dwoo-project / dwoo

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);
+	}
 }

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;
+	}
 }

lib/Dwoo/Plugins/Processors/PluginSmartyCompatible.php

Indentation +58 added lines, -58 removed lines

@@ -26,69 +26,69 @@
  */
 class PluginSmartyCompatible extends Processor
 {
-    /**
-     * @param string $input
-     *
-     * @return mixed
-     */
-    public function process($input)
-    {
-        list($l, $r) = $this->compiler->getDelimiters();
+	/**
+	 * @param string $input
+	 *
+	 * @return mixed
+	 */
+	public function process($input)
+	{
+		list($l, $r) = $this->compiler->getDelimiters();
 
-        $rl           = preg_quote($l, '/');
-        $rr           = preg_quote($r, '/');
-        $sectionParam = '(?:(name|loop|start|step|max|show)\s*=\s*(\S+))?\s*';
-        $input        = preg_replace_callback('/' . $rl . '\s*section ' . str_repeat($sectionParam, 6) . '\s*' . $rr . '(.+?)(?:' . $rl . '\s*sectionelse\s*' . $rr . '(.+?))?' . $rl . '\s*\/section\s*' . $rr . '/is', array(
-            $this,
-            'convertSection'
-        ), $input);
-        $input        = str_replace('$smarty.section.', '$smarty.for.', $input);
+		$rl           = preg_quote($l, '/');
+		$rr           = preg_quote($r, '/');
+		$sectionParam = '(?:(name|loop|start|step|max|show)\s*=\s*(\S+))?\s*';
+		$input        = preg_replace_callback('/' . $rl . '\s*section ' . str_repeat($sectionParam, 6) . '\s*' . $rr . '(.+?)(?:' . $rl . '\s*sectionelse\s*' . $rr . '(.+?))?' . $rl . '\s*\/section\s*' . $rr . '/is', array(
+			$this,
+			'convertSection'
+		), $input);
+		$input        = str_replace('$smarty.section.', '$smarty.for.', $input);
 
-        $smarty = array(
-            '/' . $rl . '\s*ldelim\s*' . $rr . '/',
-            '/' . $rl . '\s*rdelim\s*' . $rr . '/',
-            '/' . $rl . '\s*\$smarty\.ldelim\s*' . $rr . '/',
-            '/' . $rl . '\s*\$smarty\.rdelim\s*' . $rr . '/',
-            '/\$smarty\./',
-            '/' . $rl . '\s*php\s*' . $rr . '/',
-            '/' . $rl . '\s*\/php\s*' . $rr . '/',
-            '/\|(@?)strip(\||' . $rr . ')/',
-            '/' . $rl . '\s*sectionelse\s*' . $rr . '/',
-        );
+		$smarty = array(
+			'/' . $rl . '\s*ldelim\s*' . $rr . '/',
+			'/' . $rl . '\s*rdelim\s*' . $rr . '/',
+			'/' . $rl . '\s*\$smarty\.ldelim\s*' . $rr . '/',
+			'/' . $rl . '\s*\$smarty\.rdelim\s*' . $rr . '/',
+			'/\$smarty\./',
+			'/' . $rl . '\s*php\s*' . $rr . '/',
+			'/' . $rl . '\s*\/php\s*' . $rr . '/',
+			'/\|(@?)strip(\||' . $rr . ')/',
+			'/' . $rl . '\s*sectionelse\s*' . $rr . '/',
+		);
 
-        $dwoo = array(
-            '\\' . $l,
-            $r,
-            '\\' . $l,
-            $r,
-            '$dwoo.',
-            '<?php ',
-            ' ?>',
-            '|$1whitespace$2',
-            $l . 'else' . $r,
-        );
+		$dwoo = array(
+			'\\' . $l,
+			$r,
+			'\\' . $l,
+			$r,
+			'$dwoo.',
+			'<?php ',
+			' ?>',
+			'|$1whitespace$2',
+			$l . 'else' . $r,
+		);
 
-        if (preg_match('{\|@([a-z][a-z0-9_]*)}i', $input, $matches)) {
-            trigger_error('The Smarty Compatibility Module has detected that you use |@' . $matches[1] . ' in your template, this might lead to problems as Dwoo interprets the @ operator differently than Smarty, see http://wiki.dwoo.org/index.php/Syntax#The_.40_Operator', E_USER_NOTICE);
-        }
+		if (preg_match('{\|@([a-z][a-z0-9_]*)}i', $input, $matches)) {
+			trigger_error('The Smarty Compatibility Module has detected that you use |@' . $matches[1] . ' in your template, this might lead to problems as Dwoo interprets the @ operator differently than Smarty, see http://wiki.dwoo.org/index.php/Syntax#The_.40_Operator', E_USER_NOTICE);
+		}
 
-        return preg_replace($smarty, $dwoo, $input);
-    }
+		return preg_replace($smarty, $dwoo, $input);
+	}
 
-    /**
-     * @param array $matches
-     *
-     * @return mixed
-     */
-    protected function convertSection(array $matches)
-    {
-        $params = array();
-        $index  = 1;
-        while (!empty($matches[$index]) && $index < 13) {
-            $params[$matches[$index]] = $matches[$index + 1];
-            $index += 2;
-        }
+	/**
+	 * @param array $matches
+	 *
+	 * @return mixed
+	 */
+	protected function convertSection(array $matches)
+	{
+		$params = array();
+		$index  = 1;
+		while (!empty($matches[$index]) && $index < 13) {
+			$params[$matches[$index]] = $matches[$index + 1];
+			$index += 2;
+		}
 
-        return str_replace('[' . trim($params['name'], '"\'') . ']', '[$' . trim($params['name'], '"\'') . ']', $matches[0]);
-    }
+		return str_replace('[' . trim($params['name'], '"\'') . ']', '[$' . trim($params['name'], '"\'') . ']', $matches[0]);
+	}
 }

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;
+	}
 }

lib/Dwoo/Plugins/Functions/PluginCounter.php

Indentation +50 added lines, -50 removed lines

@@ -34,61 +34,61 @@
  */
 class PluginCounter extends Plugin
 {
-    protected $counters = array();
+	protected $counters = array();
 
-    /**
-     * @param string $name
-     * @param null   $start
-     * @param null   $skip
-     * @param null   $direction
-     * @param null   $print
-     * @param null   $assign
-     *
-     * @return mixed
-     */
-    public function process($name = 'default', $start = null, $skip = null, $direction = null, $print = null, $assign = null)
-    {
-        // init counter
-        if (!isset($this->counters[$name])) {
-            $this->counters[$name] = array(
-                'count'     => $start === null ? 1 : (int)$start,
-                'skip'      => $skip === null ? 1 : (int)$skip,
-                'print'     => $print === null ? true : (bool)$print,
-                'assign'    => $assign === null ? null : (string)$assign,
-                'direction' => strtolower($direction) === 'down' ? - 1 : 1,
-            );
-        } // increment
-        else {
-            // override setting if present
-            if ($skip !== null) {
-                $this->counters[$name]['skip'] = (int)$skip;
-            }
+	/**
+	 * @param string $name
+	 * @param null   $start
+	 * @param null   $skip
+	 * @param null   $direction
+	 * @param null   $print
+	 * @param null   $assign
+	 *
+	 * @return mixed
+	 */
+	public function process($name = 'default', $start = null, $skip = null, $direction = null, $print = null, $assign = null)
+	{
+		// init counter
+		if (!isset($this->counters[$name])) {
+			$this->counters[$name] = array(
+				'count'     => $start === null ? 1 : (int)$start,
+				'skip'      => $skip === null ? 1 : (int)$skip,
+				'print'     => $print === null ? true : (bool)$print,
+				'assign'    => $assign === null ? null : (string)$assign,
+				'direction' => strtolower($direction) === 'down' ? - 1 : 1,
+			);
+		} // increment
+		else {
+			// override setting if present
+			if ($skip !== null) {
+				$this->counters[$name]['skip'] = (int)$skip;
+			}
 
-            if ($direction !== null) {
-                $this->counters[$name]['direction'] = strtolower($direction) === 'down' ? - 1 : 1;
-            }
+			if ($direction !== null) {
+				$this->counters[$name]['direction'] = strtolower($direction) === 'down' ? - 1 : 1;
+			}
 
-            if ($print !== null) {
-                $this->counters[$name]['print'] = (bool)$print;
-            }
+			if ($print !== null) {
+				$this->counters[$name]['print'] = (bool)$print;
+			}
 
-            if ($assign !== null) {
-                $this->counters[$name]['assign'] = (string)$assign;
-            }
+			if ($assign !== null) {
+				$this->counters[$name]['assign'] = (string)$assign;
+			}
 
-            if ($start !== null) {
-                $this->counters[$name]['count'] = (int)$start;
-            } else {
-                $this->counters[$name]['count'] += ($this->counters[$name]['skip'] * $this->counters[$name]['direction']);
-            }
-        }
+			if ($start !== null) {
+				$this->counters[$name]['count'] = (int)$start;
+			} else {
+				$this->counters[$name]['count'] += ($this->counters[$name]['skip'] * $this->counters[$name]['direction']);
+			}
+		}
 
-        $out = $this->counters[$name]['count'];
+		$out = $this->counters[$name]['count'];
 
-        if ($this->counters[$name]['assign'] !== null) {
-            $this->core->assignInScope($out, $this->counters[$name]['assign']);
-        } elseif ($this->counters[$name]['print'] === true) {
-            return $out;
-        }
-    }
+		if ($this->counters[$name]['assign'] !== null) {
+			$this->core->assignInScope($out, $this->counters[$name]['assign']);
+		} elseif ($this->counters[$name]['print'] === true) {
+			return $out;
+		}
+	}
 }

lib/Dwoo/Plugins/Blocks/PluginForeachelse.php

Indentation +37 added lines, -37 removed lines

@@ -27,47 +27,47 @@
  */
 class PluginForeachelse extends BlockPlugin implements ICompilableBlock
 {
-    public function init()
-    {
-    }
+	public function init()
+	{
+	}
 
-    /**
-     * @param Compiler $compiler
-     * @param array    $params
-     * @param string   $prepend
-     * @param string   $append
-     * @param string   $type
-     *
-     * @return string
-     */
-    public static function preProcessing(Compiler $compiler, array $params, $prepend, $append, $type)
-    {
-        $with = &$compiler->findBlock('foreach', true);
+	/**
+	 * @param Compiler $compiler
+	 * @param array    $params
+	 * @param string   $prepend
+	 * @param string   $append
+	 * @param string   $type
+	 *
+	 * @return string
+	 */
+	public static function preProcessing(Compiler $compiler, array $params, $prepend, $append, $type)
+	{
+		$with = &$compiler->findBlock('foreach', true);
 
-        $params['initialized'] = true;
-        $compiler->injectBlock($type, $params);
+		$params['initialized'] = true;
+		$compiler->injectBlock($type, $params);
 
-        return '';
-    }
+		return '';
+	}
 
-    /**
-     * @param Compiler $compiler
-     * @param array    $params
-     * @param string   $prepend
-     * @param string   $append
-     * @param string   $content
-     *
-     * @return string
-     */
-    public static function postProcessing(Compiler $compiler, array $params, $prepend, $append, $content)
-    {
-        if (!isset($params['initialized'])) {
-            return '';
-        }
+	/**
+	 * @param Compiler $compiler
+	 * @param array    $params
+	 * @param string   $prepend
+	 * @param string   $append
+	 * @param string   $content
+	 *
+	 * @return string
+	 */
+	public static function postProcessing(Compiler $compiler, array $params, $prepend, $append, $content)
+	{
+		if (!isset($params['initialized'])) {
+			return '';
+		}
 
-        $block                      = &$compiler->getCurrentBlock();
-        $block['params']['hasElse'] = Compiler::PHP_OPEN . "else {\n" . Compiler::PHP_CLOSE . $content . Compiler::PHP_OPEN . "\n}" . Compiler::PHP_CLOSE;
+		$block                      = &$compiler->getCurrentBlock();
+		$block['params']['hasElse'] = Compiler::PHP_OPEN . "else {\n" . Compiler::PHP_CLOSE . $content . Compiler::PHP_OPEN . "\n}" . Compiler::PHP_CLOSE;
 
-        return '';
-    }
+		return '';
+	}
 }

lib/Dwoo/Plugins/Blocks/PluginIf.php

Indentation +220 added lines, -220 removed lines

@@ -41,234 +41,234 @@
  */
 class PluginIf extends BlockPlugin implements ICompilableBlock, IElseable
 {
-    /**
-     * @param array $rest
-     */
-    public function init(array $rest)
-    {
-    }
+	/**
+	 * @param array $rest
+	 */
+	public function init(array $rest)
+	{
+	}
 
-    /**
-     * @param array    $params
-     * @param array    $tokens
-     * @param Compiler $compiler
-     *
-     * @return array
-     * @throws CompilationException
-     */
-    public static function replaceKeywords(array $params, array $tokens, Compiler $compiler)
-    {
-        $p = array();
+	/**
+	 * @param array    $params
+	 * @param array    $tokens
+	 * @param Compiler $compiler
+	 *
+	 * @return array
+	 * @throws CompilationException
+	 */
+	public static function replaceKeywords(array $params, array $tokens, Compiler $compiler)
+	{
+		$p = array();
 
-        reset($params);
-        while (list($k, $v) = each($params)) {
-            $v = (string)$v;
-            if (substr($v, 0, 1) === '"' || substr($v, 0, 1) === '\'') {
-                $vmod = strtolower(substr($v, 1, - 1));
-            } else {
-                $vmod = strtolower($v);
-            }
-            switch ($vmod) {
+		reset($params);
+		while (list($k, $v) = each($params)) {
+			$v = (string)$v;
+			if (substr($v, 0, 1) === '"' || substr($v, 0, 1) === '\'') {
+				$vmod = strtolower(substr($v, 1, - 1));
+			} else {
+				$vmod = strtolower($v);
+			}
+			switch ($vmod) {
 
-                case 'and':
-                    if ($tokens[$k] === Compiler::T_UNQUOTED_STRING) {
-                        $p[] = '&&';
-                    } else {
-                        $p[] = $v;
-                    }
-                    break;
-                case 'or':
-                    if ($tokens[$k] === Compiler::T_UNQUOTED_STRING) {
-                        $p[] = '||';
-                    } else {
-                        $p[] = $v;
-                    }
-                    break;
-                case 'xor':
-                    if ($tokens[$k] === Compiler::T_UNQUOTED_STRING) {
-                        $p[] = '^';
-                    } else {
-                        $p[] = $v;
-                    }
-                    break;
-                case 'eq':
-                    if ($tokens[$k] === Compiler::T_UNQUOTED_STRING) {
-                        $p[] = '==';
-                    } else {
-                        $p[] = $v;
-                    }
-                    break;
-                case 'ne':
-                case 'neq':
-                    if ($tokens[$k] === Compiler::T_UNQUOTED_STRING) {
-                        $p[] = '!=';
-                    } else {
-                        $p[] = $v;
-                    }
-                    break;
-                case 'gte':
-                case 'ge':
-                    if ($tokens[$k] === Compiler::T_UNQUOTED_STRING) {
-                        $p[] = '>=';
-                    } else {
-                        $p[] = $v;
-                    }
-                    break;
-                case 'lte':
-                case 'le':
-                    if ($tokens[$k] === Compiler::T_UNQUOTED_STRING) {
-                        $p[] = '<=';
-                    } else {
-                        $p[] = $v;
-                    }
-                    break;
-                case 'gt':
-                    if ($tokens[$k] === Compiler::T_UNQUOTED_STRING) {
-                        $p[] = '>';
-                    } else {
-                        $p[] = $v;
-                    }
-                    break;
-                case 'lt':
-                    if ($tokens[$k] === Compiler::T_UNQUOTED_STRING) {
-                        $p[] = '<';
-                    } else {
-                        $p[] = $v;
-                    }
-                    break;
-                case 'mod':
-                    if ($tokens[$k] === Compiler::T_UNQUOTED_STRING) {
-                        $p[] = '%';
-                    } else {
-                        $p[] = $v;
-                    }
-                    break;
-                case 'not':
-                    if ($tokens[$k] === Compiler::T_UNQUOTED_STRING) {
-                        $p[] = '!';
-                    } else {
-                        $p[] = $v;
-                    }
-                    break;
-                case '<>':
-                    $p[] = '!=';
-                    break;
-                case '==':
-                case '!=':
-                case '>=':
-                case '<=':
-                case '>':
-                case '<':
-                case '===':
-                case '!==':
-                case '%':
-                case '!':
-                case '^':
-                    $p[] = $vmod;
-                    break;
-                case 'is':
-                    if ($tokens[$k] !== Compiler::T_UNQUOTED_STRING) {
-                        $p[] = $v;
-                        break;
-                    }
-                    if (isset($params[$k + 1]) && strtolower(trim($params[$k + 1], '"\'')) === 'not' && $tokens[$k + 1] === Compiler::T_UNQUOTED_STRING) {
-                        $negate = true;
-                        next($params);
-                    } else {
-                        $negate = false;
-                    }
-                    $ptr = 1 + (int)$negate;
-                    if ($tokens[$k + $ptr] !== Compiler::T_UNQUOTED_STRING) {
-                        break;
-                    }
-                    if (!isset($params[$k + $ptr])) {
-                        $params[$k + $ptr] = '';
-                    } else {
-                        $params[$k + $ptr] = trim($params[$k + $ptr], '"\'');
-                    }
-                    switch ($params[$k + $ptr]) {
+				case 'and':
+					if ($tokens[$k] === Compiler::T_UNQUOTED_STRING) {
+						$p[] = '&&';
+					} else {
+						$p[] = $v;
+					}
+					break;
+				case 'or':
+					if ($tokens[$k] === Compiler::T_UNQUOTED_STRING) {
+						$p[] = '||';
+					} else {
+						$p[] = $v;
+					}
+					break;
+				case 'xor':
+					if ($tokens[$k] === Compiler::T_UNQUOTED_STRING) {
+						$p[] = '^';
+					} else {
+						$p[] = $v;
+					}
+					break;
+				case 'eq':
+					if ($tokens[$k] === Compiler::T_UNQUOTED_STRING) {
+						$p[] = '==';
+					} else {
+						$p[] = $v;
+					}
+					break;
+				case 'ne':
+				case 'neq':
+					if ($tokens[$k] === Compiler::T_UNQUOTED_STRING) {
+						$p[] = '!=';
+					} else {
+						$p[] = $v;
+					}
+					break;
+				case 'gte':
+				case 'ge':
+					if ($tokens[$k] === Compiler::T_UNQUOTED_STRING) {
+						$p[] = '>=';
+					} else {
+						$p[] = $v;
+					}
+					break;
+				case 'lte':
+				case 'le':
+					if ($tokens[$k] === Compiler::T_UNQUOTED_STRING) {
+						$p[] = '<=';
+					} else {
+						$p[] = $v;
+					}
+					break;
+				case 'gt':
+					if ($tokens[$k] === Compiler::T_UNQUOTED_STRING) {
+						$p[] = '>';
+					} else {
+						$p[] = $v;
+					}
+					break;
+				case 'lt':
+					if ($tokens[$k] === Compiler::T_UNQUOTED_STRING) {
+						$p[] = '<';
+					} else {
+						$p[] = $v;
+					}
+					break;
+				case 'mod':
+					if ($tokens[$k] === Compiler::T_UNQUOTED_STRING) {
+						$p[] = '%';
+					} else {
+						$p[] = $v;
+					}
+					break;
+				case 'not':
+					if ($tokens[$k] === Compiler::T_UNQUOTED_STRING) {
+						$p[] = '!';
+					} else {
+						$p[] = $v;
+					}
+					break;
+				case '<>':
+					$p[] = '!=';
+					break;
+				case '==':
+				case '!=':
+				case '>=':
+				case '<=':
+				case '>':
+				case '<':
+				case '===':
+				case '!==':
+				case '%':
+				case '!':
+				case '^':
+					$p[] = $vmod;
+					break;
+				case 'is':
+					if ($tokens[$k] !== Compiler::T_UNQUOTED_STRING) {
+						$p[] = $v;
+						break;
+					}
+					if (isset($params[$k + 1]) && strtolower(trim($params[$k + 1], '"\'')) === 'not' && $tokens[$k + 1] === Compiler::T_UNQUOTED_STRING) {
+						$negate = true;
+						next($params);
+					} else {
+						$negate = false;
+					}
+					$ptr = 1 + (int)$negate;
+					if ($tokens[$k + $ptr] !== Compiler::T_UNQUOTED_STRING) {
+						break;
+					}
+					if (!isset($params[$k + $ptr])) {
+						$params[$k + $ptr] = '';
+					} else {
+						$params[$k + $ptr] = trim($params[$k + $ptr], '"\'');
+					}
+					switch ($params[$k + $ptr]) {
 
-                        case 'div':
-                            if (isset($params[$k + $ptr + 1]) && strtolower(trim($params[$k + $ptr + 1], '"\'')) === 'by') {
-                                $p[] = ' % ' . $params[$k + $ptr + 2] . ' ' . ($negate ? '!' : '=') . '== 0';
-                                next($params);
-                                next($params);
-                                next($params);
-                            } else {
-                                throw new CompilationException($compiler, 'If : Syntax error : syntax should be "if $a is [not] div by $b", found ' . $params[$k - 1] . ' is ' . ($negate ? 'not ' : '') . 'div ' . $params[$k + $ptr + 1] . ' ' . $params[$k + $ptr + 2]);
-                            }
-                            break;
-                        case 'even':
-                            $a = array_pop($p);
-                            if (isset($params[$k + $ptr + 1]) && strtolower(trim($params[$k + $ptr + 1], '"\'')) === 'by') {
-                                $b   = $params[$k + $ptr + 2];
-                                $p[] = '(' . $a . ' / ' . $b . ') % 2 ' . ($negate ? '!' : '=') . '== 0';
-                                next($params);
-                                next($params);
-                            } else {
-                                $p[] = $a . ' % 2 ' . ($negate ? '!' : '=') . '== 0';
-                            }
-                            next($params);
-                            break;
-                        case 'odd':
-                            $a = array_pop($p);
-                            if (isset($params[$k + $ptr + 1]) && strtolower(trim($params[$k + $ptr + 1], '"\'')) === 'by') {
-                                $b   = $params[$k + $ptr + 2];
-                                $p[] = '(' . $a . ' / ' . $b . ') % 2 ' . ($negate ? '=' : '!') . '== 0';
-                                next($params);
-                                next($params);
-                            } else {
-                                $p[] = $a . ' % 2 ' . ($negate ? '=' : '!') . '== 0';
-                            }
-                            next($params);
-                            break;
-                        default:
-                            throw new CompilationException($compiler, 'If : Syntax error : syntax should be "if $a is [not] (div|even|odd) [by $b]", found ' . $params[$k - 1] . ' is ' . $params[$k + $ptr + 1]);
-                    }
-                    break;
-                default:
-                    $p[] = $v;
-            }
-        }
+						case 'div':
+							if (isset($params[$k + $ptr + 1]) && strtolower(trim($params[$k + $ptr + 1], '"\'')) === 'by') {
+								$p[] = ' % ' . $params[$k + $ptr + 2] . ' ' . ($negate ? '!' : '=') . '== 0';
+								next($params);
+								next($params);
+								next($params);
+							} else {
+								throw new CompilationException($compiler, 'If : Syntax error : syntax should be "if $a is [not] div by $b", found ' . $params[$k - 1] . ' is ' . ($negate ? 'not ' : '') . 'div ' . $params[$k + $ptr + 1] . ' ' . $params[$k + $ptr + 2]);
+							}
+							break;
+						case 'even':
+							$a = array_pop($p);
+							if (isset($params[$k + $ptr + 1]) && strtolower(trim($params[$k + $ptr + 1], '"\'')) === 'by') {
+								$b   = $params[$k + $ptr + 2];
+								$p[] = '(' . $a . ' / ' . $b . ') % 2 ' . ($negate ? '!' : '=') . '== 0';
+								next($params);
+								next($params);
+							} else {
+								$p[] = $a . ' % 2 ' . ($negate ? '!' : '=') . '== 0';
+							}
+							next($params);
+							break;
+						case 'odd':
+							$a = array_pop($p);
+							if (isset($params[$k + $ptr + 1]) && strtolower(trim($params[$k + $ptr + 1], '"\'')) === 'by') {
+								$b   = $params[$k + $ptr + 2];
+								$p[] = '(' . $a . ' / ' . $b . ') % 2 ' . ($negate ? '=' : '!') . '== 0';
+								next($params);
+								next($params);
+							} else {
+								$p[] = $a . ' % 2 ' . ($negate ? '=' : '!') . '== 0';
+							}
+							next($params);
+							break;
+						default:
+							throw new CompilationException($compiler, 'If : Syntax error : syntax should be "if $a is [not] (div|even|odd) [by $b]", found ' . $params[$k - 1] . ' is ' . $params[$k + $ptr + 1]);
+					}
+					break;
+				default:
+					$p[] = $v;
+			}
+		}
 
-        return $p;
-    }
+		return $p;
+	}
 
-    /**
-     * @param Compiler $compiler
-     * @param array    $params
-     * @param string   $prepend
-     * @param string   $append
-     * @param string   $type
-     *
-     * @return string
-     */
-    public static function preProcessing(Compiler $compiler, array $params, $prepend, $append, $type)
-    {
-        return '';
-    }
+	/**
+	 * @param Compiler $compiler
+	 * @param array    $params
+	 * @param string   $prepend
+	 * @param string   $append
+	 * @param string   $type
+	 *
+	 * @return string
+	 */
+	public static function preProcessing(Compiler $compiler, array $params, $prepend, $append, $type)
+	{
+		return '';
+	}
 
-    /**
-     * @param Compiler $compiler
-     * @param array    $params
-     * @param string   $prepend
-     * @param string   $append
-     * @param string   $content
-     *
-     * @return string
-     */
-    public static function postProcessing(Compiler $compiler, array $params, $prepend, $append, $content)
-    {
-        $tokens = $compiler->getParamTokens($params);
-        $params = $compiler->getCompiledParams($params);
-        $pre    = Compiler::PHP_OPEN . 'if (' . implode(' ', self::replaceKeywords($params['*'], $tokens['*'], $compiler)) . ") {\n" . Compiler::PHP_CLOSE;
+	/**
+	 * @param Compiler $compiler
+	 * @param array    $params
+	 * @param string   $prepend
+	 * @param string   $append
+	 * @param string   $content
+	 *
+	 * @return string
+	 */
+	public static function postProcessing(Compiler $compiler, array $params, $prepend, $append, $content)
+	{
+		$tokens = $compiler->getParamTokens($params);
+		$params = $compiler->getCompiledParams($params);
+		$pre    = Compiler::PHP_OPEN . 'if (' . implode(' ', self::replaceKeywords($params['*'], $tokens['*'], $compiler)) . ") {\n" . Compiler::PHP_CLOSE;
 
-        $post = Compiler::PHP_OPEN . "\n}" . Compiler::PHP_CLOSE;
+		$post = Compiler::PHP_OPEN . "\n}" . Compiler::PHP_CLOSE;
 
-        if (isset($params['hasElse'])) {
-            $post .= $params['hasElse'];
-        }
+		if (isset($params['hasElse'])) {
+			$post .= $params['hasElse'];
+		}
 
-        return $pre . $content . $post;
-    }
+		return $pre . $content . $post;
+	}
 }

lib/Dwoo/Plugins/Blocks/PluginBlock.php

Indentation +32 added lines, -32 removed lines

@@ -29,38 +29,38 @@
  */
 class PluginBlock extends BlockPlugin implements ICompilableBlock
 {
-    /**
-     * @param string $name
-     */
-    public function init($name = '')
-    {
-    }
+	/**
+	 * @param string $name
+	 */
+	public function init($name = '')
+	{
+	}
 
-    /**
-     * @param Compiler $compiler
-     * @param array    $params
-     * @param string   $prepend
-     * @param string   $append
-     * @param string   $type
-     *
-     * @return string
-     */
-    public static function preProcessing(Compiler $compiler, array $params, $prepend, $append, $type)
-    {
-        return '';
-    }
+	/**
+	 * @param Compiler $compiler
+	 * @param array    $params
+	 * @param string   $prepend
+	 * @param string   $append
+	 * @param string   $type
+	 *
+	 * @return string
+	 */
+	public static function preProcessing(Compiler $compiler, array $params, $prepend, $append, $type)
+	{
+		return '';
+	}
 
-    /**
-     * @param Compiler $compiler
-     * @param array    $params
-     * @param string   $prepend
-     * @param string   $append
-     * @param string   $content
-     *
-     * @return string
-     */
-    public static function postProcessing(Compiler $compiler, array $params, $prepend, $append, $content)
-    {
-        return $content;
-    }
+	/**
+	 * @param Compiler $compiler
+	 * @param array    $params
+	 * @param string   $prepend
+	 * @param string   $append
+	 * @param string   $content
+	 *
+	 * @return string
+	 */
+	public static function postProcessing(Compiler $compiler, array $params, $prepend, $append, $content)
+	{
+		return $content;
+	}
 }