Upgrade PHPStan

aplus-framework · Nov 4, 2022 · a6e1890 · a6e1890
1 parent 22937da
commit a6e1890
Show file tree

Hide file tree

Showing 6 changed files with 5 additions and 6 deletions.
diff --git a/.github/workflows/tests.yml b/.github/workflows/tests.yml
@@ -49,7 +49,7 @@ jobs:
 
       - name: PHPStan
         run:
-          vendor/bin/phpstan analyse -vvv
+          vendor/bin/phpstan analyse --xdebug -vvv
 
       - name: PHPUnit
         run: vendor/bin/phpunit --verbose

diff --git a/.gitlab-ci.yml b/.gitlab-ci.yml
@@ -22,7 +22,7 @@ test:php:
     - composer normalize --dry-run --indent-size=4 --indent-style=space
     - vendor/bin/php-cs-fixer fix --diff --dry-run --verbose
     #- vendor/bin/phpmd src xml phpmd.xml
-    - vendor/bin/phpstan analyse -vvv
+    - vendor/bin/phpstan analyse --xdebug -vvv
     - vendor/bin/phpunit --colors=never
     - phpdoc
   artifacts:

diff --git a/ci-test.sh b/ci-test.sh
@@ -6,7 +6,7 @@ commands=(
     "composer normalize --dry-run --indent-size=4 --indent-style=space"
     "vendor/bin/php-cs-fixer fix --diff --dry-run --verbose"
     "vendor/bin/phpmd src xml phpmd.xml"
-    "vendor/bin/phpstan analyse -vvv"
+    "vendor/bin/phpstan analyse --xdebug -vvv"
     "vendor/bin/phpunit"
     "phpdoc"
 )

diff --git a/composer.json b/composer.json
@@ -46,7 +46,7 @@
         "ergebnis/composer-normalize": "^2.25",
         "jetbrains/phpstorm-attributes": "^1.0",
         "phpmd/phpmd": "^2.13",
-        "phpstan/phpstan": "^1.7",
+        "phpstan/phpstan": "^1.9",
         "phpunit/phpunit": "^9.5"
     },
     "minimum-stability": "dev",

diff --git a/src/Language.php b/src/Language.php
@@ -460,7 +460,6 @@ protected function getRenderedLine(
         if ($text !== null) {
             $text = $this->formatMessage($text, $args, $locale);
         }
-        // @phpstan-ignore-next-line
         return [
             'locale' => $locale,
             'message' => $text ?? ($file . '.' . $line),

diff --git a/tests/Debug/LanguageCollectorTest.php b/tests/Debug/LanguageCollectorTest.php
@@ -186,7 +186,7 @@ public function testActivities() : void
                 'start',
                 'end',
             ],
-            \array_keys($this->collector->getActivities()[0])
+            \array_keys($this->collector->getActivities()[0]) // @phpstan-ignore-line
         );
     }
 }