From 0ba335730e54871b888770bc1fd1737ce7414cfa Mon Sep 17 00:00:00 2001 From: Shane Auckland Date: Mon, 25 Feb 2013 15:34:31 +0000 Subject: [PATCH 1/2] Specific schema validation failure messages (fixes issue #1616) --- src/Composer/Console/Application.php | 5 +++++ 1 file changed, 5 insertions(+) diff --git a/src/Composer/Console/Application.php b/src/Composer/Console/Application.php index 7dfaa4940..a62e95909 100755 --- a/src/Composer/Console/Application.php +++ b/src/Composer/Console/Application.php @@ -144,7 +144,12 @@ class Application extends BaseApplication $this->io->write($e->getMessage()); exit(1); } + } catch (JsonValidationException $e) { + $errors = ' - ' . implode(PHP_EOL . ' - ', $e->getErrors()); + $message = $e->getMessage() . ':' . PHP_EOL . $errors; + throw new JsonValidationException($message); } + } return $this->composer; From a7837272276548413e09774359f5b9f82aeb2772 Mon Sep 17 00:00:00 2001 From: Shane Auckland Date: Mon, 25 Feb 2013 15:55:37 +0000 Subject: [PATCH 2/2] adding use statement --- src/Composer/Console/Application.php | 1 + 1 file changed, 1 insertion(+) diff --git a/src/Composer/Console/Application.php b/src/Composer/Console/Application.php index a62e95909..e636a12f2 100755 --- a/src/Composer/Console/Application.php +++ b/src/Composer/Console/Application.php @@ -24,6 +24,7 @@ use Composer\Composer; use Composer\Factory; use Composer\IO\IOInterface; use Composer\IO\ConsoleIO; +use Composer\Json\JsonValidationException; use Composer\Util\ErrorHandler; /**