ci-bonfire / Sprint

myth/CIModules/auth/views/login.php

Spacing +1 added lines, -1 removed lines

@@ -1,4 +1,4 @@
-<?= form_open( current_url(), ['id' => 'login_form']); ?>
+<?= form_open(current_url(), ['id' => 'login_form']); ?>
 
     <h2 class="form-signin-heading"><?= lang('auth.signin') ?></h2>
 

myth/CIModules/auth/views/register.php

Spacing +1 added lines, -1 removed lines

@@ -1,4 +1,4 @@
-<?= form_open( current_url(), ['id' => 'join_form'] ) ?>
+<?= form_open(current_url(), ['id' => 'join_form']) ?>
 
     <h2 class="form-signin-heading"><?= lang('auth.register') ?></h2>
 

myth/CIModules/cron/controllers/Cron.php

Indentation +304 added lines, -304 removed lines

@@ -37,325 +37,325 @@
 // todo Add ability to log actual cron jobs to database to verify when they ran for sure.
 class Cron extends \Myth\Controllers\CLIController {
 
-    protected $descriptions = [
-        'show'  => ['show [all/<task>]', 'Lists the names one or more tasks, with run times.'],
-        'run'   => ['run [<task>]', 'Runs all scheduled tasks. If <task> is present only runs that task.'],
-        'disable'   => ['disable', 'Disables the cron system and will not run any tasks.'],
-        'enable'    => ['enable', 'Enables the cron system and will run tasks again.'],
-        'suspend'   => ['suspend <task>', 'Stops a single task from running until resumed.'],
-        'resume'    => ['resume <task>', 'Resumes execution of a single suspended task.']
-    ];
-
-    protected $long_descriptions = [
-        'show'  => '',
-        'run'   => '',
-        'disable'   => '',
-        'enable'    => '',
-        'suspend'   => '',
-        'resume'    => ''
-    ];
-
-    //--------------------------------------------------------------------
-
-    public function __construct()
-    {
-        parent::__construct();
-
-        // Load our tasks into the sytem.
-        require APPPATH .'config/cron.php';
-    }
-
-    //--------------------------------------------------------------------
-
-    /**
-     * Runs all of the tasks (after checking their time, of course...)
-     *
-     * @param string $alias
-     * @return mixed
-     */
-    public function run($alias=null)
-    {
-        // Has the system been disabled?
-        if (Settings::get('is_disabled', 'cron') == 'y')
-        {
-            return CLI::error('The cron system has been disabled. No tasks were run.');
-        }
-
-        $force_run = false;
-
-        // Run one task or all?
-        if (! empty($alias))
-        {
-            $tasks = \Myth\Cron\CronManager::task($alias);
-
-            if (is_null($tasks))
-            {
-                return CLI::error("Unable to find the task: '{$alias}'.");
-            }
-
-            $tasks = [ $alias => $tasks];
-            $force_run = true;
-        }
-        else
-        {
-            $tasks = \Myth\Cron\CronManager::tasks();
-        }
-
-        if (empty($tasks))
-        {
-            return CLI::write("There are no tasks to run at this time.");
-        }
-
-        // We need to be able to check against suspended tasks.
-        $suspended = Settings::get('suspended_tasks', 'cron');
-
-        if (! is_array($suspended))
-        {
-            $suspended = array($suspended);
-        }
-
-        // Loop over all of our tasks, checking them against the
-        // suspended tasks to see if they're okay to run.
-
-        // Collect the output of the actions so that we can make
-        // it available to the event (for sending emails and the like)
-        $output = '';
-
-        echo CLI::write('Starting Tasks...');
-
-        foreach ($tasks as $alias => $task)
-        {
-            if (in_array($alias, $suspended))
-            {
-                echo CLI::write("\t[Suspended] {$alias} will not run until resumed.", 'yellow');
-                $output .= "[Suspended] {$alias} will not run until resumed.";
-                continue;
-            }
-
-            echo CLI::write("\tRunning task: {$alias}...");
-            $output .= \Myth\Cron\CronManager::run($alias, $force_run);
-        }
-
-        // Give other people a chance to respond.
-        echo CLI::write('Done. Firing the event so others can play too...');
-
-        Events::trigger('afterCron', [$output]);
-
-        // And we're out of here boys and girls!
-        echo CLI::write('Done');
-    }
-
-    //--------------------------------------------------------------------
-
-
-    /**
-     * Lists one or more tasks with their scheduled run times.
-     *
-     * @param null $task
-     * @return mixed
-     */
-    public function show($task=null)
-    {
-        if (empty($task))
-        {
-            return $this->listTaskNames();
-        }
-
-        if (trim(strtolower($task)) == 'all')
-        {
-            $tasks = \Myth\Cron\CronManager::listAll();
-        }
-        else
-        {
-            $tasks = \Myth\Cron\CronManager::task($task);
-        }
-
-        if (! is_array($tasks))
-        {
-            $tasks = [ $task => [
-                'next_run'  => $tasks->nextRunDate(),
-                'prev_run'  => $tasks->previousRunDate()
-            ]];
-        }
-
-        if (! count($tasks))
-        {
-            return CLI::found('No tasks found.', 'red');
-        }
-
-        $suspended = Settings::get('suspended_tasks', 'cron');
-
-        if (empty($suspended))
-        {
-            $suspended = [];
-        }
-        /*
+	protected $descriptions = [
+		'show'  => ['show [all/<task>]', 'Lists the names one or more tasks, with run times.'],
+		'run'   => ['run [<task>]', 'Runs all scheduled tasks. If <task> is present only runs that task.'],
+		'disable'   => ['disable', 'Disables the cron system and will not run any tasks.'],
+		'enable'    => ['enable', 'Enables the cron system and will run tasks again.'],
+		'suspend'   => ['suspend <task>', 'Stops a single task from running until resumed.'],
+		'resume'    => ['resume <task>', 'Resumes execution of a single suspended task.']
+	];
+
+	protected $long_descriptions = [
+		'show'  => '',
+		'run'   => '',
+		'disable'   => '',
+		'enable'    => '',
+		'suspend'   => '',
+		'resume'    => ''
+	];
+
+	//--------------------------------------------------------------------
+
+	public function __construct()
+	{
+		parent::__construct();
+
+		// Load our tasks into the sytem.
+		require APPPATH .'config/cron.php';
+	}
+
+	//--------------------------------------------------------------------
+
+	/**
+	 * Runs all of the tasks (after checking their time, of course...)
+	 *
+	 * @param string $alias
+	 * @return mixed
+	 */
+	public function run($alias=null)
+	{
+		// Has the system been disabled?
+		if (Settings::get('is_disabled', 'cron') == 'y')
+		{
+			return CLI::error('The cron system has been disabled. No tasks were run.');
+		}
+
+		$force_run = false;
+
+		// Run one task or all?
+		if (! empty($alias))
+		{
+			$tasks = \Myth\Cron\CronManager::task($alias);
+
+			if (is_null($tasks))
+			{
+				return CLI::error("Unable to find the task: '{$alias}'.");
+			}
+
+			$tasks = [ $alias => $tasks];
+			$force_run = true;
+		}
+		else
+		{
+			$tasks = \Myth\Cron\CronManager::tasks();
+		}
+
+		if (empty($tasks))
+		{
+			return CLI::write("There are no tasks to run at this time.");
+		}
+
+		// We need to be able to check against suspended tasks.
+		$suspended = Settings::get('suspended_tasks', 'cron');
+
+		if (! is_array($suspended))
+		{
+			$suspended = array($suspended);
+		}
+
+		// Loop over all of our tasks, checking them against the
+		// suspended tasks to see if they're okay to run.
+
+		// Collect the output of the actions so that we can make
+		// it available to the event (for sending emails and the like)
+		$output = '';
+
+		echo CLI::write('Starting Tasks...');
+
+		foreach ($tasks as $alias => $task)
+		{
+			if (in_array($alias, $suspended))
+			{
+				echo CLI::write("\t[Suspended] {$alias} will not run until resumed.", 'yellow');
+				$output .= "[Suspended] {$alias} will not run until resumed.";
+				continue;
+			}
+
+			echo CLI::write("\tRunning task: {$alias}...");
+			$output .= \Myth\Cron\CronManager::run($alias, $force_run);
+		}
+
+		// Give other people a chance to respond.
+		echo CLI::write('Done. Firing the event so others can play too...');
+
+		Events::trigger('afterCron', [$output]);
+
+		// And we're out of here boys and girls!
+		echo CLI::write('Done');
+	}
+
+	//--------------------------------------------------------------------
+
+
+	/**
+	 * Lists one or more tasks with their scheduled run times.
+	 *
+	 * @param null $task
+	 * @return mixed
+	 */
+	public function show($task=null)
+	{
+		if (empty($task))
+		{
+			return $this->listTaskNames();
+		}
+
+		if (trim(strtolower($task)) == 'all')
+		{
+			$tasks = \Myth\Cron\CronManager::listAll();
+		}
+		else
+		{
+			$tasks = \Myth\Cron\CronManager::task($task);
+		}
+
+		if (! is_array($tasks))
+		{
+			$tasks = [ $task => [
+				'next_run'  => $tasks->nextRunDate(),
+				'prev_run'  => $tasks->previousRunDate()
+			]];
+		}
+
+		if (! count($tasks))
+		{
+			return CLI::found('No tasks found.', 'red');
+		}
+
+		$suspended = Settings::get('suspended_tasks', 'cron');
+
+		if (empty($suspended))
+		{
+			$suspended = [];
+		}
+		/*
          * Headers
          */
-        echo CLI::write("Task\t\t\t\tNext Run\t\tPrevious Run");
-        echo CLI::write( str_repeat('-', 80) );
-
-        foreach ($tasks as $alias => $task)
-        {
-            // Suspended?
-            $color = 'yellow';
-            $extra = '';
-
-            if (in_array($alias, $suspended) )
-            {
-                $color = 'blue';
-                $extra = "\t[Suspended]";
-            }
-
-            // Alias can only be 24 chars long.
-            $alias = strlen($alias) >= 32 ? substr($alias, 0, 28) .'... ' : $alias . str_repeat(" ", 32 - strlen($alias));
-
-            $next = date('D Y-m-d H:i', $task['next_run']);
-            $prev = date('D Y-m-d H:i', $task['prev_run']);
-
-            echo CLI::write("{$alias}{$next}\t{$prev}{$extra}", $color);
-        }
-    }
-
-    //--------------------------------------------------------------------
-
-    /**
-     * Stops a task from being executed during the normal cron runs.
-     *
-     * @param $alias
-     */
-    public function suspend($alias)
-    {
-        // Verify the task actually exists.
-        $task = \Myth\Cron\CronManager::task($alias);
-
-        if (is_null($task))
-        {
-            return CLI::error("Unable to find the task: {$alias}.");
-        }
-
-        // Update the existing setting.
-        $suspended = Settings::get('suspended_tasks', 'cron');
-
-        if (empty($suspended))
-        {
-            $suspended = [];
-        }
-
-        $suspended[] = $alias;
-
-        if (Settings::save('suspended_tasks', $suspended, 'cron') )
-        {
-            return CLI::write('Done');
-        }
-
-        echo CLI::error('Unkown problem saving the settings.');
-    }
-
-    //--------------------------------------------------------------------
-
-    /**
-     * Allows the execution of a suspended task to continue again
-     * during normal cron execution.
-     *
-     * @param $alias
-     */
-    public function resume($alias)
-    {
-        // Verify the task actually exists.
-        $task = \Myth\Cron\CronManager::task($alias);
-
-        if (is_null($task))
-        {
-            return CLI::error("Unable to find the task: {$alias}.");
-        }
-
-        // Update the existing setting.
-        $suspended = Settings::get('suspended_tasks', 'cron');
-
-        if (! empty($suspended))
-        {
-            unset($suspended[ array_search($alias, $suspended) ]);
-
-            if (! Settings::save('suspended_tasks', $suspended, 'cron') )
-            {
-                return CLI::error('Unkown problem saving the settings.');
-            }
-        }
-
-        return CLI::write('Done');
-    }
-
-    //--------------------------------------------------------------------
-
-    /**
-     * Disables the cron tasks and stops the system from running any tasks.
-     * To start the system allowing it to run again, use the `enable` command.
-     */
-    public function disable()
-    {
-        if (! Settings::save('is_disabled', 'y', 'cron'))
-        {
-            return CLI::error('Unknown problem saving the setting. '. CLI::color('Cron jobs will still run!', 'yellow'));
-        }
-
-        CLI::write('Done');
-    }
+		echo CLI::write("Task\t\t\t\tNext Run\t\tPrevious Run");
+		echo CLI::write( str_repeat('-', 80) );
+
+		foreach ($tasks as $alias => $task)
+		{
+			// Suspended?
+			$color = 'yellow';
+			$extra = '';
+
+			if (in_array($alias, $suspended) )
+			{
+				$color = 'blue';
+				$extra = "\t[Suspended]";
+			}
+
+			// Alias can only be 24 chars long.
+			$alias = strlen($alias) >= 32 ? substr($alias, 0, 28) .'... ' : $alias . str_repeat(" ", 32 - strlen($alias));
+
+			$next = date('D Y-m-d H:i', $task['next_run']);
+			$prev = date('D Y-m-d H:i', $task['prev_run']);
+
+			echo CLI::write("{$alias}{$next}\t{$prev}{$extra}", $color);
+		}
+	}
+
+	//--------------------------------------------------------------------
+
+	/**
+	 * Stops a task from being executed during the normal cron runs.
+	 *
+	 * @param $alias
+	 */
+	public function suspend($alias)
+	{
+		// Verify the task actually exists.
+		$task = \Myth\Cron\CronManager::task($alias);
+
+		if (is_null($task))
+		{
+			return CLI::error("Unable to find the task: {$alias}.");
+		}
+
+		// Update the existing setting.
+		$suspended = Settings::get('suspended_tasks', 'cron');
+
+		if (empty($suspended))
+		{
+			$suspended = [];
+		}
+
+		$suspended[] = $alias;
+
+		if (Settings::save('suspended_tasks', $suspended, 'cron') )
+		{
+			return CLI::write('Done');
+		}
+
+		echo CLI::error('Unkown problem saving the settings.');
+	}
+
+	//--------------------------------------------------------------------
+
+	/**
+	 * Allows the execution of a suspended task to continue again
+	 * during normal cron execution.
+	 *
+	 * @param $alias
+	 */
+	public function resume($alias)
+	{
+		// Verify the task actually exists.
+		$task = \Myth\Cron\CronManager::task($alias);
+
+		if (is_null($task))
+		{
+			return CLI::error("Unable to find the task: {$alias}.");
+		}
+
+		// Update the existing setting.
+		$suspended = Settings::get('suspended_tasks', 'cron');
+
+		if (! empty($suspended))
+		{
+			unset($suspended[ array_search($alias, $suspended) ]);
+
+			if (! Settings::save('suspended_tasks', $suspended, 'cron') )
+			{
+				return CLI::error('Unkown problem saving the settings.');
+			}
+		}
+
+		return CLI::write('Done');
+	}
+
+	//--------------------------------------------------------------------
+
+	/**
+	 * Disables the cron tasks and stops the system from running any tasks.
+	 * To start the system allowing it to run again, use the `enable` command.
+	 */
+	public function disable()
+	{
+		if (! Settings::save('is_disabled', 'y', 'cron'))
+		{
+			return CLI::error('Unknown problem saving the setting. '. CLI::color('Cron jobs will still run!', 'yellow'));
+		}
+
+		CLI::write('Done');
+	}
     
-    //--------------------------------------------------------------------
+	//--------------------------------------------------------------------
 
-    /**
-     * Resumes the running of tasks after the system has been disabled
-     * with the `disable` command.
-     */
-    public function enable()
-    {
-        if (! Settings::save('is_disabled', 'n', 'cron'))
-        {
-            return CLI::error('Unknown problem saving the setting. '. CLI::color('Cron jobs will NOT run!', 'yellow'));
-        }
+	/**
+	 * Resumes the running of tasks after the system has been disabled
+	 * with the `disable` command.
+	 */
+	public function enable()
+	{
+		if (! Settings::save('is_disabled', 'n', 'cron'))
+		{
+			return CLI::error('Unknown problem saving the setting. '. CLI::color('Cron jobs will NOT run!', 'yellow'));
+		}
 
-        CLI::write('Done');
-    }
+		CLI::write('Done');
+	}
 
-    //--------------------------------------------------------------------
+	//--------------------------------------------------------------------
 
 
-    //--------------------------------------------------------------------
-    // Private Methods
-    //--------------------------------------------------------------------
+	//--------------------------------------------------------------------
+	// Private Methods
+	//--------------------------------------------------------------------
 
-    /**
-     * Lists out all available tasks, names only.
-     */
-    private function listTaskNames()
-    {
-        $suspended = Settings::get('suspended_tasks', 'cron');
+	/**
+	 * Lists out all available tasks, names only.
+	 */
+	private function listTaskNames()
+	{
+		$suspended = Settings::get('suspended_tasks', 'cron');
 
-        if (empty($suspended))
-        {
-            $suspended = [];
-        }
+		if (empty($suspended))
+		{
+			$suspended = [];
+		}
 
-        $tasks = \Myth\Cron\CronManager::listAll();
+		$tasks = \Myth\Cron\CronManager::listAll();
 
-        echo CLI::write("\nAvailable Tasks:");
+		echo CLI::write("\nAvailable Tasks:");
 
-        foreach ($tasks as $alias => $task)
-        {
-            $color = 'yellow';
-            $extra = '';
+		foreach ($tasks as $alias => $task)
+		{
+			$color = 'yellow';
+			$extra = '';
 
-            if (in_array($alias, $suspended) )
-            {
-                $color = 'blue';
-                $extra = "[Suspended]";
-            }
+			if (in_array($alias, $suspended) )
+			{
+				$color = 'blue';
+				$extra = "[Suspended]";
+			}
 
-            echo CLI::write("\t{$extra} {$alias}", $color);
-        }
-    }
+			echo CLI::write("\t{$extra} {$alias}", $color);
+		}
+	}
 
-    //--------------------------------------------------------------------
+	//--------------------------------------------------------------------
 
 }

Spacing +21 added lines, -21 removed lines

@@ -62,7 +62,7 @@ 
         parent::__construct();
 
         // Load our tasks into the sytem.
-        require APPPATH .'config/cron.php';
+        require APPPATH.'config/cron.php';
     }
 
     //--------------------------------------------------------------------
@@ -73,7 +73,7 @@ 
      * @param string $alias
      * @return mixed
      */
-    public function run($alias=null)
+    public function run($alias = null)
     {
         // Has the system been disabled?
         if (Settings::get('is_disabled', 'cron') == 'y')
@@ -84,7 +84,7 @@ 
         $force_run = false;
 
         // Run one task or all?
-        if (! empty($alias))
+        if ( ! empty($alias))
         {
             $tasks = \Myth\Cron\CronManager::task($alias);
 
@@ -93,7 +93,7 @@ 
                 return CLI::error("Unable to find the task: '{$alias}'.");
             }
 
-            $tasks = [ $alias => $tasks];
+            $tasks = [$alias => $tasks];
             $force_run = true;
         }
         else
@@ -109,7 +109,7 @@ 
         // We need to be able to check against suspended tasks.
         $suspended = Settings::get('suspended_tasks', 'cron');
 
-        if (! is_array($suspended))
+        if ( ! is_array($suspended))
         {
             $suspended = array($suspended);
         }
@@ -154,7 +154,7 @@ 
      * @param null $task
      * @return mixed
      */
-    public function show($task=null)
+    public function show($task = null)
     {
         if (empty($task))
         {
@@ -170,15 +170,15 @@ 
             $tasks = \Myth\Cron\CronManager::task($task);
         }
 
-        if (! is_array($tasks))
+        if ( ! is_array($tasks))
         {
-            $tasks = [ $task => [
+            $tasks = [$task => [
                 'next_run'  => $tasks->nextRunDate(),
                 'prev_run'  => $tasks->previousRunDate()
             ]];
         }
 
-        if (! count($tasks))
+        if ( ! count($tasks))
         {
             return CLI::found('No tasks found.', 'red');
         }
@@ -193,7 +193,7 @@ 
          * Headers
          */
         echo CLI::write("Task\t\t\t\tNext Run\t\tPrevious Run");
-        echo CLI::write( str_repeat('-', 80) );
+        echo CLI::write(str_repeat('-', 80));
 
         foreach ($tasks as $alias => $task)
         {
@@ -201,14 +201,14 @@ 
             $color = 'yellow';
             $extra = '';
 
-            if (in_array($alias, $suspended) )
+            if (in_array($alias, $suspended))
             {
                 $color = 'blue';
                 $extra = "\t[Suspended]";
             }
 
             // Alias can only be 24 chars long.
-            $alias = strlen($alias) >= 32 ? substr($alias, 0, 28) .'... ' : $alias . str_repeat(" ", 32 - strlen($alias));
+            $alias = strlen($alias) >= 32 ? substr($alias, 0, 28).'... ' : $alias.str_repeat(" ", 32 - strlen($alias));
 
             $next = date('D Y-m-d H:i', $task['next_run']);
             $prev = date('D Y-m-d H:i', $task['prev_run']);
@@ -244,7 +244,7 @@ 
 
         $suspended[] = $alias;
 
-        if (Settings::save('suspended_tasks', $suspended, 'cron') )
+        if (Settings::save('suspended_tasks', $suspended, 'cron'))
         {
             return CLI::write('Done');
         }
@@ -273,11 +273,11 @@ 
         // Update the existing setting.
         $suspended = Settings::get('suspended_tasks', 'cron');
 
-        if (! empty($suspended))
+        if ( ! empty($suspended))
         {
-            unset($suspended[ array_search($alias, $suspended) ]);
+            unset($suspended[array_search($alias, $suspended)]);
 
-            if (! Settings::save('suspended_tasks', $suspended, 'cron') )
+            if ( ! Settings::save('suspended_tasks', $suspended, 'cron'))
             {
                 return CLI::error('Unkown problem saving the settings.');
             }
@@ -294,9 +294,9 @@ 
      */
     public function disable()
     {
-        if (! Settings::save('is_disabled', 'y', 'cron'))
+        if ( ! Settings::save('is_disabled', 'y', 'cron'))
         {
-            return CLI::error('Unknown problem saving the setting. '. CLI::color('Cron jobs will still run!', 'yellow'));
+            return CLI::error('Unknown problem saving the setting. '.CLI::color('Cron jobs will still run!', 'yellow'));
         }
 
         CLI::write('Done');
@@ -310,9 +310,9 @@ 
      */
     public function enable()
     {
-        if (! Settings::save('is_disabled', 'n', 'cron'))
+        if ( ! Settings::save('is_disabled', 'n', 'cron'))
         {
-            return CLI::error('Unknown problem saving the setting. '. CLI::color('Cron jobs will NOT run!', 'yellow'));
+            return CLI::error('Unknown problem saving the setting. '.CLI::color('Cron jobs will NOT run!', 'yellow'));
         }
 
         CLI::write('Done');
@@ -346,7 +346,7 @@ 
             $color = 'yellow';
             $extra = '';
 
-            if (in_array($alias, $suspended) )
+            if (in_array($alias, $suspended))
             {
                 $color = 'blue';
                 $extra = "[Suspended]";

Braces +2 added lines, -4 removed lines

@@ -179,8 +179,7 @@ 
         if (! empty($name))
         {
             $this->from = [$email, $name];
-        }
-        else
+        } else
         {
             $this->from = $email;
         }
@@ -231,8 +230,7 @@ 
         if (! empty($name))
         {
             $this->reply_to = [$email, $name];
-        }
-        else
+        } else
         {
             $this->reply_to = $email;
         }

myth/CIModules/database/controllers/Database.php

Indentation +224 added lines, -224 removed lines

@@ -35,207 +35,207 @@ 
 class Database extends \Myth\Controllers\CLIController
 {
 
-    protected $descriptions = [
-        'migrate'       => ['migrate [$to]',        'Runs the migrations up or down until schema at version \$to'],
-        'quietMigrate'  => ['quiteMigrate [$to]',   'Same as migrate but without any feedback.'],
-        'refresh'       => ['refresh',              'Runs migrations back to version 0 (uninstall) and then back to the most recent migration.'],
-        'newMigration'  => ['newMigration [$name]', 'Creates a new migration file.'],
-        'seed'          => ['seed [$name]',         'Runs the named database seeder.']
-    ];
-
-    protected $long_descriptions = [
-        'migrate'       => '',
-        'quietMigrate'  => '',
-        'refresh'       => '',
-        'newMigration'  => '',
-        'seed'          => ''
-    ];
-
-    //-------------------------------------------------------------------
-
-    //--------------------------------------------------------------------
-    // Migration Methods
-    //--------------------------------------------------------------------
-
-    /**
-     * Provides a command-line interface to the migration scripts.
-     * If no $to is provided, will migrate to the latest version.
-     *
-     * Example:
-     *      > php index.php database migrate
-     *
-     * @param string $type 'app', 'myth', 'all' or {module_name}
-     * @param null $to
-     * @param bool $silent If TRUE, will NOT display any prompts for verification.
-     * @return bool|void
-     */
-    public function migrate($type=null, $to = null, $silent = false)
-    {
-        $this->load->library('migration');
-
-        if (empty($type))
-        {
-            $type = CLI::prompt("Migration group to refresh?", $this->migration->default_migration_path());
-
-            if (empty($type))
-            {
-                return $silent ? false : CLI::error("\tYou must supply a group to refresh.");
-            }
-        }
-
-        // We need to append 'mod:' to properly handle modules, if
-        // the $type is not one of the recognized migration groups.
-        $this->config->load('migration');
-        $groups = config_item('migration_paths');
-        $groups = array_keys($groups);
-
-        // If it's not in the groups list, then assume it's a module.
-        if (! in_array($type, $groups))
-        {
-            if (strpos($type, 'mod:') !== 0)
-            {
-                $type = 'mod:'. $type;
-            }
-        }
-
-        unset($groups);
-
-        // Get our stats on the migrations
-        $latest = $this->migration->get_latest($type);
-        $latest = empty($latest) ? 0 : substr($latest, 0, strpos($latest, '_'));
-
-        if (empty($latest)) {
-            return CLI::write("\tNo migrations found.", 'yellow');
-        }
-
-        $current = $this->migration->get_version($type);
-
-        // Already at the desired version?
-        if ((! is_null($to) && $current == $to) OR (is_null($to) && $current == $latest))
-        {
-            return $silent ? true : CLI::write("\tDatabase is already at the desired version ({$current})", 'yellow');
-        }
-
-        $target = is_null($to) ? $latest : $to;
-
-        // Just to be safe, verify with the user they want to migrate
-        // to the latest version.
-        if (is_null($to)) {
-            // If we're in silent mode, don't prompt, just go to the latest...
-            if (! $silent) {
-                $go_ahead = CLI::prompt('Migrate to the latest available version?', array('y', 'n'));
-
-                if ($go_ahead == 'n') {
-                    return CLI::write('Bailing...', 'yellow');
-                }
-            }
-
-            if (! $this->migration->latest($type)) {
-                return CLI::error("\n\tERROR: " . $this->migration->error_string() . "\n");
-            }
-        } else {
-            if ($this->migration->version($type, $to) === false) {
-                return CLI::error("\n\tERROR: " . $this->migration->error_string() . "\n");
-            }
-        }
-
-        return $silent ? true :
-            CLI::write("\n\tSuccessfully migrated database from version {$current} to {$target}.\n", 'green');
-    }
-
-    //--------------------------------------------------------------------
-
-    /**
-     * Performs a migration that does not prompt for any information.
-     * Suitable for use within automated scripts that can't be
-     * bothered with answering questions.
-     *
-     * @param string $type 'app', 'myth', 'all' or {module_name}
-     * @param null $to
-     * @return bool|void
-     */
-    public function quietMigrate($type='app', $to = null)
-    {
-        return $this->migrate($type, $to, true);
-    }
-
-    //--------------------------------------------------------------------
-
-
-    /**
-     * Migrates the database back to 0, then back up to the latest version.
-     *
-     * @param string $type  The group or module to refresh.
-     * @return mixed
-     */
-    public function refresh($type=null)
-    {
-        $this->load->library('migration');
-
-        if (empty($type))
-        {
-            $type = CLI::prompt("Migration group to refresh?", $this->migration->default_migration_path());
-
-            if (empty($type))
-            {
-                return CLI::error("\tYou must supply a group to refresh.");
-            }
-        }
-
-        if ($this->migration->version($type, 0) === false) {
-            return CLI::error("\tERROR: " . $this->migration->error_string());
-        }
-
-        CLI::write(CLI::color("\tCleared the database.", 'green'));
-
-        if ($this->migration->latest($type) === false) {
-            return CLI::error("\tERROR: " . $this->migration->error_string());
-        }
-
-        CLI::write("\tRe-installed the database to the latest migration.", 'green');
-    }
-
-    //--------------------------------------------------------------------
-
-    /**
-     * Creates a new migration file ready to be used.
-     *
-     * @param $name
-     */
-    public function newMigration($name = null, $type = 'app')
-    {
-        if (empty($name)) {
-            $name = CLI::prompt('Migration name? ');
-
-            if (empty($name)) {
-                return CLI::error("\tYou must provide a migration name.", 'red');
-            }
-        }
-
-        $this->load->library('migration');
-
-        $path = $this->migration->determine_migration_path($type);
-
-        // Does the alias path exist in our config?
-        if (! $path) {
-            return CLI::error("\tThe migration path for '{$type}' does not exist.'");
-        }
-
-        // Does the path really exist?
-        if (! is_dir($path)) {
-            return CLI::error("\tThe path for '{$type}' is not a directory.");
-        }
-
-        // Is the folder writeable?
-        if (! is_writeable($path)) {
-            return CLI::error("\tThe folder for '{$type}' migrations is not writeable.");
-        }
-
-        $file = $this->migration->make_name($name);
-
-        $path = rtrim($path, '/') .'/'. $file;
-
-        $contents = <<<EOT
+	protected $descriptions = [
+		'migrate'       => ['migrate [$to]',        'Runs the migrations up or down until schema at version \$to'],
+		'quietMigrate'  => ['quiteMigrate [$to]',   'Same as migrate but without any feedback.'],
+		'refresh'       => ['refresh',              'Runs migrations back to version 0 (uninstall) and then back to the most recent migration.'],
+		'newMigration'  => ['newMigration [$name]', 'Creates a new migration file.'],
+		'seed'          => ['seed [$name]',         'Runs the named database seeder.']
+	];
+
+	protected $long_descriptions = [
+		'migrate'       => '',
+		'quietMigrate'  => '',
+		'refresh'       => '',
+		'newMigration'  => '',
+		'seed'          => ''
+	];
+
+	//-------------------------------------------------------------------
+
+	//--------------------------------------------------------------------
+	// Migration Methods
+	//--------------------------------------------------------------------
+
+	/**
+	 * Provides a command-line interface to the migration scripts.
+	 * If no $to is provided, will migrate to the latest version.
+	 *
+	 * Example:
+	 *      > php index.php database migrate
+	 *
+	 * @param string $type 'app', 'myth', 'all' or {module_name}
+	 * @param null $to
+	 * @param bool $silent If TRUE, will NOT display any prompts for verification.
+	 * @return bool|void
+	 */
+	public function migrate($type=null, $to = null, $silent = false)
+	{
+		$this->load->library('migration');
+
+		if (empty($type))
+		{
+			$type = CLI::prompt("Migration group to refresh?", $this->migration->default_migration_path());
+
+			if (empty($type))
+			{
+				return $silent ? false : CLI::error("\tYou must supply a group to refresh.");
+			}
+		}
+
+		// We need to append 'mod:' to properly handle modules, if
+		// the $type is not one of the recognized migration groups.
+		$this->config->load('migration');
+		$groups = config_item('migration_paths');
+		$groups = array_keys($groups);
+
+		// If it's not in the groups list, then assume it's a module.
+		if (! in_array($type, $groups))
+		{
+			if (strpos($type, 'mod:') !== 0)
+			{
+				$type = 'mod:'. $type;
+			}
+		}
+
+		unset($groups);
+
+		// Get our stats on the migrations
+		$latest = $this->migration->get_latest($type);
+		$latest = empty($latest) ? 0 : substr($latest, 0, strpos($latest, '_'));
+
+		if (empty($latest)) {
+			return CLI::write("\tNo migrations found.", 'yellow');
+		}
+
+		$current = $this->migration->get_version($type);
+
+		// Already at the desired version?
+		if ((! is_null($to) && $current == $to) OR (is_null($to) && $current == $latest))
+		{
+			return $silent ? true : CLI::write("\tDatabase is already at the desired version ({$current})", 'yellow');
+		}
+
+		$target = is_null($to) ? $latest : $to;
+
+		// Just to be safe, verify with the user they want to migrate
+		// to the latest version.
+		if (is_null($to)) {
+			// If we're in silent mode, don't prompt, just go to the latest...
+			if (! $silent) {
+				$go_ahead = CLI::prompt('Migrate to the latest available version?', array('y', 'n'));
+
+				if ($go_ahead == 'n') {
+					return CLI::write('Bailing...', 'yellow');
+				}
+			}
+
+			if (! $this->migration->latest($type)) {
+				return CLI::error("\n\tERROR: " . $this->migration->error_string() . "\n");
+			}
+		} else {
+			if ($this->migration->version($type, $to) === false) {
+				return CLI::error("\n\tERROR: " . $this->migration->error_string() . "\n");
+			}
+		}
+
+		return $silent ? true :
+			CLI::write("\n\tSuccessfully migrated database from version {$current} to {$target}.\n", 'green');
+	}
+
+	//--------------------------------------------------------------------
+
+	/**
+	 * Performs a migration that does not prompt for any information.
+	 * Suitable for use within automated scripts that can't be
+	 * bothered with answering questions.
+	 *
+	 * @param string $type 'app', 'myth', 'all' or {module_name}
+	 * @param null $to
+	 * @return bool|void
+	 */
+	public function quietMigrate($type='app', $to = null)
+	{
+		return $this->migrate($type, $to, true);
+	}
+
+	//--------------------------------------------------------------------
+
+
+	/**
+	 * Migrates the database back to 0, then back up to the latest version.
+	 *
+	 * @param string $type  The group or module to refresh.
+	 * @return mixed
+	 */
+	public function refresh($type=null)
+	{
+		$this->load->library('migration');
+
+		if (empty($type))
+		{
+			$type = CLI::prompt("Migration group to refresh?", $this->migration->default_migration_path());
+
+			if (empty($type))
+			{
+				return CLI::error("\tYou must supply a group to refresh.");
+			}
+		}
+
+		if ($this->migration->version($type, 0) === false) {
+			return CLI::error("\tERROR: " . $this->migration->error_string());
+		}
+
+		CLI::write(CLI::color("\tCleared the database.", 'green'));
+
+		if ($this->migration->latest($type) === false) {
+			return CLI::error("\tERROR: " . $this->migration->error_string());
+		}
+
+		CLI::write("\tRe-installed the database to the latest migration.", 'green');
+	}
+
+	//--------------------------------------------------------------------
+
+	/**
+	 * Creates a new migration file ready to be used.
+	 *
+	 * @param $name
+	 */
+	public function newMigration($name = null, $type = 'app')
+	{
+		if (empty($name)) {
+			$name = CLI::prompt('Migration name? ');
+
+			if (empty($name)) {
+				return CLI::error("\tYou must provide a migration name.", 'red');
+			}
+		}
+
+		$this->load->library('migration');
+
+		$path = $this->migration->determine_migration_path($type);
+
+		// Does the alias path exist in our config?
+		if (! $path) {
+			return CLI::error("\tThe migration path for '{$type}' does not exist.'");
+		}
+
+		// Does the path really exist?
+		if (! is_dir($path)) {
+			return CLI::error("\tThe path for '{$type}' is not a directory.");
+		}
+
+		// Is the folder writeable?
+		if (! is_writeable($path)) {
+			return CLI::error("\tThe folder for '{$type}' migrations is not writeable.");
+		}
+
+		$file = $this->migration->make_name($name);
+
+		$path = rtrim($path, '/') .'/'. $file;
+
+		$contents = <<<EOT
 <?php
 
 /**
@@ -262,36 +262,36 @@ 
 
 }
 EOT;
-        $contents = str_replace('{name}', $name, $contents);
-        $contents = str_replace('{date}', date('Y-m-d H:i:s a'), $contents);
-        $contents = str_replace('{clean_name}', ucwords(str_replace('_', ' ', $name)), $contents);
+		$contents = str_replace('{name}', $name, $contents);
+		$contents = str_replace('{date}', date('Y-m-d H:i:s a'), $contents);
+		$contents = str_replace('{clean_name}', ucwords(str_replace('_', ' ', $name)), $contents);
 
-        $this->load->helper('file');
+		$this->load->helper('file');
 
-        if (write_file($path, $contents)) {
-            return CLI::write("\tNew migration created: " . CLI::color($file, 'yellow'), 'green');
-        }
+		if (write_file($path, $contents)) {
+			return CLI::write("\tNew migration created: " . CLI::color($file, 'yellow'), 'green');
+		}
 
-        return CLI::error("\tUnkown error trying to create migration: {$file}", 'red');
-    }
+		return CLI::error("\tUnkown error trying to create migration: {$file}", 'red');
+	}
 
-    //--------------------------------------------------------------------
+	//--------------------------------------------------------------------
 
-    //--------------------------------------------------------------------
-    // Seeding Methods
-    //--------------------------------------------------------------------
+	//--------------------------------------------------------------------
+	// Seeding Methods
+	//--------------------------------------------------------------------
 
-    /**
-     * Installs any database seeds stored in database/seeds. Seeds just need to
-     * extend the Seeder class and have a method named run.
-     */
-    public function seed($name = null)
-    {
-        $this->load->library('seeder');
+	/**
+	 * Installs any database seeds stored in database/seeds. Seeds just need to
+	 * extend the Seeder class and have a method named run.
+	 */
+	public function seed($name = null)
+	{
+		$this->load->library('seeder');
 
-        $this->seeder->call($name);
-    }
+		$this->seeder->call($name);
+	}
 
-    //--------------------------------------------------------------------
+	//--------------------------------------------------------------------
 
 }

Spacing +22 added lines, -23 removed lines

@@ -36,11 +36,11 @@ 
 {
 
     protected $descriptions = [
-        'migrate'       => ['migrate [$to]',        'Runs the migrations up or down until schema at version \$to'],
-        'quietMigrate'  => ['quiteMigrate [$to]',   'Same as migrate but without any feedback.'],
-        'refresh'       => ['refresh',              'Runs migrations back to version 0 (uninstall) and then back to the most recent migration.'],
+        'migrate'       => ['migrate [$to]', 'Runs the migrations up or down until schema at version \$to'],
+        'quietMigrate'  => ['quiteMigrate [$to]', 'Same as migrate but without any feedback.'],
+        'refresh'       => ['refresh', 'Runs migrations back to version 0 (uninstall) and then back to the most recent migration.'],
         'newMigration'  => ['newMigration [$name]', 'Creates a new migration file.'],
-        'seed'          => ['seed [$name]',         'Runs the named database seeder.']
+        'seed'          => ['seed [$name]', 'Runs the named database seeder.']
     ];
 
     protected $long_descriptions = [
@@ -69,7 +69,7 @@ 
      * @param bool $silent If TRUE, will NOT display any prompts for verification.
      * @return bool|void
      */
-    public function migrate($type=null, $to = null, $silent = false)
+    public function migrate($type = null, $to = null, $silent = false)
     {
         $this->load->library('migration');
 
@@ -90,11 +90,11 @@ 
         $groups = array_keys($groups);
 
         // If it's not in the groups list, then assume it's a module.
-        if (! in_array($type, $groups))
+        if ( ! in_array($type, $groups))
         {
             if (strpos($type, 'mod:') !== 0)
             {
-                $type = 'mod:'. $type;
+                $type = 'mod:'.$type;
             }
         }
 
@@ -111,7 +111,7 @@ 
         $current = $this->migration->get_version($type);
 
         // Already at the desired version?
-        if ((! is_null($to) && $current == $to) OR (is_null($to) && $current == $latest))
+        if (( ! is_null($to) && $current == $to) OR (is_null($to) && $current == $latest))
         {
             return $silent ? true : CLI::write("\tDatabase is already at the desired version ({$current})", 'yellow');
         }
@@ -122,7 +122,7 @@ 
         // to the latest version.
         if (is_null($to)) {
             // If we're in silent mode, don't prompt, just go to the latest...
-            if (! $silent) {
+            if ( ! $silent) {
                 $go_ahead = CLI::prompt('Migrate to the latest available version?', array('y', 'n'));
 
                 if ($go_ahead == 'n') {
@@ -130,17 +130,16 @@ 
                 }
             }
 
-            if (! $this->migration->latest($type)) {
-                return CLI::error("\n\tERROR: " . $this->migration->error_string() . "\n");
+            if ( ! $this->migration->latest($type)) {
+                return CLI::error("\n\tERROR: ".$this->migration->error_string()."\n");
             }
         } else {
             if ($this->migration->version($type, $to) === false) {
-                return CLI::error("\n\tERROR: " . $this->migration->error_string() . "\n");
+                return CLI::error("\n\tERROR: ".$this->migration->error_string()."\n");
             }
         }
 
-        return $silent ? true :
-            CLI::write("\n\tSuccessfully migrated database from version {$current} to {$target}.\n", 'green');
+        return $silent ? true : CLI::write("\n\tSuccessfully migrated database from version {$current} to {$target}.\n", 'green');
     }
 
     //--------------------------------------------------------------------
@@ -154,7 +153,7 @@ 
      * @param null $to
      * @return bool|void
      */
-    public function quietMigrate($type='app', $to = null)
+    public function quietMigrate($type = 'app', $to = null)
     {
         return $this->migrate($type, $to, true);
     }
@@ -168,7 +167,7 @@ 
      * @param string $type  The group or module to refresh.
      * @return mixed
      */
-    public function refresh($type=null)
+    public function refresh($type = null)
     {
         $this->load->library('migration');
 
@@ -183,13 +182,13 @@ 
         }
 
         if ($this->migration->version($type, 0) === false) {
-            return CLI::error("\tERROR: " . $this->migration->error_string());
+            return CLI::error("\tERROR: ".$this->migration->error_string());
         }
 
         CLI::write(CLI::color("\tCleared the database.", 'green'));
 
         if ($this->migration->latest($type) === false) {
-            return CLI::error("\tERROR: " . $this->migration->error_string());
+            return CLI::error("\tERROR: ".$this->migration->error_string());
         }
 
         CLI::write("\tRe-installed the database to the latest migration.", 'green');
@@ -217,23 +216,23 @@ 
         $path = $this->migration->determine_migration_path($type);
 
         // Does the alias path exist in our config?
-        if (! $path) {
+        if ( ! $path) {
             return CLI::error("\tThe migration path for '{$type}' does not exist.'");
         }
 
         // Does the path really exist?
-        if (! is_dir($path)) {
+        if ( ! is_dir($path)) {
             return CLI::error("\tThe path for '{$type}' is not a directory.");
         }
 
         // Is the folder writeable?
-        if (! is_writeable($path)) {
+        if ( ! is_writeable($path)) {
             return CLI::error("\tThe folder for '{$type}' migrations is not writeable.");
         }
 
         $file = $this->migration->make_name($name);
 
-        $path = rtrim($path, '/') .'/'. $file;
+        $path = rtrim($path, '/').'/'.$file;
 
         $contents = <<<EOT
 <?php
@@ -269,7 +268,7 @@ 
         $this->load->helper('file');
 
         if (write_file($path, $contents)) {
-            return CLI::write("\tNew migration created: " . CLI::color($file, 'yellow'), 'green');
+            return CLI::write("\tNew migration created: ".CLI::color($file, 'yellow'), 'green');
         }
 
         return CLI::error("\tUnkown error trying to create migration: {$file}", 'red');

myth/CIModules/database/libraries/Seeder.php

Indentation +63 added lines, -63 removed lines

@@ -39,92 +39,92 @@
  */
 class Seeder {
 
-    public $error_string    = '';
+	public $error_string    = '';
 
-    protected $ci;
+	protected $ci;
 
-    protected $is_cli = false;
+	protected $is_cli = false;
 
-    protected $db;
-    protected $dbforge;
+	protected $db;
+	protected $dbforge;
 
-    //--------------------------------------------------------------------
+	//--------------------------------------------------------------------
 
-    public function __construct ()
-    {
-        $this->ci =& get_instance();
+	public function __construct ()
+	{
+		$this->ci =& get_instance();
 
-        $this->is_cli = $this->ci->input->is_cli_request();
+		$this->is_cli = $this->ci->input->is_cli_request();
 
-        if ($this->is_cli)
-        {
-            $cli = new CLI();
-            $cli::_init();
-        }
+		if ($this->is_cli)
+		{
+			$cli = new CLI();
+			$cli::_init();
+		}
 
-        $this->ci->load->dbforge();
+		$this->ci->load->dbforge();
 
-        // Setup some convenience vars.
-        $this->db       =& $this->ci->db;
-        $this->dbforge  =& $this->ci->dbforge;
-    }
+		// Setup some convenience vars.
+		$this->db       =& $this->ci->db;
+		$this->dbforge  =& $this->ci->dbforge;
+	}
 
-    //--------------------------------------------------------------------
+	//--------------------------------------------------------------------
 
 
-    /**
-     * Run the database seeds. It's where the magic happens.
-     * This method MUST be overridden by child classes.
-     */
-    public function run ()
-    {
+	/**
+	 * Run the database seeds. It's where the magic happens.
+	 * This method MUST be overridden by child classes.
+	 */
+	public function run ()
+	{
 
-    }
+	}
 
-    //--------------------------------------------------------------------
+	//--------------------------------------------------------------------
 
-    /**
-     * Loads the class file and calls the run() method
-     * on the class.
-     *
-     * @param $class
-     */
-    public function call ($class)
-    {
-        if (empty($class))
-        {
-            // Ask the user...
-            $class = trim( CLI::prompt("Seeder name") );
+	/**
+	 * Loads the class file and calls the run() method
+	 * on the class.
+	 *
+	 * @param $class
+	 */
+	public function call ($class)
+	{
+		if (empty($class))
+		{
+			// Ask the user...
+			$class = trim( CLI::prompt("Seeder name") );
 
-            if (empty($class)) {
-                return CLI::error("\tNo Seeder was specified.");
-            }
-        }
+			if (empty($class)) {
+				return CLI::error("\tNo Seeder was specified.");
+			}
+		}
 
-        $path = APPPATH .'database/seeds/'. str_replace('.php', '', $class) .'.php';
+		$path = APPPATH .'database/seeds/'. str_replace('.php', '', $class) .'.php';
 
-        if ( ! is_file($path))
-        {
-            return CLI::error("\tUnable to find seed class: ". $class);
-        }
+		if ( ! is_file($path))
+		{
+			return CLI::error("\tUnable to find seed class: ". $class);
+		}
 
-        try {
-            require $path;
+		try {
+			require $path;
 
-            $seeder = new $class();
+			$seeder = new $class();
 
-            $seeder->run();
+			$seeder->run();
 
-            unset($seeder);
-        }
-        catch (\Exception $e)
-        {
-            show_error($e->getMessage(), $e->getCode());
-        }
+			unset($seeder);
+		}
+		catch (\Exception $e)
+		{
+			show_error($e->getMessage(), $e->getCode());
+		}
 
-        return Cli::write("\tSeeded: $class", 'green');
-    }
+		return Cli::write("\tSeeded: $class", 'green');
+	}
 
-    //--------------------------------------------------------------------
+	//--------------------------------------------------------------------
 
 }

Spacing +10 added lines, -10 removed lines

@@ -39,7 +39,7 @@ 
  */
 class Seeder {
 
-    public $error_string    = '';
+    public $error_string = '';
 
     protected $ci;
 
@@ -50,9 +50,9 @@ 
 
     //--------------------------------------------------------------------
 
-    public function __construct ()
+    public function __construct()
     {
-        $this->ci =& get_instance();
+        $this->ci = & get_instance();
 
         $this->is_cli = $this->ci->input->is_cli_request();
 
@@ -65,8 +65,8 @@ 
         $this->ci->load->dbforge();
 
         // Setup some convenience vars.
-        $this->db       =& $this->ci->db;
-        $this->dbforge  =& $this->ci->dbforge;
+        $this->db       = & $this->ci->db;
+        $this->dbforge  = & $this->ci->dbforge;
     }
 
     //--------------------------------------------------------------------
@@ -76,7 +76,7 @@ 
      * Run the database seeds. It's where the magic happens.
      * This method MUST be overridden by child classes.
      */
-    public function run ()
+    public function run()
     {
 
     }
@@ -89,23 +89,23 @@ 
      *
      * @param $class
      */
-    public function call ($class)
+    public function call($class)
     {
         if (empty($class))
         {
             // Ask the user...
-            $class = trim( CLI::prompt("Seeder name") );
+            $class = trim(CLI::prompt("Seeder name"));
 
             if (empty($class)) {
                 return CLI::error("\tNo Seeder was specified.");
             }
         }
 
-        $path = APPPATH .'database/seeds/'. str_replace('.php', '', $class) .'.php';
+        $path = APPPATH.'database/seeds/'.str_replace('.php', '', $class).'.php';
 
         if ( ! is_file($path))
         {
-            return CLI::error("\tUnable to find seed class: ". $class);
+            return CLI::error("\tUnable to find seed class: ".$class);
         }
 
         try {

Braces +1 added lines, -2 removed lines

@@ -116,8 +116,7 @@
             $seeder->run();
 
             unset($seeder);
-        }
-        catch (\Exception $e)
+        } catch (\Exception $e)
         {
             show_error($e->getMessage(), $e->getCode());
         }

myth/CIModules/docs/config/docs.php

Indentation +2 added lines, -2 removed lines

@@ -57,8 +57,8 @@
 | if realpath cannot find/read the folder.
 */
 $config['docs.folders'] = [
-    'application'   => APPPATH .'docs',
-    'developer'     => APPPATH .'../myth/_docs_src'
+	'application'   => APPPATH .'docs',
+	'developer'     => APPPATH .'../myth/_docs_src'
 ];
 
 /*

Spacing +3 added lines, -3 removed lines

@@ -57,8 +57,8 @@ 
 | if realpath cannot find/read the folder.
 */
 $config['docs.folders'] = [
-    'application'   => APPPATH .'docs',
-    'developer'     => APPPATH .'../myth/_docs_src'
+    'application'   => APPPATH.'docs',
+    'developer'     => APPPATH.'../myth/_docs_src'
 ];
 
 /*
@@ -89,7 +89,7 @@ 
 | If you change it, ensure that it includes the period (.).
 */
 
-$config['docs.extension']    = '.md';
+$config['docs.extension'] = '.md';
 
 /*
  * If true, the 'developer' docs will be displayed in environments other than

myth/CIModules/docs/controllers/Docs.php

Spacing +10 added lines, -10 removed lines

@@ -75,9 +75,9 @@ 
         $this->load->helper('form');
         $this->load->helper('language');
 
-        $this->docbuilder = new \Myth\Docs\Builder( array('apppath' => APPPATH) );
+        $this->docbuilder = new \Myth\Docs\Builder(array('apppath' => APPPATH));
 
-        $formatter = function ($str) {
+        $formatter = function($str) {
             $converter = new \League\CommonMark\CommonMarkConverter();
             return $converter->convertToHtml($str);
         };
@@ -162,7 +162,7 @@ 
     {
         // Is displaying docs permitted for this environment?
         if (config_item('docs.permitted_environments')
-            && !in_array(ENVIRONMENT, config_item('docs.permitted_environments'))
+            && ! in_array(ENVIRONMENT, config_item('docs.permitted_environments'))
         ) {
             $this->setMessage(lang('docs_env_disabled'), 'error');
             redirect();
@@ -177,7 +177,7 @@ 
             $this->current_group = false;
         } // Are we allowed to show developer docs in this environment?
         elseif ($current_group == 'developer'
-                && !$this->showDevDocs
+                && ! $this->showDevDocs
                 && ENVIRONMENT != 'development'
         ) {
             if ($this->showAppDocs) {
@@ -216,8 +216,8 @@ 
 
         // If nothing left, then assign the default group and redirect to
         // a page we can do something with...
-        if (!count($segments)) {
-            redirect('docs/' . config_item('docs.default_group'));
+        if ( ! count($segments)) {
+            redirect('docs/'.config_item('docs.default_group'));
         }
 
         // Do we have a group specified? Bonfire Docs requires that a group
@@ -248,7 +248,7 @@ 
         $data = [];
 
         // Set the remaining data for the view
-        $data['docsDir'] = 'docs/' . $this->current_group . '/';
+        $data['docsDir'] = 'docs/'.$this->current_group.'/';
         $data['docsExt'] = config_item('docs.extension');
 
         $data['docMap'] = $this->docbuilder->buildDocumentMap($content);
@@ -267,7 +267,7 @@ 
      */
     private function buildTOC()
     {
-        $folder = $this->doc_folders[$this->current_group] . '/';
+        $folder = $this->doc_folders[$this->current_group].'/';
 
         $map = $this->docbuilder->buildTOC($folder);
 
@@ -291,11 +291,11 @@ 
         $docs_modules = array();
         foreach (\Bonfire\Modules::list_modules() as $module) {
             $ignored_folders = array();
-            $path            = \Bonfire\Modules::path($module) . $this->docsDir;
+            $path            = \Bonfire\Modules::path($module).$this->docsDir;
 
             // If these are developer docs, add the folder to the path.
             if ($this->current_group == $this->docsTypeBf) {
-                $path .= '/' . $this->docsTypeBf;
+                $path .= '/'.$this->docsTypeBf;
             } // For Application docs, ignore the 'developers' folder.
             else {
                 $ignored_folders[] = $this->docsTypeBf;

Indentation +259 added lines, -259 removed lines

@@ -33,284 +33,284 @@
 class Docs extends \Myth\Controllers\ThemedController
 {
 
-    protected $ignoreFiles = array('_404.md');
+	protected $ignoreFiles = array('_404.md');
 
-    protected $tocFile;
+	protected $tocFile;
 
-    protected $doc_folders = [];
+	protected $doc_folders = [];
 
-    protected $current_group = null;
+	protected $current_group = null;
 
-    protected $current_path = null;
+	protected $current_path = null;
 
-    private $showAppDocs;
+	private $showAppDocs;
 
-    private $showDevDocs;
+	private $showDevDocs;
 
-    protected $theme = 'docs';
+	protected $theme = 'docs';
 
-    protected $auto_escape = false;
+	protected $auto_escape = false;
 
-    //--------------------------------------------------------------------------
+	//--------------------------------------------------------------------------
 
-    /**
-     * Constructor
-     *
-     * @return \Docs
-     */
-    public function __construct()
-    {
-        parent::__construct();
+	/**
+	 * Constructor
+	 *
+	 * @return \Docs
+	 */
+	public function __construct()
+	{
+		parent::__construct();
 
-        $this->load->config('docs');
-        $this->lang->load('docs');
+		$this->load->config('docs');
+		$this->lang->load('docs');
 
-        // Save our folders
-        $this->doc_folders = config_item('docs.folders');
+		// Save our folders
+		$this->doc_folders = config_item('docs.folders');
 
-        list($this->current_group, $this->current_path) = $this->determineFromURL();
+		list($this->current_group, $this->current_path) = $this->determineFromURL();
 
-        $this->determineVisibleGroups($this->current_group, $this->current_path);
+		$this->determineVisibleGroups($this->current_group, $this->current_path);
 
-        $this->load->helper('form');
-        $this->load->helper('language');
+		$this->load->helper('form');
+		$this->load->helper('language');
 
-        $this->docbuilder = new \Myth\Docs\Builder( array('apppath' => APPPATH) );
+		$this->docbuilder = new \Myth\Docs\Builder( array('apppath' => APPPATH) );
 
-        $formatter = function ($str) {
-            $converter = new \League\CommonMark\CommonMarkConverter();
-            return $converter->convertToHtml($str);
-        };
-        $this->docbuilder->registerFormatter($formatter, true);
-    }
+		$formatter = function ($str) {
+			$converter = new \League\CommonMark\CommonMarkConverter();
+			return $converter->convertToHtml($str);
+		};
+		$this->docbuilder->registerFormatter($formatter, true);
+	}
 
-    //--------------------------------------------------------------------
+	//--------------------------------------------------------------------
 
-    /**
-     * Display the list of documents available and the current document
-     *
-     * @return void
-     */
-    public function index()
-    {
-        $data = array();
+	/**
+	 * Display the list of documents available and the current document
+	 *
+	 * @return void
+	 */
+	public function index()
+	{
+		$data = array();
 
-        // Make sure the builder knows where to look
-        foreach ($this->doc_folders as $alias => $folder) {
-            $this->docbuilder->addDocFolder($alias, $folder);
-        }
-
-        try {
-            $content = $this->docbuilder->readPage($this->current_path, $this->current_group);
-            $content = $this->docbuilder->postProcess($content, site_url(), current_url());
-
-            $data['sidebar'] = $this->buildSidebar($content);
-            $data['toc']     = $this->buildTOC();
-            $data['content'] = $content;
-            $data['page_title'] = $this->docbuilder->pageTitle();
-        } catch (Exception $e) {
-            $this->setMessage($e->getMessage(), 'warning');
-        }
-
-        $this->render($data, config_item('docs.cache_time'));
-    }
-
-    //--------------------------------------------------------------------
-
-    /**
-     * Display search results and handles the search itself.
-     *
-     * @return void
-     */
-    public function search()
-    {
-        $this->benchmark->mark('search_start');
-        $this->docsearch = new \Myth\Docs\Search();
-        $this->load->helper('markdown_extended');
-        $this->docsearch->registerFormatter('MarkdownExtended', true);
-
-        $data = array();
-
-        $terms = $this->input->post('search_terms');
-
-        if ($terms) {
-            $search_folders = $this->doc_folders;
-
-            $data['results'] = $this->docsearch->search($terms, $search_folders);
-        }
-
-        $this->benchmark->mark('search_end');
-
-        $data['search_time']  = $this->benchmark->elapsed_time('search_start', 'search_end');
-        $data['search_terms'] = $terms;
-        $data['page_title'] = 'Search Results';
-
-        $this->render($data);
-    }
-
-    //--------------------------------------------------------------------------
-    // Private Methods
-    //--------------------------------------------------------------------------
-
-    /**
-     * Determines which groups are allowed to be viewed by the current system
-     * and the user/environment.
-     *
-     * todo Allow docs groups to be shown/hidden per-environment, using assoc-array for permitted environments
-     */
-    private function determineVisibleGroups($current_group, $current_path)
-    {
-        // Is displaying docs permitted for this environment?
-        if (config_item('docs.permitted_environments')
-            && !in_array(ENVIRONMENT, config_item('docs.permitted_environments'))
-        ) {
-            $this->setMessage(lang('docs_env_disabled'), 'danger');
-            redirect();
-        }
-
-        $this->showAppDocs = config_item('docs.show_app_docs');
-        $this->showDevDocs = config_item('docs.show_dev_docs');
-        $this->tocFile     = config_item('docs.toc_file') ?: '_toc.ini';
-
-        // Make sure we can still get to the search method.
-        if ($current_group == 'search') {
-            $this->current_group = false;
-        } // Are we allowed to show developer docs in this environment?
-        elseif ($current_group == 'developer'
-                && !$this->showDevDocs
-                && ENVIRONMENT != 'development'
-        ) {
-            if ($this->showAppDocs) {
-                $this->setMessage(lang('docs_not_allowed_dev'), 'warning');
-
-                redirect('docs/application');
-            }
-
-            show_error(lang('docs_not_allowed'));
-        }
-    }
-
-    //--------------------------------------------------------------------
-
-    /**
-     * Determines the current doc group and file path from the current URL.
-     *
-     * Returns an array with the group and file path in the 0 and 1 positions, respectively.
-     *
-     * @return array
-     */
-    private function determineFromURL()
-    {
-        $return = [
-            '', // Group
-            '', // File Path
-        ];
-
-        $segments = $this->uri->segment_array();
-
-        // Remove the 'docs' from the array
-        // for now, we assume this is the first one
-        // since that is how Bonfire is setup to show docs
-        // @todo Make it so the path can be modified and this still works.
-        array_shift($segments);
-
-        // If nothing left, then assign the default group and redirect to
-        // a page we can do something with...
-        if (!count($segments)) {
-            redirect('docs/' . config_item('docs.default_group'));
-        }
-
-        // Do we have a group specified? Bonfire Docs requires that a group
-        // be part of the URI so it should be the first element on the array.
-        $return[0] = array_shift($segments);
-
-        // If there's any more left, then join them together and they'll
-        // form the path to the file. This will allow for subfolders with the
-        // docs folder itself.
-        $return[1] = count($segments) ? implode('/', $segments) : 'index';
-
-        return $return;
-    }
-
-    //--------------------------------------------------------------------
-
-    /**
-     * Builds a TOC for the sidebar out of files found in the following folders:
-     *      - application/docs
-     *      - bonfire/docs
-     *      - {module}/docs
-     *
-     * @param $content  The HTML generated for the page content.
-     * @return string   The HTML for the sidebar.
-     */
-    private function buildSidebar(&$content)
-    {
-        $data = [];
-
-        // Set the remaining data for the view
-        $data['docsDir'] = 'docs/' . $this->current_group . '/';
-        $data['docsExt'] = config_item('docs.extension');
-
-        $data['docMap'] = $this->docbuilder->buildDocumentMap($content);
-
-        return $this->docbuilder->postProcess(
-            $this->load->view('docs/_document_map', $data, true),
-            site_url(),
-            current_url()
-        );
-    }
-
-    //--------------------------------------------------------------------
-
-    /**
-     * Builds out the nested lists of items that are needed
-     */
-    private function buildTOC()
-    {
-        $folder = $this->doc_folders[$this->current_group] . '/';
-
-        $map = $this->docbuilder->buildTOC($folder);
-
-        return $this->docbuilder->postProcess(
-            $this->load->view('docs/_toc', ['map' => $map], true),
-            site_url(),
-            current_url()
-        );
-    }
-
-    //--------------------------------------------------------------------
-
-    /**
-     * Checks all modules to see if they include docs and prepares their doc
-     * information for use in the sidebar.
-     *
-     * @return array
-     */
-    private function get_module_docs()
-    {
-        $docs_modules = array();
-        foreach (\Bonfire\Modules::list_modules() as $module) {
-            $ignored_folders = array();
-            $path            = \Bonfire\Modules::path($module) . $this->docsDir;
-
-            // If these are developer docs, add the folder to the path.
-            if ($this->current_group == $this->docsTypeBf) {
-                $path .= '/' . $this->docsTypeBf;
-            } // For Application docs, ignore the 'developers' folder.
-            else {
-                $ignored_folders[] = $this->docsTypeBf;
-            }
-
-            if (is_dir($path)) {
-                $files = $this->get_folder_files($path, $module, $ignored_folders);
-                if (is_array($files) && count($files)) {
-                    $docs_modules[$module] = $files;
-                }
-            }
-        }
-
-        return $docs_modules;
-    }
-    //--------------------------------------------------------------------
+		// Make sure the builder knows where to look
+		foreach ($this->doc_folders as $alias => $folder) {
+			$this->docbuilder->addDocFolder($alias, $folder);
+		}
+
+		try {
+			$content = $this->docbuilder->readPage($this->current_path, $this->current_group);
+			$content = $this->docbuilder->postProcess($content, site_url(), current_url());
+
+			$data['sidebar'] = $this->buildSidebar($content);
+			$data['toc']     = $this->buildTOC();
+			$data['content'] = $content;
+			$data['page_title'] = $this->docbuilder->pageTitle();
+		} catch (Exception $e) {
+			$this->setMessage($e->getMessage(), 'warning');
+		}
+
+		$this->render($data, config_item('docs.cache_time'));
+	}
+
+	//--------------------------------------------------------------------
+
+	/**
+	 * Display search results and handles the search itself.
+	 *
+	 * @return void
+	 */
+	public function search()
+	{
+		$this->benchmark->mark('search_start');
+		$this->docsearch = new \Myth\Docs\Search();
+		$this->load->helper('markdown_extended');
+		$this->docsearch->registerFormatter('MarkdownExtended', true);
+
+		$data = array();
+
+		$terms = $this->input->post('search_terms');
+
+		if ($terms) {
+			$search_folders = $this->doc_folders;
+
+			$data['results'] = $this->docsearch->search($terms, $search_folders);
+		}
+
+		$this->benchmark->mark('search_end');
+
+		$data['search_time']  = $this->benchmark->elapsed_time('search_start', 'search_end');
+		$data['search_terms'] = $terms;
+		$data['page_title'] = 'Search Results';
+
+		$this->render($data);
+	}
+
+	//--------------------------------------------------------------------------
+	// Private Methods
+	//--------------------------------------------------------------------------
+
+	/**
+	 * Determines which groups are allowed to be viewed by the current system
+	 * and the user/environment.
+	 *
+	 * todo Allow docs groups to be shown/hidden per-environment, using assoc-array for permitted environments
+	 */
+	private function determineVisibleGroups($current_group, $current_path)
+	{
+		// Is displaying docs permitted for this environment?
+		if (config_item('docs.permitted_environments')
+			&& !in_array(ENVIRONMENT, config_item('docs.permitted_environments'))
+		) {
+			$this->setMessage(lang('docs_env_disabled'), 'danger');
+			redirect();
+		}
+
+		$this->showAppDocs = config_item('docs.show_app_docs');
+		$this->showDevDocs = config_item('docs.show_dev_docs');
+		$this->tocFile     = config_item('docs.toc_file') ?: '_toc.ini';
+
+		// Make sure we can still get to the search method.
+		if ($current_group == 'search') {
+			$this->current_group = false;
+		} // Are we allowed to show developer docs in this environment?
+		elseif ($current_group == 'developer'
+				&& !$this->showDevDocs
+				&& ENVIRONMENT != 'development'
+		) {
+			if ($this->showAppDocs) {
+				$this->setMessage(lang('docs_not_allowed_dev'), 'warning');
+
+				redirect('docs/application');
+			}
+
+			show_error(lang('docs_not_allowed'));
+		}
+	}
+
+	//--------------------------------------------------------------------
+
+	/**
+	 * Determines the current doc group and file path from the current URL.
+	 *
+	 * Returns an array with the group and file path in the 0 and 1 positions, respectively.
+	 *
+	 * @return array
+	 */
+	private function determineFromURL()
+	{
+		$return = [
+			'', // Group
+			'', // File Path
+		];
+
+		$segments = $this->uri->segment_array();
+
+		// Remove the 'docs' from the array
+		// for now, we assume this is the first one
+		// since that is how Bonfire is setup to show docs
+		// @todo Make it so the path can be modified and this still works.
+		array_shift($segments);
+
+		// If nothing left, then assign the default group and redirect to
+		// a page we can do something with...
+		if (!count($segments)) {
+			redirect('docs/' . config_item('docs.default_group'));
+		}
+
+		// Do we have a group specified? Bonfire Docs requires that a group
+		// be part of the URI so it should be the first element on the array.
+		$return[0] = array_shift($segments);
+
+		// If there's any more left, then join them together and they'll
+		// form the path to the file. This will allow for subfolders with the
+		// docs folder itself.
+		$return[1] = count($segments) ? implode('/', $segments) : 'index';
+
+		return $return;
+	}
+
+	//--------------------------------------------------------------------
+
+	/**
+	 * Builds a TOC for the sidebar out of files found in the following folders:
+	 *      - application/docs
+	 *      - bonfire/docs
+	 *      - {module}/docs
+	 *
+	 * @param $content  The HTML generated for the page content.
+	 * @return string   The HTML for the sidebar.
+	 */
+	private function buildSidebar(&$content)
+	{
+		$data = [];
+
+		// Set the remaining data for the view
+		$data['docsDir'] = 'docs/' . $this->current_group . '/';
+		$data['docsExt'] = config_item('docs.extension');
+
+		$data['docMap'] = $this->docbuilder->buildDocumentMap($content);
+
+		return $this->docbuilder->postProcess(
+			$this->load->view('docs/_document_map', $data, true),
+			site_url(),
+			current_url()
+		);
+	}
+
+	//--------------------------------------------------------------------
+
+	/**
+	 * Builds out the nested lists of items that are needed
+	 */
+	private function buildTOC()
+	{
+		$folder = $this->doc_folders[$this->current_group] . '/';
+
+		$map = $this->docbuilder->buildTOC($folder);
+
+		return $this->docbuilder->postProcess(
+			$this->load->view('docs/_toc', ['map' => $map], true),
+			site_url(),
+			current_url()
+		);
+	}
+
+	//--------------------------------------------------------------------
+
+	/**
+	 * Checks all modules to see if they include docs and prepares their doc
+	 * information for use in the sidebar.
+	 *
+	 * @return array
+	 */
+	private function get_module_docs()
+	{
+		$docs_modules = array();
+		foreach (\Bonfire\Modules::list_modules() as $module) {
+			$ignored_folders = array();
+			$path            = \Bonfire\Modules::path($module) . $this->docsDir;
+
+			// If these are developer docs, add the folder to the path.
+			if ($this->current_group == $this->docsTypeBf) {
+				$path .= '/' . $this->docsTypeBf;
+			} // For Application docs, ignore the 'developers' folder.
+			else {
+				$ignored_folders[] = $this->docsTypeBf;
+			}
+
+			if (is_dir($path)) {
+				$files = $this->get_folder_files($path, $module, $ignored_folders);
+				if (is_array($files) && count($files)) {
+					$docs_modules[$module] = $files;
+				}
+			}
+		}
+
+		return $docs_modules;
+	}
+	//--------------------------------------------------------------------
 
 }

myth/CIModules/docs/views/_sidebar.php

Spacing +4 added lines, -4 removed lines

@@ -7,12 +7,12 @@ 
                         <div class="nav-header"><?php echo $file; ?></div>
                         <ul class="nav">
                             <?php foreach ($name as $line => $namer) : ?>
-                            <li><?php echo anchor($docsDir . str_replace($docsExt, '', $line), $namer); ?></li>
+                            <li><?php echo anchor($docsDir.str_replace($docsExt, '', $line), $namer); ?></li>
                             <?php endforeach; ?>
                         </ul>
                     </li>
                 <?php else : ?>
-                    <li><?php echo anchor($docsDir . str_replace($docsExt, '', $file), $name); ?></li>
+                    <li><?php echo anchor($docsDir.str_replace($docsExt, '', $file), $name); ?></li>
                 <?php endif ?>
             <?php endforeach ?>
         <?php else : ?>
@@ -29,12 +29,12 @@ 
                         <div class='nav-header'><?php echo $module; ?></div>
                         <ul class='nav'>
                         <?php foreach ($mod_files as $fileName => $title) : ?>
-                            <li><?php echo anchor(site_url($docsDir . '/' . str_replace($docsExt, '', $fileName)), ucwords($title)); ?></li>
+                            <li><?php echo anchor(site_url($docsDir.'/'.str_replace($docsExt, '', $fileName)), ucwords($title)); ?></li>
                         <?php endforeach; ?>
                         </ul>
                     </li>
                 <?php else : ?>
-                    <li class='parent'><?php echo anchor(site_url($docsDir . '/' . str_replace($docsExt, '', $module)), ucwords(str_replace('_', ' ', $module))); ?></li>
+                    <li class='parent'><?php echo anchor(site_url($docsDir.'/'.str_replace($docsExt, '', $module)), ucwords(str_replace('_', ' ', $module))); ?></li>
                 <?php endif ?>
             <?php endforeach ?>
         <?php endif ?>

Braces +15 added lines, -6 removed lines

@@ -11,12 +11,18 @@ 
                             <?php endforeach; ?>
                         </ul>
                     </li>
-                <?php else : ?>
-                    <li><?php echo anchor($docsDir . str_replace($docsExt, '', $file), $name); ?></li>
+                <?php else {
+	: ?>
+                    <li><?php echo anchor($docsDir . str_replace($docsExt, '', $file), $name);
+}
+?></li>
                 <?php endif ?>
             <?php endforeach ?>
-        <?php else : ?>
-            <p class="text-center"><?php echo lang('docs_not_found'); ?></p>
+        <?php else {
+	: ?>
+            <p class="text-center"><?php echo lang('docs_not_found');
+}
+?></p>
         <?php endif ?>
 
         <?php if ( ! empty($module_docs) && is_array($module_docs)) : ?>
@@ -33,8 +39,11 @@ 
                         <?php endforeach; ?>
                         </ul>
                     </li>
-                <?php else : ?>
-                    <li class='parent'><?php echo anchor(site_url($docsDir . '/' . str_replace($docsExt, '', $module)), ucwords(str_replace('_', ' ', $module))); ?></li>
+                <?php else {
+	: ?>
+                    <li class='parent'><?php echo anchor(site_url($docsDir . '/' . str_replace($docsExt, '', $module)), ucwords(str_replace('_', ' ', $module)));
+}
+?></li>
                 <?php endif ?>
             <?php endforeach ?>
         <?php endif ?>

myth/CIModules/docs/views/index.php

Braces +10 added lines, -4 removed lines

@@ -2,15 +2,21 @@
     <div class="alert alert-info" style="margin-top: 40px;">
         <?php if (isset($notice)) : ?>
             <?= $notice; ?>
-        <?php else: ?>
-            <?php echo lang('docs_not_found'); ?>
+        <?php else {
+	: ?>
+            <?php echo lang('docs_not_found');
+}
+?>
         <?php endif; ?>
     </div>
 
-<?php else: ?>
+<?php else {
+	: ?>
 
     <div class="page">
-        <?php echo $content; ?>
+        <?php echo $content;
+}
+?>
     </div>
 
 <?php endif; ?>