Skip to content

Commit 9a4ccf6

Browse files
BaDosBaDos
authored
Merge pull request #591 from magento/develop
Merge develop into 2002.0
2 parents 1d5e1c7 + a74ec29 commit 9a4ccf6

File tree

154 files changed

+5950
-1278
lines changed

Some content is hidden

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

154 files changed

+5950
-1278
lines changed

‎.travis.yml

Lines changed: 6 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -6,7 +6,7 @@ addons:
66
- web
77

88
git:
9-
depth: 1
9+
depth: false
1010

1111
services:
1212
- docker
@@ -50,7 +50,9 @@ matrix:
5050
env: TEST_SUITE=functional
5151

5252
install:
53-
- composer config http-basic.repo.magento.com ${REPO_USERNAME} ${REPO_PASSWORD}
53+
- if [ $TRAVIS_SECURE_ENV_VARS != "true" ]; then composer remove magento/magento-cloud-components --no-update; fi;
54+
- if [ $TRAVIS_SECURE_ENV_VARS != "true" ]; then composer config --unset repositories.repo.magento.com; fi;
55+
- if [ $TRAVIS_SECURE_ENV_VARS == "true" ]; then composer config http-basic.repo.magento.com ${REPO_USERNAME} ${REPO_PASSWORD}; fi;
5456
- composer update -n --no-suggest
5557

5658
before_script:
@@ -62,7 +64,7 @@ before_script:
6264

6365
script:
6466
- if [ $TEST_SUITE == "static-unit" ]; then ./tests/travis/static-unit.sh; fi
65-
- if [ $TRAVIS_SECURE_ENV_VARS == "true" ] && [ $TEST_SUITE == "integration" ]; then ./tests/travis/integration.sh; fi
66-
- if [ $TRAVIS_SECURE_ENV_VARS == "true" ] && [ $TEST_SUITE == "functional" ]; then ./tests/travis/functional.sh; fi
67+
- if [ $TRAVIS_SECURE_ENV_VARS == "true" ] && [ $TEST_SUITE == "integration" ]; then ./tests/travis/integration.sh; fi;
68+
- if [ $TRAVIS_SECURE_ENV_VARS == "true" ] && [ $TEST_SUITE == "functional" ]; then ./tests/travis/functional.sh; fi;
6769

6870
after_failure: docker ps -s

‎composer.json

Lines changed: 19 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -4,12 +4,12 @@
44
"type": "magento2-component",
55
"version": "2002.0.20",
66
"license": "OSL-3.0",
7-
"repositories": [
8-
{
7+
"repositories": {
8+
"repo.magento.com": {
99
"type": "composer",
1010
"url": "https://repo.magento.com/"
1111
}
12-
],
12+
},
1313
"require": {
1414
"php": "^7.0",
1515
"ext-PDO": "*",
@@ -38,7 +38,8 @@
3838
"phpunit/phpunit": "^6.2",
3939
"squizlabs/php_codesniffer": "^3.0",
4040
"codeception/codeception": "^2.5.3",
41-
"consolidation/robo": "^1.2"
41+
"consolidation/robo": "^1.2",
42+
"phpstan/phpstan": "@stable"
4243
},
4344
"conflict": {
4445
"nesbot/carbon": ">=1.38 <2.0"
@@ -67,16 +68,29 @@
6768
},
6869
"scripts": {
6970
"test": [
71+
"@phpstan",
72+
"@phpcs",
73+
"@phpmd",
74+
"@phpunit",
75+
"@coverage"
76+
],
77+
"test7.0": [
78+
"@phpstan7.0",
7079
"@phpcs",
7180
"@phpmd",
7281
"@phpunit",
7382
"@coverage"
7483
],
84+
"phpstan": "phpstan analyse -c tests/static/phpstan.neon",
85+
"phpstan7.0": "phpstan analyse -l 1 -c tests/static/phpstan7.0.neon src",
7586
"phpcs": "phpcs src --standard=tests/static/phpcs-ruleset.xml -p -n",
7687
"phpmd": "phpmd src xml tests/static/phpmd-ruleset.xml",
7788
"phpunit": "phpunit --configuration tests/unit",
7889
"coverage": "phpunit --configuration tests/unit --coverage-clover tests/unit/tmp/clover.xml && php tests/unit/code-coverage.php tests/unit/tmp/clover.xml",
79-
"coverage-generate": "phpunit --configuration tests/unit --coverage-html tests/unit/tmp/coverage"
90+
"coverage-generate": "phpunit --configuration tests/unit --coverage-html tests/unit/tmp/coverage",
91+
"pre-autoload-dump": [
92+
"Magento\\MagentoCloud\\Composer\\ClearAutoload::preAutoloadDump"
93+
]
8094
},
8195
"config": {
8296
"sort-packages": true

‎dist/.magento.env.yaml

Lines changed: 48 additions & 24 deletions
Original file line numberDiff line numberDiff line change
@@ -243,7 +243,11 @@
243243
# deploy: #
244244
# REDIS_USE_SLAVE_CONNECTION: true #
245245
#######################################################################################################################
246-
# QUEUE_CONFIGURATION - use this environment variable to retain customized AMQP service settings between deployments. #
246+
# QUEUE_CONFIGURATION - Replace or modify the AMQP configuration generated during the deployment process. This #
247+
# configuration is generated only if your project has been configured with a RabbitMQ service. #
248+
# To replace the existing configuration, specify values for each configuration option required #
249+
# for your environment. To modify the existing configuration, specify values only for the #
250+
# options to add or update. Then, add the `_merge: true` option. #
247251
# Magento Version: 2.1.4 and later #
248252
# Default value: not set #
249253
# Stages: deploy #
@@ -261,7 +265,11 @@
261265
# host: mq.host #
262266
# port: 1234 #
263267
#######################################################################################################################
264-
# SEARCH_CONFIGURATION - use this variable to retain customized search service settings between deployments. #
268+
# SEARCH_CONFIGURATION - Replace or modify the Magento search configuration generated during the deployment process. #
269+
# The generated configuration is based on the available relationships. #
270+
# To replace the existing configuration, specify values for each configuration option required #
271+
# for your environment. To modify the existing configuration, specify values only for the #
272+
# options to add or update. Then, add the `_merge: true` option. #
265273
# Magento Version: 2.1.4 and later #
266274
# Default value: not set #
267275
# Stages: deploy #
@@ -275,9 +283,11 @@
275283
# elasticsearch_index_prefix: magento #
276284
# elasticsearch_server_timeout: '15' #
277285
#######################################################################################################################
278-
# ELASTICSUITE_CONFIGURATION - use this variable to retain customized ElasticSuite service settings #
279-
# between deployments. All configs provided in this configuration are nested in main ElasticSuite #
280-
# config section 'system/default/smile_elasticsuite_core_base_settings' #
286+
# ELASTICSUITE_CONFIGURATION - Customize ElasticSuite service configuration stored in the #
287+
# 'system/default/smile_elasticsuite_core_base_settings' section of the config.php file. #
288+
# To replace the existing configuration, specify values for each configuration option #
289+
# required for your environment. To modify the existing configuration, specify values #
290+
# only for the options to add or update. Then, add the `_merge: true` option. #
281291
# Magento Version: 2.2.0 and later #
282292
# Default value: Depends on template configuration of ElasticSearch (i.e. default number of replicas and shards) #
283293
# and ElasticSearch host. #
@@ -320,9 +330,10 @@
320330
# - consumer1 #
321331
# - consumer2 #
322332
#######################################################################################################################
323-
# CACHE_CONFIGURATION - use to configure Redis page and default caching. By default, the deployment process #
324-
# overwrites all settings in the env.php file. When setting the cm_cache_backend_redis #
325-
# parameter, you must specify the server, port, and database options. #
333+
# CACHE_CONFIGURATION - Replace or modify the Magento cache configuration generated during the deployment process. #
334+
# To replace the existing configuration, specify values for each configuration option required #
335+
# for your environment. To modify the existing configuration, specify values only for the #
336+
# options to add or update. Then, add the `_merge: true` option. #
326337
# Magento Version: Magento 2.1.4 and later #
327338
# Default value: not set #
328339
# Stages: deploy #
@@ -336,9 +347,24 @@
336347
# page_cache: #
337348
# backend: file #
338349
#######################################################################################################################
339-
# SESSION_CONFIGURATION - use to configure Redis session storage. You must specify the save, redis, host, port, #
340-
# and database options for the session storage variable. #
341-
# By default, the deployment process overwrites all settings in the env.php file. #
350+
# LOCK_PROVIDER - Use to set the lock provider. #
351+
# The lock provider prevents the launch of duplicate cron jobs and cron groups. #
352+
# You must use the file lock provider in the Production environment. Starter environments and #
353+
# the Pro Integration environment do not use the MAGENTO_CLOUD_LOCKS_DIR variable, so ece-tools #
354+
# applies the db lock provider automatically. #
355+
# Magento Version: 2.2.5 and later #
356+
# Default value: "file" #
357+
# Stages: deploy #
358+
# Example: #
359+
# stage: #
360+
# deploy: #
361+
# LOCK_PROVIDER: "db" #
362+
#######################################################################################################################
363+
# SESSION_CONFIGURATION - Replace or modify the Magento session configuration generated during the deployment process.#
364+
# By default, ece-tools configures Magento to store Redis session data. #
365+
# To replace the existing configuration, specify values for each configuration option #
366+
# required for your environment. To modify the existing configuration, specify values only #
367+
# for the options to add or change. Then, add the `_merge: true` option. #
342368
# Magento Version: Magento 2.1.4 and later #
343369
# Default value: not set #
344370
# Stages: deploy #
@@ -358,10 +384,11 @@
358384
# port: 6379 #
359385
# save: redis #
360386
#######################################################################################################################
361-
# DATABASE_CONFIGURATION - use to configure database connections. You must specify at least the default connection. #
362-
# By default, the deployment process overwrites all settings in the env.php file. #
363-
# In case when added option "_merge: true" setting are merging with default configuration. #
364-
# #
387+
# DATABASE_CONFIGURATION – Customize the Magento database connection information generated by ece-tools during the #
388+
# deployment process. #
389+
# To replace the existing configuration, specify values for each configuration option #
390+
# required for your environment. To modify the existing configuration, specify values only #
391+
# for the options to add or update. Then, add the `_merge: true` option. #
365392
# Magento Version: Magento 2.1.4 and later #
366393
# Default value: not set #
367394
# Stages: deploy #
@@ -396,15 +423,11 @@
396423
# initStatements: SET NAMES utf8 #
397424
# active: 1 #
398425
#######################################################################################################################
399-
# RESOURCE_CONFIGURATION - use to map a resource name to a database connection. #
400-
# By default, the deployment process overwrites all settings in the env.php file; #
401-
# however, you can choose to merge one or more values for a service configuration without #
402-
# overwriting all of the values. #
403-
# #
404-
# Set the _merge option to one of the following: #
405-
# true - Merge the configured service values with the environment variable values. #
406-
# false - Overwrite the configured service values with the environment variable values. #
407-
# #
426+
# RESOURCE_CONFIGURATION - Replace or modify the data connection resource configuration generated during deployment. #
427+
# This configuration maps a resource name to a database connection. #
428+
# To replace the existing configuration, specify values for each configuration option #
429+
# needed for your environment. To modify the existing configuration, specify values only for #
430+
# the options to add or update. Then, add the `_merge: true` option. #
408431
# Magento Version: Magento 2.1.4 and later #
409432
# Default value: not set #
410433
# Stages: deploy #
@@ -451,6 +474,7 @@
451474
# MIN_LOGGING_LEVEL - use to override the minimum logging level for all output streams without making changes #
452475
# to the code. This helps to improve troubleshooting problems with deployment. For example, if #
453476
# your deployment fails, you can use this variable to increase the logging granularity globally. #
477+
# Doesn't affect log level for the file output. #
454478
# See Set up notifications—Log levels. #
455479
# The min_level value in Logging handlers overwrites this setting. #
456480
# Magento Version: Magento 2.1.4 and later #

‎patches.json

Lines changed: 12 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -107,7 +107,13 @@
107107
},
108108
"Fix Problems with Consumer Runners on Cloud Clusters": {
109109
"2.2.0 - 2.2.3": "MAGECLOUD-2464__fix_problems_with_consumer_runners_on_cloud_clusters__2.2.0.patch",
110-
"2.2.4 - 2.2.5": "MAGECLOUD-2464__fix_problems_with_consumer_runners_on_cloud_clusters__2.2.4.patch"
110+
"2.2.4": "MAGECLOUD-2464__fix_problems_with_consumer_runners_on_cloud_clusters__2.2.4.patch",
111+
"2.2.5": "MAGECLOUD-3913__fix_problems_with_consumer_runners_on_cloud_clusters__2.2.5.patch",
112+
"2.2.6": "MAGECLOUD-3913__fix_problems_with_consumer_runners_on_cloud_clusters__2.2.6.patch",
113+
"2.2.7": "MAGECLOUD-3913__fix_problems_with_consumer_runners_on_cloud_clusters__2.2.7.patch",
114+
"2.2.8 - 2.2.9": "MAGECLOUD-3913__fix_problems_with_consumer_runners_on_cloud_clusters__2.2.8.patch",
115+
"2.3.0": "MAGECLOUD-3913__fix_problems_with_consumer_runners_on_cloud_clusters__2.3.0.patch",
116+
"2.3.1 - 2.3.2": "MAGECLOUD-3913__fix_problems_with_consumer_runners_on_cloud_clusters__2.3.1.patch"
111117
},
112118
"Resolve Issues with Cron Schedule": {
113119
"2.1.10 - 2.1.14 || 2.2.2 - 2.2.5": "MAGECLOUD-2427__resolve_issues_with_cron_schedule.patch"
@@ -165,6 +171,11 @@
165171
"2.2.4 - 2.2.9": "MAGECLOUD-3611__multi_thread_scd__2.2.4.patch",
166172
"2.3.0 - 2.3.1": "MAGECLOUD-3611__multi_thread_scd__2.3.0.patch",
167173
"2.3.2": "MAGECLOUD-3611__multi_thread_scd__2.3.2.patch"
174+
},
175+
"setup:upgrade returns error code if app:config:import failed": {
176+
"2.2.0": "MAGECLOUD-3806__error_code_fix_for_setup_upgrade__2.2.0.patch",
177+
"2.2.1 - 2.2.9": "MAGECLOUD-3806__error_code_fix_for_setup_upgrade__2.2.1.patch",
178+
"2.3.0 - 2.3.2": "MAGECLOUD-3806__error_code_fix_for_setup_upgrade__2.3.0.patch"
168179
}
169180
},
170181
"monolog/monolog": {

0 commit comments

Comments
 (0)