Option to make asset manifests strict on missing item

Author: GromNaN

DependencyInjection/Configuration.php

@@ -696,6 +696,10 @@ private function addAssetsSection(ArrayNodeDefinition $rootNode, callable $enabl
                     ->{$enableIfStandalone('symfony/asset', Package::class)}()
                     ->fixXmlConfig('base_url')
                     ->children()
+                        ->booleanNode('strict_mode')
+                            ->info('Throw an exception if an entry is missing from the manifest.json')
+                            ->defaultFalse()
+                        ->end()
                         ->scalarNode('version_strategy')->defaultNull()->end()
                         ->scalarNode('version')->defaultNull()->end()
                         ->scalarNode('version_format')->defaultValue('%%s?%%s')->end()
@@ -733,6 +737,10 @@ private function addAssetsSection(ArrayNodeDefinition $rootNode, callable $enabl
                             ->prototype('array')
                                 ->fixXmlConfig('base_url')
                                 ->children()
+                                    ->booleanNode('strict_mode')
+                                        ->info('Throw an exception if an entry is missing from the manifest.json')
+                                        ->defaultFalse()
+                                    ->end()
                                     ->scalarNode('version_strategy')->defaultNull()->end()
                                     ->scalarNode('version')
                                         ->beforeNormalization()

DependencyInjection/FrameworkExtension.php

@@ -1141,7 +1141,7 @@ private function registerAssetsConfiguration(array $config, ContainerBuilder $co
         if ($config['version_strategy']) {
             $defaultVersion = new Reference($config['version_strategy']);
         } else {
-            $defaultVersion = $this->createVersion($container, $config['version'], $config['version_format'], $config['json_manifest_path'], '_default');
+            $defaultVersion = $this->createVersion($container, $config['version'], $config['version_format'], $config['json_manifest_path'], '_default', $config['strict_mode']);
         }
 
         $defaultPackage = $this->createPackageDefinition($config['base_path'], $config['base_urls'], $defaultVersion);
@@ -1157,7 +1157,7 @@ private function registerAssetsConfiguration(array $config, ContainerBuilder $co
                 // let format fallback to main version_format
                 $format = $package['version_format'] ?: $config['version_format'];
                 $version = $package['version'] ?? null;
-                $version = $this->createVersion($container, $version, $format, $package['json_manifest_path'], $name);
+                $version = $this->createVersion($container, $version, $format, $package['json_manifest_path'], $name, $package['strict_mode']);
             }
 
             $packageDefinition = $this->createPackageDefinition($package['base_path'], $package['base_urls'], $version)
@@ -1186,7 +1186,7 @@ private function createPackageDefinition(?string $basePath, array $baseUrls, Ref
         return $package;
     }
 
-    private function createVersion(ContainerBuilder $container, ?string $version, ?string $format, ?string $jsonManifestPath, string $name): Reference
+    private function createVersion(ContainerBuilder $container, ?string $version, ?string $format, ?string $jsonManifestPath, string $name, bool $strictMode): Reference
     {
         // Configuration prevents $version and $jsonManifestPath from being set
         if (null !== $version) {
@@ -1203,6 +1203,7 @@ private function createVersion(ContainerBuilder $container, ?string $version, ?s
         if (null !== $jsonManifestPath) {
             $def = new ChildDefinition('assets.json_manifest_version_strategy');
             $def->replaceArgument(0, $jsonManifestPath);
+            $def->replaceArgument(2, $strictMode);
             $container->setDefinition('assets._version_'.$name, $def);
 
             return new Reference('assets._version_'.$name);

Resources/config/assets.php

@@ -80,6 +80,7 @@
             ->args([
                 abstract_arg('manifest path'),
                 service('http_client')->nullOnInvalid(),
+                false,
             ])
 
         ->set('assets.remote_json_manifest_version_strategy', RemoteJsonManifestVersionStrategy::class)

Resources/config/schema/symfony-1.0.xsd

@@ -155,6 +155,7 @@
         <xsd:attribute name="version" type="xsd:string" />
         <xsd:attribute name="version-format" type="xsd:string" />
         <xsd:attribute name="json-manifest-path" type="xsd:string" />
+        <xsd:attribute name="strict-mode" type="xsd:boolean" />
     </xsd:complexType>
 
     <xsd:complexType name="package">
@@ -168,6 +169,7 @@
         <xsd:attribute name="version" type="xsd:string" />
         <xsd:attribute name="version-format" type="xsd:string" />
         <xsd:attribute name="json-manifest-path" type="xsd:string" />
+        <xsd:attribute name="strict-mode" type="xsd:boolean" />
     </xsd:complexType>
 
     <xsd:complexType name="translator">

Tests/DependencyInjection/ConfigurationTest.php

@@ -86,6 +86,7 @@ public function testAssetsCanBeEnabled()
             'base_urls' => [],
             'packages' => [],
             'json_manifest_path' => null,
+            'strict_mode' => false,
         ];
 
         $this->assertEquals($defaultConfig, $config['assets']);
@@ -489,6 +490,7 @@ protected static function getBundleDefaultConfig()
                 'base_urls' => [],
                 'packages' => [],
                 'json_manifest_path' => null,
+                'strict_mode' => false,
             ],
             'cache' => [
                 'pools' => [],

Tests/DependencyInjection/Fixtures/php/assets.php

@@ -36,6 +36,10 @@
             'env_manifest' => [
                 'json_manifest_path' => '%env(env_manifest)%',
             ],
+            'strict_manifest_strategy' => [
+                'json_manifest_path' => '/path/to/manifest.json',
+                'strict_mode' => true,
+            ],
         ],
     ],
 ]);

Tests/DependencyInjection/Fixtures/xml/assets.xml

@@ -25,6 +25,7 @@
             <framework:package name="remote_manifest" json-manifest-path="https://cdn.example.com/manifest.json" />
             <framework:package name="var_manifest" json-manifest-path="%var_json_manifest_path%" />
             <framework:package name="env_manifest" json-manifest-path="%env(env_manifest)%" />
+            <framework:package name="strict_manifest_strategy" json-manifest-path="/path/to/manifest.json" strict-mode="true" />
         </framework:assets>
     </framework:config>
 

Tests/DependencyInjection/Fixtures/yml/assets.yml

@@ -25,6 +25,9 @@ framework:
                 json_manifest_path: '%var_json_manifest_path%'
             env_manifest:
                 json_manifest_path: '%env(env_manifest)%'
+            strict_manifest_strategy:
+                json_manifest_path: '/path/to/manifest.json'
+                strict_mode: true
 
 parameters:
     var_json_manifest_path: 'https://cdn.example.com/manifest.json'

Tests/DependencyInjection/FrameworkExtensionTest.php

@@ -632,7 +632,7 @@ public function testAssets()
 
         // packages
         $packageTags = $container->findTaggedServiceIds('assets.package');
-        $this->assertCount(9, $packageTags);
+        $this->assertCount(10, $packageTags);
 
         $packages = [];
         foreach ($packageTags as $serviceId => $tagAttributes) {
@@ -658,6 +658,7 @@ public function testAssets()
         $versionStrategy = $container->getDefinition((string) $package->getArgument(1));
         $this->assertEquals('assets.json_manifest_version_strategy', $versionStrategy->getParent());
         $this->assertEquals('/path/to/manifest.json', $versionStrategy->getArgument(0));
+        $this->assertFalse($versionStrategy->getArgument(2));
 
         $package = $container->getDefinition($packages['remote_manifest']);
         $versionStrategy = $container->getDefinition($package->getArgument(1));
@@ -668,11 +669,19 @@ public function testAssets()
         $versionStrategy = $container->getDefinition($package->getArgument(1));
         $this->assertSame('assets.json_manifest_version_strategy', $versionStrategy->getParent());
         $this->assertSame('https://cdn.example.com/manifest.json', $versionStrategy->getArgument(0));
+        $this->assertFalse($versionStrategy->getArgument(2));
 
         $package = $container->getDefinition($packages['env_manifest']);
         $versionStrategy = $container->getDefinition($package->getArgument(1));
         $this->assertSame('assets.json_manifest_version_strategy', $versionStrategy->getParent());
         $this->assertStringMatchesFormat('env_%s', $versionStrategy->getArgument(0));
+        $this->assertFalse($versionStrategy->getArgument(2));
+
+        $package = $container->getDefinition((string) $packages['strict_manifest_strategy']);
+        $versionStrategy = $container->getDefinition((string) $package->getArgument(1));
+        $this->assertEquals('assets.json_manifest_version_strategy', $versionStrategy->getParent());
+        $this->assertEquals('/path/to/manifest.json', $versionStrategy->getArgument(0));
+        $this->assertTrue($versionStrategy->getArgument(2));
     }
 
     public function testAssetsDefaultVersionStrategyAsService()