From 8d72d7d3df87c725aa8cea25a3caf682b52df939 Mon Sep 17 00:00:00 2001
From: Tim van Dijen <tvdijen@gmail.com>
Date: Wed, 23 Mar 2022 21:44:05 +0100
Subject: [PATCH] Fix unnecessary annotations
---
modules/core/lib/Controller/Login.php | 2 --
modules/core/lib/Controller/Logout.php | 4 ----
tests/modules/core/lib/Controller/LoginTest.php | 3 ---
3 files changed, 9 deletions(-)
diff --git a/modules/core/lib/Controller/Login.php b/modules/core/lib/Controller/Login.php
index 5e57eb09a..b93114c3c 100644
--- a/modules/core/lib/Controller/Login.php
+++ b/modules/core/lib/Controller/Login.php
@@ -111,7 +111,6 @@ class Login
}
$authStateId = $request->query->get('AuthState');
- /** @var array $state */
$state = $this->authState::loadState($authStateId, UserPassBase::STAGEID);
/** @var \SimpleSAML\Module\core\Auth\UserPassBase|null $source */
@@ -327,7 +326,6 @@ class Login
}
$authStateId = $request->query->get('AuthState');
- /** @var array $state */
$state = $this->authState::loadState($authStateId, UserPassOrgBase::STAGEID);
/** @var \SimpleSAML\Module\core\Auth\UserPassOrgBase $source */
diff --git a/modules/core/lib/Controller/Logout.php b/modules/core/lib/Controller/Logout.php
index 3e3ab60ff..26298590c 100644
--- a/modules/core/lib/Controller/Logout.php
+++ b/modules/core/lib/Controller/Logout.php
@@ -126,7 +126,6 @@ class Logout
}
$id = $request->query->get('id');
- /** @psalm-var array $state */
$state = $this->authState::loadState($id, 'core:Logout-IFrame');
$idp = IdP::getByState($state);
@@ -240,7 +239,6 @@ class Logout
$bindings = [Constants::BINDING_HTTP_POST];
- /** @var array $dst */
$dst = $spMetadata->getDefaultEndpoint('SingleLogoutService', $bindings);
$binding = Binding::getBinding($dst['Binding']);
$lr->setDestination($dst['Location']);
@@ -274,7 +272,6 @@ class Logout
Stats::log('core:idp:logout-iframe:page', ['type' => $type]);
}
- /** @psalm-var array $state */
$state = $this->authState::loadState($id, 'core:Logout-IFrame');
$idp = IdP::getByState($state);
$mdh = MetaDataStorageHandler::getMetadataHandler();
@@ -407,7 +404,6 @@ class Logout
}
$id = $request->query->get('id');
- /** @psalm-var array $state */
$state = $this->authState::loadState($id, 'core:Logout:afterbridge');
$idp = IdP::getByState($state);
diff --git a/tests/modules/core/lib/Controller/LoginTest.php b/tests/modules/core/lib/Controller/LoginTest.php
index 52d3ed18d..5c4b875b2 100644
--- a/tests/modules/core/lib/Controller/LoginTest.php
+++ b/tests/modules/core/lib/Controller/LoginTest.php
@@ -64,7 +64,6 @@ class LoginTest extends ClearStateTestCase
{
$c = new Controller\Login($this->config);
- /** @var \SimpleSAML\XHTML\Template $response */
$response = $c->welcome();
$this->assertInstanceOf(Template::class, $response);
@@ -132,7 +131,6 @@ class LoginTest extends ClearStateTestCase
}
});
- /** @var \SimpleSAML\XHTML\Template $response */
$response = $c->loginuserpass($request);
$this->assertInstanceOf(Template::class, $response);
@@ -203,7 +201,6 @@ class LoginTest extends ClearStateTestCase
}
});
- // @var \SimpleSAML\XHTML\Template $response
$response = $c->loginuserpassorg($request);
$this->assertInstanceOf(Template::class, $response);
--
GitLab