Doctrine

Timestamp:

08/27/08 20:26:49 (10 months ago)

Author:

jwage

Message:

fixes #1077

Location:

branches/1.0

Files:

• lib/Doctrine.php (modified) (1 diff)
• lib/Doctrine/Configurable.php (modified) (1 diff)
• lib/Doctrine/Manager.php (modified) (1 diff)
• lib/Doctrine/Record.php (modified) (3 diffs)
• tests/run.php (modified) (1 diff)
• tests/Ticket/1077TestCase.php (added)

branches/1.0/lib/Doctrine.php

@@ -196 +196 @@
     const ATTR_RECURSIVE_MERGE_FIXTURES = 162;
     const ATTR_USE_DQL_CALLBACKS        = 164;
+    const ATTR_AUTO_ACCESSOR_OVERRIDE   = 165;
 
     /**

branches/1.0/lib/Doctrine/Configurable.php

@@ -182 +182 @@
             case Doctrine::ATTR_RECURSIVE_MERGE_FIXTURES;
             case Doctrine::ATTR_USE_DQL_CALLBACKS;
+            case Doctrine::ATTR_AUTO_ACCESSOR_OVERRIDE;
 
                 break;

branches/1.0/lib/Doctrine/Manager.php

@@ -103 +103 @@
                         Doctrine::ATTR_AUTOLOAD_TABLE_CLASSES   => false,
                         Doctrine::ATTR_USE_DQL_CALLBACKS        => false,
+                        Doctrine::ATTR_AUTO_ACCESSOR_OVERRIDE   => false,
                         ); 
             foreach ($attributes as $attribute => $value) {

branches/1.0/lib/Doctrine/Record.php

@@ -139 +139 @@
 
     /**
+     * Array of custom accessors for cache
+     *
+     * @var array
+     */
+    protected static $_customAccessors = array();
+
+    /**
+     * Array of custom mutators for cache
+     *
+     * @var array
+     */
+    protected static $_customMutators = array();
+
+    /**
      * @var integer $index                  this index is used for creating object identifiers
      */
@@ -893 +907 @@
     public function get($fieldName, $load = true)
     {
+        if ($this->_table->getAttribute(Doctrine::ATTR_AUTO_ACCESSOR_OVERRIDE)) {
+            $componentName = $this->_table->getComponentName();
+            $accessor = isset(self::$_customAccessors[$componentName][$fieldName]) ? self::$_customAccessors[$componentName][$fieldName]:'get' . Doctrine_Inflector::classify($fieldName);
+            if (isset(self::$_customAccessors[$componentName][$fieldName]) || method_exists($this, $accessor)) {
+                self::$_customAccessors[$componentName][$fieldName] = $accessor;
+                return $this->$accessor($load);
+            }
+        }
+        return $this->_get($fieldName, $load);
+    }
+
+    protected function _get($fieldName, $load = true)
+    {
         $value = self::$_null;
 
@@ -960 +987 @@
      */
     public function set($fieldName, $value, $load = true)
+    {
+        if ($this->_table->getAttribute(Doctrine::ATTR_AUTO_ACCESSOR_OVERRIDE)) {
+            $componentName = $this->_table->getComponentName();
+            $mutator = isset(self::$_customMutators[$componentName][$fieldName]) ? self::$_customMutators[$componentName][$fieldName]:'set' . Doctrine_Inflector::classify($fieldName);
+            if (isset(self::$_customMutators[$componentName][$fieldName]) || method_exists($this, $mutator)) {
+                self::$_customMutators[$componentName][$fieldName] = $mutator;
+                return $this->$mutator($value, $load);
+            }
+        }
+        return $this->_set($fieldName, $value, $load);
+    }
+
+    protected function _set($fieldName, $value, $load = true)
     {
         if (isset($this->_data[$fieldName])) {

branches/1.0/tests/run.php

@@ -82 +82 @@
 $tickets->addTestCase(new Doctrine_Ticket_1071_TestCase());
 $tickets->addTestCase(new Doctrine_Ticket_1072_TestCase());
+$tickets->addTestCase(new Doctrine_Ticket_1077_TestCase());
 $tickets->addTestCase(new Doctrine_Ticket_1099_TestCase());
 $tickets->addTestCase(new Doctrine_Ticket_1106_TestCase());