Merge branch '2.20.x' into 3.5.x

* 2.20.x:
  use the empty string instead of null as an array offset (#12181)
  do not call setAccessible() on PHP >= 8.1 (#12182)

Author: derrabus

src/Persisters/Entity/JoinedSubclassPersister.php

@@ -61,7 +61,7 @@ protected function getDiscriminatorColumnTableName(): string
      */
     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/SqlWalker.php

@@ -1412,7 +1412,9 @@ public function walkObjectExpression(string $dqlAlias, array $partialFieldSet, s
 
             $sqlParts[] = $col . ' AS ' . $columnAlias;
 
-            $this->scalarResultAliasMap[$resultAlias][] = $columnAlias;
+            if ($resultAlias !== null) {
+                $this->scalarResultAliasMap[$resultAlias][] = $columnAlias;
+            }
 
             $this->rsm->addFieldResult($dqlAlias, $columnAlias, $fieldName, $class->name);
 
@@ -1445,7 +1447,9 @@ public function walkObjectExpression(string $dqlAlias, array $partialFieldSet, s
 
                     $sqlParts[] = $col . ' AS ' . $columnAlias;
 
-                    $this->scalarResultAliasMap[$resultAlias][] = $columnAlias;
+                    if ($resultAlias !== null) {
+                        $this->scalarResultAliasMap[$resultAlias][] = $columnAlias;
+                    }
 
                     $this->rsm->addFieldResult($dqlAlias, $columnAlias, $fieldName, $subClassName);
                 }

src/Tools/Pagination/LimitSubqueryOutputWalker.php

@@ -132,7 +132,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 ($selectExpression->fieldIdentificationVariable !== null) {
+                $selectAliasToExpressionMap[$selectExpression->fieldIdentificationVariable] = $selectExpression->expression;
+            }
         }
 
         // Rebuild string orderby expressions to use the select expression they're referencing

tests/Tests/ORM/Functional/ParserResultSerializationTest.php

@@ -131,7 +131,6 @@ public function testSymfony44ProvidedData(): void
     private static function parseQuery(Query $query): ParserResult
     {
         $r = new ReflectionMethod($query, 'parse');
-        $r->setAccessible(true);
 
         return $r->invoke($query);
     }

tests/Tests/ORM/Functional/SecondLevelCacheCountQueriesTest.php

@@ -48,7 +48,6 @@ private function setupCountryModel(int $cacheUsage): void
 
         if ($cacheUsage === 0) {
             $metadataCacheReflection = new ReflectionProperty(ClassMetadata::class, 'cache');
-            $metadataCacheReflection->setAccessible(true);
             $metadataCacheReflection->setValue($metadata, null);
 
             return;