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

Merge pull request #2723 from jmalloc/update-json-schema 

Updated json-schema version requirement to allow newer versions.
pull/2722/merge
Jordi Boggiano 2014-02-19 11:17:46 +01:00
parent 432ace33d4 9ac4ab1b85
commit a782802e62
2 changed files with 55 additions and 12 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
composer.json
View File

@ -23,7 +23,7 @@
},
"require": {
"php": ">=5.3.2",
"justinrainbow/json-schema": "1.1.*",
"justinrainbow/json-schema": "~1.1",
"seld/jsonlint": "1.*",
"symfony/console": "~2.3",
"symfony/finder": "~2.2",

65
composer.lock generated
View File

@ -3,32 +3,75 @@
"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"
],
"hash": "fde56d480e03eef9e8c575b80cf5a09b",
"hash": "78b771e9b9f3c0181350f1d6ed8fa3c7",
"packages": [
{
"name": "justinrainbow/json-schema",
"version": "1.1.0",
"version": "1.3.5",
"source": {
"type": "git",
"url": "git://github.com/justinrainbow/json-schema.git",
"reference": "v1.1.0"
"url": "https://github.com/justinrainbow/json-schema.git",
"reference": "01949f6d2130e9737ffae5d3952909a8de70d114"
},
"dist": {
"type": "zip",
"url": "https://github.com/justinrainbow/json-schema/zipball/v1.1.0",
"reference": "v1.1.0",
"url": "https://api.github.com/repos/justinrainbow/json-schema/zipball/01949f6d2130e9737ffae5d3952909a8de70d114",
"reference": "01949f6d2130e9737ffae5d3952909a8de70d114",
"shasum": ""
},
"require": {
"php": ">=5.3.0"
},
"require-dev": {
"json-schema/json-schema-test-suite": "1.1.0",
"phpdocumentor/phpdocumentor": "~2",
"phpunit/phpunit": "~3.7"
},
"bin": [
"bin/validate-json"
],
"type": "library",
"extra": {
"branch-alias": {
"dev-master": "1.4.x-dev"
}
},
"autoload": {
"psr-0": {
"JsonSchema": "src/"
}
},
"time": "2012-01-02 21:33:17"
"notification-url": "https://packagist.org/downloads/",
"license": [
"BSD-3-Clause"
],
"authors": [
{
"name": "Igor Wiedler",
"email": "igor@wiedler.ch",
"homepage": "http://wiedler.ch/igor/"
},
{
"name": "Bruno Prieto Reis",
"email": "bruno.p.reis@gmail.com"
},
{
"name": "Justin Rainbow",
"email": "justin.rainbow@gmail.com"
},
{
"name": "Robert Schönthal",
"email": "seroscho@googlemail.com",
"homepage": "http://digitalkaoz.net"
}
],
"description": "A library to validate a json schema.",
"homepage": "https://github.com/justinrainbow/json-schema",
"keywords": [
"json",
"schema"
],
"time": "2013-12-13 15:21:04"
},
{
"name": "seld/jsonlint",
@ -555,13 +598,13 @@
"version": "1.2.3",
"source": {
"type": "git",
"url": "git://github.com/sebastianbergmann/phpunit-mock-objects.git",
"reference": "1.2.3"
"url": "https://github.com/sebastianbergmann/phpunit-mock-objects.git",
"reference": "5794e3c5c5ba0fb037b11d8151add2a07fa82875"
},
"dist": {
"type": "zip",
"url": "https://github.com/sebastianbergmann/phpunit-mock-objects/archive/1.2.3.zip",
"reference": "1.2.3",
"url": "https://api.github.com/repos/sebastianbergmann/phpunit-mock-objects/zipball/5794e3c5c5ba0fb037b11d8151add2a07fa82875",
"reference": "5794e3c5c5ba0fb037b11d8151add2a07fa82875",
"shasum": ""
},
"require": {