diff --git a/admin/tool/admin_presets/tests/event/preset_deleted_test.php b/admin/tool/admin_presets/tests/event/preset_deleted_test.php
index 03d7194eee82f..1c98d22d0df03 100644
--- a/admin/tool/admin_presets/tests/event/preset_deleted_test.php
+++ b/admin/tool/admin_presets/tests/event/preset_deleted_test.php
@@ -23,7 +23,7 @@
* @category test
* @copyright 2021 Sara Arjona (sara@moodle.com)
* @license http://www.gnu.org/copyleft/gpl.html GNU GPL v3 or later
- * @coversDefaultClass \tool_admin_presets\event\preset_deleted
+ * @covers \tool_admin_presets\event\preset_deleted
*/
class preset_deleted_test extends \advanced_testcase {
diff --git a/admin/tool/admin_presets/tests/event/preset_downloaded_test.php b/admin/tool/admin_presets/tests/event/preset_downloaded_test.php
index c00cda2d9ffb3..dba509b7897ff 100644
--- a/admin/tool/admin_presets/tests/event/preset_downloaded_test.php
+++ b/admin/tool/admin_presets/tests/event/preset_downloaded_test.php
@@ -23,7 +23,7 @@
* @category test
* @copyright 2021 Sara Arjona (sara@moodle.com)
* @license http://www.gnu.org/copyleft/gpl.html GNU GPL v3 or later
- * @coversDefaultClass \tool_admin_presets\event\preset_downloaded
+ * @covers \tool_admin_presets\event\preset_downloaded
*/
class preset_downloaded_test extends \advanced_testcase {
diff --git a/admin/tool/admin_presets/tests/event/preset_exported_test.php b/admin/tool/admin_presets/tests/event/preset_exported_test.php
index 39e28a49b0add..6e0314f32cfac 100644
--- a/admin/tool/admin_presets/tests/event/preset_exported_test.php
+++ b/admin/tool/admin_presets/tests/event/preset_exported_test.php
@@ -23,7 +23,7 @@
* @category test
* @copyright 2021 Sara Arjona (sara@moodle.com)
* @license http://www.gnu.org/copyleft/gpl.html GNU GPL v3 or later
- * @coversDefaultClass \tool_admin_presets\event\preset_exported
+ * @covers \tool_admin_presets\event\preset_exported
*/
class preset_exported_test extends \advanced_testcase {
diff --git a/admin/tool/admin_presets/tests/event/preset_imported_test.php b/admin/tool/admin_presets/tests/event/preset_imported_test.php
index 7823de06074bb..0298d209e41ca 100644
--- a/admin/tool/admin_presets/tests/event/preset_imported_test.php
+++ b/admin/tool/admin_presets/tests/event/preset_imported_test.php
@@ -23,7 +23,7 @@
* @category test
* @copyright 2021 Sara Arjona (sara@moodle.com)
* @license http://www.gnu.org/copyleft/gpl.html GNU GPL v3 or later
- * @coversDefaultClass \tool_admin_presets\event\preset_imported
+ * @covers \tool_admin_presets\event\preset_imported
*/
class preset_imported_test extends \advanced_testcase {
diff --git a/admin/tool/admin_presets/tests/event/preset_loaded_test.php b/admin/tool/admin_presets/tests/event/preset_loaded_test.php
index 160081f86bed7..32405f4eff38f 100644
--- a/admin/tool/admin_presets/tests/event/preset_loaded_test.php
+++ b/admin/tool/admin_presets/tests/event/preset_loaded_test.php
@@ -23,7 +23,7 @@
* @category test
* @copyright 2021 Sara Arjona (sara@moodle.com)
* @license http://www.gnu.org/copyleft/gpl.html GNU GPL v3 or later
- * @coversDefaultClass \tool_admin_presets\event\preset_loaded
+ * @covers \tool_admin_presets\event\preset_loaded
*/
class preset_loaded_test extends \advanced_testcase {
diff --git a/admin/tool/admin_presets/tests/event/preset_previewed_test.php b/admin/tool/admin_presets/tests/event/preset_previewed_test.php
index c9aa8d236ff73..2a27ca117eb74 100644
--- a/admin/tool/admin_presets/tests/event/preset_previewed_test.php
+++ b/admin/tool/admin_presets/tests/event/preset_previewed_test.php
@@ -23,7 +23,7 @@
* @category test
* @copyright 2021 Sara Arjona (sara@moodle.com)
* @license http://www.gnu.org/copyleft/gpl.html GNU GPL v3 or later
- * @coversDefaultClass \tool_admin_presets\event\preset_previewed
+ * @covers \tool_admin_presets\event\preset_previewed
*/
class preset_previewed_test extends \advanced_testcase {
diff --git a/admin/tool/admin_presets/tests/event/preset_reverted_test.php b/admin/tool/admin_presets/tests/event/preset_reverted_test.php
index 66ddcd827d75a..61210220e0389 100644
--- a/admin/tool/admin_presets/tests/event/preset_reverted_test.php
+++ b/admin/tool/admin_presets/tests/event/preset_reverted_test.php
@@ -23,7 +23,7 @@
* @category test
* @copyright 2021 Sara Arjona (sara@moodle.com)
* @license http://www.gnu.org/copyleft/gpl.html GNU GPL v3 or later
- * @coversDefaultClass \tool_admin_presets\event\preset_reverted
+ * @covers \tool_admin_presets\event\preset_reverted
*/
class preset_reverted_test extends \advanced_testcase {
diff --git a/admin/tool/admin_presets/tests/event/presets_listed_test.php b/admin/tool/admin_presets/tests/event/presets_listed_test.php
index 4c519691bab1c..84765486f7eeb 100644
--- a/admin/tool/admin_presets/tests/event/presets_listed_test.php
+++ b/admin/tool/admin_presets/tests/event/presets_listed_test.php
@@ -23,7 +23,7 @@
* @category test
* @copyright 2021 Sara Arjona (sara@moodle.com)
* @license http://www.gnu.org/copyleft/gpl.html GNU GPL v3 or later
- * @coversDefaultClass \tool_admin_presets\event\presets_listed
+ * @covers \tool_admin_presets\event\presets_listed
*/
class presets_listed_test extends \advanced_testcase {
diff --git a/course/format/tests/output/local/state/state_test.php b/course/format/tests/output/local/state/state_test.php
index f39de5f30e66d..3c964c98e241f 100644
--- a/course/format/tests/output/local/state/state_test.php
+++ b/course/format/tests/output/local/state/state_test.php
@@ -42,7 +42,7 @@ public static function setupBeforeClass(): void {
* Test the behaviour of state::export_for_template().
*
* @dataProvider state_provider
- * @coversDefaultClass \core_courseformat\output\local\state
+ * @covers \core_courseformat\output\local\state
*
* @param string $format The course format of the course where the method will be executed.
*/
diff --git a/files/tests/archive_writer_test.php b/files/tests/archive_writer_test.php
index 356bf62e8943c..c6d98b3ace682 100644
--- a/files/tests/archive_writer_test.php
+++ b/files/tests/archive_writer_test.php
@@ -14,15 +14,6 @@
// You should have received a copy of the GNU General Public License
// along with Moodle. If not, see .
-/**
- * Unit tests for core_files\local\archive_writer/zip_archive.
- *
- * @package core_files
- * @category test
- * @copyright 2020 Mark Nelson
- * @license http://www.gnu.org/copyleft/gpl.html GNU Public License
- */
-
namespace core_files;
use advanced_testcase;
@@ -31,7 +22,11 @@
/**
* Unit tests for \core_files\archive_writer.
*
- * @coversDefaultClass \core_files\archive_writer
+ * @package core_files
+ * @category test
+ * @copyright 2020 Mark Nelson
+ * @license http://www.gnu.org/copyleft/gpl.html GNU Public License
+ * @covers \core_files\archive_writer
*/
class archive_writer_test extends advanced_testcase {
diff --git a/files/tests/local/archive_writer/zip_writer_test.php b/files/tests/local/archive_writer/zip_writer_test.php
index 56b56f11291a1..195b975b8723f 100644
--- a/files/tests/local/archive_writer/zip_writer_test.php
+++ b/files/tests/local/archive_writer/zip_writer_test.php
@@ -14,15 +14,6 @@
// You should have received a copy of the GNU General Public License
// along with Moodle. If not, see .
-/**
- * Unit tests for \core_files\local\archive_writer\zip_writer.
- *
- * @package core_files
- * @category test
- * @copyright 2020 Mark Nelson
- * @license http://www.gnu.org/copyleft/gpl.html GNU Public License
- */
-
namespace core_files\local\archive_writer;
use advanced_testcase;
@@ -33,7 +24,11 @@
/**
* Unit tests for \core_files\local\archive_writer\zip_writer.
*
- * @coversDefaultClass \core_files\local\archive_writer\zip_writer
+ * @package core_files
+ * @category test
+ * @copyright 2020 Mark Nelson
+ * @license http://www.gnu.org/copyleft/gpl.html GNU Public License
+ * @covers \core_files\local\archive_writer\zip_writer
*/
class zip_writer_test extends advanced_testcase {
diff --git a/lib/table/tests/local/filter/filter_test.php b/lib/table/tests/local/filter/filter_test.php
index c9d8a4a680e0b..1b37f312894bb 100644
--- a/lib/table/tests/local/filter/filter_test.php
+++ b/lib/table/tests/local/filter/filter_test.php
@@ -14,15 +14,6 @@
// You should have received a copy of the GNU General Public License
// along with Moodle. If not, see .
-/**
- * Unit tests for core_table\local\filter\filter.
- *
- * @package core_table
- * @category test
- * @copyright 2020 Andrew Nicols
- * @license http://www.gnu.org/copyleft/gpl.html GNU Public License
- */
-
declare(strict_types=1);
namespace core_table\local\filter;
@@ -33,11 +24,11 @@
/**
* Unit tests for core_table\local\filter\filter.
*
- * @coversDefaultClass \core_table\local\filter\filter
* @package core_table
* @category test
* @copyright 2020 Andrew Nicols
* @license http://www.gnu.org/copyleft/gpl.html GNU GPL v3 or later
+ * @covers \core_table\local\filter\filter
*/
class filter_test extends advanced_testcase {
/**
diff --git a/lib/tests/content/export/exportable_items/exportable_filearea_test.php b/lib/tests/content/export/exportable_items/exportable_filearea_test.php
index 7e465ddfa4e37..8ce062edfaf7a 100644
--- a/lib/tests/content/export/exportable_items/exportable_filearea_test.php
+++ b/lib/tests/content/export/exportable_items/exportable_filearea_test.php
@@ -14,15 +14,6 @@
// You should have received a copy of the GNU General Public License
// along with Moodle. If not, see .
-/**
- * Unit tests for core\content\exportable_items\exportable_filearea.
- *
- * @package core
- * @category test
- * @copyright 2020 Andrew Nicols
- * @license http://www.gnu.org/copyleft/gpl.html GNU GPL v3 or later
- */
-
declare(strict_types=1);
namespace core\content\export\exportable_items;
@@ -38,7 +29,11 @@
/**
* Unit tests for the `exportable_filearea` export item class.
*
- * @coversDefaultClass \core\content\exportable_items\exportable_filearea
+ * @package core
+ * @category test
+ * @copyright 2020 Andrew Nicols
+ * @license http://www.gnu.org/copyleft/gpl.html GNU GPL v3 or later
+ * @covers \core\content\exportable_items\exportable_filearea
*/
class exportable_filearea_test extends advanced_testcase {
diff --git a/lib/tests/content/export/exportable_items/exportable_stored_file_test.php b/lib/tests/content/export/exportable_items/exportable_stored_file_test.php
index 61c760687c2f8..0b92d1b48cdd6 100644
--- a/lib/tests/content/export/exportable_items/exportable_stored_file_test.php
+++ b/lib/tests/content/export/exportable_items/exportable_stored_file_test.php
@@ -14,15 +14,6 @@
// You should have received a copy of the GNU General Public License
// along with Moodle. If not, see .
-/**
- * Unit tests for core\content\exportable_items\exportable_stored_file.
- *
- * @package core
- * @category test
- * @copyright 2020 Andrew Nicols
- * @license http://www.gnu.org/copyleft/gpl.html GNU GPL v3 or later
- */
-
declare(strict_types=1);
namespace core\content\export\exportable_items;
@@ -37,7 +28,11 @@
/**
* Unit tests for the `exportable_stored_file` export item class.
*
- * @coversDefaultClass \core\content\exportable_items\exportable_stored_file
+ * @package core
+ * @category test
+ * @copyright 2020 Andrew Nicols
+ * @license http://www.gnu.org/copyleft/gpl.html GNU GPL v3 or later
+ * @covers \core\content\exportable_items\exportable_stored_file
*/
class exportable_stored_file_test extends advanced_testcase {
diff --git a/lib/tests/content/export/exportable_items/exportable_textarea_test.php b/lib/tests/content/export/exportable_items/exportable_textarea_test.php
index 5e11c3d2afee0..de1968d30d15d 100644
--- a/lib/tests/content/export/exportable_items/exportable_textarea_test.php
+++ b/lib/tests/content/export/exportable_items/exportable_textarea_test.php
@@ -14,15 +14,6 @@
// You should have received a copy of the GNU General Public License
// along with Moodle. If not, see .
-/**
- * Unit tests for core\content\exportable_items\exportable_textarea.
- *
- * @package core
- * @category test
- * @copyright 2020 Andrew Nicols
- * @license http://www.gnu.org/copyleft/gpl.html GNU GPL v3 or later
- */
-
declare(strict_types=1);
namespace core\content\export\exportable_items;
@@ -38,7 +29,11 @@
/**
* Unit tests for the `exportable_textarea` export item class.
*
- * @coversDefaultClass \core\content\exportable_items\exportable_textarea
+ * @package core
+ * @category test
+ * @copyright 2020 Andrew Nicols
+ * @license http://www.gnu.org/copyleft/gpl.html GNU GPL v3 or later
+ * @covers \core\content\exportable_items\exportable_textarea
*/
class exportable_textarea_test extends advanced_testcase {
diff --git a/lib/tests/content/export/exporters/course_exporter_test.php b/lib/tests/content/export/exporters/course_exporter_test.php
index 6026fce15823c..3b1270b2d272f 100644
--- a/lib/tests/content/export/exporters/course_exporter_test.php
+++ b/lib/tests/content/export/exporters/course_exporter_test.php
@@ -14,15 +14,6 @@
// You should have received a copy of the GNU General Public License
// along with Moodle. If not, see .
-/**
- * Unit tests for core\content\export\exporters\course_exporter.
- *
- * @package core
- * @category test
- * @copyright 2020 Simey Lameze
- * @license http://www.gnu.org/copyleft/gpl.html GNU Public License
- */
-
declare(strict_types=1);
namespace core\content\export\exporters;
@@ -36,7 +27,11 @@
/**
* Unit tests for activity exporter.
*
- * @coversDefaultClass \core\content\export\exporters\course_exporter
+ * @package core
+ * @category test
+ * @copyright 2020 Simey Lameze
+ * @license http://www.gnu.org/copyleft/gpl.html GNU Public License
+ * @covers \core\content\export\exporters\course_exporter
*/
class course_exporter_test extends advanced_testcase {
diff --git a/lib/tests/content/export/zipwriter_test.php b/lib/tests/content/export/zipwriter_test.php
index 8c301659e3426..762e5a1f1bc57 100644
--- a/lib/tests/content/export/zipwriter_test.php
+++ b/lib/tests/content/export/zipwriter_test.php
@@ -14,15 +14,6 @@
// You should have received a copy of the GNU General Public License
// along with Moodle. If not, see .
-/**
- * Unit tests for core\content\zipwriter.
- *
- * @package core
- * @category test
- * @copyright 2020 Simey Lameze
- * @license http://www.gnu.org/copyleft/gpl.html GNU Public License
- */
-
declare(strict_types=1);
namespace core\content\export;
@@ -35,7 +26,11 @@
/**
* Unit tests for core\content\zipwriter.
*
- * @coversDefaultClass \core\content\export\zipwriter
+ * @package core
+ * @category test
+ * @copyright 2020 Simey Lameze
+ * @license http://www.gnu.org/copyleft/gpl.html GNU Public License
+ * @covers \core\content\export\zipwriter
*/
class zipwriter_test extends advanced_testcase {