add image storage as global provider

Author: martinknor

src/DI/ImageStorageExtension.php

@@ -47,6 +47,9 @@ public function loadConfiguration(): void
 			->setType(ImageStorage::class)
 			->setFactory(ImageStorage::class)
 			->setArguments((array) $config);
+
+		$builder->addDefinition($this->prefix('latteExtension'))
+		        ->setType(LatteExtension::class);
 	}
 
 	public function beforeCompile(): void
@@ -56,7 +59,7 @@ public function beforeCompile(): void
 		$latteFactory = $builder->getDefinition('latte.latteFactory');
 		assert($latteFactory instanceof FactoryDefinition);
 
-		$latteFactory->getResultDefinition()->addSetup('addExtension', [new LatteExtension()]);
+		$latteFactory->getResultDefinition()->addSetup('addExtension', [$this->prefix('@latteExtension')]);
 	}
 
 }

src/Latte/LatteExtension.php

@@ -2,6 +2,7 @@
 
 namespace Contributte\ImageStorage\Latte;
 
+use Contributte\ImageStorage\ImageStorage;
 use Latte\Compiler\Node;
 use Latte\Compiler\Nodes\AuxiliaryNode;
 use Latte\Compiler\PrintContext;
@@ -11,6 +12,10 @@
 class LatteExtension extends Extension
 {
 
+	public function __construct(protected readonly ImageStorage $imageStorage)
+	{
+	}
+
 	/**
 	 * @return array<mixed>
 	 */
@@ -32,7 +37,7 @@ public function tagImg(Tag $tag): Node
 		$args = $tag->parser->parseArguments();
 
 		return new AuxiliaryNode(
-			fn (PrintContext $context) => $context->format('$_img = $imageStorage->fromIdentifier(%node); echo "<img src=\"" . $basePath . "/" . $_img->createLink() . "\">";', $args)
+			fn (PrintContext $context) => $context->format('$_img = $this->global->imageStorage->fromIdentifier(%node); echo "<img src=\"" . $basePath . "/" . $_img->createLink() . "\">";', $args)
 		);
 	}
 
@@ -41,7 +46,7 @@ public function tagImgAbs(Tag $tag): Node
 		$args = $tag->parser->parseArguments();
 
 		return new AuxiliaryNode(
-			fn (PrintContext $context) => $context->format('$_img = $imageStorage->fromIdentifier(%node); echo "<img src=\"" . $baseUrl . "/" . $_img->createLink() . "\">";', $args)
+			fn (PrintContext $context) => $context->format('$_img = $this->global->imageStorage->fromIdentifier(%node); echo "<img src=\"" . $baseUrl . "/" . $_img->createLink() . "\">";', $args)
 		);
 	}
 
@@ -50,7 +55,7 @@ public function attrImg(Tag $tag): Node
 		$args = $tag->parser->parseArguments();
 
 		return new AuxiliaryNode(
-			fn (PrintContext $context) => $context->format('$_img = $imageStorage->fromIdentifier(%node); echo \' src="\' . $basePath . "/" . $_img->createLink() . \'"\';', $args)
+			fn (PrintContext $context) => $context->format('$_img = $this->global->imageStorage->fromIdentifier(%node); echo \' src="\' . $basePath . "/" . $_img->createLink() . \'"\';', $args)
 		);
 	}
 
@@ -59,7 +64,7 @@ public function attrImgAbs(Tag $tag): Node
 		$args = $tag->parser->parseArguments();
 
 		return new AuxiliaryNode(
-			fn (PrintContext $context) => $context->format('$_img = $imageStorage->fromIdentifier(%node); echo \' src="\' . $baseUrl . "/" . $_img->createLink() . \'"\';', $args)
+			fn (PrintContext $context) => $context->format('$_img = $this->global->imageStorage->fromIdentifier(%node); echo \' src="\' . $baseUrl . "/" . $_img->createLink() . \'"\';', $args)
 		);
 	}
 
@@ -68,7 +73,7 @@ public function linkImg(Tag $tag): Node
 		$args = $tag->parser->parseArguments();
 
 		return new AuxiliaryNode(
-			fn (PrintContext $context) => $context->format('$_img = $imageStorage->fromIdentifier(%node); echo $basePath . "/" . $_img->createLink();', $args)
+			fn (PrintContext $context) => $context->format('$_img = $this->global->imageStorage->fromIdentifier(%node); echo $basePath . "/" . $_img->createLink();', $args)
 		);
 	}
 
@@ -77,8 +82,15 @@ public function linkImgAbs(Tag $tag): Node
 		$args = $tag->parser->parseArguments();
 
 		return new AuxiliaryNode(
-			fn (PrintContext $context) => $context->format('$_img = $imageStorage->fromIdentifier(%node); echo $baseUrl . "/" . $_img->createLink();', $args)
+			fn (PrintContext $context) => $context->format('$_img = $this->global->imageStorage->fromIdentifier(%node); echo $baseUrl . "/" . $_img->createLink();', $args)
 		);
 	}
 
+	public function getProviders(): array
+	{
+		return [
+			'imageStorage' => $this->imageStorage, // Register the provider
+		];
+	}
+
 }