Merge pull request #161 from youwe-petervanderwal/fix/unitialized-pro…

…perty-type-matcher

Add isInitialized check on PropertyTypeMatcher for PHP 7.4

fixtures/f009/TypedObjectProperty.php

@@ -0,0 +1,10 @@
+<?php
+
+declare(strict_types=1);
+
+namespace DeepCopy\f009;
+
+class TypedObjectProperty
+{
+    public \DateTime $date;
+}

src/DeepCopy/Matcher/PropertyTypeMatcher.php

@@ -41,6 +41,12 @@ public function matches($object, $property)
 
         $reflectionProperty->setAccessible(true);
 
+        // Uninitialized properties (for PHP >7.4)
+        if (method_exists($reflectionProperty, 'isInitialized') && !$reflectionProperty->isInitialized($object)) {
+            // null instanceof $this->propertyType
+            return false;
+        }
+
         return $reflectionProperty->getValue($object) instanceof $this->propertyType;
     }
 }

tests/DeepCopyTest/Matcher/PropertyTypeMatcherTest.php

@@ -2,6 +2,7 @@
 
 namespace DeepCopyTest\Matcher;
 
+use DeepCopy\f009;
 use DeepCopy\Matcher\PropertyTypeMatcher;
 use PHPUnit\Framework\TestCase;
 use stdClass;
@@ -23,6 +24,31 @@ public function test_it_matches_the_given_property($object, $expected)
         $this->assertEquals($expected, $actual);
     }
 
+    /**
+     * @requires PHP 7.4
+     */
+    public function test_it_ignores_uninitialized_typed_properties()
+    {
+        $object = new f009\TypedObjectProperty();
+
+        $matcher = new PropertyTypeMatcher(\DateTime::class);
+
+        $this->assertFalse($matcher->matches($object, 'date'));
+    }
+
+    /**
+     * @requires PHP 7.4
+     */
+    public function test_it_matches_initialized_typed_properties()
+    {
+        $object = new f009\TypedObjectProperty();
+        $object->date = new \DateTime();
+
+        $matcher = new PropertyTypeMatcher(\DateTime::class);
+
+        $this->assertTrue($matcher->matches($object, 'date'));
+    }
+
     public function providePairs()
     {
         $object1 = new PropertyTypeMatcherTestFixture1();