Added support for TypedNoDefaultReflectionProperty class to RuntimeReflectionService

.travis.yml

@@ -49,6 +49,7 @@ jobs:
       script: ./vendor/bin/phpcs
 
     - stage: Code Quality
+      php: 7.4snapshot
       env: STATIC_ANALYSIS
       install: travis_retry composer install --prefer-dist
       script: vendor/bin/phpstan analyze

composer.json

@@ -25,7 +25,7 @@
         "doctrine/cache": "^1.0",
         "doctrine/collections": "^1.0",
         "doctrine/event-manager": "^1.0",
-        "doctrine/reflection": "^1.0"
+        "doctrine/reflection": "^1.1"
     },
     "require-dev": {
         "phpstan/phpstan": "^0.11",
@@ -44,7 +44,8 @@
     },
     "autoload-dev": {
         "psr-4": {
-            "Doctrine\\Tests\\": "tests/Doctrine/Tests"
+            "Doctrine\\Tests\\": "tests/Doctrine/Tests",
+            "Doctrine\\Tests_PHP74\\": "tests/Doctrine/Tests_PHP74"
         }
     },
     "extra": {

lib/Doctrine/Persistence/Mapping/RuntimeReflectionService.php

@@ -5,10 +5,12 @@
 namespace Doctrine\Persistence\Mapping;
 
 use Doctrine\Common\Reflection\RuntimePublicReflectionProperty;
+use Doctrine\Common\Reflection\TypedNoDefaultReflectionProperty;
 use ReflectionClass;
 use ReflectionException;
 use ReflectionMethod;
 use ReflectionProperty;
+use function array_key_exists;
 use function class_exists;
 use function class_parents;
 
@@ -64,7 +66,9 @@ public function getAccessibleProperty(string $class, string $property)
     {
         $reflectionProperty = new ReflectionProperty($class, $property);
 
-        if ($reflectionProperty->isPublic()) {
+        if (! array_key_exists($property, $this->getClass($class)->getDefaultProperties())) {
+            $reflectionProperty = new TypedNoDefaultReflectionProperty($class, $property);
+        } elseif ($reflectionProperty->isPublic()) {
             $reflectionProperty = new RuntimePublicReflectionProperty($class, $property);
         }
 

phpstan.neon

@@ -9,13 +9,16 @@ parameters:
         - %currentWorkingDirectory%/tests/Doctrine/Tests/Persistence/ObjectManagerDecoratorTest.php
         - %currentWorkingDirectory%/tests/Doctrine/Tests/Persistence/Mapping/ClassMetadataFactoryTest.php
         - %currentWorkingDirectory%/tests/Doctrine/Tests/Persistence/Mapping/_files/annotation/TestClass.php
+        - %currentWorkingDirectory%/tests/Doctrine/Tests_PHP74/Persistence/Mapping/RuntimeReflectionServiceTest.php
 
     excludes_analyse:
         - %currentWorkingDirectory%/tests/Doctrine/Tests/Persistence/Mapping/_files/TestEntity.php
 
     ignoreErrors:
         # looks like a bug in phpstan since method_exists first argument accepts a string
         - '#Call to function method_exists\(\) with string and (.*) will always evaluate to false#'
+        # Should be fixed by adding return typehints
+        - '#Cannot call method getDefaultProperties\(\) on ReflectionClass|null.#'
 
 includes:
     - vendor/phpstan/phpstan-phpunit/extension.neon

phpunit.xml.dist

@@ -7,7 +7,8 @@
 >
     <testsuites>
         <testsuite name="Doctrine Persistence Test Suite">
-            <directory>./tests/Doctrine/</directory>
+            <directory>./tests/Doctrine/Tests</directory>
+            <directory phpVersion="7.4" phpVersionOperator=">=">./tests/Doctrine/Tests_PHP74</directory>
         </testsuite>
     </testsuites>
 

tests/Doctrine/Tests_PHP74/Persistence/Mapping/RuntimeReflectionServiceTest.php

@@ -0,0 +1,40 @@
+<?php
+
+declare(strict_types=1);
+
+namespace Doctrine\Tests_PHP74\Persistence\Mapping;
+
+use Doctrine\Common\Reflection\TypedNoDefaultReflectionProperty;
+use Doctrine\Persistence\Mapping\RuntimeReflectionService;
+use PHPUnit\Framework\TestCase;
+use ReflectionProperty;
+
+/**
+ * @group DCOM-93
+ */
+class RuntimeReflectionServiceTest extends TestCase
+{
+    /** @var RuntimeReflectionService */
+    private $reflectionService;
+
+    private string $typedNoDefaultProperty;
+    private string $typedDefaultProperty = '';
+
+    protected function setUp() : void
+    {
+        $this->reflectionService = new RuntimeReflectionService();
+    }
+
+    public function testGetTypedNoDefaultReflectionProperty() : void
+    {
+        $reflProp = $this->reflectionService->getAccessibleProperty(self::class, 'typedNoDefaultProperty');
+        self::assertInstanceOf(TypedNoDefaultReflectionProperty::class, $reflProp);
+    }
+
+    public function testGetTypedDefaultReflectionProperty() : void
+    {
+        $reflProp = $this->reflectionService->getAccessibleProperty(self::class, 'typedDefaultProperty');
+        self::assertInstanceOf(ReflectionProperty::class, $reflProp);
+        self::assertNotInstanceOf(TypedNoDefaultReflectionProperty::class, $reflProp);
+    }
+}