Moodle release 4.4.5

Upgrade notes generated by the `upgradenotes` tool is only available
from Moodle 4.5. For 4.4 and below, we should still update the
appropriate upgrade.txt file.

.github/workflows/onebyone.yml

@@ -0,0 +1,143 @@
+name: One by One Testing
+# Run all the individual unit tests one by one, with
+# fully independent PHPUnit executions. Useful to
+# detect issues with some tests that are using stuff
+# that has been made available by others, but is not
+# available when running individually.
+#
+# Note that we aren't using PHPUnit's own isolation
+# here but completely separated runs, one for each
+# test.
+#
+# The workflow will fail reporting all the tests
+# that have failed (and will pass if no failure is
+# detected, of course).
+#
+# It's only executed via workflow dispatch (automated
+# or manual), not by push/tag. And acceptd configuration
+# of phpunit, specially useful to run it with PHPUnit's
+# own isolation or any other option.
+
+on:
+  workflow_dispatch:
+    inputs:
+      phpunit_extra_options:
+        description: Additional options to apply to PHPUnit
+        required: false
+        default: ''
+
+env:
+  chunks: 7
+
+jobs:
+  collect:
+    name: Collect individual unit tests
+    runs-on: ubuntu-latest
+    outputs:
+      matrix: ${{steps.individual-tests.outputs.matrix }}
+
+    steps:
+      - name: Checking out code
+        uses: actions/checkout@v4
+
+      - name: Looking for all individual tests
+        id: individual-tests
+        run: |
+          count=0  # Number of individual tests found.
+          while read -r testfile; do # For each test file.
+              while read -r testname; do # For each unit test in a file.
+                  count=$((count + 1))
+                  # Sent it to the correct chunk file.
+                  chunk=$(((($count % $chunks)) + 1))
+                  echo "$testname $testfile" >> ./chunk_$chunk.txt
+              done < <(grep "function test_" "${testfile}" | sed -r "s/^.*function (test_[a-zA-Z0-9_]+).*/\1/")
+          done < <(find . -name "*_test.php")
+          # Generate the matrix to run tests.
+          echo "matrix=$(ls -1 chunk_*.txt | jq -R -s -c 'split("\n")[:-1]')" >> $GITHUB_OUTPUT
+          echo "$count individual tests collected in $chunks files"
+
+      - name: Upload individual tests files
+        uses: actions/upload-artifact@v4
+        with:
+          name: individual_tests
+          path: chunk_*.txt
+          retention-days: 1
+
+  test:
+    name: Run tests
+    needs: collect
+    runs-on: ubuntu-latest
+    services:
+      exttests:
+        image: moodlehq/moodle-exttests
+        ports:
+          - 8080:80
+      redis:
+        image: redis
+        ports:
+          - 6379:6379
+    strategy:
+      fail-fast: false
+      matrix:
+        file: ${{ fromJson(needs.collect.outputs.matrix) }}
+
+    steps:
+      - name: Setting up DB pgsql
+        uses: m4nu56/postgresql-action@v1
+        with:
+          postgresql version: 13
+          postgresql db: test
+          postgresql user: test
+          postgresql password: test
+
+      - name: Setting up PHP
+        uses: shivammathur/setup-php@v2
+        with:
+          php-version: 8.3
+          ini-values: max_input_vars=5000
+          coverage: none
+
+      - name: Checking out code
+        uses: actions/checkout@v4
+
+      - name: Download individual test files
+        uses: actions/download-artifact@v4
+        with:
+          name: individual_tests # Make all the chunk files available for the next steps.
+
+      - name: Setting up PHPUnit
+        env:
+          dbtype: pgsql
+        run: |
+          echo "pathtophp=$(which php)" >> $GITHUB_ENV
+          cp .github/workflows/config-template.php config.php
+          mkdir ../moodledata
+          sudo locale-gen en_AU.UTF-8
+          php admin/tool/phpunit/cli/init.php --no-composer-self-update
+
+      - name: Run PHPUnit test (one by one)
+        env:
+          dbtype: pgsql
+        run: |
+          status=0
+          count=0
+          while read -r line; do # For each line in the chunk file
+              count=$((count + 1))
+              filter="${line% *}"
+              file="${line#* }"
+              # Run the individual unit test and report problems if needed to.
+              if ! php vendor/bin/phpunit \
+                      --fail-on-empty-test-suite \
+                      --fail-on-warning \
+                      --fail-on-risky \
+                      --filter "$filter" ${{ inputs.phpunit_extra_options }} \
+                      "$file" >/dev/null 2>&1; then
+                  if [ $status -eq 0 ]; then
+                      echo "Problems found, list of PHPUnit commands failing:"
+                  fi
+                  echo "vendor/bin/phpunit --filter '${filter}' ${{ inputs.phpunit_extra_options }} $file"
+                  status=$((status + 1))
+              fi
+          done < ${{ matrix.file }}
+          echo "Finished: $count individual tests executed, $status tests failed"
+          exit $status

.github/workflows/push.yml

@@ -4,7 +4,6 @@ on:
   push:
     branches-ignore:
       - main
-      - master
       - MOODLE_[0-9]+_STABLE
     tags-ignore:
       - v[0-9]+.[0-9]+.[0-9]+*

.github/workflows/web-installer-test.yml

@@ -0,0 +1,23 @@
+name: Web Installer Testing
+
+on:
+  workflow_dispatch:
+
+jobs:
+  InstallationTest:
+    runs-on: ${{ matrix.os }}
+    strategy:
+      fail-fast: false
+      matrix:
+        os: [ubuntu-latest]
+        php: [8.1, 8.3]
+    steps:
+      - name: Construct repository URL
+        run: echo "REPOSITORY_URL=${GITHUB_SERVER_URL}/${GITHUB_REPOSITORY}" >> $GITHUB_ENV
+        shell: bash
+
+      - uses: moodlehq/moodle-webinstaller-test@main
+        with:
+          repository: ${{ env.REPOSITORY_URL }}
+          branch: ${{ github.ref_name }}
+          php: ${{ matrix.php }}

.gitignore

@@ -26,7 +26,9 @@
 /.patches/
 /.idea/
 .phpstorm.*
-!.phpstorm.meta.php
+!/.phpstorm.meta.php/
+/.phpstorm.meta.php/*
+!/.phpstorm.meta.php/di.php
 /nbproject/
 CVS
 .DS_Store

admin/amd/build/bulk_user_actions.min.js

@@ -5,6 +5,6 @@ define("core_admin/bulk_user_actions",["exports","core_reportbuilder/local/selec
    * @module     core_admin/bulk_user_actions
    * @copyright  2024 Marina Glancy
    * @license    http://www.gnu.org/copyleft/gpl.html GNU GPL v3 or later
-   */Object.defineProperty(_exports,"__esModule",{value:!0}),_exports.init=void 0,reportSelectors=_interopRequireWildcard(reportSelectors),tableEvents=_interopRequireWildcard(tableEvents),FormChangeChecker=_interopRequireWildcard(FormChangeChecker),CustomEvents=_interopRequireWildcard(CustomEvents),_jquery=(obj=_jquery)&&obj.__esModule?obj:{default:obj};const Selectors_bulkActionsForm="form#user-bulk-action-form",Selectors_userReportWrapper='[data-region="report-user-list-wrapper"]',Selectors_checkbox='input[type="checkbox"][data-togglegroup="report-select-all"][data-toggle="slave"]',Selectors_masterCheckbox='input[type="checkbox"][data-togglegroup="report-select-all"][data-toggle="master"]',Selectors_checkedRows='[data-togglegroup="report-select-all"][data-toggle="slave"]:checked';_exports.init=()=>{var _userBulkForm$closest;const userBulkForm=document.querySelector(Selectors_bulkActionsForm),userReport=null==userBulkForm||null===(_userBulkForm$closest=userBulkForm.closest(Selectors_userReportWrapper))||void 0===_userBulkForm$closest?void 0:_userBulkForm$closest.querySelector(reportSelectors.regions.report);if(!userBulkForm||!userReport)return;const actionSelect=userBulkForm.querySelector("select");CustomEvents.define(actionSelect,[CustomEvents.events.accessibleChange]),(0,_jquery.default)(actionSelect).on(CustomEvents.events.accessibleChange,(event=>{if(event.target.value&&"0"!=="".concat(event.target.value)){const e=new Event("submit",{cancelable:!0});userBulkForm.dispatchEvent(e),e.defaultPrevented||(FormChangeChecker.markFormSubmitted(userBulkForm),userBulkForm.submit())}}));const updateUserIds=()=>{const selectedUsers=[...userReport.querySelectorAll(Selectors_checkedRows)],selectedUserIds=selectedUsers.map((check=>parseInt(check.value)));userBulkForm.querySelector('[name="userids"]').value=selectedUserIds.join(","),actionSelect.disabled=0===selectedUsers.length;const selectedUsersNames=selectedUsers.map((check=>document.querySelector('label[for="'.concat(check.id,'"]')).textContent));userBulkForm.data={userids:selectedUserIds,usernames:selectedUsersNames}};updateUserIds(),document.addEventListener("change",(event=>{(event.target.matches(Selectors_checkbox)||event.target.matches(Selectors_masterCheckbox))&&userReport.contains(event.target)&&updateUserIds()})),document.addEventListener(tableEvents.tableContentRefreshed,(event=>{userReport.contains(event.target)&&updateUserIds()}))}}));
+   */Object.defineProperty(_exports,"__esModule",{value:!0}),_exports.init=void 0,reportSelectors=_interopRequireWildcard(reportSelectors),tableEvents=_interopRequireWildcard(tableEvents),FormChangeChecker=_interopRequireWildcard(FormChangeChecker),CustomEvents=_interopRequireWildcard(CustomEvents),_jquery=(obj=_jquery)&&obj.__esModule?obj:{default:obj};const Selectors_bulkActionsForm="form#user-bulk-action-form",Selectors_userReportWrapper='[data-region="report-user-list-wrapper"]',Selectors_checkbox='input[type="checkbox"][data-togglegroup="report-select-all"][data-toggle="slave"]',Selectors_masterCheckbox='input[type="checkbox"][data-togglegroup="report-select-all"][data-toggle="master"]',Selectors_checkedRows='[data-togglegroup="report-select-all"][data-toggle="slave"]:checked';_exports.init=()=>{var _userBulkForm$closest;const userBulkForm=document.querySelector(Selectors_bulkActionsForm),userReport=null==userBulkForm||null===(_userBulkForm$closest=userBulkForm.closest(Selectors_userReportWrapper))||void 0===_userBulkForm$closest?void 0:_userBulkForm$closest.querySelector(reportSelectors.regions.report);if(!userBulkForm||!userReport)return;const actionSelect=userBulkForm.querySelector("select");CustomEvents.define(actionSelect,[CustomEvents.events.accessibleChange]),(0,_jquery.default)(actionSelect).on(CustomEvents.events.accessibleChange,(event=>{if(event.target.value&&"0"!=="".concat(event.target.value)){const e=new Event("submit",{cancelable:!0});userBulkForm.dispatchEvent(e),e.defaultPrevented||(FormChangeChecker.markFormSubmitted(userBulkForm),userBulkForm.submit())}}));const updateUserIds=()=>{const selectedUsers=[...userReport.querySelectorAll(Selectors_checkedRows)],selectedUserIds=selectedUsers.map((check=>parseInt(check.value)));userBulkForm.querySelector('[name="userids"]').value=selectedUserIds.join(","),actionSelect.disabled=0===selectedUsers.length,actionSelect.disabled&&(actionSelect.value="0");const selectedUsersNames=selectedUsers.map((check=>document.querySelector('label[for="'.concat(check.id,'"]')).textContent));userBulkForm.data={userids:selectedUserIds,usernames:selectedUsersNames}};updateUserIds(),document.addEventListener("change",(event=>{(event.target.matches(Selectors_checkbox)||event.target.matches(Selectors_masterCheckbox))&&userReport.contains(event.target)&&updateUserIds()})),document.addEventListener(tableEvents.tableContentRefreshed,(event=>{userReport.contains(event.target)&&updateUserIds()}))}}));
 
 //# sourceMappingURL=bulk_user_actions.min.js.map

admin/amd/src/bulk_user_actions.js

@@ -65,7 +65,13 @@ export const init = () => {
         const selectedUsers = [...userReport.querySelectorAll(Selectors.checkedRows)];
         const selectedUserIds = selectedUsers.map(check => parseInt(check.value));
         userBulkForm.querySelector('[name="userids"]').value = selectedUserIds.join(',');
+
+        // Disable the action selector if nothing selected, and reset the current selection.
         actionSelect.disabled = selectedUsers.length === 0;
+        if (actionSelect.disabled) {
+            actionSelect.value = "0";
+        }
+
         const selectedUsersNames = selectedUsers.map(check => document.querySelector(`label[for="${check.id}"]`).textContent);
         // Add the user ids and names to the form data attributes so they can be available from the
         // other JS modules that listen to the form submit event.

admin/classes/reportbuilder/local/systemreports/users.php

@@ -184,6 +184,7 @@ class users extends system_report {
         $entityuseralias = $entityuser->get_table_alias('user');
 
         $filters = [
+            'user:fullname',
             'user:firstname',
             'user:lastname',
             'user:username',

admin/classes/table/plugin_management_table.php

@@ -500,4 +500,15 @@ abstract class plugin_management_table extends flexible_table implements dynamic
     protected function supports_ordering(): bool {
         return $this->plugininfoclass::plugintype_supports_ordering();
     }
+
+    /**
+     * Check if the user has the capability to access this table.
+     *
+     * Default implementation for plugin management tables is to require 'moodle/site:config' capability
+     *
+     * @return bool Return true if capability check passed.
+     */
+    public function has_capability(): bool {
+        return has_capability('moodle/site:config', $this->get_context());
+    }
 }

admin/cli/install.php

@@ -177,6 +177,7 @@ $CFG->admin                = array_pop($parts);
 ini_set('include_path', $CFG->libdir.'/pear' . PATH_SEPARATOR . ini_get('include_path'));
 
 require_once($CFG->libdir.'/classes/component.php');
+
 require_once($CFG->libdir.'/classes/text.php');
 require_once($CFG->libdir.'/classes/string_manager.php');
 require_once($CFG->libdir.'/classes/string_manager_install.php');
@@ -192,13 +193,8 @@ require_once($CFG->libdir.'/adminlib.php');
 require_once($CFG->libdir.'/componentlib.class.php');
 require_once($CFG->dirroot.'/cache/lib.php');
 
-// Register our classloader, in theory somebody might want to replace it to load other hacked core classes.
-// Required because the database checks below lead to session interaction which is going to lead us to requiring autoloaded classes.
-if (defined('COMPONENT_CLASSLOADER')) {
-    spl_autoload_register(COMPONENT_CLASSLOADER);
-} else {
-    spl_autoload_register('core_component::classloader');
-}
+// Register our classloader.
+\core_component::register_autoloader();
 
 require($CFG->dirroot.'/version.php');
 $CFG->target_release = $release;

admin/environment.xml

@@ -4508,4 +4508,394 @@
       </CUSTOM_CHECK>
     </CUSTOM_CHECKS>
   </MOODLE>
+  <MOODLE version="4.5" requires="4.1.2">
+    <UNICODE level="required">
+      <FEEDBACK>
+        <ON_ERROR message="unicoderequired" />
+      </FEEDBACK>
+    </UNICODE>
+    <DATABASE level="required">
+      <VENDOR name="mariadb" version="10.6.7" />
+      <VENDOR name="mysql" version="8.0" />
+      <VENDOR name="postgres" version="13" />
+      <VENDOR name="mssql" version="14.0" />
+      <VENDOR name="oracle" version="19" />
+    </DATABASE>
+    <PHP version="8.1.0" level="required">
+    </PHP>
+    <PCREUNICODE level="optional">
+      <FEEDBACK>
+        <ON_CHECK message="pcreunicodewarning" />
+      </FEEDBACK>
+    </PCREUNICODE>
+    <PHP_EXTENSIONS>
+      <PHP_EXTENSION name="iconv" level="required">
+        <FEEDBACK>
+          <ON_ERROR message="iconvrequired" />
+        </FEEDBACK>
+      </PHP_EXTENSION>
+      <PHP_EXTENSION name="mbstring" level="required">
+        <FEEDBACK>
+          <ON_ERROR message="mbstringrequired" />
+        </FEEDBACK>
+      </PHP_EXTENSION>
+      <PHP_EXTENSION name="curl" level="required">
+        <FEEDBACK>
+          <ON_ERROR message="curlrequired" />
+        </FEEDBACK>
+      </PHP_EXTENSION>
+      <PHP_EXTENSION name="openssl" level="required">
+        <FEEDBACK>
+          <ON_ERROR message="opensslrequired" />
+        </FEEDBACK>
+      </PHP_EXTENSION>
+      <PHP_EXTENSION name="tokenizer" level="optional">
+        <FEEDBACK>
+          <ON_CHECK message="tokenizerrecommended" />
+        </FEEDBACK>
+      </PHP_EXTENSION>
+      <PHP_EXTENSION name="soap" level="optional">
+        <FEEDBACK>
+          <ON_CHECK message="soaprecommended" />
+        </FEEDBACK>
+      </PHP_EXTENSION>
+      <PHP_EXTENSION name="ctype" level="required">
+        <FEEDBACK>
+          <ON_ERROR message="ctyperequired" />
+        </FEEDBACK>
+      </PHP_EXTENSION>
+      <PHP_EXTENSION name="zip" level="required">
+        <FEEDBACK>
+          <ON_ERROR message="ziprequired" />
+        </FEEDBACK>
+      </PHP_EXTENSION>
+      <PHP_EXTENSION name="zlib" level="required">
+      </PHP_EXTENSION>
+      <PHP_EXTENSION name="gd" level="required">
+        <FEEDBACK>
+          <ON_ERROR message="gdrequired" />
+        </FEEDBACK>
+      </PHP_EXTENSION>
+      <PHP_EXTENSION name="simplexml" level="required">
+        <FEEDBACK>
+          <ON_ERROR message="simplexmlrequired" />
+        </FEEDBACK>
+      </PHP_EXTENSION>
+      <PHP_EXTENSION name="spl" level="required">
+        <FEEDBACK>
+          <ON_ERROR message="splrequired" />
+        </FEEDBACK>
+      </PHP_EXTENSION>
+      <PHP_EXTENSION name="pcre" level="required">
+      </PHP_EXTENSION>
+      <PHP_EXTENSION name="dom" level="required">
+      </PHP_EXTENSION>
+      <PHP_EXTENSION name="xml" level="required">
+      </PHP_EXTENSION>
+      <PHP_EXTENSION name="xmlreader" level="required">
+      </PHP_EXTENSION>
+      <PHP_EXTENSION name="intl" level="required">
+        <FEEDBACK>
+          <ON_ERROR message="intlrequired" />
+        </FEEDBACK>
+      </PHP_EXTENSION>
+      <PHP_EXTENSION name="json" level="required">
+      </PHP_EXTENSION>
+      <PHP_EXTENSION name="hash" level="required"/>
+      <PHP_EXTENSION name="fileinfo" level="required"/>
+      <PHP_EXTENSION name="sodium" level="required"/>
+      <PHP_EXTENSION name="exif" level="optional"/>
+    </PHP_EXTENSIONS>
+    <PHP_SETTINGS>
+      <PHP_SETTING name="memory_limit" value="96M" level="required">
+        <FEEDBACK>
+          <ON_ERROR message="settingmemorylimit" />
+        </FEEDBACK>
+      </PHP_SETTING>
+      <PHP_SETTING name="file_uploads" value="1" level="optional">
+        <FEEDBACK>
+          <ON_CHECK message="settingfileuploads" />
+        </FEEDBACK>
+      </PHP_SETTING>
+      <PHP_SETTING name="opcache.enable" value="1" level="optional">
+        <FEEDBACK>
+          <ON_CHECK message="opcacherecommended" />
+        </FEEDBACK>
+      </PHP_SETTING>
+    </PHP_SETTINGS>
+    <CUSTOM_CHECKS>
+      <CUSTOM_CHECK file="lib/upgradelib.php" function="check_database_storage_engine" level="required">
+        <FEEDBACK>
+          <ON_ERROR message="unsupporteddbstorageengine" />
+        </FEEDBACK>
+      </CUSTOM_CHECK>
+      <CUSTOM_CHECK file="question/engine/upgrade/upgradelib.php" function="quiz_attempts_upgraded" level="required">
+        <FEEDBACK>
+          <ON_ERROR message="quizattemptsupgradedmessage" />
+        </FEEDBACK>
+      </CUSTOM_CHECK>
+      <CUSTOM_CHECK file="lib/upgradelib.php" function="check_slasharguments" level="optional">
+        <FEEDBACK>
+          <ON_CHECK message="slashargumentswarning" />
+        </FEEDBACK>
+      </CUSTOM_CHECK>
+      <CUSTOM_CHECK file="lib/upgradelib.php" function="check_database_tables_row_format" level="optional">
+        <FEEDBACK>
+          <ON_CHECK message="unsupporteddbtablerowformat" />
+        </FEEDBACK>
+      </CUSTOM_CHECK>
+      <CUSTOM_CHECK file="lib/upgradelib.php" function="check_unoconv_version" level="optional">
+        <FEEDBACK>
+          <ON_CHECK message="unoconvwarning" />
+        </FEEDBACK>
+      </CUSTOM_CHECK>
+      <CUSTOM_CHECK file="lib/upgradelib.php" function="check_libcurl_version" level="optional">
+        <FEEDBACK>
+          <ON_CHECK message="libcurlwarning" />
+        </FEEDBACK>
+      </CUSTOM_CHECK>
+      <CUSTOM_CHECK file="lib/upgradelib.php" function="check_mysql_file_format" level="required">
+        <FEEDBACK>
+          <ON_ERROR message="unsupporteddbfileformat" />
+        </FEEDBACK>
+      </CUSTOM_CHECK>
+      <CUSTOM_CHECK file="lib/upgradelib.php" function="check_mysql_file_per_table" level="required">
+        <FEEDBACK>
+          <ON_ERROR message="unsupporteddbfilepertable" />
+        </FEEDBACK>
+      </CUSTOM_CHECK>
+      <CUSTOM_CHECK file="lib/upgradelib.php" function="check_mysql_large_prefix" level="required">
+        <FEEDBACK>
+          <ON_ERROR message="unsupporteddblargeprefix" />
+        </FEEDBACK>
+      </CUSTOM_CHECK>
+      <CUSTOM_CHECK file="lib/upgradelib.php" function="check_is_https" level="optional">
+        <FEEDBACK>
+          <ON_CHECK message="ishttpswarning" />
+        </FEEDBACK>
+      </CUSTOM_CHECK>
+      <CUSTOM_CHECK file="lib/upgradelib.php" function="check_mysql_incomplete_unicode_support" level="optional">
+        <FEEDBACK>
+          <ON_CHECK message="incompleteunicodesupport" />
+        </FEEDBACK>
+      </CUSTOM_CHECK>
+      <CUSTOM_CHECK file="lib/upgradelib.php" function="check_sixtyfour_bits" level="required">
+        <FEEDBACK>
+          <ON_ERROR message="sixtyfourbitsrequired" />
+        </FEEDBACK>
+      </CUSTOM_CHECK>
+      <CUSTOM_CHECK file="lib/upgradelib.php" function="check_max_input_vars" level="optional">
+      </CUSTOM_CHECK>
+      <CUSTOM_CHECK file="lib/upgradelib.php" function="check_admin_dir_usage" level="optional">
+        <FEEDBACK>
+          <ON_CHECK message="iscustomadminwarnings" />
+        </FEEDBACK>
+      </CUSTOM_CHECK>
+      <CUSTOM_CHECK file="lib/upgradelib.php" function="check_xmlrpc_usage" level="optional">
+      </CUSTOM_CHECK>
+      <CUSTOM_CHECK file="lib/upgradelib.php" function="check_mod_assignment" level="required">
+      </CUSTOM_CHECK>
+      <CUSTOM_CHECK file="lib/upgradelib.php" function="check_db_prefix_length" level="required">
+      </CUSTOM_CHECK>
+      <CUSTOM_CHECK file="lib/upgradelib.php" function="check_oracle_usage" level="optional">
+      </CUSTOM_CHECK>
+      <CUSTOM_CHECK file="lib/upgradelib.php" function="check_async_backup" level="recommended">
+      </CUSTOM_CHECK>
+    </CUSTOM_CHECKS>
+  </MOODLE>
+  <MOODLE version="5.0" requires="4.2.3">
+    <UNICODE level="required">
+      <FEEDBACK>
+        <ON_ERROR message="unicoderequired" />
+      </FEEDBACK>
+    </UNICODE>
+    <DATABASE level="required">
+      <VENDOR name="mariadb" version="10.11.0" />
+      <VENDOR name="mysql" version="8.4" />
+      <VENDOR name="postgres" version="14" />
+      <VENDOR name="mssql" version="14.0" />
+      <VENDOR name="oracle" version="19" />
+    </DATABASE>
+    <PHP version="8.2.0" level="required">
+    </PHP>
+    <PCREUNICODE level="optional">
+      <FEEDBACK>
+        <ON_CHECK message="pcreunicodewarning" />
+      </FEEDBACK>
+    </PCREUNICODE>
+    <PHP_EXTENSIONS>
+      <PHP_EXTENSION name="iconv" level="required">
+        <FEEDBACK>
+          <ON_ERROR message="iconvrequired" />
+        </FEEDBACK>
+      </PHP_EXTENSION>
+      <PHP_EXTENSION name="mbstring" level="required">
+        <FEEDBACK>
+          <ON_ERROR message="mbstringrequired" />
+        </FEEDBACK>
+      </PHP_EXTENSION>
+      <PHP_EXTENSION name="curl" level="required">
+        <FEEDBACK>
+          <ON_ERROR message="curlrequired" />
+        </FEEDBACK>
+      </PHP_EXTENSION>
+      <PHP_EXTENSION name="openssl" level="required">
+        <FEEDBACK>
+          <ON_ERROR message="opensslrequired" />
+        </FEEDBACK>
+      </PHP_EXTENSION>
+      <PHP_EXTENSION name="tokenizer" level="optional">
+        <FEEDBACK>
+          <ON_CHECK message="tokenizerrecommended" />
+        </FEEDBACK>
+      </PHP_EXTENSION>
+      <PHP_EXTENSION name="soap" level="optional">
+        <FEEDBACK>
+          <ON_CHECK message="soaprecommended" />
+        </FEEDBACK>
+      </PHP_EXTENSION>
+      <PHP_EXTENSION name="ctype" level="required">
+        <FEEDBACK>
+          <ON_ERROR message="ctyperequired" />
+        </FEEDBACK>
+      </PHP_EXTENSION>
+      <PHP_EXTENSION name="zip" level="required">
+        <FEEDBACK>
+          <ON_ERROR message="ziprequired" />
+        </FEEDBACK>
+      </PHP_EXTENSION>
+      <PHP_EXTENSION name="zlib" level="required">
+      </PHP_EXTENSION>
+      <PHP_EXTENSION name="gd" level="required">
+        <FEEDBACK>
+          <ON_ERROR message="gdrequired" />
+        </FEEDBACK>
+      </PHP_EXTENSION>
+      <PHP_EXTENSION name="simplexml" level="required">
+        <FEEDBACK>
+          <ON_ERROR message="simplexmlrequired" />
+        </FEEDBACK>
+      </PHP_EXTENSION>
+      <PHP_EXTENSION name="spl" level="required">
+        <FEEDBACK>
+          <ON_ERROR message="splrequired" />
+        </FEEDBACK>
+      </PHP_EXTENSION>
+      <PHP_EXTENSION name="pcre" level="required">
+      </PHP_EXTENSION>
+      <PHP_EXTENSION name="dom" level="required">
+      </PHP_EXTENSION>
+      <PHP_EXTENSION name="xml" level="required">
+      </PHP_EXTENSION>
+      <PHP_EXTENSION name="xmlreader" level="required">
+      </PHP_EXTENSION>
+      <PHP_EXTENSION name="intl" level="required">
+        <FEEDBACK>
+          <ON_ERROR message="intlrequired" />
+        </FEEDBACK>
+      </PHP_EXTENSION>
+      <PHP_EXTENSION name="json" level="required">
+      </PHP_EXTENSION>
+      <PHP_EXTENSION name="hash" level="required"/>
+      <PHP_EXTENSION name="fileinfo" level="required"/>
+      <PHP_EXTENSION name="sodium" level="required"/>
+      <PHP_EXTENSION name="exif" level="optional"/>
+    </PHP_EXTENSIONS>
+    <PHP_SETTINGS>
+      <PHP_SETTING name="memory_limit" value="96M" level="required">
+        <FEEDBACK>
+          <ON_ERROR message="settingmemorylimit" />
+        </FEEDBACK>
+      </PHP_SETTING>
+      <PHP_SETTING name="file_uploads" value="1" level="optional">
+        <FEEDBACK>
+          <ON_CHECK message="settingfileuploads" />
+        </FEEDBACK>
+      </PHP_SETTING>
+      <PHP_SETTING name="opcache.enable" value="1" level="optional">
+        <FEEDBACK>
+          <ON_CHECK message="opcacherecommended" />
+        </FEEDBACK>
+      </PHP_SETTING>
+    </PHP_SETTINGS>
+    <CUSTOM_CHECKS>
+      <CUSTOM_CHECK file="lib/upgradelib.php" function="check_database_storage_engine" level="required">
+        <FEEDBACK>
+          <ON_ERROR message="unsupporteddbstorageengine" />
+        </FEEDBACK>
+      </CUSTOM_CHECK>
+      <CUSTOM_CHECK file="question/engine/upgrade/upgradelib.php" function="quiz_attempts_upgraded" level="required">
+        <FEEDBACK>
+          <ON_ERROR message="quizattemptsupgradedmessage" />
+        </FEEDBACK>
+      </CUSTOM_CHECK>
+      <CUSTOM_CHECK file="lib/upgradelib.php" function="check_slasharguments" level="optional">
+        <FEEDBACK>
+          <ON_CHECK message="slashargumentswarning" />
+        </FEEDBACK>
+      </CUSTOM_CHECK>
+      <CUSTOM_CHECK file="lib/upgradelib.php" function="check_database_tables_row_format" level="optional">
+        <FEEDBACK>
+          <ON_CHECK message="unsupporteddbtablerowformat" />
+        </FEEDBACK>
+      </CUSTOM_CHECK>
+      <CUSTOM_CHECK file="lib/upgradelib.php" function="check_unoconv_version" level="optional">
+        <FEEDBACK>
+          <ON_CHECK message="unoconvwarning" />
+        </FEEDBACK>
+      </CUSTOM_CHECK>
+      <CUSTOM_CHECK file="lib/upgradelib.php" function="check_libcurl_version" level="optional">
+        <FEEDBACK>
+          <ON_CHECK message="libcurlwarning" />
+        </FEEDBACK>
+      </CUSTOM_CHECK>
+      <CUSTOM_CHECK file="lib/upgradelib.php" function="check_mysql_file_format" level="required">
+        <FEEDBACK>
+          <ON_ERROR message="unsupporteddbfileformat" />
+        </FEEDBACK>
+      </CUSTOM_CHECK>
+      <CUSTOM_CHECK file="lib/upgradelib.php" function="check_mysql_file_per_table" level="required">
+        <FEEDBACK>
+          <ON_ERROR message="unsupporteddbfilepertable" />
+        </FEEDBACK>
+      </CUSTOM_CHECK>
+      <CUSTOM_CHECK file="lib/upgradelib.php" function="check_mysql_large_prefix" level="required">
+        <FEEDBACK>
+          <ON_ERROR message="unsupporteddblargeprefix" />
+        </FEEDBACK>
+      </CUSTOM_CHECK>
+      <CUSTOM_CHECK file="lib/upgradelib.php" function="check_is_https" level="optional">
+        <FEEDBACK>
+          <ON_CHECK message="ishttpswarning" />
+        </FEEDBACK>
+      </CUSTOM_CHECK>
+      <CUSTOM_CHECK file="lib/upgradelib.php" function="check_mysql_incomplete_unicode_support" level="optional">
+        <FEEDBACK>
+          <ON_CHECK message="incompleteunicodesupport" />
+        </FEEDBACK>
+      </CUSTOM_CHECK>
+      <CUSTOM_CHECK file="lib/upgradelib.php" function="check_sixtyfour_bits" level="required">
+        <FEEDBACK>
+          <ON_ERROR message="sixtyfourbitsrequired" />
+        </FEEDBACK>
+      </CUSTOM_CHECK>
+      <CUSTOM_CHECK file="lib/upgradelib.php" function="check_max_input_vars" level="optional">
+      </CUSTOM_CHECK>
+      <CUSTOM_CHECK file="lib/upgradelib.php" function="check_admin_dir_usage" level="optional">
+        <FEEDBACK>
+          <ON_CHECK message="iscustomadminwarnings" />
+        </FEEDBACK>
+      </CUSTOM_CHECK>
+      <CUSTOM_CHECK file="lib/upgradelib.php" function="check_xmlrpc_usage" level="optional">
+      </CUSTOM_CHECK>
+      <CUSTOM_CHECK file="lib/upgradelib.php" function="check_mod_assignment" level="required">
+      </CUSTOM_CHECK>
+      <CUSTOM_CHECK file="lib/upgradelib.php" function="check_db_prefix_length" level="required">
+      </CUSTOM_CHECK>
+      <CUSTOM_CHECK file="lib/upgradelib.php" function="check_oracle_usage" level="optional">
+      </CUSTOM_CHECK>
+      <CUSTOM_CHECK file="lib/upgradelib.php" function="check_async_backup" level="recommended">
+      </CUSTOM_CHECK>
+    </CUSTOM_CHECKS>
+  </MOODLE>
 </COMPATIBILITY_MATRIX>

admin/presets/tests/generator_test.php

@@ -180,7 +180,7 @@ class generator_test extends \advanced_testcase {
      *
      * @return array
      */
-    public function create_preset_provider(): array {
+    public static function create_preset_provider(): array {
         return [
             'Default values' => [
             ],

admin/presets/tests/helper_test.php

@@ -84,7 +84,7 @@ class helper_test extends \advanced_testcase {
      *
      * @return array
      */
-    public function create_preset_provider(): array {
+    public static function create_preset_provider(): array {
         return [
             'Default values' => [
             ],
@@ -177,7 +177,7 @@ class helper_test extends \advanced_testcase {
      *
      * @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 @@ class helper_test extends \advanced_testcase {
      *
      * @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 @@ class helper_test extends \advanced_testcase {
      *
      * @return array
      */
-    public function change_default_preset_provider(): array {
+    public static function change_default_preset_provider(): array {
         return [
             'Starter preset' => [
                 'preset' => 'starter',
@@ -364,7 +364,7 @@ class helper_test extends \advanced_testcase {
                 'preset' => 'unexisting',
             ],
             'Valid XML file' => [
-                'preset' => __DIR__ . '/fixtures/import_settings_plugins.xml',
+                'preset' => self::get_fixture_path(__NAMESPACE__, 'import_settings_plugins.xml'),
                 'settings' => [
                     'allowemojipicker' => 1,
                     'enableportfolios' => 1,
@@ -377,7 +377,7 @@ class helper_test extends \advanced_testcase {
                 ],
             ],
             'Invalid XML file' => [
-                'preset' => __DIR__ . '/fixtures/invalid_xml_file.xml',
+                'preset' => self::get_fixture_path(__NAMESPACE__, 'invalid_xml_file.xml'),
             ],
             'Unexisting XML file' => [
                 'preset' => __DIR__ . '/fixtures/unexisting.xml',

admin/presets/tests/local/setting/adminpresets_admin_setting_bloglevel_test.php

@@ -72,7 +72,7 @@ class adminpresets_admin_setting_bloglevel_test extends \advanced_testcase {
      *
      * @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,

admin/presets/tests/local/setting/adminpresets_admin_setting_sitesettext_test.php

@@ -66,7 +66,7 @@ class adminpresets_admin_setting_sitesettext_test extends \advanced_testcase {
      *
      * @return array
      */
-    public function save_value_provider(): array {
+    public static function save_value_provider(): array {
         return [
             'Fullname: different value' => [
                 'settingname' => 'fullname',

admin/presets/tests/local/setting/adminpresets_setting_test.php

@@ -77,7 +77,7 @@ class adminpresets_setting_test extends \advanced_testcase {
      *
      * @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 @@ class adminpresets_setting_test extends \advanced_testcase {
      *
      * @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',

admin/presets/tests/manager_test.php

@@ -29,6 +29,14 @@ use stdClass;
  * @coversDefaultClass \core_adminpresets\manager
  */
 class manager_test extends \advanced_testcase {
+    /**
+     * Include required libraries.
+     */
+    public static function setUpBeforeClass(): void {
+        global $CFG;
+        require_once($CFG->libdir.'/adminlib.php');
+    }
+
     /**
      * Test the behaviour of protected get_site_settings method.
      *
@@ -359,7 +367,7 @@ class manager_test extends \advanced_testcase {
      *
      * @return array
      */
-    public function export_preset_provider(): array {
+    public static function export_preset_provider(): array {
         return [
             'Export settings and plugins, excluding sensible' => [
                 'includesensible' => false,
@@ -522,26 +530,32 @@ class manager_test extends \advanced_testcase {
      *
      * @return array
      */
-    public function import_preset_provider(): array {
+    public static function import_preset_provider(): array {
         return [
             'Import settings from an empty file' => [
                 'filecontents' => '',
                 'expectedpreset' => false,
             ],
             'Import settings and plugins from a valid XML file' => [
-                'filecontents' => file_get_contents(__DIR__ . '/fixtures/import_settings_plugins.xml'),
+                'filecontents' => file_get_contents(
+                    filename: self::get_fixture_path(__NAMESPACE__, 'import_settings_plugins.xml')
+                ),
                 'expectedpreset' => true,
                 'expectedsettings' => true,
                 'expectedplugins' => true,
             ],
             'Import only settings from a valid XML file' => [
-                'filecontents' => file_get_contents(__DIR__ . '/fixtures/import_settings.xml'),
+                'filecontents' => file_get_contents(
+                    filename: self::get_fixture_path(__NAMESPACE__, 'import_settings.xml')
+                ),
                 'expectedpreset' => true,
                 'expectedsettings' => true,
                 'expectedplugins' => false,
             ],
             'Import settings and plugins from a valid XML file with Starter name, which will be marked as non-core' => [
-                'filecontents' => file_get_contents(__DIR__ . '/fixtures/import_starter_name.xml'),
+                'filecontents' => file_get_contents(
+                    filename: self::get_fixture_path(__NAMESPACE__, 'import_starter_name.xml')
+                ),
                 'expectedpreset' => true,
                 'expectedsettings' => true,
                 'expectedplugins' => true,
@@ -550,7 +564,9 @@ class manager_test extends \advanced_testcase {
                 'expectedpresetname' => 'Starter',
             ],
             'Import settings from an invalid XML file' => [
-                'filecontents' => file_get_contents(__DIR__ . '/fixtures/invalid_xml_file.xml'),
+                'filecontents' => file_get_contents(
+                    filename: self::get_fixture_path(__NAMESPACE__, 'invalid_xml_file.xml')
+                ),
                 'expectedpreset' => false,
                 'expectedsettings' => false,
                 'expectedplugins' => false,
@@ -558,20 +574,26 @@ class manager_test extends \advanced_testcase {
                 'expectedexception' => \Exception::class,
             ],
             'Import unexisting settings category' => [
-                'filecontents' => file_get_contents(__DIR__ . '/fixtures/unexisting_category.xml'),
+                'filecontents' => file_get_contents(
+                    filename: self::get_fixture_path(__NAMESPACE__, 'unexisting_category.xml')
+                ),
                 'expectedpreset' => false,
                 'expectedsettings' => false,
                 'expectedplugins' => false,
             ],
             'Import unexisting setting' => [
-                'filecontents' => file_get_contents(__DIR__ . '/fixtures/unexisting_setting.xml'),
+                'filecontents' => file_get_contents(
+                    filename: self::get_fixture_path(__NAMESPACE__, 'unexisting_setting.xml')
+                ),
                 'expectedpreset' => false,
                 'expectedsettings' => false,
                 'expectedplugins' => false,
                 'expecteddebugging' => true,
             ],
             'Import valid settings with one unexisting setting too' => [
-                'filecontents' => file_get_contents(__DIR__ . '/fixtures/import_settings_with_unexisting_setting.xml'),
+                'filecontents' => file_get_contents(
+                    filename: self::get_fixture_path(__NAMESPACE__, 'import_settings_with_unexisting_setting.xml'),
+                ),
                 'expectedpreset' => true,
                 'expectedsettings' => false,
                 'expectedplugins' => false,

admin/presets/tests/privacy/privacy_provider_test.php

@@ -36,7 +36,7 @@ class privacy_provider_test extends provider_testcase {
      * Test for provider::get_metadata().
      * @covers ::get_metadata
      */
-    public function test_get_metadata() {
+    public function test_get_metadata(): void {
         $collection = new collection('core_adminpresets');
         $newcollection = provider::get_metadata($collection);
         $itemcollection = $newcollection->get_collection();
@@ -49,7 +49,7 @@ class privacy_provider_test extends provider_testcase {
      * Test for provider::get_contexts_for_userid() doesn't return any context.
      * @covers ::get_contexts_for_userid
      */
-    public function test_get_contexts_for_userid() {
+    public function test_get_contexts_for_userid(): void {
         global $USER;
 
         $this->resetAfterTest();
@@ -67,7 +67,7 @@ class privacy_provider_test extends provider_testcase {
      * Test for provider::get_users_in_context() doesn't return any user.
      * @covers ::get_users_in_context
      */
-    public function test_get_users_in_context() {
+    public function test_get_users_in_context(): void {
         global $USER;
 
         $this->resetAfterTest();
@@ -88,7 +88,7 @@ class privacy_provider_test extends provider_testcase {
      * Test for provider::export_user_data().
      * @covers ::export_user_data
      */
-    public function test_export_user_data() {
+    public function test_export_user_data(): void {
         global $USER;
 
         $this->resetAfterTest();
@@ -121,7 +121,7 @@ class privacy_provider_test extends provider_testcase {
      * Test for provider::delete_data_for_all_users_in_context().
      * @covers ::delete_data_for_all_users_in_context
      */
-    public function test_delete_data_for_all_users_in_context() {
+    public function test_delete_data_for_all_users_in_context(): void {
         global $DB, $USER;
 
         $this->resetAfterTest();
@@ -146,7 +146,7 @@ class privacy_provider_test extends provider_testcase {
      * Test for provider::delete_data_for_user().
      * @covers ::delete_data_for_user
      */
-    public function test_delete_data_for_user() {
+    public function test_delete_data_for_user(): void {
         global $DB, $USER;
 
         $this->resetAfterTest();

admin/renderer.php

@@ -874,8 +874,8 @@ class core_admin_renderer extends plugin_renderer_base {
     protected function mobile_configuration_warning($mobileconfigured) {
         $output = '';
         if (!$mobileconfigured) {
-            $settingslink = new moodle_url('/admin/settings.php', ['section' => 'mobilesettings']);
-            $configurebutton = $this->single_button($settingslink, get_string('enablemobilewebservice', 'admin'));
+            $settingslink = new moodle_url('/admin/search.php', ['query' => 'enablemobilewebservice']);
+            $configurebutton = $this->single_button($settingslink, get_string('enablemobilewebservice', 'admin'), 'get');
             $output .= $this->warning(get_string('mobilenotconfiguredwarning', 'admin') . ' ' . $configurebutton);
         }
 

admin/roles/tests/preset_test.php

@@ -27,7 +27,7 @@ use core_role_preset;
  * @license   http://www.gnu.org/copyleft/gpl.html GNU GPL v3 or later
  */
 class preset_test extends \advanced_testcase {
-    public function test_xml() {
+    public function test_xml(): void {
         global $DB;
 
         $roles = $DB->get_records('role');
@@ -81,10 +81,10 @@ class preset_test extends \advanced_testcase {
      * Tests covered method.
      * @covers \core_role_preset::parse_preset
      */
-    public function test_mixed_levels() {
+    public function test_mixed_levels(): void {
         // The problem here is that we cannot guarantee plugin contexts
         // have unique short names, so we have to also support level numbers.
-        $xml = file_get_contents(__DIR__ . '/fixtures/mixed_levels.xml');
+        $xml = file_get_contents(self::get_fixture_path(__NAMESPACE__, 'mixed_levels.xml'));
         $this->assertTrue(\core_role_preset::is_valid_preset($xml));
 
         $preset = \core_role_preset::parse_preset($xml);

admin/roles/tests/privacy/provider_test.php

@@ -45,7 +45,7 @@ class provider_test extends provider_testcase {
      * Test to check export_user_preferences.
      * returns user preferences data.
      */
-    public function test_export_user_preferences() {
+    public function test_export_user_preferences(): void {
         $this->resetAfterTest();
         $this->setAdminUser();
         $user = $this->getDataGenerator()->create_user();
@@ -64,7 +64,7 @@ class provider_test extends provider_testcase {
     /**
      * Check all contexts are returned if there is any user data for this user.
      */
-    public function test_get_contexts_for_userid() {
+    public function test_get_contexts_for_userid(): void {
         global $DB;
 
         $this->resetAfterTest();
@@ -114,7 +114,7 @@ class provider_test extends provider_testcase {
     /**
      * Test that user data is exported correctly.
      */
-    public function test_export_user_data() {
+    public function test_export_user_data(): void {
         global $DB;
 
         $this->resetAfterTest();
@@ -243,7 +243,7 @@ class provider_test extends provider_testcase {
     /**
      * Test for provider::delete_data_for_all_users_in_context().
      */
-    public function test_delete_data_for_all_users_in_context() {
+    public function test_delete_data_for_all_users_in_context(): void {
         global $DB;
 
         $this->resetAfterTest();
@@ -329,7 +329,7 @@ class provider_test extends provider_testcase {
     /**
      * Test for provider::delete_data_for_user().
      */
-    public function test_delete_data_for_user() {
+    public function test_delete_data_for_user(): void {
         global $DB;
 
         $this->resetAfterTest();
@@ -387,7 +387,7 @@ class provider_test extends provider_testcase {
     /**
      * Export for a user with a key against a script where no instance is specified.
      */
-    public function test_export_user_role_to_cohort() {
+    public function test_export_user_role_to_cohort(): void {
         global $DB;
 
         $this->resetAfterTest();
@@ -443,7 +443,7 @@ class provider_test extends provider_testcase {
     /**
      * Test for provider::delete_user_role_to_cohort().
      */
-    public function test_delete_user_role_to_cohort() {
+    public function test_delete_user_role_to_cohort(): void {
         global $DB;
 
         $this->resetAfterTest();
@@ -478,7 +478,7 @@ class provider_test extends provider_testcase {
     /**
      * Test that only users within a course context are fetched.
      */
-    public function test_get_users_in_context() {
+    public function test_get_users_in_context(): void {
         global $DB;
 
         $this->resetAfterTest();
@@ -599,7 +599,7 @@ class provider_test extends provider_testcase {
     /**
      * Test that data for users in approved userlist is deleted.
      */
-    public function test_delete_data_for_users() {
+    public function test_delete_data_for_users(): void {
         global $DB;
 
         $this->resetAfterTest();

admin/settings/courses.php

@@ -420,6 +420,12 @@ if ($hassiteconfig or has_any_capability($capabilities, $systemcontext)) {
             new lang_string('generalgroups', 'backup'), new lang_string('configgeneralgroups', 'backup'),
             array('value' => 1, 'locked' => 0)));
     $temp->add(new admin_setting_configcheckbox_with_lock('backup/backup_general_competencies', new lang_string('generalcompetencies','backup'), new lang_string('configgeneralcompetencies','backup'), array('value'=>1, 'locked'=>0)));
+    $temp->add(new admin_setting_configcheckbox_with_lock(
+        'backup/backup_general_customfield',
+        new lang_string('generalcustomfield', 'backup'),
+        new lang_string('configgeneralcustomfield', 'backup'),
+        ['value' => 1, 'locked' => 0],
+    ));
     $temp->add(new admin_setting_configcheckbox_with_lock('backup/backup_general_contentbankcontent',
         new lang_string('generalcontentbankcontent', 'backup'),
         new lang_string('configgeneralcontentbankcontent', 'backup'),
@@ -431,7 +437,6 @@ if ($hassiteconfig or has_any_capability($capabilities, $systemcontext)) {
         ['value' => 1, 'locked' => 0])
     );
 
-
     $temp->add(new admin_setting_configcheckbox_with_lock('backup/backup_general_legacyfiles',
         new lang_string('generallegacyfiles', 'backup'),
         new lang_string('configlegacyfiles', 'backup'), array('value' => 1, 'locked' => 0)));
@@ -460,6 +465,12 @@ if ($hassiteconfig or has_any_capability($capabilities, $systemcontext)) {
             new lang_string('generalgroups', 'backup'), new lang_string('configgeneralgroups', 'backup'),
             array('value' => 1, 'locked' => 0)));
     $temp->add(new admin_setting_configcheckbox_with_lock('backup/backup_import_competencies', new lang_string('generalcompetencies','backup'), new lang_string('configgeneralcompetencies','backup'), array('value'=>1, 'locked'=>0)));
+    $temp->add(new admin_setting_configcheckbox_with_lock(
+        'backup/backup_import_customfield',
+        new lang_string('generalcustomfield', 'backup'),
+        new lang_string('configgeneralcustomfield', 'backup'),
+        ['value' => 1, 'locked' => 0],
+    ));
     $temp->add(new admin_setting_configcheckbox_with_lock(
         'backup/backup_import_contentbankcontent',
         new lang_string('generalcontentbankcontent', 'backup'),
@@ -589,6 +600,12 @@ if ($hassiteconfig or has_any_capability($capabilities, $systemcontext)) {
     $temp->add(new admin_setting_configcheckbox('backup/backup_auto_groups', new lang_string('generalgroups', 'backup'),
             new lang_string('configgeneralgroups', 'backup'), 1));
     $temp->add(new admin_setting_configcheckbox('backup/backup_auto_competencies', new lang_string('generalcompetencies','backup'), new lang_string('configgeneralcompetencies','backup'), 1));
+    $temp->add(new admin_setting_configcheckbox(
+        'backup/backup_auto_customfield',
+        new lang_string('generalcustomfield', 'backup'),
+        new lang_string('configgeneralcustomfield', 'backup'),
+        1,
+    ));
     $temp->add(new admin_setting_configcheckbox(
         'backup/backup_auto_contentbankcontent',
         new lang_string('generalcontentbankcontent', 'backup'),
@@ -668,6 +685,12 @@ if ($hassiteconfig or has_any_capability($capabilities, $systemcontext)) {
     $temp->add(new admin_setting_configcheckbox_with_lock('restore/restore_general_competencies',
         new lang_string('generalcompetencies', 'backup'),
         new lang_string('configrestorecompetencies', 'backup'), array('value' => 1, 'locked' => 0)));
+    $temp->add(new admin_setting_configcheckbox_with_lock(
+        'restore/restore_general_customfield',
+        new lang_string('generalcustomfield', 'backup'),
+        new lang_string('configrestorecustomfield', 'backup'),
+        ['value' => 1, 'locked' => 0],
+    ));
     $temp->add(new admin_setting_configcheckbox_with_lock('restore/restore_general_contentbankcontent',
         new lang_string('generalcontentbankcontent', 'backup'),
         new lang_string('configrestorecontentbankcontent', 'backup'), array('value' => 1, 'locked' => 0)));

admin/settings/security.php

@@ -152,7 +152,9 @@ if ($hassiteconfig) { // speedup for non-admins, add all caps used on this page
     $sensiblesettingsdefault .= 'server_password@@search_solr, ssl_keypassword@@search_solr, ';
     $sensiblesettingsdefault .= 'alternateserver_password@@search_solr, alternatessl_keypassword@@search_solr, ';
     $sensiblesettingsdefault .= 'test_password@@cachestore_redis, password@@mlbackend_python, ';
-    $sensiblesettingsdefault .= 'badges_badgesalt@@none, calendar_exportsalt@@none';
+    $sensiblesettingsdefault .= 'badges_badgesalt@@none, calendar_exportsalt@@none, ';
+    $sensiblesettingsdefault .= 'bigbluebuttonbn_shared_secret@@none, apikey@@tiny_premium, ';
+    $sensiblesettingsdefault .= 'matrixaccesstoken@@communication_matrix, api_secret@@factor_sms';
     $temp->add(new admin_setting_configtextarea('adminpresets/sensiblesettings',
             get_string('sensiblesettings', 'core_adminpresets'),
             get_string('sensiblesettingstext', 'core_adminpresets'),

admin/templates/setting_configcheckbox.mustache

@@ -38,6 +38,6 @@
     }
 }}
 <div class="form-checkbox defaultsnext">
-    <input type="hidden" name="{{name}}" value="{{no}}">
+    {{^readonly}}<input type="hidden" name="{{name}}" value="{{no}}">{{/readonly}}
     <input {{#readonly}}disabled{{/readonly}} type="checkbox" name="{{name}}" value="{{value}}" id="{{id}}" {{#checked}}checked{{/checked}}>
 </div>

admin/templates/setting_configmulticheckbox.mustache

@@ -35,7 +35,7 @@
     }
 }}
 <div class="form-multicheckbox">
-    <input type="hidden" name="{{name}}[xxxxx]" value="1">
+    {{^readonly}}<input type="hidden" name="{{name}}[xxxxx]" value="1">{{/readonly}}
     {{#hasoptions}}
         <ul>
             {{#options}}

admin/templates/setting_configmultiselect.mustache

@@ -40,7 +40,7 @@
     Setting configmultiselect.
 }}
 <div class="form-select">
-    <input type="hidden" name="{{name}}[xxxxx]" value="1">
+    {{^readonly}}<input type="hidden" name="{{name}}[xxxxx]" value="1">{{/readonly}}
     <select {{#readonly}}disabled{{/readonly}} id="{{id}}" name="{{name}}[]" size="{{size}}" class="form-control" multiple>
         {{#options}}
             <option value="{{value}}" {{#selected}}selected{{/selected}}>{{name}}</option>

admin/templates/setting_configmultiselect_optgroup.mustache

@@ -59,7 +59,7 @@
     Setting configmultiselect with optgroup support.
 }}
 <div class="form-select">
-    <input type="hidden" name="{{name}}[xxxxx]" value="1">
+    {{^readonly}}<input type="hidden" name="{{name}}[xxxxx]" value="1">{{/readonly}}
     <select {{#readonly}}disabled{{/readonly}} id="{{id}}" name="{{name}}[]" size="{{size}}" class="form-control" multiple>
     {{#options}}
         <option value="{{value}}" {{#selected}}selected{{/selected}}>{{name}}</option>

admin/tests/behat/browse_users.feature

@@ -18,7 +18,7 @@ Feature: An administrator can browse user accounts
     When I navigate to "Users > Accounts > Browse list of users" in site administration
     # Name field always present, email field is default for showidentity.
     Then the following should exist in the "reportbuilder-table" table:
-      | First name / Last name | Email address   |
+      | First name           | Email address   |
       | User One             | one@example.com |
       | User Two             | two@example.com |
     # Should not see other identity fields or non-default name fields.
@@ -34,7 +34,7 @@ Feature: An administrator can browse user accounts
       | alternativefullnameformat | firstnamephonetic lastname |
     When I navigate to "Users > Accounts > Browse list of users" in site administration
     Then the following should exist in the "reportbuilder-table" table:
-      | First name - phonetic / Last name | Email address   |
+      | First name - phonetic           | Email address   |
       | Yewzer One                      | one@example.com |
       | Yoozare Two                     | two@example.com |
 
@@ -43,7 +43,7 @@ Feature: An administrator can browse user accounts
       | showuseridentity | department,profile_field_frog |
     When I navigate to "Users > Accounts > Browse list of users" in site administration
     Then the following should exist in the "reportbuilder-table" table:
-      | First name / Last name | Favourite frog  | Department |
+      | First name           | Favourite frog  | Department |
       | User One             | Kermit          | Attack     |
       | User Two             | Tree            | Defence    |
     And I should not see "Email address" in the "table" "css_element"
@@ -103,7 +103,7 @@ Feature: An administrator can browse user accounts
       | user3    | User      | Three    | three@example.com | Glass              |
     And I navigate to "Users > Accounts > Browse list of users" in site administration
     Then the following should exist in the "reportbuilder-table" table:
-      | First name / Last name | Email address     |
+      | First name             | Email address     |
       | User One               | one@example.com   |
       | User Two               | two@example.com   |
       | User Three             | three@example.com |
@@ -137,7 +137,7 @@ Feature: An administrator can browse user accounts
       | user2 | C1     | student |
     And I navigate to "Users > Accounts > Browse list of users" in site administration
     Then the following should exist in the "reportbuilder-table" table:
-      | First name / Last name | Email address     |
+      | First name             | Email address     |
       | User One               | one@example.com   |
       | User Two               | two@example.com   |
     And I click on "Filters" "button"
@@ -166,7 +166,7 @@ Feature: An administrator can browse user accounts
       | user1 | coursecreator | system       |           |
     And I navigate to "Users > Accounts > Browse list of users" in site administration
     Then the following should exist in the "reportbuilder-table" table:
-      | First name / Last name | Email address     |
+      | First name             | Email address     |
       | User One               | one@example.com   |
       | User Two               | two@example.com   |
       | User Three             | three@example.com |

admin/tests/behat/filter_users.feature

@@ -159,3 +159,24 @@ Feature: An administrator can filter user accounts by role, cohort and other pro
     And I should not see "User One" in the "reportbuilder-table" "table"
     And I should not see "User Three" in the "reportbuilder-table" "table"
     And I should not see "User Four" in the "reportbuilder-table" "table"
+
+  @javascript
+  Scenario: Filter users by full name
+    When I click on "Filters" "button"
+    And I set the following fields in the "Full name" "core_reportbuilder > Filter" to these values:
+      | Full name operator | Is equal to |
+      | Full name value    | User One    |
+    And I click on "Apply" "button" in the "[data-region='report-filters']" "css_element"
+    Then I should see "User One" in the "reportbuilder-table" "table"
+    And I should not see "User Two" in the "reportbuilder-table" "table"
+    And I should not see "User Three" in the "reportbuilder-table" "table"
+    And I should not see "User Four" in the "reportbuilder-table" "table"
+    And I click on "Reset all" "button" in the "[data-region='report-filters']" "css_element"
+    And I set the following fields in the "Full name" "core_reportbuilder > Filter" to these values:
+      | Full name operator | Is equal to |
+      | Full name value    | User Two    |
+    And I click on "Apply" "button" in the "[data-region='report-filters']" "css_element"
+    And I should see "User Two" in the "reportbuilder-table" "table"
+    And I should not see "User One" in the "reportbuilder-table" "table"
+    And I should not see "User Three" in the "reportbuilder-table" "table"
+    And I should not see "User Four" in the "reportbuilder-table" "table"

admin/tests/behat/task_logs.feature

@@ -48,25 +48,3 @@ Feature: View task logs report and use its filters
       | operator     | shouldornotsee |
       | Less than    | should not see |
       | Greater than | should see     |
-
-  @javascript
-  Scenario: Reset task log filters
-    Given I log in as "admin"
-    And I change window size to "large"
-    And I navigate to "Server > Tasks > Task logs" in site administration
-    When I click on "Filters" "button"
-    And I set the following fields in the "Result" "core_reportbuilder > Filter" to these values:
-      | Result operator | Is equal to |
-      | Result value    | Fail        |
-    And I click on "Apply" "button" in the "[data-region='report-filters']" "css_element"
-    Then I should see "Filters applied"
-    And I should see "Filters (1)" in the "#dropdownFiltersButton" "css_element"
-    And I should see "Nothing to display"
-    And I click on "Reset all" "button" in the "[data-region='report-filters']" "css_element"
-    And I should see "Filters reset"
-    And I should not see "Filters (1)" in the "#dropdownFiltersButton" "css_element"
-    And I should see "Filters" in the "#dropdownFiltersButton" "css_element"
-    And "[data-region='report-filters']" "css_element" should be visible
-    And the following fields in the "Result" "core_reportbuilder > Filter" match these values:
-      | Result operator | Is any value |
-    And I should not see "Nothing to display"

admin/tests/external/set_block_protection_test.php

@@ -85,7 +85,7 @@ class set_block_protection_test extends \externallib_advanced_testcase {
      *
      * @return array
      */
-    public function execute_provider(): array {
+    public static function execute_provider(): array {
         return [
             [
                 'block_login',

admin/tests/external/set_plugin_order_test.php

@@ -72,7 +72,7 @@ class set_plugin_order_test extends \externallib_advanced_testcase {
      *
      * @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 @@ class set_plugin_order_test extends \externallib_advanced_testcase {
         $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'],

admin/tests/external/set_plugin_state_test.php

@@ -66,7 +66,7 @@ class set_plugin_state_test extends \externallib_advanced_testcase {
      *
      * @return array
      */
-    public function execute_standard_provider(): array {
+    public static function execute_standard_provider(): array {
         $generatetestsfor = function (string $plugin): array {
             return [
                 [

admin/tests/reportbuilder/datasource/task_logs_test.php

@@ -110,7 +110,7 @@ class task_logs_test extends core_reportbuilder_testcase {
      *
      * @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],

admin/tool/admin_presets/tests/behat/download.feature

@@ -5,16 +5,18 @@ Feature: I can download a preset
       | name       |
       | Custom preset |
 
-  @javascript
   Scenario: Custom preset settings can be downloaded
     Given I log in as "admin"
     And I navigate to "Site admin presets" in site administration
     When I open the action menu in "Custom preset" "table_row"
-    Then following "Download" "link" in the "Custom preset" "table_row" should download between "0" and "5000" bytes
+    Then following "Download" in the "Custom preset" "table_row" should download a file that:
+      | Has mimetype                 | text/xml      |
+      | Contains text in xml element | Custom preset |
 
-  @javascript
   Scenario: Core preset settings can be downloaded
     Given I log in as "admin"
     And I navigate to "Site admin presets" in site administration
     When I open the action menu in "Starter" "table_row"
-    Then following "Download" "link" in the "Starter" "table_row" should download between "0" and "5000" bytes
+    Then following "Download" in the "Starter" "table_row" should download a file that:
+      | Has mimetype                 | text/xml |
+      | Contains text in xml element | Starter  |

admin/tool/admin_presets/tests/event/preset_deleted_test.php

@@ -30,7 +30,7 @@ class preset_deleted_test extends \advanced_testcase {
     /**
      * Test preset_deleted event.
      */
-    public function test_preset_deleted_event() {
+    public function test_preset_deleted_event(): void {
         $this->resetAfterTest();
         $this->setAdminUser();
 

admin/tool/admin_presets/tests/event/preset_downloaded_test.php

@@ -30,7 +30,7 @@ class preset_downloaded_test extends \advanced_testcase {
     /**
      * Test preset_downloaded event.
      */
-    public function test_preset_downloaded_event() {
+    public function test_preset_downloaded_event(): void {
         $this->resetAfterTest();
         $this->setAdminUser();
 

admin/tool/admin_presets/tests/event/preset_exported_test.php

@@ -30,7 +30,7 @@ class preset_exported_test extends \advanced_testcase {
     /**
      * Test preset_exported event.
      */
-    public function test_preset_exported_event() {
+    public function test_preset_exported_event(): void {
         $this->resetAfterTest();
         $this->setAdminUser();
 

admin/tool/admin_presets/tests/event/preset_imported_test.php

@@ -30,7 +30,7 @@ class preset_imported_test extends \advanced_testcase {
     /**
      * Test preset_imported event.
      */
-    public function test_preset_imported_event() {
+    public function test_preset_imported_event(): void {
         $this->resetAfterTest();
         $this->setAdminUser();
 

admin/tool/admin_presets/tests/event/preset_loaded_test.php

@@ -30,7 +30,7 @@ class preset_loaded_test extends \advanced_testcase {
     /**
      * Test preset_loaded event.
      */
-    public function test_preset_loaded_event() {
+    public function test_preset_loaded_event(): void {
         $this->resetAfterTest();
         $this->setAdminUser();
 

admin/tool/admin_presets/tests/event/preset_previewed_test.php

@@ -30,7 +30,7 @@ class preset_previewed_test extends \advanced_testcase {
     /**
      * Test preset_previewed event.
      */
-    public function test_preset_previewed_event() {
+    public function test_preset_previewed_event(): void {
         $this->resetAfterTest();
         $this->setAdminUser();
 

admin/tool/admin_presets/tests/event/preset_reverted_test.php

@@ -30,7 +30,7 @@ class preset_reverted_test extends \advanced_testcase {
     /**
      * Test preset_reverted event.
      */
-    public function test_preset_reverted_event() {
+    public function test_preset_reverted_event(): void {
         $this->resetAfterTest();
         $this->setAdminUser();
 

admin/tool/admin_presets/tests/event/presets_listed_test.php

@@ -30,7 +30,7 @@ class presets_listed_test extends \advanced_testcase {
     /**
      * Test presets_listed event.
      */
-    public function test_presets_listed_event() {
+    public function test_presets_listed_event(): void {
         $this->resetAfterTest();
         $this->setAdminUser();
 

admin/tool/admin_presets/tests/local/action/base_test.php

@@ -70,7 +70,7 @@ class base_test extends \advanced_testcase {
      *
      * @return array
      */
-    public function log_provider(): array {
+    public static function log_provider(): array {
         return [
             // Action = base.
             'action=base and mode = show' => [

admin/tool/admin_presets/tests/local/action/export_test.php

@@ -156,7 +156,7 @@ class export_test extends \advanced_testcase {
      *
      * @return array
      */
-    public function export_execute_provider(): array {
+    public static function export_execute_provider(): array {
         return [
             'Export settings and plugins, excluding sensible' => [
                 'includesensible' => false,

admin/tool/admin_presets/tests/local/action/import_test.php

@@ -190,7 +190,7 @@ class import_test extends \advanced_testcase {
      *
      * @return array
      */
-    public function import_execute_provider(): array {
+    public static function import_execute_provider(): array {
         $fixturesfolder = __DIR__ . '/../../../../../presets/tests/fixtures/';
 
         return [

admin/tool/analytics/tests/external/external_test.php

@@ -50,7 +50,7 @@ class external_test extends externallib_advanced_testcase {
     /**
      * test_potential_contexts description
      */
-    public function test_potential_contexts() {
+    public function test_potential_contexts(): void {
         $this->resetAfterTest();
 
         $this->setAdminUser();
@@ -71,7 +71,7 @@ class external_test extends externallib_advanced_testcase {
     /**
      * test_potential_contexts description
      */
-    public function test_potential_contexts_no_manager() {
+    public function test_potential_contexts_no_manager(): void {
         $this->resetAfterTest();
 
         $user = $this->getDataGenerator()->create_user();

admin/tool/behat/tests/behat/frozen_clock.feature

@@ -0,0 +1,61 @@
+@tool @tool_behat
+Feature: Frozen clock in Behat
+  In order to write tests that depend on the current system time
+  As a test writer
+  I need to set the time using a Behat step
+
+  Background:
+    Given the following "courses" exist:
+      | fullname | shortname |
+      | Course 1 | C1        |
+    And the following "activities" exist:
+      | activity | course | name      | idnumber | externalurl                                                 |
+      | url      | C1     | Fixture   | url1     | #wwwroot#/admin/tool/behat/tests/fixtures/core/showtime.php |
+      | forum    | C1     | TestForum | forum1   |                                                             |
+
+  Scenario: Time has been frozen
+    # Set up 2 forum discussions at different times. This tests the clock in the Behat CLI process.
+    Given the time is frozen at "2024-03-01 12:34:56"
+    And the following "mod_forum > discussions" exist:
+      | user  | forum  | name     | message  |
+      | admin | forum1 | Subject1 | Message1 |
+    And the time is frozen at "2024-08-01 12:34:56"
+    And the following "mod_forum > discussions" exist:
+      | user  | forum  | name     | message  |
+      | admin | forum1 | Subject2 | Message2 |
+    When I am on the "TestForum" "forum activity" page logged in as admin
+    Then I should see "1 Mar 2024" in the "Subject1" "table_row"
+    And I should see "1 Aug 2024" in the "Subject2" "table_row"
+    # Also view time on the fixture page. This tests the clock for Behat web server requests.
+    And I am on the "Fixture" "url activity" page
+    And I should see "Behat time is not the same as real time"
+    # This Unix time corresponds to 12:34:56 in Perth time zone.
+    And I should see "Unix time 1722486896"
+    And I should see "Date-time 2024-08-01 12:34:56"
+
+  # This scenario is second, to verify that the clock automatically goes back to normal after test.
+  Scenario: Time is normal
+    Given the following "mod_forum > discussions" exist:
+      | user  | forum  | name     | message  |
+      | admin | forum1 | Subject1 | Message1 |
+    When I am on the "TestForum" "forum activity" page logged in as admin
+    # The time should be the real current time, not the frozen time.
+    Then I should see "## today ##%d %b %Y##" in the "Subject1" "table_row"
+    And I am on the "Fixture" "url activity" page
+    And I should see "Behat time is the same as real time"
+
+  Scenario: Time is frozen and then unfrozen
+    Given the time is frozen at "2024-03-01 12:34:56"
+    And the following "mod_forum > discussions" exist:
+      | user  | forum  | name     | message  |
+      | admin | forum1 | Subject1 | Message1 |
+    And the time is no longer frozen
+    And the following "mod_forum > discussions" exist:
+      | user  | forum  | name     | message  |
+      | admin | forum1 | Subject2 | Message2 |
+    When I am on the "TestForum" "forum activity" page logged in as admin
+    Then I should see "1 Mar 2024" in the "Subject1" "table_row"
+    # The time should be the real current time, not the frozen time for this entry.
+    And I should see "## today ##%d %b %Y##" in the "Subject2" "table_row"
+    And I am on the "Fixture" "url activity" page
+    And I should see "Behat time is the same as real time"

admin/tool/behat/tests/behat/tabs.feature

@@ -25,7 +25,7 @@ Feature: Confirm that we can open multiple browser tabs
     And I open a tab named "CourseViewer4" on the "My courses" page
 
     # Switch between all the tabs and confirm their different contents.
-    Then I should see "You're not enrolled in any course"
+    Then I should see "You're not enrolled in any courses."
     And I switch to "CourseViewer2" tab
     And "Course 3" "heading" should exist
     And I switch to "CourseViewer1" tab

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,9 +68,9 @@ class behat_form_text_test extends \basic_testcase {
      *
      * @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) {
+    public function test_set_get_value($value, $expectation): void {
         $session = $this->createMock(Session::class);
         $node = $this->createMock(NodeElement::class);
         $node->method('getValue')->willReturn($value);
@@ -85,7 +85,7 @@ class behat_form_text_test extends \basic_testcase {
      *
      * @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,9 +113,9 @@ class behat_form_text_test extends \basic_testcase {
      * @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) {
+    public function test_matches($decsep, $value, $match, $result): void {
         global $CFG;
 
         // Switch of string manager to avoid having to (slow) customise the lang file.

admin/tool/behat/tests/fixtures/core/showtime.php

@@ -0,0 +1,52 @@
+<?php
+// This file is part of Moodle - http://moodle.org/
+//
+// Moodle is free software: you can redistribute it and/or modify
+// it under the terms of the GNU General Public License as published by
+// the Free Software Foundation, either version 3 of the License, or
+// (at your option) any later version.
+//
+// Moodle is distributed in the hope that it will be useful,
+// but WITHOUT ANY WARRANTY; without even the implied warranty of
+// MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+// GNU General Public License for more details.
+//
+// You should have received a copy of the GNU General Public License
+// along with Moodle.  If not, see <http://www.gnu.org/licenses/>.
+
+/**
+ * Fixture to show the current server time using \core\clock.
+ *
+ * @package tool_behat
+ * @copyright 2024 The Open University
+ * @license http://www.gnu.org/copyleft/gpl.html GNU GPL v3 or later
+ */
+
+// phpcs:disable moodle.Files.RequireLogin.Missing
+require(__DIR__ . '/../../../../../../config.php');
+
+defined('BEHAT_SITE_RUNNING') || die('Behat fixture');
+
+$PAGE->set_context(\context_system::instance());
+$PAGE->set_url(new \moodle_url('/admin/tool/behat/tests/fixtures/core/showtime.php'));
+
+echo $OUTPUT->header();
+
+$clock = \core\di::get(\core\clock::class);
+$dt = $clock->now();
+$realbefore = time();
+$time = $clock->time();
+$realafter = time();
+
+echo html_writer::div('Unix time ' . $time);
+echo html_writer::div('Date-time ' . $dt->format('Y-m-d H:i:s'));
+
+echo html_writer::div('TZ ' . $dt->getTimezone()->getName());
+
+if ($time >= $realbefore && $time <= $realafter) {
+    echo html_writer::div('Behat time is the same as real time');
+} else {
+    echo html_writer::div('Behat time is not the same as real time');
+}
+
+echo $OUTPUT->footer();

admin/tool/behat/tests/manager_util_test.php

@@ -25,6 +25,10 @@
  * @license   http://www.gnu.org/copyleft/gpl.html GNU GPL v3 or later
  */
 
+namespace tool_behat;
+
+use behat_config_util;
+
 defined('MOODLE_INTERNAL') || die();
 
 global $CFG;
@@ -39,7 +43,7 @@ require_once($CFG->libdir . '/behat/classes/behat_config_manager.php');
  * @copyright  2016 Rajesh Taneja
  * @license    http://www.gnu.org/copyleft/gpl.html GNU GPL v3 or later
  */
-class tool_behat_manager_util_testcase extends advanced_testcase {
+class manager_util_test extends \advanced_testcase {
 
     /** @var array Fixtures features which are available. */
     private $featurepaths = array(
@@ -103,11 +107,11 @@ class tool_behat_manager_util_testcase extends advanced_testcase {
      */
     private function get_behat_config_util($behatconfigutil, $notheme = false) {
         // Create a map of arguments to return values.
-        $map = array(
-            array('withfeatures', __DIR__.'/fixtures/theme/withfeatures'),
-            array('nofeatures', __DIR__.'/fixtures/theme/nofeatures'),
-            array('defaulttheme', __DIR__.'/fixtures/theme/defaulttheme'),
-        );
+        $map = [
+            ['withfeatures', self::get_fixture_path(__NAMESPACE__, 'theme/withfeatures')],
+            ['nofeatures', self::get_fixture_path(__NAMESPACE__, 'theme/nofeatures')],
+            ['defaulttheme', self::get_fixture_path(__NAMESPACE__, 'theme/defaulttheme')],
+        ];
         // List of themes is const for test.
         if ($notheme) {
             $themelist = array('defaulttheme');

admin/tool/brickfield/classes/local/htmlchecker/common/brickfield_accessibility_color_test.php

@@ -245,7 +245,6 @@ class brickfield_accessibility_color_test extends brickfield_accessibility_test
         return $luminosity;
     }
 
-
     /**
      * Returns the decimal equivalents for a HEX color. Returns null if it cannot be determined.
      * @param string $color The hex color value
@@ -268,13 +267,21 @@ class brickfield_accessibility_color_test extends brickfield_accessibility_test
      */
     public function convert_color(string $color): string {
         $color = trim($color);
-        if (strpos($color, ' ') !== false) {
-            $colors = explode(' ', $color);
-            foreach ($colors as $backgroundpart) {
-                if (substr(trim($backgroundpart), 0, 1) == '#' ||
-                    in_array(trim($backgroundpart), array_keys($this->colornames)) ||
-                    strtolower(substr(trim($backgroundpart), 0, 3)) == 'rgb') {
-                    $color = $backgroundpart;
+        // Search for color in rgb format first, as this can potentially contain a space.
+        if (strpos($color, 'rgb') !== false) {
+            $colors = explode('rgb', $color, 2); // Getting 2 only in array.
+            // Getting end point of rgb value, i.e. the end bracket.
+            $endpos = strpos($colors[1], ')');
+            $color = 'rgb' . substr($colors[1], 0, ($endpos + 1)); // Recompiling rgb value.
+        } else {
+            // Splitting multi-value css background value.
+            if (strpos($color, ' ') !== false) {
+                $colors = explode(' ', $color);
+                foreach ($colors as $backgroundpart) {
+                    if (substr(trim($backgroundpart), 0, 1) == '#' ||
+                        in_array(trim($backgroundpart), array_keys($this->colornames))) {
+                        $color = $backgroundpart;
+                    }
                 }
             }
         }
@@ -296,9 +303,20 @@ class brickfield_accessibility_color_test extends brickfield_accessibility_test
         }
         // RGB values.
         if (strtolower(substr($color, 0, 3)) == 'rgb') {
-            $colors = explode(',', trim(str_replace('rgb(', '', $color), '()'));
-            if (count($colors) != 3) {
-                return false;
+            if (strpos($color, 'rgba') !== false) {
+                $tmpbg = $this->get_rgb($this->defaultbackground);
+                $colors = explode(',', trim(str_replace('rgba(', '', $color), '()'));
+                if (count($colors) != 4) {
+                    return false;
+                }
+                $colors[0] = round(((1 - $colors[3]) * $tmpbg['r']) + ($colors[3] * $colors[0]));
+                $colors[1] = round((1 - $colors[3]) * $tmpbg['g']) + ($colors[3] * $colors[1]);
+                $colors[2] = round((1 - $colors[3]) * $tmpbg['b']) + ($colors[3] * $colors[2]);
+            } else {
+                $colors = explode(',', trim(str_replace('rgb(', '', $color), '()'));
+                if (count($colors) != 3) {
+                    return false;
+                }
             }
             $r = intval($colors[0]);
             $g = intval($colors[1]);
@@ -392,13 +410,13 @@ class brickfield_accessibility_color_test extends brickfield_accessibility_test
         $pos3 = stripos($fontsize, 'px');
         if ($pos1 !== false) {
             $rem = substr($fontsize, 0, -3);
-            $newfontsize = $newfontsize * $rem;
+            $newfontsize = is_numeric($rem) ? $newfontsize * $rem : $newfontsize;
         } else if ($pos2 !== false) {
             $em = substr($fontsize, 0, -2);
-            $newfontsize = $newfontsize * $em;
+            $newfontsize = is_numeric($em) ? $newfontsize * $em : $newfontsize;
         } else if ($pos3 !== false) {
             $px = substr($fontsize, 0, -2);
-            $newfontsize = 0.75 * $px;
+            $newfontsize = is_numeric($px) ? 0.75 * $px : $newfontsize;
         } else if (in_array($fontsize, array_keys($this->fontsizenames))) {
             $newfontsize = $this->fontsizenames[$fontsize];
         } else {

admin/tool/brickfield/classes/local/htmlchecker/common/checks/css_text_has_contrast.php

@@ -62,9 +62,18 @@ class css_text_has_contrast extends brickfield_accessibility_color_test {
         foreach ($entries as $element) {
             $style = $this->css->get_style($element);
 
-            if (isset($style['background-color']) || isset($style['color'])) {
+            if (isset($style['background-color']) || isset($style['color']) || isset($style['background'])) {
                 if (!isset($style['background-color'])) {
-                    $style['background-color'] = $this->defaultbackground;
+                    if (isset($style['background'])) {
+                        // Parsing background-color from CSS background shortcut string.
+                        $style['background-color'] = '#' . $this->convert_color($style['background']);
+                        // If value is empty after hash, then use defaultbackground.
+                        if ($style['background-color'] == '#') {
+                            $style['background-color'] = $this->defaultbackground;
+                        }
+                    } else {
+                        $style['background-color'] = $this->defaultbackground;
+                    }
                 }
 
                 if (!isset($style['color'])) {
@@ -82,11 +91,7 @@ class css_text_has_contrast extends brickfield_accessibility_color_test {
                     $style['color'] = '#' . $this->convert_color($style['color']);
                     $style['background-color'] = '#' . $this->convert_color($background);
 
-                    if (substr($background, 0, 3) == "rgb") {
-                        $background = '#' . $this->convert_color($background);
-                    }
-
-                    $luminosity = $this->get_luminosity($style['color'], $background);
+                    $luminosity = $this->get_luminosity($style['color'], $style['background-color']);
                     $fontsize = 0;
                     $bold = false;
                     $italic = false;

admin/tool/brickfield/classes/local/htmlchecker/common/checks/i_is_not_used.php

@@ -16,7 +16,7 @@
 
 namespace tool_brickfield\local\htmlchecker\common\checks;
 
-use tool_brickfield\local\htmlchecker\common\brickfield_accessibility_tag_test;
+use tool_brickfield\local\htmlchecker\common\brickfield_accessibility_test;
 
 /**
  * Brickfield accessibility HTML checker library.
@@ -28,11 +28,25 @@ use tool_brickfield\local\htmlchecker\common\brickfield_accessibility_tag_test;
  * @copyright  2020 onward: Brickfield Education Labs, www.brickfield.ie
  * @license    http://www.gnu.org/copyleft/gpl.html GNU GPL v3 or later
  */
-class i_is_not_used extends brickfield_accessibility_tag_test {
+class i_is_not_used extends brickfield_accessibility_test {
 
     /** @var int The default severity code for this test. */
     public $defaultseverity = \tool_brickfield\local\htmlchecker\brickfield_accessibility::BA_TEST_SEVERE;
 
     /** @var string The tag this test will fire on. */
     public $tag = 'i';
+
+    /**
+     * Check for any i elements and flag them as errors
+     * while allowing font awesome icons to be used.
+     */
+    public function check(): void {
+        foreach ($this->get_all_elements('i') as $element) {
+            // Ensure this is not a font awesome icon with aria-hidden.
+            if (str_contains($element->getAttribute('class'), 'fa-') && $element->getAttribute('aria-hidden') === 'true') {
+                continue;
+            }
+            $this->add_report($element);
+        }
+    }
 }

admin/tool/brickfield/classes/local/htmlchecker/common/checks/table_data_should_have_th.php

@@ -46,7 +46,7 @@ class table_data_should_have_th extends brickfield_accessibility_table_test {
                             foreach ($tr->childNodes as $th) {
                                 if ($this->property_is_equal($th, 'tagName', 'th')) {
                                     break 3;
-                                } else {
+                                } else if ($th->nodeName != '#text') {
                                     $this->add_report($table);
                                     break 3;
                                 }
@@ -57,7 +57,7 @@ class table_data_should_have_th extends brickfield_accessibility_table_test {
                     foreach ($child->childNodes as $th) {
                         if ($this->property_is_equal($th, 'tagName', 'th')) {
                             break 2;
-                        } else {
+                        } else if ($th->nodeName != '#text') {
                             $this->add_report($table);
                             break 2;
                         }

admin/tool/brickfield/tests/accessibility_test.php

@@ -35,7 +35,7 @@ class accessibility_test extends \advanced_testcase {
      * @throws \dml_exception
      * @throws \moodle_exception
      */
-    public function test_get_title() {
+    public function test_get_title(): void {
         $this->resetAfterTest();
         $object = new accessibility();
         $filter = new filter();
@@ -57,7 +57,7 @@ class accessibility_test extends \advanced_testcase {
      *
      * @throws \dml_exception
      */
-    public function test_check_ids() {
+    public function test_check_ids(): void {
         $this->resetAfterTest();
         $object = new accessibility();
 
@@ -74,7 +74,7 @@ class accessibility_test extends \advanced_testcase {
      *
      * @throws \dml_exception
      */
-    public function test_get_translations() {
+    public function test_get_translations(): void {
         $this->resetAfterTest();
         $object = new accessibility();
 
@@ -90,7 +90,7 @@ class accessibility_test extends \advanced_testcase {
      *
      * @throws \dml_exception
      */
-    public function test_get_category_courseids() {
+    public function test_get_category_courseids(): void {
         $this->resetAfterTest();
         $object = new accessibility();
         $category = $this->getDataGenerator()->create_category();

admin/tool/brickfield/tests/area_test.php

@@ -32,7 +32,7 @@ class area_test extends area_test_base {
     /**
      * Test for the area assign intro
      */
-    public function test_assign() {
+    public function test_assign(): void {
         $this->resetAfterTest();
         $course = $this->getDataGenerator()->create_course();
         $assign1 = $this->getDataGenerator()->create_module('assign', array(
@@ -87,7 +87,7 @@ class area_test extends area_test_base {
     /**
      * Test for the area questiontext
      */
-    public function test_questiontext() {
+    public function test_questiontext(): void {
         $this->resetAfterTest();
         /** @var \core_question_generator $generator */
         $generator = $this->getDataGenerator()->get_plugin_generator('core_question');
@@ -147,7 +147,7 @@ class area_test extends area_test_base {
     /**
      * test for the area questionanswers
      */
-    public function test_questionanswers() {
+    public function test_questionanswers(): void {
         global $DB;
 
         $this->resetAfterTest();
@@ -191,7 +191,7 @@ class area_test extends area_test_base {
     /**
      * Test for the areas choice intro and choice options
      */
-    public function test_choice() {
+    public function test_choice(): void {
         global $DB;
         $this->resetAfterTest();
         $course = $this->getDataGenerator()->create_course();

admin/tool/brickfield/tests/filters_test.php

@@ -27,7 +27,7 @@ use tool_brickfield\local\tool\filter;
  * @license    http://www.gnu.org/copyleft/gpl.html GNU GPL v3 or later
  */
 class filters_test extends \advanced_testcase {
-    public function test_constructor() {
+    public function test_constructor(): void {
         $this->resetAfterTest();
 
         // Variables.
@@ -56,7 +56,7 @@ class filters_test extends \advanced_testcase {
         $this->assertEquals($object->url, $url);
     }
 
-    public function test_get_course_sql() {
+    public function test_get_course_sql(): void {
         $this->resetAfterTest();
         $object = new filter();
 
@@ -73,7 +73,7 @@ class filters_test extends \advanced_testcase {
 
     }
 
-    public function test_validate_filters() {
+    public function test_validate_filters(): void {
         $this->resetAfterTest();
         // Variables.
         $courseid = 0;
@@ -102,7 +102,7 @@ class filters_test extends \advanced_testcase {
         $this->assertFalse($output);
     }
 
-    public function test_has_course_filters() {
+    public function test_has_course_filters(): void {
         $this->resetAfterTest();
 
         $object = new filter();
@@ -114,7 +114,7 @@ class filters_test extends \advanced_testcase {
         $this->assertTrue($output);
     }
 
-    public function test_has_capability_in_context() {
+    public function test_has_capability_in_context(): void {
         global $DB;
 
         $this->resetAfterTest();
@@ -151,7 +151,7 @@ class filters_test extends \advanced_testcase {
         $this->assertTrue($output);
     }
 
-    public function test_get_errormessage() {
+    public function test_get_errormessage(): void {
         $this->resetAfterTest();
         // Variables.
         $courseid = 0;

admin/tool/brickfield/tests/local/areas/core_question/questionanswers_test.php

@@ -36,7 +36,7 @@ class questionanswers_test extends \advanced_testcase {
     /**
      * Test find course areas.
      */
-    public function test_find_course_areas() {
+    public function test_find_course_areas(): void {
         $this->resetAfterTest();
         $this->setAdminUser();
 
@@ -122,7 +122,7 @@ class questionanswers_test extends \advanced_testcase {
     /**
      * Test find relevant areas.
      */
-    public function test_find_relevant_areas() {
+    public function test_find_relevant_areas(): void {
         $this->resetAfterTest();
         $this->setAdminUser();
 
@@ -153,7 +153,7 @@ class questionanswers_test extends \advanced_testcase {
     /**
      * Test find system areas.
      */
-    public function test_find_system_areas() {
+    public function test_find_system_areas(): void {
         $this->resetAfterTest();
         $this->setAdminUser();
 

admin/tool/brickfield/tests/local/areas/core_question/questiontext_test.php

@@ -42,7 +42,7 @@ class questiontext_test extends area_test_base {
     /**
      * Test find course areas.
      */
-    public function test_find_course_areas() {
+    public function test_find_course_areas(): void {
         $this->resetAfterTest();
         $this->setAdminUser();
 
@@ -126,7 +126,7 @@ class questiontext_test extends area_test_base {
     /**
      * Test find relevant areas.
      */
-    public function test_find_relevant_areas() {
+    public function test_find_relevant_areas(): void {
         $this->resetAfterTest();
         $this->setAdminUser();
 
@@ -156,7 +156,7 @@ class questiontext_test extends area_test_base {
     /**
      * Test find system areas.
      */
-    public function test_find_system_areas() {
+    public function test_find_system_areas(): void {
         $this->resetAfterTest();
         $this->setAdminUser();
 
@@ -197,7 +197,7 @@ class questiontext_test extends area_test_base {
      *
      * @covers ::get_course_and_category
      */
-    public function test_get_course_and_category() {
+    public function test_get_course_and_category(): void {
         $this->resetAfterTest();
         $this->setAdminUser();
 

admin/tool/brickfield/tests/local/htmlchecker/common/checks/a_links_dont_open_new_window_test.php

@@ -103,7 +103,7 @@ EOD;
     /**
      * Test for links opening a new tab or window
      */
-    public function test_check() {
+    public function test_check(): void {
         $results = $this->get_checker_results($this->htmlfail);
         $this->assertTrue($results[0]->element->tagName == 'a');
 

admin/tool/brickfield/tests/local/htmlchecker/common/checks/a_must_contain_text_test.php

@@ -64,7 +64,7 @@ EOD;
     /**
      * Test for anchor tags containing text
      */
-    public function test_check() {
+    public function test_check(): void {
         $results = $this->get_checker_results($this->htmlfail);
         $this->assertTrue($results[0]->element->tagName == 'a');
 

admin/tool/brickfield/tests/local/htmlchecker/common/checks/a_suspicious_link_text_test.php

@@ -90,7 +90,7 @@ EOD;
     /**
      * Test for anchor tags not containing susplicious link text
      */
-    public function test_check() {
+    public function test_check(): void {
         $results = $this->get_checker_results($this->htmlpass);
         $this->assertEmpty($results);
 

admin/tool/brickfield/tests/local/htmlchecker/common/checks/area_dont_open_new_window_test.php

@@ -103,7 +103,7 @@ EOD;
     /**
      * Test Area tags opening new window without warning
      */
-    public function test_check() {
+    public function test_check(): void {
         $results = $this->get_checker_results($this->htmlfail);
         $this->assertTrue($results[0]->element->tagName == 'area');
 

admin/tool/brickfield/tests/local/htmlchecker/common/checks/area_has_alt_value_test.php

@@ -64,7 +64,7 @@ EOD;
     /**
      * Test for area tags containing an alt value
      */
-    public function test_check() {
+    public function test_check(): void {
         $results = $this->get_checker_results($this->htmlfail);
         $this->assertTrue($results[0]->element->tagName == 'area');
 

admin/tool/brickfield/tests/local/htmlchecker/common/checks/basefont_is_not_used_test.php

@@ -64,7 +64,7 @@ EOD;
     /**
      * Test for basefont tags being used
      */
-    public function test_check() {
+    public function test_check(): void {
         $results = $this->get_checker_results($this->htmlfail);
         $this->assertTrue($results[0]->element->tagName == 'basefont');
 

admin/tool/brickfield/tests/local/htmlchecker/common/checks/blink_is_not_used_test.php

@@ -64,7 +64,7 @@ EOD;
     /**
      * Test for blink tags being used
      */
-    public function test_check() {
+    public function test_check(): void {
         $results = $this->get_checker_results($this->htmlfail);
         $this->assertTrue($results[0]->element->tagName == 'blink');
 

admin/tool/brickfield/tests/local/htmlchecker/common/checks/bold_is_not_used_test.php

@@ -65,7 +65,7 @@ EOD;
     /**
      * Test for b tags being used
      */
-    public function test_check() {
+    public function test_check(): void {
         $results = $this->get_checker_results($this->htmlfail);
         $this->assertTrue($results[0]->element->tagName == 'b');
         $this->assertTrue($results[1]->element->tagName == 'b');

admin/tool/brickfield/tests/local/htmlchecker/common/checks/content_too_long_test.php

@@ -124,7 +124,7 @@ EOD;
     /**
      * Test for checking the length of the content
      */
-    public function test_check() {
+    public function test_check(): void {
         $results = $this->get_checker_results($this->htmlfail);
         $this->assertTrue($results[0]->message == '<p id=\'wc\'>Word Count: 578</p>');
 

admin/tool/brickfield/tests/local/htmlchecker/common/checks/css_text_has_contrast_test.php

@@ -30,8 +30,9 @@ require_once('all_checks.php');
 
 /**
  * Class test_css_text_has_contrast_test
+ * @covers \tool_brickfield\local\htmlchecker\brickfield_accessibility
  */
-class css_text_has_contrast_test extends all_checks {
+final class css_text_has_contrast_test extends all_checks {
     /** @var string The check type. */
     protected $checktype = 'css_text_has_contrast';
 
@@ -226,10 +227,22 @@ EOD;
     This is contrasty enough.</p></body>
 EOD;
 
+    /** @var string HTML with calculated size colour values. */
+    private $calculatedfail = <<<EOD
+    <body><p style="color:#EF0000; background-color:white; font-size: calc(0.90375rem + 0.045vw)">
+    This is not contrasty enough.</p></body>
+EOD;
+
+    /** @var string HTML with calculated size colour values. */
+    private $calculatedpass = <<<EOD
+    <body><p style="color:#E60000; background-color:white; font-size: calc(0.90375rem + 0.045vw);">
+    This is contrasty enough.</p></body>
+EOD;
+
     /**
      * Test for the area assign intro
      */
-    public function test_check() {
+    public function test_check(): void {
         $results = $this->get_checker_results($this->htmlfail1);
         $this->assertTrue($results[0]->element->tagName == 'p');
 
@@ -255,7 +268,7 @@ EOD;
     /**
      * Test with valid colour names.
      */
-    public function test_check_for_namedcolours() {
+    public function test_check_for_namedcolours(): void {
         $results = $this->get_checker_results($this->namecolours);
         $this->assertTrue($results[0]->element->tagName == 'p');
     }
@@ -263,7 +276,7 @@ EOD;
     /**
      * Test with invalid colour names.
      */
-    public function test_check_for_invalidcolours() {
+    public function test_check_for_invalidcolours(): void {
         $results = $this->get_checker_results($this->invalidcolours);
         $this->assertTrue($results[0]->element->tagName == 'p');
     }
@@ -271,7 +284,7 @@ EOD;
     /**
      * Test with invalid colour numeric values.
      */
-    public function test_check_for_invalidvalues() {
+    public function test_check_for_invalidvalues(): void {
         $results = $this->get_checker_results($this->invalidvalue);
         $this->assertTrue($results[0]->element->tagName == 'p');
     }
@@ -279,7 +292,7 @@ EOD;
     /**
      * Test with empty colour values.
      */
-    public function test_check_for_emptyvalues() {
+    public function test_check_for_emptyvalues(): void {
         $results = $this->get_checker_results($this->emptyvalue);
         $this->assertEmpty($results);
     }
@@ -287,7 +300,7 @@ EOD;
     /**
      * Test for text px18 with insufficient contrast of 4.49.
      */
-    public function test_check_for_px18_fail() {
+    public function test_check_for_px18_fail(): void {
         $results = $this->get_checker_results($this->px18);
         $this->assertTrue($results[0]->element->tagName == 'p');
     }
@@ -295,7 +308,7 @@ EOD;
     /**
      * Test for text px19 bold with sufficient contrast of 4.49.
      */
-    public function test_check_for_px19bold_pass() {
+    public function test_check_for_px19bold_pass(): void {
         $results = $this->get_checker_results($this->px19bold);
         $this->assertEmpty($results);
     }
@@ -303,7 +316,7 @@ EOD;
     /**
      * Test for text px18 with sufficient contrast of 4.81.
      */
-    public function test_check_for_px18_pass() {
+    public function test_check_for_px18_pass(): void {
         $results = $this->get_checker_results($this->px18pass);
         $this->assertEmpty($results);
     }
@@ -311,7 +324,7 @@ EOD;
     /**
      * Test for medium (12pt) text with insufficient contrast of 4.49.
      */
-    public function test_check_for_medium_fail() {
+    public function test_check_for_medium_fail(): void {
         $results = $this->get_checker_results($this->mediumfail);
         $this->assertTrue($results[0]->element->tagName == 'p');
     }
@@ -319,7 +332,7 @@ EOD;
     /**
      * Test for medium (12pt) text with sufficient contrast of 4.81.
      */
-    public function test_check_for_medium_pass() {
+    public function test_check_for_medium_pass(): void {
         $results = $this->get_checker_results($this->mediumpass);
         $this->assertEmpty($results);
     }
@@ -327,7 +340,7 @@ EOD;
     /**
      * Test for larger (14pt) text with insufficient contrast of 2.94.
      */
-    public function test_check_for_larger_fail() {
+    public function test_check_for_larger_fail(): void {
         $results = $this->get_checker_results($this->largerfail);
         $this->assertTrue($results[0]->element->tagName == 'p');
     }
@@ -335,7 +348,7 @@ EOD;
     /**
      * Test for larger (14pt) text with insufficient contrast of 3.02.
      */
-    public function test_check_for_larger_pass() {
+    public function test_check_for_larger_pass(): void {
         $results = $this->get_checker_results($this->largerpass);
         $this->assertTrue($results[0]->element->tagName == 'p');
     }
@@ -343,8 +356,134 @@ EOD;
     /**
      * Test for larger (14pt) bold text with sufficient contrast of 3.02.
      */
-    public function test_check_for_largerbold_pass() {
+    public function test_check_for_largerbold_pass(): void {
         $results = $this->get_checker_results($this->largerboldpass);
         $this->assertEmpty($results);
     }
+
+    /**
+     * Test for rgb colors with insufficient contrast.
+     */
+    public function test_bad_rgbcolor(): void {
+        $html = '<body><p style="color:rgb(255, 255, 255); background-color:rgb(204, 204, 204);">
+            This is not contrasty enough.</p></body>';
+        $results = $this->get_checker_results($html);
+        $this->assertTrue($results[0]->element->tagName == 'p');
+    }
+
+    /**
+     * Test for rgb colors with sufficient contrast.
+     */
+    public function test_good_rgbcolor(): void {
+        $html = '<body><p style="color:rgb(255, 255, 255); background-color:rgb(0, 0, 0);">
+            This is contrasty enough.</p></body>';
+        $results = $this->get_checker_results($html);
+        $this->assertEmpty($results);
+    }
+
+    /**
+     * Test for named colors with insufficient contrast.
+     */
+    public function test_bad_namedcolor2(): void {
+        $html = '<body><p style="color:lightcyan; background-color:lavender;">
+            This is not contrasty enough.</p></body>';
+        $results = $this->get_checker_results($html);
+        $this->assertTrue($results[0]->element->tagName == 'p');
+    }
+
+    /**
+     * Test for named colors with sufficient contrast.
+     */
+    public function test_good_namedcolor2(): void {
+        $html = '<body><p style="color:linen; background-color:darkslategray;">
+            This is contrasty enough.</p></body>';
+        $results = $this->get_checker_results($html);
+        $this->assertEmpty($results);
+    }
+
+    /**
+     * Test for background value with insufficient contrast.
+     */
+    public function test_bad_backgroundcss(): void {
+        $html = '<body><p style="color:lightcyan; background:fixed lavender center;">
+            This is not contrasty enough.</p></body>';
+        $results = $this->get_checker_results($html);
+        $this->assertTrue($results[0]->element->tagName == 'p');
+    }
+
+    /**
+     * Test for background value with sufficient contrast.
+     */
+    public function test_good_backgroundcss(): void {
+        $html = '<body><p style="color:linen; background:fixed darkslategray center;">
+            This is contrasty enough.</p></body>';
+        $results = $this->get_checker_results($html);
+        $this->assertEmpty($results);
+    }
+
+    /**
+     * Test for background value with rgb with insufficient contrast.
+     */
+    public function test_bad_backgroundcssrgb(): void {
+        $html = '<body><p style="color:rgb(255, 255, 255); background:fixed rgb(204, 204, 204) center;">
+            This is not contrasty enough.</p></body>';
+        $results = $this->get_checker_results($html);
+        $this->assertTrue($results[0]->element->tagName == 'p');
+    }
+
+    /**
+     * Test for background value with rgb with sufficient contrast.
+     */
+    public function test_good_backgroundcssrgb(): void {
+        $html = '<body><p style="color:rgb(255, 255, 255); background:fixed rgb(0, 0, 0) center;">
+            This is contrasty enough.</p></body>';
+        $results = $this->get_checker_results($html);
+        $this->assertEmpty($results);
+    }
+
+    /**
+     * Test for text with insufficient contrast of 4.3.
+     */
+    public function test_bad_contrastrounding(): void {
+        $html = '<body><p style="color:#F50000; background-color:white; font-size: 12px">
+            This is not contrasty enough.</p></body>';
+        $results = $this->get_checker_results($html);
+        $this->assertTrue($results[0]->element->tagName == 'p');
+    }
+
+    /**
+     * Test for background value with rgba with insufficient contrast.
+     */
+    public function test_bad_backgroundcssrgba(): void {
+        $html = '<body><p style="color:rgba(255, 255, 255, 0.5); background:fixed rgba(0, 204, 204, 0.5) center;">
+            This is not contrasty enough.</p></body>';
+        $results = $this->get_checker_results($html);
+        $this->assertTrue($results[0]->element->tagName == 'p');
+    }
+
+    /**
+     * Test for background value with rgba with sufficient contrast.
+     */
+    public function test_good_backgroundcssrgba(): void {
+        $html = '<body><p style="color:rgba(255, 255, 255, 0.75); background:fixed rgba(0, 0, 0, 0.75) center;">
+            This is contrasty enough.</p></body>';
+        $results = $this->get_checker_results($html);
+        $this->assertEmpty($results);
+    }
+
+    /**
+     * Test for calculated (12pt) text with insufficient contrast of 4.49.
+     */
+    public function test_check_for_calculated_fail(): void {
+        $results = $this->get_checker_results($this->calculatedfail);
+        $this->assertTrue($results[0]->element->tagName == 'p');
+    }
+
+    /**
+     * Test for calculated (12pt) text with sufficient contrast of 4.81.
+     */
+    public function test_check_for_calculated_pass(): void {
+        $results = $this->get_checker_results($this->calculatedpass);
+        $this->assertEmpty($results);
+    }
 }

admin/tool/brickfield/tests/local/htmlchecker/common/checks/embed_has_associated_no_embed_test.php

@@ -81,7 +81,7 @@ EOD;
     /**
      * Test for noembed child tags
      */
-    public function test_check() {
+    public function test_check(): void {
         $results = $this->get_checker_results($this->htmlfail);
         $this->assertTrue($results[0]->element->tagName == 'embed');
 

admin/tool/brickfield/tests/local/htmlchecker/common/checks/header_h3_test.php

@@ -122,7 +122,7 @@ EOD;
     /**
      * Test the header following an h3 must be h1, h2, h3 or h4.
      */
-    public function test_check() {
+    public function test_check(): void {
         $results = $this->get_checker_results($this->htmlfail1);
         $this->assertTrue($results[0]->element->tagName == 'h5');
 

admin/tool/brickfield/tests/local/htmlchecker/common/checks/headers_have_text_test.php

@@ -76,7 +76,7 @@ EOD;
     /**
      * Test for headers not containing text
      */
-    public function test_check() {
+    public function test_check(): void {
         $results = $this->get_checker_results($this->htmlfail);
         $this->assertTrue($results[0]->element->tagName == 'h2');
 

admin/tool/brickfield/tests/local/htmlchecker/common/checks/i_is_not_used_test.php

@@ -30,6 +30,8 @@ require_once('all_checks.php');
 
 /**
  * Class i_is_not_used_testcase
+ *
+ * @covers \tool_brickfield\local\htmlchecker\common\checks\i_is_not_used
  */
 class i_is_not_used_test extends all_checks {
     /** @var string Check type */
@@ -64,11 +66,20 @@ EOD;
     /**
      * Test for i tags being used
      */
-    public function test_check() {
+    public function test_check(): void {
         $results = $this->get_checker_results($this->htmlfail);
         $this->assertTrue($results[0]->element->tagName == 'i');
 
         $results = $this->get_checker_results($this->htmlpass);
         $this->assertEmpty($results);
     }
+
+    /**
+     * Test for font awesome icon.
+     */
+    public function test_fa_icon(): void {
+        $html = '<div><i class="fa fa-user"></i><i>Hello there</i><i class="fa fa-address-book" aria-hidden="true"></i></div>';
+        $results = $this->get_checker_results($html);
+        $this->assertCount(2, $results);
+    }
 }

admin/tool/brickfield/tests/local/htmlchecker/common/checks/img_alt_is_different_test.php

@@ -64,7 +64,7 @@ EOD;
     /**
      * Test for img alt attributes matching the src attribute
      */
-    public function test_check() {
+    public function test_check(): void {
         $results = $this->get_checker_results($this->htmlfail);
         $this->assertTrue($results[0]->element->tagName == 'img');
 

admin/tool/brickfield/tests/local/htmlchecker/common/checks/img_alt_is_too_long_test.php

@@ -68,7 +68,7 @@ EOD;
     /**
      * Test for image alt attributes being too long
      */
-    public function test_check() {
+    public function test_check(): void {
         $results = $this->get_checker_results($this->htmlfail);
         $this->assertTrue($results[0]->element->tagName == 'img');
 

admin/tool/brickfield/tests/local/htmlchecker/common/checks/img_alt_not_empty_in_anchor_test.php

@@ -63,7 +63,7 @@ EOD;
     /**
      * Test for >Anchor tags containing a nested img tag, must not have an empty alt attribute
      */
-    public function test_check() {
+    public function test_check(): void {
         $results = $this->get_checker_results($this->htmlfail);
         $this->assertTrue($results[0]->element->tagName == 'img');
 

admin/tool/brickfield/tests/local/htmlchecker/common/checks/img_alt_not_place_holder_test.php

@@ -133,7 +133,7 @@ EOD;
     /**
      * Test for the each en string specified in $strings - line 43 in imgAltNotPlaceHolder.
      */
-    public function test_failcheck() {
+    public function test_failcheck(): void {
         $results = $this->get_checker_results($this->htmlfail1);
         $this->assertTrue($results[0]->element->tagName == 'img');
 
@@ -156,7 +156,7 @@ EOD;
     /**
      * Test with alt that was not specified in the $strings array.
      */
-    public function test_passcheck1() {
+    public function test_passcheck1(): void {
         $results = $this->get_checker_results($this->htmlpass1);
         $this->assertEmpty($results);
     }

admin/tool/brickfield/tests/local/htmlchecker/common/checks/img_has_alt_test.php

@@ -76,7 +76,7 @@ EOD;
     /**
      * Test for missing image alt text.
      */
-    public function test_check_fail() {
+    public function test_check_fail(): void {
         $results = $this->get_checker_results($this->htmlfail1);
         $this->assertTrue($results[0]->element->tagName == 'img');
 
@@ -87,7 +87,7 @@ EOD;
     /**
      * Test for present image alt text.
      */
-    public function test_check_pass() {
+    public function test_check_pass(): void {
         $results = $this->get_checker_results($this->htmlpass);
         $this->assertTrue(count($results) == 0);
     }

admin/tool/brickfield/tests/local/htmlchecker/common/checks/img_with_map_has_use_map_test.php

@@ -66,7 +66,7 @@ EOD;
     /**
      * Test for usemap attribute.
      */
-    public function test_check_fail() {
+    public function test_check_fail(): void {
         $results = $this->get_checker_results($this->htmlfail);
         $this->assertTrue($results[0]->element->tagName == 'img');
     }
@@ -74,7 +74,7 @@ EOD;
     /**
      * Test for ismap attribute.
      */
-    public function test_check_pass() {
+    public function test_check_pass(): void {
         $results = $this->get_checker_results($this->htmlpass);
         $this->assertEmpty($results);
     }

admin/tool/brickfield/tests/local/htmlchecker/common/checks/legend_text_not_empty_test.php

@@ -76,7 +76,7 @@ EOD;
     /**
      * Test for if legend is empty or only has white spaces.
      */
-    public function test_check_fail() {
+    public function test_check_fail(): void {
         $results = $this->get_checker_results($this->htmlfail1);
         $this->assertTrue($results[0]->element->tagName == 'legend');
 
@@ -87,7 +87,7 @@ EOD;
     /**
      * Test for if legend has text.
      */
-    public function test_check_pass() {
+    public function test_check_pass(): void {
         $results = $this->get_checker_results($this->htmlpass);
         $this->assertEmpty($results);
     }

admin/tool/brickfield/tests/local/htmlchecker/common/checks/no_headings_test.php

@@ -254,7 +254,7 @@ EOD;
     /**
      * Test for if heading exists where doc length is above 1800
      */
-    public function test_check_fail() {
+    public function test_check_fail(): void {
         $results = $this->get_checker_results($this->htmlfail);
         $this->assertNotEmpty($results);
 
@@ -263,7 +263,7 @@ EOD;
     /**
      * Test for if marquee does not exist.
      */
-    public function test_check_pass() {
+    public function test_check_pass(): void {
         $results = $this->get_checker_results($this->htmlpass1);
         $this->assertEmpty($results);
 

admin/tool/brickfield/tests/local/htmlchecker/common/checks/object_must_have_embed_test.php

@@ -66,7 +66,7 @@ EOD;
     /**
      * Test for missing embed element within object element.
      */
-    public function test_check_fail() {
+    public function test_check_fail(): void {
         $results = $this->get_checker_results($this->htmlfail);
         $this->assertTrue($results[0]->element->tagName == 'object');
     }
@@ -74,7 +74,7 @@ EOD;
     /**
      * Test for present embed element within object element.
      */
-    public function test_check_pass() {
+    public function test_check_pass(): void {
         $results = $this->get_checker_results($this->htmlpass);
         $this->assertEmpty($results);
     }

admin/tool/brickfield/tests/local/htmlchecker/common/checks/object_must_have_title_test.php

@@ -63,7 +63,7 @@ EOD;
     /**
      * Test for missing title attribute within object element.
      */
-    public function test_check_fail() {
+    public function test_check_fail(): void {
         $results = $this->get_checker_results($this->htmlfail);
         $this->assertTrue($results[0]->element->tagName == 'object');
     }
@@ -71,7 +71,7 @@ EOD;
     /**
      * Test for present title attribute within object element.
      */
-    public function test_check_pass() {
+    public function test_check_pass(): void {
         $results = $this->get_checker_results($this->htmlpass);
         $this->assertEmpty($results);
     }

admin/tool/brickfield/tests/local/htmlchecker/common/checks/object_must_have_valid_title_test.php

@@ -129,7 +129,7 @@ EOD;
     /**
      * Test that embed element within object element.
      */
-    public function test_check_fail() {
+    public function test_check_fail(): void {
         $results = $this->get_checker_results($this->htmlfail);
         $this->assertTrue($results[0]->element->tagName == 'object');
     }
@@ -137,7 +137,7 @@ EOD;
     /**
      * Test for embed element within object element.
      */
-    public function test_check_pass() {
+    public function test_check_pass(): void {
         $results = $this->get_checker_results($this->htmlpass1);
         $this->assertEmpty($results);
 

admin/tool/brickfield/tests/local/htmlchecker/common/checks/strike_is_not_used_test.php

@@ -77,7 +77,7 @@ EOD;
     /**
      * Test for b tags being used
      */
-    public function test_check() {
+    public function test_check(): void {
         $results = $this->get_checker_results($this->htmlfail);
         $this->assertTrue($results[0]->element->tagName == 'strike');
 

admin/tool/brickfield/tests/local/htmlchecker/common/checks/table_data_should_have_th_test.php

@@ -30,6 +30,8 @@ require_once('all_checks.php');
 
 /**
  * Class table_data_should_have_th_test
+ *
+ * @covers \tool_brickfield\local\htmlchecker\common\checks\table_data_should_have_th
  */
 class table_data_should_have_th_test extends all_checks {
     /** @var string Check type */
@@ -113,11 +115,122 @@ EOD;
         </table>
     </body>
 </html>
+EOD;
+
+    /** @var string HTML that should not get flagged. */
+    private $htmlpass3 = <<<EOD
+<!DOCTYPE HTML PUBLIC "-//W3C//DTD HTML 4.01//EN" "http://www.w3.org/TR/html4/strict.dtd">
+<html>
+    <head>
+        <title>Table should have at least one th - pass</title>
+    </head>
+    <body>
+        <table>
+            <thead>
+                <tr>
+                    <th>
+                        This is table heading
+                    </th>
+                </tr>
+            </thead>
+            <tbody>
+                <tr>
+                    <td>
+                        This is a tables data
+                    </td>
+                </tr>
+            </tbody>
+        </table>
+    </body>
+</html>
+EOD;
+
+    /** @var string HTML that should not get flagged. */
+    private $htmlpass4 = <<<EOD
+<!DOCTYPE HTML PUBLIC "-//W3C//DTD HTML 4.01//EN" "http://www.w3.org/TR/html4/strict.dtd">
+<html>
+    <head>
+        <title>Table should have at least one th - pass</title>
+    </head>
+    <body>
+        <table>
+            <tr>
+                <th>
+                    This is table heading
+                </th>
+            </tr>
+            <tr>
+                <td>
+                    This is a tables data
+                </td>
+            </tr>
+        </table>
+    </body>
+</html>
+EOD;
+
+    /** @var string HTML that should not get flagged. */
+    private $htmlpass5 = <<<EOD
+<!DOCTYPE HTML PUBLIC "-//W3C//DTD HTML 4.01//EN" "http://www.w3.org/TR/html4/strict.dtd">
+<html>
+    <head>
+        <title>Table should have at least one th - pass</title>
+    </head>
+    <body>
+        <table>
+            <thead>
+                <tr>
+                    <th>
+                        This is table heading
+                    </th>
+                </tr>
+            </thead>
+            <tbody>
+                <tr>
+                    <th>
+                        This is a table heading in table data
+                    </th>
+                </tr>
+                <tr>
+                    <td>
+                        This is a tables data
+                    </td>
+                </tr>
+            </tbody>
+        </table>
+    </body>
+</html>
+EOD;
+
+    /** @var string HTML that should not get flagged. */
+    private $htmlpass6 = <<<EOD
+<!DOCTYPE HTML PUBLIC "-//W3C//DTD HTML 4.01//EN" "http://www.w3.org/TR/html4/strict.dtd">
+<html>
+    <head>
+        <title>Table should have at least one th - pass</title>
+    </head>
+    <body>
+        <table>
+            <tbody>
+                <tr>
+                    <th>
+                        This is a table heading in table data
+                    </th>
+                </tr>
+                <tr>
+                    <td>
+                        This is a tables data
+                    </td>
+                </tr>
+            </tbody>
+        </table>
+    </body>
+</html>
 EOD;
     /**
      * Test that th does not exist
      */
-    public function test_check_fail() {
+    public function test_check_fail(): void {
         $results = $this->get_checker_results($this->htmlfail1);
         $this->assertTrue($results[0]->element->tagName == 'table');
 
@@ -128,11 +241,23 @@ EOD;
     /**
      * Test that th does exist
      */
-    public function test_check_pass() {
+    public function test_check_pass(): void {
         $results = $this->get_checker_results($this->htmlpass1);
         $this->assertEmpty($results);
 
         $results = $this->get_checker_results($this->htmlpass2);
         $this->assertEmpty($results);
+
+        $results = $this->get_checker_results($this->htmlpass3);
+        $this->assertEmpty($results);
+
+        $results = $this->get_checker_results($this->htmlpass4);
+        $this->assertEmpty($results);
+
+        $results = $this->get_checker_results($this->htmlpass5);
+        $this->assertEmpty($results);
+
+        $results = $this->get_checker_results($this->htmlpass6);
+        $this->assertEmpty($results);
     }
 }

admin/tool/brickfield/tests/local/htmlchecker/common/checks/table_summary_does_not_duplicate_caption_test.php

@@ -67,7 +67,7 @@ EOD;
     /**
      * Test that caption and summary are equal
      */
-    public function test_check_fail() {
+    public function test_check_fail(): void {
         $results = $this->get_checker_results($this->htmlfail);
         $this->assertTrue($results[0]->element->tagName == 'table');
     }
@@ -75,7 +75,7 @@ EOD;
     /**
      * Test that caption and summary are not equal
      */
-    public function test_check_pass() {
+    public function test_check_pass(): void {
         $results = $this->get_checker_results($this->htmlpass);
         $this->assertEmpty($results);
     }

admin/tool/brickfield/tests/local/htmlchecker/common/checks/table_td_should_not_merge_test.php

@@ -125,7 +125,7 @@ EOD;
     /**
      * Test for rowspan and colspan
      */
-    public function test_check_fail() {
+    public function test_check_fail(): void {
         $results = $this->get_checker_results($this->htmlfail1);
         $this->assertNotEmpty($results);
 
@@ -136,7 +136,7 @@ EOD;
     /**
      * Test for rowspan and colspan
      */
-    public function test_check_pass() {
+    public function test_check_pass(): void {
         $results = $this->get_checker_results($this->htmlpass);
         $this->assertEmpty($results);
     }

admin/tool/brickfield/tests/local/htmlchecker/common/checks/table_th_should_have_scope_test.php

@@ -163,7 +163,7 @@ EOD;
     /**
      * Test that th has scope that is equal to col or row
      */
-    public function test_check_fail() {
+    public function test_check_fail(): void {
         $results = $this->get_checker_results($this->htmlfail1);
         $this->assertEquals(2, count($results));
         $this->assertTrue($results[0]->element->tagName == 'th');
@@ -177,7 +177,7 @@ EOD;
     /**
      * Test that th has scope but != col || row. Test that th has no scope
      */
-    public function test_check_pass() {
+    public function test_check_pass(): void {
         $results = $this->get_checker_results($this->htmlpass1);
         $this->assertEmpty($results);
 

admin/tool/brickfield/tests/local/tool/activityresults_test.php

@@ -26,7 +26,7 @@ namespace tool_brickfield\local\tool;
  */
 class activityresults_test extends \advanced_testcase {
 
-    public function test_toolname() {
+    public function test_toolname(): void {
         $this->resetAfterTest();
 
         $object = new activityresults();
@@ -34,7 +34,7 @@ class activityresults_test extends \advanced_testcase {
         $this->assertEquals($output, 'Activity breakdown summary');
     }
 
-    public function test_toolshortname() {
+    public function test_toolshortname(): void {
         $this->resetAfterTest();
 
         $object = new activityresults();
@@ -42,7 +42,7 @@ class activityresults_test extends \advanced_testcase {
         $this->assertEquals($output, 'Activity breakdown');
     }
 
-    public function test_pluginname() {
+    public function test_pluginname(): void {
         $this->resetAfterTest();
 
         $object = new activityresults();
@@ -50,7 +50,7 @@ class activityresults_test extends \advanced_testcase {
         $this->assertEquals($output, 'activityresults');
     }
 
-    public function test_get_output() {
+    public function test_get_output(): void {
         $this->resetAfterTest();
 
         $category = $this->getDataGenerator()->create_category();

admin/tool/brickfield/tests/local/tool/checktyperesults_test.php

@@ -26,7 +26,7 @@ namespace tool_brickfield\local\tool;
  */
 class checktyperesults_test extends \advanced_testcase {
 
-    public function test_toolname() {
+    public function test_toolname(): void {
         $this->resetAfterTest();
 
         $object = new checktyperesults();
@@ -34,7 +34,7 @@ class checktyperesults_test extends \advanced_testcase {
         $this->assertEquals($output, 'Content types summary');
     }
 
-    public function test_toolshortname() {
+    public function test_toolshortname(): void {
         $this->resetAfterTest();
 
         $object = new checktyperesults();
@@ -42,7 +42,7 @@ class checktyperesults_test extends \advanced_testcase {
         $this->assertEquals($output, 'Content types');
     }
 
-    public function test_pluginname() {
+    public function test_pluginname(): void {
         $this->resetAfterTest();
 
         $object = new checktyperesults();
@@ -50,7 +50,7 @@ class checktyperesults_test extends \advanced_testcase {
         $this->assertEquals($output, 'checktyperesults');
     }
 
-    public function test_get_output() {
+    public function test_get_output(): void {
         $this->resetAfterTest();
         $category = $this->getDataGenerator()->create_category();
 

admin/tool/brickfield/tests/local/tool/errors_test.php

@@ -26,7 +26,7 @@ namespace tool_brickfield\local\tool;
  */
 class errors_test extends \advanced_testcase {
 
-    public function test_toolname() {
+    public function test_toolname(): void {
         $this->resetAfterTest();
 
         $object = new errors();
@@ -34,7 +34,7 @@ class errors_test extends \advanced_testcase {
         $this->assertEquals($output, 'Error list summary');
     }
 
-    public function test_toolshortname() {
+    public function test_toolshortname(): void {
         $this->resetAfterTest();
 
         $object = new errors();
@@ -42,7 +42,7 @@ class errors_test extends \advanced_testcase {
         $this->assertEquals($output, 'Error list');
     }
 
-    public function test_pluginname() {
+    public function test_pluginname(): void {
         $this->resetAfterTest();
 
         $object = new errors();
@@ -50,7 +50,7 @@ class errors_test extends \advanced_testcase {
         $this->assertEquals($output, 'errors');
     }
 
-    public function test_get_output() {
+    public function test_get_output(): void {
         $this->resetAfterTest();
         $category = $this->getDataGenerator()->create_category();
 

admin/tool/brickfield/tests/local/tool/printable_test.php

@@ -29,7 +29,7 @@ class printable_test extends \advanced_testcase {
     /**
      * Test tool name.
      */
-    public function test_toolname() {
+    public function test_toolname(): void {
         $this->resetAfterTest();
 
         $object = new printable();
@@ -40,7 +40,7 @@ class printable_test extends \advanced_testcase {
     /**
      * Test tool short name.
      */
-    public function test_toolshortname() {
+    public function test_toolshortname(): void {
         $this->resetAfterTest();
 
         $object = new printable();
@@ -51,7 +51,7 @@ class printable_test extends \advanced_testcase {
     /**
      * Test plugin name.
      */
-    public function test_pluginname() {
+    public function test_pluginname(): void {
         $this->resetAfterTest();
 
         $object = new printable();
@@ -77,7 +77,7 @@ class printable_test extends \advanced_testcase {
     /**
      * Test get output.
      */
-    public function test_get_output() {
+    public function test_get_output(): void {
         $this->resetAfterTest();
         $category = $this->getDataGenerator()->create_category();
 

admin/tool/brickfield/tests/manager_test.php

@@ -28,7 +28,7 @@ class manager_test extends \advanced_testcase {
     /**
      * Tests for the function manager::get_all_areas()
      */
-    public function test_get_areas() {
+    public function test_get_areas(): void {
         $this->resetAfterTest();
         $areas = manager::get_all_areas();
         $areaclassnames = array_map('get_class', $areas);

admin/tool/brickfield/tests/registration_test.php

@@ -40,7 +40,7 @@ class registration_test extends \advanced_testcase {
      * Tests the state of the registration system when first installed.
      * @throws \dml_exception
      */
-    public function test_initial_state() {
+    public function test_initial_state(): void {
         $this->resetAfterTest();
         $regobj = new mock_registration();
 
@@ -56,7 +56,7 @@ class registration_test extends \advanced_testcase {
      * Test the various states for setting registration keys.
      * @throws \dml_exception
      */
-    public function test_set_keys_for_registration() {
+    public function test_set_keys_for_registration(): void {
         $this->resetAfterTest();
         $regobj = new mock_registration();
 
@@ -79,7 +79,7 @@ class registration_test extends \advanced_testcase {
      * Test the validation system through its several states.
      * @throws \dml_exception
      */
-    public function test_validation() {
+    public function test_validation(): void {
         $this->resetAfterTest();
         $regobj = new mock_registration();
 
@@ -112,7 +112,7 @@ class registration_test extends \advanced_testcase {
      * Tests the system after validation grace periods expire.
      * @throws \dml_exception
      */
-    public function test_validation_time_expiry() {
+    public function test_validation_time_expiry(): void {
         $this->resetAfterTest();
         $regobj = new mock_registration();
 
@@ -149,7 +149,7 @@ class registration_test extends \advanced_testcase {
      * Tests the system after summary data time periods expire.
      * @throws \dml_exception
      */
-    public function test_summary_time_expiry() {
+    public function test_summary_time_expiry(): void {
         $this->resetAfterTest();
         $regobj = new mock_registration();
 

admin/tool/brickfield/tests/scheduler_test.php

@@ -26,7 +26,7 @@ namespace tool_brickfield;
  */
 class scheduler_test extends \advanced_testcase {
 
-    public function test_request_analysis() {
+    public function test_request_analysis(): void {
         $this->resetAfterTest();
 
         // I believe there is a bug where the code won't work with the default constructor values.
@@ -48,7 +48,7 @@ class scheduler_test extends \advanced_testcase {
 
     }
 
-    public function test_mark_analyzed() {
+    public function test_mark_analyzed(): void {
         $this->resetAfterTest();
         $object = new scheduler();
         $output = $object->mark_analyzed();
@@ -59,7 +59,7 @@ class scheduler_test extends \advanced_testcase {
         $this->assertTrue($output);
     }
 
-    public function test_create_schedule() {
+    public function test_create_schedule(): void {
         global $DB;
 
         $this->resetAfterTest();
@@ -76,7 +76,7 @@ class scheduler_test extends \advanced_testcase {
         $this->assertEquals($record->instanceid, 1);
     }
 
-    public function test_delete_schedule() {
+    public function test_delete_schedule(): void {
         global $DB;
 
         // Call create_record() to insert a record into the table.
@@ -95,7 +95,7 @@ class scheduler_test extends \advanced_testcase {
         $this->assertFalse($record);
     }
 
-    public function test_is_in_schedule() {
+    public function test_is_in_schedule(): void {
         $this->resetAfterTest();
 
         // This should assert to false as no record has been inserted.
@@ -109,7 +109,7 @@ class scheduler_test extends \advanced_testcase {
         $this->assertTrue($output);
     }
 
-    public function test_is_scheduled() {
+    public function test_is_scheduled(): void {
         $this->resetAfterTest();
 
         // This should assert to false as no record has been inserted.
@@ -129,7 +129,7 @@ class scheduler_test extends \advanced_testcase {
         $this->assertTrue($output);
     }
 
-    public function test_is_submitted() {
+    public function test_is_submitted(): void {
         $this->resetAfterTest();
 
         // This should assert to false as no record has been inserted.
@@ -149,7 +149,7 @@ class scheduler_test extends \advanced_testcase {
         $this->assertTrue($output);
     }
 
-    public function test_is_analyzed() {
+    public function test_is_analyzed(): void {
         $this->resetAfterTest();
 
         // This should assert to false as no record has been inserted.
@@ -170,14 +170,14 @@ class scheduler_test extends \advanced_testcase {
     }
 
     // Can't test because it's a protected function.
-    public function test_standard_search_params() {
+    public function test_standard_search_params(): void {
     }
 
     // Can't test because it's a protected function.
-    public function test_get_contextid() {
+    public function test_get_contextid(): void {
     }
 
-    public function test_get_datarecord() {
+    public function test_get_datarecord(): void {
         $this->resetAfterTest();
 
         $object = new scheduler();
@@ -200,11 +200,11 @@ class scheduler_test extends \advanced_testcase {
     }
 
     // No return statement.
-    public function test_process_scheduled_requests() {
+    public function test_process_scheduled_requests(): void {
 
     }
 
-    public function test_initialize_schedule() {
+    public function test_initialize_schedule(): void {
         global $DB;
         $this->resetAfterTest();
 
@@ -219,14 +219,14 @@ class scheduler_test extends \advanced_testcase {
         $this->assertEquals($record->contextlevel, 20);
     }
 
-    public function test_request_course_analysis() {
+    public function test_request_course_analysis(): void {
         $this->resetAfterTest();
 
         $output = scheduler::request_course_analysis(1);
         $this->assertTrue($output);
     }
 
-    public function test_create_course_schedule() {
+    public function test_create_course_schedule(): void {
         global $DB;
         $this->resetAfterTest();
 
@@ -237,7 +237,7 @@ class scheduler_test extends \advanced_testcase {
 
     }
 
-    public function test_delete_course_schedule() {
+    public function test_delete_course_schedule(): void {
         global $DB;
         $this->resetAfterTest();
 
@@ -251,7 +251,7 @@ class scheduler_test extends \advanced_testcase {
         $this->assertFalse($record);
     }
 
-    public function test_is_course_in_schedule() {
+    public function test_is_course_in_schedule(): void {
         $this->resetAfterTest();
 
         // This should assert to false as no record has been inserted.
@@ -264,7 +264,7 @@ class scheduler_test extends \advanced_testcase {
         $this->assertTrue($output);
     }
 
-    public function test_is_course_scheduled() {
+    public function test_is_course_scheduled(): void {
         $this->resetAfterTest();
 
         // This should assert to false as no record has been inserted.
@@ -283,7 +283,7 @@ class scheduler_test extends \advanced_testcase {
         $this->assertTrue($output);
     }
 
-    public function test_is_course_analyzed() {
+    public function test_is_course_analyzed(): void {
         $this->resetAfterTest();
         $object = new scheduler(10, 1);
 

admin/tool/brickfield/tests/tool_test.php

@@ -30,7 +30,7 @@ use tool_brickfield\local\tool\tool;
 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
@@ -58,7 +58,7 @@ w==" alt="This is a bus." />';
 EOF;
 
 
-    public function test_build_all_accessibilitytools() {
+    public function test_build_all_accessibilitytools(): void {
         $tools = tool::build_all_accessibilitytools();
 
         $this->assertEquals($tools['errors']::toolshortname(), 'Error list');
@@ -68,14 +68,14 @@ EOF;
         $this->assertEquals($tools['advanced']::toolshortname(), 'Advanced');
     }
 
-    public function test_data_is_valid() {
+    public function test_data_is_valid(): void {
         $object = $this->getMockForAbstractClass(tool::class);
         $object->set_filter(new filter());
         $output = $object->data_is_valid();
         $this->assertFalse($output);
     }
 
-    public function test_can_access() {
+    public function test_can_access(): void {
         $this->resetAfterTest();
         $category = $this->getDataGenerator()->create_category();
         $filter = new filter(1, $category->id, 'tab', 3, 4);
@@ -86,14 +86,14 @@ EOF;
         $this->assertFalse($output);
     }
 
-    public function test_get_error_message() {
+    public function test_get_error_message(): void {
         $tool = $this->getMockForAbstractClass(tool::class);
 
         $output = $tool->get_error_message();
         $this->assertEquals($output, '');
     }
 
-    public function test_get_module_label() {
+    public function test_get_module_label(): void {
         $output = tool::get_module_label('core_course');
         $this->assertEquals($output, 'Course');
 
@@ -101,7 +101,7 @@ EOF;
         $this->assertEquals($output, 'Book');
     }
 
-    public function test_toplevel_arguments() {
+    public function test_toplevel_arguments(): void {
         $this->resetAfterTest();
         $category = $this->getDataGenerator()->create_category();
         $filter = new filter(1, $category->id, 'tab', 3, 4);
@@ -118,11 +118,11 @@ EOF;
      * 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)' => [
@@ -130,7 +130,7 @@ EOF;
                 false,
             ],
             'Image tag in string (base64)' => [
-                "This is my image {$this->base64img}.",
+                "This is my image " . self::$base64img,
                 true,
             ],
             'Image tag in string (link)' => [
@@ -154,15 +154,15 @@ EOF;
      * @param string $content
      * @param bool $expectation
      */
-    public function test_base64_img_detected(string $content, bool $expectation) {
+    public function test_base64_img_detected(string $content, bool $expectation): void {
         $this->assertEquals(
             $expectation,
             tool::base64_img_detected($content)
         );
     }
 
-    public function test_truncate_base64() {
-        $truncated = tool::truncate_base64($this->base64img);
+    public function test_truncate_base64(): void {
+        $truncated = tool::truncate_base64(self::$base64img);
         $this->assertStringContainsString('<img src="data:image/gif;base64..."', $truncated);
     }
 }