Fix all Moodle PHPCS code style violations

mchurchward · claude · mchurchward · commit 87c3463e3fb1 · 2026-03-13T14:56:42.000-04:00
- Remove blank line after opening brace in all classes/local/db/ persistent records, classes/questionnaire.php, and classes/local/response/manager.php - Add missing @var doc comment to manager.php; convert constructor property promotion to explicit declaration; remove decorative // --- separator lines - Split long lines (>132 chars) in responsetype classes and mobile.php - Fix multi-line function call formatting in questiontypes_test.php - Remove double blank lines in db/upgrade.php - Move questionnaire_testable class to its own file (tests/questionnaire_testable.php) to fix PSR1 MultipleClasses violation - Add one-line phpdoc descriptions to all test methods in questionnaire_test.php; fix inline comment capitalization and punctuation throughout; convert indented TODO block to block comment Co-Authored-By: Claude Sonnet 4.6 <noreply@anthropic.com>
diff --git a/classes/local/db/choice_record.php b/classes/local/db/choice_record.php
@@ -25,7 +25,6 @@
  * @license    http://www.gnu.org/copyleft/gpl.html GNU GPL v3 or later
  */
 class choice_record extends \core\persistent {
-
     /** @var string The table name. */
     public const TABLE = 'questionnaire_quest_choice';
 
diff --git a/classes/local/db/dependency_record.php b/classes/local/db/dependency_record.php
@@ -29,7 +29,6 @@
  * @license    http://www.gnu.org/copyleft/gpl.html GNU GPL v3 or later
  */
 class dependency_record extends \core\persistent {
-
     /** @var string The table name. */
     public const TABLE = 'questionnaire_dependency';
 
diff --git a/classes/local/db/feedback_record.php b/classes/local/db/feedback_record.php
@@ -28,7 +28,6 @@
  * @license    http://www.gnu.org/copyleft/gpl.html GNU GPL v3 or later
  */
 class feedback_record extends \core\persistent {
-
     /** @var string The table name. */
     public const TABLE = 'questionnaire_feedback';
 
diff --git a/classes/local/db/feedback_section_record.php b/classes/local/db/feedback_section_record.php
@@ -28,7 +28,6 @@
  * @license    http://www.gnu.org/copyleft/gpl.html GNU GPL v3 or later
  */
 class feedback_section_record extends \core\persistent {
-
     /** @var string The table name. */
     public const TABLE = 'questionnaire_fb_sections';
 
diff --git a/classes/local/db/question_record.php b/classes/local/db/question_record.php
@@ -27,7 +27,6 @@
  * @license    http://www.gnu.org/copyleft/gpl.html GNU GPL v3 or later
  */
 class question_record extends \core\persistent {
-
     /** @var string The table name. */
     public const TABLE = 'questionnaire_question';
 
diff --git a/classes/local/db/question_type_record.php b/classes/local/db/question_type_record.php
@@ -28,7 +28,6 @@
  * @license    http://www.gnu.org/copyleft/gpl.html GNU GPL v3 or later
  */
 class question_type_record extends \core\persistent {
-
     /** @var string The table name. */
     public const TABLE = 'questionnaire_question_type';
 
diff --git a/classes/local/db/questionnaire_record.php b/classes/local/db/questionnaire_record.php
@@ -25,7 +25,6 @@
  * @license    http://www.gnu.org/copyleft/gpl.html GNU GPL v3 or later
  */
 class questionnaire_record extends \core\persistent {
-
     /** @var string The table name. */
     public const TABLE = 'questionnaire';
 
diff --git a/classes/local/db/response_bool_record.php b/classes/local/db/response_bool_record.php
@@ -27,7 +27,6 @@
  * @license    http://www.gnu.org/copyleft/gpl.html GNU GPL v3 or later
  */
 class response_bool_record extends \core\persistent {
-
     /** @var string The table name. */
     public const TABLE = 'questionnaire_response_bool';
 
diff --git a/classes/local/db/response_date_record.php b/classes/local/db/response_date_record.php
@@ -27,7 +27,6 @@
  * @license    http://www.gnu.org/copyleft/gpl.html GNU GPL v3 or later
  */
 class response_date_record extends \core\persistent {
-
     /** @var string The table name. */
     public const TABLE = 'questionnaire_response_date';
 
diff --git a/classes/local/db/response_file_record.php b/classes/local/db/response_file_record.php
@@ -28,7 +28,6 @@
  * @license    http://www.gnu.org/copyleft/gpl.html GNU GPL v3 or later
  */
 class response_file_record extends \core\persistent {
-
     /** @var string The table name. */
     public const TABLE = 'questionnaire_response_file';
 
diff --git a/classes/local/db/response_multiple_record.php b/classes/local/db/response_multiple_record.php
@@ -28,7 +28,6 @@
  * @license    http://www.gnu.org/copyleft/gpl.html GNU GPL v3 or later
  */
 class response_multiple_record extends \core\persistent {
-
     /** @var string The table name. */
     public const TABLE = 'questionnaire_resp_multiple';
 
diff --git a/classes/local/db/response_other_record.php b/classes/local/db/response_other_record.php
@@ -27,7 +27,6 @@
  * @license    http://www.gnu.org/copyleft/gpl.html GNU GPL v3 or later
  */
 class response_other_record extends \core\persistent {
-
     /** @var string The table name. */
     public const TABLE = 'questionnaire_response_other';
 
diff --git a/classes/local/db/response_rank_record.php b/classes/local/db/response_rank_record.php
@@ -27,7 +27,6 @@
  * @license    http://www.gnu.org/copyleft/gpl.html GNU GPL v3 or later
  */
 class response_rank_record extends \core\persistent {
-
     /** @var string The table name. */
     public const TABLE = 'questionnaire_response_rank';
 
diff --git a/classes/local/db/response_record.php b/classes/local/db/response_record.php
@@ -28,7 +28,6 @@
  * @license    http://www.gnu.org/copyleft/gpl.html GNU GPL v3 or later
  */
 class response_record extends \core\persistent {
-
     /** @var string The table name. */
     public const TABLE = 'questionnaire_response';
 
diff --git a/classes/local/db/response_single_record.php b/classes/local/db/response_single_record.php
@@ -27,7 +27,6 @@
  * @license    http://www.gnu.org/copyleft/gpl.html GNU GPL v3 or later
  */
 class response_single_record extends \core\persistent {
-
     /** @var string The table name. */
     public const TABLE = 'questionnaire_resp_single';
 
diff --git a/classes/local/db/response_text_record.php b/classes/local/db/response_text_record.php
@@ -28,7 +28,6 @@
  * @license    http://www.gnu.org/copyleft/gpl.html GNU GPL v3 or later
  */
 class response_text_record extends \core\persistent {
-
     /** @var string The table name. */
     public const TABLE = 'questionnaire_response_text';
 
diff --git a/classes/local/db/survey_record.php b/classes/local/db/survey_record.php
@@ -28,7 +28,6 @@
  * @license    http://www.gnu.org/copyleft/gpl.html GNU GPL v3 or later
  */
 class survey_record extends \core\persistent {
-
     /** @var string The table name. */
     public const TABLE = 'questionnaire_survey';
 
diff --git a/classes/local/response/manager.php b/classes/local/response/manager.php
@@ -25,17 +25,18 @@
  * @license    http://www.gnu.org/copyleft/gpl.html GNU GPL v3 or later
  */
 class manager {
+    /** @var \questionnaire The questionnaire instance. */
+    private readonly \questionnaire $questionnaire;
 
     /**
      * Constructor.
      * @param \questionnaire $questionnaire
      */
-    public function __construct(private readonly \questionnaire $questionnaire) {
+    public function __construct(\questionnaire $questionnaire) {
+        $this->questionnaire = $questionnaire;
     }
 
-    // -------------------------------------------------------------------------
     // Response loading / factory methods.
-    // -------------------------------------------------------------------------
 
     /**
      * Load all response information for the given user into $questionnaire->responses.
@@ -114,9 +115,7 @@ public function build_response_from_appdata(\stdClass $appdata, $sec = 0) {
         );
     }
 
-    // -------------------------------------------------------------------------
     // Response querying.
-    // -------------------------------------------------------------------------
 
     /**
      * Get the requested responses for this questionnaire.
@@ -316,9 +315,7 @@ public function get_full_submission_for_export($rid) {
         return $exportstructure;
     }
 
-    // -------------------------------------------------------------------------
     // Response saving / committing.
-    // -------------------------------------------------------------------------
 
     /**
      * Insert the provided response.
@@ -433,9 +430,7 @@ public function commit_submission_response($rid, $quser) {
         $event->trigger();
     }
 
-    // -------------------------------------------------------------------------
     // Response deletion.
-    // -------------------------------------------------------------------------
 
     /**
      * Delete the specified response's answer data.
@@ -488,9 +483,7 @@ public function response_delete($rid, $sec = null) {
         }
     }
 
-    // -------------------------------------------------------------------------
     // Response validation.
-    // -------------------------------------------------------------------------
 
     /**
      * Check that the response is complete and correctly formatted.
@@ -566,9 +559,7 @@ public function response_check_format($section, $formdata, $checkmissing = true,
         return $message;
     }
 
-    // -------------------------------------------------------------------------
     // Functions migrated from locallib.php.
-    // -------------------------------------------------------------------------
 
     /**
      * Get all responses for the given user and questionnaire.
@@ -644,9 +635,7 @@ public function delete_responses($qid) {
         return true;
     }
 
-    // -------------------------------------------------------------------------
     // Private helpers.
-    // -------------------------------------------------------------------------
 
     /**
      * Return the unique question type IDs (and optionally deduplicated by response table)
diff --git a/classes/local/responsetype/boolean.php b/classes/local/responsetype/boolean.php
@@ -84,7 +84,10 @@ public function insert_response($responsedata) {
         global $DB;
 
         if (!$responsedata instanceof \mod_questionnaire\local\responsetype\response\response) {
-            $response = \mod_questionnaire\local\responsetype\response\response::response_from_webform($responsedata, [$this->question]);
+            $response = \mod_questionnaire\localesponsetypeesponseesponse::response_from_webform(
+                $responsedata,
+                [$this->question]
+            );
         } else {
             $response = $responsedata;
         }
diff --git a/classes/local/responsetype/date.php b/classes/local/responsetype/date.php
@@ -81,7 +81,10 @@ public function insert_response($responsedata) {
         global $DB;
 
         if (!$responsedata instanceof \mod_questionnaire\local\responsetype\response\response) {
-            $response = \mod_questionnaire\local\responsetype\response\response::response_from_webform($responsedata, [$this->question]);
+            $response = \mod_questionnaire\localesponsetypeesponseesponse::response_from_webform(
+                $responsedata,
+                [$this->question]
+            );
         } else {
             $response = $responsedata;
         }
diff --git a/classes/local/responsetype/file.php b/classes/local/responsetype/file.php
@@ -166,7 +166,10 @@ public function insert_response($responsedata) {
         global $DB;
 
         if (!$responsedata instanceof \mod_questionnaire\local\responsetype\response\response) {
-            $response = \mod_questionnaire\local\responsetype\response\response::response_from_webform($responsedata, [$this->question]);
+            $response = \mod_questionnaire\localesponsetypeesponseesponse::response_from_webform(
+                $responsedata,
+                [$this->question]
+            );
         } else {
             $response = $responsedata;
         }
diff --git a/classes/local/responsetype/rank.php b/classes/local/responsetype/rank.php
@@ -116,7 +116,10 @@ public function insert_response($responsedata) {
         global $DB;
 
         if (!$responsedata instanceof \mod_questionnaire\local\responsetype\response\response) {
-            $response = \mod_questionnaire\local\responsetype\response\response::response_from_webform($responsedata, [$this->question]);
+            $response = \mod_questionnaire\localesponsetypeesponseesponse::response_from_webform(
+                $responsedata,
+                [$this->question]
+            );
         } else {
             $response = $responsedata;
         }
diff --git a/classes/local/responsetype/responsetype.php b/classes/local/responsetype/responsetype.php
@@ -45,7 +45,11 @@ abstract class responsetype {
      * @param int|null $responseid
      * @param array|null $choices
      */
-    public function __construct(\mod_questionnaire\local\question\question $question, ?int $responseid = null, ?array $choices = []) {
+    public function __construct(
+        \mod_questionnaire\local\question\question $question,
+        ?int $responseid = null,
+        ?array $choices = []
+    ) {
         $this->question = $question;
         $this->responseid = $responseid;
         $this->choices = $choices;
diff --git a/classes/local/responsetype/single.php b/classes/local/responsetype/single.php
@@ -99,7 +99,10 @@ public function insert_response($responsedata) {
         global $DB;
 
         if (!$responsedata instanceof \mod_questionnaire\local\responsetype\response\response) {
-            $response = \mod_questionnaire\local\responsetype\response\response::response_from_webform($responsedata, [$this->question]);
+            $response = \mod_questionnaire\localesponsetypeesponseesponse::response_from_webform(
+                $responsedata,
+                [$this->question]
+            );
         } else {
             $response = $responsedata;
         }
diff --git a/classes/local/responsetype/text.php b/classes/local/responsetype/text.php
@@ -66,7 +66,10 @@ public function insert_response($responsedata) {
         global $DB;
 
         if (!$responsedata instanceof \mod_questionnaire\local\responsetype\response\response) {
-            $response = \mod_questionnaire\local\responsetype\response\response::response_from_webform($responsedata, [$this->question]);
+            $response = \mod_questionnaire\localesponsetypeesponseesponse::response_from_webform(
+                $responsedata,
+                [$this->question]
+            );
         } else {
             $response = $responsedata;
         }
diff --git a/classes/output/mobile.php b/classes/output/mobile.php
@@ -102,7 +102,8 @@ public static function mobile_view_activity($args) {
                         $data['rid'] = $rid;
                     }
                     $response = (isset($questionnaire->responses) && !empty($questionnaire->responses)) ?
-                        end($questionnaire->responses) : \mod_questionnaire\local\responsetype\response\response::create_from_data([]);
+                        end($questionnaire->responses) :
+                        \mod_questionnaire\local\responsetype\response\response::create_from_data([]);
                     $response->sec = $pagenum;
                     if (isset($result['warnings'])) {
                         if ($action == 'submit') {
diff --git a/classes/questionnaire.php b/classes/questionnaire.php
@@ -32,7 +32,6 @@
  * @license http://www.gnu.org/copyleft/gpl.html GNU Public License
  */
 class questionnaire {
-
     /** @var questionnaire_record The module record instance. */
     protected questionnaire_record $modulerecord;
 
diff --git a/db/upgrade.php b/db/upgrade.php
@@ -1090,7 +1090,6 @@ function xmldb_questionnaire_upgrade($oldversion = 0) {
         upgrade_mod_savepoint(true, 2025041400.03, 'questionnaire');
     }
 
-
     if ($oldversion < 2025111100.01) {
         // Setup table for renaming fields.
         $table = new xmldb_table('questionnaire');
diff --git a/tests/questionnaire_test.php b/tests/questionnaire_test.php
diff --git a/tests/questionnaire_testable.php b/tests/questionnaire_testable.php
diff --git a/tests/questiontypes_test.php b/tests/questiontypes_test.php
