dwoo-project / dwoo

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

Indentation +1 added lines, -1 removed lines

@@ -25,5 +25,5 @@
  */
 function PluginEolCompile(Compiler $compiler)
 {
-    return 'PHP_EOL';
+	return 'PHP_EOL';
 }

lib/Dwoo/Plugins/Functions/PluginCapitalize.php

Indentation +14 added lines, -14 removed lines

@@ -29,19 +29,19 @@
  */
 function PluginCapitalize(Core $dwoo, $value, $numwords = false)
 {
-    if ($numwords || preg_match('#^[^0-9]+$#', $value)) {
-        return mb_convert_case((string)$value, MB_CASE_TITLE, $dwoo->getCharset());
-    } else {
-        $bits = explode(' ', (string)$value);
-        $out  = '';
-        while (list(, $v) = each($bits)) {
-            if (preg_match('#^[^0-9]+$#', $v)) {
-                $out .= ' ' . mb_convert_case($v, MB_CASE_TITLE, $dwoo->getCharset());
-            } else {
-                $out .= ' ' . $v;
-            }
-        }
+	if ($numwords || preg_match('#^[^0-9]+$#', $value)) {
+		return mb_convert_case((string)$value, MB_CASE_TITLE, $dwoo->getCharset());
+	} else {
+		$bits = explode(' ', (string)$value);
+		$out  = '';
+		while (list(, $v) = each($bits)) {
+			if (preg_match('#^[^0-9]+$#', $v)) {
+				$out .= ' ' . mb_convert_case($v, MB_CASE_TITLE, $dwoo->getCharset());
+			} else {
+				$out .= ' ' . $v;
+			}
+		}
 
-        return substr($out, 1);
-    }
+		return substr($out, 1);
+	}
 }

Spacing +4 added lines, -4 removed lines

@@ -30,15 +30,15 @@
 function PluginCapitalize(Core $dwoo, $value, $numwords = false)
 {
     if ($numwords || preg_match('#^[^0-9]+$#', $value)) {
-        return mb_convert_case((string)$value, MB_CASE_TITLE, $dwoo->getCharset());
+        return mb_convert_case((string) $value, MB_CASE_TITLE, $dwoo->getCharset());
     } else {
-        $bits = explode(' ', (string)$value);
+        $bits = explode(' ', (string) $value);
         $out  = '';
         while (list(, $v) = each($bits)) {
             if (preg_match('#^[^0-9]+$#', $v)) {
-                $out .= ' ' . mb_convert_case($v, MB_CASE_TITLE, $dwoo->getCharset());
+                $out .= ' '.mb_convert_case($v, MB_CASE_TITLE, $dwoo->getCharset());
             } else {
-                $out .= ' ' . $v;
+                $out .= ' '.$v;
             }
         }
 

lib/Dwoo/Plugins/Functions/PluginInclude.php

Indentation +45 added lines, -45 removed lines

@@ -36,58 +36,58 @@
  */
 function PluginInclude(Core $dwoo, $file, $cache_time = null, $cache_id = null, $compile_id = null, $data = '_root', $assign = null, array $rest = array())
 {
-    if ($file === '') {
-        return '';
-    }
+	if ($file === '') {
+		return '';
+	}
 
-    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   = $dwoo->getTemplate()->getResourceName();
-        $identifier = $file;
-    }
+	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   = $dwoo->getTemplate()->getResourceName();
+		$identifier = $file;
+	}
 
-    try {
-        $include = $dwoo->templateFactory($resource, $identifier, $cache_time, $cache_id, $compile_id);
-    }
-    catch (SecurityException $e) {
-        $dwoo->triggerError('Include : Security restriction : ' . $e->getMessage(), E_USER_WARNING);
-    }
-    catch (Exception $e) {
-        $dwoo->triggerError('Include : ' . $e->getMessage(), E_USER_WARNING);
-    }
+	try {
+		$include = $dwoo->templateFactory($resource, $identifier, $cache_time, $cache_id, $compile_id);
+	}
+	catch (SecurityException $e) {
+		$dwoo->triggerError('Include : Security restriction : ' . $e->getMessage(), E_USER_WARNING);
+	}
+	catch (Exception $e) {
+		$dwoo->triggerError('Include : ' . $e->getMessage(), E_USER_WARNING);
+	}
 
-    if ($include === null) {
-        $dwoo->triggerError('Include : Resource "' . $resource . ':' . $identifier . '" not found.', E_USER_WARNING);
-    } elseif ($include === false) {
-        $dwoo->triggerError('Include : Resource "' . $resource . '" does not support includes.', E_USER_WARNING);
-    }
+	if ($include === null) {
+		$dwoo->triggerError('Include : Resource "' . $resource . ':' . $identifier . '" not found.', E_USER_WARNING);
+	} elseif ($include === false) {
+		$dwoo->triggerError('Include : Resource "' . $resource . '" does not support includes.', E_USER_WARNING);
+	}
 
-    if (is_string($data)) {
-        $vars = $dwoo->readVar($data);
-    } else {
-        $vars = $data;
-    }
+	if (is_string($data)) {
+		$vars = $dwoo->readVar($data);
+	} else {
+		$vars = $data;
+	}
 
-    if (count($rest)) {
-        $vars = $rest + $vars;
-    }
+	if (count($rest)) {
+		$vars = $rest + $vars;
+	}
 
-    $clone = clone $dwoo;
-    $out   = $clone->get($include, $vars);
+	$clone = clone $dwoo;
+	$out   = $clone->get($include, $vars);
 
-    if ($assign !== null) {
-        $dwoo->assignInScope($out, $assign);
-    }
+	if ($assign !== null) {
+		$dwoo->assignInScope($out, $assign);
+	}
 
-    foreach ($clone->getReturnValues() as $name => $value) {
-        $dwoo->assignInScope($value, $name);
-    }
+	foreach ($clone->getReturnValues() as $name => $value) {
+		$dwoo->assignInScope($value, $name);
+	}
 
-    if ($assign === null) {
-        return $out;
-    }
+	if ($assign === null) {
+		return $out;
+	}
 }

Spacing +5 added lines, -5 removed lines

@@ -54,16 +54,16 @@ 
         $include = $dwoo->templateFactory($resource, $identifier, $cache_time, $cache_id, $compile_id);
     }
     catch (SecurityException $e) {
-        $dwoo->triggerError('Include : Security restriction : ' . $e->getMessage(), E_USER_WARNING);
+        $dwoo->triggerError('Include : Security restriction : '.$e->getMessage(), E_USER_WARNING);
     }
     catch (Exception $e) {
-        $dwoo->triggerError('Include : ' . $e->getMessage(), E_USER_WARNING);
+        $dwoo->triggerError('Include : '.$e->getMessage(), E_USER_WARNING);
     }
 
     if ($include === null) {
-        $dwoo->triggerError('Include : Resource "' . $resource . ':' . $identifier . '" not found.', E_USER_WARNING);
+        $dwoo->triggerError('Include : Resource "'.$resource.':'.$identifier.'" not found.', E_USER_WARNING);
     } elseif ($include === false) {
-        $dwoo->triggerError('Include : Resource "' . $resource . '" does not support includes.', E_USER_WARNING);
+        $dwoo->triggerError('Include : Resource "'.$resource.'" does not support includes.', E_USER_WARNING);
     }
 
     if (is_string($data)) {
@@ -73,7 +73,7 @@ 
     }
 
     if (count($rest)) {
-        $vars = $rest + $vars;
+        $vars = $rest+$vars;
     }
 
     $clone = clone $dwoo;

Braces +2 added lines, -4 removed lines

@@ -52,11 +52,9 @@
 
     try {
         $include = $dwoo->templateFactory($resource, $identifier, $cache_time, $cache_id, $compile_id);
-    }
-    catch (SecurityException $e) {
+    } catch (SecurityException $e) {
         $dwoo->triggerError('Include : Security restriction : ' . $e->getMessage(), E_USER_WARNING);
-    }
-    catch (Exception $e) {
+    } catch (Exception $e) {
         $dwoo->triggerError('Include : ' . $e->getMessage(), E_USER_WARNING);
     }
 

lib/Dwoo/Plugins/Functions/PluginCountWordsCompile.php

Indentation +1 added lines, -1 removed lines

@@ -28,5 +28,5 @@
  */
 function PluginCountWordsCompile(Compiler $compiler, $value)
 {
-    return 'preg_match_all(strcasecmp($this->charset, \'utf-8\')===0 ? \'#[\w\pL]+#u\' : \'#\w+#\', ' . $value . ', $tmp)';
+	return 'preg_match_all(strcasecmp($this->charset, \'utf-8\')===0 ? \'#[\w\pL]+#u\' : \'#\w+#\', ' . $value . ', $tmp)';
 }

Spacing +1 added lines, -1 removed lines

@@ -28,5 +28,5 @@
  */
 function PluginCountWordsCompile(Compiler $compiler, $value)
 {
-    return 'preg_match_all(strcasecmp($this->charset, \'utf-8\')===0 ? \'#[\w\pL]+#u\' : \'#\w+#\', ' . $value . ', $tmp)';
+    return 'preg_match_all(strcasecmp($this->charset, \'utf-8\')===0 ? \'#[\w\pL]+#u\' : \'#\w+#\', '.$value.', $tmp)';
 }

lib/Dwoo/Plugins/Functions/PluginIndentCompile.php

Indentation +1 added lines, -1 removed lines

@@ -30,5 +30,5 @@
  */
 function PluginIndentCompile(Compiler $compiler, $value, $by = 4, $char = ' ')
 {
-    return "preg_replace('#^#m', '" . str_repeat(substr($char, 1, - 1), trim($by, '"\'')) . "', $value)";
+	return "preg_replace('#^#m', '" . str_repeat(substr($char, 1, - 1), trim($by, '"\'')) . "', $value)";
 }

Spacing +1 added lines, -1 removed lines

@@ -30,5 +30,5 @@
  */
 function PluginIndentCompile(Compiler $compiler, $value, $by = 4, $char = ' ')
 {
-    return "preg_replace('#^#m', '" . str_repeat(substr($char, 1, - 1), trim($by, '"\'')) . "', $value)";
+    return "preg_replace('#^#m', '".str_repeat(substr($char, 1, - 1), trim($by, '"\''))."', $value)";
 }

lib/Dwoo/Plugins/Functions/PluginCountCharactersCompile.php

Indentation +5 added lines, -5 removed lines

@@ -29,9 +29,9 @@
  */
 function PluginCountCharactersCompile(Compiler $compiler, $value, $count_spaces = false)
 {
-    if ($count_spaces === 'false') {
-        return 'preg_match_all(\'#[^\s\pZ]#u\', ' . $value . ', $tmp)';
-    } else {
-        return 'mb_strlen(' . $value . ', $this->charset)';
-    }
+	if ($count_spaces === 'false') {
+		return 'preg_match_all(\'#[^\s\pZ]#u\', ' . $value . ', $tmp)';
+	} else {
+		return 'mb_strlen(' . $value . ', $this->charset)';
+	}
 }

Spacing +2 added lines, -2 removed lines

@@ -30,8 +30,8 @@
 function PluginCountCharactersCompile(Compiler $compiler, $value, $count_spaces = false)
 {
     if ($count_spaces === 'false') {
-        return 'preg_match_all(\'#[^\s\pZ]#u\', ' . $value . ', $tmp)';
+        return 'preg_match_all(\'#[^\s\pZ]#u\', '.$value.', $tmp)';
     } else {
-        return 'mb_strlen(' . $value . ', $this->charset)';
+        return 'mb_strlen('.$value.', $this->charset)';
     }
 }

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

Indentation +5 added lines, -5 removed lines

@@ -34,10 +34,10 @@
  */
 function PluginReturnCompile(Compiler $compiler, array $rest = array())
 {
-    $out = array();
-    foreach ($rest as $var => $val) {
-        $out[] = '$this->setReturnValue(' . var_export($var, true) . ', ' . $val . ')';
-    }
+	$out = array();
+	foreach ($rest as $var => $val) {
+		$out[] = '$this->setReturnValue(' . var_export($var, true) . ', ' . $val . ')';
+	}
 
-    return '(' . implode('.', $out) . ')';
+	return '(' . implode('.', $out) . ')';
 }

Spacing +2 added lines, -2 removed lines

@@ -36,8 +36,8 @@
 {
     $out = array();
     foreach ($rest as $var => $val) {
-        $out[] = '$this->setReturnValue(' . var_export($var, true) . ', ' . $val . ')';
+        $out[] = '$this->setReturnValue('.var_export($var, true).', '.$val.')';
     }
 
-    return '(' . implode('.', $out) . ')';
+    return '('.implode('.', $out).')';
 }