Merge pull request #20 from dmaicher/1.x-changes

changes for 1.x branch: do not allow phpunit 6
dmaicher · Jan 4, 2017 · 516bb50 · 516bb50
2 parents 5ea2208 + db0d8d6
commit 516bb50
Showing 1 changed file with 2 additions and 2 deletions.
diff --git a/composer.json b/composer.json
@@ -15,7 +15,7 @@
     "symfony/symfony": "~2.3|~3.0",
     "doctrine/dbal": "~2.5",
     "doctrine/doctrine-bundle": "~1.4",
-    "phpunit/phpunit": "~4.1|~5.0|~6.0"
+    "phpunit/phpunit": "~4.1|~5.0"
   },
   "autoload": {
     "psr-4": {
@@ -27,7 +27,7 @@
   },
   "extra": {
     "branch-alias": {
-      "dev-master": "2.0.x-dev"
+      "dev-master": "1.1.x-dev"
     }
   }
 }