LatteExtension: Html::$xhtml is set when service is created

Author: dg

src/Bridges/ApplicationDI/LatteExtension.php

@@ -24,9 +24,6 @@ class LatteExtension extends Nette\DI\CompilerExtension
 		'macros' => array(),
 	);
 
-	/** @var bool */
-	private $xhtml;
-
 	/** @var bool */
 	private $debugMode;
 
@@ -61,14 +58,14 @@ public function loadConfiguration()
 		}
 
 		$this->validate($config, $this->defaults, $this->name);
-		$this->xhtml = $config['xhtml'];
 		$container = $this->getContainerBuilder();
 
 		$latteFactory = $container->addDefinition('nette.latteFactory')
 			->setClass('Latte\Engine')
 			->addSetup('setTempDirectory', array($this->tempDir))
 			->addSetup('setAutoRefresh', array($this->debugMode))
 			->addSetup('setContentType', array($config['xhtml'] ? Latte\Compiler::CONTENT_XHTML : Latte\Compiler::CONTENT_HTML))
+			->addSetup('Nette\Utils\Html::$xhtml = ?;', array((bool) $config['xhtml']))
 			->setImplement('Nette\Bridges\ApplicationLatte\ILatteFactory');
 
 		$container->addDefinition('nette.templateFactory')
@@ -81,6 +78,7 @@ public function loadConfiguration()
 			->addSetup('setTempDirectory', array($this->tempDir))
 			->addSetup('setAutoRefresh', array($this->debugMode))
 			->addSetup('setContentType', array($config['xhtml'] ? Latte\Compiler::CONTENT_XHTML : Latte\Compiler::CONTENT_HTML))
+			->addSetup('Nette\Utils\Html::$xhtml = ?;', array((bool) $config['xhtml']))
 			->setAutowired(FALSE);
 
 		foreach ($config['macros'] as $macro) {
@@ -101,14 +99,6 @@ public function loadConfiguration()
 	}
 
 
-	public function afterCompile(Nette\PhpGenerator\ClassType $class)
-	{
-		if ($this->xhtml) {
-			$class->methods['initialize']->addBody('Nette\Utils\Html::$xhtml = TRUE;');
-		}
-	}
-
-
 	/**
 	 * @param  callable
 	 * @return void