Merge pull request #57 from alquerci/fix-reverse-relations-matching-while-hydrate-a-one-to-many-related

Fix reverse relations matching while hydrate a one to many related

Author: j0k3r

lib/Doctrine/Collection.php

@@ -471,7 +471,7 @@ public function add($record, $key = null)
             }
             $relations = $this->relation['table']->getRelations();
             foreach ($relations as $relation) {
-                if ($this->relation['class'] == $relation['localTable']->getOption('name') && $relation->getLocal() == $this->relation->getForeignFieldName()) {
+                if ($this->relation['localTable']->getOption('name') == $relation['class'] && $relation->getLocal() == $this->relation->getForeignFieldName()) {
                     $record->{$relation['alias']} = $this->reference;
                     break;
                 }

tests/Hydrate/CollectionInitializationTestCase.php

@@ -88,4 +88,23 @@ public function testCollectionsAreReinitializedOnHydration()
         $this->assertEqual('112', $users[0]->Phonenumber[0]->phonenumber);
         $this->assertEqual('110', $users[0]->Phonenumber[1]->phonenumber);
     }
+
+    public function testOneToManyReverseMatching()
+    {
+        $users  = Doctrine_Query::create()
+            ->from('User u')
+            ->leftJoin('u.Phonenumber p')
+            ->having('COUNT(p.id) > 0')
+            ->groupBy('u.id')
+            ->limit(1)
+            ->execute()
+        ;
+
+        $expectedUser = $users->getFirst();
+
+        // Explicitly not load the record as the reverse matching do it for us.
+        $actualUser = $expectedUser->Phonenumber->getFirst()->get('User', false);
+
+        $this->assertIdentical($expectedUser, $actualUser);
+    }
 }

tests/Ticket/1674TestCase.php

@@ -44,7 +44,7 @@ public function testTest()
 
         $xml = $users->exportTo('xml'); 
         $this->assertEqual($xml, '<?xml version="1.0" encoding="utf-8"?>
-<data><User id="4" type="0" email_id="1"><name>zYne</name><loginname/><password/><created/><updated/><Phonenumber><Phonenumber id="2" entity_id="4"><phonenumber>123 123</phonenumber><Entity/></Phonenumber></Phonenumber></User></data>
+<data><User id="4" type="0" email_id="1"><name>zYne</name><loginname/><password/><created/><updated/><Phonenumber><Phonenumber id="2" entity_id="4"><phonenumber>123 123</phonenumber><User/></Phonenumber></Phonenumber></User></data>
 ');
     }
 }