From a00387129ffb3b8a8b7e62b4d315be0e8253a643 Mon Sep 17 00:00:00 2001
From: Nathaniel Catchpole <catch@35733.no-reply.drupal.org>
Date: Mon, 18 Sep 2017 12:04:56 +0100
Subject: [PATCH] Issue #2900112 by jibran, mpdonadio, Mile23, xjm, Issue
#2900112 by jibran, mpdonadio, Mile23, xjm: Update non-Symfony dependencies
in lock file before 8.4.0: Update non-Symfony dependencies in lock file
before 8.4.0
---
composer.lock | 65 ++++++++++++++++++++++++++++++---------------------
1 file changed, 39 insertions(+), 26 deletions(-)
diff --git a/composer.lock b/composer.lock
index 310254b2e0ee..d915cd0b906a 100644
--- a/composer.lock
+++ b/composer.lock
@@ -60,16 +60,16 @@
},
{
"name": "composer/installers",
- "version": "v1.2.0",
+ "version": "v1.4.0",
"source": {
"type": "git",
"url": "https://github.com/composer/installers.git",
- "reference": "d78064c68299743e0161004f2de3a0204e33b804"
+ "reference": "9ce17fb70e9a38dd8acff0636a29f5cf4d575c1b"
},
"dist": {
"type": "zip",
- "url": "https://api.github.com/repos/composer/installers/zipball/d78064c68299743e0161004f2de3a0204e33b804",
- "reference": "d78064c68299743e0161004f2de3a0204e33b804",
+ "url": "https://api.github.com/repos/composer/installers/zipball/9ce17fb70e9a38dd8acff0636a29f5cf4d575c1b",
+ "reference": "9ce17fb70e9a38dd8acff0636a29f5cf4d575c1b",
"shasum": ""
},
"require": {
@@ -111,12 +111,17 @@
"keywords": [
"Craft",
"Dolibarr",
+ "Eliasis",
"Hurad",
"ImageCMS",
+ "Kanboard",
+ "Lan Management System",
"MODX Evo",
"Mautic",
+ "Maya",
"OXID",
"Plentymarkets",
+ "Porto",
"RadPHP",
"SMF",
"Thelia",
@@ -134,20 +139,24 @@
"croogo",
"dokuwiki",
"drupal",
+ "eZ Platform",
"elgg",
"expressionengine",
"fuelphp",
"grav",
"installer",
+ "itop",
"joomla",
"kohana",
"laravel",
+ "lavalite",
"lithium",
"magento",
"mako",
"mediawiki",
"modulework",
"moodle",
+ "osclass",
"phpbb",
"piwik",
"ppi",
@@ -156,6 +165,7 @@
"roundcube",
"shopware",
"silverstripe",
+ "sydes",
"symfony",
"typo3",
"wordpress",
@@ -163,7 +173,7 @@
"zend",
"zikula"
],
- "time": "2016-08-13T20:53:52+00:00"
+ "time": "2017-08-09T07:53:48+00:00"
},
{
"name": "composer/semver",
@@ -741,16 +751,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": {
@@ -760,9 +770,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": {
@@ -799,7 +812,7 @@
"rest",
"web service"
],
- "time": "2017-02-28T22:50:30+00:00"
+ "time": "2017-06-22T18:50:49+00:00"
},
{
"name": "guzzlehttp/promises",
@@ -2306,16 +2319,16 @@
},
{
"name": "wikimedia/composer-merge-plugin",
- "version": "v1.4.0",
+ "version": "v1.4.1",
"source": {
"type": "git",
"url": "https://github.com/wikimedia/composer-merge-plugin.git",
- "reference": "ca453f9f13d8b05f86f20ea10be992a782e6f78c"
+ "reference": "81c6ac72a24a67383419c7eb9aa2b3437f2ab100"
},
"dist": {
"type": "zip",
- "url": "https://api.github.com/repos/wikimedia/composer-merge-plugin/zipball/ca453f9f13d8b05f86f20ea10be992a782e6f78c",
- "reference": "ca453f9f13d8b05f86f20ea10be992a782e6f78c",
+ "url": "https://api.github.com/repos/wikimedia/composer-merge-plugin/zipball/81c6ac72a24a67383419c7eb9aa2b3437f2ab100",
+ "reference": "81c6ac72a24a67383419c7eb9aa2b3437f2ab100",
"shasum": ""
},
"require": {
@@ -2351,7 +2364,7 @@
}
],
"description": "Composer plugin to merge multiple composer.json files",
- "time": "2017-03-13T16:52:55+00:00"
+ "time": "2017-04-25T02:31:25+00:00"
},
{
"name": "zendframework/zend-diactoros",
@@ -3028,16 +3041,16 @@
},
{
"name": "mikey179/vfsStream",
- "version": "v1.6.4",
+ "version": "v1.6.5",
"source": {
"type": "git",
"url": "https://github.com/mikey179/vfsStream.git",
- "reference": "0247f57b2245e8ad2e689d7cee754b45fbabd592"
+ "reference": "d5fec95f541d4d71c4823bb5e30cf9b9e5b96145"
},
"dist": {
"type": "zip",
- "url": "https://api.github.com/repos/mikey179/vfsStream/zipball/0247f57b2245e8ad2e689d7cee754b45fbabd592",
- "reference": "0247f57b2245e8ad2e689d7cee754b45fbabd592",
+ "url": "https://api.github.com/repos/mikey179/vfsStream/zipball/d5fec95f541d4d71c4823bb5e30cf9b9e5b96145",
+ "reference": "d5fec95f541d4d71c4823bb5e30cf9b9e5b96145",
"shasum": ""
},
"require": {
@@ -3070,7 +3083,7 @@
],
"description": "Virtual file system to mock the real file system in unit tests.",
"homepage": "http://vfs.bovigo.org/",
- "time": "2016-07-18T14:02:57+00:00"
+ "time": "2017-08-01T08:02:14+00:00"
},
{
"name": "phpdocumentor/reflection-docblock",
@@ -3434,16 +3447,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": {
@@ -3502,7 +3515,7 @@
"testing",
"xunit"
],
- "time": "2017-02-06T05:18:07+00:00"
+ "time": "2017-06-21T08:07:12+00:00"
},
{
"name": "phpunit/phpunit-mock-objects",
--
GitLab