Upgrade json-schema to allow v3 and upgrade other deps
Jordi Boggiano
parent
14c77130e8
commit
20ee689bb4
|
|
@ -23,7 +23,7 @@
|
|||
},
|
||||
"require": {
|
||||
"php": "^5.3.2 || ^7.0",
|
||||
"justinrainbow/json-schema": "^1.6 || ^2.0",
|
||||
"justinrainbow/json-schema": "^1.6 || ^2.0 || ^3.0",
|
||||
"composer/ca-bundle": "^1.0",
|
||||
"composer/semver": "^1.0",
|
||||
"composer/spdx-licenses": "^1.0",
|
||||
|
|
|
|||
|
|
@ -4,8 +4,7 @@
|
|||
"Read more about it at https://getcomposer.org/doc/01-basic-usage.md#composer-lock-the-lock-file",
|
||||
"This file is @generated automatically"
|
||||
],
|
||||
"hash": "a0636a2549c942a28acadbd3825795b9",
|
||||
"content-hash": "7baeb5af8045a4a098de80decfffdcc2",
|
||||
"content-hash": "91ea799425e3f97a7ba5c7ac5e0e72e5",
|
||||
"packages": [
|
||||
{
|
||||
"name": "composer/ca-bundle",
|
||||
|
|
@ -190,16 +189,16 @@
|
|||
},
|
||||
{
|
||||
"name": "justinrainbow/json-schema",
|
||||
"version": "2.0.5",
|
||||
"version": "3.0.1",
|
||||
"source": {
|
||||
"type": "git",
|
||||
"url": "https://github.com/justinrainbow/json-schema.git",
|
||||
"reference": "6b2a33e6a768f96bdc2ead5600af0822eed17d67"
|
||||
"reference": "2128f9de8be4600c3394d94c3918faf67157b76b"
|
||||
},
|
||||
"dist": {
|
||||
"type": "zip",
|
||||
"url": "https://api.github.com/repos/justinrainbow/json-schema/zipball/6b2a33e6a768f96bdc2ead5600af0822eed17d67",
|
||||
"reference": "6b2a33e6a768f96bdc2ead5600af0822eed17d67",
|
||||
"url": "https://api.github.com/repos/justinrainbow/json-schema/zipball/2128f9de8be4600c3394d94c3918faf67157b76b",
|
||||
"reference": "2128f9de8be4600c3394d94c3918faf67157b76b",
|
||||
"shasum": ""
|
||||
},
|
||||
"require": {
|
||||
|
|
@ -216,7 +215,7 @@
|
|||
"type": "library",
|
||||
"extra": {
|
||||
"branch-alias": {
|
||||
"dev-master": "2.0.x-dev"
|
||||
"dev-master": "3.0.x-dev"
|
||||
}
|
||||
},
|
||||
"autoload": {
|
||||
|
|
@ -252,7 +251,7 @@
|
|||
"json",
|
||||
"schema"
|
||||
],
|
||||
"time": "2016-06-02 10:59:52"
|
||||
"time": "2016-08-26 12:45:49"
|
||||
},
|
||||
{
|
||||
"name": "psr/log",
|
||||
|
|
@ -342,16 +341,16 @@
|
|||
},
|
||||
{
|
||||
"name": "seld/jsonlint",
|
||||
"version": "1.4.0",
|
||||
"version": "1.4.1",
|
||||
"source": {
|
||||
"type": "git",
|
||||
"url": "https://github.com/Seldaek/jsonlint.git",
|
||||
"reference": "66834d3e3566bb5798db7294619388786ae99394"
|
||||
"reference": "e827b5254d3e58c736ea2c5616710983d80b0b70"
|
||||
},
|
||||
"dist": {
|
||||
"type": "zip",
|
||||
"url": "https://api.github.com/repos/Seldaek/jsonlint/zipball/66834d3e3566bb5798db7294619388786ae99394",
|
||||
"reference": "66834d3e3566bb5798db7294619388786ae99394",
|
||||
"url": "https://api.github.com/repos/Seldaek/jsonlint/zipball/e827b5254d3e58c736ea2c5616710983d80b0b70",
|
||||
"reference": "e827b5254d3e58c736ea2c5616710983d80b0b70",
|
||||
"shasum": ""
|
||||
},
|
||||
"require": {
|
||||
|
|
@ -384,7 +383,7 @@
|
|||
"parser",
|
||||
"validator"
|
||||
],
|
||||
"time": "2015-11-21 02:21:41"
|
||||
"time": "2016-09-14 15:17:56"
|
||||
},
|
||||
{
|
||||
"name": "seld/phar-utils",
|
||||
|
|
@ -432,16 +431,16 @@
|
|||
},
|
||||
{
|
||||
"name": "symfony/console",
|
||||
"version": "v2.8.10",
|
||||
"version": "v2.8.11",
|
||||
"source": {
|
||||
"type": "git",
|
||||
"url": "https://github.com/symfony/console.git",
|
||||
"reference": "bac1eb5869c1848a173852aee61df960e3a49197"
|
||||
"reference": "3d3e4fa5f0614c8e45220e5de80332322e33bd90"
|
||||
},
|
||||
"dist": {
|
||||
"type": "zip",
|
||||
"url": "https://api.github.com/repos/symfony/console/zipball/bac1eb5869c1848a173852aee61df960e3a49197",
|
||||
"reference": "bac1eb5869c1848a173852aee61df960e3a49197",
|
||||
"url": "https://api.github.com/repos/symfony/console/zipball/3d3e4fa5f0614c8e45220e5de80332322e33bd90",
|
||||
"reference": "3d3e4fa5f0614c8e45220e5de80332322e33bd90",
|
||||
"shasum": ""
|
||||
},
|
||||
"require": {
|
||||
|
|
@ -488,20 +487,20 @@
|
|||
],
|
||||
"description": "Symfony Console Component",
|
||||
"homepage": "https://symfony.com",
|
||||
"time": "2016-08-19 06:48:01"
|
||||
"time": "2016-09-06 10:55:00"
|
||||
},
|
||||
{
|
||||
"name": "symfony/filesystem",
|
||||
"version": "v2.8.10",
|
||||
"version": "v2.8.11",
|
||||
"source": {
|
||||
"type": "git",
|
||||
"url": "https://github.com/symfony/filesystem.git",
|
||||
"reference": "ab4c3f085c8f5a56536845bf985c4cef30bf75fd"
|
||||
"reference": "44b499521defddf2eae17a18c811bbdae4f98bdf"
|
||||
},
|
||||
"dist": {
|
||||
"type": "zip",
|
||||
"url": "https://api.github.com/repos/symfony/filesystem/zipball/ab4c3f085c8f5a56536845bf985c4cef30bf75fd",
|
||||
"reference": "ab4c3f085c8f5a56536845bf985c4cef30bf75fd",
|
||||
"url": "https://api.github.com/repos/symfony/filesystem/zipball/44b499521defddf2eae17a18c811bbdae4f98bdf",
|
||||
"reference": "44b499521defddf2eae17a18c811bbdae4f98bdf",
|
||||
"shasum": ""
|
||||
},
|
||||
"require": {
|
||||
|
|
@ -537,11 +536,11 @@
|
|||
],
|
||||
"description": "Symfony Filesystem Component",
|
||||
"homepage": "https://symfony.com",
|
||||
"time": "2016-07-20 05:41:28"
|
||||
"time": "2016-09-06 10:55:00"
|
||||
},
|
||||
{
|
||||
"name": "symfony/finder",
|
||||
"version": "v2.8.10",
|
||||
"version": "v2.8.11",
|
||||
"source": {
|
||||
"type": "git",
|
||||
"url": "https://github.com/symfony/finder.git",
|
||||
|
|
@ -649,16 +648,16 @@
|
|||
},
|
||||
{
|
||||
"name": "symfony/process",
|
||||
"version": "v2.8.10",
|
||||
"version": "v2.8.11",
|
||||
"source": {
|
||||
"type": "git",
|
||||
"url": "https://github.com/symfony/process.git",
|
||||
"reference": "162d37eb3396225f31574b69a453118e5bc313d2"
|
||||
"reference": "05a03ed27073638658cab9405d99a67dd1014987"
|
||||
},
|
||||
"dist": {
|
||||
"type": "zip",
|
||||
"url": "https://api.github.com/repos/symfony/process/zipball/162d37eb3396225f31574b69a453118e5bc313d2",
|
||||
"reference": "162d37eb3396225f31574b69a453118e5bc313d2",
|
||||
"url": "https://api.github.com/repos/symfony/process/zipball/05a03ed27073638658cab9405d99a67dd1014987",
|
||||
"reference": "05a03ed27073638658cab9405d99a67dd1014987",
|
||||
"shasum": ""
|
||||
},
|
||||
"require": {
|
||||
|
|
@ -694,7 +693,7 @@
|
|||
],
|
||||
"description": "Symfony Process Component",
|
||||
"homepage": "https://symfony.com",
|
||||
"time": "2016-08-16 14:56:08"
|
||||
"time": "2016-09-06 10:55:00"
|
||||
}
|
||||
],
|
||||
"packages-dev": [
|
||||
|
|
@ -1608,7 +1607,7 @@
|
|||
},
|
||||
{
|
||||
"name": "symfony/yaml",
|
||||
"version": "v2.8.10",
|
||||
"version": "v2.8.11",
|
||||
"source": {
|
||||
"type": "git",
|
||||
"url": "https://github.com/symfony/yaml.git",
|
||||
|
|
|
|||
|
|
@ -92,7 +92,14 @@ class ComposerSchemaTest extends \PHPUnit_Framework_TestCase
|
|||
$validator->check(json_decode($json), $schema);
|
||||
|
||||
if (!$validator->isValid()) {
|
||||
return $validator->getErrors();
|
||||
$errors = $validator->getErrors();
|
||||
|
||||
// remove justinrainbow/json-schema 3.0 props so it works with all versions
|
||||
foreach ($errors as &$err) {
|
||||
unset($err['pointer']);
|
||||
}
|
||||
|
||||
return $errors;
|
||||
}
|
||||
|
||||
return true;
|
||||
|
|
|
|||
Loading…
Reference in New Issue