Presenter: support for templates without /template folder

nette · Apr 14, 2024 · d6d72b7 · d6d72b7
1 parent 4fea67f
commit d6d72b7
Show file tree

Hide file tree

Showing 6 changed files with 104 additions and 30 deletions.
diff --git a/src/Application/UI/Presenter.php b/src/Application/UI/Presenter.php
@@ -563,18 +563,28 @@ public function formatLayoutTemplateFiles(): array
 			return [$this->layout];
 		}
 
-		[$module, $presenter] = Helpers::splitName($this->getName());
 		$layout = $this->layout ?: 'layout';
 		$dir = dirname(static::getReflection()->getFileName());
-		$dir = is_dir("$dir/templates") ? $dir : dirname($dir);
+		$levels = substr_count($this->getName(), ':');
+		if (!is_dir("$dir/templates")) {
+			$dir = dirname($origDir = $dir);
+			if (!is_dir("$dir/templates")) {
+				$list = ["$origDir/@$layout.latte"];
+				do {
+					$list[] = "$dir/@$layout.latte";
+				} while ($levels-- && ($dir = dirname($dir)));
+				return $list;
+			}
+		}
+
+		[, $presenter] = Helpers::splitName($this->getName());
 		$list = [
 			"$dir/templates/$presenter/@$layout.latte",
 			"$dir/templates/$presenter.@$layout.latte",
 		];
 		do {
 			$list[] = "$dir/templates/@$layout.latte";
-			$dir = dirname($dir);
-		} while ($dir && $module && ([$module] = Helpers::splitName($module)));
+		} while ($levels-- && ($dir = dirname($dir)));
 
 		return $list;
 	}
@@ -585,9 +595,17 @@ public function formatLayoutTemplateFiles(): array
 	 */
 	public function formatTemplateFiles(): array
 	{
-		[, $presenter] = Helpers::splitName($this->getName());
 		$dir = dirname(static::getReflection()->getFileName());
-		$dir = is_dir("$dir/templates") ? $dir : dirname($dir);
+		if (!is_dir("$dir/templates")) {
+			$dir = dirname($origDir = $dir);
+			if (!is_dir("$dir/templates")) {
+				return [
+					"$origDir/$this->view.latte",
+				];
+			}
+		}
+
+		[, $presenter] = Helpers::splitName($this->getName());
 		return [
 			"$dir/templates/$presenter/$this->view.latte",
 			"$dir/templates/$presenter.$this->view.latte",

diff --git a/tests/UI/Presenter.formatLayoutTemplateFiles.phpt b/tests/UI/Presenter.formatLayoutTemplateFiles.phpt
@@ -11,7 +11,8 @@ use Tester\Assert;
 
 require __DIR__ . '/../bootstrap.php';
 require __DIR__ . '/one/APresenter.php';
-require __DIR__ . '/two/BPresenter.php';
+require __DIR__ . '/one/sub/BPresenter.php';
+require __DIR__ . '/two/CPresenter.php';
 
 
 test('with subdir templates', function () {
@@ -27,14 +28,26 @@ test('with subdir templates', function () {
 });
 
 
-test('without subdir templates', function () {
+test('with parent-dir templates', function () {
 	$presenter = new BPresenter;
+	$presenter->setParent(null, 'One');
+	$presenter->setLayout('my');
+
+	Assert::same([
+		__DIR__ . DIRECTORY_SEPARATOR . 'one/templates/One/@my.latte',
+		__DIR__ . DIRECTORY_SEPARATOR . 'one/templates/[email protected]',
+		__DIR__ . DIRECTORY_SEPARATOR . 'one/templates/@my.latte',
+	], $presenter->formatLayoutTemplateFiles());
+});
+
+
+test('without subdir templates', function () {
+	$presenter = new CPresenter;
 	$presenter->setParent(null, 'Two');
 
 	Assert::same([
-		__DIR__ . '/templates/Two/@layout.latte',
-		__DIR__ . '/templates/[email protected]',
-		__DIR__ . '/templates/@layout.latte',
+		__DIR__ . DIRECTORY_SEPARATOR . 'two/@layout.latte',
+		__DIR__ . '/@layout.latte',
 	], $presenter->formatLayoutTemplateFiles());
 });
 
@@ -53,16 +66,29 @@ test('with module & subdir templates', function () {
 });
 
 
-test('with module & without subdir templates', function () {
+test('with module & parent-dir templates', function () {
 	$presenter = new BPresenter;
-	$presenter->setParent(null, 'Module:SubModule:Two');
+	$presenter->setParent(null, 'Module:SubModule:One');
 
 	Assert::same([
-		__DIR__ . '/templates/Two/@layout.latte',
-		__DIR__ . '/templates/[email protected]',
+		__DIR__ . DIRECTORY_SEPARATOR . 'one/templates/One/@layout.latte',
+		__DIR__ . DIRECTORY_SEPARATOR . 'one/templates/[email protected]',
+		__DIR__ . DIRECTORY_SEPARATOR . 'one/templates/@layout.latte',
 		__DIR__ . '/templates/@layout.latte',
 		dirname(__DIR__) . '/templates/@layout.latte',
-		dirname(__DIR__, 2) . '/templates/@layout.latte',
+	], $presenter->formatLayoutTemplateFiles());
+});
+
+
+test('with module & without subdir templates', function () {
+	$presenter = new CPresenter;
+	$presenter->setParent(null, 'Module:SubModule:Two');
+
+	Assert::same([
+		__DIR__ . DIRECTORY_SEPARATOR . 'two/@layout.latte',
+		__DIR__ . '/@layout.latte',
+		dirname(__DIR__) . '/@layout.latte',
+		dirname(__DIR__, 2) . '/@layout.latte',
 	], $presenter->formatLayoutTemplateFiles());
 });
 

diff --git a/tests/UI/Presenter.formatTemplateFiles.phpt b/tests/UI/Presenter.formatTemplateFiles.phpt
@@ -11,7 +11,8 @@ use Tester\Assert;
 
 require __DIR__ . '/../bootstrap.php';
 require __DIR__ . '/one/APresenter.php';
-require __DIR__ . '/two/BPresenter.php';
+require __DIR__ . '/one/sub/BPresenter.php';
+require __DIR__ . '/two/CPresenter.php';
 
 
 test('with subdir templates', function () {
@@ -26,14 +27,25 @@ test('with subdir templates', function () {
 });
 
 
-test('without subdir templates', function () {
+test('with parent-dir templates', function () {
 	$presenter = new BPresenter;
+	$presenter->setParent(null, 'One');
+	$presenter->setView('view');
+
+	Assert::same([
+		__DIR__ . DIRECTORY_SEPARATOR . 'one/templates/One/view.latte',
+		__DIR__ . DIRECTORY_SEPARATOR . 'one/templates/One.view.latte',
+	], $presenter->formatTemplateFiles());
+});
+
+
+test('without subdir templates', function () {
+	$presenter = new CPresenter;
 	$presenter->setParent(null, 'Two');
 	$presenter->setView('view');
 
 	Assert::same([
-		__DIR__ . '/templates/Two/view.latte',
-		__DIR__ . '/templates/Two.view.latte',
+		__DIR__ . DIRECTORY_SEPARATOR . 'two/view.latte',
 	], $presenter->formatTemplateFiles());
 });
 
@@ -50,13 +62,24 @@ test('with module & subdir templates', function () {
 });
 
 
-test('with module & without subdir templates', function () {
+test('with module & parent-dir templates', function () {
 	$presenter = new BPresenter;
+	$presenter->setParent(null, 'Module:One');
+	$presenter->setView('view');
+
+	Assert::same([
+		__DIR__ . DIRECTORY_SEPARATOR . 'one/templates/One/view.latte',
+		__DIR__ . DIRECTORY_SEPARATOR . 'one/templates/One.view.latte',
+	], $presenter->formatTemplateFiles());
+});
+
+
+test('with module & without subdir templates', function () {
+	$presenter = new CPresenter;
 	$presenter->setParent(null, 'Module:Two');
 	$presenter->setView('view');
 
 	Assert::same([
-		__DIR__ . '/templates/Two/view.latte',
-		__DIR__ . '/templates/Two.view.latte',
+		__DIR__ . DIRECTORY_SEPARATOR . 'two/view.latte',
 	], $presenter->formatTemplateFiles());
 });
diff --git a/tests/UI/one/sub/BPresenter.php b/tests/UI/one/sub/BPresenter.php
@@ -0,0 +1,7 @@
+<?php
+
+declare(strict_types=1);
+
+class BPresenter extends Nette\Application\UI\Presenter
+{
+}
diff --git a/tests/UI/two/BPresenter.php b/tests/UI/two/BPresenter.php
diff --git a/tests/UI/two/CPresenter.php b/tests/UI/two/CPresenter.php
@@ -0,0 +1,7 @@
+<?php
+
+declare(strict_types=1);
+
+class CPresenter extends Nette\Application\UI\Presenter
+{
+}