dwoo-project / dwoo

lib/Dwoo/Plugins/Functions/PluginCat.php

Indentation +11 added lines, -11 removed lines

@@ -30,15 +30,15 @@
  */
 class PluginCat extends Plugin implements ICompilable
 {
-    /**
-     * @param Compiler $compiler
-     * @param string   $value
-     * @param array    $rest
-     *
-     * @return string
-     */
-    public static function compile(Compiler $compiler, $value, array $rest)
-    {
-        return '(' . $value . ').(' . implode(').(', $rest) . ')';
-    }
+	/**
+	 * @param Compiler $compiler
+	 * @param string   $value
+	 * @param array    $rest
+	 *
+	 * @return string
+	 */
+	public static function compile(Compiler $compiler, $value, array $rest)
+	{
+		return '(' . $value . ').(' . implode(').(', $rest) . ')';
+	}
 }

Spacing +1 added lines, -1 removed lines

@@ -39,6 +39,6 @@
      */
     public static function compile(Compiler $compiler, $value, array $rest)
     {
-        return '(' . $value . ').(' . implode(').(', $rest) . ')';
+        return '('.$value.').('.implode(').(', $rest).')';
     }
 }

lib/Dwoo/Plugins/Functions/PluginCountCharacters.php

Indentation +14 added lines, -14 removed lines

@@ -31,19 +31,19 @@
  */
 class PluginCountCharacters extends Plugin implements ICompilable
 {
-    /**
-     * @param Compiler $compiler
-     * @param string   $value
-     * @param bool     $count_spaces
-     *
-     * @return string
-     */
-    public static function compile(Compiler $compiler, $value, $count_spaces = false)
-    {
-        if ($count_spaces === 'false') {
-            return 'preg_match_all(\'#[^\s\pZ]#u\', ' . $value . ', $tmp)';
-        }
+	/**
+	 * @param Compiler $compiler
+	 * @param string   $value
+	 * @param bool     $count_spaces
+	 *
+	 * @return string
+	 */
+	public static function compile(Compiler $compiler, $value, $count_spaces = false)
+	{
+		if ($count_spaces === 'false') {
+			return 'preg_match_all(\'#[^\s\pZ]#u\', ' . $value . ', $tmp)';
+		}
 
-        return 'mb_strlen(' . $value . ', $this->charset)';
-    }
+		return 'mb_strlen(' . $value . ', $this->charset)';
+	}
 }
\ No newline at end of file

Spacing +2 added lines, -2 removed lines

@@ -41,9 +41,9 @@
     public static function compile(Compiler $compiler, $value, $count_spaces = false)
     {
         if ($count_spaces === 'false') {
-            return 'preg_match_all(\'#[^\s\pZ]#u\', ' . $value . ', $tmp)';
+            return 'preg_match_all(\'#[^\s\pZ]#u\', '.$value.', $tmp)';
         }
 
-        return 'mb_strlen(' . $value . ', $this->charset)';
+        return 'mb_strlen('.$value.', $this->charset)';
     }
 }
\ No newline at end of file

lib/Dwoo/Plugins/Functions/PluginExtendsCheck.php

Spacing +9 added lines, -9 removed lines

@@ -45,29 +45,29 @@
 
         if ($tpl === null) {
             throw new CompilationException($compiler,
-                'Load Templates : Resource "' . $resource . ':' . $identifier . '" not found.');
+                'Load Templates : Resource "'.$resource.':'.$identifier.'" not found.');
         } elseif ($tpl === false) {
             throw new CompilationException($compiler,
-                'Load Templates : Resource "' . $resource . '" does not support includes.');
+                'Load Templates : Resource "'.$resource.'" does not support includes.');
         }
 
-        $out = '\'\';// checking for modification in ' . $resource . ':' . $identifier . "\r\n";
+        $out = '\'\';// checking for modification in '.$resource.':'.$identifier."\r\n";
 
         $modCheck = $tpl->getIsModifiedCode();
 
         if ($modCheck) {
-            $out .= 'if (!(' . $modCheck . ')) { ob_end_clean(); return false; }';
+            $out .= 'if (!('.$modCheck.')) { ob_end_clean(); return false; }';
         } else {
             $out .= 'try {
-	$tpl = $this->templateFactory("' . $resource . '", "' . $identifier . '");
+	$tpl = $this->templateFactory("' . $resource.'", "'.$identifier.'");
 } catch (Dwoo\Exception $e) {
-	$this->triggerError(\'Load Templates : Resource <em>' . $resource . '</em> was not added to Dwoo, can not extend <em>' . $identifier . '</em>\', E_USER_WARNING);
+	$this->triggerError(\'Load Templates : Resource <em>' . $resource.'</em> was not added to Dwoo, can not extend <em>'.$identifier.'</em>\', E_USER_WARNING);
 }
 if ($tpl === null)
-	$this->triggerError(\'Load Templates : Resource "' . $resource . ':' . $identifier . '" was not found.\', E_USER_WARNING);
+	$this->triggerError(\'Load Templates : Resource "' . $resource.':'.$identifier.'" was not found.\', E_USER_WARNING);
 elseif ($tpl === false)
-	$this->triggerError(\'Load Templates : Resource "' . $resource . '" does not support extends.\', E_USER_WARNING);
-if ($tpl->getUid() != "' . $tpl->getUid() . '") { ob_end_clean(); return false; }';
+	$this->triggerError(\'Load Templates : Resource "' . $resource.'" does not support extends.\', E_USER_WARNING);
+if ($tpl->getUid() != "' . $tpl->getUid().'") { ob_end_clean(); return false; }';
         }
 
         return $out;

Indentation +29 added lines, -29 removed lines

@@ -28,37 +28,37 @@ 
  */
 class PluginExtendsCheck extends Plugin implements ICompilable
 {
-    /**
-     * @param Compiler $compiler
-     * @param          $file
-     *
-     * @return string
-     * @throws CompilationException
-     */
-    public static function compile(Compiler $compiler, $file)
-    {
-        preg_match('#^["\']([a-z]{2,}):(.*?)["\']$#i', $file, $m);
-        $resource   = $m[1];
-        $identifier = $m[2];
+	/**
+	 * @param Compiler $compiler
+	 * @param          $file
+	 *
+	 * @return string
+	 * @throws CompilationException
+	 */
+	public static function compile(Compiler $compiler, $file)
+	{
+		preg_match('#^["\']([a-z]{2,}):(.*?)["\']$#i', $file, $m);
+		$resource   = $m[1];
+		$identifier = $m[2];
 
-        $tpl = $compiler->getCore()->templateFactory($resource, $identifier);
+		$tpl = $compiler->getCore()->templateFactory($resource, $identifier);
 
-        if ($tpl === null) {
-            throw new CompilationException($compiler,
-                'Load Templates : Resource "' . $resource . ':' . $identifier . '" not found.');
-        } elseif ($tpl === false) {
-            throw new CompilationException($compiler,
-                'Load Templates : Resource "' . $resource . '" does not support includes.');
-        }
+		if ($tpl === null) {
+			throw new CompilationException($compiler,
+				'Load Templates : Resource "' . $resource . ':' . $identifier . '" not found.');
+		} elseif ($tpl === false) {
+			throw new CompilationException($compiler,
+				'Load Templates : Resource "' . $resource . '" does not support includes.');
+		}
 
-        $out = '\'\';// checking for modification in ' . $resource . ':' . $identifier . "\r\n";
+		$out = '\'\';// checking for modification in ' . $resource . ':' . $identifier . "\r\n";
 
-        $modCheck = $tpl->getIsModifiedCode();
+		$modCheck = $tpl->getIsModifiedCode();
 
-        if ($modCheck) {
-            $out .= 'if (!(' . $modCheck . ')) { ob_end_clean(); return false; }';
-        } else {
-            $out .= 'try {
+		if ($modCheck) {
+			$out .= 'if (!(' . $modCheck . ')) { ob_end_clean(); return false; }';
+		} else {
+			$out .= 'try {
 	$tpl = $this->templateFactory("' . $resource . '", "' . $identifier . '");
 } catch (Dwoo\Exception $e) {
 	$this->triggerError(\'Load Templates : Resource <em>' . $resource . '</em> was not added to Dwoo, can not extend <em>' . $identifier . '</em>\', E_USER_WARNING);
@@ -68,8 +68,8 @@ 
 elseif ($tpl === false)
 	$this->triggerError(\'Load Templates : Resource "' . $resource . '" does not support extends.\', E_USER_WARNING);
 if ($tpl->getUid() != "' . $tpl->getUid() . '") { ob_end_clean(); return false; }';
-        }
+		}
 
-        return $out;
-    }
+		return $out;
+	}
 }
\ No newline at end of file

lib/Dwoo/Plugins/Functions/PluginNl2br.php

Indentation +10 added lines, -10 removed lines

@@ -30,14 +30,14 @@
  */
 class PluginNl2br extends Plugin implements ICompilable
 {
-    /**
-     * @param Compiler $compiler
-     * @param string   $value
-     *
-     * @return string
-     */
-    public static function compile(Compiler $compiler, $value)
-    {
-        return 'nl2br((string) ' . $value . ')';
-    }
+	/**
+	 * @param Compiler $compiler
+	 * @param string   $value
+	 *
+	 * @return string
+	 */
+	public static function compile(Compiler $compiler, $value)
+	{
+		return 'nl2br((string) ' . $value . ')';
+	}
 }
\ No newline at end of file

Spacing +1 added lines, -1 removed lines

@@ -38,6 +38,6 @@
      */
     public static function compile(Compiler $compiler, $value)
     {
-        return 'nl2br((string) ' . $value . ')';
+        return 'nl2br((string) '.$value.')';
     }
 }
\ No newline at end of file

lib/Dwoo/Plugins/Functions/PluginMath.php

Indentation +145 added lines, -145 removed lines

@@ -41,159 +41,159 @@
  */
 class PluginMath extends Plugin implements ICompilable
 {
-    /**
-     * @param Compiler $compiler
-     * @param string   $equation
-     * @param string   $format
-     * @param string   $assign
-     * @param array    $rest
-     *
-     * @return string
-     * @throws CompilationException
-     */
-    public static function compile(Compiler $compiler, $equation, $format = '', $assign = '', array $rest = array())
-    {
-        /*
+	/**
+	 * @param Compiler $compiler
+	 * @param string   $equation
+	 * @param string   $format
+	 * @param string   $assign
+	 * @param array    $rest
+	 *
+	 * @return string
+	 * @throws CompilationException
+	 */
+	public static function compile(Compiler $compiler, $equation, $format = '', $assign = '', array $rest = array())
+	{
+		/*
          * Holds the allowed function, characters, operators and constants
          */
-        $allowed = array(
-            '0',
-            '1',
-            '2',
-            '3',
-            '4',
-            '5',
-            '6',
-            '7',
-            '8',
-            '9',
-            '+',
-            '-',
-            '/',
-            '*',
-            '.',
-            ' ',
-            '<<',
-            '>>',
-            '%',
-            '&',
-            '^',
-            '|',
-            '~',
-            'abs(',
-            'ceil(',
-            'floor(',
-            'exp(',
-            'log10(',
-            'cos(',
-            'sin(',
-            'sqrt(',
-            'tan(',
-            'M_PI',
-            'INF',
-            'M_E',
-        );
+		$allowed = array(
+			'0',
+			'1',
+			'2',
+			'3',
+			'4',
+			'5',
+			'6',
+			'7',
+			'8',
+			'9',
+			'+',
+			'-',
+			'/',
+			'*',
+			'.',
+			' ',
+			'<<',
+			'>>',
+			'%',
+			'&',
+			'^',
+			'|',
+			'~',
+			'abs(',
+			'ceil(',
+			'floor(',
+			'exp(',
+			'log10(',
+			'cos(',
+			'sin(',
+			'sqrt(',
+			'tan(',
+			'M_PI',
+			'INF',
+			'M_E',
+		);
 
-        /*
+		/*
          * Holds the functions that can accept multiple arguments
          */
-        $funcs = array(
-            'round(',
-            'log(',
-            'pow(',
-            'max(',
-            'min(',
-            'rand(',
-        );
+		$funcs = array(
+			'round(',
+			'log(',
+			'pow(',
+			'max(',
+			'min(',
+			'rand(',
+		);
 
-        $equation = $equationSrc = str_ireplace(array(
-            'pi',
-            'M_PI()',
-            'inf',
-            ' e '
-        ),
-            array(
-                'M_PI',
-                'M_PI',
-                'INF',
-                ' M_E '
-            ),
-            $equation);
+		$equation = $equationSrc = str_ireplace(array(
+			'pi',
+			'M_PI()',
+			'inf',
+			' e '
+		),
+			array(
+				'M_PI',
+				'M_PI',
+				'INF',
+				' M_E '
+			),
+			$equation);
 
-        $delim      = $equation[0];
-        $open       = $delim . '.';
-        $close      = '.' . $delim;
-        $equation   = substr($equation, 1, - 1);
-        $out        = '';
-        $ptr        = 1;
-        $allowcomma = 0;
-        while (strlen($equation) > 0) {
-            $substr = substr($equation, 0, $ptr);
-            if (array_search($substr, $allowed) !== false) {
-                // allowed string
-                $out .= $substr;
-                $equation = substr($equation, $ptr);
-                $ptr      = 0;
-            } elseif (array_search($substr, $funcs) !== false) {
-                // allowed func
-                $out .= $substr;
-                $equation = substr($equation, $ptr);
-                $ptr      = 0;
-                ++ $allowcomma;
-                if ($allowcomma === 1) {
-                    $allowed[] = ',';
-                }
-            } elseif (isset($rest[$substr])) {
-                // variable
-                $out .= $rest[$substr];
-                $equation = substr($equation, $ptr);
-                $ptr      = 0;
-            } elseif ($substr === $open) {
-                // pre-replaced variable
-                preg_match('#.*\((?:[^()]*?|(?R))\)' . str_replace('.', '\\.', $close) . '#', substr($equation, 2), $m);
-                if (empty($m)) {
-                    preg_match('#.*?' . str_replace('.', '\\.', $close) . '#', substr($equation, 2), $m);
-                }
-                $out .= substr($m[0], 0, - 2);
-                $equation = substr($equation, strlen($m[0]) + 2);
-                $ptr      = 0;
-            } elseif ($substr === '(') {
-                // opening parenthesis
-                if ($allowcomma > 0) {
-                    ++ $allowcomma;
-                }
+		$delim      = $equation[0];
+		$open       = $delim . '.';
+		$close      = '.' . $delim;
+		$equation   = substr($equation, 1, - 1);
+		$out        = '';
+		$ptr        = 1;
+		$allowcomma = 0;
+		while (strlen($equation) > 0) {
+			$substr = substr($equation, 0, $ptr);
+			if (array_search($substr, $allowed) !== false) {
+				// allowed string
+				$out .= $substr;
+				$equation = substr($equation, $ptr);
+				$ptr      = 0;
+			} elseif (array_search($substr, $funcs) !== false) {
+				// allowed func
+				$out .= $substr;
+				$equation = substr($equation, $ptr);
+				$ptr      = 0;
+				++ $allowcomma;
+				if ($allowcomma === 1) {
+					$allowed[] = ',';
+				}
+			} elseif (isset($rest[$substr])) {
+				// variable
+				$out .= $rest[$substr];
+				$equation = substr($equation, $ptr);
+				$ptr      = 0;
+			} elseif ($substr === $open) {
+				// pre-replaced variable
+				preg_match('#.*\((?:[^()]*?|(?R))\)' . str_replace('.', '\\.', $close) . '#', substr($equation, 2), $m);
+				if (empty($m)) {
+					preg_match('#.*?' . str_replace('.', '\\.', $close) . '#', substr($equation, 2), $m);
+				}
+				$out .= substr($m[0], 0, - 2);
+				$equation = substr($equation, strlen($m[0]) + 2);
+				$ptr      = 0;
+			} elseif ($substr === '(') {
+				// opening parenthesis
+				if ($allowcomma > 0) {
+					++ $allowcomma;
+				}
 
-                $out .= $substr;
-                $equation = substr($equation, $ptr);
-                $ptr      = 0;
-            } elseif ($substr === ')') {
-                // closing parenthesis
-                if ($allowcomma > 0) {
-                    -- $allowcomma;
-                    if ($allowcomma === 0) {
-                        array_pop($allowed);
-                    }
-                }
+				$out .= $substr;
+				$equation = substr($equation, $ptr);
+				$ptr      = 0;
+			} elseif ($substr === ')') {
+				// closing parenthesis
+				if ($allowcomma > 0) {
+					-- $allowcomma;
+					if ($allowcomma === 0) {
+						array_pop($allowed);
+					}
+				}
 
-                $out .= $substr;
-                $equation = substr($equation, $ptr);
-                $ptr      = 0;
-            } elseif ($ptr >= strlen($equation)) {
-                // parse error if we've consumed the entire equation without finding anything valid
-                throw new CompilationException($compiler,
-                    'Math : Syntax error or variable undefined in equation ' . $equationSrc . ' at ' . $substr);
-            } else {
-                // nothing special, advance
-                ++ $ptr;
-            }
-        }
-        if ($format !== '\'\'') {
-            $out = 'sprintf(' . $format . ', ' . $out . ')';
-        }
-        if ($assign !== '\'\'') {
-            return '($this->assignInScope(' . $out . ', ' . $assign . '))';
-        }
+				$out .= $substr;
+				$equation = substr($equation, $ptr);
+				$ptr      = 0;
+			} elseif ($ptr >= strlen($equation)) {
+				// parse error if we've consumed the entire equation without finding anything valid
+				throw new CompilationException($compiler,
+					'Math : Syntax error or variable undefined in equation ' . $equationSrc . ' at ' . $substr);
+			} else {
+				// nothing special, advance
+				++ $ptr;
+			}
+		}
+		if ($format !== '\'\'') {
+			$out = 'sprintf(' . $format . ', ' . $out . ')';
+		}
+		if ($assign !== '\'\'') {
+			return '($this->assignInScope(' . $out . ', ' . $assign . '))';
+		}
 
-        return '(' . $out . ')';
-    }
+		return '(' . $out . ')';
+	}
 }
\ No newline at end of file

Spacing +13 added lines, -13 removed lines

@@ -121,8 +121,8 @@ 
             $equation);
 
         $delim      = $equation[0];
-        $open       = $delim . '.';
-        $close      = '.' . $delim;
+        $open       = $delim.'.';
+        $close      = '.'.$delim;
         $equation   = substr($equation, 1, - 1);
         $out        = '';
         $ptr        = 1;
@@ -139,7 +139,7 @@ 
                 $out .= $substr;
                 $equation = substr($equation, $ptr);
                 $ptr      = 0;
-                ++ $allowcomma;
+                ++$allowcomma;
                 if ($allowcomma === 1) {
                     $allowed[] = ',';
                 }
@@ -150,17 +150,17 @@ 
                 $ptr      = 0;
             } elseif ($substr === $open) {
                 // pre-replaced variable
-                preg_match('#.*\((?:[^()]*?|(?R))\)' . str_replace('.', '\\.', $close) . '#', substr($equation, 2), $m);
+                preg_match('#.*\((?:[^()]*?|(?R))\)'.str_replace('.', '\\.', $close).'#', substr($equation, 2), $m);
                 if (empty($m)) {
-                    preg_match('#.*?' . str_replace('.', '\\.', $close) . '#', substr($equation, 2), $m);
+                    preg_match('#.*?'.str_replace('.', '\\.', $close).'#', substr($equation, 2), $m);
                 }
                 $out .= substr($m[0], 0, - 2);
-                $equation = substr($equation, strlen($m[0]) + 2);
+                $equation = substr($equation, strlen($m[0])+2);
                 $ptr      = 0;
             } elseif ($substr === '(') {
                 // opening parenthesis
                 if ($allowcomma > 0) {
-                    ++ $allowcomma;
+                    ++$allowcomma;
                 }
 
                 $out .= $substr;
@@ -169,7 +169,7 @@ 
             } elseif ($substr === ')') {
                 // closing parenthesis
                 if ($allowcomma > 0) {
-                    -- $allowcomma;
+                    --$allowcomma;
                     if ($allowcomma === 0) {
                         array_pop($allowed);
                     }
@@ -181,19 +181,19 @@ 
             } elseif ($ptr >= strlen($equation)) {
                 // parse error if we've consumed the entire equation without finding anything valid
                 throw new CompilationException($compiler,
-                    'Math : Syntax error or variable undefined in equation ' . $equationSrc . ' at ' . $substr);
+                    'Math : Syntax error or variable undefined in equation '.$equationSrc.' at '.$substr);
             } else {
                 // nothing special, advance
-                ++ $ptr;
+                ++$ptr;
             }
         }
         if ($format !== '\'\'') {
-            $out = 'sprintf(' . $format . ', ' . $out . ')';
+            $out = 'sprintf('.$format.', '.$out.')';
         }
         if ($assign !== '\'\'') {
-            return '($this->assignInScope(' . $out . ', ' . $assign . '))';
+            return '($this->assignInScope('.$out.', '.$assign.'))';
         }
 
-        return '(' . $out . ')';
+        return '('.$out.')';
     }
 }
\ No newline at end of file

lib/Dwoo/Plugins/Helpers/PluginArray.php

Indentation +17 added lines, -17 removed lines

@@ -35,22 +35,22 @@
  */
 class PluginArray extends Plugin implements ICompilable
 {
-    /**
-     * @param Compiler $compiler
-     * @param array    $rest
-     *
-     * @return string
-     */
-    public static function compile(Compiler $compiler, array $rest = array())
-    {
-        $out = array();
-        foreach ($rest as $key => $value) {
-            if (!is_numeric($key) && !strstr($key, '$this->scope')) {
-                $key = "'" . $key . "'";
-            }
-            $out[] = $key . '=>' . $value;
-        }
+	/**
+	 * @param Compiler $compiler
+	 * @param array    $rest
+	 *
+	 * @return string
+	 */
+	public static function compile(Compiler $compiler, array $rest = array())
+	{
+		$out = array();
+		foreach ($rest as $key => $value) {
+			if (!is_numeric($key) && !strstr($key, '$this->scope')) {
+				$key = "'" . $key . "'";
+			}
+			$out[] = $key . '=>' . $value;
+		}
 
-        return 'array(' . implode(', ', $out) . ')';
-    }
+		return 'array(' . implode(', ', $out) . ')';
+	}
 }
\ No newline at end of file

Spacing +3 added lines, -3 removed lines

@@ -46,11 +46,11 @@
         $out = array();
         foreach ($rest as $key => $value) {
             if (!is_numeric($key) && !strstr($key, '$this->scope')) {
-                $key = "'" . $key . "'";
+                $key = "'".$key."'";
             }
-            $out[] = $key . '=>' . $value;
+            $out[] = $key.'=>'.$value;
         }
 
-        return 'array(' . implode(', ', $out) . ')';
+        return 'array('.implode(', ', $out).')';
     }
 }
\ No newline at end of file

lib/Dwoo/Template/File.php

Unused Use Statements -1 removed lines

@@ -18,7 +18,6 @@
 
 use Dwoo\Exception as DwooException;
 use Dwoo\Core as Core;
-use Dwoo\ICompiler;
 use Dwoo\ITemplate as ITemplate;
 use Dwoo\Security\Exception as SecurityException;
 use Dwoo\Template\File as TemplateFile;

Spacing +9 added lines, -9 removed lines

@@ -111,7 +111,7 @@ 
      */
     protected function isValidCompiledFile($file)
     {
-        return parent::isValidCompiledFile($file) && (int)$this->getUid() <= filemtime($file);
+        return parent::isValidCompiledFile($file) && (int) $this->getUid() <= filemtime($file);
     }
 
     /**
@@ -149,12 +149,12 @@ 
         } else {
             foreach ($this->getIncludePath() as $path) {
                 $path = rtrim($path, DIRECTORY_SEPARATOR);
-                if (file_exists($path . DIRECTORY_SEPARATOR . $this->file) === true) {
-                    return $this->resolvedPath = $path . DIRECTORY_SEPARATOR . $this->file;
+                if (file_exists($path.DIRECTORY_SEPARATOR.$this->file) === true) {
+                    return $this->resolvedPath = $path.DIRECTORY_SEPARATOR.$this->file;
                 }
             }
 
-            throw new DwooException('Template "' . $this->file . '" could not be found in any of your include path(s)');
+            throw new DwooException('Template "'.$this->file.'" could not be found in any of your include path(s)');
         }
     }
 
@@ -166,7 +166,7 @@ 
      */
     public function getUid()
     {
-        return (string)filemtime($this->getResourceIdentifier());
+        return (string) filemtime($this->getResourceIdentifier());
     }
 
     /**
@@ -224,7 +224,7 @@ 
                         throw new DwooException('When using an include path you can not reference a template into a parent directory (using ../)');
                     }
                 } else {
-                    $resourceId = dirname($parentTemplate->getResourceIdentifier()) . DIRECTORY_SEPARATOR . $resourceId;
+                    $resourceId = dirname($parentTemplate->getResourceIdentifier()).DIRECTORY_SEPARATOR.$resourceId;
                     if (file_exists($resourceId) === false) {
                         return null;
                     }
@@ -237,7 +237,7 @@ 
         if ($policy = $core->getSecurityPolicy()) {
             while (true) {
                 if (preg_match('{^([a-z]+?)://}i', $resourceId)) {
-                    throw new SecurityException('The security policy prevents you to read files from external sources : <em>' . $resourceId . '</em>.');
+                    throw new SecurityException('The security policy prevents you to read files from external sources : <em>'.$resourceId.'</em>.');
                 }
 
                 if ($includePath) {
@@ -251,7 +251,7 @@ 
                         break 2;
                     }
                 }
-                throw new SecurityException('The security policy prevents you to read <em>' . $resourceId . '</em>');
+                throw new SecurityException('The security policy prevents you to read <em>'.$resourceId.'</em>');
             }
         }
 
@@ -271,6 +271,6 @@ 
      */
     public function getIsModifiedCode()
     {
-        return '"' . $this->getUid() . '" == filemtime(' . var_export($this->getResourceIdentifier(), true) . ')';
+        return '"'.$this->getUid().'" == filemtime('.var_export($this->getResourceIdentifier(), true).')';
     }
 }

Indentation +222 added lines, -222 removed lines

@@ -30,247 +30,247 @@
  */
 class File extends Str
 {
-    /**
-     * Template filename.
-     *
-     * @var string
-     */
-    protected $file;
+	/**
+	 * Template filename.
+	 *
+	 * @var string
+	 */
+	protected $file;
 
-    /**
-     * Include path(s) to look into to find this template.
-     *
-     * @var array
-     */
-    protected $includePath = array();
+	/**
+	 * Include path(s) to look into to find this template.
+	 *
+	 * @var array
+	 */
+	protected $includePath = array();
 
-    /**
-     * Resolved path cache when looking for a file in multiple include paths.
-     * this is reset when the include path is changed
-     *
-     * @var string
-     */
-    protected $resolvedPath = null;
+	/**
+	 * Resolved path cache when looking for a file in multiple include paths.
+	 * this is reset when the include path is changed
+	 *
+	 * @var string
+	 */
+	protected $resolvedPath = null;
 
-    /**
-     * Creates a template from a file.
-     *
-     * @param string $file        the path to the template file, make sure it exists
-     * @param int    $cacheTime   duration of the cache validity for this template,
-     *                            if null it defaults to the Dwoo instance that will
-     *                            render this template
-     * @param string $cacheId     the unique cache identifier of this page or anything else that
-     *                            makes this template's content unique, if null it defaults
-     *                            to the current url
-     * @param string $compileId   the unique compiled identifier, which is used to distinguish this
-     *                            template from others, if null it defaults to the filename+bits of the path
-     * @param mixed  $includePath a string for a single path to look into for the given file, or an array of paths
-     */
-    public function __construct($file, $cacheTime = null, $cacheId = null, $compileId = null, $includePath = array())
-    {
-        parent::__construct($file, $cacheTime, $cacheId, $compileId);
-        $this->template = null;
-        $this->file     = $file;
-        $this->name     = basename($file);
-        $this->setIncludePath($includePath);
-        $this->compileId = $this->getResourceIdentifier();
-    }
+	/**
+	 * Creates a template from a file.
+	 *
+	 * @param string $file        the path to the template file, make sure it exists
+	 * @param int    $cacheTime   duration of the cache validity for this template,
+	 *                            if null it defaults to the Dwoo instance that will
+	 *                            render this template
+	 * @param string $cacheId     the unique cache identifier of this page or anything else that
+	 *                            makes this template's content unique, if null it defaults
+	 *                            to the current url
+	 * @param string $compileId   the unique compiled identifier, which is used to distinguish this
+	 *                            template from others, if null it defaults to the filename+bits of the path
+	 * @param mixed  $includePath a string for a single path to look into for the given file, or an array of paths
+	 */
+	public function __construct($file, $cacheTime = null, $cacheId = null, $compileId = null, $includePath = array())
+	{
+		parent::__construct($file, $cacheTime, $cacheId, $compileId);
+		$this->template = null;
+		$this->file     = $file;
+		$this->name     = basename($file);
+		$this->setIncludePath($includePath);
+		$this->compileId = $this->getResourceIdentifier();
+	}
 
-    /**
-     * Sets the include path(s) to where the given template filename must be looked up.
-     *
-     * @param mixed $paths the path to look into, can be string for a single path or an array of paths
-     */
-    public function setIncludePath($paths)
-    {
-        if (is_array($paths) === false) {
-            $paths = array($paths);
-        }
+	/**
+	 * Sets the include path(s) to where the given template filename must be looked up.
+	 *
+	 * @param mixed $paths the path to look into, can be string for a single path or an array of paths
+	 */
+	public function setIncludePath($paths)
+	{
+		if (is_array($paths) === false) {
+			$paths = array($paths);
+		}
 
-        $this->includePath  = $paths;
-        $this->resolvedPath = null;
-    }
+		$this->includePath  = $paths;
+		$this->resolvedPath = null;
+	}
 
-    /**
-     * Return the current include path(s).
-     *
-     * @return array
-     */
-    public function getIncludePath()
-    {
-        return $this->includePath;
-    }
+	/**
+	 * Return the current include path(s).
+	 *
+	 * @return array
+	 */
+	public function getIncludePath()
+	{
+		return $this->includePath;
+	}
 
-    /**
-     * Checks if compiled file is valid (exists and it's the modification is greater or
-     * equal to the modification time of the template file).
-     *
-     * @param string file
-     *
-     * @return bool True cache file existance and it's modification time
-     */
-    protected function isValidCompiledFile($file)
-    {
-        return parent::isValidCompiledFile($file) && (int)$this->getUid() <= filemtime($file);
-    }
+	/**
+	 * Checks if compiled file is valid (exists and it's the modification is greater or
+	 * equal to the modification time of the template file).
+	 *
+	 * @param string file
+	 *
+	 * @return bool True cache file existance and it's modification time
+	 */
+	protected function isValidCompiledFile($file)
+	{
+		return parent::isValidCompiledFile($file) && (int)$this->getUid() <= filemtime($file);
+	}
 
-    /**
-     * Returns the template source of this template.
-     *
-     * @return string
-     */
-    public function getSource()
-    {
-        return file_get_contents($this->getResourceIdentifier());
-    }
+	/**
+	 * Returns the template source of this template.
+	 *
+	 * @return string
+	 */
+	public function getSource()
+	{
+		return file_get_contents($this->getResourceIdentifier());
+	}
 
-    /**
-     * Returns the resource name for this template class.
-     *
-     * @return string
-     */
-    public function getResourceName()
-    {
-        return 'file';
-    }
+	/**
+	 * Returns the resource name for this template class.
+	 *
+	 * @return string
+	 */
+	public function getResourceName()
+	{
+		return 'file';
+	}
 
-    /**
-     * Returns this template's source filename.
-     *
-     * @return string
-     * @throws DwooException
-     */
-    public function getResourceIdentifier()
-    {
-        if ($this->resolvedPath !== null) {
-            return $this->resolvedPath;
-        } elseif (array_filter($this->getIncludePath()) == array()) {
-            return $this->file;
-        } else {
-            foreach ($this->getIncludePath() as $path) {
-                $path = rtrim($path, DIRECTORY_SEPARATOR);
-                if (file_exists($path . DIRECTORY_SEPARATOR . $this->file) === true) {
-                    return $this->resolvedPath = $path . DIRECTORY_SEPARATOR . $this->file;
-                }
-            }
+	/**
+	 * Returns this template's source filename.
+	 *
+	 * @return string
+	 * @throws DwooException
+	 */
+	public function getResourceIdentifier()
+	{
+		if ($this->resolvedPath !== null) {
+			return $this->resolvedPath;
+		} elseif (array_filter($this->getIncludePath()) == array()) {
+			return $this->file;
+		} else {
+			foreach ($this->getIncludePath() as $path) {
+				$path = rtrim($path, DIRECTORY_SEPARATOR);
+				if (file_exists($path . DIRECTORY_SEPARATOR . $this->file) === true) {
+					return $this->resolvedPath = $path . DIRECTORY_SEPARATOR . $this->file;
+				}
+			}
 
-            throw new DwooException('Template "' . $this->file . '" could not be found in any of your include path(s)');
-        }
-    }
+			throw new DwooException('Template "' . $this->file . '" could not be found in any of your include path(s)');
+		}
+	}
 
-    /**
-     * Returns an unique value identifying the current version of this template,
-     * in this case it's the unix timestamp of the last modification.
-     *
-     * @return string
-     */
-    public function getUid()
-    {
-        return (string)filemtime($this->getResourceIdentifier());
-    }
+	/**
+	 * Returns an unique value identifying the current version of this template,
+	 * in this case it's the unix timestamp of the last modification.
+	 *
+	 * @return string
+	 */
+	public function getUid()
+	{
+		return (string)filemtime($this->getResourceIdentifier());
+	}
 
-    /**
-     * Returns a new template object from the given include name, null if no include is
-     * possible (resource not found), or false if include is not permitted by this resource type.
-     *
-     * @param Core      $core           the dwoo instance requiring it
-     * @param mixed     $resourceId     the filename (relative to this template's dir) of the template to
-     *                                  include
-     * @param int       $cacheTime      duration of the cache validity for this template, if null it defaults
-     *                                  to the Dwoo instance that will render this template if null it
-     *                                  defaults to the Dwoo instance that will render this template if null
-     *                                  it defaults to the Dwoo instance that will render this template
-     * @param string    $cacheId        the unique cache identifier of this page or anything else that makes
-     *                                  this template's content unique, if null it defaults to the current
-     *                                  url makes this template's content unique, if null it defaults to the
-     *                                  current url makes this template's content unique, if null it defaults
-     *                                  to the current url
-     * @param string    $compileId      the unique compiled identifier, which is used to distinguish this
-     *                                  template from others, if null it defaults to the filename+bits of the
-     *                                  path template from others, if null it defaults to the filename+bits
-     *                                  of the path template from others, if null it defaults to the
-     *                                  filename+bits of the path
-     * @param ITemplate $parentTemplate the template that is requesting a new template object (through an
-     *                                  include, extends or any other plugin) an include, extends or any
-     *                                  other plugin) an include, extends or any other plugin)
-     *
-     * @return TemplateFile|null
-     * @throws DwooException
-     * @throws SecurityException
-     */
-    public static function templateFactory(Core $core, $resourceId, $cacheTime = null, $cacheId = null,
-                                           $compileId = null, ITemplate $parentTemplate = null)
-    {
-        if (DIRECTORY_SEPARATOR === '\\') {
-            $resourceId = str_replace(array("\t", "\n", "\r", "\f", "\v"), array(
-                '\\t',
-                '\\n',
-                '\\r',
-                '\\f',
-                '\\v'
-            ), $resourceId);
-        }
-        $resourceId = strtr($resourceId, '\\', '/');
+	/**
+	 * Returns a new template object from the given include name, null if no include is
+	 * possible (resource not found), or false if include is not permitted by this resource type.
+	 *
+	 * @param Core      $core           the dwoo instance requiring it
+	 * @param mixed     $resourceId     the filename (relative to this template's dir) of the template to
+	 *                                  include
+	 * @param int       $cacheTime      duration of the cache validity for this template, if null it defaults
+	 *                                  to the Dwoo instance that will render this template if null it
+	 *                                  defaults to the Dwoo instance that will render this template if null
+	 *                                  it defaults to the Dwoo instance that will render this template
+	 * @param string    $cacheId        the unique cache identifier of this page or anything else that makes
+	 *                                  this template's content unique, if null it defaults to the current
+	 *                                  url makes this template's content unique, if null it defaults to the
+	 *                                  current url makes this template's content unique, if null it defaults
+	 *                                  to the current url
+	 * @param string    $compileId      the unique compiled identifier, which is used to distinguish this
+	 *                                  template from others, if null it defaults to the filename+bits of the
+	 *                                  path template from others, if null it defaults to the filename+bits
+	 *                                  of the path template from others, if null it defaults to the
+	 *                                  filename+bits of the path
+	 * @param ITemplate $parentTemplate the template that is requesting a new template object (through an
+	 *                                  include, extends or any other plugin) an include, extends or any
+	 *                                  other plugin) an include, extends or any other plugin)
+	 *
+	 * @return TemplateFile|null
+	 * @throws DwooException
+	 * @throws SecurityException
+	 */
+	public static function templateFactory(Core $core, $resourceId, $cacheTime = null, $cacheId = null,
+										   $compileId = null, ITemplate $parentTemplate = null)
+	{
+		if (DIRECTORY_SEPARATOR === '\\') {
+			$resourceId = str_replace(array("\t", "\n", "\r", "\f", "\v"), array(
+				'\\t',
+				'\\n',
+				'\\r',
+				'\\f',
+				'\\v'
+			), $resourceId);
+		}
+		$resourceId = strtr($resourceId, '\\', '/');
 
-        $includePath = null;
+		$includePath = null;
 
-        if (file_exists($resourceId) === false) {
-            if ($parentTemplate === null) {
-                $parentTemplate = $core->getTemplate();
-            }
-            if ($parentTemplate instanceof self) {
-                if ($includePath = $parentTemplate->getIncludePath()) {
-                    if (strstr($resourceId, '../')) {
-                        throw new DwooException('When using an include path you can not reference a template into a parent directory (using ../)');
-                    }
-                } else {
-                    $resourceId = dirname($parentTemplate->getResourceIdentifier()) . DIRECTORY_SEPARATOR . $resourceId;
-                    if (file_exists($resourceId) === false) {
-                        return null;
-                    }
-                }
-            } else {
-                return null;
-            }
-        }
+		if (file_exists($resourceId) === false) {
+			if ($parentTemplate === null) {
+				$parentTemplate = $core->getTemplate();
+			}
+			if ($parentTemplate instanceof self) {
+				if ($includePath = $parentTemplate->getIncludePath()) {
+					if (strstr($resourceId, '../')) {
+						throw new DwooException('When using an include path you can not reference a template into a parent directory (using ../)');
+					}
+				} else {
+					$resourceId = dirname($parentTemplate->getResourceIdentifier()) . DIRECTORY_SEPARATOR . $resourceId;
+					if (file_exists($resourceId) === false) {
+						return null;
+					}
+				}
+			} else {
+				return null;
+			}
+		}
 
-        if ($policy = $core->getSecurityPolicy()) {
-            while (true) {
-                if (preg_match('{^([a-z]+?)://}i', $resourceId)) {
-                    throw new SecurityException('The security policy prevents you to read files from external sources : <em>' . $resourceId . '</em>.');
-                }
+		if ($policy = $core->getSecurityPolicy()) {
+			while (true) {
+				if (preg_match('{^([a-z]+?)://}i', $resourceId)) {
+					throw new SecurityException('The security policy prevents you to read files from external sources : <em>' . $resourceId . '</em>.');
+				}
 
-                if ($includePath) {
-                    break;
-                }
+				if ($includePath) {
+					break;
+				}
 
-                $resourceId = realpath($resourceId);
-                $dirs       = $policy->getAllowedDirectories();
-                foreach ($dirs as $dir => $dummy) {
-                    if (strpos($resourceId, $dir) === 0) {
-                        break 2;
-                    }
-                }
-                throw new SecurityException('The security policy prevents you to read <em>' . $resourceId . '</em>');
-            }
-        }
+				$resourceId = realpath($resourceId);
+				$dirs       = $policy->getAllowedDirectories();
+				foreach ($dirs as $dir => $dummy) {
+					if (strpos($resourceId, $dir) === 0) {
+						break 2;
+					}
+				}
+				throw new SecurityException('The security policy prevents you to read <em>' . $resourceId . '</em>');
+			}
+		}
 
-        $class = 'Dwoo\Template\File';
-        if ($parentTemplate) {
-            $class = get_class($parentTemplate);
-        }
+		$class = 'Dwoo\Template\File';
+		if ($parentTemplate) {
+			$class = get_class($parentTemplate);
+		}
 
-        return new $class($resourceId, $cacheTime, $cacheId, $compileId, $includePath);
-    }
+		return new $class($resourceId, $cacheTime, $cacheId, $compileId, $includePath);
+	}
 
-    /**
-     * Returns some php code that will check if this template has been modified or not.
-     * if the function returns null, the template will be instanciated and then the Uid checked
-     *
-     * @return string
-     */
-    public function getIsModifiedCode()
-    {
-        return '"' . $this->getUid() . '" == filemtime(' . var_export($this->getResourceIdentifier(), true) . ')';
-    }
+	/**
+	 * Returns some php code that will check if this template has been modified or not.
+	 * if the function returns null, the template will be instanciated and then the Uid checked
+	 *
+	 * @return string
+	 */
+	public function getIsModifiedCode()
+	{
+		return '"' . $this->getUid() . '" == filemtime(' . var_export($this->getResourceIdentifier(), true) . ')';
+	}
 }

lib/Dwoo/Data.php

Indentation +219 added lines, -219 removed lines

@@ -24,241 +24,241 @@
  */
 class Data implements IDataProvider
 {
-    /**
-     * Data array.
-     *
-     * @var array
-     */
-    protected $data = array();
+	/**
+	 * Data array.
+	 *
+	 * @var array
+	 */
+	protected $data = array();
 
-    /**
-     * Returns the data array.
-     *
-     * @return array
-     */
-    public function getData()
-    {
-        return $this->data;
-    }
+	/**
+	 * Returns the data array.
+	 *
+	 * @return array
+	 */
+	public function getData()
+	{
+		return $this->data;
+	}
 
-    /**
-     * Clears a the entire data or only the given key.
-     *
-     * @param array|string $name clears only one value if you give a name, multiple values if
-     *                           you give an array of names, or the entire data if left null
-     */
-    public function clear($name = null)
-    {
-        if ($name === null) {
-            $this->data = array();
-        } elseif (is_array($name)) {
-            foreach ($name as $index) {
-                unset($this->data[$index]);
-            }
-        } else {
-            unset($this->data[$name]);
-        }
-    }
+	/**
+	 * Clears a the entire data or only the given key.
+	 *
+	 * @param array|string $name clears only one value if you give a name, multiple values if
+	 *                           you give an array of names, or the entire data if left null
+	 */
+	public function clear($name = null)
+	{
+		if ($name === null) {
+			$this->data = array();
+		} elseif (is_array($name)) {
+			foreach ($name as $index) {
+				unset($this->data[$index]);
+			}
+		} else {
+			unset($this->data[$name]);
+		}
+	}
 
-    /**
-     * Overwrites the entire data with the given array.
-     *
-     * @param array $data the new data array to use
-     */
-    public function setData(array $data)
-    {
-        $this->data = $data;
-    }
+	/**
+	 * Overwrites the entire data with the given array.
+	 *
+	 * @param array $data the new data array to use
+	 */
+	public function setData(array $data)
+	{
+		$this->data = $data;
+	}
 
-    /**
-     * merges the given array(s) with the current data with array_merge.
-     *
-     * @param array $data  the array to merge
-     */
-    public function mergeData(array $data)
-    {
-        $args = func_get_args();
-        foreach ($args as $key => $v) {
-            if (is_array($v)) {
-                $this->data = array_merge($this->data, $v);
-            }
-        }
-    }
+	/**
+	 * merges the given array(s) with the current data with array_merge.
+	 *
+	 * @param array $data  the array to merge
+	 */
+	public function mergeData(array $data)
+	{
+		$args = func_get_args();
+		foreach ($args as $key => $v) {
+			if (is_array($v)) {
+				$this->data = array_merge($this->data, $v);
+			}
+		}
+	}
 
-    /**
-     * Assigns a value or an array of values to the data object.
-     *
-     * @param array|string $name an associative array of multiple (index=>value) or a string
-     *                           that is the index to use, i.e. a value assigned to "foo" will be
-     *                           accessible in the template through {$foo}
-     * @param mixed        $val  the value to assign, or null if $name was an array
-     */
-    public function assign($name, $val = null)
-    {
-        if (is_array($name)) {
-            reset($name);
-            foreach ($name as $k => $v){
-                $this->data[$k] = $v;
-            }
-        } else {
-            $this->data[$name] = $val;
-        }
-    }
+	/**
+	 * Assigns a value or an array of values to the data object.
+	 *
+	 * @param array|string $name an associative array of multiple (index=>value) or a string
+	 *                           that is the index to use, i.e. a value assigned to "foo" will be
+	 *                           accessible in the template through {$foo}
+	 * @param mixed        $val  the value to assign, or null if $name was an array
+	 */
+	public function assign($name, $val = null)
+	{
+		if (is_array($name)) {
+			reset($name);
+			foreach ($name as $k => $v){
+				$this->data[$k] = $v;
+			}
+		} else {
+			$this->data[$name] = $val;
+		}
+	}
 
-    /**
-     * Allows to assign variables using the object syntax.
-     *
-     * @param string $name  the variable name
-     * @param string $value the value to assign to it
-     */
-    public function __set($name, $value)
-    {
-        $this->assign($name, $value);
-    }
+	/**
+	 * Allows to assign variables using the object syntax.
+	 *
+	 * @param string $name  the variable name
+	 * @param string $value the value to assign to it
+	 */
+	public function __set($name, $value)
+	{
+		$this->assign($name, $value);
+	}
 
-    /**
-     * Assigns a value by reference to the data object.
-     *
-     * @param string $name the index to use, i.e. a value assigned to "foo" will be
-     *                     accessible in the template through {$foo}
-     * @param mixed  $val  the value to assign by reference
-     */
-    public function assignByRef($name, &$val)
-    {
-        $this->data[$name] = &$val;
-    }
+	/**
+	 * Assigns a value by reference to the data object.
+	 *
+	 * @param string $name the index to use, i.e. a value assigned to "foo" will be
+	 *                     accessible in the template through {$foo}
+	 * @param mixed  $val  the value to assign by reference
+	 */
+	public function assignByRef($name, &$val)
+	{
+		$this->data[$name] = &$val;
+	}
 
-    /**
-     * Appends values or an array of values to the data object.
-     *
-     * @param array|string $name  an associative array of multiple (index=>value) or a string
-     *                            that is the index to use, i.e. a value assigned to "foo" will be
-     *                            accessible in the template through {$foo}
-     * @param mixed        $val   the value to assign, or null if $name was an array
-     * @param bool         $merge true to merge data or false to append, defaults to false
-     */
-    public function append($name, $val = null, $merge = false)
-    {
-        if (is_array($name)) {
-            foreach ($name as $key => $val) {
-                if (isset($this->data[$key]) && !is_array($this->data[$key])) {
-                    settype($this->data[$key], 'array');
-                }
+	/**
+	 * Appends values or an array of values to the data object.
+	 *
+	 * @param array|string $name  an associative array of multiple (index=>value) or a string
+	 *                            that is the index to use, i.e. a value assigned to "foo" will be
+	 *                            accessible in the template through {$foo}
+	 * @param mixed        $val   the value to assign, or null if $name was an array
+	 * @param bool         $merge true to merge data or false to append, defaults to false
+	 */
+	public function append($name, $val = null, $merge = false)
+	{
+		if (is_array($name)) {
+			foreach ($name as $key => $val) {
+				if (isset($this->data[$key]) && !is_array($this->data[$key])) {
+					settype($this->data[$key], 'array');
+				}
 
-                if ($merge === true && is_array($val)) {
-                    $this->data[$key] = $val + $this->data[$key];
-                } else {
-                    $this->data[$key][] = $val;
-                }
-            }
-        } elseif ($val !== null) {
-            if (isset($this->data[$name]) && !is_array($this->data[$name])) {
-                settype($this->data[$name], 'array');
-            } elseif (!isset($this->data[$name])) {
-                $this->data[$name] = array();
-            }
+				if ($merge === true && is_array($val)) {
+					$this->data[$key] = $val + $this->data[$key];
+				} else {
+					$this->data[$key][] = $val;
+				}
+			}
+		} elseif ($val !== null) {
+			if (isset($this->data[$name]) && !is_array($this->data[$name])) {
+				settype($this->data[$name], 'array');
+			} elseif (!isset($this->data[$name])) {
+				$this->data[$name] = array();
+			}
 
-            if ($merge === true && is_array($val)) {
-                $this->data[$name] = $val + $this->data[$name];
-            } else {
-                $this->data[$name][] = $val;
-            }
-        }
-    }
+			if ($merge === true && is_array($val)) {
+				$this->data[$name] = $val + $this->data[$name];
+			} else {
+				$this->data[$name][] = $val;
+			}
+		}
+	}
 
-    /**
-     * Appends a value by reference to the data object.
-     *
-     * @param string $name  the index to use, i.e. a value assigned to "foo" will be
-     *                      accessible in the template through {$foo}
-     * @param mixed  $val   the value to append by reference
-     * @param bool   $merge true to merge data or false to append, defaults to false
-     */
-    public function appendByRef($name, &$val, $merge = false)
-    {
-        if (isset($this->data[$name]) && !is_array($this->data[$name])) {
-            settype($this->data[$name], 'array');
-        }
+	/**
+	 * Appends a value by reference to the data object.
+	 *
+	 * @param string $name  the index to use, i.e. a value assigned to "foo" will be
+	 *                      accessible in the template through {$foo}
+	 * @param mixed  $val   the value to append by reference
+	 * @param bool   $merge true to merge data or false to append, defaults to false
+	 */
+	public function appendByRef($name, &$val, $merge = false)
+	{
+		if (isset($this->data[$name]) && !is_array($this->data[$name])) {
+			settype($this->data[$name], 'array');
+		}
 
-        if ($merge === true && is_array($val)) {
-            foreach ($val as $key => &$value) {
-                $this->data[$name][$key] = &$value;
-            }
-        } else {
-            $this->data[$name][] = &$val;
-        }
-    }
+		if ($merge === true && is_array($val)) {
+			foreach ($val as $key => &$value) {
+				$this->data[$name][$key] = &$value;
+			}
+		} else {
+			$this->data[$name][] = &$val;
+		}
+	}
 
-    /**
-     * Returns true if the variable has been assigned already, false otherwise.
-     *
-     * @param string $name the variable name
-     *
-     * @return bool
-     */
-    public function isAssigned($name)
-    {
-        return isset($this->data[$name]);
-    }
+	/**
+	 * Returns true if the variable has been assigned already, false otherwise.
+	 *
+	 * @param string $name the variable name
+	 *
+	 * @return bool
+	 */
+	public function isAssigned($name)
+	{
+		return isset($this->data[$name]);
+	}
 
-    /**
-     * Supports calls to isset($dwoo->var).
-     *
-     * @param string $name the variable name
-     *
-     * @return bool
-     */
-    public function __isset($name)
-    {
-        return isset($this->data[$name]);
-    }
+	/**
+	 * Supports calls to isset($dwoo->var).
+	 *
+	 * @param string $name the variable name
+	 *
+	 * @return bool
+	 */
+	public function __isset($name)
+	{
+		return isset($this->data[$name]);
+	}
 
-    /**
-     * Unassigns/removes a variable.
-     *
-     * @param string $name the variable name
-     */
-    public function unassign($name)
-    {
-        unset($this->data[$name]);
-    }
+	/**
+	 * Unassigns/removes a variable.
+	 *
+	 * @param string $name the variable name
+	 */
+	public function unassign($name)
+	{
+		unset($this->data[$name]);
+	}
 
-    /**
-     * Supports unsetting variables using the object syntax.
-     *
-     * @param string $name the variable name
-     */
-    public function __unset($name)
-    {
-        unset($this->data[$name]);
-    }
+	/**
+	 * Supports unsetting variables using the object syntax.
+	 *
+	 * @param string $name the variable name
+	 */
+	public function __unset($name)
+	{
+		unset($this->data[$name]);
+	}
 
-    /**
-     * Returns a variable if it was assigned.
-     *
-     * @param string $name the variable name
-     *
-     * @return mixed
-     */
-    public function get($name)
-    {
-        return $this->__get($name);
-    }
+	/**
+	 * Returns a variable if it was assigned.
+	 *
+	 * @param string $name the variable name
+	 *
+	 * @return mixed
+	 */
+	public function get($name)
+	{
+		return $this->__get($name);
+	}
 
-    /**
-     * Allows to read variables using the object syntax.
-     *
-     * @param string $name the variable name
-     *
-     * @return mixed
-     * @throws Exception
-     */
-    public function __get($name)
-    {
-        if (isset($this->data[$name])) {
-            return $this->data[$name];
-        } else {
-            throw new Exception('Tried to read a value that was not assigned yet : "' . $name . '"');
-        }
-    }
+	/**
+	 * Allows to read variables using the object syntax.
+	 *
+	 * @param string $name the variable name
+	 *
+	 * @return mixed
+	 * @throws Exception
+	 */
+	public function __get($name)
+	{
+		if (isset($this->data[$name])) {
+			return $this->data[$name];
+		} else {
+			throw new Exception('Tried to read a value that was not assigned yet : "' . $name . '"');
+		}
+	}
 }

Spacing +4 added lines, -4 removed lines

@@ -97,7 +97,7 @@ 
     {
         if (is_array($name)) {
             reset($name);
-            foreach ($name as $k => $v){
+            foreach ($name as $k => $v) {
                 $this->data[$k] = $v;
             }
         } else {
@@ -146,7 +146,7 @@ 
                 }
 
                 if ($merge === true && is_array($val)) {
-                    $this->data[$key] = $val + $this->data[$key];
+                    $this->data[$key] = $val+$this->data[$key];
                 } else {
                     $this->data[$key][] = $val;
                 }
@@ -159,7 +159,7 @@ 
             }
 
             if ($merge === true && is_array($val)) {
-                $this->data[$name] = $val + $this->data[$name];
+                $this->data[$name] = $val+$this->data[$name];
             } else {
                 $this->data[$name][] = $val;
             }
@@ -258,7 +258,7 @@ 
         if (isset($this->data[$name])) {
             return $this->data[$name];
         } else {
-            throw new Exception('Tried to read a value that was not assigned yet : "' . $name . '"');
+            throw new Exception('Tried to read a value that was not assigned yet : "'.$name.'"');
         }
     }
 }

lib/Dwoo/ITemplate.php

Indentation +122 added lines, -122 removed lines

@@ -23,139 +23,139 @@
  */
 interface ITemplate
 {
-    /**
-     * Returns the cache duration for this template.
-     * defaults to null if it was not provided
-     *
-     * @return int|null
-     */
-    public function getCacheTime();
+	/**
+	 * Returns the cache duration for this template.
+	 * defaults to null if it was not provided
+	 *
+	 * @return int|null
+	 */
+	public function getCacheTime();
 
-    /**
-     * Sets the cache duration for this template.
-     * can be used to set it after the object is created if you did not provide
-     * it in the constructor
-     *
-     * @param int $seconds duration of the cache validity for this template, if
-     *                     null it defaults to the Dwoo instance's cache time. 0 = disable and
-     *                     -1 = infinite cache
-     */
-    public function setCacheTime($seconds = null);
+	/**
+	 * Sets the cache duration for this template.
+	 * can be used to set it after the object is created if you did not provide
+	 * it in the constructor
+	 *
+	 * @param int $seconds duration of the cache validity for this template, if
+	 *                     null it defaults to the Dwoo instance's cache time. 0 = disable and
+	 *                     -1 = infinite cache
+	 */
+	public function setCacheTime($seconds = null);
 
-    /**
-     * Returns the cached template output file name, true if it's cache-able but not cached
-     * or false if it's not cached.
-     *
-     * @param Core $core the dwoo instance that requests it
-     *
-     * @return string|bool
-     */
-    public function getCachedTemplate(Core $core);
+	/**
+	 * Returns the cached template output file name, true if it's cache-able but not cached
+	 * or false if it's not cached.
+	 *
+	 * @param Core $core the dwoo instance that requests it
+	 *
+	 * @return string|bool
+	 */
+	public function getCachedTemplate(Core $core);
 
-    /**
-     * Caches the provided output into the cache file.
-     *
-     * @param Core   $core   the dwoo instance that requests it
-     * @param string $output the template output
-     *
-     * @return mixed full path of the cached file or false upon failure
-     */
-    public function cache(Core $core, $output);
+	/**
+	 * Caches the provided output into the cache file.
+	 *
+	 * @param Core   $core   the dwoo instance that requests it
+	 * @param string $output the template output
+	 *
+	 * @return mixed full path of the cached file or false upon failure
+	 */
+	public function cache(Core $core, $output);
 
-    /**
-     * Clears the cached template if it's older than the given time.
-     *
-     * @param Core $core      the dwoo instance that was used to cache that template
-     * @param int  $olderThan minimum time (in seconds) required for the cache to be cleared
-     *
-     * @return bool true if the cache was not present or if it was deleted, false if it remains there
-     */
-    public function clearCache(Core $core, $olderThan = - 1);
+	/**
+	 * Clears the cached template if it's older than the given time.
+	 *
+	 * @param Core $core      the dwoo instance that was used to cache that template
+	 * @param int  $olderThan minimum time (in seconds) required for the cache to be cleared
+	 *
+	 * @return bool true if the cache was not present or if it was deleted, false if it remains there
+	 */
+	public function clearCache(Core $core, $olderThan = - 1);
 
-    /**
-     * Returns the compiled template file name.
-     *
-     * @param Core      $core     the dwoo instance that requests it
-     * @param ICompiler $compiler the compiler that must be used
-     *
-     * @return string
-     */
-    public function getCompiledTemplate(Core $core, ICompiler $compiler = null);
+	/**
+	 * Returns the compiled template file name.
+	 *
+	 * @param Core      $core     the dwoo instance that requests it
+	 * @param ICompiler $compiler the compiler that must be used
+	 *
+	 * @return string
+	 */
+	public function getCompiledTemplate(Core $core, ICompiler $compiler = null);
 
-    /**
-     * Returns the template name.
-     *
-     * @return string
-     */
-    public function getName();
+	/**
+	 * Returns the template name.
+	 *
+	 * @return string
+	 */
+	public function getName();
 
-    /**
-     * Returns the resource name for this template class.
-     *
-     * @return string
-     */
-    public function getResourceName();
+	/**
+	 * Returns the resource name for this template class.
+	 *
+	 * @return string
+	 */
+	public function getResourceName();
 
-    /**
-     * Returns the resource identifier for this template or false if it has no identifier.
-     *
-     * @return string|false
-     */
-    public function getResourceIdentifier();
+	/**
+	 * Returns the resource identifier for this template or false if it has no identifier.
+	 *
+	 * @return string|false
+	 */
+	public function getResourceIdentifier();
 
-    /**
-     * Returns the template source of this template.
-     *
-     * @return string
-     */
-    public function getSource();
+	/**
+	 * Returns the template source of this template.
+	 *
+	 * @return string
+	 */
+	public function getSource();
 
-    /**
-     * Returns an unique string identifying the current version of this template,
-     * for example a timestamp of the last modified date or a hash of the template source.
-     *
-     * @return string
-     */
-    public function getUid();
+	/**
+	 * Returns an unique string identifying the current version of this template,
+	 * for example a timestamp of the last modified date or a hash of the template source.
+	 *
+	 * @return string
+	 */
+	public function getUid();
 
-    /**
-     * Returns the compiler used by this template, if it was just compiled, or null.
-     *
-     * @return ICompiler
-     */
-    public function getCompiler();
+	/**
+	 * Returns the compiler used by this template, if it was just compiled, or null.
+	 *
+	 * @return ICompiler
+	 */
+	public function getCompiler();
 
-    /**
-     * Returns some php code that will check if this template has been modified or not.
-     * if the function returns null, the template will be instanciated and then the Uid checked
-     *
-     * @return string
-     */
-    public function getIsModifiedCode();
+	/**
+	 * Returns some php code that will check if this template has been modified or not.
+	 * if the function returns null, the template will be instanciated and then the Uid checked
+	 *
+	 * @return string
+	 */
+	public function getIsModifiedCode();
 
-    /**
-     * Returns a new template object from the given resource identifier, null if no include is
-     * possible (resource not found), or false if include is not permitted by this resource type.
-     * this method should also check if $dwoo->getSecurityPolicy() is null or not and do the
-     * necessary permission checks if required, if the security policy prevents the template
-     * generation it should throw a new Security\Exception with a relevant message
-     *
-     * @param Core      $core
-     * @param mixed     $resourceId     the resource identifier
-     * @param int       $cacheTime      duration of the cache validity for this template, if null it defaults to the
-     *                                  Dwoo instance that will render this template if null it defaults to the Dwoo
-     *                                  instance that will render this template
-     * @param string    $cacheId        the unique cache identifier of this page or anything else that makes this
-     *                                  template's content unique, if null it defaults to the current url makes this
-     *                                  template's content unique, if null it defaults to the current url
-     * @param string    $compileId      the unique compiled identifier, which is used to distinguish this template from
-     *                                  others, if null it defaults to the filename+bits of the path template from
-     *                                  others, if null it defaults to the filename+bits of the path
-     * @param ITemplate $parentTemplate the template that is requesting a new template object (through an include,
-     *                                  extends or any other plugin) an include, extends or any other plugin)
-     *
-     * @return ITemplate|false|null
-     */
-    public static function templateFactory(Core $core, $resourceId, $cacheTime = null, $cacheId = null,
-                                           $compileId = null, ITemplate $parentTemplate = null);
+	/**
+	 * Returns a new template object from the given resource identifier, null if no include is
+	 * possible (resource not found), or false if include is not permitted by this resource type.
+	 * this method should also check if $dwoo->getSecurityPolicy() is null or not and do the
+	 * necessary permission checks if required, if the security policy prevents the template
+	 * generation it should throw a new Security\Exception with a relevant message
+	 *
+	 * @param Core      $core
+	 * @param mixed     $resourceId     the resource identifier
+	 * @param int       $cacheTime      duration of the cache validity for this template, if null it defaults to the
+	 *                                  Dwoo instance that will render this template if null it defaults to the Dwoo
+	 *                                  instance that will render this template
+	 * @param string    $cacheId        the unique cache identifier of this page or anything else that makes this
+	 *                                  template's content unique, if null it defaults to the current url makes this
+	 *                                  template's content unique, if null it defaults to the current url
+	 * @param string    $compileId      the unique compiled identifier, which is used to distinguish this template from
+	 *                                  others, if null it defaults to the filename+bits of the path template from
+	 *                                  others, if null it defaults to the filename+bits of the path
+	 * @param ITemplate $parentTemplate the template that is requesting a new template object (through an include,
+	 *                                  extends or any other plugin) an include, extends or any other plugin)
+	 *
+	 * @return ITemplate|false|null
+	 */
+	public static function templateFactory(Core $core, $resourceId, $cacheTime = null, $cacheId = null,
+										   $compileId = null, ITemplate $parentTemplate = null);
 }