Merge pull request #525 from lenton/3.4/bugfix/module-classes-reliance

Don't use classes from modules until all modules are successfully enabled
kohana · Aug 10, 2014 · 4a7c74f · 4a7c74f
2 parents 741b96e + 66a1ac7
commit 4a7c74f
Show file tree

Hide file tree

Showing 2 changed files with 2 additions and 5 deletions.
diff --git a/classes/Kohana/Core.php b/classes/Kohana/Core.php
@@ -489,10 +489,7 @@ public static function modules(array $modules = NULL)
 			else
 			{
 				// This module is invalid, remove it
-				throw new Kohana_Exception('Attempted to load an invalid or missing module \':module\' at \':path\'', array(
-					':module' => $name,
-					':path'   => Debug::path($path),
-				));
+				throw new Exception('Attempted to load an invalid or missing module "'.$name.'" at "'.$path.'"');
 			}
 		}
 

diff --git a/tests/kohana/CoreTest.php b/tests/kohana/CoreTest.php
@@ -241,7 +241,7 @@ public function provider_modules_detects_invalid_modules()
 	 *
 	 * @test
 	 * @dataProvider provider_modules_detects_invalid_modules
-	 * @expectedException Kohana_Exception
+	 * @expectedException Exception
 	 * @param boolean $source   Input for Kohana::modules
 	 *
 	 */