Pull merge.

[yaffs-website] / vendor / symfony / process / composer.json

diff --git a/vendor/symfony/process/composer.json b/vendor/symfony/process/composer.json
index b3cb5186fc9408d5849399c1e2b958899eb82ba7..b8867db368038cbe11cc5120991981fc90a6cb48 100644 (file)
--- a/vendor/symfony/process/composer.json
+++ b/vendor/symfony/process/composer.json
@@ -16,7 +16,7 @@
         }
     ],
     "require": {
-        "php": ">=5.3.9"
+        "php": "^5.5.9|>=7.0.8"
     },
     "autoload": {
         "psr-4": { "Symfony\\Component\\Process\\": "" },
@@ -27,7 +27,7 @@
     "minimum-stability": "dev",
     "extra": {
         "branch-alias": {
-            "dev-master": "2.8-dev"
+            "dev-master": "3.4-dev"
         }
     }
 }