Make sure schema issues are always reported correctly, but not in ini…

…t when Composer is not required, fixes #9986
composer · Jun 27, 2021 · e87a150 · e87a150
1 parent 6f992a6
commit e87a150
Show file tree

Hide file tree

Showing 2 changed files with 11 additions and 4 deletions.
diff --git a/src/Composer/Console/Application.php b/src/Composer/Console/Application.php
@@ -420,9 +420,9 @@ public function getComposer($required = true, $disablePlugins = null)
                     exit(1);
                 }
             } catch (JsonValidationException $e) {
-                $errors = ' - ' . implode(PHP_EOL . ' - ', $e->getErrors());
-                $message = $e->getMessage() . ':' . PHP_EOL . $errors;
-                throw new JsonValidationException($message);
+                if ($required) {
+                    throw $e;
+                }
             }
         }
 

diff --git a/src/Composer/Factory.php b/src/Composer/Factory.php
@@ -37,6 +37,7 @@
 use Composer\Autoload\AutoloadGenerator;
 use Composer\Package\Version\VersionParser;
 use Composer\Downloader\TransportException;
+use Composer\Json\JsonValidationException;
 use Seld\JsonLint\JsonParser;
 
 /**
@@ -308,7 +309,13 @@ public function createComposer(IOInterface $io, $localConfig = null, $disablePlu
                 throw new \InvalidArgumentException($message.PHP_EOL.$instructions);
             }
 
-            $file->validateSchema(JsonFile::LAX_SCHEMA);
+            try {
+                $file->validateSchema(JsonFile::LAX_SCHEMA);
+            } catch (JsonValidationException $e) {
+                $errors = ' - ' . implode(PHP_EOL . ' - ', $e->getErrors());
+                $message = $e->getMessage() . ':' . PHP_EOL . $errors;
+                throw new JsonValidationException($message);
+            }
             $jsonParser = new JsonParser;
             try {
                 $jsonParser->parse(file_get_contents($localConfig), JsonParser::DETECT_KEY_CONFLICTS);