Nette 3

Author: mabar

README.md

@@ -24,11 +24,12 @@ Extra contribution to [`nette/latte`](https://github.com/nette/latte).
 
 ## Versions
 
-| State       | Version | Branch   | PHP      |
-|-------------|---------|----------|----------|
-| dev         | `^0.4`  | `master` | `>= 7.1` |
-| stable      | `^0.3`  | `master` | `>= 7.1` |
-| stable      | `^0.2`  | `master` | `>= 5.6` |
+| State       | Version | Branch   | Nette | PHP     |
+|-------------|---------|----------|-------|---------|
+| dev         | `^0.5`  | `master` | 3.0+  | `^7.2`  |
+| stable      | `^0.4`  | `master` | 3.0+  | `^7.2`  |
+| stable      | `^0.3`  | `master` | 2.4   | `>=7.1` |
+| stable      | `^0.2`  | `master` | 2.4   | `>=5.6` |
 
 ## Maintainers
 

composer.json

@@ -16,12 +16,12 @@
     }
   ],
   "require": {
-    "php": ">= 7.1",
-    "latte/latte": "~2.4.4 || ~2.5.1"
+    "php": "^7.2",
+    "latte/latte": "~2.5.1"
   },
   "require-dev": {
-    "nette/application": "~2.4.6",
-    "nette/di": "~2.4.12",
+    "nette/application": "~3.0.0",
+    "nette/di": "~3.0.0",
     "ninjify/nunjuck": "^0.2.0",
     "ninjify/qa": "^0.8.0",
     "phpstan/extension-installer": "^1.0",
@@ -31,7 +31,7 @@
     "phpstan/phpstan-strict-rules": "^0.11"
   },
   "conflict": {
-    "nette/utils": "<2.5.2"
+    "nette/di": "<3.0.0"
   },
   "suggest": {
     "nette/di": "to use VersionExtension[CompilerExtension]"
@@ -53,7 +53,7 @@
   },
   "extra": {
     "branch-alias": {
-      "dev-master": "0.4.x-dev"
+      "dev-master": "0.5.x-dev"
     }
   }
 }

src/DI/FiltersExtension.php

@@ -6,13 +6,11 @@
 use Contributte\Latte\Filters\FiltersProvider;
 use Nette\Bridges\ApplicationLatte\ILatteFactory;
 use Nette\DI\CompilerExtension;
+use Nette\DI\Definitions\FactoryDefinition;
 
 class FiltersExtension extends CompilerExtension
 {
 
-	/**
-	 * Decorate services
-	 */
 	public function beforeCompile(): void
 	{
 		$builder = $this->getContainerBuilder();
@@ -22,10 +20,11 @@ public function beforeCompile(): void
 		}
 
 		$latte = $builder->getDefinitionByType(ILatteFactory::class);
+		assert($latte instanceof FactoryDefinition);
 		$filters = $builder->findByType(FiltersProvider::class);
 
 		foreach ($filters as $definition) {
-			$latte->addSetup(
+			$latte->getResultDefinition()->addSetup(
 				'foreach (?->getFilters() as $name => $callback) {
 					?->addFilter($name, $callback);
 				}',

src/DI/VersionExtension.php

@@ -6,42 +6,52 @@
 use Contributte\Latte\Macros\VersionMacros;
 use Nette\Bridges\ApplicationLatte\ILatteFactory;
 use Nette\DI\CompilerExtension;
+use Nette\DI\Definitions\FactoryDefinition;
 use Nette\PhpGenerator\PhpLiteral;
+use Nette\Schema\Expect;
+use Nette\Schema\Schema;
+use stdClass;
 
+/**
+ * @property-read stdClass $config
+ */
 class VersionExtension extends CompilerExtension
 {
 
-	/** @var mixed[] */
-	private $defaults = [
-		'generated' => false,
-		'rev' => null,
-		'build' => null,
-		'v' => null,
-	];
-
-	/**
-	 * Decorate services
-	 */
+	public function getConfigSchema(): Schema
+	{
+		return Expect::structure([
+			'generated' => Expect::bool(false),
+			'rev' => Expect::anyOf(Expect::int(), Expect::string()),
+			'build' => Expect::anyOf(Expect::int(), Expect::string()),
+			'v' => Expect::anyOf(Expect::int(), Expect::string()),
+		]);
+	}
+
 	public function beforeCompile(): void
 	{
 		$builder = $this->getContainerBuilder();
-		$config = $this->validateConfig($this->defaults);
+		$config = $this->config;
 
 		if ($builder->getByType(ILatteFactory::class) === null) {
 			throw new LatteDefinitionNotFoundException();
 		}
 
-		if ($config['generated'] === true) {
-			$config['rev'] = md5(microtime() . random_int(0, 100));
-			$config['build'] = md5(microtime() . random_int(0, 100));
-			$config['v'] = md5(microtime() . random_int(0, 100));
+		$factoryDefinition = $builder->getDefinitionByType(ILatteFactory::class);
+		assert($factoryDefinition instanceof FactoryDefinition);
+
+		if ($config->generated) {
+			$config->rev = md5(microtime() . random_int(0, 100));
+			$config->build = md5(microtime() . random_int(0, 100));
+			$config->v = md5(microtime() . random_int(0, 100));
 		}
 
-		$builder->getDefinitionByType(ILatteFactory::class)
+		$factoryDefinition
+			->getResultDefinition()
 			->addSetup('?->onCompile[] = function ($engine) { ?::install($engine->getCompiler(), ?); }', [
 				'@self',
 				new PhpLiteral(VersionMacros::class),
-				$config,
+				(array) $config,
 			]);
 	}