From 56a8949141a3aa2d783763aaaaccaa0ccf6164c2 Mon Sep 17 00:00:00 2001
From: Tim van Dijen <tvdijen@gmail.com>
Date: Mon, 14 Mar 2022 22:24:35 +0100
Subject: [PATCH] Psalter: Remove obsolete annotations
---
lib/SimpleSAML/Auth/State.php | 1 -
lib/SimpleSAML/IdP/TraditionalLogoutHandler.php | 1 -
lib/SimpleSAML/Utils/Attributes.php | 2 --
modules/core/lib/Auth/UserPassBase.php | 1 -
modules/core/lib/Auth/UserPassOrgBase.php | 2 --
modules/core/lib/Controller/Exception.php | 3 ---
modules/core/www/idp/logout-iframe-done.php | 1 -
modules/core/www/idp/logout-iframe.php | 1 -
modules/core/www/idp/resumelogout.php | 1 -
modules/core/www/loginuserpass.php | 1 -
modules/core/www/loginuserpassorg.php | 1 -
modules/exampleauth/lib/Auth/Source/External.php | 1 -
modules/exampleauth/lib/Controller/ExampleAuth.php | 1 -
modules/multiauth/lib/Controller/DiscoController.php | 1 -
modules/saml/www/proxy/invalid_session.php | 2 --
modules/saml/www/sp/discoresp.php | 1 -
16 files changed, 21 deletions(-)
diff --git a/lib/SimpleSAML/Auth/State.php b/lib/SimpleSAML/Auth/State.php
index 032d00473..b43f48f1b 100644
--- a/lib/SimpleSAML/Auth/State.php
+++ b/lib/SimpleSAML/Auth/State.php
@@ -389,7 +389,6 @@ class State
$id = $_REQUEST[self::EXCEPTION_PARAM];
}
- /** @var array $state */
$state = self::loadState($id, self::EXCEPTION_STAGE);
Assert::keyExists($state, self::EXCEPTION_DATA);
diff --git a/lib/SimpleSAML/IdP/TraditionalLogoutHandler.php b/lib/SimpleSAML/IdP/TraditionalLogoutHandler.php
index e5b02908c..fd1829e31 100644
--- a/lib/SimpleSAML/IdP/TraditionalLogoutHandler.php
+++ b/lib/SimpleSAML/IdP/TraditionalLogoutHandler.php
@@ -107,7 +107,6 @@ class TraditionalLogoutHandler implements LogoutHandlerInterface
throw new Error\Exception('RelayState lost during logout.');
}
- /** @psalm-var array $state */
$state = Auth\State::loadState($relayState, 'core:LogoutTraditional');
if ($error === null) {
diff --git a/lib/SimpleSAML/Utils/Attributes.php b/lib/SimpleSAML/Utils/Attributes.php
index af6edfb86..791e4da44 100644
--- a/lib/SimpleSAML/Utils/Attributes.php
+++ b/lib/SimpleSAML/Utils/Attributes.php
@@ -72,7 +72,6 @@ class Attributes
$newAttrs = [];
foreach ($attributes as $name => $values) {
if (!is_string($name)) {
- /** @var string $name */
$name = print_r($name, true);
throw new InvalidArgumentException(sprintf('Invalid attribute name: "%s".', $name));
}
@@ -82,7 +81,6 @@ class Attributes
foreach ($values as $value) {
if (!is_string($value)) {
- /** @var string $value */
$value = print_r($value, true);
throw new InvalidArgumentException(
sprintf('Invalid attribute value for attribute %s: "%s".', $name, $value)
diff --git a/modules/core/lib/Auth/UserPassBase.php b/modules/core/lib/Auth/UserPassBase.php
index 11f18f1d4..c8630b4bf 100644
--- a/modules/core/lib/Auth/UserPassBase.php
+++ b/modules/core/lib/Auth/UserPassBase.php
@@ -284,7 +284,6 @@ abstract class UserPassBase extends Auth\Source
public static function handleLogin(string $authStateId, string $username, string $password): void
{
// Here we retrieve the state array we saved in the authenticate-function.
- /** @var array $state */
$state = Auth\State::loadState($authStateId, self::STAGEID);
// Retrieve the authentication source we are executing.
diff --git a/modules/core/lib/Auth/UserPassOrgBase.php b/modules/core/lib/Auth/UserPassOrgBase.php
index aaed8a59a..a85839859 100644
--- a/modules/core/lib/Auth/UserPassOrgBase.php
+++ b/modules/core/lib/Auth/UserPassOrgBase.php
@@ -270,7 +270,6 @@ abstract class UserPassOrgBase extends Auth\Source
string $organization
): void {
/* Retrieve the authentication state. */
- /** @var array $state */
$state = Auth\State::loadState($authStateId, self::STAGEID);
/* Find authentication source. */
@@ -330,7 +329,6 @@ abstract class UserPassOrgBase extends Auth\Source
public static function listOrganizations(string $authStateId): ?array
{
/* Retrieve the authentication state. */
- /** @var array $state */
$state = Auth\State::loadState($authStateId, self::STAGEID);
/* Find authentication source. */
diff --git a/modules/core/lib/Controller/Exception.php b/modules/core/lib/Controller/Exception.php
index b5a758c39..18067fb6c 100644
--- a/modules/core/lib/Controller/Exception.php
+++ b/modules/core/lib/Controller/Exception.php
@@ -65,9 +65,7 @@ class Exception
throw new Error\BadRequest('Missing required StateId query parameter.');
}
- /** @var array $state */
$state = Auth\State::loadState($stateId, 'core:cardinality');
-
Logger::stats(
'core:cardinality:error ' . $state['Destination']['entityid'] . ' ' . $state['saml:sp:IdP'] .
' ' . implode(',', array_keys($state['core:cardinality:errorAttributes']))
@@ -126,7 +124,6 @@ class Exception
throw new Error\BadRequest('Missing required StateId query parameter.');
}
- /** @var array $state */
$state = Auth\State::loadState($stateId, 'core:short_sso_interval');
$continue = $request->query->get('continue', false);
diff --git a/modules/core/www/idp/logout-iframe-done.php b/modules/core/www/idp/logout-iframe-done.php
index ca1618dfc..2e5c759b0 100644
--- a/modules/core/www/idp/logout-iframe-done.php
+++ b/modules/core/www/idp/logout-iframe-done.php
@@ -4,7 +4,6 @@ if (!isset($_REQUEST['id'])) {
throw new \SimpleSAML\Error\BadRequest('Missing required parameter: id');
}
-/** @psalm-var array $state */
$state = \SimpleSAML\Auth\State::loadState($_REQUEST['id'], 'core:Logout-IFrame');
$idp = \SimpleSAML\IdP::getByState($state);
diff --git a/modules/core/www/idp/logout-iframe.php b/modules/core/www/idp/logout-iframe.php
index 759e6fdf8..34c5ae32e 100644
--- a/modules/core/www/idp/logout-iframe.php
+++ b/modules/core/www/idp/logout-iframe.php
@@ -18,7 +18,6 @@ if ($type !== 'embed') {
\SimpleSAML\Stats::log('core:idp:logout-iframe:page', ['type' => $type]);
}
-/** @psalm-var array $state */
$state = \SimpleSAML\Auth\State::loadState($_REQUEST['id'], 'core:Logout-IFrame');
$idp = \SimpleSAML\IdP::getByState($state);
$mdh = \SimpleSAML\Metadata\MetaDataStorageHandler::getMetadataHandler();
diff --git a/modules/core/www/idp/resumelogout.php b/modules/core/www/idp/resumelogout.php
index 5f90c0bca..656885f44 100644
--- a/modules/core/www/idp/resumelogout.php
+++ b/modules/core/www/idp/resumelogout.php
@@ -4,7 +4,6 @@ if (!isset($_REQUEST['id'])) {
throw new \SimpleSAML\Error\BadRequest('Missing id-parameter.');
}
-/** @psalm-var array $state */
$state = \SimpleSAML\Auth\State::loadState($_REQUEST['id'], 'core:Logout:afterbridge');
$idp = \SimpleSAML\IdP::getByState($state);
diff --git a/modules/core/www/loginuserpass.php b/modules/core/www/loginuserpass.php
index b770b889b..45b6207c4 100644
--- a/modules/core/www/loginuserpass.php
+++ b/modules/core/www/loginuserpass.php
@@ -13,7 +13,6 @@ if (!array_key_exists('AuthState', $_REQUEST)) {
throw new \SimpleSAML\Error\BadRequest('Missing AuthState parameter.');
}
$authStateId = $_REQUEST['AuthState'];
-/** @var array $state */
$state = \SimpleSAML\Auth\State::loadState($authStateId, \SimpleSAML\Module\core\Auth\UserPassBase::STAGEID);
/** @var \SimpleSAML\Module\core\Auth\UserPassBase|null $source */
diff --git a/modules/core/www/loginuserpassorg.php b/modules/core/www/loginuserpassorg.php
index 44f5d39c9..00bc014f1 100644
--- a/modules/core/www/loginuserpassorg.php
+++ b/modules/core/www/loginuserpassorg.php
@@ -14,7 +14,6 @@ if (!array_key_exists('AuthState', $_REQUEST)) {
}
$authStateId = $_REQUEST['AuthState'];
-/** @var array $state */
$state = \SimpleSAML\Auth\State::loadState($authStateId, \SimpleSAML\Module\core\Auth\UserPassOrgBase::STAGEID);
/** @var \SimpleSAML\Module\core\Auth\UserPassOrgBase $source */
diff --git a/modules/exampleauth/lib/Auth/Source/External.php b/modules/exampleauth/lib/Auth/Source/External.php
index 6e7d5166f..39b7063ce 100644
--- a/modules/exampleauth/lib/Auth/Source/External.php
+++ b/modules/exampleauth/lib/Auth/Source/External.php
@@ -203,7 +203,6 @@ class External extends Auth\Source
* Once again, note the second parameter to the loadState function. This must
* match the string we used in the saveState-call above.
*/
- /** @var array $state */
$state = Auth\State::loadState($request->query->get('State'), 'exampleauth:External');
/*
diff --git a/modules/exampleauth/lib/Controller/ExampleAuth.php b/modules/exampleauth/lib/Controller/ExampleAuth.php
index aed747526..961fbfe68 100644
--- a/modules/exampleauth/lib/Controller/ExampleAuth.php
+++ b/modules/exampleauth/lib/Controller/ExampleAuth.php
@@ -185,7 +185,6 @@ class ExampleAuth
throw new Error\BadRequest('Missing required StateId query parameter.');
}
- /** @var array $state */
$state = $this->authState::loadState($stateId, 'exampleauth:redirectfilter-test');
$state['Attributes']['RedirectTest2'] = ['OK'];
diff --git a/modules/multiauth/lib/Controller/DiscoController.php b/modules/multiauth/lib/Controller/DiscoController.php
index 6f0694ae0..09f577e9f 100644
--- a/modules/multiauth/lib/Controller/DiscoController.php
+++ b/modules/multiauth/lib/Controller/DiscoController.php
@@ -103,7 +103,6 @@ class DiscoController
throw new Error\BadRequest('Missing AuthState parameter.');
}
- /** @var array $state */
$state = $this->authState::loadState($authStateId, MultiAuth::STAGEID);
$as = null;
diff --git a/modules/saml/www/proxy/invalid_session.php b/modules/saml/www/proxy/invalid_session.php
index 5a95f2a78..5181da60e 100644
--- a/modules/saml/www/proxy/invalid_session.php
+++ b/modules/saml/www/proxy/invalid_session.php
@@ -15,11 +15,9 @@ if (!array_key_exists('AuthState', $_REQUEST)) {
try {
// try to get the state
- /** @var array $state State can never be null without a third argument */
$state = \SimpleSAML\Auth\State::loadState($_REQUEST['AuthState'], 'saml:proxy:invalid_idp');
} catch (\Exception $e) {
// the user probably hit the back button after starting the logout, try to recover the state with another stage
- /** @var array $state State can never be null without a third argument */
$state = \SimpleSAML\Auth\State::loadState($_REQUEST['AuthState'], 'core:Logout:afterbridge');
// success! Try to continue with reauthentication, since we no longer have a valid session here
diff --git a/modules/saml/www/sp/discoresp.php b/modules/saml/www/sp/discoresp.php
index 28d855a7c..5944cfae5 100644
--- a/modules/saml/www/sp/discoresp.php
+++ b/modules/saml/www/sp/discoresp.php
@@ -16,7 +16,6 @@ if (!array_key_exists('idpentityid', $_REQUEST)) {
throw new Error\BadRequest('Missing idpentityid to discovery service response handler');
}
-/** @var array $state */
$state = Auth\State::loadState($_REQUEST['AuthID'], 'saml:sp:sso');
// Find authentication source
--
GitLab