Replaced newInstanceWithoutConstructor with doctrine\instantiator

phpro · Jan 16, 2015 · 1036ca4 · 1036ca4
1 parent 083f9a2
commit 1036ca4
Show file tree

Hide file tree

Showing 3 changed files with 9 additions and 5 deletions.
diff --git a/composer.json b/composer.json
@@ -19,7 +19,8 @@
       "zendframework/zend-modulemanager": "2.*",
       "zendframework/zend-servicemanager": "2.*",
       "zendframework/zend-stdlib": "2.*",
-      "doctrine/doctrine-module": ">=0.8.0"
+      "doctrine/doctrine-module": ">=0.8.0",
+      "doctrine/instantiator": "~1.0.4"
     },
     "require-dev": {
       "fabpot/PHP-CS-Fixer": "*",

diff --git a/src/Hydrator/ODM/MongoDB/Strategy/EmbeddedCollection.php b/src/Hydrator/ODM/MongoDB/Strategy/EmbeddedCollection.php
@@ -8,6 +8,7 @@
 
 use Doctrine\Common\Collections\Collection;
 use DoctrineModule\Stdlib\Hydrator;
+use Doctrine\Instantiator\Instantiator;
 
 /**
  * Class PersistentCollection
@@ -92,8 +93,8 @@ protected function hydrateSingle($targetDocument, $document)
             return $document;
         }
 
-        $rc = new \ReflectionClass($targetDocument);
-        $object = $rc->newInstance();
+        $instantiator = new Instantiator();
+        $object = $instantiator->instantiate($targetDocument);
 
         $hydrator = $this->getDoctrineHydrator($targetDocument);
         $hydrator->hydrate($document, $object);

diff --git a/src/Hydrator/ODM/MongoDB/Strategy/EmbeddedField.php b/src/Hydrator/ODM/MongoDB/Strategy/EmbeddedField.php
@@ -6,6 +6,8 @@
 
 namespace Phpro\DoctrineHydrationModule\Hydrator\ODM\MongoDB\Strategy;
 
+use Doctrine\Instantiator\Instantiator;
+
 /**
  * Class PersistentCollection
  *
@@ -39,8 +41,8 @@ public function hydrate($value)
             return $value;
         }
 
-        $rc = new \ReflectionClass($targetDocument);
-        $object = $rc->newInstance();
+        $instantiator = new Instantiator();
+        $object = $instantiator->instantiate($targetDocument);
 
         $hydrator = $this->getDoctrineHydrator($targetDocument);
         $hydrator->hydrate($value, $object);