Skip to content

Commit e11b3bc

Browse files
glo71317glo71317
committed
Resolve the conflicts
2 parents a6569b8 + ffe280c commit e11b3bc

File tree

8 files changed

+81
-84
lines changed

8 files changed

+81
-84
lines changed

‎app/code/Magento/Checkout/Test/Mftf/ActionGroup/AssertMiniCartEmptyActionGroup.xml‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -16,6 +16,6 @@
1616
<wait stepKey="waitForMinicartAjaxCallToComplete" time="15"/>
1717
<dontSeeElement selector="{{StorefrontMinicartSection.productCount}}" stepKey="dontSeeMinicartProductCount"/>
1818
<click selector="{{StorefrontMinicartSection.showCart}}" stepKey="expandMinicart"/>
19-
<see selector="{{StorefrontMinicartSection.minicartContent}}" userInput="You have no items in your shopping cart." stepKey="seeEmptyCartMessage"/>
19+
<see selector="{{StorefrontMinicartSection.messageEmptyCart}}" userInput="You have no items in your shopping cart." stepKey="seeEmptyCartMessage"/>
2020
</actionGroup>
2121
</actionGroups>

‎app/code/Magento/Elasticsearch7/composer.json‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -5,7 +5,7 @@
55
"php": "~8.1.0||~8.2.0",
66
"magento/framework": "*",
77
"magento/module-elasticsearch": "*",
8-
"elasticsearch/elasticsearch": "~7.17.0",
8+
"elasticsearch/elasticsearch": "^7.17",
99
"magento/module-advanced-search": "*",
1010
"magento/module-catalog-search": "*",
1111
"magento/module-search": "*"

‎app/code/Magento/GraphQl/composer.json‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -9,7 +9,7 @@
99
"magento/module-webapi": "*",
1010
"magento/module-new-relic-reporting": "*",
1111
"magento/module-authorization": "*",
12-
"webonyx/graphql-php": "~14.11.5"
12+
"webonyx/graphql-php": "^14.11"
1313
},
1414
"suggest": {
1515
"magento/module-graph-ql-cache": "*"

‎app/code/Magento/OpenSearch/composer.json‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -9,7 +9,7 @@
99
"magento/module-elasticsearch": "*",
1010
"magento/module-search": "*",
1111
"magento/module-config": "*",
12-
"opensearch-project/opensearch-php": "~1.0.0 || ^2.0.0"
12+
"opensearch-project/opensearch-php": "^1.0 || ^2.0"
1313
},
1414
"type": "magento2-module",
1515
"license": [

‎app/code/Magento/RemoteStorage/composer.json‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -4,8 +4,8 @@
44
"require": {
55
"php": "~8.1.0||~8.2.0",
66
"magento/framework": "*",
7-
"league/flysystem": "~2.4.3",
8-
"league/flysystem-aws-s3-v3": "^2.4.3"
7+
"league/flysystem": "^2.4",
8+
"league/flysystem-aws-s3-v3": "^2.4"
99
},
1010
"suggest": {
1111
"magento/module-backend": "*",

‎composer.json‎

Lines changed: 44 additions & 44 deletions
Original file line numberDiff line numberDiff line change
@@ -34,45 +34,45 @@
3434
"ext-xsl": "*",
3535
"ext-zip": "*",
3636
"lib-libxml": "*",
37-
"colinmollenhour/cache-backend-file": "~1.4.1",
38-
"colinmollenhour/cache-backend-redis": "1.14.2",
39-
"colinmollenhour/credis": "1.13.0",
40-
"colinmollenhour/php-redis-session-abstract": "v1.5.0",
37+
"colinmollenhour/cache-backend-file": "^1.4",
38+
"colinmollenhour/cache-backend-redis": "^1.14",
39+
"colinmollenhour/credis": "^1.13",
40+
"colinmollenhour/php-redis-session-abstract": "^1.5",
4141
"composer/composer": "^2.0, !=2.2.16",
42-
"elasticsearch/elasticsearch": "~7.17.0",
42+
"elasticsearch/elasticsearch": "^7.17",
4343
"ezyang/htmlpurifier": "^4.14",
44-
"guzzlehttp/guzzle": "^7.4.2",
44+
"guzzlehttp/guzzle": "^7.4",
4545
"laminas/laminas-captcha": "^2.12",
46-
"laminas/laminas-code": "~4.5.0",
47-
"laminas/laminas-db": "^2.15.0",
48-
"laminas/laminas-dependency-plugin": "^2.2.0",
49-
"laminas/laminas-di": "^3.7.0",
50-
"laminas/laminas-escaper": "^2.12",
51-
"laminas/laminas-eventmanager": "^3.5.0",
52-
"laminas/laminas-feed": "^2.17.0",
53-
"laminas/laminas-file": "^2.11.0",
54-
"laminas/laminas-filter": "^2.23",
55-
"laminas/laminas-http": "^2.15.0",
56-
"laminas/laminas-i18n": "^2.17.0",
57-
"laminas/laminas-mail": "^2.19",
58-
"laminas/laminas-mime": "^2.9.1",
59-
"laminas/laminas-modulemanager": "^2.11.0",
60-
"laminas/laminas-mvc": "^3.5",
46+
"laminas/laminas-code": "^4.5",
47+
"laminas/laminas-db": "^2.15",
48+
"laminas/laminas-dependency-plugin": "^2.5",
49+
"laminas/laminas-di": "^3.7",
50+
"laminas/laminas-escaper": "^2.10",
51+
"laminas/laminas-eventmanager": "^3.5",
52+
"laminas/laminas-feed": "^2.17",
53+
"laminas/laminas-file": "^2.11",
54+
"laminas/laminas-filter": "^2.17",
55+
"laminas/laminas-http": "^2.15",
56+
"laminas/laminas-i18n": "^2.17",
57+
"laminas/laminas-mail": "^2.16",
58+
"laminas/laminas-mime": "^2.9",
59+
"laminas/laminas-modulemanager": "^2.11",
60+
"laminas/laminas-mvc": "^3.3",
6161
"laminas/laminas-oauth": "^2.4",
62-
"laminas/laminas-permissions-acl": "^2.10.0",
63-
"laminas/laminas-servicemanager": "^3.16.0",
64-
"laminas/laminas-soap": "^2.10.0",
65-
"laminas/laminas-stdlib": "^3.11.0",
66-
"laminas/laminas-uri": "^2.9.1",
67-
"laminas/laminas-validator": "^2.23.0",
68-
"league/flysystem": "~2.4.5",
69-
"league/flysystem-aws-s3-v3": "^2.4.3",
70-
"magento/composer": "~1.9.0-beta1",
71-
"magento/composer-dependency-version-audit-plugin": "~0.1",
62+
"laminas/laminas-permissions-acl": "^2.10",
63+
"laminas/laminas-servicemanager": "^3.16",
64+
"laminas/laminas-soap": "^2.10",
65+
"laminas/laminas-stdlib": "^3.11",
66+
"laminas/laminas-uri": "^2.9",
67+
"laminas/laminas-validator": "^2.23",
68+
"league/flysystem": "^2.4",
69+
"league/flysystem-aws-s3-v3": "^2.4",
70+
"magento/composer": "^1.9.0-beta1",
71+
"magento/composer-dependency-version-audit-plugin": "^0.1",
7272
"magento/magento-composer-installer": ">=0.4.0-beta1",
73-
"magento/zendframework1": "~1.15.0",
73+
"magento/zendframework1": "^1.15",
7474
"monolog/monolog": "^2.7",
75-
"opensearch-project/opensearch-php": "~1.0.0 || ^2.0.0",
75+
"opensearch-project/opensearch-php": "^1.0 || ^2.0",
7676
"pelago/emogrifier": "^6.0.0",
7777
"php-amqplib/php-amqplib": "~3.2.0",
7878
"phpseclib/mcrypt_compat": "~2.0.2",
@@ -89,19 +89,19 @@
8989
"wikimedia/less.php": "^3.0.0"
9090
},
9191
"require-dev": {
92-
"allure-framework/allure-phpunit": "~1.5.0",
93-
"dealerdirect/phpcodesniffer-composer-installer": "^0.7.2",
94-
"friendsofphp/php-cs-fixer": "~3.8.0",
95-
"lusitanian/oauth": "~0.8.10",
92+
"allure-framework/allure-phpunit": "^1.5",
93+
"dealerdirect/phpcodesniffer-composer-installer": "^0.7",
94+
"friendsofphp/php-cs-fixer": "^3.8",
95+
"lusitanian/oauth": "^0.8",
9696
"magento/magento-coding-standard": "*",
9797
"magento/magento2-functional-testing-framework": "^3.10",
98-
"pdepend/pdepend": "^2.12",
99-
"phpmd/phpmd": "^2.13",
100-
"phpstan/phpstan": "^1.6.8",
101-
"phpunit/phpunit": "~9.5.20",
102-
"sebastian/phpcpd": "^6.0.3",
103-
"squizlabs/php_codesniffer": "~3.6.0",
104-
"symfony/finder": "^5.4.8"
98+
"pdepend/pdepend": "^2.10",
99+
"phpmd/phpmd": "^2.12",
100+
"phpstan/phpstan": "^1.7",
101+
"phpunit/phpunit": "^9.5",
102+
"sebastian/phpcpd": "^6.0",
103+
"squizlabs/php_codesniffer": "^3.6",
104+
"symfony/finder": "^5.4"
105105
},
106106
"suggest": {
107107
"ext-pcntl": "Need for run processes in parallel mode"

‎composer.lock‎

Lines changed: 8 additions & 10 deletions
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

‎lib/internal/Magento/Framework/composer.json‎

Lines changed: 23 additions & 24 deletions
Original file line numberDiff line numberDiff line change
@@ -23,34 +23,33 @@
2323
"ext-sodium": "*",
2424
"ext-xsl": "*",
2525
"lib-libxml": "*",
26-
"colinmollenhour/php-redis-session-abstract": "v1.5.0",
26+
"colinmollenhour/php-redis-session-abstract": "^1.5",
2727
"composer/composer": "^2.0, !=2.2.16",
2828
"ezyang/htmlpurifier": "^4.14",
29-
"guzzlehttp/guzzle": "^7.4.2",
30-
"laminas/laminas-code": "~4.5.0",
31-
"laminas/laminas-escaper": "^2.12",
32-
"laminas/laminas-file": "^2.11.0",
33-
"laminas/laminas-filter": "^2.23",
34-
"laminas/laminas-http": "^2.15.0",
35-
"laminas/laminas-i18n": "^2.17.0",
36-
"laminas/laminas-mail": "^2.19",
37-
"laminas/laminas-mime": "^2.9.1",
38-
"laminas/laminas-permissions-acl": "^2.10.0",
39-
"laminas/laminas-stdlib": "^3.11.0",
29+
"guzzlehttp/guzzle": "^7.4",
30+
"laminas/laminas-code": "^4.5",
31+
"laminas/laminas-escaper": "^2.10",
32+
"laminas/laminas-file": "^2.11",
33+
"laminas/laminas-filter": "^2.17",
34+
"laminas/laminas-http": "^2.15",
35+
"laminas/laminas-i18n": "^2.17",
36+
"laminas/laminas-mail": "^2.16",
37+
"laminas/laminas-mime": "^2.9",
38+
"laminas/laminas-permissions-acl": "^2.10",
39+
"laminas/laminas-stdlib": "^3.11",
4040
"laminas/laminas-oauth": "^2.4",
41-
"laminas/laminas-uri": "^2.9.1",
42-
"laminas/laminas-validator": "^2.23.0",
43-
"magento/composer-dependency-version-audit-plugin": "~0.1",
44-
"magento/zendframework1": "~1.15.0",
41+
"laminas/laminas-uri": "^2.9",
42+
"laminas/laminas-validator": "^2.23",
43+
"magento/composer-dependency-version-audit-plugin": "^0.1",
44+
"magento/zendframework1": "^1.15",
4545
"monolog/monolog": "^2.7",
46-
"ramsey/uuid": "~4.2.0",
47-
"symfony/console": "~5.4.12",
48-
"symfony/string": "~5.4.12",
49-
"symfony/intl": "~5.4.11",
50-
"symfony/process": "~5.4.8",
51-
"tedivm/jshrink": "~1.4.0",
52-
"webonyx/graphql-php": "~14.11.6",
53-
"wikimedia/less.php": "^3.0.0"
46+
"ramsey/uuid": "^4.2",
47+
"symfony/console": "^5.4",
48+
"symfony/intl": "^5.4",
49+
"symfony/process": "^5.4",
50+
"tedivm/jshrink": "^1.4",
51+
"webonyx/graphql-php": "^14.11",
52+
"wikimedia/less.php": "^3.0"
5453
},
5554
"archive": {
5655
"exclude": [

0 commit comments

Comments
 (0)