From bbb7f2dc77e7d24a25f5b7844f9ed90b52f60222 Mon Sep 17 00:00:00 2001
From: webimpress <contact@webimpress.com>
Date: Tue, 26 Jul 2016 12:34:09 +0100
Subject: [PATCH] ZF3 compatibility, PHP5.5 support dropped

---
 src/DoctrineModule/Stdlib/Hydrator/DoctrineObject.php        | 5 ++---
 src/DoctrineModule/Stdlib/Hydrator/Filter/PropertyName.php   | 2 +-
 .../Stdlib/Hydrator/Strategy/AbstractCollectionStrategy.php  | 2 +-
 .../Stdlib/Hydrator/Asset/ContextStrategy.php                | 2 +-
 .../Stdlib/Hydrator/Asset/SimpleStrategy.php                 | 2 +-
 .../Stdlib/Hydrator/DoctrineObjectTest.php                   | 5 +----
 6 files changed, 7 insertions(+), 11 deletions(-)

diff --git a/src/DoctrineModule/Stdlib/Hydrator/DoctrineObject.php b/src/DoctrineModule/Stdlib/Hydrator/DoctrineObject.php
index 1ca4be9..d09c5bd 100644
--- a/src/DoctrineModule/Stdlib/Hydrator/DoctrineObject.php
+++ b/src/DoctrineModule/Stdlib/Hydrator/DoctrineObject.php
@@ -27,8 +27,8 @@
 use RuntimeException;
 use Traversable;
 use Zend\Stdlib\ArrayUtils;
-use Zend\Stdlib\Hydrator\AbstractHydrator;
-use Zend\Stdlib\Hydrator\Filter\FilterProviderInterface;
+use Zend\Hydrator\AbstractHydrator;
+use Zend\Hydrator\Filter\FilterProviderInterface;
 
 /**
  * This hydrator has been completely refactored for DoctrineModule 0.7.0. It provides an easy and powerful way
@@ -421,7 +421,6 @@ protected function toMany($object, $collectionName, $target, $values)
 
         // If the collection contains identifiers, fetch the objects from database
         foreach ($values as $value) {
-
             if ($value instanceof $target) {
                 // assumes modifications have already taken place in object
                 $collection[] = $value;
diff --git a/src/DoctrineModule/Stdlib/Hydrator/Filter/PropertyName.php b/src/DoctrineModule/Stdlib/Hydrator/Filter/PropertyName.php
index a9867d4..a5242f6 100644
--- a/src/DoctrineModule/Stdlib/Hydrator/Filter/PropertyName.php
+++ b/src/DoctrineModule/Stdlib/Hydrator/Filter/PropertyName.php
@@ -19,7 +19,7 @@
 
 namespace DoctrineModule\Stdlib\Hydrator\Filter;
 
-use Zend\Stdlib\Hydrator\Filter\FilterInterface;
+use Zend\Hydrator\Filter\FilterInterface;
 
 /**
  * Provides a filter to restrict returned fields by whitelisting or
diff --git a/src/DoctrineModule/Stdlib/Hydrator/Strategy/AbstractCollectionStrategy.php b/src/DoctrineModule/Stdlib/Hydrator/Strategy/AbstractCollectionStrategy.php
index d015c85..b820c1a 100644
--- a/src/DoctrineModule/Stdlib/Hydrator/Strategy/AbstractCollectionStrategy.php
+++ b/src/DoctrineModule/Stdlib/Hydrator/Strategy/AbstractCollectionStrategy.php
@@ -22,7 +22,7 @@
 use InvalidArgumentException;
 use Doctrine\Common\Collections\Collection;
 use Doctrine\Common\Persistence\Mapping\ClassMetadata;
-use Zend\Stdlib\Hydrator\Strategy\StrategyInterface;
+use Zend\Hydrator\Strategy\StrategyInterface;
 
 /**
  * @license MIT
diff --git a/tests/DoctrineModuleTest/Stdlib/Hydrator/Asset/ContextStrategy.php b/tests/DoctrineModuleTest/Stdlib/Hydrator/Asset/ContextStrategy.php
index e7c1096..03eb60b 100644
--- a/tests/DoctrineModuleTest/Stdlib/Hydrator/Asset/ContextStrategy.php
+++ b/tests/DoctrineModuleTest/Stdlib/Hydrator/Asset/ContextStrategy.php
@@ -2,7 +2,7 @@
 
 namespace DoctrineModuleTest\Stdlib\Hydrator\Asset;
 
-use Zend\Stdlib\Hydrator\Strategy\StrategyInterface;
+use Zend\Hydrator\Strategy\StrategyInterface;
 
 class ContextStrategy implements StrategyInterface
 {
diff --git a/tests/DoctrineModuleTest/Stdlib/Hydrator/Asset/SimpleStrategy.php b/tests/DoctrineModuleTest/Stdlib/Hydrator/Asset/SimpleStrategy.php
index a7bbde8..d45650e 100644
--- a/tests/DoctrineModuleTest/Stdlib/Hydrator/Asset/SimpleStrategy.php
+++ b/tests/DoctrineModuleTest/Stdlib/Hydrator/Asset/SimpleStrategy.php
@@ -1,7 +1,7 @@
 <?php
 namespace DoctrineModuleTest\Stdlib\Hydrator\Asset;
 
-use Zend\Stdlib\Hydrator\Strategy\StrategyInterface;
+use Zend\Hydrator\Strategy\StrategyInterface;
 
 class SimpleStrategy implements StrategyInterface
 {
diff --git a/tests/DoctrineModuleTest/Stdlib/Hydrator/DoctrineObjectTest.php b/tests/DoctrineModuleTest/Stdlib/Hydrator/DoctrineObjectTest.php
index e90de77..a89882d 100644
--- a/tests/DoctrineModuleTest/Stdlib/Hydrator/DoctrineObjectTest.php
+++ b/tests/DoctrineModuleTest/Stdlib/Hydrator/DoctrineObjectTest.php
@@ -10,7 +10,7 @@
 use DoctrineModule\Stdlib\Hydrator\Strategy;
 use DoctrineModule\Stdlib\Hydrator\Filter;
 use DoctrineModuleTest\Stdlib\Hydrator\Asset\NamingStrategyEntity;
-use Zend\Stdlib\Hydrator\NamingStrategy\UnderscoreNamingStrategy;
+use Zend\Hydrator\NamingStrategy\UnderscoreNamingStrategy;
 
 class DoctrineObjectTest extends BaseTestCase
 {
@@ -726,7 +726,6 @@ function ($arg) {
             $this->objectManager,
             false
         );
-
     }
 
     public function configureObjectManagerForOneToManyArrayEntity()
@@ -2192,8 +2191,6 @@ function ($target, $arg) use ($entityInDatabaseWithIdOfTwo, $entityInDatabaseWit
 
         $this->assertEquals(3, $entities[1]->getId());
         $this->assertSame($entityInDatabaseWithIdOfThree, $entities[1]);
-
-
     }
 
     public function testAssertCollectionsAreNotSwappedDuringHydration()