Support PHP 8.5

phpstan.neon

@@ -11,9 +11,6 @@ parameters:
     paths:
         - src
 
-    scanDirectories:
-        - /usr/share/icinga-php
-
     ignoreErrors:
         -
             messages:

src/BaseFilter.php

@@ -4,7 +4,7 @@
 
 use ipl\Stdlib\Filter\Rule;
 
 trait BaseFilter
 {
     /** @var Rule Base filter */
     private $baseFilter;
@@ -32,11 +32,11 @@
     /**
      * Set the base filter
      *
-     * @param Rule $baseFilter
+     * @param ?Rule $baseFilter
      *
      * @return $this
      */
-    public function setBaseFilter(Rule $baseFilter = null): self
+    public function setBaseFilter(?Rule $baseFilter = null): self
     {
         $this->baseFilter = $baseFilter;
 

src/Filter.php

@@ -1,3 +1,3 @@
 <?php
 
 namespace ipl\Stdlib;
@@ -259,8 +259,8 @@
         if ($ignoreCase && is_string($rowValue)) {
             $rowValue = strtolower($rowValue);
             /** @var string|string[] $value {@see self::normalizeTypes} ensures this is the case */
             $value = is_array($value)
                 ? array_map('strtolower', $value)
                 : ($value === null ? null : strtolower($value)); // phpstan is wrong here
         }
 
@@ -285,8 +285,8 @@
         if ($ignoreCase && is_string($rowValue)) {
             $rowValue = strtolower($rowValue);
             /** @var string|string[] $value {@see self::normalizeTypes} ensures this is the case */
             $value = is_array($value)
                 ? array_map('strtolower', $value)
                 : ($value === null ? null : strtolower($value)); // phpstan is wrong here
         }
 
@@ -536,11 +536,7 @@
      */
     protected function extractValue($column, $row)
     {
-        try {
-            return $row->{$column};
-        } catch (Throwable $_) {
-            return null;
-        }
+        return $row->$column ?? null;
     }
 
     /**

src/PriorityQueue.php

@@ -25,9 +25,9 @@ class PriorityQueue extends SplPriorityQueue
      * @param TValue $value
      * @param TPriority $priority
      *
-     * @return bool
+     * @return true
      */
-    public function insert($value, $priority): bool
+    public function insert($value, $priority): true
     {
         return parent::insert($value, [$priority, $this->serial--]);
     }

src/Str.php

@@ -76,7 +76,7 @@ public static function symmetricSplit(?string $subject, string $delimiter, int $
      *
      * @return array<string>
      */
-    public static function trimSplit(?string $subject, string $delimiter = ',', int $limit = null)
+    public static function trimSplit(?string $subject, string $delimiter = ',', ?int $limit = null)
     {
         if ($subject === null || empty($delimiter)) {
             return [];