Use the provided ReflectionProperty for Matchers and Filters (#107)

src/DeepCopy/DeepCopy.php

@@ -214,10 +214,10 @@ private function copyObjectProperty($object, ReflectionProperty $property)
             /** @var Filter $filter */
             $filter = $item['filter'];
 
-            if ($matcher->matches($object, $property->getName())) {
+            if ($matcher->matches($object, $property)) {
                 $filter->apply(
                     $object,
-                    $property->getName(),
+                    $property,
                     function ($object) {
                         return $this->recursiveCopy($object);
                     }

src/DeepCopy/Filter/Doctrine/DoctrineCollectionFilter.php

@@ -3,7 +3,7 @@
 namespace DeepCopy\Filter\Doctrine;
 
 use DeepCopy\Filter\Filter;
-use DeepCopy\Reflection\ReflectionHelper;
+use ReflectionProperty;
 
 /**
  * @final
@@ -15,10 +15,8 @@ class DoctrineCollectionFilter implements Filter
      *
      * {@inheritdoc}
      */
-    public function apply($object, $property, $objectCopier)
+    public function apply($object, ReflectionProperty $reflectionProperty, $objectCopier)
     {
-        $reflectionProperty = ReflectionHelper::getProperty($object, $property);
-
         $reflectionProperty->setAccessible(true);
         $oldCollection = $reflectionProperty->getValue($object);
 

src/DeepCopy/Filter/Doctrine/DoctrineEmptyCollectionFilter.php

@@ -3,8 +3,8 @@
 namespace DeepCopy\Filter\Doctrine;
 
 use DeepCopy\Filter\Filter;
-use DeepCopy\Reflection\ReflectionHelper;
 use Doctrine\Common\Collections\ArrayCollection;
+use ReflectionProperty;
 
 /**
  * @final
@@ -14,13 +14,10 @@ class DoctrineEmptyCollectionFilter implements Filter
     /**
      * Sets the object property to an empty doctrine collection.
      *
-     * @param object   $object
-     * @param string   $property
-     * @param callable $objectCopier
+     * {@inheritdoc}
      */
-    public function apply($object, $property, $objectCopier)
+    public function apply($object, ReflectionProperty $reflectionProperty, $objectCopier)
     {
-        $reflectionProperty = ReflectionHelper::getProperty($object, $property);
         $reflectionProperty->setAccessible(true);
 
         $reflectionProperty->setValue($object, new ArrayCollection());

src/DeepCopy/Filter/Doctrine/DoctrineProxyFilter.php

@@ -3,6 +3,7 @@
 namespace DeepCopy\Filter\Doctrine;
 
 use DeepCopy\Filter\Filter;
+use ReflectionProperty;
 
 /**
  * @final
@@ -15,7 +16,7 @@ class DoctrineProxyFilter implements Filter
      *
      * {@inheritdoc}
      */
-    public function apply($object, $property, $objectCopier)
+    public function apply($object, ReflectionProperty $reflectionProperty, $objectCopier)
     {
         $object->__load();
     }

src/DeepCopy/Filter/Filter.php

@@ -2,6 +2,8 @@
 
 namespace DeepCopy\Filter;
 
+use ReflectionProperty;
+
 /**
  * Filter to apply to a property while copying an object
  */
@@ -10,9 +12,9 @@ interface Filter
     /**
      * Applies the filter to the object.
      *
-     * @param object   $object
-     * @param string   $property
-     * @param callable $objectCopier
+     * @param object             $object
+     * @param ReflectionProperty $reflectionProperty
+     * @param callable           $objectCopier
      */
-    public function apply($object, $property, $objectCopier);
+    public function apply($object, ReflectionProperty $reflectionProperty, $objectCopier);
 }

src/DeepCopy/Filter/KeepFilter.php

@@ -2,14 +2,16 @@
 
 namespace DeepCopy\Filter;
 
+use ReflectionProperty;
+
 class KeepFilter implements Filter
 {
     /**
      * Keeps the value of the object property.
      *
      * {@inheritdoc}
      */
-    public function apply($object, $property, $objectCopier)
+    public function apply($object, ReflectionProperty $reflectionProperty, $objectCopier)
     {
         // Nothing to do
     }

src/DeepCopy/Filter/ReplaceFilter.php

@@ -2,7 +2,7 @@
 
 namespace DeepCopy\Filter;
 
-use DeepCopy\Reflection\ReflectionHelper;
+use ReflectionProperty;
 
 /**
  * @final
@@ -27,9 +27,8 @@ public function __construct(callable $callable)
      *
      * {@inheritdoc}
      */
-    public function apply($object, $property, $objectCopier)
+    public function apply($object, ReflectionProperty $reflectionProperty, $objectCopier)
     {
-        $reflectionProperty = ReflectionHelper::getProperty($object, $property);
         $reflectionProperty->setAccessible(true);
 
         $value = call_user_func($this->callback, $reflectionProperty->getValue($object));

src/DeepCopy/Filter/SetNullFilter.php

@@ -2,7 +2,7 @@
 
 namespace DeepCopy\Filter;
 
-use DeepCopy\Reflection\ReflectionHelper;
+use ReflectionProperty;
 
 /**
  * @final
@@ -14,10 +14,8 @@ class SetNullFilter implements Filter
      *
      * {@inheritdoc}
      */
-    public function apply($object, $property, $objectCopier)
+    public function apply($object, ReflectionProperty $reflectionProperty, $objectCopier)
     {
-        $reflectionProperty = ReflectionHelper::getProperty($object, $property);
-
         $reflectionProperty->setAccessible(true);
         $reflectionProperty->setValue($object, null);
     }

src/DeepCopy/Matcher/Doctrine/DoctrineProxyMatcher.php

@@ -4,6 +4,7 @@
 
 use DeepCopy\Matcher\Matcher;
 use Doctrine\Common\Persistence\Proxy;
+use ReflectionProperty;
 
 /**
  * @final
@@ -15,7 +16,7 @@ class DoctrineProxyMatcher implements Matcher
      *
      * {@inheritdoc}
      */
-    public function matches($object, $property)
+    public function matches($object, ReflectionProperty $reflectionProperty)
     {
         return $object instanceof Proxy;
     }

src/DeepCopy/Matcher/Matcher.php

@@ -2,13 +2,15 @@
 
 namespace DeepCopy\Matcher;
 
+use ReflectionProperty;
+
 interface Matcher
 {
     /**
-     * @param object $object
-     * @param string $property
+     * @param object             $object
+     * @param ReflectionProperty $reflectionProperty
      *
      * @return boolean
      */
-    public function matches($object, $property);
+    public function matches($object, ReflectionProperty $reflectionProperty);
 }

src/DeepCopy/Matcher/PropertyMatcher.php

@@ -2,6 +2,8 @@
 
 namespace DeepCopy\Matcher;
 
+use ReflectionProperty;
+
 /**
  * @final
  */
@@ -32,8 +34,8 @@ public function __construct($class, $property)
      *
      * {@inheritdoc}
      */
-    public function matches($object, $property)
+    public function matches($object, ReflectionProperty $reflectionProperty)
     {
-        return ($object instanceof $this->class) && $property == $this->property;
+        return ($object instanceof $this->class) && $reflectionProperty->getName() == $this->property;
     }
 }

src/DeepCopy/Matcher/PropertyNameMatcher.php

@@ -2,6 +2,8 @@
 
 namespace DeepCopy\Matcher;
 
+use ReflectionProperty;
+
 /**
  * @final
  */
@@ -25,8 +27,8 @@ public function __construct($property)
      *
      * {@inheritdoc}
      */
-    public function matches($object, $property)
+    public function matches($object, ReflectionProperty $reflectionProperty)
     {
-        return $property == $this->property;
+        return $reflectionProperty->getName() == $this->property;
     }
 }

src/DeepCopy/Matcher/PropertyTypeMatcher.php

@@ -2,8 +2,7 @@
 
 namespace DeepCopy\Matcher;
 
-use DeepCopy\Reflection\ReflectionHelper;
-use ReflectionException;
+use ReflectionProperty;
 
 /**
  * Matches a property by its type.
@@ -31,14 +30,8 @@ public function __construct($propertyType)
     /**
      * {@inheritdoc}
      */
-    public function matches($object, $property)
+    public function matches($object, ReflectionProperty $reflectionProperty)
     {
-        try {
-            $reflectionProperty = ReflectionHelper::getProperty($object, $property);
-        } catch (ReflectionException $exception) {
-            return false;
-        }
-
         $reflectionProperty->setAccessible(true);
 
         return $reflectionProperty->getValue($object) instanceof $this->propertyType;

src/DeepCopy/Reflection/ReflectionHelper.php

@@ -43,36 +43,4 @@ public static function getProperties(ReflectionClass $ref)
 
         return $propsArr;
     }
-
-    /**
-     * Retrieves property by name from object and all its ancestors.
-     *
-     * @param object|string $object
-     * @param string $name
-     *
-     * @throws PropertyException
-     * @throws ReflectionException
-     *
-     * @return ReflectionProperty
-     */
-    public static function getProperty($object, $name)
-    {
-        $reflection = is_object($object) ? new ReflectionObject($object) : new ReflectionClass($object);
-
-        if ($reflection->hasProperty($name)) {
-            return $reflection->getProperty($name);
-        }
-
-        if ($parentClass = $reflection->getParentClass()) {
-            return self::getProperty($parentClass->getName(), $name);
-        }
-
-        throw new PropertyException(
-            sprintf(
-                'The class "%s" doesn\'t have a property with the given name: "%s".',
-                is_object($object) ? get_class($object) : $object,
-                $name
-            )
-        );
-    }
 }

tests/DeepCopyTest/DeepCopyTest.php

@@ -17,6 +17,7 @@
 use DeepCopy\f007;
 use DeepCopy\f008;
 use DeepCopy\Filter\KeepFilter;
+use DeepCopy\Filter\ReplaceFilter;
 use DeepCopy\Filter\SetNullFilter;
 use DeepCopy\Matcher\PropertyNameMatcher;
 use DeepCopy\Matcher\PropertyTypeMatcher;
@@ -424,6 +425,21 @@ public function test_matchers_can_access_to_parent_private_properties()
         $this->assertNull($copy->getFoo());
     }
 
+    public function test_private_property_of_parent_object_copy_with_filters_and_matchers()
+    {
+        $object = new f001\B();
+        $object->setAProp(new stdClass());
+        $object->setBProp(new stdClass());
+
+        $deepCopy = new DeepCopy();
+        $deepCopy->addFilter(new ReplaceFilter(function() {return 'foo';}), new PropertyTypeMatcher(stdClass::class));
+
+        $new = $deepCopy->copy($object);
+
+        $this->assertSame('foo', $new->getAProp());
+        $this->assertSame('foo', $new->getBProp());
+    }
+
     private function assertEqualButNotSame($expected, $val)
     {
         $this->assertEquals($expected, $val);

tests/DeepCopyTest/Filter/Doctrine/DoctrineCollectionFilterTest.php

@@ -6,6 +6,7 @@
 use Doctrine\Common\Collections\ArrayCollection;
 use Doctrine\Common\Collections\Collection;
 use PHPUnit\Framework\TestCase;
+use ReflectionProperty;
 use stdClass;
 
 /**
@@ -15,7 +16,9 @@ class DoctrineCollectionFilterTest extends TestCase
 {
     public function test_it_copies_the_object_property_array_collection()
     {
-        $object = new stdClass();
+        $object = new class {
+            public $foo;
+        };
         $oldCollection = new ArrayCollection();
         $oldCollection->add($stdClass = new stdClass());
         $object->foo = $oldCollection;
@@ -24,7 +27,7 @@ public function test_it_copies_the_object_property_array_collection()
 
         $filter->apply(
             $object,
-            'foo',
+            new ReflectionProperty($object, 'foo'),
             function($item) {
                 return null;
             }

tests/DeepCopyTest/Filter/Doctrine/DoctrineEmptyCollectionFilterTest.php

@@ -6,6 +6,7 @@
 use Doctrine\Common\Collections\ArrayCollection;
 use Doctrine\Common\Collections\Collection;
 use PHPUnit\Framework\TestCase;
+use ReflectionProperty;
 use stdClass;
 
 /**
@@ -15,8 +16,9 @@ class DoctrineEmptyCollectionFilterTest extends TestCase
 {
     public function test_it_sets_the_object_property_to_an_empty_doctrine_collection()
     {
-        $object = new stdClass();
-
+        $object = new class {
+            public $foo;
+        };
         $collection = new ArrayCollection();
         $collection->add(new stdClass());
 
@@ -26,7 +28,7 @@ public function test_it_sets_the_object_property_to_an_empty_doctrine_collection
 
         $filter->apply(
             $object,
-            'foo',
+            new ReflectionProperty($object, 'foo'),
             function($item) {
                 return null;
             }