public-mirrors
/
composer
mirror of https://github.com/composer/composer
1
0
Fork 0
Code

Update json schema

pull/2353/merge
Jordi Boggiano 2014-05-27 13:58:53 +02:00
parent 90d1b6e08a
commit af6ef235e1
2 changed files with 8 additions and 8 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

13
composer.lock generated
View File

@ -1,22 +1,23 @@
{ {
"_readme": [ "_readme": [
"This file locks the dependencies of your project to a known state", "This file locks the dependencies of your project to a known state",
"Read more about it at http://getcomposer.org/doc/01-basic-usage.md#composer-lock-the-lock-file" "Read more about it at http://getcomposer.org/doc/01-basic-usage.md#composer-lock-the-lock-file",
"This file is @generated automatically"
], ],
"hash": "e68bf60f228ca192b8b492cb95a80fa7", "hash": "e68bf60f228ca192b8b492cb95a80fa7",
"packages": [ "packages": [
{ {
"name": "justinrainbow/json-schema", "name": "justinrainbow/json-schema",
"version": "1.3.5", "version": "1.3.6",
"source": { "source": {
"type": "git", "type": "git",
"url": "https://github.com/justinrainbow/json-schema.git", "url": "https://github.com/justinrainbow/json-schema.git",
"reference": "01949f6d2130e9737ffae5d3952909a8de70d114" "reference": "d97cf3ce890fe80f247fc08594a1c8a1029fc7ed"
}, },
"dist": { "dist": {
"type": "zip", "type": "zip",
"url": "https://api.github.com/repos/justinrainbow/json-schema/zipball/01949f6d2130e9737ffae5d3952909a8de70d114", "url": "https://api.github.com/repos/justinrainbow/json-schema/zipball/d97cf3ce890fe80f247fc08594a1c8a1029fc7ed",
"reference": "01949f6d2130e9737ffae5d3952909a8de70d114", "reference": "d97cf3ce890fe80f247fc08594a1c8a1029fc7ed",
"shasum": "" "shasum": ""
}, },
"require": { "require": {
@ -71,7 +72,7 @@
"json", "json",
"schema" "schema"
], ],
"time": "2013-12-13 15:21:04" "time": "2014-03-05 15:03:52"
}, },
{ {
"name": "seld/jsonlint", "name": "seld/jsonlint",

3
src/Composer/Json/JsonFile.php
View File

@ -154,8 +154,7 @@ class JsonFile
$schemaData = json_decode(file_get_contents($schemaFile)); $schemaData = json_decode(file_get_contents($schemaFile));
if ($schema === self::LAX_SCHEMA) { if ($schema === self::LAX_SCHEMA) {
// TODO this should just be set to true, but this is a workaround for https://github.com/justinrainbow/json-schema/pull/94 $schemaData->additionalProperties = true;
$schemaData->additionalProperties = (object) array('type' => array('object', 'string', 'array', 'number', 'null', 'boolean'));
$schemaData->properties->name->required = false; $schemaData->properties->name->required = false;
$schemaData->properties->description->required = false; $schemaData->properties->description->required = false;
} }