Fix doc block and use a more generic error message.

cakephp · Jul 16, 2014 · ce126ed · ce126ed
1 parent fcec8ef
commit ce126ed
Show file tree

Hide file tree

Showing 2 changed files with 5 additions and 3 deletions.
diff --git a/src/View/View.php b/src/View/View.php
@@ -872,14 +872,16 @@ protected function _getViewFileName($name = null) {
  * @param string $file The path to the template file.
  * @param string $path Base path that $file should be inside of.
  * @return string The file path
+ * @throws \Cake\Error\Exception
  */
 	protected function _checkFilePath($file, $path) {
 		if (strpos($file, '..') === false) {
 			return $file;
 		}
 		$absolute = realpath($file);
 		if (strpos($absolute, $path) !== 0) {
-			throw new Error\MissingViewException(array('file' => $file));
+			$msg = sprintf('Cannot use "%s" as a template, it is not within any view template path.', $file);
+			throw new Exception($msg);
 		}
 		return $absolute;
 	}

diff --git a/tests/TestCase/View/ViewTest.php b/tests/TestCase/View/ViewTest.php
@@ -517,7 +517,7 @@ public function testGetViewFileNames() {
 /**
  * Test that getViewFileName() protects against malicious directory traversal.
  *
- * @expectedException Cake\View\Error\MissingViewException
+ * @expectedException Cake\Error\Exception
  * @return void
  */
 	public function testGetViewFileNameDirectoryTraversal() {
@@ -616,7 +616,7 @@ public function testGetLayoutFileNamePrefix() {
 /**
  * Test that getLayoutFileName() protects against malicious directory traversal.
  *
- * @expectedException Cake\View\Error\MissingViewException
+ * @expectedException Cake\Error\Exception
  * @return void
  */
 	public function testGetLayoutFileNameDirectoryTraversal() {