]
@@ -284,7 +284,7 @@ class instance_test extends advanced_testcase {
*
* @return array
*/
- public function is_currently_open_provider(): array {
+ public static function is_currently_open_provider(): array {
return [
'No opening or closing time set: Is open' => [null, null, true],
'Opening time set in the past, no closing: Is open' => [-DAYSECS, null, true],
@@ -363,7 +363,7 @@ class instance_test extends advanced_testcase {
*
* @return array
*/
- public function user_must_wait_to_join_provider(): array {
+ public static function user_must_wait_to_join_provider(): array {
return [
'Admins must never wait to join (waiting disabled)' => [true, false, false, false],
'Admins must never wait to join (waiting enabled)' => [true, false, true, false],
@@ -407,7 +407,7 @@ class instance_test extends advanced_testcase {
*
* @return array
*/
- public function does_current_user_count_towards_user_limit_provider(): array {
+ public static function does_current_user_count_towards_user_limit_provider(): array {
return [
'Admin does not count' => [true, false, false],
'Moderator does not count' => [false, true, false],
@@ -452,7 +452,7 @@ class instance_test extends advanced_testcase {
*
* @return array
*/
- public function get_current_user_password_provider(): array {
+ public static function get_current_user_password_provider(): array {
return [
'Admin is a moderator' => [true, false, true],
'Moderator is a moderator' => [false, true, true],
@@ -493,7 +493,7 @@ class instance_test extends advanced_testcase {
*
* @return array
*/
- public function get_current_user_role_provider(): array {
+ public static function get_current_user_role_provider(): array {
return [
'Admin is a moderator' => [true, false, true],
'Moderator is a moderator' => [false, true, true],
@@ -534,7 +534,7 @@ class instance_test extends advanced_testcase {
*
* @return array
*/
- public function allow_recording_start_stop_provider(): array {
+ public static function allow_recording_start_stop_provider(): array {
return [
'Meeting is not recorded: No start/stop' => [false, false, false],
'Meeting recorded, Buttons shown: Allow' => [true, true, true],
diff --git a/mod/bigbluebuttonbn/tests/local/bigbluebutton/recordings/recording_data_test.php b/mod/bigbluebuttonbn/tests/local/bigbluebutton/recordings/recording_data_test.php
index 4622c9d9e83..64a990f0cd9 100644
--- a/mod/bigbluebuttonbn/tests/local/bigbluebutton/recordings/recording_data_test.php
+++ b/mod/bigbluebuttonbn/tests/local/bigbluebutton/recordings/recording_data_test.php
@@ -44,7 +44,7 @@ class recording_data_test extends \advanced_testcase {
*
* @return \string[][]
*/
- public function type_text_provider(): array {
+ public static function type_text_provider(): array {
return [
['Presentation', 'presentation'],
['Video', 'video'],
diff --git a/mod/bigbluebuttonbn/tests/meeting_test.php b/mod/bigbluebuttonbn/tests/meeting_test.php
index d19dd8618d7..f6fa0283767 100644
--- a/mod/bigbluebuttonbn/tests/meeting_test.php
+++ b/mod/bigbluebuttonbn/tests/meeting_test.php
@@ -57,7 +57,7 @@ class meeting_test extends \advanced_testcase {
*
* @return array[]
*/
- public function get_instance_types_meeting_info(): array {
+ public static function get_instance_types_meeting_info(): array {
return [
'Instance Type ALL - No Group' => [
'type' => instance::TYPE_ALL,
@@ -417,7 +417,7 @@ class meeting_test extends \advanced_testcase {
*
* @return array[]
*/
- public function get_data_can_join_with_dates(): array {
+ public static function get_data_can_join_with_dates(): array {
return [
'Instance Type ALL - No Group - Closed in past' => [
'type' => instance::TYPE_ALL,
diff --git a/mod/bigbluebuttonbn/tests/recording_test.php b/mod/bigbluebuttonbn/tests/recording_test.php
index fa4ff52fd64..8479a25cc1f 100644
--- a/mod/bigbluebuttonbn/tests/recording_test.php
+++ b/mod/bigbluebuttonbn/tests/recording_test.php
@@ -103,7 +103,7 @@ class recording_test extends \advanced_testcase {
*
* @return array[]
*/
- public function get_status_provider(): array {
+ public static function get_status_provider(): array {
return [
[recording::RECORDING_STATUS_PROCESSED],
[recording::RECORDING_STATUS_DISMISSED],
@@ -137,7 +137,7 @@ class recording_test extends \advanced_testcase {
*
* @return array[]
*/
- public function get_allrecordings_types_provider(): array {
+ public static function get_allrecordings_types_provider(): array {
return [
'Instance Type ALL' => [
'type' => instance::TYPE_ALL
diff --git a/mod/chat/tests/format_message_test.php b/mod/chat/tests/format_message_test.php
index d27691b4f36..3a27b0ec689 100644
--- a/mod/chat/tests/format_message_test.php
+++ b/mod/chat/tests/format_message_test.php
@@ -33,7 +33,7 @@ class format_message_test extends \advanced_testcase {
const USER_CURRENT = 1;
const USER_OTHER = 2;
- public function chat_format_message_manually_provider() {
+ public static function chat_format_message_manually_provider(): array {
$dateregexp = '\d{2}:\d{2}';
return [
'Beep everyone' => [
diff --git a/mod/choice/tests/custom_completion_test.php b/mod/choice/tests/custom_completion_test.php
index 0de6b5ebf02..120d3e2f400 100644
--- a/mod/choice/tests/custom_completion_test.php
+++ b/mod/choice/tests/custom_completion_test.php
@@ -43,7 +43,7 @@ class custom_completion_test extends advanced_testcase {
*
* @return array[]
*/
- public function get_state_provider(): array {
+ public static function get_state_provider(): array {
return [
'Undefined rule' => [
'somenonexistentrule', COMPLETION_DISABLED, false, null, coding_exception::class
@@ -166,7 +166,7 @@ class custom_completion_test extends advanced_testcase {
*
* @return array[]
*/
- public function get_available_custom_rules_provider(): array {
+ public static function get_available_custom_rules_provider(): array {
return [
'Completion submit available' => [
COMPLETION_ENABLED, ['completionsubmit']
diff --git a/mod/choice/tests/dates_test.php b/mod/choice/tests/dates_test.php
index b5c0d27f92e..dd6eab7d692 100644
--- a/mod/choice/tests/dates_test.php
+++ b/mod/choice/tests/dates_test.php
@@ -43,7 +43,7 @@ class dates_test extends advanced_testcase {
* Data provider for get_dates_for_module().
* @return array[]
*/
- public function get_dates_for_module_provider(): array {
+ public static function get_dates_for_module_provider(): array {
$now = time();
$before = $now - DAYSECS;
$earlier = $before - DAYSECS;
diff --git a/mod/data/tests/custom_completion_test.php b/mod/data/tests/custom_completion_test.php
index 8cd39265c54..2f41dad7a5b 100644
--- a/mod/data/tests/custom_completion_test.php
+++ b/mod/data/tests/custom_completion_test.php
@@ -51,7 +51,7 @@ class custom_completion_test extends advanced_testcase {
*
* @return array[]
*/
- public function get_state_provider(): array {
+ public static function get_state_provider(): array {
return [
'Undefined rule' => [
'somenonexistentrule', COMPLETION_DISABLED, 0, null, coding_exception::class
@@ -173,7 +173,7 @@ class custom_completion_test extends advanced_testcase {
*
* @return array[]
*/
- public function get_available_custom_rules_provider(): array {
+ public static function get_available_custom_rules_provider(): array {
return [
'Completion entries available' => [
COMPLETION_ENABLED, ['completionentries']
diff --git a/mod/data/tests/dates_test.php b/mod/data/tests/dates_test.php
index 6fdd3494079..2a769e7f169 100644
--- a/mod/data/tests/dates_test.php
+++ b/mod/data/tests/dates_test.php
@@ -43,7 +43,7 @@ class dates_test extends advanced_testcase {
* Data provider for get_dates_for_module().
* @return array[]
*/
- public function get_dates_for_module_provider(): array {
+ public static function get_dates_for_module_provider(): array {
$now = time();
$before = $now - DAYSECS;
$earlier = $before - DAYSECS;
diff --git a/mod/data/tests/event/events_test.php b/mod/data/tests/event/events_test.php
index 6df9fb43650..a8a2353f1b0 100644
--- a/mod/data/tests/event/events_test.php
+++ b/mod/data/tests/event/events_test.php
@@ -370,7 +370,7 @@ class events_test extends \advanced_testcase {
*
* @return array[]
*/
- public function preset_importer_provider(): array {
+ public static function preset_importer_provider(): array {
// Image gallery preset is: ['title' => 'text', 'description' => 'textarea', 'image' => 'picture'];
$titlefield = new \stdClass();
diff --git a/mod/data/tests/external/get_mapping_information_test.php b/mod/data/tests/external/get_mapping_information_test.php
index cbadf5966b2..b41fb5718a0 100644
--- a/mod/data/tests/external/get_mapping_information_test.php
+++ b/mod/data/tests/external/get_mapping_information_test.php
@@ -40,7 +40,7 @@ class get_mapping_information_test extends \advanced_testcase {
*
* @return array[]
*/
- public function get_mapping_information_provider(): array {
+ public static function get_mapping_information_provider(): array {
// Image gallery preset is: ['title' => 'text', 'description' => 'textarea', 'image' => 'picture'];
$titlefield = new \stdClass();
diff --git a/mod/data/tests/generator_test.php b/mod/data/tests/generator_test.php
index eed49e5aec1..62b84bfdc81 100644
--- a/mod/data/tests/generator_test.php
+++ b/mod/data/tests/generator_test.php
@@ -300,7 +300,7 @@ class generator_test extends \advanced_testcase {
*
* @return array
*/
- public function create_preset_provider(): array {
+ public static function create_preset_provider(): array {
return [
'Create using the default configuration' => [
'record' => null,
diff --git a/mod/data/tests/lib_test.php b/mod/data/tests/lib_test.php
index 154deae9e11..799e9ccbc5a 100644
--- a/mod/data/tests/lib_test.php
+++ b/mod/data/tests/lib_test.php
@@ -746,7 +746,7 @@ class lib_test extends \advanced_testcase {
*
* @return array
*/
- public function data_get_config_provider() {
+ public static function data_get_config_provider(): array {
$initialdata = (object) [
'template_foo' => true,
'template_bar' => false,
@@ -837,7 +837,7 @@ class lib_test extends \advanced_testcase {
*
* @return array
*/
- public function data_set_config_provider() {
+ public static function data_set_config_provider(): array {
$basevalue = (object) ['id' => rand(1, 1000)];
$config = [
'template_foo' => true,
diff --git a/mod/data/tests/manager_test.php b/mod/data/tests/manager_test.php
index 5dcc4a3849b..14d8067b961 100644
--- a/mod/data/tests/manager_test.php
+++ b/mod/data/tests/manager_test.php
@@ -482,7 +482,7 @@ class manager_test extends \advanced_testcase {
*
* @return array
*/
- public function can_view_preset_provider(): array {
+ public static function can_view_preset_provider(): array {
return [
// User presets.
'Teacher owned preset without user id param' => [
@@ -737,7 +737,7 @@ class manager_test extends \advanced_testcase {
*
* @return array
*/
- public function reset_template_provider(): array {
+ public static function reset_template_provider(): array {
return [
// User presets.
'listtemplate' => [
diff --git a/mod/data/tests/preset_importer_test.php b/mod/data/tests/preset_importer_test.php
index 34cefbb5084..d99d3f37de6 100644
--- a/mod/data/tests/preset_importer_test.php
+++ b/mod/data/tests/preset_importer_test.php
@@ -28,14 +28,13 @@ use mod_data\local\importer\preset_importer;
* @license http://www.gnu.org/copyleft/gpl.html GNU GPL v3 or later
* @coversDefaultClass \mod_data\local\importer\preset_importer
*/
-class preset_importer_test extends \advanced_testcase {
-
+final class preset_importer_test extends \advanced_testcase {
/**
* Data provider for build providers for test_needs_mapping and test_set_affected_fields.
*
* @return array[]
*/
- public function preset_importer_provider(): array {
+ public static function preset_importer_provider(): array {
// Image gallery preset is: ['title' => 'text', 'description' => 'textarea', 'image' => 'picture'];
$titlefield = new \stdClass();
@@ -107,8 +106,8 @@ class preset_importer_test extends \advanced_testcase {
*
* @return array[]
*/
- public function needs_mapping_provider(): array {
- $basedprovider = $this->preset_importer_provider();
+ public static function needs_mapping_provider(): array {
+ $basedprovider = static::preset_importer_provider();
$basedprovider['Empty database / Empty importer']['needsmapping'] = false;
$basedprovider['Empty database / Importer with fields']['needsmapping'] = false;
@@ -182,8 +181,8 @@ class preset_importer_test extends \advanced_testcase {
*
* @return array[]
*/
- public function set_affected_provider(): array {
- $basedprovider = $this->preset_importer_provider();
+ public static function set_affected_provider(): array {
+ $basedprovider = static::preset_importer_provider();
$basedprovider['Empty database / Empty importer']['fieldstocreate'] = 0;
$basedprovider['Empty database / Empty importer']['fieldstoremove'] = 0;
@@ -353,7 +352,7 @@ class preset_importer_test extends \advanced_testcase {
*
* @return array[]
*/
- public function get_field_names_provider(): array {
+ public static function get_field_names_provider(): array {
return [
'Empty list' => [
'fields' => [],
diff --git a/mod/data/tests/preset_test.php b/mod/data/tests/preset_test.php
index 37f98566703..018e6bdf3b6 100644
--- a/mod/data/tests/preset_test.php
+++ b/mod/data/tests/preset_test.php
@@ -495,7 +495,7 @@ class preset_test extends \advanced_testcase {
*
* @return array
*/
- public function is_directory_a_preset_provider(): array {
+ public static function is_directory_a_preset_provider(): array {
global $CFG;
return [
@@ -608,7 +608,7 @@ class preset_test extends \advanced_testcase {
*
* @return array
*/
- public function generate_preset_xml_provider(): array {
+ public static function generate_preset_xml_provider(): array {
return [
'Generate preset.xml with the default params and empty description' => [
'params' => [],
diff --git a/mod/data/tests/template_test.php b/mod/data/tests/template_test.php
index 660a2f3e59b..ed27d746213 100644
--- a/mod/data/tests/template_test.php
+++ b/mod/data/tests/template_test.php
@@ -169,7 +169,7 @@ class template_test extends \advanced_testcase {
*
* @return array of scenarios
*/
- public function parse_entries_provider(): array {
+ public static function parse_entries_provider(): array {
return [
// Teacher scenarios.
'Teacher id tag' => [
@@ -871,7 +871,7 @@ class template_test extends \advanced_testcase {
*
* @return array of scenarios
*/
- public function parse_add_entry_provider(): array {
+ public static function parse_add_entry_provider(): array {
return [
// Editing an entry.
'Teacher editing entry tags tag' => [
diff --git a/mod/feedback/tests/custom_completion_test.php b/mod/feedback/tests/custom_completion_test.php
index 3719b411588..630b063dc3a 100644
--- a/mod/feedback/tests/custom_completion_test.php
+++ b/mod/feedback/tests/custom_completion_test.php
@@ -51,7 +51,7 @@ class custom_completion_test extends advanced_testcase {
*
* @return array[]
*/
- public function get_state_provider(): array {
+ public static function get_state_provider(): array {
return [
'Undefined rule' => [
'somenonexistentrule', COMPLETION_DISABLED, false, null, coding_exception::class
@@ -174,7 +174,7 @@ class custom_completion_test extends advanced_testcase {
*
* @return array[]
*/
- public function get_available_custom_rules_provider(): array {
+ public static function get_available_custom_rules_provider(): array {
return [
'Completion submit available' => [
COMPLETION_ENABLED, ['completionsubmit']
diff --git a/mod/feedback/tests/dates_test.php b/mod/feedback/tests/dates_test.php
index f37ba28a05f..b9c65282386 100644
--- a/mod/feedback/tests/dates_test.php
+++ b/mod/feedback/tests/dates_test.php
@@ -43,7 +43,7 @@ class dates_test extends advanced_testcase {
* Data provider for get_dates_for_module().
* @return array[]
*/
- public function get_dates_for_module_provider(): array {
+ public static function get_dates_for_module_provider(): array {
$now = time();
$before = $now - DAYSECS;
$earlier = $before - DAYSECS;
diff --git a/mod/feedback/tests/form/create_template_form_test.php b/mod/feedback/tests/form/create_template_form_test.php
index 268db0b281c..ae56cce41f7 100644
--- a/mod/feedback/tests/form/create_template_form_test.php
+++ b/mod/feedback/tests/form/create_template_form_test.php
@@ -102,7 +102,7 @@ class create_template_form_test extends \advanced_testcase {
*
* @return array
*/
- public function createtemplate_form_with_modified_capabilities_provider(): array {
+ public static function createtemplate_form_with_modified_capabilities_provider(): array {
return [
"Manager without edititems permission cannot create any templates" => [
['mod/feedback:edititems'], false
@@ -180,7 +180,7 @@ class create_template_form_test extends \advanced_testcase {
*
* @return array
*/
- public function createtemplate_form_provider(): array {
+ public static function createtemplate_form_provider(): array {
return [
'Create a private template as an admin' => [
'admin', false
diff --git a/mod/feedback/tests/form/use_template_form_test.php b/mod/feedback/tests/form/use_template_form_test.php
index f57fe7d4aae..d5637b8d21e 100644
--- a/mod/feedback/tests/form/use_template_form_test.php
+++ b/mod/feedback/tests/form/use_template_form_test.php
@@ -100,7 +100,7 @@ class use_template_form_test extends \advanced_testcase {
*
* @return array
*/
- public function usetemplate_form_provider() {
+ public static function usetemplate_form_provider(): array {
return [
'Test submission with a private template as an admin' => [
'admin', true, true
diff --git a/mod/folder/tests/lib_test.php b/mod/folder/tests/lib_test.php
index 15825f7388d..b0b1c17adff 100644
--- a/mod/folder/tests/lib_test.php
+++ b/mod/folder/tests/lib_test.php
@@ -376,7 +376,7 @@ class lib_test extends \advanced_testcase {
*
* @return array
*/
- public function folder_get_recent_mod_activity_provider(): array {
+ public static function folder_get_recent_mod_activity_provider(): array {
return [
'Teacher with force download' => [
'forcedownload' => 1,
diff --git a/mod/forum/tests/backup_forum_activity_task_test.php b/mod/forum/tests/backup_forum_activity_task_test.php
index d0990a31d46..28c021717e5 100644
--- a/mod/forum/tests/backup_forum_activity_task_test.php
+++ b/mod/forum/tests/backup_forum_activity_task_test.php
@@ -49,7 +49,7 @@ class backup_forum_activity_task_test extends \advanced_testcase {
$this->assertEquals($expectation, backup_forum_activity_task::encode_content_links($content));
}
- public function encode_content_links_provider() {
+ public static function encode_content_links_provider(): array {
global $CFG;
$altwwwroot = 'http://invalid.example.com/';
return [
diff --git a/mod/forum/tests/custom_completion_test.php b/mod/forum/tests/custom_completion_test.php
index 0f7fd080854..1d5df101112 100644
--- a/mod/forum/tests/custom_completion_test.php
+++ b/mod/forum/tests/custom_completion_test.php
@@ -55,7 +55,7 @@ class custom_completion_test extends advanced_testcase {
*
* @return array[]
*/
- public function get_state_provider(): array {
+ public static function get_state_provider(): array {
return [
'Undefined rule' => [
'somenonexistentrule', 0, COMPLETION_TRACKING_NONE, 0, 0, 0, null, coding_exception::class
@@ -214,7 +214,7 @@ class custom_completion_test extends advanced_testcase {
*
* @return array[]
*/
- public function get_available_custom_rules_provider(): array {
+ public static function get_available_custom_rules_provider(): array {
return [
'Completion discussions available' => [
COMPLETION_ENABLED, ['completiondiscussions']
diff --git a/mod/forum/tests/dates_test.php b/mod/forum/tests/dates_test.php
index 6a304e3e867..79a9a04a300 100644
--- a/mod/forum/tests/dates_test.php
+++ b/mod/forum/tests/dates_test.php
@@ -43,7 +43,7 @@ class dates_test extends advanced_testcase {
* Data provider for get_dates_for_module().
* @return array[]
*/
- public function get_dates_for_module_provider(): array {
+ public static function get_dates_for_module_provider(): array {
$now = time();
$before = $now - DAYSECS;
$after = $now + DAYSECS;
diff --git a/mod/forum/tests/entities_discussion_test.php b/mod/forum/tests/entities_discussion_test.php
index 4a0dccfaefc..f4b448af8ce 100644
--- a/mod/forum/tests/entities_discussion_test.php
+++ b/mod/forum/tests/entities_discussion_test.php
@@ -159,7 +159,7 @@ class entities_discussion_test extends \advanced_testcase {
*
* @return array start/end time offsets and the expected results.
*/
- public function diplay_period_options_provider() {
+ public static function diplay_period_options_provider(): array {
return array(
["No dates set", 0, 0, true, false, true],
["Only started date in the future", 100, 0, false, false, false],
diff --git a/mod/forum/tests/exporters_post_test.php b/mod/forum/tests/exporters_post_test.php
index ef2c33a51cd..8387b834b27 100644
--- a/mod/forum/tests/exporters_post_test.php
+++ b/mod/forum/tests/exporters_post_test.php
@@ -201,7 +201,7 @@ class exporters_post_test extends \advanced_testcase {
*
* @return array
*/
- public function export_post_provider(): array {
+ public static function export_post_provider(): array {
return [
'Simple export' => [
],
diff --git a/mod/forum/tests/grade/forum_gradeitem_test.php b/mod/forum/tests/grade/forum_gradeitem_test.php
index 86d9c6ee1d8..3d62c316ea1 100644
--- a/mod/forum/tests/grade/forum_gradeitem_test.php
+++ b/mod/forum/tests/grade/forum_gradeitem_test.php
@@ -216,7 +216,7 @@ class forum_gradeitem_test extends \advanced_testcase {
*
* @return array
*/
- public function should_grade_only_active_users_provider(): array {
+ public static function should_grade_only_active_users_provider(): array {
return [
'Enabled showonlyactiveenrol setting; enabled showonlyactiveenrol preference; view suspended users capability' =>
[
diff --git a/mod/forum/tests/grade/gradeitems_test.php b/mod/forum/tests/grade/gradeitems_test.php
index 404791ac8a4..1bbe060d919 100644
--- a/mod/forum/tests/grade/gradeitems_test.php
+++ b/mod/forum/tests/grade/gradeitems_test.php
@@ -77,7 +77,7 @@ class gradeitems_test extends advanced_testcase {
*
* @return array
*/
- public function is_advancedgrading_itemname_provider(): array {
+ public static function is_advancedgrading_itemname_provider(): array {
return [
'rating is not advanced' => [
'rating',
diff --git a/mod/forum/tests/h5p/canedit_test.php b/mod/forum/tests/h5p/canedit_test.php
index 1973bf8eeb6..2602f615fd3 100644
--- a/mod/forum/tests/h5p/canedit_test.php
+++ b/mod/forum/tests/h5p/canedit_test.php
@@ -123,7 +123,7 @@ class canedit_test extends \advanced_testcase {
*
* @return array
*/
- public function can_edit_content_provider(): array {
+ public static function can_edit_content_provider(): array {
return [
// Component = mod_forum.
'mod_forum: Admin user is author' => [
diff --git a/mod/forum/tests/lib_test.php b/mod/forum/tests/lib_test.php
index 1c13e3711c1..d2d70243861 100644
--- a/mod/forum/tests/lib_test.php
+++ b/mod/forum/tests/lib_test.php
@@ -3242,7 +3242,7 @@ class lib_test extends \advanced_testcase {
*
* @return array
*/
- public function forum_discussion_is_locked_provider() {
+ public static function forum_discussion_is_locked_provider(): array {
return [
'Unlocked: lockdiscussionafter is false' => [
['lockdiscussionafter' => false],
@@ -3296,7 +3296,7 @@ class lib_test extends \advanced_testcase {
*
* @return array
*/
- public function forum_is_cutoff_date_reached_provider() {
+ public static function forum_is_cutoff_date_reached_provider(): array {
$now = time();
return [
'cutoffdate is unset' => [
@@ -3344,7 +3344,7 @@ class lib_test extends \advanced_testcase {
*
* @return array
*/
- public function forum_is_due_date_reached_provider() {
+ public static function forum_is_due_date_reached_provider(): array {
$now = time();
return [
'duedate is unset' => [
@@ -4091,7 +4091,7 @@ class lib_test extends \advanced_testcase {
*
* @return array
*/
- public function forum_check_throttling_early_returns_provider() {
+ public static function forum_check_throttling_early_returns_provider(): array {
return [
'Empty blockafter' => [(object)['id' => 1, 'course' => SITEID, 'blockafter' => 0]],
'Empty blockperiod' => [(object)['id' => 1, 'course' => SITEID, 'blockafter' => DAYSECS, 'blockperiod' => 0]],
@@ -4114,7 +4114,7 @@ class lib_test extends \advanced_testcase {
*
* @return array
*/
- public function forum_check_throttling_early_exceptions_provider() {
+ public static function forum_check_throttling_early_exceptions_provider(): array {
return [
'Non-object forum' => ['a'],
'Forum ID not set' => [(object)['id' => false]],
diff --git a/mod/forum/tests/mail_test.php b/mod/forum/tests/mail_test.php
index 0a4db889641..ac8ea0576f9 100644
--- a/mod/forum/tests/mail_test.php
+++ b/mod/forum/tests/mail_test.php
@@ -991,7 +991,7 @@ class mail_test extends \advanced_testcase {
/**
* dataProvider for test_forum_post_email_templates().
*/
- public function forum_post_email_templates_provider() {
+ public static function forum_post_email_templates_provider(): array {
// Base information, we'll build variations based on it.
$base = array(
'user' => array('firstname' => 'Love', 'lastname' => 'Moodle', 'mailformat' => 0, 'maildigest' => 0),
diff --git a/mod/forum/tests/output_email_test.php b/mod/forum/tests/output_email_test.php
index 1169e2e032c..1c997632677 100644
--- a/mod/forum/tests/output_email_test.php
+++ b/mod/forum/tests/output_email_test.php
@@ -29,7 +29,7 @@ class output_email_test extends \advanced_testcase {
/**
* Data provider for the postdate function tests.
*/
- public function postdate_provider() {
+ public static function postdate_provider(): array {
return array(
'Timed discussions disabled, timestart unset' => array(
'globalconfig' => array(
diff --git a/mod/forum/tests/subscriptions_test.php b/mod/forum/tests/subscriptions_test.php
index 1194b60b92b..0bab898dff0 100644
--- a/mod/forum/tests/subscriptions_test.php
+++ b/mod/forum/tests/subscriptions_test.php
@@ -1311,7 +1311,7 @@ class subscriptions_test extends \advanced_testcase {
$this->assertGreaterThan($suppliedcmcount, $calculatedcmcount);
}
- public function is_subscribable_forums() {
+ public static function is_subscribable_forums(): array {
return [
[
'forcesubscribe' => FORUM_DISALLOWSUBSCRIBE,
@@ -1328,9 +1328,9 @@ class subscriptions_test extends \advanced_testcase {
];
}
- public function is_subscribable_provider() {
+ public static function is_subscribable_provider(): array {
$data = [];
- foreach ($this->is_subscribable_forums() as $forum) {
+ foreach (self::is_subscribable_forums() as $forum) {
$data[] = [$forum];
}
@@ -1369,7 +1369,7 @@ class subscriptions_test extends \advanced_testcase {
$this->assertFalse(\mod_forum\subscriptions::is_subscribable($forum));
}
- public function is_subscribable_loggedin_provider() {
+ public static function is_subscribable_loggedin_provider(): array {
return [
[
['forcesubscribe' => FORUM_DISALLOWSUBSCRIBE],
diff --git a/mod/glossary/tests/custom_completion_test.php b/mod/glossary/tests/custom_completion_test.php
index c9af3d71cd7..87d7cd2ec70 100644
--- a/mod/glossary/tests/custom_completion_test.php
+++ b/mod/glossary/tests/custom_completion_test.php
@@ -51,7 +51,7 @@ class custom_completion_test extends advanced_testcase {
*
* @return array[]
*/
- public function get_state_provider(): array {
+ public static function get_state_provider(): array {
return [
'Undefined rule' => [
'somenonexistentrule', COMPLETION_DISABLED, 0, null, coding_exception::class
@@ -174,7 +174,7 @@ class custom_completion_test extends advanced_testcase {
*
* @return array[]
*/
- public function get_available_custom_rules_provider(): array {
+ public static function get_available_custom_rules_provider(): array {
return [
'Completion submit available' => [
COMPLETION_ENABLED, ['completionentries']
diff --git a/mod/h5pactivity/tests/event/report_viewed_test.php b/mod/h5pactivity/tests/event/report_viewed_test.php
index afb5703b70a..a5de5faf978 100644
--- a/mod/h5pactivity/tests/event/report_viewed_test.php
+++ b/mod/h5pactivity/tests/event/report_viewed_test.php
@@ -114,7 +114,7 @@ class report_viewed_test extends advanced_testcase {
*
* @return array
*/
- public function report_viewed_data(): array {
+ public static function report_viewed_data(): array {
return [
// Exception cases.
'Event withour other data (exception)' => [
diff --git a/mod/h5pactivity/tests/external/get_attempts_test.php b/mod/h5pactivity/tests/external/get_attempts_test.php
index 86b5a108b45..170da5c827b 100644
--- a/mod/h5pactivity/tests/external/get_attempts_test.php
+++ b/mod/h5pactivity/tests/external/get_attempts_test.php
@@ -154,7 +154,7 @@ class get_attempts_test extends externallib_advanced_testcase {
*
* @return array
*/
- public function execute_data(): array {
+ public static function execute_data(): array {
return [
// Teacher checking a user with attempts.
'Manual grade, Teacher asking participant with attempts' => [
@@ -458,7 +458,7 @@ class get_attempts_test extends externallib_advanced_testcase {
*
* @return array
*/
- public function execute_multipleusers_data(): array {
+ public static function execute_multipleusers_data(): array {
return [
// Teacher checks.
'Teacher checking students with attempts' => [
diff --git a/mod/h5pactivity/tests/external/get_h5pactivity_access_information_test.php b/mod/h5pactivity/tests/external/get_h5pactivity_access_information_test.php
index 6f7be0dd8b3..816b3ee05f4 100644
--- a/mod/h5pactivity/tests/external/get_h5pactivity_access_information_test.php
+++ b/mod/h5pactivity/tests/external/get_h5pactivity_access_information_test.php
@@ -90,7 +90,7 @@ class get_h5pactivity_access_information_test extends externallib_advanced_testc
*
* @return array
*/
- public function get_h5pactivity_access_information_data(): array {
+ public static function get_h5pactivity_access_information_data(): array {
return [
'Admin, tracking enabled' => [
'', 1, ['canview', 'canreviewattempts', 'canaddinstance']
diff --git a/mod/h5pactivity/tests/external/get_results_test.php b/mod/h5pactivity/tests/external/get_results_test.php
index 081501e5229..031a724ae4f 100644
--- a/mod/h5pactivity/tests/external/get_results_test.php
+++ b/mod/h5pactivity/tests/external/get_results_test.php
@@ -146,7 +146,7 @@ class get_results_test extends externallib_advanced_testcase {
*
* @return array
*/
- public function execute_data(): array {
+ public static function execute_data(): array {
return [
'Teacher reviewing an attempt' => [
1, manager::REVIEWCOMPLETION, 'editingteacher', 'student', true, 1
@@ -277,7 +277,7 @@ class get_results_test extends externallib_advanced_testcase {
*
* @return array
*/
- public function execute_multipleattempts_data(): array {
+ public static function execute_multipleattempts_data(): array {
return [
// Teacher cases.
'Teacher reviewing students attempts' => [
@@ -408,7 +408,7 @@ class get_results_test extends externallib_advanced_testcase {
*
* @return array
*/
- public function execute_mixactivities_data(): array {
+ public static function execute_mixactivities_data(): array {
return [
// Teacher cases.
'Correct activity id' => [
diff --git a/mod/h5pactivity/tests/external/get_user_attempts_test.php b/mod/h5pactivity/tests/external/get_user_attempts_test.php
index faff92273f4..e76b868d519 100644
--- a/mod/h5pactivity/tests/external/get_user_attempts_test.php
+++ b/mod/h5pactivity/tests/external/get_user_attempts_test.php
@@ -145,7 +145,7 @@ class get_user_attempts_test extends externallib_advanced_testcase {
*
* @return array
*/
- public function execute_multipleusers_data(): array {
+ public static function execute_multipleusers_data(): array {
return [
// Teacher checks.
'Teacher checking students with attempts' => [
@@ -188,7 +188,7 @@ class get_user_attempts_test extends externallib_advanced_testcase {
*
* @return array[]
*/
- public function execute_with_sortorder(): array {
+ public static function execute_with_sortorder(): array {
return [
'Sort by id' => ['id', ['user01', 'user02']],
'Sort by id desc' => ['id desc', ['user02', 'user01']],
diff --git a/mod/h5pactivity/tests/local/attempt_test.php b/mod/h5pactivity/tests/local/attempt_test.php
index e4ff6b8d9a2..8278ae1165d 100644
--- a/mod/h5pactivity/tests/local/attempt_test.php
+++ b/mod/h5pactivity/tests/local/attempt_test.php
@@ -159,7 +159,7 @@ class attempt_test extends \advanced_testcase {
*
* @return array
*/
- public function save_statement_data(): array {
+ public static function save_statement_data(): array {
return [
'Statement without definition and result' => [
'', false, false, [false, 0, 0, 0, 0, null, null]
@@ -291,7 +291,7 @@ class attempt_test extends \advanced_testcase {
*
* @return array
*/
- public function delete_all_attempts_data(): array {
+ public static function delete_all_attempts_data(): array {
return [
'Delete all attempts from activity' => [
false, [0, 0, 2, 2, 2, 4]
@@ -392,7 +392,7 @@ class attempt_test extends \advanced_testcase {
*
* @return array
*/
- public function basic_setters_data(): array {
+ public static function basic_setters_data(): array {
return [
'Set attempt duration' => [
'duration', 25, 35
diff --git a/mod/h5pactivity/tests/local/grader_test.php b/mod/h5pactivity/tests/local/grader_test.php
index 36389c0c423..870a5119c97 100644
--- a/mod/h5pactivity/tests/local/grader_test.php
+++ b/mod/h5pactivity/tests/local/grader_test.php
@@ -160,7 +160,7 @@ class grader_test extends \advanced_testcase {
*
* @return array
*/
- public function grade_item_update_data(): array {
+ public static function grade_item_update_data(): array {
return [
'Change idnumber' => [
100, false, 'newidnumber'
@@ -258,7 +258,7 @@ class grader_test extends \advanced_testcase {
*
* @return array
*/
- public function update_grades_data(): array {
+ public static function update_grades_data(): array {
return [
// Quantitative grade, all attempts completed.
'Same grademax, all users, all completed' => [
diff --git a/mod/h5pactivity/tests/local/manager_test.php b/mod/h5pactivity/tests/local/manager_test.php
index 53bdee4cbab..77bdce412cf 100644
--- a/mod/h5pactivity/tests/local/manager_test.php
+++ b/mod/h5pactivity/tests/local/manager_test.php
@@ -95,7 +95,7 @@ class manager_test extends \advanced_testcase {
*
* @return array
*/
- public function is_tracking_enabled_data(): array {
+ public static function is_tracking_enabled_data(): array {
return [
'Logged student, tracking enabled' => [
true, 'student', 1, true
@@ -209,7 +209,7 @@ class manager_test extends \advanced_testcase {
*
* @return array
*/
- public function get_users_scaled_score_data(): array {
+ public static function get_users_scaled_score_data(): array {
return [
'Tracking with max attempt method' => [
1, manager::GRADEHIGHESTATTEMPT, [1.00000, 31, 2], [0.66667, 32, 2]
@@ -286,7 +286,7 @@ class manager_test extends \advanced_testcase {
*
* @return array
*/
- public function get_selected_attempt_data(): array {
+ public static function get_selected_attempt_data(): array {
return [
'Tracking with max attempt method' => [
1, manager::GRADEHIGHESTATTEMPT, manager::GRADEHIGHESTATTEMPT
@@ -395,7 +395,7 @@ class manager_test extends \advanced_testcase {
*
* @return array
*/
- public function can_view_all_attempts_data(): array {
+ public static function can_view_all_attempts_data(): array {
return [
// No tracking cases.
'No tracking with admin using $USER' => [
@@ -467,7 +467,7 @@ class manager_test extends \advanced_testcase {
*
* @return array
*/
- public function can_view_own_attempts_data(): array {
+ public static function can_view_own_attempts_data(): array {
return [
// No tracking cases.
'No tracking, review none, using $USER, without attempts' => [
@@ -606,7 +606,7 @@ class manager_test extends \advanced_testcase {
*
* @return array
*/
- public function count_attempts_all_data(): array {
+ public static function count_attempts_all_data(): array {
return [
'Students with both view and submit capability' => [true, true, false, 6],
'Students without view but with submit capability' => [false, true, false, 0],
@@ -672,7 +672,7 @@ class manager_test extends \advanced_testcase {
*
* @return array
*/
- public function get_active_users_join_data(): array {
+ public static function get_active_users_join_data(): array {
return [
'All potential users' => [
'allpotentialusers' => true,
@@ -895,7 +895,7 @@ class manager_test extends \advanced_testcase {
*
* @return array
*/
- public function get_report_data(): array {
+ public static function get_report_data(): array {
return [
// No tracking scenarios.
'No tracking, review none, no attempts, teacher' => [
@@ -1030,7 +1030,7 @@ class manager_test extends \advanced_testcase {
*
* @return array
*/
- public function get_report_data_groupmode(): array {
+ public static function get_report_data_groupmode(): array {
return [
// No tracking scenarios.
'course groupmode is SEPARATEGROUPS' => [false],
@@ -1088,7 +1088,7 @@ class manager_test extends \advanced_testcase {
*
* @return array
*/
- public function get_attempt_data(): array {
+ public static function get_attempt_data(): array {
return [
'Get the current activity attempt' => [
'current', 'current'
diff --git a/mod/h5pactivity/tests/restore_test.php b/mod/h5pactivity/tests/restore_test.php
index 6b3d7778895..a060b1f08a5 100644
--- a/mod/h5pactivity/tests/restore_test.php
+++ b/mod/h5pactivity/tests/restore_test.php
@@ -155,7 +155,7 @@ class restore_test extends advanced_testcase {
*
* @return array
*/
- public function backup_restore_data(): array {
+ public static function backup_restore_data(): array {
return [
'Activity attempts and restore with userdata' => [
true, true, [1, 1, 3], [1, 1, 3]
diff --git a/mod/label/tests/lib_test.php b/mod/label/tests/lib_test.php
index 90f16ed8464..911651554ab 100644
--- a/mod/label/tests/lib_test.php
+++ b/mod/label/tests/lib_test.php
@@ -231,7 +231,7 @@ class lib_test extends \advanced_testcase {
*
* @return array
*/
- public function label_get_name_data_provider(): array {
+ public static function label_get_name_data_provider(): array {
return [
'simple' => [
'content' => 'Simple textual content
',
diff --git a/mod/lesson/tests/dates_test.php b/mod/lesson/tests/dates_test.php
index 4d4345cb665..0d2b676ff40 100644
--- a/mod/lesson/tests/dates_test.php
+++ b/mod/lesson/tests/dates_test.php
@@ -43,7 +43,7 @@ class dates_test extends advanced_testcase {
* Data provider for get_dates_for_module().
* @return array[]
*/
- public function get_dates_for_module_provider(): array {
+ public static function get_dates_for_module_provider(): array {
$now = time();
$before = $now - DAYSECS;
$earlier = $before - DAYSECS;
diff --git a/mod/lesson/tests/locallib_test.php b/mod/lesson/tests/locallib_test.php
index 91e8ce64b4b..7571ed7a1f4 100644
--- a/mod/lesson/tests/locallib_test.php
+++ b/mod/lesson/tests/locallib_test.php
@@ -260,7 +260,7 @@ class locallib_test extends \advanced_testcase {
*
* @return array
*/
- public function get_last_attempt_dataprovider() {
+ public static function get_last_attempt_dataprovider(): array {
return [
[0, [(object)['id' => 1], (object)['id' => 2], (object)['id' => 3]], (object)['id' => 3]],
[1, [(object)['id' => 1], (object)['id' => 2], (object)['id' => 3]], (object)['id' => 1]],
diff --git a/mod/lesson/tests/numeric_helper_test.php b/mod/lesson/tests/numeric_helper_test.php
index a0ea02a24b9..f72e32ded46 100644
--- a/mod/lesson/tests/numeric_helper_test.php
+++ b/mod/lesson/tests/numeric_helper_test.php
@@ -62,7 +62,7 @@ class numeric_helper_test extends \advanced_testcase {
*
* @return array
*/
- public function lesson_unformat_dataprovider() {
+ public static function lesson_unformat_dataprovider(): array {
return [
"Using a decimal as a separator" => [
"decsep" => ".",
@@ -100,7 +100,7 @@ class numeric_helper_test extends \advanced_testcase {
*
* @return array
*/
- public function lesson_format_dataprovider() {
+ public static function lesson_format_dataprovider(): array {
return [
"Using a decimal as a separator" => [
"decsep" => ".",
diff --git a/mod/lti/tests/local/ltiopenid/jwks_helper_test.php b/mod/lti/tests/local/ltiopenid/jwks_helper_test.php
index 0fe71e29fb9..8fcac76df8c 100644
--- a/mod/lti/tests/local/ltiopenid/jwks_helper_test.php
+++ b/mod/lti/tests/local/ltiopenid/jwks_helper_test.php
@@ -66,7 +66,7 @@ class jwks_helper_test extends \basic_testcase {
* Provider for test_fix_jwks_alg.
* @return array test data.
*/
- public function jwks_alg_provider(): array {
+ public static function jwks_alg_provider(): array {
return [
// Algs already present, so no changes to input key array.
'All JWKS keys have algs set' => [
diff --git a/mod/lti/tests/locallib_test.php b/mod/lti/tests/locallib_test.php
index 3a04c21f6eb..a3f0d35e9fe 100644
--- a/mod/lti/tests/locallib_test.php
+++ b/mod/lti/tests/locallib_test.php
@@ -517,7 +517,7 @@ class locallib_test extends mod_lti_testcase {
*
* @return array of [urlToTest, expectedTool, allTools]
*/
- public function lti_get_best_tool_by_url_provider() {
+ public static function lti_get_best_tool_by_url_provider(): array {
$tools = [
(object) [
'name' => 'Here',
@@ -605,7 +605,7 @@ class locallib_test extends mod_lti_testcase {
// Construct the final array as required by the provider API. Each row
// of the array contains the URL to test, the expected tool, and
// the complete list of tools.
- return array_map(function($data) use ($tools) {
+ return array_map(function($data) use ($tools): array {
return [$data['url'], $data['expected'], $tools];
}, $data);
}
@@ -1915,7 +1915,7 @@ MwIDAQAB
*
* @return array[] the test case data.
*/
- public function lti_get_ims_role_provider() {
+ public static function lti_get_ims_role_provider(): array {
return [
'Student, LTI 1.1, no role switch' => [
'islti2' => false,
diff --git a/mod/lti/tests/servicelib_test.php b/mod/lti/tests/servicelib_test.php
index a20fbc8184e..1fd5c321a1a 100644
--- a/mod/lti/tests/servicelib_test.php
+++ b/mod/lti/tests/servicelib_test.php
@@ -47,7 +47,7 @@ class servicelib_test extends \basic_testcase {
*
* @return array
*/
- public function message_id_provider() {
+ public static function message_id_provider(): array {
$valid = <<
diff --git a/mod/quiz/accessrule/seb/tests/access_manager_test.php b/mod/quiz/accessrule/seb/tests/access_manager_test.php
index 3a7743add70..8fd5e308349 100644
--- a/mod/quiz/accessrule/seb/tests/access_manager_test.php
+++ b/mod/quiz/accessrule/seb/tests/access_manager_test.php
@@ -343,7 +343,7 @@ class access_manager_test extends \advanced_testcase {
*
* @return array
*/
- public function should_validate_basic_header_data_provider() {
+ public static function should_validate_basic_header_data_provider(): array {
return [
[settings_provider::USE_SEB_NO, false],
[settings_provider::USE_SEB_CONFIG_MANUALLY, false],
@@ -377,7 +377,7 @@ class access_manager_test extends \advanced_testcase {
*
* @return array
*/
- public function should_validate_config_key_data_provider() {
+ public static function should_validate_config_key_data_provider(): array {
return [
[settings_provider::USE_SEB_NO, false],
[settings_provider::USE_SEB_CONFIG_MANUALLY, true],
@@ -410,7 +410,7 @@ class access_manager_test extends \advanced_testcase {
*
* @return array
*/
- public function should_validate_browser_exam_key_data_provider() {
+ public static function should_validate_browser_exam_key_data_provider(): array {
return [
[settings_provider::USE_SEB_NO, false],
[settings_provider::USE_SEB_CONFIG_MANUALLY, false],
diff --git a/mod/quiz/accessrule/seb/tests/config_key_test.php b/mod/quiz/accessrule/seb/tests/config_key_test.php
index cf21162b42a..1e4f2f7572d 100644
--- a/mod/quiz/accessrule/seb/tests/config_key_test.php
+++ b/mod/quiz/accessrule/seb/tests/config_key_test.php
@@ -59,7 +59,7 @@ class config_key_test extends \advanced_testcase {
*
* @return array
*/
- public function real_ck_hash_provider() : array {
+ public static function real_ck_hash_provider(): array {
return [
'unencrypted_mac2.1.4' => ['unencrypted_mac_001.seb',
'4fa9af8ec8759eb7c680752ef4ee5eaf1a860628608fccae2715d519849f9292', ''],
diff --git a/mod/quiz/accessrule/seb/tests/external/validate_quiz_access_test.php b/mod/quiz/accessrule/seb/tests/external/validate_quiz_access_test.php
index 4a470a4d381..ec765772125 100644
--- a/mod/quiz/accessrule/seb/tests/external/validate_quiz_access_test.php
+++ b/mod/quiz/accessrule/seb/tests/external/validate_quiz_access_test.php
@@ -56,7 +56,7 @@ class validate_quiz_access_test extends \advanced_testcase {
*
* @return array
*/
- public function bad_parameters_provider(): array {
+ public static function bad_parameters_provider(): array {
return [
'no params' => [
'cmid' => null,
diff --git a/mod/quiz/accessrule/seb/tests/property_list_test.php b/mod/quiz/accessrule/seb/tests/property_list_test.php
index 50eef499869..b6def63d989 100644
--- a/mod/quiz/accessrule/seb/tests/property_list_test.php
+++ b/mod/quiz/accessrule/seb/tests/property_list_test.php
@@ -304,7 +304,7 @@ class property_list_test extends \advanced_testcase {
*
* @return array Array with test data.
*/
- public function good_update_data_provider() : array {
+ public static function good_update_data_provider(): array {
return [
'Update string' => ['testKeytestValue', 'testKey', 'newValue'],
'Update bool' => ['testKey', 'testKey', false],
@@ -317,7 +317,7 @@ class property_list_test extends \advanced_testcase {
*
* @return array Array with test data.
*/
- public function bad_update_data_provider() : array {
+ public static function bad_update_data_provider(): array {
return [
'Update string with bool' => ['testKeytestValue', 'testKey', true, 'testValue',
@@ -379,7 +379,7 @@ class property_list_test extends \advanced_testcase {
*
* @return array
*/
- public function json_data_provider() : array {
+ public static function json_data_provider(): array {
$data = "blahblah";
$base64data = base64_encode($data);
diff --git a/mod/quiz/accessrule/seb/tests/quiz_settings_test.php b/mod/quiz/accessrule/seb/tests/quiz_settings_test.php
index 57335a77f8d..7fa0ba32a45 100644
--- a/mod/quiz/accessrule/seb/tests/quiz_settings_test.php
+++ b/mod/quiz/accessrule/seb/tests/quiz_settings_test.php
@@ -528,7 +528,7 @@ class quiz_settings_test extends \advanced_testcase {
*
* @return array
*/
- public function bad_browser_exam_key_provider() : array {
+ public static function bad_browser_exam_key_provider(): array {
return [
'Short string' => ['fdsf434r',
'A key should be a 64-character hex string.'],
@@ -544,7 +544,7 @@ class quiz_settings_test extends \advanced_testcase {
*
* @return array Test data.
*/
- public function filter_rules_provider() : array {
+ public static function filter_rules_provider(): array {
return [
'enabled simple expessions' => [
(object) [
diff --git a/mod/quiz/accessrule/seb/tests/rule_test.php b/mod/quiz/accessrule/seb/tests/rule_test.php
index dccca8fc453..307bb2c6182 100644
--- a/mod/quiz/accessrule/seb/tests/rule_test.php
+++ b/mod/quiz/accessrule/seb/tests/rule_test.php
@@ -87,7 +87,7 @@ class rule_test extends \advanced_testcase {
*
* @return array
*/
- public function valid_form_data_provider() : array {
+ public static function valid_form_data_provider(): array {
return [
'valid seb_requiresafeexambrowser' => ['seb_requiresafeexambrowser', '0'],
'valid seb_linkquitseb0' => ['seb_linkquitseb', 'http://safeexambrowser.org/macosx'],
@@ -103,7 +103,7 @@ class rule_test extends \advanced_testcase {
*
* @return array
*/
- public function invalid_form_data_provider() : array {
+ public static function invalid_form_data_provider(): array {
return [
'invalid seb_requiresafeexambrowser' => ['seb_requiresafeexambrowser', 'Uh oh!'],
'invalid seb_linkquitseb0' => ['seb_linkquitseb', '\0'],
diff --git a/mod/quiz/accessrule/seb/tests/settings_provider_test.php b/mod/quiz/accessrule/seb/tests/settings_provider_test.php
index 7f63c36393d..a87afffb818 100644
--- a/mod/quiz/accessrule/seb/tests/settings_provider_test.php
+++ b/mod/quiz/accessrule/seb/tests/settings_provider_test.php
@@ -93,7 +93,7 @@ class settings_provider_test extends \advanced_testcase {
*
* @return array
*/
- public function settings_capability_data_provider() {
+ public static function settings_capability_data_provider(): array {
$data = [];
// Build first level SEB config settings. Any of this setting let us use SEB manual config.
diff --git a/mod/quiz/accessrule/timelimit/tests/rule_test.php b/mod/quiz/accessrule/timelimit/tests/rule_test.php
index 36a075bc841..a2b4ff77d5c 100644
--- a/mod/quiz/accessrule/timelimit/tests/rule_test.php
+++ b/mod/quiz/accessrule/timelimit/tests/rule_test.php
@@ -63,7 +63,7 @@ class rule_test extends \basic_testcase {
*
* @return array of ($timetoclose, $timelimit, $displaylimit, $actuallimit)
*/
- public function time_limit_access_rule_with_time_close_provider() {
+ public static function time_limit_access_rule_with_time_close_provider(): array {
return [
'Close time is earlier than time limit' => [1800, 3600, 3600, 1800],
'Close time is on time limit' => [3600, 3600, 3600, 3600],
diff --git a/mod/quiz/report/overview/tests/report_test.php b/mod/quiz/report/overview/tests/report_test.php
index f82d457f069..e040be3331b 100644
--- a/mod/quiz/report/overview/tests/report_test.php
+++ b/mod/quiz/report/overview/tests/report_test.php
@@ -53,7 +53,7 @@ class report_test extends \advanced_testcase {
*
* @return array the data for the test sub-cases.
*/
- public function report_sql_cases(): array {
+ public static function report_sql_cases(): array {
return [[null], ['csv']]; // Only need to test on or off, not all download types.
}
@@ -247,7 +247,7 @@ class report_test extends \advanced_testcase {
* Bands provider.
* @return array
*/
- public function get_bands_count_and_width_provider(): array {
+ public static function get_bands_count_and_width_provider(): array {
return [
[10, [20, .5]],
[20, [20, 1]],
diff --git a/mod/quiz/tests/dates_test.php b/mod/quiz/tests/dates_test.php
index b550f1690ed..5b0c135612c 100644
--- a/mod/quiz/tests/dates_test.php
+++ b/mod/quiz/tests/dates_test.php
@@ -43,7 +43,7 @@ class dates_test extends advanced_testcase {
* Data provider for get_dates_for_module().
* @return array[]
*/
- public function get_dates_for_module_provider(): array {
+ public static function get_dates_for_module_provider(): array {
$now = time();
$before = $now - DAYSECS;
$earlier = $before - DAYSECS;
diff --git a/mod/quiz/tests/locallib_test.php b/mod/quiz/tests/locallib_test.php
index 06e1b5b06e7..a3c9f687a8d 100644
--- a/mod/quiz/tests/locallib_test.php
+++ b/mod/quiz/tests/locallib_test.php
@@ -58,7 +58,7 @@ class locallib_test extends \advanced_testcase {
format_float(0.247, 3));
}
- public function quiz_attempt_state_data_provider() {
+ public static function quiz_attempt_state_data_provider(): array {
return [
[quiz_attempt::IN_PROGRESS, null, null, mod_quiz_display_options::DURING],
[quiz_attempt::FINISHED, -90, null, mod_quiz_display_options::IMMEDIATELY_AFTER],
diff --git a/mod/scorm/tests/custom_completion_test.php b/mod/scorm/tests/custom_completion_test.php
index cf267af1c76..fdb083d4282 100644
--- a/mod/scorm/tests/custom_completion_test.php
+++ b/mod/scorm/tests/custom_completion_test.php
@@ -44,7 +44,7 @@ class custom_completion_test extends advanced_testcase {
*
* @return array[]
*/
- public function get_state_provider(): array {
+ public static function get_state_provider(): array {
// Prepare various reusable user scorm track data used to mock various completion states/requirements.
$completionincomplete = (object) [
@@ -301,7 +301,7 @@ class custom_completion_test extends advanced_testcase {
*
* @return array[]
*/
- public function get_available_custom_rules_provider(): array {
+ public static function get_available_custom_rules_provider(): array {
return [
'Completion status enabled only' => [
[
diff --git a/mod/scorm/tests/dates_test.php b/mod/scorm/tests/dates_test.php
index 363e5444af9..f9cf79c1dcc 100644
--- a/mod/scorm/tests/dates_test.php
+++ b/mod/scorm/tests/dates_test.php
@@ -43,7 +43,7 @@ class dates_test extends advanced_testcase {
* Data provider for get_dates_for_module().
* @return array[]
*/
- public function get_dates_for_module_provider(): array {
+ public static function get_dates_for_module_provider(): array {
$now = time();
$before = $now - DAYSECS;
$earlier = $before - DAYSECS;
diff --git a/mod/scorm/tests/event/events_test.php b/mod/scorm/tests/event/events_test.php
index f05177da285..db1a90fd771 100644
--- a/mod/scorm/tests/event/events_test.php
+++ b/mod/scorm/tests/event/events_test.php
@@ -392,7 +392,7 @@ class events_test extends \advanced_testcase {
/**
* dataProvider for test_scoreraw_submitted_event().
*/
- public function get_scoreraw_submitted_event_provider() {
+ public static function get_scoreraw_submitted_event_provider(): array {
return array(
// SCORM 1.2.
// - cmi.core.score.raw.
@@ -450,7 +450,7 @@ class events_test extends \advanced_testcase {
/**
* dataProvider for test_scoreraw_submitted_event_validations().
*/
- public function get_scoreraw_submitted_event_validations() {
+ public static function get_scoreraw_submitted_event_validations(): array {
return array(
'scoreraw_submitted => missing cmielement' => array(
null, '50',
@@ -511,7 +511,7 @@ class events_test extends \advanced_testcase {
/**
* dataProvider for test_status_submitted_event().
*/
- public function get_status_submitted_event_provider() {
+ public static function get_status_submitted_event_provider(): array {
return array(
// SCORM 1.2.
// 1. Status: cmi.core.lesson_status.
@@ -571,7 +571,7 @@ class events_test extends \advanced_testcase {
/**
* dataProvider for test_status_submitted_event_validations().
*/
- public function get_status_submitted_event_validations() {
+ public static function get_status_submitted_event_validations(): array {
return array(
'status_submitted => missing cmielement' => array(
null, 'passed',
diff --git a/mod/survey/tests/custom_completion_test.php b/mod/survey/tests/custom_completion_test.php
index 08b12b7cb04..98373d8e05b 100644
--- a/mod/survey/tests/custom_completion_test.php
+++ b/mod/survey/tests/custom_completion_test.php
@@ -51,7 +51,7 @@ class custom_completion_test extends advanced_testcase {
*
* @return array[]
*/
- public function get_state_provider(): array {
+ public static function get_state_provider(): array {
return [
'Undefined rule' => [
'somenonexistentrule', COMPLETION_DISABLED, false, null, coding_exception::class
@@ -174,7 +174,7 @@ class custom_completion_test extends advanced_testcase {
*
* @return array[]
*/
- public function get_available_custom_rules_provider(): array {
+ public static function get_available_custom_rules_provider(): array {
return [
'Completion submit available' => [
COMPLETION_ENABLED, ['completionsubmit']
diff --git a/mod/wiki/tests/wikiparser_test.php b/mod/wiki/tests/wikiparser_test.php
index d267cb5b517..d878a9e4338 100644
--- a/mod/wiki/tests/wikiparser_test.php
+++ b/mod/wiki/tests/wikiparser_test.php
@@ -64,7 +64,7 @@ class wikiparser_test extends \advanced_testcase {
*
* @return array
*/
- public function urls_inside_link_text_provider() {
+ public static function urls_inside_link_text_provider(): array {
return [
'creole implicit link' => [
'markup' => 'creole',
diff --git a/mod/workshop/tests/dates_test.php b/mod/workshop/tests/dates_test.php
index 0484a5d146f..3c49437bf81 100644
--- a/mod/workshop/tests/dates_test.php
+++ b/mod/workshop/tests/dates_test.php
@@ -43,7 +43,7 @@ class dates_test extends advanced_testcase {
* Data provider for get_dates_for_module().
* @return array[]
*/
- public function get_dates_for_module_provider(): array {
+ public static function get_dates_for_module_provider(): array {
$now = time();
$before = $now - DAYSECS;
$earlier = $before - DAYSECS;
diff --git a/mod/workshop/tests/lib_test.php b/mod/workshop/tests/lib_test.php
index ef6c2005f74..eddb14b9c53 100644
--- a/mod/workshop/tests/lib_test.php
+++ b/mod/workshop/tests/lib_test.php
@@ -537,7 +537,7 @@ class lib_test extends \advanced_testcase {
*
* @return array of (submissionstart, submissionend, assessmentstart, assessmentend, eventtype, expectedmin, expectedmax)
*/
- public function mod_workshop_core_calendar_get_valid_event_timestart_range_due_no_limit_provider() {
+ public static function mod_workshop_core_calendar_get_valid_event_timestart_range_due_no_limit_provider(): array {
$submissionstart = time() + DAYSECS;
$submissionend = $submissionstart + DAYSECS;
$assessmentstart = $submissionend + DAYSECS;
@@ -692,7 +692,7 @@ class lib_test extends \advanced_testcase {
*
* @return array of (submissionstart, submissionend, assessmentstart, assessmentend, eventtype, fieldtoupdate, newtime)
*/
- public function mod_workshop_core_calendar_event_timestart_updated_provider() {
+ public static function mod_workshop_core_calendar_event_timestart_updated_provider(): array {
$submissionstart = time() + DAYSECS;
$submissionend = $submissionstart + DAYSECS;
$assessmentstart = $submissionend + DAYSECS;
diff --git a/notes/tests/reportbuilder/datasource/notes_test.php b/notes/tests/reportbuilder/datasource/notes_test.php
index 1421e8fa45e..28e8ea37183 100644
--- a/notes/tests/reportbuilder/datasource/notes_test.php
+++ b/notes/tests/reportbuilder/datasource/notes_test.php
@@ -140,7 +140,7 @@ class notes_test extends core_reportbuilder_testcase {
*
* @return array[]
*/
- public function datasource_filters_provider(): array {
+ public static function datasource_filters_provider(): array {
return [
'Filter content' => ['content', 'Cool', 'note:content', [
'note:content_operator' => text::IS_EQUAL_TO,
diff --git a/payment/tests/helper_test.php b/payment/tests/helper_test.php
index 80b3c547c8a..bb66e0716cf 100644
--- a/payment/tests/helper_test.php
+++ b/payment/tests/helper_test.php
@@ -137,7 +137,7 @@ class helper_test extends advanced_testcase {
*
* @return array
*/
- public function get_rounded_cost_provider(): array {
+ public static function get_rounded_cost_provider(): array {
return [
'IRR 0 surcharge' => [5.345, 'IRR', 0, 5],
'IRR 12% surcharge' => [5.345, 'IRR', 12, 6],
@@ -151,7 +151,7 @@ class helper_test extends advanced_testcase {
*
* @return array[]
*/
- public function get_cost_as_string_provider(): array {
+ public static function get_cost_as_string_provider(): array {
return [
'IRR 0 surcharge' => [5.345, 'IRR', 0, 'IRR'."\xc2\xa0".'5'],
'IRR 12% surcharge' => [5.345, 'IRR', 12, 'IRR'."\xc2\xa0".'6'],
diff --git a/privacy/tests/collection_test.php b/privacy/tests/collection_test.php
index 1a1c81025a2..9a7c482c706 100644
--- a/privacy/tests/collection_test.php
+++ b/privacy/tests/collection_test.php
@@ -199,7 +199,7 @@ class collection_test extends \advanced_testcase {
*
* @return array
*/
- public function component_list_provider() {
+ public static function component_list_provider(): array {
return [
['core_privacy'],
['mod_forum'],
diff --git a/privacy/tests/contextlist_base_test.php b/privacy/tests/contextlist_base_test.php
index 851710e5533..bdef2e312c4 100644
--- a/privacy/tests/contextlist_base_test.php
+++ b/privacy/tests/contextlist_base_test.php
@@ -64,7 +64,7 @@ class contextlist_base_test extends advanced_testcase {
*
* @return array
*/
- public function get_contextids_provider() {
+ public static function get_contextids_provider(): array {
return [
'basic' => [
[1, 2, 3, 4, 5],
diff --git a/privacy/tests/contextlist_test.php b/privacy/tests/contextlist_test.php
index b81cdd631d3..a7038d0066c 100644
--- a/privacy/tests/contextlist_test.php
+++ b/privacy/tests/contextlist_test.php
@@ -138,7 +138,7 @@ class contextlist_test extends advanced_testcase {
*
* @return array
*/
- public function data_guess_id_field_from_sql() {
+ public static function data_guess_id_field_from_sql(): array {
return [
'easy' => [
'SELECT contextid FROM {foo}',
diff --git a/privacy/tests/manager_test.php b/privacy/tests/manager_test.php
index f749609a319..c91002e8ab8 100644
--- a/privacy/tests/manager_test.php
+++ b/privacy/tests/manager_test.php
@@ -138,7 +138,7 @@ class manager_test extends \advanced_testcase {
*
* @return array
*/
- public function component_is_compliant_provider() {
+ public static function component_is_compliant_provider(): array {
return [
'An empty subsystem' => [
'core_countries',
@@ -294,7 +294,7 @@ class manager_test extends \advanced_testcase {
*
* @return array
*/
- public function is_empty_subsystem_provider() {
+ public static function is_empty_subsystem_provider(): array {
return [
'A subsystem which has no directory' => [
'core_langconfig',
diff --git a/privacy/tests/moodle_content_writer_test.php b/privacy/tests/moodle_content_writer_test.php
index e2d8de216fe..939ef1dd546 100644
--- a/privacy/tests/moodle_content_writer_test.php
+++ b/privacy/tests/moodle_content_writer_test.php
@@ -173,7 +173,7 @@ class moodle_content_writer_test extends advanced_testcase {
/**
* Data provider for exporting user data.
*/
- public function export_data_provider() {
+ public static function export_data_provider(): array {
return [
'basic' => [
(object) [
@@ -308,7 +308,7 @@ class moodle_content_writer_test extends advanced_testcase {
*
* return array
*/
- public function export_metadata_provider() {
+ public static function export_metadata_provider(): array {
return [
'basic' => [
'key',
@@ -472,7 +472,7 @@ class moodle_content_writer_test extends advanced_testcase {
*
* @return array
*/
- public function export_file_provider() {
+ public static function export_file_provider(): array {
return [
'basic' => [
'intro',
@@ -858,7 +858,7 @@ class moodle_content_writer_test extends advanced_testcase {
*
* @return array
*/
- public function export_user_preference_provider() {
+ public static function export_user_preference_provider(): array {
return [
'basic' => [
'core_privacy',
@@ -1024,7 +1024,7 @@ class moodle_content_writer_test extends advanced_testcase {
*
* @return array
*/
- public function unescaped_unicode_export_provider() {
+ public static function unescaped_unicode_export_provider(): array {
return [
'Unicode' => ['ةكءيٓپچژکگیٹڈڑہھےâîûğŞAaÇÖáǽ你好!'],
];
@@ -1193,7 +1193,7 @@ class moodle_content_writer_test extends advanced_testcase {
*
* @return array
*/
- public function long_filename_provider() {
+ public static function long_filename_provider(): array {
return [
'More than 100 characters' => [
'Etiam sit amet dui vel leo blandit viverra. Proin viverra suscipit velit. Aenean efficitur suscipit nibh nec suscipit',
@@ -1290,7 +1290,7 @@ class moodle_content_writer_test extends advanced_testcase {
*
* @return array
*/
- public function rewrite_pluginfile_urls_provider() {
+ public static function rewrite_pluginfile_urls_provider(): array {
return [
'nullcontent' => [
'intro',
diff --git a/privacy/tests/privacy/provider_test.php b/privacy/tests/privacy/provider_test.php
index d49735378b2..87125bba89c 100644
--- a/privacy/tests/privacy/provider_test.php
+++ b/privacy/tests/privacy/provider_test.php
@@ -46,7 +46,7 @@ class provider_test extends \advanced_testcase {
*
* @return array the array of frankenstyle component names with the relevant class name.
*/
- public function get_component_list() {
+ public static function get_component_list(): array {
$components = ['core' => [
'component' => 'core',
'classname' => manager::get_provider_classname_for_component('core')
@@ -97,12 +97,12 @@ class provider_test extends \advanced_testcase {
*
* @return array
*/
- public function null_provider_provider() {
- return array_filter($this->get_component_list(), function($component) {
- return static::component_implements(
- $component['classname'],
- \core_privacy\local\metadata\null_provider::class
- );
+ public static function null_provider_provider(): array {
+ return array_filter(self::get_component_list(), function($component): bool {
+ return static::component_implements(
+ $component['classname'],
+ \core_privacy\local\metadata\null_provider::class
+ );
});
}
@@ -218,12 +218,12 @@ class provider_test extends \advanced_testcase {
*
* @return array
*/
- public function metadata_provider_provider() {
- return array_filter($this->get_component_list(), function($component) {
- return static::component_implements(
- $component['classname'],
- \core_privacy\local\metadata\provider::class
- );
+ public static function metadata_provider_provider(): array {
+ return array_filter(self::get_component_list(), function($component): bool {
+ return static::component_implements(
+ $component['classname'],
+ \core_privacy\local\metadata\provider::class
+ );
});
}
@@ -232,12 +232,12 @@ class provider_test extends \advanced_testcase {
*
* @return array
*/
- public function is_user_data_provider() {
- return array_filter($this->get_component_list(), function($component) {
- return static::component_implements(
- $component['classname'],
- \core_privacy\local\request\core_user_data_provider::class
- );
+ public static function is_user_data_provider(): array {
+ return array_filter(self::get_component_list(), function($component): bool {
+ return static::component_implements(
+ $component['classname'],
+ \core_privacy\local\request\core_user_data_provider::class
+ );
});
}
@@ -310,7 +310,7 @@ class provider_test extends \advanced_testcase {
}
}
- $componentlist = $this->metadata_provider_provider();
+ $componentlist = self::metadata_provider_provider();
foreach ($componentlist as $componentarray) {
$component = $componentarray['component'];
$classname = $componentarray['classname'];
diff --git a/privacy/tests/request_transform_test.php b/privacy/tests/request_transform_test.php
index 4182273158b..da5505a7768 100644
--- a/privacy/tests/request_transform_test.php
+++ b/privacy/tests/request_transform_test.php
@@ -110,7 +110,7 @@ class request_transform_test extends advanced_testcase {
*
* @return array
*/
- public function yesno_provider() {
+ public static function yesno_provider(): array {
return [
'Bool False' => [
false,
diff --git a/privacy/tests/types_database_table_test.php b/privacy/tests/types_database_table_test.php
index 9d46af57f61..714a6b5faf9 100644
--- a/privacy/tests/types_database_table_test.php
+++ b/privacy/tests/types_database_table_test.php
@@ -84,7 +84,7 @@ class types_database_table_test extends \advanced_testcase {
*
* @return array
*/
- public function invalid_string_provider() {
+ public static function invalid_string_provider(): array {
return [
'Space in summary' => [
'example',
@@ -128,7 +128,7 @@ class types_database_table_test extends \advanced_testcase {
*
* @return array
*/
- public function valid_string_provider() {
+ public static function valid_string_provider(): array {
return [
'Valid combination' => [
'example',
diff --git a/privacy/tests/types_external_location_test.php b/privacy/tests/types_external_location_test.php
index 87a39072777..34bfa71e52d 100644
--- a/privacy/tests/types_external_location_test.php
+++ b/privacy/tests/types_external_location_test.php
@@ -84,7 +84,7 @@ class types_external_location_test extends \advanced_testcase {
*
* @return array
*/
- public function invalid_string_provider() {
+ public static function invalid_string_provider(): array {
return [
'Space in summary' => [
'example',
@@ -128,7 +128,7 @@ class types_external_location_test extends \advanced_testcase {
*
* @return array
*/
- public function valid_string_provider() {
+ public static function valid_string_provider(): array {
return [
'Valid combination' => [
'example',
diff --git a/privacy/tests/types_plugintype_link_test.php b/privacy/tests/types_plugintype_link_test.php
index 187c5f3b49a..e268941a19b 100644
--- a/privacy/tests/types_plugintype_link_test.php
+++ b/privacy/tests/types_plugintype_link_test.php
@@ -77,7 +77,7 @@ class types_plugintype_link_test extends \advanced_testcase {
*
* @return array
*/
- public function invalid_string_provider() {
+ public static function invalid_string_provider(): array {
return [
'Space in summary' => [
'example',
@@ -97,7 +97,7 @@ class types_plugintype_link_test extends \advanced_testcase {
*
* @return array
*/
- public function valid_string_provider() {
+ public static function valid_string_provider(): array {
return [
'Valid combination' => [
'example',
diff --git a/privacy/tests/types_subsystem_link_test.php b/privacy/tests/types_subsystem_link_test.php
index 53cc24586e3..aaace71ae41 100644
--- a/privacy/tests/types_subsystem_link_test.php
+++ b/privacy/tests/types_subsystem_link_test.php
@@ -77,7 +77,7 @@ class types_subsystem_link_test extends \advanced_testcase {
*
* @return array
*/
- public function invalid_string_provider() {
+ public static function invalid_string_provider(): array {
return [
'Space in summary' => [
'example',
@@ -97,7 +97,7 @@ class types_subsystem_link_test extends \advanced_testcase {
*
* @return array
*/
- public function valid_string_provider() {
+ public static function valid_string_provider(): array {
return [
'Valid combination' => [
'example',
diff --git a/privacy/tests/types_user_preference_test.php b/privacy/tests/types_user_preference_test.php
index 3e2dd30e452..c0c12b4a64b 100644
--- a/privacy/tests/types_user_preference_test.php
+++ b/privacy/tests/types_user_preference_test.php
@@ -77,7 +77,7 @@ class types_user_preference_test extends \advanced_testcase {
*
* @return array
*/
- public function invalid_string_provider() {
+ public static function invalid_string_provider(): array {
return [
'Space in summary' => [
'example',
@@ -95,7 +95,7 @@ class types_user_preference_test extends \advanced_testcase {
*
* @return array
*/
- public function valid_string_provider() {
+ public static function valid_string_provider(): array {
return [
'Valid combination' => [
'example',
diff --git a/privacy/tests/userlist_base_test.php b/privacy/tests/userlist_base_test.php
index 0a5e7bfe8ba..9e8ffaf39d1 100644
--- a/privacy/tests/userlist_base_test.php
+++ b/privacy/tests/userlist_base_test.php
@@ -64,7 +64,7 @@ class userlist_base_test extends advanced_testcase {
*
* @return array
*/
- public function get_userids_provider() {
+ public static function get_userids_provider(): array {
return [
'basic' => [
[1, 2, 3, 4, 5],
diff --git a/question/bank/statistics/tests/helper_test.php b/question/bank/statistics/tests/helper_test.php
index 2071ea749c7..e5719ad2dbf 100644
--- a/question/bank/statistics/tests/helper_test.php
+++ b/question/bank/statistics/tests/helper_test.php
@@ -194,7 +194,7 @@ class helper_test extends \advanced_testcase {
*
* @return array
*/
- private function generate_attempt_answers(array $correctanswerflags): array {
+ private static function generate_attempt_answers(array $correctanswerflags): array {
$attempt = [];
for ($i = 1; $i <= 4; $i++) {
if (isset($correctanswerflags) && $correctanswerflags[$i - 1] == 1) {
@@ -266,31 +266,31 @@ class helper_test extends \advanced_testcase {
*
* @return \Generator
*/
- public function load_question_facility_provider(): \Generator {
+ public static function load_question_facility_provider(): \Generator {
yield 'Facility case 1' => [
'Quiz 1 attempts' => [
- $this->generate_attempt_answers([1, 0, 0, 0]),
+ self::generate_attempt_answers([1, 0, 0, 0]),
],
'Expected quiz 1 facilities' => ['100.00%', '0.00%', '0.00%', '0.00%'],
'Quiz 2 attempts' => [
- $this->generate_attempt_answers([1, 0, 0, 0]),
- $this->generate_attempt_answers([1, 1, 0, 0]),
+ self::generate_attempt_answers([1, 0, 0, 0]),
+ self::generate_attempt_answers([1, 1, 0, 0]),
],
'Expected quiz 2 facilities' => ['100.00%', '50.00%', '0.00%', '0.00%'],
'Expected average facilities' => ['100.00%', '25.00%', '0.00%', '0.00%'],
];
yield 'Facility case 2' => [
'Quiz 1 attempts' => [
- $this->generate_attempt_answers([1, 0, 0, 0]),
- $this->generate_attempt_answers([1, 1, 0, 0]),
- $this->generate_attempt_answers([1, 1, 1, 0]),
+ self::generate_attempt_answers([1, 0, 0, 0]),
+ self::generate_attempt_answers([1, 1, 0, 0]),
+ self::generate_attempt_answers([1, 1, 1, 0]),
],
'Expected quiz 1 facilities' => ['100.00%', '66.67%', '33.33%', '0.00%'],
'Quiz 2 attempts' => [
- $this->generate_attempt_answers([1, 0, 0, 0]),
- $this->generate_attempt_answers([1, 1, 0, 0]),
- $this->generate_attempt_answers([1, 1, 1, 0]),
- $this->generate_attempt_answers([1, 1, 1, 1]),
+ self::generate_attempt_answers([1, 0, 0, 0]),
+ self::generate_attempt_answers([1, 1, 0, 0]),
+ self::generate_attempt_answers([1, 1, 1, 0]),
+ self::generate_attempt_answers([1, 1, 1, 1]),
],
'Expected quiz 2 facilities' => ['100.00%', '75.00%', '50.00%', '25.00%'],
'Expected average facilities' => ['100.00%', '70.83%', '41.67%', '12.50%'],
@@ -359,20 +359,20 @@ class helper_test extends \advanced_testcase {
* Data provider for {@see test_load_question_discriminative_efficiency()}.
* @return \Generator
*/
- public function load_question_discriminative_efficiency_provider(): \Generator {
+ public static function load_question_discriminative_efficiency_provider(): \Generator {
yield 'Discriminative efficiency' => [
'Quiz 1 attempts' => [
- $this->generate_attempt_answers([1, 0, 0, 0]),
- $this->generate_attempt_answers([1, 1, 0, 0]),
- $this->generate_attempt_answers([1, 0, 1, 0]),
- $this->generate_attempt_answers([1, 1, 1, 1]),
+ self::generate_attempt_answers([1, 0, 0, 0]),
+ self::generate_attempt_answers([1, 1, 0, 0]),
+ self::generate_attempt_answers([1, 0, 1, 0]),
+ self::generate_attempt_answers([1, 1, 1, 1]),
],
'Expected quiz 1 discriminative efficiency' => ['N/A', '33.33%', '33.33%', '100.00%'],
'Quiz 2 attempts' => [
- $this->generate_attempt_answers([1, 1, 1, 1]),
- $this->generate_attempt_answers([0, 0, 0, 0]),
- $this->generate_attempt_answers([1, 0, 0, 1]),
- $this->generate_attempt_answers([0, 1, 1, 0]),
+ self::generate_attempt_answers([1, 1, 1, 1]),
+ self::generate_attempt_answers([0, 0, 0, 0]),
+ self::generate_attempt_answers([1, 0, 0, 1]),
+ self::generate_attempt_answers([0, 1, 1, 0]),
],
'Expected quiz 2 discriminative efficiency' => ['50.00%', '50.00%', '50.00%', '50.00%'],
'Expected average discriminative efficiency' => ['50.00%', '41.67%', '41.67%', '75.00%'],
@@ -465,20 +465,20 @@ class helper_test extends \advanced_testcase {
* Data provider for {@see test_load_question_discrimination_index()}.
* @return \Generator
*/
- public function load_question_discrimination_index_provider(): \Generator {
+ public static function load_question_discrimination_index_provider(): \Generator {
yield 'Discrimination Index' => [
'Quiz 1 attempts' => [
- $this->generate_attempt_answers([1, 0, 0, 0]),
- $this->generate_attempt_answers([1, 1, 0, 0]),
- $this->generate_attempt_answers([1, 0, 1, 0]),
- $this->generate_attempt_answers([1, 1, 1, 1]),
+ self::generate_attempt_answers([1, 0, 0, 0]),
+ self::generate_attempt_answers([1, 1, 0, 0]),
+ self::generate_attempt_answers([1, 0, 1, 0]),
+ self::generate_attempt_answers([1, 1, 1, 1]),
],
'Expected quiz 1 Discrimination Index' => ['N/A', '30.15%', '30.15%', '81.65%'],
'Quiz 2 attempts' => [
- $this->generate_attempt_answers([1, 1, 1, 1]),
- $this->generate_attempt_answers([0, 0, 0, 0]),
- $this->generate_attempt_answers([1, 0, 0, 1]),
- $this->generate_attempt_answers([0, 1, 1, 0]),
+ self::generate_attempt_answers([1, 1, 1, 1]),
+ self::generate_attempt_answers([0, 0, 0, 0]),
+ self::generate_attempt_answers([1, 0, 0, 1]),
+ self::generate_attempt_answers([0, 1, 1, 0]),
],
'Expected quiz 2 discrimination Index' => ['44.72%', '44.72%', '44.72%', '44.72%'],
'Expected average discrimination Index' => ['44.72%', '37.44%', '37.44%', '63.19%'],
diff --git a/question/bank/tagquestion/tests/external/submit_tags_test.php b/question/bank/tagquestion/tests/external/submit_tags_test.php
index f4d5602abe0..ced1fbd2613 100644
--- a/question/bank/tagquestion/tests/external/submit_tags_test.php
+++ b/question/bank/tagquestion/tests/external/submit_tags_test.php
@@ -192,7 +192,7 @@ class submit_tags_test extends \externallib_advanced_testcase {
*
* @return array Test cases
*/
- public function get_submit_tags_form_testcases() {
+ public static function get_submit_tags_form_testcases(): array {
return [
'course - course' => [
'editingcontext' => 'course',
@@ -274,7 +274,7 @@ class submit_tags_test extends \externallib_advanced_testcase {
* Course tags can only be set on a course category or system context question that
* is being editing in a course context.
*
- * @dataProvider get_submit_tags_form_testcases()
+ * @dataProvider get_submit_tags_form_testcases
* @param string $editingcontext The type of the context the question is being edited in
* @param string $questioncontext The type of the context the question belongs to
* @param string[] $questiontags The tag names to set as question tags
diff --git a/question/engine/tests/question_display_options_test.php b/question/engine/tests/question_display_options_test.php
index 1923c7bc27d..ece6c30f22a 100644
--- a/question/engine/tests/question_display_options_test.php
+++ b/question/engine/tests/question_display_options_test.php
@@ -32,7 +32,7 @@ class question_display_options_test extends \advanced_testcase {
*
* @return array[]
*/
- public function has_question_identifier_provider(): array {
+ public static function has_question_identifier_provider(): array {
return [
'Empty string' => ['', false],
'Empty space' => [' ', false],
@@ -61,7 +61,7 @@ class question_display_options_test extends \advanced_testcase {
*
* @return array[]
*/
- public function add_question_identifier_to_label_provider(): array {
+ public static function add_question_identifier_to_label_provider(): array {
return [
'Empty string identifier' => ['Hello', '', false, false, "Hello"],
'Null identifier' => ['Hello', null, false, false, "Hello"],
diff --git a/question/engine/tests/question_engine_test.php b/question/engine/tests/question_engine_test.php
index edb2aa9fcf8..6bc38bd6b55 100644
--- a/question/engine/tests/question_engine_test.php
+++ b/question/engine/tests/question_engine_test.php
@@ -88,7 +88,7 @@ class question_engine_test extends advanced_testcase {
*
* @return array
*/
- public function get_behaviour_unused_display_options_provider(): array {
+ public static function get_behaviour_unused_display_options_provider(): array {
return [
'interactive' => [
'interactive',
@@ -126,7 +126,7 @@ class question_engine_test extends advanced_testcase {
*
* @return array
*/
- public function can_questions_finish_during_the_attempt_provider(): array {
+ public static function can_questions_finish_during_the_attempt_provider(): array {
return [
['deferredfeedback', false],
['interactive', true],
@@ -150,7 +150,7 @@ class question_engine_test extends advanced_testcase {
*
* @return array
*/
- public function sort_behaviours_provider(): array {
+ public static function sort_behaviours_provider(): array {
$in = [
'b1' => 'Behave 1',
'b2' => 'Behave 2',
@@ -221,7 +221,7 @@ class question_engine_test extends advanced_testcase {
*
* @return array
*/
- public function is_manual_grade_in_range_provider(): array {
+ public static function is_manual_grade_in_range_provider(): array {
return [
'In range' => [
'post' => [
@@ -309,7 +309,7 @@ class question_engine_test extends advanced_testcase {
*
* @return array
*/
- public function render_question_number_provider(): array {
+ public static function render_question_number_provider(): array {
return [
'Test with number is i character' => [
'i',
diff --git a/question/engine/tests/questionattempt_with_steps_test.php b/question/engine/tests/questionattempt_with_steps_test.php
index 8ddfb7a5181..e0cc0c7f20c 100644
--- a/question/engine/tests/questionattempt_with_steps_test.php
+++ b/question/engine/tests/questionattempt_with_steps_test.php
@@ -169,7 +169,7 @@ class questionattempt_with_steps_test extends \advanced_testcase {
*
* @return array test cases
*/
- public function validate_manual_mark_cases(): array {
+ public static function validate_manual_mark_cases(): array {
// Recall, the DB schema stores question grade information to 7 decimal places.
return [
[0, 1, 2, null, ''],
diff --git a/question/format/gift/tests/giftformat_test.php b/question/format/gift/tests/giftformat_test.php
index ef0321b2ee7..52924ae6730 100644
--- a/question/format/gift/tests/giftformat_test.php
+++ b/question/format/gift/tests/giftformat_test.php
@@ -366,7 +366,7 @@ class giftformat_test extends \question_testcase {
*
* @return array Array of 1-element arrays of qtype_multichoice numbering styles
*/
- public function numberingstyle_provider() {
+ public static function numberingstyle_provider(): array {
return [
['abc'],
['ABCD'],
@@ -1330,7 +1330,7 @@ FALSE#42 is the Ultimate Answer.#You gave the right answer.}";
*
* @return array the test cases.
*/
- public function extract_idnumber_and_tags_from_comment_testcases() {
+ public static function extract_idnumber_and_tags_from_comment_testcases(): array {
return [
'blank comment' => ['', [], ''],
'nothing in comment' => ['', [], '// A basic comment.'],
diff --git a/question/tests/calculated_question_summary_test.php b/question/tests/calculated_question_summary_test.php
index b90dcf82366..2d536e7b709 100644
--- a/question/tests/calculated_question_summary_test.php
+++ b/question/tests/calculated_question_summary_test.php
@@ -33,7 +33,7 @@ class calculated_question_summary_test extends \advanced_testcase {
*
* @return array
*/
- public function get_min_max_provider() {
+ public static function get_min_max_provider(): array {
return [
'negative number and null' => [
[
@@ -105,7 +105,7 @@ class calculated_question_summary_test extends \advanced_testcase {
*
* @return array
*/
- public function get_sd_min_max_provider() {
+ public static function get_sd_min_max_provider(): array {
return [
'null and number' => [
[
diff --git a/question/tests/externallib_test.php b/question/tests/externallib_test.php
index f81f2d18504..2c69ffb1469 100644
--- a/question/tests/externallib_test.php
+++ b/question/tests/externallib_test.php
@@ -102,7 +102,7 @@ class externallib_test extends externallib_advanced_testcase {
/**
* Data provider for the get_random_question_summaries test.
*/
- public function get_random_question_summaries_test_cases() {
+ public static function get_random_question_summaries_test_cases(): array {
return [
'empty category' => [
'categoryindex' => 'emptycat',
@@ -174,7 +174,7 @@ class externallib_test extends externallib_advanced_testcase {
* Parent: cat1
* Category: emptycat
*
- * @dataProvider get_random_question_summaries_test_cases()
+ * @dataProvider get_random_question_summaries_test_cases
* @param string $categoryindex The named index for the category to use
* @param bool $includesubcategories If the search should include subcategories
* @param string[] $usetagnames The tag names to include in the search
diff --git a/question/tests/local/statistics/statistics_bulk_loader_test.php b/question/tests/local/statistics/statistics_bulk_loader_test.php
index 1a82648a169..41d1fc4ec92 100644
--- a/question/tests/local/statistics/statistics_bulk_loader_test.php
+++ b/question/tests/local/statistics/statistics_bulk_loader_test.php
@@ -216,7 +216,7 @@ class statistics_bulk_loader_test extends advanced_testcase {
*
* @return array
*/
- private function generate_attempt_answers(array $correctanswerflags): array {
+ private static function generate_attempt_answers(array $correctanswerflags): array {
$attempt = [];
for ($i = 1; $i <= 4; $i++) {
if (isset($correctanswerflags) && $correctanswerflags[$i - 1] == 1) {
@@ -287,31 +287,31 @@ class statistics_bulk_loader_test extends advanced_testcase {
*
* @return Generator
*/
- public function load_question_facility_provider(): Generator {
+ public static function load_question_facility_provider(): Generator {
yield 'Facility case 1' => [
'Quiz 1 attempts' => [
- $this->generate_attempt_answers([1, 0, 0, 0]),
+ self::generate_attempt_answers([1, 0, 0, 0]),
],
'Expected quiz 1 facilities' => [1.0, 0.0, 0.0, 0.0],
'Quiz 2 attempts' => [
- $this->generate_attempt_answers([1, 0, 0, 0]),
- $this->generate_attempt_answers([1, 1, 0, 0]),
+ self::generate_attempt_answers([1, 0, 0, 0]),
+ self::generate_attempt_answers([1, 1, 0, 0]),
],
'Expected quiz 2 facilities' => [1.0, 0.5, 0.0, 0.0],
'Expected average facilities' => [1.0, 0.25, 0.0, 0.0],
];
yield 'Facility case 2' => [
'Quiz 1 attempts' => [
- $this->generate_attempt_answers([1, 0, 0, 0]),
- $this->generate_attempt_answers([1, 1, 0, 0]),
- $this->generate_attempt_answers([1, 1, 1, 0]),
+ self::generate_attempt_answers([1, 0, 0, 0]),
+ self::generate_attempt_answers([1, 1, 0, 0]),
+ self::generate_attempt_answers([1, 1, 1, 0]),
],
'Expected quiz 1 facilities' => [1.0, 0.6667, 0.3333, 0.0],
'Quiz 2 attempts' => [
- $this->generate_attempt_answers([1, 0, 0, 0]),
- $this->generate_attempt_answers([1, 1, 0, 0]),
- $this->generate_attempt_answers([1, 1, 1, 0]),
- $this->generate_attempt_answers([1, 1, 1, 1]),
+ self::generate_attempt_answers([1, 0, 0, 0]),
+ self::generate_attempt_answers([1, 1, 0, 0]),
+ self::generate_attempt_answers([1, 1, 1, 0]),
+ self::generate_attempt_answers([1, 1, 1, 1]),
],
'Expected quiz 2 facilities' => [1.0, 0.75, 0.5, 0.25],
'Expected average facilities' => [1.0, 0.7083, 0.4167, 0.1250],
@@ -384,20 +384,20 @@ class statistics_bulk_loader_test extends advanced_testcase {
* Data provider for {@see test_load_question_discriminative_efficiency()}.
* @return Generator
*/
- public function load_question_discriminative_efficiency_provider(): Generator {
+ public static function load_question_discriminative_efficiency_provider(): Generator {
yield 'Discriminative efficiency' => [
'Quiz 1 attempts' => [
- $this->generate_attempt_answers([1, 0, 0, 0]),
- $this->generate_attempt_answers([1, 1, 0, 0]),
- $this->generate_attempt_answers([1, 0, 1, 0]),
- $this->generate_attempt_answers([1, 1, 1, 1]),
+ self::generate_attempt_answers([1, 0, 0, 0]),
+ self::generate_attempt_answers([1, 1, 0, 0]),
+ self::generate_attempt_answers([1, 0, 1, 0]),
+ self::generate_attempt_answers([1, 1, 1, 1]),
],
'Expected quiz 1 discriminative efficiency' => [null, 33.33, 33.33, 100.00],
'Quiz 2 attempts' => [
- $this->generate_attempt_answers([1, 1, 1, 1]),
- $this->generate_attempt_answers([0, 0, 0, 0]),
- $this->generate_attempt_answers([1, 0, 0, 1]),
- $this->generate_attempt_answers([0, 1, 1, 0]),
+ self::generate_attempt_answers([1, 1, 1, 1]),
+ self::generate_attempt_answers([0, 0, 0, 0]),
+ self::generate_attempt_answers([1, 0, 0, 1]),
+ self::generate_attempt_answers([0, 1, 1, 0]),
],
'Expected quiz 2 discriminative efficiency' => [50.00, 50.00, 50.00, 50.00],
'Expected average discriminative efficiency' => [50.00, 41.67, 41.67, 75.00],
@@ -478,20 +478,20 @@ class statistics_bulk_loader_test extends advanced_testcase {
* Data provider for {@see test_load_question_discrimination_index()}.
* @return Generator
*/
- public function load_question_discrimination_index_provider(): Generator {
+ public static function load_question_discrimination_index_provider(): Generator {
yield 'Discrimination Index' => [
'Quiz 1 attempts' => [
- $this->generate_attempt_answers([1, 0, 0, 0]),
- $this->generate_attempt_answers([1, 1, 0, 0]),
- $this->generate_attempt_answers([1, 0, 1, 0]),
- $this->generate_attempt_answers([1, 1, 1, 1]),
+ self::generate_attempt_answers([1, 0, 0, 0]),
+ self::generate_attempt_answers([1, 1, 0, 0]),
+ self::generate_attempt_answers([1, 0, 1, 0]),
+ self::generate_attempt_answers([1, 1, 1, 1]),
],
'Expected quiz 1 Discrimination Index' => [null, 30.15, 30.15, 81.65],
'Quiz 2 attempts' => [
- $this->generate_attempt_answers([1, 1, 1, 1]),
- $this->generate_attempt_answers([0, 0, 0, 0]),
- $this->generate_attempt_answers([1, 0, 0, 1]),
- $this->generate_attempt_answers([0, 1, 1, 0]),
+ self::generate_attempt_answers([1, 1, 1, 1]),
+ self::generate_attempt_answers([0, 0, 0, 0]),
+ self::generate_attempt_answers([1, 0, 0, 1]),
+ self::generate_attempt_answers([0, 1, 1, 0]),
],
'Expected quiz 2 discrimination Index' => [44.72, 44.72, 44.72, 44.72],
'Expected average discrimination Index' => [44.72, 37.44, 37.44, 63.19],
@@ -575,8 +575,8 @@ class statistics_bulk_loader_test extends advanced_testcase {
$this->resetAfterTest();
// Prepare some quizzes and attempts. Exactly what is not important to this test.
- $quiz1attempts = [$this->generate_attempt_answers([1, 0, 0, 0])];
- $quiz2attempts = [$this->generate_attempt_answers([1, 1, 1, 1])];
+ $quiz1attempts = [self::generate_attempt_answers([1, 0, 0, 0])];
+ $quiz2attempts = [self::generate_attempt_answers([1, 1, 1, 1])];
[, , $questions] = $this->prepare_and_submit_quizzes($quiz1attempts, $quiz2attempts);
// Prepare some useful arrays.
diff --git a/question/tests/random_question_loader_test.php b/question/tests/random_question_loader_test.php
index 8e706765ef3..659a14e6324 100644
--- a/question/tests/random_question_loader_test.php
+++ b/question/tests/random_question_loader_test.php
@@ -219,7 +219,7 @@ class random_question_loader_test extends \advanced_testcase {
/**
* Data provider for the get_questions test.
*/
- public function get_questions_test_cases() {
+ public static function get_questions_test_cases(): array {
return [
'empty category' => [
'categoryindex' => 'emptycat',
@@ -291,7 +291,7 @@ class random_question_loader_test extends \advanced_testcase {
* Parent: cat1
* Category: emptycat
*
- * @dataProvider get_questions_test_cases()
+ * @dataProvider get_questions_test_cases
* @param string $categoryindex The named index for the category to use
* @param bool $includesubcategories If the search should include subcategories
* @param string[] $usetagnames The tag names to include in the search
@@ -429,7 +429,7 @@ class random_question_loader_test extends \advanced_testcase {
/**
* Data provider for the count_questions test.
*/
- public function count_questions_test_cases() {
+ public static function count_questions_test_cases(): array {
return [
'empty category' => [
'categoryindex' => 'emptycat',
@@ -501,7 +501,7 @@ class random_question_loader_test extends \advanced_testcase {
* Parent: cat1
* Category: emptycat
*
- * @dataProvider count_questions_test_cases()
+ * @dataProvider count_questions_test_cases
* @param string $categoryindex The named index for the category to use
* @param bool $includesubcategories If the search should include subcategories
* @param string[] $usetagnames The tag names to include in the search
diff --git a/question/type/ddimageortext/tests/privacy/provider_test.php b/question/type/ddimageortext/tests/privacy/provider_test.php
index e19bdfaeb5e..353f014d890 100644
--- a/question/type/ddimageortext/tests/privacy/provider_test.php
+++ b/question/type/ddimageortext/tests/privacy/provider_test.php
@@ -91,7 +91,7 @@ class provider_test extends \core_privacy\tests\provider_testcase {
*
* @return array Array of valid user preferences.
*/
- public function user_preference_provider() {
+ public static function user_preference_provider(): array {
return [
'default mark 1' => ['defaultmark', 1, 1],
'penalty 33.33333%' => ['penalty', 0.3333333, '33.33333%'],
diff --git a/question/type/ddmarker/tests/privacy/provider_test.php b/question/type/ddmarker/tests/privacy/provider_test.php
index fcf69c7d15e..94cb4654891 100644
--- a/question/type/ddmarker/tests/privacy/provider_test.php
+++ b/question/type/ddmarker/tests/privacy/provider_test.php
@@ -91,7 +91,7 @@ class provider_test extends \core_privacy\tests\provider_testcase {
*
* @return array Array of valid user preferences.
*/
- public function user_preference_provider() {
+ public static function user_preference_provider(): array {
return [
'default mark 1.5' => ['defaultmark', 1.5, 1.5],
'penalty 33.33333%' => ['penalty', 0.3333333, '33.33333%'],
diff --git a/question/type/ddwtos/tests/privacy/provider_test.php b/question/type/ddwtos/tests/privacy/provider_test.php
index 711b7c1744c..1dda6d7f42a 100644
--- a/question/type/ddwtos/tests/privacy/provider_test.php
+++ b/question/type/ddwtos/tests/privacy/provider_test.php
@@ -91,7 +91,7 @@ class provider_test extends \core_privacy\tests\provider_testcase {
*
* @return array Array of valid user preferences.
*/
- public function user_preference_provider() {
+ public static function user_preference_provider(): array {
return [
'default mark 2' => ['defaultmark', 2, 2],
'penalty 33.33333%' => ['penalty', 0.3333333, '33.33333%'],
diff --git a/question/type/essay/tests/form/edit_form_test.php b/question/type/essay/tests/form/edit_form_test.php
index f2f6c7bed81..f55765a44e5 100644
--- a/question/type/essay/tests/form/edit_form_test.php
+++ b/question/type/essay/tests/form/edit_form_test.php
@@ -102,7 +102,7 @@ class edit_form_test extends \advanced_testcase {
*
* @return array, an array of all possible options.
*/
- public function user_preference_provider(): array {
+ public static function user_preference_provider(): array {
$valid = [];
$invalid = ['attachmentsrequired' => get_string('mustrequirefewer', 'qtype_essay')];
return [
diff --git a/question/type/essay/tests/privacy/provider_test.php b/question/type/essay/tests/privacy/provider_test.php
index ef88678dc3b..b5016af5371 100644
--- a/question/type/essay/tests/privacy/provider_test.php
+++ b/question/type/essay/tests/privacy/provider_test.php
@@ -91,7 +91,7 @@ class provider_test extends \core_privacy\tests\provider_testcase {
*
* @return array Array of valid user preferences.
*/
- public function user_preference_provider() {
+ public static function user_preference_provider(): array {
return [
'default mark 2' => ['defaultmark', 2, 2],
'responseformat editror ' => ['responseformat', 'editor', get_string('formateditor', 'qtype_essay')],
diff --git a/question/type/essay/tests/question_test.php b/question/type/essay/tests/question_test.php
index c9d582df97f..e44fe021e59 100644
--- a/question/type/essay/tests/question_test.php
+++ b/question/type/essay/tests/question_test.php
@@ -80,7 +80,7 @@ class question_test extends \advanced_testcase {
*
* @return array List of data sets (test cases)
*/
- public function summarise_response_provider(): array {
+ public static function summarise_response_provider(): array {
return [
'text input required, not attachments required' =>
[1, 0, 'This is the text input for this essay.', 0, 'This is the text input for this essay.'],
@@ -331,7 +331,7 @@ class question_test extends \advanced_testcase {
*
* (The tests are done with a fixed 14-word response.)
*
- * @dataProvider get_min_max_wordlimit_test_cases()
+ * @dataProvider get_min_max_wordlimit_test_cases
* @param int $responserequired whether response required (yes = 1, no = 0)
* @param int $minwordlimit minimum word limit
* @param int $maxwordlimit maximum word limit
@@ -353,7 +353,7 @@ class question_test extends \advanced_testcase {
*
* @return array the test cases.
*/
- public function get_min_max_wordlimit_test_cases(): array {
+ public static function get_min_max_wordlimit_test_cases(): array {
return [
'text input required, min/max word limit not set' => [1, 0, 0, ''],
'text input required, min/max word limit valid (within the boundaries)' => [1, 10, 25, ''],
@@ -370,7 +370,7 @@ class question_test extends \advanced_testcase {
*
* (The tests are done with a fixed 14-word response.)
*
- * @dataProvider get_word_count_message_for_review_test_cases()
+ * @dataProvider get_word_count_message_for_review_test_cases
* @param int|null $minwordlimit minimum word limit
* @param int|null $maxwordlimit maximum word limit
* @param string $expected error message | null
@@ -389,7 +389,7 @@ class question_test extends \advanced_testcase {
*
* @return array the test cases.
*/
- public function get_word_count_message_for_review_test_cases() {
+ public static function get_word_count_message_for_review_test_cases(): array {
return [
'No limit' =>
[null, null, ''],
diff --git a/question/type/gapselect/tests/privacy/provider_test.php b/question/type/gapselect/tests/privacy/provider_test.php
index 85734954527..0fa9f6a402d 100644
--- a/question/type/gapselect/tests/privacy/provider_test.php
+++ b/question/type/gapselect/tests/privacy/provider_test.php
@@ -91,7 +91,7 @@ class provider_test extends \core_privacy\tests\provider_testcase {
*
* @return array Array of valid user preferences.
*/
- public function user_preference_provider() {
+ public static function user_preference_provider(): array {
return [
'default mark 1.5' => ['defaultmark', 1.5, 1.5],
'penalty 25%' => ['penalty', 0.2500000, '25%'],
diff --git a/question/type/match/tests/privacy/provider_test.php b/question/type/match/tests/privacy/provider_test.php
index 41b0fc5147d..7bffe8e9f90 100644
--- a/question/type/match/tests/privacy/provider_test.php
+++ b/question/type/match/tests/privacy/provider_test.php
@@ -91,7 +91,7 @@ class provider_test extends \core_privacy\tests\provider_testcase {
*
* @return array Array of valid user preferences.
*/
- public function user_preference_provider() {
+ public static function user_preference_provider(): array {
return [
'default mark 1' => ['defaultmark', 1, 1],
'penalty 33.33333%' => ['penalty', 0.3333333, '33.33333%'],
diff --git a/question/type/multichoice/tests/privacy/provider_test.php b/question/type/multichoice/tests/privacy/provider_test.php
index 0f2dcb07918..d8fc1877ff5 100644
--- a/question/type/multichoice/tests/privacy/provider_test.php
+++ b/question/type/multichoice/tests/privacy/provider_test.php
@@ -91,7 +91,7 @@ class provider_test extends \core_privacy\tests\provider_testcase {
*
* @return array Array of valid user preferences.
*/
- public function user_preference_provider() {
+ public static function user_preference_provider(): array {
return [
'default mark 2' => ['defaultmark', 2, 2],
'penalty 33.33333%' => ['penalty', 0.3333333, '33.33333%'],
diff --git a/question/type/multichoice/tests/question_type_test.php b/question/type/multichoice/tests/question_type_test.php
index 2caba525bb0..0a053e7e117 100644
--- a/question/type/multichoice/tests/question_type_test.php
+++ b/question/type/multichoice/tests/question_type_test.php
@@ -107,7 +107,7 @@ class question_type_test extends \advanced_testcase {
), $this->qtype->get_possible_responses($q));
}
- public function get_question_saving_which() {
+ public static function get_question_saving_which(): array {
return array(array('two_of_four'), array('one_of_four'));
}
diff --git a/question/type/numerical/tests/answerprocessor_test.php b/question/type/numerical/tests/answerprocessor_test.php
index dd764665b5d..d62bc52ca8f 100644
--- a/question/type/numerical/tests/answerprocessor_test.php
+++ b/question/type/numerical/tests/answerprocessor_test.php
@@ -72,7 +72,7 @@ class answerprocessor_test extends \advanced_testcase {
*
* @return array
*/
- public function parse_response_provider(): array {
+ public static function parse_response_provider(): array {
return [
[['3', '142', '', ''], '3.142'],
[['', '2', '', ''], '.2'],
@@ -191,7 +191,7 @@ class answerprocessor_test extends \advanced_testcase {
*
* @return array
*/
- public function apply_units_provider(): array {
+ public static function apply_units_provider(): array {
return [
[3e8, 'm/s', 1, '3x10^8 m/s'],
[3e8, '', null, '3x10^8'],
@@ -250,7 +250,7 @@ class answerprocessor_test extends \advanced_testcase {
*
* @return array
*/
- public function apply_units_provider_with_units(): array {
+ public static function apply_units_provider_with_units(): array {
return [
[3e8, 'm/s', 1, '3x10^8', 'm/s'],
[3e8, '', null, '3x10^8', ''],
@@ -280,7 +280,7 @@ class answerprocessor_test extends \advanced_testcase {
*
* return array
*/
- public function euro_provider(): array {
+ public static function euro_provider(): array {
return [
[[-1000, '', null], '-1 000'],
[[3.14159, '', null], '3,14159'],
@@ -305,7 +305,7 @@ class answerprocessor_test extends \advanced_testcase {
*
* @return array
*/
- public function percent_provider(): array {
+ public static function percent_provider(): array {
return [
[['3', '%', 0.01], '3%'],
[['1e-6', '%', 0.01], '1e-6 %'],
@@ -334,7 +334,7 @@ class answerprocessor_test extends \advanced_testcase {
*
* @return array
*/
- public function currency_provider(): array {
+ public static function currency_provider(): array {
return [
[['1234.56', '£', 1], '£1,234.56'],
[['100', '$', 1], '$100'],
diff --git a/question/type/shortanswer/tests/privacy/provider_test.php b/question/type/shortanswer/tests/privacy/provider_test.php
index 4c1aed9fdaa..beb293198dd 100644
--- a/question/type/shortanswer/tests/privacy/provider_test.php
+++ b/question/type/shortanswer/tests/privacy/provider_test.php
@@ -91,7 +91,7 @@ class provider_test extends \core_privacy\tests\provider_testcase {
*
* @return array Array of valid user preferences.
*/
- public function user_preference_provider() {
+ public static function user_preference_provider(): array {
return [
'default mark 2' => ['defaultmark', 2, 2],
'penalty 33.33333%' => ['penalty', 0.3333333, '33.33333%'],
diff --git a/rating/tests/rating_test.php b/rating/tests/rating_test.php
index b2fa6a55d15..f9f034a41d3 100644
--- a/rating/tests/rating_test.php
+++ b/rating/tests/rating_test.php
@@ -279,7 +279,7 @@ class rating_test extends \advanced_testcase {
*
* @return array
*/
- public function get_aggregate_string_provider() {
+ public static function get_aggregate_string_provider(): array {
return [
'Non-numeric aggregate produces empty string' => [
RATING_AGGREGATE_NONE,
diff --git a/reportbuilder/tests/external/system_report_exporter_test.php b/reportbuilder/tests/external/system_report_exporter_test.php
index f8ce6f3174c..bef61bc95fd 100644
--- a/reportbuilder/tests/external/system_report_exporter_test.php
+++ b/reportbuilder/tests/external/system_report_exporter_test.php
@@ -48,7 +48,7 @@ class system_report_exporter_test extends advanced_testcase {
*
* @return array[]
*/
- public function export_provider(): array {
+ public static function export_provider(): array {
return [
['With filters' => true],
['Without filters' => false],
diff --git a/reportbuilder/tests/local/entities/user_test.php b/reportbuilder/tests/local/entities/user_test.php
index c6a10beb5e3..2401598c5a6 100644
--- a/reportbuilder/tests/local/entities/user_test.php
+++ b/reportbuilder/tests/local/entities/user_test.php
@@ -71,7 +71,7 @@ class user_test extends advanced_testcase {
*
* @return array
*/
- public function get_name_fields_select_provider(): array {
+ public static function get_name_fields_select_provider(): array {
return [
['firstname lastname', ['firstname', 'lastname']],
['firstname middlename lastname', ['firstname', 'middlename', 'lastname']],
diff --git a/reportbuilder/tests/local/filters/autocomplete_test.php b/reportbuilder/tests/local/filters/autocomplete_test.php
index e42768eb18f..5216cccc7c4 100644
--- a/reportbuilder/tests/local/filters/autocomplete_test.php
+++ b/reportbuilder/tests/local/filters/autocomplete_test.php
@@ -37,7 +37,7 @@ class autocomplete_test extends advanced_testcase {
*
* @return array
*/
- public function get_sql_filter_provider(): array {
+ public static function get_sql_filter_provider(): array {
return [
[[], ["Course 1 full name", "Course 2 full name", "Course 3 full name", "PHPUnit test site"]],
[["course1", "course3"], ["Course 1 full name", "Course 3 full name"]],
diff --git a/reportbuilder/tests/local/filters/boolean_select_test.php b/reportbuilder/tests/local/filters/boolean_select_test.php
index ee28dfedc86..f808e66c326 100644
--- a/reportbuilder/tests/local/filters/boolean_select_test.php
+++ b/reportbuilder/tests/local/filters/boolean_select_test.php
@@ -38,7 +38,7 @@ class boolean_select_test extends advanced_testcase {
*
* @return array
*/
- public function get_sql_filter_simple_provider(): array {
+ public static function get_sql_filter_simple_provider(): array {
return [
[boolean_select::ANY_VALUE, true],
[boolean_select::CHECKED, true],
diff --git a/reportbuilder/tests/local/filters/category_test.php b/reportbuilder/tests/local/filters/category_test.php
index 06e60ad8b09..ee38d24f39a 100644
--- a/reportbuilder/tests/local/filters/category_test.php
+++ b/reportbuilder/tests/local/filters/category_test.php
@@ -38,7 +38,7 @@ class category_test extends advanced_testcase {
*
* @return array
*/
- public function get_sql_filter_provider(): array {
+ public static function get_sql_filter_provider(): array {
return [
['One', false, ['One']],
['One', true, ['One', 'Two', 'Three']],
diff --git a/reportbuilder/tests/local/filters/select_test.php b/reportbuilder/tests/local/filters/select_test.php
index 2038a7bbc9f..475ae6b5851 100644
--- a/reportbuilder/tests/local/filters/select_test.php
+++ b/reportbuilder/tests/local/filters/select_test.php
@@ -38,7 +38,7 @@ class select_test extends advanced_testcase {
*
* @return array
*/
- public function get_sql_filter_simple_provider(): array {
+ public static function get_sql_filter_simple_provider(): array {
return [
[select::ANY_VALUE, null, true],
[select::EQUAL_TO, 'starwars', true],
diff --git a/reportbuilder/tests/local/filters/text_test.php b/reportbuilder/tests/local/filters/text_test.php
index 9a9a5f0d017..0125ebdc7d1 100644
--- a/reportbuilder/tests/local/filters/text_test.php
+++ b/reportbuilder/tests/local/filters/text_test.php
@@ -38,7 +38,7 @@ class text_test extends advanced_testcase {
*
* @return array
*/
- public function get_sql_filter_simple_provider(): array {
+ public static function get_sql_filter_simple_provider(): array {
return [
[text::ANY_VALUE, null, true],
[text::CONTAINS, 'looking', true],
@@ -101,7 +101,7 @@ class text_test extends advanced_testcase {
*
* @return array
*/
- public function get_sql_filter_empty_provider(): array {
+ public static function get_sql_filter_empty_provider(): array {
return [
[text::IS_EMPTY, null, true],
[text::IS_EMPTY, '', true],
diff --git a/reportbuilder/tests/local/filters/user_test.php b/reportbuilder/tests/local/filters/user_test.php
index a9cc75590bf..ea041c402e9 100644
--- a/reportbuilder/tests/local/filters/user_test.php
+++ b/reportbuilder/tests/local/filters/user_test.php
@@ -38,7 +38,7 @@ class user_test extends advanced_testcase {
*
* @return array
*/
- public function get_sql_filter_simple(): array {
+ public static function get_sql_filter_simple(): array {
return [
[user::USER_ANY, ['admin', 'guest', 'user01', 'user02']],
[user::USER_CURRENT, ['user01']],
diff --git a/reportbuilder/tests/local/helpers/schedule_test.php b/reportbuilder/tests/local/helpers/schedule_test.php
index e25dffaf5ac..98d6363f2f4 100644
--- a/reportbuilder/tests/local/helpers/schedule_test.php
+++ b/reportbuilder/tests/local/helpers/schedule_test.php
@@ -257,7 +257,7 @@ class schedule_test extends advanced_testcase {
*
* @return string[]
*/
- public function get_schedule_report_file_format(): array {
+ public static function get_schedule_report_file_format(): array {
return [
['csv'],
['excel'],
diff --git a/reportbuilder/tests/local/helpers/user_filter_manager_test.php b/reportbuilder/tests/local/helpers/user_filter_manager_test.php
index c3049ba757d..909c3667877 100644
--- a/reportbuilder/tests/local/helpers/user_filter_manager_test.php
+++ b/reportbuilder/tests/local/helpers/user_filter_manager_test.php
@@ -46,7 +46,7 @@ class user_filter_manager_test extends advanced_testcase {
*
* @return array
*/
- public function get_provider(): array {
+ public static function get_provider(): array {
return [
'Small value' => ['foo'],
'Large value' => [str_repeat('A', 4000)],
@@ -113,7 +113,7 @@ class user_filter_manager_test extends advanced_testcase {
*
* @return array
*/
- public function reset_all_provider(): array {
+ public static function reset_all_provider(): array {
return [
'Small value' => ['foo'],
'Large value' => [str_repeat('A', 4000)],
diff --git a/reportbuilder/tests/local/report/action_test.php b/reportbuilder/tests/local/report/action_test.php
index 316a3f114e7..1e3735c96ea 100644
--- a/reportbuilder/tests/local/report/action_test.php
+++ b/reportbuilder/tests/local/report/action_test.php
@@ -63,7 +63,7 @@ class action_test extends advanced_testcase {
*
* @return array[]
*/
- public function action_title_provider(): array {
+ public static function action_title_provider(): array {
$title = new lang_string('yes');
return [
'Specified via constructor' => ['', [], $title],
diff --git a/reportbuilder/tests/manager_test.php b/reportbuilder/tests/manager_test.php
index 68d01b9eb4c..983661927aa 100644
--- a/reportbuilder/tests/manager_test.php
+++ b/reportbuilder/tests/manager_test.php
@@ -180,7 +180,7 @@ class manager_test extends core_reportbuilder_testcase {
*
* @return array
*/
- public function report_limit_reached_provider(): array {
+ public static function report_limit_reached_provider(): array {
return [
[0, 1, false],
[1, 1, true],
diff --git a/reportbuilder/tests/task/send_schedule_test.php b/reportbuilder/tests/task/send_schedule_test.php
index 0ac88ad57a6..f09ca7c9ead 100644
--- a/reportbuilder/tests/task/send_schedule_test.php
+++ b/reportbuilder/tests/task/send_schedule_test.php
@@ -44,7 +44,7 @@ class send_schedule_test extends advanced_testcase {
*
* @return array[]
*/
- public function execute_report_viewas_user_provider(): array {
+ public static function execute_report_viewas_user_provider(): array {
return [
'View report as schedule creator' => [schedule::REPORT_VIEWAS_CREATOR, null, 'admin', 'admin'],
'View report as schedule recipient' => [schedule::REPORT_VIEWAS_RECIPIENT, null, 'userone', 'usertwo'],
diff --git a/repository/contentbank/tests/search/search_test.php b/repository/contentbank/tests/search/search_test.php
index 8cba994618e..76a62d7443c 100644
--- a/repository/contentbank/tests/search/search_test.php
+++ b/repository/contentbank/tests/search/search_test.php
@@ -75,7 +75,7 @@ class search_test extends \advanced_testcase {
*
* @return array
*/
- public function get_search_contents_provider(): array {
+ public static function get_search_contents_provider(): array {
return [
'Search for existing pattern found within the name of content items' => [
[
diff --git a/repository/dropbox/tests/api_test.php b/repository/dropbox/tests/api_test.php
index cec67079f1a..4b128c160c7 100644
--- a/repository/dropbox/tests/api_test.php
+++ b/repository/dropbox/tests/api_test.php
@@ -29,7 +29,7 @@ class api_test extends \advanced_testcase {
*
* @return array
*/
- public function has_additional_results_provider() {
+ public static function has_additional_results_provider(): array {
return [
'No more results' => [
(object) [
@@ -88,7 +88,7 @@ class api_test extends \advanced_testcase {
*
* @return array
*/
- public function check_and_handle_api_errors_provider() {
+ public static function check_and_handle_api_errors_provider(): array {
return [
'200 http_code' => [
['http_code' => 200],
@@ -180,7 +180,7 @@ class api_test extends \advanced_testcase {
*
* @return array
*/
- public function supports_thumbnail_provider() {
+ public static function supports_thumbnail_provider(): array {
$tests = [
'Only files support thumbnails' => [
(object) ['.tag' => 'folder'],
diff --git a/repository/googledocs/tests/googledocs_search_content_test.php b/repository/googledocs/tests/googledocs_search_content_test.php
index 5dbedae124c..4bdf067cbea 100644
--- a/repository/googledocs/tests/googledocs_search_content_test.php
+++ b/repository/googledocs/tests/googledocs_search_content_test.php
@@ -105,7 +105,7 @@ class googledocs_search_content_test extends \googledocs_content_testcase {
*
* @return array
*/
- public function get_content_nodes_provider(): array {
+ public static function get_content_nodes_provider(): array {
$rootid = \repository_googledocs::REPOSITORY_ROOT_ID;
$searchnodeid = \repository_googledocs::SEARCH_ROOT_ID;
@@ -118,26 +118,26 @@ class googledocs_search_content_test extends \googledocs_content_testcase {
true,
[],
[
- $this->create_google_drive_shared_drive_object('d85b21c0f86cb5', 'Shared Drive 1'),
+ self::create_google_drive_shared_drive_object('d85b21c0f86cb5', 'Shared Drive 1'),
],
[
- $this->create_google_drive_file_object('d85b21c0f86cb0', 'Test file 3.pdf',
+ self::create_google_drive_file_object('d85b21c0f86cb0', 'Test file 3.pdf',
'application/pdf', 'pdf', '1000', '',
'https://drive.google.com/uc?id=d85b21c0f86cb0&export=download'),
- $this->create_google_drive_folder_object('0c4ad262c65333', 'Test folder 1'),
- $this->create_google_drive_file_object('bed5a0f08d412a', 'Test file 1.pdf',
+ self::create_google_drive_folder_object('0c4ad262c65333', 'Test folder 1'),
+ self::create_google_drive_file_object('bed5a0f08d412a', 'Test file 1.pdf',
'application/pdf', 'pdf'),
- $this->create_google_drive_folder_object('9c4ad262c65333', 'Test folder 2'),
+ self::create_google_drive_folder_object('9c4ad262c65333', 'Test folder 2'),
],
[
- $this->create_folder_content_node_array('0c4ad262c65333', 'Test folder 1',
+ self::create_folder_content_node_array('0c4ad262c65333', 'Test folder 1',
"{$rootid}|Google+Drive/{$searchnodeid}|" . urlencode("{$searchforstring} 'test'")),
- $this->create_folder_content_node_array('9c4ad262c65333', 'Test folder 2',
+ self::create_folder_content_node_array('9c4ad262c65333', 'Test folder 2',
"{$rootid}|Google+Drive/{$searchnodeid}|" . urlencode("{$searchforstring} 'test'")),
- $this->create_file_content_node_array('bed5a0f08d412a', 'Test file 1.pdf',
+ self::create_file_content_node_array('bed5a0f08d412a', 'Test file 1.pdf',
'Test file 1.pdf', null, '', 'https://googleusercontent.com/type/application/pdf',
'', 'download'),
- $this->create_file_content_node_array('d85b21c0f86cb0', 'Test file 3.pdf',
+ self::create_file_content_node_array('d85b21c0f86cb0', 'Test file 3.pdf',
'Test file 3.pdf', '1000', '', 'https://googleusercontent.com/type/application/pdf',
'https://drive.google.com/uc?id=d85b21c0f86cb0&export=download', 'download'),
],
@@ -149,16 +149,16 @@ class googledocs_search_content_test extends \googledocs_content_testcase {
[],
[],
[
- $this->create_google_drive_folder_object('0c4ad262c65333', 'Testing folder 3'),
- $this->create_google_drive_folder_object('d85b21c0f86cb0', 'Testing folder 1'),
- $this->create_google_drive_folder_object('bed5a0f08d412a', 'Testing folder 2'),
+ self::create_google_drive_folder_object('0c4ad262c65333', 'Testing folder 3'),
+ self::create_google_drive_folder_object('d85b21c0f86cb0', 'Testing folder 1'),
+ self::create_google_drive_folder_object('bed5a0f08d412a', 'Testing folder 2'),
],
[
- $this->create_folder_content_node_array('0c4ad262c65333', 'Testing folder 3',
+ self::create_folder_content_node_array('0c4ad262c65333', 'Testing folder 3',
"{$rootid}|Google+Drive/{$searchnodeid}|" . urlencode("{$searchforstring} 'testing'")),
- $this->create_folder_content_node_array('d85b21c0f86cb0', 'Testing folder 1',
+ self::create_folder_content_node_array('d85b21c0f86cb0', 'Testing folder 1',
"{$rootid}|Google+Drive/{$searchnodeid}|" . urlencode("{$searchforstring} 'testing'")),
- $this->create_folder_content_node_array('bed5a0f08d412a', 'Testing folder 2',
+ self::create_folder_content_node_array('bed5a0f08d412a', 'Testing folder 2',
"{$rootid}|Google+Drive/{$searchnodeid}|" . urlencode("{$searchforstring} 'testing'")),
],
],
@@ -168,18 +168,18 @@ class googledocs_search_content_test extends \googledocs_content_testcase {
false,
['doc', 'txt'],
[
- $this->create_google_drive_shared_drive_object('d85b21c0f86cb5', 'Shared Drive 1'),
+ self::create_google_drive_shared_drive_object('d85b21c0f86cb5', 'Shared Drive 1'),
],
[
- $this->create_google_drive_file_object('d85b21c0f86cb0', 'Testing file 3.pdf',
+ self::create_google_drive_file_object('d85b21c0f86cb0', 'Testing file 3.pdf',
'application/pdf', 'pdf', '1000'),
- $this->create_google_drive_file_object('a85b21c0f86cb0', 'Testing file 1.txt',
+ self::create_google_drive_file_object('a85b21c0f86cb0', 'Testing file 1.txt',
'text/plain', 'txt', '3000'),
- $this->create_google_drive_file_object('f85b21c0f86cb0', 'Testing file 2.doc',
+ self::create_google_drive_file_object('f85b21c0f86cb0', 'Testing file 2.doc',
'application/msword', 'doc', '2000'),
],
[
- $this->create_file_content_node_array('d85b21c0f86cb0', 'Testing file 3.pdf',
+ self::create_file_content_node_array('d85b21c0f86cb0', 'Testing file 3.pdf',
'Testing file 3.pdf', '1000', '',
'https://googleusercontent.com/type/application/pdf', '', 'download'),
],
diff --git a/repository/googledocs/tests/helper_test.php b/repository/googledocs/tests/helper_test.php
index 64c32d8ce06..dd761c446af 100644
--- a/repository/googledocs/tests/helper_test.php
+++ b/repository/googledocs/tests/helper_test.php
@@ -50,7 +50,7 @@ class helper_test extends \repository_googledocs_testcase {
*
* @return array
*/
- public function build_node_path_provider(): array {
+ public static function build_node_path_provider(): array {
$rootid = \repository_googledocs::REPOSITORY_ROOT_ID;
$mydriveid = \repository_googledocs::MY_DRIVE_ROOT_ID;
@@ -105,7 +105,7 @@ class helper_test extends \repository_googledocs_testcase {
*
* @return array
*/
- public function explode_node_path_provider(): array {
+ public static function explode_node_path_provider(): array {
$rootid = \repository_googledocs::REPOSITORY_ROOT_ID;
@@ -155,7 +155,7 @@ class helper_test extends \repository_googledocs_testcase {
*
* @return array
*/
- public function get_browser_provider(): array {
+ public static function get_browser_provider(): array {
$rootid = \repository_googledocs::REPOSITORY_ROOT_ID;
$mydriveid = \repository_googledocs::MY_DRIVE_ROOT_ID;
@@ -208,17 +208,16 @@ class helper_test extends \repository_googledocs_testcase {
*
* @return array
*/
- public function get_node_provider(): array {
-
+ public static function get_node_provider(): array {
return [
'The content object represents a Google Drive folder.' =>
[
- $this->create_google_drive_folder_object('e3b0c44298fc1c149', 'Folder', ''),
+ self::create_google_drive_folder_object('e3b0c44298fc1c149', 'Folder', ''),
\repository_googledocs\local\node\folder_node::class,
],
'The content object represents a Google Drive file.' =>
[
- $this->create_google_drive_file_object('de04d58dc5ccc', 'File.pdf',
+ self::create_google_drive_file_object('de04d58dc5ccc', 'File.pdf',
'application/pdf'),
\repository_googledocs\local\node\file_node::class,
],
@@ -253,7 +252,7 @@ class helper_test extends \repository_googledocs_testcase {
*
* @return array
*/
- public function request_exception_provider(): array {
+ public static function request_exception_provider(): array {
return [
'The API call throws exception (status: 403; message: Access Not Configured).' =>
diff --git a/repository/googledocs/tests/local/browser/googledocs_drive_content_test.php b/repository/googledocs/tests/local/browser/googledocs_drive_content_test.php
index ad5e43e331f..f7b2d36ffc2 100644
--- a/repository/googledocs/tests/local/browser/googledocs_drive_content_test.php
+++ b/repository/googledocs/tests/local/browser/googledocs_drive_content_test.php
@@ -100,8 +100,7 @@ class googledocs_drive_content_test extends \googledocs_content_testcase {
*
* @return array
*/
- public function get_content_nodes_provider(): array {
-
+ public static function get_content_nodes_provider(): array {
$rootid = \repository_googledocs::REPOSITORY_ROOT_ID;
$mydriveid = \repository_googledocs::MY_DRIVE_ROOT_ID;
@@ -113,25 +112,25 @@ class googledocs_drive_content_test extends \googledocs_content_testcase {
true,
[],
[
- $this->create_google_drive_shared_drive_object('d85b21c0f86cb5', 'Shared Drive 1'),
+ self::create_google_drive_shared_drive_object('d85b21c0f86cb5', 'Shared Drive 1'),
],
[
- $this->create_google_drive_folder_object('1c4ad262c65333', 'Folder 2'),
- $this->create_google_drive_file_object('d85b21c0f86cb0', 'File 3.pdf',
+ self::create_google_drive_folder_object('1c4ad262c65333', 'Folder 2'),
+ self::create_google_drive_file_object('d85b21c0f86cb0', 'File 3.pdf',
'application/pdf', 'pdf', '1000'),
- $this->create_google_drive_folder_object('0c4ad262c65333', 'Folder 1'),
- $this->create_google_drive_file_object('bed5a0f08d412a', 'File 1.pdf',
+ self::create_google_drive_folder_object('0c4ad262c65333', 'Folder 1'),
+ self::create_google_drive_file_object('bed5a0f08d412a', 'File 1.pdf',
'application/pdf', 'pdf'),
],
[
- $this->create_folder_content_node_array('0c4ad262c65333', 'Folder 1',
+ self::create_folder_content_node_array('0c4ad262c65333', 'Folder 1',
"{$rootid}|Google+Drive/{$mydriveid}|My+Drive"),
- $this->create_folder_content_node_array('1c4ad262c65333', 'Folder 2',
+ self::create_folder_content_node_array('1c4ad262c65333', 'Folder 2',
"{$rootid}|Google+Drive/{$mydriveid}|My+Drive"),
- $this->create_file_content_node_array('bed5a0f08d412a', 'File 1.pdf', 'File 1.pdf',
+ self::create_file_content_node_array('bed5a0f08d412a', 'File 1.pdf', 'File 1.pdf',
null, '', 'https://googleusercontent.com/type/application/pdf', '',
'download'),
- $this->create_file_content_node_array('d85b21c0f86cb0', 'File 3.pdf', 'File 3.pdf',
+ self::create_file_content_node_array('d85b21c0f86cb0', 'File 3.pdf', 'File 3.pdf',
'1000', '', 'https://googleusercontent.com/type/application/pdf', '',
'download'),
],
@@ -144,16 +143,16 @@ class googledocs_drive_content_test extends \googledocs_content_testcase {
[],
[],
[
- $this->create_google_drive_folder_object('0c4ad262c65333', 'Folder 3'),
- $this->create_google_drive_folder_object('d85b21c0f86cb0', 'Folder 1'),
- $this->create_google_drive_folder_object('bed5a0f08d412a', 'Folder 2'),
+ self::create_google_drive_folder_object('0c4ad262c65333', 'Folder 3'),
+ self::create_google_drive_folder_object('d85b21c0f86cb0', 'Folder 1'),
+ self::create_google_drive_folder_object('bed5a0f08d412a', 'Folder 2'),
],
[
- $this->create_folder_content_node_array('0c4ad262c65333', 'Folder 3',
+ self::create_folder_content_node_array('0c4ad262c65333', 'Folder 3',
"{$rootid}|Google+Drive/{$mydriveid}|My+Drive"),
- $this->create_folder_content_node_array('d85b21c0f86cb0', 'Folder 1',
+ self::create_folder_content_node_array('d85b21c0f86cb0', 'Folder 1',
"{$rootid}|Google+Drive/{$mydriveid}|My+Drive"),
- $this->create_folder_content_node_array('bed5a0f08d412a', 'Folder 2',
+ self::create_folder_content_node_array('bed5a0f08d412a', 'Folder 2',
"{$rootid}|Google+Drive/{$mydriveid}|My+Drive"),
],
],
@@ -165,18 +164,18 @@ class googledocs_drive_content_test extends \googledocs_content_testcase {
['txt'],
[],
[
- $this->create_google_drive_file_object('d85b21c0f86cb0', 'File 3.pdf',
+ self::create_google_drive_file_object('d85b21c0f86cb0', 'File 3.pdf',
'application/pdf', 'pdf', '1000'),
- $this->create_google_drive_file_object('a85b21c0f86cb0', 'File 1.txt',
+ self::create_google_drive_file_object('a85b21c0f86cb0', 'File 1.txt',
'text/plain', 'txt', '3000'),
- $this->create_google_drive_file_object('f85b21c0f86cb0', 'File 2.doc',
+ self::create_google_drive_file_object('f85b21c0f86cb0', 'File 2.doc',
'application/msword', 'doc', '2000'),
],
[
- $this->create_file_content_node_array('d85b21c0f86cb0', 'File 3.pdf', 'File 3.pdf',
+ self::create_file_content_node_array('d85b21c0f86cb0', 'File 3.pdf', 'File 3.pdf',
'1000', '', 'https://googleusercontent.com/type/application/pdf', '',
'download'),
- $this->create_file_content_node_array('f85b21c0f86cb0', 'File 2.doc', 'File 2.doc',
+ self::create_file_content_node_array('f85b21c0f86cb0', 'File 2.doc', 'File 2.doc',
'2000', '', 'https://googleusercontent.com/type/application/msword', '',
'download'),
],
@@ -217,7 +216,7 @@ class googledocs_drive_content_test extends \googledocs_content_testcase {
*
* @return array
*/
- public function get_navigation_provider(): array {
+ public static function get_navigation_provider(): array {
$rootid = \repository_googledocs::REPOSITORY_ROOT_ID;
$mydriveid = \repository_googledocs::MY_DRIVE_ROOT_ID;
diff --git a/repository/googledocs/tests/local/browser/googledocs_root_content_test.php b/repository/googledocs/tests/local/browser/googledocs_root_content_test.php
index 0ec0b70dff8..fb46d44a5b3 100644
--- a/repository/googledocs/tests/local/browser/googledocs_root_content_test.php
+++ b/repository/googledocs/tests/local/browser/googledocs_root_content_test.php
@@ -29,8 +29,7 @@ require_once($CFG->dirroot . '/repository/googledocs/lib.php');
* @copyright 2021 Mihail Geshoski
* @license http://www.gnu.org/copyleft/gpl.html GNU GPL v3 or later
*/
-class googledocs_root_content_test extends \googledocs_content_testcase {
-
+final class googledocs_root_content_test extends \googledocs_content_testcase {
/**
* Test get_content_nodes().
*
@@ -66,37 +65,34 @@ class googledocs_root_content_test extends \googledocs_content_testcase {
*
* @return array
*/
- public function get_content_nodes_provider(): array {
-
+ public static function get_content_nodes_provider(): array {
$rootid = \repository_googledocs::REPOSITORY_ROOT_ID;
$mydriveid = \repository_googledocs::MY_DRIVE_ROOT_ID;
$shareddrivesid = \repository_googledocs::SHARED_DRIVES_ROOT_ID;
return [
- 'Shared drives exist.' =>
+ 'Shared drives exist.' => [
[
- [
- $this->create_google_drive_shared_drive_object('d85b21c0f86cb5', 'Shared Drive 1'),
- $this->create_google_drive_shared_drive_object('d85b21c0f86cb0', 'Shared Drive 3'),
- ],
- [
- $this->create_folder_content_node_array($mydriveid,
- get_string('mydrive', 'repository_googledocs'),
- "{$rootid}|Google+Drive"),
- $this->create_folder_content_node_array($shareddrivesid,
- get_string('shareddrives', 'repository_googledocs'),
- "{$rootid}|Google+Drive"),
- ],
+ self::create_google_drive_shared_drive_object('d85b21c0f86cb5', 'Shared Drive 1'),
+ self::create_google_drive_shared_drive_object('d85b21c0f86cb0', 'Shared Drive 3'),
],
- 'Shared drives do not exist.' =>
[
- [],
- [
- $this->create_folder_content_node_array($mydriveid,
- get_string('mydrive', 'repository_googledocs'),
- "{$rootid}|Google+Drive"),
- ],
+ self::create_folder_content_node_array($mydriveid,
+ get_string('mydrive', 'repository_googledocs'),
+ "{$rootid}|Google+Drive"),
+ self::create_folder_content_node_array($shareddrivesid,
+ get_string('shareddrives', 'repository_googledocs'),
+ "{$rootid}|Google+Drive"),
],
+ ],
+ 'Shared drives do not exist.' => [
+ [],
+ [
+ self::create_folder_content_node_array($mydriveid,
+ get_string('mydrive', 'repository_googledocs'),
+ "{$rootid}|Google+Drive"),
+ ],
+ ],
];
}
}
diff --git a/repository/googledocs/tests/local/browser/googledocs_shared_drives_content_test.php b/repository/googledocs/tests/local/browser/googledocs_shared_drives_content_test.php
index 93e1fc4288b..4d07e39c206 100644
--- a/repository/googledocs/tests/local/browser/googledocs_shared_drives_content_test.php
+++ b/repository/googledocs/tests/local/browser/googledocs_shared_drives_content_test.php
@@ -29,8 +29,7 @@ require_once($CFG->dirroot . '/repository/googledocs/lib.php');
* @copyright 2021 Mihail Geshoski
* @license http://www.gnu.org/copyleft/gpl.html GNU GPL v3 or later
*/
-class googledocs_shared_drives_content_test extends \googledocs_content_testcase {
-
+final class googledocs_shared_drives_content_test extends \googledocs_content_testcase {
/**
* Test get_content_nodes().
*
@@ -68,8 +67,7 @@ class googledocs_shared_drives_content_test extends \googledocs_content_testcase
*
* @return array
*/
- public function get_content_nodes_provider(): array {
-
+ public static function get_content_nodes_provider(): array {
$rootid = \repository_googledocs::REPOSITORY_ROOT_ID;
$shareddrivesid = \repository_googledocs::SHARED_DRIVES_ROOT_ID;
$shareddrivesstring = get_string('shareddrives', 'repository_googledocs');
@@ -78,34 +76,34 @@ class googledocs_shared_drives_content_test extends \googledocs_content_testcase
'Shared drives exist; ordering applied.' =>
[
[
- $this->create_google_drive_shared_drive_object('d85b21c0f86cb5', 'Shared Drive 1'),
- $this->create_google_drive_shared_drive_object('d85b21c0f86cb0', 'Shared Drive 3'),
- $this->create_google_drive_shared_drive_object('bed5a0f08d412a', 'Shared Drive 2'),
+ self::create_google_drive_shared_drive_object('d85b21c0f86cb5', 'Shared Drive 1'),
+ self::create_google_drive_shared_drive_object('d85b21c0f86cb0', 'Shared Drive 3'),
+ self::create_google_drive_shared_drive_object('bed5a0f08d412a', 'Shared Drive 2'),
],
true,
[
- $this->create_folder_content_node_array('d85b21c0f86cb5', 'Shared Drive 1',
+ self::create_folder_content_node_array('d85b21c0f86cb5', 'Shared Drive 1',
"{$rootid}|Google+Drive/{$shareddrivesid}|" . urlencode($shareddrivesstring)),
- $this->create_folder_content_node_array('bed5a0f08d412a', 'Shared Drive 2',
+ self::create_folder_content_node_array('bed5a0f08d412a', 'Shared Drive 2',
"{$rootid}|Google+Drive/{$shareddrivesid}|" . urlencode($shareddrivesstring)),
- $this->create_folder_content_node_array('d85b21c0f86cb0', 'Shared Drive 3',
+ self::create_folder_content_node_array('d85b21c0f86cb0', 'Shared Drive 3',
"{$rootid}|Google+Drive/{$shareddrivesid}|" . urlencode($shareddrivesstring)),
],
],
'Shared drives exist; ordering not applied.' =>
[
[
- $this->create_google_drive_shared_drive_object('0c4ad262c65333', 'Shared Drive 3'),
- $this->create_google_drive_shared_drive_object('d85b21c0f86cb0', 'Shared Drive 1'),
- $this->create_google_drive_shared_drive_object('bed5a0f08d412a', 'Shared Drive 2'),
+ self::create_google_drive_shared_drive_object('0c4ad262c65333', 'Shared Drive 3'),
+ self::create_google_drive_shared_drive_object('d85b21c0f86cb0', 'Shared Drive 1'),
+ self::create_google_drive_shared_drive_object('bed5a0f08d412a', 'Shared Drive 2'),
],
false,
[
- $this->create_folder_content_node_array('0c4ad262c65333', 'Shared Drive 3',
+ self::create_folder_content_node_array('0c4ad262c65333', 'Shared Drive 3',
"{$rootid}|Google+Drive/{$shareddrivesid}|" . urlencode($shareddrivesstring)),
- $this->create_folder_content_node_array('d85b21c0f86cb0', 'Shared Drive 1',
+ self::create_folder_content_node_array('d85b21c0f86cb0', 'Shared Drive 1',
"{$rootid}|Google+Drive/{$shareddrivesid}|" . urlencode($shareddrivesstring)),
- $this->create_folder_content_node_array('bed5a0f08d412a', 'Shared Drive 2',
+ self::create_folder_content_node_array('bed5a0f08d412a', 'Shared Drive 2',
"{$rootid}|Google+Drive/{$shareddrivesid}|" . urlencode($shareddrivesstring)),
],
],
diff --git a/repository/googledocs/tests/local/node/file_node_test.php b/repository/googledocs/tests/local/node/file_node_test.php
index 188341c15d9..623f5a6f789 100644
--- a/repository/googledocs/tests/local/node/file_node_test.php
+++ b/repository/googledocs/tests/local/node/file_node_test.php
@@ -28,8 +28,7 @@ require_once($CFG->dirroot . '/repository/googledocs/tests/repository_googledocs
* @copyright 2021 Mihail Geshoski
* @license http://www.gnu.org/copyleft/gpl.html GNU GPL v3 or later
*/
-class file_node_test extends \repository_googledocs_testcase {
-
+final class file_node_test extends \repository_googledocs_testcase {
/**
* Test create_node_array().
*
@@ -56,55 +55,54 @@ class file_node_test extends \repository_googledocs_testcase {
*
* @return array
*/
- public function create_node_array_provider(): array {
-
+ public static function create_node_array_provider(): array {
return [
'Google Drive file with an extension.' =>
[
- $this->create_google_drive_file_object('d85b21c0f86cb0', 'File.pdf',
+ self::create_google_drive_file_object('d85b21c0f86cb0', 'File.pdf',
'application/pdf', 'pdf', '1000', '01/01/21 0:30'),
[],
- $this->create_file_content_node_array('d85b21c0f86cb0', 'File.pdf', 'File.pdf', '1000',
+ self::create_file_content_node_array('d85b21c0f86cb0', 'File.pdf', 'File.pdf', '1000',
'1609432200', 'https://googleusercontent.com/type/application/pdf', '',
'download'),
],
'Google Drive file that has webContentLink and webViewLink.' =>
[
- $this->create_google_drive_file_object('d85b21c0f86cb0', 'File.pdf',
+ self::create_google_drive_file_object('d85b21c0f86cb0', 'File.pdf',
'application/pdf', 'pdf', null, '',
'https://drive.google.com/uc?id=d85b21c0f86cb0&export=download',
'https://drive.google.com/file/d/d85b21c0f86cb0/view?usp=drivesdk'),
[
'documentformat' => 'rtf',
],
- $this->create_file_content_node_array('d85b21c0f86cb0', 'File.pdf', 'File.pdf', null,
+ self::create_file_content_node_array('d85b21c0f86cb0', 'File.pdf', 'File.pdf', null,
'', 'https://googleusercontent.com/type/application/pdf',
'https://drive.google.com/file/d/d85b21c0f86cb0/view?usp=drivesdk', 'download'),
],
'Google Drive file that has webContentLink and no webViewLink.' =>
[
- $this->create_google_drive_file_object('d85b21c0f86cb0', 'File.pdf',
+ self::create_google_drive_file_object('d85b21c0f86cb0', 'File.pdf',
'application/pdf', 'pdf', null, '',
'https://drive.google.com/uc?id=d85b21c0f86cb0&export=download', ''),
[],
- $this->create_file_content_node_array('d85b21c0f86cb0', 'File.pdf', 'File.pdf', null,
+ self::create_file_content_node_array('d85b21c0f86cb0', 'File.pdf', 'File.pdf', null,
'', 'https://googleusercontent.com/type/application/pdf',
'https://drive.google.com/uc?id=d85b21c0f86cb0&export=download', 'download'),
],
'Google Drive file without an extension (Google document file; documentformat config set to rtf).' =>
[
- $this->create_google_drive_file_object('d85b21c0f86cb0', 'File',
+ self::create_google_drive_file_object('d85b21c0f86cb0', 'File',
'application/vnd.google-apps.document', null),
[
'documentformat' => 'rtf',
],
- $this->create_file_content_node_array('d85b21c0f86cb0', 'File', 'File.gdoc', '', '',
+ self::create_file_content_node_array('d85b21c0f86cb0', 'File', 'File.gdoc', '', '',
'https://googleusercontent.com/type/application/vnd.google-apps.document', '',
'application/rtf', 'document'),
],
'Google Drive file without an extension (Google presentation file; presentationformat config not set).' =>
[
- $this->create_google_drive_file_object('d85b21c0f86cb0', 'File',
+ self::create_google_drive_file_object('d85b21c0f86cb0', 'File',
'application/vnd.google-apps.presentation', null),
[
'documentformat' => 'rtf',
@@ -113,7 +111,7 @@ class file_node_test extends \repository_googledocs_testcase {
],
'Google Drive file without an extension (File type not supported).' =>
[
- $this->create_google_drive_file_object('d85b21c0f86cb0', 'File',
+ self::create_google_drive_file_object('d85b21c0f86cb0', 'File',
'application/vnd.google-apps.unknownmimetype', null),
[],
null,
diff --git a/repository/googledocs/tests/local/node/folder_node_test.php b/repository/googledocs/tests/local/node/folder_node_test.php
index 51a2ad7a33e..fce98c80d26 100644
--- a/repository/googledocs/tests/local/node/folder_node_test.php
+++ b/repository/googledocs/tests/local/node/folder_node_test.php
@@ -50,23 +50,26 @@ class folder_node_test extends \repository_googledocs_testcase {
*
* @return array
*/
- public function create_node_array_provider(): array {
-
+ public static function create_node_array_provider(): array {
$rootid = \repository_googledocs::REPOSITORY_ROOT_ID;
return [
'Google Drive folder with modified date.' =>
[
- $this->create_google_drive_folder_object('d85b21c0f86cb0', 'Folder', '01/01/21 0:30'),
+ self::create_google_drive_folder_object('d85b21c0f86cb0', 'Folder', '01/01/21 0:30'),
"{$rootid}|Google+Drive",
- $this->create_folder_content_node_array('d85b21c0f86cb0', 'Folder',
- "{$rootid}|Google+Drive", '1609432200'),
+ self::create_folder_content_node_array(
+ 'd85b21c0f86cb0',
+ 'Folder',
+ "{$rootid}|Google+Drive",
+ '1609432200',
+ ),
],
'Google Drive folder without modified date.' =>
[
- $this->create_google_drive_folder_object('d85b21c0f86cb0', 'Folder', ''),
+ self::create_google_drive_folder_object('d85b21c0f86cb0', 'Folder', ''),
'',
- $this->create_folder_content_node_array('d85b21c0f86cb0', 'Folder', '', ''),
+ self::create_folder_content_node_array('d85b21c0f86cb0', 'Folder', '', ''),
],
];
}
diff --git a/repository/googledocs/tests/repository_googledocs_testcase.php b/repository/googledocs/tests/repository_googledocs_testcase.php
index 35fd15a01d7..aa69213a077 100644
--- a/repository/googledocs/tests/repository_googledocs_testcase.php
+++ b/repository/googledocs/tests/repository_googledocs_testcase.php
@@ -32,9 +32,12 @@ abstract class repository_googledocs_testcase extends \advanced_testcase {
* @param string $modified The date of the last modification
* @return array The repository folder node array
*/
- protected function create_folder_content_node_array(string $id, string $name, string $path,
- string $modified = ''): array {
-
+ protected static function create_folder_content_node_array(
+ string $id,
+ string $name,
+ string $path,
+ string $modified = ''
+ ): array {
global $CFG, $OUTPUT;
return [
@@ -63,10 +66,17 @@ abstract class repository_googledocs_testcase extends \advanced_testcase {
* @param string|null $googledoctype The type of the Google Doc file (if applicable)
* @return array The repository file node array
*/
- protected function create_file_content_node_array(string $id, string $name, string $title, ?string $size = null,
- string $modified = '', string $thumbnail = '' , string $link = '', string $exportformat = '',
- ?string $googledoctype = null): array {
-
+ protected static function create_file_content_node_array(
+ string $id,
+ string $name,
+ string $title,
+ ?string $size = null,
+ string $modified = '',
+ string $thumbnail = '',
+ string $link = '',
+ string $exportformat = '',
+ ?string $googledoctype = null
+ ): array {
return [
'id' => $id,
'title' => $title,
@@ -75,7 +85,7 @@ abstract class repository_googledocs_testcase extends \advanced_testcase {
'name' => $name,
'link' => $link,
'exportformat' => $exportformat,
- 'googledoctype' => $googledoctype
+ 'googledoctype' => $googledoctype,
]),
'date' => $modified,
'size' => $size,
@@ -92,8 +102,8 @@ abstract class repository_googledocs_testcase extends \advanced_testcase {
* @param string $name The name of the shared drive
* @return \stdClass The shared drive object
*/
- protected function create_google_drive_shared_drive_object(string $id, string $name): \stdClass {
- return (object)[
+ protected static function create_google_drive_shared_drive_object(string $id, string $name): \stdClass {
+ return (object) [
'kind' => 'drive#drive',
'id' => $id,
'name' => $name,
@@ -108,7 +118,7 @@ abstract class repository_googledocs_testcase extends \advanced_testcase {
* @param string|null $modified The date of the last modification
* @return \stdClass The folder object
*/
- protected function create_google_drive_folder_object(string $id, string $name, ?string $modified = null): \stdClass {
+ protected static function create_google_drive_folder_object(string $id, string $name, ?string $modified = null): \stdClass {
return (object)[
'id' => $id,
'name' => $name,
@@ -132,10 +142,16 @@ abstract class repository_googledocs_testcase extends \advanced_testcase {
* @param string|null $webviewlink The link for opening the file in a browser
* @return \stdClass The file object
*/
- protected function create_google_drive_file_object(string $id, string $name, string $mimetype,
- ?string $extension = null, ?string $size = null, ?string $modified = null, ?string $webcontentlink = null,
- ?string $webviewlink = null): \stdClass {
-
+ protected static function create_google_drive_file_object(
+ string $id,
+ string $name,
+ string $mimetype,
+ ?string $extension = null,
+ ?string $size = null,
+ ?string $modified = null,
+ ?string $webcontentlink = null,
+ ?string $webviewlink = null
+ ): \stdClass {
$googledrivefile = [
'id' => $id,
'name' => $name,
diff --git a/repository/nextcloud/tests/lib_test.php b/repository/nextcloud/tests/lib_test.php
index 8f7f0b99f05..70f240c6079 100644
--- a/repository/nextcloud/tests/lib_test.php
+++ b/repository/nextcloud/tests/lib_test.php
@@ -853,7 +853,7 @@ XML;
*
* @return array[]
*/
- public function sync_reference_provider():array {
+ public static function sync_reference_provider(): array {
return [
'referecncelastsync done recently' => [
[
diff --git a/search/engine/solr/tests/engine_test.php b/search/engine/solr/tests/engine_test.php
index 97b505869c7..c3c5300a6ff 100644
--- a/search/engine/solr/tests/engine_test.php
+++ b/search/engine/solr/tests/engine_test.php
@@ -46,8 +46,7 @@ require_once($CFG->dirroot . '/search/engine/solr/tests/fixtures/testable_engine
*
* @runTestsInSeparateProcesses
*/
-class engine_test extends \advanced_testcase {
-
+final class engine_test extends \advanced_testcase {
/**
* @var \core_search\manager
*/
@@ -143,7 +142,7 @@ class engine_test extends \advanced_testcase {
/**
* Simple data provider to allow tests to be run with file indexing on and off.
*/
- public function file_indexing_provider() {
+ public static function file_indexing_provider(): array {
return array(
'file-indexing-on' => array(1),
'file-indexing-off' => array(0)
diff --git a/search/tests/document_test.php b/search/tests/document_test.php
index d7b83d1d030..6ae7dee5fb3 100644
--- a/search/tests/document_test.php
+++ b/search/tests/document_test.php
@@ -211,7 +211,7 @@ class document_test extends \advanced_testcase {
*
* @return array
*/
- public function document_author_visibility_provider(): array {
+ public static function document_author_visibility_provider(): array {
return [
'Teacher' => [
'rolename' => 'editingteacher',
diff --git a/search/tests/manager_test.php b/search/tests/manager_test.php
index c1363e687bc..1d4e34c9f75 100644
--- a/search/tests/manager_test.php
+++ b/search/tests/manager_test.php
@@ -106,7 +106,7 @@ class manager_test extends \advanced_testcase {
*
* @return array[]
*/
- public function data_course_search_url(): array {
+ public static function data_course_search_url(): array {
return [
'defaults' => [null, null, null, '/course/search.php'],
'enabled' => [true, true, true, '/search/index.php'],
@@ -155,7 +155,7 @@ class manager_test extends \advanced_testcase {
*
* @return array[]
*/
- public function data_can_replace_course_search(): array {
+ public static function data_can_replace_course_search(): array {
return [
'defaults' => [null, null, null, false],
'enabled' => [true, true, true, true],
@@ -1503,7 +1503,7 @@ class manager_test extends \advanced_testcase {
*
* @return array
*/
- public function parse_search_area_id_data_provider() {
+ public static function parse_search_area_id_data_provider(): array {
return [
['mod_book-chapter', ['mod_book', 'search_chapter']],
['mod_customcert-activity', ['mod_customcert', 'search_activity']],
diff --git a/tag/tests/reportbuilder/datasource/tags_test.php b/tag/tests/reportbuilder/datasource/tags_test.php
index 2e0c6c94e2e..483c4d223f2 100644
--- a/tag/tests/reportbuilder/datasource/tags_test.php
+++ b/tag/tests/reportbuilder/datasource/tags_test.php
@@ -146,7 +146,7 @@ class tags_test extends core_reportbuilder_testcase {
*
* @return array[]
*/
- public function datasource_filters_provider(): array {
+ public static function datasource_filters_provider(): array {
return [
// Collection.
'Filter collection name' => ['collection:name', [
diff --git a/theme/boost/tests/boostnavbar_test.php b/theme/boost/tests/boostnavbar_test.php
index 86e756b54db..1109d35dd7a 100644
--- a/theme/boost/tests/boostnavbar_test.php
+++ b/theme/boost/tests/boostnavbar_test.php
@@ -31,7 +31,7 @@ class boostnavbar_test extends \advanced_testcase {
*
* @return array
*/
- public function remove_no_link_items_provider(): array {
+ public static function remove_no_link_items_provider(): array {
return [
'All nodes have links links including leaf node. Set to remove section nodes.' => [
[
@@ -231,7 +231,7 @@ class boostnavbar_test extends \advanced_testcase {
*
* @return array
*/
- public function remove_duplicate_items_provider(): array {
+ public static function remove_duplicate_items_provider(): array {
global $CFG;
return [
@@ -411,7 +411,7 @@ class boostnavbar_test extends \advanced_testcase {
*
* @return array
*/
- public function remove_items_that_exist_in_navigation_provider(): array {
+ public static function remove_items_that_exist_in_navigation_provider(): array {
global $CFG;
return [
diff --git a/theme/boost/tests/privacy/provider_test.php b/theme/boost/tests/privacy/provider_test.php
index 4655f3b5f5a..7da1d3e7a4f 100644
--- a/theme/boost/tests/privacy/provider_test.php
+++ b/theme/boost/tests/privacy/provider_test.php
@@ -35,7 +35,7 @@ class provider_test extends \core_privacy\tests\provider_testcase {
*
* @return array[]
*/
- public function export_user_preference_provider(): array {
+ public static function export_user_preference_provider(): array {
return [
'Index drawer open' => [provider::DRAWER_OPEN_INDEX, true, 'privacy:drawerindexopen'],
'Index drawer closed' => [provider::DRAWER_OPEN_INDEX, false, 'privacy:drawerindexclosed'],
diff --git a/user/profile/field/text/tests/field_class_test.php b/user/profile/field/text/tests/field_class_test.php
index bdde7f88d65..834f0b3ef62 100644
--- a/user/profile/field/text/tests/field_class_test.php
+++ b/user/profile/field/text/tests/field_class_test.php
@@ -60,7 +60,7 @@ class field_class_test extends \advanced_testcase {
*
* @return string[]
*/
- public function filter_profile_field_text_provider(): array {
+ public static function filter_profile_field_text_provider(): array {
return [
'simple_string' => ['Simple string', 'Simple string'],
'format_string' => ['HTML & is escaped', 'HTML & is escaped'],
diff --git a/user/tests/externallib_test.php b/user/tests/externallib_test.php
index a3ac4614b4d..e0a0020adaa 100644
--- a/user/tests/externallib_test.php
+++ b/user/tests/externallib_test.php
@@ -553,7 +553,7 @@ class externallib_test extends externallib_advanced_testcase {
/**
* Data provider for \core_user_externallib_testcase::test_create_users_with_same_emails().
*/
- public function create_users_provider_with_same_emails() {
+ public static function create_users_provider_with_same_emails(): array {
return [
'Same emails allowed, same case' => [
1, false
@@ -639,7 +639,7 @@ class externallib_test extends externallib_advanced_testcase {
*
* @return array
*/
- public function data_create_users_invalid_parameter() {
+ public static function data_create_users_invalid_parameter(): array {
return [
'blank_username' => [
'data' => [
@@ -898,7 +898,7 @@ class externallib_test extends externallib_advanced_testcase {
*
* @return array
*/
- public function users_with_same_emails() {
+ public static function users_with_same_emails(): array {
return [
'Same emails not allowed: Update name using exactly the same email' => [
0, 'John', 's1@example.com', 'Johnny', 's1@example.com', false, true
diff --git a/user/tests/fields_test.php b/user/tests/fields_test.php
index 1d7977be335..5a5fd0fa152 100644
--- a/user/tests/fields_test.php
+++ b/user/tests/fields_test.php
@@ -549,7 +549,7 @@ class fields_test extends \advanced_testcase {
*
* @return array
*/
- public function get_sql_fullname_provider(): array {
+ public static function get_sql_fullname_provider(): array {
return [
['firstname lastname', 'FN LN'],
['lastname, firstname', 'LN, FN'],
diff --git a/user/tests/profilelib_test.php b/user/tests/profilelib_test.php
index e8609d71056..458739341cc 100644
--- a/user/tests/profilelib_test.php
+++ b/user/tests/profilelib_test.php
@@ -281,7 +281,7 @@ class profilelib_test extends \advanced_testcase {
*
* @return array[]
*/
- public function profile_get_custom_field_data_by_shortname_case_sensitivity_provider(): array {
+ public static function profile_get_custom_field_data_by_shortname_case_sensitivity_provider(): array {
return [
'Matching case, case-sensitive search' => ['hello', 'hello', true, true],
'Matching case, case-insensitive search' => ['hello', 'hello', false, true],
diff --git a/user/tests/table/participants_search_test.php b/user/tests/table/participants_search_test.php
index d3470db902d..81063bf59ac 100644
--- a/user/tests/table/participants_search_test.php
+++ b/user/tests/table/participants_search_test.php
@@ -796,7 +796,7 @@ final class participants_search_test extends advanced_testcase {
*
* @return array
*/
- public function country_provider(): array {
+ public static function country_provider(): array {
$tests = [
'users' => [
'user1' => 'DE',
@@ -991,7 +991,7 @@ final class participants_search_test extends advanced_testcase {
*
* @return array
*/
- public function keywords_provider(): array {
+ public static function keywords_provider(): array {
$tests = [
// Users where the keyword matches basic user fields such as names and email.
'Users with basic names' => (object) [
@@ -1537,7 +1537,7 @@ final class participants_search_test extends advanced_testcase {
*
* @return array
*/
- public function status_provider(): array {
+ public static function status_provider(): array {
$tests = [
// Users with different statuses and enrolment methods (so multiple statuses are possible for the same user).
'Users with different enrolment statuses' => (object) [
@@ -1792,7 +1792,7 @@ final class participants_search_test extends advanced_testcase {
*
* @return array
*/
- public function enrolments_provider(): array {
+ public static function enrolments_provider(): array {
$tests = [
// Users with different enrolment methods.
'Users with different enrolment methods' => (object) [
@@ -2016,7 +2016,7 @@ final class participants_search_test extends advanced_testcase {
*
* @return array
*/
- public function groups_provider(): array {
+ public static function groups_provider(): array {
$tests = [
'Users in different groups' => (object) [
'groupsavailable' => [
@@ -2355,7 +2355,7 @@ final class participants_search_test extends advanced_testcase {
*
* @return array
*/
- public function groups_separate_provider(): array {
+ public static function groups_separate_provider(): array {
$tests = [
'Users in different groups with separate groups mode enabled' => (object) [
'groupsavailable' => [
@@ -2715,7 +2715,7 @@ final class participants_search_test extends advanced_testcase {
*
* @return array
*/
- public function accesssince_provider(): array {
+ public static function accesssince_provider(): array {
$tests = [
// Users with different last access times.
'Users in different groups' => (object) [
@@ -3120,7 +3120,7 @@ final class participants_search_test extends advanced_testcase {
*
* @return array
*/
- public function filterset_joins_provider(): array {
+ public static function filterset_joins_provider(): array {
$tests = [
// Users with different configurations.
'Users with different configurations' => (object) [
diff --git a/user/tests/userlib_test.php b/user/tests/userlib_test.php
index 67969ff99d6..7f481bdfba8 100644
--- a/user/tests/userlib_test.php
+++ b/user/tests/userlib_test.php
@@ -394,7 +394,7 @@ class userlib_test extends \advanced_testcase {
*
* @return array
*/
- public function data_create_user_invalid_username() {
+ public static function data_create_user_invalid_username(): array {
return [
'empty_string' => [
'',
diff --git a/webservice/rest/tests/server_test.php b/webservice/rest/tests/server_test.php
index 04724a8cea8..362532f2e9e 100644
--- a/webservice/rest/tests/server_test.php
+++ b/webservice/rest/tests/server_test.php
@@ -29,13 +29,12 @@ require_once($CFG->dirroot . '/webservice/rest/locallib.php');
* @copyright 2016 Frédéric Massart - FMCorz.net
* @license http://www.gnu.org/copyleft/gpl.html GNU GPL v3 or later
*/
-class server_test extends \advanced_testcase {
-
+final class server_test extends \advanced_testcase {
/**
* Data provider for test_xmlize.
* @return array
*/
- public function xmlize_provider() {
+ public static function xmlize_provider(): array {
$data = [];
$data[] = [null, null, ''];
$data[] = [new \external_value(PARAM_BOOL), false, "0\n"];
@@ -207,5 +206,4 @@ class server_test extends \advanced_testcase {
$method->setAccessible(true);
$this->assertEquals($expected, $method->invoke(null, $value, $description));
}
-
}
diff --git a/webservice/tests/lib_test.php b/webservice/tests/lib_test.php
index 4fe60afa1bc..4c33fbe9dae 100644
--- a/webservice/tests/lib_test.php
+++ b/webservice/tests/lib_test.php
@@ -261,7 +261,7 @@ class lib_test extends \advanced_testcase {
*
* @return array
*/
- public function get_active_tokens_provider(): array {
+ public static function get_active_tokens_provider(): array {
return [
'No expiration' => [0, true],
'Active' => [time() + DAYSECS, true],
 . ')
',
+ "content" => ' . ')
',
"outputregex" => '/UPDATE/',
- "expectedcontent" => ' . ')
',
+ "expectedcontent" => ' . ')
',
],
"Test object from another site should be replaced" => [
- "content" => '