Merge branch '2.4-develop' into fix/remove-prototype

magento · Apr 28, 2022 · 837a3b7 · 837a3b7
2 parents 656289b + fa7009c
commit 837a3b7
Show file tree

Hide file tree

Showing 10 changed files with 305 additions and 257 deletions.
diff --git a/app/code/Magento/Cookie/view/base/web/js/jquery.storageapi.extended.js b/app/code/Magento/Cookie/view/base/web/js/jquery.storageapi.extended.js
@@ -5,7 +5,7 @@
 
 define([
     'jquery',
-    'jquery/jquery.cookie',
+    'js-cookie/cookie-wrapper',
     'jquery/jquery.storageapi.min'
 ], function ($) {
     'use strict';

diff --git a/app/code/Magento/Theme/view/base/requirejs-config.js b/app/code/Magento/Theme/view/base/requirejs-config.js
@@ -47,7 +47,8 @@ var config = {
             'jquery-ui-modules/widget': 'jquery/ui-modules/widget',
             'jquery-ui-modules/timepicker': 'jquery/timepicker',
             'vimeo': 'vimeo/player',
-            'vimeoWrapper': 'vimeo/vimeo-wrapper'
+            'vimeoWrapper': 'vimeo/vimeo-wrapper',
+            'jquery/jquery.cookie': 'js-cookie/cookie-wrapper'
         }
     },
     shim: {

diff --git a/composer.json b/composer.json
@@ -36,27 +36,27 @@
         "lib-libxml": "*",
         "colinmollenhour/cache-backend-file": "~1.4.1",
         "colinmollenhour/cache-backend-redis": "1.14.2",
-        "colinmollenhour/credis": "1.12.2",
+        "colinmollenhour/credis": "1.13.0",
         "colinmollenhour/php-redis-session-abstract": "~1.4.5",
         "composer/composer": "^1.9 || ^2.0",
         "elasticsearch/elasticsearch": "~7.17.0",
         "guzzlehttp/guzzle": "^7.4.2",
         "laminas/laminas-captcha": "^2.12",
         "laminas/laminas-code": "~4.5.0",
-        "laminas/laminas-db": "^2.13.4",
+        "laminas/laminas-db": "^2.15.0",
         "laminas/laminas-dependency-plugin": "^2.2.0",
         "laminas/laminas-di": "^3.4.0",
         "laminas/laminas-escaper": "~2.10.0",
-        "laminas/laminas-eventmanager": "^3.4.0",
-        "laminas/laminas-feed": "^2.15.0",
+        "laminas/laminas-eventmanager": "^3.5.0",
+        "laminas/laminas-feed": "^2.17.0",
         "laminas/laminas-http": "^2.15.0",
         "laminas/laminas-json": "^3.3.0",
         "laminas/laminas-mail": "^2.16.0",
         "laminas/laminas-mime": "^2.9.1",
         "laminas/laminas-modulemanager": "^2.11.0",
         "laminas/laminas-mvc": "^3.3.3",
         "laminas/laminas-server": "^2.11.1",
-        "laminas/laminas-servicemanager": "^3.10.0",
+        "laminas/laminas-servicemanager": "^3.11.0",
         "laminas/laminas-soap": "^2.10.0",
         "laminas/laminas-stdlib": "^3.7.1",
         "laminas/laminas-uri": "^2.9.1",
@@ -67,7 +67,7 @@
         "magento/composer-dependency-version-audit-plugin": "~0.1",
         "magento/magento-composer-installer": ">=0.3.0",
         "magento/zendframework1": "~1.15.0",
-        "monolog/monolog": "^2.3",
+        "monolog/monolog": "^2.5",
         "pelago/emogrifier": "^6.0.0",
         "php-amqplib/php-amqplib": "~3.2.0",
         "phpseclib/mcrypt_compat": "~2.0.2",
@@ -79,7 +79,7 @@
         "tedivm/jshrink": "~1.4.0",
         "tubalmartin/cssmin": "4.1.1",
         "web-token/jwt-framework": "^v2.2.7",
-        "webonyx/graphql-php": "~14.11.5",
+        "webonyx/graphql-php": "~14.11.6",
         "wikimedia/less.php": "^3.0.0"
     },
     "require-dev": {
@@ -90,8 +90,8 @@
         "magento/magento-coding-standard": "*",
         "magento/magento2-functional-testing-framework": "^3.7",
         "pdepend/pdepend": "~2.10.0",
-        "phpmd/phpmd": "^2.9.1",
-        "phpstan/phpstan": "~1.4.9",
+        "phpmd/phpmd": "^2.12.0",
+        "phpstan/phpstan": "^1.5.7",
         "phpunit/phpunit": "~9.5.20",
         "sebastian/phpcpd": "^6.0.3",
         "squizlabs/php_codesniffer": "~3.6.0",