From b3b733c55a325058236e4c21c73a5d0a4c5536e1 Mon Sep 17 00:00:00 2001 From: Fabien Potencier Date: Thu, 29 Nov 2012 12:44:37 +0100 Subject: [PATCH 1/9] updated VENDORS for 2.0.19 --- deps | 2 +- deps.lock | 4 ++-- 2 files changed, 3 insertions(+), 3 deletions(-) diff --git a/deps b/deps index c22dc946fe..21565d4822 100644 --- a/deps +++ b/deps @@ -1,6 +1,6 @@ [symfony] git=http://github.com/symfony/symfony.git - version=origin/2.0 + version=v2.0.19 [twig] git=http://github.com/fabpot/Twig.git diff --git a/deps.lock b/deps.lock index 89cde6b9c9..84ff2a8315 100644 --- a/deps.lock +++ b/deps.lock @@ -1,4 +1,4 @@ -symfony v2.0.18 +symfony v2.0.19 twig v1.10.3 monolog 1.2.1 doctrine-common 2.1.4 @@ -11,5 +11,5 @@ metadata 1.0.0 SensioFrameworkExtraBundle v2.0.17 JMSSecurityExtraBundle e752f888c51425f71382c056961f10f2be642102 SensioDistributionBundle v2.0.17 -SensioGeneratorBundle v2.0.17 +SensioGeneratorBundle v2.0.19 AsseticBundle 6f15728c1aefa5246caa83730e3dbf70b0d46052 From 7e2df63c9123637680fec78766c3d688a5a91c9a Mon Sep 17 00:00:00 2001 From: Fabien Potencier Date: Thu, 29 Nov 2012 12:46:36 +0100 Subject: [PATCH 2/9] updated vendors to dev branches --- deps | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/deps b/deps index 21565d4822..c22dc946fe 100644 --- a/deps +++ b/deps @@ -1,6 +1,6 @@ [symfony] git=http://github.com/symfony/symfony.git - version=v2.0.19 + version=origin/2.0 [twig] git=http://github.com/fabpot/Twig.git From 465c92e23f1df11bcba567d6cf9c2c1052e4969b Mon Sep 17 00:00:00 2001 From: Fabien Potencier Date: Thu, 29 Nov 2012 13:01:31 +0100 Subject: [PATCH 3/9] updated VENDORS for 2.1.4 --- app/SymfonyRequirements.php | 14 +- composer.lock | 264 ++++++++++++++++++------------------ 2 files changed, 143 insertions(+), 135 deletions(-) diff --git a/app/SymfonyRequirements.php b/app/SymfonyRequirements.php index 4df46d1102..0e416b8f05 100644 --- a/app/SymfonyRequirements.php +++ b/app/SymfonyRequirements.php @@ -500,9 +500,9 @@ function_exists('simplexml_import_dom'), $pcreVersion = defined('PCRE_VERSION') ? (float) PCRE_VERSION : null; $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+).' + null !== $pcreVersion, + 'PCRE extension must be available', + 'Install the PCRE extension (version 8.0+).' ); /* optional recommendations follow */ @@ -531,6 +531,14 @@ function_exists('simplexml_import_dom'), '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.' ); + if (null !== $pcreVersion) { + $this->addRecommendation( + $pcreVersion >= 8.0, + sprintf('PCRE extension should be at least version 8.0 (%s installed)', $pcreVersion), + 'PCRE 8.0+ is preconfigured in PHP since 5.3.2 but you are using an outdated version of it. Symfony probably works anyway but it is recommended to upgrade your PCRE extension.' + ); + } + $this->addRecommendation( class_exists('DomDocument'), 'PHP-XML module should be installed', diff --git a/composer.lock b/composer.lock index d655836c04..1d6145b6af 100644 --- a/composer.lock +++ b/composer.lock @@ -3,29 +3,29 @@ "packages": [ { "name": "doctrine/common", - "version": "2.3.x-dev", + "version": "2.3.0", "source": { "type": "git", "url": "https://github.com/doctrine/common", - "reference": "bb0aebbf234db52df476a2b473d434745b34221c" + "reference": "2.3.0" }, "dist": { "type": "zip", - "url": "https://github.com/doctrine/common/zipball/bb0aebbf234db52df476a2b473d434745b34221c", - "reference": "bb0aebbf234db52df476a2b473d434745b34221c", + "url": "https://github.com/doctrine/common/zipball/2.3.0", + "reference": "2.3.0", "shasum": "" }, "require": { "php": ">=5.3.2" }, - "time": "1348120518", + "time": "2012-09-19 22:55:18", "type": "library", "extra": { "branch-alias": { "dev-master": "2.3.x-dev" } }, - "installation-source": "source", + "installation-source": "dist", "autoload": { "psr-0": { "Doctrine\\Common": "lib/" @@ -42,7 +42,8 @@ }, { "name": "Guilherme Blanco", - "email": "guilhermeblanco@gmail.com" + "email": "guilhermeblanco@gmail.com", + "homepage": "http://www.instaclick.com" }, { "name": "Roman Borschel", @@ -71,30 +72,30 @@ }, { "name": "doctrine/dbal", - "version": "2.3.x-dev", + "version": "2.3.0", "source": { "type": "git", "url": "https://github.com/doctrine/dbal", - "reference": "9395ca33971c0ff875d71a0271e6c0d5b0f01508" + "reference": "2.3.0" }, "dist": { "type": "zip", - "url": "https://github.com/doctrine/dbal/zipball/9395ca33971c0ff875d71a0271e6c0d5b0f01508", - "reference": "9395ca33971c0ff875d71a0271e6c0d5b0f01508", + "url": "https://github.com/doctrine/dbal/zipball/2.3.0", + "reference": "2.3.0", "shasum": "" }, "require": { "php": ">=5.3.2", "doctrine/common": "2.3.*" }, - "time": "1350419590", + "time": "2012-09-19 22:56:37", "type": "library", "extra": { "branch-alias": { "dev-master": "2.3.x-dev" } }, - "installation-source": "source", + "installation-source": "dist", "autoload": { "psr-0": { "Doctrine\\DBAL": "lib/" @@ -134,41 +135,41 @@ }, { "name": "doctrine/doctrine-bundle", - "version": "dev-master", + "version": "v1.0.0", "target-dir": "Doctrine/Bundle/DoctrineBundle", "source": { "type": "git", "url": "git://github.com/doctrine/DoctrineBundle.git", - "reference": "a3b99ec049b7c488c70b8776a67c594e6ddf54cd" + "reference": "v1.0.0" }, "dist": { "type": "zip", - "url": "https://github.com/doctrine/DoctrineBundle/zipball/a3b99ec049b7c488c70b8776a67c594e6ddf54cd", - "reference": "a3b99ec049b7c488c70b8776a67c594e6ddf54cd", + "url": "https://github.com/doctrine/DoctrineBundle/zipball/v1.0.0", + "reference": "v1.0.0", "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" + "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,<2.3-dev", - "symfony/validator": ">=2.1,<2.3-dev" + "symfony/yaml": "2.1.*", + "symfony/validator": "2.1.*" }, "suggest": { "doctrine/orm": "The Doctrine ORM integration is optional in the bundle." }, - "time": "1350120716", + "time": "2012-09-07 14:18:21", "type": "symfony-bundle", "extra": { "branch-alias": { "dev-master": "1.0.x-dev" } }, - "installation-source": "source", + "installation-source": "dist", "autoload": { "psr-0": { "Doctrine\\Bundle\\DoctrineBundle": "" @@ -202,28 +203,28 @@ }, { "name": "doctrine/orm", - "version": "2.3.x-dev", + "version": "2.3.0", "source": { "type": "git", "url": "git://github.com/doctrine/doctrine2.git", - "reference": "6bad0109599348c5216df35f62b80a20ba16c507" + "reference": "2.3.0" }, "dist": { "type": "zip", - "url": "https://github.com/doctrine/doctrine2/zipball/6bad0109599348c5216df35f62b80a20ba16c507", - "reference": "6bad0109599348c5216df35f62b80a20ba16c507", + "url": "https://github.com/doctrine/doctrine2/zipball/2.3.0", + "reference": "2.3.0", "shasum": "" }, "require": { "php": ">=5.3.2", "ext-pdo": "*", - "symfony/console": "2.*", - "doctrine/dbal": "2.3.*" + "doctrine/dbal": "2.3.*", + "symfony/console": "2.*" }, "suggest": { "symfony/yaml": "If you want to use YAML Metadata Mapping Driver" }, - "time": "1350071385", + "time": "2012-09-19 23:03:34", "bin": [ "bin/doctrine", "bin/doctrine.php" @@ -234,7 +235,7 @@ "dev-master": "2.3.x-dev" } }, - "installation-source": "source", + "installation-source": "dist", "autoload": { "psr-0": { "Doctrine\\ORM": "lib/" @@ -291,7 +292,7 @@ }, "time": "2012-01-02 12:50:26", "type": "symfony-bundle", - "installation-source": "source", + "installation-source": "dist", "autoload": { "psr-0": { "JMS\\AopBundle": "" @@ -331,7 +332,7 @@ "require": { "php": ">=5.3.0" }, - "time": "2012-01-02 20:40:52", + "time": "2012-01-02 12:40:52", "type": "library", "installation-source": "dist", "autoload": { @@ -357,7 +358,7 @@ }, { "name": "jms/di-extra-bundle", - "version": "1.1.x-dev", + "version": "1.1.1", "target-dir": "JMS/DiExtraBundle", "source": { "type": "git", @@ -372,13 +373,12 @@ }, "require": { "symfony/framework-bundle": "2.1.*", - "jms/aop-bundle": "1.0.*", - "jms/metadata": "1.1.*", "symfony/process": "2.1.*", - "symfony/finder": "2.1.*" + "symfony/finder": "2.1.*", + "jms/aop-bundle": "1.0.*", + "jms/metadata": "1.1.*" }, "require-dev": { - "jms/security-extra-bundle": "1.*", "symfony/validator": "*", "symfony/form": "*", "symfony/class-loader": "*", @@ -387,12 +387,13 @@ "symfony/security-bundle": "*", "symfony/twig-bundle": "*", "sensio/framework-extra-bundle": "*", + "jms/security-extra-bundle": "1.*", "doctrine/doctrine-bundle": "*", "doctrine/orm": "*" }, - "time": "1348217792", + "time": "2012-09-21 01:56:32", "type": "symfony-bundle", - "installation-source": "source", + "installation-source": "dist", "autoload": { "psr-0": { "JMS\\DiExtraBundle": "" @@ -405,7 +406,7 @@ { "name": "Johannes M. Schmitt", "email": "schmittjoh@gmail.com", - "homepage": "http://jmsyst.com", + "homepage": "https://github.com/schmittjoh", "role": "Developer of wrapped JMSSerializerBundle" } ], @@ -433,7 +434,7 @@ "require": { "php": ">=5.3.0" }, - "time": "2012-01-02 21:32:49", + "time": "2012-01-02 13:32:49", "type": "library", "installation-source": "dist", "autoload": { @@ -448,7 +449,7 @@ { "name": "Johannes M. Schmitt", "email": "schmittjoh@gmail.com", - "homepage": "http://jmsyst.com", + "homepage": "https://github.com/schmittjoh", "role": "Developer of wrapped JMSSerializerBundle" } ], @@ -462,17 +463,17 @@ }, { "name": "jms/security-extra-bundle", - "version": "1.2.x-dev", + "version": "1.2.0", "target-dir": "JMS/SecurityExtraBundle", "source": { "type": "git", "url": "https://github.com/schmittjoh/JMSSecurityExtraBundle", - "reference": "9ab6aceda50fc7a2b07d741ba4b3f0695508afcb" + "reference": "1.2.0" }, "dist": { "type": "zip", - "url": "https://github.com/schmittjoh/JMSSecurityExtraBundle/zipball/9ab6aceda50fc7a2b07d741ba4b3f0695508afcb", - "reference": "9ab6aceda50fc7a2b07d741ba4b3f0695508afcb", + "url": "https://github.com/schmittjoh/JMSSecurityExtraBundle/zipball/1.2.0", + "reference": "1.2.0", "shasum": "" }, "require": { @@ -496,9 +497,9 @@ "symfony/form": "*", "symfony/validator": "*" }, - "time": "1346947943", + "time": "2012-09-06 09:12:03", "type": "symfony-bundle", - "installation-source": "source", + "installation-source": "dist", "autoload": { "psr-0": { "JMS\\SecurityExtraBundle": "" @@ -531,12 +532,12 @@ "source": { "type": "git", "url": "http://github.com/kriswallsmith/assetic.git", - "reference": "d6203098559cf9fc90e2890c10533d0adad33bd0" + "reference": "deed96bb7ba009d8e05aaeeb1b73c1d67a8f3719" }, "dist": { "type": "zip", - "url": "https://github.com/kriswallsmith/assetic/archive/d6203098559cf9fc90e2890c10533d0adad33bd0.zip", - "reference": "d6203098559cf9fc90e2890c10533d0adad33bd0", + "url": "https://github.com/kriswallsmith/assetic/archive/deed96bb7ba009d8e05aaeeb1b73c1d67a8f3719.zip", + "reference": "deed96bb7ba009d8e05aaeeb1b73c1d67a8f3719", "shasum": "" }, "require": { @@ -557,7 +558,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": "1352285252", + "time": "2012-11-27 13:27:38", "type": "library", "extra": { "branch-alias": { @@ -593,16 +594,16 @@ }, { "name": "monolog/monolog", - "version": "dev-master", + "version": "1.2.1", "source": { "type": "git", "url": "https://github.com/Seldaek/monolog", - "reference": "38bb472abb27db138536f845f7d259c1c47bbd3f" + "reference": "1.2.1" }, "dist": { "type": "zip", - "url": "https://github.com/Seldaek/monolog/zipball/38bb472abb27db138536f845f7d259c1c47bbd3f", - "reference": "38bb472abb27db138536f845f7d259c1c47bbd3f", + "url": "https://github.com/Seldaek/monolog/zipball/1.2.1", + "reference": "1.2.1", "shasum": "" }, "require": { @@ -616,14 +617,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": "1351084926", + "time": "2012-08-29 04:53:20", "type": "library", "extra": { "branch-alias": { "dev-master": "1.3.x-dev" } }, - "installation-source": "source", + "installation-source": "dist", "autoload": { "psr-0": { "Monolog": "src/" @@ -649,30 +650,30 @@ }, { "name": "sensio/distribution-bundle", - "version": "2.1.x-dev", + "version": "v2.1.4", "target-dir": "Sensio/Bundle/DistributionBundle", "source": { "type": "git", "url": "https://github.com/sensio/SensioDistributionBundle", - "reference": "v2.1.3" + "reference": "v2.1.4" }, "dist": { "type": "zip", - "url": "https://github.com/sensio/SensioDistributionBundle/zipball/v2.1.3", - "reference": "v2.1.3", + "url": "https://github.com/sensio/SensioDistributionBundle/archive/v2.1.4.zip", + "reference": "v2.1.4", "shasum": "" }, "require": { "symfony/framework-bundle": "2.1.*" }, - "time": "1347340208", + "time": "2012-11-19 11:18:52", "type": "symfony-bundle", "extra": { "branch-alias": { "dev-master": "2.1.x-dev" } }, - "installation-source": "source", + "installation-source": "dist", "autoload": { "psr-0": { "Sensio\\Bundle\\DistributionBundle": "" @@ -695,31 +696,31 @@ }, { "name": "sensio/framework-extra-bundle", - "version": "2.1.x-dev", + "version": "v2.1.4", "target-dir": "Sensio/Bundle/FrameworkExtraBundle", "source": { "type": "git", "url": "https://github.com/sensio/SensioFrameworkExtraBundle", - "reference": "v2.1.3" + "reference": "v2.1.4" }, "dist": { "type": "zip", - "url": "https://github.com/sensio/SensioFrameworkExtraBundle/zipball/v2.1.3", - "reference": "v2.1.3", + "url": "https://github.com/sensio/SensioFrameworkExtraBundle/archive/v2.1.4.zip", + "reference": "v2.1.4", "shasum": "" }, "require": { "symfony/framework-bundle": "2.1.*", "doctrine/common": ">=2.1,<2.4-dev" }, - "time": "1350448707", + "time": "2012-10-16 21:38:27", "type": "symfony-bundle", "extra": { "branch-alias": { "dev-master": "2.1.x-dev" } }, - "installation-source": "source", + "installation-source": "dist", "autoload": { "psr-0": { "Sensio\\Bundle\\FrameworkExtraBundle": "" @@ -742,17 +743,17 @@ }, { "name": "sensio/generator-bundle", - "version": "2.1.x-dev", + "version": "v2.1.4", "target-dir": "Sensio/Bundle/GeneratorBundle", "source": { "type": "git", "url": "https://github.com/sensio/SensioGeneratorBundle", - "reference": "v2.1.3" + "reference": "v2.1.4" }, "dist": { "type": "zip", - "url": "https://github.com/sensio/SensioGeneratorBundle/zipball/v2.1.3", - "reference": "v2.1.3", + "url": "https://github.com/sensio/SensioGeneratorBundle/archive/v2.1.4.zip", + "reference": "v2.1.4", "shasum": "" }, "require": { @@ -764,14 +765,14 @@ "doctrine/orm": ">=2.1,<2.4-dev", "twig/twig": ">=1.8,<2.0-dev" }, - "time": "1348030981", + "time": "2012-11-19 16:10:57", "type": "symfony-bundle", "extra": { "branch-alias": { "dev-master": "2.1.x-dev" } }, - "installation-source": "source", + "installation-source": "dist", "autoload": { "psr-0": { "Sensio\\Bundle\\GeneratorBundle": "" @@ -812,7 +813,7 @@ "dev-master": "4.2-dev" } }, - "installation-source": "source", + "installation-source": "dist", "autoload": { "files": [ "lib/swift_required.php" @@ -839,44 +840,44 @@ }, { "name": "symfony/assetic-bundle", - "version": "dev-master", + "version": "v2.1.0", "target-dir": "Symfony/Bundle/AsseticBundle", "source": { "type": "git", "url": "https://github.com/symfony/AsseticBundle", - "reference": "4eea8571954132e4715a5e756fe6a90a7e2d90f6" + "reference": "v2.1.0-RC2" }, "dist": { "type": "zip", - "url": "https://github.com/symfony/AsseticBundle/zipball/4eea8571954132e4715a5e756fe6a90a7e2d90f6", - "reference": "4eea8571954132e4715a5e756fe6a90a7e2d90f6", + "url": "https://github.com/symfony/AsseticBundle/zipball/v2.1.0-RC2", + "reference": "v2.1.0-RC2", "shasum": "" }, "require": { "php": ">=5.3.0", - "kriswallsmith/assetic": "1.1.*", - "symfony/framework-bundle": ">=2.1.0,<2.3-dev" + "symfony/framework-bundle": "2.1.*", + "kriswallsmith/assetic": "1.1.*" }, "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" + "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.0,<2.3-dev" + "symfony/twig-bundle": "2.1.*" }, - "time": "1350864366", + "time": "2012-08-28 03:22:44", "type": "symfony-bundle", "extra": { "branch-alias": { "dev-master": "2.1.x-dev" } }, - "installation-source": "source", + "installation-source": "dist", "autoload": { "psr-0": { "Symfony\\Bundle\\AsseticBundle": "" @@ -902,38 +903,38 @@ }, { "name": "symfony/monolog-bundle", - "version": "dev-master", + "version": "v2.1.0", "target-dir": "Symfony/Bundle/MonologBundle", "source": { "type": "git", "url": "https://github.com/symfony/MonologBundle", - "reference": "51517152a608926ee6b40ed8cfbba1a708f0a14f" + "reference": "v2.1.0-RC2" }, "dist": { "type": "zip", - "url": "https://github.com/symfony/MonologBundle/zipball/51517152a608926ee6b40ed8cfbba1a708f0a14f", - "reference": "51517152a608926ee6b40ed8cfbba1a708f0a14f", + "url": "https://github.com/symfony/MonologBundle/zipball/v2.1.0-RC2", + "reference": "v2.1.0-RC2", "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" + "symfony/monolog-bridge": "2.1.*", + "symfony/dependency-injection": "2.1.*", + "symfony/config": "2.1.*", + "monolog/monolog": "1.*" }, "require-dev": { - "symfony/yaml": ">=2.1.0,<2.3-dev", - "symfony/config": ">=2.1.0,<2.3-dev" + "symfony/yaml": "2.1.*", + "symfony/config": "2.1.*" }, - "time": "1348137624", + "time": "2012-08-21 07:05:54", "type": "symfony-bundle", "extra": { "branch-alias": { "dev-master": "2.1.x-dev" } }, - "installation-source": "source", + "installation-source": "dist", "autoload": { "psr-0": { "Symfony\\Bundle\\MonologBundle": "" @@ -957,38 +958,37 @@ }, { "name": "symfony/swiftmailer-bundle", - "version": "dev-master", + "version": "v2.1.0", "target-dir": "Symfony/Bundle/SwiftmailerBundle", "source": { "type": "git", "url": "https://github.com/symfony/SwiftmailerBundle", - "reference": "2393ba6d4f1b544349123e24a16bbc749bef9e55" + "reference": "v2.1.0-RC2" }, "dist": { "type": "zip", - "url": "https://github.com/symfony/SwiftmailerBundle/zipball/2393ba6d4f1b544349123e24a16bbc749bef9e55", - "reference": "2393ba6d4f1b544349123e24a16bbc749bef9e55", + "url": "https://github.com/symfony/SwiftmailerBundle/zipball/v2.1.0-RC2", + "reference": "v2.1.0-RC2", "shasum": "" }, "require": { "php": ">=5.3.2", "swiftmailer/swiftmailer": ">=4.2.0,<4.3-dev", - "symfony/swiftmailer-bridge": ">=2.1.0,<2.3-dev" + "symfony/swiftmailer-bridge": "2.1.*" }, "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" + "symfony/dependency-injection": "2.1.*", + "symfony/http-kernel": "2.1.*", + "symfony/config": "2.1.*" }, - "time": "1350447491", + "time": "2012-08-28 03:21:09", "type": "symfony-bundle", "extra": { "branch-alias": { "dev-master": "2.1-dev" } }, - "installation-source": "source", + "installation-source": "dist", "autoload": { "psr-0": { "Symfony\\Bundle\\SwiftmailerBundle": "" @@ -1012,16 +1012,16 @@ }, { "name": "symfony/symfony", - "version": "2.1.x-dev", + "version": "v2.1.4", "source": { "type": "git", "url": "git://github.com/symfony/symfony.git", - "reference": "v2.1.3" + "reference": "v2.1.4" }, "dist": { "type": "zip", - "url": "https://github.com/symfony/symfony/zipball/v2.1.3", - "reference": "v2.1.3", + "url": "https://github.com/symfony/symfony/archive/v2.1.4.zip", + "reference": "v2.1.4", "shasum": "" }, "require": { @@ -1070,14 +1070,14 @@ "propel/propel1": "dev-master", "monolog/monolog": "1.*" }, - "time": "1351584854", + "time": "2012-11-29 11:56:19", "type": "library", "extra": { "branch-alias": { "dev-master": "2.1-dev" } }, - "installation-source": "source", + "installation-source": "dist", "autoload": { "psr-0": { "Symfony": "src/", @@ -1113,14 +1113,14 @@ }, "dist": { "type": "zip", - "url": "https://github.com/fabpot/Twig-extensions/zipball/dcdff02fbac1282e6b8f4d0558cc7e9580105688", + "url": "https://github.com/fabpot/Twig-extensions/archive/dcdff02fbac1282e6b8f4d0558cc7e9580105688.zip", "reference": "dcdff02fbac1282e6b8f4d0558cc7e9580105688", "shasum": "" }, "require": { "twig/twig": "1.*" }, - "time": "1349889206", + "time": "2012-10-10 17:13:26", "type": "library", "extra": { "branch-alias": { @@ -1152,29 +1152,29 @@ }, { "name": "twig/twig", - "version": "dev-master", + "version": "v1.11.1", "source": { "type": "git", "url": "git://github.com/fabpot/Twig.git", - "reference": "0505c2fefd5eaa81c628b0cf8a9b8a2bc612321c" + "reference": "v1.11.1" }, "dist": { "type": "zip", - "url": "https://github.com/fabpot/Twig/zipball/0505c2fefd5eaa81c628b0cf8a9b8a2bc612321c", - "reference": "0505c2fefd5eaa81c628b0cf8a9b8a2bc612321c", + "url": "https://github.com/fabpot/Twig/archive/v1.11.1.zip", + "reference": "v1.11.1", "shasum": "" }, "require": { "php": ">=5.2.4" }, - "time": "1351434618", + "time": "2012-11-11 17:17:59", "type": "library", "extra": { "branch-alias": { "dev-master": "1.11-dev" } }, - "installation-source": "source", + "installation-source": "dist", "autoload": { "psr-0": { "Twig_": "lib/" From b8b16f77538be8cbe5f338a691c5461481777537 Mon Sep 17 00:00:00 2001 From: Greg Holland Date: Thu, 29 Nov 2012 13:22:20 -0800 Subject: [PATCH 4/9] Add a note to the 2.0 -> 2.1 upgrade guide about completing all steps before running composer install When upgrading from 2.0 -> 2.1, composer.phar will fail with a runtime exception when attempting to generate the autoload bootstrap file if the install is attempted before updating the existing files (config.yml, app.php etc). --- UPGRADE.md | 2 ++ 1 file changed, 2 insertions(+) diff --git a/UPGRADE.md b/UPGRADE.md index 663725498b..602093e026 100644 --- a/UPGRADE.md +++ b/UPGRADE.md @@ -32,6 +32,8 @@ Finally, run Composer: $ composer.phar install +Note: You must complete the upgrade steps below so composer can successfully generate the autoload files. + ### `app/autoload.php` The default `autoload.php` reads as follows (it has been simplified a lot as From c592863db9a3b1a75694799772c2e05ec8b80deb Mon Sep 17 00:00:00 2001 From: Fabien Potencier Date: Thu, 20 Dec 2012 09:59:56 +0100 Subject: [PATCH 5/9] added default configuration for trusted proxies --- app/config/config.yml | 2 ++ 1 file changed, 2 insertions(+) diff --git a/app/config/config.yml b/app/config/config.yml index b6da31e34b..951cce905c 100644 --- a/app/config/config.yml +++ b/app/config/config.yml @@ -12,6 +12,8 @@ framework: csrf_protection: true validation: { enable_annotations: true } templating: { engines: ['twig'] } #assets_version: SomeVersionScheme + trust_proxy_headers: false # Deprecated in 2.0; will be removed in 2.3 (used trusted_proxies instead) + trusted_proxies: ~ session: default_locale: %locale% auto_start: true From 6bc021e9d7353e87dd797911bf772e0c143c9370 Mon Sep 17 00:00:00 2001 From: Fabien Potencier Date: Thu, 20 Dec 2012 14:47:31 +0100 Subject: [PATCH 6/9] updated VENDORS for 2.0.20 --- deps | 2 +- deps.lock | 4 ++-- 2 files changed, 3 insertions(+), 3 deletions(-) diff --git a/deps b/deps index c22dc946fe..85c3a0feeb 100644 --- a/deps +++ b/deps @@ -1,6 +1,6 @@ [symfony] git=http://github.com/symfony/symfony.git - version=origin/2.0 + version=v2.0.20 [twig] git=http://github.com/fabpot/Twig.git diff --git a/deps.lock b/deps.lock index 84ff2a8315..0b83630f94 100644 --- a/deps.lock +++ b/deps.lock @@ -1,4 +1,4 @@ -symfony v2.0.19 +symfony v2.0.20 twig v1.10.3 monolog 1.2.1 doctrine-common 2.1.4 @@ -8,7 +8,7 @@ swiftmailer v4.2.2 assetic v1.0.4 twig-extensions v1.0.0-alpha metadata 1.0.0 -SensioFrameworkExtraBundle v2.0.17 +SensioFrameworkExtraBundle v2.0.20 JMSSecurityExtraBundle e752f888c51425f71382c056961f10f2be642102 SensioDistributionBundle v2.0.17 SensioGeneratorBundle v2.0.19 From 471049cee5816f2c5eab753890332d73d8c3b681 Mon Sep 17 00:00:00 2001 From: Fabien Potencier Date: Thu, 20 Dec 2012 14:48:13 +0100 Subject: [PATCH 7/9] updated vendors to dev branches --- deps | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/deps b/deps index 85c3a0feeb..c22dc946fe 100644 --- a/deps +++ b/deps @@ -1,6 +1,6 @@ [symfony] git=http://github.com/symfony/symfony.git - version=v2.0.20 + version=origin/2.0 [twig] git=http://github.com/fabpot/Twig.git From 3971f8c422d43ab84206290181d867bb7a158ff8 Mon Sep 17 00:00:00 2001 From: Fabien Potencier Date: Thu, 20 Dec 2012 15:32:45 +0100 Subject: [PATCH 8/9] updated VENDORS for 2.1.5 --- composer.lock | 305 +++++++++++++++++++++++++++++--------------------- 1 file changed, 179 insertions(+), 126 deletions(-) diff --git a/composer.lock b/composer.lock index 1d6145b6af..6d382de982 100644 --- a/composer.lock +++ b/composer.lock @@ -3,29 +3,28 @@ "packages": [ { "name": "doctrine/common", - "version": "2.3.0", + "version": "2.3.x-dev", "source": { "type": "git", "url": "https://github.com/doctrine/common", - "reference": "2.3.0" + "reference": "bb0aebbf234db52df476a2b473d434745b34221c" }, "dist": { "type": "zip", - "url": "https://github.com/doctrine/common/zipball/2.3.0", - "reference": "2.3.0", + "url": "https://github.com/doctrine/common/archive/bb0aebbf234db52df476a2b473d434745b34221c.zip", + "reference": "bb0aebbf234db52df476a2b473d434745b34221c", "shasum": "" }, "require": { "php": ">=5.3.2" }, - "time": "2012-09-19 22:55:18", "type": "library", "extra": { "branch-alias": { "dev-master": "2.3.x-dev" } }, - "installation-source": "dist", + "installation-source": "source", "autoload": { "psr-0": { "Doctrine\\Common": "lib/" @@ -68,34 +67,34 @@ "eventmanager", "annotations", "persistence" - ] + ], + "time": "2012-09-20 05:55:18" }, { "name": "doctrine/dbal", - "version": "2.3.0", + "version": "2.3.x-dev", "source": { "type": "git", "url": "https://github.com/doctrine/dbal", - "reference": "2.3.0" + "reference": "292d5edd17e0a9b9a7ee9eb20d6ae1033059153f" }, "dist": { "type": "zip", - "url": "https://github.com/doctrine/dbal/zipball/2.3.0", - "reference": "2.3.0", + "url": "https://github.com/doctrine/dbal/archive/292d5edd17e0a9b9a7ee9eb20d6ae1033059153f.zip", + "reference": "292d5edd17e0a9b9a7ee9eb20d6ae1033059153f", "shasum": "" }, "require": { "php": ">=5.3.2", "doctrine/common": "2.3.*" }, - "time": "2012-09-19 22:56:37", "type": "library", "extra": { "branch-alias": { "dev-master": "2.3.x-dev" } }, - "installation-source": "dist", + "installation-source": "source", "autoload": { "psr-0": { "Doctrine\\DBAL": "lib/" @@ -131,45 +130,46 @@ "persistence", "dbal", "queryobject" - ] + ], + "time": "2012-11-12 10:41:11" }, { "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": "47df202dfb4ad38e15d6aed8a53e722b30c9f9fd" }, "dist": { "type": "zip", - "url": "https://github.com/doctrine/DoctrineBundle/zipball/v1.0.0", - "reference": "v1.0.0", + "url": "https://github.com/doctrine/DoctrineBundle/archive/47df202dfb4ad38e15d6aed8a53e722b30c9f9fd.zip", + "reference": "47df202dfb4ad38e15d6aed8a53e722b30c9f9fd", "shasum": "" }, "require": { "php": ">=5.3.2", - "symfony/framework-bundle": "2.1.*", - "symfony/doctrine-bridge": "2.1.*", - "doctrine/dbal": ">=2.2,<2.4-dev" + "doctrine/dbal": ">=2.2,<2.4-dev", + "symfony/framework-bundle": ">=2.1,<2.3-dev", + "symfony/doctrine-bridge": ">=2.1,<2.3-dev", + "jdorn/sql-formatter": "v1.0.1" }, "require-dev": { "doctrine/orm": ">=2.2,<2.4-dev", - "symfony/yaml": "2.1.*", - "symfony/validator": "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": "2012-09-07 14:18:21", "type": "symfony-bundle", "extra": { "branch-alias": { "dev-master": "1.0.x-dev" } }, - "installation-source": "dist", + "installation-source": "source", "autoload": { "psr-0": { "Doctrine\\Bundle\\DoctrineBundle": "" @@ -199,32 +199,32 @@ "orm", "persistence", "dbal" - ] + ], + "time": "2012-11-16 13:54:33" }, { "name": "doctrine/orm", - "version": "2.3.0", + "version": "2.3.x-dev", "source": { "type": "git", "url": "git://github.com/doctrine/doctrine2.git", - "reference": "2.3.0" + "reference": "77d060ab74212919f1eaace72842ea43bf420f43" }, "dist": { "type": "zip", - "url": "https://github.com/doctrine/doctrine2/zipball/2.3.0", - "reference": "2.3.0", + "url": "https://github.com/doctrine/doctrine2/archive/77d060ab74212919f1eaace72842ea43bf420f43.zip", + "reference": "77d060ab74212919f1eaace72842ea43bf420f43", "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-19 23:03:34", "bin": [ "bin/doctrine", "bin/doctrine.php" @@ -235,7 +235,7 @@ "dev-master": "2.3.x-dev" } }, - "installation-source": "dist", + "installation-source": "source", "autoload": { "psr-0": { "Doctrine\\ORM": "lib/" @@ -269,6 +269,54 @@ "keywords": [ "database", "orm" + ], + "time": "2012-11-12 14:49:41" + }, + { + "name": "jdorn/sql-formatter", + "version": "v1.0.1", + "source": { + "type": "git", + "url": "git://github.com/jdorn/sql-formatter.git", + "reference": "v1.0.1" + }, + "dist": { + "type": "zip", + "url": "https://github.com/jdorn/sql-formatter/archive/v1.0.1.zip", + "reference": "v1.0.1", + "shasum": "" + }, + "require": { + "php": ">=5.2.4" + }, + "time": "2012-10-04 22:10:16", + "type": "library", + "extra": { + "branch-alias": { + "dev-master": "1.0.x-dev" + } + }, + "installation-source": "dist", + "autoload": { + "classmap": [ + "lib" + ] + }, + "license": [ + "LGPL" + ], + "authors": [ + { + "name": "Jeremy Dorn", + "email": "jeremy@jeremydorn.com", + "homepage": "http://jeremydorn.com/" + } + ], + "description": "a PHP SQL highlighting library", + "homepage": "https://github.com/jdorn/sql-formatter/", + "keywords": [ + "sql", + "highlight" ] }, { @@ -292,12 +340,13 @@ }, "time": "2012-01-02 12:50:26", "type": "symfony-bundle", - "installation-source": "dist", + "installation-source": "source", "autoload": { "psr-0": { "JMS\\AopBundle": "" } }, + "notification-url": "https://packagist.org/downloads/", "license": [ "Apache" ], @@ -367,7 +416,7 @@ }, "dist": { "type": "zip", - "url": "https://github.com/schmittjoh/JMSDiExtraBundle/zipball/1.1.1", + "url": "https://github.com/schmittjoh/JMSDiExtraBundle/archive/1.1.1.zip", "reference": "1.1.1", "shasum": "" }, @@ -393,12 +442,13 @@ }, "time": "2012-09-21 01:56:32", "type": "symfony-bundle", - "installation-source": "dist", + "installation-source": "source", "autoload": { "psr-0": { "JMS\\DiExtraBundle": "" } }, + "notification-url": "https://packagist.org/downloads/", "license": [ "Apache" ], @@ -499,12 +549,13 @@ }, "time": "2012-09-06 09:12:03", "type": "symfony-bundle", - "installation-source": "dist", + "installation-source": "source", "autoload": { "psr-0": { "JMS\\SecurityExtraBundle": "" } }, + "notification-url": "https://packagist.org/downloads/", "license": [ "Apache2" ], @@ -512,7 +563,7 @@ { "name": "Johannes M. Schmitt", "email": "schmittjoh@gmail.com", - "homepage": "http://jmsyst.com", + "homepage": "https://github.com/schmittjoh", "role": "Developer of wrapped JMSSerializerBundle" } ], @@ -532,12 +583,12 @@ "source": { "type": "git", "url": "http://github.com/kriswallsmith/assetic.git", - "reference": "deed96bb7ba009d8e05aaeeb1b73c1d67a8f3719" + "reference": "8ca1861fbed58e2c6ffcca5c0a1726c40a10a77c" }, "dist": { "type": "zip", - "url": "https://github.com/kriswallsmith/assetic/archive/deed96bb7ba009d8e05aaeeb1b73c1d67a8f3719.zip", - "reference": "deed96bb7ba009d8e05aaeeb1b73c1d67a8f3719", + "url": "https://github.com/kriswallsmith/assetic/archive/8ca1861fbed58e2c6ffcca5c0a1726c40a10a77c.zip", + "reference": "8ca1861fbed58e2c6ffcca5c0a1726c40a10a77c", "shasum": "" }, "require": { @@ -558,7 +609,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": "2012-11-27 13:27:38", + "time": "2012-12-14 18:31:26", "type": "library", "extra": { "branch-alias": { @@ -574,6 +625,7 @@ "src/functions.php" ] }, + "notification-url": "https://packagist.org/downloads/", "license": [ "MIT" ], @@ -594,16 +646,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": "b23cfd3d6ce0b6c050dda723040b83a1a6d7637e" }, "dist": { "type": "zip", - "url": "https://github.com/Seldaek/monolog/zipball/1.2.1", - "reference": "1.2.1", + "url": "https://github.com/Seldaek/monolog/archive/b23cfd3d6ce0b6c050dda723040b83a1a6d7637e.zip", + "reference": "b23cfd3d6ce0b6c050dda723040b83a1a6d7637e", "shasum": "" }, "require": { @@ -617,14 +669,13 @@ "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 04:53:20", "type": "library", "extra": { "branch-alias": { "dev-master": "1.3.x-dev" } }, - "installation-source": "dist", + "installation-source": "source", "autoload": { "psr-0": { "Monolog": "src/" @@ -646,21 +697,22 @@ "keywords": [ "log", "logging" - ] + ], + "time": "2012-11-14 15:46:10" }, { "name": "sensio/distribution-bundle", - "version": "v2.1.4", + "version": "v2.1.5", "target-dir": "Sensio/Bundle/DistributionBundle", "source": { "type": "git", "url": "https://github.com/sensio/SensioDistributionBundle", - "reference": "v2.1.4" + "reference": "v2.1.5" }, "dist": { "type": "zip", - "url": "https://github.com/sensio/SensioDistributionBundle/archive/v2.1.4.zip", - "reference": "v2.1.4", + "url": "https://github.com/sensio/SensioDistributionBundle/archive/v2.1.5.zip", + "reference": "v2.1.5", "shasum": "" }, "require": { @@ -673,12 +725,13 @@ "dev-master": "2.1.x-dev" } }, - "installation-source": "dist", + "installation-source": "source", "autoload": { "psr-0": { "Sensio\\Bundle\\DistributionBundle": "" } }, + "notification-url": "https://packagist.org/downloads/", "license": [ "MIT" ], @@ -696,36 +749,37 @@ }, { "name": "sensio/framework-extra-bundle", - "version": "v2.1.4", + "version": "v2.1.5", "target-dir": "Sensio/Bundle/FrameworkExtraBundle", "source": { "type": "git", "url": "https://github.com/sensio/SensioFrameworkExtraBundle", - "reference": "v2.1.4" + "reference": "v2.1.5" }, "dist": { "type": "zip", - "url": "https://github.com/sensio/SensioFrameworkExtraBundle/archive/v2.1.4.zip", - "reference": "v2.1.4", + "url": "https://github.com/sensio/SensioFrameworkExtraBundle/archive/v2.1.5.zip", + "reference": "v2.1.5", "shasum": "" }, "require": { "symfony/framework-bundle": "2.1.*", "doctrine/common": ">=2.1,<2.4-dev" }, - "time": "2012-10-16 21:38:27", + "time": "2012-12-18 17:19:01", "type": "symfony-bundle", "extra": { "branch-alias": { "dev-master": "2.1.x-dev" } }, - "installation-source": "dist", + "installation-source": "source", "autoload": { "psr-0": { "Sensio\\Bundle\\FrameworkExtraBundle": "" } }, + "notification-url": "https://packagist.org/downloads/", "license": [ "MIT" ], @@ -743,7 +797,7 @@ }, { "name": "sensio/generator-bundle", - "version": "v2.1.4", + "version": "v2.1.5", "target-dir": "Sensio/Bundle/GeneratorBundle", "source": { "type": "git", @@ -772,12 +826,13 @@ "dev-master": "2.1.x-dev" } }, - "installation-source": "dist", + "installation-source": "source", "autoload": { "psr-0": { "Sensio\\Bundle\\GeneratorBundle": "" } }, + "notification-url": "https://packagist.org/downloads/", "license": [ "MIT" ], @@ -840,44 +895,43 @@ }, { "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": "30d3841dc9643d352503a72f3cdf93d193c439d2" }, "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/archive/30d3841dc9643d352503a72f3cdf93d193c439d2.zip", + "reference": "30d3841dc9643d352503a72f3cdf93d193c439d2", "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": "2012-08-28 03:22:44", "type": "symfony-bundle", "extra": { "branch-alias": { "dev-master": "2.1.x-dev" } }, - "installation-source": "dist", + "installation-source": "source", "autoload": { "psr-0": { "Symfony\\Bundle\\AsseticBundle": "" @@ -899,42 +953,42 @@ "assets", "compression", "minification" - ] + ], + "time": "2012-11-07 10:47:48" }, { "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": "51517152a608926ee6b40ed8cfbba1a708f0a14f" }, "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/archive/51517152a608926ee6b40ed8cfbba1a708f0a14f.zip", + "reference": "51517152a608926ee6b40ed8cfbba1a708f0a14f", "shasum": "" }, "require": { "php": ">=5.3.2", - "symfony/monolog-bridge": "2.1.*", - "symfony/dependency-injection": "2.1.*", - "symfony/config": "2.1.*", - "monolog/monolog": "1.*" + "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.*", - "symfony/config": "2.1.*" + "symfony/yaml": ">=2.1.0,<2.3-dev", + "symfony/config": ">=2.1.0,<2.3-dev" }, - "time": "2012-08-21 07:05:54", "type": "symfony-bundle", "extra": { "branch-alias": { "dev-master": "2.1.x-dev" } }, - "installation-source": "dist", + "installation-source": "source", "autoload": { "psr-0": { "Symfony\\Bundle\\MonologBundle": "" @@ -954,41 +1008,43 @@ } ], "description": "Symfony MonologBundle", - "homepage": "http://symfony.com" + "homepage": "http://symfony.com", + "time": "2012-09-20 10:40:24" }, { "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-RC2" + "reference": "2393ba6d4f1b544349123e24a16bbc749bef9e55" }, "dist": { "type": "zip", - "url": "https://github.com/symfony/SwiftmailerBundle/zipball/v2.1.0-RC2", - "reference": "v2.1.0-RC2", + "url": "https://github.com/symfony/SwiftmailerBundle/archive/2393ba6d4f1b544349123e24a16bbc749bef9e55.zip", + "reference": "2393ba6d4f1b544349123e24a16bbc749bef9e55", "shasum": "" }, "require": { "php": ">=5.3.2", "swiftmailer/swiftmailer": ">=4.2.0,<4.3-dev", - "symfony/swiftmailer-bridge": "2.1.*" + "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/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": "2012-08-28 03:21:09", + "time": "2012-10-17 04:18:11", "type": "symfony-bundle", "extra": { "branch-alias": { "dev-master": "2.1-dev" } }, - "installation-source": "dist", + "installation-source": "source", "autoload": { "psr-0": { "Symfony\\Bundle\\SwiftmailerBundle": "" @@ -1012,16 +1068,16 @@ }, { "name": "symfony/symfony", - "version": "v2.1.4", + "version": "v2.1.5", "source": { "type": "git", "url": "git://github.com/symfony/symfony.git", - "reference": "v2.1.4" + "reference": "v2.1.5" }, "dist": { "type": "zip", - "url": "https://github.com/symfony/symfony/archive/v2.1.4.zip", - "reference": "v2.1.4", + "url": "https://github.com/symfony/symfony/archive/v2.1.5.zip", + "reference": "v2.1.5", "shasum": "" }, "require": { @@ -1070,20 +1126,16 @@ "propel/propel1": "dev-master", "monolog/monolog": "1.*" }, - "time": "2012-11-29 11:56:19", + "time": "2012-12-20 14:27:50", "type": "library", - "extra": { - "branch-alias": { - "dev-master": "2.1-dev" - } - }, - "installation-source": "dist", + "installation-source": "source", "autoload": { "psr-0": { "Symfony": "src/", "SessionHandlerInterface": "src/Symfony/Component/HttpFoundation/Resources/stubs" } }, + "notification-url": "https://packagist.org/downloads/", "license": [ "MIT" ], @@ -1109,18 +1161,18 @@ "source": { "type": "git", "url": "https://github.com/fabpot/Twig-extensions", - "reference": "dcdff02fbac1282e6b8f4d0558cc7e9580105688" + "reference": "d1990ffaca93302709d1306d50ae153adb169f49" }, "dist": { "type": "zip", - "url": "https://github.com/fabpot/Twig-extensions/archive/dcdff02fbac1282e6b8f4d0558cc7e9580105688.zip", - "reference": "dcdff02fbac1282e6b8f4d0558cc7e9580105688", + "url": "https://github.com/fabpot/Twig-extensions/archive/d1990ffaca93302709d1306d50ae153adb169f49.zip", + "reference": "d1990ffaca93302709d1306d50ae153adb169f49", "shasum": "" }, "require": { "twig/twig": "1.*" }, - "time": "2012-10-10 17:13:26", + "time": "2012-12-15 09:26:10", "type": "library", "extra": { "branch-alias": { @@ -1133,6 +1185,7 @@ "Twig_Extensions_": "lib/" } }, + "notification-url": "https://packagist.org/downloads/", "license": [ "MIT" ], @@ -1152,29 +1205,28 @@ }, { "name": "twig/twig", - "version": "v1.11.1", + "version": "dev-master", "source": { "type": "git", "url": "git://github.com/fabpot/Twig.git", - "reference": "v1.11.1" + "reference": "11368e7e08bc1c9626317fe28e3fdd1855e17198" }, "dist": { "type": "zip", - "url": "https://github.com/fabpot/Twig/archive/v1.11.1.zip", - "reference": "v1.11.1", + "url": "https://github.com/fabpot/Twig/archive/11368e7e08bc1c9626317fe28e3fdd1855e17198.zip", + "reference": "11368e7e08bc1c9626317fe28e3fdd1855e17198", "shasum": "" }, "require": { "php": ">=5.2.4" }, - "time": "2012-11-11 17:17:59", "type": "library", "extra": { "branch-alias": { - "dev-master": "1.11-dev" + "dev-master": "1.12-dev" } }, - "installation-source": "dist", + "installation-source": "source", "autoload": { "psr-0": { "Twig_": "lib/" @@ -1197,7 +1249,8 @@ "homepage": "http://twig.sensiolabs.org", "keywords": [ "templating" - ] + ], + "time": "2012-11-16 20:56:44" } ], "packages-dev": [ From 04c1e6611b1369a3a8c6f65995dc47490a10b9ed Mon Sep 17 00:00:00 2001 From: Fabien Potencier Date: Thu, 20 Dec 2012 17:30:35 +0100 Subject: [PATCH 9/9] added a warning about a security issue when using the _internal route --- app/config/routing.yml | 4 ++++ 1 file changed, 4 insertions(+) diff --git a/app/config/routing.yml b/app/config/routing.yml index 8b4740a115..707b3225b5 100644 --- a/app/config/routing.yml +++ b/app/config/routing.yml @@ -1,4 +1,8 @@ # Internal routing configuration to handle ESI +# ****** WARNING ****** +# This route should be enabled with caution as it can open a security vulnerability +# see http://symfony.com/blog/security-release-symfony-2-0-20-and-2-1-5-released for more information +# ****** WARNING ****** #_internal: # resource: "@FrameworkBundle/Resources/config/routing/internal.xml" # prefix: /_internal