From 79093d664b231531623debfce168c2520242a6a6 Mon Sep 17 00:00:00 2001 From: Ondrej Mirtes Date: Tue, 20 Jul 2021 13:01:03 +0200 Subject: [PATCH] Update PHPStan and remove ignore --- .github/workflows/phpstan.yml | 2 +- src/Composer/Util/Perforce.php | 2 -- 2 files changed, 1 insertion(+), 3 deletions(-) diff --git a/.github/workflows/phpstan.yml b/.github/workflows/phpstan.yml index 327d640c7..e8bac3d51 100644 --- a/.github/workflows/phpstan.yml +++ b/.github/workflows/phpstan.yml @@ -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 diff --git a/src/Composer/Util/Perforce.php b/src/Composer/Util/Perforce.php index 1187b06c3..0bde7fb3e 100644 --- a/src/Composer/Util/Perforce.php +++ b/src/Composer/Util/Perforce.php @@ -208,8 +208,6 @@ class Perforce return; } $this->p4User = $this->getP4variable('P4USER'); - // https://github.com/phpstan/phpstan/issues/5129 - // @phpstan-ignore-next-line if (strlen($this->p4User) > 0) { return; }