Use JsonFile::encode instead of casting to string to make sure we do not hide json errors

Seldaek · Seldaek · commit 1287062a84a8 · 2025-10-28T10:04:38.000+01:00
diff --git a/composer.json b/composer.json
@@ -23,6 +23,7 @@
     ],
     "require": {
         "php": "^7.2.5 || ^8.0",
+        "ext-json": "*",
         "composer/ca-bundle": "^1.5",
         "composer/class-map-generator": "^1.4.0",
         "composer/metadata-minifier": "^1.0",
diff --git a/composer.lock b/composer.lock
diff --git a/src/Composer/Json/JsonFile.php b/src/Composer/Json/JsonFile.php
@@ -276,7 +276,7 @@ public static function validateJsonSchema(string $source, $data, int $schema, ?s
      * @param  string $indent  Indentation string
      * @return string Encoded json
      */
-    public static function encode($data, int $options = 448, string $indent = self::INDENT_DEFAULT): string
+    public static function encode($data, int $options = \JSON_UNESCAPED_SLASHES|\JSON_PRETTY_PRINT|\JSON_UNESCAPED_UNICODE, string $indent = self::INDENT_DEFAULT): string
     {
         $json = json_encode($data, $options);
 
diff --git a/src/Composer/Repository/Vcs/ForgejoDriver.php b/src/Composer/Repository/Vcs/ForgejoDriver.php
@@ -162,7 +162,7 @@ public function getComposerInformation(string $identifier): ?array
                 $composer = $this->getBaseComposerInformation($identifier);
 
                 if ($this->shouldCache($identifier)) {
-                    $this->cache->write($identifier, (string) json_encode($composer));
+                    $this->cache->write($identifier, JsonFile::encode($composer, \JSON_UNESCAPED_UNICODE|\JSON_UNESCAPED_SLASHES));
                 }
             }
 
diff --git a/src/Composer/Repository/Vcs/GitBitbucketDriver.php b/src/Composer/Repository/Vcs/GitBitbucketDriver.php
@@ -147,7 +147,7 @@ public function getComposerInformation(string $identifier): ?array
                 $composer = $this->getBaseComposerInformation($identifier);
 
                 if ($this->shouldCache($identifier)) {
-                    $this->cache->write($identifier, (string) json_encode($composer));
+                    $this->cache->write($identifier, JsonFile::encode($composer, \JSON_UNESCAPED_UNICODE|\JSON_UNESCAPED_SLASHES));
                 }
             }
 
diff --git a/src/Composer/Repository/Vcs/GitHubDriver.php b/src/Composer/Repository/Vcs/GitHubDriver.php
@@ -166,7 +166,7 @@ public function getComposerInformation(string $identifier): ?array
                 $composer = $this->getBaseComposerInformation($identifier);
 
                 if ($this->shouldCache($identifier)) {
-                    $this->cache->write($identifier, (string) json_encode($composer));
+                    $this->cache->write($identifier, JsonFile::encode($composer, \JSON_UNESCAPED_UNICODE|\JSON_UNESCAPED_SLASHES));
                 }
             }
 
diff --git a/src/Composer/Repository/Vcs/GitLabDriver.php b/src/Composer/Repository/Vcs/GitLabDriver.php
@@ -159,7 +159,7 @@ public function getComposerInformation(string $identifier): ?array
                 $composer = $this->getBaseComposerInformation($identifier);
 
                 if ($this->shouldCache($identifier)) {
-                    $this->cache->write($identifier, (string) json_encode($composer));
+                    $this->cache->write($identifier, JsonFile::encode($composer, \JSON_UNESCAPED_UNICODE|\JSON_UNESCAPED_SLASHES));
                 }
             }
 
diff --git a/src/Composer/Repository/Vcs/SvnDriver.php b/src/Composer/Repository/Vcs/SvnDriver.php
@@ -141,7 +141,7 @@ public function getComposerInformation(string $identifier): ?array
                 // and fix outdated invalid cache files
                 if ($res === '""') {
                     $res = 'null';
-                    $this->cache->write($identifier.'.json', (string) json_encode(null));
+                    $this->cache->write($identifier.'.json', $res);
                 }
 
                 return $this->infoCache[$identifier] = JsonFile::parseJson($res);
@@ -159,7 +159,7 @@ public function getComposerInformation(string $identifier): ?array
             }
 
             if ($this->shouldCache($identifier)) {
-                $this->cache->write($identifier.'.json', (string) json_encode($composer));
+                $this->cache->write($identifier.'.json', JsonFile::encode($composer, \JSON_UNESCAPED_UNICODE|\JSON_UNESCAPED_SLASHES));
             }
 
             $this->infoCache[$identifier] = $composer;
diff --git a/src/Composer/Repository/Vcs/VcsDriver.php b/src/Composer/Repository/Vcs/VcsDriver.php
@@ -95,7 +95,7 @@ public function getComposerInformation(string $identifier): ?array
             $composer = $this->getBaseComposerInformation($identifier);
 
             if ($this->shouldCache($identifier)) {
-                $this->cache->write($identifier, JsonFile::encode($composer, 0));
+                $this->cache->write($identifier, JsonFile::encode($composer, \JSON_UNESCAPED_UNICODE|\JSON_UNESCAPED_SLASHES));
             }
 
             $this->infoCache[$identifier] = $composer;

Original file line number	Diff line number	Diff line change
`@@ -276,7 +276,7 @@ public static function validateJsonSchema(string $source, $data, int $schema, ?s`
`276`	`276`	`* @param string $indent Indentation string`
`277`	`277`	`* @return string Encoded json`
`278`	`278`	`*/`
`279`		`- public static function encode($data, int $options = 448, string $indent = self::INDENT_DEFAULT): string`
	`279`	`+ public static function encode($data, int $options = \JSON_UNESCAPED_SLASHES\|\JSON_PRETTY_PRINT\|\JSON_UNESCAPED_UNICODE, string $indent = self::INDENT_DEFAULT): string`
`280`	`280`	`{`
`281`	`281`	`$json = json_encode($data, $options);`
`282`	`282`
Original file line number	Diff line number	Diff line change
`@@ -162,7 +162,7 @@ public function getComposerInformation(string $identifier): ?array`
`162`	`162`	`$composer = $this->getBaseComposerInformation($identifier);`
`163`	`163`
`164`	`164`	`if ($this->shouldCache($identifier)) {`
`165`		`- $this->cache->write($identifier, (string) json_encode($composer));`
	`165`	`+ $this->cache->write($identifier, JsonFile::encode($composer, \JSON_UNESCAPED_UNICODE\|\JSON_UNESCAPED_SLASHES));`
`166`	`166`	`}`
`167`	`167`	`}`
`168`	`168`
Original file line number	Diff line number	Diff line change
`@@ -147,7 +147,7 @@ public function getComposerInformation(string $identifier): ?array`
`147`	`147`	`$composer = $this->getBaseComposerInformation($identifier);`
`148`	`148`
`149`	`149`	`if ($this->shouldCache($identifier)) {`
`150`		`- $this->cache->write($identifier, (string) json_encode($composer));`
	`150`	`+ $this->cache->write($identifier, JsonFile::encode($composer, \JSON_UNESCAPED_UNICODE\|\JSON_UNESCAPED_SLASHES));`
`151`	`151`	`}`
`152`	`152`	`}`
`153`	`153`
Original file line number	Diff line number	Diff line change
`@@ -166,7 +166,7 @@ public function getComposerInformation(string $identifier): ?array`
`166`	`166`	`$composer = $this->getBaseComposerInformation($identifier);`
`167`	`167`
`168`	`168`	`if ($this->shouldCache($identifier)) {`
`169`		`- $this->cache->write($identifier, (string) json_encode($composer));`
	`169`	`+ $this->cache->write($identifier, JsonFile::encode($composer, \JSON_UNESCAPED_UNICODE\|\JSON_UNESCAPED_SLASHES));`
`170`	`170`	`}`
`171`	`171`	`}`
`172`	`172`
Original file line number	Diff line number	Diff line change
`@@ -159,7 +159,7 @@ public function getComposerInformation(string $identifier): ?array`
`159`	`159`	`$composer = $this->getBaseComposerInformation($identifier);`
`160`	`160`
`161`	`161`	`if ($this->shouldCache($identifier)) {`
`162`		`- $this->cache->write($identifier, (string) json_encode($composer));`
	`162`	`+ $this->cache->write($identifier, JsonFile::encode($composer, \JSON_UNESCAPED_UNICODE\|\JSON_UNESCAPED_SLASHES));`
`163`	`163`	`}`
`164`	`164`	`}`
`165`	`165`
Original file line number	Diff line number	Diff line change
`@@ -141,7 +141,7 @@ public function getComposerInformation(string $identifier): ?array`
`141`	`141`	`// and fix outdated invalid cache files`
`142`	`142`	`if ($res === '""') {`
`143`	`143`	`$res = 'null';`
`144`		`- $this->cache->write($identifier.'.json', (string) json_encode(null));`
	`144`	`+ $this->cache->write($identifier.'.json', $res);`
`145`	`145`	`}`
`146`	`146`
`147`	`147`	`return $this->infoCache[$identifier] = JsonFile::parseJson($res);`
`@@ -159,7 +159,7 @@ public function getComposerInformation(string $identifier): ?array`
`159`	`159`	`}`
`160`	`160`
`161`	`161`	`if ($this->shouldCache($identifier)) {`
`162`		`- $this->cache->write($identifier.'.json', (string) json_encode($composer));`
	`162`	`+ $this->cache->write($identifier.'.json', JsonFile::encode($composer, \JSON_UNESCAPED_UNICODE\|\JSON_UNESCAPED_SLASHES));`
`163`	`163`	`}`
`164`	`164`
`165`	`165`	`$this->infoCache[$identifier] = $composer;`
Original file line number	Diff line number	Diff line change
`@@ -95,7 +95,7 @@ public function getComposerInformation(string $identifier): ?array`
`95`	`95`	`$composer = $this->getBaseComposerInformation($identifier);`
`96`	`96`
`97`	`97`	`if ($this->shouldCache($identifier)) {`
`98`		`- $this->cache->write($identifier, JsonFile::encode($composer, 0));`
	`98`	`+ $this->cache->write($identifier, JsonFile::encode($composer, \JSON_UNESCAPED_UNICODE\|\JSON_UNESCAPED_SLASHES));`
`99`	`99`	`}`
`100`	`100`
`101`	`101`	`$this->infoCache[$identifier] = $composer;`