ci-bonfire / Sprint

myth/Models/CIDbModel.php

Spacing +40 added lines, -40 removed lines

@@ -301,7 +301,7 @@ 
         $this->temp_return_type = $this->return_type;
 
         // Make sure our database is loaded
-        if (!is_null($db)) {
+        if ( ! is_null($db)) {
             $this->db = $db;
         }
         else {
@@ -310,7 +310,7 @@ 
         }
 
         // Do we have a form_validation library?
-        if (! is_null($form_validation)) {
+        if ( ! is_null($form_validation)) {
             $this->form_validation = $form_validation;
         }
         else {
@@ -480,7 +480,7 @@ 
 
         if (is_array($rows)) {
             foreach ($rows as $key => &$row) {
-                $row = $this->trigger('after_find', ['method' => 'find_all', 'fields' => $row] );
+                $row = $this->trigger('after_find', ['method' => 'find_all', 'fields' => $row]);
             }
         }
 
@@ -510,7 +510,7 @@ 
         if ($data !== FALSE) {
             $data = $this->trigger('before_insert', ['method' => 'insert', 'fields' => $data]);
 
-            $this->db->insert($this->table_name, $this->prep_data($data) );
+            $this->db->insert($this->table_name, $this->prep_data($data));
 
             if ($this->return_insert_id) {
                 $id = $this->db->insert_id();
@@ -555,7 +555,7 @@ 
 
         if ($data !== FALSE) {
             $data['batch'] = true;
-            $data = $this->trigger('before_insert', ['method' => 'insert_batch', 'fields' => $data] );
+            $data = $this->trigger('before_insert', ['method' => 'insert_batch', 'fields' => $data]);
             unset($data['batch']);
 
             return $this->db->insert_batch($this->table_name, $data);
@@ -577,7 +577,7 @@ 
      * @param null $skip_validation
      * @return bool
      */
-    public function replace($data, $skip_validation=null)
+    public function replace($data, $skip_validation = null)
     {
         $skip_validation = is_null($skip_validation) ? $this->skip_validation : $skip_validation;
 
@@ -624,10 +624,10 @@ 
         // Will be false if it didn't validate.
         if ($data !== FALSE) {
             
-            $data = $this->trigger('before_update', ['id' => $id, 'method' =>'update', 'fields' => $data] );
+            $data = $this->trigger('before_update', ['id' => $id, 'method' =>'update', 'fields' => $data]);
             
             $this->db->where($this->primary_key, $id);
-            $this->db->set( $this->prep_data($data) );
+            $this->db->set($this->prep_data($data));
             $result = $this->db->update($this->table_name);
 
             $this->trigger('after_update', ['id' => $id, 'fields' => $data, 'result' => $result, 'method' => 'update']);
@@ -666,7 +666,7 @@ 
     public function update_batch($data, $where_key)
     {
         foreach ($data as &$row) {
-            $row = $this->trigger('before_update', ['method' => 'update_batch', 'fields' => $row] );
+            $row = $this->trigger('before_update', ['method' => 'update_batch', 'fields' => $row]);
         }
 
         $result = $this->db->update_batch($this->table_name, $data, $where_key);
@@ -700,7 +700,7 @@ 
      */
     public function update_many($ids, $data, $skip_validation = null)
     {
-        if (!is_array($ids) || count($ids) == 0) return NULL;
+        if ( ! is_array($ids) || count($ids) == 0) return NULL;
 
         $skip_validation = is_null($skip_validation) ? $this->skip_validation : $skip_validation;
 
@@ -754,10 +754,10 @@ 
 
         // Will be false if it didn't validate.
         if ($this->validate($data) !== FALSE) {
-            $this->db->set( $this->prep_data($data) );
+            $this->db->set($this->prep_data($data));
             $result = $this->db->update($this->table_name);
 
-            $this->trigger('after_update', ['method' => 'update_by', 'fields' => $data, 'result' => $result] );
+            $this->trigger('after_update', ['method' => 'update_by', 'fields' => $data, 'result' => $result]);
 
             return $result;
         } else {
@@ -776,7 +776,7 @@ 
      */
     public function update_all($data, $skip_validation = FALSE)
     {
-        $data = $this->trigger('before_update', ['method' => 'update_all', 'fields' => $data] );
+        $data = $this->trigger('before_update', ['method' => 'update_all', 'fields' => $data]);
 
         $skip_validation = is_null($skip_validation) ? $this->skip_validation : $skip_validation;
 
@@ -786,10 +786,10 @@ 
 
         // Will be false if it didn't validate.
         if ($data !== FALSE) {
-            $this->db->set( $this->prep_data($data) );
+            $this->db->set($this->prep_data($data));
             $result = $this->db->update($this->table_name);
 
-            $this->trigger('after_update', ['method' => 'update_all', 'fields' => $data, 'result' => $result] );
+            $this->trigger('after_update', ['method' => 'update_all', 'fields' => $data, 'result' => $result]);
 
             return $result;
         } else {
@@ -808,9 +808,9 @@ 
      * @param int $value
      * @return mixed
      */
-    public function increment($id, $field, $value=1)
+    public function increment($id, $field, $value = 1)
     {
-        $value = (int)abs($value);
+        $value = (int) abs($value);
 
         $this->db->where($this->primary_key, $id);
         $this->db->set($field, "{$field}+{$value}", false);
@@ -829,9 +829,9 @@ 
      * @param int $value
      * @return mixed
      */
-    public function decrement($id, $field, $value=1)
+    public function decrement($id, $field, $value = 1)
     {
-        $value = (int)abs($value);
+        $value = (int) abs($value);
 
         $this->db->where($this->primary_key, $id);
         $this->db->set($field, "{$field}-{$value}", false);
@@ -849,7 +849,7 @@ 
      */
     public function delete($id)
     {
-        $this->trigger('before_delete', ['id' => $id, 'method' => 'delete'] );
+        $this->trigger('before_delete', ['id' => $id, 'method' => 'delete']);
 
         $this->db->where($this->primary_key, $id);
 
@@ -864,7 +864,7 @@ 
             $result = $this->db->delete($this->table_name);
         }
 
-        $this->trigger('after_delete', ['id' => $id, 'method' => 'delete', 'result' => $result] );
+        $this->trigger('after_delete', ['id' => $id, 'method' => 'delete', 'result' => $result]);
 
         return $result;
     }
@@ -888,7 +888,7 @@ 
             $result = $this->db->delete($this->table_name);
         }
 
-        $this->trigger('after_delete', ['method' => 'delete_by', 'fields' => $where, 'result' => $result] );
+        $this->trigger('after_delete', ['method' => 'delete_by', 'fields' => $where, 'result' => $result]);
 
         return $result;
     }
@@ -897,9 +897,9 @@ 
 
     public function delete_many($ids)
     {
-        if (!is_array($ids) || count($ids) == 0) return NULL;
+        if ( ! is_array($ids) || count($ids) == 0) return NULL;
 
-        $ids = $this->trigger('before_delete', ['ids' => $ids, 'method' => 'delete_many'] );
+        $ids = $this->trigger('before_delete', ['ids' => $ids, 'method' => 'delete_many']);
 
         $this->db->where_in($this->primary_key, $ids);
 
@@ -960,7 +960,7 @@ 
      * @param string $class
      * @return $this
      */
-    public function as_object($class=null)
+    public function as_object($class = null)
     {
         $this->temp_return_type = ! empty($class) ? $class : 'object';
 
@@ -1060,7 +1060,7 @@ 
      */
     public function return_insert_id($return = true)
     {
-        $this->return_insert_id = (bool)$return;
+        $this->return_insert_id = (bool) $return;
 
         return $this;
     }
@@ -1170,7 +1170,7 @@ 
 
         // Though the model doesn't support multiple keys well, $this->key
         // could be an array or a string...
-        $skippedFields = array_merge($skippedFields, (array)$this->primary_key);
+        $skippedFields = array_merge($skippedFields, (array) $this->primary_key);
 
         // Remove any protected attributes
         $skippedFields = array_merge($skippedFields, $this->protected_attributes);
@@ -1200,7 +1200,7 @@ 
      *
      * @return string
      */
-    public function last_query ()
+    public function last_query()
     {
         return $this->db->last_query();
     }
@@ -1213,11 +1213,11 @@ 
      *
      * @return mixed
      */
-    public function last_query_time ()
+    public function last_query_time()
     {
         $times = $this->db->query_times;
 
-        if (! is_array($this->db->query_times) || ! count($this->db->query_times))
+        if ( ! is_array($this->db->query_times) || ! count($this->db->query_times))
         {
             return null;
         }
@@ -1249,7 +1249,7 @@ 
         $row = $row['fields'];
 
         // Created_on
-        if (! array_key_exists($this->created_field, $row))
+        if ( ! array_key_exists($this->created_field, $row))
         {
             $row[$this->created_field] = $this->set_date();
         }
@@ -1260,7 +1260,7 @@ 
             // If you're here because of an error with $this->authenticate
             // not being available, it's likely due to you not using
             // the AuthTrait and/or setting log_user after model is instantiated.
-            $row[$this->created_by_field] = (int)$this->authenticate->id();
+            $row[$this->created_by_field] = (int) $this->authenticate->id();
         }
 
         return $row;
@@ -1332,7 +1332,7 @@ 
      */
     public function trigger($event, $data = false)
     {
-        if (! isset($this->$event) || ! is_array($this->$event))
+        if ( ! isset($this->$event) || ! is_array($this->$event))
         {
             if (isset($data['fields']))
             {
@@ -1397,18 +1397,18 @@ 
             $this->load->database();
         }
 
-        if (!empty($this->validation_rules)) {
+        if ( ! empty($this->validation_rules)) {
             $this->form_validation->set_data($data);
 
             if (is_array($this->validation_rules)) {
                 // Any insert additions?
                 if ($type == 'insert'
-                    && !empty($this->insert_validate_rules)
+                    && ! empty($this->insert_validate_rules)
                     && is_array($this->insert_validate_rules)
                 ) {
                     foreach ($this->validation_rules as &$row) {
                         if (isset($this->insert_validate_rules[$row['field']])) {
-                            $row ['rules'] .= '|' . $this->insert_validate_rules[$row['field']];
+                            $row ['rules'] .= '|'.$this->insert_validate_rules[$row['field']];
                         }
                     }
                 }
@@ -1475,7 +1475,7 @@ 
      */
     protected function set_date($user_date = NULL)
     {
-        $curr_date = !empty($user_date) ? $user_date : time();
+        $curr_date = ! empty($user_date) ? $user_date : time();
 
         switch ($this->date_format) {
             case 'int':
@@ -1499,7 +1499,7 @@ 
      *
      * @return mixed
      */
-    public function error($db_array_only=false)
+    public function error($db_array_only = false)
     {
         // Send any validation errors if we have any.
         if (function_exists('validation_errors') && validation_errors() && ! $db_array_only)
@@ -1515,7 +1515,7 @@ 
             return $error;
         }
 
-        if (! empty($error['code']))
+        if ( ! empty($error['code']))
         {
             return "Database Error {$error['code']}: {$error['message']}.";
         }
@@ -1565,7 +1565,7 @@ 
      * @param $name
      * @param $params
      */
-    public function __call($name, $params=null)
+    public function __call($name, $params = null)
     {
         if (method_exists($this->db, $name))
         {

myth/Modules.php

Spacing +91 added lines, -91 removed lines

@@ -37,20 +37,20 @@ 
  * available within the Router class, before get_instance() is available we'll have to
  * live with it for now.
  */
-include APPPATH . 'config/config.php';
+include APPPATH.'config/config.php';
 
-if ( isset( $config ) )
+if (isset($config))
 {
-	if ( is_array( $config['modules_locations'] ) )
+	if (is_array($config['modules_locations']))
 	{
 		Modules::$locations = $config['modules_locations'];
 	}
 	else
 	{
-		Modules::$locations = array( APPPATH . 'modules/' => '../modules/' );
+		Modules::$locations = array(APPPATH.'modules/' => '../modules/');
 	}
 
-	unset( $config );
+	unset($config);
 }
 
 
@@ -107,17 +107,17 @@ 
 	 *
 	 * @return bool
 	 */
-	public static function load_file( $file, $path, $type = 'other', $result = TRUE )
+	public static function load_file($file, $path, $type = 'other', $result = TRUE)
 	{
 
-		$file     = str_replace( '.php', '', $file );
-		$location = $path . $file . '.php';
+		$file     = str_replace('.php', '', $file);
+		$location = $path.$file.'.php';
 
-		if ( $type === 'other' )
+		if ($type === 'other')
 		{
-			if ( class_exists( $file, FALSE ) )
+			if (class_exists($file, FALSE))
 			{
-				log_message( 'debug', "File already loaded: {$location}" );
+				log_message('debug', "File already loaded: {$location}");
 
 				return $result;
 			}
@@ -129,14 +129,14 @@ 
 			/* load config or language array */
 			include $location;
 
-			if ( ! isset( $$type ) OR ! is_array( $$type ) )
+			if ( ! isset($$type) OR ! is_array($$type))
 			{
-				show_error( "{$location} does not contain a valid {$type} array" );
+				show_error("{$location} does not contain a valid {$type} array");
 			}
 
 			$result = $$type;
 		}
-		log_message( 'debug', "File loaded: {$location}" );
+		log_message('debug', "File loaded: {$location}");
 
 		return $result;
 	}
@@ -156,64 +156,64 @@ 
 	 *
 	 * @return  array           [ {full_path_to_file}, {file} ] or FALSE
 	 */
-	public static function find( $file, $module, $base )
+	public static function find($file, $module, $base)
 	{
-		if (! is_string($module) || ! is_string($file) || ! is_string($base))
+		if ( ! is_string($module) || ! is_string($file) || ! is_string($base))
 		{
 			throw new \InvalidArgumentException('Argument must be a string for Modules::find()');
 		}
 
 		// Find the actual file name. It will always be the last element.
-		$segments = explode( '/', $file );
-		$file     = array_pop( $segments );
-		$file_ext = ( pathinfo( $file, PATHINFO_EXTENSION ) ) ? $file : $file . '.php';
+		$segments = explode('/', $file);
+		$file     = array_pop($segments);
+		$file_ext = (pathinfo($file, PATHINFO_EXTENSION)) ? $file : $file.'.php';
 
 		// Put the pieces back to get the path.
-		$path = implode( '/', $segments ) . '/';
-		$base = rtrim( $base, '/' ) . '/';
+		$path = implode('/', $segments).'/';
+		$base = rtrim($base, '/').'/';
 
 		// Look in any possible module locations based on the string segments.
 		$modules = array();
-		if ( ! empty( $module ) )
+		if ( ! empty($module))
 		{
-			$modules[ $module ] = $path;
+			$modules[$module] = $path;
 		}
 
 		// Collect the modules from the segments
-		if ( ! empty( $segments ) )
+		if ( ! empty($segments))
 		{
-			$modules[ array_shift( $segments ) ] = ltrim( implode( '/', $segments ) . '/', '/' );
+			$modules[array_shift($segments)] = ltrim(implode('/', $segments).'/', '/');
 		}
 
-		foreach ( self::$locations as $location )
+		foreach (self::$locations as $location)
 		{
 
-			foreach ( $modules as $module => $subpath )
+			foreach ($modules as $module => $subpath)
 			{
 				// Combine the elements to make an actual path to the file
-				$fullpath = str_replace( '//', '/', "{$location}{$module}/{$base}{$subpath}" );
+				$fullpath = str_replace('//', '/', "{$location}{$module}/{$base}{$subpath}");
 
 				// If it starts with a '/' assume it's a full path already
-				if ( substr( $path, 0, 1 ) == '/' && strlen( $path ) > 1 )
+				if (substr($path, 0, 1) == '/' && strlen($path) > 1)
 				{
 					$fullpath = $path;
 				}
 
 				// Libraries are a special consideration since they are
 				// frequently ucfirst.
-				if ( $base == 'libraries/' AND is_file( $fullpath . ucfirst( $file_ext ) ) )
+				if ($base == 'libraries/' AND is_file($fullpath.ucfirst($file_ext)))
 				{
-					return array( $fullpath, ucfirst( $file ) );
+					return array($fullpath, ucfirst($file));
 				}
 
-				if ( is_file( $fullpath . $file_ext ) )
+				if (is_file($fullpath.$file_ext))
 				{
-					return array( $fullpath, $file );
+					return array($fullpath, $file);
 				}
 			}
 		}
 
-		return array( FALSE, $file );
+		return array(FALSE, $file);
 	}
 
 	//--------------------------------------------------------------------
@@ -225,33 +225,33 @@ 
 	 */
 	public static function listModules()
 	{
-		if ( ! function_exists( 'directory_map' ) )
+		if ( ! function_exists('directory_map'))
 		{
-			require BASEPATH . 'helpers/directory_helper.php';
+			require BASEPATH.'helpers/directory_helper.php';
 		}
 
 		$map = array();
 
-		foreach ( self::$locations as $folder )
+		foreach (self::$locations as $folder)
 		{
 
-			$dirs = directory_map( $folder, 1 );
-			if ( ! is_array( $dirs ) )
+			$dirs = directory_map($folder, 1);
+			if ( ! is_array($dirs))
 			{
 				$dirs = array();
 			}
 
-			$map = array_merge( $map, $dirs );
+			$map = array_merge($map, $dirs);
 		}
 
 		// Clean out any html or php files
-		if ( $count = count( $map ) )
+		if ($count = count($map))
 		{
-			for ( $i = 0; $i < $count; $i ++ )
+			for ($i = 0; $i < $count; $i++)
 			{
-				if ( strpos( $map[ $i ], '.html' ) !== FALSE || strpos( $map[ $i ], '.php' ) !== FALSE )
+				if (strpos($map[$i], '.html') !== FALSE || strpos($map[$i], '.php') !== FALSE)
 				{
-					unset( $map[ $i ] );
+					unset($map[$i]);
 				}
 			}
 		}
@@ -278,17 +278,17 @@ 
 	 *
 	 * @return boolean
 	 */
-	public static function controllerExists($controller, $module )
+	public static function controllerExists($controller, $module)
 	{
-		if (! is_string($module) || ! is_string($controller))
+		if ( ! is_string($module) || ! is_string($controller))
 		{
 			throw new \InvalidArgumentException('Argument must be a string for Modules::controllerExists()');
 		}
 
 		// Look in all module paths
-		foreach ( self::$locations as $folder )
+		foreach (self::$locations as $folder)
 		{
-			if ( is_file( "{$folder}{$module}/controllers/{$controller}.php" ) )
+			if (is_file("{$folder}{$module}/controllers/{$controller}.php"))
 			{
 				return TRUE;
 			}
@@ -308,18 +308,18 @@ 
 	 *
 	 * @return  string          The full path to the file, or false if the file was not found
 	 */
-	public static function filePath( $module, $folder, $file )
+	public static function filePath($module, $folder, $file)
 	{
-		if (! is_string($module) || ! is_string($folder) || ! is_string($file))
+		if ( ! is_string($module) || ! is_string($folder) || ! is_string($file))
 		{
 			throw new \InvalidArgumentException('Argument must be a string for Modules::filePath()');
 		}
 
-		foreach ( self::$locations as $location )
+		foreach (self::$locations as $location)
 		{
 			$test_file = "{$location}{$module}/{$folder}/{$file}";
 
-			if ( is_file( $test_file ) )
+			if (is_file($test_file))
 			{
 				return $test_file;
 			}
@@ -338,23 +338,23 @@ 
 	 *
 	 * @return string The path, relative to the front controller, or false if the folder was not found
 	 */
-	public static function path( $module, $folder = null )
+	public static function path($module, $folder = null)
 	{
-		if (! is_string($module) || (! is_string($folder) && !is_null($folder) ) )
+		if ( ! is_string($module) || ( ! is_string($folder) && ! is_null($folder)))
 		{
 			throw new \InvalidArgumentException('Argument must be a string for Modules::path()');
 		}
 
-		foreach ( self::$locations as $module_folder )
+		foreach (self::$locations as $module_folder)
 		{
-			if ( is_dir( $module_folder . $module ) )
+			if (is_dir($module_folder.$module))
 			{
-				if ( ! empty( $folder ) && is_dir( "{$module_folder}{$module}/{$folder}" ) )
+				if ( ! empty($folder) && is_dir("{$module_folder}{$module}/{$folder}"))
 				{
 					return "{$module_folder}{$module}/{$folder}/";
 				}
 
-				return $module_folder . $module . '/';
+				return $module_folder.$module.'/';
 			}
 		}
 
@@ -372,58 +372,58 @@ 
 	 *
 	 * @return array An associative array, like: array('module_name' => array('folder' => array('file1', 'file2')))
 	 */
-	public static function files( $module_name = NULL, $module_folder = NULL )
+	public static function files($module_name = NULL, $module_folder = NULL)
 	{
-		if ( ! function_exists( 'directory_map' ) )
+		if ( ! function_exists('directory_map'))
 		{
-			require BASEPATH . 'helpers/directory_helper.php';
+			require BASEPATH.'helpers/directory_helper.php';
 		}
 
 		$files = array();
 
-		foreach ( self::$locations as $path )
+		foreach (self::$locations as $path)
 		{
 
 			// Only map the whole modules directory if $module_name isn't passed
-			if ( empty( $module_name ) )
+			if (empty($module_name))
 			{
-				$modules = directory_map( $path );
+				$modules = directory_map($path);
 			}
 			// Only map the $module_name directory if it exists
-			elseif ( is_dir( $path . $module_name ) )
+			elseif (is_dir($path.$module_name))
 			{
-				$path                    = $path . $module_name;
-				$modules[ $module_name ] = directory_map( $path );
+				$path                    = $path.$module_name;
+				$modules[$module_name] = directory_map($path);
 			}
 
 			// If the element is not an array, it's a file, so ignore it.
 			// Otherwise it is assumed to be a module.
-			if ( empty( $modules ) || ! is_array( $modules ) )
+			if (empty($modules) || ! is_array($modules))
 			{
 				continue;
 			}
 
-			foreach ( $modules as $mod_name => $values )
+			foreach ($modules as $mod_name => $values)
 			{
-				if ( is_array( $values ) )
+				if (is_array($values))
 				{
 					// Add just the specified folder for this module
-					if ( ! empty( $module_folder ) && isset( $values[ $module_folder .'/' ] ) && count( $values[ $module_folder .'/' ] ) )
+					if ( ! empty($module_folder) && isset($values[$module_folder.'/']) && count($values[$module_folder.'/']))
 					{
-						$files[ $mod_name ] = array(
-							$module_folder .'/' => $values[ $module_folder .'/' ],
+						$files[$mod_name] = array(
+							$module_folder.'/' => $values[$module_folder.'/'],
 						);
 					}
 					// Add the entire module
-					elseif ( empty( $module_folder ) )
+					elseif (empty($module_folder))
 					{
-						$files[ $mod_name ] = $values;
+						$files[$mod_name] = $values;
 					}
 				}
 			}
 		}
 
-		return count( $files ) ? $files : null;
+		return count($files) ? $files : null;
 	}
 
 	//--------------------------------------------------------------------
@@ -436,37 +436,37 @@ 
 	 *
 	 * @return array
 	 */
-	public static function parse_routes( $module, $uri )
+	public static function parse_routes($module, $uri)
 	{
 
 		/* load the route file */
-		if ( ! isset( self::$routes[ $module ] ) )
+		if ( ! isset(self::$routes[$module]))
 		{
-			if ( list( $path ) = self::find( 'routes', $module, 'config/' ) AND $path )
+			if (list($path) = self::find('routes', $module, 'config/') AND $path)
 			{
-				self::$routes[ $module ] = self::load_file( 'routes', $path, 'route' );
+				self::$routes[$module] = self::load_file('routes', $path, 'route');
 			}
 		}
 
-		if ( ! isset( self::$routes[ $module ] ) )
+		if ( ! isset(self::$routes[$module]))
 		{
 			return;
 		}
 
 		/* parse module routes */
-		foreach ( self::$routes[ $module ] as $key => $val )
+		foreach (self::$routes[$module] as $key => $val)
 		{
 
-			$key = str_replace( array( ':any', ':num' ), array( '.+', '[0-9]+' ), $key );
+			$key = str_replace(array(':any', ':num'), array('.+', '[0-9]+'), $key);
 
-			if ( preg_match( '#^' . $key . '$#', $uri ) )
+			if (preg_match('#^'.$key.'$#', $uri))
 			{
-				if ( strpos( $val, '$' ) !== FALSE AND strpos( $key, '(' ) !== FALSE )
+				if (strpos($val, '$') !== FALSE AND strpos($key, '(') !== FALSE)
 				{
-					$val = preg_replace( '#^' . $key . '$#', $val, $uri );
+					$val = preg_replace('#^'.$key.'$#', $val, $uri);
 				}
 
-				return explode( '/', $module . '/' . $val );
+				return explode('/', $module.'/'.$val);
 			}
 		}
 	}
@@ -482,17 +482,17 @@ 
 	 *
 	 * @param $class
 	 */
-	public static function autoload( $class )
+	public static function autoload($class)
 	{
 
 		/* don't autoload CI_ prefixed classes or those using the config subclass_prefix */
-		if ( strstr( $class, 'CI_' ) OR strstr( $class, config_item( 'subclass_prefix' ) ) )
+		if (strstr($class, 'CI_') OR strstr($class, config_item('subclass_prefix')))
 		{
 			return;
 		}
 
 		/* autoload core classes */
-		if ( is_file( $location = APPPATH . 'core/' . $class . '.php' ) )
+		if (is_file($location = APPPATH.'core/'.$class.'.php'))
 		{
 			include_once $location;
 
@@ -500,7 +500,7 @@ 
 		}
 
 		/* autoload library classes */
-		if ( is_file( $location = APPPATH . 'libraries/' . $class . '.php' ) )
+		if (is_file($location = APPPATH.'libraries/'.$class.'.php'))
 		{
 			include_once $location;
 

myth/Route.php

Spacing +29 added lines, -30 removed lines

@@ -162,10 +162,10 @@ 
     {
         // Ensure consistency
         $name    = trim($name, '{} ');
-        $pattern = '(' . trim($pattern, '() ') . ')';
+        $pattern = '('.trim($pattern, '() ').')';
 
         // Not here? Add it and leave...
-        if (! array_key_exists($name, $this->constraints)) {
+        if ( ! array_key_exists($name, $this->constraints)) {
             $this->constraints[$name] = $pattern;
 
             return;
@@ -231,7 +231,7 @@ 
 
         // To register a route, we'll set a flag so that our router
         // so it will see the groupname.
-        $this->group = ltrim($old_group . '/' . $name, '/');
+        $this->group = ltrim($old_group.'/'.$name, '/');
 
         call_user_func($callback);
 
@@ -429,24 +429,23 @@ 
         // If a new module was specified, simply put that path
         // in front of the controller.
         if (isset($options['module'])) {
-            $new_name = $options['module'] . '/' . $new_name;
+            $new_name = $options['module'].'/'.$new_name;
         }
 
         // In order to allow customization of allowed id values
         // we need someplace to store them.
-        $id = isset($this->constraints[$this->default_constraint]) ? $this->constraints[$this->default_constraint] :
-            '(:any)';
+        $id = isset($this->constraints[$this->default_constraint]) ? $this->constraints[$this->default_constraint] : '(:any)';
 
         if (isset($options['constraint'])) {
             $id = $options['constraint'];
         }
 
-        $this->get($name, $new_name . '/list_all', $options);
-        $this->get($name . '/' . $id, $new_name . '/show/$1', $options);
-        $this->post($name, $new_name . '/create', $options);
-        $this->put($name . '/' . $id, $new_name . '/update/$1', $options);
-        $this->delete($name . '/' . $id, $new_name . '/delete/$1', $options);
-        $this->options($name, $new_name . '/index', $options);
+        $this->get($name, $new_name.'/list_all', $options);
+        $this->get($name.'/'.$id, $new_name.'/show/$1', $options);
+        $this->post($name, $new_name.'/create', $options);
+        $this->put($name.'/'.$id, $new_name.'/update/$1', $options);
+        $this->delete($name.'/'.$id, $new_name.'/delete/$1', $options);
+        $this->options($name, $new_name.'/index', $options);
     }
 
     //--------------------------------------------------------------------
@@ -468,11 +467,11 @@ 
         self::$areas[$area] = $controller;
 
         // Create routes for this area.
-        $this->create($area . '/(:any)/(:any)/(:any)/(:any)/(:any)', '$1/' . $controller . '/$2/$3/$4/$5', $options);
-        $this->create($area . '/(:any)/(:any)/(:any)/(:any)', '$1/' . $controller . '/$2/$3/$4', $options);
-        $this->create($area . '/(:any)/(:any)/(:any)', '$1/' . $controller . '/$2/$3', $options);
-        $this->create($area . '/(:any)/(:any)', '$1/' . $controller . '/$2', $options);
-        $this->create($area . '/(:any)', '$1/' . $controller, $options);
+        $this->create($area.'/(:any)/(:any)/(:any)/(:any)/(:any)', '$1/'.$controller.'/$2/$3/$4/$5', $options);
+        $this->create($area.'/(:any)/(:any)/(:any)/(:any)', '$1/'.$controller.'/$2/$3/$4', $options);
+        $this->create($area.'/(:any)/(:any)/(:any)', '$1/'.$controller.'/$2/$3', $options);
+        $this->create($area.'/(:any)/(:any)', '$1/'.$controller.'/$2', $options);
+        $this->create($area.'/(:any)', '$1/'.$controller, $options);
     }
 
     //--------------------------------------------------------------------
@@ -534,7 +533,7 @@ 
     {
         $paths = func_get_args();
 
-        if (! is_array($paths) || ! count($paths)) {
+        if ( ! is_array($paths) || ! count($paths)) {
             return;
         }
 
@@ -577,20 +576,20 @@ 
      */
     private function create($from, $to, $options = array())
     {
-        $prefix = is_null($this->group) ? '' : $this->group . '/';
+        $prefix = is_null($this->group) ? '' : $this->group.'/';
 
-        $from = $prefix . $from;
+        $from = $prefix.$from;
 
         // Are we saving the name for this one?
-        if (isset($options['as']) && !empty($options['as'])) {
+        if (isset($options['as']) && ! empty($options['as'])) {
             self::$names[$options['as']] = $from;
         }
 
         // Limiting to subdomains?
-        if (isset($options['subdomain']) && !empty($options['subdomain'])) {
+        if (isset($options['subdomain']) && ! empty($options['subdomain'])) {
             // If we don't match the current subdomain, then
             // we don't need to add the route.
-            if (!$this->checkSubdomains($options['subdomain'])) {
+            if ( ! $this->checkSubdomains($options['subdomain'])) {
                 return;
             }
         }
@@ -602,11 +601,11 @@ 
             // Get a constant string to work with.
             $to = preg_replace('/(\$\d+)/', '$X', $to);
 
-            for ($i = (int)$options['offset'] + 1; $i < (int)$options['offset'] + 7; $i ++) {
+            for ($i = (int) $options['offset'] + 1; $i < (int) $options['offset'] + 7; $i++) {
                 $to = preg_replace_callback(
                     '/\$X/',
-                    function ($m) use ($i) {
-                        return '$' . $i;
+                    function($m) use ($i) {
+                        return '$'.$i;
                     },
                     $to,
                     1
@@ -616,7 +615,7 @@ 
 
         // Convert any custom constraints to the CI/pattern equivalent
         foreach ($this->constraints as $name => $pattern) {
-            $from = str_replace('{' . $name . '}', $pattern, $from);
+            $from = str_replace('{'.$name.'}', $pattern, $from);
         }
 
         $this->routes[$from] = $to;
@@ -637,7 +636,7 @@ 
             $this->determineCurrentSubdomain();
         }
 
-        if (!is_array($subdomains)) {
+        if ( ! is_array($subdomains)) {
             $subdomains = array($subdomains);
         }
 
@@ -645,7 +644,7 @@ 
 
         array_walk(
             $subdomains,
-            function ($subdomain) use (&$matched) {
+            function($subdomain) use (&$matched) {
                 if ($subdomain == $this->current_subdomain || $subdomain == '*') {
                     $matched = true;
                 }
@@ -670,7 +669,7 @@ 
         // If we only have 2 parts, then we don't have a subdomain.
         // This won't be totally accurate, since URL's like example.co.uk
         // would still pass, but it helps to separate the chaff...
-        if (!is_array($host) || count($host) == 2) {
+        if ( ! is_array($host) || count($host) == 2) {
             // Set it to false so we don't make it back here again.
             $this->current_subdomain = false;
             return;

myth/Settings/ConfigStore.php

Spacing +8 added lines, -8 removed lines

@@ -53,14 +53,14 @@ 
 
     //--------------------------------------------------------------------
 
-    public function __construct( $ci=null )
+    public function __construct($ci = null)
     {
         if (is_object($ci))
         {
-            $this->ci =& $ci;
+            $this->ci = & $ci;
         }
         else {
-            $this->ci =& get_instance();
+            $this->ci = & get_instance();
         }
     }
 
@@ -73,7 +73,7 @@ 
      * @param null $value
      * @param string $group
      */
-    public function save($key, $value=null, $group='app')
+    public function save($key, $value = null, $group = 'app')
     {
         // Treat the 'app' group as our primary, un-sectioned
         // config files.
@@ -83,7 +83,7 @@ 
         }
 
         // Otherwise, we'll need to ensure a section exists
-        if (! isset($this->ci->config->config[$group]))
+        if ( ! isset($this->ci->config->config[$group]))
         {
             $this->ci->config->config[$group] = [];
         }
@@ -102,7 +102,7 @@ 
      * @param string $group
      * @return mixed
      */
-    public function get($key, $group='application')
+    public function get($key, $group = 'application')
     {
         // First, see if CI already has this key loaded.
         $result = $this->ci->config->item($key);
@@ -134,7 +134,7 @@ 
      * @param $group
      * @return mixed
      */
-    public function delete($key, $group='app')
+    public function delete($key, $group = 'app')
     {
         return false;
     }
@@ -163,7 +163,7 @@ 
      * @param string $group
      * @return mixed
      */
-    public function all($group=null)
+    public function all($group = null)
     {
         if (empty($group))
         {

myth/Settings/DatabaseStore.php

Spacing +11 added lines, -11 removed lines

@@ -38,14 +38,14 @@ 
 
     //--------------------------------------------------------------------
 
-    public function __construct( $ci=null )
+    public function __construct($ci = null)
     {
         if (is_object($ci))
         {
-            $this->ci =& $ci;
+            $this->ci = & $ci;
         }
         else {
-            $this->ci =& get_instance();
+            $this->ci = & get_instance();
         }
 
         // Ensure that the database is loaded.
@@ -65,7 +65,7 @@ 
      * @param string $group
      * @return bool
      */
-    public function save($key, $value=null, $group='app')
+    public function save($key, $value = null, $group = 'app')
     {
         if (empty($this->ci->db) || ! is_object($this->ci->db))
         {
@@ -100,7 +100,7 @@ 
      * @param string $group
      * @return mixed
      */
-    public function get($key, $group='app')
+    public function get($key, $group = 'app')
     {
         if (empty($this->ci->db) || ! is_object($this->ci->db))
         {
@@ -115,7 +115,7 @@ 
         $query = $this->ci->db->where($where)
                               ->get('settings');
 
-        if (! $query->num_rows())
+        if ( ! $query->num_rows())
         {
             return false;
         }
@@ -123,7 +123,7 @@ 
         $value = $query->row()->value;
 
         // Check to see if it needs to be unserialized
-        $data = @unserialize($value);   // We don't need to issue an E_NOTICE here...
+        $data = @unserialize($value); // We don't need to issue an E_NOTICE here...
 
         // Check for a value of false or
         if ($value === 'b:0;' || $data !== false)
@@ -143,7 +143,7 @@ 
      * @param $group
      * @return mixed
      */
-    public function delete($key, $group='app')
+    public function delete($key, $group = 'app')
     {
         if (empty($this->ci->db) || ! is_object($this->ci->db))
         {
@@ -177,7 +177,7 @@ 
         $query = $this->ci->db->where($field, $value)
                               ->get('settings');
 
-        if (! $query->num_rows())
+        if ( ! $query->num_rows())
         {
             return false;
         }
@@ -193,7 +193,7 @@ 
      * @param string $group
      * @return mixed
      */
-    public function all($group=null)
+    public function all($group = null)
     {
         if (empty($this->ci->db) || ! is_object($this->ci->db))
         {
@@ -202,7 +202,7 @@ 
 
         $query = $this->ci->db->get('settings');
 
-        if (! $query->num_rows())
+        if ( ! $query->num_rows())
         {
             return false;
         }

myth/Settings/Settings.php

Spacing +19 added lines, -19 removed lines

@@ -70,15 +70,15 @@ 
         {
             foreach ($user_stores as $alias => $class)
             {
-                self::$stores[ strtolower($alias) ] = new $class();
+                self::$stores[strtolower($alias)] = new $class();
             }
         }
 
         self::$default_store = config_item('settings.default_store');
 
-        if (empty(self::$stores[ self::$default_store ]))
+        if (empty(self::$stores[self::$default_store]))
         {
-            show_error( lang('settings.bad_default') );
+            show_error(lang('settings.bad_default'));
         }
     }
 
@@ -92,7 +92,7 @@ 
      * @param string $group
      * @param string $store
      */
-    public static function save($key, $value=null, $group='app', $store=null)
+    public static function save($key, $value = null, $group = 'app', $store = null)
     {
         self::init();
 
@@ -103,7 +103,7 @@ 
             $store = self::$default_store;
         }
 
-        return self::$stores[ $store ]->save($key, $value, $group);
+        return self::$stores[$store]->save($key, $value, $group);
     }
 
     //--------------------------------------------------------------------
@@ -118,7 +118,7 @@ 
      * @param string $store
      * @return mixed
      */
-    public static function get($key, $group='app', $store=null)
+    public static function get($key, $group = 'app', $store = null)
     {
         self::init();
 
@@ -126,13 +126,13 @@ 
 
         // If the store is specified but doesn't exist, crap out
         // so that they developer has a chance to fix it.
-        if (! is_null($store) && empty(self::$stores[$store]))
+        if ( ! is_null($store) && empty(self::$stores[$store]))
         {
-            show_error( sprintf( lang('settings.cant_retrieve'), $store ) );
+            show_error(sprintf(lang('settings.cant_retrieve'), $store));
         }
 
         // If $store is set, get the value from that store only.
-        if (! empty($store))
+        if ( ! empty($store))
         {
             return self::$stores[$store]->get($key, $group);
         }
@@ -160,7 +160,7 @@ 
      * @param $store
      * @return mixed
      */
-    public static function delete($key, $group='app', $store=null)
+    public static function delete($key, $group = 'app', $store = null)
     {
         self::init();
 
@@ -168,19 +168,19 @@ 
 
         // If the store is specified but doesn't exist, crap out
         // so that they developer has a chance to fix it.
-        if (! is_null($store) && empty(self::$stores[$store]))
+        if ( ! is_null($store) && empty(self::$stores[$store]))
         {
-            show_error( sprintf( lang('settings.cant_retrieve'), $store ) );
+            show_error(sprintf(lang('settings.cant_retrieve'), $store));
         }
 
         // If $store is set, get the value from that store only.
-        if (! empty($store))
+        if ( ! empty($store))
         {
             return self::$stores[$store]->delete($key, $group);
         }
 
         // Otherwise delete from the default store
-        return self::$stores[ self::$default_store ]->delete($key, $group);
+        return self::$stores[self::$default_store]->delete($key, $group);
     }
 
     //--------------------------------------------------------------------
@@ -215,15 +215,15 @@ 
      * @param string $group
      * @return mixed
      */
-    public static function all($group=null, $store=null)
+    public static function all($group = null, $store = null)
     {
         self::init();
 
         $group = strtolower($group);
 
-        if (! empty($store))
+        if ( ! empty($store))
         {
-            return self::$stores[ $store ]->all($group);
+            return self::$stores[$store]->all($group);
         }
 
         // Otherwise combine the results from all stores
@@ -234,7 +234,7 @@ 
             $found = $s->all($group);
             if ($found)
             {
-                $results = array_merge($results, (array)$found);
+                $results = array_merge($results, (array) $found);
             }
         }
 
@@ -256,7 +256,7 @@ 
 
         if (class_exists($class))
         {
-            self::$stores[ strtolower($alias) ] = new $class();
+            self::$stores[strtolower($alias)] = new $class();
             return true;
         }
 

myth/Settings/SettingsStoreInterface.php

Spacing +4 added lines, -4 removed lines

@@ -47,7 +47,7 @@ 
      * @param null $value
      * @param string $group
      */
-    public function save($key, $value=null, $group='app');
+    public function save($key, $value = null, $group = 'app');
 
     //--------------------------------------------------------------------
 
@@ -58,7 +58,7 @@ 
      * @param string $group
      * @return mixed
      */
-    public function get($key, $group='app');
+    public function get($key, $group = 'app');
 
     //--------------------------------------------------------------------
 
@@ -69,7 +69,7 @@ 
      * @param $group
      * @return mixed
      */
-    public function delete($key, $group='app');
+    public function delete($key, $group = 'app');
 
     //--------------------------------------------------------------------
 
@@ -90,7 +90,7 @@ 
      * @param string $group
      * @return mixed
      */
-    public function all($group=null);
+    public function all($group = null);
 
     //--------------------------------------------------------------------
 

myth/Themers/MetaCollection.php

Spacing +6 added lines, -6 removed lines

@@ -1,6 +1,6 @@ 
 <?php namespace Myth\Themers;
 
-require_once dirname(__FILE__) .'/escape.php';
+require_once dirname(__FILE__).'/escape.php';
 
 /**
  * Sprint
@@ -108,7 +108,7 @@ 
      *
      * @return mixed
      */
-    public function set($alias, $value=null, $escape=true)
+    public function set($alias, $value = null, $escape = true)
     {
         if (is_array($alias))
         {
@@ -128,7 +128,7 @@ 
             return $this;
         }
 
-        $this->meta[ strtolower($alias) ] = $escape ? esc($value, 'htmlAttr') : $value;
+        $this->meta[strtolower($alias)] = $escape ? esc($value, 'htmlAttr') : $value;
 
         return $this;
     }
@@ -146,7 +146,7 @@ 
     {
         $alias = strtolower($alias);
 
-        return isset($this->meta[ $alias ]) ? $this->meta[$alias] : null;
+        return isset($this->meta[$alias]) ? $this->meta[$alias] : null;
     }
 
     //--------------------------------------------------------------------
@@ -158,7 +158,7 @@ 
      */
     public function renderTags()
     {
-        if (! count($this->meta))
+        if ( ! count($this->meta))
         {
             return null;
         }
@@ -227,7 +227,7 @@ 
      * @param $alias
      * @param null $value
      */
-    public function __set($alias, $value=null)
+    public function __set($alias, $value = null)
     {
         $this->set($alias, $value);
     }

myth/Themers/MetaInterface.php

Spacing +1 added lines, -1 removed lines

@@ -41,7 +41,7 @@
      *
      * @return mixed
      */
-    public function set($alias, $value=null);
+    public function set($alias, $value = null);
 
     //--------------------------------------------------------------------