Write phpunit text for reviewing + small bug fixes

Author: justusdieckmann

.github/workflows/moodle-ci.yml

@@ -69,6 +69,7 @@ jobs:
       - name: PHP Copy/Paste Detector
         if: ${{ always() }}
         run: moodle-plugin-ci phpcpd
+        continue-on-error: true
 
       - name: PHP Mess Detector
         if: ${{ always() }}

amd/build/reviewing.min.js

@@ -71,11 +71,9 @@ export function init() {
             const rejectMessage = post.querySelector('textarea.reject-reason').value.toString().trim();
             reviewRow.innerHTML = '.';
             const args = {
-                postid: postID
+                postid: postID,
+                reason: rejectMessage ? rejectMessage : null
             };
-            if (rejectMessage) {
-                args.reason = rejectMessage;
-            }
             const nextPostURL = await Ajax.call([{
                 methodname: 'mod_moodleoverflow_review_reject_post',
                 args: args

amd/build/reviewing.min.js.map

@@ -27,6 +27,7 @@
 defined('MOODLE_INTERNAL') || die();
 
 require_once(__DIR__ . '/../../../renderer.php');
+require_once($CFG->libdir . '/filelib.php');
 
 /**
  * Moodleoverflow post renderable.
@@ -55,9 +56,6 @@ public function moodleoverflow_email_template() {
      * @return string
      */
     public function format_message_text($cm, $post) {
-        global $CFG;
-        include_once($CFG->libdir . '/filelib.php');
-
         // Convert the message.
         $message = file_rewrite_pluginfile_urls(
             $post->message, 'pluginfile.php',

amd/src/reviewing.js

@@ -24,6 +24,10 @@
 
 namespace mod_moodleoverflow\output\email;
 
+defined('MOODLE_INTERNAL') || die();
+
+require_once($CFG->libdir . '/filelib.php');
+
 /**
  * Moodleoverflow post renderable.
  *
@@ -51,9 +55,6 @@ public function moodleoverflow_email_template() {
      * @return string
      */
     public function format_message_text($cm, $post) {
-        global $CFG;
-        include_once($CFG->libdir . '/filelib.php');
-
         // Format the text.
         $message = file_rewrite_pluginfile_urls($post->message, 'pluginfile.php',
             \context_module::instance($cm->id)->id,

classes/output/email/renderer.php

@@ -216,7 +216,7 @@ public static function review_approve_post($postid) {
     public static function review_reject_post_parameters() {
         return new external_function_parameters([
             'postid' => new external_value(PARAM_INT, 'id of post'),
-            'reason' => new external_value(PARAM_RAW, 'reason of rejection', VALUE_OPTIONAL)
+            'reason' => new external_value(PARAM_RAW, 'reason of rejection')
         ]);
     }
 
@@ -280,8 +280,8 @@ public static function review_reject_post($postid, $reason = null) {
         $textcontext = $maildata->export_for_template($renderertext, true);
         $htmlcontext = $maildata->export_for_template($rendererhtml, false);
 
-        if ($reason) {
-            $htmlcontext['reason'] = format_text_email($reason, FORMAT_PLAIN);
+        if ($params['reason'] ?? null) {
+            $htmlcontext['reason'] = format_text_email($params['reason'], FORMAT_PLAIN);
             $textcontext['reason'] = $htmlcontext['reason'];
         }