Skip to content

HTTPS clone URL

Subversion checkout URL

You can clone with
or
.
Download ZIP
Browse files

merged 2.1

  • Loading branch information...
commit a9a0f420e2d78fb416063061d8a20d23643826e5 2 parents c5edce7 + 3c32fd9
@fabpot fabpot authored
Showing with 89 additions and 87 deletions.
  1. +32 −32 composer.json
  2. +2 −2 src/Symfony/Bridge/Doctrine/composer.json
  3. +1 −1  src/Symfony/Bridge/Monolog/composer.json
  4. +3 −3 src/Symfony/Bridge/Propel1/composer.json
  5. +1 −1  src/Symfony/Bridge/Swiftmailer/composer.json
  6. +6 −6 src/Symfony/Bridge/Twig/composer.json
  7. +13 −13 src/Symfony/Bundle/FrameworkBundle/composer.json
  8. +1 −1  src/Symfony/Bundle/SecurityBundle/composer.json
  9. +1 −1  src/Symfony/Bundle/TwigBundle/composer.json
  10. +1 −1  src/Symfony/Bundle/WebProfilerBundle/composer.json
  11. +1 −1  src/Symfony/Component/BrowserKit/composer.json
  12. +1 −1  src/Symfony/Component/DependencyInjection/ParameterBag/ParameterBag.php
  13. +2 −0  src/Symfony/Component/DependencyInjection/Tests/ParameterBag/ParameterBagTest.php
  14. +2 −2 src/Symfony/Component/DependencyInjection/composer.json
  15. +1 −1  src/Symfony/Component/DomCrawler/composer.json
  16. +2 −2 src/Symfony/Component/EventDispatcher/composer.json
  17. +2 −2 src/Symfony/Component/Form/composer.json
  18. +6 −6 src/Symfony/Component/HttpKernel/composer.json
  19. +2 −2 src/Symfony/Component/Routing/composer.json
  20. +5 −5 src/Symfony/Component/Security/composer.json
  21. +2 −2 src/Symfony/Component/Translation/composer.json
  22. +2 −2 src/Symfony/Component/Validator/composer.json
View
64 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",
View
4 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"
View
2  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": {
View
6 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": {
View
2  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": "" }
View
12 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": "" }
View
26 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": "" }
View
2  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": "" }
View
2  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": "" }
View
2  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": "" }
View
2  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": "" }
View
2  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)]);
}
/**
View
2  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');
}
/**
View
4 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": "" }
View
2  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": "" }
View
4 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": "" }
View
4 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": "" }
View
12 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": "" }
View
4 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": {
View
10 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": {
View
4 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": "" }
View
4 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": "" }
Please sign in to comment.
Something went wrong with that request. Please try again.