From db5b6be990bdd7aa9dd3744c02052271af0c6cc4 Mon Sep 17 00:00:00 2001 From: Fabien Potencier Date: Mon, 7 Mar 2011 12:41:35 +0100 Subject: [PATCH 001/899] made initial import --- .gitignore | 6 + LICENSE | 19 ++ README | 67 +++++ VERSION | 1 + app/.htaccess | 1 + app/AppCache.php | 9 + app/AppKernel.php | 38 +++ app/autoload.php | 25 ++ app/cache/.gitkeep | 0 app/check.php | 150 ++++++++++ app/config/config.yml | 48 ++++ app/config/config_dev.yml | 18 ++ app/config/config_prod.yml | 2 + app/config/config_test.yml | 14 + app/config/parameters.ini | 15 + app/config/routing.yml | 3 + app/config/routing_dev.yml | 23 ++ app/console | 16 ++ app/logs/.gitkeep | 0 app/phpunit.xml.dist | 38 +++ app/views/base.html.twig | 13 + bin/build.sh | 106 +++++++ bin/build_bootstrap.php | 83 ++++++ bin/vendors.sh | 96 +++++++ src/.htaccess | 1 + src/Acme/DemoBundle/AcmeDemoBundle.php | 9 + .../DemoBundle/Controller/DemoController.php | 48 ++++ .../Controller/WelcomeController.php | 17 ++ src/Acme/DemoBundle/ControllerListener.php | 26 ++ .../DependencyInjection/AcmeDemoExtension.php | 22 ++ src/Acme/DemoBundle/Form/ContactForm.php | 24 ++ .../DemoBundle/Resources/config/services.xml | 18 ++ .../DemoBundle/Resources/public/css/demo.css | 262 ++++++++++++++++++ .../Resources/public/images/blue-arrow.png | Bin 0 -> 181 bytes .../public/images/field-background.gif | Bin 0 -> 63 bytes .../Resources/public/images/logo.gif | Bin 0 -> 1698 bytes .../Resources/public/images/search.png | Bin 0 -> 737 bytes .../public/images/welcome-configure.gif | Bin 0 -> 4053 bytes .../Resources/public/images/welcome-demo.gif | Bin 0 -> 3530 bytes .../public/images/welcome-quick-tour.gif | Bin 0 -> 4770 bytes .../Resources/views/Demo/contact.html.twig | 10 + .../Resources/views/Demo/hello.html.twig | 11 + .../Resources/views/Demo/index.html.twig | 15 + .../Resources/views/Welcome/index.html.twig | 59 ++++ .../Resources/views/layout.html.twig | 39 +++ .../Tests/Controller/DemoControllerTest.php | 17 ++ .../Twig/Extension/DemoExtension.php | 74 +++++ web/.htaccess | 5 + web/app.php | 11 + web/app_dev.php | 15 + web/config.php | 174 ++++++++++++ web/favicon.ico | Bin 0 -> 1150 bytes 52 files changed, 1648 insertions(+) create mode 100644 .gitignore create mode 100644 LICENSE create mode 100644 README create mode 100644 VERSION create mode 100644 app/.htaccess create mode 100644 app/AppCache.php create mode 100644 app/AppKernel.php create mode 100644 app/autoload.php create mode 100755 app/cache/.gitkeep create mode 100644 app/check.php create mode 100644 app/config/config.yml create mode 100644 app/config/config_dev.yml create mode 100644 app/config/config_prod.yml create mode 100644 app/config/config_test.yml create mode 100644 app/config/parameters.ini create mode 100644 app/config/routing.yml create mode 100644 app/config/routing_dev.yml create mode 100755 app/console create mode 100644 app/logs/.gitkeep create mode 100644 app/phpunit.xml.dist create mode 100644 app/views/base.html.twig create mode 100755 bin/build.sh create mode 100755 bin/build_bootstrap.php create mode 100755 bin/vendors.sh create mode 100644 src/.htaccess create mode 100644 src/Acme/DemoBundle/AcmeDemoBundle.php create mode 100644 src/Acme/DemoBundle/Controller/DemoController.php create mode 100644 src/Acme/DemoBundle/Controller/WelcomeController.php create mode 100644 src/Acme/DemoBundle/ControllerListener.php create mode 100644 src/Acme/DemoBundle/DependencyInjection/AcmeDemoExtension.php create mode 100644 src/Acme/DemoBundle/Form/ContactForm.php create mode 100644 src/Acme/DemoBundle/Resources/config/services.xml create mode 100644 src/Acme/DemoBundle/Resources/public/css/demo.css create mode 100644 src/Acme/DemoBundle/Resources/public/images/blue-arrow.png create mode 100644 src/Acme/DemoBundle/Resources/public/images/field-background.gif create mode 100644 src/Acme/DemoBundle/Resources/public/images/logo.gif create mode 100644 src/Acme/DemoBundle/Resources/public/images/search.png create mode 100644 src/Acme/DemoBundle/Resources/public/images/welcome-configure.gif create mode 100644 src/Acme/DemoBundle/Resources/public/images/welcome-demo.gif create mode 100644 src/Acme/DemoBundle/Resources/public/images/welcome-quick-tour.gif create mode 100644 src/Acme/DemoBundle/Resources/views/Demo/contact.html.twig create mode 100644 src/Acme/DemoBundle/Resources/views/Demo/hello.html.twig create mode 100644 src/Acme/DemoBundle/Resources/views/Demo/index.html.twig create mode 100644 src/Acme/DemoBundle/Resources/views/Welcome/index.html.twig create mode 100644 src/Acme/DemoBundle/Resources/views/layout.html.twig create mode 100644 src/Acme/DemoBundle/Tests/Controller/DemoControllerTest.php create mode 100644 src/Acme/DemoBundle/Twig/Extension/DemoExtension.php create mode 100644 web/.htaccess create mode 100644 web/app.php create mode 100644 web/app_dev.php create mode 100644 web/config.php create mode 100644 web/favicon.ico diff --git a/.gitignore b/.gitignore new file mode 100644 index 0000000000..2807d5f7eb --- /dev/null +++ b/.gitignore @@ -0,0 +1,6 @@ +web/bundles/ +app/bootstrap* +app/cache/* +app/logs/* +build/ +vendor/ diff --git a/LICENSE b/LICENSE new file mode 100644 index 0000000000..89c135de51 --- /dev/null +++ b/LICENSE @@ -0,0 +1,19 @@ +Copyright (c) 2004-2010 Fabien Potencier + +Permission is hereby granted, free of charge, to any person obtaining a copy +of this software and associated documentation files (the "Software"), to deal +in the Software without restriction, including without limitation the rights +to use, copy, modify, merge, publish, distribute, sublicense, and/or sell +copies of the Software, and to permit persons to whom the Software is furnished +to do so, subject to the following conditions: + +The above copyright notice and this permission notice shall be included in all +copies or substantial portions of the Software. + +THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR +IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY, +FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE +AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER +LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, +OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN +THE SOFTWARE. diff --git a/README b/README new file mode 100644 index 0000000000..64aba39c52 --- /dev/null +++ b/README @@ -0,0 +1,67 @@ +Symfony Standard Edition +======================== + +What's inside? +-------------- + +Symfony Standard Edition comes pre-configured with the following bundles: + + * FrameworkBundle + * SensioFrameworkExtraBundle + * DoctrineBundle + * TwigBundle + * SwiftmailerBundle + * ZendBundle + * AsseticBundle + * WebProfilerBundle (in dev/test env) + * SymfonyWebConfiguratorBundle (in dev/test env) + * AcmeDemoBundle (in dev/test env) + +Installation from an Archive +---------------------------- + +If you have downloaded an archive, unpack it somewhere under your web server +root directory. + +If you have downloaded an archive without the vendors, run the +`bin/vendors.sh` script (`git` must be installed on your machine). If you +don't have git, download the version with the vendors included. + +Installation from Git +--------------------- + +Run the following scripts: + + * `bin/vendors.sh` + * `bin/build_bootstrap.php` + * `app/console assets:install web/` + +Configuration +------------- + +Check that everything is working fine by going to the `config.php` page in a +browser and follow the instructions. + +The distribution is configured with the following defaults: + + * Twig is the only configured template engine; + * Doctrine ORM/DBAL is configured; + * Swiftmailer is configured; + * Annotations for everything are enabled. + +A default bundle, `AcmeDemoBundle`, shows you Symfony2 in action. It's only +available in the `dev` environment. After playing with it, you can remove it +by deleting the `src/Acme` directory and removing the routing entry in +`app/config/routing_dev.yml`. + +Configure the distribution by editing `app/config/parameters.ini` or by +accessing `/web/config.php` in a browser. + +A simple controller is configured at `/hello/{name}`. Access it via +`web/app_dev.php/_demo/hello/Fabien`. + +If you want to use the CLI, a console application is available at +`app/console`. Check first that your PHP is correctly configured for the CLI +by running `app/check.php`. + +Enjoy! diff --git a/VERSION b/VERSION new file mode 100644 index 0000000000..d10b077780 --- /dev/null +++ b/VERSION @@ -0,0 +1 @@ +2.0.0PR7 \ No newline at end of file diff --git a/app/.htaccess b/app/.htaccess new file mode 100644 index 0000000000..3418e55a68 --- /dev/null +++ b/app/.htaccess @@ -0,0 +1 @@ +deny from all \ No newline at end of file diff --git a/app/AppCache.php b/app/AppCache.php new file mode 100644 index 0000000000..ddb51db058 --- /dev/null +++ b/app/AppCache.php @@ -0,0 +1,9 @@ +getEnvironment(), array('dev', 'test'))) { + $bundles[] = new Symfony\Bundle\WebProfilerBundle\WebProfilerBundle(); + $bundles[] = new Symfony\Bundle\WebConfiguratorBundle\SymfonyWebConfiguratorBundle(); + $bundles[] = new Acme\DemoBundle\AcmeDemoBundle(); + } + + return $bundles; + } + + public function registerContainerConfiguration(LoaderInterface $loader) + { + $loader->load(__DIR__.'/config/config_'.$this->getEnvironment().'.yml'); + } + + public function registerRootDir() + { + return __DIR__; + } +} diff --git a/app/autoload.php b/app/autoload.php new file mode 100644 index 0000000000..3eefc81d7f --- /dev/null +++ b/app/autoload.php @@ -0,0 +1,25 @@ +registerNamespaces(array( + 'Symfony' => array(__DIR__.'/../vendor/symfony/src', __DIR__.'/../vendor/bundles'), + 'Sensio' => __DIR__.'/../vendor/bundles', + 'Doctrine\\Common\\DataFixtures' => __DIR__.'/../vendor/doctrine-data-fixtures/lib', + 'Doctrine\\Common' => __DIR__.'/../vendor/doctrine-common/lib', + 'Doctrine\\DBAL\\Migrations' => __DIR__.'/../vendor/doctrine-migrations/lib', + 'Doctrine\\MongoDB' => __DIR__.'/../vendor/doctrine-mongodb/lib', + 'Doctrine\\ODM\\MongoDB' => __DIR__.'/../vendor/doctrine-mongodb-odm/lib', + 'Doctrine\\DBAL' => __DIR__.'/../vendor/doctrine-dbal/lib', + 'Doctrine' => __DIR__.'/../vendor/doctrine/lib', + 'Zend\\Log' => __DIR__.'/../vendor/zend-log', + 'Assetic' => __DIR__.'/../vendor/assetic/src', + 'Acme' => __DIR__.'/../src', +)); +$loader->registerPrefixes(array( + 'Twig_Extensions_' => __DIR__.'/../vendor/twig-extensions/lib', + 'Twig_' => __DIR__.'/../vendor/twig/lib', + 'Swift_' => __DIR__.'/../vendor/swiftmailer/lib/classes', +)); +$loader->register(); diff --git a/app/cache/.gitkeep b/app/cache/.gitkeep new file mode 100755 index 0000000000..e69de29bb2 diff --git a/app/check.php b/app/check.php new file mode 100644 index 0000000000..c9e8ebb2d9 --- /dev/null +++ b/app/check.php @@ -0,0 +1,150 @@ + + + + + +

symfony +REQUIREMENTS CHECK

+EOF +; + echo sprintf("

php.ini used by PHP: %s

", get_ini_path()); +} + +// mandatory +echo_title("Mandatory requirements"); +check(version_compare(phpversion(), '5.3.2', '>='), sprintf('Checking that PHP version is at least 5.3.2 (%s installed)', phpversion()), 'Install PHP 5.3.1 or newer (current version is '.phpversion(), true); +check(ini_get('date.timezone'), 'Checking that the "date.timezone" setting is set', 'Set the "date.timezone" setting in php.ini (like Europe/Paris)', true); +check(is_writable(__DIR__.'/../app/cache'), sprintf('Checking that app/cache/ directory is writable'), 'Change the permissions of the app/cache/ directory so that the web server can write in it', true); +check(is_writable(__DIR__.'/../app/logs'), sprintf('Checking that the app/logs/ directory is writable'), 'Change the permissions of the app/logs/ directory so that the web server can write in it', true); + +// warnings +echo_title("Optional checks"); +check(class_exists('DomDocument'), 'Checking that the PHP-XML module is installed', 'Install and enable the php-xml module', false); +check(defined('LIBXML_COMPACT'), 'Checking that the libxml version is at least 2.6.21', 'Upgrade your php-xml module with a newer libxml', false); +check(function_exists('token_get_all'), 'Checking that the token_get_all() function is available', 'Install and enable the Tokenizer extension (highly recommended)', false); +check(function_exists('mb_strlen'), 'Checking that the mb_strlen() function is available', 'Install and enable the mbstring extension', false); +check(function_exists('iconv'), 'Checking that the iconv() function is available', 'Install and enable the iconv extension', false); +check(function_exists('utf8_decode'), 'Checking that the utf8_decode() is available', 'Install and enable the XML extension', false); +check(function_exists('posix_isatty'), 'Checking that the posix_isatty() is available', 'Install and enable the php_posix extension (used to colorized the CLI output)', false); +check(class_exists('Locale'), 'Checking that the intl extension is available', 'Install and enable the intl extension (used for validators)', false); + +$accelerator = + (function_exists('apc_store') && ini_get('apc.enabled')) + || + function_exists('eaccelerator_put') && ini_get('eaccelerator.enable') + || + function_exists('xcache_set') +; +check($accelerator, 'Checking that a PHP accelerator is installed', 'Install a PHP accelerator like APC (highly recommended)', false); + +check(!ini_get('short_open_tag'), 'Checking that php.ini has short_open_tag set to off', 'Set short_open_tag to off in php.ini', false); +check(!ini_get('magic_quotes_gpc'), 'Checking that php.ini has magic_quotes_gpc set to off', 'Set magic_quotes_gpc to off in php.ini', false); +check(!ini_get('register_globals'), 'Checking that php.ini has register_globals set to off', 'Set register_globals to off in php.ini', false); +check(!ini_get('session.auto_start'), 'Checking that php.ini has session.auto_start set to off', 'Set session.auto_start to off in php.ini', false); + +echo_title("Optional checks (Doctrine)"); + +check(class_exists('PDO'), 'Checking that PDO is installed', 'Install PDO (mandatory for Doctrine)', false); +if (class_exists('PDO')) { + $drivers = PDO::getAvailableDrivers(); + check(count($drivers), 'Checking that PDO has some drivers installed: '.implode(', ', $drivers), 'Install PDO drivers (mandatory for Doctrine)'); +} + +if (!is_cli()) { + echo ''; +} + +/** + * Checks a configuration. + */ +function check($boolean, $message, $help = '', $fatal = false) +{ + if (is_cli()) { + echo $boolean ? " OK " : sprintf("\n\n[[%s]] ", $fatal ? ' ERROR ' : 'WARNING'); + echo sprintf("$message%s\n", $boolean ? '' : ': FAILED'); + + if (!$boolean) { + echo " *** $help ***\n"; + if ($fatal) { + die("You must fix this problem before resuming the check.\n"); + } + } + } else { + if ($boolean) { + $color = '#60b111'; + $image = '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'; + $alt = 'ok'; + } elseif ($fatal) { + $color = '#fd3900'; + $image = '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'; + $alt = 'fatal'; + } else { + $color = '#6a9ee6'; + $image = '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'; + $alt = 'warning'; + } + + echo sprintf(' +
+
%s
+
%s%s
+
+
', $color, $alt, $image, $message, !$boolean ? '
What to do'.($fatal ? '' : ' (optional)').': '.$help.'
' : ''); + } +} + +function echo_title($title) +{ + if (is_cli()) { + echo "\n** $title **\n\n"; + } else { + echo "

$title

"; + } +} + +/** + * Gets the php.ini path used by the current PHP interpretor. + * + * @return string the php.ini path + */ +function get_ini_path() +{ + if ($path = get_cfg_var('cfg_file_path')) { + return $path; + } + + return 'WARNING: not using a php.ini file'; +} + +function is_cli() +{ + return !isset($_SERVER['HTTP_HOST']); +} diff --git a/app/config/config.yml b/app/config/config.yml new file mode 100644 index 0000000000..7f996fd92d --- /dev/null +++ b/app/config/config.yml @@ -0,0 +1,48 @@ +imports: + - { resource: parameters.ini } + +framework: + charset: UTF-8 + error_handler: null + csrf_protection: + enabled: true + secret: %csrf_secret% + router: { resource: "%kernel.root_dir%/config/routing.yml" } + validation: { enabled: true, annotations: true } + templating: { engines: ['twig'] } #assets_version: SomeVersionScheme + session: + default_locale: %locale% + lifetime: 3600 + auto_start: true + +# Twig Configuration +twig: + debug: %kernel.debug% + strict_variables: %kernel.debug% + +# Assetic Configuration +assetic: + debug: %kernel.debug% + use_controller: false + +# Doctrine Configuration +doctrine: + dbal: + driver: %database_driver% + host: %database_host% + dbname: %database_name% + user: %database_user% + password: %database_password% + logging: %kernel.debug% + + orm: + auto_generate_proxy_classes: %kernel.debug% + mappings: + AcmeDemoBundle: ~ + +# Swiftmailer Configuration +swiftmailer: + transport: %mailer_transport% + host: %mailer_host% + username: %mailer_user% + password: %mailer_password% diff --git a/app/config/config_dev.yml b/app/config/config_dev.yml new file mode 100644 index 0000000000..ed41e77e36 --- /dev/null +++ b/app/config/config_dev.yml @@ -0,0 +1,18 @@ +imports: + - { resource: config.yml } + +framework: + router: { resource: "%kernel.root_dir%/config/routing_dev.yml" } + profiler: { only_exceptions: false } + +web_profiler: + toolbar: true + intercept_redirects: false + +zend: + logger: + priority: debug + path: %kernel.logs_dir%/%kernel.environment%.log + +assetic: + use_controller: true diff --git a/app/config/config_prod.yml b/app/config/config_prod.yml new file mode 100644 index 0000000000..8e0b6ff02b --- /dev/null +++ b/app/config/config_prod.yml @@ -0,0 +1,2 @@ +imports: + - { resource: config.yml } diff --git a/app/config/config_test.yml b/app/config/config_test.yml new file mode 100644 index 0000000000..b0b372fdce --- /dev/null +++ b/app/config/config_test.yml @@ -0,0 +1,14 @@ +imports: + - { resource: config_dev.yml } + +framework: + error_handler: false + test: ~ + +web_profiler: + toolbar: false + intercept_redirects: false + +zend: + logger: + priority: debug diff --git a/app/config/parameters.ini b/app/config/parameters.ini new file mode 100644 index 0000000000..93c76cd21b --- /dev/null +++ b/app/config/parameters.ini @@ -0,0 +1,15 @@ +[parameters] + database_driver=pdo_mysql + database_host=localhost + database_name=symfony + database_user=root + database_password= + + mailer_transport=smtp + mailer_host=localhost + mailer_user= + mailer_password= + + locale=en + + csrf_secret=xxxxxxxxxx diff --git a/app/config/routing.yml b/app/config/routing.yml new file mode 100644 index 0000000000..de2a408b4a --- /dev/null +++ b/app/config/routing.yml @@ -0,0 +1,3 @@ +_welcome: + resource: "@AcmeDemoBundle/Controller/WelcomeController.php" + type: annotation diff --git a/app/config/routing_dev.yml b/app/config/routing_dev.yml new file mode 100644 index 0000000000..e4978b38ac --- /dev/null +++ b/app/config/routing_dev.yml @@ -0,0 +1,23 @@ +_main: + resource: routing.yml + +_demo: + resource: "@AcmeDemoBundle/Controller/DemoController.php" + type: annotation + prefix: /_demo + +_assetic: + resource: . + type: assetic + +_wdt: + resource: "@WebProfilerBundle/Resources/config/routing/wdt.xml" + prefix: /_wdt + +_profiler: + resource: "@WebProfilerBundle/Resources/config/routing/profiler.xml" + prefix: /_profiler + +_configurator: + resource: "@SymfonyWebConfiguratorBundle/Resources/config/routing/configurator.xml" + prefix: /_configurator diff --git a/app/console b/app/console new file mode 100755 index 0000000000..2e40898bc3 --- /dev/null +++ b/app/console @@ -0,0 +1,16 @@ +#!/usr/bin/env php +getParameterOption(array('--env', '-e'), 'dev'); +$debug = !$input->hasParameterOption(array('--no-debug', '')); + +$kernel = new AppKernel($env, $debug); +$application = new Application($kernel); +$application->run(); diff --git a/app/logs/.gitkeep b/app/logs/.gitkeep new file mode 100644 index 0000000000..e69de29bb2 diff --git a/app/phpunit.xml.dist b/app/phpunit.xml.dist new file mode 100644 index 0000000000..aadfbf7bc5 --- /dev/null +++ b/app/phpunit.xml.dist @@ -0,0 +1,38 @@ + + + + + + ../src/*/*Bundle/Tests + ../src/*/Bundle/*Bundle/Tests + + + + + + + + ../src + + ../src/*/*Bundle/Resources + ../src/*/*Bundle/Tests + ../src/*/Bundle/*Bundle/Resources + ../src/*/Bundle/*Bundle/Tests + + + + diff --git a/app/views/base.html.twig b/app/views/base.html.twig new file mode 100644 index 0000000000..c19978f0da --- /dev/null +++ b/app/views/base.html.twig @@ -0,0 +1,13 @@ + + + + + {% block title %}Welcome!{% endblock %} + {% block stylesheets %}{% endblock %} + + + + {% block body %}{% endblock %} + {% block javascripts %}{% endblock %} + + diff --git a/bin/build.sh b/bin/build.sh new file mode 100755 index 0000000000..7b495ec093 --- /dev/null +++ b/bin/build.sh @@ -0,0 +1,106 @@ +#!/bin/sh + +DIR=`php -r "echo realpath(dirname(\\$_SERVER['argv'][0]));"` +cd $DIR +VERSION=`cat VERSION` + +if [ ! -d "$DIR/build" ]; then + mkdir -p $DIR/build +fi + +$DIR/bin/build_bootstrap.php +$DIR/app/console assets:install web/ + +# Without vendors +rm -rf /tmp/Symfony +mkdir /tmp/Symfony +cp -r app /tmp/Symfony/ +cp -r src /tmp/Symfony/ +cp -r web /tmp/Symfony/ +cp -r README /tmp/Symfony/ +cp -r LICENSE /tmp/Symfony/ +cp -r VERSION /tmp/Symfony/ +cd /tmp/Symfony +sudo rm -rf app/cache/* app/logs/* .git* +chmod 777 app/cache app/logs +cd .. +# avoid the creation of ._* files +export COPY_EXTENDED_ATTRIBUTES_DISABLE=true +export COPYFILE_DISABLE=true +tar zcpf $DIR/build/Symfony_Standard_$VERSION.tgz Symfony +sudo rm -f $DIR/build/Symfony_Standard_$VERSION.zip +zip -rq $DIR/build/Symfony_Standard_$VERSION.zip Symfony + +# With vendors +cd $DIR +rm -rf /tmp/vendor +mkdir /tmp/vendor +TARGET=/tmp/vendor +cd $TARGET + +if [ ! -d "$DIR/vendor" ]; then + echo "The master vendor directory does not exist" + exit +fi + +cp -r $DIR/vendor/* . + +# Assetic +cd assetic && rm -rf phpunit.xml* README* tests +cd $TARGET + +# Doctrine ORM +cd doctrine && rm -rf UPGRADE* build* bin tests tools lib/vendor +cd $TARGET + +# Doctrine DBAL +cd doctrine-dbal && rm -rf bin build* tests lib/vendor +cd $TARGET + +# Doctrine Common +cd doctrine-common && rm -rf build* tests lib/vendor +cd $TARGET + +# Doctrine migrations +cd doctrine-migrations && rm -rf tests build* lib/vendor +cd $TARGET + +# Doctrine data fixtures +cd doctrine-data-fixtures && rm -rf tests README* lib/vendor +cd $TARGET + +# Doctrine MongoDB +cd doctrine-mongodb && rm -rf tests build* tools lib/vendor +cd $TARGET + +# Doctrine MongoDB ODM +cd doctrine-mongodb-odm && rm -rf tests build* tools phpunit.xml* build* bin README* lib/vendor +cd $TARGET + +# Swiftmailer +cd swiftmailer && rm -rf CHANGES README* build* docs notes test-suite tests create_pear_package.php package* +cd $TARGET + +# Symfony +cd symfony && rm -rf README phpunit.xml* tests *.sh vendor +cd $TARGET + +# Twig +cd twig && rm -rf AUTHORS CHANGELOG README.markdown bin doc package.xml.tpl phpunit.xml* test +cd $TARGET + +# Twig Extensions +cd twig-extensions && rm -rf README doc phpunit.xml* test +cd $TARGET + +# cleanup +find . -name .git | xargs rm -rf - +find . -name .gitignore | xargs rm -rf - +find . -name .gitmodules | xargs rm -rf - +find . -name .svn | xargs rm -rf - + +cd /tmp/ +mv /tmp/vendor /tmp/Symfony/ +tar zcpf $DIR/build/Symfony_Standard_Vendors_$VERSION.tgz Symfony +sudo rm -f $DIR/build/Symfony_Standard_Vendors_$VERSION.zip +zip -rq $DIR/build/Symfony_Standard_Vendors_$VERSION.zip Symfony diff --git a/bin/build_bootstrap.php b/bin/build_bootstrap.php new file mode 100755 index 0000000000..5c3b3bdbe8 --- /dev/null +++ b/bin/build_bootstrap.php @@ -0,0 +1,83 @@ +#!/usr/bin/env php + + * + * For the full copyright and license information, please view the LICENSE + * file that was distributed with this source code. + */ + +use Symfony\Component\ClassLoader\UniversalClassLoader; +use Symfony\Component\ClassLoader\ClassCollectionLoader; + +$loader = new UniversalClassLoader(); +$loader->registerNamespaces(array('Symfony' => __DIR__.'/../vendor/symfony/src')); +$loader->register(); + +$file = __DIR__.'/../app/bootstrap.php'; +if (file_exists($file)) { + unlink($file); +} + +ClassCollectionLoader::load(array( + 'Symfony\\Component\\DependencyInjection\\ContainerInterface', + 'Symfony\\Component\\DependencyInjection\\Container', + 'Symfony\\Component\\DependencyInjection\\ContainerAwareInterface', + 'Symfony\\Component\\DependencyInjection\\ContainerAware', + + 'Symfony\\Component\\HttpKernel\\Bundle\\BundleInterface', + 'Symfony\\Component\\HttpKernel\\Bundle\\Bundle', + 'Symfony\\Component\\HttpKernel\\Debug\\ErrorHandler', + 'Symfony\\Component\\HttpKernel\\HttpKernelInterface', + 'Symfony\\Component\\HttpKernel\\HttpKernel', + 'Symfony\\Component\\HttpKernel\\KernelInterface', + 'Symfony\\Component\\HttpKernel\\Kernel', + + 'Symfony\\Component\\HttpFoundation\\ParameterBag', + 'Symfony\\Component\\HttpFoundation\\FileBag', + 'Symfony\\Component\\HttpFoundation\\ServerBag', + 'Symfony\\Component\\HttpFoundation\\HeaderBag', + 'Symfony\\Component\\HttpFoundation\\Request', + 'Symfony\\Component\\HttpFoundation\\ApacheRequest', + + 'Symfony\\Component\\ClassLoader\\ClassCollectionLoader', + 'Symfony\\Component\\ClassLoader\\UniversalClassLoader', + 'Symfony\\Component\\ClassLoader\\MapFileClassLoader', + + 'Symfony\\Component\\Config\\ConfigCache', +), dirname($file), basename($file, '.php'), false); + +file_put_contents($file, " $name); + } + + /** + * @extra:Route("/contact", name="_demo_contact") + * @extra:Template() + */ + public function contactAction() + { + $form = ContactForm::create($this->get('form.context'), 'contact'); + + $form->bind($this->container->get('request'), $form); + if ($form->isValid()) { + $form->send($this->get('mailer')); + + $this->get('session')->setFlash('notice', 'Message sent!'); + + return new RedirectResponse($this->generateUrl('_demo')); + } + + return array('form' => $form); + } +} diff --git a/src/Acme/DemoBundle/Controller/WelcomeController.php b/src/Acme/DemoBundle/Controller/WelcomeController.php new file mode 100644 index 0000000000..b8c55bc8ca --- /dev/null +++ b/src/Acme/DemoBundle/Controller/WelcomeController.php @@ -0,0 +1,17 @@ +extension = $extension; + } + + public function getController(Event $event, $controller) + { + if (HttpKernelInterface::MASTER_REQUEST === $event->get('request_type')) { + $this->extension->setController($controller); + } + + return $controller; + } +} diff --git a/src/Acme/DemoBundle/DependencyInjection/AcmeDemoExtension.php b/src/Acme/DemoBundle/DependencyInjection/AcmeDemoExtension.php new file mode 100644 index 0000000000..6dfcc8229c --- /dev/null +++ b/src/Acme/DemoBundle/DependencyInjection/AcmeDemoExtension.php @@ -0,0 +1,22 @@ +load('services.xml'); + } + + public function getAlias() + { + return 'acme_demo'; + } +} diff --git a/src/Acme/DemoBundle/Form/ContactForm.php b/src/Acme/DemoBundle/Form/ContactForm.php new file mode 100644 index 0000000000..03a54b2330 --- /dev/null +++ b/src/Acme/DemoBundle/Form/ContactForm.php @@ -0,0 +1,24 @@ +add(new TextField('email')); + $this->add(new TextField('message')); + } + + public function send(\Swift_Mailer $mailer) + { + //$mailer->send(); + } +} diff --git a/src/Acme/DemoBundle/Resources/config/services.xml b/src/Acme/DemoBundle/Resources/config/services.xml new file mode 100644 index 0000000000..07366c7112 --- /dev/null +++ b/src/Acme/DemoBundle/Resources/config/services.xml @@ -0,0 +1,18 @@ + + + + + + + + + + + + + + + + diff --git a/src/Acme/DemoBundle/Resources/public/css/demo.css b/src/Acme/DemoBundle/Resources/public/css/demo.css new file mode 100644 index 0000000000..d02f29a6ae --- /dev/null +++ b/src/Acme/DemoBundle/Resources/public/css/demo.css @@ -0,0 +1,262 @@ +/* +Copyright (c) 2010, Yahoo! Inc. All rights reserved. +Code licensed under the BSD License: +http://developer.yahoo.com/yui/license.html +version: 2.8.2r1 + +Reset +*/ + +html{color:#000;background:#FFF;}body,div,dl,dt,dd,ul,ol,li,h1,h2,h3,h4,h5,h6,pre,code,form,fieldset,legend,input,button,textarea,p,blockquote,th,td{margin:0;padding:0;}table{border-collapse:collapse;border-spacing:0;}fieldset,img{border:0;}address,caption,cite,code,dfn,em,strong,th,var,optgroup{font-style:inherit;font-weight:inherit;}del,ins{text-decoration:none;}li{list-style:none;}caption,th{text-align:left;}h1,h2,h3,h4,h5,h6{font-size:100%;font-weight:normal;}q:before,q:after{content:'';}abbr,acronym{border:0;font-variant:normal;}sup{vertical-align:baseline;}sub{vertical-align:baseline;}legend{color:#000;}input,button,textarea,select,optgroup,option{font-family:inherit;font-size:inherit;font-style:inherit;font-weight:inherit;}input,button,textarea,select{*font-size:100%;} + +html, body +{ + background-color: #EFEFEF; +} + +body +{ + font-size: 14px; + font-family: "Lucida Sans Unicode", "Lucida Grande", Verdana, Arial, Helvetica, sans-serif; + color: #313131; +} + +a +{ + color: #08C; + text-decoration: none; +} + +a:hover +{ + text-decoration: underline; +} + +strong +{ + font-weight: bold; +} + +em +{ + font-style: italic; +} + +h1, h2, h3 +{ + font-family: Georgia, "Times New Roman", Times, serif; + color: #404040; +} + +h1 +{ + font-size: 45px; + padding-bottom: 30px; +} + +h2 +{ + font-weight: bold; + color: #FFFFFF; + /* Font is duplicated of body (sans-serif) */ + font-family: "Lucida Sans Unicode", "Lucida Grande", Verdana, Arial, Helvetica, sans-serif; + + margin-bottom: 10px; + background-color: #aacd4e; + padding: 2px 4px; + display: inline-block; + text-transform: uppercase; + +} + +p +{ + line-height: 20px; + padding-bottom: 20px; +} + +ul a +{ + background: url(../images/blue-arrow.png) no-repeat right 6px; + padding-right: 10px; +} + +ul, ol +{ + padding-left: 20px; +} + +li +{ + padding-bottom: 18px; +} + +ol li +{ + list-style-type: decimal; +} + +ul li +{ + list-style-type: none; +} + +#symfony-header +{ + position: relative; + padding: 30px 30px 20px 30px; +} + +#symfony-wrapper +{ + width: 970px; + margin: 0 auto; +} + +.symfony-content +{ + background-color: white; + border: 1px solid #DFDFDF; + padding: 50px; + -moz-border-radius: 16px; + -webkit-border-radius: 16px; + border-radius: 16px; + margin-bottom: 20px; +} + +#symfony-search +{ + position: absolute; + + top: 50px; + right: 30px; +} + +#symfony-search-field +{ + width: 190px; +} + +#symfony-search label +{ + display: block; + float: left; + width: 20px; + height: 25px; + background: url(../images/search.png) no-repeat left 5px; +} + +#symfony-search label span +{ + display: none; +} + +input[type=text] +{ + border: 1px solid #DADADA; + background: white url(../images/field-background.gif) repeat-x left top; + padding: 5px 6px; + color: #565656; + font-family: 'Lucida Sans Unicode', 'Lucida Grande', Verdana, Arial, Helvetica, sans-serif; + font-size: 12px; +} + +.symfony-button-grey, +.symfony-button-green +{ + font-size: 0.85em; + font-weight: bold; + + cursor: pointer; + + display: inline-block; + outline: none; + + text-align: center; + text-transform: uppercase; + + padding: 3px 10px; + + text-shadow: 0 1px 1px rgba(0,0,0,.3); + + -webkit-border-radius: 4px; + -moz-border-radius: 4px; + border-radius: 4px; +} + +.symfony-button-grey +{ + color: #868686; + font-weight: normal; + + padding: 5px 10px; + border: solid 1px #d7d7d7; + background: #ffffff; + background: -webkit-gradient(linear, left top, left bottom, from(#ffffff), to(#d7d7d7)); + background: -moz-linear-gradient(top, #ffffff, #d7d7d7); + filter: progid:DXImageTransform.Microsoft.gradient(startColorstr='#ffffff', endColorstr='#d7d7d7'); +} + +.symfony-button-green +{ + padding: 5px 12px; + + color: white; + + border: solid 1px #a7da39; + background: #a7da39; + background: -webkit-gradient(linear, left top, left bottom, from(#a7da39), to(#6a9211)); + background: -moz-linear-gradient(top, #a7da39, #6a9211); + filter: progid:DXImageTransform.Microsoft.gradient(startColorstr='#a7da39', endColorstr='#6a9211'); +} + +.symfony-blocks-welcome +{ + overflow: hidden; +} + +.symfony-blocks-welcome > div +{ + background-color: whitesmoke; + float: left; + width: 240px; + margin-right: 14px; + text-align: center; + padding: 26px 20px; +} + +.symfony-blocks-welcome > div.block-demo +{ + margin-right: 0; +} + +.symfony-blocks-welcome .illustration +{ + padding-bottom: 20px; +} + +.symfony-blocks-help +{ + overflow: hidden; +} + +.symfony-blocks-help +{ + margin-top: 30px; + padding: 18px; + border: 1px solid #E6E6E6; +} + +.symfony-blocks-help > div +{ + width: 254px; + float: left; +} + +.flash-message +{ + padding: 10px; + margin: 5px; + margin-top: 15px; + background-color: #ffe; +} diff --git a/src/Acme/DemoBundle/Resources/public/images/blue-arrow.png b/src/Acme/DemoBundle/Resources/public/images/blue-arrow.png new file mode 100644 index 0000000000000000000000000000000000000000..fa82d4b4fff6414062efb2a02049cfeb9e8e7cb1 GIT binary patch literal 181 zcmeAS@N?(olHy`uVBq!ia0vp^tU%1c!3HD^Kbl$tDajJoh?3y^w370~qErUQl>DSr z1<%~X^wgl##FWaylc_d9Md6+I= zhqi>4PnzMOuO)K~*(RkoSoCn7)R^#~T4CSujwM;<0=t>E&QEnQ(&y3G(9U?$#xX^m ckwt=G)hqGzYlDe*q4@=v9Pj!eSesj znO9X=ad2|Jy}yf!jHIKbv9Yp#e1F*3*>P`jS5;V~q@}*Tzl({C|Ns9mE;9fB{{R30 z000000000000000A^8LW000^QEC2ui0JZ==06+!*peBxFX^z0-1i_MJ3+p_pEh_&5dM^QH^o`2q?YC;|Y#eo6?SBFL~IkO9*W zUWrg(6a+6t1e9~gkzoUD0u)q?cL8IkHxMNMW_YDz4U&xn4G;-%fMrJwrreB*aD?3_ z1wa){Fo|t|jsdNTB$!ozNI7K6ROJ$p6pPVgF9`4wMB>|mt0D|wjG70m21m-KH6S4q zhKOfKG;JyM!j7010!F!0IkQPpts|OdaKxZQty_Z;XW06P@mIDOfgM&{!i#`0fD`e3 zQEdyS&0Nj2C9?Kr8lnz-R4p>0a~KE_K`S#&yS5Dk42ZH}fWWNn-@r{EpxZBi&EUv6 z8aN0#2?2n~qoYCA9N}^4*n51eZlv`Vo}$7KN0+^P4l3M z2>3zos9Q+@lo%19fEJ&v_eMl=Ver}i6~3L26fm|Wb=^(lB>@IXO1OprcmzanA$V+L zb^~<*z@))9>6GxyTD2hYPk$N-mINXQ^p_PtcqCwBVHzYQp9trqhK*03$jI3zp=`EL z4gk;<4l+DyFhEu)P)UL+z8NDzFH^jr%?TK>h?fa6iXfN(BusNv6&G%ik!z~7xy6*t zIl-j}Y9eFPWF!!y%L|M_g5H-VU{nL2eF8edifzfKN)iT20F<12yZv3FsjK z;Rr5efTm$DL^*<=i7qz6og;{q#A5}anraE7fn!1!py{+pbtXdbOp509;L?wY*qD(5 z06@@Q5uSu`O>_G}VTmEZ{vb*JgE&xUL1w2rpe-Fev@4h-90G~<(Y|8JzQl6785e#5UFuM(io2~!?FPxpW2UiiX#KE~* z@e34008|A3Hij{FaHUIu9SUF;&k<9N3>-uiQxHZ4U%WA%01CV85UvN?MKf#F{QQ#6 zwS{a20W27sMHohcl(Pv9{JSJU??&s;yP0%mi5&wxi^V4(W-tK+3tD074XPv%P67Jn zgWlPu)oR5^7&M*1$rz+WHy1@*`e+rU;lOHbgVTm}65KMKgaFOHA#`1H_0h5o&rIGb zE)5zmMj3GkP)KY67-azeT>((?w-JLB@U8#{nAQ0qC1>EkRbD)Is|#A0lK2~y79sN} zNG@y24sdXt_r~;iTHpx_=E*BaSP{$|$EWviZgdX{vBSluA zfC7ZqxHo|4cW)@0O6rG$hWUwSS3w4Z5G8{2&1zKz6h<&!@COo>P*Ep(L223&B{pG- z2y^&^Ds~qJqs^mjH~7XN@K6{!CC`PjdZDVeRKRC^iZLxrq7p~2JUof2D@uqT9E_kv z39)c17fSdz2oVk(|*9gP26mT@rLI(4sh?6#MCjsXOoCcz2gl2{9QVN>M zDBh=%)a0N50dPS1QV22^6&KcVi9jlXAybu*3hZqF zu;Jn-Qqr8K6@)kfNWj!GMXb&_vW`!zqp1P`D-sM~lX-ZeEsNm?6HFs{LTHX2-e5P0 zkjo5$5s}2!XM@Adqk=r!%(|SQh-ZjzVV3BW)ka{=J|u_>4l{-2o)9YhVN4aQ+W{Xl zVi%ZY#c|acCDCl7u_MR{1AEbx1k!1WaqiPJ^IWEzLb9vsZ1bQIlEVaoGL-Z@6r#YP s-o}b>F^nP~2bk%~rANzE00$7X3b6#@NZAEF2Ha}_46x5i%M$_sJDrx#NB{r; literal 0 HcmV?d00001 diff --git a/src/Acme/DemoBundle/Resources/public/images/search.png b/src/Acme/DemoBundle/Resources/public/images/search.png new file mode 100644 index 0000000000000000000000000000000000000000..3c88b6a4234ef5bb048bcecdc210c603c629339d GIT binary patch literal 737 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 H0RaFzT>Bsn literal 0 HcmV?d00001 diff --git a/src/Acme/DemoBundle/Resources/public/images/welcome-demo.gif b/src/Acme/DemoBundle/Resources/public/images/welcome-demo.gif new file mode 100644 index 0000000000000000000000000000000000000000..931179a7cb9827b662968f36f0732dceaae9cc8e GIT binary patch literal 3530 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 EJ3feF)c^nh literal 0 HcmV?d00001 diff --git a/src/Acme/DemoBundle/Resources/public/images/welcome-quick-tour.gif b/src/Acme/DemoBundle/Resources/public/images/welcome-quick-tour.gif new file mode 100644 index 0000000000000000000000000000000000000000..b9018b11dd21302f850984fe9b49e49828101a00 GIT binary patch literal 4770 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%0D3*BH}7=0?8k*0Vzrykq=6t~oIX@3Ybb_LZc-J4 zwg$N=q1>88;AoNU^#wW^zIjxX2j=5zB)0%{0VpH5B_cYF)9W!jR4bq^-g@+l9tGg~ zxCCem9vp!FsDY2m^EC(ZS1sm0W>Z#*X-Vd)3^s0?L>8$nFs{u%EK*X7q&=Od>xuIt z<>I9+h44rQi(QUaa0CMTLqc5YpX;AsqAWjo@d_n zuf6>|CSQsG*ro&El10oy{$|ooY zmEOc_ttc$V+%n zUq7kyi9=ztN&Ir+1+hFPg8qTY%3Q)F5jfn7!&^XF&Q1)x&Q1ZDCnCF=!W47DCENNH4#o+7}EL=wuI@Ghl?2N@x75it~Rwx zOb!!;;W5ZTLMmD!l`oRaP{>>ae$sXF0&xFjJB19(8}JD`F+3Xyo{v0L_&(2$c`8dn z#}M#=>`Afi$qouu{H~7$D1muaq1#W$=7G(l3yanS9W7H%u Pcp^k-X1orE1J?f^bf!^p literal 0 HcmV?d00001 diff --git a/src/Acme/DemoBundle/Resources/views/Demo/contact.html.twig b/src/Acme/DemoBundle/Resources/views/Demo/contact.html.twig new file mode 100644 index 0000000000..8a55cfd60b --- /dev/null +++ b/src/Acme/DemoBundle/Resources/views/Demo/contact.html.twig @@ -0,0 +1,10 @@ +{% extends "AcmeDemoBundle::layout.html.twig" %} + +{% block title %}Symfony - Contact form{% endblock %} + +{% block content %} +
+ {{ form_field(form) }} + +
+{% endblock %} diff --git a/src/Acme/DemoBundle/Resources/views/Demo/hello.html.twig b/src/Acme/DemoBundle/Resources/views/Demo/hello.html.twig new file mode 100644 index 0000000000..46f4cb7841 --- /dev/null +++ b/src/Acme/DemoBundle/Resources/views/Demo/hello.html.twig @@ -0,0 +1,11 @@ +{% extends "AcmeDemoBundle::layout.html.twig" %} + +{% block content %} + {{ parent() }} + +

+ Hello {{ name }}! +

+{% endblock %} + +{% set code = code(_self) %} diff --git a/src/Acme/DemoBundle/Resources/views/Demo/index.html.twig b/src/Acme/DemoBundle/Resources/views/Demo/index.html.twig new file mode 100644 index 0000000000..8934c092b0 --- /dev/null +++ b/src/Acme/DemoBundle/Resources/views/Demo/index.html.twig @@ -0,0 +1,15 @@ +{% extends "AcmeDemoBundle::layout.html.twig" %} + +{% block title %}Symfony - Demos{% endblock %} + +{% block content %} +

Available demos

+ + +

Symfony is under development, more demos will soon be available...

+{% endblock %} diff --git a/src/Acme/DemoBundle/Resources/views/Welcome/index.html.twig b/src/Acme/DemoBundle/Resources/views/Welcome/index.html.twig new file mode 100644 index 0000000000..d3ed7147da --- /dev/null +++ b/src/Acme/DemoBundle/Resources/views/Welcome/index.html.twig @@ -0,0 +1,59 @@ +{% extends 'AcmeDemoBundle::layout.html.twig' %} + +{% block title %}Symfony - Welcome{% endblock %} + +{% block content %} + +

Welcome!

+

Congratulations! You have successfully installed a new Symfony application.

+ +
+
+
+ Quick tour +
+ Read the Quick Tour +
+
+
+ Configure your appication +
+ Configure +
+
+
+ Demo +
+ Run The Demo +
+
+ +
+
+ +
+
+ +
+
+ +
+
+{% endblock %} diff --git a/src/Acme/DemoBundle/Resources/views/layout.html.twig b/src/Acme/DemoBundle/Resources/views/layout.html.twig new file mode 100644 index 0000000000..2cd9a904ca --- /dev/null +++ b/src/Acme/DemoBundle/Resources/views/layout.html.twig @@ -0,0 +1,39 @@ + + + + + + {% block title %}Demo Bundle{% endblock %} + + + +
+
+ + Symfony + + +
+ + {% if app.session.flash('notice') %} +
+ Notice: {{ app.session.flash('notice') }} +
+ {% endif %} + +
+ {% block content %} + {% endblock %} +
+ + {% if code is defined %} +

Code behind this page

+
{{ code|raw }}
+ {% endif %} +
+ + diff --git a/src/Acme/DemoBundle/Tests/Controller/DemoControllerTest.php b/src/Acme/DemoBundle/Tests/Controller/DemoControllerTest.php new file mode 100644 index 0000000000..0c115a67c6 --- /dev/null +++ b/src/Acme/DemoBundle/Tests/Controller/DemoControllerTest.php @@ -0,0 +1,17 @@ +createClient(); + + $crawler = $client->request('GET', '/_demo/hello/Fabien'); + + $this->assertTrue($crawler->filter('html:contains("Hello Fabien")')->count() > 0); + } +} diff --git a/src/Acme/DemoBundle/Twig/Extension/DemoExtension.php b/src/Acme/DemoBundle/Twig/Extension/DemoExtension.php new file mode 100644 index 0000000000..ae2726c1f7 --- /dev/null +++ b/src/Acme/DemoBundle/Twig/Extension/DemoExtension.php @@ -0,0 +1,74 @@ +loader = $loader; + } + + public function setController($controller) + { + $this->controller = $controller; + } + + /** + * {@inheritdoc} + */ + public function getFunctions() + { + return array( + 'code' => new \Twig_Function_Method($this, 'getCode', array('is_safe' => array('html'))), + ); + } + + public function getCode($template) + { + $controller = htmlspecialchars($this->getControllerCode(), ENT_QUOTES, 'UTF-8'); + $template = htmlspecialchars($this->getTemplateCode($template), ENT_QUOTES, 'UTF-8'); + + // remove the code block + $template = str_replace('{% block code %}{{ code(_self) }}{% endblock %}', '', $template); + + return <<Controller Code

+
$controller
+ +

Template Code

+
$template
+EOF; + } + + protected function getControllerCode() + { + $r = new \ReflectionClass($this->controller[0]); + $m = $r->getMethod($this->controller[1]); + + $code = file($r->getFilename()); + + return ' '.$m->getDocComment()."\n".implode('', array_slice($code, $m->getStartline() - 1, $m->getEndLine() - $m->getStartline() + 1)); + } + + protected function getTemplateCode($template) + { + return $this->loader->getSource($template->getTemplateName()); + } + + /** + * Returns the name of the extension. + * + * @return string The extension name + */ + public function getName() + { + return 'demo'; + } +} diff --git a/web/.htaccess b/web/.htaccess new file mode 100644 index 0000000000..0355c2007a --- /dev/null +++ b/web/.htaccess @@ -0,0 +1,5 @@ + + RewriteEngine On + RewriteCond %{REQUEST_FILENAME} !-f + RewriteRule ^(.*)$ app.php [QSA,L] + diff --git a/web/app.php b/web/app.php new file mode 100644 index 0000000000..02ded2c4b8 --- /dev/null +++ b/web/app.php @@ -0,0 +1,11 @@ +handle(Request::createFromGlobals())->send(); diff --git a/web/app_dev.php b/web/app_dev.php new file mode 100644 index 0000000000..7fb6182524 --- /dev/null +++ b/web/app_dev.php @@ -0,0 +1,15 @@ +handle(Request::createFromGlobals())->send(); diff --git a/web/config.php b/web/config.php new file mode 100644 index 0000000000..52f8d31277 --- /dev/null +++ b/web/config.php @@ -0,0 +1,174 @@ +=')) { + $version = phpversion(); + $majorProblems[] = <<$version", but Symfony + needs at least PHP "5.3.2" to run. Before using Symfony, install + PHP "5.3.2" or newer. +EOF; +} + +if (!is_writable(__DIR__ . '/../app/cache')) { + $majorProblems[] = 'Change the permissions of the "app/cache/" + directory so that the web server can write into it.'; +} + +if (!is_writable(__DIR__ . '/../app/logs')) { + $majorProblems[] = 'Change the permissions of the "app/logs/" + directory so that the web server can write into it.'; +} + +// extensions +if (!class_exists('DomDocument')) { + $minorProblems[] = 'Install and enable the php-xml module.'; +} + +if (!defined('LIBXML_COMPACT')) { + $minorProblems[] = 'Upgrade your php-xml extension with a newer libxml.'; +} + +if (!((function_exists('apc_store') && ini_get('apc.enabled')) || function_exists('eaccelerator_put') && ini_get('eaccelerator.enable') || function_exists('xcache_set'))) { + $minorProblems[] = 'Install and enable a PHP accelerator like APC (highly recommended).'; +} + +if (!function_exists('token_get_all')) { + $minorProblems[] = 'Install and enable the Tokenizer extension.'; +} + +if (!function_exists('mb_strlen')) { + $minorProblems[] = 'Install and enable the mbstring extension.'; +} + +if (!function_exists('iconv')) { + $minorProblems[] = 'Install and enable the iconv extension.'; +} + +if (!function_exists('utf8_decode')) { + $minorProblems[] = 'Install and enable the XML extension.'; +} + +if (!function_exists('posix_isatty')) { + $minorProblems[] = 'Install and enable the php_posix extension (used to colorized the CLI output).'; +} + +if (!class_exists('Locale')) { + $minorProblems[] = 'Install and enable the intl extension.'; +} + +if (!function_exists('sqlite_open')) { + $majorProblems[] = 'Install and enable the SQLite or PDO_SQLite extension.'; +} + +// php.ini +if (!ini_get('date.timezone')) { + $phpini = true; + $majorProblems[] = 'Set the "date.timezone" setting in php.ini* (like Europe/Paris).'; +} + +if (ini_get('short_open_tag')) { + $phpini = true; + $minorProblems[] = 'Set short_open_tag to off in php.ini*.'; +} + +if (ini_get('magic_quotes_gpc')) { + $phpini = true; + $minorProblems[] = 'Set magic_quotes_gpc to off in php.ini*.'; +} + +if (ini_get('register_globals')) { + $phpini = true; + $minorProblems[] = 'Set register_globals to off in php.ini*.'; +} + +if (ini_get('session.auto_start')) { + $phpini = true; + $minorProblems[] = 'Set session.auto_start to off in php.ini*.'; +} +?> + + + + + + Symfony Configuration + + +
+
+
+ + +
+

Welcome!

+

Welcome to your new Symfony project.

+

This script will guide you through the basic configuration of your project. You can also do the same by editing the ‘app/parameters.ini’ file directly.

+ + +

+ Major problems +

+

Major problems have been detected and must be fixed before continuing :

+
    + +
    2. + +
+ + + +

Recommandations

+

+ + Additionally, to + + To + enhance your Symfony experience, it’s recommended that you fixe the following : +

+
    + +
    2. + +
+ + + + +

* + + Changes to the php.ini file must be done in "". + + To change settings, create a "php.ini". + +

+
+ + + +
+
+
+
Symfony Standard Edition v.
+ + diff --git a/web/favicon.ico b/web/favicon.ico new file mode 100644 index 0000000000000000000000000000000000000000..864803618e0888f8463c0b30038633c018f939cc GIT binary patch literal 1150 zcmaizUr1AN6vuy3^oL%AsH~?RBQobI=ccaNk~J)QQD?41%~lUl4?1&O#PTUgotA-9 zsDZB9Dx!CTsTlUUw?V5x4YK5>5M*n+r|-FL<1!X8KKK0Y+4-K|Ip_DgLX_ZFS}O27 zD6VZ4Vy_V55P%DwO+Snf_;2^FO_X=lLt9ZPzz)z@c~ldI{Q@#slCUp96W9qfs%tQ*oXL6(4`+eocJ>~>XTi!Tx6`NE0#k>{2Oo} ztK9}W2EBZ;)|i=(L{i>6UU}sHFa>93DOU?()OGNh>)?K^U==8P)fsB(g!Z`H)Oe2K zAL8V3c}P=UQK;p237iK()-qO$m3q1_)5Uf>)l?g3abZDzzr3uhc^8WX1k|b(vZuwUYd`2nOcXxJ?f6`A^uQ+Js>k0*)1Z4Ms zn^LJ1IeVQ{e)veSS*BUf_2AsdWHfQT>0~mg)MIP0(fZmtg+pPwU~40@=~Q74tpCV* z?ho@%#bU9aI76NxIeHwFNF*?aMWwIcY>?`WCUqU3p`BrU7P-H#KQlGy-*EQ!{qC?| zBHyTwqR}XwX|T}E>o*E#8G_CNzUOjq9hiOEpwp*$E~o3w^mcAenG2uk(7mCIUZ>~% zB=me1mhaCn;Cq#;BX2o}t+|y3?+$Lc6{R^^&pjZF^ literal 0 HcmV?d00001 From a08a4208fe6faa4ab146d02b3edfbcc79a4fc412 Mon Sep 17 00:00:00 2001 From: Fabien Potencier Date: Mon, 7 Mar 2011 13:46:41 +0100 Subject: [PATCH 002/899] renamed README --- README | 67 ---------------------------------------------------------- 1 file changed, 67 deletions(-) delete mode 100644 README diff --git a/README b/README deleted file mode 100644 index 64aba39c52..0000000000 --- a/README +++ /dev/null @@ -1,67 +0,0 @@ -Symfony Standard Edition -======================== - -What's inside? --------------- - -Symfony Standard Edition comes pre-configured with the following bundles: - - * FrameworkBundle - * SensioFrameworkExtraBundle - * DoctrineBundle - * TwigBundle - * SwiftmailerBundle - * ZendBundle - * AsseticBundle - * WebProfilerBundle (in dev/test env) - * SymfonyWebConfiguratorBundle (in dev/test env) - * AcmeDemoBundle (in dev/test env) - -Installation from an Archive ----------------------------- - -If you have downloaded an archive, unpack it somewhere under your web server -root directory. - -If you have downloaded an archive without the vendors, run the -`bin/vendors.sh` script (`git` must be installed on your machine). If you -don't have git, download the version with the vendors included. - -Installation from Git ---------------------- - -Run the following scripts: - - * `bin/vendors.sh` - * `bin/build_bootstrap.php` - * `app/console assets:install web/` - -Configuration -------------- - -Check that everything is working fine by going to the `config.php` page in a -browser and follow the instructions. - -The distribution is configured with the following defaults: - - * Twig is the only configured template engine; - * Doctrine ORM/DBAL is configured; - * Swiftmailer is configured; - * Annotations for everything are enabled. - -A default bundle, `AcmeDemoBundle`, shows you Symfony2 in action. It's only -available in the `dev` environment. After playing with it, you can remove it -by deleting the `src/Acme` directory and removing the routing entry in -`app/config/routing_dev.yml`. - -Configure the distribution by editing `app/config/parameters.ini` or by -accessing `/web/config.php` in a browser. - -A simple controller is configured at `/hello/{name}`. Access it via -`web/app_dev.php/_demo/hello/Fabien`. - -If you want to use the CLI, a console application is available at -`app/console`. Check first that your PHP is correctly configured for the CLI -by running `app/check.php`. - -Enjoy! From 2bbcd994f0ff6691ec9453acb3cae14d1dc9826e Mon Sep 17 00:00:00 2001 From: Fabien Potencier Date: Mon, 7 Mar 2011 13:47:02 +0100 Subject: [PATCH 003/899] renamed README --- README.md | 67 +++++++++++++++++++++++++++++++++++++++++++++++++++++++ 1 file changed, 67 insertions(+) create mode 100644 README.md diff --git a/README.md b/README.md new file mode 100644 index 0000000000..64aba39c52 --- /dev/null +++ b/README.md @@ -0,0 +1,67 @@ +Symfony Standard Edition +======================== + +What's inside? +-------------- + +Symfony Standard Edition comes pre-configured with the following bundles: + + * FrameworkBundle + * SensioFrameworkExtraBundle + * DoctrineBundle + * TwigBundle + * SwiftmailerBundle + * ZendBundle + * AsseticBundle + * WebProfilerBundle (in dev/test env) + * SymfonyWebConfiguratorBundle (in dev/test env) + * AcmeDemoBundle (in dev/test env) + +Installation from an Archive +---------------------------- + +If you have downloaded an archive, unpack it somewhere under your web server +root directory. + +If you have downloaded an archive without the vendors, run the +`bin/vendors.sh` script (`git` must be installed on your machine). If you +don't have git, download the version with the vendors included. + +Installation from Git +--------------------- + +Run the following scripts: + + * `bin/vendors.sh` + * `bin/build_bootstrap.php` + * `app/console assets:install web/` + +Configuration +------------- + +Check that everything is working fine by going to the `config.php` page in a +browser and follow the instructions. + +The distribution is configured with the following defaults: + + * Twig is the only configured template engine; + * Doctrine ORM/DBAL is configured; + * Swiftmailer is configured; + * Annotations for everything are enabled. + +A default bundle, `AcmeDemoBundle`, shows you Symfony2 in action. It's only +available in the `dev` environment. After playing with it, you can remove it +by deleting the `src/Acme` directory and removing the routing entry in +`app/config/routing_dev.yml`. + +Configure the distribution by editing `app/config/parameters.ini` or by +accessing `/web/config.php` in a browser. + +A simple controller is configured at `/hello/{name}`. Access it via +`web/app_dev.php/_demo/hello/Fabien`. + +If you want to use the CLI, a console application is available at +`app/console`. Check first that your PHP is correctly configured for the CLI +by running `app/check.php`. + +Enjoy! From 7ca8bb70da06e3198a156934f48532d600c0c9a3 Mon Sep 17 00:00:00 2001 From: Fabien Potencier Date: Mon, 7 Mar 2011 14:04:55 +0100 Subject: [PATCH 004/899] tweaked README --- README.md | 3 +++ bin/build.sh | 2 +- 2 files changed, 4 insertions(+), 1 deletion(-) diff --git a/README.md b/README.md index 64aba39c52..b58483a09f 100644 --- a/README.md +++ b/README.md @@ -30,6 +30,9 @@ don't have git, download the version with the vendors included. Installation from Git --------------------- +We highly recommend you that you download the packaged version of this +distribution. If you still want to use Git, your are on your own. + Run the following scripts: * `bin/vendors.sh` diff --git a/bin/build.sh b/bin/build.sh index 7b495ec093..eb9560e6bc 100755 --- a/bin/build.sh +++ b/bin/build.sh @@ -17,7 +17,7 @@ mkdir /tmp/Symfony cp -r app /tmp/Symfony/ cp -r src /tmp/Symfony/ cp -r web /tmp/Symfony/ -cp -r README /tmp/Symfony/ +cp -r README.md /tmp/Symfony/ cp -r LICENSE /tmp/Symfony/ cp -r VERSION /tmp/Symfony/ cd /tmp/Symfony From d7f79facdd668da401073370f5b2fc26e67e3e23 Mon Sep 17 00:00:00 2001 From: Albert Jessurum Date: Mon, 7 Mar 2011 14:36:19 +0100 Subject: [PATCH 005/899] Fixed typo --- README.md | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/README.md b/README.md index b58483a09f..3c601a7704 100644 --- a/README.md +++ b/README.md @@ -42,7 +42,7 @@ Run the following scripts: Configuration ------------- -Check that everything is working fine by going to the `config.php` page in a +Check that everything is working fine by going to the `web/config.php` page in a browser and follow the instructions. The distribution is configured with the following defaults: From f9181ef9b0b8e6138f24b5914f1e5fba531cf23b Mon Sep 17 00:00:00 2001 From: Fabien Potencier Date: Mon, 7 Mar 2011 15:45:01 +0100 Subject: [PATCH 006/899] moved installation of the assets at the end of the vendoring process --- bin/vendors.sh | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/bin/vendors.sh b/bin/vendors.sh index 270ab7debc..0ba0f13fbf 100755 --- a/bin/vendors.sh +++ b/bin/vendors.sh @@ -44,9 +44,6 @@ install_git symfony git://github.com/symfony/symfony.git # Update the bootstrap files ../bin/build_bootstrap.php -# Update assets -../app/console assets:install ../web/ - # Doctrine ORM install_git doctrine git://github.com/doctrine/doctrine2.git 2.0.2 @@ -94,3 +91,6 @@ mkdir -p bundles/Symfony/Bundle cd bundles/Symfony/Bundle install_git WebConfiguratorBundle git://github.com/symfony/WebConfiguratorBundle.git cd ../../.. + +# Update assets +../app/console assets:install ../web/ From c5cc88bb30fceae902dc56cba419108fe23c8d11 Mon Sep 17 00:00:00 2001 From: Fabien Potencier Date: Mon, 7 Mar 2011 20:44:52 +0100 Subject: [PATCH 007/899] moved CLI test first in config.php --- web/config.php | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/web/config.php b/web/config.php index 52f8d31277..f22374fc0e 100644 --- a/web/config.php +++ b/web/config.php @@ -1,13 +1,13 @@ Date: Mon, 7 Mar 2011 21:02:12 +0100 Subject: [PATCH 008/899] fixed SQLite detection --- web/config.php | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/web/config.php b/web/config.php index f22374fc0e..3a63b01b9d 100644 --- a/web/config.php +++ b/web/config.php @@ -69,7 +69,7 @@ $minorProblems[] = 'Install and enable the intl extension.'; } -if (!function_exists('sqlite_open')) { +if (!function_exists('sqlite_open') && !in_array('sqlite', PDO::getAvailableDrivers())) { $majorProblems[] = 'Install and enable the SQLite or PDO_SQLite extension.'; } From d32f653d20b77a52866e6ed1ed4db6ec3c9fb7ef Mon Sep 17 00:00:00 2001 From: Fabien Potencier Date: Mon, 7 Mar 2011 21:03:09 +0100 Subject: [PATCH 009/899] added missing bin/ dir in archives --- bin/build.sh | 1 + 1 file changed, 1 insertion(+) diff --git a/bin/build.sh b/bin/build.sh index eb9560e6bc..b483b32e6d 100755 --- a/bin/build.sh +++ b/bin/build.sh @@ -15,6 +15,7 @@ $DIR/app/console assets:install web/ rm -rf /tmp/Symfony mkdir /tmp/Symfony cp -r app /tmp/Symfony/ +cp -r bin /tmp/Symfony/ cp -r src /tmp/Symfony/ cp -r web /tmp/Symfony/ cp -r README.md /tmp/Symfony/ From 28181cdd2268f060b976dbb750db3c34182cf496 Mon Sep 17 00:00:00 2001 From: Fabien Potencier Date: Tue, 8 Mar 2011 09:15:02 +0100 Subject: [PATCH 010/899] changed the search input to search type --- src/Acme/DemoBundle/Resources/public/css/demo.css | 6 +++++- src/Acme/DemoBundle/Resources/views/layout.html.twig | 2 +- 2 files changed, 6 insertions(+), 2 deletions(-) diff --git a/src/Acme/DemoBundle/Resources/public/css/demo.css b/src/Acme/DemoBundle/Resources/public/css/demo.css index d02f29a6ae..143031fbd6 100644 --- a/src/Acme/DemoBundle/Resources/public/css/demo.css +++ b/src/Acme/DemoBundle/Resources/public/css/demo.css @@ -127,11 +127,15 @@ ul li #symfony-search { position: absolute; - top: 50px; right: 30px; } +#symfony-search input[type="search"] +{ + -webkit-appearance: textfield; +} + #symfony-search-field { width: 190px; diff --git a/src/Acme/DemoBundle/Resources/views/layout.html.twig b/src/Acme/DemoBundle/Resources/views/layout.html.twig index 2cd9a904ca..1eb3cfd7c5 100644 --- a/src/Acme/DemoBundle/Resources/views/layout.html.twig +++ b/src/Acme/DemoBundle/Resources/views/layout.html.twig @@ -14,7 +14,7 @@ From 41500be4f390f7a39b7c884a9b6407d99d2d18cc Mon Sep 17 00:00:00 2001 From: Fabien Potencier Date: Wed, 9 Mar 2011 17:44:56 +0100 Subject: [PATCH 011/899] made the Demo bundle available in all envs --- README.md | 9 ++++----- app/config/routing.yml | 7 ++++++- app/config/routing_dev.yml | 5 ----- src/Acme/DemoBundle/Controller/WelcomeController.php | 6 +----- 4 files changed, 11 insertions(+), 16 deletions(-) diff --git a/README.md b/README.md index b58483a09f..a5b7868f0f 100644 --- a/README.md +++ b/README.md @@ -52,16 +52,15 @@ The distribution is configured with the following defaults: * Swiftmailer is configured; * Annotations for everything are enabled. -A default bundle, `AcmeDemoBundle`, shows you Symfony2 in action. It's only -available in the `dev` environment. After playing with it, you can remove it -by deleting the `src/Acme` directory and removing the routing entry in -`app/config/routing_dev.yml`. +A default bundle, `AcmeDemoBundle`, shows you Symfony2 in action. After +playing with it, you can remove it by deleting the `src/Acme` directory and +removing the routing entry in `app/config/routing.yml`. Configure the distribution by editing `app/config/parameters.ini` or by accessing `/web/config.php` in a browser. A simple controller is configured at `/hello/{name}`. Access it via -`web/app_dev.php/_demo/hello/Fabien`. +`web/app_dev.php/demo/hello/Fabien`. If you want to use the CLI, a console application is available at `app/console`. Check first that your PHP is correctly configured for the CLI diff --git a/app/config/routing.yml b/app/config/routing.yml index de2a408b4a..268d919256 100644 --- a/app/config/routing.yml +++ b/app/config/routing.yml @@ -1,3 +1,8 @@ _welcome: - resource: "@AcmeDemoBundle/Controller/WelcomeController.php" + pattern: / + defaults: { _controller: AcmeDemoBundle:Welcome:index } + +_demo: + resource: "@AcmeDemoBundle/Controller/DemoController.php" type: annotation + prefix: /demo diff --git a/app/config/routing_dev.yml b/app/config/routing_dev.yml index e4978b38ac..40c660f3ed 100644 --- a/app/config/routing_dev.yml +++ b/app/config/routing_dev.yml @@ -1,11 +1,6 @@ _main: resource: routing.yml -_demo: - resource: "@AcmeDemoBundle/Controller/DemoController.php" - type: annotation - prefix: /_demo - _assetic: resource: . type: assetic diff --git a/src/Acme/DemoBundle/Controller/WelcomeController.php b/src/Acme/DemoBundle/Controller/WelcomeController.php index b8c55bc8ca..0185aef04e 100644 --- a/src/Acme/DemoBundle/Controller/WelcomeController.php +++ b/src/Acme/DemoBundle/Controller/WelcomeController.php @@ -6,12 +6,8 @@ class WelcomeController extends Controller { - /** - * @extra:Route("/", name="_welcome") - * @extra:Template() - */ public function indexAction() { - return array(); + return $this->render('AcmeDemoBundle:Welcome:index.html.twig'); } } From cc70cb1c96e2939c2a3c609ddfc4217976996e12 Mon Sep 17 00:00:00 2001 From: Fabien Potencier Date: Wed, 9 Mar 2011 17:45:13 +0100 Subject: [PATCH 012/899] added .cache at the end of the bootstrap files to fix IDE problems --- app/console | 2 +- app/phpunit.xml.dist | 2 +- bin/build_bootstrap.php | 8 ++++---- web/app.php | 2 +- web/app_dev.php | 2 +- 5 files changed, 8 insertions(+), 8 deletions(-) diff --git a/app/console b/app/console index 2e40898bc3..32104712e5 100755 --- a/app/console +++ b/app/console @@ -1,7 +1,7 @@ #!/usr/bin/env php diff --git a/bin/build_bootstrap.php b/bin/build_bootstrap.php index 5c3b3bdbe8..70115ef104 100755 --- a/bin/build_bootstrap.php +++ b/bin/build_bootstrap.php @@ -19,7 +19,7 @@ $loader->registerNamespaces(array('Symfony' => __DIR__.'/../vendor/symfony/src')); $loader->register(); -$file = __DIR__.'/../app/bootstrap.php'; +$file = __DIR__.'/../app/bootstrap.php.cache'; if (file_exists($file)) { unlink($file); } @@ -50,11 +50,11 @@ 'Symfony\\Component\\ClassLoader\\MapFileClassLoader', 'Symfony\\Component\\Config\\ConfigCache', -), dirname($file), basename($file, '.php'), false); +), dirname($file), basename($file, '.php.cache'), false, false, '.php.cache'); file_put_contents($file, " Date: Wed, 9 Mar 2011 14:24:20 -0600 Subject: [PATCH 013/899] Fixed bad url in DemoControllerTest::testIndex --- src/Acme/DemoBundle/Tests/Controller/DemoControllerTest.php | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/src/Acme/DemoBundle/Tests/Controller/DemoControllerTest.php b/src/Acme/DemoBundle/Tests/Controller/DemoControllerTest.php index 0c115a67c6..7cb0238464 100644 --- a/src/Acme/DemoBundle/Tests/Controller/DemoControllerTest.php +++ b/src/Acme/DemoBundle/Tests/Controller/DemoControllerTest.php @@ -10,7 +10,7 @@ public function testIndex() { $client = $this->createClient(); - $crawler = $client->request('GET', '/_demo/hello/Fabien'); + $crawler = $client->request('GET', '/demo/hello/Fabien'); $this->assertTrue($crawler->filter('html:contains("Hello Fabien")')->count() > 0); } From 52ed8de3440839b570879f17e33915837827e436 Mon Sep 17 00:00:00 2001 From: Douglas Greenshields Date: Thu, 10 Mar 2011 16:47:46 +0000 Subject: [PATCH 014/899] fixed a couple of incorrect spellings on config web page --- web/config.php | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/web/config.php b/web/config.php index 3a63b01b9d..9eb067fd1e 100644 --- a/web/config.php +++ b/web/config.php @@ -132,13 +132,13 @@ -

Recommandations

+

Recommendations

Additionally, to To - enhance your Symfony experience, it’s recommended that you fixe the following : + enhance your Symfony experience, it’s recommended that you fix the following :

    From 9bb079df4f1213a9d66bf6b54f54f9615b540ba1 Mon Sep 17 00:00:00 2001 From: Kris Wallsmith Date: Fri, 11 Mar 2011 06:52:31 -0800 Subject: [PATCH 015/899] added missing .htaccess --- bin/.htaccess | 1 + 1 file changed, 1 insertion(+) create mode 100644 bin/.htaccess diff --git a/bin/.htaccess b/bin/.htaccess new file mode 100644 index 0000000000..3418e55a68 --- /dev/null +++ b/bin/.htaccess @@ -0,0 +1 @@ +deny from all \ No newline at end of file From f4520751aa205f6015008418e1f04e2ab61f583f Mon Sep 17 00:00:00 2001 From: Kris Wallsmith Date: Fri, 11 Mar 2011 07:40:19 -0800 Subject: [PATCH 016/899] removed unused vendors --- app/autoload.php | 20 ++++++++------------ bin/build.sh | 16 ---------------- bin/vendors.sh | 12 ------------ 3 files changed, 8 insertions(+), 40 deletions(-) diff --git a/app/autoload.php b/app/autoload.php index 3eefc81d7f..96eb83b96c 100644 --- a/app/autoload.php +++ b/app/autoload.php @@ -4,18 +4,14 @@ $loader = new UniversalClassLoader(); $loader->registerNamespaces(array( - 'Symfony' => array(__DIR__.'/../vendor/symfony/src', __DIR__.'/../vendor/bundles'), - 'Sensio' => __DIR__.'/../vendor/bundles', - 'Doctrine\\Common\\DataFixtures' => __DIR__.'/../vendor/doctrine-data-fixtures/lib', - 'Doctrine\\Common' => __DIR__.'/../vendor/doctrine-common/lib', - 'Doctrine\\DBAL\\Migrations' => __DIR__.'/../vendor/doctrine-migrations/lib', - 'Doctrine\\MongoDB' => __DIR__.'/../vendor/doctrine-mongodb/lib', - 'Doctrine\\ODM\\MongoDB' => __DIR__.'/../vendor/doctrine-mongodb-odm/lib', - 'Doctrine\\DBAL' => __DIR__.'/../vendor/doctrine-dbal/lib', - 'Doctrine' => __DIR__.'/../vendor/doctrine/lib', - 'Zend\\Log' => __DIR__.'/../vendor/zend-log', - 'Assetic' => __DIR__.'/../vendor/assetic/src', - 'Acme' => __DIR__.'/../src', + 'Symfony' => array(__DIR__.'/../vendor/symfony/src', __DIR__.'/../vendor/bundles'), + 'Sensio' => __DIR__.'/../vendor/bundles', + 'Doctrine\\Common' => __DIR__.'/../vendor/doctrine-common/lib', + 'Doctrine\\DBAL' => __DIR__.'/../vendor/doctrine-dbal/lib', + 'Doctrine' => __DIR__.'/../vendor/doctrine/lib', + 'Zend\\Log' => __DIR__.'/../vendor/zend-log', + 'Assetic' => __DIR__.'/../vendor/assetic/src', + 'Acme' => __DIR__.'/../src', )); $loader->registerPrefixes(array( 'Twig_Extensions_' => __DIR__.'/../vendor/twig-extensions/lib', diff --git a/bin/build.sh b/bin/build.sh index b483b32e6d..6e9f121cd6 100755 --- a/bin/build.sh +++ b/bin/build.sh @@ -62,22 +62,6 @@ cd $TARGET cd doctrine-common && rm -rf build* tests lib/vendor cd $TARGET -# Doctrine migrations -cd doctrine-migrations && rm -rf tests build* lib/vendor -cd $TARGET - -# Doctrine data fixtures -cd doctrine-data-fixtures && rm -rf tests README* lib/vendor -cd $TARGET - -# Doctrine MongoDB -cd doctrine-mongodb && rm -rf tests build* tools lib/vendor -cd $TARGET - -# Doctrine MongoDB ODM -cd doctrine-mongodb-odm && rm -rf tests build* tools phpunit.xml* build* bin README* lib/vendor -cd $TARGET - # Swiftmailer cd swiftmailer && rm -rf CHANGES README* build* docs notes test-suite tests create_pear_package.php package* cd $TARGET diff --git a/bin/vendors.sh b/bin/vendors.sh index 0ba0f13fbf..07351f63c0 100755 --- a/bin/vendors.sh +++ b/bin/vendors.sh @@ -47,24 +47,12 @@ install_git symfony git://github.com/symfony/symfony.git # Doctrine ORM install_git doctrine git://github.com/doctrine/doctrine2.git 2.0.2 -# Doctrine Data Fixtures Extension -install_git doctrine-data-fixtures git://github.com/doctrine/data-fixtures.git - # Doctrine DBAL install_git doctrine-dbal git://github.com/doctrine/dbal.git 2.0.2 # Doctrine Common install_git doctrine-common git://github.com/doctrine/common.git 2.0.1 -# Doctrine migrations -install_git doctrine-migrations git://github.com/doctrine/migrations.git - -# Doctrine MongoDB -install_git doctrine-mongodb git://github.com/doctrine/mongodb.git - -# Doctrine MongoDB -install_git doctrine-mongodb-odm git://github.com/doctrine/mongodb-odm.git 1.0.0BETA3 - # Swiftmailer install_git swiftmailer git://github.com/swiftmailer/swiftmailer.git origin/4.1 From 2fe5feb0d3d23fc3ce5910fe0f61a8f8f2f49820 Mon Sep 17 00:00:00 2001 From: Christophe Coevoet Date: Fri, 11 Mar 2011 16:49:40 +0100 Subject: [PATCH 017/899] Updated the configuration since the short syntax has been removed for Doctrine --- app/config/config.yml | 21 +++++++++++++-------- 1 file changed, 13 insertions(+), 8 deletions(-) diff --git a/app/config/config.yml b/app/config/config.yml index 7f996fd92d..595d4d109c 100644 --- a/app/config/config.yml +++ b/app/config/config.yml @@ -28,17 +28,22 @@ assetic: # Doctrine Configuration doctrine: dbal: - driver: %database_driver% - host: %database_host% - dbname: %database_name% - user: %database_user% - password: %database_password% - logging: %kernel.debug% + default_connection: default + connections: + default: + driver: %database_driver% + host: %database_host% + dbname: %database_name% + user: %database_user% + password: %database_password% orm: auto_generate_proxy_classes: %kernel.debug% - mappings: - AcmeDemoBundle: ~ + default_entity_manager: default + entity_managers: + default: + mappings: + AcmeDemoBundle: ~ # Swiftmailer Configuration swiftmailer: From 993930eaa54b5c0d5b93b9aafeedbee17cd1ae6b Mon Sep 17 00:00:00 2001 From: Fabien Potencier Date: Fri, 11 Mar 2011 16:56:11 +0100 Subject: [PATCH 018/899] made various small fixes --- bin/build.sh | 2 +- web/app.php | 3 ++- 2 files changed, 3 insertions(+), 2 deletions(-) diff --git a/bin/build.sh b/bin/build.sh index 6e9f121cd6..e99e6f03b4 100755 --- a/bin/build.sh +++ b/bin/build.sh @@ -67,7 +67,7 @@ cd swiftmailer && rm -rf CHANGES README* build* docs notes test-suite tests crea cd $TARGET # Symfony -cd symfony && rm -rf README phpunit.xml* tests *.sh vendor +cd symfony && rm -rf README.md phpunit.xml* tests *.sh vendor cd $TARGET # Twig diff --git a/web/app.php b/web/app.php index 24ea4984ab..dd7aca97d6 100644 --- a/web/app.php +++ b/web/app.php @@ -1,7 +1,8 @@ Date: Thu, 10 Mar 2011 21:09:33 +0000 Subject: [PATCH 019/899] Fixed some typos in the web config script. --- web/config.php | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/web/config.php b/web/config.php index 9eb067fd1e..16ebf73ea4 100644 --- a/web/config.php +++ b/web/config.php @@ -62,7 +62,7 @@ } if (!function_exists('posix_isatty')) { - $minorProblems[] = 'Install and enable the php_posix extension (used to colorized the CLI output).'; + $minorProblems[] = 'Install and enable the php_posix extension (used to colorize the CLI output).'; } if (!class_exists('Locale')) { From ce50c0dbee21ae3182b21e67032b30df4e330547 Mon Sep 17 00:00:00 2001 From: "Johannes M. Schmitt" Date: Mon, 14 Mar 2011 16:48:32 +0100 Subject: [PATCH 020/899] [Security] make it easier to get started --- app/AppKernel.php | 1 + app/config/config.yml | 1 + app/config/security.yml | 23 +++++++++++++++++++++++ 3 files changed, 25 insertions(+) create mode 100644 app/config/security.yml diff --git a/app/AppKernel.php b/app/AppKernel.php index 5d1f31a727..0659549531 100644 --- a/app/AppKernel.php +++ b/app/AppKernel.php @@ -9,6 +9,7 @@ public function registerBundles() { $bundles = array( new Symfony\Bundle\FrameworkBundle\FrameworkBundle(), +// new Symfony\Bundle\SecurityBundle\SecurityBundle(), new Symfony\Bundle\TwigBundle\TwigBundle(), new Symfony\Bundle\ZendBundle\ZendBundle(), new Symfony\Bundle\SwiftmailerBundle\SwiftmailerBundle(), diff --git a/app/config/config.yml b/app/config/config.yml index 595d4d109c..15bcb30320 100644 --- a/app/config/config.yml +++ b/app/config/config.yml @@ -1,5 +1,6 @@ imports: - { resource: parameters.ini } +# - { resource: security.yml } framework: charset: UTF-8 diff --git a/app/config/security.yml b/app/config/security.yml new file mode 100644 index 0000000000..00ab482af9 --- /dev/null +++ b/app/config/security.yml @@ -0,0 +1,23 @@ +security: + encoders: + Symfony\Component\Security\Core\User\User: plaintext + + providers: + in_memory: + users: + MyUser: { password: testing } + + firewalls: + profiler: + pattern: /_profiler.* + security: false + wdt: + pattern: /_wdt.* + security: false + default: + form_login: ~ + anonymous: ~ + logout: ~ + + access_control: + - { path: /login, roles: IS_AUTHENTICATED_ANONYMOUSLY, channel: https } From 7ce8e8f0d3fc021d59e2f37263122de1378d6559 Mon Sep 17 00:00:00 2001 From: "Johannes M. Schmitt" Date: Mon, 14 Mar 2011 18:07:50 +0100 Subject: [PATCH 021/899] [Security] adds SecurityExtraBundle --- app/AppKernel.php | 1 + app/autoload.php | 1 + bin/vendors.sh | 6 ++++++ 3 files changed, 8 insertions(+) diff --git a/app/AppKernel.php b/app/AppKernel.php index 0659549531..cb728b89e6 100644 --- a/app/AppKernel.php +++ b/app/AppKernel.php @@ -16,6 +16,7 @@ public function registerBundles() new Symfony\Bundle\DoctrineBundle\DoctrineBundle(), new Symfony\Bundle\AsseticBundle\AsseticBundle(), new Sensio\Bundle\FrameworkExtraBundle\SensioFrameworkExtraBundle(), +// new JMS\SecurityExtraBundle\JMSSecurityExtraBundle(), ); if (in_array($this->getEnvironment(), array('dev', 'test'))) { diff --git a/app/autoload.php b/app/autoload.php index 96eb83b96c..37044954ad 100644 --- a/app/autoload.php +++ b/app/autoload.php @@ -6,6 +6,7 @@ $loader->registerNamespaces(array( 'Symfony' => array(__DIR__.'/../vendor/symfony/src', __DIR__.'/../vendor/bundles'), 'Sensio' => __DIR__.'/../vendor/bundles', + 'JMS' => __DIR__.'/../vendor/bundles', 'Doctrine\\Common' => __DIR__.'/../vendor/doctrine-common/lib', 'Doctrine\\DBAL' => __DIR__.'/../vendor/doctrine-dbal/lib', 'Doctrine' => __DIR__.'/../vendor/doctrine/lib', diff --git a/bin/vendors.sh b/bin/vendors.sh index 07351f63c0..fc9a51be5f 100755 --- a/bin/vendors.sh +++ b/bin/vendors.sh @@ -74,6 +74,12 @@ cd bundles/Sensio/Bundle install_git FrameworkExtraBundle git://github.com/sensio/FrameworkExtraBundle.git cd ../../.. +# SecurityExtraBundle +mkdir -p bundles/JMS +cd bundles/JMS +install_git SecurityExtraBundle git://github.com/schmittjoh/SecurityExtraBundle.git +cd ../.. + # WebConfiguratorBundle mkdir -p bundles/Symfony/Bundle cd bundles/Symfony/Bundle From 1352505bf26b3392eea856bcb8bf0f8f50b37696 Mon Sep 17 00:00:00 2001 From: Fabien Potencier Date: Tue, 15 Mar 2011 09:10:08 +0100 Subject: [PATCH 022/899] added an option to only get the latest version of all vendors to vendors.sh --- bin/vendors.sh | 10 ++++++++-- 1 file changed, 8 insertions(+), 2 deletions(-) diff --git a/bin/vendors.sh b/bin/vendors.sh index 07351f63c0..8b8aba81fe 100755 --- a/bin/vendors.sh +++ b/bin/vendors.sh @@ -4,10 +4,16 @@ DIR=`php -r "echo realpath(dirname(\\$_SERVER['argv'][0]));"` VENDOR=$DIR/vendor # initialization -if [ "$1" = "--reinstall" ]; then +if [ "$1" = "--reinstall" -o "$2" = "--reinstall" ]; then rm -rf $VENDOR fi +# just the latest revision +CLONE_OPTIONS='' +if [ "$1" = "--min" -o "$2" = "--min" ]; then + CLONE_OPTIONS='--depth 1' +fi + mkdir -p $VENDOR && cd $VENDOR ## @@ -26,7 +32,7 @@ install_git() fi if [ ! -d $INSTALL_DIR ]; then - git clone $SOURCE_URL $INSTALL_DIR + git clone $CLONE_OPTIONS $SOURCE_URL $INSTALL_DIR fi cd $INSTALL_DIR From 5bfe8ac9b16d6d2eeba6c2b188c1dd94d5f91789 Mon Sep 17 00:00:00 2001 From: Fabien Potencier Date: Tue, 15 Mar 2011 09:13:03 +0100 Subject: [PATCH 023/899] made small changes to README --- README.md | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/README.md b/README.md index a5b7868f0f..c046aad506 100644 --- a/README.md +++ b/README.md @@ -35,7 +35,7 @@ distribution. If you still want to use Git, your are on your own. Run the following scripts: - * `bin/vendors.sh` + * `bin/vendors.sh` (use `--min` if you don't want all the history) * `bin/build_bootstrap.php` * `app/console assets:install web/` @@ -57,7 +57,7 @@ playing with it, you can remove it by deleting the `src/Acme` directory and removing the routing entry in `app/config/routing.yml`. Configure the distribution by editing `app/config/parameters.ini` or by -accessing `/web/config.php` in a browser. +accessing `web/config.php` in a browser. A simple controller is configured at `/hello/{name}`. Access it via `web/app_dev.php/demo/hello/Fabien`. From bde51b98394a9abb32b26ddcc31b376deea1f680 Mon Sep 17 00:00:00 2001 From: Fabien Potencier Date: Tue, 15 Mar 2011 09:18:54 +0100 Subject: [PATCH 024/899] changed vendors.sh to use tags instead of HEAD --- VERSION | 2 +- bin/vendors.sh | 5 +++-- 2 files changed, 4 insertions(+), 3 deletions(-) diff --git a/VERSION b/VERSION index d10b077780..42b00d24c4 100644 --- a/VERSION +++ b/VERSION @@ -1 +1 @@ -2.0.0PR7 \ No newline at end of file +2.0.0PR8 \ No newline at end of file diff --git a/bin/vendors.sh b/bin/vendors.sh index 8b8aba81fe..d0f9bfbb68 100755 --- a/bin/vendors.sh +++ b/bin/vendors.sh @@ -2,6 +2,7 @@ DIR=`php -r "echo realpath(dirname(\\$_SERVER['argv'][0]));"` VENDOR=$DIR/vendor +VERSION=`cat $DIR/VERSION` # initialization if [ "$1" = "--reinstall" -o "$2" = "--reinstall" ]; then @@ -42,10 +43,10 @@ install_git() } # Assetic -install_git assetic git://github.com/kriswallsmith/assetic.git +install_git assetic git://github.com/kriswallsmith/assetic.git v1.0.0alpha1 # Symfony -install_git symfony git://github.com/symfony/symfony.git +install_git symfony git://github.com/symfony/symfony.git $VERSION # Update the bootstrap files ../bin/build_bootstrap.php From 91c1244b0cd7ffb2c94b4279da17f062bf490684 Mon Sep 17 00:00:00 2001 From: Fabien Potencier Date: Tue, 15 Mar 2011 18:27:47 +0100 Subject: [PATCH 025/899] fixed typo in security.yml --- app/config/security.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/app/config/security.yml b/app/config/security.yml index 00ab482af9..c759642a3c 100644 --- a/app/config/security.yml +++ b/app/config/security.yml @@ -20,4 +20,4 @@ security: logout: ~ access_control: - - { path: /login, roles: IS_AUTHENTICATED_ANONYMOUSLY, channel: https } + - { path: /login, roles: IS_AUTHENTICATED_ANONYMOUSLY, requires_channel: https } From 9bd3a7d7718e2faf5d2405076a6dcf7bcf3811e3 Mon Sep 17 00:00:00 2001 From: Toni Uebernickel Date: Tue, 15 Mar 2011 19:34:57 +0100 Subject: [PATCH 026/899] fixed vendors shell to work in paths with spaces --- bin/vendors.sh | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/bin/vendors.sh b/bin/vendors.sh index d0f9bfbb68..a2244c8dfb 100755 --- a/bin/vendors.sh +++ b/bin/vendors.sh @@ -1,8 +1,8 @@ #!/bin/sh DIR=`php -r "echo realpath(dirname(\\$_SERVER['argv'][0]));"` -VENDOR=$DIR/vendor -VERSION=`cat $DIR/VERSION` +VENDOR="$DIR/vendor" +VERSION=`cat "$DIR/VERSION"` # initialization if [ "$1" = "--reinstall" -o "$2" = "--reinstall" ]; then @@ -15,7 +15,7 @@ if [ "$1" = "--min" -o "$2" = "--min" ]; then CLONE_OPTIONS='--depth 1' fi -mkdir -p $VENDOR && cd $VENDOR +mkdir -p "$VENDOR" && cd "$VENDOR" ## # @param destination directory (e.g. "doctrine") From c0cf7534fb656eabb9367f5c7e670ad53149a385 Mon Sep 17 00:00:00 2001 From: Fabien Potencier Date: Tue, 15 Mar 2011 22:08:52 +0100 Subject: [PATCH 027/899] tweaked security.yml --- app/config/security.yml | 22 ++++++++++++++-------- 1 file changed, 14 insertions(+), 8 deletions(-) diff --git a/app/config/security.yml b/app/config/security.yml index c759642a3c..4dab4db87d 100644 --- a/app/config/security.yml +++ b/app/config/security.yml @@ -1,23 +1,29 @@ security: encoders: Symfony\Component\Security\Core\User\User: plaintext - + providers: in_memory: users: - MyUser: { password: testing } - + admin: { password: pa$$word, roles: [ 'ROLE_USER' ] } + firewalls: profiler: - pattern: /_profiler.* + pattern: /_profiler.* security: false + wdt: - pattern: /_wdt.* + pattern: /_wdt.* security: false + + login: + pattern: /login + security: false + default: form_login: ~ - anonymous: ~ - logout: ~ - + anonymous: ~ + logout: ~ + access_control: - { path: /login, roles: IS_AUTHENTICATED_ANONYMOUSLY, requires_channel: https } From 74d773f5af04c6fcabc74d7d5da3d2c5a6a75150 Mon Sep 17 00:00:00 2001 From: Fabien Potencier Date: Wed, 16 Mar 2011 08:21:51 +0100 Subject: [PATCH 028/899] fixed the demo main URL (/demo instead of /demo/demo) --- src/Acme/DemoBundle/Controller/DemoController.php | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/src/Acme/DemoBundle/Controller/DemoController.php b/src/Acme/DemoBundle/Controller/DemoController.php index 3f5a7c2d56..092a93912c 100644 --- a/src/Acme/DemoBundle/Controller/DemoController.php +++ b/src/Acme/DemoBundle/Controller/DemoController.php @@ -9,7 +9,7 @@ class DemoController extends Controller { /** - * @extra:Route("/demo", name="_demo") + * @extra:Route("/", name="_demo") * @extra:Template() */ public function indexAction() From 3e9fda56df2cdd3b039f189693ab7844fbb2d4f6 Mon Sep 17 00:00:00 2001 From: Fabien Potencier Date: Wed, 16 Mar 2011 09:33:05 +0100 Subject: [PATCH 029/899] made security active by default, added some working examples in the demo --- app/AppKernel.php | 2 +- app/config/config.yml | 2 +- app/config/routing.yml | 4 ++ app/config/security.yml | 21 ++++--- .../Controller/SecuredController.php | 55 +++++++++++++++++++ .../DemoBundle/Resources/public/css/demo.css | 28 +++++++++- .../Resources/views/Demo/contact.html.twig | 2 +- .../Resources/views/Demo/hello.html.twig | 8 +-- .../Resources/views/Demo/index.html.twig | 11 ++-- .../Resources/views/Secured/hello.html.twig | 9 +++ .../Resources/views/Secured/layout.html.twig | 6 ++ .../Resources/views/Secured/login.html.twig | 25 +++++++++ .../Resources/views/Welcome/index.html.twig | 4 +- .../Resources/views/layout.html.twig | 10 ++++ 14 files changed, 164 insertions(+), 23 deletions(-) create mode 100644 src/Acme/DemoBundle/Controller/SecuredController.php create mode 100644 src/Acme/DemoBundle/Resources/views/Secured/hello.html.twig create mode 100644 src/Acme/DemoBundle/Resources/views/Secured/layout.html.twig create mode 100644 src/Acme/DemoBundle/Resources/views/Secured/login.html.twig diff --git a/app/AppKernel.php b/app/AppKernel.php index 0659549531..155574f8ae 100644 --- a/app/AppKernel.php +++ b/app/AppKernel.php @@ -9,7 +9,7 @@ public function registerBundles() { $bundles = array( new Symfony\Bundle\FrameworkBundle\FrameworkBundle(), -// new Symfony\Bundle\SecurityBundle\SecurityBundle(), + new Symfony\Bundle\SecurityBundle\SecurityBundle(), new Symfony\Bundle\TwigBundle\TwigBundle(), new Symfony\Bundle\ZendBundle\ZendBundle(), new Symfony\Bundle\SwiftmailerBundle\SwiftmailerBundle(), diff --git a/app/config/config.yml b/app/config/config.yml index 15bcb30320..a565fd6535 100644 --- a/app/config/config.yml +++ b/app/config/config.yml @@ -1,6 +1,6 @@ imports: - { resource: parameters.ini } -# - { resource: security.yml } + - { resource: security.yml } framework: charset: UTF-8 diff --git a/app/config/routing.yml b/app/config/routing.yml index 268d919256..f95dc84b90 100644 --- a/app/config/routing.yml +++ b/app/config/routing.yml @@ -2,6 +2,10 @@ _welcome: pattern: / defaults: { _controller: AcmeDemoBundle:Welcome:index } +_demo_secured: + resource: "@AcmeDemoBundle/Controller/SecuredController.php" + type: annotation + _demo: resource: "@AcmeDemoBundle/Controller/DemoController.php" type: annotation diff --git a/app/config/security.yml b/app/config/security.yml index 4dab4db87d..54f389f50d 100644 --- a/app/config/security.yml +++ b/app/config/security.yml @@ -5,7 +5,7 @@ security: providers: in_memory: users: - admin: { password: pa$$word, roles: [ 'ROLE_USER' ] } + admin: { password: pass, roles: [ 'ROLE_USER' ] } firewalls: profiler: @@ -17,13 +17,20 @@ security: security: false login: - pattern: /login + pattern: /demo/secured/login security: false - default: - form_login: ~ - anonymous: ~ - logout: ~ + secured_area: + pattern: /demo/secured/.* + form_login: + check_path: /demo/secured/login_check + login_path: /demo/secured/login + logout: + path: /demo/secured/logout + target: /demo/ + #anonymous: ~ + #http_basic: + # realm: "Secured Demo Area" access_control: - - { path: /login, roles: IS_AUTHENTICATED_ANONYMOUSLY, requires_channel: https } + #- { path: /login, roles: IS_AUTHENTICATED_ANONYMOUSLY, requires_channel: https } diff --git a/src/Acme/DemoBundle/Controller/SecuredController.php b/src/Acme/DemoBundle/Controller/SecuredController.php new file mode 100644 index 0000000000..c3dc48e383 --- /dev/null +++ b/src/Acme/DemoBundle/Controller/SecuredController.php @@ -0,0 +1,55 @@ +get('request')->attributes->has(SecurityContext::AUTHENTICATION_ERROR)) { + $error = $this->get('request')->attributes->get(SecurityContext::AUTHENTICATION_ERROR); + } else { + $error = $this->get('request')->getSession()->get(SecurityContext::AUTHENTICATION_ERROR); + } + + return array( + 'last_username' => $this->get('request')->getSession()->get(SecurityContext::LAST_USERNAME), + 'error' => $error, + ); + } + + /** + * @extra:Route("/login_check", name="_security_check") + */ + public function securityCheckAction() + { + // The security layer will intercept this request + } + + /** + * @extra:Route("/logout", name="_demo_logout") + */ + public function logoutAction() + { + // The security layer will intercept this request + } + + /** + * @extra:Route("/hello/{name}", name="_demo_secured_hello") + * @extra:Template() + */ + public function helloAction($name) + { + return array('name' => $name); + } +} diff --git a/src/Acme/DemoBundle/Resources/public/css/demo.css b/src/Acme/DemoBundle/Resources/public/css/demo.css index 143031fbd6..0e5a289deb 100644 --- a/src/Acme/DemoBundle/Resources/public/css/demo.css +++ b/src/Acme/DemoBundle/Resources/public/css/demo.css @@ -155,7 +155,7 @@ ul li display: none; } -input[type=text] +input[type=text], input[type=password] { border: 1px solid #DADADA; background: white url(../images/field-background.gif) repeat-x left top; @@ -264,3 +264,29 @@ input[type=text] margin-top: 15px; background-color: #ffe; } + +.error +{ + color: red; +} + +#login label +{ + display: block; + float: left; + width: 90px; +} + +ul#menu +{ + float: right; + margin-bottom: 20px; + padding-left: 0; +} + +#menu li +{ + padding-left: 0; + margin-right: 10px; + display: inline; +} diff --git a/src/Acme/DemoBundle/Resources/views/Demo/contact.html.twig b/src/Acme/DemoBundle/Resources/views/Demo/contact.html.twig index 8a55cfd60b..89a4b36c56 100644 --- a/src/Acme/DemoBundle/Resources/views/Demo/contact.html.twig +++ b/src/Acme/DemoBundle/Resources/views/Demo/contact.html.twig @@ -1,6 +1,6 @@ {% extends "AcmeDemoBundle::layout.html.twig" %} -{% block title %}Symfony - Contact form{% endblock %} +{% block title "Symfony - Contact form" %} {% block content %}
    diff --git a/src/Acme/DemoBundle/Resources/views/Demo/hello.html.twig b/src/Acme/DemoBundle/Resources/views/Demo/hello.html.twig index 46f4cb7841..3997ff606a 100644 --- a/src/Acme/DemoBundle/Resources/views/Demo/hello.html.twig +++ b/src/Acme/DemoBundle/Resources/views/Demo/hello.html.twig @@ -1,11 +1,9 @@ {% extends "AcmeDemoBundle::layout.html.twig" %} -{% block content %} - {{ parent() }} +{% block title "Hello " ~ name %} -

    - Hello {{ name }}! -

    +{% block content %} +

    Hello {{ name }}!

    {% endblock %} {% set code = code(_self) %} diff --git a/src/Acme/DemoBundle/Resources/views/Demo/index.html.twig b/src/Acme/DemoBundle/Resources/views/Demo/index.html.twig index 8934c092b0..fc4f9fbd9d 100644 --- a/src/Acme/DemoBundle/Resources/views/Demo/index.html.twig +++ b/src/Acme/DemoBundle/Resources/views/Demo/index.html.twig @@ -1,15 +1,14 @@ {% extends "AcmeDemoBundle::layout.html.twig" %} -{% block title %}Symfony - Demos{% endblock %} +{% block title "Symfony - Demos" %} + +{% block content_header '' %} {% block content %}

    Available demos

    - -

    Symfony is under development, more demos will soon be available...

    {% endblock %} diff --git a/src/Acme/DemoBundle/Resources/views/Secured/hello.html.twig b/src/Acme/DemoBundle/Resources/views/Secured/hello.html.twig new file mode 100644 index 0000000000..263ad8db0c --- /dev/null +++ b/src/Acme/DemoBundle/Resources/views/Secured/hello.html.twig @@ -0,0 +1,9 @@ +{% extends "AcmeDemoBundle:Secured:layout.html.twig" %} + +{% block title "Hello " ~ name %} + +{% block content %} +

    Hello {{ name }}!

    +{% endblock %} + +{% set code = code(_self) %} diff --git a/src/Acme/DemoBundle/Resources/views/Secured/layout.html.twig b/src/Acme/DemoBundle/Resources/views/Secured/layout.html.twig new file mode 100644 index 0000000000..18f4418db3 --- /dev/null +++ b/src/Acme/DemoBundle/Resources/views/Secured/layout.html.twig @@ -0,0 +1,6 @@ +{% extends "AcmeDemoBundle::layout.html.twig" %} + +{% block content_header_more %} + {{ parent() }} +
  1. logged in as {{ app.user ? app.user.username : 'Anonymous' }} - Logout
    2. +{% endblock %} diff --git a/src/Acme/DemoBundle/Resources/views/Secured/login.html.twig b/src/Acme/DemoBundle/Resources/views/Secured/login.html.twig new file mode 100644 index 0000000000..30c3b9dd8b --- /dev/null +++ b/src/Acme/DemoBundle/Resources/views/Secured/login.html.twig @@ -0,0 +1,25 @@ +{% extends 'AcmeDemoBundle::layout.html.twig' %} + +{% block content %} +

    Login

    + + {% if error %} +
    {{ error.message }}
    + {% endif %} + + +
    + + +
    + +
    + + +
    + + +
    +{% endblock %} + +{% set code = code(_self) %} diff --git a/src/Acme/DemoBundle/Resources/views/Welcome/index.html.twig b/src/Acme/DemoBundle/Resources/views/Welcome/index.html.twig index d3ed7147da..ff280ca1bb 100644 --- a/src/Acme/DemoBundle/Resources/views/Welcome/index.html.twig +++ b/src/Acme/DemoBundle/Resources/views/Welcome/index.html.twig @@ -2,9 +2,11 @@ {% block title %}Symfony - Welcome{% endblock %} +{% block content_header '' %} + {% block content %} +

    Welcome!

    -

    Welcome!

    Congratulations! You have successfully installed a new Symfony application.

    diff --git a/src/Acme/DemoBundle/Resources/views/layout.html.twig b/src/Acme/DemoBundle/Resources/views/layout.html.twig index 1eb3cfd7c5..67f4554eea 100644 --- a/src/Acme/DemoBundle/Resources/views/layout.html.twig +++ b/src/Acme/DemoBundle/Resources/views/layout.html.twig @@ -26,6 +26,16 @@ {% endif %}
    + {% block content_header %} + + +
    + {% endblock %} + {% block content %} {% endblock %}
    From 6a7dd089e6e3deccf1715654d11e8571b41fed8a Mon Sep 17 00:00:00 2001 From: Fabien Potencier Date: Wed, 16 Mar 2011 14:02:51 +0100 Subject: [PATCH 030/899] fixed old code --- src/Acme/DemoBundle/Twig/Extension/DemoExtension.php | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/src/Acme/DemoBundle/Twig/Extension/DemoExtension.php b/src/Acme/DemoBundle/Twig/Extension/DemoExtension.php index ae2726c1f7..29fee3104d 100644 --- a/src/Acme/DemoBundle/Twig/Extension/DemoExtension.php +++ b/src/Acme/DemoBundle/Twig/Extension/DemoExtension.php @@ -36,7 +36,7 @@ public function getCode($template) $template = htmlspecialchars($this->getTemplateCode($template), ENT_QUOTES, 'UTF-8'); // remove the code block - $template = str_replace('{% block code %}{{ code(_self) }}{% endblock %}', '', $template); + $template = str_replace('{% set code = code(_self) %}', '', $template); return <<Controller Code

    From c01664ade5097b05b8045beee884a83e857985aa Mon Sep 17 00:00:00 2001 From: Fabien Potencier Date: Wed, 16 Mar 2011 14:03:51 +0100 Subject: [PATCH 031/899] tweaked HTML/CSS --- app/config/security.yml | 3 ++- .../DemoBundle/Resources/public/css/demo.css | 2 +- .../Resources/views/Demo/index.html.twig | 2 +- .../Resources/views/Secured/layout.html.twig | 2 +- .../Resources/views/Secured/login.html.twig | 4 ++++ .../Resources/views/layout.html.twig | 18 +++++++++--------- 6 files changed, 18 insertions(+), 13 deletions(-) diff --git a/app/config/security.yml b/app/config/security.yml index 54f389f50d..f7a0c6bea8 100644 --- a/app/config/security.yml +++ b/app/config/security.yml @@ -5,7 +5,8 @@ security: providers: in_memory: users: - admin: { password: pass, roles: [ 'ROLE_USER' ] } + user: { password: userpass, roles: [ 'ROLE_USER' ] } + admin: { password: adminpass, roles: [ 'ROLE_ADMIN' ] } firewalls: profiler: diff --git a/src/Acme/DemoBundle/Resources/public/css/demo.css b/src/Acme/DemoBundle/Resources/public/css/demo.css index 0e5a289deb..6fce8c3124 100644 --- a/src/Acme/DemoBundle/Resources/public/css/demo.css +++ b/src/Acme/DemoBundle/Resources/public/css/demo.css @@ -75,7 +75,7 @@ p padding-bottom: 20px; } -ul a +ul#demo-list a { background: url(../images/blue-arrow.png) no-repeat right 6px; padding-right: 10px; diff --git a/src/Acme/DemoBundle/Resources/views/Demo/index.html.twig b/src/Acme/DemoBundle/Resources/views/Demo/index.html.twig index fc4f9fbd9d..82e65e6503 100644 --- a/src/Acme/DemoBundle/Resources/views/Demo/index.html.twig +++ b/src/Acme/DemoBundle/Resources/views/Demo/index.html.twig @@ -6,7 +6,7 @@ {% block content %}

    Available demos

    -
      +
      • Hello World
      • Access the secured area    Go to the login page
        • {#
      • Send a Message
        • #} diff --git a/src/Acme/DemoBundle/Resources/views/Secured/layout.html.twig b/src/Acme/DemoBundle/Resources/views/Secured/layout.html.twig index 18f4418db3..aeea55c5cf 100644 --- a/src/Acme/DemoBundle/Resources/views/Secured/layout.html.twig +++ b/src/Acme/DemoBundle/Resources/views/Secured/layout.html.twig @@ -2,5 +2,5 @@ {% block content_header_more %} {{ parent() }} -
      • logged in as {{ app.user ? app.user.username : 'Anonymous' }} - Logout
        • +
      • logged in as {{ app.user ? app.user.username : 'Anonymous' }} - Logout
        • {% endblock %} diff --git a/src/Acme/DemoBundle/Resources/views/Secured/login.html.twig b/src/Acme/DemoBundle/Resources/views/Secured/login.html.twig index 30c3b9dd8b..005175dc8b 100644 --- a/src/Acme/DemoBundle/Resources/views/Secured/login.html.twig +++ b/src/Acme/DemoBundle/Resources/views/Secured/login.html.twig @@ -3,6 +3,10 @@ {% block content %}

        Login

        +

        + Choose between two default users: user/userpass (ROLE_USER) or admin/adminpass (ROLE_ADMIN) +

        + {% if error %}
        {{ error.message }}
        {% endif %} diff --git a/src/Acme/DemoBundle/Resources/views/layout.html.twig b/src/Acme/DemoBundle/Resources/views/layout.html.twig index 67f4554eea..e367ab89bb 100644 --- a/src/Acme/DemoBundle/Resources/views/layout.html.twig +++ b/src/Acme/DemoBundle/Resources/views/layout.html.twig @@ -25,17 +25,17 @@
    {% endif %} -
    - {% block content_header %} - + {% block content_header %} + -
    - {% endblock %} +
    + {% endblock %} +
    {% block content %} {% endblock %}
    From 1b3873718d84b1e22440e88ca9dca0797d8957de Mon Sep 17 00:00:00 2001 From: Christophe Coevoet Date: Wed, 16 Mar 2011 17:11:39 +0100 Subject: [PATCH 032/899] Fixed typo --- web/config.php | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/web/config.php b/web/config.php index 16ebf73ea4..f90683e8e0 100644 --- a/web/config.php +++ b/web/config.php @@ -117,7 +117,7 @@

    Welcome!

    Welcome to your new Symfony project.

    -

    This script will guide you through the basic configuration of your project. You can also do the same by editing the ‘app/parameters.ini’ file directly.

    +

    This script will guide you through the basic configuration of your project. You can also do the same by editing the ‘app/config/parameters.ini’ file directly.

    From a3d8285b390aa844fe38c1c96d83611f390cd29a Mon Sep 17 00:00:00 2001 From: jstout24 Date: Tue, 15 Mar 2011 19:50:27 -0700 Subject: [PATCH 033/899] Moved main routing to bottom to so that custom routes wouldn't overlap dev routes ie. /_wdt/token matches /{state}/{city} so /{state}/{city} route would be called instead of the profiler --- app/config/routing_dev.yml | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/app/config/routing_dev.yml b/app/config/routing_dev.yml index 40c660f3ed..e806f76fa7 100644 --- a/app/config/routing_dev.yml +++ b/app/config/routing_dev.yml @@ -1,6 +1,3 @@ -_main: - resource: routing.yml - _assetic: resource: . type: assetic @@ -16,3 +13,6 @@ _profiler: _configurator: resource: "@SymfonyWebConfiguratorBundle/Resources/config/routing/configurator.xml" prefix: /_configurator + +_main: + resource: routing.yml \ No newline at end of file From ff33617d05ab44849fc42949f18f7f530fefc388 Mon Sep 17 00:00:00 2001 From: Fabien Potencier Date: Wed, 16 Mar 2011 21:58:38 +0100 Subject: [PATCH 034/899] updated to the latest --- app/AppKernel.php | 5 ----- 1 file changed, 5 deletions(-) diff --git a/app/AppKernel.php b/app/AppKernel.php index 155574f8ae..af27b40949 100644 --- a/app/AppKernel.php +++ b/app/AppKernel.php @@ -31,9 +31,4 @@ public function registerContainerConfiguration(LoaderInterface $loader) { $loader->load(__DIR__.'/config/config_'.$this->getEnvironment().'.yml'); } - - public function registerRootDir() - { - return __DIR__; - } } From 3a7630189f7cd84914427b17c9af3ba43d608a33 Mon Sep 17 00:00:00 2001 From: Fabien Potencier Date: Thu, 17 Mar 2011 08:15:16 +0100 Subject: [PATCH 035/899] added logging configuration for swiftmailer --- app/config/config.yml | 2 ++ 1 file changed, 2 insertions(+) diff --git a/app/config/config.yml b/app/config/config.yml index a565fd6535..a01bc4cd89 100644 --- a/app/config/config.yml +++ b/app/config/config.yml @@ -52,3 +52,5 @@ swiftmailer: host: %mailer_host% username: %mailer_user% password: %mailer_password% + logging: %kernel.debug% + From 95ba2a4f2fa071b6628690b7506327a695da7052 Mon Sep 17 00:00:00 2001 From: Fabien Potencier Date: Thu, 17 Mar 2011 11:42:10 +0100 Subject: [PATCH 036/899] added support and a small example for the @extra:Secure annotation --- app/AppKernel.php | 2 +- app/config/config.yml | 3 +++ src/Acme/DemoBundle/Controller/SecuredController.php | 10 ++++++++++ .../DemoBundle/Resources/views/Secured/hello.html.twig | 2 ++ .../Resources/views/Secured/helloadmin.html.twig | 9 +++++++++ 5 files changed, 25 insertions(+), 1 deletion(-) create mode 100644 src/Acme/DemoBundle/Resources/views/Secured/helloadmin.html.twig diff --git a/app/AppKernel.php b/app/AppKernel.php index fd4c8f37fb..78a71b3cd8 100644 --- a/app/AppKernel.php +++ b/app/AppKernel.php @@ -16,7 +16,7 @@ public function registerBundles() new Symfony\Bundle\DoctrineBundle\DoctrineBundle(), new Symfony\Bundle\AsseticBundle\AsseticBundle(), new Sensio\Bundle\FrameworkExtraBundle\SensioFrameworkExtraBundle(), -// new JMS\SecurityExtraBundle\JMSSecurityExtraBundle(), + new JMS\SecurityExtraBundle\JMSSecurityExtraBundle(), ); if (in_array($this->getEnvironment(), array('dev', 'test'))) { diff --git a/app/config/config.yml b/app/config/config.yml index a01bc4cd89..df4bbee61e 100644 --- a/app/config/config.yml +++ b/app/config/config.yml @@ -54,3 +54,6 @@ swiftmailer: password: %mailer_password% logging: %kernel.debug% +jms_security_extra: + secure_controllers: true + secure_all_services: false diff --git a/src/Acme/DemoBundle/Controller/SecuredController.php b/src/Acme/DemoBundle/Controller/SecuredController.php index c3dc48e383..9ccd62ab07 100644 --- a/src/Acme/DemoBundle/Controller/SecuredController.php +++ b/src/Acme/DemoBundle/Controller/SecuredController.php @@ -52,4 +52,14 @@ public function helloAction($name) { return array('name' => $name); } + + /** + * @extra:Route("/hello/admin/{name}", name="_demo_secured_hello_admin") + * @extra:Secure(roles="ROLE_ADMIN") + * @extra:Template() + */ + public function helloAdminAction($name) + { + return array('name' => $name); + } } diff --git a/src/Acme/DemoBundle/Resources/views/Secured/hello.html.twig b/src/Acme/DemoBundle/Resources/views/Secured/hello.html.twig index 263ad8db0c..c8da283832 100644 --- a/src/Acme/DemoBundle/Resources/views/Secured/hello.html.twig +++ b/src/Acme/DemoBundle/Resources/views/Secured/hello.html.twig @@ -4,6 +4,8 @@ {% block content %}

    Hello {{ name }}!

    + + Hello resource secured for admin only. {% endblock %} {% set code = code(_self) %} diff --git a/src/Acme/DemoBundle/Resources/views/Secured/helloadmin.html.twig b/src/Acme/DemoBundle/Resources/views/Secured/helloadmin.html.twig new file mode 100644 index 0000000000..425213ee56 --- /dev/null +++ b/src/Acme/DemoBundle/Resources/views/Secured/helloadmin.html.twig @@ -0,0 +1,9 @@ +{% extends "AcmeDemoBundle:Secured:layout.html.twig" %} + +{% block title "Hello " ~ name %} + +{% block content %} +

    Hello {{ name }} secured for Admins only!

    +{% endblock %} + +{% set code = code(_self) %} From b8792d89c46cbb1cd063ff84f55620367d579e0b Mon Sep 17 00:00:00 2001 From: Fabien Potencier Date: Thu, 17 Mar 2011 14:26:30 +0100 Subject: [PATCH 037/899] removed unneeded configuration line --- app/config/config.yml | 9 ++++----- 1 file changed, 4 insertions(+), 5 deletions(-) diff --git a/app/config/config.yml b/app/config/config.yml index df4bbee61e..5f3ac48877 100644 --- a/app/config/config.yml +++ b/app/config/config.yml @@ -48,11 +48,10 @@ doctrine: # Swiftmailer Configuration swiftmailer: - transport: %mailer_transport% - host: %mailer_host% - username: %mailer_user% - password: %mailer_password% - logging: %kernel.debug% + transport: %mailer_transport% + host: %mailer_host% + username: %mailer_user% + password: %mailer_password% jms_security_extra: secure_controllers: true From 1231cf450c449cbeb08db58c5282091c114c13ef Mon Sep 17 00:00:00 2001 From: Fabien Potencier Date: Fri, 18 Mar 2011 07:48:25 +0100 Subject: [PATCH 038/899] updated listeners to the latest version of the event system --- src/Acme/DemoBundle/ControllerListener.php | 9 ++++----- src/Acme/DemoBundle/Resources/config/services.xml | 2 +- 2 files changed, 5 insertions(+), 6 deletions(-) diff --git a/src/Acme/DemoBundle/ControllerListener.php b/src/Acme/DemoBundle/ControllerListener.php index 81b3956e5e..83932a8ef0 100644 --- a/src/Acme/DemoBundle/ControllerListener.php +++ b/src/Acme/DemoBundle/ControllerListener.php @@ -4,6 +4,7 @@ use Symfony\Component\EventDispatcher\Event; use Symfony\Component\HttpKernel\HttpKernelInterface; +use Symfony\Component\HttpKernel\Event\FilterControllerEvent; use Acme\DemoBundle\Twig\Extension\DemoExtension; class ControllerListener @@ -15,12 +16,10 @@ public function __construct(DemoExtension $extension) $this->extension = $extension; } - public function getController(Event $event, $controller) + public function onCoreController(FilterControllerEvent $event) { - if (HttpKernelInterface::MASTER_REQUEST === $event->get('request_type')) { - $this->extension->setController($controller); + if (HttpKernelInterface::MASTER_REQUEST === $event->getRequestType()) { + $this->extension->setController($event->getController()); } - - return $controller; } } diff --git a/src/Acme/DemoBundle/Resources/config/services.xml b/src/Acme/DemoBundle/Resources/config/services.xml index 07366c7112..ef9184502b 100644 --- a/src/Acme/DemoBundle/Resources/config/services.xml +++ b/src/Acme/DemoBundle/Resources/config/services.xml @@ -11,7 +11,7 @@ - + From 33baebe22d97b5ac990707bce24a1bc55854fc50 Mon Sep 17 00:00:00 2001 From: Fabien Potencier Date: Fri, 18 Mar 2011 11:21:28 +0100 Subject: [PATCH 039/899] activated the AcmeDemoBundle for all env to ease things --- app/AppKernel.php | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/app/AppKernel.php b/app/AppKernel.php index 78a71b3cd8..4aed8a0334 100644 --- a/app/AppKernel.php +++ b/app/AppKernel.php @@ -17,12 +17,12 @@ public function registerBundles() new Symfony\Bundle\AsseticBundle\AsseticBundle(), new Sensio\Bundle\FrameworkExtraBundle\SensioFrameworkExtraBundle(), new JMS\SecurityExtraBundle\JMSSecurityExtraBundle(), + new Acme\DemoBundle\AcmeDemoBundle(), ); if (in_array($this->getEnvironment(), array('dev', 'test'))) { $bundles[] = new Symfony\Bundle\WebProfilerBundle\WebProfilerBundle(); $bundles[] = new Symfony\Bundle\WebConfiguratorBundle\SymfonyWebConfiguratorBundle(); - $bundles[] = new Acme\DemoBundle\AcmeDemoBundle(); } return $bundles; From 721eaa5aeaaa3dd7c846143dd773baf3c8e5a44c Mon Sep 17 00:00:00 2001 From: Fabien Potencier Date: Fri, 18 Mar 2011 12:52:55 +0100 Subject: [PATCH 040/899] made sure that vendors.sh can be executed from any directory --- bin/vendors.sh | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/bin/vendors.sh b/bin/vendors.sh index af5883e8e8..f070192566 100755 --- a/bin/vendors.sh +++ b/bin/vendors.sh @@ -1,6 +1,6 @@ #!/bin/sh -DIR=`php -r "echo realpath(dirname(\\$_SERVER['argv'][0]));"` +DIR="`dirname $0`/../" VENDOR="$DIR/vendor" VERSION=`cat "$DIR/VERSION"` @@ -49,7 +49,7 @@ install_git assetic git://github.com/kriswallsmith/assetic.git v1.0.0alpha1 install_git symfony git://github.com/symfony/symfony.git $VERSION # Update the bootstrap files -../bin/build_bootstrap.php +$DIR/bin/build_bootstrap.php # Doctrine ORM install_git doctrine git://github.com/doctrine/doctrine2.git 2.0.2 @@ -94,4 +94,4 @@ install_git WebConfiguratorBundle git://github.com/symfony/WebConfiguratorBundle cd ../../.. # Update assets -../app/console assets:install ../web/ +$DIR/app/console assets:install $DIR/web/ From 760d5501d8bb802dc2e90c4e7e75b76e3cfd9f99 Mon Sep 17 00:00:00 2001 From: Fabien Potencier Date: Fri, 18 Mar 2011 13:01:27 +0100 Subject: [PATCH 041/899] fixed bug in vendors.sh --- bin/vendors.sh | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/bin/vendors.sh b/bin/vendors.sh index f070192566..42281f72a7 100755 --- a/bin/vendors.sh +++ b/bin/vendors.sh @@ -49,7 +49,7 @@ install_git assetic git://github.com/kriswallsmith/assetic.git v1.0.0alpha1 install_git symfony git://github.com/symfony/symfony.git $VERSION # Update the bootstrap files -$DIR/bin/build_bootstrap.php +../bin/build_bootstrap.php # Doctrine ORM install_git doctrine git://github.com/doctrine/doctrine2.git 2.0.2 @@ -94,4 +94,4 @@ install_git WebConfiguratorBundle git://github.com/symfony/WebConfiguratorBundle cd ../../.. # Update assets -$DIR/app/console assets:install $DIR/web/ +../app/console assets:install ../web/ From 5f15a8c4688b428bf13132f08b7042f1ec2d8932 Mon Sep 17 00:00:00 2001 From: Fabien Potencier Date: Fri, 18 Mar 2011 16:27:10 +0100 Subject: [PATCH 042/899] fixed vendors.sh DIR path --- bin/vendors.sh | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/bin/vendors.sh b/bin/vendors.sh index 42281f72a7..a741b65bd9 100755 --- a/bin/vendors.sh +++ b/bin/vendors.sh @@ -1,6 +1,6 @@ #!/bin/sh -DIR="`dirname $0`/../" +DIR=`php -r "echo dirname(dirname(realpath('$0')));"` VENDOR="$DIR/vendor" VERSION=`cat "$DIR/VERSION"` @@ -49,7 +49,7 @@ install_git assetic git://github.com/kriswallsmith/assetic.git v1.0.0alpha1 install_git symfony git://github.com/symfony/symfony.git $VERSION # Update the bootstrap files -../bin/build_bootstrap.php +$DIR/bin/build_bootstrap.php # Doctrine ORM install_git doctrine git://github.com/doctrine/doctrine2.git 2.0.2 @@ -94,4 +94,4 @@ install_git WebConfiguratorBundle git://github.com/symfony/WebConfiguratorBundle cd ../../.. # Update assets -../app/console assets:install ../web/ +$DIR/app/console assets:install $DIR/web/ From 40158a3d4ac8eccfa5b19ac05705a4f24fdf43f5 Mon Sep 17 00:00:00 2001 From: Christophe Coevoet Date: Fri, 18 Mar 2011 16:58:12 +0100 Subject: [PATCH 043/899] Replaced Zend\Log with Monolog --- app/AppKernel.php | 2 +- app/autoload.php | 2 +- app/config/config_dev.yml | 10 ++++++---- app/config/config_prod.yml | 10 ++++++++++ bin/build.sh | 4 ++++ bin/vendors.sh | 6 ++---- 6 files changed, 24 insertions(+), 10 deletions(-) diff --git a/app/AppKernel.php b/app/AppKernel.php index 4aed8a0334..6285de337d 100644 --- a/app/AppKernel.php +++ b/app/AppKernel.php @@ -11,7 +11,7 @@ public function registerBundles() new Symfony\Bundle\FrameworkBundle\FrameworkBundle(), new Symfony\Bundle\SecurityBundle\SecurityBundle(), new Symfony\Bundle\TwigBundle\TwigBundle(), - new Symfony\Bundle\ZendBundle\ZendBundle(), + new Symfony\Bundle\MonologBundle\MonologBundle(), new Symfony\Bundle\SwiftmailerBundle\SwiftmailerBundle(), new Symfony\Bundle\DoctrineBundle\DoctrineBundle(), new Symfony\Bundle\AsseticBundle\AsseticBundle(), diff --git a/app/autoload.php b/app/autoload.php index 37044954ad..d16cd7ec3b 100644 --- a/app/autoload.php +++ b/app/autoload.php @@ -10,7 +10,7 @@ 'Doctrine\\Common' => __DIR__.'/../vendor/doctrine-common/lib', 'Doctrine\\DBAL' => __DIR__.'/../vendor/doctrine-dbal/lib', 'Doctrine' => __DIR__.'/../vendor/doctrine/lib', - 'Zend\\Log' => __DIR__.'/../vendor/zend-log', + 'Monolog' => __DIR__.'/../vendor/monolog/src', 'Assetic' => __DIR__.'/../vendor/assetic/src', 'Acme' => __DIR__.'/../src', )); diff --git a/app/config/config_dev.yml b/app/config/config_dev.yml index ed41e77e36..7599e922f4 100644 --- a/app/config/config_dev.yml +++ b/app/config/config_dev.yml @@ -9,10 +9,12 @@ web_profiler: toolbar: true intercept_redirects: false -zend: - logger: - priority: debug - path: %kernel.logs_dir%/%kernel.environment%.log +monolog: + handlers: + main: + type: stream + path: %kernel.logs_dir%/%kernel.environment%.log + level: debug assetic: use_controller: true diff --git a/app/config/config_prod.yml b/app/config/config_prod.yml index 8e0b6ff02b..81a1ce139f 100644 --- a/app/config/config_prod.yml +++ b/app/config/config_prod.yml @@ -1,2 +1,12 @@ imports: - { resource: config.yml } + +monolog: + handlers: + main: + type: fingerscrossed + action_level: error + handler: + type: stream + path: %kernel.logs_dir%/%kernel.environment%.log + level: debug diff --git a/bin/build.sh b/bin/build.sh index e99e6f03b4..769c3ccd19 100755 --- a/bin/build.sh +++ b/bin/build.sh @@ -78,6 +78,10 @@ cd $TARGET cd twig-extensions && rm -rf README doc phpunit.xml* test cd $TARGET +# Monolog +cd monolog && rm -rf README.markdown phpunit.xml* tests +cd $TARGET + # cleanup find . -name .git | xargs rm -rf - find . -name .gitignore | xargs rm -rf - diff --git a/bin/vendors.sh b/bin/vendors.sh index a741b65bd9..effe99a201 100755 --- a/bin/vendors.sh +++ b/bin/vendors.sh @@ -69,10 +69,8 @@ install_git twig git://github.com/fabpot/Twig.git # Twig Extensions install_git twig-extensions git://github.com/fabpot/Twig-extensions.git -# Zend Framework Log -mkdir -p zend-log/Zend -cd zend-log/Zend -install_git Log git://github.com/symfony/zend-log.git +# Monolog +install_git monolog git://github.com/Seldaek/monolog.git cd ../.. # FrameworkExtraBundle From 20059f3ae522684dcd75d71345ab9ce4095aa0ed Mon Sep 17 00:00:00 2001 From: Christophe Coevoet Date: Sat, 19 Mar 2011 17:42:57 +0100 Subject: [PATCH 044/899] Updated MonologBundle config for the new syntax for nested handlers --- app/config/config_prod.yml | 9 +++++---- 1 file changed, 5 insertions(+), 4 deletions(-) diff --git a/app/config/config_prod.yml b/app/config/config_prod.yml index 81a1ce139f..37de15cd48 100644 --- a/app/config/config_prod.yml +++ b/app/config/config_prod.yml @@ -6,7 +6,8 @@ monolog: main: type: fingerscrossed action_level: error - handler: - type: stream - path: %kernel.logs_dir%/%kernel.environment%.log - level: debug + handler: nested + nested: + type: stream + path: %kernel.logs_dir%/%kernel.environment%.log + level: debug From f6f6993d523f06dff50b8d32b91d1e512f2b0c77 Mon Sep 17 00:00:00 2001 From: Fabien Potencier Date: Sun, 20 Mar 2011 22:31:44 +0100 Subject: [PATCH 045/899] updated vendor versions --- bin/vendors.sh | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/bin/vendors.sh b/bin/vendors.sh index a741b65bd9..57f8a2a6b8 100755 --- a/bin/vendors.sh +++ b/bin/vendors.sh @@ -43,19 +43,19 @@ install_git() } # Assetic -install_git assetic git://github.com/kriswallsmith/assetic.git v1.0.0alpha1 +install_git assetic git://github.com/kriswallsmith/assetic.git #v1.0.0alpha1 # Symfony -install_git symfony git://github.com/symfony/symfony.git $VERSION +install_git symfony git://github.com/symfony/symfony.git #$VERSION # Update the bootstrap files $DIR/bin/build_bootstrap.php # Doctrine ORM -install_git doctrine git://github.com/doctrine/doctrine2.git 2.0.2 +install_git doctrine git://github.com/doctrine/doctrine2.git 2.0.3 # Doctrine DBAL -install_git doctrine-dbal git://github.com/doctrine/dbal.git 2.0.2 +install_git doctrine-dbal git://github.com/doctrine/dbal.git 2.0.3 # Doctrine Common install_git doctrine-common git://github.com/doctrine/common.git 2.0.1 From 8cce362c60ec53a580cb46504da51d6e258db107 Mon Sep 17 00:00:00 2001 From: Fabien Potencier Date: Mon, 21 Mar 2011 07:36:53 +0100 Subject: [PATCH 046/899] added the intl stub in autoloading --- app/autoload.php | 3 +++ 1 file changed, 3 insertions(+) diff --git a/app/autoload.php b/app/autoload.php index 37044954ad..2f73caf562 100644 --- a/app/autoload.php +++ b/app/autoload.php @@ -20,3 +20,6 @@ 'Swift_' => __DIR__.'/../vendor/swiftmailer/lib/classes', )); $loader->register(); +$loader->registerPrefixFallback(array( + __DIR__.'/../vendor/symfony/src/Symfony/Component/Locale/Resources/stubs', +)); From a2da28e75b6e1d617ddf22301a13b915bf9da2ed Mon Sep 17 00:00:00 2001 From: Fabien Potencier Date: Mon, 21 Mar 2011 08:18:42 +0100 Subject: [PATCH 047/899] added a role hierarchy in security.yml --- app/config/security.yml | 4 ++++ 1 file changed, 4 insertions(+) diff --git a/app/config/security.yml b/app/config/security.yml index f7a0c6bea8..7a0ab1c5c5 100644 --- a/app/config/security.yml +++ b/app/config/security.yml @@ -2,6 +2,10 @@ security: encoders: Symfony\Component\Security\Core\User\User: plaintext + role_hierarchy: + ROLE_ADMIN: ROLE_USER + ROLE_SUPER_ADMIN: [ROLE_USER, ROLE_ADMIN, ROLE_ALLOWED_TO_SWITCH] + providers: in_memory: users: From 2b8157a3f6348289a1bcc66aa1a7a726fccc25d8 Mon Sep 17 00:00:00 2001 From: Fabien Potencier Date: Mon, 21 Mar 2011 15:43:38 +0100 Subject: [PATCH 048/899] added a @Routes example --- src/Acme/DemoBundle/Controller/SecuredController.php | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/src/Acme/DemoBundle/Controller/SecuredController.php b/src/Acme/DemoBundle/Controller/SecuredController.php index 9ccd62ab07..d57e9d4b64 100644 --- a/src/Acme/DemoBundle/Controller/SecuredController.php +++ b/src/Acme/DemoBundle/Controller/SecuredController.php @@ -45,7 +45,10 @@ public function logoutAction() } /** - * @extra:Route("/hello/{name}", name="_demo_secured_hello") + * @extra:Routes({ + * @extra:Route("/hello", defaults={"name"="World"}), + * @extra:Route("/hello/{name}", name="_demo_secured_hello") + * }) * @extra:Template() */ public function helloAction($name) From 30d4eac9ac00644ae71b3b2016d5dffa8da4f294 Mon Sep 17 00:00:00 2001 From: Fabien Potencier Date: Mon, 21 Mar 2011 15:44:46 +0100 Subject: [PATCH 049/899] fixed case sensitivity bug --- src/Acme/DemoBundle/Controller/SecuredController.php | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/src/Acme/DemoBundle/Controller/SecuredController.php b/src/Acme/DemoBundle/Controller/SecuredController.php index d57e9d4b64..4de750f537 100644 --- a/src/Acme/DemoBundle/Controller/SecuredController.php +++ b/src/Acme/DemoBundle/Controller/SecuredController.php @@ -61,7 +61,7 @@ public function helloAction($name) * @extra:Secure(roles="ROLE_ADMIN") * @extra:Template() */ - public function helloAdminAction($name) + public function helloadminAction($name) { return array('name' => $name); } From 39ff652cebc25872cb5f50a22cbf6fa4b10006c4 Mon Sep 17 00:00:00 2001 From: Fabien Potencier Date: Mon, 21 Mar 2011 15:48:06 +0100 Subject: [PATCH 050/899] updated vendors script --- bin/vendors.sh | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/bin/vendors.sh b/bin/vendors.sh index 57f8a2a6b8..2939b6249d 100755 --- a/bin/vendors.sh +++ b/bin/vendors.sh @@ -46,7 +46,7 @@ install_git() install_git assetic git://github.com/kriswallsmith/assetic.git #v1.0.0alpha1 # Symfony -install_git symfony git://github.com/symfony/symfony.git #$VERSION +install_git symfony git://github.com/symfony/symfony.git v$VERSION # Update the bootstrap files $DIR/bin/build_bootstrap.php From ca21a253a6056e85b7f446b51e0fd2668cb5d189 Mon Sep 17 00:00:00 2001 From: Brikou CARRE Date: Tue, 22 Mar 2011 08:19:51 +0100 Subject: [PATCH 051/899] added missing 403 header, in order no to be indexed by google (just try the message in google query search box) --- web/app_dev.php | 6 +++++- web/config.php | 6 +++++- 2 files changed, 10 insertions(+), 2 deletions(-) diff --git a/web/app_dev.php b/web/app_dev.php index eb10da5565..960b8892f9 100644 --- a/web/app_dev.php +++ b/web/app_dev.php @@ -2,7 +2,11 @@ // this check prevents access to debug front controllers that are deployed by accident to production servers. // feel free to remove this, extend it, or make something more sophisticated. -if (!in_array(@$_SERVER['REMOTE_ADDR'], array('127.0.0.1', '::1'))) { +if (!in_array(@$_SERVER['REMOTE_ADDR'], array( + '127.0.0.1', + '::1', +))) { + header('HTTP/1.0 403 Forbidden'); die('You are not allowed to access this file. Check '.basename(__FILE__).' for more information.'); } diff --git a/web/config.php b/web/config.php index f90683e8e0..b8921eee40 100644 --- a/web/config.php +++ b/web/config.php @@ -4,7 +4,11 @@ die('This script cannot be run from the CLI. Run it from a browser.'); } -if (!in_array(@$_SERVER['REMOTE_ADDR'], array('127.0.0.1', '::1'))) { +if (!in_array(@$_SERVER['REMOTE_ADDR'], array( + '127.0.0.1', + '::1', +))) { + header('HTTP/1.0 403 Forbidden'); die('This script is only accessible from localhost.'); } From 3a2cddb16eefceab62f1b097b073f5456e443acf Mon Sep 17 00:00:00 2001 From: Fabien Potencier Date: Tue, 22 Mar 2011 12:58:22 +0100 Subject: [PATCH 052/899] removed .DS_Store files from the builds --- bin/build.sh | 1 + 1 file changed, 1 insertion(+) diff --git a/bin/build.sh b/bin/build.sh index e99e6f03b4..e98a3f2835 100755 --- a/bin/build.sh +++ b/bin/build.sh @@ -83,6 +83,7 @@ find . -name .git | xargs rm -rf - find . -name .gitignore | xargs rm -rf - find . -name .gitmodules | xargs rm -rf - find . -name .svn | xargs rm -rf - +find . -name .DS_Store | xargs rm -rf - cd /tmp/ mv /tmp/vendor /tmp/Symfony/ From 1901ff06ab6b923d980339b54ae2794e30cf6da4 Mon Sep 17 00:00:00 2001 From: Albert Jessurum Date: Tue, 22 Mar 2011 15:53:04 +0100 Subject: [PATCH 053/899] Corrected: Removed .DS_Store files from the builds --- bin/build.sh | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/bin/build.sh b/bin/build.sh index e98a3f2835..481b37573c 100755 --- a/bin/build.sh +++ b/bin/build.sh @@ -24,6 +24,10 @@ cp -r VERSION /tmp/Symfony/ cd /tmp/Symfony sudo rm -rf app/cache/* app/logs/* .git* chmod 777 app/cache app/logs + +# DS_Store cleanup +find . -name .DS_Store | xargs rm -rf - + cd .. # avoid the creation of ._* files export COPY_EXTENDED_ATTRIBUTES_DISABLE=true @@ -83,7 +87,6 @@ find . -name .git | xargs rm -rf - find . -name .gitignore | xargs rm -rf - find . -name .gitmodules | xargs rm -rf - find . -name .svn | xargs rm -rf - -find . -name .DS_Store | xargs rm -rf - cd /tmp/ mv /tmp/vendor /tmp/Symfony/ From e189fbd23b28e73cae28a6a7808990206510690a Mon Sep 17 00:00:00 2001 From: Miha Vrhovnik Date: Wed, 23 Mar 2011 08:40:01 +0100 Subject: [PATCH 054/899] Fixing route not found problem when running producton version --- src/Acme/DemoBundle/Resources/views/Welcome/index.html.twig | 2 ++ 1 file changed, 2 insertions(+) diff --git a/src/Acme/DemoBundle/Resources/views/Welcome/index.html.twig b/src/Acme/DemoBundle/Resources/views/Welcome/index.html.twig index ff280ca1bb..4aca61165f 100644 --- a/src/Acme/DemoBundle/Resources/views/Welcome/index.html.twig +++ b/src/Acme/DemoBundle/Resources/views/Welcome/index.html.twig @@ -16,12 +16,14 @@

    Read the Quick Tour
    + {% if app.environment != 'prod' %}
    Configure your appication
    Configure
    + {% endif %}
    Demo From 0f30922044a14ea4d76cb51ad9c59680b01b836d Mon Sep 17 00:00:00 2001 From: Fabien Potencier Date: Wed, 23 Mar 2011 09:06:37 +0100 Subject: [PATCH 055/899] moved global views to their new location --- app/{ => Resources}/views/base.html.twig | 0 bin/vendors.sh | 2 +- 2 files changed, 1 insertion(+), 1 deletion(-) rename app/{ => Resources}/views/base.html.twig (100%) diff --git a/app/views/base.html.twig b/app/Resources/views/base.html.twig similarity index 100% rename from app/views/base.html.twig rename to app/Resources/views/base.html.twig diff --git a/bin/vendors.sh b/bin/vendors.sh index 2939b6249d..cf2819f32b 100755 --- a/bin/vendors.sh +++ b/bin/vendors.sh @@ -46,7 +46,7 @@ install_git() install_git assetic git://github.com/kriswallsmith/assetic.git #v1.0.0alpha1 # Symfony -install_git symfony git://github.com/symfony/symfony.git v$VERSION +install_git symfony git://github.com/symfony/symfony.git #v$VERSION # Update the bootstrap files $DIR/bin/build_bootstrap.php From 991909987373d9d9770cf88c3f46da021e5af2e5 Mon Sep 17 00:00:00 2001 From: Miha Vrhovnik Date: Wed, 23 Mar 2011 09:47:41 +0100 Subject: [PATCH 056/899] changed != prod to == dev --- src/Acme/DemoBundle/Resources/views/Welcome/index.html.twig | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/src/Acme/DemoBundle/Resources/views/Welcome/index.html.twig b/src/Acme/DemoBundle/Resources/views/Welcome/index.html.twig index 4aca61165f..83251e8c94 100644 --- a/src/Acme/DemoBundle/Resources/views/Welcome/index.html.twig +++ b/src/Acme/DemoBundle/Resources/views/Welcome/index.html.twig @@ -16,7 +16,7 @@
    Read the Quick Tour
    - {% if app.environment != 'prod' %} + {% if app.environment == 'dev' %}
    Configure your appication From b1a28765b1e45b348c4800ce33ac861dce4e3013 Mon Sep 17 00:00:00 2001 From: Fabien Potencier Date: Wed, 23 Mar 2011 12:25:13 +0100 Subject: [PATCH 057/899] fixed CS --- .../DemoBundle/Resources/views/Welcome/index.html.twig | 10 +++++----- 1 file changed, 5 insertions(+), 5 deletions(-) diff --git a/src/Acme/DemoBundle/Resources/views/Welcome/index.html.twig b/src/Acme/DemoBundle/Resources/views/Welcome/index.html.twig index 83251e8c94..e50f1b2457 100644 --- a/src/Acme/DemoBundle/Resources/views/Welcome/index.html.twig +++ b/src/Acme/DemoBundle/Resources/views/Welcome/index.html.twig @@ -17,12 +17,12 @@ Read the Quick Tour
    {% if app.environment == 'dev' %} -
    -
    - Configure your appication +
    +
    + Configure your appication +
    + Configure
    - Configure -
    {% endif %}
    From 1ce82be91ebdac2f5f3ecd997811a1bb5d7873c8 Mon Sep 17 00:00:00 2001 From: Fabien Potencier Date: Wed, 23 Mar 2011 21:31:09 +0100 Subject: [PATCH 058/899] updated request matchers --- app/config/security.yml | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/app/config/security.yml b/app/config/security.yml index 7a0ab1c5c5..432c0f755b 100644 --- a/app/config/security.yml +++ b/app/config/security.yml @@ -14,19 +14,19 @@ security: firewalls: profiler: - pattern: /_profiler.* + pattern: ^/_profiler security: false wdt: - pattern: /_wdt.* + pattern: ^/_wdt security: false login: - pattern: /demo/secured/login + pattern: ^/demo/secured/login$ security: false secured_area: - pattern: /demo/secured/.* + pattern: ^/demo/secured/ form_login: check_path: /demo/secured/login_check login_path: /demo/secured/login From 10a03de6371f75d834ac0a9d81bca11a05186a1a Mon Sep 17 00:00:00 2001 From: Fabien Potencier Date: Wed, 23 Mar 2011 22:40:25 +0100 Subject: [PATCH 059/899] updated vendors --- bin/vendors.sh | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/bin/vendors.sh b/bin/vendors.sh index cf2819f32b..6e559afa2e 100755 --- a/bin/vendors.sh +++ b/bin/vendors.sh @@ -75,10 +75,10 @@ cd zend-log/Zend install_git Log git://github.com/symfony/zend-log.git cd ../.. -# FrameworkExtraBundle +# SensioFrameworkExtraBundle mkdir -p bundles/Sensio/Bundle cd bundles/Sensio/Bundle -install_git FrameworkExtraBundle git://github.com/sensio/FrameworkExtraBundle.git +install_git FrameworkExtraBundle git://github.com/sensio/SensioFrameworkExtraBundle.git cd ../../.. # SecurityExtraBundle From 36045e091ae3802da8b1c50bc0b05d74455e8aa2 Mon Sep 17 00:00:00 2001 From: Kris Wallsmith Date: Sun, 27 Mar 2011 05:39:36 -0700 Subject: [PATCH 060/899] updated for shorter bundle names --- app/config/config.yml | 2 +- app/config/routing.yml | 2 +- src/Acme/DemoBundle/Controller/WelcomeController.php | 2 +- src/Acme/DemoBundle/Resources/views/Demo/contact.html.twig | 2 +- src/Acme/DemoBundle/Resources/views/Demo/hello.html.twig | 2 +- src/Acme/DemoBundle/Resources/views/Demo/index.html.twig | 2 +- src/Acme/DemoBundle/Resources/views/Secured/hello.html.twig | 2 +- .../DemoBundle/Resources/views/Secured/helloadmin.html.twig | 2 +- src/Acme/DemoBundle/Resources/views/Secured/layout.html.twig | 2 +- src/Acme/DemoBundle/Resources/views/Secured/login.html.twig | 2 +- src/Acme/DemoBundle/Resources/views/Welcome/index.html.twig | 2 +- 11 files changed, 11 insertions(+), 11 deletions(-) diff --git a/app/config/config.yml b/app/config/config.yml index 5f3ac48877..0b62331d69 100644 --- a/app/config/config.yml +++ b/app/config/config.yml @@ -44,7 +44,7 @@ doctrine: entity_managers: default: mappings: - AcmeDemoBundle: ~ + AcmeDemo: ~ # Swiftmailer Configuration swiftmailer: diff --git a/app/config/routing.yml b/app/config/routing.yml index f95dc84b90..e00afd20c3 100644 --- a/app/config/routing.yml +++ b/app/config/routing.yml @@ -1,6 +1,6 @@ _welcome: pattern: / - defaults: { _controller: AcmeDemoBundle:Welcome:index } + defaults: { _controller: AcmeDemo:Welcome:index } _demo_secured: resource: "@AcmeDemoBundle/Controller/SecuredController.php" diff --git a/src/Acme/DemoBundle/Controller/WelcomeController.php b/src/Acme/DemoBundle/Controller/WelcomeController.php index 0185aef04e..f02f99492b 100644 --- a/src/Acme/DemoBundle/Controller/WelcomeController.php +++ b/src/Acme/DemoBundle/Controller/WelcomeController.php @@ -8,6 +8,6 @@ class WelcomeController extends Controller { public function indexAction() { - return $this->render('AcmeDemoBundle:Welcome:index.html.twig'); + return $this->render('AcmeDemo:Welcome:index.html.twig'); } } diff --git a/src/Acme/DemoBundle/Resources/views/Demo/contact.html.twig b/src/Acme/DemoBundle/Resources/views/Demo/contact.html.twig index 89a4b36c56..71ebe8a1e8 100644 --- a/src/Acme/DemoBundle/Resources/views/Demo/contact.html.twig +++ b/src/Acme/DemoBundle/Resources/views/Demo/contact.html.twig @@ -1,4 +1,4 @@ -{% extends "AcmeDemoBundle::layout.html.twig" %} +{% extends "AcmeDemo::layout.html.twig" %} {% block title "Symfony - Contact form" %} diff --git a/src/Acme/DemoBundle/Resources/views/Demo/hello.html.twig b/src/Acme/DemoBundle/Resources/views/Demo/hello.html.twig index 3997ff606a..4881d25917 100644 --- a/src/Acme/DemoBundle/Resources/views/Demo/hello.html.twig +++ b/src/Acme/DemoBundle/Resources/views/Demo/hello.html.twig @@ -1,4 +1,4 @@ -{% extends "AcmeDemoBundle::layout.html.twig" %} +{% extends "AcmeDemo::layout.html.twig" %} {% block title "Hello " ~ name %} diff --git a/src/Acme/DemoBundle/Resources/views/Demo/index.html.twig b/src/Acme/DemoBundle/Resources/views/Demo/index.html.twig index 82e65e6503..85612778df 100644 --- a/src/Acme/DemoBundle/Resources/views/Demo/index.html.twig +++ b/src/Acme/DemoBundle/Resources/views/Demo/index.html.twig @@ -1,4 +1,4 @@ -{% extends "AcmeDemoBundle::layout.html.twig" %} +{% extends "AcmeDemo::layout.html.twig" %} {% block title "Symfony - Demos" %} diff --git a/src/Acme/DemoBundle/Resources/views/Secured/hello.html.twig b/src/Acme/DemoBundle/Resources/views/Secured/hello.html.twig index c8da283832..8a87bfa7cf 100644 --- a/src/Acme/DemoBundle/Resources/views/Secured/hello.html.twig +++ b/src/Acme/DemoBundle/Resources/views/Secured/hello.html.twig @@ -1,4 +1,4 @@ -{% extends "AcmeDemoBundle:Secured:layout.html.twig" %} +{% extends "AcmeDemo:Secured:layout.html.twig" %} {% block title "Hello " ~ name %} diff --git a/src/Acme/DemoBundle/Resources/views/Secured/helloadmin.html.twig b/src/Acme/DemoBundle/Resources/views/Secured/helloadmin.html.twig index 425213ee56..2f5e7ca8cf 100644 --- a/src/Acme/DemoBundle/Resources/views/Secured/helloadmin.html.twig +++ b/src/Acme/DemoBundle/Resources/views/Secured/helloadmin.html.twig @@ -1,4 +1,4 @@ -{% extends "AcmeDemoBundle:Secured:layout.html.twig" %} +{% extends "AcmeDemo:Secured:layout.html.twig" %} {% block title "Hello " ~ name %} diff --git a/src/Acme/DemoBundle/Resources/views/Secured/layout.html.twig b/src/Acme/DemoBundle/Resources/views/Secured/layout.html.twig index aeea55c5cf..e65288ddc5 100644 --- a/src/Acme/DemoBundle/Resources/views/Secured/layout.html.twig +++ b/src/Acme/DemoBundle/Resources/views/Secured/layout.html.twig @@ -1,4 +1,4 @@ -{% extends "AcmeDemoBundle::layout.html.twig" %} +{% extends "AcmeDemo::layout.html.twig" %} {% block content_header_more %} {{ parent() }} diff --git a/src/Acme/DemoBundle/Resources/views/Secured/login.html.twig b/src/Acme/DemoBundle/Resources/views/Secured/login.html.twig index 005175dc8b..258e855149 100644 --- a/src/Acme/DemoBundle/Resources/views/Secured/login.html.twig +++ b/src/Acme/DemoBundle/Resources/views/Secured/login.html.twig @@ -1,4 +1,4 @@ -{% extends 'AcmeDemoBundle::layout.html.twig' %} +{% extends 'AcmeDemo::layout.html.twig' %} {% block content %}

    Login

    diff --git a/src/Acme/DemoBundle/Resources/views/Welcome/index.html.twig b/src/Acme/DemoBundle/Resources/views/Welcome/index.html.twig index e50f1b2457..115d02a9b4 100644 --- a/src/Acme/DemoBundle/Resources/views/Welcome/index.html.twig +++ b/src/Acme/DemoBundle/Resources/views/Welcome/index.html.twig @@ -1,4 +1,4 @@ -{% extends 'AcmeDemoBundle::layout.html.twig' %} +{% extends 'AcmeDemo::layout.html.twig' %} {% block title %}Symfony - Welcome{% endblock %} From f511f187583825c23e3e6ea320ad8e9537e3693e Mon Sep 17 00:00:00 2001 From: Gregory Quatannens Date: Fri, 25 Mar 2011 22:31:29 +0100 Subject: [PATCH 061/899] Add steps to delete all references of AcmeBundle --- README.md | 8 ++++++-- 1 file changed, 6 insertions(+), 2 deletions(-) diff --git a/README.md b/README.md index 5df63989a7..935ab65e5a 100644 --- a/README.md +++ b/README.md @@ -53,8 +53,12 @@ The distribution is configured with the following defaults: * Annotations for everything are enabled. A default bundle, `AcmeDemoBundle`, shows you Symfony2 in action. After -playing with it, you can remove it by deleting the `src/Acme` directory and -removing the routing entry in `app/config/routing.yml`. +playing with it, you can remove it by following these steps : + * delete the `src/Acme` directory. + * remove the routing entry in `app/config/routing.yml`. + * remove the `Acme` reference in `app/config/config.yml`. + * remove the AcmeBundle from the registered bundles in `app/AppKernel.php` + * remove the Acme registered namespace in `app/autoload.php` Configure the distribution by editing `app/config/parameters.ini` or by accessing `web/config.php` in a browser. From 933b0016ca42a0c922d4bd1a6841236928c4b0ed Mon Sep 17 00:00:00 2001 From: Fabien Potencier Date: Sun, 27 Mar 2011 22:57:27 +0200 Subject: [PATCH 062/899] updated vendors for Twig 1.0.0 --- bin/vendors.sh | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/bin/vendors.sh b/bin/vendors.sh index 6e559afa2e..3324941870 100755 --- a/bin/vendors.sh +++ b/bin/vendors.sh @@ -64,7 +64,7 @@ install_git doctrine-common git://github.com/doctrine/common.git 2.0.1 install_git swiftmailer git://github.com/swiftmailer/swiftmailer.git origin/4.1 # Twig -install_git twig git://github.com/fabpot/Twig.git +install_git twig git://github.com/fabpot/Twig.git v1.0.0 # Twig Extensions install_git twig-extensions git://github.com/fabpot/Twig-extensions.git From b8fac2ce636605226a97ac21b0ff330b000d7652 Mon Sep 17 00:00:00 2001 From: Fabien Potencier Date: Mon, 28 Mar 2011 19:02:36 +0200 Subject: [PATCH 063/899] fixed routing --- app/config/routing_dev.yml | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/app/config/routing_dev.yml b/app/config/routing_dev.yml index e806f76fa7..11f26b3909 100644 --- a/app/config/routing_dev.yml +++ b/app/config/routing_dev.yml @@ -3,15 +3,15 @@ _assetic: type: assetic _wdt: - resource: "@WebProfilerBundle/Resources/config/routing/wdt.xml" + resource: "@WebProfiler/Resources/config/routing/wdt.xml" prefix: /_wdt _profiler: - resource: "@WebProfilerBundle/Resources/config/routing/profiler.xml" + resource: "@WebProfiler/Resources/config/routing/profiler.xml" prefix: /_profiler _configurator: - resource: "@SymfonyWebConfiguratorBundle/Resources/config/routing/configurator.xml" + resource: "@SymfonyWebConfigurator/Resources/config/routing/configurator.xml" prefix: /_configurator _main: From 69a8328dc620e3547a563008e5a3e9d7bbc67594 Mon Sep 17 00:00:00 2001 From: Fabien Potencier Date: Mon, 28 Mar 2011 19:03:56 +0200 Subject: [PATCH 064/899] fixed routing --- app/config/routing.yml | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/app/config/routing.yml b/app/config/routing.yml index e00afd20c3..e02c91660d 100644 --- a/app/config/routing.yml +++ b/app/config/routing.yml @@ -3,10 +3,10 @@ _welcome: defaults: { _controller: AcmeDemo:Welcome:index } _demo_secured: - resource: "@AcmeDemoBundle/Controller/SecuredController.php" + resource: "@AcmeDemo/Controller/SecuredController.php" type: annotation _demo: - resource: "@AcmeDemoBundle/Controller/DemoController.php" + resource: "@AcmeDemo/Controller/DemoController.php" type: annotation prefix: /demo From 884c5d6bd22403f9f7ea128a06449cc61d5af839 Mon Sep 17 00:00:00 2001 From: Kris Wallsmith Date: Mon, 28 Mar 2011 10:17:57 -0700 Subject: [PATCH 065/899] added cssrewrite and closure (api) filters since those work out of the box --- app/config/config.yml | 3 +++ 1 file changed, 3 insertions(+) diff --git a/app/config/config.yml b/app/config/config.yml index 0b62331d69..c1a89f8b0d 100644 --- a/app/config/config.yml +++ b/app/config/config.yml @@ -25,6 +25,9 @@ twig: assetic: debug: %kernel.debug% use_controller: false + filters: + cssrewrite: ~ + closure: ~ # Doctrine Configuration doctrine: From 381ae0dd48178e0c4cd895568bcdc7b4674b27f1 Mon Sep 17 00:00:00 2001 From: Fabien Potencier Date: Tue, 29 Mar 2011 11:44:04 +0200 Subject: [PATCH 066/899] updated VERSION --- VERSION | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/VERSION b/VERSION index 42b00d24c4..3cf4766cf0 100644 --- a/VERSION +++ b/VERSION @@ -1 +1 @@ -2.0.0PR8 \ No newline at end of file +2.0.0PR9 \ No newline at end of file From eff993a3f8381f4184635fae3bdbd7c5345cb49c Mon Sep 17 00:00:00 2001 From: Brikou CARRE Date: Thu, 31 Mar 2011 07:25:07 +0200 Subject: [PATCH 067/899] fixed indentation in phpunit configuration file --- app/phpunit.xml.dist | 44 ++++++++++++++++++++++---------------------- 1 file changed, 22 insertions(+), 22 deletions(-) diff --git a/app/phpunit.xml.dist b/app/phpunit.xml.dist index 10a9c5737e..092802d097 100644 --- a/app/phpunit.xml.dist +++ b/app/phpunit.xml.dist @@ -11,28 +11,28 @@ syntaxCheck="false" bootstrap="bootstrap.php.cache" > - - - ../src/*/*Bundle/Tests - ../src/*/Bundle/*Bundle/Tests - - + + + ../src/*/*Bundle/Tests + ../src/*/Bundle/*Bundle/Tests + + - + - - - ../src - - ../src/*/*Bundle/Resources - ../src/*/*Bundle/Tests - ../src/*/Bundle/*Bundle/Resources - ../src/*/Bundle/*Bundle/Tests - - - + + + ../src + + ../src/*/*Bundle/Resources + ../src/*/*Bundle/Tests + ../src/*/Bundle/*Bundle/Resources + ../src/*/Bundle/*Bundle/Tests + + + From 0d5c260ab0347cf4eff9bbb79b5bf89d273bf41a Mon Sep 17 00:00:00 2001 From: Brikou CARRE Date: Thu, 31 Mar 2011 08:25:25 +0200 Subject: [PATCH 068/899] fixed (or tweak) indentation in parameters.ini + changed default csrf token by an explicit one --- app/config/parameters.ini | 22 +++++++++++----------- 1 file changed, 11 insertions(+), 11 deletions(-) diff --git a/app/config/parameters.ini b/app/config/parameters.ini index 93c76cd21b..720fae3e03 100644 --- a/app/config/parameters.ini +++ b/app/config/parameters.ini @@ -1,15 +1,15 @@ [parameters] - database_driver=pdo_mysql - database_host=localhost - database_name=symfony - database_user=root - database_password= + database_driver = pdo_mysql + database_host = localhost + database_name = symfony + database_user = root + database_password = - mailer_transport=smtp - mailer_host=localhost - mailer_user= - mailer_password= + mailer_transport = smtp + mailer_host = localhost + mailer_user = + mailer_password = - locale=en + locale = en - csrf_secret=xxxxxxxxxx + csrf_secret = ThisTokenIsNotSoSecretChangeIt From 1e24e4b832d7c5b7b62f464d79bc7f9656b97c99 Mon Sep 17 00:00:00 2001 From: Kris Wallsmith Date: Fri, 1 Apr 2011 10:02:20 -0700 Subject: [PATCH 069/899] added example config for closure and yui_css filters --- app/config/config.yml | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/app/config/config.yml b/app/config/config.yml index c1a89f8b0d..ab09821b73 100644 --- a/app/config/config.yml +++ b/app/config/config.yml @@ -27,7 +27,10 @@ assetic: use_controller: false filters: cssrewrite: ~ - closure: ~ + # closure: + # jar: %kernel.root_dir%/java/compiler.jar + # yui_css: + # jar: %kernel.root_dir%/java/yuicompressor-2.4.2.jar # Doctrine Configuration doctrine: From 32605cba3d9e3b66d4e0518002561a85f3a18236 Mon Sep 17 00:00:00 2001 From: Jordi Boggiano Date: Sun, 3 Apr 2011 16:11:08 +0200 Subject: [PATCH 070/899] Add default apple-touch-icon to avoid 404s --- web/apple-touch-icon.png | Bin 0 -> 10784 bytes 1 file changed, 0 insertions(+), 0 deletions(-) create mode 100644 web/apple-touch-icon.png diff --git a/web/apple-touch-icon.png b/web/apple-touch-icon.png new file mode 100644 index 0000000000000000000000000000000000000000..11f17e6d89ee3b416218ede42b66ec1dd81507f2 GIT binary patch literal 10784 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 f! Date: Sun, 3 Apr 2011 16:11:56 +0200 Subject: [PATCH 071/899] Add default robots.txt to avoid 404s --- web/robots.txt | 4 ++++ 1 file changed, 4 insertions(+) create mode 100644 web/robots.txt diff --git a/web/robots.txt b/web/robots.txt new file mode 100644 index 0000000000..214e411965 --- /dev/null +++ b/web/robots.txt @@ -0,0 +1,4 @@ +# www.robotstxt.org/ +# www.google.com/support/webmasters/bin/answer.py?hl=en&answer=156449 + +User-agent: * From 8e78bcf7d2b6eb7f4ffcd3f528701153c4d06f4a Mon Sep 17 00:00:00 2001 From: Fabien Potencier Date: Mon, 4 Apr 2011 11:11:58 +0200 Subject: [PATCH 072/899] Revert "Merge remote branch 'kriswallsmith/shorter-bundle-names'" This reverts commit 101fe3651a0b1dcd88fa3535286146c3c153beb7, reversing changes made to 933b0016ca42a0c922d4bd1a6841236928c4b0ed. --- app/config/config.yml | 2 +- app/config/routing.yml | 2 +- src/Acme/DemoBundle/Controller/WelcomeController.php | 2 +- src/Acme/DemoBundle/Resources/views/Demo/contact.html.twig | 2 +- src/Acme/DemoBundle/Resources/views/Demo/hello.html.twig | 2 +- src/Acme/DemoBundle/Resources/views/Demo/index.html.twig | 2 +- src/Acme/DemoBundle/Resources/views/Secured/hello.html.twig | 2 +- .../DemoBundle/Resources/views/Secured/helloadmin.html.twig | 2 +- src/Acme/DemoBundle/Resources/views/Secured/layout.html.twig | 2 +- src/Acme/DemoBundle/Resources/views/Secured/login.html.twig | 2 +- src/Acme/DemoBundle/Resources/views/Welcome/index.html.twig | 2 +- 11 files changed, 11 insertions(+), 11 deletions(-) diff --git a/app/config/config.yml b/app/config/config.yml index c1a89f8b0d..ab1a39bb24 100644 --- a/app/config/config.yml +++ b/app/config/config.yml @@ -47,7 +47,7 @@ doctrine: entity_managers: default: mappings: - AcmeDemo: ~ + AcmeDemoBundle: ~ # Swiftmailer Configuration swiftmailer: diff --git a/app/config/routing.yml b/app/config/routing.yml index e02c91660d..b425c4d4f5 100644 --- a/app/config/routing.yml +++ b/app/config/routing.yml @@ -1,6 +1,6 @@ _welcome: pattern: / - defaults: { _controller: AcmeDemo:Welcome:index } + defaults: { _controller: AcmeDemoBundle:Welcome:index } _demo_secured: resource: "@AcmeDemo/Controller/SecuredController.php" diff --git a/src/Acme/DemoBundle/Controller/WelcomeController.php b/src/Acme/DemoBundle/Controller/WelcomeController.php index f02f99492b..0185aef04e 100644 --- a/src/Acme/DemoBundle/Controller/WelcomeController.php +++ b/src/Acme/DemoBundle/Controller/WelcomeController.php @@ -8,6 +8,6 @@ class WelcomeController extends Controller { public function indexAction() { - return $this->render('AcmeDemo:Welcome:index.html.twig'); + return $this->render('AcmeDemoBundle:Welcome:index.html.twig'); } } diff --git a/src/Acme/DemoBundle/Resources/views/Demo/contact.html.twig b/src/Acme/DemoBundle/Resources/views/Demo/contact.html.twig index 71ebe8a1e8..89a4b36c56 100644 --- a/src/Acme/DemoBundle/Resources/views/Demo/contact.html.twig +++ b/src/Acme/DemoBundle/Resources/views/Demo/contact.html.twig @@ -1,4 +1,4 @@ -{% extends "AcmeDemo::layout.html.twig" %} +{% extends "AcmeDemoBundle::layout.html.twig" %} {% block title "Symfony - Contact form" %} diff --git a/src/Acme/DemoBundle/Resources/views/Demo/hello.html.twig b/src/Acme/DemoBundle/Resources/views/Demo/hello.html.twig index 4881d25917..3997ff606a 100644 --- a/src/Acme/DemoBundle/Resources/views/Demo/hello.html.twig +++ b/src/Acme/DemoBundle/Resources/views/Demo/hello.html.twig @@ -1,4 +1,4 @@ -{% extends "AcmeDemo::layout.html.twig" %} +{% extends "AcmeDemoBundle::layout.html.twig" %} {% block title "Hello " ~ name %} diff --git a/src/Acme/DemoBundle/Resources/views/Demo/index.html.twig b/src/Acme/DemoBundle/Resources/views/Demo/index.html.twig index 85612778df..82e65e6503 100644 --- a/src/Acme/DemoBundle/Resources/views/Demo/index.html.twig +++ b/src/Acme/DemoBundle/Resources/views/Demo/index.html.twig @@ -1,4 +1,4 @@ -{% extends "AcmeDemo::layout.html.twig" %} +{% extends "AcmeDemoBundle::layout.html.twig" %} {% block title "Symfony - Demos" %} diff --git a/src/Acme/DemoBundle/Resources/views/Secured/hello.html.twig b/src/Acme/DemoBundle/Resources/views/Secured/hello.html.twig index 8a87bfa7cf..c8da283832 100644 --- a/src/Acme/DemoBundle/Resources/views/Secured/hello.html.twig +++ b/src/Acme/DemoBundle/Resources/views/Secured/hello.html.twig @@ -1,4 +1,4 @@ -{% extends "AcmeDemo:Secured:layout.html.twig" %} +{% extends "AcmeDemoBundle:Secured:layout.html.twig" %} {% block title "Hello " ~ name %} diff --git a/src/Acme/DemoBundle/Resources/views/Secured/helloadmin.html.twig b/src/Acme/DemoBundle/Resources/views/Secured/helloadmin.html.twig index 2f5e7ca8cf..425213ee56 100644 --- a/src/Acme/DemoBundle/Resources/views/Secured/helloadmin.html.twig +++ b/src/Acme/DemoBundle/Resources/views/Secured/helloadmin.html.twig @@ -1,4 +1,4 @@ -{% extends "AcmeDemo:Secured:layout.html.twig" %} +{% extends "AcmeDemoBundle:Secured:layout.html.twig" %} {% block title "Hello " ~ name %} diff --git a/src/Acme/DemoBundle/Resources/views/Secured/layout.html.twig b/src/Acme/DemoBundle/Resources/views/Secured/layout.html.twig index e65288ddc5..aeea55c5cf 100644 --- a/src/Acme/DemoBundle/Resources/views/Secured/layout.html.twig +++ b/src/Acme/DemoBundle/Resources/views/Secured/layout.html.twig @@ -1,4 +1,4 @@ -{% extends "AcmeDemo::layout.html.twig" %} +{% extends "AcmeDemoBundle::layout.html.twig" %} {% block content_header_more %} {{ parent() }} diff --git a/src/Acme/DemoBundle/Resources/views/Secured/login.html.twig b/src/Acme/DemoBundle/Resources/views/Secured/login.html.twig index 258e855149..005175dc8b 100644 --- a/src/Acme/DemoBundle/Resources/views/Secured/login.html.twig +++ b/src/Acme/DemoBundle/Resources/views/Secured/login.html.twig @@ -1,4 +1,4 @@ -{% extends 'AcmeDemo::layout.html.twig' %} +{% extends 'AcmeDemoBundle::layout.html.twig' %} {% block content %}

    Login

    diff --git a/src/Acme/DemoBundle/Resources/views/Welcome/index.html.twig b/src/Acme/DemoBundle/Resources/views/Welcome/index.html.twig index 115d02a9b4..e50f1b2457 100644 --- a/src/Acme/DemoBundle/Resources/views/Welcome/index.html.twig +++ b/src/Acme/DemoBundle/Resources/views/Welcome/index.html.twig @@ -1,4 +1,4 @@ -{% extends 'AcmeDemo::layout.html.twig' %} +{% extends 'AcmeDemoBundle::layout.html.twig' %} {% block title %}Symfony - Welcome{% endblock %} From 925f9f2fbb28286a7a7b381fe656a5ee6ab25d60 Mon Sep 17 00:00:00 2001 From: Fabien Potencier Date: Mon, 4 Apr 2011 11:17:04 +0200 Subject: [PATCH 073/899] Revert "fixed routing" This reverts commit b8fac2ce636605226a97ac21b0ff330b000d7652. --- app/config/routing_dev.yml | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/app/config/routing_dev.yml b/app/config/routing_dev.yml index 11f26b3909..e806f76fa7 100644 --- a/app/config/routing_dev.yml +++ b/app/config/routing_dev.yml @@ -3,15 +3,15 @@ _assetic: type: assetic _wdt: - resource: "@WebProfiler/Resources/config/routing/wdt.xml" + resource: "@WebProfilerBundle/Resources/config/routing/wdt.xml" prefix: /_wdt _profiler: - resource: "@WebProfiler/Resources/config/routing/profiler.xml" + resource: "@WebProfilerBundle/Resources/config/routing/profiler.xml" prefix: /_profiler _configurator: - resource: "@SymfonyWebConfigurator/Resources/config/routing/configurator.xml" + resource: "@SymfonyWebConfiguratorBundle/Resources/config/routing/configurator.xml" prefix: /_configurator _main: From bcef37f0ce0016e29a25a5119596de31ac48d3f0 Mon Sep 17 00:00:00 2001 From: Fabien Potencier Date: Mon, 4 Apr 2011 11:17:09 +0200 Subject: [PATCH 074/899] Revert "fixed routing" This reverts commit 69a8328dc620e3547a563008e5a3e9d7bbc67594. --- app/config/routing.yml | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/app/config/routing.yml b/app/config/routing.yml index b425c4d4f5..f95dc84b90 100644 --- a/app/config/routing.yml +++ b/app/config/routing.yml @@ -3,10 +3,10 @@ _welcome: defaults: { _controller: AcmeDemoBundle:Welcome:index } _demo_secured: - resource: "@AcmeDemo/Controller/SecuredController.php" + resource: "@AcmeDemoBundle/Controller/SecuredController.php" type: annotation _demo: - resource: "@AcmeDemo/Controller/DemoController.php" + resource: "@AcmeDemoBundle/Controller/DemoController.php" type: annotation prefix: /demo From 4cdecb63d7d8f9b7b161644f3df46621900f3d91 Mon Sep 17 00:00:00 2001 From: Fabien Potencier Date: Mon, 4 Apr 2011 13:01:32 +0200 Subject: [PATCH 075/899] removed zend config --- app/config/config_test.yml | 4 ---- 1 file changed, 4 deletions(-) diff --git a/app/config/config_test.yml b/app/config/config_test.yml index b0b372fdce..dd18732089 100644 --- a/app/config/config_test.yml +++ b/app/config/config_test.yml @@ -8,7 +8,3 @@ framework: web_profiler: toolbar: false intercept_redirects: false - -zend: - logger: - priority: debug From 4f9ed79dceaa57fe6268426668ee99605f0adc57 Mon Sep 17 00:00:00 2001 From: Christophe Coevoet Date: Mon, 4 Apr 2011 16:05:46 +0200 Subject: [PATCH 076/899] Fixed vendors script --- bin/vendors.sh | 1 - 1 file changed, 1 deletion(-) diff --git a/bin/vendors.sh b/bin/vendors.sh index 8ae139a9e8..fd23ff80ff 100755 --- a/bin/vendors.sh +++ b/bin/vendors.sh @@ -71,7 +71,6 @@ install_git twig-extensions git://github.com/fabpot/Twig-extensions.git # Monolog install_git monolog git://github.com/Seldaek/monolog.git -cd ../.. # SensioFrameworkExtraBundle mkdir -p bundles/Sensio/Bundle From 11c85b8bab62c3fc4d8c442f5e674cbe7af1c76f Mon Sep 17 00:00:00 2001 From: Lukas Kahwe Smith Date: Mon, 4 Apr 2011 17:40:37 +0200 Subject: [PATCH 077/899] made the checkout process more resilient by using absolute paths also output the current vendor for better debugging and build bootstrap at the very end to allow for more classes to be included --- bin/vendors.sh | 27 +++++++++++++++------------ 1 file changed, 15 insertions(+), 12 deletions(-) diff --git a/bin/vendors.sh b/bin/vendors.sh index fd23ff80ff..a7a7ff104e 100755 --- a/bin/vendors.sh +++ b/bin/vendors.sh @@ -3,6 +3,8 @@ DIR=`php -r "echo dirname(dirname(realpath('$0')));"` VENDOR="$DIR/vendor" VERSION=`cat "$DIR/VERSION"` +BUNDLES=$VENDOR/bundles +SRC=$DIR/src # initialization if [ "$1" = "--reinstall" -o "$2" = "--reinstall" ]; then @@ -28,6 +30,8 @@ install_git() SOURCE_URL=$2 REV=$3 + echo $INSTALL_DIR + if [ -z $REV ]; then REV=origin/HEAD fi @@ -48,9 +52,6 @@ install_git assetic git://github.com/kriswallsmith/assetic.git #v1.0.0alpha1 # Symfony install_git symfony git://github.com/symfony/symfony.git #v$VERSION -# Update the bootstrap files -$DIR/bin/build_bootstrap.php - # Doctrine ORM install_git doctrine git://github.com/doctrine/doctrine2.git 2.0.3 @@ -73,22 +74,24 @@ install_git twig-extensions git://github.com/fabpot/Twig-extensions.git install_git monolog git://github.com/Seldaek/monolog.git # SensioFrameworkExtraBundle -mkdir -p bundles/Sensio/Bundle -cd bundles/Sensio/Bundle +mkdir -p $BUNDLES/Sensio/Bundle +cd $BUNDLES/Sensio/Bundle install_git FrameworkExtraBundle git://github.com/sensio/SensioFrameworkExtraBundle.git -cd ../../.. # SecurityExtraBundle -mkdir -p bundles/JMS -cd bundles/JMS +mkdir -p $BUNDLES/JMS +cd $BUNDLES/JMS install_git SecurityExtraBundle git://github.com/schmittjoh/SecurityExtraBundle.git -cd ../.. + +# Symfony bundles +mkdir -p $BUNDLES/Symfony/Bundle +cd $BUNDLES/Symfony/Bundle # WebConfiguratorBundle -mkdir -p bundles/Symfony/Bundle -cd bundles/Symfony/Bundle install_git WebConfiguratorBundle git://github.com/symfony/WebConfiguratorBundle.git -cd ../../.. + +# Update the bootstrap files +$DIR/bin/build_bootstrap.php # Update assets $DIR/app/console assets:install $DIR/web/ From 92bf95500c71ecef0ddbed1356518820b423dbec Mon Sep 17 00:00:00 2001 From: Victor Berchet Date: Mon, 4 Apr 2011 17:59:50 +0200 Subject: [PATCH 078/899] [AcmeDemoBundle] Fix css to wrap text --- src/Acme/DemoBundle/Resources/public/css/demo.css | 1 + 1 file changed, 1 insertion(+) diff --git a/src/Acme/DemoBundle/Resources/public/css/demo.css b/src/Acme/DemoBundle/Resources/public/css/demo.css index 6fce8c3124..7aa3efd7d0 100644 --- a/src/Acme/DemoBundle/Resources/public/css/demo.css +++ b/src/Acme/DemoBundle/Resources/public/css/demo.css @@ -122,6 +122,7 @@ ul li -webkit-border-radius: 16px; border-radius: 16px; margin-bottom: 20px; + word-wrap: break-word; } #symfony-search From e75df3537c0d5717ccb4c4a9cce193730a36dafe Mon Sep 17 00:00:00 2001 From: Lukas Kahwe Smith Date: Mon, 4 Apr 2011 21:37:32 +0200 Subject: [PATCH 079/899] removed unused SRC var --- bin/vendors.sh | 1 - 1 file changed, 1 deletion(-) diff --git a/bin/vendors.sh b/bin/vendors.sh index a7a7ff104e..edabea6994 100755 --- a/bin/vendors.sh +++ b/bin/vendors.sh @@ -4,7 +4,6 @@ DIR=`php -r "echo dirname(dirname(realpath('$0')));"` VENDOR="$DIR/vendor" VERSION=`cat "$DIR/VERSION"` BUNDLES=$VENDOR/bundles -SRC=$DIR/src # initialization if [ "$1" = "--reinstall" -o "$2" = "--reinstall" ]; then From 0b40f0fae35ce236368309cd96f96ee0d6b41af1 Mon Sep 17 00:00:00 2001 From: Fabien Potencier Date: Tue, 5 Apr 2011 10:35:33 +0200 Subject: [PATCH 080/899] updated VERSION --- VERSION | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/VERSION b/VERSION index 3cf4766cf0..6a90f8b35f 100644 --- a/VERSION +++ b/VERSION @@ -1 +1 @@ -2.0.0PR9 \ No newline at end of file +2.0.0PR10 From d7c694e8f3f583e6e672e89d381ae35c35f3de48 Mon Sep 17 00:00:00 2001 From: Fabien Potencier Date: Tue, 5 Apr 2011 10:35:50 +0200 Subject: [PATCH 081/899] tweaked message in vendors.sh --- bin/vendors.sh | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/bin/vendors.sh b/bin/vendors.sh index edabea6994..621db6cd7f 100755 --- a/bin/vendors.sh +++ b/bin/vendors.sh @@ -29,7 +29,7 @@ install_git() SOURCE_URL=$2 REV=$3 - echo $INSTALL_DIR + echo "> Installing/Updating " $INSTALL_DIR if [ -z $REV ]; then REV=origin/HEAD From c932c4c521f121f20875ea5c0f24d7e0e3dbe19f Mon Sep 17 00:00:00 2001 From: Fabien Potencier Date: Tue, 5 Apr 2011 10:46:58 +0200 Subject: [PATCH 082/899] changed all vendor URLs to HTTPS instead of Git --- bin/vendors.sh | 26 +++++++++++++------------- 1 file changed, 13 insertions(+), 13 deletions(-) diff --git a/bin/vendors.sh b/bin/vendors.sh index 621db6cd7f..8b1b049e94 100755 --- a/bin/vendors.sh +++ b/bin/vendors.sh @@ -20,7 +20,7 @@ mkdir -p "$VENDOR" && cd "$VENDOR" ## # @param destination directory (e.g. "doctrine") -# @param URL of the git remote (e.g. git://github.com/doctrine/doctrine2.git) +# @param URL of the git remote (e.g. https://github.com/doctrine/doctrine2.git) # @param revision to point the head (e.g. origin/HEAD) # install_git() @@ -46,48 +46,48 @@ install_git() } # Assetic -install_git assetic git://github.com/kriswallsmith/assetic.git #v1.0.0alpha1 +install_git assetic https://github.com/kriswallsmith/assetic.git #v1.0.0alpha1 # Symfony -install_git symfony git://github.com/symfony/symfony.git #v$VERSION +install_git symfony https://github.com/symfony/symfony.git #v$VERSION # Doctrine ORM -install_git doctrine git://github.com/doctrine/doctrine2.git 2.0.3 +install_git doctrine https://github.com/doctrine/doctrine2.git 2.0.3 # Doctrine DBAL -install_git doctrine-dbal git://github.com/doctrine/dbal.git 2.0.3 +install_git doctrine-dbal https://github.com/doctrine/dbal.git 2.0.3 # Doctrine Common -install_git doctrine-common git://github.com/doctrine/common.git 2.0.1 +install_git doctrine-common https://github.com/doctrine/common.git 2.0.1 # Swiftmailer -install_git swiftmailer git://github.com/swiftmailer/swiftmailer.git origin/4.1 +install_git swiftmailer https://github.com/swiftmailer/swiftmailer.git origin/4.1 # Twig -install_git twig git://github.com/fabpot/Twig.git v1.0.0 +install_git twig https://github.com/fabpot/Twig.git v1.0.0 # Twig Extensions -install_git twig-extensions git://github.com/fabpot/Twig-extensions.git +install_git twig-extensions https://github.com/fabpot/Twig-extensions.git # Monolog -install_git monolog git://github.com/Seldaek/monolog.git +install_git monolog https://github.com/Seldaek/monolog.git # SensioFrameworkExtraBundle mkdir -p $BUNDLES/Sensio/Bundle cd $BUNDLES/Sensio/Bundle -install_git FrameworkExtraBundle git://github.com/sensio/SensioFrameworkExtraBundle.git +install_git FrameworkExtraBundle https://github.com/sensio/SensioFrameworkExtraBundle.git # SecurityExtraBundle mkdir -p $BUNDLES/JMS cd $BUNDLES/JMS -install_git SecurityExtraBundle git://github.com/schmittjoh/SecurityExtraBundle.git +install_git SecurityExtraBundle https://github.com/schmittjoh/SecurityExtraBundle.git # Symfony bundles mkdir -p $BUNDLES/Symfony/Bundle cd $BUNDLES/Symfony/Bundle # WebConfiguratorBundle -install_git WebConfiguratorBundle git://github.com/symfony/WebConfiguratorBundle.git +install_git WebConfiguratorBundle https://github.com/symfony/WebConfiguratorBundle.git # Update the bootstrap files $DIR/bin/build_bootstrap.php From 9e1605c4b7a1e47c04639c87ad9790b691b8275c Mon Sep 17 00:00:00 2001 From: Jordi Boggiano Date: Fri, 8 Apr 2011 10:16:28 +0200 Subject: [PATCH 083/899] Adjust for latest MonologBundle change --- app/config/config_prod.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/app/config/config_prod.yml b/app/config/config_prod.yml index 37de15cd48..4dffd458e8 100644 --- a/app/config/config_prod.yml +++ b/app/config/config_prod.yml @@ -4,7 +4,7 @@ imports: monolog: handlers: main: - type: fingerscrossed + type: fingers_crossed action_level: error handler: nested nested: From 6a5390badf62eacab667589b9c5fc2e7b5c745cf Mon Sep 17 00:00:00 2001 From: Lukas Kahwe Smith Date: Fri, 8 Apr 2011 20:07:00 +0200 Subject: [PATCH 084/899] updated doctrine orm/dbal/common --- bin/vendors.sh | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/bin/vendors.sh b/bin/vendors.sh index 8b1b049e94..fccec6fcb3 100755 --- a/bin/vendors.sh +++ b/bin/vendors.sh @@ -52,13 +52,13 @@ install_git assetic https://github.com/kriswallsmith/assetic.git #v1.0.0alpha1 install_git symfony https://github.com/symfony/symfony.git #v$VERSION # Doctrine ORM -install_git doctrine https://github.com/doctrine/doctrine2.git 2.0.3 +install_git doctrine https://github.com/doctrine/doctrine2.git 2.0.4 # Doctrine DBAL -install_git doctrine-dbal https://github.com/doctrine/dbal.git 2.0.3 +install_git doctrine-dbal https://github.com/doctrine/dbal.git 2.0.4 # Doctrine Common -install_git doctrine-common https://github.com/doctrine/common.git 2.0.1 +install_git doctrine-common https://github.com/doctrine/common.git 2.0.2 # Swiftmailer install_git swiftmailer https://github.com/swiftmailer/swiftmailer.git origin/4.1 From 4fec08f2eba71eb5229757b417f8848dedbb5bbe Mon Sep 17 00:00:00 2001 From: Fabien Potencier Date: Tue, 12 Apr 2011 15:49:16 +0200 Subject: [PATCH 085/899] switched Twig to use the upcoming 1.1 version (as error messages are much better as everything is BC) --- bin/vendors.sh | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/bin/vendors.sh b/bin/vendors.sh index fccec6fcb3..e7fc1673cf 100755 --- a/bin/vendors.sh +++ b/bin/vendors.sh @@ -64,7 +64,7 @@ install_git doctrine-common https://github.com/doctrine/common.git 2.0.2 install_git swiftmailer https://github.com/swiftmailer/swiftmailer.git origin/4.1 # Twig -install_git twig https://github.com/fabpot/Twig.git v1.0.0 +install_git twig https://github.com/fabpot/Twig.git # Twig Extensions install_git twig-extensions https://github.com/fabpot/Twig-extensions.git From d8aedac61aec5121d73f9ccbe4223303b16af73a Mon Sep 17 00:00:00 2001 From: Fabien Potencier Date: Tue, 12 Apr 2011 15:57:11 +0200 Subject: [PATCH 086/899] updated VERSION --- VERSION | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/VERSION b/VERSION index 6a90f8b35f..3548e8e401 100644 --- a/VERSION +++ b/VERSION @@ -1 +1 @@ -2.0.0PR10 +2.0.0PR11 From 34ad3b77090d2203a996d0ebd04e9768f4b3fc22 Mon Sep 17 00:00:00 2001 From: Jordi Boggiano Date: Sat, 16 Apr 2011 14:50:09 +0200 Subject: [PATCH 087/899] changed all vendor URLs to HTTP instead of HTTPS --- bin/vendors.sh | 26 +++++++++++++------------- 1 file changed, 13 insertions(+), 13 deletions(-) diff --git a/bin/vendors.sh b/bin/vendors.sh index fccec6fcb3..a83ced28d8 100755 --- a/bin/vendors.sh +++ b/bin/vendors.sh @@ -20,7 +20,7 @@ mkdir -p "$VENDOR" && cd "$VENDOR" ## # @param destination directory (e.g. "doctrine") -# @param URL of the git remote (e.g. https://github.com/doctrine/doctrine2.git) +# @param URL of the git remote (e.g. http://github.com/doctrine/doctrine2.git) # @param revision to point the head (e.g. origin/HEAD) # install_git() @@ -46,48 +46,48 @@ install_git() } # Assetic -install_git assetic https://github.com/kriswallsmith/assetic.git #v1.0.0alpha1 +install_git assetic http://github.com/kriswallsmith/assetic.git #v1.0.0alpha1 # Symfony -install_git symfony https://github.com/symfony/symfony.git #v$VERSION +install_git symfony http://github.com/symfony/symfony.git #v$VERSION # Doctrine ORM -install_git doctrine https://github.com/doctrine/doctrine2.git 2.0.4 +install_git doctrine http://github.com/doctrine/doctrine2.git 2.0.4 # Doctrine DBAL -install_git doctrine-dbal https://github.com/doctrine/dbal.git 2.0.4 +install_git doctrine-dbal http://github.com/doctrine/dbal.git 2.0.4 # Doctrine Common -install_git doctrine-common https://github.com/doctrine/common.git 2.0.2 +install_git doctrine-common http://github.com/doctrine/common.git 2.0.2 # Swiftmailer -install_git swiftmailer https://github.com/swiftmailer/swiftmailer.git origin/4.1 +install_git swiftmailer http://github.com/swiftmailer/swiftmailer.git origin/4.1 # Twig -install_git twig https://github.com/fabpot/Twig.git v1.0.0 +install_git twig http://github.com/fabpot/Twig.git v1.0.0 # Twig Extensions -install_git twig-extensions https://github.com/fabpot/Twig-extensions.git +install_git twig-extensions http://github.com/fabpot/Twig-extensions.git # Monolog -install_git monolog https://github.com/Seldaek/monolog.git +install_git monolog http://github.com/Seldaek/monolog.git # SensioFrameworkExtraBundle mkdir -p $BUNDLES/Sensio/Bundle cd $BUNDLES/Sensio/Bundle -install_git FrameworkExtraBundle https://github.com/sensio/SensioFrameworkExtraBundle.git +install_git FrameworkExtraBundle http://github.com/sensio/SensioFrameworkExtraBundle.git # SecurityExtraBundle mkdir -p $BUNDLES/JMS cd $BUNDLES/JMS -install_git SecurityExtraBundle https://github.com/schmittjoh/SecurityExtraBundle.git +install_git SecurityExtraBundle http://github.com/schmittjoh/SecurityExtraBundle.git # Symfony bundles mkdir -p $BUNDLES/Symfony/Bundle cd $BUNDLES/Symfony/Bundle # WebConfiguratorBundle -install_git WebConfiguratorBundle https://github.com/symfony/WebConfiguratorBundle.git +install_git WebConfiguratorBundle http://github.com/symfony/WebConfiguratorBundle.git # Update the bootstrap files $DIR/bin/build_bootstrap.php From 1f2be22b0368cc19ec92716a90e170560f4c6bab Mon Sep 17 00:00:00 2001 From: Fabien Potencier Date: Tue, 19 Apr 2011 14:55:27 +0200 Subject: [PATCH 088/899] updated VERSION --- VERSION | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/VERSION b/VERSION index 3548e8e401..4bd6e2edd1 100644 --- a/VERSION +++ b/VERSION @@ -1 +1 @@ -2.0.0PR11 +2.0.0PR12 From 7ee066a48d8751849d305ea368270e88dd6e8323 Mon Sep 17 00:00:00 2001 From: Miha Vrhovnik Date: Tue, 19 Apr 2011 17:15:28 +0200 Subject: [PATCH 089/899] Adding check for json extension into the config.php script. This fixes trac ticket #9635 --- web/config.php | 4 ++++ 1 file changed, 4 insertions(+) diff --git a/web/config.php b/web/config.php index b8921eee40..f4f8fca795 100644 --- a/web/config.php +++ b/web/config.php @@ -77,6 +77,10 @@ $majorProblems[] = 'Install and enable the SQLite or PDO_SQLite extension.'; } +if (!function_exists('json_encode')) { + $majorProblems[] = 'Install and enable the json extension.'; +} + // php.ini if (!ini_get('date.timezone')) { $phpini = true; From d075972dc61c15c096a79a959bfa346b41e2b6de Mon Sep 17 00:00:00 2001 From: Miha Vrhovnik Date: Thu, 21 Apr 2011 09:25:24 +0200 Subject: [PATCH 090/899] Added a check for json extension --- app/check.php | 1 + 1 file changed, 1 insertion(+) diff --git a/app/check.php b/app/check.php index c9e8ebb2d9..7c6b399df3 100644 --- a/app/check.php +++ b/app/check.php @@ -44,6 +44,7 @@ check(ini_get('date.timezone'), 'Checking that the "date.timezone" setting is set', 'Set the "date.timezone" setting in php.ini (like Europe/Paris)', true); check(is_writable(__DIR__.'/../app/cache'), sprintf('Checking that app/cache/ directory is writable'), 'Change the permissions of the app/cache/ directory so that the web server can write in it', true); check(is_writable(__DIR__.'/../app/logs'), sprintf('Checking that the app/logs/ directory is writable'), 'Change the permissions of the app/logs/ directory so that the web server can write in it', true); +check(function_exists('json_encode'), 'Checking that the json_encode() is available', 'Install and enable the json extension', true); // warnings echo_title("Optional checks"); From 8f1d18e2e651476951272b515f380c205ca751b4 Mon Sep 17 00:00:00 2001 From: Jordi Boggiano Date: Mon, 25 Apr 2011 17:49:12 +0200 Subject: [PATCH 091/899] Add firephp log output by default in dev config --- app/config/config_dev.yml | 3 +++ 1 file changed, 3 insertions(+) diff --git a/app/config/config_dev.yml b/app/config/config_dev.yml index 7599e922f4..671f52f0db 100644 --- a/app/config/config_dev.yml +++ b/app/config/config_dev.yml @@ -15,6 +15,9 @@ monolog: type: stream path: %kernel.logs_dir%/%kernel.environment%.log level: debug + firephp: + type: firephp + level: info assetic: use_controller: true From 965af19452dbf8c9ad8b9c25eb8054c61f8f48b8 Mon Sep 17 00:00:00 2001 From: Fabien Potencier Date: Tue, 26 Apr 2011 13:44:48 +0200 Subject: [PATCH 092/899] use Assetic alpha2 --- bin/vendors.sh | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/bin/vendors.sh b/bin/vendors.sh index bcac963647..c828490e32 100755 --- a/bin/vendors.sh +++ b/bin/vendors.sh @@ -46,7 +46,7 @@ install_git() } # Assetic -install_git assetic http://github.com/kriswallsmith/assetic.git #v1.0.0alpha1 +install_git assetic http://github.com/kriswallsmith/assetic.git v1.0.0alpha2 # Symfony install_git symfony http://github.com/symfony/symfony.git #v$VERSION From 7e5d1a71411dcea5a5da09945b634dbd02260b72 Mon Sep 17 00:00:00 2001 From: Fabien Potencier Date: Wed, 27 Apr 2011 12:40:07 +0200 Subject: [PATCH 093/899] simplified default configuration --- app/config/config.yml | 20 +++++++------------- 1 file changed, 7 insertions(+), 13 deletions(-) diff --git a/app/config/config.yml b/app/config/config.yml index 838e3dad60..15c41b808b 100644 --- a/app/config/config.yml +++ b/app/config/config.yml @@ -35,22 +35,16 @@ assetic: # Doctrine Configuration doctrine: dbal: - default_connection: default - connections: - default: - driver: %database_driver% - host: %database_host% - dbname: %database_name% - user: %database_user% - password: %database_password% + driver: %database_driver% + host: %database_host% + dbname: %database_name% + user: %database_user% + password: %database_password% orm: auto_generate_proxy_classes: %kernel.debug% - default_entity_manager: default - entity_managers: - default: - mappings: - AcmeDemoBundle: ~ + mappings: + AcmeDemoBundle: ~ # Swiftmailer Configuration swiftmailer: From 715eaf17bd7b2eb2b2212da90758012799dbc750 Mon Sep 17 00:00:00 2001 From: Fabien Potencier Date: Wed, 27 Apr 2011 17:44:47 +0200 Subject: [PATCH 094/899] updated Doctrine configuration --- app/config/config.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/app/config/config.yml b/app/config/config.yml index 15c41b808b..3afc92bcda 100644 --- a/app/config/config.yml +++ b/app/config/config.yml @@ -44,7 +44,7 @@ doctrine: orm: auto_generate_proxy_classes: %kernel.debug% mappings: - AcmeDemoBundle: ~ + auto_mapping: true # Swiftmailer Configuration swiftmailer: From 29b69e90af657fd6136b760c2d15d96f7546688c Mon Sep 17 00:00:00 2001 From: Fabien Potencier Date: Wed, 27 Apr 2011 18:20:42 +0200 Subject: [PATCH 095/899] fixed typo --- app/config/config.yml | 3 +-- 1 file changed, 1 insertion(+), 2 deletions(-) diff --git a/app/config/config.yml b/app/config/config.yml index 3afc92bcda..2951aab0ac 100644 --- a/app/config/config.yml +++ b/app/config/config.yml @@ -43,8 +43,7 @@ doctrine: orm: auto_generate_proxy_classes: %kernel.debug% - mappings: - auto_mapping: true + auto_mapping: true # Swiftmailer Configuration swiftmailer: From ae608b7c52da1ebe8946fb1b184012cc43b460e9 Mon Sep 17 00:00:00 2001 From: Fabien Potencier Date: Thu, 28 Apr 2011 11:01:57 +0200 Subject: [PATCH 096/899] updated secret management --- app/config/config.yml | 2 +- app/config/parameters.ini | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/app/config/config.yml b/app/config/config.yml index 2951aab0ac..0b3d474888 100644 --- a/app/config/config.yml +++ b/app/config/config.yml @@ -3,11 +3,11 @@ imports: - { resource: security.yml } framework: + secret: %secret% charset: UTF-8 error_handler: null csrf_protection: enabled: true - secret: %csrf_secret% router: { resource: "%kernel.root_dir%/config/routing.yml" } validation: { enabled: true, annotations: true } templating: { engines: ['twig'] } #assets_version: SomeVersionScheme diff --git a/app/config/parameters.ini b/app/config/parameters.ini index 720fae3e03..039269baae 100644 --- a/app/config/parameters.ini +++ b/app/config/parameters.ini @@ -12,4 +12,4 @@ locale = en - csrf_secret = ThisTokenIsNotSoSecretChangeIt + secret = ThisTokenIsNotSoSecretChangeIt From 10134f9ddbf2346f38b538a896b55fa55de072f0 Mon Sep 17 00:00:00 2001 From: Fabien Potencier Date: Thu, 28 Apr 2011 14:13:58 +0200 Subject: [PATCH 097/899] updated README --- README.md | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/README.md b/README.md index 935ab65e5a..be70fbfded 100644 --- a/README.md +++ b/README.md @@ -11,7 +11,7 @@ Symfony Standard Edition comes pre-configured with the following bundles: * DoctrineBundle * TwigBundle * SwiftmailerBundle - * ZendBundle + * MonologBundle * AsseticBundle * WebProfilerBundle (in dev/test env) * SymfonyWebConfiguratorBundle (in dev/test env) From b4094ed631dea84c751cead2503ae6e7ec03de62 Mon Sep 17 00:00:00 2001 From: Fabien Potencier Date: Thu, 28 Apr 2011 14:49:50 +0200 Subject: [PATCH 098/899] tweaked front controllers to enable PHP class caches --- web/app.php | 1 + web/app_dev.php | 1 + 2 files changed, 2 insertions(+) diff --git a/web/app.php b/web/app.php index dd7aca97d6..38619cd669 100644 --- a/web/app.php +++ b/web/app.php @@ -9,4 +9,5 @@ //$kernel = new AppCache(new AppKernel('prod', false)); $kernel = new AppKernel('prod', false); +$kernel->loadClassCache(); $kernel->handle(Request::createFromGlobals())->send(); diff --git a/web/app_dev.php b/web/app_dev.php index 960b8892f9..d73f15755e 100644 --- a/web/app_dev.php +++ b/web/app_dev.php @@ -16,4 +16,5 @@ use Symfony\Component\HttpFoundation\Request; $kernel = new AppKernel('dev', true); +$kernel->loadClassCache(); $kernel->handle(Request::createFromGlobals())->send(); From 73e17d3d4e2692a2c321fdedaa85f5765e552e12 Mon Sep 17 00:00:00 2001 From: Fabien Potencier Date: Thu, 28 Apr 2011 16:10:54 +0200 Subject: [PATCH 099/899] updated Assetic vendor --- bin/vendors.sh | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/bin/vendors.sh b/bin/vendors.sh index c828490e32..4c8c112b04 100755 --- a/bin/vendors.sh +++ b/bin/vendors.sh @@ -46,7 +46,7 @@ install_git() } # Assetic -install_git assetic http://github.com/kriswallsmith/assetic.git v1.0.0alpha2 +install_git assetic http://github.com/kriswallsmith/assetic.git # Symfony install_git symfony http://github.com/symfony/symfony.git #v$VERSION From c6bc231340a70eaea511aed72d8f1cf510ce71b9 Mon Sep 17 00:00:00 2001 From: Fabien Potencier Date: Fri, 29 Apr 2011 13:15:32 +0200 Subject: [PATCH 100/899] tagged BETA1 --- VERSION | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/VERSION b/VERSION index 4bd6e2edd1..cc462a6572 100644 --- a/VERSION +++ b/VERSION @@ -1 +1 @@ -2.0.0PR12 +2.0.0BETA1 From 4a1eac6bfb66daa53adab55daa6d9cbae4986b6f Mon Sep 17 00:00:00 2001 From: Mark Badolato Date: Sat, 30 Apr 2011 13:01:57 -0700 Subject: [PATCH 101/899] Removed no-longer needed instruction about removing the Acme reference from app/config/config.yml. Fixed a formatting issue causing the Markdown to display incorrectly --- README.md | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/README.md b/README.md index be70fbfded..17b2e9067c 100644 --- a/README.md +++ b/README.md @@ -53,10 +53,10 @@ The distribution is configured with the following defaults: * Annotations for everything are enabled. A default bundle, `AcmeDemoBundle`, shows you Symfony2 in action. After -playing with it, you can remove it by following these steps : +playing with it, you can remove it by following these steps: + * delete the `src/Acme` directory. * remove the routing entry in `app/config/routing.yml`. - * remove the `Acme` reference in `app/config/config.yml`. * remove the AcmeBundle from the registered bundles in `app/AppKernel.php` * remove the Acme registered namespace in `app/autoload.php` From b2b7338cb8e4953cfede19bcb99099655d93841f Mon Sep 17 00:00:00 2001 From: Damien Alexandre Date: Sun, 1 May 2011 01:52:16 -0700 Subject: [PATCH 102/899] Remove the build_bootstrap and assets install commands as they are launch by vendord.sh --- README.md | 2 -- 1 file changed, 2 deletions(-) diff --git a/README.md b/README.md index be70fbfded..c8f640bbb6 100644 --- a/README.md +++ b/README.md @@ -36,8 +36,6 @@ distribution. If you still want to use Git, your are on your own. Run the following scripts: * `bin/vendors.sh` (use `--min` if you don't want all the history) - * `bin/build_bootstrap.php` - * `app/console assets:install web/` Configuration ------------- From e33734f7f9e5168b77845820beb65ebb95c06e7f Mon Sep 17 00:00:00 2001 From: Nathan Vonnahme Date: Mon, 2 May 2011 15:33:54 -0700 Subject: [PATCH 103/899] Added comments to top of file. This would have saved me at least 10 minutes chasing an error when I commented out a line using `#` . --- app/config/parameters.ini | 2 ++ 1 file changed, 2 insertions(+) diff --git a/app/config/parameters.ini b/app/config/parameters.ini index 039269baae..271bc12f97 100644 --- a/app/config/parameters.ini +++ b/app/config/parameters.ini @@ -1,3 +1,5 @@ +; These parameters can be imported into other config files as %foo% +; Comments start with ';', as in php.ini [parameters] database_driver = pdo_mysql database_host = localhost From 7788178791dafa4c18a5294797406e909c66d5d8 Mon Sep 17 00:00:00 2001 From: Fabien Potencier Date: Thu, 5 May 2011 08:40:08 +0200 Subject: [PATCH 104/899] tweaked README --- README.md | 5 +++-- 1 file changed, 3 insertions(+), 2 deletions(-) diff --git a/README.md b/README.md index d119c61b5e..6662cb7aba 100644 --- a/README.md +++ b/README.md @@ -20,8 +20,9 @@ Symfony Standard Edition comes pre-configured with the following bundles: Installation from an Archive ---------------------------- -If you have downloaded an archive, unpack it somewhere under your web server -root directory. +The easiest way to get started is to download an archive with vendors included +(http://symfony.com/download). Unpack it somewhere under your web server root +directory and you're done. If you have downloaded an archive without the vendors, run the `bin/vendors.sh` script (`git` must be installed on your machine). If you From 258b728808217cea48a6e0b994ff1b6f941dab40 Mon Sep 17 00:00:00 2001 From: Fabien Potencier Date: Thu, 5 May 2011 08:54:03 +0200 Subject: [PATCH 105/899] added AppKernel::init() with sensible defaults --- app/AppKernel.php | 15 +++++++++++++++ app/config/config.yml | 1 - 2 files changed, 15 insertions(+), 1 deletion(-) diff --git a/app/AppKernel.php b/app/AppKernel.php index 6285de337d..899626cc10 100644 --- a/app/AppKernel.php +++ b/app/AppKernel.php @@ -2,6 +2,8 @@ use Symfony\Component\HttpKernel\Kernel; use Symfony\Component\Config\Loader\LoaderInterface; +use Symfony\Component\ClassLoader\DebugUniversalClassLoader; +use Symfony\Component\HttpKernel\Debug\ErrorHandler; class AppKernel extends Kernel { @@ -28,6 +30,19 @@ public function registerBundles() return $bundles; } + public function init() + { + if ($this->debug) { + ini_set('display_errors', 1); + error_reporting(-1); + + DebugUniversalClassLoader::enable(); + ErrorHandler::register(); + } else { + ini_set('display_errors', 0); + } + } + public function registerContainerConfiguration(LoaderInterface $loader) { $loader->load(__DIR__.'/config/config_'.$this->getEnvironment().'.yml'); diff --git a/app/config/config.yml b/app/config/config.yml index 0b3d474888..c024113964 100644 --- a/app/config/config.yml +++ b/app/config/config.yml @@ -5,7 +5,6 @@ imports: framework: secret: %secret% charset: UTF-8 - error_handler: null csrf_protection: enabled: true router: { resource: "%kernel.root_dir%/config/routing.yml" } From 28da5a5b9bc04bca362c99dd089889f9a84501e7 Mon Sep 17 00:00:00 2001 From: Brikou CARRE Date: Thu, 5 May 2011 10:29:08 +0200 Subject: [PATCH 106/899] fixed test config (error_handler removed) --- app/config/config_test.yml | 1 - 1 file changed, 1 deletion(-) diff --git a/app/config/config_test.yml b/app/config/config_test.yml index dd18732089..2296633984 100644 --- a/app/config/config_test.yml +++ b/app/config/config_test.yml @@ -2,7 +2,6 @@ imports: - { resource: config_dev.yml } framework: - error_handler: false test: ~ web_profiler: From 56c972fd9010fdbe0875a27b6a82677ac7087c24 Mon Sep 17 00:00:00 2001 From: Chekote Date: Thu, 5 May 2011 10:37:23 -0500 Subject: [PATCH 107/899] Disabled the Acme bundle in the Production environment as specified by the "What's inside?" section of the README --- app/AppKernel.php | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/app/AppKernel.php b/app/AppKernel.php index 899626cc10..7c90e75ed9 100644 --- a/app/AppKernel.php +++ b/app/AppKernel.php @@ -19,10 +19,10 @@ public function registerBundles() new Symfony\Bundle\AsseticBundle\AsseticBundle(), new Sensio\Bundle\FrameworkExtraBundle\SensioFrameworkExtraBundle(), new JMS\SecurityExtraBundle\JMSSecurityExtraBundle(), - new Acme\DemoBundle\AcmeDemoBundle(), ); if (in_array($this->getEnvironment(), array('dev', 'test'))) { + $bundles[] = new Acme\DemoBundle\AcmeDemoBundle(); $bundles[] = new Symfony\Bundle\WebProfilerBundle\WebProfilerBundle(); $bundles[] = new Symfony\Bundle\WebConfiguratorBundle\SymfonyWebConfiguratorBundle(); } From 7fdfbdc19a579a4c3edda1b9593ec166e41317b9 Mon Sep 17 00:00:00 2001 From: Jordi Boggiano Date: Fri, 6 May 2011 17:05:33 +0200 Subject: [PATCH 108/899] Add default test storage to config_test.yml --- app/config/config_test.yml | 2 ++ 1 file changed, 2 insertions(+) diff --git a/app/config/config_test.yml b/app/config/config_test.yml index 2296633984..a002a8d51b 100644 --- a/app/config/config_test.yml +++ b/app/config/config_test.yml @@ -3,6 +3,8 @@ imports: framework: test: ~ + session: + storage_id: session.storage.filesystem web_profiler: toolbar: false From 686f8036954a789b1f0a3d7099b2f6640deb67a0 Mon Sep 17 00:00:00 2001 From: Fabien Potencier Date: Wed, 11 May 2011 11:19:39 +0200 Subject: [PATCH 109/899] moved the AcmeBundle routes to routing_dev.yml --- README.md | 8 ++++---- app/config/routing.yml | 12 ------------ app/config/routing_dev.yml | 13 +++++++++++++ 3 files changed, 17 insertions(+), 16 deletions(-) diff --git a/README.md b/README.md index 6662cb7aba..7dda0371c5 100644 --- a/README.md +++ b/README.md @@ -54,10 +54,10 @@ The distribution is configured with the following defaults: A default bundle, `AcmeDemoBundle`, shows you Symfony2 in action. After playing with it, you can remove it by following these steps: - * delete the `src/Acme` directory. - * remove the routing entry in `app/config/routing.yml`. - * remove the AcmeBundle from the registered bundles in `app/AppKernel.php` - * remove the Acme registered namespace in `app/autoload.php` + * delete the `src/Acme` directory; + * remove the routing entries referencing AcmeBundle in `app/config/routing_dev.yml`; + * remove the AcmeBundle from the registered bundles in `app/AppKernel.php`; + * remove the Acme registered namespace in `app/autoload.php`. Configure the distribution by editing `app/config/parameters.ini` or by accessing `web/config.php` in a browser. diff --git a/app/config/routing.yml b/app/config/routing.yml index f95dc84b90..e69de29bb2 100644 --- a/app/config/routing.yml +++ b/app/config/routing.yml @@ -1,12 +0,0 @@ -_welcome: - pattern: / - defaults: { _controller: AcmeDemoBundle:Welcome:index } - -_demo_secured: - resource: "@AcmeDemoBundle/Controller/SecuredController.php" - type: annotation - -_demo: - resource: "@AcmeDemoBundle/Controller/DemoController.php" - type: annotation - prefix: /demo diff --git a/app/config/routing_dev.yml b/app/config/routing_dev.yml index e806f76fa7..b7aa4a07e8 100644 --- a/app/config/routing_dev.yml +++ b/app/config/routing_dev.yml @@ -1,3 +1,16 @@ +_welcome: + pattern: / + defaults: { _controller: AcmeDemoBundle:Welcome:index } + +_demo_secured: + resource: "@AcmeDemoBundle/Controller/SecuredController.php" + type: annotation + +_demo: + resource: "@AcmeDemoBundle/Controller/DemoController.php" + type: annotation + prefix: /demo + _assetic: resource: . type: assetic From 62454d3d3b6521091f3a9293e154584231eb4d9d Mon Sep 17 00:00:00 2001 From: Fabien Potencier Date: Wed, 11 May 2011 11:22:40 +0200 Subject: [PATCH 110/899] tweaked previous commit --- app/config/parameters.ini | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/app/config/parameters.ini b/app/config/parameters.ini index 271bc12f97..6a295289d3 100644 --- a/app/config/parameters.ini +++ b/app/config/parameters.ini @@ -1,4 +1,5 @@ -; These parameters can be imported into other config files as %foo% +; These parameters can be imported into other config files +; by enclosing the key with % (like %database_user%) ; Comments start with ';', as in php.ini [parameters] database_driver = pdo_mysql From 756c311330c14dda3c9fa66d4ecbdad13308fecb Mon Sep 17 00:00:00 2001 From: stealth35 Date: Wed, 11 May 2011 02:55:28 -0700 Subject: [PATCH 111/899] - posix extension don't exists on windows - sqlite_open is sqlite2 (this sqlite PDO driver is sqlite 3) --- web/config.php | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/web/config.php b/web/config.php index f4f8fca795..8489f47ef5 100644 --- a/web/config.php +++ b/web/config.php @@ -65,7 +65,7 @@ $minorProblems[] = 'Install and enable the XML extension.'; } -if (!function_exists('posix_isatty')) { +if (PHP_OS != 'WINNT' && !function_exists('posix_isatty')) { $minorProblems[] = 'Install and enable the php_posix extension (used to colorize the CLI output).'; } @@ -73,8 +73,8 @@ $minorProblems[] = 'Install and enable the intl extension.'; } -if (!function_exists('sqlite_open') && !in_array('sqlite', PDO::getAvailableDrivers())) { - $majorProblems[] = 'Install and enable the SQLite or PDO_SQLite extension.'; +if (!class_exists('SQLite3') && !in_array('sqlite', PDO::getAvailableDrivers())) { + $majorProblems[] = 'Install and enable the SQLite3 or PDO_SQLite extension.'; } if (!function_exists('json_encode')) { From ad88e75f3ada2583b5ae76fc7bb6915021d5ced9 Mon Sep 17 00:00:00 2001 From: Fabien Potencier Date: Thu, 12 May 2011 18:03:12 +0200 Subject: [PATCH 112/899] added an exception handler to catch exceptions during Kernel boot --- web/app_dev.php | 3 +++ 1 file changed, 3 insertions(+) diff --git a/web/app_dev.php b/web/app_dev.php index d73f15755e..9128cf1662 100644 --- a/web/app_dev.php +++ b/web/app_dev.php @@ -14,6 +14,9 @@ require_once __DIR__.'/../app/AppKernel.php'; use Symfony\Component\HttpFoundation\Request; +use Symfony\Component\HttpKernel\Debug\DebugExceptionHandler; + +set_exception_handler(new DebugExceptionHandler()); $kernel = new AppKernel('dev', true); $kernel->loadClassCache(); From cfbd190c3b5fbe7f0189a88c29fb23f83c92019a Mon Sep 17 00:00:00 2001 From: Fabien Potencier Date: Fri, 13 May 2011 14:20:10 +0200 Subject: [PATCH 113/899] moved exception handler to AppKernel to be more consistent with the error handler --- app/AppKernel.php | 2 ++ app/logs/.gitkeep | 0 web/app_dev.php | 3 --- 3 files changed, 2 insertions(+), 3 deletions(-) mode change 100644 => 100755 app/logs/.gitkeep diff --git a/app/AppKernel.php b/app/AppKernel.php index 7c90e75ed9..a68c89f994 100644 --- a/app/AppKernel.php +++ b/app/AppKernel.php @@ -4,6 +4,7 @@ use Symfony\Component\Config\Loader\LoaderInterface; use Symfony\Component\ClassLoader\DebugUniversalClassLoader; use Symfony\Component\HttpKernel\Debug\ErrorHandler; +use Symfony\Component\HttpKernel\Debug\ExceptionHandler; class AppKernel extends Kernel { @@ -38,6 +39,7 @@ public function init() DebugUniversalClassLoader::enable(); ErrorHandler::register(); + ExceptionHandler::register(); } else { ini_set('display_errors', 0); } diff --git a/app/logs/.gitkeep b/app/logs/.gitkeep old mode 100644 new mode 100755 diff --git a/web/app_dev.php b/web/app_dev.php index 9128cf1662..d73f15755e 100644 --- a/web/app_dev.php +++ b/web/app_dev.php @@ -14,9 +14,6 @@ require_once __DIR__.'/../app/AppKernel.php'; use Symfony\Component\HttpFoundation\Request; -use Symfony\Component\HttpKernel\Debug\DebugExceptionHandler; - -set_exception_handler(new DebugExceptionHandler()); $kernel = new AppKernel('dev', true); $kernel->loadClassCache(); From c6521dffb71be78299aaa82c8b3945ffc5c43e8d Mon Sep 17 00:00:00 2001 From: Fabien Potencier Date: Sat, 14 May 2011 10:11:25 +0200 Subject: [PATCH 114/899] added some sensible configuration for Doctrine --- app/config/config_prod.yml | 5 +++++ 1 file changed, 5 insertions(+) diff --git a/app/config/config_prod.yml b/app/config/config_prod.yml index 4dffd458e8..4a36496036 100644 --- a/app/config/config_prod.yml +++ b/app/config/config_prod.yml @@ -1,6 +1,11 @@ imports: - { resource: config.yml } +#doctrine: +# metadata_cache_driver: apc +# result_cache_driver: apc +# query_cache_driver: apc + monolog: handlers: main: From 808807ddd0379dd5c2c252c87602ecd2d78907cd Mon Sep 17 00:00:00 2001 From: Fabien Potencier Date: Sat, 14 May 2011 20:12:05 +0200 Subject: [PATCH 115/899] updated Doctrine libs --- bin/vendors.sh | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/bin/vendors.sh b/bin/vendors.sh index 4c8c112b04..51448b0846 100755 --- a/bin/vendors.sh +++ b/bin/vendors.sh @@ -52,10 +52,10 @@ install_git assetic http://github.com/kriswallsmith/assetic.git install_git symfony http://github.com/symfony/symfony.git #v$VERSION # Doctrine ORM -install_git doctrine http://github.com/doctrine/doctrine2.git 2.0.4 +install_git doctrine http://github.com/doctrine/doctrine2.git 2.0.5 # Doctrine DBAL -install_git doctrine-dbal http://github.com/doctrine/dbal.git 2.0.4 +install_git doctrine-dbal http://github.com/doctrine/dbal.git 2.0.5 # Doctrine Common install_git doctrine-common http://github.com/doctrine/common.git 2.0.2 From 67e9eaa310a92fa1760d171fcfb61f48d3b6d9c8 Mon Sep 17 00:00:00 2001 From: Stephan Petzl Date: Mon, 16 May 2011 16:52:23 +0200 Subject: [PATCH 116/899] vendors.sh improvements --- bin/vendors.sh | 23 ++++++++++++++++------- 1 file changed, 16 insertions(+), 7 deletions(-) diff --git a/bin/vendors.sh b/bin/vendors.sh index 51448b0846..0553d93469 100755 --- a/bin/vendors.sh +++ b/bin/vendors.sh @@ -40,47 +40,56 @@ install_git() fi cd $INSTALL_DIR + echo "> Reseting to version " $REV git fetch origin git reset --hard $REV - cd .. } # Assetic -install_git assetic http://github.com/kriswallsmith/assetic.git +cd $VENDOR +install_git assetic http://github.com/kriswallsmith/assetic.git bb7f2c7a1e2f4bdd623b # Symfony -install_git symfony http://github.com/symfony/symfony.git #v$VERSION +cd $VENDOR +install_git symfony http://github.com/symfony/symfony.git v$VERSION # Doctrine ORM -install_git doctrine http://github.com/doctrine/doctrine2.git 2.0.5 +cd $VENDOR +install_git doctrine http://github.com/doctrine/doctrine2.git 2.0.4 # Doctrine DBAL -install_git doctrine-dbal http://github.com/doctrine/dbal.git 2.0.5 +cd $VENDOR +install_git doctrine-dbal http://github.com/doctrine/dbal.git 2.0.4 # Doctrine Common +cd $VENDOR install_git doctrine-common http://github.com/doctrine/common.git 2.0.2 # Swiftmailer +cd $VENDOR install_git swiftmailer http://github.com/swiftmailer/swiftmailer.git origin/4.1 # Twig +cd $VENDOR install_git twig http://github.com/fabpot/Twig.git # Twig Extensions +cd $VENDOR install_git twig-extensions http://github.com/fabpot/Twig-extensions.git # Monolog +cd $VENDOR install_git monolog http://github.com/Seldaek/monolog.git # SensioFrameworkExtraBundle mkdir -p $BUNDLES/Sensio/Bundle cd $BUNDLES/Sensio/Bundle -install_git FrameworkExtraBundle http://github.com/sensio/SensioFrameworkExtraBundle.git +install_git FrameworkExtraBundle http://github.com/sensio/SensioFrameworkExtraBundle.git 3b1ec25fc11097afadb0 # SecurityExtraBundle mkdir -p $BUNDLES/JMS cd $BUNDLES/JMS -install_git SecurityExtraBundle http://github.com/schmittjoh/SecurityExtraBundle.git +install_git SecurityExtraBundle http://github.com/schmittjoh/SecurityExtraBundle.git 70c6d100ef0c49b0c80f # Symfony bundles mkdir -p $BUNDLES/Symfony/Bundle From 6395999ccc898a5c90e71feb2e4ecc6e234f993a Mon Sep 17 00:00:00 2001 From: Fabien Potencier Date: Mon, 16 May 2011 17:37:02 +0200 Subject: [PATCH 117/899] reverted previous commit partially --- bin/vendors.sh | 14 +++++++------- 1 file changed, 7 insertions(+), 7 deletions(-) diff --git a/bin/vendors.sh b/bin/vendors.sh index 0553d93469..ba44fb9002 100755 --- a/bin/vendors.sh +++ b/bin/vendors.sh @@ -40,26 +40,26 @@ install_git() fi cd $INSTALL_DIR - echo "> Reseting to version " $REV + echo "> Reseting to version " $REV git fetch origin git reset --hard $REV } # Assetic cd $VENDOR -install_git assetic http://github.com/kriswallsmith/assetic.git bb7f2c7a1e2f4bdd623b +install_git assetic http://github.com/kriswallsmith/assetic.git # Symfony cd $VENDOR -install_git symfony http://github.com/symfony/symfony.git v$VERSION +install_git symfony http://github.com/symfony/symfony.git #v$VERSION # Doctrine ORM cd $VENDOR -install_git doctrine http://github.com/doctrine/doctrine2.git 2.0.4 +install_git doctrine http://github.com/doctrine/doctrine2.git 2.0.5 # Doctrine DBAL cd $VENDOR -install_git doctrine-dbal http://github.com/doctrine/dbal.git 2.0.4 +install_git doctrine-dbal http://github.com/doctrine/dbal.git 2.0.5 # Doctrine Common cd $VENDOR @@ -84,12 +84,12 @@ install_git monolog http://github.com/Seldaek/monolog.git # SensioFrameworkExtraBundle mkdir -p $BUNDLES/Sensio/Bundle cd $BUNDLES/Sensio/Bundle -install_git FrameworkExtraBundle http://github.com/sensio/SensioFrameworkExtraBundle.git 3b1ec25fc11097afadb0 +install_git FrameworkExtraBundle http://github.com/sensio/SensioFrameworkExtraBundle.git # SecurityExtraBundle mkdir -p $BUNDLES/JMS cd $BUNDLES/JMS -install_git SecurityExtraBundle http://github.com/schmittjoh/SecurityExtraBundle.git 70c6d100ef0c49b0c80f +install_git SecurityExtraBundle http://github.com/schmittjoh/SecurityExtraBundle.git # Symfony bundles mkdir -p $BUNDLES/Symfony/Bundle From e3160e91ef1d3160d678ebdf92ea2f81ab9662c0 Mon Sep 17 00:00:00 2001 From: Fabien Potencier Date: Mon, 16 May 2011 22:09:08 +0200 Subject: [PATCH 118/899] migrate vendors to submodules --- .gitignore | 1 - .gitmodules | 36 +++++++ README.md | 2 +- bin/vendors.sh | 97 +------------------ vendor/assetic | 1 + vendor/bundles/JMS/SecurityExtraBundle | 1 + .../Sensio/Bundle/FrameworkExtraBundle | 1 + .../Symfony/Bundle/WebConfiguratorBundle | 1 + vendor/doctrine | 1 + vendor/doctrine-common | 1 + vendor/doctrine-dbal | 1 + vendor/monolog | 1 + vendor/swiftmailer | 1 + vendor/symfony | 1 + vendor/twig | 1 + vendor/twig-extensions | 1 + 16 files changed, 51 insertions(+), 97 deletions(-) create mode 100644 .gitmodules create mode 160000 vendor/assetic create mode 160000 vendor/bundles/JMS/SecurityExtraBundle create mode 160000 vendor/bundles/Sensio/Bundle/FrameworkExtraBundle create mode 160000 vendor/bundles/Symfony/Bundle/WebConfiguratorBundle create mode 160000 vendor/doctrine create mode 160000 vendor/doctrine-common create mode 160000 vendor/doctrine-dbal create mode 160000 vendor/monolog create mode 160000 vendor/swiftmailer create mode 160000 vendor/symfony create mode 160000 vendor/twig create mode 160000 vendor/twig-extensions diff --git a/.gitignore b/.gitignore index 2807d5f7eb..d7c2fddc64 100644 --- a/.gitignore +++ b/.gitignore @@ -3,4 +3,3 @@ app/bootstrap* app/cache/* app/logs/* build/ -vendor/ diff --git a/.gitmodules b/.gitmodules new file mode 100644 index 0000000000..562a7825bf --- /dev/null +++ b/.gitmodules @@ -0,0 +1,36 @@ +[submodule "vendor/assetic"] + path = vendor/assetic + url = http://github.com/kriswallsmith/assetic.git +[submodule "vendor/symfony"] + path = vendor/symfony + url = http://github.com/symfony/symfony.git +[submodule "vendor/doctrine"] + path = vendor/doctrine + url = http://github.com/doctrine/doctrine2.git +[submodule "vendor/doctrine-dbal"] + path = vendor/doctrine-dbal + url = http://github.com/doctrine/dbal.git +[submodule "vendor/doctrine-common"] + path = vendor/doctrine-common + url = http://github.com/doctrine/common.git +[submodule "vendor/swiftmailer"] + path = vendor/swiftmailer + url = http://github.com/swiftmailer/swiftmailer.git +[submodule "vendor/twig"] + path = vendor/twig + url = http://github.com/fabpot/Twig.git +[submodule "vendor/twig-extensions"] + path = vendor/twig-extensions + url = http://github.com/fabpot/Twig-extensions.git +[submodule "vendor/monolog"] + path = vendor/monolog + url = http://github.com/Seldaek/monolog.git +[submodule "vendor/bundles/Symfony/Bundle/WebConfiguratorBundle"] + path = vendor/bundles/Symfony/Bundle/WebConfiguratorBundle + url = http://github.com/symfony/WebConfiguratorBundle.git +[submodule "vendor/bundles/JMS/SecurityExtraBundle"] + path = vendor/bundles/JMS/SecurityExtraBundle + url = http://github.com/schmittjoh/SecurityExtraBundle.git +[submodule "vendor/bundles/Sensio/Bundle/FrameworkExtraBundle"] + path = vendor/bundles/Sensio/Bundle/FrameworkExtraBundle + url = http://github.com/sensio/SensioFrameworkExtraBundle.git diff --git a/README.md b/README.md index 7dda0371c5..73a17aad0a 100644 --- a/README.md +++ b/README.md @@ -36,7 +36,7 @@ distribution. If you still want to use Git, your are on your own. Run the following scripts: - * `bin/vendors.sh` (use `--min` if you don't want all the history) + * `bin/vendors.sh` Configuration ------------- diff --git a/bin/vendors.sh b/bin/vendors.sh index ba44fb9002..a669093d8a 100755 --- a/bin/vendors.sh +++ b/bin/vendors.sh @@ -1,102 +1,9 @@ #!/bin/sh DIR=`php -r "echo dirname(dirname(realpath('$0')));"` -VENDOR="$DIR/vendor" -VERSION=`cat "$DIR/VERSION"` -BUNDLES=$VENDOR/bundles -# initialization -if [ "$1" = "--reinstall" -o "$2" = "--reinstall" ]; then - rm -rf $VENDOR -fi - -# just the latest revision -CLONE_OPTIONS='' -if [ "$1" = "--min" -o "$2" = "--min" ]; then - CLONE_OPTIONS='--depth 1' -fi - -mkdir -p "$VENDOR" && cd "$VENDOR" - -## -# @param destination directory (e.g. "doctrine") -# @param URL of the git remote (e.g. http://github.com/doctrine/doctrine2.git) -# @param revision to point the head (e.g. origin/HEAD) -# -install_git() -{ - INSTALL_DIR=$1 - SOURCE_URL=$2 - REV=$3 - - echo "> Installing/Updating " $INSTALL_DIR - - if [ -z $REV ]; then - REV=origin/HEAD - fi - - if [ ! -d $INSTALL_DIR ]; then - git clone $CLONE_OPTIONS $SOURCE_URL $INSTALL_DIR - fi - - cd $INSTALL_DIR - echo "> Reseting to version " $REV - git fetch origin - git reset --hard $REV -} - -# Assetic -cd $VENDOR -install_git assetic http://github.com/kriswallsmith/assetic.git - -# Symfony -cd $VENDOR -install_git symfony http://github.com/symfony/symfony.git #v$VERSION - -# Doctrine ORM -cd $VENDOR -install_git doctrine http://github.com/doctrine/doctrine2.git 2.0.5 - -# Doctrine DBAL -cd $VENDOR -install_git doctrine-dbal http://github.com/doctrine/dbal.git 2.0.5 - -# Doctrine Common -cd $VENDOR -install_git doctrine-common http://github.com/doctrine/common.git 2.0.2 - -# Swiftmailer -cd $VENDOR -install_git swiftmailer http://github.com/swiftmailer/swiftmailer.git origin/4.1 - -# Twig -cd $VENDOR -install_git twig http://github.com/fabpot/Twig.git - -# Twig Extensions -cd $VENDOR -install_git twig-extensions http://github.com/fabpot/Twig-extensions.git - -# Monolog -cd $VENDOR -install_git monolog http://github.com/Seldaek/monolog.git - -# SensioFrameworkExtraBundle -mkdir -p $BUNDLES/Sensio/Bundle -cd $BUNDLES/Sensio/Bundle -install_git FrameworkExtraBundle http://github.com/sensio/SensioFrameworkExtraBundle.git - -# SecurityExtraBundle -mkdir -p $BUNDLES/JMS -cd $BUNDLES/JMS -install_git SecurityExtraBundle http://github.com/schmittjoh/SecurityExtraBundle.git - -# Symfony bundles -mkdir -p $BUNDLES/Symfony/Bundle -cd $BUNDLES/Symfony/Bundle - -# WebConfiguratorBundle -install_git WebConfiguratorBundle http://github.com/symfony/WebConfiguratorBundle.git +# Update vendors +git submodule update --init --recursive # Update the bootstrap files $DIR/bin/build_bootstrap.php diff --git a/vendor/assetic b/vendor/assetic new file mode 160000 index 0000000000..953b2e4465 --- /dev/null +++ b/vendor/assetic @@ -0,0 +1 @@ +Subproject commit 953b2e44654e85bded787e0c6084b918d90b27b6 diff --git a/vendor/bundles/JMS/SecurityExtraBundle b/vendor/bundles/JMS/SecurityExtraBundle new file mode 160000 index 0000000000..cad7b07bd5 --- /dev/null +++ b/vendor/bundles/JMS/SecurityExtraBundle @@ -0,0 +1 @@ +Subproject commit cad7b07bd58c3e924a94463e46b1d7f185513489 diff --git a/vendor/bundles/Sensio/Bundle/FrameworkExtraBundle b/vendor/bundles/Sensio/Bundle/FrameworkExtraBundle new file mode 160000 index 0000000000..2edf6067b9 --- /dev/null +++ b/vendor/bundles/Sensio/Bundle/FrameworkExtraBundle @@ -0,0 +1 @@ +Subproject commit 2edf6067b968bb3dc9796835e2642fef41ce1f4d diff --git a/vendor/bundles/Symfony/Bundle/WebConfiguratorBundle b/vendor/bundles/Symfony/Bundle/WebConfiguratorBundle new file mode 160000 index 0000000000..3c272a6cef --- /dev/null +++ b/vendor/bundles/Symfony/Bundle/WebConfiguratorBundle @@ -0,0 +1 @@ +Subproject commit 3c272a6cefcd62b32dba8571fe0d9d3d398f187b diff --git a/vendor/doctrine b/vendor/doctrine new file mode 160000 index 0000000000..9f01e9563f --- /dev/null +++ b/vendor/doctrine @@ -0,0 +1 @@ +Subproject commit 9f01e9563fd88a5359da39922e853cb6df445d0f diff --git a/vendor/doctrine-common b/vendor/doctrine-common new file mode 160000 index 0000000000..9c3508f7e5 --- /dev/null +++ b/vendor/doctrine-common @@ -0,0 +1 @@ +Subproject commit 9c3508f7e576f91690f79c8d3a0b9b3d5ad57a8a diff --git a/vendor/doctrine-dbal b/vendor/doctrine-dbal new file mode 160000 index 0000000000..36c2e76abc --- /dev/null +++ b/vendor/doctrine-dbal @@ -0,0 +1 @@ +Subproject commit 36c2e76abc75c9d508df87eec02cfbb2f045d307 diff --git a/vendor/monolog b/vendor/monolog new file mode 160000 index 0000000000..ee75a8f8f0 --- /dev/null +++ b/vendor/monolog @@ -0,0 +1 @@ +Subproject commit ee75a8f8f0c081deb0a92dfa1a7c48cd4e25a1bc diff --git a/vendor/swiftmailer b/vendor/swiftmailer new file mode 160000 index 0000000000..9729315e09 --- /dev/null +++ b/vendor/swiftmailer @@ -0,0 +1 @@ +Subproject commit 9729315e09d72a840cc067ab44eba2c88fa1dd3b diff --git a/vendor/symfony b/vendor/symfony new file mode 160000 index 0000000000..c4ae5b1ba2 --- /dev/null +++ b/vendor/symfony @@ -0,0 +1 @@ +Subproject commit c4ae5b1ba2dfd4d14915832322c309bafc767a08 diff --git a/vendor/twig b/vendor/twig new file mode 160000 index 0000000000..654468ff5d --- /dev/null +++ b/vendor/twig @@ -0,0 +1 @@ +Subproject commit 654468ff5d085f8a74ef1bdb210d0518818c4970 diff --git a/vendor/twig-extensions b/vendor/twig-extensions new file mode 160000 index 0000000000..6b0cc16934 --- /dev/null +++ b/vendor/twig-extensions @@ -0,0 +1 @@ +Subproject commit 6b0cc16934b6e62ef07c8d2e59f9f13ff3193d3d From f824dade04a2efde7d53645e513e077ff10fd846 Mon Sep 17 00:00:00 2001 From: Fabien Potencier Date: Mon, 16 May 2011 22:34:45 +0200 Subject: [PATCH 119/899] updated build script --- VERSION | 2 +- bin/build.sh | 54 ++++++++++++++++++---------------------------------- 2 files changed, 19 insertions(+), 37 deletions(-) diff --git a/VERSION b/VERSION index cc462a6572..2a2714769a 100644 --- a/VERSION +++ b/VERSION @@ -1 +1 @@ -2.0.0BETA1 +2.0.0BETA2 diff --git a/bin/build.sh b/bin/build.sh index d1afba7f17..188d767b0a 100755 --- a/bin/build.sh +++ b/bin/build.sh @@ -14,20 +14,12 @@ $DIR/app/console assets:install web/ # Without vendors rm -rf /tmp/Symfony mkdir /tmp/Symfony -cp -r app /tmp/Symfony/ -cp -r bin /tmp/Symfony/ -cp -r src /tmp/Symfony/ -cp -r web /tmp/Symfony/ -cp -r README.md /tmp/Symfony/ -cp -r LICENSE /tmp/Symfony/ -cp -r VERSION /tmp/Symfony/ cd /tmp/Symfony -sudo rm -rf app/cache/* app/logs/* .git* +git clone --depth 1 --branch master http://github.com/symfony/symfony-standard.git . +cp $DIR/app/bootstrap* app/ +cp -r $DIR/web/bundles web/ chmod 777 app/cache app/logs -# DS_Store cleanup -find . -name .DS_Store | xargs rm -rf - - cd .. # avoid the creation of ._* files export COPY_EXTENDED_ATTRIBUTES_DISABLE=true @@ -37,63 +29,53 @@ sudo rm -f $DIR/build/Symfony_Standard_$VERSION.zip zip -rq $DIR/build/Symfony_Standard_$VERSION.zip Symfony # With vendors -cd $DIR -rm -rf /tmp/vendor -mkdir /tmp/vendor -TARGET=/tmp/vendor -cd $TARGET +TARGET=/tmp/Symfony/vendor -if [ ! -d "$DIR/vendor" ]; then - echo "The master vendor directory does not exist" - exit -fi - -cp -r $DIR/vendor/* . +cp -r $DIR/vendor/* $TARGET/ # Assetic -cd assetic && rm -rf phpunit.xml* README* tests cd $TARGET +cd assetic && rm -rf phpunit.xml* README* tests # Doctrine ORM -cd doctrine && rm -rf UPGRADE* build* bin tests tools lib/vendor cd $TARGET +cd doctrine && rm -rf UPGRADE* build* bin tests tools lib/vendor # Doctrine DBAL -cd doctrine-dbal && rm -rf bin build* tests lib/vendor cd $TARGET +cd doctrine-dbal && rm -rf bin build* tests lib/vendor # Doctrine Common -cd doctrine-common && rm -rf build* tests lib/vendor cd $TARGET +cd doctrine-common && rm -rf build* tests lib/vendor # Swiftmailer -cd swiftmailer && rm -rf CHANGES README* build* docs notes test-suite tests create_pear_package.php package* cd $TARGET +cd swiftmailer && rm -rf CHANGES README* build* docs notes test-suite tests create_pear_package.php package* # Symfony -cd symfony && rm -rf README.md phpunit.xml* tests *.sh vendor cd $TARGET +cd symfony && rm -rf README.md phpunit.xml* tests *.sh vendor # Twig -cd twig && rm -rf AUTHORS CHANGELOG README.markdown bin doc package.xml.tpl phpunit.xml* test cd $TARGET +cd twig && rm -rf AUTHORS CHANGELOG README.markdown bin doc package.xml.tpl phpunit.xml* test # Twig Extensions -cd twig-extensions && rm -rf README doc phpunit.xml* test cd $TARGET +cd twig-extensions && rm -rf README doc phpunit.xml* test # Monolog -cd monolog && rm -rf README.markdown phpunit.xml* tests cd $TARGET +cd monolog && rm -rf README.markdown phpunit.xml* tests # cleanup -find . -name .git | xargs rm -rf - -find . -name .gitignore | xargs rm -rf - -find . -name .gitmodules | xargs rm -rf - -find . -name .svn | xargs rm -rf - +find /tmp/Symfony -name .git | xargs rm -rf - +find /tmp/Symfony -name .gitignore | xargs rm -rf - +find /tmp/Symfony -name .gitmodules | xargs rm -rf - +find /tmp/Symfony -name .svn | xargs rm -rf - cd /tmp/ -mv /tmp/vendor /tmp/Symfony/ tar zcpf $DIR/build/Symfony_Standard_Vendors_$VERSION.tgz Symfony sudo rm -f $DIR/build/Symfony_Standard_Vendors_$VERSION.zip zip -rq $DIR/build/Symfony_Standard_Vendors_$VERSION.zip Symfony From 8219ac7093a64e3a785cd2d14b2abd9587d2c0a1 Mon Sep 17 00:00:00 2001 From: Fabien Potencier Date: Mon, 16 May 2011 22:37:39 +0200 Subject: [PATCH 120/899] removed doctrine common and dbal submodules --- .gitmodules | 6 ------ app/autoload.php | 4 ++-- vendor/doctrine-common | 1 - vendor/doctrine-dbal | 1 - 4 files changed, 2 insertions(+), 10 deletions(-) delete mode 160000 vendor/doctrine-common delete mode 160000 vendor/doctrine-dbal diff --git a/.gitmodules b/.gitmodules index 562a7825bf..234a98e799 100644 --- a/.gitmodules +++ b/.gitmodules @@ -7,12 +7,6 @@ [submodule "vendor/doctrine"] path = vendor/doctrine url = http://github.com/doctrine/doctrine2.git -[submodule "vendor/doctrine-dbal"] - path = vendor/doctrine-dbal - url = http://github.com/doctrine/dbal.git -[submodule "vendor/doctrine-common"] - path = vendor/doctrine-common - url = http://github.com/doctrine/common.git [submodule "vendor/swiftmailer"] path = vendor/swiftmailer url = http://github.com/swiftmailer/swiftmailer.git diff --git a/app/autoload.php b/app/autoload.php index b3e6f0e06e..0d2b6090f8 100644 --- a/app/autoload.php +++ b/app/autoload.php @@ -7,8 +7,8 @@ 'Symfony' => array(__DIR__.'/../vendor/symfony/src', __DIR__.'/../vendor/bundles'), 'Sensio' => __DIR__.'/../vendor/bundles', 'JMS' => __DIR__.'/../vendor/bundles', - 'Doctrine\\Common' => __DIR__.'/../vendor/doctrine-common/lib', - 'Doctrine\\DBAL' => __DIR__.'/../vendor/doctrine-dbal/lib', + 'Doctrine\\Common' => __DIR__.'/../vendor/doctrine/lib/vendor/doctrine-common/lib', + 'Doctrine\\DBAL' => __DIR__.'/../vendor/doctrine/lib/vendor/doctrine-dbal/lib', 'Doctrine' => __DIR__.'/../vendor/doctrine/lib', 'Monolog' => __DIR__.'/../vendor/monolog/src', 'Assetic' => __DIR__.'/../vendor/assetic/src', diff --git a/vendor/doctrine-common b/vendor/doctrine-common deleted file mode 160000 index 9c3508f7e5..0000000000 --- a/vendor/doctrine-common +++ /dev/null @@ -1 +0,0 @@ -Subproject commit 9c3508f7e576f91690f79c8d3a0b9b3d5ad57a8a diff --git a/vendor/doctrine-dbal b/vendor/doctrine-dbal deleted file mode 160000 index 36c2e76abc..0000000000 --- a/vendor/doctrine-dbal +++ /dev/null @@ -1 +0,0 @@ -Subproject commit 36c2e76abc75c9d508df87eec02cfbb2f045d307 From 8ae5a28416893b7de4bcb2c637f67c5fb32e48f1 Mon Sep 17 00:00:00 2001 From: Fabien Potencier Date: Tue, 17 May 2011 07:18:41 +0200 Subject: [PATCH 121/899] fixed build script --- bin/build.sh | 10 +--------- 1 file changed, 1 insertion(+), 9 deletions(-) diff --git a/bin/build.sh b/bin/build.sh index 188d767b0a..4653a52157 100755 --- a/bin/build.sh +++ b/bin/build.sh @@ -39,15 +39,7 @@ cd assetic && rm -rf phpunit.xml* README* tests # Doctrine ORM cd $TARGET -cd doctrine && rm -rf UPGRADE* build* bin tests tools lib/vendor - -# Doctrine DBAL -cd $TARGET -cd doctrine-dbal && rm -rf bin build* tests lib/vendor - -# Doctrine Common -cd $TARGET -cd doctrine-common && rm -rf build* tests lib/vendor +cd doctrine && rm -rf UPGRADE* build* bin tests tools lib/vendor/Symfony # Swiftmailer cd $TARGET From b44943bc7b1906157027d5e0e6de0ba2abe5a47c Mon Sep 17 00:00:00 2001 From: Fabien Potencier Date: Tue, 17 May 2011 07:22:30 +0200 Subject: [PATCH 122/899] optimized build script --- bin/build.sh | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/bin/build.sh b/bin/build.sh index 4653a52157..dced741af3 100755 --- a/bin/build.sh +++ b/bin/build.sh @@ -39,7 +39,7 @@ cd assetic && rm -rf phpunit.xml* README* tests # Doctrine ORM cd $TARGET -cd doctrine && rm -rf UPGRADE* build* bin tests tools lib/vendor/Symfony +cd doctrine && rm -rf UPGRADE* build* bin tests tools lib/vendor/Symfony lib/vendor/doctrine-dbal/lib/vendor # Swiftmailer cd $TARGET From e6efc1399e73b722309024e1ed4e0e1861b8f2dc Mon Sep 17 00:00:00 2001 From: Fabien Potencier Date: Tue, 17 May 2011 11:34:55 +0200 Subject: [PATCH 123/899] Revert "optimized build script" This reverts commit b44943bc7b1906157027d5e0e6de0ba2abe5a47c. --- bin/build.sh | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/bin/build.sh b/bin/build.sh index dced741af3..4653a52157 100755 --- a/bin/build.sh +++ b/bin/build.sh @@ -39,7 +39,7 @@ cd assetic && rm -rf phpunit.xml* README* tests # Doctrine ORM cd $TARGET -cd doctrine && rm -rf UPGRADE* build* bin tests tools lib/vendor/Symfony lib/vendor/doctrine-dbal/lib/vendor +cd doctrine && rm -rf UPGRADE* build* bin tests tools lib/vendor/Symfony # Swiftmailer cd $TARGET From e7aacb249775be6af2d84bea895d1f324a9a40da Mon Sep 17 00:00:00 2001 From: Fabien Potencier Date: Tue, 17 May 2011 11:35:00 +0200 Subject: [PATCH 124/899] Revert "fixed build script" This reverts commit 8ae5a28416893b7de4bcb2c637f67c5fb32e48f1. --- bin/build.sh | 10 +++++++++- 1 file changed, 9 insertions(+), 1 deletion(-) diff --git a/bin/build.sh b/bin/build.sh index 4653a52157..188d767b0a 100755 --- a/bin/build.sh +++ b/bin/build.sh @@ -39,7 +39,15 @@ cd assetic && rm -rf phpunit.xml* README* tests # Doctrine ORM cd $TARGET -cd doctrine && rm -rf UPGRADE* build* bin tests tools lib/vendor/Symfony +cd doctrine && rm -rf UPGRADE* build* bin tests tools lib/vendor + +# Doctrine DBAL +cd $TARGET +cd doctrine-dbal && rm -rf bin build* tests lib/vendor + +# Doctrine Common +cd $TARGET +cd doctrine-common && rm -rf build* tests lib/vendor # Swiftmailer cd $TARGET From 214123452b91f70e5fa504d2074a73d6f7c4d991 Mon Sep 17 00:00:00 2001 From: Fabien Potencier Date: Tue, 17 May 2011 11:35:02 +0200 Subject: [PATCH 125/899] Revert "removed doctrine common and dbal submodules" This reverts commit 8219ac7093a64e3a785cd2d14b2abd9587d2c0a1. --- .gitmodules | 6 ++++++ app/autoload.php | 4 ++-- vendor/doctrine-common | 1 + vendor/doctrine-dbal | 1 + 4 files changed, 10 insertions(+), 2 deletions(-) create mode 160000 vendor/doctrine-common create mode 160000 vendor/doctrine-dbal diff --git a/.gitmodules b/.gitmodules index 234a98e799..562a7825bf 100644 --- a/.gitmodules +++ b/.gitmodules @@ -7,6 +7,12 @@ [submodule "vendor/doctrine"] path = vendor/doctrine url = http://github.com/doctrine/doctrine2.git +[submodule "vendor/doctrine-dbal"] + path = vendor/doctrine-dbal + url = http://github.com/doctrine/dbal.git +[submodule "vendor/doctrine-common"] + path = vendor/doctrine-common + url = http://github.com/doctrine/common.git [submodule "vendor/swiftmailer"] path = vendor/swiftmailer url = http://github.com/swiftmailer/swiftmailer.git diff --git a/app/autoload.php b/app/autoload.php index 0d2b6090f8..b3e6f0e06e 100644 --- a/app/autoload.php +++ b/app/autoload.php @@ -7,8 +7,8 @@ 'Symfony' => array(__DIR__.'/../vendor/symfony/src', __DIR__.'/../vendor/bundles'), 'Sensio' => __DIR__.'/../vendor/bundles', 'JMS' => __DIR__.'/../vendor/bundles', - 'Doctrine\\Common' => __DIR__.'/../vendor/doctrine/lib/vendor/doctrine-common/lib', - 'Doctrine\\DBAL' => __DIR__.'/../vendor/doctrine/lib/vendor/doctrine-dbal/lib', + 'Doctrine\\Common' => __DIR__.'/../vendor/doctrine-common/lib', + 'Doctrine\\DBAL' => __DIR__.'/../vendor/doctrine-dbal/lib', 'Doctrine' => __DIR__.'/../vendor/doctrine/lib', 'Monolog' => __DIR__.'/../vendor/monolog/src', 'Assetic' => __DIR__.'/../vendor/assetic/src', diff --git a/vendor/doctrine-common b/vendor/doctrine-common new file mode 160000 index 0000000000..9c3508f7e5 --- /dev/null +++ b/vendor/doctrine-common @@ -0,0 +1 @@ +Subproject commit 9c3508f7e576f91690f79c8d3a0b9b3d5ad57a8a diff --git a/vendor/doctrine-dbal b/vendor/doctrine-dbal new file mode 160000 index 0000000000..36c2e76abc --- /dev/null +++ b/vendor/doctrine-dbal @@ -0,0 +1 @@ +Subproject commit 36c2e76abc75c9d508df87eec02cfbb2f045d307 From 2ba90deb56190af64e9118d95c42628788883190 Mon Sep 17 00:00:00 2001 From: Fabien Potencier Date: Tue, 17 May 2011 11:35:03 +0200 Subject: [PATCH 126/899] Revert "updated build script" This reverts commit f824dade04a2efde7d53645e513e077ff10fd846. --- VERSION | 2 +- bin/build.sh | 54 ++++++++++++++++++++++++++++++++++------------------ 2 files changed, 37 insertions(+), 19 deletions(-) diff --git a/VERSION b/VERSION index 2a2714769a..cc462a6572 100644 --- a/VERSION +++ b/VERSION @@ -1 +1 @@ -2.0.0BETA2 +2.0.0BETA1 diff --git a/bin/build.sh b/bin/build.sh index 188d767b0a..d1afba7f17 100755 --- a/bin/build.sh +++ b/bin/build.sh @@ -14,12 +14,20 @@ $DIR/app/console assets:install web/ # Without vendors rm -rf /tmp/Symfony mkdir /tmp/Symfony +cp -r app /tmp/Symfony/ +cp -r bin /tmp/Symfony/ +cp -r src /tmp/Symfony/ +cp -r web /tmp/Symfony/ +cp -r README.md /tmp/Symfony/ +cp -r LICENSE /tmp/Symfony/ +cp -r VERSION /tmp/Symfony/ cd /tmp/Symfony -git clone --depth 1 --branch master http://github.com/symfony/symfony-standard.git . -cp $DIR/app/bootstrap* app/ -cp -r $DIR/web/bundles web/ +sudo rm -rf app/cache/* app/logs/* .git* chmod 777 app/cache app/logs +# DS_Store cleanup +find . -name .DS_Store | xargs rm -rf - + cd .. # avoid the creation of ._* files export COPY_EXTENDED_ATTRIBUTES_DISABLE=true @@ -29,53 +37,63 @@ sudo rm -f $DIR/build/Symfony_Standard_$VERSION.zip zip -rq $DIR/build/Symfony_Standard_$VERSION.zip Symfony # With vendors -TARGET=/tmp/Symfony/vendor +cd $DIR +rm -rf /tmp/vendor +mkdir /tmp/vendor +TARGET=/tmp/vendor +cd $TARGET -cp -r $DIR/vendor/* $TARGET/ +if [ ! -d "$DIR/vendor" ]; then + echo "The master vendor directory does not exist" + exit +fi + +cp -r $DIR/vendor/* . # Assetic -cd $TARGET cd assetic && rm -rf phpunit.xml* README* tests +cd $TARGET # Doctrine ORM -cd $TARGET cd doctrine && rm -rf UPGRADE* build* bin tests tools lib/vendor +cd $TARGET # Doctrine DBAL -cd $TARGET cd doctrine-dbal && rm -rf bin build* tests lib/vendor +cd $TARGET # Doctrine Common -cd $TARGET cd doctrine-common && rm -rf build* tests lib/vendor +cd $TARGET # Swiftmailer -cd $TARGET cd swiftmailer && rm -rf CHANGES README* build* docs notes test-suite tests create_pear_package.php package* +cd $TARGET # Symfony -cd $TARGET cd symfony && rm -rf README.md phpunit.xml* tests *.sh vendor +cd $TARGET # Twig -cd $TARGET cd twig && rm -rf AUTHORS CHANGELOG README.markdown bin doc package.xml.tpl phpunit.xml* test +cd $TARGET # Twig Extensions -cd $TARGET cd twig-extensions && rm -rf README doc phpunit.xml* test +cd $TARGET # Monolog -cd $TARGET cd monolog && rm -rf README.markdown phpunit.xml* tests +cd $TARGET # cleanup -find /tmp/Symfony -name .git | xargs rm -rf - -find /tmp/Symfony -name .gitignore | xargs rm -rf - -find /tmp/Symfony -name .gitmodules | xargs rm -rf - -find /tmp/Symfony -name .svn | xargs rm -rf - +find . -name .git | xargs rm -rf - +find . -name .gitignore | xargs rm -rf - +find . -name .gitmodules | xargs rm -rf - +find . -name .svn | xargs rm -rf - cd /tmp/ +mv /tmp/vendor /tmp/Symfony/ tar zcpf $DIR/build/Symfony_Standard_Vendors_$VERSION.tgz Symfony sudo rm -f $DIR/build/Symfony_Standard_Vendors_$VERSION.zip zip -rq $DIR/build/Symfony_Standard_Vendors_$VERSION.zip Symfony From eca6078e9855043b4bb3a7b6d16913b4bdd488a4 Mon Sep 17 00:00:00 2001 From: Fabien Potencier Date: Tue, 17 May 2011 11:35:04 +0200 Subject: [PATCH 127/899] Revert "migrate vendors to submodules" This reverts commit e3160e91ef1d3160d678ebdf92ea2f81ab9662c0. --- .gitignore | 1 + .gitmodules | 36 ------- README.md | 2 +- bin/vendors.sh | 97 ++++++++++++++++++- vendor/assetic | 1 - vendor/bundles/JMS/SecurityExtraBundle | 1 - .../Sensio/Bundle/FrameworkExtraBundle | 1 - .../Symfony/Bundle/WebConfiguratorBundle | 1 - vendor/doctrine | 1 - vendor/doctrine-common | 1 - vendor/doctrine-dbal | 1 - vendor/monolog | 1 - vendor/swiftmailer | 1 - vendor/symfony | 1 - vendor/twig | 1 - vendor/twig-extensions | 1 - 16 files changed, 97 insertions(+), 51 deletions(-) delete mode 100644 .gitmodules delete mode 160000 vendor/assetic delete mode 160000 vendor/bundles/JMS/SecurityExtraBundle delete mode 160000 vendor/bundles/Sensio/Bundle/FrameworkExtraBundle delete mode 160000 vendor/bundles/Symfony/Bundle/WebConfiguratorBundle delete mode 160000 vendor/doctrine delete mode 160000 vendor/doctrine-common delete mode 160000 vendor/doctrine-dbal delete mode 160000 vendor/monolog delete mode 160000 vendor/swiftmailer delete mode 160000 vendor/symfony delete mode 160000 vendor/twig delete mode 160000 vendor/twig-extensions diff --git a/.gitignore b/.gitignore index d7c2fddc64..2807d5f7eb 100644 --- a/.gitignore +++ b/.gitignore @@ -3,3 +3,4 @@ app/bootstrap* app/cache/* app/logs/* build/ +vendor/ diff --git a/.gitmodules b/.gitmodules deleted file mode 100644 index 562a7825bf..0000000000 --- a/.gitmodules +++ /dev/null @@ -1,36 +0,0 @@ -[submodule "vendor/assetic"] - path = vendor/assetic - url = http://github.com/kriswallsmith/assetic.git -[submodule "vendor/symfony"] - path = vendor/symfony - url = http://github.com/symfony/symfony.git -[submodule "vendor/doctrine"] - path = vendor/doctrine - url = http://github.com/doctrine/doctrine2.git -[submodule "vendor/doctrine-dbal"] - path = vendor/doctrine-dbal - url = http://github.com/doctrine/dbal.git -[submodule "vendor/doctrine-common"] - path = vendor/doctrine-common - url = http://github.com/doctrine/common.git -[submodule "vendor/swiftmailer"] - path = vendor/swiftmailer - url = http://github.com/swiftmailer/swiftmailer.git -[submodule "vendor/twig"] - path = vendor/twig - url = http://github.com/fabpot/Twig.git -[submodule "vendor/twig-extensions"] - path = vendor/twig-extensions - url = http://github.com/fabpot/Twig-extensions.git -[submodule "vendor/monolog"] - path = vendor/monolog - url = http://github.com/Seldaek/monolog.git -[submodule "vendor/bundles/Symfony/Bundle/WebConfiguratorBundle"] - path = vendor/bundles/Symfony/Bundle/WebConfiguratorBundle - url = http://github.com/symfony/WebConfiguratorBundle.git -[submodule "vendor/bundles/JMS/SecurityExtraBundle"] - path = vendor/bundles/JMS/SecurityExtraBundle - url = http://github.com/schmittjoh/SecurityExtraBundle.git -[submodule "vendor/bundles/Sensio/Bundle/FrameworkExtraBundle"] - path = vendor/bundles/Sensio/Bundle/FrameworkExtraBundle - url = http://github.com/sensio/SensioFrameworkExtraBundle.git diff --git a/README.md b/README.md index 73a17aad0a..7dda0371c5 100644 --- a/README.md +++ b/README.md @@ -36,7 +36,7 @@ distribution. If you still want to use Git, your are on your own. Run the following scripts: - * `bin/vendors.sh` + * `bin/vendors.sh` (use `--min` if you don't want all the history) Configuration ------------- diff --git a/bin/vendors.sh b/bin/vendors.sh index a669093d8a..ba44fb9002 100755 --- a/bin/vendors.sh +++ b/bin/vendors.sh @@ -1,9 +1,102 @@ #!/bin/sh DIR=`php -r "echo dirname(dirname(realpath('$0')));"` +VENDOR="$DIR/vendor" +VERSION=`cat "$DIR/VERSION"` +BUNDLES=$VENDOR/bundles -# Update vendors -git submodule update --init --recursive +# initialization +if [ "$1" = "--reinstall" -o "$2" = "--reinstall" ]; then + rm -rf $VENDOR +fi + +# just the latest revision +CLONE_OPTIONS='' +if [ "$1" = "--min" -o "$2" = "--min" ]; then + CLONE_OPTIONS='--depth 1' +fi + +mkdir -p "$VENDOR" && cd "$VENDOR" + +## +# @param destination directory (e.g. "doctrine") +# @param URL of the git remote (e.g. http://github.com/doctrine/doctrine2.git) +# @param revision to point the head (e.g. origin/HEAD) +# +install_git() +{ + INSTALL_DIR=$1 + SOURCE_URL=$2 + REV=$3 + + echo "> Installing/Updating " $INSTALL_DIR + + if [ -z $REV ]; then + REV=origin/HEAD + fi + + if [ ! -d $INSTALL_DIR ]; then + git clone $CLONE_OPTIONS $SOURCE_URL $INSTALL_DIR + fi + + cd $INSTALL_DIR + echo "> Reseting to version " $REV + git fetch origin + git reset --hard $REV +} + +# Assetic +cd $VENDOR +install_git assetic http://github.com/kriswallsmith/assetic.git + +# Symfony +cd $VENDOR +install_git symfony http://github.com/symfony/symfony.git #v$VERSION + +# Doctrine ORM +cd $VENDOR +install_git doctrine http://github.com/doctrine/doctrine2.git 2.0.5 + +# Doctrine DBAL +cd $VENDOR +install_git doctrine-dbal http://github.com/doctrine/dbal.git 2.0.5 + +# Doctrine Common +cd $VENDOR +install_git doctrine-common http://github.com/doctrine/common.git 2.0.2 + +# Swiftmailer +cd $VENDOR +install_git swiftmailer http://github.com/swiftmailer/swiftmailer.git origin/4.1 + +# Twig +cd $VENDOR +install_git twig http://github.com/fabpot/Twig.git + +# Twig Extensions +cd $VENDOR +install_git twig-extensions http://github.com/fabpot/Twig-extensions.git + +# Monolog +cd $VENDOR +install_git monolog http://github.com/Seldaek/monolog.git + +# SensioFrameworkExtraBundle +mkdir -p $BUNDLES/Sensio/Bundle +cd $BUNDLES/Sensio/Bundle +install_git FrameworkExtraBundle http://github.com/sensio/SensioFrameworkExtraBundle.git + +# SecurityExtraBundle +mkdir -p $BUNDLES/JMS +cd $BUNDLES/JMS +install_git SecurityExtraBundle http://github.com/schmittjoh/SecurityExtraBundle.git + +# Symfony bundles +mkdir -p $BUNDLES/Symfony/Bundle +cd $BUNDLES/Symfony/Bundle + +# WebConfiguratorBundle +install_git WebConfiguratorBundle http://github.com/symfony/WebConfiguratorBundle.git # Update the bootstrap files $DIR/bin/build_bootstrap.php diff --git a/vendor/assetic b/vendor/assetic deleted file mode 160000 index 953b2e4465..0000000000 --- a/vendor/assetic +++ /dev/null @@ -1 +0,0 @@ -Subproject commit 953b2e44654e85bded787e0c6084b918d90b27b6 diff --git a/vendor/bundles/JMS/SecurityExtraBundle b/vendor/bundles/JMS/SecurityExtraBundle deleted file mode 160000 index cad7b07bd5..0000000000 --- a/vendor/bundles/JMS/SecurityExtraBundle +++ /dev/null @@ -1 +0,0 @@ -Subproject commit cad7b07bd58c3e924a94463e46b1d7f185513489 diff --git a/vendor/bundles/Sensio/Bundle/FrameworkExtraBundle b/vendor/bundles/Sensio/Bundle/FrameworkExtraBundle deleted file mode 160000 index 2edf6067b9..0000000000 --- a/vendor/bundles/Sensio/Bundle/FrameworkExtraBundle +++ /dev/null @@ -1 +0,0 @@ -Subproject commit 2edf6067b968bb3dc9796835e2642fef41ce1f4d diff --git a/vendor/bundles/Symfony/Bundle/WebConfiguratorBundle b/vendor/bundles/Symfony/Bundle/WebConfiguratorBundle deleted file mode 160000 index 3c272a6cef..0000000000 --- a/vendor/bundles/Symfony/Bundle/WebConfiguratorBundle +++ /dev/null @@ -1 +0,0 @@ -Subproject commit 3c272a6cefcd62b32dba8571fe0d9d3d398f187b diff --git a/vendor/doctrine b/vendor/doctrine deleted file mode 160000 index 9f01e9563f..0000000000 --- a/vendor/doctrine +++ /dev/null @@ -1 +0,0 @@ -Subproject commit 9f01e9563fd88a5359da39922e853cb6df445d0f diff --git a/vendor/doctrine-common b/vendor/doctrine-common deleted file mode 160000 index 9c3508f7e5..0000000000 --- a/vendor/doctrine-common +++ /dev/null @@ -1 +0,0 @@ -Subproject commit 9c3508f7e576f91690f79c8d3a0b9b3d5ad57a8a diff --git a/vendor/doctrine-dbal b/vendor/doctrine-dbal deleted file mode 160000 index 36c2e76abc..0000000000 --- a/vendor/doctrine-dbal +++ /dev/null @@ -1 +0,0 @@ -Subproject commit 36c2e76abc75c9d508df87eec02cfbb2f045d307 diff --git a/vendor/monolog b/vendor/monolog deleted file mode 160000 index ee75a8f8f0..0000000000 --- a/vendor/monolog +++ /dev/null @@ -1 +0,0 @@ -Subproject commit ee75a8f8f0c081deb0a92dfa1a7c48cd4e25a1bc diff --git a/vendor/swiftmailer b/vendor/swiftmailer deleted file mode 160000 index 9729315e09..0000000000 --- a/vendor/swiftmailer +++ /dev/null @@ -1 +0,0 @@ -Subproject commit 9729315e09d72a840cc067ab44eba2c88fa1dd3b diff --git a/vendor/symfony b/vendor/symfony deleted file mode 160000 index c4ae5b1ba2..0000000000 --- a/vendor/symfony +++ /dev/null @@ -1 +0,0 @@ -Subproject commit c4ae5b1ba2dfd4d14915832322c309bafc767a08 diff --git a/vendor/twig b/vendor/twig deleted file mode 160000 index 654468ff5d..0000000000 --- a/vendor/twig +++ /dev/null @@ -1 +0,0 @@ -Subproject commit 654468ff5d085f8a74ef1bdb210d0518818c4970 diff --git a/vendor/twig-extensions b/vendor/twig-extensions deleted file mode 160000 index 6b0cc16934..0000000000 --- a/vendor/twig-extensions +++ /dev/null @@ -1 +0,0 @@ -Subproject commit 6b0cc16934b6e62ef07c8d2e59f9f13ff3193d3d From 2e9dab6a554aa73e2317771f300e733abc755959 Mon Sep 17 00:00:00 2001 From: Fabien Potencier Date: Tue, 17 May 2011 11:37:02 +0200 Subject: [PATCH 128/899] added a way to freeze vendor sha1s --- README.md | 72 --------------------------- README.rst | 86 ++++++++++++++++++++++++++++++++ VERSION | 2 +- bin/2.0.0BETA2.deps | 12 +++++ bin/2.0.0NEXT.deps | 12 +++++ bin/build.sh | 7 +++ bin/build_bootstrap.php | 9 ++++ bin/deps | 12 +++++ bin/freeze_vendors.php | 32 ++++++++++++ bin/vendors.php | 70 +++++++++++++++++++++++++++ bin/vendors.sh | 105 ---------------------------------------- 11 files changed, 241 insertions(+), 178 deletions(-) delete mode 100644 README.md create mode 100644 README.rst create mode 100644 bin/2.0.0BETA2.deps create mode 100644 bin/2.0.0NEXT.deps create mode 100644 bin/deps create mode 100755 bin/freeze_vendors.php create mode 100755 bin/vendors.php delete mode 100755 bin/vendors.sh diff --git a/README.md b/README.md deleted file mode 100644 index 7dda0371c5..0000000000 --- a/README.md +++ /dev/null @@ -1,72 +0,0 @@ -Symfony Standard Edition -======================== - -What's inside? --------------- - -Symfony Standard Edition comes pre-configured with the following bundles: - - * FrameworkBundle - * SensioFrameworkExtraBundle - * DoctrineBundle - * TwigBundle - * SwiftmailerBundle - * MonologBundle - * AsseticBundle - * WebProfilerBundle (in dev/test env) - * SymfonyWebConfiguratorBundle (in dev/test env) - * AcmeDemoBundle (in dev/test env) - -Installation from an Archive ----------------------------- - -The easiest way to get started is to download an archive with vendors included -(http://symfony.com/download). Unpack it somewhere under your web server root -directory and you're done. - -If you have downloaded an archive without the vendors, run the -`bin/vendors.sh` script (`git` must be installed on your machine). If you -don't have git, download the version with the vendors included. - -Installation from Git ---------------------- - -We highly recommend you that you download the packaged version of this -distribution. If you still want to use Git, your are on your own. - -Run the following scripts: - - * `bin/vendors.sh` (use `--min` if you don't want all the history) - -Configuration -------------- - -Check that everything is working fine by going to the `web/config.php` page in a -browser and follow the instructions. - -The distribution is configured with the following defaults: - - * Twig is the only configured template engine; - * Doctrine ORM/DBAL is configured; - * Swiftmailer is configured; - * Annotations for everything are enabled. - -A default bundle, `AcmeDemoBundle`, shows you Symfony2 in action. After -playing with it, you can remove it by following these steps: - - * delete the `src/Acme` directory; - * remove the routing entries referencing AcmeBundle in `app/config/routing_dev.yml`; - * remove the AcmeBundle from the registered bundles in `app/AppKernel.php`; - * remove the Acme registered namespace in `app/autoload.php`. - -Configure the distribution by editing `app/config/parameters.ini` or by -accessing `web/config.php` in a browser. - -A simple controller is configured at `/hello/{name}`. Access it via -`web/app_dev.php/demo/hello/Fabien`. - -If you want to use the CLI, a console application is available at -`app/console`. Check first that your PHP is correctly configured for the CLI -by running `app/check.php`. - -Enjoy! diff --git a/README.rst b/README.rst new file mode 100644 index 0000000000..d8b667ca3d --- /dev/null +++ b/README.rst @@ -0,0 +1,86 @@ +Symfony Standard Edition +======================== + +What's inside? +-------------- + +Symfony Standard Edition comes pre-configured with the following bundles: + +* FrameworkBundle +* SensioFrameworkExtraBundle +* DoctrineBundle +* TwigBundle +* SwiftmailerBundle +* MonologBundle +* AsseticBundle +* WebProfilerBundle (in dev/test env) +* SymfonyWebConfiguratorBundle (in dev/test env) +* AcmeDemoBundle (in dev/test env) + +Installation from an Archive +---------------------------- + +The easiest way to get started is to download an archive with vendors included +(http://symfony.com/download). Unpack it somewhere under your web server root +directory and you're done. + +If you have downloaded an archive without the vendors, you must have ``git`` +available to install the vendors: + + php bin/vendors.php + +.. tip:: + + You can pass the `--min` option if you don't want all the history. This + also makes the installation much faster. + +Installation from Git +--------------------- + +We highly recommend you that you download the packaged version of this +distribution. If you still want to use Git, your are on your own. + +Run the following commands: + + git clone http://github.com/symfony/symfony-standard.git + cd symfony-standard + rm -rf .git + php bin/vendors.php + +..note:: + + Symfony SE does/can not use git submodules as it you should not keep the + `.git` directory. + +Configuration +------------- + +Check that everything is working fine by going to the ``web/config.php`` page +in a browser and follow the instructions. + +The distribution is configured with the following defaults: + +* Twig is the only configured template engine; +* Doctrine ORM/DBAL is configured; +* Swiftmailer is configured; +* Annotations for everything are enabled. + +A default bundle, ``AcmeDemoBundle``, shows you Symfony2 in action. After +playing with it, you can remove it by following these steps: + +* delete the ``src/Acme`` directory; +* remove the routing entries referencing AcmeBundle in ``app/config/routing_dev.yml``; +* remove the AcmeBundle from the registered bundles in ``app/AppKernel.php``; +* remove the Acme registered namespace in ``app/autoload.php``. + +Configure the distribution by editing ``app/config/parameters.ini`` or by +accessing ``web/config.php`` in a browser. + +A simple controller is configured at ``/hello/{name}``. Access it via +``web/app_dev.php/demo/hello/Fabien``. + +If you want to use the CLI, a console application is available at +``app/console``. Check first that your PHP is correctly configured for the CLI +by running ``app/check.php``. + +Enjoy! diff --git a/VERSION b/VERSION index cc462a6572..9cbac2cb9f 100644 --- a/VERSION +++ b/VERSION @@ -1 +1 @@ -2.0.0BETA1 +2.0.0NEXT diff --git a/bin/2.0.0BETA2.deps b/bin/2.0.0BETA2.deps new file mode 100644 index 0000000000..94f0fb700f --- /dev/null +++ b/bin/2.0.0BETA2.deps @@ -0,0 +1,12 @@ +assetic 1270994160ed8b5aecab0b7aa700934cbea124d6 +symfony 24d79f680f47222b4ed6730031a7f9d72f09bfbb +doctrine 35a318148cd891347f489e64140b724beb267849 +doctrine-dbal 4ee7356ce0ca798f70877f295ad1309120a79c30 +doctrine-common ffd9dc7460bb90ebfe1f98388e5eceb03a934e9a +swiftmailer acb505a943d2782a00136d8e77c67dae1573fbe3 +twig 654468ff5d085f8a74ef1bdb210d0518818c4970 +twig-extensions 6b0cc16934b6e62ef07c8d2e59f9f13ff3193d3d +monolog 1defa7857f842a5a554b13b776e06e7784e3a99b +FrameworkExtraBundle 2edf6067b968bb3dc9796835e2642fef41ce1f4d +SecurityExtraBundle cad7b07bd58c3e924a94463e46b1d7f185513489 +WebConfiguratorBundle 3c272a6cefcd62b32dba8571fe0d9d3d398f187b \ No newline at end of file diff --git a/bin/2.0.0NEXT.deps b/bin/2.0.0NEXT.deps new file mode 100644 index 0000000000..159449e542 --- /dev/null +++ b/bin/2.0.0NEXT.deps @@ -0,0 +1,12 @@ +assetic origin/HEAD +symfony origin/HEAD +doctrine 2.0.5 +doctrine-dbal 2.0.5 +doctrine-common 2.0.2 +swiftmailer origin/4.1 +twig origin/HEAD +twig-extensions origin/HEAD +monolog origin/HEAD +FrameworkExtraBundle origin/HEAD +SecurityExtraBundle origin/HEAD +WebConfiguratorBundle origin/HEAD \ No newline at end of file diff --git a/bin/build.sh b/bin/build.sh index d1afba7f17..311e22920b 100755 --- a/bin/build.sh +++ b/bin/build.sh @@ -1,5 +1,12 @@ #!/bin/sh +# This file is part of the Symfony Standard Edition. +# +# (c) Fabien Potencier +# +# For the full copyright and license information, please view the LICENSE +# file that was distributed with this source code. + DIR=`php -r "echo realpath(dirname(\\$_SERVER['argv'][0]));"` cd $DIR VERSION=`cat VERSION` diff --git a/bin/build_bootstrap.php b/bin/build_bootstrap.php index 70115ef104..2912a07e6c 100755 --- a/bin/build_bootstrap.php +++ b/bin/build_bootstrap.php @@ -1,6 +1,15 @@ #!/usr/bin/env php + * + * For the full copyright and license information, please view the LICENSE + * file that was distributed with this source code. + */ + require_once __DIR__.'/../vendor/symfony/src/Symfony/Component/ClassLoader/UniversalClassLoader.php'; /* diff --git a/bin/deps b/bin/deps new file mode 100644 index 0000000000..e510ec24c1 --- /dev/null +++ b/bin/deps @@ -0,0 +1,12 @@ +/ assetic http://github.com/kriswallsmith/assetic.git +/ symfony http://github.com/symfony/symfony.git +/ doctrine http://github.com/doctrine/doctrine2.git +/ doctrine-dbal http://github.com/doctrine/dbal.git +/ doctrine-common http://github.com/doctrine/common.git +/ swiftmailer http://github.com/swiftmailer/swiftmailer.git +/ twig http://github.com/fabpot/Twig.git +/ twig-extensions http://github.com/fabpot/Twig-extensions.git +/ monolog http://github.com/Seldaek/monolog.git +/bundles/Sensio/Bundle FrameworkExtraBundle http://github.com/sensio/SensioFrameworkExtraBundle.git +/bundles/JMS SecurityExtraBundle http://github.com/schmittjoh/SecurityExtraBundle.git +/bundles/Symfony/Bundle WebConfiguratorBundle http://github.com/symfony/WebConfiguratorBundle.git diff --git a/bin/freeze_vendors.php b/bin/freeze_vendors.php new file mode 100755 index 0000000000..455923ef7b --- /dev/null +++ b/bin/freeze_vendors.php @@ -0,0 +1,32 @@ +#!/usr/bin/env php + + * + * For the full copyright and license information, please view the LICENSE + * file that was distributed with this source code. + */ + +$DIR = dirname(__DIR__); +$VENDOR = $DIR.'/vendor'; +$VERSION = trim(file_get_contents($DIR.'/VERSION')); + +$deps = array(); +foreach (file(__DIR__.'/deps') as $line) { + if (!trim($line)) { + continue; + } + $parts = array_values(array_filter(explode(' ', trim($line)))); + if (3 !== count($parts)) { + die(sprintf('The deps file is not valid (near "%s")', $line)); + } + list($path, $name, $url) = $parts; + + ob_start(); + system('cd '.$VENDOR.'/'.$path.'/'.$name.'; git log -n 1 --format=%H'); + $deps[] = trim($name.' '.ob_get_clean()); +} +file_put_contents($DIR.'/bin/'.$VERSION.'.deps', implode("\n", $deps)); diff --git a/bin/vendors.php b/bin/vendors.php new file mode 100755 index 0000000000..6001354eba --- /dev/null +++ b/bin/vendors.php @@ -0,0 +1,70 @@ +#!/usr/bin/env php + + * + * For the full copyright and license information, please view the LICENSE + * file that was distributed with this source code. + */ + +$DIR = dirname(__DIR__); +$VENDOR = $DIR.'/vendor'; +$VERSION = trim(file_get_contents($DIR.'/VERSION')); + +// Initialization +if (in_array('--reinstall', $argv)) { + system('rm -rf $VENDOR'); +} + +if (in_array('--min', $argv)) { + $CLONE_OPTIONS = '--depth 1'; +} + +if (!is_dir($VENDOR)) { + mkdir($VENDOR, 0777, true); +} + +// versions +$versions = array(); +foreach (file(__DIR__.'/'.$VERSION.'.deps') as $line) { + if (!trim($line)) { + continue; + } + $parts = array_values(array_filter(explode(' ', trim($line)))); + if (2 !== count($parts)) { + die(sprintf('The deps version file is not valid (near "%s")', $line)); + } + $versions[$parts[0]] = $parts[1]; +} + +foreach (file(__DIR__.'/deps') as $line) { + if (!trim($line)) { + continue; + } + $parts = array_values(array_filter(explode(' ', trim($line)))); + if (3 !== count($parts)) { + die(sprintf('The deps file is not valid (near "%s")', $line)); + } + list($path, $name, $url) = $parts; + + $installDir = $VENDOR.'/'.$path.'/'.$name; + + $rev = isset($versions[$name]) ? $versions[$name] : 'origin/HEAD'; + + echo "> Installing/Updating $name\n"; + + if (!is_dir($installDir)) { + system(sprintf('git clone %s %s %s', $CLONE_OPTIONS, $url, $installDir)); + } + + system(sprintf('cd %s && git fetch origin && git reset --hard %s', $installDir, $rev)); +} + +// Update the bootstrap files +system($DIR.'/bin/build_bootstrap.php'); + +// Update assets +system($DIR.'/app/console assets:install '.$DIR.'/web/'); diff --git a/bin/vendors.sh b/bin/vendors.sh deleted file mode 100755 index ba44fb9002..0000000000 --- a/bin/vendors.sh +++ /dev/null @@ -1,105 +0,0 @@ -#!/bin/sh - -DIR=`php -r "echo dirname(dirname(realpath('$0')));"` -VENDOR="$DIR/vendor" -VERSION=`cat "$DIR/VERSION"` -BUNDLES=$VENDOR/bundles - -# initialization -if [ "$1" = "--reinstall" -o "$2" = "--reinstall" ]; then - rm -rf $VENDOR -fi - -# just the latest revision -CLONE_OPTIONS='' -if [ "$1" = "--min" -o "$2" = "--min" ]; then - CLONE_OPTIONS='--depth 1' -fi - -mkdir -p "$VENDOR" && cd "$VENDOR" - -## -# @param destination directory (e.g. "doctrine") -# @param URL of the git remote (e.g. http://github.com/doctrine/doctrine2.git) -# @param revision to point the head (e.g. origin/HEAD) -# -install_git() -{ - INSTALL_DIR=$1 - SOURCE_URL=$2 - REV=$3 - - echo "> Installing/Updating " $INSTALL_DIR - - if [ -z $REV ]; then - REV=origin/HEAD - fi - - if [ ! -d $INSTALL_DIR ]; then - git clone $CLONE_OPTIONS $SOURCE_URL $INSTALL_DIR - fi - - cd $INSTALL_DIR - echo "> Reseting to version " $REV - git fetch origin - git reset --hard $REV -} - -# Assetic -cd $VENDOR -install_git assetic http://github.com/kriswallsmith/assetic.git - -# Symfony -cd $VENDOR -install_git symfony http://github.com/symfony/symfony.git #v$VERSION - -# Doctrine ORM -cd $VENDOR -install_git doctrine http://github.com/doctrine/doctrine2.git 2.0.5 - -# Doctrine DBAL -cd $VENDOR -install_git doctrine-dbal http://github.com/doctrine/dbal.git 2.0.5 - -# Doctrine Common -cd $VENDOR -install_git doctrine-common http://github.com/doctrine/common.git 2.0.2 - -# Swiftmailer -cd $VENDOR -install_git swiftmailer http://github.com/swiftmailer/swiftmailer.git origin/4.1 - -# Twig -cd $VENDOR -install_git twig http://github.com/fabpot/Twig.git - -# Twig Extensions -cd $VENDOR -install_git twig-extensions http://github.com/fabpot/Twig-extensions.git - -# Monolog -cd $VENDOR -install_git monolog http://github.com/Seldaek/monolog.git - -# SensioFrameworkExtraBundle -mkdir -p $BUNDLES/Sensio/Bundle -cd $BUNDLES/Sensio/Bundle -install_git FrameworkExtraBundle http://github.com/sensio/SensioFrameworkExtraBundle.git - -# SecurityExtraBundle -mkdir -p $BUNDLES/JMS -cd $BUNDLES/JMS -install_git SecurityExtraBundle http://github.com/schmittjoh/SecurityExtraBundle.git - -# Symfony bundles -mkdir -p $BUNDLES/Symfony/Bundle -cd $BUNDLES/Symfony/Bundle - -# WebConfiguratorBundle -install_git WebConfiguratorBundle http://github.com/symfony/WebConfiguratorBundle.git - -# Update the bootstrap files -$DIR/bin/build_bootstrap.php - -# Update assets -$DIR/app/console assets:install $DIR/web/ From bb57c06565df587ecd275b2b7438fec5005d239d Mon Sep 17 00:00:00 2001 From: Fabien Potencier Date: Tue, 17 May 2011 12:30:09 +0200 Subject: [PATCH 129/899] fixed typo --- README.rst | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/README.rst b/README.rst index d8b667ca3d..8e627a5505 100644 --- a/README.rst +++ b/README.rst @@ -47,7 +47,7 @@ Run the following commands: rm -rf .git php bin/vendors.php -..note:: +.. note:: Symfony SE does/can not use git submodules as it you should not keep the `.git` directory. From 511d32ed3de13a16cdc2fe631088c017e50a8718 Mon Sep 17 00:00:00 2001 From: Fabien Potencier Date: Tue, 17 May 2011 13:16:04 +0200 Subject: [PATCH 130/899] fixed a warning, fixed CS --- bin/freeze_vendors.php | 10 +++++----- bin/vendors.php | 25 +++++++++++++------------ 2 files changed, 18 insertions(+), 17 deletions(-) diff --git a/bin/freeze_vendors.php b/bin/freeze_vendors.php index 455923ef7b..132255b03b 100755 --- a/bin/freeze_vendors.php +++ b/bin/freeze_vendors.php @@ -10,9 +10,9 @@ * file that was distributed with this source code. */ -$DIR = dirname(__DIR__); -$VENDOR = $DIR.'/vendor'; -$VERSION = trim(file_get_contents($DIR.'/VERSION')); +$rootDir = dirname(__DIR__); +$vendorDir = $rootDir.'/vendor'; +$version = trim(file_get_contents($rootDir.'/VERSION')); $deps = array(); foreach (file(__DIR__.'/deps') as $line) { @@ -26,7 +26,7 @@ list($path, $name, $url) = $parts; ob_start(); - system('cd '.$VENDOR.'/'.$path.'/'.$name.'; git log -n 1 --format=%H'); + system('cd '.$vendorDir.'/'.$path.'/'.$name.'; git log -n 1 --format=%H'); $deps[] = trim($name.' '.ob_get_clean()); } -file_put_contents($DIR.'/bin/'.$VERSION.'.deps', implode("\n", $deps)); +file_put_contents($rootDir.'/bin/'.$version.'.deps', implode("\n", $deps)); diff --git a/bin/vendors.php b/bin/vendors.php index 6001354eba..7c021a1f59 100755 --- a/bin/vendors.php +++ b/bin/vendors.php @@ -10,26 +10,27 @@ * file that was distributed with this source code. */ -$DIR = dirname(__DIR__); -$VENDOR = $DIR.'/vendor'; -$VERSION = trim(file_get_contents($DIR.'/VERSION')); +$rootDir = dirname(__DIR__); +$vendorDir = $rootDir.'/vendor'; +$version = trim(file_get_contents($rootDir.'/VERSION')); // Initialization if (in_array('--reinstall', $argv)) { - system('rm -rf $VENDOR'); + system('rm -rf $vendorDir'); } +$cloneOptions = ''; if (in_array('--min', $argv)) { - $CLONE_OPTIONS = '--depth 1'; + $cloneOptions = '--depth 1'; } -if (!is_dir($VENDOR)) { - mkdir($VENDOR, 0777, true); +if (!is_dir($vendorDir)) { + mkdir($vendorDir, 0777, true); } // versions $versions = array(); -foreach (file(__DIR__.'/'.$VERSION.'.deps') as $line) { +foreach (file(__DIR__.'/'.$version.'.deps') as $line) { if (!trim($line)) { continue; } @@ -50,21 +51,21 @@ } list($path, $name, $url) = $parts; - $installDir = $VENDOR.'/'.$path.'/'.$name; + $installDir = $vendorDir.'/'.$path.'/'.$name; $rev = isset($versions[$name]) ? $versions[$name] : 'origin/HEAD'; echo "> Installing/Updating $name\n"; if (!is_dir($installDir)) { - system(sprintf('git clone %s %s %s', $CLONE_OPTIONS, $url, $installDir)); + system(sprintf('git clone %s %s %s', $cloneOptions, $url, $installDir)); } system(sprintf('cd %s && git fetch origin && git reset --hard %s', $installDir, $rev)); } // Update the bootstrap files -system($DIR.'/bin/build_bootstrap.php'); +system($rootDir.'/bin/build_bootstrap.php'); // Update assets -system($DIR.'/app/console assets:install '.$DIR.'/web/'); +system($rootDir.'/app/console assets:install '.$rootDir.'/web/'); From 9505155cccc0725545d98ac5848cd097e43bfe7b Mon Sep 17 00:00:00 2001 From: Fabien Potencier Date: Tue, 17 May 2011 13:16:42 +0200 Subject: [PATCH 131/899] fixed typo --- README.rst | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/README.rst b/README.rst index 8e627a5505..5e2cc8ce48 100644 --- a/README.rst +++ b/README.rst @@ -49,7 +49,7 @@ Run the following commands: .. note:: - Symfony SE does/can not use git submodules as it you should not keep the + Symfony SE does/can not use git submodules as you should not keep the `.git` directory. Configuration From d691f507edac952f77eaae041357b97f06df3f02 Mon Sep 17 00:00:00 2001 From: Fabien Potencier Date: Tue, 17 May 2011 13:17:18 +0200 Subject: [PATCH 132/899] added missing deps in README --- README.rst | 1 + 1 file changed, 1 insertion(+) diff --git a/README.rst b/README.rst index 5e2cc8ce48..9defb79111 100644 --- a/README.rst +++ b/README.rst @@ -13,6 +13,7 @@ Symfony Standard Edition comes pre-configured with the following bundles: * SwiftmailerBundle * MonologBundle * AsseticBundle +* JMSSecurityExtraBundle * WebProfilerBundle (in dev/test env) * SymfonyWebConfiguratorBundle (in dev/test env) * AcmeDemoBundle (in dev/test env) From 74fe9e62ebd3a5f45e448ef4e683f1f084c7a148 Mon Sep 17 00:00:00 2001 From: Fabien Potencier Date: Wed, 18 May 2011 16:07:59 +0200 Subject: [PATCH 133/899] updated configuration --- app/config/config.yml | 14 +++++++------- 1 file changed, 7 insertions(+), 7 deletions(-) diff --git a/app/config/config.yml b/app/config/config.yml index c024113964..2de0421f06 100644 --- a/app/config/config.yml +++ b/app/config/config.yml @@ -3,13 +3,13 @@ imports: - { resource: security.yml } framework: - secret: %secret% - charset: UTF-8 - csrf_protection: - enabled: true - router: { resource: "%kernel.root_dir%/config/routing.yml" } - validation: { enabled: true, annotations: true } - templating: { engines: ['twig'] } #assets_version: SomeVersionScheme + secret: %secret% + charset: UTF-8 + router: { resource: "%kernel.root_dir%/config/routing.yml" } + form: true + csrf_protection: true + validation: true + templating: { engines: ['twig'] } #assets_version: SomeVersionScheme session: default_locale: %locale% lifetime: 3600 From 0ddb2f2325c63ca0a1d063175fe4781340609c64 Mon Sep 17 00:00:00 2001 From: Volker Thiel Date: Wed, 18 May 2011 16:54:51 +0200 Subject: [PATCH 134/899] Changed url(...) to path(...) --- src/Acme/DemoBundle/Resources/views/Demo/index.html.twig | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/src/Acme/DemoBundle/Resources/views/Demo/index.html.twig b/src/Acme/DemoBundle/Resources/views/Demo/index.html.twig index 82e65e6503..87329d3f18 100644 --- a/src/Acme/DemoBundle/Resources/views/Demo/index.html.twig +++ b/src/Acme/DemoBundle/Resources/views/Demo/index.html.twig @@ -7,8 +7,8 @@ {% block content %}

    Available demos

    {% endblock %} From bc61b627772e61ce4f7ddc0ed32af17367a4aae7 Mon Sep 17 00:00:00 2001 From: Carsten Nielsen Date: Thu, 19 May 2011 21:48:57 +0200 Subject: [PATCH 135/899] fixed wrong quotes --- bin/vendors.php | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/bin/vendors.php b/bin/vendors.php index 7c021a1f59..7730394ab6 100755 --- a/bin/vendors.php +++ b/bin/vendors.php @@ -16,7 +16,7 @@ // Initialization if (in_array('--reinstall', $argv)) { - system('rm -rf $vendorDir'); + system('rm -rf '.$vendorDir); } $cloneOptions = ''; From 1a1f54134d17b64299e317662e377d7e461c338d Mon Sep 17 00:00:00 2001 From: Ariel Arjona Date: Thu, 19 May 2011 23:40:00 -0500 Subject: [PATCH 136/899] fix for windows, where without 'php' first it just tries to open the file instead of executing --- bin/vendors.php | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/bin/vendors.php b/bin/vendors.php index 7c021a1f59..0cd8e973c5 100755 --- a/bin/vendors.php +++ b/bin/vendors.php @@ -65,7 +65,7 @@ } // Update the bootstrap files -system($rootDir.'/bin/build_bootstrap.php'); +system('php '.$rootDir.'/bin/build_bootstrap.php'); // Update assets -system($rootDir.'/app/console assets:install '.$rootDir.'/web/'); +system('php '.$rootDir.'/app/console assets:install '.$rootDir.'/web/'); From f22f7ffce4c054dddbe4beeee1f3657a58054617 Mon Sep 17 00:00:00 2001 From: Fabien Potencier Date: Sun, 22 May 2011 09:05:51 +0200 Subject: [PATCH 137/899] updated code for the new annotation lib --- bin/2.0.0NEXT.deps | 2 +- .../DemoBundle/Controller/DemoController.php | 14 +++++----- .../Controller/SecuredController.php | 27 ++++++++++--------- 3 files changed, 23 insertions(+), 20 deletions(-) diff --git a/bin/2.0.0NEXT.deps b/bin/2.0.0NEXT.deps index 159449e542..068e67556d 100644 --- a/bin/2.0.0NEXT.deps +++ b/bin/2.0.0NEXT.deps @@ -2,7 +2,7 @@ assetic origin/HEAD symfony origin/HEAD doctrine 2.0.5 doctrine-dbal 2.0.5 -doctrine-common 2.0.2 +doctrine-common origin/3.0.x swiftmailer origin/4.1 twig origin/HEAD twig-extensions origin/HEAD diff --git a/src/Acme/DemoBundle/Controller/DemoController.php b/src/Acme/DemoBundle/Controller/DemoController.php index 092a93912c..e65713a250 100644 --- a/src/Acme/DemoBundle/Controller/DemoController.php +++ b/src/Acme/DemoBundle/Controller/DemoController.php @@ -5,12 +5,14 @@ use Symfony\Bundle\FrameworkBundle\Controller\Controller; use Symfony\Component\HttpFoundation\RedirectResponse; use Acme\DemoBundle\Form\ContactForm; +use Sensio\Bundle\FrameworkExtraBundle\Configuration\Route; +use Sensio\Bundle\FrameworkExtraBundle\Configuration\Template; class DemoController extends Controller { /** - * @extra:Route("/", name="_demo") - * @extra:Template() + * @Route("/", name="_demo") + * @Template() */ public function indexAction() { @@ -18,8 +20,8 @@ public function indexAction() } /** - * @extra:Route("/hello/{name}", name="_demo_hello") - * @extra:Template() + * @Route("/hello/{name}", name="_demo_hello") + * @Template() */ public function helloAction($name) { @@ -27,8 +29,8 @@ public function helloAction($name) } /** - * @extra:Route("/contact", name="_demo_contact") - * @extra:Template() + * @Route("/contact", name="_demo_contact") + * @Template() */ public function contactAction() { diff --git a/src/Acme/DemoBundle/Controller/SecuredController.php b/src/Acme/DemoBundle/Controller/SecuredController.php index 4de750f537..9848e42977 100644 --- a/src/Acme/DemoBundle/Controller/SecuredController.php +++ b/src/Acme/DemoBundle/Controller/SecuredController.php @@ -4,15 +4,18 @@ use Symfony\Bundle\FrameworkBundle\Controller\Controller; use Symfony\Component\Security\Core\SecurityContext; +use Sensio\Bundle\FrameworkExtraBundle\Configuration\Route; +use Sensio\Bundle\FrameworkExtraBundle\Configuration\Template; +use JMS\SecurityExtraBundle\Annotation\Secure; /** - * @extra:Route("/demo/secured") + * @Route("/demo/secured") */ class SecuredController extends Controller { /** - * @extra:Route("/login", name="_demo_login") - * @extra:Template() + * @Route("/login", name="_demo_login") + * @Template() */ public function loginAction() { @@ -29,7 +32,7 @@ public function loginAction() } /** - * @extra:Route("/login_check", name="_security_check") + * @Route("/login_check", name="_security_check") */ public function securityCheckAction() { @@ -37,7 +40,7 @@ public function securityCheckAction() } /** - * @extra:Route("/logout", name="_demo_logout") + * @Route("/logout", name="_demo_logout") */ public function logoutAction() { @@ -45,11 +48,9 @@ public function logoutAction() } /** - * @extra:Routes({ - * @extra:Route("/hello", defaults={"name"="World"}), - * @extra:Route("/hello/{name}", name="_demo_secured_hello") - * }) - * @extra:Template() + * @Route("/hello", defaults={"name"="World"}), + * @Route("/hello/{name}", name="_demo_secured_hello") + * @Template() */ public function helloAction($name) { @@ -57,9 +58,9 @@ public function helloAction($name) } /** - * @extra:Route("/hello/admin/{name}", name="_demo_secured_hello_admin") - * @extra:Secure(roles="ROLE_ADMIN") - * @extra:Template() + * @Route("/hello/admin/{name}", name="_demo_secured_hello_admin") + * @Secure(roles="ROLE_ADMIN") + * @Template() */ public function helloadminAction($name) { From 9db91ad0c93ad88a017fc0586305b83b8bd99fcc Mon Sep 17 00:00:00 2001 From: Johannes Schmitt Date: Sun, 22 May 2011 11:53:45 +0200 Subject: [PATCH 138/899] adds Metadata library --- app/autoload.php | 1 + bin/2.0.0NEXT.deps | 1 + bin/deps | 1 + 3 files changed, 3 insertions(+) diff --git a/app/autoload.php b/app/autoload.php index b3e6f0e06e..94daa03258 100644 --- a/app/autoload.php +++ b/app/autoload.php @@ -12,6 +12,7 @@ 'Doctrine' => __DIR__.'/../vendor/doctrine/lib', 'Monolog' => __DIR__.'/../vendor/monolog/src', 'Assetic' => __DIR__.'/../vendor/assetic/src', + 'Metadata' => __DIR__.'/../vendor/metadata/src', 'Acme' => __DIR__.'/../src', )); $loader->registerPrefixes(array( diff --git a/bin/2.0.0NEXT.deps b/bin/2.0.0NEXT.deps index 068e67556d..d8c64e9419 100644 --- a/bin/2.0.0NEXT.deps +++ b/bin/2.0.0NEXT.deps @@ -7,6 +7,7 @@ swiftmailer origin/4.1 twig origin/HEAD twig-extensions origin/HEAD monolog origin/HEAD +metadata origin/HEAD FrameworkExtraBundle origin/HEAD SecurityExtraBundle origin/HEAD WebConfiguratorBundle origin/HEAD \ No newline at end of file diff --git a/bin/deps b/bin/deps index e510ec24c1..3cb6486a66 100644 --- a/bin/deps +++ b/bin/deps @@ -7,6 +7,7 @@ / twig http://github.com/fabpot/Twig.git / twig-extensions http://github.com/fabpot/Twig-extensions.git / monolog http://github.com/Seldaek/monolog.git +/ metadata http://github.com/schmittjoh/metadata.git /bundles/Sensio/Bundle FrameworkExtraBundle http://github.com/sensio/SensioFrameworkExtraBundle.git /bundles/JMS SecurityExtraBundle http://github.com/schmittjoh/SecurityExtraBundle.git /bundles/Symfony/Bundle WebConfiguratorBundle http://github.com/symfony/WebConfiguratorBundle.git From 22ade4eceb3b9bfc7bcef55087f20254308fcab8 Mon Sep 17 00:00:00 2001 From: Fabien Potencier Date: Mon, 23 May 2011 08:25:30 +0200 Subject: [PATCH 139/899] removed Exception handler when using the CLI --- app/AppKernel.php | 4 +++- 1 file changed, 3 insertions(+), 1 deletion(-) diff --git a/app/AppKernel.php b/app/AppKernel.php index a68c89f994..aa87fd0280 100644 --- a/app/AppKernel.php +++ b/app/AppKernel.php @@ -39,7 +39,9 @@ public function init() DebugUniversalClassLoader::enable(); ErrorHandler::register(); - ExceptionHandler::register(); + if ('cli' !== php_sapi_name()) { + ExceptionHandler::register(); + } } else { ini_set('display_errors', 0); } From 8cbb52460bd3f1bda4d1fccce8e70afede68f53b Mon Sep 17 00:00:00 2001 From: Fabien Potencier Date: Mon, 23 May 2011 08:38:03 +0200 Subject: [PATCH 140/899] added the cache:clear command when updating the vendors --- bin/vendors.php | 3 +++ 1 file changed, 3 insertions(+) diff --git a/bin/vendors.php b/bin/vendors.php index 7730394ab6..0fe4fb78c5 100755 --- a/bin/vendors.php +++ b/bin/vendors.php @@ -69,3 +69,6 @@ // Update assets system($rootDir.'/app/console assets:install '.$rootDir.'/web/'); + +// Remove the cache +system($rootDir.'/app/console cache:clear --no-warmup'); From edb84a362caa5e38b5a4b200d033a41b7be6631e Mon Sep 17 00:00:00 2001 From: Fabien Potencier Date: Mon, 23 May 2011 13:42:45 +0200 Subject: [PATCH 141/899] updated build.sh --- bin/build.sh | 43 ++++++++++++++++++------------------------- 1 file changed, 18 insertions(+), 25 deletions(-) diff --git a/bin/build.sh b/bin/build.sh index 311e22920b..b8e62fb5ad 100755 --- a/bin/build.sh +++ b/bin/build.sh @@ -25,7 +25,7 @@ cp -r app /tmp/Symfony/ cp -r bin /tmp/Symfony/ cp -r src /tmp/Symfony/ cp -r web /tmp/Symfony/ -cp -r README.md /tmp/Symfony/ +cp -r README.rst /tmp/Symfony/ cp -r LICENSE /tmp/Symfony/ cp -r VERSION /tmp/Symfony/ cd /tmp/Symfony @@ -48,56 +48,49 @@ cd $DIR rm -rf /tmp/vendor mkdir /tmp/vendor TARGET=/tmp/vendor -cd $TARGET if [ ! -d "$DIR/vendor" ]; then echo "The master vendor directory does not exist" exit fi -cp -r $DIR/vendor/* . +cp -r $DIR/vendor/* $TARGET/ # Assetic -cd assetic && rm -rf phpunit.xml* README* tests -cd $TARGET +cd $TARGET/assetic && rm -rf phpunit.xml* README* tests # Doctrine ORM -cd doctrine && rm -rf UPGRADE* build* bin tests tools lib/vendor -cd $TARGET +cd $TARGET/doctrine && rm -rf UPGRADE* build* bin tests tools lib/vendor # Doctrine DBAL -cd doctrine-dbal && rm -rf bin build* tests lib/vendor -cd $TARGET +cd $TARGET/doctrine-dbal && rm -rf bin build* tests lib/vendor # Doctrine Common -cd doctrine-common && rm -rf build* tests lib/vendor -cd $TARGET +cd $TARGET/doctrine-common && rm -rf build* tests lib/vendor # Swiftmailer -cd swiftmailer && rm -rf CHANGES README* build* docs notes test-suite tests create_pear_package.php package* -cd $TARGET +cd $TARGET/swiftmailer && rm -rf CHANGES README* build* docs notes test-suite tests create_pear_package.php package* # Symfony -cd symfony && rm -rf README.md phpunit.xml* tests *.sh vendor -cd $TARGET +cd $TARGET/symfony && rm -rf README.md phpunit.xml* tests *.sh vendor # Twig -cd twig && rm -rf AUTHORS CHANGELOG README.markdown bin doc package.xml.tpl phpunit.xml* test -cd $TARGET +cd $TARGET/twig && rm -rf AUTHORS CHANGELOG README.markdown bin doc package.xml.tpl phpunit.xml* test # Twig Extensions -cd twig-extensions && rm -rf README doc phpunit.xml* test -cd $TARGET +cd $TARGET/twig-extensions && rm -rf README doc phpunit.xml* test # Monolog -cd monolog && rm -rf README.markdown phpunit.xml* tests -cd $TARGET +cd $TARGET/monolog && rm -rf README.markdown phpunit.xml* tests + +# Metadata +cd $TARGET/metadata && rm -rf README.rst phpunit.xml* tests # cleanup -find . -name .git | xargs rm -rf - -find . -name .gitignore | xargs rm -rf - -find . -name .gitmodules | xargs rm -rf - -find . -name .svn | xargs rm -rf - +find $TARGET -name .git | xargs rm -rf - +find $TARGET -name .gitignore | xargs rm -rf - +find $TARGET -name .gitmodules | xargs rm -rf - +find $TARGET -name .svn | xargs rm -rf - cd /tmp/ mv /tmp/vendor /tmp/Symfony/ From 3da0bfe437cfe7837bd51f45bd394f9a460d0970 Mon Sep 17 00:00:00 2001 From: Fabien Potencier Date: Mon, 23 May 2011 13:43:54 +0200 Subject: [PATCH 142/899] updated deps for beta2 --- VERSION | 2 +- bin/2.0.0BETA2.deps | 15 ++++++++------- 2 files changed, 9 insertions(+), 8 deletions(-) diff --git a/VERSION b/VERSION index 9cbac2cb9f..2a2714769a 100644 --- a/VERSION +++ b/VERSION @@ -1 +1 @@ -2.0.0NEXT +2.0.0BETA2 diff --git a/bin/2.0.0BETA2.deps b/bin/2.0.0BETA2.deps index 94f0fb700f..b0ca75baae 100644 --- a/bin/2.0.0BETA2.deps +++ b/bin/2.0.0BETA2.deps @@ -1,12 +1,13 @@ -assetic 1270994160ed8b5aecab0b7aa700934cbea124d6 -symfony 24d79f680f47222b4ed6730031a7f9d72f09bfbb +assetic 39cd55eee63e645ac1d569e7d4d10479399b32f8 +symfony 2636e36bbf6a31263fb7d58a07660c66daa52179 doctrine 35a318148cd891347f489e64140b724beb267849 doctrine-dbal 4ee7356ce0ca798f70877f295ad1309120a79c30 -doctrine-common ffd9dc7460bb90ebfe1f98388e5eceb03a934e9a -swiftmailer acb505a943d2782a00136d8e77c67dae1573fbe3 -twig 654468ff5d085f8a74ef1bdb210d0518818c4970 +doctrine-common fb845829afbd7e1821f608417894629bbb1b2a48 +swiftmailer 97962cda2c9dd61cac2c341bd7106b9b6ef665a8 +twig d90b2f7112fd2baca418f62de07aea635bf6178f twig-extensions 6b0cc16934b6e62ef07c8d2e59f9f13ff3193d3d monolog 1defa7857f842a5a554b13b776e06e7784e3a99b -FrameworkExtraBundle 2edf6067b968bb3dc9796835e2642fef41ce1f4d -SecurityExtraBundle cad7b07bd58c3e924a94463e46b1d7f185513489 +metadata 2350020f8d33f30aba891145ffa8bcb9bcdec38d +FrameworkExtraBundle f3264b91a9790eddcf1820d46c0ca1164e8c07b9 +SecurityExtraBundle f23c68b67171153cc9c6ba6ce8bfc5087a7634a8 WebConfiguratorBundle 3c272a6cefcd62b32dba8571fe0d9d3d398f187b \ No newline at end of file From 43cb104f242eb0fe5eb4549c6997ffcbab03c7d0 Mon Sep 17 00:00:00 2001 From: Fabien Potencier Date: Mon, 23 May 2011 13:46:14 +0200 Subject: [PATCH 143/899] updated VERSION --- VERSION | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/VERSION b/VERSION index 2a2714769a..9cbac2cb9f 100644 --- a/VERSION +++ b/VERSION @@ -1 +1 @@ -2.0.0BETA2 +2.0.0NEXT From a33c2c2afd5a1419ab15f5639f90d52f27e0b459 Mon Sep 17 00:00:00 2001 From: Stepan Tanasiychuk Date: Mon, 23 May 2011 13:22:03 -0700 Subject: [PATCH 144/899] rm excess slash --- bin/vendors.php | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) mode change 100755 => 100644 bin/vendors.php diff --git a/bin/vendors.php b/bin/vendors.php old mode 100755 new mode 100644 index 0fe4fb78c5..54813b1048 --- a/bin/vendors.php +++ b/bin/vendors.php @@ -68,7 +68,7 @@ system($rootDir.'/bin/build_bootstrap.php'); // Update assets -system($rootDir.'/app/console assets:install '.$rootDir.'/web/'); +system($rootDir.'/app/console assets:install '.$rootDir.'/web'); // Remove the cache system($rootDir.'/app/console cache:clear --no-warmup'); From 5f6695253e25e2383d09479278bb2c7a2bbbc226 Mon Sep 17 00:00:00 2001 From: Fabien Potencier Date: Mon, 23 May 2011 22:36:06 +0200 Subject: [PATCH 145/899] reverted mode changed from previous commit --- bin/vendors.php | 0 1 file changed, 0 insertions(+), 0 deletions(-) mode change 100644 => 100755 bin/vendors.php diff --git a/bin/vendors.php b/bin/vendors.php old mode 100644 new mode 100755 From 992158d59894d6341b7fcb24b2402521eb1a8d9c Mon Sep 17 00:00:00 2001 From: Carsten Nielsen Date: Tue, 24 May 2011 08:46:10 +0200 Subject: [PATCH 146/899] On reinstall only the vendors defined in bin/deps should be deleted. --- bin/vendors.php | 8 +++----- 1 file changed, 3 insertions(+), 5 deletions(-) diff --git a/bin/vendors.php b/bin/vendors.php index 54813b1048..6762cb2a00 100755 --- a/bin/vendors.php +++ b/bin/vendors.php @@ -15,10 +15,6 @@ $version = trim(file_get_contents($rootDir.'/VERSION')); // Initialization -if (in_array('--reinstall', $argv)) { - system('rm -rf '.$vendorDir); -} - $cloneOptions = ''; if (in_array('--min', $argv)) { $cloneOptions = '--depth 1'; @@ -52,7 +48,9 @@ list($path, $name, $url) = $parts; $installDir = $vendorDir.'/'.$path.'/'.$name; - + if (in_array('--reinstall', $argv)) { + system('rm -rf '.$installDir); + } $rev = isset($versions[$name]) ? $versions[$name] : 'origin/HEAD'; echo "> Installing/Updating $name\n"; From a9991a27f7dc4e6cf24d6a1c3356bc9d51ef6001 Mon Sep 17 00:00:00 2001 From: Ryan Weaver Date: Wed, 25 May 2011 10:07:26 -0500 Subject: [PATCH 147/899] Fixing 5.3.1 typo/out-dated text in CLI check.php script --- app/check.php | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/app/check.php b/app/check.php index 7c6b399df3..d32aaca2e9 100644 --- a/app/check.php +++ b/app/check.php @@ -40,7 +40,7 @@ // mandatory echo_title("Mandatory requirements"); -check(version_compare(phpversion(), '5.3.2', '>='), sprintf('Checking that PHP version is at least 5.3.2 (%s installed)', phpversion()), 'Install PHP 5.3.1 or newer (current version is '.phpversion(), true); +check(version_compare(phpversion(), '5.3.2', '>='), sprintf('Checking that PHP version is at least 5.3.2 (%s installed)', phpversion()), 'Install PHP 5.3.2 or newer (current version is '.phpversion(), true); check(ini_get('date.timezone'), 'Checking that the "date.timezone" setting is set', 'Set the "date.timezone" setting in php.ini (like Europe/Paris)', true); check(is_writable(__DIR__.'/../app/cache'), sprintf('Checking that app/cache/ directory is writable'), 'Change the permissions of the app/cache/ directory so that the web server can write in it', true); check(is_writable(__DIR__.'/../app/logs'), sprintf('Checking that the app/logs/ directory is writable'), 'Change the permissions of the app/logs/ directory so that the web server can write in it', true); From 936240510ebf536d0c448cd8356cdad6348c1502 Mon Sep 17 00:00:00 2001 From: Ariel Arjona Date: Wed, 25 May 2011 23:07:47 -0500 Subject: [PATCH 148/899] added a realpath() call so windows can use the paths for rmdir --- bin/vendors.php | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/bin/vendors.php b/bin/vendors.php index f367809c12..29d28f73fb 100755 --- a/bin/vendors.php +++ b/bin/vendors.php @@ -49,8 +49,8 @@ $installDir = $vendorDir.'/'.$path.'/'.$name; if (in_array('--reinstall', $argv)) { - if (PHP_OS == 'WINNT') { - system('rmdir /Q /S '.$installDir); + if (PHP_OS == 'WINNT') { + system('rmdir /S /Q '.realpath($installDir)); } else { system('rm -rf '.$installDir); } From 46cb686f0ffdee570b2f3cf08ef4379a30cb9274 Mon Sep 17 00:00:00 2001 From: Ariel Arjona Date: Thu, 26 May 2011 00:39:31 -0500 Subject: [PATCH 149/899] formatting --- bin/vendors.php | 10 +++++----- 1 file changed, 5 insertions(+), 5 deletions(-) diff --git a/bin/vendors.php b/bin/vendors.php index 29d28f73fb..479062a6cf 100755 --- a/bin/vendors.php +++ b/bin/vendors.php @@ -49,12 +49,12 @@ $installDir = $vendorDir.'/'.$path.'/'.$name; if (in_array('--reinstall', $argv)) { - if (PHP_OS == 'WINNT') { - system('rmdir /S /Q '.realpath($installDir)); - } else { - system('rm -rf '.$installDir); - } + if (PHP_OS == 'WINNT') { + system('rmdir /S /Q '.realpath($installDir)); + } else { + system('rm -rf '.$installDir); } + } $rev = isset($versions[$name]) ? $versions[$name] : 'origin/HEAD'; echo "> Installing/Updating $name\n"; From 166675b8f184090a57cbfc151dde093409414784 Mon Sep 17 00:00:00 2001 From: Fabien Potencier Date: Thu, 26 May 2011 10:33:19 +0200 Subject: [PATCH 150/899] fixed CS --- bin/vendors.php | 12 ++++++------ 1 file changed, 6 insertions(+), 6 deletions(-) diff --git a/bin/vendors.php b/bin/vendors.php index 479062a6cf..580846d9bf 100755 --- a/bin/vendors.php +++ b/bin/vendors.php @@ -49,12 +49,12 @@ $installDir = $vendorDir.'/'.$path.'/'.$name; if (in_array('--reinstall', $argv)) { - if (PHP_OS == 'WINNT') { - system('rmdir /S /Q '.realpath($installDir)); - } else { - system('rm -rf '.$installDir); - } - } + if (PHP_OS == 'WINNT') { + system('rmdir /S /Q '.realpath($installDir)); + } else { + system('rm -rf '.$installDir); + } + } $rev = isset($versions[$name]) ? $versions[$name] : 'origin/HEAD'; echo "> Installing/Updating $name\n"; From ed7e0bccc9a5c39745e281c044a6a34146dd828d Mon Sep 17 00:00:00 2001 From: Christophe Coevoet Date: Thu, 26 May 2011 13:36:56 +0200 Subject: [PATCH 151/899] Enabled the annotations for the validator --- app/config/config.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/app/config/config.yml b/app/config/config.yml index 2de0421f06..3a1d354ef3 100644 --- a/app/config/config.yml +++ b/app/config/config.yml @@ -8,7 +8,7 @@ framework: router: { resource: "%kernel.root_dir%/config/routing.yml" } form: true csrf_protection: true - validation: true + validation: { enable_annotations: true } templating: { engines: ['twig'] } #assets_version: SomeVersionScheme session: default_locale: %locale% From 69a78d30b07b5563ba972f2cc8f43326f64db8e2 Mon Sep 17 00:00:00 2001 From: Fabien Potencier Date: Thu, 26 May 2011 22:31:03 +0200 Subject: [PATCH 152/899] added a special autoloader for Swiftmailer This removed the need to get the 'mailer' service before doing anything with Swiftmailer. --- app/autoload.php | 18 +++++++++++++++++- 1 file changed, 17 insertions(+), 1 deletion(-) diff --git a/app/autoload.php b/app/autoload.php index 94daa03258..0a938fdfc2 100644 --- a/app/autoload.php +++ b/app/autoload.php @@ -18,9 +18,25 @@ $loader->registerPrefixes(array( 'Twig_Extensions_' => __DIR__.'/../vendor/twig-extensions/lib', 'Twig_' => __DIR__.'/../vendor/twig/lib', - 'Swift_' => __DIR__.'/../vendor/swiftmailer/lib/classes', )); $loader->register(); $loader->registerPrefixFallback(array( __DIR__.'/../vendor/symfony/src/Symfony/Component/Locale/Resources/stubs', )); + +// Swiftmailer needs a special autoloader to allow +// the lazy loading of the init file (which is expensive) +spl_autoload_register(function ($class) { + static $initialized = false; + + $src = __DIR__.'/../vendor/swiftmailer/lib'; + + if (0 === strpos($class, 'Swift_') && file_exists($path = $src.'/classes/'.str_replace('_', '/', $class).'.php')) { + if (!$initialized) { + $initialized = true; + require $src.'/swift_init.php'; + } + + require $path; + } +}); From cfe1379c037f46d48d543443bcc9a1c90ebe9811 Mon Sep 17 00:00:00 2001 From: Fabien Potencier Date: Fri, 27 May 2011 08:53:03 +0200 Subject: [PATCH 153/899] prepared BETA3 released --- VERSION | 2 +- bin/2.0.0BETA3.deps | 13 +++++++++++++ 2 files changed, 14 insertions(+), 1 deletion(-) create mode 100644 bin/2.0.0BETA3.deps diff --git a/VERSION b/VERSION index 9cbac2cb9f..36a7bbb02f 100644 --- a/VERSION +++ b/VERSION @@ -1 +1 @@ -2.0.0NEXT +2.0.0BETA3 diff --git a/bin/2.0.0BETA3.deps b/bin/2.0.0BETA3.deps new file mode 100644 index 0000000000..91eafaa5c1 --- /dev/null +++ b/bin/2.0.0BETA3.deps @@ -0,0 +1,13 @@ +assetic 119b37fbdea9d0ab6a6466f00d8eaa239753878a +symfony 923c234160c1174353d6e282bb9486b267c43343 +doctrine 35a318148cd891347f489e64140b724beb267849 +doctrine-dbal 4ee7356ce0ca798f70877f295ad1309120a79c30 +doctrine-common 31e5f19107c7e37afcbb26335fb322323eac037f +swiftmailer 97962cda2c9dd61cac2c341bd7106b9b6ef665a8 +twig f742efd602f310c37fdbe40c5ffcf4d61f5a4f52 +twig-extensions 6b0cc16934b6e62ef07c8d2e59f9f13ff3193d3d +monolog 1defa7857f842a5a554b13b776e06e7784e3a99b +metadata 97d85e0085b3393288f45f413147b08411b19e77 +FrameworkExtraBundle f3264b91a9790eddcf1820d46c0ca1164e8c07b9 +SecurityExtraBundle f23c68b67171153cc9c6ba6ce8bfc5087a7634a8 +WebConfiguratorBundle b1520580ab8626ab1c84f4ddb5bc25203bf228a0 \ No newline at end of file From 78fe6926c46db3c27e160a8c3844124ad36e24c8 Mon Sep 17 00:00:00 2001 From: Fabien Potencier Date: Fri, 27 May 2011 08:53:53 +0200 Subject: [PATCH 154/899] updated VERSION --- VERSION | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/VERSION b/VERSION index 36a7bbb02f..9cbac2cb9f 100644 --- a/VERSION +++ b/VERSION @@ -1 +1 @@ -2.0.0BETA3 +2.0.0NEXT From 4da2da9b779169c442b2b0c41fbe07d511b060a3 Mon Sep 17 00:00:00 2001 From: Fabien Potencier Date: Fri, 27 May 2011 09:19:00 +0200 Subject: [PATCH 155/899] added a more sensible default configuration for Swiftmailer in the test env --- app/config/config_test.yml | 3 +++ 1 file changed, 3 insertions(+) diff --git a/app/config/config_test.yml b/app/config/config_test.yml index a002a8d51b..7dba2fbfce 100644 --- a/app/config/config_test.yml +++ b/app/config/config_test.yml @@ -9,3 +9,6 @@ framework: web_profiler: toolbar: false intercept_redirects: false + +swiftmailer: + disable_delivery: true From eb91949d655e7a36ed8e02a380c9ef2ab97d0efb Mon Sep 17 00:00:00 2001 From: Ryan Weaver Date: Fri, 27 May 2011 08:33:08 -0500 Subject: [PATCH 156/899] Fixing the contact form, which now works with the new forms --- .../DemoBundle/Controller/DemoController.php | 23 +++++++++++------- src/Acme/DemoBundle/Form/ContactForm.php | 24 ------------------- src/Acme/DemoBundle/Form/ContactType.php | 15 ++++++++++++ .../DemoBundle/Resources/public/css/demo.css | 2 +- .../Resources/views/Demo/contact.html.twig | 11 ++++++--- 5 files changed, 39 insertions(+), 36 deletions(-) delete mode 100644 src/Acme/DemoBundle/Form/ContactForm.php create mode 100644 src/Acme/DemoBundle/Form/ContactType.php diff --git a/src/Acme/DemoBundle/Controller/DemoController.php b/src/Acme/DemoBundle/Controller/DemoController.php index e65713a250..23928b07bb 100644 --- a/src/Acme/DemoBundle/Controller/DemoController.php +++ b/src/Acme/DemoBundle/Controller/DemoController.php @@ -4,7 +4,9 @@ use Symfony\Bundle\FrameworkBundle\Controller\Controller; use Symfony\Component\HttpFoundation\RedirectResponse; -use Acme\DemoBundle\Form\ContactForm; +use Acme\DemoBundle\Form\ContactType; + +// these import the "@Route" and "@Template" annotations use Sensio\Bundle\FrameworkExtraBundle\Configuration\Route; use Sensio\Bundle\FrameworkExtraBundle\Configuration\Template; @@ -34,17 +36,22 @@ public function helloAction($name) */ public function contactAction() { - $form = ContactForm::create($this->get('form.context'), 'contact'); + $form = $this->get('form.factory')->create(new ContactType()); - $form->bind($this->container->get('request'), $form); - if ($form->isValid()) { - $form->send($this->get('mailer')); + $request = $this->get('request'); + if ('POST' == $request->getMethod()) { + $form->bindRequest($request); + if ($form->isValid()) { + $mailer = $this->get('mailer'); + // .. setup a message and send it + // http://symfony.com/doc/current/cookbook/email.html - $this->get('session')->setFlash('notice', 'Message sent!'); + $this->get('session')->setFlash('notice', 'Message sent!'); - return new RedirectResponse($this->generateUrl('_demo')); + return new RedirectResponse($this->generateUrl('_demo')); + } } - return array('form' => $form); + return array('form' => $form->createView()); } } diff --git a/src/Acme/DemoBundle/Form/ContactForm.php b/src/Acme/DemoBundle/Form/ContactForm.php deleted file mode 100644 index 03a54b2330..0000000000 --- a/src/Acme/DemoBundle/Form/ContactForm.php +++ /dev/null @@ -1,24 +0,0 @@ -add(new TextField('email')); - $this->add(new TextField('message')); - } - - public function send(\Swift_Mailer $mailer) - { - //$mailer->send(); - } -} diff --git a/src/Acme/DemoBundle/Form/ContactType.php b/src/Acme/DemoBundle/Form/ContactType.php new file mode 100644 index 0000000000..39959378fc --- /dev/null +++ b/src/Acme/DemoBundle/Form/ContactType.php @@ -0,0 +1,15 @@ +add('email', 'email'); + $builder->add('message', 'textarea'); + } +} diff --git a/src/Acme/DemoBundle/Resources/public/css/demo.css b/src/Acme/DemoBundle/Resources/public/css/demo.css index 7aa3efd7d0..1dd242f4e3 100644 --- a/src/Acme/DemoBundle/Resources/public/css/demo.css +++ b/src/Acme/DemoBundle/Resources/public/css/demo.css @@ -271,7 +271,7 @@ input[type=text], input[type=password] color: red; } -#login label +#login label, #contact_form label { display: block; float: left; diff --git a/src/Acme/DemoBundle/Resources/views/Demo/contact.html.twig b/src/Acme/DemoBundle/Resources/views/Demo/contact.html.twig index 89a4b36c56..e5b7523bac 100644 --- a/src/Acme/DemoBundle/Resources/views/Demo/contact.html.twig +++ b/src/Acme/DemoBundle/Resources/views/Demo/contact.html.twig @@ -3,8 +3,13 @@ {% block title "Symfony - Contact form" %} {% block content %} -
    - {{ form_field(form) }} - + + {{ form_errors(form) }} + + {{ form_row(form.email) }} + {{ form_row(form.message) }} + + {{ form_rest(form) }} +
    {% endblock %} From 554b027610a2a43decce144b315b46cdb898bceb Mon Sep 17 00:00:00 2001 From: Fabien Potencier Date: Mon, 30 May 2011 11:10:53 +0200 Subject: [PATCH 157/899] removed the web version of app/check.php (done by web/config.php) --- app/check.php | 117 +++++++++++--------------------------------------- 1 file changed, 25 insertions(+), 92 deletions(-) diff --git a/app/check.php b/app/check.php index d32aaca2e9..c10f1ab2bf 100644 --- a/app/check.php +++ b/app/check.php @@ -1,42 +1,25 @@ - - - - -

    symfony -REQUIREMENTS CHECK

    -EOF -; - echo sprintf("

    php.ini used by PHP: %s

    ", get_ini_path()); + +echo "********************************\n"; +echo "* *\n"; +echo "* Symfony requirements check *\n"; +echo "* *\n"; +echo "********************************\n\n"; +echo sprintf("php.ini used by PHP: %s\n\n", $iniPath); + +echo "** WARNING **\n"; +echo "* The PHP CLI can use a different php.ini file\n"; +echo "* than the one used with your web server.\n"; +if ('\\' == DIRECTORY_SEPARATOR) { + echo "* (especially on the Windows platform)\n"; } +echo "* If this is the case, please ALSO launch this\n"; +echo "* utility from your web server.\n"; +echo "** WARNING **\n"; // mandatory echo_title("Mandatory requirements"); @@ -79,73 +62,23 @@ function_exists('xcache_set') check(count($drivers), 'Checking that PDO has some drivers installed: '.implode(', ', $drivers), 'Install PDO drivers (mandatory for Doctrine)'); } -if (!is_cli()) { - echo ''; -} - /** * Checks a configuration. */ function check($boolean, $message, $help = '', $fatal = false) { - if (is_cli()) { - echo $boolean ? " OK " : sprintf("\n\n[[%s]] ", $fatal ? ' ERROR ' : 'WARNING'); - echo sprintf("$message%s\n", $boolean ? '' : ': FAILED'); + echo $boolean ? " OK " : sprintf("\n\n[[%s]] ", $fatal ? ' ERROR ' : 'WARNING'); + echo sprintf("$message%s\n", $boolean ? '' : ': FAILED'); - if (!$boolean) { - echo " *** $help ***\n"; - if ($fatal) { - die("You must fix this problem before resuming the check.\n"); - } - } - } else { - if ($boolean) { - $color = '#60b111'; - $image = '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'; - $alt = 'ok'; - } elseif ($fatal) { - $color = '#fd3900'; - $image = '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'; - $alt = 'fatal'; - } else { - $color = '#6a9ee6'; - $image = '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'; - $alt = 'warning'; + if (!$boolean) { + echo " *** $help ***\n"; + if ($fatal) { + die("You must fix this problem before resuming the check.\n"); } - - echo sprintf(' -
    -
    %s
    -
    %s%s
    -
    -
    ', $color, $alt, $image, $message, !$boolean ? '
    What to do'.($fatal ? '' : ' (optional)').': '.$help.'
    ' : ''); } } function echo_title($title) { - if (is_cli()) { - echo "\n** $title **\n\n"; - } else { - echo "

    $title

    "; - } -} - -/** - * Gets the php.ini path used by the current PHP interpretor. - * - * @return string the php.ini path - */ -function get_ini_path() -{ - if ($path = get_cfg_var('cfg_file_path')) { - return $path; - } - - return 'WARNING: not using a php.ini file'; -} - -function is_cli() -{ - return !isset($_SERVER['HTTP_HOST']); + echo "\n** $title **\n\n"; } From 5507ad193ecdbc76e497afb730b25fbabb80c070 Mon Sep 17 00:00:00 2001 From: Fabien Potencier Date: Tue, 31 May 2011 07:31:38 +0200 Subject: [PATCH 158/899] removed the special Swift autoloader in favor of the new Swift build-in one --- app/autoload.php | 16 ++-------------- app/cache/.gitkeep | 0 2 files changed, 2 insertions(+), 14 deletions(-) delete mode 100755 app/cache/.gitkeep diff --git a/app/autoload.php b/app/autoload.php index 0a938fdfc2..3f31e25508 100644 --- a/app/autoload.php +++ b/app/autoload.php @@ -26,17 +26,5 @@ // Swiftmailer needs a special autoloader to allow // the lazy loading of the init file (which is expensive) -spl_autoload_register(function ($class) { - static $initialized = false; - - $src = __DIR__.'/../vendor/swiftmailer/lib'; - - if (0 === strpos($class, 'Swift_') && file_exists($path = $src.'/classes/'.str_replace('_', '/', $class).'.php')) { - if (!$initialized) { - $initialized = true; - require $src.'/swift_init.php'; - } - - require $path; - } -}); +require_once __DIR__.'/../vendor/swiftmailer/lib/classes/Swift.php'; +Swift::registerAutoload(__DIR__.'/../vendor/swiftmailer/lib/swift_init.php'); diff --git a/app/cache/.gitkeep b/app/cache/.gitkeep deleted file mode 100755 index e69de29bb2..0000000000 From 9ad57d5976866ed4da3ea863bd18d836d4ec05f9 Mon Sep 17 00:00:00 2001 From: Fabien Potencier Date: Tue, 31 May 2011 09:08:49 +0200 Subject: [PATCH 159/899] fixed listener --- src/Acme/DemoBundle/Resources/config/services.xml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/src/Acme/DemoBundle/Resources/config/services.xml b/src/Acme/DemoBundle/Resources/config/services.xml index ef9184502b..cddc0d6350 100644 --- a/src/Acme/DemoBundle/Resources/config/services.xml +++ b/src/Acme/DemoBundle/Resources/config/services.xml @@ -11,7 +11,7 @@ - + From 267dec43364f3f5388e23379d6a91f7eb9c8aa1b Mon Sep 17 00:00:00 2001 From: Fabien Potencier Date: Tue, 31 May 2011 09:31:44 +0200 Subject: [PATCH 160/899] updated autoloader --- README.rst | 1 - app/autoload.php | 8 +++++--- 2 files changed, 5 insertions(+), 4 deletions(-) diff --git a/README.rst b/README.rst index 9defb79111..b9ba349086 100644 --- a/README.rst +++ b/README.rst @@ -72,7 +72,6 @@ playing with it, you can remove it by following these steps: * delete the ``src/Acme`` directory; * remove the routing entries referencing AcmeBundle in ``app/config/routing_dev.yml``; * remove the AcmeBundle from the registered bundles in ``app/AppKernel.php``; -* remove the Acme registered namespace in ``app/autoload.php``. Configure the distribution by editing ``app/config/parameters.ini`` or by accessing ``web/config.php`` in a browser. diff --git a/app/autoload.php b/app/autoload.php index 3f31e25508..f23e397767 100644 --- a/app/autoload.php +++ b/app/autoload.php @@ -13,16 +13,18 @@ 'Monolog' => __DIR__.'/../vendor/monolog/src', 'Assetic' => __DIR__.'/../vendor/assetic/src', 'Metadata' => __DIR__.'/../vendor/metadata/src', - 'Acme' => __DIR__.'/../src', )); $loader->registerPrefixes(array( 'Twig_Extensions_' => __DIR__.'/../vendor/twig-extensions/lib', 'Twig_' => __DIR__.'/../vendor/twig/lib', )); -$loader->register(); -$loader->registerPrefixFallback(array( +$loader->registerPrefixFallbacks(array( __DIR__.'/../vendor/symfony/src/Symfony/Component/Locale/Resources/stubs', )); +$loader->registerNamespaceFallbacks(array( + __DIR__.'/../src', +)); +$loader->register(); // Swiftmailer needs a special autoloader to allow // the lazy loading of the init file (which is expensive) From b181843b6c5b9d91f5791938a2c99abc356b5178 Mon Sep 17 00:00:00 2001 From: Carsten Nielsen Date: Tue, 31 May 2011 11:16:03 +0200 Subject: [PATCH 161/899] Set anchor to use id-attribute instead of name (acc. XHTML/HTML5) --- web/config.php | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/web/config.php b/web/config.php index 8489f47ef5..23aed3374e 100644 --- a/web/config.php +++ b/web/config.php @@ -156,7 +156,7 @@ - +

    * Changes to the php.ini file must be done in "". From 37cef6803415ae04370e56d37784ea322287593b Mon Sep 17 00:00:00 2001 From: Brikou CARRE Date: Fri, 3 Jun 2011 09:28:16 +0200 Subject: [PATCH 162/899] simplified phpunit's configuration --- app/phpunit.xml.dist | 20 ++++++++------------ 1 file changed, 8 insertions(+), 12 deletions(-) diff --git a/app/phpunit.xml.dist b/app/phpunit.xml.dist index 092802d097..38651d8443 100644 --- a/app/phpunit.xml.dist +++ b/app/phpunit.xml.dist @@ -1,16 +1,11 @@ - + + + ../src/*/*Bundle/Tests @@ -22,7 +17,7 @@ - //--> + --> @@ -35,4 +30,5 @@ + From 7b2666f573d128b7f93f672f6acfa36a29deb121 Mon Sep 17 00:00:00 2001 From: Brikou CARRE Date: Fri, 3 Jun 2011 10:16:44 +0200 Subject: [PATCH 163/899] cosmetic --- app/phpunit.xml.dist | 13 ++++++++++--- 1 file changed, 10 insertions(+), 3 deletions(-) diff --git a/app/phpunit.xml.dist b/app/phpunit.xml.dist index 38651d8443..1e31086ded 100644 --- a/app/phpunit.xml.dist +++ b/app/phpunit.xml.dist @@ -2,9 +2,16 @@ + backupGlobals = "false" + backupStaticAttributes = "false" + colors = "true" + convertErrorsToExceptions = "true" + convertNoticesToExceptions = "true" + convertWarningsToExceptions = "true" + processIsolation = "false" + stopOnFailure = "false" + syntaxCheck = "false" + bootstrap = "bootstrap.php.cache" > From ca00e87b4cd9b2f3045ac565e11ab5b516eb1e6d Mon Sep 17 00:00:00 2001 From: Fabien Potencier Date: Sun, 5 Jun 2011 07:52:50 +0200 Subject: [PATCH 164/899] fixed wrong image names --- .../public/images/welcome-configure.gif | Bin 4053 -> 3530 bytes .../Resources/public/images/welcome-demo.gif | Bin 3530 -> 4053 bytes 2 files changed, 0 insertions(+), 0 deletions(-) diff --git a/src/Acme/DemoBundle/Resources/public/images/welcome-configure.gif b/src/Acme/DemoBundle/Resources/public/images/welcome-configure.gif index 0623de54c9501be250cd0907bd09f6b452c53fe6..931179a7cb9827b662968f36f0732dceaae9cc8e 100644 GIT binary patch delta 3513 zcmV;q4My_SAIcklM@dFFIbpH@WB~X70M53Z+qor;Mnp+QLrFe7L4|~dLO?}$c6mcUMm{@0L_$YtXKOz_LSSBEOi53vsH!$I zIC5}wQcqNxn46G~kw-*INk&YGh>CuEeo977k&u#hba*{FKf%DkfPR63fP}EGv51C= zTv}ePt*?!Li;X-vKG)XPR8m*1tgfr7tT8V$#>U5EU}cJliy|N+s;R4IWNORG%EQ9L zhJ}cspP}2@+u7LJ)zs9itF2^WX2rzDT3B2xDlSS#O~1auYiMnvp`&qdb8TyIe0qK< zC@Ul*CMzi|Vqjw^CMvzXzD!F_dU$&!Bqvi+RGyuGpKEDsCnYFRP*P4zP)$rvZESBz zNJ~9DKc=Opac*-mFf>n0QpCf>=;!Cu)74E%P%|+#G%_}UfP%ljzdATQJ2^f%Haj;p zIXgH#H8VF)OjAutQS0mLHZ(XmHaj>qIyW^sHZ(amG&%3@?=&$sH8M9iHaapeHSzKB zG%`1T#KXihF*Y+WH90psARi(lAtk4#r|s?S?(Xj3-{0`?@WsT%@bB;J?Ck98>pD0* z<>lt)<>l(?>f+(y@9yq0Ff(v&b8&BS?dFGN;J|?5?b>Y-?@c z-{7UBrR3w}yt}*M;o`KjwQz27>+0*TuCQ8vS6kNA*6Hc#H#RwIX>RiI@usDw%gf9= zIy|?wx9I2S+}qn#Q&+&h!o$PFrKG1WEH9XsnZd!qj*X8uH8)F2OkQ1J(9h4KqNFl0 zG?kQ=@$m5K>FP&DNPm5SL_$SRO;VehoSd7TPfk&|x4GBX*wfO}-{0SLba(FU?d3&*1kn?Qz{E+?rcjws@uG@| zi;!uT5*}H}R>`P=o>Z*N!O`l^ta$%%D8zTsB2$dqAo54Ju;IgmZQb$|e?g)IA2o7l za7vlP8yil8aIiA8B-4s5-V{_?F%I-f2{?u+e`bH%WMJl*Xr`Iw zGi*L{#+zq25eN@KN-`uW68?f@Q#CA!!vs!-G*U?&+_1(P(@b;132t-{Q;IZ=fW=!~ zR%+>`m}aW!rkr}hg@`0ldE%9ky7(edsHUpwszIR;45t+h|A8T(9L@l1d+Y6Vt3+QA zDdCYSY*Y&umK1A=eW- zV0*pBu9P8%2)Gc2$S~|yl(51Le=&@lau1ushZZ!~+=m1Y z-=W1m4X~hv5)UJWAB-$7=`M?fdV*2QU2Z78KAy+9rf>WtNGv>iqN2@3e+Da1U=#FG4H;BH&W0 zR791^ug#*VZbxta`9uL@eL-1h$f1V|*t-5jE6@K=e-mOed4&BI)j$6iDL7J+g2jBj2l^2pV1^h($U+?$ zF-8Vje{h3d2!sGl%AyvvI0&TpZ+%P9QGtrVM0=fw8VuRO1|GpiHnJf`U$h>7s#Y(i ztwtMjV1yp`NRCWc=bAkc{LvoKP~tzyp#M7=s_a zQ3hA^;2V3$#Z=-rJVloAVH}`?Dp$G6H!Noee{?{DGhiVNIw(N`Q=kJcRHGQiK!lXS zGv(3@pbAycAq@T?W-)bT_7BppmLRj^!IO^$7MOrPcI0!5$-5ZA7 zS2pdPEvBQ=fgv8izrq^!u!v2pVi(KU#ya+~kc}*31Hgm?Sk|%x$gE~J%h}F)_OqbX zEC3Qg+R~c#w5Uz3YDxR5#yVgcXp`xc#^<7p|Dx}6Oy{=y*Myb&Nh%2@ z$bx;>1OZ+sxf_W_0v&=3Y^;C)f56yqMkZXeFQjx&7{*8~ZcvjLK!gcCXwe8B2*Dz* zF9vr48wNEJ4L3Y$1kq@S8Xgss0+>)4M0}bAyMj<(wE-!kh{hVyaDu4{WDqUMvKR{D zi6f-p07-tQ1P%J2OvsQdWuQQn5weDqxS9U~?RX0-2;pWdgxQ|<<3LbLf7+D;%wia5 zoQeW+P=XVTs~`j*iJ}+H=oQ@ApLy=lNEd`H#MmNV`@)C=o}qy?SaBd!(5|RQy#NGM z1(DX$5Y~&R9v%m*HqgJ2@nPD0MWz`N z1|dY@+0g#MK*At}L)uu5e{wB^D2~lYZRMg{1p!AS#!YT0bcw_)dyj1DxKF|$Lj^pD zx4g@N1RhWT2=UIr!K|(1`7umD?AGTPGH|u4g`yOTQ37B5u#R*TqL5iZx5DBn&r-;M z1sKmb3xGzLa5WJnUKC#%5a7V{rZ=4ptAPR>&`^yo2m%f>aD@}#0Eol98Xw?} z$kC&f^oJ>d4`@$&+VkKF=6rz<-)H~=bis!qh~XW4P{DGNy=;VxeOG0#k2&BF2R>ZE zAL59E;^Bae`EVc(fBm>X1JDqMA0*-$aX7|&ydCy#uKb%VA7;(|KmuLRY!3D!f)>Wn zg=)lsW_n*5BI@yZ;03-uF-V2(b)N^E1#Jeq&jLI939Wy^$K~x#etC$mQTyFq`Os$# z^9%d@=v)6V(>H!;@_GI4W54#lJ6iu99^i=boB#aiPrv%je~*CnyZ`-3h<_5oLH`Tb z|Ni#(g8sYFjZ*mk|D|vUhX4x%Xa)v&fMy^73b=p*a0ORD0O034M*~-+Ay7O57?buw zWu{Pj(KE%pEaD!76y2mozBfi;qCtF~uDg;&4gRZf9a@ADyl z)l|u|JjAsVe-$uhR3~?$Hw@*0Ed_!~)jd8)Dp4gAR+bm# zu!K7$gFsbRUGWuMB|teiHaqB7A}9pk;}TEBHfhC$mtqHC_*PAbflqi)DD^8-=qI$o zT)#C@BN$l2MLs{#g?J%1cNivlr(gt{!#S()IioW=f2MOfL|_A5#ZY_YQasp(6;*<5 zBUP8u2aR|m<&YOrkXI|EgWL66B0?7m;R#a^gm!i*%W#S}at3uk71^K%6OdyT#!`GG zh=4N>3gHdWl_lJeDG#8FU?_$nMN&0bR5)m0Ni`_IRfxhh6Yp>coMH_J0F6tShkCS! n8;B>vA4r8wVuj5WINWFgOF$11R*&|0kNB96`nZo45fA`7aAIBg delta 4040 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 diff --git a/src/Acme/DemoBundle/Resources/public/images/welcome-demo.gif b/src/Acme/DemoBundle/Resources/public/images/welcome-demo.gif index 931179a7cb9827b662968f36f0732dceaae9cc8e..0623de54c9501be250cd0907bd09f6b452c53fe6 100644 GIT binary patch delta 4040 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 delta 3513 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 From 9dd067b6fe9c43fda8a740f9c43f5e379ebb3a3a Mon Sep 17 00:00:00 2001 From: Johannes Date: Mon, 6 Jun 2011 01:20:44 -0700 Subject: [PATCH 165/899] Session lifetime should be configured in php.ini, this value only applies to the cookie and is not enforced if the client decides to keep the cookie for more than one hour --- app/config/config.yml | 1 - 1 file changed, 1 deletion(-) diff --git a/app/config/config.yml b/app/config/config.yml index 3a1d354ef3..c884d58c5f 100644 --- a/app/config/config.yml +++ b/app/config/config.yml @@ -12,7 +12,6 @@ framework: templating: { engines: ['twig'] } #assets_version: SomeVersionScheme session: default_locale: %locale% - lifetime: 3600 auto_start: true # Twig Configuration From ee4c91949cadf862bf899865f9f66099aa6efcc3 Mon Sep 17 00:00:00 2001 From: Fabien Potencier Date: Mon, 6 Jun 2011 12:16:28 +0200 Subject: [PATCH 166/899] updated vendors for BETA4 --- VERSION | 2 +- bin/2.0.0BETA4.deps | 13 +++++++++++++ 2 files changed, 14 insertions(+), 1 deletion(-) create mode 100644 bin/2.0.0BETA4.deps diff --git a/VERSION b/VERSION index 9cbac2cb9f..c3da571373 100644 --- a/VERSION +++ b/VERSION @@ -1 +1 @@ -2.0.0NEXT +2.0.0BETA4 diff --git a/bin/2.0.0BETA4.deps b/bin/2.0.0BETA4.deps new file mode 100644 index 0000000000..7da1fbfb43 --- /dev/null +++ b/bin/2.0.0BETA4.deps @@ -0,0 +1,13 @@ +assetic bb9fae263d2d05da4ae916955a1b72945618e9ac +symfony a1d866e709cef62f2b9b44a4959574984ab86ab7 +doctrine 35a318148cd891347f489e64140b724beb267849 +doctrine-dbal 4ee7356ce0ca798f70877f295ad1309120a79c30 +doctrine-common 40ab808b37dcd3e9fd92800061a9b71f64469e52 +swiftmailer 0c47ff6d24b1fa97a095e3627ad03e12125369c4 +twig 7e457209f8c69865ac2bc8b86c24518cded0dd01 +twig-extensions 6b0cc16934b6e62ef07c8d2e59f9f13ff3193d3d +monolog 53c9b2050f3da67a1eb2e1f920bc934b60c742f1 +metadata 97d85e0085b3393288f45f413147b08411b19e77 +FrameworkExtraBundle 4614b59dd42673e7ba2eba4ef53db0393fc751b5 +SecurityExtraBundle 5676f8ddbc512713e101cb123baf5cd500edefbb +WebConfiguratorBundle b1520580ab8626ab1c84f4ddb5bc25203bf228a0 \ No newline at end of file From 9d44dcd398a16c17386961aba2339896cd6b6716 Mon Sep 17 00:00:00 2001 From: Fabien Potencier Date: Mon, 6 Jun 2011 12:20:06 +0200 Subject: [PATCH 167/899] updated VERSION --- VERSION | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/VERSION b/VERSION index c3da571373..9cbac2cb9f 100644 --- a/VERSION +++ b/VERSION @@ -1 +1 @@ -2.0.0BETA4 +2.0.0NEXT From 394453605c584f3310d2ce3993e16949d643b093 Mon Sep 17 00:00:00 2001 From: Fabien Potencier Date: Tue, 7 Jun 2011 18:56:58 +0200 Subject: [PATCH 168/899] updated vendors management script The VERSION file is gone as it was specific to Symfony, not to your application. Installing vendors is as simple as running: ./bin/vendors install This command installs all dependencies at a version known to work. If you want to update all dependencies to their latest version, you can run ./bin/vendors update It updates your vendors and update the deps.lock file as well. You should not have to run this command. --- VERSION | 1 - bin/2.0.0BETA2.deps | 13 -- bin/2.0.0BETA3.deps | 13 -- bin/2.0.0NEXT.deps | 13 -- bin/{build_bootstrap.php => build_bootstrap} | 0 bin/deps | 13 -- bin/freeze_vendors.php | 32 ----- bin/vendors | 127 +++++++++++++++++++ bin/vendors.php | 79 ------------ deps | 13 ++ bin/2.0.0BETA4.deps => deps.lock | 0 11 files changed, 140 insertions(+), 164 deletions(-) delete mode 100644 VERSION delete mode 100644 bin/2.0.0BETA2.deps delete mode 100644 bin/2.0.0BETA3.deps delete mode 100644 bin/2.0.0NEXT.deps rename bin/{build_bootstrap.php => build_bootstrap} (100%) delete mode 100644 bin/deps delete mode 100755 bin/freeze_vendors.php create mode 100755 bin/vendors delete mode 100755 bin/vendors.php create mode 100644 deps rename bin/2.0.0BETA4.deps => deps.lock (100%) diff --git a/VERSION b/VERSION deleted file mode 100644 index 9cbac2cb9f..0000000000 --- a/VERSION +++ /dev/null @@ -1 +0,0 @@ -2.0.0NEXT diff --git a/bin/2.0.0BETA2.deps b/bin/2.0.0BETA2.deps deleted file mode 100644 index b0ca75baae..0000000000 --- a/bin/2.0.0BETA2.deps +++ /dev/null @@ -1,13 +0,0 @@ -assetic 39cd55eee63e645ac1d569e7d4d10479399b32f8 -symfony 2636e36bbf6a31263fb7d58a07660c66daa52179 -doctrine 35a318148cd891347f489e64140b724beb267849 -doctrine-dbal 4ee7356ce0ca798f70877f295ad1309120a79c30 -doctrine-common fb845829afbd7e1821f608417894629bbb1b2a48 -swiftmailer 97962cda2c9dd61cac2c341bd7106b9b6ef665a8 -twig d90b2f7112fd2baca418f62de07aea635bf6178f -twig-extensions 6b0cc16934b6e62ef07c8d2e59f9f13ff3193d3d -monolog 1defa7857f842a5a554b13b776e06e7784e3a99b -metadata 2350020f8d33f30aba891145ffa8bcb9bcdec38d -FrameworkExtraBundle f3264b91a9790eddcf1820d46c0ca1164e8c07b9 -SecurityExtraBundle f23c68b67171153cc9c6ba6ce8bfc5087a7634a8 -WebConfiguratorBundle 3c272a6cefcd62b32dba8571fe0d9d3d398f187b \ No newline at end of file diff --git a/bin/2.0.0BETA3.deps b/bin/2.0.0BETA3.deps deleted file mode 100644 index 91eafaa5c1..0000000000 --- a/bin/2.0.0BETA3.deps +++ /dev/null @@ -1,13 +0,0 @@ -assetic 119b37fbdea9d0ab6a6466f00d8eaa239753878a -symfony 923c234160c1174353d6e282bb9486b267c43343 -doctrine 35a318148cd891347f489e64140b724beb267849 -doctrine-dbal 4ee7356ce0ca798f70877f295ad1309120a79c30 -doctrine-common 31e5f19107c7e37afcbb26335fb322323eac037f -swiftmailer 97962cda2c9dd61cac2c341bd7106b9b6ef665a8 -twig f742efd602f310c37fdbe40c5ffcf4d61f5a4f52 -twig-extensions 6b0cc16934b6e62ef07c8d2e59f9f13ff3193d3d -monolog 1defa7857f842a5a554b13b776e06e7784e3a99b -metadata 97d85e0085b3393288f45f413147b08411b19e77 -FrameworkExtraBundle f3264b91a9790eddcf1820d46c0ca1164e8c07b9 -SecurityExtraBundle f23c68b67171153cc9c6ba6ce8bfc5087a7634a8 -WebConfiguratorBundle b1520580ab8626ab1c84f4ddb5bc25203bf228a0 \ No newline at end of file diff --git a/bin/2.0.0NEXT.deps b/bin/2.0.0NEXT.deps deleted file mode 100644 index d8c64e9419..0000000000 --- a/bin/2.0.0NEXT.deps +++ /dev/null @@ -1,13 +0,0 @@ -assetic origin/HEAD -symfony origin/HEAD -doctrine 2.0.5 -doctrine-dbal 2.0.5 -doctrine-common origin/3.0.x -swiftmailer origin/4.1 -twig origin/HEAD -twig-extensions origin/HEAD -monolog origin/HEAD -metadata origin/HEAD -FrameworkExtraBundle origin/HEAD -SecurityExtraBundle origin/HEAD -WebConfiguratorBundle origin/HEAD \ No newline at end of file diff --git a/bin/build_bootstrap.php b/bin/build_bootstrap similarity index 100% rename from bin/build_bootstrap.php rename to bin/build_bootstrap diff --git a/bin/deps b/bin/deps deleted file mode 100644 index 3cb6486a66..0000000000 --- a/bin/deps +++ /dev/null @@ -1,13 +0,0 @@ -/ assetic http://github.com/kriswallsmith/assetic.git -/ symfony http://github.com/symfony/symfony.git -/ doctrine http://github.com/doctrine/doctrine2.git -/ doctrine-dbal http://github.com/doctrine/dbal.git -/ doctrine-common http://github.com/doctrine/common.git -/ swiftmailer http://github.com/swiftmailer/swiftmailer.git -/ twig http://github.com/fabpot/Twig.git -/ twig-extensions http://github.com/fabpot/Twig-extensions.git -/ monolog http://github.com/Seldaek/monolog.git -/ metadata http://github.com/schmittjoh/metadata.git -/bundles/Sensio/Bundle FrameworkExtraBundle http://github.com/sensio/SensioFrameworkExtraBundle.git -/bundles/JMS SecurityExtraBundle http://github.com/schmittjoh/SecurityExtraBundle.git -/bundles/Symfony/Bundle WebConfiguratorBundle http://github.com/symfony/WebConfiguratorBundle.git diff --git a/bin/freeze_vendors.php b/bin/freeze_vendors.php deleted file mode 100755 index 132255b03b..0000000000 --- a/bin/freeze_vendors.php +++ /dev/null @@ -1,32 +0,0 @@ -#!/usr/bin/env php - - * - * For the full copyright and license information, please view the LICENSE - * file that was distributed with this source code. - */ - -$rootDir = dirname(__DIR__); -$vendorDir = $rootDir.'/vendor'; -$version = trim(file_get_contents($rootDir.'/VERSION')); - -$deps = array(); -foreach (file(__DIR__.'/deps') as $line) { - if (!trim($line)) { - continue; - } - $parts = array_values(array_filter(explode(' ', trim($line)))); - if (3 !== count($parts)) { - die(sprintf('The deps file is not valid (near "%s")', $line)); - } - list($path, $name, $url) = $parts; - - ob_start(); - system('cd '.$vendorDir.'/'.$path.'/'.$name.'; git log -n 1 --format=%H'); - $deps[] = trim($name.' '.ob_get_clean()); -} -file_put_contents($rootDir.'/bin/'.$version.'.deps', implode("\n", $deps)); diff --git a/bin/vendors b/bin/vendors new file mode 100755 index 0000000000..e84e53e880 --- /dev/null +++ b/bin/vendors @@ -0,0 +1,127 @@ +#!/usr/bin/env php + + * + * For the full copyright and license information, please view the LICENSE + * file that was distributed with this source code. + */ + +$rootDir = dirname(__DIR__); +$vendorDir = $rootDir.'/vendor'; + +array_shift($argv); +if (!isset($argv[0])) { + die(<< Installing/Updating $name\n"; + + if (!is_dir($installDir)) { + system(sprintf('git clone %s %s %s', $cloneOptions, $url, $installDir)); + } + + system(sprintf('cd %s && git fetch origin && git reset --hard %s', $installDir, $rev)); +} + +// update? +if ('update' === $command) { + $deps = array(); + foreach (file($rootDir.'/deps') as $line) { + if (!trim($line)) { + continue; + } + $parts = array_values(array_filter(explode(' ', trim($line)))); + if (3 !== count($parts)) { + die(sprintf('The deps file is not valid (near "%s")', $line)); + } + list($name, $path, $url) = $parts; + + ob_start(); + system('cd '.$vendorDir.'/'.$path.'/'.$name.'; git log -n 1 --format=%H'); + $deps[] = trim($name.' '.ob_get_clean()); + } + file_put_contents($rootDir.'/deps.lock', implode("\n", $deps)); +} + +// php on windows can't use the shebang line from system() +$interpreter = PHP_OS == 'WINNT' ? 'php.exe' : ''; + +// Update the bootstrap files +system(sprintf('%s %s/bin/build_bootstrap', $interpreter, $rootDir)); + +// Update assets +system(sprintf('%s %s/app/console assets:install %s/web/', $interpreter, $rootDir, $rootDir)); + +// Remove the cache +system(sprintf('%s %s/app/console cache:clear --no-warmup', $interpreter, $rootDir)); diff --git a/bin/vendors.php b/bin/vendors.php deleted file mode 100755 index 580846d9bf..0000000000 --- a/bin/vendors.php +++ /dev/null @@ -1,79 +0,0 @@ -#!/usr/bin/env php - - * - * For the full copyright and license information, please view the LICENSE - * file that was distributed with this source code. - */ - -$rootDir = dirname(__DIR__); -$vendorDir = $rootDir.'/vendor'; -$version = trim(file_get_contents($rootDir.'/VERSION')); - -// Initialization -$cloneOptions = ''; -if (in_array('--min', $argv)) { - $cloneOptions = '--depth 1'; -} - -if (!is_dir($vendorDir)) { - mkdir($vendorDir, 0777, true); -} - -// versions -$versions = array(); -foreach (file(__DIR__.'/'.$version.'.deps') as $line) { - if (!trim($line)) { - continue; - } - $parts = array_values(array_filter(explode(' ', trim($line)))); - if (2 !== count($parts)) { - die(sprintf('The deps version file is not valid (near "%s")', $line)); - } - $versions[$parts[0]] = $parts[1]; -} - -foreach (file(__DIR__.'/deps') as $line) { - if (!trim($line)) { - continue; - } - $parts = array_values(array_filter(explode(' ', trim($line)))); - if (3 !== count($parts)) { - die(sprintf('The deps file is not valid (near "%s")', $line)); - } - list($path, $name, $url) = $parts; - - $installDir = $vendorDir.'/'.$path.'/'.$name; - if (in_array('--reinstall', $argv)) { - if (PHP_OS == 'WINNT') { - system('rmdir /S /Q '.realpath($installDir)); - } else { - system('rm -rf '.$installDir); - } - } - $rev = isset($versions[$name]) ? $versions[$name] : 'origin/HEAD'; - - echo "> Installing/Updating $name\n"; - - if (!is_dir($installDir)) { - system(sprintf('git clone %s %s %s', $cloneOptions, $url, $installDir)); - } - - system(sprintf('cd %s && git fetch origin && git reset --hard %s', $installDir, $rev)); -} - -// php on windows can't use the shebang line from system() -$interpreter = PHP_OS == 'WINNT' ? 'php.exe' : ''; - -// Update the bootstrap files -system(sprintf('%s %s/bin/build_bootstrap.php', $interpreter, $rootDir)); - -// Update assets -system(sprintf('%s %s/app/console assets:install %s/web/', $interpreter, $rootDir, $rootDir)); - -// Remove the cache -system(sprintf('%s %s/app/console cache:clear --no-warmup', $interpreter, $rootDir)); diff --git a/deps b/deps new file mode 100644 index 0000000000..d8039449c2 --- /dev/null +++ b/deps @@ -0,0 +1,13 @@ +assetic / http://github.com/kriswallsmith/assetic.git +symfony / http://github.com/symfony/symfony.git +doctrine / http://github.com/doctrine/doctrine2.git@2.0.5 +doctrine-dbal / http://github.com/doctrine/dbal.git@2.0.5 +doctrine-common / http://github.com/doctrine/common.git@origin/3.0.x +swiftmailer / http://github.com/swiftmailer/swiftmailer.git@origin/4.1 +twig / http://github.com/fabpot/Twig.git +twig-extensions / http://github.com/fabpot/Twig-extensions.git +monolog / http://github.com/Seldaek/monolog.git +metadata / http://github.com/schmittjoh/metadata.git +FrameworkExtraBundle /bundles/Sensio/Bundle http://github.com/sensio/SensioFrameworkExtraBundle.git +SecurityExtraBundle /bundles/JMS http://github.com/schmittjoh/SecurityExtraBundle.git +WebConfiguratorBundle /bundles/Symfony/Bundle http://github.com/symfony/WebConfiguratorBundle.git diff --git a/bin/2.0.0BETA4.deps b/deps.lock similarity index 100% rename from bin/2.0.0BETA4.deps rename to deps.lock From 9e669c9f9e5e9cee1a89bcbec82264c6acfdab6f Mon Sep 17 00:00:00 2001 From: Fabien Potencier Date: Tue, 7 Jun 2011 19:13:57 +0200 Subject: [PATCH 169/899] removed the --min option of the vendor script (closes #83) --- README.rst | 9 ++------- bin/vendors | 8 +------- 2 files changed, 3 insertions(+), 14 deletions(-) diff --git a/README.rst b/README.rst index b9ba349086..dc93ca959f 100644 --- a/README.rst +++ b/README.rst @@ -28,12 +28,7 @@ directory and you're done. If you have downloaded an archive without the vendors, you must have ``git`` available to install the vendors: - php bin/vendors.php - -.. tip:: - - You can pass the `--min` option if you don't want all the history. This - also makes the installation much faster. + php bin/vendors install Installation from Git --------------------- @@ -46,7 +41,7 @@ Run the following commands: git clone http://github.com/symfony/symfony-standard.git cd symfony-standard rm -rf .git - php bin/vendors.php + php bin/vendors install .. note:: diff --git a/bin/vendors b/bin/vendors index e84e53e880..72b504cf05 100755 --- a/bin/vendors +++ b/bin/vendors @@ -32,12 +32,6 @@ if (!in_array($command = array_shift($argv), array('install', 'update'))) { die(sprintf("Command \"%s\" does not exist.\n", $command)); } -// Initialization -$cloneOptions = ''; -if (in_array('--min', $argv)) { - $cloneOptions = '--depth 1'; -} - if (!is_dir($vendorDir)) { mkdir($vendorDir, 0777, true); } @@ -88,7 +82,7 @@ foreach (file($rootDir.'/deps') as $line) { echo "> Installing/Updating $name\n"; if (!is_dir($installDir)) { - system(sprintf('git clone %s %s %s', $cloneOptions, $url, $installDir)); + system(sprintf('git clone %s %s', $url, $installDir)); } system(sprintf('cd %s && git fetch origin && git reset --hard %s', $installDir, $rev)); From d7e3758a6210f7d5192ea8f59e15f846b208aaec Mon Sep 17 00:00:00 2001 From: Christophe Coevoet Date: Wed, 8 Jun 2011 16:27:46 +0200 Subject: [PATCH 170/899] Added the charset for the DBAL connection --- app/config/config.yml | 1 + 1 file changed, 1 insertion(+) diff --git a/app/config/config.yml b/app/config/config.yml index 3a1d354ef3..586420aaf9 100644 --- a/app/config/config.yml +++ b/app/config/config.yml @@ -39,6 +39,7 @@ doctrine: dbname: %database_name% user: %database_user% password: %database_password% + charset: UTF8 orm: auto_generate_proxy_classes: %kernel.debug% From 9793b20cb340db29011b4f398cca4b4b105f3af4 Mon Sep 17 00:00:00 2001 From: Michael Ridgway Date: Wed, 8 Jun 2011 14:46:46 -0400 Subject: [PATCH 171/899] Fixed vendors.php not working if directory path has space in it --- bin/vendors | 16 ++++++++-------- 1 file changed, 8 insertions(+), 8 deletions(-) diff --git a/bin/vendors b/bin/vendors index 72b504cf05..2b2c2a3bac 100755 --- a/bin/vendors +++ b/bin/vendors @@ -73,19 +73,19 @@ foreach (file($rootDir.'/deps') as $line) { $installDir = $vendorDir.'/'.$path.'/'.$name; if (in_array('--reinstall', $argv)) { if (PHP_OS == 'WINNT') { - system('rmdir /S /Q '.realpath($installDir)); + system('rmdir /S /Q "'.realpath($installDir)).'"'; } else { - system('rm -rf '.$installDir); + system('rm -rf "'.$installDir.'"'); } } echo "> Installing/Updating $name\n"; if (!is_dir($installDir)) { - system(sprintf('git clone %s %s', $url, $installDir)); + system(sprintf('git clone %s "%s"', $url, $installDir)); } - system(sprintf('cd %s && git fetch origin && git reset --hard %s', $installDir, $rev)); + system(sprintf('cd "%s" && git fetch origin && git reset --hard %s', $installDir, $rev)); } // update? @@ -102,7 +102,7 @@ if ('update' === $command) { list($name, $path, $url) = $parts; ob_start(); - system('cd '.$vendorDir.'/'.$path.'/'.$name.'; git log -n 1 --format=%H'); + system('cd "'.$vendorDir.'/'.$path.'/'.$name.'"; git log -n 1 --format=%H'); $deps[] = trim($name.' '.ob_get_clean()); } file_put_contents($rootDir.'/deps.lock', implode("\n", $deps)); @@ -112,10 +112,10 @@ if ('update' === $command) { $interpreter = PHP_OS == 'WINNT' ? 'php.exe' : ''; // Update the bootstrap files -system(sprintf('%s %s/bin/build_bootstrap', $interpreter, $rootDir)); +system(sprintf('%s "%s/bin/build_bootstrap"', $interpreter, $rootDir)); // Update assets -system(sprintf('%s %s/app/console assets:install %s/web/', $interpreter, $rootDir, $rootDir)); +system(sprintf('%s "%s/app/console" assets:install "%s/web/"', $interpreter, $rootDir, $rootDir)); // Remove the cache -system(sprintf('%s %s/app/console cache:clear --no-warmup', $interpreter, $rootDir)); +system(sprintf('%s "%s/app/console" cache:clear --no-warmup', $interpreter, $rootDir)); From 62a9e7e86cc73472a3dd433250a08a64983f0a5d Mon Sep 17 00:00:00 2001 From: Michael Ridgway Date: Fri, 10 Jun 2011 11:37:57 -0400 Subject: [PATCH 172/899] Using escapeshellarg() instead of quotes to fix paths with spaces (vendors.php) --- bin/vendors | 16 ++++++++-------- 1 file changed, 8 insertions(+), 8 deletions(-) diff --git a/bin/vendors b/bin/vendors index 2b2c2a3bac..1636f1db04 100755 --- a/bin/vendors +++ b/bin/vendors @@ -73,19 +73,19 @@ foreach (file($rootDir.'/deps') as $line) { $installDir = $vendorDir.'/'.$path.'/'.$name; if (in_array('--reinstall', $argv)) { if (PHP_OS == 'WINNT') { - system('rmdir /S /Q "'.realpath($installDir)).'"'; + system(sprintf('rmdir /S /Q %s', escapeshellarg(realpath($installDir)))); } else { - system('rm -rf "'.$installDir.'"'); + system(sprintf('rm -rf %s', escapeshellarg($installDir))); } } echo "> Installing/Updating $name\n"; if (!is_dir($installDir)) { - system(sprintf('git clone %s "%s"', $url, $installDir)); + system(sprintf('git clone %s %s', $url, escapeshellarg($installDir))); } - system(sprintf('cd "%s" && git fetch origin && git reset --hard %s', $installDir, $rev)); + system(sprintf('cd %s && git fetch origin && git reset --hard %s', escapeshellarg($installDir), $rev)); } // update? @@ -102,7 +102,7 @@ if ('update' === $command) { list($name, $path, $url) = $parts; ob_start(); - system('cd "'.$vendorDir.'/'.$path.'/'.$name.'"; git log -n 1 --format=%H'); + system(sprintf('cd %s; git log -n 1 --format=%%H', escapeshellarg($vendorDir.'/'.$path.'/'.$name))); $deps[] = trim($name.' '.ob_get_clean()); } file_put_contents($rootDir.'/deps.lock', implode("\n", $deps)); @@ -112,10 +112,10 @@ if ('update' === $command) { $interpreter = PHP_OS == 'WINNT' ? 'php.exe' : ''; // Update the bootstrap files -system(sprintf('%s "%s/bin/build_bootstrap"', $interpreter, $rootDir)); +system(sprintf('%s %s', $interpreter, escapeshellarg($rootDir.'/bin/build_bootstrap'))); // Update assets -system(sprintf('%s "%s/app/console" assets:install "%s/web/"', $interpreter, $rootDir, $rootDir)); +system(sprintf('%s %s assets:install %s', $interpreter, escapeshellarg($rootDir.'/app/console'), escapeshellarg($rootDir.'/web/'))); // Remove the cache -system(sprintf('%s "%s/app/console" cache:clear --no-warmup', $interpreter, $rootDir)); +system(sprintf('%s %s cache:clear --no-warmup', $interpreter, escapeshellarg($rootDir.'/app/console'))); From 09064e61ca30fff68a0e3e5c07ce139dbd0fbab0 Mon Sep 17 00:00:00 2001 From: Michael Ridgway Date: Fri, 10 Jun 2011 11:56:29 -0400 Subject: [PATCH 173/899] Adding more escapes to shell params --- bin/vendors | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/bin/vendors b/bin/vendors index 1636f1db04..568e8a8134 100755 --- a/bin/vendors +++ b/bin/vendors @@ -82,10 +82,10 @@ foreach (file($rootDir.'/deps') as $line) { echo "> Installing/Updating $name\n"; if (!is_dir($installDir)) { - system(sprintf('git clone %s %s', $url, escapeshellarg($installDir))); + system(sprintf('git clone %s %s', escapeshellarg($url), escapeshellarg($installDir))); } - system(sprintf('cd %s && git fetch origin && git reset --hard %s', escapeshellarg($installDir), $rev)); + system(sprintf('cd %s && git fetch origin && git reset --hard %s', escapeshellarg($installDir), escapeshellarg($rev))); } // update? From 98609c0b44d15d958bcb8f0e00d8f5d8302ffa55 Mon Sep 17 00:00:00 2001 From: Yosmany Garcia Date: Tue, 14 Jun 2011 14:58:52 -0400 Subject: [PATCH 174/899] Typo in operator --- bin/vendors | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/bin/vendors b/bin/vendors index 568e8a8134..3e93ed1670 100755 --- a/bin/vendors +++ b/bin/vendors @@ -102,7 +102,7 @@ if ('update' === $command) { list($name, $path, $url) = $parts; ob_start(); - system(sprintf('cd %s; git log -n 1 --format=%%H', escapeshellarg($vendorDir.'/'.$path.'/'.$name))); + system(sprintf('cd %s && git log -n 1 --format=%%H', escapeshellarg($vendorDir.'/'.$path.'/'.$name))); $deps[] = trim($name.' '.ob_get_clean()); } file_put_contents($rootDir.'/deps.lock', implode("\n", $deps)); From 79a63bdf72dd376919d464afd676e89f90f97e4a Mon Sep 17 00:00:00 2001 From: Fabien Potencier Date: Wed, 15 Jun 2011 13:11:22 +0200 Subject: [PATCH 175/899] updated deps --- deps | 2 +- deps.lock | 18 +++++++++--------- 2 files changed, 10 insertions(+), 10 deletions(-) diff --git a/deps b/deps index d8039449c2..2615f3b6b7 100644 --- a/deps +++ b/deps @@ -1,6 +1,6 @@ assetic / http://github.com/kriswallsmith/assetic.git symfony / http://github.com/symfony/symfony.git -doctrine / http://github.com/doctrine/doctrine2.git@2.0.5 +doctrine / http://github.com/doctrine/doctrine2.git@origin/2.0.x doctrine-dbal / http://github.com/doctrine/dbal.git@2.0.5 doctrine-common / http://github.com/doctrine/common.git@origin/3.0.x swiftmailer / http://github.com/swiftmailer/swiftmailer.git@origin/4.1 diff --git a/deps.lock b/deps.lock index 7da1fbfb43..d746abe1ec 100644 --- a/deps.lock +++ b/deps.lock @@ -1,13 +1,13 @@ -assetic bb9fae263d2d05da4ae916955a1b72945618e9ac -symfony a1d866e709cef62f2b9b44a4959574984ab86ab7 -doctrine 35a318148cd891347f489e64140b724beb267849 +assetic 2b53d8763909008a623d70351e392964989d17d3 +symfony fb24b95bd556b91ac2f85f7395f6334aa1640f4b +doctrine 3587f3bcb3c727eebcbb537bec9da10f9c237d87 doctrine-dbal 4ee7356ce0ca798f70877f295ad1309120a79c30 -doctrine-common 40ab808b37dcd3e9fd92800061a9b71f64469e52 -swiftmailer 0c47ff6d24b1fa97a095e3627ad03e12125369c4 -twig 7e457209f8c69865ac2bc8b86c24518cded0dd01 +doctrine-common 0ba250a785178d7cdb579ce82151731c04849abf +swiftmailer 640d501b5071c83f9bbe8c98c0b2c6a815e31dbe +twig b340d98d980ed4c36a7e18f4797f42002234ecf9 twig-extensions 6b0cc16934b6e62ef07c8d2e59f9f13ff3193d3d -monolog 53c9b2050f3da67a1eb2e1f920bc934b60c742f1 +monolog ff6d7fce5cbe52fa98d143199a3d58b2372b36de metadata 97d85e0085b3393288f45f413147b08411b19e77 -FrameworkExtraBundle 4614b59dd42673e7ba2eba4ef53db0393fc751b5 +FrameworkExtraBundle d529f700916be3beccfb93cf356bca018db9ba95 SecurityExtraBundle 5676f8ddbc512713e101cb123baf5cd500edefbb -WebConfiguratorBundle b1520580ab8626ab1c84f4ddb5bc25203bf228a0 \ No newline at end of file +WebConfiguratorBundle 4aa1fd14302d1251d4a5c78a70ce9f2717c5748c \ No newline at end of file From 0e38ab05a61bdff7c77324d23290c7fae3437f6e Mon Sep 17 00:00:00 2001 From: stealth35 Date: Wed, 15 Jun 2011 06:48:54 -0700 Subject: [PATCH 176/899] Removed alias (die to exit), useless trim (use correct file option) --- bin/vendors | 31 +++++++++++-------------------- 1 file changed, 11 insertions(+), 20 deletions(-) mode change 100755 => 100644 bin/vendors diff --git a/bin/vendors b/bin/vendors old mode 100755 new mode 100644 index 568e8a8134..ada4424516 --- a/bin/vendors +++ b/bin/vendors @@ -15,7 +15,7 @@ $vendorDir = $rootDir.'/vendor'; array_shift($argv); if (!isset($argv[0])) { - die(<< Date: Wed, 15 Jun 2011 22:12:42 +0200 Subject: [PATCH 177/899] updated vendors --- deps | 1 + deps.lock | 5 +++-- 2 files changed, 4 insertions(+), 2 deletions(-) diff --git a/deps b/deps index 2615f3b6b7..ad2d0e276d 100644 --- a/deps +++ b/deps @@ -11,3 +11,4 @@ metadata / http://github.com/schmittjoh/metad FrameworkExtraBundle /bundles/Sensio/Bundle http://github.com/sensio/SensioFrameworkExtraBundle.git SecurityExtraBundle /bundles/JMS http://github.com/schmittjoh/SecurityExtraBundle.git WebConfiguratorBundle /bundles/Symfony/Bundle http://github.com/symfony/WebConfiguratorBundle.git +AsseticBundle /bundles/Symfony/Bundle http://github.com/symfony/AsseticBundle.git diff --git a/deps.lock b/deps.lock index d746abe1ec..564c339093 100644 --- a/deps.lock +++ b/deps.lock @@ -1,5 +1,5 @@ assetic 2b53d8763909008a623d70351e392964989d17d3 -symfony fb24b95bd556b91ac2f85f7395f6334aa1640f4b +symfony 524d51adf88b4614a9d33dfe918c63a8b3339ee6 doctrine 3587f3bcb3c727eebcbb537bec9da10f9c237d87 doctrine-dbal 4ee7356ce0ca798f70877f295ad1309120a79c30 doctrine-common 0ba250a785178d7cdb579ce82151731c04849abf @@ -10,4 +10,5 @@ monolog ff6d7fce5cbe52fa98d143199a3d58b2372b36de metadata 97d85e0085b3393288f45f413147b08411b19e77 FrameworkExtraBundle d529f700916be3beccfb93cf356bca018db9ba95 SecurityExtraBundle 5676f8ddbc512713e101cb123baf5cd500edefbb -WebConfiguratorBundle 4aa1fd14302d1251d4a5c78a70ce9f2717c5748c \ No newline at end of file +WebConfiguratorBundle 4aa1fd14302d1251d4a5c78a70ce9f2717c5748c +AsseticBundle 6d597c4abeb513198f153a0a695612fcfd688972 \ No newline at end of file From bb4445cec581e0147da6e8e19eb126bc38387b7e Mon Sep 17 00:00:00 2001 From: stealth35 Date: Wed, 15 Jun 2011 23:05:23 +0200 Subject: [PATCH 178/899] correct mode --- bin/vendors | 0 1 file changed, 0 insertions(+), 0 deletions(-) mode change 100644 => 100755 bin/vendors diff --git a/bin/vendors b/bin/vendors old mode 100644 new mode 100755 From 2ae55ffae13723cf61e7d797b60dbc204ebb5788 Mon Sep 17 00:00:00 2001 From: Fabien Potencier Date: Thu, 16 Jun 2011 08:57:58 +0200 Subject: [PATCH 179/899] changed the format of the deps file --- bin/vendors | 47 ++++++++++++++++++--------------------- deps | 63 +++++++++++++++++++++++++++++++++++++++++------------ deps.lock | 8 +++---- 3 files changed, 74 insertions(+), 44 deletions(-) diff --git a/bin/vendors b/bin/vendors index ada4424516..c3555d5cba 100755 --- a/bin/vendors +++ b/bin/vendors @@ -48,23 +48,18 @@ if ('install' === $command && file_exists($rootDir.'/deps.lock')) { } } -foreach (file($rootDir.'/deps', FILE_IGNORE_NEW_LINES | FILE_SKIP_EMPTY_LINES) as $line) { - $parts = array_values(array_filter(explode(' ', $line))); - if (3 !== count($parts)) { - exit(sprintf('The deps file is not valid (near "%s")', $line)); - } - list($name, $path, $url) = $parts; - - $rev = 'origin/HEAD'; - if (false !== strpos($url, '@')) { - list($url, $rev) = explode('@', $url); - } - +$newversions = array(); +$deps = parse_ini_file($rootDir.'/deps', true, INI_SCANNER_RAW); +foreach ($deps as $name => $dep) { + // revision if (isset($versions[$name])) { $rev = $versions[$name]; + } else { + $rev = isset($dep['version']) ? $dep['version'] : 'origin/HEAD'; } - $installDir = $vendorDir.'/'.$path.'/'.$name; + // install dir + $installDir = isset($dep['target']) ? $vendorDir.'/'.$dep['target'] : $vendorDir.'/'.$name; if (in_array('--reinstall', $argv)) { if (PHP_OS == 'WINNT') { system(sprintf('rmdir /S /Q %s', escapeshellarg(realpath($installDir)))); @@ -75,28 +70,28 @@ foreach (file($rootDir.'/deps', FILE_IGNORE_NEW_LINES | FILE_SKIP_EMPTY_LINES) a echo "> Installing/Updating $name\n"; + // url + if (!isset($dep['git'])) { + exit(sprintf('The "git" value for the "%s" dependency must be set.', $name)); + } + $url = $dep['git']; + if (!is_dir($installDir)) { system(sprintf('git clone %s %s', escapeshellarg($url), escapeshellarg($installDir))); } system(sprintf('cd %s && git fetch origin && git reset --hard %s', escapeshellarg($installDir), escapeshellarg($rev))); + + if ('update' === $command) { + ob_start(); + system(sprintf('cd %s; git log -n 1 --format=%%H', escapeshellarg($installDir))); + $newversions[] = trim($name.' '.ob_get_clean()); + } } // update? if ('update' === $command) { - $deps = array(); - foreach (file($rootDir.'/deps', FILE_IGNORE_NEW_LINES | FILE_SKIP_EMPTY_LINES) as $line) { - $parts = array_values(array_filter(explode(' ', $line))); - if (3 !== count($parts)) { - exit(sprintf('The deps file is not valid (near "%s")', $line)); - } - list($name, $path, $url) = $parts; - - ob_start(); - system(sprintf('cd %s; git log -n 1 --format=%%H', escapeshellarg($vendorDir.'/'.$path.'/'.$name))); - $deps[] = trim($name.' '.ob_get_clean()); - } - file_put_contents($rootDir.'/deps.lock', implode("\n", $deps)); + file_put_contents($rootDir.'/deps.lock', implode("\n", $newversions)); } // php on windows can't use the shebang line from system() diff --git a/deps b/deps index ad2d0e276d..4bafa16c19 100644 --- a/deps +++ b/deps @@ -1,14 +1,49 @@ -assetic / http://github.com/kriswallsmith/assetic.git -symfony / http://github.com/symfony/symfony.git -doctrine / http://github.com/doctrine/doctrine2.git@origin/2.0.x -doctrine-dbal / http://github.com/doctrine/dbal.git@2.0.5 -doctrine-common / http://github.com/doctrine/common.git@origin/3.0.x -swiftmailer / http://github.com/swiftmailer/swiftmailer.git@origin/4.1 -twig / http://github.com/fabpot/Twig.git -twig-extensions / http://github.com/fabpot/Twig-extensions.git -monolog / http://github.com/Seldaek/monolog.git -metadata / http://github.com/schmittjoh/metadata.git -FrameworkExtraBundle /bundles/Sensio/Bundle http://github.com/sensio/SensioFrameworkExtraBundle.git -SecurityExtraBundle /bundles/JMS http://github.com/schmittjoh/SecurityExtraBundle.git -WebConfiguratorBundle /bundles/Symfony/Bundle http://github.com/symfony/WebConfiguratorBundle.git -AsseticBundle /bundles/Symfony/Bundle http://github.com/symfony/AsseticBundle.git +[assetic] + git=http://github.com/kriswallsmith/assetic.git + +[symfony] + git=http://github.com/symfony/symfony.git + +[doctrine] + git=http://github.com/doctrine/doctrine2.git + version=origin/2.0.x + +[doctrine-dbal] + git=http://github.com/doctrine/dbal.git + version=origin/2.0.5 + +[doctrine-common] + git=http://github.com/doctrine/common.git + version=origin/3.0.x + +[swiftmailer] + git=http://github.com/swiftmailer/swiftmailer.git + version=origin/4.1 + +[twig] + git=http://github.com/fabpot/Twig.git + +[twig-extensions] + git=http://github.com/fabpot/Twig-extensions.git + +[monolog] + git=http://github.com/Seldaek/monolog.git + +[metadata] + git=http://github.com/schmittjoh/metadata.git + +[SensioFrameworkExtraBundle] + git=http://github.com/sensio/SensioFrameworkExtraBundle.git + target=/bundles/Sensio/Bundle/FrameworkExtraBundle + +[JMSSecurityExtraBundle] + git=http://github.com/schmittjoh/SecurityExtraBundle.git + target=/bundles/JMS/SecurityExtraBundle + +[WebConfiguratorBundle] + git=http://github.com/symfony/WebConfiguratorBundle.git + target=/bundles/Symfony/Bundle/WebConfiguratorBundle + +[AsseticBundle] + git=http://github.com/symfony/AsseticBundle.git + target=/bundles/Symfony/Bundle/AsseticBundle diff --git a/deps.lock b/deps.lock index 564c339093..1249b7aea2 100644 --- a/deps.lock +++ b/deps.lock @@ -1,6 +1,6 @@ assetic 2b53d8763909008a623d70351e392964989d17d3 -symfony 524d51adf88b4614a9d33dfe918c63a8b3339ee6 -doctrine 3587f3bcb3c727eebcbb537bec9da10f9c237d87 +symfony f1b955be8c5ab5e773403f0e56da9c0867d516f3 +doctrine 5c9b3d0b92f0c4e7b0ead1e87e7a8730e8115242 doctrine-dbal 4ee7356ce0ca798f70877f295ad1309120a79c30 doctrine-common 0ba250a785178d7cdb579ce82151731c04849abf swiftmailer 640d501b5071c83f9bbe8c98c0b2c6a815e31dbe @@ -8,7 +8,7 @@ twig b340d98d980ed4c36a7e18f4797f42002234ecf9 twig-extensions 6b0cc16934b6e62ef07c8d2e59f9f13ff3193d3d monolog ff6d7fce5cbe52fa98d143199a3d58b2372b36de metadata 97d85e0085b3393288f45f413147b08411b19e77 -FrameworkExtraBundle d529f700916be3beccfb93cf356bca018db9ba95 -SecurityExtraBundle 5676f8ddbc512713e101cb123baf5cd500edefbb +SensioFrameworkExtraBundle d529f700916be3beccfb93cf356bca018db9ba95 +JMSSecurityExtraBundle 5676f8ddbc512713e101cb123baf5cd500edefbb WebConfiguratorBundle 4aa1fd14302d1251d4a5c78a70ce9f2717c5748c AsseticBundle 6d597c4abeb513198f153a0a695612fcfd688972 \ No newline at end of file From aaf249fb4d01f7ebbaaf05fdbfcb5832a76aea37 Mon Sep 17 00:00:00 2001 From: Fabien Potencier Date: Thu, 16 Jun 2011 09:12:18 +0200 Subject: [PATCH 180/899] reordered deps --- deps | 28 ++++++++++++++-------------- 1 file changed, 14 insertions(+), 14 deletions(-) diff --git a/deps b/deps index 4bafa16c19..5cc24713d2 100644 --- a/deps +++ b/deps @@ -1,34 +1,34 @@ -[assetic] - git=http://github.com/kriswallsmith/assetic.git - [symfony] git=http://github.com/symfony/symfony.git -[doctrine] - git=http://github.com/doctrine/doctrine2.git - version=origin/2.0.x +[twig] + git=http://github.com/fabpot/Twig.git -[doctrine-dbal] - git=http://github.com/doctrine/dbal.git - version=origin/2.0.5 +[monolog] + git=http://github.com/Seldaek/monolog.git [doctrine-common] git=http://github.com/doctrine/common.git version=origin/3.0.x +[doctrine-dbal] + git=http://github.com/doctrine/dbal.git + version=origin/2.0.5 + +[doctrine] + git=http://github.com/doctrine/doctrine2.git + version=origin/2.0.x + [swiftmailer] git=http://github.com/swiftmailer/swiftmailer.git version=origin/4.1 -[twig] - git=http://github.com/fabpot/Twig.git +[assetic] + git=http://github.com/kriswallsmith/assetic.git [twig-extensions] git=http://github.com/fabpot/Twig-extensions.git -[monolog] - git=http://github.com/Seldaek/monolog.git - [metadata] git=http://github.com/schmittjoh/metadata.git From 1cf0a1026b46c7eb58c789c10586fecedf992c3f Mon Sep 17 00:00:00 2001 From: Fabien Potencier Date: Thu, 16 Jun 2011 16:13:12 +0200 Subject: [PATCH 181/899] updated Doctrine to master (Symfony2 will ship with Doctrine 2.1) --- deps | 2 -- deps.lock | 14 +++++++------- 2 files changed, 7 insertions(+), 9 deletions(-) diff --git a/deps b/deps index 5cc24713d2..a64967fbf9 100644 --- a/deps +++ b/deps @@ -13,11 +13,9 @@ [doctrine-dbal] git=http://github.com/doctrine/dbal.git - version=origin/2.0.5 [doctrine] git=http://github.com/doctrine/doctrine2.git - version=origin/2.0.x [swiftmailer] git=http://github.com/swiftmailer/swiftmailer.git diff --git a/deps.lock b/deps.lock index 1249b7aea2..0101303182 100644 --- a/deps.lock +++ b/deps.lock @@ -1,13 +1,13 @@ -assetic 2b53d8763909008a623d70351e392964989d17d3 -symfony f1b955be8c5ab5e773403f0e56da9c0867d516f3 -doctrine 5c9b3d0b92f0c4e7b0ead1e87e7a8730e8115242 -doctrine-dbal 4ee7356ce0ca798f70877f295ad1309120a79c30 +symfony 0805c6f9635d77ece39cd5070a86e3ae8d889d0e +twig a12aec38c3e57814543ffd049101c2f54dd3e257 +monolog ff6d7fce5cbe52fa98d143199a3d58b2372b36de doctrine-common 0ba250a785178d7cdb579ce82151731c04849abf +doctrine-dbal cfcad35f11a81feba19a25dc6f4afde603639438 +doctrine ec748b2a16f0a813e091271b75fff82b91bfbe51 swiftmailer 640d501b5071c83f9bbe8c98c0b2c6a815e31dbe -twig b340d98d980ed4c36a7e18f4797f42002234ecf9 +assetic 2b53d8763909008a623d70351e392964989d17d3 twig-extensions 6b0cc16934b6e62ef07c8d2e59f9f13ff3193d3d -monolog ff6d7fce5cbe52fa98d143199a3d58b2372b36de -metadata 97d85e0085b3393288f45f413147b08411b19e77 +metadata aa04872c6f0e2b32128b62dd075e8cf97a8d93da SensioFrameworkExtraBundle d529f700916be3beccfb93cf356bca018db9ba95 JMSSecurityExtraBundle 5676f8ddbc512713e101cb123baf5cd500edefbb WebConfiguratorBundle 4aa1fd14302d1251d4a5c78a70ce9f2717c5748c From 89ef913a6b6bd25b4cac517c25b5162d25b4c68c Mon Sep 17 00:00:00 2001 From: stealth35 Date: Thu, 16 Jun 2011 16:20:01 +0200 Subject: [PATCH 182/899] Update verification requirements --- app/check.php | 22 +++++++++++++++++++++- web/config.php | 19 +++++++++++++++++++ 2 files changed, 40 insertions(+), 1 deletion(-) diff --git a/app/check.php b/app/check.php index c10f1ab2bf..91a0991fa1 100644 --- a/app/check.php +++ b/app/check.php @@ -37,8 +37,28 @@ check(function_exists('mb_strlen'), 'Checking that the mb_strlen() function is available', 'Install and enable the mbstring extension', false); check(function_exists('iconv'), 'Checking that the iconv() function is available', 'Install and enable the iconv extension', false); check(function_exists('utf8_decode'), 'Checking that the utf8_decode() is available', 'Install and enable the XML extension', false); -check(function_exists('posix_isatty'), 'Checking that the posix_isatty() is available', 'Install and enable the php_posix extension (used to colorized the CLI output)', false); +if (PHP_OS != 'WINNT') { + check(function_exists('posix_isatty'), 'Checking that the posix_isatty() is available', 'Install and enable the php_posix extension (used to colorized the CLI output)', false); +} check(class_exists('Locale'), 'Checking that the intl extension is available', 'Install and enable the intl extension (used for validators)', false); +if (class_exists('Locale')) { + $version = ''; + + if (defined('INTL_ICU_VERSION')) { + $version = INTL_ICU_VERSION; + } else { + $reflector = new \ReflectionExtension('intl'); + + ob_start(); + $reflector->info(); + $output = ob_get_clean(); + + preg_match('/^ICU version => (.*)$/m', $output, $matches); + $version = $matches[1]; + } + + check(version_compare($matches[1], '4.0', '>='), 'Checking that the intl ICU version is at least 4+', 'Upgrade your intl extension with a newer ICU version (4+)', false); +} $accelerator = (function_exists('apc_store') && ini_get('apc.enabled')) diff --git a/web/config.php b/web/config.php index 23aed3374e..790a01c721 100644 --- a/web/config.php +++ b/web/config.php @@ -71,6 +71,25 @@ if (!class_exists('Locale')) { $minorProblems[] = 'Install and enable the intl extension.'; +} else { + $version = ''; + + if (defined('INTL_ICU_VERSION')) { + $version = INTL_ICU_VERSION; + } else { + $reflector = new \ReflectionExtension('intl'); + + ob_start(); + $reflector->info(); + $output = strip_tags(ob_get_clean()); + + preg_match('/^ICU version (.*)$/m', $output, $matches); + $version = $matches[1]; + } + + if(!version_compare($matches[1], '4.0', '>=')) { + $minorProblems[] = 'Upgrade your intl extension with a newer ICU version (4+).'; + } } if (!class_exists('SQLite3') && !in_array('sqlite', PDO::getAvailableDrivers())) { From cbfa1c975928b7bc2756a5a94401ab63d7a21748 Mon Sep 17 00:00:00 2001 From: Fabien Potencier Date: Thu, 16 Jun 2011 16:43:03 +0200 Subject: [PATCH 183/899] added a check for SQLite3 (needed for the profiler) --- app/check.php | 1 + 1 file changed, 1 insertion(+) diff --git a/app/check.php b/app/check.php index 91a0991fa1..d41498c754 100644 --- a/app/check.php +++ b/app/check.php @@ -28,6 +28,7 @@ check(is_writable(__DIR__.'/../app/cache'), sprintf('Checking that app/cache/ directory is writable'), 'Change the permissions of the app/cache/ directory so that the web server can write in it', true); check(is_writable(__DIR__.'/../app/logs'), sprintf('Checking that the app/logs/ directory is writable'), 'Change the permissions of the app/logs/ directory so that the web server can write in it', true); check(function_exists('json_encode'), 'Checking that the json_encode() is available', 'Install and enable the json extension', true); +check(class_exists('SQLite3') || in_array('sqlite', PDO::getAvailableDrivers()), 'Install and enable the SQLite3 or PDO_SQLite extension.', true); // warnings echo_title("Optional checks"); From d39a4f127a3279ec0ec0c74ed24afec89df0cf65 Mon Sep 17 00:00:00 2001 From: Fabien Potencier Date: Thu, 16 Jun 2011 19:20:08 +0200 Subject: [PATCH 184/899] removed VERSION from web/config.php --- web/config.php | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/web/config.php b/web/config.php index 790a01c721..79cf7020bb 100644 --- a/web/config.php +++ b/web/config.php @@ -196,6 +196,6 @@

    -
    Symfony Standard Edition v.
    +
    Symfony Standard Edition
    From 4b519afc007065acdaa9324583154de6096fc461 Mon Sep 17 00:00:00 2001 From: Fabien Potencier Date: Thu, 16 Jun 2011 19:23:44 +0200 Subject: [PATCH 185/899] updated vendors for BETA5 --- deps.lock | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/deps.lock b/deps.lock index 0101303182..8c3ea63700 100644 --- a/deps.lock +++ b/deps.lock @@ -1,14 +1,14 @@ -symfony 0805c6f9635d77ece39cd5070a86e3ae8d889d0e +symfony a30c06a384becf9a1e8ab8efb3a9b51e1769754b twig a12aec38c3e57814543ffd049101c2f54dd3e257 monolog ff6d7fce5cbe52fa98d143199a3d58b2372b36de doctrine-common 0ba250a785178d7cdb579ce82151731c04849abf doctrine-dbal cfcad35f11a81feba19a25dc6f4afde603639438 -doctrine ec748b2a16f0a813e091271b75fff82b91bfbe51 -swiftmailer 640d501b5071c83f9bbe8c98c0b2c6a815e31dbe +doctrine 98bc3c4e402731fae8716e99c7c19d5e0ff7b60a +swiftmailer d4e5e63f077d74080919521f786138a3b27d556e assetic 2b53d8763909008a623d70351e392964989d17d3 twig-extensions 6b0cc16934b6e62ef07c8d2e59f9f13ff3193d3d metadata aa04872c6f0e2b32128b62dd075e8cf97a8d93da SensioFrameworkExtraBundle d529f700916be3beccfb93cf356bca018db9ba95 JMSSecurityExtraBundle 5676f8ddbc512713e101cb123baf5cd500edefbb -WebConfiguratorBundle 4aa1fd14302d1251d4a5c78a70ce9f2717c5748c +WebConfiguratorBundle 301419e7900bfaac2f029af868e31075b147abcf AsseticBundle 6d597c4abeb513198f153a0a695612fcfd688972 \ No newline at end of file From 42e7fddc57c319723f37390e7fcbe2eb0c8d8517 Mon Sep 17 00:00:00 2001 From: Fabien Potencier Date: Thu, 16 Jun 2011 19:45:03 +0200 Subject: [PATCH 186/899] fixed build script --- bin/build.sh | 5 ++--- deps.lock | 4 ++-- 2 files changed, 4 insertions(+), 5 deletions(-) diff --git a/bin/build.sh b/bin/build.sh index b8e62fb5ad..2fa791030a 100755 --- a/bin/build.sh +++ b/bin/build.sh @@ -9,13 +9,13 @@ DIR=`php -r "echo realpath(dirname(\\$_SERVER['argv'][0]));"` cd $DIR -VERSION=`cat VERSION` +VERSION=`grep 'VERSION' vendor/symfony/src/Symfony/Component/HttpKernel/Kernel.php | sed -E "s/.*'(.+)'.*/\1/g"` if [ ! -d "$DIR/build" ]; then mkdir -p $DIR/build fi -$DIR/bin/build_bootstrap.php +$DIR/bin/build_bootstrap $DIR/app/console assets:install web/ # Without vendors @@ -27,7 +27,6 @@ cp -r src /tmp/Symfony/ cp -r web /tmp/Symfony/ cp -r README.rst /tmp/Symfony/ cp -r LICENSE /tmp/Symfony/ -cp -r VERSION /tmp/Symfony/ cd /tmp/Symfony sudo rm -rf app/cache/* app/logs/* .git* chmod 777 app/cache app/logs diff --git a/deps.lock b/deps.lock index 8c3ea63700..fc788a1b22 100644 --- a/deps.lock +++ b/deps.lock @@ -1,4 +1,4 @@ -symfony a30c06a384becf9a1e8ab8efb3a9b51e1769754b +symfony c62724b3c3df1887432568b50a04a27870e5e802 twig a12aec38c3e57814543ffd049101c2f54dd3e257 monolog ff6d7fce5cbe52fa98d143199a3d58b2372b36de doctrine-common 0ba250a785178d7cdb579ce82151731c04849abf @@ -11,4 +11,4 @@ metadata aa04872c6f0e2b32128b62dd075e8cf97a8d93da SensioFrameworkExtraBundle d529f700916be3beccfb93cf356bca018db9ba95 JMSSecurityExtraBundle 5676f8ddbc512713e101cb123baf5cd500edefbb WebConfiguratorBundle 301419e7900bfaac2f029af868e31075b147abcf -AsseticBundle 6d597c4abeb513198f153a0a695612fcfd688972 \ No newline at end of file +AsseticBundle 6d597c4abeb513198f153a0a695612fcfd688972 From 11500060eea075448b79e4df363d993d27250af2 Mon Sep 17 00:00:00 2001 From: Fabien Potencier Date: Thu, 16 Jun 2011 21:45:34 +0200 Subject: [PATCH 187/899] updated build script --- bin/build.sh | 5 ++--- 1 file changed, 2 insertions(+), 3 deletions(-) diff --git a/bin/build.sh b/bin/build.sh index 2fa791030a..8ba1f89521 100755 --- a/bin/build.sh +++ b/bin/build.sh @@ -27,6 +27,8 @@ cp -r src /tmp/Symfony/ cp -r web /tmp/Symfony/ cp -r README.rst /tmp/Symfony/ cp -r LICENSE /tmp/Symfony/ +cp -r deps /tmp/Symfony/ +cp -r deps.lock /tmp/Symfony/ cd /tmp/Symfony sudo rm -rf app/cache/* app/logs/* .git* chmod 777 app/cache app/logs @@ -55,9 +57,6 @@ fi cp -r $DIR/vendor/* $TARGET/ -# Assetic -cd $TARGET/assetic && rm -rf phpunit.xml* README* tests - # Doctrine ORM cd $TARGET/doctrine && rm -rf UPGRADE* build* bin tests tools lib/vendor From 6e4b3d5b42283a7e9a946b439534dc14885bc338 Mon Sep 17 00:00:00 2001 From: stealth35 Date: Fri, 17 Jun 2011 01:05:42 -0700 Subject: [PATCH 188/899] Missing strong tag --- web/config.php | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/web/config.php b/web/config.php index 790a01c721..8c9c56dc32 100644 --- a/web/config.php +++ b/web/config.php @@ -88,7 +88,7 @@ } if(!version_compare($matches[1], '4.0', '>=')) { - $minorProblems[] = 'Upgrade your intl extension with a newer ICU version (4+).'; + $minorProblems[] = 'Upgrade your intl extension with a newer ICU version (4+).'; } } From a743f20af511a4645af9dbfcea0c62efe8be9f19 Mon Sep 17 00:00:00 2001 From: Fabien Potencier Date: Fri, 17 Jun 2011 14:00:39 +0200 Subject: [PATCH 189/899] removed ContainerAware from the bootstrap file as it was parser by the Doctrine annotation library, which slows down the first request a lot --- bin/build_bootstrap | 2 -- 1 file changed, 2 deletions(-) diff --git a/bin/build_bootstrap b/bin/build_bootstrap index 2912a07e6c..54b34958bf 100755 --- a/bin/build_bootstrap +++ b/bin/build_bootstrap @@ -36,8 +36,6 @@ if (file_exists($file)) { ClassCollectionLoader::load(array( 'Symfony\\Component\\DependencyInjection\\ContainerInterface', 'Symfony\\Component\\DependencyInjection\\Container', - 'Symfony\\Component\\DependencyInjection\\ContainerAwareInterface', - 'Symfony\\Component\\DependencyInjection\\ContainerAware', 'Symfony\\Component\\HttpKernel\\Bundle\\BundleInterface', 'Symfony\\Component\\HttpKernel\\Bundle\\Bundle', From a1c8a8523b6d428be3282fd0f077f413e9fd84e6 Mon Sep 17 00:00:00 2001 From: Kris Wallsmith Date: Sat, 18 Jun 2011 12:18:09 -0700 Subject: [PATCH 190/899] collapsed profiler and wdt firewalls into one, added patterns to match default assetic paths --- app/config/security.yml | 8 ++------ 1 file changed, 2 insertions(+), 6 deletions(-) diff --git a/app/config/security.yml b/app/config/security.yml index 432c0f755b..846768dff1 100644 --- a/app/config/security.yml +++ b/app/config/security.yml @@ -13,12 +13,8 @@ security: admin: { password: adminpass, roles: [ 'ROLE_ADMIN' ] } firewalls: - profiler: - pattern: ^/_profiler - security: false - - wdt: - pattern: ^/_wdt + dev: + pattern: ^/(_(profiler|wdt)|css|images|js)/ security: false login: From b354f233d28ce674907f4ca9764095393de4317d Mon Sep 17 00:00:00 2001 From: Fabien Potencier Date: Mon, 20 Jun 2011 08:11:17 +0200 Subject: [PATCH 191/899] updated for the new SensioDistributionBundle --- README.rst | 2 +- app/AppKernel.php | 2 +- app/config/routing_dev.yml | 4 +- bin/build.sh | 97 -------------------------------------- bin/build_bootstrap | 90 ----------------------------------- bin/vendors | 2 +- web/config.php | 4 +- 7 files changed, 7 insertions(+), 194 deletions(-) delete mode 100755 bin/build.sh delete mode 100755 bin/build_bootstrap diff --git a/README.rst b/README.rst index dc93ca959f..f7db32051c 100644 --- a/README.rst +++ b/README.rst @@ -15,7 +15,7 @@ Symfony Standard Edition comes pre-configured with the following bundles: * AsseticBundle * JMSSecurityExtraBundle * WebProfilerBundle (in dev/test env) -* SymfonyWebConfiguratorBundle (in dev/test env) +* SensioDistributionBundle (in dev/test env) * AcmeDemoBundle (in dev/test env) Installation from an Archive diff --git a/app/AppKernel.php b/app/AppKernel.php index aa87fd0280..3c46e419dd 100644 --- a/app/AppKernel.php +++ b/app/AppKernel.php @@ -25,7 +25,7 @@ public function registerBundles() if (in_array($this->getEnvironment(), array('dev', 'test'))) { $bundles[] = new Acme\DemoBundle\AcmeDemoBundle(); $bundles[] = new Symfony\Bundle\WebProfilerBundle\WebProfilerBundle(); - $bundles[] = new Symfony\Bundle\WebConfiguratorBundle\SymfonyWebConfiguratorBundle(); + $bundles[] = new Sensio\Bundle\DistributionBundle\SensioDistributionBundle(); } return $bundles; diff --git a/app/config/routing_dev.yml b/app/config/routing_dev.yml index b7aa4a07e8..f3c971e439 100644 --- a/app/config/routing_dev.yml +++ b/app/config/routing_dev.yml @@ -24,8 +24,8 @@ _profiler: prefix: /_profiler _configurator: - resource: "@SymfonyWebConfiguratorBundle/Resources/config/routing/configurator.xml" + resource: "@SensioDistributionBundle/Resources/config/routing/webconfigurator.xml" prefix: /_configurator _main: - resource: routing.yml \ No newline at end of file + resource: routing.yml diff --git a/bin/build.sh b/bin/build.sh deleted file mode 100755 index 8ba1f89521..0000000000 --- a/bin/build.sh +++ /dev/null @@ -1,97 +0,0 @@ -#!/bin/sh - -# This file is part of the Symfony Standard Edition. -# -# (c) Fabien Potencier -# -# For the full copyright and license information, please view the LICENSE -# file that was distributed with this source code. - -DIR=`php -r "echo realpath(dirname(\\$_SERVER['argv'][0]));"` -cd $DIR -VERSION=`grep 'VERSION' vendor/symfony/src/Symfony/Component/HttpKernel/Kernel.php | sed -E "s/.*'(.+)'.*/\1/g"` - -if [ ! -d "$DIR/build" ]; then - mkdir -p $DIR/build -fi - -$DIR/bin/build_bootstrap -$DIR/app/console assets:install web/ - -# Without vendors -rm -rf /tmp/Symfony -mkdir /tmp/Symfony -cp -r app /tmp/Symfony/ -cp -r bin /tmp/Symfony/ -cp -r src /tmp/Symfony/ -cp -r web /tmp/Symfony/ -cp -r README.rst /tmp/Symfony/ -cp -r LICENSE /tmp/Symfony/ -cp -r deps /tmp/Symfony/ -cp -r deps.lock /tmp/Symfony/ -cd /tmp/Symfony -sudo rm -rf app/cache/* app/logs/* .git* -chmod 777 app/cache app/logs - -# DS_Store cleanup -find . -name .DS_Store | xargs rm -rf - - -cd .. -# avoid the creation of ._* files -export COPY_EXTENDED_ATTRIBUTES_DISABLE=true -export COPYFILE_DISABLE=true -tar zcpf $DIR/build/Symfony_Standard_$VERSION.tgz Symfony -sudo rm -f $DIR/build/Symfony_Standard_$VERSION.zip -zip -rq $DIR/build/Symfony_Standard_$VERSION.zip Symfony - -# With vendors -cd $DIR -rm -rf /tmp/vendor -mkdir /tmp/vendor -TARGET=/tmp/vendor - -if [ ! -d "$DIR/vendor" ]; then - echo "The master vendor directory does not exist" - exit -fi - -cp -r $DIR/vendor/* $TARGET/ - -# Doctrine ORM -cd $TARGET/doctrine && rm -rf UPGRADE* build* bin tests tools lib/vendor - -# Doctrine DBAL -cd $TARGET/doctrine-dbal && rm -rf bin build* tests lib/vendor - -# Doctrine Common -cd $TARGET/doctrine-common && rm -rf build* tests lib/vendor - -# Swiftmailer -cd $TARGET/swiftmailer && rm -rf CHANGES README* build* docs notes test-suite tests create_pear_package.php package* - -# Symfony -cd $TARGET/symfony && rm -rf README.md phpunit.xml* tests *.sh vendor - -# Twig -cd $TARGET/twig && rm -rf AUTHORS CHANGELOG README.markdown bin doc package.xml.tpl phpunit.xml* test - -# Twig Extensions -cd $TARGET/twig-extensions && rm -rf README doc phpunit.xml* test - -# Monolog -cd $TARGET/monolog && rm -rf README.markdown phpunit.xml* tests - -# Metadata -cd $TARGET/metadata && rm -rf README.rst phpunit.xml* tests - -# cleanup -find $TARGET -name .git | xargs rm -rf - -find $TARGET -name .gitignore | xargs rm -rf - -find $TARGET -name .gitmodules | xargs rm -rf - -find $TARGET -name .svn | xargs rm -rf - - -cd /tmp/ -mv /tmp/vendor /tmp/Symfony/ -tar zcpf $DIR/build/Symfony_Standard_Vendors_$VERSION.tgz Symfony -sudo rm -f $DIR/build/Symfony_Standard_Vendors_$VERSION.zip -zip -rq $DIR/build/Symfony_Standard_Vendors_$VERSION.zip Symfony diff --git a/bin/build_bootstrap b/bin/build_bootstrap deleted file mode 100755 index 54b34958bf..0000000000 --- a/bin/build_bootstrap +++ /dev/null @@ -1,90 +0,0 @@ -#!/usr/bin/env php - - * - * For the full copyright and license information, please view the LICENSE - * file that was distributed with this source code. - */ - -require_once __DIR__.'/../vendor/symfony/src/Symfony/Component/ClassLoader/UniversalClassLoader.php'; - -/* - * This file is part of the Symfony package. - * - * (c) Fabien Potencier - * - * For the full copyright and license information, please view the LICENSE - * file that was distributed with this source code. - */ - -use Symfony\Component\ClassLoader\UniversalClassLoader; -use Symfony\Component\ClassLoader\ClassCollectionLoader; - -$loader = new UniversalClassLoader(); -$loader->registerNamespaces(array('Symfony' => __DIR__.'/../vendor/symfony/src')); -$loader->register(); - -$file = __DIR__.'/../app/bootstrap.php.cache'; -if (file_exists($file)) { - unlink($file); -} - -ClassCollectionLoader::load(array( - 'Symfony\\Component\\DependencyInjection\\ContainerInterface', - 'Symfony\\Component\\DependencyInjection\\Container', - - 'Symfony\\Component\\HttpKernel\\Bundle\\BundleInterface', - 'Symfony\\Component\\HttpKernel\\Bundle\\Bundle', - 'Symfony\\Component\\HttpKernel\\Debug\\ErrorHandler', - 'Symfony\\Component\\HttpKernel\\HttpKernelInterface', - 'Symfony\\Component\\HttpKernel\\HttpKernel', - 'Symfony\\Component\\HttpKernel\\KernelInterface', - 'Symfony\\Component\\HttpKernel\\Kernel', - - 'Symfony\\Component\\HttpFoundation\\ParameterBag', - 'Symfony\\Component\\HttpFoundation\\FileBag', - 'Symfony\\Component\\HttpFoundation\\ServerBag', - 'Symfony\\Component\\HttpFoundation\\HeaderBag', - 'Symfony\\Component\\HttpFoundation\\Request', - 'Symfony\\Component\\HttpFoundation\\ApacheRequest', - - 'Symfony\\Component\\ClassLoader\\ClassCollectionLoader', - 'Symfony\\Component\\ClassLoader\\UniversalClassLoader', - 'Symfony\\Component\\ClassLoader\\MapFileClassLoader', - - 'Symfony\\Component\\Config\\ConfigCache', -), dirname($file), basename($file, '.php.cache'), false, false, '.php.cache'); - -file_put_contents($file, " - + Symfony Configuration @@ -138,7 +138,7 @@
    From cdc383699f590de3769dde3c5f7c33af702631e9 Mon Sep 17 00:00:00 2001 From: Fabien Potencier Date: Mon, 20 Jun 2011 08:13:55 +0200 Subject: [PATCH 192/899] updated to the latest vendors --- app/AppKernel.php | 19 ------------------- deps | 6 +++--- deps.lock | 20 ++++++++++---------- 3 files changed, 13 insertions(+), 32 deletions(-) diff --git a/app/AppKernel.php b/app/AppKernel.php index 3c46e419dd..31652ed181 100644 --- a/app/AppKernel.php +++ b/app/AppKernel.php @@ -2,9 +2,6 @@ use Symfony\Component\HttpKernel\Kernel; use Symfony\Component\Config\Loader\LoaderInterface; -use Symfony\Component\ClassLoader\DebugUniversalClassLoader; -use Symfony\Component\HttpKernel\Debug\ErrorHandler; -use Symfony\Component\HttpKernel\Debug\ExceptionHandler; class AppKernel extends Kernel { @@ -31,22 +28,6 @@ public function registerBundles() return $bundles; } - public function init() - { - if ($this->debug) { - ini_set('display_errors', 1); - error_reporting(-1); - - DebugUniversalClassLoader::enable(); - ErrorHandler::register(); - if ('cli' !== php_sapi_name()) { - ExceptionHandler::register(); - } - } else { - ini_set('display_errors', 0); - } - } - public function registerContainerConfiguration(LoaderInterface $loader) { $loader->load(__DIR__.'/config/config_'.$this->getEnvironment().'.yml'); diff --git a/deps b/deps index a64967fbf9..f238385efc 100644 --- a/deps +++ b/deps @@ -38,9 +38,9 @@ git=http://github.com/schmittjoh/SecurityExtraBundle.git target=/bundles/JMS/SecurityExtraBundle -[WebConfiguratorBundle] - git=http://github.com/symfony/WebConfiguratorBundle.git - target=/bundles/Symfony/Bundle/WebConfiguratorBundle +[SensioDistributionBundle] + git=http://github.com/sensio/SensioDistributionBundle.git + target=/bundles/Sensio/Bundle/DistributionBundle [AsseticBundle] git=http://github.com/symfony/AsseticBundle.git diff --git a/deps.lock b/deps.lock index fc788a1b22..4ac8ea9ace 100644 --- a/deps.lock +++ b/deps.lock @@ -1,14 +1,14 @@ -symfony c62724b3c3df1887432568b50a04a27870e5e802 -twig a12aec38c3e57814543ffd049101c2f54dd3e257 -monolog ff6d7fce5cbe52fa98d143199a3d58b2372b36de +symfony 38fa4e65dcb9b2d47a0e3382f69c779feee63417 +twig 027f4890a76536a6bade74c0e130e5553fc0eeea +monolog 8492eb74b30429c68beeca22ded788a487d0fd82 doctrine-common 0ba250a785178d7cdb579ce82151731c04849abf -doctrine-dbal cfcad35f11a81feba19a25dc6f4afde603639438 -doctrine 98bc3c4e402731fae8716e99c7c19d5e0ff7b60a -swiftmailer d4e5e63f077d74080919521f786138a3b27d556e -assetic 2b53d8763909008a623d70351e392964989d17d3 +doctrine-dbal 48c78a2d1499c8e5156177c7c7ad8d6d0e0d6fad +doctrine fff0204e6d799018d98103a4fec435ec1d54b745 +swiftmailer 79fe79112664b855c9f6db3350e374b5ea9467cf +assetic cfba41d2632c58a32570c9c6250b53e962b5c875 twig-extensions 6b0cc16934b6e62ef07c8d2e59f9f13ff3193d3d metadata aa04872c6f0e2b32128b62dd075e8cf97a8d93da -SensioFrameworkExtraBundle d529f700916be3beccfb93cf356bca018db9ba95 +SensioFrameworkExtraBundle e2da95a87d31ea4df5eadb687b97d3d7f0c528eb JMSSecurityExtraBundle 5676f8ddbc512713e101cb123baf5cd500edefbb -WebConfiguratorBundle 301419e7900bfaac2f029af868e31075b147abcf -AsseticBundle 6d597c4abeb513198f153a0a695612fcfd688972 +SensioDistributionBundle aac81624875860aa52aebee0a7eb0527e7129c06 +AsseticBundle 9215de810b64e14cecc4b4f1a9359b5fbd999358 \ No newline at end of file From 6dbfe0440e47af781f6c9a354eb9f9e72e51fff7 Mon Sep 17 00:00:00 2001 From: Jordi Boggiano Date: Mon, 20 Jun 2011 16:25:43 +0200 Subject: [PATCH 193/899] Adjusts tag name for latest changes --- src/Acme/DemoBundle/Resources/config/services.xml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/src/Acme/DemoBundle/Resources/config/services.xml b/src/Acme/DemoBundle/Resources/config/services.xml index cddc0d6350..33617fa29d 100644 --- a/src/Acme/DemoBundle/Resources/config/services.xml +++ b/src/Acme/DemoBundle/Resources/config/services.xml @@ -11,7 +11,7 @@ - + From d4535c15f61986a5cc931a9a15fc918c3490e179 Mon Sep 17 00:00:00 2001 From: Jordi Boggiano Date: Tue, 21 Jun 2011 16:31:21 +0200 Subject: [PATCH 194/899] Renamed core.* events to kernel.* to match latest changes --- src/Acme/DemoBundle/ControllerListener.php | 2 +- src/Acme/DemoBundle/Resources/config/services.xml | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/src/Acme/DemoBundle/ControllerListener.php b/src/Acme/DemoBundle/ControllerListener.php index 83932a8ef0..e0a3ff41c6 100644 --- a/src/Acme/DemoBundle/ControllerListener.php +++ b/src/Acme/DemoBundle/ControllerListener.php @@ -16,7 +16,7 @@ public function __construct(DemoExtension $extension) $this->extension = $extension; } - public function onCoreController(FilterControllerEvent $event) + public function onKernelController(FilterControllerEvent $event) { if (HttpKernelInterface::MASTER_REQUEST === $event->getRequestType()) { $this->extension->setController($event->getController()); diff --git a/src/Acme/DemoBundle/Resources/config/services.xml b/src/Acme/DemoBundle/Resources/config/services.xml index 33617fa29d..bb60be0341 100644 --- a/src/Acme/DemoBundle/Resources/config/services.xml +++ b/src/Acme/DemoBundle/Resources/config/services.xml @@ -11,7 +11,7 @@ - + From ea6d9c1aa729855b33d60e7778749358884a742a Mon Sep 17 00:00:00 2001 From: Fabien Potencier Date: Wed, 22 Jun 2011 11:36:16 +0200 Subject: [PATCH 195/899] updated vendors --- deps.lock | 14 +++++++------- 1 file changed, 7 insertions(+), 7 deletions(-) diff --git a/deps.lock b/deps.lock index 4ac8ea9ace..e107ec5799 100644 --- a/deps.lock +++ b/deps.lock @@ -1,14 +1,14 @@ -symfony 38fa4e65dcb9b2d47a0e3382f69c779feee63417 +symfony e717c99f3bb92a7215221c69277b87f981e7ce75 twig 027f4890a76536a6bade74c0e130e5553fc0eeea monolog 8492eb74b30429c68beeca22ded788a487d0fd82 doctrine-common 0ba250a785178d7cdb579ce82151731c04849abf -doctrine-dbal 48c78a2d1499c8e5156177c7c7ad8d6d0e0d6fad -doctrine fff0204e6d799018d98103a4fec435ec1d54b745 +doctrine-dbal ada344f284da70c937d093360e3fd1af6ada7a59 +doctrine db80b2b1351f055f58a549cbf0cb79b27b92741c swiftmailer 79fe79112664b855c9f6db3350e374b5ea9467cf assetic cfba41d2632c58a32570c9c6250b53e962b5c875 twig-extensions 6b0cc16934b6e62ef07c8d2e59f9f13ff3193d3d metadata aa04872c6f0e2b32128b62dd075e8cf97a8d93da -SensioFrameworkExtraBundle e2da95a87d31ea4df5eadb687b97d3d7f0c528eb -JMSSecurityExtraBundle 5676f8ddbc512713e101cb123baf5cd500edefbb -SensioDistributionBundle aac81624875860aa52aebee0a7eb0527e7129c06 -AsseticBundle 9215de810b64e14cecc4b4f1a9359b5fbd999358 \ No newline at end of file +SensioFrameworkExtraBundle 849cea913ffb6cf2f69d1be554bf0a09a9b4420e +JMSSecurityExtraBundle f9fbc5da0d464a3764ef7bf6d7988fbb7b883d6a +SensioDistributionBundle 868d8db9ca3ae41d5d6e74f3db708eb5970bc478 +AsseticBundle 9691c911d063432d8df54377bdfc9664f295e9bf \ No newline at end of file From f5f9a5e4f6695d181d38bb7b9f0dde2fa1649a17 Mon Sep 17 00:00:00 2001 From: Fabien Potencier Date: Tue, 21 Jun 2011 21:53:38 +0200 Subject: [PATCH 196/899] added SensioGeneratorBundle --- app/AppKernel.php | 1 + deps | 4 ++++ deps.lock | 1 + 3 files changed, 6 insertions(+) diff --git a/app/AppKernel.php b/app/AppKernel.php index 31652ed181..5bd97b74c7 100644 --- a/app/AppKernel.php +++ b/app/AppKernel.php @@ -23,6 +23,7 @@ public function registerBundles() $bundles[] = new Acme\DemoBundle\AcmeDemoBundle(); $bundles[] = new Symfony\Bundle\WebProfilerBundle\WebProfilerBundle(); $bundles[] = new Sensio\Bundle\DistributionBundle\SensioDistributionBundle(); + $bundles[] = new Sensio\Bundle\GeneratorBundle\SensioGeneratorBundle(); } return $bundles; diff --git a/deps b/deps index f238385efc..751d0678a4 100644 --- a/deps +++ b/deps @@ -42,6 +42,10 @@ git=http://github.com/sensio/SensioDistributionBundle.git target=/bundles/Sensio/Bundle/DistributionBundle +[SensioGeneratorBundle] + git=http://github.com/sensio/SensioGeneratorBundle.git + target=/bundles/Sensio/Bundle/GeneratorBundle + [AsseticBundle] git=http://github.com/symfony/AsseticBundle.git target=/bundles/Symfony/Bundle/AsseticBundle diff --git a/deps.lock b/deps.lock index e107ec5799..d8346745f0 100644 --- a/deps.lock +++ b/deps.lock @@ -11,4 +11,5 @@ metadata aa04872c6f0e2b32128b62dd075e8cf97a8d93da SensioFrameworkExtraBundle 849cea913ffb6cf2f69d1be554bf0a09a9b4420e JMSSecurityExtraBundle f9fbc5da0d464a3764ef7bf6d7988fbb7b883d6a SensioDistributionBundle 868d8db9ca3ae41d5d6e74f3db708eb5970bc478 +SensioGeneratorBundle 4ae7a6071b2d76392e5b601aa4945fdec6618418 AsseticBundle 9691c911d063432d8df54377bdfc9664f295e9bf \ No newline at end of file From 2ca24bd5f95ec81355306388712081d4dd42cb93 Mon Sep 17 00:00:00 2001 From: Fabien Potencier Date: Wed, 22 Jun 2011 11:46:17 +0200 Subject: [PATCH 197/899] updated vendors --- deps.lock | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/deps.lock b/deps.lock index d8346745f0..8278323d6a 100644 --- a/deps.lock +++ b/deps.lock @@ -1,4 +1,4 @@ -symfony e717c99f3bb92a7215221c69277b87f981e7ce75 +symfony b91bd78ddb495d4dcf5f3d843af3b8a079aba76c twig 027f4890a76536a6bade74c0e130e5553fc0eeea monolog 8492eb74b30429c68beeca22ded788a487d0fd82 doctrine-common 0ba250a785178d7cdb579ce82151731c04849abf From bad84ccb0d9fd88a6da0f69ede7bb1def9040056 Mon Sep 17 00:00:00 2001 From: Michel Weimerskirch Date: Fri, 24 Jun 2011 04:11:37 -0700 Subject: [PATCH 198/899] Added missing bundle name to README.rst --- README.rst | 1 + 1 file changed, 1 insertion(+) diff --git a/README.rst b/README.rst index f7db32051c..b544e26429 100644 --- a/README.rst +++ b/README.rst @@ -16,6 +16,7 @@ Symfony Standard Edition comes pre-configured with the following bundles: * JMSSecurityExtraBundle * WebProfilerBundle (in dev/test env) * SensioDistributionBundle (in dev/test env) +* SensioGeneratorBundle (in dev/test env) * AcmeDemoBundle (in dev/test env) Installation from an Archive From 5ee255c1193c072c5f0dc9807360d17912de849d Mon Sep 17 00:00:00 2001 From: Fabien Potencier Date: Fri, 24 Jun 2011 14:13:54 +0200 Subject: [PATCH 199/899] updated vendors --- deps | 1 - deps.lock | 14 +++++++------- 2 files changed, 7 insertions(+), 8 deletions(-) diff --git a/deps b/deps index 751d0678a4..524e059c4b 100644 --- a/deps +++ b/deps @@ -9,7 +9,6 @@ [doctrine-common] git=http://github.com/doctrine/common.git - version=origin/3.0.x [doctrine-dbal] git=http://github.com/doctrine/dbal.git diff --git a/deps.lock b/deps.lock index 8278323d6a..9651b5ba69 100644 --- a/deps.lock +++ b/deps.lock @@ -1,15 +1,15 @@ -symfony b91bd78ddb495d4dcf5f3d843af3b8a079aba76c -twig 027f4890a76536a6bade74c0e130e5553fc0eeea +symfony 46680d4565b4b675dc73aa5dca1ec3dddbda6b97 +twig 612fa7bc514ab88110c974ba5a330ef2ec2c2363 monolog 8492eb74b30429c68beeca22ded788a487d0fd82 -doctrine-common 0ba250a785178d7cdb579ce82151731c04849abf +doctrine-common f60729bb431e520fcc5437903043f7ff04860a75 doctrine-dbal ada344f284da70c937d093360e3fd1af6ada7a59 doctrine db80b2b1351f055f58a549cbf0cb79b27b92741c swiftmailer 79fe79112664b855c9f6db3350e374b5ea9467cf -assetic cfba41d2632c58a32570c9c6250b53e962b5c875 +assetic 4fffe721606a46712d613610df4d3d4a92dc4b21 twig-extensions 6b0cc16934b6e62ef07c8d2e59f9f13ff3193d3d metadata aa04872c6f0e2b32128b62dd075e8cf97a8d93da -SensioFrameworkExtraBundle 849cea913ffb6cf2f69d1be554bf0a09a9b4420e +SensioFrameworkExtraBundle 414c0812bf941811791f8a1efd4ccd25e9562406 JMSSecurityExtraBundle f9fbc5da0d464a3764ef7bf6d7988fbb7b883d6a SensioDistributionBundle 868d8db9ca3ae41d5d6e74f3db708eb5970bc478 -SensioGeneratorBundle 4ae7a6071b2d76392e5b601aa4945fdec6618418 -AsseticBundle 9691c911d063432d8df54377bdfc9664f295e9bf \ No newline at end of file +SensioGeneratorBundle 2830337f3368b2aba1d25ee41b4542fe1a6ead78 +AsseticBundle 9c37ad8e168f86a3635460d749290e81ff3ccc5a \ No newline at end of file From eaeba47dbc61b16e12a61c8104ec43f4ba9b0c89 Mon Sep 17 00:00:00 2001 From: Fabien Potencier Date: Fri, 24 Jun 2011 15:22:54 +0200 Subject: [PATCH 200/899] updated vendors --- deps.lock | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/deps.lock b/deps.lock index 9651b5ba69..0524b3fbbe 100644 --- a/deps.lock +++ b/deps.lock @@ -1,4 +1,4 @@ -symfony 46680d4565b4b675dc73aa5dca1ec3dddbda6b97 +symfony 92c28844ced90926b6f6ce138783072d6dee2a52 twig 612fa7bc514ab88110c974ba5a330ef2ec2c2363 monolog 8492eb74b30429c68beeca22ded788a487d0fd82 doctrine-common f60729bb431e520fcc5437903043f7ff04860a75 From 3a6f8203d82d4933347e253c08150a47358ba22a Mon Sep 17 00:00:00 2001 From: Christian Raue Date: Fri, 24 Jun 2011 12:52:23 -0700 Subject: [PATCH 201/899] updated year range in LICENSE --- LICENSE | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/LICENSE b/LICENSE index 89c135de51..89df4481b9 100644 --- a/LICENSE +++ b/LICENSE @@ -1,4 +1,4 @@ -Copyright (c) 2004-2010 Fabien Potencier +Copyright (c) 2004-2011 Fabien Potencier Permission is hereby granted, free of charge, to any person obtaining a copy of this software and associated documentation files (the "Software"), to deal From 5213a34952968be0fcbb5ed6a959e93d3cffa3bb Mon Sep 17 00:00:00 2001 From: Fabien Potencier Date: Sun, 26 Jun 2011 18:18:59 +0200 Subject: [PATCH 202/899] updated vendors --- deps.lock | 14 +++++++------- 1 file changed, 7 insertions(+), 7 deletions(-) diff --git a/deps.lock b/deps.lock index 0524b3fbbe..fee51ac1ed 100644 --- a/deps.lock +++ b/deps.lock @@ -1,15 +1,15 @@ -symfony 92c28844ced90926b6f6ce138783072d6dee2a52 +symfony a19c336c180ab05f309bee0630a70f68d48e1183 twig 612fa7bc514ab88110c974ba5a330ef2ec2c2363 monolog 8492eb74b30429c68beeca22ded788a487d0fd82 -doctrine-common f60729bb431e520fcc5437903043f7ff04860a75 -doctrine-dbal ada344f284da70c937d093360e3fd1af6ada7a59 -doctrine db80b2b1351f055f58a549cbf0cb79b27b92741c +doctrine-common fa9954572e2489d54d015eaf648e5d867e6605c9 +doctrine-dbal 4cfb32db00da53638bc2dca84e3e63553fdf3c5b +doctrine 52431251cbe1aff0d7fef1ec7135540d0d345f04 swiftmailer 79fe79112664b855c9f6db3350e374b5ea9467cf -assetic 4fffe721606a46712d613610df4d3d4a92dc4b21 +assetic 50d19c4af63a3216e0147b5911f244165bd93b0b twig-extensions 6b0cc16934b6e62ef07c8d2e59f9f13ff3193d3d metadata aa04872c6f0e2b32128b62dd075e8cf97a8d93da SensioFrameworkExtraBundle 414c0812bf941811791f8a1efd4ccd25e9562406 JMSSecurityExtraBundle f9fbc5da0d464a3764ef7bf6d7988fbb7b883d6a SensioDistributionBundle 868d8db9ca3ae41d5d6e74f3db708eb5970bc478 -SensioGeneratorBundle 2830337f3368b2aba1d25ee41b4542fe1a6ead78 -AsseticBundle 9c37ad8e168f86a3635460d749290e81ff3ccc5a \ No newline at end of file +SensioGeneratorBundle 439f14359e495786de15a28ccd29e9f9f35bc7f1 +AsseticBundle e54bb29e47dba301faaa74e14e90c6c0befb044b \ No newline at end of file From d737ce21a4c1382f2047037da17ae756f0e74ab2 Mon Sep 17 00:00:00 2001 From: Fabien Potencier Date: Mon, 27 Jun 2011 18:15:57 +0200 Subject: [PATCH 203/899] updated vendors --- deps.lock | 14 +++++++------- 1 file changed, 7 insertions(+), 7 deletions(-) diff --git a/deps.lock b/deps.lock index fee51ac1ed..b639c62b47 100644 --- a/deps.lock +++ b/deps.lock @@ -1,15 +1,15 @@ -symfony a19c336c180ab05f309bee0630a70f68d48e1183 -twig 612fa7bc514ab88110c974ba5a330ef2ec2c2363 +symfony e906897c185142942bf24d4a2088f3c67163b439 +twig cdd8351cf58babc767a8fbe0a3f6d05df90373ff monolog 8492eb74b30429c68beeca22ded788a487d0fd82 doctrine-common fa9954572e2489d54d015eaf648e5d867e6605c9 -doctrine-dbal 4cfb32db00da53638bc2dca84e3e63553fdf3c5b -doctrine 52431251cbe1aff0d7fef1ec7135540d0d345f04 +doctrine-dbal 2cb22496a732029373d98ff9e4d54a7187ee9bb8 +doctrine 5afc097527685f33abddbfb10af4741e8bd7385a swiftmailer 79fe79112664b855c9f6db3350e374b5ea9467cf -assetic 50d19c4af63a3216e0147b5911f244165bd93b0b +assetic 50d4b959d713f7544dc98e36bc181631aca034a0 twig-extensions 6b0cc16934b6e62ef07c8d2e59f9f13ff3193d3d metadata aa04872c6f0e2b32128b62dd075e8cf97a8d93da SensioFrameworkExtraBundle 414c0812bf941811791f8a1efd4ccd25e9562406 JMSSecurityExtraBundle f9fbc5da0d464a3764ef7bf6d7988fbb7b883d6a SensioDistributionBundle 868d8db9ca3ae41d5d6e74f3db708eb5970bc478 -SensioGeneratorBundle 439f14359e495786de15a28ccd29e9f9f35bc7f1 -AsseticBundle e54bb29e47dba301faaa74e14e90c6c0befb044b \ No newline at end of file +SensioGeneratorBundle 272b440f3f5e98d24894a24ac760baffe9307b2d +AsseticBundle f6ec47d9399459ab7b602fb3737243a0f1fa2f29 \ No newline at end of file From ec1cd9ef670d081529e9aa8a91a90b3593f557d8 Mon Sep 17 00:00:00 2001 From: Fabien Potencier Date: Mon, 27 Jun 2011 23:44:23 +0200 Subject: [PATCH 204/899] updated vendors --- deps.lock | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/deps.lock b/deps.lock index b639c62b47..be0e91beb7 100644 --- a/deps.lock +++ b/deps.lock @@ -1,4 +1,4 @@ -symfony e906897c185142942bf24d4a2088f3c67163b439 +symfony 705fc0ddd3c615b03a4ee001a9164259c8011b68 twig cdd8351cf58babc767a8fbe0a3f6d05df90373ff monolog 8492eb74b30429c68beeca22ded788a487d0fd82 doctrine-common fa9954572e2489d54d015eaf648e5d867e6605c9 @@ -11,5 +11,5 @@ metadata aa04872c6f0e2b32128b62dd075e8cf97a8d93da SensioFrameworkExtraBundle 414c0812bf941811791f8a1efd4ccd25e9562406 JMSSecurityExtraBundle f9fbc5da0d464a3764ef7bf6d7988fbb7b883d6a SensioDistributionBundle 868d8db9ca3ae41d5d6e74f3db708eb5970bc478 -SensioGeneratorBundle 272b440f3f5e98d24894a24ac760baffe9307b2d +SensioGeneratorBundle 719b6912c19d9c27c39f1df59885718c8c4af0ae AsseticBundle f6ec47d9399459ab7b602fb3737243a0f1fa2f29 \ No newline at end of file From 459e9b5e8f1ac40e5c22fcc554803d7d18344c70 Mon Sep 17 00:00:00 2001 From: Hugo Hamon Date: Tue, 28 Jun 2011 11:31:05 +0200 Subject: [PATCH 205/899] [config] added commented config line to activate ESI without deeping in the documentation. --- app/config/config.yml | 1 + 1 file changed, 1 insertion(+) diff --git a/app/config/config.yml b/app/config/config.yml index c9423e42e6..2601a32910 100644 --- a/app/config/config.yml +++ b/app/config/config.yml @@ -3,6 +3,7 @@ imports: - { resource: security.yml } framework: + # esi: ~ secret: %secret% charset: UTF-8 router: { resource: "%kernel.root_dir%/config/routing.yml" } From ee935fdf2be77c13c0a6da2022905bf39bd69349 Mon Sep 17 00:00:00 2001 From: Hugo Hamon Date: Tue, 28 Jun 2011 11:35:28 +0200 Subject: [PATCH 206/899] [config] added commented internal route definition for ESI in routing.yml file. --- app/config/routing.yml | 4 ++++ 1 file changed, 4 insertions(+) diff --git a/app/config/routing.yml b/app/config/routing.yml index e69de29bb2..9cbc4465f8 100644 --- a/app/config/routing.yml +++ b/app/config/routing.yml @@ -0,0 +1,4 @@ +# Internal routing configuration to handle ESI +# _internal: +# resource: "@FrameworkBundle/Resources/config/routing/internal.xml" +# prefix: /_internal From e024fdd1c0c04b23148a4af9ccc8c366951d0f5d Mon Sep 17 00:00:00 2001 From: Richard Miller Date: Tue, 28 Jun 2011 10:39:54 +0100 Subject: [PATCH 207/899] Fixed very minor typo in README.rst --- README.rst | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/README.rst b/README.rst index b544e26429..6568fa5ece 100644 --- a/README.rst +++ b/README.rst @@ -35,7 +35,7 @@ Installation from Git --------------------- We highly recommend you that you download the packaged version of this -distribution. If you still want to use Git, your are on your own. +distribution. If you still want to use Git, you are on your own. Run the following commands: From 72abc005818212c32be751490db75c85872048bb Mon Sep 17 00:00:00 2001 From: denderello Date: Wed, 29 Jun 2011 09:34:31 +0200 Subject: [PATCH 208/899] added a way to check wether the project sources were shipped with or without vendors. --- bin/vendors | 16 ++++++++++++++++ 1 file changed, 16 insertions(+) diff --git a/bin/vendors b/bin/vendors index 76b835f14d..d704098569 100755 --- a/bin/vendors +++ b/bin/vendors @@ -32,6 +32,22 @@ if (!in_array($command = array_shift($argv), array('install', 'update'))) { exit(sprintf("Command \"%s\" does not exist.\n", $command)); } +/* + * Check wether this project is based on the Standard Edition that was + * shipped with vendors or not. + */ +if (!is_dir($vendorDir.'/symfony/.git')) +{ + exit(<< Date: Thu, 30 Jun 2011 14:10:35 +0200 Subject: [PATCH 209/899] Added check and note for the --reinstall option when trying to install vendors --- bin/vendors | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/bin/vendors b/bin/vendors index d704098569..996746f7b6 100755 --- a/bin/vendors +++ b/bin/vendors @@ -36,12 +36,12 @@ if (!in_array($command = array_shift($argv), array('install', 'update'))) { * Check wether this project is based on the Standard Edition that was * shipped with vendors or not. */ -if (!is_dir($vendorDir.'/symfony/.git')) +if (!is_dir($vendorDir.'/symfony/.git') && !in_array('--reinstall', $argv)) { exit(<< Date: Thu, 30 Jun 2011 20:29:44 +0200 Subject: [PATCH 210/899] changed Twig version to 1.1.0 --- deps | 1 + 1 file changed, 1 insertion(+) diff --git a/deps b/deps index 524e059c4b..c9f0942078 100644 --- a/deps +++ b/deps @@ -3,6 +3,7 @@ [twig] git=http://github.com/fabpot/Twig.git + version=v1.1.0 [monolog] git=http://github.com/Seldaek/monolog.git From 61c8d3fffd957a509543ebd34a4bde6f5045d127 Mon Sep 17 00:00:00 2001 From: Fabien Potencier Date: Thu, 30 Jun 2011 20:30:53 +0200 Subject: [PATCH 211/899] fixed CS --- bin/vendors | 9 ++++----- 1 file changed, 4 insertions(+), 5 deletions(-) diff --git a/bin/vendors b/bin/vendors index 996746f7b6..02e8b89cfe 100755 --- a/bin/vendors +++ b/bin/vendors @@ -36,16 +36,15 @@ if (!in_array($command = array_shift($argv), array('install', 'update'))) { * Check wether this project is based on the Standard Edition that was * shipped with vendors or not. */ -if (!is_dir($vendorDir.'/symfony/.git') && !in_array('--reinstall', $argv)) -{ +if (!is_dir($vendorDir.'/symfony/.git') && !in_array('--reinstall', $argv)) { exit(<< Date: Thu, 30 Jun 2011 20:32:38 +0200 Subject: [PATCH 212/899] fixed indentation --- app/config/routing.yml | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/app/config/routing.yml b/app/config/routing.yml index 9cbc4465f8..8b4740a115 100644 --- a/app/config/routing.yml +++ b/app/config/routing.yml @@ -1,4 +1,4 @@ # Internal routing configuration to handle ESI -# _internal: -# resource: "@FrameworkBundle/Resources/config/routing/internal.xml" -# prefix: /_internal +#_internal: +# resource: "@FrameworkBundle/Resources/config/routing/internal.xml" +# prefix: /_internal From f3c513f42bab8ab25749605ecf310d55df28477a Mon Sep 17 00:00:00 2001 From: Fabien Potencier Date: Thu, 30 Jun 2011 20:38:05 +0200 Subject: [PATCH 213/899] updated vendors --- deps.lock | 24 ++++++++++++------------ 1 file changed, 12 insertions(+), 12 deletions(-) diff --git a/deps.lock b/deps.lock index be0e91beb7..ceacc0ac61 100644 --- a/deps.lock +++ b/deps.lock @@ -1,15 +1,15 @@ -symfony 705fc0ddd3c615b03a4ee001a9164259c8011b68 -twig cdd8351cf58babc767a8fbe0a3f6d05df90373ff -monolog 8492eb74b30429c68beeca22ded788a487d0fd82 -doctrine-common fa9954572e2489d54d015eaf648e5d867e6605c9 -doctrine-dbal 2cb22496a732029373d98ff9e4d54a7187ee9bb8 -doctrine 5afc097527685f33abddbfb10af4741e8bd7385a -swiftmailer 79fe79112664b855c9f6db3350e374b5ea9467cf -assetic 50d4b959d713f7544dc98e36bc181631aca034a0 +symfony 5da21d1b468f6d310ced3af8646d14e3e561f1e8 +twig 661e9c7ad2820e881c93474f2fbcbe2661fd1970 +monolog 66c1cc05a8e00fb5d4dbf540dba12b5727564d33 +doctrine-common 628cad2cb89fe1c9cc63aa21ac1f82a27ed12df5 +doctrine-dbal b59ccaf3b24b93846f227253d44084094a3d8b61 +doctrine 5362206297d8c6715e4e8f43fab778bb662f810a +swiftmailer 3304927fe86466534a4a3e14a4741bda64a0eaef +assetic 7448f2c09c8824e756a12e8be291ce0ce657b246 twig-extensions 6b0cc16934b6e62ef07c8d2e59f9f13ff3193d3d metadata aa04872c6f0e2b32128b62dd075e8cf97a8d93da -SensioFrameworkExtraBundle 414c0812bf941811791f8a1efd4ccd25e9562406 -JMSSecurityExtraBundle f9fbc5da0d464a3764ef7bf6d7988fbb7b883d6a +SensioFrameworkExtraBundle d36c60b4b1f47081476742d4aae39d4a5c9f4272 +JMSSecurityExtraBundle a7717ed531f64fac812634d7f5a5c6c9b825e14f SensioDistributionBundle 868d8db9ca3ae41d5d6e74f3db708eb5970bc478 -SensioGeneratorBundle 719b6912c19d9c27c39f1df59885718c8c4af0ae -AsseticBundle f6ec47d9399459ab7b602fb3737243a0f1fa2f29 \ No newline at end of file +SensioGeneratorBundle 5d78a4b1398aaa11b2965dd6772abb1865977a32 +AsseticBundle d07327d1ed07b004b145774798b29b09a00e60ff \ No newline at end of file From 68c696db174d4d30f5aafe5182c5a7bf59f33e6a Mon Sep 17 00:00:00 2001 From: Fabien Potencier Date: Thu, 30 Jun 2011 22:40:38 +0200 Subject: [PATCH 214/899] updated vendors --- deps | 2 +- deps.lock | 6 +++--- 2 files changed, 4 insertions(+), 4 deletions(-) diff --git a/deps b/deps index c9f0942078..14bc6e7b72 100644 --- a/deps +++ b/deps @@ -19,7 +19,7 @@ [swiftmailer] git=http://github.com/swiftmailer/swiftmailer.git - version=origin/4.1 + version=v4.1.0 [assetic] git=http://github.com/kriswallsmith/assetic.git diff --git a/deps.lock b/deps.lock index ceacc0ac61..6442e7d29b 100644 --- a/deps.lock +++ b/deps.lock @@ -1,10 +1,10 @@ symfony 5da21d1b468f6d310ced3af8646d14e3e561f1e8 twig 661e9c7ad2820e881c93474f2fbcbe2661fd1970 monolog 66c1cc05a8e00fb5d4dbf540dba12b5727564d33 -doctrine-common 628cad2cb89fe1c9cc63aa21ac1f82a27ed12df5 +doctrine-common 40e49ec3fd59f5c16e809078aa18ede23405bf00 doctrine-dbal b59ccaf3b24b93846f227253d44084094a3d8b61 -doctrine 5362206297d8c6715e4e8f43fab778bb662f810a -swiftmailer 3304927fe86466534a4a3e14a4741bda64a0eaef +doctrine 5299bd788f7afa8bee9a251f6efa99fb64742ffe +swiftmailer c53c8c1ab88c78c463ba65086d93d00193957e94 assetic 7448f2c09c8824e756a12e8be291ce0ce657b246 twig-extensions 6b0cc16934b6e62ef07c8d2e59f9f13ff3193d3d metadata aa04872c6f0e2b32128b62dd075e8cf97a8d93da From 55a8d9554fb1d15506e87784d36552263aa7fc9f Mon Sep 17 00:00:00 2001 From: Hugo Hamon Date: Fri, 1 Jul 2011 08:58:04 +0200 Subject: [PATCH 215/899] [config] fixed indendation for ESI configuration. --- app/config/config.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/app/config/config.yml b/app/config/config.yml index 2601a32910..e63f1f9188 100644 --- a/app/config/config.yml +++ b/app/config/config.yml @@ -3,7 +3,7 @@ imports: - { resource: security.yml } framework: - # esi: ~ + #esi: ~ secret: %secret% charset: UTF-8 router: { resource: "%kernel.root_dir%/config/routing.yml" } From 7147adc13ab366611bbbadcafa33b951b57e868c Mon Sep 17 00:00:00 2001 From: Hugo Hamon Date: Fri, 1 Jul 2011 10:17:08 +0200 Subject: [PATCH 216/899] [config] added security template for ESI internal routes. --- app/config/security.yml | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/app/config/security.yml b/app/config/security.yml index 846768dff1..586d1d07ae 100644 --- a/app/config/security.yml +++ b/app/config/security.yml @@ -34,4 +34,5 @@ security: # realm: "Secured Demo Area" access_control: - #- { path: /login, roles: IS_AUTHENTICATED_ANONYMOUSLY, requires_channel: https } + #- { path: ^/login, roles: IS_AUTHENTICATED_ANONYMOUSLY, requires_channel: https } + #- { path: ^/_internal, roles: IS_AUTHENTICATED_ANONYMOUSLY, ip: 127.0.0.1 } From 5cff6e4cbed00f344be410c11a8f88c507cccb72 Mon Sep 17 00:00:00 2001 From: Jordan Alliot Date: Sat, 2 Jul 2011 17:45:06 +0100 Subject: [PATCH 217/899] Correct regression from 72abc005818212c32be751490db75c85872048bb --- bin/vendors | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/bin/vendors b/bin/vendors index 02e8b89cfe..2021ec4e02 100755 --- a/bin/vendors +++ b/bin/vendors @@ -36,7 +36,7 @@ if (!in_array($command = array_shift($argv), array('install', 'update'))) { * Check wether this project is based on the Standard Edition that was * shipped with vendors or not. */ -if (!is_dir($vendorDir.'/symfony/.git') && !in_array('--reinstall', $argv)) { +if (is_dir($vendorDir.'/symfony') && !is_dir($vendorDir.'/symfony/.git') && !in_array('--reinstall', $argv)) { exit(<< Date: Sat, 2 Jul 2011 21:51:20 +0200 Subject: [PATCH 218/899] Updated the url of JMSSecurityExtraBundle. Closes #122 --- deps | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/deps b/deps index 14bc6e7b72..9483624310 100644 --- a/deps +++ b/deps @@ -35,7 +35,7 @@ target=/bundles/Sensio/Bundle/FrameworkExtraBundle [JMSSecurityExtraBundle] - git=http://github.com/schmittjoh/SecurityExtraBundle.git + git=http://github.com/schmittjoh/JMSSecurityExtraBundle.git target=/bundles/JMS/SecurityExtraBundle [SensioDistributionBundle] From 957a5f3c97317677cf9ecf24c8029f181006c707 Mon Sep 17 00:00:00 2001 From: Benjamin Eberlei Date: Sun, 3 Jul 2011 16:45:45 +0200 Subject: [PATCH 219/899] Update autoload.php with requirements for AnnotationRegistry changes, update vendors to Common RC3 and ORM RC3 --- app/autoload.php | 8 ++++++++ deps.lock | 4 ++-- 2 files changed, 10 insertions(+), 2 deletions(-) diff --git a/app/autoload.php b/app/autoload.php index f23e397767..d5abd9aa40 100644 --- a/app/autoload.php +++ b/app/autoload.php @@ -1,6 +1,7 @@ registerNamespaces(array( @@ -26,7 +27,14 @@ )); $loader->register(); +AnnotationRegistry::registerLoader(function($class) use ($loader) { + $loader->loadClass($class); + return class_exists($class, false); +}); +AnnotationRegistry::registerFile(__DIR__.'/../vendor/doctrine/lib/Doctrine/ORM/Mapping/Driver/DoctrineAnnotations.php'); + // Swiftmailer needs a special autoloader to allow // the lazy loading of the init file (which is expensive) require_once __DIR__.'/../vendor/swiftmailer/lib/classes/Swift.php'; Swift::registerAutoload(__DIR__.'/../vendor/swiftmailer/lib/swift_init.php'); + diff --git a/deps.lock b/deps.lock index 6442e7d29b..6e93135353 100644 --- a/deps.lock +++ b/deps.lock @@ -1,9 +1,9 @@ symfony 5da21d1b468f6d310ced3af8646d14e3e561f1e8 twig 661e9c7ad2820e881c93474f2fbcbe2661fd1970 monolog 66c1cc05a8e00fb5d4dbf540dba12b5727564d33 -doctrine-common 40e49ec3fd59f5c16e809078aa18ede23405bf00 +doctrine-common 74a2c924cd08b30785877808b1fb519b4b2e60b1 doctrine-dbal b59ccaf3b24b93846f227253d44084094a3d8b61 -doctrine 5299bd788f7afa8bee9a251f6efa99fb64742ffe +doctrine 6b54cceed71368be7a8a2e6a1b50d9dfc775f0fa swiftmailer c53c8c1ab88c78c463ba65086d93d00193957e94 assetic 7448f2c09c8824e756a12e8be291ce0ce657b246 twig-extensions 6b0cc16934b6e62ef07c8d2e59f9f13ff3193d3d From 38038620eb6a3affa47fa8ab4bb31058ea183066 Mon Sep 17 00:00:00 2001 From: Fabien Potencier Date: Mon, 4 Jul 2011 11:30:45 +0200 Subject: [PATCH 220/899] updated vendors --- deps.lock | 10 +++++----- 1 file changed, 5 insertions(+), 5 deletions(-) diff --git a/deps.lock b/deps.lock index 6e93135353..66d52b3328 100644 --- a/deps.lock +++ b/deps.lock @@ -1,15 +1,15 @@ -symfony 5da21d1b468f6d310ced3af8646d14e3e561f1e8 +symfony b93dd7a36bfd7c10434d1acad50b9826fcd365ce twig 661e9c7ad2820e881c93474f2fbcbe2661fd1970 -monolog 66c1cc05a8e00fb5d4dbf540dba12b5727564d33 -doctrine-common 74a2c924cd08b30785877808b1fb519b4b2e60b1 +monolog 5e651a82b4b03d267da6084720ada0cd398c8d16 +doctrine-common 73b61b5078264035894047fb8b2b71ddbc69e941 doctrine-dbal b59ccaf3b24b93846f227253d44084094a3d8b61 doctrine 6b54cceed71368be7a8a2e6a1b50d9dfc775f0fa swiftmailer c53c8c1ab88c78c463ba65086d93d00193957e94 -assetic 7448f2c09c8824e756a12e8be291ce0ce657b246 +assetic ff2cc17175addf307d40141198968530280693db twig-extensions 6b0cc16934b6e62ef07c8d2e59f9f13ff3193d3d metadata aa04872c6f0e2b32128b62dd075e8cf97a8d93da SensioFrameworkExtraBundle d36c60b4b1f47081476742d4aae39d4a5c9f4272 JMSSecurityExtraBundle a7717ed531f64fac812634d7f5a5c6c9b825e14f SensioDistributionBundle 868d8db9ca3ae41d5d6e74f3db708eb5970bc478 SensioGeneratorBundle 5d78a4b1398aaa11b2965dd6772abb1865977a32 -AsseticBundle d07327d1ed07b004b145774798b29b09a00e60ff \ No newline at end of file +AsseticBundle bf7ee477c1192cb8f7e27697be0b5cd263b9015d \ No newline at end of file From ddd250b81ba7fe1147fc7b9ea77e6fce29f30fa5 Mon Sep 17 00:00:00 2001 From: Fabien Potencier Date: Mon, 4 Jul 2011 22:45:14 +0200 Subject: [PATCH 221/899] updated vendors --- deps.lock | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/deps.lock b/deps.lock index 66d52b3328..b078c7e523 100644 --- a/deps.lock +++ b/deps.lock @@ -1,9 +1,9 @@ -symfony b93dd7a36bfd7c10434d1acad50b9826fcd365ce +symfony 7d8fb3ddb93610f0c75a25ce2060dd568d36da85 twig 661e9c7ad2820e881c93474f2fbcbe2661fd1970 -monolog 5e651a82b4b03d267da6084720ada0cd398c8d16 +monolog 7e0f4ef70e6f66326b4899d1929ed603f9373f2f doctrine-common 73b61b5078264035894047fb8b2b71ddbc69e941 doctrine-dbal b59ccaf3b24b93846f227253d44084094a3d8b61 -doctrine 6b54cceed71368be7a8a2e6a1b50d9dfc775f0fa +doctrine 438dd9141fba6cc1f4481dd2fdfde01f29dfe543 swiftmailer c53c8c1ab88c78c463ba65086d93d00193957e94 assetic ff2cc17175addf307d40141198968530280693db twig-extensions 6b0cc16934b6e62ef07c8d2e59f9f13ff3193d3d @@ -11,5 +11,5 @@ metadata aa04872c6f0e2b32128b62dd075e8cf97a8d93da SensioFrameworkExtraBundle d36c60b4b1f47081476742d4aae39d4a5c9f4272 JMSSecurityExtraBundle a7717ed531f64fac812634d7f5a5c6c9b825e14f SensioDistributionBundle 868d8db9ca3ae41d5d6e74f3db708eb5970bc478 -SensioGeneratorBundle 5d78a4b1398aaa11b2965dd6772abb1865977a32 +SensioGeneratorBundle 79c2af182331d8e04571694989cec97e6176ae84 AsseticBundle bf7ee477c1192cb8f7e27697be0b5cd263b9015d \ No newline at end of file From 1521bba833bcb1f9716613ee68094126b267021b Mon Sep 17 00:00:00 2001 From: Jordi Boggiano Date: Mon, 4 Jul 2011 22:47:19 +0200 Subject: [PATCH 222/899] Add IntrospectionProcessor for firephp --- app/config/config_dev.yml | 1 + 1 file changed, 1 insertion(+) diff --git a/app/config/config_dev.yml b/app/config/config_dev.yml index 671f52f0db..14e41af643 100644 --- a/app/config/config_dev.yml +++ b/app/config/config_dev.yml @@ -18,6 +18,7 @@ monolog: firephp: type: firephp level: info + processors: [@monolog.processor.introspection] assetic: use_controller: true From 3f39504b6a12fcf050f5dca2db3ba4e54709986c Mon Sep 17 00:00:00 2001 From: Fabien Potencier Date: Tue, 5 Jul 2011 09:59:23 +0200 Subject: [PATCH 223/899] updated Doctrine version to 2.1.0 --- deps | 3 +++ deps.lock | 10 +++++----- 2 files changed, 8 insertions(+), 5 deletions(-) diff --git a/deps b/deps index 9483624310..3f1aae2e92 100644 --- a/deps +++ b/deps @@ -10,12 +10,15 @@ [doctrine-common] git=http://github.com/doctrine/common.git + version=2.1.0 [doctrine-dbal] git=http://github.com/doctrine/dbal.git + version=2.1.0 [doctrine] git=http://github.com/doctrine/doctrine2.git + version=2.1.0 [swiftmailer] git=http://github.com/swiftmailer/swiftmailer.git diff --git a/deps.lock b/deps.lock index b078c7e523..8f9fc276cb 100644 --- a/deps.lock +++ b/deps.lock @@ -1,9 +1,9 @@ -symfony 7d8fb3ddb93610f0c75a25ce2060dd568d36da85 +symfony b9656e62ec441c010fc205e8533de42f3e3d925e twig 661e9c7ad2820e881c93474f2fbcbe2661fd1970 monolog 7e0f4ef70e6f66326b4899d1929ed603f9373f2f -doctrine-common 73b61b5078264035894047fb8b2b71ddbc69e941 -doctrine-dbal b59ccaf3b24b93846f227253d44084094a3d8b61 -doctrine 438dd9141fba6cc1f4481dd2fdfde01f29dfe543 +doctrine-common 40f1bf16e84ddc5291a6a63aa00b9879c40e3500 +doctrine-dbal 0127ee98a4301f2f6e3463c824adc3a3687f901f +doctrine dfdb7353065407afc997956e23f3a44ec3effd72 swiftmailer c53c8c1ab88c78c463ba65086d93d00193957e94 assetic ff2cc17175addf307d40141198968530280693db twig-extensions 6b0cc16934b6e62ef07c8d2e59f9f13ff3193d3d @@ -11,5 +11,5 @@ metadata aa04872c6f0e2b32128b62dd075e8cf97a8d93da SensioFrameworkExtraBundle d36c60b4b1f47081476742d4aae39d4a5c9f4272 JMSSecurityExtraBundle a7717ed531f64fac812634d7f5a5c6c9b825e14f SensioDistributionBundle 868d8db9ca3ae41d5d6e74f3db708eb5970bc478 -SensioGeneratorBundle 79c2af182331d8e04571694989cec97e6176ae84 +SensioGeneratorBundle a3804aa0d3ca6574069670cd77ed84ef1976129f AsseticBundle bf7ee477c1192cb8f7e27697be0b5cd263b9015d \ No newline at end of file From 10b8ddf1ff49238ae2c046e2f6d54b88f536e5ff Mon Sep 17 00:00:00 2001 From: Fabien Potencier Date: Tue, 5 Jul 2011 14:20:27 +0200 Subject: [PATCH 224/899] fixed intl functions when intl is not enabled --- app/autoload.php | 11 ++++++++--- 1 file changed, 8 insertions(+), 3 deletions(-) diff --git a/app/autoload.php b/app/autoload.php index d5abd9aa40..64ba187734 100644 --- a/app/autoload.php +++ b/app/autoload.php @@ -19,9 +19,14 @@ 'Twig_Extensions_' => __DIR__.'/../vendor/twig-extensions/lib', 'Twig_' => __DIR__.'/../vendor/twig/lib', )); -$loader->registerPrefixFallbacks(array( - __DIR__.'/../vendor/symfony/src/Symfony/Component/Locale/Resources/stubs', -)); + +// intl +if (!function_exists('intl_get_error_code')) { + require_once __DIR__.'/../vendor/symfony/src/Symfony/Component/Locale/Resources/stubs/functions.php'; + + $loader->registerPrefixFallbacks(array(__DIR__.'/../vendor/symfony/src/Symfony/Component/Locale/Resources/stubs')); +} + $loader->registerNamespaceFallbacks(array( __DIR__.'/../src', )); From 1e33f4966521dda7e6bf0f4692c846d55ead80d2 Mon Sep 17 00:00:00 2001 From: Fabien Potencier Date: Tue, 5 Jul 2011 14:25:16 +0200 Subject: [PATCH 225/899] updated vendors --- deps.lock | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/deps.lock b/deps.lock index 8f9fc276cb..3c10be99d9 100644 --- a/deps.lock +++ b/deps.lock @@ -1,4 +1,4 @@ -symfony b9656e62ec441c010fc205e8533de42f3e3d925e +symfony 8a1fe408298681fbaf30e06ca3c23bd8e117a782 twig 661e9c7ad2820e881c93474f2fbcbe2661fd1970 monolog 7e0f4ef70e6f66326b4899d1929ed603f9373f2f doctrine-common 40f1bf16e84ddc5291a6a63aa00b9879c40e3500 From 663a24a996fe0348649a31d09af598990b302191 Mon Sep 17 00:00:00 2001 From: Christophe Coevoet Date: Wed, 6 Jul 2011 16:35:37 +0200 Subject: [PATCH 226/899] Removed the processor for the firephp handler as the way to configure them changed --- app/config/config_dev.yml | 1 - 1 file changed, 1 deletion(-) diff --git a/app/config/config_dev.yml b/app/config/config_dev.yml index 14e41af643..671f52f0db 100644 --- a/app/config/config_dev.yml +++ b/app/config/config_dev.yml @@ -18,7 +18,6 @@ monolog: firephp: type: firephp level: info - processors: [@monolog.processor.introspection] assetic: use_controller: true From 7a46d8ebd3456c8c953d92ffa1d02aba13dd3ca9 Mon Sep 17 00:00:00 2001 From: Fabien Potencier Date: Wed, 6 Jul 2011 17:51:32 +0200 Subject: [PATCH 227/899] updated vendors --- deps.lock | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/deps.lock b/deps.lock index 3c10be99d9..cc80893c20 100644 --- a/deps.lock +++ b/deps.lock @@ -1,6 +1,6 @@ -symfony 8a1fe408298681fbaf30e06ca3c23bd8e117a782 +symfony 498f72ce9c18397cddaaa63a37f56bf376abe1b5 twig 661e9c7ad2820e881c93474f2fbcbe2661fd1970 -monolog 7e0f4ef70e6f66326b4899d1929ed603f9373f2f +monolog cf247ca0ac8dc11a4172d39cebdc3b1f711b942b doctrine-common 40f1bf16e84ddc5291a6a63aa00b9879c40e3500 doctrine-dbal 0127ee98a4301f2f6e3463c824adc3a3687f901f doctrine dfdb7353065407afc997956e23f3a44ec3effd72 @@ -8,8 +8,8 @@ swiftmailer c53c8c1ab88c78c463ba65086d93d00193957e94 assetic ff2cc17175addf307d40141198968530280693db twig-extensions 6b0cc16934b6e62ef07c8d2e59f9f13ff3193d3d metadata aa04872c6f0e2b32128b62dd075e8cf97a8d93da -SensioFrameworkExtraBundle d36c60b4b1f47081476742d4aae39d4a5c9f4272 -JMSSecurityExtraBundle a7717ed531f64fac812634d7f5a5c6c9b825e14f +SensioFrameworkExtraBundle 4202abea19fd143434be4cb276da5b3811bd60d5 +JMSSecurityExtraBundle 936892c9735f76037393639f1410773715bf403c SensioDistributionBundle 868d8db9ca3ae41d5d6e74f3db708eb5970bc478 SensioGeneratorBundle a3804aa0d3ca6574069670cd77ed84ef1976129f AsseticBundle bf7ee477c1192cb8f7e27697be0b5cd263b9015d \ No newline at end of file From cf80be6ced4678140e1650a82f000780894e0366 Mon Sep 17 00:00:00 2001 From: Fabien Potencier Date: Wed, 6 Jul 2011 17:59:09 +0200 Subject: [PATCH 228/899] updated vendors --- deps.lock | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/deps.lock b/deps.lock index cc80893c20..a7a2ab896c 100644 --- a/deps.lock +++ b/deps.lock @@ -10,6 +10,6 @@ twig-extensions 6b0cc16934b6e62ef07c8d2e59f9f13ff3193d3d metadata aa04872c6f0e2b32128b62dd075e8cf97a8d93da SensioFrameworkExtraBundle 4202abea19fd143434be4cb276da5b3811bd60d5 JMSSecurityExtraBundle 936892c9735f76037393639f1410773715bf403c -SensioDistributionBundle 868d8db9ca3ae41d5d6e74f3db708eb5970bc478 +SensioDistributionBundle 03cc2ae87becc98c368438a3d14f2b4954be06f7 SensioGeneratorBundle a3804aa0d3ca6574069670cd77ed84ef1976129f AsseticBundle bf7ee477c1192cb8f7e27697be0b5cd263b9015d \ No newline at end of file From 0188cb7452efaf64f067f9b63e791e7ad7a559f4 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Lenar=20L=C3=B5hmus?= Date: Wed, 6 Jul 2011 14:42:27 -0700 Subject: [PATCH 229/899] Trim ini values Fixes symfony/symfony#1562 --- bin/vendors | 2 ++ 1 file changed, 2 insertions(+) mode change 100755 => 100644 bin/vendors diff --git a/bin/vendors b/bin/vendors old mode 100755 new mode 100644 index 2021ec4e02..186e0aa83c --- a/bin/vendors +++ b/bin/vendors @@ -66,6 +66,8 @@ if ('install' === $command && file_exists($rootDir.'/deps.lock')) { $newversions = array(); $deps = parse_ini_file($rootDir.'/deps', true, INI_SCANNER_RAW); foreach ($deps as $name => $dep) { + $dep = array_map('trim', $dep); + // revision if (isset($versions[$name])) { $rev = $versions[$name]; From f9623a77d95909c26442d34f47081b58bc5bc5c2 Mon Sep 17 00:00:00 2001 From: Fabien Potencier Date: Thu, 7 Jul 2011 07:43:36 +0200 Subject: [PATCH 230/899] reverted mode change from previous merge --- bin/vendors | 0 1 file changed, 0 insertions(+), 0 deletions(-) mode change 100644 => 100755 bin/vendors diff --git a/bin/vendors b/bin/vendors old mode 100644 new mode 100755 From 5dbcddd3185b8d4645a81768ca7ccd2c7bd5286a Mon Sep 17 00:00:00 2001 From: Ryan Weaver Date: Thu, 7 Jul 2011 10:16:55 -0500 Subject: [PATCH 231/899] Refactoring the README to be very friendly to people after they've downloaded Symfony I also renamed the file to .md, because GitHub doesn't render .rst very well, and I'm not aware of any place where we actually compile this README file using sphinx. I think this is just a pragmatic thing to do - if you look at the current README.rst on GitHub, some of the "code" blocks aren't processing the line breaks as desired. --- README.md | 114 +++++++++++++++++++++++++++++++++++++++++++++++++++++ README.rst | 82 -------------------------------------- 2 files changed, 114 insertions(+), 82 deletions(-) create mode 100644 README.md delete mode 100644 README.rst diff --git a/README.md b/README.md new file mode 100644 index 0000000000..586ddce1f3 --- /dev/null +++ b/README.md @@ -0,0 +1,114 @@ +Symfony Standard Edition +======================== + +Welcome to the Symfony Standard Edition - a fully-functionality Symfony2 +application that you can use as the skeleton for your new app. + +This document contains information on how to download and start using Symfony. +For a more detailed explanation, see the Installation chapter of the Symfony +Documentation. + +1) Download the Standard Edition +-------------------------------- + +If you've already downloaded the standard edition, and unpacked it somewhere +within your web root directory, then move on to the "Installation" section. + +To download the standard edition, you have two options: + +### Download an archive file (*recommended*) + +The easiest way to get started is to download an archive with vendors included +(http://symfony.com/download). Unpack it somewhere under your web server root +directory and you're done. + +### Clone the git Repository + +We highly recommend you that you download the packaged version of this +distribution. If you still want to use Git, you are on your own. + +Run the following commands: + + git clone http://github.com/symfony/symfony-standard.git + cd symfony-standard + rm -rf .git + +2) Installation +--------------- + +Once you've downloaded the standard edition, installation is easy, and basically +involves making sure your system is ready for Symfony. + +### a) Check your System Configuration + +Before you begin, make sure that your local system is properly configured +for Symfony. To do this, execute the following: + + php app/check.php + +If you get any warnings or recommendations, fix these now before moving on. + +### b) Install the Vendor Libraries + +If you downloaded the archive "without vendors" or installed via git, then +you need to download all of the necessary vendor libraries. If you're not +sure if you need to do this, check to see if you have a ``vendor/`` directory. +If you don't, or if that directory is empty, run the following: + + php bin/vendors install + +Note that you **must** have git installed to run this command. If you don't, +either install it or download Symfony with the vendor libraries already included. + +### c) Access the Application via the Browser + +Congratulations! You're now ready to use Symfony. If you've unzipped Symfony +in the web root of your computer, then you should be able to access the +web version of the Symfony requirements check via: + + http://localhost/Symfony/web/config.php + +If everything look good, click the "Bypass configuration and go to the Welcome page" +link to load up your first Symfony page. + +You can also use a web-based configurator by click on the "Configure your +Symfony Application online" link of the ``config.php`` page. + +To see a real-live Symfony page in action, access the following page: + + web/app_dev.php/demo/hello/Fabien + +3) Learn about Symfony! +----------------------- + +This distribution is meant to be the starting point for your application, +but it also contains some sample code that you can learn from and play with. + +A great way to start learning Symfony is via the Quick Tour (http://symfony.com/doc/current/quick_tour/the_big_picture.html), +which will take you through all the basic features of Symfony2 and test pages +that are available in the standard edition. + +Once you're feeling good, you can move onto reading the official +Symfony2 book (http://symfony.com/doc/current/). + +Using this Edition as the Base of your Application +-------------------------------------------------- + +Since the standard edition is fully-configured and comes with some examples, +you'll need to make a few changes before using it to build your application. + +The distribution is configured with the following defaults: + +* Twig is the only configured template engine; +* Doctrine ORM/DBAL is configured; +* Swiftmailer is configured; +* Annotations for everything are enabled. + +A default bundle, ``AcmeDemoBundle``, shows you Symfony2 in action. After +playing with it, you can remove it by following these steps: + +* delete the ``src/Acme`` directory; +* remove the routing entries referencing AcmeBundle in ``app/config/routing_dev.yml``; +* remove the AcmeBundle from the registered bundles in ``app/AppKernel.php``; + +Enjoy! diff --git a/README.rst b/README.rst deleted file mode 100644 index 6568fa5ece..0000000000 --- a/README.rst +++ /dev/null @@ -1,82 +0,0 @@ -Symfony Standard Edition -======================== - -What's inside? --------------- - -Symfony Standard Edition comes pre-configured with the following bundles: - -* FrameworkBundle -* SensioFrameworkExtraBundle -* DoctrineBundle -* TwigBundle -* SwiftmailerBundle -* MonologBundle -* AsseticBundle -* JMSSecurityExtraBundle -* WebProfilerBundle (in dev/test env) -* SensioDistributionBundle (in dev/test env) -* SensioGeneratorBundle (in dev/test env) -* AcmeDemoBundle (in dev/test env) - -Installation from an Archive ----------------------------- - -The easiest way to get started is to download an archive with vendors included -(http://symfony.com/download). Unpack it somewhere under your web server root -directory and you're done. - -If you have downloaded an archive without the vendors, you must have ``git`` -available to install the vendors: - - php bin/vendors install - -Installation from Git ---------------------- - -We highly recommend you that you download the packaged version of this -distribution. If you still want to use Git, you are on your own. - -Run the following commands: - - git clone http://github.com/symfony/symfony-standard.git - cd symfony-standard - rm -rf .git - php bin/vendors install - -.. note:: - - Symfony SE does/can not use git submodules as you should not keep the - `.git` directory. - -Configuration -------------- - -Check that everything is working fine by going to the ``web/config.php`` page -in a browser and follow the instructions. - -The distribution is configured with the following defaults: - -* Twig is the only configured template engine; -* Doctrine ORM/DBAL is configured; -* Swiftmailer is configured; -* Annotations for everything are enabled. - -A default bundle, ``AcmeDemoBundle``, shows you Symfony2 in action. After -playing with it, you can remove it by following these steps: - -* delete the ``src/Acme`` directory; -* remove the routing entries referencing AcmeBundle in ``app/config/routing_dev.yml``; -* remove the AcmeBundle from the registered bundles in ``app/AppKernel.php``; - -Configure the distribution by editing ``app/config/parameters.ini`` or by -accessing ``web/config.php`` in a browser. - -A simple controller is configured at ``/hello/{name}``. Access it via -``web/app_dev.php/demo/hello/Fabien``. - -If you want to use the CLI, a console application is available at -``app/console``. Check first that your PHP is correctly configured for the CLI -by running ``app/check.php``. - -Enjoy! From a171f177850a8ef9f74489de5aa90f5217040da3 Mon Sep 17 00:00:00 2001 From: Dustin Dobervich Date: Thu, 7 Jul 2011 08:59:39 -0700 Subject: [PATCH 232/899] Fixed grammar error in README.md --- README.md | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/README.md b/README.md index 586ddce1f3..9a72047357 100644 --- a/README.md +++ b/README.md @@ -1,7 +1,7 @@ Symfony Standard Edition ======================== -Welcome to the Symfony Standard Edition - a fully-functionality Symfony2 +Welcome to the Symfony Standard Edition - a fully-functional Symfony2 application that you can use as the skeleton for your new app. This document contains information on how to download and start using Symfony. From c719f30ebdec712b4cffcdab202609e9ff41c031 Mon Sep 17 00:00:00 2001 From: Evan Kaufman Date: Thu, 7 Jul 2011 09:28:46 -0700 Subject: [PATCH 233/899] Catch ini parsing errors for deps file, exit w useful error message --- bin/vendors | 3 +++ 1 file changed, 3 insertions(+) mode change 100755 => 100644 bin/vendors diff --git a/bin/vendors b/bin/vendors old mode 100755 new mode 100644 index 186e0aa83c..719216d1a2 --- a/bin/vendors +++ b/bin/vendors @@ -65,6 +65,9 @@ if ('install' === $command && file_exists($rootDir.'/deps.lock')) { $newversions = array(); $deps = parse_ini_file($rootDir.'/deps', true, INI_SCANNER_RAW); +if (false === $deps) { + exit("The deps file is not valid ini syntax. Perhaps missing a trailing newline?\n"); +} foreach ($deps as $name => $dep) { $dep = array_map('trim', $dep); From 154a339b6815cf35529ddbb6cdd8355280f3150e Mon Sep 17 00:00:00 2001 From: Fabien Potencier Date: Thu, 7 Jul 2011 19:04:44 +0200 Subject: [PATCH 234/899] updated Monolog to 1.0.0 --- bin/vendors | 0 deps | 1 + deps.lock | 6 +++--- 3 files changed, 4 insertions(+), 3 deletions(-) mode change 100644 => 100755 bin/vendors diff --git a/bin/vendors b/bin/vendors old mode 100644 new mode 100755 diff --git a/deps b/deps index 3f1aae2e92..c61e3ca2ec 100644 --- a/deps +++ b/deps @@ -7,6 +7,7 @@ [monolog] git=http://github.com/Seldaek/monolog.git + version=1.0.0 [doctrine-common] git=http://github.com/doctrine/common.git diff --git a/deps.lock b/deps.lock index a7a2ab896c..988e19467c 100644 --- a/deps.lock +++ b/deps.lock @@ -1,6 +1,6 @@ -symfony 498f72ce9c18397cddaaa63a37f56bf376abe1b5 +symfony 28be19461b92d65642b79c87cf97b90406b2b0e8 twig 661e9c7ad2820e881c93474f2fbcbe2661fd1970 -monolog cf247ca0ac8dc11a4172d39cebdc3b1f711b942b +monolog 433b98d4218c181bae01865901aac045585e8a1a doctrine-common 40f1bf16e84ddc5291a6a63aa00b9879c40e3500 doctrine-dbal 0127ee98a4301f2f6e3463c824adc3a3687f901f doctrine dfdb7353065407afc997956e23f3a44ec3effd72 @@ -11,5 +11,5 @@ metadata aa04872c6f0e2b32128b62dd075e8cf97a8d93da SensioFrameworkExtraBundle 4202abea19fd143434be4cb276da5b3811bd60d5 JMSSecurityExtraBundle 936892c9735f76037393639f1410773715bf403c SensioDistributionBundle 03cc2ae87becc98c368438a3d14f2b4954be06f7 -SensioGeneratorBundle a3804aa0d3ca6574069670cd77ed84ef1976129f +SensioGeneratorBundle 39a54993fc26a6e29ea15877463d7305e93ba2e3 AsseticBundle bf7ee477c1192cb8f7e27697be0b5cd263b9015d \ No newline at end of file From c7ea941b84e2e4c0e06216cd2d921c5657979f2a Mon Sep 17 00:00:00 2001 From: Ryan Weaver Date: Thu, 7 Jul 2011 13:26:50 -0500 Subject: [PATCH 235/899] [README] More modifications to the README chapter - closer proofreading --- README.md | 62 +++++++++++++++++++++++++++++++++++++++++-------------- 1 file changed, 47 insertions(+), 15 deletions(-) diff --git a/README.md b/README.md index 9a72047357..6b711fd6cd 100644 --- a/README.md +++ b/README.md @@ -2,11 +2,13 @@ Symfony Standard Edition ======================== Welcome to the Symfony Standard Edition - a fully-functional Symfony2 -application that you can use as the skeleton for your new app. +application that you can use as the skeleton for your new app. If you want +to learn more about the features included, see the "What's Inside?" section. This document contains information on how to download and start using Symfony. -For a more detailed explanation, see the Installation chapter of the Symfony -Documentation. +For a more detailed explanation, see the +[Installation chapter](http://symfony.com/doc/current/book/installation.html) +of the Symfony Documentation. 1) Download the Standard Edition -------------------------------- @@ -18,14 +20,15 @@ To download the standard edition, you have two options: ### Download an archive file (*recommended*) -The easiest way to get started is to download an archive with vendors included +The easiest way to get started is to download an archive of the standard edition (http://symfony.com/download). Unpack it somewhere under your web server root -directory and you're done. +directory and you're done. The web root is wherever your web server (e.g. Apache) +looks when you access `http://localhost` in a browser. ### Clone the git Repository -We highly recommend you that you download the packaged version of this -distribution. If you still want to use Git, you are on your own. +We highly recommend that you download the packaged version of this distribution. +But if you still want to use Git, you are on your own. Run the following commands: @@ -57,8 +60,9 @@ If you don't, or if that directory is empty, run the following: php bin/vendors install -Note that you **must** have git installed to run this command. If you don't, -either install it or download Symfony with the vendor libraries already included. +Note that you **must** have git installed and be able to execute the `git` +command to execute this script. If you don't have git available, either install +it or download Symfony with the vendor libraries already included. ### c) Access the Application via the Browser @@ -68,10 +72,10 @@ web version of the Symfony requirements check via: http://localhost/Symfony/web/config.php -If everything look good, click the "Bypass configuration and go to the Welcome page" +If everything looks good, click the "Bypass configuration and go to the Welcome page" link to load up your first Symfony page. -You can also use a web-based configurator by click on the "Configure your +You can also use a web-based configurator by clicking on the "Configure your Symfony Application online" link of the ``config.php`` page. To see a real-live Symfony page in action, access the following page: @@ -84,12 +88,12 @@ To see a real-live Symfony page in action, access the following page: This distribution is meant to be the starting point for your application, but it also contains some sample code that you can learn from and play with. -A great way to start learning Symfony is via the Quick Tour (http://symfony.com/doc/current/quick_tour/the_big_picture.html), -which will take you through all the basic features of Symfony2 and test pages -that are available in the standard edition. +A great way to start learning Symfony is via the [Quick Tour](http://symfony.com/doc/current/quick_tour/the_big_picture.html), +which will take you through all the basic features of Symfony2 and the test +pages that are available in the standard edition. Once you're feeling good, you can move onto reading the official -Symfony2 book (http://symfony.com/doc/current/). +[Symfony2 book](http://symfony.com/doc/current/). Using this Edition as the Base of your Application -------------------------------------------------- @@ -111,4 +115,32 @@ playing with it, you can remove it by following these steps: * remove the routing entries referencing AcmeBundle in ``app/config/routing_dev.yml``; * remove the AcmeBundle from the registered bundles in ``app/AppKernel.php``; + +What's inside? +--------------- +The Symfony Standard Edition comes pre-configured with the following bundles: + +* **FrameworkBundle** - The core Symfony framework bundle +* **SensioFrameworkExtraBundle** - Adds several enhancements, including template + and routing annotation capability ([documentation](http://symfony.com/doc/current/bundles/SensioFrameworkExtraBundle/index.html)) +* **DoctrineBundle** - Adds support for the Doctrine ORM + ([documentation](http://symfony.com/doc/current/book/doctrine.html)) +* **TwigBundle** - Adds support for the Twig templating engine + ([documentation](http://symfony.com/doc/current/book/templating.html)) +* **SwiftmailerBundle** - Adds support for Swiftmailer, a library for sending emails + ([documentation](http://symfony.com/doc/2.0/cookbook/email.html)) +* **MonologBundle** - Adds support for Monolog, a logging library + ([documentation](http://symfony.com/doc/2.0/cookbook/logging/monolog.html)) +* **AsseticBundle** - Adds support for Assetic, an asset processing library + ([documentation](http://symfony.com/doc/2.0/cookbook/assetic/asset_management.html)) +* **JMSSecurityExtraBundle** - Allows security to be added via annotations + ([documentation](http://symfony.com/doc/current/bundles/JMSSecurityExtraBundle/index.html)) +* **WebProfilerBundle** (in dev/test env) - Adds profiling functionality and + the web debug toolbar +* **SensioDistributionBundle** (in dev/test env) - Adds functionality for configuring + and working with Symfony distributions +* **SensioGeneratorBundle** (in dev/test env) - Adds code generation capabilities + ([documentation](http://symfony.com/doc/current/bundles/SensioGeneratorBundle/index.html)) +* **AcmeDemoBundle** (in dev/test env) - A demo bundle with some example code + Enjoy! From 1d00f6e8489776fea24cb614bf6823eb95fe1c85 Mon Sep 17 00:00:00 2001 From: Ryan Weaver Date: Fri, 8 Jul 2011 07:06:49 -0500 Subject: [PATCH 236/899] [README] Adding missing SecurityBundle mention per @stof --- README.md | 2 ++ 1 file changed, 2 insertions(+) diff --git a/README.md b/README.md index 6b711fd6cd..75d133da14 100644 --- a/README.md +++ b/README.md @@ -127,6 +127,8 @@ The Symfony Standard Edition comes pre-configured with the following bundles: ([documentation](http://symfony.com/doc/current/book/doctrine.html)) * **TwigBundle** - Adds support for the Twig templating engine ([documentation](http://symfony.com/doc/current/book/templating.html)) +* **SecurityBundle** - Adds security by integrating Symfony's security component + ([documentation](http://symfony.com/doc/current/book/security.html)) * **SwiftmailerBundle** - Adds support for Swiftmailer, a library for sending emails ([documentation](http://symfony.com/doc/2.0/cookbook/email.html)) * **MonologBundle** - Adds support for Monolog, a logging library From b28f4310dc7957ce839b3d4e7ccdb9f98dfb99d6 Mon Sep 17 00:00:00 2001 From: Luis Cordova Date: Fri, 8 Jul 2011 12:43:57 -0400 Subject: [PATCH 237/899] * fixed misleading check on SQLite3 or PDO_SQLite extensions --- app/check.php | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/app/check.php b/app/check.php index d41498c754..fcc9eca500 100644 --- a/app/check.php +++ b/app/check.php @@ -28,7 +28,7 @@ check(is_writable(__DIR__.'/../app/cache'), sprintf('Checking that app/cache/ directory is writable'), 'Change the permissions of the app/cache/ directory so that the web server can write in it', true); check(is_writable(__DIR__.'/../app/logs'), sprintf('Checking that the app/logs/ directory is writable'), 'Change the permissions of the app/logs/ directory so that the web server can write in it', true); check(function_exists('json_encode'), 'Checking that the json_encode() is available', 'Install and enable the json extension', true); -check(class_exists('SQLite3') || in_array('sqlite', PDO::getAvailableDrivers()), 'Install and enable the SQLite3 or PDO_SQLite extension.', true); +check(class_exists('SQLite3') || in_array('sqlite', PDO::getAvailableDrivers()), 'Checking that the SQLite3 or PDO_SQLite extension is available', 'Install and enable the SQLite3 or PDO_SQLite extension.', true); // warnings echo_title("Optional checks"); From 6a00026829fc3ded4af2e92c99a6e5c4dac17c57 Mon Sep 17 00:00:00 2001 From: Carlossg Date: Sun, 10 Jul 2011 03:38:36 +0200 Subject: [PATCH 238/899] fix form name remove guessing --- src/Acme/DemoBundle/Form/ContactType.php | 5 +++++ 1 file changed, 5 insertions(+) diff --git a/src/Acme/DemoBundle/Form/ContactType.php b/src/Acme/DemoBundle/Form/ContactType.php index 39959378fc..0206bcc0c8 100644 --- a/src/Acme/DemoBundle/Form/ContactType.php +++ b/src/Acme/DemoBundle/Form/ContactType.php @@ -12,4 +12,9 @@ public function buildForm(FormBuilder $builder, array $options) $builder->add('email', 'email'); $builder->add('message', 'textarea'); } + + public function getName() + { + return 'contact'; + } } From 1b92639c5d4fe710d3353a53e06d0c11af21641a Mon Sep 17 00:00:00 2001 From: Julien Brochet Date: Sun, 10 Jul 2011 19:54:42 +0200 Subject: [PATCH 239/899] updated assetic to v1.0.0 --- deps | 1 + deps.lock | 4 ++-- 2 files changed, 3 insertions(+), 2 deletions(-) diff --git a/deps b/deps index c61e3ca2ec..5cb0faae47 100644 --- a/deps +++ b/deps @@ -27,6 +27,7 @@ [assetic] git=http://github.com/kriswallsmith/assetic.git + version=v1.0.0 [twig-extensions] git=http://github.com/fabpot/Twig-extensions.git diff --git a/deps.lock b/deps.lock index 988e19467c..62c4fcc5c9 100644 --- a/deps.lock +++ b/deps.lock @@ -1,11 +1,11 @@ -symfony 28be19461b92d65642b79c87cf97b90406b2b0e8 +symfony 29460becde710c19e7082267ed2bb9989a7981bb twig 661e9c7ad2820e881c93474f2fbcbe2661fd1970 monolog 433b98d4218c181bae01865901aac045585e8a1a doctrine-common 40f1bf16e84ddc5291a6a63aa00b9879c40e3500 doctrine-dbal 0127ee98a4301f2f6e3463c824adc3a3687f901f doctrine dfdb7353065407afc997956e23f3a44ec3effd72 swiftmailer c53c8c1ab88c78c463ba65086d93d00193957e94 -assetic ff2cc17175addf307d40141198968530280693db +assetic 6e535b0e65d0d0d731ae3a620e3a3c6d34596d39 twig-extensions 6b0cc16934b6e62ef07c8d2e59f9f13ff3193d3d metadata aa04872c6f0e2b32128b62dd075e8cf97a8d93da SensioFrameworkExtraBundle 4202abea19fd143434be4cb276da5b3811bd60d5 From fa24f6915a550ece64480e115ba71dbdd01edb6d Mon Sep 17 00:00:00 2001 From: Julien Brochet Date: Sun, 10 Jul 2011 20:29:27 +0200 Subject: [PATCH 240/899] updated AsseticBundle to v1.0.0RC1 --- deps | 1 + deps.lock | 4 ++-- 2 files changed, 3 insertions(+), 2 deletions(-) diff --git a/deps b/deps index 5cb0faae47..802b8cedf4 100644 --- a/deps +++ b/deps @@ -54,3 +54,4 @@ [AsseticBundle] git=http://github.com/symfony/AsseticBundle.git target=/bundles/Symfony/Bundle/AsseticBundle + version=v1.0.0RC1 diff --git a/deps.lock b/deps.lock index 62c4fcc5c9..9c97af3910 100644 --- a/deps.lock +++ b/deps.lock @@ -1,4 +1,4 @@ -symfony 29460becde710c19e7082267ed2bb9989a7981bb +symfony 1a5b14d49d799b9e47c827a82d2e1feb3c8cde12 twig 661e9c7ad2820e881c93474f2fbcbe2661fd1970 monolog 433b98d4218c181bae01865901aac045585e8a1a doctrine-common 40f1bf16e84ddc5291a6a63aa00b9879c40e3500 @@ -12,4 +12,4 @@ SensioFrameworkExtraBundle 4202abea19fd143434be4cb276da5b3811bd60d5 JMSSecurityExtraBundle 936892c9735f76037393639f1410773715bf403c SensioDistributionBundle 03cc2ae87becc98c368438a3d14f2b4954be06f7 SensioGeneratorBundle 39a54993fc26a6e29ea15877463d7305e93ba2e3 -AsseticBundle bf7ee477c1192cb8f7e27697be0b5cd263b9015d \ No newline at end of file +AsseticBundle 61bc7f32c663a9c7be53ed761a574a1509f74d7e \ No newline at end of file From 7d110e035f5d8600e63e661ab2263282544f510b Mon Sep 17 00:00:00 2001 From: Johannes Date: Sun, 10 Jul 2011 11:44:06 -0700 Subject: [PATCH 241/899] updated version --- deps | 1 + 1 file changed, 1 insertion(+) diff --git a/deps b/deps index c61e3ca2ec..f2e783ce38 100644 --- a/deps +++ b/deps @@ -33,6 +33,7 @@ [metadata] git=http://github.com/schmittjoh/metadata.git + version=1.0.0 [SensioFrameworkExtraBundle] git=http://github.com/sensio/SensioFrameworkExtraBundle.git From 97dcbcea6698f78eca5449a6607bec0ebb298668 Mon Sep 17 00:00:00 2001 From: Fabien Potencier Date: Sun, 10 Jul 2011 22:11:23 +0200 Subject: [PATCH 242/899] updated vendors --- deps.lock | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/deps.lock b/deps.lock index 9c97af3910..db0a991090 100644 --- a/deps.lock +++ b/deps.lock @@ -1,4 +1,4 @@ -symfony 1a5b14d49d799b9e47c827a82d2e1feb3c8cde12 +symfony 9301ad00fd839f0ebb40ecb933030226325fdcd4 twig 661e9c7ad2820e881c93474f2fbcbe2661fd1970 monolog 433b98d4218c181bae01865901aac045585e8a1a doctrine-common 40f1bf16e84ddc5291a6a63aa00b9879c40e3500 @@ -7,9 +7,9 @@ doctrine dfdb7353065407afc997956e23f3a44ec3effd72 swiftmailer c53c8c1ab88c78c463ba65086d93d00193957e94 assetic 6e535b0e65d0d0d731ae3a620e3a3c6d34596d39 twig-extensions 6b0cc16934b6e62ef07c8d2e59f9f13ff3193d3d -metadata aa04872c6f0e2b32128b62dd075e8cf97a8d93da +metadata 8717ad2a5689480765d9ffafe925cd8a2457e582 SensioFrameworkExtraBundle 4202abea19fd143434be4cb276da5b3811bd60d5 JMSSecurityExtraBundle 936892c9735f76037393639f1410773715bf403c SensioDistributionBundle 03cc2ae87becc98c368438a3d14f2b4954be06f7 -SensioGeneratorBundle 39a54993fc26a6e29ea15877463d7305e93ba2e3 +SensioGeneratorBundle e45326b2e2f3b685baf23932742bd901b4aed706 AsseticBundle 61bc7f32c663a9c7be53ed761a574a1509f74d7e \ No newline at end of file From e4ba08cf78b39747dd719cc7fdbb3a536fac7fe7 Mon Sep 17 00:00:00 2001 From: Fabien Potencier Date: Tue, 12 Jul 2011 15:45:20 +0200 Subject: [PATCH 243/899] updated vendors --- deps.lock | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/deps.lock b/deps.lock index db0a991090..39b034e5f2 100644 --- a/deps.lock +++ b/deps.lock @@ -1,4 +1,4 @@ -symfony 9301ad00fd839f0ebb40ecb933030226325fdcd4 +symfony 51dd916cc8f11e421dc2f068c2c9e3493afa521b twig 661e9c7ad2820e881c93474f2fbcbe2661fd1970 monolog 433b98d4218c181bae01865901aac045585e8a1a doctrine-common 40f1bf16e84ddc5291a6a63aa00b9879c40e3500 @@ -8,8 +8,8 @@ swiftmailer c53c8c1ab88c78c463ba65086d93d00193957e94 assetic 6e535b0e65d0d0d731ae3a620e3a3c6d34596d39 twig-extensions 6b0cc16934b6e62ef07c8d2e59f9f13ff3193d3d metadata 8717ad2a5689480765d9ffafe925cd8a2457e582 -SensioFrameworkExtraBundle 4202abea19fd143434be4cb276da5b3811bd60d5 +SensioFrameworkExtraBundle bced40d4d123f5171f888d6e56bb638b8c2a5e57 JMSSecurityExtraBundle 936892c9735f76037393639f1410773715bf403c SensioDistributionBundle 03cc2ae87becc98c368438a3d14f2b4954be06f7 -SensioGeneratorBundle e45326b2e2f3b685baf23932742bd901b4aed706 +SensioGeneratorBundle 1b59f604c56480b3ac06b0e79742244e958089c0 AsseticBundle 61bc7f32c663a9c7be53ed761a574a1509f74d7e \ No newline at end of file From 52784779d9628b836bd8e044abe6e7d5f314eebf Mon Sep 17 00:00:00 2001 From: Hugo Hamon Date: Thu, 14 Jul 2011 13:05:23 +0200 Subject: [PATCH 244/899] [config] added commented default translator configuration. --- app/config/config.yml | 1 + 1 file changed, 1 insertion(+) diff --git a/app/config/config.yml b/app/config/config.yml index e63f1f9188..d35014329e 100644 --- a/app/config/config.yml +++ b/app/config/config.yml @@ -4,6 +4,7 @@ imports: framework: #esi: ~ + #translator: { fallback: en } secret: %secret% charset: UTF-8 router: { resource: "%kernel.root_dir%/config/routing.yml" } From ac65cfb1a2780bfaf9f9e7d13f3b6d27921fb0a3 Mon Sep 17 00:00:00 2001 From: lenar Date: Fri, 15 Jul 2011 00:36:31 +0300 Subject: [PATCH 245/899] Add a way to easily specify database connection port --- app/config/config.yml | 1 + app/config/parameters.ini | 1 + 2 files changed, 2 insertions(+) diff --git a/app/config/config.yml b/app/config/config.yml index e63f1f9188..c1ebdce6af 100644 --- a/app/config/config.yml +++ b/app/config/config.yml @@ -36,6 +36,7 @@ doctrine: dbal: driver: %database_driver% host: %database_host% + port: %database_port% dbname: %database_name% user: %database_user% password: %database_password% diff --git a/app/config/parameters.ini b/app/config/parameters.ini index 6a295289d3..3628066c4f 100644 --- a/app/config/parameters.ini +++ b/app/config/parameters.ini @@ -4,6 +4,7 @@ [parameters] database_driver = pdo_mysql database_host = localhost + database_port = database_name = symfony database_user = root database_password = From d868bf7d9d2e246ab4efbbffca2bfe4756087aa2 Mon Sep 17 00:00:00 2001 From: Luis Cordova Date: Fri, 8 Jul 2011 14:08:13 -0400 Subject: [PATCH 246/899] * fixed run of web/check.php and app/check.php for cgi and cli --- app/check.php | 9 +++++++-- 1 file changed, 7 insertions(+), 2 deletions(-) diff --git a/app/check.php b/app/check.php index d41498c754..cb603eb6fc 100644 --- a/app/check.php +++ b/app/check.php @@ -54,8 +54,13 @@ $reflector->info(); $output = ob_get_clean(); - preg_match('/^ICU version => (.*)$/m', $output, $matches); - $version = $matches[1]; + if (preg_match('/^ICU version => (.*)$/m', $output, $matches)) { + $version = $matches[1]; + } elseif ( preg_match('/^ICU version <\/td>(.*)<\/td><\/tr>$/m', $output, $matches) ) { + $version = $matches[1]; + } else { + $version = ''; + } } check(version_compare($matches[1], '4.0', '>='), 'Checking that the intl ICU version is at least 4+', 'Upgrade your intl extension with a newer ICU version (4+)', false); From 75da6760759f342c9492a7ff9f78b6be5b5ca7bb Mon Sep 17 00:00:00 2001 From: Fabien Potencier Date: Sat, 16 Jul 2011 08:14:25 +0200 Subject: [PATCH 247/899] tweaked previous merge to match the logic in web/config.php --- app/check.php | 13 ++++--------- web/config.php | 2 +- 2 files changed, 5 insertions(+), 10 deletions(-) diff --git a/app/check.php b/app/check.php index e728199c8a..63ef0283b5 100644 --- a/app/check.php +++ b/app/check.php @@ -52,15 +52,10 @@ ob_start(); $reflector->info(); - $output = ob_get_clean(); - - if (preg_match('/^ICU version => (.*)$/m', $output, $matches)) { - $version = $matches[1]; - } elseif ( preg_match('/^ICU version <\/td>(.*)<\/td><\/tr>$/m', $output, $matches) ) { - $version = $matches[1]; - } else { - $version = ''; - } + $output = strip_tags(ob_get_clean()); + + preg_match('/^ICU version +(?:=> )?(.*)$/m', $output, $matches); + $version = $matches[1]; } check(version_compare($matches[1], '4.0', '>='), 'Checking that the intl ICU version is at least 4+', 'Upgrade your intl extension with a newer ICU version (4+)', false); diff --git a/web/config.php b/web/config.php index c13755ab15..28411a5326 100644 --- a/web/config.php +++ b/web/config.php @@ -87,7 +87,7 @@ $version = $matches[1]; } - if(!version_compare($matches[1], '4.0', '>=')) { + if (!version_compare($matches[1], '4.0', '>=')) { $minorProblems[] = 'Upgrade your intl extension with a newer ICU version (4+).'; } } From 2402eea977c81401b5b5c698671269e120f7e500 Mon Sep 17 00:00:00 2001 From: Fabien Potencier Date: Sun, 17 Jul 2011 16:01:18 +0200 Subject: [PATCH 248/899] updated vendors --- deps | 4 ++-- deps.lock | 6 +++--- 2 files changed, 5 insertions(+), 5 deletions(-) diff --git a/deps b/deps index b799f672de..ec1e0aa2d3 100644 --- a/deps +++ b/deps @@ -3,7 +3,7 @@ [twig] git=http://github.com/fabpot/Twig.git - version=v1.1.0 + version=v1.1.1 [monolog] git=http://github.com/Seldaek/monolog.git @@ -27,7 +27,7 @@ [assetic] git=http://github.com/kriswallsmith/assetic.git - version=v1.0.0 + version=v1.0.1 [twig-extensions] git=http://github.com/fabpot/Twig-extensions.git diff --git a/deps.lock b/deps.lock index 39b034e5f2..b87bba933e 100644 --- a/deps.lock +++ b/deps.lock @@ -1,11 +1,11 @@ -symfony 51dd916cc8f11e421dc2f068c2c9e3493afa521b -twig 661e9c7ad2820e881c93474f2fbcbe2661fd1970 +symfony 23ef6059d7fa36dc964caebb6d77823ba9a24883 +twig 94ac20f1553d945c2c224d19d9d28e85ec14372b monolog 433b98d4218c181bae01865901aac045585e8a1a doctrine-common 40f1bf16e84ddc5291a6a63aa00b9879c40e3500 doctrine-dbal 0127ee98a4301f2f6e3463c824adc3a3687f901f doctrine dfdb7353065407afc997956e23f3a44ec3effd72 swiftmailer c53c8c1ab88c78c463ba65086d93d00193957e94 -assetic 6e535b0e65d0d0d731ae3a620e3a3c6d34596d39 +assetic 3333d371c4511abcdec7bad86e15ac2be3b10f03 twig-extensions 6b0cc16934b6e62ef07c8d2e59f9f13ff3193d3d metadata 8717ad2a5689480765d9ffafe925cd8a2457e582 SensioFrameworkExtraBundle bced40d4d123f5171f888d6e56bb638b8c2a5e57 From 4071c8c349212a167bee32b9bba43e58e5d6a581 Mon Sep 17 00:00:00 2001 From: Fabien Potencier Date: Mon, 18 Jul 2011 15:00:21 +0200 Subject: [PATCH 249/899] updated vendors --- deps.lock | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/deps.lock b/deps.lock index b87bba933e..829ba08399 100644 --- a/deps.lock +++ b/deps.lock @@ -1,4 +1,4 @@ -symfony 23ef6059d7fa36dc964caebb6d77823ba9a24883 +symfony bb452cd7c4e45acc2267645925bb818204b3e5e3 twig 94ac20f1553d945c2c224d19d9d28e85ec14372b monolog 433b98d4218c181bae01865901aac045585e8a1a doctrine-common 40f1bf16e84ddc5291a6a63aa00b9879c40e3500 @@ -10,6 +10,6 @@ twig-extensions 6b0cc16934b6e62ef07c8d2e59f9f13ff3193d3d metadata 8717ad2a5689480765d9ffafe925cd8a2457e582 SensioFrameworkExtraBundle bced40d4d123f5171f888d6e56bb638b8c2a5e57 JMSSecurityExtraBundle 936892c9735f76037393639f1410773715bf403c -SensioDistributionBundle 03cc2ae87becc98c368438a3d14f2b4954be06f7 +SensioDistributionBundle 5b6fd1191f11abf0da7d028c159d94b3d30bff87 SensioGeneratorBundle 1b59f604c56480b3ac06b0e79742244e958089c0 AsseticBundle 61bc7f32c663a9c7be53ed761a574a1509f74d7e \ No newline at end of file From d1eeb62e929c856ec40b943ab2948104f8a86440 Mon Sep 17 00:00:00 2001 From: Fabien Potencier Date: Tue, 19 Jul 2011 07:16:52 +0200 Subject: [PATCH 250/899] fixes typo --- app/check.php | 2 +- web/config.php | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/app/check.php b/app/check.php index 63ef0283b5..6b4b25fc4b 100644 --- a/app/check.php +++ b/app/check.php @@ -58,7 +58,7 @@ $version = $matches[1]; } - check(version_compare($matches[1], '4.0', '>='), 'Checking that the intl ICU version is at least 4+', 'Upgrade your intl extension with a newer ICU version (4+)', false); + check(version_compare($version, '4.0', '>='), 'Checking that the intl ICU version is at least 4+', 'Upgrade your intl extension with a newer ICU version (4+)', false); } $accelerator = diff --git a/web/config.php b/web/config.php index 28411a5326..0899e40feb 100644 --- a/web/config.php +++ b/web/config.php @@ -87,7 +87,7 @@ $version = $matches[1]; } - if (!version_compare($matches[1], '4.0', '>=')) { + if (!version_compare($version, '4.0', '>=')) { $minorProblems[] = 'Upgrade your intl extension with a newer ICU version (4+).'; } } From e67b49c860d171c376689e5272b9531663661873 Mon Sep 17 00:00:00 2001 From: Jeremy Mikola Date: Wed, 20 Jul 2011 08:38:22 -0700 Subject: [PATCH 251/899] Check for SYMFONY_ENV in app/console before defaulting to "dev" environment Borrowed from Rails. --- app/console | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) mode change 100755 => 100644 app/console diff --git a/app/console b/app/console old mode 100755 new mode 100644 index 32104712e5..281acd4bca --- a/app/console +++ b/app/console @@ -8,7 +8,7 @@ use Symfony\Bundle\FrameworkBundle\Console\Application; use Symfony\Component\Console\Input\ArgvInput; $input = new ArgvInput(); -$env = $input->getParameterOption(array('--env', '-e'), 'dev'); +$env = $input->getParameterOption(array('--env', '-e'), getenv('SYMFONY_ENV') ?: 'dev'); $debug = !$input->hasParameterOption(array('--no-debug', '')); $kernel = new AppKernel($env, $debug); From 3c4a9dc8dd416fc44d3fa09ad80c42e47e132b10 Mon Sep 17 00:00:00 2001 From: Fabien Potencier Date: Wed, 20 Jul 2011 19:24:32 +0200 Subject: [PATCH 252/899] updated vendors --- app/console | 0 deps.lock | 6 +++--- 2 files changed, 3 insertions(+), 3 deletions(-) mode change 100644 => 100755 app/console diff --git a/app/console b/app/console old mode 100644 new mode 100755 diff --git a/deps.lock b/deps.lock index 829ba08399..88b1a38283 100644 --- a/deps.lock +++ b/deps.lock @@ -1,4 +1,4 @@ -symfony bb452cd7c4e45acc2267645925bb818204b3e5e3 +symfony 6108b8dedcb39c9fec1c11777f6138fe323d8def twig 94ac20f1553d945c2c224d19d9d28e85ec14372b monolog 433b98d4218c181bae01865901aac045585e8a1a doctrine-common 40f1bf16e84ddc5291a6a63aa00b9879c40e3500 @@ -10,6 +10,6 @@ twig-extensions 6b0cc16934b6e62ef07c8d2e59f9f13ff3193d3d metadata 8717ad2a5689480765d9ffafe925cd8a2457e582 SensioFrameworkExtraBundle bced40d4d123f5171f888d6e56bb638b8c2a5e57 JMSSecurityExtraBundle 936892c9735f76037393639f1410773715bf403c -SensioDistributionBundle 5b6fd1191f11abf0da7d028c159d94b3d30bff87 -SensioGeneratorBundle 1b59f604c56480b3ac06b0e79742244e958089c0 +SensioDistributionBundle 14d669f9cb785ba9973fb883c109aa98306a6935 +SensioGeneratorBundle 17cb09d5758f76ce18b5d7be6c2b714d7144d853 AsseticBundle 61bc7f32c663a9c7be53ed761a574a1509f74d7e \ No newline at end of file From 8a7be4fdcac34685757439f86fbd64bee6643cc8 Mon Sep 17 00:00:00 2001 From: Fabien Potencier Date: Thu, 21 Jul 2011 15:24:00 +0200 Subject: [PATCH 253/899] removed the bootstrap_cache as it's not needed anymore --- web/app.php | 1 - 1 file changed, 1 deletion(-) diff --git a/web/app.php b/web/app.php index 38619cd669..66dbff0ae7 100644 --- a/web/app.php +++ b/web/app.php @@ -2,7 +2,6 @@ require_once __DIR__.'/../app/bootstrap.php.cache'; require_once __DIR__.'/../app/AppKernel.php'; -//require_once __DIR__.'/../app/bootstrap_cache.php.cache'; //require_once __DIR__.'/../app/AppCache.php'; use Symfony\Component\HttpFoundation\Request; From 885639aae29ccc3fe79d8e529257dbff2ccdd3a0 Mon Sep 17 00:00:00 2001 From: Fabien Potencier Date: Thu, 21 Jul 2011 22:10:44 +0200 Subject: [PATCH 254/899] tweaked app.php when using the built-in reverse proxy --- web/app.php | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/web/app.php b/web/app.php index 66dbff0ae7..5a9e02d999 100644 --- a/web/app.php +++ b/web/app.php @@ -6,7 +6,7 @@ use Symfony\Component\HttpFoundation\Request; -//$kernel = new AppCache(new AppKernel('prod', false)); $kernel = new AppKernel('prod', false); $kernel->loadClassCache(); +//$kernel = new AppCache($kernel); $kernel->handle(Request::createFromGlobals())->send(); From 5d97960278811c571a5017086a381fc88f178dd2 Mon Sep 17 00:00:00 2001 From: Fabien Potencier Date: Thu, 21 Jul 2011 22:41:14 +0200 Subject: [PATCH 255/899] updated vendors --- deps.lock | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/deps.lock b/deps.lock index 88b1a38283..9b30dca8c1 100644 --- a/deps.lock +++ b/deps.lock @@ -1,4 +1,4 @@ -symfony 6108b8dedcb39c9fec1c11777f6138fe323d8def +symfony 6b0a9ff7842acb92767ec367d4cc750dc1cc5437 twig 94ac20f1553d945c2c224d19d9d28e85ec14372b monolog 433b98d4218c181bae01865901aac045585e8a1a doctrine-common 40f1bf16e84ddc5291a6a63aa00b9879c40e3500 @@ -10,6 +10,6 @@ twig-extensions 6b0cc16934b6e62ef07c8d2e59f9f13ff3193d3d metadata 8717ad2a5689480765d9ffafe925cd8a2457e582 SensioFrameworkExtraBundle bced40d4d123f5171f888d6e56bb638b8c2a5e57 JMSSecurityExtraBundle 936892c9735f76037393639f1410773715bf403c -SensioDistributionBundle 14d669f9cb785ba9973fb883c109aa98306a6935 +SensioDistributionBundle 74b38d93e621d1642c0540d4f9d9e848652e32f3 SensioGeneratorBundle 17cb09d5758f76ce18b5d7be6c2b714d7144d853 AsseticBundle 61bc7f32c663a9c7be53ed761a574a1509f74d7e \ No newline at end of file From ad52acd0a897bbb1986b8f071b71a30ac7d8511b Mon Sep 17 00:00:00 2001 From: Fabien Potencier Date: Fri, 22 Jul 2011 18:54:37 +0200 Subject: [PATCH 256/899] updated vendors --- deps.lock | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/deps.lock b/deps.lock index 9b30dca8c1..8b431ff885 100644 --- a/deps.lock +++ b/deps.lock @@ -1,4 +1,4 @@ -symfony 6b0a9ff7842acb92767ec367d4cc750dc1cc5437 +symfony e16c226a5c4109c748fdfbac690b0fae7a1e7757 twig 94ac20f1553d945c2c224d19d9d28e85ec14372b monolog 433b98d4218c181bae01865901aac045585e8a1a doctrine-common 40f1bf16e84ddc5291a6a63aa00b9879c40e3500 @@ -11,5 +11,5 @@ metadata 8717ad2a5689480765d9ffafe925cd8a2457e582 SensioFrameworkExtraBundle bced40d4d123f5171f888d6e56bb638b8c2a5e57 JMSSecurityExtraBundle 936892c9735f76037393639f1410773715bf403c SensioDistributionBundle 74b38d93e621d1642c0540d4f9d9e848652e32f3 -SensioGeneratorBundle 17cb09d5758f76ce18b5d7be6c2b714d7144d853 +SensioGeneratorBundle e8bcce716ac876ccd8ffed9f1e54177323bf0b59 AsseticBundle 61bc7f32c663a9c7be53ed761a574a1509f74d7e \ No newline at end of file From 4bd78abad12cfd840346e66ba072df90c98edba6 Mon Sep 17 00:00:00 2001 From: Fabien Potencier Date: Fri, 22 Jul 2011 19:13:24 +0200 Subject: [PATCH 257/899] updated vendors --- deps.lock | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/deps.lock b/deps.lock index 8b431ff885..c17e6ff91d 100644 --- a/deps.lock +++ b/deps.lock @@ -1,4 +1,4 @@ -symfony e16c226a5c4109c748fdfbac690b0fae7a1e7757 +symfony eb7c86b7a812f152b16b27f2abe95e9e43af1363 twig 94ac20f1553d945c2c224d19d9d28e85ec14372b monolog 433b98d4218c181bae01865901aac045585e8a1a doctrine-common 40f1bf16e84ddc5291a6a63aa00b9879c40e3500 From d978d77162817cec3e698c097110afa100d3ac66 Mon Sep 17 00:00:00 2001 From: Fabien Potencier Date: Fri, 22 Jul 2011 22:26:53 +0200 Subject: [PATCH 258/899] updated vendors --- deps.lock | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/deps.lock b/deps.lock index c17e6ff91d..cf94bc0909 100644 --- a/deps.lock +++ b/deps.lock @@ -1,4 +1,4 @@ -symfony eb7c86b7a812f152b16b27f2abe95e9e43af1363 +symfony 9fe6c74a277f119ea2bcc20deac43230edcab2e8 twig 94ac20f1553d945c2c224d19d9d28e85ec14372b monolog 433b98d4218c181bae01865901aac045585e8a1a doctrine-common 40f1bf16e84ddc5291a6a63aa00b9879c40e3500 From b57631316b413fe830550806564f6e017c63f43e Mon Sep 17 00:00:00 2001 From: Fabien Potencier Date: Sat, 23 Jul 2011 16:43:05 +0200 Subject: [PATCH 259/899] updated vendors --- deps.lock | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/deps.lock b/deps.lock index cf94bc0909..0fbb871f5f 100644 --- a/deps.lock +++ b/deps.lock @@ -1,4 +1,4 @@ -symfony 9fe6c74a277f119ea2bcc20deac43230edcab2e8 +symfony 169f1b57f1a492900d9a65c11cba8ec087e09e2e twig 94ac20f1553d945c2c224d19d9d28e85ec14372b monolog 433b98d4218c181bae01865901aac045585e8a1a doctrine-common 40f1bf16e84ddc5291a6a63aa00b9879c40e3500 @@ -10,6 +10,6 @@ twig-extensions 6b0cc16934b6e62ef07c8d2e59f9f13ff3193d3d metadata 8717ad2a5689480765d9ffafe925cd8a2457e582 SensioFrameworkExtraBundle bced40d4d123f5171f888d6e56bb638b8c2a5e57 JMSSecurityExtraBundle 936892c9735f76037393639f1410773715bf403c -SensioDistributionBundle 74b38d93e621d1642c0540d4f9d9e848652e32f3 +SensioDistributionBundle 029151792beac272548fe9df183e15b9be521870 SensioGeneratorBundle e8bcce716ac876ccd8ffed9f1e54177323bf0b59 AsseticBundle 61bc7f32c663a9c7be53ed761a574a1509f74d7e \ No newline at end of file From 5976f69b9e283e0ab354cfd570082e89d921a434 Mon Sep 17 00:00:00 2001 From: Fabien Potencier Date: Sat, 23 Jul 2011 17:20:05 +0200 Subject: [PATCH 260/899] updated vendors --- deps.lock | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/deps.lock b/deps.lock index 0fbb871f5f..c802de9830 100644 --- a/deps.lock +++ b/deps.lock @@ -1,4 +1,4 @@ -symfony 169f1b57f1a492900d9a65c11cba8ec087e09e2e +symfony 39dd8aee47915e3aeb48f497ee4b5a289ea58da2 twig 94ac20f1553d945c2c224d19d9d28e85ec14372b monolog 433b98d4218c181bae01865901aac045585e8a1a doctrine-common 40f1bf16e84ddc5291a6a63aa00b9879c40e3500 From 59f94c1e1553d6c782ce71129bfac655aa2c5db9 Mon Sep 17 00:00:00 2001 From: Brikou CARRE Date: Mon, 25 Jul 2011 16:53:03 +0200 Subject: [PATCH 261/899] fixed some grammar + tweaks --- web/app_dev.php | 7 ++++--- web/config.php | 2 +- 2 files changed, 5 insertions(+), 4 deletions(-) diff --git a/web/app_dev.php b/web/app_dev.php index d73f15755e..5aa389870c 100644 --- a/web/app_dev.php +++ b/web/app_dev.php @@ -1,13 +1,14 @@ Date: Mon, 25 Jul 2011 18:02:55 +0200 Subject: [PATCH 262/899] removed alias (die to exit) --- app/check.php | 2 +- web/app_dev.php | 2 +- web/config.php | 4 ++-- 3 files changed, 4 insertions(+), 4 deletions(-) diff --git a/app/check.php b/app/check.php index 6b4b25fc4b..f0d5ee7ba1 100644 --- a/app/check.php +++ b/app/check.php @@ -94,7 +94,7 @@ function check($boolean, $message, $help = '', $fatal = false) if (!$boolean) { echo " *** $help ***\n"; if ($fatal) { - die("You must fix this problem before resuming the check.\n"); + exit("You must fix this problem before resuming the check.\n"); } } } diff --git a/web/app_dev.php b/web/app_dev.php index d73f15755e..7c91824124 100644 --- a/web/app_dev.php +++ b/web/app_dev.php @@ -7,7 +7,7 @@ '::1', ))) { header('HTTP/1.0 403 Forbidden'); - die('You are not allowed to access this file. Check '.basename(__FILE__).' for more information.'); + exit('You are not allowed to access this file. Check '.basename(__FILE__).' for more information.'); } require_once __DIR__.'/../app/bootstrap.php.cache'; diff --git a/web/config.php b/web/config.php index 0899e40feb..9e0aad7ce5 100644 --- a/web/config.php +++ b/web/config.php @@ -1,7 +1,7 @@ Date: Tue, 26 Jul 2011 10:59:47 +0300 Subject: [PATCH 263/899] Update requirement for web/config --- web/config.php | 10 +++++++++- 1 file changed, 9 insertions(+), 1 deletion(-) diff --git a/web/config.php b/web/config.php index 0899e40feb..767c9162d9 100644 --- a/web/config.php +++ b/web/config.php @@ -45,7 +45,7 @@ $minorProblems[] = 'Upgrade your php-xml extension with a newer libxml.'; } -if (!((function_exists('apc_store') && ini_get('apc.enabled')) || function_exists('eaccelerator_put') && ini_get('eaccelerator.enable') || function_exists('xcache_set'))) { +if (!((version_compare(phpversion('apc'), '3.0.17', '>=') && ini_get('apc.enabled')) || function_exists('eaccelerator_put') && ini_get('eaccelerator.enable') || function_exists('xcache_set'))) { $minorProblems[] = 'Install and enable a PHP accelerator like APC (highly recommended).'; } @@ -100,6 +100,14 @@ $majorProblems[] = 'Install and enable the json extension.'; } +if (!function_exists('session_start')) { + $majorProblems[] = 'Install and enable the session extension.'; +} + +if (!function_exists('ctype_alpha')) { + $majorProblems[] = 'Install and enable the ctype extension.'; +} + // php.ini if (!ini_get('date.timezone')) { $phpini = true; From c0fbc7c7574033cf426fd397ad5eb4b2b311ec86 Mon Sep 17 00:00:00 2001 From: stealth35 Date: Tue, 26 Jul 2011 11:02:51 +0300 Subject: [PATCH 264/899] Update requirement for app/check --- app/check.php | 4 +++- 1 file changed, 3 insertions(+), 1 deletion(-) diff --git a/app/check.php b/app/check.php index 6b4b25fc4b..f1dc4b5643 100644 --- a/app/check.php +++ b/app/check.php @@ -29,6 +29,8 @@ check(is_writable(__DIR__.'/../app/logs'), sprintf('Checking that the app/logs/ directory is writable'), 'Change the permissions of the app/logs/ directory so that the web server can write in it', true); check(function_exists('json_encode'), 'Checking that the json_encode() is available', 'Install and enable the json extension', true); check(class_exists('SQLite3') || in_array('sqlite', PDO::getAvailableDrivers()), 'Checking that the SQLite3 or PDO_SQLite extension is available', 'Install and enable the SQLite3 or PDO_SQLite extension.', true); +check(function_exists('session_start'), 'Checking that the session_start() is available', 'Install and enable the session extension', true); +check(function_exists('ctype_alpha'), 'Checking that the ctype_alpha() is available', 'Install and enable the ctype extension', true); // warnings echo_title("Optional checks"); @@ -62,7 +64,7 @@ } $accelerator = - (function_exists('apc_store') && ini_get('apc.enabled')) + ((version_compare(phpversion('apc'), '3.0.17', '>=') && ini_get('apc.enabled')) || function_exists('eaccelerator_put') && ini_get('eaccelerator.enable') || From 530cd13ef57b9267d3e07fba8b0b9e35a2cc24d8 Mon Sep 17 00:00:00 2001 From: stealth35 Date: Tue, 26 Jul 2011 18:53:23 +0300 Subject: [PATCH 265/899] Check APC version after for app/check --- app/check.php | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/app/check.php b/app/check.php index f1dc4b5643..bc543862e5 100644 --- a/app/check.php +++ b/app/check.php @@ -64,13 +64,14 @@ } $accelerator = - ((version_compare(phpversion('apc'), '3.0.17', '>=') && ini_get('apc.enabled')) + (function_exists('apc_store') && ini_get('apc.enabled')) || function_exists('eaccelerator_put') && ini_get('eaccelerator.enable') || function_exists('xcache_set') ; check($accelerator, 'Checking that a PHP accelerator is installed', 'Install a PHP accelerator like APC (highly recommended)', false); +check(function_exists('apc_store') && ini_get('apc.enabled') && version_compare(phpversion('apc'), '3.0.17', '>='), 'Checking that the APC version is at least 3.0.17', 'Upgrade your intl extension with a newer ICU version (4+)', true); check(!ini_get('short_open_tag'), 'Checking that php.ini has short_open_tag set to off', 'Set short_open_tag to off in php.ini', false); check(!ini_get('magic_quotes_gpc'), 'Checking that php.ini has magic_quotes_gpc set to off', 'Set magic_quotes_gpc to off in php.ini', false); From c9c7582393e7e120be4c541838f53fdecbab330b Mon Sep 17 00:00:00 2001 From: stealth35 Date: Tue, 26 Jul 2011 18:57:36 +0300 Subject: [PATCH 266/899] correct message --- app/check.php | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/app/check.php b/app/check.php index bc543862e5..0a9cf8fa85 100644 --- a/app/check.php +++ b/app/check.php @@ -71,7 +71,7 @@ function_exists('eaccelerator_put') && ini_get('eaccelerator.enable') function_exists('xcache_set') ; check($accelerator, 'Checking that a PHP accelerator is installed', 'Install a PHP accelerator like APC (highly recommended)', false); -check(function_exists('apc_store') && ini_get('apc.enabled') && version_compare(phpversion('apc'), '3.0.17', '>='), 'Checking that the APC version is at least 3.0.17', 'Upgrade your intl extension with a newer ICU version (4+)', true); +check(function_exists('apc_store') && ini_get('apc.enabled') && version_compare(phpversion('apc'), '3.0.17', '>='), 'Checking that the APC version is at least 3.0.17', 'Upgrade your APC extension (3.0.17+)', true); check(!ini_get('short_open_tag'), 'Checking that php.ini has short_open_tag set to off', 'Set short_open_tag to off in php.ini', false); check(!ini_get('magic_quotes_gpc'), 'Checking that php.ini has magic_quotes_gpc set to off', 'Set magic_quotes_gpc to off in php.ini', false); From 53fe3e8c98ab162a7159f352626ee91c06dce7ef Mon Sep 17 00:00:00 2001 From: stealth35 Date: Tue, 26 Jul 2011 19:01:00 +0300 Subject: [PATCH 267/899] check APC version for wev/config --- web/config.php | 6 +++++- 1 file changed, 5 insertions(+), 1 deletion(-) diff --git a/web/config.php b/web/config.php index 767c9162d9..d92c422fc2 100644 --- a/web/config.php +++ b/web/config.php @@ -45,10 +45,14 @@ $minorProblems[] = 'Upgrade your php-xml extension with a newer libxml.'; } -if (!((version_compare(phpversion('apc'), '3.0.17', '>=') && ini_get('apc.enabled')) || function_exists('eaccelerator_put') && ini_get('eaccelerator.enable') || function_exists('xcache_set'))) { +if (!(function_exists('apc_store') && ini_get('apc.enabled')) || function_exists('eaccelerator_put') && ini_get('eaccelerator.enable') || function_exists('xcache_set'))) { $minorProblems[] = 'Install and enable a PHP accelerator like APC (highly recommended).'; } +if (!(function_exists('apc_store') && ini_get('apc.enabled') && version_compare(phpversion('apc'), '3.0.17', '>=')) { + $majorProblems[] = 'Upgrade your APC extension (3.0.17+)'; +} + if (!function_exists('token_get_all')) { $minorProblems[] = 'Install and enable the Tokenizer extension.'; } From 371731574e8dc3ebe68c49f9c08d1ca5f5d8f2d1 Mon Sep 17 00:00:00 2001 From: stealth35 Date: Tue, 26 Jul 2011 19:03:09 +0300 Subject: [PATCH 268/899] fix typo --- web/config.php | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/web/config.php b/web/config.php index d92c422fc2..3028c63eaf 100644 --- a/web/config.php +++ b/web/config.php @@ -45,7 +45,7 @@ $minorProblems[] = 'Upgrade your php-xml extension with a newer libxml.'; } -if (!(function_exists('apc_store') && ini_get('apc.enabled')) || function_exists('eaccelerator_put') && ini_get('eaccelerator.enable') || function_exists('xcache_set'))) { +if (!((function_exists('apc_store') && ini_get('apc.enabled')) || function_exists('eaccelerator_put') && ini_get('eaccelerator.enable') || function_exists('xcache_set'))) { $minorProblems[] = 'Install and enable a PHP accelerator like APC (highly recommended).'; } From 8d1f886e3ac02c72450fd459d774a029626e1edb Mon Sep 17 00:00:00 2001 From: stealth35 Date: Tue, 26 Jul 2011 19:10:27 +0300 Subject: [PATCH 269/899] fix cond --- web/config.php | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/web/config.php b/web/config.php index 3028c63eaf..b13ddcae74 100644 --- a/web/config.php +++ b/web/config.php @@ -49,7 +49,7 @@ $minorProblems[] = 'Install and enable a PHP accelerator like APC (highly recommended).'; } -if (!(function_exists('apc_store') && ini_get('apc.enabled') && version_compare(phpversion('apc'), '3.0.17', '>=')) { +if (!(function_exists('apc_store') && ini_get('apc.enabled') && version_compare(phpversion('apc'), '3.0.17', '>='))) { $majorProblems[] = 'Upgrade your APC extension (3.0.17+)'; } From 29cf340d76b0af7347210512051251c180fcadcd Mon Sep 17 00:00:00 2001 From: Fabien Potencier Date: Wed, 27 Jul 2011 08:36:40 +0200 Subject: [PATCH 270/899] updated vendors --- deps.lock | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/deps.lock b/deps.lock index c802de9830..6b44171a06 100644 --- a/deps.lock +++ b/deps.lock @@ -1,4 +1,4 @@ -symfony 39dd8aee47915e3aeb48f497ee4b5a289ea58da2 +symfony 8700cd61543827269418f9263b1e3bf0679541fd twig 94ac20f1553d945c2c224d19d9d28e85ec14372b monolog 433b98d4218c181bae01865901aac045585e8a1a doctrine-common 40f1bf16e84ddc5291a6a63aa00b9879c40e3500 @@ -11,5 +11,5 @@ metadata 8717ad2a5689480765d9ffafe925cd8a2457e582 SensioFrameworkExtraBundle bced40d4d123f5171f888d6e56bb638b8c2a5e57 JMSSecurityExtraBundle 936892c9735f76037393639f1410773715bf403c SensioDistributionBundle 029151792beac272548fe9df183e15b9be521870 -SensioGeneratorBundle e8bcce716ac876ccd8ffed9f1e54177323bf0b59 +SensioGeneratorBundle 75845b9af4b29f59baced650c49bbf96a0119be5 AsseticBundle 61bc7f32c663a9c7be53ed761a574a1509f74d7e \ No newline at end of file From 60756ac9231958be4673fe77276e7dd7e7a63c27 Mon Sep 17 00:00:00 2001 From: Fabien Potencier Date: Thu, 28 Jul 2011 09:01:09 +0200 Subject: [PATCH 271/899] updated vendors --- deps.lock | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/deps.lock b/deps.lock index 6b44171a06..197ff2a4ea 100644 --- a/deps.lock +++ b/deps.lock @@ -1,4 +1,4 @@ -symfony 8700cd61543827269418f9263b1e3bf0679541fd +symfony 3caa8953c529233207970394a5356df63f2c7e7b twig 94ac20f1553d945c2c224d19d9d28e85ec14372b monolog 433b98d4218c181bae01865901aac045585e8a1a doctrine-common 40f1bf16e84ddc5291a6a63aa00b9879c40e3500 @@ -11,5 +11,5 @@ metadata 8717ad2a5689480765d9ffafe925cd8a2457e582 SensioFrameworkExtraBundle bced40d4d123f5171f888d6e56bb638b8c2a5e57 JMSSecurityExtraBundle 936892c9735f76037393639f1410773715bf403c SensioDistributionBundle 029151792beac272548fe9df183e15b9be521870 -SensioGeneratorBundle 75845b9af4b29f59baced650c49bbf96a0119be5 +SensioGeneratorBundle 511b8b011fc7a85a8b70c9b024ef2c6e8ffe76ec AsseticBundle 61bc7f32c663a9c7be53ed761a574a1509f74d7e \ No newline at end of file From 5209427005c2d5ef939d0cf709ffc5d8e134297d Mon Sep 17 00:00:00 2001 From: Fabien Potencier Date: Thu, 28 Jul 2011 10:48:13 +0200 Subject: [PATCH 272/899] updated vendors --- deps | 3 ++- deps.lock | 4 ++-- 2 files changed, 4 insertions(+), 3 deletions(-) diff --git a/deps b/deps index ec1e0aa2d3..5123a1f601 100644 --- a/deps +++ b/deps @@ -1,5 +1,6 @@ [symfony] git=http://github.com/symfony/symfony.git + version=v2.0.0 [twig] git=http://github.com/fabpot/Twig.git @@ -55,4 +56,4 @@ [AsseticBundle] git=http://github.com/symfony/AsseticBundle.git target=/bundles/Symfony/Bundle/AsseticBundle - version=v1.0.0RC1 + version=v1.0.0RC2 diff --git a/deps.lock b/deps.lock index 197ff2a4ea..1fba8a3ddb 100644 --- a/deps.lock +++ b/deps.lock @@ -1,4 +1,4 @@ -symfony 3caa8953c529233207970394a5356df63f2c7e7b +symfony c3ebdbf9cceddb82cd2089aaef8c7b992e536363 twig 94ac20f1553d945c2c224d19d9d28e85ec14372b monolog 433b98d4218c181bae01865901aac045585e8a1a doctrine-common 40f1bf16e84ddc5291a6a63aa00b9879c40e3500 @@ -12,4 +12,4 @@ SensioFrameworkExtraBundle bced40d4d123f5171f888d6e56bb638b8c2a5e57 JMSSecurityExtraBundle 936892c9735f76037393639f1410773715bf403c SensioDistributionBundle 029151792beac272548fe9df183e15b9be521870 SensioGeneratorBundle 511b8b011fc7a85a8b70c9b024ef2c6e8ffe76ec -AsseticBundle 61bc7f32c663a9c7be53ed761a574a1509f74d7e \ No newline at end of file +AsseticBundle 9c1b7269a4517d1ae94af2dc0d6d6fc4b31e6c10 \ No newline at end of file From 72fd4ff45dd1a500fba92556413f678d3daf536e Mon Sep 17 00:00:00 2001 From: Fabien Potencier Date: Thu, 28 Jul 2011 11:14:49 +0200 Subject: [PATCH 273/899] updated vendors --- deps.lock | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/deps.lock b/deps.lock index 1fba8a3ddb..3bc21a8426 100644 --- a/deps.lock +++ b/deps.lock @@ -11,5 +11,5 @@ metadata 8717ad2a5689480765d9ffafe925cd8a2457e582 SensioFrameworkExtraBundle bced40d4d123f5171f888d6e56bb638b8c2a5e57 JMSSecurityExtraBundle 936892c9735f76037393639f1410773715bf403c SensioDistributionBundle 029151792beac272548fe9df183e15b9be521870 -SensioGeneratorBundle 511b8b011fc7a85a8b70c9b024ef2c6e8ffe76ec +SensioGeneratorBundle 84c41ef39046ba652c0201c29816a0ff7b23e1f5 AsseticBundle 9c1b7269a4517d1ae94af2dc0d6d6fc4b31e6c10 \ No newline at end of file From 96e96eb0fe270e8c3feb04c0f8b48404c97ff334 Mon Sep 17 00:00:00 2001 From: winzou Date: Thu, 28 Jul 2011 23:24:12 +0800 Subject: [PATCH 274/899] Fix condition for APC checking, as it currently shows this majorProblem even if APC is not installed at all --- web/config.php | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/web/config.php b/web/config.php index b13ddcae74..74b7353a91 100644 --- a/web/config.php +++ b/web/config.php @@ -49,7 +49,7 @@ $minorProblems[] = 'Install and enable a PHP accelerator like APC (highly recommended).'; } -if (!(function_exists('apc_store') && ini_get('apc.enabled') && version_compare(phpversion('apc'), '3.0.17', '>='))) { +if (!(!(function_exists('apc_store') && ini_get('apc.enabled')) || version_compare(phpversion('apc'), '3.0.17', '>='))) { $majorProblems[] = 'Upgrade your APC extension (3.0.17+)'; } From 8b1a40382a6de95d0b1e2ee5af697d19cac508c3 Mon Sep 17 00:00:00 2001 From: winzou Date: Thu, 28 Jul 2011 23:41:57 +0800 Subject: [PATCH 275/899] Fix APC version check, and move it to mandatory requirements --- app/check.php | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/app/check.php b/app/check.php index 0a9cf8fa85..86ec27b2de 100644 --- a/app/check.php +++ b/app/check.php @@ -31,6 +31,7 @@ check(class_exists('SQLite3') || in_array('sqlite', PDO::getAvailableDrivers()), 'Checking that the SQLite3 or PDO_SQLite extension is available', 'Install and enable the SQLite3 or PDO_SQLite extension.', true); check(function_exists('session_start'), 'Checking that the session_start() is available', 'Install and enable the session extension', true); check(function_exists('ctype_alpha'), 'Checking that the ctype_alpha() is available', 'Install and enable the ctype extension', true); +check(!(function_exists('apc_store') && ini_get('apc.enabled')) || version_compare(phpversion('apc'), '3.0.17', '>='), 'Checking that the APC version is at least 3.0.17', 'Upgrade your APC extension (3.0.17+)', true); // warnings echo_title("Optional checks"); @@ -71,7 +72,6 @@ function_exists('eaccelerator_put') && ini_get('eaccelerator.enable') function_exists('xcache_set') ; check($accelerator, 'Checking that a PHP accelerator is installed', 'Install a PHP accelerator like APC (highly recommended)', false); -check(function_exists('apc_store') && ini_get('apc.enabled') && version_compare(phpversion('apc'), '3.0.17', '>='), 'Checking that the APC version is at least 3.0.17', 'Upgrade your APC extension (3.0.17+)', true); check(!ini_get('short_open_tag'), 'Checking that php.ini has short_open_tag set to off', 'Set short_open_tag to off in php.ini', false); check(!ini_get('magic_quotes_gpc'), 'Checking that php.ini has magic_quotes_gpc set to off', 'Set magic_quotes_gpc to off in php.ini', false); From 1b869866e7d4428b6ed66302b46adbffbf57cb49 Mon Sep 17 00:00:00 2001 From: Brikou CARRE Date: Sat, 30 Jul 2011 11:55:51 +0200 Subject: [PATCH 276/899] framework.translator.fallback set to %locale% --- app/config/config.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/app/config/config.yml b/app/config/config.yml index d53a2cc5da..d7dae20faf 100644 --- a/app/config/config.yml +++ b/app/config/config.yml @@ -4,7 +4,7 @@ imports: framework: #esi: ~ - #translator: { fallback: en } + translator: { fallback: %locale% } secret: %secret% charset: UTF-8 router: { resource: "%kernel.root_dir%/config/routing.yml" } From 3cd30b65c8c8872e29693226109591c987ca0cc9 Mon Sep 17 00:00:00 2001 From: Brikou CARRE Date: Sat, 30 Jul 2011 12:54:19 +0200 Subject: [PATCH 277/899] commented translator entry --- app/config/config.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/app/config/config.yml b/app/config/config.yml index d7dae20faf..ba0effa87a 100644 --- a/app/config/config.yml +++ b/app/config/config.yml @@ -4,7 +4,7 @@ imports: framework: #esi: ~ - translator: { fallback: %locale% } + #translator: { fallback: %locale% } secret: %secret% charset: UTF-8 router: { resource: "%kernel.root_dir%/config/routing.yml" } From fe13c823c8bc36ec22a3536145b4623e300c7058 Mon Sep 17 00:00:00 2001 From: Lukas Kahwe Smith Date: Sat, 30 Jul 2011 14:37:13 +0200 Subject: [PATCH 278/899] added support to lock vendors as they are currently checked out --- bin/vendors | 46 +++++++++++++++++++++++++--------------------- 1 file changed, 25 insertions(+), 21 deletions(-) diff --git a/bin/vendors b/bin/vendors index 719216d1a2..a073b26d0e 100755 --- a/bin/vendors +++ b/bin/vendors @@ -22,13 +22,13 @@ Specify a command to run: install: install vendors as specified in deps or deps.lock (recommended) update: update vendors to their latest versions (as specified in deps) - + lock: lock vendors to their current versions EOF ); } -if (!in_array($command = array_shift($argv), array('install', 'update'))) { +if (!in_array($command = array_shift($argv), array('install', 'update', 'lock'))) { exit(sprintf("Command \"%s\" does not exist.\n", $command)); } @@ -71,13 +71,6 @@ if (false === $deps) { foreach ($deps as $name => $dep) { $dep = array_map('trim', $dep); - // revision - if (isset($versions[$name])) { - $rev = $versions[$name]; - } else { - $rev = isset($dep['version']) ? $dep['version'] : 'origin/HEAD'; - } - // install dir $installDir = isset($dep['target']) ? $vendorDir.'/'.$dep['target'] : $vendorDir.'/'.$name; if (in_array('--reinstall', $argv)) { @@ -88,21 +81,30 @@ foreach ($deps as $name => $dep) { } } - echo "> Installing/Updating $name\n"; + if ('install' === $command || 'update' === $command) { + echo "> Installing/Updating $name\n"; - // url - if (!isset($dep['git'])) { - exit(sprintf('The "git" value for the "%s" dependency must be set.', $name)); - } - $url = $dep['git']; + // url + if (!isset($dep['git'])) { + exit(sprintf('The "git" value for the "%s" dependency must be set.', $name)); + } + $url = $dep['git']; - if (!is_dir($installDir)) { - system(sprintf('git clone %s %s', escapeshellarg($url), escapeshellarg($installDir))); - } + if (!is_dir($installDir)) { + system(sprintf('git clone %s %s', escapeshellarg($url), escapeshellarg($installDir))); + } + + // revision + if (isset($versions[$name])) { + $rev = $versions[$name]; + } else { + $rev = isset($dep['version']) ? $dep['version'] : 'origin/HEAD'; + } - system(sprintf('cd %s && git fetch origin && git reset --hard %s', escapeshellarg($installDir), escapeshellarg($rev))); + system(sprintf('cd %s && git fetch origin && git reset --hard %s', escapeshellarg($installDir), escapeshellarg($rev))); + } - if ('update' === $command) { + if ('update' === $command || 'lock' === $command) { ob_start(); system(sprintf('cd %s && git log -n 1 --format=%%H', escapeshellarg($installDir))); $newversions[] = trim($name.' '.ob_get_clean()); @@ -110,7 +112,9 @@ foreach ($deps as $name => $dep) { } // update? -if ('update' === $command) { +if ('update' === $command || 'lock' === $command) { + echo "> Updating deps.lock\n"; + file_put_contents($rootDir.'/deps.lock', implode("\n", $newversions)); } From e7b7b0f366465b15a29f44d7ba17287bb0b8392b Mon Sep 17 00:00:00 2001 From: Mateusz Heleniak Date: Sat, 6 Aug 2011 01:37:29 +0300 Subject: [PATCH 279/899] replaced app/bootstrap wildcard with explicit entry this could be done as `app/bootstrap_cache.php.cache` is no longer created and used (see 8a7be4fdcac34685757439f86fbd64bee6643cc8) --- .gitignore | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.gitignore b/.gitignore index 2807d5f7eb..ec05cd2297 100644 --- a/.gitignore +++ b/.gitignore @@ -1,5 +1,5 @@ web/bundles/ -app/bootstrap* +app/bootstrap.php.cache app/cache/* app/logs/* build/ From dc3d938d0ee79b048290afc6bbe44c65229eb2bc Mon Sep 17 00:00:00 2001 From: Brikou CARRE Date: Fri, 19 Aug 2011 15:29:15 +0200 Subject: [PATCH 280/899] removed ending 's' --- web/app_dev.php | 2 +- web/config.php | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/web/app_dev.php b/web/app_dev.php index 5aa389870c..398b9ec754 100644 --- a/web/app_dev.php +++ b/web/app_dev.php @@ -8,7 +8,7 @@ '::1', ))) { header('HTTP/1.0 403 Forbidden'); - die('You are not allowed to access this file. Check '.basename(__FILE__).' for more informations.'); + die('You are not allowed to access this file. Check '.basename(__FILE__).' for more information.'); } require_once __DIR__.'/../app/bootstrap.php.cache'; diff --git a/web/config.php b/web/config.php index 065b54892a..30b23d87a1 100644 --- a/web/config.php +++ b/web/config.php @@ -9,7 +9,7 @@ '::1', ))) { header('HTTP/1.0 403 Forbidden'); - die('You are not allowed to access this file. Check '.basename(__FILE__).' for more informations.'); + die('You are not allowed to access this file. Check '.basename(__FILE__).' for more information.'); } $majorProblems = array(); From fa05b96e61a806aa262218924c813e2bc8618611 Mon Sep 17 00:00:00 2001 From: Brikou CARRE Date: Fri, 19 Aug 2011 15:35:12 +0200 Subject: [PATCH 281/899] reverted sentence --- web/config.php | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/web/config.php b/web/config.php index 30b23d87a1..0899e40feb 100644 --- a/web/config.php +++ b/web/config.php @@ -9,7 +9,7 @@ '::1', ))) { header('HTTP/1.0 403 Forbidden'); - die('You are not allowed to access this file. Check '.basename(__FILE__).' for more information.'); + die('This script is only accessible from localhost.'); } $majorProblems = array(); From 0248da16b51ee12b1e45b84dbc3c224dad919590 Mon Sep 17 00:00:00 2001 From: Fabien Potencier Date: Tue, 23 Aug 2011 11:39:55 +0200 Subject: [PATCH 282/899] updated vendors --- deps | 16 ++++++++-------- deps.lock | 18 +++++++++--------- 2 files changed, 17 insertions(+), 17 deletions(-) diff --git a/deps b/deps index 5123a1f601..d9dba07d6e 100644 --- a/deps +++ b/deps @@ -1,10 +1,10 @@ [symfony] git=http://github.com/symfony/symfony.git - version=v2.0.0 + version=origin/2.0 [twig] git=http://github.com/fabpot/Twig.git - version=v1.1.1 + version=v1.1.2 [monolog] git=http://github.com/Seldaek/monolog.git @@ -12,19 +12,19 @@ [doctrine-common] git=http://github.com/doctrine/common.git - version=2.1.0 + version=origin/2.1.x [doctrine-dbal] git=http://github.com/doctrine/dbal.git - version=2.1.0 + version=origin/2.1.x [doctrine] git=http://github.com/doctrine/doctrine2.git - version=2.1.0 + version=origin/2.1.x [swiftmailer] git=http://github.com/swiftmailer/swiftmailer.git - version=v4.1.0 + version=v4.1.1 [assetic] git=http://github.com/kriswallsmith/assetic.git @@ -35,7 +35,7 @@ [metadata] git=http://github.com/schmittjoh/metadata.git - version=1.0.0 + version=origin/1.0.x [SensioFrameworkExtraBundle] git=http://github.com/sensio/SensioFrameworkExtraBundle.git @@ -56,4 +56,4 @@ [AsseticBundle] git=http://github.com/symfony/AsseticBundle.git target=/bundles/Symfony/Bundle/AsseticBundle - version=v1.0.0RC2 + version=v1.0.0 diff --git a/deps.lock b/deps.lock index 3bc21a8426..529da75db2 100644 --- a/deps.lock +++ b/deps.lock @@ -1,15 +1,15 @@ -symfony c3ebdbf9cceddb82cd2089aaef8c7b992e536363 -twig 94ac20f1553d945c2c224d19d9d28e85ec14372b +symfony 277d75b7ceb03e1073cf6d0c5d76760919677b6d +twig 396435ecd05556adb0a8bd05b14641cb4f8a8aa5 monolog 433b98d4218c181bae01865901aac045585e8a1a doctrine-common 40f1bf16e84ddc5291a6a63aa00b9879c40e3500 -doctrine-dbal 0127ee98a4301f2f6e3463c824adc3a3687f901f -doctrine dfdb7353065407afc997956e23f3a44ec3effd72 -swiftmailer c53c8c1ab88c78c463ba65086d93d00193957e94 +doctrine-dbal abda6a5d73a66c51ddcf2e3b39105d105a7ae834 +doctrine 6380795827e17728451cb700ae9394f311a51e78 +swiftmailer 1f273a7cd466a2dd82e59431dd5ce15f36996688 assetic 3333d371c4511abcdec7bad86e15ac2be3b10f03 -twig-extensions 6b0cc16934b6e62ef07c8d2e59f9f13ff3193d3d -metadata 8717ad2a5689480765d9ffafe925cd8a2457e582 -SensioFrameworkExtraBundle bced40d4d123f5171f888d6e56bb638b8c2a5e57 -JMSSecurityExtraBundle 936892c9735f76037393639f1410773715bf403c +twig-extensions eba4f5d572bec05c72a47bbd73ba0a3330cf8f54 +metadata 014d200714030996ae8ea26a7ccaccf86fc89734 +SensioFrameworkExtraBundle 68a13edb3a6901cc4517665cbab9464486b81316 +JMSSecurityExtraBundle facedd50988b311f778288ea3b5e070591936f30 SensioDistributionBundle 029151792beac272548fe9df183e15b9be521870 SensioGeneratorBundle 84c41ef39046ba652c0201c29816a0ff7b23e1f5 AsseticBundle 9c1b7269a4517d1ae94af2dc0d6d6fc4b31e6c10 \ No newline at end of file From 45c4b38cc526fd331d22ef709294405797583f07 Mon Sep 17 00:00:00 2001 From: Fabien Potencier Date: Fri, 26 Aug 2011 09:00:41 +0200 Subject: [PATCH 283/899] updated VENDORS for 2.0.1 --- deps | 12 ++++++------ deps.lock | 16 ++++++++-------- 2 files changed, 14 insertions(+), 14 deletions(-) diff --git a/deps b/deps index d9dba07d6e..0038e2dfc2 100644 --- a/deps +++ b/deps @@ -1,6 +1,6 @@ [symfony] git=http://github.com/symfony/symfony.git - version=origin/2.0 + version=v2.0.1 [twig] git=http://github.com/fabpot/Twig.git @@ -8,19 +8,19 @@ [monolog] git=http://github.com/Seldaek/monolog.git - version=1.0.0 + version=1.0.1 [doctrine-common] git=http://github.com/doctrine/common.git - version=origin/2.1.x + version=2.1.1 [doctrine-dbal] git=http://github.com/doctrine/dbal.git - version=origin/2.1.x + version=2.1.1 [doctrine] git=http://github.com/doctrine/doctrine2.git - version=origin/2.1.x + version=2.1.1 [swiftmailer] git=http://github.com/swiftmailer/swiftmailer.git @@ -35,7 +35,7 @@ [metadata] git=http://github.com/schmittjoh/metadata.git - version=origin/1.0.x + version=1.0.0 [SensioFrameworkExtraBundle] git=http://github.com/sensio/SensioFrameworkExtraBundle.git diff --git a/deps.lock b/deps.lock index 529da75db2..9df5ee59da 100644 --- a/deps.lock +++ b/deps.lock @@ -1,15 +1,15 @@ -symfony 277d75b7ceb03e1073cf6d0c5d76760919677b6d +symfony 7cb402d806a9615cf8bcafcfd049da00914b45f8 twig 396435ecd05556adb0a8bd05b14641cb4f8a8aa5 -monolog 433b98d4218c181bae01865901aac045585e8a1a -doctrine-common 40f1bf16e84ddc5291a6a63aa00b9879c40e3500 -doctrine-dbal abda6a5d73a66c51ddcf2e3b39105d105a7ae834 -doctrine 6380795827e17728451cb700ae9394f311a51e78 +monolog 303b8a83c87d5c6d749926cf02620465a5dcd0f2 +doctrine-common 174111c8d245d560e1af4c7455b730347f85686d +doctrine-dbal 54f474b3c321676ceadbe4288396902405d87756 +doctrine 05d12e20be58ab4d5fa403c5bd6ac06d1fce97e5 swiftmailer 1f273a7cd466a2dd82e59431dd5ce15f36996688 assetic 3333d371c4511abcdec7bad86e15ac2be3b10f03 twig-extensions eba4f5d572bec05c72a47bbd73ba0a3330cf8f54 -metadata 014d200714030996ae8ea26a7ccaccf86fc89734 -SensioFrameworkExtraBundle 68a13edb3a6901cc4517665cbab9464486b81316 +metadata 8717ad2a5689480765d9ffafe925cd8a2457e582 +SensioFrameworkExtraBundle 9b9194a47effc66b08d44ae110b982352119ca17 JMSSecurityExtraBundle facedd50988b311f778288ea3b5e070591936f30 SensioDistributionBundle 029151792beac272548fe9df183e15b9be521870 -SensioGeneratorBundle 84c41ef39046ba652c0201c29816a0ff7b23e1f5 +SensioGeneratorBundle 52038c005d565a1bd4986dcdef207ed9f1246b32 AsseticBundle 9c1b7269a4517d1ae94af2dc0d6d6fc4b31e6c10 \ No newline at end of file From 6701e68868009e59b544d52e57d30d62175779cf Mon Sep 17 00:00:00 2001 From: Fabien Potencier Date: Fri, 26 Aug 2011 09:39:04 +0200 Subject: [PATCH 284/899] updated vendors to dev branches --- deps | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/deps b/deps index 0038e2dfc2..a5e5233f95 100644 --- a/deps +++ b/deps @@ -1,6 +1,6 @@ [symfony] git=http://github.com/symfony/symfony.git - version=v2.0.1 + version=origin/2.0 [twig] git=http://github.com/fabpot/Twig.git @@ -12,15 +12,15 @@ [doctrine-common] git=http://github.com/doctrine/common.git - version=2.1.1 + version=origin/2.1.x [doctrine-dbal] git=http://github.com/doctrine/dbal.git - version=2.1.1 + version=origin/2.1.x [doctrine] git=http://github.com/doctrine/doctrine2.git - version=2.1.1 + version=origin/2.1.x [swiftmailer] git=http://github.com/swiftmailer/swiftmailer.git From 4cd7a2717ed484b2fd55c851aa7b46f4988b45a3 Mon Sep 17 00:00:00 2001 From: Kris Wallsmith Date: Fri, 26 Aug 2011 06:51:04 -0700 Subject: [PATCH 285/899] updated assetic to v1.0.2 --- deps | 2 +- deps.lock | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/deps b/deps index a5e5233f95..fd7c537fea 100644 --- a/deps +++ b/deps @@ -28,7 +28,7 @@ [assetic] git=http://github.com/kriswallsmith/assetic.git - version=v1.0.1 + version=v1.0.2 [twig-extensions] git=http://github.com/fabpot/Twig-extensions.git diff --git a/deps.lock b/deps.lock index 9df5ee59da..71af4d8b56 100644 --- a/deps.lock +++ b/deps.lock @@ -5,7 +5,7 @@ doctrine-common 174111c8d245d560e1af4c7455b730347f85686d doctrine-dbal 54f474b3c321676ceadbe4288396902405d87756 doctrine 05d12e20be58ab4d5fa403c5bd6ac06d1fce97e5 swiftmailer 1f273a7cd466a2dd82e59431dd5ce15f36996688 -assetic 3333d371c4511abcdec7bad86e15ac2be3b10f03 +assetic f829ad23d23c87480151a21faad49fefe7c09e5d twig-extensions eba4f5d572bec05c72a47bbd73ba0a3330cf8f54 metadata 8717ad2a5689480765d9ffafe925cd8a2457e582 SensioFrameworkExtraBundle 9b9194a47effc66b08d44ae110b982352119ca17 From f134e9f1e7854bde82f6a3ce20c729df569e4c69 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Krzysztof=20Men=C5=BCyk?= Date: Mon, 5 Sep 2011 15:13:59 +0200 Subject: [PATCH 286/899] Fixed configuration for doctrine caching --- app/config/config_prod.yml | 7 ++++--- 1 file changed, 4 insertions(+), 3 deletions(-) diff --git a/app/config/config_prod.yml b/app/config/config_prod.yml index 4a36496036..0b91d4d885 100644 --- a/app/config/config_prod.yml +++ b/app/config/config_prod.yml @@ -2,9 +2,10 @@ imports: - { resource: config.yml } #doctrine: -# metadata_cache_driver: apc -# result_cache_driver: apc -# query_cache_driver: apc +# orm: +# metadata_cache_driver: apc +# result_cache_driver: apc +# query_cache_driver: apc monolog: handlers: From cc8e6faf93137ea5cf618f8f8986d350f30eda58 Mon Sep 17 00:00:00 2001 From: Fabien Potencier Date: Tue, 13 Sep 2011 17:11:46 +0200 Subject: [PATCH 287/899] bumped version of dependencies --- deps | 9 ++++----- deps.lock | 20 ++++++++++---------- 2 files changed, 14 insertions(+), 15 deletions(-) diff --git a/deps b/deps index d9dba07d6e..33858dc939 100644 --- a/deps +++ b/deps @@ -1,14 +1,13 @@ [symfony] git=http://github.com/symfony/symfony.git - version=origin/2.0 [twig] git=http://github.com/fabpot/Twig.git - version=v1.1.2 + version=v1.2.0 [monolog] git=http://github.com/Seldaek/monolog.git - version=1.0.0 + version=1.0.1 [doctrine-common] git=http://github.com/doctrine/common.git @@ -24,11 +23,11 @@ [swiftmailer] git=http://github.com/swiftmailer/swiftmailer.git - version=v4.1.1 + version=v4.1.2 [assetic] git=http://github.com/kriswallsmith/assetic.git - version=v1.0.1 + version=v1.0.2 [twig-extensions] git=http://github.com/fabpot/Twig-extensions.git diff --git a/deps.lock b/deps.lock index 529da75db2..d8cdf78d52 100644 --- a/deps.lock +++ b/deps.lock @@ -1,15 +1,15 @@ -symfony 277d75b7ceb03e1073cf6d0c5d76760919677b6d -twig 396435ecd05556adb0a8bd05b14641cb4f8a8aa5 -monolog 433b98d4218c181bae01865901aac045585e8a1a -doctrine-common 40f1bf16e84ddc5291a6a63aa00b9879c40e3500 -doctrine-dbal abda6a5d73a66c51ddcf2e3b39105d105a7ae834 -doctrine 6380795827e17728451cb700ae9394f311a51e78 -swiftmailer 1f273a7cd466a2dd82e59431dd5ce15f36996688 -assetic 3333d371c4511abcdec7bad86e15ac2be3b10f03 +symfony cfc202be93f98a0addf0e907b45b73566265c897 +twig 4a5057997d6d3ffacb2dad1550972a244d459ab8 +monolog 303b8a83c87d5c6d749926cf02620465a5dcd0f2 +doctrine-common 3f530763a550e0e1bee445492d551a443dc119a4 +doctrine-dbal 03ea47792cf04b70bd765ae09e0c327d31318e38 +doctrine cf10ee4d02432b3a19128d0d681a79ba329b89a6 +swiftmailer 8c3165691e36302405926abbae7526549db8b899 +assetic f829ad23d23c87480151a21faad49fefe7c09e5d twig-extensions eba4f5d572bec05c72a47bbd73ba0a3330cf8f54 metadata 014d200714030996ae8ea26a7ccaccf86fc89734 -SensioFrameworkExtraBundle 68a13edb3a6901cc4517665cbab9464486b81316 +SensioFrameworkExtraBundle 9b9194a47effc66b08d44ae110b982352119ca17 JMSSecurityExtraBundle facedd50988b311f778288ea3b5e070591936f30 SensioDistributionBundle 029151792beac272548fe9df183e15b9be521870 -SensioGeneratorBundle 84c41ef39046ba652c0201c29816a0ff7b23e1f5 +SensioGeneratorBundle 019aa5ab8ed5017bb27b39f04cf2a659ff31ef74 AsseticBundle 9c1b7269a4517d1ae94af2dc0d6d6fc4b31e6c10 \ No newline at end of file From 619618ed0dc8e0ac67fc2924d42b105860fe9f18 Mon Sep 17 00:00:00 2001 From: Fabien Potencier Date: Tue, 13 Sep 2011 17:10:46 +0200 Subject: [PATCH 288/899] bumped version of Swiftmailer --- deps | 2 +- deps.lock | 12 ++++++------ 2 files changed, 7 insertions(+), 7 deletions(-) diff --git a/deps b/deps index fd7c537fea..11d9ec28fe 100644 --- a/deps +++ b/deps @@ -24,7 +24,7 @@ [swiftmailer] git=http://github.com/swiftmailer/swiftmailer.git - version=v4.1.1 + version=v4.1.2 [assetic] git=http://github.com/kriswallsmith/assetic.git diff --git a/deps.lock b/deps.lock index 71af4d8b56..02ff67e54c 100644 --- a/deps.lock +++ b/deps.lock @@ -1,15 +1,15 @@ -symfony 7cb402d806a9615cf8bcafcfd049da00914b45f8 +symfony 27dcc187f6f4eacfefee4fad908212d31c75153b twig 396435ecd05556adb0a8bd05b14641cb4f8a8aa5 monolog 303b8a83c87d5c6d749926cf02620465a5dcd0f2 -doctrine-common 174111c8d245d560e1af4c7455b730347f85686d -doctrine-dbal 54f474b3c321676ceadbe4288396902405d87756 -doctrine 05d12e20be58ab4d5fa403c5bd6ac06d1fce97e5 -swiftmailer 1f273a7cd466a2dd82e59431dd5ce15f36996688 +doctrine-common 3f530763a550e0e1bee445492d551a443dc119a4 +doctrine-dbal 03ea47792cf04b70bd765ae09e0c327d31318e38 +doctrine cf10ee4d02432b3a19128d0d681a79ba329b89a6 +swiftmailer 8c3165691e36302405926abbae7526549db8b899 assetic f829ad23d23c87480151a21faad49fefe7c09e5d twig-extensions eba4f5d572bec05c72a47bbd73ba0a3330cf8f54 metadata 8717ad2a5689480765d9ffafe925cd8a2457e582 SensioFrameworkExtraBundle 9b9194a47effc66b08d44ae110b982352119ca17 JMSSecurityExtraBundle facedd50988b311f778288ea3b5e070591936f30 SensioDistributionBundle 029151792beac272548fe9df183e15b9be521870 -SensioGeneratorBundle 52038c005d565a1bd4986dcdef207ed9f1246b32 +SensioGeneratorBundle 019aa5ab8ed5017bb27b39f04cf2a659ff31ef74 AsseticBundle 9c1b7269a4517d1ae94af2dc0d6d6fc4b31e6c10 \ No newline at end of file From a65eec7398ca73eb01bff814e10fba503ed54597 Mon Sep 17 00:00:00 2001 From: Johannes Date: Wed, 14 Sep 2011 11:54:25 +0300 Subject: [PATCH 289/899] use the BC branch --- deps | 1 + 1 file changed, 1 insertion(+) diff --git a/deps b/deps index 33858dc939..73a41d3afe 100644 --- a/deps +++ b/deps @@ -43,6 +43,7 @@ [JMSSecurityExtraBundle] git=http://github.com/schmittjoh/JMSSecurityExtraBundle.git target=/bundles/JMS/SecurityExtraBundle + version=origin/1.0.x [SensioDistributionBundle] git=http://github.com/sensio/SensioDistributionBundle.git From e6e8d300cd1c4d864ec4db3e4e854f9cbca0ea35 Mon Sep 17 00:00:00 2001 From: alexandresalome Date: Fri, 16 Sep 2011 15:53:07 +0200 Subject: [PATCH 290/899] Remove checks for SQLite --- app/check.php | 1 - web/config.php | 4 ---- 2 files changed, 5 deletions(-) diff --git a/app/check.php b/app/check.php index 43087bd2e6..401dc3420c 100644 --- a/app/check.php +++ b/app/check.php @@ -28,7 +28,6 @@ check(is_writable(__DIR__.'/../app/cache'), sprintf('Checking that app/cache/ directory is writable'), 'Change the permissions of the app/cache/ directory so that the web server can write in it', true); check(is_writable(__DIR__.'/../app/logs'), sprintf('Checking that the app/logs/ directory is writable'), 'Change the permissions of the app/logs/ directory so that the web server can write in it', true); check(function_exists('json_encode'), 'Checking that the json_encode() is available', 'Install and enable the json extension', true); -check(class_exists('SQLite3') || in_array('sqlite', PDO::getAvailableDrivers()), 'Checking that the SQLite3 or PDO_SQLite extension is available', 'Install and enable the SQLite3 or PDO_SQLite extension.', true); check(function_exists('session_start'), 'Checking that the session_start() is available', 'Install and enable the session extension', true); check(function_exists('ctype_alpha'), 'Checking that the ctype_alpha() is available', 'Install and enable the ctype extension', true); check(!(function_exists('apc_store') && ini_get('apc.enabled')) || version_compare(phpversion('apc'), '3.0.17', '>='), 'Checking that the APC version is at least 3.0.17', 'Upgrade your APC extension (3.0.17+)', true); diff --git a/web/config.php b/web/config.php index 25ef14ec33..e6495e0c7c 100644 --- a/web/config.php +++ b/web/config.php @@ -96,10 +96,6 @@ } } -if (!class_exists('SQLite3') && !in_array('sqlite', PDO::getAvailableDrivers())) { - $majorProblems[] = 'Install and enable the SQLite3 or PDO_SQLite extension.'; -} - if (!function_exists('json_encode')) { $majorProblems[] = 'Install and enable the json extension.'; } From 25846a1202d1ac0c719fe5db201003b34443c8e8 Mon Sep 17 00:00:00 2001 From: Jordi Boggiano Date: Sat, 17 Sep 2011 12:58:33 +0200 Subject: [PATCH 291/899] Adjust the way of checking for windows --- app/check.php | 4 ++-- bin/vendors | 4 ++-- web/config.php | 2 +- 3 files changed, 5 insertions(+), 5 deletions(-) diff --git a/app/check.php b/app/check.php index 401dc3420c..20a65775bf 100644 --- a/app/check.php +++ b/app/check.php @@ -40,7 +40,7 @@ check(function_exists('mb_strlen'), 'Checking that the mb_strlen() function is available', 'Install and enable the mbstring extension', false); check(function_exists('iconv'), 'Checking that the iconv() function is available', 'Install and enable the iconv extension', false); check(function_exists('utf8_decode'), 'Checking that the utf8_decode() is available', 'Install and enable the XML extension', false); -if (PHP_OS != 'WINNT') { +if (!defined('PHP_WINDOWS_VERSION_BUILD')) { check(function_exists('posix_isatty'), 'Checking that the posix_isatty() is available', 'Install and enable the php_posix extension (used to colorized the CLI output)', false); } check(class_exists('Locale'), 'Checking that the intl extension is available', 'Install and enable the intl extension (used for validators)', false); @@ -63,7 +63,7 @@ check(version_compare($version, '4.0', '>='), 'Checking that the intl ICU version is at least 4+', 'Upgrade your intl extension with a newer ICU version (4+)', false); } -$accelerator = +$accelerator = (function_exists('apc_store') && ini_get('apc.enabled')) || function_exists('eaccelerator_put') && ini_get('eaccelerator.enable') diff --git a/bin/vendors b/bin/vendors index 719216d1a2..fbe6f70793 100755 --- a/bin/vendors +++ b/bin/vendors @@ -81,7 +81,7 @@ foreach ($deps as $name => $dep) { // install dir $installDir = isset($dep['target']) ? $vendorDir.'/'.$dep['target'] : $vendorDir.'/'.$name; if (in_array('--reinstall', $argv)) { - if (PHP_OS == 'WINNT') { + if (defined('PHP_WINDOWS_VERSION_BUILD')) { system(sprintf('rmdir /S /Q %s', escapeshellarg(realpath($installDir)))); } else { system(sprintf('rm -rf %s', escapeshellarg($installDir))); @@ -115,7 +115,7 @@ if ('update' === $command) { } // php on windows can't use the shebang line from system() -$interpreter = PHP_OS == 'WINNT' ? 'php.exe' : ''; +$interpreter = defined('PHP_WINDOWS_VERSION_BUILD') ? 'php.exe' : ''; // Update the bootstrap files system(sprintf('%s %s', $interpreter, escapeshellarg($rootDir.'/vendor/bundles/Sensio/Bundle/DistributionBundle/Resources/bin/build_bootstrap.php'))); diff --git a/web/config.php b/web/config.php index e6495e0c7c..7388de723f 100644 --- a/web/config.php +++ b/web/config.php @@ -69,7 +69,7 @@ $minorProblems[] = 'Install and enable the XML extension.'; } -if (PHP_OS != 'WINNT' && !function_exists('posix_isatty')) { +if (!defined('PHP_WINDOWS_VERSION_BUILD') && !function_exists('posix_isatty')) { $minorProblems[] = 'Install and enable the php_posix extension (used to colorize the CLI output).'; } From d9ce0523e5442a3d7f62c63c3b04cc1090bc41e9 Mon Sep 17 00:00:00 2001 From: Fabien Potencier Date: Mon, 19 Sep 2011 08:40:20 +0200 Subject: [PATCH 292/899] updated vendors --- deps.lock | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/deps.lock b/deps.lock index d8cdf78d52..cb361abc84 100644 --- a/deps.lock +++ b/deps.lock @@ -1,4 +1,4 @@ -symfony cfc202be93f98a0addf0e907b45b73566265c897 +symfony 1b66af1b99fc6840ba311c8e54f6bf838e15e591 twig 4a5057997d6d3ffacb2dad1550972a244d459ab8 monolog 303b8a83c87d5c6d749926cf02620465a5dcd0f2 doctrine-common 3f530763a550e0e1bee445492d551a443dc119a4 @@ -9,7 +9,7 @@ assetic f829ad23d23c87480151a21faad49fefe7c09e5d twig-extensions eba4f5d572bec05c72a47bbd73ba0a3330cf8f54 metadata 014d200714030996ae8ea26a7ccaccf86fc89734 SensioFrameworkExtraBundle 9b9194a47effc66b08d44ae110b982352119ca17 -JMSSecurityExtraBundle facedd50988b311f778288ea3b5e070591936f30 -SensioDistributionBundle 029151792beac272548fe9df183e15b9be521870 -SensioGeneratorBundle 019aa5ab8ed5017bb27b39f04cf2a659ff31ef74 +JMSSecurityExtraBundle b8b7eb294ed83d83ca7260ac018e701f08003538 +SensioDistributionBundle 2082cb99d408fd89243059c6eff866347ec00bbe +SensioGeneratorBundle 88ecf05691825c81b6a19ca6e2dc1849f1a5dcd4 AsseticBundle 9c1b7269a4517d1ae94af2dc0d6d6fc4b31e6c10 \ No newline at end of file From 4e6f7a564b57a97dcfa80ee73d609e50e0a40754 Mon Sep 17 00:00:00 2001 From: stealth35 Date: Mon, 19 Sep 2011 17:43:29 +0200 Subject: [PATCH 293/899] Fix 169 Update requirements : tokenkizer --- app/check.php | 1 + web/config.php | 4 ++++ 2 files changed, 5 insertions(+) diff --git a/app/check.php b/app/check.php index 43087bd2e6..66d2e41847 100644 --- a/app/check.php +++ b/app/check.php @@ -31,6 +31,7 @@ check(class_exists('SQLite3') || in_array('sqlite', PDO::getAvailableDrivers()), 'Checking that the SQLite3 or PDO_SQLite extension is available', 'Install and enable the SQLite3 or PDO_SQLite extension.', true); check(function_exists('session_start'), 'Checking that the session_start() is available', 'Install and enable the session extension', true); check(function_exists('ctype_alpha'), 'Checking that the ctype_alpha() is available', 'Install and enable the ctype extension', true); +check(function_exists('token_get_all'), 'Checking that the token_get_all() is available', 'Install and enable the tokenizer extension', true); check(!(function_exists('apc_store') && ini_get('apc.enabled')) || version_compare(phpversion('apc'), '3.0.17', '>='), 'Checking that the APC version is at least 3.0.17', 'Upgrade your APC extension (3.0.17+)', true); // warnings diff --git a/web/config.php b/web/config.php index 25ef14ec33..0e44270610 100644 --- a/web/config.php +++ b/web/config.php @@ -112,6 +112,10 @@ $majorProblems[] = 'Install and enable the ctype extension.'; } +if (!function_exists('token_get_all')) { + $majorProblems[] = 'Install and enable the Tokenizer extension.'; +} + // php.ini if (!ini_get('date.timezone')) { $phpini = true; From da1dd0869722a6408eb8f6fb0aa45309ffa2ccc1 Mon Sep 17 00:00:00 2001 From: Fabien Potencier Date: Tue, 20 Sep 2011 07:34:31 +0200 Subject: [PATCH 294/899] updated AsseticBundle to 1.0.1 --- deps | 2 +- deps.lock | 4 ++-- 2 files changed, 3 insertions(+), 3 deletions(-) diff --git a/deps b/deps index 73a41d3afe..e6aa043b49 100644 --- a/deps +++ b/deps @@ -56,4 +56,4 @@ [AsseticBundle] git=http://github.com/symfony/AsseticBundle.git target=/bundles/Symfony/Bundle/AsseticBundle - version=v1.0.0 + version=v1.0.1 diff --git a/deps.lock b/deps.lock index cb361abc84..a1036d1850 100644 --- a/deps.lock +++ b/deps.lock @@ -1,4 +1,4 @@ -symfony 1b66af1b99fc6840ba311c8e54f6bf838e15e591 +symfony e2463caacdba6348b27c2be04a1d420d3fa4c5a5 twig 4a5057997d6d3ffacb2dad1550972a244d459ab8 monolog 303b8a83c87d5c6d749926cf02620465a5dcd0f2 doctrine-common 3f530763a550e0e1bee445492d551a443dc119a4 @@ -12,4 +12,4 @@ SensioFrameworkExtraBundle 9b9194a47effc66b08d44ae110b982352119ca17 JMSSecurityExtraBundle b8b7eb294ed83d83ca7260ac018e701f08003538 SensioDistributionBundle 2082cb99d408fd89243059c6eff866347ec00bbe SensioGeneratorBundle 88ecf05691825c81b6a19ca6e2dc1849f1a5dcd4 -AsseticBundle 9c1b7269a4517d1ae94af2dc0d6d6fc4b31e6c10 \ No newline at end of file +AsseticBundle 41b5913b5086a0909af92adcb4a6005ee0051b16 \ No newline at end of file From 87994c4003e6d40a791f7c6be8f10f312cba29bb Mon Sep 17 00:00:00 2001 From: Fabien Potencier Date: Tue, 20 Sep 2011 07:39:39 +0200 Subject: [PATCH 295/899] updated vendors --- deps | 3 ++- deps.lock | 10 +++++----- 2 files changed, 7 insertions(+), 6 deletions(-) diff --git a/deps b/deps index 11d9ec28fe..912dfee8c9 100644 --- a/deps +++ b/deps @@ -44,6 +44,7 @@ [JMSSecurityExtraBundle] git=http://github.com/schmittjoh/JMSSecurityExtraBundle.git target=/bundles/JMS/SecurityExtraBundle + version=origin/1.0.x [SensioDistributionBundle] git=http://github.com/sensio/SensioDistributionBundle.git @@ -56,4 +57,4 @@ [AsseticBundle] git=http://github.com/symfony/AsseticBundle.git target=/bundles/Symfony/Bundle/AsseticBundle - version=v1.0.0 + version=v1.0.1 diff --git a/deps.lock b/deps.lock index 02ff67e54c..5a83ae8db0 100644 --- a/deps.lock +++ b/deps.lock @@ -1,4 +1,4 @@ -symfony 27dcc187f6f4eacfefee4fad908212d31c75153b +symfony b635dcad7aaab2befed8bc867e71e54e8589aec0 twig 396435ecd05556adb0a8bd05b14641cb4f8a8aa5 monolog 303b8a83c87d5c6d749926cf02620465a5dcd0f2 doctrine-common 3f530763a550e0e1bee445492d551a443dc119a4 @@ -9,7 +9,7 @@ assetic f829ad23d23c87480151a21faad49fefe7c09e5d twig-extensions eba4f5d572bec05c72a47bbd73ba0a3330cf8f54 metadata 8717ad2a5689480765d9ffafe925cd8a2457e582 SensioFrameworkExtraBundle 9b9194a47effc66b08d44ae110b982352119ca17 -JMSSecurityExtraBundle facedd50988b311f778288ea3b5e070591936f30 -SensioDistributionBundle 029151792beac272548fe9df183e15b9be521870 -SensioGeneratorBundle 019aa5ab8ed5017bb27b39f04cf2a659ff31ef74 -AsseticBundle 9c1b7269a4517d1ae94af2dc0d6d6fc4b31e6c10 \ No newline at end of file +JMSSecurityExtraBundle b8b7eb294ed83d83ca7260ac018e701f08003538 +SensioDistributionBundle 2082cb99d408fd89243059c6eff866347ec00bbe +SensioGeneratorBundle 88ecf05691825c81b6a19ca6e2dc1849f1a5dcd4 +AsseticBundle 41b5913b5086a0909af92adcb4a6005ee0051b16 \ No newline at end of file From efdc4efbdf903bae0a08b53f3c0c13319f93cdb1 Mon Sep 17 00:00:00 2001 From: Fabien Potencier Date: Sun, 25 Sep 2011 10:32:51 +0200 Subject: [PATCH 296/899] updated VENDORS for 2.0.2 --- deps | 8 ++++---- deps.lock | 8 ++++---- 2 files changed, 8 insertions(+), 8 deletions(-) diff --git a/deps b/deps index 912dfee8c9..1ff6b36881 100644 --- a/deps +++ b/deps @@ -1,6 +1,6 @@ [symfony] git=http://github.com/symfony/symfony.git - version=origin/2.0 + version=v2.0.2 [twig] git=http://github.com/fabpot/Twig.git @@ -12,15 +12,15 @@ [doctrine-common] git=http://github.com/doctrine/common.git - version=origin/2.1.x + version=2.1.1 [doctrine-dbal] git=http://github.com/doctrine/dbal.git - version=origin/2.1.x + version=2.1.2 [doctrine] git=http://github.com/doctrine/doctrine2.git - version=origin/2.1.x + version=2.1.1 [swiftmailer] git=http://github.com/swiftmailer/swiftmailer.git diff --git a/deps.lock b/deps.lock index 5a83ae8db0..17fcd907c1 100644 --- a/deps.lock +++ b/deps.lock @@ -1,9 +1,9 @@ -symfony b635dcad7aaab2befed8bc867e71e54e8589aec0 +symfony 3d89f340b309539d647b2e7d3aa541d60f808155 twig 396435ecd05556adb0a8bd05b14641cb4f8a8aa5 monolog 303b8a83c87d5c6d749926cf02620465a5dcd0f2 -doctrine-common 3f530763a550e0e1bee445492d551a443dc119a4 -doctrine-dbal 03ea47792cf04b70bd765ae09e0c327d31318e38 -doctrine cf10ee4d02432b3a19128d0d681a79ba329b89a6 +doctrine-common 174111c8d245d560e1af4c7455b730347f85686d +doctrine-dbal edc628f7e7fa5a116b9b41838e7955c03f7af2e0 +doctrine 05d12e20be58ab4d5fa403c5bd6ac06d1fce97e5 swiftmailer 8c3165691e36302405926abbae7526549db8b899 assetic f829ad23d23c87480151a21faad49fefe7c09e5d twig-extensions eba4f5d572bec05c72a47bbd73ba0a3330cf8f54 From bc60b480fed3528648f3881b0a6531511799f386 Mon Sep 17 00:00:00 2001 From: Fabien Potencier Date: Sun, 25 Sep 2011 10:42:13 +0200 Subject: [PATCH 297/899] updated vendors to dev branches --- deps | 8 ++++---- deps.lock | 8 ++++---- 2 files changed, 8 insertions(+), 8 deletions(-) diff --git a/deps b/deps index 1ff6b36881..912dfee8c9 100644 --- a/deps +++ b/deps @@ -1,6 +1,6 @@ [symfony] git=http://github.com/symfony/symfony.git - version=v2.0.2 + version=origin/2.0 [twig] git=http://github.com/fabpot/Twig.git @@ -12,15 +12,15 @@ [doctrine-common] git=http://github.com/doctrine/common.git - version=2.1.1 + version=origin/2.1.x [doctrine-dbal] git=http://github.com/doctrine/dbal.git - version=2.1.2 + version=origin/2.1.x [doctrine] git=http://github.com/doctrine/doctrine2.git - version=2.1.1 + version=origin/2.1.x [swiftmailer] git=http://github.com/swiftmailer/swiftmailer.git diff --git a/deps.lock b/deps.lock index 17fcd907c1..9a76c547e6 100644 --- a/deps.lock +++ b/deps.lock @@ -1,9 +1,9 @@ -symfony 3d89f340b309539d647b2e7d3aa541d60f808155 +symfony 604d066b52f1bc59f98568ce2e097abc3195df27 twig 396435ecd05556adb0a8bd05b14641cb4f8a8aa5 monolog 303b8a83c87d5c6d749926cf02620465a5dcd0f2 -doctrine-common 174111c8d245d560e1af4c7455b730347f85686d -doctrine-dbal edc628f7e7fa5a116b9b41838e7955c03f7af2e0 -doctrine 05d12e20be58ab4d5fa403c5bd6ac06d1fce97e5 +doctrine-common 65fcc72fec14f65db9f2900d5a26b5a8a68d81bd +doctrine-dbal 03ea47792cf04b70bd765ae09e0c327d31318e38 +doctrine cf10ee4d02432b3a19128d0d681a79ba329b89a6 swiftmailer 8c3165691e36302405926abbae7526549db8b899 assetic f829ad23d23c87480151a21faad49fefe7c09e5d twig-extensions eba4f5d572bec05c72a47bbd73ba0a3330cf8f54 From 3f3e20a1bb676b5f07cb0bc22cc0cc9eed01dc3e Mon Sep 17 00:00:00 2001 From: Fabien Potencier Date: Sun, 25 Sep 2011 11:57:12 +0200 Subject: [PATCH 298/899] updated VENDORS for 2.0.3 --- deps | 9 +++++---- deps.lock | 8 ++++---- 2 files changed, 9 insertions(+), 8 deletions(-) diff --git a/deps b/deps index 912dfee8c9..a2c6fde271 100644 --- a/deps +++ b/deps @@ -1,6 +1,6 @@ [symfony] git=http://github.com/symfony/symfony.git - version=origin/2.0 + version=v2.0.3 [twig] git=http://github.com/fabpot/Twig.git @@ -12,15 +12,15 @@ [doctrine-common] git=http://github.com/doctrine/common.git - version=origin/2.1.x + version=2.1.1 [doctrine-dbal] git=http://github.com/doctrine/dbal.git - version=origin/2.1.x + version=2.1.2 [doctrine] git=http://github.com/doctrine/doctrine2.git - version=origin/2.1.x + version=2.1.1 [swiftmailer] git=http://github.com/swiftmailer/swiftmailer.git @@ -49,6 +49,7 @@ [SensioDistributionBundle] git=http://github.com/sensio/SensioDistributionBundle.git target=/bundles/Sensio/Bundle/DistributionBundle + version=origin/1.0 [SensioGeneratorBundle] git=http://github.com/sensio/SensioGeneratorBundle.git diff --git a/deps.lock b/deps.lock index 9a76c547e6..66dd0d1b4c 100644 --- a/deps.lock +++ b/deps.lock @@ -1,9 +1,9 @@ -symfony 604d066b52f1bc59f98568ce2e097abc3195df27 +symfony 6a25df0ebf92074bf541fc7ca53d9fcd27981c3d twig 396435ecd05556adb0a8bd05b14641cb4f8a8aa5 monolog 303b8a83c87d5c6d749926cf02620465a5dcd0f2 -doctrine-common 65fcc72fec14f65db9f2900d5a26b5a8a68d81bd -doctrine-dbal 03ea47792cf04b70bd765ae09e0c327d31318e38 -doctrine cf10ee4d02432b3a19128d0d681a79ba329b89a6 +doctrine-common 174111c8d245d560e1af4c7455b730347f85686d +doctrine-dbal edc628f7e7fa5a116b9b41838e7955c03f7af2e0 +doctrine 05d12e20be58ab4d5fa403c5bd6ac06d1fce97e5 swiftmailer 8c3165691e36302405926abbae7526549db8b899 assetic f829ad23d23c87480151a21faad49fefe7c09e5d twig-extensions eba4f5d572bec05c72a47bbd73ba0a3330cf8f54 From cfca9c4ec693db6cb94b2a19378b8ade4d5658fa Mon Sep 17 00:00:00 2001 From: Fabien Potencier Date: Sun, 25 Sep 2011 11:59:02 +0200 Subject: [PATCH 299/899] updated vendors to dev branches --- deps | 8 ++++---- deps.lock | 8 ++++---- 2 files changed, 8 insertions(+), 8 deletions(-) diff --git a/deps b/deps index a2c6fde271..9834cb40c4 100644 --- a/deps +++ b/deps @@ -1,6 +1,6 @@ [symfony] git=http://github.com/symfony/symfony.git - version=v2.0.3 + version=origin/2.0 [twig] git=http://github.com/fabpot/Twig.git @@ -12,15 +12,15 @@ [doctrine-common] git=http://github.com/doctrine/common.git - version=2.1.1 + version=origin/2.1.x [doctrine-dbal] git=http://github.com/doctrine/dbal.git - version=2.1.2 + version=origin/2.1.x [doctrine] git=http://github.com/doctrine/doctrine2.git - version=2.1.1 + version=origin/2.1.x [swiftmailer] git=http://github.com/swiftmailer/swiftmailer.git diff --git a/deps.lock b/deps.lock index 66dd0d1b4c..1049d02c77 100644 --- a/deps.lock +++ b/deps.lock @@ -1,9 +1,9 @@ -symfony 6a25df0ebf92074bf541fc7ca53d9fcd27981c3d +symfony 369d4da4ebd7e05ffe7d178f4c20e08417817d12 twig 396435ecd05556adb0a8bd05b14641cb4f8a8aa5 monolog 303b8a83c87d5c6d749926cf02620465a5dcd0f2 -doctrine-common 174111c8d245d560e1af4c7455b730347f85686d -doctrine-dbal edc628f7e7fa5a116b9b41838e7955c03f7af2e0 -doctrine 05d12e20be58ab4d5fa403c5bd6ac06d1fce97e5 +doctrine-common 65fcc72fec14f65db9f2900d5a26b5a8a68d81bd +doctrine-dbal 03ea47792cf04b70bd765ae09e0c327d31318e38 +doctrine cf10ee4d02432b3a19128d0d681a79ba329b89a6 swiftmailer 8c3165691e36302405926abbae7526549db8b899 assetic f829ad23d23c87480151a21faad49fefe7c09e5d twig-extensions eba4f5d572bec05c72a47bbd73ba0a3330cf8f54 From bfd2cf2208fa6abf45d71baa71e0584b07cc8b0b Mon Sep 17 00:00:00 2001 From: Fabien Potencier Date: Wed, 28 Sep 2011 08:30:39 +0200 Subject: [PATCH 300/899] removed execution time limit for the console and the vendors script --- app/console | 2 ++ bin/vendors | 2 ++ 2 files changed, 4 insertions(+) diff --git a/app/console b/app/console index 281acd4bca..c1e47996c7 100755 --- a/app/console +++ b/app/console @@ -1,6 +1,8 @@ #!/usr/bin/env php Date: Wed, 28 Sep 2011 21:56:14 +0200 Subject: [PATCH 301/899] removed check for LIBXML_COMPACT as this is now checked directly in the source code --- app/check.php | 1 - web/config.php | 4 ---- 2 files changed, 5 deletions(-) diff --git a/app/check.php b/app/check.php index 66d2e41847..9481c07348 100644 --- a/app/check.php +++ b/app/check.php @@ -37,7 +37,6 @@ // warnings echo_title("Optional checks"); check(class_exists('DomDocument'), 'Checking that the PHP-XML module is installed', 'Install and enable the php-xml module', false); -check(defined('LIBXML_COMPACT'), 'Checking that the libxml version is at least 2.6.21', 'Upgrade your php-xml module with a newer libxml', false); check(function_exists('token_get_all'), 'Checking that the token_get_all() function is available', 'Install and enable the Tokenizer extension (highly recommended)', false); check(function_exists('mb_strlen'), 'Checking that the mb_strlen() function is available', 'Install and enable the mbstring extension', false); check(function_exists('iconv'), 'Checking that the iconv() function is available', 'Install and enable the iconv extension', false); diff --git a/web/config.php b/web/config.php index 0e44270610..56c58a66d4 100644 --- a/web/config.php +++ b/web/config.php @@ -41,10 +41,6 @@ $minorProblems[] = 'Install and enable the php-xml module.'; } -if (!defined('LIBXML_COMPACT')) { - $minorProblems[] = 'Upgrade your php-xml extension with a newer libxml.'; -} - if (!((function_exists('apc_store') && ini_get('apc.enabled')) || function_exists('eaccelerator_put') && ini_get('eaccelerator.enable') || function_exists('xcache_set'))) { $minorProblems[] = 'Install and enable a PHP accelerator like APC (highly recommended).'; } From c31e38ec9ca9e170e4f4428d9294a9dc047cb041 Mon Sep 17 00:00:00 2001 From: Fabien Potencier Date: Wed, 28 Sep 2011 22:42:11 +0200 Subject: [PATCH 302/899] added a commented umask(0000) to simplify permissions setup (should only be used in the dev environment though) --- app/console | 4 ++++ web/app_dev.php | 4 ++++ 2 files changed, 8 insertions(+) diff --git a/app/console b/app/console index c1e47996c7..468cc84057 100755 --- a/app/console +++ b/app/console @@ -1,6 +1,10 @@ #!/usr/bin/env php Date: Thu, 29 Sep 2011 11:45:47 +0200 Subject: [PATCH 303/899] moved parameters.ini to parameters.yml --- app/config/config.yml | 2 +- app/config/parameters.ini | 19 ------------------- app/config/parameters.yml | 13 +++++++++++++ 3 files changed, 14 insertions(+), 20 deletions(-) delete mode 100644 app/config/parameters.ini create mode 100644 app/config/parameters.yml diff --git a/app/config/config.yml b/app/config/config.yml index ba0effa87a..de1932aa23 100644 --- a/app/config/config.yml +++ b/app/config/config.yml @@ -1,5 +1,5 @@ imports: - - { resource: parameters.ini } + - { resource: parameters.yml } - { resource: security.yml } framework: diff --git a/app/config/parameters.ini b/app/config/parameters.ini deleted file mode 100644 index 3628066c4f..0000000000 --- a/app/config/parameters.ini +++ /dev/null @@ -1,19 +0,0 @@ -; These parameters can be imported into other config files -; by enclosing the key with % (like %database_user%) -; Comments start with ';', as in php.ini -[parameters] - database_driver = pdo_mysql - database_host = localhost - database_port = - database_name = symfony - database_user = root - database_password = - - mailer_transport = smtp - mailer_host = localhost - mailer_user = - mailer_password = - - locale = en - - secret = ThisTokenIsNotSoSecretChangeIt diff --git a/app/config/parameters.yml b/app/config/parameters.yml new file mode 100644 index 0000000000..84f79b09f2 --- /dev/null +++ b/app/config/parameters.yml @@ -0,0 +1,13 @@ +parameters: + database_driver: pdo_mysql + database_host: localhost + database_port: '1111' + database_name: symfonyaaa + database_user: root + database_password: null + mailer_transport: smtp + mailer_host: localhost + mailer_user: null + mailer_password: null + locale: en + secret: ee71517c5016eb25c8cc5108625f5d622 From 858934ab53f8b1b75a2f521376e7e0cb84666912 Mon Sep 17 00:00:00 2001 From: gordonslondon Date: Thu, 29 Sep 2011 21:51:21 +0200 Subject: [PATCH 304/899] create app/cache folder by default --- app/cache/.gitkeep | 0 1 file changed, 0 insertions(+), 0 deletions(-) create mode 100644 app/cache/.gitkeep diff --git a/app/cache/.gitkeep b/app/cache/.gitkeep new file mode 100644 index 0000000000..e69de29bb2 From b68c3d4db0b4a99a35970d9fab0e86a8975a613e Mon Sep 17 00:00:00 2001 From: Fabien Potencier Date: Fri, 30 Sep 2011 09:40:20 +0200 Subject: [PATCH 305/899] updated vendors --- deps.lock | 10 +++++----- 1 file changed, 5 insertions(+), 5 deletions(-) diff --git a/deps.lock b/deps.lock index a1036d1850..2bcdc3f2fc 100644 --- a/deps.lock +++ b/deps.lock @@ -1,15 +1,15 @@ -symfony e2463caacdba6348b27c2be04a1d420d3fa4c5a5 +symfony 1467bdb86837e132891dd1b5605248a736cca5fe twig 4a5057997d6d3ffacb2dad1550972a244d459ab8 monolog 303b8a83c87d5c6d749926cf02620465a5dcd0f2 -doctrine-common 3f530763a550e0e1bee445492d551a443dc119a4 -doctrine-dbal 03ea47792cf04b70bd765ae09e0c327d31318e38 -doctrine cf10ee4d02432b3a19128d0d681a79ba329b89a6 +doctrine-common 2913bcf6cf5a39fba49b4de07650510a56612929 +doctrine-dbal 17005ec6a0d1c6647597c37749a1087807e12c83 +doctrine 623ab9cee97b99188f0b5bb671ef8e2618485bf5 swiftmailer 8c3165691e36302405926abbae7526549db8b899 assetic f829ad23d23c87480151a21faad49fefe7c09e5d twig-extensions eba4f5d572bec05c72a47bbd73ba0a3330cf8f54 metadata 014d200714030996ae8ea26a7ccaccf86fc89734 SensioFrameworkExtraBundle 9b9194a47effc66b08d44ae110b982352119ca17 JMSSecurityExtraBundle b8b7eb294ed83d83ca7260ac018e701f08003538 -SensioDistributionBundle 2082cb99d408fd89243059c6eff866347ec00bbe +SensioDistributionBundle a186b53154bc137a65802ef567e4a2eee2082d21 SensioGeneratorBundle 88ecf05691825c81b6a19ca6e2dc1849f1a5dcd4 AsseticBundle 41b5913b5086a0909af92adcb4a6005ee0051b16 \ No newline at end of file From 619c6a4b7d4c7b5ef086ea5016c8c72ae780d493 Mon Sep 17 00:00:00 2001 From: Fabien Potencier Date: Mon, 3 Oct 2011 21:43:34 +0200 Subject: [PATCH 306/899] fixed default values in parameters.yml --- app/config/parameters.yml | 26 ++++++++++++++------------ 1 file changed, 14 insertions(+), 12 deletions(-) diff --git a/app/config/parameters.yml b/app/config/parameters.yml index 84f79b09f2..479d2137cb 100644 --- a/app/config/parameters.yml +++ b/app/config/parameters.yml @@ -1,13 +1,15 @@ parameters: - database_driver: pdo_mysql - database_host: localhost - database_port: '1111' - database_name: symfonyaaa - database_user: root - database_password: null - mailer_transport: smtp - mailer_host: localhost - mailer_user: null - mailer_password: null - locale: en - secret: ee71517c5016eb25c8cc5108625f5d622 + database_driver: pdo_mysql + database_host: localhost + database_port: ~ + database_name: symfony + database_user: root + database_password: ~ + + mailer_transport: smtp + mailer_host: localhost + mailer_user: ~ + mailer_password: ~ + + locale: en + secret: ThisTokenIsNotSoSecretChangeIt From cf3fbc8e5f2841acc4f18943095b3b03d0bc65ea Mon Sep 17 00:00:00 2001 From: Fabien Potencier Date: Tue, 4 Oct 2011 14:05:31 +0200 Subject: [PATCH 307/899] updated VENDORS for 2.0.4 --- deps | 8 ++++---- deps.lock | 8 ++++---- 2 files changed, 8 insertions(+), 8 deletions(-) diff --git a/deps b/deps index 9834cb40c4..234da40063 100644 --- a/deps +++ b/deps @@ -1,6 +1,6 @@ [symfony] git=http://github.com/symfony/symfony.git - version=origin/2.0 + version=v2.0.4 [twig] git=http://github.com/fabpot/Twig.git @@ -12,15 +12,15 @@ [doctrine-common] git=http://github.com/doctrine/common.git - version=origin/2.1.x + version=2.1.2 [doctrine-dbal] git=http://github.com/doctrine/dbal.git - version=origin/2.1.x + version=2.1.3 [doctrine] git=http://github.com/doctrine/doctrine2.git - version=origin/2.1.x + version=2.1.2 [swiftmailer] git=http://github.com/swiftmailer/swiftmailer.git diff --git a/deps.lock b/deps.lock index 1049d02c77..03f12f9160 100644 --- a/deps.lock +++ b/deps.lock @@ -1,9 +1,9 @@ -symfony 369d4da4ebd7e05ffe7d178f4c20e08417817d12 +symfony 1f2e72d84aa9a4829185d6b2a0b814f6b933b30a twig 396435ecd05556adb0a8bd05b14641cb4f8a8aa5 monolog 303b8a83c87d5c6d749926cf02620465a5dcd0f2 -doctrine-common 65fcc72fec14f65db9f2900d5a26b5a8a68d81bd -doctrine-dbal 03ea47792cf04b70bd765ae09e0c327d31318e38 -doctrine cf10ee4d02432b3a19128d0d681a79ba329b89a6 +doctrine-common b385ca770888248241bd3086a40d5b3bd082a706 +doctrine-dbal e0b69790ab1ffd646fd70a04fdb91e5dfbb3ccf1 +doctrine 144d0de0ab61dffc738d7fb590cff8d77919f553 swiftmailer 8c3165691e36302405926abbae7526549db8b899 assetic f829ad23d23c87480151a21faad49fefe7c09e5d twig-extensions eba4f5d572bec05c72a47bbd73ba0a3330cf8f54 From 7043188f844b6a6ce090d7c650c7f9ddb51bb997 Mon Sep 17 00:00:00 2001 From: Fabien Potencier Date: Tue, 4 Oct 2011 14:07:04 +0200 Subject: [PATCH 308/899] updated vendors to dev branches --- deps | 8 ++++---- deps.lock | 6 +++--- 2 files changed, 7 insertions(+), 7 deletions(-) diff --git a/deps b/deps index 234da40063..9834cb40c4 100644 --- a/deps +++ b/deps @@ -1,6 +1,6 @@ [symfony] git=http://github.com/symfony/symfony.git - version=v2.0.4 + version=origin/2.0 [twig] git=http://github.com/fabpot/Twig.git @@ -12,15 +12,15 @@ [doctrine-common] git=http://github.com/doctrine/common.git - version=2.1.2 + version=origin/2.1.x [doctrine-dbal] git=http://github.com/doctrine/dbal.git - version=2.1.3 + version=origin/2.1.x [doctrine] git=http://github.com/doctrine/doctrine2.git - version=2.1.2 + version=origin/2.1.x [swiftmailer] git=http://github.com/swiftmailer/swiftmailer.git diff --git a/deps.lock b/deps.lock index 03f12f9160..4f2a99e56d 100644 --- a/deps.lock +++ b/deps.lock @@ -1,9 +1,9 @@ symfony 1f2e72d84aa9a4829185d6b2a0b814f6b933b30a twig 396435ecd05556adb0a8bd05b14641cb4f8a8aa5 monolog 303b8a83c87d5c6d749926cf02620465a5dcd0f2 -doctrine-common b385ca770888248241bd3086a40d5b3bd082a706 -doctrine-dbal e0b69790ab1ffd646fd70a04fdb91e5dfbb3ccf1 -doctrine 144d0de0ab61dffc738d7fb590cff8d77919f553 +doctrine-common 2913bcf6cf5a39fba49b4de07650510a56612929 +doctrine-dbal 17005ec6a0d1c6647597c37749a1087807e12c83 +doctrine 623ab9cee97b99188f0b5bb671ef8e2618485bf5 swiftmailer 8c3165691e36302405926abbae7526549db8b899 assetic f829ad23d23c87480151a21faad49fefe7c09e5d twig-extensions eba4f5d572bec05c72a47bbd73ba0a3330cf8f54 From 0ec0c126ecfa4fc721dfa1b94166a5d39312c25a Mon Sep 17 00:00:00 2001 From: Johannes Date: Tue, 4 Oct 2011 16:06:47 +0300 Subject: [PATCH 309/899] updated version --- deps | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/deps b/deps index e6aa043b49..a598f6a7ae 100644 --- a/deps +++ b/deps @@ -34,7 +34,7 @@ [metadata] git=http://github.com/schmittjoh/metadata.git - version=origin/1.0.x + version=1.1.0 [SensioFrameworkExtraBundle] git=http://github.com/sensio/SensioFrameworkExtraBundle.git From 070de68eca94974cf6602b2a4f93cc82693991ab Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?J=C3=A9r=C3=A9my=20CROMBEZ?= Date: Thu, 6 Oct 2011 17:51:36 +0300 Subject: [PATCH 310/899] Message correction to reflect the recent naming change of "parameters.ini" to "parameters.yml". --- web/config.php | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/web/config.php b/web/config.php index 7388de723f..efb41d9829 100644 --- a/web/config.php +++ b/web/config.php @@ -152,7 +152,7 @@

    Welcome!

    Welcome to your new Symfony project.

    -

    This script will guide you through the basic configuration of your project. You can also do the same by editing the ‘app/config/parameters.ini’ file directly.

    +

    This script will guide you through the basic configuration of your project. You can also do the same by editing the ‘app/config/parameters.yml’ file directly.

    From 3b7c46a7f2229ddac595cf738134612b0b3fddb6 Mon Sep 17 00:00:00 2001 From: Kris Wallsmith Date: Fri, 7 Oct 2011 06:10:58 -0700 Subject: [PATCH 311/899] updated default assetic config so no bundles are scanned for assetic tags --- app/config/config.yml | 1 + 1 file changed, 1 insertion(+) diff --git a/app/config/config.yml b/app/config/config.yml index de1932aa23..2c6d94f3f2 100644 --- a/app/config/config.yml +++ b/app/config/config.yml @@ -25,6 +25,7 @@ twig: assetic: debug: %kernel.debug% use_controller: false + bundles: [ ] filters: cssrewrite: ~ # closure: From 8686e87715c20d7b02ba6244b87917b50706cf87 Mon Sep 17 00:00:00 2001 From: Ryan Weaver Date: Fri, 7 Oct 2011 13:20:44 -0500 Subject: [PATCH 312/899] Explicitly passing the project's root dir to the build_bootstrap.php script This takes advantage of a recent change in the SensioDistributionBundle which allows this. A specific situation this addresses is when the `vendor` dir is symlinked, and the build_bootstrap.php script mistakenly places the bootstrap.php.cache in ../app of the vendor dir's real location (instead of actually inside the project). --- bin/vendors | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/bin/vendors b/bin/vendors index 8b96132f5a..d5ef38f363 100755 --- a/bin/vendors +++ b/bin/vendors @@ -120,7 +120,7 @@ if ('update' === $command) { $interpreter = PHP_OS == 'WINNT' ? 'php.exe' : ''; // Update the bootstrap files -system(sprintf('%s %s', $interpreter, escapeshellarg($rootDir.'/vendor/bundles/Sensio/Bundle/DistributionBundle/Resources/bin/build_bootstrap.php'))); +system(sprintf('%s %s %s', $interpreter, escapeshellarg($rootDir.'/vendor/bundles/Sensio/Bundle/DistributionBundle/Resources/bin/build_bootstrap.php'), $rootDir)); // Update assets system(sprintf('%s %s assets:install %s', $interpreter, escapeshellarg($rootDir.'/app/console'), escapeshellarg($rootDir.'/web/'))); From 921e20394980fccdb7b5c4dd69953d1d89c67e0d Mon Sep 17 00:00:00 2001 From: Ryan Weaver Date: Fri, 7 Oct 2011 16:21:36 -0500 Subject: [PATCH 313/899] [DemoBundle] Fixing test client - `createClient()` is a static function --- src/Acme/DemoBundle/Tests/Controller/DemoControllerTest.php | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/src/Acme/DemoBundle/Tests/Controller/DemoControllerTest.php b/src/Acme/DemoBundle/Tests/Controller/DemoControllerTest.php index 7cb0238464..2941af9a18 100644 --- a/src/Acme/DemoBundle/Tests/Controller/DemoControllerTest.php +++ b/src/Acme/DemoBundle/Tests/Controller/DemoControllerTest.php @@ -8,7 +8,7 @@ class DemoControllerTest extends WebTestCase { public function testIndex() { - $client = $this->createClient(); + $client = static::createClient(); $crawler = $client->request('GET', '/demo/hello/Fabien'); From 7b91b5beb8172003eb0590fa85f7ccee256aee32 Mon Sep 17 00:00:00 2001 From: Fabien Potencier Date: Sun, 9 Oct 2011 20:26:37 +0200 Subject: [PATCH 314/899] fixed default_locale configuration --- app/config/config.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/app/config/config.yml b/app/config/config.yml index de1932aa23..3e2edc6cec 100644 --- a/app/config/config.yml +++ b/app/config/config.yml @@ -12,8 +12,8 @@ framework: csrf_protection: true validation: { enable_annotations: true } templating: { engines: ['twig'] } #assets_version: SomeVersionScheme + default_locale: %locale% session: - default_locale: %locale% auto_start: true # Twig Configuration From 809b68fe25ab3e19446e42ce18ecd8b80095283d Mon Sep 17 00:00:00 2001 From: Fabien Potencier Date: Thu, 13 Oct 2011 15:53:47 +0200 Subject: [PATCH 315/899] fixed markup in config.php --- web/config.php | 15 +++++++-------- 1 file changed, 7 insertions(+), 8 deletions(-) diff --git a/web/config.php b/web/config.php index 56c58a66d4..ac530e1aae 100644 --- a/web/config.php +++ b/web/config.php @@ -188,14 +188,13 @@ -

    * - - Changes to the php.ini file must be done in "". - - To change settings, create a "php.ini". - -

    -

    +

    * + + Changes to the php.ini file must be done in "". + + To change settings, create a "php.ini". + +

      From a46859b3fc9d307ecaf16624b6e16bc9b081800f Mon Sep 17 00:00:00 2001 From: Fabien Potencier Date: Sat, 15 Oct 2011 01:54:45 +0200 Subject: [PATCH 316/899] updated deps --- deps | 3 +-- deps.lock | 12 ++++++------ 2 files changed, 7 insertions(+), 8 deletions(-) diff --git a/deps b/deps index 251de7f302..b43f707202 100644 --- a/deps +++ b/deps @@ -3,7 +3,7 @@ [twig] git=http://github.com/fabpot/Twig.git - version=v1.2.0 + version=v1.3.0 [monolog] git=http://github.com/Seldaek/monolog.git @@ -48,7 +48,6 @@ [SensioDistributionBundle] git=http://github.com/sensio/SensioDistributionBundle.git target=/bundles/Sensio/Bundle/DistributionBundle - version=origin/1.0 [SensioGeneratorBundle] git=http://github.com/sensio/SensioGeneratorBundle.git diff --git a/deps.lock b/deps.lock index 2bcdc3f2fc..509722a78d 100644 --- a/deps.lock +++ b/deps.lock @@ -1,13 +1,13 @@ -symfony 1467bdb86837e132891dd1b5605248a736cca5fe -twig 4a5057997d6d3ffacb2dad1550972a244d459ab8 +symfony 5b69dae9c8384a3e8c0cbc1a2ec5dc4fa44d05d3 +twig 4b929992df65808f36e8f93f87fa66a9fce03629 monolog 303b8a83c87d5c6d749926cf02620465a5dcd0f2 -doctrine-common 2913bcf6cf5a39fba49b4de07650510a56612929 -doctrine-dbal 17005ec6a0d1c6647597c37749a1087807e12c83 -doctrine 623ab9cee97b99188f0b5bb671ef8e2618485bf5 +doctrine-common e4a48faef35752ba3cd1d261316313e9c09e0c81 +doctrine-dbal 5084e6bf5ded98b01feb847935d40e5e260b5025 +doctrine ef4d8410f6137d61a31655f6168b17ec76dff27a swiftmailer 8c3165691e36302405926abbae7526549db8b899 assetic f829ad23d23c87480151a21faad49fefe7c09e5d twig-extensions eba4f5d572bec05c72a47bbd73ba0a3330cf8f54 -metadata 014d200714030996ae8ea26a7ccaccf86fc89734 +metadata 30c622cad82e39a6856b981a9bfb9df06b3cc067 SensioFrameworkExtraBundle 9b9194a47effc66b08d44ae110b982352119ca17 JMSSecurityExtraBundle b8b7eb294ed83d83ca7260ac018e701f08003538 SensioDistributionBundle a186b53154bc137a65802ef567e4a2eee2082d21 From 79f849cd965a7fd47c9f63d60f4bcb83d599f5e3 Mon Sep 17 00:00:00 2001 From: Fabien Potencier Date: Sat, 15 Oct 2011 03:58:50 +0200 Subject: [PATCH 317/899] updated vendors --- deps | 6 +++--- deps.lock | 8 ++++---- 2 files changed, 7 insertions(+), 7 deletions(-) diff --git a/deps b/deps index b43f707202..c647e6e0e2 100644 --- a/deps +++ b/deps @@ -11,15 +11,15 @@ [doctrine-common] git=http://github.com/doctrine/common.git - version=origin/2.1.x + version=origin/master [doctrine-dbal] git=http://github.com/doctrine/dbal.git - version=origin/2.1.x + version=origin/master [doctrine] git=http://github.com/doctrine/doctrine2.git - version=origin/2.1.x + version=origin/master [swiftmailer] git=http://github.com/swiftmailer/swiftmailer.git diff --git a/deps.lock b/deps.lock index 509722a78d..a9c5c46790 100644 --- a/deps.lock +++ b/deps.lock @@ -1,9 +1,9 @@ -symfony 5b69dae9c8384a3e8c0cbc1a2ec5dc4fa44d05d3 +symfony 8b4552ff76fcea38e622081b3f74bd1b02955d65 twig 4b929992df65808f36e8f93f87fa66a9fce03629 monolog 303b8a83c87d5c6d749926cf02620465a5dcd0f2 -doctrine-common e4a48faef35752ba3cd1d261316313e9c09e0c81 -doctrine-dbal 5084e6bf5ded98b01feb847935d40e5e260b5025 -doctrine ef4d8410f6137d61a31655f6168b17ec76dff27a +doctrine-common b2fd909b4b5476df01744c9d34c7a23723a687b6 +doctrine-dbal f14cab2a7517d36714d97ae69641c7f709fc4eb8 +doctrine 4a920d0aad06f3fd102ad812227a67ac1bd2d8df swiftmailer 8c3165691e36302405926abbae7526549db8b899 assetic f829ad23d23c87480151a21faad49fefe7c09e5d twig-extensions eba4f5d572bec05c72a47bbd73ba0a3330cf8f54 From a6c8a77567b084a8565916fe2b3df37429701ac7 Mon Sep 17 00:00:00 2001 From: Fabien Potencier Date: Mon, 24 Oct 2011 11:07:00 +0200 Subject: [PATCH 318/899] updated vendors --- deps | 2 +- deps.lock | 12 ++++++------ 2 files changed, 7 insertions(+), 7 deletions(-) diff --git a/deps b/deps index c647e6e0e2..c7481d517a 100644 --- a/deps +++ b/deps @@ -3,7 +3,7 @@ [twig] git=http://github.com/fabpot/Twig.git - version=v1.3.0 + version=origin/master [monolog] git=http://github.com/Seldaek/monolog.git diff --git a/deps.lock b/deps.lock index a9c5c46790..9604e5eac1 100644 --- a/deps.lock +++ b/deps.lock @@ -1,14 +1,14 @@ -symfony 8b4552ff76fcea38e622081b3f74bd1b02955d65 -twig 4b929992df65808f36e8f93f87fa66a9fce03629 +symfony 08b5d73c375e946a570e0307e412a2169039dee6 +twig d10966132b34076d67aa2d5ed07d66217db106c4 monolog 303b8a83c87d5c6d749926cf02620465a5dcd0f2 -doctrine-common b2fd909b4b5476df01744c9d34c7a23723a687b6 -doctrine-dbal f14cab2a7517d36714d97ae69641c7f709fc4eb8 -doctrine 4a920d0aad06f3fd102ad812227a67ac1bd2d8df +doctrine-common f5314bd482b87a0badc08add0dcd9cd6af32262f +doctrine-dbal dea79e7bfbabf973e807539e258ccf3b9ee98f45 +doctrine 993d6f5ac80c180d2d0e4458c18f7ff1ea20357b swiftmailer 8c3165691e36302405926abbae7526549db8b899 assetic f829ad23d23c87480151a21faad49fefe7c09e5d twig-extensions eba4f5d572bec05c72a47bbd73ba0a3330cf8f54 metadata 30c622cad82e39a6856b981a9bfb9df06b3cc067 -SensioFrameworkExtraBundle 9b9194a47effc66b08d44ae110b982352119ca17 +SensioFrameworkExtraBundle b6565d32d71325be1f56943a8758b18f5999de8c JMSSecurityExtraBundle b8b7eb294ed83d83ca7260ac018e701f08003538 SensioDistributionBundle a186b53154bc137a65802ef567e4a2eee2082d21 SensioGeneratorBundle 88ecf05691825c81b6a19ca6e2dc1849f1a5dcd4 From 5cf335921931f741a77688760bc076999b6bac6b Mon Sep 17 00:00:00 2001 From: Fabien Potencier Date: Mon, 24 Oct 2011 11:48:46 +0200 Subject: [PATCH 319/899] updated vendors --- deps.lock | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/deps.lock b/deps.lock index 9604e5eac1..c00eb90e97 100644 --- a/deps.lock +++ b/deps.lock @@ -1,4 +1,4 @@ -symfony 08b5d73c375e946a570e0307e412a2169039dee6 +symfony 714d0326d64b9abea8bb8dee9295c425b741ed60 twig d10966132b34076d67aa2d5ed07d66217db106c4 monolog 303b8a83c87d5c6d749926cf02620465a5dcd0f2 doctrine-common f5314bd482b87a0badc08add0dcd9cd6af32262f From 4bbcd79562b76429370fb65d8b40bce4410934fd Mon Sep 17 00:00:00 2001 From: Fabien Potencier Date: Mon, 24 Oct 2011 11:49:52 +0200 Subject: [PATCH 320/899] updated vendors --- deps.lock | 10 +++++----- 1 file changed, 5 insertions(+), 5 deletions(-) diff --git a/deps.lock b/deps.lock index 4f2a99e56d..a885ca57a7 100644 --- a/deps.lock +++ b/deps.lock @@ -1,14 +1,14 @@ -symfony 1f2e72d84aa9a4829185d6b2a0b814f6b933b30a +symfony cbb4bbae977eb7e0651b9963cbef84fa75349c3d twig 396435ecd05556adb0a8bd05b14641cb4f8a8aa5 monolog 303b8a83c87d5c6d749926cf02620465a5dcd0f2 -doctrine-common 2913bcf6cf5a39fba49b4de07650510a56612929 -doctrine-dbal 17005ec6a0d1c6647597c37749a1087807e12c83 -doctrine 623ab9cee97b99188f0b5bb671ef8e2618485bf5 +doctrine-common e4a48faef35752ba3cd1d261316313e9c09e0c81 +doctrine-dbal 5084e6bf5ded98b01feb847935d40e5e260b5025 +doctrine ca289bf1ea6223d5894b1f6ec86fc2759e458ccc swiftmailer 8c3165691e36302405926abbae7526549db8b899 assetic f829ad23d23c87480151a21faad49fefe7c09e5d twig-extensions eba4f5d572bec05c72a47bbd73ba0a3330cf8f54 metadata 8717ad2a5689480765d9ffafe925cd8a2457e582 -SensioFrameworkExtraBundle 9b9194a47effc66b08d44ae110b982352119ca17 +SensioFrameworkExtraBundle b6565d32d71325be1f56943a8758b18f5999de8c JMSSecurityExtraBundle b8b7eb294ed83d83ca7260ac018e701f08003538 SensioDistributionBundle 2082cb99d408fd89243059c6eff866347ec00bbe SensioGeneratorBundle 88ecf05691825c81b6a19ca6e2dc1849f1a5dcd4 From 09f082a6429f43388a813dc76460f2d09e7193b9 Mon Sep 17 00:00:00 2001 From: Jordi Boggiano Date: Mon, 24 Oct 2011 11:55:56 +0200 Subject: [PATCH 321/899] Update Monolog --- deps | 2 +- deps.lock | 4 ++-- 2 files changed, 3 insertions(+), 3 deletions(-) diff --git a/deps b/deps index 9834cb40c4..67e2964c4e 100644 --- a/deps +++ b/deps @@ -8,7 +8,7 @@ [monolog] git=http://github.com/Seldaek/monolog.git - version=1.0.1 + version=1.0.2 [doctrine-common] git=http://github.com/doctrine/common.git diff --git a/deps.lock b/deps.lock index a885ca57a7..a4e8912b74 100644 --- a/deps.lock +++ b/deps.lock @@ -1,6 +1,6 @@ symfony cbb4bbae977eb7e0651b9963cbef84fa75349c3d twig 396435ecd05556adb0a8bd05b14641cb4f8a8aa5 -monolog 303b8a83c87d5c6d749926cf02620465a5dcd0f2 +monolog b704c49a3051536f67f2d39f13568f74615b9922 doctrine-common e4a48faef35752ba3cd1d261316313e9c09e0c81 doctrine-dbal 5084e6bf5ded98b01feb847935d40e5e260b5025 doctrine ca289bf1ea6223d5894b1f6ec86fc2759e458ccc @@ -12,4 +12,4 @@ SensioFrameworkExtraBundle b6565d32d71325be1f56943a8758b18f5999de8c JMSSecurityExtraBundle b8b7eb294ed83d83ca7260ac018e701f08003538 SensioDistributionBundle 2082cb99d408fd89243059c6eff866347ec00bbe SensioGeneratorBundle 88ecf05691825c81b6a19ca6e2dc1849f1a5dcd4 -AsseticBundle 41b5913b5086a0909af92adcb4a6005ee0051b16 \ No newline at end of file +AsseticBundle 41b5913b5086a0909af92adcb4a6005ee0051b16 From 0a9e58dc1cf8bcc43eaf0f10c80d774be2136b35 Mon Sep 17 00:00:00 2001 From: Fabien Potencier Date: Thu, 27 Oct 2011 06:59:41 +0200 Subject: [PATCH 322/899] updated vendors --- deps.lock | 14 +++++++------- 1 file changed, 7 insertions(+), 7 deletions(-) diff --git a/deps.lock b/deps.lock index 786c23b39f..7ec73c2ace 100644 --- a/deps.lock +++ b/deps.lock @@ -1,9 +1,9 @@ -symfony 714d0326d64b9abea8bb8dee9295c425b741ed60 -twig d10966132b34076d67aa2d5ed07d66217db106c4 -monolog 303b8a83c87d5c6d749926cf02620465a5dcd0f2 -doctrine-common f5314bd482b87a0badc08add0dcd9cd6af32262f -doctrine-dbal dea79e7bfbabf973e807539e258ccf3b9ee98f45 -doctrine 993d6f5ac80c180d2d0e4458c18f7ff1ea20357b +symfony 8c0517f3051924445297b2c20044271aa197c913 +twig 52a8afd67cac3dc30641d907fd5084f7973887c5 +monolog b704c49a3051536f67f2d39f13568f74615b9922 +doctrine-common 925a052b3c2e9bb7f9a81174a25f48c2e837758f +doctrine-dbal 537de7ea6a34edbcc40bc6ca92e0a3f816b59330 +doctrine c5ef21864fa524b9239f698d3918ad06b3265b35 swiftmailer 8c3165691e36302405926abbae7526549db8b899 assetic f829ad23d23c87480151a21faad49fefe7c09e5d twig-extensions eba4f5d572bec05c72a47bbd73ba0a3330cf8f54 @@ -12,4 +12,4 @@ SensioFrameworkExtraBundle b6565d32d71325be1f56943a8758b18f5999de8c JMSSecurityExtraBundle b8b7eb294ed83d83ca7260ac018e701f08003538 SensioDistributionBundle a186b53154bc137a65802ef567e4a2eee2082d21 SensioGeneratorBundle 88ecf05691825c81b6a19ca6e2dc1849f1a5dcd4 -AsseticBundle 41b5913b5086a0909af92adcb4a6005ee0051b16 +AsseticBundle 41b5913b5086a0909af92adcb4a6005ee0051b16 \ No newline at end of file From 75e74556010877ff2db40221387e73c92677df02 Mon Sep 17 00:00:00 2001 From: Fabien Potencier Date: Thu, 27 Oct 2011 07:03:38 +0200 Subject: [PATCH 323/899] updated vendors --- deps.lock | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/deps.lock b/deps.lock index a4e8912b74..955e239965 100644 --- a/deps.lock +++ b/deps.lock @@ -1,4 +1,4 @@ -symfony cbb4bbae977eb7e0651b9963cbef84fa75349c3d +symfony e3149318f522c14717041db3ff6b7e64421ce033 twig 396435ecd05556adb0a8bd05b14641cb4f8a8aa5 monolog b704c49a3051536f67f2d39f13568f74615b9922 doctrine-common e4a48faef35752ba3cd1d261316313e9c09e0c81 @@ -12,4 +12,4 @@ SensioFrameworkExtraBundle b6565d32d71325be1f56943a8758b18f5999de8c JMSSecurityExtraBundle b8b7eb294ed83d83ca7260ac018e701f08003538 SensioDistributionBundle 2082cb99d408fd89243059c6eff866347ec00bbe SensioGeneratorBundle 88ecf05691825c81b6a19ca6e2dc1849f1a5dcd4 -AsseticBundle 41b5913b5086a0909af92adcb4a6005ee0051b16 +AsseticBundle 41b5913b5086a0909af92adcb4a6005ee0051b16 \ No newline at end of file From ff67e589865c18bda19655a0ed9a509600108946 Mon Sep 17 00:00:00 2001 From: Toni Uebernickel Date: Mon, 24 Oct 2011 15:26:50 +0300 Subject: [PATCH 324/899] fix directory with spaces on build_bootstrap.php --- bin/vendors | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/bin/vendors b/bin/vendors index d5ef38f363..080f3e520b 100755 --- a/bin/vendors +++ b/bin/vendors @@ -120,7 +120,7 @@ if ('update' === $command) { $interpreter = PHP_OS == 'WINNT' ? 'php.exe' : ''; // Update the bootstrap files -system(sprintf('%s %s %s', $interpreter, escapeshellarg($rootDir.'/vendor/bundles/Sensio/Bundle/DistributionBundle/Resources/bin/build_bootstrap.php'), $rootDir)); +system(sprintf('%s %s %s', $interpreter, escapeshellarg($rootDir.'/vendor/bundles/Sensio/Bundle/DistributionBundle/Resources/bin/build_bootstrap.php'), escapeshellarg($rootDir))); // Update assets system(sprintf('%s %s assets:install %s', $interpreter, escapeshellarg($rootDir.'/app/console'), escapeshellarg($rootDir.'/web/'))); From 9f740f07759e4175afde407301c4fe79aca2a2e1 Mon Sep 17 00:00:00 2001 From: Vladimir Droznik Date: Wed, 12 Oct 2011 14:50:40 +0300 Subject: [PATCH 325/899] Hint for the user on how to point to java executable in config --- app/config/config.yml | 1 + 1 file changed, 1 insertion(+) diff --git a/app/config/config.yml b/app/config/config.yml index ba0effa87a..b6da31e34b 100644 --- a/app/config/config.yml +++ b/app/config/config.yml @@ -25,6 +25,7 @@ twig: assetic: debug: %kernel.debug% use_controller: false + # java: /usr/bin/java filters: cssrewrite: ~ # closure: From 64f6a6a0fd91969fe06d00be8028bf8f1e7c45f6 Mon Sep 17 00:00:00 2001 From: Fabien Potencier Date: Wed, 2 Nov 2011 12:49:58 +0100 Subject: [PATCH 326/899] updated VENDORS for 2.0.5 --- deps | 10 +++++----- deps.lock | 12 ++++++------ 2 files changed, 11 insertions(+), 11 deletions(-) diff --git a/deps b/deps index 67e2964c4e..0833c245b0 100644 --- a/deps +++ b/deps @@ -1,6 +1,6 @@ [symfony] git=http://github.com/symfony/symfony.git - version=origin/2.0 + version=v2.0.5 [twig] git=http://github.com/fabpot/Twig.git @@ -12,19 +12,19 @@ [doctrine-common] git=http://github.com/doctrine/common.git - version=origin/2.1.x + version=2.1.2 [doctrine-dbal] git=http://github.com/doctrine/dbal.git - version=origin/2.1.x + version=2.1.3 [doctrine] git=http://github.com/doctrine/doctrine2.git - version=origin/2.1.x + version=2.1.2 [swiftmailer] git=http://github.com/swiftmailer/swiftmailer.git - version=v4.1.2 + version=v4.1.3 [assetic] git=http://github.com/kriswallsmith/assetic.git diff --git a/deps.lock b/deps.lock index 955e239965..890b2f4805 100644 --- a/deps.lock +++ b/deps.lock @@ -1,15 +1,15 @@ -symfony e3149318f522c14717041db3ff6b7e64421ce033 +symfony 7f21a5e9792f892166a550bb55791d80248243fc twig 396435ecd05556adb0a8bd05b14641cb4f8a8aa5 monolog b704c49a3051536f67f2d39f13568f74615b9922 -doctrine-common e4a48faef35752ba3cd1d261316313e9c09e0c81 -doctrine-dbal 5084e6bf5ded98b01feb847935d40e5e260b5025 -doctrine ca289bf1ea6223d5894b1f6ec86fc2759e458ccc -swiftmailer 8c3165691e36302405926abbae7526549db8b899 +doctrine-common b385ca770888248241bd3086a40d5b3bd082a706 +doctrine-dbal e0b69790ab1ffd646fd70a04fdb91e5dfbb3ccf1 +doctrine 144d0de0ab61dffc738d7fb590cff8d77919f553 +swiftmailer daaff2b8515390fbb10882647311f476b89a67e6 assetic f829ad23d23c87480151a21faad49fefe7c09e5d twig-extensions eba4f5d572bec05c72a47bbd73ba0a3330cf8f54 metadata 8717ad2a5689480765d9ffafe925cd8a2457e582 SensioFrameworkExtraBundle b6565d32d71325be1f56943a8758b18f5999de8c JMSSecurityExtraBundle b8b7eb294ed83d83ca7260ac018e701f08003538 SensioDistributionBundle 2082cb99d408fd89243059c6eff866347ec00bbe -SensioGeneratorBundle 88ecf05691825c81b6a19ca6e2dc1849f1a5dcd4 +SensioGeneratorBundle 2016dd4752ec52990b3fb304d68422eab3b1e8e0 AsseticBundle 41b5913b5086a0909af92adcb4a6005ee0051b16 \ No newline at end of file From 38e67840992c09803a8c7ac3dc2b58b6a82c981e Mon Sep 17 00:00:00 2001 From: Fabien Potencier Date: Wed, 2 Nov 2011 12:52:47 +0100 Subject: [PATCH 327/899] updated vendors to dev branches --- deps | 8 ++++---- deps.lock | 6 +++--- 2 files changed, 7 insertions(+), 7 deletions(-) diff --git a/deps b/deps index 0833c245b0..bb94482bba 100644 --- a/deps +++ b/deps @@ -1,6 +1,6 @@ [symfony] git=http://github.com/symfony/symfony.git - version=v2.0.5 + version=origin/2.0 [twig] git=http://github.com/fabpot/Twig.git @@ -12,15 +12,15 @@ [doctrine-common] git=http://github.com/doctrine/common.git - version=2.1.2 + version=origin/2.1.x [doctrine-dbal] git=http://github.com/doctrine/dbal.git - version=2.1.3 + version=origin/2.1.x [doctrine] git=http://github.com/doctrine/doctrine2.git - version=2.1.2 + version=origin/2.1.x [swiftmailer] git=http://github.com/swiftmailer/swiftmailer.git diff --git a/deps.lock b/deps.lock index 890b2f4805..a6423855e9 100644 --- a/deps.lock +++ b/deps.lock @@ -1,9 +1,9 @@ symfony 7f21a5e9792f892166a550bb55791d80248243fc twig 396435ecd05556adb0a8bd05b14641cb4f8a8aa5 monolog b704c49a3051536f67f2d39f13568f74615b9922 -doctrine-common b385ca770888248241bd3086a40d5b3bd082a706 -doctrine-dbal e0b69790ab1ffd646fd70a04fdb91e5dfbb3ccf1 -doctrine 144d0de0ab61dffc738d7fb590cff8d77919f553 +doctrine-common e4a48faef35752ba3cd1d261316313e9c09e0c81 +doctrine-dbal f80444b8a476e5e6748239b68246528afc14f3f0 +doctrine d9328ea5e70d0d0f9d5578c47dfe152778d4b9ae swiftmailer daaff2b8515390fbb10882647311f476b89a67e6 assetic f829ad23d23c87480151a21faad49fefe7c09e5d twig-extensions eba4f5d572bec05c72a47bbd73ba0a3330cf8f54 From 882b6d46338df6f468c962a0dcc69c7a07cca042 Mon Sep 17 00:00:00 2001 From: Beau Simensen Date: Thu, 3 Nov 2011 22:52:51 -0500 Subject: [PATCH 328/899] Detect if it looks like vendors have maybe not been installed. Tweak HTML slightly to not include external files (CSS/images) if it is possible they might not exist so that config.php renders "cleanly" in this case. --- web/config.php | 13 +++++++++++++ 1 file changed, 13 insertions(+) diff --git a/web/config.php b/web/config.php index 1058141b1b..5b5ea8cf4a 100644 --- a/web/config.php +++ b/web/config.php @@ -26,6 +26,14 @@ EOF; } +if (!is_dir(__DIR__ . '/../vendor/symfony')) { + $vendorsAreMissing = true; + $majorProblems[] = 'CRITICAL: Vendors are missing. Run + "bin/vendors" to install dependencies.'; +} else { + $vendorsAreMissing = false; +} + if (!is_writable(__DIR__ . '/../app/cache')) { $majorProblems[] = 'Change the permissions of the "app/cache/" directory so that the web server can write into it.'; @@ -133,21 +141,26 @@ $phpini = true; $minorProblems[] = 'Set session.auto_start to off in php.ini*.'; } + ?> + + Symfony Configuration
      + +

      Welcome!

      From 66780ef8a4e95ce65c28852ae8616ad8bbc6b3ce Mon Sep 17 00:00:00 2001 From: Fabien Potencier Date: Fri, 4 Nov 2011 07:28:56 +0100 Subject: [PATCH 329/899] added vendor detection check to the CLI check.php script --- app/check.php | 1 + web/config.php | 6 +++--- 2 files changed, 4 insertions(+), 3 deletions(-) diff --git a/app/check.php b/app/check.php index bf9a91eb54..43bf92508c 100644 --- a/app/check.php +++ b/app/check.php @@ -24,6 +24,7 @@ // mandatory echo_title("Mandatory requirements"); check(version_compare(phpversion(), '5.3.2', '>='), sprintf('Checking that PHP version is at least 5.3.2 (%s installed)', phpversion()), 'Install PHP 5.3.2 or newer (current version is '.phpversion(), true); +check(is_dir(__DIR__.'/../vendor/symfony'), 'Checking that vendor libraries are installed', 'Vendor libraries are missing; run "bin/vendors install" to them.', true); check(ini_get('date.timezone'), 'Checking that the "date.timezone" setting is set', 'Set the "date.timezone" setting in php.ini (like Europe/Paris)', true); check(is_writable(__DIR__.'/../app/cache'), sprintf('Checking that app/cache/ directory is writable'), 'Change the permissions of the app/cache/ directory so that the web server can write in it', true); check(is_writable(__DIR__.'/../app/logs'), sprintf('Checking that the app/logs/ directory is writable'), 'Change the permissions of the app/logs/ directory so that the web server can write in it', true); diff --git a/web/config.php b/web/config.php index 5b5ea8cf4a..01ad123028 100644 --- a/web/config.php +++ b/web/config.php @@ -26,10 +26,10 @@ EOF; } -if (!is_dir(__DIR__ . '/../vendor/symfony')) { +if (!is_dir(__DIR__.'/../vendor/symfony')) { $vendorsAreMissing = true; - $majorProblems[] = 'CRITICAL: Vendors are missing. Run - "bin/vendors" to install dependencies.'; + $majorProblems[] = 'CRITICAL: Vendor libraries are missing. Run + "bin/vendors install" to install them.'; } else { $vendorsAreMissing = false; } From 605da7ef55dd5db580e65b927a84d6eed7147ba8 Mon Sep 17 00:00:00 2001 From: Christian Raue Date: Fri, 4 Nov 2011 15:12:26 +0100 Subject: [PATCH 330/899] fixed typo --- app/check.php | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/app/check.php b/app/check.php index 43bf92508c..3d71f7e41a 100644 --- a/app/check.php +++ b/app/check.php @@ -24,7 +24,7 @@ // mandatory echo_title("Mandatory requirements"); check(version_compare(phpversion(), '5.3.2', '>='), sprintf('Checking that PHP version is at least 5.3.2 (%s installed)', phpversion()), 'Install PHP 5.3.2 or newer (current version is '.phpversion(), true); -check(is_dir(__DIR__.'/../vendor/symfony'), 'Checking that vendor libraries are installed', 'Vendor libraries are missing; run "bin/vendors install" to them.', true); +check(is_dir(__DIR__.'/../vendor/symfony'), 'Checking that vendor libraries are installed', 'Vendor libraries are missing; run "bin/vendors install" to install them', true); check(ini_get('date.timezone'), 'Checking that the "date.timezone" setting is set', 'Set the "date.timezone" setting in php.ini (like Europe/Paris)', true); check(is_writable(__DIR__.'/../app/cache'), sprintf('Checking that app/cache/ directory is writable'), 'Change the permissions of the app/cache/ directory so that the web server can write in it', true); check(is_writable(__DIR__.'/../app/logs'), sprintf('Checking that the app/logs/ directory is writable'), 'Change the permissions of the app/logs/ directory so that the web server can write in it', true); From 29dd189a3bd37c24755104838731fde59bc1516c Mon Sep 17 00:00:00 2001 From: Adam Monsen Date: Tue, 8 Nov 2011 15:59:07 -0800 Subject: [PATCH 331/899] bin/vendors: break if a bundle has local modifications I'm often developing several Symfony2 bundles at once. I have them all set up as deps for a single Symfony2 application, and I point Netbeans at the base of the Symfony2 directory. Since each [sub]dir in vendor/ is a complete git repository, after making a bunch of changes I can then dive into each dir and commit/push as necessary. If I accidentally run "bin/vendors install" while I have un-pushed changes, they're blown away by the "git reset --hard" in bin/vendors. This patch proposes to make the script more cautious, assuming that local modifications should never be blown away. Note that "--force" is unimplemented, this is just one idea. --- bin/vendors | 4 ++++ 1 file changed, 4 insertions(+) diff --git a/bin/vendors b/bin/vendors index 080f3e520b..008330c00c 100755 --- a/bin/vendors +++ b/bin/vendors @@ -102,6 +102,10 @@ foreach ($deps as $name => $dep) { system(sprintf('git clone %s %s', escapeshellarg($url), escapeshellarg($installDir))); } + $status = system(sprintf('cd %s && git status --porcelain', escapeshellarg($installDir))); + if (!empty($status)) { + exit("$name has local modifications. Will not proceed without --force.\n"); + } system(sprintf('cd %s && git fetch origin && git reset --hard %s', escapeshellarg($installDir), escapeshellarg($rev))); if ('update' === $command) { From 888d68b258bc224210b6169c1a968fc3c57207a3 Mon Sep 17 00:00:00 2001 From: Harry Walter Date: Thu, 10 Nov 2011 11:22:16 +0000 Subject: [PATCH 332/899] Fix for incorrect link to help pages --- .../Resources/views/Welcome/index.html.twig | 14 +++++++------- 1 file changed, 7 insertions(+), 7 deletions(-) diff --git a/src/Acme/DemoBundle/Resources/views/Welcome/index.html.twig b/src/Acme/DemoBundle/Resources/views/Welcome/index.html.twig index e50f1b2457..d031bd2ec3 100644 --- a/src/Acme/DemoBundle/Resources/views/Welcome/index.html.twig +++ b/src/Acme/DemoBundle/Resources/views/Welcome/index.html.twig @@ -14,7 +14,7 @@
      Quick tour
      - Read the Quick Tour + Read the Quick Tour
      {% if app.environment == 'dev' %}
      @@ -36,15 +36,15 @@
      @@ -55,8 +55,8 @@
    • IRC channel
    • Mailing lists
    • Forum
      • -
    • How to be involved
      • -
    • Contributing
      • +
    • How to be involved
      • +
    • Contributing
    From 2ca70881381001ed7e413849c12ae444eb818d6c Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Beno=C3=AEt=20Merlet?= Date: Mon, 14 Nov 2011 12:41:51 +0100 Subject: [PATCH 333/899] moved DemoBundle ControllerListener in a EventListener subnamespace --- src/Acme/DemoBundle/{ => EventListener}/ControllerListener.php | 2 +- src/Acme/DemoBundle/Resources/config/services.xml | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) rename src/Acme/DemoBundle/{ => EventListener}/ControllerListener.php (93%) diff --git a/src/Acme/DemoBundle/ControllerListener.php b/src/Acme/DemoBundle/EventListener/ControllerListener.php similarity index 93% rename from src/Acme/DemoBundle/ControllerListener.php rename to src/Acme/DemoBundle/EventListener/ControllerListener.php index e0a3ff41c6..5274f71fd3 100644 --- a/src/Acme/DemoBundle/ControllerListener.php +++ b/src/Acme/DemoBundle/EventListener/ControllerListener.php @@ -1,6 +1,6 @@ - + From d604999d9d0a1facc806e87c31635f9b9a30aec4 Mon Sep 17 00:00:00 2001 From: Fabien Potencier Date: Wed, 16 Nov 2011 20:41:52 +0100 Subject: [PATCH 334/899] updated VENDORS for 2.0.6 --- deps | 8 ++++---- deps.lock | 16 ++++++++-------- 2 files changed, 12 insertions(+), 12 deletions(-) diff --git a/deps b/deps index bb94482bba..994e6802c4 100644 --- a/deps +++ b/deps @@ -1,6 +1,6 @@ [symfony] git=http://github.com/symfony/symfony.git - version=origin/2.0 + version=v2.0.6 [twig] git=http://github.com/fabpot/Twig.git @@ -12,15 +12,15 @@ [doctrine-common] git=http://github.com/doctrine/common.git - version=origin/2.1.x + version=2.1.2 [doctrine-dbal] git=http://github.com/doctrine/dbal.git - version=origin/2.1.x + version=2.1.3 [doctrine] git=http://github.com/doctrine/doctrine2.git - version=origin/2.1.x + version=2.1.2 [swiftmailer] git=http://github.com/swiftmailer/swiftmailer.git diff --git a/deps.lock b/deps.lock index a6423855e9..bb2a85b1a3 100644 --- a/deps.lock +++ b/deps.lock @@ -1,15 +1,15 @@ -symfony 7f21a5e9792f892166a550bb55791d80248243fc +symfony b55a43813e8fbcf4facd19ce1da0cd7acc67ce9b twig 396435ecd05556adb0a8bd05b14641cb4f8a8aa5 monolog b704c49a3051536f67f2d39f13568f74615b9922 -doctrine-common e4a48faef35752ba3cd1d261316313e9c09e0c81 -doctrine-dbal f80444b8a476e5e6748239b68246528afc14f3f0 -doctrine d9328ea5e70d0d0f9d5578c47dfe152778d4b9ae +doctrine-common b385ca770888248241bd3086a40d5b3bd082a706 +doctrine-dbal e0b69790ab1ffd646fd70a04fdb91e5dfbb3ccf1 +doctrine 144d0de0ab61dffc738d7fb590cff8d77919f553 swiftmailer daaff2b8515390fbb10882647311f476b89a67e6 assetic f829ad23d23c87480151a21faad49fefe7c09e5d -twig-extensions eba4f5d572bec05c72a47bbd73ba0a3330cf8f54 +twig-extensions d5851b96f06442e74590e5540a4209e9e3946243 metadata 8717ad2a5689480765d9ffafe925cd8a2457e582 -SensioFrameworkExtraBundle b6565d32d71325be1f56943a8758b18f5999de8c +SensioFrameworkExtraBundle dcd40eb4e2fff2d82fad644bb44fc2a40ccaf381 JMSSecurityExtraBundle b8b7eb294ed83d83ca7260ac018e701f08003538 -SensioDistributionBundle 2082cb99d408fd89243059c6eff866347ec00bbe -SensioGeneratorBundle 2016dd4752ec52990b3fb304d68422eab3b1e8e0 +SensioDistributionBundle 20b66a408084ad8752f98e50f10533f5245310bf +SensioGeneratorBundle c6af9719ae9e81fa4e086f40697d35e7090921cc AsseticBundle 41b5913b5086a0909af92adcb4a6005ee0051b16 \ No newline at end of file From c37d2517cebc07a1dec819131b544b4844655a95 Mon Sep 17 00:00:00 2001 From: Fabien Potencier Date: Wed, 16 Nov 2011 20:43:42 +0100 Subject: [PATCH 335/899] updated vendors to dev branches --- deps | 8 ++++---- deps.lock | 6 +++--- 2 files changed, 7 insertions(+), 7 deletions(-) diff --git a/deps b/deps index 994e6802c4..bb94482bba 100644 --- a/deps +++ b/deps @@ -1,6 +1,6 @@ [symfony] git=http://github.com/symfony/symfony.git - version=v2.0.6 + version=origin/2.0 [twig] git=http://github.com/fabpot/Twig.git @@ -12,15 +12,15 @@ [doctrine-common] git=http://github.com/doctrine/common.git - version=2.1.2 + version=origin/2.1.x [doctrine-dbal] git=http://github.com/doctrine/dbal.git - version=2.1.3 + version=origin/2.1.x [doctrine] git=http://github.com/doctrine/doctrine2.git - version=2.1.2 + version=origin/2.1.x [swiftmailer] git=http://github.com/swiftmailer/swiftmailer.git diff --git a/deps.lock b/deps.lock index bb2a85b1a3..ef1d3b3e01 100644 --- a/deps.lock +++ b/deps.lock @@ -1,9 +1,9 @@ symfony b55a43813e8fbcf4facd19ce1da0cd7acc67ce9b twig 396435ecd05556adb0a8bd05b14641cb4f8a8aa5 monolog b704c49a3051536f67f2d39f13568f74615b9922 -doctrine-common b385ca770888248241bd3086a40d5b3bd082a706 -doctrine-dbal e0b69790ab1ffd646fd70a04fdb91e5dfbb3ccf1 -doctrine 144d0de0ab61dffc738d7fb590cff8d77919f553 +doctrine-common e4a48faef35752ba3cd1d261316313e9c09e0c81 +doctrine-dbal 41d28002ec8082d5344ed969815669e71ea0dd87 +doctrine d0b9f7cb2bde06a408039526e400c780d89418da swiftmailer daaff2b8515390fbb10882647311f476b89a67e6 assetic f829ad23d23c87480151a21faad49fefe7c09e5d twig-extensions d5851b96f06442e74590e5540a4209e9e3946243 From b9754f491ae83af42af59b1e00183dd926ca8772 Mon Sep 17 00:00:00 2001 From: Fabien Potencier Date: Thu, 17 Nov 2011 16:42:07 +0100 Subject: [PATCH 336/899] fixed config for latest Symfony master --- app/config/security.yml | 7 ++++--- deps.lock | 18 +++++++++--------- 2 files changed, 13 insertions(+), 12 deletions(-) diff --git a/app/config/security.yml b/app/config/security.yml index 586d1d07ae..7052f2cea6 100644 --- a/app/config/security.yml +++ b/app/config/security.yml @@ -8,9 +8,10 @@ security: providers: in_memory: - users: - user: { password: userpass, roles: [ 'ROLE_USER' ] } - admin: { password: adminpass, roles: [ 'ROLE_ADMIN' ] } + memory: + users: + user: { password: userpass, roles: [ 'ROLE_USER' ] } + admin: { password: adminpass, roles: [ 'ROLE_ADMIN' ] } firewalls: dev: diff --git a/deps.lock b/deps.lock index 7ec73c2ace..c5eb223fdc 100644 --- a/deps.lock +++ b/deps.lock @@ -1,15 +1,15 @@ -symfony 8c0517f3051924445297b2c20044271aa197c913 -twig 52a8afd67cac3dc30641d907fd5084f7973887c5 +symfony ae1e9cbedf6e8fb0613650fd4a8c2d212b0f6ad1 +twig 8ac3603a8b9a40420c7a87a720f9fee228b928ce monolog b704c49a3051536f67f2d39f13568f74615b9922 -doctrine-common 925a052b3c2e9bb7f9a81174a25f48c2e837758f -doctrine-dbal 537de7ea6a34edbcc40bc6ca92e0a3f816b59330 -doctrine c5ef21864fa524b9239f698d3918ad06b3265b35 +doctrine-common ae8493e66cd80d340d4d2d5ad876ca5196c02f16 +doctrine-dbal ce28f3ddf73fc3c6923c27a09a3ae8dc5b195656 +doctrine 43b1e79ec4cfedb6a707f1346cb0e3bd907116e5 swiftmailer 8c3165691e36302405926abbae7526549db8b899 assetic f829ad23d23c87480151a21faad49fefe7c09e5d -twig-extensions eba4f5d572bec05c72a47bbd73ba0a3330cf8f54 +twig-extensions d5851b96f06442e74590e5540a4209e9e3946243 metadata 30c622cad82e39a6856b981a9bfb9df06b3cc067 -SensioFrameworkExtraBundle b6565d32d71325be1f56943a8758b18f5999de8c +SensioFrameworkExtraBundle dcd40eb4e2fff2d82fad644bb44fc2a40ccaf381 JMSSecurityExtraBundle b8b7eb294ed83d83ca7260ac018e701f08003538 -SensioDistributionBundle a186b53154bc137a65802ef567e4a2eee2082d21 -SensioGeneratorBundle 88ecf05691825c81b6a19ca6e2dc1849f1a5dcd4 +SensioDistributionBundle 2e0060d701949d2ad4b32c6c3c6c50c0d8f75fba +SensioGeneratorBundle c6af9719ae9e81fa4e086f40697d35e7090921cc AsseticBundle 41b5913b5086a0909af92adcb4a6005ee0051b16 \ No newline at end of file From b4a1288571955a8398e9e67662ee237d76707f6e Mon Sep 17 00:00:00 2001 From: Fabien Potencier Date: Tue, 22 Nov 2011 15:44:16 +0100 Subject: [PATCH 337/899] updated deps --- deps | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/deps b/deps index bb94482bba..8a416f5043 100644 --- a/deps +++ b/deps @@ -40,6 +40,7 @@ [SensioFrameworkExtraBundle] git=http://github.com/sensio/SensioFrameworkExtraBundle.git target=/bundles/Sensio/Bundle/FrameworkExtraBundle + version=origin/2.0 [JMSSecurityExtraBundle] git=http://github.com/schmittjoh/JMSSecurityExtraBundle.git @@ -49,7 +50,7 @@ [SensioDistributionBundle] git=http://github.com/sensio/SensioDistributionBundle.git target=/bundles/Sensio/Bundle/DistributionBundle - version=origin/1.0 + version=origin/2.0 [SensioGeneratorBundle] git=http://github.com/sensio/SensioGeneratorBundle.git From 3210fdaf842f574821cf2765fda3f0a6bb6ebbb3 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Beno=C3=AEt=20Merlet?= Date: Thu, 1 Dec 2011 00:54:19 +0100 Subject: [PATCH 338/899] cleaned HTML rendering --- web/config.php | 79 ++++++++++++++++++++++++-------------------------- 1 file changed, 38 insertions(+), 41 deletions(-) diff --git a/web/config.php b/web/config.php index 01ad123028..3466304389 100644 --- a/web/config.php +++ b/web/config.php @@ -149,70 +149,67 @@ - + Symfony Configuration
    - - - - -
    -

    Welcome!

    -

    Welcome to your new Symfony project.

    -

    This script will guide you through the basic configuration of your project. You can also do the same by editing the ‘app/config/parameters.yml’ file directly.

    - - + + + + +
    +

    Welcome!

    +

    Welcome to your new Symfony project.

    +

    This script will guide you through the basic configuration of your project. You can also do the same by editing the ‘app/config/parameters.yml’ file directly.

    + +

    Major problems

    -

    Major problems have been detected and must be fixed before continuing :

    +

    Major problems have been detected and must be fixed before continuing:

      -
      2. +
    - - - + + +

    Recommendations

    - - Additionally, to - - To - enhance your Symfony experience, it’s recommended that you fix the following : + Additionally, toTo enhance your Symfony experience, it’s recommended that you fix the following:

    - - - - -

    * - - Changes to the php.ini file must be done in "". - - To change settings, create a "php.ini". - -

    - - - +
    From 73f00c2860278de5e28054bf336ac6f9ffd682fb Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Beno=C3=AEt=20Merlet?= Date: Thu, 1 Dec 2011 10:16:57 +0100 Subject: [PATCH 339/899] Update web/config.php --- web/config.php | 20 ++++++++++---------- 1 file changed, 10 insertions(+), 10 deletions(-) diff --git a/web/config.php b/web/config.php index 3466304389..9b5734941b 100644 --- a/web/config.php +++ b/web/config.php @@ -149,7 +149,7 @@ - + Symfony Configuration @@ -160,7 +160,7 @@ - +

    Welcome!

    @@ -169,27 +169,27 @@

    - Major problems + Major problems

    Major problems have been detected and must be fixed before continuing:

      2. - +
    - +

    Recommendations

    - Additionally, toTo enhance your Symfony experience, it’s recommended that you fix the following: + Additionally, toTo enhance your Symfony experience, it’s recommended that you fix the following:

    - + @@ -198,15 +198,15 @@ Changes to the php.ini file must be done in "". To change settings, create a "php.ini". - +

    - +
    From 7e93e84b41c3144143177cf8bd9fa1ef30add323 Mon Sep 17 00:00:00 2001 From: Fabien Potencier Date: Wed, 7 Dec 2011 17:06:22 +0100 Subject: [PATCH 340/899] tweaked previous merge --- bin/vendors | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/bin/vendors b/bin/vendors index 008330c00c..523eaa0e89 100755 --- a/bin/vendors +++ b/bin/vendors @@ -104,8 +104,9 @@ foreach ($deps as $name => $dep) { $status = system(sprintf('cd %s && git status --porcelain', escapeshellarg($installDir))); if (!empty($status)) { - exit("$name has local modifications. Will not proceed without --force.\n"); + exit(sprintf('"%s" has local modifications. Please revert or commit/push them before running this command again.', $name)); } + system(sprintf('cd %s && git fetch origin && git reset --hard %s', escapeshellarg($installDir), escapeshellarg($rev))); if ('update' === $command) { From 73ef28d2524857e82f9a1af7d7a04978bb827f84 Mon Sep 17 00:00:00 2001 From: Fabien Potencier Date: Wed, 7 Dec 2011 19:17:50 +0100 Subject: [PATCH 341/899] updated vendors --- deps.lock | 18 +++++++++--------- 1 file changed, 9 insertions(+), 9 deletions(-) diff --git a/deps.lock b/deps.lock index c5eb223fdc..aa8e444de0 100644 --- a/deps.lock +++ b/deps.lock @@ -1,15 +1,15 @@ -symfony ae1e9cbedf6e8fb0613650fd4a8c2d212b0f6ad1 -twig 8ac3603a8b9a40420c7a87a720f9fee228b928ce +symfony 7e9d53bc9376a32cdf743306a146d8ea0bddd418 +twig b496a2324c21b5b19a4e28ac15c8270c8810c0fe monolog b704c49a3051536f67f2d39f13568f74615b9922 -doctrine-common ae8493e66cd80d340d4d2d5ad876ca5196c02f16 -doctrine-dbal ce28f3ddf73fc3c6923c27a09a3ae8dc5b195656 -doctrine 43b1e79ec4cfedb6a707f1346cb0e3bd907116e5 -swiftmailer 8c3165691e36302405926abbae7526549db8b899 +doctrine-common 583b0e1d461d63d928cbf5ca18a6a408eeaaf1e9 +doctrine-dbal 23d2950c130c00b6589b216679ed036052d6963a +doctrine 33c5b639b04169f9520910da0d25508754d32b6b +swiftmailer daaff2b8515390fbb10882647311f476b89a67e6 assetic f829ad23d23c87480151a21faad49fefe7c09e5d -twig-extensions d5851b96f06442e74590e5540a4209e9e3946243 +twig-extensions 3076c971976e1baaf86e5820c7a1da3f5c1c14eb metadata 30c622cad82e39a6856b981a9bfb9df06b3cc067 -SensioFrameworkExtraBundle dcd40eb4e2fff2d82fad644bb44fc2a40ccaf381 +SensioFrameworkExtraBundle 1c7e92f466d11f83130b0c1271f44d067a2c3b31 JMSSecurityExtraBundle b8b7eb294ed83d83ca7260ac018e701f08003538 -SensioDistributionBundle 2e0060d701949d2ad4b32c6c3c6c50c0d8f75fba +SensioDistributionBundle 64ae64795c794e34d964a67e76f0584444189fc2 SensioGeneratorBundle c6af9719ae9e81fa4e086f40697d35e7090921cc AsseticBundle 41b5913b5086a0909af92adcb4a6005ee0051b16 \ No newline at end of file From 2651554163d405e3883996b4947638abc76e3e7e Mon Sep 17 00:00:00 2001 From: Adam Monsen Date: Wed, 7 Dec 2011 13:42:16 -0800 Subject: [PATCH 342/899] bin/vendors: speed up: fetch only when necessary If a bundle's HEAD is already at the version specified in deps or deps.lock, don't fetch more commits from upstream. This performance improvement only helps when the version specified is an SHA-1 checksum (as opposed to a branch or tag name), but that turns out to be quite often (especially if update/deps.lock is used). This does not handle the case where upstream contains modified history (e.g. missing commits), but neither does the rest of bin/vendors. --- bin/vendors | 4 ++++ 1 file changed, 4 insertions(+) diff --git a/bin/vendors b/bin/vendors index 523eaa0e89..11671bf1f7 100755 --- a/bin/vendors +++ b/bin/vendors @@ -106,6 +106,10 @@ foreach ($deps as $name => $dep) { if (!empty($status)) { exit(sprintf('"%s" has local modifications. Please revert or commit/push them before running this command again.', $name)); } + $current_rev = system(sprintf('cd %s && git rev-list --max-count=1 HEAD', escapeshellarg($installDir))); + if ($current_rev === $rev) { + continue; + } system(sprintf('cd %s && git fetch origin && git reset --hard %s', escapeshellarg($installDir), escapeshellarg($rev))); From d2569cd8745f6782840f61ba12fda3935cf0bfa6 Mon Sep 17 00:00:00 2001 From: Victor Berchet Date: Thu, 8 Dec 2011 11:32:44 +0100 Subject: [PATCH 343/899] Do not take untracked files into account --- bin/vendors | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/bin/vendors b/bin/vendors index 11671bf1f7..0f8e00ba55 100755 --- a/bin/vendors +++ b/bin/vendors @@ -102,7 +102,7 @@ foreach ($deps as $name => $dep) { system(sprintf('git clone %s %s', escapeshellarg($url), escapeshellarg($installDir))); } - $status = system(sprintf('cd %s && git status --porcelain', escapeshellarg($installDir))); + $status = system(sprintf('cd %s && git status --porcelain -uno', escapeshellarg($installDir))); if (!empty($status)) { exit(sprintf('"%s" has local modifications. Please revert or commit/push them before running this command again.', $name)); } From 2004910bdd8dfdfdeba4166119ea8632121cce36 Mon Sep 17 00:00:00 2001 From: Fabien Potencier Date: Thu, 8 Dec 2011 15:39:18 +0100 Subject: [PATCH 344/899] updated VENDORS for 2.0.7 --- deps | 10 +++++----- deps.lock | 14 +++++++------- 2 files changed, 12 insertions(+), 12 deletions(-) diff --git a/deps b/deps index 8a416f5043..8a45151fbd 100644 --- a/deps +++ b/deps @@ -1,10 +1,10 @@ [symfony] git=http://github.com/symfony/symfony.git - version=origin/2.0 + version=v2.0.7 [twig] git=http://github.com/fabpot/Twig.git - version=v1.1.2 + version=v1.4.0 [monolog] git=http://github.com/Seldaek/monolog.git @@ -12,15 +12,15 @@ [doctrine-common] git=http://github.com/doctrine/common.git - version=origin/2.1.x + version=2.1.4 [doctrine-dbal] git=http://github.com/doctrine/dbal.git - version=origin/2.1.x + version=2.1.5 [doctrine] git=http://github.com/doctrine/doctrine2.git - version=origin/2.1.x + version=2.1.4 [swiftmailer] git=http://github.com/swiftmailer/swiftmailer.git diff --git a/deps.lock b/deps.lock index ef1d3b3e01..425704a728 100644 --- a/deps.lock +++ b/deps.lock @@ -1,14 +1,14 @@ -symfony b55a43813e8fbcf4facd19ce1da0cd7acc67ce9b -twig 396435ecd05556adb0a8bd05b14641cb4f8a8aa5 +symfony 848f87504de4cf825f1e44f20e89fb266f64e653 +twig 0b7d6dfa0cf0dfb6a3c5745b6434ebd6ea32e90e monolog b704c49a3051536f67f2d39f13568f74615b9922 -doctrine-common e4a48faef35752ba3cd1d261316313e9c09e0c81 -doctrine-dbal 41d28002ec8082d5344ed969815669e71ea0dd87 -doctrine d0b9f7cb2bde06a408039526e400c780d89418da +doctrine-common b886898821288d305862ee9c567cc5b5cbb4c0dc +doctrine-dbal ae358bd94ec09d7d3ad92ca7820e67825ad9e5f4 +doctrine bff55577cd7df5924dcc43a237993f2d052316f2 swiftmailer daaff2b8515390fbb10882647311f476b89a67e6 assetic f829ad23d23c87480151a21faad49fefe7c09e5d -twig-extensions d5851b96f06442e74590e5540a4209e9e3946243 +twig-extensions 3076c971976e1baaf86e5820c7a1da3f5c1c14eb metadata 8717ad2a5689480765d9ffafe925cd8a2457e582 -SensioFrameworkExtraBundle dcd40eb4e2fff2d82fad644bb44fc2a40ccaf381 +SensioFrameworkExtraBundle 1c7e92f466d11f83130b0c1271f44d067a2c3b31 JMSSecurityExtraBundle b8b7eb294ed83d83ca7260ac018e701f08003538 SensioDistributionBundle 20b66a408084ad8752f98e50f10533f5245310bf SensioGeneratorBundle c6af9719ae9e81fa4e086f40697d35e7090921cc From 2a044c8701928c7775bbf5be63c3d277432c54a7 Mon Sep 17 00:00:00 2001 From: Fabien Potencier Date: Thu, 8 Dec 2011 16:01:42 +0100 Subject: [PATCH 345/899] updated vendors to dev branches --- deps | 8 ++++---- deps.lock | 6 +++--- 2 files changed, 7 insertions(+), 7 deletions(-) diff --git a/deps b/deps index 8a45151fbd..8d0b8063cf 100644 --- a/deps +++ b/deps @@ -1,6 +1,6 @@ [symfony] git=http://github.com/symfony/symfony.git - version=v2.0.7 + version=origin/2.0 [twig] git=http://github.com/fabpot/Twig.git @@ -12,15 +12,15 @@ [doctrine-common] git=http://github.com/doctrine/common.git - version=2.1.4 + version=origin/2.1.x [doctrine-dbal] git=http://github.com/doctrine/dbal.git - version=2.1.5 + version=origin/2.1.x [doctrine] git=http://github.com/doctrine/doctrine2.git - version=2.1.4 + version=origin/2.1.x [swiftmailer] git=http://github.com/swiftmailer/swiftmailer.git diff --git a/deps.lock b/deps.lock index 425704a728..521cb00bf3 100644 --- a/deps.lock +++ b/deps.lock @@ -1,9 +1,9 @@ symfony 848f87504de4cf825f1e44f20e89fb266f64e653 twig 0b7d6dfa0cf0dfb6a3c5745b6434ebd6ea32e90e monolog b704c49a3051536f67f2d39f13568f74615b9922 -doctrine-common b886898821288d305862ee9c567cc5b5cbb4c0dc -doctrine-dbal ae358bd94ec09d7d3ad92ca7820e67825ad9e5f4 -doctrine bff55577cd7df5924dcc43a237993f2d052316f2 +doctrine-common 441d276795d3e2cbb4196138a4c12c6d35a5f740 +doctrine-dbal b4a6d4a66bc0da31893a535780fcf417d0e4aa83 +doctrine b1db2ad0d87419b3a7be8cc50d89cc21d89d8985 swiftmailer daaff2b8515390fbb10882647311f476b89a67e6 assetic f829ad23d23c87480151a21faad49fefe7c09e5d twig-extensions 3076c971976e1baaf86e5820c7a1da3f5c1c14eb From e7f8c7845beed3f533ecdfe1e2b93c3ce1474cb2 Mon Sep 17 00:00:00 2001 From: Fabien Potencier Date: Thu, 15 Dec 2011 18:20:17 +0100 Subject: [PATCH 346/899] updated vendors; added the new terminate method in front controllers --- deps.lock | 14 +++++++------- web/app.php | 5 ++++- web/app_dev.php | 5 ++++- 3 files changed, 15 insertions(+), 9 deletions(-) diff --git a/deps.lock b/deps.lock index aa8e444de0..f343603c9d 100644 --- a/deps.lock +++ b/deps.lock @@ -1,15 +1,15 @@ -symfony 7e9d53bc9376a32cdf743306a146d8ea0bddd418 -twig b496a2324c21b5b19a4e28ac15c8270c8810c0fe +symfony 2c3672bff8eec50acef2875e5f5d7c40d5b82737 +twig 972a93f85d862ac7051e9d655dce9e10287aa005 monolog b704c49a3051536f67f2d39f13568f74615b9922 -doctrine-common 583b0e1d461d63d928cbf5ca18a6a408eeaaf1e9 -doctrine-dbal 23d2950c130c00b6589b216679ed036052d6963a -doctrine 33c5b639b04169f9520910da0d25508754d32b6b +doctrine-common 06e9f72342a4c49b3590d0e8b53d451b3f9c1b33 +doctrine-dbal fd75cdfd0a5a8bbc6d373db149a59afbb8fc3dae +doctrine 41a3d90a571cf3392912af696344ee021960dfb0 swiftmailer daaff2b8515390fbb10882647311f476b89a67e6 assetic f829ad23d23c87480151a21faad49fefe7c09e5d -twig-extensions 3076c971976e1baaf86e5820c7a1da3f5c1c14eb +twig-extensions 560990d47ba3fefea18420f9951b54d490715b19 metadata 30c622cad82e39a6856b981a9bfb9df06b3cc067 SensioFrameworkExtraBundle 1c7e92f466d11f83130b0c1271f44d067a2c3b31 JMSSecurityExtraBundle b8b7eb294ed83d83ca7260ac018e701f08003538 SensioDistributionBundle 64ae64795c794e34d964a67e76f0584444189fc2 -SensioGeneratorBundle c6af9719ae9e81fa4e086f40697d35e7090921cc +SensioGeneratorBundle 87fe88c4c8dc09cb197ba4b2d6d5b834e2c64980 AsseticBundle 41b5913b5086a0909af92adcb4a6005ee0051b16 \ No newline at end of file diff --git a/web/app.php b/web/app.php index 5a9e02d999..468a8e8f6a 100644 --- a/web/app.php +++ b/web/app.php @@ -9,4 +9,7 @@ $kernel = new AppKernel('prod', false); $kernel->loadClassCache(); //$kernel = new AppCache($kernel); -$kernel->handle(Request::createFromGlobals())->send(); +$request = Request::createFromGlobals(); +$response = $kernel->handle($request); +$response->send(); +$kernel->terminate($request, $response); diff --git a/web/app_dev.php b/web/app_dev.php index 00d78ac941..1920ea5ca1 100644 --- a/web/app_dev.php +++ b/web/app_dev.php @@ -21,4 +21,7 @@ $kernel = new AppKernel('dev', true); $kernel->loadClassCache(); -$kernel->handle(Request::createFromGlobals())->send(); +$request = Request::createFromGlobals(); +$response = $kernel->handle($request); +$response->send(); +$kernel->terminate($request, $response); From c89dd295b9082340e249e51d36742b503ac51f12 Mon Sep 17 00:00:00 2001 From: Fabien Potencier Date: Fri, 16 Dec 2011 11:09:47 +0100 Subject: [PATCH 347/899] updated vendors --- deps.lock | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/deps.lock b/deps.lock index f343603c9d..30e4382f2a 100644 --- a/deps.lock +++ b/deps.lock @@ -1,9 +1,9 @@ -symfony 2c3672bff8eec50acef2875e5f5d7c40d5b82737 +symfony 9a0aefd1921351f6eb2655440900ec7345928b53 twig 972a93f85d862ac7051e9d655dce9e10287aa005 monolog b704c49a3051536f67f2d39f13568f74615b9922 doctrine-common 06e9f72342a4c49b3590d0e8b53d451b3f9c1b33 -doctrine-dbal fd75cdfd0a5a8bbc6d373db149a59afbb8fc3dae -doctrine 41a3d90a571cf3392912af696344ee021960dfb0 +doctrine-dbal 5a827d7c18f5e34a87086be88af2f3d706169aa4 +doctrine cd04cbc7c40287638df78b79e5f0e475ecba368f swiftmailer daaff2b8515390fbb10882647311f476b89a67e6 assetic f829ad23d23c87480151a21faad49fefe7c09e5d twig-extensions 560990d47ba3fefea18420f9951b54d490715b19 From 4ab6de1940714568a55d26b4f8c7ea9e22ec40f9 Mon Sep 17 00:00:00 2001 From: Fabien Potencier Date: Fri, 16 Dec 2011 11:10:02 +0100 Subject: [PATCH 348/899] switched configuration to use a memory spool for Swiftmailer by default --- app/config/config.yml | 1 + 1 file changed, 1 insertion(+) diff --git a/app/config/config.yml b/app/config/config.yml index 24f7e2401c..4071311edb 100644 --- a/app/config/config.yml +++ b/app/config/config.yml @@ -55,6 +55,7 @@ swiftmailer: host: %mailer_host% username: %mailer_user% password: %mailer_password% + spool: { type: memory } jms_security_extra: secure_controllers: true From 93809fd05bebb85edc2fb4e58f8e921e03e5bd8e Mon Sep 17 00:00:00 2001 From: Ismael Ambrosi Date: Sat, 17 Dec 2011 08:11:33 -0200 Subject: [PATCH 349/899] Using PHP_EOL constant for displayed messages Using PHP_EOL constant for displayed messages on vendors script. Added some missing new lines, to get more clean error messages --- bin/vendors | 14 +++++++------- 1 file changed, 7 insertions(+), 7 deletions(-) diff --git a/bin/vendors b/bin/vendors index 37f8279584..9003dbe53e 100755 --- a/bin/vendors +++ b/bin/vendors @@ -31,7 +31,7 @@ EOF } if (!in_array($command = array_shift($argv), array('install', 'update', 'lock'))) { - exit(sprintf("Command \"%s\" does not exist.\n", $command)); + exit(sprintf('Command "%s" does not exist.', $command).PHP_EOL); } /* @@ -59,7 +59,7 @@ if ('install' === $command && file_exists($rootDir.'/deps.lock')) { foreach (file($rootDir.'/deps.lock', FILE_IGNORE_NEW_LINES | FILE_SKIP_EMPTY_LINES) as $line) { $parts = array_values(array_filter(explode(' ', $line))); if (2 !== count($parts)) { - exit(sprintf('The deps version file is not valid (near "%s")', $line)); + exit(sprintf('The deps version file is not valid (near "%s")', $line).PHP_EOL); } $versions[$parts[0]] = $parts[1]; } @@ -68,7 +68,7 @@ if ('install' === $command && file_exists($rootDir.'/deps.lock')) { $newversions = array(); $deps = parse_ini_file($rootDir.'/deps', true, INI_SCANNER_RAW); if (false === $deps) { - exit("The deps file is not valid ini syntax. Perhaps missing a trailing newline?\n"); + exit('The deps file is not valid ini syntax. Perhaps missing a trailing newline?'.PHP_EOL); } foreach ($deps as $name => $dep) { $dep = array_map('trim', $dep); @@ -84,11 +84,11 @@ foreach ($deps as $name => $dep) { } if ('install' === $command || 'update' === $command) { - echo "> Installing/Updating $name\n"; + echo '> Installing/Updating '.$name.PHP_EOL; // url if (!isset($dep['git'])) { - exit(sprintf('The "git" value for the "%s" dependency must be set.', $name)); + exit(sprintf('The "git" value for the "%s" dependency must be set.', $name).PHP_EOL); } $url = $dep['git']; @@ -105,7 +105,7 @@ foreach ($deps as $name => $dep) { $status = system(sprintf('cd %s && git status --porcelain', escapeshellarg($installDir))); if (!empty($status)) { - exit(sprintf('"%s" has local modifications. Please revert or commit/push them before running this command again.', $name)); + exit(sprintf('"%s" has local modifications. Please revert or commit/push them before running this command again.', $name).PHP_EOL); } $current_rev = system(sprintf('cd %s && git rev-list --max-count=1 HEAD', escapeshellarg($installDir))); if ($current_rev === $rev) { @@ -124,7 +124,7 @@ foreach ($deps as $name => $dep) { // update? if ('update' === $command || 'lock' === $command) { - echo "> Updating deps.lock\n"; + echo '> Updating deps.lock'.PHP_EOL; file_put_contents($rootDir.'/deps.lock', implode("\n", $newversions)); } From 4580eba779408a500c76636e60deb75d55411a2d Mon Sep 17 00:00:00 2001 From: Fabien Potencier Date: Sun, 18 Dec 2011 09:20:26 +0100 Subject: [PATCH 350/899] updated vendors --- deps | 2 +- deps.lock | 8 ++++---- 2 files changed, 5 insertions(+), 5 deletions(-) diff --git a/deps b/deps index 1499dfd5e3..129472ba0e 100644 --- a/deps +++ b/deps @@ -23,7 +23,7 @@ [swiftmailer] git=http://github.com/swiftmailer/swiftmailer.git - version=v4.1.3 + version=v4.1.4 [assetic] git=http://github.com/kriswallsmith/assetic.git diff --git a/deps.lock b/deps.lock index 30e4382f2a..d14d490f9d 100644 --- a/deps.lock +++ b/deps.lock @@ -1,10 +1,10 @@ -symfony 9a0aefd1921351f6eb2655440900ec7345928b53 -twig 972a93f85d862ac7051e9d655dce9e10287aa005 +symfony be4e5388ef98b0e0ae7bc3b9b3784541b3c83302 +twig b9908680126b3e5aa640de298c9382ea752b3be5 monolog b704c49a3051536f67f2d39f13568f74615b9922 doctrine-common 06e9f72342a4c49b3590d0e8b53d451b3f9c1b33 doctrine-dbal 5a827d7c18f5e34a87086be88af2f3d706169aa4 -doctrine cd04cbc7c40287638df78b79e5f0e475ecba368f -swiftmailer daaff2b8515390fbb10882647311f476b89a67e6 +doctrine 9cd8f85a8cef8d97c3d9dfe03d45b580998e0032 +swiftmailer eb0ecaa4243efc46e0f54d87c6454e49aa4b62dd assetic f829ad23d23c87480151a21faad49fefe7c09e5d twig-extensions 560990d47ba3fefea18420f9951b54d490715b19 metadata 30c622cad82e39a6856b981a9bfb9df06b3cc067 From 028b2fce2a18bbd76914a48e61f6889d461f877e Mon Sep 17 00:00:00 2001 From: "H. Westphal" Date: Sun, 18 Dec 2011 19:46:51 +0100 Subject: [PATCH 351/899] Removed duplicate check of token_get_all function. --- app/check.php | 1 - web/config.php | 4 ---- 2 files changed, 5 deletions(-) diff --git a/app/check.php b/app/check.php index 3d71f7e41a..404450610b 100644 --- a/app/check.php +++ b/app/check.php @@ -37,7 +37,6 @@ // warnings echo_title("Optional checks"); check(class_exists('DomDocument'), 'Checking that the PHP-XML module is installed', 'Install and enable the php-xml module', false); -check(function_exists('token_get_all'), 'Checking that the token_get_all() function is available', 'Install and enable the Tokenizer extension (highly recommended)', false); check(function_exists('mb_strlen'), 'Checking that the mb_strlen() function is available', 'Install and enable the mbstring extension', false); check(function_exists('iconv'), 'Checking that the iconv() function is available', 'Install and enable the iconv extension', false); check(function_exists('utf8_decode'), 'Checking that the utf8_decode() is available', 'Install and enable the XML extension', false); diff --git a/web/config.php b/web/config.php index 01ad123028..76a2881364 100644 --- a/web/config.php +++ b/web/config.php @@ -57,10 +57,6 @@ $majorProblems[] = 'Upgrade your APC extension (3.0.17+)'; } -if (!function_exists('token_get_all')) { - $minorProblems[] = 'Install and enable the Tokenizer extension.'; -} - if (!function_exists('mb_strlen')) { $minorProblems[] = 'Install and enable the mbstring extension.'; } From 72fb25f911578e506afbc66ce8068f25d0e929d2 Mon Sep 17 00:00:00 2001 From: "H. Westphal" Date: Sun, 18 Dec 2011 19:51:10 +0100 Subject: [PATCH 352/899] Added checks for required simplexml extension. --- app/check.php | 1 + web/config.php | 4 ++++ 2 files changed, 5 insertions(+) diff --git a/app/check.php b/app/check.php index 404450610b..a1a987b1c9 100644 --- a/app/check.php +++ b/app/check.php @@ -32,6 +32,7 @@ check(function_exists('session_start'), 'Checking that the session_start() is available', 'Install and enable the session extension', true); check(function_exists('ctype_alpha'), 'Checking that the ctype_alpha() is available', 'Install and enable the ctype extension', true); check(function_exists('token_get_all'), 'Checking that the token_get_all() is available', 'Install and enable the tokenizer extension', true); +check(function_exists('simplexml_import_dom'), 'Checking that the simplexml_import_dom() is available', 'Install and enable the simplexml extension', true); check(!(function_exists('apc_store') && ini_get('apc.enabled')) || version_compare(phpversion('apc'), '3.0.17', '>='), 'Checking that the APC version is at least 3.0.17', 'Upgrade your APC extension (3.0.17+)', true); // warnings diff --git a/web/config.php b/web/config.php index 76a2881364..d1b4c9ab6e 100644 --- a/web/config.php +++ b/web/config.php @@ -112,6 +112,10 @@ $majorProblems[] = 'Install and enable the Tokenizer extension.'; } +if (!function_exists('simplexml_import_dom')) { + $majorProblems[] = 'Install and enable the SimpleXML extension.'; +} + // php.ini if (!ini_get('date.timezone')) { $phpini = true; From 08a625c27667c56d3ac26b7d4e13062e50d1191f Mon Sep 17 00:00:00 2001 From: Fabien Potencier Date: Sun, 18 Dec 2011 21:06:01 +0100 Subject: [PATCH 353/899] updated vendors --- deps.lock | 12 ++++++------ 1 file changed, 6 insertions(+), 6 deletions(-) diff --git a/deps.lock b/deps.lock index d14d490f9d..95de92a98a 100644 --- a/deps.lock +++ b/deps.lock @@ -1,12 +1,12 @@ -symfony be4e5388ef98b0e0ae7bc3b9b3784541b3c83302 -twig b9908680126b3e5aa640de298c9382ea752b3be5 +symfony e6e78f6a81eb2d0e1814714b2b390a75b384d357 +twig 6f020ccaf4d0c23a4c6c6e6e1bd21c79cac72f22 monolog b704c49a3051536f67f2d39f13568f74615b9922 -doctrine-common 06e9f72342a4c49b3590d0e8b53d451b3f9c1b33 -doctrine-dbal 5a827d7c18f5e34a87086be88af2f3d706169aa4 -doctrine 9cd8f85a8cef8d97c3d9dfe03d45b580998e0032 +doctrine-common 6c37d60eeb7a6ab7a3a2932a6041fd006806b537 +doctrine-dbal 0c336901ff5e9877e176e4530fe6f309d8fdf59a +doctrine 29fabbd81f105ce1427b13eed6f7e9bc0ada1a9a swiftmailer eb0ecaa4243efc46e0f54d87c6454e49aa4b62dd assetic f829ad23d23c87480151a21faad49fefe7c09e5d -twig-extensions 560990d47ba3fefea18420f9951b54d490715b19 +twig-extensions d75a453b4e1ad48216cc4803ba9095855f130774 metadata 30c622cad82e39a6856b981a9bfb9df06b3cc067 SensioFrameworkExtraBundle 1c7e92f466d11f83130b0c1271f44d067a2c3b31 JMSSecurityExtraBundle b8b7eb294ed83d83ca7260ac018e701f08003538 From ea819603129d308dfc99b1c232968182737acf76 Mon Sep 17 00:00:00 2001 From: Fabien Potencier Date: Mon, 26 Dec 2011 12:01:18 +0100 Subject: [PATCH 354/899] updated VENDORS for 2.0.8 --- deps | 10 +++++----- deps.lock | 14 +++++++------- 2 files changed, 12 insertions(+), 12 deletions(-) diff --git a/deps b/deps index 8d0b8063cf..cf15d6bd75 100644 --- a/deps +++ b/deps @@ -1,6 +1,6 @@ [symfony] git=http://github.com/symfony/symfony.git - version=origin/2.0 + version=v2.0.8 [twig] git=http://github.com/fabpot/Twig.git @@ -12,19 +12,19 @@ [doctrine-common] git=http://github.com/doctrine/common.git - version=origin/2.1.x + version=2.1.4 [doctrine-dbal] git=http://github.com/doctrine/dbal.git - version=origin/2.1.x + version=2.1.5 [doctrine] git=http://github.com/doctrine/doctrine2.git - version=origin/2.1.x + version=2.1.5 [swiftmailer] git=http://github.com/swiftmailer/swiftmailer.git - version=v4.1.3 + version=v4.1.4 [assetic] git=http://github.com/kriswallsmith/assetic.git diff --git a/deps.lock b/deps.lock index 521cb00bf3..037d8fff4e 100644 --- a/deps.lock +++ b/deps.lock @@ -1,15 +1,15 @@ -symfony 848f87504de4cf825f1e44f20e89fb266f64e653 +symfony 5b4e6190c4420524e4dcaf51213c4ad78f646528 twig 0b7d6dfa0cf0dfb6a3c5745b6434ebd6ea32e90e monolog b704c49a3051536f67f2d39f13568f74615b9922 -doctrine-common 441d276795d3e2cbb4196138a4c12c6d35a5f740 -doctrine-dbal b4a6d4a66bc0da31893a535780fcf417d0e4aa83 -doctrine b1db2ad0d87419b3a7be8cc50d89cc21d89d8985 -swiftmailer daaff2b8515390fbb10882647311f476b89a67e6 +doctrine-common b886898821288d305862ee9c567cc5b5cbb4c0dc +doctrine-dbal ae358bd94ec09d7d3ad92ca7820e67825ad9e5f4 +doctrine da0e3439aba4c8bf5e8a6ee4ccee5ce2624be8d1 +swiftmailer eb0ecaa4243efc46e0f54d87c6454e49aa4b62dd assetic f829ad23d23c87480151a21faad49fefe7c09e5d -twig-extensions 3076c971976e1baaf86e5820c7a1da3f5c1c14eb +twig-extensions d75a453b4e1ad48216cc4803ba9095855f130774 metadata 8717ad2a5689480765d9ffafe925cd8a2457e582 SensioFrameworkExtraBundle 1c7e92f466d11f83130b0c1271f44d067a2c3b31 JMSSecurityExtraBundle b8b7eb294ed83d83ca7260ac018e701f08003538 SensioDistributionBundle 20b66a408084ad8752f98e50f10533f5245310bf -SensioGeneratorBundle c6af9719ae9e81fa4e086f40697d35e7090921cc +SensioGeneratorBundle 87fe88c4c8dc09cb197ba4b2d6d5b834e2c64980 AsseticBundle 41b5913b5086a0909af92adcb4a6005ee0051b16 \ No newline at end of file From 9737e724d07a79f3847dfed3558e6876219eae43 Mon Sep 17 00:00:00 2001 From: Fabien Potencier Date: Mon, 26 Dec 2011 12:03:16 +0100 Subject: [PATCH 355/899] updated vendors to dev branches --- deps | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/deps b/deps index cf15d6bd75..8471a0b115 100644 --- a/deps +++ b/deps @@ -1,6 +1,6 @@ [symfony] git=http://github.com/symfony/symfony.git - version=v2.0.8 + version=origin/2.0 [twig] git=http://github.com/fabpot/Twig.git From 19c269d1762fc822886b57451fe60987ef3d3da0 Mon Sep 17 00:00:00 2001 From: Fabien Potencier Date: Thu, 29 Dec 2011 09:27:02 +0100 Subject: [PATCH 356/899] updated vendors --- deps.lock | 12 ++++++------ 1 file changed, 6 insertions(+), 6 deletions(-) diff --git a/deps.lock b/deps.lock index 95de92a98a..24f6f381e9 100644 --- a/deps.lock +++ b/deps.lock @@ -1,9 +1,9 @@ -symfony e6e78f6a81eb2d0e1814714b2b390a75b384d357 -twig 6f020ccaf4d0c23a4c6c6e6e1bd21c79cac72f22 +symfony 23e04e3acb4cb9328a395ddb8b97928dfb1b3627 +twig fc85a16886834f011ad8d63d560b36a585f1b2e5 monolog b704c49a3051536f67f2d39f13568f74615b9922 -doctrine-common 6c37d60eeb7a6ab7a3a2932a6041fd006806b537 -doctrine-dbal 0c336901ff5e9877e176e4530fe6f309d8fdf59a -doctrine 29fabbd81f105ce1427b13eed6f7e9bc0ada1a9a +doctrine-common 16b2385b3ce5319d88969f18694e4b36533bd258 +doctrine-dbal 6c3b6d034c51226cd133857c80c969663703219d +doctrine 959a68694e5827a74ad5b8c8216996ffff6196ba swiftmailer eb0ecaa4243efc46e0f54d87c6454e49aa4b62dd assetic f829ad23d23c87480151a21faad49fefe7c09e5d twig-extensions d75a453b4e1ad48216cc4803ba9095855f130774 @@ -11,5 +11,5 @@ metadata 30c622cad82e39a6856b981a9bfb9df06b3cc067 SensioFrameworkExtraBundle 1c7e92f466d11f83130b0c1271f44d067a2c3b31 JMSSecurityExtraBundle b8b7eb294ed83d83ca7260ac018e701f08003538 SensioDistributionBundle 64ae64795c794e34d964a67e76f0584444189fc2 -SensioGeneratorBundle 87fe88c4c8dc09cb197ba4b2d6d5b834e2c64980 +SensioGeneratorBundle 21af7fa5f31e1a9f35d093c97ab7bef1b3a63be4 AsseticBundle 41b5913b5086a0909af92adcb4a6005ee0051b16 \ No newline at end of file From 5dee24eb280452fe46e76f99706c21ab417462ac Mon Sep 17 00:00:00 2001 From: Fabien Potencier Date: Mon, 2 Jan 2012 18:13:57 +0100 Subject: [PATCH 357/899] updated Doctrine bundle configuration as it has moved to the Doctrine organization --- app/AppKernel.php | 2 +- app/autoload.php | 1 + deps | 4 ++++ 3 files changed, 6 insertions(+), 1 deletion(-) diff --git a/app/AppKernel.php b/app/AppKernel.php index 5bd97b74c7..d37b90f6d9 100644 --- a/app/AppKernel.php +++ b/app/AppKernel.php @@ -13,8 +13,8 @@ public function registerBundles() new Symfony\Bundle\TwigBundle\TwigBundle(), new Symfony\Bundle\MonologBundle\MonologBundle(), new Symfony\Bundle\SwiftmailerBundle\SwiftmailerBundle(), - new Symfony\Bundle\DoctrineBundle\DoctrineBundle(), new Symfony\Bundle\AsseticBundle\AsseticBundle(), + new Doctrine\Bundle\DoctrineBundle\DoctrineBundle(), new Sensio\Bundle\FrameworkExtraBundle\SensioFrameworkExtraBundle(), new JMS\SecurityExtraBundle\JMSSecurityExtraBundle(), ); diff --git a/app/autoload.php b/app/autoload.php index 64ba187734..f36067f824 100644 --- a/app/autoload.php +++ b/app/autoload.php @@ -8,6 +8,7 @@ 'Symfony' => array(__DIR__.'/../vendor/symfony/src', __DIR__.'/../vendor/bundles'), 'Sensio' => __DIR__.'/../vendor/bundles', 'JMS' => __DIR__.'/../vendor/bundles', + 'Doctrine\\Bundle' => __DIR__.'/../vendor/bundles', 'Doctrine\\Common' => __DIR__.'/../vendor/doctrine-common/lib', 'Doctrine\\DBAL' => __DIR__.'/../vendor/doctrine-dbal/lib', 'Doctrine' => __DIR__.'/../vendor/doctrine/lib', diff --git a/deps b/deps index 129472ba0e..e78732ce39 100644 --- a/deps +++ b/deps @@ -58,3 +58,7 @@ git=http://github.com/symfony/AsseticBundle.git target=/bundles/Symfony/Bundle/AsseticBundle version=v1.0.1 + +[DoctrineBundle] + git=http://github.com/doctrine/DoctrineBundle.git + target=/bundles/Doctrine/Bundle/DoctrineBundle From cad2f8378477f5ed4a949f33e3b12eba80bab4e7 Mon Sep 17 00:00:00 2001 From: Fabien Potencier Date: Mon, 2 Jan 2012 18:16:56 +0100 Subject: [PATCH 358/899] updated vendors --- deps.lock | 17 +++++++++-------- 1 file changed, 9 insertions(+), 8 deletions(-) diff --git a/deps.lock b/deps.lock index 24f6f381e9..fcef3136fb 100644 --- a/deps.lock +++ b/deps.lock @@ -1,15 +1,16 @@ -symfony 23e04e3acb4cb9328a395ddb8b97928dfb1b3627 -twig fc85a16886834f011ad8d63d560b36a585f1b2e5 +symfony dcf209a4aaf27147848437bc5a505b5506116d44 +twig b44dba5c7c1d13f514d55cadcdc4fbc38ad4e652 monolog b704c49a3051536f67f2d39f13568f74615b9922 -doctrine-common 16b2385b3ce5319d88969f18694e4b36533bd258 -doctrine-dbal 6c3b6d034c51226cd133857c80c969663703219d -doctrine 959a68694e5827a74ad5b8c8216996ffff6196ba +doctrine-common cc04744bcf5a4743c46fae0487ac7a093a722856 +doctrine-dbal 15bcd83a392df19de22cde6c9d5b28c1f7207751 +doctrine 9a0d36ae869955ee0e0d554f1962b4eea7f36149 swiftmailer eb0ecaa4243efc46e0f54d87c6454e49aa4b62dd assetic f829ad23d23c87480151a21faad49fefe7c09e5d twig-extensions d75a453b4e1ad48216cc4803ba9095855f130774 metadata 30c622cad82e39a6856b981a9bfb9df06b3cc067 SensioFrameworkExtraBundle 1c7e92f466d11f83130b0c1271f44d067a2c3b31 -JMSSecurityExtraBundle b8b7eb294ed83d83ca7260ac018e701f08003538 +JMSSecurityExtraBundle 3a728757abc2dd5ab357caded801d5d7e2436539 SensioDistributionBundle 64ae64795c794e34d964a67e76f0584444189fc2 -SensioGeneratorBundle 21af7fa5f31e1a9f35d093c97ab7bef1b3a63be4 -AsseticBundle 41b5913b5086a0909af92adcb4a6005ee0051b16 \ No newline at end of file +SensioGeneratorBundle 0d58617cbde570803c2f00dc03f3acffce0cf28f +AsseticBundle 41b5913b5086a0909af92adcb4a6005ee0051b16 +DoctrineBundle 807485d7781323c2ea12991138340b60f34d3a5d \ No newline at end of file From 71b1be1e4d7ece0055202def2580c8d44127e954 Mon Sep 17 00:00:00 2001 From: Fabien Potencier Date: Mon, 2 Jan 2012 18:36:24 +0100 Subject: [PATCH 359/899] fixed CS --- web/config.php | 52 +++++++++++++++++++++++++------------------------- 1 file changed, 26 insertions(+), 26 deletions(-) diff --git a/web/config.php b/web/config.php index 69957b8acf..1172717935 100644 --- a/web/config.php +++ b/web/config.php @@ -161,51 +161,51 @@ sf_symfony
    - +

    Welcome!

    Welcome to your new Symfony project.

    This script will guide you through the basic configuration of your project. You can also do the same by editing the ‘app/config/parameters.yml’ file directly.

    - + -

    - Major problems -

    -

    Major problems have been detected and must be fixed before continuing:

    -
      - -
      2. - -
    +

    + Major problems +

    +

    Major problems have been detected and must be fixed before continuing:

    +
      + +
      2. + +
    - + -

    Recommendations

    +

    Recommendations

    Additionally, toTo enhance your Symfony experience, it’s recommended that you fix the following:

      -
      2. +
    - + - -

    * - - Changes to the php.ini file must be done in "". - - To change settings, create a "php.ini". - -

    + +

    * + + Changes to the php.ini file must be done in "". + + To change settings, create a "php.ini". + +

    - + From 5a2c4ba7ea07f03d1222a682d360e631dea8abdd Mon Sep 17 00:00:00 2001 From: Fabien Potencier Date: Tue, 3 Jan 2012 12:41:58 +0100 Subject: [PATCH 360/899] updated vendors --- deps | 1 + deps.lock | 6 +++--- 2 files changed, 4 insertions(+), 3 deletions(-) diff --git a/deps b/deps index 8471a0b115..e2e803f333 100644 --- a/deps +++ b/deps @@ -55,6 +55,7 @@ [SensioGeneratorBundle] git=http://github.com/sensio/SensioGeneratorBundle.git target=/bundles/Sensio/Bundle/GeneratorBundle + version=origin/2.0 [AsseticBundle] git=http://github.com/symfony/AsseticBundle.git diff --git a/deps.lock b/deps.lock index 037d8fff4e..2bc8184d98 100644 --- a/deps.lock +++ b/deps.lock @@ -1,4 +1,4 @@ -symfony 5b4e6190c4420524e4dcaf51213c4ad78f646528 +symfony 4e1499dd747fc47b89591cc6ebc6b37bdadcee40 twig 0b7d6dfa0cf0dfb6a3c5745b6434ebd6ea32e90e monolog b704c49a3051536f67f2d39f13568f74615b9922 doctrine-common b886898821288d305862ee9c567cc5b5cbb4c0dc @@ -9,7 +9,7 @@ assetic f829ad23d23c87480151a21faad49fefe7c09e5d twig-extensions d75a453b4e1ad48216cc4803ba9095855f130774 metadata 8717ad2a5689480765d9ffafe925cd8a2457e582 SensioFrameworkExtraBundle 1c7e92f466d11f83130b0c1271f44d067a2c3b31 -JMSSecurityExtraBundle b8b7eb294ed83d83ca7260ac018e701f08003538 +JMSSecurityExtraBundle 3a728757abc2dd5ab357caded801d5d7e2436539 SensioDistributionBundle 20b66a408084ad8752f98e50f10533f5245310bf -SensioGeneratorBundle 87fe88c4c8dc09cb197ba4b2d6d5b834e2c64980 +SensioGeneratorBundle dd37fc4487bc09ac01bdcf89e0ff4ee4484b7fab AsseticBundle 41b5913b5086a0909af92adcb4a6005ee0051b16 \ No newline at end of file From 7c7f28b36baff2dbf3dadbb3283038dae8db7813 Mon Sep 17 00:00:00 2001 From: Fabien Potencier Date: Tue, 3 Jan 2012 12:46:58 +0100 Subject: [PATCH 361/899] updated vendors --- deps.lock | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/deps.lock b/deps.lock index 6606e80dab..3376ad947f 100644 --- a/deps.lock +++ b/deps.lock @@ -1,4 +1,4 @@ -symfony dcf209a4aaf27147848437bc5a505b5506116d44 +symfony 42fe9fc35fc7821f585379afe67d4a8bec7c2c5e twig b44dba5c7c1d13f514d55cadcdc4fbc38ad4e652 monolog b704c49a3051536f67f2d39f13568f74615b9922 doctrine-common cc04744bcf5a4743c46fae0487ac7a093a722856 @@ -8,9 +8,9 @@ swiftmailer eb0ecaa4243efc46e0f54d87c6454e49aa4b62dd assetic f829ad23d23c87480151a21faad49fefe7c09e5d twig-extensions d75a453b4e1ad48216cc4803ba9095855f130774 metadata 30c622cad82e39a6856b981a9bfb9df06b3cc067 -SensioFrameworkExtraBundle 1c7e92f466d11f83130b0c1271f44d067a2c3b31 +SensioFrameworkExtraBundle 1f661752ff051aeeca048e0be8df896faa024184 JMSSecurityExtraBundle 3a728757abc2dd5ab357caded801d5d7e2436539 SensioDistributionBundle 64ae64795c794e34d964a67e76f0584444189fc2 SensioGeneratorBundle 0d58617cbde570803c2f00dc03f3acffce0cf28f AsseticBundle 41b5913b5086a0909af92adcb4a6005ee0051b16 -DoctrineBundle 807485d7781323c2ea12991138340b60f34d3a5d +DoctrineBundle 807485d7781323c2ea12991138340b60f34d3a5d \ No newline at end of file From b41362a9cff36e2d64a946b5ed6f52a8a324bf6d Mon Sep 17 00:00:00 2001 From: Fabien Potencier Date: Wed, 4 Jan 2012 14:51:24 +0100 Subject: [PATCH 362/899] updated vendors --- deps | 4 ++-- deps.lock | 6 +++--- 2 files changed, 5 insertions(+), 5 deletions(-) diff --git a/deps b/deps index e2e803f333..21f9c69954 100644 --- a/deps +++ b/deps @@ -4,7 +4,7 @@ [twig] git=http://github.com/fabpot/Twig.git - version=v1.4.0 + version=v1.5.0 [monolog] git=http://github.com/Seldaek/monolog.git @@ -24,7 +24,7 @@ [swiftmailer] git=http://github.com/swiftmailer/swiftmailer.git - version=v4.1.4 + version=v4.1.5 [assetic] git=http://github.com/kriswallsmith/assetic.git diff --git a/deps.lock b/deps.lock index 2bc8184d98..e6155bd5dd 100644 --- a/deps.lock +++ b/deps.lock @@ -1,10 +1,10 @@ -symfony 4e1499dd747fc47b89591cc6ebc6b37bdadcee40 -twig 0b7d6dfa0cf0dfb6a3c5745b6434ebd6ea32e90e +symfony 870ab2d11ecc9550a5190e9f72d0590fba9064d4 +twig f6e49636d1cef286262f85835f7d19ec3df61b4c monolog b704c49a3051536f67f2d39f13568f74615b9922 doctrine-common b886898821288d305862ee9c567cc5b5cbb4c0dc doctrine-dbal ae358bd94ec09d7d3ad92ca7820e67825ad9e5f4 doctrine da0e3439aba4c8bf5e8a6ee4ccee5ce2624be8d1 -swiftmailer eb0ecaa4243efc46e0f54d87c6454e49aa4b62dd +swiftmailer 982b4c9498b7dd85e70f6d35e65d909c888e6345 assetic f829ad23d23c87480151a21faad49fefe7c09e5d twig-extensions d75a453b4e1ad48216cc4803ba9095855f130774 metadata 8717ad2a5689480765d9ffafe925cd8a2457e582 From c32d44742077941b5a8da7ba0d4a224f6c4f22bd Mon Sep 17 00:00:00 2001 From: Fabien Potencier Date: Wed, 4 Jan 2012 14:53:08 +0100 Subject: [PATCH 363/899] updated vendors --- deps.lock | 10 +++++----- 1 file changed, 5 insertions(+), 5 deletions(-) diff --git a/deps.lock b/deps.lock index c5b2cedf1e..e14dfd245b 100644 --- a/deps.lock +++ b/deps.lock @@ -1,10 +1,10 @@ symfony 42fe9fc35fc7821f585379afe67d4a8bec7c2c5e -twig b44dba5c7c1d13f514d55cadcdc4fbc38ad4e652 +twig d76d670b54ec722b70f41b4f68274df8c74b7712 monolog b704c49a3051536f67f2d39f13568f74615b9922 -doctrine-common cc04744bcf5a4743c46fae0487ac7a093a722856 +doctrine-common 3107f295eb17ed40116ae4cd2499e5c5c3adde42 doctrine-dbal 15bcd83a392df19de22cde6c9d5b28c1f7207751 -doctrine 9a0d36ae869955ee0e0d554f1962b4eea7f36149 -swiftmailer eb0ecaa4243efc46e0f54d87c6454e49aa4b62dd +doctrine 3fff83cd135a1e97141eddc1e2751b5584e9acb0 +swiftmailer 982b4c9498b7dd85e70f6d35e65d909c888e6345 assetic f829ad23d23c87480151a21faad49fefe7c09e5d twig-extensions d75a453b4e1ad48216cc4803ba9095855f130774 metadata 30c622cad82e39a6856b981a9bfb9df06b3cc067 @@ -13,4 +13,4 @@ JMSSecurityExtraBundle 3a728757abc2dd5ab357caded801d5d7e2436539 SensioDistributionBundle 64ae64795c794e34d964a67e76f0584444189fc2 SensioGeneratorBundle 0d58617cbde570803c2f00dc03f3acffce0cf28f AsseticBundle 41b5913b5086a0909af92adcb4a6005ee0051b16 -DoctrineBundle 807485d7781323c2ea12991138340b60f34d3a5d +DoctrineBundle 3d65b220ef83d7cff77b6b0383e548e6e70fb45a \ No newline at end of file From 898945606acbd18d3be5d2ab58d48ee43514c0e5 Mon Sep 17 00:00:00 2001 From: Fabien Potencier Date: Thu, 5 Jan 2012 16:58:29 +0100 Subject: [PATCH 364/899] updated vendors --- deps | 2 +- deps.lock | 8 ++++---- 2 files changed, 5 insertions(+), 5 deletions(-) diff --git a/deps b/deps index 21f9c69954..bd8184cd31 100644 --- a/deps +++ b/deps @@ -4,7 +4,7 @@ [twig] git=http://github.com/fabpot/Twig.git - version=v1.5.0 + version=v1.5.1 [monolog] git=http://github.com/Seldaek/monolog.git diff --git a/deps.lock b/deps.lock index e6155bd5dd..852ff097ec 100644 --- a/deps.lock +++ b/deps.lock @@ -1,15 +1,15 @@ -symfony 870ab2d11ecc9550a5190e9f72d0590fba9064d4 -twig f6e49636d1cef286262f85835f7d19ec3df61b4c +symfony e09b5231d3062d099429ebc55e269849a270e1ac +twig 5bba14970604a26469af90b605d10c716b3af411 monolog b704c49a3051536f67f2d39f13568f74615b9922 doctrine-common b886898821288d305862ee9c567cc5b5cbb4c0dc doctrine-dbal ae358bd94ec09d7d3ad92ca7820e67825ad9e5f4 doctrine da0e3439aba4c8bf5e8a6ee4ccee5ce2624be8d1 swiftmailer 982b4c9498b7dd85e70f6d35e65d909c888e6345 assetic f829ad23d23c87480151a21faad49fefe7c09e5d -twig-extensions d75a453b4e1ad48216cc4803ba9095855f130774 +twig-extensions a05ab5ed18a51ae45f3dcc2d0c4ec9b3a6386987 metadata 8717ad2a5689480765d9ffafe925cd8a2457e582 SensioFrameworkExtraBundle 1c7e92f466d11f83130b0c1271f44d067a2c3b31 -JMSSecurityExtraBundle 3a728757abc2dd5ab357caded801d5d7e2436539 +JMSSecurityExtraBundle 541a4c242328dc04b99540c75346cc74a7c0cfb5 SensioDistributionBundle 20b66a408084ad8752f98e50f10533f5245310bf SensioGeneratorBundle dd37fc4487bc09ac01bdcf89e0ff4ee4484b7fab AsseticBundle 41b5913b5086a0909af92adcb4a6005ee0051b16 \ No newline at end of file From 2999bdeba7b53fc1b6c4a78e8d44237ce1ac905d Mon Sep 17 00:00:00 2001 From: Fabien Potencier Date: Fri, 6 Jan 2012 07:56:20 +0100 Subject: [PATCH 365/899] updated VENDORS for 2.0.9 --- deps | 2 +- deps.lock | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/deps b/deps index bd8184cd31..60b4ec71ad 100644 --- a/deps +++ b/deps @@ -1,6 +1,6 @@ [symfony] git=http://github.com/symfony/symfony.git - version=origin/2.0 + version=v2.0.9 [twig] git=http://github.com/fabpot/Twig.git diff --git a/deps.lock b/deps.lock index 852ff097ec..c388e7c1d0 100644 --- a/deps.lock +++ b/deps.lock @@ -1,4 +1,4 @@ -symfony e09b5231d3062d099429ebc55e269849a270e1ac +symfony 3e9d937eb8fedb8a585559e04311ee9a39db421f twig 5bba14970604a26469af90b605d10c716b3af411 monolog b704c49a3051536f67f2d39f13568f74615b9922 doctrine-common b886898821288d305862ee9c567cc5b5cbb4c0dc From db67701977654fac125689f23b30d2f7990781c5 Mon Sep 17 00:00:00 2001 From: Fabien Potencier Date: Fri, 6 Jan 2012 07:57:32 +0100 Subject: [PATCH 366/899] updated vendors to dev branches --- deps | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/deps b/deps index 60b4ec71ad..bd8184cd31 100644 --- a/deps +++ b/deps @@ -1,6 +1,6 @@ [symfony] git=http://github.com/symfony/symfony.git - version=v2.0.9 + version=origin/2.0 [twig] git=http://github.com/fabpot/Twig.git From dc62f29c74094f4a76262f9b902c5bba814c62b4 Mon Sep 17 00:00:00 2001 From: Toni Uebernickel Date: Mon, 9 Jan 2012 15:59:33 +0100 Subject: [PATCH 367/899] add name-rev trying to retrieve a nice version This will render tag names rather than commit hashes in deps.lock file, where possible. --- bin/vendors | 14 +++++++++++++- 1 file changed, 13 insertions(+), 1 deletion(-) diff --git a/bin/vendors b/bin/vendors index 9003dbe53e..ae4b07ce9a 100755 --- a/bin/vendors +++ b/bin/vendors @@ -118,7 +118,19 @@ foreach ($deps as $name => $dep) { if ('update' === $command || 'lock' === $command) { ob_start(); system(sprintf('cd %s && git log -n 1 --format=%%H', escapeshellarg($installDir))); - $newversions[] = trim($name.' '.ob_get_clean()); + $newversion = trim(ob_get_clean()); + + ob_start(); + system(sprintf('cd %s && git name-rev --tags --name-only %s', escapeshellarg($installDir), $newversion)); + // remove trailing ^0 from tags, those are the tags themselves + $niceversion = preg_replace('/\^0$/', '', trim(ob_get_clean())); + + // undefined is returned in case no name-rev could be found + if ('undefined' !== $niceversion) { + $newversions[] = $name.' '.$niceversion; + } else { + $newversions[] = $name.' '.$newversion; + } } } From 5e401da4d4c7ad0f69b577196a0a3f3f81c01f50 Mon Sep 17 00:00:00 2001 From: Fabien Potencier Date: Tue, 10 Jan 2012 07:28:54 +0100 Subject: [PATCH 368/899] updated vendors --- deps.lock | 26 +++++++++++++------------- 1 file changed, 13 insertions(+), 13 deletions(-) diff --git a/deps.lock b/deps.lock index e14dfd245b..2ce7863b97 100644 --- a/deps.lock +++ b/deps.lock @@ -1,16 +1,16 @@ -symfony 42fe9fc35fc7821f585379afe67d4a8bec7c2c5e -twig d76d670b54ec722b70f41b4f68274df8c74b7712 -monolog b704c49a3051536f67f2d39f13568f74615b9922 -doctrine-common 3107f295eb17ed40116ae4cd2499e5c5c3adde42 -doctrine-dbal 15bcd83a392df19de22cde6c9d5b28c1f7207751 -doctrine 3fff83cd135a1e97141eddc1e2751b5584e9acb0 -swiftmailer 982b4c9498b7dd85e70f6d35e65d909c888e6345 -assetic f829ad23d23c87480151a21faad49fefe7c09e5d -twig-extensions d75a453b4e1ad48216cc4803ba9095855f130774 -metadata 30c622cad82e39a6856b981a9bfb9df06b3cc067 +symfony 46b00b1001f12997d93afd6730c07185ac9aaa3f +twig fee85f2f1d9b5f3a9b2d6859c56d6229f79ae909 +monolog 1.0.2 +doctrine-common d68ebde1cdfd5717ae6ddb29f36aebf8a3a73156 +doctrine-dbal 98424cc67beabdec8a170fb2193042a4759be641 +doctrine adec530c131e419cd16622de79c3eae13dbbfff4 +swiftmailer v4.1.5 +assetic v1.0.2 +twig-extensions a05ab5ed18a51ae45f3dcc2d0c4ec9b3a6386987 +metadata 1.1.0 SensioFrameworkExtraBundle 1f661752ff051aeeca048e0be8df896faa024184 -JMSSecurityExtraBundle 3a728757abc2dd5ab357caded801d5d7e2436539 +JMSSecurityExtraBundle 541a4c242328dc04b99540c75346cc74a7c0cfb5 SensioDistributionBundle 64ae64795c794e34d964a67e76f0584444189fc2 SensioGeneratorBundle 0d58617cbde570803c2f00dc03f3acffce0cf28f -AsseticBundle 41b5913b5086a0909af92adcb4a6005ee0051b16 -DoctrineBundle 3d65b220ef83d7cff77b6b0383e548e6e70fb45a \ No newline at end of file +AsseticBundle v1.0.1 +DoctrineBundle d6c923eec875d3bd622c7037b3ff879f4fdafdc8 \ No newline at end of file From 36ad2123ecab34e68216efc94680eecdca4197cf Mon Sep 17 00:00:00 2001 From: Fabien Potencier Date: Tue, 10 Jan 2012 07:29:31 +0100 Subject: [PATCH 369/899] merged bin/vendors from master --- bin/vendors | 86 +++++++++++++++++++++++++++++++---------------------- 1 file changed, 51 insertions(+), 35 deletions(-) diff --git a/bin/vendors b/bin/vendors index 0f8e00ba55..ae4b07ce9a 100755 --- a/bin/vendors +++ b/bin/vendors @@ -24,14 +24,14 @@ Specify a command to run: install: install vendors as specified in deps or deps.lock (recommended) update: update vendors to their latest versions (as specified in deps) - + lock: lock vendors to their current versions EOF ); } -if (!in_array($command = array_shift($argv), array('install', 'update'))) { - exit(sprintf("Command \"%s\" does not exist.\n", $command)); +if (!in_array($command = array_shift($argv), array('install', 'update', 'lock'))) { + exit(sprintf('Command "%s" does not exist.', $command).PHP_EOL); } /* @@ -59,7 +59,7 @@ if ('install' === $command && file_exists($rootDir.'/deps.lock')) { foreach (file($rootDir.'/deps.lock', FILE_IGNORE_NEW_LINES | FILE_SKIP_EMPTY_LINES) as $line) { $parts = array_values(array_filter(explode(' ', $line))); if (2 !== count($parts)) { - exit(sprintf('The deps version file is not valid (near "%s")', $line)); + exit(sprintf('The deps version file is not valid (near "%s")', $line).PHP_EOL); } $versions[$parts[0]] = $parts[1]; } @@ -68,65 +68,81 @@ if ('install' === $command && file_exists($rootDir.'/deps.lock')) { $newversions = array(); $deps = parse_ini_file($rootDir.'/deps', true, INI_SCANNER_RAW); if (false === $deps) { - exit("The deps file is not valid ini syntax. Perhaps missing a trailing newline?\n"); + exit('The deps file is not valid ini syntax. Perhaps missing a trailing newline?'.PHP_EOL); } foreach ($deps as $name => $dep) { $dep = array_map('trim', $dep); - // revision - if (isset($versions[$name])) { - $rev = $versions[$name]; - } else { - $rev = isset($dep['version']) ? $dep['version'] : 'origin/HEAD'; - } - // install dir $installDir = isset($dep['target']) ? $vendorDir.'/'.$dep['target'] : $vendorDir.'/'.$name; if (in_array('--reinstall', $argv)) { - if (PHP_OS == 'WINNT') { + if (defined('PHP_WINDOWS_VERSION_BUILD')) { system(sprintf('rmdir /S /Q %s', escapeshellarg(realpath($installDir)))); } else { system(sprintf('rm -rf %s', escapeshellarg($installDir))); } } - echo "> Installing/Updating $name\n"; + if ('install' === $command || 'update' === $command) { + echo '> Installing/Updating '.$name.PHP_EOL; - // url - if (!isset($dep['git'])) { - exit(sprintf('The "git" value for the "%s" dependency must be set.', $name)); - } - $url = $dep['git']; + // url + if (!isset($dep['git'])) { + exit(sprintf('The "git" value for the "%s" dependency must be set.', $name).PHP_EOL); + } + $url = $dep['git']; - if (!is_dir($installDir)) { - system(sprintf('git clone %s %s', escapeshellarg($url), escapeshellarg($installDir))); - } + if (!is_dir($installDir)) { + system(sprintf('git clone %s %s', escapeshellarg($url), escapeshellarg($installDir))); + } - $status = system(sprintf('cd %s && git status --porcelain -uno', escapeshellarg($installDir))); - if (!empty($status)) { - exit(sprintf('"%s" has local modifications. Please revert or commit/push them before running this command again.', $name)); - } - $current_rev = system(sprintf('cd %s && git rev-list --max-count=1 HEAD', escapeshellarg($installDir))); - if ($current_rev === $rev) { - continue; - } + // revision + if (isset($versions[$name])) { + $rev = $versions[$name]; + } else { + $rev = isset($dep['version']) ? $dep['version'] : 'origin/HEAD'; + } - system(sprintf('cd %s && git fetch origin && git reset --hard %s', escapeshellarg($installDir), escapeshellarg($rev))); + $status = system(sprintf('cd %s && git status --porcelain', escapeshellarg($installDir))); + if (!empty($status)) { + exit(sprintf('"%s" has local modifications. Please revert or commit/push them before running this command again.', $name).PHP_EOL); + } + $current_rev = system(sprintf('cd %s && git rev-list --max-count=1 HEAD', escapeshellarg($installDir))); + if ($current_rev === $rev) { + continue; + } - if ('update' === $command) { + system(sprintf('cd %s && git fetch origin && git reset --hard %s', escapeshellarg($installDir), escapeshellarg($rev))); + } + + if ('update' === $command || 'lock' === $command) { ob_start(); system(sprintf('cd %s && git log -n 1 --format=%%H', escapeshellarg($installDir))); - $newversions[] = trim($name.' '.ob_get_clean()); + $newversion = trim(ob_get_clean()); + + ob_start(); + system(sprintf('cd %s && git name-rev --tags --name-only %s', escapeshellarg($installDir), $newversion)); + // remove trailing ^0 from tags, those are the tags themselves + $niceversion = preg_replace('/\^0$/', '', trim(ob_get_clean())); + + // undefined is returned in case no name-rev could be found + if ('undefined' !== $niceversion) { + $newversions[] = $name.' '.$niceversion; + } else { + $newversions[] = $name.' '.$newversion; + } } } // update? -if ('update' === $command) { +if ('update' === $command || 'lock' === $command) { + echo '> Updating deps.lock'.PHP_EOL; + file_put_contents($rootDir.'/deps.lock', implode("\n", $newversions)); } // php on windows can't use the shebang line from system() -$interpreter = PHP_OS == 'WINNT' ? 'php.exe' : ''; +$interpreter = defined('PHP_WINDOWS_VERSION_BUILD') ? 'php.exe' : ''; // Update the bootstrap files system(sprintf('%s %s %s', $interpreter, escapeshellarg($rootDir.'/vendor/bundles/Sensio/Bundle/DistributionBundle/Resources/bin/build_bootstrap.php'), escapeshellarg($rootDir))); From 74cea61fc7704a03ebfcba35a409d2ea97576cc1 Mon Sep 17 00:00:00 2001 From: Fabien Potencier Date: Tue, 10 Jan 2012 07:30:11 +0100 Subject: [PATCH 370/899] updated vendors --- deps.lock | 20 ++++++++++---------- 1 file changed, 10 insertions(+), 10 deletions(-) diff --git a/deps.lock b/deps.lock index c388e7c1d0..4e59cc900d 100644 --- a/deps.lock +++ b/deps.lock @@ -1,15 +1,15 @@ -symfony 3e9d937eb8fedb8a585559e04311ee9a39db421f -twig 5bba14970604a26469af90b605d10c716b3af411 -monolog b704c49a3051536f67f2d39f13568f74615b9922 -doctrine-common b886898821288d305862ee9c567cc5b5cbb4c0dc -doctrine-dbal ae358bd94ec09d7d3ad92ca7820e67825ad9e5f4 -doctrine da0e3439aba4c8bf5e8a6ee4ccee5ce2624be8d1 -swiftmailer 982b4c9498b7dd85e70f6d35e65d909c888e6345 -assetic f829ad23d23c87480151a21faad49fefe7c09e5d +symfony caec56fbe3f27584a30ff32c02331135d1e744a3 +twig v1.5.1 +monolog 1.0.2 +doctrine-common 2.1.4 +doctrine-dbal 2.1.5 +doctrine 2.1.5 +swiftmailer v4.1.5 +assetic v1.0.2 twig-extensions a05ab5ed18a51ae45f3dcc2d0c4ec9b3a6386987 -metadata 8717ad2a5689480765d9ffafe925cd8a2457e582 +metadata 1.0.0 SensioFrameworkExtraBundle 1c7e92f466d11f83130b0c1271f44d067a2c3b31 JMSSecurityExtraBundle 541a4c242328dc04b99540c75346cc74a7c0cfb5 SensioDistributionBundle 20b66a408084ad8752f98e50f10533f5245310bf SensioGeneratorBundle dd37fc4487bc09ac01bdcf89e0ff4ee4484b7fab -AsseticBundle 41b5913b5086a0909af92adcb4a6005ee0051b16 \ No newline at end of file +AsseticBundle v1.0.1 \ No newline at end of file From b847dcbc15ac18d0c0125703290c777e3864485a Mon Sep 17 00:00:00 2001 From: Tobias Schultze Date: Fri, 13 Jan 2012 05:02:00 +0100 Subject: [PATCH 371/899] HTML5 markup for config.php --- web/config.php | 37 +++++++++++++++++++------------------ 1 file changed, 19 insertions(+), 18 deletions(-) diff --git a/web/config.php b/web/config.php index 1172717935..9bda81a3d1 100644 --- a/web/config.php +++ b/web/config.php @@ -144,11 +144,11 @@ ?> - + - + - + Symfony Configuration @@ -158,19 +158,20 @@

    Welcome!

    Welcome to your new Symfony project.

    -

    This script will guide you through the basic configuration of your project. You can also do the same by editing the ‘app/config/parameters.yml’ file directly.

    +

    + This script will guide you through the basic configuration of your project. + You can also do the same by editing the ‘app/config/parameters.yml’ file directly. +

    -

    - Major problems -

    +

    Major problems

    Major problems have been detected and must be fixed before continuing:

      @@ -181,19 +182,19 @@

      Recommendations

      -

      - Additionally, toTo enhance your Symfony experience, it’s recommended that you fix the following: -

      -
        - -
        2. - -
      +

      + Additionally, toTo enhance your Symfony experience, + it’s recommended that you fix the following: +

      +
        + +
        2. + +
      - -

      * +

      * Changes to the php.ini file must be done in "". From ba73d98c9f0cddb33dd817dafbfa0f0efc14aa1f Mon Sep 17 00:00:00 2001 From: Tobias Schultze Date: Fri, 13 Jan 2012 10:03:29 +0100 Subject: [PATCH 372/899] HTML5 for base.html.twig --- app/Resources/views/base.html.twig | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/app/Resources/views/base.html.twig b/app/Resources/views/base.html.twig index c19978f0da..bafd28d3bd 100644 --- a/app/Resources/views/base.html.twig +++ b/app/Resources/views/base.html.twig @@ -1,10 +1,10 @@ - + {% block title %}Welcome!{% endblock %} {% block stylesheets %}{% endblock %} - + {% block body %}{% endblock %} From e24fe0357b22da98de0f0e2e6776f92a76e6283e Mon Sep 17 00:00:00 2001 From: Tobias Schultze Date: Fri, 13 Jan 2012 10:08:43 +0100 Subject: [PATCH 373/899] HTML5 for layout.html.twig --- src/Acme/DemoBundle/Resources/views/layout.html.twig | 10 +++++----- 1 file changed, 5 insertions(+), 5 deletions(-) diff --git a/src/Acme/DemoBundle/Resources/views/layout.html.twig b/src/Acme/DemoBundle/Resources/views/layout.html.twig index e367ab89bb..44f6b0f671 100644 --- a/src/Acme/DemoBundle/Resources/views/layout.html.twig +++ b/src/Acme/DemoBundle/Resources/views/layout.html.twig @@ -1,16 +1,16 @@ - + - - + {% block title %}Demo Bundle{% endblock %} - + +

      - Symfony + Symfony logo
      From 526c2cc4447475e676be3ace418943e0dc953f97 Mon Sep 17 00:00:00 2001 From: Fabien Potencier Date: Sat, 7 Jul 2012 10:40:07 +0200 Subject: [PATCH 503/899] removed a backslash to avoid problem with PHP 5.2 --- app/SymfonyRequirements.php | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/app/SymfonyRequirements.php b/app/SymfonyRequirements.php index 0399b9630f..fdfc42f35c 100644 --- a/app/SymfonyRequirements.php +++ b/app/SymfonyRequirements.php @@ -413,7 +413,7 @@ public function __construct() if (version_compare($installedPhpVersion, self::REQUIRED_PHP_VERSION, '>=')) { $this->addRequirement( - (in_array(date_default_timezone_get(), \DateTimeZone::listIdentifiers())), + (in_array(date_default_timezone_get(), DateTimeZone::listIdentifiers())), sprintf('Default timezone is deprecated (%s)', date_default_timezone_get()), 'Fix your php.ini file (list of deprecated timezones http://us.php.net/manual/en/timezones.others.php).' ); From 94dccf163c480016038f46070dd70887b3e29abc Mon Sep 17 00:00:00 2001 From: Fabien Potencier Date: Sat, 7 Jul 2012 16:53:59 +0200 Subject: [PATCH 504/899] removed error message in autoload.php as the check is already be done in check.php and config.php --- app/autoload.php | 18 +----------------- 1 file changed, 1 insertion(+), 17 deletions(-) diff --git a/app/autoload.php b/app/autoload.php index 28425dc1ce..9fa06777c1 100644 --- a/app/autoload.php +++ b/app/autoload.php @@ -2,23 +2,7 @@ use Doctrine\Common\Annotations\AnnotationRegistry; -if (!$loader = @include __DIR__.'/../vendor/autoload.php') { - - $message = <<< EOF -

      You must set up the project dependencies by running the following commands:

      -
      -    curl -s http://getcomposer.org/installer | php
-    php composer.phar install
-
      - -EOF; - - if (PHP_SAPI === 'cli') { - $message = strip_tags($message); - } - - die($message); -} +$loader = include __DIR__.'/../vendor/autoload.php'; // intl if (!function_exists('intl_get_error_code')) { From 67cbb5771f38ca1ab71c83916d2fedb3c0311b16 Mon Sep 17 00:00:00 2001 From: Brikou CARRE Date: Sat, 7 Jul 2012 23:30:17 +0200 Subject: [PATCH 505/899] s/include/require/ for autoload.php as is it now mandatory --- app/autoload.php | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/app/autoload.php b/app/autoload.php index 9fa06777c1..a68e37fbc0 100644 --- a/app/autoload.php +++ b/app/autoload.php @@ -2,7 +2,7 @@ use Doctrine\Common\Annotations\AnnotationRegistry; -$loader = include __DIR__.'/../vendor/autoload.php'; +$loader = require __DIR__.'/../vendor/autoload.php'; // intl if (!function_exists('intl_get_error_code')) { From e4cd5bdbb778e6cd5a7aa5261b65c6a48e8f4539 Mon Sep 17 00:00:00 2001 From: Fabien Potencier Date: Sun, 8 Jul 2012 11:58:44 +0200 Subject: [PATCH 506/899] fixed links in the welcome page (they are now dynamic) --- .../Resources/views/Welcome/index.html.twig | 16 +++++++++------- 1 file changed, 9 insertions(+), 7 deletions(-) diff --git a/src/Acme/DemoBundle/Resources/views/Welcome/index.html.twig b/src/Acme/DemoBundle/Resources/views/Welcome/index.html.twig index cbad2abc85..e373981b39 100644 --- a/src/Acme/DemoBundle/Resources/views/Welcome/index.html.twig +++ b/src/Acme/DemoBundle/Resources/views/Welcome/index.html.twig @@ -5,6 +5,8 @@ {% block content_header '' %} {% block content %} + {% set version = constant('Symfony\\Component\\HttpKernel\\Kernel::MAJOR_VERSION') ~ '.' ~ constant('Symfony\\Component\\HttpKernel\\Kernel::MINOR_VERSION')%} +

      Welcome!

      Congratulations! You have successfully installed a new Symfony application.

      @@ -14,7 +16,7 @@
      Quick tour
      - Read the Quick Tour + Read the Quick Tour
      {% if app.environment == 'dev' %}
      @@ -36,11 +38,11 @@
      @@ -56,7 +58,7 @@
    1. IRC channel
    2. Mailing lists
    3. Forum
      4. -
    4. Contributing
      5. +
    5. Contributing
      6. From 312bc1d47ebc47a07d46a48d674efcba689b1a41 Mon Sep 17 00:00:00 2001 From: Fabien Potencier Date: Sun, 8 Jul 2012 12:00:45 +0200 Subject: [PATCH 507/899] added an UPGRADE file --- UPGRADE.md | 216 +++++++++++++++++++++++++++++++++++++++++++++++++++++ 1 file changed, 216 insertions(+) create mode 100644 UPGRADE.md diff --git a/UPGRADE.md b/UPGRADE.md new file mode 100644 index 0000000000..d5b0e67e7c --- /dev/null +++ b/UPGRADE.md @@ -0,0 +1,216 @@ +Symfony Standard Edition Upgrade +================================ + +From Symfony 2.0 to Symfony 2.1 +------------------------------- + +### `app/config/config.yml` + +The `framework.charset` setting must be removed. If you are not using `UTF-8` +for your application, override the `getCharset()` method in your `AppKernel` +class instead: + + class AppKernel extends Kernel + { + public function getCharset() + { + return 'ISO-8859-1'; + } + + // ... + } + +You might want to add the new `strict_parameters` parameter to +`framework.router` (it avoids fatal errors in the production environment when +a link cannot be generated): + + framework: + router: + strict_parameters: %kernel.debug% + +The `default_locale` parameter is now a setting of the main `framework` +configuration (it was under the `framework.router` in 2.0): + + framework: + default_locale: %locale% + +The `auto_start` setting under `framework.session` must be removed as it is +not used anymore (the session is now always started on-demand). + +The `trust_proxy_headers` setting was added in the default configuration file +(as it should be set to `true` when you install your application behind a +reverse proxy): + + framework: + trust_proxy_headers: false + +An empty `bundles` entry was added to the `assetic` configuration: + + assetic: + bundles: [] + +The default `swiftmailer` configuration now has the `spool` setting configured +to the `memory` type to defer email sending after the response is sent to the +user (recommended for better end-user performance): + + swiftmailer: + spool: { type: memory } + +The `jms_security_extra` configuration was moved to the `security.yml` +configuration file. + +### `app/config/config_dev.yml` + +An example of how to send all emails to a unique address was added: + + #swiftmailer: + # delivery_address: me@example.com + +### `app/config/config_test.yml` + +The `storage_id` setting must be changed to `session.storage.mock_file`: + + framework: + session: + storage_id: session.storage.mock_file + +### `app/config/parameters.ini` + +The file has been converted to a YAML file which read as follows: + + parameters: + database_driver: pdo_mysql + database_host: localhost + database_port: ~ + database_name: symfony + database_user: root + database_password: ~ + + mailer_transport: smtp + mailer_host: localhost + mailer_user: ~ + mailer_password: ~ + + locale: en + secret: ThisTokenIsNotSoSecretChangeIt + +Note that if you convert your parameters file to YAML, you must also change +its reference in `app/config/config.yml`. + +### `app/config/routing_dev.yml` + +The `_assetic` entry was removed: + + #_assetic: + # resource: . + # type: assetic + +### `app/config/security.yml` + +Under `security.access_control`, the default rule for internal routes was changed: + + security: + access_control: + #- { path: ^/_internal/secure, roles: IS_AUTHENTICATED_ANONYMOUSLY, ip: 127.0.0.1 } + +Under `security.providers`, the `in_memory` example was updated to the following: + + security: + providers: + in_memory: + memory: + users: + user: { password: userpass, roles: [ 'ROLE_USER' ] } + admin: { password: adminpass, roles: [ 'ROLE_ADMIN' ] } + +### `app/AppKernel.php` + +The following bundles was added to the list of default registered bundles: + + `new JMS\AopBundle\JMSAopBundle(), + `new JMS\DiExtraBundle\JMSDiExtraBundle($this), + +### `app/autoload.php` + +The default `autoload.php` reads as follows: + + add('', __DIR__.'/../vendor/symfony/symfony/src/Symfony/Component/Locale/Resources/stubs'); + } + + AnnotationRegistry::registerLoader(array($loader, 'loadClass')); + + return $loader; + +### `web/app.php` + +The default `web/app.php` file now reads as follows: + + register(true); + */ + + require_once __DIR__.'/../app/AppKernel.php'; + //require_once __DIR__.'/../app/AppCache.php'; + + $kernel = new AppKernel('prod', false); + $kernel->loadClassCache(); + //$kernel = new AppCache($kernel); + $request = Request::createFromGlobals(); + $response = $kernel->handle($request); + $response->send(); + $kernel->terminate($request, $response); + +### `web/app_dev.php` + +The default `web/app_dev.php` file now reads as follows: + + loadClassCache(); + $request = Request::createFromGlobals(); + $response = $kernel->handle($request); + $response->send(); + $kernel->terminate($request, $response); From 68e02eb6e934651f2c9608d971454169bdd0a7ed Mon Sep 17 00:00:00 2001 From: Fabien Potencier Date: Sun, 8 Jul 2012 12:03:12 +0200 Subject: [PATCH 508/899] updated vendors --- app/SymfonyRequirements.php | 19 ++++++++++++++++++- composer.json | 6 ++++-- composer.lock | 38 ++++++++++++++++++------------------- 3 files changed, 41 insertions(+), 22 deletions(-) diff --git a/app/SymfonyRequirements.php b/app/SymfonyRequirements.php index fdfc42f35c..a630af01e2 100644 --- a/app/SymfonyRequirements.php +++ b/app/SymfonyRequirements.php @@ -14,6 +14,17 @@ * It can be a mandatory requirement or an optional recommendation. * There is a special subclass, named PhpIniRequirement, to check a php.ini configuration. * + * This file must be compatible with PHP 5.2+. + * + * ************** CAUTION ************** + * + * DO NOT EDIT THIS FILE AS IT WILL BE OVERRIDEN BY COMPOSER + * + * If you want to change this file, edit the one in the + * SensioDistributionBundle instead. + * + * ************** CAUTION ************** + * * @author Tobias Schultze */ class Requirement @@ -386,12 +397,18 @@ public function __construct() ); $this->addRequirement( - is_dir(__DIR__.'/../vendor/symfony'), + is_dir(__DIR__.'/../vendor/composer'), 'Vendor libraries must be installed', 'Vendor libraries are missing. Install composer following instructions from http://getcomposer.org/. ' . 'Then run "php composer.phar install" to install them.' ); + $this->addRequirement( + file_get_contents(__FILE__) == file_get_contents(__DIR__.'/../vendor/sensio/distribution-bundle/Sensio/Bundle/DistributionBundle/Resources/skeleton/app/SymfonyRequirements.php'), + 'Outdated requirements file', + 'Your requirements file is outdated. Run composer install and re-check your configuration.' + ); + $baseDir = basename(__DIR__); $this->addRequirement( is_writable(__DIR__.'/cache'), diff --git a/composer.json b/composer.json index 85dd1a5594..b6aa797b44 100644 --- a/composer.json +++ b/composer.json @@ -23,12 +23,14 @@ "post-install-cmd": [ "Sensio\\Bundle\\DistributionBundle\\Composer\\ScriptHandler::buildBootstrap", "Sensio\\Bundle\\DistributionBundle\\Composer\\ScriptHandler::clearCache", - "Sensio\\Bundle\\DistributionBundle\\Composer\\ScriptHandler::installAssets" + "Sensio\\Bundle\\DistributionBundle\\Composer\\ScriptHandler::installAssets", + "Sensio\\Bundle\\DistributionBundle\\Composer\\ScriptHandler::installRequirementsFile" ], "post-update-cmd": [ "Sensio\\Bundle\\DistributionBundle\\Composer\\ScriptHandler::buildBootstrap", "Sensio\\Bundle\\DistributionBundle\\Composer\\ScriptHandler::clearCache", - "Sensio\\Bundle\\DistributionBundle\\Composer\\ScriptHandler::installAssets" + "Sensio\\Bundle\\DistributionBundle\\Composer\\ScriptHandler::installAssets", + "Sensio\\Bundle\\DistributionBundle\\Composer\\ScriptHandler::installRequirementsFile" ] }, "config": { diff --git a/composer.lock b/composer.lock index b7d3355860..18cf672659 100644 --- a/composer.lock +++ b/composer.lock @@ -1,5 +1,5 @@ { - "hash": "60f09c83d9f0891b51ac51941970dcd5", + "hash": "ab7ccf177098603cace942212179431f", "packages": [ { "package": "doctrine/common", @@ -8,20 +8,20 @@ { "package": "doctrine/dbal", "version": "2.2.x-dev", - "source-reference": "8cc129aa64a8de6447056bce20f0a274fe2a340b", - "commit-date": "1338113316" + "source-reference": "331fd04c289103a63b300296b43c2d0772fbf879", + "commit-date": "1341666717" }, { "package": "doctrine/doctrine-bundle", "version": "dev-master", - "source-reference": "1d5061d3e426feb990f2378fbcbee58f6ecadd12", - "commit-date": "1341222099" + "source-reference": "c9ea46d1f0c48bb88bb87b44214fe44e03c0c692", + "commit-date": "1341405737" }, { "package": "doctrine/orm", "version": "2.2.x-dev", - "source-reference": "5f66c65c9a8d984899903b54215d0249a45b92d6", - "commit-date": "1338138826" + "source-reference": "5d2a3bcb3b467f41ee58575764f3ba84937f76e4", + "commit-date": "1341676080" }, { "package": "jms/aop-bundle", @@ -62,8 +62,8 @@ { "package": "sensio/distribution-bundle", "version": "dev-master", - "source-reference": "a3f939728f421b897472163b7e041d65d48c3b01", - "commit-date": "1341409780" + "source-reference": "0a075702419ee400193c4fcacc6cb7940478a904", + "commit-date": "1341675550" }, { "package": "sensio/framework-extra-bundle", @@ -86,8 +86,8 @@ { "package": "swiftmailer/swiftmailer", "version": "dev-master", - "source-reference": "f34ff8a49dc611e8171f041b529671b3e460cfe1", - "commit-date": "1341391688" + "source-reference": "1829c40b70f3fc45a3696349bfcb99fb755aa926", + "commit-date": "1341418063" }, { "package": "symfony/assetic-bundle", @@ -104,8 +104,8 @@ { "package": "symfony/swiftmailer-bundle", "version": "dev-master", - "source-reference": "66e29c6b1db11e434f773b2902d58349577664ac", - "commit-date": "1341344279" + "source-reference": "e1d413ce27fd1696bdc82ad9525f1b874664530e", + "commit-date": "1341509614" }, { "package": "symfony/symfony", @@ -116,8 +116,8 @@ { "package": "symfony/symfony", "version": "dev-master", - "source-reference": "000d54cd27fc08e3e43dbe33d527c5792fd61491", - "commit-date": "1341409667" + "source-reference": "b8f99ee19e092b604d8edab6c3acfe481214f9e3", + "commit-date": "1341734728" }, { "package": "twig/extensions", @@ -128,14 +128,14 @@ { "package": "twig/twig", "version": "dev-master", - "alias-pretty-version": "1.8.x-dev", - "alias-version": "1.8.9999999.9999999-dev" + "alias-pretty-version": "1.9.x-dev", + "alias-version": "1.9.9999999.9999999-dev" }, { "package": "twig/twig", "version": "dev-master", - "source-reference": "73da773aaad0f97f2e967ec8241b8adf7b1e03d2", - "commit-date": "1340890758" + "source-reference": "26eb0a2653eade50dffdd31b11ca454232dea8cf", + "commit-date": "1341423205" } ], "packages-dev": [ From 59e594582610e4185965e4fe96e93ec5ed3dadac Mon Sep 17 00:00:00 2001 From: Fabien Potencier Date: Sun, 8 Jul 2012 12:06:28 +0200 Subject: [PATCH 509/899] tweaked the README file (closes #351) --- README.md | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/README.md b/README.md index b860ea45af..3d85c921b5 100644 --- a/README.md +++ b/README.md @@ -98,9 +98,9 @@ playing with it, you can remove it by following these steps: * remove the `web/bundles/acmedemo` directory; - * remove the inclusion of the security configuration in - `app/config/config.yml` (remove the `- { resource: security.yml }` line) - or tweak the security configuration to fit your needs. + * remove the `security.providers`, `security.firewall.login` and + `security.firewall.secured_area` entries in the `security.yml` file or + tweak the security configuration to fit your needs. What's inside? --------------- From 623dfab03ef66c826cd08f7b19eb27d34803a5e9 Mon Sep 17 00:00:00 2001 From: Fabien Potencier Date: Sun, 8 Jul 2012 13:22:20 +0200 Subject: [PATCH 510/899] fixed typo --- UPGRADE.md | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/UPGRADE.md b/UPGRADE.md index d5b0e67e7c..19acde8c35 100644 --- a/UPGRADE.md +++ b/UPGRADE.md @@ -29,7 +29,7 @@ a link cannot be generated): strict_parameters: %kernel.debug% The `default_locale` parameter is now a setting of the main `framework` -configuration (it was under the `framework.router` in 2.0): +configuration (it was under the `framework.session` in 2.0): framework: default_locale: %locale% From b815a2fba29b4ce2e681639e32a55f2acad5e33f Mon Sep 17 00:00:00 2001 From: Fabien Potencier Date: Mon, 9 Jul 2012 08:16:51 +0200 Subject: [PATCH 511/899] added information about Composer in the README file --- UPGRADE.md | 72 ++++++++++++++++++++++++++++++++++++++---------------- 1 file changed, 51 insertions(+), 21 deletions(-) diff --git a/UPGRADE.md b/UPGRADE.md index 19acde8c35..5081436846 100644 --- a/UPGRADE.md +++ b/UPGRADE.md @@ -4,6 +4,57 @@ Symfony Standard Edition Upgrade From Symfony 2.0 to Symfony 2.1 ------------------------------- +### Project Dependencies + +As of Symfony 2.1, project dependencies are managed by +[Composer](http://getcomposer.org/): + +* The `bin/vendors` script can be removed as `composer.phar` does all the work + now (it is recommended to install it globally on your machine). + +* The `deps` file need to be replaced with the `composer.json` one. + +* The `composer.lock` is the equivalent of the generated `deps.lock` file and + it is automatically generated by Composer. + +Download the default +[`composer.json`](https://raw.github.com/symfony/symfony-standard/master/composer.json) +and +[`composer.lock`](https://raw.github.com/symfony/symfony-standard/master/composer.lock) +files for Symfony 2.1 and put them into the main directory of your project. If +you have customized your `deps` file, move the added dependencies to the +`composer.json` file (many bundles and PHP libraries are already available as +Composer packages -- search for them on [Packagist](http://packagist.org/)). + +Remove your current `vendors` directory. + +Finally, run Composer: + + $ composer.phar install + +### `app/autoload.php` + +The default `autoload.php` reads as follows (it has been simplified a lot as +autoloading for libraries and bundles declared in your `composer.json` file is +automatically managed by the Composer autoloader): + + add('', __DIR__.'/../vendor/symfony/symfony/src/Symfony/Component/Locale/Resources/stubs'); + } + + AnnotationRegistry::registerLoader(array($loader, 'loadClass')); + + return $loader; + ### `app/config/config.yml` The `framework.charset` setting must be removed. If you are not using `UTF-8` @@ -130,27 +181,6 @@ The following bundles was added to the list of default registered bundles: `new JMS\AopBundle\JMSAopBundle(), `new JMS\DiExtraBundle\JMSDiExtraBundle($this), -### `app/autoload.php` - -The default `autoload.php` reads as follows: - - add('', __DIR__.'/../vendor/symfony/symfony/src/Symfony/Component/Locale/Resources/stubs'); - } - - AnnotationRegistry::registerLoader(array($loader, 'loadClass')); - - return $loader; - ### `web/app.php` The default `web/app.php` file now reads as follows: From eb0681cd4c4023f9de0f4bf81a88b90995e8731c Mon Sep 17 00:00:00 2001 From: Fabien Potencier Date: Mon, 9 Jul 2012 09:56:30 +0200 Subject: [PATCH 512/899] updated vendors --- app/SymfonyRequirements.php | 10 +++++----- composer.lock | 20 ++++++++++---------- 2 files changed, 15 insertions(+), 15 deletions(-) diff --git a/app/SymfonyRequirements.php b/app/SymfonyRequirements.php index a630af01e2..5c638c1553 100644 --- a/app/SymfonyRequirements.php +++ b/app/SymfonyRequirements.php @@ -429,11 +429,11 @@ public function __construct() ); if (version_compare($installedPhpVersion, self::REQUIRED_PHP_VERSION, '>=')) { - $this->addRequirement( - (in_array(date_default_timezone_get(), DateTimeZone::listIdentifiers())), - sprintf('Default timezone is deprecated (%s)', date_default_timezone_get()), - 'Fix your php.ini file (list of deprecated timezones http://us.php.net/manual/en/timezones.others.php).' - ); + $this->addRequirement( + (in_array(date_default_timezone_get(), DateTimeZone::listIdentifiers())), + sprintf('Default timezone "%s" is not supported by your installation of PHP', date_default_timezone_get()), + 'Fix your php.ini file (check for typos and have a look at the list of deprecated timezones http://php.net/manual/en/timezones.others.php).' + ); } $this->addRequirement( diff --git a/composer.lock b/composer.lock index 18cf672659..6570f72d0f 100644 --- a/composer.lock +++ b/composer.lock @@ -8,8 +8,8 @@ { "package": "doctrine/dbal", "version": "2.2.x-dev", - "source-reference": "331fd04c289103a63b300296b43c2d0772fbf879", - "commit-date": "1341666717" + "source-reference": "b961a3fce6bf220f1dca47d7d747b9074bea4730", + "commit-date": "1341779435" }, { "package": "doctrine/doctrine-bundle", @@ -62,8 +62,8 @@ { "package": "sensio/distribution-bundle", "version": "dev-master", - "source-reference": "0a075702419ee400193c4fcacc6cb7940478a904", - "commit-date": "1341675550" + "source-reference": "b2b18d749d0ed24b48d1932b21f3e8b1e8d9c1f2", + "commit-date": "1341919005" }, { "package": "sensio/framework-extra-bundle", @@ -86,8 +86,8 @@ { "package": "swiftmailer/swiftmailer", "version": "dev-master", - "source-reference": "1829c40b70f3fc45a3696349bfcb99fb755aa926", - "commit-date": "1341418063" + "source-reference": "f51b5f33c83b48faea75f1285f99a2e8f1c66f75", + "commit-date": "1341746460" }, { "package": "symfony/assetic-bundle", @@ -98,13 +98,13 @@ { "package": "symfony/monolog-bundle", "version": "dev-master", - "source-reference": "7fe7f711bb04b86ad7f45a9e11a7f8cbaf9bc1a5", + "source-reference": "v2.1.0-BETA2", "commit-date": "1341078487" }, { "package": "symfony/swiftmailer-bundle", "version": "dev-master", - "source-reference": "e1d413ce27fd1696bdc82ad9525f1b874664530e", + "source-reference": "v2.1.0-BETA2", "commit-date": "1341509614" }, { @@ -116,8 +116,8 @@ { "package": "symfony/symfony", "version": "dev-master", - "source-reference": "b8f99ee19e092b604d8edab6c3acfe481214f9e3", - "commit-date": "1341734728" + "source-reference": "5487a1f0767f96264823b4a128ad9e68d4b0220b", + "commit-date": "1341915525" }, { "package": "twig/extensions", From 36047d69c25fbbf8b9be51f0d988beb574b6eff0 Mon Sep 17 00:00:00 2001 From: Fabien Potencier Date: Tue, 10 Jul 2012 15:42:15 +0200 Subject: [PATCH 513/899] tweaked UPGRADE instructions --- UPGRADE.md | 8 +++++++- 1 file changed, 7 insertions(+), 1 deletion(-) diff --git a/UPGRADE.md b/UPGRADE.md index 5081436846..eba7bbc4f4 100644 --- a/UPGRADE.md +++ b/UPGRADE.md @@ -86,7 +86,13 @@ configuration (it was under the `framework.session` in 2.0): default_locale: %locale% The `auto_start` setting under `framework.session` must be removed as it is -not used anymore (the session is now always started on-demand). +not used anymore (the session is now always started on-demand). If +`auto_start` was the only setting under the `framework.session` entry, don't +remove it entirely, but set its value to `~` (`~` means `null` in YAML) +instead: + + framework: + session: ~ The `trust_proxy_headers` setting was added in the default configuration file (as it should be set to `true` when you install your application behind a From 0bf425608b734221a2eadaefa0563e2480bdc75a Mon Sep 17 00:00:00 2001 From: Ben Lumley Date: Wed, 11 Jul 2012 13:55:23 +0200 Subject: [PATCH 514/899] Fixed indenting of upgrade instructions so that the file displays correctly when rendered by github. --- UPGRADE.md | 20 ++++++++++---------- 1 file changed, 10 insertions(+), 10 deletions(-) diff --git a/UPGRADE.md b/UPGRADE.md index eba7bbc4f4..276015862b 100644 --- a/UPGRADE.md +++ b/UPGRADE.md @@ -38,22 +38,22 @@ The default `autoload.php` reads as follows (it has been simplified a lot as autoloading for libraries and bundles declared in your `composer.json` file is automatically managed by the Composer autoloader): - add('', __DIR__.'/../vendor/symfony/symfony/src/Symfony/Component/Locale/Resources/stubs'); - } + $loader->add('', __DIR__.'/../vendor/symfony/symfony/src/Symfony/Component/Locale/Resources/stubs'); + } - AnnotationRegistry::registerLoader(array($loader, 'loadClass')); + AnnotationRegistry::registerLoader(array($loader, 'loadClass')); - return $loader; + return $loader; ### `app/config/config.yml` From c0a5d5c6b022682f6a90e3612a96f6de105f65e4 Mon Sep 17 00:00:00 2001 From: Tobias Schultze Date: Sun, 8 Jul 2012 23:51:33 +0300 Subject: [PATCH 515/899] fix typos in upgrade --- UPGRADE.md | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/UPGRADE.md b/UPGRADE.md index 276015862b..d664bb2145 100644 --- a/UPGRADE.md +++ b/UPGRADE.md @@ -133,7 +133,7 @@ The `storage_id` setting must be changed to `session.storage.mock_file`: ### `app/config/parameters.ini` -The file has been converted to a YAML file which read as follows: +The file has been converted to a YAML file which reads as follows: parameters: database_driver: pdo_mysql @@ -182,7 +182,7 @@ Under `security.providers`, the `in_memory` example was updated to the following ### `app/AppKernel.php` -The following bundles was added to the list of default registered bundles: +The following bundles have been added to the list of default registered bundles: `new JMS\AopBundle\JMSAopBundle(), `new JMS\DiExtraBundle\JMSDiExtraBundle($this), From 36cbc56a4fcb6e86bcec007e252a7cc0bcf404c8 Mon Sep 17 00:00:00 2001 From: Fabien Potencier Date: Wed, 11 Jul 2012 19:32:59 +0200 Subject: [PATCH 516/899] updated deps --- deps | 2 +- deps.lock | 6 +++--- 2 files changed, 4 insertions(+), 4 deletions(-) diff --git a/deps b/deps index e03bb584d9..b72bef8baf 100644 --- a/deps +++ b/deps @@ -60,4 +60,4 @@ [AsseticBundle] git=http://github.com/symfony/AsseticBundle.git target=/bundles/Symfony/Bundle/AsseticBundle - version=v1.0.1 + version=origin/2.0 diff --git a/deps.lock b/deps.lock index 6bd9f595c8..1ba7066884 100644 --- a/deps.lock +++ b/deps.lock @@ -1,4 +1,4 @@ -symfony 24696641db7ae7441b49cc29a7e59c5fd63005c3 +symfony b18f6f557b5db1e2e6d2c2c0494e0564b91f438d twig v1.8.2 monolog 1.0.2 doctrine-common 2.1.4 @@ -8,8 +8,8 @@ swiftmailer v4.2.0 assetic v1.0.3 twig-extensions feb6d3f10c411e2631997c0a905aa581c80305c1 metadata 1.0.0 -SensioFrameworkExtraBundle 891359252711c424d5da8cac9fa1e757450a6db2 +SensioFrameworkExtraBundle 3dcf2d31ad898db2a5ab418cb03b9f701ba2350f JMSSecurityExtraBundle e752f888c51425f71382c056961f10f2be642102 SensioDistributionBundle 41a6c5caed65f02bb09c95a90579f047616471fd SensioGeneratorBundle c0118ce370f8da20e43051f2dd1ae331a202ab9c -AsseticBundle v1.0.1 +AsseticBundle fbcbaf46df2aa143759319de205e1babcf7dd87d From d8d8949d508da975de9a90f449b04e86179bc6a5 Mon Sep 17 00:00:00 2001 From: Fabien Potencier Date: Wed, 11 Jul 2012 19:59:58 +0200 Subject: [PATCH 517/899] updated vendors --- deps.lock | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/deps.lock b/deps.lock index 1ba7066884..98776b7b13 100644 --- a/deps.lock +++ b/deps.lock @@ -1,4 +1,4 @@ -symfony b18f6f557b5db1e2e6d2c2c0494e0564b91f438d +symfony v2.0.16 twig v1.8.2 monolog 1.0.2 doctrine-common 2.1.4 From 5bd76ae569fd07eab33a4aec221b0a5e81a6b8d6 Mon Sep 17 00:00:00 2001 From: Fabien Potencier Date: Fri, 13 Jul 2012 21:23:29 +0200 Subject: [PATCH 518/899] raised the minimum version of PHP --- app/SymfonyRequirements.php | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/app/SymfonyRequirements.php b/app/SymfonyRequirements.php index 5c638c1553..fc66a3c4b1 100644 --- a/app/SymfonyRequirements.php +++ b/app/SymfonyRequirements.php @@ -376,7 +376,7 @@ public function getPhpIniConfigPath() */ class SymfonyRequirements extends RequirementCollection { - const REQUIRED_PHP_VERSION = '5.3.3'; + const REQUIRED_PHP_VERSION = '5.3.4'; /** * Constructor that initializes the requirements. From 4f708cc1b8139d9c65a9b2bf2d2b8c6837075435 Mon Sep 17 00:00:00 2001 From: Jordan Alliot Date: Fri, 13 Jul 2012 22:27:55 +0300 Subject: [PATCH 519/899] Raised minimum version of PHP --- composer.json | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/composer.json b/composer.json index b6aa797b44..1e675d03ab 100644 --- a/composer.json +++ b/composer.json @@ -5,7 +5,7 @@ "psr-0": { "": "src/" } }, "require": { - "php": ">=5.3.3", + "php": ">=5.3.4", "symfony/symfony": "2.1.*", "doctrine/orm": "2.2.*", "doctrine/doctrine-bundle": "dev-master", From 88402f5de3c023448e1f84687208215c19501c8b Mon Sep 17 00:00:00 2001 From: Fabien Potencier Date: Sun, 15 Jul 2012 12:21:11 +0200 Subject: [PATCH 520/899] Revert "merged branch jalliot/patch-2 (PR #362)" This reverts commit 6a8122dc394dfd1e050314813e56d4292e4e00c8, reversing changes made to 5bd76ae569fd07eab33a4aec221b0a5e81a6b8d6. --- composer.json | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/composer.json b/composer.json index 1e675d03ab..b6aa797b44 100644 --- a/composer.json +++ b/composer.json @@ -5,7 +5,7 @@ "psr-0": { "": "src/" } }, "require": { - "php": ">=5.3.4", + "php": ">=5.3.3", "symfony/symfony": "2.1.*", "doctrine/orm": "2.2.*", "doctrine/doctrine-bundle": "dev-master", From b1f182638450a756772bf6ca161c0dc5aff1e799 Mon Sep 17 00:00:00 2001 From: Fabien Potencier Date: Sun, 15 Jul 2012 12:21:18 +0200 Subject: [PATCH 521/899] Revert "raised the minimum version of PHP" This reverts commit 5bd76ae569fd07eab33a4aec221b0a5e81a6b8d6. --- app/SymfonyRequirements.php | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/app/SymfonyRequirements.php b/app/SymfonyRequirements.php index fc66a3c4b1..5c638c1553 100644 --- a/app/SymfonyRequirements.php +++ b/app/SymfonyRequirements.php @@ -376,7 +376,7 @@ public function getPhpIniConfigPath() */ class SymfonyRequirements extends RequirementCollection { - const REQUIRED_PHP_VERSION = '5.3.4'; + const REQUIRED_PHP_VERSION = '5.3.3'; /** * Constructor that initializes the requirements. From fb35b76415381da9d6bb8d9da59fa312cf171c85 Mon Sep 17 00:00:00 2001 From: Fabien Potencier Date: Sun, 15 Jul 2012 12:27:05 +0200 Subject: [PATCH 522/899] updated vendors --- app/SymfonyRequirements.php | 6 ++++++ composer.lock | 28 ++++++++++++++-------------- 2 files changed, 20 insertions(+), 14 deletions(-) diff --git a/app/SymfonyRequirements.php b/app/SymfonyRequirements.php index 5c638c1553..cfd55a74bc 100644 --- a/app/SymfonyRequirements.php +++ b/app/SymfonyRequirements.php @@ -492,6 +492,12 @@ function_exists('simplexml_import_dom'), /* optional recommendations follow */ + $this->addRecommendation( + version_compare($installedPhpVersion, '5.3.4', '>='), + sprintf('Your project might not work properly ("Notice: Trying to get property of non-object") due to the PHP bug #52083 before PHP 5.3.4 (%s installed)', $installedPhpVersion), + 'Install PHP 5.3.4 or newer' + ); + $this->addRecommendation( version_compare($installedPhpVersion, '5.3.8', '>='), sprintf('Annotations might not work properly due to the PHP bug #55156 before PHP 5.3.8 (%s installed)', $installedPhpVersion), diff --git a/composer.lock b/composer.lock index 6570f72d0f..d04ba4dc5b 100644 --- a/composer.lock +++ b/composer.lock @@ -62,20 +62,20 @@ { "package": "sensio/distribution-bundle", "version": "dev-master", - "source-reference": "b2b18d749d0ed24b48d1932b21f3e8b1e8d9c1f2", - "commit-date": "1341919005" + "source-reference": "5886adae1613c0a72fbb95259a83ae798e86c0d3", + "commit-date": "1342347850" }, { "package": "sensio/framework-extra-bundle", "version": "dev-master", - "source-reference": "4f54e5d5fb3b54fb107892684018f3704934c48d", - "commit-date": "1341126219" + "source-reference": "e9ac8f1a911ed29e30296c7f1549f53d4c94eddf", + "commit-date": "1342084432" }, { "package": "sensio/generator-bundle", "version": "dev-master", - "source-reference": "43ed45c48db18e4a0e48aec0c098f42e56e22d36", - "commit-date": "1340138445" + "source-reference": "c17dbddefe517e3adfcbeaa1ab7cef3e572d29c6", + "commit-date": "1342195488" }, { "package": "swiftmailer/swiftmailer", @@ -86,14 +86,14 @@ { "package": "swiftmailer/swiftmailer", "version": "dev-master", - "source-reference": "f51b5f33c83b48faea75f1285f99a2e8f1c66f75", - "commit-date": "1341746460" + "source-reference": "8b2aa953f87da228ba413e8fb1372e49c1374050", + "commit-date": "1342198037" }, { "package": "symfony/assetic-bundle", "version": "dev-master", - "source-reference": "8fe7b898b08103c1d6fce64c3e279a7afd61adfc", - "commit-date": "1340234971" + "source-reference": "ed933dcfa45f00b6bc6d7727007403f3ff429e5a", + "commit-date": "1342126277" }, { "package": "symfony/monolog-bundle", @@ -116,8 +116,8 @@ { "package": "symfony/symfony", "version": "dev-master", - "source-reference": "5487a1f0767f96264823b4a128ad9e68d4b0220b", - "commit-date": "1341915525" + "source-reference": "d09bfe7552148d1d36b65487dfcbd378830b55a0", + "commit-date": "1342347592" }, { "package": "twig/extensions", @@ -134,8 +134,8 @@ { "package": "twig/twig", "version": "dev-master", - "source-reference": "26eb0a2653eade50dffdd31b11ca454232dea8cf", - "commit-date": "1341423205" + "source-reference": "17e2c36a58c4b17a58a3befa783d16ac19776df5", + "commit-date": "1342275003" } ], "packages-dev": [ From 257957bff65fa9bd8bc5611bc644628f7277d98c Mon Sep 17 00:00:00 2001 From: Fabien Potencier Date: Sun, 15 Jul 2012 20:14:57 +0200 Subject: [PATCH 523/899] updated vendors for 2.1.0-BETA3 --- composer.lock | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/composer.lock b/composer.lock index d04ba4dc5b..ff9ad9cfec 100644 --- a/composer.lock +++ b/composer.lock @@ -116,8 +116,8 @@ { "package": "symfony/symfony", "version": "dev-master", - "source-reference": "d09bfe7552148d1d36b65487dfcbd378830b55a0", - "commit-date": "1342347592" + "source-reference": "v2.1.0-BETA3", + "commit-date": "1342375577" }, { "package": "twig/extensions", From 1d2e1da5779d7850252f50d62bcb30e2b3070ecc Mon Sep 17 00:00:00 2001 From: Tobias Schultze Date: Wed, 18 Jul 2012 04:40:40 +0300 Subject: [PATCH 524/899] fix directory name --- UPGRADE.md | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/UPGRADE.md b/UPGRADE.md index d664bb2145..e6300b9e8e 100644 --- a/UPGRADE.md +++ b/UPGRADE.md @@ -26,7 +26,7 @@ you have customized your `deps` file, move the added dependencies to the `composer.json` file (many bundles and PHP libraries are already available as Composer packages -- search for them on [Packagist](http://packagist.org/)). -Remove your current `vendors` directory. +Remove your current `vendor` directory. Finally, run Composer: From 7b3f4ae67096b70f717372a8c363edbec2642280 Mon Sep 17 00:00:00 2001 From: Tobias Schultze Date: Wed, 18 Jul 2012 05:17:20 +0300 Subject: [PATCH 525/899] fix typo in config name --- README.md | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/README.md b/README.md index 3d85c921b5..0c75d9d85e 100644 --- a/README.md +++ b/README.md @@ -98,8 +98,8 @@ playing with it, you can remove it by following these steps: * remove the `web/bundles/acmedemo` directory; - * remove the `security.providers`, `security.firewall.login` and - `security.firewall.secured_area` entries in the `security.yml` file or + * remove the `security.providers`, `security.firewalls.login` and + `security.firewalls.secured_area` entries in the `security.yml` file or tweak the security configuration to fit your needs. What's inside? From 280ebe971fd23a79ada5e9f7285dfedab87a7aa8 Mon Sep 17 00:00:00 2001 From: Dmitriy Fetisov Date: Fri, 20 Jul 2012 10:18:03 +0400 Subject: [PATCH 526/899] Update bin/vendors --- bin/vendors | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/bin/vendors b/bin/vendors index 1ca43f9470..d1a594fa38 100755 --- a/bin/vendors +++ b/bin/vendors @@ -165,7 +165,7 @@ if ('update' === $command || 'lock' === $command) { } // php on windows can't use the shebang line from system() -$interpreter = defined('PHP_WINDOWS_VERSION_BUILD') ? 'php.exe' : ''; +$interpreter = defined('PHP_WINDOWS_VERSION_BUILD') ? 'php.exe' : 'php'; // Update the bootstrap files system(sprintf('%s %s %s', $interpreter, escapeshellarg($rootDir.'/vendor/bundles/Sensio/Bundle/DistributionBundle/Resources/bin/build_bootstrap.php'), escapeshellarg($rootDir))); From c2e86db04037eb737c5215c82d3ca2b816ef3f28 Mon Sep 17 00:00:00 2001 From: Dmitriy Fetisov Date: Fri, 20 Jul 2012 13:08:04 +0400 Subject: [PATCH 527/899] Update bin/vendors --- bin/vendors | 12 +++++++++--- 1 file changed, 9 insertions(+), 3 deletions(-) diff --git a/bin/vendors b/bin/vendors index d1a594fa38..952b8befe4 100755 --- a/bin/vendors +++ b/bin/vendors @@ -168,10 +168,16 @@ if ('update' === $command || 'lock' === $command) { $interpreter = defined('PHP_WINDOWS_VERSION_BUILD') ? 'php.exe' : 'php'; // Update the bootstrap files -system(sprintf('%s %s %s', $interpreter, escapeshellarg($rootDir.'/vendor/bundles/Sensio/Bundle/DistributionBundle/Resources/bin/build_bootstrap.php'), escapeshellarg($rootDir))); +if ( ! @system(sprintf('%s %s %s', $interpreter, escapeshellarg($rootDir.'/vendor/bundles/Sensio/Bundle/DistributionBundle/Resources/bin/build_bootstrap.php'), escapeshellarg($rootDir)))){ + echo PHP_EOL.">Updating the bootstrap files failed.\nPlease run command \"php vendor/bundles/Sensio/Bundle/DistributionBundle/Resources/bin/build_bootstrap.php /\" manually".PHP_EOL; +} // Update assets -system(sprintf('%s %s assets:install %s', $interpreter, escapeshellarg($rootDir.'/app/console'), escapeshellarg($rootDir.'/web/'))); +if ( ! @system(sprintf('%s %s assets:install %s', $interpreter, escapeshellarg($rootDir.'/app/console'), escapeshellarg($rootDir.'/web/')))){ + echo PHP_EOL.">Updating assets failed.\nPlease run command \"php app/console assets:install web\" manually".PHP_EOL; +} // Remove the cache -system(sprintf('%s %s cache:clear --no-warmup', $interpreter, escapeshellarg($rootDir.'/app/console'))); +if ( ! @system(sprintf('%s %s cache:clear --no-warmup', $interpreter, escapeshellarg($rootDir.'/app/console')))){ + echo PHP_EOL.">Updating assets failed.\nPlease run command \"php app/console cache:clear --no-warmup\" manually".PHP_EOL; +} From 11bf951ed668d282d25b1266b2742af98f293582 Mon Sep 17 00:00:00 2001 From: Dmitriy Fetisov Date: Fri, 20 Jul 2012 13:42:36 +0400 Subject: [PATCH 528/899] Extra spaces removed in bin/vendors --- bin/vendors | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/bin/vendors b/bin/vendors index 952b8befe4..45ed86bb94 100755 --- a/bin/vendors +++ b/bin/vendors @@ -168,16 +168,16 @@ if ('update' === $command || 'lock' === $command) { $interpreter = defined('PHP_WINDOWS_VERSION_BUILD') ? 'php.exe' : 'php'; // Update the bootstrap files -if ( ! @system(sprintf('%s %s %s', $interpreter, escapeshellarg($rootDir.'/vendor/bundles/Sensio/Bundle/DistributionBundle/Resources/bin/build_bootstrap.php'), escapeshellarg($rootDir)))){ +if (!@system(sprintf('%s %s %s', $interpreter, escapeshellarg($rootDir.'/vendor/bundles/Sensio/Bundle/DistributionBundle/Resources/bin/build_bootstrap.php'), escapeshellarg($rootDir)))){ echo PHP_EOL.">Updating the bootstrap files failed.\nPlease run command \"php vendor/bundles/Sensio/Bundle/DistributionBundle/Resources/bin/build_bootstrap.php /\" manually".PHP_EOL; } // Update assets -if ( ! @system(sprintf('%s %s assets:install %s', $interpreter, escapeshellarg($rootDir.'/app/console'), escapeshellarg($rootDir.'/web/')))){ +if (!@system(sprintf('%s %s assets:install %s', $interpreter, escapeshellarg($rootDir.'/app/console'), escapeshellarg($rootDir.'/web/')))){ echo PHP_EOL.">Updating assets failed.\nPlease run command \"php app/console assets:install web\" manually".PHP_EOL; } // Remove the cache -if ( ! @system(sprintf('%s %s cache:clear --no-warmup', $interpreter, escapeshellarg($rootDir.'/app/console')))){ +if (!@system(sprintf('%s %s cache:clear --no-warmup', $interpreter, escapeshellarg($rootDir.'/app/console')))){ echo PHP_EOL.">Updating assets failed.\nPlease run command \"php app/console cache:clear --no-warmup\" manually".PHP_EOL; } From 1e2d97eadc9a008ea4a06436dcf37e76e8e12c90 Mon Sep 17 00:00:00 2001 From: Fabien Potencier Date: Mon, 23 Jul 2012 19:20:18 +0200 Subject: [PATCH 529/899] updated VENDORS for 2.1.0-BETA4 --- composer.lock | 34 +++++++++++++++++++++++----------- 1 file changed, 23 insertions(+), 11 deletions(-) diff --git a/composer.lock b/composer.lock index ff9ad9cfec..030b83fb3e 100644 --- a/composer.lock +++ b/composer.lock @@ -52,8 +52,8 @@ { "package": "kriswallsmith/assetic", "version": "dev-master", - "source-reference": "d6f89a3170c5280ad554347dc113eb25fdf00ad7", - "commit-date": "1339515714" + "source-reference": "5c1c9b658b732a980312e8f29cec4e175c2bb6b2", + "commit-date": "1342787613" }, { "package": "monolog/monolog", @@ -92,20 +92,32 @@ { "package": "symfony/assetic-bundle", "version": "dev-master", - "source-reference": "ed933dcfa45f00b6bc6d7727007403f3ff429e5a", - "commit-date": "1342126277" + "source-reference": "e5e9a56a872d9e1f305d14cd8296bf77888388af", + "commit-date": "1342820047" }, { "package": "symfony/monolog-bundle", "version": "dev-master", - "source-reference": "v2.1.0-BETA2", + "alias-pretty-version": "2.1.x-dev", + "alias-version": "2.1.9999999.9999999-dev" + }, + { + "package": "symfony/monolog-bundle", + "version": "dev-master", + "source-reference": "v2.1.0-BETA4", "commit-date": "1341078487" }, { "package": "symfony/swiftmailer-bundle", "version": "dev-master", - "source-reference": "v2.1.0-BETA2", - "commit-date": "1341509614" + "alias-pretty-version": "2.1.x-dev", + "alias-version": "2.1.9999999.9999999-dev" + }, + { + "package": "symfony/swiftmailer-bundle", + "version": "dev-master", + "source-reference": "v2.1.0-BETA4", + "commit-date": "1342684512" }, { "package": "symfony/symfony", @@ -116,8 +128,8 @@ { "package": "symfony/symfony", "version": "dev-master", - "source-reference": "v2.1.0-BETA3", - "commit-date": "1342375577" + "source-reference": "v2.1.0-BETA4", + "commit-date": "1343063410" }, { "package": "twig/extensions", @@ -134,8 +146,8 @@ { "package": "twig/twig", "version": "dev-master", - "source-reference": "17e2c36a58c4b17a58a3befa783d16ac19776df5", - "commit-date": "1342275003" + "source-reference": "657de7bdeb680815e0df95f63da9f81e1533d2ea", + "commit-date": "1342953178" } ], "packages-dev": [ From 9ba626749da440b9a66f73ce6f9b25413e612e39 Mon Sep 17 00:00:00 2001 From: Johannes Date: Wed, 25 Jul 2012 02:14:41 +0300 Subject: [PATCH 530/899] bumped versions Bumps the versions for JMSSecurityExtraBundle, and JMSDiExtraBundle. --- composer.json | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/composer.json b/composer.json index b6aa797b44..62f2416be1 100644 --- a/composer.json +++ b/composer.json @@ -16,8 +16,8 @@ "sensio/distribution-bundle": "dev-master", "sensio/framework-extra-bundle": "dev-master", "sensio/generator-bundle": "dev-master", - "jms/security-extra-bundle": "1.1.*", - "jms/di-extra-bundle": "1.0.*" + "jms/security-extra-bundle": "1.2.*", + "jms/di-extra-bundle": "1.1.*" }, "scripts": { "post-install-cmd": [ From 31d35a61ed56a75ee2d2d927e22cfae998b3d3f7 Mon Sep 17 00:00:00 2001 From: Fabien Potencier Date: Fri, 27 Jul 2012 08:42:28 +0200 Subject: [PATCH 531/899] fixed links (closes #375) --- README.md | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/README.md b/README.md index 0c75d9d85e..186b846c91 100644 --- a/README.md +++ b/README.md @@ -161,7 +161,7 @@ Enjoy! [2]: http://getcomposer.org/ [3]: http://symfony.com/download [4]: http://symfony.com/doc/2.1/quick_tour/the_big_picture.html -[5]: http://symfony.com/doc/2.1/ +[5]: http://symfony.com/doc/2.1/index.html [6]: http://symfony.com/doc/2.1/bundles/SensioFrameworkExtraBundle/index.html [7]: http://symfony.com/doc/2.1/book/doctrine.html [8]: http://symfony.com/doc/2.1/book/templating.html @@ -169,6 +169,6 @@ Enjoy! [10]: http://symfony.com/doc/2.1/cookbook/email.html [11]: http://symfony.com/doc/2.1/cookbook/logging/monolog.html [12]: http://symfony.com/doc/2.1/cookbook/assetic/asset_management.html -[13]: http://jmsyst.com/bundles/JMSSecurityExtraBundle/1.1 -[14]: http://jmsyst.com/bundles/JMSDiExtraBundle/1.0 +[13]: http://jmsyst.com/bundles/JMSSecurityExtraBundle/master +[14]: http://jmsyst.com/bundles/JMSDiExtraBundle/master [15]: http://symfony.com/doc/2.1/bundles/SensioGeneratorBundle/index.html From c1641ec8aa887123bf6da600b3884cc4c5fdc82f Mon Sep 17 00:00:00 2001 From: Victor Berchet Date: Tue, 31 Jul 2012 16:08:01 +0200 Subject: [PATCH 532/899] [Config] Update routing configuration related to symfony/symfony#5114 --- app/config/config.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/app/config/config.yml b/app/config/config.yml index 85b1103ba9..06aebb59ec 100644 --- a/app/config/config.yml +++ b/app/config/config.yml @@ -8,7 +8,7 @@ framework: secret: %secret% router: resource: "%kernel.root_dir%/config/routing.yml" - strict_parameters: %kernel.debug% + strict_requirements: %kernel.debug% form: true csrf_protection: true validation: { enable_annotations: true } From 98623b3056d9dbe4d04c80456797d94f3ed79b06 Mon Sep 17 00:00:00 2001 From: Fabien Potencier Date: Tue, 31 Jul 2012 16:24:12 +0200 Subject: [PATCH 533/899] updated deps --- composer.lock | 66 +++++++++++++++++++++++++++------------------------ 1 file changed, 35 insertions(+), 31 deletions(-) diff --git a/composer.lock b/composer.lock index 030b83fb3e..7a36045bce 100644 --- a/composer.lock +++ b/composer.lock @@ -1,5 +1,5 @@ { - "hash": "ab7ccf177098603cace942212179431f", + "hash": "1a1259c83478d633de476b776290a632", "packages": [ { "package": "doctrine/common", @@ -14,14 +14,14 @@ { "package": "doctrine/doctrine-bundle", "version": "dev-master", - "source-reference": "c9ea46d1f0c48bb88bb87b44214fe44e03c0c692", - "commit-date": "1341405737" + "source-reference": "ed8d02b491512f947fdb2f8b665dc8fd72b5879c", + "commit-date": "1343657020" }, { "package": "doctrine/orm", "version": "2.2.x-dev", - "source-reference": "5d2a3bcb3b467f41ee58575764f3ba84937f76e4", - "commit-date": "1341676080" + "source-reference": "7d343302a8f886be9cfb2a9c8345a95740dcfde9", + "commit-date": "1343560954" }, { "package": "jms/aop-bundle", @@ -33,7 +33,15 @@ }, { "package": "jms/di-extra-bundle", - "version": "1.0.1" + "version": "dev-master", + "alias-pretty-version": "1.1.x-dev", + "alias-version": "1.1.9999999.9999999-dev" + }, + { + "package": "jms/di-extra-bundle", + "version": "dev-master", + "source-reference": "19c78ddeb222b0e911eb87c9b3c07d5dc0f9f9ea", + "commit-date": "1343655179" }, { "package": "jms/metadata", @@ -41,7 +49,15 @@ }, { "package": "jms/security-extra-bundle", - "version": "1.1.0" + "version": "dev-master", + "alias-pretty-version": "1.2.x-dev", + "alias-version": "1.2.9999999.9999999-dev" + }, + { + "package": "jms/security-extra-bundle", + "version": "dev-master", + "source-reference": "75b21cce40f7714f462deb4292f093a566958b02", + "commit-date": "1343654921" }, { "package": "kriswallsmith/assetic", @@ -52,8 +68,8 @@ { "package": "kriswallsmith/assetic", "version": "dev-master", - "source-reference": "5c1c9b658b732a980312e8f29cec4e175c2bb6b2", - "commit-date": "1342787613" + "source-reference": "11324294acf2dcf6b7f7cb0c4f35fd77e6f01cb7", + "commit-date": "1343684910" }, { "package": "monolog/monolog", @@ -68,14 +84,14 @@ { "package": "sensio/framework-extra-bundle", "version": "dev-master", - "source-reference": "e9ac8f1a911ed29e30296c7f1549f53d4c94eddf", - "commit-date": "1342084432" + "source-reference": "dbe4432742e16ee9ca550a2f953b059f0a80c53d", + "commit-date": "1343637454" }, { "package": "sensio/generator-bundle", "version": "dev-master", - "source-reference": "c17dbddefe517e3adfcbeaa1ab7cef3e572d29c6", - "commit-date": "1342195488" + "source-reference": "4436c2e24301123fb413baf3f78cd93bbc016c07", + "commit-date": "1343291371" }, { "package": "swiftmailer/swiftmailer", @@ -92,14 +108,8 @@ { "package": "symfony/assetic-bundle", "version": "dev-master", - "source-reference": "e5e9a56a872d9e1f305d14cd8296bf77888388af", - "commit-date": "1342820047" - }, - { - "package": "symfony/monolog-bundle", - "version": "dev-master", - "alias-pretty-version": "2.1.x-dev", - "alias-version": "2.1.9999999.9999999-dev" + "source-reference": "24df9ede95084be882aeb557eaef5b761cfa00e0", + "commit-date": "1343684934" }, { "package": "symfony/monolog-bundle", @@ -107,12 +117,6 @@ "source-reference": "v2.1.0-BETA4", "commit-date": "1341078487" }, - { - "package": "symfony/swiftmailer-bundle", - "version": "dev-master", - "alias-pretty-version": "2.1.x-dev", - "alias-version": "2.1.9999999.9999999-dev" - }, { "package": "symfony/swiftmailer-bundle", "version": "dev-master", @@ -128,8 +132,8 @@ { "package": "symfony/symfony", "version": "dev-master", - "source-reference": "v2.1.0-BETA4", - "commit-date": "1343063410" + "source-reference": "4b521985f121be25360365e2dc7a36645daa26b1", + "commit-date": "1343744174" }, { "package": "twig/extensions", @@ -146,8 +150,8 @@ { "package": "twig/twig", "version": "dev-master", - "source-reference": "657de7bdeb680815e0df95f63da9f81e1533d2ea", - "commit-date": "1342953178" + "source-reference": "51c866f415bbee670cd9ba13591307bce8dabdca", + "commit-date": "1343464333" } ], "packages-dev": [ From 59fdaebaac63193f08afaec62827657ff664a464 Mon Sep 17 00:00:00 2001 From: Christophe Coevoet Date: Wed, 25 Jul 2012 14:40:47 +0200 Subject: [PATCH 534/899] Bumped Doctrine to 2.2.3 --- composer.json | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/composer.json b/composer.json index 62f2416be1..55b55b2a29 100644 --- a/composer.json +++ b/composer.json @@ -7,7 +7,7 @@ "require": { "php": ">=5.3.3", "symfony/symfony": "2.1.*", - "doctrine/orm": "2.2.*", + "doctrine/orm": ">=2.2.3,<2.4-dev", "doctrine/doctrine-bundle": "dev-master", "twig/extensions": "dev-master", "symfony/assetic-bundle": "dev-master", From 793a21af9f69a4161ec442f22bae50dc2a3aa53f Mon Sep 17 00:00:00 2001 From: Christophe Coevoet Date: Wed, 25 Jul 2012 14:41:06 +0200 Subject: [PATCH 535/899] Updated the lock file --- composer.lock | 82 +++++++++++++++++++++++++++------------------------ 1 file changed, 43 insertions(+), 39 deletions(-) diff --git a/composer.lock b/composer.lock index 030b83fb3e..f63a612f06 100644 --- a/composer.lock +++ b/composer.lock @@ -1,27 +1,29 @@ { - "hash": "ab7ccf177098603cace942212179431f", + "hash": "2c0ad4beaacc810752764681fc5067a8", "packages": [ { "package": "doctrine/common", - "version": "2.2.2" + "version": "2.3.x-dev", + "source-reference": "1ba1f944c174db5ea2320fab3f49a6ca0ea79b9b", + "commit-date": "1343558692" }, { "package": "doctrine/dbal", - "version": "2.2.x-dev", - "source-reference": "b961a3fce6bf220f1dca47d7d747b9074bea4730", - "commit-date": "1341779435" + "version": "2.3.x-dev", + "source-reference": "86b10e7eda2eed1d9a07a580a40e14cea8e1733a", + "commit-date": "1343559046" }, { "package": "doctrine/doctrine-bundle", "version": "dev-master", - "source-reference": "c9ea46d1f0c48bb88bb87b44214fe44e03c0c692", - "commit-date": "1341405737" + "source-reference": "ed8d02b491512f947fdb2f8b665dc8fd72b5879c", + "commit-date": "1343657020" }, { "package": "doctrine/orm", - "version": "2.2.x-dev", - "source-reference": "5d2a3bcb3b467f41ee58575764f3ba84937f76e4", - "commit-date": "1341676080" + "version": "2.3.x-dev", + "source-reference": "992b51eba77b413878385f2924763680617497ff", + "commit-date": "1343559790" }, { "package": "jms/aop-bundle", @@ -33,7 +35,15 @@ }, { "package": "jms/di-extra-bundle", - "version": "1.0.1" + "version": "dev-master", + "alias-pretty-version": "1.1.x-dev", + "alias-version": "1.1.9999999.9999999-dev" + }, + { + "package": "jms/di-extra-bundle", + "version": "dev-master", + "source-reference": "19c78ddeb222b0e911eb87c9b3c07d5dc0f9f9ea", + "commit-date": "1343655179" }, { "package": "jms/metadata", @@ -41,7 +51,15 @@ }, { "package": "jms/security-extra-bundle", - "version": "1.1.0" + "version": "dev-master", + "alias-pretty-version": "1.2.x-dev", + "alias-version": "1.2.9999999.9999999-dev" + }, + { + "package": "jms/security-extra-bundle", + "version": "dev-master", + "source-reference": "75b21cce40f7714f462deb4292f093a566958b02", + "commit-date": "1343654921" }, { "package": "kriswallsmith/assetic", @@ -52,8 +70,8 @@ { "package": "kriswallsmith/assetic", "version": "dev-master", - "source-reference": "5c1c9b658b732a980312e8f29cec4e175c2bb6b2", - "commit-date": "1342787613" + "source-reference": "11324294acf2dcf6b7f7cb0c4f35fd77e6f01cb7", + "commit-date": "1343684910" }, { "package": "monolog/monolog", @@ -68,14 +86,14 @@ { "package": "sensio/framework-extra-bundle", "version": "dev-master", - "source-reference": "e9ac8f1a911ed29e30296c7f1549f53d4c94eddf", - "commit-date": "1342084432" + "source-reference": "a0d76a65aeb70be6f25754a4482e84a9a28fb614", + "commit-date": "1343456386" }, { "package": "sensio/generator-bundle", "version": "dev-master", - "source-reference": "c17dbddefe517e3adfcbeaa1ab7cef3e572d29c6", - "commit-date": "1342195488" + "source-reference": "4436c2e24301123fb413baf3f78cd93bbc016c07", + "commit-date": "1343291371" }, { "package": "swiftmailer/swiftmailer", @@ -92,14 +110,8 @@ { "package": "symfony/assetic-bundle", "version": "dev-master", - "source-reference": "e5e9a56a872d9e1f305d14cd8296bf77888388af", - "commit-date": "1342820047" - }, - { - "package": "symfony/monolog-bundle", - "version": "dev-master", - "alias-pretty-version": "2.1.x-dev", - "alias-version": "2.1.9999999.9999999-dev" + "source-reference": "24df9ede95084be882aeb557eaef5b761cfa00e0", + "commit-date": "1343684934" }, { "package": "symfony/monolog-bundle", @@ -107,12 +119,6 @@ "source-reference": "v2.1.0-BETA4", "commit-date": "1341078487" }, - { - "package": "symfony/swiftmailer-bundle", - "version": "dev-master", - "alias-pretty-version": "2.1.x-dev", - "alias-version": "2.1.9999999.9999999-dev" - }, { "package": "symfony/swiftmailer-bundle", "version": "dev-master", @@ -128,8 +134,8 @@ { "package": "symfony/symfony", "version": "dev-master", - "source-reference": "v2.1.0-BETA4", - "commit-date": "1343063410" + "source-reference": "6b39ebc4f8b4d5e3bb7ba4350cd5175f12fc8510", + "commit-date": "1343572385" }, { "package": "twig/extensions", @@ -146,13 +152,11 @@ { "package": "twig/twig", "version": "dev-master", - "source-reference": "657de7bdeb680815e0df95f63da9f81e1533d2ea", - "commit-date": "1342953178" + "source-reference": "51c866f415bbee670cd9ba13591307bce8dabdca", + "commit-date": "1343464333" } ], - "packages-dev": [ - - ], + "packages-dev": null, "aliases": [ ], From ef7300ef45cbd4bd49be62bcb719ef255a339729 Mon Sep 17 00:00:00 2001 From: Ben Lumley Date: Wed, 1 Aug 2012 17:52:54 +0200 Subject: [PATCH 536/899] Rename strict_parameters to strict_requirements MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit To match https://github.com/symfony/symfony/commit/4b521985f121be25360365e2dc7a36645daa26b1 --- UPGRADE.md | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/UPGRADE.md b/UPGRADE.md index e6300b9e8e..7bc21ebd6d 100644 --- a/UPGRADE.md +++ b/UPGRADE.md @@ -71,13 +71,13 @@ class instead: // ... } -You might want to add the new `strict_parameters` parameter to +You might want to add the new `strict_requirements` parameter to `framework.router` (it avoids fatal errors in the production environment when a link cannot be generated): framework: router: - strict_parameters: %kernel.debug% + strict_requirements: %kernel.debug% The `default_locale` parameter is now a setting of the main `framework` configuration (it was under the `framework.session` in 2.0): From c8e9f4b0377e879f6c776caece9ed78fca3e3c6b Mon Sep 17 00:00:00 2001 From: Fabien Potencier Date: Sat, 4 Aug 2012 11:38:25 +0200 Subject: [PATCH 537/899] updated deps --- composer.lock | 36 ++++++++++++++++++------------------ 1 file changed, 18 insertions(+), 18 deletions(-) diff --git a/composer.lock b/composer.lock index baf74bd963..b39d0bd12f 100644 --- a/composer.lock +++ b/composer.lock @@ -4,8 +4,8 @@ { "package": "doctrine/common", "version": "2.3.x-dev", - "source-reference": "1ba1f944c174db5ea2320fab3f49a6ca0ea79b9b", - "commit-date": "1343558692" + "source-reference": "2ec4bc6db13db6a0976a16b71058083c55cbcdbd", + "commit-date": "1343847076" }, { "package": "doctrine/dbal", @@ -22,8 +22,8 @@ { "package": "doctrine/orm", "version": "2.3.x-dev", - "source-reference": "3f2ddc60d42ebc140de7bbadf7f7af6115c3690a", - "commit-date": "1343745264" + "source-reference": "17862d9a2a38bf801e564d09a26eea8503621ae0", + "commit-date": "1343850025" }, { "package": "jms/aop-bundle", @@ -42,8 +42,8 @@ { "package": "jms/di-extra-bundle", "version": "dev-master", - "source-reference": "19c78ddeb222b0e911eb87c9b3c07d5dc0f9f9ea", - "commit-date": "1343655179" + "source-reference": "912519a3dafc6318c781bd00a9ef7ff790b2c321", + "commit-date": "1343737883" }, { "package": "jms/metadata", @@ -80,20 +80,20 @@ { "package": "sensio/distribution-bundle", "version": "dev-master", - "source-reference": "5886adae1613c0a72fbb95259a83ae798e86c0d3", - "commit-date": "1342347850" + "source-reference": "26a1165b8cfbde91bf01d809f87bc286f18f0963", + "commit-date": "1343979103" }, { "package": "sensio/framework-extra-bundle", "version": "dev-master", - "source-reference": "dbe4432742e16ee9ca550a2f953b059f0a80c53d", - "commit-date": "1343637454" + "source-reference": "ade2d53b20a9fc3428f04c863b3fd4fca0b62181", + "commit-date": "1344072374" }, { "package": "sensio/generator-bundle", "version": "dev-master", - "source-reference": "4436c2e24301123fb413baf3f78cd93bbc016c07", - "commit-date": "1343291371" + "source-reference": "d8fc1666f3cdb403f1b2d4320c45ddd6adbdf6a5", + "commit-date": "1343980150" }, { "package": "swiftmailer/swiftmailer", @@ -104,14 +104,14 @@ { "package": "swiftmailer/swiftmailer", "version": "dev-master", - "source-reference": "8b2aa953f87da228ba413e8fb1372e49c1374050", - "commit-date": "1342198037" + "source-reference": "19045c3692f6f6ddb4abc5ebfaf3f86f1c57d265", + "commit-date": "1343980916" }, { "package": "symfony/assetic-bundle", "version": "dev-master", - "source-reference": "24df9ede95084be882aeb557eaef5b761cfa00e0", - "commit-date": "1343684934" + "source-reference": "0c09207be07b044e06d28a4111f554f071e5b658", + "commit-date": "1343812720" }, { "package": "symfony/monolog-bundle", @@ -134,8 +134,8 @@ { "package": "symfony/symfony", "version": "dev-master", - "source-reference": "b1618d210cb7e27036edcea9c163a94167e7df59", - "commit-date": "1343747192" + "source-reference": "v2.1.0-RC1", + "commit-date": "1344072741" }, { "package": "twig/extensions", From 2175994882deb1406897c608a07456629e643906 Mon Sep 17 00:00:00 2001 From: Grayson Koonce Date: Sat, 4 Aug 2012 11:38:03 -0700 Subject: [PATCH 538/899] Adding bin to .gitignore MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit Composer moves or links bin files to the bin directory, so  checking these files in after installing deps with composer  doesn't make any sense. --- .gitignore | 1 + 1 file changed, 1 insertion(+) diff --git a/.gitignore b/.gitignore index e984ef673b..93f07f37b5 100644 --- a/.gitignore +++ b/.gitignore @@ -4,4 +4,5 @@ app/cache/* app/logs/* build/ vendor +bin composer.phar From dbfb751fd8f3f26615799460b546e67f2171bc00 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Gr=C3=A9goire=20Pineau?= Date: Tue, 7 Aug 2012 15:32:02 +0200 Subject: [PATCH 539/899] [Acme] Highlight code block in demo pages --- src/Acme/DemoBundle/Twig/Extension/DemoExtension.php | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/src/Acme/DemoBundle/Twig/Extension/DemoExtension.php b/src/Acme/DemoBundle/Twig/Extension/DemoExtension.php index 8f6533a6d7..ac34332d33 100644 --- a/src/Acme/DemoBundle/Twig/Extension/DemoExtension.php +++ b/src/Acme/DemoBundle/Twig/Extension/DemoExtension.php @@ -33,7 +33,10 @@ public function getFunctions() public function getCode($template) { - $controller = htmlspecialchars($this->getControllerCode(), ENT_QUOTES, 'UTF-8'); + // highlight_string highlights php code only if 'getControllerCode(), true); + $controller = str_replace('<?php    ', '    ', $controller); + $template = htmlspecialchars($this->getTemplateCode($template), ENT_QUOTES, 'UTF-8'); // remove the code block From cc5c5befde0ffa7bb0943a5f64d06b832d25f112 Mon Sep 17 00:00:00 2001 From: Jordan Alliot Date: Wed, 8 Aug 2012 00:24:58 +0200 Subject: [PATCH 540/899] Remove specific autoloading part to reflect latest Symfony master --- app/autoload.php | 2 -- 1 file changed, 2 deletions(-) diff --git a/app/autoload.php b/app/autoload.php index a68e37fbc0..75069ac3f7 100644 --- a/app/autoload.php +++ b/app/autoload.php @@ -7,8 +7,6 @@ // intl if (!function_exists('intl_get_error_code')) { require_once __DIR__.'/../vendor/symfony/symfony/src/Symfony/Component/Locale/Resources/stubs/functions.php'; - - $loader->add('', __DIR__.'/../vendor/symfony/symfony/src/Symfony/Component/Locale/Resources/stubs'); } AnnotationRegistry::registerLoader(array($loader, 'loadClass')); From b7c1d49ae1c15e6d06a57e3b07d24bfd4cbcea35 Mon Sep 17 00:00:00 2001 From: Bilal Amarni Date: Mon, 13 Aug 2012 17:09:45 +0300 Subject: [PATCH 541/899] fixed typo --- app/config/config.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/app/config/config.yml b/app/config/config.yml index 06aebb59ec..b812a36a87 100644 --- a/app/config/config.yml +++ b/app/config/config.yml @@ -14,7 +14,7 @@ framework: validation: { enable_annotations: true } templating: { engines: ['twig'] } #assets_version: SomeVersionScheme default_locale: %locale% - trust_proxy_headers: false # Should Request object should trust proxy headers (X_FORWARDED_FOR/HTTP_CLIENT_IP) + trust_proxy_headers: false # Whether or not the Request object should trust proxy headers (X_FORWARDED_FOR/HTTP_CLIENT_IP) session: ~ # Twig Configuration From 94dca83e75557cef605b8258d4a0d14869c668a1 Mon Sep 17 00:00:00 2001 From: Fabien Potencier Date: Tue, 21 Aug 2012 13:05:42 +0200 Subject: [PATCH 542/899] updated vendors --- composer.lock | 48 ++++++++++++++++++++++++------------------------ 1 file changed, 24 insertions(+), 24 deletions(-) diff --git a/composer.lock b/composer.lock index b39d0bd12f..f3a1ab6f69 100644 --- a/composer.lock +++ b/composer.lock @@ -10,20 +10,20 @@ { "package": "doctrine/dbal", "version": "2.3.x-dev", - "source-reference": "86b10e7eda2eed1d9a07a580a40e14cea8e1733a", - "commit-date": "1343559046" + "source-reference": "6470e2089e9ab4a2d24e6927ebe073b7935d7ed5", + "commit-date": "1344980709" }, { "package": "doctrine/doctrine-bundle", "version": "dev-master", - "source-reference": "ed8d02b491512f947fdb2f8b665dc8fd72b5879c", - "commit-date": "1343657020" + "source-reference": "4d9bb0f3af470556983eb41a7d19ede23401ef0b", + "commit-date": "1344549563" }, { "package": "doctrine/orm", "version": "2.3.x-dev", - "source-reference": "17862d9a2a38bf801e564d09a26eea8503621ae0", - "commit-date": "1343850025" + "source-reference": "971865f271771a3b06c474dfea9e91f023837cce", + "commit-date": "1344977483" }, { "package": "jms/aop-bundle", @@ -42,8 +42,8 @@ { "package": "jms/di-extra-bundle", "version": "dev-master", - "source-reference": "912519a3dafc6318c781bd00a9ef7ff790b2c321", - "commit-date": "1343737883" + "source-reference": "3420add7ca1957b60c7e250506d7c59ea7012747", + "commit-date": "1345140102" }, { "package": "jms/metadata", @@ -58,8 +58,8 @@ { "package": "jms/security-extra-bundle", "version": "dev-master", - "source-reference": "75b21cce40f7714f462deb4292f093a566958b02", - "commit-date": "1343654921" + "source-reference": "68ff54447d3be168ecb248dedbcd4cb401ec69b2", + "commit-date": "1345149984" }, { "package": "kriswallsmith/assetic", @@ -70,18 +70,18 @@ { "package": "kriswallsmith/assetic", "version": "dev-master", - "source-reference": "11324294acf2dcf6b7f7cb0c4f35fd77e6f01cb7", - "commit-date": "1343684910" + "source-reference": "d1d5066d9071a76d771993081ee23137e96216b7", + "commit-date": "1344507381" }, { "package": "monolog/monolog", - "version": "1.1.0" + "version": "1.2.0" }, { "package": "sensio/distribution-bundle", "version": "dev-master", - "source-reference": "26a1165b8cfbde91bf01d809f87bc286f18f0963", - "commit-date": "1343979103" + "source-reference": "bd98b5fb0e4a5dddb4f7acd2e11f28c4cd7eacee", + "commit-date": "1345139690" }, { "package": "sensio/framework-extra-bundle", @@ -110,19 +110,19 @@ { "package": "symfony/assetic-bundle", "version": "dev-master", - "source-reference": "0c09207be07b044e06d28a4111f554f071e5b658", - "commit-date": "1343812720" + "source-reference": "ec3a65d3eab342af9e93a3c21af0ac7b78e01c17", + "commit-date": "1344507386" }, { "package": "symfony/monolog-bundle", "version": "dev-master", - "source-reference": "v2.1.0-BETA4", - "commit-date": "1341078487" + "source-reference": "aed4d742838d2a7350633fed7afe18dbfd3415de", + "commit-date": "1344949802" }, { "package": "symfony/swiftmailer-bundle", "version": "dev-master", - "source-reference": "v2.1.0-BETA4", + "source-reference": "v2.1.0-RC1", "commit-date": "1342684512" }, { @@ -134,8 +134,8 @@ { "package": "symfony/symfony", "version": "dev-master", - "source-reference": "v2.1.0-RC1", - "commit-date": "1344072741" + "source-reference": "ef29276c3a1d6ab757d894bd64391fa2ea47db0c", + "commit-date": "1345367019" }, { "package": "twig/extensions", @@ -152,8 +152,8 @@ { "package": "twig/twig", "version": "dev-master", - "source-reference": "51c866f415bbee670cd9ba13591307bce8dabdca", - "commit-date": "1343464333" + "source-reference": "552143062982fd15a1d6fe5a0cdda1f007212154", + "commit-date": "1345489844" } ], "packages-dev": [ From 1dea48c088104252afcd8c0e86564dd1d3559ba3 Mon Sep 17 00:00:00 2001 From: Fabien Potencier Date: Tue, 28 Aug 2012 09:24:15 +0200 Subject: [PATCH 543/899] updated vendors --- composer.json | 12 ++++++------ 1 file changed, 6 insertions(+), 6 deletions(-) diff --git a/composer.json b/composer.json index 55b55b2a29..fad5edf5e0 100644 --- a/composer.json +++ b/composer.json @@ -10,12 +10,12 @@ "doctrine/orm": ">=2.2.3,<2.4-dev", "doctrine/doctrine-bundle": "dev-master", "twig/extensions": "dev-master", - "symfony/assetic-bundle": "dev-master", - "symfony/swiftmailer-bundle": "dev-master", - "symfony/monolog-bundle": "dev-master", - "sensio/distribution-bundle": "dev-master", - "sensio/framework-extra-bundle": "dev-master", - "sensio/generator-bundle": "dev-master", + "symfony/assetic-bundle": "2.1.*", + "symfony/swiftmailer-bundle": "2.1.*", + "symfony/monolog-bundle": "2.1.*", + "sensio/distribution-bundle": "2.1.*", + "sensio/framework-extra-bundle": "2.1.*", + "sensio/generator-bundle": "2.1.*", "jms/security-extra-bundle": "1.2.*", "jms/di-extra-bundle": "1.1.*" }, From 6b3ed0580ce0b2f374c932481db5e3af0b5bed1a Mon Sep 17 00:00:00 2001 From: Fabien Potencier Date: Tue, 28 Aug 2012 10:18:31 +0200 Subject: [PATCH 544/899] updated VENDORS for 2.0.17 --- deps | 6 +++--- deps.lock | 14 +++++++------- 2 files changed, 10 insertions(+), 10 deletions(-) diff --git a/deps b/deps index b72bef8baf..56531e3ed0 100644 --- a/deps +++ b/deps @@ -1,10 +1,10 @@ [symfony] git=http://github.com/symfony/symfony.git - version=origin/2.0 + version=v2.0.17 [twig] git=http://github.com/fabpot/Twig.git - version=v1.8.2 + version=v1.9.2 [monolog] git=http://github.com/Seldaek/monolog.git @@ -24,7 +24,7 @@ [swiftmailer] git=http://github.com/swiftmailer/swiftmailer.git - version=v4.2.0 + version=v4.2.1 [assetic] git=http://github.com/kriswallsmith/assetic.git diff --git a/deps.lock b/deps.lock index 98776b7b13..2e7a4bb491 100644 --- a/deps.lock +++ b/deps.lock @@ -1,15 +1,15 @@ -symfony v2.0.16 -twig v1.8.2 +symfony v2.0.17 +twig v1.9.2 monolog 1.0.2 doctrine-common 2.1.4 doctrine-dbal 2.1.7 doctrine 2.1.7 -swiftmailer v4.2.0 +swiftmailer v4.2.1 assetic v1.0.3 twig-extensions feb6d3f10c411e2631997c0a905aa581c80305c1 metadata 1.0.0 -SensioFrameworkExtraBundle 3dcf2d31ad898db2a5ab418cb03b9f701ba2350f +SensioFrameworkExtraBundle v2.0.17 JMSSecurityExtraBundle e752f888c51425f71382c056961f10f2be642102 -SensioDistributionBundle 41a6c5caed65f02bb09c95a90579f047616471fd -SensioGeneratorBundle c0118ce370f8da20e43051f2dd1ae331a202ab9c -AsseticBundle fbcbaf46df2aa143759319de205e1babcf7dd87d +SensioDistributionBundle v2.0.17 +SensioGeneratorBundle v2.0.17 +AsseticBundle 6f15728c1aefa5246caa83730e3dbf70b0d46052 From fbf178c0ffe782d22a6880fd1201e1ecfa351d8e Mon Sep 17 00:00:00 2001 From: Fabien Potencier Date: Tue, 28 Aug 2012 10:22:27 +0200 Subject: [PATCH 545/899] updated vendors to dev branches --- deps | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/deps b/deps index 56531e3ed0..ee98c78559 100644 --- a/deps +++ b/deps @@ -1,6 +1,6 @@ [symfony] git=http://github.com/symfony/symfony.git - version=v2.0.17 + version=origin/2.0 [twig] git=http://github.com/fabpot/Twig.git From 4fb5d34b83b3ab12cf8443ac08361d2a5bcd83b0 Mon Sep 17 00:00:00 2001 From: Fabien Potencier Date: Tue, 28 Aug 2012 10:30:39 +0200 Subject: [PATCH 546/899] updated VENDORS for 2.1.0-RC2 --- app/SymfonyRequirements.php | 33 +++++++++++++++ composer.lock | 84 +++++++++++++++++++++++++------------ 2 files changed, 90 insertions(+), 27 deletions(-) diff --git a/app/SymfonyRequirements.php b/app/SymfonyRequirements.php index cfd55a74bc..5c7fccff00 100644 --- a/app/SymfonyRequirements.php +++ b/app/SymfonyRequirements.php @@ -26,6 +26,7 @@ * ************** CAUTION ************** * * @author Tobias Schultze + * @author Fabien Potencier */ class Requirement { @@ -482,6 +483,20 @@ function_exists('simplexml_import_dom'), 'Add "phar" to suhosin.executor.include.whitelist in php.ini*.' ); + if (extension_loaded('xdebug')) { + $this->addPhpIniRequirement( + 'xdebug.show_exception_trace', false, true, + 'xdebug.show_exception_trace setting must be disabled', + 'Set the "xdebug.show_exception_trace" setting to "Off" in php.ini*.' + ); + + $this->addPhpIniRequirement( + 'xdebug.scream', false, true, + 'xdebug.scream setting must be disabled', + 'Set the "xdebug.scream" setting to "Off" in php.ini*.' + ); + } + $pcreVersion = defined('PCRE_VERSION') ? (float) PCRE_VERSION : null; $this->addRequirement( @@ -490,6 +505,12 @@ function_exists('simplexml_import_dom'), 'Upgrade your PCRE extension (8.0+)' ); + $this->addRequirement( + version_compare($installedPhpVersion, '5.3.16', '!='), + 'Symfony won\'t work properly with PHP 5.3.16', + 'Install PHP 5.3.17 or newer' + ); + /* optional recommendations follow */ $this->addRecommendation( @@ -498,12 +519,24 @@ function_exists('simplexml_import_dom'), 'Install PHP 5.3.4 or newer' ); + $this->addRecommendation( + version_compare($installedPhpVersion, '5.4.0', '!='), + 'Your project might not work properly ("Cannot dump definitions which have method calls") due to the PHP bug #61453 in PHP 5.4.0', + 'Install PHP 5.4.1 or newer' + ); + $this->addRecommendation( version_compare($installedPhpVersion, '5.3.8', '>='), sprintf('Annotations might not work properly due to the PHP bug #55156 before PHP 5.3.8 (%s installed)', $installedPhpVersion), 'Install PHP 5.3.8 or newer if your project uses annotations' ); + $this->addRecommendation( + !(extension_loaded('intl') && null === new Collator('fr_FR')), + 'intl extension should be correctly configured', + 'The intl extension does not behave properly. This problem is typical on PHP 5.3.X x64 WIN builds' + ); + $this->addRecommendation( class_exists('DomDocument'), 'PHP-XML module should be installed', diff --git a/composer.lock b/composer.lock index f3a1ab6f69..0e78d3d7e6 100644 --- a/composer.lock +++ b/composer.lock @@ -1,5 +1,5 @@ { - "hash": "2c0ad4beaacc810752764681fc5067a8", + "hash": "afa9ed2f087ef34f2ab54c177f478a34", "packages": [ { "package": "doctrine/common", @@ -58,8 +58,8 @@ { "package": "jms/security-extra-bundle", "version": "dev-master", - "source-reference": "68ff54447d3be168ecb248dedbcd4cb401ec69b2", - "commit-date": "1345149984" + "source-reference": "dc76f47a5f4171abfd958fe4d277dfa11a3290ce", + "commit-date": "1345840275" }, { "package": "kriswallsmith/assetic", @@ -70,8 +70,8 @@ { "package": "kriswallsmith/assetic", "version": "dev-master", - "source-reference": "d1d5066d9071a76d771993081ee23137e96216b7", - "commit-date": "1344507381" + "source-reference": "db682ee6bf6b15131a5433f2a71f8ca39555ccaa", + "commit-date": "1346007196" }, { "package": "monolog/monolog", @@ -80,20 +80,38 @@ { "package": "sensio/distribution-bundle", "version": "dev-master", - "source-reference": "bd98b5fb0e4a5dddb4f7acd2e11f28c4cd7eacee", - "commit-date": "1345139690" + "alias-pretty-version": "2.1.x-dev", + "alias-version": "2.1.9999999.9999999-dev" + }, + { + "package": "sensio/distribution-bundle", + "version": "dev-master", + "source-reference": "v2.1.0-RC2", + "commit-date": "1345982505" + }, + { + "package": "sensio/framework-extra-bundle", + "version": "dev-master", + "alias-pretty-version": "2.1.x-dev", + "alias-version": "2.1.9999999.9999999-dev" }, { "package": "sensio/framework-extra-bundle", "version": "dev-master", - "source-reference": "ade2d53b20a9fc3428f04c863b3fd4fca0b62181", + "source-reference": "v2.1.0-RC2", "commit-date": "1344072374" }, { "package": "sensio/generator-bundle", "version": "dev-master", - "source-reference": "d8fc1666f3cdb403f1b2d4320c45ddd6adbdf6a5", - "commit-date": "1343980150" + "alias-pretty-version": "2.1.x-dev", + "alias-version": "2.1.9999999.9999999-dev" + }, + { + "package": "sensio/generator-bundle", + "version": "dev-master", + "source-reference": "v2.1.0-RC2", + "commit-date": "1346138171" }, { "package": "swiftmailer/swiftmailer", @@ -104,25 +122,43 @@ { "package": "swiftmailer/swiftmailer", "version": "dev-master", - "source-reference": "19045c3692f6f6ddb4abc5ebfaf3f86f1c57d265", - "commit-date": "1343980916" + "source-reference": "e12e4ef3a9d6dd60fb734a01984a6e6627aea764", + "commit-date": "1345630910" }, { "package": "symfony/assetic-bundle", "version": "dev-master", - "source-reference": "ec3a65d3eab342af9e93a3c21af0ac7b78e01c17", + "alias-pretty-version": "2.1.x-dev", + "alias-version": "2.1.9999999.9999999-dev" + }, + { + "package": "symfony/assetic-bundle", + "version": "dev-master", + "source-reference": "v2.1.0-RC2", "commit-date": "1344507386" }, { "package": "symfony/monolog-bundle", "version": "dev-master", - "source-reference": "aed4d742838d2a7350633fed7afe18dbfd3415de", - "commit-date": "1344949802" + "alias-pretty-version": "2.1.x-dev", + "alias-version": "2.1.9999999.9999999-dev" + }, + { + "package": "symfony/monolog-bundle", + "version": "dev-master", + "source-reference": "10c3d6fcda8d73eb1a35860eeea2933d1ab2c1f6", + "commit-date": "1345557954" + }, + { + "package": "symfony/swiftmailer-bundle", + "version": "dev-master", + "alias-pretty-version": "2.1.x-dev", + "alias-version": "2.1.9999999.9999999-dev" }, { "package": "symfony/swiftmailer-bundle", "version": "dev-master", - "source-reference": "v2.1.0-RC1", + "source-reference": "v2.1.0-RC2", "commit-date": "1342684512" }, { @@ -134,8 +170,8 @@ { "package": "symfony/symfony", "version": "dev-master", - "source-reference": "ef29276c3a1d6ab757d894bd64391fa2ea47db0c", - "commit-date": "1345367019" + "source-reference": "v2.1.0-RC2", + "commit-date": "1346140818" }, { "package": "twig/extensions", @@ -152,8 +188,8 @@ { "package": "twig/twig", "version": "dev-master", - "source-reference": "552143062982fd15a1d6fe5a0cdda1f007212154", - "commit-date": "1345489844" + "source-reference": "32c4867f68c1bacc758602d602e18a3ac1598c76", + "commit-date": "1345916214" } ], "packages-dev": [ @@ -165,12 +201,6 @@ "minimum-stability": "dev", "stability-flags": { "doctrine/doctrine-bundle": 20, - "twig/extensions": 20, - "symfony/assetic-bundle": 20, - "symfony/swiftmailer-bundle": 20, - "symfony/monolog-bundle": 20, - "sensio/distribution-bundle": 20, - "sensio/framework-extra-bundle": 20, - "sensio/generator-bundle": 20 + "twig/extensions": 20 } } From d2bb484448998a9efe928bfc9234b161dc584fea Mon Sep 17 00:00:00 2001 From: Fabien Potencier Date: Tue, 28 Aug 2012 17:10:36 +0200 Subject: [PATCH 547/899] updated version for twig/extensions --- composer.json | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/composer.json b/composer.json index fad5edf5e0..643736ef28 100644 --- a/composer.json +++ b/composer.json @@ -9,7 +9,7 @@ "symfony/symfony": "2.1.*", "doctrine/orm": ">=2.2.3,<2.4-dev", "doctrine/doctrine-bundle": "dev-master", - "twig/extensions": "dev-master", + "twig/extensions": "1.0.*", "symfony/assetic-bundle": "2.1.*", "symfony/swiftmailer-bundle": "2.1.*", "symfony/monolog-bundle": "2.1.*", From 81e245e8c3acab14c9c2032bd815f2737f927b3d Mon Sep 17 00:00:00 2001 From: Fabien Potencier Date: Wed, 29 Aug 2012 10:56:57 +0200 Subject: [PATCH 548/899] updated deps for Doctrine bundle --- composer.json | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/composer.json b/composer.json index 643736ef28..0290d2e209 100644 --- a/composer.json +++ b/composer.json @@ -8,7 +8,7 @@ "php": ">=5.3.3", "symfony/symfony": "2.1.*", "doctrine/orm": ">=2.2.3,<2.4-dev", - "doctrine/doctrine-bundle": "dev-master", + "doctrine/doctrine-bundle": "2.1.*", "twig/extensions": "1.0.*", "symfony/assetic-bundle": "2.1.*", "symfony/swiftmailer-bundle": "2.1.*", From 22771ee4535b53bc2da4a67037619fd87201516f Mon Sep 17 00:00:00 2001 From: Fabien Potencier Date: Wed, 29 Aug 2012 11:27:32 +0200 Subject: [PATCH 549/899] fixed Doctrine bundle version --- composer.json | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/composer.json b/composer.json index 0290d2e209..8f905d7d1b 100644 --- a/composer.json +++ b/composer.json @@ -8,7 +8,7 @@ "php": ">=5.3.3", "symfony/symfony": "2.1.*", "doctrine/orm": ">=2.2.3,<2.4-dev", - "doctrine/doctrine-bundle": "2.1.*", + "doctrine/doctrine-bundle": "1.0.*", "twig/extensions": "1.0.*", "symfony/assetic-bundle": "2.1.*", "symfony/swiftmailer-bundle": "2.1.*", From 33eaa39b10f17e6f23498bd6ec468d30e879c2a1 Mon Sep 17 00:00:00 2001 From: Tobias Schultze Date: Thu, 30 Aug 2012 18:20:33 +0300 Subject: [PATCH 550/899] configure strict_requirements: null in production MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit possible since symfony/symfony#5187 --- app/config/config_prod.yml | 8 ++++++++ 1 file changed, 8 insertions(+) diff --git a/app/config/config_prod.yml b/app/config/config_prod.yml index 0b91d4d885..5e31419627 100644 --- a/app/config/config_prod.yml +++ b/app/config/config_prod.yml @@ -1,6 +1,14 @@ imports: - { resource: config.yml } +# In production environment you should know that the parameters for URL generation +# always pass the requirements. Otherwise it would break your link (or even site with +# strict_requirements = true). So we can disable the requirements check completely for +# enhanced performance with strict_requirements = null. +framework: + router: + strict_requirements: null + #doctrine: # orm: # metadata_cache_driver: apc From ef43472edf11c79ba7b55bfebcac28dfde192afa Mon Sep 17 00:00:00 2001 From: Tobias Schultze Date: Thu, 30 Aug 2012 17:52:00 +0200 Subject: [PATCH 551/899] added upgrade note for strict_requirements = null --- UPGRADE.md | 5 +++++ 1 file changed, 5 insertions(+) diff --git a/UPGRADE.md b/UPGRADE.md index 7bc21ebd6d..0f7cdfc8cf 100644 --- a/UPGRADE.md +++ b/UPGRADE.md @@ -79,6 +79,11 @@ a link cannot be generated): router: strict_requirements: %kernel.debug% +You can even disable the requirements check on production with `null` as you should +know that the parameters for URL generation always pass the requirements, e.g. by +validating them beforehand. This additionally enhances performance. See +[config_prod.yml](https://github.com/symfony/symfony-standard/blob/master/app/config/config_prod.yml). + The `default_locale` parameter is now a setting of the main `framework` configuration (it was under the `framework.session` in 2.0): From 4a2e8153622b6be5924835beedb8afc75caa5390 Mon Sep 17 00:00:00 2001 From: Fabien Potencier Date: Mon, 3 Sep 2012 08:32:19 +0200 Subject: [PATCH 552/899] updated deps --- composer.lock | 105 ++++++++++++++++++++++++++++++++------------------ 1 file changed, 67 insertions(+), 38 deletions(-) diff --git a/composer.lock b/composer.lock index 0e78d3d7e6..6d7b21a4b9 100644 --- a/composer.lock +++ b/composer.lock @@ -1,29 +1,35 @@ { - "hash": "afa9ed2f087ef34f2ab54c177f478a34", + "hash": "c2639bd4ac21bfd8d3fd08e114f2f759", "packages": [ { "package": "doctrine/common", "version": "2.3.x-dev", - "source-reference": "2ec4bc6db13db6a0976a16b71058083c55cbcdbd", - "commit-date": "1343847076" + "source-reference": "605b1b8b5a7bc8daf9111fb35483e5708e30de35", + "commit-date": "1346249247" }, { "package": "doctrine/dbal", "version": "2.3.x-dev", - "source-reference": "6470e2089e9ab4a2d24e6927ebe073b7935d7ed5", - "commit-date": "1344980709" + "source-reference": "adb28e4e1f959d515971b8e8b7f05a01913a7b91", + "commit-date": "1346249329" }, { "package": "doctrine/doctrine-bundle", "version": "dev-master", - "source-reference": "4d9bb0f3af470556983eb41a7d19ede23401ef0b", - "commit-date": "1344549563" + "alias-pretty-version": "1.0.x-dev", + "alias-version": "1.0.9999999.9999999-dev" + }, + { + "package": "doctrine/doctrine-bundle", + "version": "dev-master", + "source-reference": "3600872919186e1a40e8fd556e65f6dca6337cc9", + "commit-date": "1346617185" }, { "package": "doctrine/orm", "version": "2.3.x-dev", - "source-reference": "971865f271771a3b06c474dfea9e91f023837cce", - "commit-date": "1344977483" + "source-reference": "bbf527a27356414bfa9bf520f018c5cb7af67c77", + "commit-date": "1346250986" }, { "package": "jms/aop-bundle", @@ -42,8 +48,14 @@ { "package": "jms/di-extra-bundle", "version": "dev-master", - "source-reference": "3420add7ca1957b60c7e250506d7c59ea7012747", - "commit-date": "1345140102" + "alias-pretty-version": "1.2.x-dev", + "alias-version": "1.2.9999999.9999999-dev" + }, + { + "package": "jms/di-extra-bundle", + "version": "dev-master", + "source-reference": "a949d13485eff40b5672d29a136f3ecd34ed0f85", + "commit-date": "1346498128" }, { "package": "jms/metadata", @@ -58,8 +70,14 @@ { "package": "jms/security-extra-bundle", "version": "dev-master", - "source-reference": "dc76f47a5f4171abfd958fe4d277dfa11a3290ce", - "commit-date": "1345840275" + "alias-pretty-version": "1.3.x-dev", + "alias-version": "1.3.9999999.9999999-dev" + }, + { + "package": "jms/security-extra-bundle", + "version": "dev-master", + "source-reference": "70514f4be9256caa1abff2e4418e56261c8f2a5d", + "commit-date": "1346497751" }, { "package": "kriswallsmith/assetic", @@ -70,12 +88,20 @@ { "package": "kriswallsmith/assetic", "version": "dev-master", - "source-reference": "db682ee6bf6b15131a5433f2a71f8ca39555ccaa", - "commit-date": "1346007196" + "source-reference": "0410297526eacc3aa2146b55bc4e30e6fd3a50ed", + "commit-date": "1346167888" + }, + { + "package": "monolog/monolog", + "version": "dev-master", + "alias-pretty-version": "1.3.x-dev", + "alias-version": "1.3.9999999.9999999-dev" }, { "package": "monolog/monolog", - "version": "1.2.0" + "version": "dev-master", + "source-reference": "1.2.1", + "commit-date": "1346241200" }, { "package": "sensio/distribution-bundle", @@ -86,8 +112,8 @@ { "package": "sensio/distribution-bundle", "version": "dev-master", - "source-reference": "v2.1.0-RC2", - "commit-date": "1345982505" + "source-reference": "a86d2c0d7212851cc4e971abdff13b89eb063861", + "commit-date": "1346246961" }, { "package": "sensio/framework-extra-bundle", @@ -98,8 +124,8 @@ { "package": "sensio/framework-extra-bundle", "version": "dev-master", - "source-reference": "v2.1.0-RC2", - "commit-date": "1344072374" + "source-reference": "1281f6218226ddb88df8546f28a3166e2a0cb55d", + "commit-date": "1346234539" }, { "package": "sensio/generator-bundle", @@ -134,8 +160,8 @@ { "package": "symfony/assetic-bundle", "version": "dev-master", - "source-reference": "v2.1.0-RC2", - "commit-date": "1344507386" + "source-reference": "4e7e8a039fa19434f04558473adbb201118af942", + "commit-date": "1346199949" }, { "package": "symfony/monolog-bundle", @@ -146,7 +172,7 @@ { "package": "symfony/monolog-bundle", "version": "dev-master", - "source-reference": "10c3d6fcda8d73eb1a35860eeea2933d1ab2c1f6", + "source-reference": "v2.1.0-RC2", "commit-date": "1345557954" }, { @@ -158,8 +184,8 @@ { "package": "symfony/swiftmailer-bundle", "version": "dev-master", - "source-reference": "v2.1.0-RC2", - "commit-date": "1342684512" + "source-reference": "d2eae9385c029cbac031a90e6d2abc74b889a562", + "commit-date": "1346243146" }, { "package": "symfony/symfony", @@ -170,14 +196,20 @@ { "package": "symfony/symfony", "version": "dev-master", - "source-reference": "v2.1.0-RC2", - "commit-date": "1346140818" + "source-reference": "41ffd006e57b0955d44a2b07fd898689c0d63a56", + "commit-date": "1346482338" + }, + { + "package": "twig/extensions", + "version": "dev-master", + "alias-pretty-version": "1.0.x-dev", + "alias-version": "1.0.9999999.9999999-dev" }, { "package": "twig/extensions", "version": "dev-master", - "source-reference": "feb6d3f10c411e2631997c0a905aa581c80305c1", - "commit-date": "1337599699" + "source-reference": "v1.0.0-alpha", + "commit-date": "1346166263" }, { "package": "twig/twig", @@ -188,19 +220,16 @@ { "package": "twig/twig", "version": "dev-master", - "source-reference": "32c4867f68c1bacc758602d602e18a3ac1598c76", - "commit-date": "1345916214" + "source-reference": "459720ff3b74ee0c0d159277c6f2f5df89d8a4f6", + "commit-date": "1346397138" } ], - "packages-dev": [ - - ], + "packages-dev": null, "aliases": [ ], "minimum-stability": "dev", - "stability-flags": { - "doctrine/doctrine-bundle": 20, - "twig/extensions": 20 - } + "stability-flags": [ + + ] } From 18ab88b62537728712519d0270ce6a27a92346fe Mon Sep 17 00:00:00 2001 From: Fabien Potencier Date: Mon, 3 Sep 2012 12:00:23 +0200 Subject: [PATCH 553/899] udpated deps (from a clean state) --- composer.lock | 36 ++++++------------------------------ 1 file changed, 6 insertions(+), 30 deletions(-) diff --git a/composer.lock b/composer.lock index 6d7b21a4b9..d487f18c0e 100644 --- a/composer.lock +++ b/composer.lock @@ -41,21 +41,9 @@ }, { "package": "jms/di-extra-bundle", - "version": "dev-master", - "alias-pretty-version": "1.1.x-dev", - "alias-version": "1.1.9999999.9999999-dev" - }, - { - "package": "jms/di-extra-bundle", - "version": "dev-master", - "alias-pretty-version": "1.2.x-dev", - "alias-version": "1.2.9999999.9999999-dev" - }, - { - "package": "jms/di-extra-bundle", - "version": "dev-master", - "source-reference": "a949d13485eff40b5672d29a136f3ecd34ed0f85", - "commit-date": "1346498128" + "version": "1.1.x-dev", + "source-reference": "1.1.0-RC", + "commit-date": "1345140102" }, { "package": "jms/metadata", @@ -63,21 +51,9 @@ }, { "package": "jms/security-extra-bundle", - "version": "dev-master", - "alias-pretty-version": "1.2.x-dev", - "alias-version": "1.2.9999999.9999999-dev" - }, - { - "package": "jms/security-extra-bundle", - "version": "dev-master", - "alias-pretty-version": "1.3.x-dev", - "alias-version": "1.3.9999999.9999999-dev" - }, - { - "package": "jms/security-extra-bundle", - "version": "dev-master", - "source-reference": "70514f4be9256caa1abff2e4418e56261c8f2a5d", - "commit-date": "1346497751" + "version": "1.2.x-dev", + "source-reference": "81070f525ec24f9e6cf6509532b260bc54c42ea5", + "commit-date": "1346345841" }, { "package": "kriswallsmith/assetic", From dd09775fc1bc5eee77a8f43b40803f3c57193165 Mon Sep 17 00:00:00 2001 From: Kim Ausloos Date: Wed, 5 Sep 2012 17:29:55 +0300 Subject: [PATCH 554/899] Add more verbose warning for PHP 5.3.16 There was some confusion about the PHP 5.3.16 warning because 5.3.17 is not yet released. Added a bit more info to clear things up. --- app/SymfonyRequirements.php | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/app/SymfonyRequirements.php b/app/SymfonyRequirements.php index 5c7fccff00..7e708820ac 100644 --- a/app/SymfonyRequirements.php +++ b/app/SymfonyRequirements.php @@ -507,8 +507,8 @@ function_exists('simplexml_import_dom'), $this->addRequirement( version_compare($installedPhpVersion, '5.3.16', '!='), - 'Symfony won\'t work properly with PHP 5.3.16', - 'Install PHP 5.3.17 or newer' + 'Symfony won\'t work properly with PHP 5.3.16 due to issues in this version', + 'Install PHP 5.3.17 or newer when possible, or downgrade to PHP 5.3.15' ); /* optional recommendations follow */ From ece0516c54e3c530073b83aaabe72e052ae161d1 Mon Sep 17 00:00:00 2001 From: Kim Ausloos Date: Wed, 5 Sep 2012 20:24:26 +0300 Subject: [PATCH 555/899] Add reference to PHP bug #62874 for 5.3.16 requirement --- app/SymfonyRequirements.php | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/app/SymfonyRequirements.php b/app/SymfonyRequirements.php index 7e708820ac..b00417d2cc 100644 --- a/app/SymfonyRequirements.php +++ b/app/SymfonyRequirements.php @@ -507,8 +507,8 @@ function_exists('simplexml_import_dom'), $this->addRequirement( version_compare($installedPhpVersion, '5.3.16', '!='), - 'Symfony won\'t work properly with PHP 5.3.16 due to issues in this version', - 'Install PHP 5.3.17 or newer when possible, or downgrade to PHP 5.3.15' + 'Symfony won\'t work properly with PHP 5.3.16 due to PHP bug #62874', + 'Install PHP 5.3.17 or newer when possible, or downgrade to PHP 5.3.15.' ); /* optional recommendations follow */ From 37cf3a58b7467ba0dd0d6041d87e5cce9deaebf3 Mon Sep 17 00:00:00 2001 From: Fabien Potencier Date: Thu, 6 Sep 2012 11:11:24 +0200 Subject: [PATCH 556/899] updated VENDORS for 2.1.0 --- app/SymfonyRequirements.php | 132 +++++++++++++++++++----------------- composer.lock | 34 +++++----- 2 files changed, 88 insertions(+), 78 deletions(-) diff --git a/app/SymfonyRequirements.php b/app/SymfonyRequirements.php index 5c7fccff00..07636ca682 100644 --- a/app/SymfonyRequirements.php +++ b/app/SymfonyRequirements.php @@ -9,24 +9,26 @@ * file that was distributed with this source code. */ -/** - * Represents a single PHP requirement, e.g. an installed extension. - * It can be a mandatory requirement or an optional recommendation. - * There is a special subclass, named PhpIniRequirement, to check a php.ini configuration. - * - * This file must be compatible with PHP 5.2+. +/* + * Users of PHP 5.2 should be able to run the requirements checks. + * This is why the file and all classes must be compatible with PHP 5.2+ + * (e.g. not using namespaces and closures). * * ************** CAUTION ************** * - * DO NOT EDIT THIS FILE AS IT WILL BE OVERRIDEN BY COMPOSER - * - * If you want to change this file, edit the one in the - * SensioDistributionBundle instead. + * DO NOT EDIT THIS FILE as it will be overriden by Composer as part of + * the installation/update process. The original file resides in the + * SensioDistributionBundle. * * ************** CAUTION ************** + */ + +/** + * Represents a single PHP requirement, e.g. an installed extension. + * It can be a mandatory requirement or an optional recommendation. + * There is a special subclass, named PhpIniRequirement, to check a php.ini configuration. * * @author Tobias Schultze - * @author Fabien Potencier */ class Requirement { @@ -121,8 +123,8 @@ class PhpIniRequirement extends Requirement * @param Boolean $approveCfgAbsence If true the Requirement will be fulfilled even if the configuration option does not exist, i.e. ini_get() returns false. This is helpful for abandoned configs in later PHP versions or configs of an optional extension, like Suhosin. Example: You require a config to be true but PHP later removes this config and defaults it to true internally. - * @param string $testMessage The message for testing the requirement (when null and $evaluation is a Boolean a default message is derived) - * @param string $helpHtml The help text formatted in HTML for resolving the problem (when null and $evaluation is a Boolean a default help is derived) + * @param string|null $testMessage The message for testing the requirement (when null and $evaluation is a Boolean a default message is derived) + * @param string|null $helpHtml The help text formatted in HTML for resolving the problem (when null and $evaluation is a Boolean a default help is derived) * @param string|null $helpText The help text (when null, it will be inferred from $helpHtml, i.e. stripped from HTML tags) * @param Boolean $optional Whether this is only an optional recommendation not a mandatory requirement */ @@ -162,10 +164,6 @@ public function __construct($cfgName, $evaluation, $approveCfgAbsence = false, $ /** * A RequirementCollection represents a set of Requirement instances. * - * Users of PHP 5.2 should be able to run the requirements checks. - * This is why the class must be compatible with PHP 5.2 - * (e.g. not using namespaces and closures). - * * @author Tobias Schultze */ class RequirementCollection implements IteratorAggregate @@ -374,6 +372,7 @@ public function getPhpIniConfigPath() * are necessary to run the Symfony Standard Edition. * * @author Tobias Schultze + * @author Fabien Potencier */ class SymfonyRequirements extends RequirementCollection { @@ -397,6 +396,12 @@ public function __construct() sprintf('Install PHP %s or newer (installed version is %s)', self::REQUIRED_PHP_VERSION, $installedPhpVersion) ); + $this->addRequirement( + version_compare($installedPhpVersion, '5.3.16', '!='), + 'PHP version must not be 5.3.16 as Symfony won\'t work properly with it', + 'Install PHP 5.3.17 or newer (or downgrade to an earlier PHP version)' + ); + $this->addRequirement( is_dir(__DIR__.'/../vendor/composer'), 'Vendor libraries must be installed', @@ -404,13 +409,8 @@ public function __construct() 'Then run "php composer.phar install" to install them.' ); - $this->addRequirement( - file_get_contents(__FILE__) == file_get_contents(__DIR__.'/../vendor/sensio/distribution-bundle/Sensio/Bundle/DistributionBundle/Resources/skeleton/app/SymfonyRequirements.php'), - 'Outdated requirements file', - 'Your requirements file is outdated. Run composer install and re-check your configuration.' - ); - $baseDir = basename(__DIR__); + $this->addRequirement( is_writable(__DIR__.'/cache'), "$baseDir/cache/ directory must be writable", @@ -432,8 +432,8 @@ public function __construct() if (version_compare($installedPhpVersion, self::REQUIRED_PHP_VERSION, '>=')) { $this->addRequirement( (in_array(date_default_timezone_get(), DateTimeZone::listIdentifiers())), - sprintf('Default timezone "%s" is not supported by your installation of PHP', date_default_timezone_get()), - 'Fix your php.ini file (check for typos and have a look at the list of deprecated timezones http://php.net/manual/en/timezones.others.php).' + sprintf('Configured default timezone "%s" must be supported by your installation of PHP', date_default_timezone_get()), + 'Your default timezone is not supported by PHP. Check for typos in your php.ini file and have a look at the list of deprecated timezones at http://php.net/manual/en/timezones.others.php.' ); } @@ -467,33 +467,39 @@ function_exists('simplexml_import_dom'), 'Install and enable the SimpleXML extension.' ); - $this->addRequirement( - !(function_exists('apc_store') && ini_get('apc.enabled')) || version_compare(phpversion('apc'), '3.0.17', '>='), - 'APC version must be at least 3.0.17', - 'Upgrade your APC extension (3.0.17+)' - ); + if (function_exists('apc_store') && ini_get('apc.enabled')) { + $this->addRequirement( + version_compare(phpversion('apc'), '3.0.17', '>='), + 'APC version must be at least 3.0.17', + 'Upgrade your APC extension (3.0.17+).' + ); + } $this->addPhpIniRequirement('detect_unicode', false); - $this->addPhpIniRequirement( - 'suhosin.executor.include.whitelist', - create_function('$cfgValue', 'return false !== stripos($cfgValue, "phar");'), - true, - 'suhosin.executor.include.whitelist must be configured correctly in php.ini', - 'Add "phar" to suhosin.executor.include.whitelist in php.ini*.' - ); + ob_start(); + phpinfo(); + $phpinfo = ob_get_contents(); + ob_end_clean(); + + // the phpinfo check is necessary when Suhosin is compiled into PHP + if (extension_loaded('suhosin') || false !== strpos($phpinfo, 'Suhosin')) { + $this->addPhpIniRequirement( + 'suhosin.executor.include.whitelist', + create_function('$cfgValue', 'return false !== stripos($cfgValue, "phar");'), + false, + 'suhosin.executor.include.whitelist must be configured correctly in php.ini', + 'Add "phar" to suhosin.executor.include.whitelist in php.ini*.' + ); + } if (extension_loaded('xdebug')) { $this->addPhpIniRequirement( - 'xdebug.show_exception_trace', false, true, - 'xdebug.show_exception_trace setting must be disabled', - 'Set the "xdebug.show_exception_trace" setting to "Off" in php.ini*.' + 'xdebug.show_exception_trace', false, true ); $this->addPhpIniRequirement( - 'xdebug.scream', false, true, - 'xdebug.scream setting must be disabled', - 'Set the "xdebug.scream" setting to "Off" in php.ini*.' + 'xdebug.scream', false, true ); } @@ -502,39 +508,33 @@ function_exists('simplexml_import_dom'), $this->addRequirement( null !== $pcreVersion && $pcreVersion > 8.0, sprintf('PCRE extension must be available and at least 8.0 (%s installed)', $pcreVersion ? $pcreVersion : 'not'), - 'Upgrade your PCRE extension (8.0+)' - ); - - $this->addRequirement( - version_compare($installedPhpVersion, '5.3.16', '!='), - 'Symfony won\'t work properly with PHP 5.3.16', - 'Install PHP 5.3.17 or newer' + 'Upgrade your PCRE extension (8.0+).' ); /* optional recommendations follow */ $this->addRecommendation( - version_compare($installedPhpVersion, '5.3.4', '>='), - sprintf('Your project might not work properly ("Notice: Trying to get property of non-object") due to the PHP bug #52083 before PHP 5.3.4 (%s installed)', $installedPhpVersion), - 'Install PHP 5.3.4 or newer' + file_get_contents(__FILE__) === file_get_contents(__DIR__.'/../vendor/sensio/distribution-bundle/Sensio/Bundle/DistributionBundle/Resources/skeleton/app/SymfonyRequirements.php'), + 'Requirements file should be up-to-date', + 'Your requirements file is outdated. Run composer install and re-check your configuration.' ); $this->addRecommendation( - version_compare($installedPhpVersion, '5.4.0', '!='), - 'Your project might not work properly ("Cannot dump definitions which have method calls") due to the PHP bug #61453 in PHP 5.4.0', - 'Install PHP 5.4.1 or newer' + version_compare($installedPhpVersion, '5.3.4', '>='), + 'You should use at least PHP 5.3.4 due to PHP bug #52083 in earlier versions', + 'Your project might malfunction randomly due to PHP bug #52083 ("Notice: Trying to get property of non-object"). Install PHP 5.3.4 or newer.' ); - + $this->addRecommendation( version_compare($installedPhpVersion, '5.3.8', '>='), - sprintf('Annotations might not work properly due to the PHP bug #55156 before PHP 5.3.8 (%s installed)', $installedPhpVersion), - 'Install PHP 5.3.8 or newer if your project uses annotations' + 'When using annotations you should have at least PHP 5.3.8 due to PHP bug #55156', + 'Install PHP 5.3.8 or newer if your project uses annotations.' ); $this->addRecommendation( - !(extension_loaded('intl') && null === new Collator('fr_FR')), - 'intl extension should be correctly configured', - 'The intl extension does not behave properly. This problem is typical on PHP 5.3.X x64 WIN builds' + version_compare($installedPhpVersion, '5.4.0', '!='), + 'You should not use PHP 5.4.0 due to the PHP bug #61453', + 'Your project might not work properly due to the PHP bug #61453 ("Cannot dump definitions which have method calls"). Install PHP 5.4.1 or newer.' ); $this->addRecommendation( @@ -575,6 +575,14 @@ class_exists('Locale'), 'Install and enable the intl extension (used for validators).' ); + if (class_exists('Collator')) { + $this->addRecommendation( + null !== new Collator('fr_FR'), + 'intl extension should be correctly configured', + 'The intl extension does not behave properly. This problem is typical on PHP 5.3.X x64 WIN builds.' + ); + } + if (class_exists('Locale')) { if (defined('INTL_ICU_VERSION')) { $version = INTL_ICU_VERSION; diff --git a/composer.lock b/composer.lock index d487f18c0e..dc79b1f3a1 100644 --- a/composer.lock +++ b/composer.lock @@ -10,8 +10,8 @@ { "package": "doctrine/dbal", "version": "2.3.x-dev", - "source-reference": "adb28e4e1f959d515971b8e8b7f05a01913a7b91", - "commit-date": "1346249329" + "source-reference": "239630b61f03f39d198441eced1bfffb7b0e61d1", + "commit-date": "1346866589" }, { "package": "doctrine/doctrine-bundle", @@ -28,8 +28,8 @@ { "package": "doctrine/orm", "version": "2.3.x-dev", - "source-reference": "bbf527a27356414bfa9bf520f018c5cb7af67c77", - "commit-date": "1346250986" + "source-reference": "4d9f24b2eef3af3a3e76c773994c19bbb0706f88", + "commit-date": "1346869007" }, { "package": "jms/aop-bundle", @@ -64,8 +64,8 @@ { "package": "kriswallsmith/assetic", "version": "dev-master", - "source-reference": "0410297526eacc3aa2146b55bc4e30e6fd3a50ed", - "commit-date": "1346167888" + "source-reference": "86b637e9f64ddcbd17d9eda944384812b5836254", + "commit-date": "1346695911" }, { "package": "monolog/monolog", @@ -76,8 +76,8 @@ { "package": "monolog/monolog", "version": "dev-master", - "source-reference": "1.2.1", - "commit-date": "1346241200" + "source-reference": "a929570bb7688b39fefe4106f0ecf0ac35f37647", + "commit-date": "1346873566" }, { "package": "sensio/distribution-bundle", @@ -88,8 +88,8 @@ { "package": "sensio/distribution-bundle", "version": "dev-master", - "source-reference": "a86d2c0d7212851cc4e971abdff13b89eb063861", - "commit-date": "1346246961" + "source-reference": "v2.1.0", + "commit-date": "1346859132" }, { "package": "sensio/framework-extra-bundle", @@ -100,7 +100,7 @@ { "package": "sensio/framework-extra-bundle", "version": "dev-master", - "source-reference": "1281f6218226ddb88df8546f28a3166e2a0cb55d", + "source-reference": "v2.1.0", "commit-date": "1346234539" }, { @@ -172,8 +172,8 @@ { "package": "symfony/symfony", "version": "dev-master", - "source-reference": "41ffd006e57b0955d44a2b07fd898689c0d63a56", - "commit-date": "1346482338" + "source-reference": "v2.1.0", + "commit-date": "1346922116" }, { "package": "twig/extensions", @@ -184,8 +184,8 @@ { "package": "twig/extensions", "version": "dev-master", - "source-reference": "v1.0.0-alpha", - "commit-date": "1346166263" + "source-reference": "f904575642b1213db69b4a98f08397e722ba1cae", + "commit-date": "1346770278" }, { "package": "twig/twig", @@ -200,7 +200,9 @@ "commit-date": "1346397138" } ], - "packages-dev": null, + "packages-dev": [ + + ], "aliases": [ ], From c61f0ed2fe9a90c1cc4b05bd420cee4633755b19 Mon Sep 17 00:00:00 2001 From: Fabien Potencier Date: Thu, 6 Sep 2012 15:11:57 +0200 Subject: [PATCH 557/899] fixed markup --- UPGRADE.md | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/UPGRADE.md b/UPGRADE.md index 0f7cdfc8cf..bf65bac330 100644 --- a/UPGRADE.md +++ b/UPGRADE.md @@ -189,8 +189,8 @@ Under `security.providers`, the `in_memory` example was updated to the following The following bundles have been added to the list of default registered bundles: - `new JMS\AopBundle\JMSAopBundle(), - `new JMS\DiExtraBundle\JMSDiExtraBundle($this), + new JMS\AopBundle\JMSAopBundle(), + new JMS\DiExtraBundle\JMSDiExtraBundle($this), ### `web/app.php` From 641ed4c2aef4a869828f5f0bf26af68b21624210 Mon Sep 17 00:00:00 2001 From: JMather Date: Thu, 6 Sep 2012 17:19:37 -0300 Subject: [PATCH 558/899] Fixed an issue with installs from composer not working due to version conflict on symfony/symfony --- composer.lock | 9 +-------- 1 file changed, 1 insertion(+), 8 deletions(-) diff --git a/composer.lock b/composer.lock index dc79b1f3a1..0656ccb79c 100644 --- a/composer.lock +++ b/composer.lock @@ -165,16 +165,9 @@ }, { "package": "symfony/symfony", - "version": "dev-master", - "alias-pretty-version": "2.1.x-dev", + "version": "2.1.x-dev", "alias-version": "2.1.9999999.9999999-dev" }, - { - "package": "symfony/symfony", - "version": "dev-master", - "source-reference": "v2.1.0", - "commit-date": "1346922116" - }, { "package": "twig/extensions", "version": "dev-master", From 6fbb39675581c65cd6f1ec82229b6525e5051ec8 Mon Sep 17 00:00:00 2001 From: Fabien Potencier Date: Fri, 7 Sep 2012 07:19:34 +0200 Subject: [PATCH 559/899] fixed composer file --- composer.lock | 15 +++++++-------- 1 file changed, 7 insertions(+), 8 deletions(-) diff --git a/composer.lock b/composer.lock index 0656ccb79c..7b7757891a 100644 --- a/composer.lock +++ b/composer.lock @@ -42,8 +42,8 @@ { "package": "jms/di-extra-bundle", "version": "1.1.x-dev", - "source-reference": "1.1.0-RC", - "commit-date": "1345140102" + "source-reference": "af219527024c584d7311aa855d7522429c5bdb67", + "commit-date": "1346947722" }, { "package": "jms/metadata", @@ -52,8 +52,8 @@ { "package": "jms/security-extra-bundle", "version": "1.2.x-dev", - "source-reference": "81070f525ec24f9e6cf6509532b260bc54c42ea5", - "commit-date": "1346345841" + "source-reference": "9ab6aceda50fc7a2b07d741ba4b3f0695508afcb", + "commit-date": "1346947943" }, { "package": "kriswallsmith/assetic", @@ -166,7 +166,8 @@ { "package": "symfony/symfony", "version": "2.1.x-dev", - "alias-version": "2.1.9999999.9999999-dev" + "source-reference": "e7059b44c78ca8e1e892adb4d93b5a482f4eb9b3", + "commit-date": "1346926323" }, { "package": "twig/extensions", @@ -193,9 +194,7 @@ "commit-date": "1346397138" } ], - "packages-dev": [ - - ], + "packages-dev": null, "aliases": [ ], From 506ffaab8d8474db2512fca879ca4b9877616a1e Mon Sep 17 00:00:00 2001 From: Fabien Potencier Date: Fri, 7 Sep 2012 07:36:07 +0200 Subject: [PATCH 560/899] bumped symfony version --- composer.json | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/composer.json b/composer.json index 8f905d7d1b..51c43b4955 100644 --- a/composer.json +++ b/composer.json @@ -6,7 +6,7 @@ }, "require": { "php": ">=5.3.3", - "symfony/symfony": "2.1.*", + "symfony/symfony": "2.2.*", "doctrine/orm": ">=2.2.3,<2.4-dev", "doctrine/doctrine-bundle": "1.0.*", "twig/extensions": "1.0.*", From d772606654ccc911a00f4882e7b2257af4dbd8b9 Mon Sep 17 00:00:00 2001 From: Fabien Potencier Date: Sat, 8 Sep 2012 07:54:09 +0200 Subject: [PATCH 561/899] Revert "merged branch Tobion/patch-1 (PR #397)" This reverts commit 85e19a5dda7b58e64b618f576d4014e3b1d9c55f, reversing changes made to 22771ee4535b53bc2da4a67037619fd87201516f. --- UPGRADE.md | 5 ----- app/config/config_prod.yml | 8 -------- 2 files changed, 13 deletions(-) diff --git a/UPGRADE.md b/UPGRADE.md index bf65bac330..1be8033266 100644 --- a/UPGRADE.md +++ b/UPGRADE.md @@ -79,11 +79,6 @@ a link cannot be generated): router: strict_requirements: %kernel.debug% -You can even disable the requirements check on production with `null` as you should -know that the parameters for URL generation always pass the requirements, e.g. by -validating them beforehand. This additionally enhances performance. See -[config_prod.yml](https://github.com/symfony/symfony-standard/blob/master/app/config/config_prod.yml). - The `default_locale` parameter is now a setting of the main `framework` configuration (it was under the `framework.session` in 2.0): diff --git a/app/config/config_prod.yml b/app/config/config_prod.yml index 5e31419627..0b91d4d885 100644 --- a/app/config/config_prod.yml +++ b/app/config/config_prod.yml @@ -1,14 +1,6 @@ imports: - { resource: config.yml } -# In production environment you should know that the parameters for URL generation -# always pass the requirements. Otherwise it would break your link (or even site with -# strict_requirements = true). So we can disable the requirements check completely for -# enhanced performance with strict_requirements = null. -framework: - router: - strict_requirements: null - #doctrine: # orm: # metadata_cache_driver: apc From 6272172b77152a609e9b930030ce67c0876524a1 Mon Sep 17 00:00:00 2001 From: Fabien Potencier Date: Tue, 11 Sep 2012 07:06:15 +0200 Subject: [PATCH 562/899] updated VENDORS for 2.1.1 --- app/SymfonyRequirements.php | 12 +++------- composer.lock | 48 ++++++++++++++----------------------- 2 files changed, 21 insertions(+), 39 deletions(-) diff --git a/app/SymfonyRequirements.php b/app/SymfonyRequirements.php index 7830cb3d7e..4df46d1102 100644 --- a/app/SymfonyRequirements.php +++ b/app/SymfonyRequirements.php @@ -398,8 +398,8 @@ public function __construct() $this->addRequirement( version_compare($installedPhpVersion, '5.3.16', '!='), - 'Symfony won\'t work properly with PHP 5.3.16 due to PHP bug #62874', - 'Install PHP 5.3.17 or newer when possible, or downgrade to PHP 5.3.15.' + 'PHP version must not be 5.3.16 as Symfony won\'t work properly with it', + 'Install PHP 5.3.17 or newer (or downgrade to an earlier PHP version)' ); $this->addRequirement( @@ -477,13 +477,7 @@ function_exists('simplexml_import_dom'), $this->addPhpIniRequirement('detect_unicode', false); - ob_start(); - phpinfo(); - $phpinfo = ob_get_contents(); - ob_end_clean(); - - // the phpinfo check is necessary when Suhosin is compiled into PHP - if (extension_loaded('suhosin') || false !== strpos($phpinfo, 'Suhosin')) { + if (extension_loaded('suhosin')) { $this->addPhpIniRequirement( 'suhosin.executor.include.whitelist', create_function('$cfgValue', 'return false !== stripos($cfgValue, "phar");'), diff --git a/composer.lock b/composer.lock index 7b7757891a..6e76e3b3dc 100644 --- a/composer.lock +++ b/composer.lock @@ -22,8 +22,8 @@ { "package": "doctrine/doctrine-bundle", "version": "dev-master", - "source-reference": "3600872919186e1a40e8fd556e65f6dca6337cc9", - "commit-date": "1346617185" + "source-reference": "d3c930599723c8343472a5791b0f5909a4111a73", + "commit-date": "1347289964" }, { "package": "doctrine/orm", @@ -64,8 +64,8 @@ { "package": "kriswallsmith/assetic", "version": "dev-master", - "source-reference": "86b637e9f64ddcbd17d9eda944384812b5836254", - "commit-date": "1346695911" + "source-reference": "dfbb776288baf9319d1693195af2cb6e00729901", + "commit-date": "1347039484" }, { "package": "monolog/monolog", @@ -76,30 +76,18 @@ { "package": "monolog/monolog", "version": "dev-master", - "source-reference": "a929570bb7688b39fefe4106f0ecf0ac35f37647", - "commit-date": "1346873566" + "source-reference": "e5bf7ba5d1df622b68d004b3c0277bc94286e1b7", + "commit-date": "1347105894" }, { "package": "sensio/distribution-bundle", - "version": "dev-master", - "alias-pretty-version": "2.1.x-dev", - "alias-version": "2.1.9999999.9999999-dev" - }, - { - "package": "sensio/distribution-bundle", - "version": "dev-master", - "source-reference": "v2.1.0", - "commit-date": "1346859132" - }, - { - "package": "sensio/framework-extra-bundle", - "version": "dev-master", - "alias-pretty-version": "2.1.x-dev", - "alias-version": "2.1.9999999.9999999-dev" + "version": "2.1.x-dev", + "source-reference": "2eee3cb4cd761c851f0d766649fb9ff6f4c97002", + "commit-date": "1347340208" }, { "package": "sensio/framework-extra-bundle", - "version": "dev-master", + "version": "2.1.x-dev", "source-reference": "v2.1.0", "commit-date": "1346234539" }, @@ -124,8 +112,8 @@ { "package": "swiftmailer/swiftmailer", "version": "dev-master", - "source-reference": "e12e4ef3a9d6dd60fb734a01984a6e6627aea764", - "commit-date": "1345630910" + "source-reference": "c97353b1ebffe25a224146f69d17efe24c093def", + "commit-date": "1347083952" }, { "package": "symfony/assetic-bundle", @@ -148,8 +136,8 @@ { "package": "symfony/monolog-bundle", "version": "dev-master", - "source-reference": "v2.1.0-RC2", - "commit-date": "1345557954" + "source-reference": "b7318480e6f8bf5579d6b3cd856850302e7ba8d8", + "commit-date": "1347283885" }, { "package": "symfony/swiftmailer-bundle", @@ -166,8 +154,8 @@ { "package": "symfony/symfony", "version": "2.1.x-dev", - "source-reference": "e7059b44c78ca8e1e892adb4d93b5a482f4eb9b3", - "commit-date": "1346926323" + "source-reference": "v2.1.1", + "commit-date": "1347339641" }, { "package": "twig/extensions", @@ -190,8 +178,8 @@ { "package": "twig/twig", "version": "dev-master", - "source-reference": "459720ff3b74ee0c0d159277c6f2f5df89d8a4f6", - "commit-date": "1346397138" + "source-reference": "68b8c4619c5bbe82bd345fe56070dec8c356610a", + "commit-date": "1347025342" } ], "packages-dev": null, From cf40c2b5fa2e15850de2881342c9cad72265116d Mon Sep 17 00:00:00 2001 From: Bilal Amarni Date: Fri, 14 Sep 2012 17:50:29 +0200 Subject: [PATCH 563/899] added .travis.yml --- .travis.yml | 10 ++++++++++ 1 file changed, 10 insertions(+) create mode 100644 .travis.yml diff --git a/.travis.yml b/.travis.yml new file mode 100644 index 0000000000..8d9c285475 --- /dev/null +++ b/.travis.yml @@ -0,0 +1,10 @@ +language: php + +php: + - 5.3.3 + - 5.3 + - 5.4 + +before_script: composer install + +script: phpunit -c app From ae36fb4dcfb1d7b8ab9d8086ac114c6591ac5107 Mon Sep 17 00:00:00 2001 From: Maks Date: Sat, 15 Sep 2012 11:04:53 +0300 Subject: [PATCH 564/899] Download Composer from a secure source --- README.md | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/README.md b/README.md index 186b846c91..6a386d6942 100644 --- a/README.md +++ b/README.md @@ -22,7 +22,7 @@ to create a new project is to use it. If you don't have Composer yet, download it following the instructions on http://getcomposer.org/ or just run the following command: - curl -s http://getcomposer.org/installer | php + curl -s https://getcomposer.org/installer | php Then, use the `create-project` command to generate a new Symfony application: From 6cc83cc8f88ba577bd1ffd9e8d04af0bebcf99c5 Mon Sep 17 00:00:00 2001 From: Fabien Potencier Date: Tue, 18 Sep 2012 12:49:39 +0200 Subject: [PATCH 565/899] updated deps --- .gitignore | 1 - app/SymfonyRequirements.php | 8 +- composer.json | 67 +- composer.lock | 1278 +++++++++++++++++++++++++++++++---- 4 files changed, 1180 insertions(+), 174 deletions(-) diff --git a/.gitignore b/.gitignore index 93f07f37b5..e984ef673b 100644 --- a/.gitignore +++ b/.gitignore @@ -4,5 +4,4 @@ app/cache/* app/logs/* build/ vendor -bin composer.phar diff --git a/app/SymfonyRequirements.php b/app/SymfonyRequirements.php index 4df46d1102..07636ca682 100644 --- a/app/SymfonyRequirements.php +++ b/app/SymfonyRequirements.php @@ -477,7 +477,13 @@ function_exists('simplexml_import_dom'), $this->addPhpIniRequirement('detect_unicode', false); - if (extension_loaded('suhosin')) { + ob_start(); + phpinfo(); + $phpinfo = ob_get_contents(); + ob_end_clean(); + + // the phpinfo check is necessary when Suhosin is compiled into PHP + if (extension_loaded('suhosin') || false !== strpos($phpinfo, 'Suhosin')) { $this->addPhpIniRequirement( 'suhosin.executor.include.whitelist', create_function('$cfgValue', 'return false !== stripos($cfgValue, "phar");'), diff --git a/composer.json b/composer.json index 8f905d7d1b..fbd11abc69 100644 --- a/composer.json +++ b/composer.json @@ -1,44 +1,49 @@ { - "name": "symfony/framework-standard-edition", - "description": "The \"Symfony Standard Edition\" distribution", "autoload": { - "psr-0": { "": "src/" } + "psr-0": { + "": "src/" + } + }, + "config": { + "bin-dir": "vendor/bin" + }, + "description": "The \"Symfony Standard Edition\" distribution", + "extra": { + "symfony-app-dir": "app", + "symfony-web-dir": "web" }, + "minimum-stability": "alpha", + "name": "symfony/framework-standard-edition", "require": { - "php": ">=5.3.3", - "symfony/symfony": "2.1.*", - "doctrine/orm": ">=2.2.3,<2.4-dev", "doctrine/doctrine-bundle": "1.0.*", - "twig/extensions": "1.0.*", - "symfony/assetic-bundle": "2.1.*", - "symfony/swiftmailer-bundle": "2.1.*", - "symfony/monolog-bundle": "2.1.*", + "doctrine/orm": ">=2.2.3,<2.4-dev", + "jms/di-extra-bundle": "1.1.*", + "jms/security-extra-bundle": "1.2.*", + "php": ">=5.3.3", "sensio/distribution-bundle": "2.1.*", "sensio/framework-extra-bundle": "2.1.*", "sensio/generator-bundle": "2.1.*", - "jms/security-extra-bundle": "1.2.*", - "jms/di-extra-bundle": "1.1.*" + "symfony/assetic-bundle": "2.1.*", + "symfony/monolog-bundle": "2.1.*", + "symfony/swiftmailer-bundle": "2.1.*", + "symfony/symfony": "2.1.*", + "twig/extensions": "1.0.*" + }, + "require-dev": { + "symfony/process": "2.1.*" }, "scripts": { "post-install-cmd": [ - "Sensio\\Bundle\\DistributionBundle\\Composer\\ScriptHandler::buildBootstrap", - "Sensio\\Bundle\\DistributionBundle\\Composer\\ScriptHandler::clearCache", - "Sensio\\Bundle\\DistributionBundle\\Composer\\ScriptHandler::installAssets", - "Sensio\\Bundle\\DistributionBundle\\Composer\\ScriptHandler::installRequirementsFile" - ], +"Sensio\\Bundle\\DistributionBundle\\Composer\\ScriptHandler::buildBootstrap", +"Sensio\\Bundle\\DistributionBundle\\Composer\\ScriptHandler::clearCache", +"Sensio\\Bundle\\DistributionBundle\\Composer\\ScriptHandler::installAssets", +"Sensio\\Bundle\\DistributionBundle\\Composer\\ScriptHandler::installRequirementsFile" + ], "post-update-cmd": [ - "Sensio\\Bundle\\DistributionBundle\\Composer\\ScriptHandler::buildBootstrap", - "Sensio\\Bundle\\DistributionBundle\\Composer\\ScriptHandler::clearCache", - "Sensio\\Bundle\\DistributionBundle\\Composer\\ScriptHandler::installAssets", - "Sensio\\Bundle\\DistributionBundle\\Composer\\ScriptHandler::installRequirementsFile" - ] - }, - "config": { - "bin-dir": "bin" - }, - "minimum-stability": "dev", - "extra": { - "symfony-app-dir": "app", - "symfony-web-dir": "web" +"Sensio\\Bundle\\DistributionBundle\\Composer\\ScriptHandler::buildBootstrap", +"Sensio\\Bundle\\DistributionBundle\\Composer\\ScriptHandler::clearCache", +"Sensio\\Bundle\\DistributionBundle\\Composer\\ScriptHandler::installAssets", +"Sensio\\Bundle\\DistributionBundle\\Composer\\ScriptHandler::installRequirementsFile" + ] } -} +} \ No newline at end of file diff --git a/composer.lock b/composer.lock index 6e76e3b3dc..5281783391 100644 --- a/composer.lock +++ b/composer.lock @@ -1,192 +1,1188 @@ { - "hash": "c2639bd4ac21bfd8d3fd08e114f2f759", + "hash": "a70b1d65ec44f5bf4fe91ad87bae299b", "packages": [ { - "package": "doctrine/common", - "version": "2.3.x-dev", - "source-reference": "605b1b8b5a7bc8daf9111fb35483e5708e30de35", - "commit-date": "1346249247" + "name": "doctrine/common", + "version": "2.3.0-RC3", + "source": { + "type": "git", + "url": "https://github.com/doctrine/common", + "reference": "2.3.0-RC3" + }, + "dist": { + "type": "zip", + "url": "https://github.com/doctrine/common/zipball/2.3.0-RC3", + "reference": "2.3.0-RC3", + "shasum": "" + }, + "require": { + "php": ">=5.3.2" + }, + "time": "2012-09-17 09:47:57", + "type": "library", + "extra": { + "branch-alias": { + "dev-master": "2.3.x-dev" + } + }, + "installation-source": "dist", + "autoload": { + "psr-0": { + "Doctrine\\Common": "lib/" + } + }, + "license": [ + "MIT" + ], + "authors": [ + { + "name": "Jonathan Wage", + "email": "jonwage@gmail.com", + "homepage": "http://www.jwage.com/" + }, + { + "name": "Guilherme Blanco", + "email": "guilhermeblanco@gmail.com" + }, + { + "name": "Roman Borschel", + "email": "roman@code-factory.org" + }, + { + "name": "Benjamin Eberlei", + "email": "kontakt@beberlei.de" + }, + { + "name": "Johannes Schmitt", + "email": "schmittjoh@gmail.com", + "homepage": "http://jmsyst.com", + "role": "Developer of wrapped JMSSerializerBundle" + } + ], + "description": "Common Library for Doctrine projects", + "homepage": "http://www.doctrine-project.org", + "keywords": [ + "collections", + "spl", + "eventmanager", + "annotations", + "persistence" + ] }, { - "package": "doctrine/dbal", - "version": "2.3.x-dev", - "source-reference": "239630b61f03f39d198441eced1bfffb7b0e61d1", - "commit-date": "1346866589" + "name": "doctrine/dbal", + "version": "2.3.0-RC4", + "source": { + "type": "git", + "url": "https://github.com/doctrine/dbal", + "reference": "2.3.0-RC4" + }, + "dist": { + "type": "zip", + "url": "https://github.com/doctrine/dbal/zipball/2.3.0-RC4", + "reference": "2.3.0-RC4", + "shasum": "" + }, + "require": { + "php": ">=5.3.2", + "doctrine/common": "2.3.*" + }, + "time": "2012-09-17 09:50:07", + "type": "library", + "extra": { + "branch-alias": { + "dev-master": "2.3.x-dev" + } + }, + "installation-source": "dist", + "autoload": { + "psr-0": { + "Doctrine\\DBAL": "lib/" + } + }, + "license": [ + "MIT" + ], + "authors": [ + { + "name": "Jonathan Wage", + "email": "jonwage@gmail.com", + "homepage": "http://www.jwage.com/" + }, + { + "name": "Guilherme Blanco", + "email": "guilhermeblanco@gmail.com" + }, + { + "name": "Roman Borschel", + "email": "roman@code-factory.org" + }, + { + "name": "Benjamin Eberlei", + "email": "kontakt@beberlei.de" + } + ], + "description": "Database Abstraction Layer", + "homepage": "http://www.doctrine-project.org", + "keywords": [ + "database", + "persistence", + "dbal", + "queryobject" + ] }, { - "package": "doctrine/doctrine-bundle", - "version": "dev-master", - "alias-pretty-version": "1.0.x-dev", - "alias-version": "1.0.9999999.9999999-dev" + "name": "doctrine/doctrine-bundle", + "version": "v1.0.0", + "target-dir": "Doctrine/Bundle/DoctrineBundle", + "source": { + "type": "git", + "url": "git://github.com/doctrine/DoctrineBundle.git", + "reference": "v1.0.0" + }, + "dist": { + "type": "zip", + "url": "https://github.com/doctrine/DoctrineBundle/zipball/v1.0.0", + "reference": "v1.0.0", + "shasum": "" + }, + "require": { + "php": ">=5.3.2", + "symfony/framework-bundle": "2.1.*", + "symfony/doctrine-bridge": "2.1.*", + "doctrine/dbal": ">=2.2,<2.4-dev" + }, + "require-dev": { + "doctrine/orm": ">=2.2,<2.4-dev", + "symfony/yaml": "2.1.*", + "symfony/validator": "2.1.*" + }, + "suggest": { + "doctrine/orm": "The Doctrine ORM integration is optional in the bundle." + }, + "time": "2012-09-07 19:18:21", + "type": "symfony-bundle", + "extra": { + "branch-alias": { + "dev-master": "1.0.x-dev" + } + }, + "installation-source": "dist", + "autoload": { + "psr-0": { + "Doctrine\\Bundle\\DoctrineBundle": "" + } + }, + "license": [ + "MIT" + ], + "authors": [ + { + "name": "Fabien Potencier", + "email": "fabien@symfony.com" + }, + { + "name": "Symfony Community", + "homepage": "http://symfony.com/contributors" + }, + { + "name": "Benjamin Eberlei", + "email": "kontakt@beberlei.de" + } + ], + "description": "Symfony DoctrineBundle", + "homepage": "http://www.doctrine-project.org", + "keywords": [ + "database", + "orm", + "persistence", + "dbal" + ] }, { - "package": "doctrine/doctrine-bundle", - "version": "dev-master", - "source-reference": "d3c930599723c8343472a5791b0f5909a4111a73", - "commit-date": "1347289964" + "name": "doctrine/orm", + "version": "2.3.0-RC4", + "source": { + "type": "git", + "url": "git://github.com/doctrine/doctrine2.git", + "reference": "2.3.0-RC4" + }, + "dist": { + "type": "zip", + "url": "https://github.com/doctrine/doctrine2/zipball/2.3.0-RC4", + "reference": "2.3.0-RC4", + "shasum": "" + }, + "require": { + "php": ">=5.3.2", + "ext-pdo": "*", + "doctrine/dbal": "2.3.*", + "symfony/console": "2.*" + }, + "suggest": { + "symfony/yaml": "If you want to use YAML Metadata Mapping Driver" + }, + "time": "2012-09-17 10:09:09", + "bin": [ + "bin/doctrine", + "bin/doctrine.php" + ], + "type": "library", + "extra": { + "branch-alias": { + "dev-master": "2.3.x-dev" + } + }, + "installation-source": "dist", + "autoload": { + "psr-0": { + "Doctrine\\ORM": "lib/" + } + }, + "license": [ + "MIT" + ], + "authors": [ + { + "name": "Jonathan Wage", + "email": "jonwage@gmail.com", + "homepage": "http://www.jwage.com/" + }, + { + "name": "Guilherme Blanco", + "email": "guilhermeblanco@gmail.com" + }, + { + "name": "Roman Borschel", + "email": "roman@code-factory.org" + }, + { + "name": "Benjamin Eberlei", + "email": "kontakt@beberlei.de" + } + ], + "description": "Object-Relational-Mapper for PHP", + "homepage": "http://www.doctrine-project.org", + "keywords": [ + "database", + "orm" + ] }, { - "package": "doctrine/orm", - "version": "2.3.x-dev", - "source-reference": "4d9f24b2eef3af3a3e76c773994c19bbb0706f88", - "commit-date": "1346869007" + "name": "jms/aop-bundle", + "version": "1.0.0", + "target-dir": "JMS/AopBundle", + "source": { + "type": "git", + "url": "https://github.com/schmittjoh/JMSAopBundle", + "reference": "1.0.0" + }, + "dist": { + "type": "zip", + "url": "https://github.com/schmittjoh/JMSAopBundle/zipball/1.0.0", + "reference": "1.0.0", + "shasum": "" + }, + "require": { + "symfony/framework-bundle": "2.*", + "jms/cg": "1.0.0" + }, + "time": "2012-01-02 19:50:26", + "type": "symfony-bundle", + "installation-source": "dist", + "autoload": { + "psr-0": { + "JMS\\AopBundle": "" + } + }, + "license": [ + "Apache" + ], + "authors": [ + { + "name": "Johannes M. Schmitt", + "email": "schmittjoh@gmail.com", + "homepage": "http://jmsyst.com", + "role": "Developer of wrapped JMSSerializerBundle" + } + ], + "description": "Adds AOP capabilities to Symfony2", + "keywords": [ + "annotations", + "aop" + ] }, { - "package": "jms/aop-bundle", - "version": "1.0.0" + "name": "jms/cg", + "version": "1.0.0", + "source": { + "type": "git", + "url": "git://github.com/schmittjoh/cg-library.git", + "reference": "1.0.0" + }, + "dist": { + "type": "zip", + "url": "https://github.com/schmittjoh/cg-library/zipball/1.0.0", + "reference": "1.0.0", + "shasum": "" + }, + "require": { + "php": ">=5.3.0" + }, + "time": "2012-01-02 19:40:52", + "type": "library", + "installation-source": "dist", + "autoload": { + "psr-0": { + "CG\\": "src/" + } + }, + "license": [ + "Apache" + ], + "authors": [ + { + "name": "Johannes M. Schmitt", + "email": "schmittjoh@gmail.com", + "homepage": "http://jmsyst.com", + "role": "Developer of wrapped JMSSerializerBundle" + } + ], + "description": "Toolset for generating PHP code", + "keywords": [ + "code generation" + ] }, { - "package": "jms/cg", - "version": "1.0.0" + "name": "jms/di-extra-bundle", + "version": "1.1.0", + "target-dir": "JMS/DiExtraBundle", + "source": { + "type": "git", + "url": "https://github.com/schmittjoh/JMSDiExtraBundle", + "reference": "1.1.0" + }, + "dist": { + "type": "zip", + "url": "https://github.com/schmittjoh/JMSDiExtraBundle/zipball/1.1.0", + "reference": "1.1.0", + "shasum": "" + }, + "require": { + "symfony/framework-bundle": "2.1.*", + "jms/aop-bundle": "1.0.*", + "jms/metadata": "1.1.*" + }, + "time": "2012-09-06 14:07:54", + "type": "symfony-bundle", + "installation-source": "dist", + "autoload": { + "psr-0": { + "JMS\\DiExtraBundle": "" + } + }, + "license": [ + "Apache" + ], + "authors": [ + { + "name": "Johannes M. Schmitt", + "email": "schmittjoh@gmail.com", + "homepage": "http://jmsyst.com", + "role": "Developer of wrapped JMSSerializerBundle" + } + ], + "description": "Allows to configure dependency injection using annotations", + "homepage": "http://jmsyst.com/bundles/JMSDiExtraBundle", + "keywords": [ + "dependency injection", + "annotations" + ] }, { - "package": "jms/di-extra-bundle", - "version": "1.1.x-dev", - "source-reference": "af219527024c584d7311aa855d7522429c5bdb67", - "commit-date": "1346947722" + "name": "jms/metadata", + "version": "1.1.1", + "source": { + "type": "git", + "url": "https://github.com/schmittjoh/metadata", + "reference": "1.1.1" + }, + "dist": { + "type": "zip", + "url": "https://github.com/schmittjoh/metadata/zipball/1.1.1", + "reference": "1.1.1", + "shasum": "" + }, + "require": { + "php": ">=5.3.0" + }, + "time": "2012-01-02 20:32:49", + "type": "library", + "installation-source": "dist", + "autoload": { + "psr-0": { + "Metadata\\": "src/" + } + }, + "license": [ + "Apache" + ], + "authors": [ + { + "name": "Johannes M. Schmitt", + "email": "schmittjoh@gmail.com", + "homepage": "http://jmsyst.com", + "role": "Developer of wrapped JMSSerializerBundle" + } + ], + "description": "Class/method/property metadata management in PHP", + "keywords": [ + "annotations", + "yaml", + "xml", + "metadata" + ] }, { - "package": "jms/metadata", - "version": "1.1.1" + "name": "jms/security-extra-bundle", + "version": "1.2.0", + "target-dir": "JMS/SecurityExtraBundle", + "source": { + "type": "git", + "url": "https://github.com/schmittjoh/JMSSecurityExtraBundle", + "reference": "1.2.0" + }, + "dist": { + "type": "zip", + "url": "https://github.com/schmittjoh/JMSSecurityExtraBundle/zipball/1.2.0", + "reference": "1.2.0", + "shasum": "" + }, + "require": { + "symfony/framework-bundle": "2.1.*", + "symfony/security-bundle": "*", + "jms/metadata": "1.1.*", + "jms/aop-bundle": "1.0.*", + "jms/di-extra-bundle": "1.1.*" + }, + "require-dev": { + "sensio/framework-extra-bundle": "*", + "symfony/class-loader": "*", + "symfony/yaml": "*", + "symfony/browser-kit": "*", + "symfony/finder": "*", + "symfony/css-selector": "*", + "symfony/process": "*", + "doctrine/doctrine-bundle": "*", + "symfony/twig-bundle": "*", + "doctrine/orm": "*", + "symfony/form": "*", + "symfony/validator": "*" + }, + "time": "2012-09-06 14:12:03", + "type": "symfony-bundle", + "installation-source": "dist", + "autoload": { + "psr-0": { + "JMS\\SecurityExtraBundle": "" + } + }, + "license": [ + "Apache2" + ], + "authors": [ + { + "name": "Johannes M. Schmitt", + "email": "schmittjoh@gmail.com", + "homepage": "https://github.com/schmittjoh", + "role": "Developer of wrapped JMSSerializerBundle" + } + ], + "description": "Enhances the Symfony2 Security Component by adding several new features", + "homepage": "http://jmsyst.com/bundles/JMSSecurityExtraBundle", + "keywords": [ + "annotations", + "authorization", + "security", + "secure", + "expression" + ] }, { - "package": "jms/security-extra-bundle", - "version": "1.2.x-dev", - "source-reference": "9ab6aceda50fc7a2b07d741ba4b3f0695508afcb", - "commit-date": "1346947943" + "name": "kriswallsmith/assetic", + "version": "v1.1.0-alpha1", + "source": { + "type": "git", + "url": "http://github.com/kriswallsmith/assetic.git", + "reference": "v1.1.0-alpha1" + }, + "dist": { + "type": "zip", + "url": "https://github.com/kriswallsmith/assetic/zipball/v1.1.0-alpha1", + "reference": "v1.1.0-alpha1", + "shasum": "" + }, + "require": { + "php": ">=5.3.1", + "symfony/process": "2.1.*" + }, + "require-dev": { + "twig/twig": ">=1.6.0,<2.0", + "leafo/lessphp": "*", + "leafo/scssphp": "*", + "ptachoire/cssembed": "*" + }, + "suggest": { + "twig/twig": "Assetic provides the integration with the Twig templating engine", + "leafo/lessphp": "Assetic provides the integration with the lessphp LESS compiler", + "leafo/scssphp": "Assetic provides the integration with the scssphp SCSS compiler", + "ptachoire/cssembed": "Assetic provides the integration with phpcssembed to embed data uris" + }, + "time": "2012-08-28 10:33:44", + "type": "library", + "extra": { + "branch-alias": { + "dev-master": "1.1-dev" + } + }, + "installation-source": "dist", + "autoload": { + "psr-0": { + "Assetic": "src/" + } + }, + "license": [ + "MIT" + ], + "authors": [ + { + "name": "Kris Wallsmith", + "email": "kris.wallsmith@gmail.com", + "homepage": "http://kriswallsmith.net/" + } + ], + "description": "Asset Management for PHP", + "homepage": "https://github.com/kriswallsmith/assetic", + "keywords": [ + "assets", + "compression", + "minification" + ] }, { - "package": "kriswallsmith/assetic", - "version": "dev-master", - "alias-pretty-version": "1.1.x-dev", - "alias-version": "1.1.9999999.9999999-dev" + "name": "monolog/monolog", + "version": "1.2.1", + "source": { + "type": "git", + "url": "https://github.com/Seldaek/monolog", + "reference": "1.2.1" + }, + "dist": { + "type": "zip", + "url": "https://github.com/Seldaek/monolog/zipball/1.2.1", + "reference": "1.2.1", + "shasum": "" + }, + "require": { + "php": ">=5.3.0" + }, + "require-dev": { + "mlehner/gelf-php": "1.0.*" + }, + "suggest": { + "mlehner/gelf-php": "Allow sending log messages to a GrayLog2 server", + "ext-amqp": "Allow sending log messages to an AMQP server (1.0+ required)", + "ext-mongo": "Allow sending log messages to a MongoDB server" + }, + "time": "2012-08-29 09:53:20", + "type": "library", + "extra": { + "branch-alias": { + "dev-master": "1.3.x-dev" + } + }, + "installation-source": "dist", + "autoload": { + "psr-0": { + "Monolog": "src/" + } + }, + "license": [ + "MIT" + ], + "authors": [ + { + "name": "Jordi Boggiano", + "email": "j.boggiano@seld.be", + "homepage": "http://seld.be", + "role": "Developer" + } + ], + "description": "Logging for PHP 5.3", + "homepage": "http://github.com/Seldaek/monolog", + "keywords": [ + "log", + "logging" + ] }, { - "package": "kriswallsmith/assetic", - "version": "dev-master", - "source-reference": "dfbb776288baf9319d1693195af2cb6e00729901", - "commit-date": "1347039484" + "name": "sensio/distribution-bundle", + "version": "v2.1.0", + "target-dir": "Sensio/Bundle/DistributionBundle", + "source": { + "type": "git", + "url": "https://github.com/sensio/SensioDistributionBundle", + "reference": "v2.1.0" + }, + "dist": { + "type": "zip", + "url": "https://github.com/sensio/SensioDistributionBundle/zipball/v2.1.0", + "reference": "v2.1.0", + "shasum": "" + }, + "require": { + "symfony/framework-bundle": "2.1.*" + }, + "time": "2012-09-05 13:32:12", + "type": "symfony-bundle", + "extra": { + "branch-alias": { + "dev-master": "2.1.x-dev" + } + }, + "installation-source": "dist", + "autoload": { + "psr-0": { + "Sensio\\Bundle\\DistributionBundle": "" + } + }, + "license": [ + "MIT" + ], + "authors": [ + { + "name": "Fabien Potencier", + "email": "fabien@symfony.com" + } + ], + "description": "The base bundle for the Symfony Distributions", + "keywords": [ + "distribution", + "configuration" + ] }, { - "package": "monolog/monolog", - "version": "dev-master", - "alias-pretty-version": "1.3.x-dev", - "alias-version": "1.3.9999999.9999999-dev" + "name": "sensio/framework-extra-bundle", + "version": "v2.1.0", + "target-dir": "Sensio/Bundle/FrameworkExtraBundle", + "source": { + "type": "git", + "url": "https://github.com/sensio/SensioFrameworkExtraBundle", + "reference": "v2.1.0" + }, + "dist": { + "type": "zip", + "url": "https://github.com/sensio/SensioFrameworkExtraBundle/zipball/v2.1.0", + "reference": "v2.1.0", + "shasum": "" + }, + "require": { + "symfony/framework-bundle": "2.1.*", + "doctrine/common": ">=2.1,<2.4-dev" + }, + "time": "2012-08-29 08:02:19", + "type": "symfony-bundle", + "extra": { + "branch-alias": { + "dev-master": "2.1.x-dev" + } + }, + "installation-source": "dist", + "autoload": { + "psr-0": { + "Sensio\\Bundle\\FrameworkExtraBundle": "" + } + }, + "license": [ + "MIT" + ], + "authors": [ + { + "name": "Fabien Potencier", + "email": "fabien@symfony.com" + } + ], + "description": "This bundle provides a way to configure your controllers with annotations", + "keywords": [ + "annotations", + "controllers" + ] }, { - "package": "monolog/monolog", - "version": "dev-master", - "source-reference": "e5bf7ba5d1df622b68d004b3c0277bc94286e1b7", - "commit-date": "1347105894" + "name": "sensio/generator-bundle", + "version": "v2.1.0", + "target-dir": "Sensio/Bundle/GeneratorBundle", + "source": { + "type": "git", + "url": "https://github.com/sensio/SensioGeneratorBundle", + "reference": "v2.1.0-RC2" + }, + "dist": { + "type": "zip", + "url": "https://github.com/sensio/SensioGeneratorBundle/zipball/v2.1.0-RC2", + "reference": "v2.1.0-RC2", + "shasum": "" + }, + "require": { + "symfony/framework-bundle": "2.1.*" + }, + "require-dev": { + "symfony/doctrine-bridge": "2.1.*", + "doctrine/orm": ">=2.1,<2.4-dev", + "twig/twig": ">=1.8,<2.0-dev" + }, + "time": "2012-08-28 05:16:11", + "type": "symfony-bundle", + "extra": { + "branch-alias": { + "dev-master": "2.1.x-dev" + } + }, + "installation-source": "dist", + "autoload": { + "psr-0": { + "Sensio\\Bundle\\GeneratorBundle": "" + } + }, + "license": [ + "MIT" + ], + "authors": [ + { + "name": "Fabien Potencier", + "email": "fabien@symfony.com" + } + ], + "description": "This bundle generates code for you" }, { - "package": "sensio/distribution-bundle", - "version": "2.1.x-dev", - "source-reference": "2eee3cb4cd761c851f0d766649fb9ff6f4c97002", - "commit-date": "1347340208" + "name": "swiftmailer/swiftmailer", + "version": "v4.2.1", + "source": { + "type": "git", + "url": "git://github.com/swiftmailer/swiftmailer.git", + "reference": "v4.2.1" + }, + "dist": { + "type": "zip", + "url": "https://github.com/swiftmailer/swiftmailer/zipball/v4.2.1", + "reference": "v4.2.1", + "shasum": "" + }, + "require": { + "php": ">=5.2.4" + }, + "time": "2012-07-13 14:46:37", + "type": "library", + "extra": { + "branch-alias": { + "dev-master": "4.2-dev" + } + }, + "installation-source": "dist", + "autoload": { + "files": [ + "lib/swift_required.php" + ] + }, + "license": [ + "LGPL" + ], + "authors": [ + { + "name": "Fabien Potencier", + "email": "fabien@symfony.com" + }, + { + "name": "Chris Corbyn" + } + ], + "description": "Swiftmailer, free feature-rich PHP mailer", + "homepage": "http://swiftmailer.org", + "keywords": [ + "mail", + "mailer" + ] }, { - "package": "sensio/framework-extra-bundle", - "version": "2.1.x-dev", - "source-reference": "v2.1.0", - "commit-date": "1346234539" + "name": "symfony/assetic-bundle", + "version": "v2.1.0", + "target-dir": "Symfony/Bundle/AsseticBundle", + "source": { + "type": "git", + "url": "https://github.com/symfony/AsseticBundle", + "reference": "v2.1.0-RC2" + }, + "dist": { + "type": "zip", + "url": "https://github.com/symfony/AsseticBundle/zipball/v2.1.0-RC2", + "reference": "v2.1.0-RC2", + "shasum": "" + }, + "require": { + "php": ">=5.3.0", + "symfony/framework-bundle": "2.1.*", + "kriswallsmith/assetic": "1.1.*" + }, + "require-dev": { + "symfony/twig-bundle": "2.1.*", + "symfony/console": "2.1.*", + "symfony/class-loader": "2.1.*", + "symfony/yaml": "2.1.*", + "symfony/form": "2.1.*", + "symfony/dom-crawler": "2.1.*", + "symfony/css-selector": "2.1.*" + }, + "suggest": { + "symfony/twig-bundle": "2.1.*" + }, + "time": "2012-08-28 08:22:44", + "type": "symfony-bundle", + "extra": { + "branch-alias": { + "dev-master": "2.1.x-dev" + } + }, + "installation-source": "dist", + "autoload": { + "psr-0": { + "Symfony\\Bundle\\AsseticBundle": "" + } + }, + "license": [ + "MIT" + ], + "authors": [ + { + "name": "Kris Wallsmith", + "email": "kris.wallsmith@gmail.com", + "homepage": "http://kriswallsmith.net/" + } + ], + "description": "Integrates Assetic into Symfony2", + "homepage": "https://github.com/symfony/AsseticBundle", + "keywords": [ + "assets", + "compression", + "minification" + ] }, { - "package": "sensio/generator-bundle", - "version": "dev-master", - "alias-pretty-version": "2.1.x-dev", - "alias-version": "2.1.9999999.9999999-dev" + "name": "symfony/monolog-bundle", + "version": "v2.1.0", + "target-dir": "Symfony/Bundle/MonologBundle", + "source": { + "type": "git", + "url": "https://github.com/symfony/MonologBundle", + "reference": "v2.1.0-RC2" + }, + "dist": { + "type": "zip", + "url": "https://github.com/symfony/MonologBundle/zipball/v2.1.0-RC2", + "reference": "v2.1.0-RC2", + "shasum": "" + }, + "require": { + "php": ">=5.3.2", + "symfony/monolog-bridge": "2.1.*", + "symfony/dependency-injection": "2.1.*", + "symfony/config": "2.1.*", + "monolog/monolog": "1.*" + }, + "require-dev": { + "symfony/yaml": "2.1.*", + "symfony/config": "2.1.*" + }, + "time": "2012-08-21 12:05:54", + "type": "symfony-bundle", + "extra": { + "branch-alias": { + "dev-master": "2.1.x-dev" + } + }, + "installation-source": "dist", + "autoload": { + "psr-0": { + "Symfony\\Bundle\\MonologBundle": "" + } + }, + "license": [ + "MIT" + ], + "authors": [ + { + "name": "Fabien Potencier", + "email": "fabien@symfony.com" + }, + { + "name": "Symfony Community", + "homepage": "http://symfony.com/contributors" + } + ], + "description": "Symfony MonologBundle", + "homepage": "http://symfony.com" }, { - "package": "sensio/generator-bundle", - "version": "dev-master", - "source-reference": "v2.1.0-RC2", - "commit-date": "1346138171" + "name": "symfony/swiftmailer-bundle", + "version": "v2.1.0", + "target-dir": "Symfony/Bundle/SwiftmailerBundle", + "source": { + "type": "git", + "url": "https://github.com/symfony/SwiftmailerBundle", + "reference": "v2.1.0" + }, + "dist": { + "type": "zip", + "url": "https://github.com/symfony/SwiftmailerBundle/zipball/v2.1.0", + "reference": "v2.1.0", + "shasum": "" + }, + "require": { + "php": ">=5.3.2", + "swiftmailer/swiftmailer": ">=4.2.0,<4.3-dev", + "symfony/swiftmailer-bridge": "2.1.*" + }, + "require-dev": { + "symfony/dependency-injection": "2.1.*", + "symfony/http-kernel": "2.1.*", + "symfony/config": "2.1.*" + }, + "time": "2012-08-28 08:21:09", + "type": "symfony-bundle", + "extra": { + "branch-alias": { + "dev-master": "2.1-dev" + } + }, + "installation-source": "dist", + "autoload": { + "psr-0": { + "Symfony\\Bundle\\SwiftmailerBundle": "" + } + }, + "license": [ + "MIT" + ], + "authors": [ + { + "name": "Fabien Potencier", + "email": "fabien@symfony.com" + }, + { + "name": "Symfony Community", + "homepage": "http://symfony.com/contributors" + } + ], + "description": "Symfony SwiftmailerBundle", + "homepage": "http://symfony.com" }, { - "package": "swiftmailer/swiftmailer", - "version": "dev-master", - "alias-pretty-version": "4.2.x-dev", - "alias-version": "4.2.9999999.9999999-dev" + "name": "symfony/symfony", + "version": "v2.1.1", + "source": { + "type": "git", + "url": "git://github.com/symfony/symfony.git", + "reference": "v2.1.1" + }, + "dist": { + "type": "zip", + "url": "https://github.com/symfony/symfony/zipball/v2.1.1", + "reference": "v2.1.1", + "shasum": "" + }, + "require": { + "php": ">=5.3.3", + "doctrine/common": ">2.2,<2.4-dev", + "twig/twig": ">=1.9.1,<2.0-dev" + }, + "replace": { + "symfony/doctrine-bridge": "self.version", + "symfony/monolog-bridge": "self.version", + "symfony/propel1-bridge": "self.version", + "symfony/swiftmailer-bridge": "self.version", + "symfony/twig-bridge": "self.version", + "symfony/framework-bundle": "self.version", + "symfony/security-bundle": "self.version", + "symfony/twig-bundle": "self.version", + "symfony/web-profiler-bundle": "self.version", + "symfony/browser-kit": "self.version", + "symfony/class-loader": "self.version", + "symfony/config": "self.version", + "symfony/console": "self.version", + "symfony/css-selector": "self.version", + "symfony/dependency-injection": "self.version", + "symfony/dom-crawler": "self.version", + "symfony/event-dispatcher": "self.version", + "symfony/filesystem": "self.version", + "symfony/finder": "self.version", + "symfony/form": "self.version", + "symfony/http-foundation": "self.version", + "symfony/http-kernel": "self.version", + "symfony/locale": "self.version", + "symfony/options-resolver": "self.version", + "symfony/process": "self.version", + "symfony/routing": "self.version", + "symfony/security": "self.version", + "symfony/serializer": "self.version", + "symfony/templating": "self.version", + "symfony/translation": "self.version", + "symfony/validator": "self.version", + "symfony/yaml": "self.version" + }, + "require-dev": { + "doctrine/dbal": ">=2.2,<2.4-dev", + "doctrine/orm": ">=2.2.3,<2.4-dev", + "doctrine/data-fixtures": "1.0.*", + "propel/propel1": "dev-master", + "monolog/monolog": "dev-master" + }, + "time": "2012-09-11 03:00:41", + "type": "library", + "extra": { + "branch-alias": { + "dev-master": "2.1-dev" + } + }, + "installation-source": "dist", + "autoload": { + "psr-0": { + "Symfony": "src/", + "SessionHandlerInterface": "src/Symfony/Component/HttpFoundation/Resources/stubs" + } + }, + "license": [ + "MIT" + ], + "authors": [ + { + "name": "Fabien Potencier", + "email": "fabien@symfony.com" + }, + { + "name": "Symfony Community", + "homepage": "http://symfony.com/contributors" + } + ], + "description": "The Symfony PHP framework", + "homepage": "http://symfony.com", + "keywords": [ + "framework" + ] }, { - "package": "swiftmailer/swiftmailer", - "version": "dev-master", - "source-reference": "c97353b1ebffe25a224146f69d17efe24c093def", - "commit-date": "1347083952" + "name": "twig/extensions", + "version": "v1.0.0-alpha", + "source": { + "type": "git", + "url": "https://github.com/fabpot/Twig-extensions", + "reference": "v1.0.0-alpha" + }, + "dist": { + "type": "zip", + "url": "https://github.com/fabpot/Twig-extensions/zipball/v1.0.0-alpha", + "reference": "v1.0.0-alpha", + "shasum": "" + }, + "require": { + "twig/twig": "1.*" + }, + "time": "2012-08-28 13:04:23", + "type": "library", + "extra": { + "branch-alias": { + "dev-master": "1.0.x-dev" + } + }, + "installation-source": "dist", + "autoload": { + "psr-0": { + "Twig_Extensions_": "lib/" + } + }, + "license": [ + "MIT" + ], + "authors": [ + { + "name": "Fabien Potencier", + "email": "fabien@symfony.com" + } + ], + "description": "Common additional features for Twig that do not directly belong in core", + "homepage": "https://github.com/fabpot/Twig-extensions", + "keywords": [ + "debug", + "i18n", + "text" + ] }, { - "package": "symfony/assetic-bundle", - "version": "dev-master", - "alias-pretty-version": "2.1.x-dev", - "alias-version": "2.1.9999999.9999999-dev" - }, - { - "package": "symfony/assetic-bundle", - "version": "dev-master", - "source-reference": "4e7e8a039fa19434f04558473adbb201118af942", - "commit-date": "1346199949" - }, - { - "package": "symfony/monolog-bundle", - "version": "dev-master", - "alias-pretty-version": "2.1.x-dev", - "alias-version": "2.1.9999999.9999999-dev" - }, - { - "package": "symfony/monolog-bundle", - "version": "dev-master", - "source-reference": "b7318480e6f8bf5579d6b3cd856850302e7ba8d8", - "commit-date": "1347283885" - }, - { - "package": "symfony/swiftmailer-bundle", - "version": "dev-master", - "alias-pretty-version": "2.1.x-dev", - "alias-version": "2.1.9999999.9999999-dev" - }, - { - "package": "symfony/swiftmailer-bundle", - "version": "dev-master", - "source-reference": "d2eae9385c029cbac031a90e6d2abc74b889a562", - "commit-date": "1346243146" - }, - { - "package": "symfony/symfony", - "version": "2.1.x-dev", - "source-reference": "v2.1.1", - "commit-date": "1347339641" - }, - { - "package": "twig/extensions", - "version": "dev-master", - "alias-pretty-version": "1.0.x-dev", - "alias-version": "1.0.9999999.9999999-dev" - }, - { - "package": "twig/extensions", - "version": "dev-master", - "source-reference": "f904575642b1213db69b4a98f08397e722ba1cae", - "commit-date": "1346770278" - }, - { - "package": "twig/twig", - "version": "dev-master", - "alias-pretty-version": "1.9.x-dev", - "alias-version": "1.9.9999999.9999999-dev" - }, - { - "package": "twig/twig", - "version": "dev-master", - "source-reference": "68b8c4619c5bbe82bd345fe56070dec8c356610a", - "commit-date": "1347025342" + "name": "twig/twig", + "version": "v1.9.2", + "source": { + "type": "git", + "url": "git://github.com/fabpot/Twig.git", + "reference": "v1.9.2" + }, + "dist": { + "type": "zip", + "url": "https://github.com/fabpot/Twig/zipball/v1.9.2", + "reference": "v1.9.2", + "shasum": "" + }, + "require": { + "php": ">=5.2.4" + }, + "time": "2012-08-25 15:32:57", + "type": "library", + "extra": { + "branch-alias": { + "dev-master": "1.9-dev" + } + }, + "installation-source": "dist", + "autoload": { + "psr-0": { + "Twig_": "lib/" + } + }, + "license": [ + "BSD-3" + ], + "authors": [ + { + "name": "Fabien Potencier", + "email": "fabien@symfony.com" + }, + { + "name": "Armin Ronacher", + "email": "armin.ronacher@active-4.com" + } + ], + "description": "Twig, the flexible, fast, and secure template language for PHP", + "homepage": "http://twig.sensiolabs.org", + "keywords": [ + "templating" + ] } ], - "packages-dev": null, + "packages-dev": [ + + ], "aliases": [ ], - "minimum-stability": "dev", + "minimum-stability": "alpha", "stability-flags": [ ] From d1544145cfe05459507e0005d3addaa7596a2b8f Mon Sep 17 00:00:00 2001 From: Fabien Potencier Date: Tue, 18 Sep 2012 13:17:12 +0200 Subject: [PATCH 566/899] reverted unwanted changes --- composer.json | 64 ++++++++++++++++++++++----------------------------- 1 file changed, 28 insertions(+), 36 deletions(-) diff --git a/composer.json b/composer.json index fbd11abc69..fd1aa0effc 100644 --- a/composer.json +++ b/composer.json @@ -1,49 +1,41 @@ { - "autoload": { - "psr-0": { - "": "src/" - } - }, - "config": { - "bin-dir": "vendor/bin" - }, + "name": "symfony/framework-standard-edition", "description": "The \"Symfony Standard Edition\" distribution", - "extra": { - "symfony-app-dir": "app", - "symfony-web-dir": "web" + "autoload": { + "psr-0": { "": "src/" } }, - "minimum-stability": "alpha", - "name": "symfony/framework-standard-edition", "require": { - "doctrine/doctrine-bundle": "1.0.*", - "doctrine/orm": ">=2.2.3,<2.4-dev", - "jms/di-extra-bundle": "1.1.*", - "jms/security-extra-bundle": "1.2.*", "php": ">=5.3.3", + "symfony/symfony": "2.1.*", + "doctrine/orm": ">=2.2.3,<2.4-dev", + "doctrine/doctrine-bundle": "1.0.*", + "twig/extensions": "1.0.*", + "symfony/assetic-bundle": "2.1.*", + "symfony/swiftmailer-bundle": "2.1.*", + "symfony/monolog-bundle": "2.1.*", "sensio/distribution-bundle": "2.1.*", "sensio/framework-extra-bundle": "2.1.*", "sensio/generator-bundle": "2.1.*", - "symfony/assetic-bundle": "2.1.*", - "symfony/monolog-bundle": "2.1.*", - "symfony/swiftmailer-bundle": "2.1.*", - "symfony/symfony": "2.1.*", - "twig/extensions": "1.0.*" - }, - "require-dev": { - "symfony/process": "2.1.*" + "jms/security-extra-bundle": "1.2.*", + "jms/di-extra-bundle": "1.1.*" }, "scripts": { "post-install-cmd": [ -"Sensio\\Bundle\\DistributionBundle\\Composer\\ScriptHandler::buildBootstrap", -"Sensio\\Bundle\\DistributionBundle\\Composer\\ScriptHandler::clearCache", -"Sensio\\Bundle\\DistributionBundle\\Composer\\ScriptHandler::installAssets", -"Sensio\\Bundle\\DistributionBundle\\Composer\\ScriptHandler::installRequirementsFile" - ], + "Sensio\\Bundle\\DistributionBundle\\Composer\\ScriptHandler::buildBootstrap", + "Sensio\\Bundle\\DistributionBundle\\Composer\\ScriptHandler::clearCache", + "Sensio\\Bundle\\DistributionBundle\\Composer\\ScriptHandler::installAssets", + "Sensio\\Bundle\\DistributionBundle\\Composer\\ScriptHandler::installRequirementsFile" + ], "post-update-cmd": [ -"Sensio\\Bundle\\DistributionBundle\\Composer\\ScriptHandler::buildBootstrap", -"Sensio\\Bundle\\DistributionBundle\\Composer\\ScriptHandler::clearCache", -"Sensio\\Bundle\\DistributionBundle\\Composer\\ScriptHandler::installAssets", -"Sensio\\Bundle\\DistributionBundle\\Composer\\ScriptHandler::installRequirementsFile" - ] + "Sensio\\Bundle\\DistributionBundle\\Composer\\ScriptHandler::buildBootstrap", + "Sensio\\Bundle\\DistributionBundle\\Composer\\ScriptHandler::clearCache", + "Sensio\\Bundle\\DistributionBundle\\Composer\\ScriptHandler::installAssets", + "Sensio\\Bundle\\DistributionBundle\\Composer\\ScriptHandler::installRequirementsFile" + ] + }, + "minimum-stability": "dev", + "extra": { + "symfony-app-dir": "app", + "symfony-web-dir": "web" } -} \ No newline at end of file +} From dff325057723643842cd25c2c4abb44885ce2412 Mon Sep 17 00:00:00 2001 From: Fabien Potencier Date: Tue, 18 Sep 2012 13:29:44 +0200 Subject: [PATCH 567/899] finished reverting previous changes --- app/SymfonyRequirements.php | 8 +- composer.lock | 286 +++++++++++++++++++----------------- 2 files changed, 156 insertions(+), 138 deletions(-) diff --git a/app/SymfonyRequirements.php b/app/SymfonyRequirements.php index 07636ca682..4df46d1102 100644 --- a/app/SymfonyRequirements.php +++ b/app/SymfonyRequirements.php @@ -477,13 +477,7 @@ function_exists('simplexml_import_dom'), $this->addPhpIniRequirement('detect_unicode', false); - ob_start(); - phpinfo(); - $phpinfo = ob_get_contents(); - ob_end_clean(); - - // the phpinfo check is necessary when Suhosin is compiled into PHP - if (extension_loaded('suhosin') || false !== strpos($phpinfo, 'Suhosin')) { + if (extension_loaded('suhosin')) { $this->addPhpIniRequirement( 'suhosin.executor.include.whitelist', create_function('$cfgValue', 'return false !== stripos($cfgValue, "phar");'), diff --git a/composer.lock b/composer.lock index 5281783391..e09e9f4979 100644 --- a/composer.lock +++ b/composer.lock @@ -1,31 +1,31 @@ { - "hash": "a70b1d65ec44f5bf4fe91ad87bae299b", + "hash": "871ca732d39c832f0b78012cc83cec2e", "packages": [ { "name": "doctrine/common", - "version": "2.3.0-RC3", + "version": "2.3.x-dev", "source": { "type": "git", "url": "https://github.com/doctrine/common", - "reference": "2.3.0-RC3" + "reference": "24c761bf0f8337064b961a8fad85631a561d26c7" }, "dist": { "type": "zip", - "url": "https://github.com/doctrine/common/zipball/2.3.0-RC3", - "reference": "2.3.0-RC3", + "url": "https://github.com/doctrine/common/zipball/24c761bf0f8337064b961a8fad85631a561d26c7", + "reference": "24c761bf0f8337064b961a8fad85631a561d26c7", "shasum": "" }, "require": { "php": ">=5.3.2" }, - "time": "2012-09-17 09:47:57", + "time": "1347882477", "type": "library", "extra": { "branch-alias": { "dev-master": "2.3.x-dev" } }, - "installation-source": "dist", + "installation-source": "source", "autoload": { "psr-0": { "Doctrine\\Common": "lib/" @@ -71,30 +71,30 @@ }, { "name": "doctrine/dbal", - "version": "2.3.0-RC4", + "version": "2.3.x-dev", "source": { "type": "git", "url": "https://github.com/doctrine/dbal", - "reference": "2.3.0-RC4" + "reference": "c4fe3499781944f7f2b056fd164cfedc67cc0130" }, "dist": { "type": "zip", - "url": "https://github.com/doctrine/dbal/zipball/2.3.0-RC4", - "reference": "2.3.0-RC4", + "url": "https://github.com/doctrine/dbal/zipball/c4fe3499781944f7f2b056fd164cfedc67cc0130", + "reference": "c4fe3499781944f7f2b056fd164cfedc67cc0130", "shasum": "" }, "require": { "php": ">=5.3.2", "doctrine/common": "2.3.*" }, - "time": "2012-09-17 09:50:07", + "time": "1347882607", "type": "library", "extra": { "branch-alias": { "dev-master": "2.3.x-dev" } }, - "installation-source": "dist", + "installation-source": "source", "autoload": { "psr-0": { "Doctrine\\DBAL": "lib/" @@ -133,41 +133,41 @@ }, { "name": "doctrine/doctrine-bundle", - "version": "v1.0.0", + "version": "dev-master", "target-dir": "Doctrine/Bundle/DoctrineBundle", "source": { "type": "git", "url": "git://github.com/doctrine/DoctrineBundle.git", - "reference": "v1.0.0" + "reference": "d3c930599723c8343472a5791b0f5909a4111a73" }, "dist": { "type": "zip", - "url": "https://github.com/doctrine/DoctrineBundle/zipball/v1.0.0", - "reference": "v1.0.0", + "url": "https://github.com/doctrine/DoctrineBundle/zipball/d3c930599723c8343472a5791b0f5909a4111a73", + "reference": "d3c930599723c8343472a5791b0f5909a4111a73", "shasum": "" }, "require": { "php": ">=5.3.2", + "doctrine/dbal": ">=2.2,<2.4-dev", "symfony/framework-bundle": "2.1.*", - "symfony/doctrine-bridge": "2.1.*", - "doctrine/dbal": ">=2.2,<2.4-dev" + "symfony/doctrine-bridge": "2.1.*" }, "require-dev": { "doctrine/orm": ">=2.2,<2.4-dev", - "symfony/yaml": "2.1.*", - "symfony/validator": "2.1.*" + "symfony/validator": "2.1.*", + "symfony/yaml": "2.1.*" }, "suggest": { "doctrine/orm": "The Doctrine ORM integration is optional in the bundle." }, - "time": "2012-09-07 19:18:21", + "time": "1347289964", "type": "symfony-bundle", "extra": { "branch-alias": { "dev-master": "1.0.x-dev" } }, - "installation-source": "dist", + "installation-source": "source", "autoload": { "psr-0": { "Doctrine\\Bundle\\DoctrineBundle": "" @@ -201,28 +201,28 @@ }, { "name": "doctrine/orm", - "version": "2.3.0-RC4", + "version": "2.3.x-dev", "source": { "type": "git", "url": "git://github.com/doctrine/doctrine2.git", - "reference": "2.3.0-RC4" + "reference": "c6101317cd71cbf320e96f4ce461f8a5a54bf56d" }, "dist": { "type": "zip", - "url": "https://github.com/doctrine/doctrine2/zipball/2.3.0-RC4", - "reference": "2.3.0-RC4", + "url": "https://github.com/doctrine/doctrine2/zipball/c6101317cd71cbf320e96f4ce461f8a5a54bf56d", + "reference": "c6101317cd71cbf320e96f4ce461f8a5a54bf56d", "shasum": "" }, "require": { "php": ">=5.3.2", "ext-pdo": "*", - "doctrine/dbal": "2.3.*", - "symfony/console": "2.*" + "symfony/console": "2.*", + "doctrine/dbal": "2.3.*" }, "suggest": { "symfony/yaml": "If you want to use YAML Metadata Mapping Driver" }, - "time": "2012-09-17 10:09:09", + "time": "1347883749", "bin": [ "bin/doctrine", "bin/doctrine.php" @@ -233,7 +233,7 @@ "dev-master": "2.3.x-dev" } }, - "installation-source": "dist", + "installation-source": "source", "autoload": { "psr-0": { "Doctrine\\ORM": "lib/" @@ -287,7 +287,7 @@ "symfony/framework-bundle": "2.*", "jms/cg": "1.0.0" }, - "time": "2012-01-02 19:50:26", + "time": "2012-01-02 20:50:26", "type": "symfony-bundle", "installation-source": "dist", "autoload": { @@ -329,7 +329,7 @@ "require": { "php": ">=5.3.0" }, - "time": "2012-01-02 19:40:52", + "time": "2012-01-02 20:40:52", "type": "library", "installation-source": "dist", "autoload": { @@ -355,27 +355,42 @@ }, { "name": "jms/di-extra-bundle", - "version": "1.1.0", + "version": "1.1.x-dev", "target-dir": "JMS/DiExtraBundle", "source": { "type": "git", "url": "https://github.com/schmittjoh/JMSDiExtraBundle", - "reference": "1.1.0" + "reference": "b94feeee8f57060598fdc7a3ef2527182b3946b5" }, "dist": { "type": "zip", - "url": "https://github.com/schmittjoh/JMSDiExtraBundle/zipball/1.1.0", - "reference": "1.1.0", + "url": "https://github.com/schmittjoh/JMSDiExtraBundle/zipball/b94feeee8f57060598fdc7a3ef2527182b3946b5", + "reference": "b94feeee8f57060598fdc7a3ef2527182b3946b5", "shasum": "" }, "require": { "symfony/framework-bundle": "2.1.*", "jms/aop-bundle": "1.0.*", - "jms/metadata": "1.1.*" + "jms/metadata": "1.1.*", + "symfony/process": "2.1.*", + "symfony/finder": "2.1.*" }, - "time": "2012-09-06 14:07:54", + "require-dev": { + "jms/security-extra-bundle": "1.*", + "symfony/validator": "*", + "symfony/form": "*", + "symfony/class-loader": "*", + "symfony/yaml": "*", + "symfony/browser-kit": "*", + "symfony/security-bundle": "*", + "symfony/twig-bundle": "*", + "sensio/framework-extra-bundle": "*", + "doctrine/doctrine-bundle": "*", + "doctrine/orm": "*" + }, + "time": "1347872946", "type": "symfony-bundle", - "installation-source": "dist", + "installation-source": "source", "autoload": { "psr-0": { "JMS\\DiExtraBundle": "" @@ -416,7 +431,7 @@ "require": { "php": ">=5.3.0" }, - "time": "2012-01-02 20:32:49", + "time": "2012-01-02 21:32:49", "type": "library", "installation-source": "dist", "autoload": { @@ -445,17 +460,17 @@ }, { "name": "jms/security-extra-bundle", - "version": "1.2.0", + "version": "1.2.x-dev", "target-dir": "JMS/SecurityExtraBundle", "source": { "type": "git", "url": "https://github.com/schmittjoh/JMSSecurityExtraBundle", - "reference": "1.2.0" + "reference": "9ab6aceda50fc7a2b07d741ba4b3f0695508afcb" }, "dist": { "type": "zip", - "url": "https://github.com/schmittjoh/JMSSecurityExtraBundle/zipball/1.2.0", - "reference": "1.2.0", + "url": "https://github.com/schmittjoh/JMSSecurityExtraBundle/zipball/9ab6aceda50fc7a2b07d741ba4b3f0695508afcb", + "reference": "9ab6aceda50fc7a2b07d741ba4b3f0695508afcb", "shasum": "" }, "require": { @@ -479,9 +494,9 @@ "symfony/form": "*", "symfony/validator": "*" }, - "time": "2012-09-06 14:12:03", + "time": "1346947943", "type": "symfony-bundle", - "installation-source": "dist", + "installation-source": "source", "autoload": { "psr-0": { "JMS\\SecurityExtraBundle": "" @@ -510,46 +525,51 @@ }, { "name": "kriswallsmith/assetic", - "version": "v1.1.0-alpha1", + "version": "dev-master", "source": { "type": "git", "url": "http://github.com/kriswallsmith/assetic.git", - "reference": "v1.1.0-alpha1" + "reference": "a6baab9b4c4361aca51bf90ee47c1586dff3cb0c" }, "dist": { "type": "zip", - "url": "https://github.com/kriswallsmith/assetic/zipball/v1.1.0-alpha1", - "reference": "v1.1.0-alpha1", + "url": "https://github.com/kriswallsmith/assetic/zipball/a6baab9b4c4361aca51bf90ee47c1586dff3cb0c", + "reference": "a6baab9b4c4361aca51bf90ee47c1586dff3cb0c", "shasum": "" }, "require": { - "php": ">=5.3.1", - "symfony/process": "2.1.*" + "symfony/process": "2.1.*", + "php": ">=5.3.1" }, "require-dev": { "twig/twig": ">=1.6.0,<2.0", "leafo/lessphp": "*", "leafo/scssphp": "*", - "ptachoire/cssembed": "*" + "ptachoire/cssembed": "*", + "leafo/scssphp-compass": "*" }, "suggest": { "twig/twig": "Assetic provides the integration with the Twig templating engine", "leafo/lessphp": "Assetic provides the integration with the lessphp LESS compiler", "leafo/scssphp": "Assetic provides the integration with the scssphp SCSS compiler", - "ptachoire/cssembed": "Assetic provides the integration with phpcssembed to embed data uris" + "ptachoire/cssembed": "Assetic provides the integration with phpcssembed to embed data uris", + "leafo/scssphp-compass": "Assetic provides the integration with the SCSS compass plugin" }, - "time": "2012-08-28 10:33:44", + "time": "1347622188", "type": "library", "extra": { "branch-alias": { "dev-master": "1.1-dev" } }, - "installation-source": "dist", + "installation-source": "source", "autoload": { "psr-0": { "Assetic": "src/" - } + }, + "files": [ + "src/functions.php" + ] }, "license": [ "MIT" @@ -571,16 +591,16 @@ }, { "name": "monolog/monolog", - "version": "1.2.1", + "version": "dev-master", "source": { "type": "git", "url": "https://github.com/Seldaek/monolog", - "reference": "1.2.1" + "reference": "0f3dc95c4a0ed7d17bec237d07af3da6c0c1071a" }, "dist": { "type": "zip", - "url": "https://github.com/Seldaek/monolog/zipball/1.2.1", - "reference": "1.2.1", + "url": "https://github.com/Seldaek/monolog/zipball/0f3dc95c4a0ed7d17bec237d07af3da6c0c1071a", + "reference": "0f3dc95c4a0ed7d17bec237d07af3da6c0c1071a", "shasum": "" }, "require": { @@ -594,14 +614,14 @@ "ext-amqp": "Allow sending log messages to an AMQP server (1.0+ required)", "ext-mongo": "Allow sending log messages to a MongoDB server" }, - "time": "2012-08-29 09:53:20", + "time": "1347363321", "type": "library", "extra": { "branch-alias": { "dev-master": "1.3.x-dev" } }, - "installation-source": "dist", + "installation-source": "source", "autoload": { "psr-0": { "Monolog": "src/" @@ -627,30 +647,30 @@ }, { "name": "sensio/distribution-bundle", - "version": "v2.1.0", + "version": "2.1.x-dev", "target-dir": "Sensio/Bundle/DistributionBundle", "source": { "type": "git", "url": "https://github.com/sensio/SensioDistributionBundle", - "reference": "v2.1.0" + "reference": "2eee3cb4cd761c851f0d766649fb9ff6f4c97002" }, "dist": { "type": "zip", - "url": "https://github.com/sensio/SensioDistributionBundle/zipball/v2.1.0", - "reference": "v2.1.0", + "url": "https://github.com/sensio/SensioDistributionBundle/zipball/2eee3cb4cd761c851f0d766649fb9ff6f4c97002", + "reference": "2eee3cb4cd761c851f0d766649fb9ff6f4c97002", "shasum": "" }, "require": { "symfony/framework-bundle": "2.1.*" }, - "time": "2012-09-05 13:32:12", + "time": "1347340208", "type": "symfony-bundle", "extra": { "branch-alias": { "dev-master": "2.1.x-dev" } }, - "installation-source": "dist", + "installation-source": "source", "autoload": { "psr-0": { "Sensio\\Bundle\\DistributionBundle": "" @@ -673,31 +693,31 @@ }, { "name": "sensio/framework-extra-bundle", - "version": "v2.1.0", + "version": "2.1.x-dev", "target-dir": "Sensio/Bundle/FrameworkExtraBundle", "source": { "type": "git", "url": "https://github.com/sensio/SensioFrameworkExtraBundle", - "reference": "v2.1.0" + "reference": "6d393099b17f301cc09a1d586292ed0b84763011" }, "dist": { "type": "zip", - "url": "https://github.com/sensio/SensioFrameworkExtraBundle/zipball/v2.1.0", - "reference": "v2.1.0", + "url": "https://github.com/sensio/SensioFrameworkExtraBundle/zipball/6d393099b17f301cc09a1d586292ed0b84763011", + "reference": "6d393099b17f301cc09a1d586292ed0b84763011", "shasum": "" }, "require": { "symfony/framework-bundle": "2.1.*", "doctrine/common": ">=2.1,<2.4-dev" }, - "time": "2012-08-29 08:02:19", + "time": "1347780475", "type": "symfony-bundle", "extra": { "branch-alias": { "dev-master": "2.1.x-dev" } }, - "installation-source": "dist", + "installation-source": "source", "autoload": { "psr-0": { "Sensio\\Bundle\\FrameworkExtraBundle": "" @@ -720,17 +740,17 @@ }, { "name": "sensio/generator-bundle", - "version": "v2.1.0", + "version": "dev-master", "target-dir": "Sensio/Bundle/GeneratorBundle", "source": { "type": "git", "url": "https://github.com/sensio/SensioGeneratorBundle", - "reference": "v2.1.0-RC2" + "reference": "v2.1.0" }, "dist": { "type": "zip", - "url": "https://github.com/sensio/SensioGeneratorBundle/zipball/v2.1.0-RC2", - "reference": "v2.1.0-RC2", + "url": "https://github.com/sensio/SensioGeneratorBundle/zipball/v2.1.0", + "reference": "v2.1.0", "shasum": "" }, "require": { @@ -741,14 +761,17 @@ "doctrine/orm": ">=2.1,<2.4-dev", "twig/twig": ">=1.8,<2.0-dev" }, - "time": "2012-08-28 05:16:11", + "suggest": { + "doctrine/doctrine-bundle": "to generate entities and their crud controller" + }, + "time": "1346138171", "type": "symfony-bundle", "extra": { "branch-alias": { "dev-master": "2.1.x-dev" } }, - "installation-source": "dist", + "installation-source": "source", "autoload": { "psr-0": { "Sensio\\Bundle\\GeneratorBundle": "" @@ -767,29 +790,29 @@ }, { "name": "swiftmailer/swiftmailer", - "version": "v4.2.1", + "version": "dev-master", "source": { "type": "git", "url": "git://github.com/swiftmailer/swiftmailer.git", - "reference": "v4.2.1" + "reference": "1e5482485f30a2431f9b8eb19a091eef4b57008c" }, "dist": { "type": "zip", - "url": "https://github.com/swiftmailer/swiftmailer/zipball/v4.2.1", - "reference": "v4.2.1", + "url": "https://github.com/swiftmailer/swiftmailer/zipball/1e5482485f30a2431f9b8eb19a091eef4b57008c", + "reference": "1e5482485f30a2431f9b8eb19a091eef4b57008c", "shasum": "" }, "require": { "php": ">=5.2.4" }, - "time": "2012-07-13 14:46:37", + "time": "1347542176", "type": "library", "extra": { "branch-alias": { "dev-master": "4.2-dev" } }, - "installation-source": "dist", + "installation-source": "source", "autoload": { "files": [ "lib/swift_required.php" @@ -816,17 +839,17 @@ }, { "name": "symfony/assetic-bundle", - "version": "v2.1.0", + "version": "dev-master", "target-dir": "Symfony/Bundle/AsseticBundle", "source": { "type": "git", "url": "https://github.com/symfony/AsseticBundle", - "reference": "v2.1.0-RC2" + "reference": "64345e86761444c35679e1aed424e1ed2370f0de" }, "dist": { "type": "zip", - "url": "https://github.com/symfony/AsseticBundle/zipball/v2.1.0-RC2", - "reference": "v2.1.0-RC2", + "url": "https://github.com/symfony/AsseticBundle/zipball/64345e86761444c35679e1aed424e1ed2370f0de", + "reference": "64345e86761444c35679e1aed424e1ed2370f0de", "shasum": "" }, "require": { @@ -846,14 +869,14 @@ "suggest": { "symfony/twig-bundle": "2.1.*" }, - "time": "2012-08-28 08:22:44", + "time": "1347626244", "type": "symfony-bundle", "extra": { "branch-alias": { "dev-master": "2.1.x-dev" } }, - "installation-source": "dist", + "installation-source": "source", "autoload": { "psr-0": { "Symfony\\Bundle\\AsseticBundle": "" @@ -879,38 +902,38 @@ }, { "name": "symfony/monolog-bundle", - "version": "v2.1.0", + "version": "dev-master", "target-dir": "Symfony/Bundle/MonologBundle", "source": { "type": "git", "url": "https://github.com/symfony/MonologBundle", - "reference": "v2.1.0-RC2" + "reference": "b7318480e6f8bf5579d6b3cd856850302e7ba8d8" }, "dist": { "type": "zip", - "url": "https://github.com/symfony/MonologBundle/zipball/v2.1.0-RC2", - "reference": "v2.1.0-RC2", + "url": "https://github.com/symfony/MonologBundle/zipball/b7318480e6f8bf5579d6b3cd856850302e7ba8d8", + "reference": "b7318480e6f8bf5579d6b3cd856850302e7ba8d8", "shasum": "" }, "require": { "php": ">=5.3.2", + "monolog/monolog": "1.*", "symfony/monolog-bridge": "2.1.*", "symfony/dependency-injection": "2.1.*", - "symfony/config": "2.1.*", - "monolog/monolog": "1.*" + "symfony/config": "2.1.*" }, "require-dev": { "symfony/yaml": "2.1.*", "symfony/config": "2.1.*" }, - "time": "2012-08-21 12:05:54", + "time": "1347283885", "type": "symfony-bundle", "extra": { "branch-alias": { "dev-master": "2.1.x-dev" } }, - "installation-source": "dist", + "installation-source": "source", "autoload": { "psr-0": { "Symfony\\Bundle\\MonologBundle": "" @@ -934,37 +957,38 @@ }, { "name": "symfony/swiftmailer-bundle", - "version": "v2.1.0", + "version": "dev-master", "target-dir": "Symfony/Bundle/SwiftmailerBundle", "source": { "type": "git", "url": "https://github.com/symfony/SwiftmailerBundle", - "reference": "v2.1.0" + "reference": "d2eae9385c029cbac031a90e6d2abc74b889a562" }, "dist": { "type": "zip", - "url": "https://github.com/symfony/SwiftmailerBundle/zipball/v2.1.0", - "reference": "v2.1.0", + "url": "https://github.com/symfony/SwiftmailerBundle/zipball/d2eae9385c029cbac031a90e6d2abc74b889a562", + "reference": "d2eae9385c029cbac031a90e6d2abc74b889a562", "shasum": "" }, "require": { "php": ">=5.3.2", - "swiftmailer/swiftmailer": ">=4.2.0,<4.3-dev", - "symfony/swiftmailer-bridge": "2.1.*" + "symfony/swiftmailer-bridge": "2.1.*", + "swiftmailer/swiftmailer": ">=4.2.0,<4.3-dev" }, "require-dev": { "symfony/dependency-injection": "2.1.*", "symfony/http-kernel": "2.1.*", - "symfony/config": "2.1.*" + "symfony/config": "2.1.*", + "symfony/yaml": "2.1.*" }, - "time": "2012-08-28 08:21:09", + "time": "1346243146", "type": "symfony-bundle", "extra": { "branch-alias": { "dev-master": "2.1-dev" } }, - "installation-source": "dist", + "installation-source": "source", "autoload": { "psr-0": { "Symfony\\Bundle\\SwiftmailerBundle": "" @@ -988,16 +1012,16 @@ }, { "name": "symfony/symfony", - "version": "v2.1.1", + "version": "2.1.x-dev", "source": { "type": "git", "url": "git://github.com/symfony/symfony.git", - "reference": "v2.1.1" + "reference": "ff1b990075be41c0b85702f2c9bde988d30f4d6b" }, "dist": { "type": "zip", - "url": "https://github.com/symfony/symfony/zipball/v2.1.1", - "reference": "v2.1.1", + "url": "https://github.com/symfony/symfony/zipball/ff1b990075be41c0b85702f2c9bde988d30f4d6b", + "reference": "ff1b990075be41c0b85702f2c9bde988d30f4d6b", "shasum": "" }, "require": { @@ -1046,14 +1070,14 @@ "propel/propel1": "dev-master", "monolog/monolog": "dev-master" }, - "time": "2012-09-11 03:00:41", + "time": "1347914517", "type": "library", "extra": { "branch-alias": { "dev-master": "2.1-dev" } }, - "installation-source": "dist", + "installation-source": "source", "autoload": { "psr-0": { "Symfony": "src/", @@ -1081,29 +1105,29 @@ }, { "name": "twig/extensions", - "version": "v1.0.0-alpha", + "version": "dev-master", "source": { "type": "git", "url": "https://github.com/fabpot/Twig-extensions", - "reference": "v1.0.0-alpha" + "reference": "f904575642b1213db69b4a98f08397e722ba1cae" }, "dist": { "type": "zip", - "url": "https://github.com/fabpot/Twig-extensions/zipball/v1.0.0-alpha", - "reference": "v1.0.0-alpha", + "url": "https://github.com/fabpot/Twig-extensions/zipball/f904575642b1213db69b4a98f08397e722ba1cae", + "reference": "f904575642b1213db69b4a98f08397e722ba1cae", "shasum": "" }, "require": { "twig/twig": "1.*" }, - "time": "2012-08-28 13:04:23", + "time": "1346770278", "type": "library", "extra": { "branch-alias": { "dev-master": "1.0.x-dev" } }, - "installation-source": "dist", + "installation-source": "source", "autoload": { "psr-0": { "Twig_Extensions_": "lib/" @@ -1128,29 +1152,29 @@ }, { "name": "twig/twig", - "version": "v1.9.2", + "version": "dev-master", "source": { "type": "git", "url": "git://github.com/fabpot/Twig.git", - "reference": "v1.9.2" + "reference": "b4d1d62b82e83c6fd3d5a6cd46a186de64275bb4" }, "dist": { "type": "zip", - "url": "https://github.com/fabpot/Twig/zipball/v1.9.2", - "reference": "v1.9.2", + "url": "https://github.com/fabpot/Twig/zipball/b4d1d62b82e83c6fd3d5a6cd46a186de64275bb4", + "reference": "b4d1d62b82e83c6fd3d5a6cd46a186de64275bb4", "shasum": "" }, "require": { "php": ">=5.2.4" }, - "time": "2012-08-25 15:32:57", + "time": "1347961095", "type": "library", "extra": { "branch-alias": { - "dev-master": "1.9-dev" + "dev-master": "1.10-dev" } }, - "installation-source": "dist", + "installation-source": "source", "autoload": { "psr-0": { "Twig_": "lib/" @@ -1182,7 +1206,7 @@ "aliases": [ ], - "minimum-stability": "alpha", + "minimum-stability": "dev", "stability-flags": [ ] From 1ca77023fd28c25ee0c579807907994818fe26b2 Mon Sep 17 00:00:00 2001 From: Fabien Potencier Date: Tue, 18 Sep 2012 16:40:45 +0200 Subject: [PATCH 568/899] disabled the profiler in the test environment to speed up tests --- UPGRADE-2.2.md | 11 +++++++++++ app/config/config_test.yml | 2 ++ 2 files changed, 13 insertions(+) create mode 100644 UPGRADE-2.2.md diff --git a/UPGRADE-2.2.md b/UPGRADE-2.2.md new file mode 100644 index 0000000000..d4b47d17e8 --- /dev/null +++ b/UPGRADE-2.2.md @@ -0,0 +1,11 @@ +UPGRADE FROM 2.1 to 2.2 +======================= + +Functional Tests +---------------- + + * The profiler has been disabled by default in the test environment. You can + enable it again by modifying the ``config_test.yml`` configuration file or + even better, you can just enable it for the very next request by calling + ``$client->enableProfiler()`` when you need the profiler in a test (that + speeds up functional tests quite a bit). diff --git a/app/config/config_test.yml b/app/config/config_test.yml index e7f44e50a3..f39c3cb972 100644 --- a/app/config/config_test.yml +++ b/app/config/config_test.yml @@ -5,6 +5,8 @@ framework: test: ~ session: storage_id: session.storage.mock_file + profiler: + enable: false web_profiler: toolbar: false From a30cc123e08101ac47801c2ea87bb7e6b4a0087e Mon Sep 17 00:00:00 2001 From: Fabien Potencier Date: Tue, 18 Sep 2012 21:33:37 +0200 Subject: [PATCH 569/899] updated deps --- composer.json | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/composer.json b/composer.json index 51c43b4955..8abc58a355 100644 --- a/composer.json +++ b/composer.json @@ -16,8 +16,8 @@ "sensio/distribution-bundle": "2.1.*", "sensio/framework-extra-bundle": "2.1.*", "sensio/generator-bundle": "2.1.*", - "jms/security-extra-bundle": "1.2.*", - "jms/di-extra-bundle": "1.1.*" + "jms/security-extra-bundle": "1.3.*", + "jms/di-extra-bundle": "1.2.*" }, "scripts": { "post-install-cmd": [ From e3e652a27e127a7ffb764294f4cf2d6e2f1a1578 Mon Sep 17 00:00:00 2001 From: Andreas Fischer Date: Mon, 6 Aug 2012 16:33:51 +0200 Subject: [PATCH 570/899] Improve wording of the comment about ApcClassLoader in app.php --- UPGRADE.md | 5 +++-- web/app.php | 5 +++-- 2 files changed, 6 insertions(+), 4 deletions(-) diff --git a/UPGRADE.md b/UPGRADE.md index bf65bac330..35c577b895 100644 --- a/UPGRADE.md +++ b/UPGRADE.md @@ -203,8 +203,9 @@ The default `web/app.php` file now reads as follows: $loader = require_once __DIR__.'/../app/bootstrap.php.cache'; - // Use APC for autoloading to improve performance - // Change 'sf2' by the prefix you want in order to prevent key conflict with another application + // Use APC for autoloading to improve performance. + // Change 'sf2' to a unique prefix in order to prevent cache key conflicts + // with other applications also using APC. /* $loader = new ApcClassLoader('sf2', $loader); $loader->register(true); diff --git a/web/app.php b/web/app.php index 2b4d5e794e..b70e120d35 100644 --- a/web/app.php +++ b/web/app.php @@ -5,8 +5,9 @@ $loader = require_once __DIR__.'/../app/bootstrap.php.cache'; -// Use APC for autoloading to improve performance -// Change 'sf2' by the prefix you want in order to prevent key conflict with another application +// Use APC for autoloading to improve performance. +// Change 'sf2' to a unique prefix in order to prevent cache key conflicts +// with other applications also using APC. /* $loader = new ApcClassLoader('sf2', $loader); $loader->register(true); From 807776dd4c04cf7c64b8f346fd9728d9ea6e5f35 Mon Sep 17 00:00:00 2001 From: Fabien Potencier Date: Thu, 20 Sep 2012 09:22:37 +0200 Subject: [PATCH 571/899] updated VENDORS for 2.1.2 --- composer.lock | 80 +++++++++++++++++++++++++-------------------------- 1 file changed, 39 insertions(+), 41 deletions(-) diff --git a/composer.lock b/composer.lock index e09e9f4979..67cc704bfd 100644 --- a/composer.lock +++ b/composer.lock @@ -7,18 +7,18 @@ "source": { "type": "git", "url": "https://github.com/doctrine/common", - "reference": "24c761bf0f8337064b961a8fad85631a561d26c7" + "reference": "bb0aebbf234db52df476a2b473d434745b34221c" }, "dist": { "type": "zip", - "url": "https://github.com/doctrine/common/zipball/24c761bf0f8337064b961a8fad85631a561d26c7", - "reference": "24c761bf0f8337064b961a8fad85631a561d26c7", + "url": "https://github.com/doctrine/common/zipball/bb0aebbf234db52df476a2b473d434745b34221c", + "reference": "bb0aebbf234db52df476a2b473d434745b34221c", "shasum": "" }, "require": { "php": ">=5.3.2" }, - "time": "1347882477", + "time": "1348120518", "type": "library", "extra": { "branch-alias": { @@ -75,19 +75,19 @@ "source": { "type": "git", "url": "https://github.com/doctrine/dbal", - "reference": "c4fe3499781944f7f2b056fd164cfedc67cc0130" + "reference": "fdc866a37959e43620e4f7ec519dc7dd8e30fc5b" }, "dist": { "type": "zip", - "url": "https://github.com/doctrine/dbal/zipball/c4fe3499781944f7f2b056fd164cfedc67cc0130", - "reference": "c4fe3499781944f7f2b056fd164cfedc67cc0130", + "url": "https://github.com/doctrine/dbal/zipball/fdc866a37959e43620e4f7ec519dc7dd8e30fc5b", + "reference": "fdc866a37959e43620e4f7ec519dc7dd8e30fc5b", "shasum": "" }, "require": { "php": ">=5.3.2", "doctrine/common": "2.3.*" }, - "time": "1347882607", + "time": "1348120597", "type": "library", "extra": { "branch-alias": { @@ -205,12 +205,12 @@ "source": { "type": "git", "url": "git://github.com/doctrine/doctrine2.git", - "reference": "c6101317cd71cbf320e96f4ce461f8a5a54bf56d" + "reference": "ea2b28857830720460a345c80c6e7d3f6adae93a" }, "dist": { "type": "zip", - "url": "https://github.com/doctrine/doctrine2/zipball/c6101317cd71cbf320e96f4ce461f8a5a54bf56d", - "reference": "c6101317cd71cbf320e96f4ce461f8a5a54bf56d", + "url": "https://github.com/doctrine/doctrine2/zipball/ea2b28857830720460a345c80c6e7d3f6adae93a", + "reference": "ea2b28857830720460a345c80c6e7d3f6adae93a", "shasum": "" }, "require": { @@ -222,7 +222,7 @@ "suggest": { "symfony/yaml": "If you want to use YAML Metadata Mapping Driver" }, - "time": "1347883749", + "time": "1348121015", "bin": [ "bin/doctrine", "bin/doctrine.php" @@ -509,7 +509,7 @@ { "name": "Johannes M. Schmitt", "email": "schmittjoh@gmail.com", - "homepage": "https://github.com/schmittjoh", + "homepage": "http://jmsyst.com", "role": "Developer of wrapped JMSSerializerBundle" } ], @@ -595,12 +595,12 @@ "source": { "type": "git", "url": "https://github.com/Seldaek/monolog", - "reference": "0f3dc95c4a0ed7d17bec237d07af3da6c0c1071a" + "reference": "09b3a80cfaf3e323e348a5e817afeee98d5e6b48" }, "dist": { "type": "zip", - "url": "https://github.com/Seldaek/monolog/zipball/0f3dc95c4a0ed7d17bec237d07af3da6c0c1071a", - "reference": "0f3dc95c4a0ed7d17bec237d07af3da6c0c1071a", + "url": "https://github.com/Seldaek/monolog/zipball/09b3a80cfaf3e323e348a5e817afeee98d5e6b48", + "reference": "09b3a80cfaf3e323e348a5e817afeee98d5e6b48", "shasum": "" }, "require": { @@ -614,7 +614,7 @@ "ext-amqp": "Allow sending log messages to an AMQP server (1.0+ required)", "ext-mongo": "Allow sending log messages to a MongoDB server" }, - "time": "1347363321", + "time": "1347983448", "type": "library", "extra": { "branch-alias": { @@ -652,12 +652,12 @@ "source": { "type": "git", "url": "https://github.com/sensio/SensioDistributionBundle", - "reference": "2eee3cb4cd761c851f0d766649fb9ff6f4c97002" + "reference": "v2.1.1" }, "dist": { "type": "zip", - "url": "https://github.com/sensio/SensioDistributionBundle/zipball/2eee3cb4cd761c851f0d766649fb9ff6f4c97002", - "reference": "2eee3cb4cd761c851f0d766649fb9ff6f4c97002", + "url": "https://github.com/sensio/SensioDistributionBundle/zipball/v2.1.1", + "reference": "v2.1.1", "shasum": "" }, "require": { @@ -698,19 +698,19 @@ "source": { "type": "git", "url": "https://github.com/sensio/SensioFrameworkExtraBundle", - "reference": "6d393099b17f301cc09a1d586292ed0b84763011" + "reference": "86a68df44eb50a64042d05a3f09548d2c21d4456" }, "dist": { "type": "zip", - "url": "https://github.com/sensio/SensioFrameworkExtraBundle/zipball/6d393099b17f301cc09a1d586292ed0b84763011", - "reference": "6d393099b17f301cc09a1d586292ed0b84763011", + "url": "https://github.com/sensio/SensioFrameworkExtraBundle/zipball/86a68df44eb50a64042d05a3f09548d2c21d4456", + "reference": "86a68df44eb50a64042d05a3f09548d2c21d4456", "shasum": "" }, "require": { "symfony/framework-bundle": "2.1.*", "doctrine/common": ">=2.1,<2.4-dev" }, - "time": "1347780475", + "time": "1348064274", "type": "symfony-bundle", "extra": { "branch-alias": { @@ -740,31 +740,29 @@ }, { "name": "sensio/generator-bundle", - "version": "dev-master", + "version": "2.1.x-dev", "target-dir": "Sensio/Bundle/GeneratorBundle", "source": { "type": "git", "url": "https://github.com/sensio/SensioGeneratorBundle", - "reference": "v2.1.0" + "reference": "3a65c9bf7d31aecacffc15a48f5eb2ece3615ef0" }, "dist": { "type": "zip", - "url": "https://github.com/sensio/SensioGeneratorBundle/zipball/v2.1.0", - "reference": "v2.1.0", + "url": "https://github.com/sensio/SensioGeneratorBundle/zipball/3a65c9bf7d31aecacffc15a48f5eb2ece3615ef0", + "reference": "3a65c9bf7d31aecacffc15a48f5eb2ece3615ef0", "shasum": "" }, "require": { - "symfony/framework-bundle": "2.1.*" + "symfony/framework-bundle": "2.1.*", + "symfony/console": "2.1.*" }, "require-dev": { "symfony/doctrine-bridge": "2.1.*", "doctrine/orm": ">=2.1,<2.4-dev", "twig/twig": ">=1.8,<2.0-dev" }, - "suggest": { - "doctrine/doctrine-bundle": "to generate entities and their crud controller" - }, - "time": "1346138171", + "time": "1348030981", "type": "symfony-bundle", "extra": { "branch-alias": { @@ -907,12 +905,12 @@ "source": { "type": "git", "url": "https://github.com/symfony/MonologBundle", - "reference": "b7318480e6f8bf5579d6b3cd856850302e7ba8d8" + "reference": "e1acd0a0da661bdb0f5378a60226ae6e30ec55c6" }, "dist": { "type": "zip", - "url": "https://github.com/symfony/MonologBundle/zipball/b7318480e6f8bf5579d6b3cd856850302e7ba8d8", - "reference": "b7318480e6f8bf5579d6b3cd856850302e7ba8d8", + "url": "https://github.com/symfony/MonologBundle/zipball/e1acd0a0da661bdb0f5378a60226ae6e30ec55c6", + "reference": "e1acd0a0da661bdb0f5378a60226ae6e30ec55c6", "shasum": "" }, "require": { @@ -926,7 +924,7 @@ "symfony/yaml": "2.1.*", "symfony/config": "2.1.*" }, - "time": "1347283885", + "time": "1347983520", "type": "symfony-bundle", "extra": { "branch-alias": { @@ -1016,12 +1014,12 @@ "source": { "type": "git", "url": "git://github.com/symfony/symfony.git", - "reference": "ff1b990075be41c0b85702f2c9bde988d30f4d6b" + "reference": "v2.1.2" }, "dist": { "type": "zip", - "url": "https://github.com/symfony/symfony/zipball/ff1b990075be41c0b85702f2c9bde988d30f4d6b", - "reference": "ff1b990075be41c0b85702f2c9bde988d30f4d6b", + "url": "https://github.com/symfony/symfony/zipball/v2.1.2", + "reference": "v2.1.2", "shasum": "" }, "require": { @@ -1070,7 +1068,7 @@ "propel/propel1": "dev-master", "monolog/monolog": "dev-master" }, - "time": "1347914517", + "time": "1348125180", "type": "library", "extra": { "branch-alias": { From 3114365100012ee5eaecd535952fcf22f30c8add Mon Sep 17 00:00:00 2001 From: Daniel Nieto Date: Wed, 26 Sep 2012 14:12:46 +0300 Subject: [PATCH 572/899] Update README.md If you don't include the version of the Symfony's installation, you'll get an error if you try to install with composer. --- README.md | 4 +++- 1 file changed, 3 insertions(+), 1 deletion(-) diff --git a/README.md b/README.md index 6a386d6942..b70ed0500e 100644 --- a/README.md +++ b/README.md @@ -26,7 +26,9 @@ http://getcomposer.org/ or just run the following command: Then, use the `create-project` command to generate a new Symfony application: - php composer.phar create-project symfony/framework-standard-edition path/to/install + php composer.phar create-project symfony/framework-standard-edition path/to/install 2.1.x-dev + +For an exact version, replace 2.1.x-dev with the latest Symfony version (e.g. 2.1.1). Composer will install Symfony and all its dependencies under the `path/to/install` directory. From 64422162cabe7c80b4780d6be4b686b164453705 Mon Sep 17 00:00:00 2001 From: Fabien Potencier Date: Sat, 29 Sep 2012 19:01:04 +0200 Subject: [PATCH 573/899] updated some bundles to 2.2 --- composer.json | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/composer.json b/composer.json index 8abc58a355..5e49eefe88 100644 --- a/composer.json +++ b/composer.json @@ -13,9 +13,9 @@ "symfony/assetic-bundle": "2.1.*", "symfony/swiftmailer-bundle": "2.1.*", "symfony/monolog-bundle": "2.1.*", - "sensio/distribution-bundle": "2.1.*", - "sensio/framework-extra-bundle": "2.1.*", - "sensio/generator-bundle": "2.1.*", + "sensio/distribution-bundle": "2.2.*", + "sensio/framework-extra-bundle": "2.2.*", + "sensio/generator-bundle": "2.2.*", "jms/security-extra-bundle": "1.3.*", "jms/di-extra-bundle": "1.2.*" }, From 7724fbcd69aa42f2f8f9e5c9bc02f31639b0399e Mon Sep 17 00:00:00 2001 From: Fabien Potencier Date: Sat, 29 Sep 2012 19:54:46 +0200 Subject: [PATCH 574/899] updated deps --- app/SymfonyRequirements.php | 10 +- composer.lock | 1298 +++++++++++++++++++++++++++++++---- 2 files changed, 1162 insertions(+), 146 deletions(-) diff --git a/app/SymfonyRequirements.php b/app/SymfonyRequirements.php index 07636ca682..586b45604b 100644 --- a/app/SymfonyRequirements.php +++ b/app/SymfonyRequirements.php @@ -477,13 +477,7 @@ function_exists('simplexml_import_dom'), $this->addPhpIniRequirement('detect_unicode', false); - ob_start(); - phpinfo(); - $phpinfo = ob_get_contents(); - ob_end_clean(); - - // the phpinfo check is necessary when Suhosin is compiled into PHP - if (extension_loaded('suhosin') || false !== strpos($phpinfo, 'Suhosin')) { + if (extension_loaded('suhosin')) { $this->addPhpIniRequirement( 'suhosin.executor.include.whitelist', create_function('$cfgValue', 'return false !== stripos($cfgValue, "phar");'), @@ -524,7 +518,7 @@ function_exists('simplexml_import_dom'), 'You should use at least PHP 5.3.4 due to PHP bug #52083 in earlier versions', 'Your project might malfunction randomly due to PHP bug #52083 ("Notice: Trying to get property of non-object"). Install PHP 5.3.4 or newer.' ); - + $this->addRecommendation( version_compare($installedPhpVersion, '5.3.8', '>='), 'When using annotations you should have at least PHP 5.3.8 due to PHP bug #55156', diff --git a/composer.lock b/composer.lock index dc79b1f3a1..173aa4759e 100644 --- a/composer.lock +++ b/composer.lock @@ -1,203 +1,1225 @@ { - "hash": "c2639bd4ac21bfd8d3fd08e114f2f759", + "hash": "6f0cd88e7a3895f9791ed2e6ab91c1c4", "packages": [ { - "package": "doctrine/common", + "name": "doctrine/common", "version": "2.3.x-dev", - "source-reference": "605b1b8b5a7bc8daf9111fb35483e5708e30de35", - "commit-date": "1346249247" + "source": { + "type": "git", + "url": "https://github.com/doctrine/common", + "reference": "bb0aebbf234db52df476a2b473d434745b34221c" + }, + "dist": { + "type": "zip", + "url": "https://github.com/doctrine/common/zipball/bb0aebbf234db52df476a2b473d434745b34221c", + "reference": "bb0aebbf234db52df476a2b473d434745b34221c", + "shasum": "" + }, + "require": { + "php": ">=5.3.2" + }, + "time": "1348120518", + "type": "library", + "extra": { + "branch-alias": { + "dev-master": "2.3.x-dev" + } + }, + "installation-source": "source", + "autoload": { + "psr-0": { + "Doctrine\\Common": "lib/" + } + }, + "license": [ + "MIT" + ], + "authors": [ + { + "name": "Jonathan Wage", + "email": "jonwage@gmail.com", + "homepage": "http://www.jwage.com/" + }, + { + "name": "Guilherme Blanco", + "email": "guilhermeblanco@gmail.com" + }, + { + "name": "Roman Borschel", + "email": "roman@code-factory.org" + }, + { + "name": "Benjamin Eberlei", + "email": "kontakt@beberlei.de" + }, + { + "name": "Johannes Schmitt", + "email": "schmittjoh@gmail.com", + "homepage": "http://jmsyst.com", + "role": "Developer of wrapped JMSSerializerBundle" + } + ], + "description": "Common Library for Doctrine projects", + "homepage": "http://www.doctrine-project.org", + "keywords": [ + "collections", + "spl", + "eventmanager", + "annotations", + "persistence" + ] }, { - "package": "doctrine/dbal", + "name": "doctrine/dbal", "version": "2.3.x-dev", - "source-reference": "239630b61f03f39d198441eced1bfffb7b0e61d1", - "commit-date": "1346866589" + "source": { + "type": "git", + "url": "https://github.com/doctrine/dbal", + "reference": "fdc866a37959e43620e4f7ec519dc7dd8e30fc5b" + }, + "dist": { + "type": "zip", + "url": "https://github.com/doctrine/dbal/zipball/fdc866a37959e43620e4f7ec519dc7dd8e30fc5b", + "reference": "fdc866a37959e43620e4f7ec519dc7dd8e30fc5b", + "shasum": "" + }, + "require": { + "php": ">=5.3.2", + "doctrine/common": "2.3.*" + }, + "time": "1348120597", + "type": "library", + "extra": { + "branch-alias": { + "dev-master": "2.3.x-dev" + } + }, + "installation-source": "source", + "autoload": { + "psr-0": { + "Doctrine\\DBAL": "lib/" + } + }, + "license": [ + "MIT" + ], + "authors": [ + { + "name": "Jonathan Wage", + "email": "jonwage@gmail.com", + "homepage": "http://www.jwage.com/" + }, + { + "name": "Guilherme Blanco", + "email": "guilhermeblanco@gmail.com" + }, + { + "name": "Roman Borschel", + "email": "roman@code-factory.org" + }, + { + "name": "Benjamin Eberlei", + "email": "kontakt@beberlei.de" + } + ], + "description": "Database Abstraction Layer", + "homepage": "http://www.doctrine-project.org", + "keywords": [ + "database", + "persistence", + "dbal", + "queryobject" + ] }, { - "package": "doctrine/doctrine-bundle", + "name": "doctrine/doctrine-bundle", "version": "dev-master", - "alias-pretty-version": "1.0.x-dev", - "alias-version": "1.0.9999999.9999999-dev" + "target-dir": "Doctrine/Bundle/DoctrineBundle", + "source": { + "type": "git", + "url": "git://github.com/doctrine/DoctrineBundle.git", + "reference": "db818ceec46d05fed4f944b957f82a4ab5197e27" + }, + "dist": { + "type": "zip", + "url": "https://github.com/doctrine/DoctrineBundle/zipball/db818ceec46d05fed4f944b957f82a4ab5197e27", + "reference": "db818ceec46d05fed4f944b957f82a4ab5197e27", + "shasum": "" + }, + "require": { + "php": ">=5.3.2", + "doctrine/dbal": ">=2.2,<2.4-dev", + "symfony/framework-bundle": ">=2.1,<2.3-dev", + "symfony/doctrine-bridge": ">=2.1,<2.3-dev" + }, + "require-dev": { + "doctrine/orm": ">=2.2,<2.4-dev", + "symfony/yaml": ">=2.1,<2.3-dev", + "symfony/validator": ">=2.1,<2.3-dev" + }, + "suggest": { + "doctrine/orm": "The Doctrine ORM integration is optional in the bundle." + }, + "time": "1348828243", + "type": "symfony-bundle", + "extra": { + "branch-alias": { + "dev-master": "1.0.x-dev" + } + }, + "installation-source": "source", + "autoload": { + "psr-0": { + "Doctrine\\Bundle\\DoctrineBundle": "" + } + }, + "license": [ + "MIT" + ], + "authors": [ + { + "name": "Fabien Potencier", + "email": "fabien@symfony.com" + }, + { + "name": "Symfony Community", + "homepage": "http://symfony.com/contributors" + }, + { + "name": "Benjamin Eberlei", + "email": "kontakt@beberlei.de" + } + ], + "description": "Symfony DoctrineBundle", + "homepage": "http://www.doctrine-project.org", + "keywords": [ + "database", + "orm", + "persistence", + "dbal" + ] }, { - "package": "doctrine/doctrine-bundle", - "version": "dev-master", - "source-reference": "3600872919186e1a40e8fd556e65f6dca6337cc9", - "commit-date": "1346617185" - }, - { - "package": "doctrine/orm", + "name": "doctrine/orm", "version": "2.3.x-dev", - "source-reference": "4d9f24b2eef3af3a3e76c773994c19bbb0706f88", - "commit-date": "1346869007" - }, - { - "package": "jms/aop-bundle", - "version": "1.0.0" - }, - { - "package": "jms/cg", - "version": "1.0.0" - }, - { - "package": "jms/di-extra-bundle", - "version": "1.1.x-dev", - "source-reference": "1.1.0-RC", - "commit-date": "1345140102" - }, - { - "package": "jms/metadata", - "version": "1.1.1" - }, - { - "package": "jms/security-extra-bundle", - "version": "1.2.x-dev", - "source-reference": "81070f525ec24f9e6cf6509532b260bc54c42ea5", - "commit-date": "1346345841" - }, - { - "package": "kriswallsmith/assetic", - "version": "dev-master", - "alias-pretty-version": "1.1.x-dev", - "alias-version": "1.1.9999999.9999999-dev" - }, - { - "package": "kriswallsmith/assetic", - "version": "dev-master", - "source-reference": "86b637e9f64ddcbd17d9eda944384812b5836254", - "commit-date": "1346695911" - }, - { - "package": "monolog/monolog", - "version": "dev-master", - "alias-pretty-version": "1.3.x-dev", - "alias-version": "1.3.9999999.9999999-dev" - }, - { - "package": "monolog/monolog", - "version": "dev-master", - "source-reference": "a929570bb7688b39fefe4106f0ecf0ac35f37647", - "commit-date": "1346873566" - }, - { - "package": "sensio/distribution-bundle", - "version": "dev-master", - "alias-pretty-version": "2.1.x-dev", - "alias-version": "2.1.9999999.9999999-dev" + "source": { + "type": "git", + "url": "git://github.com/doctrine/doctrine2.git", + "reference": "ea2b28857830720460a345c80c6e7d3f6adae93a" + }, + "dist": { + "type": "zip", + "url": "https://github.com/doctrine/doctrine2/zipball/ea2b28857830720460a345c80c6e7d3f6adae93a", + "reference": "ea2b28857830720460a345c80c6e7d3f6adae93a", + "shasum": "" + }, + "require": { + "php": ">=5.3.2", + "ext-pdo": "*", + "symfony/console": "2.*", + "doctrine/dbal": "2.3.*" + }, + "suggest": { + "symfony/yaml": "If you want to use YAML Metadata Mapping Driver" + }, + "time": "1348121015", + "bin": [ + "bin/doctrine", + "bin/doctrine.php" + ], + "type": "library", + "extra": { + "branch-alias": { + "dev-master": "2.3.x-dev" + } + }, + "installation-source": "source", + "autoload": { + "psr-0": { + "Doctrine\\ORM": "lib/" + } + }, + "license": [ + "MIT" + ], + "authors": [ + { + "name": "Jonathan Wage", + "email": "jonwage@gmail.com", + "homepage": "http://www.jwage.com/" + }, + { + "name": "Guilherme Blanco", + "email": "guilhermeblanco@gmail.com" + }, + { + "name": "Roman Borschel", + "email": "roman@code-factory.org" + }, + { + "name": "Benjamin Eberlei", + "email": "kontakt@beberlei.de" + } + ], + "description": "Object-Relational-Mapper for PHP", + "homepage": "http://www.doctrine-project.org", + "keywords": [ + "database", + "orm" + ] }, { - "package": "sensio/distribution-bundle", + "name": "jms/aop-bundle", "version": "dev-master", - "source-reference": "v2.1.0", - "commit-date": "1346859132" + "target-dir": "JMS/AopBundle", + "source": { + "type": "git", + "url": "https://github.com/schmittjoh/JMSAopBundle", + "reference": "03d725fde78abea8e1e1ed6af5f1c86c6b9446e1" + }, + "dist": { + "type": "zip", + "url": "https://github.com/schmittjoh/JMSAopBundle/zipball/03d725fde78abea8e1e1ed6af5f1c86c6b9446e1", + "reference": "03d725fde78abea8e1e1ed6af5f1c86c6b9446e1", + "shasum": "" + }, + "require": { + "symfony/framework-bundle": "2.*", + "jms/cg": "1.0.0" + }, + "time": "1348045406", + "type": "symfony-bundle", + "extra": { + "branch-alias": { + "dev-master": "1.1.0-dev" + } + }, + "installation-source": "source", + "autoload": { + "psr-0": { + "JMS\\AopBundle": "" + } + }, + "license": [ + "Apache" + ], + "authors": [ + { + "name": "Johannes M. Schmitt", + "email": "schmittjoh@gmail.com", + "homepage": "http://jmsyst.com", + "role": "Developer of wrapped JMSSerializerBundle" + } + ], + "description": "Adds AOP capabilities to Symfony2", + "keywords": [ + "annotations", + "aop" + ] }, { - "package": "sensio/framework-extra-bundle", - "version": "dev-master", - "alias-pretty-version": "2.1.x-dev", - "alias-version": "2.1.9999999.9999999-dev" - }, - { - "package": "sensio/framework-extra-bundle", - "version": "dev-master", - "source-reference": "v2.1.0", - "commit-date": "1346234539" + "name": "jms/cg", + "version": "1.0.0", + "source": { + "type": "git", + "url": "git://github.com/schmittjoh/cg-library.git", + "reference": "1.0.0" + }, + "dist": { + "type": "zip", + "url": "https://github.com/schmittjoh/cg-library/zipball/1.0.0", + "reference": "1.0.0", + "shasum": "" + }, + "require": { + "php": ">=5.3.0" + }, + "time": "2012-01-02 20:40:52", + "type": "library", + "installation-source": "dist", + "autoload": { + "psr-0": { + "CG\\": "src/" + } + }, + "license": [ + "Apache" + ], + "authors": [ + { + "name": "Johannes M. Schmitt", + "email": "schmittjoh@gmail.com", + "homepage": "http://jmsyst.com", + "role": "Developer of wrapped JMSSerializerBundle" + } + ], + "description": "Toolset for generating PHP code", + "keywords": [ + "code generation" + ] }, { - "package": "sensio/generator-bundle", + "name": "jms/di-extra-bundle", "version": "dev-master", - "alias-pretty-version": "2.1.x-dev", - "alias-version": "2.1.9999999.9999999-dev" + "target-dir": "JMS/DiExtraBundle", + "source": { + "type": "git", + "url": "https://github.com/schmittjoh/JMSDiExtraBundle", + "reference": "4cfdb1fe6e380578dd459e71c060f655a94e28d7" + }, + "dist": { + "type": "zip", + "url": "https://github.com/schmittjoh/JMSDiExtraBundle/zipball/4cfdb1fe6e380578dd459e71c060f655a94e28d7", + "reference": "4cfdb1fe6e380578dd459e71c060f655a94e28d7", + "shasum": "" + }, + "require": { + "jms/metadata": "1.1.*", + "symfony/framework-bundle": ">=2.1.0,<2.3-dev", + "symfony/process": ">=2.1.0,<2.3-dev", + "symfony/finder": ">=2.1.0,<2.3-dev", + "jms/aop-bundle": ">=1.0.0,<1.2-dev" + }, + "require-dev": { + "jms/security-extra-bundle": "1.*", + "symfony/validator": "*", + "symfony/form": "*", + "symfony/class-loader": "*", + "symfony/yaml": "*", + "symfony/browser-kit": "*", + "symfony/security-bundle": "*", + "symfony/twig-bundle": "*", + "sensio/framework-extra-bundle": "*", + "doctrine/doctrine-bundle": "*", + "doctrine/orm": "*" + }, + "time": "1348217858", + "type": "symfony-bundle", + "extra": { + "branch-alias": { + "dev-master": "1.2.x-dev" + } + }, + "installation-source": "source", + "autoload": { + "psr-0": { + "JMS\\DiExtraBundle": "" + } + }, + "license": [ + "Apache" + ], + "authors": [ + { + "name": "Johannes M. Schmitt", + "email": "schmittjoh@gmail.com", + "homepage": "https://github.com/schmittjoh", + "role": "Developer of wrapped JMSSerializerBundle" + } + ], + "description": "Allows to configure dependency injection using annotations", + "homepage": "http://jmsyst.com/bundles/JMSDiExtraBundle", + "keywords": [ + "dependency injection", + "annotations" + ] }, { - "package": "sensio/generator-bundle", - "version": "dev-master", - "source-reference": "v2.1.0-RC2", - "commit-date": "1346138171" - }, - { - "package": "swiftmailer/swiftmailer", - "version": "dev-master", - "alias-pretty-version": "4.2.x-dev", - "alias-version": "4.2.9999999.9999999-dev" + "name": "jms/metadata", + "version": "1.1.1", + "source": { + "type": "git", + "url": "https://github.com/schmittjoh/metadata", + "reference": "1.1.1" + }, + "dist": { + "type": "zip", + "url": "https://github.com/schmittjoh/metadata/zipball/1.1.1", + "reference": "1.1.1", + "shasum": "" + }, + "require": { + "php": ">=5.3.0" + }, + "time": "2012-01-02 21:32:49", + "type": "library", + "installation-source": "dist", + "autoload": { + "psr-0": { + "Metadata\\": "src/" + } + }, + "license": [ + "Apache" + ], + "authors": [ + { + "name": "Johannes M. Schmitt", + "email": "schmittjoh@gmail.com", + "homepage": "http://jmsyst.com", + "role": "Developer of wrapped JMSSerializerBundle" + } + ], + "description": "Class/method/property metadata management in PHP", + "keywords": [ + "annotations", + "yaml", + "xml", + "metadata" + ] }, { - "package": "swiftmailer/swiftmailer", + "name": "jms/security-extra-bundle", "version": "dev-master", - "source-reference": "e12e4ef3a9d6dd60fb734a01984a6e6627aea764", - "commit-date": "1345630910" + "target-dir": "JMS/SecurityExtraBundle", + "source": { + "type": "git", + "url": "https://github.com/schmittjoh/JMSSecurityExtraBundle", + "reference": "daa4e93edc6e89ce809a76edc0866dcb3feb3306" + }, + "dist": { + "type": "zip", + "url": "https://github.com/schmittjoh/JMSSecurityExtraBundle/zipball/daa4e93edc6e89ce809a76edc0866dcb3feb3306", + "reference": "daa4e93edc6e89ce809a76edc0866dcb3feb3306", + "shasum": "" + }, + "require": { + "jms/metadata": "1.1.*", + "symfony/security-bundle": "*", + "jms/di-extra-bundle": "1.2.*", + "symfony/framework-bundle": ">=2.1.0,<2.3-dev", + "jms/aop-bundle": ">=1.0.0,<1.2-dev" + }, + "require-dev": { + "sensio/framework-extra-bundle": "*", + "symfony/class-loader": "*", + "symfony/yaml": "*", + "symfony/browser-kit": "*", + "symfony/finder": "*", + "symfony/css-selector": "*", + "symfony/process": "*", + "doctrine/doctrine-bundle": "*", + "symfony/twig-bundle": "*", + "doctrine/orm": "*", + "symfony/form": "*", + "symfony/validator": "*" + }, + "time": "1348046640", + "type": "symfony-bundle", + "extra": { + "branch-alias": { + "dev-master": "1.3-dev" + } + }, + "installation-source": "source", + "autoload": { + "psr-0": { + "JMS\\SecurityExtraBundle": "" + } + }, + "license": [ + "Apache2" + ], + "authors": [ + { + "name": "Johannes M. Schmitt", + "email": "schmittjoh@gmail.com", + "homepage": "http://jmsyst.com", + "role": "Developer of wrapped JMSSerializerBundle" + } + ], + "description": "Enhances the Symfony2 Security Component by adding several new features", + "homepage": "http://jmsyst.com/bundles/JMSSecurityExtraBundle", + "keywords": [ + "annotations", + "authorization", + "security", + "secure", + "expression" + ] }, { - "package": "symfony/assetic-bundle", + "name": "kriswallsmith/assetic", "version": "dev-master", - "alias-pretty-version": "2.1.x-dev", - "alias-version": "2.1.9999999.9999999-dev" + "source": { + "type": "git", + "url": "http://github.com/kriswallsmith/assetic.git", + "reference": "a6baab9b4c4361aca51bf90ee47c1586dff3cb0c" + }, + "dist": { + "type": "zip", + "url": "https://github.com/kriswallsmith/assetic/zipball/a6baab9b4c4361aca51bf90ee47c1586dff3cb0c", + "reference": "a6baab9b4c4361aca51bf90ee47c1586dff3cb0c", + "shasum": "" + }, + "require": { + "symfony/process": ">=2.1.0,<2.3-dev", + "php": ">=5.3.1" + }, + "require-dev": { + "twig/twig": ">=1.6.0,<2.0", + "leafo/lessphp": "*", + "leafo/scssphp": "*", + "ptachoire/cssembed": "*", + "leafo/scssphp-compass": "*" + }, + "suggest": { + "twig/twig": "Assetic provides the integration with the Twig templating engine", + "leafo/lessphp": "Assetic provides the integration with the lessphp LESS compiler", + "leafo/scssphp": "Assetic provides the integration with the scssphp SCSS compiler", + "ptachoire/cssembed": "Assetic provides the integration with phpcssembed to embed data uris", + "leafo/scssphp-compass": "Assetic provides the integration with the SCSS compass plugin" + }, + "time": "1347622188", + "type": "library", + "extra": { + "branch-alias": { + "dev-master": "1.1-dev" + } + }, + "installation-source": "source", + "autoload": { + "psr-0": { + "Assetic": "src/" + }, + "files": [ + "src/functions.php" + ] + }, + "license": [ + "MIT" + ], + "authors": [ + { + "name": "Kris Wallsmith", + "email": "kris.wallsmith@gmail.com", + "homepage": "http://kriswallsmith.net/" + } + ], + "description": "Asset Management for PHP", + "homepage": "https://github.com/kriswallsmith/assetic", + "keywords": [ + "assets", + "compression", + "minification" + ] }, { - "package": "symfony/assetic-bundle", + "name": "monolog/monolog", "version": "dev-master", - "source-reference": "4e7e8a039fa19434f04558473adbb201118af942", - "commit-date": "1346199949" + "source": { + "type": "git", + "url": "https://github.com/Seldaek/monolog", + "reference": "09b3a80cfaf3e323e348a5e817afeee98d5e6b48" + }, + "dist": { + "type": "zip", + "url": "https://github.com/Seldaek/monolog/zipball/09b3a80cfaf3e323e348a5e817afeee98d5e6b48", + "reference": "09b3a80cfaf3e323e348a5e817afeee98d5e6b48", + "shasum": "" + }, + "require": { + "php": ">=5.3.0" + }, + "require-dev": { + "mlehner/gelf-php": "1.0.*" + }, + "suggest": { + "mlehner/gelf-php": "Allow sending log messages to a GrayLog2 server", + "ext-amqp": "Allow sending log messages to an AMQP server (1.0+ required)", + "ext-mongo": "Allow sending log messages to a MongoDB server" + }, + "time": "1347983448", + "type": "library", + "extra": { + "branch-alias": { + "dev-master": "1.3.x-dev" + } + }, + "installation-source": "source", + "autoload": { + "psr-0": { + "Monolog": "src/" + } + }, + "license": [ + "MIT" + ], + "authors": [ + { + "name": "Jordi Boggiano", + "email": "j.boggiano@seld.be", + "homepage": "http://seld.be", + "role": "Developer" + } + ], + "description": "Logging for PHP 5.3", + "homepage": "http://github.com/Seldaek/monolog", + "keywords": [ + "log", + "logging" + ] }, { - "package": "symfony/monolog-bundle", + "name": "sensio/distribution-bundle", "version": "dev-master", - "alias-pretty-version": "2.1.x-dev", - "alias-version": "2.1.9999999.9999999-dev" + "target-dir": "Sensio/Bundle/DistributionBundle", + "source": { + "type": "git", + "url": "https://github.com/sensio/SensioDistributionBundle", + "reference": "4e86595e02c6e3d76971f790d7c06ec434e1b513" + }, + "dist": { + "type": "zip", + "url": "https://github.com/sensio/SensioDistributionBundle/zipball/4e86595e02c6e3d76971f790d7c06ec434e1b513", + "reference": "4e86595e02c6e3d76971f790d7c06ec434e1b513", + "shasum": "" + }, + "require": { + "symfony/framework-bundle": "2.2.*" + }, + "time": "1347635342", + "type": "symfony-bundle", + "extra": { + "branch-alias": { + "dev-master": "2.2.x-dev" + } + }, + "installation-source": "source", + "autoload": { + "psr-0": { + "Sensio\\Bundle\\DistributionBundle": "" + } + }, + "license": [ + "MIT" + ], + "authors": [ + { + "name": "Fabien Potencier", + "email": "fabien@symfony.com" + } + ], + "description": "The base bundle for the Symfony Distributions", + "keywords": [ + "distribution", + "configuration" + ] }, { - "package": "symfony/monolog-bundle", + "name": "sensio/framework-extra-bundle", "version": "dev-master", - "source-reference": "v2.1.0-RC2", - "commit-date": "1345557954" + "target-dir": "Sensio/Bundle/FrameworkExtraBundle", + "source": { + "type": "git", + "url": "https://github.com/sensio/SensioFrameworkExtraBundle", + "reference": "03e32da3fd1bb37e4c6f3c77f1b4cb8a3a78e0a8" + }, + "dist": { + "type": "zip", + "url": "https://github.com/sensio/SensioFrameworkExtraBundle/zipball/03e32da3fd1bb37e4c6f3c77f1b4cb8a3a78e0a8", + "reference": "03e32da3fd1bb37e4c6f3c77f1b4cb8a3a78e0a8", + "shasum": "" + }, + "require": { + "doctrine/common": ">=2.1,<2.4-dev", + "symfony/framework-bundle": "2.2.*" + }, + "time": "1347340790", + "type": "symfony-bundle", + "extra": { + "branch-alias": { + "dev-master": "2.2.x-dev" + } + }, + "installation-source": "source", + "autoload": { + "psr-0": { + "Sensio\\Bundle\\FrameworkExtraBundle": "" + } + }, + "license": [ + "MIT" + ], + "authors": [ + { + "name": "Fabien Potencier", + "email": "fabien@symfony.com" + } + ], + "description": "This bundle provides a way to configure your controllers with annotations", + "keywords": [ + "annotations", + "controllers" + ] }, { - "package": "symfony/swiftmailer-bundle", + "name": "sensio/generator-bundle", "version": "dev-master", - "alias-pretty-version": "2.1.x-dev", - "alias-version": "2.1.9999999.9999999-dev" + "target-dir": "Sensio/Bundle/GeneratorBundle", + "source": { + "type": "git", + "url": "https://github.com/sensio/SensioGeneratorBundle", + "reference": "f5bda1014f5f124a0fd881644664493e36a09ad0" + }, + "dist": { + "type": "zip", + "url": "https://github.com/sensio/SensioGeneratorBundle/zipball/f5bda1014f5f124a0fd881644664493e36a09ad0", + "reference": "f5bda1014f5f124a0fd881644664493e36a09ad0", + "shasum": "" + }, + "require": { + "symfony/framework-bundle": "2.2.*", + "symfony/console": "2.2.*" + }, + "require-dev": { + "doctrine/orm": ">=2.1,<2.4-dev", + "twig/twig": ">=1.8,<2.0-dev", + "symfony/doctrine-bridge": "2.2.*" + }, + "suggest": { + "doctrine/doctrine-bundle": "to generate entities and their crud controller" + }, + "time": "1348070473", + "type": "symfony-bundle", + "extra": { + "branch-alias": { + "dev-master": "2.2.x-dev" + } + }, + "installation-source": "source", + "autoload": { + "psr-0": { + "Sensio\\Bundle\\GeneratorBundle": "" + } + }, + "license": [ + "MIT" + ], + "authors": [ + { + "name": "Fabien Potencier", + "email": "fabien@symfony.com" + } + ], + "description": "This bundle generates code for you" }, { - "package": "symfony/swiftmailer-bundle", + "name": "swiftmailer/swiftmailer", "version": "dev-master", - "source-reference": "d2eae9385c029cbac031a90e6d2abc74b889a562", - "commit-date": "1346243146" + "source": { + "type": "git", + "url": "git://github.com/swiftmailer/swiftmailer.git", + "reference": "1a987b45ea8dcbbe9680499800c67fc97a2d07f6" + }, + "dist": { + "type": "zip", + "url": "https://github.com/swiftmailer/swiftmailer/zipball/1a987b45ea8dcbbe9680499800c67fc97a2d07f6", + "reference": "1a987b45ea8dcbbe9680499800c67fc97a2d07f6", + "shasum": "" + }, + "require": { + "php": ">=5.2.4" + }, + "time": "1348747908", + "type": "library", + "extra": { + "branch-alias": { + "dev-master": "4.2-dev" + } + }, + "installation-source": "source", + "autoload": { + "files": [ + "lib/swift_required.php" + ] + }, + "license": [ + "LGPL" + ], + "authors": [ + { + "name": "Fabien Potencier", + "email": "fabien@symfony.com" + }, + { + "name": "Chris Corbyn" + } + ], + "description": "Swiftmailer, free feature-rich PHP mailer", + "homepage": "http://swiftmailer.org", + "keywords": [ + "mail", + "mailer" + ] }, { - "package": "symfony/symfony", + "name": "symfony/assetic-bundle", "version": "dev-master", - "alias-pretty-version": "2.1.x-dev", - "alias-version": "2.1.9999999.9999999-dev" + "target-dir": "Symfony/Bundle/AsseticBundle", + "source": { + "type": "git", + "url": "https://github.com/symfony/AsseticBundle", + "reference": "5ebcf72d9b2d7028ca8c9b71b464ccc81d4795d2" + }, + "dist": { + "type": "zip", + "url": "https://github.com/symfony/AsseticBundle/zipball/5ebcf72d9b2d7028ca8c9b71b464ccc81d4795d2", + "reference": "5ebcf72d9b2d7028ca8c9b71b464ccc81d4795d2", + "shasum": "" + }, + "require": { + "php": ">=5.3.0", + "kriswallsmith/assetic": "1.1.*", + "symfony/framework-bundle": ">=2.1.0,<2.3-dev" + }, + "require-dev": { + "symfony/twig-bundle": ">=2.1.0,<2.3-dev", + "symfony/console": ">=2.1.0,<2.3-dev", + "symfony/class-loader": ">=2.1.0,<2.3-dev", + "symfony/yaml": ">=2.1.0,<2.3-dev", + "symfony/form": ">=2.1.0,<2.3-dev", + "symfony/dom-crawler": ">=2.1.0,<2.3-dev", + "symfony/css-selector": ">=2.1.0,<2.3-dev" + }, + "suggest": { + "symfony/twig-bundle": ">=2.1.0,<2.3-dev" + }, + "time": "1348938560", + "type": "symfony-bundle", + "extra": { + "branch-alias": { + "dev-master": "2.1.x-dev" + } + }, + "installation-source": "source", + "autoload": { + "psr-0": { + "Symfony\\Bundle\\AsseticBundle": "" + } + }, + "license": [ + "MIT" + ], + "authors": [ + { + "name": "Kris Wallsmith", + "email": "kris.wallsmith@gmail.com", + "homepage": "http://kriswallsmith.net/" + } + ], + "description": "Integrates Assetic into Symfony2", + "homepage": "https://github.com/symfony/AsseticBundle", + "keywords": [ + "assets", + "compression", + "minification" + ] }, { - "package": "symfony/symfony", + "name": "symfony/monolog-bundle", "version": "dev-master", - "source-reference": "v2.1.0", - "commit-date": "1346922116" + "target-dir": "Symfony/Bundle/MonologBundle", + "source": { + "type": "git", + "url": "https://github.com/symfony/MonologBundle", + "reference": "51517152a608926ee6b40ed8cfbba1a708f0a14f" + }, + "dist": { + "type": "zip", + "url": "https://github.com/symfony/MonologBundle/zipball/51517152a608926ee6b40ed8cfbba1a708f0a14f", + "reference": "51517152a608926ee6b40ed8cfbba1a708f0a14f", + "shasum": "" + }, + "require": { + "php": ">=5.3.2", + "monolog/monolog": "1.*", + "symfony/monolog-bridge": ">=2.1.0,<2.3-dev", + "symfony/dependency-injection": ">=2.1.0,<2.3-dev", + "symfony/config": ">=2.1.0,<2.3-dev" + }, + "require-dev": { + "symfony/yaml": ">=2.1.0,<2.3-dev", + "symfony/config": ">=2.1.0,<2.3-dev" + }, + "time": "1348137624", + "type": "symfony-bundle", + "extra": { + "branch-alias": { + "dev-master": "2.1.x-dev" + } + }, + "installation-source": "source", + "autoload": { + "psr-0": { + "Symfony\\Bundle\\MonologBundle": "" + } + }, + "license": [ + "MIT" + ], + "authors": [ + { + "name": "Fabien Potencier", + "email": "fabien@symfony.com" + }, + { + "name": "Symfony Community", + "homepage": "http://symfony.com/contributors" + } + ], + "description": "Symfony MonologBundle", + "homepage": "http://symfony.com" }, { - "package": "twig/extensions", + "name": "symfony/swiftmailer-bundle", "version": "dev-master", - "alias-pretty-version": "1.0.x-dev", - "alias-version": "1.0.9999999.9999999-dev" + "target-dir": "Symfony/Bundle/SwiftmailerBundle", + "source": { + "type": "git", + "url": "https://github.com/symfony/SwiftmailerBundle", + "reference": "e055faf5d7279f3c01ffd58f1548e0fc524b71d1" + }, + "dist": { + "type": "zip", + "url": "https://github.com/symfony/SwiftmailerBundle/zipball/e055faf5d7279f3c01ffd58f1548e0fc524b71d1", + "reference": "e055faf5d7279f3c01ffd58f1548e0fc524b71d1", + "shasum": "" + }, + "require": { + "php": ">=5.3.2", + "swiftmailer/swiftmailer": ">=4.2.0,<4.3-dev", + "symfony/swiftmailer-bridge": ">=2.1.0,<2.3-dev" + }, + "require-dev": { + "symfony/dependency-injection": ">=2.1.0,<2.3-dev", + "symfony/http-kernel": ">=2.1.0,<2.3-dev", + "symfony/config": ">=2.1.0,<2.3-dev", + "symfony/yaml": ">=2.1.0,<2.3-dev" + }, + "time": "1348137776", + "type": "symfony-bundle", + "extra": { + "branch-alias": { + "dev-master": "2.1-dev" + } + }, + "installation-source": "source", + "autoload": { + "psr-0": { + "Symfony\\Bundle\\SwiftmailerBundle": "" + } + }, + "license": [ + "MIT" + ], + "authors": [ + { + "name": "Fabien Potencier", + "email": "fabien@symfony.com" + }, + { + "name": "Symfony Community", + "homepage": "http://symfony.com/contributors" + } + ], + "description": "Symfony SwiftmailerBundle", + "homepage": "http://symfony.com" }, { - "package": "twig/extensions", + "name": "symfony/symfony", "version": "dev-master", - "source-reference": "f904575642b1213db69b4a98f08397e722ba1cae", - "commit-date": "1346770278" + "source": { + "type": "git", + "url": "git://github.com/symfony/symfony.git", + "reference": "dda2f7cdb3ca084b3a13d28b61f8b54fdeb3f543" + }, + "dist": { + "type": "zip", + "url": "https://github.com/symfony/symfony/zipball/dda2f7cdb3ca084b3a13d28b61f8b54fdeb3f543", + "reference": "dda2f7cdb3ca084b3a13d28b61f8b54fdeb3f543", + "shasum": "" + }, + "require": { + "doctrine/common": ">2.2,<2.4-dev", + "php": ">=5.3.3", + "twig/twig": ">=1.9.1,<2.0-dev" + }, + "replace": { + "symfony/doctrine-bridge": "self.version", + "symfony/monolog-bridge": "self.version", + "symfony/propel1-bridge": "self.version", + "symfony/swiftmailer-bridge": "self.version", + "symfony/twig-bridge": "self.version", + "symfony/framework-bundle": "self.version", + "symfony/security-bundle": "self.version", + "symfony/twig-bundle": "self.version", + "symfony/web-profiler-bundle": "self.version", + "symfony/browser-kit": "self.version", + "symfony/class-loader": "self.version", + "symfony/config": "self.version", + "symfony/console": "self.version", + "symfony/css-selector": "self.version", + "symfony/dependency-injection": "self.version", + "symfony/dom-crawler": "self.version", + "symfony/event-dispatcher": "self.version", + "symfony/filesystem": "self.version", + "symfony/finder": "self.version", + "symfony/form": "self.version", + "symfony/http-foundation": "self.version", + "symfony/http-kernel": "self.version", + "symfony/locale": "self.version", + "symfony/options-resolver": "self.version", + "symfony/process": "self.version", + "symfony/routing": "self.version", + "symfony/security": "self.version", + "symfony/serializer": "self.version", + "symfony/templating": "self.version", + "symfony/translation": "self.version", + "symfony/validator": "self.version", + "symfony/yaml": "self.version" + }, + "require-dev": { + "doctrine/data-fixtures": "1.0.*", + "propel/propel1": "dev-master", + "monolog/monolog": "dev-master", + "doctrine/dbal": ">=2.2,<2.4-dev", + "doctrine/orm": ">=2.2.3,<2.4-dev" + }, + "suggest": { + "doctrine/data-fixtures": "1.0.*" + }, + "time": "1348937500", + "type": "library", + "extra": { + "branch-alias": { + "dev-master": "2.2-dev" + } + }, + "installation-source": "source", + "autoload": { + "psr-0": { + "Symfony\\": "src/" + }, + "classmap": [ + "src/Symfony/Component/HttpFoundation/Resources/stubs", + "src/Symfony/Component/Locale/Resources/stubs" + ] + }, + "license": [ + "MIT" + ], + "authors": [ + { + "name": "Fabien Potencier", + "email": "fabien@symfony.com" + }, + { + "name": "Symfony Community", + "homepage": "http://symfony.com/contributors" + } + ], + "description": "The Symfony PHP framework", + "homepage": "http://symfony.com", + "keywords": [ + "framework" + ] }, { - "package": "twig/twig", + "name": "twig/extensions", "version": "dev-master", - "alias-pretty-version": "1.9.x-dev", - "alias-version": "1.9.9999999.9999999-dev" + "source": { + "type": "git", + "url": "https://github.com/fabpot/Twig-extensions", + "reference": "f904575642b1213db69b4a98f08397e722ba1cae" + }, + "dist": { + "type": "zip", + "url": "https://github.com/fabpot/Twig-extensions/zipball/f904575642b1213db69b4a98f08397e722ba1cae", + "reference": "f904575642b1213db69b4a98f08397e722ba1cae", + "shasum": "" + }, + "require": { + "twig/twig": "1.*" + }, + "time": "1346770278", + "type": "library", + "extra": { + "branch-alias": { + "dev-master": "1.0.x-dev" + } + }, + "installation-source": "source", + "autoload": { + "psr-0": { + "Twig_Extensions_": "lib/" + } + }, + "license": [ + "MIT" + ], + "authors": [ + { + "name": "Fabien Potencier", + "email": "fabien@symfony.com" + } + ], + "description": "Common additional features for Twig that do not directly belong in core", + "homepage": "https://github.com/fabpot/Twig-extensions", + "keywords": [ + "debug", + "i18n", + "text" + ] }, { - "package": "twig/twig", + "name": "twig/twig", "version": "dev-master", - "source-reference": "459720ff3b74ee0c0d159277c6f2f5df89d8a4f6", - "commit-date": "1346397138" + "source": { + "type": "git", + "url": "git://github.com/fabpot/Twig.git", + "reference": "120cde3fa54c31047edf1cd003752ca119dec9a8" + }, + "dist": { + "type": "zip", + "url": "https://github.com/fabpot/Twig/zipball/120cde3fa54c31047edf1cd003752ca119dec9a8", + "reference": "120cde3fa54c31047edf1cd003752ca119dec9a8", + "shasum": "" + }, + "require": { + "php": ">=5.2.4" + }, + "time": "1348936415", + "type": "library", + "extra": { + "branch-alias": { + "dev-master": "1.10-dev" + } + }, + "installation-source": "source", + "autoload": { + "psr-0": { + "Twig_": "lib/" + } + }, + "license": [ + "BSD-3" + ], + "authors": [ + { + "name": "Fabien Potencier", + "email": "fabien@symfony.com" + }, + { + "name": "Armin Ronacher", + "email": "armin.ronacher@active-4.com" + } + ], + "description": "Twig, the flexible, fast, and secure template language for PHP", + "homepage": "http://twig.sensiolabs.org", + "keywords": [ + "templating" + ] } ], "packages-dev": [ From 9afa2c1a0d1f86c5aed1ec2aa6729da8942bb0c5 Mon Sep 17 00:00:00 2001 From: Stephen Ostrow Date: Mon, 1 Oct 2012 14:47:20 -0400 Subject: [PATCH 575/899] Correcting YAML Markup in app/config to be valid YAML 1.2o You cannot start a Plain Style Scalar with an Indicator (%). Play Style Scalars which have a leading % should be changed to double-quote style scalars. fixes #426 --- app/config/config.yml | 40 +++++++++++++++++++------------------- app/config/config_dev.yml | 2 +- app/config/config_prod.yml | 2 +- 3 files changed, 22 insertions(+), 22 deletions(-) diff --git a/app/config/config.yml b/app/config/config.yml index b812a36a87..6859cea0a4 100644 --- a/app/config/config.yml +++ b/app/config/config.yml @@ -4,56 +4,56 @@ imports: framework: #esi: ~ - #translator: { fallback: %locale% } - secret: %secret% + #translator: { fallback: "%locale%" } + secret: "%secret%" router: resource: "%kernel.root_dir%/config/routing.yml" - strict_requirements: %kernel.debug% + strict_requirements: "%kernel.debug%" form: true csrf_protection: true validation: { enable_annotations: true } templating: { engines: ['twig'] } #assets_version: SomeVersionScheme - default_locale: %locale% + default_locale: "%locale%" trust_proxy_headers: false # Whether or not the Request object should trust proxy headers (X_FORWARDED_FOR/HTTP_CLIENT_IP) session: ~ # Twig Configuration twig: - debug: %kernel.debug% - strict_variables: %kernel.debug% + debug: "%kernel.debug%" + strict_variables: "%kernel.debug%" # Assetic Configuration assetic: - debug: %kernel.debug% + debug: "%kernel.debug%" use_controller: false bundles: [ ] #java: /usr/bin/java filters: cssrewrite: ~ #closure: - # jar: %kernel.root_dir%/Resources/java/compiler.jar + # jar: "%kernel.root_dir%/Resources/java/compiler.jar" #yui_css: - # jar: %kernel.root_dir%/Resources/java/yuicompressor-2.4.7.jar + # jar: "%kernel.root_dir%/Resources/java/yuicompressor-2.4.7.jar" # Doctrine Configuration doctrine: dbal: - driver: %database_driver% - host: %database_host% - port: %database_port% - dbname: %database_name% - user: %database_user% - password: %database_password% + driver: "%database_driver%" + host: "%database_host%" + port: "%database_port%" + dbname: "%database_name%" + user: "%database_user%" + password: "%database_password%" charset: UTF8 orm: - auto_generate_proxy_classes: %kernel.debug% + auto_generate_proxy_classes: "%kernel.debug%" auto_mapping: true # Swiftmailer Configuration swiftmailer: - transport: %mailer_transport% - host: %mailer_host% - username: %mailer_user% - password: %mailer_password% + transport: "%mailer_transport%" + host: "%mailer_host%" + username: "%mailer_user%" + password: "%mailer_password%" spool: { type: memory } diff --git a/app/config/config_dev.yml b/app/config/config_dev.yml index b7e675da74..8dbf07b1a4 100644 --- a/app/config/config_dev.yml +++ b/app/config/config_dev.yml @@ -13,7 +13,7 @@ monolog: handlers: main: type: stream - path: %kernel.logs_dir%/%kernel.environment%.log + path: "%kernel.logs_dir%/%kernel.environment%.log" level: debug firephp: type: firephp diff --git a/app/config/config_prod.yml b/app/config/config_prod.yml index 0b91d4d885..332a137fa2 100644 --- a/app/config/config_prod.yml +++ b/app/config/config_prod.yml @@ -15,5 +15,5 @@ monolog: handler: nested nested: type: stream - path: %kernel.logs_dir%/%kernel.environment%.log + path: "%kernel.logs_dir%/%kernel.environment%.log" level: debug From 8c0334095f3fde6f0c0ac8387b192d7d2dffa331 Mon Sep 17 00:00:00 2001 From: Stephen Ostrow Date: Sat, 6 Oct 2012 01:27:59 -0400 Subject: [PATCH 576/899] You cannot start a Plain Style Scalar with an Indicator (%). Plain Style Scalars which have a leading % should be changed to double-quote style scalars. for #426 --- UPGRADE.md | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/UPGRADE.md b/UPGRADE.md index 1be8033266..caa467a021 100644 --- a/UPGRADE.md +++ b/UPGRADE.md @@ -77,13 +77,13 @@ a link cannot be generated): framework: router: - strict_requirements: %kernel.debug% + strict_requirements: "%kernel.debug%" The `default_locale` parameter is now a setting of the main `framework` configuration (it was under the `framework.session` in 2.0): framework: - default_locale: %locale% + default_locale: "%locale%" The `auto_start` setting under `framework.session` must be removed as it is not used anymore (the session is now always started on-demand). If From db0de7614595bfbed59c2226b7d232de0c812fbb Mon Sep 17 00:00:00 2001 From: Fabien Potencier Date: Mon, 15 Oct 2012 09:55:40 +0200 Subject: [PATCH 577/899] re-added travis file (missing due to a bad merge, refs #432) --- .travis.yml | 10 ++++++++++ 1 file changed, 10 insertions(+) create mode 100644 .travis.yml diff --git a/.travis.yml b/.travis.yml new file mode 100644 index 0000000000..8d9c285475 --- /dev/null +++ b/.travis.yml @@ -0,0 +1,10 @@ +language: php + +php: + - 5.3.3 + - 5.3 + - 5.4 + +before_script: composer install + +script: phpunit -c app From faad63785804869b3c61031d082f0270355c1b45 Mon Sep 17 00:00:00 2001 From: Fabien Potencier Date: Thu, 25 Oct 2012 11:03:53 +0200 Subject: [PATCH 578/899] updated VENDORS for 2.0.18 --- deps | 11 ++++++----- deps.lock | 12 ++++++------ 2 files changed, 12 insertions(+), 11 deletions(-) diff --git a/deps b/deps index ee98c78559..ce853fc3ab 100644 --- a/deps +++ b/deps @@ -1,14 +1,14 @@ [symfony] git=http://github.com/symfony/symfony.git - version=origin/2.0 + version=v2.0.18 [twig] git=http://github.com/fabpot/Twig.git - version=v1.9.2 + version=v1.10.3 [monolog] git=http://github.com/Seldaek/monolog.git - version=1.0.2 + version=1.2.1 [doctrine-common] git=http://github.com/doctrine/common.git @@ -24,14 +24,15 @@ [swiftmailer] git=http://github.com/swiftmailer/swiftmailer.git - version=v4.2.1 + version=v4.2.2 [assetic] git=http://github.com/kriswallsmith/assetic.git - version=v1.0.3 + version=v1.0.4 [twig-extensions] git=http://github.com/fabpot/Twig-extensions.git + version=v1.0.0-alpha [metadata] git=http://github.com/schmittjoh/metadata.git diff --git a/deps.lock b/deps.lock index 2e7a4bb491..89cde6b9c9 100644 --- a/deps.lock +++ b/deps.lock @@ -1,12 +1,12 @@ -symfony v2.0.17 -twig v1.9.2 -monolog 1.0.2 +symfony v2.0.18 +twig v1.10.3 +monolog 1.2.1 doctrine-common 2.1.4 doctrine-dbal 2.1.7 doctrine 2.1.7 -swiftmailer v4.2.1 -assetic v1.0.3 -twig-extensions feb6d3f10c411e2631997c0a905aa581c80305c1 +swiftmailer v4.2.2 +assetic v1.0.4 +twig-extensions v1.0.0-alpha metadata 1.0.0 SensioFrameworkExtraBundle v2.0.17 JMSSecurityExtraBundle e752f888c51425f71382c056961f10f2be642102 From d275d3d050936d6e5e2a162c131de17e000cc42c Mon Sep 17 00:00:00 2001 From: Fabien Potencier Date: Thu, 25 Oct 2012 11:05:20 +0200 Subject: [PATCH 579/899] updated vendors to dev branches --- deps | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/deps b/deps index ce853fc3ab..c22dc946fe 100644 --- a/deps +++ b/deps @@ -1,6 +1,6 @@ [symfony] git=http://github.com/symfony/symfony.git - version=v2.0.18 + version=origin/2.0 [twig] git=http://github.com/fabpot/Twig.git From 14a6d3feb668647f5c646869c96ff1dc738f58bf Mon Sep 17 00:00:00 2001 From: Michel Salib Date: Fri, 26 Oct 2012 15:26:03 +0300 Subject: [PATCH 580/899] Update app/config/config_test.yml Fix config typo --- app/config/config_test.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/app/config/config_test.yml b/app/config/config_test.yml index f39c3cb972..a27c240f9b 100644 --- a/app/config/config_test.yml +++ b/app/config/config_test.yml @@ -6,7 +6,7 @@ framework: session: storage_id: session.storage.mock_file profiler: - enable: false + enabled: false web_profiler: toolbar: false From 421e3306ce60e68deacce19ba03a32f7822cc3be Mon Sep 17 00:00:00 2001 From: TR Date: Fri, 26 Oct 2012 20:48:01 +0200 Subject: [PATCH 581/899] Update app/config/config.yml Adding note about sqlite databases needing a path parameter --- app/config/config.yml | 3 +++ 1 file changed, 3 insertions(+) diff --git a/app/config/config.yml b/app/config/config.yml index b812a36a87..f82edf367c 100644 --- a/app/config/config.yml +++ b/app/config/config.yml @@ -45,6 +45,9 @@ doctrine: user: %database_user% password: %database_password% charset: UTF8 + # if using pdo_sqlite as your database driver, add the path in parameters.yml + # e.g. database_path: %kernel.root_dir%/data/data.db3 + # path: %database_path% orm: auto_generate_proxy_classes: %kernel.debug% From 5c3e3b0ef8e32a7c9fa22e09e124744ed1238587 Mon Sep 17 00:00:00 2001 From: Fabien Potencier Date: Tue, 30 Oct 2012 09:20:16 +0100 Subject: [PATCH 582/899] updated VENDORS for 2.1.3 --- composer.lock | 192 +++++++++++++++++++++++++------------------------- 1 file changed, 97 insertions(+), 95 deletions(-) diff --git a/composer.lock b/composer.lock index 67cc704bfd..458219f3ea 100644 --- a/composer.lock +++ b/composer.lock @@ -75,19 +75,19 @@ "source": { "type": "git", "url": "https://github.com/doctrine/dbal", - "reference": "fdc866a37959e43620e4f7ec519dc7dd8e30fc5b" + "reference": "9395ca33971c0ff875d71a0271e6c0d5b0f01508" }, "dist": { "type": "zip", - "url": "https://github.com/doctrine/dbal/zipball/fdc866a37959e43620e4f7ec519dc7dd8e30fc5b", - "reference": "fdc866a37959e43620e4f7ec519dc7dd8e30fc5b", + "url": "https://github.com/doctrine/dbal/zipball/9395ca33971c0ff875d71a0271e6c0d5b0f01508", + "reference": "9395ca33971c0ff875d71a0271e6c0d5b0f01508", "shasum": "" }, "require": { "php": ">=5.3.2", "doctrine/common": "2.3.*" }, - "time": "1348120597", + "time": "1350419590", "type": "library", "extra": { "branch-alias": { @@ -111,7 +111,8 @@ }, { "name": "Guilherme Blanco", - "email": "guilhermeblanco@gmail.com" + "email": "guilhermeblanco@gmail.com", + "homepage": "http://www.instaclick.com" }, { "name": "Roman Borschel", @@ -138,29 +139,29 @@ "source": { "type": "git", "url": "git://github.com/doctrine/DoctrineBundle.git", - "reference": "d3c930599723c8343472a5791b0f5909a4111a73" + "reference": "a3b99ec049b7c488c70b8776a67c594e6ddf54cd" }, "dist": { "type": "zip", - "url": "https://github.com/doctrine/DoctrineBundle/zipball/d3c930599723c8343472a5791b0f5909a4111a73", - "reference": "d3c930599723c8343472a5791b0f5909a4111a73", + "url": "https://github.com/doctrine/DoctrineBundle/zipball/a3b99ec049b7c488c70b8776a67c594e6ddf54cd", + "reference": "a3b99ec049b7c488c70b8776a67c594e6ddf54cd", "shasum": "" }, "require": { "php": ">=5.3.2", "doctrine/dbal": ">=2.2,<2.4-dev", - "symfony/framework-bundle": "2.1.*", - "symfony/doctrine-bridge": "2.1.*" + "symfony/framework-bundle": ">=2.1,<2.3-dev", + "symfony/doctrine-bridge": ">=2.1,<2.3-dev" }, "require-dev": { "doctrine/orm": ">=2.2,<2.4-dev", - "symfony/validator": "2.1.*", - "symfony/yaml": "2.1.*" + "symfony/yaml": ">=2.1,<2.3-dev", + "symfony/validator": ">=2.1,<2.3-dev" }, "suggest": { "doctrine/orm": "The Doctrine ORM integration is optional in the bundle." }, - "time": "1347289964", + "time": "1350120716", "type": "symfony-bundle", "extra": { "branch-alias": { @@ -205,12 +206,12 @@ "source": { "type": "git", "url": "git://github.com/doctrine/doctrine2.git", - "reference": "ea2b28857830720460a345c80c6e7d3f6adae93a" + "reference": "6bad0109599348c5216df35f62b80a20ba16c507" }, "dist": { "type": "zip", - "url": "https://github.com/doctrine/doctrine2/zipball/ea2b28857830720460a345c80c6e7d3f6adae93a", - "reference": "ea2b28857830720460a345c80c6e7d3f6adae93a", + "url": "https://github.com/doctrine/doctrine2/zipball/6bad0109599348c5216df35f62b80a20ba16c507", + "reference": "6bad0109599348c5216df35f62b80a20ba16c507", "shasum": "" }, "require": { @@ -222,7 +223,7 @@ "suggest": { "symfony/yaml": "If you want to use YAML Metadata Mapping Driver" }, - "time": "1348121015", + "time": "1350071385", "bin": [ "bin/doctrine", "bin/doctrine.php" @@ -250,7 +251,8 @@ }, { "name": "Guilherme Blanco", - "email": "guilhermeblanco@gmail.com" + "email": "guilhermeblanco@gmail.com", + "homepage": "http://www.instaclick.com" }, { "name": "Roman Borschel", @@ -287,9 +289,9 @@ "symfony/framework-bundle": "2.*", "jms/cg": "1.0.0" }, - "time": "2012-01-02 20:50:26", + "time": "2012-01-02 12:50:26", "type": "symfony-bundle", - "installation-source": "dist", + "installation-source": "source", "autoload": { "psr-0": { "JMS\\AopBundle": "" @@ -360,12 +362,12 @@ "source": { "type": "git", "url": "https://github.com/schmittjoh/JMSDiExtraBundle", - "reference": "b94feeee8f57060598fdc7a3ef2527182b3946b5" + "reference": "1.1.1" }, "dist": { "type": "zip", - "url": "https://github.com/schmittjoh/JMSDiExtraBundle/zipball/b94feeee8f57060598fdc7a3ef2527182b3946b5", - "reference": "b94feeee8f57060598fdc7a3ef2527182b3946b5", + "url": "https://github.com/schmittjoh/JMSDiExtraBundle/zipball/1.1.1", + "reference": "1.1.1", "shasum": "" }, "require": { @@ -388,7 +390,7 @@ "doctrine/doctrine-bundle": "*", "doctrine/orm": "*" }, - "time": "1347872946", + "time": "1348217792", "type": "symfony-bundle", "installation-source": "source", "autoload": { @@ -529,16 +531,16 @@ "source": { "type": "git", "url": "http://github.com/kriswallsmith/assetic.git", - "reference": "a6baab9b4c4361aca51bf90ee47c1586dff3cb0c" + "reference": "a1b6fa1f7bb27c203b6c3cf7d0dd0184f8dffcdc" }, "dist": { "type": "zip", - "url": "https://github.com/kriswallsmith/assetic/zipball/a6baab9b4c4361aca51bf90ee47c1586dff3cb0c", - "reference": "a6baab9b4c4361aca51bf90ee47c1586dff3cb0c", + "url": "https://github.com/kriswallsmith/assetic/zipball/a1b6fa1f7bb27c203b6c3cf7d0dd0184f8dffcdc", + "reference": "a1b6fa1f7bb27c203b6c3cf7d0dd0184f8dffcdc", "shasum": "" }, "require": { - "symfony/process": "2.1.*", + "symfony/process": ">=2.1.0,<2.3-dev", "php": ">=5.3.1" }, "require-dev": { @@ -555,7 +557,7 @@ "ptachoire/cssembed": "Assetic provides the integration with phpcssembed to embed data uris", "leafo/scssphp-compass": "Assetic provides the integration with the SCSS compass plugin" }, - "time": "1347622188", + "time": "1351079542", "type": "library", "extra": { "branch-alias": { @@ -595,12 +597,12 @@ "source": { "type": "git", "url": "https://github.com/Seldaek/monolog", - "reference": "09b3a80cfaf3e323e348a5e817afeee98d5e6b48" + "reference": "38bb472abb27db138536f845f7d259c1c47bbd3f" }, "dist": { "type": "zip", - "url": "https://github.com/Seldaek/monolog/zipball/09b3a80cfaf3e323e348a5e817afeee98d5e6b48", - "reference": "09b3a80cfaf3e323e348a5e817afeee98d5e6b48", + "url": "https://github.com/Seldaek/monolog/zipball/38bb472abb27db138536f845f7d259c1c47bbd3f", + "reference": "38bb472abb27db138536f845f7d259c1c47bbd3f", "shasum": "" }, "require": { @@ -614,7 +616,7 @@ "ext-amqp": "Allow sending log messages to an AMQP server (1.0+ required)", "ext-mongo": "Allow sending log messages to a MongoDB server" }, - "time": "1347983448", + "time": "1351084926", "type": "library", "extra": { "branch-alias": { @@ -652,12 +654,12 @@ "source": { "type": "git", "url": "https://github.com/sensio/SensioDistributionBundle", - "reference": "v2.1.1" + "reference": "v2.1.3" }, "dist": { "type": "zip", - "url": "https://github.com/sensio/SensioDistributionBundle/zipball/v2.1.1", - "reference": "v2.1.1", + "url": "https://github.com/sensio/SensioDistributionBundle/zipball/v2.1.3", + "reference": "v2.1.3", "shasum": "" }, "require": { @@ -698,19 +700,19 @@ "source": { "type": "git", "url": "https://github.com/sensio/SensioFrameworkExtraBundle", - "reference": "86a68df44eb50a64042d05a3f09548d2c21d4456" + "reference": "v2.1.3" }, "dist": { "type": "zip", - "url": "https://github.com/sensio/SensioFrameworkExtraBundle/zipball/86a68df44eb50a64042d05a3f09548d2c21d4456", - "reference": "86a68df44eb50a64042d05a3f09548d2c21d4456", + "url": "https://github.com/sensio/SensioFrameworkExtraBundle/zipball/v2.1.3", + "reference": "v2.1.3", "shasum": "" }, "require": { "symfony/framework-bundle": "2.1.*", "doctrine/common": ">=2.1,<2.4-dev" }, - "time": "1348064274", + "time": "1350448707", "type": "symfony-bundle", "extra": { "branch-alias": { @@ -745,12 +747,12 @@ "source": { "type": "git", "url": "https://github.com/sensio/SensioGeneratorBundle", - "reference": "3a65c9bf7d31aecacffc15a48f5eb2ece3615ef0" + "reference": "v2.1.3" }, "dist": { "type": "zip", - "url": "https://github.com/sensio/SensioGeneratorBundle/zipball/3a65c9bf7d31aecacffc15a48f5eb2ece3615ef0", - "reference": "3a65c9bf7d31aecacffc15a48f5eb2ece3615ef0", + "url": "https://github.com/sensio/SensioGeneratorBundle/zipball/v2.1.3", + "reference": "v2.1.3", "shasum": "" }, "require": { @@ -788,22 +790,22 @@ }, { "name": "swiftmailer/swiftmailer", - "version": "dev-master", + "version": "v4.2.2", "source": { "type": "git", "url": "git://github.com/swiftmailer/swiftmailer.git", - "reference": "1e5482485f30a2431f9b8eb19a091eef4b57008c" + "reference": "v4.2.2" }, "dist": { "type": "zip", - "url": "https://github.com/swiftmailer/swiftmailer/zipball/1e5482485f30a2431f9b8eb19a091eef4b57008c", - "reference": "1e5482485f30a2431f9b8eb19a091eef4b57008c", + "url": "https://github.com/swiftmailer/swiftmailer/zipball/v4.2.2", + "reference": "v4.2.2", "shasum": "" }, "require": { "php": ">=5.2.4" }, - "time": "1347542176", + "time": "2012-10-25 01:30:40", "type": "library", "extra": { "branch-alias": { @@ -842,32 +844,32 @@ "source": { "type": "git", "url": "https://github.com/symfony/AsseticBundle", - "reference": "64345e86761444c35679e1aed424e1ed2370f0de" + "reference": "4eea8571954132e4715a5e756fe6a90a7e2d90f6" }, "dist": { "type": "zip", - "url": "https://github.com/symfony/AsseticBundle/zipball/64345e86761444c35679e1aed424e1ed2370f0de", - "reference": "64345e86761444c35679e1aed424e1ed2370f0de", + "url": "https://github.com/symfony/AsseticBundle/zipball/4eea8571954132e4715a5e756fe6a90a7e2d90f6", + "reference": "4eea8571954132e4715a5e756fe6a90a7e2d90f6", "shasum": "" }, "require": { "php": ">=5.3.0", - "symfony/framework-bundle": "2.1.*", - "kriswallsmith/assetic": "1.1.*" + "kriswallsmith/assetic": "1.1.*", + "symfony/framework-bundle": ">=2.1.0,<2.3-dev" }, "require-dev": { - "symfony/twig-bundle": "2.1.*", - "symfony/console": "2.1.*", - "symfony/class-loader": "2.1.*", - "symfony/yaml": "2.1.*", - "symfony/form": "2.1.*", - "symfony/dom-crawler": "2.1.*", - "symfony/css-selector": "2.1.*" + "symfony/twig-bundle": ">=2.1.0,<2.3-dev", + "symfony/console": ">=2.1.0,<2.3-dev", + "symfony/class-loader": ">=2.1.0,<2.3-dev", + "symfony/yaml": ">=2.1.0,<2.3-dev", + "symfony/form": ">=2.1.0,<2.3-dev", + "symfony/dom-crawler": ">=2.1.0,<2.3-dev", + "symfony/css-selector": ">=2.1.0,<2.3-dev" }, "suggest": { - "symfony/twig-bundle": "2.1.*" + "symfony/twig-bundle": ">=2.1.0,<2.3-dev" }, - "time": "1347626244", + "time": "1350864366", "type": "symfony-bundle", "extra": { "branch-alias": { @@ -905,26 +907,26 @@ "source": { "type": "git", "url": "https://github.com/symfony/MonologBundle", - "reference": "e1acd0a0da661bdb0f5378a60226ae6e30ec55c6" + "reference": "51517152a608926ee6b40ed8cfbba1a708f0a14f" }, "dist": { "type": "zip", - "url": "https://github.com/symfony/MonologBundle/zipball/e1acd0a0da661bdb0f5378a60226ae6e30ec55c6", - "reference": "e1acd0a0da661bdb0f5378a60226ae6e30ec55c6", + "url": "https://github.com/symfony/MonologBundle/zipball/51517152a608926ee6b40ed8cfbba1a708f0a14f", + "reference": "51517152a608926ee6b40ed8cfbba1a708f0a14f", "shasum": "" }, "require": { "php": ">=5.3.2", "monolog/monolog": "1.*", - "symfony/monolog-bridge": "2.1.*", - "symfony/dependency-injection": "2.1.*", - "symfony/config": "2.1.*" + "symfony/monolog-bridge": ">=2.1.0,<2.3-dev", + "symfony/dependency-injection": ">=2.1.0,<2.3-dev", + "symfony/config": ">=2.1.0,<2.3-dev" }, "require-dev": { - "symfony/yaml": "2.1.*", - "symfony/config": "2.1.*" + "symfony/yaml": ">=2.1.0,<2.3-dev", + "symfony/config": ">=2.1.0,<2.3-dev" }, - "time": "1347983520", + "time": "1348137624", "type": "symfony-bundle", "extra": { "branch-alias": { @@ -960,26 +962,26 @@ "source": { "type": "git", "url": "https://github.com/symfony/SwiftmailerBundle", - "reference": "d2eae9385c029cbac031a90e6d2abc74b889a562" + "reference": "2393ba6d4f1b544349123e24a16bbc749bef9e55" }, "dist": { "type": "zip", - "url": "https://github.com/symfony/SwiftmailerBundle/zipball/d2eae9385c029cbac031a90e6d2abc74b889a562", - "reference": "d2eae9385c029cbac031a90e6d2abc74b889a562", + "url": "https://github.com/symfony/SwiftmailerBundle/zipball/2393ba6d4f1b544349123e24a16bbc749bef9e55", + "reference": "2393ba6d4f1b544349123e24a16bbc749bef9e55", "shasum": "" }, "require": { "php": ">=5.3.2", - "symfony/swiftmailer-bridge": "2.1.*", - "swiftmailer/swiftmailer": ">=4.2.0,<4.3-dev" + "swiftmailer/swiftmailer": ">=4.2.0,<4.3-dev", + "symfony/swiftmailer-bridge": ">=2.1.0,<2.3-dev" }, "require-dev": { - "symfony/dependency-injection": "2.1.*", - "symfony/http-kernel": "2.1.*", - "symfony/config": "2.1.*", - "symfony/yaml": "2.1.*" + "symfony/dependency-injection": ">=2.1.0,<2.3-dev", + "symfony/http-kernel": ">=2.1.0,<2.3-dev", + "symfony/config": ">=2.1.0,<2.3-dev", + "symfony/yaml": ">=2.1.0,<2.3-dev" }, - "time": "1346243146", + "time": "1350447491", "type": "symfony-bundle", "extra": { "branch-alias": { @@ -1014,12 +1016,12 @@ "source": { "type": "git", "url": "git://github.com/symfony/symfony.git", - "reference": "v2.1.2" + "reference": "v2.1.3" }, "dist": { "type": "zip", - "url": "https://github.com/symfony/symfony/zipball/v2.1.2", - "reference": "v2.1.2", + "url": "https://github.com/symfony/symfony/zipball/v2.1.3", + "reference": "v2.1.3", "shasum": "" }, "require": { @@ -1066,9 +1068,9 @@ "doctrine/orm": ">=2.2.3,<2.4-dev", "doctrine/data-fixtures": "1.0.*", "propel/propel1": "dev-master", - "monolog/monolog": "dev-master" + "monolog/monolog": "1.*" }, - "time": "1348125180", + "time": "1351584854", "type": "library", "extra": { "branch-alias": { @@ -1107,18 +1109,18 @@ "source": { "type": "git", "url": "https://github.com/fabpot/Twig-extensions", - "reference": "f904575642b1213db69b4a98f08397e722ba1cae" + "reference": "dcdff02fbac1282e6b8f4d0558cc7e9580105688" }, "dist": { "type": "zip", - "url": "https://github.com/fabpot/Twig-extensions/zipball/f904575642b1213db69b4a98f08397e722ba1cae", - "reference": "f904575642b1213db69b4a98f08397e722ba1cae", + "url": "https://github.com/fabpot/Twig-extensions/zipball/dcdff02fbac1282e6b8f4d0558cc7e9580105688", + "reference": "dcdff02fbac1282e6b8f4d0558cc7e9580105688", "shasum": "" }, "require": { "twig/twig": "1.*" }, - "time": "1346770278", + "time": "1349889206", "type": "library", "extra": { "branch-alias": { @@ -1154,22 +1156,22 @@ "source": { "type": "git", "url": "git://github.com/fabpot/Twig.git", - "reference": "b4d1d62b82e83c6fd3d5a6cd46a186de64275bb4" + "reference": "0505c2fefd5eaa81c628b0cf8a9b8a2bc612321c" }, "dist": { "type": "zip", - "url": "https://github.com/fabpot/Twig/zipball/b4d1d62b82e83c6fd3d5a6cd46a186de64275bb4", - "reference": "b4d1d62b82e83c6fd3d5a6cd46a186de64275bb4", + "url": "https://github.com/fabpot/Twig/zipball/0505c2fefd5eaa81c628b0cf8a9b8a2bc612321c", + "reference": "0505c2fefd5eaa81c628b0cf8a9b8a2bc612321c", "shasum": "" }, "require": { "php": ">=5.2.4" }, - "time": "1347961095", + "time": "1351434618", "type": "library", "extra": { "branch-alias": { - "dev-master": "1.10-dev" + "dev-master": "1.11-dev" } }, "installation-source": "source", From 2c844059730cd793c868e7015b1f660933be0552 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?David=20Z=C3=BClke?= Date: Fri, 2 Nov 2012 20:15:44 +0100 Subject: [PATCH 583/899] Add fe80::1 to list of loopback addresses. MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit On my Mac, my loopback interface is configured (via `/etc/hosts`, out of the box) to have both a link-local and a node-local loopback address, with the link-local address taking precedence: ``` lo0: flags=8049 mtu 16384 options=3 inet6 fe80::1%lo0 prefixlen 64 scopeid 0x1  inet 127.0.0.1 netmask 0xff000000  inet6 ::1 prefixlen 128  ``` That obviously results in a `REMOTE_ADDR` of "fe80::1" rather than just "::1". --- web/app_dev.php | 1 + 1 file changed, 1 insertion(+) diff --git a/web/app_dev.php b/web/app_dev.php index 5a05245a6e..55bcc00540 100644 --- a/web/app_dev.php +++ b/web/app_dev.php @@ -12,6 +12,7 @@ || isset($_SERVER['HTTP_X_FORWARDED_FOR']) || !in_array(@$_SERVER['REMOTE_ADDR'], array( '127.0.0.1', + 'fe80::1', '::1', )) ) { From 9cfb9bd860e53121f47103dd5ebdd32cfe9b4107 Mon Sep 17 00:00:00 2001 From: Fabien Potencier Date: Sat, 3 Nov 2012 08:12:43 +0100 Subject: [PATCH 584/899] added fe80::1 as a local IP address in config.php --- web/app_dev.php | 6 +----- web/config.php | 5 +---- 2 files changed, 2 insertions(+), 9 deletions(-) diff --git a/web/app_dev.php b/web/app_dev.php index 55bcc00540..0cae19c83d 100644 --- a/web/app_dev.php +++ b/web/app_dev.php @@ -10,11 +10,7 @@ // Feel free to remove this, extend it, or make something more sophisticated. if (isset($_SERVER['HTTP_CLIENT_IP']) || isset($_SERVER['HTTP_X_FORWARDED_FOR']) - || !in_array(@$_SERVER['REMOTE_ADDR'], array( - '127.0.0.1', - 'fe80::1', - '::1', - )) + || !in_array(@$_SERVER['REMOTE_ADDR'], array('127.0.0.1', 'fe80::1', '::1')) ) { header('HTTP/1.0 403 Forbidden'); exit('You are not allowed to access this file. Check '.basename(__FILE__).' for more information.'); diff --git a/web/config.php b/web/config.php index ad215f31f2..957b8800d8 100644 --- a/web/config.php +++ b/web/config.php @@ -4,10 +4,7 @@ exit('This script cannot be run from the CLI. Run it from a browser.'); } -if (!in_array(@$_SERVER['REMOTE_ADDR'], array( - '127.0.0.1', - '::1', -))) { +if (!in_array(@$_SERVER['REMOTE_ADDR'], array('127.0.0.1', 'fe80::1', '::1'))) { header('HTTP/1.0 403 Forbidden'); exit('This script is only accessible from localhost.'); } From 302a41dc2b734c7d59397107db13c563685e1f15 Mon Sep 17 00:00:00 2001 From: pap-florin Date: Mon, 30 Jul 2012 13:28:07 +0300 Subject: [PATCH 585/899] Close not closed div tag in config.php (closes #378) --- web/config.php | 1 + 1 file changed, 1 insertion(+) diff --git a/web/config.php b/web/config.php index 4ad46b9210..508eb56ac8 100644 --- a/web/config.php +++ b/web/config.php @@ -205,6 +205,7 @@
    6. Re-check configuration
    +
    Symfony Standard Edition
    From 3cee635f1f9090181a680c3a1496b245d30a3679 Mon Sep 17 00:00:00 2001 From: Fabien Potencier Date: Mon, 5 Nov 2012 11:04:27 +0100 Subject: [PATCH 586/899] fixed links in the UPGRADE file (closes #431) --- UPGRADE.md | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/UPGRADE.md b/UPGRADE.md index caa467a021..663725498b 100644 --- a/UPGRADE.md +++ b/UPGRADE.md @@ -18,9 +18,9 @@ As of Symfony 2.1, project dependencies are managed by it is automatically generated by Composer. Download the default -[`composer.json`](https://raw.github.com/symfony/symfony-standard/master/composer.json) +[`composer.json`](https://raw.github.com/symfony/symfony-standard/2.1/composer.json) and -[`composer.lock`](https://raw.github.com/symfony/symfony-standard/master/composer.lock) +[`composer.lock`](https://raw.github.com/symfony/symfony-standard/2.1/composer.lock) files for Symfony 2.1 and put them into the main directory of your project. If you have customized your `deps` file, move the added dependencies to the `composer.json` file (many bundles and PHP libraries are already available as From 1264284d8e493862317f0a5f37e1ebe18dc49d68 Mon Sep 17 00:00:00 2001 From: Wouter J Date: Fri, 9 Nov 2012 22:35:18 +0100 Subject: [PATCH 587/899] Changed assertion to be more specific --- src/Acme/DemoBundle/Tests/Controller/DemoControllerTest.php | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/src/Acme/DemoBundle/Tests/Controller/DemoControllerTest.php b/src/Acme/DemoBundle/Tests/Controller/DemoControllerTest.php index 2941af9a18..6472ac7a05 100644 --- a/src/Acme/DemoBundle/Tests/Controller/DemoControllerTest.php +++ b/src/Acme/DemoBundle/Tests/Controller/DemoControllerTest.php @@ -12,6 +12,6 @@ public function testIndex() $crawler = $client->request('GET', '/demo/hello/Fabien'); - $this->assertTrue($crawler->filter('html:contains("Hello Fabien")')->count() > 0); + $this->assertGreaterThan(0, $crawler->filter('html:contains("Hello Fabien")')->count()); } } From bdb3c42e5357bd3f6e4f9d9324a1f6a383bc1fed Mon Sep 17 00:00:00 2001 From: Fabien Potencier Date: Sun, 11 Nov 2012 16:17:24 +0100 Subject: [PATCH 588/899] changed the Composer min-stability to stable (closes #420, #402) --- composer.json | 6 +++--- composer.lock | 19 ++++++++++--------- web/config.php | 5 ++++- 3 files changed, 17 insertions(+), 13 deletions(-) diff --git a/composer.json b/composer.json index fd1aa0effc..3792e33aef 100644 --- a/composer.json +++ b/composer.json @@ -9,7 +9,7 @@ "symfony/symfony": "2.1.*", "doctrine/orm": ">=2.2.3,<2.4-dev", "doctrine/doctrine-bundle": "1.0.*", - "twig/extensions": "1.0.*", + "twig/extensions": "1.0.*@dev", "symfony/assetic-bundle": "2.1.*", "symfony/swiftmailer-bundle": "2.1.*", "symfony/monolog-bundle": "2.1.*", @@ -17,7 +17,8 @@ "sensio/framework-extra-bundle": "2.1.*", "sensio/generator-bundle": "2.1.*", "jms/security-extra-bundle": "1.2.*", - "jms/di-extra-bundle": "1.1.*" + "jms/di-extra-bundle": "1.1.*", + "kriswallsmith/assetic": "1.1.*@dev" }, "scripts": { "post-install-cmd": [ @@ -33,7 +34,6 @@ "Sensio\\Bundle\\DistributionBundle\\Composer\\ScriptHandler::installRequirementsFile" ] }, - "minimum-stability": "dev", "extra": { "symfony-app-dir": "app", "symfony-web-dir": "web" diff --git a/composer.lock b/composer.lock index 458219f3ea..d655836c04 100644 --- a/composer.lock +++ b/composer.lock @@ -1,5 +1,5 @@ { - "hash": "871ca732d39c832f0b78012cc83cec2e", + "hash": "addf2541972b996b4b6ae1658b8e4591", "packages": [ { "name": "doctrine/common", @@ -531,12 +531,12 @@ "source": { "type": "git", "url": "http://github.com/kriswallsmith/assetic.git", - "reference": "a1b6fa1f7bb27c203b6c3cf7d0dd0184f8dffcdc" + "reference": "d6203098559cf9fc90e2890c10533d0adad33bd0" }, "dist": { "type": "zip", - "url": "https://github.com/kriswallsmith/assetic/zipball/a1b6fa1f7bb27c203b6c3cf7d0dd0184f8dffcdc", - "reference": "a1b6fa1f7bb27c203b6c3cf7d0dd0184f8dffcdc", + "url": "https://github.com/kriswallsmith/assetic/archive/d6203098559cf9fc90e2890c10533d0adad33bd0.zip", + "reference": "d6203098559cf9fc90e2890c10533d0adad33bd0", "shasum": "" }, "require": { @@ -557,7 +557,7 @@ "ptachoire/cssembed": "Assetic provides the integration with phpcssembed to embed data uris", "leafo/scssphp-compass": "Assetic provides the integration with the SCSS compass plugin" }, - "time": "1351079542", + "time": "1352285252", "type": "library", "extra": { "branch-alias": { @@ -1206,8 +1206,9 @@ "aliases": [ ], - "minimum-stability": "dev", - "stability-flags": [ - - ] + "minimum-stability": "stable", + "stability-flags": { + "twig/extensions": 20, + "kriswallsmith/assetic": 20 + } } diff --git a/web/config.php b/web/config.php index 957b8800d8..ad215f31f2 100644 --- a/web/config.php +++ b/web/config.php @@ -4,7 +4,10 @@ exit('This script cannot be run from the CLI. Run it from a browser.'); } -if (!in_array(@$_SERVER['REMOTE_ADDR'], array('127.0.0.1', 'fe80::1', '::1'))) { +if (!in_array(@$_SERVER['REMOTE_ADDR'], array( + '127.0.0.1', + '::1', +))) { header('HTTP/1.0 403 Forbidden'); exit('This script is only accessible from localhost.'); } From 4c86b92c707953f57e7fb893ebeac445663d67c0 Mon Sep 17 00:00:00 2001 From: Fabien Potencier Date: Mon, 12 Nov 2012 11:22:42 +0100 Subject: [PATCH 589/899] changed the default host fomr localhost to 127.0.0.1 (closes symfony/symfony#5987) --- app/config/parameters.ini | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/app/config/parameters.ini b/app/config/parameters.ini index 3628066c4f..b6ccb56673 100644 --- a/app/config/parameters.ini +++ b/app/config/parameters.ini @@ -3,7 +3,7 @@ ; Comments start with ';', as in php.ini [parameters] database_driver = pdo_mysql - database_host = localhost + database_host = 127.0.0.1 database_port = database_name = symfony database_user = root From 7bad42369ebbe88448513c6b8111323b706eea83 Mon Sep 17 00:00:00 2001 From: Fabien Potencier Date: Tue, 13 Nov 2012 14:24:12 +0100 Subject: [PATCH 590/899] refactored demo code based on the latest changes from Symfony (mainly about CSS and images) --- .../DemoBundle/Resources/public/css/demo.css | 263 +++--------------- .../Resources/views/Demo/index.html.twig | 2 +- .../Resources/views/Secured/hello.html.twig | 2 +- .../views/Secured/helloadmin.html.twig | 2 +- .../Resources/views/Secured/login.html.twig | 10 +- .../Resources/views/Welcome/index.html.twig | 26 +- .../Resources/views/layout.html.twig | 72 ++--- web/config.php | 44 ++- 8 files changed, 133 insertions(+), 288 deletions(-) diff --git a/src/Acme/DemoBundle/Resources/public/css/demo.css b/src/Acme/DemoBundle/Resources/public/css/demo.css index 0a9d8e2de3..4dd2f16c2f 100644 --- a/src/Acme/DemoBundle/Resources/public/css/demo.css +++ b/src/Acme/DemoBundle/Resources/public/css/demo.css @@ -1,61 +1,12 @@ -/* -Copyright (c) 2010, Yahoo! Inc. All rights reserved. -Code licensed under the BSD License: -http://developer.yahoo.com/yui/license.html -version: 2.8.2r1 - -Reset -*/ - -html{color:#000;background:#FFF;}body,div,dl,dt,dd,ul,ol,li,h1,h2,h3,h4,h5,h6,pre,code,form,fieldset,legend,input,button,textarea,p,blockquote,th,td{margin:0;padding:0;}table{border-collapse:collapse;border-spacing:0;}fieldset,img{border:0;}address,caption,cite,code,dfn,em,strong,th,var,optgroup{font-style:inherit;font-weight:inherit;}del,ins{text-decoration:none;}li{list-style:none;}caption,th{text-align:left;}h1,h2,h3,h4,h5,h6{font-size:100%;font-weight:normal;}q:before,q:after{content:'';}abbr,acronym{border:0;font-variant:normal;}sup{vertical-align:baseline;}sub{vertical-align:baseline;}legend{color:#000;}input,button,textarea,select,optgroup,option{font-family:inherit;font-size:inherit;font-style:inherit;font-weight:inherit;}input,button,textarea,select{*font-size:100%;} - -html, body -{ - background-color: #EFEFEF; -} - -body -{ - font-size: 14px; - font-family: "Lucida Sans Unicode", "Lucida Grande", Verdana, Arial, Helvetica, sans-serif; - color: #313131; +body { + font-size: 14px; + font-family: "Lucida Sans Unicode", "Lucida Grande", Verdana, Arial, Helvetica, sans-serif; } - -a -{ - color: #08C; - text-decoration: none; -} - -a:hover -{ - text-decoration: underline; -} - -strong -{ - font-weight: bold; -} - -em -{ - font-style: italic; -} - -h1, h2, h3 -{ - font-family: Georgia, "Times New Roman", Times, serif; - color: #404040; -} - -h1 -{ - font-size: 45px; +h1.title { + font-size: 45px; padding-bottom: 30px; } - -h2 -{ +.sf-reset h2 { font-weight: bold; color: #FFFFFF; /* Font is duplicated of body (sans-serif) */ @@ -68,161 +19,23 @@ h2 text-transform: uppercase; } - -p -{ +p { line-height: 20px; padding-bottom: 20px; } - -ul#demo-list a -{ +ul#demo-list a { background: url(../images/blue-arrow.png) no-repeat right 6px; padding-right: 10px; margin-right: 30px; } - -ul, ol -{ - padding-left: 20px; -} - -li -{ - padding-bottom: 18px; -} - -ol li -{ - list-style-type: decimal; -} - -ul li -{ - list-style-type: none; -} - -#symfony-header -{ +#symfony-header { position: relative; padding: 30px 30px 20px 30px; } - -#symfony-wrapper -{ - width: 970px; - margin: 0 auto; -} - -.symfony-content -{ - background-color: white; - border: 1px solid #DFDFDF; - padding: 50px; - -moz-border-radius: 16px; - -webkit-border-radius: 16px; - border-radius: 16px; - margin-bottom: 20px; - word-wrap: break-word; -} - -#symfony-search -{ - position: absolute; - top: 50px; - right: 30px; -} - -#symfony-search input[type="search"] -{ - -webkit-appearance: textfield; -} - -#symfony-search-field -{ - width: 190px; -} - -#symfony-search label -{ - display: block; - float: left; - width: 20px; - height: 25px; - background: url(../images/search.png) no-repeat left 5px; -} - -#symfony-search label span -{ - display: none; -} - -input[type=text], input[type=password] -{ - border: 1px solid #DADADA; - background: white url(../images/field-background.gif) repeat-x left top; - padding: 5px 6px; - color: #565656; - font-family: 'Lucida Sans Unicode', 'Lucida Grande', Verdana, Arial, Helvetica, sans-serif; - font-size: 12px; -} - -.symfony-button-grey, -.symfony-button-green -{ - font-size: 0.85em; - font-weight: bold; - - cursor: pointer; - - display: inline-block; - outline: none; - - text-align: center; - text-transform: uppercase; - - padding: 3px 10px; - - text-shadow: 0 1px 1px rgba(0,0,0,.3); - - -webkit-border-radius: 4px; - -moz-border-radius: 4px; - border-radius: 4px; -} - -.symfony-button-grey -{ - color: #868686; - font-weight: normal; - - padding: 5px 10px; - border: solid 1px #d7d7d7; - background: #ffffff; - background: -webkit-gradient(linear, left top, left bottom, from(#ffffff), to(#d7d7d7)); - background: -moz-linear-gradient(top, #ffffff, #d7d7d7); - filter: progid:DXImageTransform.Microsoft.gradient(startColorstr='#ffffff', endColorstr='#d7d7d7'); -} - -.symfony-button-green -{ - padding: 5px 12px; - - color: white; - - border: solid 1px #a7da39; - background: #a7da39; - background: -webkit-gradient(linear, left top, left bottom, from(#a7da39), to(#6a9211)); - background: -moz-linear-gradient(top, #a7da39, #6a9211); - filter: progid:DXImageTransform.Microsoft.gradient(startColorstr='#a7da39', endColorstr='#6a9211'); -} - -.symfony-blocks-welcome -{ +.sf-reset .symfony-blocks-welcome { overflow: hidden; } - -.symfony-blocks-welcome > div -{ +.sf-reset .symfony-blocks-welcome > div { background-color: whitesmoke; float: left; width: 240px; @@ -230,65 +43,59 @@ input[type=text], input[type=password] text-align: center; padding: 26px 20px; } - -.symfony-blocks-welcome > div.block-demo -{ +.sf-reset .symfony-blocks-welcome > div.block-demo { margin-right: 0; } - -.symfony-blocks-welcome .illustration -{ +.sf-reset .symfony-blocks-welcome .illustration { padding-bottom: 20px; } - -.symfony-blocks-help -{ +.sf-reset .symfony-blocks-help { overflow: hidden; } - -.symfony-blocks-help -{ +.sf-reset .symfony-blocks-help { margin-top: 30px; padding: 18px; border: 1px solid #E6E6E6; } - -.symfony-blocks-help > div -{ +.sf-reset .symfony-blocks-help > div { width: 254px; float: left; } - -.flash-message -{ +.flash-message { padding: 10px; margin: 5px; margin-top: 15px; background-color: #ffe; } - -.error -{ +.sf-reset .error { color: red; } - -#login label, #contact_form label -{ +#login label, #contact_form label { display: block; float: left; width: 90px; } - -ul#menu -{ +.sf-reset ul#menu { float: right; margin-bottom: 20px; padding-left: 0; } - -#menu li -{ +.sf-reset #menu li { padding-left: 0; margin-right: 10px; display: inline; } +.sf-reset a, +.sf-reset li a { + color: #08C; + text-decoration: none; +} +.sf-reset a:hover, +.sf-reset li a:hover { + color: #08C; + text-decoration: underline; +} +.sf-reset .symfony-content pre { + white-space: pre; + font-family: monospace; +} diff --git a/src/Acme/DemoBundle/Resources/views/Demo/index.html.twig b/src/Acme/DemoBundle/Resources/views/Demo/index.html.twig index 75f118d768..454a3203e4 100644 --- a/src/Acme/DemoBundle/Resources/views/Demo/index.html.twig +++ b/src/Acme/DemoBundle/Resources/views/Demo/index.html.twig @@ -5,7 +5,7 @@ {% block content_header '' %} {% block content %} -

    Available demos

    +

    Available demos

    • Hello World
    • Access the secured area Go to the login page
      • diff --git a/src/Acme/DemoBundle/Resources/views/Secured/hello.html.twig b/src/Acme/DemoBundle/Resources/views/Secured/hello.html.twig index c8da283832..faf95cf8c1 100644 --- a/src/Acme/DemoBundle/Resources/views/Secured/hello.html.twig +++ b/src/Acme/DemoBundle/Resources/views/Secured/hello.html.twig @@ -3,7 +3,7 @@ {% block title "Hello " ~ name %} {% block content %} -

      Hello {{ name }}!

      +

      Hello {{ name }}!

      Hello resource secured for admin only. {% endblock %} diff --git a/src/Acme/DemoBundle/Resources/views/Secured/helloadmin.html.twig b/src/Acme/DemoBundle/Resources/views/Secured/helloadmin.html.twig index 425213ee56..4e3649f77a 100644 --- a/src/Acme/DemoBundle/Resources/views/Secured/helloadmin.html.twig +++ b/src/Acme/DemoBundle/Resources/views/Secured/helloadmin.html.twig @@ -3,7 +3,7 @@ {% block title "Hello " ~ name %} {% block content %} -

      Hello {{ name }} secured for Admins only!

      +

      Hello {{ name }} secured for Admins only!

      {% endblock %} {% set code = code(_self) %} diff --git a/src/Acme/DemoBundle/Resources/views/Secured/login.html.twig b/src/Acme/DemoBundle/Resources/views/Secured/login.html.twig index 005175dc8b..e74a5aa7b6 100644 --- a/src/Acme/DemoBundle/Resources/views/Secured/login.html.twig +++ b/src/Acme/DemoBundle/Resources/views/Secured/login.html.twig @@ -1,7 +1,7 @@ {% extends 'AcmeDemoBundle::layout.html.twig' %} {% block content %} -

      Login

      +

      Login

      Choose between two default users: user/userpass (ROLE_USER) or admin/adminpass (ROLE_ADMIN) @@ -22,7 +22,13 @@

    - + {% endblock %} diff --git a/src/Acme/DemoBundle/Resources/views/Welcome/index.html.twig b/src/Acme/DemoBundle/Resources/views/Welcome/index.html.twig index e373981b39..ea3a7299b7 100644 --- a/src/Acme/DemoBundle/Resources/views/Welcome/index.html.twig +++ b/src/Acme/DemoBundle/Resources/views/Welcome/index.html.twig @@ -7,7 +7,7 @@ {% block content %} {% set version = constant('Symfony\\Component\\HttpKernel\\Kernel::MAJOR_VERSION') ~ '.' ~ constant('Symfony\\Component\\HttpKernel\\Kernel::MINOR_VERSION')%} -

    Welcome!

    +

    Welcome!

    Congratulations! You have successfully installed a new Symfony application.

    @@ -16,21 +16,39 @@
    Quick tour
    - Read the Quick Tour + + + + Read the Quick Tour + + + {% if app.environment == 'dev' %}
    Configure your application
    - Configure + + + + Configure + + +
    {% endif %}
    Demo
    - Run The Demo + + + + Run The Demo + + +
    diff --git a/src/Acme/DemoBundle/Resources/views/layout.html.twig b/src/Acme/DemoBundle/Resources/views/layout.html.twig index 3dd39368e2..d7e97d5638 100644 --- a/src/Acme/DemoBundle/Resources/views/layout.html.twig +++ b/src/Acme/DemoBundle/Resources/views/layout.html.twig @@ -1,49 +1,37 @@ - - - - - {% block title %}Demo Bundle{% endblock %} - - - - -
    -
    - - Symfony logo - - -
    +{% extends "TwigBundle::layout.html.twig" %} - {% for flashMessage in app.session.flashbag.get('notice') %} -
    - Notice: {{ flashMessage }} -
    - {% endfor %} +{% block head %} + + +{% endblock %} - {% block content_header %} - +{% block title 'Demo Bundle' %} -
    +{% block body %} + {% for flashMessage in app.session.flashbag.get('notice') %} +
    + Notice: {{ flashMessage }} +
    + {% endfor %} + + {% block content_header %} + + +
    + {% endblock %} -
    - {% block content %} - {% endblock %} -
    +
    + {% block content %}{% endblock %} +
    - {% if code is defined %} -

    Code behind this page

    -
    {{ code|raw }}
    - {% endif %} + {% if code is defined %} +

    Code behind this page

    +
    +
    {{ code|raw }}
    - - + {% endif %} +{% endblock %} diff --git a/web/config.php b/web/config.php index ad215f31f2..162acfc7b2 100644 --- a/web/config.php +++ b/web/config.php @@ -21,22 +21,48 @@ ?> - + - - + + Symfony Configuration + + + -
    -
    -
    -