Merge pull request #4 from danielburger1337/stricter-phpstan

Update PHPStan config
danielburger1337 · Feb 24, 2024 · 1699e86 · 1699e86
2 parents 29b08cc + 0802985
commit 1699e86
Show file tree

Hide file tree

Showing 7 changed files with 18 additions and 31 deletions.
diff --git a/.github/workflows/phpstan.yml b/.github/workflows/phpstan.yml
@@ -16,40 +16,18 @@ jobs:
                 operating-system: [ubuntu-latest]
                 php-versions: ["8.2", "8.3"]
 
-        name: PHP ${{ matrix.php-versions }} Static Analysis on ${{ matrix.operating-system }}
-
-        env:
-            PHP_EXTENSIONS: mbstring
-            key: cache-v1
+        name: PHPStan with PHP ${{ matrix.php-versions }} on ${{ matrix.operating-system }}
 
         steps:
-            - uses: actions/checkout@v3
-
-            - name: Setup Cache environment
-              id: extcache
-              uses: shivammathur/cache-extensions@v1
-              with:
-                  php-version: ${{ matrix.php-versions }}
-                  extensions: ${{ env.PHP_EXTENSIONS }}
-                  key: ${{ env.key }}
-
-            - name: Cache PHP extensions
-              uses: actions/cache@v3
-              with:
-                  path: ${{ steps.extcache.outputs.dir }}
-                  key: ${{ steps.extcache.outputs.key }}
-                  restore-keys: ${{ steps.extcache.outputs.key }}
+            - uses: actions/checkout@v4
 
             - name: Setup PHP
               uses: shivammathur/setup-php@v2
               with:
                   php-version: ${{ matrix.php-versions }}
-                  extensions: ${{ env.PHP_EXTENSIONS }}
 
-            ###> Composer ###
             - name: Install Composer packages
               run: composer install -q --no-ansi --no-interaction --no-scripts --no-progress --prefer-dist
-            ###< Composer ###
 
             - name: Run PHPSTAN
-              run: $GITHUB_WORKSPACE/vendor/bin/phpstan --level=9 --error-format=github
+              run: $GITHUB_WORKSPACE/vendor/bin/phpstan --error-format=github
diff --git a/.github/workflows/phpunit.yml b/.github/workflows/phpunit.yml
@@ -25,7 +25,6 @@ jobs:
               uses: shivammathur/setup-php@v2
               with:
                   php-version: ${{ matrix.php-versions }}
-                  extensions: ${{ env.PHP_EXTENSIONS }}
 
             - name: Install Composer packages
               run: composer install -q --no-ansi --no-interaction --no-scripts --no-progress --prefer-dist

diff --git a/.gitignore b/.gitignore
@@ -1,3 +1,5 @@
 /vendor/
 /composer.lock
+
 /.phpunit.result.cache
+/phpstan.neon
diff --git a/composer.json b/composer.json
@@ -22,7 +22,7 @@
         "ext-mbstring": "*"
     },
     "require-dev": {
-        "phpstan/phpstan": "^1.4",
+        "phpstan/phpstan": "^1.10",
         "phpunit/phpunit": "^11.0"
     },
     "config": {

diff --git a/phpstan.neon b/phpstan.neon
diff --git a/phpstan.neon.dist b/phpstan.neon.dist
@@ -0,0 +1,6 @@
+parameters:
+    level: 9
+
+    paths:
+        - src/
+        - tests/
diff --git a/tests/SHA3ShakeTest.php b/tests/SHA3ShakeTest.php
@@ -48,6 +48,9 @@ public function testShake256(string $string, int $outputLength, string $expected
         $this->assertEquals(SHA3Shake::shake256($string, $outputLength, true), \hex2bin($expected));
     }
 
+    /**
+     * @return array<array{0: string, 1: int, 2: string}>
+     */
     public static function shake128Provider(): array
     {
         return [
@@ -60,6 +63,9 @@ public static function shake128Provider(): array
         ];
     }
 
+    /**
+     * @return array<array{0: string, 1: int, 2: string}>
+     */
     public static function shake256Provider(): array
     {
         return [