PHP 8.4 deprecation: fix cases of implicitly marked nullable

tvdijen · tvdijen · commit 0d3b5474f51a · 2025-01-06T23:24:47.000+01:00
diff --git a/src/SimpleSAML/Error/Exception.php b/src/SimpleSAML/Error/Exception.php
@@ -53,7 +53,7 @@ class Exception extends \Exception
      * @param int            $code Error code
      * @param \Throwable|null $cause The cause of this exception.
      */
-    public function __construct(string $message, int $code = 0, Throwable $cause = null)
+    public function __construct(string $message, int $code = 0, ?Throwable $cause = null)
     {
         parent::__construct($message, $code);
 
diff --git a/src/SimpleSAML/Session.php b/src/SimpleSAML/Session.php
@@ -344,7 +344,7 @@ public static function getSessionFromRequest(): Session
      * @return \SimpleSAML\Session|null The session that is stored in the session handler,
      *   or null if the session wasn't found.
      */
-    public static function getSession(string $sessionId = null): ?Session
+    public static function getSession(?string $sessionId = null): ?Session
     {
         $sh = SessionHandler::getSessionHandler();
 
@@ -587,7 +587,7 @@ public function getRememberMeExpire(): ?int
      *
      * @param int $lifetime Number of seconds after when remember me session cookies expire.
      */
-    public function setRememberMeExpire(int $lifetime = null): void
+    public function setRememberMeExpire(?int $lifetime = null): void
     {
         if ($lifetime === null) {
             $lifetime = self::$config->getOptionalInteger('session.rememberme.lifetime', 14 * 86400);
@@ -817,7 +817,7 @@ public function updateSessionCookies(array $params = []): void
      * @param string $authority The authentication source we are setting expire time for.
      * @param int    $expire The number of seconds authentication source is valid.
      */
-    public function setAuthorityExpire(string $authority, int $expire = null): void
+    public function setAuthorityExpire(string $authority, ?int $expire = null): void
     {
         $this->markDirty();
 
diff --git a/src/SimpleSAML/SessionHandler.php b/src/SimpleSAML/SessionHandler.php
@@ -120,7 +120,7 @@ abstract public function hasSessionCookie(): bool;
      *
      * @throws \SimpleSAML\Error\CannotSetCookie If we can't set the cookie.
      */
-    abstract public function setCookie(string $sessionName, ?string $sessionID, array $cookieParams = null): void;
+    abstract public function setCookie(string $sessionName, ?string $sessionID, ?array $cookieParams = null): void;
 
 
     /**
diff --git a/src/SimpleSAML/SessionHandlerPHP.php b/src/SimpleSAML/SessionHandlerPHP.php
@@ -247,7 +247,7 @@ public function saveSession(Session $session): void
      * @throws \SimpleSAML\Error\Exception If it wasn't possible to disable session cookies or we are trying to load a
      * PHP session with a specific identifier and it doesn't match with the current session identifier.
      */
-    public function loadSession(string $sessionId = null): ?Session
+    public function loadSession(?string $sessionId = null): ?Session
     {
         if ($sessionId !== session_id()) {
             throw new Error\Exception('Cannot load PHP session with a specific ID.');
@@ -331,7 +331,7 @@ public function getCookieParams(): array
      *
      * @throws \SimpleSAML\Error\CannotSetCookie If we can't set the cookie.
      */
-    public function setCookie(string $sessionName, ?string $sessionID, array $cookieParams = null): void
+    public function setCookie(string $sessionName, ?string $sessionID, ?array $cookieParams = null): void
     {
         if ($cookieParams === null) {
             $cookieParams = session_get_cookie_params();

Original file line number	Diff line number	Diff line change
`@@ -53,7 +53,7 @@ class Exception extends \Exception`
`53`	`53`	`* @param int $code Error code`
`54`	`54`	`* @param \Throwable\|null $cause The cause of this exception.`
`55`	`55`	`*/`
`56`		`- public function __construct(string $message, int $code = 0, Throwable $cause = null)`
	`56`	`+ public function __construct(string $message, int $code = 0, ?Throwable $cause = null)`
`57`	`57`	`{`
`58`	`58`	`parent::__construct($message, $code);`
`59`	`59`
Original file line number	Diff line number	Diff line change
`@@ -344,7 +344,7 @@ public static function getSessionFromRequest(): Session`
`344`	`344`	`* @return \SimpleSAML\Session\|null The session that is stored in the session handler,`
`345`	`345`	`* or null if the session wasn't found.`
`346`	`346`	`*/`
`347`		`- public static function getSession(string $sessionId = null): ?Session`
	`347`	`+ public static function getSession(?string $sessionId = null): ?Session`
`348`	`348`	`{`
`349`	`349`	`$sh = SessionHandler::getSessionHandler();`
`350`	`350`
`@@ -587,7 +587,7 @@ public function getRememberMeExpire(): ?int`
`587`	`587`	`*`
`588`	`588`	`* @param int $lifetime Number of seconds after when remember me session cookies expire.`
`589`	`589`	`*/`
`590`		`- public function setRememberMeExpire(int $lifetime = null): void`
	`590`	`+ public function setRememberMeExpire(?int $lifetime = null): void`
`591`	`591`	`{`
`592`	`592`	`if ($lifetime === null) {`
`593`	`593`	`$lifetime = self::$config->getOptionalInteger('session.rememberme.lifetime', 14 * 86400);`
`@@ -817,7 +817,7 @@ public function updateSessionCookies(array $params = []): void`
`817`	`817`	`* @param string $authority The authentication source we are setting expire time for.`
`818`	`818`	`* @param int $expire The number of seconds authentication source is valid.`
`819`	`819`	`*/`
`820`		`- public function setAuthorityExpire(string $authority, int $expire = null): void`
	`820`	`+ public function setAuthorityExpire(string $authority, ?int $expire = null): void`
`821`	`821`	`{`
`822`	`822`	`$this->markDirty();`
`823`	`823`
Original file line number	Diff line number	Diff line change
`@@ -120,7 +120,7 @@ abstract public function hasSessionCookie(): bool;`
`120`	`120`	`*`
`121`	`121`	`* @throws \SimpleSAML\Error\CannotSetCookie If we can't set the cookie.`
`122`	`122`	`*/`
`123`		`- abstract public function setCookie(string $sessionName, ?string $sessionID, array $cookieParams = null): void;`
	`123`	`+ abstract public function setCookie(string $sessionName, ?string $sessionID, ?array $cookieParams = null): void;`
`124`	`124`
`125`	`125`
`126`	`126`	`/**`
Original file line number	Diff line number	Diff line change
`@@ -247,7 +247,7 @@ public function saveSession(Session $session): void`
`247`	`247`	`* @throws \SimpleSAML\Error\Exception If it wasn't possible to disable session cookies or we are trying to load a`
`248`	`248`	`* PHP session with a specific identifier and it doesn't match with the current session identifier.`
`249`	`249`	`*/`
`250`		`- public function loadSession(string $sessionId = null): ?Session`
	`250`	`+ public function loadSession(?string $sessionId = null): ?Session`
`251`	`251`	`{`
`252`	`252`	`if ($sessionId !== session_id()) {`
`253`	`253`	`throw new Error\Exception('Cannot load PHP session with a specific ID.');`
`@@ -331,7 +331,7 @@ public function getCookieParams(): array`
`331`	`331`	`*`
`332`	`332`	`* @throws \SimpleSAML\Error\CannotSetCookie If we can't set the cookie.`
`333`	`333`	`*/`
`334`		`- public function setCookie(string $sessionName, ?string $sessionID, array $cookieParams = null): void`
	`334`	`+ public function setCookie(string $sessionName, ?string $sessionID, ?array $cookieParams = null): void`
`335`	`335`	`{`
`336`	`336`	`if ($cookieParams === null) {`
`337`	`337`	`$cookieParams = session_get_cookie_params();`