bug #39865 [Asset] Fix JsonManifest when there is no dependency on HttpClient (maxhelias)

fabpot · fabpot · commit 294195157c36 · 2021-01-18T15:48:21.000+01:00
This PR was merged into the 5.3-dev branch. Discussion ---------- [Asset] Fix JsonManifest when there is no dependency on HttpClient | Q | A | ------------- | --- | Branch? | 5.x | Bug fix? | yes | New feature? |no | Deprecations? |no | Tickets | - | License | MIT | Doc PR | - Recently on my project, I don't have any more dependency on HttpClient and the tests on the 5.x I have this error : <img width="678" alt="Capture d’écran 2021-01-17 à 14 26 16" src="https://user-images.githubusercontent.com/12966574/104844393-45a7d180-58d0-11eb-870b-ad4b7b78d092.png"> ~~I think this should also be the case for the RemoteJsonManifestVersionStrategy but I don't have a use case to try it.~~ It's related to #39484 Commits ------- e0e691a [Asset] Fix JsonManifest when there is no dependency on HttpClient
diff --git a/src/Symfony/Bundle/FrameworkBundle/Resources/config/assets.php b/src/Symfony/Bundle/FrameworkBundle/Resources/config/assets.php
@@ -77,7 +77,7 @@
             ->abstract()
             ->args([
                 abstract_arg('manifest path'),
-                service('http_client'),
+                service('http_client')->nullOnInvalid(),
             ])
 
         ->set('assets.remote_json_manifest_version_strategy', RemoteJsonManifestVersionStrategy::class)
diff --git a/src/Symfony/Component/Asset/Tests/VersionStrategy/JsonManifestVersionStrategyTest.php b/src/Symfony/Component/Asset/Tests/VersionStrategy/JsonManifestVersionStrategyTest.php
@@ -61,6 +61,14 @@ public function testManifestFileWithBadJSONThrowsException(JsonManifestVersionSt
         $strategy->getVersion('main.js');
     }
 
+    public function testRemoteManifestFileWithoutHttpClient()
+    {
+        $this->expectException(\LogicException::class);
+        $this->expectExceptionMessage(sprintf('The "%s" class needs an HTTP client to use a remote manifest. Try running "composer require symfony/http-client".', JsonManifestVersionStrategy::class));
+
+        new JsonManifestVersionStrategy('https://cdn.example.com/manifest.json');
+    }
+
     public function provideValidStrategies()
     {
         yield from $this->provideStrategies('manifest-valid.json');
diff --git a/src/Symfony/Component/Asset/VersionStrategy/JsonManifestVersionStrategy.php b/src/Symfony/Component/Asset/VersionStrategy/JsonManifestVersionStrategy.php
@@ -38,6 +38,10 @@ public function __construct(string $manifestPath, HttpClientInterface $httpClien
     {
         $this->manifestPath = $manifestPath;
         $this->httpClient = $httpClient;
+
+        if (null === $this->httpClient && 0 === strpos(parse_url($this->manifestPath, \PHP_URL_SCHEME), 'http')) {
+            throw new \LogicException(sprintf('The "%s" class needs an HTTP client to use a remote manifest. Try running "composer require symfony/http-client".', self::class));
+        }
     }
 
     /**

Original file line number	Diff line number	Diff line change
`@@ -61,6 +61,14 @@ public function testManifestFileWithBadJSONThrowsException(JsonManifestVersionSt`
`61`	`61`	`$strategy->getVersion('main.js');`
`62`	`62`	`}`
`63`	`63`
	`64`	`+ public function testRemoteManifestFileWithoutHttpClient()`
	`65`	`+ {`
	`66`	`+ $this->expectException(\LogicException::class);`
	`67`	`+ $this->expectExceptionMessage(sprintf('The "%s" class needs an HTTP client to use a remote manifest. Try running "composer require symfony/http-client".', JsonManifestVersionStrategy::class));`
	`68`	`+`
	`69`	`+ new JsonManifestVersionStrategy('https://cdn.example.com/manifest.json');`
	`70`	`+ }`
	`71`	`+`
`64`	`72`	`public function provideValidStrategies()`
`65`	`73`	`{`
`66`	`74`	`yield from $this->provideStrategies('manifest-valid.json');`
Original file line number	Diff line number	Diff line change
`@@ -38,6 +38,10 @@ public function __construct(string $manifestPath, HttpClientInterface $httpClien`
`38`	`38`	`{`
`39`	`39`	`$this->manifestPath = $manifestPath;`
`40`	`40`	`$this->httpClient = $httpClient;`
	`41`	`+`
	`42`	`+ if (null === $this->httpClient && 0 === strpos(parse_url($this->manifestPath, \PHP_URL_SCHEME), 'http')) {`
	`43`	`+ throw new \LogicException(sprintf('The "%s" class needs an HTTP client to use a remote manifest. Try running "composer require symfony/http-client".', self::class));`
	`44`	`+ }`
`41`	`45`	`}`
`42`	`46`
`43`	`47`	`/**`