add jobs using PHP 8.5 in the CI

.github/workflows/continuous-integration.yml

@@ -41,6 +41,7 @@ jobs:
           - "8.2"
           - "8.3"
           - "8.4"
+          - "8.5"
         dbal-version:
           - "default"
         extension:
@@ -115,6 +116,7 @@ jobs:
           - "8.2"
           - "8.3"
           - "8.4"
+          - "8.5"
         dbal-version:
           - "default"
           - "3@dev"
@@ -189,6 +191,7 @@ jobs:
           - "8.2"
           - "8.3"
           - "8.4"
+          - "8.5"
         dbal-version:
           - "default"
           - "3@dev"
@@ -260,6 +263,7 @@ jobs:
           - "8.2"
           - "8.3"
           - "8.4"
+          - "8.5"
         dbal-version:
           - "default"
           - "3@dev"

src/Mapping/ClassMetadataInfo.php

@@ -1064,6 +1064,109 @@
         return $serialized;
     }
 
+    public function __serialize(): array
+    {
+        // This metadata is always serialized/cached.
+        $serialized = [
+            'associationMappings' => $this->associationMappings,
+            'columnNames' => $this->columnNames, //TODO: 3.0 Remove this. Can use fieldMappings[$fieldName]['columnName']
+            'fieldMappings' => $this->fieldMappings,
+            'fieldNames' => $this->fieldNames,
+            'embeddedClasses' => $this->embeddedClasses,
+            'identifier' => $this->identifier,
+            'isIdentifierComposite' => $this->isIdentifierComposite, // TODO: REMOVE
+            'name' => $this->name,
+            'namespace' => $this->namespace, // TODO: REMOVE
+            'table' => $this->table,
+            'rootEntityName' => $this->rootEntityName,
+            'idGenerator' => $this->idGenerator, //TODO: Does not really need to be serialized. Could be moved to runtime.
+        ];
+
+        // The rest of the metadata is only serialized if necessary.
+        if ($this->changeTrackingPolicy !== self::CHANGETRACKING_DEFERRED_IMPLICIT) {
+            $serialized['changeTrackingPolicy'] = $this->changeTrackingPolicy;
+        }
+
+        if ($this->customRepositoryClassName) {
+            $serialized['customRepositoryClassName'] = $this->customRepositoryClassName;
+        }
+
+        if ($this->inheritanceType !== self::INHERITANCE_TYPE_NONE) {
+            $serialized['inheritanceType'] = $this->inheritanceType;
+            $serialized['discriminatorColumn'] = $this->discriminatorColumn;
+            $serialized['discriminatorValue'] = $this->discriminatorValue;
+            $serialized['discriminatorMap'] = $this->discriminatorMap;
+            $serialized['parentClasses'] = $this->parentClasses;
+            $serialized['subClasses'] = $this->subClasses;
+        }
+
+        if ($this->generatorType !== self::GENERATOR_TYPE_NONE) {
+            $serialized['generatorType'] = $this->generatorType;
+            if ($this->generatorType === self::GENERATOR_TYPE_SEQUENCE) {
+                $serialized['sequenceGeneratorDefinition'] = $this->sequenceGeneratorDefinition;
+            }
+        }
+
+        if ($this->isMappedSuperclass) {
+            $serialized['isMappedSuperclass'] = $this->isMappedSuperclass;
+        }
+
+        if ($this->isEmbeddedClass) {
+            $serialized['isEmbeddedClass'] = $this->isEmbeddedClass;
+        }
+
+        if ($this->containsForeignIdentifier) {
+            $serialized['containsForeignIdentifier'] = $this->containsForeignIdentifier;
+        }
+
+        if ($this->containsEnumIdentifier) {
+            $serialized['containsEnumIdentifier'] = $this->containsEnumIdentifier;
+        }
+
+        if ($this->isVersioned) {
+            $serialized['isVersioned'] = $this->isVersioned;
+            $serialized['versionField'] = $this->versionField;
+        }
+
+        if ($this->lifecycleCallbacks) {
+            $serialized['lifecycleCallbacks'] = $this->lifecycleCallbacks;
+        }
+
+        if ($this->entityListeners) {
+            $serialized['entityListeners'] = $this->entityListeners;
+        }
+
+        if ($this->namedQueries) {
+            $serialized['namedQueries'] = $this->namedQueries;
+        }
+
+        if ($this->namedNativeQueries) {
+            $serialized['namedNativeQueries'] = $this->namedNativeQueries;
+        }
+
+        if ($this->sqlResultSetMappings) {
+            $serialized['sqlResultSetMappings'] = $this->sqlResultSetMappings;
+        }
+
+        if ($this->isReadOnly) {
+            $serialized['isReadOnly'] = $this->isReadOnly;
+        }
+
+        if ($this->customGeneratorDefinition) {
+            $serialized['customGeneratorDefinition'] = $this->customGeneratorDefinition;
+        }
+
+        if ($this->cache) {
+            $serialized['cache'] = $this->cache;
+        }
+
+        if ($this->requiresFetchAfterChange) {
+            $serialized['requiresFetchAfterChange'] = $this->requiresFetchAfterChange;
+        }
+
+        return $serialized;
+    }
+
     /**
      * Creates a new instance of the mapped class, without invoking the constructor.
      *

src/PersistentCollection.php

@@ -588,6 +588,14 @@
         return ['collection', 'initialized'];
     }
 
+    public function __serialize(): array
+    {
+        return [
+            'collection' => $this->collection,
+            'initialized' => $this->initialized,
+        ];
+    }
+
     /**
      * Extracts a slice of $length elements starting at position $offset from the Collection.
      *

src/Persisters/Entity/JoinedSubclassPersister.php

@@ -63,7 +63,7 @@ protected function getDiscriminatorColumnTableName()
      */
     private function getVersionedClassMetadata(): ClassMetadata
     {
-        if (isset($this->class->fieldMappings[$this->class->versionField]['inherited'])) {
+        if ($this->class->versionField !== null && isset($this->class->fieldMappings[$this->class->versionField]['inherited'])) {
             $definingClassName = $this->class->fieldMappings[$this->class->versionField]['inherited'];
 
             return $this->em->getClassMetadata($definingClassName);

src/Query/Exec/AbstractSqlExecutor.php

@@ -92,6 +92,20 @@
         }, array_keys((array) $this)), ['_sqlStatements']));
     }
 
+    public function __serialize(): array
+    {
+        $properties = array_values(array_diff(array_map(static function (string $prop): string {
+            return str_replace("\0*\0", '', $prop);
+        }, array_keys((array) $this)), ['_sqlStatements']));
+        $serialized = [];
+
+        foreach ($properties as $property) {
+            $serialized[$property] = $this->$property;
+        }
+
+        return $serialized;
+    }
+
     public function __wakeup(): void
     {
         // @phpstan-ignore property.deprecated
@@ -103,4 +117,11 @@
         // @phpstan-ignore property.deprecated
         $this->_sqlStatements = &$this->sqlStatements;
     }
+
+    public function __unserialize(array $data): void
+    {
+        foreach ($data as $property => $value) {
+            $this->$property = $value;
+        }
+    }
 }

src/Tools/Pagination/LimitSubqueryOutputWalker.php

@@ -149,7 +149,9 @@ private function rebuildOrderByForRowNumber(SelectStatement $AST): void
         $selectAliasToExpressionMap = [];
         // Get any aliases that are available for select expressions.
         foreach ($AST->selectClause->selectExpressions as $selectExpression) {
-            $selectAliasToExpressionMap[$selectExpression->fieldIdentificationVariable] = $selectExpression->expression;
+            if (is_string($selectExpression->fieldIdentificationVariable)) {
+                $selectAliasToExpressionMap[$selectExpression->fieldIdentificationVariable] = $selectExpression->expression;
+            }
         }
 
         // Rebuild string orderby expressions to use the select expression they're referencing

tests/Tests/ORM/Cache/DefaultCacheTest.php

@@ -20,6 +20,8 @@
 
 use function array_merge;
 
+use const PHP_VERSION_ID;
+
 /** @group DDC-2183 */
 class DefaultCacheTest extends OrmTestCase
 {
@@ -244,8 +246,11 @@ public function testToIdentifierArrayShouldLookupForEntityIdentifier(): void
         $method     = new ReflectionMethod($this->cache, 'toIdentifierArray');
         $property   = new ReflectionProperty($entity, 'id');
 
-        $property->setAccessible(true);
-        $method->setAccessible(true);
+        if (PHP_VERSION_ID < 80100) {
+            $property->setAccessible(true);
+            $method->setAccessible(true);
+        }
+
         $property->setValue($entity, $identifier);
 
         self::assertEquals(['id' => $identifier], $method->invoke($this->cache, $metadata, $identifier));

tests/Tests/ORM/Cache/DefaultQueryCacheTest.php

@@ -30,6 +30,8 @@
 use function microtime;
 use function sprintf;
 
+use const PHP_VERSION_ID;
+
 /** @group DDC-2183 */
 class DefaultQueryCacheTest extends OrmTestCase
 {
@@ -585,7 +587,9 @@ public function testGetAssociationValue(): void
         $rsm        = new ResultSetMappingBuilder($this->em);
         $key        = new QueryCacheKey('query.key1', 0);
 
-        $reflection->setAccessible(true);
+        if (PHP_VERSION_ID < 80100) {
+            $reflection->setAccessible(true);
+        }
 
         $germany  = new Country('Germany');
         $bavaria  = new State('Bavaria', $germany);

tests/Tests/ORM/Cache/FileLockRegionTest.php

@@ -27,6 +27,7 @@
 use function unlink;
 
 use const E_WARNING;
+use const PHP_VERSION_ID;
 
 /**
  * @extends RegionTestCase<FileLockRegion>
@@ -46,7 +47,9 @@ private function getFileName(FileLockRegion $region, CacheKey $key): string
     {
         $reflection = new ReflectionMethod($region, 'getLockFileName');
 
-        $reflection->setAccessible(true);
+        if (PHP_VERSION_ID < 80100) {
+            $reflection->setAccessible(true);
+        }
 
         return $reflection->invoke($region, $key);
     }
@@ -227,7 +230,10 @@ public function testLockLifetime(): void
         $file     = $this->getFileName($this->region, $key);
         $property = new ReflectionProperty($this->region, 'lockLifetime');
 
-        $property->setAccessible(true);
+        if (PHP_VERSION_ID < 80100) {
+            $property->setAccessible(true);
+        }
+
         $property->setValue($this->region, -10);
 
         self::assertFalse($this->region->contains($key));
@@ -253,7 +259,10 @@ public function testHandlesScanErrorsGracefullyOnEvictAll(): void
         $region              = $this->createRegion();
         $reflectionDirectory = new ReflectionProperty($region, 'directory');
 
-        $reflectionDirectory->setAccessible(true);
+        if (PHP_VERSION_ID < 80100) {
+            $reflectionDirectory->setAccessible(true);
+        }
+
         $reflectionDirectory->setValue($region, str_repeat('a', 10000));
 
         set_error_handler(static function (): bool {

tests/Tests/ORM/Cache/Persister/Collection/ReadWriteCachedCollectionPersisterTest.php

@@ -15,6 +15,8 @@
 use Doctrine\Tests\Models\Cache\State;
 use ReflectionProperty;
 
+use const PHP_VERSION_ID;
+
 /** @group DDC-2183 */
 class ReadWriteCachedCollectionPersisterTest extends CollectionPersisterTestCase
 {
@@ -121,7 +123,9 @@ public function testTransactionRollBackDeleteShouldClearQueue(): void
         $key        = new CollectionCacheKey(State::class, 'cities', ['id' => 1]);
         $property   = new ReflectionProperty(ReadWriteCachedCollectionPersister::class, 'queuedCache');
 
-        $property->setAccessible(true);
+        if (PHP_VERSION_ID < 80100) {
+            $property->setAccessible(true);
+        }
 
         $this->region->expects(self::once())
             ->method('lock')
@@ -153,7 +157,9 @@ public function testTransactionRollBackUpdateShouldClearQueue(): void
         $key        = new CollectionCacheKey(State::class, 'cities', ['id' => 1]);
         $property   = new ReflectionProperty(ReadWriteCachedCollectionPersister::class, 'queuedCache');
 
-        $property->setAccessible(true);
+        if (PHP_VERSION_ID < 80100) {
+            $property->setAccessible(true);
+        }
 
         $this->region->expects(self::once())
             ->method('lock')
@@ -185,7 +191,9 @@ public function testTransactionRollCommitDeleteShouldClearQueue(): void
         $key        = new CollectionCacheKey(State::class, 'cities', ['id' => 1]);
         $property   = new ReflectionProperty(ReadWriteCachedCollectionPersister::class, 'queuedCache');
 
-        $property->setAccessible(true);
+        if (PHP_VERSION_ID < 80100) {
+            $property->setAccessible(true);
+        }
 
         $this->region->expects(self::once())
             ->method('lock')
@@ -217,7 +225,9 @@ public function testTransactionRollCommitUpdateShouldClearQueue(): void
         $key        = new CollectionCacheKey(State::class, 'cities', ['id' => 1]);
         $property   = new ReflectionProperty(ReadWriteCachedCollectionPersister::class, 'queuedCache');
 
-        $property->setAccessible(true);
+        if (PHP_VERSION_ID < 80100) {
+            $property->setAccessible(true);
+        }
 
         $this->region->expects(self::once())
             ->method('lock')
@@ -248,7 +258,9 @@ public function testDeleteLockFailureShouldIgnoreQueue(): void
         $key        = new CollectionCacheKey(State::class, 'cities', ['id' => 1]);
         $property   = new ReflectionProperty(ReadWriteCachedCollectionPersister::class, 'queuedCache');
 
-        $property->setAccessible(true);
+        if (PHP_VERSION_ID < 80100) {
+            $property->setAccessible(true);
+        }
 
         $this->region->expects(self::once())
             ->method('lock')
@@ -273,7 +285,9 @@ public function testUpdateLockFailureShouldIgnoreQueue(): void
         $key        = new CollectionCacheKey(State::class, 'cities', ['id' => 1]);
         $property   = new ReflectionProperty(ReadWriteCachedCollectionPersister::class, 'queuedCache');
 
-        $property->setAccessible(true);
+        if (PHP_VERSION_ID < 80100) {
+            $property->setAccessible(true);
+        }
 
         $this->region->expects(self::once())
             ->method('lock')