Changeset 4915 for trunk/lib/Doctrine

Timestamp:

09/12/08 10:26:43 (4 months ago)

Author:

romanb

Message:

Moved association mappings.

Location:

trunk/lib/Doctrine

Files:

• Association (deleted)
• Association.php (deleted)
• ClassMetadata.php (modified) (6 diffs)
• Collection.php (modified) (1 diff)

trunk/lib/Doctrine/ClassMetadata.php

@@ -1553 +1553 @@
      * @param unknown_type $fieldName
      */
-    private function _registerCustomAssociationAccessors(Doctrine_Association $assoc, $fieldName)
+    private function _registerCustomAssociationAccessors(Doctrine_ORM_Mapping_AssociationMapping $assoc, $fieldName)
     {
         if ($acc = $assoc->getCustomAccessor()) {
@@ -1571 +1571 @@
     {
         $mapping = $this->_completeAssociationMapping($mapping);
-        $oneToOneMapping = new Doctrine_Association_OneToOne($mapping);
+        $oneToOneMapping = new Doctrine_ORM_Mapping_OneToOneMapping($mapping);
         $this->_storeAssociationMapping($oneToOneMapping);
         
@@ -1584 +1584 @@
     }
     
-    private function _registerMappingIfInverse(Doctrine_Association $assoc)
+    private function _registerMappingIfInverse(Doctrine_ORM_Mapping_AssociationMapping $assoc)
     {
         if ($assoc->isInverseSide()) {
@@ -1599 +1599 @@
     {
         $mapping = $this->_completeAssociationMapping($mapping);
-        $oneToManyMapping = new Doctrine_Association_OneToMany($mapping);
+        $oneToManyMapping = new Doctrine_ORM_Mapping_OneToManyMapping($mapping);
         $this->_storeAssociationMapping($oneToManyMapping);
     }
@@ -1622 +1622 @@
     {
         $mapping = $this->_completeAssociationMapping($mapping);
-        $manyToManyMapping = new Doctrine_Association_ManyToManyMapping($mapping);
+        $manyToManyMapping = new Doctrine_ORM_Mapping_ManyToManyMapping($mapping);
         $this->_storeAssociationMapping($manyToManyMapping);
     }
@@ -1631 +1631 @@
      * @param Doctrine_Association $assocMapping
      */
-    private function _storeAssociationMapping(Doctrine_Association $assocMapping)
+    private function _storeAssociationMapping(Doctrine_ORM_Mapping_AssociationMapping $assocMapping)
     {
         $sourceFieldName = $assocMapping->getSourceFieldName();

trunk/lib/Doctrine/Collection.php

@@ -230 +230 @@
      * @return void
      */
-    public function _setOwner(Doctrine_Entity $entity, Doctrine_Association $relation)
+    public function _setOwner(Doctrine_Entity $entity, Doctrine_ORM_Mapping_AssociationMapping $relation)
     {
         $this->_owner = $entity;