Merge branch 'master' into patch-4

.github/workflows/tests.yml

@@ -7,7 +7,7 @@ jobs:
         runs-on: ubuntu-latest
         strategy:
             matrix:
-                php: ['8.1', '8.2', '8.3']
+                php: ['8.1', '8.2', '8.3', '8.4']
 
             fail-fast: false
 

composer.json

@@ -15,7 +15,7 @@
 		}
 	],
 	"require": {
-		"php": "8.1 - 8.3",
+		"php": "8.1 - 8.4",
 		"nette/component-model": "^3.1",
 		"nette/http": "^3.3",
 		"nette/routing": "^3.1",

src/Bridges/ApplicationDI/LatteExtension.php

@@ -38,7 +38,7 @@ public function getConfigSchema(): Nette\Schema\Schema
 			'strictTypes' => Expect::bool(false),
 			'strictParsing' => Expect::bool(false),
 			'phpLinter' => Expect::string(),
-			'variables' => Expect::array([]),
+			'locale' => Expect::string(),
 		]);
 	}
 
@@ -60,7 +60,8 @@ public function loadConfiguration(): void
 				->addSetup('setAutoRefresh', [$this->debugMode])
 				->addSetup('setStrictTypes', [$config->strictTypes])
 				->addSetup('setStrictParsing', [$config->strictParsing])
-				->addSetup('enablePhpLinter', [$config->phpLinter]);
+				->addSetup('enablePhpLinter', [$config->phpLinter])
+				->addSetup('setLocale', [$config->locale]);
 
 		$this->addExtension(new Statement(ApplicationLatte\UIExtension::class, [$builder::literal('$control')]));
 
@@ -72,6 +73,9 @@ public function loadConfiguration(): void
 		}
 
 		foreach ($config->extensions as $extension) {
+			if ($extension === Latte\Essential\TranslatorExtension::class) {
+				$extension = new Statement($extension, [new Nette\DI\Definitions\Reference(Nette\Localization\Translator::class)]);
+			}
 			$this->addExtension($extension);
 		}
 

src/Bridges/ApplicationDI/PresenterFactoryCallback.php

@@ -41,8 +41,8 @@ public function __invoke(string $class): Nette\Application\IPresenter
 
 		if ($this->touchToRefresh && class_exists($class)) {
 			touch($this->touchToRefresh);
-			header('Refresh: 3');
-			echo "The DI container does not know the $class class. I will refresh it in 3 seconds.";
+			echo 'Class ' . htmlspecialchars($class) . ' was not found in DI container.<br><br>If you just created this presenter, it should be enough to refresh the page. It will happen automatically in 5 seconds.<br><br>Otherwise, please check the configuration of your DI container.';
+			header('Refresh: 5');
 			exit;
 		}
 

tests/Bridges.DI/LatteExtension.translator.phpt

@@ -0,0 +1,42 @@
+<?php
+
+/**
+ * Test: LatteExtension passes Translator to TranslatorExtension
+ */
+
+declare(strict_types=1);
+
+use Nette\DI;
+use Tester\Assert;
+
+require __DIR__ . '/../bootstrap.php';
+
+
+class Translator implements Nette\Localization\Translator
+{
+	public function translate(Stringable|string $message, ...$parameters): string|Stringable
+	{
+		return '';
+	}
+}
+
+$loader = new DI\Config\Loader;
+$config = $loader->load(Tester\FileMock::create('
+latte:
+	extensions:
+		- Latte\Essential\TranslatorExtension
+
+services:
+	- Translator
+', 'neon'));
+
+$compiler = new DI\Compiler;
+$compiler->addExtension('latte', new Nette\Bridges\ApplicationDI\LatteExtension(''));
+$code = $compiler->addConfig($config)->compile();
+eval($code);
+
+$container = new Container;
+
+$latte = $container->getService('nette.latteFactory')->create();
+$extensions = Assert::with($latte, fn() => $this->extensions);
+Assert::equal(new Latte\Essential\TranslatorExtension(new Translator), $extensions[3]);