Fix PHPStan

Author: mscherer

.editorconfig

@@ -13,5 +13,8 @@ charset = utf-8
 [*.bat]
 end_of_line = crlf
 
+[*.yml]
+indent_size = 2
+
 [*.neon]
 indent_style = tab

.github/workflows/ci.yml

@@ -8,14 +8,14 @@ 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']
 
     steps:
-    - uses: actions/checkout@v2
+    - uses: actions/checkout@v5
 
     - name: Setup PHP
       uses: shivammathur/setup-php@v2
@@ -47,10 +47,10 @@ jobs:
 
   cs-stan:
     name: Coding Standard & Static Analysis
-    runs-on: ubuntu-22.04
+    runs-on: ubuntu-24.04
 
     steps:
-    - uses: actions/checkout@v3
+    - uses: actions/checkout@v5
 
     - name: Setup PHP
       uses: shivammathur/setup-php@v2

composer.json

@@ -16,15 +16,15 @@
     ],
     "require": {
         "php": ">=8.1",
+        "ext-json": "*",
         "intervention/image": "^3.2.0",
-        "spatie/image-optimizer": "^1.2.0",
-        "ext-json": "*"
+        "spatie/image-optimizer": "^1.2.0"
     },
     "require-dev": {
-        "phpunit/phpunit": "^10.3",
-        "phpstan/phpstan": "^1.10",
-        "php-collective/code-sniffer": "^0.2.1",
-        "php-collective/file-storage": "dev-league/flysystem-v3 as 1.0",
+        "phpunit/phpunit": "^10.3 || ^11.5 || ^12.3",
+        "phpstan/phpstan": "^2.1",
+        "php-collective/code-sniffer": "^0.4.1",
+        "php-collective/file-storage": "dev-master as 1.0",
         "instituteweb/composer-scripts": "^1.1"
     },
     "minimum-stability": "dev",

config/.github/workflows/ci.yml

@@ -1,6 +1,5 @@
 <?php
-
-declare(strict_types=1);
+declare(strict_types = 1);
 
 require 'vendor/autoload.php';
 

config/composer_phive.php

@@ -1,15 +1,18 @@
 <?xml version="1.0"?>
-<ruleset name="Phauthentic">
+<ruleset name="file-storage">
     <arg name="tab-width" value="4"/>
-    <rule ref="PSR12">
-        <exclude name="Generic.Files.LineLength.TooLong"/>
-        <exclude name="PSR2.Classes.PropertyDeclaration"/>
-        <exclude name="PSR1.Classes.ClassDeclaration.MultipleClasses"/>
-        <!-- Use this if you want tabs over spaces -->
-        <!-- <exclude name="Generic.WhiteSpace.DisallowTabIndent"/> -->
-    </rule>
-    <!-- Use this if you want tabs over spaces -->
-    <!-- <rule ref="Generic.WhiteSpace.DisallowSpaceIndent"/>-->
+    <arg value="nps"/>
+
     <file>src/</file>
     <file>tests/</file>
+
+    <rule ref="PhpCollective"/>
+
+    <rule ref="PhpCollective.PHP.DeclareStrictTypes">
+        <properties>
+            <property name="declareOnFirstLine" value="yes"/>
+            <property name="spacesCountAroundEqualsSign" value="1"/>
+        </properties>
+    </rule>
+
 </ruleset>

config/composer_post_install.php

@@ -1,6 +1,4 @@
 parameters:
-	level: 6
+	level: 8
 	paths:
 		- src/
-	checkGenericClassInNonGenericObjectType: false
-	checkMissingIterableValueType: false