adjust for rebase

.github/workflows/ci.yml

@@ -78,4 +78,4 @@ jobs:
       - name: Run Static Analysis
         run: |
           rm -r public_html # remove once https://github.com/phpstan/phpstan/issues/10321 is fixed
-          vendor/bin/phpstan analyse
+          vendor/bin/phpstan analyse -v

phpstan.neon.dist

@@ -27,7 +27,7 @@ parameters:
         - '~^Call to function base64_decode\(\) requires parameter #2 to be (set|true).~'
 
         -
-            message: '~^Parameter #1 \$browser \(Tests\\Browser\\Browser\) of method Tests\\Browser\\Components\\\w+::assert\(\) should be contravariant with parameter \$browser \(Laravel\\Dusk\\Browser\) of method Laravel\\Dusk\\Component::assert\(\)$~'
+            message: '~^Parameter #1 \$browser \(Roundcube\\Tests\\Browser\\Browser\) of method Roundcube\\Tests\\Browser\\Components\\\w+::assert\(\) should be contravariant with parameter \$browser \(Laravel\\Dusk\\Browser\) of method Laravel\\Dusk\\Component::assert\(\)$~'
             count: 7
             path: tests/Browser/Components/*.php
 

program/lib/Roundcube/rcube_imap.php

@@ -4358,7 +4358,6 @@ public function sort_folder_list($a_folders, $skip_special = false)
         }
 
         // Force the type of folder name variable (#1485527)
-        /** @var array<string|null> $folders */
         $folders = array_map('strval', $folders);
 
         $count = count($folders);

tests/Framework/MessageTest.php

@@ -94,7 +94,7 @@ class rcube_message_test extends \rcube_message
 {
     private $part_bodies = [];
 
-    public function __construct($uid, $folder = null, $is_safe = false)
+    public function __construct($uid, $folder = null, $is_safe = false) // @phpstan-ignore constructor.missingParentCall
     {
         $this->uid = $uid;
         $this->folder = $folder;