Allow env variables in json_manifest_path

Author: jderusse

DependencyInjection/FrameworkExtension.php

@@ -1129,12 +1129,7 @@ private function createVersion(ContainerBuilder $container, ?string $version, ?s
         }
 
         if (null !== $jsonManifestPath) {
-            $definitionName = 'assets.json_manifest_version_strategy';
-            if (0 === strpos(parse_url($jsonManifestPath, \PHP_URL_SCHEME), 'http')) {
-                $definitionName = 'assets.remote_json_manifest_version_strategy';
-            }
-
-            $def = new ChildDefinition($definitionName);
+            $def = new ChildDefinition('assets.json_manifest_version_strategy');
             $def->replaceArgument(0, $jsonManifestPath);
             $container->setDefinition('assets._version_'.$name, $def);
 

Resources/config/assets.php

@@ -77,10 +77,12 @@
             ->abstract()
             ->args([
                 abstract_arg('manifest path'),
+                service('http_client'),
             ])
 
         ->set('assets.remote_json_manifest_version_strategy', RemoteJsonManifestVersionStrategy::class)
             ->abstract()
+            ->deprecate('symfony/framework-bundle', '5.3', 'The "%service_id%" service is deprecated, use "assets.json_manifest_version_strategy" instead.')
             ->args([
                 abstract_arg('manifest url'),
                 service('http_client'),

Tests/DependencyInjection/Fixtures/php/assets.php

@@ -30,6 +30,15 @@
             'remote_manifest' => [
                 'json_manifest_path' => 'https://cdn.example.com/manifest.json',
             ],
+            'var_manifest' => [
+                'json_manifest_path' => '%var_json_manifest_path%',
+            ],
+            'env_manifest' => [
+                'json_manifest_path' => '%env(env_manifest)%',
+            ],
         ],
     ],
 ]);
+
+$container->setParameter('var_json_manifest_path', 'https://cdn.example.com/manifest.json');
+$container->setParameter('env(env_manifest)', 'https://cdn.example.com/manifest.json');

Tests/DependencyInjection/Fixtures/xml/assets.xml

@@ -23,6 +23,13 @@
             </framework:package>
             <framework:package name="json_manifest_strategy" json-manifest-path="/path/to/manifest.json" />
             <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:assets>
     </framework:config>
+
+    <parameters>
+        <parameter key="var_json_manifest_path">https://cdn.example.com/manifest.json</parameter>
+        <parameter key="env(env_manifest)">https://cdn.example.com/manifest.json</parameter>
+    </parameters>
 </container>

Tests/DependencyInjection/Fixtures/yml/assets.yml

@@ -21,3 +21,11 @@ framework:
                 json_manifest_path: '/path/to/manifest.json'
             remote_manifest:
                 json_manifest_path: 'https://cdn.example.com/manifest.json'
+            var_manifest:
+                json_manifest_path: '%var_json_manifest_path%'
+            env_manifest:
+                json_manifest_path: '%env(env_manifest)%'
+
+parameters:
+    var_json_manifest_path: 'https://cdn.example.com/manifest.json'
+    env(env_manifest): https://cdn.example.com/manifest.json

Tests/DependencyInjection/FrameworkExtensionTest.php

@@ -597,7 +597,7 @@ public function testAssets()
 
         // packages
         $packages = $packages->getArgument(1);
-        $this->assertCount(7, $packages);
+        $this->assertCount(9, $packages);
 
         $package = $container->getDefinition((string) $packages['images_path']);
         $this->assertPathPackage($container, $package, '/foo', 'SomeVersionScheme', '%%s?version=%%s');
@@ -621,8 +621,18 @@ public function testAssets()
 
         $package = $container->getDefinition($packages['remote_manifest']);
         $versionStrategy = $container->getDefinition($package->getArgument(1));
-        $this->assertSame('assets.remote_json_manifest_version_strategy', $versionStrategy->getParent());
+        $this->assertSame('assets.json_manifest_version_strategy', $versionStrategy->getParent());
         $this->assertSame('https://cdn.example.com/manifest.json', $versionStrategy->getArgument(0));
+
+        $package = $container->getDefinition($packages['var_manifest']);
+        $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));
+
+        $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));
     }
 
     public function testAssetsDefaultVersionStrategyAsService()

composer.json

@@ -34,7 +34,7 @@
     "require-dev": {
         "doctrine/annotations": "~1.7",
         "doctrine/cache": "~1.0",
-        "symfony/asset": "^5.1",
+        "symfony/asset": "^5.3",
         "symfony/browser-kit": "^4.4|^5.0",
         "symfony/console": "^5.2",
         "symfony/css-selector": "^4.4|^5.0",
@@ -71,7 +71,7 @@
         "phpdocumentor/reflection-docblock": "<3.0",
         "phpdocumentor/type-resolver": "<0.2.1",
         "phpunit/phpunit": "<5.4.3",
-        "symfony/asset": "<5.1",
+        "symfony/asset": "<5.3",
         "symfony/browser-kit": "<4.4",
         "symfony/console": "<5.2",
         "symfony/dotenv": "<5.1",