Changeset 2684

Timestamp:

08/20/08 09:34:06 (5 months ago)

Author:

david

Message:

Some refactorings related to [2679], refs #605

Location:

branches/1.0/src/renderer

Files:

• AgaviEzctemplateRenderer.class.php (modified) (1 diff)
• AgaviPhpRenderer.class.php (modified) (2 diffs)
• AgaviPhptalRenderer.class.php (modified) (1 diff)
• AgaviRenderer.class.php (modified) (1 diff)
• AgaviSmartyRenderer.class.php (modified) (1 diff)

branches/1.0/src/renderer/AgaviEzctemplateRenderer.class.php

@@ -159 +159 @@
     }
 
-    foreach($moreAssigns as $key => &$value) {
-      if(isset($this->moreAssignNames[$key])) {
-        $key = $this->moreAssignNames[$key];
-      } elseif(array_key_exists($key, $this->moreAssignNames)) {
-        // the name is null, which means this one should not be assigned
-        continue;
-      }
+    $finalMoreAssigns =& self::buildMoreAssigns($moreAssigns, $this->moreAssignNames);
+    foreach($finalMoreAssigns as $key => &$value) {
       $engine->send->{$key} = $value;
     }

branches/1.0/src/renderer/AgaviPhpRenderer.class.php

@@ -79 +79 @@
     $this->attributes =& $attributes;
     $this->slots =& $slots;
-    $this->moreAssigns = array();
-    foreach($moreAssigns as $moreAssignName => &$moreAssign) {
-      if(isset($this->moreAssignNames[$moreAssignName])) {
-        $moreAssignName = $this->moreAssignNames[$moreAssignName];
-      } elseif(array_key_exists($moreAssignName, $this->moreAssignNames)) {
-        // the name is null, which means this one should not be assigned
-        continue;
-      }
-      $this->moreAssigns[$moreAssignName] =& $moreAssign;
-    }
+    $this->moreAssigns =& self::buildMoreAssigns($moreAssigns, $this->moreAssignNames);
     unset($layer, $attributes, $slots, $moreAssigns);
     
@@ -104 +95 @@
     unset($name, $getter);
     
-    extract($this->moreAssigns, EXTR_REFS);
+    extract($this->moreAssigns, EXTR_REFS | EXTR_PREFIX_INVALID, '_');
     
     ob_start();

branches/1.0/src/renderer/AgaviPhptalRenderer.class.php

@@ -127 +127 @@
     }
     
-    foreach($moreAssigns as $key => $value) {
-      if(isset($this->moreAssignNames[$key])) {
-        $key = $this->moreAssignNames[$key];
-      } elseif(array_key_exists($key, $this->moreAssignNames)) {
-        // the name is null, which means this one should not be assigned
-        continue;
-      }
+    $finalMoreAssigns =& self::buildMoreAssigns($moreAssigns, $this->moreAssignNames);
+    foreach($finalMoreAssigns as $key => &$value) {
       $engine->set($key, $value);
     }

branches/1.0/src/renderer/AgaviRenderer.class.php

@@ -163 +163 @@
   
   /**
+   * Build an array of "more" assigns.
+   *
+   * @param      array The values to be assigned.
+   * @param      array Assigns name map.
+   *
+   * @return     array The data.
+   *
+   * @author     David Zülke <david.zuelke@bitextender.com>
+   * @since      1.0.0
+   */
+  protected static function &buildMoreAssigns(&$moreAssigns, $moreAssignNames)
+  {
+    $retval = array();
+    
+    foreach($moreAssigns as $name => &$value) {
+      if(isset($moreAssignNames[$name])) {
+        $name = $moreAssignNames[$name];
+      } elseif(array_key_exists($name, $moreAssignNames)) {
+        // the name is null, which means this one should not be assigned
+        continue;
+      }
+      $retval[$name] =& $value;
+    }
+    
+    return $retval;
+  }
+  
+  /**
    * Render the presentation and return the result.
    *

branches/1.0/src/renderer/AgaviSmartyRenderer.class.php

@@ -155 +155 @@
     }
     
-    foreach($moreAssigns as $key => &$value) {
-      if(isset($this->moreAssignNames[$key])) {
-        $key = $this->moreAssignNames[$key];
-      } elseif(array_key_exists($key, $this->moreAssignNames)) {
-        // the name is null, which means this one should not be assigned
-        continue;
-      }
+    $finalMoreAssigns =& self::buildMoreAssigns($moreAssigns, $this->moreAssignNames);
+    foreach($finalMoreAssigns as $key => &$value) {
       $engine->assign_by_ref($key, $value);
     }