Presenter::formatLayoutTemplateFiles() finds layouts in parent presen…

…ters locations (BC break)
nette · May 25, 2015 · b5a4a62 · b5a4a62
1 parent e15c4d2
commit b5a4a62
Show file tree

Hide file tree

Showing 2 changed files with 10 additions and 3 deletions.
diff --git a/src/Application/UI/Presenter.php b/src/Application/UI/Presenter.php
@@ -502,7 +502,8 @@ public function formatLayoutTemplateFiles()
 		$name = $this->getName();
 		$presenter = substr($name, strrpos(':' . $name, ':'));
 		$layout = $this->layout ? $this->layout : 'layout';
-		$dir = dirname($this->getReflection()->getFileName());
+		$rc = $this->getReflection();
+		$dir = dirname($rc->getFileName());
 		$dir = is_dir("$dir/templates") ? $dir : dirname($dir);
 		$list = [
 			"$dir/templates/$presenter/@$layout.latte",
@@ -512,6 +513,10 @@ public function formatLayoutTemplateFiles()
 			$list[] = "$dir/templates/@$layout.latte";
 			$dir = dirname($dir);
 		} while ($dir && ($name = substr($name, 0, strrpos($name, ':'))));
+
+		while (($rc = $rc->getParentClass()) && $rc->getName() !== __CLASS__) {
+			$list[] = dirname($rc->getFileName()) . "/templates/@$layout.latte";
+		}
 		return $list;
 	}
 

diff --git a/tests/Application.templates/Presenter.formatLayoutTemplateFiles.phpt b/tests/Application.templates/Presenter.formatLayoutTemplateFiles.phpt
@@ -26,14 +26,15 @@ test(function() { // with subdir templates
 });
 
 
-test(function() { // without subdir templates
+test(function() { // without subdir templates & parent presenter
 	$presenter = new Presenter2;
 	$presenter->setParent(NULL, 'Two');
 
 	Assert::same( [
 		__DIR__ . '/templates/Two/@layout.latte',
 		__DIR__ . '/templates/Two.@layout.latte',
 		__DIR__ . '/templates/@layout.latte',
+		__DIR__ . DIRECTORY_SEPARATOR . 'one/templates/@layout.latte',
 	], $presenter->formatLayoutTemplateFiles() );
 });
 
@@ -52,7 +53,7 @@ test(function() { // with module & subdir templates
 });
 
 
-test(function() { // with module & without subdir templates
+test(function() { // with module & without subdir templates & parent presenter
 	$presenter = new Presenter2;
 	$presenter->setParent(NULL, 'Module:SubModule:Two');
 
@@ -62,5 +63,6 @@ test(function() { // with module & without subdir templates
 		__DIR__ . '/templates/@layout.latte',
 		dirname(__DIR__) . '/templates/@layout.latte',
 		dirname(dirname(__DIR__)) . '/templates/@layout.latte',
+		__DIR__ . DIRECTORY_SEPARATOR . 'one/templates/@layout.latte',
 	], $presenter->formatLayoutTemplateFiles() );
 });