Merge branch 'hotfix/7672' into develop

Forward port #69

Author: weierophinney

.travis.yml

@@ -23,7 +23,6 @@ matrix:
     - php: 7
     - php: hhvm 
   allow_failures:
-    - php: 7
     - php: hhvm
 
 notifications:

CHANGELOG.md

@@ -91,7 +91,7 @@ All notable changes to this project will be documented in this file, in reverse
     factories by default. You can force it to do so by passing an optional
     second argument, a boolean flag, with a value of boolean true.
 
-## 2.6.1 - TBD
+## 2.6.1 - 2016-02-16
 
 ### Added
 
@@ -107,7 +107,17 @@ All notable changes to this project will be documented in this file, in reverse
 
 ### Fixed
 
-- Nothing.
+- [#69](https://github.com/zendframework/zend-mvc/pull/69) largely reverts
+  [#30](https://github.com/zendframework/zend-mvc/pull/30), having the component
+  utilize the `HydratorPluginManager` from zend-stdlib 2.7.5. This was done to
+  provide backwards compatibility; while zend-stdlib Hydrator types can be used
+  in place of zend-hydrator types, the reverse is not true.
+
+  You can make your code forwards-compatible with version 3, where the
+  `HydratorPluginManager` will be pulled from zend-hydrator, by updating your
+  typehints to use the zend-hydrator classes instead of those from zend-stdlib;
+  the instances returned from the zend-stdlib `HydratorPluginManager`, because
+  they extend those from zend-hydrator, remain compatible. 
 
 ## 2.6.0 - 2015-09-22
 

composer.json

@@ -13,12 +13,12 @@
         }
     },
     "require": {
-        "php": ">=5.5",
+        "php": "^5.5 || ^7.0",
         "zendframework/zend-eventmanager": "dev-develop as 2.7.0",
         "zendframework/zend-servicemanager": "dev-develop as 2.6.0",
         "zendframework/zend-hydrator": "~1.0",
         "zendframework/zend-form": "~2.6",
-        "zendframework/zend-stdlib": "~2.7",
+        "zendframework/zend-stdlib": "^2.7.5",
         "zendframework/zend-psr7bridge": "^0.2",
         "container-interop/container-interop": "^1.1"
     },

test/Service/HydratorManagerFactoryTest.php

@@ -0,0 +1,30 @@
+<?php
+/**
+ * Zend Framework (http://framework.zend.com/)
+ *
+ * @link      http://github.com/zendframework/zf2 for the canonical source repository
+ * @copyright Copyright (c) 2005-2015 Zend Technologies USA Inc. (http://www.zend.com)
+ * @license   http://framework.zend.com/license/new-bsd New BSD License
+ */
+
+namespace ZendTest\Mvc\Service;
+
+use Interop\Container\ContainerInterface;
+use PHPUnit_Framework_TestCase as TestCase;
+use Zend\Hydrator\HydratorPluginManager;
+use Zend\Mvc\Service\HydratorManagerFactory;
+
+class HydratorManagerFactoryTest extends TestCase
+{
+    public function setUp()
+    {
+        $this->factory = new HydratorManagerFactory();
+        $this->services = $this->prophesize(ContainerInterface::class);
+    }
+
+    public function testFactoryReturnsZendHydratorManagerInstance()
+    {
+        $hydrators = $this->factory->__invoke($this->services->reveal(), null);
+        $this->assertInstanceOf(HydratorPluginManager::class, $hydrators);
+    }
+}