avoid fatal error by throwing exception

cakephp · Aug 26, 2014 · fe475a1 · fe475a1
1 parent 9d3c954
commit fe475a1
Show file tree

Hide file tree

Showing 2 changed files with 2 additions and 2 deletions.
diff --git a/src/Utility/ObjectRegistry.php b/src/Utility/ObjectRegistry.php
@@ -72,7 +72,7 @@ public function load($objectName, $config = []) {
 			$objectName = $config['className'];
 		}
 		$className = $this->_resolveClassName($objectName);
-		if (!$className) {
+		if (!$className || (is_string($className) && !class_exists($className))) {
 			list($plugin, $objectName) = pluginSplit($objectName);
 			$this->_throwMissingClassError($objectName, $plugin);
 		}

diff --git a/tests/TestCase/Datasource/ConnectionManagerTest.php b/tests/TestCase/Datasource/ConnectionManagerTest.php
@@ -75,7 +75,7 @@ public function testConfigVariants($settings) {
  */
 	public function testConfigInvalidOptions() {
 		ConnectionManager::config('test_variant', [
-			'className' => 'HerpDerp'
+			'className' => 'Herp\Derp'
 		]);
 		ConnectionManager::get('test_variant');
 	}