Restore nullable assocId for SLO (#1787)

tvdijen · web-flow · commit d0a3d7c7262f · 2023-03-09T21:09:01.000+01:00
* Restore nullable assocId for SLO

* Fix namespace

* Add changelog note

* Fix changelog
diff --git a/docs/simplesamlphp-changelog.md b/docs/simplesamlphp-changelog.md
@@ -10,7 +10,7 @@ See the upgrade notes for specific information about upgrading.
 Released 2023-03-10
 
 * The language-menu on mobile devices was fixed
-* Fix some issues with logout (#1780, #1785)
+* Fix some issues with logout (#1776, #1780, #1785)
 * The `loginpage_links` functionality for authsources was restored and documented (#1770, #1773)
 * Several issues regarding the use of the back-button were fixed (#1720)
 * Many fixes in documentation
diff --git a/src/SimpleSAML/IdP.php b/src/SimpleSAML/IdP.php
@@ -437,7 +437,7 @@ public function getLogoutHandler(): LogoutHandlerInterface
                 throw new Error\Exception('Unknown logout handler: ' . var_export($logouttype, true));
         }
 
-        /** @var IdP\LogoutHandlerInterface */
+        /** @var \SimpleSAML\IdP\LogoutHandlerInterface */
         return new $handler($this);
     }
 
diff --git a/src/SimpleSAML/IdP/LogoutHandlerInterface.php b/src/SimpleSAML/IdP/LogoutHandlerInterface.php
@@ -29,9 +29,9 @@ public function __construct(IdP $idp);
      * This function must never return.
      *
      * @param array &$state The logout state.
-     * @param string $assocId The association that started the logout.
+     * @param string|null $assocId The association that started the logout.
      */
-    public function startLogout(array &$state, string $assocId): void;
+    public function startLogout(array &$state, ?string $assocId): void;
 
 
     /**
diff --git a/src/SimpleSAML/IdP/TraditionalLogoutHandler.php b/src/SimpleSAML/IdP/TraditionalLogoutHandler.php
@@ -80,9 +80,9 @@ private function logoutNextSP(array &$state): void
      * This function never returns.
      *
      * @param array  &$state The logout state.
-     * @param string $assocId The association that started the logout.
+     * @param string|null $assocId The association that started the logout.
      */
-    public function startLogout(array &$state, string $assocId): void
+    public function startLogout(array &$state, /** @scrutinizer ignore-unused */?string $assocId): void
     {
         $state['core:LogoutTraditional:Remaining'] = $this->idp->getAssociations();
 

Original file line number	Diff line number	Diff line change
`@@ -437,7 +437,7 @@ public function getLogoutHandler(): LogoutHandlerInterface`
`437`	`437`	`throw new Error\Exception('Unknown logout handler: ' . var_export($logouttype, true));`
`438`	`438`	`}`
`439`	`439`
`440`		`- /** @var IdP\LogoutHandlerInterface */`
	`440`	`+ /** @var \SimpleSAML\IdP\LogoutHandlerInterface */`
`441`	`441`	`return new $handler($this);`
`442`	`442`	`}`
`443`	`443`
Original file line number	Diff line number	Diff line change
`@@ -80,9 +80,9 @@ private function logoutNextSP(array &$state): void`
`80`	`80`	`* This function never returns.`
`81`	`81`	`*`
`82`	`82`	`* @param array &$state The logout state.`
`83`		`- * @param string $assocId The association that started the logout.`
	`83`	`+ * @param string\|null $assocId The association that started the logout.`
`84`	`84`	`*/`
`85`		`- public function startLogout(array &$state, string $assocId): void`
	`85`	`+ public function startLogout(array &$state, /** @scrutinizer ignore-unused */?string $assocId): void`
`86`	`86`	`{`
`87`	`87`	`$state['core:LogoutTraditional:Remaining'] = $this->idp->getAssociations();`
`88`	`88`