Add runtime exception for invalid JSON downloaded

GromNaN · GromNaN · commit c929d43e403f · 2020-02-21T17:55:07.000+01:00
diff --git a/src/Symfony/Component/Asset/Exception/RuntimeException.php b/src/Symfony/Component/Asset/Exception/RuntimeException.php
@@ -0,0 +1,21 @@
+<?php
+
+/*
+ * This file is part of the Symfony package.
+ *
+ * (c) Fabien Potencier <fabien@symfony.com>
+ *
+ * For the full copyright and license information, please view the LICENSE
+ * file that was distributed with this source code.
+ */
+
+namespace Symfony\Component\Asset\Exception;
+
+/**
+ * Base RuntimeException for the Asset component.
+ *
+ * @author Fabien Potencier <fabien@symfony.com>
+ */
+class RuntimeException extends \RuntimeException implements ExceptionInterface
+{
+}
diff --git a/src/Symfony/Component/Asset/Tests/VersionStrategy/RemoteJsonManifestVersionStrategyTest.php b/src/Symfony/Component/Asset/Tests/VersionStrategy/RemoteJsonManifestVersionStrategyTest.php
@@ -42,15 +42,15 @@ public function testApplyVersionWhenKeyDoesNotExistInManifest()
     public function testMissingManifestFileThrowsException()
     {
         $this->expectException('RuntimeException');
-        $this->expectExceptionMessage('Error loading asset manifest from URL "https://cdn.example.com/non-existent-file.json"');
+        $this->expectExceptionMessage('HTTP 404 returned for "https://cdn.example.com/non-existent-file.json"');
         $strategy = $this->createStrategy('https://cdn.example.com/non-existent-file.json');
         $strategy->getVersion('main.js');
     }
 
     public function testManifestFileWithBadJSONThrowsException()
     {
         $this->expectException('RuntimeException');
-        $this->expectExceptionMessage('Error loading asset manifest from URL "https://cdn.example.com/manifest-invalid.json"');
+        $this->expectExceptionMessage('Invalid JSON downloaded from "https://cdn.example.com/manifest-invalid.json"');
         $strategy = $this->createStrategy('https://cdn.example.com/manifest-invalid.json');
         $strategy->getVersion('main.js');
     }
diff --git a/src/Symfony/Component/Asset/VersionStrategy/RemoteJsonManifestVersionStrategy.php b/src/Symfony/Component/Asset/VersionStrategy/RemoteJsonManifestVersionStrategy.php
@@ -11,6 +11,8 @@
 
 namespace Symfony\Component\Asset\VersionStrategy;
 
+use Symfony\Component\Asset\Exception\RuntimeException;
+use Symfony\Contracts\HttpClient\Exception\DecodingExceptionInterface;
 use Symfony\Contracts\HttpClient\HttpClientInterface;
 
 /**
@@ -57,10 +59,14 @@ public function applyVersion(string $path)
     private function getManifestPath(string $path): ?string
     {
         if (null === $this->manifestData) {
-            $this->manifestData = $this->httpClient->request('GET', $this->manifestUrl, [
-                'headers' => ['accept' => 'application/json'],
-                'buffer' => true,
-            ])->toArray();
+            try {
+                $this->manifestData = $this->httpClient->request('GET', $this->manifestUrl, [
+                    'headers' => ['accept' => 'application/json'],
+                    'buffer' => true,
+                ])->toArray();
+            } catch (DecodingExceptionInterface $e) {
+                throw new RuntimeException(sprintf('Invalid JSON downloaded from "%s"', $this->manifestUrl), 0, $e);
+            }
         }
 
         return $this->manifestData[$path] ?? null;

Original file line number	Diff line number	Diff line change
`@@ -42,15 +42,15 @@ public function testApplyVersionWhenKeyDoesNotExistInManifest()`
`42`	`42`	`public function testMissingManifestFileThrowsException()`
`43`	`43`	`{`
`44`	`44`	`$this->expectException('RuntimeException');`
`45`		`- $this->expectExceptionMessage('Error loading asset manifest from URL "https://cdn.example.com/non-existent-file.json"');`
	`45`	`+ $this->expectExceptionMessage('HTTP 404 returned for "https://cdn.example.com/non-existent-file.json"');`
`46`	`46`	`$strategy = $this->createStrategy('https://cdn.example.com/non-existent-file.json');`
`47`	`47`	`$strategy->getVersion('main.js');`
`48`	`48`	`}`
`49`	`49`
`50`	`50`	`public function testManifestFileWithBadJSONThrowsException()`
`51`	`51`	`{`
`52`	`52`	`$this->expectException('RuntimeException');`
`53`		`- $this->expectExceptionMessage('Error loading asset manifest from URL "https://cdn.example.com/manifest-invalid.json"');`
	`53`	`+ $this->expectExceptionMessage('Invalid JSON downloaded from "https://cdn.example.com/manifest-invalid.json"');`
`54`	`54`	`$strategy = $this->createStrategy('https://cdn.example.com/manifest-invalid.json');`
`55`	`55`	`$strategy->getVersion('main.js');`
`56`	`56`	`}`