Compiler::compile() class name is required

nette · Jan 29, 2015 · cdf25b7 · cdf25b7
1 parent 93a78cf
commit cdf25b7
Show file tree

Hide file tree

Showing 3 changed files with 5 additions and 5 deletions.
diff --git a/src/Latte/Compiler.php b/src/Latte/Compiler.php
@@ -92,9 +92,9 @@ public function addMacro($name, IMacro $macro)
 	 * @param  Token[]
 	 * @return string
 	 */
-	public function compile(array $tokens, $className = NULL)
+	public function compile(array $tokens, $className)
 	{
-		$this->templateId = substr(lcg_value(), 2, 10);
+		$this->templateId = substr(md5($className), 0, 10);
 		$this->tokens = $tokens;
 		$output = '';
 		$this->output = & $output;
@@ -130,7 +130,7 @@ public function compile(array $tokens, $className = NULL)
 
 		$output = $this->expandTokens($output);
 		$output = "<?php\n"
-			. 'class ' . ($className ?: 'Template') . " extends Latte\\Template {\n"
+			. 'class ' . $className . " extends Latte\\Template {\n"
 			. "function render() {\n"
 			. 'foreach ($this->params as $__k => $__v) $$__k = $__v; unset($__k, $__v);'
 			. '?>' . $output . "<?php\n}}";

diff --git a/tests/Latte/Compiler.htmlNode.phpt b/tests/Latte/Compiler.htmlNode.phpt
@@ -37,4 +37,4 @@ class MockMacro implements IMacro
 $parser = new Parser;
 $compiler = new Compiler;
 $compiler->addMacro('foo', new MockMacro);
-$compiler->compile($parser->parse('<div a b=123 c = abc d="text" e=\'xxx\' f={foo 1/} b="456" g="a{foo 2/}b"> {foo 3/}'));
+$compiler->compile($parser->parse('<div a b=123 c = abc d="text" e=\'xxx\' f={foo 1/} b="456" g="a{foo 2/}b"> {foo 3/}'), 'Template');
diff --git a/tests/Latte/Compiler.macroMethodsCallingOrder.phpt b/tests/Latte/Compiler.macroMethodsCallingOrder.phpt
@@ -51,7 +51,7 @@ $macro = new MockMacro;
 $parser = new Parser;
 $compiler = new Compiler;
 $compiler->addMacro('foo', $macro);
-$compiler->compile($parser->parse($latte));
+$compiler->compile($parser->parse($latte), 'Template');
 
 Assert::same( array(
 	'initialize',