From 6e4c24684c6ce61ac2db818962bed6752352449f Mon Sep 17 00:00:00 2001
From: piccoloprincipe <piccoloprincipe@625475ce-881a-0410-a577-b389adb331d8>
Date: Fri, 17 Jul 2009 13:41:03 +0000
Subject: [PATCH] [2.0] added load() method

---
 lib/Doctrine/ORM/Mapping/AssociationMapping.php |  2 +-
 lib/Doctrine/ORM/Mapping/ManyToManyMapping.php  |  6 +++---
 lib/Doctrine/ORM/Mapping/OneToManyMapping.php   | 13 ++++---------
 lib/Doctrine/ORM/Mapping/OneToOneMapping.php    |  2 +-
 4 files changed, 9 insertions(+), 14 deletions(-)

diff --git a/lib/Doctrine/ORM/Mapping/AssociationMapping.php b/lib/Doctrine/ORM/Mapping/AssociationMapping.php
index 378a0f56a..e6ef4b32b 100644
--- a/lib/Doctrine/ORM/Mapping/AssociationMapping.php
+++ b/lib/Doctrine/ORM/Mapping/AssociationMapping.php
@@ -386,5 +386,5 @@ abstract class AssociationMapping
      * @param object $targetEntity
      * @param EntityManager $em
      */
-    public function load($owningEntity, $targetEntity, $em) {}
+    abstract public function load($owningEntity, $targetEntity, $em);
 }
diff --git a/lib/Doctrine/ORM/Mapping/ManyToManyMapping.php b/lib/Doctrine/ORM/Mapping/ManyToManyMapping.php
index c29c6ad60..03df394d3 100644
--- a/lib/Doctrine/ORM/Mapping/ManyToManyMapping.php
+++ b/lib/Doctrine/ORM/Mapping/ManyToManyMapping.php
@@ -138,9 +138,9 @@ class ManyToManyMapping extends AssociationMapping
         return $this->targetKeyColumns;
     }
 
-    public function lazyLoadFor($entity, $entityManager)
+    public function load($owningEntity, $targetEntity, $em)
     {
-        //TODO
+        throw new Exception('Not yet implemented.');
     }
 
     /**
@@ -152,4 +152,4 @@ class ManyToManyMapping extends AssociationMapping
     {
         return true;
     }
-}
\ No newline at end of file
+}
diff --git a/lib/Doctrine/ORM/Mapping/OneToManyMapping.php b/lib/Doctrine/ORM/Mapping/OneToManyMapping.php
index 6cd1fbc2c..4a4442f68 100644
--- a/lib/Doctrine/ORM/Mapping/OneToManyMapping.php
+++ b/lib/Doctrine/ORM/Mapping/OneToManyMapping.php
@@ -96,14 +96,9 @@ class OneToManyMapping extends AssociationMapping
     {
         return true;
     }
-    
-    /**
-     *
-     * @param <type> $entity 
-     * @override
-     */
-    public function lazyLoadFor($entity, $entityManager)
-    {
 
+    public function load($owningEntity, $targetEntity, $em)
+    {
+        throw new Exception('Not yet implemented.');
     }
-}
\ No newline at end of file
+}
diff --git a/lib/Doctrine/ORM/Mapping/OneToOneMapping.php b/lib/Doctrine/ORM/Mapping/OneToOneMapping.php
index e902f34a2..3bafa158f 100644
--- a/lib/Doctrine/ORM/Mapping/OneToOneMapping.php
+++ b/lib/Doctrine/ORM/Mapping/OneToOneMapping.php
@@ -181,4 +181,4 @@ class OneToOneMapping extends AssociationMapping
 
         $em->getUnitOfWork()->getEntityPersister($this->targetEntityName)->load($conditions, $targetEntity);
     }
-}
\ No newline at end of file
+}