Merge branch 'MDL-81521-main' of https://github.com/andrewnicols/moodle

mackensen · Nov 19, 2024 · fcb39d6 · fcb39d6
2 parents c6353ef + 5a86d31
commit fcb39d6
Show file tree

Hide file tree

Showing 415 changed files with 2,475 additions and 2,157 deletions.
diff --git a/.upgradenotes/MDL-81521-2024101701160681.yml b/.upgradenotes/MDL-81521-2024101701160681.yml
@@ -0,0 +1,19 @@
+issueNumber: MDL-81521
+notes:
+  mod_quiz:
+    - message: >
+        The `\mod_quiz\attempt_walkthrough_from_csv_test` unit test has been
+        marked as final and should not be extended by other tests.
+
+
+        All shared functionality has been moved to a new autoloadable test-case:
+
+        `\mod_quiz\tests\attempt_walkthrough_testcase`.
+
+
+        To support this testcase the existing `$files` instance property should be replaced with a
+        new static method, `::get_test_files`.
+
+        Both the existing instance property and the new static method can co-exist.
+
+      type: changed
diff --git a/admin/presets/tests/generator_test.php b/admin/presets/tests/generator_test.php
@@ -180,7 +180,7 @@ public function test_create_preset(?string $name = null, ?string $comments = nul
      *
      * @return array
      */
-    public function create_preset_provider(): array {
+    public static function create_preset_provider(): array {
         return [
             'Default values' => [
             ],

diff --git a/admin/presets/tests/helper_test.php b/admin/presets/tests/helper_test.php
@@ -84,7 +84,7 @@ public function test_create_preset(?string $name = null, ?string $comments = nul
      *
      * @return array
      */
-    public function create_preset_provider(): array {
+    public static function create_preset_provider(): array {
         return [
             'Default values' => [
             ],
@@ -177,7 +177,7 @@ public function test_add_item(string $name, string $value, ?string $plugin = 'no
      *
      * @return array
      */
-    public function add_item_provider(): array {
+    public static function add_item_provider(): array {
         return [
             'Setting without plugin' => [
                 'name' => 'settingname',
@@ -239,7 +239,7 @@ public function test_add_plugin(string $type, string $name, $enabled = 0): void
      *
      * @return array
      */
-    public function add_plugin_provider(): array {
+    public static function add_plugin_provider(): array {
         return [
             'Plugin: enabled (using int)' => [
                 'type' => 'plugintype',
@@ -321,7 +321,7 @@ public function test_change_default_preset(string $preset, ?array $settings = nu
      *
      * @return array
      */
-    public function change_default_preset_provider(): array {
+    public static function change_default_preset_provider(): array {
         return [
             'Starter preset' => [
                 'preset' => 'starter',

diff --git a/admin/presets/tests/local/setting/adminpresets_admin_setting_bloglevel_test.php b/admin/presets/tests/local/setting/adminpresets_admin_setting_bloglevel_test.php
@@ -72,7 +72,7 @@ public function test_save_value(int $settingvalue, bool $expectedsaved): void {
      *
      * @return array
      */
-    public function save_value_provider(): array {
+    public static function save_value_provider(): array {
         return [
             'Save the bloglevel and set blog_menu block visibility to true' => [
                 'setttingvalue' => BLOG_USER_LEVEL,

diff --git a/admin/presets/tests/local/setting/adminpresets_admin_setting_sitesettext_test.php b/admin/presets/tests/local/setting/adminpresets_admin_setting_sitesettext_test.php
@@ -66,7 +66,7 @@ public function test_save_value(string $settingname, string $settingvalue, bool
      *
      * @return array
      */
-    public function save_value_provider(): array {
+    public static function save_value_provider(): array {
         return [
             'Fullname: different value' => [
                 'settingname' => 'fullname',

diff --git a/admin/presets/tests/local/setting/adminpresets_setting_test.php b/admin/presets/tests/local/setting/adminpresets_setting_test.php
@@ -77,7 +77,7 @@ public function test_save_value(string $category, string $settingplugin, string
      *
      * @return array
      */
-    public function save_value_provider(): array {
+    public static function save_value_provider(): array {
         return [
             'Core setting with the same value is not saved' => [
                 'category' => 'optionalsubsystems',
@@ -167,7 +167,7 @@ public function test_save_attributes_values(string $category, string $settingplu
      *
      * @return array
      */
-    public function save_attributes_values_provider(): array {
+    public static function save_attributes_values_provider(): array {
         return [
             'Plugin setting with the same value is not saved' => [
                 'category' => 'modsettinglesson',

diff --git a/admin/presets/tests/manager_test.php b/admin/presets/tests/manager_test.php
@@ -368,7 +368,7 @@ public function test_export_preset(bool $includesensible = false, string $preset
      *
      * @return array
      */
-    public function export_preset_provider(): array {
+    public static function export_preset_provider(): array {
         return [
             'Export settings and plugins, excluding sensible' => [
                 'includesensible' => false,
@@ -531,7 +531,7 @@ public function test_import_preset(string $filecontents, bool $expectedpreset, b
      *
      * @return array
      */
-    public function import_preset_provider(): array {
+    public static function import_preset_provider(): array {
         return [
             'Import settings from an empty file' => [
                 'filecontents' => '',

diff --git a/admin/tests/external/set_block_protection_test.php b/admin/tests/external/set_block_protection_test.php
@@ -85,7 +85,7 @@ public function test_execute(
      *
      * @return array
      */
-    public function execute_provider(): array {
+    public static function execute_provider(): array {
         return [
             [
                 'block_login',

diff --git a/admin/tests/external/set_plugin_order_test.php b/admin/tests/external/set_plugin_order_test.php
@@ -72,7 +72,7 @@ public function test_execute_editors(
      *
      * @return array
      */
-    public function execute_editor_provider(): array {
+    public static function execute_editor_provider(): array {
         $pluginmanager = \core_plugin_manager::instance();
         $allplugins = array_keys($pluginmanager->get_plugins_of_type('editor'));
 
@@ -142,7 +142,7 @@ public function test_execute_editors_non_orderable(string $plugin): void {
         $this->assertIsArray(set_plugin_order::execute($plugin, 1));
     }
 
-    public function execute_non_orderable_provider(): array {
+    public static function execute_non_orderable_provider(): array {
         return [
             // Activities do not support ordering.
             ['mod_assign'],

diff --git a/admin/tests/external/set_plugin_state_test.php b/admin/tests/external/set_plugin_state_test.php
@@ -66,7 +66,7 @@ public function test_execute(
      *
      * @return array
      */
-    public function execute_standard_provider(): array {
+    public static function execute_standard_provider(): array {
         $generatetestsfor = function (string $plugin): array {
             return [
                 [

diff --git a/admin/tests/reportbuilder/datasource/task_logs_test.php b/admin/tests/reportbuilder/datasource/task_logs_test.php
@@ -110,7 +110,7 @@ public function test_datasource_non_default_columns(): void {
      *
      * @return array[]
      */
-    public function datasource_filters_provider(): array {
+    public static function datasource_filters_provider(): array {
         return [
             'Filter name' => ['task_log:name', [
                 'task_log:name_values' => [send_schedules::class],

diff --git a/admin/tool/admin_presets/tests/local/action/base_test.php b/admin/tool/admin_presets/tests/local/action/base_test.php
@@ -70,7 +70,7 @@ public function test_base_log(string $action, string $mode, ?string $expectedcla
      *
      * @return array
      */
-    public function log_provider(): array {
+    public static function log_provider(): array {
         return [
             // Action = base.
             'action=base and mode = show' => [

diff --git a/admin/tool/admin_presets/tests/local/action/export_test.php b/admin/tool/admin_presets/tests/local/action/export_test.php
@@ -156,7 +156,7 @@ public function test_export_execute(bool $includesensible = false, string $prese
      *
      * @return array
      */
-    public function export_execute_provider(): array {
+    public static function export_execute_provider(): array {
         return [
             'Export settings and plugins, excluding sensible' => [
                 'includesensible' => false,

diff --git a/admin/tool/admin_presets/tests/local/action/import_test.php b/admin/tool/admin_presets/tests/local/action/import_test.php
@@ -190,7 +190,7 @@ public function test_import_execute(string $filecontents, bool $expectedpreset,
      *
      * @return array
      */
-    public function import_execute_provider(): array {
+    public static function import_execute_provider(): array {
         $fixturesfolder = __DIR__ . '/../../../../../presets/tests/fixtures/';
 
         return [

diff --git a/admin/tool/behat/tests/behat_form_text_test.php b/admin/tool/behat/tests/behat_form_text_test.php
@@ -53,7 +53,7 @@ class behat_form_text_test extends \basic_testcase {
      *
      * @return array of value and expectation pairs to be tested.
      */
-    public function provider_test_set_get_value() {
+    public static function provider_test_set_get_value(): array {
         return [
             'null' => [null, null],
             'int' => [3, 3],
@@ -68,7 +68,7 @@ public function provider_test_set_get_value() {
      *
      * @param mixed $value value to be set.
      * @param mixed $expectation value to be checked.
-     * @dataProvider provider_test_set_get_value()
+     * @dataProvider provider_test_set_get_value
      */
     public function test_set_get_value($value, $expectation): void {
         $session = $this->createMock(Session::class);
@@ -85,7 +85,7 @@ public function test_set_get_value($value, $expectation): void {
      *
      * @return array of decsep, value, match and result pairs to be tested.
      */
-    public function provider_test_matches() {
+    public static function provider_test_matches(): array {
         return [
             'lazy true' => ['.', 'hello', 'hello', true],
             'lazy false' => ['.', 'hello', 'bye', false],
@@ -113,7 +113,7 @@ public function provider_test_matches() {
      * @param mixed $value value to be set.
      * @param mixed $match value to be matched.
      * @param bool  $result expected return status of the function.
-     * @dataProvider provider_test_matches()
+     * @dataProvider provider_test_matches
      */
     public function test_matches($decsep, $value, $match, $result): void {
         global $CFG;

diff --git a/admin/tool/brickfield/tests/tool_test.php b/admin/tool/brickfield/tests/tool_test.php
@@ -30,7 +30,7 @@
 class tool_test extends \advanced_testcase {
 
     /** @var string base 64 image */
-    protected $base64img = <<<EOF
+    protected static string $base64img = <<<EOF
 <img src="data:image/gif;base64,R0lGODlhPQBEAPeoAJosM//AwO/AwHVYZ/z595kzAP/s7P+goOXMv8+fhw/v739/f+8PD98fH/
 8mJl+fn/9ZWb8/PzWlwv///6wWGbImAPgTEMImIN9gUFCEm/gDALULDN8PAD6atYdCTX9gUNKlj8wZAKUsAOzZz+UMAOsJAP/Z2ccMDA8PD/95eX5N
 WvsJCOVNQPtfX/8zM8+QePLl38MGBr8JCP+zs9myn/8GBqwpAP/GxgwJCPny78lzYLgjAJ8vAP9fX/+MjMUcAN8zM/9wcM8ZGcATEL+QePdZWf/29u
@@ -118,19 +118,19 @@ public function test_toplevel_arguments(): void {
      * Base64 image provider.
      * @return array
      */
-    public function base64_img_provider(): array {
+    public static function base64_img_provider(): array {
         $img = '<img src="myimage.jpg" />';
         return [
             'Image tag alone (base64)' => [
-                $this->base64img,
+                self::$base64img,
                 true,
             ],
             'Image tag alone (link)' => [
                 $img,
                 false,
             ],
             'Image tag in string (base64)' => [
-                "This is my image {$this->base64img}.",
+                "This is my image " . self::$base64img,
                 true,
             ],
             'Image tag in string (link)' => [
@@ -162,7 +162,7 @@ public function test_base64_img_detected(string $content, bool $expectation): vo
     }
 
     public function test_truncate_base64(): void {
-        $truncated = tool::truncate_base64($this->base64img);
+        $truncated = tool::truncate_base64(self::$base64img);
         $this->assertStringContainsString('<img src="data:image/gif;base64..."', $truncated);
     }
 }
diff --git a/admin/tool/customlang/tests/local/mlang/langstring_test.php b/admin/tool/customlang/tests/local/mlang/langstring_test.php
@@ -60,7 +60,7 @@ public function test_fix_syntax(string $text, int $version, ?int $fromversion, s
      *
      * @return  array
      */
-    public function fix_syntax_data(): array {
+    public static function fix_syntax_data(): array {
         return [
             // Syntax sanity v1 strings.
             [

diff --git a/admin/tool/customlang/tests/local/mlang/phpparser_test.php b/admin/tool/customlang/tests/local/mlang/phpparser_test.php
@@ -79,7 +79,7 @@ public function test_parse(string $phpcode, array $expected, bool $exception): v
      *
      * @return  array
      */
-    public function parse_provider(): array {
+    public static function parse_provider(): array {
         return [
             'Invalid PHP code' => [
                 'No PHP code', [], false

diff --git a/admin/tool/dataprivacy/tests/api_test.php b/admin/tool/dataprivacy/tests/api_test.php
@@ -633,7 +633,7 @@ public function test_can_download_data_request_for_user(): void {
      *
      * @return array
      */
-    public function data_request_creation_provider() {
+    public static function data_request_creation_provider(): array {
         return [
             'Export request by user, automatic approval off' => [
                 false, api::DATAREQUEST_TYPE_EXPORT, 'automaticdataexportapproval', false, 0,
@@ -815,7 +815,7 @@ public function test_deny_data_request(): void {
      *
      * @return array
      */
-    public function get_data_requests_provider() {
+    public static function get_data_requests_provider(): array {
         $completeonly = [api::DATAREQUEST_STATUS_COMPLETE, api::DATAREQUEST_STATUS_DOWNLOAD_READY, api::DATAREQUEST_STATUS_DELETED];
         $completeandcancelled = array_merge($completeonly, [api::DATAREQUEST_STATUS_CANCELLED]);
 
@@ -1000,7 +1000,7 @@ public function test_get_approved_contextlist_collection_for_request(): void {
     /**
      * Data provider for test_has_ongoing_request.
      */
-    public function status_provider() {
+    public static function status_provider(): array {
         return [
             [api::DATAREQUEST_STATUS_AWAITING_APPROVAL, true],
             [api::DATAREQUEST_STATUS_APPROVED, true],
@@ -1090,7 +1090,7 @@ public function test_is_site_dpo(): void {
      *
      * @return array
      */
-    public function notify_dpo_provider() {
+    public static function notify_dpo_provider(): array {
         return [
             [false, api::DATAREQUEST_TYPE_EXPORT, 'requesttypeexport', 'Export my user data'],
             [false, api::DATAREQUEST_TYPE_DELETE, 'requesttypedelete', 'Delete my user data'],
@@ -1442,7 +1442,7 @@ public function test_effective_contextlevel_invalid_contextlevels($contextlevel)
     /**
      * Data provider for invalid contextlevel fetchers.
      */
-    public function invalid_effective_contextlevel_provider() {
+    public static function invalid_effective_contextlevel_provider(): array {
         return [
             [CONTEXT_COURSECAT],
             [CONTEXT_COURSE],
@@ -2002,7 +2002,7 @@ public function test_get_approved_contextlist_collection_for_collection_delete_c
     /**
      * Data provider for \tool_dataprivacy_api_testcase::test_set_context_defaults
      */
-    public function set_context_defaults_provider() {
+    public static function set_context_defaults_provider(): array {
         $contextlevels = [
             [CONTEXT_COURSECAT],
             [CONTEXT_COURSE],
@@ -2477,7 +2477,7 @@ public function test_can_create_data_deletion_request_for_children(): void {
      *
      * @return array
      */
-    public function queue_data_request_task_provider() {
+    public static function queue_data_request_task_provider(): array {
         return [
             'With user ID provided' => [true],
             'Without user ID provided' => [false],
@@ -2514,7 +2514,7 @@ public function test_queue_data_request_task(bool $withuserid): void {
     /**
      * Data provider for test_is_automatic_request_approval_on().
      */
-    public function automatic_request_approval_setting_provider() {
+    public static function automatic_request_approval_setting_provider(): array {
         return [
             'Data export, not set' => [
                 'automaticdataexportapproval', api::DATAREQUEST_TYPE_EXPORT, null, false

diff --git a/admin/tool/dataprivacy/tests/data_request_test.php b/admin/tool/dataprivacy/tests/data_request_test.php
@@ -35,7 +35,7 @@ class data_request_test extends data_privacy_testcase {
      *
      * @return  array
      */
-    public function status_state_provider(): array {
+    public static function status_state_provider(): array {
         return [
             [
                 'state' => api::DATAREQUEST_STATUS_PENDING,
@@ -138,9 +138,9 @@ public function test_can_reset_others($status): void {
      *
      * @return      array
      */
-    public function non_resettable_provider(): array {
+    public static function non_resettable_provider(): array {
         $states = [];
-        foreach ($this->status_state_provider() as $thisstatus) {
+        foreach (self::status_state_provider() as $thisstatus) {
             if (!$thisstatus['resettable']) {
                 $states[] = $thisstatus;
             }