Skip to content

Commit d294221

Browse files
oshmyheliukbillygilbert
oshmyheliuk
authored and
billygilbert
committed
Merge develop into 2002.0 (#549)
1 parent ee1c3ab commit d294221

File tree

198 files changed

+7384
-3914
lines changed

Some content is hidden

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

198 files changed

+7384
-3914
lines changed

‎docker/.gitignore renamed to ‎.docker/.gitignore

File renamed without changes.

‎docker/global.env renamed to ‎.docker/global.env

File renamed without changes.

‎.travis.yml

Lines changed: 39 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,9 @@
11
dist: trusty
2+
sudo: required
3+
4+
addons:
5+
hosts:
6+
- web
27

38
git:
49
depth: 1
@@ -17,13 +22,43 @@ env:
1722
- TEST_SUITE=static-unit XDEBUG=true
1823
- TEST_SUITE=integration
1924
- TEST_SUITE=functional
25+
- TEST_SUITE=functional FUNCTIONAL_INDEX=1
26+
- TEST_SUITE=functional FUNCTIONAL_INDEX=2
27+
- TEST_SUITE=functional FUNCTIONAL_INDEX=3
28+
29+
matrix:
30+
exclude:
31+
- php: '7.0'
32+
env: TEST_SUITE=integration
33+
- php: '7.0'
34+
env: TEST_SUITE=functional FUNCTIONAL_INDEX=1
35+
- php: '7.0'
36+
env: TEST_SUITE=functional FUNCTIONAL_INDEX=2
37+
- php: '7.0'
38+
env: TEST_SUITE=functional FUNCTIONAL_INDEX=3
39+
40+
- php: '7.1'
41+
env: TEST_SUITE=integration
42+
- php: '7.1'
43+
env: TEST_SUITE=functional FUNCTIONAL_INDEX=1
44+
- php: '7.1'
45+
env: TEST_SUITE=functional FUNCTIONAL_INDEX=2
46+
- php: '7.1'
47+
env: TEST_SUITE=functional FUNCTIONAL_INDEX=3
48+
49+
- php: '7.2'
50+
env: TEST_SUITE=functional
2051

21-
install: composer update -n --no-suggest
52+
install:
53+
- composer config http-basic.repo.magento.com ${REPO_USERNAME} ${REPO_PASSWORD}
54+
- composer update -n --no-suggest
2255

2356
before_script:
24-
- echo "COMPOSER_MAGENTO_USERNAME=${REPO_USERNAME}" >> ./docker/composer.env
25-
- echo "COMPOSER_MAGENTO_PASSWORD=${REPO_PASSWORD}" >> ./docker/composer.env
26-
- if [ $XDEBUG == "true" ]; then echo "PHP_ENABLE_XDEBUG=true" >> ./docker/global.env; fi;
57+
- echo "COMPOSER_MAGENTO_USERNAME=${REPO_USERNAME}" >> ./.docker/composer.env
58+
- echo "COMPOSER_MAGENTO_PASSWORD=${REPO_PASSWORD}" >> ./.docker/composer.env
59+
- if [ $XDEBUG == "true" ]; then echo "PHP_ENABLE_XDEBUG=true" >> ./.docker/global.env; fi;
60+
- sudo /etc/init.d/mysql stop
61+
- ./tests/travis/prepare_functional_parallel.sh
2762

2863
script:
2964
- if [ $TEST_SUITE == "static-unit" ]; then ./tests/travis/static-unit.sh; fi

‎README.md

Lines changed: 8 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -9,10 +9,17 @@ You can submit issues and pull requests to extend functionality or fix potential
99

1010
*Please note:* this repository is not an official support channel. To get project-specific help, please create support ticket through [Support Portal](https://support.magento.com). Support-related issues will be closed with the request to open a support ticket.
1111

12+
## Magento Cloud Module for Core
13+
The ece-tools package uses extended core functionality that is provided by the [Magento Cloud Components](https://github.com/magento/magento-cloud-components) module. Starting with ece-tools `2002.0.20`, this module is required to support some advanced features, such as cache warm-up using regex. The [Magento Cloud Components](https://github.com/magento/magento-cloud-components) module is installed automatically when you upgrade the ece-tools package to `2002.0.20` or later.
14+
15+
## Magento Cloud Docker for Local Development and CICD
16+
The ece-tools package uses images that are generated from code in the [Magento Cloud Docker](https://github.com/magento/magento-cloud-docker) repository. Magento maintains a list of images based on the list of service versions available for Magento Commerce. These images are used for building your Docker environment using the ece-tools package.
17+
1218
## Useful Resources
19+
- [Release Notes](https://github.com/magento/ece-tools/releases)
1320
- [Cloud DevDocs](https://devdocs.magento.com/guides/v2.2/cloud/bk-cloud.html)
1421
- [Cloud Knowledge Base and Support](https://support.magento.com)
15-
- [Cloud Slack Channel](https://tinyurl.com/engcom-signup) (join #cloud)
22+
- [Cloud Slack Channel](https://magentocommeng.slack.com) (join #cloud and #cloud-docker)
1623

1724
## License
1825
Each Magento source file included in this distribution is licensed under OSL-3.0 license.

‎codeception.dist.yml

Lines changed: 6 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -31,5 +31,11 @@ modules:
3131
- /var/www/magento/pub/media
3232
- /var/www/magento/var
3333
- /var/www/magento/app/etc
34+
printOutput: false
3435
PhpBrowser:
3536
url: "%Magento.docker.settings.env.url.base%"
37+
Magento\MagentoCloud\Test\Functional\Codeception\MagentoDb:
38+
dsn: "mysql:host=127.0.0.1;port=3306;dbname=%Magento.docker.settings.db.path%"
39+
user: "%Magento.docker.settings.db.username%"
40+
password: "%Magento.docker.settings.db.password%"
41+
reconnect: true

‎composer.json

Lines changed: 41 additions & 20 deletions
Original file line numberDiff line numberDiff line change
@@ -4,10 +4,17 @@
44
"type": "magento2-component",
55
"version": "2002.0.19",
66
"license": "OSL-3.0",
7+
"repositories": [
8+
{
9+
"type": "composer",
10+
"url": "https://repo.magento.com/"
11+
}
12+
],
713
"require": {
814
"php": "^7.0",
915
"ext-PDO": "*",
1016
"ext-json": "*",
17+
"ext-sockets": "*",
1118
"composer/composer": "@stable",
1219
"composer/semver": "^1.4",
1320
"graylog2/gelf-php": "^1.4.2",
@@ -19,19 +26,23 @@
1926
"psr/container": "^1.0",
2027
"psr/log": "^1.0",
2128
"symfony/console": "^2.6||^4.0",
22-
"symfony/yaml": "^3.3",
23-
"twig/twig": "^1.0||^2.0"
29+
"symfony/process": "~2.1||~4.1.0",
30+
"symfony/yaml": "^3.3||^4.0",
31+
"twig/twig": "^1.0||^2.0",
32+
"magento/magento-cloud-components": "^1.0"
2433
},
2534
"require-dev": {
2635
"php-mock/php-mock-phpunit": "^2.0",
2736
"phpmd/phpmd": "@stable",
2837
"phpunit/php-code-coverage": "^5.2",
2938
"phpunit/phpunit": "^6.2",
30-
"squizlabs/php_codesniffer": " ^3.0",
31-
"symfony/process": "^3.4",
39+
"squizlabs/php_codesniffer": "^3.0",
3240
"codeception/codeception": "^2.5.3",
3341
"consolidation/robo": "^1.2"
3442
},
43+
"conflict": {
44+
"nesbot/carbon": ">=1.38 <2.0"
45+
},
3546
"replace": {
3647
"magento/ece-patches": "*",
3748
"magento/magento-cloud-configuration": "*"
@@ -56,12 +67,16 @@
5667
},
5768
"scripts": {
5869
"test": [
59-
"phpcs src --standard=tests/static/phpcs-ruleset.xml -p -n",
60-
"phpmd src xml tests/static/phpmd-ruleset.xml",
61-
"phpunit --configuration tests/unit",
62-
"phpunit --configuration tests/unit --coverage-clover tests/unit/tmp/clover.xml && php tests/unit/code-coverage.php tests/unit/tmp/clover.xml"
70+
"@phpcs",
71+
"@phpmd",
72+
"@phpunit",
73+
"@coverage"
6374
],
64-
"test-coverage-generate": "phpunit --configuration tests/unit --coverage-html tests/unit/tmp/coverage"
75+
"phpcs": "phpcs src --standard=tests/static/phpcs-ruleset.xml -p -n",
76+
"phpmd": "phpmd src xml tests/static/phpmd-ruleset.xml",
77+
"phpunit": "phpunit --configuration tests/unit",
78+
"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"
6580
},
6681
"config": {
6782
"sort-packages": true
@@ -74,29 +89,35 @@
7489
".magento.env.yaml.dist"
7590
],
7691
[
77-
"dist/Makefile",
78-
"Makefile"
92+
"dist/docker-sync.yml",
93+
"docker-sync.yml"
94+
],
95+
[
96+
"dist/mutagen.sh",
97+
"mutagen.sh"
7998
],
8099
[
81100
"dist/docker/mnt",
82-
"docker/mnt"
101+
".docker/mnt"
83102
],
84103
[
85104
"dist/docker/tmp",
86-
"docker/tmp"
105+
".docker/tmp"
87106
],
88107
[
89108
"dist/docker/mysql",
90-
"docker/mysql"
91-
],
92-
[
93-
"dist/docker/README.md",
94-
"docker/README.md"
109+
".docker/mysql"
95110
],
96111
[
97-
"dist/docker-sync.yml",
98-
"docker-sync.yml"
112+
"dist/docker/bin/docker",
113+
"bin/docker"
99114
]
115+
],
116+
"chmod": [
117+
{
118+
"mask": "0755",
119+
"path": "bin/docker"
120+
}
100121
]
101122
}
102123
}

‎dist/.magento.env.yaml

Lines changed: 25 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -175,6 +175,8 @@
175175
# This is useful for local development, where base URLs are set up for your local environment. #
176176
# When you deploy to a Cloud environment, we change the URLs so you can access your storefront #
177177
# and Magento Admin using project URLs. #
178+
# To update URLs when deploying to Staging or Production environments, #
179+
# use the FORCE_UPDATE_URLS variable. #
178180
# Magento Version: 2.1.4 and later #
179181
# Default value: true #
180182
# Possible values: true or false #
@@ -184,6 +186,17 @@
184186
# deploy: #
185187
# UPDATE_URLS: false #
186188
#######################################################################################################################
189+
# FORCE_UPDATE_URLS - This setting overrides the default behavior for the UPDATE_URLS variable #
190+
# which is ignored when deploying to Staging or Production environments. #
191+
# Magento Version: 2.1.4 and later #
192+
# Default value: false #
193+
# Possible values: true or false #
194+
# Stages: deploy #
195+
# Example: #
196+
# stage: #
197+
# deploy: #
198+
# FORCE_UPDATE_URLS: true #
199+
#######################################################################################################################
187200
# GENERATED_CODE_SYMLINK - generates symlinks for the var/generation and var/di generated folders. #
188201
# Magento Version: only 2.1.* #
189202
# Default value: true #
@@ -414,6 +427,18 @@
414427
# - "index.php" #
415428
# - "index.php/customer/account/create" #
416429
#######################################################################################################################
430+
# TTFB_TESTED_PAGES - list pages you wish to perform time to first byte (TTFB) testing on #
431+
# Magento Version: Magento 2.1.4 and later #
432+
# Default value: - [] (an empty array) #
433+
# Stages: post-deploy #
434+
# Example: #
435+
# stage: #
436+
# post-deploy: #
437+
# TTFB_TESTED_PAGES: #
438+
# - "index.php" #
439+
# - "index.php/customer/account/create" #
440+
# - "https://example.com/catalog/some-category" #
441+
#######################################################################################################################
417442
# X_FRAME_CONFIGURATION - customize X-Frame-Options header. #
418443
# Magento Version: Magento 2.1.4 and later #
419444
# Default value: - "" (empty) #

‎dist/Makefile

Lines changed: 0 additions & 32 deletions
This file was deleted.

‎dist/docker-sync.yml

Lines changed: 7 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,10 @@
11
version: 2
22
syncs:
3-
magento:
3+
magento-sync:
44
src: './'
5-
sync_excludes: ['.git', '.idea']
5+
sync_excludes:
6+
- '.git'
7+
- '.idea'
8+
- '.magento'
9+
- '.docker'
10+
- '.github'

‎dist/docker/README.md

Lines changed: 0 additions & 29 deletions
This file was deleted.

0 commit comments

Comments
 (0)