Matchers & Filters: use the right ReflectionProperty

src/DeepCopy/DeepCopy.php

@@ -162,10 +162,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

@@ -13,10 +13,8 @@ class DoctrineCollectionFilter implements Filter
     /**
      * {@inheritdoc}
      */
-    public function apply($object, $property, $objectCopier)
+    public function apply($object, ReflectionProperty $reflectionProperty, $objectCopier)
     {
-        $reflectionProperty = new ReflectionProperty($object, $property);
-
         $reflectionProperty->setAccessible(true);
         $oldCollection = $reflectionProperty->getValue($object);
 

src/DeepCopy/Filter/Doctrine/DoctrineEmptyCollectionFilter.php

@@ -4,6 +4,7 @@
 
 use DeepCopy\Filter\Filter;
 use Doctrine\Common\Collections\ArrayCollection;
+use ReflectionProperty;
 
 class DoctrineEmptyCollectionFilter implements Filter
 {
@@ -14,9 +15,8 @@ class DoctrineEmptyCollectionFilter implements Filter
      * @param string   $property
      * @param callable $objectCopier
      */
-    public function apply($object, $property, $objectCopier)
+    public function apply($object, ReflectionProperty $reflectionProperty, $objectCopier)
     {
-        $reflectionProperty = new \ReflectionProperty($object, $property);
         $reflectionProperty->setAccessible(true);
 
         $reflectionProperty->setValue($object, new ArrayCollection());

src/DeepCopy/Filter/Filter.php

@@ -2,16 +2,18 @@
 
 namespace DeepCopy\Filter;
 
+use ReflectionProperty;
+
 /**
  * Filter to apply to a property while copying an object
  */
 interface Filter
 {
     /**
      * Apply 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,6 +2,8 @@
 
 namespace DeepCopy\Filter;
 
+use ReflectionProperty;
+
 /**
  * Keep the value of a property
  */
@@ -10,7 +12,7 @@ class KeepFilter implements Filter
     /**
      * {@inheritdoc}
      */
-    public function apply($object, $property, $objectCopier)
+    public function apply($object, ReflectionProperty $reflectionProperty, $objectCopier)
     {
         // Nothing to do
     }

src/DeepCopy/Filter/ReplaceFilter.php

@@ -2,6 +2,8 @@
 
 namespace DeepCopy\Filter;
 
+use ReflectionProperty;
+
 /**
  * Replace the value of a property
  */
@@ -23,9 +25,8 @@ public function __construct(callable $callable)
     /**
      * {@inheritdoc}
      */
-    public function apply($object, $property, $objectCopier)
+    public function apply($object, ReflectionProperty $reflectionProperty, $objectCopier)
     {
-        $reflectionProperty = new \ReflectionProperty($object, $property);
         $reflectionProperty->setAccessible(true);
 
         $value = call_user_func($this->callback, $reflectionProperty->getValue($object));

src/DeepCopy/Filter/SetNullFilter.php

@@ -12,10 +12,8 @@ class SetNullFilter implements Filter
     /**
      * {@inheritdoc}
      */
-    public function apply($object, $property, $objectCopier)
+    public function apply($object, ReflectionProperty $reflectionProperty, $objectCopier)
     {
-        $reflectionProperty = new ReflectionProperty($object, $property);
-
         $reflectionProperty->setAccessible(true);
         $reflectionProperty->setValue($object, null);
     }

src/DeepCopy/Matcher/Matcher.php

@@ -2,6 +2,8 @@
 
 namespace DeepCopy\Matcher;
 
+use ReflectionProperty;
+
 /**
  * Matcher interface
  */
@@ -12,5 +14,5 @@ interface Matcher
      * @param string $property
      * @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;
+
 /**
  * Match a specific property of a specific class
  */
@@ -30,8 +32,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;
+
 /**
  * Match a property by its name
  */
@@ -23,8 +25,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

@@ -28,9 +28,8 @@ public function __construct($propertyType)
     /**
      * {@inheritdoc}
      */
-    public function matches($object, $property)
+    public function matches($object, ReflectionProperty $reflectionProperty)
     {
-        $reflectionProperty = new ReflectionProperty($object, $property);
         $reflectionProperty->setAccessible(true);
 
         return $reflectionProperty->getValue($object) instanceof $this->propertyType;

tests/DeepCopyTest/DeepCopyTest.php

@@ -4,9 +4,12 @@
 
 use DeepCopy\DeepCopy;
 use DeepCopy\Filter\Filter;
+use DeepCopy\Filter\ReplaceFilter;
 use DeepCopy\Matcher\PropertyMatcher;
+use DeepCopy\Matcher\PropertyTypeMatcher;
 use DeepCopy\TypeFilter\TypeFilter;
 use DeepCopy\TypeMatcher\TypeMatcher;
+use ReflectionProperty;
 
 /**
  * DeepCopyTest
@@ -53,6 +56,21 @@ public function testPrivatePropertyOfParentObjectCopy()
         $this->assertDeepCopyOf($o, $deepCopy->copy($o));
     }
 
+    public function testPrivatePropertyOfParentObjectCopyWithFiltersAndMatchers()
+    {
+        $o = new E();
+        $o->setProperty1(new B);
+        $o->setProperty2(new B);
+
+        $deepCopy = new DeepCopy();
+        $deepCopy->addFilter(new ReplaceFilter(function() {return 'foo';}), new PropertyTypeMatcher('DeepCopyTest\B'));
+
+        $new = $deepCopy->copy($o);
+
+        $this->assertSame('foo', $new->getProperty1());
+        $this->assertSame('foo', $new->getProperty2());
+    }
+
     public function testPropertyArrayCopy()
     {
         $o = new A();
@@ -139,8 +157,8 @@ public function filtersShouldBeApplied()
         $filter = $this->getMockForAbstractClass('DeepCopy\Filter\Filter');
         $filter->expects($this->once())
             ->method('apply')
-            ->will($this->returnCallback(function($object, $property) {
-                        $object->$property = null;
+            ->will($this->returnCallback(function($object, ReflectionProperty $reflectionProperty) {
+                        $reflectionProperty->setValue($object, null);
                     }));
 
         $deepCopy = new DeepCopy();
@@ -164,7 +182,7 @@ public function filtersShouldBeAppliedAndBreakPropertyCopying()
         $filter = $this->getMockForAbstractClass('DeepCopy\Filter\Filter');
         $filter->expects($this->once())
             ->method('apply')
-            ->will($this->returnCallback(function($object, $property, $objectCopier) {
+            ->will($this->returnCallback(function($object, ReflectionProperty $reflectionProperty, $objectCopier) {
                     }));
 
         $deepCopy = new DeepCopy();

tests/DeepCopyTest/Filter/Doctrine/DoctrineCollectionFilterTest.php

@@ -7,6 +7,7 @@
 use DeepCopy\Matcher\PropertyMatcher;
 use Doctrine\Common\Collections\ArrayCollection;
 use Doctrine\Common\Collections\Collection;
+use ReflectionProperty;
 
 /**
  * Test Doctrine Collection filter
@@ -15,19 +16,19 @@ class DoctrineCollectionFilterTest extends \PHPUnit_Framework_TestCase
 {
     public function testApply()
     {
-        $object = new \stdClass();
+        $object = new DoctrineCollectionFilterTestFixture();
         $oldCollection = new ArrayCollection();
         $oldCollection->add(new \stdClass());
-        $object->foo = $oldCollection;
+        $object->property1 = $oldCollection;
 
         $filter = new DoctrineCollectionFilter();
-        $filter->apply($object, 'foo', function($item) {
+        $filter->apply($object, new ReflectionProperty('DeepCopyTest\Filter\Doctrine\DoctrineCollectionFilterTestFixture', 'property1'), function($item) {
                 return null;
             });
 
-        $this->assertTrue($object->foo instanceof Collection);
-        $this->assertNotSame($oldCollection, $object->foo);
-        $this->assertCount(1, $object->foo);
+        $this->assertTrue($object->property1 instanceof Collection);
+        $this->assertNotSame($oldCollection, $object->property1);
+        $this->assertCount(1, $object->property1);
     }
 
     public function testIntegration()

tests/DeepCopyTest/Filter/Doctrine/DoctrineEmptyCollectionFilterTest.php

@@ -7,6 +7,7 @@
 use DeepCopy\Matcher\PropertyMatcher;
 use Doctrine\Common\Collections\ArrayCollection;
 use Doctrine\Common\Collections\Collection;
+use ReflectionProperty;
 
 /**
  * Test Doctrine Collection filter
@@ -15,19 +16,19 @@ class DoctrineEmptyCollectionFilterTest extends \PHPUnit_Framework_TestCase
 {
     public function testApply()
     {
-        $object = new \StdClass();
+        $object = new DoctrineEmptyCollectionFilterTestFixture();
 
         $collection = new ArrayCollection();
         $collection->add(new \StdClass());
 
-        $object->foo = $collection;
+        $object->property1 = $collection;
 
         $filter = new DoctrineEmptyCollectionFilter();
-        $filter->apply($object, 'foo', function($item){ return null; });
+        $filter->apply($object, new ReflectionProperty('DeepCopyTest\Filter\Doctrine\DoctrineEmptyCollectionFilterTestFixture', 'property1'), function($item){ return null; });
 
-        $this->assertTrue($object->foo instanceof Collection);
-        $this->assertNotSame($collection, $object->foo);
-        $this->assertTrue($object->foo->isEmpty());
+        $this->assertTrue($object->property1 instanceof Collection);
+        $this->assertNotSame($collection, $object->property1);
+        $this->assertTrue($object->property1->isEmpty());
     }
 
     public function testIntegration()
@@ -36,16 +37,21 @@ public function testIntegration()
         $doctrineEmptyCollectionFixture = new \StdClass();
         $originalCollection = new ArrayCollection();
         $originalCollection->add(new \StdClass());
-        $doctrineEmptyCollectionFixture->foo = $originalCollection;
+        $doctrineEmptyCollectionFixture->property1 = $originalCollection;
 
         //Copy
         $deepCopy = new DeepCopy();
-        $deepCopy->addFilter(new DoctrineEmptyCollectionFilter(), new PropertyMatcher(get_class($doctrineEmptyCollectionFixture), 'foo'));
+        $deepCopy->addFilter(new DoctrineEmptyCollectionFilter(), new PropertyMatcher(get_class($doctrineEmptyCollectionFixture), 'property1'));
         $copied = $deepCopy->copy($doctrineEmptyCollectionFixture);
 
         //Check result
-        $this->assertTrue($copied->foo instanceof Collection);
-        $this->assertNotSame($originalCollection, $copied->foo);
-        $this->assertTrue($copied->foo->isEmpty());
+        $this->assertTrue($copied->property1 instanceof Collection);
+        $this->assertNotSame($originalCollection, $copied->property1);
+        $this->assertTrue($copied->property1->isEmpty());
     }
 }
+
+class DoctrineEmptyCollectionFilterTestFixture
+{
+    public $property1;
+}

tests/DeepCopyTest/Filter/KeepFilterTest.php

@@ -5,6 +5,7 @@
 use DeepCopy\DeepCopy;
 use DeepCopy\Filter\KeepFilter;
 use DeepCopy\Matcher\PropertyMatcher;
+use ReflectionProperty;
 
 /**
  * Test Keep filter
@@ -13,14 +14,14 @@ class KeepFilterTest extends \PHPUnit_Framework_TestCase
 {
     public function testApply()
     {
-        $object = new \stdClass();
+        $object = new KeepFilterTestFixture();
         $keepObject = new \stdClass();
-        $object->foo = $keepObject;
+        $object->property1 = $keepObject;
 
         $filter = new KeepFilter();
-        $filter->apply($object, 'foo', null);
+        $filter->apply($object, new ReflectionProperty('DeepCopyTest\Filter\KeepFilterTestFixture', 'property1'), null);
 
-        $this->assertSame($keepObject, $object->foo);
+        $this->assertSame($keepObject, $object->property1);
     }
 
     public function testIntegration()