From 5f52967bf64662444b05c7be3698949dc8c05c6c Mon Sep 17 00:00:00 2001 From: Medvediev Date: Thu, 21 Jan 2021 17:39:32 +0200 Subject: [PATCH 1/2] Updated tedivm/jshrink dependency to PHP 8 compatible version --- composer.json | 2 +- composer.lock | 78 +++++++++++++++++--- lib/internal/Magento/Framework/composer.json | 2 +- 3 files changed, 70 insertions(+), 12 deletions(-) diff --git a/composer.json b/composer.json index 6aa9355cec7b1..8ab0c5fcf21d3 100644 --- a/composer.json +++ b/composer.json @@ -77,7 +77,7 @@ "symfony/console": "~4.4.0", "symfony/event-dispatcher": "~4.4.0", "symfony/process": "~4.4.0", - "tedivm/jshrink": "~1.3.0", + "tedivm/jshrink": "~1.4.0", "tubalmartin/cssmin": "4.1.1", "webonyx/graphql-php": "^0.13.8", "wikimedia/less.php": "~1.8.0", diff --git a/composer.lock b/composer.lock index b0b15f4e13f6c..68316e9a5e6fb 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": "ac6fc13ba98a815bce589d300d28012c", + "content-hash": "89588fbc4ad1be077ea78638b34ed615", "packages": [ { "name": "aws/aws-sdk-php", @@ -1459,6 +1459,12 @@ "BSD-3-Clause" ], "description": "Replace zendframework and zfcampus packages with their Laminas Project equivalents.", + "funding": [ + { + "url": "https://funding.communitybridge.org/projects/laminas-project", + "type": "community_bridge" + } + ], "time": "2020-05-20T13:45:39+00:00" }, { @@ -3714,11 +3720,13 @@ "Magento\\Composer\\": "src" } }, + "notification-url": "https://packagist.org/downloads/", "license": [ "OSL-3.0", "AFL-3.0" ], - "description": "Magento composer library helps to instantiate Composer application and run composer commands." + "description": "Magento composer library helps to instantiate Composer application and run composer commands.", + "time": "2020-06-15T17:52:31+00:00" }, { "name": "magento/magento-composer-installer", @@ -5985,20 +5993,20 @@ }, { "name": "tedivm/jshrink", - "version": "v1.3.3", + "version": "v1.4.0", "source": { "type": "git", "url": "https://github.com/tedious/JShrink.git", - "reference": "566e0c731ba4e372be2de429ef7d54f4faf4477a" + "reference": "0513ba1407b1f235518a939455855e6952a48bbc" }, "dist": { "type": "zip", - "url": "https://api.github.com/repos/tedious/JShrink/zipball/566e0c731ba4e372be2de429ef7d54f4faf4477a", - "reference": "566e0c731ba4e372be2de429ef7d54f4faf4477a", + "url": "https://api.github.com/repos/tedious/JShrink/zipball/0513ba1407b1f235518a939455855e6952a48bbc", + "reference": "0513ba1407b1f235518a939455855e6952a48bbc", "shasum": "" }, "require": { - "php": "^5.6|^7.0" + "php": "^5.6|^7.0|^8.0" }, "require-dev": { "friendsofphp/php-cs-fixer": "^2.8", @@ -6027,7 +6035,13 @@ "javascript", "minifier" ], - "time": "2019-06-28T18:11:46+00:00" + "funding": [ + { + "url": "https://tidelift.com/funding/github/packagist/tedivm/jshrink", + "type": "tidelift" + } + ], + "time": "2020-11-30T18:10:21+00:00" }, { "name": "true/punycode", @@ -7548,6 +7562,20 @@ "parser", "php" ], + "funding": [ + { + "url": "https://www.doctrine-project.org/sponsorship.html", + "type": "custom" + }, + { + "url": "https://www.patreon.com/phpdoctrine", + "type": "patreon" + }, + { + "url": "https://tidelift.com/funding/github/packagist/doctrine%2Flexer", + "type": "tidelift" + } + ], "time": "2020-05-25T17:44:05+00:00" }, { @@ -9538,6 +9566,20 @@ "MIT" ], "description": "PHPStan - PHP Static Analysis Tool", + "funding": [ + { + "url": "https://github.com/ondrejmirtes", + "type": "github" + }, + { + "url": "https://www.patreon.com/phpstan", + "type": "patreon" + }, + { + "url": "https://tidelift.com/funding/github/packagist/phpstan/phpstan", + "type": "tidelift" + } + ], "time": "2020-05-05T12:55:44+00:00" }, { @@ -9827,6 +9869,12 @@ "keywords": [ "timer" ], + "funding": [ + { + "url": "https://github.com/sebastianbergmann", + "type": "github" + } + ], "time": "2020-04-20T06:00:37+00:00" }, { @@ -9971,6 +10019,16 @@ "testing", "xunit" ], + "funding": [ + { + "url": "https://phpunit.de/donate.html", + "type": "custom" + }, + { + "url": "https://github.com/sebastianbergmann", + "type": "github" + } + ], "time": "2020-05-22T13:54:05+00:00" }, { @@ -11901,12 +11959,12 @@ "version": "1.9.1", "source": { "type": "git", - "url": "https://github.com/webmozart/assert.git", + "url": "https://github.com/webmozarts/assert.git", "reference": "bafc69caeb4d49c39fd0779086c03a3738cbb389" }, "dist": { "type": "zip", - "url": "https://api.github.com/repos/webmozart/assert/zipball/bafc69caeb4d49c39fd0779086c03a3738cbb389", + "url": "https://api.github.com/repos/webmozarts/assert/zipball/bafc69caeb4d49c39fd0779086c03a3738cbb389", "reference": "bafc69caeb4d49c39fd0779086c03a3738cbb389", "shasum": "" }, diff --git a/lib/internal/Magento/Framework/composer.json b/lib/internal/Magento/Framework/composer.json index dfc81189bf544..a744f8dc78e21 100644 --- a/lib/internal/Magento/Framework/composer.json +++ b/lib/internal/Magento/Framework/composer.json @@ -39,7 +39,7 @@ "ramsey/uuid": "~3.8.0", "symfony/console": "~4.4.0", "symfony/process": "~4.4.0", - "tedivm/jshrink": "~1.3.0", + "tedivm/jshrink": "~1.4.0", "wikimedia/less.php": "~1.8.0" }, "archive": { From 4dad3d690fcda8c75872da93343fc381559771c5 Mon Sep 17 00:00:00 2001 From: Sergii Ivashchenko Date: Mon, 1 Feb 2021 15:11:36 +0000 Subject: [PATCH 2/2] magento/magento#231778: Updated composer.lock --- composer.lock | 20 +++++++++++++------- 1 file changed, 13 insertions(+), 7 deletions(-) diff --git a/composer.lock b/composer.lock index ba560a95d9237..63e3702075bc1 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": "438feb5366e2edd6b88e3c286b637f9b", + "content-hash": "413d6009928922f47697cdd4153ce0e3", "packages": [ { "name": "aws/aws-sdk-php", @@ -5984,20 +5984,20 @@ }, { "name": "tedivm/jshrink", - "version": "v1.3.3", + "version": "v1.4.0", "source": { "type": "git", "url": "https://github.com/tedious/JShrink.git", - "reference": "566e0c731ba4e372be2de429ef7d54f4faf4477a" + "reference": "0513ba1407b1f235518a939455855e6952a48bbc" }, "dist": { "type": "zip", - "url": "https://api.github.com/repos/tedious/JShrink/zipball/566e0c731ba4e372be2de429ef7d54f4faf4477a", - "reference": "566e0c731ba4e372be2de429ef7d54f4faf4477a", + "url": "https://api.github.com/repos/tedious/JShrink/zipball/0513ba1407b1f235518a939455855e6952a48bbc", + "reference": "0513ba1407b1f235518a939455855e6952a48bbc", "shasum": "" }, "require": { - "php": "^5.6|^7.0" + "php": "^5.6|^7.0|^8.0" }, "require-dev": { "friendsofphp/php-cs-fixer": "^2.8", @@ -6026,7 +6026,13 @@ "javascript", "minifier" ], - "time": "2019-06-28T18:11:46+00:00" + "funding": [ + { + "url": "https://tidelift.com/funding/github/packagist/tedivm/jshrink", + "type": "tidelift" + } + ], + "time": "2020-11-30T18:10:21+00:00" }, { "name": "true/punycode",