Merge pull request #4191 from kenjis/fix-Parser-render

Fix Parser file path in ViewException message is empty
codeigniter4 · Jan 30, 2021 · 457e71d · 457e71d
2 parents 05a836a + 6db7e1c
commit 457e71d
Show file tree

Hide file tree

Showing 2 changed files with 11 additions and 8 deletions.
diff --git a/system/View/Parser.php b/system/View/Parser.php
@@ -117,13 +117,14 @@ public function render(string $view, array $options = null, bool $saveData = nul
 
 		if (! is_file($file))
 		{
-			$file = $this->loader->locateFile($view, 'Views');
-		}
+			$fileOrig = $file;
+			$file     = $this->loader->locateFile($view, 'Views');
 
-		// locateFile will return an empty string if the file cannot be found.
-		if (empty($file))
-		{
-			throw ViewException::forInvalidFile($file);
+			// locateFile will return an empty string if the file cannot be found.
+			if (empty($file))
+			{
+				throw ViewException::forInvalidFile($fileOrig);
+			}
 		}
 
 		if (is_null($this->tempData))
@@ -328,8 +329,8 @@ protected function parsePair(string $variable, array $data, string $template): a
 		// Find all matches of space-flexible versions of {tag}{/tag} so we
 		// have something to loop over.
 		preg_match_all(
-				'#' . $this->leftDelimiter . '\s*' . preg_quote($variable) . '\s*' . $this->rightDelimiter . '(.+?)' .
-				$this->leftDelimiter . '\s*' . '/' . preg_quote($variable) . '\s*' . $this->rightDelimiter . '#s', $template, $matches, PREG_SET_ORDER
+			'#' . $this->leftDelimiter . '\s*' . preg_quote($variable) . '\s*' . $this->rightDelimiter . '(.+?)' .
+			$this->leftDelimiter . '\s*' . '/' . preg_quote($variable) . '\s*' . $this->rightDelimiter . '#s', $template, $matches, PREG_SET_ORDER
 		);
 
 		/*

diff --git a/tests/system/View/ParserTest.php b/tests/system/View/ParserTest.php
@@ -942,6 +942,8 @@ public function testRenderFindsView()
 	public function testRenderCannotFindView()
 	{
 		$this->expectException(ViewException::class);
+		$this->expectExceptionMessageMatches('!/View/Views/Simplest\.php\z!');
+
 		$this->parser->setData(['testString' => 'Hello World']);
 		$this->parser->render('Simplest');
 	}