Merge pull request #3 from radutopala/sf3.1

dependencies update
radutopala · Jul 13, 2016 · 4b52ec1 · 4b52ec1
2 parents aaa3578 + e56ffa0
commit 4b52ec1
Show file tree

Hide file tree

Showing 4 changed files with 16 additions and 724 deletions.
diff --git a/.gitignore b/.gitignore
@@ -3,3 +3,4 @@ vendor
 *.phar
 build
 box.json
+composer.lock
diff --git a/composer.json b/composer.json
@@ -12,13 +12,13 @@
     }
   ],
   "require": {
-    "php": ">=5.4",
-    "symfony/console": "^2.8",
+    "php": ">=5.6",
+    "symfony/console": "^2.8|^3",
     "padraic/phar-updater": "^1.0",
     "guzzlehttp/guzzle": "^6.2",
-    "symfony/yaml": "^2.8",
-    "symfony/filesystem": "^2.8",
-    "phpdocumentor/reflection-docblock": "~2.0",
+    "symfony/yaml": "^2.8|^3",
+    "symfony/filesystem": "^2.8|^3",
+    "phpdocumentor/reflection-docblock": "~3.0",
     "mattketmo/camel": "~1.1",
     "rybakit/arguments-resolver": "~0.5.0"
   },
-Original file line number
+Diff line change
@@ Expand Up / @@ -3,3 +3,4 @@ vendor @@
     *.phar
     build
     box.json
+    composer.lock