Merge remote-tracking branch 'origin/1.1.0-dev' into 1.1.0-dev

tapestry-cloud · Jan 3, 2018 · adf2736 · adf2736
2 parents 0c76489 + 073757f
commit adf2736
Show file tree

Hide file tree

Showing 42 changed files with 1,127 additions and 876 deletions.
diff --git a/composer.json b/composer.json
@@ -29,20 +29,20 @@
   },
   "require": {
     "php": ">=5.6.0",
-    "symfony/console": "^3.1",
-    "symfony/filesystem": "^3.1",
-    "symfony/finder" : "^3.1",
-    "symfony/yaml": "^3.1",
-    "league/container": "^2.2",
-    "league/plates": "^3.1",
+    "symfony/console": "^3.4",
+    "symfony/filesystem": "^3.4",
+    "symfony/finder" : "^3.4",
+    "symfony/yaml": "^3.4",
+    "symfony/process": "^3.4",
+    "league/container": "^2.4",
+    "league/plates": "^3.3",
     "league/event": "^2.1",
-    "nesbot/carbon": "^1.21",
+    "nesbot/carbon": "^1",
     "composer/semver": "^1.4",
-    "michelf/php-markdown": "^1.7",
-    "symfony/process": "^3.4"
+    "michelf/php-markdown": "^1.7"
   },
   "require-dev": {
-    "phpunit/phpunit": "5.7.*"
+    "phpunit/phpunit": "^5"
   },
   "bin": [
     "bin/tapestry.php"