ci-bonfire / Sprint

myth/_generators/Migration/MigrationGenerator.php

Spacing +34 added lines, -35 removed lines

@@ -92,27 +92,27 @@ 
 
 	//--------------------------------------------------------------------
 
-	public function run($segments=[], $quiet=false)
+	public function run($segments = [], $quiet = false)
 	{
-		$name = array_shift( $segments );
+		$name = array_shift($segments);
 
-		if ( empty( $name ) )
+		if (empty($name))
 		{
-			$name = CLI::prompt( 'Migration name' );
+			$name = CLI::prompt('Migration name');
 		}
 
 		// Format to CI Standards
-		$name = str_replace('.php', '', strtolower( $name ) );
+		$name = str_replace('.php', '', strtolower($name));
 
 		$this->detectAction($name);
 
-		$this->collectOptions( $name, $quiet );
+		$this->collectOptions($name, $quiet);
 
 		$data = [
 			'name'              => $name,
 			'clean_name'        => ucwords(str_replace('_', ' ', $name)),
-			'today'             => date( 'Y-m-d H:ia' ),
-			'fields'            => trim( $this->stringify( $this->fields ), ', '),
+			'today'             => date('Y-m-d H:ia'),
+			'fields'            => trim($this->stringify($this->fields), ', '),
 			'raw_fields'        => $this->fields,
 			'action'            => $this->action,
 			'table'             => $this->table,
@@ -120,9 +120,9 @@ 
 			'column'            => $this->column
 		];
 
-		if (! empty($this->column) && array_key_exists($this->column, $this->fields))
+		if ( ! empty($this->column) && array_key_exists($this->column, $this->fields))
 		{
-			$data['column_string'] = trim( $this->stringify($this->fields[$this->column]), ', ');
+			$data['column_string'] = trim($this->stringify($this->fields[$this->column]), ', ');
 		}
 
 		$this->load->library('migration');
@@ -130,17 +130,17 @@ 
 		// todo Allow different migration "types"
 		$type = 'app';
 
-		if (! empty($this->module))
+		if ( ! empty($this->module))
 		{
-			$type = 'mod:'. $this->module;
+			$type = 'mod:'.$this->module;
 		}
 		$destination = $this->migration->determine_migration_path($type, true);
 
 		$file = $this->migration->make_name($name);
 
-		$destination = rtrim($destination, '/') .'/'. $file;
+		$destination = rtrim($destination, '/').'/'.$file;
 
-		if (! $this->copyTemplate( 'migration', $destination, $data, true) )
+		if ( ! $this->copyTemplate('migration', $destination, $data, true))
 		{
 			CLI::error('Error creating seed file.');
 		}
@@ -173,7 +173,7 @@ 
 			$action = $this->actionMap[$action];
 		}
 
-		if (! in_array($action, $this->allowedActions))
+		if ( ! in_array($action, $this->allowedActions))
 		{
 			return;
 		}
@@ -187,7 +187,7 @@ 
 
 			// The name of the table is assumed to be the one
 			// prior to the $index found.
-			$this->table = plural( implode('_', array_slice($segments, 0, $index) ) );
+			$this->table = plural(implode('_', array_slice($segments, 0, $index)));
 		}
 
 		// Are we referencing a column?
@@ -199,12 +199,12 @@ 
 
 	//--------------------------------------------------------------------
 
-	public function collectOptions($name, $quiet=false)
+	public function collectOptions($name, $quiet = false)
 	{
 		$options = CLI::getOptions();
 
 		// Use existing db table?
-		if (array_key_exists('fromdb', $options) )
+		if (array_key_exists('fromdb', $options))
 		{
 			$this->readTable($this->table);
 		}
@@ -217,10 +217,9 @@ 
 				return;
 			}
 
-			$fields = empty( $fields ) ?
-				CLI::prompt( 'Fields? (name:type)' ) :
-				$options['fields'];
-			$this->fields = $this->parseFields( $fields );
+			$fields = empty($fields) ?
+				CLI::prompt('Fields? (name:type)') : $options['fields'];
+			$this->fields = $this->parseFields($fields);
 		}
 	}
 
@@ -244,7 +243,7 @@ 
 		$fields = [];
 		$segments = explode(' ', $str);
 
-		if (! count($segments))
+		if ( ! count($segments))
 		{
 			return $fields;
 		}
@@ -252,7 +251,7 @@ 
 		foreach ($segments as $segment)
 		{
 			$pop = [null, null, null];
-			list($field, $type, $size) = array_merge( explode(':', $segment), $pop);
+			list($field, $type, $size) = array_merge(explode(':', $segment), $pop);
 			$type = strtolower($type);
 
 			// Is type one of our convenience mapped items?
@@ -261,7 +260,7 @@ 
 				$type = $this->map[$type];
 			}
 
-			$f = [ 'type' => $type ];
+			$f = ['type' => $type];
 
 			// Creating a primary key?
 			if ($type == 'id')
@@ -275,9 +274,9 @@ 
 			}
 
 			// Constraint?
-			if (! empty($size))
+			if ( ! empty($size))
 			{
-				$f['constraint'] = (int)$size;
+				$f['constraint'] = (int) $size;
 			}
 			else if (array_key_exists($type, $this->defaultSizes))
 			{
@@ -319,7 +318,7 @@ 
 		}
 
 		// Table exists?
-		if (! $this->db->table_exists($table))
+		if ( ! $this->db->table_exists($table))
 		{
 			return false;
 		}
@@ -327,7 +326,7 @@ 
 		$fields = $this->db->field_data($table);
 
 		// Any fields?
-		if (! is_array($fields) || ! count($fields))
+		if ( ! is_array($fields) || ! count($fields))
 		{
 			return false;
 		}
@@ -336,30 +335,30 @@ 
 
 		foreach ($fields as $field)
 		{
-			$f = [ 'type' => $field->type ];
+			$f = ['type' => $field->type];
 
 			// Constraint
-			if (! empty($field->max_length))
+			if ( ! empty($field->max_length))
 			{
 				$f['constraint'] = $field->max_length;
 			}
 			else if (array_key_exists($field->type, $this->defaultSizes))
 			{
-				$f['constraint'] = $this->defaultSizes[ $field->type ];
+				$f['constraint'] = $this->defaultSizes[$field->type];
 			}
 
 			// Default
-			if (! empty($field->default)) $f['default'] = $field->default;
+			if ( ! empty($field->default)) $f['default'] = $field->default;
 
 			// Primary Key?
-			if (! empty($field->primary_key) && $field->primary_key == 1)
+			if ( ! empty($field->primary_key) && $field->primary_key == 1)
 			{
 				$this->primary_key = $field->name;
 				$f['auto_increment'] = true;
 				$f['unsigned'] = true;
 			}
 
-			$new_fields[ $field->name ] = $f;
+			$new_fields[$field->name] = $f;
 		}
 
 		$this->fields = $new_fields;

myth/_generators/Migration/migration.tpl.php

Spacing +2 added lines, -2 removed lines

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

myth/_generators/Model/ModelGenerator.php

Spacing +61 added lines, -64 removed lines

@@ -56,47 +56,47 @@ 
 
 	//--------------------------------------------------------------------
 
-	public function run( $segments = [ ], $quiet = false )
+	public function run($segments = [], $quiet = false)
 	{
-		$name = array_shift( $segments );
+		$name = array_shift($segments);
 
         $options = CLI::getOptions();
 
-		$this->options['table_name'] = array_shift( $segments );
+		$this->options['table_name'] = array_shift($segments);
 
-		if ( empty( $name ) )
+		if (empty($name))
 		{
-			$name = CLI::prompt( 'Model name' );
+			$name = CLI::prompt('Model name');
 		}
 
 		// Format to CI Standards
-		if ( substr( $name, - 6 ) !== '_model' )
+		if (substr($name, - 6) !== '_model')
 		{
 			$name .= '_model';
 		}
-		$name = ucfirst( $name );
+		$name = ucfirst($name);
 
-		if ( $quiet === false )
+		if ($quiet === false)
 		{
-			$this->collectOptions( $name, $options );
+			$this->collectOptions($name, $options);
 		}
 		else
 		{
-			$this->quietSetOptions( $name, $options );
+			$this->quietSetOptions($name, $options);
 		}
 
 		$data = [
 			'model_name' => $name,
-			'today'      => date( 'Y-m-d H:ia' )
+			'today'      => date('Y-m-d H:ia')
 		];
 
-		$data = array_merge( $data, $this->options );
+		$data = array_merge($data, $this->options);
 
-		$destination = $this->determineOutputPath( 'models' ) . $name . '.php';
+		$destination = $this->determineOutputPath('models').$name.'.php';
 
-		if ( ! $this->copyTemplate( 'model', $destination, $data, $this->overwrite ) )
+		if ( ! $this->copyTemplate('model', $destination, $data, $this->overwrite))
 		{
-			CLI::error( 'Error creating new files' );
+			CLI::error('Error creating new files');
 		}
 
 		return TRUE;
@@ -107,70 +107,67 @@ 
 	/*
 	 * Customizes our settings
 	 */
-	protected function collectOptions( $model_name, $options=[] )
+	protected function collectOptions($model_name, $options = [])
 	{
-		$this->load->helper( 'inflector' );
+		$this->load->helper('inflector');
 
 		// Table Name?
-		if ( empty( $this->options['table_name'] ) )
+		if (empty($this->options['table_name']))
 		{
-			$this->options['table_name'] = empty( $options['table'] ) ?
-				CLI::prompt( 'Table name', plural( strtolower( str_replace( '_model', '', $model_name ) ) ) ) :
-				$options['table'];
+			$this->options['table_name'] = empty($options['table']) ?
+				CLI::prompt('Table name', plural(strtolower(str_replace('_model', '', $model_name)))) : $options['table'];
 		}
 
-		$this->options['fields'] = $this->table_info( $this->options['table_name'], $options );
+		$this->options['fields'] = $this->table_info($this->options['table_name'], $options);
 
 		// Primary Key
 		if (empty($this->options['primary_key']))
 		{
-			$this->options['primary_key'] = empty( $options['primary_key'] ) ?
-				CLI::prompt( 'Primary Key', 'id' ) :
-				$options['primary_key'];
+			$this->options['primary_key'] = empty($options['primary_key']) ?
+				CLI::prompt('Primary Key', 'id') : $options['primary_key'];
 		}
 
-		$this->options['protected'] = [ $this->options['primary_key'] ];
+		$this->options['protected'] = [$this->options['primary_key']];
 
 		// Set Created?
-		if ( empty( $options['set_created'] ) )
+		if (empty($options['set_created']))
 		{
-			$ans = CLI::prompt( 'Set Created date?', [ 'y', 'n' ] );
-			if ( $ans == 'n' )
+			$ans = CLI::prompt('Set Created date?', ['y', 'n']);
+			if ($ans == 'n')
 			{
 				$this->options['set_created'] = FALSE;
 			}
 		}
 
 		// Set Modified?
-		if ( empty( $options['set_modified'] ) )
+		if (empty($options['set_modified']))
 		{
-			$ans = CLI::prompt( 'Set Modified date?', [ 'y', 'n' ] );
-			if ( $ans == 'n' )
+			$ans = CLI::prompt('Set Modified date?', ['y', 'n']);
+			if ($ans == 'n')
 			{
 				$this->options['set_modified'] = FALSE;
 			}
 		}
 
 		// Date Format
-		$this->options['date_format'] = empty( $options['date_format'] ) ?
-			CLI::prompt( 'Date Format?', [ 'datetime', 'date', 'int' ] ) :
-			$options['date_format'];
+		$this->options['date_format'] = empty($options['date_format']) ?
+			CLI::prompt('Date Format?', ['datetime', 'date', 'int']) : $options['date_format'];
 
 		// Log User?
-		if ( empty( $options['log_user'] ) )
+		if (empty($options['log_user']))
 		{
-			$ans = CLI::prompt( 'Log User actions?', [ 'y', 'n' ] );
-			if ( $ans == 'y' )
+			$ans = CLI::prompt('Log User actions?', ['y', 'n']);
+			if ($ans == 'y')
 			{
 				$this->options['log_user'] = TRUE;
 			}
 		}
 
 		// Soft Deletes
-		if ( empty( $options['soft_delete'] ) )
+		if (empty($options['soft_delete']))
 		{
-			$ans = CLI::prompt( 'Use Soft Deletes?', [ 'y', 'n' ] );
-			if ( $ans == 'n' )
+			$ans = CLI::prompt('Use Soft Deletes?', ['y', 'n']);
+			if ($ans == 'n')
 			{
 				$this->options['soft_delete'] = false;
 			}
@@ -180,21 +177,21 @@ 
 
 	//--------------------------------------------------------------------
 
-	protected function quietSetOptions( $model_name, $options=[] )
+	protected function quietSetOptions($model_name, $options = [])
 	{
-		$this->load->helper( 'inflector' );
+		$this->load->helper('inflector');
 
 		if (empty($this->options['table_name']))
 		{
-			$this->options['table_name'] = plural( strtolower( str_replace( '_model', '', $model_name ) ) );
+			$this->options['table_name'] = plural(strtolower(str_replace('_model', '', $model_name)));
 		}
 
 		// Try to set it from the database first,
 		// otherwise, try to pull from fields
-		$this->options['fields'] = $this->table_info( $this->options['table_name'], $options );
+		$this->options['fields'] = $this->table_info($this->options['table_name'], $options);
 
-		$this->options['primary_key'] = ! empty( $this->options['primary_key'] ) ? $this->options['primary_key'] : 'id';
-		$this->options['protected']   = [ $this->options['primary_key'] ];
+		$this->options['primary_key'] = ! empty($this->options['primary_key']) ? $this->options['primary_key'] : 'id';
+		$this->options['protected']   = [$this->options['primary_key']];
 	}
 
 	//--------------------------------------------------------------------
@@ -206,12 +203,12 @@ 
 	 *
 	 * @return mixed An array of fields or false if the table does not exist
 	 */
-	protected function table_info( $table_name, $options=[] )
+	protected function table_info($table_name, $options = [])
 	{
 		$this->load->database();
 
 		// Check whether the table exists in this database
-		if ( ! $this->db->table_exists( $table_name ) )
+		if ( ! $this->db->table_exists($table_name))
 		{
             if (empty($options['fields']))
             {
@@ -222,12 +219,12 @@ 
 		}
         else
         {
-            $fields = $this->db->field_data( $table_name );
+            $fields = $this->db->field_data($table_name);
         }
 
 		// There may be something wrong or the database driver may not return
 		// field data
-		if ( empty( $fields ) )
+		if (empty($fields))
 		{
 			return FALSE;
 		}
@@ -237,9 +234,9 @@ 
         $this->options['use_soft_deletes']  = false;
 
 		// Use the primary key if the table has one already set.
-		foreach ( $fields as $field )
+		foreach ($fields as $field)
 		{
-			if ( ! empty( $field->primary_key ) && $field->primary_key == 1 )
+			if ( ! empty($field->primary_key) && $field->primary_key == 1)
 			{
 				$this->options['primary_key'] = $field->name;
 			}
@@ -261,7 +258,7 @@ 
 		}
 
 		// Set our validation rules based on these fields
-		$this->options['rules'] = $this->buildValidationRules( $fields );
+		$this->options['rules'] = $this->buildValidationRules($fields);
 
 		return $fields;
 	}
@@ -274,20 +271,20 @@ 
      */
     protected function parseFieldString($fields)
     {
-        if ( empty( $fields ) )
+        if (empty($fields))
         {
             return NULL;
         }
 
-        $fields = explode( ' ', $fields );
+        $fields = explode(' ', $fields);
 
-        $new_fields = [ ];
+        $new_fields = [];
 
-        foreach ( $fields as $field )
+        foreach ($fields as $field)
         {
-            $pop = [ NULL, NULL, NULL ];
-            list( $field, $type, $size ) = array_merge( explode( ':', $field ), $pop );
-            $type = strtolower( $type );
+            $pop = [NULL, NULL, NULL];
+            list($field, $type, $size) = array_merge(explode(':', $field), $pop);
+            $type = strtolower($type);
 
             // Strings
             if (in_array($type, ['char', 'varchar', 'string']))
@@ -328,7 +325,7 @@ 
 
         // Convert to objects
         array_walk($new_fields, function(&$item, $key) {
-            $item = (object)$item;
+            $item = (object) $item;
         });
 
         return $new_fields;
@@ -345,7 +342,7 @@ 
 	 *
 	 * @return array
 	 */
-	public function buildValidationrules($fields=[])
+	public function buildValidationrules($fields = [])
 	{
 		if (empty($fields) || ! is_array($fields) || ! count($fields))
 		{
@@ -390,7 +387,7 @@ 
 					break;
 			}
 
-			if (! empty($field->max_length))
+			if ( ! empty($field->max_length))
 			{
 				$rule[] = "max_length[{$field->max_length}]";
 			}

myth/_generators/Model/model.tpl.php

Spacing +1 added lines, -1 removed lines

@@ -35,7 +35,7 @@
     protected \$deleted_by_field    = 'deleted_by';
 ";
 
-$protect = "'". implode("', '", $protected) . "'";
+$protect = "'".implode("', '", $protected)."'";
 
 //--------------------------------------------------------------------
 // Create the full model

myth/_generators/Scaffold/ScaffoldGenerator.php

Spacing +8 added lines, -8 removed lines

@@ -42,9 +42,9 @@ 
 
 	//--------------------------------------------------------------------
 
-	public function run($segments = [ ], $quiet = false)
+	public function run($segments = [], $quiet = false)
 	{
-		$name = array_shift( $segments );
+		$name = array_shift($segments);
 
         // If a table already exists then we don't need a migration
         $this->load->database();
@@ -61,16 +61,16 @@ 
         // exists, then we need to provide some default fields.
         if (empty($this->fields))
         {
-            if (! $this->table_exists)
+            if ( ! $this->table_exists)
             {
                 $this->fields = "id:int id:id title:string created_on:datetime modified_on:datetime";
             }
         }
 
 		// Perform the steps.
-        if (! $this->table_exists)
+        if ( ! $this->table_exists)
         {
-            $this->makeMigration( $name );
+            $this->makeMigration($name);
         }
 		$this->makeSeed($name);
 		$this->makeModel($name);
@@ -114,12 +114,12 @@ 
         // If a table exists, we can build it from that
         if ($this->table_exists)
         {
-            $this->generate( "model {$name}", "-table $name -primary_key id", TRUE );
+            $this->generate("model {$name}", "-table $name -primary_key id", TRUE);
         }
         // Otherwise, we need to provide the fields to make the model out of.
         else
         {
-            $this->generate( "model {$name}", "-fields '{$this->fields}'", TRUE );
+            $this->generate("model {$name}", "-fields '{$this->fields}'", TRUE);
         }
 	}
 
@@ -129,7 +129,7 @@ 
 	{
         $options = "-model {$this->model_name} -create_views";
 
-        if (! empty($this->fields))
+        if ( ! empty($this->fields))
         {
             $options .= " -fields '{$this->fields}'";
         }

myth/_generators/Seed/SeedGenerator.php

Spacing +10 added lines, -10 removed lines

@@ -34,36 +34,36 @@
 
 class SeedGenerator extends \Myth\Forge\BaseGenerator {
 
-	public function run($segments=[], $quiet=false)
+	public function run($segments = [], $quiet = false)
 	{
-		$name = array_shift( $segments );
+		$name = array_shift($segments);
 
-		if ( empty( $name ) )
+		if (empty($name))
 		{
-			$name = CLI::prompt( 'Seed name' );
+			$name = CLI::prompt('Seed name');
 		}
 
 		// Format to CI Standards
-		$name = str_replace('.php', '', strtolower( $name ) );
-		if (substr( $name, -4) == 'seed')
+		$name = str_replace('.php', '', strtolower($name));
+		if (substr($name, -4) == 'seed')
 		{
 			$name = substr($name, 0, strlen($name) - 4);
 		}
-		$name = ucfirst($name) .'Seeder';
+		$name = ucfirst($name).'Seeder';
 
 		$data = [
 			'seed_name' => $name,
-			'today'     => date( 'Y-m-d H:ia' )
+			'today'     => date('Y-m-d H:ia')
 		];
 
-		$destination = $this->determineOutputPath( 'database/seeds' ) . $name . '.php';
+		$destination = $this->determineOutputPath('database/seeds').$name.'.php';
 
 		if (strpos($destination, 'modules') !== false)
 		{
 			$destination = str_replace('database/', '', $destination);
 		}
 
-		if (! $this->copyTemplate( 'seed', $destination, $data, $this->overwrite) )
+		if ( ! $this->copyTemplate('seed', $destination, $data, $this->overwrite))
 		{
 			CLI::error('Error creating seed file.');
 		}

myth/_generators/View/ViewGenerator.php

Spacing +7 added lines, -7 removed lines

@@ -34,21 +34,21 @@
 
 class ViewGenerator extends \Myth\Forge\BaseGenerator {
 
-	public function run($segments=[], $quiet=false)
+	public function run($segments = [], $quiet = false)
 	{
-		$name = array_shift( $segments );
+		$name = array_shift($segments);
 
-		if ( empty( $name ) )
+		if (empty($name))
 		{
-			$name = CLI::prompt( 'View name' );
+			$name = CLI::prompt('View name');
 		}
 
 		// Format to CI Standards
-		$name = str_replace('.php', '', strtolower( $name ) );
+		$name = str_replace('.php', '', strtolower($name));
 
-		$destination = $this->determineOutputPath( 'views' ) . $name . '.php';
+		$destination = $this->determineOutputPath('views').$name.'.php';
 
-		if (! $this->createFile($destination, "The {$name}.php view file.", $this->overwrite) )
+		if ( ! $this->createFile($destination, "The {$name}.php view file.", $this->overwrite))
 		{
 			CLI::error('Error creating view file.');
 		}

system/core/CodeIgniter.php

Spacing +10 added lines, -10 removed lines

@@ -185,7 +185,7 @@ 
  *  Start the timer... tick tock tick tock...
  * ------------------------------------------------------
  */
-	$BM =& load_class('Benchmark', 'core');
+	$BM = & load_class('Benchmark', 'core');
 	$BM->mark('total_execution_time_start');
 	$BM->mark('loading_time:_base_classes_start');
 
@@ -194,7 +194,7 @@ 
  *  Instantiate the hooks class
  * ------------------------------------------------------
  */
-	$EXT =& load_class('Hooks', 'core');
+	$EXT = & load_class('Hooks', 'core');
 
 /*
  * ------------------------------------------------------
@@ -213,7 +213,7 @@ 
  * depending on another class that uses it.
  *
  */
-	$CFG =& load_class('Config', 'core');
+	$CFG = & load_class('Config', 'core');
 
 	// Do we have any manually set config items in the index.php file?
 	if (isset($assign_to_config) && is_array($assign_to_config))
@@ -291,28 +291,28 @@ 
  *  Instantiate the UTF-8 class
  * ------------------------------------------------------
  */
-	$UNI =& load_class('Utf8', 'core');
+	$UNI = & load_class('Utf8', 'core');
 
 /*
  * ------------------------------------------------------
  *  Instantiate the URI class
  * ------------------------------------------------------
  */
-	$URI =& load_class('URI', 'core');
+	$URI = & load_class('URI', 'core');
 
 /*
  * ------------------------------------------------------
  *  Instantiate the routing class and set the routing
  * ------------------------------------------------------
  */
-	$RTR =& load_class('Router', 'core', isset($routing) ? $routing : NULL);
+	$RTR = & load_class('Router', 'core', isset($routing) ? $routing : NULL);
 
 /*
  * ------------------------------------------------------
  *  Instantiate the output class
  * ------------------------------------------------------
  */
-	$OUT =& load_class('Output', 'core');
+	$OUT = & load_class('Output', 'core');
 
 /*
  * ------------------------------------------------------
@@ -329,21 +329,21 @@ 
  * Load the security class for xss and csrf support
  * -----------------------------------------------------
  */
-	$SEC =& load_class('Security', 'core');
+	$SEC = & load_class('Security', 'core');
 
 /*
  * ------------------------------------------------------
  *  Load the Input class and sanitize globals
  * ------------------------------------------------------
  */
-	$IN	=& load_class('Input', 'core');
+	$IN = & load_class('Input', 'core');
 
 /*
  * ------------------------------------------------------
  *  Load the Language class
  * ------------------------------------------------------
  */
-	$LANG =& load_class('Lang', 'core');
+	$LANG = & load_class('Lang', 'core');
 
 /*
  * ------------------------------------------------------

system/core/Common.php

Spacing +9 added lines, -9 removed lines

@@ -297,7 +297,7 @@ 
 		if (empty($_config))
 		{
 			// references cannot be directly assigned to static variables, so we use an array
-			$_config[0] =& get_config();
+			$_config[0] = & get_config();
 		}
 
 		return isset($_config[0][$item]) ? $_config[0][$item] : NULL;
@@ -422,7 +422,7 @@ 
 			$exit_status = 1; // EXIT_ERROR
 		}
 
-		$_error =& load_class('Exceptions', 'core');
+		$_error = & load_class('Exceptions', 'core');
 		echo $_error->show_error($heading, $message, 'error_general', $status_code);
 		exit($exit_status);
 	}
@@ -445,7 +445,7 @@ 
 	 */
 	function show_404($page = '', $log_error = TRUE)
 	{
-		$_error =& load_class('Exceptions', 'core');
+		$_error = & load_class('Exceptions', 'core');
 		$_error->show_404($page, $log_error);
 		exit(4); // EXIT_UNKNOWN_FILE
 	}
@@ -472,7 +472,7 @@ 
 		if ($_log === NULL)
 		{
 			// references cannot be directly assigned to static variables, so we use an array
-			$_log[0] =& load_class('Log', 'core');
+			$_log[0] = & load_class('Log', 'core');
 		}
 
 		$_log[0]->write_log($level, $message);
@@ -618,7 +618,7 @@ 
 			return;
 		}
 
-		$_error =& load_class('Exceptions', 'core');
+		$_error = & load_class('Exceptions', 'core');
 		$_error->log_exception($severity, $message, $filepath, $line);
 
 		// Should we display the error?
@@ -653,7 +653,7 @@ 
 	 */
 	function _exception_handler($exception)
 	{
-		$_error =& load_class('Exceptions', 'core');
+		$_error = & load_class('Exceptions', 'core');
 		$_error->log_exception('error', 'Exception: '.$exception->getMessage(), $exception->getFile(), $exception->getLine());
 
 		// Should we display the error?
@@ -716,11 +716,11 @@ 
 		// carriage return (dec 13) and horizontal tab (dec 09)
 		if ($url_encoded)
 		{
-			$non_displayables[] = '/%0[0-8bcef]/';	// url encoded 00-08, 11, 12, 14, 15
-			$non_displayables[] = '/%1[0-9a-f]/';	// url encoded 16-31
+			$non_displayables[] = '/%0[0-8bcef]/'; // url encoded 00-08, 11, 12, 14, 15
+			$non_displayables[] = '/%1[0-9a-f]/'; // url encoded 16-31
 		}
 
-		$non_displayables[] = '/[\x00-\x08\x0B\x0C\x0E-\x1F\x7F]+/S';	// 00-08, 11, 12, 14-31, 127
+		$non_displayables[] = '/[\x00-\x08\x0B\x0C\x0E-\x1F\x7F]+/S'; // 00-08, 11, 12, 14-31, 127
 
 		do
 		{