From 392603a3d057579547591da444e0590db8a2d27d Mon Sep 17 00:00:00 2001
From: Tim van Dijen <tvdijen@gmail.com>
Date: Sun, 11 Aug 2019 22:47:32 +0200
Subject: [PATCH] Fully typehint lib/IdP/*.php
---
lib/SimpleSAML/IdP/IFrameLogoutHandler.php | 8 ++------
lib/SimpleSAML/IdP/LogoutHandlerInterface.php | 4 ++--
lib/SimpleSAML/IdP/TraditionalLogoutHandler.php | 9 +++------
3 files changed, 7 insertions(+), 14 deletions(-)
diff --git a/lib/SimpleSAML/IdP/IFrameLogoutHandler.php b/lib/SimpleSAML/IdP/IFrameLogoutHandler.php
index 6c7b2e7d5..17c789d58 100644
--- a/lib/SimpleSAML/IdP/IFrameLogoutHandler.php
+++ b/lib/SimpleSAML/IdP/IFrameLogoutHandler.php
@@ -45,10 +45,8 @@ class IFrameLogoutHandler implements LogoutHandlerInterface
* @param string|null $assocId The SP we are logging out from.
* @return void
*/
- public function startLogout(array &$state, $assocId)
+ public function startLogout(array &$state, ?string $assocId) : void
{
- Assert::nullOrString($assocId);
-
$associations = $this->idp->getAssociations();
if (count($associations) === 0) {
@@ -95,10 +93,8 @@ class IFrameLogoutHandler implements LogoutHandlerInterface
* @param \SimpleSAML\Error\Exception|null $error The error that occurred during session termination (if any).
* @return void
*/
- public function onResponse($assocId, $relayState, Error\Exception $error = null)
+ public function onResponse(string $assocId, ?string $relayState, Error\Exception $error = null): void
{
- Assert::string($assocId);
-
$this->idp->terminateAssociation($assocId);
$config = Configuration::getInstance();
diff --git a/lib/SimpleSAML/IdP/LogoutHandlerInterface.php b/lib/SimpleSAML/IdP/LogoutHandlerInterface.php
index c072456c9..3708d6924 100644
--- a/lib/SimpleSAML/IdP/LogoutHandlerInterface.php
+++ b/lib/SimpleSAML/IdP/LogoutHandlerInterface.php
@@ -32,7 +32,7 @@ interface LogoutHandlerInterface
* @param string $assocId The association that started the logout.
* @return void
*/
- public function startLogout(array &$state, $assocId);
+ public function startLogout(array &$state, string $assocId): void;
/**
@@ -45,5 +45,5 @@ interface LogoutHandlerInterface
* @param \SimpleSAML\Error\Exception|null $error The error that occurred during session termination (if any).
* @return void
*/
- public function onResponse($assocId, $relayState, Error\Exception $error = null);
+ public function onResponse(string $assocId, ?string $relayState, Error\Exception $error = null): void;
}
diff --git a/lib/SimpleSAML/IdP/TraditionalLogoutHandler.php b/lib/SimpleSAML/IdP/TraditionalLogoutHandler.php
index 885439490..9c9705ff7 100644
--- a/lib/SimpleSAML/IdP/TraditionalLogoutHandler.php
+++ b/lib/SimpleSAML/IdP/TraditionalLogoutHandler.php
@@ -46,7 +46,7 @@ class TraditionalLogoutHandler implements LogoutHandlerInterface
* @param array &$state The logout state.
* @return void
*/
- private function logoutNextSP(array &$state)
+ private function logoutNextSP(array &$state): void
{
$association = array_pop($state['core:LogoutTraditional:Remaining']);
if ($association === null) {
@@ -83,7 +83,7 @@ class TraditionalLogoutHandler implements LogoutHandlerInterface
* @param string $assocId The association that started the logout.
* @return void
*/
- public function startLogout(array &$state, $assocId)
+ public function startLogout(array &$state, string $assocId): void
{
$state['core:LogoutTraditional:Remaining'] = $this->idp->getAssociations();
@@ -103,11 +103,8 @@ class TraditionalLogoutHandler implements LogoutHandlerInterface
*
* @throws \SimpleSAML\Error\Exception If the RelayState was lost during logout.
*/
- public function onResponse($assocId, $relayState, Error\Exception $error = null)
+ public function onResponse(string $assocId, ?string $relayState, Error\Exception $error = null): void
{
- Assert::string($assocId);
- Assert::nullOrString($relayState);
-
if ($relayState === null) {
throw new Error\Exception('RelayState lost during logout.');
}
--
GitLab