Simplified strictMode handling. EntrypointLookupCollection::getEntrypointLookup fails because build is not configured but not because file doesn't exist.

Author: karser

src/Asset/EmptyEntrypointLookup.php

@@ -27,26 +27,23 @@ class EntrypointLookupCollection implements EntrypointLookupCollectionInterface
 
     private $strictMode;
 
-    public function __construct(ContainerInterface $buildEntrypoints, string $defaultBuildName = null, bool $strictMode = true)
+    public function __construct(ContainerInterface $buildEntrypoints, string $defaultBuildName = null)
     {
         $this->buildEntrypoints = $buildEntrypoints;
         $this->defaultBuildName = $defaultBuildName;
-        $this->strictMode = $strictMode;
     }
 
     public function getEntrypointLookup(string $buildName = null): EntrypointLookupInterface
     {
         if (null === $buildName) {
             if (null === $this->defaultBuildName) {
-                if (!$this->strictMode) return new EmptyEntrypointLookup();
                 throw new UndefinedBuildException('There is no default build configured: please pass an argument to getEntrypointLookup().');
             }
 
             $buildName = $this->defaultBuildName;
         }
 
         if (!$this->buildEntrypoints->has($buildName)) {
-            if (!$this->strictMode) return new EmptyEntrypointLookup();
             throw new UndefinedBuildException(sprintf('The build "%s" is not configured', $buildName));
         }
 

src/Asset/EntrypointLookupCollection.php

@@ -49,11 +49,7 @@ public function load(array $configs, ContainerBuilder $container)
             ->replaceArgument(0, $cacheKeys);
 
         $container->getDefinition('webpack_encore.entrypoint_lookup_collection')
-            ->replaceArgument(0, ServiceLocatorTagPass::register($container, $factories))
-            ->replaceArgument(2, $config['strict_mode']);
-
-        $container->getDefinition('webpack_encore.twig_entry_files_extension')
-            ->replaceArgument(1, $config['strict_mode']);
+            ->replaceArgument(0, ServiceLocatorTagPass::register($container, $factories));
 
         $container->setAlias(EntrypointLookupInterface::class, new Alias($this->getEntrypointServiceId('_default')));
     }

src/DependencyInjection/WebpackEncoreExtension.php

@@ -9,8 +9,6 @@
 
         <service id="webpack_encore.entrypoint_lookup_collection" class="Symfony\WebpackEncoreBundle\Asset\EntrypointLookupCollection">
             <argument /> <!-- build list of entrypoints locator -->
-            <argument /> <!-- defaultBuildName -->
-            <argument /> <!-- strictMode -->
         </service>
 
         <service id="Symfony\WebpackEncoreBundle\Asset\EntrypointLookupCollectionInterface" alias="webpack_encore.entrypoint_lookup_collection" />
@@ -31,7 +29,6 @@
                     </argument>
                 </service>
             </argument>
-            <argument /><!-- strict mode -->
         </service>
 
         <service id="webpack_encore.entrypoint_lookup.cache_warmer" class="Symfony\WebpackEncoreBundle\CacheWarmer\EntrypointCacheWarmer">

src/Resources/config/services.xml

@@ -18,12 +18,10 @@
 final class EntryFilesTwigExtension extends AbstractExtension
 {
     private $container;
-    private $strictMode;
 
-    public function __construct(ContainerInterface $container, bool $strictMode)
+    public function __construct(ContainerInterface $container)
     {
         $this->container = $container;
-        $this->strictMode = $strictMode;
     }
 
     public function getFunctions()

src/Twig/EntryFilesTwigExtension.php

@@ -107,7 +107,7 @@ public function testEnabledStrictMode_throwsException_ifBuildMissing()
     {
         $kernel = new WebpackEncoreIntegrationTestKernel(true);
         $kernel->outputPath = 'missing_build';
-        $kernel->builds = [];
+        $kernel->builds = ['different_build' => 'missing_build'];
         $kernel->boot();
         $container = $kernel->getContainer();
 
@@ -119,7 +119,7 @@ public function testDisabledStrictMode_ignoresMissingBuild()
         $kernel = new WebpackEncoreIntegrationTestKernel(true);
         $kernel->outputPath = 'missing_build';
         $kernel->strictMode = false;
-        $kernel->builds = [];
+        $kernel->builds = ['different_build' => 'missing_build'];
         $kernel->boot();
         $container = $kernel->getContainer();