Fix up PHPStan

mscherer · mscherer · commit 5c3c15ef3fe2 · 2025-11-07T03:15:57.000+01:00
diff --git a/.github/workflows/ci.yml b/.github/workflows/ci.yml
@@ -8,20 +8,20 @@ on:
 jobs:
   testsuite:
     name: Unittests
-    runs-on: ubuntu-22.04
+    runs-on: ubuntu-24.04
     strategy:
       fail-fast: false
       matrix:
-        php-version: ['8.1', '8.3']
+        php-version: ['8.1', '8.5']
         dependencies: ['highest']
         include:
             - php-version: '8.1'
               dependencies: 'lowest'
-            - php-version: '8.3'
+            - php-version: '8.5'
               dependencies: 'highest'
 
     steps:
-    - uses: actions/checkout@v4
+    - uses: actions/checkout@v5
 
     - name: Setup PHP
       uses: shivammathur/setup-php@v2
@@ -51,10 +51,10 @@ jobs:
 
   cs-stan:
     name: Coding Standard & Static Analysis
-    runs-on: ubuntu-22.04
+    runs-on: ubuntu-24.04
 
     steps:
-    - uses: actions/checkout@v4
+    - uses: actions/checkout@v5
 
     - name: Setup PHP
       uses: shivammathur/setup-php@v2
@@ -68,7 +68,7 @@ jobs:
       run: composer install
 
     - name: Run phpcs
-      run: vendor/bin/phpcs --version && vendor/bin/phpcs --report=checkstyle | cs2pr
+      run: vendor/bin/phpcs --report=checkstyle | cs2pr
 
     - name: Run phpstan
-      run: vendor/bin/phpstan -V && vendor/bin/phpstan analyze --error-format=github
+      run: vendor/bin/phpstan analyze --error-format=github
diff --git a/composer.json b/composer.json
@@ -34,9 +34,9 @@
         "psr/container": "^1.0|^2.0"
     },
     "require-dev": {
-        "phpunit/phpunit": "^10.3",
-        "phpstan/phpstan": "^1.10",
-        "php-collective/code-sniffer": "^0.2.1",
+        "phpunit/phpunit": "^10.3 || ^11.5 || ^12.3",
+        "phpstan/phpstan": "^2.1",
+        "php-collective/code-sniffer": "^0.4.1",
         "instituteweb/composer-scripts": "^1.1",
         "league/flysystem-aws-s3-v3": "^3.22",
         "league/flysystem-azure-blob-storage": "^3.22",
diff --git a/config/composer_phive.php b/config/composer_phive.php
diff --git a/config/composer_post_install.php b/config/composer_post_install.php
diff --git a/config/scrutinizer-setup.sh b/config/scrutinizer-setup.sh
diff --git a/phpcs.xml b/phpcs.xml
@@ -1,8 +1,7 @@
 <?xml version="1.0"?>
 <ruleset name="file-storage">
-    <config name="installed_paths" value="../../php-collective/code-sniffer"/>
-
     <arg name="tab-width" value="4"/>
+    <arg value="nps"/>
 
     <file>src/</file>
     <file>tests/</file>
diff --git a/phpstan.neon b/phpstan.neon
@@ -2,6 +2,5 @@ parameters:
 	level: 8
 	paths:
 		- src/
-	checkMissingIterableValueType: false
-	checkGenericClassInNonGenericObjectType: false
 	ignoreErrors:
+		- identifier: missingType.iterableValue
diff --git a/src/Adapter/NullFilesystemAdapter.php b/src/Adapter/NullFilesystemAdapter.php
@@ -31,7 +31,7 @@ public function write(string $path, string $contents, Config $config): void
 
     /**
      * @param string $path
-     * @param $contents
+     * @param resource $contents
      * @param \League\Flysystem\Config $config
      *
      * @return void
diff --git a/src/Exception/AdapterFactoryNotFoundException.php b/src/Exception/AdapterFactoryNotFoundException.php
@@ -1,4 +1,4 @@
-<?php declare(strict_types=1);
+<?php declare(strict_types = 1);
 
 /**
  * Copyright (c) Florian Krämer (https://florian-kraemer.net)
diff --git a/src/Exception/PackageRequiredException.php b/src/Exception/PackageRequiredException.php
@@ -1,4 +1,4 @@
-<?php declare(strict_types=1);
+<?php declare(strict_types = 1);
 
 /**
  * Copyright (c) Florian Krämer (https://florian-kraemer.net)
diff --git a/src/Exception/StorageException.php b/src/Exception/StorageException.php
@@ -1,4 +1,4 @@
-<?php declare(strict_types=1);
+<?php declare(strict_types = 1);
 
 /**
  * Copyright (c) Florian Krämer (https://florian-kraemer.net)
diff --git a/src/Factories/AbstractFactory.php b/src/Factories/AbstractFactory.php
@@ -1,4 +1,4 @@
-<?php declare(strict_types=1);
+<?php declare(strict_types = 1);
 
 /**
  * Copyright (c) Florian Krämer (https://florian-kraemer.net)
diff --git a/src/Factories/AwsS3v3Factory.php b/src/Factories/AwsS3v3Factory.php
@@ -1,4 +1,4 @@
-<?php declare(strict_types=1);
+<?php declare(strict_types = 1);
 
 /**
  * Copyright (c) Florian Krämer (https://florian-kraemer.net)
diff --git a/src/Factories/AzureFactory.php b/src/Factories/AzureFactory.php
@@ -1,4 +1,4 @@
-<?php declare(strict_types=1);
+<?php declare(strict_types = 1);
 
 /**
  * Copyright (c) Florian Krämer (https://florian-kraemer.net)
diff --git a/src/Factories/DropboxFactory.php b/src/Factories/DropboxFactory.php
@@ -1,4 +1,4 @@
-<?php declare(strict_types=1);
+<?php declare(strict_types = 1);
 
 /**
  * Copyright (c) Florian Krämer (https://florian-kraemer.net)
diff --git a/src/Factories/Exception/FactoryConfigException.php b/src/Factories/Exception/FactoryConfigException.php
@@ -1,4 +1,4 @@
-<?php declare(strict_types=1);
+<?php declare(strict_types = 1);
 
 /**
  * Copyright (c) Florian Krämer (https://florian-kraemer.net)
diff --git a/src/Factories/Exception/FactoryException.php b/src/Factories/Exception/FactoryException.php
@@ -1,4 +1,4 @@
-<?php declare(strict_types=1);
+<?php declare(strict_types = 1);
 
 /**
  * Copyright (c) Florian Krämer (https://florian-kraemer.net)
diff --git a/src/Factories/Exception/FactoryNotFoundException.php b/src/Factories/Exception/FactoryNotFoundException.php
@@ -1,4 +1,4 @@
-<?php declare(strict_types=1);
+<?php declare(strict_types = 1);
 
 /**
  * Copyright (c) Florian Krämer (https://florian-kraemer.net)
diff --git a/src/Factories/FactoryInterface.php b/src/Factories/FactoryInterface.php
@@ -1,4 +1,4 @@
-<?php declare(strict_types=1);
+<?php declare(strict_types = 1);
 
 /**
  * Copyright (c) Florian Krämer (https://florian-kraemer.net)
diff --git a/src/Factories/LocalFactory.php b/src/Factories/LocalFactory.php
@@ -1,4 +1,4 @@
-<?php declare(strict_types=1);
+<?php declare(strict_types = 1);
 
 /**
  * Copyright (c) Florian Krämer (https://florian-kraemer.net)
diff --git a/src/Factories/MemoryFactory.php b/src/Factories/MemoryFactory.php
@@ -1,4 +1,4 @@
-<?php declare(strict_types=1);
+<?php declare(strict_types = 1);
 
 /**
  * Copyright (c) Florian Krämer (https://florian-kraemer.net)
diff --git a/src/Factories/NullFactory.php b/src/Factories/NullFactory.php
@@ -1,4 +1,4 @@
-<?php declare(strict_types=1);
+<?php declare(strict_types = 1);
 
 /**
  * Copyright (c) Florian Krämer (https://florian-kraemer.net)
diff --git a/src/Factories/WebDavFactory.php b/src/Factories/WebDavFactory.php
@@ -1,4 +1,4 @@
-<?php declare(strict_types=1);
+<?php declare(strict_types = 1);
 
 /**
  * Copyright (c) Florian Krämer (https://florian-kraemer.net)
diff --git a/src/Factories/ZipArchiveFactory.php b/src/Factories/ZipArchiveFactory.php
@@ -1,4 +1,4 @@
-<?php declare(strict_types=1);
+<?php declare(strict_types = 1);
 
 /**
  * Copyright (c) Florian Krämer (https://florian-kraemer.net)
diff --git a/src/StorageAdapterFactory.php b/src/StorageAdapterFactory.php
@@ -1,4 +1,4 @@
-<?php declare(strict_types=1);
+<?php declare(strict_types = 1);
 
 /**
  * Copyright (c) Florian Krämer (https://florian-kraemer.net)
@@ -24,7 +24,7 @@
 class StorageAdapterFactory implements StorageAdapterFactoryInterface
 {
     /**
-     * @var \Psr\Container\ContainerInterface
+     * @var \Psr\Container\ContainerInterface|null
      */
     protected ?ContainerInterface $container;
 
@@ -46,7 +46,7 @@ public function __construct(?ContainerInterface $container = null)
      */
     public function buildStorageAdapter(
         string $adapterClass,
-        array $options
+        array $options,
     ): FilesystemAdapter {
         /** @var class-string<\PhpCollective\Infrastructure\Storage\Factories\FactoryInterface> $adapterClass */
         $adapterClass = $this->checkAndResolveAdapterClass($adapterClass);
diff --git a/src/StorageAdapterFactoryInterface.php b/src/StorageAdapterFactoryInterface.php
@@ -1,4 +1,4 @@
-<?php declare(strict_types=1);
+<?php declare(strict_types = 1);
 
 /**
  * Copyright (c) Florian Krämer (https://florian-kraemer.net)
@@ -31,6 +31,6 @@ interface StorageAdapterFactoryInterface
      */
     public function buildStorageAdapter(
         string $adapterClass,
-        array $options
+        array $options,
     ): FilesystemAdapter;
 }
diff --git a/tests/TestCase/Storage/Exception/AdapterFactoryNotFoundExceptionTest.php b/tests/TestCase/Storage/Exception/AdapterFactoryNotFoundExceptionTest.php
@@ -1,4 +1,4 @@
-<?php declare(strict_types=1);
+<?php declare(strict_types = 1);
 
 /**
  * Copyright (c) Florian Krämer (https://florian-kraemer.net)
@@ -12,7 +12,7 @@
  * @license https://opensource.org/licenses/MIT MIT License
  */
 
-namespace PhpCollective\Storage\Test\TestCase\Storage\Factories;
+namespace PhpCollective\Storage\Test\TestCase\Storage\Exception;
 
 use PhpCollective\Infrastructure\Storage\Exception\AdapterFactoryNotFoundException;
 use PhpCollective\Storage\Test\TestCase\StorageTestCase as TestCase;
diff --git a/tests/TestCase/Storage/Exception/PackageRequiredExceptionTest.php b/tests/TestCase/Storage/Exception/PackageRequiredExceptionTest.php
@@ -1,4 +1,4 @@
-<?php declare(strict_types=1);
+<?php declare(strict_types = 1);
 
 /**
  * Copyright (c) Florian Krämer (https://florian-kraemer.net)
@@ -12,7 +12,7 @@
  * @license https://opensource.org/licenses/MIT MIT License
  */
 
-namespace PhpCollective\Storage\Test\TestCase\Storage\Factories;
+namespace PhpCollective\Storage\Test\TestCase\Storage\Exception;
 
 use PhpCollective\Infrastructure\Storage\Exception\PackageRequiredException;
 use PhpCollective\Storage\Test\TestCase\StorageTestCase as TestCase;
diff --git a/tests/TestCase/Storage/Factories/AbstractFactoryTest.php b/tests/TestCase/Storage/Factories/AbstractFactoryTest.php
@@ -1,4 +1,4 @@
-<?php declare(strict_types=1);
+<?php declare(strict_types = 1);
 
 /**
  * Copyright (c) Florian Krämer (https://florian-kraemer.net)
diff --git a/tests/TestCase/Storage/Factories/AwsS3v3FactoryTest.php b/tests/TestCase/Storage/Factories/AwsS3v3FactoryTest.php
@@ -1,4 +1,4 @@
-<?php declare(strict_types=1);
+<?php declare(strict_types = 1);
 
 /**
  * Copyright (c) Florian Krämer (https://florian-kraemer.net)
diff --git a/tests/TestCase/Storage/Factories/AzureFactoryTest.php b/tests/TestCase/Storage/Factories/AzureFactoryTest.php
@@ -1,4 +1,4 @@
-<?php declare(strict_types=1);
+<?php declare(strict_types = 1);
 
 /**
  * Copyright (c) Florian Krämer (https://florian-kraemer.net)
diff --git a/tests/TestCase/Storage/Factories/DropboxFactoryTest.php b/tests/TestCase/Storage/Factories/DropboxFactoryTest.php
@@ -1,4 +1,4 @@
-<?php declare(strict_types=1);
+<?php declare(strict_types = 1);
 
 /**
  * Copyright (c) Florian Krämer (https://florian-kraemer.net)
diff --git a/tests/TestCase/Storage/Factories/Exception/FactoryNotFoundExceptionTest.php b/tests/TestCase/Storage/Factories/Exception/FactoryNotFoundExceptionTest.php
@@ -1,4 +1,4 @@
-<?php declare(strict_types=1);
+<?php declare(strict_types = 1);
 
 /**
  * Copyright (c) Florian Krämer (https://florian-kraemer.net)
diff --git a/tests/TestCase/Storage/Factories/LocalFactoryTest.php b/tests/TestCase/Storage/Factories/LocalFactoryTest.php
@@ -1,4 +1,4 @@
-<?php declare(strict_types=1);
+<?php declare(strict_types = 1);
 
 /**
  * Copyright (c) Florian Krämer (https://florian-kraemer.net)
diff --git a/tests/TestCase/Storage/Factories/MemoryFactoryTest.php b/tests/TestCase/Storage/Factories/MemoryFactoryTest.php
@@ -1,4 +1,4 @@
-<?php declare(strict_types=1);
+<?php declare(strict_types = 1);
 
 /**
  * Copyright (c) Florian Krämer (https://florian-kraemer.net)
diff --git a/tests/TestCase/Storage/Factories/NullFactoryTest.php b/tests/TestCase/Storage/Factories/NullFactoryTest.php
@@ -1,4 +1,4 @@
-<?php declare(strict_types=1);
+<?php declare(strict_types = 1);
 
 /**
  * Copyright (c) Florian Krämer (https://florian-kraemer.net)
diff --git a/tests/TestCase/Storage/Factories/WebDavFactoryTest.php b/tests/TestCase/Storage/Factories/WebDavFactoryTest.php
@@ -1,4 +1,4 @@
-<?php declare(strict_types=1);
+<?php declare(strict_types = 1);
 
 /**
  * Copyright (c) Florian Krämer (https://florian-kraemer.net)
diff --git a/tests/TestCase/Storage/Factories/ZipArchiveFactoryTest.php b/tests/TestCase/Storage/Factories/ZipArchiveFactoryTest.php
@@ -1,4 +1,4 @@
-<?php declare(strict_types=1);
+<?php declare(strict_types = 1);
 
 /**
  * Copyright (c) Florian Krämer (https://florian-kraemer.net)
diff --git a/tests/TestCase/Storage/StorageAdapterFactoryTest.php b/tests/TestCase/Storage/StorageAdapterFactoryTest.php
@@ -1,4 +1,4 @@
-<?php declare(strict_types=1);
+<?php declare(strict_types = 1);
 
 /**
  * Copyright (c) Florian Krämer (https://florian-kraemer.net)
diff --git a/tests/TestCase/StorageTestCase.php b/tests/TestCase/StorageTestCase.php
@@ -1,4 +1,4 @@
-<?php declare(strict_types=1);
+<?php declare(strict_types = 1);
 
 /**
  * Copyright (c) Florian Krämer (https://florian-kraemer.net)

Original file line number	Diff line number	Diff line change
`@@ -31,7 +31,7 @@ public function write(string $path, string $contents, Config $config): void`
`31`	`31`
`32`	`32`	`/**`
`33`	`33`	`* @param string $path`
`34`		`- * @param $contents`
	`34`	`+ * @param resource $contents`
`35`	`35`	`* @param \League\Flysystem\Config $config`
`36`	`36`	`*`
`37`	`37`	`* @return void`
Original file line number	Diff line number	Diff line change
`@@ -1,4 +1,4 @@`
`1`		`-<?php declare(strict_types=1);`
	`1`	`+<?php declare(strict_types = 1);`
`2`	`2`
`3`	`3`	`/**`
`4`	`4`	`* Copyright (c) Florian Krämer (https://florian-kraemer.net)`