PHP 8.1 (#10)

* Fix code style

* Add fixes for PHP 8.1

Author: marvin255

.github/workflows/php.yml

@@ -14,7 +14,7 @@ jobs:
     strategy:
       fail-fast: true
       matrix:
-        php-versions: ['8.0']
+        php-versions: ['8.0', '8.1']
 
     steps:
     - uses: actions/checkout@v2

composer.json

@@ -9,10 +9,10 @@
   },
   "require-dev": {
     "phpunit/phpunit": "^9.0",
-    "friendsofphp/php-cs-fixer": "^2.0|^3.0",
-    "sebastian/phpcpd": "^5.0|^6.0",
+    "friendsofphp/php-cs-fixer": "^3.0",
+    "sebastian/phpcpd": "^6.0",
     "vimeo/psalm": "^4.0",
-    "psalm/plugin-phpunit": "^0.15.1"
+    "psalm/plugin-phpunit": "^0.16"
   },
   "autoload": {
     "psr-4": {
@@ -25,13 +25,19 @@
     }
   },
   "scripts": {
-    "test": "vendor/bin/phpunit --configuration phpunit.xml.dist",
-    "coverage": "vendor/bin/phpunit --configuration phpunit.xml.dist --coverage-html=tests/coverage",
-    "fixer": "vendor/bin/php-cs-fixer fix --config=.php-cs-fixer.dist.php -vv --allow-risky=yes",
+    "test": [
+      "vendor/bin/phpunit --configuration phpunit.xml.dist"
+    ],
+    "coverage": [
+      "vendor/bin/phpunit --configuration phpunit.xml.dist --coverage-html=tests/coverage"
+    ],
+    "fixer": [
+      "vendor/bin/php-cs-fixer fix --config=.php-cs-fixer.dist.php -vv --allow-risky=yes"
+    ],
     "linter": [
         "vendor/bin/php-cs-fixer fix --config=.php-cs-fixer.dist.php -vv --allow-risky=yes --dry-run --stop-on-violation",
         "vendor/bin/phpcpd ./ --exclude vendor --exclude tests",
-        "vendor/bin/psalm --show-info=true"
+        "vendor/bin/psalm --show-info=true --php-version=$(php -r \"echo phpversion();\")"
     ]
   },
   "repositories": [

docker/php/Dockerfile

@@ -24,7 +24,11 @@ RUN docker-php-ext-install zip soap \
     && echo 'xdebug.mode=coverage' >> /usr/local/etc/php/conf.d/docker-php-ext-xdebug.ini
 
 
+<<<<<<< HEAD
+RUN curl -sS https://getcomposer.org/installer | php -- --install-dir=/usr/local/bin --filename=composer  --version=2.2.7 \
+=======
 RUN curl -sS https://getcomposer.org/installer | php -- --install-dir=/usr/local/bin --filename=composer  --version=2.1.8 \
+>>>>>>> origin/master
     && mkdir -p /.composer && chmod -Rf 777 /.composer
 
 

psalm.xml

@@ -1,18 +1,19 @@
 <?xml version="1.0"?>
 <psalm
-    totallyTyped="true"
     cacheDirectory="/tmp"
     xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
     xmlns="https://getpsalm.org/schema/config"
     xsi:schemaLocation="https://getpsalm.org/schema/config file:///var/www/vendor/vimeo/psalm/config.xsd"
 >
     <projectFiles>
         <directory name="./src" />
+        <directory name="./tests" />
         <ignoreFiles>
         </ignoreFiles>
     </projectFiles>
 
     <issueHandlers>
+        <PropertyNotSetInConstructor errorLevel="suppress"/>
     </issueHandlers>
 
     <plugins>

src/FileSystemHelperBase.php

@@ -50,9 +50,7 @@ public function remove(SplFileInfo|string $entity): void
         } elseif ($splEntity->isDir()) {
             $this->iterateDirectory(
                 $splEntity,
-                function (SplFileInfo $file): void {
-                    $this->remove($file);
-                }
+                fn (SplFileInfo $file): mixed => $this->remove($file)
             );
             $this->runPhpFunction(
                 'rmdir',
@@ -239,9 +237,7 @@ public function emptyDir(SplFileInfo|string $path): void
 
         $this->iterateDirectory(
             $dir,
-            function (SplFileInfo $entity): void {
-                $this->remove($entity);
-            }
+            fn (SplFileInfo $file): mixed => $this->remove($file)
         );
     }
 

tests/BaseCase.php

@@ -8,6 +8,7 @@
 use RecursiveDirectoryIterator;
 use RecursiveIteratorIterator;
 use RuntimeException;
+use SplFileInfo;
 
 /**
  * Basic class for all tests in suite.
@@ -115,6 +116,7 @@ protected function removeDir(string $folderPath): void
                 $folderPath,
                 RecursiveDirectoryIterator::SKIP_DOTS
             );
+            /** @var iterable<SplFileInfo> */
             $files = new RecursiveIteratorIterator(
                 $it,
                 RecursiveIteratorIterator::CHILD_FIRST