Skip to content

Commit

Permalink
Fixes PHP8 deprecation warnings (PoetOS#359)
Browse files Browse the repository at this point in the history 
* Fixes PHP8 deprecation warning

Co-authored-by: Mike Churchward <[email protected]>
  • Loading branch information
@mwehr @mchurchward
mwehr and mchurchward authored Mar 8, 2022
1 parent 815026f commit 9ec8ab4
Show file tree
Hide file tree
Showing 28 changed files with 66 additions and 66 deletions.
4 changes: 2 additions & 2 deletions classes/feedback/section.php
View file
Original file line number Diff line number Diff line change
Expand Up @@ -58,13 +58,13 @@ class section {
* 'surveyid' - the surveyid field of the fb_sections table (required if no 'id' field),
* 'sectionnum' - the section field of the fb_sections table (ignored if 'id' is present; defaults to 1).
*
* @param array $params As above
* @param array $questions Array of mod_questionnaire\question objects.
* @param array $params As above
* @throws \dml_exception
* @throws coding_exception
* @throws invalid_parameter_exception
*/
public function __construct($params = [], $questions) {
public function __construct($questions, $params = []) {

if (!is_array($params) || !is_array($questions)) {
throw new coding_exception('Invalid data provided.');
Expand Down
2 changes: 1 addition & 1 deletion classes/output/mobile.php
View file
Original file line number Diff line number Diff line change
Expand Up @@ -48,7 +48,7 @@ public static function mobile_view_activity($args) {
$completed = isset($args->completed) ? $args->completed : false;

list($cm, $course, $questionnaire) = questionnaire_get_standard_page_items($cmid);
$questionnaire = new \questionnaire(0, $questionnaire, $course, $cm);
$questionnaire = new \questionnaire($course, $cm, 0, $questionnaire);

$data = [];
$data['cmid'] = $cmid;
Expand Down
6 changes: 3 additions & 3 deletions classes/output/renderer.php
View file
Original file line number Diff line number Diff line change
Expand Up @@ -207,14 +207,14 @@ public function render_progress_bar($section, $questionsbysec) {
* Render a question for a survey.
* @param \mod_questionnaire\question\question $question The question object.
* @param \mod_questionnaire\responsetype\response\response $response Any current response data.
* @param array $dependants Array of all questions/choices depending on $question.
* @param int $qnum The question number.
* @param boolean $blankquestionnaire Used for printing a blank one.
* @param array $dependants Array of all questions/choices depending on $question.
* @return string The output for the page.
*/
public function question_output($question, $response, $dependants=[], $qnum, $blankquestionnaire) {
public function question_output($question, $response, $qnum, $blankquestionnaire, $dependants=[]) {

$pagetags = $question->question_output($response, $dependants, $qnum, $blankquestionnaire);
$pagetags = $question->question_output($response, $blankquestionnaire, $dependants, $qnum);

// If the question has a template, then render it from the 'qformelement' context. If no template, then 'qformelement'
// already contains HTML.
Expand Down
2 changes: 1 addition & 1 deletion classes/privacy/provider.php
View file
Original file line number Diff line number Diff line change
Expand Up @@ -211,7 +211,7 @@ public static function export_user_data(approved_contextlist $contextlist) {
$lastcmid = $response->cmid;
$course = $DB->get_record("course", ["id" => $response->qcourse]);
$cm = get_coursemodule_from_instance("questionnaire", $response->qid, $course->id);
$questionnaire = new \questionnaire($response->qid, null, $course, $cm);
$questionnaire = new \questionnaire($course, $cm, $response->qid, null);
}
$responsedata['responses'][] = [
'complete' => (($response->complete == 'y') ? get_string('yes') : get_string('no')),
Expand Down
4 changes: 2 additions & 2 deletions classes/question/question.php
View file
Original file line number Diff line number Diff line change
Expand Up @@ -846,12 +846,12 @@ public function results_template($pdf = false) {
/**
* Get the output for question renderers / templates.
* @param \mod_questionnaire\responsetype\response\response $response
* @param boolean $blankquestionnaire
* @param array $dependants Array of all questions/choices depending on this question.
* @param integer $qnum
* @param boolean $blankquestionnaire
* @return \stdClass
*/
public function question_output($response, $dependants=[], $qnum='', $blankquestionnaire) {
public function question_output($response, $blankquestionnaire, $dependants=[], $qnum='') {
$pagetags = $this->questionstart_survey_display($qnum, $response);
$pagetags->qformelement = $this->question_survey_display($response, $dependants, $blankquestionnaire);
return $pagetags;
Expand Down
2 changes: 1 addition & 1 deletion classes/question/sectiontext.php
View file
Original file line number Diff line number Diff line change
Expand Up @@ -112,7 +112,7 @@ protected function question_survey_display($response, $descendantsdata, $blankqu
}

list($cm, $course, $questionnaire) = questionnaire_get_standard_page_items(null, $response->questionnaireid);
$questionnaire = new \questionnaire(0, $questionnaire, $course, $cm);
$questionnaire = new \questionnaire($course, $cm, 0, $questionnaire);
$questionnaire->add_renderer($PAGE->get_renderer('mod_questionnaire'));
$questionnaire->add_page(new \mod_questionnaire\output\reportpage());

Expand Down
2 changes: 1 addition & 1 deletion complete.php
View file
Original file line number Diff line number Diff line change
Expand Up @@ -47,7 +47,7 @@

$PAGE->set_url($url);
$PAGE->set_context($context);
$questionnaire = new questionnaire(0, $questionnaire, $course, $cm);
$questionnaire = new questionnaire( $course, $cm, 0, $questionnaire);
// Add renderer and page objects to the questionnaire object for display use.
$questionnaire->add_renderer($PAGE->get_renderer('mod_questionnaire'));
$questionnaire->add_page(new \mod_questionnaire\output\completepage());
Expand Down
4 changes: 2 additions & 2 deletions drawchart.php
View file
Original file line number Diff line number Diff line change
Expand Up @@ -23,8 +23,8 @@

defined('MOODLE_INTERNAL') || die();

function draw_chart($feedbacktype, $charttype=null, $labels,
$score=null, $allscore=null, $globallabel=null, $groupname, $allresponses) {
function draw_chart($feedbacktype, $labels, $groupname,
$allresponses, $charttype=null, $score=null, $allscore=null, $globallabel=null) {
global $PAGE;

$pageoutput = '';
Expand Down
2 changes: 1 addition & 1 deletion externallib.php
View file
Original file line number Diff line number Diff line change
Expand Up @@ -104,7 +104,7 @@ public static function submit_questionnaire_response($questionnaireid, $surveyid
);

list($cm, $course, $questionnaire) = questionnaire_get_standard_page_items($cmid);
$questionnaire = new \questionnaire(0, $questionnaire, $course, $cm);
$questionnaire = new \questionnaire($course, $cm, 0, $questionnaire);

$context = \context_module::instance($cm->id);
self::validate_context($context);
Expand Down
8 changes: 4 additions & 4 deletions fbsections.php
View file
Original file line number Diff line number Diff line change
Expand Up @@ -58,11 +58,11 @@
$SESSION->questionnaire = new stdClass();
}

$questionnaire = new questionnaire(0, $questionnaire, $course, $cm);
$questionnaire = new questionnaire($course, $cm, 0, $questionnaire);

if ($sectionid) {
// Get the specified section by its id.
$feedbacksection = new mod_questionnaire\feedback\section(['id' => $sectionid], $questionnaire->questions);
$feedbacksection = new mod_questionnaire\feedback\section($questionnaire->questions, ['id' => $sectionid]);

} else if (!$DB->count_records('questionnaire_fb_sections', ['surveyid' => $questionnaire->sid])) {
// There are no sections currently, so create one.
Expand All @@ -75,8 +75,8 @@

} else {
// Get the specified section by section number.
$feedbacksection = new mod_questionnaire\feedback\section(['surveyid' => $questionnaire->survey->id, 'sectionnum' => $section],
$questionnaire->questions);
$feedbacksection = new mod_questionnaire\feedback\section($questionnaire->questions,
['surveyid' => $questionnaire->survey->id, 'sectionnum' => $section]);
}

// Get all questions that are valid feedback questions.
Expand Down
2 changes: 1 addition & 1 deletion feedback.php
View file
Original file line number Diff line number Diff line change
Expand Up @@ -53,7 +53,7 @@
if (!isset($SESSION->questionnaire)) {
$SESSION->questionnaire = new stdClass();
}
$questionnaire = new questionnaire(0, $questionnaire, $course, $cm);
$questionnaire = new questionnaire($course, $cm, 0, $questionnaire);

// Add renderer and page objects to the questionnaire object for display use.
$questionnaire->add_renderer($PAGE->get_renderer('mod_questionnaire'));
Expand Down
10 changes: 5 additions & 5 deletions lib.php
View file
Original file line number Diff line number Diff line change
Expand Up @@ -82,7 +82,7 @@ function questionnaire_add_instance($questionnaire) {
// Create a new survey.
$course = get_course($questionnaire->course);
$cm = new stdClass();
$qobject = new questionnaire(0, $questionnaire, $course, $cm);
$qobject = new questionnaire($course, $cm, 0, $questionnaire);

if ($questionnaire->create == 'new-0') {
$sdata = new stdClass();
Expand Down Expand Up @@ -547,7 +547,7 @@ function questionnaire_extend_settings_navigation(settings_navigation $settings,
}

$courseid = $course->id;
$questionnaire = new questionnaire(0, $questionnaire, $course, $cm);
$questionnaire = new questionnaire($course, $cm, 0, $questionnaire);

if ($owner = $DB->get_field('questionnaire_survey', 'courseid', ['id' => $questionnaire->sid])) {
$owner = (trim($owner) == trim($courseid));
Expand Down Expand Up @@ -763,7 +763,7 @@ function questionnaire_get_recent_mod_activity(&$activities, &$index, $timestart

$cm = $modinfo->cms[$cmid];
$questionnaire = $DB->get_record('questionnaire', ['id' => $cm->instance]);
$questionnaire = new questionnaire(0, $questionnaire, $course, $cm);
$questionnaire = new questionnaire($course, $cm, 0, $questionnaire);

$context = context_module::instance($cm->id);
$grader = has_capability('mod/questionnaire:viewsingleresponse', $context);
Expand Down Expand Up @@ -1226,10 +1226,10 @@ function mod_questionnaire_coursemodule_edit_post_actions($data, $course) {

if (!empty($data->copyid)) {
$cm = (object)['id' => $data->coursemodule];
$questionnaire = new questionnaire(0, $data, $course, $cm);
$questionnaire = new questionnaire($course, $cm, 0, $data);
$oldquestionnaireid = $DB->get_field('questionnaire', 'id', ['sid' => $data->copyid]);
$oldcm = get_coursemodule_from_instance('questionnaire', $oldquestionnaireid);
$oldquestionnaire = new questionnaire($oldquestionnaireid, null, $course, $oldcm);
$oldquestionnaire = new questionnaire($course, $oldcm, $oldquestionnaireid, null);
$oldcontext = context_module::instance($oldcm->id);
$newcontext = context_module::instance($data->coursemodule);
$areas = $questionnaire->get_all_file_areas();
Expand Down
4 changes: 2 additions & 2 deletions locallib.php
View file
Original file line number Diff line number Diff line change
Expand Up @@ -784,7 +784,7 @@ function questionnaire_check_page_breaks($questionnaire) {
}
$newpbids[] = $newqid;
$movetopos = $i;
$questionnaire = new questionnaire($questionnaire->id, null, $course, $cm);
$questionnaire = new questionnaire($course, $cm, $questionnaire->id, null);
$questionnaire->move_question($newqid, $movetopos);
}
}
Expand All @@ -795,7 +795,7 @@ function questionnaire_check_page_breaks($questionnaire) {
} else if ($newpbids) {
$msg .= get_string('checkbreaksadded', 'questionnaire').'&nbsp;';
$newpbids = array_reverse ($newpbids);
$questionnaire = new questionnaire($questionnaire->id, null, $course, $cm);
$questionnaire = new questionnaire($course, $cm, $questionnaire->id, null);
foreach ($newpbids as $newpbid) {
$msg .= $questionnaire->questions[$newpbid]->position.'&nbsp;';
}
Expand Down
2 changes: 1 addition & 1 deletion mod_form.php
View file
Original file line number Diff line number Diff line change
Expand Up @@ -34,7 +34,7 @@ protected function definition() {
global $COURSE;
global $questionnairetypes, $questionnairerespondents, $questionnaireresponseviewers, $autonumbering;

$questionnaire = new questionnaire($this->_instance, null, $COURSE, $this->_cm);
$questionnaire = new questionnaire($COURSE, $this->_cm, $this->_instance, null);

$mform =& $this->_form;

Expand Down
2 changes: 1 addition & 1 deletion myreport.php
View file
Original file line number Diff line number Diff line change
Expand Up @@ -65,7 +65,7 @@
$PAGE->set_title(get_string('questionnairereport', 'questionnaire'));
$PAGE->set_heading(format_string($course->fullname));

$questionnaire = new questionnaire(0, $questionnaire, $course, $cm);
$questionnaire = new questionnaire($course, $cm, 0, $questionnaire);
// Add renderer and page objects to the questionnaire object for display use.
$questionnaire->add_renderer($PAGE->get_renderer('mod_questionnaire'));
$questionnaire->add_page(new \mod_questionnaire\output\reportpage());
Expand Down
4 changes: 2 additions & 2 deletions preview.php
View file
Original file line number Diff line number Diff line change
Expand Up @@ -79,7 +79,7 @@
$PAGE->set_context($context);
$PAGE->set_cm($cm); // CONTRIB-5872 - I don't know why this is needed.

$questionnaire = new questionnaire($qid, $questionnaire, $course, $cm);
$questionnaire = new questionnaire($course, $cm, $qid, $questionnaire);

// Add renderer and page objects to the questionnaire object for display use.
$questionnaire->add_renderer($PAGE->get_renderer('mod_questionnaire'));
Expand Down Expand Up @@ -141,7 +141,7 @@
$questionnaire->renderer->action_link($link, $linkname, $action, array('class' => $class, 'title' => $title),
new pix_icon('t/print', $title)));
}
$questionnaire->survey_print_render('', 'preview', $course->id, $rid = 0, $popup);
$questionnaire->survey_print_render($course->id, '', 'preview', $rid = 0, $popup);
if ($popup) {
$questionnaire->page->add_to_page('closebutton', $questionnaire->renderer->close_window_button());
}
Expand Down
4 changes: 2 additions & 2 deletions print.php
View file
Original file line number Diff line number Diff line change
Expand Up @@ -37,7 +37,7 @@
// Check login and get context.
require_login($courseid);

$questionnaire = new questionnaire(0, $questionnaire, $course, $cm);
$questionnaire = new questionnaire($course, $cm, 0, $questionnaire);

// Add renderer and page objects to the questionnaire object for display use.
$questionnaire->add_renderer($PAGE->get_renderer('mod_questionnaire'));
Expand Down Expand Up @@ -66,6 +66,6 @@
$PAGE->set_pagelayout('popup');
echo $questionnaire->renderer->header();
$questionnaire->page->add_to_page('closebutton', $questionnaire->renderer->close_window_button());
$questionnaire->survey_print_render('', 'print', $courseid, $rid, $blankquestionnaire);
$questionnaire->survey_print_render($courseid, '', 'print', $rid, $blankquestionnaire);
echo $questionnaire->renderer->render($questionnaire->page);
echo $questionnaire->renderer->footer();
2 changes: 1 addition & 1 deletion qsettings.php
View file
Original file line number Diff line number Diff line change
Expand Up @@ -46,7 +46,7 @@
if (!isset($SESSION->questionnaire)) {
$SESSION->questionnaire = new stdClass();
}
$questionnaire = new questionnaire(0, $questionnaire, $course, $cm);
$questionnaire = new questionnaire($course, $cm, 0, $questionnaire);

// Add renderer and page objects to the questionnaire object for display use.
$questionnaire->add_renderer($PAGE->get_renderer('mod_questionnaire'));
Expand Down
32 changes: 16 additions & 16 deletions questionnaire.class.php
View file
Original file line number Diff line number Diff line change
Expand Up @@ -56,7 +56,7 @@ class questionnaire {
* The class constructor
*
*/
public function __construct($id = 0, $questionnaire = null, &$course, &$cm, $addquestions = true) {
public function __construct(&$course, &$cm, $id = 0, $questionnaire = null, $addquestions = true) {
global $DB;

if ($id) {
Expand Down Expand Up @@ -270,7 +270,7 @@ public function view() {
// Handle the main questionnaire completion page.
$quser = $USER->id;

$msg = $this->print_survey($USER->id, $quser);
$msg = $this->print_survey($quser, $USER->id);

// If Questionnaire was submitted with all required fields completed ($msg is empty),
// then record the submittal.
Expand Down Expand Up @@ -1070,7 +1070,7 @@ public function eligible_questions_on_page($secnum, $rid) {

// Display Methods.

public function print_survey($userid=false, $quser) {
public function print_survey($quser, $userid=false) {
global $SESSION, $CFG;

if (!($formdata = data_submitted()) || !confirm_sesskey()) {
Expand Down Expand Up @@ -1169,7 +1169,7 @@ public function print_survey($userid=false, $quser) {
$this->page->add_to_page('formstart', $this->renderer->complete_formstart($action, ['referer' => $formdatareferer,
'a' => $this->id, 'sid' => $this->survey->id, 'rid' => $formdatarid, 'sec' => $formdata->sec, 'sesskey' => sesskey()]));
if (isset($this->questions) && $numsections) { // Sanity check.
$this->survey_render($formdata->sec, $msg, $formdata);
$this->survey_render($formdata, $formdata->sec, $msg);
$controlbuttons = [];
if ($formdata->sec > 1) {
$controlbuttons['prev'] = ['type' => 'submit', 'class' => 'btn btn-secondary',
Expand Down Expand Up @@ -1201,13 +1201,13 @@ public function print_survey($userid=false, $quser) {
}

/**
* @param $formdata
* @param int $section
* @param string $message
* @param $formdata
* @return bool|void
* @throws coding_exception
*/
private function survey_render($section = 1, $message = '', &$formdata) {
private function survey_render(&$formdata, $section = 1, $message = '') {

$this->usehtmleditor = null;

Expand Down Expand Up @@ -1257,7 +1257,7 @@ private function survey_render($section = 1, $message = '', &$formdata) {
$this->page->add_to_page('questions',
$this->renderer->question_output($this->questions[$questionid],
(isset($this->responses[$formdata->rid]) ? $this->responses[$formdata->rid] : []),
[], $i, $this->usehtmleditor));
$i, $this->usehtmleditor, []));
}

$this->print_survey_end($section, $numsections);
Expand Down Expand Up @@ -1428,7 +1428,7 @@ private function print_survey_end($section, $numsections) {
}

// Blankquestionnaire : if we are printing a blank questionnaire.
public function survey_print_render($message = '', $referer='', $courseid, $rid=0, $blankquestionnaire=false) {
public function survey_print_render($courseid, $message = '', $referer='', $rid=0, $blankquestionnaire=false) {
global $DB, $CFG;

if (! $course = $DB->get_record("course", array("id" => $courseid))) {
Expand Down Expand Up @@ -1521,8 +1521,8 @@ public function survey_print_render($message = '', $referer='', $courseid, $rid=
} else {
$dependants = [];
}
$output .= $this->renderer->question_output($this->questions[$questionid], $this->responses[0] ?? [], $dependants,
$i++, null);
$output .= $this->renderer->question_output($this->questions[$questionid], $this->responses[0] ?? [],
$i++, null, $dependants);
$this->page->add_to_page('questions', $output);
$output = '';
}
Expand Down Expand Up @@ -2212,7 +2212,7 @@ private function get_formatted_answers_for_emails($answers) {
private function response_send_email($rid, $email) {
global $CFG;

$submission = $this->generate_csv($rid, '', null, 1, 0);
$submission = $this->generate_csv(0, $rid, '', null, 1);
if (!empty($submission)) {
$answers = $this->get_formatted_answers_for_emails($submission);
} else {
Expand Down Expand Up @@ -3044,7 +3044,7 @@ protected function process_csv_row(array &$row,
/* {{{ proto array survey_generate_csv(int surveyid)
Exports the results of a survey to an array.
*/
public function generate_csv($rid='', $userid='', $choicecodes=1, $choicetext=0, $currentgroupid, $showincompletes=0,
public function generate_csv($currentgroupid, $rid='', $userid='', $choicecodes=1, $choicetext=0, $showincompletes=0,
$rankaverages=0) {
global $DB;

Expand Down Expand Up @@ -3652,8 +3652,8 @@ public function response_analysis($rid, $resps, $compare, $isgroupmember, $allre
$usergraph = get_config('questionnaire', 'usergraph');
if ($usergraph && $this->survey->chart_type) {
$this->page->add_to_page('feedbackcharts',
draw_chart ($feedbacktype = 'global', $this->survey->chart_type, $labels,
$score, $allscore, $sectionlabel, $groupname, $allresponses));
draw_chart ($feedbacktype = 'global', $labels, $groupname,
$allresponses, $this->survey->chart_type, $score, $allscore, $sectionlabel));
}
// Display class or group score. Pending chart library decision to display?
// Find out if this feedback sectionlabel has a pipe separator.
Expand Down Expand Up @@ -3826,8 +3826,8 @@ public function response_analysis($rid, $resps, $compare, $isgroupmember, $allre

if ($usergraph && $this->survey->chart_type) {
$this->page->add_to_page('feedbackcharts',
draw_chart($feedbacktype = 'sections', $this->survey->chart_type, array_values($chartlabels),
array_values($scorepercent), array_values($allscorepercent), $sectionlabel, $groupname, $allresponses));
draw_chart($feedbacktype = 'sections', array_values($chartlabels), $groupname,
$allresponses, $this->survey->chart_type, array_values($scorepercent), array_values($allscorepercent), $sectionlabel));
}
if ($this->survey->feedbackscores) {
$this->page->add_to_page('feedbackscores', html_writer::table($table));
Expand Down
Loading

0 comments on commit 9ec8ab4

Please sign in to comment.