Skip to content

Commit 43bc8de

Browse files
authored
Merge pull request #7574 from magento-atwix-pyrrans/delivery-bunch-w16
[Pyrrans] Delivery bunch 2022`W16
2 parents ac0c588 + 94e47ea commit 43bc8de

File tree

10 files changed

+289
-241
lines changed

10 files changed

+289
-241
lines changed

app/code/Magento/Cookie/view/base/web/js/jquery.storageapi.extended.js

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -5,7 +5,7 @@
55

66
define([
77
'jquery',
8-
'jquery/jquery.cookie',
8+
'js-cookie/cookie-wrapper',
99
'jquery/jquery.storageapi.min'
1010
], function ($) {
1111
'use strict';

app/code/Magento/Theme/view/base/requirejs-config.js

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -47,7 +47,8 @@ var config = {
4747
'jquery-ui-modules/widget': 'jquery/ui-modules/widget',
4848
'jquery-ui-modules/timepicker': 'jquery/timepicker',
4949
'vimeo': 'vimeo/player',
50-
'vimeoWrapper': 'vimeo/vimeo-wrapper'
50+
'vimeoWrapper': 'vimeo/vimeo-wrapper',
51+
'jquery/jquery.cookie': 'js-cookie/cookie-wrapper'
5152
}
5253
},
5354
shim: {

composer.json

Lines changed: 9 additions & 9 deletions
Original file line numberDiff line numberDiff line change
@@ -36,27 +36,27 @@
3636
"lib-libxml": "*",
3737
"colinmollenhour/cache-backend-file": "~1.4.1",
3838
"colinmollenhour/cache-backend-redis": "1.14.2",
39-
"colinmollenhour/credis": "1.12.2",
39+
"colinmollenhour/credis": "1.13.0",
4040
"colinmollenhour/php-redis-session-abstract": "~1.4.5",
4141
"composer/composer": "^1.9 || ^2.0",
4242
"elasticsearch/elasticsearch": "~7.17.0",
4343
"guzzlehttp/guzzle": "^7.4.2",
4444
"laminas/laminas-captcha": "^2.12",
4545
"laminas/laminas-code": "~4.5.0",
46-
"laminas/laminas-db": "^2.13.4",
46+
"laminas/laminas-db": "^2.15.0",
4747
"laminas/laminas-dependency-plugin": "^2.2.0",
4848
"laminas/laminas-di": "^3.4.0",
4949
"laminas/laminas-escaper": "~2.10.0",
50-
"laminas/laminas-eventmanager": "^3.4.0",
51-
"laminas/laminas-feed": "^2.15.0",
50+
"laminas/laminas-eventmanager": "^3.5.0",
51+
"laminas/laminas-feed": "^2.17.0",
5252
"laminas/laminas-http": "^2.15.0",
5353
"laminas/laminas-json": "^3.3.0",
5454
"laminas/laminas-mail": "^2.16.0",
5555
"laminas/laminas-mime": "^2.9.1",
5656
"laminas/laminas-modulemanager": "^2.11.0",
5757
"laminas/laminas-mvc": "^3.3.3",
5858
"laminas/laminas-server": "^2.11.1",
59-
"laminas/laminas-servicemanager": "^3.10.0",
59+
"laminas/laminas-servicemanager": "^3.11.0",
6060
"laminas/laminas-soap": "^2.10.0",
6161
"laminas/laminas-stdlib": "^3.7.1",
6262
"laminas/laminas-uri": "^2.9.1",
@@ -67,7 +67,7 @@
6767
"magento/composer-dependency-version-audit-plugin": "~0.1",
6868
"magento/magento-composer-installer": ">=0.3.0",
6969
"magento/zendframework1": "~1.15.0",
70-
"monolog/monolog": "^2.3",
70+
"monolog/monolog": "^2.5",
7171
"pelago/emogrifier": "^6.0.0",
7272
"php-amqplib/php-amqplib": "~3.2.0",
7373
"phpseclib/mcrypt_compat": "~2.0.2",
@@ -79,7 +79,7 @@
7979
"tedivm/jshrink": "~1.4.0",
8080
"tubalmartin/cssmin": "4.1.1",
8181
"web-token/jwt-framework": "^v2.2.7",
82-
"webonyx/graphql-php": "~14.11.5",
82+
"webonyx/graphql-php": "~14.11.6",
8383
"wikimedia/less.php": "^3.0.0"
8484
},
8585
"require-dev": {
@@ -90,8 +90,8 @@
9090
"magento/magento-coding-standard": "*",
9191
"magento/magento2-functional-testing-framework": "^3.7",
9292
"pdepend/pdepend": "~2.10.0",
93-
"phpmd/phpmd": "^2.9.1",
94-
"phpstan/phpstan": "~1.4.9",
93+
"phpmd/phpmd": "^2.12.0",
94+
"phpstan/phpstan": "^1.5.7",
9595
"phpunit/phpunit": "~9.5.20",
9696
"sebastian/phpcpd": "^6.0.3",
9797
"squizlabs/php_codesniffer": "~3.6.0",

0 commit comments

Comments
 (0)