Skip to content

Commit fb2af53

Browse files
shiftedrealityshiftedreality
authored
Merge pull request #66 from magento/develop-bcp
Develiver develop branch into 1.0
2 parents 7da8f36 + aaaa16d commit fb2af53

File tree

158 files changed

+22288
-1291
lines changed

Some content is hidden

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

158 files changed

+22288
-1291
lines changed

‎.travis.yml

Lines changed: 11 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -39,6 +39,11 @@ jobs:
3939
php: '7.1'
4040
env:
4141
- TEST_SUITE=functional-ee
42+
- PART_INDEX=1
43+
- php: '7.1'
44+
env:
45+
- TEST_SUITE=functional-ee
46+
- PART_INDEX=2
4247
- php: '7.2'
4348
env:
4449
- TEST_SUITE=functional-ee
@@ -48,6 +53,11 @@ jobs:
4853
- php: '7.1'
4954
env:
5055
- TEST_SUITE=functional-ce
56+
- PART_INDEX=1
57+
- php: '7.1'
58+
env:
59+
- TEST_SUITE=functional-ce
60+
- PART_INDEX=2
5161
- php: '7.2'
5262
env:
5363
- TEST_SUITE=functional-ce
@@ -59,6 +69,7 @@ install:
5969
- composer config http-basic.repo.magento.com ${REPO_USERNAME_CE} ${REPO_PASSWORD_CE}
6070
- composer config github-oauth.github.com ${GITHUB_TOKEN}
6171
- 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;
72+
- 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;
6273
- composer update -n --no-suggest
6374

6475
before_script:

‎bin/ece-patches

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -4,7 +4,8 @@
44
* Copyright © Magento, Inc. All rights reserved.
55
* See COPYING.txt for license details.
66
*/
7+
define('IS_CLOUD', true);
78
$container = require __DIR__ . '/../bootstrap.php';
89

9-
$application = new Magento\CloudPatches\Application($container);
10+
$application = new Magento\CloudPatches\ApplicationEce($container);
1011
$application->run();

‎bin/magento-patches

Lines changed: 10 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,10 @@
1+
#!/usr/bin/env php
2+
<?php
3+
/**
4+
* Copyright © Magento, Inc. All rights reserved.
5+
* See COPYING.txt for license details.
6+
*/
7+
$container = require __DIR__ . '/../bootstrap.php';
8+
9+
$application = new Magento\CloudPatches\Application($container);
10+
$application->run();

‎codeception.dist.yml

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -20,6 +20,8 @@ modules:
2020
mcd_repo: "https://github.com/magento/magento-cloud-docker.git"
2121
mcc_repo: "https://github.com/magento/magento-cloud-components.git"
2222
mcp_repo: "https://github.com/magento/magento-cloud-patches.git"
23+
mqp_repo: "https://github.com/magento/quality-patches.git"
24+
ece_tools_repo: "https://github.com/magento/ece-tools.git"
2325
composer_magento_username: "%REPO_USERNAME%"
2426
composer_magento_password: "%REPO_PASSWORD%"
2527
composer_github_token: "%GITHUB_TOKEN%"

‎composer.json

Lines changed: 8 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -2,7 +2,7 @@
22
"name": "magento/magento-cloud-patches",
33
"description": "Provides critical fixes for Magento 2 Enterprise Edition",
44
"type": "magento2-component",
5-
"version": "1.0.5",
5+
"version": "1.0.6",
66
"license": "OSL-3.0",
77
"require": {
88
"php": "^7.0",
@@ -12,7 +12,11 @@
1212
"symfony/config": "^3.3||^4.4",
1313
"symfony/console": "^2.6||^4.0",
1414
"symfony/dependency-injection": "^3.3||^4.3",
15-
"symfony/process": "^2.1||^4.1"
15+
"symfony/process": "^2.1||^4.1",
16+
"symfony/proxy-manager-bridge": "^3.3||^4.3",
17+
"symfony/yaml": "^3.3||^4.0",
18+
"monolog/monolog": "^1.16",
19+
"magento/quality-patches": "^1.0.0"
1620
},
1721
"require-dev": {
1822
"codeception/codeception": "^2.5.3",
@@ -22,7 +26,8 @@
2226
"squizlabs/php_codesniffer": "^3.0"
2327
},
2428
"bin": [
25-
"bin/ece-patches"
29+
"bin/ece-patches",
30+
"bin/magento-patches"
2631
],
2732
"autoload": {
2833
"psr-4": {

‎config/services.xml

Lines changed: 64 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -6,13 +6,75 @@
66

77
<prototype namespace="Magento\CloudPatches\" resource="../src/*" exclude="../src/{Test}"/>
88

9+
<service id="Psr\Log\LoggerInterface" alias="Magento\CloudPatches\App\Logger" />
910
<service id="Magento\CloudPatches\App\Container" autowire="false"/>
1011
<service id="Magento\CloudPatches\Filesystem\DirectoryList" autowire="false"/>
12+
<service id="Symfony\Component\Console\Helper\QuestionHelper"/>
1113
<service id="Composer\Composer"/>
1214
<service id="Magento\CloudPatches\App\GenericException" autowire="false"/>
13-
<service id="Magento\CloudPatches\Command\Patch\ManagerException" autowire="false"/>
15+
<service id="Magento\CloudPatches\App\RuntimeException" autowire="false"/>
16+
<service id="Magento\CloudPatches\Filesystem\FileSystemException" autowire="false"/>
17+
<service id="Magento\CloudPatches\Patch\SourceProviderException" autowire="false"/>
18+
<service id="Magento\CloudPatches\Patch\Collector\CollectorException" autowire="false"/>
19+
<service id="Magento\CloudPatches\Patch\Status\StatusResolverException" autowire="false"/>
20+
<service id="Magento\CloudPatches\Patch\PatchIntegrityException" autowire="false"/>
21+
<service id="Magento\CloudPatches\Patch\Pool\PatchNotFoundException" autowire="false"/>
1422
<service id="Magento\CloudPatches\Patch\ApplierException" autowire="false"/>
15-
<service id="Magento\CloudPatches\Filesystem\FileNotFoundException" autowire="false"/>
1623
<service id="Magento\CloudPatches\Shell\PackageNotFoundException" autowire="false"/>
24+
<service id="Magento\CloudPatches\Patch\Data\Patch" autowire="false"/>
25+
<service id="Magento\CloudPatches\Patch\Data\AggregatedPatch" autowire="false"/>
26+
<service id="Magento\CloudPatches\Patch\Pool\OptionalPool" lazy="true" />
27+
<service id="Magento\CloudPatches\Patch\Pool\RequiredPool" lazy="true"/>
28+
<service id="Magento\CloudPatches\Patch\Pool\LocalPool" lazy="true"/>
29+
<service id="Magento\CloudPatches\Patch\Status\StatusPool" autowire="false"/>
30+
<service id="statusPool" class="Magento\CloudPatches\Patch\Status\StatusPool" lazy="true">
31+
<argument key="$resolvers" type="collection">
32+
<argument type="service" id="Magento\CloudPatches\Patch\Status\LocalResolver"/>
33+
<argument type="service" id="Magento\CloudPatches\Patch\Status\OptionalResolver"/>
34+
</argument>
35+
</service>
36+
<service id="Magento\CloudPatches\Command\Process\ShowStatus">
37+
<argument key="$statusPool" type="service" id="statusPool"/>
38+
</service>
39+
<service id="Magento\CloudPatches\Command\Process\Ece\Revert">
40+
<argument key="$statusPool" type="service" id="statusPool"/>
41+
</service>
42+
<service id="Magento\CloudPatches\Command\Process\Action\ApplyOptionalAction">
43+
<argument key="$statusPool" type="service" id="statusPool"/>
44+
</service>
45+
<service id="Magento\CloudPatches\Command\Process\Action\RevertAction">
46+
<argument key="$statusPool" type="service" id="statusPool"/>
47+
</service>
48+
<service id="Magento\CloudPatches\Command\Process\Action\ConfirmRequiredAction">
49+
<argument key="$statusPool" type="service" id="statusPool"/>
50+
</service>
51+
<service id="Magento\CloudPatches\Command\Process\Action\ProcessDeprecatedAction">
52+
<argument key="$statusPool" type="service" id="statusPool"/>
53+
</service>
54+
<service id="Magento\CloudPatches\Command\Process\Action\ReviewAppliedAction">
55+
<argument key="$statusPool" type="service" id="statusPool"/>
56+
</service>
57+
<service id="Magento\CloudPatches\Patch\RevertValidator">
58+
<argument key="$statusPool" type="service" id="statusPool"/>
59+
</service>
60+
<service id="Magento\CloudPatches\Command\Process\Renderer">
61+
<argument key="$statusPool" type="service" id="statusPool"/>
62+
</service>
63+
<service id="Magento\CloudPatches\Command\Process\Action\ActionPool" autowire="false"/>
64+
<service id="ApplyOptionalActionPool" class="Magento\CloudPatches\Command\Process\Action\ActionPool">
65+
<argument key="$actions" type="collection">
66+
<argument type="service" id="Magento\CloudPatches\Command\Process\Action\ReviewAppliedAction"/>
67+
<argument type="service" id="Magento\CloudPatches\Command\Process\Action\ConfirmRequiredAction"/>
68+
<argument type="service" id="Magento\CloudPatches\Command\Process\Action\ProcessDeprecatedAction"/>
69+
<argument type="service" id="Magento\CloudPatches\Command\Process\Action\ApplyOptionalAction"/>
70+
</argument>
71+
</service>
72+
<service id="Magento\CloudPatches\Command\Process\ApplyOptional">
73+
<argument key="$actionPool" type="service" id="ApplyOptionalActionPool"/>
74+
</service>
75+
<service id="Magento\CloudPatches\Command\Process\Ece\ApplyOptional">
76+
<argument key="$actionPool" type="service" id="ApplyOptionalActionPool"/>
77+
</service>
78+
<service id="Magento\CloudPatches\Patch\PatchBuilder" shared="false"/>
1779
</services>
1880
</container>

‎patches.json

Lines changed: 23 additions & 17 deletions
Original file line numberDiff line numberDiff line change
@@ -70,7 +70,9 @@
7070
},
7171
"Add Zookeeper and flock locks": {
7272
"2.2.5 - 2.2.8": "MAGECLOUD-3054__add_zookeeper_and_flock_locks__2.2.5.patch",
73-
"2.3.0 - 2.3.1": "MAGECLOUD-3054__add_zookeeper_and_flock_locks__2.3.0.patch"
73+
"2.3.0": "MAGECLOUD-3054__add_zookeeper_and_flock_locks__2.3.0.patch",
74+
"2.3.1": "MAGECLOUD-3054__add_zookeeper_and_flock_locks__2.3.1.patch",
75+
">=2.3.2 <2.3.5": "MCLOUD_6139__improvement_flock_locks__2.3.2.patch"
7476
},
7577
"Reduce memory usage when importing customers and addresses": {
7678
"2.1.4 - 2.1.10": "SET-36__fix_oom_during_customer_import__2.1.4.patch",
@@ -116,7 +118,7 @@
116118
">=2.3.1 <2.3.3": "MAGECLOUD-3913__fix_problems_with_consumer_runners_on_cloud_clusters__2.3.1.patch"
117119
},
118120
"Resolve Issues with Cron Schedule": {
119-
"2.1.10 - 2.1.14 || 2.2.2 - 2.2.5": "MAGECLOUD-2427__resolve_issues_with_cron_schedule.patch"
121+
"2.1.10 - 2.1.14 || 2.2.2 - 2.2.5": "MAGECLOUD-2427__resolve_issues_with_cron_schedule__2.1.10.patch"
120122
},
121123
"Fix timezone parsing for Cron": {
122124
"2.1.4": "MAGECLOUD-2602__fix_timezone_parsing_for_cron__2.1.4.patch",
@@ -135,7 +137,7 @@
135137
"2.1.4 - 2.2.5": "MAGECLOUD-2445__do_not_run_cron_when_it_is_disabled__2.1.4.patch"
136138
},
137139
"Zendframework1 should use TLS 1.2": {
138-
">=2.1.4 <2.3": "MAGECLOUD-2521__zendframework1_use_TLS_1.2.patch"
140+
">=2.1.4 <2.3": "MAGECLOUD-2521__zendframework1_use_TLS_1.2__2.1.4.patch"
139141
},
140142
"The recursion detected error during deployment": {
141143
"2.2.0 - 2.2.6": "MAGECLOUD-2173__the_recursion_error_during_deployment__2.2.0.patch"
@@ -144,16 +146,13 @@
144146
"2.2.0 - 2.2.5": "MAGECLOUD-2509__remove_permission_check_for_console_application__2.2.0.patch",
145147
"2.2.6": "MAGECLOUD-2509__remove_permission_check_for_console_application__2.2.6.patch"
146148
},
147-
"Fix for DI compilation with Amazon_Payment module": {
148-
"2.2.6": "MAGECLOUD-2850_fix_amazon_payment_module__2.2.6.patch"
149-
},
150149
"Add the possibility to install Magento without admin creation" : {
151150
"2.1.4 - 2.2.1": "MAGECLOUD-2573__installation_without_admin_creation__2.1.4.patch",
152151
"2.2.2 - 2.2.7": "MAGECLOUD-2573__installation_without_admin_creation__2.2.2.patch"
153152
},
154153
"Add the possibility to configure max execution time during static content deployment": {
155-
"2.2.0 - 2.2.8 || 2.3.0": "MAGECLOUD-2822__configure_max_execution_time.patch",
156-
"2.3.1": "MAGECLOUD-2822__configure_max_execution_time_2.3.1.patch"
154+
"2.2.0 - 2.2.8 || 2.3.0": "MAGECLOUD-2822__configure_max_execution_time__2.2.0.patch",
155+
"2.3.1": "MAGECLOUD-2822__configure_max_execution_time__2.3.1.patch"
157156
},
158157
"Suppress PDO warnings to work around PHP bugs #63812, #74401": {
159158
"2.1.4": "MAGECLOUD-2820__implement_isolated_connections_mechanism__2.1.4.patch",
@@ -232,7 +231,7 @@
232231
">=2.3.5 <2.4.0": "MAGECLOUD-5069__fpc_is_getting_disabled_during_deployments__2.3.5.patch"
233232
},
234233
"Hold deployment config after reading from file": {
235-
">=2.3.3 <2.3.6": "MCLOUD-5650__hold_deployment_config_after_reading_from_file.patch"
234+
">=2.3.3 <2.3.6": "MCLOUD-5650__hold_deployment_config_after_reading_from_file__2.3.3.patch"
236235
},
237236
"Pagination Not working - product_list_limit=all": {
238237
">=2.3.2 <2.3.4": "MCLOUD-5684__pagination_not_working_product_list_limit_all__2.3.2.patch",
@@ -245,13 +244,17 @@
245244
"Fix load balancer issue": {
246245
">=2.3.4 <2.3.6": "MCLOUD-5837__fix_filesystem_load_balancer_issue__2.3.4.patch"
247246
},
248-
"Cache Locking performance issue": {
249-
"2.3.3": "MDVA-27538__fix_performance_issue_in_cache_locking_mechanism__2.3.3.patch",
250-
">=2.3.3-p1 <2.3.4": "MDVA-27538__fix_performance_issue_in_cache_locking_mechanism__2.3.3-p1.patch",
251-
">=2.3.4 <2.3.5": "MDVA-26795__fix_performance_issue_in_cache_locking_mechanism__2.3.4.patch"
252-
},
253247
"Large amount of Keys Block Cache": {
254248
">=2.3.1 <2.3.5": "MDVA-22950__large_amount_of_keys_block_cache__2.3.1.patch"
249+
},
250+
"Redis improvements": {
251+
"2.3.0": "MCLOUD-6139_MCLOUD-6211__redis_improvement_patches__2.3.0.patch",
252+
"2.3.1": "MCLOUD-6139_MCLOUD-6211__redis_improvement_patches__2.3.1.patch",
253+
">=2.3.2 <2.3.3": "MCLOUD-6139_MCLOUD-6211__redis_improvement_patches__2.3.2.patch",
254+
"2.3.3": "MCLOUD-6139_MCLOUD-6211__redis_improvement_patches__2.3.3.patch",
255+
">=2.3.3-p1 <2.3.4": "MCLOUD-6139_MCLOUD-6211__redis_improvement_patches__2.3.3-p1.patch",
256+
">=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"
255258
}
256259
},
257260
"magento/module-paypal": {
@@ -274,8 +277,8 @@
274277
},
275278
"monolog/monolog": {
276279
"Fix monolog Slack Handler bug for magento 2.1.x": {
277-
"1.16.0": "MAGECLOUD-2793__fix_monolog_slack_handler_2.1.x.patch",
278-
">=1.16.0 <1.24.0": "MAGECLOUD-6029__add_processor_interface_2.1.x.patch"
280+
"1.16.0": "MAGECLOUD-2793__fix_monolog_slack_handler__2.1.x.patch",
281+
">=1.16.0 <1.24.0": "MAGECLOUD-6029__add_processor_interface__2.1.x.patch"
279282
}
280283
},
281284
"colinmollenhour/cache-backend-redis": {
@@ -323,7 +326,10 @@
323326
"3.2.0": "MAGECLOUD-4407__fix_namespace_vertex_tax__3.2.0.patch"
324327
}
325328
},
326-
"amzn/amazon-pay-and-login-magento-2-module": {
329+
"amzn/amazon-pay-module": {
330+
"Fix for DI compilation with Amazon_Payment module": {
331+
"2.1.0": "MAGECLOUD-2850__fix_amazon_payment_module__2.2.6.patch"
332+
},
327333
"Set Payment info bug": {
328334
"3.4.1": "BUNDLE-2554__set_payment_info_bug_fix__3.4.1.patch"
329335
}

‎patches/MAGECLOUD-2427__resolve_issues_with_cron_schedule.patch renamed to ‎patches/MAGECLOUD-2427__resolve_issues_with_cron_schedule__2.1.10.patch

File renamed without changes.

‎patches/MAGECLOUD-2521__zendframework1_use_TLS_1.2.patch renamed to ‎patches/MAGECLOUD-2521__zendframework1_use_TLS_1.2__2.1.4.patch

File renamed without changes.

‎patches/MAGECLOUD-2793__fix_monolog_slack_handler_2.1.x.patch renamed to ‎patches/MAGECLOUD-2793__fix_monolog_slack_handler__2.1.x.patch

File renamed without changes.

0 commit comments

Comments
 (0)