From e172cd81a146666d844d2b7b37b5feccb89e2b61 Mon Sep 17 00:00:00 2001 From: Jordi Boggiano Date: Fri, 2 Jan 2015 07:52:56 +0000 Subject: [PATCH] Fix lax validation of packages when loading them, fixes #3606, fixes #3605 --- src/Composer/Json/JsonFile.php | 3 +-- src/Composer/Json/JsonValidationException.php | 4 ++-- 2 files changed, 3 insertions(+), 4 deletions(-) diff --git a/src/Composer/Json/JsonFile.php b/src/Composer/Json/JsonFile.php index ceaffaa25..3375329c7 100644 --- a/src/Composer/Json/JsonFile.php +++ b/src/Composer/Json/JsonFile.php @@ -154,8 +154,7 @@ class JsonFile if ($schema === self::LAX_SCHEMA) { $schemaData->additionalProperties = true; - $schemaData->properties->name->required = false; - $schemaData->properties->description->required = false; + $schemaData->required = array(); } $validator = new Validator(); diff --git a/src/Composer/Json/JsonValidationException.php b/src/Composer/Json/JsonValidationException.php index 0b2b2ba70..5d21f533c 100644 --- a/src/Composer/Json/JsonValidationException.php +++ b/src/Composer/Json/JsonValidationException.php @@ -21,10 +21,10 @@ class JsonValidationException extends Exception { protected $errors; - public function __construct($message, $errors = array()) + public function __construct($message, $errors = array(), \Exception $previous = null) { $this->errors = $errors; - parent::__construct($message); + parent::__construct($message, 0, $previous); } public function getErrors()