Skip to content

Commit 7828691

Browse files
committed
Adjust boolean vars in .travis.yml to prepare for PHP8.0
1 parent 7101bbe commit 7828691

File tree

1 file changed

+8
-3
lines changed

1 file changed

+8
-3
lines changed

.travis.yml

Lines changed: 8 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -16,6 +16,8 @@ env:
1616
- SABRE_MYSQLUSER="root"
1717
- SABRE_MYSQLPASS=""
1818
- SABRE_MYSQLDSN="mysql:host=127.0.0.1;dbname=sabredav_test"
19+
- RUN_PHPCSFIXER="TRUE"
20+
- RUN_PHPUNIT="TRUE"
1921
- RUN_PHPSTAN="FALSE"
2022
matrix:
2123
- PREFER_LOWEST="" TEST_DEPS="" REPORT_COVERAGE="TRUE" WITH_COVERAGE="--coverage-clover=coverage.xml"
@@ -26,6 +28,8 @@ matrix:
2628
- name: 'PHPStan'
2729
php: 7.4
2830
env:
31+
- RUN_PHPCSFIXER="FALSE"
32+
- RUN_PHPUNIT="FALSE"
2933
- RUN_PHPSTAN="TRUE"
3034
- REPORT_COVERAGE="FALSE"
3135
- name: 'Test with streaming propfind'
@@ -43,15 +47,16 @@ before_script:
4347
- mysql -u root -h 127.0.0.1 -e 'create database sabredav_test'
4448
- psql -c "create database sabredav_test" -U postgres
4549
- psql -c "create user sabredav with PASSWORD 'sabredav';GRANT ALL PRIVILEGES ON DATABASE sabredav_test TO sabredav" -U postgres
50+
- if [ $RUN_PHPCSFIXER == "FALSE" ]; then composer remove --dev friendsofphp/php-cs-fixer; fi
4651
- composer update $PREFER_LOWEST
4752

4853
addons:
4954
postgresql: "9.5"
5055

5156
script:
52-
- if [ $RUN_PHPSTAN == "FALSE" ]; then php vendor/bin/php-cs-fixer fix --dry-run --diff; fi
53-
- if [ $RUN_PHPSTAN == "FALSE" ]; then php vendor/bin/phpunit --configuration tests/phpunit.xml $WITH_COVERAGE $TEST_DEPS; fi
54-
- if [ $RUN_PHPSTAN == "FALSE" ]; then rm -f ~/.phpenv/versions/$(phpenv version-name)/etc/conf.d/xdebug.ini; fi
57+
- if [ $RUN_PHPCSFIXER == "TRUE" ]; then php vendor/bin/php-cs-fixer fix --dry-run --diff; fi
58+
- if [ $RUN_PHPUNIT == "TRUE" ]; then php vendor/bin/phpunit --configuration tests/phpunit.xml $WITH_COVERAGE $TEST_DEPS; fi
59+
- if [ $RUN_PHPUNIT == "TRUE" ]; then rm -f ~/.phpenv/versions/$(phpenv version-name)/etc/conf.d/xdebug.ini; fi
5560
- if [ $RUN_PHPSTAN == "TRUE" ]; then composer phpstan; fi
5661

5762
after_success:

0 commit comments

Comments
 (0)