Merge branch '2.4-develop' into 2.4-develop

Author: pavel77718

app/code/Magento/Captcha/composer.json

@@ -14,7 +14,7 @@
         "magento/module-store": "*",
         "magento/module-authorization": "*",
         "laminas/laminas-captcha": "^2.18",
-        "magento/laminas-db": "^1.0.0"
+        "magento/magento-zf-db": "^3.21"
     },
     "type": "magento2-module",
     "license": [

composer.json

@@ -16,12 +16,6 @@
         "preferred-install": "dist",
         "sort-packages": true
     },
-    "repositories": [
-        {
-            "type": "composer",
-            "url": "https://repo.magento.com/"
-        }
-    ],
     "require": {
         "php": "~8.2.0||~8.3.0||~8.4.0",
         "ext-bcmath": "*",
@@ -54,8 +48,8 @@
         "guzzlehttp/guzzle": "^7.5",
         "laminas/laminas-captcha": "^2.18",
         "laminas/laminas-code": "^4.13",
-        "magento/laminas-db": "^1.0.0",
-        "magento/laminas-di": "^1.0.0",
+        "magento/magento-zf-db": "^3.21",
+        "laminas/laminas-di": "^3.15",
         "laminas/laminas-escaper": "^2.13",
         "laminas/laminas-eventmanager": "^3.11",
         "laminas/laminas-feed": "^2.22",
@@ -96,15 +90,14 @@
         "tubalmartin/cssmin": "^4.1",
         "web-token/jwt-framework": "^3.4",
         "webonyx/graphql-php": "^15.0",
-        "wikimedia/less.php": "^5.0",
-        "magento/ringphp": "^1.0.0"
+        "wikimedia/less.php": "^5.0"
     },
     "require-dev": {
-        "magento/allure-phpunit": "^1.0.0",
+        "magento/magento-allure-phpunit": "^3.0",
         "dealerdirect/phpcodesniffer-composer-installer": "^0.7 || ^1.0",
         "dg/bypass-finals": "^1.4",
         "friendsofphp/php-cs-fixer": "^3.22",
-        "magento/oauth": "^1.0.0",
+        "carlos-mg89/oauth": "^0.8.17",
         "magento/magento-coding-standard": "*",
         "magento/magento2-functional-testing-framework": "^5.0",
         "pdepend/pdepend": "3.x-dev",