Merge branch 'hotfix/26'

Close #26

Author: weierophinney

CHANGELOG.md

@@ -2,7 +2,7 @@
 
 All notable changes to this project will be documented in this file, in reverse chronological order by release.
 
-## 2.7.2 - TBD
+## 2.7.2 - 2015-09-23
 
 ### Added
 
@@ -18,7 +18,10 @@ All notable changes to this project will be documented in this file, in reverse
 
 ### Fixed
 
-- Nothing.
+- [#26](https://github.com/zendframework/zend-stdlib/pull/26) fixes a subtle
+  inheritance issue with deprecation in the hydrators, and updates the
+  `HydratorInterface` to also extend the zend-hydrator `HydratorInterface` to
+  ensure LSP is preserved.
 
 ## 2.7.1 - 2015-09-22
 

src/Hydrator/HydratorInterface.php

@@ -10,10 +10,11 @@
 namespace Zend\Stdlib\Hydrator;
 
 use Zend\Stdlib\Extractor\ExtractionInterface;
+use Zend\Hydrator\HydratorInterface as BaseHydratorInterface;
 
 /**
  * @deprecated Use Zend\Hydrator\HydratorInterface from zendframework/zend-hydrator instead.
  */
-interface HydratorInterface extends HydrationInterface, ExtractionInterface
+interface HydratorInterface extends BaseHydratorInterface, HydrationInterface, ExtractionInterface
 {
 }

test/HydratorDeprecationTest.php

@@ -23,4 +23,37 @@ public function testPassingHydratorExtendingStdlibAbstractHydratorToTypehintedMe
         $hydratorInjected->setHydrator($hydrator);
         $this->assertSame($hydrator, $hydratorInjected->hydrator);
     }
+
+    public function testDeprecatedHydratorInterfaceIsAcceptedByMethodsTypehintedWithNewInterface()
+    {
+        $hydratorInjected = new TestAsset\HydratorInjectedObjectUsingDeprecatedInterfaceTypehint();
+        $hydrator         = new TestAsset\DeprecatedInterfaceHydrator();
+        set_error_handler(function ($errno, $errstr) {
+            $this->fail('Catchable fatal error was triggered: ' . $errstr);
+        }, E_RECOVERABLE_ERROR);
+        $hydratorInjected->setHydrator($hydrator);
+        $this->assertSame($hydrator, $hydratorInjected->hydrator);
+    }
+
+    public function testDeprecatedHydratorInterfaceIsAcceptedByMethodsTypehintedWithDeprecatedHydrationInterface()
+    {
+        $hydratorInjected = new TestAsset\HydratorInjectedObjectUsingDeprecatedHydrationInterfaceTypehint();
+        $hydrator         = new TestAsset\DeprecatedInterfaceHydrator();
+        set_error_handler(function ($errno, $errstr) {
+            $this->fail('Catchable fatal error was triggered: ' . $errstr);
+        }, E_RECOVERABLE_ERROR);
+        $hydratorInjected->setHydrator($hydrator);
+        $this->assertSame($hydrator, $hydratorInjected->hydrator);
+    }
+
+    public function testDeprecatedHydratorInterfaceIsAcceptedByMethodsTypehintedWithDeprecatedExtractionInterface()
+    {
+        $hydratorInjected = new TestAsset\HydratorInjectedObjectUsingDeprecatedExtractionInterfaceTypehint();
+        $hydrator         = new TestAsset\DeprecatedInterfaceHydrator();
+        set_error_handler(function ($errno, $errstr) {
+            $this->fail('Catchable fatal error was triggered: ' . $errstr);
+        }, E_RECOVERABLE_ERROR);
+        $hydratorInjected->setExtractor($hydrator);
+        $this->assertSame($hydrator, $hydratorInjected->extractor);
+    }
 }

test/TestAsset/DeprecatedInterfaceHydrator.php

@@ -0,0 +1,34 @@
+<?php
+/**
+ * @see       http://github.com/zendframework/zend-stdlib for the canonical source repository
+ * @copyright Copyright (c) 2015 Zend Technologies USA Inc. (http://www.zend.com)
+ * @license   https://github.com/zendframework/zend-stdlib/blob/master/LICENSE.md New BSD License
+ */
+
+namespace ZendTest\Stdlib\TestAsset;
+
+use Zend\Stdlib\Hydrator\HydratorInterface;
+
+class DeprecatedInterfaceHydrator implements HydratorInterface
+{
+    /**
+     * Hydrate $object with the provided $data.
+     *
+     * @param  array $data
+     * @param  object $object
+     * @return object
+     */
+    public function hydrate(array $data, $object)
+    {
+    }
+
+    /**
+     * Extract values from an object
+     *
+     * @param  object $object
+     * @return array
+     */
+    public function extract($object)
+    {
+    }
+} 

test/TestAsset/HydratorInjectedObjectUsingDeprecatedExtractionInterfaceTypehint.php

@@ -0,0 +1,24 @@
+<?php
+/**
+ * @see       http://github.com/zendframework/zend-stdlib for the canonical source repository
+ * @copyright Copyright (c) 2015 Zend Technologies USA Inc. (http://www.zend.com)
+ * @license   https://github.com/zendframework/zend-stdlib/blob/master/LICENSE.md New BSD License
+ */
+
+namespace ZendTest\Stdlib\TestAsset;
+
+use Zend\Stdlib\Extractor\ExtractionInterface;
+
+/**
+ * This test asset exists to see how deprecation works; it is associated with
+ * the test ZendTest\Stdlib\HydratorDeprecationTest.
+ */
+class HydratorInjectedObjectUsingDeprecatedExtractionInterfaceTypehint
+{
+    public $extractor;
+
+    public function setExtractor(ExtractionInterface $extractor)
+    {
+        $this->extractor = $extractor;
+    }
+}

test/TestAsset/HydratorInjectedObjectUsingDeprecatedHydrationInterfaceTypehint.php

@@ -0,0 +1,24 @@
+<?php
+/**
+ * @see       http://github.com/zendframework/zend-stdlib for the canonical source repository
+ * @copyright Copyright (c) 2015 Zend Technologies USA Inc. (http://www.zend.com)
+ * @license   https://github.com/zendframework/zend-stdlib/blob/master/LICENSE.md New BSD License
+ */
+
+namespace ZendTest\Stdlib\TestAsset;
+
+use Zend\Stdlib\Hydrator\HydrationInterface;
+
+/**
+ * This test asset exists to see how deprecation works; it is associated with
+ * the test ZendTest\Stdlib\HydratorDeprecationTest.
+ */
+class HydratorInjectedObjectUsingDeprecatedHydrationInterfaceTypehint
+{
+    public $hydrator;
+
+    public function setHydrator(HydrationInterface $hydrator)
+    {
+        $this->hydrator = $hydrator;
+    }
+}

test/TestAsset/HydratorInjectedObjectUsingDeprecatedInterfaceTypehint.php

@@ -0,0 +1,24 @@
+<?php
+/**
+ * @see       http://github.com/zendframework/zend-stdlib for the canonical source repository
+ * @copyright Copyright (c) 2015 Zend Technologies USA Inc. (http://www.zend.com)
+ * @license   https://github.com/zendframework/zend-stdlib/blob/master/LICENSE.md New BSD License
+ */
+
+namespace ZendTest\Stdlib\TestAsset;
+
+use Zend\Hydrator\HydratorInterface;
+
+/**
+ * This test asset exists to see how deprecation works; it is associated with
+ * the test ZendTest\Stdlib\HydratorDeprecationTest.
+ */
+class HydratorInjectedObjectUsingDeprecatedInterfaceTypehint
+{
+    public $hydrator;
+
+    public function setHydrator(HydratorInterface $hydrator)
+    {
+        $this->hydrator = $hydrator;
+    }
+}