From 9f2dd5c612d3d2d75815dc0f4291201775d90ddf Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Andreas=20M=C3=B6ller?= Date: Wed, 2 Jan 2019 15:38:07 +0100 Subject: [PATCH 1/6] Fix: Consistently indent with 2 spaces --- .travis.yml | 38 +++++++++++++++++++------------------- 1 file changed, 19 insertions(+), 19 deletions(-) diff --git a/.travis.yml b/.travis.yml index c1511b6c3..1ff8a5221 100644 --- a/.travis.yml +++ b/.travis.yml @@ -37,33 +37,33 @@ matrix: - php: nightly before_install: - # disable xdebug if available - - phpenv config-rm xdebug.ini || echo "xdebug not available" - # disable default memory limit - - export INI=~/.phpenv/versions/$(phpenv version-name)/etc/conf.d/travis.ini - - echo memory_limit = -1 >> $INI + # disable xdebug if available + - phpenv config-rm xdebug.ini || echo "xdebug not available" + # disable default memory limit + - export INI=~/.phpenv/versions/$(phpenv version-name)/etc/conf.d/travis.ini + - echo memory_limit = -1 >> $INI install: - # flags to pass to install - - flags="--ansi --prefer-dist --no-interaction --optimize-autoloader --no-suggest --no-progress" - # update deps to latest in case of high deps build - - if [ "$deps" == "high" ]; then composer config platform.php 7.2.4; composer update $flags; fi - # install dependencies using system provided composer binary - - composer install $flags - # install dependencies using composer from source - - bin/composer install $flags + # flags to pass to install + - flags="--ansi --prefer-dist --no-interaction --optimize-autoloader --no-suggest --no-progress" + # update deps to latest in case of high deps build + - if [ "$deps" == "high" ]; then composer config platform.php 7.2.4; composer update $flags; fi + # install dependencies using system provided composer binary + - composer install $flags + # install dependencies using composer from source + - bin/composer install $flags before_script: - # make sure git tests do not complain about user/email not being set - - git config --global user.name travis-ci - - git config --global user.email travis@example.com + # make sure git tests do not complain about user/email not being set + - git config --global user.name travis-ci + - git config --global user.email travis@example.com script: - # run test suite directories in parallel using GNU parallel - - ls -d tests/Composer/Test/* | grep -v TestCase.php | parallel --gnu --keep-order 'echo "Running {} tests"; ./vendor/bin/phpunit -c tests/complete.phpunit.xml --colors=always {} || (echo -e "\e[41mFAILED\e[0m {}" && exit 1);' + # run test suite directories in parallel using GNU parallel + - ls -d tests/Composer/Test/* | grep -v TestCase.php | parallel --gnu --keep-order 'echo "Running {} tests"; ./vendor/bin/phpunit -c tests/complete.phpunit.xml --colors=always {} || (echo -e "\e[41mFAILED\e[0m {}" && exit 1);' before_deploy: - - php -d phar.readonly=0 bin/compile + - php -d phar.readonly=0 bin/compile deploy: provider: releases From 8f3946fc3aaf87202a19e62728cd720dc6e61b81 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Andreas=20M=C3=B6ller?= Date: Wed, 2 Jan 2019 15:40:17 +0100 Subject: [PATCH 2/6] Enhancement: Reference phpunit.xsd as installed with composer --- phpunit.xml.dist | 4 +++- 1 file changed, 3 insertions(+), 1 deletion(-) diff --git a/phpunit.xml.dist b/phpunit.xml.dist index 4c6749521..20eaefb12 100644 --- a/phpunit.xml.dist +++ b/phpunit.xml.dist @@ -1,6 +1,8 @@ - Date: Wed, 2 Jan 2019 15:45:25 +0100 Subject: [PATCH 3/6] Enhancement: Explicitly configure build matrix to maintain order --- .travis.yml | 18 ++++++++---------- 1 file changed, 8 insertions(+), 10 deletions(-) diff --git a/.travis.yml b/.travis.yml index c1511b6c3..df2110057 100644 --- a/.travis.yml +++ b/.travis.yml @@ -16,22 +16,20 @@ addons: packages: - parallel -php: - - 5.4 - - 5.5 - - 5.6 - - 7.0 - - 7.1 - - 7.2 - - 7.3 - - nightly - matrix: include: - php: 5.3 dist: precise + - php: 5.4 + - php: 5.5 + - php: 5.6 + - php: 7.0 + - php: 7.1 + - php: 7.2 + - php: 7.3 - php: 7.3 env: deps=high + - php: nightly fast_finish: true allow_failures: - php: nightly From 05e86c2c071e1c9b7ca1bdfe09b0b44c5aaf729a Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Andreas=20M=C3=B6ller?= Date: Wed, 2 Jan 2019 15:41:33 +0100 Subject: [PATCH 4/6] Fix: Remove non-existent attribute --- phpunit.xml.dist | 1 - 1 file changed, 1 deletion(-) diff --git a/phpunit.xml.dist b/phpunit.xml.dist index 20eaefb12..bb3b94774 100644 --- a/phpunit.xml.dist +++ b/phpunit.xml.dist @@ -10,7 +10,6 @@ convertWarningsToExceptions="true" processIsolation="false" stopOnFailure="false" - syntaxCheck="false" bootstrap="tests/bootstrap.php" > From bd2a46cf5dcc33af229834a4b817383252d14ffc Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Andreas=20M=C3=B6ller?= Date: Wed, 2 Jan 2019 15:52:53 +0100 Subject: [PATCH 5/6] Fix: Remove sudo configuration --- .travis.yml | 2 -- 1 file changed, 2 deletions(-) diff --git a/.travis.yml b/.travis.yml index c1511b6c3..e9bc30034 100644 --- a/.travis.yml +++ b/.travis.yml @@ -1,7 +1,5 @@ language: php -sudo: false - dist: trusty git: From db4ec12a24e0091c861c43da7e05cd1df1a34d9b Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Andreas=20M=C3=B6ller?= Date: Wed, 2 Jan 2019 15:16:42 +0100 Subject: [PATCH 6/6] Enhancement: Add .editorconfig --- .editorconfig | 11 +++++++++++ 1 file changed, 11 insertions(+) create mode 100644 .editorconfig diff --git a/.editorconfig b/.editorconfig new file mode 100644 index 000000000..033f8a6da --- /dev/null +++ b/.editorconfig @@ -0,0 +1,11 @@ +root = true + +[*] +charset = utf-8 +indent_size = 4 +indent_style = space +insert_final_newline = true +trim_trailing_whitespace = true + +[*.yml] +indent_size = 2