Skip to content

Commit 5d4cb12

Browse files
oshmyheliukoshmyheliuk
authored
Merge pull request #5 from magento-commerce/develop
MCLOUD-7111: Cloud Patches v1.0.7 release
2 parents 10ea637 + 8b70b5b commit 5d4cb12

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

49 files changed

+895
-268
lines changed

‎.travis.yml

Lines changed: 18 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -20,10 +20,6 @@ jobs:
2020
include:
2121
- stage: static-unit
2222
script: ./tests/travis/static-unit.sh;
23-
php: '7.0'
24-
env:
25-
- TEST_SUITE=static-unit
26-
- script: ./tests/travis/static-unit.sh;
2723
php: '7.1'
2824
env:
2925
- TEST_SUITE=static-unit
@@ -50,6 +46,10 @@ jobs:
5046
- php: '7.3'
5147
env:
5248
- TEST_SUITE=functional-ee
49+
- php: '7.4'
50+
dist: bionic
51+
env:
52+
- TEST_SUITE=functional-ee
5353
- php: '7.1'
5454
env:
5555
- TEST_SUITE=functional-ce
@@ -64,12 +64,26 @@ jobs:
6464
- php: '7.3'
6565
env:
6666
- TEST_SUITE=functional-ce
67+
- php: '7.4'
68+
dist: bionic
69+
env:
70+
- TEST_SUITE=functional-ce
71+
72+
before_install:
73+
# https://github.com/kylekatarnls/update-helper/issues/9
74+
- if [ -n "${COMPOSER_VERSION}" ]; then travis_retry composer self-update ${COMPOSER_VERSION}; fi;
6775

6876
install:
6977
- composer config http-basic.repo.magento.com ${REPO_USERNAME_CE} ${REPO_PASSWORD_CE}
7078
- composer config github-oauth.github.com ${GITHUB_TOKEN}
7179
- if [ -n "${MCD_VERSION}" ] && [ $TRAVIS_PHP_VERSION != "7.0" ]; then composer config repositories.mcd git [email protected]:magento/magento-cloud-docker.git && composer require "magento/magento-cloud-docker:${MCD_VERSION}" --no-update; fi;
7280
- if [ -n "${MQP_VERSION}" ]; then composer config repositories.mqp git [email protected]:magento/quality-patches.git && composer require "magento/quality-patches:${MQP_VERSION}" --no-update; fi;
81+
- if [ -n "${MCC_VERSION}" ]; then composer config repositories.mcc git [email protected]:magento/magento-cloud-components.git && composer require "magento/magento-cloud-components:${MCC_VERSION}" --no-update; fi;
82+
- if [ -n "${ECE_VERSION}" ]; then composer config repositories.ece git [email protected]:magento/ece-tools.git && composer require "magento/ece-tools:${ECE_VERSION}" --no-update; fi;
83+
- composer config repositories.magento composer https://repo.magento.com/
84+
- composer require "magento/framework:*" --no-update
85+
- composer require "magento/module-store:*" --no-update
86+
- composer require "magento/module-url-rewrite:*" --no-update
7387
- composer update -n --no-suggest
7488

7589
before_script:

‎composer.json

Lines changed: 5 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -2,21 +2,21 @@
22
"name": "magento/magento-cloud-patches",
33
"description": "Provides critical fixes for Magento 2 Enterprise Edition",
44
"type": "magento2-component",
5-
"version": "1.0.6",
5+
"version": "1.0.7",
66
"license": "OSL-3.0",
77
"require": {
88
"php": "^7.0",
99
"ext-json": "*",
1010
"composer/composer": "@stable",
1111
"composer/semver": "^1.5",
12-
"symfony/config": "^3.3||^4.4",
12+
"symfony/config": "^3.3||^4.4||^5.1",
1313
"symfony/console": "^2.6||^4.0",
14-
"symfony/dependency-injection": "^3.3||^4.3",
14+
"symfony/dependency-injection": "^3.3||^4.3||^5.1",
1515
"symfony/process": "^2.1||^4.1",
16-
"symfony/proxy-manager-bridge": "^3.3||^4.3",
16+
"symfony/proxy-manager-bridge": "^3.3||^4.3||^5.1",
1717
"symfony/yaml": "^3.3||^4.0",
1818
"monolog/monolog": "^1.16",
19-
"magento/quality-patches": "^1.0.0"
19+
"magento/quality-patches": "^1.0.6"
2020
},
2121
"require-dev": {
2222
"codeception/codeception": "^2.5.3",

‎config/services.xml

Lines changed: 11 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -27,6 +27,11 @@
2727
<service id="Magento\CloudPatches\Patch\Pool\RequiredPool" lazy="true"/>
2828
<service id="Magento\CloudPatches\Patch\Pool\LocalPool" lazy="true"/>
2929
<service id="Magento\CloudPatches\Patch\Status\StatusPool" autowire="false"/>
30+
<service id="Magento\CloudPatches\Patch\PatchCommandNotFound" autowire="false"/>
31+
<service id="Magento\CloudPatches\Patch\PatchCommandException" autowire="false"/>
32+
<service id="Magento\CloudPatches\Shell\Command\DriverException" autowire="false"/>
33+
<service id="Magento\CloudPatches\Patch\PatchCommand" autowire="false"/>
34+
<service id="Magento\CloudPatches\Patch\PatchCommandInterface" alias="Magento\CloudPatches\Patch\PatchCommand"/>
3035
<service id="statusPool" class="Magento\CloudPatches\Patch\Status\StatusPool" lazy="true">
3136
<argument key="$resolvers" type="collection">
3237
<argument type="service" id="Magento\CloudPatches\Patch\Status\LocalResolver"/>
@@ -76,5 +81,11 @@
7681
<argument key="$actionPool" type="service" id="ApplyOptionalActionPool"/>
7782
</service>
7883
<service id="Magento\CloudPatches\Patch\PatchBuilder" shared="false"/>
84+
<service id="Magento\CloudPatches\Patch\PatchCommand">
85+
<argument key="$drivers" type="collection">
86+
<argument type="service" id="Magento\CloudPatches\Shell\Command\GitDriver"/>
87+
<argument type="service" id="Magento\CloudPatches\Shell\Command\PatchDriver"/>
88+
</argument>
89+
</service>
7990
</services>
8091
</container>

‎patches.json

Lines changed: 7 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -254,7 +254,8 @@
254254
"2.3.3": "MCLOUD-6139_MCLOUD-6211__redis_improvement_patches__2.3.3.patch",
255255
">=2.3.3-p1 <2.3.4": "MCLOUD-6139_MCLOUD-6211__redis_improvement_patches__2.3.3-p1.patch",
256256
">=2.3.4 <2.3.5": "MCLOUD-6139_MCLOUD-6211__redis_improvement_patches__2.3.4.patch",
257-
">=2.3.5 <2.3.6": "MCLOUD-6211__redis_improvement_patches__2.3.5.patch"
257+
">=2.3.5 <2.3.6": "MCLOUD-6211__redis_improvement_patches__2.3.5.patch",
258+
">=2.4.0 <2.4.1": "MCLOUD-6659__fix_L2_redis_cache__2.4.0.patch"
258259
}
259260
},
260261
"magento/module-paypal": {
@@ -334,6 +335,11 @@
334335
"3.4.1": "BUNDLE-2554__set_payment_info_bug_fix__3.4.1.patch"
335336
}
336337
},
338+
"paypal/module-braintree-core": {
339+
"Fix Braintree Settlement report error": {
340+
"4.1.0": "BUNDLE-2683__braintree_settlement_report_fix__4.1.0.patch"
341+
}
342+
},
337343
"magento/magento2-ee-base": {
338344
"Fix pagebuilder module": {
339345
"2.3.1": "PB-319__fix_pagebuilder_module__2.3.1.patch",

‎patches/BUNDLE-2683__braintree_settlement_report_fix__4.1.0.patch

Lines changed: 12 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,12 @@
1+
diff -Naur a/vendor/paypal/module-braintree-core/Ui/Component/Report/Listing/Column/PaymentType.php b/vendor/paypal/module-braintree-core/Ui/Component/Report/Listing/Column/PaymentType.php
2+
--- a/vendor/paypal/module-braintree-core/Ui/Component/Report/Listing/Column/PaymentType.php
3+
+++ b/vendor/paypal/module-braintree-core/Ui/Component/Report/Listing/Column/PaymentType.php
4+
@@ -44,8 +44,6 @@ private function getAvailablePaymentTypes(): array
5+
// @codingStandardsIgnoreStart
6+
return [
7+
PaymentInstrumentType::PAYPAL_ACCOUNT => __(PaymentInstrumentType::PAYPAL_ACCOUNT),
8+
- PaymentInstrumentType::COINBASE_ACCOUNT => __(PaymentInstrumentType::COINBASE_ACCOUNT),
9+
- PaymentInstrumentType::EUROPE_BANK_ACCOUNT => __(PaymentInstrumentType::EUROPE_BANK_ACCOUNT),
10+
PaymentInstrumentType::CREDIT_CARD => __(PaymentInstrumentType::CREDIT_CARD),
11+
PaymentInstrumentType::APPLE_PAY_CARD => __(PaymentInstrumentType::APPLE_PAY_CARD),
12+
PaymentInstrumentType::ANDROID_PAY_CARD => __(PaymentInstrumentType::ANDROID_PAY_CARD)

‎patches/MCLOUD-6139_MCLOUD-6211__redis_improvement_patches__2.3.0.patch

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1798,7 +1798,7 @@ diff -Nuar a/vendor/magento/framework/Cache/Backend/RemoteSynchronizedCache.php
17981798
+ $dataToSave = $data;
17991799
+ $remHash = $this->loadRemoteDataVersion($id);
18001800
+
1801-
+ if ($remHash !== false) {
1801+
+ if ($remHash !== false && $this->getDataVersion($data) === $remHash) {
18021802
+ $dataToSave = $this->remote->load($id);
18031803
+ } else {
18041804
+ $this->remote->save($data, $id, $tags, $specificLifetime);

‎patches/MCLOUD-6139_MCLOUD-6211__redis_improvement_patches__2.3.1.patch

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1742,7 +1742,7 @@ diff -Nuar a/vendor/magento/framework/Cache/Backend/RemoteSynchronizedCache.php
17421742
+ $dataToSave = $data;
17431743
+ $remHash = $this->loadRemoteDataVersion($id);
17441744
+
1745-
+ if ($remHash !== false) {
1745+
+ if ($remHash !== false && $this->getDataVersion($data) === $remHash) {
17461746
+ $dataToSave = $this->remote->load($id);
17471747
+ } else {
17481748
+ $this->remote->save($data, $id, $tags, $specificLifetime);

‎patches/MCLOUD-6139_MCLOUD-6211__redis_improvement_patches__2.3.2.patch

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -843,7 +843,7 @@ diff -Nuar a/vendor/magento/framework/Cache/Backend/RemoteSynchronizedCache.php
843843
+ $dataToSave = $data;
844844
+ $remHash = $this->loadRemoteDataVersion($id);
845845
+
846-
+ if ($remHash !== false) {
846+
+ if ($remHash !== false && $this->getDataVersion($data) === $remHash) {
847847
+ $dataToSave = $this->remote->load($id);
848848
+ } else {
849849
+ $this->remote->save($data, $id, $tags, $specificLifetime);

‎patches/MCLOUD-6139_MCLOUD-6211__redis_improvement_patches__2.3.3-p1.patch

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -844,7 +844,7 @@ diff -Nuar a/vendor/magento/framework/Cache/Backend/RemoteSynchronizedCache.php
844844
+ $dataToSave = $data;
845845
+ $remHash = $this->loadRemoteDataVersion($id);
846846
+
847-
+ if ($remHash !== false) {
847+
+ if ($remHash !== false && $this->getDataVersion($data) === $remHash) {
848848
+ $dataToSave = $this->remote->load($id);
849849
+ } else {
850850
+ $this->remote->save($data, $id, $tags, $specificLifetime);

‎patches/MCLOUD-6139_MCLOUD-6211__redis_improvement_patches__2.3.3.patch

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -844,7 +844,7 @@ diff -Nuar a/vendor/magento/framework/Cache/Backend/RemoteSynchronizedCache.php
844844
+ $dataToSave = $data;
845845
+ $remHash = $this->loadRemoteDataVersion($id);
846846
+
847-
+ if ($remHash !== false) {
847+
+ if ($remHash !== false && $this->getDataVersion($data) === $remHash) {
848848
+ $dataToSave = $this->remote->load($id);
849849
+ } else {
850850
+ $this->remote->save($data, $id, $tags, $specificLifetime);

0 commit comments

Comments
 (0)