RetailCRM-Mirror/doctrine2
1
0
Fork 0
mirror of synced 2025-03-06 12:56:10 +03:00
Code Issues Projects Releases Wiki Activity

#6464 #6475 using PHP 7.1 void and string return hints where available

Browse Source
This commit is contained in:
Marco Pivetta 2017-08-11 21:45:23 +02:00
parent 91a5091612
commit 9ad91ddc1c
No known key found for this signature in database
GPG Key ID: 4167D3337FD9D629
2 changed files with 3 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
lib/Doctrine/ORM/Query/SqlWalker.php
View File

@ -888,7 +888,7 @@ class SqlWalker implements TreeWalker
* *
* @return string * @return string
*/ */
private function generateRangeVariableDeclarationSQL($rangeVariableDeclaration, $buildNestedJoins) private function generateRangeVariableDeclarationSQL($rangeVariableDeclaration, bool $buildNestedJoins) : string
{ {
$class = $this->em->getClassMetadata($rangeVariableDeclaration->abstractSchemaName); $class = $this->em->getClassMetadata($rangeVariableDeclaration->abstractSchemaName);
$dqlAlias = $rangeVariableDeclaration->aliasIdentificationVariable; $dqlAlias = $rangeVariableDeclaration->aliasIdentificationVariable;

4
tests/Doctrine/Tests/ORM/Functional/Ticket/GH6464Test.php
View File

@ -12,7 +12,7 @@ class GH6464Test extends OrmFunctionalTestCase
/** /**
* {@inheritDoc} * {@inheritDoc}
*/ */
protected function setUp() protected function setUp() : void
{ {
parent::setUp(); parent::setUp();
@ -29,7 +29,7 @@ class GH6464Test extends OrmFunctionalTestCase
* SqlWalker needs to generate nested INNER JOIN statements, otherwise there would be INNER JOIN * SqlWalker needs to generate nested INNER JOIN statements, otherwise there would be INNER JOIN
* statements without an ON clause, which are valid on e.g. MySQL but rejected by PostgreSQL. * statements without an ON clause, which are valid on e.g. MySQL but rejected by PostgreSQL.
*/ */
public function testIssue() public function testIssue() : void
{ {
$query = $this->_em->createQueryBuilder() $query = $this->_em->createQueryBuilder()
->select('p') ->select('p')