Fixed incorrectly rebased composer dependencies

zendframework · Apr 28, 2017 · 7d89900 · 7d89900
1 parent b05cd8b
commit 7d89900
Show file tree

Hide file tree

Showing 2 changed files with 457 additions and 549 deletions.
diff --git a/composer.json b/composer.json
@@ -24,10 +24,10 @@
         "zendframework/zend-view": "^2.6.7"
     },
     "require-dev": {
+        "phpunit/phpunit": "^6.0.7 || ^5.7.14",
+        "zendframework/zend-coding-standard": "~1.0.0",
         "zendframework/zend-json": "^2.6.1 || ^3.0",
         "zendframework/zend-psr7bridge": "^0.2",
-        "fabpot/php-cs-fixer": "1.7.*",
-        "phpunit/phpunit": "^4.5",
         "zendframework/zend-stratigility": "^2.0.1"
     },
     "suggest": {