dwoo-project / dwoo

lib/Dwoo/Adapters/Agavi/dwoo_plugins/url.php

Indentation +19 added lines, -19 removed lines

@@ -16,24 +16,24 @@
  */
 function Dwoo_Plugin_url_compile(Dwoo_Compiler $compiler, $route = null, $params = null, $options = null, array $rest = array())
 {
-    if ($params == 'null') {
-        if (count($rest)) {
-            $params = array();
-            foreach ($rest as $k => $v) {
-                if (is_numeric($k)) {
-                    $params[] = $k.'=>'.$v;
-                } else {
-                    $params[] = '"'.$k.'"=>'.$v;
-                }
-            }
-            $params = 'array('.implode(', ', $params).')';
-        } else {
-            $params = 'array()';
-        }
-    }
-    if ($options == 'null') {
-        $options = 'array()';
-    }
+	if ($params == 'null') {
+		if (count($rest)) {
+			$params = array();
+			foreach ($rest as $k => $v) {
+				if (is_numeric($k)) {
+					$params[] = $k.'=>'.$v;
+				} else {
+					$params[] = '"'.$k.'"=>'.$v;
+				}
+			}
+			$params = 'array('.implode(', ', $params).')';
+		} else {
+			$params = 'array()';
+		}
+	}
+	if ($options == 'null') {
+		$options = 'array()';
+	}
 
-    return '$this->data[\'ro\']->gen('.$route.', '.$params.', '.$options.')';
+	return '$this->data[\'ro\']->gen('.$route.', '.$params.', '.$options.')';
 }

lib/Dwoo/Adapters/CodeIgniter/controllers/dwoowelcome.php

Indentation +10 added lines, -10 removed lines

@@ -16,15 +16,15 @@
 
 class dwoowelcome extends Controller
 {
-    public function __construct()
-    {
-        parent::Controller();
-    }
+	public function __construct()
+	{
+		parent::Controller();
+	}
 
-    public function index()
-    {
-        $this->load->library('Dwootemplate');
-        $this->dwootemplate->assign('itshowlate', date('H:i:s'));
-        $this->dwootemplate->display('dwoowelcome.tpl');
-    }
+	public function index()
+	{
+		$this->load->library('Dwootemplate');
+		$this->dwootemplate->assign('itshowlate', date('H:i:s'));
+		$this->dwootemplate->display('dwoowelcome.tpl');
+	}
 }

lib/Dwoo/Adapters/CodeIgniter/config/dwootemplate.php

Indentation +1 added lines, -1 removed lines

@@ -15,7 +15,7 @@
  */
 
 if (!defined('BASEPATH')) {
-    exit('No direct script access allowed');
+	exit('No direct script access allowed');
 }
 
 // The name of the directory where templates are located.

lib/Dwoo/Adapters/CodeIgniter/libraries/Dwootemplate.php

Indentation +151 added lines, -151 removed lines

@@ -15,7 +15,7 @@ 
  */
 
 if (!defined('BASEPATH')) {
-    exit('No direct script access allowed');
+	exit('No direct script access allowed');
 }
 
 require 'dwoo/dwooAutoload.php';
@@ -39,154 +39,154 @@ 
  */
 class Dwootemplate extends Dwoo_Core
 {
-    protected $dwoo_data = array();
-
-    /**
-     * Constructor for the DwooTemplate engine.
-     */
-    public function __construct()
-    {
-        // Call parents constructor
-        parent::__construct();
-
-        // Set the config settings
-        $this->initialize();
-
-        // Assign some defaults to dwoo
-        $CI = get_instance();
-        $this->dwoo_data = new Dwoo_Data();
-        $this->dwoo_data->js_files = array();
-        $this->dwoo_data->css_files = array();
-        $this->dwoo_data->CI = $CI;
-        $this->dwoo_data->site_url = $CI->config->site_url(); // so we can get the full path to CI easily
-        $this->dwoo_data->uniqid = uniqid();
-        $this->dwoo_data->timestamp = mktime();
-
-        log_message('debug', 'Dwoo Template Class Initialized');
-    }
-
-    /**
-     * Assign data to dwoo data object.
-     *
-     * @param string $key
-     * @param mixed  $value
-     */
-    public function assign($key, $value)
-    {
-        $this->dwoo_data->$key = $value;
-    }
-
-    /**
-     * Add Javascript files to template.
-     *
-     * @param string $js
-     */
-    public function add_js($js)
-    {
-        $current = $this->dwoo_data->js_files;
-        $current[] = $js;
-        $this->dwoo_data->js_files = $current;
-    }
-
-    /**
-     * Add Css stylesheets to template.
-     *
-     * @param string $css
-     */
-    public function add_css($css)
-    {
-        $current = $this->dwoo_data->css_files;
-        $current[] = $css;
-        $this->dwoo_data->css_files = $current;
-    }
-
-    /**
-     * Display or return the compiled template
-     * Since we assign the results to the standard CI output module
-     * you can also use the helper from CI in your templates!!
-     *
-     * @param string $sTemplate
-     * @param bool   $return
-     *
-     * @return mixed
-     */
-    public function display($sTemplate, $return = false)
-    {
-        // Start benchmark
-        $CI = get_instance();
-        $CI->benchmark->mark('dwoo_parse_start');
-
-        // Check if file exists
-        if (!file_exists($this->template_dir.$sTemplate)) {
-            $message = sprintf('Template file \'%s\' not found.', $sTemplate);
-            show_error($message);
-            log_message('error', $message);
-        }
-
-        // Create new template
-        $tpl = new Dwoo_Template_File($this->template_dir.$sTemplate);
-
-        // render the template
-        $template = $this->get($tpl, $this->dwoo_data);
-
-        // Finish benchmark
-        $CI->benchmark->mark('dwoo_parse_end');
-
-        // Return results or not ?
-        if ($return == false) {
-            $CI->output->final_output = $template;
-        } else {
-            return $template;
-        }
-    }
-
-    /**
-     * Toggle Codeigniter profiler on/off.
-     */
-    public function enable_profiler($toggle = true)
-    {
-        $CI = get_instance();
-        $CI->output->enable_profiler($toggle);
-    }
-
-    /**
-     * Set http header.
-     *
-     * @example $this->output->set_header("HTTP/1.1 200 OK");
-     * @example $this->output->set_header('Last-Modified: '.gmdate('D, d M Y H:i:s', $last_update).' GMT');
-     *
-     * @param string $header
-     */
-    public function set_header($header)
-    {
-        $CI = get_instance();
-        $CI->output->set_header($header);
-    }
-
-    /**
-     * Set status header.
-     *
-     * @example $this->output->set_status_header('401');
-     * @example // Sets the header as: Unauthorized
-     *
-     * @param string $header
-     */
-    public function set_status_header($header)
-    {
-        $CI = get_instance();
-        $CI->output->set_status_header($header);
-    }
-
-    /**
-     * Assign the dwootemplate config items to the instance.
-     */
-    private function initialize()
-    {
-        $CI = get_instance();
-        $CI->config->load('dwootemplate', true);
-        $config = $CI->config->item('dwootemplate');
-        foreach ($config as $key => $val) {
-            $this->$key = $val;
-        }
-    }
+	protected $dwoo_data = array();
+
+	/**
+	 * Constructor for the DwooTemplate engine.
+	 */
+	public function __construct()
+	{
+		// Call parents constructor
+		parent::__construct();
+
+		// Set the config settings
+		$this->initialize();
+
+		// Assign some defaults to dwoo
+		$CI = get_instance();
+		$this->dwoo_data = new Dwoo_Data();
+		$this->dwoo_data->js_files = array();
+		$this->dwoo_data->css_files = array();
+		$this->dwoo_data->CI = $CI;
+		$this->dwoo_data->site_url = $CI->config->site_url(); // so we can get the full path to CI easily
+		$this->dwoo_data->uniqid = uniqid();
+		$this->dwoo_data->timestamp = mktime();
+
+		log_message('debug', 'Dwoo Template Class Initialized');
+	}
+
+	/**
+	 * Assign data to dwoo data object.
+	 *
+	 * @param string $key
+	 * @param mixed  $value
+	 */
+	public function assign($key, $value)
+	{
+		$this->dwoo_data->$key = $value;
+	}
+
+	/**
+	 * Add Javascript files to template.
+	 *
+	 * @param string $js
+	 */
+	public function add_js($js)
+	{
+		$current = $this->dwoo_data->js_files;
+		$current[] = $js;
+		$this->dwoo_data->js_files = $current;
+	}
+
+	/**
+	 * Add Css stylesheets to template.
+	 *
+	 * @param string $css
+	 */
+	public function add_css($css)
+	{
+		$current = $this->dwoo_data->css_files;
+		$current[] = $css;
+		$this->dwoo_data->css_files = $current;
+	}
+
+	/**
+	 * Display or return the compiled template
+	 * Since we assign the results to the standard CI output module
+	 * you can also use the helper from CI in your templates!!
+	 *
+	 * @param string $sTemplate
+	 * @param bool   $return
+	 *
+	 * @return mixed
+	 */
+	public function display($sTemplate, $return = false)
+	{
+		// Start benchmark
+		$CI = get_instance();
+		$CI->benchmark->mark('dwoo_parse_start');
+
+		// Check if file exists
+		if (!file_exists($this->template_dir.$sTemplate)) {
+			$message = sprintf('Template file \'%s\' not found.', $sTemplate);
+			show_error($message);
+			log_message('error', $message);
+		}
+
+		// Create new template
+		$tpl = new Dwoo_Template_File($this->template_dir.$sTemplate);
+
+		// render the template
+		$template = $this->get($tpl, $this->dwoo_data);
+
+		// Finish benchmark
+		$CI->benchmark->mark('dwoo_parse_end');
+
+		// Return results or not ?
+		if ($return == false) {
+			$CI->output->final_output = $template;
+		} else {
+			return $template;
+		}
+	}
+
+	/**
+	 * Toggle Codeigniter profiler on/off.
+	 */
+	public function enable_profiler($toggle = true)
+	{
+		$CI = get_instance();
+		$CI->output->enable_profiler($toggle);
+	}
+
+	/**
+	 * Set http header.
+	 *
+	 * @example $this->output->set_header("HTTP/1.1 200 OK");
+	 * @example $this->output->set_header('Last-Modified: '.gmdate('D, d M Y H:i:s', $last_update).' GMT');
+	 *
+	 * @param string $header
+	 */
+	public function set_header($header)
+	{
+		$CI = get_instance();
+		$CI->output->set_header($header);
+	}
+
+	/**
+	 * Set status header.
+	 *
+	 * @example $this->output->set_status_header('401');
+	 * @example // Sets the header as: Unauthorized
+	 *
+	 * @param string $header
+	 */
+	public function set_status_header($header)
+	{
+		$CI = get_instance();
+		$CI->output->set_status_header($header);
+	}
+
+	/**
+	 * Assign the dwootemplate config items to the instance.
+	 */
+	private function initialize()
+	{
+		$CI = get_instance();
+		$CI->config->load('dwootemplate', true);
+		$config = $CI->config->item('dwootemplate');
+		foreach ($config as $key => $val) {
+			$this->$key = $val;
+		}
+	}
 }

lib/Dwoo/Adapters/ZendFramework/Dwoo.php

Indentation +21 added lines, -21 removed lines

@@ -16,26 +16,26 @@
  */
 class Dwoo_Adapters_ZendFramework_Dwoo extends Dwoo_Core
 {
-    /**
-     * Redirects all unknown properties to plugin proxy
-     * to support $this->viewVariable from within templates.
-     *
-     * @param string $name Property name
-     *
-     * @return mixed
-     */
-    public function __get($name)
-    {
-        if (isset($this->getPluginProxy()->view->$name)) {
-            return $this->getPluginProxy()->view->$name;
-        }
-        $trace = debug_backtrace();
-        trigger_error(
-            'Undefined property via __get(): '.$name.
-                      ' in '.$trace[0]['file'].
-            ' on line '.$trace[0]['line'], E_USER_NOTICE
-        );
+	/**
+	 * Redirects all unknown properties to plugin proxy
+	 * to support $this->viewVariable from within templates.
+	 *
+	 * @param string $name Property name
+	 *
+	 * @return mixed
+	 */
+	public function __get($name)
+	{
+		if (isset($this->getPluginProxy()->view->$name)) {
+			return $this->getPluginProxy()->view->$name;
+		}
+		$trace = debug_backtrace();
+		trigger_error(
+			'Undefined property via __get(): '.$name.
+					  ' in '.$trace[0]['file'].
+			' on line '.$trace[0]['line'], E_USER_NOTICE
+		);
 
-        return null;
-    }
+		return null;
+	}
 }

lib/Dwoo/Processor.php

Indentation +24 added lines, -24 removed lines

@@ -23,30 +23,30 @@
  */
 abstract class Processor
 {
-    /**
-     * The compiler instance that runs this processor.
-     *
-     * @var Core
-     */
-    protected $compiler;
+	/**
+	 * The compiler instance that runs this processor.
+	 *
+	 * @var Core
+	 */
+	protected $compiler;
 
-    /**
-     * Constructor, if you override it, call parent::__construct($compiler); or assign
-     * the dwoo instance yourself if you need it.
-     *
-     * @param Compiler $compiler the compiler class
-     */
-    public function __construct(Compiler $compiler)
-    {
-        $this->compiler = $compiler;
-    }
+	/**
+	 * Constructor, if you override it, call parent::__construct($compiler); or assign
+	 * the dwoo instance yourself if you need it.
+	 *
+	 * @param Compiler $compiler the compiler class
+	 */
+	public function __construct(Compiler $compiler)
+	{
+		$this->compiler = $compiler;
+	}
 
-    /**
-     * Processes the input and returns it filtered.
-     *
-     * @param string $input the template to process
-     *
-     * @return string
-     */
-    abstract public function process($input);
+	/**
+	 * Processes the input and returns it filtered.
+	 *
+	 * @param string $input the template to process
+	 *
+	 * @return string
+	 */
+	abstract public function process($input);
 }

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      $dwoo
-     * @param ITemplate $template the template to compile
-     *
-     * @return string a compiled php code string
-     */
-    public function compile(Core $dwoo, ITemplate $template);
+	/**
+	 * Compiles the provided string down to php code.
+	 *
+	 * @param Core      $dwoo
+	 * @param ITemplate $template the template to compile
+	 *
+	 * @return string a compiled php code string
+	 */
+	public function compile(Core $dwoo, 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/Data.php

Indentation +219 added lines, -219 removed lines

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

Spacing +3 added lines, -3 removed lines

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

lib/Dwoo/Plugin.php

Indentation +70 added lines, -70 removed lines

@@ -25,81 +25,81 @@
  */
 abstract class Plugin
 {
-    /**
-     * The dwoo instance that runs this plugin.
-     *
-     * @var Core
-     */
-    protected $core;
+	/**
+	 * The dwoo instance that runs this plugin.
+	 *
+	 * @var Core
+	 */
+	protected $core;
 
-    /**
-     * Constructor, if you override it, call parent::__construct($core); or assign
-     * the dwoo instance yourself if you need it.
-     *
-     * @param Core $core the dwoo instance that runs this plugin
-     */
-    public function __construct(Core $core)
-    {
-        $this->core = $core;
-    }
+	/**
+	 * Constructor, if you override it, call parent::__construct($core); or assign
+	 * the dwoo instance yourself if you need it.
+	 *
+	 * @param Core $core the dwoo instance that runs this plugin
+	 */
+	public function __construct(Core $core)
+	{
+		$this->core = $core;
+	}
 
-    // plugins should always implement :
-    // public function process($arg, $arg, ...)
-    // or for block plugins :
-    // public function init($arg, $arg, ...)
+	// plugins should always implement :
+	// public function process($arg, $arg, ...)
+	// or for block plugins :
+	// public function init($arg, $arg, ...)
 
-    // this could be enforced with :
-    // abstract public function process(...);
-    // if my feature request gets enough interest one day
-    // see => http://bugs.php.net/bug.php?id=44043
+	// this could be enforced with :
+	// abstract public function process(...);
+	// if my feature request gets enough interest one day
+	// see => http://bugs.php.net/bug.php?id=44043
 
-    /**
-     * Utility function that converts an array of compiled parameters (or rest array) to a string of xml/html tag
-     * attributes. this is to be used in preProcessing or postProcessing functions, example :
-     *  $p = $compiler->getCompiledParams($params);
-     *  // get only the rest array as attributes
-     *  $attributes = Plugin::paramsToAttributes($p['*']);
-     *  // get all the parameters as attributes (if there is a rest array, it will be included)
-     *  $attributes = Plugin::paramsToAttributes($p);
-     *
-     * @param array    $params   an array of attributeName=>value items that will be compiled to be ready for inclusion in a php string
-     *                                inclusion in a php string
-     * @param string   $delim    the string delimiter you want to use (defaults to ')
-     * @param Compiler $compiler the compiler instance (optional for BC, but recommended to pass it for proper escaping behavior)
-     *                                escaping behavior)
-     *
-     * @return string
-     */
-    public static function paramsToAttributes(array $params, $delim = '\'', Compiler $compiler = null)
-    {
-        if (isset($params['*'])) {
-            $params = array_merge($params, $params['*']);
-            unset($params['*']);
-        }
+	/**
+	 * Utility function that converts an array of compiled parameters (or rest array) to a string of xml/html tag
+	 * attributes. this is to be used in preProcessing or postProcessing functions, example :
+	 *  $p = $compiler->getCompiledParams($params);
+	 *  // get only the rest array as attributes
+	 *  $attributes = Plugin::paramsToAttributes($p['*']);
+	 *  // get all the parameters as attributes (if there is a rest array, it will be included)
+	 *  $attributes = Plugin::paramsToAttributes($p);
+	 *
+	 * @param array    $params   an array of attributeName=>value items that will be compiled to be ready for inclusion in a php string
+	 *                                inclusion in a php string
+	 * @param string   $delim    the string delimiter you want to use (defaults to ')
+	 * @param Compiler $compiler the compiler instance (optional for BC, but recommended to pass it for proper escaping behavior)
+	 *                                escaping behavior)
+	 *
+	 * @return string
+	 */
+	public static function paramsToAttributes(array $params, $delim = '\'', Compiler $compiler = null)
+	{
+		if (isset($params['*'])) {
+			$params = array_merge($params, $params['*']);
+			unset($params['*']);
+		}
 
-        $out = '';
-        foreach ($params as $attr => $val) {
-            $out .= ' ' . $attr . '=';
-            if (trim($val, '"\'') == '' || $val == 'null') {
-                $out .= str_replace($delim, '\\' . $delim, '""');
-            } elseif (substr($val, 0, 1) === $delim && substr($val, - 1) === $delim) {
-                $out .= str_replace($delim, '\\' . $delim, '"' . substr($val, 1, - 1) . '"');
-            } else {
-                if (!$compiler) {
-                    // disable double encoding since it can not be determined if it was encoded
-                    $escapedVal = '.(is_string($tmp2=' . $val . ') ? htmlspecialchars($tmp2, ENT_QUOTES, $this->charset, false) : $tmp2).';
-                } elseif (!$compiler->getAutoEscape() || false === strpos($val, 'isset($this->scope')) {
-                    // escape if auto escaping is disabled, or there was no variable in the string
-                    $escapedVal = '.(is_string($tmp2=' . $val . ') ? htmlspecialchars($tmp2, ENT_QUOTES, $this->charset) : $tmp2).';
-                } else {
-                    // print as is
-                    $escapedVal = '.' . $val . '.';
-                }
+		$out = '';
+		foreach ($params as $attr => $val) {
+			$out .= ' ' . $attr . '=';
+			if (trim($val, '"\'') == '' || $val == 'null') {
+				$out .= str_replace($delim, '\\' . $delim, '""');
+			} elseif (substr($val, 0, 1) === $delim && substr($val, - 1) === $delim) {
+				$out .= str_replace($delim, '\\' . $delim, '"' . substr($val, 1, - 1) . '"');
+			} else {
+				if (!$compiler) {
+					// disable double encoding since it can not be determined if it was encoded
+					$escapedVal = '.(is_string($tmp2=' . $val . ') ? htmlspecialchars($tmp2, ENT_QUOTES, $this->charset, false) : $tmp2).';
+				} elseif (!$compiler->getAutoEscape() || false === strpos($val, 'isset($this->scope')) {
+					// escape if auto escaping is disabled, or there was no variable in the string
+					$escapedVal = '.(is_string($tmp2=' . $val . ') ? htmlspecialchars($tmp2, ENT_QUOTES, $this->charset) : $tmp2).';
+				} else {
+					// print as is
+					$escapedVal = '.' . $val . '.';
+				}
 
-                $out .= str_replace($delim, '\\' . $delim, '"') . $delim . $escapedVal . $delim . str_replace($delim, '\\' . $delim, '"');
-            }
-        }
+				$out .= str_replace($delim, '\\' . $delim, '"') . $delim . $escapedVal . $delim . str_replace($delim, '\\' . $delim, '"');
+			}
+		}
 
-        return ltrim($out);
-    }
+		return ltrim($out);
+	}
 }

Spacing +7 added lines, -7 removed lines

@@ -79,24 +79,24 @@
 
         $out = '';
         foreach ($params as $attr => $val) {
-            $out .= ' ' . $attr . '=';
+            $out .= ' '.$attr.'=';
             if (trim($val, '"\'') == '' || $val == 'null') {
-                $out .= str_replace($delim, '\\' . $delim, '""');
+                $out .= str_replace($delim, '\\'.$delim, '""');
             } elseif (substr($val, 0, 1) === $delim && substr($val, - 1) === $delim) {
-                $out .= str_replace($delim, '\\' . $delim, '"' . substr($val, 1, - 1) . '"');
+                $out .= str_replace($delim, '\\'.$delim, '"'.substr($val, 1, - 1).'"');
             } else {
                 if (!$compiler) {
                     // disable double encoding since it can not be determined if it was encoded
-                    $escapedVal = '.(is_string($tmp2=' . $val . ') ? htmlspecialchars($tmp2, ENT_QUOTES, $this->charset, false) : $tmp2).';
+                    $escapedVal = '.(is_string($tmp2='.$val.') ? htmlspecialchars($tmp2, ENT_QUOTES, $this->charset, false) : $tmp2).';
                 } elseif (!$compiler->getAutoEscape() || false === strpos($val, 'isset($this->scope')) {
                     // escape if auto escaping is disabled, or there was no variable in the string
-                    $escapedVal = '.(is_string($tmp2=' . $val . ') ? htmlspecialchars($tmp2, ENT_QUOTES, $this->charset) : $tmp2).';
+                    $escapedVal = '.(is_string($tmp2='.$val.') ? htmlspecialchars($tmp2, ENT_QUOTES, $this->charset) : $tmp2).';
                 } else {
                     // print as is
-                    $escapedVal = '.' . $val . '.';
+                    $escapedVal = '.'.$val.'.';
                 }
 
-                $out .= str_replace($delim, '\\' . $delim, '"') . $delim . $escapedVal . $delim . str_replace($delim, '\\' . $delim, '"');
+                $out .= str_replace($delim, '\\'.$delim, '"').$delim.$escapedVal.$delim.str_replace($delim, '\\'.$delim, '"');
             }
         }