fix PHP 8.4 support

tvdijen · tvdijen · commit e74697720101 · 2024-12-02T22:45:28.000+01:00
diff --git a/src/SimpleSAML/Configuration.php b/src/SimpleSAML/Configuration.php
@@ -1315,7 +1315,7 @@ public function getEndpointPrioritizedByBinding(
      */
     public function getDefaultEndpoint(
         string $endpointType,
-        array $bindings = null,
+        ?array $bindings = null,
         mixed $default = self::REQUIRED_OPTION,
     ): mixed {
         $endpoints = $this->getEndpoints($endpointType);
diff --git a/src/SimpleSAML/Locale/Localization.php b/src/SimpleSAML/Locale/Localization.php
@@ -130,7 +130,7 @@ public function getDomainLocaleDir(string $domain): string
      * @param string $localeDir Absolute path if the module is housed elsewhere
      * @param string $domain Translation domain within module; defaults to module name
      */
-    public function addModuleDomain(string $module, string $localeDir = null, string $domain = null): void
+    public function addModuleDomain(string $module, ?string $localeDir = null, ?string $domain = null): void
     {
         if (!$localeDir) {
             $localeDir = $this->getDomainLocaleDir($module);
diff --git a/src/SimpleSAML/Module.php b/src/SimpleSAML/Module.php
@@ -156,7 +156,7 @@ public static function isModuleEnabled(string $module): bool
      * @throws Error\BadRequest In case the request URI is malformed.
      * @throws Error\NotFound In case the request URI is invalid or the resource it points to cannot be found.
      */
-    public static function process(Request $request = null): Response
+    public static function process(?Request $request = null): Response
     {
         if ($request === null) {
             $request = Request::createFromGlobals();
diff --git a/src/SimpleSAML/Utils/HTTP.php b/src/SimpleSAML/Utils/HTTP.php
@@ -380,7 +380,7 @@ public function checkSessionCookie(?string $retryURL = null): void
      * @throws Error\Exception If the URL is not allowed by configuration.
      *
      */
-    public function checkURLAllowed(string $url, array $trustedSites = null): string
+    public function checkURLAllowed(string $url, ?array $trustedSites = null): string
     {
         if (empty($url)) {
             return '';
@@ -1019,7 +1019,7 @@ public function redirectUntrustedURL(string $url, array $parameters = []): Redir
      *     are not strings.
      *
      */
-    public function resolveURL(string $url, string $base = null): string
+    public function resolveURL(string $url, ?string $base = null): string
     {
         if ($base === null) {
             $base = $this->getBaseURL();
@@ -1094,7 +1094,7 @@ public function resolveURL(string $url, string $base = null): string
      *
      *
      */
-    public function setCookie(string $name, ?string $value, array $params = null, bool $throw = true): void
+    public function setCookie(string $name, ?string $value, ?array $params = null, bool $throw = true): void
     {
         $default_params = [
             'lifetime' => 0,
diff --git a/src/SimpleSAML/Utils/System.php b/src/SimpleSAML/Utils/System.php
@@ -143,7 +143,7 @@ public function getTempDir(): string
      * @return string An absolute path referring to $path.
      *
      */
-    public function resolvePath(string $path, string $base = null): string
+    public function resolvePath(string $path, ?string $base = null): string
     {
         if ($base === null) {
             $config = Configuration::getInstance();
diff --git a/src/SimpleSAML/XHTML/Template.php b/src/SimpleSAML/XHTML/Template.php
@@ -172,7 +172,7 @@ class_exists($controller)
      * @param bool $tag
      * @return string
      */
-    public function asset(string $asset, string $module = null, bool $tag = true): string
+    public function asset(string $asset, ?string $module = null, bool $tag = true): string
     {
         $baseDir = $this->configuration->getBaseDir();
         $basePath = $this->configuration->getBasePath();

Original file line number	Diff line number	Diff line change
`@@ -130,7 +130,7 @@ public function getDomainLocaleDir(string $domain): string`
`130`	`130`	`* @param string $localeDir Absolute path if the module is housed elsewhere`
`131`	`131`	`* @param string $domain Translation domain within module; defaults to module name`
`132`	`132`	`*/`
`133`		`- public function addModuleDomain(string $module, string $localeDir = null, string $domain = null): void`
	`133`	`+ public function addModuleDomain(string $module, ?string $localeDir = null, ?string $domain = null): void`
`134`	`134`	`{`
`135`	`135`	`if (!$localeDir) {`
`136`	`136`	`$localeDir = $this->getDomainLocaleDir($module);`
Original file line number	Diff line number	Diff line change
`@@ -156,7 +156,7 @@ public static function isModuleEnabled(string $module): bool`
`156`	`156`	`* @throws Error\BadRequest In case the request URI is malformed.`
`157`	`157`	`* @throws Error\NotFound In case the request URI is invalid or the resource it points to cannot be found.`
`158`	`158`	`*/`
`159`		`- public static function process(Request $request = null): Response`
	`159`	`+ public static function process(?Request $request = null): Response`
`160`	`160`	`{`
`161`	`161`	`if ($request === null) {`
`162`	`162`	`$request = Request::createFromGlobals();`
Original file line number	Diff line number	Diff line change
`@@ -380,7 +380,7 @@ public function checkSessionCookie(?string $retryURL = null): void`
`380`	`380`	`* @throws Error\Exception If the URL is not allowed by configuration.`
`381`	`381`	`*`
`382`	`382`	`*/`
`383`		`- public function checkURLAllowed(string $url, array $trustedSites = null): string`
	`383`	`+ public function checkURLAllowed(string $url, ?array $trustedSites = null): string`
`384`	`384`	`{`
`385`	`385`	`if (empty($url)) {`
`386`	`386`	`return '';`
`@@ -1019,7 +1019,7 @@ public function redirectUntrustedURL(string $url, array $parameters = []): Redir`
`1019`	`1019`	`* are not strings.`
`1020`	`1020`	`*`
`1021`	`1021`	`*/`
`1022`		`- public function resolveURL(string $url, string $base = null): string`
	`1022`	`+ public function resolveURL(string $url, ?string $base = null): string`
`1023`	`1023`	`{`
`1024`	`1024`	`if ($base === null) {`
`1025`	`1025`	`$base = $this->getBaseURL();`
`@@ -1094,7 +1094,7 @@ public function resolveURL(string $url, string $base = null): string`
`1094`	`1094`	`*`
`1095`	`1095`	`*`
`1096`	`1096`	`*/`
`1097`		`- public function setCookie(string $name, ?string $value, array $params = null, bool $throw = true): void`
	`1097`	`+ public function setCookie(string $name, ?string $value, ?array $params = null, bool $throw = true): void`
`1098`	`1098`	`{`
`1099`	`1099`	`$default_params = [`
`1100`	`1100`	`'lifetime' => 0,`
Original file line number	Diff line number	Diff line change
`@@ -143,7 +143,7 @@ public function getTempDir(): string`
`143`	`143`	`* @return string An absolute path referring to $path.`
`144`	`144`	`*`
`145`	`145`	`*/`
`146`		`- public function resolvePath(string $path, string $base = null): string`
	`146`	`+ public function resolvePath(string $path, ?string $base = null): string`
`147`	`147`	`{`
`148`	`148`	`if ($base === null) {`
`149`	`149`	`$config = Configuration::getInstance();`
Original file line number	Diff line number	Diff line change
`@@ -172,7 +172,7 @@ class_exists($controller)`
`172`	`172`	`* @param bool $tag`
`173`	`173`	`* @return string`
`174`	`174`	`*/`
`175`		`- public function asset(string $asset, string $module = null, bool $tag = true): string`
	`175`	`+ public function asset(string $asset, ?string $module = null, bool $tag = true): string`
`176`	`176`	`{`
`177`	`177`	`$baseDir = $this->configuration->getBaseDir();`
`178`	`178`	`$basePath = $this->configuration->getBasePath();`