Show model type in MissingModelException message.

cakephp · Apr 17, 2014 · 90586cd · 90586cd
1 parent 282c6e0
commit 90586cd
Show file tree

Hide file tree

Showing 3 changed files with 19 additions and 2 deletions.
diff --git a/src/Model/Error/MissingModelException.php b/src/Model/Error/MissingModelException.php
@@ -22,6 +22,6 @@
  */
 class MissingModelException extends Exception {
 
-	protected $_messageTemplate = 'Model class %s could not be found.';
+	protected $_messageTemplate = 'Model class "%s" of type "%s" could not be found.';
 
 }
diff --git a/src/Model/ModelAwareTrait.php b/src/Model/ModelAwareTrait.php
@@ -93,7 +93,7 @@ public function loadModel($modelClass = null, $type = 'Table') {
 		$factory = $this->_modelFactories[$type];
 		$this->{$modelClass} = $factory($plugin . $modelClass);
 		if (!$this->{$modelClass}) {
-			throw new Error\MissingModelException($modelClass);
+			throw new Error\MissingModelException([$modelClass, $type]);
 		}
 		return true;
 	}

diff --git a/tests/TestCase/Model/ModelAwareTraitTest.php b/tests/TestCase/Model/ModelAwareTraitTest.php
@@ -85,4 +85,21 @@ public function testModelFactory() {
 		$this->assertEquals('Magic', $stub->Magic->name);
 	}
 
+/**
+ * test MissingModelException being thrown
+ *
+ * @return void
+ * @expectedException Cake\Model\Error\MissingModelException
+ * @expectedExceptionMessage Model class "Magic" of type "Test" could not be found.
+ */
+	public function testMissingModelException() {
+		$stub = new Stub();
+
+		$stub->modelFactory('Test', function($name) {
+			return false;
+		});
+
+		$stub->loadModel('Magic', 'Test');
+	}
+
 }