Fix twig:lint bug with anonymous component tag

Author: smnandre

src/TwigComponent/src/ComponentTemplateFinder.php

@@ -19,25 +19,25 @@
  */
 final class ComponentTemplateFinder implements ComponentTemplateFinderInterface
 {
-    /**
-     * Avoid bug when the lint:command changes the Environment Loader.
-     *
-     * @internal
-     */
-    private LoaderInterface $loader;
+    private readonly LoaderInterface $loader;
 
     public function __construct(
-        private Environment $environment,
+        Environment|LoaderInterface $loader,
         private readonly ?string $directory = null,
     ) {
+        if ($loader instanceof Environment) {
+            trigger_deprecation('symfony/ux-twig-component', '2.13', 'The "%s()" method will require "%s $loader" as first argument in 3.0. Passing an "Environment" instance is deprecated.', __METHOD__, LoaderInterface::class);
+            $loader = $loader->getLoader();
+        }
+        $this->loader = $loader;
         if (null === $this->directory) {
             trigger_deprecation('symfony/ux-twig-component', '2.13', 'The "%s()" method will require "string $directory" argument in 3.0. Not defining it or passing null is deprecated.', __METHOD__);
         }
     }
 
     public function findAnonymousComponentTemplate(string $name): ?string
     {
-        $loader = $this->getLoader();
+        $loader = $this->loader;
         $componentPath = rtrim(str_replace(':', '/', $name));
 
         // Legacy auto-naming rules < 2.13
@@ -68,20 +68,4 @@ public function findAnonymousComponentTemplate(string $name): ?string
 
         return null;
     }
-
-    /**
-     * @internal
-     */
-    public function setLoader(LoaderInterface $loader): void
-    {
-        $this->loader = $loader;
-    }
-
-    /**
-     * @internal
-     */
-    private function getLoader(): LoaderInterface
-    {
-        return $this->loader ??= $this->environment->getLoader();
-    }
 }

src/TwigComponent/src/DependencyInjection/TwigComponentExtension.php

@@ -65,11 +65,9 @@ public function load(array $configs, ContainerBuilder $container): void
 
         $container->register('ux.twig_component.component_template_finder', ComponentTemplateFinder::class)
             ->setArguments([
-                new Reference('twig'),
+                new Reference('twig.loader'),
                 $config['anonymous_template_directory'],
-            ])
-            ->addMethodCall('setLoader', [new Reference('twig.loader')]);
-
+            ]);
         $container->setAlias(ComponentRendererInterface::class, 'ux.twig_component.component_renderer');
 
         $container->registerAttributeForAutoconfiguration(

src/TwigComponent/tests/Unit/ComponentTemplateFinderTest.php

@@ -16,6 +16,7 @@
 use Symfony\UX\TwigComponent\ComponentTemplateFinder;
 use Twig\Environment;
 use Twig\Loader\ArrayLoader;
+use Twig\Loader\LoaderInterface;
 
 /**
  * @author Simon André <[email protected]>
@@ -36,8 +37,8 @@ public function testFindTemplate(): void
             'components/b.html.twig',
             'components/c',
         ];
-        $environment = $this->createEnvironment($templates);
-        $finder = new ComponentTemplateFinder($environment, 'components');
+        $loader = $this->createLoader($templates);
+        $finder = new ComponentTemplateFinder($loader, 'components');
 
         $this->assertEquals('components/aa.html.twig', $finder->findAnonymousComponentTemplate('aa'));
         $this->assertEquals('components/aa/bb.html.twig', $finder->findAnonymousComponentTemplate('aa:bb'));
@@ -84,6 +85,17 @@ public function testFindTemplateWithLegacyAutonaming(): void
         $this->assertNull($finder->findAnonymousComponentTemplate('nope:bar'));
     }
 
+    /**
+     * @group legacy
+     */
+    public function testTriggerDeprecationWhenEnvironmentAsFirstArgument(): void
+    {
+        $environment = $this->createEnvironment([]);
+
+        $this->expectDeprecation('Since symfony/ux-twig-component 2.13: The "Symfony\UX\TwigComponent\ComponentTemplateFinder::__construct()" method will require "Twig\Loader\LoaderInterface $loader" as first argument in 3.0. Passing an "Environment" instance is deprecated.');
+        $finder = new ComponentTemplateFinder($environment, 'foo');
+    }
+
     /**
      * @group legacy
      */
@@ -106,18 +118,21 @@ public function testFindTemplateWithinDirectory(): void
             'bar/foo/bar.html.twig',
             'foo/foo/bar.html.twig',
         ];
-        $environment = $this->createEnvironment($templates);
-        $finder = new ComponentTemplateFinder($environment, 'foo');
+        $loader = $this->createLoader($templates);
+        $finder = new ComponentTemplateFinder($loader, 'foo');
 
         $this->assertEquals('foo/bar.html.twig', $finder->findAnonymousComponentTemplate('bar'));
         $this->assertEquals('foo/foo/bar.html.twig', $finder->findAnonymousComponentTemplate('foo:bar'));
         $this->assertEquals('foo/foo/bar.html.twig', $finder->findAnonymousComponentTemplate('foo:bar'));
     }
 
-    private function createEnvironment(array $templates): Environment
+    private function createLoader(array $templates): LoaderInterface
     {
-        $loader = new ArrayLoader(array_combine($templates, $templates));
+        return new ArrayLoader(array_combine($templates, $templates));
+    }
 
-        return new Environment($loader);
+    private function createEnvironment(array $templates): Environment
+    {
+        return new Environment($this->createLoader($templates));
     }
 }