ci-bonfire / Sprint

myth/Themers/MetaCollection.php

Indentation +213 added lines, -213 removed lines

@@ -35,219 +35,219 @@
 
 class MetaCollection implements MetaInterface {
 
-    /**
-     * Stores the meta values the user has set.
-     *
-     * @var array
-     */
-    protected $meta = [];
-
-    /**
-     * Stores the standard meta-value names
-     * Mostly here for reference, I guess.
-     *
-     * @var array
-     */
-    protected $std_meta = [
-        'application-name',
-        'author',
-        'copyright',
-        'description',
-        'generator',
-        'keywords',
-        'robots',
-        'googlebot'
-    ];
-
-    /**
-     * Stores the HTTP-Equiv meta tags
-     * since they need to be rendered differently.
-     *
-     * @var array
-     */
-    protected $http_equiv_meta = [
-        'cache-control',
-        'content-language',
-        'content-type',
-        'default-style',
-        'expires',
-        'pragma',
-        'refresh',
-        'set-cookie'
-    ];
-
-    /**
-     * Stores the document's character encoding.
-     *
-     * @var string
-     */
-    public $charset = 'utf-8';
-
-    //--------------------------------------------------------------------
-
-    public function __construct($ci)
-    {
-        $ci->config->load('html_meta', true);
-
-        $config = $ci->config->item('html_meta');
-
-        $this->meta = $config['meta'];
-
-        $this->http_equiv_meta = array_merge($this->http_equiv_meta, $config['http-equiv']);
-    }
-
-    //--------------------------------------------------------------------
-
-
-    /**
-     * Sets a single meta item.
-     * $alias can also be an array of key/value pairs to set.
-     *
-     * @param string|array $alias
-     * @param null $value
-     *
-     * @return mixed
-     */
-    public function set($alias, $value=null, $escape=true)
-    {
-        if (is_array($alias))
-        {
-            foreach ($alias as $key => $val)
-            {
-                $this->set($key, $val);
-            }
-
-            return $this;
-        }
-
-        // Charset
-        if (strtolower($alias) == 'charset')
-        {
-            $this->charset = $value;
-
-            return $this;
-        }
-
-        $this->meta[ strtolower($alias) ] = $escape ? esc($value, 'htmlAttr') : $value;
-
-        return $this;
-    }
-
-    //--------------------------------------------------------------------
-
-    /**
-     * Returns a single meta item.
-     *
-     * @param $alias
-     *
-     * @return mixed
-     */
-    public function get($alias)
-    {
-        $alias = strtolower($alias);
-
-        return isset($this->meta[ $alias ]) ? $this->meta[$alias] : null;
-    }
-
-    //--------------------------------------------------------------------
-
-    /**
-     * Renders out all defined meta tags.
-     *
-     * @return mixed
-     */
-    public function renderTags()
-    {
-        if (! count($this->meta))
-        {
-            return null;
-        }
-
-        $output = '';
-
-        // Character Encoding
-        $output .= "\t<meta charset=\"{$this->charset}\" >";
-
-        // Everything else
-        foreach ($this->meta as $name => $content)
-        {
-            if (is_array($content))
-            {
-                $content = implode(',', $content);
-            }
-
-            if (empty($content))
-            {
-                continue;
-            }
-
-            // Http Equivalent meta tags.
-            if (in_array($name, $this->http_equiv_meta))
-            {
-                $output .= "\t<meta http-equiv=\"{$name}\" content=\"{$content}\">\n";
-            }
-            // Standard Meta Tag
-            else {
-                $output .= "\t<meta name=\"{$name}\" content=\"{$content}\">\n";
-            }
-        }
-
-        return $output;
-    }
-
-    //--------------------------------------------------------------------
-
-    /**
-     * Registers a new HTTP Equivalent meta tag so it can be
-     * rendered out properly.
-     *
-     * @param $name
-     *
-     * @return $this
-     */
-    public function registerHTTPEquivTag($name)
-    {
-        if (is_null($name))
-        {
-            return $this;
-        }
-
-        $this->http_equiv_meta[] = strtolower($name);
-
-        return $this;
-    }
-
-    //--------------------------------------------------------------------
-
-
-    /**
-     * Convenience implementation to set a value
-     * as if it was a property of the class.
-     *
-     * @param $alias
-     * @param null $value
-     */
-    public function __set($alias, $value=null)
-    {
-        $this->set($alias, $value);
-    }
-
-    //--------------------------------------------------------------------
-
-    /**
-     * Convenience method to access a value
-     * as if it was a property of the class.
-     *
-     * @param $alias
-     *
-     * @return mixed
-     */
-    public function __get($alias)
-    {
-        return $this->get($alias);
-    }
-
-    //--------------------------------------------------------------------
+	/**
+	 * Stores the meta values the user has set.
+	 *
+	 * @var array
+	 */
+	protected $meta = [];
+
+	/**
+	 * Stores the standard meta-value names
+	 * Mostly here for reference, I guess.
+	 *
+	 * @var array
+	 */
+	protected $std_meta = [
+		'application-name',
+		'author',
+		'copyright',
+		'description',
+		'generator',
+		'keywords',
+		'robots',
+		'googlebot'
+	];
+
+	/**
+	 * Stores the HTTP-Equiv meta tags
+	 * since they need to be rendered differently.
+	 *
+	 * @var array
+	 */
+	protected $http_equiv_meta = [
+		'cache-control',
+		'content-language',
+		'content-type',
+		'default-style',
+		'expires',
+		'pragma',
+		'refresh',
+		'set-cookie'
+	];
+
+	/**
+	 * Stores the document's character encoding.
+	 *
+	 * @var string
+	 */
+	public $charset = 'utf-8';
+
+	//--------------------------------------------------------------------
+
+	public function __construct($ci)
+	{
+		$ci->config->load('html_meta', true);
+
+		$config = $ci->config->item('html_meta');
+
+		$this->meta = $config['meta'];
+
+		$this->http_equiv_meta = array_merge($this->http_equiv_meta, $config['http-equiv']);
+	}
+
+	//--------------------------------------------------------------------
+
+
+	/**
+	 * Sets a single meta item.
+	 * $alias can also be an array of key/value pairs to set.
+	 *
+	 * @param string|array $alias
+	 * @param null $value
+	 *
+	 * @return mixed
+	 */
+	public function set($alias, $value=null, $escape=true)
+	{
+		if (is_array($alias))
+		{
+			foreach ($alias as $key => $val)
+			{
+				$this->set($key, $val);
+			}
+
+			return $this;
+		}
+
+		// Charset
+		if (strtolower($alias) == 'charset')
+		{
+			$this->charset = $value;
+
+			return $this;
+		}
+
+		$this->meta[ strtolower($alias) ] = $escape ? esc($value, 'htmlAttr') : $value;
+
+		return $this;
+	}
+
+	//--------------------------------------------------------------------
+
+	/**
+	 * Returns a single meta item.
+	 *
+	 * @param $alias
+	 *
+	 * @return mixed
+	 */
+	public function get($alias)
+	{
+		$alias = strtolower($alias);
+
+		return isset($this->meta[ $alias ]) ? $this->meta[$alias] : null;
+	}
+
+	//--------------------------------------------------------------------
+
+	/**
+	 * Renders out all defined meta tags.
+	 *
+	 * @return mixed
+	 */
+	public function renderTags()
+	{
+		if (! count($this->meta))
+		{
+			return null;
+		}
+
+		$output = '';
+
+		// Character Encoding
+		$output .= "\t<meta charset=\"{$this->charset}\" >";
+
+		// Everything else
+		foreach ($this->meta as $name => $content)
+		{
+			if (is_array($content))
+			{
+				$content = implode(',', $content);
+			}
+
+			if (empty($content))
+			{
+				continue;
+			}
+
+			// Http Equivalent meta tags.
+			if (in_array($name, $this->http_equiv_meta))
+			{
+				$output .= "\t<meta http-equiv=\"{$name}\" content=\"{$content}\">\n";
+			}
+			// Standard Meta Tag
+			else {
+				$output .= "\t<meta name=\"{$name}\" content=\"{$content}\">\n";
+			}
+		}
+
+		return $output;
+	}
+
+	//--------------------------------------------------------------------
+
+	/**
+	 * Registers a new HTTP Equivalent meta tag so it can be
+	 * rendered out properly.
+	 *
+	 * @param $name
+	 *
+	 * @return $this
+	 */
+	public function registerHTTPEquivTag($name)
+	{
+		if (is_null($name))
+		{
+			return $this;
+		}
+
+		$this->http_equiv_meta[] = strtolower($name);
+
+		return $this;
+	}
+
+	//--------------------------------------------------------------------
+
+
+	/**
+	 * Convenience implementation to set a value
+	 * as if it was a property of the class.
+	 *
+	 * @param $alias
+	 * @param null $value
+	 */
+	public function __set($alias, $value=null)
+	{
+		$this->set($alias, $value);
+	}
+
+	//--------------------------------------------------------------------
+
+	/**
+	 * Convenience method to access a value
+	 * as if it was a property of the class.
+	 *
+	 * @param $alias
+	 *
+	 * @return mixed
+	 */
+	public function __get($alias)
+	{
+		return $this->get($alias);
+	}
+
+	//--------------------------------------------------------------------
 
 
 

Spacing +6 added lines, -6 removed lines

@@ -1,6 +1,6 @@ 
 <?php namespace Myth\Themers;
 
-require_once dirname(__FILE__) .'/escape.php';
+require_once dirname(__FILE__).'/escape.php';
 
 /**
  * Sprint
@@ -108,7 +108,7 @@ 
      *
      * @return mixed
      */
-    public function set($alias, $value=null, $escape=true)
+    public function set($alias, $value = null, $escape = true)
     {
         if (is_array($alias))
         {
@@ -128,7 +128,7 @@ 
             return $this;
         }
 
-        $this->meta[ strtolower($alias) ] = $escape ? esc($value, 'htmlAttr') : $value;
+        $this->meta[strtolower($alias)] = $escape ? esc($value, 'htmlAttr') : $value;
 
         return $this;
     }
@@ -146,7 +146,7 @@ 
     {
         $alias = strtolower($alias);
 
-        return isset($this->meta[ $alias ]) ? $this->meta[$alias] : null;
+        return isset($this->meta[$alias]) ? $this->meta[$alias] : null;
     }
 
     //--------------------------------------------------------------------
@@ -158,7 +158,7 @@ 
      */
     public function renderTags()
     {
-        if (! count($this->meta))
+        if ( ! count($this->meta))
         {
             return null;
         }
@@ -227,7 +227,7 @@ 
      * @param $alias
      * @param null $value
      */
-    public function __set($alias, $value=null)
+    public function __set($alias, $value = null)
     {
         $this->set($alias, $value);
     }

myth/Themers/ThemerInterface.php

Indentation +214 added lines, -214 removed lines

@@ -38,219 +38,219 @@
  */
 interface ThemerInterface
 {
-    /**
-     * The main entryway into rendering a view. This is called from the
-     * controller and is generally the last method called.
-     *
-     * @param string $layout If provided, will override the default layout.
-     */
-    public function render($layout = null);
-
-    //--------------------------------------------------------------------
-
-    /**
-     * Used within the template layout file to render the current content.
-     * This content is typically used to display the current view.
-     */
-    public function content();
-
-    //--------------------------------------------------------------------
-
-    /**
-     * Sets the active theme to use. This theme should be
-     * relative to one of the 'theme_paths' folders.
-     *
-     * @param $theme
-     */
-    public function setTheme($theme);
-
-    //--------------------------------------------------------------------
-
-    /**
-     * Returns the current theme.
-     *
-     * @return mixed|string
-     */
-    public function theme();
-
-    //--------------------------------------------------------------------
-
-    /**
-     * Sets the default theme to use.
-     *
-     * @param $theme
-     * @return mixed
-     */
-    public function setDefaultTheme($theme);
-
-    //--------------------------------------------------------------------
-
-    /**
-     * Sets the current view file to render.
-     *
-     * @param $file
-     * @return mixed
-     */
-    public function setView($file);
-
-    //--------------------------------------------------------------------
-
-    /**
-     * Returns the current view.
-     *
-     * @return mixed|string
-     */
-    public function view();
-
-    //--------------------------------------------------------------------
-
-    /**
-     * Sets the current layout to be used. MUST be the name of one of
-     * the layout files within the current theme. Case-sensitive.
-     *
-     * @param $file
-     * @return mixed
-     */
-    public function setLayout($file);
-
-    //--------------------------------------------------------------------
-
-    /**
-     * Returns the active layout.
-     *
-     * @return mixed
-     */
-    public function layout();
-
-    //--------------------------------------------------------------------
-
-    /**
-     * Stores one or more pieces of data to be passed to the views when
-     * they are rendered out.
-     *
-     * If both $key and $value are ! empty, then it will treat it as a
-     * key/value pair. If $key is an array of key/value pairs, then $value
-     * is ignored and each element of the array are made available to the
-     * view as if it was a single $key/$value pair.
-     *
-     * @param string|array $key
-     * @param mixed        $value
-     */
-    public function set($key, $value = null);
-
-    //--------------------------------------------------------------------
-
-    /**
-     * Returns a value that has been previously set().
-     *
-     * @param $key
-     * @return mixed
-     */
-    public function get($key);
-
-    //--------------------------------------------------------------------
-
-    /**
-     * Determines whether or not the view should be parsed with the
-     * CodeIgniter's parser.
-     *
-     * @param bool $parse
-     * @return mixed
-     */
-    public function parseViews($parse = false);
-
-    //--------------------------------------------------------------------
-
-    /**
-     * Theme paths allow you to have multiple locations for themes to be
-     * stored. This might be used for separating themes for different sub-
-     * applications, or a core theme and user-submitted themes.
-     *
-     * @param $alias The name the theme can be referenced by
-     * @param $path  A new path where themes can be found.
-     *
-     * @return mixed
-     */
-    public function addThemePath($alias, $path);
-
-    //--------------------------------------------------------------------
-
-    /**
-     * Removes a single theme path.
-     *
-     * @param $alias
-     */
-    public function removeThemePath($alias);
-    //--------------------------------------------------------------------
-
-    /**
-     * Loads a view file. Useful to control caching. Intended for use
-     * from within view files.
-     *
-     * You can specify that a view should belong to a theme by prefixing
-     * the name of the theme and a colon to the view name. For example,
-     * "admin:header" would try to display the "header.php" file within
-     * the "admin" theme.
-     *
-     * @param string    $view
-     * @param array     $data
-     * @param int       $cache_time  The number of MINUTES to cache the output
-     * @return mixed
-     */
-    public function display($view, $data = array(), $cache_time = 0);
-
-    //--------------------------------------------------------------------
-
-    /**
-     * Sets the variant used when creating view names. These variants can
-     * be anything, but by default are used to render specific templates
-     * for desktop, tablet, and phone. The name of the variant is added
-     * to the view name, joined by a "+" symbol.
-     *
-     * Example:
-     *      $this->setVariant('phone');
-     *      $this->display('header');
-     *
-     *      Tries to display "views/header+phone.php"
-     *
-     * @param $variant
-     * @return mixed
-     */
-    public function setVariant($variant);
-
-    //--------------------------------------------------------------------
-
-    /**
-     * Adds a new variant to the system.
-     *
-     * @param $name
-     * @param $postfix
-     * @return mixed
-     */
-    public function addVariant($name, $postfix);
-
-    //--------------------------------------------------------------------
-
-    /**
-     * Removes a variant from the system.
-     *
-     * @param $name
-     * @param $postfix
-     * @return mixed
-     */
-    public function removeVariant($name);
-
-    //--------------------------------------------------------------------
-
-    /**
-     * Runs a callback method and returns the contents to the view.
-     *
-     * @param $command
-     * @param int $cache_minutes
-     * @return mixed
-     */
-    public function call($command, $cache_minutes=0);
-
-    //--------------------------------------------------------------------
+	/**
+	 * The main entryway into rendering a view. This is called from the
+	 * controller and is generally the last method called.
+	 *
+	 * @param string $layout If provided, will override the default layout.
+	 */
+	public function render($layout = null);
+
+	//--------------------------------------------------------------------
+
+	/**
+	 * Used within the template layout file to render the current content.
+	 * This content is typically used to display the current view.
+	 */
+	public function content();
+
+	//--------------------------------------------------------------------
+
+	/**
+	 * Sets the active theme to use. This theme should be
+	 * relative to one of the 'theme_paths' folders.
+	 *
+	 * @param $theme
+	 */
+	public function setTheme($theme);
+
+	//--------------------------------------------------------------------
+
+	/**
+	 * Returns the current theme.
+	 *
+	 * @return mixed|string
+	 */
+	public function theme();
+
+	//--------------------------------------------------------------------
+
+	/**
+	 * Sets the default theme to use.
+	 *
+	 * @param $theme
+	 * @return mixed
+	 */
+	public function setDefaultTheme($theme);
+
+	//--------------------------------------------------------------------
+
+	/**
+	 * Sets the current view file to render.
+	 *
+	 * @param $file
+	 * @return mixed
+	 */
+	public function setView($file);
+
+	//--------------------------------------------------------------------
+
+	/**
+	 * Returns the current view.
+	 *
+	 * @return mixed|string
+	 */
+	public function view();
+
+	//--------------------------------------------------------------------
+
+	/**
+	 * Sets the current layout to be used. MUST be the name of one of
+	 * the layout files within the current theme. Case-sensitive.
+	 *
+	 * @param $file
+	 * @return mixed
+	 */
+	public function setLayout($file);
+
+	//--------------------------------------------------------------------
+
+	/**
+	 * Returns the active layout.
+	 *
+	 * @return mixed
+	 */
+	public function layout();
+
+	//--------------------------------------------------------------------
+
+	/**
+	 * Stores one or more pieces of data to be passed to the views when
+	 * they are rendered out.
+	 *
+	 * If both $key and $value are ! empty, then it will treat it as a
+	 * key/value pair. If $key is an array of key/value pairs, then $value
+	 * is ignored and each element of the array are made available to the
+	 * view as if it was a single $key/$value pair.
+	 *
+	 * @param string|array $key
+	 * @param mixed        $value
+	 */
+	public function set($key, $value = null);
+
+	//--------------------------------------------------------------------
+
+	/**
+	 * Returns a value that has been previously set().
+	 *
+	 * @param $key
+	 * @return mixed
+	 */
+	public function get($key);
+
+	//--------------------------------------------------------------------
+
+	/**
+	 * Determines whether or not the view should be parsed with the
+	 * CodeIgniter's parser.
+	 *
+	 * @param bool $parse
+	 * @return mixed
+	 */
+	public function parseViews($parse = false);
+
+	//--------------------------------------------------------------------
+
+	/**
+	 * Theme paths allow you to have multiple locations for themes to be
+	 * stored. This might be used for separating themes for different sub-
+	 * applications, or a core theme and user-submitted themes.
+	 *
+	 * @param $alias The name the theme can be referenced by
+	 * @param $path  A new path where themes can be found.
+	 *
+	 * @return mixed
+	 */
+	public function addThemePath($alias, $path);
+
+	//--------------------------------------------------------------------
+
+	/**
+	 * Removes a single theme path.
+	 *
+	 * @param $alias
+	 */
+	public function removeThemePath($alias);
+	//--------------------------------------------------------------------
+
+	/**
+	 * Loads a view file. Useful to control caching. Intended for use
+	 * from within view files.
+	 *
+	 * You can specify that a view should belong to a theme by prefixing
+	 * the name of the theme and a colon to the view name. For example,
+	 * "admin:header" would try to display the "header.php" file within
+	 * the "admin" theme.
+	 *
+	 * @param string    $view
+	 * @param array     $data
+	 * @param int       $cache_time  The number of MINUTES to cache the output
+	 * @return mixed
+	 */
+	public function display($view, $data = array(), $cache_time = 0);
+
+	//--------------------------------------------------------------------
+
+	/**
+	 * Sets the variant used when creating view names. These variants can
+	 * be anything, but by default are used to render specific templates
+	 * for desktop, tablet, and phone. The name of the variant is added
+	 * to the view name, joined by a "+" symbol.
+	 *
+	 * Example:
+	 *      $this->setVariant('phone');
+	 *      $this->display('header');
+	 *
+	 *      Tries to display "views/header+phone.php"
+	 *
+	 * @param $variant
+	 * @return mixed
+	 */
+	public function setVariant($variant);
+
+	//--------------------------------------------------------------------
+
+	/**
+	 * Adds a new variant to the system.
+	 *
+	 * @param $name
+	 * @param $postfix
+	 * @return mixed
+	 */
+	public function addVariant($name, $postfix);
+
+	//--------------------------------------------------------------------
+
+	/**
+	 * Removes a variant from the system.
+	 *
+	 * @param $name
+	 * @param $postfix
+	 * @return mixed
+	 */
+	public function removeVariant($name);
+
+	//--------------------------------------------------------------------
+
+	/**
+	 * Runs a callback method and returns the contents to the view.
+	 *
+	 * @param $command
+	 * @param int $cache_minutes
+	 * @return mixed
+	 */
+	public function call($command, $cache_minutes=0);
+
+	//--------------------------------------------------------------------
 
 }

Spacing +1 added lines, -1 removed lines

@@ -249,7 +249,7 @@
      * @param int $cache_minutes
      * @return mixed
      */
-    public function call($command, $cache_minutes=0);
+    public function call($command, $cache_minutes = 0);
 
     //--------------------------------------------------------------------
 

myth/Themers/escape.php

Indentation +69 added lines, -69 removed lines

@@ -4,79 +4,79 @@
 
 if (! function_exists('esc'))
 {
-    /**
-     * Escapes strings to make them safe for use
-     * within HTML templates. Used by the auto-escaping
-     * functionality in setVar() and available to
-     * use within your views.
-     *
-     * Uses ZendFramework's Escaper to handle the actual escaping,
-     * based on context. Valid contexts are:
-     *      - html
-     *      - htmlAttr
-     *      - js
-     *      - css
-     *      - url
-     *
-     * References:
-     *  - https://www.owasp.org/index.php/XSS_(Cross_Site_Scripting)_Prevention_Cheat_Sheet
-     *  - http://framework.zend.com/manual/current/en/modules/zend.escaper.introduction.html
-     *
-     * @param $data
-     * @param $context
-     * @param escaper   // An instance of ZF's Escaper to avoid repeated class instantiation.
-     *
-     * @return string
-     */
-    function esc($data, $context='html', $escaper=null)
-    {
-        if (is_array($data))
-        {
-            foreach ($data as $key => &$value)
-            {
-                $value = esc($value, $context);
-            }
-        }
+	/**
+	 * Escapes strings to make them safe for use
+	 * within HTML templates. Used by the auto-escaping
+	 * functionality in setVar() and available to
+	 * use within your views.
+	 *
+	 * Uses ZendFramework's Escaper to handle the actual escaping,
+	 * based on context. Valid contexts are:
+	 *      - html
+	 *      - htmlAttr
+	 *      - js
+	 *      - css
+	 *      - url
+	 *
+	 * References:
+	 *  - https://www.owasp.org/index.php/XSS_(Cross_Site_Scripting)_Prevention_Cheat_Sheet
+	 *  - http://framework.zend.com/manual/current/en/modules/zend.escaper.introduction.html
+	 *
+	 * @param $data
+	 * @param $context
+	 * @param escaper   // An instance of ZF's Escaper to avoid repeated class instantiation.
+	 *
+	 * @return string
+	 */
+	function esc($data, $context='html', $escaper=null)
+	{
+		if (is_array($data))
+		{
+			foreach ($data as $key => &$value)
+			{
+				$value = esc($value, $context);
+			}
+		}
 
-        $context = strtolower($context);
+		$context = strtolower($context);
 
-        if (! is_object($escaper))
-        {
-            $escaper = new Escaper(config_item('charset'));
-        }
+		if (! is_object($escaper))
+		{
+			$escaper = new Escaper(config_item('charset'));
+		}
 
-        // Valid context?
-        if (! in_array($context, ['html', 'htmlattr', 'js', 'css', 'url']))
-        {
-            throw new \InvalidArgumentException('Invalid Context type: '. $context);
-        }
+		// Valid context?
+		if (! in_array($context, ['html', 'htmlattr', 'js', 'css', 'url']))
+		{
+			throw new \InvalidArgumentException('Invalid Context type: '. $context);
+		}
 
-        if (! is_string($data))
-        {
-            return $data;
-        }
+		if (! is_string($data))
+		{
+			return $data;
+		}
 
-        switch ($context)
-        {
-            case 'html':
-                $data = $escaper->escapeHtml($data);
-                break;
-            case 'htmlattr':
-                $data = $escaper->escapeHtmlAttr($data);
-                break;
-            case 'js':
-                $data = $escaper->escapeJs($data);
-                break;
-            case 'css':
-                $data = $escaper->escapeCss($data);
-                break;
-            case 'url':
-                $data = $escaper->escapeUrl($data);
-                break;
-            default:
-                break;
-        }
+		switch ($context)
+		{
+			case 'html':
+				$data = $escaper->escapeHtml($data);
+				break;
+			case 'htmlattr':
+				$data = $escaper->escapeHtmlAttr($data);
+				break;
+			case 'js':
+				$data = $escaper->escapeJs($data);
+				break;
+			case 'css':
+				$data = $escaper->escapeCss($data);
+				break;
+			case 'url':
+				$data = $escaper->escapeUrl($data);
+				break;
+			default:
+				break;
+		}
 
-        return $data;
-    }
+		return $data;
+	}
 }
\ No newline at end of file

Spacing +6 added lines, -6 removed lines

@@ -2,7 +2,7 @@ 
 
 use Zend\Escaper\Escaper;
 
-if (! function_exists('esc'))
+if ( ! function_exists('esc'))
 {
     /**
      * Escapes strings to make them safe for use
@@ -28,7 +28,7 @@ 
      *
      * @return string
      */
-    function esc($data, $context='html', $escaper=null)
+    function esc($data, $context = 'html', $escaper = null)
     {
         if (is_array($data))
         {
@@ -40,18 +40,18 @@ 
 
         $context = strtolower($context);
 
-        if (! is_object($escaper))
+        if ( ! is_object($escaper))
         {
             $escaper = new Escaper(config_item('charset'));
         }
 
         // Valid context?
-        if (! in_array($context, ['html', 'htmlattr', 'js', 'css', 'url']))
+        if ( ! in_array($context, ['html', 'htmlattr', 'js', 'css', 'url']))
         {
-            throw new \InvalidArgumentException('Invalid Context type: '. $context);
+            throw new \InvalidArgumentException('Invalid Context type: '.$context);
         }
 
-        if (! is_string($data))
+        if ( ! is_string($data))
         {
             return $data;
         }

myth/_generators/Controller/controller.tpl.php

Indentation +10 added lines, -10 removed lines

@@ -23,7 +23,7 @@ 
 
 if (! empty($model) )
 {
-    $index_method = <<<EOD
+	$index_method = <<<EOD
 \$this->load->library('table');
 
         \$offset = \$this->uri->segment( \$this->uri->total_segments() );
@@ -44,7 +44,7 @@ 
 
 if (! empty($model))
 {
-    $create_method = <<<EOD
+	$create_method = <<<EOD
 \$this->load->helper('form');
         \$this->load->helper('inflector');
 
@@ -72,7 +72,7 @@ 
 
 if (! empty($model))
 {
-    $show_method = <<<EOD
+	$show_method = <<<EOD
 \$item = \$this->{$lower_model}->find(\$id);
 
         if (! \$item)
@@ -94,7 +94,7 @@ 
 
 if (! empty($model))
 {
-    $update_method = <<<EOD
+	$update_method = <<<EOD
 \$this->load->helper('form');
         \$this->load->helper('inflector');
 
@@ -125,7 +125,7 @@ 
 
 if (! empty($model))
 {
-    $delete_method = <<<EOD
+	$delete_method = <<<EOD
 if (\$this->{$lower_model}->delete(\$id))
         {
             \$this->setMessage('Successfully deleted item.', 'success');
@@ -145,12 +145,12 @@ 
 
 if ($themed)
 {
-    $index_method   .= "\$this->render();";
-    $create_method  .= "\$this->render();";
-    $show_method    .= "\$this->render();";
-    $update_method  .= "\$this->render();";
+	$index_method   .= "\$this->render();";
+	$create_method  .= "\$this->render();";
+	$show_method    .= "\$this->render();";
+	$update_method  .= "\$this->render();";
 
-    $fields = "
+	$fields = "
     /**
      * Allows per-controller override of theme.
      * @var null

Spacing +7 added lines, -7 removed lines

@@ -5,9 +5,9 @@ 
 //--------------------------------------------------------------------
 
 $model_string = $model ? "'{$model}'" : 'null';
-$lower_model  = trim( strtolower($model_string), "' " );
+$lower_model  = trim(strtolower($model_string), "' ");
 $lower_model_esc = strpos($lower_model, 'null') !== false ? 'null' : "'{$lower_model}'";
-$lower_controller   = strtolower($controller_name);
+$lower_controller = strtolower($controller_name);
 
 //--------------------------------------------------------------------
 // Build our Methods
@@ -21,7 +21,7 @@ 
  */
 $index_method = '';
 
-if (! empty($model) )
+if ( ! empty($model))
 {
     $index_method = <<<EOD
 \$this->load->library('table');
@@ -42,7 +42,7 @@ 
  */
 $create_method = '';
 
-if (! empty($model))
+if ( ! empty($model))
 {
     $create_method = <<<EOD
 \$this->load->helper('form');
@@ -70,7 +70,7 @@ 
  */
 $show_method = '';
 
-if (! empty($model))
+if ( ! empty($model))
 {
     $show_method = <<<EOD
 \$item = \$this->{$lower_model}->find(\$id);
@@ -92,7 +92,7 @@ 
  */
 $update_method = '';
 
-if (! empty($model))
+if ( ! empty($model))
 {
     $update_method = <<<EOD
 \$this->load->helper('form');
@@ -123,7 +123,7 @@ 
  */
 $delete_method = '';
 
-if (! empty($model))
+if ( ! empty($model))
 {
     $delete_method = <<<EOD
 if (\$this->{$lower_model}->delete(\$id))

myth/_generators/Controller/forge.php

Indentation +1 added lines, -1 removed lines

@@ -31,7 +31,7 @@
  */
 
 $descriptions = [
-    'controller' => ['controller <name> [<base>]', 'Creates a new controller file that extends from <base> or BaseController.']
+	'controller' => ['controller <name> [<base>]', 'Creates a new controller file that extends from <base> or BaseController.']
 ];
 
 $long_description = <<<EOT

myth/_generators/Controller/view_create.tpl.php

Indentation +37 added lines, -37 removed lines

@@ -4,43 +4,43 @@
 
 <?= $uikit->row([], function() use($uikit, $fields) {
 
-    $sizes = [
-        's' => 12,
-        'm' => 6,
-        'l' => 4
-    ];
-    echo $uikit->column(['sizes' => $sizes], function() use($uikit, $fields) {
-
-        foreach ($fields as $field)
-        {
-            echo $uikit->inputWrap( humanize($field['name']), null, function() use($uikit, $field) {
-
-                switch ($field['type'])
-                {
-                    case 'text':
-                        echo "            <input type='text' class='form-control' name='{$field['name']}' />\n";
-                        break;
-                    case 'number':
-                        echo "            <input type='number' class='form-control' name='{$field['name']}' />\n";
-                        break;
-                    case 'date':
-                        echo "            <input type='date' class='form-control' name='{$field['name']}' />\n";
-                        break;
-                    case 'datetime':
-                        echo "            <input type='datetime' class='form-control' name='{$field['name']}' />\n";
-                        break;
-                    case 'time':
-                        echo "            <input type='time' class='form-control' name='{$field['name']}' />\n";
-                        break;
-                    case 'textarea':
-                        echo "            <textarea name='{$field['name']}' class='form-control'></textarea>\n";
-                        break;
-                }
-
-            } );
-        }
-
-    });
+	$sizes = [
+		's' => 12,
+		'm' => 6,
+		'l' => 4
+	];
+	echo $uikit->column(['sizes' => $sizes], function() use($uikit, $fields) {
+
+		foreach ($fields as $field)
+		{
+			echo $uikit->inputWrap( humanize($field['name']), null, function() use($uikit, $field) {
+
+				switch ($field['type'])
+				{
+					case 'text':
+						echo "            <input type='text' class='form-control' name='{$field['name']}' />\n";
+						break;
+					case 'number':
+						echo "            <input type='number' class='form-control' name='{$field['name']}' />\n";
+						break;
+					case 'date':
+						echo "            <input type='date' class='form-control' name='{$field['name']}' />\n";
+						break;
+					case 'datetime':
+						echo "            <input type='datetime' class='form-control' name='{$field['name']}' />\n";
+						break;
+					case 'time':
+						echo "            <input type='time' class='form-control' name='{$field['name']}' />\n";
+						break;
+					case 'textarea':
+						echo "            <textarea name='{$field['name']}' class='form-control'></textarea>\n";
+						break;
+				}
+
+			} );
+		}
+
+	});
 
 }); ?>
 

Spacing +1 added lines, -1 removed lines

@@ -13,7 +13,7 @@
 
         foreach ($fields as $field)
         {
-            echo $uikit->inputWrap( humanize($field['name']), null, function() use($uikit, $field) {
+            echo $uikit->inputWrap(humanize($field['name']), null, function() use($uikit, $field) {
 
                 switch ($field['type'])
                 {

myth/_generators/Controller/view_update.tpl.php

Indentation +39 added lines, -39 removed lines

@@ -5,45 +5,45 @@
 <?= $uikit->row([], function() use($uikit, $fields)
 {
 
-    $sizes = [
-        's' => 12,
-        'm' => 6,
-        'l' => 4
-    ];
-    echo $uikit->column( [ 'sizes' => $sizes ], function () use ( $uikit, $fields )
-    {
-
-        foreach ( $fields as $field )
-        {
-
-            echo $uikit->inputWrap( humanize( $field['name'] ), NULL, function () use ( $uikit, $field )
-            {
-
-                switch ( $field['type'] )
-                {
-                    case 'text':
-                        echo "            <input type='text' name='{$field['name']}' class='form-control' value='@= set_value('" . $field["name"] . "', \$item->" . $field['name'] . " ) ?>' />\n";
-                        break;
-                    case 'number':
-                        echo "            <input type='number' name='{$field['name']}' class='form-control' value='@= set_value('" . $field["name"] . "', \$item->" . $field['name'] . " ) ?>' />\n";
-                        break;
-                    case 'date':
-                        echo "            <input type='date' name='{$field['name']}' class='form-control' value='@= set_value('" . $field["name"] . "', \$item->" . $field['name'] . " ) ?>' />\n";
-                        break;
-                    case 'datetime':
-                        echo "            <input type='datetime' name='{$field['name']}' class='form-control' value='@= set_value('" . $field["name"] . "', \$item->" . $field['name'] . " ) ?>' />\n";
-                        break;
-                    case 'time':
-                        echo "            <input type='time' name='{$field['name']}' class='form-control' value='@= set_value('" . $field["name"] . "', \$item->" . $field['name'] . " ) ?>' />\n";
-                        break;
-                    case 'textarea':
-                        echo "            <textarea  class='form-control' name='{$field['name']}'>@= set_value('" . $field["name"] . "') ?></textarea>\n";
-                        break;
-                }
-
-            } );
-        }
-    } );
+	$sizes = [
+		's' => 12,
+		'm' => 6,
+		'l' => 4
+	];
+	echo $uikit->column( [ 'sizes' => $sizes ], function () use ( $uikit, $fields )
+	{
+
+		foreach ( $fields as $field )
+		{
+
+			echo $uikit->inputWrap( humanize( $field['name'] ), NULL, function () use ( $uikit, $field )
+			{
+
+				switch ( $field['type'] )
+				{
+					case 'text':
+						echo "            <input type='text' name='{$field['name']}' class='form-control' value='@= set_value('" . $field["name"] . "', \$item->" . $field['name'] . " ) ?>' />\n";
+						break;
+					case 'number':
+						echo "            <input type='number' name='{$field['name']}' class='form-control' value='@= set_value('" . $field["name"] . "', \$item->" . $field['name'] . " ) ?>' />\n";
+						break;
+					case 'date':
+						echo "            <input type='date' name='{$field['name']}' class='form-control' value='@= set_value('" . $field["name"] . "', \$item->" . $field['name'] . " ) ?>' />\n";
+						break;
+					case 'datetime':
+						echo "            <input type='datetime' name='{$field['name']}' class='form-control' value='@= set_value('" . $field["name"] . "', \$item->" . $field['name'] . " ) ?>' />\n";
+						break;
+					case 'time':
+						echo "            <input type='time' name='{$field['name']}' class='form-control' value='@= set_value('" . $field["name"] . "', \$item->" . $field['name'] . " ) ?>' />\n";
+						break;
+					case 'textarea':
+						echo "            <textarea  class='form-control' name='{$field['name']}'>@= set_value('" . $field["name"] . "') ?></textarea>\n";
+						break;
+				}
+
+			} );
+		}
+	} );
 } );
 ?>
 

Spacing +10 added lines, -10 removed lines

@@ -10,34 +10,34 @@
         'm' => 6,
         'l' => 4
     ];
-    echo $uikit->column( [ 'sizes' => $sizes ], function () use ( $uikit, $fields )
+    echo $uikit->column(['sizes' => $sizes], function() use ($uikit, $fields)
     {
 
-        foreach ( $fields as $field )
+        foreach ($fields as $field)
         {
 
-            echo $uikit->inputWrap( humanize( $field['name'] ), NULL, function () use ( $uikit, $field )
+            echo $uikit->inputWrap(humanize($field['name']), NULL, function() use ($uikit, $field)
             {
 
-                switch ( $field['type'] )
+                switch ($field['type'])
                 {
                     case 'text':
-                        echo "            <input type='text' name='{$field['name']}' class='form-control' value='@= set_value('" . $field["name"] . "', \$item->" . $field['name'] . " ) ?>' />\n";
+                        echo "            <input type='text' name='{$field['name']}' class='form-control' value='@= set_value('".$field["name"]."', \$item->".$field['name']." ) ?>' />\n";
                         break;
                     case 'number':
-                        echo "            <input type='number' name='{$field['name']}' class='form-control' value='@= set_value('" . $field["name"] . "', \$item->" . $field['name'] . " ) ?>' />\n";
+                        echo "            <input type='number' name='{$field['name']}' class='form-control' value='@= set_value('".$field["name"]."', \$item->".$field['name']." ) ?>' />\n";
                         break;
                     case 'date':
-                        echo "            <input type='date' name='{$field['name']}' class='form-control' value='@= set_value('" . $field["name"] . "', \$item->" . $field['name'] . " ) ?>' />\n";
+                        echo "            <input type='date' name='{$field['name']}' class='form-control' value='@= set_value('".$field["name"]."', \$item->".$field['name']." ) ?>' />\n";
                         break;
                     case 'datetime':
-                        echo "            <input type='datetime' name='{$field['name']}' class='form-control' value='@= set_value('" . $field["name"] . "', \$item->" . $field['name'] . " ) ?>' />\n";
+                        echo "            <input type='datetime' name='{$field['name']}' class='form-control' value='@= set_value('".$field["name"]."', \$item->".$field['name']." ) ?>' />\n";
                         break;
                     case 'time':
-                        echo "            <input type='time' name='{$field['name']}' class='form-control' value='@= set_value('" . $field["name"] . "', \$item->" . $field['name'] . " ) ?>' />\n";
+                        echo "            <input type='time' name='{$field['name']}' class='form-control' value='@= set_value('".$field["name"]."', \$item->".$field['name']." ) ?>' />\n";
                         break;
                     case 'textarea':
-                        echo "            <textarea  class='form-control' name='{$field['name']}'>@= set_value('" . $field["name"] . "') ?></textarea>\n";
+                        echo "            <textarea  class='form-control' name='{$field['name']}'>@= set_value('".$field["name"]."') ?></textarea>\n";
                         break;
                 }
 

myth/_generators/Migration/migration.tpl.php

Indentation +11 added lines, -11 removed lines

@@ -12,21 +12,21 @@ 
  */
 if ($action == 'create')
 {
-    $up = "\$fields = {$fields};
+	$up = "\$fields = {$fields};
 
         \$this->dbforge->add_field(\$fields);
 ";
 
-    if (! empty($primary_key))
-    {
-        $up .= "        \$this->dbforge->add_key('{$primary_key}', true);
+	if (! empty($primary_key))
+	{
+		$up .= "        \$this->dbforge->add_key('{$primary_key}', true);
 ";
-    }
+	}
 
-    $up .="	    \$this->dbforge->create_table('{$table}', true, config_item('migration_create_table_attr') );
+	$up .="	    \$this->dbforge->create_table('{$table}', true, config_item('migration_create_table_attr') );
     ";
 
-    $down = "\$this->dbforge->drop_table('{$table}');";
+	$down = "\$this->dbforge->drop_table('{$table}');";
 }
 
 /*
@@ -34,10 +34,10 @@ 
  */
 if ($action == 'add' && ! empty($column))
 {
-    $up = "\$field = {$column_string};
+	$up = "\$field = {$column_string};
         \$this->dbforge->add_column('{$table}', \$field);";
 
-    $down = "\$this->dbforge->drop_column('{$table}', '{$column}');";
+	$down = "\$this->dbforge->drop_column('{$table}', '{$column}');";
 }
 
 /*
@@ -45,9 +45,9 @@ 
  */
 if ($action == 'remove' && ! empty($column))
 {
-    $up = "\$this->dbforge->drop_column('{$table}', '{$column}');";
+	$up = "\$this->dbforge->drop_column('{$table}', '{$column}');";
 
-    $down = "\$field = {$column_string};
+	$down = "\$field = {$column_string};
         \$this->dbforge->add_column('{$table}', \$field);";
 }
 

Spacing +2 added lines, -2 removed lines

@@ -17,13 +17,13 @@
         \$this->dbforge->add_field(\$fields);
 ";
 
-    if (! empty($primary_key))
+    if ( ! empty($primary_key))
     {
         $up .= "        \$this->dbforge->add_key('{$primary_key}', true);
 ";
     }
 
-    $up .="	    \$this->dbforge->create_table('{$table}', true, config_item('migration_create_table_attr') );
+    $up .= "	    \$this->dbforge->create_table('{$table}', true, config_item('migration_create_table_attr') );
     ";
 
     $down = "\$this->dbforge->drop_table('{$table}');";

myth/_generators/Model/forge.php

Indentation +1 added lines, -1 removed lines

@@ -31,7 +31,7 @@
  */
 
 $descriptions = [
-    'model' => ['model <name>', 'Creates a new model file that extends from CIDbModel.']
+	'model' => ['model <name>', 'Creates a new model file that extends from CIDbModel.']
 ];
 
 $long_description = <<<EOT