From 4f410d270411f81e3f0019096dd33961b60327d5 Mon Sep 17 00:00:00 2001 From: Nicola Galgano Date: Mon, 8 Mar 2021 18:59:39 +0100 Subject: [PATCH 1/4] willdurand/negotiation from 2.3 to 3.0 php 8 --- composer.json | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/composer.json b/composer.json index f3ddc0a7b90bf..dcf6171413a8c 100644 --- a/composer.json +++ b/composer.json @@ -76,7 +76,7 @@ "wamania/php-stemmer": "^2.0", "maximebf/debugbar": "^1.15", "tobscure/json-api": "^0.4.1", - "willdurand/negotiation": "^2.3", + "willdurand/negotiation": "^3.0", "ext-json": "*", "ext-simplexml": "*", "psr/log": "~1.0", From 17d81fcfa37fdc00a8628c8808992af8dd9ba797 Mon Sep 17 00:00:00 2001 From: Nicola Galgano Date: Mon, 8 Mar 2021 19:03:59 +0100 Subject: [PATCH 2/4] willdurand/negotiation from 2.3 to 3.0 php 8 --- composer.lock | 63 +++++++++++++++++---------------------------------- 1 file changed, 21 insertions(+), 42 deletions(-) diff --git a/composer.lock b/composer.lock index b0188168c9b0f..af0cb44a6e1e9 100644 --- a/composer.lock +++ b/composer.lock @@ -4,7 +4,7 @@ "Read more about it at https://getcomposer.org/doc/01-basic-usage.md#installing-dependencies", "This file is @generated automatically" ], - "content-hash": "0955d7ab2dd79ed25e7cb52e299b81ff", + "content-hash": "19772794cc68edcef1d5b83189f520b7", "packages": [ { "name": "algo26-matthias/idna-convert", @@ -753,16 +753,16 @@ }, { "name": "joomla/console", - "version": "2.0.0-beta3", + "version": "2.0.0-beta2", "source": { "type": "git", "url": "https://github.com/joomla-framework/console.git", - "reference": "972a0cb3d8498eb717e0f9b5fcb4584d41436bb9" + "reference": "355fb82d414e58e30ea9fd870fc211c29f3f6338" }, "dist": { "type": "zip", - "url": "https://api.github.com/repos/joomla-framework/console/zipball/972a0cb3d8498eb717e0f9b5fcb4584d41436bb9", - "reference": "972a0cb3d8498eb717e0f9b5fcb4584d41436bb9", + "url": "https://api.github.com/repos/joomla-framework/console/zipball/355fb82d414e58e30ea9fd870fc211c29f3f6338", + "reference": "355fb82d414e58e30ea9fd870fc211c29f3f6338", "shasum": "" }, "require": { @@ -803,17 +803,7 @@ "framework", "joomla" ], - "funding": [ - { - "url": "https://community.joomla.org/sponsorship-campaigns.html", - "type": "custom" - }, - { - "url": "https://github.com/joomla", - "type": "github" - } - ], - "time": "2020-11-28T14:40:42+00:00" + "time": "2020-06-28T19:54:55+00:00" }, { "name": "joomla/crypt", @@ -1143,16 +1133,16 @@ }, { "name": "joomla/filter", - "version": "2.0.0-beta5", + "version": "2.0.0-beta2", "source": { "type": "git", "url": "https://github.com/joomla-framework/filter.git", - "reference": "8fbdae72ea6ceaece401f34c4ee179b4c01d2ee8" + "reference": "8d326ca1862c1cdb5b9b01d6719730b663e411c6" }, "dist": { "type": "zip", - "url": "https://api.github.com/repos/joomla-framework/filter/zipball/8fbdae72ea6ceaece401f34c4ee179b4c01d2ee8", - "reference": "8fbdae72ea6ceaece401f34c4ee179b4c01d2ee8", + "url": "https://api.github.com/repos/joomla-framework/filter/zipball/8d326ca1862c1cdb5b9b01d6719730b663e411c6", + "reference": "8d326ca1862c1cdb5b9b01d6719730b663e411c6", "shasum": "" }, "require": { @@ -1163,7 +1153,7 @@ "joomla/language": "<2.0" }, "require-dev": { - "joomla/coding-standards": "^3.0@dev", + "joomla/coding-standards": "^2.0@alpha", "joomla/language": "^2.0", "phpunit/phpunit": "^8.5|^9.0" }, @@ -1192,17 +1182,7 @@ "framework", "joomla" ], - "funding": [ - { - "url": "https://community.joomla.org/sponsorship-campaigns.html", - "type": "custom" - }, - { - "url": "https://github.com/joomla", - "type": "github" - } - ], - "time": "2021-02-01T12:25:08+00:00" + "time": "2020-06-08T23:03:46+00:00" }, { "name": "joomla/http", @@ -4416,28 +4396,28 @@ }, { "name": "willdurand/negotiation", - "version": "v2.3.1", + "version": "3.0.0", "source": { "type": "git", "url": "https://github.com/willdurand/Negotiation.git", - "reference": "03436ededa67c6e83b9b12defac15384cb399dc9" + "reference": "04e14f38d4edfcc974114a07d2777d90c98f3d9c" }, "dist": { "type": "zip", - "url": "https://api.github.com/repos/willdurand/Negotiation/zipball/03436ededa67c6e83b9b12defac15384cb399dc9", - "reference": "03436ededa67c6e83b9b12defac15384cb399dc9", + "url": "https://api.github.com/repos/willdurand/Negotiation/zipball/04e14f38d4edfcc974114a07d2777d90c98f3d9c", + "reference": "04e14f38d4edfcc974114a07d2777d90c98f3d9c", "shasum": "" }, "require": { - "php": ">=5.4.0" + "php": ">=7.1.0" }, "require-dev": { - "phpunit/phpunit": "~4.5" + "symfony/phpunit-bridge": "^5.0" }, "type": "library", "extra": { "branch-alias": { - "dev-master": "2.3-dev" + "dev-master": "3.0-dev" } }, "autoload": { @@ -4464,7 +4444,7 @@ "header", "negotiation" ], - "time": "2017-05-14T17:21:12+00:00" + "time": "2020-09-25T08:01:41+00:00" } ], "packages-dev": [ @@ -8297,6 +8277,5 @@ "platform-dev": [], "platform-overrides": { "php": "7.2.5" - }, - "plugin-api-version": "1.1.0" + } } From 75e02e476d66df6c8ec9dfac042cf02de4e1f7d1 Mon Sep 17 00:00:00 2001 From: Nicola Galgano Date: Tue, 9 Mar 2021 08:27:56 +0100 Subject: [PATCH 3/4] .lock --- composer.lock | 47 ++++++++++++++++++++++++++++++++++------------- 1 file changed, 34 insertions(+), 13 deletions(-) diff --git a/composer.lock b/composer.lock index af0cb44a6e1e9..88ae08c9f8921 100644 --- a/composer.lock +++ b/composer.lock @@ -4,7 +4,7 @@ "Read more about it at https://getcomposer.org/doc/01-basic-usage.md#installing-dependencies", "This file is @generated automatically" ], - "content-hash": "19772794cc68edcef1d5b83189f520b7", + "content-hash": "68cc312f4c0dae0d21a9735a9594c57b", "packages": [ { "name": "algo26-matthias/idna-convert", @@ -753,16 +753,16 @@ }, { "name": "joomla/console", - "version": "2.0.0-beta2", + "version": "2.0.0-beta3", "source": { "type": "git", "url": "https://github.com/joomla-framework/console.git", - "reference": "355fb82d414e58e30ea9fd870fc211c29f3f6338" + "reference": "972a0cb3d8498eb717e0f9b5fcb4584d41436bb9" }, "dist": { "type": "zip", - "url": "https://api.github.com/repos/joomla-framework/console/zipball/355fb82d414e58e30ea9fd870fc211c29f3f6338", - "reference": "355fb82d414e58e30ea9fd870fc211c29f3f6338", + "url": "https://api.github.com/repos/joomla-framework/console/zipball/972a0cb3d8498eb717e0f9b5fcb4584d41436bb9", + "reference": "972a0cb3d8498eb717e0f9b5fcb4584d41436bb9", "shasum": "" }, "require": { @@ -803,7 +803,17 @@ "framework", "joomla" ], - "time": "2020-06-28T19:54:55+00:00" + "funding": [ + { + "url": "https://community.joomla.org/sponsorship-campaigns.html", + "type": "custom" + }, + { + "url": "https://github.com/joomla", + "type": "github" + } + ], + "time": "2020-11-28T14:40:42+00:00" }, { "name": "joomla/crypt", @@ -1133,16 +1143,16 @@ }, { "name": "joomla/filter", - "version": "2.0.0-beta2", + "version": "2.0.0-beta5", "source": { "type": "git", "url": "https://github.com/joomla-framework/filter.git", - "reference": "8d326ca1862c1cdb5b9b01d6719730b663e411c6" + "reference": "8fbdae72ea6ceaece401f34c4ee179b4c01d2ee8" }, "dist": { "type": "zip", - "url": "https://api.github.com/repos/joomla-framework/filter/zipball/8d326ca1862c1cdb5b9b01d6719730b663e411c6", - "reference": "8d326ca1862c1cdb5b9b01d6719730b663e411c6", + "url": "https://api.github.com/repos/joomla-framework/filter/zipball/8fbdae72ea6ceaece401f34c4ee179b4c01d2ee8", + "reference": "8fbdae72ea6ceaece401f34c4ee179b4c01d2ee8", "shasum": "" }, "require": { @@ -1153,7 +1163,7 @@ "joomla/language": "<2.0" }, "require-dev": { - "joomla/coding-standards": "^2.0@alpha", + "joomla/coding-standards": "^3.0@dev", "joomla/language": "^2.0", "phpunit/phpunit": "^8.5|^9.0" }, @@ -1182,7 +1192,17 @@ "framework", "joomla" ], - "time": "2020-06-08T23:03:46+00:00" + "funding": [ + { + "url": "https://community.joomla.org/sponsorship-campaigns.html", + "type": "custom" + }, + { + "url": "https://github.com/joomla", + "type": "github" + } + ], + "time": "2021-02-01T12:25:08+00:00" }, { "name": "joomla/http", @@ -8277,5 +8297,6 @@ "platform-dev": [], "platform-overrides": { "php": "7.2.5" - } + }, + "plugin-api-version": "1.1.0" } From 84769b184e6061837dfb2fa439016fb4ceb1e1e0 Mon Sep 17 00:00:00 2001 From: Nicola Galgano Date: Tue, 9 Mar 2021 08:42:33 +0100 Subject: [PATCH 4/4] .lock --- composer.lock | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/composer.lock b/composer.lock index 88ae08c9f8921..2f4d56c8001ef 100644 --- a/composer.lock +++ b/composer.lock @@ -4,7 +4,7 @@ "Read more about it at https://getcomposer.org/doc/01-basic-usage.md#installing-dependencies", "This file is @generated automatically" ], - "content-hash": "68cc312f4c0dae0d21a9735a9594c57b", + "content-hash": "19772794cc68edcef1d5b83189f520b7", "packages": [ { "name": "algo26-matthias/idna-convert",