Merge branch 'MDL-77344-master' of https://github.com/meirzamoodle/moodle

mod/forum/classes/local/entities/forum.php

@@ -99,8 +99,8 @@ class forum {
     private $completionreplies;
     /** @var int $completionposts Completion posts */
     private $completionposts;
-    /** @var bool $displaywordcounts Should display word counts in posts */
-    private $displaywordcounts;
+    /** @var bool $displaywordcount Should display word counts in posts */
+    private $displaywordcount;
     /** @var bool $lockdiscussionafter Timestamp after which discussions should be locked */
     private $lockdiscussionafter;
     /** @var int $duedate Timestamp that represents the due date for forum posts */

mod/forum/classes/output/big_search_form.php

@@ -59,6 +59,8 @@ class big_search_form implements renderable, templatable {
     public $guestuser;
     /** @var bool Whether the include starredonly checkbox is checked. */
     public $starredonly;
+    /** @var int forum ID. */
+    public $forumid;
 
     /**
      * Constructor.

mod/forum/classes/output/forum_post.php

@@ -107,6 +107,9 @@ class forum_post implements \renderable, \templatable {
         'viewfullnames'    => true,
     );
 
+    /** @var \stdClass user record. */
+    protected $userfrom;
+
     /**
      * Builds a renderable forum post
      *

mod/forum/classes/task/cron_task.php

@@ -221,7 +221,7 @@ class cron_task extends \core\task\scheduled_task {
         global $DB;
 
         if (empty($discussionids)) {
-            $this->discussion = [];
+            $this->discussions = [];
         } else {
 
             $requiredfields = [

mod/forum/classes/task/send_user_notifications.php

@@ -93,6 +93,11 @@ class send_user_notifications extends \core\task\adhoc_task {
      */
     protected $inboundmanager;
 
+    /**
+     * @var array List of users.
+     */
+    protected $users = [];
+
     /**
      * Send out messages.
      * @throws \moodle_exception

mod/forum/locallib.php

@@ -45,6 +45,9 @@ class forum_portfolio_caller extends portfolio_module_caller_base {
     private $posts;
     private $keyedfiles; // just using multifiles isn't enough if we're exporting a full thread
 
+    /** @var context_module context instance. */
+    private $modcontext;
+
     /**
      * @return array
      */

mod/forum/tests/exporters_discussion_test.php

@@ -27,6 +27,10 @@ use mod_forum\local\exporters\discussion as discussion_exporter;
  * @license    http://www.gnu.org/copyleft/gpl.html GNU GPL v3 or later
  */
 class exporters_discussion_test extends \advanced_testcase {
+
+    /** @var \mod_forum\local\builders\exported_posts */
+    private $builder;
+
     /**
      * Test set up function.
      */

mod/forum/tests/mail_test.php

@@ -52,6 +52,9 @@ class mail_test extends \advanced_testcase {
      */
     protected $mailsink;
 
+    /** @var \phpunit_event_sink */
+    protected $eventsink;
+
     public function setUp(): void {
         global $CFG;
 

mod/forum/tests/maildigest_test.php

@@ -41,6 +41,12 @@ class maildigest_test extends \advanced_testcase {
     // Make use of the test generator trait.
     use mod_forum_tests_generator_trait;
 
+    /** @var \phpunit_message_sink */
+    protected $messagesink;
+
+    /** @var \phpunit_message_sink */
+    protected $mailsink;
+
     /**
      * Set up message and mail sinks, and set up other requirements for the
      * cron to be tested here.