Skip to content

Commit ebded8b

Browse files
authored
Merge pull request #2 from szepeviktor/tools
Fix CI, add tools
2 parents b637b42 + 9307cd3 commit ebded8b

File tree

2 files changed

+10
-6
lines changed

2 files changed

+10
-6
lines changed

.phive/phars.xml

Lines changed: 6 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,6 @@
1+
<?xml version="1.0" encoding="UTF-8"?>
2+
<phive xmlns="https://phar.io/phive">
3+
<phar name="scrutinizer-ci/ocular" version="^1.6.0" installed="1.6.0" location="./tools/ocular" copy="false"/>
4+
<phar name="box-project/box" version="^3.9.0" installed="3.9.0" location="./tools/box" copy="false"/>
5+
<phar name="php-cs-fixer" version="^2.16.4" installed="2.16.4" location="./tools/php-cs-fixer" copy="false"/>
6+
</phive>

.travis.yml

Lines changed: 4 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -17,14 +17,13 @@ jobs:
1717
fast_finish: true
1818
include:
1919
- php: 7.4
20-
- php: 7.3
2120
after_script:
2221
- travis_retry composer require --no-interaction --prefer-dist --optimize-autoloader php-coveralls/php-coveralls
2322
- vendor/bin/php-coveralls -v
2423
- tools/ocular code-coverage:upload --format=php-clover build/logs/clover.xml
2524
- bash <(curl -s "https://codecov.io/bash") -Z
26-
- php: 7.2
27-
- php: nightly
25+
- name: "PHP 8.0"
26+
php: nightly
2827
- name: "Coding style"
2928
php: 7.4
3029
install: "skip"
@@ -34,10 +33,9 @@ jobs:
3433
- name: "Static analysis"
3534
php: 7.4
3635
install:
37-
- travis_retry composer require --no-interaction --prefer-dist --optimize-autoloader phpstan/phpstan
38-
- travis_retry composer require --no-interaction --prefer-dist --optimize-autoloader vimeo/psalm
36+
- travis_retry composer require --no-interaction --prefer-dist --optimize-autoloader phpstan/phpstan vimeo/psalm
3937
script:
40-
- php bin/phpdocfixer analyse src
38+
- php bin/phpdocfixer run src/
4139
- vendor/bin/phpstan analyse
4240
- vendor/bin/psalm
4341
- name: "Compile PHAR"

0 commit comments

Comments
 (0)