From 2975994d5b63f71d6edb937e686b3b9b6587307f Mon Sep 17 00:00:00 2001 From: Vladimir Fishchenko Date: Wed, 17 Mar 2021 21:19:39 +0000 Subject: [PATCH] #32443 Update laminas-captcha to ^2.10 to be PHP8 compatible --- app/code/Magento/Captcha/composer.json | 2 +- composer.json | 2 +- composer.lock | 72 ++++++++++++++++---------- 3 files changed, 47 insertions(+), 29 deletions(-) diff --git a/app/code/Magento/Captcha/composer.json b/app/code/Magento/Captcha/composer.json index 3c3aa58c3fe2f..47a2cb197a558 100644 --- a/app/code/Magento/Captcha/composer.json +++ b/app/code/Magento/Captcha/composer.json @@ -12,7 +12,7 @@ "magento/module-customer": "*", "magento/module-store": "*", "magento/module-authorization": "*", - "laminas/laminas-captcha": "^2.7.1", + "laminas/laminas-captcha": "^2.10", "laminas/laminas-db": "^2.8.2", "laminas/laminas-session": "^2.7.3" }, diff --git a/composer.json b/composer.json index 3c14c08728323..397726f260062 100644 --- a/composer.json +++ b/composer.json @@ -35,7 +35,7 @@ "composer/composer": "^1.9 || ^2.0", "elasticsearch/elasticsearch": "~7.11.0", "guzzlehttp/guzzle": "^6.3.3", - "laminas/laminas-captcha": "^2.7.1", + "laminas/laminas-captcha": "^2.10", "laminas/laminas-code": "^3.5.1", "laminas/laminas-crypt": "^3.4.0", "laminas/laminas-db": "^2.12.0", diff --git a/composer.lock b/composer.lock index ab96a1bd800b7..ba3642269099e 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": "ebd060da6b367c590778ba8864a268a7", + "content-hash": "e906c991e4722a91b340469ae8ce3fbc", "packages": [ { "name": "aws/aws-sdk-php", @@ -1103,34 +1103,36 @@ }, { "name": "laminas/laminas-captcha", - "version": "2.9.0", + "version": "2.10.0", "source": { "type": "git", "url": "https://github.com/laminas/laminas-captcha.git", - "reference": "b88f650f3adf2d902ef56f6377cceb5cd87b9876" + "reference": "9a0134e434cd792934ecca42cb66f316be7bba50" }, "dist": { "type": "zip", - "url": "https://api.github.com/repos/laminas/laminas-captcha/zipball/b88f650f3adf2d902ef56f6377cceb5cd87b9876", - "reference": "b88f650f3adf2d902ef56f6377cceb5cd87b9876", + "url": "https://api.github.com/repos/laminas/laminas-captcha/zipball/9a0134e434cd792934ecca42cb66f316be7bba50", + "reference": "9a0134e434cd792934ecca42cb66f316be7bba50", "shasum": "" }, "require": { "laminas/laminas-math": "^2.7 || ^3.0", - "laminas/laminas-stdlib": "^3.2.1", - "laminas/laminas-zendframework-bridge": "^1.0", - "php": "^5.6 || ^7.0" + "laminas/laminas-stdlib": "^3.3", + "laminas/laminas-zendframework-bridge": "^1.1", + "php": "^7.3 || ~8.0.0" }, "replace": { - "zendframework/zend-captcha": "self.version" + "zendframework/zend-captcha": "^2.9.0" }, "require-dev": { - "laminas/laminas-coding-standard": "~1.0.0", + "laminas/laminas-coding-standard": "~2.1.4", "laminas/laminas-recaptcha": "^3.0", - "laminas/laminas-session": "^2.8", - "laminas/laminas-text": "^2.6", - "laminas/laminas-validator": "^2.10.1", - "phpunit/phpunit": "^5.7.27 || ^6.5.8 || ^7.1.2" + "laminas/laminas-session": "^2.10", + "laminas/laminas-text": "^2.8", + "laminas/laminas-validator": "^2.14", + "phpunit/phpunit": "^9.4.3", + "psalm/plugin-phpunit": "^0.15.1", + "vimeo/psalm": "^4.6" }, "suggest": { "laminas/laminas-i18n-resources": "Translations of captcha messages", @@ -1140,12 +1142,6 @@ "laminas/laminas-validator": "Laminas\\Validator component" }, "type": "library", - "extra": { - "branch-alias": { - "dev-master": "2.9.x-dev", - "dev-develop": "2.10.x-dev" - } - }, "autoload": { "psr-4": { "Laminas\\Captcha\\": "src/" @@ -1161,7 +1157,13 @@ "captcha", "laminas" ], - "time": "2019-12-31T16:24:14+00:00" + "funding": [ + { + "url": "https://funding.communitybridge.org/projects/laminas-project", + "type": "community_bridge" + } + ], + "time": "2021-03-17T16:42:11+00:00" }, { "name": "laminas/laminas-code", @@ -3683,11 +3685,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", @@ -4719,11 +4723,6 @@ "MIT" ], "authors": [ - { - "name": "Ben Ramsey", - "email": "ben@benramsey.com", - "homepage": "https://benramsey.com" - }, { "name": "Marijn Huizendveld", "email": "marijn.huizendveld@gmail.com" @@ -4731,6 +4730,11 @@ { "name": "Thibaud Fabre", "email": "thibaud@aztech.io" + }, + { + "name": "Ben Ramsey", + "email": "ben@benramsey.com", + "homepage": "https://benramsey.com" } ], "description": "Formerly rhumsaa/uuid. A PHP 5.4+ library for generating RFC 4122 version 1, 3, 4, and 5 universally unique identifiers (UUID).", @@ -7307,6 +7311,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" }, {