ci-bonfire / Sprint

myth/CIModules/database/controllers/Database.php

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

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 {

myth/CIModules/docs/config/docs.php

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;

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

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

myth/CIModules/forge/controllers/Forge.php

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;

myth/CLI.php

Spacing +26 added lines, -26 removed lines

@@ -86,7 +86,7 @@ 
 		    return;
 	    }
 
-        if ( ! (PHP_SAPI === 'cli' || defined('STDIN')) )
+        if ( ! (PHP_SAPI === 'cli' || defined('STDIN')))
         {
             throw new \Exception('Cli class cannot be used outside of the command line.');
         }
@@ -110,7 +110,7 @@ 
      */
     public static function segment($index)
     {
-        if (! isset(static::$segments[$index - 1]))
+        if ( ! isset(static::$segments[$index - 1]))
         {
             return null;
         }
@@ -202,13 +202,13 @@ 
                 // E.g: $ready = CLI::prompt('Are you ready?', array('y','n'));
                 if (is_array($args[1]))
                 {
-                    list($output, $options)=$args;
+                    list($output, $options) = $args;
                 }
 
                 // E.g: $color = CLI::prompt('What is your favourite color?', 'white');
                 elseif (is_string($args[1]))
                 {
-                    list($output, $default)=$args;
+                    list($output, $default) = $args;
                 }
 
                 break;
@@ -391,7 +391,7 @@ 
     public static function new_line($num = 1)
     {
         // Do it once or more, write with empty string gives us a new line
-        for($i = 0; $i < $num; $i++)
+        for ($i = 0; $i < $num; $i++)
         {
             static::write();
         }
@@ -427,7 +427,7 @@ 
      * @param	string	$format		other formatting to apply. Currently only 'underline' is understood
      * @return	string	the color coded string
      */
-    public static function color($text, $foreground, $background = null, $format=null)
+    public static function color($text, $foreground, $background = null, $format = null)
     {
         if (static::is_windows() and ! isset($_SERVER['ANSICON']))
         {
@@ -439,7 +439,7 @@ 
             throw new \RuntimeException('Invalid CLI foreground color: '.$foreground);
         }
 
-        if ( $background !== null and ! array_key_exists($background, static::$background_colors))
+        if ($background !== null and ! array_key_exists($background, static::$background_colors))
         {
             throw new \RuntimeException('Invalid CLI background color: '.$background);
         }
@@ -463,26 +463,26 @@ 
 
     //--------------------------------------------------------------------
 
-    public static function getWidth($default=80)
+    public static function getWidth($default = 80)
     {
         if (static::is_windows())
         {
             return $default;
         }
 
-        return (int)shell_exec('tput cols');
+        return (int) shell_exec('tput cols');
     }
     
     //--------------------------------------------------------------------
 
-    public static function getHeight($default=32)
+    public static function getHeight($default = 32)
     {
         if (static::is_windows())
         {
             return $default;
         }
 
-        return (int)shell_exec('tput lines');
+        return (int) shell_exec('tput lines');
     }
 
     //--------------------------------------------------------------------
@@ -494,13 +494,13 @@ 
      * @param int $thisStep
      * @param int $totalSteps
      */
-    public static function showProgress($thisStep=1, $totalSteps=10)
+    public static function showProgress($thisStep = 1, $totalSteps = 10)
     {
         // The first time through, save
         // our position so the script knows where to go
         // back to when writing the bar, and
         // at the end of the script.
-        if (! static::$inProgress) {
+        if ( ! static::$inProgress) {
             fwrite(STDOUT, "\0337");
             static::$inProgress = true;
         }
@@ -513,13 +513,13 @@ 
             $thisStep = abs($thisStep);
             $totalSteps = $totalSteps < 1 ? 1 : $totalSteps;
 
-            $percent = intval( ($thisStep / $totalSteps) * 100 );
-            $step = (int)round($percent / 10);
+            $percent = intval(($thisStep / $totalSteps) * 100);
+            $step = (int) round($percent / 10);
 
             // Write the progress bar
-            fwrite(STDOUT, "[\033[32m" . str_repeat('#', $step) . str_repeat('.', 10 - $step) . "\033[0m]");
+            fwrite(STDOUT, "[\033[32m".str_repeat('#', $step).str_repeat('.', 10 - $step)."\033[0m]");
             // Textual representation...
-            fwrite(STDOUT, " {$percent}% Complete" . PHP_EOL);
+            fwrite(STDOUT, " {$percent}% Complete".PHP_EOL);
             // Move up, undo the PHP_EOL
             fwrite(STDOUT, "\033[1A");
         }
@@ -570,7 +570,7 @@ 
 	 */
 	public static function optionString()
 	{
-		if (! count(static::$options))
+		if ( ! count(static::$options))
 		{
 			return '';
 		}
@@ -583,7 +583,7 @@ 
 			// so it will pass correctly.
 			if (strpos($value, ' ') !== false)
 			{
-				$value = '"'. $value .'"';
+				$value = '"'.$value.'"';
 			}
 			$out .= "-{$name} $value ";
 		}
@@ -608,7 +608,7 @@ 
 	 * @param int $max
 	 * @param int $pad_left
 	 */
-	public static function wrap($string=null, $max=0, $pad_left=0)
+	public static function wrap($string = null, $max = 0, $pad_left = 0)
 	{
 		if (empty($string))
 		{
@@ -630,13 +630,13 @@ 
 		$lines = wordwrap($string, $max);
 
 		if ($pad_left > 0) {
-			$lines = explode( "\n", $lines );
+			$lines = explode("\n", $lines);
 
 			$first = true;
 
-			array_walk( $lines, function ( &$line, $index ) use($max, $pad_left, &$first) {
-				if (! $first) {
-					$line = str_repeat( " ", $pad_left ) . $line;
+			array_walk($lines, function(&$line, $index) use($max, $pad_left, &$first) {
+				if ( ! $first) {
+					$line = str_repeat(" ", $pad_left).$line;
 				}
 				else
 				{
@@ -668,7 +668,7 @@ 
 		{
 			// If there's no '-' at the beginning of the argument
 			// then add it to our segments.
-			if (! $options_found && strpos($_SERVER['argv'][$i], '-') === false)
+			if ( ! $options_found && strpos($_SERVER['argv'][$i], '-') === false)
 			{
 				self::$segments[] = $_SERVER['argv'][$i];
 				continue;
@@ -685,7 +685,7 @@ 
 			$value = null;
 
 			// If the next item starts with a dash it's a value
-			if (isset($_SERVER['argv'][$i + 1]) && substr($_SERVER['argv'][$i + 1], 0, 1) != '-' )
+			if (isset($_SERVER['argv'][$i + 1]) && substr($_SERVER['argv'][$i + 1], 0, 1) != '-')
 			{
 				$value = $_SERVER['argv'][$i + 1];
 				$i++;

myth/Controllers/BaseController.php

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);
 	}
 
 	//--------------------------------------------------------------------