Merge pull request doctrine#437 from xabbuh/php-8.5

fix compatibility with PHP 8.5

Author: greg0ire

.github/workflows/continuous-integration.yml

@@ -15,6 +15,6 @@ jobs:
     uses: "doctrine/.github/.github/workflows/continuous-integration.yml@7.3.0"
     with:
       composer-root-version: "3.0"
-      php-versions: '["7.2", "7.3", "7.4", "8.0", "8.1", "8.2", "8.3"]'
+      php-versions: '["7.2", "7.3", "7.4", "8.0", "8.1", "8.2", "8.3", "8.4", "8.5"]'
     secrets:
       CODECOV_TOKEN: "${{ secrets.CODECOV_TOKEN }}"

src/Persistence/Mapping/RuntimeReflectionService.php

@@ -17,6 +17,8 @@
 use function phpversion;
 use function version_compare;
 
+use const PHP_VERSION_ID;
+
 /**
  * PHP Runtime Reflection Service.
  */
@@ -90,7 +92,9 @@ public function getAccessibleProperty(string $class, string $property)
             $reflectionProperty = new TypedNoDefaultReflectionProperty($class, $property);
         }
 
-        $reflectionProperty->setAccessible(true);
+        if (PHP_VERSION_ID < 80100) {
+            $reflectionProperty->setAccessible(true);
+        }
 
         return $reflectionProperty;
     }

tests/Persistence/Mapping/ClassMetadataFactoryTest.php

@@ -16,6 +16,8 @@
 use stdClass;
 use Symfony\Component\Cache\Adapter\ArrayAdapter;
 
+use const PHP_VERSION_ID;
+
 /** @covers \Doctrine\Persistence\Mapping\AbstractClassMetadataFactory */
 class ClassMetadataFactoryTest extends DoctrineTestCase
 {
@@ -196,7 +198,9 @@ public function testWillNotCacheFallbackMetadata(): void
     private static function getCache(AbstractClassMetadataFactory $classMetadataFactory): ?CacheItemPoolInterface
     {
         $method = new ReflectionMethod($classMetadataFactory, 'getCache');
-        $method->setAccessible(true);
+        if (PHP_VERSION_ID < 80100) {
+            $method->setAccessible(true);
+        }
 
         return $method->invoke($classMetadataFactory);
     }

tests/Persistence/RuntimeReflectionPropertyTest.php

@@ -11,6 +11,8 @@
 use LogicException;
 use PHPUnit\Framework\TestCase;
 
+use const PHP_VERSION_ID;
+
 class DummyMock
 {
     public function callGet(): void
@@ -36,7 +38,10 @@ public function testGetSetValue(string $name, string $value): void
 
         self::assertSame($value, $reflProperty->getValue($object));
 
-        $reflProperty->setAccessible(true);
+        if (PHP_VERSION_ID < 80100) {
+            $reflProperty->setAccessible(true);
+        }
+
         $reflProperty->setValue($object, 'changedValue');
 
         self::assertSame('changedValue', $reflProperty->getValue($object));

tests_php74/Persistence/Reflection/TypedNoDefaultReflectionPropertyTest.php

@@ -7,6 +7,8 @@
 use Doctrine\Persistence\Reflection\TypedNoDefaultReflectionProperty;
 use PHPUnit\Framework\TestCase;
 
+use const PHP_VERSION_ID;
+
 class TypedNoDefaultReflectionPropertyTest extends TestCase
 {
     public function testGetValue(): void
@@ -29,7 +31,9 @@ public function testGetValue(): void
     public function testSetValueNull(): void
     {
         $reflection = new TypedNoDefaultReflectionProperty(TypedFoo::class, 'id');
-        $reflection->setAccessible(true);
+        if (PHP_VERSION_ID < 80100) {
+            $reflection->setAccessible(true);
+        }
 
         $object = new TypedFoo();
         $object->setId(1);
@@ -45,7 +49,9 @@ public function testSetValueNull(): void
     public function testSetValueNullOnNullableProperty(): void
     {
         $reflection = new TypedNoDefaultReflectionProperty(TypedNullableFoo::class, 'value');
-        $reflection->setAccessible(true);
+        if (PHP_VERSION_ID < 80100) {
+            $reflection->setAccessible(true);
+        }
 
         $object = new TypedNullableFoo();