tests: compatibility with Latte master

nette · Jun 14, 2016 · 90cdc20 · 90cdc20
1 parent af79d39
commit 90cdc20
Show file tree

Hide file tree

Showing 4 changed files with 9 additions and 33 deletions.
diff --git a/src/Bridges/FormsLatte/FormMacros.php b/src/Bridges/FormsLatte/FormMacros.php
@@ -58,7 +58,7 @@ public function macroForm(MacroNode $node, PhpWriter $writer)
 		if ($name === FALSE) {
 			throw new CompileException('Missing form name in ' . $node->getNotation());
 		}
-		$node->replaced = true;
+		$node->replaced = TRUE;
 		$node->tokenizer->reset();
 		return $writer->write(
 			"/* line $node->startLine */\n"

diff --git a/tests/Forms.Latte/expected/FormMacros.button.phtml b/tests/Forms.Latte/expected/FormMacros.button.phtml
@@ -1,11 +1,4 @@
 <?php
-// source: %A%
-
-class Template%a% extends Latte\Runtime\Template
-{
-
-	function render()
-	{
 %A%
 		$form = $_form = $this->global->formsStack[] = $this->global->uiControl["myForm"];
 		?><form<?php
@@ -29,5 +22,4 @@ class Template%a% extends Latte\Runtime\Template
 ?></form>
 <?php
 	}
-
-}
+%A%
diff --git a/tests/Forms.Latte/expected/FormMacros.formContainer.phtml b/tests/Forms.Latte/expected/FormMacros.formContainer.phtml
@@ -1,11 +1,4 @@
 <?php
-// source: %A%
-
-class Template%a% extends Latte\Runtime\Template
-{
-
-	function render()
-	{
 %A%
 		echo Nette\Bridges\FormsLatte\Runtime::renderFormBegin($form = $_form = $this->global->formsStack[] = $this->global->uiControl["myForm"], []);
 ?>
@@ -89,5 +82,4 @@ class Template%a% extends Latte\Runtime\Template
 
 <?php
 	}
-
-}
+%A%
diff --git a/tests/Forms.Latte/expected/FormMacros.forms.phtml b/tests/Forms.Latte/expected/FormMacros.forms.phtml
@@ -1,11 +1,4 @@
 <?php
-// source: %A%
-
-class Template%a% extends Latte\Runtime\Template
-{
-
-	function render()
-	{
 %A%
 		/* line 1 */
 		echo Nette\Bridges\FormsLatte\Runtime::renderFormBegin($form = $_form = $this->global->formsStack[] = $this->global->uiControl["myForm"], ['id' => 'myForm', 'class'=>"ajax"]);
@@ -23,12 +16,12 @@ class Template%a% extends Latte\Runtime\Template
 			echo $_input->getControl()->addAttributes(['title' => 'Hello', 'size' => 10]) /* line 4 */ ?>
 
 		<?php
-			echo LR\Filters::escapeHtml($_input->getError());
+			echo LR\Filters::escapeHtmlText($_input->getError());
 ?>
 
 		<?php
 			$_input = is_object($name) ? $name : end($this->global->formsStack)[$name];
-			echo LR\Filters::escapeHtml($_input->getError());
+			echo LR\Filters::escapeHtmlText($_input->getError());
 ?>
 
 
@@ -43,7 +36,7 @@ class Template%a% extends Latte\Runtime\Template
 
 		<?php
 			$_input = is_object($form[$name]) ? $form[$name] : end($this->global->formsStack)[$form[$name]];
-			echo LR\Filters::escapeHtml($_input->getError());
+			echo LR\Filters::escapeHtmlText($_input->getError());
 ?>
 
 <?php
@@ -106,7 +99,7 @@ class Template%a% extends Latte\Runtime\Template
 		foreach ($form['sex']->items as $key => $label) {
 			?>	<?php if ($_label = end($this->global->formsStack)["sex"]->getLabelPart($key)) echo $_label->startTag() ?> <?php
 			echo end($this->global->formsStack)["sex"]->getControlPart($key) /* line 32 */ ?> <?php
-			echo LR\Filters::escapeHtml($label) /* line 32 */;
+			echo LR\Filters::escapeHtmlText($label) /* line 32 */;
 			if ($_label) echo $_label->endTag() ?>
 
 	<label title=hello<?php
@@ -164,7 +157,7 @@ class Template%a% extends Latte\Runtime\Template
 		foreach ($form['checklist']->items as $key => $label) {
 			?>	<?php if ($_label = end($this->global->formsStack)["checklist"]->getLabelPart($key)) echo $_label->startTag() ?> <?php
 			echo end($this->global->formsStack)["checklist"]->getControlPart($key) /* line 50 */ ?> <?php
-			echo LR\Filters::escapeHtml($label) /* line 50 */;
+			echo LR\Filters::escapeHtmlText($label) /* line 50 */;
 			if ($_label) echo $_label->endTag() ?>
 
 	<label<?php
@@ -243,5 +236,4 @@ class Template%a% extends Latte\Runtime\Template
 
 <?php
 	}
-
-}
+%A%