From cff5c07014aa4c35a8f085018bf4883ebd5da828 Mon Sep 17 00:00:00 2001 From: Marco Pivetta Date: Sun, 27 Nov 2016 17:49:09 +0100 Subject: [PATCH] #5935 #5684 #6020 #6152 removed useless `NAME` constant from the test --- .../Tests/ORM/Functional/Ticket/DDC5684Test.php | 11 +++++------ 1 file changed, 5 insertions(+), 6 deletions(-) diff --git a/tests/Doctrine/Tests/ORM/Functional/Ticket/DDC5684Test.php b/tests/Doctrine/Tests/ORM/Functional/Ticket/DDC5684Test.php index 78e9330a0..a25178de2 100644 --- a/tests/Doctrine/Tests/ORM/Functional/Ticket/DDC5684Test.php +++ b/tests/Doctrine/Tests/ORM/Functional/Ticket/DDC5684Test.php @@ -18,10 +18,10 @@ class DDC5684Test extends \Doctrine\Tests\OrmFunctionalTestCase { parent::setUp(); - if (DBALTypes\Type::hasType(DDC5684ObjectIdType::NAME)) { - DBALTypes\Type::overrideType(DDC5684ObjectIdType::NAME, DDC5684ObjectIdType::CLASSNAME); + if (DBALTypes\Type::hasType(DDC5684ObjectIdType::CLASSNAME)) { + DBALTypes\Type::overrideType(DDC5684ObjectIdType::CLASSNAME, DDC5684ObjectIdType::CLASSNAME); } else { - DBALTypes\Type::addType(DDC5684ObjectIdType::NAME, DDC5684ObjectIdType::CLASSNAME); + DBALTypes\Type::addType(DDC5684ObjectIdType::CLASSNAME, DDC5684ObjectIdType::CLASSNAME); } $this->_schemaTool->createSchema([$this->_em->getClassMetadata(DDC5684Object::CLASSNAME)]); @@ -60,7 +60,6 @@ class DDC5684Test extends \Doctrine\Tests\OrmFunctionalTestCase class DDC5684ObjectIdType extends DBALTypes\IntegerType { - const NAME = 'ticket_5684_object_id'; const CLASSNAME = __CLASS__; public function convertToPHPValue($value, AbstractPlatform $platform) @@ -75,7 +74,7 @@ class DDC5684ObjectIdType extends DBALTypes\IntegerType public function getName() { - return self::NAME; + return self::CLASSNAME; } public function requiresSQLCommentHint(AbstractPlatform $platform) @@ -111,7 +110,7 @@ class DDC5684Object /** * @Id - * @Column(type="ticket_5684_object_id") + * @Column(type=Doctrine\Tests\ORM\Functional\Ticket\DDC5684ObjectIdType::class) * @GeneratedValue(strategy="AUTO") */ public $id;