Changeset 4792 for trunk/lib/Doctrine

Timestamp:

08/22/08 10:37:03 (5 months ago)

Author:

romanb

Message:

added mapping check to onetomany. corrected test models.

Location:

trunk/lib/Doctrine

Files:

• Association/OneToMany.php (modified) (1 diff)
• MappingException.php (modified) (1 diff)

trunk/lib/Doctrine/Association/OneToMany.php

@@ -69 +69 @@
     
     /**
+     * Validates and completed the mapping.
+     *
+     * @param array $mapping The mapping to validate and complete.
+     * @return array The validated and completed mapping.
+     * @override
+     */
+    protected function _validateAndCompleteMapping(array $mapping)
+    {
+        $mapping = parent::_validateAndCompleteMapping($mapping);
+        // one-side MUST be inverse (must have mappedBy)
+        if ( ! isset($mapping['mappedBy'])) {
+            throw Doctrine_MappingException::oneToManyRequiresMappedBy($mapping['fieldName']);
+        }
+        
+        return $mapping;
+    }
+    
+    /**
      * Whether orphaned elements (removed from the collection) should be deleted.
      *

trunk/lib/Doctrine/MappingException.php

@@ -48 +48 @@
         return new self("No mapping found for field '$fieldName'.");
     }
+    
+    public static function oneToManyRequiresMappedBy($fieldName)
+    {
+        return new self("OneToMany mapping on field '$fieldName' requires the 'mappedBy' attribute.");
+    }
 }