Skip to content

Commit 4689561

Browse files
committed
Add version 2.1.10
1 parent 7fc5a6f commit 4689561

File tree

13,815 files changed

+881494
-175508
lines changed

Some content is hidden

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

13,815 files changed

+881494
-175508
lines changed

.gitignore

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

.travis.yml

Lines changed: 20 additions & 63 deletions
Original file line numberDiff line numberDiff line change
@@ -9,72 +9,29 @@ addons:
99
- postfix
1010
language: php
1111
php:
12-
- 5.5
1312
- 5.6
13+
- 7.0
1414
env:
15-
- TEST_SUITE=unit
16-
- TEST_SUITE=integration_part_1
17-
- TEST_SUITE=integration_part_2
18-
- TEST_SUITE=integration_integrity
19-
- TEST_SUITE=static_phpcs
20-
- TEST_SUITE=static_annotation
15+
global:
16+
- COMPOSER_BIN_DIR=~/bin
17+
- INTEGRATION_SETS=3
18+
matrix:
19+
- TEST_SUITE=unit
20+
- TEST_SUITE=integration INTEGRATION_INDEX=1
21+
- TEST_SUITE=integration INTEGRATION_INDEX=2
22+
- TEST_SUITE=integration INTEGRATION_INDEX=3
23+
- TEST_SUITE=static
2124
cache:
2225
apt: true
23-
directories:
24-
- $HOME/.composer/cache
25-
- $HOME/.cache/bin
26+
directories: $HOME/.composer/cache
2627
matrix:
2728
exclude:
28-
- php: 5.6
29-
env: TEST_SUITE=static_phpcs
30-
- php: 5.6
31-
env: TEST_SUITE=static_annotation
32-
before_install:
33-
- sudo apt-get update -qq
34-
- sudo apt-get install -y -qq postfix
35-
- sh -c 'if [ "$CASHER_DIR" ]; then
36-
if [ -x $HOME/.cache/bin/composer ]; then
37-
$HOME/.cache/bin/composer self-update; echo '';
38-
else
39-
mkdir -p $HOME/.cache/bin;
40-
curl --connect-timeout 30 -sS https://getcomposer.org/installer
41-
| php -- --install-dir $HOME/.cache/bin/ --filename composer;
42-
fi
43-
fi'
44-
- export PATH="$HOME/.cache/bin:$PATH"
45-
before_script:
46-
# Mock mail
47-
- sudo service postfix stop
48-
- smtp-sink -d "%d.%H.%M.%S" localhost:2500 1000 &
49-
- echo -e '#!/usr/bin/env bash\nexit 0' | sudo tee /usr/sbin/sendmail
50-
- >
51-
echo 'sendmail_path = "/usr/sbin/sendmail -t -i "'
52-
| sudo tee "/home/travis/.phpenv/versions/`php -i
53-
| grep "PHP Version"
54-
| head -n 1
55-
| grep -o -P '\d+\.\d+\.\d+.*'`/etc/conf.d/sendmail.ini"
56-
# Disable xDebug
57-
- echo '' > ~/.phpenv/versions/$(phpenv version-name)/etc/conf.d/xdebug.ini
58-
# Install MySQL 5.6, create DB for integration tests
59-
- >
60-
sh -c "if [ '$TEST_SUITE' = 'integration_part_1' ] || [ '$TEST_SUITE' = 'integration_part_2' ] || [ '$TEST_SUITE' = 'integration_integrity' ]; then
61-
mysql -u root -e 'SET @@global.sql_mode = NO_ENGINE_SUBSTITUTION; CREATE DATABASE magento_integration_tests;';
62-
mv dev/tests/integration/etc/install-config-mysql.travis.php.dist dev/tests/integration/etc/install-config-mysql.php;
63-
fi"
64-
# Change memory_limit for travis
65-
- echo 'memory_limit = -1' >> ~/.phpenv/versions/$(phpenv version-name)/etc/conf.d/travis.ini
66-
- phpenv rehash;
67-
- composer install --no-interaction --prefer-dist
68-
script:
69-
# Unit tests
70-
- sh -c "if [ '$TEST_SUITE' = 'unit' ]; then ./vendor/bin/phpunit -c dev/tests/unit/phpunit.xml.dist; fi"
71-
# Integration tests
72-
- sh -c "if [ '$TEST_SUITE' = 'integration_part_1' ] || [ '$TEST_SUITE' = 'integration_part_2' ]; then cd dev/tests/integration/; bash IntegationTestsForTravis.sh 2; fi"
73-
- sh -c "if [ '$TEST_SUITE' = 'integration_part_1' ]; then cd dev/tests/integration/; ./../../../vendor/bin/phpunit -c phpunit.xml.travis1; fi"
74-
- sh -c "if [ '$TEST_SUITE' = 'integration_part_2' ]; then cd dev/tests/integration/; ./../../../vendor/bin/phpunit -c phpunit.xml.travis2; fi"
75-
# Integration integrity tests
76-
- sh -c "if [ '$TEST_SUITE' = 'integration_integrity' ]; then cd dev/tests/integration/; ./../../../vendor/bin/phpunit -c phpunit.xml.dist testsuite/Magento/Test/Integrity; fi"
77-
# Static tests [Code Style]
78-
- sh -c "if [ '$TEST_SUITE' = 'static_phpcs' ]; then cd dev/tests/static; ./../../../vendor/bin/phpunit -c phpunit.xml.dist --filter 'Magento\\\\Test\\\\Php\\\\LiveCodeTest::testCodeStyle'; fi"
79-
# Static tests [Code Style]
80-
- sh -c "if [ '$TEST_SUITE' = 'static_annotation' ]; then cd dev/tests/static; ./../../../vendor/bin/phpunit -c phpunit.xml.dist --filter 'Magento\\\\Test\\\\Php\\\\LiveCodeTest::testAnnotationStandard'; fi"
29+
- php: 7.0
30+
env: TEST_SUITE=static
31+
before_install: ./dev/travis/before_install.sh
32+
install: composer install --no-interaction --prefer-dist
33+
before_script: ./dev/travis/before_script.sh
34+
script:
35+
- cd dev/tests/$TEST_SUITE
36+
- test $TEST_SUITE = "static" && TEST_FILTER='--filter "Magento\\Test\\Php\\LiveCodeTest"' || true
37+
- phpunit $TEST_FILTER

0 commit comments

Comments
 (0)