revert changes to unaffected code

m-vo · m-vo · commit ee73cf235885 · 2021-07-09T17:17:06.000+02:00
diff --git a/core-bundle/src/ContaoCoreBundle.php b/core-bundle/src/ContaoCoreBundle.php
@@ -27,10 +27,10 @@
 use Contao\CoreBundle\DependencyInjection\Compiler\RegisterHookListenersPass;
 use Contao\CoreBundle\DependencyInjection\Compiler\RegisterPagesPass;
 use Contao\CoreBundle\DependencyInjection\Compiler\RemembermeServicesPass;
+use Contao\CoreBundle\DependencyInjection\Compiler\RewireTwigPathsPass;
 use Contao\CoreBundle\DependencyInjection\Compiler\SearchIndexerPass;
 use Contao\CoreBundle\DependencyInjection\Compiler\TaggedMigrationsPass;
 use Contao\CoreBundle\DependencyInjection\Compiler\TranslationDataCollectorPass;
-use Contao\CoreBundle\DependencyInjection\Compiler\TwigPathsPass;
 use Contao\CoreBundle\DependencyInjection\ContaoCoreExtension;
 use Contao\CoreBundle\DependencyInjection\Security\ContaoLoginFactory;
 use Contao\CoreBundle\Event\ContaoCoreEvents;
@@ -116,7 +116,7 @@ public function build(ContainerBuilder $container): void
         $container->addCompilerPass(new AddCronJobsPass());
         $container->addCompilerPass(new AddAvailableTransportsPass());
         $container->addCompilerPass(new RegisterRouteEnhancersPass('contao.routing.page_router', 'contao.page_router_enhancer'));
-        $container->addCompilerPass(new TwigPathsPass());
+        $container->addCompilerPass(new RewireTwigPathsPass());
         $container->addCompilerPass(new AddNativeTransportFactoryPass());
     }
 }
diff --git a/core-bundle/src/DependencyInjection/Compiler/RewireTwigPathsPass.php b/core-bundle/src/DependencyInjection/Compiler/RewireTwigPathsPass.php
@@ -15,31 +15,24 @@
 use Contao\CoreBundle\Twig\Loader\FailTolerantFilesystemLoader;
 use Symfony\Component\DependencyInjection\Compiler\CompilerPassInterface;
 use Symfony\Component\DependencyInjection\ContainerBuilder;
-use Symfony\Component\DependencyInjection\Definition;
 
 /**
  * @internal
  */
-class TwigPathsPass implements CompilerPassInterface
+class RewireTwigPathsPass implements CompilerPassInterface
 {
-    public function process(ContainerBuilder $container): void
-    {
-        $this->migrateSymfonyTwigPaths(
-            $container->getDefinition('twig.loader.native_filesystem'),
-            $container->getDefinition(FailTolerantFilesystemLoader::class)
-        );
-    }
-
     /**
      * Rewires Symfony's "addPath" method calls to our fail tolerant version
-     * of a filesystem loader which tolerates missing paths that will occur
+     * of a filesystem loader which tolerates missing paths. Those will occur
      * as soon as a user removes registered directories (e.g. from within the
-     * backend) and that would otherwise require the container to be rebuild.
+     * backend) and that would otherwise require the container to be rebuilt.
      */
-    private function migrateSymfonyTwigPaths(Definition $from, Definition $to): void
+    public function process(ContainerBuilder $container): void
     {
+        $original = $container->getDefinition('twig.loader.native_filesystem');
+
         $calls = array_filter(
-            $from->getMethodCalls(),
+            $original->getMethodCalls(),
             static function (array $call): bool {
                 return 'addPath' === $call[0];
             }
@@ -49,10 +42,12 @@ static function (array $call): bool {
             return;
         }
 
-        $from->removeMethodCall('addPath');
+        $original->removeMethodCall('addPath');
+
+        $replaced = $container->getDefinition(FailTolerantFilesystemLoader::class);
 
         foreach ($calls as $call) {
-            $to->addMethodCall(...$call);
+            $replaced->addMethodCall(...$call);
         }
     }
 }
diff --git a/core-bundle/tests/ContaoCoreBundleTest.php b/core-bundle/tests/ContaoCoreBundleTest.php
@@ -28,10 +28,10 @@
 use Contao\CoreBundle\DependencyInjection\Compiler\RegisterHookListenersPass;
 use Contao\CoreBundle\DependencyInjection\Compiler\RegisterPagesPass;
 use Contao\CoreBundle\DependencyInjection\Compiler\RemembermeServicesPass;
+use Contao\CoreBundle\DependencyInjection\Compiler\RewireTwigPathsPass;
 use Contao\CoreBundle\DependencyInjection\Compiler\SearchIndexerPass;
 use Contao\CoreBundle\DependencyInjection\Compiler\TaggedMigrationsPass;
 use Contao\CoreBundle\DependencyInjection\Compiler\TranslationDataCollectorPass;
-use Contao\CoreBundle\DependencyInjection\Compiler\TwigPathsPass;
 use Contao\CoreBundle\DependencyInjection\Security\ContaoLoginFactory;
 use Contao\CoreBundle\Event\ContaoCoreEvents;
 use Contao\CoreBundle\Event\GenerateSymlinksEvent;
@@ -73,7 +73,7 @@ public function testAddsTheCompilerPasses(): void
             AddCronJobsPass::class,
             AddAvailableTransportsPass::class,
             RegisterRouteEnhancersPass::class,
-            TwigPathsPass::class,
+            RewireTwigPathsPass::class,
             AddNativeTransportFactoryPass::class,
         ];
 
diff --git a/core-bundle/tests/DependencyInjection/Compiler/RewireTwigPathsPassTest.php b/core-bundle/tests/DependencyInjection/Compiler/RewireTwigPathsPassTest.php
@@ -12,14 +12,14 @@
 
 namespace Contao\CoreBundle\Tests\DependencyInjection\Compiler;
 
-use Contao\CoreBundle\DependencyInjection\Compiler\TwigPathsPass;
+use Contao\CoreBundle\DependencyInjection\Compiler\RewireTwigPathsPass;
 use Contao\CoreBundle\Tests\TestCase;
 use Contao\CoreBundle\Twig\Loader\FailTolerantFilesystemLoader;
 use Symfony\Component\DependencyInjection\ContainerBuilder;
 use Symfony\Component\DependencyInjection\Definition;
 use Twig\Loader\FilesystemLoader;
 
-class TwigPathsPassTest extends TestCase
+class RewireTwigPathsPassTest extends TestCase
 {
     public function testRewiresAndAddsMethodCalls(): void
     {
@@ -38,7 +38,7 @@ public function testRewiresAndAddsMethodCalls(): void
             FailTolerantFilesystemLoader::class => $loader,
         ]);
 
-        (new TwigPathsPass())->process($container);
+        (new RewireTwigPathsPass())->process($container);
 
         $this->assertFalse($baseLoader->hasMethodCall('addPath'));
         $this->assertTrue($baseLoader->hasMethodCall('foo'));
