Pull merge.

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

diff --git a/vendor/symfony/yaml/composer.json b/vendor/symfony/yaml/composer.json
index 9c92bebcf2e00f5dfe33453704aea8ecfa20f2e8..933547da02195e39292849c4d1c132f13f5592e2 100644 (file)
--- a/vendor/symfony/yaml/composer.json
+++ b/vendor/symfony/yaml/composer.json
@@ -16,10 +16,14 @@
         }
     ],
     "require": {
-        "php": ">=5.5.9"
+        "php": "^5.5.9|>=7.0.8",
+        "symfony/polyfill-ctype": "~1.8"
     },
     "require-dev": {
-        "symfony/console": "~2.8|~3.0"
+        "symfony/console": "~3.4|~4.0"
+    },
+    "conflict": {
+        "symfony/console": "<3.4"
     },
     "suggest": {
         "symfony/console": "For validating YAML files using the lint command"
@@ -33,7 +37,7 @@
     "minimum-stability": "dev",
     "extra": {
         "branch-alias": {
-            "dev-master": "3.2-dev"
+            "dev-master": "3.4-dev"
         }
     }
 }