kenjis / ci-phpunit-test

application/tests/_ci_phpunit_test/replacing/core/Loader.php

Doc Comments +9 added lines, -9 removed lines

@@ -191,7 +191,7 @@ 
 	 * @param	mixed	$library	Library name
 	 * @param	array	$params		Optional parameters to pass to the library class constructor
 	 * @param	string	$object_name	An optional object name to assign to
-	 * @return	object
+	 * @return	CI_Loader
 	 *
 	 * @codeCoverageIgnore
 	 */
@@ -237,7 +237,7 @@ 
 	 * @param	string	$model		Model name
 	 * @param	string	$name		An optional object name to assign to
 	 * @param	bool	$db_conn	An optional database connection configuration to initialize
-	 * @return	object
+	 * @return	CI_Loader
 	 *
 	 * modified by ci-phpunit-test
 	 */
@@ -369,7 +369,7 @@ 
 	/**
 	 * Database Loader
 	 *
-	 * @param	mixed	$params		Database configuration options
+	 * @param	string|boolean	$params		Database configuration options
 	 * @param	bool	$return 	Whether to return the database object
 	 * @param	bool	$query_builder	Whether to enable Query Builder
 	 *					(overrides the configuration setting)
@@ -533,7 +533,7 @@ 
 	 *					An associative array or object containing values
 	 *					to be set, or a value's name if string
 	 * @param 	string	$val	Value to set, only used if $vars is a string
-	 * @return	object
+	 * @return	CI_Loader
 	 *
 	 * @codeCoverageIgnore
 	 */
@@ -607,7 +607,7 @@ 
 	 * Helper Loader
 	 *
 	 * @param	string|string[]	$helpers	Helper name(s)
-	 * @return	object
+	 * @return	CI_Loader
 	 *
 	 * @codeCoverageIgnore
 	 */
@@ -686,7 +686,7 @@ 
 	 *
 	 * @uses	CI_Loader::helper()
 	 * @param	string|string[]	$helpers	Helper name(s)
-	 * @return	object
+	 * @return	CI_Loader
 	 *
 	 * @codeCoverageIgnore
 	 */
@@ -704,7 +704,7 @@ 
 	 *
 	 * @param	string|string[]	$files	List of language file names to load
 	 * @param	string		Language name
-	 * @return	object
+	 * @return	CI_Loader
 	 *
 	 * @codeCoverageIgnore
 	 */
@@ -804,7 +804,7 @@ 
 	 *
 	 * @param	string	$path		Path to add
 	 * @param 	bool	$view_cascade	(default: TRUE)
-	 * @return	object
+	 * @return	CI_Loader
 	 *
 	 * @codeCoverageIgnore
 	 */
@@ -852,7 +852,7 @@ 
 	 * added path will be removed removed.
 	 *
 	 * @param	string	$path	Path to remove
-	 * @return	object
+	 * @return	CI_Loader
 	 *
 	 * @codeCoverageIgnore
 	 */

Braces +15 added lines, -30 removed lines

@@ -200,16 +200,14 @@ 
 		if (empty($library))
 		{
 			return $this;
-		}
-		elseif (is_array($library))
+		} elseif (is_array($library))
 		{
 			foreach ($library as $key => $value)
 			{
 				if (is_int($key))
 				{
 					$this->library($value, $params);
-				}
-				else
+				} else
 				{
 					$this->library($key, $params, $value);
 				}
@@ -246,8 +244,7 @@ 
 		if (empty($model))
 		{
 			return $this;
-		}
-		elseif (is_array($model))
+		} elseif (is_array($model))
 		{
 			foreach ($model as $key => $value)
 			{
@@ -313,8 +310,7 @@ 
 				{
 					throw new RuntimeException($app_path."Model.php exists, but doesn't declare class CI_Model");
 				}
-			}
-			elseif ( ! class_exists('CI_Model', FALSE))
+			} elseif ( ! class_exists('CI_Model', FALSE))
 			{
 				require_once(BASEPATH.'core'.DIRECTORY_SEPARATOR.'Model.php');
 			}
@@ -471,8 +467,7 @@ 
 				require_once($driver_path);
 				$class = 'CI_DB_'.$db->dbdriver.'_'.$db->subdriver.'_forge';
 			}
-		}
-		else
+		} else
 		{
 			$class = 'CI_DB_'.$db->dbdriver.'_forge';
 		}
@@ -759,16 +754,14 @@ 
 				if (is_int($key))
 				{
 					$this->driver($value, $params);
-				}
-				else
+				} else
 				{
 					$this->driver($key, $params, $value);
 				}
 			}
 
 			return $this;
-		}
-		elseif (empty($library))
+		} elseif (empty($library))
 		{
 			return FALSE;
 		}
@@ -867,8 +860,7 @@ 
 			array_shift($this->_ci_helper_paths);
 			array_shift($this->_ci_view_paths);
 			array_pop($config->_config_paths);
-		}
-		else
+		} else
 		{
 			$path = rtrim($path, '/').'/';
 			foreach (array('_ci_library_paths', '_ci_model_paths', '_ci_helper_paths') as $var)
@@ -932,8 +924,7 @@ 
 		{
 			$_ci_x = explode('/', $_ci_path);
 			$_ci_file = end($_ci_x);
-		}
-		else
+		} else
 		{
 			$_ci_ext = pathinfo($_ci_view, PATHINFO_EXTENSION);
 			$_ci_file = ($_ci_ext === '') ? $_ci_view.'.php' : $_ci_view;
@@ -1000,8 +991,7 @@ 
 		if ( ! is_php('5.4') && ! ini_get('short_open_tag') && config_item('rewrite_short_tags') === TRUE)
 		{
 			echo eval('?>'.preg_replace('/;*\s*\?>/', '; ?>', str_replace('<?=', '<?php echo ', file_get_contents($_ci_path))));
-		}
-		else
+		} else
 		{
 			include($_ci_path); // include() vs include_once() allows for multiple views with the same name
 		}
@@ -1028,8 +1018,7 @@ 
 		if (ob_get_level() > $this->_ci_ob_level + 1)
 		{
 			ob_end_flush();
-		}
-		else
+		} else
 		{
 			$_ci_CI->output->append_output(ob_get_contents());
 			@ob_end_clean();
@@ -1069,8 +1058,7 @@ 
 
 			// Get the filename from the path
 			$class = substr($class, $last_slash);
-		}
-		else
+		} else
 		{
 			$subdir = '';
 		}
@@ -1208,8 +1196,7 @@ 
 		if (file_exists(TESTPATH.'_ci_phpunit_test/replacing/libraries/'.$file_path.$library_name.'.php'))
 		{
 			include_once(TESTPATH.'_ci_phpunit_test/replacing/libraries/'.$file_path.$library_name.'.php');
-		}
-		else
+		} else
 		{
 			include_once(BASEPATH.'libraries/'.$file_path.$library_name.'.php');
 		}
@@ -1273,8 +1260,7 @@ 
 					{
 						include($path.'config/'.strtolower($class).'.php');
 						$found = TRUE;
-					}
-					elseif (file_exists($path.'config/'.ucfirst(strtolower($class)).'.php'))
+					} elseif (file_exists($path.'config/'.ucfirst(strtolower($class)).'.php'))
 					{
 						include($path.'config/'.ucfirst(strtolower($class)).'.php');
 						$found = TRUE;
@@ -1284,8 +1270,7 @@ 
 					{
 						include($path.'config/'.ENVIRONMENT.'/'.strtolower($class).'.php');
 						$found = TRUE;
-					}
-					elseif (file_exists($path.'config/'.ENVIRONMENT.'/'.ucfirst(strtolower($class)).'.php'))
+					} elseif (file_exists($path.'config/'.ENVIRONMENT.'/'.ucfirst(strtolower($class)).'.php'))
 					{
 						include($path.'config/'.ENVIRONMENT.'/'.ucfirst(strtolower($class)).'.php');
 						$found = TRUE;