dwoo-project / dwoo

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/dwoo_plugins/t.php

Indentation +1 added lines, -1 removed lines

@@ -16,5 +16,5 @@
  */
 function Dwoo_Plugin_t_compile(Dwoo_Compiler $compiler, $string)
 {
-    return '$this->data[\'tm\']->_('.$string.')';
+	return '$this->data[\'tm\']->_('.$string.')';
 }

lib/Dwoo/Adapters/Agavi/dwoo_plugins/url.php

Indentation +19 added lines, -19 removed lines

@@ -16,24 +16,24 @@
  */
 function Dwoo_Plugin_url_compile(Dwoo_Compiler $compiler, $route = null, $params = null, $options = null, array $rest = array())
 {
-    if ($params == 'null') {
-        if (count($rest)) {
-            $params = array();
-            foreach ($rest as $k => $v) {
-                if (is_numeric($k)) {
-                    $params[] = $k.'=>'.$v;
-                } else {
-                    $params[] = '"'.$k.'"=>'.$v;
-                }
-            }
-            $params = 'array('.implode(', ', $params).')';
-        } else {
-            $params = 'array()';
-        }
-    }
-    if ($options == 'null') {
-        $options = 'array()';
-    }
+	if ($params == 'null') {
+		if (count($rest)) {
+			$params = array();
+			foreach ($rest as $k => $v) {
+				if (is_numeric($k)) {
+					$params[] = $k.'=>'.$v;
+				} else {
+					$params[] = '"'.$k.'"=>'.$v;
+				}
+			}
+			$params = 'array('.implode(', ', $params).')';
+		} else {
+			$params = 'array()';
+		}
+	}
+	if ($options == 'null') {
+		$options = 'array()';
+	}
 
-    return '$this->data[\'ro\']->gen('.$route.', '.$params.', '.$options.')';
+	return '$this->data[\'ro\']->gen('.$route.', '.$params.', '.$options.')';
 }

lib/Dwoo/Adapters/CodeIgniter/controllers/dwoowelcome.php

Indentation +10 added lines, -10 removed lines

@@ -16,15 +16,15 @@
 
 class dwoowelcome extends Controller
 {
-    public function __construct()
-    {
-        parent::Controller();
-    }
+	public function __construct()
+	{
+		parent::Controller();
+	}
 
-    public function index()
-    {
-        $this->load->library('Dwootemplate');
-        $this->dwootemplate->assign('itshowlate', date('H:i:s'));
-        $this->dwootemplate->display('dwoowelcome.tpl');
-    }
+	public function index()
+	{
+		$this->load->library('Dwootemplate');
+		$this->dwootemplate->assign('itshowlate', date('H:i:s'));
+		$this->dwootemplate->display('dwoowelcome.tpl');
+	}
 }

lib/Dwoo/IDataProvider.php

Indentation +6 added lines, -6 removed lines

@@ -19,10 +19,10 @@
  */
 interface Dwoo_IDataProvider
 {
-    /**
-     * returns the data as an associative array that will be used in the template.
-     *
-     * @return array
-     */
-    public function getData();
+	/**
+	 * returns the data as an associative array that will be used in the template.
+	 *
+	 * @return array
+	 */
+	public function getData();
 }

lib/Dwoo/Filter.php

Indentation +24 added lines, -24 removed lines

@@ -18,30 +18,30 @@
  */
 abstract class Dwoo_Filter
 {
-    /**
-     * The dwoo instance that runs this filter.
-     *
-     * @var Dwoo
-     */
-    protected $dwoo;
+	/**
+	 * The dwoo instance that runs this filter.
+	 *
+	 * @var Dwoo
+	 */
+	protected $dwoo;
 
-    /**
-     * Constructor, if you override it, call parent::__construct($dwoo); or assign
-     * the dwoo instance yourself if you need it.
-     *
-     * @param Dwoo_Core $dwoo the dwoo instance that runs this plugin
-     */
-    public function __construct(Dwoo_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 Dwoo_Core $dwoo the dwoo instance that runs this plugin
+	 */
+	public function __construct(Dwoo_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/Loader.php

Indentation +129 added lines, -129 removed lines

@@ -19,143 +19,143 @@
  */
 class Dwoo_Loader implements Dwoo_ILoader
 {
-    /**
-     * stores the plugin directories.
-     *
-     * @see addDirectory
-     *
-     * @var array
-     */
-    protected $paths = array();
+	/**
+	 * stores the plugin directories.
+	 *
+	 * @see addDirectory
+	 *
+	 * @var array
+	 */
+	protected $paths = array();
 
-    /**
-     * stores the plugins names/paths relationships
-     * don't edit this on your own, use addDirectory.
-     *
-     * @see addDirectory
-     *
-     * @var array
-     */
-    protected $classPath = array();
+	/**
+	 * stores the plugins names/paths relationships
+	 * don't edit this on your own, use addDirectory.
+	 *
+	 * @see addDirectory
+	 *
+	 * @var array
+	 */
+	protected $classPath = array();
 
-    /**
-     * path where class paths cache files are written.
-     *
-     * @var string
-     */
-    protected $cacheDir;
+	/**
+	 * path where class paths cache files are written.
+	 *
+	 * @var string
+	 */
+	protected $cacheDir;
 
-    protected $corePluginDir;
+	protected $corePluginDir;
 
-    public function __construct($cacheDir)
-    {
-        $this->corePluginDir = DWOO_DIRECTORY.'plugins';
-        $this->cacheDir = rtrim($cacheDir, DIRECTORY_SEPARATOR).DIRECTORY_SEPARATOR;
+	public function __construct($cacheDir)
+	{
+		$this->corePluginDir = DWOO_DIRECTORY.'plugins';
+		$this->cacheDir = rtrim($cacheDir, DIRECTORY_SEPARATOR).DIRECTORY_SEPARATOR;
 
-        // include class paths or rebuild paths if the cache file isn't there
-        $cacheFile = $this->cacheDir.'classpath.cache.d'.Dwoo_Core::RELEASE_TAG.'.php';
-        if (file_exists($cacheFile)) {
-            $classpath = file_get_contents($cacheFile);
-            $this->classPath = unserialize($classpath) + $this->classPath;
-        } else {
-            $this->rebuildClassPathCache($this->corePluginDir, $cacheFile);
-        }
-    }
+		// include class paths or rebuild paths if the cache file isn't there
+		$cacheFile = $this->cacheDir.'classpath.cache.d'.Dwoo_Core::RELEASE_TAG.'.php';
+		if (file_exists($cacheFile)) {
+			$classpath = file_get_contents($cacheFile);
+			$this->classPath = unserialize($classpath) + $this->classPath;
+		} else {
+			$this->rebuildClassPathCache($this->corePluginDir, $cacheFile);
+		}
+	}
 
-    /**
-     * rebuilds class paths, scans the given directory recursively and saves all paths in the given file.
-     *
-     * @param string $path      the plugin path to scan
-     * @param string $cacheFile the file where to store the plugin paths cache, it will be overwritten
-     *
-     * @throws Dwoo_Exception
-     */
-    protected function rebuildClassPathCache($path, $cacheFile)
-    {
-        if ($cacheFile !== false) {
-            $tmp = $this->classPath;
-            $this->classPath = array();
-        }
+	/**
+	 * rebuilds class paths, scans the given directory recursively and saves all paths in the given file.
+	 *
+	 * @param string $path      the plugin path to scan
+	 * @param string $cacheFile the file where to store the plugin paths cache, it will be overwritten
+	 *
+	 * @throws Dwoo_Exception
+	 */
+	protected function rebuildClassPathCache($path, $cacheFile)
+	{
+		if ($cacheFile !== false) {
+			$tmp = $this->classPath;
+			$this->classPath = array();
+		}
 
-        // iterates over all files/folders
-        $list = glob(rtrim($path, DIRECTORY_SEPARATOR).DIRECTORY_SEPARATOR.'*');
-        if (is_array($list)) {
-            foreach ($list as $f) {
-                if (is_dir($f)) {
-                    $this->rebuildClassPathCache($f, false);
-                } else {
-                    $this->classPath[str_replace(array('function.', 'block.', 'modifier.', 'outputfilter.', 'filter.', 'prefilter.', 'postfilter.', 'pre.', 'post.', 'output.', 'shared.', 'helper.'), '', basename($f, '.php'))] = $f;
-                }
-            }
-        }
+		// iterates over all files/folders
+		$list = glob(rtrim($path, DIRECTORY_SEPARATOR).DIRECTORY_SEPARATOR.'*');
+		if (is_array($list)) {
+			foreach ($list as $f) {
+				if (is_dir($f)) {
+					$this->rebuildClassPathCache($f, false);
+				} else {
+					$this->classPath[str_replace(array('function.', 'block.', 'modifier.', 'outputfilter.', 'filter.', 'prefilter.', 'postfilter.', 'pre.', 'post.', 'output.', 'shared.', 'helper.'), '', basename($f, '.php'))] = $f;
+				}
+			}
+		}
 
-        // save in file if it's the first call (not recursed)
-        if ($cacheFile !== false) {
-            if (!file_put_contents($cacheFile, serialize($this->classPath))) {
-                throw new Dwoo_Exception('Could not write into '.$cacheFile.', either because the folder is not there (create it) or because of the chmod configuration (please ensure this directory is writable by php), alternatively you can change the directory used with $dwoo->setCompileDir() or provide a custom loader object with $dwoo->setLoader()');
-            }
-            $this->classPath += $tmp;
-        }
-    }
+		// save in file if it's the first call (not recursed)
+		if ($cacheFile !== false) {
+			if (!file_put_contents($cacheFile, serialize($this->classPath))) {
+				throw new Dwoo_Exception('Could not write into '.$cacheFile.', either because the folder is not there (create it) or because of the chmod configuration (please ensure this directory is writable by php), alternatively you can change the directory used with $dwoo->setCompileDir() or provide a custom loader object with $dwoo->setLoader()');
+			}
+			$this->classPath += $tmp;
+		}
+	}
 
-    /**
-     * loads a plugin file.
-     *
-     * @param string $class       the plugin name, without the Dwoo_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
-     *
-     * @throws Dwoo_Exception
-     */
-    public function loadPlugin($class, $forceRehash = true)
-    {
-        // An unknown class was requested (maybe newly added) or the
-        // include failed so we rebuild the cache. include() will fail
-        // with an uncatchable error if the file doesn't exist, which
-        // usually means that the cache is stale and must be rebuilt,
-        // so we check for that before trying to include() the plugin.
-        if (!isset($this->classPath[$class]) ||
-            !is_readable($this->classPath[$class]) ||
-            !(include $this->classPath[$class])) {
-            if ($forceRehash) {
-                $this->rebuildClassPathCache($this->corePluginDir, $this->cacheDir.'classpath.cache.d'.Dwoo_Core::RELEASE_TAG.'.php');
-                foreach ($this->paths as $path => $file) {
-                    $this->rebuildClassPathCache($path, $file);
-                }
-                if (isset($this->classPath[$class])) {
-                    include $this->classPath[$class];
-                }
-                throw new Dwoo_Exception('Plugin <em>'.$class.'</em> can not be found, maybe you forgot to bind it if it\'s a custom plugin ?', E_USER_NOTICE);
-            }
-            throw new Dwoo_Exception('Plugin <em>'.$class.'</em> can not be found, maybe you forgot to bind it if it\'s a custom plugin ?', E_USER_NOTICE);
-        }
-    }
+	/**
+	 * loads a plugin file.
+	 *
+	 * @param string $class       the plugin name, without the Dwoo_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
+	 *
+	 * @throws Dwoo_Exception
+	 */
+	public function loadPlugin($class, $forceRehash = true)
+	{
+		// An unknown class was requested (maybe newly added) or the
+		// include failed so we rebuild the cache. include() will fail
+		// with an uncatchable error if the file doesn't exist, which
+		// usually means that the cache is stale and must be rebuilt,
+		// so we check for that before trying to include() the plugin.
+		if (!isset($this->classPath[$class]) ||
+			!is_readable($this->classPath[$class]) ||
+			!(include $this->classPath[$class])) {
+			if ($forceRehash) {
+				$this->rebuildClassPathCache($this->corePluginDir, $this->cacheDir.'classpath.cache.d'.Dwoo_Core::RELEASE_TAG.'.php');
+				foreach ($this->paths as $path => $file) {
+					$this->rebuildClassPathCache($path, $file);
+				}
+				if (isset($this->classPath[$class])) {
+					include $this->classPath[$class];
+				}
+				throw new Dwoo_Exception('Plugin <em>'.$class.'</em> can not be found, maybe you forgot to bind it if it\'s a custom plugin ?', E_USER_NOTICE);
+			}
+			throw new Dwoo_Exception('Plugin <em>'.$class.'</em> can not be found, maybe you forgot to bind it if it\'s a custom plugin ?', E_USER_NOTICE);
+		}
+	}
 
-    /**
-     * adds a plugin directory, the plugins found in the new plugin directory
-     * will take precedence over the other directories (including the default
-     * dwoo plugin directory), you can use this for example to override plugins
-     * in a specific directory for a specific application while keeping all your
-     * usual plugins in the same place for all applications.
-     * TOCOM don't forget that php functions overrides are not rehashed so you
-     * need to clear the classpath caches by hand when adding those.
-     *
-     * @param string $pluginDirectory the plugin path to scan
-     *
-     * @throws Dwoo_Exception
-     */
-    public function addDirectory($pluginDirectory)
-    {
-        $pluginDir = realpath($pluginDirectory);
-        if (!$pluginDir) {
-            throw new Dwoo_Exception('Plugin directory does not exist or can not be read : '.$pluginDirectory);
-        }
-        $cacheFile = $this->cacheDir.'classpath-'.substr(strtr($pluginDir, '/\\:'.PATH_SEPARATOR, '----'), strlen($pluginDir) > 80 ? -80 : 0).'.d'.Dwoo_Core::RELEASE_TAG.'.php';
-        $this->paths[$pluginDir] = $cacheFile;
-        if (file_exists($cacheFile)) {
-            $classpath = file_get_contents($cacheFile);
-            $this->classPath = unserialize($classpath) + $this->classPath;
-        } else {
-            $this->rebuildClassPathCache($pluginDir, $cacheFile);
-        }
-    }
+	/**
+	 * adds a plugin directory, the plugins found in the new plugin directory
+	 * will take precedence over the other directories (including the default
+	 * dwoo plugin directory), you can use this for example to override plugins
+	 * in a specific directory for a specific application while keeping all your
+	 * usual plugins in the same place for all applications.
+	 * TOCOM don't forget that php functions overrides are not rehashed so you
+	 * need to clear the classpath caches by hand when adding those.
+	 *
+	 * @param string $pluginDirectory the plugin path to scan
+	 *
+	 * @throws Dwoo_Exception
+	 */
+	public function addDirectory($pluginDirectory)
+	{
+		$pluginDir = realpath($pluginDirectory);
+		if (!$pluginDir) {
+			throw new Dwoo_Exception('Plugin directory does not exist or can not be read : '.$pluginDirectory);
+		}
+		$cacheFile = $this->cacheDir.'classpath-'.substr(strtr($pluginDir, '/\\:'.PATH_SEPARATOR, '----'), strlen($pluginDir) > 80 ? -80 : 0).'.d'.Dwoo_Core::RELEASE_TAG.'.php';
+		$this->paths[$pluginDir] = $cacheFile;
+		if (file_exists($cacheFile)) {
+			$classpath = file_get_contents($cacheFile);
+			$this->classPath = unserialize($classpath) + $this->classPath;
+		} else {
+			$this->rebuildClassPathCache($pluginDir, $cacheFile);
+		}
+	}
 }

lib/Dwoo/Adapters/ZendFramework/Dwoo.php

Indentation +19 added lines, -19 removed lines

@@ -19,24 +19,24 @@
  */
 class Dwoo_Adapters_ZendFramework_Dwoo extends Dwoo_Core
 {
-    /**
-     * Redirects all unknown properties to plugin proxy
-     * to support $this->viewVariable from within templates.
-     *
-     * @param string $name Property name
-     *
-     * @return mixed
-     */
-    public function __get($name)
-    {
-        if (isset($this->getPluginProxy()->view->$name)) {
-            return $this->getPluginProxy()->view->$name;
-        }
-        $trace = debug_backtrace();
-        trigger_error('Undefined property via __get(): '.$name.
-                      ' in '.$trace[0]['file'].
-                      ' on line '.$trace[0]['line'], E_USER_NOTICE);
+	/**
+	 * Redirects all unknown properties to plugin proxy
+	 * to support $this->viewVariable from within templates.
+	 *
+	 * @param string $name Property name
+	 *
+	 * @return mixed
+	 */
+	public function __get($name)
+	{
+		if (isset($this->getPluginProxy()->view->$name)) {
+			return $this->getPluginProxy()->view->$name;
+		}
+		$trace = debug_backtrace();
+		trigger_error('Undefined property via __get(): '.$name.
+					  ' in '.$trace[0]['file'].
+					  ' on line '.$trace[0]['line'], E_USER_NOTICE);
 
-        return null;
-    }
+		return null;
+	}
 }

lib/Dwoo/Adapters/ZendFramework/PluginProxy.php

Indentation +78 added lines, -78 removed lines

@@ -19,88 +19,88 @@
  */
 class Dwoo_Adapters_ZendFramework_PluginProxy implements Dwoo_IPluginProxy
 {
-    /**
-     * reference to the zend view owning this proxy.
-     *
-     * @var Zend_View_Interface
-     */
-    public $view;
+	/**
+	 * reference to the zend view owning this proxy.
+	 *
+	 * @var Zend_View_Interface
+	 */
+	public $view;
 
-    /**
-     * Dwoo_Adapters_ZendFramework_PluginProxy's constructor.
-     *
-     * @param Zend_View_Interface $view
-     */
-    public function __construct(Zend_View_Interface $view)
-    {
-        $this->view = $view;
-    }
+	/**
+	 * Dwoo_Adapters_ZendFramework_PluginProxy's constructor.
+	 *
+	 * @param Zend_View_Interface $view
+	 */
+	public function __construct(Zend_View_Interface $view)
+	{
+		$this->view = $view;
+	}
 
-    /**
-     * Called from Dwoo_Compiler to check if the requested plugin is available.
-     *
-     * @param string $name
-     *
-     * @return bool
-     */
-    public function handles($name)
-    {
-        try {
-            $this->view->getHelper($name);
-        } catch (Zend_Loader_PluginLoader_Exception $e) {
-            return false;
-        }
+	/**
+	 * Called from Dwoo_Compiler to check if the requested plugin is available.
+	 *
+	 * @param string $name
+	 *
+	 * @return bool
+	 */
+	public function handles($name)
+	{
+		try {
+			$this->view->getHelper($name);
+		} catch (Zend_Loader_PluginLoader_Exception $e) {
+			return false;
+		}
 
-        return true;
-    }
+		return true;
+	}
 
-    /**
-     * 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)
-    {
-        return '$this->getPluginProxy()->view->'.$name.'('.Dwoo_Compiler::implode_r($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)
+	{
+		return '$this->getPluginProxy()->view->'.$name.'('.Dwoo_Compiler::implode_r($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 (i.e. for ZendFramework helpers) 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)
-    {
-        return array($this->view->getHelper($name), $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 (i.e. for ZendFramework helpers) 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)
+	{
+		return array($this->view->getHelper($name), $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)
-    {
-        return '';
-    }
+	/**
+	 * 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)
+	{
+		return '';
+	}
 }