diff --git a/composer.json b/composer.json index 74df757f3..d1af27ec2 100644 --- a/composer.json +++ b/composer.json @@ -23,6 +23,7 @@ }, "require": { "php": ">=5.3.2", + "justinrainbow/json-schema": "~1.4", "composer/spdx-licenses": "~1.0", "seld/jsonlint": "~1.0", "symfony/console": "~2.5", diff --git a/composer.lock b/composer.lock index 154102042..b07d76621 100644 --- a/composer.lock +++ b/composer.lock @@ -4,7 +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": "694654491125336d91b339a8e117bb40", + "hash": "6d311df5df4ca3795787f58b29b03470", "packages": [ { "name": "composer/spdx-licenses", @@ -69,20 +69,20 @@ }, { "name": "justinrainbow/json-schema", - "version": "1.4.1", + "version": "1.4.4", "source": { "type": "git", "url": "https://github.com/justinrainbow/json-schema.git", - "reference": "2465fe486c864e30badaa4d005ebdf89dbc503f3" + "reference": "8dc9b9d85ab639ca60ab4608b34c1279d6ae7bce" }, "dist": { "type": "zip", - "url": "https://api.github.com/repos/justinrainbow/json-schema/zipball/2465fe486c864e30badaa4d005ebdf89dbc503f3", - "reference": "2465fe486c864e30badaa4d005ebdf89dbc503f3", + "url": "https://api.github.com/repos/justinrainbow/json-schema/zipball/8dc9b9d85ab639ca60ab4608b34c1279d6ae7bce", + "reference": "8dc9b9d85ab639ca60ab4608b34c1279d6ae7bce", "shasum": "" }, "require": { - "php": ">=5.3.0" + "php": ">=5.3.2" }, "require-dev": { "json-schema/json-schema-test-suite": "1.1.0", @@ -131,7 +131,7 @@ "json", "schema" ], - "time": "2015-03-27 16:41:39" + "time": "2015-07-14 16:29:50" }, { "name": "seld/cli-prompt", diff --git a/src/Composer/Compiler.php b/src/Composer/Compiler.php index 749adf659..40e767873 100644 --- a/src/Composer/Compiler.php +++ b/src/Composer/Compiler.php @@ -95,7 +95,8 @@ class Compiler $finder = new Finder(); $finder->files() ->name('*.json') - ->in(__DIR__ . '/../../res') + ->in(__DIR__.'/../../res') + ->in(__DIR__.'/../../vendor/composer/spdx-licenses/res/') ->sort($finderSort) ; @@ -116,6 +117,7 @@ class Compiler ->in(__DIR__.'/../../vendor/seld/jsonlint/') ->in(__DIR__.'/../../vendor/seld/cli-prompt/') ->in(__DIR__.'/../../vendor/justinrainbow/json-schema/') + ->in(__DIR__.'/../../vendor/composer/spdx-licenses/') ->sort($finderSort) ;