From 6ecd600d8f6021553107b4f4adaf709975ce59b5 Mon Sep 17 00:00:00 2001 From: "khrystyna.stolbova" Date: Tue, 2 Mar 2021 18:26:51 +0200 Subject: [PATCH 1/2] "laminas/laminas-mime" updated to ^2.8.0 --- composer.json | 12 ++++++------ composer.lock | 38 +++++++++++++++++++++++--------------- 2 files changed, 29 insertions(+), 21 deletions(-) diff --git a/composer.json b/composer.json index a2f2ed834bda0..9489af2318151 100644 --- a/composer.json +++ b/composer.json @@ -33,7 +33,6 @@ "colinmollenhour/credis": "1.11.1", "colinmollenhour/php-redis-session-abstract": "~1.4.0", "composer/composer": "^1.9 || ^2.0", - "magento/magento-composer-installer": ">=0.1.11", "elasticsearch/elasticsearch": "~7.11.0", "guzzlehttp/guzzle": "^6.3.3", "laminas/laminas-captcha": "^2.7.1", @@ -51,7 +50,7 @@ "laminas/laminas-json": "^3.2.0", "laminas/laminas-log": "^2.9.1", "laminas/laminas-mail": "^2.9.0", - "laminas/laminas-mime": "^2.5.0", + "laminas/laminas-mime": "^2.8.0", "laminas/laminas-modulemanager": "^2.7", "laminas/laminas-mvc": "~2.7.0", "laminas/laminas-serializer": "^2.7.2", @@ -64,7 +63,11 @@ "laminas/laminas-uri": "^2.5.1", "laminas/laminas-validator": "^2.6.0", "laminas/laminas-view": "~2.11.2", + "league/flysystem": "^1.0", + "league/flysystem-aws-s3-v3": "^1.0", + "league/flysystem-cached-adapter": "^1.0", "magento/composer": "1.6.0", + "magento/magento-composer-installer": ">=0.1.11", "magento/zendframework1": "~1.14.2", "monolog/monolog": "^1.17", "paragonie/sodium_compat": "^1.6", @@ -79,10 +82,7 @@ "tedivm/jshrink": "~1.4.0", "tubalmartin/cssmin": "4.1.1", "webonyx/graphql-php": "^0.13.8", - "wikimedia/less.php": "^3.0.0", - "league/flysystem": "^1.0", - "league/flysystem-aws-s3-v3": "^1.0", - "league/flysystem-cached-adapter": "^1.0" + "wikimedia/less.php": "^3.0.0" }, "require-dev": { "allure-framework/allure-phpunit": "~1.2.0", diff --git a/composer.lock b/composer.lock index fcb4e7760d164..aba28bd4804c6 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": "351f63d8396148e0126fc48ad6cf09c6", + "content-hash": "18b0afd3f403cb1fb4d523192493d963", "packages": [ { "name": "aws/aws-sdk-php", @@ -2554,22 +2554,22 @@ }, { "name": "laminas/laminas-mime", - "version": "2.7.4", + "version": "2.8.0", "source": { "type": "git", "url": "https://github.com/laminas/laminas-mime.git", - "reference": "e45a7d856bf7b4a7b5bd00d6371f9961dc233add" + "reference": "9a59704f33106427a384d0ae421f96043174093a" }, "dist": { "type": "zip", - "url": "https://api.github.com/repos/laminas/laminas-mime/zipball/e45a7d856bf7b4a7b5bd00d6371f9961dc233add", - "reference": "e45a7d856bf7b4a7b5bd00d6371f9961dc233add", + "url": "https://api.github.com/repos/laminas/laminas-mime/zipball/9a59704f33106427a384d0ae421f96043174093a", + "reference": "9a59704f33106427a384d0ae421f96043174093a", "shasum": "" }, "require": { "laminas/laminas-stdlib": "^2.7 || ^3.0", "laminas/laminas-zendframework-bridge": "^1.0", - "php": "^5.6 || ^7.0" + "php": "^7.3 || ~8.0.0" }, "replace": { "zendframework/zend-mime": "^2.7.2" @@ -2577,18 +2577,12 @@ "require-dev": { "laminas/laminas-coding-standard": "~1.0.0", "laminas/laminas-mail": "^2.6", - "phpunit/phpunit": "^5.7.27 || ^6.5.14 || ^7.5.20" + "phpunit/phpunit": "^9.3" }, "suggest": { "laminas/laminas-mail": "Laminas\\Mail component" }, "type": "library", - "extra": { - "branch-alias": { - "dev-master": "2.7.x-dev", - "dev-develop": "2.8.x-dev" - } - }, "autoload": { "psr-4": { "Laminas\\Mime\\": "src/" @@ -2604,7 +2598,21 @@ "laminas", "mime" ], - "time": "2020-03-29T13:12:07+00:00" + "support": { + "chat": "https://laminas.dev/chat", + "docs": "https://docs.laminas.dev/laminas-mime/", + "forum": "https://discourse.laminas.dev", + "issues": "https://github.com/laminas/laminas-mime/issues", + "rss": "https://github.com/laminas/laminas-mime/releases.atom", + "source": "https://github.com/laminas/laminas-mime" + }, + "funding": [ + { + "url": "https://funding.communitybridge.org/projects/laminas-project", + "type": "community_bridge" + } + ], + "time": "2021-02-16T17:40:06+00:00" }, { "name": "laminas/laminas-modulemanager", @@ -12139,5 +12147,5 @@ "lib-libxml": "*" }, "platform-dev": [], - "plugin-api-version": "1.1.0" + "plugin-api-version": "2.0.0" } From abc050b46d062bfb826980c35fcbde63a9c58e88 Mon Sep 17 00:00:00 2001 From: "khrystyna.stolbova" Date: Tue, 9 Mar 2021 12:30:46 +0200 Subject: [PATCH 2/2] #32319 "laminas/laminas-mime" updated to ^2.8.0 (update in the Magento framework's composer.json file) --- lib/internal/Magento/Framework/composer.json | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/lib/internal/Magento/Framework/composer.json b/lib/internal/Magento/Framework/composer.json index 9c46a8089cd64..45d00cfba1f2d 100644 --- a/lib/internal/Magento/Framework/composer.json +++ b/lib/internal/Magento/Framework/composer.json @@ -29,7 +29,7 @@ "laminas/laminas-crypt": "^3.4.0", "laminas/laminas-http": "^2.6.0", "laminas/laminas-mail": "^2.9.0", - "laminas/laminas-mime": "^2.5.0", + "laminas/laminas-mime": "^2.8.0", "laminas/laminas-mvc": "~2.7.0", "laminas/laminas-stdlib": "^3.2.1", "laminas/laminas-uri": "^2.5.1",