Merge 1.x into master #2

Merged
sikofitt merged 18 commits from 1.x into master 2022-05-17 11:15:18 -07:00
1 changed files with 2 additions and 2 deletions
Showing only changes of commit de1084eed1 - Show all commits

View File

@ -21,7 +21,7 @@ before_script:
# If Xdebug was installed you can generate a coverage report and see code coverage metrics. # If Xdebug was installed you can generate a coverage report and see code coverage metrics.
test:7.4: test:7.4:
only: only:
- master - 1.x-dev
tags: tags:
- default - default
image: php:7.4 image: php:7.4
@ -29,7 +29,7 @@ test:7.4:
- vendor/bin/phpunit --configuration phpunit.xml --coverage-text --colors=never - vendor/bin/phpunit --configuration phpunit.xml --coverage-text --colors=never
test:8.0: test:8.0:
only: only:
- master - 1.x-dev
tags: tags:
- default - default
image: php:8.0 image: php:8.0