ci-bonfire / Sprint

system/database/DB.php

Indentation +1 added lines, -1 removed lines

@@ -185,7 +185,7 @@
 	elseif ( ! class_exists('CI_DB', FALSE))
 	{
 		/**
-	 	 * @ignore
+		 * @ignore
 		 */
 		class CI_DB extends CI_DB_driver { }
 	}

myth/Docs/DocSearchInterface.php

Indentation +30 added lines, -30 removed lines

@@ -32,40 +32,40 @@
 
 interface DocSearchInterface {
 
-    /**
-     * The entry point for performing a search of the documentation.
-     *
-     * @param null  $terms
-     * @param array $folders
-     *
-     * @return array|null
-     */
-    public function search($terms = null, $folders = []);
+	/**
+	 * The entry point for performing a search of the documentation.
+	 *
+	 * @param null  $terms
+	 * @param array $folders
+	 *
+	 * @return array|null
+	 */
+	public function search($terms = null, $folders = []);
 
-    //--------------------------------------------------------------------
+	//--------------------------------------------------------------------
 
-    /**
-     * Stores the name of the callback method to run to convert the source
-     * files to viewable files. By default, this should be used to register
-     * a Mardown Extended formatter with the system, but could be used to
-     * extend the
-     *
-     * @param string $callback_name
-     * @param bool   $cascade       // If FALSE the formatting of a component ends here. If TRUE, will be passed to next formatter.
-     * @return $this
-     */
-    public function registerFormatter($callback_name='', $cascade=false);
+	/**
+	 * Stores the name of the callback method to run to convert the source
+	 * files to viewable files. By default, this should be used to register
+	 * a Mardown Extended formatter with the system, but could be used to
+	 * extend the
+	 *
+	 * @param string $callback_name
+	 * @param bool   $cascade       // If FALSE the formatting of a component ends here. If TRUE, will be passed to next formatter.
+	 * @return $this
+	 */
+	public function registerFormatter($callback_name='', $cascade=false);
 
-    //--------------------------------------------------------------------
+	//--------------------------------------------------------------------
 
-    /**
-     * Runs the text through the registered formatters.
-     *
-     * @param $str
-     * @return mixed
-     */
-    public function format($str);
+	/**
+	 * Runs the text through the registered formatters.
+	 *
+	 * @param $str
+	 * @return mixed
+	 */
+	public function format($str);
 
-    //--------------------------------------------------------------------
+	//--------------------------------------------------------------------
 
 }

myth/CLI.php

Indentation +502 added lines, -502 removed lines

@@ -30,506 +30,506 @@ 
  */
 class CLI {
 
-    public static $readline_support = false;
+	public static $readline_support = false;
 
-    public static $wait_msg = 'Press any key to continue...';
+	public static $wait_msg = 'Press any key to continue...';
 
-    public static $segments = [];
+	public static $segments = [];
 
 	protected static $options = [];
 
 	protected static $initialized = false;
 
-    // Used by progress bar
-    protected static $inProgress = false;
-
-    protected static $foreground_colors = array(
-        'black'			=> '0;30',
-        'dark_gray'		=> '1;30',
-        'blue'			=> '0;34',
-        'dark_blue'		=> '1;34',
-        'light_blue'	=> '1;34',
-        'green'			=> '0;32',
-        'light_green'	=> '1;32',
-        'cyan'			=> '0;36',
-        'light_cyan'	=> '1;36',
-        'red'			=> '0;31',
-        'light_red'		=> '1;31',
-        'purple'		=> '0;35',
-        'light_purple'	=> '1;35',
-        'light_yellow'	=> '0;33',
-        'yellow'		=> '1;33',
-        'light_gray'	=> '0;37',
-        'white'			=> '1;37',
-    );
-
-    protected static $background_colors = array(
-        'black'			=> '40',
-        'red'			=> '41',
-        'green'			=> '42',
-        'yellow'		=> '43',
-        'blue'			=> '44',
-        'magenta'		=> '45',
-        'cyan'			=> '46',
-        'light_gray'	=> '47',
-    );
-
-    //--------------------------------------------------------------------
-
-    /**
-     * Static constructor.	Parses all the CLI params.
-     */
-    public static function _init()
-    {
-	    if (static::$initialized === true)
-	    {
-		    return;
-	    }
-
-        if ( ! (PHP_SAPI === 'cli' || defined('STDIN')) )
-        {
-            throw new \Exception('Cli class cannot be used outside of the command line.');
-        }
-
-	    self::parseCommand();
-
-        // Readline is an extension for PHP that makes interactive with PHP much more bash-like
-        // http://www.php.net/manual/en/readline.installation.php
-        static::$readline_support = extension_loaded('readline');
-
-	    static::$initialized = true;
-    }
-
-    //--------------------------------------------------------------------
-
-    /**
-     * Grabs an individual
-     *
-     * @param $index
-     * @return null
-     */
-    public static function segment($index)
-    {
-        if (! isset(static::$segments[$index - 1]))
-        {
-            return null;
-        }
-
-        return static::$segments[$index - 1];
-    }
-
-    //--------------------------------------------------------------------
-
-    /**
-     * Returns the command string portion of the arguments. Used
-     * by the 'sprint' CLI script to grab the portion of the arguments
-     * that is used to call the CodeIgniter application.
-     *
-     * @return string
-     */
-    public static function cli_string()
-    {
-        return implode(' ', static::$segments);
-    }
-
-    //--------------------------------------------------------------------
-
-
-
-    /**
-     * Get input from the shell, using readline or the standard STDIN
-     *
-     * Named options must be in the following formats:
-     * php index.php user -v --v -name=John --name=John
-     *
-     * @param	string|int	$name	the name of the option (int if unnamed)
-     * @return	string
-     */
-    public static function input($prefix = '')
-    {
-        if (static::$readline_support)
-        {
-            return readline($prefix);
-        }
-
-        echo $prefix;
-        return fgets(STDIN);
-    }
-
-    //--------------------------------------------------------------------
-
-    /**
-     * Asks the user for input.  This can have either 1 or 2 arguments.
-     *
-     * Usage:
-     *
-     * // Waits for any key press
-     * CLI::prompt();
-     *
-     * // Takes any input
-     * $color = CLI::prompt('What is your favorite color?');
-     *
-     * // Takes any input, but offers default
-     * $color = CLI::prompt('What is your favourite color?', 'white');
-     *
-     * // Will only accept the options in the array
-     * $ready = CLI::prompt('Are you ready?', array('y','n'));
-     *
-     * @return	string	the user input
-     */
-    public static function prompt()
-    {
-        $args = func_get_args();
-
-        $options = array();
-        $output = '';
-        $default = null;
-
-        // How many we got
-        $arg_count = count($args);
-
-        // Is the last argument a boolean? True means required
-        $required = end($args) === true;
-
-        // Reduce the argument count if required was passed, we don't care about that anymore
-        $required === true and --$arg_count;
-
-        // This method can take a few crazy combinations of arguments, so lets work it out
-        switch ($arg_count)
-        {
-            case 2:
-
-                // E.g: $ready = CLI::prompt('Are you ready?', array('y','n'));
-                if (is_array($args[1]))
-                {
-                    list($output, $options)=$args;
-                }
-
-                // E.g: $color = CLI::prompt('What is your favourite color?', 'white');
-                elseif (is_string($args[1]))
-                {
-                    list($output, $default)=$args;
-                }
-
-                break;
-
-            case 1:
-
-                // No question (probably been asked already) so just show options
-                // E.g: $ready = CLI::prompt(array('y','n'));
-                if (is_array($args[0]))
-                {
-                    $options = $args[0];
-                }
-
-                // Question without options
-                // E.g: $ready = CLI::prompt('What did you do today?');
-                elseif (is_string($args[0]))
-                {
-                    $output = $args[0];
-                }
-
-                break;
-        }
-
-        // If a question has been asked with the read
-        if ($output !== '')
-        {
-            $extra_output = '';
-
-            if ($default !== null)
-            {
-                $extra_output = ' [ Default: "'.$default.'" ]';
-            }
-
-            elseif ($options !== array())
-            {
-                $extra_output = ' [ '.implode(', ', $options).' ]';
-            }
-
-            fwrite(STDOUT, $output.$extra_output.': ');
-        }
-
-        // Read the input from keyboard.
-        $input = trim(static::input()) ?: $default;
-
-        // No input provided and we require one (default will stop this being called)
-        if (empty($input) and $required === true)
-        {
-            static::write('This is required.');
-            static::new_line();
-
-            $input = forward_static_call_array(array(__CLASS__, 'prompt'), $args);
-        }
-
-        // If options are provided and the choice is not in the array, tell them to try again
-        if ( ! empty($options) and ! in_array($input, $options))
-        {
-            static::write('This is not a valid option. Please try again.');
-            static::new_line();
-
-            $input = forward_static_call_array(array(__CLASS__, 'prompt'), $args);
-        }
-
-        return $input;
-    }
-
-    //--------------------------------------------------------------------
-
-    /**
-     * Outputs a string to the cli.	 If you send an array it will implode them
-     * with a line break.
-     *
-     * @param	string|array	$text	the text to output, or array of lines
-     */
-    public static function write($text = '', $foreground = null, $background = null)
-    {
-        if (is_array($text))
-        {
-            $text = implode(PHP_EOL, $text);
-        }
-
-        if ($foreground or $background)
-        {
-            $text = static::color($text, $foreground, $background);
-        }
-
-        fwrite(STDOUT, $text.PHP_EOL);
-    }
-
-    //--------------------------------------------------------------------
-
-    /**
-     * Outputs an error to the CLI using STDERR instead of STDOUT
-     *
-     * @param	string|array	$text	the text to output, or array of errors
-     */
-    public static function error($text = '', $foreground = 'light_red', $background = null)
-    {
-        if (is_array($text))
-        {
-            $text = implode(PHP_EOL, $text);
-        }
-
-        if ($foreground OR $background)
-        {
-            $text = static::color($text, $foreground, $background);
-        }
-
-        fwrite(STDERR, $text.PHP_EOL);
-    }
-
-    //--------------------------------------------------------------------
-
-    /**
-     * Beeps a certain number of times.
-     *
-     * @param	int $num	the number of times to beep
-     */
-    public static function beep($num = 1)
-    {
-        echo str_repeat("\x07", $num);
-    }
-
-    //--------------------------------------------------------------------
-
-    /**
-     * Waits a certain number of seconds, optionally showing a wait message and
-     * waiting for a key press.
-     *
-     * @param	int		$seconds	number of seconds
-     * @param	bool	$countdown	show a countdown or not
-     */
-    public static function wait($seconds = 0, $countdown = false)
-    {
-        if ($countdown === true)
-        {
-            $time = $seconds;
-
-            while ($time > 0)
-            {
-                fwrite(STDOUT, $time.'... ');
-                sleep(1);
-                $time--;
-            }
-            static::write();
-        }
-
-        else
-        {
-            if ($seconds > 0)
-            {
-                sleep($seconds);
-            }
-            else
-            {
-                static::write(static::$wait_msg);
-                static::input();
-            }
-        }
-    }
-
-
-    //--------------------------------------------------------------------
-
-    /**
-     * if operating system === windows
-     */
-    public static function is_windows()
-    {
-        return 'win' === strtolower(substr(php_uname("s"), 0, 3));
-    }
-
-    //--------------------------------------------------------------------
-
-    /**
-     * Enter a number of empty lines
-     *
-     * @param	integer	Number of lines to output
-     * @return	void
-     */
-    public static function new_line($num = 1)
-    {
-        // Do it once or more, write with empty string gives us a new line
-        for($i = 0; $i < $num; $i++)
-        {
-            static::write();
-        }
-    }
-
-    //--------------------------------------------------------------------
-
-    /**
-     * Clears the screen of output
-     *
-     * @return	void
-     */
-    public static function clear_screen()
-    {
-        static::is_windows()
-
-            // Windows is a bit crap at this, but their terminal is tiny so shove this in
-            ? static::new_line(40)
-
-            // Anything with a flair of Unix will handle these magic characters
-            : fwrite(STDOUT, chr(27)."[H".chr(27)."[2J");
-    }
-
-    //--------------------------------------------------------------------
-
-    /**
-     * Returns the given text with the correct color codes for a foreground and
-     * optionally a background color.
-     *
-     * @param	string	$text		the text to color
-     * @param	string	$foreground the foreground color
-     * @param	string	$background the background color
-     * @param	string	$format		other formatting to apply. Currently only 'underline' is understood
-     * @return	string	the color coded string
-     */
-    public static function color($text, $foreground, $background = null, $format=null)
-    {
-        if (static::is_windows() and ! isset($_SERVER['ANSICON']))
-        {
-            return $text;
-        }
-
-        if ( ! array_key_exists($foreground, static::$foreground_colors))
-        {
-            throw new \RuntimeException('Invalid CLI foreground color: '.$foreground);
-        }
-
-        if ( $background !== null and ! array_key_exists($background, static::$background_colors))
-        {
-            throw new \RuntimeException('Invalid CLI background color: '.$background);
-        }
-
-        $string = "\033[".static::$foreground_colors[$foreground]."m";
-
-        if ($background !== null)
-        {
-            $string .= "\033[".static::$background_colors[$background]."m";
-        }
-
-        if ($format === 'underline')
-        {
-            $string .= "\033[4m";
-        }
-
-        $string .= $text."\033[0m";
-
-        return $string;
-    }
-
-    //--------------------------------------------------------------------
-
-    public static function getWidth($default=80)
-    {
-        if (static::is_windows())
-        {
-            return $default;
-        }
-
-        return (int)shell_exec('tput cols');
-    }
+	// Used by progress bar
+	protected static $inProgress = false;
+
+	protected static $foreground_colors = array(
+		'black'			=> '0;30',
+		'dark_gray'		=> '1;30',
+		'blue'			=> '0;34',
+		'dark_blue'		=> '1;34',
+		'light_blue'	=> '1;34',
+		'green'			=> '0;32',
+		'light_green'	=> '1;32',
+		'cyan'			=> '0;36',
+		'light_cyan'	=> '1;36',
+		'red'			=> '0;31',
+		'light_red'		=> '1;31',
+		'purple'		=> '0;35',
+		'light_purple'	=> '1;35',
+		'light_yellow'	=> '0;33',
+		'yellow'		=> '1;33',
+		'light_gray'	=> '0;37',
+		'white'			=> '1;37',
+	);
+
+	protected static $background_colors = array(
+		'black'			=> '40',
+		'red'			=> '41',
+		'green'			=> '42',
+		'yellow'		=> '43',
+		'blue'			=> '44',
+		'magenta'		=> '45',
+		'cyan'			=> '46',
+		'light_gray'	=> '47',
+	);
+
+	//--------------------------------------------------------------------
+
+	/**
+	 * Static constructor.	Parses all the CLI params.
+	 */
+	public static function _init()
+	{
+		if (static::$initialized === true)
+		{
+			return;
+		}
+
+		if ( ! (PHP_SAPI === 'cli' || defined('STDIN')) )
+		{
+			throw new \Exception('Cli class cannot be used outside of the command line.');
+		}
+
+		self::parseCommand();
+
+		// Readline is an extension for PHP that makes interactive with PHP much more bash-like
+		// http://www.php.net/manual/en/readline.installation.php
+		static::$readline_support = extension_loaded('readline');
+
+		static::$initialized = true;
+	}
+
+	//--------------------------------------------------------------------
+
+	/**
+	 * Grabs an individual
+	 *
+	 * @param $index
+	 * @return null
+	 */
+	public static function segment($index)
+	{
+		if (! isset(static::$segments[$index - 1]))
+		{
+			return null;
+		}
+
+		return static::$segments[$index - 1];
+	}
+
+	//--------------------------------------------------------------------
+
+	/**
+	 * Returns the command string portion of the arguments. Used
+	 * by the 'sprint' CLI script to grab the portion of the arguments
+	 * that is used to call the CodeIgniter application.
+	 *
+	 * @return string
+	 */
+	public static function cli_string()
+	{
+		return implode(' ', static::$segments);
+	}
+
+	//--------------------------------------------------------------------
+
+
+
+	/**
+	 * Get input from the shell, using readline or the standard STDIN
+	 *
+	 * Named options must be in the following formats:
+	 * php index.php user -v --v -name=John --name=John
+	 *
+	 * @param	string|int	$name	the name of the option (int if unnamed)
+	 * @return	string
+	 */
+	public static function input($prefix = '')
+	{
+		if (static::$readline_support)
+		{
+			return readline($prefix);
+		}
+
+		echo $prefix;
+		return fgets(STDIN);
+	}
+
+	//--------------------------------------------------------------------
+
+	/**
+	 * Asks the user for input.  This can have either 1 or 2 arguments.
+	 *
+	 * Usage:
+	 *
+	 * // Waits for any key press
+	 * CLI::prompt();
+	 *
+	 * // Takes any input
+	 * $color = CLI::prompt('What is your favorite color?');
+	 *
+	 * // Takes any input, but offers default
+	 * $color = CLI::prompt('What is your favourite color?', 'white');
+	 *
+	 * // Will only accept the options in the array
+	 * $ready = CLI::prompt('Are you ready?', array('y','n'));
+	 *
+	 * @return	string	the user input
+	 */
+	public static function prompt()
+	{
+		$args = func_get_args();
+
+		$options = array();
+		$output = '';
+		$default = null;
+
+		// How many we got
+		$arg_count = count($args);
+
+		// Is the last argument a boolean? True means required
+		$required = end($args) === true;
+
+		// Reduce the argument count if required was passed, we don't care about that anymore
+		$required === true and --$arg_count;
+
+		// This method can take a few crazy combinations of arguments, so lets work it out
+		switch ($arg_count)
+		{
+			case 2:
+
+				// E.g: $ready = CLI::prompt('Are you ready?', array('y','n'));
+				if (is_array($args[1]))
+				{
+					list($output, $options)=$args;
+				}
+
+				// E.g: $color = CLI::prompt('What is your favourite color?', 'white');
+				elseif (is_string($args[1]))
+				{
+					list($output, $default)=$args;
+				}
+
+				break;
+
+			case 1:
+
+				// No question (probably been asked already) so just show options
+				// E.g: $ready = CLI::prompt(array('y','n'));
+				if (is_array($args[0]))
+				{
+					$options = $args[0];
+				}
+
+				// Question without options
+				// E.g: $ready = CLI::prompt('What did you do today?');
+				elseif (is_string($args[0]))
+				{
+					$output = $args[0];
+				}
+
+				break;
+		}
+
+		// If a question has been asked with the read
+		if ($output !== '')
+		{
+			$extra_output = '';
+
+			if ($default !== null)
+			{
+				$extra_output = ' [ Default: "'.$default.'" ]';
+			}
+
+			elseif ($options !== array())
+			{
+				$extra_output = ' [ '.implode(', ', $options).' ]';
+			}
+
+			fwrite(STDOUT, $output.$extra_output.': ');
+		}
+
+		// Read the input from keyboard.
+		$input = trim(static::input()) ?: $default;
+
+		// No input provided and we require one (default will stop this being called)
+		if (empty($input) and $required === true)
+		{
+			static::write('This is required.');
+			static::new_line();
+
+			$input = forward_static_call_array(array(__CLASS__, 'prompt'), $args);
+		}
+
+		// If options are provided and the choice is not in the array, tell them to try again
+		if ( ! empty($options) and ! in_array($input, $options))
+		{
+			static::write('This is not a valid option. Please try again.');
+			static::new_line();
+
+			$input = forward_static_call_array(array(__CLASS__, 'prompt'), $args);
+		}
+
+		return $input;
+	}
+
+	//--------------------------------------------------------------------
+
+	/**
+	 * Outputs a string to the cli.	 If you send an array it will implode them
+	 * with a line break.
+	 *
+	 * @param	string|array	$text	the text to output, or array of lines
+	 */
+	public static function write($text = '', $foreground = null, $background = null)
+	{
+		if (is_array($text))
+		{
+			$text = implode(PHP_EOL, $text);
+		}
+
+		if ($foreground or $background)
+		{
+			$text = static::color($text, $foreground, $background);
+		}
+
+		fwrite(STDOUT, $text.PHP_EOL);
+	}
+
+	//--------------------------------------------------------------------
+
+	/**
+	 * Outputs an error to the CLI using STDERR instead of STDOUT
+	 *
+	 * @param	string|array	$text	the text to output, or array of errors
+	 */
+	public static function error($text = '', $foreground = 'light_red', $background = null)
+	{
+		if (is_array($text))
+		{
+			$text = implode(PHP_EOL, $text);
+		}
+
+		if ($foreground OR $background)
+		{
+			$text = static::color($text, $foreground, $background);
+		}
+
+		fwrite(STDERR, $text.PHP_EOL);
+	}
+
+	//--------------------------------------------------------------------
+
+	/**
+	 * Beeps a certain number of times.
+	 *
+	 * @param	int $num	the number of times to beep
+	 */
+	public static function beep($num = 1)
+	{
+		echo str_repeat("\x07", $num);
+	}
+
+	//--------------------------------------------------------------------
+
+	/**
+	 * Waits a certain number of seconds, optionally showing a wait message and
+	 * waiting for a key press.
+	 *
+	 * @param	int		$seconds	number of seconds
+	 * @param	bool	$countdown	show a countdown or not
+	 */
+	public static function wait($seconds = 0, $countdown = false)
+	{
+		if ($countdown === true)
+		{
+			$time = $seconds;
+
+			while ($time > 0)
+			{
+				fwrite(STDOUT, $time.'... ');
+				sleep(1);
+				$time--;
+			}
+			static::write();
+		}
+
+		else
+		{
+			if ($seconds > 0)
+			{
+				sleep($seconds);
+			}
+			else
+			{
+				static::write(static::$wait_msg);
+				static::input();
+			}
+		}
+	}
+
+
+	//--------------------------------------------------------------------
+
+	/**
+	 * if operating system === windows
+	 */
+	public static function is_windows()
+	{
+		return 'win' === strtolower(substr(php_uname("s"), 0, 3));
+	}
+
+	//--------------------------------------------------------------------
+
+	/**
+	 * Enter a number of empty lines
+	 *
+	 * @param	integer	Number of lines to output
+	 * @return	void
+	 */
+	public static function new_line($num = 1)
+	{
+		// Do it once or more, write with empty string gives us a new line
+		for($i = 0; $i < $num; $i++)
+		{
+			static::write();
+		}
+	}
+
+	//--------------------------------------------------------------------
+
+	/**
+	 * Clears the screen of output
+	 *
+	 * @return	void
+	 */
+	public static function clear_screen()
+	{
+		static::is_windows()
+
+			// Windows is a bit crap at this, but their terminal is tiny so shove this in
+			? static::new_line(40)
+
+			// Anything with a flair of Unix will handle these magic characters
+			: fwrite(STDOUT, chr(27)."[H".chr(27)."[2J");
+	}
+
+	//--------------------------------------------------------------------
+
+	/**
+	 * Returns the given text with the correct color codes for a foreground and
+	 * optionally a background color.
+	 *
+	 * @param	string	$text		the text to color
+	 * @param	string	$foreground the foreground color
+	 * @param	string	$background the background color
+	 * @param	string	$format		other formatting to apply. Currently only 'underline' is understood
+	 * @return	string	the color coded string
+	 */
+	public static function color($text, $foreground, $background = null, $format=null)
+	{
+		if (static::is_windows() and ! isset($_SERVER['ANSICON']))
+		{
+			return $text;
+		}
+
+		if ( ! array_key_exists($foreground, static::$foreground_colors))
+		{
+			throw new \RuntimeException('Invalid CLI foreground color: '.$foreground);
+		}
+
+		if ( $background !== null and ! array_key_exists($background, static::$background_colors))
+		{
+			throw new \RuntimeException('Invalid CLI background color: '.$background);
+		}
+
+		$string = "\033[".static::$foreground_colors[$foreground]."m";
+
+		if ($background !== null)
+		{
+			$string .= "\033[".static::$background_colors[$background]."m";
+		}
+
+		if ($format === 'underline')
+		{
+			$string .= "\033[4m";
+		}
+
+		$string .= $text."\033[0m";
+
+		return $string;
+	}
+
+	//--------------------------------------------------------------------
+
+	public static function getWidth($default=80)
+	{
+		if (static::is_windows())
+		{
+			return $default;
+		}
+
+		return (int)shell_exec('tput cols');
+	}
     
-    //--------------------------------------------------------------------
-
-    public static function getHeight($default=32)
-    {
-        if (static::is_windows())
-        {
-            return $default;
-        }
-
-        return (int)shell_exec('tput lines');
-    }
-
-    //--------------------------------------------------------------------
-
-    /**
-     * Displays a progress bar on the CLI. You must call it repeatedly
-     * to update it. Set $thisStep = false to erase the progress bar.
-     *
-     * @param int $thisStep
-     * @param int $totalSteps
-     */
-    public static function showProgress($thisStep=1, $totalSteps=10)
-    {
-        // The first time through, save
-        // our position so the script knows where to go
-        // back to when writing the bar, and
-        // at the end of the script.
-        if (! static::$inProgress) {
-            fwrite(STDOUT, "\0337");
-            static::$inProgress = true;
-        }
-
-        // Restore position
-        fwrite(STDERR, "\0338");
-
-        if ($thisStep !== false) {
-            // Don't allow div by zero or negative numbers....
-            $thisStep = abs($thisStep);
-            $totalSteps = $totalSteps < 1 ? 1 : $totalSteps;
-
-            $percent = intval( ($thisStep / $totalSteps) * 100 );
-            $step = (int)round($percent / 10);
-
-            // Write the progress bar
-            fwrite(STDOUT, "[\033[32m" . str_repeat('#', $step) . str_repeat('.', 10 - $step) . "\033[0m]");
-            // Textual representation...
-            fwrite(STDOUT, " {$percent}% Complete" . PHP_EOL);
-            // Move up, undo the PHP_EOL
-            fwrite(STDOUT, "\033[1A");
-        }
-        else
-        {
-            fwrite(STDERR, "\007");
-        }
-    }
-
-    //--------------------------------------------------------------------
+	//--------------------------------------------------------------------
+
+	public static function getHeight($default=32)
+	{
+		if (static::is_windows())
+		{
+			return $default;
+		}
+
+		return (int)shell_exec('tput lines');
+	}
+
+	//--------------------------------------------------------------------
+
+	/**
+	 * Displays a progress bar on the CLI. You must call it repeatedly
+	 * to update it. Set $thisStep = false to erase the progress bar.
+	 *
+	 * @param int $thisStep
+	 * @param int $totalSteps
+	 */
+	public static function showProgress($thisStep=1, $totalSteps=10)
+	{
+		// The first time through, save
+		// our position so the script knows where to go
+		// back to when writing the bar, and
+		// at the end of the script.
+		if (! static::$inProgress) {
+			fwrite(STDOUT, "\0337");
+			static::$inProgress = true;
+		}
+
+		// Restore position
+		fwrite(STDERR, "\0338");
+
+		if ($thisStep !== false) {
+			// Don't allow div by zero or negative numbers....
+			$thisStep = abs($thisStep);
+			$totalSteps = $totalSteps < 1 ? 1 : $totalSteps;
+
+			$percent = intval( ($thisStep / $totalSteps) * 100 );
+			$step = (int)round($percent / 10);
+
+			// Write the progress bar
+			fwrite(STDOUT, "[\033[32m" . str_repeat('#', $step) . str_repeat('.', 10 - $step) . "\033[0m]");
+			// Textual representation...
+			fwrite(STDOUT, " {$percent}% Complete" . PHP_EOL);
+			// Move up, undo the PHP_EOL
+			fwrite(STDOUT, "\033[1A");
+		}
+		else
+		{
+			fwrite(STDERR, "\007");
+		}
+	}
+
+	//--------------------------------------------------------------------
 
 	/**
 	 * Checks to see if an option was passed to us on the CLI and returns
@@ -541,11 +541,11 @@ 
 	 */
 	public static function option($name)
 	{
-	    if (array_key_exists($name, self::$options))
-	    {
-		    $val = self::$options[$name] === null ? true : self::$options[$name];
-		    return $val;
-	    }
+		if (array_key_exists($name, self::$options))
+		{
+			$val = self::$options[$name] === null ? true : self::$options[$name];
+			return $val;
+		}
 
 		return null;
 	}
@@ -559,7 +559,7 @@ 
 	 */
 	public static function getOptions()
 	{
-	    return self::$options;
+		return self::$options;
 	}
 
 	//--------------------------------------------------------------------
@@ -615,10 +615,10 @@ 
 			return '';
 		}
 
-        if ($max == 0)
-        {
-            $max = CLI::getWidth();
-        }
+		if ($max == 0)
+		{
+			$max = CLI::getWidth();
+		}
 
 		if (CLI::getWidth() < $max)
 		{

myth/Forge/BaseGenerator.php

Indentation +412 added lines, -412 removed lines

@@ -43,13 +43,13 @@ 
  */
 abstract class BaseGenerator extends CLIController {
 
-    /**
-     * Instance of the active themer.
-     * @var null
-     */
-    protected $themer = null;
+	/**
+	 * Instance of the active themer.
+	 * @var null
+	 */
+	protected $themer = null;
 
-    protected $gen_path = null;
+	protected $gen_path = null;
 
 	/**
 	 * The name of the module being used, if any.
@@ -62,254 +62,254 @@ 
 
 	protected $overwrite = false;
 
-    //--------------------------------------------------------------------
+	//--------------------------------------------------------------------
 
-    public function __construct()
-    {
-        parent::__construct();
+	public function __construct()
+	{
+		parent::__construct();
 
-        $this->load->config('forge');
+		$this->load->config('forge');
 
-	    // Detect if we're genning in a module
-	    if ($module = CLI::option('module'))
-	    {
-		    $this->module = $module;
+		// Detect if we're genning in a module
+		if ($module = CLI::option('module'))
+		{
+			$this->module = $module;
 
-		    $folders = config_item('modules_locations');
+			$folders = config_item('modules_locations');
 
-		    if (is_array($folders))
-		    {
-			    $this->module_path = $folders[0] . strtolower($module) .'/';
-		    }
+			if (is_array($folders))
+			{
+				$this->module_path = $folders[0] . strtolower($module) .'/';
+			}
 		}
 
-	    // Should we overwrite files?
-	    if (CLI::option('overwrite'))
-	    {
-		    $this->overwrite = true;
-	    }
-    }
+		// Should we overwrite files?
+		if (CLI::option('overwrite'))
+		{
+			$this->overwrite = true;
+		}
+	}
 
-    //--------------------------------------------------------------------
+	//--------------------------------------------------------------------
 
 
-    /**
-     * The method called by the main generator script. This must be
-     * overridden by child classes to implement the actual logic used.
-     *
-     * @param array $segments
-     * @param bool  $quiet      If true, models should accept default values.
-     * @return mixed
-     */
-    abstract function run($segments=[], $quiet=false);
+	/**
+	 * The method called by the main generator script. This must be
+	 * overridden by child classes to implement the actual logic used.
+	 *
+	 * @param array $segments
+	 * @param bool  $quiet      If true, models should accept default values.
+	 * @return mixed
+	 */
+	abstract function run($segments=[], $quiet=false);
 
-    //--------------------------------------------------------------------
+	//--------------------------------------------------------------------
 
 
-    /**
-     * Creates a file at the specified path with the given contents.
-     *
-     * @param $path
-     * @param null $contents
-     *
-     * @return bool
-     */
-    public function createFile($path, $contents=null, $overwrite=false, $perms=0644)
-    {
-	    $path = $this->sandbox($path);
+	/**
+	 * Creates a file at the specified path with the given contents.
+	 *
+	 * @param $path
+	 * @param null $contents
+	 *
+	 * @return bool
+	 */
+	public function createFile($path, $contents=null, $overwrite=false, $perms=0644)
+	{
+		$path = $this->sandbox($path);
 
-	    $file_exists = is_file($path);
+		$file_exists = is_file($path);
 
-        // Does file already exist?
-        if ($file_exists)
-        {
-	        if (! $overwrite) {
-		        CLI::write( CLI::color("\t". strtolower(lang('exists')) .": ", 'blue') . str_replace(APPPATH, '', $path ) );
-		        return true;
-	        }
+		// Does file already exist?
+		if ($file_exists)
+		{
+			if (! $overwrite) {
+				CLI::write( CLI::color("\t". strtolower(lang('exists')) .": ", 'blue') . str_replace(APPPATH, '', $path ) );
+				return true;
+			}
 
-	        unlink($path);
-        }
+			unlink($path);
+		}
 
-	    // Do we need to create the directory?
-	    $segments = explode('/', $path);
+		// Do we need to create the directory?
+		$segments = explode('/', $path);
 		array_pop($segments);
 		$folder = implode('/', $segments);
 
-	    if (! is_dir($folder))
-	    {
-		    $this->createDirectory($folder);
-	    }
+		if (! is_dir($folder))
+		{
+			$this->createDirectory($folder);
+		}
 
-        get_instance()->load->helper('file');
+		get_instance()->load->helper('file');
 
-        if (! write_file($path, $contents))
-        {
-            throw new \RuntimeException( sprintf( lang('errors.writing_file'),  $path) );
-        }
+		if (! write_file($path, $contents))
+		{
+			throw new \RuntimeException( sprintf( lang('errors.writing_file'),  $path) );
+		}
 
-        chmod($path, $perms);
+		chmod($path, $perms);
 
-	    if ($overwrite && $file_exists)
-	    {
-		    CLI::write( CLI::color("\t". strtolower( lang('overwrote') ) ." ", 'light_red') . str_replace(APPPATH, '', $path ) );
-	    }
-	    else
-	    {
-		    CLI::write( CLI::color("\t". strtolower( lang('created') ) ." ", 'yellow') . str_replace(APPPATH, '', $path ) );
-	    }
+		if ($overwrite && $file_exists)
+		{
+			CLI::write( CLI::color("\t". strtolower( lang('overwrote') ) ." ", 'light_red') . str_replace(APPPATH, '', $path ) );
+		}
+		else
+		{
+			CLI::write( CLI::color("\t". strtolower( lang('created') ) ." ", 'yellow') . str_replace(APPPATH, '', $path ) );
+		}
 
-        return $this;
-    }
+		return $this;
+	}
     
-    //--------------------------------------------------------------------
-
-    /**
-     * Creates a new directory at the specified path.
-     *
-     * @param $path
-     * @param int|string $perms
-     *
-     * @return bool
-     */
-    public function createDirectory($path, $perms=0755)
-    {
-	    $path = $this->sandbox($path);
-
-        if (is_dir($path))
-        {
-            return $this;
-        }
-
-        if (! mkdir($path, $perms, true) )
-        {
-            throw new \RuntimeException( sprintf( lang('errors.creating_dir'), $path) );
-        }
-
-        return $this;
-    }
-
-    //--------------------------------------------------------------------
-
-    /**
-     * Copies a file from the current template group to the destination.
-     *
-     * @param $source
-     * @param $destination
-     * @param bool $overwrite
-     *
-     * @return bool
-     */
-    public function copyFile($source, $destination, $overwrite=false)
-    {
-	    $source = $this->sandbox($source);
-
-	    if (! file_exists($source))
-	    {
-		    return null;
-	    }
-
-	    $content = file_get_contents($source);
-
-	    return $this->createFile($destination, $content, $overwrite);
-    }
-
-    //--------------------------------------------------------------------
-
-    /**
-     * Attempts to locate a template within the current template group,
-     * parses it with the passed in data, and writes to the new location.
-     *
-     * @param $template
-     * @param $destination
-     * @param array $data
-     * @param bool $overwrite
-     *
-     * @return $this
-     */
-    public function copyTemplate($template, $destination, $data=[], $overwrite=false)
-    {
-	    if (! is_array($data))
-	    {
-		    $data = array($data);
-	    }
-
-        $content = $this->render($template, $data);
-
-        return $this->createFile($destination, $content, $overwrite);
-    }
-
-    //--------------------------------------------------------------------
-
-
-    /**
-     * Injects a block of code into an existing file. Using options
-     * you can specify where the code should be inserted. Available options
-     * are:
-     *      prepend         - Place at beginning of file
-     *      append          - Place at end of file
-     *      before  => ''   - Insert just prior to this line of text (don't forget the line ending "\n")
-     *      after   => ''   - Insert just after this line of text (don't forget the line ending "\n")
-     *      replace => ''   - a simple string to be replaced. All locations will be replaced.
-     *      regex   => ''   - a pregex pattern to use to replace all locations.
-     *
-     * @param $path
-     * @param $content
-     * @param array $options
-     *
-     * @return $this
-     */
-    public function injectIntoFile($path, $content, $options='append')
-    {
-        $kit = new FileKit();
-
-        if (is_string($options))
-        {
-            $action = $options;
-        }
-        else if (is_array($options) && count($options))
-        {
-            $keys = array_keys($options);
-            $action = array_shift( $keys );
-            $param = $options[$action];
-        }
-
-        switch ( strtolower($action) )
-        {
-            case 'prepend':
-                $success = $kit->prepend($path, $content);
-                break;
-            case 'before':
-                $success = $kit->before($path, $param, $content);
-                break;
-            case 'after':
-                $success = $kit->after($path, $param, $content);
-                break;
-            case 'replace':
-                $success = $kit->replaceIn($path, $param, $content);
-                break;
-            case 'regex':
-                $success = $kit->replaceWithRegex($path, $param, $content);
-                break;
-            case 'append':
-            default:
-                $success = $kit->append($path, $content);
-                break;
-        }
-
-        if ($success)
-        {
-            CLI::write( CLI::color("\t". strtolower( lang('modified') ) ." ", 'cyan') . str_replace(APPPATH, '', $path ) );
-        }
-        else
-        {
-            CLI::write( CLI::color("\t". strtolower( lang('error') ) ." ", 'light_red') . str_replace(APPPATH, '', $path ) );
-        }
-
-        return $this;
-    }
+	//--------------------------------------------------------------------
+
+	/**
+	 * Creates a new directory at the specified path.
+	 *
+	 * @param $path
+	 * @param int|string $perms
+	 *
+	 * @return bool
+	 */
+	public function createDirectory($path, $perms=0755)
+	{
+		$path = $this->sandbox($path);
+
+		if (is_dir($path))
+		{
+			return $this;
+		}
+
+		if (! mkdir($path, $perms, true) )
+		{
+			throw new \RuntimeException( sprintf( lang('errors.creating_dir'), $path) );
+		}
+
+		return $this;
+	}
+
+	//--------------------------------------------------------------------
+
+	/**
+	 * Copies a file from the current template group to the destination.
+	 *
+	 * @param $source
+	 * @param $destination
+	 * @param bool $overwrite
+	 *
+	 * @return bool
+	 */
+	public function copyFile($source, $destination, $overwrite=false)
+	{
+		$source = $this->sandbox($source);
+
+		if (! file_exists($source))
+		{
+			return null;
+		}
+
+		$content = file_get_contents($source);
+
+		return $this->createFile($destination, $content, $overwrite);
+	}
+
+	//--------------------------------------------------------------------
+
+	/**
+	 * Attempts to locate a template within the current template group,
+	 * parses it with the passed in data, and writes to the new location.
+	 *
+	 * @param $template
+	 * @param $destination
+	 * @param array $data
+	 * @param bool $overwrite
+	 *
+	 * @return $this
+	 */
+	public function copyTemplate($template, $destination, $data=[], $overwrite=false)
+	{
+		if (! is_array($data))
+		{
+			$data = array($data);
+		}
+
+		$content = $this->render($template, $data);
+
+		return $this->createFile($destination, $content, $overwrite);
+	}
+
+	//--------------------------------------------------------------------
+
+
+	/**
+	 * Injects a block of code into an existing file. Using options
+	 * you can specify where the code should be inserted. Available options
+	 * are:
+	 *      prepend         - Place at beginning of file
+	 *      append          - Place at end of file
+	 *      before  => ''   - Insert just prior to this line of text (don't forget the line ending "\n")
+	 *      after   => ''   - Insert just after this line of text (don't forget the line ending "\n")
+	 *      replace => ''   - a simple string to be replaced. All locations will be replaced.
+	 *      regex   => ''   - a pregex pattern to use to replace all locations.
+	 *
+	 * @param $path
+	 * @param $content
+	 * @param array $options
+	 *
+	 * @return $this
+	 */
+	public function injectIntoFile($path, $content, $options='append')
+	{
+		$kit = new FileKit();
+
+		if (is_string($options))
+		{
+			$action = $options;
+		}
+		else if (is_array($options) && count($options))
+		{
+			$keys = array_keys($options);
+			$action = array_shift( $keys );
+			$param = $options[$action];
+		}
+
+		switch ( strtolower($action) )
+		{
+			case 'prepend':
+				$success = $kit->prepend($path, $content);
+				break;
+			case 'before':
+				$success = $kit->before($path, $param, $content);
+				break;
+			case 'after':
+				$success = $kit->after($path, $param, $content);
+				break;
+			case 'replace':
+				$success = $kit->replaceIn($path, $param, $content);
+				break;
+			case 'regex':
+				$success = $kit->replaceWithRegex($path, $param, $content);
+				break;
+			case 'append':
+			default:
+				$success = $kit->append($path, $content);
+				break;
+		}
+
+		if ($success)
+		{
+			CLI::write( CLI::color("\t". strtolower( lang('modified') ) ." ", 'cyan') . str_replace(APPPATH, '', $path ) );
+		}
+		else
+		{
+			CLI::write( CLI::color("\t". strtolower( lang('error') ) ." ", 'light_red') . str_replace(APPPATH, '', $path ) );
+		}
+
+		return $this;
+	}
     
-    //--------------------------------------------------------------------
+	//--------------------------------------------------------------------
 
 	/**
 	 * Runs another generator. The first parameter is the name of the
@@ -320,130 +320,130 @@ 
 	 * @param $command
 	 * @param null $options
 	 */
-    public function generate($command, $options = '', $quiet=false)
-    {
+	public function generate($command, $options = '', $quiet=false)
+	{
 		$orig_options = CLI::optionString();
-	    $options = $orig_options .' '. $options;
-
-	    if ($quiet === true)
-	    {
-		    $options .= ' -quiet';
-	    }
-
-	    if ($this->overwrite === true)
-	    {
-		    $options .= ' -overwrite';
-	    }
-
-	    passthru( "php sprint forge {$command} {$options}" );
-    }
-
-    //--------------------------------------------------------------------
-
-    /**
-     * Adds a new route to the application's route file.
-     *
-     * @param $left
-     * @param $right
-     *
-     * @return \Myth\Forge\BaseGenerator
-     */
-    public function route($left, $right, $options=[], $method='any')
-    {
-        $option_str = '[';
-
-        foreach ($options as $key => $value)
-        {
-            $option_str .= "";
-        }
-
-        $option_str .= ']';
-
-        $content = "\$routes->{$method}('{$left}', '{$right}', {$option_str});\n";
-
-        return $this->injectIntoFile(APPPATH .'config/routes.php', $content, ['after' => "// Auto-generated routes go here\n"]);
-    }
+		$options = $orig_options .' '. $options;
+
+		if ($quiet === true)
+		{
+			$options .= ' -quiet';
+		}
+
+		if ($this->overwrite === true)
+		{
+			$options .= ' -overwrite';
+		}
+
+		passthru( "php sprint forge {$command} {$options}" );
+	}
+
+	//--------------------------------------------------------------------
+
+	/**
+	 * Adds a new route to the application's route file.
+	 *
+	 * @param $left
+	 * @param $right
+	 *
+	 * @return \Myth\Forge\BaseGenerator
+	 */
+	public function route($left, $right, $options=[], $method='any')
+	{
+		$option_str = '[';
+
+		foreach ($options as $key => $value)
+		{
+			$option_str .= "";
+		}
+
+		$option_str .= ']';
+
+		$content = "\$routes->{$method}('{$left}', '{$right}', {$option_str});\n";
+
+		return $this->injectIntoFile(APPPATH .'config/routes.php', $content, ['after' => "// Auto-generated routes go here\n"]);
+	}
     
-    //--------------------------------------------------------------------
+	//--------------------------------------------------------------------
 
-    /**
-     * Outputs the contents of the file in the template's source path.
-     */
-    public function readme($file='readme.txt')
-    {
-	    $name = str_replace('Generator', '', get_class($this));
+	/**
+	 * Outputs the contents of the file in the template's source path.
+	 */
+	public function readme($file='readme.txt')
+	{
+		$name = str_replace('Generator', '', get_class($this));
 
-	    $path = $this->locateGenerator($name);
+		$path = $this->locateGenerator($name);
 
-        if (! file_exists($path . $file))
-        {
-            CLI::error(sprintf( lang('forge.cant_find_readme'), $file) );
-        }
+		if (! file_exists($path . $file))
+		{
+			CLI::error(sprintf( lang('forge.cant_find_readme'), $file) );
+		}
 
-	    $contents = file_get_contents($path . $file);
+		$contents = file_get_contents($path . $file);
 
-        CLI::new_line(2);
-        CLI::write( CLI::wrap($contents), 'green' );
-        CLI::new_line();
-    }
+		CLI::new_line(2);
+		CLI::write( CLI::wrap($contents), 'green' );
+		CLI::new_line();
+	}
 
-    //--------------------------------------------------------------------
+	//--------------------------------------------------------------------
 
-    /**
-     * Renders a single generator template. The file must be in a folder
-     * under the template group named the same as $this->generator_name.
-     * The file must have a '.tpl.php' file extension.
-     *
-     * @param $template_name
-     * @param array $data
-     *
-     * @return string The rendered template
-     */
-    public function render($template_name, $data=[], $folder=null)
-    {
-        if (empty($this->themer))
-        {
-            $this->setupThemer();
-        }
+	/**
+	 * Renders a single generator template. The file must be in a folder
+	 * under the template group named the same as $this->generator_name.
+	 * The file must have a '.tpl.php' file extension.
+	 *
+	 * @param $template_name
+	 * @param array $data
+	 *
+	 * @return string The rendered template
+	 */
+	public function render($template_name, $data=[], $folder=null)
+	{
+		if (empty($this->themer))
+		{
+			$this->setupThemer();
+		}
 
-	    $data['uikit'] = $this->loadUIKit();
+		$data['uikit'] = $this->loadUIKit();
 
-        $output = null;
+		$output = null;
 
-	    $view = $template_name .'.tpl';
+		$view = $template_name .'.tpl';
 
-        $groups = config_item('forge.collections');
+		$groups = config_item('forge.collections');
 
-	    $name = str_replace('Generator', '', get_class($this) );
+		$name = str_replace('Generator', '', get_class($this) );
 
-        foreach ($groups as $group => $path)
-        {
-	        $path = rtrim($path, '/ ') .'/';
-	        $folders = scandir($path);
+		foreach ($groups as $group => $path)
+		{
+			$path = rtrim($path, '/ ') .'/';
+			$folders = scandir($path);
 
-	        if (! $i = array_search(ucfirst($name), $folders))
-	        {
-		        continue;
-	        }
+			if (! $i = array_search(ucfirst($name), $folders))
+			{
+				continue;
+			}
 
-	        $view = $folders[$i] . '/'. $view;
+			$view = $folders[$i] . '/'. $view;
 
-            if (realpath($path . $view .'.php'))
-            {
-                $output = $this->themer->display($group .':'. $view, $data);
-                break;
-            }
-        }
+			if (realpath($path . $view .'.php'))
+			{
+				$output = $this->themer->display($group .':'. $view, $data);
+				break;
+			}
+		}
 
-	    // To allow for including any PHP code in the templates,
-	    // replace any '@php' and '@=' tags with their correct PHP syntax.
-	    $output = str_replace('@php', '<?php', $output);
-	    $output = str_replace('@=', '<?=', $output);
+		// To allow for including any PHP code in the templates,
+		// replace any '@php' and '@=' tags with their correct PHP syntax.
+		$output = str_replace('@php', '<?php', $output);
+		$output = str_replace('@=', '<?=', $output);
 
-        return $output;
-    }
+		return $output;
+	}
 
-    //--------------------------------------------------------------------
+	//--------------------------------------------------------------------
 
 	/**
 	 * Forces a path to exist within the current application's folder.
@@ -458,7 +458,7 @@ 
 	 */
 	public function sandbox($path)
 	{
-        $path = $this->normalizePath($path);
+		$path = $this->normalizePath($path);
 
 		// If it's writing to BASEPATH - FIX IT
 		if (strpos($path, $this->normalizePath(BASEPATH) ) === 0)
@@ -478,37 +478,37 @@ 
 			return $path;
 		}
 
-	    return APPPATH . $path;
+		return APPPATH . $path;
 	}
 
 	//--------------------------------------------------------------------
 
 
 
-    //--------------------------------------------------------------------
-    // Private Methods
-    //--------------------------------------------------------------------
+	//--------------------------------------------------------------------
+	// Private Methods
+	//--------------------------------------------------------------------
 
-    protected function setupThemer()
-    {
-        $themer_name = config_item('forge.themer');
+	protected function setupThemer()
+	{
+		$themer_name = config_item('forge.themer');
 
-        if (! $themer_name)
-        {
-            throw new \RuntimeException( lang('forge.no_themer') );
-        }
+		if (! $themer_name)
+		{
+			throw new \RuntimeException( lang('forge.no_themer') );
+		}
 
-        $this->themer = new $themer_name( get_instance() );
+		$this->themer = new $themer_name( get_instance() );
 
-        // Register our paths with the themer
-        $paths = config_item('forge.collections');
+		// Register our paths with the themer
+		$paths = config_item('forge.collections');
 
-        foreach ($paths as $key => $path) {
-            $this->themer->addThemePath($key, $path);
-        }
-    }
+		foreach ($paths as $key => $path) {
+			$this->themer->addThemePath($key, $path);
+		}
+	}
 
-    //--------------------------------------------------------------------
+	//--------------------------------------------------------------------
 
 	public function loadUIKit()
 	{
@@ -521,7 +521,7 @@ 
 
 		$uikit = new $kit_name();
 
-	    return $uikit;
+		return $uikit;
 	}
 
 	//--------------------------------------------------------------------
@@ -639,66 +639,66 @@ 
 
 	//--------------------------------------------------------------------
 
-    /**
-     * Normalizes a path and cleans it up for healthy use within
-     * realpath() and helps to mitigate changes between Windows and *nix
-     * operating systems.
-     *
-     * Found at http://php.net/manual/en/function.realpath.php#112367
-     *
-     * @param $path
-     *
-     * @return string
-     */
-    protected function normalizePath($path)
-    {
-        // Array to build a new path from the good parts
-        $parts = array();
-
-        // Replace backslashes with forward slashes
-        $path = str_replace('\\', '/', $path);
-
-        // Combine multiple slashes into a single slash
-        $path = preg_replace('/\/+/', '/', $path);
-
-        // Collect path segments
-        $segments = explode('/', $path);
-
-        // Initialize testing variable
-        $test = '';
-
-        foreach($segments as $segment)
-        {
-            if($segment != '.')
-            {
-                $test = array_pop($parts);
-
-                if(is_null($test))
-                {
-                    $parts[] = $segment;
-                }
-                else if ($segment == '..')
-                {
-                    if ($test == '..')
-                    {
-                        $parts[] = $test;
-                    }
-
-                    if ($test == '..' || $test == '')
-                    {
-                        $parts[] = $segment;
-                    }
-                }
-                else
-                {
-                    $parts[] = $test;
-                    $parts[] = $segment;
-                }
-            }
-        }
-        return implode('/', $parts);
-    }
-
-    //--------------------------------------------------------------------
+	/**
+	 * Normalizes a path and cleans it up for healthy use within
+	 * realpath() and helps to mitigate changes between Windows and *nix
+	 * operating systems.
+	 *
+	 * Found at http://php.net/manual/en/function.realpath.php#112367
+	 *
+	 * @param $path
+	 *
+	 * @return string
+	 */
+	protected function normalizePath($path)
+	{
+		// Array to build a new path from the good parts
+		$parts = array();
+
+		// Replace backslashes with forward slashes
+		$path = str_replace('\\', '/', $path);
+
+		// Combine multiple slashes into a single slash
+		$path = preg_replace('/\/+/', '/', $path);
+
+		// Collect path segments
+		$segments = explode('/', $path);
+
+		// Initialize testing variable
+		$test = '';
+
+		foreach($segments as $segment)
+		{
+			if($segment != '.')
+			{
+				$test = array_pop($parts);
+
+				if(is_null($test))
+				{
+					$parts[] = $segment;
+				}
+				else if ($segment == '..')
+				{
+					if ($test == '..')
+					{
+						$parts[] = $test;
+					}
+
+					if ($test == '..' || $test == '')
+					{
+						$parts[] = $segment;
+					}
+				}
+				else
+				{
+					$parts[] = $test;
+					$parts[] = $segment;
+				}
+			}
+		}
+		return implode('/', $parts);
+	}
+
+	//--------------------------------------------------------------------
 
 }

myth/_generators/Migration/MigrationGenerator.php

Indentation +5 added lines, -5 removed lines

@@ -163,7 +163,7 @@ 
 	 */
 	public function detectAction($name)
 	{
-	    $segments = explode('_', $name);
+		$segments = explode('_', $name);
 
 		$action = trim(strtolower(array_shift($segments)));
 
@@ -236,10 +236,10 @@ 
 	 */
 	public function parseFields($str)
 	{
-        if (empty($str))
-        {
-	        return;
-        }
+		if (empty($str))
+		{
+			return;
+		}
 
 		$fields = [];
 		$segments = explode(' ', $str);

myth/Auth/AuthTrait.php

Indentation +3 added lines, -3 removed lines

@@ -58,7 +58,7 @@ 
 	 */
 	public function restrict($uri=null, $return_only=false)
 	{
-	    $this->setupAuthClasses();
+		$this->setupAuthClasses();
 
 		if ($this->authenticate->isLoggedIn())
 		{
@@ -108,7 +108,7 @@ 
 	 */
 	public function restrictToGroups($groups, $uri='')
 	{
-	    $this->setupAuthClasses();
+		$this->setupAuthClasses();
 
 		if ($this->authenticate->isLoggedIn())
 		{
@@ -149,7 +149,7 @@ 
 	 */
 	public function restrictWithPermissions($permissions, $uri='')
 	{
-	    $this->setupAuthClasses();
+		$this->setupAuthClasses();
 
 		if ($this->authenticate->isLoggedIn())
 		{

myth/UIKits/Bootstrap.php

Indentation +515 added lines, -515 removed lines

@@ -37,168 +37,168 @@ 
  */
 class Bootstrap extends BaseUIKit {
 
-    protected $name = 'Bootstrap3UIKit';
-
-    //--------------------------------------------------------------------
-    // Grid
-    //--------------------------------------------------------------------
-
-    /**
-     * Creates a row wrapper of HTML. We would have simple returned the
-     * the class for it, but some frameworks use a completely different
-     * approach to rows and columns than the reference Bootstrap and Foundation.
-     *
-     * @param array $options
-     * @return mixed
-     */
-    public function row($options=[], \Closure $c)
-    {
-        list($classes, $id, $attributes) = $this->parseStandardOptions($options, 'row', true);
-
-        $output = "<div {$classes} {$id} {$attributes}>\n";
-
-        $output .= $this->runClosure($c);
-
-        $output .= "</div>\n";
-
-        return $output;
-    }
-
-    //--------------------------------------------------------------------
-
-    /**
-     * Creates the CSS for a column in a grid.
-     *
-     * The attribute array is made up of key/value pairs with the
-     * key being the size, and the value being the number of columns/offset
-     * in a 12-column grid.
-     *
-     * Note that we currently DO NOT support offset columns.
-     *
-     * Valid sizes - 's', 'm', 'l', 'xl', 's-offset', 'm-offset', 'l-offset', 'xl-offset'
-     *
-     * Please note that that sizes are different than in Bootstrap. For example, for a 'xs'
-     * column size in Bootstrap, you would use 's' here. 'sm' = 'm', etc.
-     *
-     * @param array $attributes
-     * @return mixed
-     */
-    public function column($options=[], \Closure $c)
-    {
-        // Build our classes
-        $classes = '';
-
-        foreach ($options['sizes'] as $size => $value)
-        {
-            switch ($size)
-            {
-                case 's':
-                    $classes .= ' col-xs-'. $value;
-                    break;
-                case 'm':
-                    $classes .= ' col-sm-'. $value;
-                    break;
-                case 'l':
-                    $classes .= ' col-md-'. $value;
-                    break;
-                case 'xl':
-                    $classes .= ' col-lg-'. $value;
-                    break;
-                case 's-offset':
-                    $classes .= ' col-xs-offset-'. $value;
-                    break;
-                case 'm-offset':
-                    $classes .= ' col-sm-offset-'. $value;
-                    break;
-                case 'l-offset':
-                    $classes .= ' col-md-offset-'. $value;
-                    break;
-                case 'xl-offset':
-                    $classes .= ' col-lg-offset-'. $value;
-                    break;
-            }
-        }
-
-        list($classes, $id, $attributes) = $this->parseStandardOptions($options, $classes, true);
-
-        $output = "<div {$classes} {$id} {$attributes}>\n";
-
-        $output .= $this->runClosure($c);
-
-        $output .= "</div>\n";
-
-        return $output;
-    }
-
-    //--------------------------------------------------------------------
-
-    //--------------------------------------------------------------------
-    // Navigation
-    //--------------------------------------------------------------------
-
-    /**
-     * Generates the container code for a navbar, typically used along the
-     * top of a page.
-     *
-     * @param array    $options
-     * @param callable $c
-     * @return string
-     */
-    public function navbar($options=[], \Closure $c)
-    {
-        $output = '';
-
-        /*
+	protected $name = 'Bootstrap3UIKit';
+
+	//--------------------------------------------------------------------
+	// Grid
+	//--------------------------------------------------------------------
+
+	/**
+	 * Creates a row wrapper of HTML. We would have simple returned the
+	 * the class for it, but some frameworks use a completely different
+	 * approach to rows and columns than the reference Bootstrap and Foundation.
+	 *
+	 * @param array $options
+	 * @return mixed
+	 */
+	public function row($options=[], \Closure $c)
+	{
+		list($classes, $id, $attributes) = $this->parseStandardOptions($options, 'row', true);
+
+		$output = "<div {$classes} {$id} {$attributes}>\n";
+
+		$output .= $this->runClosure($c);
+
+		$output .= "</div>\n";
+
+		return $output;
+	}
+
+	//--------------------------------------------------------------------
+
+	/**
+	 * Creates the CSS for a column in a grid.
+	 *
+	 * The attribute array is made up of key/value pairs with the
+	 * key being the size, and the value being the number of columns/offset
+	 * in a 12-column grid.
+	 *
+	 * Note that we currently DO NOT support offset columns.
+	 *
+	 * Valid sizes - 's', 'm', 'l', 'xl', 's-offset', 'm-offset', 'l-offset', 'xl-offset'
+	 *
+	 * Please note that that sizes are different than in Bootstrap. For example, for a 'xs'
+	 * column size in Bootstrap, you would use 's' here. 'sm' = 'm', etc.
+	 *
+	 * @param array $attributes
+	 * @return mixed
+	 */
+	public function column($options=[], \Closure $c)
+	{
+		// Build our classes
+		$classes = '';
+
+		foreach ($options['sizes'] as $size => $value)
+		{
+			switch ($size)
+			{
+				case 's':
+					$classes .= ' col-xs-'. $value;
+					break;
+				case 'm':
+					$classes .= ' col-sm-'. $value;
+					break;
+				case 'l':
+					$classes .= ' col-md-'. $value;
+					break;
+				case 'xl':
+					$classes .= ' col-lg-'. $value;
+					break;
+				case 's-offset':
+					$classes .= ' col-xs-offset-'. $value;
+					break;
+				case 'm-offset':
+					$classes .= ' col-sm-offset-'. $value;
+					break;
+				case 'l-offset':
+					$classes .= ' col-md-offset-'. $value;
+					break;
+				case 'xl-offset':
+					$classes .= ' col-lg-offset-'. $value;
+					break;
+			}
+		}
+
+		list($classes, $id, $attributes) = $this->parseStandardOptions($options, $classes, true);
+
+		$output = "<div {$classes} {$id} {$attributes}>\n";
+
+		$output .= $this->runClosure($c);
+
+		$output .= "</div>\n";
+
+		return $output;
+	}
+
+	//--------------------------------------------------------------------
+
+	//--------------------------------------------------------------------
+	// Navigation
+	//--------------------------------------------------------------------
+
+	/**
+	 * Generates the container code for a navbar, typically used along the
+	 * top of a page.
+	 *
+	 * @param array    $options
+	 * @param callable $c
+	 * @return string
+	 */
+	public function navbar($options=[], \Closure $c)
+	{
+		$output = '';
+
+		/*
          * Open the navbar
          */
-        $classes = "navbar navbar-default ";
-
-        foreach ($options as $option)
-        {
-            switch ($option)
-            {
-                case 'sticky-top':
-                    $classes .= " navbar-static-top";
-                    break;
-                case 'fixed':
-                    $classes .= " navbar-fixed-top";
-                    break;
-                case 'inverse':
-                    $classes .= " navbar-inverse";
-            }
-        }
-
-        list($class, $id, $attributes) = $this->parseStandardOptions($options, $classes, true);
-
-        $output .= "<nav {$class} {$id} {$attributes} role='navigation'>
+		$classes = "navbar navbar-default ";
+
+		foreach ($options as $option)
+		{
+			switch ($option)
+			{
+				case 'sticky-top':
+					$classes .= " navbar-static-top";
+					break;
+				case 'fixed':
+					$classes .= " navbar-fixed-top";
+					break;
+				case 'inverse':
+					$classes .= " navbar-inverse";
+			}
+		}
+
+		list($class, $id, $attributes) = $this->parseStandardOptions($options, $classes, true);
+
+		$output .= "<nav {$class} {$id} {$attributes} role='navigation'>
   <div class='container-fluid'>\n";
 
-        /*
+		/*
          * Do any user content inside the bar
          */
-        $output .= $this->runClosure($c);
+		$output .= $this->runClosure($c);
 
-        /*
+		/*
          * Close out the navbar
          */
-        $output .= "</div></nav>\n";
-
-        return $output;
-    }
-
-    //--------------------------------------------------------------------
-
-    /**
-     * Builds the HTML for the Title portion of the navbar. This typically
-     * includes the code for the hamburger menu on small resolutions.
-     *
-     * @param        $title
-     * @param string $url
-     * @return string
-     */
-    public function navbarTitle($title, $url='#')
-    {
-        return '<div class="navbar-header">
+		$output .= "</div></nav>\n";
+
+		return $output;
+	}
+
+	//--------------------------------------------------------------------
+
+	/**
+	 * Builds the HTML for the Title portion of the navbar. This typically
+	 * includes the code for the hamburger menu on small resolutions.
+	 *
+	 * @param        $title
+	 * @param string $url
+	 * @return string
+	 */
+	public function navbarTitle($title, $url='#')
+	{
+		return '<div class="navbar-header">
       <button type="button" class="navbar-toggle" data-toggle="collapse" data-target="#navbar-collapse-1">
         <span class="sr-only">Toggle navigation</span>
         <span class="icon-bar"></span>
@@ -207,396 +207,396 @@ 
       </button>
       <a class="navbar-brand" href="'. $url .'">'. $title .'</a>
     </div>';
-    }
-
-    //--------------------------------------------------------------------
-
-    /**
-     * Creates a UL meant to pull to the right within the navbar.
-     *
-     * Available options:
-     *      'class'     - An additional class to add
-     *
-     * @param array    $options
-     * @param callable $c
-     * @return string
-     */
-    public function navbarRight($options=[], \Closure $c)
-    {
-        list($classes, $id, $attributes) = $this->parseStandardOptions($options, 'nav navbar-nav navbar-right', true);
+	}
+
+	//--------------------------------------------------------------------
+
+	/**
+	 * Creates a UL meant to pull to the right within the navbar.
+	 *
+	 * Available options:
+	 *      'class'     - An additional class to add
+	 *
+	 * @param array    $options
+	 * @param callable $c
+	 * @return string
+	 */
+	public function navbarRight($options=[], \Closure $c)
+	{
+		list($classes, $id, $attributes) = $this->parseStandardOptions($options, 'nav navbar-nav navbar-right', true);
         
-        $output = "<ul {$classes} {$id} {$attributes}>\n";
+		$output = "<ul {$classes} {$id} {$attributes}>\n";
 
-        $output .= $this->runClosure($c);
+		$output .= $this->runClosure($c);
 
-        $output .= "</ul>\n";
+		$output .= "</ul>\n";
 
-        return $output;
-    }
+		return $output;
+	}
     
-    //--------------------------------------------------------------------
+	//--------------------------------------------------------------------
 
-    public function nav()
-    {
+	public function nav()
+	{
 
-    }
+	}
 
-    //--------------------------------------------------------------------
+	//--------------------------------------------------------------------
 
 
-    /**
-     * Creates a single list item for use within a nav section.
-     *
-     * @param       $title
-     * @param       $url
-     * @param array $options
-     * @return string
-     */
-    public function navItem($title, $url='#', $options=[], $isActive=false)
-    {
-        $this->states['activeNavTitle'] = $title;
+	/**
+	 * Creates a single list item for use within a nav section.
+	 *
+	 * @param       $title
+	 * @param       $url
+	 * @param array $options
+	 * @return string
+	 */
+	public function navItem($title, $url='#', $options=[], $isActive=false)
+	{
+		$this->states['activeNavTitle'] = $title;
 
-        $class = $isActive ? $this->active_class : '';
+		$class = $isActive ? $this->active_class : '';
 
-        list($classes, $id, $attributes) = $this->parseStandardOptions($options, $class, true);
+		list($classes, $id, $attributes) = $this->parseStandardOptions($options, $class, true);
 
-        return "    <li {$classes} {$id} {$attributes}><a href='{$url}'>{$title}</a></li>\n";
-    }
+		return "    <li {$classes} {$id} {$attributes}><a href='{$url}'>{$title}</a></li>\n";
+	}
     
-    //--------------------------------------------------------------------
-
-    /**
-     * Builds the shell of a Dropdown button for use within a nav area.
-     *
-     * @param          $title
-     * @param array    $options
-     * @param callable $c
-     */
-    public function navDropdown($title,$options=[], \Closure $c)
-    {
-        list($classes, $id, $attributes) = $this->parseStandardOptions($options, 'dropdown', true);
-
-        $output = "\t<li {$classes} {$id} {$attributes}>
+	//--------------------------------------------------------------------
+
+	/**
+	 * Builds the shell of a Dropdown button for use within a nav area.
+	 *
+	 * @param          $title
+	 * @param array    $options
+	 * @param callable $c
+	 */
+	public function navDropdown($title,$options=[], \Closure $c)
+	{
+		list($classes, $id, $attributes) = $this->parseStandardOptions($options, 'dropdown', true);
+
+		$output = "\t<li {$classes} {$id} {$attributes}>
         <a href='#' class='dropdown-toggle' data-toggle='dropdown'>{$title} <span class='caret'></span></a>
         <ul class='dropdown-menu' role='menu'>\n";
 
-        $output .= $this->runClosure($c);
+		$output .= $this->runClosure($c);
+
+		$output .= "    </ul></li>\n";
 
-        $output .= "    </ul></li>\n";
+		return $output;
+	}
 
-        return $output;
-    }
+	//--------------------------------------------------------------------
 
-    //--------------------------------------------------------------------
+	/**
+	 * Creates a divider for use within a nav list.
+	 *
+	 * @return string
+	 */
+	public function navDivider()
+	{
+		return "<li class=\"divider\"></li>\n";
+	}
+
+	//--------------------------------------------------------------------
+
+	public function sideNav($options=[], \Closure $c)
+	{
+		list($classes, $id, $attributes) = $this->parseStandardOptions($options, 'nav nav-pills nav-stacked', true);
 
-    /**
-     * Creates a divider for use within a nav list.
-     *
-     * @return string
-     */
-    public function navDivider()
-    {
-        return "<li class=\"divider\"></li>\n";
-    }
+		$output = "<ul {$classes} {$id} {$attributes}>\n";
 
-    //--------------------------------------------------------------------
+		$output .= $this->runClosure($c);
+
+		$output .= "</ul>\n";
+
+		return $output;
+	}
+
+	//--------------------------------------------------------------------
+
+	/**
+	 * Creates a list of nav items to function as breadcrumbs for a site.
+	 *
+	 * @param array    $options
+	 * @param callable $c
+	 * @return mixed
+	 */
+	public function breadcrumb($options=[], \Closure $c)
+	{
+		list($classes, $id, $attributes) = $this->parseStandardOptions($options, 'breadcrumb', true);
 
-    public function sideNav($options=[], \Closure $c)
-    {
-        list($classes, $id, $attributes) = $this->parseStandardOptions($options, 'nav nav-pills nav-stacked', true);
+		$output = "<ol {$classes} {$id} {$attributes}>\n";
 
-        $output = "<ul {$classes} {$id} {$attributes}>\n";
-
-        $output .= $this->runClosure($c);
-
-        $output .= "</ul>\n";
-
-        return $output;
-    }
-
-    //--------------------------------------------------------------------
-
-    /**
-     * Creates a list of nav items to function as breadcrumbs for a site.
-     *
-     * @param array    $options
-     * @param callable $c
-     * @return mixed
-     */
-    public function breadcrumb($options=[], \Closure $c)
-    {
-        list($classes, $id, $attributes) = $this->parseStandardOptions($options, 'breadcrumb', true);
-
-        $output = "<ol {$classes} {$id} {$attributes}>\n";
-
-        $output .= $this->runClosure($c);
-
-        $output .= "</ol>\n";
-
-        return $output;
-    }
-
-    //--------------------------------------------------------------------
-
-
-    //--------------------------------------------------------------------
-
-    //--------------------------------------------------------------------
-    // Tables
-    //--------------------------------------------------------------------
-
-    public function table()
-    {
-        return 'table';
-    }
-
-    //--------------------------------------------------------------------
-
-    //--------------------------------------------------------------------
-    // Buttons
-    //--------------------------------------------------------------------
-
-    /**
-     * Creates a simple button.
-     *
-     * $style can be 'default', 'primary', 'success', 'info', 'warning', 'danger'
-     * $size can be 'default', 'small', 'xsmall', 'large'
-     *
-     * @param       $title
-     * @param string $style
-     * @param array $options
-     * @return mixed
-     */
-    public function button($title, $style='default', $size='default', $options=[])
-    {
-        $tag= "<button type='button' {classes} {id} {attributes}>{$title}</button>";
-
-        return $this->renderButtonElement($title, $style, $size, $options, $tag);
-    }
-
-    //--------------------------------------------------------------------
-
-    /**
-     * Creates a simple link styled as a button.
-     *
-     * $style can be 'default', 'primary', 'success', 'info', 'warning', 'danger'
-     * $size can be 'default', 'small', 'xsmall', 'large'
-     *
-     * @param       $title
-     * @param string $url
-     * @param string $style
-     * @param array $options
-     * @return mixed
-     */
-    public function buttonLink($title, $url='#', $style='default', $size='default', $options=[])
-    {
-        $tag = "<a href='{$url}' {classes} {id} {attributes} role='button'>{$title}</a>";
-
-        return $this->renderButtonElement($title, $style, $size, $options, $tag);
-    }
-
-    //--------------------------------------------------------------------
-
-    /**
-     * Helper method to render out our buttons in a DRY manner.
-     *
-     * @param $title
-     * @param $style
-     * @param $size
-     * @param $tag
-     */
-    protected function renderButtonElement($title, $style, $size, $options, $tag)
-    {
-        $valid_styles = ['default', 'primary', 'success', 'info', 'warning', 'danger'];
-        $valid_sizes  = ['default', 'small', 'xsmall', 'large'];
-
-        if (! in_array($style, $valid_styles))
-        {
-            $style = 'default';
-            $options['attributes'][] = 'data-error="Invalid Style passed to button method."';
-        }
-
-        $classes = 'btn ';
-
-        // Sizes
-        switch($size)
-        {
-            case 'small':
-                $classes .= 'btn-sm ';
-                break;
-            case 'xsmall':
-                $classes .= 'btn-xs ';
-                break;
-            case 'large':
-                $classes .= 'btn-lg ';
-                break;
-            default:
-                break;
-        }
-
-        // Styles
-        switch ($style)
-        {
-            case 'primary':
-                $classes .= 'btn-primary ';
-                break;
-            case 'success':
-                $classes .= 'btn-success ';
-                break;
-            case 'info':
-                $classes .= 'btn-info ';
-                break;
-            case 'warning':
-                $classes .= 'btn-warning ';
-                break;
-            case 'danger':
-                $classes .= 'btn-danger ';
-                break;
-            case 'default':
-                $classes .= 'btn-default ';
-                break;
-        }
-
-        list($classes, $id, $attributes) = $this->parseStandardOptions($options, $classes, true);
-
-        $tag = str_replace('{classes}', $classes, $tag);
-        $tag = str_replace('{id}', $id, $tag);
-        $tag = str_replace('{attributes}', $attributes, $tag);
-        $tag = str_replace('{title}', $title, $tag);
-
-        return $tag;
-    }
-
-    //--------------------------------------------------------------------
-
-    /**
-     * Creates button groups wrapping HTML.
-     *
-     * @param          $options
-     * @param callable $c
-     * @return mixed
-     */
-    public function buttonGroup($options, \Closure $c)
-    {
-        list($classes, $id, $attributes) = $this->parseStandardOptions($options, 'btn-group', true);
-
-        $output = "<div {$classes} {$id} {$attributes}>\n";
-
-        $output .= $this->runClosure($c);
-
-        $output .= "</div>\n";
-
-        return $output;
-    }
-
-    //--------------------------------------------------------------------
-
-    /**
-     * Creates the button bar wrapping HTML.
-     *
-     * @param          $options
-     * @param callable $c
-     * @return mixed
-     */
-    public function buttonBar($options, \Closure $c)
-    {
-        $options['attributes'][] = 'role="toolbar"';
-
-        list($classes, $id, $attributes) = $this->parseStandardOptions($options, 'btn-toolbar', true);
-
-        $output = "<div {$classes} {$id} {$attributes}>\n";
-
-        $output .= $this->runClosure($c);
-
-        $output .= "</div>\n";
-
-        return $output;
-    }
-
-    //--------------------------------------------------------------------
-
-    /**
-     * Creates a button that also has a dropdown menu. Also called Split Buttons
-     * by some frameworks.
-     *
-     * @param        $title
-     * @param string $style
-     * @param string $size
-     * @param array  $options
-     * @param callable $c
-     * @return mixed
-     */
-    public function buttonDropdown($title, $style='default', $size='default', $options=[], \Closure $c)
-    {
-        $tag = "<button type='button' {classes} data-toggle='dropdown'>
+		$output .= $this->runClosure($c);
+
+		$output .= "</ol>\n";
+
+		return $output;
+	}
+
+	//--------------------------------------------------------------------
+
+
+	//--------------------------------------------------------------------
+
+	//--------------------------------------------------------------------
+	// Tables
+	//--------------------------------------------------------------------
+
+	public function table()
+	{
+		return 'table';
+	}
+
+	//--------------------------------------------------------------------
+
+	//--------------------------------------------------------------------
+	// Buttons
+	//--------------------------------------------------------------------
+
+	/**
+	 * Creates a simple button.
+	 *
+	 * $style can be 'default', 'primary', 'success', 'info', 'warning', 'danger'
+	 * $size can be 'default', 'small', 'xsmall', 'large'
+	 *
+	 * @param       $title
+	 * @param string $style
+	 * @param array $options
+	 * @return mixed
+	 */
+	public function button($title, $style='default', $size='default', $options=[])
+	{
+		$tag= "<button type='button' {classes} {id} {attributes}>{$title}</button>";
+
+		return $this->renderButtonElement($title, $style, $size, $options, $tag);
+	}
+
+	//--------------------------------------------------------------------
+
+	/**
+	 * Creates a simple link styled as a button.
+	 *
+	 * $style can be 'default', 'primary', 'success', 'info', 'warning', 'danger'
+	 * $size can be 'default', 'small', 'xsmall', 'large'
+	 *
+	 * @param       $title
+	 * @param string $url
+	 * @param string $style
+	 * @param array $options
+	 * @return mixed
+	 */
+	public function buttonLink($title, $url='#', $style='default', $size='default', $options=[])
+	{
+		$tag = "<a href='{$url}' {classes} {id} {attributes} role='button'>{$title}</a>";
+
+		return $this->renderButtonElement($title, $style, $size, $options, $tag);
+	}
+
+	//--------------------------------------------------------------------
+
+	/**
+	 * Helper method to render out our buttons in a DRY manner.
+	 *
+	 * @param $title
+	 * @param $style
+	 * @param $size
+	 * @param $tag
+	 */
+	protected function renderButtonElement($title, $style, $size, $options, $tag)
+	{
+		$valid_styles = ['default', 'primary', 'success', 'info', 'warning', 'danger'];
+		$valid_sizes  = ['default', 'small', 'xsmall', 'large'];
+
+		if (! in_array($style, $valid_styles))
+		{
+			$style = 'default';
+			$options['attributes'][] = 'data-error="Invalid Style passed to button method."';
+		}
+
+		$classes = 'btn ';
+
+		// Sizes
+		switch($size)
+		{
+			case 'small':
+				$classes .= 'btn-sm ';
+				break;
+			case 'xsmall':
+				$classes .= 'btn-xs ';
+				break;
+			case 'large':
+				$classes .= 'btn-lg ';
+				break;
+			default:
+				break;
+		}
+
+		// Styles
+		switch ($style)
+		{
+			case 'primary':
+				$classes .= 'btn-primary ';
+				break;
+			case 'success':
+				$classes .= 'btn-success ';
+				break;
+			case 'info':
+				$classes .= 'btn-info ';
+				break;
+			case 'warning':
+				$classes .= 'btn-warning ';
+				break;
+			case 'danger':
+				$classes .= 'btn-danger ';
+				break;
+			case 'default':
+				$classes .= 'btn-default ';
+				break;
+		}
+
+		list($classes, $id, $attributes) = $this->parseStandardOptions($options, $classes, true);
+
+		$tag = str_replace('{classes}', $classes, $tag);
+		$tag = str_replace('{id}', $id, $tag);
+		$tag = str_replace('{attributes}', $attributes, $tag);
+		$tag = str_replace('{title}', $title, $tag);
+
+		return $tag;
+	}
+
+	//--------------------------------------------------------------------
+
+	/**
+	 * Creates button groups wrapping HTML.
+	 *
+	 * @param          $options
+	 * @param callable $c
+	 * @return mixed
+	 */
+	public function buttonGroup($options, \Closure $c)
+	{
+		list($classes, $id, $attributes) = $this->parseStandardOptions($options, 'btn-group', true);
+
+		$output = "<div {$classes} {$id} {$attributes}>\n";
+
+		$output .= $this->runClosure($c);
+
+		$output .= "</div>\n";
+
+		return $output;
+	}
+
+	//--------------------------------------------------------------------
+
+	/**
+	 * Creates the button bar wrapping HTML.
+	 *
+	 * @param          $options
+	 * @param callable $c
+	 * @return mixed
+	 */
+	public function buttonBar($options, \Closure $c)
+	{
+		$options['attributes'][] = 'role="toolbar"';
+
+		list($classes, $id, $attributes) = $this->parseStandardOptions($options, 'btn-toolbar', true);
+
+		$output = "<div {$classes} {$id} {$attributes}>\n";
+
+		$output .= $this->runClosure($c);
+
+		$output .= "</div>\n";
+
+		return $output;
+	}
+
+	//--------------------------------------------------------------------
+
+	/**
+	 * Creates a button that also has a dropdown menu. Also called Split Buttons
+	 * by some frameworks.
+	 *
+	 * @param        $title
+	 * @param string $style
+	 * @param string $size
+	 * @param array  $options
+	 * @param callable $c
+	 * @return mixed
+	 */
+	public function buttonDropdown($title, $style='default', $size='default', $options=[], \Closure $c)
+	{
+		$tag = "<button type='button' {classes} data-toggle='dropdown'>
     {title} <span class='caret'></span>
   </button>
   <ul class='dropdown-menu' role='menu'>";
 
-        $output = $this->renderButtonElement($title, $style, $size, $options, $tag);
-
-        $output .= $this->runClosure($c);
-
-        $output .= "</ul>\n";
-
-        return $output;
-    }
-
-    //--------------------------------------------------------------------
-
-    //--------------------------------------------------------------------
-    // Notices
-    //--------------------------------------------------------------------
-
-    /**
-     * Creates an 'alert-box' style of notice grid.
-     *
-     * $style can be 'default', 'success', 'info', 'warning', 'danger'
-     *
-     * @param $content
-     * @param string $style
-     * @param bool $closable
-     * @return mixed
-     */
-    public function notice($content, $style='success', $closable=true, $options=[])
-    {
-        list($classes, $id, $attributes) = $this->parseStandardOptions($options, 'alert', false);
-
-        // Styles
-        switch ($style)
-        {
-            case 'success':
-                $classes .= ' alert-success ';
-                break;
-            case 'info':
-                $classes .= ' alert-info ';
-                break;
-            case 'warning':
-                $classes .= ' alert-warning ';
-                break;
-            case 'danger':
-                $classes .= ' alert-danger ';
-                break;
-            case 'default':
-                $classes .= ' text-muted ';
-                break;
-        }
-
-        $output = "<div class='{$classes}'>\n";
-
-        $output .= "\t$content\n";
-
-        if ($closable)
-        {
-            $output .= "\t<a href='#' class='close'>&times;</a>\n";
-        }
-
-        $output .= "</div>\n";
-
-        return $output;
-    }
-
-    //--------------------------------------------------------------------
+		$output = $this->renderButtonElement($title, $style, $size, $options, $tag);
+
+		$output .= $this->runClosure($c);
+
+		$output .= "</ul>\n";
+
+		return $output;
+	}
+
+	//--------------------------------------------------------------------
+
+	//--------------------------------------------------------------------
+	// Notices
+	//--------------------------------------------------------------------
+
+	/**
+	 * Creates an 'alert-box' style of notice grid.
+	 *
+	 * $style can be 'default', 'success', 'info', 'warning', 'danger'
+	 *
+	 * @param $content
+	 * @param string $style
+	 * @param bool $closable
+	 * @return mixed
+	 */
+	public function notice($content, $style='success', $closable=true, $options=[])
+	{
+		list($classes, $id, $attributes) = $this->parseStandardOptions($options, 'alert', false);
+
+		// Styles
+		switch ($style)
+		{
+			case 'success':
+				$classes .= ' alert-success ';
+				break;
+			case 'info':
+				$classes .= ' alert-info ';
+				break;
+			case 'warning':
+				$classes .= ' alert-warning ';
+				break;
+			case 'danger':
+				$classes .= ' alert-danger ';
+				break;
+			case 'default':
+				$classes .= ' text-muted ';
+				break;
+		}
+
+		$output = "<div class='{$classes}'>\n";
+
+		$output .= "\t$content\n";
+
+		if ($closable)
+		{
+			$output .= "\t<a href='#' class='close'>&times;</a>\n";
+		}
+
+		$output .= "</div>\n";
+
+		return $output;
+	}
+
+	//--------------------------------------------------------------------
 
 	//--------------------------------------------------------------------
 	// Forms

myth/UIKits/BaseUIKit.php

Indentation +355 added lines, -355 removed lines

@@ -38,228 +38,228 @@ 
  */
 abstract class BaseUIKit {
 
-    /**
-     * Bucket for methods to control their current state between method calls.
-     * @var array
-     */
-    protected $states = [];
-
-    protected $name = '';
-
-    /**
-     * Attached to nav items that are considered active.
-     * @var string
-     */
-    protected $active_class = 'active';
-
-    //--------------------------------------------------------------------
-
-    public function name()
-    {
-        return $this->name;
-    }
-
-    //--------------------------------------------------------------------
-
-    //--------------------------------------------------------------------
-    // Grids
-    //--------------------------------------------------------------------
-
-    /**
-     * Creates a row wrapper of HTML. We would have simple returned the
-     * the class for it, but some frameworks use a completely different
-     * approach to rows and columns than the reference Bootstrap and Foundation.
-     *
-     * @param array $options
-     * @return mixed
-     */
-    abstract public function row($options=[], \Closure $c);
-
-    //--------------------------------------------------------------------
-
-    /**
-     * Creates the CSS for a column in a grid.
-     *
-     * The attribute array is made up of key/value pairs with the
-     * key being the size, and the value being the number of columns/offset
-     * in a 12-column grid.
-     *
-     * Note that we currently DO NOT support offset columns.
-     *
-     * Valid sizes - 's', 'm', 'l', 'xl', 's-offset', 'm-offset', 'l-offset', 'xl-offset'
-     *
-     * Please note that that sizes are different than in Bootstrap. For example, for a 'xs'
-     * column size in Bootstrap, you would use 's' here. 'sm' = 'm', etc.
-     *
-     * @param array $attributes
-     * @return mixed
-     */
-    abstract public function column($options=[], \Closure $c);
-
-    //--------------------------------------------------------------------
-
-    //--------------------------------------------------------------------
-    // Navigation
-    //--------------------------------------------------------------------
-
-    /**
-     * Generates the container code for a navbar, typically used along the
-     * top of a page.
-     *
-     * @param array    $options
-     * @param callable $c
-     * @return string
-     */
-    abstract public function navbar($options=[], \Closure $c);
-
-    //--------------------------------------------------------------------
-
-    /**
-     * Builds the HTML for the Title portion of the navbar. This typically
-     * includes the code for the hamburger menu on small resolutions.
-     *
-     * @param        $title
-     * @param string $url
-     * @return string
-     */
-    abstract public function navbarTitle($title, $url='#');
-
-    //--------------------------------------------------------------------
-
-    /**
-     * Creates a UL meant to pull to the right within the navbar.
-     *
-     * Available options:
-     *      'class'     - An additional class to add
-     *
-     * @param array    $options
-     * @param callable $c
-     * @return string
-     */
-    abstract public function navbarRight($options=[], \Closure $c);
-
-    //--------------------------------------------------------------------
-
-    /**
-     * Creates a single list item for use within a nav section.
-     *
-     * @param       $title
-     * @param       $url
-     * @param array $options
-     * @return string
-     */
-    abstract public function navItem($title, $url, $options=[], $isActive=false);
-
-    //--------------------------------------------------------------------
-
-    /**
-     * Builds the shell of a Dropdown button for use within a nav area.
-     *
-     * @param          $title
-     * @param array    $options
-     * @param callable $c
-     */
-    abstract public function navDropdown($title,$options=[], \Closure $c);
-
-    //--------------------------------------------------------------------
-
-    /**
-     * Creates a divider for use within a nav list.
-     *
-     * @return string
-     */
-    abstract public function navDivider();
-
-    //--------------------------------------------------------------------
-
-    /**
-     * Creates a list of nav items to function as breadcrumbs for a site.
-     *
-     * @param array    $options
-     * @param callable $c
-     * @return mixed
-     */
-    abstract public function breadcrumb($options=[], \Closure $c);
-
-    //--------------------------------------------------------------------
-
-    //--------------------------------------------------------------------
-    // Buttons
-    //--------------------------------------------------------------------
-
-    /**
-     * Creates a simple button.
-     *
-     * $style can be 'default', 'primary', 'success', 'info', 'warning', 'danger'
-     * $size can be 'default', 'small', 'xsmall', 'large'
-     *
-     * @param       $title
-     * @param string $style
-     * @param array $options
-     * @return mixed
-     */
-    abstract public function button($title, $style='default', $size='default', $options=[]);
-
-    /**
-     * Creates a simple link styled as a button.
-     *
-     * $style can be 'default', 'primary', 'success', 'info', 'warning', 'danger'
-     * $size can be 'default', 'small', 'xsmall', 'large'
-     *
-     * @param       $title
-     * @param string $url
-     * @param string $style
-     * @param array $options
-     * @return mixed
-     */
-    abstract public function buttonLink($title, $url='#', $style='default', $size='default', $options=[]);
-
-    /**
-     * Creates button groups wrapping HTML.
-     *
-     * @param          $options
-     * @param callable $c
-     * @return mixed
-     */
-    abstract public function buttonGroup($options, \Closure $c);
-
-    /**
-     * Creates the button bar wrapping HTML.
-     *
-     * @param          $options
-     * @param callable $c
-     * @return mixed
-     */
-    abstract public function buttonBar($options, \Closure $c);
-
-    /**
-     * Creates a button that also has a dropdown menu. Also called Split Buttons
-     * by some frameworks.
-     *
-     * @param        $title
-     * @param string $style
-     * @param string $size
-     * @param array  $options
-     * @param callable $c
-     * @return mixed
-     */
-    abstract public function buttonDropdown($title, $style='default', $size='default', $options=[], \Closure $c);
-
-    //--------------------------------------------------------------------
-    // Notices
-    //--------------------------------------------------------------------
-
-    /**
-     * Creates an 'alert-box' style of notice grid.
-     *
-     * $style can be 'default', 'primary', 'success', 'info', 'warning', 'danger'
-     *
-     * @param $content
-     * @param string $style
-     * @param bool $closable
-     * @return mixed
-     */
-    abstract public function notice($content, $style='success', $closable=true);
+	/**
+	 * Bucket for methods to control their current state between method calls.
+	 * @var array
+	 */
+	protected $states = [];
+
+	protected $name = '';
+
+	/**
+	 * Attached to nav items that are considered active.
+	 * @var string
+	 */
+	protected $active_class = 'active';
+
+	//--------------------------------------------------------------------
+
+	public function name()
+	{
+		return $this->name;
+	}
+
+	//--------------------------------------------------------------------
+
+	//--------------------------------------------------------------------
+	// Grids
+	//--------------------------------------------------------------------
+
+	/**
+	 * Creates a row wrapper of HTML. We would have simple returned the
+	 * the class for it, but some frameworks use a completely different
+	 * approach to rows and columns than the reference Bootstrap and Foundation.
+	 *
+	 * @param array $options
+	 * @return mixed
+	 */
+	abstract public function row($options=[], \Closure $c);
+
+	//--------------------------------------------------------------------
+
+	/**
+	 * Creates the CSS for a column in a grid.
+	 *
+	 * The attribute array is made up of key/value pairs with the
+	 * key being the size, and the value being the number of columns/offset
+	 * in a 12-column grid.
+	 *
+	 * Note that we currently DO NOT support offset columns.
+	 *
+	 * Valid sizes - 's', 'm', 'l', 'xl', 's-offset', 'm-offset', 'l-offset', 'xl-offset'
+	 *
+	 * Please note that that sizes are different than in Bootstrap. For example, for a 'xs'
+	 * column size in Bootstrap, you would use 's' here. 'sm' = 'm', etc.
+	 *
+	 * @param array $attributes
+	 * @return mixed
+	 */
+	abstract public function column($options=[], \Closure $c);
+
+	//--------------------------------------------------------------------
+
+	//--------------------------------------------------------------------
+	// Navigation
+	//--------------------------------------------------------------------
+
+	/**
+	 * Generates the container code for a navbar, typically used along the
+	 * top of a page.
+	 *
+	 * @param array    $options
+	 * @param callable $c
+	 * @return string
+	 */
+	abstract public function navbar($options=[], \Closure $c);
+
+	//--------------------------------------------------------------------
+
+	/**
+	 * Builds the HTML for the Title portion of the navbar. This typically
+	 * includes the code for the hamburger menu on small resolutions.
+	 *
+	 * @param        $title
+	 * @param string $url
+	 * @return string
+	 */
+	abstract public function navbarTitle($title, $url='#');
+
+	//--------------------------------------------------------------------
+
+	/**
+	 * Creates a UL meant to pull to the right within the navbar.
+	 *
+	 * Available options:
+	 *      'class'     - An additional class to add
+	 *
+	 * @param array    $options
+	 * @param callable $c
+	 * @return string
+	 */
+	abstract public function navbarRight($options=[], \Closure $c);
+
+	//--------------------------------------------------------------------
+
+	/**
+	 * Creates a single list item for use within a nav section.
+	 *
+	 * @param       $title
+	 * @param       $url
+	 * @param array $options
+	 * @return string
+	 */
+	abstract public function navItem($title, $url, $options=[], $isActive=false);
+
+	//--------------------------------------------------------------------
+
+	/**
+	 * Builds the shell of a Dropdown button for use within a nav area.
+	 *
+	 * @param          $title
+	 * @param array    $options
+	 * @param callable $c
+	 */
+	abstract public function navDropdown($title,$options=[], \Closure $c);
+
+	//--------------------------------------------------------------------
+
+	/**
+	 * Creates a divider for use within a nav list.
+	 *
+	 * @return string
+	 */
+	abstract public function navDivider();
+
+	//--------------------------------------------------------------------
+
+	/**
+	 * Creates a list of nav items to function as breadcrumbs for a site.
+	 *
+	 * @param array    $options
+	 * @param callable $c
+	 * @return mixed
+	 */
+	abstract public function breadcrumb($options=[], \Closure $c);
+
+	//--------------------------------------------------------------------
+
+	//--------------------------------------------------------------------
+	// Buttons
+	//--------------------------------------------------------------------
+
+	/**
+	 * Creates a simple button.
+	 *
+	 * $style can be 'default', 'primary', 'success', 'info', 'warning', 'danger'
+	 * $size can be 'default', 'small', 'xsmall', 'large'
+	 *
+	 * @param       $title
+	 * @param string $style
+	 * @param array $options
+	 * @return mixed
+	 */
+	abstract public function button($title, $style='default', $size='default', $options=[]);
+
+	/**
+	 * Creates a simple link styled as a button.
+	 *
+	 * $style can be 'default', 'primary', 'success', 'info', 'warning', 'danger'
+	 * $size can be 'default', 'small', 'xsmall', 'large'
+	 *
+	 * @param       $title
+	 * @param string $url
+	 * @param string $style
+	 * @param array $options
+	 * @return mixed
+	 */
+	abstract public function buttonLink($title, $url='#', $style='default', $size='default', $options=[]);
+
+	/**
+	 * Creates button groups wrapping HTML.
+	 *
+	 * @param          $options
+	 * @param callable $c
+	 * @return mixed
+	 */
+	abstract public function buttonGroup($options, \Closure $c);
+
+	/**
+	 * Creates the button bar wrapping HTML.
+	 *
+	 * @param          $options
+	 * @param callable $c
+	 * @return mixed
+	 */
+	abstract public function buttonBar($options, \Closure $c);
+
+	/**
+	 * Creates a button that also has a dropdown menu. Also called Split Buttons
+	 * by some frameworks.
+	 *
+	 * @param        $title
+	 * @param string $style
+	 * @param string $size
+	 * @param array  $options
+	 * @param callable $c
+	 * @return mixed
+	 */
+	abstract public function buttonDropdown($title, $style='default', $size='default', $options=[], \Closure $c);
+
+	//--------------------------------------------------------------------
+	// Notices
+	//--------------------------------------------------------------------
+
+	/**
+	 * Creates an 'alert-box' style of notice grid.
+	 *
+	 * $style can be 'default', 'primary', 'success', 'info', 'warning', 'danger'
+	 *
+	 * @param $content
+	 * @param string $style
+	 * @param bool $closable
+	 * @return mixed
+	 */
+	abstract public function notice($content, $style='success', $closable=true);
 
 	//--------------------------------------------------------------------
 	// Forms
@@ -278,137 +278,137 @@ 
 	 */
 	abstract public function inputWrap($label_text, $options=[], \Closure $c);
 
-    //--------------------------------------------------------------------
-    // Utility Methods
-    //--------------------------------------------------------------------
-
-    /**
-     * Helper method to run a Closure and collect the output of it.
-     *
-     * @param callable $c
-     * @return string
-     */
-    protected function runClosure(\Closure $c)
-    {
-        if (! is_callable($c)) return '';
-
-        ob_start();
-        $c();
-        $output = ob_get_contents();
-        ob_end_clean();
-
-        return $output;
-    }
-
-    //--------------------------------------------------------------------
-
-    /**
-     * Provides a single method call to get the $classes, $id, and $attributes
-     * from the options array.
-     *
-     * @param        $options
-     * @param string $initial_classes
-     * @param bool   $fullClassString
-     * @return array
-     */
-    protected function parseStandardOptions($options, $initial_classes='', $fullClassString=false)
-    {
-        return [
-            $this->buildClassString($initial_classes, $options, $fullClassString),
-            $this->buildIdFromOptions($options),
-            $this->buildAttributesFromOptions($options)
-        ];
-    }
-
-    //--------------------------------------------------------------------
-
-    /**
-     * Sets the element that is to be considered the active item. This is
-     * based on the navItem's $title so it must match, though it is NOT
-     * case sensitive.
-     *
-     * @param $title
-     * @return mixed
-     */
-    public function setActiveNavItem($title)
-    {
-        $this->states['activeNavItem'] = strtolower($title);
-    }
-
-    //--------------------------------------------------------------------
-
-    /**
-     * Combines an initial classes string with a 'class' item that
-     * might be available within the options array.
-     *
-     * If 'buildEntireString' is TRUE will return the string with the 'class=""' portion.
-     * Otherwise, just returns the raw classes.
-     *
-     * @param string $initial
-     * @param array $options
-     * @return array
-     */
-    protected function buildClassString($initial, $options, $buildEntireString=false)
-    {
-        $classes = explode(' ', $initial);
-
-        if (isset($options['class']))
-        {
-            $classes = array_merge($classes, explode(' ', $options['class']));
-        }
-
-        if (isset($this->states['activeNavItem']) && isset($this->states['activeNavTitle']) &&
-            $this->states['activeNavItem'] == strtolower($this->states['activeNavTitle']))
-        {
-            $classes[] = $this->active_class;
-        }
-
-        $classes = implode(' ', $classes);
-
-        // Substitute the active class for a placeholder.
-        $classes = str_replace('{active}', $this->active_class, $classes);
-
-        return $buildEntireString ? "class='{$classes}'" : $classes;
-    }
-    //--------------------------------------------------------------------
-
-    /**
-     * Checks the options array for an ID and returns the entire string.
-     *
-     * Example Return:
-     *      id='MyID'
-     *
-     * @param $options
-     * @return string
-     */
-    protected function buildIdFromOptions($options)
-    {
-        return isset($options['id']) ? "id='{$options['id']}'" : ' ';
-    }
-
-    //--------------------------------------------------------------------
-
-    /**
-     * Parses out attributes from the options array. The attributes array
-     * should all contain no key names, only values, so:
-     *
-     * 'attributes' => [
-     *      'style="width:100%",
-     *      'required'
-     * ]
-     *
-     * @param $options
-     * @return string
-     */
-    protected function buildAttributesFromOptions($options)
-    {
-        if (isset($options['attributes']) && ! is_array($options['attributes']))
-        {
-            $options['attributes'] = [ $options['attributes'] ];
-        }
-
-        return isset($options['attributes']) ? implode($options['attributes']) : '';
-    }
-
-    //--------------------------------------------------------------------
+	//--------------------------------------------------------------------
+	// Utility Methods
+	//--------------------------------------------------------------------
+
+	/**
+	 * Helper method to run a Closure and collect the output of it.
+	 *
+	 * @param callable $c
+	 * @return string
+	 */
+	protected function runClosure(\Closure $c)
+	{
+		if (! is_callable($c)) return '';
+
+		ob_start();
+		$c();
+		$output = ob_get_contents();
+		ob_end_clean();
+
+		return $output;
+	}
+
+	//--------------------------------------------------------------------
+
+	/**
+	 * Provides a single method call to get the $classes, $id, and $attributes
+	 * from the options array.
+	 *
+	 * @param        $options
+	 * @param string $initial_classes
+	 * @param bool   $fullClassString
+	 * @return array
+	 */
+	protected function parseStandardOptions($options, $initial_classes='', $fullClassString=false)
+	{
+		return [
+			$this->buildClassString($initial_classes, $options, $fullClassString),
+			$this->buildIdFromOptions($options),
+			$this->buildAttributesFromOptions($options)
+		];
+	}
+
+	//--------------------------------------------------------------------
+
+	/**
+	 * Sets the element that is to be considered the active item. This is
+	 * based on the navItem's $title so it must match, though it is NOT
+	 * case sensitive.
+	 *
+	 * @param $title
+	 * @return mixed
+	 */
+	public function setActiveNavItem($title)
+	{
+		$this->states['activeNavItem'] = strtolower($title);
+	}
+
+	//--------------------------------------------------------------------
+
+	/**
+	 * Combines an initial classes string with a 'class' item that
+	 * might be available within the options array.
+	 *
+	 * If 'buildEntireString' is TRUE will return the string with the 'class=""' portion.
+	 * Otherwise, just returns the raw classes.
+	 *
+	 * @param string $initial
+	 * @param array $options
+	 * @return array
+	 */
+	protected function buildClassString($initial, $options, $buildEntireString=false)
+	{
+		$classes = explode(' ', $initial);
+
+		if (isset($options['class']))
+		{
+			$classes = array_merge($classes, explode(' ', $options['class']));
+		}
+
+		if (isset($this->states['activeNavItem']) && isset($this->states['activeNavTitle']) &&
+			$this->states['activeNavItem'] == strtolower($this->states['activeNavTitle']))
+		{
+			$classes[] = $this->active_class;
+		}
+
+		$classes = implode(' ', $classes);
+
+		// Substitute the active class for a placeholder.
+		$classes = str_replace('{active}', $this->active_class, $classes);
+
+		return $buildEntireString ? "class='{$classes}'" : $classes;
+	}
+	//--------------------------------------------------------------------
+
+	/**
+	 * Checks the options array for an ID and returns the entire string.
+	 *
+	 * Example Return:
+	 *      id='MyID'
+	 *
+	 * @param $options
+	 * @return string
+	 */
+	protected function buildIdFromOptions($options)
+	{
+		return isset($options['id']) ? "id='{$options['id']}'" : ' ';
+	}
+
+	//--------------------------------------------------------------------
+
+	/**
+	 * Parses out attributes from the options array. The attributes array
+	 * should all contain no key names, only values, so:
+	 *
+	 * 'attributes' => [
+	 *      'style="width:100%",
+	 *      'required'
+	 * ]
+	 *
+	 * @param $options
+	 * @return string
+	 */
+	protected function buildAttributesFromOptions($options)
+	{
+		if (isset($options['attributes']) && ! is_array($options['attributes']))
+		{
+			$options['attributes'] = [ $options['attributes'] ];
+		}
+
+		return isset($options['attributes']) ? implode($options['attributes']) : '';
+	}
+
+	//--------------------------------------------------------------------
 }

myth/Settings/DatabaseStore.php

Indentation +179 added lines, -179 removed lines

@@ -32,183 +32,183 @@
 
 class DatabaseStore implements SettingsStoreInterface {
 
-    protected $ci;
-
-    protected $db;
-
-    //--------------------------------------------------------------------
-
-    public function __construct( $ci=null )
-    {
-        if (is_object($ci))
-        {
-            $this->ci =& $ci;
-        }
-        else {
-            $this->ci =& get_instance();
-        }
-
-        // Ensure that the database is loaded.
-        if (empty($this->ci->db))
-        {
-            $this->ci->load->database();
-        }
-    }
-
-    //--------------------------------------------------------------------
-
-    /**
-     * Inserts or Replaces an setting value.
-     *
-     * @param $key
-     * @param null $value
-     * @param string $group
-     * @return bool
-     */
-    public function save($key, $value=null, $group='app')
-    {
-        if (empty($this->ci->db) || ! is_object($this->ci->db))
-        {
-            return false;
-        }
-
-        $where = [
-            'name'  => $key,
-            'group' => $group
-        ];
-        $this->ci->db->delete('settings', $where);
-
-        if (is_array($value) || is_object($value))
-        {
-            $value = serialize($value);
-        }
-
-        $data = [
-            'name'  => $key,
-            'value' => $value,
-            'group' => $group
-        ];
-        return $this->ci->db->insert('settings', $data);
-    }
-
-    //--------------------------------------------------------------------
-
-    /**
-     * Retrieves a single item.
-     *
-     * @param $key
-     * @param string $group
-     * @return mixed
-     */
-    public function get($key, $group='app')
-    {
-        if (empty($this->ci->db) || ! is_object($this->ci->db))
-        {
-            return false;
-        }
-
-        $where = [
-            'name'  => $key,
-            'group' => $group
-        ];
-
-        $query = $this->ci->db->where($where)
-                              ->get('settings');
-
-        if (! $query->num_rows())
-        {
-            return false;
-        }
-
-        $value = $query->row()->value;
-
-        // Check to see if it needs to be unserialized
-        $data = @unserialize($value);   // We don't need to issue an E_NOTICE here...
-
-        // Check for a value of false or
-        if ($value === 'b:0;' || $data !== false)
-        {
-            $value = $data;
-        }
-
-        return $value;
-    }
-
-    //--------------------------------------------------------------------
-
-    /**
-     * Deletes a single item.
-     *
-     * @param $key
-     * @param $group
-     * @return mixed
-     */
-    public function delete($key, $group='app')
-    {
-        if (empty($this->ci->db) || ! is_object($this->ci->db))
-        {
-            return false;
-        }
-
-        $where = [
-            'name'  => $key,
-            'group' => $group
-        ];
-
-        return $this->ci->db->delete('settings', $where);
-    }
-
-    //--------------------------------------------------------------------
-
-    /**
-     * Searches the store for any items with $field = $value.
-     *
-     * @param $field
-     * @param $value
-     * @return mixed
-     */
-    public function findBy($field, $value)
-    {
-        if (empty($this->ci->db) || ! is_object($this->ci->db))
-        {
-            return false;
-        }
-
-        $query = $this->ci->db->where($field, $value)
-                              ->get('settings');
-
-        if (! $query->num_rows())
-        {
-            return false;
-        }
-
-        return $query->result_array();
-    }
-
-    //--------------------------------------------------------------------
-
-    /**
-     * Retrieves all items in the store either globally or for a single group.
-     *
-     * @param string $group
-     * @return mixed
-     */
-    public function all($group=null)
-    {
-        if (empty($this->ci->db) || ! is_object($this->ci->db))
-        {
-            return false;
-        }
-
-        $query = $this->ci->db->get('settings');
-
-        if (! $query->num_rows())
-        {
-            return false;
-        }
-
-        return $query->result_array();
-    }
-
-    //--------------------------------------------------------------------
+	protected $ci;
+
+	protected $db;
+
+	//--------------------------------------------------------------------
+
+	public function __construct( $ci=null )
+	{
+		if (is_object($ci))
+		{
+			$this->ci =& $ci;
+		}
+		else {
+			$this->ci =& get_instance();
+		}
+
+		// Ensure that the database is loaded.
+		if (empty($this->ci->db))
+		{
+			$this->ci->load->database();
+		}
+	}
+
+	//--------------------------------------------------------------------
+
+	/**
+	 * Inserts or Replaces an setting value.
+	 *
+	 * @param $key
+	 * @param null $value
+	 * @param string $group
+	 * @return bool
+	 */
+	public function save($key, $value=null, $group='app')
+	{
+		if (empty($this->ci->db) || ! is_object($this->ci->db))
+		{
+			return false;
+		}
+
+		$where = [
+			'name'  => $key,
+			'group' => $group
+		];
+		$this->ci->db->delete('settings', $where);
+
+		if (is_array($value) || is_object($value))
+		{
+			$value = serialize($value);
+		}
+
+		$data = [
+			'name'  => $key,
+			'value' => $value,
+			'group' => $group
+		];
+		return $this->ci->db->insert('settings', $data);
+	}
+
+	//--------------------------------------------------------------------
+
+	/**
+	 * Retrieves a single item.
+	 *
+	 * @param $key
+	 * @param string $group
+	 * @return mixed
+	 */
+	public function get($key, $group='app')
+	{
+		if (empty($this->ci->db) || ! is_object($this->ci->db))
+		{
+			return false;
+		}
+
+		$where = [
+			'name'  => $key,
+			'group' => $group
+		];
+
+		$query = $this->ci->db->where($where)
+							  ->get('settings');
+
+		if (! $query->num_rows())
+		{
+			return false;
+		}
+
+		$value = $query->row()->value;
+
+		// Check to see if it needs to be unserialized
+		$data = @unserialize($value);   // We don't need to issue an E_NOTICE here...
+
+		// Check for a value of false or
+		if ($value === 'b:0;' || $data !== false)
+		{
+			$value = $data;
+		}
+
+		return $value;
+	}
+
+	//--------------------------------------------------------------------
+
+	/**
+	 * Deletes a single item.
+	 *
+	 * @param $key
+	 * @param $group
+	 * @return mixed
+	 */
+	public function delete($key, $group='app')
+	{
+		if (empty($this->ci->db) || ! is_object($this->ci->db))
+		{
+			return false;
+		}
+
+		$where = [
+			'name'  => $key,
+			'group' => $group
+		];
+
+		return $this->ci->db->delete('settings', $where);
+	}
+
+	//--------------------------------------------------------------------
+
+	/**
+	 * Searches the store for any items with $field = $value.
+	 *
+	 * @param $field
+	 * @param $value
+	 * @return mixed
+	 */
+	public function findBy($field, $value)
+	{
+		if (empty($this->ci->db) || ! is_object($this->ci->db))
+		{
+			return false;
+		}
+
+		$query = $this->ci->db->where($field, $value)
+							  ->get('settings');
+
+		if (! $query->num_rows())
+		{
+			return false;
+		}
+
+		return $query->result_array();
+	}
+
+	//--------------------------------------------------------------------
+
+	/**
+	 * Retrieves all items in the store either globally or for a single group.
+	 *
+	 * @param string $group
+	 * @return mixed
+	 */
+	public function all($group=null)
+	{
+		if (empty($this->ci->db) || ! is_object($this->ci->db))
+		{
+			return false;
+		}
+
+		$query = $this->ci->db->get('settings');
+
+		if (! $query->num_rows())
+		{
+			return false;
+		}
+
+		return $query->result_array();
+	}
+
+	//--------------------------------------------------------------------
 }