Fix new phpstan errors

roundcube · Sep 12, 2024 · f8d9cb1 · f8d9cb1
1 parent 83417f5
commit f8d9cb1
Show file tree

Hide file tree

Showing 3 changed files with 2 additions and 9 deletions.
diff --git a/phpstan.neon.dist b/phpstan.neon.dist
@@ -16,6 +16,3 @@ parameters:
             path: 'program/lib/Roundcube/rcube_imap_generic.php'
             message: '~^(Instantiated class (GSSAPIContext|KRB5CCache) not found|Call to method \w+\(\) on an unknown class (GSSAPIContext|KRB5CCache))\.$~'
             count: 7
-
-        # https://github.com/phpstan/phpstan/issues/10499
-        - '~^Function pam_chpass invoked with 3 parameters, 4-5 required\.$~'
diff --git a/program/lib/Roundcube/cache/redis.php b/program/lib/Roundcube/cache/redis.php
@@ -235,9 +235,7 @@ protected function delete_item($key)
 
         try {
             // @phpstan-ignore-next-line
-            $result = method_exists(self::$redis, 'del')
-                ? self::$redis->del($key)
-                : self::$redis->delete($key);
+            $result = method_exists(self::$redis, 'del') ? self::$redis->del($key) : self::$redis->delete($key);
         } catch (Exception $e) {
             rcube::raise_error($e, true, false);
             return false;

diff --git a/program/lib/Roundcube/session/redis.php b/program/lib/Roundcube/session/redis.php
@@ -91,9 +91,7 @@ public function destroy($key)
         if ($key) {
             try {
                 // @phpstan-ignore-next-line
-                $result = method_exists($this->redis, 'del')
-                    ? $this->redis->del($key)
-                    : $this->redis->delete($key);
+                $result = method_exists($this->redis, 'del') ? $this->redis->del($key) : $this->redis->delete($key);
             } catch (Exception $e) {
                 rcube::raise_error($e, true, true);
             }