From 86cf9e80336c8a6d6bd25c4f2cf53e6d6dd95adc Mon Sep 17 00:00:00 2001 From: Matthew Grasmick Date: Thu, 13 Jul 2017 10:22:11 -0400 Subject: [PATCH] Upgrading wikimedia/composer-merge-plugin to 1.4.1. --- composer.json | 2 +- composer.lock | 126 +++++++++++++++++++++++++------------------------- 2 files changed, 65 insertions(+), 63 deletions(-) diff --git a/composer.json b/composer.json index f57ef1b85..1401ea6ee 100644 --- a/composer.json +++ b/composer.json @@ -30,7 +30,7 @@ "squizlabs/php_codesniffer": "^2.7", "symfony/yaml": "^2.8.11", "symfony/console": "^2.8.11", - "wikimedia/composer-merge-plugin": "dev-master", + "wikimedia/composer-merge-plugin": "^1.4.1", "consolidation/robo": "^1.1.0", "tivie/php-os-detector": "^1.0", "consolidation/robo": "^1.1.0", diff --git a/composer.lock b/composer.lock index 2a162835f..54435937a 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" ], - "content-hash": "75ef0cdf73e446a60c938206474c4a26", + "content-hash": "7bf6e0d94d92fb883ba5e24bc076619e", "packages": [ { "name": "asm89/twig-lint", @@ -370,16 +370,16 @@ }, { "name": "consolidation/robo", - "version": "1.1.0", + "version": "1.1.1", "source": { "type": "git", "url": "https://github.com/consolidation/Robo.git", - "reference": "36fe43c6be39dd2299d9a3e551f45c5ac15013ec" + "reference": "b83f558a6d7efa8d4d1d3faaff90d6448a6d2716" }, "dist": { "type": "zip", - "url": "https://api.github.com/repos/consolidation/Robo/zipball/36fe43c6be39dd2299d9a3e551f45c5ac15013ec", - "reference": "36fe43c6be39dd2299d9a3e551f45c5ac15013ec", + "url": "https://api.github.com/repos/consolidation/Robo/zipball/b83f558a6d7efa8d4d1d3faaff90d6448a6d2716", + "reference": "b83f558a6d7efa8d4d1d3faaff90d6448a6d2716", "shasum": "" }, "require": { @@ -445,7 +445,7 @@ } ], "description": "Modern task runner", - "time": "2017-06-29T15:42:54+00:00" + "time": "2017-07-07T19:48:25+00:00" }, { "name": "container-interop/container-interop", @@ -1461,16 +1461,16 @@ }, { "name": "nikic/php-parser", - "version": "v3.0.5", + "version": "v3.0.6", "source": { "type": "git", "url": "https://github.com/nikic/PHP-Parser.git", - "reference": "2b9e2f71b722f7c53918ab0c25f7646c2013f17d" + "reference": "0808939f81c1347a3c8a82a5925385a08074b0f1" }, "dist": { "type": "zip", - "url": "https://api.github.com/repos/nikic/PHP-Parser/zipball/2b9e2f71b722f7c53918ab0c25f7646c2013f17d", - "reference": "2b9e2f71b722f7c53918ab0c25f7646c2013f17d", + "url": "https://api.github.com/repos/nikic/PHP-Parser/zipball/0808939f81c1347a3c8a82a5925385a08074b0f1", + "reference": "0808939f81c1347a3c8a82a5925385a08074b0f1", "shasum": "" }, "require": { @@ -1508,7 +1508,7 @@ "parser", "php" ], - "time": "2017-03-05T18:23:57+00:00" + "time": "2017-06-28T20:53:48+00:00" }, { "name": "oomphinc/composer-installers-extender", @@ -1969,16 +1969,16 @@ }, { "name": "phpunit/phpunit", - "version": "4.8.35", + "version": "4.8.36", "source": { "type": "git", "url": "https://github.com/sebastianbergmann/phpunit.git", - "reference": "791b1a67c25af50e230f841ee7a9c6eba507dc87" + "reference": "46023de9a91eec7dfb06cc56cb4e260017298517" }, "dist": { "type": "zip", - "url": "https://api.github.com/repos/sebastianbergmann/phpunit/zipball/791b1a67c25af50e230f841ee7a9c6eba507dc87", - "reference": "791b1a67c25af50e230f841ee7a9c6eba507dc87", + "url": "https://api.github.com/repos/sebastianbergmann/phpunit/zipball/46023de9a91eec7dfb06cc56cb4e260017298517", + "reference": "46023de9a91eec7dfb06cc56cb4e260017298517", "shasum": "" }, "require": { @@ -2037,7 +2037,7 @@ "testing", "xunit" ], - "time": "2017-02-06T05:18:07+00:00" + "time": "2017-06-21T08:07:12+00:00" }, { "name": "phpunit/phpunit-mock-objects", @@ -2193,16 +2193,16 @@ }, { "name": "psy/psysh", - "version": "v0.8.7", + "version": "v0.8.9", "source": { "type": "git", "url": "https://github.com/bobthecow/psysh.git", - "reference": "be969b9dc89dcaefdb9a3117fa91fa38bca19f50" + "reference": "58a31cc4404c8f632d8c557bc72056af2d3a83db" }, "dist": { "type": "zip", - "url": "https://api.github.com/repos/bobthecow/psysh/zipball/be969b9dc89dcaefdb9a3117fa91fa38bca19f50", - "reference": "be969b9dc89dcaefdb9a3117fa91fa38bca19f50", + "url": "https://api.github.com/repos/bobthecow/psysh/zipball/58a31cc4404c8f632d8c557bc72056af2d3a83db", + "reference": "58a31cc4404c8f632d8c557bc72056af2d3a83db", "shasum": "" }, "require": { @@ -2262,7 +2262,7 @@ "interactive", "shell" ], - "time": "2017-06-20T12:51:31+00:00" + "time": "2017-07-06T14:53:52+00:00" }, { "name": "sebastian/comparator", @@ -2716,16 +2716,16 @@ }, { "name": "symfony/console", - "version": "v2.8.22", + "version": "v2.8.24", "source": { "type": "git", "url": "https://github.com/symfony/console.git", - "reference": "3ef6ef64abecd566d551d9e7f6393ac6e93b2462" + "reference": "46e65f8d98c9ab629bbfcc16a4ff023f61c37fb2" }, "dist": { "type": "zip", - "url": "https://api.github.com/repos/symfony/console/zipball/3ef6ef64abecd566d551d9e7f6393ac6e93b2462", - "reference": "3ef6ef64abecd566d551d9e7f6393ac6e93b2462", + "url": "https://api.github.com/repos/symfony/console/zipball/46e65f8d98c9ab629bbfcc16a4ff023f61c37fb2", + "reference": "46e65f8d98c9ab629bbfcc16a4ff023f61c37fb2", "shasum": "" }, "require": { @@ -2773,7 +2773,7 @@ ], "description": "Symfony Console Component", "homepage": "https://symfony.com", - "time": "2017-06-02T14:36:56+00:00" + "time": "2017-07-03T08:04:30+00:00" }, { "name": "symfony/debug", @@ -2834,7 +2834,7 @@ }, { "name": "symfony/event-dispatcher", - "version": "v2.8.22", + "version": "v2.8.24", "source": { "type": "git", "url": "https://github.com/symfony/event-dispatcher.git", @@ -2894,16 +2894,16 @@ }, { "name": "symfony/filesystem", - "version": "v2.8.22", + "version": "v2.8.24", "source": { "type": "git", "url": "https://github.com/symfony/filesystem.git", - "reference": "19c11158da8d110cc5289c063bf2ec4cc1ce9e7c" + "reference": "b8c9c18eacc525c980d27c7a2c8fd1e09e0ed4c7" }, "dist": { "type": "zip", - "url": "https://api.github.com/repos/symfony/filesystem/zipball/19c11158da8d110cc5289c063bf2ec4cc1ce9e7c", - "reference": "19c11158da8d110cc5289c063bf2ec4cc1ce9e7c", + "url": "https://api.github.com/repos/symfony/filesystem/zipball/b8c9c18eacc525c980d27c7a2c8fd1e09e0ed4c7", + "reference": "b8c9c18eacc525c980d27c7a2c8fd1e09e0ed4c7", "shasum": "" }, "require": { @@ -2939,11 +2939,11 @@ ], "description": "Symfony Filesystem Component", "homepage": "https://symfony.com", - "time": "2017-05-28T14:07:33+00:00" + "time": "2017-06-20T23:27:56+00:00" }, { "name": "symfony/finder", - "version": "v2.8.22", + "version": "v2.8.24", "source": { "type": "git", "url": "https://github.com/symfony/finder.git", @@ -3051,16 +3051,16 @@ }, { "name": "symfony/process", - "version": "v3.3.2", + "version": "v3.3.4", "source": { "type": "git", "url": "https://github.com/symfony/process.git", - "reference": "8e30690c67aafb6c7992d6d8eb0d707807dd3eaf" + "reference": "5ab8949b682b1bf9d4511a228b5e045c96758c30" }, "dist": { "type": "zip", - "url": "https://api.github.com/repos/symfony/process/zipball/8e30690c67aafb6c7992d6d8eb0d707807dd3eaf", - "reference": "8e30690c67aafb6c7992d6d8eb0d707807dd3eaf", + "url": "https://api.github.com/repos/symfony/process/zipball/5ab8949b682b1bf9d4511a228b5e045c96758c30", + "reference": "5ab8949b682b1bf9d4511a228b5e045c96758c30", "shasum": "" }, "require": { @@ -3096,20 +3096,20 @@ ], "description": "Symfony Process Component", "homepage": "https://symfony.com", - "time": "2017-05-22T12:32:03+00:00" + "time": "2017-07-03T08:12:02+00:00" }, { "name": "symfony/var-dumper", - "version": "v2.8.22", + "version": "v2.8.24", "source": { "type": "git", "url": "https://github.com/symfony/var-dumper.git", - "reference": "8108f6200e8a1cf999df2691431a2d71e6db1152" + "reference": "5fe3ba6d3817ae378d141962616e048ac85ba21d" }, "dist": { "type": "zip", - "url": "https://api.github.com/repos/symfony/var-dumper/zipball/8108f6200e8a1cf999df2691431a2d71e6db1152", - "reference": "8108f6200e8a1cf999df2691431a2d71e6db1152", + "url": "https://api.github.com/repos/symfony/var-dumper/zipball/5fe3ba6d3817ae378d141962616e048ac85ba21d", + "reference": "5fe3ba6d3817ae378d141962616e048ac85ba21d", "shasum": "" }, "require": { @@ -3164,11 +3164,11 @@ "debug", "dump" ], - "time": "2017-06-02T08:28:06+00:00" + "time": "2017-06-20T23:27:56+00:00" }, { "name": "symfony/yaml", - "version": "v2.8.22", + "version": "v2.8.24", "source": { "type": "git", "url": "https://github.com/symfony/yaml.git", @@ -3265,16 +3265,16 @@ }, { "name": "twig/twig", - "version": "v1.34.3", + "version": "v1.34.4", "source": { "type": "git", "url": "https://github.com/twigphp/Twig.git", - "reference": "451c6f4197e113e24c1c85bc3fc8c2d77adeff2e" + "reference": "f878bab48edb66ad9c6ed626bf817f60c6c096ee" }, "dist": { "type": "zip", - "url": "https://api.github.com/repos/twigphp/Twig/zipball/451c6f4197e113e24c1c85bc3fc8c2d77adeff2e", - "reference": "451c6f4197e113e24c1c85bc3fc8c2d77adeff2e", + "url": "https://api.github.com/repos/twigphp/Twig/zipball/f878bab48edb66ad9c6ed626bf817f60c6c096ee", + "reference": "f878bab48edb66ad9c6ed626bf817f60c6c096ee", "shasum": "" }, "require": { @@ -3326,7 +3326,7 @@ "keywords": [ "templating" ], - "time": "2017-06-07T18:45:17+00:00" + "time": "2017-07-04T13:19:31+00:00" }, { "name": "webmozart/assert", @@ -3426,7 +3426,7 @@ }, { "name": "wikimedia/composer-merge-plugin", - "version": "dev-master", + "version": "v1.4.1", "source": { "type": "git", "url": "https://github.com/wikimedia/composer-merge-plugin.git", @@ -3471,7 +3471,7 @@ } ], "description": "Composer plugin to merge multiple composer.json files", - "time": "2017-04-25 02:31:25" + "time": "2017-04-25T02:31:25+00:00" } ], "packages-dev": [ @@ -3540,12 +3540,12 @@ "source": { "type": "git", "url": "https://github.com/composer/composer.git", - "reference": "27b8209990abae71433e71363cc459b02e21bfc4" + "reference": "17b7387c374e202680c0da16a5f82fa2b9be17d6" }, "dist": { "type": "zip", - "url": "https://api.github.com/repos/composer/composer/zipball/27b8209990abae71433e71363cc459b02e21bfc4", - "reference": "27b8209990abae71433e71363cc459b02e21bfc4", + "url": "https://api.github.com/repos/composer/composer/zipball/17b7387c374e202680c0da16a5f82fa2b9be17d6", + "reference": "17b7387c374e202680c0da16a5f82fa2b9be17d6", "shasum": "" }, "require": { @@ -3609,7 +3609,7 @@ "dependency", "package" ], - "time": "2017-06-19 15:04:16" + "time": "2017-07-06T07:56:17+00:00" }, { "name": "composer/semver", @@ -3736,16 +3736,16 @@ }, { "name": "guzzlehttp/guzzle", - "version": "6.2.3", + "version": "6.3.0", "source": { "type": "git", "url": "https://github.com/guzzle/guzzle.git", - "reference": "8d6c6cc55186db87b7dc5009827429ba4e9dc006" + "reference": "f4db5a78a5ea468d4831de7f0bf9d9415e348699" }, "dist": { "type": "zip", - "url": "https://api.github.com/repos/guzzle/guzzle/zipball/8d6c6cc55186db87b7dc5009827429ba4e9dc006", - "reference": "8d6c6cc55186db87b7dc5009827429ba4e9dc006", + "url": "https://api.github.com/repos/guzzle/guzzle/zipball/f4db5a78a5ea468d4831de7f0bf9d9415e348699", + "reference": "f4db5a78a5ea468d4831de7f0bf9d9415e348699", "shasum": "" }, "require": { @@ -3755,9 +3755,12 @@ }, "require-dev": { "ext-curl": "*", - "phpunit/phpunit": "^4.0", + "phpunit/phpunit": "^4.0 || ^5.0", "psr/log": "^1.0" }, + "suggest": { + "psr/log": "Required for using the Log middleware" + }, "type": "library", "extra": { "branch-alias": { @@ -3794,7 +3797,7 @@ "rest", "web service" ], - "time": "2017-02-28T22:50:30+00:00" + "time": "2017-06-22T18:50:49+00:00" }, { "name": "guzzlehttp/promises", @@ -4174,7 +4177,6 @@ "aliases": [], "minimum-stability": "dev", "stability-flags": { - "wikimedia/composer-merge-plugin": 20, "composer/composer": 20 }, "prefer-stable": true,