Skip to content

CI Tweaks #97

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
merged 1 commit into from
Oct 4, 2018
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension


Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
1 change: 1 addition & 0 deletions .gitignore
Original file line number Diff line number Diff line change
@@ -1,5 +1,6 @@
/.phpcs-cache
/phpcs.xml
/phpstan.neon
/phpunit.xml
composer.lock
vendor/
Expand Down
11 changes: 7 additions & 4 deletions .travis.yml
Original file line number Diff line number Diff line change
Expand Up @@ -65,8 +65,9 @@ jobs:
- wget https://github.com/scrutinizer-ci/ocular/releases/download/1.5.2/ocular.phar
- php ocular.phar code-coverage:upload --format=php-clover build/logs/clover.xml

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

# - stage: Coding standard
# - stage: Code Quality
# if: NOT type = pull_request
# env: CODING_STANDARD
# php: 7.1
# install: travis_retry composer install --prefer-dist
# script:
# - ./vendor/bin/phpcs

- stage: Static Analysis
script: vendor/bin/phpstan analyse -c phpstan.neon src tests
- stage: Code Quality
env: STATIC_ANALYSIS
script: ./vendor/bin/phpstan analyse
4 changes: 2 additions & 2 deletions composer.json
Original file line number Diff line number Diff line change
Expand Up @@ -17,8 +17,8 @@
"ext-curl": "*"
},
"require-dev": {
"doctrine/coding-standard": "^4.0",
"phpstan/phpstan": "^0.9.2",
"doctrine/coding-standard": "^5.0",
"phpstan/phpstan": "^0.10.3",
"phpunit/phpunit": "^7",
"sebastian/comparator": "~3.0"
},
Expand Down
3 changes: 0 additions & 3 deletions phpstan.neon

This file was deleted.

6 changes: 6 additions & 0 deletions phpstan.neon.dist
Original file line number Diff line number Diff line change
@@ -0,0 +1,6 @@
parameters:
level: 1

paths:
- %currentWorkingDirectory%/src
- %currentWorkingDirectory%/tests