Psalter: Remove obsolete annotations

tvdijen · tvdijen · commit 56a8949141a3 · 2022-03-14T22:24:35.000+01:00
diff --git a/lib/SimpleSAML/Auth/State.php b/lib/SimpleSAML/Auth/State.php
@@ -389,7 +389,6 @@ public static function loadExceptionState(?string $id = null): ?array
             $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
@@ -107,7 +107,6 @@ public function onResponse(string $assocId, ?string $relayState, Error\Exception
             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
@@ -72,7 +72,6 @@ public function normalizeAttributesArray(array $attributes): array
         $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 @@ public function normalizeAttributesArray(array $attributes): array
 
             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
@@ -284,7 +284,6 @@ abstract protected function login(string $username, string $password): array;
     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
@@ -270,7 +270,6 @@ public static function handleLogin(
         string $organization
     ): void {
         /* Retrieve the authentication state. */
-        /** @var array $state */
         $state = Auth\State::loadState($authStateId, self::STAGEID);
 
         /* Find authentication source. */
@@ -330,7 +329,6 @@ public static function handleLogin(
     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
@@ -65,9 +65,7 @@ public function cardinality(Request $request): Response
             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 @@ public function shortSsoInterval(Request $request): Response
             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
@@ -4,7 +4,6 @@
     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
@@ -18,7 +18,6 @@
     \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
@@ -4,7 +4,6 @@
     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
@@ -13,7 +13,6 @@
     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
@@ -14,7 +14,6 @@
 }
 $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
@@ -203,7 +203,6 @@ public static function resume(Request $request): void
          * 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
@@ -185,7 +185,6 @@ public function redirecttest(Request $request): RunnableResponse
             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
@@ -103,7 +103,6 @@ public function discovery(Request $request)
             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
@@ -15,11 +15,9 @@
 
 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
@@ -16,7 +16,6 @@
     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

Original file line number	Diff line number	Diff line change
`@@ -389,7 +389,6 @@ public static function loadExceptionState(?string $id = null): ?array`
`389`	`389`	`$id = $_REQUEST[self::EXCEPTION_PARAM];`
`390`	`390`	`}`
`391`	`391`
`392`		`- /** @var array $state */`
`393`	`392`	`$state = self::loadState($id, self::EXCEPTION_STAGE);`
`394`	`393`	`Assert::keyExists($state, self::EXCEPTION_DATA);`
`395`	`394`
Original file line number	Diff line number	Diff line change
`@@ -107,7 +107,6 @@ public function onResponse(string $assocId, ?string $relayState, Error\Exception`
`107`	`107`	`throw new Error\Exception('RelayState lost during logout.');`
`108`	`108`	`}`
`109`	`109`
`110`		`- /** @psalm-var array $state */`
`111`	`110`	`$state = Auth\State::loadState($relayState, 'core:LogoutTraditional');`
`112`	`111`
`113`	`112`	`if ($error === null) {`
Original file line number	Diff line number	Diff line change
`@@ -284,7 +284,6 @@ abstract protected function login(string $username, string $password): array;`
`284`	`284`	`public static function handleLogin(string $authStateId, string $username, string $password): void`
`285`	`285`	`{`
`286`	`286`	`// Here we retrieve the state array we saved in the authenticate-function.`
`287`		`- /** @var array $state */`
`288`	`287`	`$state = Auth\State::loadState($authStateId, self::STAGEID);`
`289`	`288`
`290`	`289`	`// Retrieve the authentication source we are executing.`
Original file line number	Diff line number	Diff line change
`@@ -65,9 +65,7 @@ public function cardinality(Request $request): Response`
`65`	`65`	`throw new Error\BadRequest('Missing required StateId query parameter.');`
`66`	`66`	`}`
`67`	`67`
`68`		`- /** @var array $state */`
`69`	`68`	`$state = Auth\State::loadState($stateId, 'core:cardinality');`
`70`		`-`
`71`	`69`	`Logger::stats(`
`72`	`70`	`'core:cardinality:error ' . $state['Destination']['entityid'] . ' ' . $state['saml:sp:IdP'] .`
`73`	`71`	`' ' . implode(',', array_keys($state['core:cardinality:errorAttributes']))`
`@@ -126,7 +124,6 @@ public function shortSsoInterval(Request $request): Response`
`126`	`124`	`throw new Error\BadRequest('Missing required StateId query parameter.');`
`127`	`125`	`}`
`128`	`126`
`129`		`- /** @var array $state */`
`130`	`127`	`$state = Auth\State::loadState($stateId, 'core:short_sso_interval');`
`131`	`128`
`132`	`129`	`$continue = $request->query->get('continue', false);`
Original file line number	Diff line number	Diff line change
`@@ -4,7 +4,6 @@`
`4`	`4`	`throw new \SimpleSAML\Error\BadRequest('Missing required parameter: id');`
`5`	`5`	`}`
`6`	`6`
`7`		`-/** @psalm-var array $state */`
`8`	`7`	`$state = \SimpleSAML\Auth\State::loadState($_REQUEST['id'], 'core:Logout-IFrame');`
`9`	`8`	`$idp = \SimpleSAML\IdP::getByState($state);`
`10`	`9`
Original file line number	Diff line number	Diff line change
`@@ -18,7 +18,6 @@`
`18`	`18`	`\SimpleSAML\Stats::log('core:idp:logout-iframe:page', ['type' => $type]);`
`19`	`19`	`}`
`20`	`20`
`21`		`-/** @psalm-var array $state */`
`22`	`21`	`$state = \SimpleSAML\Auth\State::loadState($_REQUEST['id'], 'core:Logout-IFrame');`
`23`	`22`	`$idp = \SimpleSAML\IdP::getByState($state);`
`24`	`23`	`$mdh = \SimpleSAML\Metadata\MetaDataStorageHandler::getMetadataHandler();`
Original file line number	Diff line number	Diff line change
`@@ -13,7 +13,6 @@`
`13`	`13`	`throw new \SimpleSAML\Error\BadRequest('Missing AuthState parameter.');`
`14`	`14`	`}`
`15`	`15`	`$authStateId = $_REQUEST['AuthState'];`
`16`		`-/** @var array $state */`
`17`	`16`	`$state = \SimpleSAML\Auth\State::loadState($authStateId, \SimpleSAML\Module\core\Auth\UserPassBase::STAGEID);`
`18`	`17`
`19`	`18`	`/** @var \SimpleSAML\Module\core\Auth\UserPassBase\|null $source */`