PhpStan (#140)

* Update to PHPStan 2.0

* Update to PHPUnit 12

* Remove prefer-lowest from test config

* Drop 8.0 testing due to PHPUnit issues

Author: phpfui

.github/workflows/tests.yml

@@ -8,8 +8,8 @@ jobs:
     strategy:
       fail-fast: false
       matrix:
-        php: [8.4, 8.3, 8.2, 8.1, 8.0]
-        dependency-version: [prefer-lowest, prefer-stable]
+        php: [8.4, 8.3, 8.2, 8.1]
+        dependency-version: [prefer-stable]
         os: [ubuntu-latest, windows-latest]
 
     name: ${{ matrix.os }} - PHP${{ matrix.php }} - ${{ matrix.dependency-version }}
@@ -29,7 +29,7 @@ jobs:
       - name: Install dependencies
         run: |
           composer install --no-interaction
-          composer update --${{ matrix.dependency-version }} --prefer-dist --no-interaction --no-suggest
+          composer update --${{ matrix.dependency-version }} --prefer-dist --no-interaction
 
       - name: Execute tests
         run: vendor/bin/phpunit

composer.json

@@ -33,7 +33,7 @@
   "require-dev": {
     "phpunit/phpunit": ">=9.0",
     "friendsofphp/php-cs-fixer": "^3.8",
-    "phpstan/phpstan": "^1.9"
+    "phpstan/phpstan": "^2.0"
   },
   "autoload": {
     "psr-4": {

src/NXP/Classes/Calculator.php

@@ -1,4 +1,5 @@
 <?php
+
 /**
  * This file is part of the MathExecutor package
  *

src/NXP/Classes/Operator.php

@@ -8,7 +8,7 @@
 class Operator
 {
     /**
-     * @var callable(\SplStack)
+     * @var callable
      */
     public $function;
 

src/NXP/Classes/Tokenizer.php

@@ -1,4 +1,5 @@
 <?php
+
 /**
  * This file is part of the MathExecutor package
  *

src/NXP/MathExecutor.php

@@ -1,4 +1,5 @@
 <?php
+
 /**
  * This file is part of the MathExecutor package
  *
@@ -493,7 +494,7 @@ protected function defaultFunctions() : array
 
               $count = \count($finalArgs);
               \sort($finalArgs);
-              $index = \floor($count / 2);
+              $index = (int)\floor($count / 2);
 
               return ($count & 1) ? $finalArgs[$index] : ($finalArgs[$index - 1] + $finalArgs[$index]) / 2;
           },

tests/MathTest.php

@@ -20,12 +20,11 @@
 use NXP\Exception\UnknownVariableException;
 use NXP\MathExecutor;
 use PHPUnit\Framework\TestCase;
+use PHPUnit\Framework\Attributes\DataProvider;
 
 class MathTest extends TestCase
 {
-    /**
-     * @dataProvider providerExpressions
-     */
+    #[DataProvider('providerExpressions')]
     public function testCalculating(string $expression) : void
     {
         $calculator = new MathExecutor();
@@ -269,9 +268,7 @@ public static function providerExpressions()
         ];
     }
 
-    /**
-     * @dataProvider bcMathExpressions
-     */
+    #[DataProvider('bcMathExpressions')]
     public function testBCMathCalculating(string $expression, string $expected = '') : void
     {
         $calculator = new MathExecutor();
@@ -515,9 +512,7 @@ public static function bcMathExpressions()
         ];
     }
 
-    /**
-     * @dataProvider incorrectExpressions
-     */
+    #[DataProvider('incorrectExpressions')]
     public function testIncorrectExpressionException(string $expression) : void
     {
         $calculator = new MathExecutor();
@@ -976,7 +971,7 @@ public function testNullReturnType() : void
     public function testGetFunctionsReturnsArray() : void
     {
         $calculator = new MathExecutor();
-        $this->assertIsArray($calculator->getFunctions());
+        $this->assertIsArray($calculator->getFunctions()); // @phpstan-ignore-line
     }
 
     public function testGetFunctionsReturnsFunctions() : void
@@ -988,7 +983,7 @@ public function testGetFunctionsReturnsFunctions() : void
     public function testGetVarsReturnsArray() : void
     {
         $calculator = new MathExecutor();
-        $this->assertIsArray($calculator->getVars());
+        $this->assertIsArray($calculator->getVars()); // @phpstan-ignore-line
     }
 
     public function testGetVarsReturnsCount() : void
@@ -1098,9 +1093,7 @@ public function testVarExists() : void
         $this->assertFalse($calculator->varExists('Lucy'));
     }
 
-    /**
-     * @dataProvider providerExpressionValues
-     */
+    #[DataProvider('providerExpressionValues')]
     public function testCalculatingValues(string $expression, mixed $value) : void
     {
         $calculator = new MathExecutor();
@@ -1160,7 +1153,7 @@ public function testCache() : void
         $calculator = new MathExecutor();
         $this->assertEquals(256, $calculator->execute('2 ^ 8')); // second arg $cache is true by default
 
-        $this->assertIsArray($calculator->getCache());
+        $this->assertIsArray($calculator->getCache());  // @phpstan-ignore-line
         $this->assertCount(1, $calculator->getCache());
 
         $this->assertEquals(512, $calculator->execute('2 ^ 9', true));
@@ -1179,7 +1172,7 @@ public function testCache() : void
 
     public function testUnsupportedOperands() : void
     {
-        if (\version_compare(PHP_VERSION, '8') >= 0) {
+        if (\version_compare(PHP_VERSION, '8.0') >= 0) {	// @phpstan-ignore-line
             $calculator = new MathExecutor();
 
             $calculator->setVar('stringVar', 'string');