composer: allows nette/utils 4.0

Author: dg

composer.json

@@ -19,7 +19,7 @@
 		"nette/component-model": "^3.0",
 		"nette/http": "^3.0.2",
 		"nette/routing": "^3.0.2",
-		"nette/utils": "^3.2.1"
+		"nette/utils": "^3.2.1 || ~4.0.0"
 	},
 	"suggest": {
 		"nette/forms": "Allows to use Nette\\Application\\UI\\Form",

src/Bridges/ApplicationDI/LatteExtension.php

@@ -66,9 +66,10 @@ public function loadConfiguration()
 				->addSetup('setStrictTypes', [$config->strictTypes]);
 
 		if (version_compare(Latte\Engine::VERSION, '3', '<')) {
-			$latteFactory
-				->addSetup('setContentType', [$config->xhtml ? Latte\Compiler::CONTENT_XHTML : Latte\Compiler::CONTENT_HTML])
-				->addSetup('Nette\Utils\Html::$xhtml = ?', [$config->xhtml]);
+			$latteFactory->addSetup('setContentType', [$config->xhtml ? Latte\Compiler::CONTENT_XHTML : Latte\Compiler::CONTENT_HTML]);
+			if ($config->xhtml) {
+				$latteFactory->addSetup('Nette\Utils\Html::$xhtml = ?', [true]);
+			}
 			foreach ($config->macros as $macro) {
 				$this->addMacro($macro);
 			}