Skip to content
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

Various infra changes #496

Merged
merged 6 commits into from Feb 2, 2020
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.
Jump to
Jump to file
Failed to load files.
Diff view
Diff view
15 changes: 0 additions & 15 deletions .gitignore
Expand Up @@ -5,20 +5,5 @@ tests/cov/
tests/temp
tests/.phpunit.result.cache

#vim
.*.swp

#binaries
bin/phpunit
bin/php-cs-fixer
bin/phpstan
bin/phpstan.phar
bin/hoa

# Development stuff
testdata/
.php_cs.cache
.idea
phil-davis marked this conversation as resolved.
Show resolved Hide resolved

# OS X
.DS_Store
11 changes: 4 additions & 7 deletions .travis.yml
Expand Up @@ -8,17 +8,14 @@ php:
matrix:
fast_finish: true

install:
- composer require --dev phpstan/phpstan:^0.12

before_script:
- composer install

script:
- ./bin/php-cs-fixer fix lib/ --dry-run --diff
- php ./bin/phpstan.phar analyse -c phpstan.neon lib tests
- ./bin/phpunit --configuration tests/phpunit.xml --coverage-clover=coverage.xml
- php vendor/bin/php-cs-fixer fix --dry-run --diff
- php vendor/bin/phpstan analyse -c phpstan.neon lib tests
- php vendor/bin/phpunit --configuration tests/phpunit.xml --coverage-clover=coverage.xml

after_success:
- bash <(curl -s https://codecov.io/bash)

Expand Down
20 changes: 17 additions & 3 deletions composer.json
Expand Up @@ -38,7 +38,8 @@
},
"require-dev" : {
"friendsofphp/php-cs-fixer": "~2.16.1",
"phpunit/phpunit" : "^7 || ^8"
"phpunit/phpunit" : "^7 || ^8",
"phpstan/phpstan": "^0.12"
phil-davis marked this conversation as resolved.
Show resolved Hide resolved
},
"suggest" : {
"hoa/bench" : "If you would like to run the benchmark scripts"
Expand Down Expand Up @@ -86,7 +87,20 @@
"dev-master" : "4.0.x-dev"
}
},
"config" : {
"bin-dir" : "bin"
"scripts": {
JeroenVanOort marked this conversation as resolved.
Show resolved Hide resolved
"phpstan": [
"@php vendor/bin/phpstan analyse lib tests"
],
"cs-fixer": [
"@php vendor/bin/php-cs-fixer fix"
],
"phpunit": [
"@php vendor/bin/phpunit --configuration tests/phpunit.xml"
],
"test": [
"composer phpstan",
"composer cs-fixer",
"composer phpunit"
]
}
}