Support PHP 8.5

application/clicommands/MigrateCommand.php

@@ -509,18 +509,18 @@
 
                     if (Str::startsWith(ltrim($dashboardUrlString, '/'), 'icingadb/')) {
                         $finalUrl = $dashBoardUrl->onlyWith(['sort', 'limit', 'view', 'columns', 'page']);
                         $params = $dashBoardUrl->without(['sort', 'limit', 'view', 'columns', 'page'])->getParams();
                         $filter = QueryString::parse($params->toString());
                         $filter = UrlMigrator::transformLegacyWildcardFilter($filter);
                         if ($filter) {
                             $oldFilterString = $params->toString();
                             $newFilterString = QueryString::render($filter);
 
                             if ($oldFilterString !== $newFilterString) {
                                 Logger::info(
                                     'Icinga Db Web filter of dashboard "%s" has changed from "%s" to "%s"',
                                     $name,
                                     $params->toString(),
                                     QueryString::render($filter)
                                 );
                                 $finalUrl->setFilter($filter);
@@ -632,11 +632,11 @@
             if ($url && Str::startsWith(ltrim($url, '/'), 'icingadb/')) {
                 $url = Url::fromPath($url, [], new Request());
                 $finalUrl = $url->onlyWith(['sort', 'limit', 'view', 'columns', 'page']);
                 $params = $url->without(['sort', 'limit', 'view', 'columns', 'page'])->getParams();
                 $filter = QueryString::parse($params->toString());
                 $filter = UrlMigrator::transformLegacyWildcardFilter($filter);
                 if ($filter) {
                     $oldFilterString = $params->toString();
                     $newFilterString = QueryString::render($filter);
 
                     if ($oldFilterString !== $newFilterString) {
@@ -784,10 +784,10 @@
             $rc = 128;
         }
 
         return $config;
     }
 
-    private function createBackupIni(string $path, Config $config = null): void
+    private function createBackupIni(string $path, ?Config $config = null): void
     {
         $counter = 0;
         while (true) {

application/forms/RedisConfigForm.php

@@ -676,13 +676,13 @@ public static function checkRedis(Form $form): bool
      * Wraps the given IPL validator class into a callback validator
      * for usage as the only validator of the element given by name.
      *
-     * @param   string  $cls        IPL validator class FQN
-     * @param   string  $element    Form element name
-     * @param   Closure $additionalValidator
+     * @param string $cls IPL validator class FQN
+     * @param string $element Form element name
+     * @param ?Closure $additionalValidator
      *
-     * @return  array               Callback validator
+     * @return array Callback validator
      */
-    private function wrapIplValidator(string $cls, string $element, Closure $additionalValidator = null): array
+    private function wrapIplValidator(string $cls, string $element, ?Closure $additionalValidator = null): array
     {
         return [
             'Callback',

library/Icingadb/Command/Object/ProcessCheckResultCommand.php

@@ -118,11 +118,11 @@ public function getOutput()
     /**
      * Set the performance data of the host or service check result
      *
-     * @param   string|null $performanceData
+     * @param ?string $performanceData
      *
-     * @return  $this
+     * @return $this
      */
-    public function setPerformanceData(string $performanceData = null): self
+    public function setPerformanceData(?string $performanceData = null): self
     {
         $this->performanceData = $performanceData;
 

library/Icingadb/Command/Transport/ApiCommandTransport.php

@@ -301,13 +301,13 @@ protected function sendCommand(IcingaApiCommand $command)
      * Send the Icinga command over the Icinga 2 API
      *
      * @param IcingaCommand|IcingaApiCommand $command
-     * @param int|null $now
+     * @param ?int $now
      *
      * @throws CommandTransportException
      *
      * @return mixed
      */
-    public function send(IcingaCommand|IcingaApiCommand $command, int $now = null)
+    public function send(IcingaCommand|IcingaApiCommand $command, ?int $now = null)
     {
         if ($command instanceof IcingaCommand) {
             $command = $this->renderer->render($command);

library/Icingadb/Command/Transport/CommandTransport.php

@@ -94,14 +94,14 @@ public static function createTransport(ConfigObject $config): ApiCommandTranspor
      *
      * This will try one configured transport after another until the command has been successfully sent.
      *
-     * @param   IcingaCommand   $command    The command to send
-     * @param   int|null        $now        Timestamp of the command or null for now
+     * @param IcingaCommand $command The command to send
+     * @param ?int $now Timestamp of the command or null for now
      *
-     * @throws  CommandTransportException   If sending the Icinga command failed
+     * @return mixed
      *
-     * @return  mixed
+     * @throws CommandTransportException If sending the Icinga command failed
      */
-    public function send(IcingaCommand $command, int $now = null)
+    public function send(IcingaCommand $command, ?int $now = null)
     {
         $errors = [];
         $results = [];

library/Icingadb/Command/Transport/CommandTransportInterface.php

@@ -15,10 +15,10 @@ interface CommandTransportInterface
     /**
      * Send an Icinga command over the Icinga command transport
      *
-     * @param   IcingaCommand   $command    The command to send
-     * @param   int|null        $now        Timestamp of the command or null for now
+     * @param IcingaCommand $command The command to send
+     * @param ?int $now Timestamp of the command or null for now
      *
-     * @throws  CommandTransportException If sending the Icinga command failed
+     * @throws CommandTransportException If sending the Icinga command failed
      */
-    public function send(IcingaCommand $command, int $now = null);
+    public function send(IcingaCommand $command, ?int $now = null);
 }

library/Icingadb/Common/Backend.php

@@ -15,6 +15,7 @@
 use ipl\Sql\QueryBuilder;
 use ipl\Sql\Select;
 use PDO;
+use Pdo\Mysql;
 
 /**
  * Singleton providing access to the Icinga DB and Redis
@@ -61,7 +62,8 @@ public static function getDb(): Connection
 
             $config->options = [PDO::ATTR_DEFAULT_FETCH_MODE => PDO::FETCH_OBJ];
             if ($config->db === 'mysql') {
-                $config->options[PDO::MYSQL_ATTR_INIT_COMMAND] = "SET SESSION SQL_MODE='STRICT_TRANS_TABLES"
+                $config->options[Mysql::ATTR_INIT_COMMAND]
+                    = "SET SESSION SQL_MODE='STRICT_TRANS_TABLES"
                     . ",NO_ZERO_IN_DATE,NO_ZERO_DATE,ERROR_FOR_DIVISION_BY_ZERO,NO_ENGINE_SUBSTITUTION'";
             }
 

library/Icingadb/Common/HostStates.php

@@ -47,13 +47,13 @@ public static function int(string $state): int
     /**
      * Get the textual representation of the passed host state
      *
-     * @param int|null $state
+     * @param ?int $state
      *
      * @return string
      *
      * @throws \InvalidArgumentException If the given host state is invalid, i.e. not known
      */
-    public static function text(int $state = null): string
+    public static function text(?int $state = null): string
     {
         switch (true) {
             case $state === self::UP:
@@ -78,13 +78,13 @@ public static function text(int $state = null): string
     /**
      * Get the translated textual representation of the passed host state
      *
-     * @param int|null $state
+     * @param ?int $state
      *
      * @return string
      *
      * @throws \InvalidArgumentException If the given host state is invalid, i.e. not known
      */
-    public static function translated(int $state = null): string
+    public static function translated(?int $state = null): string
     {
         switch (true) {
             case $state === self::UP:

library/Icingadb/Common/IcingaRedis.php

@@ -173,11 +173,11 @@ protected function fetchState(string $key, array $ids, array $columns): Generato
     /**
      * Get the last icinga heartbeat from redis
      *
-     * @param Redis|null $redis
+     * @param ?Redis $redis
      *
      * @return float|int|null
      */
-    public static function getLastIcingaHeartbeat(Redis $redis = null)
+    public static function getLastIcingaHeartbeat(?Redis $redis = null)
     {
         if ($redis === null) {
             $redis = Backend::getRedis()->getConnection();
@@ -201,12 +201,12 @@ public static function getLastIcingaHeartbeat(Redis $redis = null)
     /**
      * Get the primary redis instance
      *
-     * @param Config|null $moduleConfig
-     * @param Config|null $redisConfig
+     * @param ?Config $moduleConfig
+     * @param ?Config $redisConfig
      *
      * @return Redis
      */
-    public static function getPrimaryRedis(Config $moduleConfig = null, Config $redisConfig = null): Redis
+    public static function getPrimaryRedis(?Config $moduleConfig = null, ?Config $redisConfig = null): Redis
     {
         if ($moduleConfig === null) {
             $moduleConfig = Config::module('icingadb');
@@ -235,12 +235,12 @@ public static function getPrimaryRedis(Config $moduleConfig = null, Config $redi
     /**
      * Get the secondary redis instance if exists
      *
-     * @param Config|null $moduleConfig
-     * @param Config|null $redisConfig
+     * @param ?Config $moduleConfig
+     * @param ?Config $redisConfig
      *
      * @return ?Redis
      */
-    public static function getSecondaryRedis(Config $moduleConfig = null, Config $redisConfig = null)
+    public static function getSecondaryRedis(?Config $moduleConfig = null, ?Config $redisConfig = null)
     {
         if ($moduleConfig === null) {
             $moduleConfig = Config::module('icingadb');

library/Icingadb/Common/ServiceStates.php

@@ -57,13 +57,13 @@ public static function int(string $state): int
     /**
      * Get the textual representation of the passed service state
      *
-     * @param int|null $state
+     * @param ?int $state
      *
      * @return string
      *
      * @throws \InvalidArgumentException If the given service state is invalid, i.e. not known
      */
-    public static function text(int $state = null): string
+    public static function text(?int $state = null): string
     {
         switch (true) {
             case $state === self::OK:
@@ -94,13 +94,13 @@ public static function text(int $state = null): string
     /**
      * Get the translated textual representation of the passed service state
      *
-     * @param int|null $state
+     * @param ?int $state
      *
      * @return string
      *
      * @throws \InvalidArgumentException If the given service state is invalid, i.e. not known
      */
-    public static function translated(int $state = null): string
+    public static function translated(?int $state = null): string
     {
         switch (true) {
             case $state === self::OK:

library/Icingadb/Common/StateBadges.php

@@ -118,7 +118,7 @@ public function setUrl(Url $url): self
      *
      * @return Link
      */
-    protected function createLink($content, Filter\Rule $filter = null): Link
+    protected function createLink($content, ?Filter\Rule $filter = null): Link
     {
         $url = clone $this->getUrl();
 

library/Icingadb/Compat/UrlMigrator.php

@@ -84,7 +84,7 @@ public static function transformUrl(Url $url): Url
         return $url;
     }
 
-    public static function transformParams(Url $url, string $transformerName = null): array
+    public static function transformParams(Url $url, ?string $transformerName = null): array
     {
         $transformer = new self();
 
@@ -153,11 +153,11 @@ public static function transformParams(Url $url, string $transformerName = null)
      * Transform the given legacy filter
      *
      * @param Filter\Rule $filter
-     * @param string|null $queryTransformer
+     * @param ?string $queryTransformer
      *
      * @return Filter\Rule|false
      */
-    public static function transformFilter(Filter\Rule $filter, string $queryTransformer = null)
+    public static function transformFilter(Filter\Rule $filter, ?string $queryTransformer = null)
     {
         $transformer = new self();
 

library/Icingadb/Data/PivotTable.php

@@ -115,11 +115,11 @@ public function __construct(Query $query, string $xAxisColumn, string $yAxisColu
     /**
      * Set the filter to apply on the query for the x-axis
      *
-     * @param   Filter\Rule  $filter
+     * @param ?Filter\Rule $filter
      *
-     * @return  $this
+     * @return $this
      */
-    public function setXAxisFilter(Filter\Rule $filter = null): self
+    public function setXAxisFilter(?Filter\Rule $filter = null): self
     {
         $this->xAxisFilter = $filter;
         return  $this;
@@ -128,11 +128,11 @@ public function setXAxisFilter(Filter\Rule $filter = null): self
     /**
      * Set the filter to apply on the query for the y-axis
      *
-     * @param   Filter\Rule  $filter
+     * @param ?Filter\Rule $filter
      *
-     * @return  $this
+     * @return $this
      */
-    public function setYAxisFilter(Filter\Rule $filter = null): self
+    public function setYAxisFilter(?Filter\Rule $filter = null): self
     {
         $this->yAxisFilter = $filter;
         return  $this;
@@ -203,13 +203,13 @@ public function setYAxisHeader(string $yAxisHeader): self
     /**
      * Return the value for the given request parameter
      *
-     * @param   string  $axis       The axis for which to return the parameter ('x' or 'y')
-     * @param   string  $param      The parameter name to return
-     * @param   int     $default    The default value to return
+     * @param string $axis The axis for which to return the parameter ('x' or 'y')
+     * @param string $param The parameter name to return
+     * @param ?int $default The default value to return
      *
-     * @return  int
+     * @return int
      */
-    protected function getPaginationParameter(string $axis, string $param, int $default = null): int
+    protected function getPaginationParameter(string $axis, string $param, ?int $default = null): int
     {
         /** @var Web $app */
         $app = Icinga::app();
@@ -326,12 +326,12 @@ protected function queryYAxis(): Query
      *
      * $limit and $page are taken from the current request if not given.
      *
-     * @param   int     $limit  The maximum amount of entries to fetch
-     * @param   int     $page   The page to set as current one
+     * @param ?int $limit The maximum amount of entries to fetch
+     * @param ?int $page The page to set as current one
      *
-     * @return  Paginatable
+     * @return Paginatable
      */
-    public function paginateXAxis(int $limit = null, int $page = null): Paginatable
+    public function paginateXAxis(?int $limit = null, ?int $page = null): Paginatable
     {
         if ($limit === null || $page === null) {
             if ($limit === null) {
@@ -358,12 +358,12 @@ public function paginateXAxis(int $limit = null, int $page = null): Paginatable
      *
      * $limit and $page are taken from the current request if not given.
      *
-     * @param int $limit The maximum amount of entries to fetch
-     * @param int $page The page to set as current one
+     * @param ?int $limit The maximum amount of entries to fetch
+     * @param ?int $page The page to set as current one
      *
-     * @return  Paginatable
+     * @return Paginatable
      */
-    public function paginateYAxis(int $limit = null, int $page = null): Paginatable
+    public function paginateYAxis(?int $limit = null, ?int $page = null): Paginatable
     {
         if ($limit === null || $page === null) {
             if ($limit === null) {

library/Icingadb/Hook/Common/TotalSlaReportUtils.php

@@ -14,7 +14,7 @@
 
 trait TotalSlaReportUtils
 {
-    public function getHtml(Timerange $timerange, array $config = null)
+    public function getHtml(Timerange $timerange, ?array $config = null)
     {
         $data = $this->getData($timerange, $config);
         $count = $data->count();

library/Icingadb/Model/Behavior/Bitmask.php

@@ -57,7 +57,7 @@ public function toDb($value, $key, $context)
     public function rewriteCondition(Condition $condition, $relation = null)
     {
         $column = $condition->metaData()->get('columnName');
-        if (! isset($this->properties[$column])) {
+        if ($column === null || ! isset($this->properties[$column])) {
             return;
         }
 

library/Icingadb/Model/UnreachableParent.php

@@ -86,7 +86,7 @@ public function createBehaviors(Behaviors $behaviors): void
         ]));
     }
 
-    public static function on(Connection $db, Model $root = null): Query
+    public static function on(Connection $db, ?Model $root = null): Query
     {
         if ($root === null) {
             throw new InvalidArgumentException('Root node must not be null');
@@ -188,7 +188,6 @@ private static function selectNodes(Connection $db, Model $root): Select
 
         // TODO: ipl-orm doesn't preserve key order :'(
         $columnsProperty = (new \ReflectionClass($nodeSelect))->getProperty('columns');
-        $columnsProperty->setAccessible(true);
         $columnsProperty->setValue($nodeSelect, array_merge(
             [
                 'id' => null,

library/Icingadb/ProvidedHook/Reporting/HostSlaReport.php

@@ -45,7 +45,7 @@ protected function createReportRow($row)
             ->setValues([(float) $row->sla]);
     }
 
-    protected function fetchSla(Timerange $timerange, Rule $filter = null)
+    protected function fetchSla(Timerange $timerange, ?Rule $filter = null)
     {
         $sla = Host::on($this->getDb())
             ->columns([

library/Icingadb/ProvidedHook/Reporting/ServiceSlaReport.php

@@ -45,7 +45,7 @@ protected function createReportRow($row)
             ->setValues([(float) $row->sla]);
     }
 
-    protected function fetchSla(Timerange $timerange, Rule $filter = null)
+    protected function fetchSla(Timerange $timerange, ?Rule $filter = null)
     {
         $sla = Service::on($this->getDb())
             ->columns([