Skip to content

Commit 5315cbe

Browse files
committed
fix phpstan
1 parent ab6b242 commit 5315cbe

File tree

4 files changed

+8
-8
lines changed

4 files changed

+8
-8
lines changed

.travis.yml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -10,7 +10,7 @@ env:
1010

1111
matrix:
1212
include:
13-
- php: 7.3
13+
- php: 7.4
1414
env: CHECKS=1 DEFAULT=0
1515

1616
fast_finish: true

PSR2R/Sniffs/Commenting/DocBlockReturnVoidSniff.php

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -66,7 +66,7 @@ public function process(File $phpcsFile, $stackPtr) {
6666
}
6767

6868
// If inheritdoc is present assume the parent contains it
69-
if ($docBlockReturnIndex || (!$docBlockReturnIndex && $hasInheritDoc)) {
69+
if ($docBlockReturnIndex !== null || ($docBlockReturnIndex === null && $hasInheritDoc)) {
7070
return;
7171
}
7272

composer.json

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -43,6 +43,6 @@
4343
"test-setup": "[ ! -f phpunit.phar ] && wget https://phar.phpunit.de/phpunit-8.5.1.phar && mv phpunit-8.5.1.phar phpunit.phar || true",
4444
"test-setup-mac": "[ ! -f phpunit.phar ] && curl -OL https://phar.phpunit.de/phpunit-8.5.1.phar && mv phpunit-8.5.1.phar phpunit.phar || true",
4545
"test-coverage": "php phpunit.phar --log-junit tmp/coverage/unitreport.xml --coverage-html tmp/coverage --coverage-clover tmp/coverage/coverage.xml",
46-
"stan": "phpstan analyse -c tests/phpstan.neon -l 5 PSR2R/"
46+
"stan": "phpstan analyse -c tests/phpstan.neon -l 6 PSR2R/"
4747
}
4848
}

tests/phpstan.neon

Lines changed: 5 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
11
parameters:
2-
autoload_files:
3-
- %rootDir%/../../../tests/phpstan_bootstrap.php
4-
ignoreErrors:
5-
- '#Unreachable statement - code above always terminates.#'
6-
2+
bootstrapFiles:
3+
- %rootDir%/../../../tests/phpstan_bootstrap.php
4+
ignoreErrors:
5+
- '#Unreachable statement - code above always terminates.#'
6+
checkMissingIterableValueType: false

0 commit comments

Comments
 (0)