Skip to content

Commit

Permalink
Merge pull request #11212 from greg0ire/fix-grammar
Browse files Browse the repository at this point in the history
Follow up on array access deprecation
  • Loading branch information
greg0ire committed Feb 3, 2024
2 parents 5401367 + a7d5adb commit 3764ebf
Show file tree
Hide file tree
Showing 3 changed files with 3 additions and 3 deletions.
2 changes: 1 addition & 1 deletion UPGRADE.md
Original file line number Diff line number Diff line change
Expand Up @@ -2,7 +2,7 @@

## Deprecate array access

Use array access on instances of the following classes is deprecated:
Using array access on instances of the following classes is deprecated:

- `Doctrine\ORM\Mapping\DiscriminatorColumnMapping`
- `Doctrine\ORM\Mapping\EmbedClassMapping`
Expand Down
2 changes: 1 addition & 1 deletion src/Persisters/Entity/BasicEntityPersister.php
Original file line number Diff line number Diff line change
Expand Up @@ -1151,7 +1151,7 @@ final protected function getOrderBySQL(array $orderBy, string $baseTableAlias):

if (isset($this->class->fieldMappings[$fieldName])) {
$tableAlias = isset($this->class->fieldMappings[$fieldName]->inherited)
? $this->getSQLTableAlias($this->class->fieldMappings[$fieldName]['inherited'])
? $this->getSQLTableAlias($this->class->fieldMappings[$fieldName]->inherited)
: $baseTableAlias;

$columnName = $this->quoteStrategy->getColumnName($fieldName, $this->class, $this->platform);
Expand Down
2 changes: 1 addition & 1 deletion src/Query/SqlWalker.php
Original file line number Diff line number Diff line change
Expand Up @@ -786,7 +786,7 @@ public function walkIndexBy(AST\IndexBy $indexBy): void
$class = $this->getMetadataForDqlAlias($alias);

if (isset($class->associationMappings[$fieldName]->inherited)) {
$class = $this->em->getClassMetadata($class->associationMappings[$fieldName]['inherited']);
$class = $this->em->getClassMetadata($class->associationMappings[$fieldName]->inherited);
}

$association = $class->associationMappings[$fieldName];
Expand Down

0 comments on commit 3764ebf

Please sign in to comment.