Merge pull request #434 from doctrine/4.0.x-merge-up-into-4.1.x_c0gHyWAW

Merge release 4.0.1 into 4.1.x

Author: GromNaN

.github/workflows/continuous-integration.yml

@@ -14,6 +14,6 @@ jobs:
     name: "PHPUnit"
     uses: "doctrine/.github/.github/workflows/[email protected]"
     with:
-      php-versions: '["8.1", "8.2", "8.3"]'
+      php-versions: '["8.1", "8.2", "8.3", "8.4"]'
     secrets:
       CODECOV_TOKEN: "${{ secrets.CODECOV_TOKEN }}"

phpstan-baseline.neon

@@ -5,16 +5,6 @@ parameters:
 			count: 1
 			path: src/Persistence/Mapping/Driver/StaticPHPDriver.php
 
-		-
-			message: "#^Doctrine\\\\Persistence\\\\Reflection\\\\EnumReflectionProperty\\:\\:__construct\\(\\) does not call parent constructor from ReflectionProperty\\.$#"
-			count: 1
-			path: src/Persistence/Reflection/EnumReflectionProperty.php
-
-		-
-			message: "#^Method Doctrine\\\\Persistence\\\\Reflection\\\\EnumReflectionProperty\\:\\:getDeclaringClass\\(\\) return type with generic class ReflectionClass does not specify its types\\: T$#"
-			count: 1
-			path: src/Persistence/Reflection/EnumReflectionProperty.php
-
 		-
 			message: "#^Method Doctrine\\\\Persistence\\\\Reflection\\\\EnumReflectionProperty\\:\\:toEnum\\(\\) should return array\\<BackedEnum\\>\\|BackedEnum but returns array\\<BackedEnum\\|int\\|string\\>\\.$#"
 			count: 1

src/Persistence/Mapping/ReflectionService.php

@@ -49,7 +49,7 @@ public function getClassNamespace(string $class): string;
     public function getClass(string $class): ReflectionClass;
 
     /**
-     * Returns an accessible property (setAccessible(true)) or null.
+     * Returns an accessible property or null.
      *
      * @phpstan-param class-string $class
      */

src/Persistence/Mapping/RuntimeReflectionService.php

@@ -79,8 +79,6 @@ public function getAccessibleProperty(string $class, string $property): RuntimeR
             $reflectionProperty = new TypedNoDefaultReflectionProperty($class, $property);
         }
 
-        $reflectionProperty->setAccessible(true);
-
         return $reflectionProperty;
     }
 

src/Persistence/Reflection/EnumReflectionProperty.php

@@ -5,9 +5,7 @@
 namespace Doctrine\Persistence\Reflection;
 
 use BackedEnum;
-use ReflectionClass;
 use ReflectionProperty;
-use ReflectionType;
 
 use function array_map;
 use function is_array;
@@ -21,29 +19,7 @@ class EnumReflectionProperty extends ReflectionProperty
     /** @param class-string<BackedEnum> $enumType */
     public function __construct(private readonly ReflectionProperty $originalReflectionProperty, private readonly string $enumType)
     {
-    }
-
-    public function getDeclaringClass(): ReflectionClass
-    {
-        return $this->originalReflectionProperty->getDeclaringClass();
-    }
-
-    public function getName(): string
-    {
-        return $this->originalReflectionProperty->getName();
-    }
-
-    public function getType(): ReflectionType|null
-    {
-        return $this->originalReflectionProperty->getType();
-    }
-
-    /**
-     * {@inheritDoc}
-     */
-    public function getAttributes(string|null $name = null, int $flags = 0): array
-    {
-        return $this->originalReflectionProperty->getAttributes($name, $flags);
+        parent::__construct($originalReflectionProperty->class, $originalReflectionProperty->name);
     }
 
     /**
@@ -120,19 +96,4 @@ private function toEnum(int|string|array|BackedEnum $value)
 
         return $this->enumType::from($value);
     }
-
-    public function getModifiers(): int
-    {
-        return $this->originalReflectionProperty->getModifiers();
-    }
-
-    public function getDocComment(): string|false
-    {
-        return $this->originalReflectionProperty->getDocComment();
-    }
-
-    public function isPrivate(): bool
-    {
-        return $this->originalReflectionProperty->isPrivate();
-    }
 }

tests/Persistence/Mapping/ClassMetadataFactoryTest.php

@@ -187,7 +187,6 @@ public function testWillNotCacheFallbackMetadata(): void
     private static function getCache(AbstractClassMetadataFactory $classMetadataFactory): CacheItemPoolInterface|null
     {
         $method = new ReflectionMethod($classMetadataFactory, 'getCache');
-        $method->setAccessible(true);
 
         return $method->invoke($classMetadataFactory);
     }

tests/Persistence/Reflection/Reflection/EnumReflectionPropertyTest.php

@@ -135,6 +135,18 @@ public function testIsPrivate(): void
         $reflProperty = new EnumReflectionProperty(new ReflectionProperty(TypedEnumClass::class, 'suit'), Suit::class);
         self::assertFalse($reflProperty->isPrivate());
     }
+
+    public function testIsPublic(): void
+    {
+        $reflProperty = new EnumReflectionProperty(new ReflectionProperty(TypedEnumClass::class, 'suit'), Suit::class);
+        self::assertTrue($reflProperty->isPublic());
+    }
+
+    public function testHasDefaultValue(): void
+    {
+        $reflProperty = new EnumReflectionProperty(new ReflectionProperty(TypedEnumClass::class, 'suit'), Suit::class);
+        self::assertTrue($reflProperty->hasDefaultValue());
+    }
 }
 
 #[Attribute(Attribute::TARGET_PROPERTY)]

tests/Persistence/Reflection/TypedNoDefaultReflectionPropertyTest.php

@@ -29,7 +29,6 @@ public function testGetValue(): void
     public function testSetValueNull(): void
     {
         $reflection = new TypedNoDefaultReflectionProperty(TypedFoo::class, 'id');
-        $reflection->setAccessible(true);
 
         $object = new TypedFoo();
         $object->setId(1);
@@ -45,7 +44,6 @@ public function testSetValueNull(): void
     public function testSetValueNullOnNullableProperty(): void
     {
         $reflection = new TypedNoDefaultReflectionProperty(TypedNullableFoo::class, 'value');
-        $reflection->setAccessible(true);
 
         $object = new TypedNullableFoo();
 

tests/Persistence/RuntimeReflectionPropertyTest.php

@@ -34,7 +34,6 @@ public function testGetSetValue(string $name, string $value): void
 
         self::assertSame($value, $reflProperty->getValue($object));
 
-        $reflProperty->setAccessible(true);
         $reflProperty->setValue($object, 'changedValue');
 
         self::assertSame('changedValue', $reflProperty->getValue($object));