From 2a7364bb18361b282aa271d1edc00e30bf68f395 Mon Sep 17 00:00:00 2001 From: Guilherme Blanco Date: Sat, 14 May 2011 00:53:22 -0300 Subject: [PATCH] We now support @Id on @ManyToOne fields. Removed TODO and associated code. --- tests/Doctrine/Tests/ORM/Functional/Ticket/DDC192Test.php | 8 +------- 1 file changed, 1 insertion(+), 7 deletions(-) diff --git a/tests/Doctrine/Tests/ORM/Functional/Ticket/DDC192Test.php b/tests/Doctrine/Tests/ORM/Functional/Ticket/DDC192Test.php index 07c8d1317..2238c0319 100644 --- a/tests/Doctrine/Tests/ORM/Functional/Ticket/DDC192Test.php +++ b/tests/Doctrine/Tests/ORM/Functional/Ticket/DDC192Test.php @@ -44,17 +44,12 @@ class DDC192Phonenumber */ protected $phone; - /** - * @Id @Column(name="userId", type="integer") - */ - protected $userId; - /** * @Id * @ManyToOne(targetEntity="DDC192User") * @JoinColumn(name="userId", referencedColumnName="id") */ - protected $User; // Id on this docblock is ignored! + protected $User; public function setPhone($value) { $this->phone = $value; } @@ -64,7 +59,6 @@ class DDC192Phonenumber public function setUser(User $user) { $this->User = $user; - $this->userId = $user->getId(); // TODO: Remove once ManyToOne supports Id annotation } public function getUser() { return $this->User; }