Better handling of proxying core classes

gmazzap · Mar 12, 2017 · a4ff4f2 · a4ff4f2
1 parent 9234362
commit a4ff4f2
Show file tree

Hide file tree

Showing 4 changed files with 27 additions and 4 deletions.
diff --git a/src/Callbacks/DynamicCallbacks.php b/src/Callbacks/DynamicCallbacks.php
@@ -49,6 +49,11 @@ final class DynamicCallbacks implements CallbacksInterface
      */
     private $callbacks = [];
 
+    /**
+     * @var bool
+     */
+    private $userDefined;
+
     /**
      * @param mixed                   $object
      * @param \Andrew\Checker\Checker $checker
@@ -66,6 +71,7 @@ public function __construct($object, Checker $checker = null)
         $this->checker = $checker;
         $this->object = $object;
         $this->class = $class;
+        $this->userDefined = (new \ReflectionClass($class))->isUserDefined();
     }
 
     /**
@@ -148,7 +154,9 @@ private function createCallback($which)
             }
         };
 
-        $this->callbacks[$which] = Closure::bind($caller, $this->object, $this->class);
+        $this->callbacks[$which] = $this->userDefined
+            ? Closure::bind($caller, $this->object, $this->class)
+            : Closure::bind($caller, $this->object);
 
         return $this->callbacks[$which];
     }

diff --git a/src/Callbacks/StaticCallbacks.php b/src/Callbacks/StaticCallbacks.php
@@ -70,11 +70,11 @@ final class StaticCallbacks implements CallbacksInterface
      */
     public function __construct($class, Checker $checker = null)
     {
-        if (ltrim($class, '\\') === 'stdClass') {
-            throw new ClassException('It is not possible to use static proxy with stdClass.');
-        }
         $checker or $checker = new Checker();
         $checker->assertClass($class, __CLASS__.' expects a fully qualified class name.');
+        if (! (new \ReflectionClass($class))->isUserDefined()) {
+            throw new ClassException('It is not possible to use static proxy with PHP native classes.');
+        }
         $this->checker = $checker;
         $this->class = $class;
         $this->object = (new ReflectionClass($class))->newInstanceWithoutConstructor();

diff --git a/tests/src/Unit/DynamicCallbacksTest.php b/tests/src/Unit/DynamicCallbacksTest.php
@@ -83,4 +83,12 @@ public function testCaller()
         assertInternalType('callable', $caller);
         assertSame('Private Dynamic Method Test!', $caller('privateDynamicMethod', [' Test!']));
     }
+
+    public function testCallerCoreClass()
+    {
+        $callbacks = new DynamicCallbacks(new \ArrayObject());
+        $caller = $callbacks->caller();
+        assertInternalType('callable', $caller);
+        assertSame([], $caller('getArrayCopy'));
+    }
 }
diff --git a/tests/src/Unit/StaticCallbacksTest.php b/tests/src/Unit/StaticCallbacksTest.php
@@ -37,6 +37,13 @@ public function testConstructorFailsIfStdClass()
         new StaticCallbacks(\stdClass::class);
     }
 
+    public function testConstructorFailsIfNativeClass()
+    {
+        $this->expectException(ClassException::class);
+
+        new StaticCallbacks(\ArrayObject::class);
+    }
+
     public function testGetter()
     {
         $callbacks = new StaticCallbacks(Stub::class);