Fix new static analysis issues and add PHP 8.4, 8.5 & 8.6 to GitHub Actions

Author: jon48

.github/workflows/php-codestyle.yaml

@@ -14,16 +14,16 @@ jobs:
 
     steps:
       - name: Checkout code
-        uses: actions/checkout@v4
-        
+        uses: actions/checkout@v6
+
       - name: Setup PHP
         uses: shivammathur/setup-php@v2
         with:
           php-version: 7.4
           extensions: gd,intl,mbstring,sqlite,zip
-          coverage: disable
+          coverage: none
 
-      - run: composer global require squizlabs/php_codesniffer=* --quiet
+      - run: composer install --no-progress
 
       - name: PHPCS
-        run: ~/.composer/vendor/bin/phpcs -s
+        run: composer webtrees-lib:phpcs

.github/workflows/php-staticanalysis.yaml

@@ -14,45 +14,45 @@ jobs:
     strategy:
       matrix:
         operating-system: [ubuntu-latest]
-        php-version: ['7.4', '8.0', '8.1', '8.2', '8.3']
+        php-version: ['7.4', '8.0', '8.1', '8.2', '8.3', '8.4', '8.5', '8.6']
 
     runs-on: ${{ matrix.operating-system }}
 
     steps:
       - name: Checkout code
-        uses: actions/checkout@v4
+        uses: actions/checkout@v6
 
       - name: Setup PHP
         uses: shivammathur/setup-php@v2
         with:
           php-version: ${{ matrix.php-version }}
           extensions: gd,intl,mbstring,sqlite,zip
-          coverage: disable
+          coverage: none
 
-      - run: composer install --no-progress --no-suggest --ignore-platform-reqs
+      - run: composer install --no-progress --ignore-platform-reqs
 
-      - run: ./vendor-bin/phpstan/vendor/bin/phpstan analyze --no-progress --error-format=github
+      - run: composer webtrees-lib:phpstan
 
   psalm:
     name: psalm - PHP ${{ matrix.php-version }} on ${{ matrix.operating-system }}
 
     strategy:
       matrix:
         operating-system: [ubuntu-latest]
-        php-version: ['7.4', '8.0', '8.1', '8.2', '8.3']
+        php-version: ['7.4', '8.0', '8.1', '8.2', '8.3', '8.4', '8.5', '8.6']
 
     runs-on: ${{ matrix.operating-system }}
 
     steps:
       - name: Checkout code
-        uses: actions/checkout@v4
+        uses: actions/checkout@v6
 
       - name: Setup PHP
         uses: shivammathur/setup-php@v2
         with:
           php-version: ${{ matrix.php-version }}
           extensions: gd,intl,mbstring,sqlite,zip
-          coverage: disable
+          coverage: none
 
       - run: composer global require vimeo/psalm
 

.github/workflows/php-tests.yaml

@@ -15,7 +15,7 @@ jobs:
     strategy:
       matrix:
         operating-system: [ubuntu-latest]
-        php-version: ['7.4', '8.0', '8.1', '8.2', '8.3']
+        php-version: ['7.4', '8.0', '8.1', '8.2', '8.3', '8.4', '8.5', '8.6']
 
     runs-on: ${{ matrix.operating-system }}
 
@@ -26,15 +26,16 @@ jobs:
           extensions: gd,intl,mbstring,sqlite,zip
           coverage: pcov
 
-      - uses: actions/checkout@v4
+      - uses: actions/checkout@v6
 
       - run: composer validate
 
       - run: composer install --no-progress
 
-      - run: vendor/bin/phpunit --coverage-clover=tests/coverage.xml
+      - run: composer webtrees-lib:coverage
 
-      - uses: codecov/codecov-action@v3
+      - uses: codecov/codecov-action@v5
         with:
+          token: ${{ secrets.CODECOV_TOKEN }}
           file: tests/coverage.xml
           flags: unittests

app/Module/AdminTasks/Services/TokenService.php

@@ -42,10 +42,12 @@ public function generateRandomToken(int $length = 32): string
 
         # Run each chunk through md5
         for ($i = 1; $i <= $chunks; $i++) {
-            $md5token .= md5(substr($token, $i * 32 - 32, 32));
+            $chunk = substr($token, $i * 32 - 32, 32);
+            $md5token .= md5($chunk === false ? '' : $chunk);
         }
 
         # Trim the token to the required length
-        return substr($md5token, 0, $length);
+        $token_trimmed = substr($md5token, 0, $length);
+        return  $token_trimmed === false ? '' : $token_trimmed;
     }
 }

app/Module/Hooks/Services/HookService.php

@@ -98,7 +98,7 @@ public function all(bool $include_disabled = false): Collection
                 $hook_info = $hooks_info->get($hook_collector->name()) ?? collect();
                 foreach (
                     $hook_instances->filter(
-                        fn(HookInterface $hook): bool => $hook instanceof $hook_interface
+                        fn(HookInterface $hook): bool => $hook instanceof ((string)$hook_interface)
                     ) as $hook_instance
                 ) {
                     $hook_module_info = $hook_info->get($hook_instance->module()->name(), collect())->first();

composer.json

@@ -82,12 +82,12 @@
         ]
     },
     "scripts": {
-        "webtrees-lib:phpcs" : "phpcs -s",
-        "webtrees-lib:phpcbf" : "phpcbf",
-        "webtrees-lib:phpstan" : "./vendor-bin/phpstan/vendor/bin/phpstan analyze",
+        "webtrees-lib:phpcs" : "./vendor-bin/php-cs/vendor/bin/phpcs -s --exclude=Generic.Files.LineEndings",
+        "webtrees-lib:phpcbf" : "./vendor-bin/php-cs/vendor/bin/phpcbf --exclude=Generic.Files.LineEndings",
+        "webtrees-lib:phpstan" : "./vendor-bin/phpstan/vendor/bin/phpstan analyze --no-progress",
         "webtrees-lib:sonar" : "sonar-scanner",
-        "webtrees-lib:test": "phpunit",
-        "webtrees-lib:coverage": "phpunit --coverage-clover=tests/coverage.xml --coverage-html=tests/coverage"
+        "webtrees-lib:test": "./vendor/bin/phpunit",
+        "webtrees-lib:coverage": "./vendor/bin/phpunit --coverage-clover=tests/coverage.xml --coverage-html=tests/coverage"
     },
 	"extra": {
 		"bamarni-bin": {

composer.lock

@@ -7,6 +7,7 @@
     xmlns="https://getpsalm.org/schema/config"
     xsi:schemaLocation="https://getpsalm.org/schema/config vendor/vimeo/psalm/config.xsd"
 	reportMixedIssues="false"
+    findUnusedCode="false"
     errorBaseline="psalm.baseline.xml"
 >
     <projectFiles>
@@ -29,14 +30,10 @@
             <referencedConstant name="MyArtJaub\Webtrees\Module\Certificates\Http\RequestHandlers\AutoCompleteFile::CACHE_LIFE" />
            </errorLevel>
 	   </InvalidClassConstantType>
-       <InvalidArgument>
-           <errorLevel type="suppress">
-               <referencedFunction name="Illuminate\Database\Query\Builder::groupBy" />
-           </errorLevel>
-       </InvalidArgument>
        <TooManyArguments>
            <errorLevel type="suppress">
                <referencedFunction name="Illuminate\Database\Query\Builder::select" />
+               <referencedFunction name="ReflectionMethod::invoke" />
            </errorLevel>
        </TooManyArguments>
        <PropertyNotSetInConstructor>

psalm.xml

@@ -15,6 +15,7 @@
 namespace MyArtJaub\Tests\Helpers\Webtrees;
 
 use Fisharebest\Webtrees\View;
+use Exception;
 
 /**
  * MyArtJaub base class for unit tests
@@ -44,4 +45,15 @@ public static function useDefaultViewFor(string $view): void
         View::registerNamespace('maj-common', __DIR__ . '/../resources/views/common/');
         View::registerCustomView($view, 'maj-common::default');
     }
+
+    /**
+     * Provides an error handler converting PHP errors to exceptions.
+     */
+    public static function errorToExceptionHandler(): callable
+    {
+        return static function (int $errno, string $errstr) {
+            restore_error_handler();
+            throw new Exception($errstr, $errno);
+        };
+    }
 }

tests/helpers/TestCase.php

@@ -3,12 +3,13 @@
 namespace MyArtJaub\Tests\Unit\Webtrees\Module\Certificates;
 
 use Fisharebest\Webtrees\Auth;
-use Fisharebest\Webtrees\TestCase;
 use Fisharebest\Webtrees\Tree;
 use Fisharebest\Webtrees\User;
 use Fisharebest\Webtrees\Contracts\UserInterface;
 use Fisharebest\Webtrees\Services\UserService;
+use MyArtJaub\Tests\Helpers\Webtrees\TestCase;
 use MyArtJaub\Webtrees\Module\Certificates\CertificatesModule;
+use Exception;
 
 /**
  * Class CertificatesModuleTest.
@@ -53,6 +54,9 @@ public function testMetadata(): void
 
     public function testHeadContent(): void
     {
+        set_error_handler(self::errorToExceptionHandler(), E_WARNING);
+
+        self::expectException(Exception::class);
         self::expectExceptionMessageMatches('/filemtime\(\): stat failed/');
         self::assertNotEmpty($this->certificates_module->headContent());
     }