Changeset 4944 for trunk/lib/Doctrine

Timestamp:

09/12/08 13:34:46 (4 months ago)

Author:

romanb

Message:

moved Collection

Location:

trunk/lib/Doctrine

Files:

• Collection.php (deleted)
• EntityManager.php (modified) (2 diffs)
• ORM/Collection.php (added)
• ORM/Entity.php (modified) (1 diff)
• ORM/Internal/Hydration/ObjectDriver.php (modified) (2 diffs)
• Sequence.php (deleted)
• Transaction.php (deleted)

trunk/lib/Doctrine/EntityManager.php

@@ -699 +699 @@
      * @return Doctrine::ORM::EntityManager The created EntityManager.
      */
-    public static function create($conn, $name, Doctrine_Configuration $config = null,
-            Doctrine_EventManager $eventManager = null)
+    public static function create($conn, $name, Doctrine_Common_Configuration $config = null,
+            Doctrine_Common_EventManager $eventManager = null)
     {
         if (is_array($conn)) {
@@ -710 +710 @@
         
         if (is_null($config)) {
-            $config = new Doctrine_Configuration();
+            $config = new Doctrine_Common_Configuration();
         }
         if (is_null($eventManager)) {
-            $eventManager = new Doctrine_EventManager();
+            $eventManager = new Doctrine_Common_EventManager();
         }
         

trunk/lib/Doctrine/ORM/Entity.php

@@ -544 +544 @@
         if ($rel->isOneToOne() && ! $value instanceof Doctrine_ORM_Entity) {
             throw Doctrine_Entity_Exception::invalidValueForOneToOneReference();
-        } else if (($rel->isOneToMany() || $rel->isManyToMany()) && ! $value instanceof Doctrine_Collection) {
+        } else if (($rel->isOneToMany() || $rel->isManyToMany()) && ! $value instanceof Doctrine_ORM_Collection) {
             throw Doctrine_Entity_Exception::invalidValueForOneToManyReference();
         }

trunk/lib/Doctrine/ORM/Internal/Hydration/ObjectDriver.php

@@ -50 +50 @@
     public function getElementCollection($component)
     {
-        $coll = new Doctrine_Collection($component);
+        $coll = new Doctrine_ORM_Collection($component);
         $this->_collections[] = $coll;
 
@@ -81 +81 @@
     }
     
-    public function registerCollection(Doctrine_Collection $coll)
+    public function registerCollection(Doctrine_ORM_Collection $coll)
     {
         $this->_collections[] = $coll;