fully use Latte 3's Extension (#40)

contributte · Jun 12, 2022 · f29901b · f29901b
1 parent 5bc9319
commit f29901b
Show file tree

Hide file tree

Showing 3 changed files with 17 additions and 4 deletions.
diff --git a/src/DI/WebpackExtension.php b/src/DI/WebpackExtension.php
@@ -116,10 +116,9 @@ public function loadConfiguration(): void
 				$definition = $latteFactory->getResultDefinition();
 				\assert($definition instanceof ServiceDefinition);
 
-				$definition->addSetup('?->addProvider(?, ?)', ['@self', 'webpackAssetLocator', $assetLocator]);
-
 				// @phpstan-ignore-next-line latte 2 compatibility
 				if (\version_compare(Engine::VERSION, '3', '<')) {
+					$definition->addSetup('?->addProvider(?, ?)', ['@self', 'webpackAssetLocator', $assetLocator]);
 					$definition->addSetup('?->onCompile[] = function ($engine) { Contributte\Webpack\Latte\WebpackMacros::install($engine->getCompiler()); }', ['@self']);
 				} else {
 					$definition->addSetup('addExtension', [new Statement(\Contributte\Webpack\Latte\WebpackExtension::class)]);

diff --git a/src/Latte/WebpackExtension.php b/src/Latte/WebpackExtension.php
@@ -4,14 +4,29 @@
 
 namespace Contributte\Webpack\Latte;
 
+use Contributte\Webpack\AssetLocator;
 use Latte\Extension;
 
 final class WebpackExtension extends Extension
 {
+	private AssetLocator $assetLocator;
+
+	public function __construct(AssetLocator $assetLocator)
+	{
+		$this->assetLocator = $assetLocator;
+	}
+
 	public function getTags(): array
 	{
 		return [
 			'webpack' => [WebpackNode::class, 'create'],
 		];
 	}
+
+	public function getProviders(): array
+	{
+		return [
+			'webpackAssetLocator' => $this->assetLocator,
+		];
+	}
 }
diff --git a/tests/Latte/WebpackExtensionTest.phpt b/tests/Latte/WebpackExtensionTest.phpt
@@ -38,8 +38,7 @@ final class WebpackExtensionTest extends TestCase
 		);
 
 		$latte = new Engine();
-		$latte->addProvider('webpackAssetLocator', $assetLocator);
-		$latte->addExtension(new WebpackExtension());
+		$latte->addExtension(new WebpackExtension($assetLocator));
 
 		$latte->setLoader(new StringLoader());
 		Assert::same('/dist/asset.js', $latte->renderToString('{webpack asset.js}'));