Skip to content

Commit 576630e

Browse files
committed
Various small tweaks
* Ignore PHPUnit 8.x cache file. * Only run `composer validate` once per build. * Ignore the `.git` directory for Parallel Lint to make it faster.
1 parent 75a6428 commit 576630e

File tree

3 files changed

+5
-5
lines changed

3 files changed

+5
-5
lines changed

.gitignore

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -3,3 +3,4 @@ composer.lock
33
.phpcs.xml
44
phpcs.xml
55
phpunit.xml
6+
.phpunit.result.cache

.travis.yml

Lines changed: 3 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -61,6 +61,9 @@ jobs:
6161
- diff -B ./PHPCSDebug/ruleset.xml <(xmllint --format "./PHPCSDebug/ruleset.xml")
6262
- diff -B ./PHPCSDev/ruleset.xml <(xmllint --format "./PHPCSDev/ruleset.xml")
6363

64+
# Validate the composer.json file.
65+
# @link https://getcomposer.org/doc/03-cli.md#validate
66+
- composer validate --no-check-all --strict
6467

6568
#### QUICK TEST STAGE ####
6669
# This is a much quicker test which only runs the unit tests and linting against the low/high
@@ -144,9 +147,5 @@ script:
144147
# which is why it is run against various PHP versions and not in the "Sniff" stage.
145148
- if [[ "$LINT" == "1" ]]; then composer check-complete; fi
146149

147-
# Validate the composer.json file.
148-
# @link https://getcomposer.org/doc/03-cli.md#validate
149-
- if [[ "$LINT" == "1" ]]; then composer validate --no-check-all --strict; fi
150-
151150
# Run the unit tests.
152151
- if [[ $PHPCS_VERSION != "n/a" ]]; then composer run-tests; fi

composer.json

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -36,7 +36,7 @@
3636
],
3737
"scripts" : {
3838
"lint": [
39-
"@php ./vendor/jakub-onderka/php-parallel-lint/parallel-lint . -e php --exclude vendor"
39+
"@php ./vendor/jakub-onderka/php-parallel-lint/parallel-lint . -e php --exclude vendor --exclude .git"
4040
],
4141
"check-cs": [
4242
"@php ./vendor/squizlabs/php_codesniffer/bin/phpcs"

0 commit comments

Comments
 (0)