Merge branch '2.8'

Conflicts: src/Symfony/Bridge/PhpUnit/composer.json src/Symfony/Component/Serializer/composer.json
symfony · Oct 29, 2015 · fc2eff8 · fc2eff8
2 parents d0acda8 + 5e666e6
commit fc2eff8
Show file tree

Hide file tree

Showing 2 changed files with 2 additions and 2 deletions.
diff --git a/src/Symfony/Component/Asset/composer.json b/src/Symfony/Component/Asset/composer.json
@@ -16,7 +16,7 @@
         }
     ],
     "require": {
-        "php": ">=5.3.3"
+        "php": ">=5.3.9"
     },
     "suggest": {
         "symfony/http-foundation": ""

diff --git a/src/Symfony/Component/Serializer/composer.json b/src/Symfony/Component/Serializer/composer.json
@@ -17,7 +17,7 @@
     ],
     "require": {
         "php": ">=5.5.9",
-        "symfony/polyfill-php54": "~1.0"
+        "symfony/polyfill-php55": "~1.0"
     },
     "require-dev": {
         "symfony/yaml": "~2.8|~3.0",