Merge branch 'MDL-76362-401-extra' of https://github.com/andrewnicols…

…/moodle into MOODLE_401_STABLE

admin/tool/analytics/classes/output/helper.php

@@ -45,7 +45,7 @@ public static function class_to_option($class) {
         // Form field is PARAM_ALPHANUMEXT and we are sending fully qualified class names
         // as option names, but replacing the backslash for a string that is really unlikely
         // to ever be part of a class name.
-        return str_replace('\\', '__', $class);
+        return str_replace('\\', '__', $class ?? '');
     }
 
     /**

admin/tool/behat/cli/run.php

@@ -437,7 +437,7 @@ function print_combined_run_output($processes, $stoponfail = false) {
                         $process->stop(0);
                     }
 
-                    $strlentoprint = strlen($update);
+                    $strlentoprint = strlen($update ?? '');
 
                     // If not enough dots printed on line then just print.
                     if ($strlentoprint < $remainingprintlen) {

admin/tool/brickfield/classes/manager.php

@@ -205,7 +205,7 @@ function($classname) {
      * @return string
      */
     public static function get_contenthash(?string $content = null): string {
-        return sha1($content);
+        return sha1($content ?? '');
     }
 
     /**

admin/tool/dataprivacy/classes/data_registry.php

@@ -47,7 +47,7 @@ class data_registry {
      * @return string[]
      */
     public static function var_names_from_context($classname, $pluginname = '') {
-        $pluginname = trim($pluginname);
+        $pluginname = trim($pluginname ?? '');
         if (!empty($pluginname)) {
             $categoryvar = $classname . '_' . $pluginname . '_category';
             $purposevar = $classname . '_' . $pluginname . '_purpose';

admin/tool/dataprivacy/classes/external/purpose_exporter.php

@@ -111,7 +111,7 @@ protected function get_other_values(renderer_base $output) {
         $values['formattedlawfulbases'] = $formattedbases;
 
         $formattedsensitivereasons = [];
-        $sensitivereasons = explode(',', $this->persistent->get('sensitivedatareasons'));
+        $sensitivereasons = explode(',', $this->persistent->get('sensitivedatareasons') ?? '');
         if (!empty($sensitivereasons)) {
             foreach ($sensitivereasons as $reason) {
                 if (empty(trim($reason))) {

admin/tool/log/classes/helper/reader.php

@@ -74,10 +74,10 @@ public function get_description() {
      * @return mixed Decoded value
      */
     public static function decode_other(?string $other) {
-        if ($other === 'N;' || preg_match('~^.:~', $other)) {
+        if ($other === 'N;' || preg_match('~^.:~', $other ?? '')) {
             return unserialize($other);
         } else {
-            return json_decode($other, true);
+            return json_decode($other ?? '', true);
         }
     }
 

admin/tool/moodlenet/classes/local/remote_resource.php

@@ -60,8 +60,8 @@ class remote_resource {
     public function __construct(\curl $curl, url $url, \stdClass $metadata) {
         $this->curl = $curl;
         $this->url = $url;
-        $this->filename = pathinfo($this->url->get_path(), PATHINFO_FILENAME);
-        $this->extension = pathinfo($this->url->get_path(), PATHINFO_EXTENSION);
+        $this->filename = pathinfo($this->url->get_path() ?? '', PATHINFO_FILENAME);
+        $this->extension = pathinfo($this->url->get_path() ?? '', PATHINFO_EXTENSION);
         $this->metadata = $metadata;
     }
 

analytics/classes/model.php

@@ -1828,7 +1828,7 @@ public function clear() {
      */
     public function get_name() {
 
-        if (trim($this->model->name) === '') {
+        if (trim($this->model->name ?? '') === '') {
             return $this->get_target()->get_name();
 
         } else {

backup/moodle2/backup_custom_fields.php

@@ -197,7 +197,7 @@ public function set_value($value) {
         $iv = self::generate_encryption_random_key(openssl_cipher_iv_length(backup::CIPHER));
 
         // Everything is ready, let's encrypt and prepend the 1-shot iv.
-        $value = $iv . openssl_encrypt($value, backup::CIPHER, $this->key, OPENSSL_RAW_DATA, $iv);
+        $value = $iv . openssl_encrypt($value ?? '', backup::CIPHER, $this->key, OPENSSL_RAW_DATA, $iv);
 
         // Calculate the hmac of the value (iv + encrypted) and prepend it.
         $hmac = hash_hmac('sha256', $value, $this->key, true);

backup/util/helper/restore_decode_processor.class.php

@@ -170,7 +170,7 @@ public static function register_link_decoders($processor) {
      */
     protected function precheck_content($content) {
         // Look for $@ in content (all interlinks contain that)
-        return (strpos($content, '$@') === false) ? false : $content;
+        return (strpos($content ?? '', '$@') === false) ? false : $content;
     }
 }
 

backup/util/helper/restore_structure_parser_processor.class.php

@@ -55,8 +55,10 @@ public function process_cdata($cdata) {
             return '';
         } else if (is_numeric($cdata)) {
             return $cdata;
-        } else if (strlen($cdata) < 32) { // Impossible to have one link in 32cc
-            return $cdata;                // (http://10.0.0.1/file.php/1/1.jpg, http://10.0.0.1/mod/url/view.php?id=)
+        } else if (strlen($cdata ?? '') < 32) {
+            // Impossible to have one link in 32cc.
+            // (http://10.0.0.1/file.php/1/1.jpg, http://10.0.0.1/mod/url/view.php?id=).
+            return $cdata;
         }
 
         if (strpos($cdata, '$@FILEPHP@$') !== false) {

backup/util/xml/output/xml_output.class.php

@@ -107,7 +107,7 @@ public function write($content) {
         if (!$this->running) {
             throw new xml_output_exception('xml_output_not_started');
         }
-        $lenc = strlen($content); // Get length in bytes
+        $lenc = strlen($content ?? ''); // Get length in bytes.
         if ($lenc == 0) { // 0 length contents, nothing to do
             return;
         }

backup/util/xml/xml_writer.class.php

@@ -260,7 +260,7 @@ protected function xml_safe_text_content($content) {
      * ignores the rest of characters. Also normalize linefeeds and return chars.
      */
     protected function xml_safe_utf8($content) {
-        $content = preg_replace('/[\x-\x8\xb-\xc\xe-\x1f\x7f]/is','', $content); // clean CTRL chars
+        $content = preg_replace('/[\x-\x8\xb-\xc\xe-\x1f\x7f]/is', '', $content ?? ''); // clean CTRL chars.
         $content = preg_replace("/\r\n|\r/", "\n", $content); // Normalize line&return=>line
         return $content;
     }

badges/classes/backpack_api_mapping.php

@@ -170,8 +170,8 @@ private function get_url($apiurl, $param1, $param2) {
         $url = str_replace('[SCHEME]', $urlscheme, $url);
         $url = str_replace('[HOST]', $urlhost, $url);
         $url = str_replace('[URL]', $apiurl, $url);
-        $url = str_replace('[PARAM1]', $param1, $url);
-        $url = str_replace('[PARAM2]', $param2, $url);
+        $url = str_replace('[PARAM1]', $param1 ?? '', $url);
+        $url = str_replace('[PARAM2]', $param2 ?? '', $url);
 
         return $url;
     }

cache/classes/helper.php

@@ -634,7 +634,7 @@ public static function get_definition_name($definition) {
      */
     public static function hash_key($key, cache_definition $definition) {
         if ($definition->uses_simple_keys()) {
-            if (debugging() && preg_match('#[^a-zA-Z0-9_]#', $key)) {
+            if (debugging() && preg_match('#[^a-zA-Z0-9_]#', $key ?? '')) {
                 throw new coding_exception('Cache definition '.$definition->get_id().' requires simple keys. Invalid key provided.', $key);
             }
             // We put the key first so that we can be sure the start of the key changes.

course/classes/external/course_summary_exporter.php

@@ -64,7 +64,7 @@ protected function get_other_values(renderer_base $output) {
         if ($progress === 0 || $progress > 0) {
             $hasprogress = true;
         }
-        $progress = floor($progress);
+        $progress = floor($progress ?? 0);
         $coursecategory = \core_course_category::get($this->data->category, MUST_EXIST, true);
         return array(
             'fullnamedisplay' => get_course_display_name_for_list($this->data),

course/format/classes/base.php

@@ -608,7 +608,7 @@ public function get_sections_preferences_by_preference(): array {
         $course = $this->get_course();
         try {
             $sectionpreferences = (array) json_decode(
-                get_user_preferences('coursesectionspreferences_' . $course->id, null, $USER->id)
+                get_user_preferences("coursesectionspreferences_{$course->id}", '', $USER->id)
             );
             if (empty($sectionpreferences)) {
                 $sectionpreferences = [];

course/format/classes/output/local/content/frontpagesection.php

@@ -84,7 +84,7 @@ public function export_for_template(\renderer_base $output): stdClass {
         $sectionoutput = new $this->sectionclass($format, $section);
         $sectionoutput->hide_controls();
 
-        if (trim($section->name) == '') {
+        if (trim($section->name ?? '') == '') {
             $sectionoutput->hide_title();
         }
 

course/user.php

@@ -148,7 +148,7 @@
             $coursenode->collapse = true;
             $coursenode->make_inactive();
 
-            if (!preg_match('/^user\d{0,}$/', $activenode->key)) { // No user name found.
+            if (!preg_match('/^user\d{0,}$/', $activenode->key ?? '')) { // No user name found.
                 $userurl = new moodle_url('/user/view.php', array('id' => $user->id, 'course' => $course->id));
                 // Add the user name.
                 $usernode = $activenode->add(fullname($user), $userurl, navigation_node::TYPE_SETTING);

customfield/classes/field.php

@@ -92,6 +92,6 @@ protected static function define_properties() : array {
      * @return array
      */
     protected function get_configdata() : array {
-        return json_decode($this->raw_get('configdata'), true) ?? array();
+        return json_decode($this->raw_get('configdata') ?? '', true) ?? array();
     }
 }

enrol/lti/classes/data_connector.php

@@ -88,16 +88,18 @@ public function loadToolConsumer($consumer) {
         global $DB;
 
         $id = $consumer->getRecordId();
+        $key = $consumer->getKey();
+        $result = false;
 
         if (!empty($id)) {
             $result = $DB->get_record($this->consumertable, ['id' => $id]);
-        } else {
-            $key256 = DataConnector::getConsumerKey($consumer->getKey());
+        } else if (!empty($key)) {
+            $key256 = DataConnector::getConsumerKey($key);
             $result = $DB->get_record($this->consumertable, ['consumerkey256' => $key256]);
         }
 
         if ($result) {
-            if (empty($key256) || empty($result->consumerkey) || ($consumer->getKey() === $result->consumerkey)) {
+            if (empty($key256) || empty($result->consumerkey) || ($key === $result->consumerkey)) {
                 $this->build_tool_consumer_object($result, $consumer);
                 return true;
             }
@@ -997,7 +999,7 @@ protected function build_tool_consumer_object($record, ToolConsumer $consumer) {
         $consumer->consumerName = $record->consumername;
         $consumer->consumerVersion = $record->consumerversion;
         $consumer->consumerGuid = $record->consumerguid;
-        $consumer->profile = json_decode($record->profile);
+        $consumer->profile = json_decode($record->profile ?? '');
         $consumer->toolProxy = $record->toolproxy;
         $settings = unserialize($record->settings);
         if (!is_array($settings)) {

enrol/lti/classes/local/ltiadvantage/lib/http_client.php

@@ -78,8 +78,8 @@ function(&$val, $key) {
         if (!$this->curlclient->get_errno() && !$this->curlclient->error) {
             // No errors, so format the response.
             $headersize = $info['header_size'];
-            $resheaders = substr($res, 0, $headersize);
-            $resbody = substr($res, $headersize);
+            $resheaders = substr($res ?? '', 0, $headersize);
+            $resbody = substr($res ?? '', $headersize);
             $headerlines = array_filter(explode("\r\n", $resheaders));
             $parsedresponseheaders = [
                 'httpstatus' => array_shift($headerlines)

grade/report/singleview/classes/local/screen/user.php

@@ -405,16 +405,15 @@ public function process($data): stdClass {
 
                 $gradeitem = grade_item::fetch([
                     'courseid' => $this->courseid,
-                    'id' => $matches[1]
+                    'id' => $matches[1],
                 ]);
 
                 $isscale = ($gradeitem->gradetype == GRADE_TYPE_SCALE);
 
-                $empties = (trim($value) === '' or ($isscale and $value == -1));
+                $empties = (trim($value ?? '') === '' || ($isscale && $value == -1));
 
-                if ($filter == 'all' or $empties) {
-                    $data->$varname = ($isscale and empty($insertvalue)) ?
-                        -1 : $insertvalue;
+                if ($filter == 'all' || $empties) {
+                    $data->$varname = ($isscale && empty($insertvalue)) ? -1 : $insertvalue;
                 }
             }
         }

h5p/ajax.php

@@ -58,7 +58,7 @@
         $minor = optional_param('minorVersion', 0, PARAM_INT);
 
         // Normalise Moodle language using underscore, as opposed to H5P which uses dash.
-        $language = optional_param('default-language', null, PARAM_RAW);
+        $language = optional_param('default-language', '', PARAM_RAW);
         $language = clean_param(str_replace('-', '_', $language), PARAM_LANG);
 
         if (!empty($name)) {

h5p/classes/api.php

@@ -163,7 +163,7 @@ public static function get_contenttype_libraries(?string $fields = ''): array {
             unset($library->major_version);
             $library->minorVersion = (int) $library->minorversion;
             unset($library->minorversion);
-            $library->metadataSettings = json_decode($library->metadatasettings);
+            $library->metadataSettings = json_decode($library->metadatasettings ?? '');
 
             // If we already add this library means that it is an old version,as the previous query was sorted by version.
             if (isset($added[$library->name])) {

h5p/classes/editor_framework.php

@@ -274,7 +274,7 @@ public function getLibraries($libraries = null): ?array {
                 if ($details) {
                     $library->title = $details->title;
                     $library->runnable = $details->runnable;
-                    $library->metadataSettings = json_decode($details->metadatasettings);
+                    $library->metadataSettings = json_decode($details->metadatasettings ?? '');
                     $library->example = $details->example;
                     $library->tutorial = $details->tutorial;
                     $librariesin[] = $library;

lib/accesslib.php

@@ -4519,15 +4519,15 @@ function role_get_name(stdClass $role, $context = null, $rolenamedisplay = ROLEN
     }
 
     if ($rolenamedisplay == ROLENAME_ALIAS) {
-        if ($coursecontext and trim($role->coursealias) !== '') {
+        if ($coursecontext && $role->coursealias && trim($role->coursealias) !== '') {
             return format_string($role->coursealias, true, array('context'=>$coursecontext));
         } else {
             return $original;
         }
     }
 
     if ($rolenamedisplay == ROLENAME_BOTH) {
-        if ($coursecontext and trim($role->coursealias) !== '') {
+        if ($coursecontext && $role->coursealias && trim($role->coursealias) !== '') {
             return format_string($role->coursealias, true, array('context'=>$coursecontext)) . " ($original)";
         } else {
             return $original;

lib/behat/extension/Moodle/BehatExtension/Locator/FilesystemSkipPassedListLocator.php

@@ -64,7 +64,7 @@ public function getLocatorExamples() {
      * @return SpecificationIterator
      */
     public function locateSpecifications(Suite $suite, $locator) {
-        if (!is_file($locator) || 'passed' !== pathinfo($locator, PATHINFO_EXTENSION)) {
+        if (!$locator || !is_file($locator) || 'passed' !== pathinfo($locator, PATHINFO_EXTENSION)) {
             return new NoSpecificationsIterator($suite);
         }
 

lib/classes/component.php

@@ -970,10 +970,9 @@ public static function is_valid_plugin_name($plugintype, $pluginname) {
             }
             // Modules MUST NOT have any underscores,
             // component normalisation would break very badly otherwise!
-            return (bool)preg_match('/^[a-z][a-z0-9]*$/', $pluginname);
-
+            return !is_null($pluginname) && (bool) preg_match('/^[a-z][a-z0-9]*$/', $pluginname);
         } else {
-            return (bool)preg_match('/^[a-z](?:[a-z0-9_](?!__))*[a-z0-9]+$/', $pluginname);
+            return !is_null($pluginname) && (bool) preg_match('/^[a-z](?:[a-z0-9_](?!__))*[a-z0-9]+$/', $pluginname);
         }
     }
 

lib/classes/date.php

@@ -319,7 +319,7 @@ public static function phpunit_override_default_php_timezone($tz) {
         if (!defined('PHPUNIT_TEST')) {
             throw new coding_exception('core_date::phpunit_override_default_php_timezone() must be used only from unit tests');
         }
-        $result = timezone_open($tz); // This triggers error if $tz invalid.
+        $result = timezone_open($tz ?? ''); // This triggers error if $tz invalid.
         if ($result !== false) {
             self::$defaultphptimezone = $tz;
         } else {

lib/classes/output/mustache_filesystem_loader.php

@@ -53,4 +53,16 @@ protected function getFileName($name) {
         // Call the Moodle template finder.
         return mustache_template_finder::get_template_filepath($name);
     }
+
+    /**
+     * Only check if baseDir is a directory and requested templates are files if
+     * baseDir is using the filesystem stream wrapper.
+     *
+     * Always check path for mustache_filesystem_loader.
+     *
+     * @return bool Whether to check `is_dir` and `file_exists`
+     */
+    protected function shouldCheckPath() {
+        return true;
+    }
 }

lib/dml/pgsql_native_moodle_database.php

@@ -594,7 +594,7 @@ protected function fetch_columns(string $table): array {
 
             } else if (preg_match('/int(\d)/i', $rawcolumn->type, $matches)) {
                 $info->type = 'int';
-                if (strpos($rawcolumn->adsrc, 'nextval') === 0) {
+                if (strpos($rawcolumn->adsrc ?? '', 'nextval') === 0) {
                     $info->primary_key   = true;
                     $info->meta_type     = 'R';
                     $info->unique        = true;

lib/evalmath/evalmath.class.php

@@ -260,7 +260,7 @@ function nfx($expr) {
                     if (is_null($o2)) return $this->trigger(get_string('unexpectedclosingbracket', 'mathslib'));
                     else $output[] = $o2;
                 }
-                if (preg_match('/^('.self::$namepat.')\($/', $stack->last(2), $matches)) { // did we just close a function?
+                if (preg_match('/^('.self::$namepat.')\($/', $stack->last(2) ?? '', $matches)) { // did we just close a function?
                     $fnn = $matches[1]; // get the function name
                     $arg_count = $stack->pop(); // see how many arguments there were (cleverly stored on the stack, thank you)
                     $fn = $stack->pop();

lib/evalmath/readme_moodle.txt

@@ -13,6 +13,7 @@ Our changes:
 * added round, ceil and floor functions.
 * EvalMath::EvalMath() changed to EvalMath::__construct() and there is a new EvalMath::EvalMath
   function to maintain backwards compatibility
+* Ensure a string is passed to preg_match in EvalMath::nfx.
 
 To see all changes diff against version 1.1, available from:
 http://www.phpclasses.org/browse/package/2695.html
@@ -27,4 +28,4 @@ Changes by Stefan Erlachner, Thomas Niedermaier (MDL-64414):
 * add function or:
 e.g. if (or(condition_1, condition_2, ... condition_n))
 * add function and:
-e.g. if (and(condition_1, condition_2, ... condition_n))
+e.g. if (and(condition_1, condition_2, ... condition_n))

lib/filebrowser/file_info.php

@@ -100,8 +100,8 @@ public abstract function get_children();
      */
     protected function build_search_files_sql($extensions, $prefix = null) {
         global $DB;
-        if (strlen($prefix)) {
-            $prefix = $prefix.'.';
+        if ($prefix && strlen($prefix)) {
+            $prefix = $prefix . '.';
         } else {
             $prefix = '';
         }