1
0
mirror of synced 2025-02-02 13:31:45 +03:00

#1169 DDC-3343 - minor refactoring: constant over string reference

This commit is contained in:
Marco Pivetta 2015-01-24 11:41:20 +01:00
parent ff0168834e
commit 24ebfb69cb

View File

@ -17,8 +17,8 @@ class DDC3343Test extends \Doctrine\Tests\OrmFunctionalTestCase
public function testEntityNotDeletedWhenRemovedFromExtraLazyAssociation() public function testEntityNotDeletedWhenRemovedFromExtraLazyAssociation()
{ {
$this->_schemaTool->createSchema(array( $this->_schemaTool->createSchema(array(
$this->_em->getClassMetadata(__NAMESPACE__ . '\DDC3343User'), $this->_em->getClassMetadata(DDC3343User::CLASSNAME),
$this->_em->getClassMetadata(__NAMESPACE__ . '\DDC3343Group'), $this->_em->getClassMetadata(DDC3343Group::CLASSNAME),
)); ));
// Save a group and an associated user (in an extra lazy association) // Save a group and an associated user (in an extra lazy association)
@ -34,16 +34,19 @@ class DDC3343Test extends \Doctrine\Tests\OrmFunctionalTestCase
// Fetch the group and the user again and remove the user from the collection. // Fetch the group and the user again and remove the user from the collection.
$this->_em->clear(); $this->_em->clear();
$group = $this->_em->find(__NAMESPACE__ . '\DDC3343Group', $group->id); $group = $this->_em->find(DDC3343Group::CLASSNAME, $group->id);
$user = $this->_em->find(__NAMESPACE__ . '\DDC3343User', $user->id); $user = $this->_em->find(DDC3343User::CLASSNAME, $user->id);
$group->users->removeElement($user); $group->users->removeElement($user);
// Even though the collection is extra lazy, the user should not have been deleted. // Even though the collection is extra lazy, the user should not have been deleted.
$this->_em->clear(); $this->_em->clear();
$user = $this->_em->find(__NAMESPACE__ . '\DDC3343User', $user->id); /* @var $user DDC3343User */
$this->assertInstanceOf(__NAMESPACE__ . '\DDC3343User', $user); $user = $this->_em->find(DDC3343User::CLASSNAME, $user->id);
$this->assertInstanceOf(DDC3343User::CLASSNAME, $user);
$this->assertNull($user->group);
} }
} }
@ -52,6 +55,8 @@ class DDC3343Test extends \Doctrine\Tests\OrmFunctionalTestCase
*/ */
class DDC3343User class DDC3343User
{ {
const CLASSNAME = __CLASS__;
/** /**
* @Id * @Id
* @GeneratedValue * @GeneratedValue
@ -62,7 +67,7 @@ class DDC3343User
/** /**
* @ManyToOne(targetEntity="DDC3343Group", inversedBy="users") * @ManyToOne(targetEntity="DDC3343Group", inversedBy="users")
*/ */
protected $group; public $group;
} }
/** /**
@ -70,6 +75,8 @@ class DDC3343User
*/ */
class DDC3343Group class DDC3343Group
{ {
const CLASSNAME = __CLASS__;
/** /**
* @Id * @Id
* @GeneratedValue * @GeneratedValue