From 04acde667a517db81ed5798d58ccdf39bbb82d06 Mon Sep 17 00:00:00 2001 From: Alessandro Lai Date: Tue, 18 Apr 2017 11:57:49 +0200 Subject: [PATCH] Fix as per review --- .../Tests/ORM/Functional/InstanceOfAbstractTest.php | 7 +++---- tests/Doctrine/Tests/ORM/Functional/InstanceOfTest.php | 6 +++--- 2 files changed, 6 insertions(+), 7 deletions(-) diff --git a/tests/Doctrine/Tests/ORM/Functional/InstanceOfAbstractTest.php b/tests/Doctrine/Tests/ORM/Functional/InstanceOfAbstractTest.php index a84643f84..3a52d93f9 100644 --- a/tests/Doctrine/Tests/ORM/Functional/InstanceOfAbstractTest.php +++ b/tests/Doctrine/Tests/ORM/Functional/InstanceOfAbstractTest.php @@ -28,9 +28,9 @@ namespace Doctrine\Tests\ORM\Functional { $this->assertCount(1, $result); foreach ($result as $r) { - $this->assertInstanceOf('Doctrine\Tests\ORM\Functional\InstanceOfAbstractTest\Person', $r); - $this->assertInstanceOf('Doctrine\Tests\ORM\Functional\InstanceOfAbstractTest\Employee', $r); - $this->assertEquals('bar', $r->getName()); + $this->assertInstanceOf(InstanceOfAbstractTest\Person::class, $r); + $this->assertInstanceOf(InstanceOfAbstractTest\Employee::class, $r); + $this->assertSame('bar', $r->getName()); } } @@ -109,5 +109,4 @@ namespace Doctrine\Tests\ORM\Functional\InstanceOfAbstractTest { $this->departement = $departement; } } - } diff --git a/tests/Doctrine/Tests/ORM/Functional/InstanceOfTest.php b/tests/Doctrine/Tests/ORM/Functional/InstanceOfTest.php index 7f593c3f4..fce0075b6 100644 --- a/tests/Doctrine/Tests/ORM/Functional/InstanceOfTest.php +++ b/tests/Doctrine/Tests/ORM/Functional/InstanceOfTest.php @@ -10,10 +10,10 @@ namespace Doctrine\Tests\ORM\Functional { { parent::setUp(); - $this->_schemaTool->createSchema(array( + $this->_schemaTool->createSchema([ $this->_em->getClassMetadata(__NAMESPACE__ . '\InstanceOfTest\Person'), $this->_em->getClassMetadata(__NAMESPACE__ . '\InstanceOfTest\Employee'), - )); + ]); } public function testInstanceOf() @@ -28,7 +28,7 @@ namespace Doctrine\Tests\ORM\Functional { $this->assertCount(2, $result); foreach ($result as $r) { - $this->assertInstanceOf('Doctrine\Tests\ORM\Functional\InstanceOfTest\Person', $r); + $this->assertInstanceOf(InstanceOfTest\Person::class, $r); if ($r instanceof InstanceOfTest\Employee) { $this->assertEquals('bar', $r->getName()); } else {