conflict composer.json/lock fix

Author: samsonasik

composer.json

@@ -8,40 +8,44 @@
     ],
     "homepage": "https://github.com/zendframework/zend-mvc",
     "autoload": {
+        "files": [
+            "src/autoload.php"
+        ],
         "psr-4": {
             "Zend\\Mvc\\": "src/"
         }
     },
     "require": {
         "php": "^5.5 || ^7.0",
-        "zendframework/zend-console": "^2.6",
-        "zendframework/zend-eventmanager": "^2.6.2 || ^3.0",
-        "zendframework/zend-servicemanager": "^2.7.5 || ^3.0.3",
-        "zendframework/zend-hydrator": "^1.1 || ^2.1",
-        "zendframework/zend-form": "^2.8.2",
+        "zendframework/zend-console": "^2.7",
+        "zendframework/zend-eventmanager": "^2.6.4 || ^3.0",
+        "zendframework/zend-servicemanager": "^2.7.10 || ^3.0.3",
+        "zendframework/zend-hydrator": "^1.1 || ^2.4",
+        "zendframework/zend-form": "^2.11",
         "zendframework/zend-stdlib": "^2.7.5 || ^3.0",
         "zendframework/zend-psr7bridge": "^0.2",
         "container-interop/container-interop": "^1.1"
     },
     "require-dev": {
-        "zendframework/zend-authentication": "^2.5.3",
-        "zendframework/zend-cache": "^2.6.1",
+        "zendframework/zend-authentication": "^2.6",
+        "zendframework/zend-cache": "^2.8",
         "zendframework/zend-di": "^2.6",
-        "zendframework/zend-filter": "^2.6.1",
-        "zendframework/zend-http": "^2.5.4",
-        "zendframework/zend-i18n": "^2.6",
-        "zendframework/zend-inputfilter": "^2.6",
+        "zendframework/zend-filter": "^2.8",
+        "zendframework/zend-http": "^2.8",
+        "zendframework/zend-i18n": "^2.8",
+        "zendframework/zend-inputfilter": "^2.8",
         "zendframework/zend-json": "^2.6.1",
-        "zendframework/zend-log": "^2.7.1",
-        "zendframework/zend-modulemanager": "^2.7.1",
-        "zendframework/zend-session": "^2.6.2",
-        "zendframework/zend-serializer": "^2.6.1",
-        "zendframework/zend-text": "^2.6",
-        "zendframework/zend-uri": "^2.5",
-        "zendframework/zend-validator": "^2.6",
-        "zendframework/zend-view": "^2.6.3",
+        "zendframework/zend-log": "^2.9.3",
+        "zendframework/zend-modulemanager": "^2.8",
+        "zendframework/zend-session": "^2.8.1",
+        "zendframework/zend-serializer": "^2.8",
+        "zendframework/zend-text": "^2.7",
+        "zendframework/zend-uri": "^2.6",
+        "zendframework/zend-validator": "^2.10",
+        "zendframework/zend-view": "^2.9",
         "friendsofphp/php-cs-fixer": "1.7.*",
-        "phpunit/PHPUnit": "^4.5",
+        "phpunit/phpunit": "^4.8.36",
+        "sebastian/comparator": "^1.2.4",
         "sebastian/version": "^1.0.4"
     },
     "replace": {
@@ -88,4 +92,4 @@
         "test": "phpunit",
         "test-coverage": "phpunit --coverage-clover clover.xml"
     }
-}
+}