Support PHP 8.5 (#5454)

PHP 8.4:

- Change implicit nullable type declaration to explicit
- Only set `session.sid_bits_per_character` for PHP < 8.4 

PHP 8.5:

- Remove no-op `ReflectionProperty::setAccessible()` calls
- Replace backtick operator with `shell_exec()`
- Avoid passing `null` as key in `array_key_exists()`
- Avoid passing `null` to non-nullable parameters in built-in functions
- Use `Pdo\Mysql` driver-specific constants   

Other compatibility fixes:

- Avoid passing `null` as `ipl\Html` form element `$name`
- Use latest PHPUnit version

Author: lippserd

.github/workflows/php.yml

@@ -17,7 +17,6 @@ jobs:
     with:
       databases: true
       php-extensions: ldap
-      phpunit-version: 9.6
       dependencies: |
         {
           "./icinga-php/ipl"                : "https://github.com/Icinga/icinga-php-library.git#snapshot/nightly",

application/clicommands/WebCommand.php

@@ -67,7 +67,7 @@ public function stopAction()
     {
         // TODO: No, that's NOT what we want
         $prog = readlink('/proc/self/exe');
-        `killall $prog`;
+        shell_exec("killall $prog");
     }
 
     protected function forkAndExit()

application/forms/Config/Resource/DbResourceForm.php

@@ -5,6 +5,7 @@
 
 use Icinga\Application\Platform;
 use Icinga\Web\Form;
+use Pdo\Mysql;
 
 /**
  * Form class for adding/modifying database resources
@@ -177,7 +178,7 @@ public function createElements(array $formData)
                 )
             );
             if (isset($formData['use_ssl']) && $formData['use_ssl']) {
-                if (defined('\PDO::MYSQL_ATTR_SSL_VERIFY_SERVER_CERT')) {
+                if (defined(Mysql::class . '::ATTR_SSL_VERIFY_SERVER_CERT')) {
                     $this->addElement(
                         'checkbox',
                         'ssl_do_not_verify_server_cert',

application/forms/RepositoryForm.php

@@ -145,11 +145,11 @@ public function shouldDelete()
     /**
      * Add a new entry
      *
-     * @param   array   $data   The defaults to use, if any
+     * @param ?array $data The defaults to use, if any
      *
-     * @return  $this
+     * @return $this
      */
-    public function add(array $data = null)
+    public function add(?array $data = null)
     {
         $this->mode = static::MODE_INSERT;
         $this->data = $data;
@@ -159,12 +159,12 @@ public function add(array $data = null)
     /**
      * Edit an entry
      *
-     * @param   string  $name   The entry's name
-     * @param   array   $data   The entry's current data
+     * @param string $name The entry's name
+     * @param ?array $data The entry's current data
      *
-     * @return  $this
+     * @return $this
      */
-    public function edit($name, array $data = null)
+    public function edit($name, ?array $data = null)
     {
         $this->mode = static::MODE_UPDATE;
         $this->identifier = $name;

application/views/scripts/error/error.phtml

@@ -23,7 +23,7 @@ $modReason = [];
 
 if (isset($requiredVendor, $requiredProject) && $requiredVendor && $requiredProject) {
     // TODO: I don't like this, can we define requirements somewhere else?
-    $coreDeps = ['icinga-php-library' => '>= 0.14.2', 'icinga-php-thirdparty' => '>= 0.12'];
+    $coreDeps = ['icinga-php-library' => '>= 0.19.0', 'icinga-php-thirdparty' => '>= 0.12'];
 
     foreach ($coreDeps as $libraryName => $requiredVersion) {
         if (! $libraries->has($libraryName)) {

doc/02-Installation.md

@@ -399,7 +399,7 @@ You will need to install certain dependencies depending on your setup:
   monitor your infrastructure
 * A web server, e.g. Apache or Nginx
 * PHP version ≥ 8.2
-* [Icinga PHP Library (ipl)](https://github.com/Icinga/icinga-php-library) (≥ 0.14.2)
+* [Icinga PHP Library (ipl)](https://github.com/Icinga/icinga-php-library) (≥ 0.19.0)
 * [Icinga PHP Thirdparty](https://github.com/Icinga/icinga-php-thirdparty) (≥ 0.12)
 * The following PHP modules must be installed: cURL, json, gettext, fileinfo, intl, dom, OpenSSL and xml
 * The [pdfexport](https://github.com/Icinga/icingaweb2-module-pdfexport) module (≥0.10) is required for the

library/Icinga/Application/Config.php

@@ -68,9 +68,9 @@ class Config implements Countable, Iterator, Selectable
     /**
      * Create a new config
      *
-     * @param   ConfigObject    $config     The config object to handle
+     * @param ?ConfigObject $config The config object to handle
      */
-    public function __construct(ConfigObject $config = null)
+    public function __construct(?ConfigObject $config = null)
     {
         $this->config = $config !== null ? $config : new ConfigObject();
     }

library/Icinga/Application/Hook/AuditHook.php

@@ -16,13 +16,14 @@ abstract class AuditHook
      *
      * Propagates the given message details to all known hook implementations.
      *
-     * @param   string  $type       An arbitrary name identifying the type of activity
-     * @param   string  $message    A detailed description possibly referencing parameters in $data
-     * @param   array   $data       Additional information (How this is stored or used is up to each implementation)
-     * @param   string  $identity   An arbitrary name identifying the responsible subject, defaults to the current user
-     * @param   int     $time       A timestamp defining when the activity occurred, defaults to now
+     * @param string $type An arbitrary name identifying the type of activity
+     * @param string $message A detailed description possibly referencing parameters in $data
+     * @param ?array $data Additional information (How this is stored or used is up to each implementation)
+     * @param string $identity An arbitrary name identifying the responsible subject,
+     *   defaults to the current user
+     * @param int $time A timestamp defining when the activity occurred, defaults to now
      */
-    public static function logActivity($type, $message, array $data = null, $identity = null, $time = null)
+    public static function logActivity($type, $message, ?array $data = null, $identity = null, $time = null)
     {
         if (! Hook::has('audit')) {
             return;
@@ -60,13 +61,13 @@ public static function logActivity($type, $message, array $data = null, $identit
     /**
      * Log a message to the audit log
      *
-     * @param   int     $time       A timestamp defining when the activity occurred
-     * @param   string  $identity   An arbitrary name identifying the responsible subject
-     * @param   string  $type       An arbitrary name identifying the type of activity
-     * @param   string  $message    A detailed description of the activity
-     * @param   array   $data       Additional activity information
+     * @param int $time A timestamp defining when the activity occurred
+     * @param string $identity An arbitrary name identifying the responsible subject
+     * @param string $type An arbitrary name identifying the type of activity
+     * @param string $message A detailed description of the activity
+     * @param ?array $data Additional activity information
      */
-    abstract public function logMessage($time, $identity, $type, $message, array $data = null);
+    abstract public function logMessage($time, $identity, $type, $message, ?array $data = null);
 
     /**
      * Substitute the given message with its accompanying data

library/Icinga/Application/Hook/DbMigrationHook.php

@@ -196,11 +196,11 @@ public function getLatestMigrations(int $limit): array
      * Apply all pending migrations of this hook
      *
      * @param ?Connection $conn Use the provided database connection to apply the migrations.
-     *        Is only used to elevate database users with insufficient privileges.
+     *   Is only used to elevate database users with insufficient privileges.
      *
      * @return bool Whether the migration(s) have been successfully applied
      */
-    final public function run(Connection $conn = null): bool
+    final public function run(?Connection $conn = null): bool
     {
         if (! $conn) {
             $conn = $this->getDb();

library/Icinga/Application/Hook/Ticket/TicketPattern.php

@@ -41,6 +41,7 @@ public function offsetExists($offset): bool
 
     public function offsetGet($offset): ?string
     {
+        $offset = $offset ?? '';
         return array_key_exists($offset, $this->match) ? $this->match[$offset] : null;
     }