Presenter: template file extension .latte is preferred over .phtml

nette · Nov 12, 2010 · 5bdf5b0 · 5bdf5b0
1 parent 43f1089
commit 5bdf5b0
Show file tree

Hide file tree

Showing 34 changed files with 35 additions and 30 deletions.
diff --git a/Nette/Application/Presenter.php b/Nette/Application/Presenter.php
@@ -462,10 +462,13 @@ public function formatLayoutTemplateFiles($presenter, $layout)
 		$path = '/' . str_replace(':', 'Module/', $presenter);
 		$pathP = substr_replace($path, '/templates', strrpos($path, '/'), 0);
 		$list = array(
+			"$appDir$pathP/@$layout.latte",
+			"$appDir$pathP.@$layout.latte",
 			"$appDir$pathP/@$layout.phtml",
 			"$appDir$pathP.@$layout.phtml",
 		);
 		while (($path = substr($path, 0, strrpos($path, '/'))) !== FALSE) {
+			$list[] = "$appDir$path/templates/@$layout.latte";
 			$list[] = "$appDir$path/templates/@$layout.phtml";
 		}
 		return $list;
@@ -486,9 +489,11 @@ public function formatTemplateFiles($presenter, $view)
 		$pathP = substr_replace($path, '/templates', strrpos($path, '/'), 0);
 		$path = substr_replace($path, '/templates', strrpos($path, '/'));
 		return array(
+			"$appDir$pathP/$view.latte",
+			"$appDir$pathP.$view.latte",
 			"$appDir$pathP/$view.phtml",
 			"$appDir$pathP.$view.phtml",
-			"$appDir$path/@global.$view.phtml",
+			"$appDir$path/@global.$view.phtml", // deprecated
 		);
 	}
 

diff --git a/tests/Templates/LatteFilter.macros.001.phpt b/tests/Templates/LatteFilter.macros.001.phpt
@@ -28,7 +28,7 @@ FileTemplate::setCacheStorage(new MockCacheStorage(TEMP_DIR));
 
 
 $template = new FileTemplate;
-$template->setFile(__DIR__ . '/templates/latte.phtml');
+$template->setFile(__DIR__ . '/templates/common.latte');
 $template->registerFilter(new LatteFilter);
 $template->registerHelper('translate', 'strrev');
 $template->registerHelper('join', 'implode');

diff --git a/tests/Templates/LatteFilter.macros.002.phpt b/tests/Templates/LatteFilter.macros.002.phpt
@@ -29,7 +29,7 @@ FileTemplate::setCacheStorage(new MockCacheStorage(TEMP_DIR));
 
 
 $template = new FileTemplate;
-$template->setFile(__DIR__ . '/templates/latte.cache.phtml');
+$template->setFile(__DIR__ . '/templates/cache.latte');
 $template->registerFilter(new LatteFilter);
 $template->registerHelperLoader('Nette\Templates\TemplateHelpers::loader');
 

diff --git a/tests/Templates/LatteFilter.macros.003.phpt b/tests/Templates/LatteFilter.macros.003.phpt
@@ -48,7 +48,7 @@ function types()
 
 
 $template = new FileTemplate;
-$template->setFile(__DIR__ . '/templates/latte.helpers.phtml');
+$template->setFile(__DIR__ . '/templates/helpers.latte');
 $template->registerFilter(new LatteFilter);
 $template->registerHelper('nl2br', 'nl2br');
 $template->registerHelper('h1', array(new MyHelper, 'invoke'));

diff --git a/tests/Templates/LatteFilter.macros.009.phpt b/tests/Templates/LatteFilter.macros.009.phpt
@@ -28,7 +28,7 @@ FileTemplate::setCacheStorage(new MockCacheStorage(TEMP_DIR));
 
 
 $template = new FileTemplate;
-$template->setFile(__DIR__ . '/templates/latte.delimiters.phtml');
+$template->setFile(__DIR__ . '/templates/delimiters.latte');
 $template->registerFilter(new LatteFilter);
 $template->registerHelperLoader('Nette\Templates\TemplateHelpers::loader');
 $template->people = array('John', 'Mary', 'Paul');

diff --git a/tests/Templates/LatteFilter.macros.011.phpt b/tests/Templates/LatteFilter.macros.011.phpt
@@ -28,7 +28,7 @@ FileTemplate::setCacheStorage(new MockCacheStorage(TEMP_DIR));
 
 
 $template = new FileTemplate;
-$template->setFile(__DIR__ . '/templates/latte.xml.phtml');
+$template->setFile(__DIR__ . '/templates/xml.latte');
 $template->registerFilter(new LatteFilter);
 $template->registerHelperLoader('Nette\Templates\TemplateHelpers::loader');
 

diff --git a/tests/Templates/LatteFilter.macros.018.phpt b/tests/Templates/LatteFilter.macros.018.phpt
@@ -28,7 +28,7 @@ FileTemplate::setCacheStorage(new MockCacheStorage(TEMP_DIR));
 
 Nette\Web\Html::$xhtml = FALSE;
 $template = new FileTemplate;
-$template->setFile(__DIR__ . '/templates/latte.phtml');
+$template->setFile(__DIR__ . '/templates/common.latte');
 $template->registerFilter(new LatteFilter);
 $template->registerHelper('translate', 'strrev');
 $template->registerHelper('join', 'implode');

diff --git a/tests/Templates/LatteFilter.macros.019.phpt b/tests/Templates/LatteFilter.macros.019.phpt
@@ -28,7 +28,7 @@ FileTemplate::setCacheStorage(new MockCacheStorage(TEMP_DIR));
 
 
 $template = new FileTemplate;
-$template->setFile(__DIR__ . '/templates/latte.first-sep-last.phtml');
+$template->setFile(__DIR__ . '/templates/first-sep-last.latte');
 $template->registerFilter(new LatteFilter);
 $template->people = array('John', 'Mary', 'Paul');
 

diff --git a/tests/Templates/LatteFilter.macros.ext.001.phpt b/tests/Templates/LatteFilter.macros.ext.001.phpt
@@ -28,7 +28,7 @@ FileTemplate::setCacheStorage(new MockCacheStorage(TEMP_DIR));
 
 
 $template = new FileTemplate;
-$template->setFile(__DIR__ . '/templates/latte.inheritance.child1.phtml');
+$template->setFile(__DIR__ . '/templates/inheritance.child1.latte');
 $template->registerFilter(new LatteFilter);
 
 $template->people = array('John', 'Mary', 'Paul');

diff --git a/tests/Templates/LatteFilter.macros.ext.002.phpt b/tests/Templates/LatteFilter.macros.ext.002.phpt
@@ -28,7 +28,7 @@ FileTemplate::setCacheStorage(new MockCacheStorage(TEMP_DIR));
 
 
 $template = new FileTemplate;
-$template->setFile(__DIR__ . '/templates/latte.inheritance.child2.phtml');
+$template->setFile(__DIR__ . '/templates/inheritance.child2.latte');
 $template->registerFilter(new LatteFilter);
 
 $template->people = array('John', 'Mary', 'Paul');

diff --git a/tests/Templates/LatteFilter.macros.ext.003.phpt b/tests/Templates/LatteFilter.macros.ext.003.phpt
@@ -28,7 +28,7 @@ FileTemplate::setCacheStorage(new MockCacheStorage(TEMP_DIR));
 
 
 $template = new FileTemplate;
-$template->setFile(__DIR__ . '/templates/latte.inheritance.child3.phtml');
+$template->setFile(__DIR__ . '/templates/inheritance.child3.latte');
 $template->registerFilter(new LatteFilter);
 
 Assert::match(<<<EOD

diff --git a/tests/Templates/LatteFilter.macros.ext.004.phpt b/tests/Templates/LatteFilter.macros.ext.004.phpt
@@ -28,7 +28,7 @@ FileTemplate::setCacheStorage(new MockCacheStorage(TEMP_DIR));
 
 
 $template = new FileTemplate;
-$template->setFile(__DIR__ . '/templates/latte.inheritance.child4.phtml');
+$template->setFile(__DIR__ . '/templates/inheritance.child4.latte');
 $template->registerFilter(new LatteFilter);
 
 Assert::match(<<<EOD

diff --git a/tests/Templates/LatteFilter.macros.ext.005.phpt b/tests/Templates/LatteFilter.macros.ext.005.phpt
@@ -28,9 +28,9 @@ FileTemplate::setCacheStorage(new MockCacheStorage(TEMP_DIR));
 
 
 $template = new FileTemplate;
-$template->setFile(__DIR__ . '/templates/latte.inheritance.child5.phtml');
+$template->setFile(__DIR__ . '/templates/inheritance.child5.latte');
 $template->registerFilter(new LatteFilter);
 
-$template->ext = 'latte.inheritance.parent.phtml';
+$template->ext = 'inheritance.parent.latte';
 
 Assert::match(file_get_contents(__DIR__ . '/LatteFilter.macros.ext.005.expect'), $template->__toString(TRUE));
diff --git a/tests/Templates/Template.optimizePhp().phpt b/tests/Templates/Template.optimizePhp().phpt
@@ -16,6 +16,6 @@ require __DIR__ . '/../bootstrap.php';
 
 
 
-$input = file_get_contents(__DIR__ . '/templates/optimize.phtml');
+$input = file_get_contents(__DIR__ . '/templates/optimize.latte');
 $expected = file_get_contents(__DIR__ . '/Template.optimizePhp().expect');
 Assert::match($expected, Template::optimizePhp($input));
diff --git a/tests/Templates/templates/@menu.phtml → tests/Templates/templates/@menu.latte b/tests/Templates/templates/@menu.phtml → tests/Templates/templates/@menu.latte
@@ -1,5 +1,5 @@
 <ul>
 	{foreach $menu as $item}
-	<li>{if is_array($item)} {include '@menu.phtml', 'menu' => $item} {else}{$item}{/if}</li>
+	<li>{if is_array($item)} {include '@menu.latte', 'menu' => $item} {else}{$item}{/if}</li>
 	{/foreach}
 </ul>
diff --git a/tests/Templates/templates/latte.cache.phtml → tests/Templates/templates/cache.latte b/tests/Templates/templates/latte.cache.phtml → tests/Templates/templates/cache.latte
@@ -4,6 +4,6 @@ Noncached content
 
 <h1>{$title|upper}</h1>
 
-{include 'include.cache.phtml', 'localvar' => 11}
+{include 'include.cache.latte', 'localvar' => 11}
 
 {/cache}
diff --git a/tests/Templates/templates/latte.phtml → tests/Templates/templates/common.latte b/tests/Templates/templates/latte.phtml → tests/Templates/templates/common.latte
@@ -58,7 +58,7 @@ comment *}
 
 
 
-{include 'subdir/include1.phtml', 'localvar' => 10 |indent}
+{include 'subdir/include1.latte', 'localvar' => 10 |indent}
 
 
 
@@ -105,7 +105,7 @@ var prop2 = {$people};
 
 
 
-{include '@menu.phtml'}
+{include '@menu.latte'}
 
 
 

diff --git a/...emplates/templates/latte.delimiters.phtml → tests/Templates/templates/delimiters.latte b/...emplates/templates/latte.delimiters.phtml → tests/Templates/templates/delimiters.latte
diff --git a/...ates/templates/latte.first-sep-last.phtml → .../Templates/templates/first-sep-last.latte b/...ates/templates/latte.first-sep-last.phtml → .../Templates/templates/first-sep-last.latte
diff --git a/...s/Templates/templates/latte.helpers.phtml → tests/Templates/templates/helpers.latte b/...s/Templates/templates/latte.helpers.phtml → tests/Templates/templates/helpers.latte
diff --git a/...s/Templates/templates/include.cache.phtml → ...s/Templates/templates/include.cache.latte b/...s/Templates/templates/include.cache.phtml → ...s/Templates/templates/include.cache.latte
diff --git a/tests/Templates/templates/include3.phtml → tests/Templates/templates/include3.latte b/tests/Templates/templates/include3.phtml → tests/Templates/templates/include3.latte
diff --git a/.../templates/latte.inheritance.child1.phtml → ...plates/templates/inheritance.child1.latte b/.../templates/latte.inheritance.child1.phtml → ...plates/templates/inheritance.child1.latte
@@ -1,4 +1,4 @@
-{extends "latte.inheritance.parent.phtml"}
+{extends "inheritance.parent.latte"}
 
 {block title}Homepage | {include #parent}{/block}
 

diff --git a/.../templates/latte.inheritance.child2.phtml → ...plates/templates/inheritance.child2.latte b/.../templates/latte.inheritance.child2.phtml → ...plates/templates/inheritance.child2.latte
@@ -1,4 +1,4 @@
-{extends "latte.inheritance.parent.phtml"}
+{extends "inheritance.parent.latte"}
 
 
 {block content}

diff --git a/.../templates/latte.inheritance.child3.phtml → ...plates/templates/inheritance.child3.latte b/.../templates/latte.inheritance.child3.phtml → ...plates/templates/inheritance.child3.latte
diff --git a/.../templates/latte.inheritance.child4.phtml → ...plates/templates/inheritance.child4.latte b/.../templates/latte.inheritance.child4.phtml → ...plates/templates/inheritance.child4.latte
diff --git a/.../templates/latte.inheritance.child5.phtml → ...plates/templates/inheritance.child5.latte b/.../templates/latte.inheritance.child5.phtml → ...plates/templates/inheritance.child5.latte
diff --git a/.../templates/latte.inheritance.parent.phtml → ...plates/templates/inheritance.parent.latte b/.../templates/latte.inheritance.parent.phtml → ...plates/templates/inheritance.parent.latte
diff --git a/tests/Templates/templates/optimize.phtml → tests/Templates/templates/optimize.latte b/tests/Templates/templates/optimize.phtml → tests/Templates/templates/optimize.latte
diff --git a/...s/Templates/templates/latte.snippet.phtml → tests/Templates/templates/snippet.latte b/...s/Templates/templates/latte.snippet.phtml → tests/Templates/templates/snippet.latte
diff --git a/tests/Templates/templates/subdir/include1.latte b/tests/Templates/templates/subdir/include1.latte
@@ -0,0 +1,9 @@
+<p>Included file #1</p>
+
+{include "include2.latte", 'localvar' => 20}
+
+{include ../include3.latte, }
+
+<textarea>
+pre
+</textarea>
diff --git a/tests/Templates/templates/subdir/include1.phtml b/tests/Templates/templates/subdir/include1.phtml
diff --git a/...Templates/templates/subdir/include2.phtml → ...Templates/templates/subdir/include2.latte b/...Templates/templates/subdir/include2.phtml → ...Templates/templates/subdir/include2.latte
diff --git a/tests/Templates/templates/latte.xml.phtml → tests/Templates/templates/xml.latte b/tests/Templates/templates/latte.xml.phtml → tests/Templates/templates/xml.latte