Skip to content

Commit

Permalink
Merge 4.x into 5.x
Browse files Browse the repository at this point in the history
  • Loading branch information
SonataCI committed Jan 23, 2024
2 parents a3cea12 + 53d0054 commit 442500c
Show file tree
Hide file tree
Showing 2 changed files with 4 additions and 4 deletions.
2 changes: 1 addition & 1 deletion composer.json
Original file line number Diff line number Diff line change
Expand Up @@ -59,7 +59,7 @@
"phpunit/phpunit": "^9.5",
"psalm/plugin-phpunit": "^0.18",
"psalm/plugin-symfony": "^5.0",
"rector/rector": "^0.18",
"rector/rector": "^0.19",
"sonata-project/block-bundle": "^5.0",
"sonata-project/entity-audit-bundle": "^1.1",
"symfony/browser-kit": "^5.4 || ^6.2 || ^7.0",
Expand Down
6 changes: 3 additions & 3 deletions src/Datagrid/ProxyQuery.php
Original file line number Diff line number Diff line change
Expand Up @@ -312,13 +312,13 @@ public function entityJoin(array $associationMappings): string
}

/**
* Sets a {@see \Doctrine\ORM\Query} hint. If the hint name is not recognized, it is silently ignored.
* Sets a {@see Query} hint. If the hint name is not recognized, it is silently ignored.
*
* @param string $name the name of the hint
* @param mixed $value the value of the hint
*
* @see \Doctrine\ORM\Query::setHint
* @see \Doctrine\ORM\Query::HINT_CUSTOM_OUTPUT_WALKER
* @see Query::setHint
* @see Query::HINT_CUSTOM_OUTPUT_WALKER
*
* @return $this
*/
Expand Down

0 comments on commit 442500c

Please sign in to comment.