We now support @Id on @ManyToOne fields. Removed TODO and associated code.

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; }