Presenter: support for direct setting layout file

nette · Apr 30, 2016 · 8e388e3 · 8e388e3
1 parent b12c478
commit 8e388e3
Show file tree

Hide file tree

Showing 2 changed files with 13 additions and 0 deletions.
diff --git a/src/Application/UI/Presenter.php b/src/Application/UI/Presenter.php
@@ -498,6 +498,9 @@ public function findLayoutTemplateFile()
 	 */
 	public function formatLayoutTemplateFiles()
 	{
+		if (preg_match('#/|\\\\#', $this->layout)) {
+			return [$this->layout];
+		}
 		list($module, $presenter) = Helpers::splitName($this->getName());
 		$layout = $this->layout ? $this->layout : 'layout';
 		$dir = dirname($this->getReflection()->getFileName());

diff --git a/tests/UI/Presenter.formatLayoutTemplateFiles.phpt b/tests/UI/Presenter.formatLayoutTemplateFiles.phpt
@@ -64,3 +64,13 @@ test(function () { // with module & without subdir templates
 		dirname(dirname(__DIR__)) . '/templates/@layout.latte',
 	], $presenter->formatLayoutTemplateFiles());
 });
+
+
+test(function () { // direct file
+	$presenter = new Presenter2;
+	$presenter->setLayout(__DIR__ . '/file.latte');
+
+	Assert::same([
+		__DIR__ . '/file.latte'
+	], $presenter->formatLayoutTemplateFiles());
+});