ci-bonfire / Sprint

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; ?>

myth/CIModules/docs/views/search.php

Spacing +1 added lines, -1 removed lines

@@ -2,7 +2,7 @@
 <h1><?php echo lang('docs_search_results') ?></h1>
 
 <div class="well">
-    <?php echo form_open( current_url(), 'class="form-inline"'); ?>
+    <?php echo form_open(current_url(), 'class="form-inline"'); ?>
         <input type="text" name="search_terms" class="form-control" style="width: 85%" value="<?php echo set_value('search_terms', $search_terms) ?>" />
         <input type="submit" name="submit" class="btn btn-primary" value="<?php echo lang('docs_search'); ?>"/>
     <?php echo form_close(); ?>

Braces +5 added lines, -2 removed lines

@@ -24,10 +24,13 @@
     </div>
     <?php endforeach; ?>
 
-<?php else: ?>
+<?php else {
+	: ?>
 
     <div class="alert alert-info">
-        <?php echo sprintf(lang('docs_no_results'), $search_terms); ?>
+        <?php echo sprintf(lang('docs_no_results'), $search_terms);
+}
+?>
     </div>
 
 <?php endif; ?>

myth/CIModules/forge/controllers/Forge.php

Indentation +168 added lines, -168 removed lines

@@ -34,133 +34,133 @@ 
 
 class Forge extends \Myth\Controllers\CLIController {
 
-    public function __construct()
-    {
-        parent::__construct();
+	public function __construct()
+	{
+		parent::__construct();
 
-        $this->load->config('forge');
-    }
+		$this->load->config('forge');
+	}
 
-    //--------------------------------------------------------------------
+	//--------------------------------------------------------------------
 
 
-    public function _remap($method, $params)
-    {
-        if (method_exists($this, $method))
-        {
-            call_user_func_array( [$this, $method], $params);
-        }
-        else
-        {
-	        $params = array_merge([CLI::cli_string()], $params);
+	public function _remap($method, $params)
+	{
+		if (method_exists($this, $method))
+		{
+			call_user_func_array( [$this, $method], $params);
+		}
+		else
+		{
+			$params = array_merge([CLI::cli_string()], $params);
 
-            call_user_func_array( [$this, 'run'], $params);
-        }
-    }
+			call_user_func_array( [$this, 'run'], $params);
+		}
+	}
     
-    //--------------------------------------------------------------------
-
-    /**
-     * Overrides to implement dynamic description building based on
-     * scanning the collections and grabbing the information from
-     * 'forge.php' files.
-     */
-    public function index()
-    {
-        $collections = config_item('forge.collections');
-
-        if (! is_array($collections) || ! count($collections) )
-        {
-            return CLI::error('No generator collections found.');
-        }
-
-        // We loop through each collection scanning
-        // for any generator folders that have a
-        // 'forge.php' file. For each one found
-        // we build out another section in our help commands
-        foreach ($collections as $alias => $path)
-        {
-            $path = rtrim($path, '/ ') .'/';
-            $folders = scandir($path);
-
-            $_descriptions = [];
-
-            foreach ($folders as $dir)
-            {
-                if ($dir == '.' || $dir == '..' || ! is_file($path . $dir .'/forge.php'))
-                {
-                    continue;
-                }
-
-                include $path . $dir .'/forge.php';
-
-                // Don't have valid arrays to work with? Move along...
-                if (! isset($descriptions))
-                {
-                    log_message('debug', '[Forge] Invalid forge.php file at: '. $path . $dir .'/forge.php');
-                    continue;
-                }
-
-                $_descriptions = array_merge($descriptions, $_descriptions);
-            }
-
-	        ksort($_descriptions);
-
-            CLI::new_line();
-            CLI::write(ucwords( str_replace('_', ' ', $alias)) .' Collection');
-            $this->sayDescriptions($_descriptions);
-        }
-    }
-
-    //--------------------------------------------------------------------
-
-    /**
-     * The primary method that calls the correct generator and
-     * makes it run.
-     */
-    public function run($command)
-    {
-	    $quiet = false;
-
-	    $segments = explode(" ", $command);
-
-	    // Get rid of the 'forge' command
-	    if ($segments[0] == 'forge') {
-		    array_shift( $segments );
-	    }
-
-	    $command = trim(str_ireplace("forge", '', array_shift($segments)));
+	//--------------------------------------------------------------------
+
+	/**
+	 * Overrides to implement dynamic description building based on
+	 * scanning the collections and grabbing the information from
+	 * 'forge.php' files.
+	 */
+	public function index()
+	{
+		$collections = config_item('forge.collections');
+
+		if (! is_array($collections) || ! count($collections) )
+		{
+			return CLI::error('No generator collections found.');
+		}
+
+		// We loop through each collection scanning
+		// for any generator folders that have a
+		// 'forge.php' file. For each one found
+		// we build out another section in our help commands
+		foreach ($collections as $alias => $path)
+		{
+			$path = rtrim($path, '/ ') .'/';
+			$folders = scandir($path);
+
+			$_descriptions = [];
+
+			foreach ($folders as $dir)
+			{
+				if ($dir == '.' || $dir == '..' || ! is_file($path . $dir .'/forge.php'))
+				{
+					continue;
+				}
+
+				include $path . $dir .'/forge.php';
+
+				// Don't have valid arrays to work with? Move along...
+				if (! isset($descriptions))
+				{
+					log_message('debug', '[Forge] Invalid forge.php file at: '. $path . $dir .'/forge.php');
+					continue;
+				}
+
+				$_descriptions = array_merge($descriptions, $_descriptions);
+			}
+
+			ksort($_descriptions);
+
+			CLI::new_line();
+			CLI::write(ucwords( str_replace('_', ' ', $alias)) .' Collection');
+			$this->sayDescriptions($_descriptions);
+		}
+	}
+
+	//--------------------------------------------------------------------
+
+	/**
+	 * The primary method that calls the correct generator and
+	 * makes it run.
+	 */
+	public function run($command)
+	{
+		$quiet = false;
+
+		$segments = explode(" ", $command);
+
+		// Get rid of the 'forge' command
+		if ($segments[0] == 'forge') {
+			array_shift( $segments );
+		}
+
+		$command = trim(str_ireplace("forge", '', array_shift($segments)));
 
 		$dir = $this->locateGenerator($command);
 
 		$class_name = ucfirst($command) .'Generator';
 
-	    if (! file_exists($dir . $class_name .'.php'))
-	    {
-		    return CLI::error("Generator file not found for: {$class_name}");
-	    }
+		if (! file_exists($dir . $class_name .'.php'))
+		{
+			return CLI::error("Generator file not found for: {$class_name}");
+		}
 
 		require_once $dir . $class_name .'.php';
 
-	    if (! class_exists($class_name, false))
-	    {
-		    return CLI::error("No class `{$class_name}` found in generator file.");
-	    }
+		if (! class_exists($class_name, false))
+		{
+			return CLI::error("No class `{$class_name}` found in generator file.");
+		}
 
-	    // Should we run the process quietly?
-	    if ( (CLI::option('q') || CLI::option('quiet')))
-	    {
-		    $quiet = true;
-	    }
+		// Should we run the process quietly?
+		if ( (CLI::option('q') || CLI::option('quiet')))
+		{
+			$quiet = true;
+		}
 
-	    CLI::write('Invoked '. CLI::color($class_name, 'yellow'));
+		CLI::write('Invoked '. CLI::color($class_name, 'yellow'));
 
 		$class = new $class_name();
 
-	    $class->run( $segments, $quiet );
-    }
+		$class->run( $segments, $quiet );
+	}
 
-    //--------------------------------------------------------------------
+	//--------------------------------------------------------------------
 
 	/**
 	 * Displays the readme file for a generator if it exists.
@@ -205,67 +205,67 @@ 
 	//--------------------------------------------------------------------
 
 
-    /**
-     * Overrides CLIController's version to support searching our
-     * collections for the help description.
-     *
-     * @param null $method
-     */
-    public function longDescribeMethod($method=null)
-    {
-	    $collections = config_item('forge.collections');
-
-	    if (! is_array($collections) || ! count($collections) )
-	    {
-		    return CLI::error('No generator collections found.');
-	    }
-
-	    // We loop through each collection scanning
-	    // for any generator folders that have a
-	    // 'forge.php' file. For each one found
-	    // we build out another section in our help commands
-	    foreach ($collections as $alias => $path)
-	    {
-
-		    $path = rtrim($path, '/ ') .'/';
-		    $folders = scandir($path);
-
-		    if (! $i = array_search(ucfirst($method), $folders))
-		    {
-			    continue;
-		    }
-
-		    $dir = $path . $folders[$i] .'/';
-
-		    if (! is_file($dir .'/forge.php'))
-		    {
-			    CLI::error("The {$method} command does not have any cli help available.");
-		    }
-
-		    include $dir .'/forge.php';
-
-		    // Don't have valid arrays to work with? Move along...
-		    if (! isset($long_description))
-		    {
-			    log_message('debug', '[Forge] Invalid forge.php file at: '. $dir .'/forge.php');
-			    continue;
-		    }
-
-		    if (empty($long_description))
-		    {
-			    return CLI::error("The {$method} command does not have an cli help available.");
-		    }
-
-		    CLI::new_line();
-		    CLI::write( CLI::color(ucfirst($method) .' Help', 'yellow') );
-		    return CLI::write( CLI::wrap($long_description, CLI::getWidth()) );
-	    }
-
-	    // Still here?
-	    CLI::error("No help found for command: {$method}");
-    }
-
-    //--------------------------------------------------------------------
+	/**
+	 * Overrides CLIController's version to support searching our
+	 * collections for the help description.
+	 *
+	 * @param null $method
+	 */
+	public function longDescribeMethod($method=null)
+	{
+		$collections = config_item('forge.collections');
+
+		if (! is_array($collections) || ! count($collections) )
+		{
+			return CLI::error('No generator collections found.');
+		}
+
+		// We loop through each collection scanning
+		// for any generator folders that have a
+		// 'forge.php' file. For each one found
+		// we build out another section in our help commands
+		foreach ($collections as $alias => $path)
+		{
+
+			$path = rtrim($path, '/ ') .'/';
+			$folders = scandir($path);
+
+			if (! $i = array_search(ucfirst($method), $folders))
+			{
+				continue;
+			}
+
+			$dir = $path . $folders[$i] .'/';
+
+			if (! is_file($dir .'/forge.php'))
+			{
+				CLI::error("The {$method} command does not have any cli help available.");
+			}
+
+			include $dir .'/forge.php';
+
+			// Don't have valid arrays to work with? Move along...
+			if (! isset($long_description))
+			{
+				log_message('debug', '[Forge] Invalid forge.php file at: '. $dir .'/forge.php');
+				continue;
+			}
+
+			if (empty($long_description))
+			{
+				return CLI::error("The {$method} command does not have an cli help available.");
+			}
+
+			CLI::new_line();
+			CLI::write( CLI::color(ucfirst($method) .' Help', 'yellow') );
+			return CLI::write( CLI::wrap($long_description, CLI::getWidth()) );
+		}
+
+		// Still here?
+		CLI::error("No help found for command: {$method}");
+	}
+
+	//--------------------------------------------------------------------
 
 	/**
 	 * Scans through the collections for the folder for this generator.

Spacing +36 added lines, -36 removed lines

@@ -48,13 +48,13 @@ 
     {
         if (method_exists($this, $method))
         {
-            call_user_func_array( [$this, $method], $params);
+            call_user_func_array([$this, $method], $params);
         }
         else
         {
 	        $params = array_merge([CLI::cli_string()], $params);
 
-            call_user_func_array( [$this, 'run'], $params);
+            call_user_func_array([$this, 'run'], $params);
         }
     }
     
@@ -69,7 +69,7 @@ 
     {
         $collections = config_item('forge.collections');
 
-        if (! is_array($collections) || ! count($collections) )
+        if ( ! is_array($collections) || ! count($collections))
         {
             return CLI::error('No generator collections found.');
         }
@@ -80,24 +80,24 @@ 
         // we build out another section in our help commands
         foreach ($collections as $alias => $path)
         {
-            $path = rtrim($path, '/ ') .'/';
+            $path = rtrim($path, '/ ').'/';
             $folders = scandir($path);
 
             $_descriptions = [];
 
             foreach ($folders as $dir)
             {
-                if ($dir == '.' || $dir == '..' || ! is_file($path . $dir .'/forge.php'))
+                if ($dir == '.' || $dir == '..' || ! is_file($path.$dir.'/forge.php'))
                 {
                     continue;
                 }
 
-                include $path . $dir .'/forge.php';
+                include $path.$dir.'/forge.php';
 
                 // Don't have valid arrays to work with? Move along...
-                if (! isset($descriptions))
+                if ( ! isset($descriptions))
                 {
-                    log_message('debug', '[Forge] Invalid forge.php file at: '. $path . $dir .'/forge.php');
+                    log_message('debug', '[Forge] Invalid forge.php file at: '.$path.$dir.'/forge.php');
                     continue;
                 }
 
@@ -107,7 +107,7 @@ 
 	        ksort($_descriptions);
 
             CLI::new_line();
-            CLI::write(ucwords( str_replace('_', ' ', $alias)) .' Collection');
+            CLI::write(ucwords(str_replace('_', ' ', $alias)).' Collection');
             $this->sayDescriptions($_descriptions);
         }
     }
@@ -126,38 +126,38 @@ 
 
 	    // Get rid of the 'forge' command
 	    if ($segments[0] == 'forge') {
-		    array_shift( $segments );
+		    array_shift($segments);
 	    }
 
 	    $command = trim(str_ireplace("forge", '', array_shift($segments)));
 
 		$dir = $this->locateGenerator($command);
 
-		$class_name = ucfirst($command) .'Generator';
+		$class_name = ucfirst($command).'Generator';
 
-	    if (! file_exists($dir . $class_name .'.php'))
+	    if ( ! file_exists($dir.$class_name.'.php'))
 	    {
 		    return CLI::error("Generator file not found for: {$class_name}");
 	    }
 
-		require_once $dir . $class_name .'.php';
+		require_once $dir.$class_name.'.php';
 
-	    if (! class_exists($class_name, false))
+	    if ( ! class_exists($class_name, false))
 	    {
 		    return CLI::error("No class `{$class_name}` found in generator file.");
 	    }
 
 	    // Should we run the process quietly?
-	    if ( (CLI::option('q') || CLI::option('quiet')))
+	    if ((CLI::option('q') || CLI::option('quiet')))
 	    {
 		    $quiet = true;
 	    }
 
-	    CLI::write('Invoked '. CLI::color($class_name, 'yellow'));
+	    CLI::write('Invoked '.CLI::color($class_name, 'yellow'));
 
 		$class = new $class_name();
 
-	    $class->run( $segments, $quiet );
+	    $class->run($segments, $quiet);
     }
 
     //--------------------------------------------------------------------
@@ -171,20 +171,20 @@ 
 	{
 		$dir = $this->locateGenerator($command);
 
-		if (! is_file($dir .'readme.txt'))
+		if ( ! is_file($dir.'readme.txt'))
 		{
 			return CLI::error('Unable to locate the readme.txt file.');
 		}
 
-		$lines = file($dir .'readme.txt');
+		$lines = file($dir.'readme.txt');
 
-		if (! is_array($lines) || ! count($lines))
+		if ( ! is_array($lines) || ! count($lines))
 		{
 			return CLI::error('The readme file does not have anything to display.');
 		}
 
 		$line_count = 0; // Total we're currently viewing.
-		$max_rows   = CLI::getHeight() -3;
+		$max_rows   = CLI::getHeight() - 3;
 
 		foreach ($lines as $line)
 		{
@@ -211,11 +211,11 @@ 
      *
      * @param null $method
      */
-    public function longDescribeMethod($method=null)
+    public function longDescribeMethod($method = null)
     {
 	    $collections = config_item('forge.collections');
 
-	    if (! is_array($collections) || ! count($collections) )
+	    if ( ! is_array($collections) || ! count($collections))
 	    {
 		    return CLI::error('No generator collections found.');
 	    }
@@ -227,27 +227,27 @@ 
 	    foreach ($collections as $alias => $path)
 	    {
 
-		    $path = rtrim($path, '/ ') .'/';
+		    $path = rtrim($path, '/ ').'/';
 		    $folders = scandir($path);
 
-		    if (! $i = array_search(ucfirst($method), $folders))
+		    if ( ! $i = array_search(ucfirst($method), $folders))
 		    {
 			    continue;
 		    }
 
-		    $dir = $path . $folders[$i] .'/';
+		    $dir = $path.$folders[$i].'/';
 
-		    if (! is_file($dir .'/forge.php'))
+		    if ( ! is_file($dir.'/forge.php'))
 		    {
 			    CLI::error("The {$method} command does not have any cli help available.");
 		    }
 
-		    include $dir .'/forge.php';
+		    include $dir.'/forge.php';
 
 		    // Don't have valid arrays to work with? Move along...
-		    if (! isset($long_description))
+		    if ( ! isset($long_description))
 		    {
-			    log_message('debug', '[Forge] Invalid forge.php file at: '. $dir .'/forge.php');
+			    log_message('debug', '[Forge] Invalid forge.php file at: '.$dir.'/forge.php');
 			    continue;
 		    }
 
@@ -257,8 +257,8 @@ 
 		    }
 
 		    CLI::new_line();
-		    CLI::write( CLI::color(ucfirst($method) .' Help', 'yellow') );
-		    return CLI::write( CLI::wrap($long_description, CLI::getWidth()) );
+		    CLI::write(CLI::color(ucfirst($method).' Help', 'yellow'));
+		    return CLI::write(CLI::wrap($long_description, CLI::getWidth()));
 	    }
 
 	    // Still here?
@@ -278,22 +278,22 @@ 
 	{
 		$collections = config_item('forge.collections');
 
-		if (! is_array($collections) || ! count($collections) )
+		if ( ! is_array($collections) || ! count($collections))
 		{
 			return CLI::error('No generator collections found.');
 		}
 
 		foreach ($collections as $alias => $path)
 		{
-			$path = rtrim($path, '/ ') .'/';
+			$path = rtrim($path, '/ ').'/';
 			$folders = scandir($path);
 
-			if (! $i = array_search(ucfirst($name), $folders))
+			if ( ! $i = array_search(ucfirst($name), $folders))
 			{
 				continue;
 			}
 
-			return $path . $folders[$i] .'/';
+			return $path.$folders[$i].'/';
 		}
 
 		return null;

Braces +1 added lines, -2 removed lines

@@ -253,8 +253,7 @@
             {
                 $this->vars[$k] = $escape ? esc($v, $context, $this->escaper) : $v;
             }
-        }
-        else
+        } else
         {
             $this->vars[$name] = $escape ? esc($value, $context, $this->escaper) : $value;
         }

myth/Controllers/BaseController.php

Indentation +7 added lines, -7 removed lines

@@ -100,7 +100,7 @@ 
 	{
 		parent::__construct();
 
-        $this->load->library('session');
+		$this->load->library('session');
 
 		$this->setupCache();
 
@@ -236,8 +236,8 @@ 
 		}
 
 		$this->output->enable_profiler( FALSE )
-		             ->set_content_type( 'text/plain' )
-		             ->set_output( $text );
+					 ->set_content_type( 'text/plain' )
+					 ->set_output( $text );
 	}
 
 	//--------------------------------------------------------------------
@@ -267,8 +267,8 @@ 
 		}
 
 		$this->output->enable_profiler( FALSE )
-		             ->set_content_type( 'application/json' )
-		             ->set_output( json_encode( $json ) );
+					 ->set_content_type( 'application/json' )
+					 ->set_output( json_encode( $json ) );
 	}
 
 	//--------------------------------------------------------------------
@@ -292,8 +292,8 @@ 
 		}
 
 		$this->output->enable_profiler( FALSE )
-		             ->set_content_type( 'application/x-javascript' )
-		             ->set_output( $js );
+					 ->set_content_type( 'application/x-javascript' )
+					 ->set_output( $js );
 	}
 
 	//--------------------------------------------------------------------

Spacing +50 added lines, -50 removed lines

@@ -31,7 +31,7 @@ 
  */
 
 /* PHP5 spl_autoload */
-spl_autoload_register( '\Myth\Modules::autoload' );
+spl_autoload_register('\Myth\Modules::autoload');
 
 /**
  * The following properties are used to provide autocomplete for IDE's.
@@ -110,7 +110,7 @@ 
 
 		$this->setupProfiler();
 
-		log_message( 'debug', get_class( $this ) . ' controller loaded.' );
+		log_message('debug', get_class($this).' controller loaded.');
 	}
 
 	//--------------------------------------------------------------------
@@ -131,18 +131,18 @@ 
 	{
 		// If the controller doesn't override cache type, grab the values from
 		// the defaults set in the start file.
-		if ( empty( $this->cache_type ) )
+		if (empty($this->cache_type))
 		{
-			$this->cache_type = $this->config->item( 'cache_type' );
+			$this->cache_type = $this->config->item('cache_type');
 		}
-		if ( empty( $this->backup_cache ) )
+		if (empty($this->backup_cache))
 		{
-			$this->backup_cache = $this->config->item( 'backup_cache_type' );
+			$this->backup_cache = $this->config->item('backup_cache_type');
 		}
 
 		// Make sure that caching is ALWAYS available throughout the app
 		// though it defaults to 'dummy' which won't actually cache.
-		$this->load->driver( 'cache', array( 'adapter' => $this->cache_type, 'backup' => $this->backup_cache ) );
+		$this->load->driver('cache', array('adapter' => $this->cache_type, 'backup' => $this->backup_cache));
 	}
 
 	//--------------------------------------------------------------------
@@ -153,15 +153,15 @@ 
 	 */
 	protected function autoload()
 	{
-		if ( ! is_null( $this->language_file ) )
+		if ( ! is_null($this->language_file))
 		{
-			$this->lang->load( $this->language_file );
+			$this->lang->load($this->language_file);
 		}
 
-		if ( ! is_null( $this->model_file ) )
+		if ( ! is_null($this->model_file))
 		{
 			$this->load->database();
-			$this->load->model( $this->model_file );
+			$this->load->model($this->model_file);
 		}
 	}
 
@@ -173,19 +173,19 @@ 
 	 */
 	protected function autoMigrate()
 	{
-		$migrations = config_item( 'auto_migrate' );
+		$migrations = config_item('auto_migrate');
 
-		if ( ! is_array( $migrations ) || ! count( $migrations ) )
+		if ( ! is_array($migrations) || ! count($migrations))
 		{
 			return;
 		}
 
-		$this->load->library( 'migration' );
+		$this->load->library('migration');
 
 		// Run all of our migrations for each group.
-		foreach ( $migrations as $group )
+		foreach ($migrations as $group)
 		{
-			$this->migration->latest( $group );
+			$this->migration->latest($group);
 		}
 	}
 
@@ -199,9 +199,9 @@ 
 		// The profiler is dealt with twice so that we can set
 		// things up to work correctly in AJAX methods using $this->render_json
 		// and it's cousins.
-		if ( $this->config->item( 'show_profiler' ) == TRUE )
+		if ($this->config->item('show_profiler') == TRUE)
 		{
-			$this->output->enable_profiler( TRUE );
+			$this->output->enable_profiler(TRUE);
 		}
 	}
 
@@ -223,21 +223,21 @@ 
 	 *
 	 * @return void [type]       [description]
 	 */
-	public function renderText( $text, $typography = FALSE )
+	public function renderText($text, $typography = FALSE)
 	{
 		// Note that, for now anyway, we don't do any cleaning of the text
 		// and leave that up to the client to take care of.
 
 		// However, we can auto_typogrify the text if we're asked nicely.
-		if ( $typography === TRUE )
+		if ($typography === TRUE)
 		{
-			$this->load->helper( 'typography' );
-			$text = auto_typography( $text );
+			$this->load->helper('typography');
+			$text = auto_typography($text);
 		}
 
-		$this->output->enable_profiler( FALSE )
-		             ->set_content_type( 'text/plain' )
-		             ->set_output( $text );
+		$this->output->enable_profiler(FALSE)
+		             ->set_content_type('text/plain')
+		             ->set_output($text);
 	}
 
 	//--------------------------------------------------------------------
@@ -253,22 +253,22 @@ 
 	 * @throws RenderException
 	 * @return void
 	 */
-	public function renderJSON( $json )
+	public function renderJSON($json)
 	{
-		if ( is_resource( $json ) )
+		if (is_resource($json))
 		{
-			throw new \RuntimeException( lang('bad_json_encode') );
+			throw new \RuntimeException(lang('bad_json_encode'));
 		}
 
-		if ( $this->config->item( 'show_profiler' ) )
+		if ($this->config->item('show_profiler'))
 		{
-			$this->load->library( 'profiler' );
+			$this->load->library('profiler');
 			$json['#sprint-profiler'] = $this->profiler->run();
 		}
 
-		$this->output->enable_profiler( FALSE )
-		             ->set_content_type( 'application/json' )
-		             ->set_output( json_encode( $json ) );
+		$this->output->enable_profiler(FALSE)
+		             ->set_content_type('application/json')
+		             ->set_output(json_encode($json));
 	}
 
 	//--------------------------------------------------------------------
@@ -284,16 +284,16 @@ 
 	 * @throws RenderException
 	 * @return void
 	 */
-	public function renderJS( $js = NULL )
+	public function renderJS($js = NULL)
 	{
-		if ( ! is_string( $js ) )
+		if ( ! is_string($js))
 		{
-			throw new \RuntimeException( lang('bad_javascript') );
+			throw new \RuntimeException(lang('bad_javascript'));
 		}
 
-		$this->output->enable_profiler( FALSE )
-		             ->set_content_type( 'application/x-javascript' )
-		             ->set_output( $js );
+		$this->output->enable_profiler(FALSE)
+		             ->set_content_type('application/x-javascript')
+		             ->set_output($js);
 	}
 
 	//--------------------------------------------------------------------
@@ -308,11 +308,11 @@ 
 	 */
 	public function renderRealtime()
 	{
-		if ( ob_get_level() > 0 )
+		if (ob_get_level() > 0)
 		{
 			end_end_flush();
 		}
-		ob_implicit_flush( TRUE );
+		ob_implicit_flush(TRUE);
 	}
 
 	//--------------------------------------------------------------------
@@ -326,21 +326,21 @@ 
 	 *
 	 * @param  string $location [description]
 	 */
-	public function ajaxRedirect( $location = '' )
+	public function ajaxRedirect($location = '')
 	{
-		$location = empty( $location ) ? '/' : $location;
+		$location = empty($location) ? '/' : $location;
 
-		if ( strpos( $location, '/' ) !== 0 || strpos( $location, '://' ) !== FALSE )
+		if (strpos($location, '/') !== 0 || strpos($location, '://') !== FALSE)
 		{
-			if ( ! function_exists( 'site_url' ) )
+			if ( ! function_exists('site_url'))
 			{
-				$this->load->helper( 'url' );
+				$this->load->helper('url');
 			}
 
-			$location = site_url( $location );
+			$location = site_url($location);
 		}
 
-		$this->render_json( array( 'location' => $location ) );
+		$this->render_json(array('location' => $location));
 	}
 
 	//--------------------------------------------------------------------
@@ -355,11 +355,11 @@ 
 	 *
 	 * @return mixed    The formatted JSON data, or NULL.
 	 */
-	public function getJSON( $format = 'object', $depth = 512 )
+	public function getJSON($format = 'object', $depth = 512)
 	{
 		$as_array = $format == 'array' ? TRUE : FALSE;
 
-		return json_decode( file_get_contents( 'php://input' ), $as_array, $depth );
+		return json_decode(file_get_contents('php://input'), $as_array, $depth);
 	}
 
 	//--------------------------------------------------------------------

myth/Controllers/CLIController.php

Indentation +138 added lines, -138 removed lines

@@ -41,144 +41,144 @@
  */
 class CLIController extends \CI_Controller {
 
-    /**
-     * Holds short descriptions for the public functions in this class.
-     * Each 'key' in the array should match the function name.
-     *
-     * @var array
-     */
-    protected $descriptions = [];
-
-    /**
-     * Holds long descriptions for the public functions in this class.
-     * Each 'key' in the array should match the function name.
-     * @var array
-     */
-    protected $long_descriptions = [];
-
-    //--------------------------------------------------------------------
-
-    /**
-     * Ensures that we are running on the CLI, and collects basic settings
-     * like collecting our command line arguments into a pretty array.
-     */
-    public function __construct()
-    {
-        parent::__construct();
-
-        // Restrict usage to the command line.
-        if (! is_cli() )
-        {
-            show_error( lang('cli_required') );
-        }
-
-        // Make sure the CLI library is loaded and ready.
+	/**
+	 * Holds short descriptions for the public functions in this class.
+	 * Each 'key' in the array should match the function name.
+	 *
+	 * @var array
+	 */
+	protected $descriptions = [];
+
+	/**
+	 * Holds long descriptions for the public functions in this class.
+	 * Each 'key' in the array should match the function name.
+	 * @var array
+	 */
+	protected $long_descriptions = [];
+
+	//--------------------------------------------------------------------
+
+	/**
+	 * Ensures that we are running on the CLI, and collects basic settings
+	 * like collecting our command line arguments into a pretty array.
+	 */
+	public function __construct()
+	{
+		parent::__construct();
+
+		// Restrict usage to the command line.
+		if (! is_cli() )
+		{
+			show_error( lang('cli_required') );
+		}
+
+		// Make sure the CLI library is loaded and ready.
 //        CLI::_init();
-    }
-
-    //--------------------------------------------------------------------
-
-    /**
-     * A default index method that all CLI Controllers can share. Will
-     * list all of the methods and their short descriptions, if available.
-     */
-    public function index()
-    {
-        CLI::new_line();
-        CLI::write( lang('cli.available_commands') );
-
-        $this->sayDescriptions($this->descriptions);
-
-        CLI::new_line();
-    }
-
-    //--------------------------------------------------------------------
-
-
-    /**
-     * Grabs the short description of a command, if it exists.
-     *
-     * @param null $method
-     */
-    public function describeMethod($method=null)
-    {
-        if (empty($this->descriptions[$method]))
-        {
-            return CLI::error( lang('cli.bad_description') );
-        }
-
-        CLI::write("\t{$this->descriptions[$method]}", 'yellow');
-    }
-
-    //--------------------------------------------------------------------
-
-    public function longDescribeMethod($method=null)
-    {
-        if (empty($this->long_descriptions[$method]))
-        {
-            return CLI::error( lang('cli.no_help') );
-        }
-
-        CLI::write("\t{$this->long_descriptions[$method]}", 'yellow');
-    }
-
-    //--------------------------------------------------------------------
-
-    //--------------------------------------------------------------------
-    // Private Methods
-    //--------------------------------------------------------------------
-
-    protected function sayDescriptions($descriptions)
-    {
-        $names      = array_keys($descriptions);
-        $syntaxes   = array_column($descriptions, 0);
-        $descs      = array_column($descriptions, 1);
-
-        // Pad each item to the same length
-        $names      = $this->padArray($names);
-        $syntaxes   = $this->padArray($syntaxes);
-
-        for ($i=0; $i < count($names); $i++)
-        {
-            $out = CLI::color($names[$i], 'yellow');
-
-            // The rest of the items stay default color.
-            if (isset($syntaxes[$i]))
-            {
-                $out .= $syntaxes[$i];
-            }
-
-            if (isset($descs[$i]))
-            {
-                $out .= CLI::wrap($descs[$i], 125, strlen($names[$i]) + strlen($syntaxes[$i]));
-            }
-
-            CLI::write($out);
-        }
-    }
-
-    //--------------------------------------------------------------------
-
-    /**
-     * Returns a new array where all of the string elements have
-     * been padding with trailling spaces to be the same length.
-     *
-     * @param array $array
-     * @param int $extra // How many extra spaces to add at the end
-     * @return array
-     */
-    protected function padArray($array, $extra=2)
-    {
-        $max = max(array_map('strlen', $array)) + $extra;
-
-        foreach ($array as &$item)
-        {
-            $item = str_pad($item, $max);
-        }
-
-        return $array;
-    }
-
-    //--------------------------------------------------------------------
+	}
+
+	//--------------------------------------------------------------------
+
+	/**
+	 * A default index method that all CLI Controllers can share. Will
+	 * list all of the methods and their short descriptions, if available.
+	 */
+	public function index()
+	{
+		CLI::new_line();
+		CLI::write( lang('cli.available_commands') );
+
+		$this->sayDescriptions($this->descriptions);
+
+		CLI::new_line();
+	}
+
+	//--------------------------------------------------------------------
+
+
+	/**
+	 * Grabs the short description of a command, if it exists.
+	 *
+	 * @param null $method
+	 */
+	public function describeMethod($method=null)
+	{
+		if (empty($this->descriptions[$method]))
+		{
+			return CLI::error( lang('cli.bad_description') );
+		}
+
+		CLI::write("\t{$this->descriptions[$method]}", 'yellow');
+	}
+
+	//--------------------------------------------------------------------
+
+	public function longDescribeMethod($method=null)
+	{
+		if (empty($this->long_descriptions[$method]))
+		{
+			return CLI::error( lang('cli.no_help') );
+		}
+
+		CLI::write("\t{$this->long_descriptions[$method]}", 'yellow');
+	}
+
+	//--------------------------------------------------------------------
+
+	//--------------------------------------------------------------------
+	// Private Methods
+	//--------------------------------------------------------------------
+
+	protected function sayDescriptions($descriptions)
+	{
+		$names      = array_keys($descriptions);
+		$syntaxes   = array_column($descriptions, 0);
+		$descs      = array_column($descriptions, 1);
+
+		// Pad each item to the same length
+		$names      = $this->padArray($names);
+		$syntaxes   = $this->padArray($syntaxes);
+
+		for ($i=0; $i < count($names); $i++)
+		{
+			$out = CLI::color($names[$i], 'yellow');
+
+			// The rest of the items stay default color.
+			if (isset($syntaxes[$i]))
+			{
+				$out .= $syntaxes[$i];
+			}
+
+			if (isset($descs[$i]))
+			{
+				$out .= CLI::wrap($descs[$i], 125, strlen($names[$i]) + strlen($syntaxes[$i]));
+			}
+
+			CLI::write($out);
+		}
+	}
+
+	//--------------------------------------------------------------------
+
+	/**
+	 * Returns a new array where all of the string elements have
+	 * been padding with trailling spaces to be the same length.
+	 *
+	 * @param array $array
+	 * @param int $extra // How many extra spaces to add at the end
+	 * @return array
+	 */
+	protected function padArray($array, $extra=2)
+	{
+		$max = max(array_map('strlen', $array)) + $extra;
+
+		foreach ($array as &$item)
+		{
+			$item = str_pad($item, $max);
+		}
+
+		return $array;
+	}
+
+	//--------------------------------------------------------------------
 
 }

Spacing +9 added lines, -9 removed lines

@@ -67,9 +67,9 @@ 
         parent::__construct();
 
         // Restrict usage to the command line.
-        if (! is_cli() )
+        if ( ! is_cli())
         {
-            show_error( lang('cli_required') );
+            show_error(lang('cli_required'));
         }
 
         // Make sure the CLI library is loaded and ready.
@@ -85,7 +85,7 @@ 
     public function index()
     {
         CLI::new_line();
-        CLI::write( lang('cli.available_commands') );
+        CLI::write(lang('cli.available_commands'));
 
         $this->sayDescriptions($this->descriptions);
 
@@ -100,11 +100,11 @@ 
      *
      * @param null $method
      */
-    public function describeMethod($method=null)
+    public function describeMethod($method = null)
     {
         if (empty($this->descriptions[$method]))
         {
-            return CLI::error( lang('cli.bad_description') );
+            return CLI::error(lang('cli.bad_description'));
         }
 
         CLI::write("\t{$this->descriptions[$method]}", 'yellow');
@@ -112,11 +112,11 @@ 
 
     //--------------------------------------------------------------------
 
-    public function longDescribeMethod($method=null)
+    public function longDescribeMethod($method = null)
     {
         if (empty($this->long_descriptions[$method]))
         {
-            return CLI::error( lang('cli.no_help') );
+            return CLI::error(lang('cli.no_help'));
         }
 
         CLI::write("\t{$this->long_descriptions[$method]}", 'yellow');
@@ -138,7 +138,7 @@ 
         $names      = $this->padArray($names);
         $syntaxes   = $this->padArray($syntaxes);
 
-        for ($i=0; $i < count($names); $i++)
+        for ($i = 0; $i < count($names); $i++)
         {
             $out = CLI::color($names[$i], 'yellow');
 
@@ -167,7 +167,7 @@ 
      * @param int $extra // How many extra spaces to add at the end
      * @return array
      */
-    protected function padArray($array, $extra=2)
+    protected function padArray($array, $extra = 2)
     {
         $max = max(array_map('strlen', $array)) + $extra;
 

myth/Cron/CronManager.php

Indentation +252 added lines, -252 removed lines

@@ -34,257 +34,257 @@
 
 class CronManager {
 
-    protected static $tasks = [];
-
-    //--------------------------------------------------------------------
-
-    /**
-     * Schedules a new task in the system.
-     *
-     * @param $alias
-     * @param $time_string
-     * @param callable|string $task
-     */
-    public static function schedule($alias, $time_string, $task)
-    {
-        // Valid Alias?
-        if (! is_string($alias) || empty($alias))
-        {
-            throw new \RuntimeException( lang('cron.bad_alias') );
-        }
-
-        // Valid TimeString?
-        if (! is_string($time_string) || empty($time_string))
-        {
-            throw new \RuntimeException( lang('cron.bad_timestring') );
-        }
-
-        // Valid Task?
-        if (! is_callable($task) && ! is_string($task))
-        {
-            throw new \RuntimeException( lang('cron.bad_task') . $alias);
-        }
-
-        static::$tasks[$alias] = new CronTask($time_string, $task);
-    }
-
-    //--------------------------------------------------------------------
-
-    /**
-     * Removes a single task from the system.
-     *
-     * @param $alias
-     */
-    public static function remove($alias)
-    {
-        if (empty(static::$tasks[$alias]))
-        {
-            return null;
-        }
-
-        unset(static::$tasks[$alias]);
-
-        return true;
-    }
-
-    //--------------------------------------------------------------------
-
-
-    /**
-     * Provides an array of all tasks in the system. The format will be
-     * like:
-     *      [
-     *          'alias' => [
-     *              'next_run'  => '123456789',
-     *              'prev_run'  => '123456789',
-     *              'task'  => mixed
-     *          ],
-     *          ...
-     *      ]
-     */
-    public static function listAll($current_time='now')
-    {
-        if (! count(static::$tasks))
-        {
-            return null;
-        }
-
-        $output = array();
-
-        foreach (static::$tasks as $alias => $task)
-        {
-            $output[$alias] = [
-                'next_run'  => $task->nextRunDate($current_time),
-                'prev_run'  => $task->previousRunDate($current_time),
-                'task'      => $task->task()
-            ];
-        }
-
-        return $output;
-    }
-
-    //--------------------------------------------------------------------
-
-    /**
-     * Gets the task object assigned to an alias.
-     *
-     * @param $alias
-     * @return null|CronTask object
-     */
-    public static function task($alias)
-    {
-        if (empty(static::$tasks[$alias]) )
-        {
-            return null;
-        }
-
-        return static::$tasks[$alias];
-    }
-
-    //--------------------------------------------------------------------
-
-    /**
-     * Returns all tasks currently in the system.
-     *
-     * @return array
-     */
-    public static function tasks()
-    {
-        return count(static::$tasks) ? static::$tasks : null;
-    }
-
-    //--------------------------------------------------------------------
-
-    /**
-     * Runs all tasks scheduled to run right now.
-     *
-     * Can be limited to a single task by passing it's alias in the first param.
-     *
-     * Returns the output of all task runs as a single string. Perfect for
-     * emailing to users on completion
-     *
-     * @param null $alias
-     * @param bool $force_run
-     * @param string $current_time
-     * @return string
-     */
-    public static function run($alias=null, $force_run=false, $current_time='now')
-    {
-        $tasks = static::$tasks;
-
-        if (! empty($alias) && isset($tasks[$alias]))
-        {
-            $tasks = [$alias => $tasks[$alias] ];
-        }
-
-        $output = '';
-
-        $count = 0; // How many tasks have ran?
-
-        foreach ($tasks as $alias => $task)
-        {
-            if ($task->isDue($current_time) || $force_run === true)
-            {
-                $output .= sprintf( lang('cron.running_task'), $alias);
-
-                try {
-                    $result = self::runTask($alias);
-
-                    if (is_bool($result))
-                    {
-                        $output .= $result === true ? lang('done') ."\n" : lang('failed') ."\n";
-                    }
-                    else if (is_string($result))
-                    {
-                        $output .= sprintf( lang('cron.done_with_msg'), $result);
-                    }
-                }
-                catch (\Exception $e)
-                {
-                    $output .= "[Exception] ". $e->getMessage() ."\n";
-                }
-
-                $count++;
-            }
-            else
-            {
-                $output .= sprintf( lang('cron.not_scheduled_until'), $alias, $task->nextRunDate() );
-            }
-        }
-
-        if (! $count)
-        {
-            $output .= lang('cron.nothing_scheduled');
-        }
-
-        return $output;
-    }
-
-    //--------------------------------------------------------------------
-
-    /**
-     * Clears all tasks from the system
-     */
-    public static function reset()
-    {
-        static::$tasks = [];
-    }
-
-    //--------------------------------------------------------------------
-
-    //--------------------------------------------------------------------
-    // Protected Methods
-    //--------------------------------------------------------------------
-
-    /**
-     * Runs a single Task.
-     *
-     * NOTE: Tasks MUST return a true/false value only.
-     *
-     * @param $alias
-     * @return bool
-     */
-    protected static function runTask($alias)
-    {
-        $task = static::$tasks[$alias]->task();
-
-        $success = false;
-
-        // If it's a standard callable item,
-        // then run it.
-        if (is_callable($task))
-        {
-            $success = call_user_func($task);
-        }
-
-        // Otherwise, if it's a string it should be
-        // a library:method string so try to run it.
-        else if (is_string($task) && ! empty($task) && strpos($task, ':') !== false)
-        {
-            list($class, $method) = explode(':', $task);
-
-            // Let PHP try to autoload it through any available autoloaders
-            // (including Composer and user's custom autoloaders). If we
-            // don't find it, then assume it's a CI library that we can reach.
-            if (class_exists($class)) {
-                $class = new $class();
-            } else {
-                get_instance()->load->library($class);
-                $class =& get_instance()->$class;
-            }
-
-            if (! method_exists($class, $method)) {
-                log_message('error', "[CRON] Method not found: {$class}::{$method}");
-                return $success;
-            }
-
-            // Call the class with our parameters
-            $success = $class->{$method}();
-        }
-
-        return $success;
-    }
-
-    //--------------------------------------------------------------------
+	protected static $tasks = [];
+
+	//--------------------------------------------------------------------
+
+	/**
+	 * Schedules a new task in the system.
+	 *
+	 * @param $alias
+	 * @param $time_string
+	 * @param callable|string $task
+	 */
+	public static function schedule($alias, $time_string, $task)
+	{
+		// Valid Alias?
+		if (! is_string($alias) || empty($alias))
+		{
+			throw new \RuntimeException( lang('cron.bad_alias') );
+		}
+
+		// Valid TimeString?
+		if (! is_string($time_string) || empty($time_string))
+		{
+			throw new \RuntimeException( lang('cron.bad_timestring') );
+		}
+
+		// Valid Task?
+		if (! is_callable($task) && ! is_string($task))
+		{
+			throw new \RuntimeException( lang('cron.bad_task') . $alias);
+		}
+
+		static::$tasks[$alias] = new CronTask($time_string, $task);
+	}
+
+	//--------------------------------------------------------------------
+
+	/**
+	 * Removes a single task from the system.
+	 *
+	 * @param $alias
+	 */
+	public static function remove($alias)
+	{
+		if (empty(static::$tasks[$alias]))
+		{
+			return null;
+		}
+
+		unset(static::$tasks[$alias]);
+
+		return true;
+	}
+
+	//--------------------------------------------------------------------
+
+
+	/**
+	 * Provides an array of all tasks in the system. The format will be
+	 * like:
+	 *      [
+	 *          'alias' => [
+	 *              'next_run'  => '123456789',
+	 *              'prev_run'  => '123456789',
+	 *              'task'  => mixed
+	 *          ],
+	 *          ...
+	 *      ]
+	 */
+	public static function listAll($current_time='now')
+	{
+		if (! count(static::$tasks))
+		{
+			return null;
+		}
+
+		$output = array();
+
+		foreach (static::$tasks as $alias => $task)
+		{
+			$output[$alias] = [
+				'next_run'  => $task->nextRunDate($current_time),
+				'prev_run'  => $task->previousRunDate($current_time),
+				'task'      => $task->task()
+			];
+		}
+
+		return $output;
+	}
+
+	//--------------------------------------------------------------------
+
+	/**
+	 * Gets the task object assigned to an alias.
+	 *
+	 * @param $alias
+	 * @return null|CronTask object
+	 */
+	public static function task($alias)
+	{
+		if (empty(static::$tasks[$alias]) )
+		{
+			return null;
+		}
+
+		return static::$tasks[$alias];
+	}
+
+	//--------------------------------------------------------------------
+
+	/**
+	 * Returns all tasks currently in the system.
+	 *
+	 * @return array
+	 */
+	public static function tasks()
+	{
+		return count(static::$tasks) ? static::$tasks : null;
+	}
+
+	//--------------------------------------------------------------------
+
+	/**
+	 * Runs all tasks scheduled to run right now.
+	 *
+	 * Can be limited to a single task by passing it's alias in the first param.
+	 *
+	 * Returns the output of all task runs as a single string. Perfect for
+	 * emailing to users on completion
+	 *
+	 * @param null $alias
+	 * @param bool $force_run
+	 * @param string $current_time
+	 * @return string
+	 */
+	public static function run($alias=null, $force_run=false, $current_time='now')
+	{
+		$tasks = static::$tasks;
+
+		if (! empty($alias) && isset($tasks[$alias]))
+		{
+			$tasks = [$alias => $tasks[$alias] ];
+		}
+
+		$output = '';
+
+		$count = 0; // How many tasks have ran?
+
+		foreach ($tasks as $alias => $task)
+		{
+			if ($task->isDue($current_time) || $force_run === true)
+			{
+				$output .= sprintf( lang('cron.running_task'), $alias);
+
+				try {
+					$result = self::runTask($alias);
+
+					if (is_bool($result))
+					{
+						$output .= $result === true ? lang('done') ."\n" : lang('failed') ."\n";
+					}
+					else if (is_string($result))
+					{
+						$output .= sprintf( lang('cron.done_with_msg'), $result);
+					}
+				}
+				catch (\Exception $e)
+				{
+					$output .= "[Exception] ". $e->getMessage() ."\n";
+				}
+
+				$count++;
+			}
+			else
+			{
+				$output .= sprintf( lang('cron.not_scheduled_until'), $alias, $task->nextRunDate() );
+			}
+		}
+
+		if (! $count)
+		{
+			$output .= lang('cron.nothing_scheduled');
+		}
+
+		return $output;
+	}
+
+	//--------------------------------------------------------------------
+
+	/**
+	 * Clears all tasks from the system
+	 */
+	public static function reset()
+	{
+		static::$tasks = [];
+	}
+
+	//--------------------------------------------------------------------
+
+	//--------------------------------------------------------------------
+	// Protected Methods
+	//--------------------------------------------------------------------
+
+	/**
+	 * Runs a single Task.
+	 *
+	 * NOTE: Tasks MUST return a true/false value only.
+	 *
+	 * @param $alias
+	 * @return bool
+	 */
+	protected static function runTask($alias)
+	{
+		$task = static::$tasks[$alias]->task();
+
+		$success = false;
+
+		// If it's a standard callable item,
+		// then run it.
+		if (is_callable($task))
+		{
+			$success = call_user_func($task);
+		}
+
+		// Otherwise, if it's a string it should be
+		// a library:method string so try to run it.
+		else if (is_string($task) && ! empty($task) && strpos($task, ':') !== false)
+		{
+			list($class, $method) = explode(':', $task);
+
+			// Let PHP try to autoload it through any available autoloaders
+			// (including Composer and user's custom autoloaders). If we
+			// don't find it, then assume it's a CI library that we can reach.
+			if (class_exists($class)) {
+				$class = new $class();
+			} else {
+				get_instance()->load->library($class);
+				$class =& get_instance()->$class;
+			}
+
+			if (! method_exists($class, $method)) {
+				log_message('error', "[CRON] Method not found: {$class}::{$method}");
+				return $success;
+			}
+
+			// Call the class with our parameters
+			$success = $class->{$method}();
+		}
+
+		return $success;
+	}
+
+	//--------------------------------------------------------------------
 
 }

Spacing +20 added lines, -20 removed lines

@@ -48,21 +48,21 @@ 
     public static function schedule($alias, $time_string, $task)
     {
         // Valid Alias?
-        if (! is_string($alias) || empty($alias))
+        if ( ! is_string($alias) || empty($alias))
         {
-            throw new \RuntimeException( lang('cron.bad_alias') );
+            throw new \RuntimeException(lang('cron.bad_alias'));
         }
 
         // Valid TimeString?
-        if (! is_string($time_string) || empty($time_string))
+        if ( ! is_string($time_string) || empty($time_string))
         {
-            throw new \RuntimeException( lang('cron.bad_timestring') );
+            throw new \RuntimeException(lang('cron.bad_timestring'));
         }
 
         // Valid Task?
-        if (! is_callable($task) && ! is_string($task))
+        if ( ! is_callable($task) && ! is_string($task))
         {
-            throw new \RuntimeException( lang('cron.bad_task') . $alias);
+            throw new \RuntimeException(lang('cron.bad_task').$alias);
         }
 
         static::$tasks[$alias] = new CronTask($time_string, $task);
@@ -102,9 +102,9 @@ 
      *          ...
      *      ]
      */
-    public static function listAll($current_time='now')
+    public static function listAll($current_time = 'now')
     {
-        if (! count(static::$tasks))
+        if ( ! count(static::$tasks))
         {
             return null;
         }
@@ -133,7 +133,7 @@ 
      */
     public static function task($alias)
     {
-        if (empty(static::$tasks[$alias]) )
+        if (empty(static::$tasks[$alias]))
         {
             return null;
         }
@@ -168,13 +168,13 @@ 
      * @param string $current_time
      * @return string
      */
-    public static function run($alias=null, $force_run=false, $current_time='now')
+    public static function run($alias = null, $force_run = false, $current_time = 'now')
     {
         $tasks = static::$tasks;
 
-        if (! empty($alias) && isset($tasks[$alias]))
+        if ( ! empty($alias) && isset($tasks[$alias]))
         {
-            $tasks = [$alias => $tasks[$alias] ];
+            $tasks = [$alias => $tasks[$alias]];
         }
 
         $output = '';
@@ -185,34 +185,34 @@ 
         {
             if ($task->isDue($current_time) || $force_run === true)
             {
-                $output .= sprintf( lang('cron.running_task'), $alias);
+                $output .= sprintf(lang('cron.running_task'), $alias);
 
                 try {
                     $result = self::runTask($alias);
 
                     if (is_bool($result))
                     {
-                        $output .= $result === true ? lang('done') ."\n" : lang('failed') ."\n";
+                        $output .= $result === true ? lang('done')."\n" : lang('failed')."\n";
                     }
                     else if (is_string($result))
                     {
-                        $output .= sprintf( lang('cron.done_with_msg'), $result);
+                        $output .= sprintf(lang('cron.done_with_msg'), $result);
                     }
                 }
                 catch (\Exception $e)
                 {
-                    $output .= "[Exception] ". $e->getMessage() ."\n";
+                    $output .= "[Exception] ".$e->getMessage()."\n";
                 }
 
                 $count++;
             }
             else
             {
-                $output .= sprintf( lang('cron.not_scheduled_until'), $alias, $task->nextRunDate() );
+                $output .= sprintf(lang('cron.not_scheduled_until'), $alias, $task->nextRunDate());
             }
         }
 
-        if (! $count)
+        if ( ! $count)
         {
             $output .= lang('cron.nothing_scheduled');
         }
@@ -270,10 +270,10 @@ 
                 $class = new $class();
             } else {
                 get_instance()->load->library($class);
-                $class =& get_instance()->$class;
+                $class = & get_instance()->$class;
             }
 
-            if (! method_exists($class, $method)) {
+            if ( ! method_exists($class, $method)) {
                 log_message('error', "[CRON] Method not found: {$class}::{$method}");
                 return $success;
             }

Braces +3 added lines, -6 removed lines

@@ -193,20 +193,17 @@
                     if (is_bool($result))
                     {
                         $output .= $result === true ? lang('done') ."\n" : lang('failed') ."\n";
-                    }
-                    else if (is_string($result))
+                    } else if (is_string($result))
                     {
                         $output .= sprintf( lang('cron.done_with_msg'), $result);
                     }
-                }
-                catch (\Exception $e)
+                } catch (\Exception $e)
                 {
                     $output .= "[Exception] ". $e->getMessage() ."\n";
                 }
 
                 $count++;
-            }
-            else
+            } else
             {
                 $output .= sprintf( lang('cron.not_scheduled_until'), $alias, $task->nextRunDate() );
             }

myth/Docs/DocBuilderInterface.php

Indentation +103 added lines, -103 removed lines

@@ -40,117 +40,117 @@
  */
 interface DocBuilderInterface
 {
-    /**
-     * Does the actual work of reading in and parsing the help file.
-     * If a folder Nickname (see addDocFolder() ) is passed as the second parameter,
-     * it will limit it's search to that single folder. If nothing is passed, it will
-     * search through all of the folders in the order they were given to the library,
-     * until it finds the first one.
-     *
-     * @param string $path The 'path' of the file (relative to the docs
-     *                                 folder. Usually from the URI)
-     * @param string $restrictToFolder (Optional) The folder nickname
-     *
-     * @return string
-     */
-    public function readPage($path, $restrictToFolder = null);
+	/**
+	 * Does the actual work of reading in and parsing the help file.
+	 * If a folder Nickname (see addDocFolder() ) is passed as the second parameter,
+	 * it will limit it's search to that single folder. If nothing is passed, it will
+	 * search through all of the folders in the order they were given to the library,
+	 * until it finds the first one.
+	 *
+	 * @param string $path The 'path' of the file (relative to the docs
+	 *                                 folder. Usually from the URI)
+	 * @param string $restrictToFolder (Optional) The folder nickname
+	 *
+	 * @return string
+	 */
+	public function readPage($path, $restrictToFolder = null);
 
-    /**
-     * Parses the contents. Currently runs through the Markdown Extended
-     * parser to convert to HTML.
-     *
-     * @param $str
-     * @return mixed
-     */
-    public function parse($str);
+	/**
+	 * Parses the contents. Currently runs through the Markdown Extended
+	 * parser to convert to HTML.
+	 *
+	 * @param $str
+	 * @return mixed
+	 */
+	public function parse($str);
 
-    /**
-     * Perform a few housekeeping tasks on a page, like rewriting URLs to full
-     * URLs, not relative, ensuring they link correctly, etc.
-     *
-     * @param      $content
-     * @param null $site_url
-     * @param null $current_url
-     * @return string   The post-processed HTML.
-     */
-    public function postProcess($content, $site_url = null, $current_url = null);
+	/**
+	 * Perform a few housekeeping tasks on a page, like rewriting URLs to full
+	 * URLs, not relative, ensuring they link correctly, etc.
+	 *
+	 * @param      $content
+	 * @param null $site_url
+	 * @param null $current_url
+	 * @return string   The post-processed HTML.
+	 */
+	public function postProcess($content, $site_url = null, $current_url = null);
 
-    /**
-     * Allows users to define the classes that are attached to
-     * generated tables.
-     *
-     * @param null $classes
-     * @return $this
-     */
-    public function setTableClasses($classes = null);
+	/**
+	 * Allows users to define the classes that are attached to
+	 * generated tables.
+	 *
+	 * @param null $classes
+	 * @return $this
+	 */
+	public function setTableClasses($classes = null);
 
-    /**
-     * Given the contents to render, will build a list of links for the sidebar
-     * out of the headings in the file.
-     *
-     * Note: Will ONLY use h2 and h3 to build the links from.
-     *
-     * Note: The $content passed in WILL be modified by adding named anchors
-     * that match up with the locations.
-     *
-     * @param string $content The HTML to analyse for headings.
-     * @return string
-     */
-    public function buildDocumentMap(&$content);
+	/**
+	 * Given the contents to render, will build a list of links for the sidebar
+	 * out of the headings in the file.
+	 *
+	 * Note: Will ONLY use h2 and h3 to build the links from.
+	 *
+	 * Note: The $content passed in WILL be modified by adding named anchors
+	 * that match up with the locations.
+	 *
+	 * @param string $content The HTML to analyse for headings.
+	 * @return string
+	 */
+	public function buildDocumentMap(&$content);
 
-    /**
-     * 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);
 
-    /**
-     * Retrieves the list of files in a folder and preps the name and filename
-     * so it's ready for creating the HTML.
-     *
-     * @param  String $folder The path to the folder to retrieve.
-     *
-     * @return Array  An associative array @see parse_ini_file for format
-     * details.
-     */
-    public function buildTOC($folder);
+	/**
+	 * Retrieves the list of files in a folder and preps the name and filename
+	 * so it's ready for creating the HTML.
+	 *
+	 * @param  String $folder The path to the folder to retrieve.
+	 *
+	 * @return Array  An associative array @see parse_ini_file for format
+	 * details.
+	 */
+	public function buildTOC($folder);
 
-    /**
-     * Returns the current docFolders array.
-     *
-     * @return array
-     */
-    public function docFolders();
+	/**
+	 * Returns the current docFolders array.
+	 *
+	 * @return array
+	 */
+	public function docFolders();
 
-    /**
-     * Registers a path to be used when searching for documentation files.
-     *
-     * @param $name     A nickname to reference it by later.
-     * @param $path     The server path to the folder.
-     * @return $this
-     */
-    public function addDocFolder($name, $path);
+	/**
+	 * Registers a path to be used when searching for documentation files.
+	 *
+	 * @param $name     A nickname to reference it by later.
+	 * @param $path     The server path to the folder.
+	 * @return $this
+	 */
+	public function addDocFolder($name, $path);
 
-    /**
-     * Removes a folder from the folders we scan for documentation files
-     * within.
-     *
-     * @param $name
-     * @return $this
-     */
-    public function removeDocFolder($name);
+	/**
+	 * Removes a folder from the folders we scan for documentation files
+	 * within.
+	 *
+	 * @param $name
+	 * @return $this
+	 */
+	public function removeDocFolder($name);
 }

myth/Docs/DocSearchInterface.php

Indentation +59 added lines, -59 removed lines

@@ -1,71 +1,71 @@
 <?php namespace Myth\Docs;
 /**
- * Sprint
- *
- * A set of power tools to enhance the CodeIgniter framework and provide consistent workflow.
- *
- * Permission is hereby granted, free of charge, to any person obtaining a copy
- * of this software and associated documentation files (the "Software"), to deal
- * in the Software without restriction, including without limitation the rights
- * to use, copy, modify, merge, publish, distribute, sublicense, and/or sell
- * copies of the Software, and to permit persons to whom the Software is
- * furnished to do so, subject to the following conditions:
- *
- * The above copyright notice and this permission notice shall be included in
- * all copies or substantial portions of the Software.
- *
- * THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
- * IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
- * FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE
- * AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER
- * LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM,
- * OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN
- * THE SOFTWARE.
- *
- * @package     Sprint
- * @author      Lonnie Ezell
- * @copyright   Copyright 2014-2015, New Myth Media, LLC (http://newmythmedia.com)
- * @license     http://opensource.org/licenses/MIT  (MIT)
- * @link        http://sprintphp.com
- * @since       Version 1.0
- */
+	 * Sprint
+	 *
+	 * A set of power tools to enhance the CodeIgniter framework and provide consistent workflow.
+	 *
+	 * Permission is hereby granted, free of charge, to any person obtaining a copy
+	 * of this software and associated documentation files (the "Software"), to deal
+	 * in the Software without restriction, including without limitation the rights
+	 * to use, copy, modify, merge, publish, distribute, sublicense, and/or sell
+	 * copies of the Software, and to permit persons to whom the Software is
+	 * furnished to do so, subject to the following conditions:
+	 *
+	 * The above copyright notice and this permission notice shall be included in
+	 * all copies or substantial portions of the Software.
+	 *
+	 * THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
+	 * IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
+	 * FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE
+	 * AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER
+	 * LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM,
+	 * OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN
+	 * THE SOFTWARE.
+	 *
+	 * @package     Sprint
+	 * @author      Lonnie Ezell
+	 * @copyright   Copyright 2014-2015, New Myth Media, LLC (http://newmythmedia.com)
+	 * @license     http://opensource.org/licenses/MIT  (MIT)
+	 * @link        http://sprintphp.com
+	 * @since       Version 1.0
+	 */
 
 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);
 
-    //--------------------------------------------------------------------
+	//--------------------------------------------------------------------
 
 }

Spacing +1 added lines, -1 removed lines

@@ -54,7 +54,7 @@
      * @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);
+    public function registerFormatter($callback_name = '', $cascade = false);
 
     //--------------------------------------------------------------------