dwoo-project / dwoo

lib/Dwoo/Compilation/Exception.php

Indentation +28 added lines, -28 removed lines

@@ -26,35 +26,35 @@
  */
 class Exception extends DwooException
 {
-    protected $compiler;
-    protected $template;
+	protected $compiler;
+	protected $template;
 
-    /**
-     * Exception constructor.
-     *
-     * @param DwooCompiler $compiler
-     * @param int          $message
-     */
-    public function __construct(DwooCompiler $compiler, $message)
-    {
-        $this->compiler = $compiler;
-        $this->template = $compiler->getCore()->getTemplate();
-        parent::__construct('Compilation error at line ' . $compiler->getLine() . ' in "' . $this->template->getResourceName() . ':' . $this->template->getResourceIdentifier() . '" : ' . $message);
-    }
+	/**
+	 * Exception constructor.
+	 *
+	 * @param DwooCompiler $compiler
+	 * @param int          $message
+	 */
+	public function __construct(DwooCompiler $compiler, $message)
+	{
+		$this->compiler = $compiler;
+		$this->template = $compiler->getCore()->getTemplate();
+		parent::__construct('Compilation error at line ' . $compiler->getLine() . ' in "' . $this->template->getResourceName() . ':' . $this->template->getResourceIdentifier() . '" : ' . $message);
+	}
 
-    /**
-     * @return DwooCompiler
-     */
-    public function getCompiler()
-    {
-        return $this->compiler;
-    }
+	/**
+	 * @return DwooCompiler
+	 */
+	public function getCompiler()
+	{
+		return $this->compiler;
+	}
 
-    /**
-     * @return \Dwoo\ITemplate|null
-     */
-    public function getTemplate()
-    {
-        return $this->template;
-    }
+	/**
+	 * @return \Dwoo\ITemplate|null
+	 */
+	public function getTemplate()
+	{
+		return $this->template;
+	}
 }

Spacing +1 added lines, -1 removed lines

@@ -39,7 +39,7 @@
     {
         $this->compiler = $compiler;
         $this->template = $compiler->getCore()->getTemplate();
-        parent::__construct('Compilation error at line ' . $compiler->getLine() . ' in "' . $this->template->getResourceName() . ':' . $this->template->getResourceIdentifier() . '" : ' . $message);
+        parent::__construct('Compilation error at line '.$compiler->getLine().' in "'.$this->template->getResourceName().':'.$this->template->getResourceIdentifier().'" : '.$message);
     }
 
     /**

lib/Dwoo/Plugins/Functions/PluginExtends.php

Indentation +155 added lines, -155 removed lines

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

Spacing +20 added lines, -20 removed lines

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

Braces +2 added lines, -4 removed lines

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

lib/Dwoo/Plugins/Functions/PluginTif.php

Indentation +58 added lines, -58 removed lines

@@ -36,70 +36,70 @@
  */
 class PluginTif extends Plugin implements ICompilable
 {
-    /**
-     * @param Compiler $compiler
-     * @param array    $rest
-     * @param array    $tokens
-     *
-     * @return mixed|string
-     * @throws CompilationException
-     */
-    public static function compile(Compiler $compiler, array $rest, array $tokens)
-    {
-        // load if plugin
-        if (!class_exists(Core::NAMESPACE_PLUGINS_BLOCKS . 'PluginIf')) {
-            try {
-                $compiler->getCore()->getLoader()->loadPlugin('if');
-            }
-            catch (Exception $e) {
-                throw new CompilationException($compiler, 'Tif: the if plugin is required to use Tif');
-            }
-        }
+	/**
+	 * @param Compiler $compiler
+	 * @param array    $rest
+	 * @param array    $tokens
+	 *
+	 * @return mixed|string
+	 * @throws CompilationException
+	 */
+	public static function compile(Compiler $compiler, array $rest, array $tokens)
+	{
+		// load if plugin
+		if (!class_exists(Core::NAMESPACE_PLUGINS_BLOCKS . 'PluginIf')) {
+			try {
+				$compiler->getCore()->getLoader()->loadPlugin('if');
+			}
+			catch (Exception $e) {
+				throw new CompilationException($compiler, 'Tif: the if plugin is required to use Tif');
+			}
+		}
 
-        if (count($rest) == 1) {
-            return $rest[0];
-        }
+		if (count($rest) == 1) {
+			return $rest[0];
+		}
 
-        // fetch false result and remove the ":" if it was present
-        $falseResult = array_pop($rest);
+		// fetch false result and remove the ":" if it was present
+		$falseResult = array_pop($rest);
 
-        if (trim(end($rest), '"\'') === ':') {
-            // remove the ':' if present
-            array_pop($rest);
-        } elseif (trim(end($rest), '"\'') === '?' || count($rest) === 1) {
-            if ($falseResult === '?' || $falseResult === ':') {
-                throw new CompilationException($compiler,
-                    'Tif: incomplete tif statement, value missing after ' . $falseResult);
-            }
-            // there was in fact no false result provided, so we move it to be the true result instead
-            $trueResult = $falseResult;
-            $falseResult = "''";
-        }
+		if (trim(end($rest), '"\'') === ':') {
+			// remove the ':' if present
+			array_pop($rest);
+		} elseif (trim(end($rest), '"\'') === '?' || count($rest) === 1) {
+			if ($falseResult === '?' || $falseResult === ':') {
+				throw new CompilationException($compiler,
+					'Tif: incomplete tif statement, value missing after ' . $falseResult);
+			}
+			// there was in fact no false result provided, so we move it to be the true result instead
+			$trueResult = $falseResult;
+			$falseResult = "''";
+		}
 
-        // fetch true result if needed
-        if (!isset($trueResult)) {
-            $trueResult = array_pop($rest);
-            // no true result provided so we use the expression arg
-            if ($trueResult === '?') {
-                $trueResult = true;
-            }
-        }
+		// fetch true result if needed
+		if (!isset($trueResult)) {
+			$trueResult = array_pop($rest);
+			// no true result provided so we use the expression arg
+			if ($trueResult === '?') {
+				$trueResult = true;
+			}
+		}
 
-        // remove the '?' if present
-        if (trim(end($rest), '"\'') === '?') {
-            array_pop($rest);
-        }
+		// remove the '?' if present
+		if (trim(end($rest), '"\'') === '?') {
+			array_pop($rest);
+		}
 
-        // check params were correctly provided
-        if (empty($rest) || $trueResult === null || $falseResult === null) {
-            throw new CompilationException($compiler,
-                'Tif: you must provide three parameters serving as <expression> ? <true value> : <false value>');
-        }
+		// check params were correctly provided
+		if (empty($rest) || $trueResult === null || $falseResult === null) {
+			throw new CompilationException($compiler,
+				'Tif: you must provide three parameters serving as <expression> ? <true value> : <false value>');
+		}
 
-        // parse condition
-        $condition = PluginIf::replaceKeywords($rest, $tokens, $compiler);
+		// parse condition
+		$condition = PluginIf::replaceKeywords($rest, $tokens, $compiler);
 
-        return '((' . implode(' ', $condition) . ') ? ' . ($trueResult === true ? implode(' ',
-                $condition) : $trueResult) . ' : ' . $falseResult . ')';
-    }
+		return '((' . implode(' ', $condition) . ') ? ' . ($trueResult === true ? implode(' ',
+				$condition) : $trueResult) . ' : ' . $falseResult . ')';
+	}
 }
\ No newline at end of file

Spacing +4 added lines, -4 removed lines

@@ -47,7 +47,7 @@ 
     public static function compile(Compiler $compiler, array $rest, array $tokens)
     {
         // load if plugin
-        if (!class_exists(Core::NAMESPACE_PLUGINS_BLOCKS . 'PluginIf')) {
+        if (!class_exists(Core::NAMESPACE_PLUGINS_BLOCKS.'PluginIf')) {
             try {
                 $compiler->getCore()->getLoader()->loadPlugin('if');
             }
@@ -69,7 +69,7 @@ 
         } elseif (trim(end($rest), '"\'') === '?' || count($rest) === 1) {
             if ($falseResult === '?' || $falseResult === ':') {
                 throw new CompilationException($compiler,
-                    'Tif: incomplete tif statement, value missing after ' . $falseResult);
+                    'Tif: incomplete tif statement, value missing after '.$falseResult);
             }
             // there was in fact no false result provided, so we move it to be the true result instead
             $trueResult = $falseResult;
@@ -99,7 +99,7 @@ 
         // parse condition
         $condition = PluginIf::replaceKeywords($rest, $tokens, $compiler);
 
-        return '((' . implode(' ', $condition) . ') ? ' . ($trueResult === true ? implode(' ',
-                $condition) : $trueResult) . ' : ' . $falseResult . ')';
+        return '(('.implode(' ', $condition).') ? '.($trueResult === true ? implode(' ',
+                $condition) : $trueResult).' : '.$falseResult.')';
     }
 }
\ No newline at end of file

Braces +1 added lines, -2 removed lines

@@ -50,8 +50,7 @@
         if (!class_exists(Core::NAMESPACE_PLUGINS_BLOCKS . 'PluginIf')) {
             try {
                 $compiler->getCore()->getLoader()->loadPlugin('if');
-            }
-            catch (Exception $e) {
+            } catch (Exception $e) {
                 throw new CompilationException($compiler, 'Tif: the if plugin is required to use Tif');
             }
         }

lib/Dwoo/ICompiler.php

Indentation +25 added lines, -25 removed lines

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

lib/Dwoo/Loader.php

Indentation +164 added lines, -164 removed lines

@@ -23,168 +23,168 @@
  */
 class Loader implements ILoader
 {
-    /**
-     * Stores the plugin directories.
-     *
-     * @see addDirectory
-     * @var array
-     */
-    protected $paths = array();
-
-    /**
-     * Stores the plugins names/paths relationships
-     * don't edit this on your own, use addDirectory.
-     *
-     * @see addDirectory
-     * @var array
-     */
-    protected $classPath = array();
-
-    /**
-     * Path where class paths cache files are written.
-     *
-     * @var string
-     */
-    protected $cacheDir;
-
-    /**
-     * Path where builtin plugins are stored.
-     *
-     * @var string
-     */
-    protected $corePluginDir;
-
-    /**
-     * Loader constructor.
-     *
-     * @param $cacheDir
-     */
-    public function __construct($cacheDir)
-    {
-        $this->corePluginDir = __DIR__ . DIRECTORY_SEPARATOR . 'Plugins';
-        $this->cacheDir      = rtrim($cacheDir, DIRECTORY_SEPARATOR) . DIRECTORY_SEPARATOR;
-
-        // include class paths or rebuild paths if the cache file isn't there
-        $cacheFile = $this->cacheDir . 'classpath.cache.d' . Core::RELEASE_TAG . '.php';
-
-        $chachedClassPath = null;
-
-        if (file_exists($cacheFile)) {
-
-            $chachedClassPath = unserialize(file_get_contents($cacheFile));
-
-            if (is_array($chachedClassPath)) {
-                $this->classPath = $chachedClassPath + $this->classPath;
-            }
-        }
-
-        if (!is_array($chachedClassPath)) {
-            $this->rebuildClassPathCache($this->corePluginDir, $cacheFile);
-        }
-    }
-
-    /**
-     * Rebuilds class paths, scans the given directory recursively and saves all paths in the given file.
-     *
-     * @param string         $path      the plugin path to scan
-     * @param string|boolean $cacheFile the file where to store the plugin paths cache, it will be overwritten
-     *
-     * @throws Exception
-     */
-    protected function rebuildClassPathCache($path, $cacheFile)
-    {
-        $tmp = array();
-        if ($cacheFile !== false) {
-            $tmp             = $this->classPath;
-            $this->classPath = array();
-        }
-
-        // iterates over all files/folders
-        foreach (new \DirectoryIterator($path) as $fileInfo) {
-            if (!$fileInfo->isDot()) {
-                if ($fileInfo->isDir()) {
-                    $this->rebuildClassPathCache($fileInfo->getPathname(), false);
-                } else {
-                    $this->classPath[$fileInfo->getBasename('.php')] = $fileInfo->getPathname();
-                }
-            }
-        }
-
-        // save in file if it's the first call (not recursed)
-        if ($cacheFile !== false) {
-            if (!file_put_contents($cacheFile, serialize($this->classPath), LOCK_EX)) {
-                throw new Exception('Could not write into ' . $cacheFile . ', either because the folder is not there (create it) or because of the chmod configuration (please ensure this directory is writable by php), alternatively you can change the directory used with $dwoo->setCompileDir() or provide a custom loader object with $dwoo->setLoader()');
-            }
-            $this->classPath += $tmp;
-        }
-    }
-
-    /**
-     * Loads a plugin file.
-     *
-     * @param string $class       the plugin name, without the `Plugin` prefix
-     * @param bool   $forceRehash if true, the class path caches will be rebuilt if the plugin is not found, in case it
-     *                            has just been added, defaults to true
-     *
-     * @throws Exception
-     */
-    public function loadPlugin($class, $forceRehash = true)
-    {
-        /**
-         * An unknown class was requested (maybe newly added) or the
-         * include failed so we rebuild the cache. include() will fail
-         * with an uncatchable error if the file doesn't exist, which
-         * usually means that the cache is stale and must be rebuilt,
-         * so we check for that before trying to include() the plugin.
-         */
-        if ((!isset($this->classPath[$class]) || !is_readable($this->classPath[$class])) || (!isset
-                ($this->classPath[$class . 'Compile']) || !is_readable($this->classPath[$class . 'Compile']))) {
-            if ($forceRehash) {
-                $this->rebuildClassPathCache($this->corePluginDir, $this->cacheDir . 'classpath.cache.d' .
-                    Core::RELEASE_TAG . '.php');
-                foreach ($this->paths as $path => $file) {
-                    $this->rebuildClassPathCache($path, $file);
-                }
-                if (isset($this->classPath[$class])) {
-                    include_once $this->classPath[$class];
-                } elseif (isset($this->classPath[$class . 'Compile'])) {
-                    include_once $this->classPath[$class . 'Compile'];
-                } else {
-                    throw new Exception('Plugin "' . $class . '" can not be found, maybe you forgot to bind it if it\'s a custom plugin ?', E_USER_NOTICE);
-                }
-            } else {
-                throw new Exception('Plugin "' . $class . '" can not be found, maybe you forgot to bind it if it\'s a custom plugin ?', E_USER_NOTICE);
-            }
-        }
-    }
-
-    /**
-     * Adds a plugin directory, the plugins found in the new plugin directory
-     * will take precedence over the other directories (including the default
-     * dwoo plugin directory), you can use this for example to override plugins
-     * in a specific directory for a specific application while keeping all your
-     * usual plugins in the same place for all applications.
-     * TOCOM don't forget that php functions overrides are not rehashed so you
-     * need to clear the classpath caches by hand when adding those.
-     *
-     * @param string $pluginDirectory the plugin path to scan
-     *
-     * @throws Exception
-     */
-    public function addDirectory($pluginDirectory)
-    {
-        $pluginDir = realpath($pluginDirectory);
-        if (!$pluginDir) {
-            throw new Exception('Plugin directory does not exist or can not be read : ' . $pluginDirectory);
-        }
-        $cacheFile = $this->cacheDir . 'classpath-' . substr(strtr($pluginDir, '/\\:' . PATH_SEPARATOR, '----'),
-                strlen($pluginDir) > 80 ? - 80 : 0) . '.d' . Core::RELEASE_TAG . '.php';
-        $this->paths[$pluginDir] = $cacheFile;
-        if (file_exists($cacheFile)) {
-            $classpath       = file_get_contents($cacheFile);
-            $this->classPath = unserialize($classpath) + $this->classPath;
-        } else {
-            $this->rebuildClassPathCache($pluginDir, $cacheFile);
-        }
-    }
+	/**
+	 * Stores the plugin directories.
+	 *
+	 * @see addDirectory
+	 * @var array
+	 */
+	protected $paths = array();
+
+	/**
+	 * Stores the plugins names/paths relationships
+	 * don't edit this on your own, use addDirectory.
+	 *
+	 * @see addDirectory
+	 * @var array
+	 */
+	protected $classPath = array();
+
+	/**
+	 * Path where class paths cache files are written.
+	 *
+	 * @var string
+	 */
+	protected $cacheDir;
+
+	/**
+	 * Path where builtin plugins are stored.
+	 *
+	 * @var string
+	 */
+	protected $corePluginDir;
+
+	/**
+	 * Loader constructor.
+	 *
+	 * @param $cacheDir
+	 */
+	public function __construct($cacheDir)
+	{
+		$this->corePluginDir = __DIR__ . DIRECTORY_SEPARATOR . 'Plugins';
+		$this->cacheDir      = rtrim($cacheDir, DIRECTORY_SEPARATOR) . DIRECTORY_SEPARATOR;
+
+		// include class paths or rebuild paths if the cache file isn't there
+		$cacheFile = $this->cacheDir . 'classpath.cache.d' . Core::RELEASE_TAG . '.php';
+
+		$chachedClassPath = null;
+
+		if (file_exists($cacheFile)) {
+
+			$chachedClassPath = unserialize(file_get_contents($cacheFile));
+
+			if (is_array($chachedClassPath)) {
+				$this->classPath = $chachedClassPath + $this->classPath;
+			}
+		}
+
+		if (!is_array($chachedClassPath)) {
+			$this->rebuildClassPathCache($this->corePluginDir, $cacheFile);
+		}
+	}
+
+	/**
+	 * Rebuilds class paths, scans the given directory recursively and saves all paths in the given file.
+	 *
+	 * @param string         $path      the plugin path to scan
+	 * @param string|boolean $cacheFile the file where to store the plugin paths cache, it will be overwritten
+	 *
+	 * @throws Exception
+	 */
+	protected function rebuildClassPathCache($path, $cacheFile)
+	{
+		$tmp = array();
+		if ($cacheFile !== false) {
+			$tmp             = $this->classPath;
+			$this->classPath = array();
+		}
+
+		// iterates over all files/folders
+		foreach (new \DirectoryIterator($path) as $fileInfo) {
+			if (!$fileInfo->isDot()) {
+				if ($fileInfo->isDir()) {
+					$this->rebuildClassPathCache($fileInfo->getPathname(), false);
+				} else {
+					$this->classPath[$fileInfo->getBasename('.php')] = $fileInfo->getPathname();
+				}
+			}
+		}
+
+		// save in file if it's the first call (not recursed)
+		if ($cacheFile !== false) {
+			if (!file_put_contents($cacheFile, serialize($this->classPath), LOCK_EX)) {
+				throw new Exception('Could not write into ' . $cacheFile . ', either because the folder is not there (create it) or because of the chmod configuration (please ensure this directory is writable by php), alternatively you can change the directory used with $dwoo->setCompileDir() or provide a custom loader object with $dwoo->setLoader()');
+			}
+			$this->classPath += $tmp;
+		}
+	}
+
+	/**
+	 * Loads a plugin file.
+	 *
+	 * @param string $class       the plugin name, without the `Plugin` prefix
+	 * @param bool   $forceRehash if true, the class path caches will be rebuilt if the plugin is not found, in case it
+	 *                            has just been added, defaults to true
+	 *
+	 * @throws Exception
+	 */
+	public function loadPlugin($class, $forceRehash = true)
+	{
+		/**
+		 * An unknown class was requested (maybe newly added) or the
+		 * include failed so we rebuild the cache. include() will fail
+		 * with an uncatchable error if the file doesn't exist, which
+		 * usually means that the cache is stale and must be rebuilt,
+		 * so we check for that before trying to include() the plugin.
+		 */
+		if ((!isset($this->classPath[$class]) || !is_readable($this->classPath[$class])) || (!isset
+				($this->classPath[$class . 'Compile']) || !is_readable($this->classPath[$class . 'Compile']))) {
+			if ($forceRehash) {
+				$this->rebuildClassPathCache($this->corePluginDir, $this->cacheDir . 'classpath.cache.d' .
+					Core::RELEASE_TAG . '.php');
+				foreach ($this->paths as $path => $file) {
+					$this->rebuildClassPathCache($path, $file);
+				}
+				if (isset($this->classPath[$class])) {
+					include_once $this->classPath[$class];
+				} elseif (isset($this->classPath[$class . 'Compile'])) {
+					include_once $this->classPath[$class . 'Compile'];
+				} else {
+					throw new Exception('Plugin "' . $class . '" can not be found, maybe you forgot to bind it if it\'s a custom plugin ?', E_USER_NOTICE);
+				}
+			} else {
+				throw new Exception('Plugin "' . $class . '" can not be found, maybe you forgot to bind it if it\'s a custom plugin ?', E_USER_NOTICE);
+			}
+		}
+	}
+
+	/**
+	 * Adds a plugin directory, the plugins found in the new plugin directory
+	 * will take precedence over the other directories (including the default
+	 * dwoo plugin directory), you can use this for example to override plugins
+	 * in a specific directory for a specific application while keeping all your
+	 * usual plugins in the same place for all applications.
+	 * TOCOM don't forget that php functions overrides are not rehashed so you
+	 * need to clear the classpath caches by hand when adding those.
+	 *
+	 * @param string $pluginDirectory the plugin path to scan
+	 *
+	 * @throws Exception
+	 */
+	public function addDirectory($pluginDirectory)
+	{
+		$pluginDir = realpath($pluginDirectory);
+		if (!$pluginDir) {
+			throw new Exception('Plugin directory does not exist or can not be read : ' . $pluginDirectory);
+		}
+		$cacheFile = $this->cacheDir . 'classpath-' . substr(strtr($pluginDir, '/\\:' . PATH_SEPARATOR, '----'),
+				strlen($pluginDir) > 80 ? - 80 : 0) . '.d' . Core::RELEASE_TAG . '.php';
+		$this->paths[$pluginDir] = $cacheFile;
+		if (file_exists($cacheFile)) {
+			$classpath       = file_get_contents($cacheFile);
+			$this->classPath = unserialize($classpath) + $this->classPath;
+		} else {
+			$this->rebuildClassPathCache($pluginDir, $cacheFile);
+		}
+	}
 }

Spacing +16 added lines, -16 removed lines

@@ -61,11 +61,11 @@ 
      */
     public function __construct($cacheDir)
     {
-        $this->corePluginDir = __DIR__ . DIRECTORY_SEPARATOR . 'Plugins';
-        $this->cacheDir      = rtrim($cacheDir, DIRECTORY_SEPARATOR) . DIRECTORY_SEPARATOR;
+        $this->corePluginDir = __DIR__.DIRECTORY_SEPARATOR.'Plugins';
+        $this->cacheDir      = rtrim($cacheDir, DIRECTORY_SEPARATOR).DIRECTORY_SEPARATOR;
 
         // include class paths or rebuild paths if the cache file isn't there
-        $cacheFile = $this->cacheDir . 'classpath.cache.d' . Core::RELEASE_TAG . '.php';
+        $cacheFile = $this->cacheDir.'classpath.cache.d'.Core::RELEASE_TAG.'.php';
 
         $chachedClassPath = null;
 
@@ -74,7 +74,7 @@ 
             $chachedClassPath = unserialize(file_get_contents($cacheFile));
 
             if (is_array($chachedClassPath)) {
-                $this->classPath = $chachedClassPath + $this->classPath;
+                $this->classPath = $chachedClassPath+$this->classPath;
             }
         }
 
@@ -113,7 +113,7 @@ 
         // save in file if it's the first call (not recursed)
         if ($cacheFile !== false) {
             if (!file_put_contents($cacheFile, serialize($this->classPath), LOCK_EX)) {
-                throw new Exception('Could not write into ' . $cacheFile . ', either because the folder is not there (create it) or because of the chmod configuration (please ensure this directory is writable by php), alternatively you can change the directory used with $dwoo->setCompileDir() or provide a custom loader object with $dwoo->setLoader()');
+                throw new Exception('Could not write into '.$cacheFile.', either because the folder is not there (create it) or because of the chmod configuration (please ensure this directory is writable by php), alternatively you can change the directory used with $dwoo->setCompileDir() or provide a custom loader object with $dwoo->setLoader()');
             }
             $this->classPath += $tmp;
         }
@@ -138,22 +138,22 @@ 
          * so we check for that before trying to include() the plugin.
          */
         if ((!isset($this->classPath[$class]) || !is_readable($this->classPath[$class])) || (!isset
-                ($this->classPath[$class . 'Compile']) || !is_readable($this->classPath[$class . 'Compile']))) {
+                ($this->classPath[$class.'Compile']) || !is_readable($this->classPath[$class.'Compile']))) {
             if ($forceRehash) {
-                $this->rebuildClassPathCache($this->corePluginDir, $this->cacheDir . 'classpath.cache.d' .
-                    Core::RELEASE_TAG . '.php');
+                $this->rebuildClassPathCache($this->corePluginDir, $this->cacheDir.'classpath.cache.d'.
+                    Core::RELEASE_TAG.'.php');
                 foreach ($this->paths as $path => $file) {
                     $this->rebuildClassPathCache($path, $file);
                 }
                 if (isset($this->classPath[$class])) {
                     include_once $this->classPath[$class];
-                } elseif (isset($this->classPath[$class . 'Compile'])) {
-                    include_once $this->classPath[$class . 'Compile'];
+                } elseif (isset($this->classPath[$class.'Compile'])) {
+                    include_once $this->classPath[$class.'Compile'];
                 } else {
-                    throw new Exception('Plugin "' . $class . '" can not be found, maybe you forgot to bind it if it\'s a custom plugin ?', E_USER_NOTICE);
+                    throw new Exception('Plugin "'.$class.'" can not be found, maybe you forgot to bind it if it\'s a custom plugin ?', E_USER_NOTICE);
                 }
             } else {
-                throw new Exception('Plugin "' . $class . '" can not be found, maybe you forgot to bind it if it\'s a custom plugin ?', E_USER_NOTICE);
+                throw new Exception('Plugin "'.$class.'" can not be found, maybe you forgot to bind it if it\'s a custom plugin ?', E_USER_NOTICE);
             }
         }
     }
@@ -175,14 +175,14 @@ 
     {
         $pluginDir = realpath($pluginDirectory);
         if (!$pluginDir) {
-            throw new Exception('Plugin directory does not exist or can not be read : ' . $pluginDirectory);
+            throw new Exception('Plugin directory does not exist or can not be read : '.$pluginDirectory);
         }
-        $cacheFile = $this->cacheDir . 'classpath-' . substr(strtr($pluginDir, '/\\:' . PATH_SEPARATOR, '----'),
-                strlen($pluginDir) > 80 ? - 80 : 0) . '.d' . Core::RELEASE_TAG . '.php';
+        $cacheFile = $this->cacheDir.'classpath-'.substr(strtr($pluginDir, '/\\:'.PATH_SEPARATOR, '----'),
+                strlen($pluginDir) > 80 ? -80 : 0).'.d'.Core::RELEASE_TAG.'.php';
         $this->paths[$pluginDir] = $cacheFile;
         if (file_exists($cacheFile)) {
             $classpath       = file_get_contents($cacheFile);
-            $this->classPath = unserialize($classpath) + $this->classPath;
+            $this->classPath = unserialize($classpath)+$this->classPath;
         } else {
             $this->rebuildClassPathCache($pluginDir, $cacheFile);
         }