Presenter::formatTemplateFiles() returns "template/<view>.latte" for local 'template' folder (BC break)

Author: dg

src/Application/UI/Presenter.php

@@ -524,11 +524,12 @@ public function formatTemplateFiles()
 	{
 		$name = $this->getName();
 		$presenter = substr($name, strrpos(':' . $name, ':'));
-		$dir = dirname($this->getReflection()->getFileName());
-		$dir = is_dir("$dir/templates") ? $dir : dirname($dir);
+		$presenterDir = dirname($this->getReflection()->getFileName());
+		$dir = is_dir("$presenterDir/templates") ? $presenterDir : dirname($presenterDir);
 		return [
 			"$dir/templates/$presenter/$this->view.latte",
 			"$dir/templates/$presenter.$this->view.latte",
+			"$presenterDir/templates/$this->view.latte",
 		];
 	}
 

tests/Application.templates/Presenter.formatTemplateFiles.phpt

@@ -21,6 +21,7 @@ test(function() { // with subdir templates
 	Assert::same( [
 		__DIR__ . DIRECTORY_SEPARATOR . 'one/templates/One/view.latte',
 		__DIR__ . DIRECTORY_SEPARATOR . 'one/templates/One.view.latte',
+		__DIR__ . DIRECTORY_SEPARATOR . 'one/templates/view.latte',
 	], $presenter->formatTemplateFiles() );
 });
 
@@ -33,6 +34,7 @@ test(function() { // without subdir templates
 	Assert::same( [
 		__DIR__ . '/templates/Two/view.latte',
 		__DIR__ . '/templates/Two.view.latte',
+		__DIR__ . DIRECTORY_SEPARATOR . 'two/templates/view.latte',
 	], $presenter->formatTemplateFiles() );
 });
 
@@ -45,6 +47,7 @@ test(function() { // with module & subdir templates
 	Assert::same( [
 		__DIR__ . DIRECTORY_SEPARATOR . 'one/templates/One/view.latte',
 		__DIR__ . DIRECTORY_SEPARATOR . 'one/templates/One.view.latte',
+		__DIR__ . DIRECTORY_SEPARATOR . 'one/templates/view.latte',
 	], $presenter->formatTemplateFiles() );
 });
 
@@ -57,5 +60,6 @@ test(function() { // with module & without subdir templates
 	Assert::same( [
 		__DIR__ . '/templates/Two/view.latte',
 		__DIR__ . '/templates/Two.view.latte',
+		__DIR__ . DIRECTORY_SEPARATOR . 'two/templates/view.latte',
 	], $presenter->formatTemplateFiles() );
 });