From 0824c6136d064211761a4b409ada639a184f6cd9 Mon Sep 17 00:00:00 2001 From: Volker von Hoesslin Date: Wed, 4 Mar 2015 11:55:08 +0100 Subject: [PATCH] unittest DDC3597: fix for PHP 5.4 --- .../Tests/Models/DDC3597/DDC3597Image.php | 2 ++ .../Tests/Models/DDC3597/DDC3597Media.php | 2 ++ .../Tests/Models/DDC3597/DDC3597Root.php | 2 ++ .../ORM/Functional/Ticket/DDC3597Test.php | 23 ++++++++----------- 4 files changed, 16 insertions(+), 13 deletions(-) diff --git a/tests/Doctrine/Tests/Models/DDC3597/DDC3597Image.php b/tests/Doctrine/Tests/Models/DDC3597/DDC3597Image.php index fcc905e90..2254b4243 100644 --- a/tests/Doctrine/Tests/Models/DDC3597/DDC3597Image.php +++ b/tests/Doctrine/Tests/Models/DDC3597/DDC3597Image.php @@ -12,6 +12,8 @@ use Doctrine\Tests\Models\DDC3597\Embeddable\DDC3597Dimension; */ class DDC3597Image extends DDC3597Media { + const CLASSNAME = __CLASS__; + /** * @var DDC3597Dimension * @Embedded(class = "Doctrine\Tests\Models\DDC3597\Embeddable\DDC3597Dimension", columnPrefix = false) diff --git a/tests/Doctrine/Tests/Models/DDC3597/DDC3597Media.php b/tests/Doctrine/Tests/Models/DDC3597/DDC3597Media.php index 07872431b..751f7dac1 100644 --- a/tests/Doctrine/Tests/Models/DDC3597/DDC3597Media.php +++ b/tests/Doctrine/Tests/Models/DDC3597/DDC3597Media.php @@ -10,6 +10,8 @@ namespace Doctrine\Tests\Models\DDC3597; */ abstract class DDC3597Media extends DDC3597Root { + const CLASSNAME = __CLASS__; + /** * @var string * diff --git a/tests/Doctrine/Tests/Models/DDC3597/DDC3597Root.php b/tests/Doctrine/Tests/Models/DDC3597/DDC3597Root.php index 8c8228d5d..d7f86dfba 100644 --- a/tests/Doctrine/Tests/Models/DDC3597/DDC3597Root.php +++ b/tests/Doctrine/Tests/Models/DDC3597/DDC3597Root.php @@ -15,6 +15,8 @@ use Doctrine\ORM\Mapping\DiscriminatorMap; */ abstract class DDC3597Root { + const CLASSNAME = __CLASS__; + /** * @var int * diff --git a/tests/Doctrine/Tests/ORM/Functional/Ticket/DDC3597Test.php b/tests/Doctrine/Tests/ORM/Functional/Ticket/DDC3597Test.php index 65425184d..e6f25b852 100644 --- a/tests/Doctrine/Tests/ORM/Functional/Ticket/DDC3597Test.php +++ b/tests/Doctrine/Tests/ORM/Functional/Ticket/DDC3597Test.php @@ -2,23 +2,21 @@ namespace Doctrine\Tests\ORM\Functional\Ticket; -use Doctrine\Tests\Models\DDC3597\DDC3597Root; -use Doctrine\Tests\Models\DDC3597\DDC3597Media; use Doctrine\Tests\Models\DDC3597\DDC3597Image; +use Doctrine\Tests\Models\DDC3597\DDC3597Media; +use Doctrine\Tests\Models\DDC3597\DDC3597Root; /** * @group DDC-117 */ -class DDC3597Test extends \Doctrine\Tests\OrmFunctionalTestCase -{ +class DDC3597Test extends \Doctrine\Tests\OrmFunctionalTestCase { - protected function setUp() - { + protected function setUp() { parent::setUp(); $this->_schemaTool->createSchema(array( - $this->_em->getClassMetadata(DDC3597Root::class), - $this->_em->getClassMetadata(DDC3597Media::class), - $this->_em->getClassMetadata(DDC3597Image::class) + $this->_em->getClassMetadata(DDC3597Root::CLASSNAME), + $this->_em->getClassMetadata(DDC3597Media::CLASSNAME), + $this->_em->getClassMetadata(DDC3597Image::CLASSNAME) )); } @@ -38,8 +36,8 @@ class DDC3597Test extends \Doctrine\Tests\OrmFunctionalTestCase $this->_em->clear(); //request entity - $imageEntity = $this->_em->find(DDC3597Image::class, $imageEntity->getId()); - $this->assertInstanceOf(DDC3597Image::class, $imageEntity); + $imageEntity = $this->_em->find(DDC3597Image::CLASSNAME, $imageEntity->getId()); + $this->assertInstanceOf(DDC3597Image::CLASSNAME, $imageEntity); //cleanup $this->_em->remove($imageEntity); @@ -47,8 +45,7 @@ class DDC3597Test extends \Doctrine\Tests\OrmFunctionalTestCase $this->_em->clear(); //check delete - $imageEntity = $this->_em->find(DDC3597Image::class, $imageEntity->getId()); + $imageEntity = $this->_em->find(DDC3597Image::CLASSNAME, $imageEntity->getId()); $this->assertNull($imageEntity); } - }