Refactor exception handling in core/Config

David Otis · David Otis · commit c64fe80f0e77 · 2015-11-15T17:54:38.000-04:00
diff --git a/system/core/Config.php b/system/core/Config.php
@@ -115,6 +115,7 @@ public function __construct()
 	 * @param	bool	$use_sections		Whether configuration values should be loaded into their own section
 	 * @param	bool	$fail_gracefully	Whether to just return FALSE or display an error message
 	 * @return	bool	TRUE if the file was loaded correctly or FALSE on failure
+	 * @throws	RuntimeException		Throws a runtime exception if the config file can't be found or doesn't have a valid configuration array.
 	 */
 	public function load($file = '', $use_sections = FALSE, $fail_gracefully = FALSE)
 	{
@@ -145,7 +146,7 @@ public function load($file = '', $use_sections = FALSE, $fail_gracefully = FALSE
 						return FALSE;
 					}
 
-					show_error('Your '.$file_path.' file does not appear to contain a valid configuration array.');
+					throw new RuntimeException('Your '.$file_path.' file does not appear to contain a valid configuration array.');
 				}
 
 				if ($use_sections === TRUE)
@@ -175,7 +176,7 @@ public function load($file = '', $use_sections = FALSE, $fail_gracefully = FALSE
 			return FALSE;
 		}
 
-		show_error('The configuration file '.$file.'.php does not exist.');
+		throw new RuntimeException('The configuration file '.$file.'.php does not exist.');
 	}
 
 	// --------------------------------------------------------------------
diff --git a/tests/codeigniter/core/Config_test.php b/tests/codeigniter/core/Config_test.php
@@ -226,7 +226,7 @@ public function test_load()
 		// Test regular fail of invalid file
 		$this->setExpectedException(
 			'RuntimeException',
-			'CI Error: Your '.$this->ci_vfs_path('config/'.$file.'.php', APPPATH).
+			'Your '.$this->ci_vfs_path('config/'.$file.'.php', APPPATH).
 				' file does not appear to contain a valid configuration array.'
 		);
 		$this->assertNull($this->config->load($file));
@@ -243,7 +243,7 @@ public function test_load_nonexistent()
 		$file = 'absentia';
 		$this->setExpectedException(
 			'RuntimeException',
-			'CI Error: The configuration file '.$file.'.php does not exist.'
+			'The configuration file '.$file.'.php does not exist.'
 		);
 		$this->assertNull($this->config->load($file));
 	}

Original file line number	Diff line number	Diff line change
`@@ -115,6 +115,7 @@ public function __construct()`
`115`	`115`	`* @param bool $use_sections Whether configuration values should be loaded into their own section`
`116`	`116`	`* @param bool $fail_gracefully Whether to just return FALSE or display an error message`
`117`	`117`	`* @return bool TRUE if the file was loaded correctly or FALSE on failure`
	`118`	`+ * @throws RuntimeException Throws a runtime exception if the config file can't be found or doesn't have a valid configuration array.`
`118`	`119`	`*/`
`119`	`120`	`public function load($file = '', $use_sections = FALSE, $fail_gracefully = FALSE)`
`120`	`121`	`{`
`@@ -145,7 +146,7 @@ public function load($file = '', $use_sections = FALSE, $fail_gracefully = FALSE`
`145`	`146`	`return FALSE;`
`146`	`147`	`}`
`147`	`148`
`148`		`- show_error('Your '.$file_path.' file does not appear to contain a valid configuration array.');`
	`149`	`+ throw new RuntimeException('Your '.$file_path.' file does not appear to contain a valid configuration array.');`
`149`	`150`	`}`
`150`	`151`
`151`	`152`	`if ($use_sections === TRUE)`
`@@ -175,7 +176,7 @@ public function load($file = '', $use_sections = FALSE, $fail_gracefully = FALSE`
`175`	`176`	`return FALSE;`
`176`	`177`	`}`
`177`	`178`
`178`		`- show_error('The configuration file '.$file.'.php does not exist.');`
	`179`	`+ throw new RuntimeException('The configuration file '.$file.'.php does not exist.');`
`179`	`180`	`}`
`180`	`181`
`181`	`182`	`// --------------------------------------------------------------------`