dwoo-project / dwoo

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/Processor.php

Indentation +24 added lines, -24 removed lines

@@ -23,30 +23,30 @@
  */
 abstract class Processor
 {
-    /**
-     * The compiler instance that runs this processor.
-     *
-     * @var Core
-     */
-    protected $compiler;
+	/**
+	 * The compiler instance that runs this processor.
+	 *
+	 * @var Core
+	 */
+	protected $compiler;
 
-    /**
-     * Constructor, if you override it, call parent::__construct($compiler); or assign
-     * the dwoo instance yourself if you need it.
-     *
-     * @param Compiler $compiler the compiler class
-     */
-    public function __construct(Compiler $compiler)
-    {
-        $this->compiler = $compiler;
-    }
+	/**
+	 * Constructor, if you override it, call parent::__construct($compiler); or assign
+	 * the dwoo instance yourself if you need it.
+	 *
+	 * @param Compiler $compiler the compiler class
+	 */
+	public function __construct(Compiler $compiler)
+	{
+		$this->compiler = $compiler;
+	}
 
-    /**
-     * 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/ICompiler.php

Indentation +25 added lines, -25 removed lines

@@ -29,31 +29,31 @@
  */
 interface ICompiler
 {
-    /**
-     * Compiles the provided string down to php code.
-     *
-     * @param Core      $dwoo
-     * @param ITemplate $template the template to compile
-     *
-     * @return string a compiled php code string
-     */
-    public function compile(Core $dwoo, ITemplate $template);
+	/**
+	 * Compiles the provided string down to php code.
+	 *
+	 * @param Core      $dwoo
+	 * @param ITemplate $template the template to compile
+	 *
+	 * @return string a compiled php code string
+	 */
+	public function compile(Core $dwoo, ITemplate $template);
 
-    /**
-     * Adds the custom plugins loaded into Dwoo to the compiler so it can load them.
-     *
-     * @see Core::addPlugin
-     *
-     * @param array $customPlugins an array of custom plugins
-     */
-    public function setCustomPlugins(array $customPlugins);
+	/**
+	 * Adds the custom plugins loaded into Dwoo to the compiler so it can load them.
+	 *
+	 * @see Core::addPlugin
+	 *
+	 * @param array $customPlugins an array of custom plugins
+	 */
+	public function setCustomPlugins(array $customPlugins);
 
-    /**
-     * Sets the security policy object to enforce some php security settings.
-     * use this if untrusted persons can modify templates,
-     * set it on the Dwoo object as it will be passed onto the compiler automatically
-     *
-     * @param SecurityPolicy $policy the security policy object
-     */
-    public function setSecurityPolicy(SecurityPolicy $policy = null);
+	/**
+	 * Sets the security policy object to enforce some php security settings.
+	 * use this if untrusted persons can modify templates,
+	 * set it on the Dwoo object as it will be passed onto the compiler automatically
+	 *
+	 * @param SecurityPolicy $policy the security policy object
+	 */
+	public function setSecurityPolicy(SecurityPolicy $policy = null);
 }

lib/Dwoo/Plugin.php

Indentation +70 added lines, -70 removed lines

@@ -25,81 +25,81 @@
  */
 abstract class Plugin
 {
-    /**
-     * The dwoo instance that runs this plugin.
-     *
-     * @var Core
-     */
-    protected $core;
+	/**
+	 * The dwoo instance that runs this plugin.
+	 *
+	 * @var Core
+	 */
+	protected $core;
 
-    /**
-     * Constructor, if you override it, call parent::__construct($core); or assign
-     * the dwoo instance yourself if you need it.
-     *
-     * @param Core $core the dwoo instance that runs this plugin
-     */
-    public function __construct(Core $core)
-    {
-        $this->core = $core;
-    }
+	/**
+	 * Constructor, if you override it, call parent::__construct($core); or assign
+	 * the dwoo instance yourself if you need it.
+	 *
+	 * @param Core $core the dwoo instance that runs this plugin
+	 */
+	public function __construct(Core $core)
+	{
+		$this->core = $core;
+	}
 
-    // plugins should always implement :
-    // public function process($arg, $arg, ...)
-    // or for block plugins :
-    // public function init($arg, $arg, ...)
+	// plugins should always implement :
+	// public function process($arg, $arg, ...)
+	// or for block plugins :
+	// public function init($arg, $arg, ...)
 
-    // this could be enforced with :
-    // abstract public function process(...);
-    // if my feature request gets enough interest one day
-    // see => http://bugs.php.net/bug.php?id=44043
+	// this could be enforced with :
+	// abstract public function process(...);
+	// if my feature request gets enough interest one day
+	// see => http://bugs.php.net/bug.php?id=44043
 
-    /**
-     * Utility function that converts an array of compiled parameters (or rest array) to a string of xml/html tag
-     * attributes. this is to be used in preProcessing or postProcessing functions, example :
-     *  $p = $compiler->getCompiledParams($params);
-     *  // get only the rest array as attributes
-     *  $attributes = Plugin::paramsToAttributes($p['*']);
-     *  // get all the parameters as attributes (if there is a rest array, it will be included)
-     *  $attributes = Plugin::paramsToAttributes($p);
-     *
-     * @param array    $params   an array of attributeName=>value items that will be compiled to be ready for inclusion in a php string
-     *                                inclusion in a php string
-     * @param string   $delim    the string delimiter you want to use (defaults to ')
-     * @param Compiler $compiler the compiler instance (optional for BC, but recommended to pass it for proper escaping behavior)
-     *                                escaping behavior)
-     *
-     * @return string
-     */
-    public static function paramsToAttributes(array $params, $delim = '\'', Compiler $compiler = null)
-    {
-        if (isset($params['*'])) {
-            $params = array_merge($params, $params['*']);
-            unset($params['*']);
-        }
+	/**
+	 * Utility function that converts an array of compiled parameters (or rest array) to a string of xml/html tag
+	 * attributes. this is to be used in preProcessing or postProcessing functions, example :
+	 *  $p = $compiler->getCompiledParams($params);
+	 *  // get only the rest array as attributes
+	 *  $attributes = Plugin::paramsToAttributes($p['*']);
+	 *  // get all the parameters as attributes (if there is a rest array, it will be included)
+	 *  $attributes = Plugin::paramsToAttributes($p);
+	 *
+	 * @param array    $params   an array of attributeName=>value items that will be compiled to be ready for inclusion in a php string
+	 *                                inclusion in a php string
+	 * @param string   $delim    the string delimiter you want to use (defaults to ')
+	 * @param Compiler $compiler the compiler instance (optional for BC, but recommended to pass it for proper escaping behavior)
+	 *                                escaping behavior)
+	 *
+	 * @return string
+	 */
+	public static function paramsToAttributes(array $params, $delim = '\'', Compiler $compiler = null)
+	{
+		if (isset($params['*'])) {
+			$params = array_merge($params, $params['*']);
+			unset($params['*']);
+		}
 
-        $out = '';
-        foreach ($params as $attr => $val) {
-            $out .= ' ' . $attr . '=';
-            if (trim($val, '"\'') == '' || $val == 'null') {
-                $out .= str_replace($delim, '\\' . $delim, '""');
-            } elseif (substr($val, 0, 1) === $delim && substr($val, - 1) === $delim) {
-                $out .= str_replace($delim, '\\' . $delim, '"' . substr($val, 1, - 1) . '"');
-            } else {
-                if (!$compiler) {
-                    // disable double encoding since it can not be determined if it was encoded
-                    $escapedVal = '.(is_string($tmp2=' . $val . ') ? htmlspecialchars($tmp2, ENT_QUOTES, $this->charset, false) : $tmp2).';
-                } elseif (!$compiler->getAutoEscape() || false === strpos($val, 'isset($this->scope')) {
-                    // escape if auto escaping is disabled, or there was no variable in the string
-                    $escapedVal = '.(is_string($tmp2=' . $val . ') ? htmlspecialchars($tmp2, ENT_QUOTES, $this->charset) : $tmp2).';
-                } else {
-                    // print as is
-                    $escapedVal = '.' . $val . '.';
-                }
+		$out = '';
+		foreach ($params as $attr => $val) {
+			$out .= ' ' . $attr . '=';
+			if (trim($val, '"\'') == '' || $val == 'null') {
+				$out .= str_replace($delim, '\\' . $delim, '""');
+			} elseif (substr($val, 0, 1) === $delim && substr($val, - 1) === $delim) {
+				$out .= str_replace($delim, '\\' . $delim, '"' . substr($val, 1, - 1) . '"');
+			} else {
+				if (!$compiler) {
+					// disable double encoding since it can not be determined if it was encoded
+					$escapedVal = '.(is_string($tmp2=' . $val . ') ? htmlspecialchars($tmp2, ENT_QUOTES, $this->charset, false) : $tmp2).';
+				} elseif (!$compiler->getAutoEscape() || false === strpos($val, 'isset($this->scope')) {
+					// escape if auto escaping is disabled, or there was no variable in the string
+					$escapedVal = '.(is_string($tmp2=' . $val . ') ? htmlspecialchars($tmp2, ENT_QUOTES, $this->charset) : $tmp2).';
+				} else {
+					// print as is
+					$escapedVal = '.' . $val . '.';
+				}
 
-                $out .= str_replace($delim, '\\' . $delim, '"') . $delim . $escapedVal . $delim . str_replace($delim, '\\' . $delim, '"');
-            }
-        }
+				$out .= str_replace($delim, '\\' . $delim, '"') . $delim . $escapedVal . $delim . str_replace($delim, '\\' . $delim, '"');
+			}
+		}
 
-        return ltrim($out);
-    }
+		return ltrim($out);
+	}
 }

Spacing +7 added lines, -7 removed lines

@@ -79,24 +79,24 @@
 
         $out = '';
         foreach ($params as $attr => $val) {
-            $out .= ' ' . $attr . '=';
+            $out .= ' '.$attr.'=';
             if (trim($val, '"\'') == '' || $val == 'null') {
-                $out .= str_replace($delim, '\\' . $delim, '""');
+                $out .= str_replace($delim, '\\'.$delim, '""');
             } elseif (substr($val, 0, 1) === $delim && substr($val, - 1) === $delim) {
-                $out .= str_replace($delim, '\\' . $delim, '"' . substr($val, 1, - 1) . '"');
+                $out .= str_replace($delim, '\\'.$delim, '"'.substr($val, 1, - 1).'"');
             } else {
                 if (!$compiler) {
                     // disable double encoding since it can not be determined if it was encoded
-                    $escapedVal = '.(is_string($tmp2=' . $val . ') ? htmlspecialchars($tmp2, ENT_QUOTES, $this->charset, false) : $tmp2).';
+                    $escapedVal = '.(is_string($tmp2='.$val.') ? htmlspecialchars($tmp2, ENT_QUOTES, $this->charset, false) : $tmp2).';
                 } elseif (!$compiler->getAutoEscape() || false === strpos($val, 'isset($this->scope')) {
                     // escape if auto escaping is disabled, or there was no variable in the string
-                    $escapedVal = '.(is_string($tmp2=' . $val . ') ? htmlspecialchars($tmp2, ENT_QUOTES, $this->charset) : $tmp2).';
+                    $escapedVal = '.(is_string($tmp2='.$val.') ? htmlspecialchars($tmp2, ENT_QUOTES, $this->charset) : $tmp2).';
                 } else {
                     // print as is
-                    $escapedVal = '.' . $val . '.';
+                    $escapedVal = '.'.$val.'.';
                 }
 
-                $out .= str_replace($delim, '\\' . $delim, '"') . $delim . $escapedVal . $delim . str_replace($delim, '\\' . $delim, '"');
+                $out .= str_replace($delim, '\\'.$delim, '"').$delim.$escapedVal.$delim.str_replace($delim, '\\'.$delim, '"');
             }
         }
 

lib/Dwoo/IDataProvider.php

Indentation +6 added lines, -6 removed lines

@@ -23,10 +23,10 @@
  */
 interface 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/Block/Plugin.php

Indentation +82 added lines, -82 removed lines

@@ -28,92 +28,92 @@
  */
 abstract class Plugin extends DwooPlugin
 {
-    /**
-     * Stores the contents of the block while it runs.
-     *
-     * @var string
-     */
-    protected $buffer = '';
+	/**
+	 * Stores the contents of the block while it runs.
+	 *
+	 * @var string
+	 */
+	protected $buffer = '';
 
-    /**
-     * Buffers input, override only if necessary.
-     *
-     * @var string the content that must be buffered
-     */
-    public function buffer($input)
-    {
-        $this->buffer .= $input;
-    }
+	/**
+	 * Buffers input, override only if necessary.
+	 *
+	 * @var string the content that must be buffered
+	 */
+	public function buffer($input)
+	{
+		$this->buffer .= $input;
+	}
 
-    // initialization code, receives the parameters from {block param1 param2}
-    // public function init($arg, $arg, ...);
+	// initialization code, receives the parameters from {block param1 param2}
+	// public function init($arg, $arg, ...);
 
-    /**
-     * Called when the block ends, this is most of the time followed right away by a call
-     * of <em>process()</em> but not always, so this should be used to do any shutdown operations on the
-     * block object, if required.
-     */
-    public function end()
-    {
-    }
+	/**
+	 * Called when the block ends, this is most of the time followed right away by a call
+	 * of <em>process()</em> but not always, so this should be used to do any shutdown operations on the
+	 * block object, if required.
+	 */
+	public function end()
+	{
+	}
 
-    /**
-     * Called when the block output is required by a parent block.
-     * this must read $this->buffer and return it processed
-     *
-     * @return string
-     */
-    public function process()
-    {
-        return $this->buffer;
-    }
+	/**
+	 * Called when the block output is required by a parent block.
+	 * this must read $this->buffer and return it processed
+	 *
+	 * @return string
+	 */
+	public function process()
+	{
+		return $this->buffer;
+	}
 
-    /**
-     * Called at compile time to define what the block should output in the compiled template code, happens when the
-     * block is declared basically this will replace the {block arg arg arg} tag in the template.
-     *
-     * @param DwooCompiler $compiler the compiler instance that calls this function
-     * @param array        $params   an array containing original and compiled parameters
-     * @param string       $prepend  that is just meant to allow a child class to call
-     *                               parent::postProcessing($compiler, $params, "foo();") to add a command before the
-     *                               default commands are executed parent::postProcessing($compiler, $params, "foo();")
-     *                               to add a command before the default commands are executed
-     * @param string       $append   that is just meant to allow a child class to call
-     *                               parent::postProcessing($compiler, $params, null, "foo();") to add a command after
-     *                               the default commands are executed parent::postProcessing($compiler, $params, null,
-     *                               "foo();") to add a command after the default commands are executed
-     * @param string       $type     the type is the plugin class name used
-     *
-     * @return string
-     */
-    public static function preProcessing(DwooCompiler $compiler, array $params, $prepend, $append, $type)
-    {
-        return DwooCompiler::PHP_OPEN . $prepend . '$this->addStack("' . $type . '", array(' . DwooCompiler::implode_r($compiler->getCompiledParams($params)) . '));' . $append . DwooCompiler::PHP_CLOSE;
-    }
+	/**
+	 * Called at compile time to define what the block should output in the compiled template code, happens when the
+	 * block is declared basically this will replace the {block arg arg arg} tag in the template.
+	 *
+	 * @param DwooCompiler $compiler the compiler instance that calls this function
+	 * @param array        $params   an array containing original and compiled parameters
+	 * @param string       $prepend  that is just meant to allow a child class to call
+	 *                               parent::postProcessing($compiler, $params, "foo();") to add a command before the
+	 *                               default commands are executed parent::postProcessing($compiler, $params, "foo();")
+	 *                               to add a command before the default commands are executed
+	 * @param string       $append   that is just meant to allow a child class to call
+	 *                               parent::postProcessing($compiler, $params, null, "foo();") to add a command after
+	 *                               the default commands are executed parent::postProcessing($compiler, $params, null,
+	 *                               "foo();") to add a command after the default commands are executed
+	 * @param string       $type     the type is the plugin class name used
+	 *
+	 * @return string
+	 */
+	public static function preProcessing(DwooCompiler $compiler, array $params, $prepend, $append, $type)
+	{
+		return DwooCompiler::PHP_OPEN . $prepend . '$this->addStack("' . $type . '", array(' . DwooCompiler::implode_r($compiler->getCompiledParams($params)) . '));' . $append . DwooCompiler::PHP_CLOSE;
+	}
 
-    /**
-     * Called at compile time to define what the block should output in the compiled template code, happens when the
-     * block is ended basically this will replace the {/block} tag in the template.
-     *
-     * @see preProcessing
-     *
-     * @param DwooCompiler $compiler the compiler instance that calls this function
-     * @param array        $params   an array containing original and compiled parameters, see preProcessing() for more
-     *                               details more details
-     * @param string       $prepend  that is just meant to allow a child class to call
-     *                               parent::postProcessing($compiler, $params, "foo();") to add a command before the
-     *                               default commands are executed parent::postProcessing($compiler, $params, "foo();")
-     *                               to add a command before the default commands are executed
-     * @param string       $append   that is just meant to allow a child class to call
-     *                               parent::postProcessing($compiler, $params, null, "foo();") to add a command after
-     *                               the default commands are executed parent::postProcessing($compiler, $params, null,
-     *                               "foo();") to add a command after the default commands are executed
-     * @param string       $content  the entire content of the block being closed
-     *
-     * @return string
-     */
-    public static function postProcessing(DwooCompiler $compiler, array $params, $prepend, $append, $content)
-    {
-        return $content . DwooCompiler::PHP_OPEN . $prepend . '$this->delStack();' . $append . DwooCompiler::PHP_CLOSE;
-    }
+	/**
+	 * Called at compile time to define what the block should output in the compiled template code, happens when the
+	 * block is ended basically this will replace the {/block} tag in the template.
+	 *
+	 * @see preProcessing
+	 *
+	 * @param DwooCompiler $compiler the compiler instance that calls this function
+	 * @param array        $params   an array containing original and compiled parameters, see preProcessing() for more
+	 *                               details more details
+	 * @param string       $prepend  that is just meant to allow a child class to call
+	 *                               parent::postProcessing($compiler, $params, "foo();") to add a command before the
+	 *                               default commands are executed parent::postProcessing($compiler, $params, "foo();")
+	 *                               to add a command before the default commands are executed
+	 * @param string       $append   that is just meant to allow a child class to call
+	 *                               parent::postProcessing($compiler, $params, null, "foo();") to add a command after
+	 *                               the default commands are executed parent::postProcessing($compiler, $params, null,
+	 *                               "foo();") to add a command after the default commands are executed
+	 * @param string       $content  the entire content of the block being closed
+	 *
+	 * @return string
+	 */
+	public static function postProcessing(DwooCompiler $compiler, array $params, $prepend, $append, $content)
+	{
+		return $content . DwooCompiler::PHP_OPEN . $prepend . '$this->delStack();' . $append . DwooCompiler::PHP_CLOSE;
+	}
 }

Spacing +2 added lines, -2 removed lines

@@ -88,7 +88,7 @@ 
      */
     public static function preProcessing(DwooCompiler $compiler, array $params, $prepend, $append, $type)
     {
-        return DwooCompiler::PHP_OPEN . $prepend . '$this->addStack("' . $type . '", array(' . DwooCompiler::implode_r($compiler->getCompiledParams($params)) . '));' . $append . DwooCompiler::PHP_CLOSE;
+        return DwooCompiler::PHP_OPEN.$prepend.'$this->addStack("'.$type.'", array('.DwooCompiler::implode_r($compiler->getCompiledParams($params)).'));'.$append.DwooCompiler::PHP_CLOSE;
     }
 
     /**
@@ -114,6 +114,6 @@ 
      */
     public static function postProcessing(DwooCompiler $compiler, array $params, $prepend, $append, $content)
     {
-        return $content . DwooCompiler::PHP_OPEN . $prepend . '$this->delStack();' . $append . DwooCompiler::PHP_CLOSE;
+        return $content.DwooCompiler::PHP_OPEN.$prepend.'$this->delStack();'.$append.DwooCompiler::PHP_CLOSE;
     }
 }

lib/Dwoo/Plugins/Functions/PluginExtends.php

Indentation +155 added lines, -155 removed lines

@@ -34,28 +34,28 @@ 
  */
 class PluginExtends extends Plugin implements ICompilable
 {
-    protected static $childSource;
-    protected static $regex;
-    protected static $l;
-    protected static $r;
-    protected static $lastReplacement;
-
-    public function process()
-    {
-    }
-
-    /**
-     * @param Compiler $compiler
-     * @param          $file
-     *
-     * @throws CompilationException
-     */
-    public static function compile(Compiler $compiler, $file)
-    {
-        list($l, $r) = $compiler->getDelimiters();
-        self::$l     = preg_quote($l, '/');
-        self::$r     = preg_quote($r, '/');
-        self::$regex = '/
+	protected static $childSource;
+	protected static $regex;
+	protected static $l;
+	protected static $r;
+	protected static $lastReplacement;
+
+	public function process()
+	{
+	}
+
+	/**
+	 * @param Compiler $compiler
+	 * @param          $file
+	 *
+	 * @throws CompilationException
+	 */
+	public static function compile(Compiler $compiler, $file)
+	{
+		list($l, $r) = $compiler->getDelimiters();
+		self::$l     = preg_quote($l, '/');
+		self::$r     = preg_quote($r, '/');
+		self::$regex = '/
 			' . self::$l . 'block\s(["\']?)(.+?)\1' . self::$r . '(?:\r?\n?)
 			((?:
 				(?R)
@@ -70,137 +70,137 @@ 
 			' . self::$l . '\/block' . self::$r . '
 			/six';
 
-        if ($compiler->getLooseOpeningHandling()) {
-            self::$l .= '\s*';
-            self::$r = '\s*' . self::$r;
-        }
-        $inheritanceTree = array(array('source' => $compiler->getTemplateSource()));
-        $curPath         = dirname($compiler->getDwoo()->getTemplate()->getResourceIdentifier()) . DIRECTORY_SEPARATOR;
-        $curTpl          = $compiler->getDwoo()->getTemplate();
-
-        while (!empty($file)) {
-            if ($file === '""' || $file === "''" || (substr($file, 0, 1) !== '"' && substr($file, 0, 1) !== '\'')) {
-                throw new CompilationException($compiler, 'Extends : The file name must be a non-empty string');
-            }
-
-            if (preg_match('#^["\']([a-z]{2,}):(.*?)["\']$#i', $file, $m)) {
-                // resource:identifier given, extract them
-                $resource   = $m[1];
-                $identifier = $m[2];
-            } else {
-                // get the current template's resource
-                $resource   = $curTpl->getResourceName();
-                $identifier = substr($file, 1, - 1);
-            }
-
-            try {
-                $parent = $compiler->getDwoo()->templateFactory($resource, $identifier, null, null, null, $curTpl);
-            }
-            catch (SecurityException $e) {
-                throw new CompilationException($compiler, 'Extends : Security restriction : ' . $e->getMessage());
-            }
-            catch (Exception $e) {
-                throw new CompilationException($compiler, 'Extends : ' . $e->getMessage());
-            }
-
-            if ($parent === null) {
-                throw new CompilationException($compiler, 'Extends : Resource "' . $resource . ':' . $identifier . '" not found.');
-            } elseif ($parent === false) {
-                throw new CompilationException($compiler, 'Extends : Resource "' . $resource . '" does not support extends.');
-            }
-
-            $curTpl    = $parent;
-            $newParent = array(
-                'source'     => $parent->getSource(),
-                'resource'   => $resource,
-                'identifier' => $parent->getResourceIdentifier(),
-                'uid'        => $parent->getUid()
-            );
-            if (array_search($newParent, $inheritanceTree, true) !== false) {
-                throw new CompilationException($compiler, 'Extends : Recursive template inheritance detected');
-            }
-            $inheritanceTree[] = $newParent;
-
-            if (preg_match('/^' . self::$l . 'extends(?:\(?\s*|\s+)(?:file=)?\s*((["\']).+?\2|\S+?)\s*\)?\s*?' . self::$r . '/i', $parent->getSource(), $match)) {
-                $curPath = dirname($identifier) . DIRECTORY_SEPARATOR;
-                if (isset($match[2]) && $match[2] == '"') {
-                    $file = '"' . str_replace('"', '\\"', substr($match[1], 1, - 1)) . '"';
-                } elseif (isset($match[2]) && $match[2] == "'") {
-                    $file = '"' . substr($match[1], 1, - 1) . '"';
-                } else {
-                    $file = '"' . $match[1] . '"';
-                }
-            } else {
-                $file = false;
-            }
-        }
-
-        while (true) {
-            $parent                = array_pop($inheritanceTree);
-            $child                 = end($inheritanceTree);
-            self::$childSource     = $child['source'];
-            self::$lastReplacement = count($inheritanceTree) === 1;
-            if (!isset($newSource)) {
-                $newSource = $parent['source'];
-            }
-            $newSource = preg_replace_callback(self::$regex, array(
-                'Dwoo\Plugins\Functions\PluginExtends',
-                'replaceBlock'
-            ), $newSource);
-            $newSource = $l . 'do extendsCheck(' . var_export($parent['resource'] . ':' . $parent['identifier'], true) . ')' . $r . $newSource;
-
-            if (self::$lastReplacement) {
-                break;
-            }
-        }
-        $compiler->setTemplateSource($newSource);
-        $compiler->recompile();
-    }
-
-    /**
-     * @param array $matches
-     *
-     * @return mixed|string
-     */
-    protected static function replaceBlock(array $matches)
-    {
-        $matches[3] = self::removeTrailingNewline($matches[3]);
-
-        if (preg_match_all(self::$regex, self::$childSource, $override) && in_array($matches[2], $override[2])) {
-            $key      = array_search($matches[2], $override[2]);
-            $override = self::removeTrailingNewline($override[3][$key]);
-
-            $l = stripslashes(self::$l);
-            $r = stripslashes(self::$r);
-
-            if (self::$lastReplacement) {
-                return preg_replace('/' . self::$l . '\$dwoo\.parent' . self::$r . '/is', $matches[3], $override);
-            }
-
-            return $l . 'block ' . $matches[1] . $matches[2] . $matches[1] . $r . preg_replace('/' . self::$l . '\$dwoo\.parent' . self::$r . '/is', $matches[3], $override) . $l . '/block' . $r;
-        }
-
-        if (preg_match(self::$regex, $matches[3])) {
-            return preg_replace_callback(self::$regex, array(
-                'Dwoo\Plugins\Functions\PluginExtends',
-                'replaceBlock'
-            ), $matches[3]);
-        }
-
-        if (self::$lastReplacement) {
-            return $matches[3];
-        }
-
-        return $matches[0];
-    }
-
-    /**
-     * @param $text
-     *
-     * @return string
-     */
-    protected static function removeTrailingNewline($text)
-    {
-        return substr($text, - 1) === "\n" ? substr($text, - 2, 1) === "\r" ? substr($text, 0, - 2) : substr($text, 0, - 1) : $text;
-    }
+		if ($compiler->getLooseOpeningHandling()) {
+			self::$l .= '\s*';
+			self::$r = '\s*' . self::$r;
+		}
+		$inheritanceTree = array(array('source' => $compiler->getTemplateSource()));
+		$curPath         = dirname($compiler->getDwoo()->getTemplate()->getResourceIdentifier()) . DIRECTORY_SEPARATOR;
+		$curTpl          = $compiler->getDwoo()->getTemplate();
+
+		while (!empty($file)) {
+			if ($file === '""' || $file === "''" || (substr($file, 0, 1) !== '"' && substr($file, 0, 1) !== '\'')) {
+				throw new CompilationException($compiler, 'Extends : The file name must be a non-empty string');
+			}
+
+			if (preg_match('#^["\']([a-z]{2,}):(.*?)["\']$#i', $file, $m)) {
+				// resource:identifier given, extract them
+				$resource   = $m[1];
+				$identifier = $m[2];
+			} else {
+				// get the current template's resource
+				$resource   = $curTpl->getResourceName();
+				$identifier = substr($file, 1, - 1);
+			}
+
+			try {
+				$parent = $compiler->getDwoo()->templateFactory($resource, $identifier, null, null, null, $curTpl);
+			}
+			catch (SecurityException $e) {
+				throw new CompilationException($compiler, 'Extends : Security restriction : ' . $e->getMessage());
+			}
+			catch (Exception $e) {
+				throw new CompilationException($compiler, 'Extends : ' . $e->getMessage());
+			}
+
+			if ($parent === null) {
+				throw new CompilationException($compiler, 'Extends : Resource "' . $resource . ':' . $identifier . '" not found.');
+			} elseif ($parent === false) {
+				throw new CompilationException($compiler, 'Extends : Resource "' . $resource . '" does not support extends.');
+			}
+
+			$curTpl    = $parent;
+			$newParent = array(
+				'source'     => $parent->getSource(),
+				'resource'   => $resource,
+				'identifier' => $parent->getResourceIdentifier(),
+				'uid'        => $parent->getUid()
+			);
+			if (array_search($newParent, $inheritanceTree, true) !== false) {
+				throw new CompilationException($compiler, 'Extends : Recursive template inheritance detected');
+			}
+			$inheritanceTree[] = $newParent;
+
+			if (preg_match('/^' . self::$l . 'extends(?:\(?\s*|\s+)(?:file=)?\s*((["\']).+?\2|\S+?)\s*\)?\s*?' . self::$r . '/i', $parent->getSource(), $match)) {
+				$curPath = dirname($identifier) . DIRECTORY_SEPARATOR;
+				if (isset($match[2]) && $match[2] == '"') {
+					$file = '"' . str_replace('"', '\\"', substr($match[1], 1, - 1)) . '"';
+				} elseif (isset($match[2]) && $match[2] == "'") {
+					$file = '"' . substr($match[1], 1, - 1) . '"';
+				} else {
+					$file = '"' . $match[1] . '"';
+				}
+			} else {
+				$file = false;
+			}
+		}
+
+		while (true) {
+			$parent                = array_pop($inheritanceTree);
+			$child                 = end($inheritanceTree);
+			self::$childSource     = $child['source'];
+			self::$lastReplacement = count($inheritanceTree) === 1;
+			if (!isset($newSource)) {
+				$newSource = $parent['source'];
+			}
+			$newSource = preg_replace_callback(self::$regex, array(
+				'Dwoo\Plugins\Functions\PluginExtends',
+				'replaceBlock'
+			), $newSource);
+			$newSource = $l . 'do extendsCheck(' . var_export($parent['resource'] . ':' . $parent['identifier'], true) . ')' . $r . $newSource;
+
+			if (self::$lastReplacement) {
+				break;
+			}
+		}
+		$compiler->setTemplateSource($newSource);
+		$compiler->recompile();
+	}
+
+	/**
+	 * @param array $matches
+	 *
+	 * @return mixed|string
+	 */
+	protected static function replaceBlock(array $matches)
+	{
+		$matches[3] = self::removeTrailingNewline($matches[3]);
+
+		if (preg_match_all(self::$regex, self::$childSource, $override) && in_array($matches[2], $override[2])) {
+			$key      = array_search($matches[2], $override[2]);
+			$override = self::removeTrailingNewline($override[3][$key]);
+
+			$l = stripslashes(self::$l);
+			$r = stripslashes(self::$r);
+
+			if (self::$lastReplacement) {
+				return preg_replace('/' . self::$l . '\$dwoo\.parent' . self::$r . '/is', $matches[3], $override);
+			}
+
+			return $l . 'block ' . $matches[1] . $matches[2] . $matches[1] . $r . preg_replace('/' . self::$l . '\$dwoo\.parent' . self::$r . '/is', $matches[3], $override) . $l . '/block' . $r;
+		}
+
+		if (preg_match(self::$regex, $matches[3])) {
+			return preg_replace_callback(self::$regex, array(
+				'Dwoo\Plugins\Functions\PluginExtends',
+				'replaceBlock'
+			), $matches[3]);
+		}
+
+		if (self::$lastReplacement) {
+			return $matches[3];
+		}
+
+		return $matches[0];
+	}
+
+	/**
+	 * @param $text
+	 *
+	 * @return string
+	 */
+	protected static function removeTrailingNewline($text)
+	{
+		return substr($text, - 1) === "\n" ? substr($text, - 2, 1) === "\r" ? substr($text, 0, - 2) : substr($text, 0, - 1) : $text;
+	}
 }

Spacing +20 added lines, -20 removed lines

@@ -56,26 +56,26 @@ 
         self::$l     = preg_quote($l, '/');
         self::$r     = preg_quote($r, '/');
         self::$regex = '/
-			' . self::$l . 'block\s(["\']?)(.+?)\1' . self::$r . '(?:\r?\n?)
+			' . self::$l.'block\s(["\']?)(.+?)\1'.self::$r.'(?:\r?\n?)
 			((?:
 				(?R)
 				|
-				[^' . self::$l . ']*
+				[^' . self::$l.']*
 				(?:
-					(?! ' . self::$l . '\/?block\b )
-					' . self::$l . '
-					[^' . self::$l . ']*+
+					(?! ' . self::$l.'\/?block\b )
+					' . self::$l.'
+					[^' . self::$l.']*+
 				)*
 			)*)
-			' . self::$l . '\/block' . self::$r . '
+			' . self::$l.'\/block'.self::$r.'
 			/six';
 
         if ($compiler->getLooseOpeningHandling()) {
             self::$l .= '\s*';
-            self::$r = '\s*' . self::$r;
+            self::$r = '\s*'.self::$r;
         }
         $inheritanceTree = array(array('source' => $compiler->getTemplateSource()));
-        $curPath         = dirname($compiler->getDwoo()->getTemplate()->getResourceIdentifier()) . DIRECTORY_SEPARATOR;
+        $curPath         = dirname($compiler->getDwoo()->getTemplate()->getResourceIdentifier()).DIRECTORY_SEPARATOR;
         $curTpl          = $compiler->getDwoo()->getTemplate();
 
         while (!empty($file)) {
@@ -97,16 +97,16 @@ 
                 $parent = $compiler->getDwoo()->templateFactory($resource, $identifier, null, null, null, $curTpl);
             }
             catch (SecurityException $e) {
-                throw new CompilationException($compiler, 'Extends : Security restriction : ' . $e->getMessage());
+                throw new CompilationException($compiler, 'Extends : Security restriction : '.$e->getMessage());
             }
             catch (Exception $e) {
-                throw new CompilationException($compiler, 'Extends : ' . $e->getMessage());
+                throw new CompilationException($compiler, 'Extends : '.$e->getMessage());
             }
 
             if ($parent === null) {
-                throw new CompilationException($compiler, 'Extends : Resource "' . $resource . ':' . $identifier . '" not found.');
+                throw new CompilationException($compiler, 'Extends : Resource "'.$resource.':'.$identifier.'" not found.');
             } elseif ($parent === false) {
-                throw new CompilationException($compiler, 'Extends : Resource "' . $resource . '" does not support extends.');
+                throw new CompilationException($compiler, 'Extends : Resource "'.$resource.'" does not support extends.');
             }
 
             $curTpl    = $parent;
@@ -121,14 +121,14 @@ 
             }
             $inheritanceTree[] = $newParent;
 
-            if (preg_match('/^' . self::$l . 'extends(?:\(?\s*|\s+)(?:file=)?\s*((["\']).+?\2|\S+?)\s*\)?\s*?' . self::$r . '/i', $parent->getSource(), $match)) {
-                $curPath = dirname($identifier) . DIRECTORY_SEPARATOR;
+            if (preg_match('/^'.self::$l.'extends(?:\(?\s*|\s+)(?:file=)?\s*((["\']).+?\2|\S+?)\s*\)?\s*?'.self::$r.'/i', $parent->getSource(), $match)) {
+                $curPath = dirname($identifier).DIRECTORY_SEPARATOR;
                 if (isset($match[2]) && $match[2] == '"') {
-                    $file = '"' . str_replace('"', '\\"', substr($match[1], 1, - 1)) . '"';
+                    $file = '"'.str_replace('"', '\\"', substr($match[1], 1, - 1)).'"';
                 } elseif (isset($match[2]) && $match[2] == "'") {
-                    $file = '"' . substr($match[1], 1, - 1) . '"';
+                    $file = '"'.substr($match[1], 1, - 1).'"';
                 } else {
-                    $file = '"' . $match[1] . '"';
+                    $file = '"'.$match[1].'"';
                 }
             } else {
                 $file = false;
@@ -147,7 +147,7 @@ 
                 'Dwoo\Plugins\Functions\PluginExtends',
                 'replaceBlock'
             ), $newSource);
-            $newSource = $l . 'do extendsCheck(' . var_export($parent['resource'] . ':' . $parent['identifier'], true) . ')' . $r . $newSource;
+            $newSource = $l.'do extendsCheck('.var_export($parent['resource'].':'.$parent['identifier'], true).')'.$r.$newSource;
 
             if (self::$lastReplacement) {
                 break;
@@ -174,10 +174,10 @@ 
             $r = stripslashes(self::$r);
 
             if (self::$lastReplacement) {
-                return preg_replace('/' . self::$l . '\$dwoo\.parent' . self::$r . '/is', $matches[3], $override);
+                return preg_replace('/'.self::$l.'\$dwoo\.parent'.self::$r.'/is', $matches[3], $override);
             }
 
-            return $l . 'block ' . $matches[1] . $matches[2] . $matches[1] . $r . preg_replace('/' . self::$l . '\$dwoo\.parent' . self::$r . '/is', $matches[3], $override) . $l . '/block' . $r;
+            return $l.'block '.$matches[1].$matches[2].$matches[1].$r.preg_replace('/'.self::$l.'\$dwoo\.parent'.self::$r.'/is', $matches[3], $override).$l.'/block'.$r;
         }
 
         if (preg_match(self::$regex, $matches[3])) {

Braces +2 added lines, -4 removed lines

@@ -95,11 +95,9 @@
 
             try {
                 $parent = $compiler->getDwoo()->templateFactory($resource, $identifier, null, null, null, $curTpl);
-            }
-            catch (SecurityException $e) {
+            } catch (SecurityException $e) {
                 throw new CompilationException($compiler, 'Extends : Security restriction : ' . $e->getMessage());
-            }
-            catch (Exception $e) {
+            } catch (Exception $e) {
                 throw new CompilationException($compiler, 'Extends : ' . $e->getMessage());
             }
 

lib/Dwoo/Plugins/Functions/PluginCycle.php

Spacing +2 added lines, -2 removed lines

@@ -74,10 +74,10 @@
         }
 
         if ($advance) {
-            if ($this->cycles[$name]['index'] >= count($values) - 1) {
+            if ($this->cycles[$name]['index'] >= count($values)-1) {
                 $this->cycles[$name]['index'] = 0;
             } else {
-                ++ $this->cycles[$name]['index'];
+                ++$this->cycles[$name]['index'];
             }
         }
 

Indentation +46 added lines, -46 removed lines

@@ -34,58 +34,58 @@
  */
 class PluginCycle extends Plugin
 {
-    protected $cycles = array();
+	protected $cycles = array();
 
-    /**
-     * @param string $name
-     * @param null   $values
-     * @param bool   $print
-     * @param bool   $advance
-     * @param string $delimiter
-     * @param null   $assign
-     * @param bool   $reset
-     *
-     * @return string|null
-     */
-    public function process($name = 'default', $values = null, $print = true, $advance = true, $delimiter = ',', $assign = null, $reset = false)
-    {
-        if ($values !== null) {
-            if (is_string($values)) {
-                $values = explode($delimiter, $values);
-            }
+	/**
+	 * @param string $name
+	 * @param null   $values
+	 * @param bool   $print
+	 * @param bool   $advance
+	 * @param string $delimiter
+	 * @param null   $assign
+	 * @param bool   $reset
+	 *
+	 * @return string|null
+	 */
+	public function process($name = 'default', $values = null, $print = true, $advance = true, $delimiter = ',', $assign = null, $reset = false)
+	{
+		if ($values !== null) {
+			if (is_string($values)) {
+				$values = explode($delimiter, $values);
+			}
 
-            if (!isset($this->cycles[$name]) || $this->cycles[$name]['values'] !== $values) {
-                $this->cycles[$name]['index'] = 0;
-            }
+			if (!isset($this->cycles[$name]) || $this->cycles[$name]['values'] !== $values) {
+				$this->cycles[$name]['index'] = 0;
+			}
 
-            $this->cycles[$name]['values'] = array_values($values);
-        } elseif (isset($this->cycles[$name])) {
-            $values = $this->cycles[$name]['values'];
-        }
+			$this->cycles[$name]['values'] = array_values($values);
+		} elseif (isset($this->cycles[$name])) {
+			$values = $this->cycles[$name]['values'];
+		}
 
-        if ($reset) {
-            $this->cycles[$name]['index'] = 0;
-        }
+		if ($reset) {
+			$this->cycles[$name]['index'] = 0;
+		}
 
-        if ($print) {
-            $out = $values[$this->cycles[$name]['index']];
-        } else {
-            $out = null;
-        }
+		if ($print) {
+			$out = $values[$this->cycles[$name]['index']];
+		} else {
+			$out = null;
+		}
 
-        if ($advance) {
-            if ($this->cycles[$name]['index'] >= count($values) - 1) {
-                $this->cycles[$name]['index'] = 0;
-            } else {
-                ++ $this->cycles[$name]['index'];
-            }
-        }
+		if ($advance) {
+			if ($this->cycles[$name]['index'] >= count($values) - 1) {
+				$this->cycles[$name]['index'] = 0;
+			} else {
+				++ $this->cycles[$name]['index'];
+			}
+		}
 
-        if ($assign === null) {
-            return $out;
-        }
-        $this->core->assignInScope($out, $assign);
+		if ($assign === null) {
+			return $out;
+		}
+		$this->core->assignInScope($out, $assign);
 
-        return null;
-    }
+		return null;
+	}
 }