diff options
| author | Simon Rettberg | 2025-08-01 13:41:49 +0200 |
|---|---|---|
| committer | Simon Rettberg | 2025-08-01 13:41:49 +0200 |
| commit | 429cfb1677ec77c5a945f655d9405d038d3e5a2c (patch) | |
| tree | b3fbb729cb2231f4163b96a67046ad878f48d1b4 /modules-available/sysconfig/inc | |
| parent | [minilinux] show -> action for POST actions (diff) | |
| download | slx-admin-429cfb1677ec77c5a945f655d9405d038d3e5a2c.tar.gz slx-admin-429cfb1677ec77c5a945f655d9405d038d3e5a2c.tar.xz slx-admin-429cfb1677ec77c5a945f655d9405d038d3e5a2c.zip | |
Implicitly nullable types are deprecated in PHP 8.3, make explicit
Diffstat (limited to 'modules-available/sysconfig/inc')
| -rw-r--r-- | modules-available/sysconfig/inc/configmodule.inc.php | 4 | ||||
| -rw-r--r-- | modules-available/sysconfig/inc/configmodulebaseldap.inc.php | 4 | ||||
| -rw-r--r-- | modules-available/sysconfig/inc/ppd.inc.php | 2 |
3 files changed, 5 insertions, 5 deletions
diff --git a/modules-available/sysconfig/inc/configmodule.inc.php b/modules-available/sysconfig/inc/configmodule.inc.php index 34970d0a..b5494866 100644 --- a/modules-available/sysconfig/inc/configmodule.inc.php +++ b/modules-available/sysconfig/inc/configmodule.inc.php @@ -165,7 +165,7 @@ abstract class ConfigModule * @param string $moduleType module type to get * @return ?ConfigModule[] The requested modules from DB, or null on error */ - public static function getAll(string $moduleType = null): ?array + public static function getAll(?string $moduleType = null): ?array { if ($moduleType === null) { $ret = Database::simpleQuery("SELECT moduleid, title, moduletype, filepath, contents, version, status, dateline FROM configtgz_module"); @@ -379,7 +379,7 @@ abstract class ConfigModule * true if generation succeeded (without using a task or within $timeoutMs) * false on error */ - public final function generate(bool $deleteOnError, string $parent = NULL, int $timeoutMs = 0) + public final function generate(bool $deleteOnError, ?string $parent = null, int $timeoutMs = 0) { if ($this->moduleId === 0 || empty($this->moduleTitle)) ErrorHandler::traceError('ConfigModule::generateAsync called on uninitialized/uninserted module!'); diff --git a/modules-available/sysconfig/inc/configmodulebaseldap.inc.php b/modules-available/sysconfig/inc/configmodulebaseldap.inc.php index 388b6268..e21c3904 100644 --- a/modules-available/sysconfig/inc/configmodulebaseldap.inc.php +++ b/modules-available/sysconfig/inc/configmodulebaseldap.inc.php @@ -11,7 +11,7 @@ abstract class ConfigModuleBaseLdap extends ConfigModule 'shareOther', 'shareHomeDrive', 'shareDomain', 'credentialPassthrough', 'mapping', 'genuid', 'ldapAttrMountOpts', 'shareHomeMountOpts', 'nohomewarn'); - public static function getMapping(array $config = null, ?bool &$empty = true): array + public static function getMapping(?array $config = null, ?bool &$empty = true): array { $list = array( ['name' => 'uid', 'field' => 'uid', 'ad' => 'sAMAccountName'], @@ -49,7 +49,7 @@ abstract class ConfigModuleBaseLdap extends ConfigModule * @param string|null $parent if not NULL, this will be the parent task of the launch-task * @return boolean|string false on error, id of task otherwise */ - public static function ldadp(string $command = 'start', $ids = false, string $parent = null) + public static function ldadp(string $command = 'start', $ids = false, ?string $parent = null) { if ($ids === false) { $ids = self::getActiveModuleIds(); diff --git a/modules-available/sysconfig/inc/ppd.inc.php b/modules-available/sysconfig/inc/ppd.inc.php index c28e0355..a7fc7acb 100644 --- a/modules-available/sysconfig/inc/ppd.inc.php +++ b/modules-available/sysconfig/inc/ppd.inc.php @@ -866,7 +866,7 @@ class Ppd return $this->error === null; } - public function addEmptyOption(string $settingName, string $option, string $translation = null, bool $prepend = true): bool + public function addEmptyOption(string $settingName, string $option, ?string $translation = null, ?bool $prepend = true): bool { if (!isset($this->settings[$settingName])) return false; |
