-
-
-
-
+ {{#canbeedited}}
+
- + {{#pix}}t/edit{{/pix}} {{#str}}editthisplan, tool_lp{{/str}}
+ {{/canbeedited}} {{#isreopenallowed}}- diff --git a/admin/tool/messageinbound/lang/en/tool_messageinbound.php b/admin/tool/messageinbound/lang/en/tool_messageinbound.php index 91a9b9a953028..4b6b8d240effa 100644 --- a/admin/tool/messageinbound/lang/en/tool_messageinbound.php +++ b/admin/tool/messageinbound/lang/en/tool_messageinbound.php @@ -109,8 +109,8 @@ $string['sslv3'] = 'SSLv3 (Force SSL Version 3)'; $string['taskcleanup'] = 'Cleanup of unverified incoming email'; $string['taskpickup'] = 'Incoming email pickup'; -$string['tls'] = 'TLS (TLS; started via protocol-level negotiation over unencrypted channel; RECOMMENDED way of initiating secure connection)'; -$string['tlsv1'] = 'TLSv1 (direct connection to TLS server version 1.x)'; +$string['tls'] = 'Transport Layer Security (TLS) (TLS; started via protocol-level negotiation over unencrypted channel; RECOMMENDED way of initiating secure connection)'; +$string['tlsv1'] = 'Transport Layer Security (TLS) v1 (direct connection to TLS server version 1.x)'; $string['validateaddress'] = 'Validate sender email address'; $string['validateaddress_help'] = 'When a message is received from a user, Moodle attempts to validate the message by comparing the email address of the sender with the email address in their user profile. diff --git a/admin/tool/mfa/classes/manager.php b/admin/tool/mfa/classes/manager.php index 74e9ca7216a02..cd016bf564808 100644 --- a/admin/tool/mfa/classes/manager.php +++ b/admin/tool/mfa/classes/manager.php @@ -598,6 +598,10 @@ public static function get_no_redirect_urls(): array { $urls = [ new \moodle_url('/login/logout.php'), new \moodle_url('/admin/tool/mfa/guide.php'), + // Allow email self-registration confirmation to complete so that + // auth_email can restore wantsurl from the auth_email_wantsurl user + // preference before MFA intercepts on the next request. + new \moodle_url('/login/confirm.php'), ]; foreach ($factors as $factor) { $urls = array_merge($urls, $factor->get_no_redirect_urls()); @@ -605,8 +609,9 @@ public static function get_no_redirect_urls(): array { // Allow forced redirection exclusions. if ($exclusions = get_config('tool_mfa', 'redir_exclusions')) { - foreach (explode("\n", $exclusions) as $exclusion) { - $urls[] = new \moodle_url($exclusion); + $exclusions = preg_split('/\n|\r/', $exclusions, -1, PREG_SPLIT_NO_EMPTY); + foreach ($exclusions as $exclusion) { + $urls[] = new \moodle_url(trim($exclusion)); } } diff --git a/admin/tool/mfa/factor/auth/lang/en/factor_auth.php b/admin/tool/mfa/factor/auth/lang/en/factor_auth.php index f1149e9eeda68..604ebe7ec2c0d 100644 --- a/admin/tool/mfa/factor/auth/lang/en/factor_auth.php +++ b/admin/tool/mfa/factor/auth/lang/en/factor_auth.php @@ -28,6 +28,6 @@ $string['privacy:metadata'] = 'The Authentication type factor plugin does not store any personal data.'; $string['settings:description'] = 'Automatically verify users based on their authentication type.'; $string['settings:goodauth'] = 'Factor authentication types'; -$string['settings:goodauth_help'] = 'Select all authentication types to use as a factor for MFA. Any types not selected will not be treated as a FAIL in MFA.'; +$string['settings:goodauth_help'] = 'Select all authentication types that will gain the points from this factor. Other authentication types will not be treated as a fail in MFA, but will not gain this factor\'s weight points.'; $string['settings:shortdescription'] = 'Allow users to bypass extra authentication steps based on their authentication type.'; $string['summarycondition'] = 'has an authentication type of {$a}'; diff --git a/admin/tool/mfa/styles.css b/admin/tool/mfa/styles.css index 2a376f12b1294..47296d2a2f627 100644 --- a/admin/tool/mfa/styles.css +++ b/admin/tool/mfa/styles.css @@ -38,3 +38,8 @@ input.tool-mfa-verification-code, .mfa-verify-form .form-group.fitem > span > input { width: 100%; } + +#mfalist .icon-circle .icon { + width: 64px; + height: 64px; +} diff --git a/admin/tool/mfa/tests/manager_test.php b/admin/tool/mfa/tests/manager_test.php index 16e97565198a4..602d752b0c1c2 100644 --- a/admin/tool/mfa/tests/manager_test.php +++ b/admin/tool/mfa/tests/manager_test.php @@ -20,6 +20,7 @@ * Tests for MFA manager class. * * @package tool_mfa + * @covers \tool_mfa\manager * @author Peter Burnett
- +{{#str}} instancedescription, tool_moodlenet {{/str}}
+ + {{! Removal warning - always visible when MoodleNet integration is enabled }} ++ {{#str}}removalwarning_title, tool_moodlenet{{/str}} ++{{#str}}removalwarning_service, tool_moodlenet{{/str}}
+{{#str}}removalwarning_feature, tool_moodlenet{{/str}}
+{{#str}} connectandbrowse, tool_moodlenet {{/str}}
OAuth 2 services" in site administration And I click on "Configure user field mappings" "link" in the "Testing service" "table_row" - And I should see "firstname" in the "givenname" "table_row" + And I should see "firstname" in the "given_name" "table_row" + And I should see "lastname" in the "family_name" "table_row" And I should see "idnumber" in the "sub" "table_row" And I should see "email" in the "email" "table_row" And I should see "lang" in the "locale" "table_row" diff --git a/admin/tool/replace/lang/en/tool_replace.php b/admin/tool/replace/lang/en/tool_replace.php index 55e960c54778f..a4d97d4bb9c8d 100644 --- a/admin/tool/replace/lang/en/tool_replace.php +++ b/admin/tool/replace/lang/en/tool_replace.php @@ -34,10 +34,10 @@ $string['notimplemented'] = 'Sorry, this feature is not implemented in your database driver.'; $string['notsupported'] = 'This script should be considered experimental. Changes made cannot be reverted, thus a complete backup should be made before running the script!'; $string['pageheader'] = 'Search and replace text throughout the whole database'; -$string['pluginname'] = 'DB search and replace'; +$string['pluginname'] = 'Database search and replace'; $string['replacewith'] = 'Replace with this string'; $string['replacewithhelp'] = 'usually new server URL'; $string['searchwholedb'] = 'Search whole database for'; $string['searchwholedbhelp'] = 'usually previous server URL'; $string['shortenoversized'] = 'Shorten result if necessary'; -$string['privacy:metadata'] = 'The DB search and replace plugin does not store any personal data.'; +$string['privacy:metadata'] = 'The Database search and replace plugin does not store any personal data.'; diff --git a/admin/tool/task/classes/check/adhocqueue.php b/admin/tool/task/classes/check/adhocqueue.php index 3787cd9e2dc14..36bec83dba3db 100644 --- a/admin/tool/task/classes/check/adhocqueue.php +++ b/admin/tool/task/classes/check/adhocqueue.php @@ -22,7 +22,11 @@ use moodle_url; /** - * Ad hoc queue checks + * Adhoc queue check. + * + * This alerts when the queue has old tasks in it which indicates that tasks + * are not being processed fast enough and more processess need to be added + * to manage the load. A large queue by itself is fine. * * @package tool_task * @copyright 2020 Brendan Heywood (brendan@catalyst-au.net) @@ -40,7 +44,10 @@ public function get_result(): result { $stats = $DB->get_record_sql(' SELECT count(*) cnt, MAX(? - nextruntime) age - FROM {task_adhoc}', [time()]); + FROM {task_adhoc} + WHERE attemptsavailable > 0 OR attemptsavailable IS NULL', + [time()] + ); $status = result::OK; $summary = get_string('adhocempty', 'tool_task'); diff --git a/admin/tool/task/lang/en/tool_task.php b/admin/tool/task/lang/en/tool_task.php index 91d1164d3ef4d..efa721412e742 100644 --- a/admin/tool/task/lang/en/tool_task.php +++ b/admin/tool/task/lang/en/tool_task.php @@ -55,7 +55,7 @@ $string['defaultx'] = 'Default: {$a}'; $string['deleteadhoctask'] = 'Delete ad hoc task {$a}'; $string['disabled'] = 'Disabled'; -$string['disabled_help'] = 'Disabled scheduled tasks are not executed from cron, however they can still be executed manually via the CLI tool.'; +$string['disabled_help'] = 'Disabled scheduled tasks are not executed from cron, however they can still be executed manually via the Command Line Interface (CLI) tool.'; $string['edittaskschedule'] = 'Edit task schedule: {$a}'; $string['enablerunnow'] = 'Allow \'Run now\' for scheduled tasks'; $string['enablerunnow_desc'] = 'Allows administrators to run a single scheduled task immediately, rather than waiting for it to run as scheduled. The feature requires \'Path to PHP CLI\' (pathtophp) to be set in System paths. The task runs on the web server, so you may wish to disable this feature to avoid potential performance issues.'; diff --git a/admin/tool/task/lib.php b/admin/tool/task/lib.php index c1813db730f86..980d4ffd1ff34 100644 --- a/admin/tool/task/lib.php +++ b/admin/tool/task/lib.php @@ -49,7 +49,7 @@ function tool_task_mtrace_wrapper(string $message, string $eol = ''): void { // We autolink urls and emails here but can't use format_text as it does // more than we need and has side effects which are not useful in this context. - $urlpattern = '/(http|https|ftp|ftps)\:\/\/[a-zA-Z0-9\-\.]+\.[a-zA-Z]{2,3}(\/\S*)?/'; + $urlpattern = '~\b(?:https?|ftps?)://[a-z0-9-]+(?:\.[a-z0-9-]+)*(?::\d+)?(?:/[^\s<]*)?~i'; $message = preg_replace_callback($urlpattern, function($matches) { $url = $matches[0]; return html_writer::link($url, $url, ['target' => '_blank']); diff --git a/admin/tool/task/renderer.php b/admin/tool/task/renderer.php index fd9a325e2ab95..86c5f95a9742d 100644 --- a/admin/tool/task/renderer.php +++ b/admin/tool/task/renderer.php @@ -58,7 +58,7 @@ public function adhoc_tasks_summary_table(array $summary): string { get_string('nextruntime', 'tool_task'), ]; - $table->attributes['class'] = 'admintable generaltable table table-hover'; + $table->attributes['class'] = 'admintable generaltable table table-striped table-hover'; $table->colclasses = []; // For each task entry (row) show action buttons/logs link depending on the user permissions. @@ -388,7 +388,7 @@ public function scheduled_tasks_table($tasks, $lastchanged = '') { get_string('default', 'tool_task'), ]; - $table->attributes['class'] = 'admintable generaltable table table-hover'; + $table->attributes['class'] = 'admintable generaltable table table-striped table-hover'; $table->colclasses = []; if (!$showloglink) { diff --git a/admin/tool/task/tests/adhoc_queue_test.php b/admin/tool/task/tests/adhoc_queue_test.php new file mode 100644 index 0000000000000..64dcc3e330589 --- /dev/null +++ b/admin/tool/task/tests/adhoc_queue_test.php @@ -0,0 +1,79 @@ +. + +namespace tool_task\check; + +use core\check\result; + +/** + * Tests for the adhocqueue class. + * + * @package tool_task + * @copyright 2025 Brendan Heywood
(note that table names aren\'t important if using $CFG->prefix)'; $string['yesextraindexesfound'] = 'The following additional indexes were found.'; -$string['yesmissingindexesfound'] = 'Some missing indexes have been found in your DB. Here are their details and the needed SQL statements to be executed with your favourite SQL interface to create all of them. Remember to backup your data first!
-After doing that, it\'s highly recommended to execute this utility again to check that no more missing indexes are found.
'; -$string['yeswrongdefaultsfound'] = 'Some inconsistent defaults have been found in your DB. Here are their details and the needed SQL statements to be executed with your favourite SQL interface to fix them all. Remember to backup your data first!
-After doing that, it\'s highly recommended to execute this utility again to check that no more inconsistent defaults are found.
'; -$string['yeswrongintsfound'] = 'Some wrong integers have been found in your DB. Here are their details and the needed SQL statements to be executed with your favourite SQL interface to fix them. Remember to backup your data first!
-After fixing them, it is highly recommended to execute this utility again to check that no more wrong integers are found.
'; +$string['yesmissingindexesfound'] = 'Some missing indexes have been found in your database. Here are their details and the needed SQL statements to be executed in your favourite SQL interface to create them. Remember to back up your data first!
+It\'s highly recommended to execute this utility again to check that no more missing indexes are found.
'; +$string['yeswrongdefaultsfound'] = 'Some inconsistent defaults have been found in your database. Here are their details and the needed SQL statements to be executed in your favourite SQL interface to fix them. Remember to backup your data first!
+It\'s highly recommended to execute this utility again to check that no more inconsistent defaults are found.
'; +$string['yeswrongintsfound'] = 'Some incorrect integers have been found in your database. Here are their details and the needed SQL statements to be executed in your favourite SQL interface to fix them. Remember to backup your data first!
+It is highly recommended to execute this utility again to check that no more incorrect integers are found.
'; $string['privacy:metadata'] = 'The XMLDB editor plugin does not store any personal data.'; diff --git a/admin/upgradesettings.php b/admin/upgradesettings.php index eecf91abbca8a..ae19b36eeff1d 100644 --- a/admin/upgradesettings.php +++ b/admin/upgradesettings.php @@ -35,8 +35,6 @@ $newsettingshtml = implode($newsettings); unset($newsettings); -$focus = ''; - if (empty($adminroot->errors) and $newsettingshtml === '') { // there must be either redirect without message or continue button or else upgrade would be sometimes broken if ($return == 'site') { @@ -48,12 +46,12 @@ if (!empty($adminroot->errors)) { $firsterror = reset($adminroot->errors); - $focus = $firsterror->id; + $PAGE->set_focuscontrol($firsterror->id); } // and finally, if we get here, then there are new settings and we have to print a form // to modify them -echo $OUTPUT->header($focus); +echo $OUTPUT->header(); if (!empty($SITE->fullname) and !empty($SITE->shortname)) { echo $OUTPUT->box(get_string('upgradesettingsintro','admin'), 'generalbox'); diff --git a/admin/webservice/forms.php b/admin/webservice/forms.php index 4f15173f35c2f..4f5d837c380c5 100644 --- a/admin/webservice/forms.php +++ b/admin/webservice/forms.php @@ -196,8 +196,12 @@ function definition() { //we add the descriptions to the functions foreach ($functions as $functionid => $functionname) { //retrieve full function information (including the description) - $function = \core_external\external_api::external_function_info($functionname); - if (empty($function->deprecated)) { + try { + $function = \core_external\external_api::external_function_info($functionname); + } catch (Throwable $exception) { + $function = null; + } + if ($function !== null && empty($function->deprecated)) { $functions[$functionid] = $function->name . ':' . $function->description; } else { // Exclude the deprecated ones. diff --git a/ai/amd/build/helper.min.js b/ai/amd/build/helper.min.js index cf0c839a2eac8..dd52a6af2d3b6 100644 --- a/ai/amd/build/helper.min.js +++ b/ai/amd/build/helper.min.js @@ -6,6 +6,6 @@ define("core_ai/helper",["exports"],(function(_exports){Object.defineProperty(_e * @copyright 2024 Huong Nguyen
").replace(/\n/g,"
");return"".concat(textWithBreaks,"
")}static replaceMarkdown(text){return text.replace(/\*\*(.*?)\*\*/g,"$1")}static formatResponse(text){let formattedText=this.replaceLineBreaks(text);return formattedText=this.replaceMarkdown(formattedText),formattedText}},_exports.default})); +class{static replaceLineBreaks(text){const textWithBreaks=text.replace(/(\r\n|\n|
");return"".concat(textWithBreaks,"
")}static replaceMarkdown(text){return text.replace(/\*\*(.*?)\*\*/g,"$1")}static formatResponse(text){let formattedText=this.replaceLineBreaks(text);return formattedText=this.replaceMarkdown(formattedText),formattedText}},_exports.default})); //# sourceMappingURL=helper.min.js.map \ No newline at end of file diff --git a/ai/amd/build/helper.min.js.map b/ai/amd/build/helper.min.js.map index d5beb92088569..967f069fa72c2 100644 --- a/ai/amd/build/helper.min.js.map +++ b/ai/amd/build/helper.min.js.map @@ -1 +1 @@ -{"version":3,"file":"helper.min.js","sources":["../src/helper.js"],"sourcesContent":["// This file is part of Moodle - http://moodle.org/\n//\n// Moodle is free software: you can redistribute it and/or modify\n// it under the terms of the GNU General Public License as published by\n// the Free Software Foundation, either version 3 of the License, or\n// (at your option) any later version.\n//\n// Moodle is distributed in the hope that it will be useful,\n// but WITHOUT ANY WARRANTY; without even the implied warranty of\n// MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the\n// GNU General Public License for more details.\n//\n// You should have received a copy of the GNU General Public License\n// along with Moodle. If not, see
and withfor paragraphs.\n * This is to handle the difference in response from the AI to what is expected by the editor.\n *\n * @param {String} text The text to replace.\n * @returns {String}\n */\n static replaceLineBreaks(text) {\n // Replace double line breaks with
for paragraphs\n const textWithParagraphs = text.replace(/\\n{2,}|\\r\\n/g, '
');\n\n // Replace remaining single line breaks with
tags\n const textWithBreaks = textWithParagraphs.replace(/\\n/g, '
');\n\n // Add opening and closingtags to wrap the entire content\n return `
${textWithBreaks}
`;\n }\n\n /**\n * Replace markdown formatting.\n * Even when asked not to, AI models will sometimes return markdown.\n *\n * @param {String} text The text to replace.\n * @returns {String}\n */\n static replaceMarkdown(text) {\n // Replace markdown bold formatting HTML equivalent.\n const textWithMarkdown = text.replace(/\\*\\*(.*?)\\*\\*/g, '$1');\n\n return textWithMarkdown;\n }\n\n /**\n * Format the response provided by the AI model.\n *\n * @param {String} text The text to format.\n * @returns {String}\n */\n static formatResponse(text) {\n let formattedText = this.replaceLineBreaks(text) ;\n formattedText = this.replaceMarkdown(formattedText);\n\n return formattedText;\n }\n}\n"],"names":["text","textWithBreaks","replace","formattedText","this","replaceLineBreaks","replaceMarkdown"],"mappings":";;;;;;;;+BA8B6BA,YAKfC,eAHqBD,KAAKE,QAAQ,eAAgB,cAGdA,QAAQ,MAAO,4BAG5CD,8CAUMD,aAEMA,KAAKE,QAAQ,iBAAkB,6CAWtCF,UACdG,cAAgBC,KAAKC,kBAAkBL,aAC3CG,cAAgBC,KAAKE,gBAAgBH,eAE9BA"} \ No newline at end of file +{"version":3,"file":"helper.min.js","sources":["../src/helper.js"],"sourcesContent":["// This file is part of Moodle - http://moodle.org/\n//\n// Moodle is free software: you can redistribute it and/or modify\n// it under the terms of the GNU General Public License as published by\n// the Free Software Foundation, either version 3 of the License, or\n// (at your option) any later version.\n//\n// Moodle is distributed in the hope that it will be useful,\n// but WITHOUT ANY WARRANTY; without even the implied warranty of\n// MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the\n// GNU General Public License for more details.\n//\n// You should have received a copy of the GNU General Public License\n// along with Moodle. If not, see
and withfor paragraphs.\n * This is to handle the difference in response from the AI to what is expected by the editor.\n *\n * @param {String} text The text to replace.\n * @returns {String}\n */\n static replaceLineBreaks(text) {\n // Normalise double line breaks\n const textWithParagraphs = text.replace(/(\\r\\n|\\n|
tags\n const textWithBreaks = textWithParagraphs.replace(/\\n/g, '
');\n\n // Add opening and closingtags to wrap the entire content\n return `
${textWithBreaks}
`;\n }\n\n /**\n * Replace markdown formatting.\n * Even when asked not to, AI models will sometimes return markdown.\n *\n * @param {String} text The text to replace.\n * @returns {String}\n */\n static replaceMarkdown(text) {\n // Replace markdown bold formatting HTML equivalent.\n const textWithMarkdown = text.replace(/\\*\\*(.*?)\\*\\*/g, '$1');\n\n return textWithMarkdown;\n }\n\n /**\n * Format the response provided by the AI model.\n *\n * @param {String} text The text to format.\n * @returns {String}\n */\n static formatResponse(text) {\n let formattedText = this.replaceLineBreaks(text) ;\n formattedText = this.replaceMarkdown(formattedText);\n\n return formattedText;\n }\n}\n"],"names":["text","textWithBreaks","replace","formattedText","this","replaceLineBreaks","replaceMarkdown"],"mappings":";;;;;;;;+BA8B6BA,YAKfC,eAHqBD,KAAKE,QAAQ,4BAA6B,MAG3BA,QAAQ,MAAO,iCAG5CD,8CAUMD,aAEMA,KAAKE,QAAQ,iBAAkB,6CAWtCF,UACdG,cAAgBC,KAAKC,kBAAkBL,aAC3CG,cAAgBC,KAAKE,gBAAgBH,eAE9BA"} \ No newline at end of file diff --git a/ai/amd/src/helper.js b/ai/amd/src/helper.js index 64389a62e75cb..f7e5c45c49b92 100644 --- a/ai/amd/src/helper.js +++ b/ai/amd/src/helper.js @@ -29,11 +29,11 @@ export default class AIHelper { * @returns {String} */ static replaceLineBreaks(text) { - // Replace double line breaks withfor paragraphs - const textWithParagraphs = text.replace(/\n{2,}|\r\n/g, '
'); + // Normalise double line breaks + const textWithParagraphs = text.replace(/(\r\n|\n|
tags - const textWithBreaks = textWithParagraphs.replace(/\n/g, '
'); + const textWithBreaks = textWithParagraphs.replace(/\n/g, '
'); // Add opening and closingtags to wrap the entire content return `
${textWithBreaks}
`; diff --git a/ai/configure.php b/ai/configure.php index 50b787a6f761c..9f9e8141f7ec3 100644 --- a/ai/configure.php +++ b/ai/configure.php @@ -72,6 +72,12 @@ $PAGE->set_title($title); $PAGE->set_heading($title); +// Explode if there are no provider plugins installed. +$plugins = core_plugin_manager::instance()->get_plugins_of_type('aiprovider'); +if (empty($plugins)) { + throw new moodle_exception('noproviderplugins', 'core_ai'); +} + // Provider instance form processing. $mform = new \core_ai\form\ai_provider_form(customdata: $data); if ($mform->is_cancelled()) { diff --git a/ai/placement/courseassist/classes/external/explain_text.php b/ai/placement/courseassist/classes/external/explain_text.php index 136d2db2c4c65..abb12c205b74c 100644 --- a/ai/placement/courseassist/classes/external/explain_text.php +++ b/ai/placement/courseassist/classes/external/explain_text.php @@ -92,10 +92,11 @@ public static function execute( // Send the action to the AI manager. $manager = \core\di::get(\core_ai\manager::class); $response = $manager->process_action($action); + $generatedcontent = $response->get_response_data()['generatedcontent'] ?? ''; // Return the response. return [ 'success' => $response->get_success(), - 'generatedcontent' => $response->get_response_data()['generatedcontent'] ?? '', + 'generatedcontent' => \core_external\util::format_text($generatedcontent, FORMAT_PLAIN, $contextid)[0], 'finishreason' => $response->get_response_data()['finishreason'] ?? '', 'errorcode' => $response->get_errorcode(), 'error' => $response->get_errormessage(), diff --git a/ai/placement/courseassist/classes/external/summarise_text.php b/ai/placement/courseassist/classes/external/summarise_text.php index b0397fa5a1516..00200abfac901 100644 --- a/ai/placement/courseassist/classes/external/summarise_text.php +++ b/ai/placement/courseassist/classes/external/summarise_text.php @@ -92,10 +92,11 @@ public static function execute( // Send the action to the AI manager. $manager = \core\di::get(\core_ai\manager::class); $response = $manager->process_action($action); + $generatedcontent = $response->get_response_data()['generatedcontent'] ?? ''; // Return the response. return [ 'success' => $response->get_success(), - 'generatedcontent' => $response->get_response_data()['generatedcontent'] ?? '', + 'generatedcontent' => \core_external\util::format_text($generatedcontent, FORMAT_PLAIN, $contextid)[0], 'finishreason' => $response->get_response_data()['finishreason'] ?? '', 'errorcode' => $response->get_errorcode(), 'error' => $response->get_errormessage(), diff --git a/ai/provider/ollama/classes/abstract_processor.php b/ai/provider/ollama/classes/abstract_processor.php index 1127d6eb0de35..2f6637ed23211 100644 --- a/ai/provider/ollama/classes/abstract_processor.php +++ b/ai/provider/ollama/classes/abstract_processor.php @@ -152,7 +152,7 @@ protected function handle_api_error(ResponseInterface $response): array { $responsearr['errormessage'] = $response->getReasonPhrase(); } else { $bodyobj = json_decode($response->getBody()->getContents()); - $responsearr['errormessage'] = $bodyobj->error->message; + $responsearr['errormessage'] = $bodyobj->error; } return $responsearr; diff --git a/ai/provider/ollama/classes/provider.php b/ai/provider/ollama/classes/provider.php index ef17f88282930..4284681cca740 100644 --- a/ai/provider/ollama/classes/provider.php +++ b/ai/provider/ollama/classes/provider.php @@ -55,7 +55,7 @@ public static function get_action_settings( #[\Override] public function add_authentication_headers(RequestInterface $request): RequestInterface { - if (empty($this->config['basicauthenabled'])) { + if (empty($this->config['enablebasicauth'])) { return $request; } else { // Add the Authorization header for basic auth. diff --git a/ai/provider/ollama/tests/process_explain_text_test.php b/ai/provider/ollama/tests/process_explain_text_test.php index f0f6df51575cd..cbea44b583f9e 100644 --- a/ai/provider/ollama/tests/process_explain_text_test.php +++ b/ai/provider/ollama/tests/process_explain_text_test.php @@ -151,12 +151,21 @@ public function test_handle_api_error(): void { $responses = [ 500 => new Response(500, ['Content-Type' => 'application/json']), 503 => new Response(503, ['Content-Type' => 'application/json']), - 401 => new Response(401, ['Content-Type' => 'application/json'], - '{"error": {"message": "Invalid Authentication"}}'), - 404 => new Response(404, ['Content-Type' => 'application/json'], - '{"error": {"message": "You must be a member of an organization to use the API"}}'), - 429 => new Response(429, ['Content-Type' => 'application/json'], - '{"error": {"message": "Rate limit reached for requests"}}'), + 401 => new Response( + 401, + ['Content-Type' => 'application/json'], + json_encode(['error' => 'Invalid Authentication']), + ), + 404 => new Response( + 404, + ['Content-Type' => 'application/json'], + json_encode(['error' => 'You must be a member of an organization to use the API']), + ), + 429 => new Response( + 429, + ['Content-Type' => 'application/json'], + json_encode(['error' => 'Rate limit reached for requests']), + ), ]; $processor = new process_explain_text($this->provider, $this->action); @@ -316,7 +325,7 @@ public function test_process_error(): void { $mock->append(new Response( 401, ['Content-Type' => 'application/json'], - json_encode(['error' => ['message' => 'Invalid Authentication']]), + json_encode(['error' => 'Invalid Authentication']), )); $processor = new process_explain_text($this->provider, $this->action); diff --git a/ai/provider/ollama/tests/process_generate_text_test.php b/ai/provider/ollama/tests/process_generate_text_test.php index 5e3956f64304b..836b81ab93f0d 100644 --- a/ai/provider/ollama/tests/process_generate_text_test.php +++ b/ai/provider/ollama/tests/process_generate_text_test.php @@ -153,17 +153,17 @@ public function test_handle_api_error(): void { 401 => new Response( 401, ['Content-Type' => 'application/json'], - json_encode(['error' => ['message' => 'Invalid Authentication']]), + json_encode(['error' => 'Invalid Authentication']), ), 404 => new Response( 404, ['Content-Type' => 'application/json'], - json_encode(['error' => ['message' => 'You must be a member of an organization to use the API']]), + json_encode(['error' => 'You must be a member of an organization to use the API']), ), 429 => new Response( 429, ['Content-Type' => 'application/json'], - json_encode(['error' => ['message' => 'Rate limit reached for requests']]), + json_encode(['error' => 'Rate limit reached for requests']), ), ]; @@ -325,7 +325,7 @@ public function test_process_error(): void { $mock->append(new Response( 401, ['Content-Type' => 'application/json'], - json_encode(['error' => ['message' => 'Invalid Authentication']]), + json_encode(['error' => 'Invalid Authentication']), )); $processor = new process_generate_text($this->provider, $this->action); diff --git a/ai/provider/ollama/tests/process_summarise_text_test.php b/ai/provider/ollama/tests/process_summarise_text_test.php index c7f0cd1fa34ef..e1377f7e5b9ae 100644 --- a/ai/provider/ollama/tests/process_summarise_text_test.php +++ b/ai/provider/ollama/tests/process_summarise_text_test.php @@ -151,12 +151,21 @@ public function test_handle_api_error(): void { $responses = [ 500 => new Response(500, ['Content-Type' => 'application/json']), 503 => new Response(503, ['Content-Type' => 'application/json']), - 401 => new Response(401, ['Content-Type' => 'application/json'], - '{"error": {"message": "Invalid Authentication"}}'), - 404 => new Response(404, ['Content-Type' => 'application/json'], - '{"error": {"message": "You must be a member of an organization to use the API"}}'), - 429 => new Response(429, ['Content-Type' => 'application/json'], - '{"error": {"message": "Rate limit reached for requests"}}'), + 401 => new Response( + 401, + ['Content-Type' => 'application/json'], + json_encode(['error' => 'Invalid Authentication']), + ), + 404 => new Response( + 404, + ['Content-Type' => 'application/json'], + json_encode(['error' => 'You must be a member of an organization to use the API']), + ), + 429 => new Response( + 429, + ['Content-Type' => 'application/json'], + json_encode(['error' => 'Rate limit reached for requests']), + ), ]; $processor = new process_summarise_text($this->provider, $this->action); @@ -316,7 +325,7 @@ public function test_process_error(): void { $mock->append(new Response( 401, ['Content-Type' => 'application/json'], - json_encode(['error' => ['message' => 'Invalid Authentication']]), + json_encode(['error' => 'Invalid Authentication']), )); $processor = new process_summarise_text($this->provider, $this->action); diff --git a/ai/provider/openai/UPGRADING.md b/ai/provider/openai/UPGRADING.md new file mode 100644 index 0000000000000..d3fbe1bc22775 --- /dev/null +++ b/ai/provider/openai/UPGRADING.md @@ -0,0 +1,20 @@ +# aiprovider_openai Upgrade notes + +## 5.0.7 + +### Added + +- A new `aiprovider_openai\aimodel\openai_image_base` interface has been added. Image generation model classes must now implement this interface to declare their `response_format`, `output_format`, size, and quality mappings. Existing custom model classes that handle image generation should implement this interface to ensure correct API parameters are sent. + + For more information see [MDL-85352](https://tracker.moodle.org/browse/MDL-85352) +- A new `gptimage1` model class has been added to support gpt-image-1.5. + This model uses `output_format=png` instead of `response_format`, and maps Moodle quality values to the values expected by the API: 'standard' maps to 'medium' and 'hd' maps to 'high'. + + For more information see [MDL-85352](https://tracker.moodle.org/browse/MDL-85352) + +### Changed + +- The `dalle3` model class now implements `openai_image_base` and switches from returning a URL to returning `response_format=b64_json`. + The image is now decoded directly from the API response instead of being downloaded via a second HTTP request. Size and quality logic has been moved into the model class. + + For more information see [MDL-85352](https://tracker.moodle.org/browse/MDL-85352) diff --git a/ai/provider/openai/classes/aimodel/dalle3.php b/ai/provider/openai/classes/aimodel/dalle3.php index 93d5d918e6d9d..55281140b460a 100644 --- a/ai/provider/openai/classes/aimodel/dalle3.php +++ b/ai/provider/openai/classes/aimodel/dalle3.php @@ -25,8 +25,7 @@ * @copyright 2025 Huong NguyenSpecify the format that the password field is using.
Use \'internal\' if you want the external database to manage usernames and email addresses, but Moodle to manage passwords. If you use \'internal\', you must provide a populated email address field in the external database, and you must enable the \auth_db\task\sync_users scheduled task. Moodle will send an email to new users with a temporary password.
'; @@ -65,7 +65,7 @@ $string['auth_dbupdateusers_description'] = 'As well as inserting new users, update existing users.'; $string['auth_dbupdatinguser'] = 'Updating user {$a->name} id {$a->id}'; $string['auth_dbuser'] = 'Username with read access to the database'; -$string['auth_dbuser_key'] = 'DB user'; +$string['auth_dbuser_key'] = 'Database user'; $string['auth_dbuserstoadd'] = 'User entries to add: {$a}'; $string['auth_dbuserstoremove'] = 'User entries to remove: {$a}'; $string['auth_dbnoexttable'] = 'External table not specified.'; diff --git a/auth/db/settings.php b/auth/db/settings.php index 54f3450eb0a1f..cfb9a9a184338 100644 --- a/auth/db/settings.php +++ b/auth/db/settings.php @@ -54,15 +54,11 @@ new lang_string('auth_dbtype_key', 'auth_db'), new lang_string('auth_dbtype', 'auth_db'), 'mysqli', $dboptions)); - // Sybase quotes. $yesno = array( new lang_string('no'), new lang_string('yes'), ); - $settings->add(new admin_setting_configselect('auth_db/sybasequoting', - new lang_string('auth_dbsybasequoting', 'auth_db'), new lang_string('auth_dbsybasequotinghelp', 'auth_db'), 0, $yesno)); - // DB Name. $settings->add(new admin_setting_configtext('auth_db/name', get_string('auth_dbname_key', 'auth_db'), get_string('auth_dbname', 'auth_db'), '', PARAM_RAW_TRIMMED)); diff --git a/auth/db/tests/db_test.php b/auth/db/tests/db_test.php index 8c7de967a5e6f..c9c0708fffe6b 100644 --- a/auth/db/tests/db_test.php +++ b/auth/db/tests/db_test.php @@ -70,7 +70,6 @@ protected function init_auth_database() { case 'mysql': set_config('type', 'mysqli', 'auth_db'); set_config('setupsql', "SET NAMES 'UTF-8'", 'auth_db'); - set_config('sybasequoting', '0', 'auth_db'); if (!empty($CFG->dboptions['dbsocket'])) { $dbsocket = $CFG->dboptions['dbsocket']; if ((strpos($dbsocket, '/') === false and strpos($dbsocket, '\\') === false)) { @@ -87,7 +86,6 @@ protected function init_auth_database() { $setupsql .= "; SET search_path = '".$CFG->dboptions['dbschema']."'"; } set_config('setupsql', $setupsql, 'auth_db'); - set_config('sybasequoting', '0', 'auth_db'); if (!empty($CFG->dboptions['dbsocket']) and ($CFG->dbhost === 'localhost' or $CFG->dbhost === '127.0.0.1')) { if (strpos($CFG->dboptions['dbsocket'], '/') !== false) { $socket = $CFG->dboptions['dbsocket']; @@ -103,7 +101,6 @@ protected function init_auth_database() { case 'mssql': set_config('type', 'mssqlnative', 'auth_db'); - set_config('sybasequoting', '1', 'auth_db'); // The native sqlsrv driver uses a comma as separator between host and port. $dbhost = $CFG->dbhost; diff --git a/auth/db/version.php b/auth/db/version.php index 3fa6ad96a03e4..c49f366ad6704 100644 --- a/auth/db/version.php +++ b/auth/db/version.php @@ -24,6 +24,6 @@ defined('MOODLE_INTERNAL') || die(); -$plugin->version = 2025041400; // The current plugin version (Date: YYYYMMDDXX). +$plugin->version = 2025041401; // The current plugin version (Date: YYYYMMDDXX). $plugin->requires = 2025040800; // Requires this Moodle version. $plugin->component = 'auth_db'; // Full name of the plugin (used for diagnostics) diff --git a/auth/email/auth.php b/auth/email/auth.php index 09805d9ee9859..ddfb7515b3d55 100644 --- a/auth/email/auth.php +++ b/auth/email/auth.php @@ -171,7 +171,7 @@ function can_confirm() { * @param string $confirmsecret */ function user_confirm($username, $confirmsecret) { - global $DB, $SESSION; + global $DB; $user = get_complete_user_data('username', $username); if (!empty($user)) { @@ -179,17 +179,15 @@ function user_confirm($username, $confirmsecret) { return AUTH_CONFIRM_ERROR; } else if ($user->secret === $confirmsecret && $user->confirmed) { + // Clean up stale wantsurl preference if user clicks confirmation link again. + unset_user_preference('auth_email_wantsurl', $user); return AUTH_CONFIRM_ALREADY; } else if ($user->secret === $confirmsecret) { // They have provided the secret key to get in $DB->set_field("user", "confirmed", 1, array("id"=>$user->id)); - - if ($wantsurl = get_user_preferences('auth_email_wantsurl', false, $user)) { - // Ensure user gets returned to page they were trying to access before signing up. - $SESSION->wantsurl = $wantsurl; - unset_user_preference('auth_email_wantsurl', $user); - } - + // Clean up the wantsurl preference regardless of how confirmation was triggered + // (e.g. /login/confirm.php, admin single confirm, bulk confirm, web service). + unset_user_preference('auth_email_wantsurl', $user); return AUTH_CONFIRM_OK; } } else { diff --git a/auth/email/tests/auth_test.php b/auth/email/tests/auth_test.php new file mode 100644 index 0000000000000..0e69a1333f9c0 --- /dev/null +++ b/auth/email/tests/auth_test.php @@ -0,0 +1,96 @@ +. + +namespace auth_email; + +/** + * Tests for email authentication plugin. + * + * @package auth_email + * @copyright 2026 Moodle Pty Ltd + * @license http://www.gnu.org/copyleft/gpl.html GNU GPL v3 or later + * @covers \auth_plugin_email + */ +final class auth_test extends \advanced_testcase { + /** + * Test that user_confirm() cleans up the auth_email_wantsurl preference + * when confirming a user for the first time (AUTH_CONFIRM_OK). + */ + public function test_user_confirm_cleans_up_wantsurl_preference(): void { + global $DB; + $this->resetAfterTest(true); + + // Create an unconfirmed user with the email auth method. + $user = $this->getDataGenerator()->create_user([ + 'auth' => 'email', + 'confirmed' => 0, + ]); + $secret = random_string(15); + $DB->set_field('user', 'secret', $secret, ['id' => $user->id]); + + // Simulate the wantsurl preference saved at signup time. + set_user_preference('auth_email_wantsurl', 'https://example.com/course/view.php?id=42', $user); + $this->assertTrue( + $DB->record_exists('user_preferences', ['userid' => $user->id, 'name' => 'auth_email_wantsurl']), + 'Preference should exist in DB before confirmation.' + ); + + $auth = get_auth_plugin('email'); + $result = $auth->user_confirm($user->username, $secret); + + $this->assertEquals(AUTH_CONFIRM_OK, $result); + $this->assertFalse( + $DB->record_exists('user_preferences', ['userid' => $user->id, 'name' => 'auth_email_wantsurl']), + 'auth_email_wantsurl preference must be removed from DB after successful confirmation.' + ); + } + + /** + * Test that user_confirm() cleans up the auth_email_wantsurl preference + * even when the user is already confirmed (AUTH_CONFIRM_ALREADY). + * + * This covers the edge case where a user clicks the confirmation link + * a second time — the stale preference should still be cleaned up. + */ + public function test_user_confirm_already_confirmed_cleans_up_wantsurl_preference(): void { + global $DB; + $this->resetAfterTest(true); + + // Create an already-confirmed user with the email auth method. + $user = $this->getDataGenerator()->create_user([ + 'auth' => 'email', + 'confirmed' => 1, + ]); + $secret = random_string(15); + $DB->set_field('user', 'secret', $secret, ['id' => $user->id]); + + // Simulate a stale wantsurl preference left over from signup. + set_user_preference('auth_email_wantsurl', 'https://example.com/course/view.php?id=42', $user); + $this->assertTrue( + $DB->record_exists('user_preferences', ['userid' => $user->id, 'name' => 'auth_email_wantsurl']), + 'Preference should exist in DB before re-confirmation.' + ); + + $auth = get_auth_plugin('email'); + $result = $auth->user_confirm($user->username, $secret); + + $this->assertEquals(AUTH_CONFIRM_ALREADY, $result); + $this->assertFalse( + $DB->record_exists('user_preferences', ['userid' => $user->id, 'name' => 'auth_email_wantsurl']), + 'auth_email_wantsurl preference must be removed from DB even when user is already confirmed.' + ); + } +} diff --git a/auth/ldap/lang/en/auth_ldap.php b/auth/ldap/lang/en/auth_ldap.php index 67fa20571efbe..748906cfd7e09 100644 --- a/auth/ldap/lang/en/auth_ldap.php +++ b/auth/ldap/lang/en/auth_ldap.php @@ -36,7 +36,7 @@ $string['auth_ldap_create_context'] = 'If you enable user creation with email confirmation, specify the context where users are created. This context should be different from other users to prevent security issues. You don\'t need to add this context to ldap_context-variable, Moodle will search for users from this context automatically.
Note! You have to modify the method user_create() in file auth/ldap/auth.php to make user creation work'; $string['auth_ldap_create_context_key'] = 'Context for new users'; $string['auth_ldap_create_error'] = 'Error creating user in LDAP.'; -$string['auth_ldapdescription'] = 'This method provides authentication against an external LDAP server. If the given username and password are valid, Moodle creates a new user entry in its database. This plugin can read user attributes from LDAP and prefill wanted fields in Moodle. For following logins only the username and password are checked.'; +$string['auth_ldapdescription'] = 'This method provides authentication against an external Lightweight Directory Access Protocol (LDAP) server. If the given username and password are valid, Moodle creates a new user entry in its database. This plugin can read user attributes from LDAP and prefill wanted fields in Moodle. For following logins only the username and password are checked.'; $string['auth_ldap_expiration_desc'] = 'Select \'{$a->no}\' to disable expired password checking or \'{$a->ldapserver}\' to read the password expiry time directly from the LDAP server.'; $string['auth_ldap_expiration_key'] = 'Expiry'; $string['auth_ldap_expiration_warning_desc'] = 'Number of days before password expiry warning is issued.'; @@ -72,7 +72,7 @@ $string['auth_ldap_passtype'] = 'Specify the format of new or changed passwords in LDAP server.'; $string['auth_ldap_passtype_key'] = 'Password format'; $string['auth_ldap_passwdexpire_settings'] = 'LDAP password expiry settings'; -$string['auth_ldap_preventpassindb'] = 'Select yes to prevent passwords from being stored in Moodle\'s DB.'; +$string['auth_ldap_preventpassindb'] = 'Select yes to prevent passwords from being stored in Moodle\'s database.'; $string['auth_ldap_preventpassindb_key'] = 'Prevent password caching'; $string['auth_ldap_rolecontext'] = '{$a->localname} context'; $string['auth_ldap_rolecontext_help'] = 'LDAP context used to select for {$a->localname} mapping. Separate multiple groups with \';\'. Usually something like "cn={$a->shortname},ou=first-ou-with-role-groups,o=myorg; cn={$a->shortname},ou=second-ou-with-role-groups,o=myorg".'; @@ -93,13 +93,13 @@ $string['auth_ldap_usertypeundefined2'] = 'config.user_type not defined or function ldap_unixi2expirationtime does not support selected type!'; $string['auth_ldap_version'] = 'The version of the LDAP protocol your server is using.'; $string['auth_ldap_version_key'] = 'Version'; -$string['auth_ntlmsso'] = 'NTLM SSO'; -$string['auth_ntlmsso_enabled'] = 'Set to yes to attempt Single Sign On with the NTLM domain. Note that this requires additional setup on the server to work. For further details, see the documentation NTLM authentication.'; +$string['auth_ntlmsso'] = 'New Technology LAN Manager (NTLM) SSO'; +$string['auth_ntlmsso_enabled'] = 'Set to yes to attempt Single Sign-On (SSO) with the NTLM domain. Note that this requires additional setup on the server to work. For details, see the documentation NTLM authentication.'; $string['auth_ntlmsso_enabled_key'] = 'Enable'; $string['auth_ntlmsso_ie_fastpath'] = 'Set to enable the NTLM SSO fast path (bypasses certain steps if the client\'s browser is MS Internet Explorer).'; -$string['auth_ntlmsso_ie_fastpath_key'] = 'MS IE fast path?'; +$string['auth_ntlmsso_ie_fastpath_key'] = 'Microsoft Internet Explorer (MS IE) fast path'; $string['auth_ntlmsso_ie_fastpath_yesform'] = 'Yes, all other browsers use standard login form'; -$string['auth_ntlmsso_ie_fastpath_yesattempt'] = 'Yes, attempt NTLM other browsers'; +$string['auth_ntlmsso_ie_fastpath_yesattempt'] = 'Yes, attempt NTLM with other browsers'; $string['auth_ntlmsso_ie_fastpath_attempt'] = 'Attempt NTLM with all browsers'; $string['auth_ntlmsso_maybeinvalidformat'] = 'Unable to extract the username from the REMOTE_USER header. Is the configured format right?'; $string['auth_ntlmsso_missing_username'] = 'You need to specify at least %username% in the remote username format'; @@ -108,7 +108,7 @@ $string['auth_ntlmsso_subnet'] = 'If set, it will only attempt SSO with clients in this subnet. Format: xxx.xxx.xxx.xxx/bitmask. Separate multiple subnets with \',\' (comma).'; $string['auth_ntlmsso_subnet_key'] = 'Subnet'; $string['auth_ntlmsso_type_key'] = 'Authentication type'; -$string['auth_ntlmsso_type'] = 'The authentication method configured in the web server to authenticate the users (if in doubt, choose NTLM)'; +$string['auth_ntlmsso_type'] = 'The authentication method configured in the web server to authenticate the users. If in doubt, choose NTLM.'; $string['cannotmaprole'] = 'The role "{$a->rolename}" cannot be mapped because its short name "{$a->shortname}" is too long and/or contains hyphens. To allow it to be mapped, the short name needs to be reduced to a maximum of {$a->charlimit} characters and any hyphens removed. Edit the role'; $string['connectingldap'] = "Connecting to LDAP server...\n"; $string['connectingldapsuccess'] = "Connecting to your LDAP server was successful"; @@ -132,7 +132,7 @@ $string['ntlmsso_attempting'] = 'Attempting Single Sign On via NTLM...'; $string['ntlmsso_failed'] = 'Auto-login failed, try the normal login page...'; $string['ntlmsso_isdisabled'] = 'NTLM SSO is disabled.'; -$string['ntlmsso_unknowntype'] = 'Unknown ntlmsso type!'; +$string['ntlmsso_unknowntype'] = 'Unknown NTLM SSO type.'; $string['pagedresultsnotsupp'] = 'LDAP paged results not supported (either your PHP version lacks support, you have configured Moodle to use LDAP protocol version 2 or Moodle cannot contact your LDAP server to see if paged support is available.)'; $string['pagesize'] = 'Make sure this value is smaller than your LDAP server result set size limit (the maximum number of entries that can be returned in a single query)'; $string['pagesize_key'] = 'Page size'; @@ -145,8 +145,8 @@ $string['sync_updateuserchunk'] = 'Set this value to the number of users you want updated per transaction. Setting this to 0 will update all users in one transaction.'; $string['sync_updateuserchunk_key'] = 'Sync update users chunk size'; $string['systemrolemapping'] = 'System role mapping'; -$string['start_tls'] = 'Use regular LDAP service (port 389) with TLS encryption'; -$string['start_tls_key'] = 'Use TLS'; +$string['start_tls'] = 'Use regular LDAP service (port 389) with TLS encryption.'; +$string['start_tls_key'] = 'Use Transport Layer Security (TLS)'; $string['updateremfail'] = 'Error updating LDAP record. Error code: {$a->errno}; Error string: {$a->errstring}
Key ({$a->key}) - old moodle value: \'{$a->ouvalue}\' new value: \'{$a->nuvalue}\''; $string['updateremfailamb'] = 'Failed to update LDAP with ambiguous field {$a->key}; old moodle value: \'{$a->ouvalue}\', new value: \'{$a->nuvalue}\''; $string['updatepasserror'] = 'Error in user_update_password(). Error code: {$a->errno}; Error string: {$a->errstring}'; diff --git a/auth/lti/auth.php b/auth/lti/auth.php index c5e13fd5b459d..c621eda98f15a 100644 --- a/auth/lti/auth.php +++ b/auth/lti/auth.php @@ -104,6 +104,7 @@ public function user_login($username, $password) { * @param int $provisioningmode the desired account provisioning mode, which controls the auth flow for unbound users. * @param array $legacyconsumersecrets an array of secrets used by the legacy consumer if a migration claim exists. * @throws coding_exception if the specified provisioning mode is invalid. + * @throws \core\exception\moodle_exception if user authentication fails. */ public function complete_login(array $launchdata, moodle_url $returnurl, int $provisioningmode, array $legacyconsumersecrets = []): void { @@ -112,6 +113,19 @@ public function complete_login(array $launchdata, moodle_url $returnurl, int $pr if ($this->get_user_binding($launchdata['iss'], $launchdata['sub'])) { $user = $this->find_or_create_user_from_launch($launchdata); + if ($user->suspended) { + $failurereason = AUTH_LOGIN_SUSPENDED; + $event = \core\event\user_login_failed::create([ + 'userid' => $user->id, + 'other' => [ + 'username' => $user->username, + 'reason' => $failurereason + ] + ]); + $event->trigger(); + throw new \core\exception\moodle_exception('invalidlogin', 'core'); + } + if (isloggedin()) { // If a different user is currently logged in, authenticate the linked user instead. global $USER; diff --git a/auth/oauth2/classes/api.php b/auth/oauth2/classes/api.php index 1192b5f0bf9f1..c05768cedee68 100644 --- a/auth/oauth2/classes/api.php +++ b/auth/oauth2/classes/api.php @@ -197,9 +197,7 @@ public static function send_confirm_link_login_email($userinfo, $issuer, $userid $data->link = $confirmationurl->out(false); $message = get_string('confirmlinkedloginemail', 'auth_oauth2', $data); - - $data->link = $confirmationurl->out(); - $messagehtml = text_to_html(get_string('confirmlinkedloginemail', 'auth_oauth2', $data), false, false, true); + $messagehtml = text_to_html(get_string('confirmlinkedloginemail', 'auth_oauth2', $data), false, false); $user->mailformat = 1; // Always send HTML version as well. @@ -339,9 +337,7 @@ public static function send_confirm_account_email($userinfo, $issuer) { $data->link = $confirmationurl->out(false); $message = get_string('confirmaccountemail', 'auth_oauth2', $data); - - $data->link = $confirmationurl->out(); - $messagehtml = text_to_html(get_string('confirmaccountemail', 'auth_oauth2', $data), false, false, true); + $messagehtml = text_to_html(get_string('confirmaccountemail', 'auth_oauth2', $data), false, false); $user->mailformat = 1; // Always send HTML version as well. diff --git a/auth/oauth2/classes/auth.php b/auth/oauth2/classes/auth.php index d93e976b9c0c6..f2637e5aca6ab 100644 --- a/auth/oauth2/classes/auth.php +++ b/auth/oauth2/classes/auth.php @@ -467,18 +467,31 @@ public function complete_login(client $client, $redirecturl) { $mappeduser = get_complete_user_data('id', $linkedlogin->get('userid')); if ($mappeduser && $mappeduser->suspended) { - $failurereason = AUTH_LOGIN_SUSPENDED; - $event = \core\event\user_login_failed::create([ - 'userid' => $mappeduser->id, - 'other' => [ - 'username' => $userinfo['username'], - 'reason' => $failurereason - ] - ]); - $event->trigger(); - $SESSION->loginerrormsg = get_string('invalidlogin'); - $client->log_out(); - redirect(new moodle_url('/login/index.php')); + // Check if there's another user with the same email that is not suspended. + $moodleuser = \core_user::get_user_by_email($userinfo['email'], '*', null, IGNORE_MULTIPLE); + if ($moodleuser->id == $mappeduser->id) { + $failurereason = AUTH_LOGIN_SUSPENDED; + $event = \core\event\user_login_failed::create([ + 'userid' => $mappeduser->id, + 'other' => [ + 'username' => $userinfo['username'], + 'reason' => $failurereason, + ], + ]); + $event->trigger(); + $SESSION->loginerrormsg = get_string('invalidlogin'); + $client->log_out(); + redirect(new moodle_url('/login/index.php')); + } else if ($moodleuser && !$moodleuser->suspended) { + // Update the OAuth2 linked login to point to the active user account. + $linkedlogin->set('userid', $moodleuser->id); + $linkedlogin->set('timemodified', time()); + $linkedlogin->update(); + + // Update user fields and continue with login. + $userinfo = $this->update_user($userinfo, $moodleuser); + $userwasmapped = true; + } } else if ($mappeduser && ($mappeduser->confirmed || !$issuer->get('requireconfirmation'))) { // Update user fields. $userinfo = $this->update_user($userinfo, $mappeduser); @@ -508,7 +521,6 @@ public function complete_login(client $client, $redirecturl) { redirect(new moodle_url('/login/index.php')); } - if (!$issuer->is_valid_login_domain($oauthemail)) { // Trigger login failed event. $failurereason = AUTH_LOGIN_UNAUTHORISED; @@ -524,8 +536,24 @@ public function complete_login(client $client, $redirecturl) { if (!$userwasmapped) { // No defined mapping - we need to see if there is an existing account with the same email. + $moodleuser = \core_user::get_user_by_email($userinfo['email'], '*', null, IGNORE_MULTIPLE); + + // Ensure we don't link a login for a suspended user. + if (!empty($moodleuser) && $moodleuser->suspended) { + $failurereason = AUTH_LOGIN_SUSPENDED; + $event = \core\event\user_login_failed::create([ + 'userid' => $moodleuser->id, + 'other' => [ + 'username' => $userinfo['email'], + 'reason' => $failurereason, + ], + ]); + $event->trigger(); + $SESSION->loginerrormsg = get_string('invalidlogin'); + $client->log_out(); + redirect(new moodle_url('/login/index.php')); + } - $moodleuser = \core_user::get_user_by_email($userinfo['email']); if (!empty($moodleuser)) { if ($issuer->get('requireconfirmation')) { $PAGE->set_url('/auth/oauth2/confirm-link-login.php'); diff --git a/auth/oauth2/lang/en/auth_oauth2.php b/auth/oauth2/lang/en/auth_oauth2.php index 166cea78df4a0..4e942ac1e2b40 100644 --- a/auth/oauth2/lang/en/auth_oauth2.php +++ b/auth/oauth2/lang/en/auth_oauth2.php @@ -27,19 +27,14 @@ $string['auth_oauth2settings'] = 'OAuth 2 authentication settings.'; $string['confirmaccountemail'] = 'Hi {$a->firstname}, -A new account has been requested at \'{$a->sitename}\' -using your email address. +A new account has been requested at \'{$a->sitename}\' using your email address. -To confirm your new account, please go to this web address: +To confirm your new account, please click the link below: -{$a->link} +Confirm your account -In most mail programs, this should appear as a blue link -which you can just click on. If that doesn\'t work, -then cut and paste the address into the address -line at the top of your web browser window. -If you need help, please contact the site administrator, +If you need help, please contact the site administrator. {$a->admin} If you did not do this, someone else could be trying to compromise your account. @@ -53,16 +48,12 @@ {$a->linkedemail} to your account at \'{$a->sitename}\' using your email address. -To confirm this request and link these logins, please go to this web address: +To confirm this request and link these logins, please click the link below: -{$a->link} +Link your accounts -In most mail programs, this should appear as a blue link -which you can just click on. If that doesn\'t work, -then cut and paste the address into the address -line at the top of your web browser window. -If you need help, please contact the site administrator, +If you need help, please contact the site administrator. {$a->admin} If you did not do this, someone else could be trying to compromise your account. diff --git a/auth/oauth2/login.php b/auth/oauth2/login.php index 20b6c6d234c5f..c2d39169d3088 100644 --- a/auth/oauth2/login.php +++ b/auth/oauth2/login.php @@ -25,7 +25,7 @@ require_once('../../config.php'); $issuerid = required_param('id', PARAM_INT); -$wantsurl = optional_param('wantsurl', '', PARAM_URL); +$wantsurl = optional_param('wantsurl', '', PARAM_LOCALURL); $PAGE->set_context(context_system::instance()); $PAGE->set_url(new moodle_url('/auth/oauth2/login.php', ['id' => $issuerid])); diff --git a/auth/tests/behat/loginform.feature b/auth/tests/behat/loginform.feature index 2f6c37d7e2b3e..c356366826088 100644 --- a/auth/tests/behat/loginform.feature +++ b/auth/tests/behat/loginform.feature @@ -34,11 +34,13 @@ Feature: Test if the login form provides the correct feedback Scenario: Set logo for loginpage Given I log in as "admin" And I navigate to "Appearance > Logos" in site administration - And I upload "course/tests/fixtures/image.jpg" file to "Logo" filemanager + And I upload "lib/tests/fixtures/1.jpg" file to "Logo" filemanager + And I upload "lib/tests/fixtures/2.jpg" file to "Favicon" filemanager And I press "Save changes" And I log out And I follow "Log in" - Then "//img[@id='logoimage']" "xpath_element" should exist + Then "//img[@id='logoimage' and contains(@src, '/1.jpg')]" "xpath_element" should exist + And "//link[@rel='shortcut icon' and contains(@href, '/2.jpg')]" "xpath_element" should exist Scenario: Add a custom welcome message Given the following config values are set as admin: diff --git a/auth/tests/external/external_test.php b/auth/tests/external/external_test.php index 3aa3c459f6ee8..b07098fd4e37d 100644 --- a/auth/tests/external/external_test.php +++ b/auth/tests/external/external_test.php @@ -182,6 +182,7 @@ public function test_resend_confirmation_email_invalid_username(): void { $this->assertTrue($result['success']); $this->assertEmpty($result['warnings']); + set_config('protectusernames', 0); $_SERVER['HTTP_USER_AGENT'] = 'no browser'; // Hack around missing user agent in CLI scripts. $this->expectException('\moodle_exception'); $this->expectExceptionMessage('error/invalidlogin'); @@ -205,6 +206,7 @@ public function test_resend_confirmation_email_invalid_password(): void { $this->assertTrue($result['success']); $this->assertEmpty($result['warnings']); + set_config('protectusernames', 0); $_SERVER['HTTP_USER_AGENT'] = 'no browser'; // Hack around missing user agent in CLI scripts. $this->expectException('\moodle_exception'); $this->expectExceptionMessage('error/invalidlogin'); @@ -235,6 +237,13 @@ public function test_resend_confirmation_email_already_confirmed_user(): void { $result = external_api::clean_returnvalue(core_auth_external::confirm_user_returns(), $result); $this->assertTrue($result['success']); + // Keep protectusernames enabled so the call returns invalidlogin exception. + $this->expectException('\moodle_exception'); + $this->expectExceptionMessage('error/invalidlogin'); + core_auth_external::resend_confirmation_email($username, $password); + + // Now disable protectusernames and expect an exception. + set_config('protectusernames', 0); $this->expectException('\moodle_exception'); $this->expectExceptionMessage('error/alreadyconfirmed'); core_auth_external::resend_confirmation_email($username, $password); diff --git a/availability/classes/info.php b/availability/classes/info.php index 5f3fdff380225..a573374bfeaaa 100644 --- a/availability/classes/info.php +++ b/availability/classes/info.php @@ -746,7 +746,11 @@ function($matches) use($modinfo, $context) { $modulename = format_string($cm->get_name(), true, ['context' => $context]); // We make sure that we add a data attribute to the name so we can change it later if the // original module name changes. - if ($cm->has_view() && $cm->get_user_visible()) { + if ( + \course_modinfo::is_mod_type_visible_on_course($cm->modname) + && $cm->has_view() + && $cm->get_user_visible() + ) { // Help student by providing a link to the module which is preventing availability. return \html_writer::link($cm->get_url(), $modulename, ['data-cm-name-for' => $cm->id]); } else { diff --git a/availability/condition/completion/classes/condition.php b/availability/condition/completion/classes/condition.php index 2db6cca0c6cb1..37a4743f6d70a 100644 --- a/availability/condition/completion/classes/condition.php +++ b/availability/condition/completion/classes/condition.php @@ -294,9 +294,46 @@ private function load_course_structure(stdClass $course): void { } $lastcmid = $othercm->id; } - // Fill empty sections index. + + // Process delegated sections - modules inside delegated sections need their "previous" + // calculated relative to the parent subsection module, not from the broader course context. + $delegatedcms = $modinfo->get_sections_delegated_by_cm(); + foreach ($delegatedcms as $parentcmid => $delegatedsection) { + // The delegated section's "previous" is the activity before the parent subsection module. + if (isset($this->modfastprevious[$parentcmid])) { + $sectionprevious[$delegatedsection->id] = $this->modfastprevious[$parentcmid]; + } + + // Process modules inside the delegated section in sequence order. + // Note: Subsections do not support completion tracking (FEATURE_COMPLETION => false), + // so we inherit from the subsection's previous activity with completion. + $innerlastcmid = $this->modfastprevious[$parentcmid] ?? 0; + foreach ($delegatedsection->get_sequence_cm_infos() as $innercm) { + if ($innercm->deletioninprogress) { + continue; + } + // Clear any wrong value from main iteration - delegated section modules + // must only have their previous calculated within this delegated context. + unset($this->modfastprevious[$innercm->id]); + if (!isset($sectionprevious[$innercm->section])) { + $sectionprevious[$innercm->section] = $innerlastcmid; + } + if ($innerlastcmid) { + $this->modfastprevious[$innercm->id] = $innerlastcmid; + } + if ($innercm->completion != COMPLETION_TRACKING_NONE) { + $innerlastcmid = $innercm->id; + } + } + } + + // Fill empty regular sections index (reverse iteration). $isections = array_reverse($modinfo->get_section_info_all()); foreach ($isections as $section) { + // Skip delegated sections - they were handled above. + if ($section->is_delegated()) { + continue; + } if (isset($sectionprevious[$section->id])) { $lastcmid = $sectionprevious[$section->id]; } else { diff --git a/availability/condition/completion/tests/behat/availability_completion_previous.feature b/availability/condition/completion/tests/behat/availability_completion_previous.feature index 8dff21f5336f1..5e0880de12334 100644 --- a/availability/condition/completion/tests/behat/availability_completion_previous.feature +++ b/availability/condition/completion/tests/behat/availability_completion_previous.feature @@ -32,7 +32,7 @@ Feature: Confirm that availability_completion works with previous activity setti And I expand all fieldsets And I click on "Add restriction..." "button" And I click on "Activity completion" "button" in the "Add restriction..." "dialogue" - And I click on "Displayed if student doesn't meet this condition • Click to hide" "link" + And I click on "Item name displayed with access restriction information if student doesn't meet this condition • Click to hide" "link" And I set the field "Activity or resource" to "Previous activity with completion" And I press "Save and return to course" Then I should see "Not available unless: The previous activity with completion" in the "region-main" "region" @@ -58,7 +58,7 @@ Feature: Confirm that availability_completion works with previous activity setti And I expand all fieldsets And I click on "Add restriction..." "button" And I click on "Activity completion" "button" in the "Add restriction..." "dialogue" - And I click on "Displayed if student doesn't meet this condition • Click to hide" "link" + And I click on "Item name displayed with access restriction information if student doesn't meet this condition • Click to hide" "link" And I set the field "Activity or resource" to "Previous activity with completion" And I press "Save and return to course" Then I should see "Not available unless: The previous activity with completion" in the "region-main" "region" @@ -83,7 +83,7 @@ Feature: Confirm that availability_completion works with previous activity setti And I expand all fieldsets And I click on "Add restriction..." "button" And I click on "Activity completion" "button" in the "Add restriction..." "dialogue" - And I click on "Displayed if student doesn't meet this condition • Click to hide" "link" + And I click on "Item name displayed with access restriction information if student doesn't meet this condition • Click to hide" "link" And I set the field "Activity or resource" to "Previous activity with completion" And I press "Save and return to course" Then I should see "Not available unless: The previous activity with completion" in the "region-main" "region" @@ -112,7 +112,7 @@ Feature: Confirm that availability_completion works with previous activity setti And I expand all fieldsets And I click on "Add restriction..." "button" And I click on "Activity completion" "button" in the "Add restriction..." "dialogue" - And I click on "Displayed if student doesn't meet this condition • Click to hide" "link" + And I click on "Item name displayed with access restriction information if student doesn't meet this condition • Click to hide" "link" And I set the field "Activity or resource" to "Previous activity with completion" And I press "Save changes" Then I should see "Not available unless: The previous activity with completion" in the "region-main" "region" @@ -138,7 +138,7 @@ Feature: Confirm that availability_completion works with previous activity setti And I expand all fieldsets And I click on "Add restriction..." "button" And I click on "Activity completion" "button" in the "Add restriction..." "dialogue" - And I click on "Displayed if student doesn't meet this condition • Click to hide" "link" + And I click on "Item name displayed with access restriction information if student doesn't meet this condition • Click to hide" "link" Then the "Activity or resource" select box should not contain "Previous activity with completion" # Set Page2 restriction to Previous Activity with completion and delete Page1. @@ -148,7 +148,7 @@ Feature: Confirm that availability_completion works with previous activity setti And I expand all fieldsets And I click on "Add restriction..." "button" And I click on "Activity completion" "button" in the "Add restriction..." "dialogue" - And I click on "Displayed if student doesn't meet this condition • Click to hide" "link" + And I click on "Item name displayed with access restriction information if student doesn't meet this condition • Click to hide" "link" And I set the field "Activity or resource" to "Previous activity with completion" And I press "Save and return to course" Then I should see "Not available unless: The previous activity with completion" in the "region-main" "region" @@ -170,7 +170,7 @@ Feature: Confirm that availability_completion works with previous activity setti And I expand all fieldsets And I click on "Add restriction..." "button" And I click on "Activity completion" "button" in the "Add restriction..." "dialogue" - And I click on "Displayed if student doesn't meet this condition • Click to hide" "link" + And I click on "Item name displayed with access restriction information if student doesn't meet this condition • Click to hide" "link" And I set the field "Activity or resource" to "Previous activity with completion" And I press "Save changes" Then I should see "Not available unless: The previous activity with completion" in the "region-main" "region" @@ -184,7 +184,7 @@ Feature: Confirm that availability_completion works with previous activity setti And I expand all fieldsets And I click on "Add restriction..." "button" And I click on "Activity completion" "button" in the "Add restriction..." "dialogue" - And I click on "Displayed if student doesn't meet this condition • Click to hide" "link" + And I click on "Item name displayed with access restriction information if student doesn't meet this condition • Click to hide" "link" And I set the field "Activity or resource" to "Previous activity with completion" And I press "Save changes" And I should see "Not available unless: The previous activity with completion" in the "region-main" "region" diff --git a/availability/condition/completion/tests/condition_test.php b/availability/condition/completion/tests/condition_test.php index 6524da69840f8..dc49d74ca86f1 100644 --- a/availability/condition/completion/tests/condition_test.php +++ b/availability/condition/completion/tests/condition_test.php @@ -798,4 +798,155 @@ public function test_update_dependency_id(): void { $after = $cond->save(); $this->assertEquals(condition::OPTION_PREVIOUS, $after->cm); } + + /** + * Data provider for subsection previous activity tests. + * + * Each test case has: + * - testtype: What to test (subsection, first_activity, second_activity, delegated_section) + * - activity: Which activity to test (key in $activities array) + * - expectedprevious: Key of the expected previous activity + * + * @return array[] + */ + public static function subsection_previous_activity_data(): array { + return [ + 'Subsection previous activity' => [ + 'testtype' => 'subsection', + 'activity' => 'subsection', + 'expectedprevious' => 'assigna1', + ], + 'First activity inside subsection inherits parent previous' => [ + 'testtype' => 'first_activity', + 'activity' => 'assigna2', + 'expectedprevious' => 'assigna1', + ], + 'Second activity inside subsection references sibling' => [ + 'testtype' => 'second_activity', + 'activity' => 'assigna3', + 'expectedprevious' => 'assigna2', + ], + 'Delegated section previous for section restriction' => [ + 'testtype' => 'delegated_section', + 'activity' => 'delegated_section', + 'expectedprevious' => 'assigna1', + ], + ]; + } + + /** + * Test previous activity with completion in subsection context. + * + * Course structure: + * Section A: + * - Assignment A1 (completion ON) + * - Subsection + * - Assignment A2 (completion ON) + * - Assignment A3 (no completion) + * Section B: + * - Assignment B1 (completion ON) + * + * @param string $testtype Test type + * @param string $activity Activity key + * @param string $expectedprevious Expected previous activity key + * @dataProvider subsection_previous_activity_data + * @covers \availability_completion\condition::load_course_structure + */ + public function test_subsection_previous_activity_context( + string $testtype, + string $activity, + string $expectedprevious + ): void { + global $CFG; + $this->resetAfterTest(); + $this->setAdminUser(); + + $CFG->enablecompletion = true; + $CFG->enableavailability = true; + + $generator = $this->getDataGenerator(); + $course = $generator->create_course(['enablecompletion' => 1, 'numsections' => 2]); + + // Section A: Assignment A1 (completion ON), Subsection. + $assigna1 = $generator->create_module('assign', [ + 'course' => $course->id, + 'name' => 'Assignment A1', + 'section' => 1, + 'completion' => COMPLETION_TRACKING_MANUAL, + ]); + + $subsection = $generator->create_module('subsection', [ + 'course' => $course->id, + 'section' => 1, + ]); + + // Section B: Assignment B1 (completion ON) - should not be referenced. + $assignb1 = $generator->create_module('assign', [ + 'course' => $course->id, + 'name' => 'Assignment B1', + 'section' => 2, + 'completion' => COMPLETION_TRACKING_MANUAL, + ]); + + // Get the delegated section and add activities inside. + $modinfo = get_fast_modinfo($course); + $subsectioncm = $modinfo->get_cm($subsection->cmid); + $delegatedsection = $subsectioncm->get_delegated_section_info(); + $this->assertNotNull($delegatedsection); + + // Inside subsection: Assignment A2 (completion ON), Assignment A3 (no completion). + $assigna2 = $generator->create_module('assign', [ + 'course' => $course->id, + 'name' => 'Assignment A2', + 'section' => $delegatedsection->section, + 'completion' => COMPLETION_TRACKING_MANUAL, + ]); + + $assigna3 = $generator->create_module('assign', [ + 'course' => $course->id, + 'name' => 'Assignment A3', + 'section' => $delegatedsection->section, + 'completion' => COMPLETION_TRACKING_NONE, + ]); + + // Rebuild modinfo. + $modinfo = get_fast_modinfo($course); + + // Build activity map for easy reference. + $activities = [ + 'assigna1' => $assigna1, + 'assigna2' => $assigna2, + 'assigna3' => $assigna3, + 'assignb1' => $assignb1, + 'subsection' => $subsection, + 'delegated_section' => $delegatedsection, + ]; + + $cond = new condition((object)[ + 'cm' => condition::OPTION_PREVIOUS, + 'e' => COMPLETION_COMPLETE, + ]); + + if ($testtype === 'delegated_section') { + // Test sectionfastprevious for section-level restrictions. + $ref = new \ReflectionMethod($cond, 'load_course_structure'); + $ref->invoke($cond, $course); + + $prop = new \ReflectionProperty($cond, 'sectionfastprevious'); + $sectionfastprevious = $prop->getValue($cond); + + $expectedcmid = $activities[$expectedprevious]->cmid; + $actualcmid = $sectionfastprevious[$activities['delegated_section']->id] ?? null; + $this->assertEquals($expectedcmid, $actualcmid); + } else { + // Test modfastprevious for module-level restrictions. + $testcmid = $testtype === 'subsection' + ? $activities['subsection']->cmid + : $activities[$activity]->cmid; + + $expectedcmid = $activities[$expectedprevious]->cmid; + $prevcmid = $cond->get_cmid($course, $testcmid, null); + $this->assertEquals($expectedcmid, $prevcmid); + } + } } diff --git a/availability/tests/behat/display_availability.feature b/availability/tests/behat/display_availability.feature index 9b6d943aade72..c0ce6dcd9f491 100644 --- a/availability/tests/behat/display_availability.feature +++ b/availability/tests/behat/display_availability.feature @@ -180,4 +180,4 @@ Feature: Display availability for activities and sections And I should not see "Date" in the "Restrict access" "fieldset" And I press "Add restriction..." And I click on "Grade" "button" in the "Add restriction..." "dialogue" - And the "alt" attribute of ".availability-item .availability-eye img" "css_element" should contain "Displayed if student" + And the "alt" attribute of ".availability-item .availability-eye img" "css_element" should contain "Item name displayed" diff --git a/availability/tests/behat/edit_availability.feature b/availability/tests/behat/edit_availability.feature index b7d18668ce2ba..243a445edc060 100644 --- a/availability/tests/behat/edit_availability.feature +++ b/availability/tests/behat/edit_availability.feature @@ -89,13 +89,13 @@ Feature: edit_availability And I should see "Date" in the "Restrict access" "fieldset" And ".availability-item .availability-eye img" "css_element" should be visible And ".availability-item .availability-delete img" "css_element" should be visible - And the "alt" attribute of ".availability-item .availability-eye img" "css_element" should contain "Displayed if student" + And the "alt" attribute of ".availability-item .availability-eye img" "css_element" should contain "Item name displayed" # Toggle the eye icon. When I click on ".availability-item .availability-eye img" "css_element" Then the "alt" attribute of ".availability-item .availability-eye img" "css_element" should contain "Hidden entirely" When I click on ".availability-item .availability-eye img" "css_element" - Then the "alt" attribute of ".availability-item .availability-eye img" "css_element" should contain "Displayed if student" + Then the "alt" attribute of ".availability-item .availability-eye img" "css_element" should contain "Item name displayed" # Click the delete button. When I click on ".availability-item .availability-delete img" "css_element" diff --git a/backup/moodle2/backup_stepslib.php b/backup/moodle2/backup_stepslib.php index 000ef84af8bdf..c3912662b9d57 100644 --- a/backup/moodle2/backup_stepslib.php +++ b/backup/moodle2/backup_stepslib.php @@ -2645,6 +2645,7 @@ protected function define_structure() { 'questioncategoryid', 'idnumber', 'ownerid', + 'nextversion', ]); $questionversions = new backup_nested_element('question_version'); @@ -2721,7 +2722,7 @@ protected function define_structure() { WHERE bi.backupid = ? AND bi.itemname = 'question_categoryfinal'", [backup::VAR_BACKUPID]); - // Add all question bank entries from "complete" categories, plus annotated question bank entires + // Add all question bank entries from "complete" categories, plus annotated question bank entires and their children // from "partial" categories. $questionbankentry->set_source_sql( " @@ -2733,8 +2734,11 @@ protected function define_structure() { UNION SELECT qbe.* FROM {question_bank_entries} qbe + JOIN {question_versions} qv ON qv.questionbankentryid = qbe.id + JOIN {question} q ON q.id = qv.questionid + LEFT JOIN {question_versions} parentqv ON parentqv.questionid = q.parent JOIN {question_category_partial_temp} qcp ON qcp.itemid = qbe.questioncategoryid - JOIN {backup_ids_temp} biq ON biq.itemid = qbe.id + JOIN {backup_ids_temp} biq ON biq.itemid = qbe.id OR biq.itemid = parentqv.questionbankentryid WHERE qcp.itemid = ? AND qcp.backupid = ? AND biq.backupid = ? diff --git a/backup/moodle2/restore_root_task.class.php b/backup/moodle2/restore_root_task.class.php index b3c31cf246bd3..132a710ae86b7 100644 --- a/backup/moodle2/restore_root_task.class.php +++ b/backup/moodle2/restore_root_task.class.php @@ -78,6 +78,9 @@ public function build() { // Unconditionally, load create all the needed outcomes $this->add_step(new restore_outcomes_structure_step('create_scales', 'outcomes.xml')); + // If we haven't preloaded information, load all the question banks to temp_ids_table. + $this->add_step(new \core\backup\restore_load_questionbanks('load_questionbanks')); + // If we haven't preloaded information, load all the needed categories and questions (reduced) to temp_ids_table $this->add_step(new restore_load_categories_and_questions('load_categories_and_questions')); diff --git a/backup/moodle2/restore_stepslib.php b/backup/moodle2/restore_stepslib.php index c34d34904138f..d1691ac3f461f 100644 --- a/backup/moodle2/restore_stepslib.php +++ b/backup/moodle2/restore_stepslib.php @@ -27,6 +27,9 @@ defined('MOODLE_INTERNAL') || die(); +use core_question\local\bank\question_version_status; +use core_question\versions; + /** * delete old directories and conditionally create backup_temp_ids table */ @@ -5289,6 +5292,15 @@ protected function process_question($data) { $this->set_mapping('question_bank_entry', $this->latestqbe->oldid, $this->latestqbe->newid); } + if ( + ($data->qtype === 'random') + && ($this->latestversion->status == \core_question\local\bank\question_version_status::QUESTION_STATUS_HIDDEN) + ) { + // Ensure that this newly created question is considered by + // \qtype_random\task\remove_unused_questions. + $this->latestversion->status = \core_question\local\bank\question_version_status::QUESTION_STATUS_DRAFT; + } + // Now store the question. $newitemid = $DB->insert_record('question', $data); $this->set_mapping('question', $oldid, $newitemid); @@ -5301,9 +5313,55 @@ protected function process_question($data) { $oldqvid = $this->latestversion->id; $this->latestversion->questionbankentryid = $this->latestqbe->newid; $this->latestversion->questionid = $newitemid; + // In case the backed up version was deleted and a new one created in its place, increase the version numbers of + // conflicting versions to make room for this one. + $transaction = $DB->start_delegated_transaction(); + if ( + $DB->record_exists( + 'question_versions', + [ + 'questionbankentryid' => $this->latestversion->questionbankentryid, + 'version' => $this->latestversion->version, + ], + ) + ) { + // We'll update each higher version and any references one-at-a-time, starting with the highest, to avoid + // creating a duplicate questionbankentryid-version combination in question_versions. + $moveversions = $DB->get_records_select( + 'question_versions', + 'questionbankentryid = :questionbankentryid AND version >= :oldversion', + [ + 'questionbankentryid' => $this->latestversion->questionbankentryid, + 'oldversion' => $this->latestversion->version, + ], + 'version DESC', + ); + foreach ($moveversions as $moveversion) { + $DB->set_field( + 'question_versions', + 'version', + $moveversion->version + 1, + [ + 'questionbankentryid' => $moveversion->questionbankentryid, + 'version' => $moveversion->version, + ] + ); + $DB->set_field( + 'question_references', + 'version', + $moveversion->version + 1, + [ + 'questionbankentryid' => $moveversion->questionbankentryid, + 'version' => $moveversion->version, + ] + ); + } + // Ensure the nextversion value has been initialised, and increment it to account for the additional version. + versions::get_next_version($this->latestversion->questionbankentryid); + } $newqvid = $DB->insert_record('question_versions', $this->latestversion); $this->set_mapping('question_versions', $oldqvid, $newqvid); - + $transaction->allow_commit(); } else { // By performing this set_mapping() we make get_old/new_parentid() to work for all the // children elements of the 'question' one (so qtype plugins will know the question they belong to). @@ -5311,6 +5369,18 @@ protected function process_question($data) { // Also create the question_bank_entry and version mappings, if required. $newquestionversion = $DB->get_record('question_versions', ['questionid' => $questionmapping->newitemid]); + // Restore the version to ready state if it has been hidden. + if ( + $newquestionversion->status == question_version_status::QUESTION_STATUS_HIDDEN + && $this->latestversion->status == question_version_status::QUESTION_STATUS_READY + ) { + $DB->set_field( + 'question_versions', + 'status', + question_version_status::QUESTION_STATUS_READY, + ['questionid' => $questionmapping->newitemid], + ); + } $this->set_mapping('question_versions', $this->latestversion->id, $newquestionversion->id); if (empty($this->latestqbe->newid)) { $this->latestqbe->oldid = $this->latestqbe->id; @@ -5402,12 +5472,18 @@ protected function process_tag($data) { } $tagcontextid = $this->cachedcategory->contextid; // Add the tag to the question. - core_tag_tag::add_item_tag('core_question', + $taginstanceid = core_tag_tag::add_item_tag( + 'core_question', 'question', $newquestion, context::instance_by_id($tagcontextid), - $tagname + $tagname, ); + $tagid = $DB->get_field('tag_instance', 'tagid', ['id' => $taginstanceid]); + if ($tagid != $data->id) { + // The tag didn't exist already, map the new ID. + $this->set_mapping('tag', $data->id, $tagid); + } } } @@ -5485,7 +5561,11 @@ protected function define_execution() { // but if that context still exists on the site and the user has access then point question references // to the originals. $originalcontext = context::instance_by_id($contextid, IGNORE_MISSING); - if ($originalcontext && has_capability('mod/qbank:view', $originalcontext)) { + if ( + $this->task->is_samesite() + && $originalcontext + && has_capability('mod/qbank:view', $originalcontext) + ) { $originalquestions = get_questions_category(question_get_top_category($contextid), false); $targetcoursecontext = context_course::instance($this->get_courseid()); foreach ($originalquestions as $originalquestion) { @@ -5608,13 +5688,19 @@ protected function define_execution() { // We need to check all the question_set_references belonging to this context_module. $references = $DB->get_records('question_set_references', ['usingcontextid' => $newcontext->newitemid]); foreach ($references as $reference) { - $filtercondition = json_decode($reference->filtercondition); - if (!empty($filtercondition->questioncategoryid) && - in_array($filtercondition->questioncategoryid, $categoryids)) { - // This is one of ours, update the questionscontextid. - $DB->set_field('question_set_references', - 'questionscontextid', $newcontext->newitemid, - ['id' => $reference->id]); + $filtercondition = json_decode($reference->filtercondition, true); + if (!array_key_exists('filter', $filtercondition)) { + $filtercondition = \core_question\question_reference_manager::convert_legacy_set_reference_filter_condition( + $filtercondition, + ); + } + $questioncategoryid = $filtercondition['filter']['category']['values'][0]; + if (in_array($questioncategoryid, $categoryids)) { + // This is one of ours, update the questionscontextid and filtercondition fields. + $reference->questionscontextid = $newcontext->newitemid; + $filtercondition['cat'] = "{$questioncategoryid},{$newcontext->newitemid}"; + $reference->filtercondition = json_encode($filtercondition); + $DB->update_record('question_set_references', $reference); } } } @@ -5629,20 +5715,20 @@ protected function define_execution() { ); } } - // Remove any remaining course-level question categories from the restored course. + // Remove any remaining course-level question categories and their questions from the restored course. $coursecatsql = " - SELECT qc.id AS categoryid + SELECT qc.id AS id, qc.contextid AS contextid FROM {question_categories} qc JOIN {context} c ON c.id = qc.contextid WHERE c.contextlevel = :courselevel AND c.instanceid = :courseid "; - $DB->delete_records_subquery( - 'question_categories', - 'id', - 'categoryid', + $categories = $DB->get_records_sql( $coursecatsql, - ['courselevel' => context_course::LEVEL, 'courseid' => $this->task->get_courseid()] + ['courselevel' => context_course::LEVEL, 'courseid' => $this->task->get_courseid()], ); + foreach ($categories as $category) { + question_category_delete_safe($category); + } } } @@ -6421,49 +6507,46 @@ protected function add_question_set_references($element, &$paths) { public function process_question_set_reference($data) { global $DB; $data = (object) $data; - $owncontext = $data->usingcontextid == $data->questionscontextid; $data->usingcontextid = $this->get_mappingid('context', $data->usingcontextid); $data->itemid = $this->get_new_parentid('quiz_question_instance'); + + $originalbankinbackup = (bool) restore_dbops::get_backup_ids_record( + $this->get_restoreid(), + 'questionbank', + $data->questionscontextid, + ); + + if ($context = $this->get_mappingid('context', $data->questionscontextid)) { + $data->questionscontextid = $context; + } else { + $this->log( + "question_set_reference with old id {$data->id} referenced question context " + . "{$data->questionscontextid} which was not included in the backup. Therefore, this has been " + . "restored with the old questionscontextid.", + backup::LOG_WARNING, + ); + } + $filtercondition = json_decode($data->filtercondition, true); if (!isset($filtercondition['filter'])) { // Pre-4.3, convert the old filtercondition format to the new format. + // Don't map tags to new IDs, the plugin will do that below. $filtercondition = \core_question\question_reference_manager::convert_legacy_set_reference_filter_condition( - $filtercondition); - } - - // Map category id used for category filter condition and corresponding context id. - $oldcategoryid = $filtercondition['filter']['category']['values'][0]; - // Decide if we're going to refer back to the original category, or to the new category. - // Are we restoring to a different site? - // Has the original context or category been deleted? - // Did the old category belong to the same context as the original set reference? - // Are we allowed to use its questions? - $questionscontext = context::instance_by_id($data->questionscontextid, IGNORE_MISSING); - if ( - !$this->get_task()->is_samesite() - || !$questionscontext - || !$DB->record_exists('question_categories', ['id' => $oldcategoryid]) - || $owncontext - || !has_capability('moodle/question:useall', $questionscontext) - ) { - $newcategoryid = $this->get_mappingid('question_category', $oldcategoryid); - $filtercondition['filter']['category']['values'][0] = $newcategoryid; + $filtercondition, + false, + ); } - if ($context = $this->get_mappingid('context', $data->questionscontextid)) { - $data->questionscontextid = $context; - } else { - $this->log('question_set_reference with old id ' . $data->id . - ' referenced question context ' . $data->questionscontextid . - ' which was not included in the backup. Therefore, this has been ' . - ' restored with the old questionscontextid.', backup::LOG_WARNING); - } + $qbankfeatureclasses = \core\component::get_plugin_list_with_class('qbank', 'plugin_feature'); - $filtercondition['cat'] = implode(',', [ - $filtercondition['filter']['category']['values'][0], - $data->questionscontextid, - ]); + foreach ($qbankfeatureclasses as $qbankfeatureclass) { + $qbankfeature = new $qbankfeatureclass(); + $filters = $qbankfeature->get_question_filters(); + foreach ($filters as $filter) { + $filtercondition = $filter->restore_filtercondition($filtercondition, $data, $this, $originalbankinbackup); + } + } $data->filtercondition = json_encode($filtercondition); diff --git a/backup/tests/async_backup_test.php b/backup/tests/async_backup_test.php index 23d8b964e1181..d4c48668826b7 100644 --- a/backup/tests/async_backup_test.php +++ b/backup/tests/async_backup_test.php @@ -107,17 +107,12 @@ public function test_async_backup(): void { $asynctask = new \core\task\asynchronous_backup_task(); $asynctask->set_custom_data(['backupid' => $backupid]); $asynctask->set_userid($USER->id); - \core\task\manager::queue_adhoc_task($asynctask); // We are expecting trace output during this test. $this->expectOutputRegex("/$backupid/"); // Execute adhoc task. - $now = time(); - $task = \core\task\manager::get_next_adhoc_task($now); - $this->assertInstanceOf('\\core\\task\\asynchronous_backup_task', $task); - $task->execute(); - \core\task\manager::adhoc_task_complete($task); + $asynctask->execute(); $postbackuprec = $DB->get_record('backup_controllers', ['backupid' => $backupid]); @@ -151,13 +146,9 @@ public function test_async_backup(): void { // Create the adhoc task. $asynctask = new \core\task\asynchronous_backup_task(); $asynctask->set_custom_data(['backupid' => $backupid]); - \core\task\manager::queue_adhoc_task($asynctask); // Execute adhoc task. - $now = time(); - $task = \core\task\manager::get_next_adhoc_task($now); - $task->execute(); - \core\task\manager::adhoc_task_complete($task); + $asynctask->execute(); $postbackuprec = $DB->get_record('backup_controllers', ['backupid' => $backupid]); @@ -241,19 +232,11 @@ public function test_complete_async_backup(): void { // Now queue an adhoc task and check it handles and completes gracefully. $asynctask = new \core\task\asynchronous_backup_task(); $asynctask->set_custom_data(array('backupid' => $backupid)); - \core\task\manager::queue_adhoc_task($asynctask); // We are expecting a specific message output during this test. $this->expectOutputRegex('/invalid controller/'); // Execute adhoc task. - $now = time(); - $task = \core\task\manager::get_next_adhoc_task($now); - $this->assertInstanceOf('\\core\\task\\asynchronous_backup_task', $task); - $task->execute(); - \core\task\manager::adhoc_task_complete($task); - - // Check the task record is removed. - $this->assertEquals(0, $DB->count_records('task_adhoc')); + $asynctask->execute(); } } diff --git a/backup/tests/async_restore_test.php b/backup/tests/async_restore_test.php index ec7558e1ea8a2..ff98863d65a4d 100644 --- a/backup/tests/async_restore_test.php +++ b/backup/tests/async_restore_test.php @@ -223,20 +223,12 @@ public function test_async_restore_missing_controller(): void { // Create the adhoc task. $asynctask = new \core\task\asynchronous_restore_task(); $asynctask->set_custom_data(['backupid' => $restoreid]); - \core\task\manager::queue_adhoc_task($asynctask); // We are expecting a specific message output during this test. $this->expectOutputRegex('/invalid controller/'); // Execute adhoc task. - $now = time(); - $task = \core\task\manager::get_next_adhoc_task($now); - $this->assertInstanceOf('\\core\\task\\asynchronous_restore_task', $task); - $task->execute(); - \core\task\manager::adhoc_task_complete($task); - - // Check the task record is removed. - $this->assertEquals(0, $DB->count_records('task_adhoc')); + $asynctask->execute(); // Now delete the record and confirm an entirely missing controller is handled. $DB->delete_records('backup_controllers'); @@ -244,19 +236,11 @@ public function test_async_restore_missing_controller(): void { // Create the adhoc task. $asynctask = new \core\task\asynchronous_restore_task(); $asynctask->set_custom_data(['backupid' => $restoreid]); - \core\task\manager::queue_adhoc_task($asynctask); // We are expecting a specific message output during this test. $this->expectOutputRegex('/Unable to find restore controller/'); // Execute adhoc task. - $now = time(); - $task = \core\task\manager::get_next_adhoc_task($now); - $this->assertInstanceOf('\\core\\task\\asynchronous_restore_task', $task); - $task->execute(); - \core\task\manager::adhoc_task_complete($task); - - // Check the task record is removed. - $this->assertEquals(0, $DB->count_records('task_adhoc')); + $asynctask->execute(); } } diff --git a/backup/tests/hook/copy_course_hook_test.php b/backup/tests/hook/copy_course_hook_test.php index 8af997cb0e92c..c5cc32ede9fc2 100644 --- a/backup/tests/hook/copy_course_hook_test.php +++ b/backup/tests/hook/copy_course_hook_test.php @@ -32,6 +32,14 @@ * @license http://www.gnu.org/copyleft/gpl.html GNU GPL v3 or later */ final class copy_course_hook_test extends advanced_testcase { + /** + * Load required test libraries + */ + public static function setUpBeforeClass(): void { + global $CFG; + require_once("{$CFG->dirroot}/backup/util/includes/backup_includes.php"); + parent::setUpBeforeClass(); + } /** * Test the hook. diff --git a/backup/util/dbops/restore_dbops.class.php b/backup/util/dbops/restore_dbops.class.php index 60872fb42c319..cd68126ff9f41 100644 --- a/backup/util/dbops/restore_dbops.class.php +++ b/backup/util/dbops/restore_dbops.class.php @@ -464,6 +464,39 @@ public static function load_categories_and_questions_to_tempids($restoreid, $que $xmlparser->process(); } + /** + * Store ids associated with any activity in the backup that supports FEATURE_PUBLISHES_QUESTIONS. + * + * @param string $restoreid The restore ID. + * @param string $activitiespath The path to the `activities` folder in the backup being restored. + */ + public static function load_questionbanks_to_tempids(string $restoreid, string $activitiespath): void { + if (!is_dir($activitiespath)) { + return; + } + // Get modules that publish questions. + $qmodules = array_filter( + array_keys(core\component::get_all_plugins_list('mod')), + fn($module) => plugin_supports('mod', $module, FEATURE_PUBLISHES_QUESTIONS), + ); + foreach (scandir($activitiespath) as $activitydir) { + [$modname] = explode('_', $activitydir); + if (!in_array($modname, $qmodules)) { + continue; + } + $activityfile = "{$activitiespath}/{$activitydir}/{$modname}.xml"; + if (!file_exists($activityfile)) { // Shouldn't happen ever, but... + throw new backup_helper_exception('missing_moodle_backup_xml_file', $activityfile); + } + // Parse each activity's file, storing the relevant data in the database. + $xmlparser = new progressive_parser(); + $xmlparser->set_file($activityfile); + $xmlprocessor = new restore_questionbanks_parser_processor($restoreid); + $xmlparser->set_processor($xmlprocessor); + $xmlparser->process(); + } + } + /** * Check all the included categories and questions, deciding the action to perform * for each one (mapping / creation) and returning one array of problems in case @@ -609,9 +642,18 @@ public static function prechek_precheck_qbanks_by_level($restoreid, $courseid, $ $topcats = 0; // get categories in context (bank) $categories = self::restore_get_question_categories($restoreid, $contextid, $contextlevel); - - // cache permissions if $targetcontext is found - if ($targetcontext = self::restore_find_best_target_context($categories, $courseid, $contextlevel)) { + if ( + $contextlevel == \core\context\module::LEVEL + && self::get_backup_ids_record($restoreid, 'questionbank', $contextid) + ) { + // Don't look for an existing module context, we have the original context in the backup, + // so we'll put the categories in the course context for now and move them once the activity is restored. + $targetcontext = core\context\course::instance($courseid); + } else { + $targetcontext = self::restore_find_best_target_context($categories, $courseid, $contextlevel); + } + if ($targetcontext) { + // Cache permissions if $targetcontext is found. $canmanagecategory = has_capability('moodle/question:managecategory', $targetcontext, $userid); $canadd = has_capability('moodle/question:add', $targetcontext, $userid); } diff --git a/backup/util/helper/backup_helper.class.php b/backup/util/helper/backup_helper.class.php index 65901635d2cbf..7b3435f8f3512 100644 --- a/backup/util/helper/backup_helper.class.php +++ b/backup/util/helper/backup_helper.class.php @@ -411,7 +411,7 @@ public static function print_coursereuse_selector(string $current): void { } - $selectmenu = new \core\output\select_menu('coursereusetype', $menuarray, $activeurl); + $selectmenu = new \core\output\select_menu('coursereusetype', $menuarray, $activeurl, true); $selectmenu->set_label(get_string('coursereusenavigationmenu'), ['class' => 'visually-hidden']); $options = \html_writer::tag( 'div', diff --git a/backup/util/helper/restore_prechecks_helper.class.php b/backup/util/helper/restore_prechecks_helper.class.php index 803cd77903df5..4dac448851c90 100644 --- a/backup/util/helper/restore_prechecks_helper.class.php +++ b/backup/util/helper/restore_prechecks_helper.class.php @@ -173,6 +173,7 @@ public static function execute_prechecks(restore_controller $controller, $dropte $progress->progress($majorstep++); // Check we are able to restore and the categories and questions + restore_dbops::load_questionbanks_to_tempids($restoreid, $controller->get_plan()->get_basepath() . '/activities'); $file = $controller->get_plan()->get_basepath() . '/questions.xml'; restore_dbops::load_categories_and_questions_to_tempids($restoreid, $file); if ($problems = restore_dbops::precheck_categories_and_questions($restoreid, $courseid, $userid, $samesite)) { diff --git a/backup/util/helper/restore_questionbanks_parser_processor.php b/backup/util/helper/restore_questionbanks_parser_processor.php new file mode 100644 index 0000000000000..e95135ac46142 --- /dev/null +++ b/backup/util/helper/restore_questionbanks_parser_processor.php @@ -0,0 +1,59 @@ +. + +defined('MOODLE_INTERNAL' || die()); + +require_once($CFG->dirroot . '/backup/util/xml/parser/processors/grouped_parser_processor.class.php'); + +/** + * Parse and store activity data for activities that publish questions. + * + * @package core_backup + * @copyright 2025 onwards Catalyst IT EU {@link https://catalyst-eu.net} + * @author Mark Johnsontestsomecontent '); + // Test nullcontent reset. + $xo = new memory_xml_output(); + $xw = new mock_xml_writer($xo); + $xw->set_prologue(''); + $xw->start(); + $xw->full_tag('tagname', null); + $xw->begin_tag('tagname2'); + $xw->full_tag('tagname3', 'somecontent'); + $xw->end_tag('tagname2'); + $xw->stop(); + $result = $xo->get_allcontents(); + $expected = <<+ + XML; + $this->assertEquals($expected, $result); + // Build a complex XML file and test results against stored file in fixtures $xo = new memory_xml_output(); $xw = new mock_xml_writer($xo); diff --git a/backup/util/xml/xml_writer.class.php b/backup/util/xml/xml_writer.class.php index da4ed9ebbf2e7..35be10db1fd79 100644 --- a/backup/util/xml/xml_writer.class.php +++ b/backup/util/xml/xml_writer.class.php @@ -216,6 +216,7 @@ public function full_tag($tag, $content = null, $attributes = null) { $this->lastwastext = true; $this->end_tag($tag); } + $this->nullcontent = false; // Reset nullcontent flag. } diff --git a/badges/award.php b/badges/award.php index 7b71559c2b237..bf6855c525f90 100644 --- a/badges/award.php +++ b/badges/award.php @@ -82,6 +82,16 @@ die(); } +if (!empty($role)) { + if (!user_has_role_assignment($USER->id, $role, $context->id) && !$isadmin) { + // User does not have the role passed by the parameter. + echo $OUTPUT->header(); + echo $OUTPUT->notification(get_string('wrongrole', 'badges')); + echo $OUTPUT->footer(); + die(); + } +} + $returnurl = new moodle_url('recipients.php', array('id' => $badge->id)); $returnlink = html_writer::link($returnurl, $strrecipients); $actionbar = new \core_badges\output\standard_action_bar( @@ -207,7 +217,7 @@ $users = $existingselector->get_selected_users(); foreach ($users as $user) { - if (!process_manual_revoke($user->id, $USER->id, $issuerrole->roleid, $badgeid)) { + if (!process_manual_revoke($user->id, 0, $issuerrole->roleid, $badgeid)) { echo $OUTPUT->error_text(get_string('error:cannotrevokebadge', 'badges')); } } diff --git a/badges/criteria/award_criteria_course.php b/badges/criteria/award_criteria_course.php index 9f5b41a00227d..3b0f268818575 100644 --- a/badges/criteria/award_criteria_course.php +++ b/badges/criteria/award_criteria_course.php @@ -234,7 +234,7 @@ public function get_completed_criteria_sql() { $params['courseid'] = $this->courseid; // Add by date parameter. - if (isset($param['bydate'])) { + if (isset($coursecriteria['bydate'])) { $where .= ' AND cc.timecompleted <= :completebydate'; $params['completebydate'] = $coursecriteria['bydate']; } diff --git a/badges/criteria/award_criteria_courseset.php b/badges/criteria/award_criteria_courseset.php index 68e26b40d82a0..7e7c1883aa7c7 100644 --- a/badges/criteria/award_criteria_courseset.php +++ b/badges/criteria/award_criteria_courseset.php @@ -211,7 +211,10 @@ public function review($userid, $filtered = false) { $check_grade = ($grade->grade >= $param['grade']); } - if (!$filtered && isset($param['bydate'])) { + // When the user list is not filtered, or the aggregation method is ANY, + // ensure the course completion date is before the bydate (if set). + $comparedates = !$filtered || $this->method == BADGE_CRITERIA_AGGREGATION_ANY; + if ($comparedates && isset($param['bydate'])) { $cparams = array( 'userid' => $userid, 'course' => $course->id, @@ -254,9 +257,16 @@ public function get_completed_criteria_sql() { $params = array(); if ($this->method == BADGE_CRITERIA_AGGREGATION_ANY) { + $coursedata = []; foreach ($this->params as $param) { - $coursedata[] = " cc.course = :completedcourse{$param['course']} "; + $conditionsql = " cc.course = :completedcourse{$param['course']} "; $params["completedcourse{$param['course']}"] = $param['course']; + + if (isset($param['bydate'])) { + $conditionsql .= " AND cc.timecompleted <= :completedbydate{$param['course']} "; + $params["completedbydate{$param['course']}"] = $param['bydate']; + } + $coursedata[] = "({$conditionsql})"; } if (!empty($coursedata)) { $extraon = implode(' OR ', $coursedata); @@ -272,6 +282,11 @@ public function get_completed_criteria_sql() { cc{$param['course']}.timecompleted > 0 "; $where .= " AND cc{$param['course']}.course IS NOT NULL "; $params["completedcourse{$param['course']}"] = $param['course']; + + if (isset($param['bydate'])) { + $where .= " AND cc{$param['course']}.timecompleted <= :completedbydate{$param['course']} "; + $params["completedbydate{$param['course']}"] = $param['bydate']; + } } return array($join, $where, $params); } diff --git a/badges/lib/awardlib.php b/badges/lib/awardlib.php index f085c56cd01e4..89d16ad03374c 100644 --- a/badges/lib/awardlib.php +++ b/badges/lib/awardlib.php @@ -290,27 +290,27 @@ function process_manual_award($recipientid, $issuerid, $issuerrole, $badgeid) { /** * Manually revoke awarded badges. * - * @param int $recipientid - * @param int $issuerid - * @param int $issuerrole - * @param int $badgeid + * @param int $recipientid User ID of the recipient + * @param int $issuerid User ID of the issuer (if 0, issuer will be ignored) + * @param int $issuerrole Role of the issuer + * @param int $badgeid ID of the badge * @return bool */ function process_manual_revoke($recipientid, $issuerid, $issuerrole, $badgeid) { global $DB; - $params = array( - 'badgeid' => $badgeid, - 'issuerid' => $issuerid, - 'issuerrole' => $issuerrole, - 'recipientid' => $recipientid - ); + $params = [ + 'badgeid' => $badgeid, + 'issuerrole' => $issuerrole, + 'recipientid' => $recipientid, + ]; + if (!empty($issuerid)) { + $params['issuerid'] = $issuerid; + } if ($DB->record_exists('badge_manual_award', $params)) { - if ($DB->delete_records('badge_manual_award', array('badgeid' => $badgeid, - 'issuerid' => $issuerid, - 'recipientid' => $recipientid)) - && $DB->delete_records('badge_issued', array('badgeid' => $badgeid, - 'userid' => $recipientid))) { - + if ( + $DB->delete_records('badge_manual_award', $params) && + $DB->delete_records('badge_issued', ['badgeid' => $badgeid, 'userid' => $recipientid]) + ) { // Trigger event, badge revoked. $badge = new \badge($badgeid); $eventparams = array( diff --git a/badges/tests/behat/award_badge.feature b/badges/tests/behat/award_badge.feature index f5487fefe95a5..9ef45afffb6a8 100644 --- a/badges/tests/behat/award_badge.feature +++ b/badges/tests/behat/award_badge.feature @@ -11,11 +11,13 @@ Feature: Award badges And the following "users" exist: | username | firstname | lastname | email | | teacher1 | Teacher | 1 | teacher1@example.com | + | teacher2 | Teacher | 2 | teacher2@example.com | | student1 | Student | 1 | student1@example.com | | student2 | Student | 2 | student2@example.com | And the following "course enrolments" exist: | user | course | role | | teacher1 | C1 | editingteacher | + | teacher2 | C1 | editingteacher | | student1 | C1 | student | | student2 | C1 | student | And the following "activity" exists: @@ -371,14 +373,24 @@ Feature: Award badges And I am on "Course 1" course homepage And I navigate to "Badges" in current page administration And I follow "Course Badge" - Then I should see "Recipients (2)" And I select "Recipients (2)" from the "jump" singleselect And I press "Award badge" And I set the field "existingrecipients[]" to "Student 2 (student2@example.com)" And I press "Revoke badge" + And I am on "Course 1" course homepage + And I navigate to "Badges" in current page administration + And I follow "Course Badge" + Then I should see "Recipients (1)" + And I log out + # Now attempt to revoke a badge as another teacher. + And I am on the "Course 1" "course" page logged in as "teacher2" + And I navigate to "Badges" in current page administration + And I follow "Course Badge" + And I select "Recipients (1)" from the "jump" singleselect + And I press "Award badge" And I set the field "existingrecipients[]" to "Student 1 (student1@example.com)" - When I press "Revoke badge" + And I press "Revoke badge" And I am on "Course 1" course homepage And I navigate to "Badges" in current page administration And I follow "Course Badge" - Then I should see "Recipients (0)" + And I should see "Recipients (0)" diff --git a/badges/tests/behat/award_badge_with_completion.feature b/badges/tests/behat/award_badge_with_completion.feature new file mode 100644 index 0000000000000..ae8f1c184a4eb --- /dev/null +++ b/badges/tests/behat/award_badge_with_completion.feature @@ -0,0 +1,149 @@ +@mod @mod_quiz @core_badges @core_completion @javascript + +Feature: Award badges based on course completion + In order to ensure a student has learned the required material + As a teacher + I need a badge to be awarded only when the student completes the course or a set of courses. + + Background: + Given the following "users" exist: + | username | firstname | lastname | email | + | student1 | Student | 1 | student1@example.com | + | student2 | Student | 2 | student2@example.com | + | teacher1 | Teacher | 1 | teacher1@example.com | + And the following "courses" exist: + | fullname | shortname | category | enablecompletion | + | Course 1 | C1 | 0 | 1 | + | Course 2 | C2 | 0 | 1 | + And the following "course enrolments" exist: + | user | course | role | + | teacher1 | C1 | editingteacher | + | student1 | C1 | student | + | student2 | C1 | student | + | teacher1 | C2 | editingteacher | + | student1 | C2 | student | + | student2 | C2 | student | + And the following "question categories" exist: + | contextlevel | reference | name | + | Course | C1 | Test questions | + | Course | C2 | Test questions | + And the following "questions" exist: + | questioncategory | qtype | name | questiontext | + | Test questions | truefalse | First question | Answer the first question | + And the following "activities" exist: + | activity | name | course | idnumber | attempts | gradepass | completion | completionpassgrade | completionusegrade | + | quiz | Test quiz name C1 | C1 | quiz1 | 2 | 5.00 | 2 | 1 | 1 | + | quiz | Test quiz name C2 | C2 | quiz1 | 2 | 5.00 | 2 | 1 | 1 | + And quiz "Test quiz name C1" contains the following questions: + | question | page | + | First question | 1 | + And quiz "Test quiz name C2" contains the following questions: + | question | page | + | First question | 1 | + And the following "blocks" exist: + | blockname | contextlevel | reference | pagetypepattern | defaultregion | + | completionstatus | Course | C1 | course-view-* | side-pre | + | completionstatus | Course | C2 | course-view-* | side-pre | + And I am on the "Course 1" course page logged in as teacher1 + And I navigate to "Course completion" in current page administration + And I expand all fieldsets + And I set the field "Test quiz name C1" to "1" + And I press "Save changes" + And I am on the "Course 2" course page logged in as teacher1 + And I navigate to "Course completion" in current page administration + And I expand all fieldsets + And I set the field "Test quiz name C2" to "1" + And I press "Save changes" + + Scenario Outline: Badge awarded depending on the course completion by-date + Given I am on the "Course 1" course page + And the following "core_badges > Badge" exists: + | name | Course Badge 1 | + | status | 0 | + | type | 2 | + | course | C1 | + | description | Course badge 1 description | + | image | badges/tests/behat/badge.png | + And I navigate to "Badges" in current page administration + And I click on "Course Badge 1" "link" + And I select "Criteria" from the "jump" singleselect + And I set the field "type" to "Course completion" + And I set the field "Enable" to "1" + And I set the field "Day" to "1" + And I set the field "Month" to "January" + And I set the field "Year" to "somecontent +" + And I press "Save" + And I press "Enable access" + And I click on "Enable" "button" in the "Confirm" "dialogue" + And user "student1" has attempted "Test quiz name C1" with responses: + | slot | response | + | 1 | True | + # Completion cron won't mark the whole course completed unless the + # individual criteria was marked completed more than a second ago. So + # run it twice, first to mark the criteria and second for the course. + And I run the scheduled task "core\task\completion_regular_task" + And I wait "1" seconds + And I run the scheduled task "core\task\completion_regular_task" + When I run the scheduled task "core\task\badges_cron_task" + And I run all adhoc tasks + And I navigate to "Badges" in current page administration + And I click on "Course Badge 1" "link" + Then I should see "Recipients ( )" + And I select "Recipients ( )" from the "jump" singleselect + And I see "Student 1" + And I should not see "Student 2" + + Examples: + | year | count | student1_visibility | + | ## +1 year ## %Y ## | 1 | should | + | ## -1 year ## %Y ## | 0 | should not | + + Scenario Outline: Badge awarded depending on the courseset completion by-date + Given I am logged in as "admin" + And the following "core_badges > Badge" exists: + | name | Site Badge | + | status | 0 | + | description | Site badge description | + | image | badges/tests/behat/badge.png | + And I navigate to "Badges > Manage badges" in site administration + And I press "Edit" action in the "Site Badge" report row + And I select "Criteria" from the "jump" singleselect + And I set the field "type" to "Completing a set of courses" + And I set the field "courses" to "Course 1, Course 2" + And I press "Add courses" + And I expand all fieldsets + # Set a very high grade requirement to ensure that the course completion criteria won't be marked completed just by passing the quiz. + And I set the field with xpath "(//input[contains(@name, 'grade')])[1]" to "200" + And I set the field with xpath "(//input[contains(@name, 'enabled')])[2]" to "1" + And I set the field with xpath "(//select[contains(@name, 'day')])[2]" to "1" + And I set the field with xpath "(//select[contains(@name, 'month')])[2]" to "January" + And I set the field with xpath "(//select[contains(@name, 'year')])[2]" to " " + And I click on "Any of the selected courses is complete" "radio" + And I press "Save" + And I press "Enable access" + And I click on "Enable" "button" in the "Confirm" "dialogue" + And user "student1" has attempted "Test quiz name C1" with responses: + | slot | response | + | 1 | True | + And user "student1" has attempted "Test quiz name C2" with responses: + | slot | response | + | 1 | True | + # Completion cron won't mark the whole course completed unless the + # individual criteria was marked completed more than a second ago. So + # run it twice, first to mark the criteria and second for the course. + And I run the scheduled task "core\task\completion_regular_task" + And I wait "1" seconds + And I run the scheduled task "core\task\completion_regular_task" + When I run the scheduled task "core\task\badges_cron_task" + And I run all adhoc tasks + And I navigate to "Badges > Manage badges" in site administration + And I follow "Site Badge" + Then I should see "Recipients ( )" + And I select "Recipients ( )" from the "jump" singleselect + And I see "Student 1" + And I should not see "Student 2" + + Examples: + | year | count | student1_visibility | + | ## +1 year ## %Y ## | 1 | should | + | ## -1 year ## %Y ## | 0 | should not | diff --git a/blocks/activity_modules/block_activity_modules.php b/blocks/activity_modules/block_activity_modules.php index cbf6c804fc121..2f4eee6a21c2f 100644 --- a/blocks/activity_modules/block_activity_modules.php +++ b/blocks/activity_modules/block_activity_modules.php @@ -53,7 +53,11 @@ function get_content() { foreach($modinfo->cms as $cm) { // Exclude activities that aren't visible or have no view link (e.g. label). Account for folder being displayed inline. - if (!$cm->uservisible || (!$cm->has_view() && strcmp($cm->modname, 'folder') !== 0)) { + if ( + !\course_modinfo::is_mod_type_visible_on_course($cm->modname) + || !$cm->uservisible + || (!$cm->has_view() && strcmp($cm->modname, 'folder') !== 0) + ) { continue; } if (array_key_exists($cm->modname, $modfullnames)) { diff --git a/blocks/activity_modules/tests/behat/block_activity_modules.feature b/blocks/activity_modules/tests/behat/block_activity_modules.feature index d925524cafd5f..9aa0639637373 100644 --- a/blocks/activity_modules/tests/behat/block_activity_modules.feature +++ b/blocks/activity_modules/tests/behat/block_activity_modules.feature @@ -16,6 +16,7 @@ Feature: Block activity modules | label | Frontpage label name | Frontpage label description | Acceptance test site | label0 | | lti | Frontpage lti name | Frontpage lti description | Acceptance test site | lti0 | | page | Frontpage page name | Frontpage page description | Acceptance test site | page0 | + | qbank | Frontpage qbank name | Frontpage qbank description | Acceptance test site | qbank0 | | quiz | Frontpage quiz name | Frontpage quiz description | Acceptance test site | quiz0 | | resource | Frontpage resource name | Frontpage resource description | Acceptance test site | resource0 | | imscp | Frontpage imscp name | Frontpage imscp description | Acceptance test site | imscp0 | @@ -26,6 +27,7 @@ Feature: Block activity modules | url | Frontpage url name | Frontpage url description | Acceptance test site | url0 | | wiki | Frontpage wiki name | Frontpage wiki description | Acceptance test site | wiki0 | | workshop | Frontpage workshop name | Frontpage workshop description | Acceptance test site | workshop0 | + | qbank | Frontpage qbank name | Frontpage qbank description | Acceptance test site | qbank0 | When I log in as "admin" And I am on site homepage @@ -74,6 +76,9 @@ Feature: Block activity modules And I should see "Frontpage imscp name" And I should see "Frontpage folder name" And I should see "Frontpage url name" + And I should not see "Frontpage qbank name" + And I am on site homepage + And "Question banks" "link" should not exist in the "Activities" "block" Scenario: Add activities block in a course Given the following "courses" exist: @@ -94,12 +99,14 @@ Feature: Block activity modules | lesson | Test lesson name | Test lesson description | C1 | lesson1 | | lti | Test lti name | Test lti description | C1 | lti1 | | page | Test page name | Test page description | C1 | page1 | + | qbank | Test qbank name | Test qbank description | C1 | qbank1 | | quiz | Test quiz name | Test quiz description | C1 | quiz1 | | resource | Test resource name | Test resource description | C1 | resource1 | | scorm | Test scorm name | Test scorm description | C1 | scorm1 | | url | Test url name | Test url description | C1 | url1 | | wiki | Test wiki name | Test wiki description | C1 | wiki1 | | workshop | Test workshop name | Test workshop description | C1 | workshop1 | + | qbank | Test qbank name | Test qbank description | C1 | qbank1 | When I log in as "admin" And I am on "Course 1" course homepage with editing mode on @@ -147,3 +154,6 @@ Feature: Block activity modules And I should see "Test imscp name" And I should see "Test folder name" And I should see "Test url name" + And I should not see "Test qbank name" + And I am on "Course 1" course homepage + And "Question banks" "link" should not exist in the "Activities" "block" diff --git a/blocks/completionstatus/block_completionstatus.php b/blocks/completionstatus/block_completionstatus.php index 4735e7600622f..9bd4c6fadb489 100644 --- a/blocks/completionstatus/block_completionstatus.php +++ b/blocks/completionstatus/block_completionstatus.php @@ -104,6 +104,9 @@ public function get_content() { // Flag to set if current completion data is inconsistent with what is stored in the database. $pending_update = false; + // Get activities visible to the user that have completion enabled. + $visibleactivities = $info->get_user_activities_with_completion($USER->id); + // Loop through course criteria. foreach ($completions as $completion) { $criteria = $completion->get_criteria(); @@ -115,6 +118,11 @@ public function get_content() { // Activities are a special case, so cache them and leave them till last. if ($criteria->criteriatype == COMPLETION_CRITERIA_TYPE_ACTIVITY) { + // Only include activities that are visible to the user. + if (!isset($visibleactivities[$criteria->moduleinstance])) { + continue; + } + $activities[$criteria->moduleinstance] = $complete; if ($complete) { diff --git a/blocks/completionstatus/details.php b/blocks/completionstatus/details.php index e00892babe2c6..eada453ce2c14 100644 --- a/blocks/completionstatus/details.php +++ b/blocks/completionstatus/details.php @@ -119,10 +119,21 @@ // Load criteria to display. $completions = $info->get_completions($user->id); +// Get activities visible to the user that have completion enabled. +$visibleactivities = $info->get_user_activities_with_completion($user->id); + // Loop through course criteria. foreach ($completions as $completion) { $criteria = $completion->get_criteria(); + // Skip display of activity completion criteria for activities the user cannot see. + if ( + $criteria->criteriatype == COMPLETION_CRITERIA_TYPE_ACTIVITY && + !isset($visibleactivities[$criteria->moduleinstance]) + ) { + continue; + } + if (!$pendingupdate && $criteria->is_pending($completion)) { $pendingupdate = true; } diff --git a/blocks/completionstatus/tests/behat/block_completionstatus_activity_completion.feature b/blocks/completionstatus/tests/behat/block_completionstatus_activity_completion.feature index 941a4683529e2..c57061d7c1bd5 100644 --- a/blocks/completionstatus/tests/behat/block_completionstatus_activity_completion.feature +++ b/blocks/completionstatus/tests/behat/block_completionstatus_activity_completion.feature @@ -6,9 +6,10 @@ Feature: Enable Block Completion in a course using activity completion Background: Given the following "users" exist: - | username | firstname | lastname | email | idnumber | - | teacher1 | Teacher | 1 | teacher1@example.com | T1 | - | student1 | Student | 1 | student1@example.com | S1 | + | username | firstname | lastname | email | idnumber | + | teacher1 | Teacher | 1 | teacher1@example.com | T1 | + | student1 | Student | 1 | student1@example.com | S1 | + | student2 | Student | 2 | student2@example.com | S2 | And the following "courses" exist: | fullname | shortname | category | enablecompletion | | Course 1 | C1 | 0 | 1 | @@ -16,6 +17,7 @@ Feature: Enable Block Completion in a course using activity completion | user | course | role | | teacher1 | C1 | editingteacher | | student1 | C1 | student | + | student2 | C1 | student | And the following "activities" exist: | activity | course | idnumber | name | gradepass | completion | completionview | completionusegrade | completionpassgrade | | page | C1 | page1 | Test page name | | 2 | 1 | 0 | 0 | @@ -23,10 +25,12 @@ Feature: Enable Block Completion in a course using activity completion And the following "blocks" exist: | blockname | contextlevel | reference | pagetypepattern | defaultregion | | completionstatus | Course | C1 | course-view-* | side-pre | + And I am on the "Course 1" course page logged in as teacher1 + And I change window size to "large" + And I turn editing mode on Scenario: Completion status block when student has not started any activities - Given I am on the "Course 1" course page logged in as teacher1 - And I navigate to "Course completion" in current page administration + Given I navigate to "Course completion" in current page administration And I expand all fieldsets And I set the following fields to these values: | Test page name | 1 | @@ -36,8 +40,7 @@ Feature: Enable Block Completion in a course using activity completion And I should see "0 of 1" in the "Activity completion" "table_row" Scenario: Completion status block when student has completed a page - Given I am on the "Course 1" course page logged in as teacher1 - And I navigate to "Course completion" in current page administration + Given I navigate to "Course completion" in current page administration And I expand all fieldsets And I set the following fields to these values: | Test page name | 1 | @@ -50,8 +53,7 @@ Feature: Enable Block Completion in a course using activity completion And I should see "Yes" in the "Activity completion" "table_row" Scenario: Completion status block with items with passing grade - Given I am on the "Course 1" course page logged in as teacher1 - And I navigate to "Course completion" in current page administration + Given I navigate to "Course completion" in current page administration And I expand all fieldsets And I set the following fields to these values: | Test assign name | 1 | @@ -69,8 +71,7 @@ Feature: Enable Block Completion in a course using activity completion And I should see "Yes" in the "Activity completion" "table_row" Scenario: Completion status block with items with failing grade - Given I am on the "Course 1" course page logged in as teacher1 - And the following "grade grades" exist: + Given the following "grade grades" exist: | gradeitem | user | grade | | Test assign name | student1 | 49 | And I navigate to "Course completion" in current page administration @@ -86,3 +87,265 @@ Feature: Enable Block Completion in a course using activity completion And I follow "More details" And I should see "Achieving grade, Achieving passing grade" in the "Activity completion" "table_row" And I should see "No" in the "Activity completion" "table_row" + + @javascript + Scenario: Student visibility respects combined activity and section restrictions with progressive completion + Given the following "activities" exist: + | activity | name | intro | course | idnumber | section | visible | completion | completionview | + | page | task A | page description | C1 | page1 | 0 | 1 | 2 | 1 | + | page | task B | page description | C1 | page2 | 1 | 1 | 2 | 1 | + | assign | task C | assignment description | C1 | assign1 | 1 | 1 | 2 | 1 | + And I navigate to "Course completion" in current page administration + And I expand all fieldsets + And I set the following fields to these values: + | Page - task A | 1 | + | Page - task B | 1 | + | Assignment - task C | 1 | + And I press "Save changes" + # Add conditionally visible restriction (open eye) to section 1 requiring task A completion. + And I turn editing mode on + And I edit the section "1" + And I expand all fieldsets + And I click on "Add restriction..." "button" + And I click on "Activity completion" "button" in the "Add restriction..." "dialogue" + And I set the field "Activity or resource" to "task A" + And I press "Save changes" + # Add conditionally hidden restriction (closed eye) to task C requiring task A completion. + And I am on the "task C" "assign activity editing" page + And I expand all fieldsets + And I click on "Add restriction..." "button" + And I click on "Activity completion" "button" in the "Add restriction..." "dialogue" + And I click on "Item name displayed with access restriction information if student doesn't meet this condition • Click to hide" "link" + And I set the field "Activity or resource" to "task A" + And I press "Save and return to course" + And I log out + # Initial state: Only unrestricted visible activities appear. + When I am on the "Course 1" course page logged in as student1 + Then I should see "Status: Not yet started" + And I should see "0 of 1" in the "Activity completion" "table_row" + And I follow "More details" + And I should see "task A" in the "criteriastatus" "table" + And I should not see "task B" in the "criteriastatus" "table" + And I should not see "task C" in the "criteriastatus" "table" + # After completing task A: Section 2 activities become visible. + And I click on "task A" "link" + And I am on the "Course 1" course page logged in as student1 + And I should see "Status: In progress" + And I should see "1 of 3" in the "Activity completion" "table_row" + And I follow "More details" + And I should see "task A" in the "criteriastatus" "table" + And I should see "task B" in the "criteriastatus" "table" + And I should see "task C" in the "criteriastatus" "table" + + @javascript + Scenario: Student completion view shows only accessible activities considering all activity restrictions + Given the following "activities" exist: + | activity | name | intro | course | idnumber | section | visible | completion | completionview | + | page | task A | page description | C1 | page1 | 0 | 1 | 2 | 1 | + | page | task B | page description | C1 | assign1 | 1 | 1 | 2 | 1 | + | assign | task C | assignment description | C1 | assign2 | 1 | 1 | 2 | 1 | + And I navigate to "Course completion" in current page administration + And I expand all fieldsets + # Set completion of the activities. + And I set the following fields to these values: + | Page - task A | 1 | + | Page - task B | 1 | + | Assignment - task C | 1 | + And I press "Save changes" + # Add conditionally visible restriction (open eye) to "task B". + And I am on the "task B" "page activity editing" page + And I expand all fieldsets + And I click on "Add restriction..." "button" + And I click on "Activity completion" "button" in the "Add restriction..." "dialogue" + And I set the field "Activity or resource" to "task A" + And I press "Save and return to course" + # Add conditionally hidden restriction (closed eye) to "task C". + And I am on the "task C" "assign activity editing" page + And I expand all fieldsets + And I click on "Add restriction..." "button" + And I click on "Activity completion" "button" in the "Add restriction..." "dialogue" + And I click on "Item name displayed with access restriction information if student doesn't meet this condition • Click to hide" "link" + And I set the field "Activity or resource" to "task A" + And I press "Save and return to course" + When I am on the "Course 1" course page logged in as student1 + And I should see "Status: Not yet started" + And I should see "0 of 2" in the "Activity completion" "table_row" + And I follow "More details" + Then I should see "task A" in the "criteriastatus" "table" + And I should see "task B" in the "criteriastatus" "table" + And I should not see "task C" in the "criteriastatus" "table" + And I click on "task A" "link" + # Complete task A to make task C visible. + And I am on the "Course 1" course page logged in as student1 + And I should see "Status: In progress" + And I should see "1 of 3" in the "Activity completion" "table_row" + And I follow "More details" + And I should see "task A" in the "criteriastatus" "table" + And I should see "task B" in the "criteriastatus" "table" + And I should see "task C" in the "criteriastatus" "table" + + @javascript + Scenario: Hidden activities do not appear in the completion status block + Given the following "activities" exist: + | activity | name | intro | course | idnumber | section | visible | completion | completionview | + | page | task A | page description | C1 | page1 | 0 | 1 | 2 | 1 | + | page | task B | page description | C1 | page2 | 0 | 0 | 2 | 1 | + And I navigate to "Course completion" in current page administration + And I expand all fieldsets + # Set completion of the activities. + And I set the following fields to these values: + | Page - task A | 1 | + | Page - task B | 1 | + And I press "Save changes" + When I am on the "Course 1" course page logged in as student1 + And I should see "Status: Not yet started" + And I should see "0 of 1" in the "Activity completion" "table_row" + And I follow "More details" + And I should see "task A" in the "criteriastatus" "table" + Then I should not see "task B" in the "criteriastatus" "table" + + @javascript + Scenario: Activities in the hidden section do not appear in the completion status block + Given the following "activities" exist: + | activity | name | intro | course | idnumber | section | visible | completion | completionview | + | page | task A | page description | C1 | page1 | 0 | 1 | 2 | 1 | + | page | task B | page description | C1 | page2 | 1 | 1 | 2 | 1 | + | assign | task C | page description | C1 | page3 | 2 | 1 | 2 | 1 | + | assign | task D | page description | C1 | page4 | 3 | 1 | 2 | 1 | + And I navigate to "Course completion" in current page administration + And I expand all fieldsets + # Set completion of the activities. + And I set the following fields to these values: + | Page - task A | 1 | + | Page - task B | 1 | + | Assignment - task C | 1 | + | Assignment - task D | 1 | + And I press "Save changes" + # Hide section 1 to make sure book activities are not visible to the student. + And I hide section "1" + # Add conditionally visible restriction to section 2. + And I edit the section "2" + And I expand all fieldsets + And I click on "Add restriction..." "button" + And I click on "Activity completion" "button" in the "Add restriction..." "dialogue" + And I set the field "Activity or resource" to "task A" + And I press "Save changes" + # Add conditionally hidden restriction to section 3. + And I am on the "Course 1" course page + And I edit the section "3" + And I expand all fieldsets + And I click on "Add restriction..." "button" + And I click on "Activity completion" "button" in the "Add restriction..." "dialogue" + And I set the field "Activity or resource" to "task A" + And I click on "Item name displayed with access restriction information if student doesn't meet this condition • Click to hide" "link" + And I press "Save changes" + And I log out + When I am on the "Course 1" course page logged in as student1 + And I should see "Status: Not yet started" + And I should see "0 of 1" in the "Activity completion" "table_row" + And I follow "More details" + Then I should see "task A" in the "criteriastatus" "table" + And I should not see "task B" in the "criteriastatus" "table" + And I should not see "task C" in the "criteriastatus" "table" + And I should not see "task D" in the "criteriastatus" "table" + # Complete task A to make other activities visible. + And I click on "task A" "link" + And I am on the "Course 1" course page logged in as student1 + And I should see "Status: In progress" + And I should see "1 of 3" in the "Activity completion" "table_row" + And I follow "More details" + And I should see "task A" in the "criteriastatus" "table" + And I should not see "task B" in the "criteriastatus" "table" + And I should see "task C" in the "criteriastatus" "table" + And I should see "task D" in the "criteriastatus" "table" + + @javascript + Scenario: Activities with disabled completion tracking are omitted from the completion view + Given the following "activities" exist: + | activity | name | intro | course | idnumber | section | visible | completion | completionview | + | page | task A | page description | C1 | page1 | 0 | 1 | 2 | 1 | + | page | task B | page description | C1 | page2 | 1 | 1 | 2 | 1 | + And I navigate to "Course completion" in current page administration + And I expand all fieldsets + # Set completion of the activities. + And I set the following fields to these values: + | Page - task A | 1 | + | Page - task B | 1 | + And I press "Save changes" + # Disable completion tracking for "task A". + And I am on the "task A" "page activity editing" page + And I expand all fieldsets + And I set the following fields to these values: + | completion | 0 | + And I press "Save and return to course" + When I am on the "Course 1" course page logged in as student1 + And I should see "Status: Not yet started" + And I should see "0 of 1" in the "Activity completion" "table_row" + And I follow "More details" + Then I should not see "task A" in the "criteriastatus" "table" + And I should see "task B" in the "criteriastatus" "table" + + @javascript + Scenario: Activities with group or grouping restrictions are omitted from the completion view + Given the following "activities" exist: + | activity | name | intro | course | idnumber | section | visible | completion | completionview | + | page | task A | page description | C1 | page1 | 0 | 1 | 2 | 1 | + | page | task B | page description | C1 | page2 | 1 | 1 | 2 | 1 | + | page | task C | page description | C1 | page3 | 2 | 1 | 2 | 1 | + And I navigate to "Course completion" in current page administration + And I expand all fieldsets + # Set completion of the activities. + And I set the following fields to these values: + | Page - task A | 1 | + | Page - task B | 1 | + | Page - task C | 1 | + And I press "Save changes" + # Add groups and groupings. + And the following "groups" exist: + | name | course | idnumber | + | G1 | C1 | GI1 | + | G2 | C1 | GI2 | + And the following "groupings" exist: + | name | course | idnumber | + | Grouping 1 | C1 | GG1 | + | Grouping 2 | C1 | GG2 | + And the following "grouping groups" exist: + | grouping | group | + | GG1 | GI1 | + | GG2 | GI2 | + # Add students to groups. + And the following "group members" exist: + | user | group | + | student1 | GI1 | + | student2 | GI2 | + # Add group restriction to "task B". + And I am on the "task B" "page activity editing" page + And I expand all fieldsets + And I click on "Add restriction..." "button" + And I click on "Group" "button" in the "Add restriction..." "dialogue" + And I set the field "Group" to "G1" + And I click on "Save and return to course" "button" + # Add Grouping and 'Activity or resource' restriction to "task C". + And I am on the "task C" "page activity editing" page + And I expand all fieldsets + And I click on "Add restriction..." "button" + And I click on "Grouping" "button" in the "Add restriction..." "dialogue" + And I set the field "Grouping" to "Grouping 2" + And I click on "Add restriction..." "button" + And I click on "Activity completion" "button" in the "Add restriction..." "dialogue" + And I set the field "Activity or resource" to "task A" + And I click on "Save and return to course" "button" + When I am on the "Course 1" course page logged in as student1 + And I should see "Status: Not yet started" + And I should see "0 of 2" in the "Activity completion" "table_row" + And I follow "More details" + Then I should see "task A" in the "criteriastatus" "table" + And I should see "task B" in the "criteriastatus" "table" + And I should not see "task C" in the "criteriastatus" "table" + And I am on the "Course 1" course page logged in as student2 + And I should see "Status: Not yet started" + And I should see "0 of 2" in the "Activity completion" "table_row" + And I follow "More details" + And I should see "task A" in the "criteriastatus" "table" + And I should not see "task B" in the "criteriastatus" "table" + And I should see "task C" in the "criteriastatus" "table" diff --git a/blocks/html/UPGRADING.md b/blocks/html/UPGRADING.md new file mode 100644 index 0000000000000..645286a21fef7 --- /dev/null +++ b/blocks/html/UPGRADING.md @@ -0,0 +1,9 @@ +# block_html Upgrade notes + +## 5.0.7 + +### Changed + +- Treat Dashboard (pagetype 'my-index') as trusted in web services so get_content_for_external preserves embedded HTML (e.g. iframes) on user Dashboard. + + For more information see [MDL-85322](https://tracker.moodle.org/browse/MDL-85322) diff --git a/blocks/html/block_html.php b/blocks/html/block_html.php index a771244f8d480..dae8b6e38a85d 100644 --- a/blocks/html/block_html.php +++ b/blocks/html/block_html.php @@ -165,14 +165,24 @@ public function instance_copy($fromid) { } function content_is_trusted() { - global $SCRIPT; - + global $SCRIPT, $USER; if (!$context = context::instance_by_id($this->instance->parentcontextid, IGNORE_MISSING)) { return false; } //find out if this block is on the profile page if ($context->contextlevel == CONTEXT_USER) { - if ($SCRIPT === '/my/index.php') { + $usersubpage = my_get_page($USER->id); + $usersubpage = $usersubpage->id ?? null; + if ( + $SCRIPT === '/my/index.php' || + ( + defined('WS_SERVER') && + WS_SERVER && + !empty($this->page) && + $this->page->pagetype === 'my-index' && + $this->page->subpage === $usersubpage + ) + ) { // this is exception - page is completely private, nobody else may see content there // that is why we allow JS here return true; diff --git a/blocks/moodleblock.class.php b/blocks/moodleblock.class.php index 67dd78b1d860d..6b5297f429297 100644 --- a/blocks/moodleblock.class.php +++ b/blocks/moodleblock.class.php @@ -240,9 +240,8 @@ public function get_content_for_output($output) { $bc->title = $this->title; } - if (empty($bc->title)) { - $bc->arialabel = new lang_string('pluginname', get_class($this)); - $this->arialabel = $bc->arialabel; + if ((string) $bc->title === '') { + $this->arialabel = $bc->arialabel = get_string('pluginname', get_class($this)); } if ($this->page->user_is_editing() && $this->instance_can_be_edited()) { diff --git a/blocks/myoverview/templates/main.mustache b/blocks/myoverview/templates/main.mustache index a1c81adfcd983..7c369dca452a0 100644 --- a/blocks/myoverview/templates/main.mustache +++ b/blocks/myoverview/templates/main.mustache @@ -23,7 +23,7 @@ {} }} - +{{> block_myoverview/nav-grouping-selector }} diff --git a/blocks/myoverview/templates/zero-state.mustache b/blocks/myoverview/templates/zero-state.mustache index 403679c93353b..7d221d58f4e64 100644 --- a/blocks/myoverview/templates/zero-state.mustache +++ b/blocks/myoverview/templates/zero-state.mustache @@ -44,14 +44,14 @@ } }} -+diff --git a/blocks/timeline/tests/behat/block_timeline_courses.feature b/blocks/timeline/tests/behat/block_timeline_courses.feature index 90720be4c7eeb..3564c0dfde31e 100644 --- a/blocks/timeline/tests/behat/block_timeline_courses.feature +++ b/blocks/timeline/tests/behat/block_timeline_courses.feature @@ -37,8 +37,10 @@ Feature: The timeline block allows users to see upcoming courses | student1 | C3 | student | | student1 | C4 | student | + @accessibility Scenario: Next 30 days in course view Given I log in as "student1" + And the "Timeline" "block" should meet accessibility standards with "best-practice" extra tests And I click on "Filter timeline by date" "button" in the "Timeline" "block" And I click on "Next 30 days" "link" in the "Timeline" "block" And I click on "Sort timeline items" "button" in the "Timeline" "block" @@ -61,6 +63,7 @@ Feature: The timeline block allows users to see upcoming courses And "Test feedback 2" "link" should not exist in the "Timeline" "block" And "Test feedback 3" "link" should not exist in the "Timeline" "block" And "Test assign 1" "link" should not exist in the "Timeline" "block" + And the "Timeline" "block" should meet accessibility standards with "best-practice" extra tests Scenario: All in course view Given I log in as "student1" diff --git a/blocks/timeline/tests/behat/block_timeline_dates.feature b/blocks/timeline/tests/behat/block_timeline_dates.feature index 681fd1aad06a2..c1bb71e0b9b5f 100644 --- a/blocks/timeline/tests/behat/block_timeline_dates.feature +++ b/blocks/timeline/tests/behat/block_timeline_dates.feature @@ -50,9 +50,11 @@ Feature: The timeline block allows users to see upcoming activities And "Test assign 1" "link" should not exist in the "Timeline" "block" And I should not see "Assignment is due · Course 1" in the "Timeline" "block" + @accessibility Scenario: Overdue in date view Given I log in as "student1" And I click on "Filter timeline by date" "button" in the "Timeline" "block" + And the "Timeline" "block" should meet accessibility standards with "best-practice" extra tests When I click on "Overdue" "link" in the "Timeline" "block" Then "Test assign 1" "link" should exist in the "Timeline" "block" And I should see "Assignment is due · Course 1" in the "Timeline" "block" @@ -63,6 +65,7 @@ Feature: The timeline block allows users to see upcoming activities And "Test choice 3" "link" should not exist in the "Timeline" "block" And "Test feedback 3" "link" should not exist in the "Timeline" "block" And "Test feedback 4" "link" should not exist in the "Timeline" "block" + And the "Timeline" "block" should meet accessibility standards with "best-practice" extra tests Scenario: All in date view Given I log in as "student1" diff --git a/cache/stores/redis/lang/en/cachestore_redis.php b/cache/stores/redis/lang/en/cachestore_redis.php index c3332562c8f91..dd6cca9784925 100644 --- a/cache/stores/redis/lang/en/cachestore_redis.php +++ b/cache/stores/redis/lang/en/cachestore_redis.php @@ -24,7 +24,7 @@ defined('MOODLE_INTERNAL') || die(); -$string['ca_file'] = 'CA file path'; +$string['ca_file'] = 'Certificate Authority (CA) file path'; $string['ca_file_help'] = 'Location of Certificate Authority file on local filesystem'; $string['clustermode'] = 'Cluster mode'; $string['clustermode_help'] = 'Enabling cluster mode will run the Redis Cluster function, allowing your server to serve multiple servers to handle concurrent requests simultaneously.'; @@ -34,8 +34,8 @@ $string['compressor_php_zstd'] = 'Use Zstandard compression.'; $string['connectiontimeout'] = 'Connection timeout'; $string['connectiontimeout_help'] = 'This sets the timeout when attempting to connect to the Redis server.'; -$string['encrypt_connection'] = 'Use TLS encryption.'; -$string['encrypt_connection_help'] = 'Use TLS to connect to Redis. Do not use \'tls://\' in the hostname for Redis, use this option instead.'; +$string['encrypt_connection'] = 'Use Transport Layer Security (TLS) encryption'; +$string['encrypt_connection_help'] = 'Use Transport Layer Security (TLS) to connect to Redis. Do not use \'tls://\' in the hostname for Redis; use this option instead.'; $string['password'] = 'Password'; $string['password_help'] = 'This sets the password of the Redis server.'; $string['pluginname'] = 'Redis'; @@ -91,7 +91,7 @@ 172.23.0.13-
{{{ title }}}
+{{{ title }}}
{{{ intro }}}
diff --git a/blocks/timeline/templates/nav-day-filter.mustache b/blocks/timeline/templates/nav-day-filter.mustache index db8c8ae0233d0..75fbba3383f32 100644 --- a/blocks/timeline/templates/nav-day-filter.mustache +++ b/blocks/timeline/templates/nav-day-filter.mustache @@ -60,54 +60,56 @@ {{#str}} overdue, block_timeline {{/str}} -{{#str}} duedate, block_timeline {{/str}}
- - {{#str}} next7days, block_timeline {{/str}} - - - {{#str}} next30days, block_timeline {{/str}} - - - {{#str}} next3months, block_timeline {{/str}} - - - {{#str}} next6months, block_timeline {{/str}} - ++{{#str}} duedate, block_timeline {{/str}}+ + {{#str}} next7days, block_timeline {{/str}} + + + {{#str}} next30days, block_timeline {{/str}} + + + {{#str}} next3months, block_timeline {{/str}} + + + {{#str}} next6months, block_timeline {{/str}} + +
For further information, see Accepting Client Connections and Redis PHP clients.'; -$string['test_ttl'] = 'Testing TTL'; +$string['test_ttl'] = 'Testing Time-to-Live (TTL)'; $string['test_ttl_desc'] = 'Run the performance test using a cache that requires TTL (slower sets).'; $string['usecompressor'] = 'Use compressor'; $string['usecompressor_help'] = 'Specifies the compressor to use after serializing. It is done at Moodle Cache API level, not at php-redis level.'; diff --git a/calendar/classes/external/event_exporter_base.php b/calendar/classes/external/event_exporter_base.php index 527444da034d7..2381938ac9a2a 100644 --- a/calendar/classes/external/event_exporter_base.php +++ b/calendar/classes/external/event_exporter_base.php @@ -70,7 +70,7 @@ public function __construct(event_interface $event, $related = []) { $data = new \stdClass(); $data->id = $event->get_id(); - $data->name = $event->get_name(); + $data->name = clean_string($event->get_name()); $data->description = file_rewrite_pluginfile_urls( $event->get_description()->get_value(), 'pluginfile.php', diff --git a/calendar/tests/behat/calendar.feature b/calendar/tests/behat/calendar.feature index 80667d7d86502..ac4b4e58cf8a8 100644 --- a/calendar/tests/behat/calendar.feature +++ b/calendar/tests/behat/calendar.feature @@ -15,11 +15,11 @@ Feature: Perform basic calendar functionality | name | category | idnumber | | CatA | 0 | cata | And the following "courses" exist: - | fullname | shortname | format | category | - | Course 1 | C1 | topics | cata | - | Course 2 | C2 | topics | cata | - | Course 3 | C3 | topics | cata | - | Course 4 | C4 | topics | cata | + | fullname | shortname | format | category | startdate | + | Course 1 | C1 | topics | cata | ##first day of last month## | + | Course 2 | C2 | topics | cata | ##first day of last month## | + | Course 3 | C3 | topics | cata | ##first day of last month## | + | Course 4 | C4 | topics | cata | ##first day of last month## | And the following "course enrolments" exist: | user | course | role | | student1 | C1 | student | @@ -58,20 +58,24 @@ Feature: Perform basic calendar functionality Scenario: Create a course event Given I log in as "teacher1" And I create a calendar event with form data: - | Type of event | course | - | Course | Course 1 | - | Event title | Really awesome event! | - | Description | Come join this awesome event, sucka! | + | Type of event | course | + | Course | Course 1 | + | timestart[day] | 1 | + | Event title | Really awesome event! & < > " ' | + | Description | Come join this awesome event, sucka! | And I log out When I am on the "Course 1" course page logged in as student1 And I follow "Course calendar" - And I click on "Really awesome event!" "link" - And "Course 1" "link" should exist in the "Really awesome event!" "dialogue" - And I click on "Close" "button" in the "Really awesome event!" "dialogue" + And I hover over day "1" of this month in the full calendar page + And I should see "Really awesome event! & < > \" '" + And I click on "Really awesome event! & < > \" '" "link" + And I should see "Really awesome event! & < > \" '" in the ".modal-title" "css_element" + And I should see "Course 1" in the ".modal-body" "css_element" + And I click on "Close" "button" in the ".modal-content" "css_element" And I log out And I log in as "student2" And I follow "Full calendar" - Then I should not see "Really awesome event!" + Then I should not see "Really awesome event! & < > \" '" @javascript Scenario: Create a group event diff --git a/cohort/lib.php b/cohort/lib.php index 3d7ef7195acf4..c0403b59e551d 100644 --- a/cohort/lib.php +++ b/cohort/lib.php @@ -363,7 +363,7 @@ function cohort_can_view_cohort($cohortorid, $currentcontext) { $cohort = $cohortorid; } - if ($cohort && in_array($cohort->contextid, $currentcontext->get_parent_context_ids())) { + if ($cohort && in_array($cohort->contextid, $currentcontext->get_parent_context_ids(true))) { if ($cohort->visible) { return true; } diff --git a/cohort/tests/lib_test.php b/cohort/tests/lib_test.php index ef50c1344589a..c7c747a48c5f5 100644 --- a/cohort/tests/lib_test.php +++ b/cohort/tests/lib_test.php @@ -943,6 +943,21 @@ public function test_cohort_get_custom_fields_data(): void { } } + /** + * Test whether user can view cohort + * + * @covers ::cohort_can_view_cohort + */ + public function test_cohort_can_view_cohort(): void { + $this->resetAfterTest(); + $this->setAdminUser(); + + $context = \context_system::instance(); + $cohort = $this->getDataGenerator()->create_cohort(['contextid' => $context->id]); + + $this->assertTrue(cohort_can_view_cohort($cohort, $context)); + } + /** * Test the behaviour of cohort_get_cohort(). * diff --git a/completion/UPGRADING.md b/completion/UPGRADING.md index 4a3a6938ad1c4..5a521d736ec68 100644 --- a/completion/UPGRADING.md +++ b/completion/UPGRADING.md @@ -1,6 +1,6 @@ # core_completion (subsystem) Upgrade notes -## 5.0.3+ +## 5.0.4 ### Changed diff --git a/completion/classes/form/form_trait.php b/completion/classes/form/form_trait.php index b4682d857b4cb..106143f9ee5a3 100644 --- a/completion/classes/form/form_trait.php +++ b/completion/classes/form/form_trait.php @@ -475,6 +475,19 @@ protected function definition_after_data_completion(?cm_info $cm = null): void { // Don't use hardFreeze or checkbox value gets lost. $mform->freeze($completionviewel); } + + $receivegradegroupel = 'receiveagradegroup' . $suffix; + if ($mform->elementExists($receivegradegroupel)) { + $groupelements = $mform->getElement($receivegradegroupel)->getElements(); + foreach ($groupelements as $element) { + if ($element->_type == 'select') { + $element->updateAttributes(['disabled' => 'disabled']); + } else { + $element->freeze(); + } + } + } + $completionusegradeel = 'completionusegrade' . $suffix; if ($mform->elementExists($completionusegradeel)) { $mform->freeze($completionusegradeel); diff --git a/completion/classes/progress.php b/completion/classes/progress.php index 6689bfd295aa5..48c8c2bf63f50 100644 --- a/completion/classes/progress.php +++ b/completion/classes/progress.php @@ -70,14 +70,14 @@ public static function get_course_progress_percentage($course, $userid = 0) { } // Get the number of modules that support completion. - $modules = $completion->get_activities(); + $modules = $completion->get_user_activities_with_completion($userid); $count = count($modules); if (!$count) { return null; } // Get the number of modules that have been completed. - $totalcompleted = $completion->count_modules_completed($userid); + $totalcompleted = $completion->count_modules_completed($userid, array_keys($modules)); return ($totalcompleted / $count) * 100; } diff --git a/completion/tests/progress_test.php b/completion/tests/progress_test.php index d0960395044b8..29151b08e3d89 100644 --- a/completion/tests/progress_test.php +++ b/completion/tests/progress_test.php @@ -17,6 +17,8 @@ namespace core_completion; use completion_completion; +use core_availability\tree; +use availability_date\condition; /** * Test completion progress API. @@ -67,6 +69,8 @@ public function test_course_progress_percentage_with_just_activities(): void { // Add an activity that does *not* use completion. $this->getDataGenerator()->create_module('assign', array('course' => $course->id)); + $this->setUser($user); + // Mark two of them as completed for a user. $cmassign = get_coursemodule_from_id('assign', $assign->cmid); $cmdata = get_coursemodule_from_id('data', $data->cmid); @@ -283,4 +287,292 @@ public function test_course_progress_not_tracked_user(): void { // Check that the result is null now. $this->assertNull(\core_completion\progress::get_course_progress_percentage($course, $user->id)); } + + /** + * Tests course progress with hidden section. + */ + public function test_course_progress_percentage_with_hidden_section(): void { + global $DB; + + // Create a course with completion enabled and two sections. + $course = $this->getDataGenerator()->create_course([ + 'enablecompletion' => 1, + 'numsections' => 2, + 'format' => 'topics', + ]); + + // Enrol a student. + $user = $this->getDataGenerator()->create_user(); + $studentrole = $DB->get_record('role', ['shortname' => 'student']); + $this->getDataGenerator()->enrol_user($user->id, $course->id, $studentrole->id); + + /** @var \mod_assign_generator $assigngenerator */ + $assigngenerator = $this->getDataGenerator()->get_plugin_generator('mod_assign'); + + // Add visible activities to section 0 and 1. + $activity1 = $assigngenerator->create_instance([ + 'course' => $course->id, + 'section' => 0, + 'completion' => COMPLETION_ENABLED, + ]); + $activity2 = $assigngenerator->create_instance([ + 'course' => $course->id, + 'section' => 1, + 'completion' => COMPLETION_ENABLED, + ]); + $this->setUser($user); + + // Hide section 1. + set_section_visible($course->id, 1, 0); + $completion = new \completion_info($course); + + // Complete the visible activity: activity1. + $cm = get_coursemodule_from_id('assign', $activity1->cmid); + $completion->update_state($cm, COMPLETION_COMPLETE, $user->id); + + // Only the visible activity (activity1) counts toward course completion. + // Activities in hidden sections are not included in the calculation. + $this->assertEquals(100, \core_completion\progress::get_course_progress_percentage($course, $user->id)); + + // Now unhide section 1. + set_section_visible($course->id, 1, 1); + + // Course completion: 1 of 2 visible activities complete; previously hidden activity now counted. + $this->assertEquals(50, \core_completion\progress::get_course_progress_percentage($course, $user->id)); + } + + /** + * Tests course progress with hidden activity. + */ + public function test_course_progress_percentage_with_hidden_activity(): void { + global $DB; + + // Create a course with completion enabled and two sections. + $course = $this->getDataGenerator()->create_course([ + 'enablecompletion' => 1, + 'numsections' => 3, + 'format' => 'topics', + ]); + + // Enrol a student. + $user = $this->getDataGenerator()->create_user(); + $studentrole = $DB->get_record('role', ['shortname' => 'student']); + $this->getDataGenerator()->enrol_user($user->id, $course->id, $studentrole->id); + + /** @var \mod_assign_generator $assigngenerator */ + $assigngenerator = $this->getDataGenerator()->get_plugin_generator('mod_assign'); + + // Section 0: visible activity. + $activity1 = $assigngenerator->create_instance([ + 'course' => $course->id, + 'section' => 0, + 'completion' => COMPLETION_ENABLED, + ]); + + // Section 1: hidden activity. + $activity2 = $assigngenerator->create_instance([ + 'course' => $course->id, + 'section' => 1, + 'completion' => COMPLETION_ENABLED, + 'visible' => 0, + ]); + + $completion = new \completion_info($course); + $this->setUser($user); + + // Complete activity1 (visible). + $cm1 = get_coursemodule_from_id('assign', $activity1->cmid); + $completion->update_state($cm1, COMPLETION_COMPLETE, $user->id); + + // Only 1 visible activity: course completion = 100%. + $this->assertEquals(100, \core_completion\progress::get_course_progress_percentage($course, $user->id)); + + $cm2 = get_coursemodule_from_id('assign', $activity2->cmid); + // Show activity2. + $DB->set_field('course_modules', 'visible', 1, ['id' => $cm2->id]); + $completion->update_state($cm2, COMPLETION_COMPLETE, $user->id); + rebuild_course_cache($course->id, true); + + // Course completion: both activities are complete. + $this->assertEquals(100, \core_completion\progress::get_course_progress_percentage($course, $user->id)); + + // Hide activity1 so it is excluded from course progress. + $DB->set_field('course_modules', 'visible', 0, ['id' => $cm1->id]); + rebuild_course_cache($course->id, true); + + // Course completion: activity1 is hidden and excluded from calculation. + // Only activity2 remains visible and complete, so progress stays at 100%. + $this->assertEquals(100, \core_completion\progress::get_course_progress_percentage($course, $user->id)); + } + + /** + * Tests course progress percentage with availability restrictions. + */ + public function test_course_progress_percentage_with_availability_restrictions(): void { + global $DB; + + set_config('enableavailability', 1); + + // Create a course with completion enabled. + $course = $this->getDataGenerator()->create_course([ + 'enablecompletion' => 1, + 'format' => 'topics', + ]); + + // Create and enrol a student. + $user = $this->getDataGenerator()->create_user(); + $studentrole = $DB->get_record('role', ['shortname' => 'student']); + $this->getDataGenerator()->enrol_user($user->id, $course->id, $studentrole->id); + + /** @var \mod_assign_generator $assigngenerator */ + $assigngenerator = $this->getDataGenerator()->get_plugin_generator('mod_assign'); + + // Activity 1: no restrictions (always visible). + $assign['activity1'] = $assigngenerator->create_instance([ + 'course' => $course->id, + 'completion' => COMPLETION_ENABLED, + ]); + + // Activity 2: date restriction from past (visible). + $assign['activity2'] = $assigngenerator->create_instance([ + 'course' => $course->id, + 'completion' => COMPLETION_ENABLED, + ]); + $availabilityjson = json_encode(tree::get_root_json( + [ + condition::get_json(condition::DIRECTION_FROM, time() - 3600), + ], + tree::OP_AND, + false, + )); + $DB->set_field('course_modules', 'availability', $availabilityjson, ['id' => $assign['activity2']->cmid]); + + // Activity 3: date restriction from future, shows info (open eye). + $assign['activity3'] = $assigngenerator->create_instance([ + 'course' => $course->id, + 'completion' => COMPLETION_ENABLED, + ]); + $availabilityjson = json_encode(tree::get_root_json( + [ + condition::get_json(condition::DIRECTION_FROM, time() + 3600), + ], + tree::OP_AND, + true, + )); + $DB->set_field('course_modules', 'availability', $availabilityjson, ['id' => $assign['activity3']->cmid]); + + // Activity 4: date restriction from future, hidden (closed eye). + $assign['activity4'] = $assigngenerator->create_instance([ + 'course' => $course->id, + 'completion' => COMPLETION_ENABLED, + ]); + $availabilityjson = json_encode(tree::get_root_json( + [ + condition::get_json(condition::DIRECTION_FROM, time() + 7200), + ], + tree::OP_AND, + false, + )); + $DB->set_field('course_modules', 'availability', $availabilityjson, ['id' => $assign['activity4']->cmid]); + + rebuild_course_cache($course->id, true); + + // Set user context and get completion info. + $this->setUser($user); + $completion = new \completion_info($course); + + // Initial completion: 0%. + $this->assertEquals(0, \core_completion\progress::get_course_progress_percentage($course, $user->id)); + + // Complete activity 1. + $cm1 = get_coursemodule_from_id('assign', $assign['activity1']->cmid); + $completion->update_state($cm1, COMPLETION_COMPLETE, $user->id); + // 1 of 3 user-visible activities is complete; activity4 is hidden and ignored. + $this->assertEquals(33.33, round(\core_completion\progress::get_course_progress_percentage($course, $user->id), 2)); + + // Complete activity 2 (available from past). + $cm2 = get_coursemodule_from_id('assign', $assign['activity2']->cmid); + $completion->update_state($cm2, COMPLETION_COMPLETE, $user->id); + // Now 2 of the 3 user-visible activities are complete. + $this->assertEquals(66.67, round(\core_completion\progress::get_course_progress_percentage($course, $user->id), 2)); + + // Mark the restricted activity (with open eye) as complete. + $cm3 = get_coursemodule_from_id('assign', $assign['activity3']->cmid); + $completion->update_state($cm3, COMPLETION_COMPLETE, $user->id); + // All 3 user-visible activities are now complete; activity4 remains hidden. + $this->assertEquals(100, round(\core_completion\progress::get_course_progress_percentage($course, $user->id), 2)); + } + + /** + * Tests course progress percentage with group restrictions. + */ + public function test_course_progress_percentage_with_group_restrictions(): void { + global $DB; + + set_config('enableavailability', 1); + + // Create a course with completion enabled. + $course = $this->getDataGenerator()->create_course([ + 'enablecompletion' => 1, + 'format' => 'topics', + ]); + + // Create and enrol two students in the course. + $user1 = $this->getDataGenerator()->create_user(); + $user2 = $this->getDataGenerator()->create_user(); + $studentrole = $DB->get_record('role', ['shortname' => 'student']); + $this->getDataGenerator()->enrol_user($user1->id, $course->id, $studentrole->id); + $this->getDataGenerator()->enrol_user($user2->id, $course->id, $studentrole->id); + + // Create a group and add user1. + $group1 = $this->getDataGenerator()->create_group([ + 'courseid' => $course->id, + 'name' => 'Group 1', + ]); + $this->getDataGenerator()->create_group_member([ + 'groupid' => $group1->id, + 'userid' => $user1->id, + ]); + + /** @var \mod_assign_generator $assigngenerator */ + $assigngenerator = $this->getDataGenerator()->get_plugin_generator('mod_assign'); + + // Activity 1: restricted to group1. + $assign['activity1'] = $assigngenerator->create_instance([ + 'course' => $course->id, + 'completion' => COMPLETION_ENABLED, + ]); + $availabilityjson = json_encode(tree::get_root_json( + [ + \availability_group\condition::get_json($group1->id), + ], + tree::OP_AND, + false, + )); + $DB->set_field('course_modules', 'availability', $availabilityjson, ['id' => $assign['activity1']->cmid]); + + // Activity 2: Visible to all users. + $assign['activity2'] = $assigngenerator->create_instance([ + 'course' => $course->id, + 'completion' => COMPLETION_ENABLED, + ]); + rebuild_course_cache($course->id, true); + + $cm1 = get_coursemodule_from_id('assign', $assign['activity1']->cmid); + $cm2 = get_coursemodule_from_id('assign', $assign['activity2']->cmid); + + // Test user1 (in group): complete both the activities. + $this->setUser($user1); + $completion = new \completion_info($course); + $completion->update_state($cm1, COMPLETION_COMPLETE, $user1->id); + $this->assertEquals(50, \core_completion\progress::get_course_progress_percentage($course, $user1->id)); + $completion->update_state($cm2, COMPLETION_COMPLETE, $user1->id); + $this->assertEquals(100, \core_completion\progress::get_course_progress_percentage($course, $user1->id)); + + // Test user2 (not in group1): completes only the visible activity. + $this->setUser($user2); + $completion = new \completion_info($course); + $completion->update_state($cm2, COMPLETION_COMPLETE, $user2->id); + $this->assertEquals(100, \core_completion\progress::get_course_progress_percentage($course, $user2->id)); + } } diff --git a/composer.json b/composer.json index b15c852651bee..23f62fbe71b0a 100644 --- a/composer.json +++ b/composer.json @@ -2,8 +2,11 @@ "name": "moodle/moodle", "license": "GPL-3.0-or-later", "description": "Moodle - the world's open source learning platform", - "type": "project", + "type": "moodle-core", "homepage": "https://moodle.org", + "provide": { + "moodle/lms": "5.0" + }, "require-dev": { "phpunit/phpunit": "^11", "mikey179/vfsstream": "1.6.*", diff --git a/composer.lock b/composer.lock index ea964a4fd9783..cdaaced1505d5 100644 --- a/composer.lock +++ b/composer.lock @@ -4,30 +4,30 @@ "Read more about it at https://getcomposer.org/doc/01-basic-usage.md#installing-dependencies", "This file is @generated automatically" ], - "content-hash": "6dea3d23fae938df252056489715c946", + "content-hash": "fba05eba0b3cff21bd21605a82e4cdf0", "packages": [], "packages-dev": [ { "name": "behat/behat", - "version": "v3.19.0", + "version": "v3.29.0", "source": { "type": "git", "url": "https://github.com/Behat/Behat.git", - "reference": "6cf82375a88145e33e10a34b211a3f914cbd02ee" + "reference": "51bdf81639a14645c5d2c06926f4aa37d204921b" }, "dist": { "type": "zip", - "url": "https://api.github.com/repos/Behat/Behat/zipball/6cf82375a88145e33e10a34b211a3f914cbd02ee", - "reference": "6cf82375a88145e33e10a34b211a3f914cbd02ee", + "url": "https://api.github.com/repos/Behat/Behat/zipball/51bdf81639a14645c5d2c06926f4aa37d204921b", + "reference": "51bdf81639a14645c5d2c06926f4aa37d204921b", "shasum": "" }, "require": { - "behat/gherkin": "^4.10.0", - "behat/transliterator": "^1.5", + "behat/gherkin": "^4.12.0", "composer-runtime-api": "^2.2", - "composer/xdebug-handler": "^3.0", + "composer/xdebug-handler": "^1.4 || ^2.0 || ^3.0", "ext-mbstring": "*", - "php": "8.1.* || 8.2.* || 8.3.* || 8.4.* ", + "nikic/php-parser": "^4.19.2 || ^5.2", + "php": ">=8.1 <8.6", "psr/container": "^1.0 || ^2.0", "symfony/config": "^5.4 || ^6.4 || ^7.0", "symfony/console": "^5.4 || ^6.4 || ^7.0", @@ -37,10 +37,13 @@ "symfony/yaml": "^5.4 || ^6.4 || ^7.0" }, "require-dev": { - "friendsofphp/php-cs-fixer": "^3.68", + "opis/json-schema": "^2.5", + "php-cs-fixer/shim": "^3.89", "phpstan/phpstan": "^2.0", "phpunit/phpunit": "^9.6", + "rector/rector": "2.1.7", "sebastian/diff": "^4.0", + "symfony/filesystem": "^5.4 || ^6.4 || ^7.0", "symfony/polyfill-php84": "^1.31", "symfony/process": "^5.4 || ^6.4 || ^7.0" }, @@ -51,11 +54,6 @@ "bin/behat" ], "type": "library", - "extra": { - "branch-alias": { - "dev-master": "3.x-dev" - } - }, "autoload": { "psr-4": { "Behat\\Hook\\": "src/Behat/Hook/", @@ -95,36 +93,50 @@ ], "support": { "issues": "https://github.com/Behat/Behat/issues", - "source": "https://github.com/Behat/Behat/tree/v3.19.0" + "source": "https://github.com/Behat/Behat/tree/v3.29.0" }, - "time": "2025-02-13T09:07:11+00:00" + "funding": [ + { + "url": "https://github.com/acoulton", + "type": "github" + }, + { + "url": "https://github.com/carlos-granados", + "type": "github" + }, + { + "url": "https://github.com/stof", + "type": "github" + } + ], + "time": "2025-12-11T09:51:30+00:00" }, { "name": "behat/gherkin", - "version": "v4.12.0", + "version": "v4.16.1", "source": { "type": "git", "url": "https://github.com/Behat/Gherkin.git", - "reference": "cc3a7e224b36373be382b53ef02ede0f1807bb58" + "reference": "e26037937dfd48528746764dd870bc5d0836665f" }, "dist": { "type": "zip", - "url": "https://api.github.com/repos/Behat/Gherkin/zipball/cc3a7e224b36373be382b53ef02ede0f1807bb58", - "reference": "cc3a7e224b36373be382b53ef02ede0f1807bb58", + "url": "https://api.github.com/repos/Behat/Gherkin/zipball/e26037937dfd48528746764dd870bc5d0836665f", + "reference": "e26037937dfd48528746764dd870bc5d0836665f", "shasum": "" }, "require": { "composer-runtime-api": "^2.2", - "php": "8.1.* || 8.2.* || 8.3.* || 8.4.*" + "php": ">=8.1 <8.6" }, "require-dev": { - "cucumber/cucumber": "dev-gherkin-24.1.0", - "friendsofphp/php-cs-fixer": "^3.65", + "cucumber/gherkin-monorepo": "dev-gherkin-v37.0.0", + "friendsofphp/php-cs-fixer": "^3.77", + "mikey179/vfsstream": "^1.6", "phpstan/extension-installer": "^1", "phpstan/phpstan": "^2", "phpstan/phpstan-phpunit": "^2", "phpunit/phpunit": "^10.5", - "symfony/filesystem": "^5.4 || ^6.4 || ^7.0", "symfony/yaml": "^5.4 || ^6.4 || ^7.0" }, "suggest": { @@ -137,8 +149,8 @@ } }, "autoload": { - "psr-0": { - "Behat\\Gherkin": "src/" + "psr-4": { + "Behat\\Gherkin\\": "src/" } }, "notification-url": "https://packagist.org/downloads/", @@ -164,34 +176,49 @@ ], "support": { "issues": "https://github.com/Behat/Gherkin/issues", - "source": "https://github.com/Behat/Gherkin/tree/v4.12.0" + "source": "https://github.com/Behat/Gherkin/tree/v4.16.1" }, - "time": "2025-02-26T14:28:23+00:00" + "funding": [ + { + "url": "https://github.com/acoulton", + "type": "github" + }, + { + "url": "https://github.com/carlos-granados", + "type": "github" + }, + { + "url": "https://github.com/stof", + "type": "github" + } + ], + "time": "2025-12-08T16:12:58+00:00" }, { "name": "behat/mink", - "version": "v1.12.0", + "version": "v1.13.0", "source": { "type": "git", "url": "https://github.com/minkphp/Mink.git", - "reference": "7e4edec6c335937029cb3569ce7ef81182804d0a" + "reference": "9b08f62937c173affe070c04bb072d7ea1db1be5" }, "dist": { "type": "zip", - "url": "https://api.github.com/repos/minkphp/Mink/zipball/7e4edec6c335937029cb3569ce7ef81182804d0a", - "reference": "7e4edec6c335937029cb3569ce7ef81182804d0a", + "url": "https://api.github.com/repos/minkphp/Mink/zipball/9b08f62937c173affe070c04bb072d7ea1db1be5", + "reference": "9b08f62937c173affe070c04bb072d7ea1db1be5", "shasum": "" }, "require": { "php": ">=7.2", - "symfony/css-selector": "^4.4 || ^5.0 || ^6.0 || ^7.0" + "symfony/css-selector": "^4.4 || ^5.0 || ^6.0 || ^7.0 || ^8.0" }, "require-dev": { - "phpstan/phpstan": "^1.10", + "jetbrains/phpstorm-attributes": "*", + "phpstan/phpstan": "^1.12.32", "phpstan/phpstan-phpunit": "^1.3", "phpunit/phpunit": "^8.5.22 || ^9.5.11", - "symfony/error-handler": "^4.4 || ^5.0 || ^6.0 || ^7.0", - "symfony/phpunit-bridge": "^5.4 || ^6.0 || ^7.0" + "symfony/error-handler": "^4.4 || ^5.0 || ^6.0 || ^7.0 || ^8.0", + "symfony/phpunit-bridge": "^5.4 || ^6.0 || ^7.0 || ^8.0" }, "suggest": { "behat/mink-browserkit-driver": "fast headless driver for any app without JS emulation", @@ -230,40 +257,40 @@ ], "support": { "issues": "https://github.com/minkphp/Mink/issues", - "source": "https://github.com/minkphp/Mink/tree/v1.12.0" + "source": "https://github.com/minkphp/Mink/tree/v1.13.0" }, - "time": "2024-10-30T18:48:14+00:00" + "time": "2025-11-22T12:18:15+00:00" }, { "name": "behat/mink-browserkit-driver", - "version": "v2.2.0", + "version": "v2.3.0", "source": { "type": "git", "url": "https://github.com/minkphp/MinkBrowserKitDriver.git", - "reference": "16d53476e42827ed3aafbfa4fde17a1743eafd50" + "reference": "d361516cba6e684bdc4518b9c044edc77f249e36" }, "dist": { "type": "zip", - "url": "https://api.github.com/repos/minkphp/MinkBrowserKitDriver/zipball/16d53476e42827ed3aafbfa4fde17a1743eafd50", - "reference": "16d53476e42827ed3aafbfa4fde17a1743eafd50", + "url": "https://api.github.com/repos/minkphp/MinkBrowserKitDriver/zipball/d361516cba6e684bdc4518b9c044edc77f249e36", + "reference": "d361516cba6e684bdc4518b9c044edc77f249e36", "shasum": "" }, "require": { "behat/mink": "^1.11.0@dev", "ext-dom": "*", "php": ">=7.2", - "symfony/browser-kit": "^4.4 || ^5.0 || ^6.0 || ^7.0", - "symfony/dom-crawler": "^4.4 || ^5.0 || ^6.0 || ^7.0" + "symfony/browser-kit": "^4.4 || ^5.0 || ^6.0 || ^7.0 || ^8.0", + "symfony/dom-crawler": "^4.4 || ^5.0 || ^6.0 || ^7.0 || ^8.0" }, "require-dev": { "mink/driver-testsuite": "dev-master", "phpstan/phpstan": "^1.10", "phpstan/phpstan-phpunit": "^1.3", "phpunit/phpunit": "^8.5 || ^9.5", - "symfony/error-handler": "^4.4 || ^5.0 || ^6.0 || ^7.0", - "symfony/http-client": "^4.4 || ^5.0 || ^6.0 || ^7.0", - "symfony/http-kernel": "^4.4 || ^5.0 || ^6.0 || ^7.0", - "symfony/mime": "^4.4 || ^5.0 || ^6.0 || ^7.0", + "symfony/error-handler": "^4.4 || ^5.0 || ^6.0 || ^7.0 || ^8.0", + "symfony/http-client": "^4.4 || ^5.0 || ^6.0 || ^7.0 || ^8.0", + "symfony/http-kernel": "^4.4 || ^5.0 || ^6.0 || ^7.0 || ^8.0", + "symfony/mime": "^4.4 || ^5.0 || ^6.0 || ^7.0 || ^8.0", "yoast/phpunit-polyfills": "^1.0" }, "type": "mink-driver", @@ -298,58 +325,9 @@ ], "support": { "issues": "https://github.com/minkphp/MinkBrowserKitDriver/issues", - "source": "https://github.com/minkphp/MinkBrowserKitDriver/tree/v2.2.0" + "source": "https://github.com/minkphp/MinkBrowserKitDriver/tree/v2.3.0" }, - "time": "2023-12-09T11:30:50+00:00" - }, - { - "name": "behat/transliterator", - "version": "v1.5.0", - "source": { - "type": "git", - "url": "https://github.com/Behat/Transliterator.git", - "reference": "baac5873bac3749887d28ab68e2f74db3a4408af" - }, - "dist": { - "type": "zip", - "url": "https://api.github.com/repos/Behat/Transliterator/zipball/baac5873bac3749887d28ab68e2f74db3a4408af", - "reference": "baac5873bac3749887d28ab68e2f74db3a4408af", - "shasum": "" - }, - "require": { - "php": ">=7.2" - }, - "require-dev": { - "chuyskywalker/rolling-curl": "^3.1", - "php-yaoi/php-yaoi": "^1.0", - "phpunit/phpunit": "^8.5.25 || ^9.5.19" - }, - "type": "library", - "extra": { - "branch-alias": { - "dev-master": "1.x-dev" - } - }, - "autoload": { - "psr-4": { - "Behat\\Transliterator\\": "src/Behat/Transliterator" - } - }, - "notification-url": "https://packagist.org/downloads/", - "license": [ - "Artistic-1.0" - ], - "description": "String transliterator", - "keywords": [ - "i18n", - "slug", - "transliterator" - ], - "support": { - "issues": "https://github.com/Behat/Transliterator/issues", - "source": "https://github.com/Behat/Transliterator/tree/v1.5.0" - }, - "time": "2022-03-30T09:27:43+00:00" + "time": "2025-11-22T12:42:18+00:00" }, { "name": "composer/pcre", @@ -498,16 +476,16 @@ }, { "name": "filp/whoops", - "version": "2.17.0", + "version": "2.18.4", "source": { "type": "git", "url": "https://github.com/filp/whoops.git", - "reference": "075bc0c26631110584175de6523ab3f1652eb28e" + "reference": "d2102955e48b9fd9ab24280a7ad12ed552752c4d" }, "dist": { "type": "zip", - "url": "https://api.github.com/repos/filp/whoops/zipball/075bc0c26631110584175de6523ab3f1652eb28e", - "reference": "075bc0c26631110584175de6523ab3f1652eb28e", + "url": "https://api.github.com/repos/filp/whoops/zipball/d2102955e48b9fd9ab24280a7ad12ed552752c4d", + "reference": "d2102955e48b9fd9ab24280a7ad12ed552752c4d", "shasum": "" }, "require": { @@ -557,7 +535,7 @@ ], "support": { "issues": "https://github.com/filp/whoops/issues", - "source": "https://github.com/filp/whoops/tree/2.17.0" + "source": "https://github.com/filp/whoops/tree/2.18.4" }, "funding": [ { @@ -565,7 +543,7 @@ "type": "github" } ], - "time": "2025-01-25T12:00:00+00:00" + "time": "2025-08-08T12:00:00+00:00" }, { "name": "friends-of-behat/mink-extension", @@ -635,16 +613,16 @@ }, { "name": "masterminds/html5", - "version": "2.9.0", + "version": "2.10.0", "source": { "type": "git", "url": "https://github.com/Masterminds/html5-php.git", - "reference": "f5ac2c0b0a2eefca70b2ce32a5809992227e75a6" + "reference": "fcf91eb64359852f00d921887b219479b4f21251" }, "dist": { "type": "zip", - "url": "https://api.github.com/repos/Masterminds/html5-php/zipball/f5ac2c0b0a2eefca70b2ce32a5809992227e75a6", - "reference": "f5ac2c0b0a2eefca70b2ce32a5809992227e75a6", + "url": "https://api.github.com/repos/Masterminds/html5-php/zipball/fcf91eb64359852f00d921887b219479b4f21251", + "reference": "fcf91eb64359852f00d921887b219479b4f21251", "shasum": "" }, "require": { @@ -696,9 +674,9 @@ ], "support": { "issues": "https://github.com/Masterminds/html5-php/issues", - "source": "https://github.com/Masterminds/html5-php/tree/2.9.0" + "source": "https://github.com/Masterminds/html5-php/tree/2.10.0" }, - "time": "2024-03-31T07:05:07+00:00" + "time": "2025-07-25T09:04:22+00:00" }, { "name": "mikey179/vfsstream", @@ -754,16 +732,16 @@ }, { "name": "myclabs/deep-copy", - "version": "1.13.0", + "version": "1.13.4", "source": { "type": "git", "url": "https://github.com/myclabs/DeepCopy.git", - "reference": "024473a478be9df5fdaca2c793f2232fe788e414" + "reference": "07d290f0c47959fd5eed98c95ee5602db07e0b6a" }, "dist": { "type": "zip", - "url": "https://api.github.com/repos/myclabs/DeepCopy/zipball/024473a478be9df5fdaca2c793f2232fe788e414", - "reference": "024473a478be9df5fdaca2c793f2232fe788e414", + "url": "https://api.github.com/repos/myclabs/DeepCopy/zipball/07d290f0c47959fd5eed98c95ee5602db07e0b6a", + "reference": "07d290f0c47959fd5eed98c95ee5602db07e0b6a", "shasum": "" }, "require": { @@ -802,7 +780,7 @@ ], "support": { "issues": "https://github.com/myclabs/DeepCopy/issues", - "source": "https://github.com/myclabs/DeepCopy/tree/1.13.0" + "source": "https://github.com/myclabs/DeepCopy/tree/1.13.4" }, "funding": [ { @@ -810,20 +788,20 @@ "type": "tidelift" } ], - "time": "2025-02-12T12:17:51+00:00" + "time": "2025-08-01T08:46:24+00:00" }, { "name": "nikic/php-parser", - "version": "v5.4.0", + "version": "v5.7.0", "source": { "type": "git", "url": "https://github.com/nikic/PHP-Parser.git", - "reference": "447a020a1f875a434d62f2a401f53b82a396e494" + "reference": "dca41cd15c2ac9d055ad70dbfd011130757d1f82" }, "dist": { "type": "zip", - "url": "https://api.github.com/repos/nikic/PHP-Parser/zipball/447a020a1f875a434d62f2a401f53b82a396e494", - "reference": "447a020a1f875a434d62f2a401f53b82a396e494", + "url": "https://api.github.com/repos/nikic/PHP-Parser/zipball/dca41cd15c2ac9d055ad70dbfd011130757d1f82", + "reference": "dca41cd15c2ac9d055ad70dbfd011130757d1f82", "shasum": "" }, "require": { @@ -842,7 +820,7 @@ "type": "library", "extra": { "branch-alias": { - "dev-master": "5.0-dev" + "dev-master": "5.x-dev" } }, "autoload": { @@ -866,9 +844,9 @@ ], "support": { "issues": "https://github.com/nikic/PHP-Parser/issues", - "source": "https://github.com/nikic/PHP-Parser/tree/v5.4.0" + "source": "https://github.com/nikic/PHP-Parser/tree/v5.7.0" }, - "time": "2024-12-30T11:07:19+00:00" + "time": "2025-12-06T11:56:16+00:00" }, { "name": "oleg-andreyev/mink-phpwebdriver", @@ -1056,16 +1034,16 @@ }, { "name": "php-webdriver/webdriver", - "version": "1.15.2", + "version": "1.16.0", "source": { "type": "git", "url": "https://github.com/php-webdriver/php-webdriver.git", - "reference": "998e499b786805568deaf8cbf06f4044f05d91bf" + "reference": "ac0662863aa120b4f645869f584013e4c4dba46a" }, "dist": { "type": "zip", - "url": "https://api.github.com/repos/php-webdriver/php-webdriver/zipball/998e499b786805568deaf8cbf06f4044f05d91bf", - "reference": "998e499b786805568deaf8cbf06f4044f05d91bf", + "url": "https://api.github.com/repos/php-webdriver/php-webdriver/zipball/ac0662863aa120b4f645869f584013e4c4dba46a", + "reference": "ac0662863aa120b4f645869f584013e4c4dba46a", "shasum": "" }, "require": { @@ -1074,7 +1052,7 @@ "ext-zip": "*", "php": "^7.3 || ^8.0", "symfony/polyfill-mbstring": "^1.12", - "symfony/process": "^5.0 || ^6.0 || ^7.0" + "symfony/process": "^5.0 || ^6.0 || ^7.0 || ^8.0" }, "replace": { "facebook/webdriver": "*" @@ -1087,10 +1065,10 @@ "php-parallel-lint/php-parallel-lint": "^1.2", "phpunit/phpunit": "^9.3", "squizlabs/php_codesniffer": "^3.5", - "symfony/var-dumper": "^5.0 || ^6.0 || ^7.0" + "symfony/var-dumper": "^5.0 || ^6.0 || ^7.0 || ^8.0" }, "suggest": { - "ext-SimpleXML": "For Firefox profile creation" + "ext-simplexml": "For Firefox profile creation" }, "type": "library", "autoload": { @@ -1116,41 +1094,41 @@ ], "support": { "issues": "https://github.com/php-webdriver/php-webdriver/issues", - "source": "https://github.com/php-webdriver/php-webdriver/tree/1.15.2" + "source": "https://github.com/php-webdriver/php-webdriver/tree/1.16.0" }, - "time": "2024-11-21T15:12:59+00:00" + "time": "2025-12-28T23:57:40+00:00" }, { "name": "phpunit/php-code-coverage", - "version": "11.0.9", + "version": "11.0.12", "source": { "type": "git", "url": "https://github.com/sebastianbergmann/php-code-coverage.git", - "reference": "14d63fbcca18457e49c6f8bebaa91a87e8e188d7" + "reference": "2c1ed04922802c15e1de5d7447b4856de949cf56" }, "dist": { "type": "zip", - "url": "https://api.github.com/repos/sebastianbergmann/php-code-coverage/zipball/14d63fbcca18457e49c6f8bebaa91a87e8e188d7", - "reference": "14d63fbcca18457e49c6f8bebaa91a87e8e188d7", + "url": "https://api.github.com/repos/sebastianbergmann/php-code-coverage/zipball/2c1ed04922802c15e1de5d7447b4856de949cf56", + "reference": "2c1ed04922802c15e1de5d7447b4856de949cf56", "shasum": "" }, "require": { "ext-dom": "*", "ext-libxml": "*", "ext-xmlwriter": "*", - "nikic/php-parser": "^5.4.0", + "nikic/php-parser": "^5.7.0", "php": ">=8.2", "phpunit/php-file-iterator": "^5.1.0", "phpunit/php-text-template": "^4.0.1", "sebastian/code-unit-reverse-lookup": "^4.0.1", "sebastian/complexity": "^4.0.1", - "sebastian/environment": "^7.2.0", + "sebastian/environment": "^7.2.1", "sebastian/lines-of-code": "^3.0.1", "sebastian/version": "^5.0.2", - "theseer/tokenizer": "^1.2.3" + "theseer/tokenizer": "^1.3.1" }, "require-dev": { - "phpunit/phpunit": "^11.5.2" + "phpunit/phpunit": "^11.5.46" }, "suggest": { "ext-pcov": "PHP extension that provides line coverage", @@ -1188,40 +1166,52 @@ "support": { "issues": "https://github.com/sebastianbergmann/php-code-coverage/issues", "security": "https://github.com/sebastianbergmann/php-code-coverage/security/policy", - "source": "https://github.com/sebastianbergmann/php-code-coverage/tree/11.0.9" + "source": "https://github.com/sebastianbergmann/php-code-coverage/tree/11.0.12" }, "funding": [ { "url": "https://github.com/sebastianbergmann", "type": "github" + }, + { + "url": "https://liberapay.com/sebastianbergmann", + "type": "liberapay" + }, + { + "url": "https://thanks.dev/u/gh/sebastianbergmann", + "type": "thanks_dev" + }, + { + "url": "https://tidelift.com/funding/github/packagist/phpunit/php-code-coverage", + "type": "tidelift" } ], - "time": "2025-02-25T13:26:39+00:00" + "time": "2025-12-24T07:01:01+00:00" }, { "name": "phpunit/php-file-iterator", - "version": "5.1.0", + "version": "5.1.1", "source": { "type": "git", "url": "https://github.com/sebastianbergmann/php-file-iterator.git", - "reference": "118cfaaa8bc5aef3287bf315b6060b1174754af6" + "reference": "2f3a64888c814fc235386b7387dd5b5ed92ad903" }, "dist": { "type": "zip", - "url": "https://api.github.com/repos/sebastianbergmann/php-file-iterator/zipball/118cfaaa8bc5aef3287bf315b6060b1174754af6", - "reference": "118cfaaa8bc5aef3287bf315b6060b1174754af6", + "url": "https://api.github.com/repos/sebastianbergmann/php-file-iterator/zipball/2f3a64888c814fc235386b7387dd5b5ed92ad903", + "reference": "2f3a64888c814fc235386b7387dd5b5ed92ad903", "shasum": "" }, "require": { "php": ">=8.2" }, "require-dev": { - "phpunit/phpunit": "^11.0" + "phpunit/phpunit": "^11.3" }, "type": "library", "extra": { "branch-alias": { - "dev-main": "5.0-dev" + "dev-main": "5.1-dev" } }, "autoload": { @@ -1249,15 +1239,27 @@ "support": { "issues": "https://github.com/sebastianbergmann/php-file-iterator/issues", "security": "https://github.com/sebastianbergmann/php-file-iterator/security/policy", - "source": "https://github.com/sebastianbergmann/php-file-iterator/tree/5.1.0" + "source": "https://github.com/sebastianbergmann/php-file-iterator/tree/5.1.1" }, "funding": [ { "url": "https://github.com/sebastianbergmann", "type": "github" + }, + { + "url": "https://liberapay.com/sebastianbergmann", + "type": "liberapay" + }, + { + "url": "https://thanks.dev/u/gh/sebastianbergmann", + "type": "thanks_dev" + }, + { + "url": "https://tidelift.com/funding/github/packagist/phpunit/php-file-iterator", + "type": "tidelift" } ], - "time": "2024-08-27T05:02:59+00:00" + "time": "2026-02-02T13:52:54+00:00" }, { "name": "phpunit/php-invoker", @@ -1445,16 +1447,16 @@ }, { "name": "phpunit/phpunit", - "version": "11.5.12", + "version": "11.5.55", "source": { "type": "git", "url": "https://github.com/sebastianbergmann/phpunit.git", - "reference": "d42785840519401ed2113292263795eb4c0f95da" + "reference": "adc7262fccc12de2b30f12a8aa0b33775d814f00" }, "dist": { "type": "zip", - "url": "https://api.github.com/repos/sebastianbergmann/phpunit/zipball/d42785840519401ed2113292263795eb4c0f95da", - "reference": "d42785840519401ed2113292263795eb4c0f95da", + "url": "https://api.github.com/repos/sebastianbergmann/phpunit/zipball/adc7262fccc12de2b30f12a8aa0b33775d814f00", + "reference": "adc7262fccc12de2b30f12a8aa0b33775d814f00", "shasum": "" }, "require": { @@ -1464,24 +1466,25 @@ "ext-mbstring": "*", "ext-xml": "*", "ext-xmlwriter": "*", - "myclabs/deep-copy": "^1.13.0", + "myclabs/deep-copy": "^1.13.4", "phar-io/manifest": "^2.0.4", "phar-io/version": "^3.2.1", "php": ">=8.2", - "phpunit/php-code-coverage": "^11.0.9", - "phpunit/php-file-iterator": "^5.1.0", + "phpunit/php-code-coverage": "^11.0.12", + "phpunit/php-file-iterator": "^5.1.1", "phpunit/php-invoker": "^5.0.1", "phpunit/php-text-template": "^4.0.1", "phpunit/php-timer": "^7.0.1", "sebastian/cli-parser": "^3.0.2", - "sebastian/code-unit": "^3.0.2", - "sebastian/comparator": "^6.3.1", + "sebastian/code-unit": "^3.0.3", + "sebastian/comparator": "^6.3.3", "sebastian/diff": "^6.0.2", - "sebastian/environment": "^7.2.0", - "sebastian/exporter": "^6.3.0", + "sebastian/environment": "^7.2.1", + "sebastian/exporter": "^6.3.2", "sebastian/global-state": "^7.0.2", "sebastian/object-enumerator": "^6.0.1", - "sebastian/type": "^5.1.0", + "sebastian/recursion-context": "^6.0.3", + "sebastian/type": "^5.1.3", "sebastian/version": "^5.0.2", "staabm/side-effects-detector": "^1.0.5" }, @@ -1526,7 +1529,7 @@ "support": { "issues": "https://github.com/sebastianbergmann/phpunit/issues", "security": "https://github.com/sebastianbergmann/phpunit/security/policy", - "source": "https://github.com/sebastianbergmann/phpunit/tree/11.5.12" + "source": "https://github.com/sebastianbergmann/phpunit/tree/11.5.55" }, "funding": [ { @@ -1537,12 +1540,20 @@ "url": "https://github.com/sebastianbergmann", "type": "github" }, + { + "url": "https://liberapay.com/sebastianbergmann", + "type": "liberapay" + }, + { + "url": "https://thanks.dev/u/gh/sebastianbergmann", + "type": "thanks_dev" + }, { "url": "https://tidelift.com/funding/github/packagist/phpunit/phpunit", "type": "tidelift" } ], - "time": "2025-03-07T07:31:03+00:00" + "time": "2026-02-18T12:37:06+00:00" }, { "name": "psr/container", @@ -1756,16 +1767,16 @@ }, { "name": "sebastian/code-unit", - "version": "3.0.2", + "version": "3.0.3", "source": { "type": "git", "url": "https://github.com/sebastianbergmann/code-unit.git", - "reference": "ee88b0cdbe74cf8dd3b54940ff17643c0d6543ca" + "reference": "54391c61e4af8078e5b276ab082b6d3c54c9ad64" }, "dist": { "type": "zip", - "url": "https://api.github.com/repos/sebastianbergmann/code-unit/zipball/ee88b0cdbe74cf8dd3b54940ff17643c0d6543ca", - "reference": "ee88b0cdbe74cf8dd3b54940ff17643c0d6543ca", + "url": "https://api.github.com/repos/sebastianbergmann/code-unit/zipball/54391c61e4af8078e5b276ab082b6d3c54c9ad64", + "reference": "54391c61e4af8078e5b276ab082b6d3c54c9ad64", "shasum": "" }, "require": { @@ -1801,7 +1812,7 @@ "support": { "issues": "https://github.com/sebastianbergmann/code-unit/issues", "security": "https://github.com/sebastianbergmann/code-unit/security/policy", - "source": "https://github.com/sebastianbergmann/code-unit/tree/3.0.2" + "source": "https://github.com/sebastianbergmann/code-unit/tree/3.0.3" }, "funding": [ { @@ -1809,7 +1820,7 @@ "type": "github" } ], - "time": "2024-12-12T09:59:06+00:00" + "time": "2025-03-19T07:56:08+00:00" }, { "name": "sebastian/code-unit-reverse-lookup", @@ -1869,16 +1880,16 @@ }, { "name": "sebastian/comparator", - "version": "6.3.1", + "version": "6.3.3", "source": { "type": "git", "url": "https://github.com/sebastianbergmann/comparator.git", - "reference": "24b8fbc2c8e201bb1308e7b05148d6ab393b6959" + "reference": "2c95e1e86cb8dd41beb8d502057d1081ccc8eca9" }, "dist": { "type": "zip", - "url": "https://api.github.com/repos/sebastianbergmann/comparator/zipball/24b8fbc2c8e201bb1308e7b05148d6ab393b6959", - "reference": "24b8fbc2c8e201bb1308e7b05148d6ab393b6959", + "url": "https://api.github.com/repos/sebastianbergmann/comparator/zipball/2c95e1e86cb8dd41beb8d502057d1081ccc8eca9", + "reference": "2c95e1e86cb8dd41beb8d502057d1081ccc8eca9", "shasum": "" }, "require": { @@ -1937,15 +1948,27 @@ "support": { "issues": "https://github.com/sebastianbergmann/comparator/issues", "security": "https://github.com/sebastianbergmann/comparator/security/policy", - "source": "https://github.com/sebastianbergmann/comparator/tree/6.3.1" + "source": "https://github.com/sebastianbergmann/comparator/tree/6.3.3" }, "funding": [ { "url": "https://github.com/sebastianbergmann", "type": "github" + }, + { + "url": "https://liberapay.com/sebastianbergmann", + "type": "liberapay" + }, + { + "url": "https://thanks.dev/u/gh/sebastianbergmann", + "type": "thanks_dev" + }, + { + "url": "https://tidelift.com/funding/github/packagist/sebastian/comparator", + "type": "tidelift" } ], - "time": "2025-03-07T06:57:01+00:00" + "time": "2026-01-24T09:26:40+00:00" }, { "name": "sebastian/complexity", @@ -2074,23 +2097,23 @@ }, { "name": "sebastian/environment", - "version": "7.2.0", + "version": "7.2.1", "source": { "type": "git", "url": "https://github.com/sebastianbergmann/environment.git", - "reference": "855f3ae0ab316bbafe1ba4e16e9f3c078d24a0c5" + "reference": "a5c75038693ad2e8d4b6c15ba2403532647830c4" }, "dist": { "type": "zip", - "url": "https://api.github.com/repos/sebastianbergmann/environment/zipball/855f3ae0ab316bbafe1ba4e16e9f3c078d24a0c5", - "reference": "855f3ae0ab316bbafe1ba4e16e9f3c078d24a0c5", + "url": "https://api.github.com/repos/sebastianbergmann/environment/zipball/a5c75038693ad2e8d4b6c15ba2403532647830c4", + "reference": "a5c75038693ad2e8d4b6c15ba2403532647830c4", "shasum": "" }, "require": { "php": ">=8.2" }, "require-dev": { - "phpunit/phpunit": "^11.0" + "phpunit/phpunit": "^11.3" }, "suggest": { "ext-posix": "*" @@ -2126,28 +2149,40 @@ "support": { "issues": "https://github.com/sebastianbergmann/environment/issues", "security": "https://github.com/sebastianbergmann/environment/security/policy", - "source": "https://github.com/sebastianbergmann/environment/tree/7.2.0" + "source": "https://github.com/sebastianbergmann/environment/tree/7.2.1" }, "funding": [ { "url": "https://github.com/sebastianbergmann", "type": "github" + }, + { + "url": "https://liberapay.com/sebastianbergmann", + "type": "liberapay" + }, + { + "url": "https://thanks.dev/u/gh/sebastianbergmann", + "type": "thanks_dev" + }, + { + "url": "https://tidelift.com/funding/github/packagist/sebastian/environment", + "type": "tidelift" } ], - "time": "2024-07-03T04:54:44+00:00" + "time": "2025-05-21T11:55:47+00:00" }, { "name": "sebastian/exporter", - "version": "6.3.0", + "version": "6.3.2", "source": { "type": "git", "url": "https://github.com/sebastianbergmann/exporter.git", - "reference": "3473f61172093b2da7de1fb5782e1f24cc036dc3" + "reference": "70a298763b40b213ec087c51c739efcaa90bcd74" }, "dist": { "type": "zip", - "url": "https://api.github.com/repos/sebastianbergmann/exporter/zipball/3473f61172093b2da7de1fb5782e1f24cc036dc3", - "reference": "3473f61172093b2da7de1fb5782e1f24cc036dc3", + "url": "https://api.github.com/repos/sebastianbergmann/exporter/zipball/70a298763b40b213ec087c51c739efcaa90bcd74", + "reference": "70a298763b40b213ec087c51c739efcaa90bcd74", "shasum": "" }, "require": { @@ -2161,7 +2196,7 @@ "type": "library", "extra": { "branch-alias": { - "dev-main": "6.1-dev" + "dev-main": "6.3-dev" } }, "autoload": { @@ -2204,15 +2239,27 @@ "support": { "issues": "https://github.com/sebastianbergmann/exporter/issues", "security": "https://github.com/sebastianbergmann/exporter/security/policy", - "source": "https://github.com/sebastianbergmann/exporter/tree/6.3.0" + "source": "https://github.com/sebastianbergmann/exporter/tree/6.3.2" }, "funding": [ { "url": "https://github.com/sebastianbergmann", "type": "github" + }, + { + "url": "https://liberapay.com/sebastianbergmann", + "type": "liberapay" + }, + { + "url": "https://thanks.dev/u/gh/sebastianbergmann", + "type": "thanks_dev" + }, + { + "url": "https://tidelift.com/funding/github/packagist/sebastian/exporter", + "type": "tidelift" } ], - "time": "2024-12-05T09:17:50+00:00" + "time": "2025-09-24T06:12:51+00:00" }, { "name": "sebastian/global-state", @@ -2450,23 +2497,23 @@ }, { "name": "sebastian/recursion-context", - "version": "6.0.2", + "version": "6.0.3", "source": { "type": "git", "url": "https://github.com/sebastianbergmann/recursion-context.git", - "reference": "694d156164372abbd149a4b85ccda2e4670c0e16" + "reference": "f6458abbf32a6c8174f8f26261475dc133b3d9dc" }, "dist": { "type": "zip", - "url": "https://api.github.com/repos/sebastianbergmann/recursion-context/zipball/694d156164372abbd149a4b85ccda2e4670c0e16", - "reference": "694d156164372abbd149a4b85ccda2e4670c0e16", + "url": "https://api.github.com/repos/sebastianbergmann/recursion-context/zipball/f6458abbf32a6c8174f8f26261475dc133b3d9dc", + "reference": "f6458abbf32a6c8174f8f26261475dc133b3d9dc", "shasum": "" }, "require": { "php": ">=8.2" }, "require-dev": { - "phpunit/phpunit": "^11.0" + "phpunit/phpunit": "^11.3" }, "type": "library", "extra": { @@ -2502,28 +2549,40 @@ "support": { "issues": "https://github.com/sebastianbergmann/recursion-context/issues", "security": "https://github.com/sebastianbergmann/recursion-context/security/policy", - "source": "https://github.com/sebastianbergmann/recursion-context/tree/6.0.2" + "source": "https://github.com/sebastianbergmann/recursion-context/tree/6.0.3" }, "funding": [ { "url": "https://github.com/sebastianbergmann", "type": "github" + }, + { + "url": "https://liberapay.com/sebastianbergmann", + "type": "liberapay" + }, + { + "url": "https://thanks.dev/u/gh/sebastianbergmann", + "type": "thanks_dev" + }, + { + "url": "https://tidelift.com/funding/github/packagist/sebastian/recursion-context", + "type": "tidelift" } ], - "time": "2024-07-03T05:10:34+00:00" + "time": "2025-08-13T04:42:22+00:00" }, { "name": "sebastian/type", - "version": "5.1.0", + "version": "5.1.3", "source": { "type": "git", "url": "https://github.com/sebastianbergmann/type.git", - "reference": "461b9c5da241511a2a0e8f240814fb23ce5c0aac" + "reference": "f77d2d4e78738c98d9a68d2596fe5e8fa380f449" }, "dist": { "type": "zip", - "url": "https://api.github.com/repos/sebastianbergmann/type/zipball/461b9c5da241511a2a0e8f240814fb23ce5c0aac", - "reference": "461b9c5da241511a2a0e8f240814fb23ce5c0aac", + "url": "https://api.github.com/repos/sebastianbergmann/type/zipball/f77d2d4e78738c98d9a68d2596fe5e8fa380f449", + "reference": "f77d2d4e78738c98d9a68d2596fe5e8fa380f449", "shasum": "" }, "require": { @@ -2559,15 +2618,27 @@ "support": { "issues": "https://github.com/sebastianbergmann/type/issues", "security": "https://github.com/sebastianbergmann/type/security/policy", - "source": "https://github.com/sebastianbergmann/type/tree/5.1.0" + "source": "https://github.com/sebastianbergmann/type/tree/5.1.3" }, "funding": [ { "url": "https://github.com/sebastianbergmann", "type": "github" + }, + { + "url": "https://liberapay.com/sebastianbergmann", + "type": "liberapay" + }, + { + "url": "https://thanks.dev/u/gh/sebastianbergmann", + "type": "thanks_dev" + }, + { + "url": "https://tidelift.com/funding/github/packagist/sebastian/type", + "type": "tidelift" } ], - "time": "2024-09-17T13:12:04+00:00" + "time": "2025-08-09T06:55:48+00:00" }, { "name": "sebastian/version", @@ -2677,27 +2748,28 @@ }, { "name": "symfony/browser-kit", - "version": "v7.2.4", + "version": "v7.4.4", "source": { "type": "git", "url": "https://github.com/symfony/browser-kit.git", - "reference": "8ce0ee23857d87d5be493abba2d52d1f9e49da61" + "reference": "bed167eadaaba641f51fc842c9227aa5e251309e" }, "dist": { "type": "zip", - "url": "https://api.github.com/repos/symfony/browser-kit/zipball/8ce0ee23857d87d5be493abba2d52d1f9e49da61", - "reference": "8ce0ee23857d87d5be493abba2d52d1f9e49da61", + "url": "https://api.github.com/repos/symfony/browser-kit/zipball/bed167eadaaba641f51fc842c9227aa5e251309e", + "reference": "bed167eadaaba641f51fc842c9227aa5e251309e", "shasum": "" }, "require": { "php": ">=8.2", - "symfony/dom-crawler": "^6.4|^7.0" + "symfony/deprecation-contracts": "^2.5|^3", + "symfony/dom-crawler": "^6.4|^7.0|^8.0" }, "require-dev": { - "symfony/css-selector": "^6.4|^7.0", - "symfony/http-client": "^6.4|^7.0", - "symfony/mime": "^6.4|^7.0", - "symfony/process": "^6.4|^7.0" + "symfony/css-selector": "^6.4|^7.0|^8.0", + "symfony/http-client": "^6.4|^7.0|^8.0", + "symfony/mime": "^6.4|^7.0|^8.0", + "symfony/process": "^6.4|^7.0|^8.0" }, "type": "library", "autoload": { @@ -2725,7 +2797,7 @@ "description": "Simulates the behavior of a web browser, allowing you to make requests, click on links and submit forms programmatically", "homepage": "https://symfony.com", "support": { - "source": "https://github.com/symfony/browser-kit/tree/v7.2.4" + "source": "https://github.com/symfony/browser-kit/tree/v7.4.4" }, "funding": [ { @@ -2736,31 +2808,35 @@ "url": "https://github.com/fabpot", "type": "github" }, + { + "url": "https://github.com/nicolas-grekas", + "type": "github" + }, { "url": "https://tidelift.com/funding/github/packagist/symfony/symfony", "type": "tidelift" } ], - "time": "2025-02-14T14:27:24+00:00" + "time": "2026-01-13T10:40:19+00:00" }, { "name": "symfony/config", - "version": "v7.2.3", + "version": "v7.4.4", "source": { "type": "git", "url": "https://github.com/symfony/config.git", - "reference": "7716594aaae91d9141be080240172a92ecca4d44" + "reference": "4275b53b8ab0cf37f48bf273dc2285c8178efdfb" }, "dist": { "type": "zip", - "url": "https://api.github.com/repos/symfony/config/zipball/7716594aaae91d9141be080240172a92ecca4d44", - "reference": "7716594aaae91d9141be080240172a92ecca4d44", + "url": "https://api.github.com/repos/symfony/config/zipball/4275b53b8ab0cf37f48bf273dc2285c8178efdfb", + "reference": "4275b53b8ab0cf37f48bf273dc2285c8178efdfb", "shasum": "" }, "require": { "php": ">=8.2", "symfony/deprecation-contracts": "^2.5|^3", - "symfony/filesystem": "^7.1", + "symfony/filesystem": "^7.1|^8.0", "symfony/polyfill-ctype": "~1.8" }, "conflict": { @@ -2768,11 +2844,11 @@ "symfony/service-contracts": "<2.5" }, "require-dev": { - "symfony/event-dispatcher": "^6.4|^7.0", - "symfony/finder": "^6.4|^7.0", - "symfony/messenger": "^6.4|^7.0", + "symfony/event-dispatcher": "^6.4|^7.0|^8.0", + "symfony/finder": "^6.4|^7.0|^8.0", + "symfony/messenger": "^6.4|^7.0|^8.0", "symfony/service-contracts": "^2.5|^3", - "symfony/yaml": "^6.4|^7.0" + "symfony/yaml": "^6.4|^7.0|^8.0" }, "type": "library", "autoload": { @@ -2800,7 +2876,7 @@ "description": "Helps you find, load, combine, autofill and validate configuration values of any kind", "homepage": "https://symfony.com", "support": { - "source": "https://github.com/symfony/config/tree/v7.2.3" + "source": "https://github.com/symfony/config/tree/v7.4.4" }, "funding": [ { @@ -2811,32 +2887,37 @@ "url": "https://github.com/fabpot", "type": "github" }, + { + "url": "https://github.com/nicolas-grekas", + "type": "github" + }, { "url": "https://tidelift.com/funding/github/packagist/symfony/symfony", "type": "tidelift" } ], - "time": "2025-01-22T12:07:01+00:00" + "time": "2026-01-13T11:36:38+00:00" }, { "name": "symfony/console", - "version": "v7.2.1", + "version": "v7.4.4", "source": { "type": "git", "url": "https://github.com/symfony/console.git", - "reference": "fefcc18c0f5d0efe3ab3152f15857298868dc2c3" + "reference": "41e38717ac1dd7a46b6bda7d6a82af2d98a78894" }, "dist": { "type": "zip", - "url": "https://api.github.com/repos/symfony/console/zipball/fefcc18c0f5d0efe3ab3152f15857298868dc2c3", - "reference": "fefcc18c0f5d0efe3ab3152f15857298868dc2c3", + "url": "https://api.github.com/repos/symfony/console/zipball/41e38717ac1dd7a46b6bda7d6a82af2d98a78894", + "reference": "41e38717ac1dd7a46b6bda7d6a82af2d98a78894", "shasum": "" }, "require": { "php": ">=8.2", + "symfony/deprecation-contracts": "^2.5|^3", "symfony/polyfill-mbstring": "~1.0", "symfony/service-contracts": "^2.5|^3", - "symfony/string": "^6.4|^7.0" + "symfony/string": "^7.2|^8.0" }, "conflict": { "symfony/dependency-injection": "<6.4", @@ -2850,16 +2931,16 @@ }, "require-dev": { "psr/log": "^1|^2|^3", - "symfony/config": "^6.4|^7.0", - "symfony/dependency-injection": "^6.4|^7.0", - "symfony/event-dispatcher": "^6.4|^7.0", - "symfony/http-foundation": "^6.4|^7.0", - "symfony/http-kernel": "^6.4|^7.0", - "symfony/lock": "^6.4|^7.0", - "symfony/messenger": "^6.4|^7.0", - "symfony/process": "^6.4|^7.0", - "symfony/stopwatch": "^6.4|^7.0", - "symfony/var-dumper": "^6.4|^7.0" + "symfony/config": "^6.4|^7.0|^8.0", + "symfony/dependency-injection": "^6.4|^7.0|^8.0", + "symfony/event-dispatcher": "^6.4|^7.0|^8.0", + "symfony/http-foundation": "^6.4|^7.0|^8.0", + "symfony/http-kernel": "^6.4|^7.0|^8.0", + "symfony/lock": "^6.4|^7.0|^8.0", + "symfony/messenger": "^6.4|^7.0|^8.0", + "symfony/process": "^6.4|^7.0|^8.0", + "symfony/stopwatch": "^6.4|^7.0|^8.0", + "symfony/var-dumper": "^6.4|^7.0|^8.0" }, "type": "library", "autoload": { @@ -2893,7 +2974,7 @@ "terminal" ], "support": { - "source": "https://github.com/symfony/console/tree/v7.2.1" + "source": "https://github.com/symfony/console/tree/v7.4.4" }, "funding": [ { @@ -2904,25 +2985,29 @@ "url": "https://github.com/fabpot", "type": "github" }, + { + "url": "https://github.com/nicolas-grekas", + "type": "github" + }, { "url": "https://tidelift.com/funding/github/packagist/symfony/symfony", "type": "tidelift" } ], - "time": "2024-12-11T03:49:26+00:00" + "time": "2026-01-13T11:36:38+00:00" }, { "name": "symfony/css-selector", - "version": "v7.2.0", + "version": "v7.4.0", "source": { "type": "git", "url": "https://github.com/symfony/css-selector.git", - "reference": "601a5ce9aaad7bf10797e3663faefce9e26c24e2" + "reference": "ab862f478513e7ca2fe9ec117a6f01a8da6e1135" }, "dist": { "type": "zip", - "url": "https://api.github.com/repos/symfony/css-selector/zipball/601a5ce9aaad7bf10797e3663faefce9e26c24e2", - "reference": "601a5ce9aaad7bf10797e3663faefce9e26c24e2", + "url": "https://api.github.com/repos/symfony/css-selector/zipball/ab862f478513e7ca2fe9ec117a6f01a8da6e1135", + "reference": "ab862f478513e7ca2fe9ec117a6f01a8da6e1135", "shasum": "" }, "require": { @@ -2958,7 +3043,7 @@ "description": "Converts CSS selectors to XPath expressions", "homepage": "https://symfony.com", "support": { - "source": "https://github.com/symfony/css-selector/tree/v7.2.0" + "source": "https://github.com/symfony/css-selector/tree/v7.4.0" }, "funding": [ { @@ -2969,33 +3054,37 @@ "url": "https://github.com/fabpot", "type": "github" }, + { + "url": "https://github.com/nicolas-grekas", + "type": "github" + }, { "url": "https://tidelift.com/funding/github/packagist/symfony/symfony", "type": "tidelift" } ], - "time": "2024-09-25T14:21:43+00:00" + "time": "2025-10-30T13:39:42+00:00" }, { "name": "symfony/dependency-injection", - "version": "v7.2.4", + "version": "v7.4.5", "source": { "type": "git", "url": "https://github.com/symfony/dependency-injection.git", - "reference": "f0a1614cccb4b8431a97076f9debc08ddca321ca" + "reference": "76a02cddca45a5254479ad68f9fa274ead0a7ef2" }, "dist": { "type": "zip", - "url": "https://api.github.com/repos/symfony/dependency-injection/zipball/f0a1614cccb4b8431a97076f9debc08ddca321ca", - "reference": "f0a1614cccb4b8431a97076f9debc08ddca321ca", + "url": "https://api.github.com/repos/symfony/dependency-injection/zipball/76a02cddca45a5254479ad68f9fa274ead0a7ef2", + "reference": "76a02cddca45a5254479ad68f9fa274ead0a7ef2", "shasum": "" }, "require": { "php": ">=8.2", "psr/container": "^1.1|^2.0", "symfony/deprecation-contracts": "^2.5|^3", - "symfony/service-contracts": "^3.5", - "symfony/var-exporter": "^6.4|^7.0" + "symfony/service-contracts": "^3.6", + "symfony/var-exporter": "^6.4.20|^7.2.5|^8.0" }, "conflict": { "ext-psr": "<1.1|>=2", @@ -3008,9 +3097,9 @@ "symfony/service-implementation": "1.1|2.0|3.0" }, "require-dev": { - "symfony/config": "^6.4|^7.0", - "symfony/expression-language": "^6.4|^7.0", - "symfony/yaml": "^6.4|^7.0" + "symfony/config": "^6.4|^7.0|^8.0", + "symfony/expression-language": "^6.4|^7.0|^8.0", + "symfony/yaml": "^6.4|^7.0|^8.0" }, "type": "library", "autoload": { @@ -3038,7 +3127,7 @@ "description": "Allows you to standardize and centralize the way objects are constructed in your application", "homepage": "https://symfony.com", "support": { - "source": "https://github.com/symfony/dependency-injection/tree/v7.2.4" + "source": "https://github.com/symfony/dependency-injection/tree/v7.4.5" }, "funding": [ { @@ -3049,25 +3138,29 @@ "url": "https://github.com/fabpot", "type": "github" }, + { + "url": "https://github.com/nicolas-grekas", + "type": "github" + }, { "url": "https://tidelift.com/funding/github/packagist/symfony/symfony", "type": "tidelift" } ], - "time": "2025-02-21T09:47:16+00:00" + "time": "2026-01-27T16:16:02+00:00" }, { "name": "symfony/deprecation-contracts", - "version": "v3.5.1", + "version": "v3.6.0", "source": { "type": "git", "url": "https://github.com/symfony/deprecation-contracts.git", - "reference": "74c71c939a79f7d5bf3c1ce9f5ea37ba0114c6f6" + "reference": "63afe740e99a13ba87ec199bb07bbdee937a5b62" }, "dist": { "type": "zip", - "url": "https://api.github.com/repos/symfony/deprecation-contracts/zipball/74c71c939a79f7d5bf3c1ce9f5ea37ba0114c6f6", - "reference": "74c71c939a79f7d5bf3c1ce9f5ea37ba0114c6f6", + "url": "https://api.github.com/repos/symfony/deprecation-contracts/zipball/63afe740e99a13ba87ec199bb07bbdee937a5b62", + "reference": "63afe740e99a13ba87ec199bb07bbdee937a5b62", "shasum": "" }, "require": { @@ -3080,7 +3173,7 @@ "name": "symfony/contracts" }, "branch-alias": { - "dev-main": "3.5-dev" + "dev-main": "3.6-dev" } }, "autoload": { @@ -3105,7 +3198,7 @@ "description": "A generic function and convention to trigger deprecation notices", "homepage": "https://symfony.com", "support": { - "source": "https://github.com/symfony/deprecation-contracts/tree/v3.5.1" + "source": "https://github.com/symfony/deprecation-contracts/tree/v3.6.0" }, "funding": [ { @@ -3121,30 +3214,31 @@ "type": "tidelift" } ], - "time": "2024-09-25T14:20:29+00:00" + "time": "2024-09-25T14:21:43+00:00" }, { "name": "symfony/dom-crawler", - "version": "v7.2.4", + "version": "v7.4.4", "source": { "type": "git", "url": "https://github.com/symfony/dom-crawler.git", - "reference": "19cc7b08efe9ad1ab1b56e0948e8d02e15ed3ef7" + "reference": "71fd6a82fc357c8b5de22f78b228acfc43dee965" }, "dist": { "type": "zip", - "url": "https://api.github.com/repos/symfony/dom-crawler/zipball/19cc7b08efe9ad1ab1b56e0948e8d02e15ed3ef7", - "reference": "19cc7b08efe9ad1ab1b56e0948e8d02e15ed3ef7", + "url": "https://api.github.com/repos/symfony/dom-crawler/zipball/71fd6a82fc357c8b5de22f78b228acfc43dee965", + "reference": "71fd6a82fc357c8b5de22f78b228acfc43dee965", "shasum": "" }, "require": { "masterminds/html5": "^2.6", "php": ">=8.2", + "symfony/deprecation-contracts": "^2.5|^3", "symfony/polyfill-ctype": "~1.8", "symfony/polyfill-mbstring": "~1.0" }, "require-dev": { - "symfony/css-selector": "^6.4|^7.0" + "symfony/css-selector": "^6.4|^7.0|^8.0" }, "type": "library", "autoload": { @@ -3172,7 +3266,7 @@ "description": "Eases DOM navigation for HTML and XML documents", "homepage": "https://symfony.com", "support": { - "source": "https://github.com/symfony/dom-crawler/tree/v7.2.4" + "source": "https://github.com/symfony/dom-crawler/tree/v7.4.4" }, "funding": [ { @@ -3183,25 +3277,29 @@ "url": "https://github.com/fabpot", "type": "github" }, + { + "url": "https://github.com/nicolas-grekas", + "type": "github" + }, { "url": "https://tidelift.com/funding/github/packagist/symfony/symfony", "type": "tidelift" } ], - "time": "2025-02-17T15:53:07+00:00" + "time": "2026-01-05T08:47:25+00:00" }, { "name": "symfony/event-dispatcher", - "version": "v7.2.0", + "version": "v7.4.4", "source": { "type": "git", "url": "https://github.com/symfony/event-dispatcher.git", - "reference": "910c5db85a5356d0fea57680defec4e99eb9c8c1" + "reference": "dc2c0eba1af673e736bb851d747d266108aea746" }, "dist": { "type": "zip", - "url": "https://api.github.com/repos/symfony/event-dispatcher/zipball/910c5db85a5356d0fea57680defec4e99eb9c8c1", - "reference": "910c5db85a5356d0fea57680defec4e99eb9c8c1", + "url": "https://api.github.com/repos/symfony/event-dispatcher/zipball/dc2c0eba1af673e736bb851d747d266108aea746", + "reference": "dc2c0eba1af673e736bb851d747d266108aea746", "shasum": "" }, "require": { @@ -3218,13 +3316,14 @@ }, "require-dev": { "psr/log": "^1|^2|^3", - "symfony/config": "^6.4|^7.0", - "symfony/dependency-injection": "^6.4|^7.0", - "symfony/error-handler": "^6.4|^7.0", - "symfony/expression-language": "^6.4|^7.0", - "symfony/http-foundation": "^6.4|^7.0", + "symfony/config": "^6.4|^7.0|^8.0", + "symfony/dependency-injection": "^6.4|^7.0|^8.0", + "symfony/error-handler": "^6.4|^7.0|^8.0", + "symfony/expression-language": "^6.4|^7.0|^8.0", + "symfony/framework-bundle": "^6.4|^7.0|^8.0", + "symfony/http-foundation": "^6.4|^7.0|^8.0", "symfony/service-contracts": "^2.5|^3", - "symfony/stopwatch": "^6.4|^7.0" + "symfony/stopwatch": "^6.4|^7.0|^8.0" }, "type": "library", "autoload": { @@ -3252,7 +3351,7 @@ "description": "Provides tools that allow your application components to communicate with each other by dispatching events and listening to them", "homepage": "https://symfony.com", "support": { - "source": "https://github.com/symfony/event-dispatcher/tree/v7.2.0" + "source": "https://github.com/symfony/event-dispatcher/tree/v7.4.4" }, "funding": [ { @@ -3263,25 +3362,29 @@ "url": "https://github.com/fabpot", "type": "github" }, + { + "url": "https://github.com/nicolas-grekas", + "type": "github" + }, { "url": "https://tidelift.com/funding/github/packagist/symfony/symfony", "type": "tidelift" } ], - "time": "2024-09-25T14:21:43+00:00" + "time": "2026-01-05T11:45:34+00:00" }, { "name": "symfony/event-dispatcher-contracts", - "version": "v3.5.1", + "version": "v3.6.0", "source": { "type": "git", "url": "https://github.com/symfony/event-dispatcher-contracts.git", - "reference": "7642f5e970b672283b7823222ae8ef8bbc160b9f" + "reference": "59eb412e93815df44f05f342958efa9f46b1e586" }, "dist": { "type": "zip", - "url": "https://api.github.com/repos/symfony/event-dispatcher-contracts/zipball/7642f5e970b672283b7823222ae8ef8bbc160b9f", - "reference": "7642f5e970b672283b7823222ae8ef8bbc160b9f", + "url": "https://api.github.com/repos/symfony/event-dispatcher-contracts/zipball/59eb412e93815df44f05f342958efa9f46b1e586", + "reference": "59eb412e93815df44f05f342958efa9f46b1e586", "shasum": "" }, "require": { @@ -3295,7 +3398,7 @@ "name": "symfony/contracts" }, "branch-alias": { - "dev-main": "3.5-dev" + "dev-main": "3.6-dev" } }, "autoload": { @@ -3328,7 +3431,7 @@ "standards" ], "support": { - "source": "https://github.com/symfony/event-dispatcher-contracts/tree/v3.5.1" + "source": "https://github.com/symfony/event-dispatcher-contracts/tree/v3.6.0" }, "funding": [ { @@ -3344,20 +3447,20 @@ "type": "tidelift" } ], - "time": "2024-09-25T14:20:29+00:00" + "time": "2024-09-25T14:21:43+00:00" }, { "name": "symfony/filesystem", - "version": "v7.2.0", + "version": "v7.4.0", "source": { "type": "git", "url": "https://github.com/symfony/filesystem.git", - "reference": "b8dce482de9d7c9fe2891155035a7248ab5c7fdb" + "reference": "d551b38811096d0be9c4691d406991b47c0c630a" }, "dist": { "type": "zip", - "url": "https://api.github.com/repos/symfony/filesystem/zipball/b8dce482de9d7c9fe2891155035a7248ab5c7fdb", - "reference": "b8dce482de9d7c9fe2891155035a7248ab5c7fdb", + "url": "https://api.github.com/repos/symfony/filesystem/zipball/d551b38811096d0be9c4691d406991b47c0c630a", + "reference": "d551b38811096d0be9c4691d406991b47c0c630a", "shasum": "" }, "require": { @@ -3366,7 +3469,7 @@ "symfony/polyfill-mbstring": "~1.8" }, "require-dev": { - "symfony/process": "^6.4|^7.0" + "symfony/process": "^6.4|^7.0|^8.0" }, "type": "library", "autoload": { @@ -3394,7 +3497,7 @@ "description": "Provides basic utilities for the filesystem", "homepage": "https://symfony.com", "support": { - "source": "https://github.com/symfony/filesystem/tree/v7.2.0" + "source": "https://github.com/symfony/filesystem/tree/v7.4.0" }, "funding": [ { @@ -3405,25 +3508,29 @@ "url": "https://github.com/fabpot", "type": "github" }, + { + "url": "https://github.com/nicolas-grekas", + "type": "github" + }, { "url": "https://tidelift.com/funding/github/packagist/symfony/symfony", "type": "tidelift" } ], - "time": "2024-10-25T15:15:23+00:00" + "time": "2025-11-27T13:27:24+00:00" }, { "name": "symfony/http-client", - "version": "v7.2.4", + "version": "v7.4.5", "source": { "type": "git", "url": "https://github.com/symfony/http-client.git", - "reference": "78981a2ffef6437ed92d4d7e2a86a82f256c6dc6" + "reference": "84bb634857a893cc146cceb467e31b3f02c5fe9f" }, "dist": { "type": "zip", - "url": "https://api.github.com/repos/symfony/http-client/zipball/78981a2ffef6437ed92d4d7e2a86a82f256c6dc6", - "reference": "78981a2ffef6437ed92d4d7e2a86a82f256c6dc6", + "url": "https://api.github.com/repos/symfony/http-client/zipball/84bb634857a893cc146cceb467e31b3f02c5fe9f", + "reference": "84bb634857a893cc146cceb467e31b3f02c5fe9f", "shasum": "" }, "require": { @@ -3431,10 +3538,12 @@ "psr/log": "^1|^2|^3", "symfony/deprecation-contracts": "^2.5|^3", "symfony/http-client-contracts": "~3.4.4|^3.5.2", + "symfony/polyfill-php83": "^1.29", "symfony/service-contracts": "^2.5|^3" }, "conflict": { "amphp/amp": "<2.5", + "amphp/socket": "<1.1", "php-http/discovery": "<1.15", "symfony/http-foundation": "<6.4" }, @@ -3447,18 +3556,18 @@ "require-dev": { "amphp/http-client": "^4.2.1|^5.0", "amphp/http-tunnel": "^1.0|^2.0", - "amphp/socket": "^1.1", "guzzlehttp/promises": "^1.4|^2.0", "nyholm/psr7": "^1.0", "php-http/httplug": "^1.0|^2.0", "psr/http-client": "^1.0", "symfony/amphp-http-client-meta": "^1.0|^2.0", - "symfony/dependency-injection": "^6.4|^7.0", - "symfony/http-kernel": "^6.4|^7.0", - "symfony/messenger": "^6.4|^7.0", - "symfony/process": "^6.4|^7.0", - "symfony/rate-limiter": "^6.4|^7.0", - "symfony/stopwatch": "^6.4|^7.0" + "symfony/cache": "^6.4|^7.0|^8.0", + "symfony/dependency-injection": "^6.4|^7.0|^8.0", + "symfony/http-kernel": "^6.4|^7.0|^8.0", + "symfony/messenger": "^6.4|^7.0|^8.0", + "symfony/process": "^6.4|^7.0|^8.0", + "symfony/rate-limiter": "^6.4|^7.0|^8.0", + "symfony/stopwatch": "^6.4|^7.0|^8.0" }, "type": "library", "autoload": { @@ -3489,7 +3598,7 @@ "http" ], "support": { - "source": "https://github.com/symfony/http-client/tree/v7.2.4" + "source": "https://github.com/symfony/http-client/tree/v7.4.5" }, "funding": [ { @@ -3500,25 +3609,29 @@ "url": "https://github.com/fabpot", "type": "github" }, + { + "url": "https://github.com/nicolas-grekas", + "type": "github" + }, { "url": "https://tidelift.com/funding/github/packagist/symfony/symfony", "type": "tidelift" } ], - "time": "2025-02-13T10:27:23+00:00" + "time": "2026-01-27T16:16:02+00:00" }, { "name": "symfony/http-client-contracts", - "version": "v3.5.2", + "version": "v3.6.0", "source": { "type": "git", "url": "https://github.com/symfony/http-client-contracts.git", - "reference": "ee8d807ab20fcb51267fdace50fbe3494c31e645" + "reference": "75d7043853a42837e68111812f4d964b01e5101c" }, "dist": { "type": "zip", - "url": "https://api.github.com/repos/symfony/http-client-contracts/zipball/ee8d807ab20fcb51267fdace50fbe3494c31e645", - "reference": "ee8d807ab20fcb51267fdace50fbe3494c31e645", + "url": "https://api.github.com/repos/symfony/http-client-contracts/zipball/75d7043853a42837e68111812f4d964b01e5101c", + "reference": "75d7043853a42837e68111812f4d964b01e5101c", "shasum": "" }, "require": { @@ -3531,7 +3644,7 @@ "name": "symfony/contracts" }, "branch-alias": { - "dev-main": "3.5-dev" + "dev-main": "3.6-dev" } }, "autoload": { @@ -3567,7 +3680,7 @@ "standards" ], "support": { - "source": "https://github.com/symfony/http-client-contracts/tree/v3.5.2" + "source": "https://github.com/symfony/http-client-contracts/tree/v3.6.0" }, "funding": [ { @@ -3583,43 +3696,44 @@ "type": "tidelift" } ], - "time": "2024-12-07T08:49:48+00:00" + "time": "2025-04-29T11:18:49+00:00" }, { "name": "symfony/mime", - "version": "v7.2.4", + "version": "v7.4.5", "source": { "type": "git", "url": "https://github.com/symfony/mime.git", - "reference": "87ca22046b78c3feaff04b337f33b38510fd686b" + "reference": "b18c7e6e9eee1e19958138df10412f3c4c316148" }, "dist": { "type": "zip", - "url": "https://api.github.com/repos/symfony/mime/zipball/87ca22046b78c3feaff04b337f33b38510fd686b", - "reference": "87ca22046b78c3feaff04b337f33b38510fd686b", + "url": "https://api.github.com/repos/symfony/mime/zipball/b18c7e6e9eee1e19958138df10412f3c4c316148", + "reference": "b18c7e6e9eee1e19958138df10412f3c4c316148", "shasum": "" }, "require": { "php": ">=8.2", + "symfony/deprecation-contracts": "^2.5|^3", "symfony/polyfill-intl-idn": "^1.10", "symfony/polyfill-mbstring": "^1.0" }, "conflict": { "egulias/email-validator": "~3.0.0", - "phpdocumentor/reflection-docblock": "<3.2.2", - "phpdocumentor/type-resolver": "<1.4.0", + "phpdocumentor/reflection-docblock": "<5.2|>=6", + "phpdocumentor/type-resolver": "<1.5.1", "symfony/mailer": "<6.4", "symfony/serializer": "<6.4.3|>7.0,<7.0.3" }, "require-dev": { "egulias/email-validator": "^2.1.10|^3.1|^4", "league/html-to-markdown": "^5.0", - "phpdocumentor/reflection-docblock": "^3.0|^4.0|^5.0", - "symfony/dependency-injection": "^6.4|^7.0", - "symfony/process": "^6.4|^7.0", - "symfony/property-access": "^6.4|^7.0", - "symfony/property-info": "^6.4|^7.0", - "symfony/serializer": "^6.4.3|^7.0.3" + "phpdocumentor/reflection-docblock": "^5.2", + "symfony/dependency-injection": "^6.4|^7.0|^8.0", + "symfony/process": "^6.4|^7.0|^8.0", + "symfony/property-access": "^6.4|^7.0|^8.0", + "symfony/property-info": "^6.4|^7.0|^8.0", + "symfony/serializer": "^6.4.3|^7.0.3|^8.0" }, "type": "library", "autoload": { @@ -3651,7 +3765,7 @@ "mime-type" ], "support": { - "source": "https://github.com/symfony/mime/tree/v7.2.4" + "source": "https://github.com/symfony/mime/tree/v7.4.5" }, "funding": [ { @@ -3662,16 +3776,20 @@ "url": "https://github.com/fabpot", "type": "github" }, + { + "url": "https://github.com/nicolas-grekas", + "type": "github" + }, { "url": "https://tidelift.com/funding/github/packagist/symfony/symfony", "type": "tidelift" } ], - "time": "2025-02-19T08:51:20+00:00" + "time": "2026-01-27T08:59:58+00:00" }, { "name": "symfony/polyfill-ctype", - "version": "v1.31.0", + "version": "v1.33.0", "source": { "type": "git", "url": "https://github.com/symfony/polyfill-ctype.git", @@ -3730,7 +3848,7 @@ "portable" ], "support": { - "source": "https://github.com/symfony/polyfill-ctype/tree/v1.31.0" + "source": "https://github.com/symfony/polyfill-ctype/tree/v1.33.0" }, "funding": [ { @@ -3741,6 +3859,10 @@ "url": "https://github.com/fabpot", "type": "github" }, + { + "url": "https://github.com/nicolas-grekas", + "type": "github" + }, { "url": "https://tidelift.com/funding/github/packagist/symfony/symfony", "type": "tidelift" @@ -3750,16 +3872,16 @@ }, { "name": "symfony/polyfill-intl-grapheme", - "version": "v1.31.0", + "version": "v1.33.0", "source": { "type": "git", "url": "https://github.com/symfony/polyfill-intl-grapheme.git", - "reference": "b9123926e3b7bc2f98c02ad54f6a4b02b91a8abe" + "reference": "380872130d3a5dd3ace2f4010d95125fde5d5c70" }, "dist": { "type": "zip", - "url": "https://api.github.com/repos/symfony/polyfill-intl-grapheme/zipball/b9123926e3b7bc2f98c02ad54f6a4b02b91a8abe", - "reference": "b9123926e3b7bc2f98c02ad54f6a4b02b91a8abe", + "url": "https://api.github.com/repos/symfony/polyfill-intl-grapheme/zipball/380872130d3a5dd3ace2f4010d95125fde5d5c70", + "reference": "380872130d3a5dd3ace2f4010d95125fde5d5c70", "shasum": "" }, "require": { @@ -3808,7 +3930,7 @@ "shim" ], "support": { - "source": "https://github.com/symfony/polyfill-intl-grapheme/tree/v1.31.0" + "source": "https://github.com/symfony/polyfill-intl-grapheme/tree/v1.33.0" }, "funding": [ { @@ -3819,25 +3941,29 @@ "url": "https://github.com/fabpot", "type": "github" }, + { + "url": "https://github.com/nicolas-grekas", + "type": "github" + }, { "url": "https://tidelift.com/funding/github/packagist/symfony/symfony", "type": "tidelift" } ], - "time": "2024-09-09T11:45:10+00:00" + "time": "2025-06-27T09:58:17+00:00" }, { "name": "symfony/polyfill-intl-idn", - "version": "v1.31.0", + "version": "v1.33.0", "source": { "type": "git", "url": "https://github.com/symfony/polyfill-intl-idn.git", - "reference": "c36586dcf89a12315939e00ec9b4474adcb1d773" + "reference": "9614ac4d8061dc257ecc64cba1b140873dce8ad3" }, "dist": { "type": "zip", - "url": "https://api.github.com/repos/symfony/polyfill-intl-idn/zipball/c36586dcf89a12315939e00ec9b4474adcb1d773", - "reference": "c36586dcf89a12315939e00ec9b4474adcb1d773", + "url": "https://api.github.com/repos/symfony/polyfill-intl-idn/zipball/9614ac4d8061dc257ecc64cba1b140873dce8ad3", + "reference": "9614ac4d8061dc257ecc64cba1b140873dce8ad3", "shasum": "" }, "require": { @@ -3891,7 +4017,7 @@ "shim" ], "support": { - "source": "https://github.com/symfony/polyfill-intl-idn/tree/v1.31.0" + "source": "https://github.com/symfony/polyfill-intl-idn/tree/v1.33.0" }, "funding": [ { @@ -3902,16 +4028,20 @@ "url": "https://github.com/fabpot", "type": "github" }, + { + "url": "https://github.com/nicolas-grekas", + "type": "github" + }, { "url": "https://tidelift.com/funding/github/packagist/symfony/symfony", "type": "tidelift" } ], - "time": "2024-09-09T11:45:10+00:00" + "time": "2024-09-10T14:38:51+00:00" }, { "name": "symfony/polyfill-intl-normalizer", - "version": "v1.31.0", + "version": "v1.33.0", "source": { "type": "git", "url": "https://github.com/symfony/polyfill-intl-normalizer.git", @@ -3972,7 +4102,7 @@ "shim" ], "support": { - "source": "https://github.com/symfony/polyfill-intl-normalizer/tree/v1.31.0" + "source": "https://github.com/symfony/polyfill-intl-normalizer/tree/v1.33.0" }, "funding": [ { @@ -3983,6 +4113,10 @@ "url": "https://github.com/fabpot", "type": "github" }, + { + "url": "https://github.com/nicolas-grekas", + "type": "github" + }, { "url": "https://tidelift.com/funding/github/packagist/symfony/symfony", "type": "tidelift" @@ -3992,19 +4126,20 @@ }, { "name": "symfony/polyfill-mbstring", - "version": "v1.31.0", + "version": "v1.33.0", "source": { "type": "git", "url": "https://github.com/symfony/polyfill-mbstring.git", - "reference": "85181ba99b2345b0ef10ce42ecac37612d9fd341" + "reference": "6d857f4d76bd4b343eac26d6b539585d2bc56493" }, "dist": { "type": "zip", - "url": "https://api.github.com/repos/symfony/polyfill-mbstring/zipball/85181ba99b2345b0ef10ce42ecac37612d9fd341", - "reference": "85181ba99b2345b0ef10ce42ecac37612d9fd341", + "url": "https://api.github.com/repos/symfony/polyfill-mbstring/zipball/6d857f4d76bd4b343eac26d6b539585d2bc56493", + "reference": "6d857f4d76bd4b343eac26d6b539585d2bc56493", "shasum": "" }, "require": { + "ext-iconv": "*", "php": ">=7.2" }, "provide": { @@ -4052,7 +4187,7 @@ "shim" ], "support": { - "source": "https://github.com/symfony/polyfill-mbstring/tree/v1.31.0" + "source": "https://github.com/symfony/polyfill-mbstring/tree/v1.33.0" }, "funding": [ { @@ -4063,25 +4198,109 @@ "url": "https://github.com/fabpot", "type": "github" }, + { + "url": "https://github.com/nicolas-grekas", + "type": "github" + }, { "url": "https://tidelift.com/funding/github/packagist/symfony/symfony", "type": "tidelift" } ], - "time": "2024-09-09T11:45:10+00:00" + "time": "2024-12-23T08:48:59+00:00" + }, + { + "name": "symfony/polyfill-php83", + "version": "v1.33.0", + "source": { + "type": "git", + "url": "https://github.com/symfony/polyfill-php83.git", + "reference": "17f6f9a6b1735c0f163024d959f700cfbc5155e5" + }, + "dist": { + "type": "zip", + "url": "https://api.github.com/repos/symfony/polyfill-php83/zipball/17f6f9a6b1735c0f163024d959f700cfbc5155e5", + "reference": "17f6f9a6b1735c0f163024d959f700cfbc5155e5", + "shasum": "" + }, + "require": { + "php": ">=7.2" + }, + "type": "library", + "extra": { + "thanks": { + "url": "https://github.com/symfony/polyfill", + "name": "symfony/polyfill" + } + }, + "autoload": { + "files": [ + "bootstrap.php" + ], + "psr-4": { + "Symfony\\Polyfill\\Php83\\": "" + }, + "classmap": [ + "Resources/stubs" + ] + }, + "notification-url": "https://packagist.org/downloads/", + "license": [ + "MIT" + ], + "authors": [ + { + "name": "Nicolas Grekas", + "email": "p@tchwork.com" + }, + { + "name": "Symfony Community", + "homepage": "https://symfony.com/contributors" + } + ], + "description": "Symfony polyfill backporting some PHP 8.3+ features to lower PHP versions", + "homepage": "https://symfony.com", + "keywords": [ + "compatibility", + "polyfill", + "portable", + "shim" + ], + "support": { + "source": "https://github.com/symfony/polyfill-php83/tree/v1.33.0" + }, + "funding": [ + { + "url": "https://symfony.com/sponsor", + "type": "custom" + }, + { + "url": "https://github.com/fabpot", + "type": "github" + }, + { + "url": "https://github.com/nicolas-grekas", + "type": "github" + }, + { + "url": "https://tidelift.com/funding/github/packagist/symfony/symfony", + "type": "tidelift" + } + ], + "time": "2025-07-08T02:45:35+00:00" }, { "name": "symfony/process", - "version": "v7.2.4", + "version": "v7.4.5", "source": { "type": "git", "url": "https://github.com/symfony/process.git", - "reference": "d8f411ff3c7ddc4ae9166fb388d1190a2df5b5cf" + "reference": "608476f4604102976d687c483ac63a79ba18cc97" }, "dist": { "type": "zip", - "url": "https://api.github.com/repos/symfony/process/zipball/d8f411ff3c7ddc4ae9166fb388d1190a2df5b5cf", - "reference": "d8f411ff3c7ddc4ae9166fb388d1190a2df5b5cf", + "url": "https://api.github.com/repos/symfony/process/zipball/608476f4604102976d687c483ac63a79ba18cc97", + "reference": "608476f4604102976d687c483ac63a79ba18cc97", "shasum": "" }, "require": { @@ -4113,7 +4332,7 @@ "description": "Executes commands in sub-processes", "homepage": "https://symfony.com", "support": { - "source": "https://github.com/symfony/process/tree/v7.2.4" + "source": "https://github.com/symfony/process/tree/v7.4.5" }, "funding": [ { @@ -4124,25 +4343,29 @@ "url": "https://github.com/fabpot", "type": "github" }, + { + "url": "https://github.com/nicolas-grekas", + "type": "github" + }, { "url": "https://tidelift.com/funding/github/packagist/symfony/symfony", "type": "tidelift" } ], - "time": "2025-02-05T08:33:46+00:00" + "time": "2026-01-26T15:07:59+00:00" }, { "name": "symfony/service-contracts", - "version": "v3.5.1", + "version": "v3.6.1", "source": { "type": "git", "url": "https://github.com/symfony/service-contracts.git", - "reference": "e53260aabf78fb3d63f8d79d69ece59f80d5eda0" + "reference": "45112560a3ba2d715666a509a0bc9521d10b6c43" }, "dist": { "type": "zip", - "url": "https://api.github.com/repos/symfony/service-contracts/zipball/e53260aabf78fb3d63f8d79d69ece59f80d5eda0", - "reference": "e53260aabf78fb3d63f8d79d69ece59f80d5eda0", + "url": "https://api.github.com/repos/symfony/service-contracts/zipball/45112560a3ba2d715666a509a0bc9521d10b6c43", + "reference": "45112560a3ba2d715666a509a0bc9521d10b6c43", "shasum": "" }, "require": { @@ -4160,7 +4383,7 @@ "name": "symfony/contracts" }, "branch-alias": { - "dev-main": "3.5-dev" + "dev-main": "3.6-dev" } }, "autoload": { @@ -4196,7 +4419,7 @@ "standards" ], "support": { - "source": "https://github.com/symfony/service-contracts/tree/v3.5.1" + "source": "https://github.com/symfony/service-contracts/tree/v3.6.1" }, "funding": [ { @@ -4207,31 +4430,36 @@ "url": "https://github.com/fabpot", "type": "github" }, + { + "url": "https://github.com/nicolas-grekas", + "type": "github" + }, { "url": "https://tidelift.com/funding/github/packagist/symfony/symfony", "type": "tidelift" } ], - "time": "2024-09-25T14:20:29+00:00" + "time": "2025-07-15T11:30:57+00:00" }, { "name": "symfony/string", - "version": "v7.2.0", + "version": "v7.4.4", "source": { "type": "git", "url": "https://github.com/symfony/string.git", - "reference": "446e0d146f991dde3e73f45f2c97a9faad773c82" + "reference": "1c4b10461bf2ec27537b5f36105337262f5f5d6f" }, "dist": { "type": "zip", - "url": "https://api.github.com/repos/symfony/string/zipball/446e0d146f991dde3e73f45f2c97a9faad773c82", - "reference": "446e0d146f991dde3e73f45f2c97a9faad773c82", + "url": "https://api.github.com/repos/symfony/string/zipball/1c4b10461bf2ec27537b5f36105337262f5f5d6f", + "reference": "1c4b10461bf2ec27537b5f36105337262f5f5d6f", "shasum": "" }, "require": { "php": ">=8.2", + "symfony/deprecation-contracts": "^2.5|^3.0", "symfony/polyfill-ctype": "~1.8", - "symfony/polyfill-intl-grapheme": "~1.0", + "symfony/polyfill-intl-grapheme": "~1.33", "symfony/polyfill-intl-normalizer": "~1.0", "symfony/polyfill-mbstring": "~1.0" }, @@ -4239,12 +4467,11 @@ "symfony/translation-contracts": "<2.5" }, "require-dev": { - "symfony/emoji": "^7.1", - "symfony/error-handler": "^6.4|^7.0", - "symfony/http-client": "^6.4|^7.0", - "symfony/intl": "^6.4|^7.0", + "symfony/emoji": "^7.1|^8.0", + "symfony/http-client": "^6.4|^7.0|^8.0", + "symfony/intl": "^6.4|^7.0|^8.0", "symfony/translation-contracts": "^2.5|^3.0", - "symfony/var-exporter": "^6.4|^7.0" + "symfony/var-exporter": "^6.4|^7.0|^8.0" }, "type": "library", "autoload": { @@ -4283,7 +4510,7 @@ "utf8" ], "support": { - "source": "https://github.com/symfony/string/tree/v7.2.0" + "source": "https://github.com/symfony/string/tree/v7.4.4" }, "funding": [ { @@ -4294,34 +4521,39 @@ "url": "https://github.com/fabpot", "type": "github" }, + { + "url": "https://github.com/nicolas-grekas", + "type": "github" + }, { "url": "https://tidelift.com/funding/github/packagist/symfony/symfony", "type": "tidelift" } ], - "time": "2024-11-13T13:31:26+00:00" + "time": "2026-01-12T10:54:30+00:00" }, { "name": "symfony/translation", - "version": "v7.2.4", + "version": "v7.4.4", "source": { "type": "git", "url": "https://github.com/symfony/translation.git", - "reference": "283856e6981286cc0d800b53bd5703e8e363f05a" + "reference": "bfde13711f53f549e73b06d27b35a55207528877" }, "dist": { "type": "zip", - "url": "https://api.github.com/repos/symfony/translation/zipball/283856e6981286cc0d800b53bd5703e8e363f05a", - "reference": "283856e6981286cc0d800b53bd5703e8e363f05a", + "url": "https://api.github.com/repos/symfony/translation/zipball/bfde13711f53f549e73b06d27b35a55207528877", + "reference": "bfde13711f53f549e73b06d27b35a55207528877", "shasum": "" }, "require": { "php": ">=8.2", "symfony/deprecation-contracts": "^2.5|^3", "symfony/polyfill-mbstring": "~1.0", - "symfony/translation-contracts": "^2.5|^3.0" + "symfony/translation-contracts": "^2.5.3|^3.3" }, "conflict": { + "nikic/php-parser": "<5.0", "symfony/config": "<6.4", "symfony/console": "<6.4", "symfony/dependency-injection": "<6.4", @@ -4335,19 +4567,19 @@ "symfony/translation-implementation": "2.3|3.0" }, "require-dev": { - "nikic/php-parser": "^4.18|^5.0", + "nikic/php-parser": "^5.0", "psr/log": "^1|^2|^3", - "symfony/config": "^6.4|^7.0", - "symfony/console": "^6.4|^7.0", - "symfony/dependency-injection": "^6.4|^7.0", - "symfony/finder": "^6.4|^7.0", + "symfony/config": "^6.4|^7.0|^8.0", + "symfony/console": "^6.4|^7.0|^8.0", + "symfony/dependency-injection": "^6.4|^7.0|^8.0", + "symfony/finder": "^6.4|^7.0|^8.0", "symfony/http-client-contracts": "^2.5|^3.0", - "symfony/http-kernel": "^6.4|^7.0", - "symfony/intl": "^6.4|^7.0", + "symfony/http-kernel": "^6.4|^7.0|^8.0", + "symfony/intl": "^6.4|^7.0|^8.0", "symfony/polyfill-intl-icu": "^1.21", - "symfony/routing": "^6.4|^7.0", + "symfony/routing": "^6.4|^7.0|^8.0", "symfony/service-contracts": "^2.5|^3", - "symfony/yaml": "^6.4|^7.0" + "symfony/yaml": "^6.4|^7.0|^8.0" }, "type": "library", "autoload": { @@ -4378,7 +4610,7 @@ "description": "Provides tools to internationalize your application", "homepage": "https://symfony.com", "support": { - "source": "https://github.com/symfony/translation/tree/v7.2.4" + "source": "https://github.com/symfony/translation/tree/v7.4.4" }, "funding": [ { @@ -4389,25 +4621,29 @@ "url": "https://github.com/fabpot", "type": "github" }, + { + "url": "https://github.com/nicolas-grekas", + "type": "github" + }, { "url": "https://tidelift.com/funding/github/packagist/symfony/symfony", "type": "tidelift" } ], - "time": "2025-02-13T10:27:23+00:00" + "time": "2026-01-13T10:40:19+00:00" }, { "name": "symfony/translation-contracts", - "version": "v3.5.1", + "version": "v3.6.1", "source": { "type": "git", "url": "https://github.com/symfony/translation-contracts.git", - "reference": "4667ff3bd513750603a09c8dedbea942487fb07c" + "reference": "65a8bc82080447fae78373aa10f8d13b38338977" }, "dist": { "type": "zip", - "url": "https://api.github.com/repos/symfony/translation-contracts/zipball/4667ff3bd513750603a09c8dedbea942487fb07c", - "reference": "4667ff3bd513750603a09c8dedbea942487fb07c", + "url": "https://api.github.com/repos/symfony/translation-contracts/zipball/65a8bc82080447fae78373aa10f8d13b38338977", + "reference": "65a8bc82080447fae78373aa10f8d13b38338977", "shasum": "" }, "require": { @@ -4420,7 +4656,7 @@ "name": "symfony/contracts" }, "branch-alias": { - "dev-main": "3.5-dev" + "dev-main": "3.6-dev" } }, "autoload": { @@ -4456,7 +4692,7 @@ "standards" ], "support": { - "source": "https://github.com/symfony/translation-contracts/tree/v3.5.1" + "source": "https://github.com/symfony/translation-contracts/tree/v3.6.1" }, "funding": [ { @@ -4467,34 +4703,39 @@ "url": "https://github.com/fabpot", "type": "github" }, + { + "url": "https://github.com/nicolas-grekas", + "type": "github" + }, { "url": "https://tidelift.com/funding/github/packagist/symfony/symfony", "type": "tidelift" } ], - "time": "2024-09-25T14:20:29+00:00" + "time": "2025-07-15T13:41:35+00:00" }, { "name": "symfony/var-exporter", - "version": "v7.2.4", + "version": "v7.4.0", "source": { "type": "git", "url": "https://github.com/symfony/var-exporter.git", - "reference": "4ede73aa7a73d81506002d2caadbbdad1ef5b69a" + "reference": "03a60f169c79a28513a78c967316fbc8bf17816f" }, "dist": { "type": "zip", - "url": "https://api.github.com/repos/symfony/var-exporter/zipball/4ede73aa7a73d81506002d2caadbbdad1ef5b69a", - "reference": "4ede73aa7a73d81506002d2caadbbdad1ef5b69a", + "url": "https://api.github.com/repos/symfony/var-exporter/zipball/03a60f169c79a28513a78c967316fbc8bf17816f", + "reference": "03a60f169c79a28513a78c967316fbc8bf17816f", "shasum": "" }, "require": { - "php": ">=8.2" + "php": ">=8.2", + "symfony/deprecation-contracts": "^2.5|^3" }, "require-dev": { - "symfony/property-access": "^6.4|^7.0", - "symfony/serializer": "^6.4|^7.0", - "symfony/var-dumper": "^6.4|^7.0" + "symfony/property-access": "^6.4|^7.0|^8.0", + "symfony/serializer": "^6.4|^7.0|^8.0", + "symfony/var-dumper": "^6.4|^7.0|^8.0" }, "type": "library", "autoload": { @@ -4532,7 +4773,7 @@ "serialize" ], "support": { - "source": "https://github.com/symfony/var-exporter/tree/v7.2.4" + "source": "https://github.com/symfony/var-exporter/tree/v7.4.0" }, "funding": [ { @@ -4543,37 +4784,41 @@ "url": "https://github.com/fabpot", "type": "github" }, + { + "url": "https://github.com/nicolas-grekas", + "type": "github" + }, { "url": "https://tidelift.com/funding/github/packagist/symfony/symfony", "type": "tidelift" } ], - "time": "2025-02-13T10:27:23+00:00" + "time": "2025-09-11T10:15:23+00:00" }, { "name": "symfony/yaml", - "version": "v7.2.3", + "version": "v7.4.1", "source": { "type": "git", "url": "https://github.com/symfony/yaml.git", - "reference": "ac238f173df0c9c1120f862d0f599e17535a87ec" + "reference": "24dd4de28d2e3988b311751ac49e684d783e2345" }, "dist": { "type": "zip", - "url": "https://api.github.com/repos/symfony/yaml/zipball/ac238f173df0c9c1120f862d0f599e17535a87ec", - "reference": "ac238f173df0c9c1120f862d0f599e17535a87ec", + "url": "https://api.github.com/repos/symfony/yaml/zipball/24dd4de28d2e3988b311751ac49e684d783e2345", + "reference": "24dd4de28d2e3988b311751ac49e684d783e2345", "shasum": "" }, "require": { "php": ">=8.2", - "symfony/deprecation-contracts": "^2.5|^3.0", + "symfony/deprecation-contracts": "^2.5|^3", "symfony/polyfill-ctype": "^1.8" }, "conflict": { "symfony/console": "<6.4" }, "require-dev": { - "symfony/console": "^6.4|^7.0" + "symfony/console": "^6.4|^7.0|^8.0" }, "bin": [ "Resources/bin/yaml-lint" @@ -4604,7 +4849,7 @@ "description": "Loads and dumps YAML files", "homepage": "https://symfony.com", "support": { - "source": "https://github.com/symfony/yaml/tree/v7.2.3" + "source": "https://github.com/symfony/yaml/tree/v7.4.1" }, "funding": [ { @@ -4615,25 +4860,29 @@ "url": "https://github.com/fabpot", "type": "github" }, + { + "url": "https://github.com/nicolas-grekas", + "type": "github" + }, { "url": "https://tidelift.com/funding/github/packagist/symfony/symfony", "type": "tidelift" } ], - "time": "2025-01-07T12:55:42+00:00" + "time": "2025-12-04T18:11:45+00:00" }, { "name": "theseer/tokenizer", - "version": "1.2.3", + "version": "1.3.1", "source": { "type": "git", "url": "https://github.com/theseer/tokenizer.git", - "reference": "737eda637ed5e28c3413cb1ebe8bb52cbf1ca7a2" + "reference": "b7489ce515e168639d17feec34b8847c326b0b3c" }, "dist": { "type": "zip", - "url": "https://api.github.com/repos/theseer/tokenizer/zipball/737eda637ed5e28c3413cb1ebe8bb52cbf1ca7a2", - "reference": "737eda637ed5e28c3413cb1ebe8bb52cbf1ca7a2", + "url": "https://api.github.com/repos/theseer/tokenizer/zipball/b7489ce515e168639d17feec34b8847c326b0b3c", + "reference": "b7489ce515e168639d17feec34b8847c326b0b3c", "shasum": "" }, "require": { @@ -4662,7 +4911,7 @@ "description": "A small library for converting tokenized PHP source code into XML and potentially other formats", "support": { "issues": "https://github.com/theseer/tokenizer/issues", - "source": "https://github.com/theseer/tokenizer/tree/1.2.3" + "source": "https://github.com/theseer/tokenizer/tree/1.3.1" }, "funding": [ { @@ -4670,7 +4919,7 @@ "type": "github" } ], - "time": "2024-03-03T12:36:25+00:00" + "time": "2025-11-17T20:03:58+00:00" } ], "aliases": [], diff --git a/contentbank/tests/behat/restore_content.feature b/contentbank/tests/behat/restore_content.feature new file mode 100644 index 0000000000000..91ede4e3810d3 --- /dev/null +++ b/contentbank/tests/behat/restore_content.feature @@ -0,0 +1,38 @@ +@core @core_contentbank @core_h5p @contentbank_h5p +Feature: Content bank contents are retained when course is restored + In order to restore content bank contents + As a manager + I need to be able to restore course containing the content bank + + Background: + Given the following "courses" exist: + | fullname | shortname | + | Course 1 | C1 | + And the following "course enrolments" exist: + | user | course | role | + | admin | C1 | editingteacher | + And the following "contentbank content" exist: + | contextlevel | reference | contenttype | user | contentname | filepath | + | Course | C1 | contenttype_h5p | admin | filltheblanks.h5p | /h5p/tests/fixtures/filltheblanks.h5p | + And I log in as "admin" + And I am on "Course 1" course homepage with editing mode on + And the following config values are set as admin: + | unaddableblocks | | theme_boost| + # TODO MDL-57120 site "Content bank" link not accessible without navigation block. + And I add the "Navigation" block if not present + + @javascript + Scenario: Deleted courses with content banks can be restored + Given I navigate to "Courses > Manage courses and categories" in site administration + And I click on "delete" action for "Course 1" in management course listing + And I click on "Delete" "button" in the "Confirm" "dialogue" + And I press "Continue" + And I navigate to "Recycle bin" in current page administration + And I click on "Restore" "link" in the "Course 1" "table_row" + And I am on "Course 1" course homepage + And I expand "Site pages" node + When I click on "Content bank" "link" + And I click on "filltheblanks.h5p" "link" + And I switch to "h5p-player" class iframe + And I switch to "h5p-iframe" class iframe + Then I should see "Of which countries are Berlin, Washington, Beijing, Canberra and Brasilia the capitals?" diff --git a/course/UPGRADING.md b/course/UPGRADING.md index 274d3f65752db..c7ecd4a9e09b0 100644 --- a/course/UPGRADING.md +++ b/course/UPGRADING.md @@ -1,5 +1,13 @@ # core_course (subsystem) Upgrade notes +## 5.0.4 + +### Added + +- The external function `core_course_get_course_contents` now includes the `candisplay` property for each returned module. If this is false, the module should not be displayed on the course page (for example, for question banks). + + For more information see [MDL-85405](https://tracker.moodle.org/browse/MDL-85405) + ## 5.0 ### Added diff --git a/course/amd/build/local/activitychooser/dialogue.min.js b/course/amd/build/local/activitychooser/dialogue.min.js index ab2293a115b9f..ace44f47f8d75 100644 --- a/course/amd/build/local/activitychooser/dialogue.min.js +++ b/course/amd/build/local/activitychooser/dialogue.min.js @@ -1,3 +1,3 @@ -define("core_course/local/activitychooser/dialogue",["exports","theme_boost/bootstrap/carousel","core/modal_events","core_course/local/activitychooser/selectors","core/templates","core/key_codes","core/loadingicon","core_course/local/activitychooser/repository","core/notification","core/utils","core/normalise"],(function(_exports,_carousel,ModalEvents,_selectors,Templates,_key_codes,_loadingicon,Repository,_notification,_utils,_normalise){Object.defineProperty(_exports,"__esModule",{value:!0}),_exports.displayChooser=void 0,_carousel=_interopRequireDefault(_carousel),ModalEvents=_interopRequireWildcard(ModalEvents),_selectors=_interopRequireDefault(_selectors),Templates=_interopRequireWildcard(Templates),Repository=_interopRequireWildcard(Repository),_notification=_interopRequireDefault(_notification);var _systemImportTransformerGlobalIdentifier="undefined"!=typeof window?window:"undefined"!=typeof self?self:"undefined"!=typeof global?global:{};function _getRequireWildcardCache(nodeInterop){if("function"!=typeof WeakMap)return null;var cacheBabelInterop=new WeakMap,cacheNodeInterop=new WeakMap;return(_getRequireWildcardCache=function(nodeInterop){return nodeInterop?cacheNodeInterop:cacheBabelInterop})(nodeInterop)}function _interopRequireWildcard(obj,nodeInterop){if(!nodeInterop&&obj&&obj.__esModule)return obj;if(null===obj||"object"!=typeof obj&&"function"!=typeof obj)return{default:obj};var cache=_getRequireWildcardCache(nodeInterop);if(cache&&cache.has(obj))return cache.get(obj);var newObj={},hasPropertyDescriptor=Object.defineProperty&&Object.getOwnPropertyDescriptor;for(var key in obj)if("default"!==key&&Object.prototype.hasOwnProperty.call(obj,key)){var desc=hasPropertyDescriptor?Object.getOwnPropertyDescriptor(obj,key):null;desc&&(desc.get||desc.set)?Object.defineProperty(newObj,key,desc):newObj[key]=obj[key]}return newObj.default=obj,cache&&cache.set(obj,newObj),newObj}function _interopRequireDefault(obj){return obj&&obj.__esModule?obj:{default:obj}}const showModuleHelp=function(carousel,moduleData){let modal=arguments.length>2&&void 0!==arguments[2]?arguments[2]:null;null!==modal&&!0===moduleData.showFooter&&modal.setFooter(Templates.render("core_course/local/activitychooser/footer_partial",moduleData));const help=carousel.querySelector(_selectors.default.regions.help);help.innerHTML="",help.classList.add("m-auto");const spinnerPromise=(0,_loadingicon.addIconToContainer)(help);let transitionPromiseResolver=null;const transitionPromise=new Promise((resolve=>{transitionPromiseResolver=resolve})),contentPromise=Templates.renderForPromise("core_course/local/activitychooser/help",moduleData);Promise.all([contentPromise,spinnerPromise,transitionPromise]).then((_ref=>{let[{html:html,js:js}]=_ref;return Templates.replaceNodeContents(help,html,js)})).then((()=>(help.querySelector(_selectors.default.regions.chooserSummary.header).focus(),help))).catch(_notification.default.exception),carousel.addEventListener("slid.bs.carousel",(()=>{transitionPromiseResolver()}),{once:!0}),_carousel.default.getInstance(carousel).next()},registerListenerEvents=(modal,mappedModules,partialFavourite,footerData)=>{const modalBody=(0,_normalise.getFirst)(modal.getBody()),bodyClickListener=async e=>{if(e.target.closest(_selectors.default.actions.optionActions.showSummary)){const carousel=modalBody.querySelector(_selectors.default.regions.carousel),moduleName=e.target.closest(_selectors.default.regions.chooserOption.container).dataset.modname,moduleData=mappedModules.get(moduleName);moduleData.showFooter=modal.hasFooterContent(),showModuleHelp(carousel,moduleData,modal)}if(e.target.closest(_selectors.default.actions.optionActions.manageFavourite)){const caller=e.target.closest(_selectors.default.actions.optionActions.manageFavourite);await(async(modalBody,caller,partialFavourite)=>{const isFavourite=caller.dataset.favourited,id=caller.dataset.id,name=caller.dataset.name,internal=caller.dataset.internal;"true"===isFavourite?(await Repository.unfavouriteModule(name,id),partialFavourite(internal,!1,modalBody)):(await Repository.favouriteModule(name,id),partialFavourite(internal,!0,modalBody))})(modalBody,caller,partialFavourite);const activeSectionId=modalBody.querySelector(_selectors.default.elements.activetab).getAttribute("href"),sectionChooserOptions=modalBody.querySelector(_selectors.default.regions.getSectionChooserOptions(activeSectionId)),firstChooserOption=sectionChooserOptions.querySelector(_selectors.default.regions.chooserOption.container);toggleFocusableChooserOption(firstChooserOption,!0),initChooserOptionsKeyboardNavigation(modalBody,mappedModules,sectionChooserOptions,modal)}if(e.target.matches(_selectors.default.actions.closeOption)){const carousel=modalBody.querySelector(_selectors.default.regions.carousel);_carousel.default.getInstance(carousel).prev(),carousel.addEventListener("slid.bs.carousel",(()=>{modalBody.querySelector(_selectors.default.regions.modules).querySelector(_selectors.default.regions.getModuleSelector(e.target.dataset.modname)).focus()}))}if(e.target.closest(_selectors.default.actions.clearSearch)){const searchInput=modalBody.querySelector(_selectors.default.actions.search);searchInput.value="",searchInput.focus(),toggleSearchResultsView(modal,mappedModules,searchInput.value)}},footerClickListener=async e=>{if(!0===footerData.footer){const footerjs=await(pluginName=footerData.customfooterjs,"function"==typeof _systemImportTransformerGlobalIdentifier.define&&_systemImportTransformerGlobalIdentifier.define.amd?new Promise((function(resolve,reject){_systemImportTransformerGlobalIdentifier.require([pluginName],resolve,reject)})):"undefined"!=typeof module&&module.exports&&"undefined"!=typeof require||"undefined"!=typeof module&&module.component&&_systemImportTransformerGlobalIdentifier.require&&"component"===_systemImportTransformerGlobalIdentifier.require.loader?Promise.resolve(require(pluginName)):Promise.resolve(_systemImportTransformerGlobalIdentifier[pluginName]));await footerjs.footerClickListener(e,footerData,modal)}var pluginName};modal.getBodyPromise().then((body=>body[0])).then((body=>{const carousel=document.querySelector(_selectors.default.regions.carousel);return new _carousel.default(carousel,{interval:!1,pause:!0,keyboard:!1}),body})).then((body=>(body.addEventListener("click",bodyClickListener),body))).then((body=>{const searchInput=body.querySelector(_selectors.default.actions.search);return searchInput.addEventListener("input",(0,_utils.debounce)((()=>{toggleSearchResultsView(modal,mappedModules,searchInput.value)}),300)),body})).then((body=>{const activeSectionId=body.querySelector(_selectors.default.elements.activetab).getAttribute("href"),sectionChooserOptions=body.querySelector(_selectors.default.regions.getSectionChooserOptions(activeSectionId)),firstChooserOption=sectionChooserOptions.querySelector(_selectors.default.regions.chooserOption.container);return toggleFocusableChooserOption(firstChooserOption,!0),initChooserOptionsKeyboardNavigation(body,mappedModules,sectionChooserOptions,modal),body})).catch(_notification.default.exception),modal.getFooterPromise().then((footer=>footer[0])).then((footer=>(footer.addEventListener("click",footerClickListener),footer))).catch(_notification.default.exception)},initChooserOptionsKeyboardNavigation=function(body,mappedModules,chooserOptionsContainer){let modal=arguments.length>3&&void 0!==arguments[3]?arguments[3]:null;const chooserOptions=chooserOptionsContainer.querySelectorAll(_selectors.default.regions.chooserOption.container);Array.from(chooserOptions).forEach((element=>element.addEventListener("keydown",(e=>{if((e.keyCode===_key_codes.enter||e.keyCode===_key_codes.space)&&e.target.matches(_selectors.default.actions.optionActions.showSummary)){e.preventDefault();const moduleName=e.target.closest(_selectors.default.regions.chooserOption.container).dataset.modname,moduleData=mappedModules.get(moduleName),carousel=document.querySelector(_selectors.default.regions.carousel);new _carousel.default({interval:!1,pause:!0,keyboard:!1}),moduleData.showFooter=modal.hasFooterContent(),showModuleHelp(carousel,moduleData,modal)}if(e.keyCode===_key_codes.arrowRight){e.preventDefault();const currentOption=e.target.closest(_selectors.default.regions.chooserOption.container),nextOption=currentOption.nextElementSibling,firstOption=chooserOptionsContainer.firstElementChild,toFocusOption=clickErrorHandler(nextOption,firstOption);focusChooserOption(toFocusOption,currentOption)}if(e.keyCode===_key_codes.arrowLeft){e.preventDefault();const currentOption=e.target.closest(_selectors.default.regions.chooserOption.container),previousOption=currentOption.previousElementSibling,lastOption=chooserOptionsContainer.lastElementChild,toFocusOption=clickErrorHandler(previousOption,lastOption);focusChooserOption(toFocusOption,currentOption)}if(e.keyCode===_key_codes.home){e.preventDefault();const currentOption=e.target.closest(_selectors.default.regions.chooserOption.container),firstOption=chooserOptionsContainer.firstElementChild;focusChooserOption(firstOption,currentOption)}if(e.keyCode===_key_codes.end){e.preventDefault();const currentOption=e.target.closest(_selectors.default.regions.chooserOption.container),lastOption=chooserOptionsContainer.lastElementChild;focusChooserOption(lastOption,currentOption)}}))))},focusChooserOption=function(currentChooserOption){let previousChooserOption=arguments.length>1&&void 0!==arguments[1]?arguments[1]:null;null!==previousChooserOption&&toggleFocusableChooserOption(previousChooserOption,!1),toggleFocusableChooserOption(currentChooserOption,!0),currentChooserOption.focus()},toggleFocusableChooserOption=(chooserOption,isFocusable)=>{const chooserOptionLink=chooserOption.querySelector(_selectors.default.actions.addChooser),chooserOptionHelp=chooserOption.querySelector(_selectors.default.actions.optionActions.showSummary),chooserOptionFavourite=chooserOption.querySelector(_selectors.default.actions.optionActions.manageFavourite);isFocusable?(chooserOption.tabIndex=0,chooserOptionLink.tabIndex=0,chooserOptionHelp.tabIndex=0,chooserOptionFavourite.tabIndex=0):(chooserOption.tabIndex=-1,chooserOptionLink.tabIndex=-1,chooserOptionHelp.tabIndex=-1,chooserOptionFavourite.tabIndex=-1)},clickErrorHandler=(item,fallback)=>null!==item?item:fallback,toggleSearchResultsView=async(modal,mappedModules,searchQuery)=>{const modalBody=modal.getBody()[0],searchResultsContainer=modalBody.querySelector(_selectors.default.regions.searchResults),chooserContainer=modalBody.querySelector(_selectors.default.regions.chooser),clearSearchButton=modalBody.querySelector(_selectors.default.actions.clearSearch);if(searchQuery.length>0){const searchResultsData=searchModules(mappedModules,searchQuery);await(async(searchResultsContainer,searchResultsData)=>{const templateData={searchresultsnumber:searchResultsData.length,searchresults:searchResultsData},{html:html,js:js}=await Templates.renderForPromise("core_course/local/activitychooser/search_results",templateData);await Templates.replaceNodeContents(searchResultsContainer,html,js)})(searchResultsContainer,searchResultsData);const searchResultItemsContainer=searchResultsContainer.querySelector(_selectors.default.regions.searchResultItems),firstSearchResultItem=searchResultItemsContainer.querySelector(_selectors.default.regions.chooserOption.container);firstSearchResultItem&&(toggleFocusableChooserOption(firstSearchResultItem,!0),initChooserOptionsKeyboardNavigation(modalBody,mappedModules,searchResultItemsContainer,modal)),clearSearchButton.classList.remove("d-none"),chooserContainer.setAttribute("hidden","hidden"),searchResultsContainer.removeAttribute("hidden")}else clearSearchButton.classList.add("d-none"),searchResultsContainer.setAttribute("hidden","hidden"),chooserContainer.removeAttribute("hidden")},searchModules=(modules,searchTerm)=>{if(""===searchTerm)return modules;searchTerm=searchTerm.toLowerCase();const searchResults=[];return modules.forEach((activity=>{const activityName=activity.title.toLowerCase(),activityDesc=activity.help.toLowerCase();(activityName.includes(searchTerm)||activityDesc.includes(searchTerm))&&searchResults.push(activity)})),searchResults},disableFocusAllChooserOptions=sectionChooserOptions=>{sectionChooserOptions.querySelectorAll(_selectors.default.regions.chooserOption.container).forEach((chooserOption=>{toggleFocusableChooserOption(chooserOption,!1)}))};_exports.displayChooser=(modalPromise,sectionModules,partialFavourite,footerData)=>{const mappedModules=new Map;sectionModules.forEach((module=>{mappedModules.set(module.componentname+"_"+module.link,module)})),modalPromise.then((modal=>(registerListenerEvents(modal,mappedModules,partialFavourite,footerData),((modal,mappedModules)=>{modal.getModal()[0].tabIndex=-1,modal.getBodyPromise().then((body=>{document.querySelectorAll(_selectors.default.elements.tab).forEach((tab=>{tab.addEventListener("shown.bs.tab",(e=>{const activeSectionId=e.target.getAttribute("href"),activeSectionChooserOptions=body[0].querySelector(_selectors.default.regions.getSectionChooserOptions(activeSectionId)),firstChooserOption=activeSectionChooserOptions.querySelector(_selectors.default.regions.chooserOption.container),prevActiveSectionId=e.relatedTarget.getAttribute("href"),prevActiveSectionChooserOptions=body[0].querySelector(_selectors.default.regions.getSectionChooserOptions(prevActiveSectionId));disableFocusAllChooserOptions(prevActiveSectionChooserOptions),toggleFocusableChooserOption(firstChooserOption,!0),initChooserOptionsKeyboardNavigation(body[0],mappedModules,activeSectionChooserOptions,modal)}))}))})).catch(_notification.default.exception)})(modal,mappedModules),modal.getRoot().on(ModalEvents.hidden,(()=>{modal.destroy()})),modal))).catch(_notification.default.exception)}})); +define("core_course/local/activitychooser/dialogue",["exports","jquery","core/custom_interaction_events","theme_boost/bootstrap/carousel","core/modal_events","core_course/local/activitychooser/selectors","core/templates","core/key_codes","core/loadingicon","core_course/local/activitychooser/repository","core/notification","core/utils","core/normalise"],(function(_exports,_jquery,_custom_interaction_events,_carousel,ModalEvents,_selectors,Templates,_key_codes,_loadingicon,Repository,_notification,_utils,_normalise){Object.defineProperty(_exports,"__esModule",{value:!0}),_exports.displayChooser=void 0,_jquery=_interopRequireDefault(_jquery),_custom_interaction_events=_interopRequireDefault(_custom_interaction_events),_carousel=_interopRequireDefault(_carousel),ModalEvents=_interopRequireWildcard(ModalEvents),_selectors=_interopRequireDefault(_selectors),Templates=_interopRequireWildcard(Templates),Repository=_interopRequireWildcard(Repository),_notification=_interopRequireDefault(_notification);var _systemImportTransformerGlobalIdentifier="undefined"!=typeof window?window:"undefined"!=typeof self?self:"undefined"!=typeof global?global:{};function _getRequireWildcardCache(nodeInterop){if("function"!=typeof WeakMap)return null;var cacheBabelInterop=new WeakMap,cacheNodeInterop=new WeakMap;return(_getRequireWildcardCache=function(nodeInterop){return nodeInterop?cacheNodeInterop:cacheBabelInterop})(nodeInterop)}function _interopRequireWildcard(obj,nodeInterop){if(!nodeInterop&&obj&&obj.__esModule)return obj;if(null===obj||"object"!=typeof obj&&"function"!=typeof obj)return{default:obj};var cache=_getRequireWildcardCache(nodeInterop);if(cache&&cache.has(obj))return cache.get(obj);var newObj={},hasPropertyDescriptor=Object.defineProperty&&Object.getOwnPropertyDescriptor;for(var key in obj)if("default"!==key&&Object.prototype.hasOwnProperty.call(obj,key)){var desc=hasPropertyDescriptor?Object.getOwnPropertyDescriptor(obj,key):null;desc&&(desc.get||desc.set)?Object.defineProperty(newObj,key,desc):newObj[key]=obj[key]}return newObj.default=obj,cache&&cache.set(obj,newObj),newObj}function _interopRequireDefault(obj){return obj&&obj.__esModule?obj:{default:obj}}const showModuleHelp=function(carousel,moduleData){let modal=arguments.length>2&&void 0!==arguments[2]?arguments[2]:null;null!==modal&&!0===moduleData.showFooter&&modal.setFooter(Templates.render("core_course/local/activitychooser/footer_partial",moduleData));const help=carousel.querySelector(_selectors.default.regions.help);help.innerHTML="",help.classList.add("m-auto");const spinnerPromise=(0,_loadingicon.addIconToContainer)(help);let transitionPromiseResolver=null;const transitionPromise=new Promise((resolve=>{transitionPromiseResolver=resolve})),contentPromise=Templates.renderForPromise("core_course/local/activitychooser/help",moduleData);Promise.all([contentPromise,spinnerPromise,transitionPromise]).then((_ref=>{let[{html:html,js:js}]=_ref;return Templates.replaceNodeContents(help,html,js)})).then((()=>(help.querySelector(_selectors.default.regions.chooserSummary.header).focus(),help))).catch(_notification.default.exception),carousel.addEventListener("slid.bs.carousel",(()=>{transitionPromiseResolver()}),{once:!0}),_carousel.default.getInstance(carousel).next()},registerListenerEvents=(modal,mappedModules,partialFavourite,footerData)=>{const modalBody=(0,_normalise.getFirst)(modal.getBody()),bodyClickListener=async e=>{if(e.target.closest(_selectors.default.actions.optionActions.showSummary)){const carousel=modalBody.querySelector(_selectors.default.regions.carousel),moduleName=e.target.closest(_selectors.default.regions.chooserOption.container).dataset.modname,moduleData=mappedModules.get(moduleName);moduleData.showFooter=modal.hasFooterContent(),showModuleHelp(carousel,moduleData,modal)}if(e.target.closest(_selectors.default.actions.optionActions.manageFavourite)){const caller=e.target.closest(_selectors.default.actions.optionActions.manageFavourite);await(async(modalBody,caller,partialFavourite)=>{const isFavourite=caller.dataset.favourited,id=caller.dataset.id,name=caller.dataset.name,internal=caller.dataset.internal;"true"===isFavourite?(await Repository.unfavouriteModule(name,id),partialFavourite(internal,!1,modalBody)):(await Repository.favouriteModule(name,id),partialFavourite(internal,!0,modalBody))})(modalBody,caller,partialFavourite);const activeSectionId=modalBody.querySelector(_selectors.default.elements.activetab).getAttribute("href"),sectionChooserOptions=modalBody.querySelector(_selectors.default.regions.getSectionChooserOptions(activeSectionId)),firstChooserOption=sectionChooserOptions.querySelector(_selectors.default.regions.chooserOption.container);toggleFocusableChooserOption(firstChooserOption,!0),initChooserOptionsKeyboardNavigation(modalBody,mappedModules,sectionChooserOptions,modal)}if(e.target.matches(_selectors.default.actions.closeOption)){const carousel=modalBody.querySelector(_selectors.default.regions.carousel);_carousel.default.getInstance(carousel).prev(),carousel.addEventListener("slid.bs.carousel",(()=>{modalBody.querySelector(_selectors.default.regions.modules).querySelector(_selectors.default.regions.getModuleSelector(e.target.dataset.modname)).focus()}))}if(e.target.closest(_selectors.default.actions.clearSearch)){const searchInput=modalBody.querySelector(_selectors.default.actions.search);searchInput.value="",searchInput.focus(),toggleSearchResultsView(modal,mappedModules,searchInput.value)}},footerClickListener=async e=>{if(!0===footerData.footer){const footerjs=await(pluginName=footerData.customfooterjs,"function"==typeof _systemImportTransformerGlobalIdentifier.define&&_systemImportTransformerGlobalIdentifier.define.amd?new Promise((function(resolve,reject){_systemImportTransformerGlobalIdentifier.require([pluginName],resolve,reject)})):"undefined"!=typeof module&&module.exports&&"undefined"!=typeof require||"undefined"!=typeof module&&module.component&&_systemImportTransformerGlobalIdentifier.require&&"component"===_systemImportTransformerGlobalIdentifier.require.loader?Promise.resolve(require(pluginName)):Promise.resolve(_systemImportTransformerGlobalIdentifier[pluginName]));await footerjs.footerClickListener(e,footerData,modal)}var pluginName};modal.getBodyPromise().then((body=>body[0])).then((body=>{const carousel=document.querySelector(_selectors.default.regions.carousel);return new _carousel.default(carousel,{interval:!1,pause:!0,keyboard:!1}),body})).then((body=>(body.addEventListener("click",bodyClickListener),body))).then((body=>{const searchInput=body.querySelector(_selectors.default.actions.search);return searchInput.addEventListener("input",(0,_utils.debounce)((()=>{toggleSearchResultsView(modal,mappedModules,searchInput.value)}),300)),body})).then((body=>{const activeSectionId=body.querySelector(_selectors.default.elements.activetab).getAttribute("href"),sectionChooserOptions=body.querySelector(_selectors.default.regions.getSectionChooserOptions(activeSectionId)),firstChooserOption=sectionChooserOptions.querySelector(_selectors.default.regions.chooserOption.container);return toggleFocusableChooserOption(firstChooserOption,!0),initChooserOptionsKeyboardNavigation(body,mappedModules,sectionChooserOptions,modal),body})).catch(_notification.default.exception),modal.getFooterPromise().then((footer=>footer[0])).then((footer=>(footer.addEventListener("click",footerClickListener),footer))).catch(_notification.default.exception)},initChooserOptionsKeyboardNavigation=function(body,mappedModules,chooserOptionsContainer){let modal=arguments.length>3&&void 0!==arguments[3]?arguments[3]:null;const chooserOptions=chooserOptionsContainer.querySelectorAll(_selectors.default.regions.chooserOption.container);Array.from(chooserOptions).forEach((element=>{const $element=(0,_jquery.default)(element);_custom_interaction_events.default.define($element,[_custom_interaction_events.default.events.next,_custom_interaction_events.default.events.previous,_custom_interaction_events.default.events.home,_custom_interaction_events.default.events.end]);const createNavHandler=resolver=>(e,data)=>{const currentOption=data.originalEvent.target.closest(_selectors.default.regions.chooserOption.container);if(null!==currentOption){const toFocusOption=resolver(currentOption);toFocusOption&&focusChooserOption(toFocusOption,currentOption)}};$element.on(_custom_interaction_events.default.events.next,createNavHandler((current=>current.nextElementSibling||chooserOptionsContainer.firstElementChild))),$element.on(_custom_interaction_events.default.events.previous,createNavHandler((current=>current.previousElementSibling||chooserOptionsContainer.lastElementChild))),$element.on(_custom_interaction_events.default.events.home,createNavHandler((()=>chooserOptionsContainer.firstElementChild))),$element.on(_custom_interaction_events.default.events.end,createNavHandler((()=>chooserOptionsContainer.lastElementChild))),element.addEventListener("keydown",(e=>{if((e.keyCode===_key_codes.enter||e.keyCode===_key_codes.space)&&e.target.matches(_selectors.default.actions.optionActions.showSummary)){e.preventDefault();const moduleName=e.target.closest(_selectors.default.regions.chooserOption.container).dataset.modname,moduleData=mappedModules.get(moduleName),carousel=document.querySelector(_selectors.default.regions.carousel);new _carousel.default({interval:!1,pause:!0,keyboard:!1}),moduleData.showFooter=modal.hasFooterContent(),showModuleHelp(carousel,moduleData,modal)}}))}))},focusChooserOption=function(currentChooserOption){let previousChooserOption=arguments.length>1&&void 0!==arguments[1]?arguments[1]:null;null!==previousChooserOption&&toggleFocusableChooserOption(previousChooserOption,!1),toggleFocusableChooserOption(currentChooserOption,!0),currentChooserOption.focus()},toggleFocusableChooserOption=(chooserOption,isFocusable)=>{const chooserOptionLink=chooserOption.querySelector(_selectors.default.actions.addChooser),chooserOptionHelp=chooserOption.querySelector(_selectors.default.actions.optionActions.showSummary),chooserOptionFavourite=chooserOption.querySelector(_selectors.default.actions.optionActions.manageFavourite);isFocusable?(chooserOption.tabIndex=0,chooserOptionLink.tabIndex=0,chooserOptionHelp.tabIndex=0,chooserOptionFavourite.tabIndex=0):(chooserOption.tabIndex=-1,chooserOptionLink.tabIndex=-1,chooserOptionHelp.tabIndex=-1,chooserOptionFavourite.tabIndex=-1)},toggleSearchResultsView=async(modal,mappedModules,searchQuery)=>{const modalBody=modal.getBody()[0],searchResultsContainer=modalBody.querySelector(_selectors.default.regions.searchResults),chooserContainer=modalBody.querySelector(_selectors.default.regions.chooser),clearSearchButton=modalBody.querySelector(_selectors.default.actions.clearSearch);if(searchQuery.length>0){const searchResultsData=searchModules(mappedModules,searchQuery);await(async(searchResultsContainer,searchResultsData)=>{const templateData={searchresultsnumber:searchResultsData.length,searchresults:searchResultsData},{html:html,js:js}=await Templates.renderForPromise("core_course/local/activitychooser/search_results",templateData);await Templates.replaceNodeContents(searchResultsContainer,html,js)})(searchResultsContainer,searchResultsData);const searchResultItemsContainer=searchResultsContainer.querySelector(_selectors.default.regions.searchResultItems),firstSearchResultItem=searchResultItemsContainer.querySelector(_selectors.default.regions.chooserOption.container);firstSearchResultItem&&(toggleFocusableChooserOption(firstSearchResultItem,!0),initChooserOptionsKeyboardNavigation(modalBody,mappedModules,searchResultItemsContainer,modal)),clearSearchButton.classList.remove("d-none"),chooserContainer.setAttribute("hidden","hidden"),searchResultsContainer.removeAttribute("hidden")}else clearSearchButton.classList.add("d-none"),searchResultsContainer.setAttribute("hidden","hidden"),chooserContainer.removeAttribute("hidden")},searchModules=(modules,searchTerm)=>{if(""===searchTerm)return modules;searchTerm=searchTerm.toLowerCase();const searchResults=[];return modules.forEach((activity=>{const activityName=activity.title.toLowerCase(),activityDesc=activity.help.toLowerCase();(activityName.includes(searchTerm)||activityDesc.includes(searchTerm))&&searchResults.push(activity)})),searchResults},disableFocusAllChooserOptions=sectionChooserOptions=>{sectionChooserOptions.querySelectorAll(_selectors.default.regions.chooserOption.container).forEach((chooserOption=>{toggleFocusableChooserOption(chooserOption,!1)}))};_exports.displayChooser=(modalPromise,sectionModules,partialFavourite,footerData)=>{const mappedModules=new Map;sectionModules.forEach((module=>{mappedModules.set(module.componentname+"_"+module.link,module)})),modalPromise.then((modal=>(registerListenerEvents(modal,mappedModules,partialFavourite,footerData),((modal,mappedModules)=>{modal.getModal()[0].tabIndex=-1,modal.getBodyPromise().then((body=>{document.querySelectorAll(_selectors.default.elements.tab).forEach((tab=>{tab.addEventListener("shown.bs.tab",(e=>{const activeSectionId=e.target.getAttribute("href"),activeSectionChooserOptions=body[0].querySelector(_selectors.default.regions.getSectionChooserOptions(activeSectionId)),firstChooserOption=activeSectionChooserOptions.querySelector(_selectors.default.regions.chooserOption.container),prevActiveSectionId=e.relatedTarget.getAttribute("href"),prevActiveSectionChooserOptions=body[0].querySelector(_selectors.default.regions.getSectionChooserOptions(prevActiveSectionId));disableFocusAllChooserOptions(prevActiveSectionChooserOptions),toggleFocusableChooserOption(firstChooserOption,!0),initChooserOptionsKeyboardNavigation(body[0],mappedModules,activeSectionChooserOptions,modal)}))}))})).catch(_notification.default.exception)})(modal,mappedModules),modal.getRoot().on(ModalEvents.hidden,(()=>{modal.destroy()})),modal))).catch(_notification.default.exception)}})); //# sourceMappingURL=dialogue.min.js.map \ No newline at end of file diff --git a/course/amd/build/local/activitychooser/dialogue.min.js.map b/course/amd/build/local/activitychooser/dialogue.min.js.map index 4898b189a0faf..c96b25fb02cc3 100644 --- a/course/amd/build/local/activitychooser/dialogue.min.js.map +++ b/course/amd/build/local/activitychooser/dialogue.min.js.map @@ -1 +1 @@ -{"version":3,"file":"dialogue.min.js","sources":["../../../src/local/activitychooser/dialogue.js"],"sourcesContent":["// This file is part of Moodle - http://moodle.org/\n//\n// Moodle is free software: you can redistribute it and/or modify\n// it under the terms of the GNU General Public License as published by\n// the Free Software Foundation, either version 3 of the License, or\n// (at your option) any later version.\n//\n// Moodle is distributed in the hope that it will be useful,\n// but WITHOUT ANY WARRANTY; without even the implied warranty of\n// MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the\n// GNU General Public License for more details.\n//\n// You should have received a copy of the GNU General Public License\n// along with Moodle. If not, see