Skip to content

Commit 5f35518

Browse files
authored
use the empty string instead of null as an array offset (#12181)
1 parent 7d950ab commit 5f35518

File tree

4 files changed

+11
-5
lines changed

4 files changed

+11
-5
lines changed

src/Persisters/Entity/JoinedSubclassPersister.php

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -63,7 +63,7 @@ protected function getDiscriminatorColumnTableName()
6363
*/
6464
private function getVersionedClassMetadata(): ClassMetadata
6565
{
66-
if (isset($this->class->fieldMappings[$this->class->versionField]['inherited'])) {
66+
if ($this->class->versionField !== null && isset($this->class->fieldMappings[$this->class->versionField]['inherited'])) {
6767
$definingClassName = $this->class->fieldMappings[$this->class->versionField]['inherited'];
6868

6969
return $this->em->getClassMetadata($definingClassName);

src/Query/ResultSetMappingBuilder.php

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -411,7 +411,7 @@ public function addNamedNativeQueryEntityResultMapping(ClassMetadataInfo $classM
411411
[$relation, $fieldName] = explode('.', $fieldName);
412412
}
413413

414-
if (isset($classMetadata->associationMappings[$relation])) {
414+
if ($relation !== null && isset($classMetadata->associationMappings[$relation])) {
415415
if ($relation) {
416416
$associationMapping = $classMetadata->associationMappings[$relation];
417417
$joinAlias = $alias . $relation;

src/Query/SqlWalker.php

Lines changed: 6 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1587,7 +1587,9 @@ public function walkSelectExpression($selectExpression)
15871587

15881588
$sqlParts[] = $col . ' AS ' . $columnAlias;
15891589

1590-
$this->scalarResultAliasMap[$resultAlias][] = $columnAlias;
1590+
if ($resultAlias !== null) {
1591+
$this->scalarResultAliasMap[$resultAlias][] = $columnAlias;
1592+
}
15911593

15921594
$this->rsm->addFieldResult($dqlAlias, $columnAlias, $fieldName, $class->name);
15931595

@@ -1622,7 +1624,9 @@ public function walkSelectExpression($selectExpression)
16221624

16231625
$sqlParts[] = $col . ' AS ' . $columnAlias;
16241626

1625-
$this->scalarResultAliasMap[$resultAlias][] = $columnAlias;
1627+
if ($resultAlias !== null) {
1628+
$this->scalarResultAliasMap[$resultAlias][] = $columnAlias;
1629+
}
16261630

16271631
$this->rsm->addFieldResult($dqlAlias, $columnAlias, $fieldName, $subClassName);
16281632
}

src/Tools/Pagination/LimitSubqueryOutputWalker.php

Lines changed: 3 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -149,7 +149,9 @@ private function rebuildOrderByForRowNumber(SelectStatement $AST): void
149149
$selectAliasToExpressionMap = [];
150150
// Get any aliases that are available for select expressions.
151151
foreach ($AST->selectClause->selectExpressions as $selectExpression) {
152-
$selectAliasToExpressionMap[$selectExpression->fieldIdentificationVariable] = $selectExpression->expression;
152+
if ($selectExpression->fieldIdentificationVariable !== null) {
153+
$selectAliasToExpressionMap[$selectExpression->fieldIdentificationVariable] = $selectExpression->expression;
154+
}
153155
}
154156

155157
// Rebuild string orderby expressions to use the select expression they're referencing

0 commit comments

Comments
 (0)