From d439f67df5afe43858defbf8e4777afb0fcbb680 Mon Sep 17 00:00:00 2001 From: Alexander Date: Thu, 28 Jul 2011 12:25:23 +0200 Subject: [PATCH] [DDC-1301] Prefixed all Legacy models properties with _ --- .../Tests/Models/Legacy/LegacyArticle.php | 12 ++-- .../Tests/Models/Legacy/LegacyCar.php | 14 ++-- .../Tests/Models/Legacy/LegacyUser.php | 38 +++++------ .../Models/Legacy/LegacyUserReference.php | 28 ++++---- .../ORM/Functional/Ticket/DDC1301Test.php | 68 +++++++++---------- 5 files changed, 80 insertions(+), 80 deletions(-) diff --git a/tests/Doctrine/Tests/Models/Legacy/LegacyArticle.php b/tests/Doctrine/Tests/Models/Legacy/LegacyArticle.php index e373c337d..fb754462e 100644 --- a/tests/Doctrine/Tests/Models/Legacy/LegacyArticle.php +++ b/tests/Doctrine/Tests/Models/Legacy/LegacyArticle.php @@ -13,21 +13,21 @@ class LegacyArticle * @Column(name="iArticleId", type="integer") * @GeneratedValue(strategy="AUTO") */ - public $id; + public $_id; /** * @Column(name="sTopic", type="string", length=255) */ - public $topic; + public $_topic; /** * @Column(name="sText", type="text") */ - public $text; + public $_text; /** - * @ManyToOne(targetEntity="LegacyUser", inversedBy="articles") + * @ManyToOne(targetEntity="LegacyUser", inversedBy="_articles") * @JoinColumn(name="iUserId", referencedColumnName="iUserId") */ - public $user; + public $_user; public function setAuthor(LegacyUser $author) { - $this->user = $author; + $this->_user = $author; } } diff --git a/tests/Doctrine/Tests/Models/Legacy/LegacyCar.php b/tests/Doctrine/Tests/Models/Legacy/LegacyCar.php index a27d3c34c..ac3834145 100644 --- a/tests/Doctrine/Tests/Models/Legacy/LegacyCar.php +++ b/tests/Doctrine/Tests/Models/Legacy/LegacyCar.php @@ -15,27 +15,27 @@ class LegacyCar * @GeneratedValue * @Column(name="iCarId", type="integer", nullable=false) */ - public $id; + public $_id; /** - * @ManyToMany(targetEntity="LegacyUser", mappedBy="cars") + * @ManyToMany(targetEntity="LegacyUser", mappedBy="_cars") */ - public $users; + public $_users; /** * @Column(name="sDescription", type="string", length=255, unique=true) */ - public $description; + public $_description; function getDescription() { - return $this->description; + return $this->_description; } public function addUser(LegacyUser $user) { - $this->users[] = $user; + $this->_users[] = $user; } public function getUsers() { - return $this->users; + return $this->_users; } } diff --git a/tests/Doctrine/Tests/Models/Legacy/LegacyUser.php b/tests/Doctrine/Tests/Models/Legacy/LegacyUser.php index fb06263a2..d7c9a5c37 100644 --- a/tests/Doctrine/Tests/Models/Legacy/LegacyUser.php +++ b/tests/Doctrine/Tests/Models/Legacy/LegacyUser.php @@ -15,66 +15,66 @@ class LegacyUser * @GeneratedValue * @Column(name="iUserId", type="integer", nullable=false) */ - public $id; + public $_id; /** * @Column(name="sUsername", type="string", length=255, unique=true) */ - public $username; + public $_username; /** * @Column(type="string", length=255) */ - public $name; + public $_name; /** - * @OneToMany(targetEntity="LegacyArticle", mappedBy="user") + * @OneToMany(targetEntity="LegacyArticle", mappedBy="_user") */ - public $articles; + public $_articles; /** - * @OneToMany(targetEntity="LegacyUserReference", mappedBy="source", cascade={"remove"}) + * @OneToMany(targetEntity="LegacyUserReference", mappedBy="_source", cascade={"remove"}) */ - public $references; + public $_references; /** - * @ManyToMany(targetEntity="LegacyCar", inversedBy="users", cascade={"persist", "merge"}) + * @ManyToMany(targetEntity="LegacyCar", inversedBy="_users", cascade={"persist", "merge"}) * @JoinTable(name="legace_users_cars", * joinColumns={@JoinColumn(name="iUserId", referencedColumnName="iUserId")}, * inverseJoinColumns={@JoinColumn(name="iCarId", referencedColumnName="iCarId")} * ) */ - public $cars; + public $_cars; public function __construct() { - $this->articles = new ArrayCollection; - $this->references = new ArrayCollection; - $this->cars = new ArrayCollection; + $this->_articles = new ArrayCollection; + $this->_references = new ArrayCollection; + $this->_cars = new ArrayCollection; } public function getId() { - return $this->id; + return $this->_id; } public function getUsername() { - return $this->username; + return $this->_username; } public function addArticle(LegacyArticle $article) { - $this->articles[] = $article; + $this->_articles[] = $article; $article->setAuthor($this); } public function addReference($reference) { - $this->references[] = $reference; + $this->_references[] = $reference; } public function references() { - return $this->references; + return $this->_references; } public function addCar(LegacyCar $car) { - $this->cars[] = $car; + $this->_cars[] = $car; $car->addUser($this); } public function getCars() { - return $this->cars; + return $this->_cars; } } diff --git a/tests/Doctrine/Tests/Models/Legacy/LegacyUserReference.php b/tests/Doctrine/Tests/Models/Legacy/LegacyUserReference.php index 8b1ee9407..c6cd891a1 100644 --- a/tests/Doctrine/Tests/Models/Legacy/LegacyUserReference.php +++ b/tests/Doctrine/Tests/Models/Legacy/LegacyUserReference.php @@ -10,56 +10,56 @@ class LegacyUserReference { /** * @Id - * @ManyToOne(targetEntity="LegacyUser", inversedBy="references") + * @ManyToOne(targetEntity="LegacyUser", inversedBy="_references") * @JoinColumn(name="iUserIdSource", referencedColumnName="iUserId") */ - private $source; + private $_source; /** * @Id - * @ManyToOne(targetEntity="LegacyUser", inversedBy="references") + * @ManyToOne(targetEntity="LegacyUser", inversedBy="_references") * @JoinColumn(name="iUserIdTarget", referencedColumnName="iUserId") */ - private $target; + private $_target; /** * @column(type="string") */ - private $description; + private $_description; /** * @column(type="datetime") */ - private $created; + private $_created; public function __construct($source, $target, $description) { $source->addReference($this); $target->addReference($this); - $this->source = $source; - $this->target = $target; - $this->description = $description; - $this->created = new \DateTime("now"); + $this->_source = $source; + $this->_target = $target; + $this->_description = $description; + $this->_created = new \DateTime("now"); } public function source() { - return $this->source; + return $this->_source; } public function target() { - return $this->target; + return $this->_target; } public function setDescription($desc) { - $this->description = $desc; + $this->_description = $desc; } public function getDescription() { - return $this->description; + return $this->_description; } } diff --git a/tests/Doctrine/Tests/ORM/Functional/Ticket/DDC1301Test.php b/tests/Doctrine/Tests/ORM/Functional/Ticket/DDC1301Test.php index f1dd02498..94d02f905 100644 --- a/tests/Doctrine/Tests/ORM/Functional/Ticket/DDC1301Test.php +++ b/tests/Doctrine/Tests/ORM/Functional/Ticket/DDC1301Test.php @@ -19,9 +19,9 @@ class DDC1301Test extends \Doctrine\Tests\OrmFunctionalTestCase parent::setUp(); $class = $this->_em->getClassMetadata('Doctrine\Tests\Models\Legacy\LegacyUser'); - $class->associationMappings['articles']['fetch'] = ClassMetadataInfo::FETCH_EXTRA_LAZY; - $class->associationMappings['references']['fetch'] = ClassMetadataInfo::FETCH_EXTRA_LAZY; - $class->associationMappings['cars']['fetch'] = ClassMetadataInfo::FETCH_EXTRA_LAZY; + $class->associationMappings['_articles']['fetch'] = ClassMetadataInfo::FETCH_EXTRA_LAZY; + $class->associationMappings['_references']['fetch'] = ClassMetadataInfo::FETCH_EXTRA_LAZY; + $class->associationMappings['_cars']['fetch'] = ClassMetadataInfo::FETCH_EXTRA_LAZY; $this->loadFixture(); } @@ -31,9 +31,9 @@ class DDC1301Test extends \Doctrine\Tests\OrmFunctionalTestCase parent::tearDown(); $class = $this->_em->getClassMetadata('Doctrine\Tests\Models\Legacy\LegacyUser'); - $class->associationMappings['articles']['fetch'] = ClassMetadataInfo::FETCH_LAZY; - $class->associationMappings['references']['fetch'] = ClassMetadataInfo::FETCH_LAZY; - $class->associationMappings['cars']['fetch'] = ClassMetadataInfo::FETCH_LAZY; + $class->associationMappings['_articles']['fetch'] = ClassMetadataInfo::FETCH_LAZY; + $class->associationMappings['_references']['fetch'] = ClassMetadataInfo::FETCH_LAZY; + $class->associationMappings['_cars']['fetch'] = ClassMetadataInfo::FETCH_LAZY; } public function testCountNotInitializesLegacyCollection() @@ -41,11 +41,11 @@ class DDC1301Test extends \Doctrine\Tests\OrmFunctionalTestCase $user = $this->_em->find('Doctrine\Tests\Models\Legacy\LegacyUser', $this->userId); $queryCount = $this->getCurrentQueryCount(); - $this->assertFalse($user->articles->isInitialized()); - $this->assertEquals(2, count($user->articles)); - $this->assertFalse($user->articles->isInitialized()); + $this->assertFalse($user->_articles->isInitialized()); + $this->assertEquals(2, count($user->_articles)); + $this->assertFalse($user->_articles->isInitialized()); - foreach ($user->articles AS $article) { } + foreach ($user->_articles AS $article) { } $this->assertEquals($queryCount + 2, $this->getCurrentQueryCount(), "Expecting two queries to be fired for count, then iteration."); } @@ -55,11 +55,11 @@ class DDC1301Test extends \Doctrine\Tests\OrmFunctionalTestCase $user = $this->_em->find('Doctrine\Tests\Models\Legacy\LegacyUser', $this->userId); $queryCount = $this->getCurrentQueryCount(); - $this->assertFalse($user->references->isInitialized()); - $this->assertEquals(2, count($user->references)); - $this->assertFalse($user->references->isInitialized()); + $this->assertFalse($user->_references->isInitialized()); + $this->assertEquals(2, count($user->_references)); + $this->assertFalse($user->_references->isInitialized()); - foreach ($user->references AS $reference) { } + foreach ($user->_references AS $reference) { } $this->assertEquals($queryCount + 2, $this->getCurrentQueryCount(), "Expecting two queries to be fired for count, then iteration."); } @@ -69,11 +69,11 @@ class DDC1301Test extends \Doctrine\Tests\OrmFunctionalTestCase $user = $this->_em->find('Doctrine\Tests\Models\Legacy\LegacyUser', $this->userId); $queryCount = $this->getCurrentQueryCount(); - $this->assertFalse($user->cars->isInitialized()); - $this->assertEquals(3, count($user->cars)); - $this->assertFalse($user->cars->isInitialized()); + $this->assertFalse($user->_cars->isInitialized()); + $this->assertEquals(3, count($user->_cars)); + $this->assertFalse($user->_cars->isInitialized()); - foreach ($user->cars AS $reference) { } + foreach ($user->_cars AS $reference) { } $this->assertEquals($queryCount + 2, $this->getCurrentQueryCount(), "Expecting two queries to be fired for count, then iteration."); } @@ -81,45 +81,45 @@ class DDC1301Test extends \Doctrine\Tests\OrmFunctionalTestCase public function loadFixture() { $user1 = new \Doctrine\Tests\Models\Legacy\LegacyUser(); - $user1->username = "beberlei"; - $user1->name = "Benjamin"; - $user1->status = "active"; + $user1->_username = "beberlei"; + $user1->_name = "Benjamin"; + $user1->_status = "active"; $user2 = new \Doctrine\Tests\Models\Legacy\LegacyUser(); - $user2->username = "jwage"; - $user2->name = "Jonathan"; - $user2->status = "active"; + $user2->_username = "jwage"; + $user2->_name = "Jonathan"; + $user2->_status = "active"; $user3 = new \Doctrine\Tests\Models\Legacy\LegacyUser(); - $user3->username = "romanb"; - $user3->name = "Roman"; - $user3->status = "active"; + $user3->_username = "romanb"; + $user3->_name = "Roman"; + $user3->_status = "active"; $this->_em->persist($user1); $this->_em->persist($user2); $this->_em->persist($user3); $article1 = new \Doctrine\Tests\Models\Legacy\LegacyArticle(); - $article1->topic = "Test"; - $article1->text = "Test"; + $article1->_topic = "Test"; + $article1->_text = "Test"; $article1->setAuthor($user1); $article2 = new \Doctrine\Tests\Models\Legacy\LegacyArticle(); - $article2->topic = "Test"; - $article2->text = "Test"; + $article2->_topic = "Test"; + $article2->_text = "Test"; $article2->setAuthor($user1); $this->_em->persist($article1); $this->_em->persist($article2); $car1 = new \Doctrine\Tests\Models\Legacy\LegacyCar(); - $car1->description = "Test1"; + $car1->_description = "Test1"; $car2 = new \Doctrine\Tests\Models\Legacy\LegacyCar(); - $car2->description = "Test2"; + $car2->_description = "Test2"; $car3 = new \Doctrine\Tests\Models\Legacy\LegacyCar(); - $car3->description = "Test3"; + $car3->_description = "Test3"; $user1->addCar($car1); $user1->addCar($car2);