Remove static closure workaround (#445)

php-pm · Mar 6, 2019 · b25639a · b25639a
1 parent 7a778a5
commit b25639a
Show file tree

Hide file tree

Showing 3 changed files with 14 additions and 22 deletions.
diff --git a/src/ClosureHelper.php b/src/ClosureHelper.php
diff --git a/src/Utils.php b/src/Utils.php
@@ -35,8 +35,9 @@ public static function bindAndCall(callable $fn, $newThis, $args = [], $bindClas
      */
     public static function hijackProperty($object, $propertyName, $newValue)
     {
-        $closure = (new ClosureHelper())->getPropertyAccessor($propertyName, $newValue);
-        Utils::bindAndCall($closure, $object);
+        Utils::bindAndCall(function () use ($object, $propertyName, $newValue) {
+            $object->$propertyName = $newValue;
+        }, $object);
     }
 
     /**

diff --git a/tests/UtilsTest.php b/tests/UtilsTest.php
@@ -32,4 +32,15 @@ public function testParseQueryPath($path, $expected)
     {
         $this->assertEquals($expected, Utils::parseQueryPath($path));
     }
+
+    public function testHijackProperty()
+    {
+        $object = new \PHPPM\SlavePool();
+        Utils::hijackProperty($object, 'slaves', ['SOME VALUE']);
+
+        $r = new \ReflectionObject($object);
+        $p = $r->getProperty('slaves');
+        $p->setAccessible(true);
+        $this->assertEquals(['SOME VALUE'], $p->getValue($object));
+    }
 }