dwoo-project / dwoo

lib/Dwoo/Plugins/Blocks/PluginDynamic.php

Indentation +78 added lines, -78 removed lines

@@ -28,89 +28,89 @@
  */
 class PluginDynamic 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)
-    {
-        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)
-    {
-        try {
-            $compiler->findBlock('dynamic');
+	/**
+	 * @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)
+	{
+		try {
+			$compiler->findBlock('dynamic');
 
-            return $content;
-        }
-        catch (CompilationException $e) {
-        }
-        $output = Compiler::PHP_OPEN . 'if($doCache) {' . "\n\t" . 'echo \'<dwoo:dynamic_\'.$dynamicId.\'>' . str_replace('\'', '\\\'', $content) . '</dwoo:dynamic_\'.$dynamicId.\'>\';' . "\n} else {\n\t";
-        if (substr($content, 0, strlen(Compiler::PHP_OPEN)) == Compiler::PHP_OPEN) {
-            $output .= substr($content, strlen(Compiler::PHP_OPEN));
-        } else {
-            $output .= Compiler::PHP_CLOSE . $content;
-        }
-        if (substr($output, - strlen(Compiler::PHP_CLOSE)) == Compiler::PHP_CLOSE) {
-            $output = substr($output, 0, - strlen(Compiler::PHP_CLOSE));
-        } else {
-            $output .= Compiler::PHP_OPEN;
-        }
-        $output .= "\n}" . Compiler::PHP_CLOSE;
+			return $content;
+		}
+		catch (CompilationException $e) {
+		}
+		$output = Compiler::PHP_OPEN . 'if($doCache) {' . "\n\t" . 'echo \'<dwoo:dynamic_\'.$dynamicId.\'>' . str_replace('\'', '\\\'', $content) . '</dwoo:dynamic_\'.$dynamicId.\'>\';' . "\n} else {\n\t";
+		if (substr($content, 0, strlen(Compiler::PHP_OPEN)) == Compiler::PHP_OPEN) {
+			$output .= substr($content, strlen(Compiler::PHP_OPEN));
+		} else {
+			$output .= Compiler::PHP_CLOSE . $content;
+		}
+		if (substr($output, - strlen(Compiler::PHP_CLOSE)) == Compiler::PHP_CLOSE) {
+			$output = substr($output, 0, - strlen(Compiler::PHP_CLOSE));
+		} else {
+			$output .= Compiler::PHP_OPEN;
+		}
+		$output .= "\n}" . Compiler::PHP_CLOSE;
 
-        return $output;
-    }
+		return $output;
+	}
 
-    /**
-     * @param $output
-     * @param $dynamicId
-     * @param $compiledFile
-     *
-     * @return mixed|string
-     */
-    public static function unescape($output, $dynamicId, $compiledFile)
-    {
-        $output = preg_replace_callback('/<dwoo:dynamic_(' . $dynamicId . ')>(.+?)<\/dwoo:dynamic_' . $dynamicId . '>/s', array(
-            'self',
-            'unescapePhp'
-        ), $output, - 1, $count);
-        // re-add the includes on top of the file
-        if ($count && preg_match('#/\* template head \*/(.+?)/\* end template head \*/#s', file_get_contents($compiledFile), $m)) {
-            $output = '<?php ' . $m[1] . ' ?>' . $output;
-        }
+	/**
+	 * @param $output
+	 * @param $dynamicId
+	 * @param $compiledFile
+	 *
+	 * @return mixed|string
+	 */
+	public static function unescape($output, $dynamicId, $compiledFile)
+	{
+		$output = preg_replace_callback('/<dwoo:dynamic_(' . $dynamicId . ')>(.+?)<\/dwoo:dynamic_' . $dynamicId . '>/s', array(
+			'self',
+			'unescapePhp'
+		), $output, - 1, $count);
+		// re-add the includes on top of the file
+		if ($count && preg_match('#/\* template head \*/(.+?)/\* end template head \*/#s', file_get_contents($compiledFile), $m)) {
+			$output = '<?php ' . $m[1] . ' ?>' . $output;
+		}
 
-        return $output;
-    }
+		return $output;
+	}
 
-    /**
-     * @param $match
-     *
-     * @return mixed
-     */
-    public static function unescapePhp($match)
-    {
-        return preg_replace('{<\?php /\*' . $match[1] . '\*/ echo \'(.+?)\'; \?>}s', '$1', $match[2]);
-    }
+	/**
+	 * @param $match
+	 *
+	 * @return mixed
+	 */
+	public static function unescapePhp($match)
+	{
+		return preg_replace('{<\?php /\*' . $match[1] . '\*/ echo \'(.+?)\'; \?>}s', '$1', $match[2]);
+	}
 }

lib/Dwoo/Plugins/Blocks/PluginWithelse.php

Indentation +37 added lines, -37 removed lines

@@ -27,47 +27,47 @@
  */
 class PluginWithelse 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('with', 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('with', 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/PluginTextformat.php

Indentation +71 added lines, -71 removed lines

@@ -36,84 +36,84 @@
  */
 class PluginTextformat extends BlockPlugin
 {
-    protected $wrap;
-    protected $wrapChar;
-    protected $wrapCut;
-    protected $indent;
-    protected $indChar;
-    protected $indFirst;
-    protected $assign;
+	protected $wrap;
+	protected $wrapChar;
+	protected $wrapCut;
+	protected $indent;
+	protected $indChar;
+	protected $indFirst;
+	protected $assign;
 
-    /**
-     * @param int    $wrap
-     * @param string $wrap_char
-     * @param bool   $wrap_cut
-     * @param int    $indent
-     * @param string $indent_char
-     * @param int    $indent_first
-     * @param string $style
-     * @param string $assign
-     */
-    public function init($wrap = 80, $wrap_char = "\r\n", $wrap_cut = false, $indent = 0, $indent_char = ' ', $indent_first = 0, $style = '', $assign = '')
-    {
-        if ($indent_char === 'tab') {
-            $indent_char = "\t";
-        }
+	/**
+	 * @param int    $wrap
+	 * @param string $wrap_char
+	 * @param bool   $wrap_cut
+	 * @param int    $indent
+	 * @param string $indent_char
+	 * @param int    $indent_first
+	 * @param string $style
+	 * @param string $assign
+	 */
+	public function init($wrap = 80, $wrap_char = "\r\n", $wrap_cut = false, $indent = 0, $indent_char = ' ', $indent_first = 0, $style = '', $assign = '')
+	{
+		if ($indent_char === 'tab') {
+			$indent_char = "\t";
+		}
 
-        switch ($style) {
+		switch ($style) {
 
-            case 'email':
-                $wrap         = 72;
-                $indent_first = 0;
-                break;
-            case 'html':
-                $wrap_char   = '<br />';
-                $indent_char = $indent_char == "\t" ? '&nbsp;&nbsp;&nbsp;&nbsp;' : '&nbsp;';
-                break;
-        }
+			case 'email':
+				$wrap         = 72;
+				$indent_first = 0;
+				break;
+			case 'html':
+				$wrap_char   = '<br />';
+				$indent_char = $indent_char == "\t" ? '&nbsp;&nbsp;&nbsp;&nbsp;' : '&nbsp;';
+				break;
+		}
 
-        $this->wrap     = (int)$wrap;
-        $this->wrapChar = (string)$wrap_char;
-        $this->wrapCut  = (bool)$wrap_cut;
-        $this->indent   = (int)$indent;
-        $this->indChar  = (string)$indent_char;
-        $this->indFirst = (int)$indent_first + $this->indent;
-        $this->assign   = (string)$assign;
-    }
+		$this->wrap     = (int)$wrap;
+		$this->wrapChar = (string)$wrap_char;
+		$this->wrapCut  = (bool)$wrap_cut;
+		$this->indent   = (int)$indent;
+		$this->indChar  = (string)$indent_char;
+		$this->indFirst = (int)$indent_first + $this->indent;
+		$this->assign   = (string)$assign;
+	}
 
-    /**
-     * @return string
-     */
-    public function process()
-    {
-        // gets paragraphs
-        $pgs = explode("\n", str_replace(array(
-            "\r\n",
-            "\r"
-        ), "\n", $this->buffer));
+	/**
+	 * @return string
+	 */
+	public function process()
+	{
+		// gets paragraphs
+		$pgs = explode("\n", str_replace(array(
+			"\r\n",
+			"\r"
+		), "\n", $this->buffer));
 
-        while (list($i) = each($pgs)) {
-            if (empty($pgs[$i])) {
-                continue;
-            }
+		while (list($i) = each($pgs)) {
+			if (empty($pgs[$i])) {
+				continue;
+			}
 
-            // removes line breaks and extensive white space
-            $pgs[$i] = preg_replace(array(
-                '#\s+#',
-                '#^\s*(.+?)\s*$#m'
-            ), array(
-                ' ',
-                '$1'
-            ), str_replace("\n", '', $pgs[$i]));
+			// removes line breaks and extensive white space
+			$pgs[$i] = preg_replace(array(
+				'#\s+#',
+				'#^\s*(.+?)\s*$#m'
+			), array(
+				' ',
+				'$1'
+			), str_replace("\n", '', $pgs[$i]));
 
-            // wordwraps + indents lines
-            $pgs[$i] = str_repeat($this->indChar, $this->indFirst) . wordwrap($pgs[$i], max($this->wrap - $this->indent, 1), $this->wrapChar . str_repeat($this->indChar, $this->indent), $this->wrapCut);
-        }
+			// wordwraps + indents lines
+			$pgs[$i] = str_repeat($this->indChar, $this->indFirst) . wordwrap($pgs[$i], max($this->wrap - $this->indent, 1), $this->wrapChar . str_repeat($this->indChar, $this->indent), $this->wrapCut);
+		}
 
-        if ($this->assign !== '') {
-            $this->core->assignInScope(implode($this->wrapChar . $this->wrapChar, $pgs), $this->assign);
-        } else {
-            return implode($this->wrapChar . $this->wrapChar, $pgs);
-        }
-    }
+		if ($this->assign !== '') {
+			$this->core->assignInScope(implode($this->wrapChar . $this->wrapChar, $pgs), $this->assign);
+		} else {
+			return implode($this->wrapChar . $this->wrapChar, $pgs);
+		}
+	}
 }

lib/Dwoo/Plugins/Blocks/PluginCapture.php

Indentation +46 added lines, -46 removed lines

@@ -42,54 +42,54 @@
  */
 class PluginCapture extends BlockPlugin implements ICompilableBlock
 {
-    /**
-     * @param string $name
-     * @param null   $assign
-     * @param bool   $cat
-     * @param bool   $trim
-     */
-    public function init($name = 'default', $assign = null, $cat = false, $trim = false)
-    {
-    }
+	/**
+	 * @param string $name
+	 * @param null   $assign
+	 * @param bool   $cat
+	 * @param bool   $trim
+	 */
+	public function init($name = 'default', $assign = null, $cat = false, $trim = false)
+	{
+	}
 
-    /**
-     * @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 Compiler::PHP_OPEN . $prepend . 'ob_start();' . $append . Compiler::PHP_CLOSE;
-    }
+	/**
+	 * @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 Compiler::PHP_OPEN . $prepend . 'ob_start();' . $append . 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)
-    {
-        $params = $compiler->getCompiledParams($params);
+	/**
+	 * @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)
+	{
+		$params = $compiler->getCompiledParams($params);
 
-        $out = $content . Compiler::PHP_OPEN . $prepend . "\n" . '$tmp = ob_get_clean();';
-        if ($params['trim'] !== 'false' && $params['trim'] !== 0) {
-            $out .= "\n" . '$tmp = trim($tmp);';
-        }
-        if ($params['cat'] === 'true' || $params['cat'] === 1) {
-            $out .= "\n" . '$tmp = $this->readVar(\'dwoo.capture.\'.' . $params['name'] . ') . $tmp;';
-        }
-        if ($params['assign'] !== 'null') {
-            $out .= "\n" . '$this->scope[' . $params['assign'] . '] = $tmp;';
-        }
+		$out = $content . Compiler::PHP_OPEN . $prepend . "\n" . '$tmp = ob_get_clean();';
+		if ($params['trim'] !== 'false' && $params['trim'] !== 0) {
+			$out .= "\n" . '$tmp = trim($tmp);';
+		}
+		if ($params['cat'] === 'true' || $params['cat'] === 1) {
+			$out .= "\n" . '$tmp = $this->readVar(\'dwoo.capture.\'.' . $params['name'] . ') . $tmp;';
+		}
+		if ($params['assign'] !== 'null') {
+			$out .= "\n" . '$this->scope[' . $params['assign'] . '] = $tmp;';
+		}
 
-        return $out . "\n" . '$this->globals[\'capture\'][' . $params['name'] . '] = $tmp;' . $append . Compiler::PHP_CLOSE;
-    }
+		return $out . "\n" . '$this->globals[\'capture\'][' . $params['name'] . '] = $tmp;' . $append . Compiler::PHP_CLOSE;
+	}
 }

lib/Dwoo/Plugins/Blocks/PluginElseif.php

Indentation +55 added lines, -55 removed lines

@@ -28,68 +28,68 @@
  */
 class PluginElseif extends PluginIf implements ICompilableBlock, IElseable
 {
-    /**
-     * @param array $rest
-     */
-    public function init(array $rest)
-    {
-    }
+	/**
+	 * @param array $rest
+	 */
+	public function init(array $rest)
+	{
+	}
 
-    /**
-     * @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)
-    {
-        $preContent = '';
-        while (true) {
-            $preContent .= $compiler->removeTopBlock();
-            $block      = &$compiler->getCurrentBlock();
-            $interfaces = class_implements($block['class']);
-            if (in_array('Dwoo\IElseable', $interfaces) !== false) {
-                break;
-            }
-        }
+	/**
+	 * @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)
+	{
+		$preContent = '';
+		while (true) {
+			$preContent .= $compiler->removeTopBlock();
+			$block      = &$compiler->getCurrentBlock();
+			$interfaces = class_implements($block['class']);
+			if (in_array('Dwoo\IElseable', $interfaces) !== false) {
+				break;
+			}
+		}
 
-        $params['initialized'] = true;
-        $compiler->injectBlock($type, $params);
+		$params['initialized'] = true;
+		$compiler->injectBlock($type, $params);
 
-        return $preContent;
-    }
+		return $preContent;
+	}
 
-    /**
-     * @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 '';
+		}
 
-        $tokens = $compiler->getParamTokens($params);
-        $params = $compiler->getCompiledParams($params);
+		$tokens = $compiler->getParamTokens($params);
+		$params = $compiler->getCompiledParams($params);
 
-        $pre  = Compiler::PHP_OPEN . 'elseif (' . implode(' ', self::replaceKeywords($params['*'], $tokens['*'], $compiler)) . ") {\n" . Compiler::PHP_CLOSE;
-        $post = Compiler::PHP_OPEN . "\n}" . Compiler::PHP_CLOSE;
+		$pre  = Compiler::PHP_OPEN . 'elseif (' . implode(' ', self::replaceKeywords($params['*'], $tokens['*'], $compiler)) . ") {\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'];
+		}
 
-        $block                      = &$compiler->getCurrentBlock();
-        $block['params']['hasElse'] = $pre . $content . $post;
+		$block                      = &$compiler->getCurrentBlock();
+		$block['params']['hasElse'] = $pre . $content . $post;
 
-        return '';
-    }
+		return '';
+	}
 }

lib/Dwoo/Plugins/Blocks/PluginForeach.php

Indentation +155 added lines, -155 removed lines

@@ -43,159 +43,159 @@
  */
 class PluginForeach extends BlockPlugin implements ICompilableBlock, IElseable
 {
-    public static $cnt = 0;
-
-    /**
-     * @param        $from
-     * @param null   $key
-     * @param null   $item
-     * @param string $name
-     * @param null   $implode
-     */
-    public function init($from, $key = null, $item = null, $name = 'default', $implode = null)
-    {
-    }
-
-    /**
-     * @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)
-    {
-        // get block params and save the current template pointer to use it in the postProcessing method
-        $currentBlock                         = &$compiler->getCurrentBlock();
-        $currentBlock['params']['tplPointer'] = $compiler->getPointer();
-
-        return '';
-    }
-
-    /**
-     * @param Compiler $compiler
-     * @param array    $params
-     * @param string   $prepend
-     * @param string   $append
-     * @param string   $content
-     *
-     * @return string
-     * @throws CompilationException
-     */
-    public static function postProcessing(Compiler $compiler, array $params, $prepend, $append, $content)
-    {
-        $params = $compiler->getCompiledParams($params);
-        $tpl    = $compiler->getTemplateSource($params['tplPointer']);
-
-        // assigns params
-        $src = $params['from'];
-
-        if ($params['item'] !== 'null') {
-            if ($params['key'] !== 'null') {
-                $key = $params['key'];
-            }
-            $val = $params['item'];
-        } elseif ($params['key'] !== 'null') {
-            $val = $params['key'];
-        } else {
-            throw new CompilationException($compiler, 'Foreach <em>item</em> parameter missing');
-        }
-        $name = $params['name'];
-
-        if (substr($val, 0, 1) !== '"' && substr($val, 0, 1) !== '\'') {
-            throw new CompilationException($compiler, 'Foreach <em>item</em> parameter must be of type string');
-        }
-        if (isset($key) && substr($val, 0, 1) !== '"' && substr($val, 0, 1) !== '\'') {
-            throw new CompilationException($compiler, 'Foreach <em>key</em> parameter must be of type string');
-        }
-
-        // evaluates which global variables have to be computed
-        $varName       = '$dwoo.foreach.' . trim($name, '"\'') . '.';
-        $shortVarName  = '$.foreach.' . trim($name, '"\'') . '.';
-        $usesAny       = strpos($tpl, $varName) !== false || strpos($tpl, $shortVarName) !== false;
-        $usesFirst     = strpos($tpl, $varName . 'first') !== false || strpos($tpl, $shortVarName . 'first') !== false;
-        $usesLast      = strpos($tpl, $varName . 'last') !== false || strpos($tpl, $shortVarName . 'last') !== false;
-        $usesIndex     = $usesFirst || strpos($tpl, $varName . 'index') !== false || strpos($tpl, $shortVarName . 'index') !== false;
-        $usesIteration = $usesLast || strpos($tpl, $varName . 'iteration') !== false || strpos($tpl, $shortVarName . 'iteration') !== false;
-        $usesShow      = strpos($tpl, $varName . 'show') !== false || strpos($tpl, $shortVarName . 'show') !== false;
-        $usesTotal     = $usesLast || strpos($tpl, $varName . 'total') !== false || strpos($tpl, $shortVarName . 'total') !== false;
-
-        if (strpos($name, '$this->scope[') !== false) {
-            $usesAny = $usesFirst = $usesLast = $usesIndex = $usesIteration = $usesShow = $usesTotal = true;
-        }
-
-        // override globals vars if implode is used
-        if ($params['implode'] !== 'null') {
-            $implode       = $params['implode'];
-            $usesAny       = true;
-            $usesLast      = true;
-            $usesIteration = true;
-            $usesTotal     = true;
-        }
-
-        // gets foreach id
-        $cnt = self::$cnt ++;
-
-        // build pre content output
-        $pre = Compiler::PHP_OPEN . "\n" . '$_fh' . $cnt . '_data = ' . $src . ';';
-        // adds foreach properties
-        if ($usesAny) {
-            $pre .= "\n" . '$this->globals["foreach"][' . $name . '] = array' . "\n(";
-            if ($usesIndex) {
-                $pre .= "\n\t" . '"index"		=> 0,';
-            }
-            if ($usesIteration) {
-                $pre .= "\n\t" . '"iteration"		=> 1,';
-            }
-            if ($usesFirst) {
-                $pre .= "\n\t" . '"first"		=> null,';
-            }
-            if ($usesLast) {
-                $pre .= "\n\t" . '"last"		=> null,';
-            }
-            if ($usesShow) {
-                $pre .= "\n\t" . '"show"		=> $this->isArray($_fh' . $cnt . '_data, true),';
-            }
-            if ($usesTotal) {
-                $pre .= "\n\t" . '"total"		=> $this->count($_fh' . $cnt . '_data),';
-            }
-            $pre .= "\n);\n" . '$_fh' . $cnt . '_glob =& $this->globals["foreach"][' . $name . '];';
-        }
-        // checks if foreach must be looped
-        $pre .= "\n" . 'if ($this->isTraversable($_fh' . $cnt . '_data' . (isset($params['hasElse']) ? ', true' : '') . ') == true)' . "\n{";
-        // iterates over keys
-        $pre .= "\n\t" . 'foreach ($_fh' . $cnt . '_data as ' . (isset($key) ? '$this->scope[' . $key . ']=>' : '') . '$this->scope[' . $val . '])' . "\n\t{";
-        // updates properties
-        if ($usesFirst) {
-            $pre .= "\n\t\t" . '$_fh' . $cnt . '_glob["first"] = (string) ($_fh' . $cnt . '_glob["index"] === 0);';
-        }
-        if ($usesLast) {
-            $pre .= "\n\t\t" . '$_fh' . $cnt . '_glob["last"] = (string) ($_fh' . $cnt . '_glob["iteration"] === $_fh' . $cnt . '_glob["total"]);';
-        }
-        $pre .= "\n/* -- foreach start output */\n" . Compiler::PHP_CLOSE;
-
-        // build post content output
-        $post = Compiler::PHP_OPEN . "\n";
-
-        if (isset($implode)) {
-            $post .= '/* -- implode */' . "\n" . 'if (!$_fh' . $cnt . '_glob["last"]) {' . "\n\t" . 'echo ' . $implode . ";\n}\n";
-        }
-        $post .= '/* -- foreach end output */';
-        // update properties
-        if ($usesIndex) {
-            $post .= "\n\t\t" . '$_fh' . $cnt . '_glob["index"]+=1;';
-        }
-        if ($usesIteration) {
-            $post .= "\n\t\t" . '$_fh' . $cnt . '_glob["iteration"]+=1;';
-        }
-        // end loop
-        $post .= "\n\t}\n}" . Compiler::PHP_CLOSE;
-        if (isset($params['hasElse'])) {
-            $post .= $params['hasElse'];
-        }
-
-        return $pre . $content . $post;
-    }
+	public static $cnt = 0;
+
+	/**
+	 * @param        $from
+	 * @param null   $key
+	 * @param null   $item
+	 * @param string $name
+	 * @param null   $implode
+	 */
+	public function init($from, $key = null, $item = null, $name = 'default', $implode = null)
+	{
+	}
+
+	/**
+	 * @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)
+	{
+		// get block params and save the current template pointer to use it in the postProcessing method
+		$currentBlock                         = &$compiler->getCurrentBlock();
+		$currentBlock['params']['tplPointer'] = $compiler->getPointer();
+
+		return '';
+	}
+
+	/**
+	 * @param Compiler $compiler
+	 * @param array    $params
+	 * @param string   $prepend
+	 * @param string   $append
+	 * @param string   $content
+	 *
+	 * @return string
+	 * @throws CompilationException
+	 */
+	public static function postProcessing(Compiler $compiler, array $params, $prepend, $append, $content)
+	{
+		$params = $compiler->getCompiledParams($params);
+		$tpl    = $compiler->getTemplateSource($params['tplPointer']);
+
+		// assigns params
+		$src = $params['from'];
+
+		if ($params['item'] !== 'null') {
+			if ($params['key'] !== 'null') {
+				$key = $params['key'];
+			}
+			$val = $params['item'];
+		} elseif ($params['key'] !== 'null') {
+			$val = $params['key'];
+		} else {
+			throw new CompilationException($compiler, 'Foreach <em>item</em> parameter missing');
+		}
+		$name = $params['name'];
+
+		if (substr($val, 0, 1) !== '"' && substr($val, 0, 1) !== '\'') {
+			throw new CompilationException($compiler, 'Foreach <em>item</em> parameter must be of type string');
+		}
+		if (isset($key) && substr($val, 0, 1) !== '"' && substr($val, 0, 1) !== '\'') {
+			throw new CompilationException($compiler, 'Foreach <em>key</em> parameter must be of type string');
+		}
+
+		// evaluates which global variables have to be computed
+		$varName       = '$dwoo.foreach.' . trim($name, '"\'') . '.';
+		$shortVarName  = '$.foreach.' . trim($name, '"\'') . '.';
+		$usesAny       = strpos($tpl, $varName) !== false || strpos($tpl, $shortVarName) !== false;
+		$usesFirst     = strpos($tpl, $varName . 'first') !== false || strpos($tpl, $shortVarName . 'first') !== false;
+		$usesLast      = strpos($tpl, $varName . 'last') !== false || strpos($tpl, $shortVarName . 'last') !== false;
+		$usesIndex     = $usesFirst || strpos($tpl, $varName . 'index') !== false || strpos($tpl, $shortVarName . 'index') !== false;
+		$usesIteration = $usesLast || strpos($tpl, $varName . 'iteration') !== false || strpos($tpl, $shortVarName . 'iteration') !== false;
+		$usesShow      = strpos($tpl, $varName . 'show') !== false || strpos($tpl, $shortVarName . 'show') !== false;
+		$usesTotal     = $usesLast || strpos($tpl, $varName . 'total') !== false || strpos($tpl, $shortVarName . 'total') !== false;
+
+		if (strpos($name, '$this->scope[') !== false) {
+			$usesAny = $usesFirst = $usesLast = $usesIndex = $usesIteration = $usesShow = $usesTotal = true;
+		}
+
+		// override globals vars if implode is used
+		if ($params['implode'] !== 'null') {
+			$implode       = $params['implode'];
+			$usesAny       = true;
+			$usesLast      = true;
+			$usesIteration = true;
+			$usesTotal     = true;
+		}
+
+		// gets foreach id
+		$cnt = self::$cnt ++;
+
+		// build pre content output
+		$pre = Compiler::PHP_OPEN . "\n" . '$_fh' . $cnt . '_data = ' . $src . ';';
+		// adds foreach properties
+		if ($usesAny) {
+			$pre .= "\n" . '$this->globals["foreach"][' . $name . '] = array' . "\n(";
+			if ($usesIndex) {
+				$pre .= "\n\t" . '"index"		=> 0,';
+			}
+			if ($usesIteration) {
+				$pre .= "\n\t" . '"iteration"		=> 1,';
+			}
+			if ($usesFirst) {
+				$pre .= "\n\t" . '"first"		=> null,';
+			}
+			if ($usesLast) {
+				$pre .= "\n\t" . '"last"		=> null,';
+			}
+			if ($usesShow) {
+				$pre .= "\n\t" . '"show"		=> $this->isArray($_fh' . $cnt . '_data, true),';
+			}
+			if ($usesTotal) {
+				$pre .= "\n\t" . '"total"		=> $this->count($_fh' . $cnt . '_data),';
+			}
+			$pre .= "\n);\n" . '$_fh' . $cnt . '_glob =& $this->globals["foreach"][' . $name . '];';
+		}
+		// checks if foreach must be looped
+		$pre .= "\n" . 'if ($this->isTraversable($_fh' . $cnt . '_data' . (isset($params['hasElse']) ? ', true' : '') . ') == true)' . "\n{";
+		// iterates over keys
+		$pre .= "\n\t" . 'foreach ($_fh' . $cnt . '_data as ' . (isset($key) ? '$this->scope[' . $key . ']=>' : '') . '$this->scope[' . $val . '])' . "\n\t{";
+		// updates properties
+		if ($usesFirst) {
+			$pre .= "\n\t\t" . '$_fh' . $cnt . '_glob["first"] = (string) ($_fh' . $cnt . '_glob["index"] === 0);';
+		}
+		if ($usesLast) {
+			$pre .= "\n\t\t" . '$_fh' . $cnt . '_glob["last"] = (string) ($_fh' . $cnt . '_glob["iteration"] === $_fh' . $cnt . '_glob["total"]);';
+		}
+		$pre .= "\n/* -- foreach start output */\n" . Compiler::PHP_CLOSE;
+
+		// build post content output
+		$post = Compiler::PHP_OPEN . "\n";
+
+		if (isset($implode)) {
+			$post .= '/* -- implode */' . "\n" . 'if (!$_fh' . $cnt . '_glob["last"]) {' . "\n\t" . 'echo ' . $implode . ";\n}\n";
+		}
+		$post .= '/* -- foreach end output */';
+		// update properties
+		if ($usesIndex) {
+			$post .= "\n\t\t" . '$_fh' . $cnt . '_glob["index"]+=1;';
+		}
+		if ($usesIteration) {
+			$post .= "\n\t\t" . '$_fh' . $cnt . '_glob["iteration"]+=1;';
+		}
+		// end loop
+		$post .= "\n\t}\n}" . Compiler::PHP_CLOSE;
+		if (isset($params['hasElse'])) {
+			$post .= $params['hasElse'];
+		}
+
+		return $pre . $content . $post;
+	}
 }

lib/Dwoo/Plugins/Blocks/PluginTemplate.php

Indentation +73 added lines, -73 removed lines

@@ -33,83 +33,83 @@
  */
 class PluginTemplate extends BlockPlugin implements ICompilableBlock
 {
-    /**
-     * @param Compiler $compiler
-     * @param array    $params
-     * @param string   $prepend
-     * @param string   $append
-     * @param string   $type
-     *
-     * @return string
-     * @throws CompilationException
-     */
-    public static function preProcessing(Compiler $compiler, array $params, $prepend, $append, $type)
-    {
-        $params       = $compiler->getCompiledParams($params);
-        $parsedParams = array();
-        if (!isset($params['*'])) {
-            $params['*'] = array();
-        }
-        foreach ($params['*'] as $param => $defValue) {
-            if (is_numeric($param)) {
-                $param    = $defValue;
-                $defValue = null;
-            }
-            $param = trim($param, '\'"');
-            if (!preg_match('#^[a-z0-9_]+$#i', $param)) {
-                throw new CompilationException($compiler, 'Function : parameter names must contain only A-Z, 0-9 or _');
-            }
-            $parsedParams[$param] = $defValue;
-        }
-        $params['name'] = substr($params['name'], 1, - 1);
-        $params['*']    = $parsedParams;
-        $params['uuid'] = uniqid();
-        $compiler->addTemplatePlugin($params['name'], $parsedParams, $params['uuid']);
-        $currentBlock           = &$compiler->getCurrentBlock();
-        $currentBlock['params'] = $params;
+	/**
+	 * @param Compiler $compiler
+	 * @param array    $params
+	 * @param string   $prepend
+	 * @param string   $append
+	 * @param string   $type
+	 *
+	 * @return string
+	 * @throws CompilationException
+	 */
+	public static function preProcessing(Compiler $compiler, array $params, $prepend, $append, $type)
+	{
+		$params       = $compiler->getCompiledParams($params);
+		$parsedParams = array();
+		if (!isset($params['*'])) {
+			$params['*'] = array();
+		}
+		foreach ($params['*'] as $param => $defValue) {
+			if (is_numeric($param)) {
+				$param    = $defValue;
+				$defValue = null;
+			}
+			$param = trim($param, '\'"');
+			if (!preg_match('#^[a-z0-9_]+$#i', $param)) {
+				throw new CompilationException($compiler, 'Function : parameter names must contain only A-Z, 0-9 or _');
+			}
+			$parsedParams[$param] = $defValue;
+		}
+		$params['name'] = substr($params['name'], 1, - 1);
+		$params['*']    = $parsedParams;
+		$params['uuid'] = uniqid();
+		$compiler->addTemplatePlugin($params['name'], $parsedParams, $params['uuid']);
+		$currentBlock           = &$compiler->getCurrentBlock();
+		$currentBlock['params'] = $params;
 
-        return '';
-    }
+		return '';
+	}
 
-    /**
-     * @param Compiler $compiler
-     * @param array    $params
-     * @param string   $prepend
-     * @param string   $append
-     * @param string   $content
-     *
-     * @return string|void
-     */
-    public static function postProcessing(Compiler $compiler, array $params, $prepend, $append, $content)
-    {
-        $paramstr = 'Dwoo\Core $dwoo';
-        $init     = 'static $_callCnt = 0;' . "\n" . '$dwoo->scope[\' ' . $params['uuid'] . '\'.$_callCnt] = array();' . "\n" . '$_scope = $dwoo->setScope(array(\' ' . $params['uuid'] . '\'.($_callCnt++)));' . "\n";
-        $cleanup  = '/* -- template end output */ $dwoo->setScope($_scope, true);';
-        foreach ($params['*'] as $param => $defValue) {
-            if ($defValue === null) {
-                $paramstr .= ', $' . $param;
-            } else {
-                $paramstr .= ', $' . $param . ' = ' . $defValue;
-            }
-            $init .= '$dwoo->scope[\'' . $param . '\'] = $' . $param . ";\n";
-        }
-        $init .= '/* -- template start output */';
+	/**
+	 * @param Compiler $compiler
+	 * @param array    $params
+	 * @param string   $prepend
+	 * @param string   $append
+	 * @param string   $content
+	 *
+	 * @return string|void
+	 */
+	public static function postProcessing(Compiler $compiler, array $params, $prepend, $append, $content)
+	{
+		$paramstr = 'Dwoo\Core $dwoo';
+		$init     = 'static $_callCnt = 0;' . "\n" . '$dwoo->scope[\' ' . $params['uuid'] . '\'.$_callCnt] = array();' . "\n" . '$_scope = $dwoo->setScope(array(\' ' . $params['uuid'] . '\'.($_callCnt++)));' . "\n";
+		$cleanup  = '/* -- template end output */ $dwoo->setScope($_scope, true);';
+		foreach ($params['*'] as $param => $defValue) {
+			if ($defValue === null) {
+				$paramstr .= ', $' . $param;
+			} else {
+				$paramstr .= ', $' . $param . ' = ' . $defValue;
+			}
+			$init .= '$dwoo->scope[\'' . $param . '\'] = $' . $param . ";\n";
+		}
+		$init .= '/* -- template start output */';
 
-        $funcName = 'Plugin' . Core::toCamelCase($params['name']) . Core::toCamelCase($params['uuid']);
+		$funcName = 'Plugin' . Core::toCamelCase($params['name']) . Core::toCamelCase($params['uuid']);
 
-        $search      = array('$this->charset', '$this->', '$this,',);
-        $replacement = array('$dwoo->getCharset()', '$dwoo->', '$dwoo,',);
-        $content     = str_replace($search, $replacement, $content);
+		$search      = array('$this->charset', '$this->', '$this,',);
+		$replacement = array('$dwoo->getCharset()', '$dwoo->', '$dwoo,',);
+		$content     = str_replace($search, $replacement, $content);
 
-        $body = 'if (!function_exists(\'' . $funcName . "')) {\nfunction " . $funcName . '(' . $paramstr . ') {' . "\n$init" . Compiler::PHP_CLOSE . $prepend . $content . $append . Compiler::PHP_OPEN . $cleanup . "\n}\n}";
-        $compiler->addTemplatePlugin($params['name'], $params['*'], $params['uuid'], $body);
-    }
+		$body = 'if (!function_exists(\'' . $funcName . "')) {\nfunction " . $funcName . '(' . $paramstr . ') {' . "\n$init" . Compiler::PHP_CLOSE . $prepend . $content . $append . Compiler::PHP_OPEN . $cleanup . "\n}\n}";
+		$compiler->addTemplatePlugin($params['name'], $params['*'], $params['uuid'], $body);
+	}
 
-    /**
-     * @param       $name
-     * @param array $rest
-     */
-    public function init($name, array $rest = array())
-    {
-    }
+	/**
+	 * @param       $name
+	 * @param array $rest
+	 */
+	public function init($name, array $rest = array())
+	{
+	}
 }

lib/Dwoo/Plugins/Blocks/PluginWith.php

Indentation +41 added lines, -41 removed lines

@@ -47,53 +47,53 @@
  */
 class PluginWith extends BlockPlugin implements ICompilableBlock, IElseable
 {
-    protected static $cnt = 0;
+	protected static $cnt = 0;
 
-    /**
-     * @param $var
-     */
-    public function init($var)
-    {
-    }
+	/**
+	 * @param $var
+	 */
+	public function init($var)
+	{
+	}
 
-    /**
-     * @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)
-    {
-        $rparams = $compiler->getRealParams($params);
-        $cparams = $compiler->getCompiledParams($params);
+	/**
+	 * @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)
+	{
+		$rparams = $compiler->getRealParams($params);
+		$cparams = $compiler->getCompiledParams($params);
 
-        $compiler->setScope($rparams['var']);
+		$compiler->setScope($rparams['var']);
 
-        $pre = Compiler::PHP_OPEN . 'if (' . $cparams['var'] . ')' . "\n{\n" . '$_with' . (self::$cnt) . ' = $this->setScope("' . $rparams['var'] . '");' . "\n/* -- start with output */\n" . Compiler::PHP_CLOSE;
+		$pre = Compiler::PHP_OPEN . 'if (' . $cparams['var'] . ')' . "\n{\n" . '$_with' . (self::$cnt) . ' = $this->setScope("' . $rparams['var'] . '");' . "\n/* -- start with output */\n" . Compiler::PHP_CLOSE;
 
-        $post = Compiler::PHP_OPEN . "\n/* -- end with output */\n" . '$this->setScope($_with' . (self::$cnt ++) . ', true);' . "\n}\n" . Compiler::PHP_CLOSE;
+		$post = Compiler::PHP_OPEN . "\n/* -- end with output */\n" . '$this->setScope($_with' . (self::$cnt ++) . ', true);' . "\n}\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/PluginA.php

Indentation +46 added lines, -46 removed lines

@@ -39,57 +39,57 @@
  */
 class PluginA extends BlockPlugin implements ICompilableBlock
 {
-    /**
-     * @param       $href
-     * @param array $rest
-     */
-    public function init($href, array $rest = array())
-    {
-    }
+	/**
+	 * @param       $href
+	 * @param array $rest
+	 */
+	public function init($href, array $rest = array())
+	{
+	}
 
-    /**
-     * @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)
-    {
-        $p = $compiler->getCompiledParams($params);
+	/**
+	 * @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)
+	{
+		$p = $compiler->getCompiledParams($params);
 
-        $out = Compiler::PHP_OPEN . 'echo \'<a ' . self::paramsToAttributes($p, "'", $compiler);
+		$out = Compiler::PHP_OPEN . 'echo \'<a ' . self::paramsToAttributes($p, "'", $compiler);
 
-        return $out . '>\';' . Compiler::PHP_CLOSE;
-    }
+		return $out . '>\';' . 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)
-    {
-        $p = $compiler->getCompiledParams($params);
+	/**
+	 * @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)
+	{
+		$p = $compiler->getCompiledParams($params);
 
-        // no content was provided so use the url as display text
-        if ($content == '') {
-            // merge </a> into the href if href is a string
-            if (substr($p['href'], - 1) === '"' || substr($p['href'], - 1) === '\'') {
-                return Compiler::PHP_OPEN . 'echo ' . substr($p['href'], 0, - 1) . '</a>' . substr($p['href'], - 1) . ';' . Compiler::PHP_CLOSE;
-            }
+		// no content was provided so use the url as display text
+		if ($content == '') {
+			// merge </a> into the href if href is a string
+			if (substr($p['href'], - 1) === '"' || substr($p['href'], - 1) === '\'') {
+				return Compiler::PHP_OPEN . 'echo ' . substr($p['href'], 0, - 1) . '</a>' . substr($p['href'], - 1) . ';' . Compiler::PHP_CLOSE;
+			}
 
-            // otherwise append
-            return Compiler::PHP_OPEN . 'echo ' . $p['href'] . '.\'</a>\';' . Compiler::PHP_CLOSE;
-        }
+			// otherwise append
+			return Compiler::PHP_OPEN . 'echo ' . $p['href'] . '.\'</a>\';' . Compiler::PHP_CLOSE;
+		}
 
-        // return content
-        return $content . '</a>';
-    }
+		// return content
+		return $content . '</a>';
+	}
 }