Changeset 4436 for trunk/lib/Doctrine

Timestamp:

05/25/08 21:57:32 (8 months ago)

Author:

romanb

Message:

custom/magic accessors + test

Location:

trunk/lib/Doctrine

Files:

• ClassMetadata.php (modified) (1 diff)
• Entity.php (modified) (5 diffs)
• EntityManager.php (modified) (1 diff)

trunk/lib/Doctrine/ClassMetadata.php

@@ -952 +952 @@
         $columnName = $this->getColumnName($fieldName);
         return isset($this->_mappedColumns[$columnName]['mutator']) ?
-        $this->_mappedColumns[$columnName]['mutator'] : null;
+                $this->_mappedColumns[$columnName]['mutator'] : null;
     }
 

trunk/lib/Doctrine/Entity.php

@@ -249 +249 @@
         //--
         
-        self::$_useAutoAccessorOverride = false; // @todo read from attribute the first time
+        self::$_useAutoAccessorOverride = true; // @todo read from attribute the first time
     }
 
@@ -995 +995 @@
     public function get($fieldName, $load = false)
     {
+        if ($getter = $this->_getCustomAccessor($fieldName)) {
+            return $this->$getter();
+        }
         $this->_invokeCustomAccessor($fieldName);
         
@@ -1028 +1031 @@
     }
     
-    private function _invokeCustomAccessor($fieldName)
+    private function _getCustomMutator($fieldName)
+    {
+        if ( ! isset(self::$_mutatorCache[$this->_entityName][$fieldName])) {
+            if (self::$_useAutoAccessorOverride) {
+                $setterMethod = 'set' . Doctrine::classify($fieldName);
+                if (method_exists($this, $setterMethod)) {
+                    self::$_mutatorCache[$this->_entityName][$fieldName] = $setterMethod;
+                } else {
+                    self::$_mutatorCache[$this->_entityName][$fieldName] = false;
+                }
+            }
+            
+            if ($setter = $this->_class->getCustomMutator($fieldName)) {
+                self::$_mutatorCache[$this->_entityName][$fieldName] = $setter;
+            } else if ( ! isset(self::$_mutatorCache[$this->_entityName][$fieldName])) {
+                self::$_mutatorCache[$this->_entityName][$fieldName] = false;
+            }
+        }
+        
+        return self::$_mutatorCache[$this->_entityName][$fieldName];
+    }
+    
+    private function _getCustomAccessor($fieldName)
     {
         if ( ! isset(self::$_accessorCache[$this->_entityName][$fieldName])) {
@@ -1045 +1070 @@
             }
         }
-        // invoke custom accessor, if it exists.
-        if ($getter = self::$_accessorCache[$this->_entityName][$fieldName]) {
-            return $this->$getter();
-        }
+        
+        return self::$_accessorCache[$this->_entityName][$fieldName];
     }
     
@@ -1071 +1094 @@
      */
     public function set($fieldName, $value, $load = false)
-    {        
+    {
+        if ($setter = $this->_getCustomMutator($fieldName)) {
+            return $this->$setter($value);
+        }
+        
         if ($this->_class->hasField($fieldName)) {
             if ($value instanceof Doctrine_Entity) {

trunk/lib/Doctrine/EntityManager.php

@@ -20 +20 @@
  */
 
+#namespace Doctrine::ORM;
+
 /**
  * The EntityManager is a central access point to ORM functionality.