Skip to content

Commit

Permalink
Update PHPStan and remove ignore
Browse files Browse the repository at this point in the history
  • Loading branch information
ondrejmirtes authored and alcohol committed Jul 21, 2021
1 parent 052a455 commit 79093d6
Show file tree
Hide file tree
Showing 2 changed files with 1 addition and 3 deletions.
2 changes: 1 addition & 1 deletion .github/workflows/phpstan.yml
Original file line number Diff line number Diff line change
Expand Up @@ -52,5 +52,5 @@ jobs:
- name: Run PHPStan
# Locked to phpunit 7.5 here as newer ones have void return types which break inheritance
run: |
bin/composer require --dev phpstan/phpstan:^0.12.69 phpstan/phpstan-phpunit:^0.12.17 phpunit/phpunit:^7.5.20 --with-all-dependencies ${{ env.COMPOSER_FLAGS }}
bin/composer require --dev phpstan/phpstan:^0.12.93 phpstan/phpstan-phpunit:^0.12.17 phpunit/phpunit:^7.5.20 --with-all-dependencies ${{ env.COMPOSER_FLAGS }}
vendor/bin/phpstan analyse --configuration=phpstan/config.neon
2 changes: 0 additions & 2 deletions src/Composer/Util/Perforce.php
Original file line number Diff line number Diff line change
Expand Up @@ -208,8 +208,6 @@ public function queryP4User()
return;
}
$this->p4User = $this->getP4variable('P4USER');
// https://github.com/phpstan/phpstan/issues/5129
// @phpstan-ignore-next-line
if (strlen($this->p4User) > 0) {
return;
}
Expand Down

0 comments on commit 79093d6

Please sign in to comment.