dwoo-project / dwoo

lib/Dwoo/Plugins/Blocks/PluginTopLevelBlock.php

Indentation +29 added lines, -29 removed lines

@@ -26,35 +26,35 @@
  */
 final class PluginTopLevelBlock extends BlockPlugin implements ICompilableBlock
 {
-    public function init()
-    {
-    }
+	public function init()
+	{
+	}
 
-    /**
-     * @param Compiler $compiler
-     * @param array    $params
-     * @param string   $prepend
-     * @param string   $append
-     * @param string   $type
-     *
-     * @return string
-     */
-    public static function preProcessing(Compiler $compiler, array $params, $prepend, $append, $type)
-    {
-        return '/* end template head */ ob_start(); /* template body */ ' . Compiler::PHP_CLOSE;
-    }
+	/**
+	 * @param Compiler $compiler
+	 * @param array    $params
+	 * @param string   $prepend
+	 * @param string   $append
+	 * @param string   $type
+	 *
+	 * @return string
+	 */
+	public static function preProcessing(Compiler $compiler, array $params, $prepend, $append, $type)
+	{
+		return '/* end template head */ ob_start(); /* template body */ ' . Compiler::PHP_CLOSE;
+	}
 
-    /**
-     * @param Compiler $compiler
-     * @param array    $params
-     * @param string   $prepend
-     * @param string   $append
-     * @param string   $content
-     *
-     * @return string
-     */
-    public static function postProcessing(Compiler $compiler, array $params, $prepend, $append, $content)
-    {
-        return $content . Compiler::PHP_OPEN . ' /* end template body */' . "\n" . 'return $this->buffer . ob_get_clean();';
-    }
+	/**
+	 * @param Compiler $compiler
+	 * @param array    $params
+	 * @param string   $prepend
+	 * @param string   $append
+	 * @param string   $content
+	 *
+	 * @return string
+	 */
+	public static function postProcessing(Compiler $compiler, array $params, $prepend, $append, $content)
+	{
+		return $content . Compiler::PHP_OPEN . ' /* end template body */' . "\n" . 'return $this->buffer . ob_get_clean();';
+	}
 }

Spacing +2 added lines, -2 removed lines

@@ -41,7 +41,7 @@ 
      */
     public static function preProcessing(Compiler $compiler, array $params, $prepend, $append, $type)
     {
-        return '/* end template head */ ob_start(); /* template body */ ' . Compiler::PHP_CLOSE;
+        return '/* end template head */ ob_start(); /* template body */ '.Compiler::PHP_CLOSE;
     }
 
     /**
@@ -55,6 +55,6 @@ 
      */
     public static function postProcessing(Compiler $compiler, array $params, $prepend, $append, $content)
     {
-        return $content . Compiler::PHP_OPEN . ' /* end template body */' . "\n" . 'return $this->buffer . ob_get_clean();';
+        return $content.Compiler::PHP_OPEN.' /* end template body */'."\n".'return $this->buffer . ob_get_clean();';
     }
 }

lib/Dwoo/Plugins/Filters/PluginHtmlFormat.php

Indentation +157 added lines, -157 removed lines

@@ -30,161 +30,161 @@
  */
 class PluginHtmlFormat extends Filter
 {
-    /**
-     * tab count to auto-indent the source.
-     *
-     * @var int
-     */
-    protected static $tabCount = - 1;
-
-    /**
-     * stores the additional data (following a tag) of the last call to open/close/singleTag.
-     *
-     * @var string
-     */
-    protected static $lastCallAdd = '';
-
-    /**
-     * formats the input using the singleTag/closeTag/openTag functions.
-     * It is auto indenting the whole code, excluding <textarea>, <code> and <pre> tags that must be kept intact.
-     * Those tags must however contain only htmlentities-escaped text for everything to work properly.
-     * Inline tags are presented on a single line with their content
-     *
-     * @param string $input the xhtml to format
-     *
-     * @return string formatted xhtml
-     */
-    public function process($input)
-    {
-        self::$tabCount = - 1;
-
-        // auto indent all but textareas & pre (or we have weird tabs inside)
-        $input = preg_replace_callback("#(<[^>]+>)(\s*)([^<]*)#", array(
-            'self',
-            'tagDispatcher'
-        ), $input);
-
-        return $input;
-    }
-
-    /**
-     * helper function for format()'s preg_replace call.
-     *
-     * @param array $input array of matches (1=>tag, 2=>whitespace(optional), 3=>additional non-html content)
-     *
-     * @return string the indented tag
-     */
-    protected static function tagDispatcher($input)
-    {
-        // textarea, pre, code tags and comments are to be left alone to avoid any non-wanted whitespace inside them so it just outputs them as they were
-        if (substr($input[1], 0, 9) == '<textarea' || substr($input[1], 0, 4) == '<pre' || substr($input[1], 0, 5) == '<code' || substr($input[1], 0, 4) == '<!--' || substr($input[1], 0, 9) == '<![CDATA[') {
-            return $input[1] . $input[3];
-        }
-        // closing textarea, code and pre tags and self-closed tags (i.e. <br />) are printed as singleTags because we didn't use openTag for the formers and the latter is a single tag
-        if (substr($input[1], 0, 10) == '</textarea' || substr($input[1], 0, 5) == '</pre' || substr($input[1], 0, 6) == '</code' || substr($input[1], - 2) == '/>') {
-            return self::singleTag($input[1], $input[3], $input[2]);
-        }
-        // it's the closing tag
-        if ($input[0][1] == '/') {
-            return self::closeTag($input[1], $input[3], $input[2]);
-        }
-
-        // opening tag
-        return self::openTag($input[1], $input[3], $input[2]);
-    }
-
-    /**
-     * returns an open tag and adds a tab into the auto indenting.
-     *
-     * @param string $tag        content of the tag
-     * @param string $add        additional data (anything before the following tag)
-     * @param string $whitespace white space between the tag and the additional data
-     *
-     * @return string
-     */
-    protected static function openTag($tag, $add, $whitespace)
-    {
-        $tabs = str_pad('', self::$tabCount ++, "\t");
-
-        if (preg_match('#^<(a|label|option|textarea|h1|h2|h3|h4|h5|h6|strong|b|em|i|abbr|acronym|cite|span|sub|sup|u|s|title)(?: [^>]*|)>#', $tag)) {
-            // if it's one of those tag it's inline so it does not require a leading line break
-            $result = $tag . $whitespace . str_replace("\n", "\n" . $tabs, $add);
-        } elseif (substr($tag, 0, 9) == '<!DOCTYPE') {
-            // it's the doctype declaration so no line break here either
-            $result = $tabs . $tag;
-        } else {
-            // normal block tag
-            $result = "\n" . $tabs . $tag;
-
-            if (!empty($add)) {
-                $result .= "\n" . $tabs . "\t" . str_replace("\n", "\n\t" . $tabs, $add);
-            }
-        }
-
-        self::$lastCallAdd = $add;
-
-        return $result;
-    }
-
-    /**
-     * returns a closing tag and removes a tab from the auto indenting.
-     *
-     * @param string $tag        content of the tag
-     * @param string $add        additional data (anything before the following tag)
-     * @param string $whitespace white space between the tag and the additional data
-     *
-     * @return string
-     */
-    protected static function closeTag($tag, $add, $whitespace)
-    {
-        $tabs = str_pad('', -- self::$tabCount, "\t");
-
-        // if it's one of those tag it's inline so it does not require a leading line break
-        if (preg_match('#^</(a|label|option|textarea|h1|h2|h3|h4|h5|h6|strong|b|em|i|abbr|acronym|cite|span|sub|sup|u|s|title)>#', $tag)) {
-            $result = $tag . $whitespace . str_replace("\n", "\n" . $tabs, $add);
-        } else {
-            $result = "\n" . $tabs . $tag;
-
-            if (!empty($add)) {
-                $result .= "\n" . $tabs . "\t" . str_replace("\n", "\n\t" . $tabs, $add);
-            }
-        }
-
-        self::$lastCallAdd = $add;
-
-        return $result;
-    }
-
-    /**
-     * returns a single tag with auto indenting.
-     *
-     * @param string $tag content of the tag
-     * @param string $add additional data (anything before the following tag)
-     *
-     * @return string
-     */
-    protected static function singleTag($tag, $add, $whitespace)
-    {
-        $tabs = str_pad('', self::$tabCount, "\t");
-
-        // if it's img, br it's inline so it does not require a leading line break
-        // if it's a closing textarea, code or pre tag, it does not require a leading line break either or it creates whitespace at the end of those blocks
-        if (preg_match('#^<(img|br|/textarea|/pre|/code)(?: [^>]*|)>#', $tag)) {
-            $result = $tag . $whitespace;
-
-            if (!empty($add)) {
-                $result .= str_replace("\n", "\n" . $tabs, $add);
-            }
-        } else {
-            $result = "\n" . $tabs . $tag;
-
-            if (!empty($add)) {
-                $result .= "\n" . $tabs . str_replace("\n", "\n" . $tabs, $add);
-            }
-        }
-
-        self::$lastCallAdd = $add;
-
-        return $result;
-    }
+	/**
+	 * tab count to auto-indent the source.
+	 *
+	 * @var int
+	 */
+	protected static $tabCount = - 1;
+
+	/**
+	 * stores the additional data (following a tag) of the last call to open/close/singleTag.
+	 *
+	 * @var string
+	 */
+	protected static $lastCallAdd = '';
+
+	/**
+	 * formats the input using the singleTag/closeTag/openTag functions.
+	 * It is auto indenting the whole code, excluding <textarea>, <code> and <pre> tags that must be kept intact.
+	 * Those tags must however contain only htmlentities-escaped text for everything to work properly.
+	 * Inline tags are presented on a single line with their content
+	 *
+	 * @param string $input the xhtml to format
+	 *
+	 * @return string formatted xhtml
+	 */
+	public function process($input)
+	{
+		self::$tabCount = - 1;
+
+		// auto indent all but textareas & pre (or we have weird tabs inside)
+		$input = preg_replace_callback("#(<[^>]+>)(\s*)([^<]*)#", array(
+			'self',
+			'tagDispatcher'
+		), $input);
+
+		return $input;
+	}
+
+	/**
+	 * helper function for format()'s preg_replace call.
+	 *
+	 * @param array $input array of matches (1=>tag, 2=>whitespace(optional), 3=>additional non-html content)
+	 *
+	 * @return string the indented tag
+	 */
+	protected static function tagDispatcher($input)
+	{
+		// textarea, pre, code tags and comments are to be left alone to avoid any non-wanted whitespace inside them so it just outputs them as they were
+		if (substr($input[1], 0, 9) == '<textarea' || substr($input[1], 0, 4) == '<pre' || substr($input[1], 0, 5) == '<code' || substr($input[1], 0, 4) == '<!--' || substr($input[1], 0, 9) == '<![CDATA[') {
+			return $input[1] . $input[3];
+		}
+		// closing textarea, code and pre tags and self-closed tags (i.e. <br />) are printed as singleTags because we didn't use openTag for the formers and the latter is a single tag
+		if (substr($input[1], 0, 10) == '</textarea' || substr($input[1], 0, 5) == '</pre' || substr($input[1], 0, 6) == '</code' || substr($input[1], - 2) == '/>') {
+			return self::singleTag($input[1], $input[3], $input[2]);
+		}
+		// it's the closing tag
+		if ($input[0][1] == '/') {
+			return self::closeTag($input[1], $input[3], $input[2]);
+		}
+
+		// opening tag
+		return self::openTag($input[1], $input[3], $input[2]);
+	}
+
+	/**
+	 * returns an open tag and adds a tab into the auto indenting.
+	 *
+	 * @param string $tag        content of the tag
+	 * @param string $add        additional data (anything before the following tag)
+	 * @param string $whitespace white space between the tag and the additional data
+	 *
+	 * @return string
+	 */
+	protected static function openTag($tag, $add, $whitespace)
+	{
+		$tabs = str_pad('', self::$tabCount ++, "\t");
+
+		if (preg_match('#^<(a|label|option|textarea|h1|h2|h3|h4|h5|h6|strong|b|em|i|abbr|acronym|cite|span|sub|sup|u|s|title)(?: [^>]*|)>#', $tag)) {
+			// if it's one of those tag it's inline so it does not require a leading line break
+			$result = $tag . $whitespace . str_replace("\n", "\n" . $tabs, $add);
+		} elseif (substr($tag, 0, 9) == '<!DOCTYPE') {
+			// it's the doctype declaration so no line break here either
+			$result = $tabs . $tag;
+		} else {
+			// normal block tag
+			$result = "\n" . $tabs . $tag;
+
+			if (!empty($add)) {
+				$result .= "\n" . $tabs . "\t" . str_replace("\n", "\n\t" . $tabs, $add);
+			}
+		}
+
+		self::$lastCallAdd = $add;
+
+		return $result;
+	}
+
+	/**
+	 * returns a closing tag and removes a tab from the auto indenting.
+	 *
+	 * @param string $tag        content of the tag
+	 * @param string $add        additional data (anything before the following tag)
+	 * @param string $whitespace white space between the tag and the additional data
+	 *
+	 * @return string
+	 */
+	protected static function closeTag($tag, $add, $whitespace)
+	{
+		$tabs = str_pad('', -- self::$tabCount, "\t");
+
+		// if it's one of those tag it's inline so it does not require a leading line break
+		if (preg_match('#^</(a|label|option|textarea|h1|h2|h3|h4|h5|h6|strong|b|em|i|abbr|acronym|cite|span|sub|sup|u|s|title)>#', $tag)) {
+			$result = $tag . $whitespace . str_replace("\n", "\n" . $tabs, $add);
+		} else {
+			$result = "\n" . $tabs . $tag;
+
+			if (!empty($add)) {
+				$result .= "\n" . $tabs . "\t" . str_replace("\n", "\n\t" . $tabs, $add);
+			}
+		}
+
+		self::$lastCallAdd = $add;
+
+		return $result;
+	}
+
+	/**
+	 * returns a single tag with auto indenting.
+	 *
+	 * @param string $tag content of the tag
+	 * @param string $add additional data (anything before the following tag)
+	 *
+	 * @return string
+	 */
+	protected static function singleTag($tag, $add, $whitespace)
+	{
+		$tabs = str_pad('', self::$tabCount, "\t");
+
+		// if it's img, br it's inline so it does not require a leading line break
+		// if it's a closing textarea, code or pre tag, it does not require a leading line break either or it creates whitespace at the end of those blocks
+		if (preg_match('#^<(img|br|/textarea|/pre|/code)(?: [^>]*|)>#', $tag)) {
+			$result = $tag . $whitespace;
+
+			if (!empty($add)) {
+				$result .= str_replace("\n", "\n" . $tabs, $add);
+			}
+		} else {
+			$result = "\n" . $tabs . $tag;
+
+			if (!empty($add)) {
+				$result .= "\n" . $tabs . str_replace("\n", "\n" . $tabs, $add);
+			}
+		}
+
+		self::$lastCallAdd = $add;
+
+		return $result;
+	}
 }

Spacing +13 added lines, -13 removed lines

@@ -78,7 +78,7 @@ 
     {
         // textarea, pre, code tags and comments are to be left alone to avoid any non-wanted whitespace inside them so it just outputs them as they were
         if (substr($input[1], 0, 9) == '<textarea' || substr($input[1], 0, 4) == '<pre' || substr($input[1], 0, 5) == '<code' || substr($input[1], 0, 4) == '<!--' || substr($input[1], 0, 9) == '<![CDATA[') {
-            return $input[1] . $input[3];
+            return $input[1].$input[3];
         }
         // closing textarea, code and pre tags and self-closed tags (i.e. <br />) are printed as singleTags because we didn't use openTag for the formers and the latter is a single tag
         if (substr($input[1], 0, 10) == '</textarea' || substr($input[1], 0, 5) == '</pre' || substr($input[1], 0, 6) == '</code' || substr($input[1], - 2) == '/>') {
@@ -104,20 +104,20 @@ 
      */
     protected static function openTag($tag, $add, $whitespace)
     {
-        $tabs = str_pad('', self::$tabCount ++, "\t");
+        $tabs = str_pad('', self::$tabCount++, "\t");
 
         if (preg_match('#^<(a|label|option|textarea|h1|h2|h3|h4|h5|h6|strong|b|em|i|abbr|acronym|cite|span|sub|sup|u|s|title)(?: [^>]*|)>#', $tag)) {
             // if it's one of those tag it's inline so it does not require a leading line break
-            $result = $tag . $whitespace . str_replace("\n", "\n" . $tabs, $add);
+            $result = $tag.$whitespace.str_replace("\n", "\n".$tabs, $add);
         } elseif (substr($tag, 0, 9) == '<!DOCTYPE') {
             // it's the doctype declaration so no line break here either
-            $result = $tabs . $tag;
+            $result = $tabs.$tag;
         } else {
             // normal block tag
-            $result = "\n" . $tabs . $tag;
+            $result = "\n".$tabs.$tag;
 
             if (!empty($add)) {
-                $result .= "\n" . $tabs . "\t" . str_replace("\n", "\n\t" . $tabs, $add);
+                $result .= "\n".$tabs."\t".str_replace("\n", "\n\t".$tabs, $add);
             }
         }
 
@@ -141,12 +141,12 @@ 
 
         // if it's one of those tag it's inline so it does not require a leading line break
         if (preg_match('#^</(a|label|option|textarea|h1|h2|h3|h4|h5|h6|strong|b|em|i|abbr|acronym|cite|span|sub|sup|u|s|title)>#', $tag)) {
-            $result = $tag . $whitespace . str_replace("\n", "\n" . $tabs, $add);
+            $result = $tag.$whitespace.str_replace("\n", "\n".$tabs, $add);
         } else {
-            $result = "\n" . $tabs . $tag;
+            $result = "\n".$tabs.$tag;
 
             if (!empty($add)) {
-                $result .= "\n" . $tabs . "\t" . str_replace("\n", "\n\t" . $tabs, $add);
+                $result .= "\n".$tabs."\t".str_replace("\n", "\n\t".$tabs, $add);
             }
         }
 
@@ -170,16 +170,16 @@ 
         // if it's img, br it's inline so it does not require a leading line break
         // if it's a closing textarea, code or pre tag, it does not require a leading line break either or it creates whitespace at the end of those blocks
         if (preg_match('#^<(img|br|/textarea|/pre|/code)(?: [^>]*|)>#', $tag)) {
-            $result = $tag . $whitespace;
+            $result = $tag.$whitespace;
 
             if (!empty($add)) {
-                $result .= str_replace("\n", "\n" . $tabs, $add);
+                $result .= str_replace("\n", "\n".$tabs, $add);
             }
         } else {
-            $result = "\n" . $tabs . $tag;
+            $result = "\n".$tabs.$tag;
 
             if (!empty($add)) {
-                $result .= "\n" . $tabs . str_replace("\n", "\n" . $tabs, $add);
+                $result .= "\n".$tabs.str_replace("\n", "\n".$tabs, $add);
             }
         }
 

lib/Dwoo/Security/Policy.php

Indentation +271 added lines, -271 removed lines

@@ -25,298 +25,298 @@
  */
 class Policy
 {
-    /**
-     * Php handling constants, defaults to PHP_REMOVE
-     * PHP_ENCODE : run htmlentities over them
-     * PHP_REMOVE : remove all <?php ?> (+ short tags if your short tags option is on) from the input template
-     * PHP_ALLOW : leave them as they are
-     *
-     * @var int
-     */
-    const PHP_ENCODE = 1;
-    const PHP_REMOVE = 2;
-    const PHP_ALLOW  = 3;
+	/**
+	 * Php handling constants, defaults to PHP_REMOVE
+	 * PHP_ENCODE : run htmlentities over them
+	 * PHP_REMOVE : remove all <?php ?> (+ short tags if your short tags option is on) from the input template
+	 * PHP_ALLOW : leave them as they are
+	 *
+	 * @var int
+	 */
+	const PHP_ENCODE = 1;
+	const PHP_REMOVE = 2;
+	const PHP_ALLOW  = 3;
 
-    /**
-     * Constant handling constants, defaults to CONST_DISALLOW
-     * CONST_DISALLOW : throw an error if {$dwoo.const.*} is used in the template
-     * CONST_ALLOW : allow {$dwoo.const.*} calls
-     */
-    const CONST_DISALLOW = false;
-    const CONST_ALLOW    = true;
+	/**
+	 * Constant handling constants, defaults to CONST_DISALLOW
+	 * CONST_DISALLOW : throw an error if {$dwoo.const.*} is used in the template
+	 * CONST_ALLOW : allow {$dwoo.const.*} calls
+	 */
+	const CONST_DISALLOW = false;
+	const CONST_ALLOW    = true;
 
-    /**
-     * Php functions that are allowed to be used within the template.
-     *
-     * @var array
-     */
-    protected $allowedPhpFunctions = array(
-        'str_repeat'       => true,
-        'number_format'    => true,
-        'htmlentities'     => true,
-        'htmlspecialchars' => true,
-        'long2ip'          => true,
-        'strlen'           => true,
-        'list'             => true,
-        'empty'            => true,
-        'count'            => true,
-        'sizeof'           => true,
-        'in_array'         => true,
-        'is_array'         => true,
-    );
+	/**
+	 * Php functions that are allowed to be used within the template.
+	 *
+	 * @var array
+	 */
+	protected $allowedPhpFunctions = array(
+		'str_repeat'       => true,
+		'number_format'    => true,
+		'htmlentities'     => true,
+		'htmlspecialchars' => true,
+		'long2ip'          => true,
+		'strlen'           => true,
+		'list'             => true,
+		'empty'            => true,
+		'count'            => true,
+		'sizeof'           => true,
+		'in_array'         => true,
+		'is_array'         => true,
+	);
 
-    /**
-     * Methods that are allowed to be used within the template.
-     *
-     * @var array
-     */
-    protected $allowedMethods = array();
+	/**
+	 * Methods that are allowed to be used within the template.
+	 *
+	 * @var array
+	 */
+	protected $allowedMethods = array();
 
-    /**
-     * Paths that are safe to use with include or other file-access plugins.
-     *
-     * @var array
-     */
-    protected $allowedDirectories = array();
+	/**
+	 * Paths that are safe to use with include or other file-access plugins.
+	 *
+	 * @var array
+	 */
+	protected $allowedDirectories = array();
 
-    /**
-     * Stores the php handling level.
-     * defaults to self::PHP_REMOVE
-     *
-     * @var int
-     */
-    protected $phpHandling = self::PHP_REMOVE;
+	/**
+	 * Stores the php handling level.
+	 * defaults to self::PHP_REMOVE
+	 *
+	 * @var int
+	 */
+	protected $phpHandling = self::PHP_REMOVE;
 
-    /**
-     * Stores the constant handling level.
-     * defaults to self::CONST_DISALLOW
-     *
-     * @var bool
-     */
-    protected $constHandling = self::CONST_DISALLOW;
+	/**
+	 * Stores the constant handling level.
+	 * defaults to self::CONST_DISALLOW
+	 *
+	 * @var bool
+	 */
+	protected $constHandling = self::CONST_DISALLOW;
 
-    /**
-     * Adds a php function to the allowed list.
-     *
-     * @param mixed $func function name or array of function names
-     */
-    public function allowPhpFunction($func)
-    {
-        if (is_array($func)) {
-            foreach ($func as $fname) {
-                $this->allowedPhpFunctions[strtolower($fname)] = true;
-            }
-        } else {
-            $this->allowedPhpFunctions[strtolower($func)] = true;
-        }
-    }
+	/**
+	 * Adds a php function to the allowed list.
+	 *
+	 * @param mixed $func function name or array of function names
+	 */
+	public function allowPhpFunction($func)
+	{
+		if (is_array($func)) {
+			foreach ($func as $fname) {
+				$this->allowedPhpFunctions[strtolower($fname)] = true;
+			}
+		} else {
+			$this->allowedPhpFunctions[strtolower($func)] = true;
+		}
+	}
 
-    /**
-     * Removes a php function from the allowed list.
-     *
-     * @param mixed $func function name or array of function names
-     */
-    public function disallowPhpFunction($func)
-    {
-        if (is_array($func)) {
-            foreach ($func as $fname) {
-                unset($this->allowedPhpFunctions[strtolower($fname)]);
-            }
-        } else {
-            unset($this->allowedPhpFunctions[strtolower($func)]);
-        }
-    }
+	/**
+	 * Removes a php function from the allowed list.
+	 *
+	 * @param mixed $func function name or array of function names
+	 */
+	public function disallowPhpFunction($func)
+	{
+		if (is_array($func)) {
+			foreach ($func as $fname) {
+				unset($this->allowedPhpFunctions[strtolower($fname)]);
+			}
+		} else {
+			unset($this->allowedPhpFunctions[strtolower($func)]);
+		}
+	}
 
-    /**
-     * Returns the list of php functions allowed to run, note that the function names
-     * are stored in the array keys and not values.
-     *
-     * @return array
-     */
-    public function getAllowedPhpFunctions()
-    {
-        return $this->allowedPhpFunctions;
-    }
+	/**
+	 * Returns the list of php functions allowed to run, note that the function names
+	 * are stored in the array keys and not values.
+	 *
+	 * @return array
+	 */
+	public function getAllowedPhpFunctions()
+	{
+		return $this->allowedPhpFunctions;
+	}
 
-    /**
-     * Adds a class method to the allowed list, this must be used for
-     * both static and non static method by providing the class name
-     * and method name to use.
-     *
-     * @param mixed  $class  class name or array of array('class', 'method') couples
-     * @param string $method method name
-     */
-    public function allowMethod($class, $method = null)
-    {
-        if (is_array($class)) {
-            foreach ($class as $elem) {
-                $this->allowedMethods[strtolower($elem[0])][strtolower($elem[1])] = true;
-            }
-        } else {
-            $this->allowedMethods[strtolower($class)][strtolower($method)] = true;
-        }
-    }
+	/**
+	 * Adds a class method to the allowed list, this must be used for
+	 * both static and non static method by providing the class name
+	 * and method name to use.
+	 *
+	 * @param mixed  $class  class name or array of array('class', 'method') couples
+	 * @param string $method method name
+	 */
+	public function allowMethod($class, $method = null)
+	{
+		if (is_array($class)) {
+			foreach ($class as $elem) {
+				$this->allowedMethods[strtolower($elem[0])][strtolower($elem[1])] = true;
+			}
+		} else {
+			$this->allowedMethods[strtolower($class)][strtolower($method)] = true;
+		}
+	}
 
-    /**
-     * Removes a class method from the allowed list.
-     *
-     * @param mixed  $class  class name or array of array('class', 'method') couples
-     * @param string $method method name
-     */
-    public function disallowMethod($class, $method = null)
-    {
-        if (is_array($class)) {
-            foreach ($class as $elem) {
-                unset($this->allowedMethods[strtolower($elem[0])][strtolower($elem[1])]);
-            }
-        } else {
-            unset($this->allowedMethods[strtolower($class)][strtolower($method)]);
-        }
-    }
+	/**
+	 * Removes a class method from the allowed list.
+	 *
+	 * @param mixed  $class  class name or array of array('class', 'method') couples
+	 * @param string $method method name
+	 */
+	public function disallowMethod($class, $method = null)
+	{
+		if (is_array($class)) {
+			foreach ($class as $elem) {
+				unset($this->allowedMethods[strtolower($elem[0])][strtolower($elem[1])]);
+			}
+		} else {
+			unset($this->allowedMethods[strtolower($class)][strtolower($method)]);
+		}
+	}
 
-    /**
-     * Returns the list of class methods allowed to run, note that the class names
-     * and method names are stored in the array keys and not values.
-     *
-     * @return array
-     */
-    public function getAllowedMethods()
-    {
-        return $this->allowedMethods;
-    }
+	/**
+	 * Returns the list of class methods allowed to run, note that the class names
+	 * and method names are stored in the array keys and not values.
+	 *
+	 * @return array
+	 */
+	public function getAllowedMethods()
+	{
+		return $this->allowedMethods;
+	}
 
-    /**
-     * Adds a directory to the safelist for includes and other file-access plugins.
-     * note that all the includePath directories you provide to the Dwoo_Template_File class
-     * are automatically marked as safe
-     *
-     * @param mixed $path a path name or an array of paths
-     */
-    public function allowDirectory($path)
-    {
-        if (is_array($path)) {
-            foreach ($path as $dir) {
-                $this->allowedDirectories[realpath($dir)] = true;
-            }
-        } else {
-            $this->allowedDirectories[realpath($path)] = true;
-        }
-    }
+	/**
+	 * Adds a directory to the safelist for includes and other file-access plugins.
+	 * note that all the includePath directories you provide to the Dwoo_Template_File class
+	 * are automatically marked as safe
+	 *
+	 * @param mixed $path a path name or an array of paths
+	 */
+	public function allowDirectory($path)
+	{
+		if (is_array($path)) {
+			foreach ($path as $dir) {
+				$this->allowedDirectories[realpath($dir)] = true;
+			}
+		} else {
+			$this->allowedDirectories[realpath($path)] = true;
+		}
+	}
 
-    /**
-     * Removes a directory from the safe list.
-     *
-     * @param mixed $path a path name or an array of paths
-     */
-    public function disallowDirectory($path)
-    {
-        if (is_array($path)) {
-            foreach ($path as $dir) {
-                unset($this->allowedDirectories[realpath($dir)]);
-            }
-        } else {
-            unset($this->allowedDirectories[realpath($path)]);
-        }
-    }
+	/**
+	 * Removes a directory from the safe list.
+	 *
+	 * @param mixed $path a path name or an array of paths
+	 */
+	public function disallowDirectory($path)
+	{
+		if (is_array($path)) {
+			foreach ($path as $dir) {
+				unset($this->allowedDirectories[realpath($dir)]);
+			}
+		} else {
+			unset($this->allowedDirectories[realpath($path)]);
+		}
+	}
 
-    /**
-     * Returns the list of safe paths, note that the paths are stored in the array
-     * keys and not values.
-     *
-     * @return array
-     */
-    public function getAllowedDirectories()
-    {
-        return $this->allowedDirectories;
-    }
+	/**
+	 * Returns the list of safe paths, note that the paths are stored in the array
+	 * keys and not values.
+	 *
+	 * @return array
+	 */
+	public function getAllowedDirectories()
+	{
+		return $this->allowedDirectories;
+	}
 
-    /**
-     * Sets the php handling level, defaults to REMOVE.
-     *
-     * @param int $level one of the Dwoo_Security_Policy::PHP_* constants
-     */
-    public function setPhpHandling($level = self::PHP_REMOVE)
-    {
-        $this->phpHandling = $level;
-    }
+	/**
+	 * Sets the php handling level, defaults to REMOVE.
+	 *
+	 * @param int $level one of the Dwoo_Security_Policy::PHP_* constants
+	 */
+	public function setPhpHandling($level = self::PHP_REMOVE)
+	{
+		$this->phpHandling = $level;
+	}
 
-    /**
-     * Returns the php handling level.
-     *
-     * @return int the current level, one of the Dwoo_Security_Policy::PHP_* constants
-     */
-    public function getPhpHandling()
-    {
-        return $this->phpHandling;
-    }
+	/**
+	 * Returns the php handling level.
+	 *
+	 * @return int the current level, one of the Dwoo_Security_Policy::PHP_* constants
+	 */
+	public function getPhpHandling()
+	{
+		return $this->phpHandling;
+	}
 
-    /**
-     * Sets the constant handling level, defaults to CONST_DISALLOW.
-     *
-     * @param bool $level one of the Dwoo_Security_Policy::CONST_* constants
-     */
-    public function setConstantHandling($level = self::CONST_DISALLOW)
-    {
-        $this->constHandling = $level;
-    }
+	/**
+	 * Sets the constant handling level, defaults to CONST_DISALLOW.
+	 *
+	 * @param bool $level one of the Dwoo_Security_Policy::CONST_* constants
+	 */
+	public function setConstantHandling($level = self::CONST_DISALLOW)
+	{
+		$this->constHandling = $level;
+	}
 
-    /**
-     * Returns the constant handling level.
-     *
-     * @return bool the current level, one of the Dwoo_Security_Policy::CONST_* constants
-     */
-    public function getConstantHandling()
-    {
-        return $this->constHandling;
-    }
+	/**
+	 * Returns the constant handling level.
+	 *
+	 * @return bool the current level, one of the Dwoo_Security_Policy::CONST_* constants
+	 */
+	public function getConstantHandling()
+	{
+		return $this->constHandling;
+	}
 
-    /**
-     * This is used at run time to check whether method calls are allowed or not.
-     *
-     * @param Core   $dwoo   dwoo instance that calls this
-     * @param object $obj    any object on which the method must be called
-     * @param string $method lowercased method name
-     * @param array  $args   arguments array
-     *
-     * @return mixed result of method call or unll + E_USER_NOTICE if not allowed
-     */
-    public function callMethod(Core $dwoo, $obj, $method, $args)
-    {
-        foreach ($this->allowedMethods as $class => $methods) {
-            if (!isset($methods[$method])) {
-                continue;
-            }
-            if ($obj instanceof $class) {
-                return call_user_func_array(array($obj, $method), $args);
-            }
-        }
-        $dwoo->triggerError('The current security policy prevents you from calling ' . get_class($obj) . '::' . $method . '()');
+	/**
+	 * This is used at run time to check whether method calls are allowed or not.
+	 *
+	 * @param Core   $dwoo   dwoo instance that calls this
+	 * @param object $obj    any object on which the method must be called
+	 * @param string $method lowercased method name
+	 * @param array  $args   arguments array
+	 *
+	 * @return mixed result of method call or unll + E_USER_NOTICE if not allowed
+	 */
+	public function callMethod(Core $dwoo, $obj, $method, $args)
+	{
+		foreach ($this->allowedMethods as $class => $methods) {
+			if (!isset($methods[$method])) {
+				continue;
+			}
+			if ($obj instanceof $class) {
+				return call_user_func_array(array($obj, $method), $args);
+			}
+		}
+		$dwoo->triggerError('The current security policy prevents you from calling ' . get_class($obj) . '::' . $method . '()');
 
-        return null;
-    }
+		return null;
+	}
 
-    /**
-     * This is used at compile time to check whether static method calls are allowed or not.
-     *
-     * @param mixed  $class  lowercased class name or array('class', 'method') couple
-     * @param string $method lowercased method name
-     *
-     * @return bool
-     */
-    public function isMethodAllowed($class, $method = null)
-    {
-        if (is_array($class)) {
-            list($class, $method) = $class;
-        }
-        foreach ($this->allowedMethods as $allowedClass => $methods) {
-            if (!isset($methods[$method])) {
-                continue;
-            }
-            if ($class === $allowedClass || is_subclass_of($class, $allowedClass)) {
-                return true;
-            }
-        }
+	/**
+	 * This is used at compile time to check whether static method calls are allowed or not.
+	 *
+	 * @param mixed  $class  lowercased class name or array('class', 'method') couple
+	 * @param string $method lowercased method name
+	 *
+	 * @return bool
+	 */
+	public function isMethodAllowed($class, $method = null)
+	{
+		if (is_array($class)) {
+			list($class, $method) = $class;
+		}
+		foreach ($this->allowedMethods as $allowedClass => $methods) {
+			if (!isset($methods[$method])) {
+				continue;
+			}
+			if ($class === $allowedClass || is_subclass_of($class, $allowedClass)) {
+				return true;
+			}
+		}
 
-        return false;
-    }
+		return false;
+	}
 }

Spacing +1 added lines, -1 removed lines

@@ -290,7 +290,7 @@
                 return call_user_func_array(array($obj, $method), $args);
             }
         }
-        $dwoo->triggerError('The current security policy prevents you from calling ' . get_class($obj) . '::' . $method . '()');
+        $dwoo->triggerError('The current security policy prevents you from calling '.get_class($obj).'::'.$method.'()');
 
         return null;
     }

lib/Dwoo/Template/File.php

Indentation +248 added lines, -248 removed lines

@@ -29,279 +29,279 @@
  */
 class File extends String
 {
-    /**
-     * 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 = null;
+	/**
+	 * Include path(s) to look into to find this template.
+	 *
+	 * @var array
+	 */
+	protected $includePath = 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;
+	/**
+	 * 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 = null)
-    {
-        $this->file      = $file;
-        $this->name      = basename($file);
-        $this->cacheTime = $cacheTime;
+	/**
+	 * 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 = null)
+	{
+		$this->file      = $file;
+		$this->name      = basename($file);
+		$this->cacheTime = $cacheTime;
 
-        if ($compileId !== null) {
-            $this->compileId = str_replace('../', '__', strtr($compileId, '\\%?=!:;' . PATH_SEPARATOR, '/-------'));
-        }
+		if ($compileId !== null) {
+			$this->compileId = str_replace('../', '__', strtr($compileId, '\\%?=!:;' . PATH_SEPARATOR, '/-------'));
+		}
 
-        if ($cacheId !== null) {
-            $this->cacheId = str_replace('../', '__', strtr($cacheId, '\\%?=!:;' . PATH_SEPARATOR, '/-------'));
-        }
+		if ($cacheId !== null) {
+			$this->cacheId = str_replace('../', '__', strtr($cacheId, '\\%?=!:;' . PATH_SEPARATOR, '/-------'));
+		}
 
-        if (is_string($includePath)) {
-            $this->includePath = array($includePath);
-        } elseif (is_array($includePath)) {
-            $this->includePath = $includePath;
-        }
-    }
+		if (is_string($includePath)) {
+			$this->includePath = array($includePath);
+		} elseif (is_array($includePath)) {
+			$this->includePath = $includePath;
+		}
+	}
 
-    /**
-     * 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 ($this->includePath === null) {
-            return $this->file;
-        } else {
-            foreach ($this->includePath as $path) {
-                $path = rtrim($path, DIRECTORY_SEPARATOR);
-                if (file_exists($path . DIRECTORY_SEPARATOR . $this->file) === true) {
-                    $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 ($this->includePath === null) {
+			return $this->file;
+		} else {
+			foreach ($this->includePath as $path) {
+				$path = rtrim($path, DIRECTORY_SEPARATOR);
+				if (file_exists($path . DIRECTORY_SEPARATOR . $this->file) === true) {
+					$this->resolvedPath = $path . DIRECTORY_SEPARATOR . $this->file;
 
-                    return $this->resolvedPath;
-                }
-            }
+					return $this->resolvedPath;
+				}
+			}
 
-            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 the full compiled file name and assigns a default value to it if
-     * required.
-     *
-     * @param Core $core the dwoo instance that requests the file name
-     *
-     * @return string the full path to the compiled file
-     */
-    protected function getCompiledFilename(Core $core)
-    {
-        // no compile id was provided, set default
-        if ($this->compileId === null) {
-            $this->compileId = str_replace('../', '__', strtr($this->getResourceIdentifier(), '\\:', '/-'));
-        }
+	/**
+	 * Returns the full compiled file name and assigns a default value to it if
+	 * required.
+	 *
+	 * @param Core $core the dwoo instance that requests the file name
+	 *
+	 * @return string the full path to the compiled file
+	 */
+	protected function getCompiledFilename(Core $core)
+	{
+		// no compile id was provided, set default
+		if ($this->compileId === null) {
+			$this->compileId = str_replace('../', '__', strtr($this->getResourceIdentifier(), '\\:', '/-'));
+		}
 
-        return $this->compileId . '.d' . Core::RELEASE_TAG . '.php';
-    }
+		return $this->compileId . '.d' . Core::RELEASE_TAG . '.php';
+	}
 
-    /**
-     * 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) . ')';
+	}
 }

Spacing +12 added lines, -12 removed lines

@@ -72,11 +72,11 @@ 
         $this->cacheTime = $cacheTime;
 
         if ($compileId !== null) {
-            $this->compileId = str_replace('../', '__', strtr($compileId, '\\%?=!:;' . PATH_SEPARATOR, '/-------'));
+            $this->compileId = str_replace('../', '__', strtr($compileId, '\\%?=!:;'.PATH_SEPARATOR, '/-------'));
         }
 
         if ($cacheId !== null) {
-            $this->cacheId = str_replace('../', '__', strtr($cacheId, '\\%?=!:;' . PATH_SEPARATOR, '/-------'));
+            $this->cacheId = str_replace('../', '__', strtr($cacheId, '\\%?=!:;'.PATH_SEPARATOR, '/-------'));
         }
 
         if (is_string($includePath)) {
@@ -121,7 +121,7 @@ 
      */
     protected function isValidCompiledFile($file)
     {
-        return parent::isValidCompiledFile($file) && (int)$this->getUid() <= filemtime($file);
+        return parent::isValidCompiledFile($file) && (int) $this->getUid() <= filemtime($file);
     }
 
     /**
@@ -159,14 +159,14 @@ 
         } else {
             foreach ($this->includePath as $path) {
                 $path = rtrim($path, DIRECTORY_SEPARATOR);
-                if (file_exists($path . DIRECTORY_SEPARATOR . $this->file) === true) {
-                    $this->resolvedPath = $path . DIRECTORY_SEPARATOR . $this->file;
+                if (file_exists($path.DIRECTORY_SEPARATOR.$this->file) === true) {
+                    $this->resolvedPath = $path.DIRECTORY_SEPARATOR.$this->file;
 
                     return $this->resolvedPath;
                 }
             }
 
-            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)');
         }
     }
 
@@ -178,7 +178,7 @@ 
      */
     public function getUid()
     {
-        return (string)filemtime($this->getResourceIdentifier());
+        return (string) filemtime($this->getResourceIdentifier());
     }
 
     /**
@@ -237,7 +237,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;
                     }
@@ -250,7 +250,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) {
@@ -264,7 +264,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>');
             }
         }
 
@@ -291,7 +291,7 @@ 
             $this->compileId = str_replace('../', '__', strtr($this->getResourceIdentifier(), '\\:', '/-'));
         }
 
-        return $this->compileId . '.d' . Core::RELEASE_TAG . '.php';
+        return $this->compileId.'.d'.Core::RELEASE_TAG.'.php';
     }
 
     /**
@@ -302,6 +302,6 @@ 
      */
     public function getIsModifiedCode()
     {
-        return '"' . $this->getUid() . '" == filemtime(' . var_export($this->getResourceIdentifier(), true) . ')';
+        return '"'.$this->getUid().'" == filemtime('.var_export($this->getResourceIdentifier(), true).')';
     }
 }

lib/Dwoo/Smarty/Filter/Adapter.php

Indentation +17 added lines, -17 removed lines

@@ -23,23 +23,23 @@
  */
 class Adapter extends Processor
 {
-    public $callback;
+	public $callback;
 
-    /**
-     * @param string $input
-     *
-     * @return mixed
-     */
-    public function process($input)
-    {
-        return call_user_func($this->callback, $input);
-    }
+	/**
+	 * @param string $input
+	 *
+	 * @return mixed
+	 */
+	public function process($input)
+	{
+		return call_user_func($this->callback, $input);
+	}
 
-    /**
-     * @param $callback
-     */
-    public function registerCallback($callback)
-    {
-        $this->callback = $callback;
-    }
+	/**
+	 * @param $callback
+	 */
+	public function registerCallback($callback)
+	{
+		$this->callback = $callback;
+	}
 }
\ No newline at end of file