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.

Sign up for GitHub

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

Jump to bottom

Update infrastructure like done in vobject #6

Merged
merged 1 commit into from
Feb 2, 2020
Merged

Update infrastructure like done in vobject #6

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
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
13 changes: 0 additions & 13 deletions .gitignore
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -5,17 +5,4 @@ composer.lock
# Tests
tests/cov/
tests/.phpunit.result.cache

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

# Vim
.*.swp

# IDEs
/.idea

.php_cs.cache
9 changes: 3 additions & 6 deletions .travis.yml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -7,13 +7,10 @@ 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
- ./bin/phpstan.phar analyse -c phpstan.neon lib
- ./bin/phpunit --configuration tests/phpunit.xml
- php vendor/bin/php-cs-fixer fix --dry-run --diff
- php vendor/bin/phpstan.phar analyse -c phpstan.neon lib tests
Copy link
Member

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Ohh I.. the .phar is too much here?

- php vendor/bin/phpunit --configuration tests/phpunit.xml
18 changes: 16 additions & 2 deletions composer.json
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -29,9 +29,23 @@
},
"require-dev": {
"friendsofphp/php-cs-fixer": "~2.16.1",
"phpstan/phpstan": "^0.12",
"phpunit/phpunit" : "^7 || ^8"
},
"config" : {
"bin-dir" : "bin/"
"scripts": {
"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"
]
}
}
1 change: 0 additions & 1 deletion tests/phpunit.xml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -6,7 +6,6 @@
convertWarningsToExceptions="true"
beStrictAboutTestsThatDoNotTestAnything="true"
beStrictAboutOutputDuringTests="true"
enforceTimeLimit="true"
>
<testsuites>
<testsuite name="sabre-skel">
Expand Down