dwoo-project / dwoo

lib/Dwoo/Smarty/Processor/Adapter.php

Indentation +17 added lines, -17 removed lines

@@ -23,23 +23,23 @@
  */
 class Adapter extends Processor
 {
-    public $callback;
+	public $callback;
 
-    /**
-     * @param string $input
-     *
-     * @return mixed
-     */
-    public function process($input)
-    {
-        return call_user_func($this->callback, $input);
-    }
+	/**
+	 * @param string $input
+	 *
+	 * @return mixed
+	 */
+	public function process($input)
+	{
+		return call_user_func($this->callback, $input);
+	}
 
-    /**
-     * @param $callback
-     */
-    public function registerCallback($callback)
-    {
-        $this->callback = $callback;
-    }
+	/**
+	 * @param $callback
+	 */
+	public function registerCallback($callback)
+	{
+		$this->callback = $callback;
+	}
 }
\ No newline at end of file

lib/Dwoo/Compilation/Exception.php

Indentation +28 added lines, -28 removed lines

@@ -26,35 +26,35 @@
  */
 class Exception extends DwooException
 {
-    protected $compiler;
-    protected $template;
+	protected $compiler;
+	protected $template;
 
-    /**
-     * Exception constructor.
-     *
-     * @param DwooCompiler $compiler
-     * @param int          $message
-     */
-    public function __construct(DwooCompiler $compiler, $message)
-    {
-        $this->compiler = $compiler;
-        $this->template = $compiler->getDwoo()->getTemplate();
-        parent::__construct('Compilation error at line ' . $compiler->getLine() . ' in "' . $this->template->getResourceName() . ':' . $this->template->getResourceIdentifier() . '" : ' . $message);
-    }
+	/**
+	 * Exception constructor.
+	 *
+	 * @param DwooCompiler $compiler
+	 * @param int          $message
+	 */
+	public function __construct(DwooCompiler $compiler, $message)
+	{
+		$this->compiler = $compiler;
+		$this->template = $compiler->getDwoo()->getTemplate();
+		parent::__construct('Compilation error at line ' . $compiler->getLine() . ' in "' . $this->template->getResourceName() . ':' . $this->template->getResourceIdentifier() . '" : ' . $message);
+	}
 
-    /**
-     * @return DwooCompiler
-     */
-    public function getCompiler()
-    {
-        return $this->compiler;
-    }
+	/**
+	 * @return DwooCompiler
+	 */
+	public function getCompiler()
+	{
+		return $this->compiler;
+	}
 
-    /**
-     * @return \Dwoo\ITemplate|null
-     */
-    public function getTemplate()
-    {
-        return $this->template;
-    }
+	/**
+	 * @return \Dwoo\ITemplate|null
+	 */
+	public function getTemplate()
+	{
+		return $this->template;
+	}
 }

Spacing +1 added lines, -1 removed lines

@@ -39,7 +39,7 @@
     {
         $this->compiler = $compiler;
         $this->template = $compiler->getDwoo()->getTemplate();
-        parent::__construct('Compilation error at line ' . $compiler->getLine() . ' in "' . $this->template->getResourceName() . ':' . $this->template->getResourceIdentifier() . '" : ' . $message);
+        parent::__construct('Compilation error at line '.$compiler->getLine().' in "'.$this->template->getResourceName().':'.$this->template->getResourceIdentifier().'" : '.$message);
     }
 
     /**

lib/Dwoo/IPluginProxy.php

Indentation +45 added lines, -45 removed lines

@@ -23,52 +23,52 @@
  */
 interface IPluginProxy
 {
-    /**
-     * Returns true or false to say whether the given plugin is handled by this proxy or not.
-     *
-     * @param string $name the plugin name
-     *
-     * @return bool true if the plugin is known and usable, otherwise false
-     */
-    public function handles($name);
+	/**
+	 * Returns true or false to say whether the given plugin is handled by this proxy or not.
+	 *
+	 * @param string $name the plugin name
+	 *
+	 * @return bool true if the plugin is known and usable, otherwise false
+	 */
+	public function handles($name);
 
-    /**
-     * Returns the code (as a string) to call the plugin
-     * (this will be executed at runtime inside the Dwoo class).
-     *
-     * @param string $name   the plugin name
-     * @param array  $params a parameter array, array key "*" is the rest array
-     *
-     * @return string
-     */
-    public function getCode($name, $params);
+	/**
+	 * Returns the code (as a string) to call the plugin
+	 * (this will be executed at runtime inside the Dwoo class).
+	 *
+	 * @param string $name   the plugin name
+	 * @param array  $params a parameter array, array key "*" is the rest array
+	 *
+	 * @return string
+	 */
+	public function getCode($name, $params);
 
-    /**
-     * Returns a callback to the plugin, this is used with the reflection API to
-     * find out about the plugin's parameter names etc.
-     * should you need a rest array without the possibility to edit the
-     * plugin's code, you can provide a callback to some
-     * other function with the correct parameter signature, i.e. :
-     * <code>
-     * return array($this, "callbackHelper");
-     * // and callbackHelper would be as such:
-     * public function callbackHelper(array $rest=array()){}
-     * </code>
-     *
-     * @param string $name the plugin name
-     *
-     * @return callback
-     */
-    public function getCallback($name);
+	/**
+	 * Returns a callback to the plugin, this is used with the reflection API to
+	 * find out about the plugin's parameter names etc.
+	 * should you need a rest array without the possibility to edit the
+	 * plugin's code, you can provide a callback to some
+	 * other function with the correct parameter signature, i.e. :
+	 * <code>
+	 * return array($this, "callbackHelper");
+	 * // and callbackHelper would be as such:
+	 * public function callbackHelper(array $rest=array()){}
+	 * </code>
+	 *
+	 * @param string $name the plugin name
+	 *
+	 * @return callback
+	 */
+	public function getCallback($name);
 
-    /**
-     * Returns some code that will check if the plugin is loaded and if not load it
-     * this is optional, if your plugins are autoloaded or whatever, just return an
-     * empty string.
-     *
-     * @param string $name the plugin name
-     *
-     * @return string
-     */
-    public function getLoader($name);
+	/**
+	 * Returns some code that will check if the plugin is loaded and if not load it
+	 * this is optional, if your plugins are autoloaded or whatever, just return an
+	 * empty string.
+	 *
+	 * @param string $name the plugin name
+	 *
+	 * @return string
+	 */
+	public function getLoader($name);
 }

lib/Dwoo/ITemplate.php

Indentation +120 added lines, -120 removed lines

@@ -23,137 +23,137 @@
  */
 interface ITemplate
 {
-    /**
-     * Returns the cache duration for this template.
-     * defaults to null if it was not provided
-     *
-     * @return int|null
-     */
-    public function getCacheTime();
+	/**
+	 * Returns the cache duration for this template.
+	 * defaults to null if it was not provided
+	 *
+	 * @return int|null
+	 */
+	public function getCacheTime();
 
-    /**
-     * Sets the cache duration for this template.
-     * can be used to set it after the object is created if you did not provide
-     * it in the constructor
-     *
-     * @param int $seconds duration of the cache validity for this template, if
-     *                     null it defaults to the Dwoo instance's cache time. 0 = disable and
-     *                     -1 = infinite cache
-     */
-    public function setCacheTime($seconds = null);
+	/**
+	 * Sets the cache duration for this template.
+	 * can be used to set it after the object is created if you did not provide
+	 * it in the constructor
+	 *
+	 * @param int $seconds duration of the cache validity for this template, if
+	 *                     null it defaults to the Dwoo instance's cache time. 0 = disable and
+	 *                     -1 = infinite cache
+	 */
+	public function setCacheTime($seconds = null);
 
-    /**
-     * Returns the cached template output file name, true if it's cache-able but not cached
-     * or false if it's not cached.
-     *
-     * @param Core $dwoo the dwoo instance that requests it
-     *
-     * @return string|bool
-     */
-    public function getCachedTemplate(Core $dwoo);
+	/**
+	 * Returns the cached template output file name, true if it's cache-able but not cached
+	 * or false if it's not cached.
+	 *
+	 * @param Core $dwoo the dwoo instance that requests it
+	 *
+	 * @return string|bool
+	 */
+	public function getCachedTemplate(Core $dwoo);
 
-    /**
-     * Caches the provided output into the cache file.
-     *
-     * @param Core   $dwoo   the dwoo instance that requests it
-     * @param string $output the template output
-     *
-     * @return mixed full path of the cached file or false upon failure
-     */
-    public function cache(Core $dwoo, $output);
+	/**
+	 * Caches the provided output into the cache file.
+	 *
+	 * @param Core   $dwoo   the dwoo instance that requests it
+	 * @param string $output the template output
+	 *
+	 * @return mixed full path of the cached file or false upon failure
+	 */
+	public function cache(Core $dwoo, $output);
 
-    /**
-     * Clears the cached template if it's older than the given time.
-     *
-     * @param Core $dwoo      the dwoo instance that was used to cache that template
-     * @param int  $olderThan minimum time (in seconds) required for the cache to be cleared
-     *
-     * @return bool true if the cache was not present or if it was deleted, false if it remains there
-     */
-    public function clearCache(Core $dwoo, $olderThan = - 1);
+	/**
+	 * Clears the cached template if it's older than the given time.
+	 *
+	 * @param Core $dwoo      the dwoo instance that was used to cache that template
+	 * @param int  $olderThan minimum time (in seconds) required for the cache to be cleared
+	 *
+	 * @return bool true if the cache was not present or if it was deleted, false if it remains there
+	 */
+	public function clearCache(Core $dwoo, $olderThan = - 1);
 
-    /**
-     * Returns the compiled template file name.
-     *
-     * @param Core      $dwoo     the dwoo instance that requests it
-     * @param ICompiler $compiler the compiler that must be used
-     *
-     * @return string
-     */
-    public function getCompiledTemplate(Core $dwoo, ICompiler $compiler = null);
+	/**
+	 * Returns the compiled template file name.
+	 *
+	 * @param Core      $dwoo     the dwoo instance that requests it
+	 * @param ICompiler $compiler the compiler that must be used
+	 *
+	 * @return string
+	 */
+	public function getCompiledTemplate(Core $dwoo, ICompiler $compiler = null);
 
-    /**
-     * Returns the template name.
-     *
-     * @return string
-     */
-    public function getName();
+	/**
+	 * Returns the template name.
+	 *
+	 * @return string
+	 */
+	public function getName();
 
-    /**
-     * Returns the resource name for this template class.
-     *
-     * @return string
-     */
-    public function getResourceName();
+	/**
+	 * Returns the resource name for this template class.
+	 *
+	 * @return string
+	 */
+	public function getResourceName();
 
-    /**
-     * Returns the resource identifier for this template or false if it has no identifier.
-     *
-     * @return string|false
-     */
-    public function getResourceIdentifier();
+	/**
+	 * Returns the resource identifier for this template or false if it has no identifier.
+	 *
+	 * @return string|false
+	 */
+	public function getResourceIdentifier();
 
-    /**
-     * Returns the template source of this template.
-     *
-     * @return string
-     */
-    public function getSource();
+	/**
+	 * Returns the template source of this template.
+	 *
+	 * @return string
+	 */
+	public function getSource();
 
-    /**
-     * Returns an unique string identifying the current version of this template,
-     * for example a timestamp of the last modified date or a hash of the template source.
-     *
-     * @return string
-     */
-    public function getUid();
+	/**
+	 * Returns an unique string identifying the current version of this template,
+	 * for example a timestamp of the last modified date or a hash of the template source.
+	 *
+	 * @return string
+	 */
+	public function getUid();
 
-    /**
-     * Returns the compiler used by this template, if it was just compiled, or null.
-     *
-     * @return ICompiler
-     */
-    public function getCompiler();
+	/**
+	 * Returns the compiler used by this template, if it was just compiled, or null.
+	 *
+	 * @return ICompiler
+	 */
+	public function getCompiler();
 
-    /**
-     * Returns some php code that will check if this template has been modified or not.
-     * if the function returns null, the template will be instanciated and then the Uid checked
-     *
-     * @return string
-     */
-    public function getIsModifiedCode();
+	/**
+	 * Returns some php code that will check if this template has been modified or not.
+	 * if the function returns null, the template will be instanciated and then the Uid checked
+	 *
+	 * @return string
+	 */
+	public function getIsModifiedCode();
 
-    /**
-     * Returns a new template object from the given resource identifier, null if no include is
-     * possible (resource not found), or false if include is not permitted by this resource type.
-     * this method should also check if $dwoo->getSecurityPolicy() is null or not and do the
-     * necessary permission checks if required, if the security policy prevents the template
-     * generation it should throw a new Security\Exception with a relevant message
-     *
-     * @param mixed     $resourceId     the resource identifier
-     * @param int       $cacheTime      duration of the cache validity for this template, if null it defaults to the
-     *                                  Dwoo instance that will render this template if null it defaults to the Dwoo
-     *                                  instance that will render this template
-     * @param string    $cacheId        the unique cache identifier of this page or anything else that makes this
-     *                                  template's content unique, if null it defaults to the current url makes this
-     *                                  template's content unique, if null it defaults to the current url
-     * @param string    $compileId      the unique compiled identifier, which is used to distinguish this template from
-     *                                  others, if null it defaults to the filename+bits of the path template from
-     *                                  others, if null it defaults to the filename+bits of the path
-     * @param ITemplate $parentTemplate the template that is requesting a new template object (through an include,
-     *                                  extends or any other plugin) an include, extends or any other plugin)
-     *
-     * @return ITemplate|null|false
-     */
-    public static function templateFactory(Core $dwoo, $resourceId, $cacheTime = null, $cacheId = null, $compileId = null, ITemplate $parentTemplate = null);
+	/**
+	 * Returns a new template object from the given resource identifier, null if no include is
+	 * possible (resource not found), or false if include is not permitted by this resource type.
+	 * this method should also check if $dwoo->getSecurityPolicy() is null or not and do the
+	 * necessary permission checks if required, if the security policy prevents the template
+	 * generation it should throw a new Security\Exception with a relevant message
+	 *
+	 * @param mixed     $resourceId     the resource identifier
+	 * @param int       $cacheTime      duration of the cache validity for this template, if null it defaults to the
+	 *                                  Dwoo instance that will render this template if null it defaults to the Dwoo
+	 *                                  instance that will render this template
+	 * @param string    $cacheId        the unique cache identifier of this page or anything else that makes this
+	 *                                  template's content unique, if null it defaults to the current url makes this
+	 *                                  template's content unique, if null it defaults to the current url
+	 * @param string    $compileId      the unique compiled identifier, which is used to distinguish this template from
+	 *                                  others, if null it defaults to the filename+bits of the path template from
+	 *                                  others, if null it defaults to the filename+bits of the path
+	 * @param ITemplate $parentTemplate the template that is requesting a new template object (through an include,
+	 *                                  extends or any other plugin) an include, extends or any other plugin)
+	 *
+	 * @return ITemplate|null|false
+	 */
+	public static function templateFactory(Core $dwoo, $resourceId, $cacheTime = null, $cacheId = null, $compileId = null, ITemplate $parentTemplate = null);
 }

lib/Dwoo/Filter.php

Indentation +24 added lines, -24 removed lines

@@ -23,30 +23,30 @@
  */
 abstract class Filter
 {
-    /**
-     * The dwoo instance that runs this filter.
-     *
-     * @var Core
-     */
-    protected $dwoo;
+	/**
+	 * The dwoo instance that runs this filter.
+	 *
+	 * @var Core
+	 */
+	protected $dwoo;
 
-    /**
-     * Constructor, if you override it, call parent::__construct($dwoo); or assign
-     * the dwoo instance yourself if you need it.
-     *
-     * @param Core $dwoo the dwoo instance that runs this plugin
-     */
-    public function __construct(Core $dwoo)
-    {
-        $this->dwoo = $dwoo;
-    }
+	/**
+	 * Constructor, if you override it, call parent::__construct($dwoo); or assign
+	 * the dwoo instance yourself if you need it.
+	 *
+	 * @param Core $dwoo the dwoo instance that runs this plugin
+	 */
+	public function __construct(Core $dwoo)
+	{
+		$this->dwoo = $dwoo;
+	}
 
-    /**
-     * Processes the input and returns it filtered.
-     *
-     * @param string $input the template to process
-     *
-     * @return string
-     */
-    abstract public function process($input);
+	/**
+	 * Processes the input and returns it filtered.
+	 *
+	 * @param string $input the template to process
+	 *
+	 * @return string
+	 */
+	abstract public function process($input);
 }

lib/Dwoo/ILoader.php

Indentation +11 added lines, -11 removed lines

@@ -23,15 +23,15 @@
  */
 interface ILoader
 {
-    /**
-     * Loads a plugin file.
-     * the second parameter is used to avoid permanent rehashing when using php functions,
-     * however this means that if you have add a plugin that overrides a php function you have
-     * to delete the classpath.cache file(s) by hand to force a rehash of the plugins
-     *
-     * @param string $class       the plugin name, without the `Plugin` prefix
-     * @param bool   $forceRehash if true, the class path caches will be rebuilt if the plugin is not found, in case it
-     *                            has just been added, defaults to true
-     */
-    public function loadPlugin($class, $forceRehash = true);
+	/**
+	 * Loads a plugin file.
+	 * the second parameter is used to avoid permanent rehashing when using php functions,
+	 * however this means that if you have add a plugin that overrides a php function you have
+	 * to delete the classpath.cache file(s) by hand to force a rehash of the plugins
+	 *
+	 * @param string $class       the plugin name, without the `Plugin` prefix
+	 * @param bool   $forceRehash if true, the class path caches will be rebuilt if the plugin is not found, in case it
+	 *                            has just been added, defaults to true
+	 */
+	public function loadPlugin($class, $forceRehash = true);
 }

lib/Dwoo/ICompilable.php

Indentation +2 added lines, -2 removed lines

@@ -26,6 +26,6 @@
  */
 interface ICompilable
 {
-    // this replaces the process function
-    //public static function compile(Compiler $compiler, $arg, $arg, ...);
+	// this replaces the process function
+	//public static function compile(Compiler $compiler, $arg, $arg, ...);
 }

lib/Dwoo/Adapters/CakePHP/dwoo.php

Indentation +113 added lines, -113 removed lines

@@ -42,118 +42,118 @@
  */
 class DwooView extends View
 {
-    protected $_sv_template_dir;
-    protected $_sv_layout_dir;
-    protected $_sv_compile_dir;
-    protected $_sv_cache_dir;
-    protected $_sv_compile_id;
-
-    protected $_dwoo;
-
-    public $sv_processedTpl;
+	protected $_sv_template_dir;
+	protected $_sv_layout_dir;
+	protected $_sv_compile_dir;
+	protected $_sv_cache_dir;
+	protected $_sv_compile_id;
+
+	protected $_dwoo;
+
+	public $sv_processedTpl;
 
-    public function __construct(&$controller)
-    {
-        parent::__construct($controller);
-
-        $this->ext = '.tpl';
-
-        $this->_sv_template_dir = array(
-            VIEWS.$this->viewPath.DS.$this->subDir,
-            VIEWS.$this->viewPath,
-            VIEWS,
-        );
-
-        $this->_sv_layout_dir = array(
-            LAYOUTS.$this->subDir,
-            VIEWS,
-        );
-
-        $this->_sv_compile_dir = TMP.'dwoo'.DS.'compile';
-        $this->_sv_cache_dir = TMP.'dwoo'.DS.'cache';
-
-        $this->_dwoo = new Dwoo_Core($this->_sv_compile_dir, $this->_sv_cache_dir);
-
-        $this->_sv_compile_id = $controller->name;
-
-        $this->_dwoo->sv_this = $this;
-        $this->_dwoo->setSecurityPolicy();
-
-        return;
-    }
-
-    /**
-     * changes the template directory.
-     */
-    public function setTemplateDir($path = VIEW)
-    {
-        $old = $this->_sv_template_dir;
-        $this->_sv_template_dir = $path;
-
-        return $old;
-    }
-
-    public function getTemplateDir()
-    {
-        return $this->_sv_template_dir;
-    }
-
-    public function _render($___viewFn, $___data_for_view, $___play_safe = true, $loadHelpers = true)
-    {
-        // let's determine if this is a layout call or a template call
-        // and change the template dir accordingly
-        $layout = false;
-        if (isset($___data_for_view['content_for_layout'])) {
-            $this->_sv_template_dir = $this->_sv_layout_dir;
-            $layout = true;
-        }
-
-        $tpl = new Dwoo_Template_File($___viewFn);
-        $data = $___data_for_view;
-
-        $data['view'] = $this;
-
-        if ($this->helpers != false && $loadHelpers === true) {
-            $loadedHelpers = array();
-            $loadedHelpers = $this->_loadHelpers($loadedHelpers, $this->helpers);
-
-            foreach (array_keys($loadedHelpers) as $helper) {
-                $camelBackedHelper = strtolower(substr($helper, 0, 1)).substr($helper, 1);
-
-                ${$camelBackedHelper} = $loadedHelpers[$helper];
-
-                if (is_array(${$camelBackedHelper}->helpers) && !empty(${$camelBackedHelper}->helpers)) {
-                    $subHelpers = ${$camelBackedHelper}->helpers;
-                    foreach ($subHelpers as $subHelper) {
-                        ${$camelBackedHelper}->{$subHelper} = $loadedHelpers[$subHelper];
-                    }
-                }
-
-                if (isset($this->passedArgs)) {
-                    ${$camelBackedHelper}->passedArgs = $this->passedArgs;
-                }
-
-                $this->loaded[$camelBackedHelper] = ${$camelBackedHelper};
-
-                $data[$camelBackedHelper] = ${$camelBackedHelper};
-            }
-        }
-
-        if ($this->helpers != false && $loadHelpers === true) {
-            foreach ($loadedHelpers as $helper) {
-                if (is_object($helper)) {
-                    if (is_subclass_of($helper, 'Helper') || is_subclass_of($helper, 'helper')) {
-                        $helper->beforeRender();
-                    }
-                }
-            }
-        }
-
-        return $this->_dwoo->get($tpl, $data);
-    }
-
-    public function get()
-    {
-        return $this->_dwoo;
-    }
+	public function __construct(&$controller)
+	{
+		parent::__construct($controller);
+
+		$this->ext = '.tpl';
+
+		$this->_sv_template_dir = array(
+			VIEWS.$this->viewPath.DS.$this->subDir,
+			VIEWS.$this->viewPath,
+			VIEWS,
+		);
+
+		$this->_sv_layout_dir = array(
+			LAYOUTS.$this->subDir,
+			VIEWS,
+		);
+
+		$this->_sv_compile_dir = TMP.'dwoo'.DS.'compile';
+		$this->_sv_cache_dir = TMP.'dwoo'.DS.'cache';
+
+		$this->_dwoo = new Dwoo_Core($this->_sv_compile_dir, $this->_sv_cache_dir);
+
+		$this->_sv_compile_id = $controller->name;
+
+		$this->_dwoo->sv_this = $this;
+		$this->_dwoo->setSecurityPolicy();
+
+		return;
+	}
+
+	/**
+	 * changes the template directory.
+	 */
+	public function setTemplateDir($path = VIEW)
+	{
+		$old = $this->_sv_template_dir;
+		$this->_sv_template_dir = $path;
+
+		return $old;
+	}
+
+	public function getTemplateDir()
+	{
+		return $this->_sv_template_dir;
+	}
+
+	public function _render($___viewFn, $___data_for_view, $___play_safe = true, $loadHelpers = true)
+	{
+		// let's determine if this is a layout call or a template call
+		// and change the template dir accordingly
+		$layout = false;
+		if (isset($___data_for_view['content_for_layout'])) {
+			$this->_sv_template_dir = $this->_sv_layout_dir;
+			$layout = true;
+		}
+
+		$tpl = new Dwoo_Template_File($___viewFn);
+		$data = $___data_for_view;
+
+		$data['view'] = $this;
+
+		if ($this->helpers != false && $loadHelpers === true) {
+			$loadedHelpers = array();
+			$loadedHelpers = $this->_loadHelpers($loadedHelpers, $this->helpers);
+
+			foreach (array_keys($loadedHelpers) as $helper) {
+				$camelBackedHelper = strtolower(substr($helper, 0, 1)).substr($helper, 1);
+
+				${$camelBackedHelper} = $loadedHelpers[$helper];
+
+				if (is_array(${$camelBackedHelper}->helpers) && !empty(${$camelBackedHelper}->helpers)) {
+					$subHelpers = ${$camelBackedHelper}->helpers;
+					foreach ($subHelpers as $subHelper) {
+						${$camelBackedHelper}->{$subHelper} = $loadedHelpers[$subHelper];
+					}
+				}
+
+				if (isset($this->passedArgs)) {
+					${$camelBackedHelper}->passedArgs = $this->passedArgs;
+				}
+
+				$this->loaded[$camelBackedHelper] = ${$camelBackedHelper};
+
+				$data[$camelBackedHelper] = ${$camelBackedHelper};
+			}
+		}
+
+		if ($this->helpers != false && $loadHelpers === true) {
+			foreach ($loadedHelpers as $helper) {
+				if (is_object($helper)) {
+					if (is_subclass_of($helper, 'Helper') || is_subclass_of($helper, 'helper')) {
+						$helper->beforeRender();
+					}
+				}
+			}
+		}
+
+		return $this->_dwoo->get($tpl, $data);
+	}
+
+	public function get()
+	{
+		return $this->_dwoo;
+	}
 }

lib/Dwoo/Adapters/Agavi/DwooRenderer.php

Indentation +153 added lines, -153 removed lines

@@ -16,157 +16,157 @@
  */
 class DwooRenderer extends AgaviRenderer implements AgaviIReusableRenderer
 {
-    /**
-     * @constant   string The directory inside the cache dir where templates will
-     *                    be stored in compiled form.
-     */
-    const COMPILE_DIR = 'templates';
-
-    /**
-     * @constant   string The subdirectory inside the compile dir where templates
-     *                    will be stored in compiled form.
-     */
-    const COMPILE_SUBDIR = 'dwoo';
-
-    /**
-     * @constant   string The directory inside the cache dir where cached content
-     *                    will be stored.
-     */
-    const CACHE_DIR = 'dwoo';
-
-    /**
-     * @var Dwoo Dwoo template engine
-     */
-    protected $dwoo = null;
-
-    /**
-     * @var string A string with the default template file extension,
-     *             including the dot
-     */
-    protected $defaultExtension = '.html';
-
-    /**
-     * stores the (optional) plugin directories to add to the Dwoo_Loader.
-     */
-    protected $plugin_dir = null;
-
-    /**
-     * Pre-serialization callback.
-     *
-     * Excludes the Dwoo instance to prevent excessive serialization load.
-     */
-    public function __sleep()
-    {
-        $keys = parent::__sleep();
-        unset($keys[array_search('dwoo', $keys)]);
-
-        return $keys;
-    }
-
-    /**
-     * Initialize this Renderer.
-     *
-     * @param AgaviContext The current application context
-     * @param array        An associative array of initialization parameters
-     */
-    public function initialize(AgaviContext $context, array $parameters = array())
-    {
-        parent::initialize($context, $parameters);
-
-        $this->plugin_dir = $this->getParameter('plugin_dir', $this->plugin_dir);
-    }
-
-    /**
-     * provides a custom compiler to the dwoo renderer with optional settings
-     * you can set in the agavi output_types.xml config file.
-     *
-     * @return Dwoo_Compiler
-     */
-    public function compilerFactory()
-    {
-        $compiler = Dwoo_Compiler::compilerFactory();
-        $compiler->setAutoEscape((bool) $this->getParameter('auto_escape', false));
-
-        return $compiler;
-    }
-
-    /**
-     * Grab a cleaned up dwoo instance.
-     *
-     * @return Dwoo A Dwoo instance
-     */
-    protected function getEngine()
-    {
-        if ($this->dwoo) {
-            return $this->dwoo;
-        }
-
-        // this triggers Agavi autoload
-        if (!class_exists('Dwoo')) {
-            if (file_exists(dirname(__FILE__).'/../../../dwooAutoload.php')) {
-                // file was dropped with the entire dwoo package
-                include dirname(__FILE__).'/../../../dwooAutoload.php';
-            } else {
-                // assume the dwoo package is in the include path
-                include 'dwooAutoload.php';
-            }
-        }
-
-        $parentMode = fileperms(AgaviConfig::get('core.cache_dir'));
-
-        $compileDir = AgaviConfig::get('core.cache_dir').DIRECTORY_SEPARATOR.self::COMPILE_DIR.DIRECTORY_SEPARATOR.self::COMPILE_SUBDIR;
-        AgaviToolkit::mkdir($compileDir, $parentMode, true);
-
-        $cacheDir = AgaviConfig::get('core.cache_dir').DIRECTORY_SEPARATOR.self::CACHE_DIR;
-        AgaviToolkit::mkdir($cacheDir, $parentMode, true);
-
-        $this->dwoo = new Dwoo_Core($compileDir, $cacheDir);
-
-        if (!empty($this->plugin_dir)) {
-            foreach ((array) $this->plugin_dir as $dir) {
-                $this->dwoo->getLoader()->addDirectory($dir);
-            }
-        }
-
-        $this->dwoo->setDefaultCompilerFactory('file', array($this, 'compilerFactory'));
-
-        return $this->dwoo;
-    }
-
-    /**
-     * Render the presentation and return the result.
-     *
-     * @param AgaviTemplateLayer The template layer to render
-     * @param array              The template variables
-     * @param array              The slots
-     * @param array              Associative array of additional assigns
-     *
-     * @return string A rendered result
-     */
-    public function render(AgaviTemplateLayer $layer, array &$attributes = array(), array &$slots = array(), array &$moreAssigns = array())
-    {
-        $engine = $this->getEngine();
-
-        $data = array();
-        if ($this->extractVars) {
-            $data = $attributes;
-        } else {
-            $data[$this->varName] = &$attributes;
-        }
-
-        $data[$this->slotsVarName] = &$slots;
-
-        foreach ($this->assigns as $key => $getter) {
-            $data[$key] = $this->getContext()->$getter();
-        }
-
-        foreach ($moreAssigns as $key => &$value) {
-            if (isset($this->moreAssignNames[$key])) {
-                $key = $this->moreAssignNames[$key];
-            }
-            $data[$key] = &$value;
-        }
-
-        return $engine->get($layer->getResourceStreamIdentifier(), $data);
-    }
+	/**
+	 * @constant   string The directory inside the cache dir where templates will
+	 *                    be stored in compiled form.
+	 */
+	const COMPILE_DIR = 'templates';
+
+	/**
+	 * @constant   string The subdirectory inside the compile dir where templates
+	 *                    will be stored in compiled form.
+	 */
+	const COMPILE_SUBDIR = 'dwoo';
+
+	/**
+	 * @constant   string The directory inside the cache dir where cached content
+	 *                    will be stored.
+	 */
+	const CACHE_DIR = 'dwoo';
+
+	/**
+	 * @var Dwoo Dwoo template engine
+	 */
+	protected $dwoo = null;
+
+	/**
+	 * @var string A string with the default template file extension,
+	 *             including the dot
+	 */
+	protected $defaultExtension = '.html';
+
+	/**
+	 * stores the (optional) plugin directories to add to the Dwoo_Loader.
+	 */
+	protected $plugin_dir = null;
+
+	/**
+	 * Pre-serialization callback.
+	 *
+	 * Excludes the Dwoo instance to prevent excessive serialization load.
+	 */
+	public function __sleep()
+	{
+		$keys = parent::__sleep();
+		unset($keys[array_search('dwoo', $keys)]);
+
+		return $keys;
+	}
+
+	/**
+	 * Initialize this Renderer.
+	 *
+	 * @param AgaviContext The current application context
+	 * @param array        An associative array of initialization parameters
+	 */
+	public function initialize(AgaviContext $context, array $parameters = array())
+	{
+		parent::initialize($context, $parameters);
+
+		$this->plugin_dir = $this->getParameter('plugin_dir', $this->plugin_dir);
+	}
+
+	/**
+	 * provides a custom compiler to the dwoo renderer with optional settings
+	 * you can set in the agavi output_types.xml config file.
+	 *
+	 * @return Dwoo_Compiler
+	 */
+	public function compilerFactory()
+	{
+		$compiler = Dwoo_Compiler::compilerFactory();
+		$compiler->setAutoEscape((bool) $this->getParameter('auto_escape', false));
+
+		return $compiler;
+	}
+
+	/**
+	 * Grab a cleaned up dwoo instance.
+	 *
+	 * @return Dwoo A Dwoo instance
+	 */
+	protected function getEngine()
+	{
+		if ($this->dwoo) {
+			return $this->dwoo;
+		}
+
+		// this triggers Agavi autoload
+		if (!class_exists('Dwoo')) {
+			if (file_exists(dirname(__FILE__).'/../../../dwooAutoload.php')) {
+				// file was dropped with the entire dwoo package
+				include dirname(__FILE__).'/../../../dwooAutoload.php';
+			} else {
+				// assume the dwoo package is in the include path
+				include 'dwooAutoload.php';
+			}
+		}
+
+		$parentMode = fileperms(AgaviConfig::get('core.cache_dir'));
+
+		$compileDir = AgaviConfig::get('core.cache_dir').DIRECTORY_SEPARATOR.self::COMPILE_DIR.DIRECTORY_SEPARATOR.self::COMPILE_SUBDIR;
+		AgaviToolkit::mkdir($compileDir, $parentMode, true);
+
+		$cacheDir = AgaviConfig::get('core.cache_dir').DIRECTORY_SEPARATOR.self::CACHE_DIR;
+		AgaviToolkit::mkdir($cacheDir, $parentMode, true);
+
+		$this->dwoo = new Dwoo_Core($compileDir, $cacheDir);
+
+		if (!empty($this->plugin_dir)) {
+			foreach ((array) $this->plugin_dir as $dir) {
+				$this->dwoo->getLoader()->addDirectory($dir);
+			}
+		}
+
+		$this->dwoo->setDefaultCompilerFactory('file', array($this, 'compilerFactory'));
+
+		return $this->dwoo;
+	}
+
+	/**
+	 * Render the presentation and return the result.
+	 *
+	 * @param AgaviTemplateLayer The template layer to render
+	 * @param array              The template variables
+	 * @param array              The slots
+	 * @param array              Associative array of additional assigns
+	 *
+	 * @return string A rendered result
+	 */
+	public function render(AgaviTemplateLayer $layer, array &$attributes = array(), array &$slots = array(), array &$moreAssigns = array())
+	{
+		$engine = $this->getEngine();
+
+		$data = array();
+		if ($this->extractVars) {
+			$data = $attributes;
+		} else {
+			$data[$this->varName] = &$attributes;
+		}
+
+		$data[$this->slotsVarName] = &$slots;
+
+		foreach ($this->assigns as $key => $getter) {
+			$data[$key] = $this->getContext()->$getter();
+		}
+
+		foreach ($moreAssigns as $key => &$value) {
+			if (isset($this->moreAssignNames[$key])) {
+				$key = $this->moreAssignNames[$key];
+			}
+			$data[$key] = &$value;
+		}
+
+		return $engine->get($layer->getResourceStreamIdentifier(), $data);
+	}
 }