Merge pull request #3432 from stof/patch-1

Fixed the json formatting when using JSONC
10 years ago · 533eeddcb7
parent 494f5698c4 b0f13e0ab6
commit 533eeddcb7
1 changed files with 1 additions and 1 deletions
--- a/src/Composer/Json/JsonFile.php
+++ b/src/Composer/Json/JsonFile.php
@ -187,7 +187,7 @@ class JsonFile
            $json = json_encode($data, $options);

            //  compact brackets to follow recent php versions
-            if (PHP_VERSION_ID < 50428 || (PHP_VERSION_ID >= 50500 && PHP_VERSION_ID < 50512)) {
+            if (PHP_VERSION_ID < 50428 || (PHP_VERSION_ID >= 50500 && PHP_VERSION_ID < 50512) || (defined('JSON_C_VERSION') && version_compare(phpversion('json'), '1.3.6', '<'))) {
                $json = preg_replace('/\[\s+\]/', '[]', $json);
                $json = preg_replace('/\{\s+\}/', '{}', $json);
            }