diff --git a/composer.json b/composer.json index 37d1b3341d9a..3b666d1dd798 100644 --- a/composer.json +++ b/composer.json @@ -21,38 +21,38 @@ "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" + "symfony/doctrine-bridge": "2.1.*", + "symfony/monolog-bridge": "2.1.*", + "symfony/propel1-bridge": "2.1.*", + "symfony/swiftmailer-bridge": "2.1.*", + "symfony/twig-bridge": "2.1.*", + "symfony/framework-bundle": "2.1.*", + "symfony/security-bundle": "2.1.*", + "symfony/twig-bundle": "2.1.*", + "symfony/web-profiler-bundle": "2.1.*", + "symfony/browser-kit": "2.1.*", + "symfony/class-loader": "2.1.*", + "symfony/config": "2.1.*", + "symfony/console": "2.1.*", + "symfony/css-selector": "2.1.*", + "symfony/dependency-injection": "2.1.*", + "symfony/dom-crawler": "2.1.*", + "symfony/event-dispatcher": "2.1.*", + "symfony/filesystem": "2.1.*", + "symfony/finder": "2.1.*", + "symfony/form": "2.1.*", + "symfony/http-foundation": "2.1.*", + "symfony/http-kernel": "2.1.*", + "symfony/locale": "2.1.*", + "symfony/options-resolver": "2.1.*", + "symfony/process": "2.1.*", + "symfony/routing": "2.1.*", + "symfony/security": "2.1.*", + "symfony/serializer": "2.1.*", + "symfony/templating": "2.1.*", + "symfony/translation": "2.1.*", + "symfony/validator": "2.1.*", + "symfony/yaml": "2.1.*" }, "require-dev": { "doctrine/dbal": ">=2.2,<2.4-dev", diff --git a/src/Symfony/Bridge/Doctrine/composer.json b/src/Symfony/Bridge/Doctrine/composer.json index 83533de1b923..d1e0248fb035 100644 --- a/src/Symfony/Bridge/Doctrine/composer.json +++ b/src/Symfony/Bridge/Doctrine/composer.json @@ -20,8 +20,8 @@ "doctrine/common": ">=2.2,<2.4-dev" }, "suggest": { - "symfony/form": "self.version", - "symfony/validator": "self.version", + "symfony/form": "2.1.*", + "symfony/validator": "2.1.*", "doctrine/data-fixtures": "1.0.*", "doctrine/dbal": ">=2.2,<2.4-dev", "doctrine/orm": ">=2.2.3,<2.4-dev" diff --git a/src/Symfony/Bridge/Monolog/composer.json b/src/Symfony/Bridge/Monolog/composer.json index e5d959ed4eda..9c39ec2e1d59 100644 --- a/src/Symfony/Bridge/Monolog/composer.json +++ b/src/Symfony/Bridge/Monolog/composer.json @@ -17,7 +17,7 @@ ], "require": { "php": ">=5.3.3", - "symfony/http-kernel": "self.version", + "symfony/http-kernel": "2.1.*", "monolog/monolog": "1.*" }, "autoload": { diff --git a/src/Symfony/Bridge/Propel1/composer.json b/src/Symfony/Bridge/Propel1/composer.json index c312d98e68da..9219b32388c3 100644 --- a/src/Symfony/Bridge/Propel1/composer.json +++ b/src/Symfony/Bridge/Propel1/composer.json @@ -17,9 +17,9 @@ ], "require": { "php": ">=5.3.3", - "symfony/http-foundation": "self.version", - "symfony/http-kernel": "self.version", - "symfony/form": "self.version", + "symfony/http-foundation": "2.1.*", + "symfony/http-kernel": "2.1.*", + "symfony/form": "2.1.*", "propel/propel1": "1.6.*" }, "autoload": { diff --git a/src/Symfony/Bridge/Swiftmailer/composer.json b/src/Symfony/Bridge/Swiftmailer/composer.json index 560f1fe035ee..5995b79c0777 100644 --- a/src/Symfony/Bridge/Swiftmailer/composer.json +++ b/src/Symfony/Bridge/Swiftmailer/composer.json @@ -20,7 +20,7 @@ "swiftmailer/swiftmailer": ">=4.2.0,<4.3-dev" }, "suggest": { - "symfony/http-kernel": "self.version" + "symfony/http-kernel": "2.1.*" }, "autoload": { "psr-0": { "Symfony\\Bridge\\Swiftmailer": "" } diff --git a/src/Symfony/Bridge/Twig/composer.json b/src/Symfony/Bridge/Twig/composer.json index 9e1914000592..fcb4d946bf75 100644 --- a/src/Symfony/Bridge/Twig/composer.json +++ b/src/Symfony/Bridge/Twig/composer.json @@ -28,12 +28,12 @@ "symfony/security": "2.2.*" }, "suggest": { - "symfony/form": "self.version", - "symfony/routing": "self.version", - "symfony/templating": "self.version", - "symfony/translation": "self.version", - "symfony/yaml": "self.version", - "symfony/security": "self.version" + "symfony/form": "2.1.*", + "symfony/routing": "2.1.*", + "symfony/templating": "2.1.*", + "symfony/translation": "2.1.*", + "symfony/yaml": "2.1.*", + "symfony/security": "2.1.*" }, "autoload": { "psr-0": { "Symfony\\Bridge\\Twig": "" } diff --git a/src/Symfony/Bundle/FrameworkBundle/composer.json b/src/Symfony/Bundle/FrameworkBundle/composer.json index d06ccc27ad05..e41d0005d1cf 100644 --- a/src/Symfony/Bundle/FrameworkBundle/composer.json +++ b/src/Symfony/Bundle/FrameworkBundle/composer.json @@ -17,24 +17,24 @@ ], "require": { "php": ">=5.3.3", - "symfony/dependency-injection" : "self.version", - "symfony/config" : "self.version", - "symfony/event-dispatcher": "self.version", - "symfony/http-kernel": "self.version", - "symfony/filesystem": "self.version", - "symfony/routing": "self.version", - "symfony/templating": "self.version", - "symfony/translation": "self.version", + "symfony/dependency-injection" : "2.1.*", + "symfony/config" : "2.1.*", + "symfony/event-dispatcher": "2.1.*", + "symfony/http-kernel": "2.1.*", + "symfony/filesystem": "2.1.*", + "symfony/routing": "2.1.*", + "symfony/templating": "2.1.*", + "symfony/translation": "2.1.*", "doctrine/common": ">=2.2,<2.4-dev" }, "require-dev": { - "symfony/finder": "self.version" + "symfony/finder": "2.1.*" }, "suggest": { - "symfony/console": "self.version", - "symfony/finder": "self.version", - "symfony/form": "self.version", - "symfony/validator": "self.version" + "symfony/console": "2.1.*", + "symfony/finder": "2.1.*", + "symfony/form": "2.1.*", + "symfony/validator": "2.1.*" }, "autoload": { "psr-0": { "Symfony\\Bundle\\FrameworkBundle": "" } diff --git a/src/Symfony/Bundle/SecurityBundle/composer.json b/src/Symfony/Bundle/SecurityBundle/composer.json index c7f32ec85674..70e6a486580b 100644 --- a/src/Symfony/Bundle/SecurityBundle/composer.json +++ b/src/Symfony/Bundle/SecurityBundle/composer.json @@ -17,7 +17,7 @@ ], "require": { "php": ">=5.3.3", - "symfony/security": "self.version" + "symfony/security": "2.1.*" }, "autoload": { "psr-0": { "Symfony\\Bundle\\SecurityBundle": "" } diff --git a/src/Symfony/Bundle/TwigBundle/composer.json b/src/Symfony/Bundle/TwigBundle/composer.json index 9dc49d2a2297..62978d302247 100644 --- a/src/Symfony/Bundle/TwigBundle/composer.json +++ b/src/Symfony/Bundle/TwigBundle/composer.json @@ -17,7 +17,7 @@ ], "require": { "php": ">=5.3.3", - "symfony/twig-bridge": "self.version" + "symfony/twig-bridge": "2.1.*" }, "autoload": { "psr-0": { "Symfony\\Bundle\\TwigBundle": "" } diff --git a/src/Symfony/Bundle/WebProfilerBundle/composer.json b/src/Symfony/Bundle/WebProfilerBundle/composer.json index 67ab2b048dc2..900880e27517 100644 --- a/src/Symfony/Bundle/WebProfilerBundle/composer.json +++ b/src/Symfony/Bundle/WebProfilerBundle/composer.json @@ -17,7 +17,7 @@ ], "require": { "php": ">=5.3.3", - "symfony/twig-bundle": "self.version" + "symfony/twig-bundle": "2.1.*" }, "autoload": { "psr-0": { "Symfony\\Bundle\\WebProfilerBundle": "" } diff --git a/src/Symfony/Component/BrowserKit/composer.json b/src/Symfony/Component/BrowserKit/composer.json index 8088fbb7b932..47c657f93477 100644 --- a/src/Symfony/Component/BrowserKit/composer.json +++ b/src/Symfony/Component/BrowserKit/composer.json @@ -24,7 +24,7 @@ "symfony/css-selector": "2.2.*" }, "suggest": { - "symfony/process": "self.version" + "symfony/process": "2.1.*" }, "autoload": { "psr-0": { "Symfony\\Component\\BrowserKit": "" } diff --git a/src/Symfony/Component/DependencyInjection/ParameterBag/ParameterBag.php b/src/Symfony/Component/DependencyInjection/ParameterBag/ParameterBag.php index 908e2a146fa2..bfcb5eda3bf9 100644 --- a/src/Symfony/Component/DependencyInjection/ParameterBag/ParameterBag.php +++ b/src/Symfony/Component/DependencyInjection/ParameterBag/ParameterBag.php @@ -135,7 +135,7 @@ public function has($name) */ public function remove($key) { - unset($this->parameters[$key]); + unset($this->parameters[strtolower($key)]); } /** diff --git a/src/Symfony/Component/DependencyInjection/Tests/ParameterBag/ParameterBagTest.php b/src/Symfony/Component/DependencyInjection/Tests/ParameterBag/ParameterBagTest.php index 46fb35837152..968ae9bcf5f4 100644 --- a/src/Symfony/Component/DependencyInjection/Tests/ParameterBag/ParameterBagTest.php +++ b/src/Symfony/Component/DependencyInjection/Tests/ParameterBag/ParameterBagTest.php @@ -54,6 +54,8 @@ public function testRemove() )); $bag->remove('foo'); $this->assertEquals(array('bar' => 'bar'), $bag->all(), '->remove() removes a parameter'); + $bag->remove('BAR'); + $this->assertEquals(array(), $bag->all(), '->remove() converts key to lowercase before removing'); } /** diff --git a/src/Symfony/Component/DependencyInjection/composer.json b/src/Symfony/Component/DependencyInjection/composer.json index ae900cbd4435..f108829d3b46 100644 --- a/src/Symfony/Component/DependencyInjection/composer.json +++ b/src/Symfony/Component/DependencyInjection/composer.json @@ -23,8 +23,8 @@ "symfony/config": "2.2.*" }, "suggest": { - "symfony/yaml": "self.version", - "symfony/config": "self.version" + "symfony/yaml": "2.1.*", + "symfony/config": "2.1.*" }, "autoload": { "psr-0": { "Symfony\\Component\\DependencyInjection": "" } diff --git a/src/Symfony/Component/DomCrawler/composer.json b/src/Symfony/Component/DomCrawler/composer.json index 9f5ef9ca46d2..b22062256123 100644 --- a/src/Symfony/Component/DomCrawler/composer.json +++ b/src/Symfony/Component/DomCrawler/composer.json @@ -22,7 +22,7 @@ "symfony/css-selector": "2.2.*" }, "suggest": { - "symfony/css-selector": "self.version" + "symfony/css-selector": "2.1.*" }, "autoload": { "psr-0": { "Symfony\\Component\\DomCrawler": "" } diff --git a/src/Symfony/Component/EventDispatcher/composer.json b/src/Symfony/Component/EventDispatcher/composer.json index 9cca69216bd5..a706847e980e 100644 --- a/src/Symfony/Component/EventDispatcher/composer.json +++ b/src/Symfony/Component/EventDispatcher/composer.json @@ -22,8 +22,8 @@ "symfony/dependency-injection": "2.2.*" }, "suggest": { - "symfony/dependency-injection": "self.version", - "symfony/http-kernel": "self.version" + "symfony/dependency-injection": "2.1.*", + "symfony/http-kernel": "2.1.*" }, "autoload": { "psr-0": { "Symfony\\Component\\EventDispatcher": "" } diff --git a/src/Symfony/Component/Form/composer.json b/src/Symfony/Component/Form/composer.json index 9b6797377f1c..bd5d58393b66 100644 --- a/src/Symfony/Component/Form/composer.json +++ b/src/Symfony/Component/Form/composer.json @@ -26,8 +26,8 @@ "symfony/http-foundation": "2.2.*" }, "suggest": { - "symfony/validator": "self.version", - "symfony/http-foundation": "self.version" + "symfony/validator": "2.1.*", + "symfony/http-foundation": "2.1.*" }, "autoload": { "psr-0": { "Symfony\\Component\\Form": "" } diff --git a/src/Symfony/Component/HttpKernel/composer.json b/src/Symfony/Component/HttpKernel/composer.json index b1d1c2c4d017..639318596181 100644 --- a/src/Symfony/Component/HttpKernel/composer.json +++ b/src/Symfony/Component/HttpKernel/composer.json @@ -31,12 +31,12 @@ "symfony/routing": "2.2.*" }, "suggest": { - "symfony/browser-kit": "self.version", - "symfony/class-loader": "self.version", - "symfony/config": "self.version", - "symfony/console": "self.version", - "symfony/dependency-injection": "self.version", - "symfony/finder": "self.version" + "symfony/browser-kit": "2.1.*", + "symfony/class-loader": "2.1.*", + "symfony/config": "2.1.*", + "symfony/console": "2.1.*", + "symfony/dependency-injection": "2.1.*", + "symfony/finder": "2.1.*" }, "autoload": { "psr-0": { "Symfony\\Component\\HttpKernel": "" } diff --git a/src/Symfony/Component/Routing/composer.json b/src/Symfony/Component/Routing/composer.json index 88a2b1952e55..d8f0e95e0ce4 100644 --- a/src/Symfony/Component/Routing/composer.json +++ b/src/Symfony/Component/Routing/composer.json @@ -25,8 +25,8 @@ "doctrine/common": ">=2.2,<2.4-dev" }, "suggest": { - "symfony/config": "self.version", - "symfony/yaml": "self.version", + "symfony/config": "2.1.*", + "symfony/yaml": "2.1.*", "doctrine/common": ">=2.2,<2.4-dev" }, "autoload": { diff --git a/src/Symfony/Component/Security/composer.json b/src/Symfony/Component/Security/composer.json index ce5d22878b5a..26fea16f0b9f 100644 --- a/src/Symfony/Component/Security/composer.json +++ b/src/Symfony/Component/Security/composer.json @@ -29,11 +29,11 @@ "doctrine/dbal": ">=2.2,<2.4-dev" }, "suggest": { - "symfony/class-loader": "self.version", - "symfony/finder": "self.version", - "symfony/form": "self.version", - "symfony/validator": "self.version", - "symfony/routing": "self.version", + "symfony/class-loader": "2.1.*", + "symfony/finder": "2.1.*", + "symfony/form": "2.1.*", + "symfony/validator": "2.1.*", + "symfony/routing": "2.1.*", "doctrine/dbal": "to use the built-in ACL implementation" }, "autoload": { diff --git a/src/Symfony/Component/Translation/composer.json b/src/Symfony/Component/Translation/composer.json index caa44e0b0e34..41183c2a5de9 100644 --- a/src/Symfony/Component/Translation/composer.json +++ b/src/Symfony/Component/Translation/composer.json @@ -23,8 +23,8 @@ "symfony/yaml": "2.2.*" }, "suggest": { - "symfony/config": "self.version", - "symfony/yaml": "self.version" + "symfony/config": "2.1.*", + "symfony/yaml": "2.1.*" }, "autoload": { "psr-0": { "Symfony\\Component\\Translation": "" } diff --git a/src/Symfony/Component/Validator/composer.json b/src/Symfony/Component/Validator/composer.json index c016c07fede2..a4702c970f25 100644 --- a/src/Symfony/Component/Validator/composer.json +++ b/src/Symfony/Component/Validator/composer.json @@ -25,8 +25,8 @@ }, "suggest": { "doctrine/common": ">=2.1,<2.4-dev", - "symfony/http-foundation": "self.version", - "symfony/yaml": "self.version" + "symfony/http-foundation": "2.1.*", + "symfony/yaml": "2.1.*" }, "autoload": { "psr-0": { "Symfony\\Component\\Validator": "" }