Fix instantiation for latest PHP versions.

Refs: phpspec/phpspec#377. See also: Ocramius/Instantiator#8 (comment)
whatthejeff · Sep 7, 2014 · fe9982d · fe9982d
1 parent 5bc9c7c
commit fe9982d
Show file tree

Hide file tree

Showing 4 changed files with 40 additions and 55 deletions.
diff --git a/composer.json b/composer.json
@@ -17,7 +17,8 @@
         }
     ],
     "require": {
-        "phpdocumentor/reflection-docblock": "~2.0"
+        "phpdocumentor/reflection-docblock": "~2.0",
+        "doctrine/instantiator":             "~1.0,>=1.0.2"
     },
 
     "require-dev": {

diff --git a/spec/Prophecy/Promise/ThrowPromiseSpec.php b/spec/Prophecy/Promise/ThrowPromiseSpec.php
@@ -28,6 +28,18 @@ function it_instantiates_and_throws_exception_from_provided_classname($object, $
             ->duringExecute(array(), $object, $method);
     }
 
+    /**
+     * @param \Prophecy\Prophecy\ObjectProphecy $object
+     * @param \Prophecy\Prophecy\MethodProphecy $method
+     */
+    function it_instantiates_exceptions_with_required_arguments($object, $method)
+    {
+        $this->beConstructedWith('spec\Prophecy\Promise\RequiredArgumentException');
+
+        $this->shouldThrow('spec\Prophecy\Promise\RequiredArgumentException')
+            ->duringExecute(array(), $object, $method);
+    }
+
     /**
      * @param \Prophecy\Prophecy\ObjectProphecy $object
      * @param \Prophecy\Prophecy\MethodProphecy $method
@@ -39,3 +51,8 @@ function it_throws_provided_exception($object, $method)
         $this->shouldThrow($exc)->duringExecute(array(), $object, $method);
     }
 }
+
+class RequiredArgumentException extends \Exception
+{
+    final public function __construct($message, $code) {}
+}
diff --git a/src/Prophecy/Doubler/Doubler.php b/src/Prophecy/Doubler/Doubler.php
@@ -11,6 +11,7 @@
 
 namespace Prophecy\Doubler;
 
+use Doctrine\Instantiator\Instantiator;
 use Prophecy\Doubler\Generator\ClassMirror;
 use Prophecy\Doubler\Generator\ClassCreator;
 use Prophecy\Exception\InvalidArgumentException;
@@ -33,6 +34,11 @@ class Doubler
      */
     private $patches = array();
 
+    /**
+     * @var \Doctrine\Instantiator\Instantiator
+     */
+    private $instantiator;
+
     /**
      * Initializes doubler.
      *
@@ -106,7 +112,11 @@ public function double(ReflectionClass $class = null, array $interfaces, array $
             return $reflection->newInstance();
         }
 
-        return $this->createInstanceWithoutConstructor($reflection);
+        if (!$this->instantiator) {
+            $this->instantiator = new Instantiator();
+        }
+
+        return $this->instantiator->instantiate($classname);
     }
 
     /**
@@ -132,54 +142,4 @@ protected function createDoubleClass(ReflectionClass $class = null, array $inter
 
         return $name;
     }
-
-    /**
-     * Creates an instance without using its constructor using different strategies
-     *
-     * @param ReflectionClass $reflection
-     *
-     * @return object
-     */
-    private function createInstanceWithoutConstructor(ReflectionClass $reflection)
-    {
-        if (version_compare(PHP_VERSION, '5.4', '>=')) {
-            if ($class = $this->createInstanceWithoutConstructorUsingReflection($reflection)) {
-                return $class;
-            }
-        }
-
-        return $this->createInstanceWithoutConstructorUsingUnserialize($reflection);
-    }
-
-    /**
-     * Creates an instance bypassing the constructor using unserialization
-     *
-     * @param ReflectionClass $reflection
-     *
-     * @return object
-     */
-    private function createInstanceWithoutConstructorUsingUnserialize(ReflectionClass $reflection)
-    {
-        $classname = $reflection->getName();
-        $serializedObject = sprintf('O:%d:"%s":0:{}', strlen($classname), $classname);
-
-        return @unserialize($serializedObject);
-    }
-
-    /**
-     * Creates an instance bypassing the constructor using reflection, or null on failure
-     *
-     * @param ReflectionClass $reflection
-     *
-     * @return object|null
-     */
-    private function createInstanceWithoutConstructorUsingReflection(ReflectionClass $reflection)
-    {
-        try {
-            return $reflection->newInstanceWithoutConstructor();
-        } catch (\ReflectionException $e) {
-            // certain internal types can't have their constructor skipped
-            return null;
-        }
-    }
 }
diff --git a/src/Prophecy/Promise/ThrowPromise.php b/src/Prophecy/Promise/ThrowPromise.php
@@ -11,6 +11,7 @@
 
 namespace Prophecy\Promise;
 
+use Doctrine\Instantiator\Instantiator;
 use Prophecy\Prophecy\ObjectProphecy;
 use Prophecy\Prophecy\MethodProphecy;
 use Prophecy\Exception\InvalidArgumentException;
@@ -25,6 +26,11 @@ class ThrowPromise implements PromiseInterface
 {
     private $exception;
 
+    /**
+     * @var \Doctrine\Instantiator\Instantiator
+     */
+    private $instantiator;
+
     /**
      * Initializes promise.
      *
@@ -72,11 +78,12 @@ public function execute(array $args, ObjectProphecy $object, MethodProphecy $met
             if ($constructor->isPublic() && 0 == $constructor->getNumberOfRequiredParameters()) {
                 throw $reflection->newInstance();
             }
-            if (version_compare(PHP_VERSION, '5.4', '<')) {
-                throw unserialize(sprintf('O:%d:"%s":0:{}', strlen($classname), $classname));
+
+            if (!$this->instantiator) {
+                $this->instantiator = new Instantiator();
             }
 
-            throw $reflection->newInstanceWithoutConstructor();
+            throw $this->instantiator->instantiate($classname);
         }
 
         throw $this->exception;