diff --git a/lib/SimpleSAML/Auth/ProcessingChain.php b/lib/SimpleSAML/Auth/ProcessingChain.php
index a013b0efa31bd1952b1df908b4a5d36ae1c4ae70..65a8fcd029cdd124d35b21c61afb62d7f953623d 100644
--- a/lib/SimpleSAML/Auth/ProcessingChain.php
+++ b/lib/SimpleSAML/Auth/ProcessingChain.php
@@ -90,7 +90,6 @@ class ProcessingChain
      *
      * @param array &$target  Target filter list. This list must be sorted.
      * @param array $src  Source filters. May be unsorted.
-     * @return void
      */
     private static function addFilters(array &$target, array $src): void
     {
@@ -185,7 +184,6 @@ class ProcessingChain
      * @param array &$state  The state we are processing.
      * @throws \SimpleSAML\Error\Exception
      * @throws \SimpleSAML\Error\UnserializableException
-     * @return void
      */
     public function processState(array &$state): void
     {
@@ -224,7 +222,6 @@ class ProcessingChain
      * to whatever exception handler is defined in the state array.
      *
      * @param array $state  The state we are processing.
-     * @return void
      */
     public static function resumeProcessing(array $state): void
     {
@@ -277,7 +274,6 @@ class ProcessingChain
      * This function will only return if processing completes.
      *
      * @param array &$state  The state we are processing.
-     * @return void
      */
     public function processStatePassive(array &$state): void
     {
diff --git a/lib/SimpleSAML/Auth/ProcessingFilter.php b/lib/SimpleSAML/Auth/ProcessingFilter.php
index 548ae0ab88b1c0010137ce335431990b7b949c2e..90442a5b2cfa91e6473b39a63b028c149622d962 100644
--- a/lib/SimpleSAML/Auth/ProcessingFilter.php
+++ b/lib/SimpleSAML/Auth/ProcessingFilter.php
@@ -64,7 +64,6 @@ abstract class ProcessingFilter
      * When a filter returns from this function, it is assumed to have completed its task.
      *
      * @param array &$request  The request we are currently processing.
-     * @return void
      */
     abstract public function process(array &$request): void;
 }
diff --git a/lib/SimpleSAML/Auth/Simple.php b/lib/SimpleSAML/Auth/Simple.php
index e81d989977cd2d5308aced6f7c41405ade347e47..1d435a7efb31d2465d2dd3c39e05b1afb212db6b 100644
--- a/lib/SimpleSAML/Auth/Simple.php
+++ b/lib/SimpleSAML/Auth/Simple.php
@@ -99,7 +99,6 @@ class Simple
      * method for a description.
      *
      * @param array $params Various options to the authentication request. See the documentation.
-     * @return void
      */
     public function requireAuth(array $params = []): void
     {
@@ -125,7 +124,6 @@ class Simple
      * Please note: this function never returns.
      *
      * @param array $params Various options to the authentication request.
-     * @return void
      */
     public function login(array $params = []): void
     {
@@ -185,7 +183,6 @@ class Simple
      *
      * @param string|array|null $params Either the URL the user should be redirected to after logging out, or an array
      * with parameters for the logout. If this parameter is null, we will return to the current page.
-     * @return void
      */
     public function logout($params = null): void
     {
@@ -234,7 +231,6 @@ class Simple
      * This function never returns.
      *
      * @param array $state The state after the logout.
-     * @return void
      */
     public static function logoutCompleted(array $state): void
     {
diff --git a/lib/SimpleSAML/Auth/Source.php b/lib/SimpleSAML/Auth/Source.php
index c415484931af505be872da2d96805bd35213b5b1..3f52d31111c5e73f19ddfcb83d5d8a5472ded7a5 100644
--- a/lib/SimpleSAML/Auth/Source.php
+++ b/lib/SimpleSAML/Auth/Source.php
@@ -103,7 +103,6 @@ abstract class Source
      * information about the user, and call completeAuth with the state array.
      *
      * @param array &$state Information about the current authentication.
-     * @return void
      */
     abstract public function authenticate(array &$state): void;
 
@@ -115,7 +114,6 @@ abstract class Source
      * interact with the user even in the case when the user is already authenticated.
      *
      * @param array &$state Information about the current authentication.
-     * @return void
      */
     public function reauthenticate(array &$state): void
     {
@@ -142,7 +140,6 @@ abstract class Source
      * but should instead be passed to the top-level exception handler.
      *
      * @param array &$state Information about the current authentication.
-     * @return void
      */
     public static function completeAuth(array &$state): void
     {
@@ -170,7 +167,6 @@ abstract class Source
      * check it by calling \SimpleSAML\Utils\HTTP::checkURLAllowed().
      * @param array $params Extra information about the login. Different authentication requestors may provide different
      * information. Optional, will default to an empty array.
-     * @return void
      */
     public function initLogin($return, ?string $errorURL = null, array $params = []): void
     {
@@ -213,7 +209,6 @@ abstract class Source
      * This method never returns.
      *
      * @param array $state The state after the login has completed.
-     * @return void
      */
     public static function loginCompleted(array $state): void
     {
@@ -251,7 +246,6 @@ abstract class Source
      * showing the user a page, or redirecting, this function should return.
      *
      * @param array &$state Information about the current logout operation.
-     * @return void
      */
     public function logout(array &$state): void
     {
@@ -267,7 +261,6 @@ abstract class Source
      * but should instead be passed to the top-level exception handler.
      *
      * @param array &$state Information about the current authentication.
-     * @return void
      */
     public static function completeLogout(array &$state): void
     {
@@ -380,7 +373,6 @@ abstract class Source
      * Called when the authentication source receives an external logout request.
      *
      * @param array $state State array for the logout operation.
-     * @return void
      */
     public static function logoutCallback(array $state): void
     {
@@ -412,7 +404,6 @@ abstract class Source
      *
      * @param string $assoc The identifier for this logout association.
      * @param array  $state The state array passed to the authenticate-function.
-     * @return void
      */
     protected function addLogoutCallback(string $assoc, array $state): void
     {
@@ -454,7 +445,6 @@ abstract class Source
      * This function always returns.
      *
      * @param string $assoc The logout association which should be called.
-     * @return void
      */
     protected function callLogoutCallback(string $assoc): void
     {
@@ -502,7 +492,6 @@ abstract class Source
      * @param string $id The auth source identifier.
      *
      * @throws \Exception If the first element of $source is not an identifier for the auth source.
-     * @return void
      */
     protected static function validateSource(array $source, string $id): void
     {
diff --git a/lib/SimpleSAML/Auth/State.php b/lib/SimpleSAML/Auth/State.php
index 03d36efa4e25652789976677954ccc914ab41676..175fd9494e5f0cd4c7df787fed6c30470311f5c7 100644
--- a/lib/SimpleSAML/Auth/State.php
+++ b/lib/SimpleSAML/Auth/State.php
@@ -316,7 +316,6 @@ class State
      * This function deletes the given state to prevent the user from reusing it later.
      *
      * @param array &$state The state which should be deleted.
-     * @return void
      */
     public static function deleteState(array &$state): void
     {
@@ -339,7 +338,6 @@ class State
      * @param \SimpleSAML\Error\Exception $exception The exception.
      *
      * @throws \SimpleSAML\Error\Exception If there is no exception handler defined, it will just throw the $exception.
-     * @return void
      */
     public static function throwException(array $state, Error\Exception $exception): void
     {
diff --git a/lib/SimpleSAML/Command/RouterDebugCommand.php b/lib/SimpleSAML/Command/RouterDebugCommand.php
index 3f6124dc6dbce5faa68aa0e888bf52b3e13c6989..b5610c797dff3aa415330de1c352a1a92c5d5056 100644
--- a/lib/SimpleSAML/Command/RouterDebugCommand.php
+++ b/lib/SimpleSAML/Command/RouterDebugCommand.php
@@ -38,7 +38,6 @@ class RouterDebugCommand extends Command
 
 
     /**
-     * @return void
      */
     protected function configure(): void
     {
diff --git a/lib/SimpleSAML/Configuration.php b/lib/SimpleSAML/Configuration.php
index 9a908c0c689185ec28b383c14a83bac7e6c600c9..d562448cbf35da57f431b1b233b356a70c80c0b8 100644
--- a/lib/SimpleSAML/Configuration.php
+++ b/lib/SimpleSAML/Configuration.php
@@ -178,7 +178,6 @@ class Configuration implements Utils\ClearableState
      *
      * @param string $path The directory which contains the configuration files.
      * @param string $configSet The configuration set. Defaults to 'simplesaml'.
-     * @return void
      */
     public static function setConfigDir(string $path, string $configSet = 'simplesaml'): void
     {
@@ -195,7 +194,6 @@ class Configuration implements Utils\ClearableState
      * @param \SimpleSAML\Configuration $config  The configuration object to store
      * @param string $filename  The name of the configuration file.
      * @param string $configSet  The configuration set. Optional, defaults to 'simplesaml'.
-     * @return void
      * @throws \Exception
      */
     public static function setPreLoadedConfig(
@@ -1200,7 +1198,6 @@ class Configuration implements Utils\ClearableState
      * Allows for configuration files to be changed and reloaded during a given request. Most useful
      * when running phpunit tests and needing to alter config.php between test cases
      *
-     * @return void
      */
     public static function clearInternalState(): void
     {
diff --git a/lib/SimpleSAML/Error/Assertion.php b/lib/SimpleSAML/Error/Assertion.php
index 42cf63563f5674276135147c3b0f31ad86eb97c3..47335eca527e69ff1936f8f8a004339ff24adcf2 100644
--- a/lib/SimpleSAML/Error/Assertion.php
+++ b/lib/SimpleSAML/Error/Assertion.php
@@ -54,7 +54,6 @@ class Assertion extends Exception
      *
      * This function will register this assertion handler. If will not enable assertions if they are
      * disabled.
-     * @return void
      */
     public static function installHandler(): void
     {
@@ -72,7 +71,6 @@ class Assertion extends Exception
      * @param string $file  The file assert was called from.
      * @param int $line  The line assert was called from.
      * @param mixed $message  The expression which was passed to the assert-function.
-     * @return void
      */
     public static function onAssertion(string $file, int $line, $message): void
     {
diff --git a/lib/SimpleSAML/Error/Error.php b/lib/SimpleSAML/Error/Error.php
index f5285716c44131cb27a8b8ec746cc87ce4863410..2d7375f5b4d68a1beec97069314f0b906b2a95f5 100644
--- a/lib/SimpleSAML/Error/Error.php
+++ b/lib/SimpleSAML/Error/Error.php
@@ -165,7 +165,6 @@ class Error extends Exception
      * Set the HTTP return code for this error.
      *
      * This should be overridden by subclasses who want a different return code than 500 Internal Server Error.
-     * @return void
      */
     protected function setHTTPCode(): void
     {
@@ -219,7 +218,6 @@ class Error extends Exception
      * Display this error.
      *
      * This method displays a standard SimpleSAMLphp error page and exits.
-     * @return void
      */
     public function show(): void
     {
diff --git a/lib/SimpleSAML/Error/Exception.php b/lib/SimpleSAML/Error/Exception.php
index ce1cae1d6e8112e405bc8f4b74777a91dc61b759..15d4fa644cf066fa8ef71a75194543bd6f9caed8 100644
--- a/lib/SimpleSAML/Error/Exception.php
+++ b/lib/SimpleSAML/Error/Exception.php
@@ -79,7 +79,6 @@ class Exception extends \Exception
      * Load the backtrace from the given exception.
      *
      * @param \Throwable $exception The exception we should fetch the backtrace from.
-     * @return void
      */
     protected function initBacktrace(Throwable $exception): void
     {
@@ -197,7 +196,6 @@ class Exception extends \Exception
     /**
      * Print the backtrace to the log if the 'debug' option is enabled in the configuration.
      * @param int $level
-     * @return void
      */
     protected function logBacktrace(int $level = Logger::DEBUG): void
     {
@@ -230,7 +228,6 @@ class Exception extends \Exception
      * Override to allow errors extending this class to specify the log level themselves.
      *
      * @param int $default_level The log level to use if this method was not overridden.
-     * @return void
      */
     public function log(int $default_level): void
     {
@@ -248,7 +245,6 @@ class Exception extends \Exception
      * Print the exception to the log with log level error.
      *
      * This function will write this exception to the log, including a full backtrace.
-     * @return void
      */
     public function logError(): void
     {
@@ -261,7 +257,6 @@ class Exception extends \Exception
      * Print the exception to the log with log level warning.
      *
      * This function will write this exception to the log, including a full backtrace.
-     * @return void
      */
     public function logWarning(): void
     {
@@ -274,7 +269,6 @@ class Exception extends \Exception
      * Print the exception to the log with log level info.
      *
      * This function will write this exception to the log, including a full backtrace.
-     * @return void
      */
     public function logInfo(): void
     {
@@ -287,7 +281,6 @@ class Exception extends \Exception
      * Print the exception to the log with log level debug.
      *
      * This function will write this exception to the log, including a full backtrace.
-     * @return void
      */
     public function logDebug(): void
     {
diff --git a/lib/SimpleSAML/IdP.php b/lib/SimpleSAML/IdP.php
index 94f767289144c60e6fe49f75e6e75555149790e3..876e4d0eda8514d5b8d62f050a98c3d5334c860f 100644
--- a/lib/SimpleSAML/IdP.php
+++ b/lib/SimpleSAML/IdP.php
@@ -207,7 +207,6 @@ class IdP
      * Add an SP association.
      *
      * @param array $association The SP association.
-     * @return void
      */
     public function addAssociation(array $association): void
     {
@@ -237,7 +236,6 @@ class IdP
      * Remove an SP association.
      *
      * @param string $assocId The association id.
-     * @return void
      */
     public function terminateAssociation(string $assocId): void
     {
@@ -261,7 +259,6 @@ class IdP
      * Called after authproc has run.
      *
      * @param array $state The authentication request state array.
-     * @return void
      */
     public static function postAuthProc(array $state): void
     {
@@ -288,7 +285,6 @@ class IdP
      * @param array $state The authentication request state array.
      *
      * @throws \SimpleSAML\Error\Exception If we are not authenticated.
-     * @return void
      */
     public static function postAuth(array $state): void
     {
@@ -336,7 +332,6 @@ class IdP
      * @param array &$state The authentication request state.
      *
      * @throws \SimpleSAML\Module\saml\Error\NoPassive If we were asked to do passive authentication.
-     * @return void
      */
     private function authenticate(array &$state): void
     {
@@ -359,7 +354,6 @@ class IdP
      * @param array &$state The authentication request state.
      *
      * @throws \Exception If there is no auth source defined for this IdP.
-     * @return void
      */
     private function reauthenticate(array &$state): void
     {
@@ -372,7 +366,6 @@ class IdP
      * Process authentication requests.
      *
      * @param array &$state The authentication request state.
-     * @return void
      */
     public function handleAuthenticationRequest(array &$state): void
     {
@@ -450,7 +443,6 @@ class IdP
      * This function will never return.
      *
      * @param array &$state The logout request state.
-     * @return void
      */
     public function finishLogout(array &$state): void
     {
@@ -470,7 +462,6 @@ class IdP
      * @param array       &$state The logout request state.
      * @param string|null $assocId The association we received the logout request from, or null if there was no
      * association.
-     * @return void
      */
     public function handleLogoutRequest(array &$state, ?string $assocId): void
     {
@@ -508,7 +499,6 @@ class IdP
      * @param string                 $assocId The association that is terminated.
      * @param string|null            $relayState The RelayState from the start of the logout.
      * @param \SimpleSAML\Error\Exception|null $error  The error that occurred during session termination (if any).
-     * @return void
      */
     public function handleLogoutResponse(string $assocId, ?string $relayState, Error\Exception $error = null): void
     {
@@ -531,7 +521,6 @@ class IdP
      * This function never returns.
      *
      * @param string $url The URL the user should be returned to after logout.
-     * @return void
      */
     public function doLogoutRedirect(string $url): void
     {
@@ -552,7 +541,6 @@ class IdP
      *
      * @param IdP      $idp Deprecated. Will be removed.
      * @param array    &$state The logout state from doLogoutRedirect().
-     * @return void
      */
     public static function finishLogoutRedirect(IdP $idp, array $state): void
     {
diff --git a/lib/SimpleSAML/IdP/IFrameLogoutHandler.php b/lib/SimpleSAML/IdP/IFrameLogoutHandler.php
index 12d2601cb200d5ac62200ddc232241908f7d02e3..b7303a256f3e6662b5ae5374afee8617e6343fae 100644
--- a/lib/SimpleSAML/IdP/IFrameLogoutHandler.php
+++ b/lib/SimpleSAML/IdP/IFrameLogoutHandler.php
@@ -43,7 +43,6 @@ class IFrameLogoutHandler implements LogoutHandlerInterface
      *
      * @param array &$state The logout state.
      * @param string|null $assocId The SP we are logging out from.
-     * @return void
      */
     public function startLogout(array &$state, ?string $assocId): void
     {
@@ -91,7 +90,6 @@ class IFrameLogoutHandler implements LogoutHandlerInterface
      * @param string $assocId The association that is terminated.
      * @param string|null $relayState The RelayState from the start of the logout.
      * @param \SimpleSAML\Error\Exception|null $error The error that occurred during session termination (if any).
-     * @return void
      */
     public function onResponse(string $assocId, ?string $relayState, Error\Exception $error = null): void
     {
diff --git a/lib/SimpleSAML/IdP/LogoutHandlerInterface.php b/lib/SimpleSAML/IdP/LogoutHandlerInterface.php
index 3708d6924f87374076a9beaf078ec95f231454e1..ca0f498189c305cbf230bcbbe96a3e441c925af6 100644
--- a/lib/SimpleSAML/IdP/LogoutHandlerInterface.php
+++ b/lib/SimpleSAML/IdP/LogoutHandlerInterface.php
@@ -30,7 +30,6 @@ interface LogoutHandlerInterface
      *
      * @param array &$state The logout state.
      * @param string $assocId The association that started the logout.
-     * @return void
      */
     public function startLogout(array &$state, string $assocId): void;
 
@@ -43,7 +42,6 @@ interface LogoutHandlerInterface
      * @param string $assocId The association that is terminated.
      * @param string|null $relayState The RelayState from the start of the logout.
      * @param \SimpleSAML\Error\Exception|null $error The error that occurred during session termination (if any).
-     * @return void
      */
     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 2a555cdc321e5fe88ba4f6742eb3fb026952d1a3..cf6c2a63cdf7f14097737989e14ff3766c3969be 100644
--- a/lib/SimpleSAML/IdP/TraditionalLogoutHandler.php
+++ b/lib/SimpleSAML/IdP/TraditionalLogoutHandler.php
@@ -44,7 +44,6 @@ class TraditionalLogoutHandler implements LogoutHandlerInterface
      * This function never returns.
      *
      * @param array &$state The logout state.
-     * @return void
      */
     private function logoutNextSP(array &$state): void
     {
@@ -81,7 +80,6 @@ class TraditionalLogoutHandler implements LogoutHandlerInterface
      *
      * @param array  &$state The logout state.
      * @param string $assocId The association that started the logout.
-     * @return void
      */
     public function startLogout(array &$state, string $assocId): void
     {
@@ -99,7 +97,6 @@ class TraditionalLogoutHandler implements LogoutHandlerInterface
      * @param string $assocId The association that is terminated.
      * @param string|null $relayState The RelayState from the start of the logout.
      * @param \SimpleSAML\Error\Exception|null $error The error that occurred during session termination (if any).
-     * @return void
      *
      * @throws \SimpleSAML\Error\Exception If the RelayState was lost during logout.
      */
diff --git a/lib/SimpleSAML/Kernel.php b/lib/SimpleSAML/Kernel.php
index 3a9877eb4d38deec2a666d6e2211c9fa8ec6fe7e..49b9d690648f9e25e00470643d5a24723ecfad14 100644
--- a/lib/SimpleSAML/Kernel.php
+++ b/lib/SimpleSAML/Kernel.php
@@ -100,7 +100,6 @@ class Kernel extends BaseKernel
      *
      * @param ContainerBuilder $container
      * @param LoaderInterface $loader
-     * @return void
      */
     protected function configureContainer(ContainerBuilder $container, LoaderInterface $loader): void
     {
@@ -124,7 +123,6 @@ class Kernel extends BaseKernel
      * Import routes.
      *
      * @param RouteCollectionBuilder $routes
-     * @return void
      */
     protected function configureRoutes(RouteCollectionBuilder $routes): void
     {
@@ -140,7 +138,6 @@ class Kernel extends BaseKernel
 
     /**
      * @param ContainerBuilder $container
-     * @return void
      */
     private function registerModuleControllers(ContainerBuilder $container): void
     {
diff --git a/lib/SimpleSAML/Locale/Language.php b/lib/SimpleSAML/Locale/Language.php
index 04280d9ad28461ad6c1f3b12024fedb538e45af5..d8fad2258311bb59a016749730aebfe1a7224c75 100644
--- a/lib/SimpleSAML/Locale/Language.php
+++ b/lib/SimpleSAML/Locale/Language.php
@@ -199,7 +199,6 @@ class Language
      *
      * @param string  $language Language code for the language to set.
      * @param boolean $setLanguageCookie Whether to set the language cookie or not. Defaults to true.
-     * @return void
      */
     public function setLanguage(string $language, bool $setLanguageCookie = true): void
     {
@@ -404,7 +403,6 @@ class Language
      * specified is not in the list of available languages, or the headers have already been sent to the browser.
      *
      * @param string $language The language set by the user.
-     * @return void
      */
     public static function setLanguageCookie(string $language): void
     {
diff --git a/lib/SimpleSAML/Locale/Localization.php b/lib/SimpleSAML/Locale/Localization.php
index 776b10ddcb476e33ee2eaa39291e9686eeba6236..b28c54da3919e767c208b8fb8692d39abcec0520 100644
--- a/lib/SimpleSAML/Locale/Localization.php
+++ b/lib/SimpleSAML/Locale/Localization.php
@@ -140,7 +140,6 @@ class Localization
      *
      * @param string $module Module name
      * @param string $localeDir Absolute path if the module is housed elsewhere
-     * @return void
      */
     public function addModuleDomain(string $module, string $localeDir = null): void
     {
@@ -157,7 +156,6 @@ class Localization
      *
      * @param string $localeDir Location of translations
      * @param string $domain Domain at location
-     * @return void
      */
     public function addDomain(string $localeDir, string $domain): void
     {
@@ -216,7 +214,6 @@ class Localization
 
     /**
      * Setup the translator
-     * @return void
      */
     private function setupTranslator(): void
     {
@@ -233,7 +230,6 @@ class Localization
      *
      * @param string $domain Name of domain
      * @param boolean $catchException Whether to catch an exception on error or return early
-     * @return void
      *
      * @throws \Exception If something is wrong with the locale file for the domain and activated language
      */
@@ -283,7 +279,6 @@ class Localization
 
     /**
      * Set up L18N if configured or fallback to old system
-     * @return void
      */
     private function setupL10N(): void
     {
diff --git a/lib/SimpleSAML/Locale/Translate.php b/lib/SimpleSAML/Locale/Translate.php
index 0413fd0973cdb658b2737587c40a6acd668b855b..75ce2a1fcce98e19c421dac1ecfb383251371138 100644
--- a/lib/SimpleSAML/Locale/Translate.php
+++ b/lib/SimpleSAML/Locale/Translate.php
@@ -237,7 +237,6 @@ class Translate
      * @param mixed  $translation The translation array
      *
      * @throws \Exception If $translation is neither a string nor an array.
-     * @return void
      */
     public function includeInlineTranslation(string $tag, $translation): void
     {
@@ -262,7 +261,6 @@ class Translate
      * one provided in the constructor to be used to find the directory of the dictionary. This allows to combine
      * dictionaries inside the SimpleSAMLphp main code distribution together with external dictionaries. Defaults to
      * null.
-     * @return void
      */
     public function includeLanguageFile(string $file, Configuration $otherConfig = null): void
     {
diff --git a/lib/SimpleSAML/Logger.php b/lib/SimpleSAML/Logger.php
index 9d0a82fb97a3a55063a1ae6ab3cec24003a9d932..ec47b8a4b447738854f2b4e165af99a90b81f967 100644
--- a/lib/SimpleSAML/Logger.php
+++ b/lib/SimpleSAML/Logger.php
@@ -158,7 +158,6 @@ class Logger
      * Log an emergency message.
      *
      * @param string $string The message to log.
-     * @return void
      */
     public static function emergency(string $string): void
     {
@@ -170,7 +169,6 @@ class Logger
      * Log a critical message.
      *
      * @param string $string The message to log.
-     * @return void
      */
     public static function critical(string $string): void
     {
@@ -182,7 +180,6 @@ class Logger
      * Log an alert.
      *
      * @param string $string The message to log.
-     * @return void
      */
     public static function alert(string $string): void
     {
@@ -194,7 +191,6 @@ class Logger
      * Log an error.
      *
      * @param string $string The message to log.
-     * @return void
      */
     public static function error(string $string): void
     {
@@ -206,7 +202,6 @@ class Logger
      * Log a warning.
      *
      * @param string $string The message to log.
-     * @return void
      */
     public static function warning(string $string): void
     {
@@ -218,7 +213,6 @@ class Logger
      * We reserve the notice level for statistics, so do not use this level for other kind of log messages.
      *
      * @param string $string The message to log.
-     * @return void
      */
     public static function notice(string $string): void
     {
@@ -230,7 +224,6 @@ class Logger
      * Info messages are a bit less verbose than debug messages. This is useful to trace a session.
      *
      * @param string $string The message to log.
-     * @return void
      */
     public static function info(string $string): void
     {
@@ -243,7 +236,6 @@ class Logger
      * system.
      *
      * @param string $string The message to log.
-     * @return void
      */
     public static function debug(string $string): void
     {
@@ -255,7 +247,6 @@ class Logger
      * Statistics.
      *
      * @param string $string The message to log.
-     * @return void
      */
     public static function stats(string $string): void
     {
@@ -267,7 +258,6 @@ class Logger
      * Set the logger to capture logs.
      *
      * @param boolean $val Whether to capture logs or not. Defaults to TRUE.
-     * @return void
      */
     public static function setCaptureLog(bool $val = true): void
     {
@@ -289,7 +279,6 @@ class Logger
      * Set the track identifier to use in all logs.
      *
      * @param string $trackId The track identifier to use during this session.
-     * @return void
      */
     public static function setTrackId(string $trackId): void
     {
@@ -301,7 +290,6 @@ class Logger
     /**
      * Flush any pending log messages to the logging handler.
      *
-     * @return void
      */
     public static function flush(): void
     {
@@ -318,7 +306,6 @@ class Logger
      * This method is intended to be registered as a shutdown handler, so that any pending messages that weren't sent
      * to the logging handler at that point, can still make it. It is therefore not intended to be called manually.
      *
-     * @return void
      */
     public static function shutdown(): void
     {
@@ -355,7 +342,6 @@ class Logger
      * Every call to this function must be followed by a call to popErrorMask().
      *
      * @param int $mask The log levels that should be masked.
-     * @return void
      */
     public static function maskErrors(int $mask): void
     {
@@ -373,7 +359,6 @@ class Logger
      *
      * This function restores the previous error mask.
      *
-     * @return void
      */
     public static function popErrorMask(): void
     {
@@ -389,7 +374,6 @@ class Logger
      * @param int     $level The log level corresponding to this message.
      * @param string  $message The message itself to log.
      * @param boolean $stats Whether this is a stats message or a regular one.
-     * @return void
      */
     private static function defer(int $level, string $message, bool $stats): void
     {
@@ -406,7 +390,6 @@ class Logger
 
     /**
      * @param string|null $handler
-     * @return void
      * @throws \Exception
      */
     private static function createLoggingHandler(?string $handler = null): void
@@ -465,7 +448,6 @@ class Logger
      * @param int $level
      * @param string $string
      * @param bool $statsLog
-     * @return void
      */
     private static function log(int $level, string $string, bool $statsLog = false): void
     {
diff --git a/lib/SimpleSAML/Logger/ErrorLogLoggingHandler.php b/lib/SimpleSAML/Logger/ErrorLogLoggingHandler.php
index fe5d4baffae7f0c096b8fd2a790d9827604aef84..1900893aa9874a89b3ff7b697d5c8a0ed085a5e4 100644
--- a/lib/SimpleSAML/Logger/ErrorLogLoggingHandler.php
+++ b/lib/SimpleSAML/Logger/ErrorLogLoggingHandler.php
@@ -53,7 +53,6 @@ class ErrorLogLoggingHandler implements LoggingHandlerInterface
      * Set the format desired for the logs.
      *
      * @param string $format The format used for logs.
-     * @return void
      */
     public function setLogFormat(string $format): void
     {
@@ -66,7 +65,6 @@ class ErrorLogLoggingHandler implements LoggingHandlerInterface
      *
      * @param int $level The log level.
      * @param string $string The formatted message to log.
-     * @return void
      */
     public function log(int $level, string $string): void
     {
diff --git a/lib/SimpleSAML/Logger/FileLoggingHandler.php b/lib/SimpleSAML/Logger/FileLoggingHandler.php
index a7bbe37cb4879276e83bc8aa5bebd6b7269bbb11..f54e76ae10f89d881c422a06aeb4f8727b2f9a83 100644
--- a/lib/SimpleSAML/Logger/FileLoggingHandler.php
+++ b/lib/SimpleSAML/Logger/FileLoggingHandler.php
@@ -78,7 +78,6 @@ class FileLoggingHandler implements LoggingHandlerInterface
      * Set the format desired for the logs.
      *
      * @param string $format The format used for logs.
-     * @return void
      */
     public function setLogFormat(string $format): void
     {
@@ -91,7 +90,6 @@ class FileLoggingHandler implements LoggingHandlerInterface
      *
      * @param int    $level The log level.
      * @param string $string The formatted message to log.
-     * @return void
      */
     public function log(int $level, string $string): void
     {
diff --git a/lib/SimpleSAML/Logger/LoggingHandlerInterface.php b/lib/SimpleSAML/Logger/LoggingHandlerInterface.php
index 8874c2939d591cb557c0750ea0811c5b77d406e4..25bac0a1101ad476016aed3ce25de76d9551ef0c 100644
--- a/lib/SimpleSAML/Logger/LoggingHandlerInterface.php
+++ b/lib/SimpleSAML/Logger/LoggingHandlerInterface.php
@@ -27,7 +27,6 @@ interface LoggingHandlerInterface
      *
      * @param int $level The log level.
      * @param string $string The message to log.
-     * @return void
      */
     public function log(int $level, string $string): void;
 
@@ -36,7 +35,6 @@ interface LoggingHandlerInterface
      * Set the format desired for the logs.
      *
      * @param string $format The format used for logs.
-     * @return void
      */
     public function setLogFormat(string $format): void;
 }
diff --git a/lib/SimpleSAML/Logger/SyslogLoggingHandler.php b/lib/SimpleSAML/Logger/SyslogLoggingHandler.php
index efa7ed232a6d8f20c9c632f4604575ce2e236c54..bb38492013e6d458f0fb8cebefa56399c737aeb5 100644
--- a/lib/SimpleSAML/Logger/SyslogLoggingHandler.php
+++ b/lib/SimpleSAML/Logger/SyslogLoggingHandler.php
@@ -45,7 +45,6 @@ class SyslogLoggingHandler implements LoggingHandlerInterface
      * Set the format desired for the logs.
      *
      * @param string $format The format used for logs.
-     * @return void
      */
     public function setLogFormat(string $format): void
     {
@@ -58,7 +57,6 @@ class SyslogLoggingHandler implements LoggingHandlerInterface
      *
      * @param int $level The log level.
      * @param string $string The formatted message to log.
-     * @return void
      */
     public function log(int $level, string $string): void
     {
diff --git a/lib/SimpleSAML/Memcache.php b/lib/SimpleSAML/Memcache.php
index f69e4d83b9b16e94bf11c5e5b679d4983dd2b696..39e4b8a8883cfd1a6bef8a013de2dbe919dd0800 100644
--- a/lib/SimpleSAML/Memcache.php
+++ b/lib/SimpleSAML/Memcache.php
@@ -142,7 +142,6 @@ class Memcache
      * @param string       $key The key of the data.
      * @param mixed        $value The value of the data.
      * @param integer|null $expire The expiration timestamp of the data.
-     * @return void
      */
     public static function set(string $key, $value, ?int $expire = null): void
     {
@@ -169,7 +168,6 @@ class Memcache
      * Delete a key-value pair from the memcache servers.
      *
      * @param string $key The key we should delete.
-     * @return void
      */
     public static function delete(string $key): void
     {
@@ -202,7 +200,6 @@ class Memcache
      *
      * @param \Memcached $memcache The Memcache object we should add this server to.
      * @param array    $server An associative array with the configuration options for the server to add.
-     * @return void
      *
      * @throws \Exception If any configuration option for the server is invalid.
      */
diff --git a/lib/SimpleSAML/Metadata/MetaDataStorageHandler.php b/lib/SimpleSAML/Metadata/MetaDataStorageHandler.php
index d4f86e55119293a23b7b5150acf11901ab9f5549..e668914ddec2617eecdfe02cf21d9ec1a2e27253 100644
--- a/lib/SimpleSAML/Metadata/MetaDataStorageHandler.php
+++ b/lib/SimpleSAML/Metadata/MetaDataStorageHandler.php
@@ -391,7 +391,6 @@ class MetaDataStorageHandler implements ClearableState
      * Clear any metadata cached.
      * Allows for metadata configuration to be changed and reloaded during a given request. Most useful
      * when running phpunit tests and needing to alter config.php and metadata sources between test cases
-     * @return void
      */
     public static function clearInternalState(): void
     {
diff --git a/lib/SimpleSAML/Metadata/MetaDataStorageHandlerSerialize.php b/lib/SimpleSAML/Metadata/MetaDataStorageHandlerSerialize.php
index 08d75d427404c8e6477d9fc14d0505cd0bf0492f..6e1770f3e2b097121afd466d7ef8b93e48d36b11 100644
--- a/lib/SimpleSAML/Metadata/MetaDataStorageHandlerSerialize.php
+++ b/lib/SimpleSAML/Metadata/MetaDataStorageHandlerSerialize.php
@@ -258,7 +258,6 @@ class MetaDataStorageHandlerSerialize extends MetaDataStorageSource
      *
      * @param string $entityId The entityId of the metadata entry.
      * @param string $set The metadata set this metadata entry belongs to.
-     * @return void
      */
     public function deleteMetadata(string $entityId, string $set): void
     {
diff --git a/lib/SimpleSAML/Metadata/SAMLBuilder.php b/lib/SimpleSAML/Metadata/SAMLBuilder.php
index 1ea0a5e122f033f8d8f957c88c791219fe6ecd74..0eed9f37ea6ba2aced4ccf24d08a24535eb3fa0f 100644
--- a/lib/SimpleSAML/Metadata/SAMLBuilder.php
+++ b/lib/SimpleSAML/Metadata/SAMLBuilder.php
@@ -72,7 +72,6 @@ class SAMLBuilder
      * @param int|null $maxCache The maximum time in seconds the metadata should be cached. Defaults to null
      * @param int|null $maxDuration The maximum time in seconds this metadata should be considered valid. Defaults
      * to null.
-     * @return void
      */
     public function __construct(string $entityId, int $maxCache = null, int $maxDuration = null)
     {
@@ -86,7 +85,6 @@ class SAMLBuilder
 
     /**
      * @param array $metadata
-     * @return void
      */
     private function setExpiration(array $metadata): void
     {
@@ -143,7 +141,6 @@ class SAMLBuilder
      * Add a SecurityTokenServiceType for ADFS metadata.
      *
      * @param array $metadata The metadata with the information about the SecurityTokenServiceType.
-     * @return void
      */
     public function addSecurityTokenServiceType(array $metadata): void
     {
@@ -167,7 +164,6 @@ class SAMLBuilder
      *
      * @param \SimpleSAML\Configuration    $metadata The metadata to get extensions from.
      * @param \SAML2\XML\md\RoleDescriptor $e Reference to the element where the Extensions element should be included.
-     * @return void
      */
     private function addExtensions(Configuration $metadata, RoleDescriptor $e): void
     {
@@ -315,7 +311,6 @@ class SAMLBuilder
      * @param array $orgName An array with the localized OrganizationName.
      * @param array $orgDisplayName An array with the localized OrganizationDisplayName.
      * @param array $orgURL An array with the localized OrganizationURL.
-     * @return void
      */
     public function addOrganization(array $orgName, array $orgDisplayName, array $orgURL): void
     {
@@ -333,7 +328,6 @@ class SAMLBuilder
      * Add an Organization element based on metadata array.
      *
      * @param array $metadata The metadata we should extract the organization information from.
-     * @return void
      */
     public function addOrganizationInfo(array $metadata): void
     {
@@ -416,7 +410,6 @@ class SAMLBuilder
      *
      * @param \SAML2\XML\md\SPSSODescriptor $spDesc The SPSSODescriptor element.
      * @param \SimpleSAML\Configuration     $metadata The metadata.
-     * @return void
      */
     private function addAttributeConsumingService(
         SPSSODescriptor $spDesc,
@@ -472,7 +465,6 @@ class SAMLBuilder
      *
      * @param string $set The metadata set this metadata comes from.
      * @param array  $metadata The metadata.
-     * @return void
      */
     public function addMetadata(string $set, array $metadata): void
     {
@@ -499,7 +491,6 @@ class SAMLBuilder
      *
      * @param array $metadata The metadata.
      * @param string[] $protocols The protocols supported. Defaults to \SAML2\Constants::NS_SAMLP.
-     * @return void
      */
     public function addMetadataSP20(array $metadata, array $protocols = [Constants::NS_SAMLP]): void
     {
@@ -554,7 +545,6 @@ class SAMLBuilder
      * Add metadata of a SAML 2.0 identity provider.
      *
      * @param array $metadata The metadata.
-     * @return void
      */
     public function addMetadataIdP20(array $metadata): void
     {
@@ -604,7 +594,6 @@ class SAMLBuilder
      *
      * @param array $metadata The AttributeAuthorityDescriptor, in the format returned by
      * \SimpleSAML\Metadata\SAMLParser.
-     * @return void
      */
     public function addAttributeAuthority(array $metadata): void
     {
@@ -641,7 +630,6 @@ class SAMLBuilder
      * @param string $type The type of contact. Deprecated.
      * @param array  $details The details about the contact.
      *
-     * @return void
      * @todo Change the signature to remove $type.
      * @todo Remove the capability to pass a name and parse it inside the method.
      */
@@ -699,7 +687,6 @@ class SAMLBuilder
      * @param \SAML2\XML\md\RoleDescriptor $rd The RoleDescriptor the certificate should be added to.
      * @param string                      $use The value of the 'use' attribute.
      * @param string                      $x509data The certificate data.
-     * @return void
      */
     private function addX509KeyDescriptor(RoleDescriptor $rd, string $use, string $x509data): void
     {
@@ -718,7 +705,6 @@ class SAMLBuilder
      *
      * @param \SAML2\XML\md\RoleDescriptor $rd The RoleDescriptor the certificate should be added to.
      * @param \SimpleSAML\Configuration    $metadata The metadata of the entity.
-     * @return void
      */
     private function addCertificate(RoleDescriptor $rd, Configuration $metadata): void
     {
diff --git a/lib/SimpleSAML/Metadata/SAMLParser.php b/lib/SimpleSAML/Metadata/SAMLParser.php
index 61f783e80fa9fa426265a0195df66347dcffd47b..637f551534696ceb974a85b8845a9cfc5522a176 100644
--- a/lib/SimpleSAML/Metadata/SAMLParser.php
+++ b/lib/SimpleSAML/Metadata/SAMLParser.php
@@ -487,7 +487,6 @@ class SAMLParser
      *
      * @param array &$metadata The metadata that should be updated.
      * @param array $roleDescriptor The parsed role descriptor.
-     * @return void
      */
     private function addExtensions(array &$metadata, array $roleDescriptor): void
     {
@@ -796,7 +795,6 @@ class SAMLParser
      * @param \SAML2\XML\md\SPSSODescriptor $element The element which should be parsed.
      * @param int|NULL                     $expireTime The unix timestamp for when this element should expire, or
      *                             NULL if unknown.
-     * @return void
      */
     private function processSPSSODescriptor(SPSSODescriptor $element, ?int $expireTime): void
     {
@@ -831,7 +829,6 @@ class SAMLParser
      * @param \SAML2\XML\md\IDPSSODescriptor $element The element which should be parsed.
      * @param int|NULL                      $expireTime The unix timestamp for when this element should expire, or
      *                             NULL if unknown.
-     * @return void
      */
     private function processIDPSSODescriptor(IDPSSODescriptor $element, ?int $expireTime): void
     {
@@ -856,7 +853,6 @@ class SAMLParser
      * @param \SAML2\XML\md\AttributeAuthorityDescriptor $element The element which should be parsed.
      * @param int|NULL                                  $expireTime The unix timestamp for when this element should
      *     expire, or NULL if unknown.
-     * @return void
      */
     private function processAttributeAuthorityDescriptor(
         AttributeAuthorityDescriptor $element,
@@ -1035,7 +1031,6 @@ class SAMLParser
      * Parse and process a Organization element.
      *
      * @param \SAML2\XML\md\Organization $element The Organization element.
-     * @return void
      */
     private function processOrganization(Organization $element): void
     {
@@ -1049,7 +1044,6 @@ class SAMLParser
      * Parse and process a ContactPerson element.
      *
      * @param \SAML2\XML\md\ContactPerson $element The ContactPerson element.
-     * @return void
      */
     private function processContactPerson(ContactPerson $element): void
     {
@@ -1083,7 +1077,6 @@ class SAMLParser
      *
      * @param \SAML2\XML\md\AttributeConsumingService $element The AttributeConsumingService to parse.
      * @param array $sp The array with the SP's metadata.
-     * @return void
      */
     private static function parseAttributeConsumerService(AttributeConsumingService $element, array &$sp): void
     {
diff --git a/lib/SimpleSAML/Metadata/Sources/MDQ.php b/lib/SimpleSAML/Metadata/Sources/MDQ.php
index 923cca2a9ddf6eeb3a3612fe112ed52f316e7253..a972c3ef70365d7d1940c702b507b1ae0ed3cae2 100644
--- a/lib/SimpleSAML/Metadata/Sources/MDQ.php
+++ b/lib/SimpleSAML/Metadata/Sources/MDQ.php
@@ -179,7 +179,6 @@ class MDQ extends \SimpleSAML\Metadata\MetaDataStorageSource
      * @param array  $data The associative array with the metadata for this entity.
      *
      * @throws \Exception If metadata cannot be written to cache.
-     * @return void
      */
     private function writeToCache(string $set, string $entityId, array $data): void
     {
diff --git a/lib/SimpleSAML/Module.php b/lib/SimpleSAML/Module.php
index 6f1591296f38acbee12ee1c89dc4a42e7102615b..f3f4ac03a291e80adc255d4e666d9434a83337e0 100644
--- a/lib/SimpleSAML/Module.php
+++ b/lib/SimpleSAML/Module.php
@@ -508,7 +508,6 @@ class Module
      *
      * @param string $hook The name of the hook.
      * @param mixed  &$data The data which should be passed to each hook. Will be passed as a reference.
-     * @return void
      *
      * @throws \SimpleSAML\Error\Exception If an invalid hook is found in a module.
      */
diff --git a/lib/SimpleSAML/Session.php b/lib/SimpleSAML/Session.php
index 3d49f0faa3062328bc81d56eb700f82c28717d26..7800bf5c4595143872f83d4d4975c513db79d427 100644
--- a/lib/SimpleSAML/Session.php
+++ b/lib/SimpleSAML/Session.php
@@ -190,7 +190,6 @@ class Session implements Serializable, Utils\ClearableState
      * Set the configuration we should use.
      *
      * @param Configuration $config
-     * @return void
      */
     public function setConfiguration(Configuration $config): void
     {
@@ -218,7 +217,6 @@ class Session implements Serializable, Utils\ClearableState
      * be serializable in its original form (e.g.: DOM objects).
      *
      * @param string $serialized The serialized representation of a session that we want to restore.
-     * @return void
      *
      * Cannot typehint param as string due to upstream restrictions
      */
@@ -412,7 +410,6 @@ class Session implements Serializable, Utils\ClearableState
      * Create a session that should not be saved at the end of the request.
      * Subsequent calls to getInstance() will return this transient session.
      *
-     * @return void
      */
     public static function useTransientSession(): void
     {
@@ -429,7 +426,6 @@ class Session implements Serializable, Utils\ClearableState
      * Create a new session and cache it.
      *
      * @param string $sessionId The new session we should create.
-     * @return void
      */
     public static function createSession(string $sessionId): void
     {
@@ -445,7 +441,6 @@ class Session implements Serializable, Utils\ClearableState
      * WARNING: please do not use this method directly unless you really need to and know what you are doing. Use
      * markDirty() instead.
      *
-     * @return void
      */
     public function save(): void
     {
@@ -480,7 +475,6 @@ class Session implements Serializable, Utils\ClearableState
      * Use this method if you are using PHP sessions in your application *and* in SimpleSAMLphp, *after* you are done
      * using SimpleSAMLphp and before trying to access your application's session again.
      *
-     * @return void
      */
     public function cleanup(): void
     {
@@ -497,7 +491,6 @@ class Session implements Serializable, Utils\ClearableState
      *
      * This method will register a callback to save the session right before any output is sent to the browser.
      *
-     * @return void
      */
     public function markDirty(): void
     {
@@ -576,7 +569,6 @@ class Session implements Serializable, Utils\ClearableState
      * Set remember me expire time.
      *
      * @param int $lifetime Number of seconds after when remember me session cookies expire.
-     * @return void
      */
     public function setRememberMeExpire(int $lifetime = null): void
     {
@@ -597,7 +589,6 @@ class Session implements Serializable, Utils\ClearableState
      *
      * @param string     $authority The authority the user logged in with.
      * @param array      $data The authentication data for this authority.
-     * @return void
      *
      * @throws Error\CannotSetCookie If the authentication token cannot be set for some reason.
      */
@@ -690,7 +681,6 @@ class Session implements Serializable, Utils\ClearableState
      * This function will call any registered logout handlers before marking the user as logged out.
      *
      * @param string $authority The authentication source we are logging out of.
-     * @return void
      */
     public function doLogout(string $authority): void
     {
@@ -717,7 +707,6 @@ class Session implements Serializable, Utils\ClearableState
      * This function calls all registered logout handlers.
      *
      * @param string $authority The authentication source we are logging out from.
-     * @return void
      *
      * @throws \Exception If the handler is not a valid function or method.
      */
@@ -782,7 +771,6 @@ class Session implements Serializable, Utils\ClearableState
      * Update session cookies.
      *
      * @param array $params The parameters for the cookies.
-     * @return void
      */
     public function updateSessionCookies(array $params = []): void
     {
@@ -810,7 +798,6 @@ class Session implements Serializable, Utils\ClearableState
      *
      * @param string $authority The authentication source we are setting expire time for.
      * @param int    $expire The number of seconds authentication source is valid.
-     * @return void
      */
     public function setAuthorityExpire(string $authority, int $expire = null): void
     {
@@ -830,7 +817,6 @@ class Session implements Serializable, Utils\ClearableState
      * @param string $authority The authority for which register the handler.
      * @param string $classname The class which contains the logout handler.
      * @param string $functionname The logout handler function.
-     * @return void
      *
      * @throws \Exception If the handler is not a valid function or method.
      */
@@ -859,7 +845,6 @@ class Session implements Serializable, Utils\ClearableState
      *
      * @param string $type The type of the data.
      * @param string $id The identifier of the data.
-     * @return void
      */
     public function deleteData(string $type, string $id): void
     {
@@ -884,7 +869,6 @@ class Session implements Serializable, Utils\ClearableState
      * @param int|string|null $timeout The number of seconds this data should be stored after its last access.
      * This parameter is optional. The default value is set in 'session.datastore.timeout',
      * and the default is 4 hours.
-     * @return void
      *
      * @throws \Exception If the data couldn't be stored.
      *
@@ -931,7 +915,6 @@ class Session implements Serializable, Utils\ClearableState
     /**
      * This function removes expired data from the data store.
      *
-     * @return void
      */
     private function expireData(): void
     {
@@ -1048,7 +1031,6 @@ class Session implements Serializable, Utils\ClearableState
      *
      * @param string $idp The IdP id.
      * @param array  $association The association we should add.
-     * @return void
      */
     public function addAssociation(string $idp, array $association): void
     {
@@ -1110,7 +1092,6 @@ class Session implements Serializable, Utils\ClearableState
      *
      * @param string $idp The IdP id.
      * @param string $associationId The id of the association.
-     * @return void
      */
     public function terminateAssociation(string $idp, string $associationId): void
     {
@@ -1165,7 +1146,6 @@ class Session implements Serializable, Utils\ClearableState
 
     /**
      * Clear any configuration information cached
-     * @return void
      */
     public static function clearInternalState(): void
     {
diff --git a/lib/SimpleSAML/SessionHandler.php b/lib/SimpleSAML/SessionHandler.php
index 1ec01461b3c5f8e9e9961048bb4430b2b0b92a2a..5ee37605ec6c26acdc4871ec102caabfa7488619 100644
--- a/lib/SimpleSAML/SessionHandler.php
+++ b/lib/SimpleSAML/SessionHandler.php
@@ -84,7 +84,6 @@ abstract class SessionHandler
      * Save the session.
      *
      * @param \SimpleSAML\Session $session The session object we should save.
-     * @return void
      */
     abstract public function saveSession(Session $session): void;
 
@@ -115,7 +114,6 @@ abstract class SessionHandler
      * @param string $sessionName The name of the session.
      * @param string|null $sessionID The session ID to use. Set to null to delete the cookie.
      * @param array|null $cookieParams Additional parameters to use for the session cookie.
-     * @return void
      *
      * @throws \SimpleSAML\Error\CannotSetCookie If we can't set the cookie.
      */
@@ -130,7 +128,6 @@ abstract class SessionHandler
      * session handler is selected, then we will fall back to the default
      * PHP session handler.
      *
-     * @return void
      *
      * @throws \Exception If we cannot instantiate the session handler.
      */
diff --git a/lib/SimpleSAML/SessionHandlerCookie.php b/lib/SimpleSAML/SessionHandlerCookie.php
index 30a5880e23db09a0036481bc97abe20e5e50e054..cb5fbfc9d022783a9eace631047d684ce4b9de39 100644
--- a/lib/SimpleSAML/SessionHandlerCookie.php
+++ b/lib/SimpleSAML/SessionHandlerCookie.php
@@ -150,7 +150,6 @@ abstract class SessionHandlerCookie extends SessionHandler
      * @param string $sessionName The name of the session.
      * @param string|null $sessionID The session ID to use. Set to null to delete the cookie.
      * @param array|null $cookieParams Additional parameters to use for the session cookie.
-     * @return void
      *
      * @throws \SimpleSAML\Error\CannotSetCookie If we can't set the cookie.
      */
diff --git a/lib/SimpleSAML/SessionHandlerPHP.php b/lib/SimpleSAML/SessionHandlerPHP.php
index 5a8146bbdda7d1a229c6bf231edef98f62740eae..587ea15f0339a20519ee48d885d6eae89e4d3ec0 100644
--- a/lib/SimpleSAML/SessionHandlerPHP.php
+++ b/lib/SimpleSAML/SessionHandlerPHP.php
@@ -106,7 +106,6 @@ class SessionHandlerPHP extends SessionHandler
      * session must always be saved properly before calling this method. If you don't understand what this is about,
      * don't use this method.
      *
-     * @return void
      */
     public function restorePrevious(): void
     {
@@ -203,7 +202,6 @@ class SessionHandlerPHP extends SessionHandler
      * Save the current session to the PHP session array.
      *
      * @param \SimpleSAML\Session $session The session object we should save.
-     * @return void
      */
     public function saveSession(Session $session): void
     {
@@ -295,7 +293,6 @@ class SessionHandlerPHP extends SessionHandler
      * @param string $sessionName The name of the session.
      * @param string|null $sessionID The session ID to use. Set to null to delete the cookie.
      * @param array|null $cookieParams Additional parameters to use for the session cookie.
-     * @return void
      *
      * @throws \SimpleSAML\Error\CannotSetCookie If we can't set the cookie.
      */
diff --git a/lib/SimpleSAML/SessionHandlerStore.php b/lib/SimpleSAML/SessionHandlerStore.php
index 09f08c05d3b3a69453e1b872390b726bbbda7579..66c2c911bb002b7cae4b15a47adbcca8b756273a 100644
--- a/lib/SimpleSAML/SessionHandlerStore.php
+++ b/lib/SimpleSAML/SessionHandlerStore.php
@@ -66,7 +66,6 @@ class SessionHandlerStore extends SessionHandlerCookie
      * Save a session to the data store.
      *
      * @param \SimpleSAML\Session $session The session object we should save.
-     * @return void
      */
     public function saveSession(Session $session): void
     {
diff --git a/lib/SimpleSAML/Stats.php b/lib/SimpleSAML/Stats.php
index f50227bbc2e87a465c6630779a152844ebd9f52f..4c47c0cc937eeb6121a5a02e81b2538e48ef7963 100644
--- a/lib/SimpleSAML/Stats.php
+++ b/lib/SimpleSAML/Stats.php
@@ -52,7 +52,6 @@ class Stats
     /**
      * Initialize the outputs.
      *
-     * @return void
      */
     private static function initOutputs(): void
     {
@@ -72,7 +71,6 @@ class Stats
      * @param string $event The event.
      * @param array  $data Event data. Optional.
      *
-     * @return void|boolean False if output is not enabled, void otherwise.
      */
     public static function log(string $event, array $data = [])
     {
diff --git a/lib/SimpleSAML/Stats/Output.php b/lib/SimpleSAML/Stats/Output.php
index 89be3c8ef01dc3451a69f6c125cc958b7273c458..75c3e6455adfe2a6ef875c00660191d44e33de46 100644
--- a/lib/SimpleSAML/Stats/Output.php
+++ b/lib/SimpleSAML/Stats/Output.php
@@ -29,7 +29,6 @@ abstract class Output
      * Write a stats event.
      *
      * @param array $data The event.
-     * @return void
      */
     abstract public function emit(array $data): void;
 }
diff --git a/lib/SimpleSAML/Store.php b/lib/SimpleSAML/Store.php
index 18a18cf730b4054ad5236368c3eabad4aa25d2c3..86e86377733c7a921d6346e477d9442bcf807289 100644
--- a/lib/SimpleSAML/Store.php
+++ b/lib/SimpleSAML/Store.php
@@ -93,7 +93,6 @@ abstract class Store implements Utils\ClearableState
      * @param string   $key The key.
      * @param mixed    $value The value.
      * @param int|null $expire The expiration time (unix timestamp), or null if it never expires.
-     * @return void
      */
     abstract public function set(string $type, string $key, $value, ?int $expire = null): void;
 
@@ -103,14 +102,12 @@ abstract class Store implements Utils\ClearableState
      *
      * @param string $type The data type.
      * @param string $key The key.
-     * @return void
      */
     abstract public function delete(string $type, string $key): void;
 
 
     /**
      * Clear any SSP specific state, such as SSP environmental variables or cached internals.
-     * @return void
      */
     public static function clearInternalState(): void
     {
diff --git a/lib/SimpleSAML/Store/Memcache.php b/lib/SimpleSAML/Store/Memcache.php
index 02049476e7819c35fb139a08cc5212b934303a1a..8592675d6d48efeb6c723542d40005e77e6158d8 100644
--- a/lib/SimpleSAML/Store/Memcache.php
+++ b/lib/SimpleSAML/Store/Memcache.php
@@ -53,7 +53,6 @@ class Memcache extends Store
      * @param string $key The key.
      * @param mixed $value The value.
      * @param int|null $expire The expiration time (unix timestamp), or NULL if it never expires.
-     * @return void
      */
     public function set(string $type, string $key, $value, ?int $expire = null): void
     {
@@ -72,7 +71,6 @@ class Memcache extends Store
      *
      * @param string $type The data type.
      * @param string $key The key.
-     * @return void
      */
     public function delete(string $type, string $key): void
     {
diff --git a/lib/SimpleSAML/Store/Redis.php b/lib/SimpleSAML/Store/Redis.php
index a176c4334208fb5bf3638f04260a4615a59e95e9..dbdeb1d3adcdea6b53924ffa4bbdafc1c19dbd28 100644
--- a/lib/SimpleSAML/Store/Redis.php
+++ b/lib/SimpleSAML/Store/Redis.php
@@ -97,7 +97,6 @@ class Redis extends Store
      * @param string $key The key to insert.
      * @param mixed $value The value itself.
      * @param int|null $expire The expiration time (unix timestamp), or null if it never expires.
-     * @return void
      */
     public function set(string $type, string $key, $value, ?int $expire = null): void
     {
@@ -119,7 +118,6 @@ class Redis extends Store
      *
      * @param string $type The type of the data
      * @param string $key The key to delete.
-     * @return void
      */
     public function delete(string $type, string $key): void
     {
diff --git a/lib/SimpleSAML/Store/SQL.php b/lib/SimpleSAML/Store/SQL.php
index d6d472677773b6249484d4402dbc013e02833d09..10435dcc5a4bbd1e6919cc1dcaa43b6a174dab99 100644
--- a/lib/SimpleSAML/Store/SQL.php
+++ b/lib/SimpleSAML/Store/SQL.php
@@ -79,7 +79,6 @@ class SQL extends Store
 
     /**
      * Initialize the table-version table.
-     * @return void
      */
     private function initTableVersionTable(): void
     {
@@ -103,7 +102,6 @@ class SQL extends Store
 
     /**
      * Initialize key-value table.
-     * @return void
      */
     private function initKVTable(): void
     {
@@ -200,7 +198,6 @@ class SQL extends Store
      *
      * @param string $name Table name.
      * @param int $version Table version.
-     * @return void
      */
     public function setTableVersion(string $name, int $version): void
     {
@@ -221,7 +218,6 @@ class SQL extends Store
      * @param string $table The table we should update.
      * @param string[] $keys The key columns.
      * @param array $data Associative array with columns.
-     * @return void
      */
     public function insertOrUpdate(string $table, array $keys, array $data): void
     {
@@ -277,7 +273,6 @@ class SQL extends Store
 
     /**
      * Clean the key-value table of expired entries.
-     * @return void
      */
     private function cleanKVStore(): void
     {
@@ -341,7 +336,6 @@ class SQL extends Store
      * @param string $key The key to insert.
      * @param mixed $value The value itself.
      * @param int|null $expire The expiration time (unix timestamp), or null if it never expires.
-     * @return void
      */
     public function set(string $type, string $key, $value, ?int $expire = null): void
     {
@@ -378,7 +372,6 @@ class SQL extends Store
      *
      * @param string $type The type of the data
      * @param string $key The key to delete.
-     * @return void
      */
     public function delete(string $type, string $key): void
     {
diff --git a/lib/SimpleSAML/Utils/Auth.php b/lib/SimpleSAML/Utils/Auth.php
index 6461511a462d9c29d6b197f29fd9ccbfdcbec2cb..614749aee98382b54d0f76667d10faa4f40f277c 100644
--- a/lib/SimpleSAML/Utils/Auth.php
+++ b/lib/SimpleSAML/Utils/Auth.php
@@ -68,7 +68,6 @@ class Auth
      * This is a helper function for limiting a page to those with administrative access. It will redirect the user to
      * a login page if the current user doesn't have admin access.
      *
-     * @return void This function will only return if the user is admin.
      * @throws \SimpleSAML\Error\Exception If no "admin" authentication source was configured.
      *
      */
diff --git a/lib/SimpleSAML/Utils/ClearableState.php b/lib/SimpleSAML/Utils/ClearableState.php
index 60fc07851489d74eee332579bb80e5358e41c618..e0a0dede38b19fd2ef563f0c6854001e0567de04 100644
--- a/lib/SimpleSAML/Utils/ClearableState.php
+++ b/lib/SimpleSAML/Utils/ClearableState.php
@@ -14,7 +14,6 @@ interface ClearableState
 {
     /**
      * Clear any cached internal state.
-     * @return void
      */
     public static function clearInternalState(): void;
 }
diff --git a/lib/SimpleSAML/Utils/EMail.php b/lib/SimpleSAML/Utils/EMail.php
index 9d435c7fe950f4c3963960abab9dfc1ca8b78eb5..6317cd6b2bae59d6384f68b2702896a3fb5e6438 100644
--- a/lib/SimpleSAML/Utils/EMail.php
+++ b/lib/SimpleSAML/Utils/EMail.php
@@ -78,7 +78,6 @@ class EMail
      * Set the data that should be embedded in the e-mail body
      *
      * @param array $data The data that should be embedded in the e-mail body
-     * @return void
      */
     public function setData(array $data): void
     {
@@ -104,7 +103,6 @@ class EMail
      * Set an introduction text for the e-mail
      *
      * @param string $text Introduction text
-     * @return void
      */
     public function setText(string $text): void
     {
@@ -116,7 +114,6 @@ class EMail
      * Add a Reply-To address to the mail
      *
      * @param string $address Reply-To e-mail address
-     * @return void
      */
     public function addReplyTo(string $address): void
     {
@@ -128,7 +125,6 @@ class EMail
      * Send the mail
      *
      * @param bool $plainTextOnly Do not send HTML payload
-     * @return void
      *
      * @throws \PHPMailer\PHPMailer\Exception
      */
@@ -154,7 +150,6 @@ class EMail
      * @param string $transportMethod the transport method
      * @param array $transportOptions options for the transport method
      *
-     * @return void
      *
      * @throws \InvalidArgumentException
      */
diff --git a/lib/SimpleSAML/Utils/HTTP.php b/lib/SimpleSAML/Utils/HTTP.php
index c1714ad9d23e1aee11b65423e7d2d5faacec63b6..23c7bdf84d0f627e24c1d0abd8a7977b3beb63fa 100644
--- a/lib/SimpleSAML/Utils/HTTP.php
+++ b/lib/SimpleSAML/Utils/HTTP.php
@@ -161,7 +161,6 @@ class HTTP
      *     the name and the value will be urlencoded. If the value is NULL, then the parameter will be encoded as just
      *     the name, without a value.
      *
-     * @return void This function never returns.
      * @throws \InvalidArgumentException If $url is not a string or is empty, or $parameters is not an array.
      * @throws \SimpleSAML\Error\Exception If $url is not a valid HTTP URL.
      *
@@ -295,7 +294,6 @@ class HTTP
      *
      * @param string|null $retryURL The URL the user should access to retry the operation. Defaults to null.
      *
-     * @return void If there is a session cookie, nothing will be returned. Otherwise, the user will be redirected to a
      *     page telling about the missing cookie.
      * @throws \InvalidArgumentException If $retryURL is neither a string nor null.
      *
@@ -932,7 +930,6 @@ class HTTP
      * name and the value will be urlencoded. If the value is NULL, then the parameter will be encoded as just the
      * name, without a value.
      *
-     * @return void This function never returns.
      * @throws \InvalidArgumentException If $url is not a string or $parameters is not an array.
      *
      */
@@ -959,7 +956,6 @@ class HTTP
      * name and the value will be urlencoded. If the value is NULL, then the parameter will be encoded as just the
      * name, without a value.
      *
-     * @return void This function never returns.
      * @throws \InvalidArgumentException If $url is not a string or $parameters is not an array.
      *
      */
@@ -1061,7 +1057,6 @@ class HTTP
      * @throws \InvalidArgumentException If any parameter has an incorrect type.
      * @throws \SimpleSAML\Error\CannotSetCookie If the headers were already sent and the cookie cannot be set.
      *
-     * @return void
      *
      */
     public static function setCookie(string $name, ?string $value, array $params = null, bool $throw = true): void
@@ -1159,7 +1154,6 @@ class HTTP
      * @throws \InvalidArgumentException If $destination is not a string or $data is not an array.
      * @throws \SimpleSAML\Error\Exception If $destination is not a valid HTTP URL.
      *
-     * @return void
      *
      */
     public static function submitPOSTData(string $destination, array $data): void
diff --git a/lib/SimpleSAML/Utils/HttpAdapter.php b/lib/SimpleSAML/Utils/HttpAdapter.php
index f5a85b9c956c4e67230b76ec95686a24e548e4a1..46d32ce3ac97a96fc32057df1f04a392561979a0 100644
--- a/lib/SimpleSAML/Utils/HttpAdapter.php
+++ b/lib/SimpleSAML/Utils/HttpAdapter.php
@@ -48,7 +48,6 @@ class HttpAdapter
      * @see HTTP::checkSessionCookie()
      *
      * @param string|null $retryURL
-     * @return void
      */
     public function checkSessionCookie(string $retryURL = null): void
     {
@@ -236,7 +235,6 @@ class HttpAdapter
      *
      * @param string $url
      * @param array $parameters
-     * @return void
      */
     public function redirectTrustedURL(string $url, array $parameters = []): void
     {
@@ -249,7 +247,6 @@ class HttpAdapter
      *
      * @param string $url
      * @param array $parameters
-     * @return void
      */
     public function redirectUntrustedURL(string $url, array $parameters = []): void
     {
@@ -277,7 +274,6 @@ class HttpAdapter
      * @param string $value
      * @param array|null $params
      * @param bool $throw
-     * @return void
      */
     public function setCookie(string $name, string $value, array $params = null, bool $throw = true): void
     {
@@ -290,7 +286,6 @@ class HttpAdapter
      *
      * @param string $destination
      * @param array $data
-     * @return void
      */
     public function submitPOSTData(string $destination, array $data): void
     {
diff --git a/lib/SimpleSAML/Utils/System.php b/lib/SimpleSAML/Utils/System.php
index 8f831b8179d1c09b6b5f4737c5870d55479034e3..0a8b837c10b1ff8753bb6c5a0c01f997a1055fae 100644
--- a/lib/SimpleSAML/Utils/System.php
+++ b/lib/SimpleSAML/Utils/System.php
@@ -179,7 +179,6 @@ class System
      * @param string $data The data we should write to the file.
      * @param int    $mode The permissions to apply to the file. Defaults to 0600.
      *
-     * @return void
      *
      * @throws \InvalidArgumentException If any of the input parameters doesn't have the proper types.
      * @throws Error\Exception If the file cannot be saved, permissions cannot be changed or it is not
diff --git a/lib/SimpleSAML/Utils/Time.php b/lib/SimpleSAML/Utils/Time.php
index 62661b7155e31104b2c8489db6591c385ae55fb0..ee860b78cc0995b002e88fcb957ac762093a422c 100644
--- a/lib/SimpleSAML/Utils/Time.php
+++ b/lib/SimpleSAML/Utils/Time.php
@@ -46,7 +46,6 @@ class Time
      * This function should be called before any calls to date().
      *
      *
-     * @return void
      * @throws \SimpleSAML\Error\Exception If the timezone set in the configuration is invalid.
      */
     public static function initTimezone(): void
diff --git a/lib/SimpleSAML/Utils/XML.php b/lib/SimpleSAML/Utils/XML.php
index 9c0d98c44c021598e4a0f9683518cd84236b86c0..75667676a08a460d728cd9fa28d8a9638e5bdc53 100644
--- a/lib/SimpleSAML/Utils/XML.php
+++ b/lib/SimpleSAML/Utils/XML.php
@@ -37,7 +37,6 @@ class XML
      *     values allowed.
      * @throws \SimpleSAML\Error\Exception If $message contains a doctype declaration.
      *
-     * @return void
      *
      */
     public static function checkSAMLMessage(string $message, string $type): void
@@ -92,7 +91,6 @@ class XML
      *
      * @throws \InvalidArgumentException If $type is not a string or $message is neither a string nor a \DOMElement.
      *
-     * @return void
      *
      */
     public static function debugSAMLMessage($message, string $type): void
@@ -157,7 +155,6 @@ class XML
      *
      * @throws \InvalidArgumentException If $root is not a DOMElement or $indentBase is not a string.
      *
-     * @return void
      *
      */
     public static function formatDOMElement(DOMNode $root, string $indentBase = ''): void
diff --git a/lib/SimpleSAML/XHTML/IdPDisco.php b/lib/SimpleSAML/XHTML/IdPDisco.php
index 408855334d82baf3d28efdf93495b5977525a555..c0199a445dd6ddc06b963fff7df7abcf94fcb97f 100644
--- a/lib/SimpleSAML/XHTML/IdPDisco.php
+++ b/lib/SimpleSAML/XHTML/IdPDisco.php
@@ -172,7 +172,6 @@ class IdPDisco
      * discovery service type.
      *
      * @param string $message The message which should be logged.
-     * @return void
      */
     protected function log(string $message): void
     {
@@ -209,7 +208,6 @@ class IdPDisco
      *
      * @param string $name The name of the cookie.
      * @param string $value The value of the cookie.
-     * @return void
      */
     protected function setCookie(string $name, string $value): void
     {
@@ -387,7 +385,6 @@ class IdPDisco
      * Save the current IdP choice to a cookie.
      *
      * @param string $idp The entityID of the IdP.
-     * @return void
      */
     protected function setPreviousIdP(string $idp): void
     {
@@ -508,7 +505,6 @@ class IdPDisco
     /**
      * Check if an IdP is set or if the request is passive, and redirect accordingly.
      *
-     * @return void If there is no IdP targeted and this is not a passive request.
      */
     protected function start(): void
     {
@@ -544,7 +540,6 @@ class IdPDisco
      * Handles a request to this discovery service.
      *
      * The IdP disco parameters should be set before calling this function.
-     * @return void
      */
     public function handleRequest(): void
     {
diff --git a/lib/SimpleSAML/XHTML/Template.php b/lib/SimpleSAML/XHTML/Template.php
index b6873c991c61828cdbc0893c349c06699572640b..3fde9897bf4ca0901ad2fc0784ea2af45223f877 100644
--- a/lib/SimpleSAML/XHTML/Template.php
+++ b/lib/SimpleSAML/XHTML/Template.php
@@ -404,7 +404,6 @@ class Template extends Response
      *
      * @param string $module The module where we need to search for templates.
      * @throws \InvalidArgumentException If the module is not enabled or it has no templates directory.
-     * @return void
      */
     public function addTemplatesFromModule(string $module): void
     {
@@ -451,7 +450,6 @@ class Template extends Response
 
     /**
      * Set some default context
-     * @return void
      */
     private function twigDefaultContext(): void
     {
diff --git a/lib/SimpleSAML/XHTML/TemplateControllerInterface.php b/lib/SimpleSAML/XHTML/TemplateControllerInterface.php
index fe789e3998b3f1e86c332db41a71270efdb358b5..488676cd37052c4504621bb2a91f0070bf43dffa 100644
--- a/lib/SimpleSAML/XHTML/TemplateControllerInterface.php
+++ b/lib/SimpleSAML/XHTML/TemplateControllerInterface.php
@@ -19,7 +19,6 @@ interface TemplateControllerInterface
      *
      * @param \Twig\Environment $twig The current twig environment.
      *
-     * @return void
      */
     public function setUpTwig(Environment &$twig): void;
 
@@ -31,7 +30,6 @@ interface TemplateControllerInterface
      *
      * @param array $data The current data used by the template.
      *
-     * @return void
      */
     public function display(array &$data): void;
 }
diff --git a/lib/SimpleSAML/XML/Errors.php b/lib/SimpleSAML/XML/Errors.php
index b6363278eb24e8dbd766a915b6f1f3704f3aa759..155cb66465284ae1ed0a6f41b1cee25b4288fa44 100644
--- a/lib/SimpleSAML/XML/Errors.php
+++ b/lib/SimpleSAML/XML/Errors.php
@@ -32,7 +32,6 @@ class Errors
     /**
      * Append current XML errors to the current stack level.
      *
-     * @return void
      */
     private static function addErrors(): void
     {
@@ -50,7 +49,6 @@ class Errors
      * A call to this function will begin a new error logging context. Every call must have
      * a corresponding call to end().
      *
-     * @return void
      */
     public static function begin(): void
     {
diff --git a/lib/SimpleSAML/XML/Signer.php b/lib/SimpleSAML/XML/Signer.php
index cbb99c18c1624837ec740968e3d9bca7dab341ad..769b8dd76d2555f59d18cd36ad7dfc3553555720 100644
--- a/lib/SimpleSAML/XML/Signer.php
+++ b/lib/SimpleSAML/XML/Signer.php
@@ -96,7 +96,6 @@ class Signer
      * by \SimpleSAML\Utils\Crypto::loadPrivateKey(...).
      *
      * @param array $privatekey  The private key.
-     * @return void
      */
     public function loadPrivateKeyArray(array $privatekey): void
     {
@@ -122,7 +121,6 @@ class Signer
      * @param bool $full_path  Whether the filename found in the configuration contains the
      *                         full path to the private key or not. Default to false.
      * @throws \Exception
-     * @return void
      */
     public function loadPrivateKey(string $file, ?string $pass, bool $full_path = false): void
     {
@@ -156,7 +154,6 @@ class Signer
      *
      * @param array $publickey The public key.
      * @throws \Exception
-     * @return void
      */
     public function loadPublicKeyArray(array $publickey): void
     {
@@ -181,7 +178,6 @@ class Signer
      * @param bool $full_path  Whether the filename found in the configuration contains the
      *                         full path to the private key or not. Default to false.
      * @throws \Exception
-     * @return void
      */
     public function loadCertificate(string $file, bool $full_path = false): void
     {
@@ -207,7 +203,6 @@ class Signer
      * Set the attribute name for the ID value.
      *
      * @param string $idAttrName  The name of the attribute which contains the id.
-     * @return void
      */
     public function setIDAttribute(string $idAttrName): void
     {
@@ -225,7 +220,6 @@ class Signer
      * @param bool $full_path  Whether the filename found in the configuration contains the
      *                         full path to the private key or not. Default to false.
      * @throws \Exception
-     * @return void
      */
     public function addCertificate(string $file, bool $full_path = false): void
     {
@@ -259,7 +253,6 @@ class Signer
      *  The element we should insert the signature element before. Defaults to NULL,
      *  in which case the signature will be appended to the element spesified in $insertInto.
      * @throws \Exception
-     * @return void
      */
     public function sign(DOMElement $node, DOMElement $insertInto, $insertBefore = null): void
     {
diff --git a/modules/admin/lib/Controller/Menu.php b/modules/admin/lib/Controller/Menu.php
index 5b6c4416167ac532b84c3cea16ca6137a82f725e..1754042f8c19fdfcfe2458d8ffcfafc2123b7cbd 100644
--- a/modules/admin/lib/Controller/Menu.php
+++ b/modules/admin/lib/Controller/Menu.php
@@ -54,7 +54,6 @@ final class Menu
      * @param string $id The identifier of this option.
      * @param string $url The URL this option points to.
      * @param string $name The name of the option for display purposes.
-     * @return void
      */
     public function addOption(string $id, string $url, string $name): void
     {
diff --git a/modules/core/hooks/hook_sanitycheck.php b/modules/core/hooks/hook_sanitycheck.php
index d647c68e78c2278a6370934d10ee1f01694a9eee..53c0d9e8219c9874f7dbe3f68ee26f6bcefba2b8 100644
--- a/modules/core/hooks/hook_sanitycheck.php
+++ b/modules/core/hooks/hook_sanitycheck.php
@@ -10,7 +10,6 @@ use SimpleSAML\Module;
  * Hook to do sanitycheck
  *
  * @param array &$hookinfo  hookinfo
- * @return void
  */
 function core_hook_sanitycheck(array &$hookinfo): void
 {
diff --git a/modules/core/lib/Auth/Process/AttributeAdd.php b/modules/core/lib/Auth/Process/AttributeAdd.php
index 14493b090bef161a42d13b203b5c6830098dcbfa..28c82fc1aa53a917cced97fc4fd589b857d8a09b 100644
--- a/modules/core/lib/Auth/Process/AttributeAdd.php
+++ b/modules/core/lib/Auth/Process/AttributeAdd.php
@@ -74,7 +74,6 @@ class AttributeAdd extends Auth\ProcessingFilter
      * Add or replace existing attributes with the configured values.
      *
      * @param array &$request  The current request
-     * @return void
      */
     public function process(array &$request): void
     {
diff --git a/modules/core/lib/Auth/Process/AttributeAlter.php b/modules/core/lib/Auth/Process/AttributeAlter.php
index e6a4be7b0a57260c1752f9455d0bd24864dee117..badf28ad3d09e3ab50554dd3e430cfd2f17e0833 100644
--- a/modules/core/lib/Auth/Process/AttributeAlter.php
+++ b/modules/core/lib/Auth/Process/AttributeAlter.php
@@ -101,7 +101,6 @@ class AttributeAlter extends Auth\ProcessingFilter
      *
      * @param array &$request The current request.
      * @throws \SimpleSAML\Error\Exception In case of invalid configuration.
-     * @return void
      */
     public function process(array &$request): void
     {
diff --git a/modules/core/lib/Auth/Process/AttributeCopy.php b/modules/core/lib/Auth/Process/AttributeCopy.php
index f5631bb5e4b5eaff533ca36d4cedc61a8cba8b51..d0767528cd2857902af25c998d8284ad92681e07 100644
--- a/modules/core/lib/Auth/Process/AttributeCopy.php
+++ b/modules/core/lib/Auth/Process/AttributeCopy.php
@@ -59,7 +59,6 @@ class AttributeCopy extends Auth\ProcessingFilter
      * Apply filter to rename attributes.
      *
      * @param array &$request  The current request
-     * @return void
      */
     public function process(array &$request): void
     {
diff --git a/modules/core/lib/Auth/Process/AttributeLimit.php b/modules/core/lib/Auth/Process/AttributeLimit.php
index 91f6757b5fd102f7083f3dae3e6fc208dd7d18d5..91d32fc3a40eda55db50252578ed211c1e1555ee 100644
--- a/modules/core/lib/Auth/Process/AttributeLimit.php
+++ b/modules/core/lib/Auth/Process/AttributeLimit.php
@@ -90,7 +90,6 @@ class AttributeLimit extends Auth\ProcessingFilter
      *
      * @param array &$request  The current request
      * @throws \SimpleSAML\Error\Exception If invalid configuration is found.
-     * @return void
      */
     public function process(array &$request): void
     {
diff --git a/modules/core/lib/Auth/Process/AttributeMap.php b/modules/core/lib/Auth/Process/AttributeMap.php
index 7dcfbc63865871f665d76eb5403fda9c502b2970..d96068c9d25394729905e0b913a7440c74c56775 100644
--- a/modules/core/lib/Auth/Process/AttributeMap.php
+++ b/modules/core/lib/Auth/Process/AttributeMap.php
@@ -80,7 +80,6 @@ class AttributeMap extends Auth\ProcessingFilter
      * of the SimpleSAMLphp installation, or in the root of a module.
      *
      * @throws \Exception If the filter could not load the requested attribute map file.
-     * @return void
      */
     private function loadMapFile(string $fileName): void
     {
@@ -121,7 +120,6 @@ class AttributeMap extends Auth\ProcessingFilter
      * Apply filter to rename attributes.
      *
      * @param array &$request The current request.
-     * @return void
      */
     public function process(array &$request): void
     {
diff --git a/modules/core/lib/Auth/Process/AttributeValueMap.php b/modules/core/lib/Auth/Process/AttributeValueMap.php
index 14d3b0b6b30b75c24b841034add84a7d5cf9a26a..8f52114e4e396eb84c892ac7ebcbf553dd838a0f 100644
--- a/modules/core/lib/Auth/Process/AttributeValueMap.php
+++ b/modules/core/lib/Auth/Process/AttributeValueMap.php
@@ -108,7 +108,6 @@ class AttributeValueMap extends Auth\ProcessingFilter
      * Apply filter.
      *
      * @param array &$request The current request
-     * @return void
      */
     public function process(array &$request): void
     {
diff --git a/modules/core/lib/Auth/Process/Cardinality.php b/modules/core/lib/Auth/Process/Cardinality.php
index 275799628978ac3202180f35c86aef8e27b4d228..a05e67fd1c533fed4b8a0c416e7c7f9e6562ebae 100644
--- a/modules/core/lib/Auth/Process/Cardinality.php
+++ b/modules/core/lib/Auth/Process/Cardinality.php
@@ -107,7 +107,6 @@ class Cardinality extends Auth\ProcessingFilter
      * Process this filter
      *
      * @param array &$request  The current request
-     * @return void
      */
     public function process(array &$request): void
     {
diff --git a/modules/core/lib/Auth/Process/CardinalitySingle.php b/modules/core/lib/Auth/Process/CardinalitySingle.php
index c1c667f249ae4fc1e87390b83a1af6b7db8c9cdb..0593c2d344db5a5a7499920b1d9896c692510964 100644
--- a/modules/core/lib/Auth/Process/CardinalitySingle.php
+++ b/modules/core/lib/Auth/Process/CardinalitySingle.php
@@ -82,7 +82,6 @@ class CardinalitySingle extends Auth\ProcessingFilter
      * Process this filter
      *
      * @param array &$request  The current request
-     * @return void
      */
     public function process(array &$request): void
     {
diff --git a/modules/core/lib/Auth/Process/ExtendIdPSession.php b/modules/core/lib/Auth/Process/ExtendIdPSession.php
index f3e9f710f11d274b21cb8eeaaf358426f96918a6..09ce3d08c3a1077cb05daf0bca7df3fc116436e0 100644
--- a/modules/core/lib/Auth/Process/ExtendIdPSession.php
+++ b/modules/core/lib/Auth/Process/ExtendIdPSession.php
@@ -17,7 +17,6 @@ class ExtendIdPSession extends Auth\ProcessingFilter
 {
     /**
      * @param array &$state
-     * @return void
      */
     public function process(array &$state): void
     {
diff --git a/modules/core/lib/Auth/Process/GenerateGroups.php b/modules/core/lib/Auth/Process/GenerateGroups.php
index c0d0ceef89878439642b596b4afcfcc0841f40ee..5793381f23b6116e1ce1356cf902bd57e6e776e3 100644
--- a/modules/core/lib/Auth/Process/GenerateGroups.php
+++ b/modules/core/lib/Auth/Process/GenerateGroups.php
@@ -57,7 +57,6 @@ class GenerateGroups extends Auth\ProcessingFilter
      * Apply filter to add groups attribute.
      *
      * @param array &$request  The current request
-     * @return void
      */
     public function process(array &$request): void
     {
diff --git a/modules/core/lib/Auth/Process/LanguageAdaptor.php b/modules/core/lib/Auth/Process/LanguageAdaptor.php
index 11dd96d3b4d8a060587151cc2780b5bc9600ec65..c6d14c9f0d174589d4a62e76b18b7618c4256cd2 100644
--- a/modules/core/lib/Auth/Process/LanguageAdaptor.php
+++ b/modules/core/lib/Auth/Process/LanguageAdaptor.php
@@ -42,7 +42,6 @@ class LanguageAdaptor extends Auth\ProcessingFilter
      * Add or replace existing attributes with the configured values.
      *
      * @param array &$request  The current request
-     * @return void
      */
     public function process(array &$request): void
     {
diff --git a/modules/core/lib/Auth/Process/PHP.php b/modules/core/lib/Auth/Process/PHP.php
index 30ca1c35d53fc575dcaec99a2c50477dfb0cad34..a1dfab414f013ead3b1b71e3719a2f728ddd3845 100644
--- a/modules/core/lib/Auth/Process/PHP.php
+++ b/modules/core/lib/Auth/Process/PHP.php
@@ -47,7 +47,6 @@ class PHP extends Auth\ProcessingFilter
      * Apply the PHP code to the attributes.
      *
      * @param array &$request The current request
-     * @return void
      *
      * @scrutinizer ignore-unused
      */
@@ -59,7 +58,6 @@ class PHP extends Auth\ProcessingFilter
          * @param array &$attributes
          * @param array &$state
          */
-        $function = /** @return void */ function (
             /** @scrutinizer ignore-unused */ array &$attributes,
             /** @scrutinizer ignore-unused */ array &$state
         ) {
diff --git a/modules/core/lib/Auth/Process/ScopeAttribute.php b/modules/core/lib/Auth/Process/ScopeAttribute.php
index 4c60aa0c8573832698fa2a703fb6e4d2257bccef..1b6ceca7cabd7c6943810d194a349fc01ae692ce 100644
--- a/modules/core/lib/Auth/Process/ScopeAttribute.php
+++ b/modules/core/lib/Auth/Process/ScopeAttribute.php
@@ -68,7 +68,6 @@ class ScopeAttribute extends Auth\ProcessingFilter
      * Apply this filter to the request.
      *
      * @param array &$request  The current request
-     * @return void
      */
     public function process(array &$request): void
     {
diff --git a/modules/core/lib/Auth/Process/ScopeFromAttribute.php b/modules/core/lib/Auth/Process/ScopeFromAttribute.php
index 2e819b0f1b5e2867138cc8e7aeb290b0f8b4bdd9..121c6e3f3ee5af6f48209c2c03729f6d6407ed59 100644
--- a/modules/core/lib/Auth/Process/ScopeFromAttribute.php
+++ b/modules/core/lib/Auth/Process/ScopeFromAttribute.php
@@ -62,7 +62,6 @@ class ScopeFromAttribute extends Auth\ProcessingFilter
      * Apply this filter.
      *
      * @param array &$request  The current request
-     * @return void
      */
     public function process(array &$request): void
     {
diff --git a/modules/core/lib/Auth/Process/StatisticsWithAttribute.php b/modules/core/lib/Auth/Process/StatisticsWithAttribute.php
index 364240254087e56bf46572040c84d4f91ea8114e..f7541d45a581c8cd4dcd8b51abcbf16013be2c90 100644
--- a/modules/core/lib/Auth/Process/StatisticsWithAttribute.php
+++ b/modules/core/lib/Auth/Process/StatisticsWithAttribute.php
@@ -67,7 +67,6 @@ class StatisticsWithAttribute extends Auth\ProcessingFilter
      * Log line.
      *
      * @param array &$state  The current state.
-     * @return void
      */
     public function process(array &$state): void
     {
diff --git a/modules/core/lib/Auth/Process/TargetedID.php b/modules/core/lib/Auth/Process/TargetedID.php
index 4fe2f3d787805da34e88c24a3242b830c8b1b49b..2325fa2f62a4310dc8b4678d0ed20a0062271205 100644
--- a/modules/core/lib/Auth/Process/TargetedID.php
+++ b/modules/core/lib/Auth/Process/TargetedID.php
@@ -94,7 +94,6 @@ class TargetedID extends Auth\ProcessingFilter
      * Apply filter to add the targeted ID.
      *
      * @param array &$state  The current state.
-     * @return void
      */
     public function process(array &$state): void
     {
diff --git a/modules/core/lib/Auth/Process/WarnShortSSOInterval.php b/modules/core/lib/Auth/Process/WarnShortSSOInterval.php
index ef47239e91f037e529e99ad6bbfca92b4c7b3d8a..71e14c7aed4206cde7bd0ebad86e9b02ea5604c4 100644
--- a/modules/core/lib/Auth/Process/WarnShortSSOInterval.php
+++ b/modules/core/lib/Auth/Process/WarnShortSSOInterval.php
@@ -24,7 +24,6 @@ class WarnShortSSOInterval extends Auth\ProcessingFilter
      * If it is to short a while since, we will show a warning to the user.
      *
      * @param array $state  The state of the response.
-     * @return void
      */
     public function process(array &$state): void
     {
diff --git a/modules/core/lib/Auth/UserPassBase.php b/modules/core/lib/Auth/UserPassBase.php
index 3d69ef7388baf0b4c753e77c7c9eb0270a357533..515445b90cbadee35b3a3732df19ac7667932365 100644
--- a/modules/core/lib/Auth/UserPassBase.php
+++ b/modules/core/lib/Auth/UserPassBase.php
@@ -129,7 +129,6 @@ abstract class UserPassBase extends Auth\Source
      * Set forced username.
      *
      * @param string|null $forcedUsername  The forced username.
-     * @return void
      */
     public function setForcedUsername(?string $forcedUsername): void
     {
@@ -194,7 +193,6 @@ abstract class UserPassBase extends Auth\Source
      * login page.
      *
      * @param array &$state  Information about the current authentication.
-     * @return void
      */
     public function authenticate(array &$state): void
     {
@@ -281,7 +279,6 @@ abstract class UserPassBase extends Auth\Source
      * @param string $authStateId  The identifier of the authentication state.
      * @param string $username  The username the user wrote.
      * @param string $password  The password the user wrote.
-     * @return void
      */
     public static function handleLogin(string $authStateId, string $username, string $password): void
     {
diff --git a/modules/core/lib/Auth/UserPassOrgBase.php b/modules/core/lib/Auth/UserPassOrgBase.php
index ce9ead3c5cd209047e4f45bdba08c43803034008..03b9b214a07c880a009dc6590d0c0ce135b084aa 100644
--- a/modules/core/lib/Auth/UserPassOrgBase.php
+++ b/modules/core/lib/Auth/UserPassOrgBase.php
@@ -134,7 +134,6 @@ abstract class UserPassOrgBase extends Auth\Source
      * If unconfigured, the default is 'none'.
      *
      * @param string $usernameOrgMethod  The method which should be used.
-     * @return void
      */
     protected function setUsernameOrgMethod(string $usernameOrgMethod): void
     {
@@ -207,7 +206,6 @@ abstract class UserPassOrgBase extends Auth\Source
      * login page.
      *
      * @param array &$state  Information about the current authentication.
-     * @return void
      */
     public function authenticate(array &$state): void
     {
@@ -263,7 +261,6 @@ abstract class UserPassOrgBase extends Auth\Source
      * @param string $username  The username the user wrote.
      * @param string $password  The password the user wrote.
      * @param string $organization  The id of the organization the user chose.
-     * @return void
      */
     public static function handleLogin(
         string $authStateId,
diff --git a/modules/core/lib/Controller/Login.php b/modules/core/lib/Controller/Login.php
index de75c470284e713171e0084b10efb7ef59226af9..e54d60198cebecd0dd23505cb58779782fd8e7b7 100644
--- a/modules/core/lib/Controller/Login.php
+++ b/modules/core/lib/Controller/Login.php
@@ -216,7 +216,6 @@ class Login
      * This clears the user's IdP discovery choices.
      *
      * @param Request $request The request that lead to this login operation.
-     * @return void
      */
     public function cleardiscochoices(Request $request): void
     {
diff --git a/modules/core/lib/Stats/Output/File.php b/modules/core/lib/Stats/Output/File.php
index 90fde84378cc265c2481d5c17a5deab0985d9943..17d890bc707be51e865efbe91b76d991e87284da 100644
--- a/modules/core/lib/Stats/Output/File.php
+++ b/modules/core/lib/Stats/Output/File.php
@@ -56,7 +56,6 @@ class File extends \SimpleSAML\Stats\Output
      * Open a log file.
      *
      * @param string $date  The date for the log file.
-     * @return void
      */
     private function openLog(string $date): void
     {
@@ -83,7 +82,6 @@ class File extends \SimpleSAML\Stats\Output
      * Write a stats event.
      *
      * @param array $data  The event.
-     * @return void
      */
     public function emit(array $data): void
     {
diff --git a/modules/core/lib/Stats/Output/Log.php b/modules/core/lib/Stats/Output/Log.php
index aa881b0b88a38240c859683792d9ceeca69801d7..58c554b574c555616847965b98b59545b5402ec7 100644
--- a/modules/core/lib/Stats/Output/Log.php
+++ b/modules/core/lib/Stats/Output/Log.php
@@ -41,7 +41,6 @@ class Log extends \SimpleSAML\Stats\Output
      * Write a stats event.
      *
      * @param array $data  The event
-     * @return void
      */
     public function emit(array $data): void
     {
diff --git a/modules/core/lib/Storage/SQLPermanentStorage.php b/modules/core/lib/Storage/SQLPermanentStorage.php
index f25519539c2720a03dad52d686dfd2eb00e69ef4..dec8a8f76403be420e3dbd538db43e789ba27e67 100644
--- a/modules/core/lib/Storage/SQLPermanentStorage.php
+++ b/modules/core/lib/Storage/SQLPermanentStorage.php
@@ -75,7 +75,6 @@ class SQLPermanentStorage
      * @param string $key2
      * @param string $value
      * @param int|null $duration
-     * @return void
      */
     public function set(string $type, string $key1, string $key2, string $value, int $duration = null): void
     {
diff --git a/modules/cron/hooks/hook_configpage.php b/modules/cron/hooks/hook_configpage.php
index d933c5c5d1f707c6a98f4ad9ff1712f2a21da2a0..51329aee9b6a1fef69fd95f604d4cf7f99d47624 100644
--- a/modules/cron/hooks/hook_configpage.php
+++ b/modules/cron/hooks/hook_configpage.php
@@ -8,7 +8,6 @@ use SimpleSAML\XHTML\Template;
  * Hook to add the cron module to the config page.
  *
  * @param \SimpleSAML\XHTML\Template &$template The template that we should alter in this hook.
- * @return void
  */
 function cron_hook_configpage(Template &$template): void
 {
diff --git a/modules/cron/hooks/hook_cron.php b/modules/cron/hooks/hook_cron.php
index f411fb7ca24087029252d546b2b4021b206b109b..843d4dd5dc894568456a0c288fc75cab8f4e2b78 100644
--- a/modules/cron/hooks/hook_cron.php
+++ b/modules/cron/hooks/hook_cron.php
@@ -7,7 +7,6 @@ use SimpleSAML\Configuration;
  * Hook to run a cron job.
  *
  * @param array &$croninfo  Output
- * @return void
  */
 function cron_hook_cron(array &$croninfo): void
 {
diff --git a/modules/cron/hooks/hook_frontpage.php b/modules/cron/hooks/hook_frontpage.php
index 430edf7ef30465eedc9dadddbd3bbd5f05cad036..bf57406cb592d08576d464dc08f90c826d2469d5 100644
--- a/modules/cron/hooks/hook_frontpage.php
+++ b/modules/cron/hooks/hook_frontpage.php
@@ -7,7 +7,6 @@ use SimpleSAML\Module;
  * Hook to add the modinfo module to the frontpage.
  *
  * @param array &$links  The links on the frontpage, split into sections.
- * @return void
  */
 function cron_hook_frontpage(array &$links): void
 {
diff --git a/modules/exampleauth/lib/Auth/Process/RedirectTest.php b/modules/exampleauth/lib/Auth/Process/RedirectTest.php
index 6f9214d91d89779746b732bb76ec7bf6f9f91fdc..bb4e7ff6aaf894b72a4a56e009498b3acbf9b99b 100644
--- a/modules/exampleauth/lib/Auth/Process/RedirectTest.php
+++ b/modules/exampleauth/lib/Auth/Process/RedirectTest.php
@@ -19,7 +19,6 @@ class RedirectTest extends \SimpleSAML\Auth\ProcessingFilter
      * Initialize processing of the redirect test.
      *
      * @param array &$state  The state we should update.
-     * @return void
      */
     public function process(array &$state): void
     {
diff --git a/modules/exampleauth/lib/Auth/Source/External.php b/modules/exampleauth/lib/Auth/Source/External.php
index 7d59c63da32e7c609cc19aef6701d0eed6446106..6ed1ef5e9c755bc85c22965d431fa6432c5bae51 100644
--- a/modules/exampleauth/lib/Auth/Source/External.php
+++ b/modules/exampleauth/lib/Auth/Source/External.php
@@ -102,7 +102,6 @@ class External extends Auth\Source
      * Log in using an external authentication helper.
      *
      * @param array &$state  Information about the current authentication.
-     * @return void
      */
     public function authenticate(array &$state): void
     {
@@ -185,7 +184,6 @@ class External extends Auth\Source
      * This function resumes the authentication process after the user has
      * entered his or her credentials.
      *
-     * @return void
      * @throws \SimpleSAML\Error\BadRequest
      * @throws \SimpleSAML\Error\Exception
      */
@@ -264,7 +262,6 @@ class External extends Auth\Source
      * by logging out of a SP that supports single logout.
      *
      * @param array &$state  The logout state array.
-     * @return void
      */
     public function logout(array &$state): void
     {
diff --git a/modules/exampleauth/lib/Auth/Source/StaticSource.php b/modules/exampleauth/lib/Auth/Source/StaticSource.php
index fc871630551637287368675c9c37a99c33739620..270d6c0ed556923f34ef6158864eed099f19f67c 100644
--- a/modules/exampleauth/lib/Auth/Source/StaticSource.php
+++ b/modules/exampleauth/lib/Auth/Source/StaticSource.php
@@ -51,7 +51,6 @@ class StaticSource extends Auth\Source
      * Log in using static attributes.
      *
      * @param array &$state  Information about the current authentication.
-     * @return void
      */
     public function authenticate(array &$state): void
     {
diff --git a/modules/multiauth/lib/Auth/Source/MultiAuth.php b/modules/multiauth/lib/Auth/Source/MultiAuth.php
index adb283032969bcf25f1ce5b05927a9bac5409a9c..3f93169cb7f463ed93cebdd4c3108a5637b654af 100644
--- a/modules/multiauth/lib/Auth/Source/MultiAuth.php
+++ b/modules/multiauth/lib/Auth/Source/MultiAuth.php
@@ -134,7 +134,6 @@ class MultiAuth extends Auth\Source
      * in the delegateAuthentication method.
      *
      * @param array &$state Information about the current authentication.
-     * @return void
      */
     public function authenticate(array &$state): void
     {
@@ -176,7 +175,6 @@ class MultiAuth extends Auth\Source
      *
      * @param string $authId Selected authentication source
      * @param array $state Information about the current authentication.
-     * @return void
      * @throws \Exception
      */
     public static function delegateAuthentication(string $authId, array $state): void
@@ -224,7 +222,6 @@ class MultiAuth extends Auth\Source
      * session and then call the logout method on it.
      *
      * @param array &$state Information about the current logout operation.
-     * @return void
      */
     public function logout(array &$state): void
     {
@@ -248,7 +245,6 @@ class MultiAuth extends Auth\Source
      * by storing its name in a cookie.
      *
      * @param string $source Name of the authentication source the user selected.
-     * @return void
      */
     public function setPreviousSource(string $source): void
     {
diff --git a/modules/saml/hooks/hook_metadata_hosted.php b/modules/saml/hooks/hook_metadata_hosted.php
index d91d8062df3c5487c34f836d463a0ac6c27f0184..45c8021fbc4eed132ff88f1cf4fdaad9bb3620fe 100644
--- a/modules/saml/hooks/hook_metadata_hosted.php
+++ b/modules/saml/hooks/hook_metadata_hosted.php
@@ -7,7 +7,6 @@ use SimpleSAML\Auth;
  * Hook to add the metadata for hosted entities to the frontpage.
  *
  * @param array &$metadataHosted  The metadata links for hosted metadata on the frontpage.
- * @return void
  */
 function saml_hook_metadata_hosted(array &$metadataHosted)
 {
diff --git a/modules/saml/lib/Auth/Process/AuthnContextClassRef.php b/modules/saml/lib/Auth/Process/AuthnContextClassRef.php
index 1c98f44aec66382a108162da72c6d39cbfbd85bd..93bf1c7197364510604f7d6909f0b30b0a7ebfc5 100644
--- a/modules/saml/lib/Auth/Process/AuthnContextClassRef.php
+++ b/modules/saml/lib/Auth/Process/AuthnContextClassRef.php
@@ -47,7 +47,6 @@ class AuthnContextClassRef extends ProcessingFilter
      * Set the AuthnContextClassRef in the SAML 2 response.
      *
      * @param array &$state The state array for this request.
-     * @return void
      */
     public function process(array &$state): void
     {
diff --git a/modules/saml/lib/Auth/Process/ExpectedAuthnContextClassRef.php b/modules/saml/lib/Auth/Process/ExpectedAuthnContextClassRef.php
index 2ba768e3ed93a8e97fab336d2a707ea7801b407d..31db71085b5d82a350fe62e8080aacbd318ad777 100644
--- a/modules/saml/lib/Auth/Process/ExpectedAuthnContextClassRef.php
+++ b/modules/saml/lib/Auth/Process/ExpectedAuthnContextClassRef.php
@@ -71,7 +71,6 @@ class ExpectedAuthnContextClassRef extends ProcessingFilter
     /**
      *
      * @param array &$request The current request
-     * @return void
      */
     public function process(array &$request): void
     {
@@ -96,7 +95,6 @@ class ExpectedAuthnContextClassRef extends ProcessingFilter
      * permission logic.
      *
      * @param array $request
-     * @return void
      */
     protected function unauthorized(array &$request): void
     {
diff --git a/modules/saml/lib/Auth/Process/FilterScopes.php b/modules/saml/lib/Auth/Process/FilterScopes.php
index 5b58f930773ee1ec79edf32d4a3a5a3d4979d2b1..3a80036386cad1aa662d3e2f8b0e5aaa4ede432f 100644
--- a/modules/saml/lib/Auth/Process/FilterScopes.php
+++ b/modules/saml/lib/Auth/Process/FilterScopes.php
@@ -46,7 +46,6 @@ class FilterScopes extends ProcessingFilter
      * This method applies the filter, removing any values
      *
      * @param array &$request the current request
-     * @return void
      */
     public function process(array &$request): void
     {
diff --git a/modules/saml/lib/Auth/Process/NameIDAttribute.php b/modules/saml/lib/Auth/Process/NameIDAttribute.php
index 7ec8a1caeab4b48a6bf4d405f309a06ba0706027..33e612eecfc0a1fc5d4702b1e888d8168f394f99 100644
--- a/modules/saml/lib/Auth/Process/NameIDAttribute.php
+++ b/modules/saml/lib/Auth/Process/NameIDAttribute.php
@@ -107,7 +107,6 @@ class NameIDAttribute extends ProcessingFilter
      * Convert NameID to attribute.
      *
      * @param array &$state The request state.
-     * @return void
      */
     public function process(array &$state): void
     {
diff --git a/modules/saml/lib/Auth/Process/PersistentNameID2TargetedID.php b/modules/saml/lib/Auth/Process/PersistentNameID2TargetedID.php
index 3f889124f75c531f71d3749f2ca6ae4ef407d2d2..99053c352d461421a228b52249750a332f7c167e 100644
--- a/modules/saml/lib/Auth/Process/PersistentNameID2TargetedID.php
+++ b/modules/saml/lib/Auth/Process/PersistentNameID2TargetedID.php
@@ -61,7 +61,6 @@ class PersistentNameID2TargetedID extends ProcessingFilter
      * Store a NameID to attribute.
      *
      * @param array &$state The request state.
-     * @return void
      */
     public function process(array &$state): void
     {
diff --git a/modules/saml/lib/Auth/Source/SP.php b/modules/saml/lib/Auth/Source/SP.php
index 6f111198a0456c88ad92931c512c58d9842c0fc9..4a7842d8fb844a0d07b57493d7445276856453af 100644
--- a/modules/saml/lib/Auth/Source/SP.php
+++ b/modules/saml/lib/Auth/Source/SP.php
@@ -438,7 +438,6 @@ class SP extends \SimpleSAML\Auth\Source
      *
      * @param \SimpleSAML\Configuration $idpMetadata  The metadata of the IdP.
      * @param array $state  The state array for the current authentication.
-     * @return void
      */
     private function startSSO2(Configuration $idpMetadata, array $state): void
     {
@@ -647,7 +646,6 @@ class SP extends \SimpleSAML\Auth\Source
      * @param array &$state  The state array.
      * @param \SAML2\Binding $binding  The binding.
      * @param \SAML2\AuthnRequest  $ar  The authentication request.
-     * @return void
      */
     public function sendSAML2AuthnRequest(array &$state, Binding $binding, AuthnRequest $ar): void
     {
@@ -661,7 +659,6 @@ class SP extends \SimpleSAML\Auth\Source
      *
      * @param string $idp  The entity ID of the IdP.
      * @param array $state  The state array for the current authentication.
-     * @return void
      */
     public function startSSO(string $idp, array $state): void
     {
@@ -683,7 +680,6 @@ class SP extends \SimpleSAML\Auth\Source
      * Start an IdP discovery service operation.
      *
      * @param array $state  The state array.
-     * @return void
      */
     private function startDisco(array $state): void
     {
@@ -721,7 +717,6 @@ class SP extends \SimpleSAML\Auth\Source
      * This function saves the information about the login, and redirects to the IdP.
      *
      * @param array &$state  Information about the current authentication.
-     * @return void
      */
     public function authenticate(array &$state): void
     {
@@ -778,7 +773,6 @@ class SP extends \SimpleSAML\Auth\Source
      * interact with the user even in the case when the user is already authenticated.
      *
      * @param array &$state  Information about the current authentication.
-     * @return void
      */
     public function reauthenticate(array &$state): void
     {
@@ -865,7 +859,6 @@ class SP extends \SimpleSAML\Auth\Source
      * - 'core:IdP': the identifier of the local IdP.
      * - 'SPMetadata': an array with the metadata of this local SP.
      *
-     * @return void
      * @throws \SimpleSAML\Module\saml\Error\NoPassive In case the authentication request was passive.
      */
     public static function askForIdPChange(array &$state): void
@@ -897,7 +890,6 @@ class SP extends \SimpleSAML\Auth\Source
      * This method will never return.
      *
      * @param array $state The state array.
-     * @return void
      */
     public static function reauthLogout(array $state): void
     {
@@ -918,7 +910,6 @@ class SP extends \SimpleSAML\Auth\Source
      * Complete login operation after re-authenticating the user on another IdP.
      *
      * @param array $state  The authentication state.
-     * @return void
      */
     public static function reauthPostLogin(array $state): void
     {
@@ -942,7 +933,6 @@ class SP extends \SimpleSAML\Auth\Source
      *
      * @param \SimpleSAML\IdP $idp The IdP we are logging out from.
      * @param array &$state The state array with the state during logout.
-     * @return void
      */
     public static function reauthPostLogout(IdP $idp, array $state): void
     {
@@ -967,7 +957,6 @@ class SP extends \SimpleSAML\Auth\Source
      * Start a SAML 2 logout operation.
      *
      * @param array $state  The logout state.
-     * @return void
      */
     public function startSLO2(array &$state): void
     {
@@ -1022,7 +1011,6 @@ class SP extends \SimpleSAML\Auth\Source
      * Start logout operation.
      *
      * @param array $state  The logout state.
-     * @return void
      */
     public function logout(array &$state): void
     {
@@ -1046,7 +1034,6 @@ class SP extends \SimpleSAML\Auth\Source
      * @param array $state  The authentication state.
      * @param string $idp  The entity id of the IdP.
      * @param array $attributes  The attributes.
-     * @return void
      */
     public function handleResponse(array $state, string $idp, array $attributes): void
     {
@@ -1090,7 +1077,6 @@ class SP extends \SimpleSAML\Auth\Source
      * Handle a logout request from an IdP.
      *
      * @param string $idpEntityId  The entity ID of the IdP.
-     * @return void
      */
     public function handleLogout(string $idpEntityId): void
     {
@@ -1112,7 +1098,6 @@ class SP extends \SimpleSAML\Auth\Source
      * the session. The function will check if the URL is allowed, so there is no need to
      * manually check the URL on beforehand. Please refer to the 'trusted.url.domains'
      * configuration directive for more information about allowing (or disallowing) URLs.
-     * @return void
      */
     public static function handleUnsolicitedAuth(string $authId, array $state, string $redirectTo): void
     {
@@ -1127,7 +1112,6 @@ class SP extends \SimpleSAML\Auth\Source
      * Called when we have completed the procssing chain.
      *
      * @param array $authProcState  The processing chain state.
-     * @return void
      */
     public static function onProcessingCompleted(array $authProcState): void
     {
diff --git a/modules/saml/lib/BaseNameIDGenerator.php b/modules/saml/lib/BaseNameIDGenerator.php
index a6deb6010cc3ef24df62ed35b6046d9cc420e16c..c319ea450d607c5c30a55369c05da85029c99ff6 100644
--- a/modules/saml/lib/BaseNameIDGenerator.php
+++ b/modules/saml/lib/BaseNameIDGenerator.php
@@ -85,7 +85,6 @@ abstract class BaseNameIDGenerator extends \SimpleSAML\Auth\ProcessingFilter
      * Generate transient NameID.
      *
      * @param array &$state  The request state.
-     * @return void
      */
     public function process(array &$state): void
     {
diff --git a/modules/saml/lib/IdP/SAML2.php b/modules/saml/lib/IdP/SAML2.php
index e4814db36b296fea3b89b1dc82b5570d83ed29f4..ac692da2bd1a7da52e18e9cdcc3709c0fa531697 100644
--- a/modules/saml/lib/IdP/SAML2.php
+++ b/modules/saml/lib/IdP/SAML2.php
@@ -47,7 +47,6 @@ class SAML2
      * Send a response to the SP.
      *
      * @param array $state The authentication state.
-     * @return void
      */
     public static function sendResponse(array $state): void
     {
@@ -125,7 +124,6 @@ class SAML2
      * \SimpleSAML\Error\Exception $exception  The exception.
      *
      * @param array $state The error state.
-     * @return void
      */
     public static function handleAuthError(\SimpleSAML\Error\Exception $exception, array $state): void
     {
@@ -274,7 +272,6 @@ class SAML2
      * Receive an authentication request.
      *
      * @param \SimpleSAML\IdP $idp The IdP we are receiving it for.
-     * @return void
      * @throws \SimpleSAML\Error\BadRequest In case an error occurs when trying to receive the request.
      */
     public static function receiveAuthnRequest(IdP $idp): void
@@ -492,7 +489,6 @@ class SAML2
      * @param \SimpleSAML\IdP $idp The IdP we are sending a logout request from.
      * @param array           $association The association that should be terminated.
      * @param string|null     $relayState An id that should be carried across the logout.
-     * @return void
      */
     public static function sendLogoutRequest(IdP $idp, array $association, string $relayState = null): void
     {
@@ -528,7 +524,6 @@ class SAML2
      *
      * @param \SimpleSAML\IdP $idp The IdP we are sending a logout request from.
      * @param array           &$state The logout state array.
-     * @return void
      */
     public static function sendLogoutResponse(IdP $idp, array $state): void
     {
@@ -588,7 +583,6 @@ class SAML2
      * Receive a logout message.
      *
      * @param \SimpleSAML\IdP $idp The IdP we are receiving it for.
-     * @return void
      * @throws \SimpleSAML\Error\BadRequest In case an error occurs while trying to receive the logout message.
      */
     public static function receiveLogoutMessage(IdP $idp): void
diff --git a/modules/saml/lib/IdP/SQLNameID.php b/modules/saml/lib/IdP/SQLNameID.php
index d83ca638473019038446094108af75cbbe0dca37..45623212a50115cd13011b476c71bdc2aefd775f 100644
--- a/modules/saml/lib/IdP/SQLNameID.php
+++ b/modules/saml/lib/IdP/SQLNameID.php
@@ -81,7 +81,6 @@ class SQLNameID
 
     /**
      * @param array $config
-     * @return void
      */
     private static function create(array $config = [])
     {
@@ -131,7 +130,6 @@ class SQLNameID
      *
      * @param string $table  The table name.
      * @param array $config
-     * @return void
      */
     private static function createTable(string $table, array $config = [])
     {
@@ -176,7 +174,6 @@ class SQLNameID
      * @param string $user  The user's unique identificator (e.g. username).
      * @param string $value  The NameID value.
      * @param array $config
-     * @return void
      */
     public static function add(
         string $idpEntityId,
@@ -241,7 +238,6 @@ class SQLNameID
      * @param string $spEntityId  The SP entityID.
      * @param string $user  The user's unique identificator (e.g. username).
      * @param array $config
-     * @return void
      */
     public static function delete(
         string $idpEntityId,
diff --git a/modules/saml/lib/Message.php b/modules/saml/lib/Message.php
index b461cd99f62253140ab66baf7ce3f622fdc51140..4955c20378ff8417adf18aa1e9a2e599742ba334 100644
--- a/modules/saml/lib/Message.php
+++ b/modules/saml/lib/Message.php
@@ -37,7 +37,6 @@ class Message
      * @param \SimpleSAML\Configuration $srcMetadata The metadata of the sender.
      * @param \SimpleSAML\Configuration $dstMetadata The metadata of the recipient.
      * @param \SAML2\SignedElement $element The element we should add the data to.
-     * @return void
      */
     public static function addSign(
         Configuration $srcMetadata,
@@ -89,7 +88,6 @@ class Message
      * @param \SimpleSAML\Configuration $srcMetadata The metadata of the sender.
      * @param \SimpleSAML\Configuration $dstMetadata The metadata of the recipient.
      * @param \SAML2\Message $message The message we should add the data to.
-     * @return void
      */
     private static function addRedirectSign(
         Configuration $srcMetadata,
@@ -193,7 +191,6 @@ class Message
      * @param \SimpleSAML\Configuration $srcMetadata The metadata of the sender.
      * @param \SimpleSAML\Configuration $dstMetadata The metadata of the recipient.
      * @param \SAML2\Message $message The message we should check the signature on.
-     * @return void
      *
      * @throws \SimpleSAML\Error\Exception if message validation is enabled, but there is no signature in the message.
      */
@@ -378,7 +375,6 @@ class Message
      * @param \SimpleSAML\Configuration $dstMetadata The metadata of the recipient (SP).
      * @param \SAML2\Assertion|\SAML2\Assertion $assertion The assertion containing any possibly encrypted attributes.
      *
-     * @return void
      *
      * @throws \SimpleSAML\Error\Exception if we cannot get the decryption keys or decryption fails.
      */
diff --git a/modules/saml/lib/SP/LogoutStore.php b/modules/saml/lib/SP/LogoutStore.php
index 9b8f423d28d93ef920fb52f995345df83ef4d8ed..0cbde2f9275d6ef7b7ba206a991983fb09880904 100644
--- a/modules/saml/lib/SP/LogoutStore.php
+++ b/modules/saml/lib/SP/LogoutStore.php
@@ -24,7 +24,6 @@ class LogoutStore
      * Create logout table in SQL, if it is missing.
      *
      * @param \SimpleSAML\Store\SQL $store  The datastore.
-     * @return void
      */
     private static function createLogoutTable(Store\SQL $store): void
     {
@@ -199,7 +198,6 @@ class LogoutStore
      * Clean the logout table of expired entries.
      *
      * @param \SimpleSAML\Store\SQL $store  The datastore.
-     * @return void
      */
     private static function cleanLogoutStore(Store\SQL $store): void
     {
@@ -222,7 +220,6 @@ class LogoutStore
      * @param string $sessionIndex  The SessionIndex of the user.
      * @param int $expire
      * @param string $sessionId
-     * @return void
      */
     private static function addSessionSQL(
         Store\SQL $store,
@@ -327,7 +324,6 @@ class LogoutStore
      * @param \SAML2\XML\saml\NameID $nameId The NameID of the user.
      * @param string|null $sessionIndex  The SessionIndex of the user.
      * @param int $expire
-     * @return void
      */
     public static function addSession(string $authId, NameID $nameId, ?string $sessionIndex, int $expire): void
     {
diff --git a/tests/SigningTestCase.php b/tests/SigningTestCase.php
index 95714f23006c57476a4a420d2b142431833203cc..b5ee39435f6b5515a8a295f12fe3b71f7be25b6e 100644
--- a/tests/SigningTestCase.php
+++ b/tests/SigningTestCase.php
@@ -189,7 +189,6 @@ NOWDOC;
 
 
     /**
-     * @return void
      */
     public function setUp(): void
     {
@@ -215,7 +214,6 @@ NOWDOC;
 
 
     /**
-     * @return void
      */
     public function tearDown(): void
     {
@@ -227,7 +225,6 @@ NOWDOC;
      * @param \SimpleSAML\Configuration $service
      * @param class-string $className
      * @param mixed|null $value
-     * @return void
      */
     protected function clearInstance(Configuration $service, string $className, $value = null): void
     {
diff --git a/tests/Utils/ClearStateTestCase.php b/tests/Utils/ClearStateTestCase.php
index 000bf57df9b3e47cb67ccb53dad9861d2276bc12..d82c423b805a74f498d637a3c2e35090018a9168 100644
--- a/tests/Utils/ClearStateTestCase.php
+++ b/tests/Utils/ClearStateTestCase.php
@@ -19,7 +19,6 @@ class ClearStateTestCase extends TestCase
 
 
     /**
-     * @return void
      */
     public static function setUpBeforeClass(): void
     {
@@ -31,7 +30,6 @@ class ClearStateTestCase extends TestCase
 
 
     /**
-     * @return void
      */
     protected function setUp(): void
     {
@@ -40,7 +38,6 @@ class ClearStateTestCase extends TestCase
 
 
     /**
-     * @return void
      */
     public static function tearDownAfterClass(): void
     {
@@ -50,7 +47,6 @@ class ClearStateTestCase extends TestCase
 
     /**
      * Clear any SSP global state to reduce spill over between tests.
-     * @return void
      */
     public static function clearState(): void
     {
diff --git a/tests/Utils/ExitTestException.php b/tests/Utils/ExitTestException.php
index 973b9d833b0d0d516590a84073f02cd1ec06bee3..dc64a0ae842e4814511222ae022ef117e4ae38e9 100644
--- a/tests/Utils/ExitTestException.php
+++ b/tests/Utils/ExitTestException.php
@@ -15,7 +15,6 @@ class ExitTestException extends \Exception
 
     /**
      * @param array $testResult
-     * @return void
      */
     public function __construct(array $testResult)
     {
diff --git a/tests/Utils/ReduceSpillOverTest.php b/tests/Utils/ReduceSpillOverTest.php
index 6554d558790734d26132ca32cc2a705531b9f810..ba57f9cbf420ab949f5dee6d8ad89e4282b9ef29 100644
--- a/tests/Utils/ReduceSpillOverTest.php
+++ b/tests/Utils/ReduceSpillOverTest.php
@@ -15,7 +15,6 @@ class ReduceSpillOverTest extends ClearStateTestCase
 {
     /**
      * Set some global state
-     * @return void
      */
     public function testSetState(): void
     {
@@ -28,7 +27,6 @@ class ReduceSpillOverTest extends ClearStateTestCase
 
     /**
      * Confirm global state removed prior to next test
-     * @return void
      * @throws \SimpleSAML\Error\ConfigurationError
      */
     public function testStateRemoved(): void
diff --git a/tests/Utils/SpTester.php b/tests/Utils/SpTester.php
index 64ef75503db91f7f2e384cc59dfa6f21f0e6c9fb..a83396bbca22b987380e19c35e5c435e69d2e01f 100644
--- a/tests/Utils/SpTester.php
+++ b/tests/Utils/SpTester.php
@@ -20,7 +20,6 @@ class SpTester extends SP
     /**
      * @param array $info
      * @param array $config
-     * @return void
      */
     public function __construct(array $info, array $config)
     {
@@ -29,7 +28,6 @@ class SpTester extends SP
 
 
     /**
-     * @return void
      */
     public function startSSO2Test(Configuration $idpMetadata, array $state): void
     {
@@ -42,7 +40,6 @@ class SpTester extends SP
 
     /**
      * override the method that sends the request to avoid sending anything
-     * @return void
      */
     public function sendSAML2AuthnRequest(array &$state, Binding $binding, AuthnRequest $ar): void
     {
diff --git a/tests/Utils/StateClearer.php b/tests/Utils/StateClearer.php
index ba453a4a2e8942bddaceeb7170a3a480de2a8223..05e69814d0365ebcdea0a751cc0e1886a28995ed 100644
--- a/tests/Utils/StateClearer.php
+++ b/tests/Utils/StateClearer.php
@@ -34,7 +34,6 @@ class StateClearer
 
 
     /**
-     * @return void
      */
     public function backupGlobals(): void
     {
@@ -54,7 +53,6 @@ class StateClearer
 
     /**
      * Clear any global state.
-     * @return void
      */
     public function clearGlobals(): void
     {
@@ -75,7 +73,6 @@ class StateClearer
 
     /**
      * Clear any SSP specific state, such as SSP enviormental variables or cached internals.
-     * @return void
      */
     public function clearSSPState(): void
     {
diff --git a/tests/Utils/TestAuthSource.php b/tests/Utils/TestAuthSource.php
index 2388bfb2525e4f936f01cf3af94694c952dc37a0..7fd0929bcdfc178cc3b5c9e55dd18ab8f5820c70 100644
--- a/tests/Utils/TestAuthSource.php
+++ b/tests/Utils/TestAuthSource.php
@@ -10,7 +10,6 @@ class TestAuthSource extends Source
 {
     /**
      * @param array &$state
-     * @return void
      */
     public function authenticate(array &$state): void
     {
diff --git a/tests/_autoload_modules.php b/tests/_autoload_modules.php
index 8da8c9eb6f6c0d8288da9ef0475d875162e32830..eae6153bc75db09aebbe7ff7c60431c942ac1f7b 100644
--- a/tests/_autoload_modules.php
+++ b/tests/_autoload_modules.php
@@ -11,7 +11,6 @@ declare(strict_types=1);
  * Module test classes have namespaces like SimpleSAML\Test\Module\<moduleName>\Auth\Process
  *
  * @param string $className Name of the class.
- * @return void
  */
 function sspmodTestClassAutoloadPSR4(string $className): void
 {
diff --git a/tests/lib/SimpleSAML/Auth/SimpleTest.php b/tests/lib/SimpleSAML/Auth/SimpleTest.php
index d2b5e56fbde9a9682beb459b3f619bae5ed0fc7f..2c407cd491ff13a1f3419e41022ade6331f1d48c 100644
--- a/tests/lib/SimpleSAML/Auth/SimpleTest.php
+++ b/tests/lib/SimpleSAML/Auth/SimpleTest.php
@@ -18,7 +18,6 @@ class SimpleTest extends ClearStateTestCase
 {
     /**
      * @test
-     * @return void
      */
     public function testGetProcessedURL(): void
     {
diff --git a/tests/lib/SimpleSAML/Auth/SourceTest.php b/tests/lib/SimpleSAML/Auth/SourceTest.php
index 415d69ae274a3dbf62290c91bca92e74bb1807e1..0d447cb6ddca87f096b87ca6919dec3f1b829baa 100644
--- a/tests/lib/SimpleSAML/Auth/SourceTest.php
+++ b/tests/lib/SimpleSAML/Auth/SourceTest.php
@@ -18,7 +18,6 @@ use SimpleSAML\Test\Utils\TestAuthSourceFactory;
 class SourceTest extends ClearStateTestCase
 {
     /**
-     * @return void
      */
     public function testParseAuthSource(): void
     {
diff --git a/tests/lib/SimpleSAML/Auth/StateTest.php b/tests/lib/SimpleSAML/Auth/StateTest.php
index b8945646402b414a5d5def66c2a7d901f1a08f44..239784f1d7be5495ce64b22429bcd705f7db1ba8 100644
--- a/tests/lib/SimpleSAML/Auth/StateTest.php
+++ b/tests/lib/SimpleSAML/Auth/StateTest.php
@@ -16,7 +16,6 @@ class StateTest extends TestCase
 {
     /**
      * Test the getPersistentAuthData() function.
-     * @return void
      */
     public function testGetPersistentAuthData(): void
     {
diff --git a/tests/lib/SimpleSAML/ConfigurationTest.php b/tests/lib/SimpleSAML/ConfigurationTest.php
index ae07d2a3318cc55df9537ebe93fe75ca86218c27..50455174d92f1c35878ec7f8f5bab82344e015e3 100644
--- a/tests/lib/SimpleSAML/ConfigurationTest.php
+++ b/tests/lib/SimpleSAML/ConfigurationTest.php
@@ -19,7 +19,6 @@ class ConfigurationTest extends ClearStateTestCase
 {
     /**
      * Test \SimpleSAML\Configuration::getVersion()
-     * @return void
      */
     public function testGetVersion(): void
     {
@@ -30,7 +29,6 @@ class ConfigurationTest extends ClearStateTestCase
 
     /**
      * Test that the default instance fails to load even if we previously loaded another instance.
-     * @return void
      */
     public function testLoadDefaultInstance(): void
     {
@@ -43,7 +41,6 @@ class ConfigurationTest extends ClearStateTestCase
     /**
      * Test that after a \SimpleSAML\Error\CriticalConfigurationError exception, a basic, self-survival configuration
      * is loaded.
-     * @return void
      */
     public function testCriticalConfigurationError(): void
     {
@@ -64,7 +61,6 @@ class ConfigurationTest extends ClearStateTestCase
 
     /**
      * Test \SimpleSAML\Configuration::getValue()
-     * @return void
      */
     public function testGetValue(): void
     {
@@ -85,7 +81,6 @@ class ConfigurationTest extends ClearStateTestCase
 
     /**
      * Test \SimpleSAML\Configuration::getValue(), REQUIRED_OPTION flag.
-     * @return void
      */
     public function testGetValueRequired(): void
     {
@@ -97,7 +92,6 @@ class ConfigurationTest extends ClearStateTestCase
 
     /**
      * Test \SimpleSAML\Configuration::hasValue()
-     * @return void
      */
     public function testHasValue(): void
     {
@@ -113,7 +107,6 @@ class ConfigurationTest extends ClearStateTestCase
 
     /**
      * Test \SimpleSAML\Configuration::hasValue()
-     * @return void
      */
     public function testHasValueOneOf(): void
     {
@@ -134,7 +127,6 @@ class ConfigurationTest extends ClearStateTestCase
 
     /**
      * Test \SimpleSAML\Configuration::getBasePath()
-     * @return void
      */
     public function testGetBasePath(): void
     {
@@ -193,7 +185,6 @@ class ConfigurationTest extends ClearStateTestCase
 
     /**
      * Test \SimpleSAML\Configuration::resolvePath()
-     * @return void
      */
     public function testResolvePath(): void
     {
@@ -215,7 +206,6 @@ class ConfigurationTest extends ClearStateTestCase
 
     /**
      * Test \SimpleSAML\Configuration::getPathValue()
-     * @return void
      */
     public function testGetPathValue(): void
     {
@@ -233,7 +223,6 @@ class ConfigurationTest extends ClearStateTestCase
 
     /**
      * Test \SimpleSAML\Configuration::getBaseDir()
-     * @return void
      */
     public function testGetBaseDir(): void
     {
@@ -254,7 +243,6 @@ class ConfigurationTest extends ClearStateTestCase
 
     /**
      * Test \SimpleSAML\Configuration::getBoolean()
-     * @return void
      */
     public function testGetBoolean(): void
     {
@@ -270,7 +258,6 @@ class ConfigurationTest extends ClearStateTestCase
 
     /**
      * Test \SimpleSAML\Configuration::getBoolean() missing option
-     * @return void
      */
     public function testGetBooleanMissing(): void
     {
@@ -282,7 +269,6 @@ class ConfigurationTest extends ClearStateTestCase
 
     /**
      * Test \SimpleSAML\Configuration::getBoolean() wrong option
-     * @return void
      */
     public function testGetBooleanWrong(): void
     {
@@ -296,7 +282,6 @@ class ConfigurationTest extends ClearStateTestCase
 
     /**
      * Test \SimpleSAML\Configuration::getString()
-     * @return void
      */
     public function testGetString(): void
     {
@@ -310,7 +295,6 @@ class ConfigurationTest extends ClearStateTestCase
 
     /**
      * Test \SimpleSAML\Configuration::getString() missing option
-     * @return void
      */
     public function testGetStringMissing(): void
     {
@@ -322,7 +306,6 @@ class ConfigurationTest extends ClearStateTestCase
 
     /**
      * Test \SimpleSAML\Configuration::getString() wrong option
-     * @return void
      */
     public function testGetStringWrong(): void
     {
@@ -336,7 +319,6 @@ class ConfigurationTest extends ClearStateTestCase
 
     /**
      * Test \SimpleSAML\Configuration::getInteger()
-     * @return void
      */
     public function testGetInteger(): void
     {
@@ -350,7 +332,6 @@ class ConfigurationTest extends ClearStateTestCase
 
     /**
      * Test \SimpleSAML\Configuration::getInteger() missing option
-     * @return void
      */
     public function testGetIntegerMissing(): void
     {
@@ -362,7 +343,6 @@ class ConfigurationTest extends ClearStateTestCase
 
     /**
      * Test \SimpleSAML\Configuration::getInteger() wrong option
-     * @return void
      */
     public function testGetIntegerWrong(): void
     {
@@ -376,7 +356,6 @@ class ConfigurationTest extends ClearStateTestCase
 
     /**
      * Test \SimpleSAML\Configuration::getIntegerRange()
-     * @return void
      */
     public function testGetIntegerRange(): void
     {
@@ -390,7 +369,6 @@ class ConfigurationTest extends ClearStateTestCase
 
     /**
      * Test \SimpleSAML\Configuration::getIntegerRange() below limit
-     * @return void
      */
     public function testGetIntegerRangeBelow(): void
     {
@@ -404,7 +382,6 @@ class ConfigurationTest extends ClearStateTestCase
 
     /**
      * Test \SimpleSAML\Configuration::getIntegerRange() above limit
-     * @return void
      */
     public function testGetIntegerRangeAbove(): void
     {
@@ -418,7 +395,6 @@ class ConfigurationTest extends ClearStateTestCase
 
     /**
      * Test \SimpleSAML\Configuration::getValueValidate()
-     * @return void
      */
     public function testGetValueValidate(): void
     {
@@ -432,7 +408,6 @@ class ConfigurationTest extends ClearStateTestCase
 
     /**
      * Test \SimpleSAML\Configuration::getValueValidate() wrong option
-     * @return void
      */
     public function testGetValueValidateWrong(): void
     {
@@ -446,7 +421,6 @@ class ConfigurationTest extends ClearStateTestCase
 
     /**
      * Test \SimpleSAML\Configuration::getArray()
-     * @return void
      */
     public function testGetArray(): void
     {
@@ -460,7 +434,6 @@ class ConfigurationTest extends ClearStateTestCase
 
     /**
      * Test \SimpleSAML\Configuration::getArray() wrong option
-     * @return void
      */
     public function testGetArrayWrong(): void
     {
@@ -474,7 +447,6 @@ class ConfigurationTest extends ClearStateTestCase
 
     /**
      * Test \SimpleSAML\Configuration::getArrayize()
-     * @return void
      */
     public function testGetArrayize(): void
     {
@@ -492,7 +464,6 @@ class ConfigurationTest extends ClearStateTestCase
 
     /**
      * Test \SimpleSAML\Configuration::getArrayizeString()
-     * @return void
      */
     public function testGetArrayizeString(): void
     {
@@ -509,7 +480,6 @@ class ConfigurationTest extends ClearStateTestCase
     /**
      * Test \SimpleSAML\Configuration::getArrayizeString() option
      * with an array that contains something that isn't a string.
-     * @return void
      */
     public function testGetArrayizeStringWrongValue(): void
     {
@@ -523,7 +493,6 @@ class ConfigurationTest extends ClearStateTestCase
 
     /**
      * Test \SimpleSAML\Configuration::getConfigItem()
-     * @return void
      */
     public function testGetConfigItem(): void
     {
@@ -541,7 +510,6 @@ class ConfigurationTest extends ClearStateTestCase
 
     /**
      * Test \SimpleSAML\Configuration::getConfigItem() wrong option
-     * @return void
      */
     public function testGetConfigItemWrong(): void
     {
@@ -555,7 +523,6 @@ class ConfigurationTest extends ClearStateTestCase
 
     /**
      * Test \SimpleSAML\Configuration::getOptions()
-     * @return void
      */
     public function testGetOptions(): void
     {
@@ -569,7 +536,6 @@ class ConfigurationTest extends ClearStateTestCase
 
     /**
      * Test \SimpleSAML\Configuration::toArray()
-     * @return void
      */
     public function testToArray(): void
     {
@@ -585,7 +551,6 @@ class ConfigurationTest extends ClearStateTestCase
      * Test \SimpleSAML\Configuration::getDefaultEndpoint().
      *
      * Iterate over all different valid definitions of endpoints and check if the expected output is produced.
-     * @return void
      */
     public function testGetDefaultEndpoint(): void
     {
@@ -779,7 +744,6 @@ class ConfigurationTest extends ClearStateTestCase
 
     /**
      * Test \SimpleSAML\Configuration::getEndpoints().
-     * @return void
      */
     public function testGetEndpoints(): void
     {
@@ -884,7 +848,6 @@ class ConfigurationTest extends ClearStateTestCase
 
     /**
      * Test \SimpleSAML\Configuration::getLocalizedString()
-     * @return void
      */
     public function testGetLocalizedString(): void
     {
@@ -903,7 +866,6 @@ class ConfigurationTest extends ClearStateTestCase
 
     /**
      * Test \SimpleSAML\Configuration::getLocalizedString() not array nor simple string
-     * @return void
      */
     public function testGetLocalizedStringNotArray(): void
     {
@@ -917,7 +879,6 @@ class ConfigurationTest extends ClearStateTestCase
 
     /**
      * Test \SimpleSAML\Configuration::getLocalizedString() not string key
-     * @return void
      */
     public function testGetLocalizedStringNotStringKey(): void
     {
@@ -931,7 +892,6 @@ class ConfigurationTest extends ClearStateTestCase
 
     /**
      * Test \SimpleSAML\Configuration::getLocalizedString() not string value
-     * @return void
      */
     public function testGetLocalizedStringNotStringValue(): void
     {
@@ -945,7 +905,6 @@ class ConfigurationTest extends ClearStateTestCase
 
     /**
      * Test \SimpleSAML\Configuration::getConfig() nonexistent file
-     * @return void
      */
     public function testGetConfigNonexistentFile(): void
     {
@@ -956,7 +915,6 @@ class ConfigurationTest extends ClearStateTestCase
 
     /**
      * Test \SimpleSAML\Configuration::getConfig() preloaded nonexistent file
-     * @return void
      */
     public function testGetConfigNonexistentFilePreload(): void
     {
@@ -974,7 +932,6 @@ class ConfigurationTest extends ClearStateTestCase
      * Test that Configuration objects can be initialized from an array.
      *
      * ATTENTION: this test must be kept the last.
-     * @return void
      */
     public function testLoadInstanceFromArray(): void
     {
diff --git a/tests/lib/SimpleSAML/DatabaseTest.php b/tests/lib/SimpleSAML/DatabaseTest.php
index bcda35d06576d65637d61201e74a5f2bb691cdc4..cfafb15cdcedab3d48085db62c1c8461cabff6ed 100644
--- a/tests/lib/SimpleSAML/DatabaseTest.php
+++ b/tests/lib/SimpleSAML/DatabaseTest.php
@@ -54,7 +54,6 @@ class DatabaseTest extends TestCase
 
 
     /**
-     * @return void
      */
     public function setUp(): void
     {
@@ -78,7 +77,6 @@ class DatabaseTest extends TestCase
 
     /**
      * @test
-     * @return void
      */
     public function connectionFailure(): void
     {
@@ -99,7 +97,6 @@ class DatabaseTest extends TestCase
 
     /**
      * @test
-     * @return void
      */
     public function instances(): void
     {
@@ -164,7 +161,6 @@ class DatabaseTest extends TestCase
 
     /**
      * @test
-     * @return void
      */
     public function secondaries(): void
     {
@@ -216,7 +212,6 @@ class DatabaseTest extends TestCase
 
     /**
      * @test
-     * @return void
      */
     public function prefix(): void
     {
@@ -230,7 +225,6 @@ class DatabaseTest extends TestCase
 
     /**
      * @test
-     * @return void
      */
     public function querying(): void
     {
@@ -260,7 +254,6 @@ class DatabaseTest extends TestCase
 
     /**
      * @test
-     * @return void
      */
     public function readFailure(): void
     {
@@ -274,7 +267,6 @@ class DatabaseTest extends TestCase
 
     /**
      * @test
-     * @return void
      */
     public function noSuchTable(): void
     {
@@ -284,7 +276,6 @@ class DatabaseTest extends TestCase
 
 
     /**
-     * @return void
      */
     public function tearDown(): void
     {
diff --git a/tests/lib/SimpleSAML/Locale/LanguageTest.php b/tests/lib/SimpleSAML/Locale/LanguageTest.php
index e6c3da4de70182af70889caae1f7096ea8fe04a2..f309bfb7501957cddc0efa4416a050ccbc4f8f66 100644
--- a/tests/lib/SimpleSAML/Locale/LanguageTest.php
+++ b/tests/lib/SimpleSAML/Locale/LanguageTest.php
@@ -15,7 +15,6 @@ class LanguageTest extends TestCase
 {
     /**
      * Test SimpleSAML\Locale\Language::getDefaultLanguage().
-     * @return void
      */
     public function testGetDefaultLanguage(): void
     {
@@ -36,7 +35,6 @@ class LanguageTest extends TestCase
 
     /**
      * Test SimpleSAML\Locale\Language::getLanguageCookie().
-     * @return void
      */
     public function testGetLanguageCookie(): void
     {
@@ -61,7 +59,6 @@ class LanguageTest extends TestCase
 
     /**
      * Test SimpleSAML\Locale\Language::getLanguageList().
-     * @return void
      */
     public function testGetLanguageListNoConfig(): void
     {
@@ -75,7 +72,6 @@ class LanguageTest extends TestCase
 
     /**
      * Test SimpleSAML\Locale\Language::getLanguageList().
-     * @return void
      */
     public function testGetLanguageListCorrectConfig(): void
     {
@@ -95,7 +91,6 @@ class LanguageTest extends TestCase
 
     /**
      * Test SimpleSAML\Locale\Language::getLanguageList().
-     * @return void
      */
     public function testGetLanguageListIncorrectConfig(): void
     {
@@ -111,7 +106,6 @@ class LanguageTest extends TestCase
 
     /**
      * Test SimpleSAML\Locale\Language::getLanguageParameterName().
-     * @return void
      */
     public function testGetLanguageParameterName(): void
     {
@@ -131,7 +125,6 @@ class LanguageTest extends TestCase
 
     /**
      * Test SimpleSAML\Locale\Language::isLanguageRTL().
-     * @return void
      */
     public function testIsLanguageRTL(): void
     {
@@ -162,7 +155,6 @@ class LanguageTest extends TestCase
 
     /**
      * Test SimpleSAML\Locale\Language::setLanguage().
-     * @return void
      */
     public function testSetLanguage(): void
     {
diff --git a/tests/lib/SimpleSAML/Locale/LocalizationTest.php b/tests/lib/SimpleSAML/Locale/LocalizationTest.php
index 169bafa0d6e8f0477dd5b033d6f0d5b257c40ae7..7f529a0bd8cc6ea83170f78d6fa75cec28c0f565 100644
--- a/tests/lib/SimpleSAML/Locale/LocalizationTest.php
+++ b/tests/lib/SimpleSAML/Locale/LocalizationTest.php
@@ -14,7 +14,6 @@ use SimpleSAML\Locale\Localization;
 class LocalizationTest extends TestCase
 {
     /**
-     * @return void
      */
     protected function setUp(): void
     {
@@ -25,7 +24,6 @@ class LocalizationTest extends TestCase
 
     /**
      * Test SimpleSAML\Locale\Localization().
-     * @return void
      */
     public function testLocalization(): void
     {
@@ -37,7 +35,6 @@ class LocalizationTest extends TestCase
 
     /**
      * Test SimpleSAML\Locale\Localization::activateDomain().
-     * @return void
      */
     public function testAddDomain(): void
     {
diff --git a/tests/lib/SimpleSAML/Locale/TranslateTest.php b/tests/lib/SimpleSAML/Locale/TranslateTest.php
index d66d16ea58425eb401b10897a9d13a8d1aeef4b7..f5242544a5b33bb030c6392b3b2c61e2795f7f4c 100644
--- a/tests/lib/SimpleSAML/Locale/TranslateTest.php
+++ b/tests/lib/SimpleSAML/Locale/TranslateTest.php
@@ -15,7 +15,6 @@ class TranslateTest extends TestCase
 {
     /**
      * Test SimpleSAML\Locale\Translate::noop().
-     * @return void
      */
     public function testNoop(): void
     {
diff --git a/tests/lib/SimpleSAML/Metadata/MetaDataStorageHandlerTest.php b/tests/lib/SimpleSAML/Metadata/MetaDataStorageHandlerTest.php
index 2245cd5b8cfbaa7001cce0718bdb3098f33c8669..66739c3aad358b3653db8599ae85d61c58c01303 100644
--- a/tests/lib/SimpleSAML/Metadata/MetaDataStorageHandlerTest.php
+++ b/tests/lib/SimpleSAML/Metadata/MetaDataStorageHandlerTest.php
@@ -15,7 +15,6 @@ class MetaDataStorageHandlerTest extends ClearStateTestCase
 {
     /**
      * Test that loading specific entities works, and that metadata source precedence is followed
-     * @return void
      */
     public function testLoadEntities(): void
     {
diff --git a/tests/lib/SimpleSAML/Metadata/MetaDataStorageSourceTest.php b/tests/lib/SimpleSAML/Metadata/MetaDataStorageSourceTest.php
index 9cee1f59df7b88a71357609d3a9e64bc22991262..e7ab19347fcc0fac385cd7ce7b4e353d144e5216 100644
--- a/tests/lib/SimpleSAML/Metadata/MetaDataStorageSourceTest.php
+++ b/tests/lib/SimpleSAML/Metadata/MetaDataStorageSourceTest.php
@@ -18,7 +18,6 @@ class MetaDataStorageSourceTest extends TestCase
 {
     /**
      * Test \SimpleSAML\Metadata\MetaDataStorageSourceTest::getConfig XML bad source
-     * @return void
      */
     public function testBadXMLSource(): void
     {
@@ -29,7 +28,6 @@ class MetaDataStorageSourceTest extends TestCase
 
     /**
      * Test \SimpleSAML\Metadata\MetaDataStorageSourceTest::getConfig invalid static XML source
-     * @return void
      */
     public function testInvalidStaticXMLSource(): void
     {
@@ -44,7 +42,6 @@ class MetaDataStorageSourceTest extends TestCase
 
     /**
      * Test \SimpleSAML\Metadata\MetaDataStorageSourceTest::getConfig XML static XML source
-     * @return void
      */
     public function testStaticXMLSource(): void
     {
@@ -68,7 +65,6 @@ class MetaDataStorageSourceTest extends TestCase
 
     /**
      * Test loading multiple entities
-     * @return void
      */
     public function testLoadEntitiesStaticXMLSource(): void
     {
diff --git a/tests/lib/SimpleSAML/Metadata/SAMLBuilderTest.php b/tests/lib/SimpleSAML/Metadata/SAMLBuilderTest.php
index d00003bb6f73b943dafc472df95b740831b98782..2998a753a8d49a0dd102b3c4d57ca300edbf90bd 100644
--- a/tests/lib/SimpleSAML/Metadata/SAMLBuilderTest.php
+++ b/tests/lib/SimpleSAML/Metadata/SAMLBuilderTest.php
@@ -16,7 +16,6 @@ class SAMLBuilderTest extends TestCase
 {
     /**
      * Test the requested attributes are valued correctly.
-     * @return void
      */
     public function testAttributes(): void
     {
@@ -96,7 +95,6 @@ class SAMLBuilderTest extends TestCase
 
     /**
      * Test the working of the isDefault config option
-     * @return void
      */
     public function testAttributeConsumingServiceDefault(): void
     {
@@ -152,7 +150,6 @@ class SAMLBuilderTest extends TestCase
 
     /**
      * Test the index option is used correctly.
-     * @return void
      */
     public function testAttributeConsumingServiceIndex(): void
     {
@@ -197,7 +194,6 @@ class SAMLBuilderTest extends TestCase
 
     /**
      * Test the required protocolSupportEnumeration in AttributeAuthorityDescriptor
-     * @return void
      */
     public function testProtocolSupportEnumeration(): void
     {
diff --git a/tests/lib/SimpleSAML/Metadata/SAMLParserTest.php b/tests/lib/SimpleSAML/Metadata/SAMLParserTest.php
index 8edf64798e61d386731d576d69e9b662eccb53f9..2bd7d1160c934386b28894ba34c7896053a95756 100644
--- a/tests/lib/SimpleSAML/Metadata/SAMLParserTest.php
+++ b/tests/lib/SimpleSAML/Metadata/SAMLParserTest.php
@@ -20,7 +20,6 @@ class SAMLParserTest extends \SimpleSAML\Test\SigningTestCase
 {
     /**
      * Test Registration Info is parsed
-     * @return void
      */
     public function testRegistrationInfo(): void
     {
@@ -54,7 +53,6 @@ XML
     /**
      * Test RegistrationInfo is inherited correctly from parent EntitiesDescriptor.
      * According to the spec overriding RegistrationInfo is not valid. We ignore attempts to override
-     * @return void
      */
     public function testRegistrationInfoInheritance(): void
     {
@@ -106,7 +104,6 @@ XML
 
     /**
      * Test AttributeConsumingService is parsed
-     * @return void
      */
     public function testAttributeConsumingServiceParsing(): void
     {
@@ -184,7 +181,6 @@ XML
 
     /**
      * Test RoleDescriptor/Extensions is parsed
-     * @return void
      */
     public function testRoleDescriptorExtensions(): void
     {
@@ -276,7 +272,6 @@ XML
 
     /**
      * Test entity category hidden from discovery is parsed
-     * @return void
      */
     public function testHiddenFromDiscovery(): void
     {
@@ -309,7 +304,6 @@ XML
 
     /**
      * Test entity category hidden from discovery is not returned when not present
-     * @return void
      */
     public function testHiddenFromDiscoveryNotHidden(): void
     {
@@ -341,7 +335,6 @@ XML
 
     /**
      * Test entity category hidden from discovery is not returned when no mace dir entity categories present
-     * @return void
      */
     public function testHiddenFromDiscoveryNotHiddenNoMaceDirEC(): void
     {
diff --git a/tests/lib/SimpleSAML/ModuleTest.php b/tests/lib/SimpleSAML/ModuleTest.php
index ce567e5093e1088ae0244904c8de7516138983b3..0a4b69941e628d1bacc03d13662ed6915c442dc6 100644
--- a/tests/lib/SimpleSAML/ModuleTest.php
+++ b/tests/lib/SimpleSAML/ModuleTest.php
@@ -16,7 +16,6 @@ class ModuleTest extends TestCase
 {
     /**
      * Test for SimpleSAML\Module::isModuleEnabled().
-     * @return void
      */
     public function testIsModuleEnabled(): void
     {
@@ -27,7 +26,6 @@ class ModuleTest extends TestCase
 
     /**
      * Test for SimpleSAML\Module::getModuleDir().
-     * @return void
      */
     public function testGetModuleDir(): void
     {
@@ -41,7 +39,6 @@ class ModuleTest extends TestCase
 
     /**
      * Test for SimpleSAML\Module::getModuleURL().
-     * @return void
      */
     public function testGetModuleURL(): void
     {
@@ -64,7 +61,6 @@ class ModuleTest extends TestCase
 
     /**
      * Test for SimpleSAML\Module::getModules().
-     * @return void
      */
     public function testGetModules(): void
     {
@@ -76,7 +72,6 @@ class ModuleTest extends TestCase
      * Test for SimpleSAML\Module::resolveClass(). It will make sure that an exception is thrown if we are not asking
      * for a class inside a module (that is, there is no colon separating the name of the module and the name of the
      * class).
-     * @return void
      */
     public function testResolveClassNoModule(): void
     {
@@ -88,7 +83,6 @@ class ModuleTest extends TestCase
     /**
      * Test for SimpleSAML\Module::resolveClass(). It will make sure that an exception is thrown if the class we are
      * asking for can be resolved, but does not extend a given class.
-     * @return void
      */
     public function testResolveClassNotSubclass(): void
     {
@@ -99,7 +93,6 @@ class ModuleTest extends TestCase
 
     /**
      * Test for SimpleSAML\Module::resolveClass(). It covers all the valid use cases.
-     * @return void
      */
     public function testResolveClass(): void
     {
diff --git a/tests/lib/SimpleSAML/SessionHandlerPHPTest.php b/tests/lib/SimpleSAML/SessionHandlerPHPTest.php
index 058e7d24b09949a2a5cc6c3993b1dda367070fa7..15a82c3817a52dc64b111e30b77c3365217b7f93 100644
--- a/tests/lib/SimpleSAML/SessionHandlerPHPTest.php
+++ b/tests/lib/SimpleSAML/SessionHandlerPHPTest.php
@@ -29,7 +29,6 @@ class SessionHandlerPHPTest extends ClearStateTestCase
 
 
     /**
-     * @return void
      */
     protected function setUp(): void
     {
@@ -43,7 +42,6 @@ class SessionHandlerPHPTest extends ClearStateTestCase
 
 
     /**
-     * @return void
      */
     protected function tearDown(): void
     {
@@ -52,7 +50,6 @@ class SessionHandlerPHPTest extends ClearStateTestCase
 
 
     /**
-     * @return void
      */
     public function testGetSessionHandler(): void
     {
@@ -65,7 +62,6 @@ class SessionHandlerPHPTest extends ClearStateTestCase
     /**
      * @runInSeparateProcess
      * @requires extension xdebug
-     * @return void
      */
     public function testSetCookie(): void
     {
@@ -89,7 +85,6 @@ class SessionHandlerPHPTest extends ClearStateTestCase
     /**
      * @runInSeparateProcess
      * @requires extension xdebug
-     * @return void
      */
     public function testSetCookieSameSiteNone(): void
     {
@@ -110,7 +105,6 @@ class SessionHandlerPHPTest extends ClearStateTestCase
     /**
      * @runInSeparateProcess
      * @requires extension xdebug
-     * @return void
      */
     public function testSetCookieSameSiteLax(): void
     {
@@ -131,7 +125,6 @@ class SessionHandlerPHPTest extends ClearStateTestCase
     /**
      * @runInSeparateProcess
      * @requires extension xdebug
-     * @return void
      */
     public function testSetCookieSameSiteStrict(): void
     {
@@ -152,7 +145,6 @@ class SessionHandlerPHPTest extends ClearStateTestCase
     /**
      * @runInSeparateProcess
      * @requires extension xdebug
-     * @return void
      */
     public function testRestorePrevious(): void
     {
@@ -175,7 +167,6 @@ class SessionHandlerPHPTest extends ClearStateTestCase
 
 
     /**
-     * @return void
      */
     public function testNewSessionId(): void
     {
diff --git a/tests/lib/SimpleSAML/SessionTest.php b/tests/lib/SimpleSAML/SessionTest.php
index 07e8ab7786c7b8a8fb6b28d66ff233846e718c58..6c9326b80be5ede926cae0173fd375a37b5cc810 100644
--- a/tests/lib/SimpleSAML/SessionTest.php
+++ b/tests/lib/SimpleSAML/SessionTest.php
@@ -18,7 +18,6 @@ class SessionTest extends ClearStateTestCase
     protected $session;
 
     /**
-     * @return void
      */
     public function setUp(): void
     {
@@ -28,7 +27,6 @@ class SessionTest extends ClearStateTestCase
     }
 
     /**
-     * @return void
      */
     public function testSetRememberMeExpireDefaults(): void
     {
@@ -42,7 +40,6 @@ class SessionTest extends ClearStateTestCase
     }
 
     /**
-     * @return void
      */
     public function testSetRememberMeExpireExplicit(): void
     {
diff --git a/tests/lib/SimpleSAML/Store/RedisTest.php b/tests/lib/SimpleSAML/Store/RedisTest.php
index 27b466426461f74a100b7d3d4c7e3fb1e5daa528..ede953e3ac5e83cd45aa465e17c7f99e227f7c4e 100644
--- a/tests/lib/SimpleSAML/Store/RedisTest.php
+++ b/tests/lib/SimpleSAML/Store/RedisTest.php
@@ -32,7 +32,6 @@ class RedisTest extends TestCase
 
 
     /**
-     * @return void
      */
     protected function setUp(): void
     {
@@ -55,7 +54,6 @@ class RedisTest extends TestCase
         $this->mocked_redis->method('del')
                            ->will($this->returnCallback([$this, 'delMocked']));
 
-        $nop = /** @return void */ function () {
             return;
         };
 
@@ -80,7 +78,6 @@ class RedisTest extends TestCase
     /**
      * @param string $key
      * @param mixed $value
-     * @return void
      */
     public function setMocked(string $key, $value): void
     {
@@ -92,7 +89,6 @@ class RedisTest extends TestCase
      * @param string $key
      * @param int $expire
      * @param mixed $value
-     * @return void
      */
     public function setexMocked(string $key, int $expire, $value): void
     {
@@ -103,7 +99,6 @@ class RedisTest extends TestCase
 
     /**
      * @param string $key
-     * @return void
      */
     public function delMocked(string $key): void
     {
@@ -113,7 +108,6 @@ class RedisTest extends TestCase
 
     /**
      * @test
-     * @return void
      */
     public function testRedisInstance(): void
     {
@@ -134,7 +128,6 @@ class RedisTest extends TestCase
 
     /**
      * @test
-     * @return void
      */
     public function testRedisInstanceWithPassword(): void
     {
@@ -156,7 +149,6 @@ class RedisTest extends TestCase
 
     /**
      * @test
-     * @return void
      */
     public function testInsertData(): void
     {
@@ -172,7 +164,6 @@ class RedisTest extends TestCase
 
     /**
      * @test
-     * @return void
      */
     public function testInsertExpiringData(): void
     {
@@ -188,7 +179,6 @@ class RedisTest extends TestCase
 
     /**
      * @test
-     * @return void
      */
     public function testGetEmptyData(): void
     {
@@ -200,7 +190,6 @@ class RedisTest extends TestCase
 
     /**
      * @test
-     * @return void
      */
     public function testOverwriteData(): void
     {
@@ -218,7 +207,6 @@ class RedisTest extends TestCase
 
     /**
      * @test
-     * @return void
      */
     public function testDeleteData(): void
     {
@@ -233,7 +221,6 @@ class RedisTest extends TestCase
     /**
      * @param \SimpleSAML\Configuration|\SimpleSAML\Store $service
      * @param class-string $className
-     * @return void
      */
     protected function clearInstance($service, string $className): void
     {
diff --git a/tests/lib/SimpleSAML/Store/SQLTest.php b/tests/lib/SimpleSAML/Store/SQLTest.php
index 0d335ebe4f27325c59a6c1e6ff017f4c71f37462..28b23d6f4950d6bbc0ce5ea8bee4e62ef7a08111 100644
--- a/tests/lib/SimpleSAML/Store/SQLTest.php
+++ b/tests/lib/SimpleSAML/Store/SQLTest.php
@@ -22,7 +22,6 @@ use SimpleSAML\Store;
 class SQLTest extends TestCase
 {
     /**
-     * @return void
      */
     protected function setUp(): void
     {
@@ -36,7 +35,6 @@ class SQLTest extends TestCase
 
     /**
      * @test
-     * @return void
      */
     public function SQLInstance(): void
     {
@@ -48,7 +46,6 @@ class SQLTest extends TestCase
 
     /**
      * @test
-     * @return void
      */
     public function kvstoreTableVersion(): void
     {
@@ -63,7 +60,6 @@ class SQLTest extends TestCase
 
     /**
      * @test
-     * @return void
      */
     public function newTableVersion(): void
     {
@@ -78,7 +74,6 @@ class SQLTest extends TestCase
 
     /**
      * @test
-     * @return void
      */
     public function testSetTableVersion(): void
     {
@@ -94,7 +89,6 @@ class SQLTest extends TestCase
 
     /**
      * @test
-     * @return void
      */
     public function testGetEmptyData(): void
     {
@@ -109,7 +103,6 @@ class SQLTest extends TestCase
 
     /**
      * @test
-     * @return void
      */
     public function testInsertData(): void
     {
@@ -125,7 +118,6 @@ class SQLTest extends TestCase
 
     /**
      * @test
-     * @return void
      */
     public function testOverwriteData(): void
     {
@@ -142,7 +134,6 @@ class SQLTest extends TestCase
 
     /**
      * @test
-     * @return void
      */
     public function testDeleteData(): void
     {
@@ -159,7 +150,6 @@ class SQLTest extends TestCase
 
     /**
      * @test
-     * @return void
      */
     public function testVeryLongKey(): void
     {
@@ -176,7 +166,6 @@ class SQLTest extends TestCase
 
 
     /**
-     * @return void
      */
     protected function tearDown(): void
     {
@@ -193,7 +182,6 @@ class SQLTest extends TestCase
     /**
      * @param \SimpleSAML\Configuration|\SimpleSAML\Store $service
      * @param class-string $className
-     * @return void
      */
     protected function clearInstance($service, string $className): void
     {
diff --git a/tests/lib/SimpleSAML/StoreTest.php b/tests/lib/SimpleSAML/StoreTest.php
index 582ef8d6e42bd1212c21e057781ab0752898bf35..ffeeb30e3b7cb436c2713d5b0722c97b4a996323 100644
--- a/tests/lib/SimpleSAML/StoreTest.php
+++ b/tests/lib/SimpleSAML/StoreTest.php
@@ -24,7 +24,6 @@ class StoreTest extends TestCase
 {
     /**
      * @test
-     * @return void
      */
     public function defaultStore(): void
     {
@@ -39,7 +38,6 @@ class StoreTest extends TestCase
 
     /**
      * @test
-     * @return void
      */
     public function phpSessionStore(): void
     {
@@ -54,7 +52,6 @@ class StoreTest extends TestCase
 
     /**
      * @test
-     * @return void
      */
     public function memcacheStore(): void
     {
@@ -70,7 +67,6 @@ class StoreTest extends TestCase
 
     /**
      * @test
-     * @return void
      */
     public function sqlStore(): void
     {
@@ -88,7 +84,6 @@ class StoreTest extends TestCase
 
     /**
      * @test
-     * @return void
      */
     public function pathStore(): void
     {
@@ -106,7 +101,6 @@ class StoreTest extends TestCase
 
     /**
      * @test
-     * @return void
      */
     public function notFoundStoreException(): void
     {
@@ -122,7 +116,6 @@ class StoreTest extends TestCase
 
 
     /**
-     * @return void
      */
     protected function tearDown(): void
     {
@@ -138,7 +131,6 @@ class StoreTest extends TestCase
     /**
      * @param \SimpleSAML\Configuration|\SimpleSAML\Store $service
      * @param class-string $className
-     * @return void
      */
     protected function clearInstance($service, string $className): void
     {
diff --git a/tests/lib/SimpleSAML/Utils/ArraysTest.php b/tests/lib/SimpleSAML/Utils/ArraysTest.php
index 4dbaebeecc34167abb0179b55b0db6c2ef15e6be..7267b8ab3ca5875078208afc982241b18a021404 100644
--- a/tests/lib/SimpleSAML/Utils/ArraysTest.php
+++ b/tests/lib/SimpleSAML/Utils/ArraysTest.php
@@ -16,7 +16,6 @@ class ArraysTest extends TestCase
 {
     /**
      * Test the arrayize() function.
-     * @return void
      */
     public function testArrayize(): void
     {
@@ -44,7 +43,6 @@ class ArraysTest extends TestCase
 
     /**
      * Test the transpose() function.
-     * @return void
      */
     public function testTranspose(): void
     {
diff --git a/tests/lib/SimpleSAML/Utils/AttributesTest.php b/tests/lib/SimpleSAML/Utils/AttributesTest.php
index 85ccca10aec0f05f2122362f01ce99a526401541..452fd46fbb80f8d4575ba411b59cb88a490773ca 100644
--- a/tests/lib/SimpleSAML/Utils/AttributesTest.php
+++ b/tests/lib/SimpleSAML/Utils/AttributesTest.php
@@ -18,7 +18,6 @@ class AttributesTest extends TestCase
 {
     /**
      * Test the getExpectedAttributeMethod() method with a non-normalized attributes array.
-     * @return void
      */
     public function testGetExpectedAttributeNonNormalizedArray(): void
     {
@@ -37,7 +36,6 @@ class AttributesTest extends TestCase
 
     /**
      * Test the getExpectedAttribute() method with valid input but missing expected attribute.
-     * @return void
      */
     public function testGetExpectedAttributeMissingAttribute(): void
     {
@@ -54,7 +52,6 @@ class AttributesTest extends TestCase
 
     /**
      * Test the getExpectedAttribute() method with an empty attribute.
-     * @return void
      */
     public function testGetExpectedAttributeEmptyAttribute(): void
     {
@@ -71,7 +68,6 @@ class AttributesTest extends TestCase
 
     /**
      * Test the getExpectedAttributeMethod() method with multiple values (not being allowed).
-     * @return void
      */
     public function testGetExpectedAttributeMultipleValues(): void
     {
@@ -93,7 +89,6 @@ class AttributesTest extends TestCase
 
     /**
      * Test that the getExpectedAttribute() method successfully obtains values from the attributes array.
-     * @return void
      */
     public function testGetExpectedAttribute(): void
     {
@@ -117,7 +112,6 @@ class AttributesTest extends TestCase
 
     /**
      * Test the normalizeAttributesArray() function with an array with non-string attribute names.
-     * @return void
      */
     public function testNormalizeAttributesArrayBadKeys(): void
     {
@@ -128,7 +122,6 @@ class AttributesTest extends TestCase
 
     /**
      * Test the normalizeAttributesArray() function with an array with non-string attribute values.
-     * @return void
      */
     public function testNormalizeAttributesArrayBadValues(): void
     {
@@ -139,7 +132,6 @@ class AttributesTest extends TestCase
 
     /**
      * Test the normalizeAttributesArray() function.
-     * @return void
      */
     public function testNormalizeAttributesArray(): void
     {
@@ -163,7 +155,6 @@ class AttributesTest extends TestCase
 
     /**
      * Test the getAttributeNamespace() function.
-     * @return void
      */
     public function testNamespacedAttributes(): void
     {
diff --git a/tests/lib/SimpleSAML/Utils/Config/MetadataTest.php b/tests/lib/SimpleSAML/Utils/Config/MetadataTest.php
index db198ef8f6f8956bb4f3a848d4a91c63d40b1cd2..f22300602ec06876314f789eea97e8c69bf072a0 100644
--- a/tests/lib/SimpleSAML/Utils/Config/MetadataTest.php
+++ b/tests/lib/SimpleSAML/Utils/Config/MetadataTest.php
@@ -20,7 +20,6 @@ class MetadataTest extends TestCase
 {
     /**
      * Test contact configuration parsing and sanitizing.
-     * @return void
      */
     public function testGetContact(): void
     {
@@ -228,7 +227,6 @@ class MetadataTest extends TestCase
 
     /**
      * Test \SimpleSAML\Utils\Config\Metadata::isHiddenFromDiscovery().
-     * @return void
      */
     public function testIsHiddenFromDiscovery(): void
     {
@@ -269,7 +267,6 @@ class MetadataTest extends TestCase
 
     /**
      * Test \SimpleSAML\Utils\Config\Metadata::parseNameIdPolicy().
-     * @return void
      */
     public function testParseNameIdPolicy(): void
     {
diff --git a/tests/lib/SimpleSAML/Utils/ConfigTest.php b/tests/lib/SimpleSAML/Utils/ConfigTest.php
index 6f683b4a9ce1ffda88e481ae8d7eb3cfc90b091b..3516d455483410ed1284af4b4c326efb9ff6d5f3 100644
--- a/tests/lib/SimpleSAML/Utils/ConfigTest.php
+++ b/tests/lib/SimpleSAML/Utils/ConfigTest.php
@@ -17,7 +17,6 @@ class ConfigTest extends TestCase
 {
     /**
      * Test default config dir with not environment variable
-     * @return void
      */
     public function testDefaultConfigDir(): void
     {
@@ -31,7 +30,6 @@ class ConfigTest extends TestCase
 
     /**
      * Test valid dir specified by env var overrides default config dir
-     * @return void
      */
     public function testEnvVariableConfigDir(): void
     {
@@ -43,7 +41,6 @@ class ConfigTest extends TestCase
 
     /**
      * Test valid dir specified by env redirect var overrides default config dir
-     * @return void
      */
     public function testEnvRedirectVariableConfigDir(): void
     {
@@ -56,7 +53,6 @@ class ConfigTest extends TestCase
 
     /**
      * Test which directory takes precedence
-     * @return void
      */
     public function testEnvRedirectPriorityVariableConfigDir(): void
     {
@@ -70,7 +66,6 @@ class ConfigTest extends TestCase
 
     /**
      * Test invalid dir specified by env var results in a thrown exception
-     * @return void
      */
     public function testInvalidEnvVariableConfigDirThrowsException(): void
     {
diff --git a/tests/lib/SimpleSAML/Utils/CryptoTest.php b/tests/lib/SimpleSAML/Utils/CryptoTest.php
index 3a7bdb1751faa6ab7d5e78b90cd888c3cff17d3d..1dd32661b3b36dfc02be9db83b1fdefee3a19838 100644
--- a/tests/lib/SimpleSAML/Utils/CryptoTest.php
+++ b/tests/lib/SimpleSAML/Utils/CryptoTest.php
@@ -33,7 +33,6 @@ class CryptoTest extends TestCase
 
 
     /**
-     * @return void
      */
     public function setUp(): void
     {
@@ -53,7 +52,6 @@ class CryptoTest extends TestCase
      * Test that aesDecrypt() works properly, being able to decrypt some previously known (and correct)
      * ciphertext.
      *
-     * @return void
      */
     public function testAesDecrypt(): void
     {
@@ -75,7 +73,6 @@ class CryptoTest extends TestCase
     /**
      * Test that aesEncrypt() produces ciphertexts that aesDecrypt() can decrypt.
      *
-     * @return void
      */
     public function testAesEncrypt(): void
     {
@@ -99,7 +96,6 @@ class CryptoTest extends TestCase
     /**
      * Test that the pem2der() and der2pem() methods work correctly.
      *
-     * @return void
      */
     public function testFormatConversion(): void
     {
@@ -144,7 +140,6 @@ PHP;
 
 
     /**
-     * @return void
      */
     public function testGoodPwValid(): void
     {
@@ -158,7 +153,6 @@ PHP;
 
 
     /**
-     * @return void
      */
     public function testBadPwInvalid(): void
     {
@@ -173,7 +167,6 @@ PHP;
 
 
     /**
-     * @return void
      */
     public function testSecureCompareEqual(): void
     {
@@ -184,7 +177,6 @@ PHP;
 
 
     /**
-     * @return void
      */
     public function testSecureCompareNotEqual(): void
     {
@@ -195,7 +187,6 @@ PHP;
 
 
     /**
-     * @return void
      */
     public function testLoadPrivateKeyRequiredMetadataMissing(): void
     {
@@ -208,7 +199,6 @@ PHP;
 
 
     /**
-     * @return void
      */
     public function testLoadPrivateKeyNotRequiredMetadataMissing(): void
     {
@@ -222,7 +212,6 @@ PHP;
 
 
     /**
-     * @return void
      */
     public function testLoadPrivateKeyMissingFile(): void
     {
@@ -234,7 +223,6 @@ PHP;
 
 
     /**
-     * @return void
      */
     public function testLoadPrivateKeyBasic(): void
     {
@@ -253,7 +241,6 @@ PHP;
 
 
     /**
-     * @return void
      */
     public function testLoadPrivateKeyPassword(): void
     {
@@ -279,7 +266,6 @@ PHP;
 
 
     /**
-     * @return void
      */
     public function testLoadPrivateKeyPrefix(): void
     {
@@ -306,7 +292,6 @@ PHP;
 
 
     /**
-     * @return void
      */
     public function testLoadPublicKeyRequiredMetadataMissing(): void
     {
@@ -319,7 +304,6 @@ PHP;
 
 
     /**
-     * @return void
      */
     public function testLoadPublicKeyNotRequiredMetadataMissing(): void
     {
@@ -333,7 +317,6 @@ PHP;
 
 
     /**
-     * @return void
      */
     public function testLoadPublicKeyNotX509Certificate(): void
     {
@@ -357,7 +340,6 @@ PHP;
 
 
     /**
-     * @return void
      */
     public function testLoadPublicKeyNotSigning(): void
     {
@@ -381,7 +363,6 @@ PHP;
 
 
     /**
-     * @return void
      */
     public function testLoadPublicKeyBasic(): void
     {
diff --git a/tests/lib/SimpleSAML/Utils/EMailTest.php b/tests/lib/SimpleSAML/Utils/EMailTest.php
index fcaa4d8aba9eb09114cc50166c964b7c9937379c..f3b51427ab37eb4ace19b31da78ef6897e76449e 100644
--- a/tests/lib/SimpleSAML/Utils/EMailTest.php
+++ b/tests/lib/SimpleSAML/Utils/EMailTest.php
@@ -18,7 +18,6 @@ use SimpleSAML\Utils\EMail;
 class EMailTest extends ClearStateTestCase
 {
     /**
-     * @return void
      */
     public function setUp(): void
     {
@@ -34,7 +33,6 @@ class EMailTest extends ClearStateTestCase
     /**
      * Test that an exception is thrown if using default configuration,
      * and no custom from address is specified.
-     * @return void
      */
     public function testMailFromDefaultConfigurationException(): void
     {
@@ -45,7 +43,6 @@ class EMailTest extends ClearStateTestCase
 
     /**
      * Test that an exception is thrown if using an invalid "From"-address
-     * @return void
      */
     public function testInvalidFromAddressException(): void
     {
@@ -56,7 +53,6 @@ class EMailTest extends ClearStateTestCase
 
     /**
      * Test that an exception is thrown if using an invalid "To"-address
-     * @return void
      */
     public function testInvalidToAddressException(): void
     {
@@ -69,7 +65,6 @@ class EMailTest extends ClearStateTestCase
      * Test that the data given is visible in the resulting mail
      * @dataProvider mailTemplates
      * @param string $template
-     * @return void
      */
     public function testMailContents($template): void
     {
@@ -99,7 +94,6 @@ class EMailTest extends ClearStateTestCase
 
 
     /**
-     * @return void
      */
     public function testInvalidTransportConfiguration(): void
     {
@@ -121,7 +115,6 @@ class EMailTest extends ClearStateTestCase
 
 
     /**
-     * @return void
      */
     public function testInvalidSMTPConfiguration(): void
     {
@@ -138,7 +131,6 @@ class EMailTest extends ClearStateTestCase
     /**
      * Test setting configuration.
      *
-     * @return void
      */
     public function testGetDefaultMailAddress(): void
     {
diff --git a/tests/lib/SimpleSAML/Utils/HTTPTest.php b/tests/lib/SimpleSAML/Utils/HTTPTest.php
index 17e8004a74272b19a85e6c1b689a4ddceaaf09ed..e60dae5c8d9df57cb059166b946fbde836ed9d24 100644
--- a/tests/lib/SimpleSAML/Utils/HTTPTest.php
+++ b/tests/lib/SimpleSAML/Utils/HTTPTest.php
@@ -19,7 +19,6 @@ class HTTPTest extends ClearStateTestCase
      * Set up the environment ($_SERVER) populating the typical variables from a given URL.
      *
      * @param string $url The URL to use as the current one.
-     * @return void
      */
     private function setupEnvFromURL(string $url): void
     {
@@ -48,7 +47,6 @@ class HTTPTest extends ClearStateTestCase
 
     /**
      * Test SimpleSAML\Utils\HTTP::addURLParameters().
-     * @return void
      */
     public function testAddURLParameters(): void
     {
@@ -76,7 +74,6 @@ class HTTPTest extends ClearStateTestCase
 
     /**
      * Test SimpleSAML\Utils\HTTP::guessBasePath().
-     * @return void
      */
     public function testGuessBasePath(): void
     {
@@ -120,7 +117,6 @@ class HTTPTest extends ClearStateTestCase
 
     /**
      * Test SimpleSAML\Utils\HTTP::getSelfHost() with and without custom port.
-     * @return void
      */
     public function testGetSelfHost(): void
     {
@@ -140,7 +136,6 @@ class HTTPTest extends ClearStateTestCase
 
     /**
      * Test SimpleSAML\Utils\HTTP::getSelfHostWithPort(), with and without custom port.
-     * @return void
      */
     public function testGetSelfHostWithPort(): void
     {
@@ -169,7 +164,6 @@ class HTTPTest extends ClearStateTestCase
 
     /**
      * Test SimpleSAML\Utils\HTTP::getSelfURL().
-     * @return void
      */
     public function testGetSelfURLMethods(): void
     {
@@ -296,7 +290,6 @@ class HTTPTest extends ClearStateTestCase
 
     /**
      * Test SimpleSAML\Utils\HTTP::checkURLAllowed(), without regex.
-     * @return void
      */
     public function testCheckURLAllowedWithoutRegex(): void
     {
@@ -328,7 +321,6 @@ class HTTPTest extends ClearStateTestCase
 
     /**
      * Test SimpleSAML\Utils\HTTP::checkURLAllowed(), with regex.
-     * @return void
      */
     public function testCheckURLAllowedWithRegex(): void
     {
@@ -362,7 +354,6 @@ class HTTPTest extends ClearStateTestCase
 
     /**
      * Test SimpleSAML\Utils\HTTP::getServerPort().
-     * @return void
      */
     public function testGetServerPort(): void
     {
@@ -409,7 +400,6 @@ class HTTPTest extends ClearStateTestCase
     /**
      * Test SimpleSAML\Utils\HTTP::checkURLAllowed(), with the regex as a
      * subdomain of an evil domain.
-     * @return void
      */
     public function testCheckURLAllowedWithRegexWithoutDelimiters(): void
     {
@@ -430,7 +420,6 @@ class HTTPTest extends ClearStateTestCase
 
 
     /**
-     * @return void
      */
     public function testGetFirstPathElement(): void
     {
@@ -445,7 +434,6 @@ class HTTPTest extends ClearStateTestCase
     /**
      * @runInSeparateProcess
      * @requires extension xdebug
-     * @return void
      */
     public function testSetCookie(): void
     {
@@ -503,7 +491,6 @@ class HTTPTest extends ClearStateTestCase
 
 
     /**
-     * @return void
      */
     public function testSetCookieInsecure(): void
     {
@@ -525,7 +512,6 @@ class HTTPTest extends ClearStateTestCase
     /**
      * @runInSeparateProcess
      * @requires extension xdebug
-     * @return void
      */
     public function testSetCookieSameSite(): void
     {
diff --git a/tests/lib/SimpleSAML/Utils/NetTest.php b/tests/lib/SimpleSAML/Utils/NetTest.php
index ded9ff93ef13776f9fa2e22839f601e04528a847..2ef7bc2bdd211a1c973a7852a81b2fb9a5c42d50 100644
--- a/tests/lib/SimpleSAML/Utils/NetTest.php
+++ b/tests/lib/SimpleSAML/Utils/NetTest.php
@@ -17,7 +17,6 @@ class NetTest extends TestCase
     /**
      * Test the function that checks for IPs belonging to a CIDR.
      *
-     * @return void
      */
     public function testIpCIDRcheck(): void
     {
@@ -52,7 +51,6 @@ class NetTest extends TestCase
     /**
      * Test IPv6 support in SimpleSAML\Utils\Net::ipCIDRcheck.
      *
-     * @return void
      */
     public function testIpv6CIDRcheck(): void
     {
diff --git a/tests/lib/SimpleSAML/Utils/RandomTest.php b/tests/lib/SimpleSAML/Utils/RandomTest.php
index 8e204a2db291324c3ce35a9aab7ae342b0f0b213..d84905a32db1f77d7e31c847bc1f2f9a4a28311a 100644
--- a/tests/lib/SimpleSAML/Utils/RandomTest.php
+++ b/tests/lib/SimpleSAML/Utils/RandomTest.php
@@ -17,7 +17,6 @@ class RandomTest extends TestCase
     /**
      * Test for SimpleSAML\Utils\Random::generateID().
      *
-     * @return void
      */
     public function testGenerateID(): void
     {
diff --git a/tests/lib/SimpleSAML/Utils/SystemTest.php b/tests/lib/SimpleSAML/Utils/SystemTest.php
index 3bd3619843bda8ed9613eabf77118a5db5ed869b..dd233f78921c6d9affb4af92944a0d9a11037770 100644
--- a/tests/lib/SimpleSAML/Utils/SystemTest.php
+++ b/tests/lib/SimpleSAML/Utils/SystemTest.php
@@ -31,7 +31,6 @@ class SystemTest extends TestCase
 
 
     /**
-     * @return void
      */
     public function setUp(): void
     {
@@ -48,7 +47,6 @@ class SystemTest extends TestCase
 
     /**
      * @test
-     * @return void
      */
     public function testGetOSBasic(): void
     {
@@ -60,7 +58,6 @@ class SystemTest extends TestCase
 
     /**
      * @test
-     * @return void
      */
     public function testResolvePathRemoveTrailingSlashes(): void
     {
@@ -76,7 +73,6 @@ class SystemTest extends TestCase
 
     /**
      * @test
-     * @return void
      */
     public function testResolvePathPreferAbsolutePathToBase(): void
     {
@@ -92,7 +88,6 @@ class SystemTest extends TestCase
 
     /**
      * @test
-     * @return void
      */
     public function testResolvePathCurDirPath(): void
     {
@@ -108,7 +103,6 @@ class SystemTest extends TestCase
 
     /**
      * @test
-     * @return void
      */
     public function testResolvePathParentPath(): void
     {
@@ -124,7 +118,6 @@ class SystemTest extends TestCase
 
     /**
      * @test
-     * @return void
      */
     public function testResolvePathAllowsStreamWrappers(): void
     {
@@ -140,7 +133,6 @@ class SystemTest extends TestCase
 
     /**
      * @test
-     * @return void
      */
     public function testResolvePathAllowsAwsS3StreamWrappers(): void
     {
@@ -156,7 +148,6 @@ class SystemTest extends TestCase
 
     /**
      * @test
-     * @return void
      */
     public function testWriteFileBasic(): void
     {
@@ -175,7 +166,6 @@ class SystemTest extends TestCase
 
     /**
      * @test
-     * @return void
      */
     public function testWriteFileContents(): void
     {
@@ -198,7 +188,6 @@ class SystemTest extends TestCase
 
     /**
      * @test
-     * @return void
      */
     public function testWriteFileMode(): void
     {
@@ -221,7 +210,6 @@ class SystemTest extends TestCase
 
     /**
      * @test
-     * @return void
      */
     public function testGetTempDirBasic(): void
     {
@@ -240,7 +228,6 @@ class SystemTest extends TestCase
 
     /**
      * @test
-     * @return void
      */
     public function testGetTempDirNonExistant(): void
     {
@@ -259,7 +246,6 @@ class SystemTest extends TestCase
 
     /**
      * @test
-     * @return void
      */
     public function testGetTempDirBadPermissions(): void
     {
@@ -292,7 +278,6 @@ class SystemTest extends TestCase
     /**
      * @param \SimpleSAML\Configuration $service
      * @param class-string $className
-     * @return void
      */
     protected function clearInstance(Configuration $service, string $className): void
     {
diff --git a/tests/lib/SimpleSAML/Utils/TimeTest.php b/tests/lib/SimpleSAML/Utils/TimeTest.php
index 00e1a7c150931caa3279194026c5c4f22204b05a..220e611510afa679fde67bfc89e32172304108d7 100644
--- a/tests/lib/SimpleSAML/Utils/TimeTest.php
+++ b/tests/lib/SimpleSAML/Utils/TimeTest.php
@@ -19,7 +19,6 @@ class TimeTest extends TestCase
     /**
      * Test the SimpleSAML\Utils\Time::generateTimestamp() method.
      *
-     * @return void
      */
     public function testGenerateTimestamp(): void
     {
@@ -34,7 +33,6 @@ class TimeTest extends TestCase
     /**
      * Test the SimpleSAML\Utils\Time::initTimezone() method.
      *
-     * @return void
      */
     public function testInitTimezone(): void
     {
@@ -78,7 +76,6 @@ class TimeTest extends TestCase
     /**
      * Test the SimpleSAML\Utils\Time::parseDuration() method.
      *
-     * @return void
      */
     public function testParseDuration(): void
     {
diff --git a/tests/lib/SimpleSAML/Utils/XMLTest.php b/tests/lib/SimpleSAML/Utils/XMLTest.php
index c41ae9a1a955db4d16624ad53e8120eaf1d70b76..7281e5e0d83da2fc5867938a73d678f70f44c06b 100644
--- a/tests/lib/SimpleSAML/Utils/XMLTest.php
+++ b/tests/lib/SimpleSAML/Utils/XMLTest.php
@@ -26,7 +26,6 @@ class XMLTest extends TestCase
 
     /**
      * @test
-     * @return void
      */
     public function testIsDomNodeOfTypeBasic(): void
     {
@@ -42,7 +41,6 @@ class XMLTest extends TestCase
 
     /**
      * @test
-     * @return void
      */
     public function testIsDomNodeOfTypeMissingNamespace(): void
     {
@@ -57,7 +55,6 @@ class XMLTest extends TestCase
 
     /**
      * @test
-     * @return void
      */
     public function testIsDomNodeOfTypeEmpty(): void
     {
@@ -73,7 +70,6 @@ class XMLTest extends TestCase
 
     /**
      * @test
-     * @return void
      */
     public function testIsDomNodeOfTypeShortcut(): void
     {
@@ -90,7 +86,6 @@ class XMLTest extends TestCase
 
     /**
      * @test
-     * @return void
      */
     public function testIsDomNodeOfTypeIncorrectName(): void
     {
@@ -107,7 +102,6 @@ class XMLTest extends TestCase
 
     /**
      * @test
-     * @return void
      */
     public function testIsDomNodeOfTypeIncorrectNamespace(): void
     {
@@ -124,7 +118,6 @@ class XMLTest extends TestCase
 
     /**
      * @test
-     * @return void
      */
     public function testGetDomTextBasic(): void
     {
@@ -142,7 +135,6 @@ class XMLTest extends TestCase
 
     /**
      * @test
-     * @return void
      */
     public function testGetDomTextMulti(): void
     {
@@ -162,7 +154,6 @@ class XMLTest extends TestCase
 
     /**
      * @test
-     * @return void
      */
     public function testGetDomTextIncorrectType(): void
     {
@@ -177,7 +168,6 @@ class XMLTest extends TestCase
 
     /**
      * @test
-     * @return void
      */
     public function testGetDomChildrenBasic(): void
     {
@@ -196,7 +186,6 @@ class XMLTest extends TestCase
 
     /**
      * @test
-     * @return void
      */
     public function testGetDomChildrenIncorrectType(): void
     {
@@ -214,7 +203,6 @@ class XMLTest extends TestCase
 
     /**
      * @test
-     * @return void
      */
     public function testGetDomChildrenIncorrectName(): void
     {
@@ -233,7 +221,6 @@ class XMLTest extends TestCase
 
     /**
      * @test
-     * @return void
      */
     public function testFormatDomElementBasic(): void
     {
@@ -256,7 +243,6 @@ NOWDOC;
 
     /**
      * @test
-     * @return void
      */
     public function testFormatDomElementNested(): void
     {
@@ -283,7 +269,6 @@ NOWDOC;
 
     /**
      * @test
-     * @return void
      */
     public function testFormatDomElementIndentBase(): void
     {
@@ -311,7 +296,6 @@ HEREDOC;
 
     /**
      * @test
-     * @return void
      */
     public function testFormatDomElementTextAndChild(): void
     {
@@ -335,7 +319,6 @@ HEREDOC;
 
     /**
      * @test
-     * @return void
      */
     public function testFormatXmlStringBasic(): void
     {
@@ -354,7 +337,6 @@ NOWDOC;
 
     /**
      * @test
-     * @return void
      */
     public function testFormatXmlStringMalformedXml(): void
     {
@@ -367,7 +349,6 @@ NOWDOC;
 
     /**
      * @test
-     * @return void
      */
     public function testIsValidMalformedXml(): void
     {
@@ -382,7 +363,6 @@ NOWDOC;
 
 
     /**
-     * @return void
      */
     public function testIsValidMetadata(): void
     {
@@ -397,7 +377,6 @@ NOWDOC;
     }
 
     /**
-     * @return void
      */
     public function testCheckSAMLMessageInvalidType(): void
     {
diff --git a/tests/lib/SimpleSAML/XML/ErrorsTest.php b/tests/lib/SimpleSAML/XML/ErrorsTest.php
index ad9a9ab94ab0e5314e486be35f28cd5f0e26decc..dec252ee45b1b7199992b82080fde9f4ff80455a 100644
--- a/tests/lib/SimpleSAML/XML/ErrorsTest.php
+++ b/tests/lib/SimpleSAML/XML/ErrorsTest.php
@@ -22,7 +22,6 @@ class ErrorsTest extends TestCase
 {
     /**
      * @test
-     * @return void
      */
     public function loggingErrors(): void
     {
@@ -41,7 +40,6 @@ class ErrorsTest extends TestCase
 
     /**
      * @test
-     * @return void
      */
     public function formatErrors(): void
     {
diff --git a/tests/lib/SimpleSAML/XML/ParserTest.php b/tests/lib/SimpleSAML/XML/ParserTest.php
index accc6c3c07de0eda0d078ffa1ccdfae6c4a297a6..1955d4f0f918afa8ffdcddc598273d47159aca77 100644
--- a/tests/lib/SimpleSAML/XML/ParserTest.php
+++ b/tests/lib/SimpleSAML/XML/ParserTest.php
@@ -32,7 +32,6 @@ XML;
 
 
     /**
-     * @return void
      */
     protected function setUp(): void
     {
@@ -42,7 +41,6 @@ XML;
 
     /**
      * @test
-     * @return void
      */
     public function getValue(): void
     {
@@ -56,7 +54,6 @@ XML;
 
     /**
      * @test
-     * @return void
      */
     public function getEmptyValue(): void
     {
@@ -70,7 +67,6 @@ XML;
 
     /**
      * @test
-     * @return void
      */
     public function getValueException(): void
     {
@@ -81,7 +77,6 @@ XML;
 
     /**
      * @test
-     * @return void
      */
     public function getDefaultValue(): void
     {
@@ -95,7 +90,6 @@ XML;
 
     /**
      * @test
-     * @return void
      */
     public function getValueAlternatives(): void
     {
@@ -116,7 +110,6 @@ XML;
 
     /**
      * @test
-     * @return void
      */
     public function getEmptyValueAlternatives(): void
     {
@@ -137,7 +130,6 @@ XML;
 
     /**
      * @test
-     * @return void
      */
     public function getValueAlternativesException(): void
     {
diff --git a/tests/lib/SimpleSAML/XML/SignerTest.php b/tests/lib/SimpleSAML/XML/SignerTest.php
index 2b6463fc1d909c5d771b9396d2466764b5b53e6f..0713f77e9bb202b6448b214ffcb1b318ae4ba9c2 100644
--- a/tests/lib/SimpleSAML/XML/SignerTest.php
+++ b/tests/lib/SimpleSAML/XML/SignerTest.php
@@ -67,7 +67,6 @@ NOWDOC;
 
 
     /**
-     * @return void
      */
     public function testSignerBasic(): void
     {
@@ -78,7 +77,6 @@ NOWDOC;
 
 
     /**
-     * @return void
      */
     public function testSignBasic(): void
     {
@@ -119,7 +117,6 @@ NOWDOC;
 
 
     /**
-     * @return void
      */
     public function testSignWithCertificate(): void
     {
@@ -147,7 +144,6 @@ NOWDOC;
 
 
     /**
-     * @return void
      */
     public function testSignWithMultiCertificate(): void
     {
@@ -180,7 +176,6 @@ NOWDOC;
 
 
     /**
-     * @return void
      */
     public function testSignMissingPrivateKey(): void
     {
@@ -204,7 +199,6 @@ NOWDOC;
      * @param \SimpleSAML\Configuration $service
      * @param class-string $className
      * @param mixed|null $value
-     * @return void
      */
     protected function clearInstance(Configuration $service, string $className, $value = null): void
     {
diff --git a/tests/lib/SimpleSAML/XML/ValidatorTest.php b/tests/lib/SimpleSAML/XML/ValidatorTest.php
index f79a647ef29d4b888afa22a2f956124b8e2e99a8..1aee17e65ec47fa3829528e565c73407742bdf87 100644
--- a/tests/lib/SimpleSAML/XML/ValidatorTest.php
+++ b/tests/lib/SimpleSAML/XML/ValidatorTest.php
@@ -21,7 +21,6 @@ use SimpleSAML\XML\Validator;
 class ValidatorTest extends SigningTestCase
 {
     /**
-     * @return void
      */
     public function testValidatorMissingSignature(): void
     {
@@ -34,7 +33,6 @@ class ValidatorTest extends SigningTestCase
 
 
     /**
-     * @return void
      */
     public function testGetX509Certificate(): void
     {
@@ -63,7 +61,6 @@ class ValidatorTest extends SigningTestCase
 
 
     /**
-     * @return void
      */
     public function testIsNodeValidatedSuccess(): void
     {
@@ -92,7 +89,6 @@ class ValidatorTest extends SigningTestCase
 
 
     /**
-     * @return void
      */
     public function testIsNodeValidatedFailure(): void
     {
diff --git a/tests/modules/admin/lib/Controller/ConfigTest.php b/tests/modules/admin/lib/Controller/ConfigTest.php
index 422a685b2ace35ef06008006527dff4f950f6b3e..389d8925c564b87dca33b6408b7281b0fcc17b71 100644
--- a/tests/modules/admin/lib/Controller/ConfigTest.php
+++ b/tests/modules/admin/lib/Controller/ConfigTest.php
@@ -34,7 +34,6 @@ class ConfigTest extends TestCase
 
     /**
      * Set up for each test.
-     * @return void
      */
     protected function setUp(): void
     {
@@ -78,7 +77,6 @@ class ConfigTest extends TestCase
 
 
     /**
-     * @return void
      */
     public function testDiagnostics(): void
     {
@@ -97,7 +95,6 @@ class ConfigTest extends TestCase
 
 
     /**
-     * @return void
      */
     public function testMain(): void
     {
@@ -116,7 +113,6 @@ class ConfigTest extends TestCase
 
 
     /**
-     * @return void
      */
     public function testPhpinfo(): void
     {
diff --git a/tests/modules/admin/lib/Controller/FederationTest.php b/tests/modules/admin/lib/Controller/FederationTest.php
index c4acde34b6e40825ad498199a8d39ec30c497e04..f353d8c4c3ba3644e20702b9ecd52c29f34706d5 100644
--- a/tests/modules/admin/lib/Controller/FederationTest.php
+++ b/tests/modules/admin/lib/Controller/FederationTest.php
@@ -55,7 +55,6 @@ class FederationTest extends TestCase
 
     /**
      * Set up for each test.
-     * @return void
      */
     protected function setUp(): void
     {
@@ -95,7 +94,6 @@ class FederationTest extends TestCase
 
 
     /**
-     * @return void
      */
     public function testMain(): void
     {
@@ -180,7 +178,6 @@ class FederationTest extends TestCase
 
 
     /**
-     * @return void
      */
     public function testMetadataConverterFileUpload(): void
     {
@@ -210,7 +207,6 @@ class FederationTest extends TestCase
 
 
     /**
-     * @return void
      */
     public function testMetadataConverterData(): void
     {
@@ -229,7 +225,6 @@ class FederationTest extends TestCase
     }
 
     /**
-     * @return void
      */
     public function testMetadataConverterSkipsExpires(): void
     {
@@ -249,7 +244,6 @@ class FederationTest extends TestCase
 
 
     /**
-     * @return void
      */
     public function testMetadataConverterInvalidMetadataShowsError(): void
     {
@@ -270,7 +264,6 @@ class FederationTest extends TestCase
 
 
     /**
-     * @return void
      */
     public function testMetadataConverterEmptyInput(): void
     {
@@ -292,7 +285,6 @@ class FederationTest extends TestCase
 
 
     /**
-     * @return void
      */
     public function testDownloadCertSP(): void
     {
@@ -344,7 +336,6 @@ class FederationTest extends TestCase
 
 
     /**
-     * @return void
      */
     public function testDownloadCertFile(): void
     {
@@ -384,7 +375,6 @@ class FederationTest extends TestCase
 
 
     /**
-     * @return void
      */
     public function testShowRemoteEntity(): void
     {
diff --git a/tests/modules/admin/lib/Controller/TestTest.php b/tests/modules/admin/lib/Controller/TestTest.php
index 881abe700bf23915cf5672a5776a83c5d87fd9b1..72a887eaaf50004af4a6814585071c7383b5e6cb 100644
--- a/tests/modules/admin/lib/Controller/TestTest.php
+++ b/tests/modules/admin/lib/Controller/TestTest.php
@@ -37,7 +37,6 @@ class TestTest extends TestCase
 
     /**
      * Set up for each test.
-     * @return void
      */
     protected function setUp(): void
     {
@@ -75,7 +74,6 @@ class TestTest extends TestCase
 
 
     /**
-     * @return void
      */
     public function testMainWithoutAuthSource(): void
     {
@@ -95,7 +93,6 @@ class TestTest extends TestCase
 
 
     /**
-     * @return void
      */
     public function testMainWithAuthSourceAndLogout(): void
     {
@@ -123,7 +120,6 @@ class TestTest extends TestCase
 
 
     /**
-     * @return void
      */
     public function testMainWithAuthSourceAndException(): void
     {
@@ -150,7 +146,6 @@ class TestTest extends TestCase
 
 
     /**
-     * @return void
      */
     public function testMainWithAuthSourceNotAuthenticated(): void
     {
@@ -183,7 +178,6 @@ class TestTest extends TestCase
 
 
     /**
-     * @return void
      */
     public function testMainWithAuthSourceAuthenticated(): void
     {
diff --git a/tests/modules/core/lib/Auth/Process/AttributeAddTest.php b/tests/modules/core/lib/Auth/Process/AttributeAddTest.php
index 3c91e2e6f61be37a9ff9815566df7cdc439f62f0..ae15ae4b476e600ad29fc5df8b7adec862bf81b8 100644
--- a/tests/modules/core/lib/Auth/Process/AttributeAddTest.php
+++ b/tests/modules/core/lib/Auth/Process/AttributeAddTest.php
@@ -32,7 +32,6 @@ class AttributeAddTest extends TestCase
 
     /**
      * Test the most basic functionality.
-     * @return void
      */
     public function testBasic(): void
     {
@@ -51,7 +50,6 @@ class AttributeAddTest extends TestCase
 
     /**
      * Test that existing attributes are left unmodified.
-     * @return void
      */
     public function testExistingNotModified(): void
     {
@@ -77,7 +75,6 @@ class AttributeAddTest extends TestCase
 
     /**
      * Test single string as attribute value.
-     * @return void
      */
     public function testStringValue(): void
     {
@@ -96,7 +93,6 @@ class AttributeAddTest extends TestCase
 
     /**
      * Test adding multiple attributes in one config.
-     * @return void
      */
     public function testAddMultiple(): void
     {
@@ -118,7 +114,6 @@ class AttributeAddTest extends TestCase
 
     /**
      * Test behavior when appending attribute values.
-     * @return void
      */
     public function testAppend(): void
     {
@@ -138,7 +133,6 @@ class AttributeAddTest extends TestCase
 
     /**
      * Test replacing attribute values.
-     * @return void
      */
     public function testReplace(): void
     {
@@ -159,7 +153,6 @@ class AttributeAddTest extends TestCase
 
     /**
      * Test wrong usage generates exceptions
-     * @return void
      */
     public function testWrongFlag(): void
     {
@@ -179,7 +172,6 @@ class AttributeAddTest extends TestCase
 
     /**
      * Test wrong attribute value
-     * @return void
      */
     public function testWrongAttributeValue(): void
     {
diff --git a/tests/modules/core/lib/Auth/Process/AttributeAlterTest.php b/tests/modules/core/lib/Auth/Process/AttributeAlterTest.php
index d81ca84cc10ab9334eff24f91c804ae196ef202f..5227e0f6752901a757e60d1e6123b2785d15261e 100644
--- a/tests/modules/core/lib/Auth/Process/AttributeAlterTest.php
+++ b/tests/modules/core/lib/Auth/Process/AttributeAlterTest.php
@@ -32,7 +32,6 @@ class AttributeAlterTest extends TestCase
 
     /**
      * Test the most basic functionality.
-     * @return void
      */
     public function testBasic(): void
     {
@@ -57,7 +56,6 @@ class AttributeAlterTest extends TestCase
 
     /**
      * Test the most basic functionality.
-     * @return void
      */
     public function testWithTarget(): void
     {
@@ -85,7 +83,6 @@ class AttributeAlterTest extends TestCase
 
     /**
      * Module is a no op if subject attribute is not present.
-     * @return void
      */
     public function testNomatch(): void
     {
@@ -114,7 +111,6 @@ class AttributeAlterTest extends TestCase
 
     /**
      * Test replacing attribute value.
-     * @return void
      */
     public function testReplaceMatch(): void
     {
@@ -137,7 +133,6 @@ class AttributeAlterTest extends TestCase
 
     /**
      * Test replacing attribute value.
-     * @return void
      */
     public function testReplaceMatchWithTarget(): void
     {
@@ -162,7 +157,6 @@ class AttributeAlterTest extends TestCase
 
     /**
      * Test replacing attribute values.
-     * @return void
      */
     public function testReplaceNoMatch(): void
     {
@@ -189,7 +183,6 @@ class AttributeAlterTest extends TestCase
      * Test removing attribute values.
      * Note that removing a value does not renumber the attributes array.
      * Also ensure unrelated attributes are not touched.
-     * @return void
      */
     public function testRemoveMatch(): void
     {
@@ -213,7 +206,6 @@ class AttributeAlterTest extends TestCase
 
     /**
      * Test removing attribute values, resulting in an empty attribute.
-     * @return void
      */
     public function testRemoveMatchAll(): void
     {
@@ -236,7 +228,6 @@ class AttributeAlterTest extends TestCase
 
     /**
      * Test for exception with illegal config.
-     * @return void
      */
     public function testWrongConfig(): void
     {
@@ -257,7 +248,6 @@ class AttributeAlterTest extends TestCase
 
     /**
      * Test for exception with illegal config.
-     * @return void
      */
     public function testIncompleteConfig(): void
     {
@@ -276,7 +266,6 @@ class AttributeAlterTest extends TestCase
 
     /**
      * Test for exception with illegal config.
-     * @return void
      */
     public function testIncompleteConfig2(): void
     {
@@ -297,7 +286,6 @@ class AttributeAlterTest extends TestCase
 
     /**
      * Test for exception with illegal config.
-     * @return void
      */
     public function testIncompleteConfig3(): void
     {
@@ -320,7 +308,6 @@ class AttributeAlterTest extends TestCase
 
     /**
      * Test for exception with illegal config.
-     * @return void
      */
     public function testIncompleteConfig4(): void
     {
@@ -343,7 +330,6 @@ class AttributeAlterTest extends TestCase
 
     /**
      * Test for exception with illegal config.
-     * @return void
      */
     public function testIncompleteConfig5(): void
     {
diff --git a/tests/modules/core/lib/Auth/Process/AttributeCopyTest.php b/tests/modules/core/lib/Auth/Process/AttributeCopyTest.php
index ea0323ca5701b55c6ff3e14c25d48635ea5b4a4b..41b6cb337e7ab867014144f3ec0315777d59a73d 100644
--- a/tests/modules/core/lib/Auth/Process/AttributeCopyTest.php
+++ b/tests/modules/core/lib/Auth/Process/AttributeCopyTest.php
@@ -32,7 +32,6 @@ class AttributeCopyTest extends TestCase
 
     /**
      * Test the most basic functionality.
-     * @return void
      */
     public function testBasic(): void
     {
@@ -52,7 +51,6 @@ class AttributeCopyTest extends TestCase
 
     /**
      * Test the most basic functionality.
-     * @return void
      */
     public function testArray(): void
     {
@@ -74,7 +72,6 @@ class AttributeCopyTest extends TestCase
 
     /**
      * Test that existing attributes are left unmodified.
-     * @return void
      */
     public function testExistingNotModified(): void
     {
@@ -101,7 +98,6 @@ class AttributeCopyTest extends TestCase
 
     /**
      * Test copying multiple attributes
-     * @return void
      */
     public function testCopyMultiple(): void
     {
@@ -123,7 +119,6 @@ class AttributeCopyTest extends TestCase
 
     /**
      * Test behaviour when target attribute exists (should be replaced).
-     * @return void
      */
     public function testCopyClash(): void
     {
@@ -144,7 +139,6 @@ class AttributeCopyTest extends TestCase
 
     /**
      * Test wrong attribute name
-     * @return void
      */
     public function testWrongAttributeName(): void
     {
@@ -163,7 +157,6 @@ class AttributeCopyTest extends TestCase
 
     /**
      * Test wrong attribute value
-     * @return void
      */
     public function testWrongAttributeValue(): void
     {
diff --git a/tests/modules/core/lib/Auth/Process/AttributeLimitTest.php b/tests/modules/core/lib/Auth/Process/AttributeLimitTest.php
index 9878ba8b245d3351336ce4f3ebcb8b4a8cc471ea..71c1ce10798cd8fe6a835489847f5f52fb95585b 100644
--- a/tests/modules/core/lib/Auth/Process/AttributeLimitTest.php
+++ b/tests/modules/core/lib/Auth/Process/AttributeLimitTest.php
@@ -40,7 +40,6 @@ class AttributeLimitTest extends TestCase
 
     /**
      * Test reading IdP Attributes.
-     * @return void
      */
     public function testIdPAttrs(): void
     {
@@ -87,7 +86,6 @@ class AttributeLimitTest extends TestCase
 
     /**
      * Tests when no attributes are in metadata.
-     * @return void
      */
     public function testNULLMetadataAttrs(): void
     {
@@ -143,7 +141,6 @@ class AttributeLimitTest extends TestCase
 
 
     /**
-     * @return void
      */
     public static function setUpBeforeClass(): void
     {
@@ -165,7 +162,6 @@ class AttributeLimitTest extends TestCase
 
     /**
      * Test the most basic functionality.
-     * @return void
      */
     public function testBasic(): void
     {
@@ -183,7 +179,6 @@ class AttributeLimitTest extends TestCase
 
     /**
      * Test defaults with metadata available.
-     * @return void
      */
     public function testDefaultWithMetadata(): void
     {
@@ -201,7 +196,6 @@ class AttributeLimitTest extends TestCase
 
     /**
      * Test defaults with attributes and metadata
-     * @return void
      */
     public function testDefaultWithAttrs(): void
     {
@@ -222,7 +216,6 @@ class AttributeLimitTest extends TestCase
 
     /**
      * Test for exception with illegal config.
-     * @return void
      */
     public function testInvalidConfig(): void
     {
@@ -237,7 +230,6 @@ class AttributeLimitTest extends TestCase
 
     /**
      * Test for invalid attribute name
-     * @return void
      */
     public function testInvalidAttributeName(): void
     {
@@ -252,7 +244,6 @@ class AttributeLimitTest extends TestCase
 
     /**
      * Test for attribute value matching
-     * @return void
      */
     public function testMatchAttributeValues(): void
     {
@@ -293,7 +284,6 @@ class AttributeLimitTest extends TestCase
 
 
     /**
-     * @return void
      */
     public function testBadOptionsNotTreatedAsValidValues(): void
     {
@@ -311,7 +301,6 @@ class AttributeLimitTest extends TestCase
     /**
      * Verify that the true value for ignoreCase doesn't get converted into a string ('1') by
      * php and matched against an attribute value of '1'
-     * @return void
      */
     public function testThatIgnoreCaseOptionNotMatchBooleanAsStringValue(): void
     {
@@ -333,7 +322,6 @@ class AttributeLimitTest extends TestCase
 
     /**
      * Test for attribute value matching ignore case
-     * @return void
      */
     public function testMatchAttributeValuesIgnoreCase(): void
     {
@@ -375,7 +363,6 @@ class AttributeLimitTest extends TestCase
 
     /**
      * Test for attribute value matching
-     * @return void
      */
     public function testMatchAttributeValuesRegex(): void
     {
@@ -477,7 +464,6 @@ class AttributeLimitTest extends TestCase
      *
      * This test is very unlikely and would require malformed metadata processing.
      * Cannot be generated via config options.
-     * @return void
      */
     public function testMatchAttributeValuesNotArray(): void
     {
@@ -507,7 +493,6 @@ class AttributeLimitTest extends TestCase
 
     /**
      * Test attributes not intersecting
-     * @return void
      */
     public function testNoIntersection(): void
     {
diff --git a/tests/modules/core/lib/Auth/Process/AttributeMapTest.php b/tests/modules/core/lib/Auth/Process/AttributeMapTest.php
index 628695e4ddf3fe28acab63c457e09c4b33a792a2..88391df1a599339b04d48209a51f5d05ea232c43 100644
--- a/tests/modules/core/lib/Auth/Process/AttributeMapTest.php
+++ b/tests/modules/core/lib/Auth/Process/AttributeMapTest.php
@@ -30,7 +30,6 @@ class AttributeMapTest extends TestCase
 
 
     /**
-     * @return void
      */
     public function testBasic(): void
     {
@@ -54,7 +53,6 @@ class AttributeMapTest extends TestCase
 
 
     /**
-     * @return void
      */
     public function testDuplicate(): void
     {
@@ -80,7 +78,6 @@ class AttributeMapTest extends TestCase
 
 
     /**
-     * @return void
      */
     public function testMultiple(): void
     {
@@ -105,7 +102,6 @@ class AttributeMapTest extends TestCase
 
 
     /**
-     * @return void
      */
     public function testMultipleDuplicate(): void
     {
@@ -132,7 +128,6 @@ class AttributeMapTest extends TestCase
 
 
     /**
-     * @return void
      */
     public function testCircular(): void
     {
@@ -159,7 +154,6 @@ class AttributeMapTest extends TestCase
 
 
     /**
-     * @return void
      */
     public function testMissingMap(): void
     {
@@ -185,7 +179,6 @@ class AttributeMapTest extends TestCase
 
 
     /**
-     * @return void
      */
     public function testInvalidOriginalAttributeType(): void
     {
@@ -204,7 +197,6 @@ class AttributeMapTest extends TestCase
 
 
     /**
-     * @return void
      */
     public function testInvalidMappedAttributeType(): void
     {
@@ -223,7 +215,6 @@ class AttributeMapTest extends TestCase
 
 
     /**
-     * @return void
      */
     public function testMissingMapFile(): void
     {
@@ -242,7 +233,6 @@ class AttributeMapTest extends TestCase
 
 
     /**
-     * @return void
      */
     public function testOverwrite(): void
     {
@@ -267,7 +257,6 @@ class AttributeMapTest extends TestCase
 
 
     /**
-     * @return void
      */
     public function testOverwriteReversed(): void
     {
diff --git a/tests/modules/core/lib/Auth/Process/AttributeValueMapTest.php b/tests/modules/core/lib/Auth/Process/AttributeValueMapTest.php
index 0dedcf98e5e457e910cab0731adf6a9e5cdaf5cc..87e77230057538a4061218473416d0d187e67b69 100644
--- a/tests/modules/core/lib/Auth/Process/AttributeValueMapTest.php
+++ b/tests/modules/core/lib/Auth/Process/AttributeValueMapTest.php
@@ -33,7 +33,6 @@ class AttributeValueMapTest extends TestCase
     /**
      * Test the most basic functionality.
      *
-     * @return void
      */
     public function testBasic(): void
     {
@@ -63,7 +62,6 @@ class AttributeValueMapTest extends TestCase
     /**
      * Test basic functionality, remove duplicates
      *
-     * @return void
      */
     public function testNoDuplicates(): void
     {
@@ -94,7 +92,6 @@ class AttributeValueMapTest extends TestCase
     /**
      * Test the %replace functionality.
      *
-     * @return void
      */
     public function testReplace(): void
     {
@@ -126,7 +123,6 @@ class AttributeValueMapTest extends TestCase
     /**
      * Test the %keep functionality.
      *
-     * @return void
      */
     public function testKeep(): void
     {
@@ -158,7 +154,6 @@ class AttributeValueMapTest extends TestCase
     /**
      * Test unknown flag Exception
      *
-     * @return void
      */
     public function testUnknownFlag(): void
     {
@@ -187,7 +182,6 @@ class AttributeValueMapTest extends TestCase
     /**
      * Test missing Source attribute
      *
-     * @return void
      */
     public function testMissingSourceAttribute(): void
     {
@@ -212,7 +206,6 @@ class AttributeValueMapTest extends TestCase
     /**
      * Test missing Target attribute
      *
-     * @return void
      */
     public function testMissingTargetAttribute(): void
     {
diff --git a/tests/modules/core/lib/Auth/Process/CardinalitySingleTest.php b/tests/modules/core/lib/Auth/Process/CardinalitySingleTest.php
index 5b62d6d71e43d333158229fdde7fe25828d2d22e..76a7857bb3d2497ceccddc7d475f51616f4ac2fd 100644
--- a/tests/modules/core/lib/Auth/Process/CardinalitySingleTest.php
+++ b/tests/modules/core/lib/Auth/Process/CardinalitySingleTest.php
@@ -41,7 +41,6 @@ class CardinalitySingleTest extends TestCase
 
 
     /**
-     * @return void
      */
     protected function setUp(): void
     {
@@ -54,7 +53,6 @@ class CardinalitySingleTest extends TestCase
 
     /**
      * Test singleValued
-     * @return void
      */
     public function testSingleValuedUnchanged(): void
     {
@@ -75,7 +73,6 @@ class CardinalitySingleTest extends TestCase
 
     /**
      * Test first value extraction
-     * @return void
      */
     public function testFirstValue(): void
     {
@@ -95,7 +92,6 @@ class CardinalitySingleTest extends TestCase
 
 
     /**
-     * @return void
      */
     public function testFirstValueUnchanged(): void
     {
@@ -116,7 +112,6 @@ class CardinalitySingleTest extends TestCase
 
     /**
      * Test flattening
-     * @return void
      */
     public function testFlatten(): void
     {
@@ -137,7 +132,6 @@ class CardinalitySingleTest extends TestCase
 
 
     /**
-     * @return void
      */
     public function testFlattenUnchanged(): void
     {
@@ -159,7 +153,6 @@ class CardinalitySingleTest extends TestCase
 
     /**
      * Test abort
-     * @return void
      */
     public function testAbort(): void
     {
diff --git a/tests/modules/core/lib/Auth/Process/CardinalityTest.php b/tests/modules/core/lib/Auth/Process/CardinalityTest.php
index 421b382ed002d3ebde6207b852bcc2a26ee439cf..3441848815940d313321ceb46867437d1d6702ad 100644
--- a/tests/modules/core/lib/Auth/Process/CardinalityTest.php
+++ b/tests/modules/core/lib/Auth/Process/CardinalityTest.php
@@ -43,7 +43,6 @@ class CardinalityTest extends TestCase
 
 
     /**
-     * @return void
      */
     protected function setUp(): void
     {
@@ -56,7 +55,6 @@ class CardinalityTest extends TestCase
 
     /**
      * Test where a minimum is set but no maximum
-     * @return void
      */
     public function testMinNoMax(): void
     {
@@ -77,7 +75,6 @@ class CardinalityTest extends TestCase
 
     /**
      * Test where a maximum is set but no minimum
-     * @return void
      */
     public function testMaxNoMin(): void
     {
@@ -98,7 +95,6 @@ class CardinalityTest extends TestCase
 
     /**
      * Test in bounds within a maximum an minimum
-     * @return void
      */
     public function testMaxMin(): void
     {
@@ -119,7 +115,6 @@ class CardinalityTest extends TestCase
 
     /**
      * Test maximum is out of bounds results in redirect
-     * @return void
      */
     public function testMaxOutOfBounds(): void
     {
@@ -142,7 +137,6 @@ class CardinalityTest extends TestCase
 
     /**
      * Test minimum is out of bounds results in redirect
-     * @return void
      */
     public function testMinOutOfBounds(): void
     {
@@ -165,7 +159,6 @@ class CardinalityTest extends TestCase
 
     /**
      * Test missing attribute results in redirect
-     * @return void
      */
     public function testMissingAttribute(): void
     {
@@ -191,7 +184,6 @@ class CardinalityTest extends TestCase
 
     /**
      * Test invalid minimum values
-     * @return void
      */
     public function testMinInvalid(): void
     {
@@ -211,7 +203,6 @@ class CardinalityTest extends TestCase
 
     /**
      * Test invalid minimum values
-     * @return void
      */
     public function testMinNegative(): void
     {
@@ -231,7 +222,6 @@ class CardinalityTest extends TestCase
 
     /**
      * Test invalid maximum values
-     * @return void
      */
     public function testMaxInvalid(): void
     {
@@ -251,7 +241,6 @@ class CardinalityTest extends TestCase
 
     /**
      * Test maximum < minimum
-     * @return void
      */
     public function testMinGreaterThanMax(): void
     {
@@ -271,7 +260,6 @@ class CardinalityTest extends TestCase
 
     /**
      * Test invalid attribute name
-     * @return void
      */
     public function testInvalidAttributeName(): void
     {
diff --git a/tests/modules/core/lib/Auth/Process/PHPTest.php b/tests/modules/core/lib/Auth/Process/PHPTest.php
index bed06c00495b72621d473c322f31839c036aba59..40644af95466ffe59713d6cce26bf6fca4e1b8b6 100644
--- a/tests/modules/core/lib/Auth/Process/PHPTest.php
+++ b/tests/modules/core/lib/Auth/Process/PHPTest.php
@@ -34,7 +34,6 @@ class PHPTest extends TestCase
 
     /**
      * Test the configuration of the filter.
-     * @return void
      */
     public function testInvalidConfiguration(): void
     {
@@ -49,7 +48,6 @@ class PHPTest extends TestCase
 
     /**
      * Check that defining the code works as expected.
-     * @return void
      */
     public function testCodeDefined(): void
     {
@@ -71,7 +69,6 @@ class PHPTest extends TestCase
 
     /**
      * Check that the incoming attributes are also available after processing
-     * @return void
      */
     public function testPreserveIncomingAttributes(): void
     {
@@ -102,7 +99,6 @@ class PHPTest extends TestCase
     /**
      * Check that throwing an Exception inside the PHP code of the
      * filter (a documented use case) works.
-     * @return void
      */
     public function testThrowExceptionFromFilter(): void
     {
@@ -128,7 +124,6 @@ class PHPTest extends TestCase
 
     /**
      * Check that the entire state can be adjusted.
-     * @return void
      */
     public function testStateCanBeModified(): void
     {
diff --git a/tests/modules/core/lib/Auth/Process/ScopeAttributeTest.php b/tests/modules/core/lib/Auth/Process/ScopeAttributeTest.php
index 0e45babcb391d150b3d505108c717c500a1e576a..2ef2d6f5107b5402b85b678125b55e42397158d1 100644
--- a/tests/modules/core/lib/Auth/Process/ScopeAttributeTest.php
+++ b/tests/modules/core/lib/Auth/Process/ScopeAttributeTest.php
@@ -31,7 +31,6 @@ class ScopeAttributeTest extends TestCase
 
     /**
      * Test the most basic functionality.
-     * @return void
      */
     public function testBasic(): void
     {
@@ -55,7 +54,6 @@ class ScopeAttributeTest extends TestCase
 
     /**
      * If target attribute already set, module must add, not overwrite.
-     * @return void
      */
     public function testNoOverwrite(): void
     {
@@ -82,7 +80,6 @@ class ScopeAttributeTest extends TestCase
 
     /**
      * If same scope already set, module must do nothing, not duplicate value.
-     * @return void
      */
     public function testNoDuplication(): void
     {
@@ -106,7 +103,6 @@ class ScopeAttributeTest extends TestCase
 
     /**
      * If source attribute not set, nothing happens
-     * @return void
      */
     public function testNoSourceAttribute(): void
     {
@@ -129,7 +125,6 @@ class ScopeAttributeTest extends TestCase
 
     /**
      * If scope attribute not set, nothing happens
-     * @return void
      */
     public function testNoScopeAttribute(): void
     {
@@ -152,7 +147,6 @@ class ScopeAttributeTest extends TestCase
 
     /**
      * When multiple @ signs in attribute, will use the first one.
-     * @return void
      */
     public function testMultiAt(): void
     {
@@ -175,7 +169,6 @@ class ScopeAttributeTest extends TestCase
 
     /**
      * When multiple values in source attribute, should render multiple targets.
-     * @return void
      */
     public function testMultivaluedSource(): void
     {
@@ -201,7 +194,6 @@ class ScopeAttributeTest extends TestCase
 
     /**
      * When the source attribute doesn't have a scope, the entire value is used.
-     * @return void
      */
     public function testNoAt(): void
     {
@@ -224,7 +216,6 @@ class ScopeAttributeTest extends TestCase
 
     /**
      * When the target attribute exists and onlyIfEmpty is set
-     * @return void
      */
     public function testOnlyIfEmpty(): void
     {
diff --git a/tests/modules/core/lib/Auth/Process/ScopeFromAttributeTest.php b/tests/modules/core/lib/Auth/Process/ScopeFromAttributeTest.php
index 010416d30c32c4a6f4b2fce7738e09fcc5af6a46..0749662aac6bdbc7ed98e7856ac856818c734625 100644
--- a/tests/modules/core/lib/Auth/Process/ScopeFromAttributeTest.php
+++ b/tests/modules/core/lib/Auth/Process/ScopeFromAttributeTest.php
@@ -31,7 +31,6 @@ class ScopeFromAttributeTest extends TestCase
 
     /**
      * Test the most basic functionality.
-     * @return void
      */
     public function testBasic(): void
     {
@@ -53,7 +52,6 @@ class ScopeFromAttributeTest extends TestCase
 
     /**
      * If scope already set, module must not overwrite.
-     * @return void
      */
     public function testNoOverwrite(): void
     {
@@ -75,7 +73,6 @@ class ScopeFromAttributeTest extends TestCase
 
     /**
      * If source attribute not set, nothing happens
-     * @return void
      */
     public function testNoSourceAttribute(): void
     {
@@ -116,7 +113,6 @@ class ScopeFromAttributeTest extends TestCase
 
     /**
      * When the source attribute doesn't have a scope, a warning is emitted
-     * @return void
      */
     public function testNoAt(): void
     {
diff --git a/tests/modules/core/lib/Auth/Process/TargetedIDTest.php b/tests/modules/core/lib/Auth/Process/TargetedIDTest.php
index 2adbddef52d0efd6dee77dac5981203f0e185648..2920d9386d2a744dcafab31d25e786d8b7796760 100644
--- a/tests/modules/core/lib/Auth/Process/TargetedIDTest.php
+++ b/tests/modules/core/lib/Auth/Process/TargetedIDTest.php
@@ -27,7 +27,6 @@ class TargetedIDTest extends TestCase
 
     /**
      * Set up for each test.
-     * @return void
      */
     protected function setUp(): void
     {
@@ -61,7 +60,6 @@ class TargetedIDTest extends TestCase
 
     /**
      * Test the most basic functionality
-     * @return void
      */
     public function testBasic()
     {
@@ -79,7 +77,6 @@ class TargetedIDTest extends TestCase
     /**
      * Test with src and dst entityIds.
      * Make sure to overwrite any present eduPersonTargetedId
-     * @return void
      */
     public function testWithSrcDst()
     {
@@ -109,7 +106,6 @@ class TargetedIDTest extends TestCase
 
     /**
      * Test with nameId config option set.
-     * @return void
      */
     public function testNameIdGeneration()
     {
@@ -154,7 +150,6 @@ class TargetedIDTest extends TestCase
 
     /**
      * Test the outcome to make sure the algorithm remains unchanged
-     * @return void
      */
     public function testOutcome()
     {
@@ -171,7 +166,6 @@ class TargetedIDTest extends TestCase
 
     /**
      * Test the outcome when multiple values are given
-     * @return void
      */
     public function testOutcomeMultipleValues()
     {
@@ -188,7 +182,6 @@ class TargetedIDTest extends TestCase
 
     /**
      * Test that Id is the same for subsequent invocations with same input.
-     * @return void
      */
     public function testIdIsPersistent()
     {
@@ -222,7 +215,6 @@ class TargetedIDTest extends TestCase
 
     /**
      * Test that Id is different for two different usernames and two different sp's
-     * @return void
      */
     public function testIdIsUnique()
     {
@@ -258,7 +250,6 @@ class TargetedIDTest extends TestCase
 
     /**
      * Test no userid set
-     * @return void
      */
     public function testNoUserID(): void
     {
@@ -273,7 +264,6 @@ class TargetedIDTest extends TestCase
 
     /**
      * Test with specified attribute not set
-     * @return void
      */
     public function testAttributeNotExists(): void
     {
@@ -292,7 +282,6 @@ class TargetedIDTest extends TestCase
 
     /**
      * Test with configuration error 1
-     * @return void
      */
     public function testConfigInvalidAttributeName(): void
     {
@@ -311,7 +300,6 @@ class TargetedIDTest extends TestCase
 
     /**
      * Test with configuration error 2
-     * @return void
      */
     public function testConfigInvalidNameId(): void
     {
diff --git a/tests/modules/core/lib/Auth/UserPassBaseTest.php b/tests/modules/core/lib/Auth/UserPassBaseTest.php
index f0b08669acca637586725044d49441813671b5ac..ec8bcbfdf8b4bf8086ef3cb2c258634420934757 100644
--- a/tests/modules/core/lib/Auth/UserPassBaseTest.php
+++ b/tests/modules/core/lib/Auth/UserPassBaseTest.php
@@ -15,7 +15,6 @@ use SimpleSAML\Module\core\Auth\UserPassBase;
 class UserPassBaseTest extends TestCase
 {
     /**
-     * @return void
      */
     public function testAuthenticateECPCallsLoginAndSetsAttributes(): void
     {
@@ -45,7 +44,6 @@ class UserPassBaseTest extends TestCase
 
 
     /**
-     * @return void
      */
     public function testAuthenticateECPMissingUsername(): void
     {
@@ -69,7 +67,6 @@ class UserPassBaseTest extends TestCase
 
 
     /**
-     * @return void
      */
     public function testAuthenticateECPMissingPassword(): void
     {
@@ -93,7 +90,6 @@ class UserPassBaseTest extends TestCase
 
 
     /**
-     * @return void
      */
     public function testAuthenticateECPCallsLoginWithForcedUsername(): void
     {
diff --git a/tests/modules/core/lib/Auth/UserPassOrgBaseTest.php b/tests/modules/core/lib/Auth/UserPassOrgBaseTest.php
index 9c472638baca7b8890b06d3fe06dd93693ae2df5..c3b431bc3db2c9841ded939808865d980faf92f7 100644
--- a/tests/modules/core/lib/Auth/UserPassOrgBaseTest.php
+++ b/tests/modules/core/lib/Auth/UserPassOrgBaseTest.php
@@ -13,7 +13,6 @@ use SimpleSAML\Module\core\Auth\UserPassOrgBase;
 class UserPassOrgBaseTest extends TestCase
 {
     /**
-     * @return void
      */
     public function testRememberOrganizationEnabled(): void
     {
diff --git a/tests/modules/core/lib/Controller/LoginTest.php b/tests/modules/core/lib/Controller/LoginTest.php
index 4d06027a7c4d8d13edb5f14d81194bdee1a5c3f2..bb539a01ad0bbebab83e3a2a4a34f2218a796c66 100644
--- a/tests/modules/core/lib/Controller/LoginTest.php
+++ b/tests/modules/core/lib/Controller/LoginTest.php
@@ -40,7 +40,6 @@ class LoginTest extends ClearStateTestCase
 
     /**
      * Set up for each test.
-     * @return void
      */
     protected function setUp(): void
     {
@@ -71,7 +70,6 @@ class LoginTest extends ClearStateTestCase
     /**
      * Test that authentication is started immediately if we hit the login endpoint and there's only one non-admin
      * source configured.
-     * @return void
      */
     public function testAutomaticLoginWhenOnlyOneSource(): void
     {
@@ -97,7 +95,6 @@ class LoginTest extends ClearStateTestCase
 
     /**
      * Test that the user can choose what auth source to use when there are multiple defined (admin excluded).
-     * @return void
      */
     public function testMultipleAuthSources(): void
     {
@@ -133,7 +130,6 @@ class LoginTest extends ClearStateTestCase
 
     /**
      * Test that specifying an invalid auth source while trying to login raises an exception.
-     * @return void
      */
     public function testLoginWithInvalidAuthSource(): void
     {
@@ -151,7 +147,6 @@ class LoginTest extends ClearStateTestCase
     /**
      * Test that we get redirected to /account/authsource when accessing the login endpoint while being already
      * authenticated.
-     * @return void
      */
     public function testLoginWhenAlreadyAuthenticated(): void
     {
@@ -190,7 +185,6 @@ class LoginTest extends ClearStateTestCase
 
     /**
      * Test that triggering the logout controller actually proceeds to log out from the specified source.
-     * @return void
      */
     public function testLogout(): void
     {
@@ -212,7 +206,6 @@ class LoginTest extends ClearStateTestCase
     /**
      * Test that accessing the "account" endpoint without being authenticated gets you redirected to the "login"
      * endpoint.
-     * @return void
      */
     public function testNotAuthenticated(): void
     {
@@ -233,7 +226,6 @@ class LoginTest extends ClearStateTestCase
 
     /**
      * Test that we are presented with a regular page if we are authenticated and try to access the "account" endpoint.
-     * @return void
      */
     public function testAuthenticated(): void
     {
diff --git a/tests/modules/core/lib/Storage/SQLPermanentStorageTest.php b/tests/modules/core/lib/Storage/SQLPermanentStorageTest.php
index 21d884d5f05dd33dbe0f26ca545e3d36100feeac..204640081490b9fa7b9c634763c38a49119f9d2d 100644
--- a/tests/modules/core/lib/Storage/SQLPermanentStorageTest.php
+++ b/tests/modules/core/lib/Storage/SQLPermanentStorageTest.php
@@ -20,7 +20,6 @@ class SQLPermanentStorageTest extends TestCase
 
 
     /**
-     * @return void
      */
     public static function setUpBeforeClass(): void
     {
@@ -33,7 +32,6 @@ class SQLPermanentStorageTest extends TestCase
 
 
     /**
-     * @return void
      */
     public static function tearDownAfterClass(): void
     {
@@ -43,7 +41,6 @@ class SQLPermanentStorageTest extends TestCase
 
 
     /**
-     * @return void
      */
     public function testSet(): void
     {
@@ -58,7 +55,6 @@ class SQLPermanentStorageTest extends TestCase
 
 
     /**
-     * @return void
      */
     public function testSetOverwrite(): void
     {
@@ -76,7 +72,6 @@ class SQLPermanentStorageTest extends TestCase
 
 
     /**
-     * @return void
      */
     public function testNonexistentKey(): void
     {
@@ -91,7 +86,6 @@ class SQLPermanentStorageTest extends TestCase
 
 
     /**
-     * @return void
      */
     public function testExpiration(): void
     {
@@ -113,7 +107,6 @@ class SQLPermanentStorageTest extends TestCase
 
 
     /**
-     * @return void
      */
     public function testRemove(): void
     {
diff --git a/tests/modules/cron/lib/Controller/CronTest.php b/tests/modules/cron/lib/Controller/CronTest.php
index 637efae13aa7cc599dbb458a7f36fd3a0be32c69..d82da0d8af824838a1a40adcc28feb1fb3c99a23 100644
--- a/tests/modules/cron/lib/Controller/CronTest.php
+++ b/tests/modules/cron/lib/Controller/CronTest.php
@@ -33,7 +33,6 @@ class CronTest extends TestCase
 
     /**
      * Set up for each test.
-     * @return void
      */
     protected function setUp(): void
     {
@@ -75,7 +74,6 @@ class CronTest extends TestCase
 
 
     /**
-     * @return void
      */
     public function testInfo(): void
     {
@@ -90,7 +88,6 @@ class CronTest extends TestCase
 
 
     /**
-     * @return void
      */
     public function testRun(): void
     {
diff --git a/tests/modules/multiauth/lib/Auth/Source/MultiAuthTest.php b/tests/modules/multiauth/lib/Auth/Source/MultiAuthTest.php
index 4862f120f0b48548d32ea7a6c8f77a51967bd8ed..68e72a13ebbfa9ebb0dcd1c0b0f6d02181754ccc 100644
--- a/tests/modules/multiauth/lib/Auth/Source/MultiAuthTest.php
+++ b/tests/modules/multiauth/lib/Auth/Source/MultiAuthTest.php
@@ -23,7 +23,6 @@ class MultiAuthTest extends ClearStateTestCase
 
 
     /**
-     * @return void
      */
     public function setUp(): void
     {
@@ -75,7 +74,6 @@ class MultiAuthTest extends ClearStateTestCase
 
 
     /**
-     * @return void
      */
     public function testSourcesMustBePresent(): void
     {
@@ -94,7 +92,6 @@ class MultiAuthTest extends ClearStateTestCase
 
 
     /**
-     * @return void
      */
     public function testPreselectMustBeValid(): void
     {
@@ -143,7 +140,6 @@ class MultiAuthTest extends ClearStateTestCase
 
 
     /**
-     * @return void
      */
     public function testPreselectIsOptional(): void
     {
@@ -199,7 +195,6 @@ class MultiAuthTest extends ClearStateTestCase
 
 
     /**
-     * @return void
      */
     public function testPreselectCanBeConfigured(): void
     {
@@ -218,7 +213,6 @@ class MultiAuthTest extends ClearStateTestCase
 
 
     /**
-     * @return void
      */
     public function testStatePreselectHasPriority(): void
     {
diff --git a/tests/modules/saml/lib/Auth/Process/FilterScopesTest.php b/tests/modules/saml/lib/Auth/Process/FilterScopesTest.php
index de82c8adbbcfbc82fca203f96260e262357cba83..724eebe57ac0aa6927a05b4581306d7e2bed4f7a 100644
--- a/tests/modules/saml/lib/Auth/Process/FilterScopesTest.php
+++ b/tests/modules/saml/lib/Auth/Process/FilterScopesTest.php
@@ -33,7 +33,6 @@ class FilterScopesTest extends TestCase
 
     /**
      * Test valid scopes.
-     * @return void
      */
     public function testValidScopes(): void
     {
@@ -95,7 +94,6 @@ class FilterScopesTest extends TestCase
 
     /**
      * Test invalid scopes.
-     * @return void
      */
     public function testInvalidScopes(): void
     {
diff --git a/tests/modules/saml/lib/Auth/Process/NameIDAttributeTest.php b/tests/modules/saml/lib/Auth/Process/NameIDAttributeTest.php
index 664071df7ec16dbdfc045020b3ad607cf2f4a905..ba0b5472e546d8da731f9bba4d7860d1ce2273f2 100644
--- a/tests/modules/saml/lib/Auth/Process/NameIDAttributeTest.php
+++ b/tests/modules/saml/lib/Auth/Process/NameIDAttributeTest.php
@@ -36,7 +36,6 @@ class NameIDAttributeTest extends TestCase
 
     /**
      * Test minimal configuration.
-     * @return void
      */
     public function testMinimalConfig(): void
     {
@@ -67,7 +66,6 @@ class NameIDAttributeTest extends TestCase
 
     /**
      * Test custom attribute name.
-     * @return void
      */
     public function testCustomAttributeName(): void
     {
@@ -99,7 +97,6 @@ class NameIDAttributeTest extends TestCase
 
     /**
      * Test custom format.
-     * @return void
      */
     public function testFormat(): void
     {
@@ -129,7 +126,6 @@ class NameIDAttributeTest extends TestCase
 
     /**
      * Test invalid format throws an exception.
-     * @return void
      */
     public function testInvalidFormatThrowsException(): void
     {
@@ -159,7 +155,6 @@ class NameIDAttributeTest extends TestCase
 
     /**
      * Test invalid request silently continues, leaving the state untouched
-     * @return void
      */
     public function testInvalidRequestLeavesStateUntouched(): void
     {
@@ -184,7 +179,6 @@ class NameIDAttributeTest extends TestCase
 
     /**
      * Test custom attribute name with format.
-     * @return void
      */
     public function testCustomAttributeNameAndFormat(): void
     {
@@ -216,7 +210,6 @@ class NameIDAttributeTest extends TestCase
 
     /**
      * Test overriding NameID Format/NameQualifier/SPNameQualifier with defaults.
-     * @return void
      */
     public function testOverrideNameID(): void
     {
diff --git a/tests/modules/saml/lib/Auth/Source/Auth_Source_SP_Test.php b/tests/modules/saml/lib/Auth/Source/Auth_Source_SP_Test.php
index 397482f18b01ea253edb45be013b9f13881edd91..28c3bfca9a0d3f2f35ce3cbf77068da2f07906da 100644
--- a/tests/modules/saml/lib/Auth/Source/Auth_Source_SP_Test.php
+++ b/tests/modules/saml/lib/Auth/Source/Auth_Source_SP_Test.php
@@ -51,7 +51,6 @@ class SPTest extends ClearStateTestCase
 
 
     /**
-     * @return void
      */
     protected function setUp(): void
     {
@@ -124,7 +123,6 @@ class SPTest extends ClearStateTestCase
     /**
      * Test generating an AuthnRequest
      * @test
-     * @return void
      */
     public function testAuthnRequest(): void
     {
@@ -150,7 +148,6 @@ class SPTest extends ClearStateTestCase
     /**
      * Test setting a Subject
      * @test
-     * @return void
      */
     public function testNameID(): void
     {
@@ -185,7 +182,6 @@ class SPTest extends ClearStateTestCase
     /**
      * Test setting an AuthnConextClassRef
      * @test
-     * @return void
      */
     public function testAuthnContextClassRef(): void
     {
@@ -215,7 +211,6 @@ class SPTest extends ClearStateTestCase
     /**
      * Test setting ForcedAuthn
      * @test
-     * @return void
      */
     public function testForcedAuthn(): void
     {
@@ -244,7 +239,6 @@ class SPTest extends ClearStateTestCase
 
     /**
      * Test specifying an IDPList where no metadata found for those idps is an error
-     * @return void
      */
     public function testIdpListWithNoMatchingMetadata(): void
     {
@@ -262,7 +256,6 @@ class SPTest extends ClearStateTestCase
 
     /**
      * Test specifying an IDPList where the list does not overlap with the Idp specified in SP config is an error
-     * @return void
      */
     public function testIdpListWithExplicitIdpNotMatch(): void
     {
@@ -290,7 +283,6 @@ class SPTest extends ClearStateTestCase
 
     /**
      * Test that IDPList overlaps with the IDP specified in SP config results in AuthnRequest
-     * @return void
      */
     public function testIdpListWithExplicitIdpMatch(): void
     {
@@ -332,7 +324,6 @@ class SPTest extends ClearStateTestCase
 
     /**
      * Test that IDPList with a single valid idp and no SP config idp results in AuthnRequest to that idp
-     * @return void
      */
     public function testIdpListWithSingleMatch(): void
     {
@@ -372,7 +363,6 @@ class SPTest extends ClearStateTestCase
 
     /**
      * Test that IDPList with multiple valid idp and no SP config idp results in discovery redirect
-     * @return void
      */
     public function testIdpListWithMultipleMatch(): void
     {
diff --git a/tests/modules/saml/lib/IdP/SAML2Test.php b/tests/modules/saml/lib/IdP/SAML2Test.php
index c0affe8340657e9bbdd553d749dc9bea14215c30..503afddd1034c2c4e1dc5c7155446e45bf04f397 100644
--- a/tests/modules/saml/lib/IdP/SAML2Test.php
+++ b/tests/modules/saml/lib/IdP/SAML2Test.php
@@ -39,7 +39,6 @@ class SAML2Test extends ClearStateTestCase
 
     /**
      * Test that invoking the idp initiated endpoint with the minimum necessary parameters works.
-     * @return void
      */
     public function testIdPInitiatedLoginMinimumParams(): void
     {
@@ -64,7 +63,6 @@ class SAML2Test extends ClearStateTestCase
 
     /**
      * Test that invoking the idp initiated endpoint with the optional parameters works.
-     * @return void
      */
     public function testIdPInitiatedLoginOptionalParams(): void
     {
@@ -99,7 +97,6 @@ class SAML2Test extends ClearStateTestCase
 
     /**
      * Test that invoking the idp initiated endpoint using minimum shib params works
-     * @return void
      */
     public function testIdPInitShibCompatyMinimumParams(): void
     {
@@ -126,7 +123,6 @@ class SAML2Test extends ClearStateTestCase
 
     /**
      * Test that invoking the idp initiated endpoint using minimum shib params works
-     * @return void
      */
     public function testIdPInitShibCompatOptionalParams(): void
     {
diff --git a/tests/modules/saml/lib/IdP/SQLNameIDTest.php b/tests/modules/saml/lib/IdP/SQLNameIDTest.php
index 2a5ae7b407c486b657594485623948becebf05d2..f89e5bbc97161f41c264d20cc00a37c384a3c5d1 100644
--- a/tests/modules/saml/lib/IdP/SQLNameIDTest.php
+++ b/tests/modules/saml/lib/IdP/SQLNameIDTest.php
@@ -22,7 +22,6 @@ class SQLNameIDTest extends TestCase
 {
     /**
      * @param array $config
-     * @return void
      */
     private function addGetDelete(array $config = []): void
     {
@@ -36,7 +35,6 @@ class SQLNameIDTest extends TestCase
     /**
      * Test Store.
      * @test
-     * @return void
      */
     public function testSQLStore(): void
     {
@@ -57,7 +55,6 @@ class SQLNameIDTest extends TestCase
     /**
      * Test incompatible Store.
      * @test
-     * @return void
      */
     public function testIncompatibleStore(): void
     {
@@ -79,7 +76,6 @@ class SQLNameIDTest extends TestCase
     /**
      * Test Database.
      * @test
-     * @return void
      */
     public function testDatabase(): void
     {
@@ -104,7 +100,6 @@ class SQLNameIDTest extends TestCase
     /**
      * @param \SimpleSAML\Configuration|\SimpleSAML\Store $service
      * @param class-string $className
-     * @return void
      */
     protected function clearInstance($service, string $className): void
     {
diff --git a/tests/www/IndexTest.php b/tests/www/IndexTest.php
index 070689829cb11e55ab1baff86d7df7a2ae263f28..62183d57703a56bc40a986210c5c0590e3b41332 100644
--- a/tests/www/IndexTest.php
+++ b/tests/www/IndexTest.php
@@ -39,7 +39,6 @@ class IndexTest extends TestCase
 
     /**
      * The setup method that is run before any tests in this class.
-     * @return void
      */
     protected function setup(): void
     {
@@ -54,7 +53,6 @@ class IndexTest extends TestCase
 
     /**
      * @param array $config
-     * @return void
      */
     protected function updateConfig(array $config): void
     {
@@ -66,7 +64,6 @@ class IndexTest extends TestCase
 
     /**
      * A simple test to make sure the index.php file redirects appropriately to the right URL.
-     * @return void
      */
     public function testRedirection(): void
     {
@@ -113,7 +110,6 @@ class IndexTest extends TestCase
 
     /**
      * The tear down method that is executed after all tests in this class.
-     * @return void
      */
     protected function tearDown(): void
     {