Merge branch 'master' of https://github.com/PHP-DI/ZF2-Bridge

# Conflicts:
#	config/module.config.php
#	src/DI/ZendFramework2/Service/CacheFactory.php

.travis.yml

@@ -4,6 +4,7 @@ php:
   - 5.5
   - 5.6
   - 7.0
+  - 7.1
   - hhvm
 
 before_script:

README.md

@@ -134,6 +134,22 @@ return [
 ];
 ```
 
+### Enable Memcached cache
+
+If you're using Memcached, you should have only one project per memcached instance.
+
+```php
+return [
+    'phpdi-zf2' => [
+        'cache' => [
+            'adapter' => 'memcached',
+            'host' => 'localhost', // default is localhost
+            'port' => 11211, // default is 11211
+        ],
+    ]
+];
+```
+
 ## Console commands
 
 ### Clear definition cache

composer.json

@@ -13,10 +13,10 @@
     },
 
     "require-dev": {
-        "zendframework/zendframework": "~2.5",
         "squizlabs/php_codesniffer": "~2.0",
         "phpmd/phpmd" : "~2.0",
-        "phpunit/phpunit": "~4.8"
+        "phpunit/phpunit": "~4.8",
+        "zendframework/zendframework": "^2.5"
     },
 
     "autoload": {

config/module.config.php

@@ -8,6 +8,14 @@
  */
 namespace DI\ZendFramework2;
 
+// compatibility with zend > 2.5
+$controllerType = 'ControllerLoader';
+if (class_exists('\Zend\Version\Version')) {
+    if (\Zend\Version\Version::compareVersion('2.5.3') <= 0) {
+        $controllerType = 'ControllerManager';
+    }
+}
+
 return [
     'controllers' => [
         'invokables' => [
@@ -21,7 +29,7 @@
         ),
 
         'factories' => [
-            'ControllerLoader' => __NAMESPACE__ . '\\Service\\ControllerLoaderFactory',
+            $controllerType => __NAMESPACE__ . '\\Service\\ControllerLoaderFactory',
             'DiCache' => __NAMESPACE__ . '\\Service\\CacheFactory\CacheFactory',
         ],
     ],