Issue #77: Do not pass template object to the helper

timble · May 3, 2016 · efda0e3 · efda0e3
1 parent 4972e70
commit efda0e3
Show file tree

Hide file tree

Showing 3 changed files with 14 additions and 15 deletions.
diff --git a/code/template/behavior/helperable.php b/code/template/behavior/helperable.php
@@ -80,6 +80,6 @@ public function invokeHelper($identifier, $params = array())
  $params = array_merge($this->getParameters()->toArray(), $params);
  }
 
- return $helper->$function($params, $this->getMixer());
+ return $helper->$function($params);
  }
 }
diff --git a/code/template/helper/actionbar.php b/code/template/helper/actionbar.php
@@ -23,7 +23,7 @@ class TemplateHelperActionbar extends TemplateHelperAbstract
  * @param array $config An optional array with configuration options
  * @return string Html
  */
- public function render($config = array(), TemplateInterface $template)
+ public function render($config = array())
  {
  $config = new ObjectConfigJson($config);
  $config->append(array(
@@ -44,9 +44,9 @@ public function render($config = array(), TemplateInterface $template)
  $name = $command->getName();
 
  if(method_exists($this, $name)) {
- $html .= $this->$name(ObjectConfig::unbox($command), $template);
+ $html .= $this->$name(ObjectConfig::unbox($command));
  } else {
- $html .= $this->command(ObjectConfig::unbox($command), $template);
+ $html .= $this->command(ObjectConfig::unbox($command));
  }
  }
  $html .= '</div>';
@@ -62,7 +62,7 @@ public function render($config = array(), TemplateInterface $template)
  * @param array $config An optional array with configuration options
  * @return string Html
  */
- public function command($config = array(), TemplateInterface $template)
+ public function command($config = array())
  {
  $config = new ObjectConfigJson($config);
  $config->append(array(
@@ -100,7 +100,7 @@ public function command($config = array(), TemplateInterface $template)
 
  //Create the href
  if(!empty($config->href)) {
- $config->attribs['href'] = $template->route($config->href);
+ $config->attribs['href'] = $config->href;
  }
 
  $html = '<a '.$this->buildAttributes($config->attribs).'>';
@@ -134,10 +134,10 @@ public function separator($config = array())
  * @param array $config An optional array with configuration options
  * @return string Html
  */
- public function dialog($config = array(), TemplateInterface $template)
+ public function dialog($config = array())
  {
  $html = $this->createHelper('behavior')->modal();
- $html .= $this->command($config, $template);
+ $html .= $this->command($config);
 
  return $html;
  }

diff --git a/code/template/helper/listbox.php b/code/template/helper/listbox.php
@@ -32,7 +32,7 @@ class TemplateHelperListbox extends TemplateHelperSelect
  * @return string Html
  * @see __call()
  */
- public function render($config = array(), TemplateInterface $template)
+ public function render($config = array())
  {
  $config = new ObjectConfig($config);
  $config->append(array(
@@ -62,9 +62,9 @@ public function render($config = array(), TemplateInterface $template)
  }
 
  if($config->autocomplete) {
- $result = $this->__autocomplete($config, $template);
+ $result = $this->__autocomplete($config);
  } else {
- $result = $this->__listbox($config, $template);
+ $result = $this->__listbox($config);
  }
 
  return $result;
@@ -251,7 +251,7 @@ public function timezones($config = array())
  * @return string Html
  * @see __call()
  */
- private function __listbox($config = array(), TemplateInterface $template)
+ private function __listbox($config = array())
  {
  $config = new ObjectConfigJson($config);
  $config->append(array(
@@ -316,7 +316,7 @@ private function __listbox($config = array(), TemplateInterface $template)
  * @param array|ObjectConfig $config
  * @return string The html output
  */
- private function __autocomplete($config = array(), TemplateInterface $template)
+ private function __autocomplete($config = array())
  {
  $config = new ObjectConfigJson($config);
  $config->append(array(
@@ -352,11 +352,10 @@ private function __autocomplete($config = array(), TemplateInterface $template)
  $parts = array_merge($parts, ObjectConfig::unbox($config->filter));
  }
 
- $config->url = $template->route($parts, false, false);
+ $config->url = $this->getObject('lib:dispatcher.router.route')->setQuery($parts);
  }
 
  $html = '';
-
  $html .= $this->createHelper('behavior')->autocomplete($config);
 
  $config->attribs->name = $config->name;