From 0129c26e859493b3a4214f5337691d1afabdc80d Mon Sep 17 00:00:00 2001
From: Tim van Dijen <tvdijen@gmail.com>
Date: Thu, 27 Aug 2020 18:15:29 +0200
Subject: [PATCH] Only use one @covers on the test-class instead of per-method;
 as per phpunit best-practises

---
 tests/lib/SimpleSAML/Auth/SimpleTest.php      |  1 +
 tests/lib/SimpleSAML/Auth/SourceTest.php      |  2 ++
 tests/lib/SimpleSAML/Auth/StateTest.php       |  2 ++
 tests/lib/SimpleSAML/ConfigurationTest.php    |  2 ++
 tests/lib/SimpleSAML/DatabaseTest.php         | 29 ++-----------------
 tests/lib/SimpleSAML/Locale/LanguageTest.php  |  3 ++
 .../SimpleSAML/Locale/LocalizationTest.php    |  3 ++
 tests/lib/SimpleSAML/Locale/TranslateTest.php |  3 ++
 .../Metadata/MetaDataStorageHandlerTest.php   |  3 ++
 .../Metadata/MetaDataStorageSourceTest.php    |  3 +-
 .../SimpleSAML/Metadata/SAMLBuilderTest.php   |  3 +-
 .../SimpleSAML/Metadata/SAMLParserTest.php    |  2 ++
 tests/lib/SimpleSAML/ModuleTest.php           |  3 ++
 .../lib/SimpleSAML/SessionHandlerPHPTest.php  | 12 ++------
 tests/lib/SimpleSAML/SessionTest.php          |  3 ++
 tests/lib/SimpleSAML/Store/RedisTest.php      | 15 +---------
 tests/lib/SimpleSAML/Store/SQLTest.php        | 24 ++-------------
 tests/lib/SimpleSAML/StoreTest.php            |  8 ++---
 tests/lib/SimpleSAML/Utils/ArraysTest.php     |  2 ++
 tests/lib/SimpleSAML/Utils/AttributesTest.php |  1 +
 .../SimpleSAML/Utils/Config/MetadataTest.php  |  2 ++
 tests/lib/SimpleSAML/Utils/ConfigTest.php     |  2 ++
 tests/lib/SimpleSAML/Utils/CryptoTest.php     | 22 ++------------
 tests/lib/SimpleSAML/Utils/EMailTest.php      |  2 ++
 tests/lib/SimpleSAML/Utils/HTTPTest.php       |  7 ++---
 tests/lib/SimpleSAML/Utils/NetTest.php        |  4 +--
 tests/lib/SimpleSAML/Utils/RandomTest.php     |  3 +-
 tests/lib/SimpleSAML/Utils/SystemTest.php     | 15 ++--------
 tests/lib/SimpleSAML/Utils/TimeTest.php       |  6 ++--
 tests/lib/SimpleSAML/Utils/XMLTest.php        | 23 ++-------------
 tests/lib/SimpleSAML/XML/ErrorsTest.php       |  7 ++---
 tests/lib/SimpleSAML/XML/ParserTest.php       | 16 ++--------
 tests/lib/SimpleSAML/XML/SignerTest.php       |  2 ++
 tests/lib/SimpleSAML/XML/ValidatorTest.php    |  2 ++
 .../admin/lib/Controller/ConfigTest.php       |  1 +
 .../admin/lib/Controller/FederationTest.php   |  1 +
 .../modules/admin/lib/Controller/TestTest.php |  1 +
 .../lib/Auth/Process/AttributeAddTest.php     |  2 ++
 .../lib/Auth/Process/AttributeAlterTest.php   |  2 ++
 .../lib/Auth/Process/AttributeCopyTest.php    |  2 ++
 .../lib/Auth/Process/AttributeLimitTest.php   |  2 ++
 .../lib/Auth/Process/AttributeMapTest.php     |  2 ++
 .../Auth/Process/AttributeValueMapTest.php    | 16 ++--------
 .../Auth/Process/CardinalitySingleTest.php    |  2 ++
 .../core/lib/Auth/Process/CardinalityTest.php |  2 ++
 .../modules/core/lib/Auth/Process/PHPTest.php |  2 ++
 .../lib/Auth/Process/ScopeAttributeTest.php   |  2 ++
 .../Auth/Process/ScopeFromAttributeTest.php   |  2 ++
 .../core/lib/Auth/Process/TargetedIDTest.php  |  2 ++
 .../core/lib/Auth/UserPassBaseTest.php        |  3 ++
 .../core/lib/Auth/UserPassOrgBaseTest.php     |  3 ++
 .../modules/core/lib/Controller/LoginTest.php |  1 +
 .../lib/Storage/SQLPermanentStorageTest.php   |  2 ++
 .../modules/cron/lib/Controller/CronTest.php  |  1 +
 .../lib/Auth/Source/MultiAuthTest.php         |  3 ++
 .../lib/Auth/Process/FilterScopesTest.php     |  2 ++
 .../lib/Auth/Process/NameIDAttributeTest.php  |  2 ++
 .../lib/Auth/Source/Auth_Source_SP_Test.php   |  2 ++
 tests/modules/saml/lib/IdP/SAML2Test.php      |  3 ++
 tests/modules/saml/lib/IdP/SQLNameIDTest.php  |  2 ++
 60 files changed, 125 insertions(+), 177 deletions(-)

diff --git a/tests/lib/SimpleSAML/Auth/SimpleTest.php b/tests/lib/SimpleSAML/Auth/SimpleTest.php
index 7acd28041..d2b5e56fb 100644
--- a/tests/lib/SimpleSAML/Auth/SimpleTest.php
+++ b/tests/lib/SimpleSAML/Auth/SimpleTest.php
@@ -12,6 +12,7 @@ use SimpleSAML\Test\Utils\ClearStateTestCase;
 /**
  * Tests for \SimpleSAML\Auth\Simple
  *
+ * @covers \SimpleSAML\Auth\Simple
  */
 class SimpleTest extends ClearStateTestCase
 {
diff --git a/tests/lib/SimpleSAML/Auth/SourceTest.php b/tests/lib/SimpleSAML/Auth/SourceTest.php
index c8d2cdcb0..415d69ae2 100644
--- a/tests/lib/SimpleSAML/Auth/SourceTest.php
+++ b/tests/lib/SimpleSAML/Auth/SourceTest.php
@@ -12,6 +12,8 @@ use SimpleSAML\Test\Utils\TestAuthSourceFactory;
 
 /**
  * Tests for \SimpleSAML\Auth\Source
+ *
+ * @covers \SimpleSAML\Auth\Source
  */
 class SourceTest extends ClearStateTestCase
 {
diff --git a/tests/lib/SimpleSAML/Auth/StateTest.php b/tests/lib/SimpleSAML/Auth/StateTest.php
index 43b153dc0..b89456464 100644
--- a/tests/lib/SimpleSAML/Auth/StateTest.php
+++ b/tests/lib/SimpleSAML/Auth/StateTest.php
@@ -9,6 +9,8 @@ use SimpleSAML\Auth;
 
 /**
  * Tests for \SimpleSAML\Auth\State
+ *
+ * @covers \SimpleSAML\Auth\State
  */
 class StateTest extends TestCase
 {
diff --git a/tests/lib/SimpleSAML/ConfigurationTest.php b/tests/lib/SimpleSAML/ConfigurationTest.php
index 4992c3404..ae07d2a33 100644
--- a/tests/lib/SimpleSAML/ConfigurationTest.php
+++ b/tests/lib/SimpleSAML/ConfigurationTest.php
@@ -12,6 +12,8 @@ use SimpleSAML\Test\Utils\ClearStateTestCase;
 
 /**
  * Tests for \SimpleSAML\Configuration
+ *
+ * @covers \SimpleSAML\Configuration
  */
 class ConfigurationTest extends ClearStateTestCase
 {
diff --git a/tests/lib/SimpleSAML/DatabaseTest.php b/tests/lib/SimpleSAML/DatabaseTest.php
index f9dcf26db..c1251608e 100644
--- a/tests/lib/SimpleSAML/DatabaseTest.php
+++ b/tests/lib/SimpleSAML/DatabaseTest.php
@@ -21,10 +21,11 @@ use SimpleSAML\Database;
  * should be created for test cases to ensure that it will work
  * in an environment.
  *
+ * @covers \SimpleSAML\Database
+ *
  * @author Tyler Antonio, University of Alberta. <tantonio@ualberta.ca>
  * @package SimpleSAMLphp
  */
-
 class DatabaseTest extends TestCase
 {
     /**
@@ -54,10 +55,6 @@ class DatabaseTest extends TestCase
 
 
     /**
-     * @covers SimpleSAML\Database::getInstance
-     * @covers SimpleSAML\Database::generateInstanceId
-     * @covers SimpleSAML\Database::__construct
-     * @covers SimpleSAML\Database::connect
      * @return void
      */
     public function setUp(): void
@@ -81,10 +78,6 @@ class DatabaseTest extends TestCase
 
 
     /**
-     * @covers SimpleSAML\Database::getInstance
-     * @covers SimpleSAML\Database::generateInstanceId
-     * @covers SimpleSAML\Database::__construct
-     * @covers SimpleSAML\Database::connect
      * @test
      * @return void
      */
@@ -106,10 +99,6 @@ class DatabaseTest extends TestCase
 
 
     /**
-     * @covers SimpleSAML\Database::getInstance
-     * @covers SimpleSAML\Database::generateInstanceId
-     * @covers SimpleSAML\Database::__construct
-     * @covers SimpleSAML\Database::connect
      * @test
      * @return void
      */
@@ -175,11 +164,6 @@ class DatabaseTest extends TestCase
 
 
     /**
-     * @covers SimpleSAML\Database::getInstance
-     * @covers SimpleSAML\Database::generateInstanceId
-     * @covers SimpleSAML\Database::__construct
-     * @covers SimpleSAML\Database::connect
-     * @covers SimpleSAML\Database::getSecondary
      * @test
      * @return void
      */
@@ -232,7 +216,6 @@ class DatabaseTest extends TestCase
 
 
     /**
-     * @covers SimpleSAML\Database::applyPrefix
      * @test
      * @return void
      */
@@ -247,10 +230,6 @@ class DatabaseTest extends TestCase
 
 
     /**
-     * @covers SimpleSAML\Database::write
-     * @covers SimpleSAML\Database::read
-     * @covers SimpleSAML\Database::exec
-     * @covers SimpleSAML\Database::query
      * @test
      * @return void
      */
@@ -281,8 +260,6 @@ class DatabaseTest extends TestCase
 
 
     /**
-     * @covers SimpleSAML\Database::read
-     * @covers SimpleSAML\Database::query
      * @test
      * @return void
      */
@@ -297,8 +274,6 @@ class DatabaseTest extends TestCase
 
 
     /**
-     * @covers SimpleSAML\Database::write
-     * @covers SimpleSAML\Database::exec
      * @test
      * @return void
      */
diff --git a/tests/lib/SimpleSAML/Locale/LanguageTest.php b/tests/lib/SimpleSAML/Locale/LanguageTest.php
index 677f95c6f..e6c3da4de 100644
--- a/tests/lib/SimpleSAML/Locale/LanguageTest.php
+++ b/tests/lib/SimpleSAML/Locale/LanguageTest.php
@@ -8,6 +8,9 @@ use PHPUnit\Framework\TestCase;
 use SimpleSAML\Configuration;
 use SimpleSAML\Locale\Language;
 
+/**
+ * @covers \SimpleSAML\Locale\Language
+ */
 class LanguageTest extends TestCase
 {
     /**
diff --git a/tests/lib/SimpleSAML/Locale/LocalizationTest.php b/tests/lib/SimpleSAML/Locale/LocalizationTest.php
index 3ae4de9d7..169bafa0d 100644
--- a/tests/lib/SimpleSAML/Locale/LocalizationTest.php
+++ b/tests/lib/SimpleSAML/Locale/LocalizationTest.php
@@ -8,6 +8,9 @@ use PHPUnit\Framework\TestCase;
 use SimpleSAML\Configuration;
 use SimpleSAML\Locale\Localization;
 
+/**
+ * @covers \SimpleSAML\Locale\Localization
+ */
 class LocalizationTest extends TestCase
 {
     /**
diff --git a/tests/lib/SimpleSAML/Locale/TranslateTest.php b/tests/lib/SimpleSAML/Locale/TranslateTest.php
index f08de6f33..d66d16ea5 100644
--- a/tests/lib/SimpleSAML/Locale/TranslateTest.php
+++ b/tests/lib/SimpleSAML/Locale/TranslateTest.php
@@ -8,6 +8,9 @@ use PHPUnit\Framework\TestCase;
 use SimpleSAML\Configuration;
 use SimpleSAML\Locale\Translate;
 
+/**
+ * @covers \SimpleSAML\Locale\Translate
+ */
 class TranslateTest extends TestCase
 {
     /**
diff --git a/tests/lib/SimpleSAML/Metadata/MetaDataStorageHandlerTest.php b/tests/lib/SimpleSAML/Metadata/MetaDataStorageHandlerTest.php
index 9abc2a59b..2245cd5b8 100644
--- a/tests/lib/SimpleSAML/Metadata/MetaDataStorageHandlerTest.php
+++ b/tests/lib/SimpleSAML/Metadata/MetaDataStorageHandlerTest.php
@@ -8,6 +8,9 @@ use SimpleSAML\Configuration;
 use SimpleSAML\Metadata\MetaDataStorageHandler;
 use SimpleSAML\Test\Utils\ClearStateTestCase;
 
+/**
+ * @covers \SimpleSAML\Metadata\MetadataStorageHandler
+ */
 class MetaDataStorageHandlerTest extends ClearStateTestCase
 {
     /**
diff --git a/tests/lib/SimpleSAML/Metadata/MetaDataStorageSourceTest.php b/tests/lib/SimpleSAML/Metadata/MetaDataStorageSourceTest.php
index 35f33f0d1..9cee1f59d 100644
--- a/tests/lib/SimpleSAML/Metadata/MetaDataStorageSourceTest.php
+++ b/tests/lib/SimpleSAML/Metadata/MetaDataStorageSourceTest.php
@@ -11,8 +11,9 @@ use SimpleSAML\Metadata\MetaDataStorageSource;
 
 /**
  * Class MetaDataStorageSourceTest
+ *
+ * @covers \SimpleSAML\Metadata\MetadataStorageSource
  */
-
 class MetaDataStorageSourceTest extends TestCase
 {
     /**
diff --git a/tests/lib/SimpleSAML/Metadata/SAMLBuilderTest.php b/tests/lib/SimpleSAML/Metadata/SAMLBuilderTest.php
index 105bbb13e..d00003bb6 100644
--- a/tests/lib/SimpleSAML/Metadata/SAMLBuilderTest.php
+++ b/tests/lib/SimpleSAML/Metadata/SAMLBuilderTest.php
@@ -9,8 +9,9 @@ use SimpleSAML\Metadata\SAMLBuilder;
 
 /**
  * Class SAMLBuilderTest
+ *
+ * @covers \SimpleSAML\Metadata\SAMLBuilder
  */
-
 class SAMLBuilderTest extends TestCase
 {
     /**
diff --git a/tests/lib/SimpleSAML/Metadata/SAMLParserTest.php b/tests/lib/SimpleSAML/Metadata/SAMLParserTest.php
index e4867fdb6..8edf64798 100644
--- a/tests/lib/SimpleSAML/Metadata/SAMLParserTest.php
+++ b/tests/lib/SimpleSAML/Metadata/SAMLParserTest.php
@@ -13,6 +13,8 @@ use SimpleSAML\Metadata\SAMLParser;
 
 /**
  * Test SAML parsing
+ *
+ * @covers \SimpleSAML\Metadata\SAMLParser
  */
 class SAMLParserTest extends \SimpleSAML\Test\SigningTestCase
 {
diff --git a/tests/lib/SimpleSAML/ModuleTest.php b/tests/lib/SimpleSAML/ModuleTest.php
index 78f34f457..ce567e509 100644
--- a/tests/lib/SimpleSAML/ModuleTest.php
+++ b/tests/lib/SimpleSAML/ModuleTest.php
@@ -9,6 +9,9 @@ use PHPUnit\Framework\TestCase;
 use SimpleSAML\Configuration;
 use SimpleSAML\Module;
 
+/**
+ * @covers \SimpleSAML\Module
+ */
 class ModuleTest extends TestCase
 {
     /**
diff --git a/tests/lib/SimpleSAML/SessionHandlerPHPTest.php b/tests/lib/SimpleSAML/SessionHandlerPHPTest.php
index 5558e12e6..058e7d24b 100644
--- a/tests/lib/SimpleSAML/SessionHandlerPHPTest.php
+++ b/tests/lib/SimpleSAML/SessionHandlerPHPTest.php
@@ -9,6 +9,9 @@ use SimpleSAML\Test\Utils\ClearStateTestCase;
 use SimpleSAML\SessionHandlerPHP;
 use SimpleSAML\Configuration;
 
+/**
+ * @covers \SimpleSAML\SessionHandlerPHP
+ */
 class SessionHandlerPHPTest extends ClearStateTestCase
 {
     /** @var array */
@@ -49,9 +52,6 @@ class SessionHandlerPHPTest extends ClearStateTestCase
 
 
     /**
-     * @covers SimpleSAML\SessionHandlerPHP::__construct()
-     * @covers SimpleSAML\SessionHandlerPHP::getSessionHandler()
-     * @covers SimpleSAML\SessionHandler::getSessionHandler()
      * @return void
      */
     public function testGetSessionHandler(): void
@@ -63,7 +63,6 @@ class SessionHandlerPHPTest extends ClearStateTestCase
 
 
     /**
-     * @covers SimpleSAML\SessionHandlerPHP::setCookie()
      * @runInSeparateProcess
      * @requires extension xdebug
      * @return void
@@ -88,7 +87,6 @@ class SessionHandlerPHPTest extends ClearStateTestCase
 
 
     /**
-     * @covers SimpleSAML\SessionHandlerPHP::setCookie()
      * @runInSeparateProcess
      * @requires extension xdebug
      * @return void
@@ -110,7 +108,6 @@ class SessionHandlerPHPTest extends ClearStateTestCase
 
 
     /**
-     * @covers SimpleSAML\SessionHandlerPHP::setCookie()
      * @runInSeparateProcess
      * @requires extension xdebug
      * @return void
@@ -132,7 +129,6 @@ class SessionHandlerPHPTest extends ClearStateTestCase
 
 
     /**
-     * @covers SimpleSAML\SessionHandlerPHP::setCookie()
      * @runInSeparateProcess
      * @requires extension xdebug
      * @return void
@@ -154,7 +150,6 @@ class SessionHandlerPHPTest extends ClearStateTestCase
 
 
     /**
-     * @covers SimpleSAML\SessionHandlerPHP::restorePrevious()
      * @runInSeparateProcess
      * @requires extension xdebug
      * @return void
@@ -180,7 +175,6 @@ class SessionHandlerPHPTest extends ClearStateTestCase
 
 
     /**
-     * @covers SimpleSAML\SessionHandlerPHP::newSessionId()
      * @return void
      */
     public function testNewSessionId(): void
diff --git a/tests/lib/SimpleSAML/SessionTest.php b/tests/lib/SimpleSAML/SessionTest.php
index a2abe78ae..07e8ab778 100644
--- a/tests/lib/SimpleSAML/SessionTest.php
+++ b/tests/lib/SimpleSAML/SessionTest.php
@@ -9,6 +9,9 @@ use SimpleSAML\Test\Utils\ClearStateTestCase;
 use SimpleSAML\Session;
 use SimpleSAML\Configuration;
 
+/**
+ * @covers \SimpleSAML\Session
+ */
 class SessionTest extends ClearStateTestCase
 {
     /** @var \SimpleSAML\Session */
diff --git a/tests/lib/SimpleSAML/Store/RedisTest.php b/tests/lib/SimpleSAML/Store/RedisTest.php
index 6041142c2..27b466426 100644
--- a/tests/lib/SimpleSAML/Store/RedisTest.php
+++ b/tests/lib/SimpleSAML/Store/RedisTest.php
@@ -16,6 +16,7 @@ use SimpleSAML\Store;
  * For the full copyright and license information, please view the LICENSE file that was distributed with this source
  * code.
  *
+ * @covers \SimpleSAML\Store\Redis
  * @package simplesamlphp/simplesamlphp
  */
 class RedisTest extends TestCase
@@ -111,8 +112,6 @@ class RedisTest extends TestCase
 
 
     /**
-     * @covers \SimpleSAML\Store::getInstance
-     * @covers \SimpleSAML\Store\Redis::__construct
      * @test
      * @return void
      */
@@ -134,8 +133,6 @@ class RedisTest extends TestCase
 
 
     /**
-     * @covers \SimpleSAML\Store::getInstance
-     * @covers \SimpleSAML\Store\Redis::__construct
      * @test
      * @return void
      */
@@ -158,8 +155,6 @@ class RedisTest extends TestCase
 
 
     /**
-     * @covers \SimpleSAML\Store\Redis::get
-     * @covers \SimpleSAML\Store\Redis::set
      * @test
      * @return void
      */
@@ -176,8 +171,6 @@ class RedisTest extends TestCase
 
 
     /**
-     * @covers \SimpleSAML\Store\Redis::get
-     * @covers \SimpleSAML\Store\Redis::set
      * @test
      * @return void
      */
@@ -194,7 +187,6 @@ class RedisTest extends TestCase
 
 
     /**
-     * @covers \SimpleSAML\Store\Redis::get
      * @test
      * @return void
      */
@@ -207,8 +199,6 @@ class RedisTest extends TestCase
 
 
     /**
-     * @covers \SimpleSAML\Store\Redis::get
-     * @covers \SimpleSAML\Store\Redis::set
      * @test
      * @return void
      */
@@ -227,9 +217,6 @@ class RedisTest extends TestCase
 
 
     /**
-     * @covers \SimpleSAML\Store\Redis::get
-     * @covers \SimpleSAML\Store\Redis::set
-     * @covers \SimpleSAML\Store\Redis::delete
      * @test
      * @return void
      */
diff --git a/tests/lib/SimpleSAML/Store/SQLTest.php b/tests/lib/SimpleSAML/Store/SQLTest.php
index 8dd5f19e5..93fcb5368 100644
--- a/tests/lib/SimpleSAML/Store/SQLTest.php
+++ b/tests/lib/SimpleSAML/Store/SQLTest.php
@@ -15,6 +15,8 @@ use SimpleSAML\Store;
  * For the full copyright and license information, please view the LICENSE file that was distributed with this source
  * code.
  *
+ * @covers \SimpleSAML\Store\SQL
+ *
  * @author Sergio GĂłmez <sergio@uco.es>
  * @package simplesamlphp/simplesamlphp
  */
@@ -34,8 +36,6 @@ class SQLTest extends TestCase
 
 
     /**
-     * @covers \SimpleSAML\Store::getInstance
-     * @covers \SimpleSAML\Store\SQL::__construct
      * @test
      * @return void
      */
@@ -48,8 +48,6 @@ class SQLTest extends TestCase
 
 
     /**
-     * @covers \SimpleSAML\Store\SQL::initTableVersionTable
-     * @covers \SimpleSAML\Store\SQL::initKVTable
      * @test
      * @return void
      */
@@ -65,7 +63,6 @@ class SQLTest extends TestCase
 
 
     /**
-     * @covers \SimpleSAML\Store\SQL::getTableVersion
      * @test
      * @return void
      */
@@ -81,8 +78,6 @@ class SQLTest extends TestCase
 
 
     /**
-     * @covers \SimpleSAML\Store\SQL::setTableVersion
-     * @covers \SimpleSAML\Store\SQL::insertOrUpdate
      * @test
      * @return void
      */
@@ -99,7 +94,6 @@ class SQLTest extends TestCase
 
 
     /**
-     * @covers \SimpleSAML\Store\SQL::get
      * @test
      * @return void
      */
@@ -115,9 +109,6 @@ class SQLTest extends TestCase
 
 
     /**
-     * @covers \SimpleSAML\Store\SQL::get
-     * @covers \SimpleSAML\Store\SQL::set
-     * @covers \SimpleSAML\Store\SQL::insertOrUpdate
      * @test
      * @return void
      */
@@ -134,9 +125,6 @@ class SQLTest extends TestCase
 
 
     /**
-     * @covers \SimpleSAML\Store\SQL::get
-     * @covers \SimpleSAML\Store\SQL::set
-     * @covers \SimpleSAML\Store\SQL::insertOrUpdate
      * @test
      * @return void
      */
@@ -154,10 +142,6 @@ class SQLTest extends TestCase
 
 
     /**
-     * @covers \SimpleSAML\Store\SQL::get
-     * @covers \SimpleSAML\Store\SQL::set
-     * @covers \SimpleSAML\Store\SQL::insertOrUpdate
-     * @covers \SimpleSAML\Store\SQL::delete
      * @test
      * @return void
      */
@@ -175,10 +159,6 @@ class SQLTest extends TestCase
 
 
     /**
-     * @covers \SimpleSAML\Store\SQL::get
-     * @covers \SimpleSAML\Store\SQL::set
-     * @covers \SimpleSAML\Store\SQL::insertOrUpdate
-     * @covers \SimpleSAML\Store\SQL::delete
      * @test
      * @return void
      */
diff --git a/tests/lib/SimpleSAML/StoreTest.php b/tests/lib/SimpleSAML/StoreTest.php
index 7417b53b8..e04bc23d7 100644
--- a/tests/lib/SimpleSAML/StoreTest.php
+++ b/tests/lib/SimpleSAML/StoreTest.php
@@ -16,13 +16,14 @@ use SimpleSAML\Store;
  * For the full copyright and license information, please view the LICENSE file that was
  * distributed with this source code.
  *
+ * @covers \SimpleSAML\Store
+ *
  * @author Sergio GĂłmez <sergio@uco.es>
  * @package simplesamlphp/simplesamlphp
  */
 class StoreTest extends TestCase
 {
     /**
-     * @covers \SimpleSAML\Store::getInstance
      * @test
      * @return void
      */
@@ -38,7 +39,6 @@ class StoreTest extends TestCase
 
 
     /**
-     * @covers \SimpleSAML\Store::getInstance
      * @test
      * @return void
      */
@@ -54,7 +54,6 @@ class StoreTest extends TestCase
 
 
     /**
-     * @covers \SimpleSAML\Store::getInstance
      * @test
      * @return void
      */
@@ -71,7 +70,6 @@ class StoreTest extends TestCase
 
 
     /**
-     * @covers \SimpleSAML\Store::getInstance
      * @test
      * @return void
      */
@@ -90,7 +88,6 @@ class StoreTest extends TestCase
 
 
     /**
-     * @covers \SimpleSAML\Store::getInstance
      * @test
      * @return void
      */
@@ -109,7 +106,6 @@ class StoreTest extends TestCase
 
 
     /**
-     * @covers \SimpleSAML\Store::getInstance
      * @test
      * @return void
      */
diff --git a/tests/lib/SimpleSAML/Utils/ArraysTest.php b/tests/lib/SimpleSAML/Utils/ArraysTest.php
index b56537700..4dbaebeec 100644
--- a/tests/lib/SimpleSAML/Utils/ArraysTest.php
+++ b/tests/lib/SimpleSAML/Utils/ArraysTest.php
@@ -9,6 +9,8 @@ use SimpleSAML\Utils\Arrays;
 
 /**
  * Tests for SimpleSAML\Utils\Arrays.
+ *
+ * @covers \SimpleSAML\Utils\Arrays
  */
 class ArraysTest extends TestCase
 {
diff --git a/tests/lib/SimpleSAML/Utils/AttributesTest.php b/tests/lib/SimpleSAML/Utils/AttributesTest.php
index 74f3f8bb0..63b4f5b7e 100644
--- a/tests/lib/SimpleSAML/Utils/AttributesTest.php
+++ b/tests/lib/SimpleSAML/Utils/AttributesTest.php
@@ -12,6 +12,7 @@ use SimpleSAML\Utils\Attributes;
 /**
  * Tests for SimpleSAML\Utils\Attributes.
  *
+ * @covers \SimpleSAML\Utils\Attributes
  * @author Jaime Perez, UNINETT AS <jaime.perez@uninett.no>
  */
 class AttributesTest extends TestCase
diff --git a/tests/lib/SimpleSAML/Utils/Config/MetadataTest.php b/tests/lib/SimpleSAML/Utils/Config/MetadataTest.php
index f8480392c..db198ef8f 100644
--- a/tests/lib/SimpleSAML/Utils/Config/MetadataTest.php
+++ b/tests/lib/SimpleSAML/Utils/Config/MetadataTest.php
@@ -13,6 +13,8 @@ use TypeError;
 
 /**
  * Tests related to SAML metadata.
+ *
+ * @covers \SimpleSAML\Utils\Config
  */
 class MetadataTest extends TestCase
 {
diff --git a/tests/lib/SimpleSAML/Utils/ConfigTest.php b/tests/lib/SimpleSAML/Utils/ConfigTest.php
index bc7585a27..6f683b4a9 100644
--- a/tests/lib/SimpleSAML/Utils/ConfigTest.php
+++ b/tests/lib/SimpleSAML/Utils/ConfigTest.php
@@ -10,6 +10,8 @@ use SimpleSAML\Utils\Config;
 
 /**
  * Tests for SimpleSAML\Utils\Config
+ *
+ * @covers \SimpleSAML\Utils\Config
  */
 class ConfigTest extends TestCase
 {
diff --git a/tests/lib/SimpleSAML/Utils/CryptoTest.php b/tests/lib/SimpleSAML/Utils/CryptoTest.php
index d2cc235c5..04346750e 100644
--- a/tests/lib/SimpleSAML/Utils/CryptoTest.php
+++ b/tests/lib/SimpleSAML/Utils/CryptoTest.php
@@ -13,6 +13,8 @@ use SimpleSAML\Utils\Crypto;
 
 /**
  * Tests for SimpleSAML\Utils\Crypto.
+ *
+ * @covers \SimpleSAML\Utils\Crypto
  */
 class CryptoTest extends TestCase
 {
@@ -51,7 +53,6 @@ class CryptoTest extends TestCase
      * Test that aesDecrypt() works properly, being able to decrypt some previously known (and correct)
      * ciphertext.
      *
-     * @covers \SimpleSAML\Utils\Crypto::aesDecrypt
      * @return void
      */
     public function testAesDecrypt(): void
@@ -74,8 +75,6 @@ class CryptoTest extends TestCase
     /**
      * Test that aesEncrypt() produces ciphertexts that aesDecrypt() can decrypt.
      *
-     * @covers \SimpleSAML\Utils\Crypto::aesDecrypt
-     * @covers \SimpleSAML\Utils\Crypto::aesEncrypt
      * @return void
      */
     public function testAesEncrypt(): void
@@ -100,8 +99,6 @@ class CryptoTest extends TestCase
     /**
      * Test that the pem2der() and der2pem() methods work correctly.
      *
-     * @covers \SimpleSAML\Utils\Crypto::der2pem
-     * @covers \SimpleSAML\Utils\Crypto::pem2der
      * @return void
      */
     public function testFormatConversion(): void
@@ -147,7 +144,6 @@ PHP;
 
 
     /**
-     * @covers \SimpleSAML\Utils\Crypto::pwValid
      * @return void
      */
     public function testGoodPwValid(): void
@@ -162,7 +158,6 @@ PHP;
 
 
     /**
-     * @covers \SimpleSAML\Utils\Crypto::pwValid
      * @return void
      */
     public function testBadPwInvalid(): void
@@ -178,7 +173,6 @@ PHP;
 
 
     /**
-     * @covers \SimpleSAML\Utils\Crypto::secureCompare
      * @return void
      */
     public function testSecureCompareEqual(): void
@@ -190,7 +184,6 @@ PHP;
 
 
     /**
-     * @covers \SimpleSAML\Utils\Crypto::secureCompare
      * @return void
      */
     public function testSecureCompareNotEqual(): void
@@ -202,7 +195,6 @@ PHP;
 
 
     /**
-     * @covers \SimpleSAML\Utils\Crypto::loadPrivateKey
      * @return void
      */
     public function testLoadPrivateKeyRequiredMetadataMissing(): void
@@ -216,7 +208,6 @@ PHP;
 
 
     /**
-     * @covers \SimpleSAML\Utils\Crypto::loadPrivateKey
      * @return void
      */
     public function testLoadPrivateKeyNotRequiredMetadataMissing(): void
@@ -231,7 +222,6 @@ PHP;
 
 
     /**
-     * @covers \SimpleSAML\Utils\Crypto::loadPrivateKey
      * @return void
      */
     public function testLoadPrivateKeyMissingFile(): void
@@ -244,7 +234,6 @@ PHP;
 
 
     /**
-     * @covers \SimpleSAML\Utils\Crypto::loadPrivateKey
      * @return void
      */
     public function testLoadPrivateKeyBasic(): void
@@ -264,7 +253,6 @@ PHP;
 
 
     /**
-     * @covers \SimpleSAML\Utils\Crypto::loadPrivateKey
      * @return void
      */
     public function testLoadPrivateKeyPassword(): void
@@ -291,7 +279,6 @@ PHP;
 
 
     /**
-     * @covers \SimpleSAML\Utils\Crypto::loadPrivateKey
      * @return void
      */
     public function testLoadPrivateKeyPrefix(): void
@@ -319,7 +306,6 @@ PHP;
 
 
     /**
-     * @covers \SimpleSAML\Utils\Crypto::loadPublicKey
      * @return void
      */
     public function testLoadPublicKeyRequiredMetadataMissing(): void
@@ -333,7 +319,6 @@ PHP;
 
 
     /**
-     * @covers \SimpleSAML\Utils\Crypto::loadPublicKey
      * @return void
      */
     public function testLoadPublicKeyNotRequiredMetadataMissing(): void
@@ -348,7 +333,6 @@ PHP;
 
 
     /**
-     * @covers \SimpleSAML\Utils\Crypto::loadPublicKey
      * @return void
      */
     public function testLoadPublicKeyNotX509Certificate(): void
@@ -373,7 +357,6 @@ PHP;
 
 
     /**
-     * @covers \SimpleSAML\Utils\Crypto::loadPublicKey
      * @return void
      */
     public function testLoadPublicKeyNotSigning(): void
@@ -398,7 +381,6 @@ PHP;
 
 
     /**
-     * @covers \SimpleSAML\Utils\Crypto::loadPublicKey
      * @return void
      */
     public function testLoadPublicKeyBasic(): void
diff --git a/tests/lib/SimpleSAML/Utils/EMailTest.php b/tests/lib/SimpleSAML/Utils/EMailTest.php
index e775c05d8..fcaa4d8ab 100644
--- a/tests/lib/SimpleSAML/Utils/EMailTest.php
+++ b/tests/lib/SimpleSAML/Utils/EMailTest.php
@@ -12,6 +12,8 @@ use SimpleSAML\Utils\EMail;
 
 /**
  * A base SSP test case that tests some simple e-mail related calls
+ *
+ * @covers \SimpleSAML\Utils\EMail
  */
 class EMailTest extends ClearStateTestCase
 {
diff --git a/tests/lib/SimpleSAML/Utils/HTTPTest.php b/tests/lib/SimpleSAML/Utils/HTTPTest.php
index 0b497123e..17e8004a7 100644
--- a/tests/lib/SimpleSAML/Utils/HTTPTest.php
+++ b/tests/lib/SimpleSAML/Utils/HTTPTest.php
@@ -10,6 +10,9 @@ use SimpleSAML\Error;
 use SimpleSAML\Test\Utils\ClearStateTestCase;
 use SimpleSAML\Utils\HTTP;
 
+/**
+ * @covers \SimpleSAML\Utils\HTTP
+ */
 class HTTPTest extends ClearStateTestCase
 {
     /**
@@ -427,7 +430,6 @@ class HTTPTest extends ClearStateTestCase
 
 
     /**
-     * @covers SimpleSAML\Utils\HTTP::getFirstPathElement()
      * @return void
      */
     public function testGetFirstPathElement(): void
@@ -441,7 +443,6 @@ class HTTPTest extends ClearStateTestCase
 
 
     /**
-     * @covers SimpleSAML\Utils\HTTP::setCookie()
      * @runInSeparateProcess
      * @requires extension xdebug
      * @return void
@@ -502,7 +503,6 @@ class HTTPTest extends ClearStateTestCase
 
 
     /**
-     * @covers SimpleSAML\Utils\HTTP::setCookie()
      * @return void
      */
     public function testSetCookieInsecure(): void
@@ -523,7 +523,6 @@ class HTTPTest extends ClearStateTestCase
 
 
     /**
-     * @covers SimpleSAML\Utils\HTTP::setCookie()
      * @runInSeparateProcess
      * @requires extension xdebug
      * @return void
diff --git a/tests/lib/SimpleSAML/Utils/NetTest.php b/tests/lib/SimpleSAML/Utils/NetTest.php
index fcacbc18f..ded9ff93e 100644
--- a/tests/lib/SimpleSAML/Utils/NetTest.php
+++ b/tests/lib/SimpleSAML/Utils/NetTest.php
@@ -9,13 +9,14 @@ use SimpleSAML\Utils\Net;
 
 /**
  * Tests for SimpleSAML\Utils\Test.
+ *
+ * @covers \SimpleSAML\Utils\Net
  */
 class NetTest extends TestCase
 {
     /**
      * Test the function that checks for IPs belonging to a CIDR.
      *
-     * @covers SimpleSAML\Utils\Net::ipCIDRcheck
      * @return void
      */
     public function testIpCIDRcheck(): void
@@ -51,7 +52,6 @@ class NetTest extends TestCase
     /**
      * Test IPv6 support in SimpleSAML\Utils\Net::ipCIDRcheck.
      *
-     * @covers 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 d059e5cf8..8e204a2db 100644
--- a/tests/lib/SimpleSAML/Utils/RandomTest.php
+++ b/tests/lib/SimpleSAML/Utils/RandomTest.php
@@ -9,13 +9,14 @@ use SimpleSAML\Utils\Random;
 
 /**
  * Tests for SimpleSAML\Utils\Random.
+ *
+ * @covers \SimpleSAML\Utils\Random
  */
 class RandomTest extends TestCase
 {
     /**
      * Test for SimpleSAML\Utils\Random::generateID().
      *
-     * @covers 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 ab10c1c71..3bd361984 100644
--- a/tests/lib/SimpleSAML/Utils/SystemTest.php
+++ b/tests/lib/SimpleSAML/Utils/SystemTest.php
@@ -14,6 +14,8 @@ use SimpleSAML\Utils\System;
 
 /**
  * Tests for SimpleSAML\Utils\System.
+ *
+ * @covers \SimpleSAML\Utils\Random
  */
 class SystemTest extends TestCase
 {
@@ -45,7 +47,6 @@ class SystemTest extends TestCase
 
 
     /**
-     * @covers \SimpleSAML\Utils\System::getOS
      * @test
      * @return void
      */
@@ -58,7 +59,6 @@ class SystemTest extends TestCase
 
 
     /**
-     * @covers \SimpleSAML\Utils\System::resolvePath
      * @test
      * @return void
      */
@@ -75,7 +75,6 @@ class SystemTest extends TestCase
 
 
     /**
-     * @covers \SimpleSAML\Utils\System::resolvePath
      * @test
      * @return void
      */
@@ -92,7 +91,6 @@ class SystemTest extends TestCase
 
 
     /**
-     * @covers \SimpleSAML\Utils\System::resolvePath
      * @test
      * @return void
      */
@@ -109,7 +107,6 @@ class SystemTest extends TestCase
 
 
     /**
-     * @covers \SimpleSAML\Utils\System::resolvePath
      * @test
      * @return void
      */
@@ -126,7 +123,6 @@ class SystemTest extends TestCase
 
 
     /**
-     * @covers \SimpleSAML\Utils\System::resolvePath
      * @test
      * @return void
      */
@@ -143,7 +139,6 @@ class SystemTest extends TestCase
 
 
     /**
-     * @covers \SimpleSAML\Utils\System::resolvePath
      * @test
      * @return void
      */
@@ -160,7 +155,6 @@ class SystemTest extends TestCase
 
 
     /**
-     * @covers \SimpleSAML\Utils\System::writeFile
      * @test
      * @return void
      */
@@ -180,7 +174,6 @@ class SystemTest extends TestCase
 
 
     /**
-     * @covers \SimpleSAML\Utils\System::writeFile
      * @test
      * @return void
      */
@@ -204,7 +197,6 @@ class SystemTest extends TestCase
 
 
     /**
-     * @covers \SimpleSAML\Utils\System::writeFile
      * @test
      * @return void
      */
@@ -228,7 +220,6 @@ class SystemTest extends TestCase
 
 
     /**
-     * @covers \SimpleSAML\Utils\System::getTempDir
      * @test
      * @return void
      */
@@ -248,7 +239,6 @@ class SystemTest extends TestCase
 
 
     /**
-     * @covers \SimpleSAML\Utils\System::getTempDir
      * @test
      * @return void
      */
@@ -268,7 +258,6 @@ class SystemTest extends TestCase
 
 
     /**
-     * @covers \SimpleSAML\Utils\System::getTempDir
      * @test
      * @return void
      */
diff --git a/tests/lib/SimpleSAML/Utils/TimeTest.php b/tests/lib/SimpleSAML/Utils/TimeTest.php
index 9a12a3b12..00e1a7c15 100644
--- a/tests/lib/SimpleSAML/Utils/TimeTest.php
+++ b/tests/lib/SimpleSAML/Utils/TimeTest.php
@@ -11,12 +11,14 @@ use SimpleSAML\Configuration;
 use SimpleSAML\Error;
 use SimpleSAML\Utils\Time;
 
+/**
+ * @covers \SimpleSAML\Utils\Time
+ */
 class TimeTest extends TestCase
 {
     /**
      * Test the SimpleSAML\Utils\Time::generateTimestamp() method.
      *
-     * @covers SimpleSAML\Utils\Time::generateTimestamp
      * @return void
      */
     public function testGenerateTimestamp(): void
@@ -32,7 +34,6 @@ class TimeTest extends TestCase
     /**
      * Test the SimpleSAML\Utils\Time::initTimezone() method.
      *
-     * @covers SimpleSAML\Utils\Time::initTimezone
      * @return void
      */
     public function testInitTimezone(): void
@@ -77,7 +78,6 @@ class TimeTest extends TestCase
     /**
      * Test the SimpleSAML\Utils\Time::parseDuration() method.
      *
-     * @covers SimpleSAML\Utils\Time::parseDuration
      * @return void
      */
     public function testParseDuration(): void
diff --git a/tests/lib/SimpleSAML/Utils/XMLTest.php b/tests/lib/SimpleSAML/Utils/XMLTest.php
index b0a6e5b41..c41ae9a1a 100644
--- a/tests/lib/SimpleSAML/Utils/XMLTest.php
+++ b/tests/lib/SimpleSAML/Utils/XMLTest.php
@@ -17,13 +17,14 @@ use SimpleSAML\Utils\XML;
 
 /**
  * Tests for SimpleSAML\Utils\XML.
+ *
+ * @covers \SimpleSAML\Utils\XML
  */
 class XMLTest extends TestCase
 {
     private const FRAMEWORK = 'vendor/simplesamlphp/simplesamlphp-test-framework';
 
     /**
-     * @covers \SimpleSAML\Utils\XML::isDOMNodeOfType
      * @test
      * @return void
      */
@@ -40,7 +41,6 @@ class XMLTest extends TestCase
 
 
     /**
-     * @covers \SimpleSAML\Utils\XML::isDOMNodeOfType
      * @test
      * @return void
      */
@@ -56,7 +56,6 @@ class XMLTest extends TestCase
 
 
     /**
-     * @covers \SimpleSAML\Utils\XML::isDOMNodeOfType
      * @test
      * @return void
      */
@@ -73,7 +72,6 @@ class XMLTest extends TestCase
 
 
     /**
-     * @covers \SimpleSAML\Utils\XML::isDOMNodeOfType
      * @test
      * @return void
      */
@@ -91,7 +89,6 @@ class XMLTest extends TestCase
 
 
     /**
-     * @covers \SimpleSAML\Utils\XML::isDOMNodeOfType
      * @test
      * @return void
      */
@@ -109,7 +106,6 @@ class XMLTest extends TestCase
 
 
     /**
-     * @covers \SimpleSAML\Utils\XML::isDOMNodeOfType
      * @test
      * @return void
      */
@@ -127,7 +123,6 @@ class XMLTest extends TestCase
 
 
     /**
-     * @covers \SimpleSAML\Utils\XML::getDOMText
      * @test
      * @return void
      */
@@ -146,7 +141,6 @@ class XMLTest extends TestCase
 
 
     /**
-     * @covers \SimpleSAML\Utils\XML::getDOMText
      * @test
      * @return void
      */
@@ -167,7 +161,6 @@ class XMLTest extends TestCase
 
 
     /**
-     * @covers \SimpleSAML\Utils\XML::getDOMText
      * @test
      * @return void
      */
@@ -183,7 +176,6 @@ class XMLTest extends TestCase
 
 
     /**
-     * @covers \SimpleSAML\Utils\XML::getDOMChildren
      * @test
      * @return void
      */
@@ -203,7 +195,6 @@ class XMLTest extends TestCase
 
 
     /**
-     * @covers \SimpleSAML\Utils\XML::getDOMChildren
      * @test
      * @return void
      */
@@ -222,7 +213,6 @@ class XMLTest extends TestCase
 
 
     /**
-     * @covers \SimpleSAML\Utils\XML::getDOMChildren
      * @test
      * @return void
      */
@@ -242,7 +232,6 @@ class XMLTest extends TestCase
 
 
     /**
-     * @covers \SimpleSAML\Utils\XML::formatDOMElement
      * @test
      * @return void
      */
@@ -266,7 +255,6 @@ NOWDOC;
 
 
     /**
-     * @covers \SimpleSAML\Utils\XML::formatDOMElement
      * @test
      * @return void
      */
@@ -294,7 +282,6 @@ NOWDOC;
 
 
     /**
-     * @covers \SimpleSAML\Utils\XML::formatDOMElement
      * @test
      * @return void
      */
@@ -323,7 +310,6 @@ HEREDOC;
 
 
     /**
-     * @covers \SimpleSAML\Utils\XML::formatDOMElement
      * @test
      * @return void
      */
@@ -348,7 +334,6 @@ HEREDOC;
 
 
     /**
-     * @covers \SimpleSAML\Utils\XML::formatXMLString
      * @test
      * @return void
      */
@@ -368,7 +353,6 @@ NOWDOC;
 
 
     /**
-     * @covers \SimpleSAML\Utils\XML::formatXMLString
      * @test
      * @return void
      */
@@ -382,7 +366,6 @@ NOWDOC;
 
 
     /**
-     * @covers \SimpleSAML\Utils\XML::isValid
      * @test
      * @return void
      */
@@ -399,7 +382,6 @@ NOWDOC;
 
 
     /**
-     * @covers \SimpleSAML\Utils\XML::isValid
      * @return void
      */
     public function testIsValidMetadata(): void
@@ -415,7 +397,6 @@ NOWDOC;
     }
 
     /**
-     * @covers \SimpleSAML\Utils\XML::checkSAMLMessage()
      * @return void
      */
     public function testCheckSAMLMessageInvalidType(): void
diff --git a/tests/lib/SimpleSAML/XML/ErrorsTest.php b/tests/lib/SimpleSAML/XML/ErrorsTest.php
index 38d49317b..2a6c2e8c7 100644
--- a/tests/lib/SimpleSAML/XML/ErrorsTest.php
+++ b/tests/lib/SimpleSAML/XML/ErrorsTest.php
@@ -14,15 +14,14 @@ use SimpleSAML\XML\Errors;
  * For the full copyright and license information, please view the LICENSE file that was distributed with this source
  * code.
  *
+ * @covers \SimpleSAML\XML\Errors
+ *
  * @author Sergio GĂłmez <sergio@uco.es>
  * @package simplesamlphp/simplesamlphp
  */
 class ErrorsTest extends TestCase
 {
     /**
-     * @covers \SimpleSAML\XML\Errors::begin
-     * @covers \SimpleSAML\XML\Errors::addErrors
-     * @covers \SimpleSAML\XML\Errors::end
      * @test
      * @return void
      */
@@ -42,8 +41,6 @@ class ErrorsTest extends TestCase
 
 
     /**
-     * @covers \SimpleSAML\XML\Errors::formatError
-     * @covers \SimpleSAML\XML\Errors::formatErrors
      * @test
      * @return void
      */
diff --git a/tests/lib/SimpleSAML/XML/ParserTest.php b/tests/lib/SimpleSAML/XML/ParserTest.php
index baac66222..accc6c3c0 100644
--- a/tests/lib/SimpleSAML/XML/ParserTest.php
+++ b/tests/lib/SimpleSAML/XML/ParserTest.php
@@ -15,6 +15,8 @@ use SimpleSAML\XML\Parser;
  *
  * For the full copyright and license information, please view the LICENSE
  * file that was distributed with this source code.
+ *
+ * @covers \SimpleSAML\XML\Parser
  */
 class ParserTest extends TestCase
 {
@@ -39,8 +41,6 @@ XML;
 
 
     /**
-     * @covers \SimpleSAML\XML\Parser::getValue
-     * @covers \SimpleSAML\XML\Parser::__construct
      * @test
      * @return void
      */
@@ -55,8 +55,6 @@ XML;
 
 
     /**
-     * @covers \SimpleSAML\XML\Parser::getValue
-     * @covers \SimpleSAML\XML\Parser::__construct
      * @test
      * @return void
      */
@@ -71,8 +69,6 @@ XML;
 
 
     /**
-     * @covers \SimpleSAML\XML\Parser::getValue
-     * @covers \SimpleSAML\XML\Parser::__construct
      * @test
      * @return void
      */
@@ -84,8 +80,6 @@ XML;
 
 
     /**
-     * @covers \SimpleSAML\XML\Parser::getValueDefault
-     * @covers \SimpleSAML\XML\Parser::__construct
      * @test
      * @return void
      */
@@ -100,8 +94,6 @@ XML;
 
 
     /**
-     * @covers \SimpleSAML\XML\Parser::getValueAlternatives
-     * @covers \SimpleSAML\XML\Parser::__construct
      * @test
      * @return void
      */
@@ -123,8 +115,6 @@ XML;
 
 
     /**
-     * @covers \SimpleSAML\XML\Parser::getValueAlternatives
-     * @covers \SimpleSAML\XML\Parser::__construct
      * @test
      * @return void
      */
@@ -146,8 +136,6 @@ XML;
 
 
     /**
-     * @covers \SimpleSAML\XML\Parser::getValueAlternatives
-     * @covers \SimpleSAML\XML\Parser::__construct
      * @test
      * @return void
      */
diff --git a/tests/lib/SimpleSAML/XML/SignerTest.php b/tests/lib/SimpleSAML/XML/SignerTest.php
index 57535821d..2b6463fc1 100644
--- a/tests/lib/SimpleSAML/XML/SignerTest.php
+++ b/tests/lib/SimpleSAML/XML/SignerTest.php
@@ -16,6 +16,8 @@ use SimpleSAML\XML\Signer;
 
 /**
  * Tests for SimpleSAML\XML\Signer.
+ *
+ * @covers \SimpleSAML\XML\Signer
  */
 class SignerTest extends SigningTestCase
 {
diff --git a/tests/lib/SimpleSAML/XML/ValidatorTest.php b/tests/lib/SimpleSAML/XML/ValidatorTest.php
index 331b55931..f79a647ef 100644
--- a/tests/lib/SimpleSAML/XML/ValidatorTest.php
+++ b/tests/lib/SimpleSAML/XML/ValidatorTest.php
@@ -15,6 +15,8 @@ use SimpleSAML\XML\Validator;
 
 /**
  * Tests for SimpleSAML\XML\Validator.
+ *
+ * @covers \SimpleSAML\XML\Validator
  */
 class ValidatorTest extends SigningTestCase
 {
diff --git a/tests/modules/admin/lib/Controller/ConfigTest.php b/tests/modules/admin/lib/Controller/ConfigTest.php
index 67611e0f6..422a685b2 100644
--- a/tests/modules/admin/lib/Controller/ConfigTest.php
+++ b/tests/modules/admin/lib/Controller/ConfigTest.php
@@ -17,6 +17,7 @@ use Symfony\Component\HttpFoundation\Response;
 /**
  * Set of tests for the controllers in the "admin" module.
  *
+ * @covers \SimpleSAML\Module\admin\Controller\Config
  * @package SimpleSAML\Test
  */
 class ConfigTest extends TestCase
diff --git a/tests/modules/admin/lib/Controller/FederationTest.php b/tests/modules/admin/lib/Controller/FederationTest.php
index 761318f83..c4acde34b 100644
--- a/tests/modules/admin/lib/Controller/FederationTest.php
+++ b/tests/modules/admin/lib/Controller/FederationTest.php
@@ -21,6 +21,7 @@ use Symfony\Component\HttpFoundation\File\UploadedFile;
 /**
  * Set of tests for the controllers in the "admin" module.
  *
+ * @covers \SimpleSAML\Module\admin\Controller\Federation
  * @package SimpleSAML\Test
  */
 class FederationTest extends TestCase
diff --git a/tests/modules/admin/lib/Controller/TestTest.php b/tests/modules/admin/lib/Controller/TestTest.php
index b509f78c4..881abe700 100644
--- a/tests/modules/admin/lib/Controller/TestTest.php
+++ b/tests/modules/admin/lib/Controller/TestTest.php
@@ -20,6 +20,7 @@ use Symfony\Component\HttpFoundation\Response;
 /**
  * Set of tests for the controllers in the "admin" module.
  *
+ * @covers \SimpleSAML\Module\admin\Controller\Test
  * @package SimpleSAML\Test
  */
 class TestTest extends TestCase
diff --git a/tests/modules/core/lib/Auth/Process/AttributeAddTest.php b/tests/modules/core/lib/Auth/Process/AttributeAddTest.php
index 3e40c73e4..3c91e2e6f 100644
--- a/tests/modules/core/lib/Auth/Process/AttributeAddTest.php
+++ b/tests/modules/core/lib/Auth/Process/AttributeAddTest.php
@@ -10,6 +10,8 @@ use SimpleSAML\Module\core\Auth\Process\AttributeAdd;
 
 /**
  * Test for the core:AttributeAdd filter.
+ *
+ * @covers \SimpleSAML\Module\core\Auth\Process\AttributeAdd
  */
 class AttributeAddTest extends TestCase
 {
diff --git a/tests/modules/core/lib/Auth/Process/AttributeAlterTest.php b/tests/modules/core/lib/Auth/Process/AttributeAlterTest.php
index 72de230ca..d81ca84cc 100644
--- a/tests/modules/core/lib/Auth/Process/AttributeAlterTest.php
+++ b/tests/modules/core/lib/Auth/Process/AttributeAlterTest.php
@@ -10,6 +10,8 @@ use SimpleSAML\Module\core\Auth\Process\AttributeAlter;
 
 /**
  * Test for the core:AttributeAlter filter.
+ *
+ * @covers \SimpleSAML\Module\core\Auth\Process\AttributeAlter
  */
 class AttributeAlterTest extends TestCase
 {
diff --git a/tests/modules/core/lib/Auth/Process/AttributeCopyTest.php b/tests/modules/core/lib/Auth/Process/AttributeCopyTest.php
index 81a2da1c7..ea0323ca5 100644
--- a/tests/modules/core/lib/Auth/Process/AttributeCopyTest.php
+++ b/tests/modules/core/lib/Auth/Process/AttributeCopyTest.php
@@ -10,6 +10,8 @@ use SimpleSAML\Module\core\Auth\Process\AttributeCopy;
 
 /**
  * Test for the core:AttributeCopy filter.
+ *
+ * @covers \SimpleSAML\Module\core\Auth\Process\AttributeCopy
  */
 class AttributeCopyTest extends TestCase
 {
diff --git a/tests/modules/core/lib/Auth/Process/AttributeLimitTest.php b/tests/modules/core/lib/Auth/Process/AttributeLimitTest.php
index d5453c0d9..9878ba8b2 100644
--- a/tests/modules/core/lib/Auth/Process/AttributeLimitTest.php
+++ b/tests/modules/core/lib/Auth/Process/AttributeLimitTest.php
@@ -11,6 +11,8 @@ use SimpleSAML\Module\core\Auth\Process\AttributeLimit;
 
 /**
  * Test for the core:AttributeLimit filter.
+ *
+ * @covers \SimpleSAML\Module\core\Auth\Process\AttributeLimit
  */
 class AttributeLimitTest extends TestCase
 {
diff --git a/tests/modules/core/lib/Auth/Process/AttributeMapTest.php b/tests/modules/core/lib/Auth/Process/AttributeMapTest.php
index f8f453e74..628695e4d 100644
--- a/tests/modules/core/lib/Auth/Process/AttributeMapTest.php
+++ b/tests/modules/core/lib/Auth/Process/AttributeMapTest.php
@@ -9,6 +9,8 @@ use SimpleSAML\Module\core\Auth\Process\AttributeMap;
 
 /**
  * Test for the core:AttributeMap filter.
+ *
+ * @covers \SimpleSAML\Module\core\Auth\Process\AttributeMap
  */
 class AttributeMapTest extends TestCase
 {
diff --git a/tests/modules/core/lib/Auth/Process/AttributeValueMapTest.php b/tests/modules/core/lib/Auth/Process/AttributeValueMapTest.php
index 489f2c6b5..0dedcf98e 100644
--- a/tests/modules/core/lib/Auth/Process/AttributeValueMapTest.php
+++ b/tests/modules/core/lib/Auth/Process/AttributeValueMapTest.php
@@ -10,6 +10,8 @@ use SimpleSAML\Module\core\Auth\Process\AttributeValueMap;
 
 /**
  * Test for the core:AttributeValueMap filter.
+ *
+ * @covers \SimpleSAML\Module\core\Auth\Process\AttributeValueMap
  */
 class AttributeValueMapTest extends TestCase
 {
@@ -31,8 +33,6 @@ class AttributeValueMapTest extends TestCase
     /**
      * Test the most basic functionality.
      *
-     * @covers SimpleSAML\Module\core\Auth\Process\AttributeValueMap::__construct
-     * @covers SimpleSAML\Module\core\Auth\Process\AttributeValueMap::process
      * @return void
      */
     public function testBasic(): void
@@ -63,8 +63,6 @@ class AttributeValueMapTest extends TestCase
     /**
      * Test basic functionality, remove duplicates
      *
-     * @covers SimpleSAML\Module\core\Auth\Process\AttributeValueMap::__construct
-     * @covers SimpleSAML\Module\core\Auth\Process\AttributeValueMap::process
      * @return void
      */
     public function testNoDuplicates(): void
@@ -96,8 +94,6 @@ class AttributeValueMapTest extends TestCase
     /**
      * Test the %replace functionality.
      *
-     * @covers SimpleSAML\Module\core\Auth\Process\AttributeValueMap::__construct
-     * @covers SimpleSAML\Module\core\Auth\Process\AttributeValueMap::process
      * @return void
      */
     public function testReplace(): void
@@ -130,8 +126,6 @@ class AttributeValueMapTest extends TestCase
     /**
      * Test the %keep functionality.
      *
-     * @covers SimpleSAML\Module\core\Auth\Process\AttributeValueMap::__construct
-     * @covers SimpleSAML\Module\core\Auth\Process\AttributeValueMap::process
      * @return void
      */
     public function testKeep(): void
@@ -164,8 +158,6 @@ class AttributeValueMapTest extends TestCase
     /**
      * Test unknown flag Exception
      *
-     * @covers SimpleSAML\Module\core\Auth\Process\AttributeValueMap::__construct
-     * @covers SimpleSAML\Module\core\Auth\Process\AttributeValueMap::process
      * @return void
      */
     public function testUnknownFlag(): void
@@ -195,8 +187,6 @@ class AttributeValueMapTest extends TestCase
     /**
      * Test missing Source attribute
      *
-     * @covers SimpleSAML\Module\core\Auth\Process\AttributeValueMap::__construct
-     * @covers SimpleSAML\Module\core\Auth\Process\AttributeValueMap::process
      * @return void
      */
     public function testMissingSourceAttribute(): void
@@ -222,8 +212,6 @@ class AttributeValueMapTest extends TestCase
     /**
      * Test missing Target attribute
      *
-     * @covers SimpleSAML\Module\core\Auth\Process\AttributeValueMap::__construct
-     * @covers SimpleSAML\Module\core\Auth\Process\AttributeValueMap::process
      * @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 a17bb90cc..5b62d6d71 100644
--- a/tests/modules/core/lib/Auth/Process/CardinalitySingleTest.php
+++ b/tests/modules/core/lib/Auth/Process/CardinalitySingleTest.php
@@ -10,6 +10,8 @@ use SimpleSAML\Module\core\Auth\Process\CardinalitySingle;
 
 /**
  * Test for the core:CardinalitySingle filter.
+ *
+ * @covers \SimpleSAML\Module\core\Auth\Process\CardinalitySingle
  */
 class CardinalitySingleTest extends TestCase
 {
diff --git a/tests/modules/core/lib/Auth/Process/CardinalityTest.php b/tests/modules/core/lib/Auth/Process/CardinalityTest.php
index af0262a09..421b382ed 100644
--- a/tests/modules/core/lib/Auth/Process/CardinalityTest.php
+++ b/tests/modules/core/lib/Auth/Process/CardinalityTest.php
@@ -12,6 +12,8 @@ use SimpleSAML\Utils\HttpAdapter;
 
 /**
  * Test for the core:Cardinality filter.
+ *
+ * @covers \SimpleSAML\Module\core\Auth\Process\Cardinality
  */
 class CardinalityTest extends TestCase
 {
diff --git a/tests/modules/core/lib/Auth/Process/PHPTest.php b/tests/modules/core/lib/Auth/Process/PHPTest.php
index 4be06b9f5..bed06c004 100644
--- a/tests/modules/core/lib/Auth/Process/PHPTest.php
+++ b/tests/modules/core/lib/Auth/Process/PHPTest.php
@@ -11,6 +11,8 @@ use SimpleSAML\Module\core\Auth\Process\PHP;
 
 /**
  * Test for the core:PHP filter.
+ *
+ * @covers \SimpleSAML\Module\core\Auth\Process\PHP
  */
 class PHPTest extends TestCase
 {
diff --git a/tests/modules/core/lib/Auth/Process/ScopeAttributeTest.php b/tests/modules/core/lib/Auth/Process/ScopeAttributeTest.php
index a957ddbac..0e45babcb 100644
--- a/tests/modules/core/lib/Auth/Process/ScopeAttributeTest.php
+++ b/tests/modules/core/lib/Auth/Process/ScopeAttributeTest.php
@@ -9,6 +9,8 @@ use SimpleSAML\Module\core\Auth\Process\ScopeAttribute;
 
 /**
  * Test for the core:ScopeAttribute filter.
+ *
+ * @covers \SimpleSAML\Module\core\Auth\Process\ScopeAttribute
  */
 class ScopeAttributeTest extends TestCase
 {
diff --git a/tests/modules/core/lib/Auth/Process/ScopeFromAttributeTest.php b/tests/modules/core/lib/Auth/Process/ScopeFromAttributeTest.php
index 12e970189..010416d30 100644
--- a/tests/modules/core/lib/Auth/Process/ScopeFromAttributeTest.php
+++ b/tests/modules/core/lib/Auth/Process/ScopeFromAttributeTest.php
@@ -9,6 +9,8 @@ use SimpleSAML\Module\core\Auth\Process\ScopeFromAttribute;
 
 /**
  * Test for the core:ScopeFromAttribute filter.
+ *
+ * @covers \SimpleSAML\Module\core\Auth\Process\ScopeFromAttribute
  */
 class ScopeFromAttributeTest extends TestCase
 {
diff --git a/tests/modules/core/lib/Auth/Process/TargetedIDTest.php b/tests/modules/core/lib/Auth/Process/TargetedIDTest.php
index 148d7541f..2adbddef5 100644
--- a/tests/modules/core/lib/Auth/Process/TargetedIDTest.php
+++ b/tests/modules/core/lib/Auth/Process/TargetedIDTest.php
@@ -14,6 +14,8 @@ use SimpleSAML\Utils;
 
 /**
  * Test for the core:TargetedID filter.
+ *
+ * @covers \SimpleSAML\Module\core\Auth\Process\TargetedID
  */
 class TargetedIDTest extends TestCase
 {
diff --git a/tests/modules/core/lib/Auth/UserPassBaseTest.php b/tests/modules/core/lib/Auth/UserPassBaseTest.php
index 84db06b22..f0b08669a 100644
--- a/tests/modules/core/lib/Auth/UserPassBaseTest.php
+++ b/tests/modules/core/lib/Auth/UserPassBaseTest.php
@@ -9,6 +9,9 @@ use SAML2\Constants;
 use SimpleSAML\Error\Error as SspError;
 use SimpleSAML\Module\core\Auth\UserPassBase;
 
+/**
+ * @covers \SimpleSAML\Module\core\Auth\UserPassBase
+ */
 class UserPassBaseTest extends TestCase
 {
     /**
diff --git a/tests/modules/core/lib/Auth/UserPassOrgBaseTest.php b/tests/modules/core/lib/Auth/UserPassOrgBaseTest.php
index ebc5f3c66..9c472638b 100644
--- a/tests/modules/core/lib/Auth/UserPassOrgBaseTest.php
+++ b/tests/modules/core/lib/Auth/UserPassOrgBaseTest.php
@@ -7,6 +7,9 @@ namespace SimpleSAML\Test\Module\core\Auth;
 use PHPUnit\Framework\TestCase;
 use SimpleSAML\Module\core\Auth\UserPassOrgBase;
 
+/**
+ * @covers \SimpleSAML\Module\core\Auth\UserPassOrgBase
+ */
 class UserPassOrgBaseTest extends TestCase
 {
     /**
diff --git a/tests/modules/core/lib/Controller/LoginTest.php b/tests/modules/core/lib/Controller/LoginTest.php
index ba7a0b1ee..4d06027a7 100644
--- a/tests/modules/core/lib/Controller/LoginTest.php
+++ b/tests/modules/core/lib/Controller/LoginTest.php
@@ -24,6 +24,7 @@ use Symfony\Component\HttpFoundation\Request;
  * For now, this test extends ClearStateTestCase so that it doesn't interfere with other tests. Once every class has
  * been made PSR-7-aware, that won't be necessary any longer.
  *
+ * @covers \SimpleSAML\Module\core\Controller\Login
  * @package SimpleSAML\Test
  */
 class LoginTest extends ClearStateTestCase
diff --git a/tests/modules/core/lib/Storage/SQLPermanentStorageTest.php b/tests/modules/core/lib/Storage/SQLPermanentStorageTest.php
index ea6441bf4..21d884d5f 100644
--- a/tests/modules/core/lib/Storage/SQLPermanentStorageTest.php
+++ b/tests/modules/core/lib/Storage/SQLPermanentStorageTest.php
@@ -10,6 +10,8 @@ use SimpleSAML\Module\core\Storage\SQLPermanentStorage;
 
 /**
  * Test for the SQLPermanentStorage class.
+ *
+ * @covers \SimpleSAML\Module\core\Storage\SQLPermanentStorage
  */
 class SQLPermanentStorageTest extends TestCase
 {
diff --git a/tests/modules/cron/lib/Controller/CronTest.php b/tests/modules/cron/lib/Controller/CronTest.php
index 687d35f72..637efae13 100644
--- a/tests/modules/cron/lib/Controller/CronTest.php
+++ b/tests/modules/cron/lib/Controller/CronTest.php
@@ -16,6 +16,7 @@ use Symfony\Component\HttpFoundation\Response;
 /**
  * Set of tests for the controllers in the "cron" module.
  *
+ * @covers \SimpleSAML\Module\cron\Controller\Cron
  * @package SimpleSAML\Test
  */
 class CronTest extends TestCase
diff --git a/tests/modules/multiauth/lib/Auth/Source/MultiAuthTest.php b/tests/modules/multiauth/lib/Auth/Source/MultiAuthTest.php
index 879a6b4da..4862f120f 100644
--- a/tests/modules/multiauth/lib/Auth/Source/MultiAuthTest.php
+++ b/tests/modules/multiauth/lib/Auth/Source/MultiAuthTest.php
@@ -10,6 +10,9 @@ use SimpleSAML\Test\Utils\ClearStateTestCase;
 use SimpleSAML\Configuration;
 use SimpleSAML\Module\multiauth\Auth\Source\MultiAuth;
 
+/**
+ * @covers \SimpleSAML\Module\multiauth\Auth\Source\MultiAuth
+ */
 class MultiAuthTest extends ClearStateTestCase
 {
     /** @var Configuration */
diff --git a/tests/modules/saml/lib/Auth/Process/FilterScopesTest.php b/tests/modules/saml/lib/Auth/Process/FilterScopesTest.php
index 764d3caa7..9b5296fbe 100644
--- a/tests/modules/saml/lib/Auth/Process/FilterScopesTest.php
+++ b/tests/modules/saml/lib/Auth/Process/FilterScopesTest.php
@@ -10,6 +10,8 @@ use SimpleSAML\Module\saml\Auth\Process\FilterScopes;
 /**
  * Test for the saml:FilterScopes filter.
  *
+ * @covers \SimpleSAML\Module\saml\Auth\Process\FilterScopes
+ *
  * @author Jaime PĂ©rez Crespo, UNINETT AS <jaime.perez@uninett.no>
  * @package SimpleSAMLphp
  */
diff --git a/tests/modules/saml/lib/Auth/Process/NameIDAttributeTest.php b/tests/modules/saml/lib/Auth/Process/NameIDAttributeTest.php
index fa45d32b4..4649f3836 100644
--- a/tests/modules/saml/lib/Auth/Process/NameIDAttributeTest.php
+++ b/tests/modules/saml/lib/Auth/Process/NameIDAttributeTest.php
@@ -13,6 +13,8 @@ use SAML2\Constants;
 /**
  * Test for the saml:NameIDAttribute filter.
  *
+ * @covers \SimpleSAML\Module\saml\Auth\Process\NameIDAttribute
+ *
  * @author Eugene Venter <eugene@catalyst.net.nz>
  * @package SimpleSAMLphp
  */
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 5baa54d1f..397482f18 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
@@ -19,6 +19,8 @@ use SimpleSAML\Test\Utils\SpTester;
 
 /**
  * Set of test cases for \SimpleSAML\Module\saml\Auth\Source\SP.
+ *
+ * @covers \SimpleSAML\Module\saml\Auth\Source\SP
  */
 class SPTest extends ClearStateTestCase
 {
diff --git a/tests/modules/saml/lib/IdP/SAML2Test.php b/tests/modules/saml/lib/IdP/SAML2Test.php
index 301c1c72e..c0affe834 100644
--- a/tests/modules/saml/lib/IdP/SAML2Test.php
+++ b/tests/modules/saml/lib/IdP/SAML2Test.php
@@ -9,6 +9,9 @@ use SimpleSAML\IdP;
 use SimpleSAML\Module\saml\IdP\SAML2;
 use SimpleSAML\Test\Utils\ClearStateTestCase;
 
+/**
+ * @covers \SimpleSAML\Module\saml\IdP\SAML2
+ */
 class SAML2Test extends ClearStateTestCase
 {
     /**
diff --git a/tests/modules/saml/lib/IdP/SQLNameIDTest.php b/tests/modules/saml/lib/IdP/SQLNameIDTest.php
index 1149a59d5..181b2d64b 100644
--- a/tests/modules/saml/lib/IdP/SQLNameIDTest.php
+++ b/tests/modules/saml/lib/IdP/SQLNameIDTest.php
@@ -14,6 +14,8 @@ use SimpleSAML\Store;
 /**
  * Test for the SQLNameID helper class.
  *
+ * @covers \SimpleSAML\Module\saml\IdP\SQLNameID
+ *
  * @author Pavel Brousek <brousek@ics.muni.cz>
  * @package SimpleSAMLphp
  */
-- 
GitLab