[AssetMapper] Fixing incorrect exception & adding allowing more realistic error mode

Author: weaverryan

DependencyInjection/Configuration.php

@@ -870,9 +870,10 @@ private function addAssetMapperSection(ArrayNodeDefinition $rootNode, callable $
                             ->info('The public path where the assets will be written to (and served from when "server" is true)')
                             ->defaultValue('/assets/')
                         ->end()
-                        ->booleanNode('strict_mode')
-                            ->info('If true, an exception will be thrown if an asset cannot be found when imported from JavaScript or CSS files - e.g. "import \'./non-existent.js\'"')
-                            ->defaultValue(true)
+                        ->enumNode('missing_import_mode')
+                            ->values(['strict', 'warn', 'ignore'])
+                            ->info('Behavior if an asset cannot be found when imported from JavaScript or CSS files - e.g. "import \'./non-existent.js\'". "strict" means an exception is thrown, "warn" means a warning is logged, "ignore" means the import is left as-is.')
+                            ->defaultValue('warn')
                         ->end()
                         ->arrayNode('extensions')
                             ->info('Key-value pair of file extensions set to their mime type.')

DependencyInjection/FrameworkExtension.php

@@ -1305,10 +1305,10 @@ private function registerAssetMapperConfiguration(array $config, ContainerBuilde
         }
 
         $container->getDefinition('asset_mapper.compiler.css_asset_url_compiler')
-            ->setArgument(0, $config['strict_mode']);
+            ->setArgument(0, $config['missing_import_mode']);
 
         $container->getDefinition('asset_mapper.compiler.javascript_import_path_compiler')
-            ->setArgument(0, $config['strict_mode']);
+            ->setArgument(0, $config['missing_import_mode']);
 
         $container
             ->getDefinition('asset_mapper.importmap.manager')

Resources/config/asset_mapper.php

@@ -114,7 +114,8 @@
 
         ->set('asset_mapper.compiler.css_asset_url_compiler', CssAssetUrlCompiler::class)
             ->args([
-                abstract_arg('strict mode'),
+                abstract_arg('missing import mode'),
+                service('logger'),
             ])
             ->tag('asset_mapper.compiler')
 
@@ -123,7 +124,8 @@
 
         ->set('asset_mapper.compiler.javascript_import_path_compiler', JavaScriptImportPathCompiler::class)
             ->args([
-                abstract_arg('strict mode'),
+                abstract_arg('missing import mode'),
+                service('logger'),
             ])
             ->tag('asset_mapper.compiler')
 

Resources/config/schema/symfony-1.0.xsd

@@ -197,7 +197,7 @@
         <xsd:attribute name="enabled" type="xsd:boolean" />
         <xsd:attribute name="server" type="xsd:boolean" />
         <xsd:attribute name="public-prefix" type="xsd:string" />
-        <xsd:attribute name="strict-mode" type="xsd:boolean" />
+        <xsd:attribute name="missing-import-mode" type="missing-import-mode" />
         <xsd:attribute name="importmap-path" type="xsd:string" />
         <xsd:attribute name="importmap-polyfill" type="xsd:string" />
         <xsd:attribute name="vendor-dir" type="xsd:string" />
@@ -216,6 +216,14 @@
         <xsd:attribute name="key" type="xsd:string" use="required" />
     </xsd:complexType>
 
+    <xsd:simpleType name="missing-import-mode">
+        <xsd:restriction base="xsd:string">
+            <xsd:enumeration value="strict" />
+            <xsd:enumeration value="warn" />
+            <xsd:enumeration value="ignore" />
+        </xsd:restriction>
+    </xsd:simpleType>
+
     <xsd:complexType name="translator">
         <xsd:sequence>
             <xsd:element name="fallback" type="xsd:string" minOccurs="0" maxOccurs="unbounded" />

Tests/DependencyInjection/ConfigurationTest.php

@@ -107,7 +107,7 @@ public function testAssetMapperCanBeEnabled()
             'excluded_patterns' => [],
             'server' => true,
             'public_prefix' => '/assets/',
-            'strict_mode' => true,
+            'missing_import_mode' => 'warn',
             'extensions' => [],
             'importmap_path' => '%kernel.project_dir%/importmap.php',
             'importmap_polyfill' => null,
@@ -619,7 +619,7 @@ protected static function getBundleDefaultConfig()
                 'excluded_patterns' => [],
                 'server' => true,
                 'public_prefix' => '/assets/',
-                'strict_mode' => true,
+                'missing_import_mode' => 'warn',
                 'extensions' => [],
                 'importmap_path' => '%kernel.project_dir%/importmap.php',
                 'importmap_polyfill' => null,

Tests/DependencyInjection/Fixtures/xml/asset_mapper.xml

@@ -11,7 +11,7 @@
             enabled="true"
             server="true"
             public-prefix="/assets_path/"
-            strict-mode="true"
+            missing-import-mode="strict"
             importmap-path="%kernel.project_dir%/importmap.php"
             importmap-polyfill="https://cdn.example.com/polyfill.js"
             vendor-dir="%kernel.project_dir%/assets/vendor"

Tests/DependencyInjection/XmlFrameworkExtensionTest.php

@@ -89,5 +89,8 @@ public function testAssetMapper()
 
         $definition = $container->getDefinition('asset_mapper.repository');
         $this->assertSame(['assets/' => '', 'assets2/' => 'my_namespace'], $definition->getArgument(0));
+
+        $definition = $container->getDefinition('asset_mapper.compiler.css_asset_url_compiler');
+        $this->assertSame('strict', $definition->getArgument(0));
     }
 }