From 98c55a725e0162f30c5089c5fa2c2bebee0eafa2 Mon Sep 17 00:00:00 2001 From: Meirza Date: Mon, 27 Mar 2023 21:55:21 +0700 Subject: [PATCH] MDL-77346 mod_workshop: Added missing class properties In PHP 8.2 and later, setting a value to an undeclared class property is deprecated and emits a deprecation notice. So we need to add missing class properties that still need to be declared. --- mod/workshop/allocation/random/lib.php | 2 ++ mod/workshop/eval/best/lib.php | 3 -- mod/workshop/eval/lib.php | 3 ++ .../tests/privacy/provider_test.php | 30 +++++++++++++++++++ mod/workshop/form/assessment_form.php | 12 ++++++++ .../comments/tests/privacy/provider_test.php | 30 +++++++++++++++++++ mod/workshop/form/edit_form.php | 3 ++ .../numerrors/tests/privacy/provider_test.php | 30 +++++++++++++++++++ .../rubric/tests/privacy/provider_test.php | 30 +++++++++++++++++++ mod/workshop/tests/external/external_test.php | 8 +++++ 10 files changed, 148 insertions(+), 3 deletions(-) diff --git a/mod/workshop/allocation/random/lib.php b/mod/workshop/allocation/random/lib.php index 657d5228685..257e4decae4 100644 --- a/mod/workshop/allocation/random/lib.php +++ b/mod/workshop/allocation/random/lib.php @@ -731,6 +731,8 @@ class workshop_random_allocator_setting { public $assesswosubmission; /** @var bool add self-assessments */ public $addselfassessment; + /** @var bool scheduled allocation status */ + public $enablescheduled; /** * Use the factory method {@link self::instance_from_object()} diff --git a/mod/workshop/eval/best/lib.php b/mod/workshop/eval/best/lib.php index 0681d98dc42..7a74081642a 100644 --- a/mod/workshop/eval/best/lib.php +++ b/mod/workshop/eval/best/lib.php @@ -35,9 +35,6 @@ require_once($CFG->libdir . '/gradelib.php'); */ class workshop_best_evaluation extends workshop_evaluation { - /** @var workshop the parent workshop instance */ - protected $workshop; - /** @var the recently used settings in this workshop */ protected $settings; diff --git a/mod/workshop/eval/lib.php b/mod/workshop/eval/lib.php index 41d3e473372..33296baf62e 100644 --- a/mod/workshop/eval/lib.php +++ b/mod/workshop/eval/lib.php @@ -31,6 +31,9 @@ require_once($CFG->dirroot . '/lib/formslib.php'); */ abstract class workshop_evaluation { + /** @var workshop the parent workshop instance */ + protected $workshop; + /** * Calculates grades for assessment and updates 'gradinggrade' fields in 'workshop_assessments' table * diff --git a/mod/workshop/form/accumulative/tests/privacy/provider_test.php b/mod/workshop/form/accumulative/tests/privacy/provider_test.php index 2cd05e9dcc9..b3b4f3eeb7b 100644 --- a/mod/workshop/form/accumulative/tests/privacy/provider_test.php +++ b/mod/workshop/form/accumulative/tests/privacy/provider_test.php @@ -39,6 +39,36 @@ use core_privacy\tests\provider_testcase; */ class provider_test extends provider_testcase { + /** @var \testing_data_generator data generator. */ + protected $generator; + + /** @var \mod_workshop_generator workshop generator. */ + protected $workshopgenerator; + + /** @var \stdClass course data. */ + protected $course1; + + /** @var \stdClass student data. */ + protected $student1; + + /** @var \stdClass student data. */ + protected $student2; + + /** @var \stdClass first workshop in course1 */ + protected $workshop11; + + /** @var int ID of the submission in workshop11 by student1 */ + protected $submission111; + + /** @var int ID of the assessment of submission111 by student2 */ + protected $assessment1112; + + /** @var bool|int true or new id */ + protected $dim1; + + /** @var bool|int true or new id */ + protected $dim2; + /** * Test {@link workshopform_accumulative\privacy\provider::export_assessment_form()} implementation. */ diff --git a/mod/workshop/form/assessment_form.php b/mod/workshop/form/assessment_form.php index 4f7ba99b1da..8ccb121eff9 100644 --- a/mod/workshop/form/assessment_form.php +++ b/mod/workshop/form/assessment_form.php @@ -37,6 +37,18 @@ require_once($CFG->libdir . '/formslib.php'); // parent class definition */ class workshop_assessment_form extends moodleform { + /** @var string Mode to open the form in: preview/assessment. */ + public $mode; + + /** @var workshop_strategy workshop strategy */ + public $strategy; + + /** @var workshop workshop. */ + public $workshop; + + /** @var array options. */ + public $options; + /** * Add the fields that are common for all grading strategies. * diff --git a/mod/workshop/form/comments/tests/privacy/provider_test.php b/mod/workshop/form/comments/tests/privacy/provider_test.php index bfc37b773dc..e0771b6abe7 100644 --- a/mod/workshop/form/comments/tests/privacy/provider_test.php +++ b/mod/workshop/form/comments/tests/privacy/provider_test.php @@ -39,6 +39,36 @@ use core_privacy\tests\provider_testcase; */ class provider_test extends provider_testcase { + /** @var \testing_data_generator data generator. */ + protected $generator; + + /** @var \mod_workshop_generator workshop generator. */ + protected $workshopgenerator; + + /** @var \stdClass course data. */ + protected $course1; + + /** @var \stdClass student data. */ + protected $student1; + + /** @var \stdClass student data. */ + protected $student2; + + /** @var \stdClass first workshop in course1 */ + protected $workshop11; + + /** @var int ID of the submission in workshop11 by student1 */ + protected $submission111; + + /** @var int ID of the assessment of submission111 by student2 */ + protected $assessment1112; + + /** @var bool|int true or new id */ + protected $dim1; + + /** @var bool|int true or new id */ + protected $dim2; + /** * Test {@link workshopform_comments\privacy\provider::export_assessment_form()} implementation. */ diff --git a/mod/workshop/form/edit_form.php b/mod/workshop/form/edit_form.php index 708cdc4f118..9e932e6338b 100644 --- a/mod/workshop/form/edit_form.php +++ b/mod/workshop/form/edit_form.php @@ -40,6 +40,9 @@ class workshop_edit_strategy_form extends moodleform { /** strategy logic instance that this class is editor of */ protected $strategy; + /** @var workshop workshop. */ + protected $workshop; + /** * Add the fields that are common for all grading strategies. * diff --git a/mod/workshop/form/numerrors/tests/privacy/provider_test.php b/mod/workshop/form/numerrors/tests/privacy/provider_test.php index a2f5b2b886d..d574cd58951 100644 --- a/mod/workshop/form/numerrors/tests/privacy/provider_test.php +++ b/mod/workshop/form/numerrors/tests/privacy/provider_test.php @@ -39,6 +39,36 @@ use core_privacy\tests\provider_testcase; */ class provider_test extends provider_testcase { + /** @var \testing_data_generator data generator. */ + protected $generator; + + /** @var \mod_workshop_generator workshop generator. */ + protected $workshopgenerator; + + /** @var \stdClass course data. */ + protected $course1; + + /** @var \stdClass student data. */ + protected $student1; + + /** @var \stdClass student data. */ + protected $student2; + + /** @var \stdClass first workshop in course1 */ + protected $workshop11; + + /** @var int ID of the submission in workshop11 by student1 */ + protected $submission111; + + /** @var int ID of the assessment of submission111 by student2 */ + protected $assessment1112; + + /** @var bool|int true or new id */ + protected $dim1; + + /** @var bool|int true or new id */ + protected $dim2; + /** * Test {@link workshopform_numerrors\privacy\provider::export_assessment_form()} implementation. */ diff --git a/mod/workshop/form/rubric/tests/privacy/provider_test.php b/mod/workshop/form/rubric/tests/privacy/provider_test.php index e0359e74aec..817ae122829 100644 --- a/mod/workshop/form/rubric/tests/privacy/provider_test.php +++ b/mod/workshop/form/rubric/tests/privacy/provider_test.php @@ -39,6 +39,36 @@ use core_privacy\tests\provider_testcase; */ class provider_test extends provider_testcase { + /** @var \testing_data_generator data generator. */ + protected $generator; + + /** @var \mod_workshop_generator workshop generator. */ + protected $workshopgenerator; + + /** @var \stdClass course data. */ + protected $course1; + + /** @var \stdClass student data. */ + protected $student1; + + /** @var \stdClass student data. */ + protected $student2; + + /** @var \stdClass first workshop in course1 */ + protected $workshop11; + + /** @var int ID of the submission in workshop11 by student1 */ + protected $submission111; + + /** @var int ID of the assessment of submission111 by student2 */ + protected $assessment1112; + + /** @var bool|int true or new id */ + protected $dim1; + + /** @var bool|int true or new id */ + protected $dim2; + /** * Test {@link workshopform_rubric\privacy\provider::export_assessment_form()} implementation. */ diff --git a/mod/workshop/tests/external/external_test.php b/mod/workshop/tests/external/external_test.php index c86c17294a7..8b1d0b80fe9 100644 --- a/mod/workshop/tests/external/external_test.php +++ b/mod/workshop/tests/external/external_test.php @@ -65,6 +65,14 @@ class external_test extends externallib_advanced_testcase { private $studentrole; /** @var stdClass teacher role object */ private $teacherrole; + /** @var \stdClass student object. */ + private $anotherstudentg1; + /** @var \stdClass student object. */ + private $anotherstudentg2; + /** @var \stdClass group object. */ + private $group1; + /** @var \stdClass group object. */ + private $group2; /** * Set up for every test