L-electron-Rare/moodle
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

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

Browse Source
This commit is contained in:
Huong Nguyen
2024-08-20 09:30:44 +07:00
parent 2bfd4c2950 e05ae09017
commit dca18ebca3
395 changed files with 787 additions and 785 deletions
Download Patch File Download Diff File Expand all files Collapse all files
availability/classes/frontend.php
+6 -6
View File
@@ -50,8 +50,8 @@ abstract class frontend {
* @param \cm_info $cm Course-module currently being edited (null if none)
* @param \section_info $section Section currently being edited (null if none)
*/
protected function allow_add($course, \cm_info $cm = null,
\section_info $section = null) {
protected function allow_add($course, ?\cm_info $cm = null,
?\section_info $section = null) {
return true;
}
@@ -78,8 +78,8 @@ abstract class frontend {
* @param \section_info $section Section currently being edited (null if none)
* @return array Array of parameters for the JavaScript function
*/
protected function get_javascript_init_params($course, \cm_info $cm = null,
\section_info $section = null) {
protected function get_javascript_init_params($course, ?\cm_info $cm = null,
?\section_info $section = null) {
return array();
}
@@ -99,8 +99,8 @@ abstract class frontend {
* @param \cm_info $cm Course-module currently being edited (null if none)
* @param \section_info $section Section currently being edited (null if none)
*/
public static function include_all_javascript($course, \cm_info $cm = null,
\section_info $section = null) {
public static function include_all_javascript($course, ?\cm_info $cm = null,
?\section_info $section = null) {
global $PAGE;
// Prepare array of required YUI modules. It is bad for performance to
availability/classes/info.php
+2 -2
View File
@@ -173,7 +173,7 @@ abstract class info {
* @return bool True if this item is available to the user, false otherwise
*/
public function is_available(&$information, $grabthelot = false, $userid = 0,
\course_modinfo $modinfo = null) {
?\course_modinfo $modinfo = null) {
global $USER;
// Default to no information.
@@ -262,7 +262,7 @@ abstract class info {
* @return string Information string (for admin) about all restrictions on
* this item
*/
public function get_full_information(\course_modinfo $modinfo = null) {
public function get_full_information(?\course_modinfo $modinfo = null) {
// Do nothing if there are no availability restrictions.
if (is_null($this->availability)) {
return '';
availability/classes/result.php
+1 -1
View File
@@ -50,7 +50,7 @@ class result {
* @param tree_node $node Node if failed & should be displayed
* @param result[] $failedchildren Array of children who failed too
*/
public function __construct($available, tree_node $node = null,
public function __construct($available, ?tree_node $node = null,
array $failedchildren = array()) {
$this->available = $available;
if (!$available) {
availability/condition/completion/classes/frontend.php
+4 -4
View File
@@ -49,8 +49,8 @@ class frontend extends \core_availability\frontend {
'label_cm', 'label_completion'];
}
protected function get_javascript_init_params($course, \cm_info $cm = null,
\section_info $section = null) {
protected function get_javascript_init_params($course, ?\cm_info $cm = null,
?\section_info $section = null) {
// Use cached result if available. The cache is just because we call it
// twice (once from allow_add) so it's nice to avoid doing all the
// print_string calls twice.
@@ -86,8 +86,8 @@ class frontend extends \core_availability\frontend {
return $this->cacheinitparams;
}
protected function allow_add($course, \cm_info $cm = null,
\section_info $section = null) {
protected function allow_add($course, ?\cm_info $cm = null,
?\section_info $section = null) {
global $CFG;
// Check if completion is enabled for the course.
availability/condition/date/classes/frontend.php
+2 -2
View File
@@ -84,8 +84,8 @@ class frontend extends \core_availability\frontend {
'hour' => $wrongfields['hours'], 'minute' => $wrongfields['minutes']);
}
protected function get_javascript_init_params($course, \cm_info $cm = null,
\section_info $section = null) {
protected function get_javascript_init_params($course, ?\cm_info $cm = null,
?\section_info $section = null) {
global $CFG, $OUTPUT;
require_once($CFG->libdir . '/formslib.php');
availability/condition/grade/classes/frontend.php
+2 -2
View File
@@ -38,8 +38,8 @@ class frontend extends \core_availability\frontend {
return array('option_min', 'option_max', 'label_min', 'label_max');
}
protected function get_javascript_init_params($course, \cm_info $cm = null,
\section_info $section = null) {
protected function get_javascript_init_params($course, ?\cm_info $cm = null,
?\section_info $section = null) {
global $DB, $CFG;
require_once($CFG->libdir . '/gradelib.php');
require_once($CFG->dirroot . '/course/lib.php');
availability/condition/group/classes/frontend.php
+4 -4
View File
@@ -43,8 +43,8 @@ class frontend extends \core_availability\frontend {
return array('anygroup');
}
protected function get_javascript_init_params($course, \cm_info $cm = null,
\section_info $section = null) {
protected function get_javascript_init_params($course, ?\cm_info $cm = null,
?\section_info $section = null) {
// Get all groups for course.
$groups = $this->get_all_groups($course->id);
@@ -78,8 +78,8 @@ class frontend extends \core_availability\frontend {
return $this->allgroups;
}
protected function allow_add($course, \cm_info $cm = null,
\section_info $section = null) {
protected function allow_add($course, ?\cm_info $cm = null,
?\section_info $section = null) {
global $CFG;
// Only show this option if there are some groups.
availability/condition/grouping/classes/frontend.php
+4 -4
View File
@@ -39,8 +39,8 @@ class frontend extends \core_availability\frontend {
/** @var int Course id that $allgroupings is for */
protected $allgroupingscourseid;
protected function get_javascript_init_params($course, \cm_info $cm = null,
\section_info $section = null) {
protected function get_javascript_init_params($course, ?\cm_info $cm = null,
?\section_info $section = null) {
// Get all groups for course.
$groupings = $this->get_all_groupings($course->id);
@@ -70,8 +70,8 @@ class frontend extends \core_availability\frontend {
return $this->allgroupings;
}
protected function allow_add($course, \cm_info $cm = null,
\section_info $section = null) {
protected function allow_add($course, ?\cm_info $cm = null,
?\section_info $section = null) {
global $CFG, $DB;
// Check if groupings are in use for the course. (Unlike the 'group'
availability/condition/profile/classes/frontend.php
+2 -2
View File
@@ -40,8 +40,8 @@ class frontend extends \core_availability\frontend {
'label_operator', 'label_value');
}
protected function get_javascript_init_params($course, \cm_info $cm = null,
\section_info $section = null) {
protected function get_javascript_init_params($course, ?\cm_info $cm = null,
?\section_info $section = null) {
// Standard user fields.
$standardfields = condition::get_standard_profile_fields();
availability/tests/fixtures/mock_info_module.php
Vendored
+1 -1
View File
@@ -46,7 +46,7 @@ class mock_info_module extends info_module {
* @param int $userid Userid for modinfo (if used)
* @param \cm_info $cm Course-module object
*/
public function __construct($userid = 0, \cm_info $cm = null) {
public function __construct($userid = 0, ?\cm_info $cm = null) {
parent::__construct($cm);
$this->userid = $userid;
$this->cm = $cm;
availability/tests/fixtures/mock_info_section.php
Vendored
+1 -1
View File
@@ -46,7 +46,7 @@ class mock_info_section extends info_section {
* @param int $userid Userid for modinfo (if used)
* @param \section_info $section Section object
*/
public function __construct($userid = 0, \section_info $section = null) {
public function __construct($userid = 0, ?\section_info $section = null) {
parent::__construct($section);
$this->userid = $userid;
$this->section = $section;