Skip to content

Commit 4390b4e

Browse files
authored
Merge pull request #97 from simPod/improve-ci
CI Tweaks
2 parents b661da0 + 3cc8500 commit 4390b4e

File tree

5 files changed

+16
-9
lines changed

5 files changed

+16
-9
lines changed

.gitignore

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,6 @@
11
/.phpcs-cache
22
/phpcs.xml
3+
/phpstan.neon
34
/phpunit.xml
45
composer.lock
56
vendor/

.travis.yml

Lines changed: 7 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -65,8 +65,9 @@ jobs:
6565
- wget https://github.com/scrutinizer-ci/ocular/releases/download/1.5.2/ocular.phar
6666
- php ocular.phar code-coverage:upload --format=php-clover build/logs/clover.xml
6767

68-
- stage: Pull request coding standard
68+
- stage: Code Quality
6969
if: type = pull_request
70+
env: PULL_REQUEST_CODING_STANDARD
7071
php: 7.1
7172
install: travis_retry composer install --prefer-dist
7273
script:
@@ -79,12 +80,14 @@ jobs:
7980
- wget https://github.com/diff-sniffer/git/releases/download/0.1.0/git-phpcs.phar
8081
- php git-phpcs.phar origin/$TRAVIS_BRANCH...$TRAVIS_PULL_REQUEST_SHA
8182

82-
# - stage: Coding standard
83+
# - stage: Code Quality
8384
# if: NOT type = pull_request
85+
# env: CODING_STANDARD
8486
# php: 7.1
8587
# install: travis_retry composer install --prefer-dist
8688
# script:
8789
# - ./vendor/bin/phpcs
8890

89-
- stage: Static Analysis
90-
script: vendor/bin/phpstan analyse -c phpstan.neon src tests
91+
- stage: Code Quality
92+
env: STATIC_ANALYSIS
93+
script: ./vendor/bin/phpstan analyse

composer.json

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -17,8 +17,8 @@
1717
"ext-curl": "*"
1818
},
1919
"require-dev": {
20-
"doctrine/coding-standard": "^4.0",
21-
"phpstan/phpstan": "^0.9.2",
20+
"doctrine/coding-standard": "^5.0",
21+
"phpstan/phpstan": "^0.10.3",
2222
"phpunit/phpunit": "^7",
2323
"sebastian/comparator": "~3.0"
2424
},

phpstan.neon

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

phpstan.neon.dist

Lines changed: 6 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,6 @@
1+
parameters:
2+
level: 1
3+
4+
paths:
5+
- %currentWorkingDirectory%/src
6+
- %currentWorkingDirectory%/tests

0 commit comments

Comments
 (0)