RetailCRM-Mirror/doctrine2
1
0
Fork 0
mirror of synced 2025-02-10 17:29:27 +03:00
Code Issues Projects Releases Wiki Activity

Add more CS fixes

Browse Source
This commit is contained in:
Alessandro Lai 2017-08-18 12:35:51 +02:00
parent 9864a5a9b9
commit 19bc4991ae
No known key found for this signature in database
GPG Key ID: 5D9C513BE4F5798D
5 changed files with 21 additions and 21 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -2276,7 +2276,7 @@ class SqlWalker implements TreeWalker
* @return string The list in parentheses of valid child discriminators from the given class * @return string The list in parentheses of valid child discriminators from the given class
* @throws QueryException * @throws QueryException
*/ */
private function getChildDiscriminatorsFromClassMetadata(ClassMetadataInfo $rootClass, AST\InstanceOfExpression $instanceOfExpr) private function getChildDiscriminatorsFromClassMetadata(ClassMetadataInfo $rootClass, AST\InstanceOfExpression $instanceOfExpr): string
{ {
$sqlParameterList = []; $sqlParameterList = [];
$discriminators = []; $discriminators = [];

10
tests/Doctrine/Tests/ORM/Functional/Ticket/Ticket4646InstanceOfAbstractTest.php
View File

@ -6,7 +6,7 @@ use Doctrine\Tests\OrmFunctionalTestCase;
class Ticket4646InstanceOfAbstractTest extends OrmFunctionalTestCase class Ticket4646InstanceOfAbstractTest extends OrmFunctionalTestCase
{ {
protected function setUp() protected function setUp(): void
{ {
parent::setUp(); parent::setUp();
@ -16,7 +16,7 @@ class Ticket4646InstanceOfAbstractTest extends OrmFunctionalTestCase
]); ]);
} }
public function testInstanceOf() public function testInstanceOf(): void
{ {
$this->_em->persist(new EmployeeTicket4646Abstract()); $this->_em->persist(new EmployeeTicket4646Abstract());
$this->_em->flush(); $this->_em->flush();
@ -26,8 +26,8 @@ class Ticket4646InstanceOfAbstractTest extends OrmFunctionalTestCase
$query = $this->_em->createQuery($dql); $query = $this->_em->createQuery($dql);
$result = $query->getResult(); $result = $query->getResult();
$this->assertCount(1, $result); self::assertCount(1, $result);
$this->assertContainsOnlyInstancesOf(PersonTicket4646Abstract::class, $result); self::assertContainsOnlyInstancesOf(PersonTicket4646Abstract::class, $result);
} }
} }
@ -49,7 +49,7 @@ abstract class PersonTicket4646Abstract
*/ */
private $id; private $id;
public function getId() public function getId(): ?int
{ {
return $this->id; return $this->id;
} }

10
tests/Doctrine/Tests/ORM/Functional/Ticket/Ticket4646InstanceOfMultiLevelTest.php
View File

@ -6,7 +6,7 @@ use Doctrine\Tests\OrmFunctionalTestCase;
class Ticket4646InstanceOfMultiLevelTest extends OrmFunctionalTestCase class Ticket4646InstanceOfMultiLevelTest extends OrmFunctionalTestCase
{ {
protected function setUp() protected function setUp(): void
{ {
parent::setUp(); parent::setUp();
@ -17,7 +17,7 @@ class Ticket4646InstanceOfMultiLevelTest extends OrmFunctionalTestCase
]); ]);
} }
public function testInstanceOf() public function testInstanceOf(): void
{ {
$this->_em->persist(new PersonTicket4646MultiLevel()); $this->_em->persist(new PersonTicket4646MultiLevel());
$this->_em->persist(new EmployeeTicket4646MultiLevel()); $this->_em->persist(new EmployeeTicket4646MultiLevel());
@ -29,8 +29,8 @@ class Ticket4646InstanceOfMultiLevelTest extends OrmFunctionalTestCase
$query = $this->_em->createQuery($dql); $query = $this->_em->createQuery($dql);
$result = $query->getResult(); $result = $query->getResult();
$this->assertCount(3, $result); self::assertCount(3, $result);
$this->assertContainsOnlyInstancesOf(PersonTicket4646MultiLevel::class, $result); self::assertContainsOnlyInstancesOf(PersonTicket4646MultiLevel::class, $result);
} }
} }
@ -54,7 +54,7 @@ class PersonTicket4646MultiLevel
*/ */
private $id; private $id;
public function getId() public function getId(): ?int
{ {
return $this->id; return $this->id;
} }

10
tests/Doctrine/Tests/ORM/Functional/Ticket/Ticket4646InstanceOfParametricTest.php
View File

@ -6,7 +6,7 @@ use Doctrine\Tests\OrmFunctionalTestCase;
class Ticket4646InstanceOfParametricTest extends OrmFunctionalTestCase class Ticket4646InstanceOfParametricTest extends OrmFunctionalTestCase
{ {
protected function setUp() protected function setUp(): void
{ {
parent::setUp(); parent::setUp();
$this->_schemaTool->createSchema([ $this->_schemaTool->createSchema([
@ -15,7 +15,7 @@ class Ticket4646InstanceOfParametricTest extends OrmFunctionalTestCase
]); ]);
} }
public function testInstanceOf() public function testInstanceOf(): void
{ {
$this->_em->persist(new PersonTicket4646Parametric()); $this->_em->persist(new PersonTicket4646Parametric());
$this->_em->persist(new EmployeeTicket4646Parametric()); $this->_em->persist(new EmployeeTicket4646Parametric());
@ -28,8 +28,8 @@ class Ticket4646InstanceOfParametricTest extends OrmFunctionalTestCase
$this->_em->getClassMetadata(PersonTicket4646Parametric::class) $this->_em->getClassMetadata(PersonTicket4646Parametric::class)
); );
$result = $query->getResult(); $result = $query->getResult();
$this->assertCount(2, $result); self::assertCount(2, $result);
$this->assertContainsOnlyInstancesOf(PersonTicket4646Parametric::class, $result); self::assertContainsOnlyInstancesOf(PersonTicket4646Parametric::class, $result);
} }
} }
@ -52,7 +52,7 @@ class PersonTicket4646Parametric
*/ */
private $id; private $id;
public function getId() public function getId(): ?int
{ {
return $this->id; return $this->id;
} }

10
tests/Doctrine/Tests/ORM/Functional/Ticket/Ticket4646InstanceOfTest.php
View File

@ -6,7 +6,7 @@ use Doctrine\Tests\OrmFunctionalTestCase;
class Ticket4646InstanceOfTest extends OrmFunctionalTestCase class Ticket4646InstanceOfTest extends OrmFunctionalTestCase
{ {
protected function setUp() protected function setUp(): void
{ {
parent::setUp(); parent::setUp();
@ -16,7 +16,7 @@ class Ticket4646InstanceOfTest extends OrmFunctionalTestCase
]); ]);
} }
public function testInstanceOf() public function testInstanceOf(): void
{ {
$this->_em->persist(new PersonTicket4646()); $this->_em->persist(new PersonTicket4646());
$this->_em->persist(new EmployeeTicket4646()); $this->_em->persist(new EmployeeTicket4646());
@ -27,8 +27,8 @@ class Ticket4646InstanceOfTest extends OrmFunctionalTestCase
$query = $this->_em->createQuery($dql); $query = $this->_em->createQuery($dql);
$result = $query->getResult(); $result = $query->getResult();
$this->assertCount(2, $result); self::assertCount(2, $result);
$this->assertContainsOnlyInstancesOf(PersonTicket4646::class, $result); self::assertContainsOnlyInstancesOf(PersonTicket4646::class, $result);
} }
} }
@ -51,7 +51,7 @@ class PersonTicket4646
*/ */
private $id; private $id;
public function getId() public function getId(): ?int
{ {
return $this->id; return $this->id;
} }