From d4a4b01f87652f0711e581d8d756b7f1b3557685 Mon Sep 17 00:00:00 2001 From: "khrystyna.stolbova" Date: Mon, 1 Mar 2021 14:16:37 +0200 Subject: [PATCH 1/2] laminas-servicemanager updated to 3.5.1 --- composer.json | 12 ++++---- composer.lock | 77 ++++++++++++++++++++++++++++++++++++--------------- 2 files changed, 60 insertions(+), 29 deletions(-) diff --git a/composer.json b/composer.json index a2f2ed834bda0..0764c06422a18 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", @@ -56,7 +55,7 @@ "laminas/laminas-mvc": "~2.7.0", "laminas/laminas-serializer": "^2.7.2", "laminas/laminas-server": "^2.6.1", - "laminas/laminas-servicemanager": "^2.7.8", + "laminas/laminas-servicemanager": "^3.5.1", "laminas/laminas-session": "^2.7.3", "laminas/laminas-soap": "^2.7.0", "laminas/laminas-stdlib": "^3.2.1", @@ -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..cc3e7ea5f6ab8 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": "d7f9f2b4257de6ad745bdce942bae0ba", "packages": [ { "name": "aws/aws-sdk-php", @@ -2937,44 +2937,55 @@ }, { "name": "laminas/laminas-servicemanager", - "version": "2.7.11", + "version": "3.6.4", "source": { "type": "git", "url": "https://github.com/laminas/laminas-servicemanager.git", - "reference": "841abb656c6018afebeec1f355be438426d6a3dd" + "reference": "b1445e1a7077c21b0fad0974a1b7a11b9dbe0828" }, "dist": { "type": "zip", - "url": "https://api.github.com/repos/laminas/laminas-servicemanager/zipball/841abb656c6018afebeec1f355be438426d6a3dd", - "reference": "841abb656c6018afebeec1f355be438426d6a3dd", + "url": "https://api.github.com/repos/laminas/laminas-servicemanager/zipball/b1445e1a7077c21b0fad0974a1b7a11b9dbe0828", + "reference": "b1445e1a7077c21b0fad0974a1b7a11b9dbe0828", "shasum": "" }, "require": { - "container-interop/container-interop": "~1.0", + "container-interop/container-interop": "^1.2", + "laminas/laminas-stdlib": "^3.2.1", "laminas/laminas-zendframework-bridge": "^1.0", - "php": "^5.5 || ^7.0" + "php": "^7.3 || ~8.0.0", + "psr/container": "^1.0" + }, + "conflict": { + "laminas/laminas-code": "<3.3.1", + "zendframework/zend-code": "<3.3.1" + }, + "provide": { + "container-interop/container-interop-implementation": "^1.2", + "psr/container-implementation": "^1.0" }, "replace": { - "zendframework/zend-servicemanager": "self.version" + "zendframework/zend-servicemanager": "^3.4.0" }, "require-dev": { - "athletic/athletic": "dev-master", - "fabpot/php-cs-fixer": "1.7.*", - "laminas/laminas-di": "~2.5", - "laminas/laminas-mvc": "~2.5", - "phpunit/phpunit": "~4.0" + "composer/package-versions-deprecated": "^1.0", + "laminas/laminas-coding-standard": "~1.0.0", + "laminas/laminas-container-config-test": "^0.3", + "laminas/laminas-dependency-plugin": "^2.1", + "mikey179/vfsstream": "^1.6.8", + "ocramius/proxy-manager": "^2.2.3", + "phpbench/phpbench": "^1.0.0-alpha3", + "phpspec/prophecy-phpunit": "^2.0", + "phpunit/phpunit": "^9.4" }, "suggest": { - "laminas/laminas-di": "Laminas\\Di component", - "ocramius/proxy-manager": "ProxyManager 0.5.* to handle lazy initialization of services" + "ocramius/proxy-manager": "ProxyManager ^2.1.1 to handle lazy initialization of services" }, + "bin": [ + "bin/generate-deps-for-config-factory", + "bin/generate-factory-for-class" + ], "type": "library", - "extra": { - "branch-alias": { - "dev-master": "2.7-dev", - "dev-develop": "3.0-dev" - } - }, "autoload": { "psr-4": { "Laminas\\ServiceManager\\": "src/" @@ -2984,12 +2995,32 @@ "license": [ "BSD-3-Clause" ], + "description": "Factory-Driven Dependency Injection Container", "homepage": "https://laminas.dev", "keywords": [ + "PSR-11", + "dependency-injection", + "di", + "dic", "laminas", + "service-manager", "servicemanager" ], - "time": "2019-12-31T17:44:16+00:00" + "support": { + "chat": "https://laminas.dev/chat", + "docs": "https://docs.laminas.dev/laminas-servicemanager/", + "forum": "https://discourse.laminas.dev", + "issues": "https://github.com/laminas/laminas-servicemanager/issues", + "rss": "https://github.com/laminas/laminas-servicemanager/releases.atom", + "source": "https://github.com/laminas/laminas-servicemanager" + }, + "funding": [ + { + "url": "https://funding.communitybridge.org/projects/laminas-project", + "type": "community_bridge" + } + ], + "time": "2021-02-03T08:44:41+00:00" }, { "name": "laminas/laminas-session", @@ -12139,5 +12170,5 @@ "lib-libxml": "*" }, "platform-dev": [], - "plugin-api-version": "1.1.0" + "plugin-api-version": "2.0.0" } From 8c1ea3d409c28145dd32118aed34157620d01df4 Mon Sep 17 00:00:00 2001 From: "khrystyna.stolbova" Date: Mon, 1 Mar 2021 14:20:39 +0200 Subject: [PATCH 2/2] laminas/laminas-view updated to ~2.12.0 --- composer.json | 2 +- composer.lock | 35 ++++++++++++++++++++++++----------- 2 files changed, 25 insertions(+), 12 deletions(-) diff --git a/composer.json b/composer.json index 0764c06422a18..2421231be663b 100644 --- a/composer.json +++ b/composer.json @@ -62,7 +62,7 @@ "laminas/laminas-text": "^2.6.0", "laminas/laminas-uri": "^2.5.1", "laminas/laminas-validator": "^2.6.0", - "laminas/laminas-view": "~2.11.2", + "laminas/laminas-view": "~2.12.0", "league/flysystem": "^1.0", "league/flysystem-aws-s3-v3": "^1.0", "league/flysystem-cached-adapter": "^1.0", diff --git a/composer.lock b/composer.lock index cc3e7ea5f6ab8..0d0d926717090 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": "d7f9f2b4257de6ad745bdce942bae0ba", + "content-hash": "b85838eda22c5a829b13e7bfd1b4a106", "packages": [ { "name": "aws/aws-sdk-php", @@ -3392,25 +3392,28 @@ }, { "name": "laminas/laminas-view", - "version": "2.11.5", + "version": "2.12.0", "source": { "type": "git", "url": "https://github.com/laminas/laminas-view.git", - "reference": "16611035d7b3a6ef2c636a9268c213146123b663" + "reference": "3ef103da6887809f08ecf52f42c31a76c9bf08b1" }, "dist": { "type": "zip", - "url": "https://api.github.com/repos/laminas/laminas-view/zipball/16611035d7b3a6ef2c636a9268c213146123b663", - "reference": "16611035d7b3a6ef2c636a9268c213146123b663", + "url": "https://api.github.com/repos/laminas/laminas-view/zipball/3ef103da6887809f08ecf52f42c31a76c9bf08b1", + "reference": "3ef103da6887809f08ecf52f42c31a76c9bf08b1", "shasum": "" }, "require": { - "laminas/laminas-eventmanager": "^2.6.2 || ^3.0", + "laminas/laminas-eventmanager": "^3.0", "laminas/laminas-json": "^2.6.1 || ^3.0", "laminas/laminas-loader": "^2.5", - "laminas/laminas-stdlib": "^2.7 || ^3.0", + "laminas/laminas-stdlib": "^3.2.1", "laminas/laminas-zendframework-bridge": "^1.0", - "php": "^5.6 || ^7.0" + "php": "^7.3 || ~8.0.0" + }, + "conflict": { + "laminas/laminas-servicemanager": "<3.3" }, "replace": { "zendframework/zend-view": "^2.11.4" @@ -3434,10 +3437,12 @@ "laminas/laminas-permissions-acl": "^2.6", "laminas/laminas-router": "^3.0.1", "laminas/laminas-serializer": "^2.6.1", - "laminas/laminas-servicemanager": "^2.7.5 || ^3.0.3", + "laminas/laminas-servicemanager": "^3.3", "laminas/laminas-session": "^2.8.1", "laminas/laminas-uri": "^2.5", - "phpunit/phpunit": "^5.7.27 || ^6.5.14 || ^7.5.18" + "phpspec/prophecy": "^1.12", + "phpspec/prophecy-phpunit": "^2.0", + "phpunit/phpunit": "^9.3" }, "suggest": { "laminas/laminas-authentication": "Laminas\\Authentication component", @@ -3473,13 +3478,21 @@ "laminas", "view" ], + "support": { + "chat": "https://laminas.dev/chat", + "docs": "https://docs.laminas.dev/laminas-view/", + "forum": "https://discourse.laminas.dev", + "issues": "https://github.com/laminas/laminas-view/issues", + "rss": "https://github.com/laminas/laminas-view/releases.atom", + "source": "https://github.com/laminas/laminas-view" + }, "funding": [ { "url": "https://funding.communitybridge.org/projects/laminas-project", "type": "community_bridge" } ], - "time": "2020-12-15T14:57:08+00:00" + "time": "2021-01-01T14:07:41+00:00" }, { "name": "laminas/laminas-zendframework-bridge",