WebSVN – Moodle – Diff – /message/tests/api_test.php

  * @copyright 2016 Mark Nelson <markn@moodle.com>
  * @license http://www.gnu.org/copyleft/gpl.html GNU GPL v3 or later
  * @covers \core_message\api
  */
 final class api_test extends \advanced_testcase {
+    /**
+     * Test set up.
+     *
+     * This is executed before running any test in this file.
+     */
+    public function setUp(): void {
+        parent::setUp();
+        $this->resetAfterTest();
+    }
     public function test_mark_all_read_for_user_touser(): void {
         $this->resetAfterTest();
-        $sender = $this->getDataGenerator()->create_user(array('firstname' => 'Test1', 'lastname' => 'User1'));
+        $sender = $this->getDataGenerator()->create_user(['firstname' => 'Test1', 'lastname' => 'User1']);
-        $recipient = $this->getDataGenerator()->create_user(array('firstname' => 'Test2', 'lastname' => 'User2'));
+        $recipient = $this->getDataGenerator()->create_user(['firstname' => 'Test2', 'lastname' => 'User2']);
         testhelper::send_fake_message($sender, $recipient, 'Notification', 1);
         testhelper::send_fake_message($sender, $recipient, 'Notification', 1);
+    }
     public function test_mark_all_read_for_user_touser_with_fromuser(): void {
-        $this->resetAfterTest();
-        $sender1 = $this->getDataGenerator()->create_user(array('firstname' => 'Test1', 'lastname' => 'User1'));
-        $sender2 = $this->getDataGenerator()->create_user(array('firstname' => 'Test3', 'lastname' => 'User3'));
+        $this->resetAfterTest();
         $recipient = $this->getDataGenerator()->create_user(array('firstname' => 'Test2', 'lastname' => 'User2'));
         $sender1 = $this->getDataGenerator()->create_user(['firstname' => 'Test1', 'lastname' => 'User1']);
         $sender2 = $this->getDataGenerator()->create_user(['firstname' => 'Test3', 'lastname' => 'User3']);
      */
     public function test_count_blocked_users(): void {
         global $USER;
         $this->resetAfterTest();
         // Set this user as the admin.
         $this->setAdminUser();
         api::add_contact($users[3]->id, $users[1]->id);
         api::add_contact($users[1]->id, $users[4]->id);
         // Enrol a user as a teacher in the course, and make the teacher role a course contact role.
         $this->getDataGenerator()->enrol_user($users[8]->id, $course2->id, 'editingteacher');
-        $teacherrole = $DB->get_record('role', array('shortname' => 'editingteacher'));
+        $teacherrole = $DB->get_record('role', ['shortname' => 'editingteacher']);
         set_config('coursecontact', $teacherrole->id);
+        // Create individual conversations between some users, one contact and one non-contact.
-        // Create individual conversations between some users, one contact and one non-contact.
+        $ic1 = api::create_conversation(
+            api::MESSAGE_CONVERSATION_TYPE_INDIVIDUAL,
+            [$users[1]->id, $users[2]->id]
-        $ic1 = api::create_conversation(api::MESSAGE_CONVERSATION_TYPE_INDIVIDUAL,
+        );
-            [$users[1]->id, $users[2]->id]);
+        $ic2 = api::create_conversation(
+            api::MESSAGE_CONVERSATION_TYPE_INDIVIDUAL,
-        $ic2 = api::create_conversation(api::MESSAGE_CONVERSATION_TYPE_INDIVIDUAL,
+            [$users[6]->id, $users[1]->id]
+        );
-            [$users[6]->id, $users[1]->id]);
+        // Create a group conversation between 4 users, including a contact and a non-contact.
+        $gc1 = api::create_conversation(
+            api::MESSAGE_CONVERSATION_TYPE_GROUP,
-        // Create a group conversation between 4 users, including a contact and a non-contact.
+            [$users[1]->id, $users[2]->id, $users[4]->id, $users[7]->id],
-        $gc1 = api::create_conversation(api::MESSAGE_CONVERSATION_TYPE_GROUP,
+            'Project chat'
-            [$users[1]->id, $users[2]->id, $users[4]->id, $users[7]->id], 'Project chat');
+        );
         $this->assertEquals($users[6]->id, $noncontacts[1]->id);
         $this->assertEquals($users[7]->id, $noncontacts[2]->id);
         // Verify the correct conversations were returned for the non-contacts.
+        $this->assertCount(1, $noncontacts[1]->conversations);
-        $this->assertCount(1, $noncontacts[1]->conversations);
+        $this->assertEquals(
-        $this->assertEquals(api::MESSAGE_CONVERSATION_TYPE_INDIVIDUAL,
+            api::MESSAGE_CONVERSATION_TYPE_INDIVIDUAL,
+            $noncontacts[1]->conversations[$ic2->id]->type
-            $noncontacts[1]->conversations[$ic2->id]->type);
+        );
         $this->assertCount(1, $noncontacts[2]->conversations);
         api::add_contact($users[3]->id, $users[1]->id);
         api::add_contact($users[1]->id, $users[4]->id);
         // Enrol a user as a teacher in the course, and make the teacher role a course contact role.
         $this->getDataGenerator()->enrol_user($users[9]->id, $course1->id, 'editingteacher');
-        $teacherrole = $DB->get_record('role', array('shortname' => 'editingteacher'));
+        $teacherrole = $DB->get_record('role', ['shortname' => 'editingteacher']);
         set_config('coursecontact', $teacherrole->id);
         // Get self-conversation.
+        $selfconversation = api::get_self_conversation($users[1]->id);
-        $selfconversation = api::get_self_conversation($users[1]->id);
+        // Create individual conversations between some users, one contact and one non-contact.
+        $ic1 = api::create_conversation(
+            api::MESSAGE_CONVERSATION_TYPE_INDIVIDUAL,
-        // Create individual conversations between some users, one contact and one non-contact.
+            [$users[1]->id, $users[2]->id]
-        $ic1 = api::create_conversation(api::MESSAGE_CONVERSATION_TYPE_INDIVIDUAL,
+        );
+        $ic2 = api::create_conversation(
-            [$users[1]->id, $users[2]->id]);
+            api::MESSAGE_CONVERSATION_TYPE_INDIVIDUAL,
+            [$users[6]->id, $users[1]->id]
-        $ic2 = api::create_conversation(api::MESSAGE_CONVERSATION_TYPE_INDIVIDUAL,
+        );
-            [$users[6]->id, $users[1]->id]);
+        // Create a group conversation between 5 users, including a contact and a non-contact, and a user NOT in a shared course.
+        $gc1 = api::create_conversation(
             api::MESSAGE_CONVERSATION_TYPE_GROUP,
-        // Create a group conversation between 5 users, including a contact and a non-contact, and a user NOT in a shared course.
+            [$users[1]->id, $users[2]->id, $users[4]->id, $users[7]->id, $users[8]->id],
-        $gc1 = api::create_conversation(api::MESSAGE_CONVERSATION_TYPE_GROUP,
+            'Project chat'
         $this->assertCount(1, $noncontacts[1]->conversations);
         $this->assertCount(1, $noncontacts[2]->conversations);
         $this->assertCount(0, $noncontacts[3]->conversations);
+        // Verify the correct conversations were returned for the non-contacts.
-        // Verify the correct conversations were returned for the non-contacts.
+        $this->assertEquals(
-        $this->assertEquals(api::MESSAGE_CONVERSATION_TYPE_SELF,
+            api::MESSAGE_CONVERSATION_TYPE_SELF,
+            $noncontacts[0]->conversations[$selfconversation->id]->type
-            $noncontacts[0]->conversations[$selfconversation->id]->type);
+        );
+        $this->assertCount(1, $noncontacts[1]->conversations);
-        $this->assertCount(1, $noncontacts[1]->conversations);
+        $this->assertEquals(
+            api::MESSAGE_CONVERSATION_TYPE_INDIVIDUAL,
-        $this->assertEquals(api::MESSAGE_CONVERSATION_TYPE_INDIVIDUAL,
+            $noncontacts[1]->conversations[$ic2->id]->type
-            $noncontacts[1]->conversations[$ic2->id]->type);
+        );
         // Add some users as contacts.
         api::add_contact($user1->id, $user2->id);
         api::add_contact($user6->id, $user1->id);
+        // Create private conversations with some users.
-        // Create private conversations with some users.
+        api::create_conversation(
-        api::create_conversation(api::MESSAGE_CONVERSATION_TYPE_INDIVIDUAL,
+            api::MESSAGE_CONVERSATION_TYPE_INDIVIDUAL,
+            [$user1->id, $user2->id]
+        );
-            array($user1->id, $user2->id));
+        api::create_conversation(
-        api::create_conversation(api::MESSAGE_CONVERSATION_TYPE_INDIVIDUAL,
+            api::MESSAGE_CONVERSATION_TYPE_INDIVIDUAL,
+            [$user3->id, $user1->id]
-            array($user3->id, $user1->id));
+        );
+        // Create a group conversation with users.
-        // Create a group conversation with users.
+        api::create_conversation(
-        api::create_conversation(api::MESSAGE_CONVERSATION_TYPE_GROUP,
+            api::MESSAGE_CONVERSATION_TYPE_GROUP,
+            [$user1->id, $user2->id, $user3->id, $user4->id],
-            array($user1->id, $user2->id, $user3->id, $user4->id),
+            'Project chat'
-            'Project chat');
+        );
         // Check that we retrieved the correct conversations.
         // Add some users as contacts.
         api::add_contact($user1->id, $user2->id);
         api::add_contact($user3->id, $user1->id);
+        // Create private conversations with some users.
-        // Create private conversations with some users.
+        api::create_conversation(
-        api::create_conversation(api::MESSAGE_CONVERSATION_TYPE_INDIVIDUAL,
+            api::MESSAGE_CONVERSATION_TYPE_INDIVIDUAL,
+            [$user1->id, $user2->id]
+        );
-            array($user1->id, $user2->id));
+        api::create_conversation(
-        api::create_conversation(api::MESSAGE_CONVERSATION_TYPE_INDIVIDUAL,
+            api::MESSAGE_CONVERSATION_TYPE_INDIVIDUAL,
+            [$user3->id, $user1->id]
-            array($user3->id, $user1->id));
+        );
+        // Create a group conversation with users.
-        // Create a group conversation with users.
+        $gc = api::create_conversation(
-        $gc = api::create_conversation(api::MESSAGE_CONVERSATION_TYPE_GROUP,
+            api::MESSAGE_CONVERSATION_TYPE_GROUP,
+            [$user1->id, $user2->id, $user3->id],
-            array($user1->id, $user2->id, $user3->id),
+            'Project chat'
-            'Project chat');
+        );
         // Get self-conversations.
         // 3) At least one of each type (group, individual) of which user1 IS NOT a member.
         // 4) At least two group conversation having 0 messages, of which user1 IS a member (To confirm conversationid ordering).
         // 5) At least one group conversation having 0 messages, of which user1 IS NOT a member.
+        // Individual conversation, user1 is a member, last message from other user.
-        // Individual conversation, user1 is a member, last message from other user.
+        $ic1 = api::create_conversation(
-        $ic1 = api::create_conversation(api::MESSAGE_CONVERSATION_TYPE_INDIVIDUAL,
+            api::MESSAGE_CONVERSATION_TYPE_INDIVIDUAL,
+            [$user1->id, $user2->id]
-            [$user1->id, $user2->id]);
+        );
         testhelper::send_fake_message_to_conversation($user1, $ic1->id, 'Message 1', $time);
         testhelper::send_fake_message_to_conversation($user2, $ic1->id, 'Message 2', $time + 1);
+        // Individual conversation, user1 is a member, last message from user1.
-        // Individual conversation, user1 is a member, last message from user1.
+        $ic2 = api::create_conversation(
+            api::MESSAGE_CONVERSATION_TYPE_INDIVIDUAL,
-        $ic2 = api::create_conversation(api::MESSAGE_CONVERSATION_TYPE_INDIVIDUAL,
+            [$user1->id, $user3->id]
-            [$user1->id, $user3->id]);
+        );
         testhelper::send_fake_message_to_conversation($user3, $ic2->id, 'Message 3', $time + 2);
+        testhelper::send_fake_message_to_conversation($user1, $ic2->id, 'Message 4', $time + 3);
-        testhelper::send_fake_message_to_conversation($user1, $ic2->id, 'Message 4', $time + 3);
+        // Individual conversation, user1 is not a member.
+        $ic3 = api::create_conversation(
-        // Individual conversation, user1 is not a member.
+            api::MESSAGE_CONVERSATION_TYPE_INDIVIDUAL,
-        $ic3 = api::create_conversation(api::MESSAGE_CONVERSATION_TYPE_INDIVIDUAL,
+            [$user2->id, $user3->id]
-            [$user2->id, $user3->id]);
+        );
+        testhelper::send_fake_message_to_conversation($user2, $ic3->id, 'Message 5', $time + 4);
-        testhelper::send_fake_message_to_conversation($user2, $ic3->id, 'Message 5', $time + 4);
+        testhelper::send_fake_message_to_conversation($user3, $ic3->id, 'Message 6', $time + 5);
-        testhelper::send_fake_message_to_conversation($user3, $ic3->id, 'Message 6', $time + 5);
+        // Group conversation, user1 is not a member.
+        $gc1 = api::create_conversation(
             api::MESSAGE_CONVERSATION_TYPE_GROUP,
-        // Group conversation, user1 is not a member.
+            [$user2->id, $user3->id, $user4->id],
-        $gc1 = api::create_conversation(api::MESSAGE_CONVERSATION_TYPE_GROUP,
+            'Project discussions'
+        );
-            [$user2->id, $user3->id, $user4->id], 'Project discussions');
+        testhelper::send_fake_message_to_conversation($user2, $gc1->id, 'Message 7', $time + 6);
-        testhelper::send_fake_message_to_conversation($user2, $gc1->id, 'Message 7', $time + 6);
+        testhelper::send_fake_message_to_conversation($user4, $gc1->id, 'Message 8', $time + 7);
+        // Group conversation, user1 is a member, last message from another user.
-        testhelper::send_fake_message_to_conversation($user4, $gc1->id, 'Message 8', $time + 7);
+        $gc2 = api::create_conversation(
             api::MESSAGE_CONVERSATION_TYPE_GROUP,
-        // Group conversation, user1 is a member, last message from another user.
+            [$user1->id, $user3->id, $user4->id],
-        $gc2 = api::create_conversation(api::MESSAGE_CONVERSATION_TYPE_GROUP,
+            'Group chat'
+        );
-            [$user1->id, $user3->id, $user4->id], 'Group chat');
+        testhelper::send_fake_message_to_conversation($user1, $gc2->id, 'Message 9', $time + 8);
-        testhelper::send_fake_message_to_conversation($user1, $gc2->id, 'Message 9', $time + 8);
+        testhelper::send_fake_message_to_conversation($user3, $gc2->id, 'Message 10', $time + 9);
+        testhelper::send_fake_message_to_conversation($user4, $gc2->id, 'Message 11', $time + 10);
-        testhelper::send_fake_message_to_conversation($user3, $gc2->id, 'Message 10', $time + 9);
+        // Group conversation, user1 is a member, last message from user1.
-        testhelper::send_fake_message_to_conversation($user4, $gc2->id, 'Message 11', $time + 10);
+        $gc3 = api::create_conversation(
             api::MESSAGE_CONVERSATION_TYPE_GROUP,
-        // Group conversation, user1 is a member, last message from user1.
+            [$user1->id, $user2->id, $user3->id, $user4->id],
+            'Group chat again!'
-        $gc3 = api::create_conversation(api::MESSAGE_CONVERSATION_TYPE_GROUP,
+        );
-            [$user1->id, $user2->id, $user3->id, $user4->id], 'Group chat again!');
+        testhelper::send_fake_message_to_conversation($user4, $gc3->id, 'Message 12', $time + 11);
+        testhelper::send_fake_message_to_conversation($user3, $gc3->id, 'Message 13', $time + 12);
+        testhelper::send_fake_message_to_conversation($user1, $gc3->id, 'Message 14', $time + 13);
-        testhelper::send_fake_message_to_conversation($user4, $gc3->id, 'Message 12', $time + 11);
+        // Empty group conversations (x2), user1 is a member.
-        testhelper::send_fake_message_to_conversation($user3, $gc3->id, 'Message 13', $time + 12);
+        $gc4 = api::create_conversation(
+            api::MESSAGE_CONVERSATION_TYPE_GROUP,
+            [$user1->id, $user2->id, $user3->id],
-        testhelper::send_fake_message_to_conversation($user1, $gc3->id, 'Message 14', $time + 13);
+            'Empty group'
+        );
+        $gc5 = api::create_conversation(
-        // Empty group conversations (x2), user1 is a member.
+            api::MESSAGE_CONVERSATION_TYPE_GROUP,
+            [$user1->id, $user2->id, $user4->id],
+            'Another empty group'
-        $gc4 = api::create_conversation(api::MESSAGE_CONVERSATION_TYPE_GROUP,
+        );
             [$user1->id, $user2->id, $user3->id], 'Empty group');
-        $gc5 = api::create_conversation(api::MESSAGE_CONVERSATION_TYPE_GROUP,
+        // Empty group conversation, user1 is NOT a member.
         $user1 = self::getDataGenerator()->create_user();
         // Self-conversation should exists.
         $this->assertCount(1, api::get_conversations($user1->id));
         // Get a bunch of conversations, some group, some individual and in different states.
-        list($user1, $user2, $user3, $user4, $ic1, $ic2, $ic3,
+        [$user1, $user2, $user3, $user4, $ic1, $ic2, $ic3,
-            $gc1, $gc2, $gc3, $gc4, $gc5, $gc6) = $this->create_conversation_test_data();
+            $gc1, $gc2, $gc3, $gc4, $gc5, $gc6] = $this->create_conversation_test_data();
         // Get all conversations for user1.
         // Create some users.
         $user1 = self::getDataGenerator()->create_user();
         $user2 = self::getDataGenerator()->create_user();
         $user3 = self::getDataGenerator()->create_user();
+        $conversation1 = api::create_conversation(
-        $conversation1 = api::create_conversation(api::MESSAGE_CONVERSATION_TYPE_INDIVIDUAL,
+            api::MESSAGE_CONVERSATION_TYPE_INDIVIDUAL,
+            [$user1->id, $user2->id]
-            [$user1->id, $user2->id]);
+        );
         testhelper::send_fake_message_to_conversation($user1, $conversation1->id, 'Message 1');
         testhelper::send_fake_message_to_conversation($user2, $conversation1->id, 'Message 2');
+        api::mute_conversation($user1->id, $conversation1->id);
-        api::mute_conversation($user1->id, $conversation1->id);
+        $conversation2 = api::create_conversation(
+            api::MESSAGE_CONVERSATION_TYPE_INDIVIDUAL,
-        $conversation2 = api::create_conversation(api::MESSAGE_CONVERSATION_TYPE_INDIVIDUAL,
+            [$user1->id, $user3->id]
-            [$user1->id, $user3->id]);
+        );
         testhelper::send_fake_message_to_conversation($user1, $conversation2->id, 'Message 1');
+        testhelper::send_fake_message_to_conversation($user2, $conversation2->id, 'Message 2');
-        testhelper::send_fake_message_to_conversation($user2, $conversation2->id, 'Message 2');
+        $conversation3 = api::create_conversation(
             api::MESSAGE_CONVERSATION_TYPE_GROUP,
-        $conversation3 = api::create_conversation(api::MESSAGE_CONVERSATION_TYPE_GROUP,
+            [$user1->id, $user2->id]
+        );
-            [$user1->id, $user2->id]);
+        api::mute_conversation($user1->id, $conversation3->id);
-        api::mute_conversation($user1->id, $conversation3->id);
+        $conversation4 = api::create_conversation(
+            api::MESSAGE_CONVERSATION_TYPE_GROUP,
-        $conversation4 = api::create_conversation(api::MESSAGE_CONVERSATION_TYPE_GROUP,
+            [$user1->id, $user3->id]
-            [$user1->id, $user3->id]);
+        );
         $conversations = api::get_conversations($user1->id);
      */
     public function test_get_conversations_limit_offset(): void {
         $this->resetAfterTest();
         // Get a bunch of conversations, some group, some individual and in different states.
-        list($user1, $user2, $user3, $user4, $ic1, $ic2, $ic3,
+        [$user1, $user2, $user3, $user4, $ic1, $ic2, $ic3,
-            $gc1, $gc2, $gc3, $gc4, $gc5, $gc6) = $this->create_conversation_test_data();
+            $gc1, $gc2, $gc3, $gc4, $gc5, $gc6] = $this->create_conversation_test_data();
         // Get all conversations for user1, limited to 1 result.
      */
     public function test_get_conversations_type_filter(): void {
         $this->resetAfterTest();
         // Get a bunch of conversations, some group, some individual and in different states.
-        list($user1, $user2, $user3, $user4, $ic1, $ic2, $ic3,
+        [$user1, $user2, $user3, $user4, $ic1, $ic2, $ic3,
-            $gc1, $gc2, $gc3, $gc4, $gc5, $gc6) = $this->create_conversation_test_data();
+            $gc1, $gc2, $gc3, $gc4, $gc5, $gc6] = $this->create_conversation_test_data();
+        // Verify we can ask for only individual conversations.
+        $conversations = api::get_conversations(
+            $user1->id,
-        // Verify we can ask for only individual conversations.
+,
+,
-        $conversations = api::get_conversations($user1->id, 0, 20,
+            api::MESSAGE_CONVERSATION_TYPE_INDIVIDUAL
-            api::MESSAGE_CONVERSATION_TYPE_INDIVIDUAL);
+        );
         $this->assertCount(2, $conversations);
+        // Verify we can ask for only group conversations.
+        $conversations = api::get_conversations(
+            $user1->id,
+,
-        // Verify we can ask for only group conversations.
+,
-        $conversations = api::get_conversations($user1->id, 0, 20,
+            api::MESSAGE_CONVERSATION_TYPE_GROUP
-            api::MESSAGE_CONVERSATION_TYPE_GROUP);
+        );
         $this->assertCount(4, $conversations);
      */
     public function test_get_conversations_self_conversations(): void {
         global $DB;
         $this->resetAfterTest();
         // Create a conversation between one user and themself.
         $user1 = self::getDataGenerator()->create_user();
         $user2 = self::getDataGenerator()->create_user();
         $user3 = self::getDataGenerator()->create_user();
         $user4 = self::getDataGenerator()->create_user();
+        // Create some individual conversations.
-        // Create some individual conversations.
+        $ic1 = api::create_conversation(
+            api::MESSAGE_CONVERSATION_TYPE_INDIVIDUAL,
+            [$user1->id, $user2->id]
-        $ic1 = api::create_conversation(api::MESSAGE_CONVERSATION_TYPE_INDIVIDUAL,
+        );
-            [$user1->id, $user2->id]);
+        $ic2 = api::create_conversation(
+            api::MESSAGE_CONVERSATION_TYPE_INDIVIDUAL,
-        $ic2 = api::create_conversation(api::MESSAGE_CONVERSATION_TYPE_INDIVIDUAL,
+            [$user1->id, $user3->id]
-            [$user1->id, $user3->id]);
+        );
         testhelper::send_fake_message_to_conversation($user1, $ic1->id, 'Message from user1 to user2');
         $conversations = api::get_conversations($user4->id);
         // The self-conversation.
         $this->assertCount(1, $conversations);
         // Get only private conversations for user1 (empty conversations, like $ic2, are not returned).
+        $conversations = api::get_conversations(
+            $user1->id,
+,
-        $conversations = api::get_conversations($user1->id, 0, 20,
+,
+            api::MESSAGE_CONVERSATION_TYPE_INDIVIDUAL
-            api::MESSAGE_CONVERSATION_TYPE_INDIVIDUAL);
+        );
         $this->assertCount(1, $conversations);
+        // Merge self with private conversations for user1.
+        $conversations = api::get_conversations(
+            $user1->id,
-        // Merge self with private conversations for user1.
+,
+,
+            api::MESSAGE_CONVERSATION_TYPE_INDIVIDUAL,
+            null,
-        $conversations = api::get_conversations($user1->id, 0, 20,
+            true
-            api::MESSAGE_CONVERSATION_TYPE_INDIVIDUAL, null, true);
+        );
         $this->assertCount(2, $conversations);
+        // Get only private conversations for user2.
+        $conversations = api::get_conversations(
+            $user2->id,
+,
-        // Get only private conversations for user2.
+,
-        $conversations = api::get_conversations($user2->id, 0, 20,
+            api::MESSAGE_CONVERSATION_TYPE_INDIVIDUAL
-            api::MESSAGE_CONVERSATION_TYPE_INDIVIDUAL);
+        );
+        $this->assertCount(1, $conversations);
+        // Merge self with private conversations for user2.
-        $this->assertCount(1, $conversations);
+        $conversations = api::get_conversations(
+            $user2->id,
+,
+,
             api::MESSAGE_CONVERSATION_TYPE_INDIVIDUAL,
-        // Merge self with private conversations for user2.
+            null,
-        $conversations = api::get_conversations($user2->id, 0, 20,
+            true
-            api::MESSAGE_CONVERSATION_TYPE_INDIVIDUAL, null, true);
+        );
         $this->assertCount(2, $conversations);
+    }
     /**
      * Tests retrieving conversations when a conversation contains a deleted user.
      */
     public function test_get_conversations_with_deleted_user(): void {
         $this->resetAfterTest();
         // Get a bunch of conversations, some group, some individual and in different states.
      */
     public function test_get_conversations_deleted_messages(): void {
         $this->resetAfterTest();
         // Get a bunch of conversations, some group, some individual and in different states.
-        list($user1, $user2, $user3, $user4, $ic1, $ic2, $ic3,
+        [$user1, $user2, $user3, $user4, $ic1, $ic2, $ic3,
-            $gc1, $gc2, $gc3, $gc4, $gc5, $gc6) = $this->create_conversation_test_data();
+            $gc1, $gc2, $gc3, $gc4, $gc5, $gc6] = $this->create_conversation_test_data();
         $conversations = api::get_conversations($user1->id);
      */
     public function test_get_conversations_favourite_conversations_single(): void {
         $this->resetAfterTest();
         // Get a bunch of conversations, some group, some individual and in different states.
-        list($user1, $user2, $user3, $user4, $ic1, $ic2, $ic3,
+        [$user1, $user2, $user3, $user4, $ic1, $ic2, $ic3,
-            $gc1, $gc2, $gc3, $gc4, $gc5, $gc6) = $this->create_conversation_test_data();
+            $gc1, $gc2, $gc3, $gc4, $gc5, $gc6] = $this->create_conversation_test_data();
         // Mark a single conversation as favourites.
                 $this->assertEquals($ic2->id, $conv->id);
+            }
+        }
         // Now, try ONLY favourites of type 'group'.
+        $conversations = api::get_conversations(
+            $user1->id,
+,
-        $conversations = api::get_conversations($user1->id, 0, 20,
+,
+            api::MESSAGE_CONVERSATION_TYPE_GROUP,
+            true
-            api::MESSAGE_CONVERSATION_TYPE_GROUP, true);
+        );
         $this->assertEmpty($conversations);
         // And NO favourite conversations.
      */
     public function test_get_conversations_favourite_conversations(): void {
         $this->resetAfterTest();
         // Get a bunch of conversations, some group, some individual and in different states.
-        list($user1, $user2, $user3, $user4, $ic1, $ic2, $ic3,
+        [$user1, $user2, $user3, $user4, $ic1, $ic2, $ic3,
-            $gc1, $gc2, $gc3, $gc4, $gc5, $gc6) = $this->create_conversation_test_data();
+            $gc1, $gc2, $gc3, $gc4, $gc5, $gc6] = $this->create_conversation_test_data();
         // Try to get ONLY favourite conversations, when only self-conversation exist.
             $this->assertTrue($conv->isfavourite);
             $this->assertNotFalse(array_search($conv->id, $favouriteids));
+        }
         // Now, try ONLY favourites of type 'group'.
+        $conversations = api::get_conversations(
+            $user1->id,
+,
-        $conversations = api::get_conversations($user1->id, 0, 20,
+,
+            api::MESSAGE_CONVERSATION_TYPE_GROUP,
+            true
-            api::MESSAGE_CONVERSATION_TYPE_GROUP, true);
+        );
         $this->assertCount(2, $conversations);
         foreach ($conversations as $conv) {
             $this->assertTrue($conv->isfavourite);
             $this->assertNotFalse(array_search($conv->id, [$gc2->id, $gc5->id]));
         $conversation = api::create_conversation(
             api::MESSAGE_CONVERSATION_TYPE_INDIVIDUAL,
+            [
                 $user1->id,
-                $user2->id
+                $user2->id,
             ],
             'Individual conversation'
         );
      */
     public function test_get_conversations_group_linked(): void {
         global $CFG, $DB;
         $this->resetAfterTest();
         // Create some users.
         $user1 = self::getDataGenerator()->create_user();
         $user2 = self::getDataGenerator()->create_user();
         $this->getDataGenerator()->enrol_user($user2->id, $course1->id);
         $this->getDataGenerator()->enrol_user($user3->id, $course1->id);
         $group1 = $this->getDataGenerator()->create_group([
             'courseid' => $course1->id,
             'enablemessaging' => 1,
-            'picturepath' => $CFG->dirroot . '/lib/tests/fixtures/gd-logo.png'
+            'picturepath' => $CFG->dirroot . '/lib/tests/fixtures/gd-logo.png',
         ]);
         // Add users to group1.
-        $this->getDataGenerator()->create_group_member(array('groupid' => $group1->id, 'userid' => $user1->id));
+        $this->getDataGenerator()->create_group_member(['groupid' => $group1->id, 'userid' => $user1->id]);
-        $this->getDataGenerator()->create_group_member(array('groupid' => $group1->id, 'userid' => $user2->id));
+        $this->getDataGenerator()->create_group_member(['groupid' => $group1->id, 'userid' => $user2->id]);
         // Verify the group with the image works as expected.
         $conversations = api::get_conversations($user1->id);
             'courseid' => $course1->id,
             'enablemessaging' => 1,
         ]);
         // Add users to group2.
-        $this->getDataGenerator()->create_group_member(array('groupid' => $group2->id, 'userid' => $user2->id));
+        $this->getDataGenerator()->create_group_member(['groupid' => $group2->id, 'userid' => $user2->id]);
-        $this->getDataGenerator()->create_group_member(array('groupid' => $group2->id, 'userid' => $user3->id));
+        $this->getDataGenerator()->create_group_member(['groupid' => $group2->id, 'userid' => $user3->id]);
         // Verify the group without any image works as expected too.
         $conversations = api::get_conversations($user3->id);
    /**
     * The data provider for get_conversations_mixed.
+    *
+    * This provides sets of data to for testing.
     * This provides sets of data to for testing.
     * @return array
     */
-   public function get_conversations_mixed_provider() {
+    public static function get_conversations_mixed_provider(): array {
-       return array(
+        return [
-            'Test that conversations with messages contacts is correctly ordered.' => array(
+            'Test that conversations with messages contacts is correctly ordered.' => [
-                'users' => array(
+                'usersdata' => [
                     'user1',
                     'user2',
                     'user3',
-                ),
+                ],
-                'contacts' => array(
+                'contacts' => [
-                ),
+                ],
-                'messages' => array(
+                'messagesdata' => [
                     array(
                         'from'          => 'user1',
                         'to'            => 'user2',
                         'state'         => 'unread',
                         'subject'       => 'S1',
-                    ),
+                    ],
                     array(
                         'from'          => 'user2',
                         'to'            => 'user1',
                         'state'         => 'unread',
                         'subject'       => 'S2',
-                    ),
+                    ],
                     array(
                         'from'          => 'user1',
                         'to'            => 'user2',
                         'state'         => 'unread',
                         'timecreated'   => 0,
                         'subject'       => 'S3',
-                    ),
+                    ],
                     array(
                         'from'          => 'user1',
                         'to'            => 'user3',
                         'state'         => 'read',
                         'timemodifier'  => 1,
                         'subject'       => 'S4',
-                    ),
+                    ],
                     array(
                         'from'          => 'user3',
                         'to'            => 'user1',
                         'state'         => 'read',
                         'timemodifier'  => 1,
                         'subject'       => 'S5',
-                    ),
+                    ],
                     array(
                         'from'          => 'user1',
                         'to'            => 'user3',
                         'state'         => 'read',
                         'timecreated'   => 0,
                         'subject'       => 'S6',
-                    ),
+                    ],
-                ),
+                ],
-                'expectations' => array(
+                'expectations' => [
-                    'user1' => array(
+                    'user1' => [
                         // User1 has conversed most recently with user3. The most recent message is M5.
                         array(
                             'messageposition'   => 0,
                             'with'              => 'user3',
                             'subject'           => '<p>S5</p>',
                             'unreadcount'       => 0,
-                        ),
+                        ],
                         // User1 has also conversed with user2. The most recent message is S2.
                         array(
                             'messageposition'   => 1,
                             'with'              => 'user2',
                             'subject'           => '<p>S2</p>',
                             'unreadcount'       => 1,
-                        ),
+                        ],
-                    ),
+                    ],
-                    'user2' => array(
+                    'user2' => [
                         // User2 has only conversed with user1. Their most recent shared message was S2.
                         array(
                             'messageposition'   => 0,
                             'with'              => 'user1',
                             'subject'           => '<p>S2</p>',
                             'unreadcount'       => 2,
-                        ),
+                        ],
-                    ),
+                    ],
-                    'user3' => array(
+                    'user3' => [
                         // User3 has only conversed with user1. Their most recent shared message was S5.
                         array(
                             'messageposition'   => 0,
                             'with'              => 'user1',
                             'subject'           => '<p>S5</p>',
                             'unreadcount'       => 0,
-                        ),
+                        ],
-                    ),
+                    ],
-                ),
+                ],
-            ),
+            ],
-            'Test conversations with a single user, where some messages are read and some are not.' => array(
+            'Test conversations with a single user, where some messages are read and some are not.' => [
-                'users' => array(
+                'usersdata' => [
                     'user1',
                     'user2',
-                ),
+                ],
-                'contacts' => array(
+                'contacts' => [
-                ),
+                ],
-                'messages' => array(
+                'messagesdata' => [
                     array(
                         'from'          => 'user1',
                         'to'            => 'user2',
                         'state'         => 'read',
                         'subject'       => 'S1',
-                    ),
+                    ],
                     array(
                         'from'          => 'user2',
                         'to'            => 'user1',
                         'state'         => 'read',
                         'subject'       => 'S2',
-                    ),
+                    ],
                     array(
                         'from'          => 'user1',
                         'to'            => 'user2',
                         'state'         => 'unread',
                         'timemodifier'  => 1,
                         'subject'       => 'S3',
-                    ),
+                    ],
                     array(
                         'from'          => 'user1',
                         'to'            => 'user2',
                         'state'         => 'unread',
                         'timemodifier'  => 1,
                         'subject'       => 'S4',
-                    ),
+                    ],
-                ),
+                ],
-                'expectations' => array(
+                'expectations' => [
                     // The most recent message between user1 and user2 was S4.
-                    'user1' => array(
+                    'user1' => [
                         array(
                             'messageposition'   => 0,
                             'with'              => 'user2',
                             'subject'           => '<p>S4</p>',
                             'unreadcount'       => 0,
-                        ),
+                        ],
-                    ),
+                    ],
-                    'user2' => array(
+                    'user2' => [
                         // The most recent message between user1 and user2 was S4.
                         array(
                             'messageposition'   => 0,
                             'with'              => 'user1',
                             'subject'           => '<p>S4</p>',
                             'unreadcount'       => 2,
-                        ),
+                        ],
-                    ),
+                    ],
-                ),
+                ],
-            ),
+            ],
             'Test conversations with a single user, where some messages are read and some are not, and messages ' .
-            'are out of order' => array(
+            'are out of order' => [
             // This can happen through a combination of factors including multi-master DB replication with messages
             // read somehow (e.g. API).
-                'users' => array(
+                'usersdata' => [
                     'user1',
                     'user2',
-                ),
+                ],
-                'contacts' => array(
+                'contacts' => [
-                ),
+                ],
-                'messages' => array(
+                'messagesdata' => [
                     array(
                         'from'          => 'user1',
                         'to'            => 'user2',
                         'state'         => 'read',
                         'subject'       => 'S1',
                         'timemodifier'  => 1,
-                    ),
+                    ],
                     array(
                         'from'          => 'user2',
                         'to'            => 'user1',
                         'state'         => 'read',
                         'subject'       => 'S2',
                         'timemodifier'  => 2,
-                    ),
+                    ],
                     array(
                         'from'          => 'user1',
                         'to'            => 'user2',
                         'state'         => 'unread',
                         'subject'       => 'S3',
-                    ),
+                    ],
                     array(
                         'from'          => 'user1',
                         'to'            => 'user2',
                         'state'         => 'unread',
                         'subject'       => 'S4',
-                    ),
+                    ],
-                ),
+                ],
-                'expectations' => array(
+                'expectations' => [
                     // The most recent message between user1 and user2 was S2, even though later IDs have not been read.
-                    'user1' => array(
+                    'user1' => [
                         array(
                             'messageposition'   => 0,
                             'with'              => 'user2',
                             'subject'           => '<p>S2</p>',
                             'unreadcount'       => 0,
-                        ),
+                        ],
-                    ),
+                    ],
-                    'user2' => array(
+                    'user2' => [
                         array(
                             'messageposition'   => 0,
                             'with'              => 'user1',
                             'subject'           => '<p>S2</p>',
-                            'unreadcount'       => 2
+                            'unreadcount'       => 2,
-                        ),
+                        ],
-                    ),
+                    ],
-                ),
+                ],
-            ),
+            ],
-            'Test unread message count is correct for both users' => array(
+            'Test unread message count is correct for both users' => [
-                'users' => array(
+                'usersdata' => [
                     'user1',
                     'user2',
-                ),
+                ],
-                'contacts' => array(
+                'contacts' => [
-                ),
+                ],
-                'messages' => array(
+                'messagesdata' => [
                     array(
                         'from'          => 'user1',
                         'to'            => 'user2',
                         'state'         => 'read',
                         'subject'       => 'S1',
                         'timemodifier'  => 1,
-                    ),
+                    ],
                     array(
                         'from'          => 'user2',
                         'to'            => 'user1',
                         'state'         => 'read',
                         'subject'       => 'S2',
                         'timemodifier'  => 2,
-                    ),
+                    ],
                     array(
                         'from'          => 'user1',
                         'to'            => 'user2',
                         'state'         => 'read',
                         'subject'       => 'S3',
                         'timemodifier'  => 3,
-                    ),
+                    ],
                     array(
                         'from'          => 'user1',
                         'to'            => 'user2',
                         'state'         => 'read',
                         'subject'       => 'S4',
                         'timemodifier'  => 4,
-                    ),
+                    ],
                     array(
                         'from'          => 'user1',
                         'to'            => 'user2',
                         'state'         => 'unread',
                         'subject'       => 'S5',
                         'timemodifier'  => 5,
-                    ),
+                    ],
                     array(
                         'from'          => 'user2',
                         'to'            => 'user1',
                         'state'         => 'unread',
                         'subject'       => 'S6',
                         'timemodifier'  => 6,
-                    ),
+                    ],
                     array(
                         'from'          => 'user1',
                         'to'            => 'user2',
                         'state'         => 'unread',
                         'subject'       => 'S7',
                         'timemodifier'  => 7,
-                    ),
+                    ],
                     array(
                         'from'          => 'user1',
                         'to'            => 'user2',
                         'state'         => 'unread',
                         'subject'       => 'S8',
                         'timemodifier'  => 8,
-                    ),
+                    ],
-                ),
+                ],
-                'expectations' => array(
+                'expectations' => [
                     // The most recent message between user1 and user2 was S2, even though later IDs have not been read.
-                    'user1' => array(
+                    'user1' => [
                         array(
                             'messageposition'   => 0,
                             'with'              => 'user2',
                             'subject'           => '<p>S8</p>',
                             'unreadcount'       => 1,
-                        ),
+                        ],
-                    ),
+                    ],
-                    'user2' => array(
+                    'user2' => [
                         array(
                             'messageposition'   => 0,
                             'with'              => 'user1',
                             'subject'           => '<p>S8</p>',
                             'unreadcount'       => 3,
-                        ),
+                        ],
-                    ),
+                    ],
-                ),
+                ],
-            ),
+            ],
-        );
+        ];
+    }
     /**
      */
     public function test_get_conversations_mixed($usersdata, $contacts, $messagesdata, $expectations): void {
         global $DB;
         $this->resetAfterTest();
         $this->redirectMessages();
         // Create all of the users.
-        $users = array();
+        $users = [];
         foreach ($usersdata as $username) {
-            $users[$username] = $this->getDataGenerator()->create_user(array('username' => $username));
+            $users[$username] = $this->getDataGenerator()->create_user(['username' => $username]);
+        }
         // Confirm the members data is correct.
         $members = $convmessages['members'];
         $this->assertEquals(3, count($members));
         // Retrieve the messages from $time + 3, which should only be the 2 last messages.
+        $convmessages = api::get_conversation_messages(
+            $user1->id,
+            $conversation->id,
+,
-        $convmessages = api::get_conversation_messages($user1->id, $conversation->id, 0, 0,
+,
+            'timecreated ASC',
+            $time + 3
-            'timecreated ASC', $time + 3);
+        );
         // Confirm the conversation id is correct.
         testhelper::send_fake_message_to_conversation($user2, $conversation->id, 'Message 2', $time + 2);
         testhelper::send_fake_message_to_conversation($user1, $conversation->id, 'Message 3', $time + 3);
         testhelper::send_fake_message_to_conversation($user3, $conversation->id, 'Message 4', $time + 4);
         // Retrieve the messages up until $time + 4, which should be all of them.
+        $convmessages = api::get_conversation_messages(
+            $user1->id,
+            $conversation->id,
+,
+,
+            'timecreated ASC',
-        $convmessages = api::get_conversation_messages($user1->id, $conversation->id, 0, 0, 'timecreated ASC',
+,
+            $time + 4
-, $time + 4);
+        );
         // Confirm the conversation id is correct.
         // Confirm the members data is correct.
         $members = $convmessages['members'];
         $this->assertEquals(3, count($members));
         // Retrieve the messages up until $time + 2, which should be the first two.
+        $convmessages = api::get_conversation_messages(
+            $user1->id,
+            $conversation->id,
+,
+,
+            'timecreated ASC',
-        $convmessages = api::get_conversation_messages($user1->id, $conversation->id, 0, 0, 'timecreated ASC',
+,
+            $time + 2
-, $time + 2);
+        );
         // Confirm the conversation id is correct.
         testhelper::send_fake_message_to_conversation($user2, $conversation->id, 'Message 2', $time + 2);
         testhelper::send_fake_message_to_conversation($user1, $conversation->id, 'Message 3', $time + 3);
         testhelper::send_fake_message_to_conversation($user3, $conversation->id, 'Message 4', $time + 4);
         // Retrieve the messages from $time + 2 up until $time + 3, which should be 2nd and 3rd message.
+        $convmessages = api::get_conversation_messages(
+            $user1->id,
+            $conversation->id,
+,
-        $convmessages = api::get_conversation_messages($user1->id, $conversation->id, 0, 0,
+,
+            'timecreated ASC',
+            $time + 2,
+            $time + 3
-            'timecreated ASC', $time + 2, $time + 3);
+        );
         // Confirm the conversation id is correct.
         // Confirm the members data is correct.
         $members = $convmessages['members'];
         $this->assertEquals(2, count($members));
+    }
     /**
      * Test retrieving conversation messages by providing a limitfrom value.
      */
     public function test_get_conversation_messages_limitfrom_only(): void {
      */
     public function test_delete_conversation_by_id(): void {
         global $DB;
         $this->resetAfterTest();
         // Create some users.
         $user1 = self::getDataGenerator()->create_user();
         $user2 = self::getDataGenerator()->create_user();
         $conversationid = api::get_conversation_between_users([$user1->id, $user2->id]);
         // Delete the individual conversation between user1 and user2 (only for user1).
         api::delete_conversation_by_id($user1->id, $conversationid);
-        $muas = $DB->get_records('message_user_actions', array(), 'timecreated ASC');
+        $muas = $DB->get_records('message_user_actions', [], 'timecreated ASC');
         $this->assertCount(4, $muas);
         // Sort by id.
         $this->assertEquals(api::MESSAGE_ACTION_DELETED, $mua4->action);
         // Delete the self-conversation as user 1.
         api::delete_conversation_by_id($user1->id, $sc1->id);
-        $muas = $DB->get_records('message_user_actions', array(), 'timecreated ASC');
+        $muas = $DB->get_records('message_user_actions', [], 'timecreated ASC');
         $this->assertCount(5, $muas);
      */
     public function test_can_send_message_without_sendmessage_cap(): void {
         global $DB;
         $this->resetAfterTest();
         // Create some users.
         $user1 = self::getDataGenerator()->create_user();
         $user2 = self::getDataGenerator()->create_user();
         // Set as the user 1.
         $this->setUser($user1);
+        // Remove the capability to send a message.
+        $roleids = $DB->get_records_menu('role', null, '', 'shortname, id');
-        // Remove the capability to send a message.
+        unassign_capability(
+            'moodle/site:sendmessage',
-        $roleids = $DB->get_records_menu('role', null, '', 'shortname, id');
+            $roleids['user'],
-        unassign_capability('moodle/site:sendmessage', $roleids['user'],
+            \context_system::instance()
-            \context_system::instance());
+        );
      */
     public function test_can_send_message_with_messageanyuser_cap(): void {
         global $DB;
         $this->resetAfterTest();
         // Create some users.
         $teacher1 = self::getDataGenerator()->create_user();
         $student1 = self::getDataGenerator()->create_user();
         $this->resetAfterTest();
         $user1 = self::getDataGenerator()->create_user();
         $user2 = self::getDataGenerator()->create_user();
-        $authenticateduserrole = $DB->get_record('role', array('shortname' => 'user'));
+        $authenticateduserrole = $DB->get_record('role', ['shortname' => 'user']);
         assign_capability('moodle/site:messageanyuser', CAP_ALLOW, $authenticateduserrole->id, \context_system::instance(), true);
         $this->resetAfterTest();
         $user1 = self::getDataGenerator()->create_user();
         $user2 = self::getDataGenerator()->create_user();
-        $authenticateduserrole = $DB->get_record('role', array('shortname' => 'user'));
+        $authenticateduserrole = $DB->get_record('role', ['shortname' => 'user']);
         assign_capability('moodle/site:readallmessages', CAP_ALLOW, $authenticateduserrole->id, \context_system::instance(), true);
     public function test_can_send_message_even_if_blocked_shared_course_with_message_any_user_cap(): void {
         global $DB;
         $this->resetAfterTest();
-        $editingteacherrole = $DB->get_record('role', array('shortname' => 'editingteacher'));
+        $editingteacherrole = $DB->get_record('role', ['shortname' => 'editingteacher']);
         $teacher = self::getDataGenerator()->create_user();
         $student = self::getDataGenerator()->create_user();
+        $course = self::getDataGenerator()->create_course();
+        $this->getDataGenerator()->enrol_user($teacher->id, $course->id, $editingteacherrole->id);
-        $course = self::getDataGenerator()->create_course();
+        $this->getDataGenerator()->enrol_user($student->id, $course->id);
+        assign_capability(
             'moodle/site:messageanyuser',
-        $this->getDataGenerator()->enrol_user($teacher->id, $course->id, $editingteacherrole->id);
+            CAP_ALLOW,
-        $this->getDataGenerator()->enrol_user($student->id, $course->id);
+            $editingteacherrole->id,
         // Create an individual conversation between user1 and user2.
         $ic1 = api::create_conversation(
             api::MESSAGE_CONVERSATION_TYPE_INDIVIDUAL,
+            [
                 $user1->id,
-                $user2->id
+                $user2->id,
+            ]
         );
         // Create a group conversation between and users 1, 2 and 3.
         $gc1 = api::create_conversation(
             api::MESSAGE_CONVERSATION_TYPE_GROUP,
+            [
                 $user1->id,
                 $user2->id,
-                $user3->id
+                $user3->id,
+            ]
         );
      */
     public function test_can_send_message_to_conversation_sendmessage_cap(): void {
         global $DB;
         $this->resetAfterTest();
         $user1 = self::getDataGenerator()->create_user();
         $user2 = self::getDataGenerator()->create_user();
         $user3 = self::getDataGenerator()->create_user();
         // Create an individual conversation between user1 and user2.
         $ic1 = api::create_conversation(
             api::MESSAGE_CONVERSATION_TYPE_INDIVIDUAL,
+            [
                 $user1->id,
-                $user2->id
+                $user2->id,
+            ]
         );
         // Group conversation between and users 1, 2 and 3.
         $gc1 = api::create_conversation(
             api::MESSAGE_CONVERSATION_TYPE_GROUP,
+            [
                 $user1->id,
                 $user2->id,
-                $user3->id
+                $user3->id,
+            ]
         );
      */
     public function test_can_send_message_to_conversation_messageanyuser_cap(): void {
         global $DB;
         $this->resetAfterTest();
         $user1 = self::getDataGenerator()->create_user();
         $user2 = self::getDataGenerator()->create_user();
         $user3 = self::getDataGenerator()->create_user();
         // Create an individual conversation between user1 and user2.
         $ic1 = api::create_conversation(
             api::MESSAGE_CONVERSATION_TYPE_INDIVIDUAL,
+            [
                 $user1->id,
-                $user2->id
+                $user2->id,
+            ]
         );
         // Group conversation between and users 1, 2 and 3.
         $gc1 = api::create_conversation(
             api::MESSAGE_CONVERSATION_TYPE_GROUP,
+            [
                 $user1->id,
                 $user2->id,
-                $user3->id
+                $user3->id,
+            ]
         );
         // Create an individual conversation between user1 and user2.
         $ic1 = api::create_conversation(
             api::MESSAGE_CONVERSATION_TYPE_INDIVIDUAL,
+            [
                 $user1->id,
-                $user2->id
+                $user2->id,
+            ]
         );
         // Create a group conversation between and users 1, 2 and 3.
         $gc1 = api::create_conversation(
             api::MESSAGE_CONVERSATION_TYPE_GROUP,
+            [
                 $user1->id,
                 $user2->id,
-                $user3->id
+                $user3->id,
+            ]
         );
         // Create an individual conversation between user1 and user2.
         $ic1 = api::create_conversation(
             api::MESSAGE_CONVERSATION_TYPE_INDIVIDUAL,
+            [
                 $user1->id,
-                $user2->id
+                $user2->id,
+            ]
         );
         // Create a group conversation between and users 1, 2 and 3.
         $gc1 = api::create_conversation(
             api::MESSAGE_CONVERSATION_TYPE_GROUP,
+            [
                 $user1->id,
                 $user2->id,
-                $user3->id
+                $user3->id,
+            ]
         );
         // Create an individual conversation between user1 and user2.
         $ic1 = api::create_conversation(
             api::MESSAGE_CONVERSATION_TYPE_INDIVIDUAL,
+            [
                 $user1->id,
-                $user2->id
+                $user2->id,
+            ]
         );
         // Create a group conversation between and users 1, 2 and 3.
         $gc1 = api::create_conversation(
             api::MESSAGE_CONVERSATION_TYPE_GROUP,
+            [
                 $user1->id,
                 $user2->id,
-                $user3->id
+                $user3->id,
+            ]
         );
         // Create an individual conversation between user1 and user2.
         $ic1 = api::create_conversation(
             api::MESSAGE_CONVERSATION_TYPE_INDIVIDUAL,
+            [
                 $user1->id,
-                $user2->id
+                $user2->id,
+            ]
         );
         // Create a group conversation between and users 1, 2 and 3.
         $gc1 = api::create_conversation(
             api::MESSAGE_CONVERSATION_TYPE_GROUP,
+            [
                 $user1->id,
                 $user2->id,
-                $user3->id
+                $user3->id,
+            ]
         );
         // Create an individual conversation between user1 and user2.
         $ic1 = api::create_conversation(
             api::MESSAGE_CONVERSATION_TYPE_INDIVIDUAL,
+            [
                 $user1->id,
-                $user2->id
+                $user2->id,
+            ]
         );
         // Create a group conversation between and users 1, 2 and 3.
         $gc1 = api::create_conversation(
             api::MESSAGE_CONVERSATION_TYPE_GROUP,
+            [
                 $user1->id,
                 $user2->id,
-                $user3->id
+                $user3->id,
+            ]
         );
      */
     public function test_get_blocked_users(): void {
         global $USER;
         $this->resetAfterTest();
         // Set this user as the admin.
         $this->setAdminUser();
         $conversation = api::create_conversation(
             api::MESSAGE_CONVERSATION_TYPE_INDIVIDUAL,
+            [
                 $user1->id,
-                $user2->id
+                $user2->id,
+            ]
         );
         $conversationid = $conversation->id;
+        $this->assertEquals(
+,
-        $this->assertEquals(2,
+            api::count_conversation_members($conversationid)
-            api::count_conversation_members($conversationid));
+        );
+    }
         $conversation = api::create_conversation(
             api::MESSAGE_CONVERSATION_TYPE_INDIVIDUAL,
+            [
                 $user1->id,
-                $user2->id
+                $user2->id,
+            ]
         );
         $conversationid = $conversation->id;
         $conversation = api::create_conversation(
             api::MESSAGE_CONVERSATION_TYPE_GROUP,
+            [
                 $user1->id,
-                $user2->id
+                $user2->id,
+            ]
         );
         $conversationid = $conversation->id;
+        $this->assertNull(api::add_members_to_conversation([$user3->id], $conversationid));
-        $this->assertNull(api::add_members_to_conversation([$user3->id], $conversationid));
+        $this->assertEquals(
+,
-        $this->assertEquals(3,
+            api::count_conversation_members($conversationid)
-            api::count_conversation_members($conversationid));
+        );
+    }
         $conversation = api::create_conversation(
             api::MESSAGE_CONVERSATION_TYPE_GROUP,
+            [
                 $user1->id,
-                $user2->id
+                $user2->id,
+            ]
         );
         $conversationid = $conversation->id;
         // Don't throw an error for non existing user, but don't add it as a member.
+        $this->assertNull(api::add_members_to_conversation([0], $conversationid));
-        $this->assertNull(api::add_members_to_conversation([0], $conversationid));
+        $this->assertEquals(
+,
-        $this->assertEquals(2,
+            api::count_conversation_members($conversationid)
-            api::count_conversation_members($conversationid));
+        );
+    }
         $conversation = api::create_conversation(
             api::MESSAGE_CONVERSATION_TYPE_GROUP,
+            [
                 $user1->id,
-                $user2->id
+                $user2->id,
+            ]
         );
         $conversationid = $conversation->id;
         // Don't add as a member a user that is already conversation member.
+        $this->assertNull(api::add_members_to_conversation([$user1->id], $conversationid));
-        $this->assertNull(api::add_members_to_conversation([$user1->id], $conversationid));
+        $this->assertEquals(
+,
-        $this->assertEquals(2,
+            api::count_conversation_members($conversationid)
-            api::count_conversation_members($conversationid));
+        );
+    }
         $conversation = api::create_conversation(
             api::MESSAGE_CONVERSATION_TYPE_GROUP,
+            [
                 $user1->id,
-                $user2->id
+                $user2->id,
+            ]
         );
         $conversationid = $conversation->id;
+        $this->assertNull(api::add_members_to_conversation([$user3->id, $user4->id], $conversationid));
-        $this->assertNull(api::add_members_to_conversation([$user3->id, $user4->id], $conversationid));
+        $this->assertEquals(
+,
-        $this->assertEquals(4,
+            api::count_conversation_members($conversationid)
-            api::count_conversation_members($conversationid));
+        );
+    }
         $conversation = api::create_conversation(
             api::MESSAGE_CONVERSATION_TYPE_GROUP,
+            [
                 $user1->id,
-                $user2->id
+                $user2->id,
+            ]
         );
         $conversationid = $conversation->id;
         // Don't throw errors, but don't add as members users don't exist or are already conversation members.
+        $this->assertNull(api::add_members_to_conversation([$user3->id, $user1->id, 0], $conversationid));
-        $this->assertNull(api::add_members_to_conversation([$user3->id, $user1->id, 0], $conversationid));
+        $this->assertEquals(
+,
-        $this->assertEquals(3,
+            api::count_conversation_members($conversationid)
-            api::count_conversation_members($conversationid));
+        );
+    }
         $conversation = api::create_conversation(
             api::MESSAGE_CONVERSATION_TYPE_INDIVIDUAL,
+            [
                 $user1->id,
-                $user2->id
+                $user2->id,
+            ]
         );
         $conversationid = $conversation->id;
         $conversation = api::create_conversation(
             api::MESSAGE_CONVERSATION_TYPE_GROUP,
+            [
                 $user1->id,
-                $user2->id
+                $user2->id,
+            ]
         );
         $conversationid = $conversation->id;
+        $this->assertNull(api::remove_members_from_conversation([$user1->id], $conversationid));
-        $this->assertNull(api::remove_members_from_conversation([$user1->id], $conversationid));
+        $this->assertEquals(
+,
-        $this->assertEquals(1,
+            api::count_conversation_members($conversationid)
-            api::count_conversation_members($conversationid));
+        );
+    }
         $conversation = api::create_conversation(
             api::MESSAGE_CONVERSATION_TYPE_GROUP,
+            [
                 $user1->id,
-                $user2->id
+                $user2->id,
+            ]
         );
         $conversationid = $conversation->id;
+        $this->assertNull(api::remove_members_from_conversation([0], $conversationid));
-        $this->assertNull(api::remove_members_from_conversation([0], $conversationid));
+        $this->assertEquals(
+,
-        $this->assertEquals(2,
+            api::count_conversation_members($conversationid)
-            api::count_conversation_members($conversationid));
+        );
+    }
         $conversation = api::create_conversation(
             api::MESSAGE_CONVERSATION_TYPE_GROUP,
+            [
                 $user1->id,
-                $user2->id
+                $user2->id,
+            ]
         );
         $conversationid = $conversation->id;
         $this->assertNull(api::add_members_to_conversation([$user3->id, $user4->id], $conversationid));
+        $this->assertNull(api::remove_members_from_conversation([$user3->id, $user4->id], $conversationid));
-        $this->assertNull(api::remove_members_from_conversation([$user3->id, $user4->id], $conversationid));
+        $this->assertEquals(
+,
-        $this->assertEquals(2,
+            api::count_conversation_members($conversationid)
-            api::count_conversation_members($conversationid));
+        );
+    }
         $conversation = api::create_conversation(
             api::MESSAGE_CONVERSATION_TYPE_GROUP,
+            [
                 $user1->id,
-                $user2->id
+                $user2->id,
+            ]
         );
         $conversationid = $conversation->id;
         $this->assertNull(api::add_members_to_conversation([$user3->id], $conversationid));
         $this->assertNull(
             api::remove_members_from_conversation([$user2->id, $user3->id, $user4->id, 0], $conversationid)
+        );
-        );
+        $this->assertEquals(
+,
-        $this->assertEquals(1,
+            api::count_conversation_members($conversationid)
-            api::count_conversation_members($conversationid));
+        );
+    }
         $conversation = api::create_conversation(
             api::MESSAGE_CONVERSATION_TYPE_GROUP,
+            [
                 $user1->id,
-                $user2->id
+                $user2->id,
+            ]
         );
         $conversationid = $conversation->id;
+        $this->assertNull(api::remove_members_from_conversation([$user1->id, $user2->id], $conversationid));
-        $this->assertNull(api::remove_members_from_conversation([$user1->id, $user2->id], $conversationid));
+        $this->assertEquals(
 ,
-        $this->assertEquals(0,
+            api::count_conversation_members($conversationid)
-            api::count_conversation_members($conversationid));
+        );
+    }
         $conversation = api::create_conversation(
             api::MESSAGE_CONVERSATION_TYPE_INDIVIDUAL,
+            [
                 $user1->id,
-                $user2->id
+                $user2->id,
+            ]
         );
         $conversationid = $conversation->id;
         $conversation = api::create_conversation(
             api::MESSAGE_CONVERSATION_TYPE_INDIVIDUAL,
+            [
                 $user1->id,
-                $user2->id
+                $user2->id,
+            ]
         );
         $conversationid = $conversation->id;
         $conversation = api::create_conversation(
             api::MESSAGE_CONVERSATION_TYPE_INDIVIDUAL,
+            [
                 $user1->id,
-                $user2->id
+                $user2->id,
+            ]
         );
         $conversationid = $conversation->id;
         $conversation = api::create_conversation(
             api::MESSAGE_CONVERSATION_TYPE_INDIVIDUAL,
+            [
                 $user1->id,
-                $user2->id
+                $user2->id,
+            ]
         );
         $conversationid = $conversation->id;
         $conversation = api::create_conversation(
             api::MESSAGE_CONVERSATION_TYPE_INDIVIDUAL,
+            [
                 $user1->id,
-                $user2->id
+                $user2->id,
+            ]
         );
         $conversationid = $conversation->id;
         $conversation = api::create_conversation(
             api::MESSAGE_CONVERSATION_TYPE_INDIVIDUAL,
+            [
                 $user1->id,
-                $user2->id
+                $user2->id,
             ],
             'A conversation name'
         );
         $conversation = api::create_conversation(
             api::MESSAGE_CONVERSATION_TYPE_GROUP,
+            [
                 $user1->id,
                 $user2->id,
-                $user3->id
+                $user3->id,
             ],
             'A conversation name'
         );
      */
     public function test_disable_conversation(): void {
         global $DB;
         $this->resetAfterTest();
         $name = 'Name of conversation';
         $conversation = api::create_conversation(
         $newname = 'New name of conversation';
         api::update_conversation_name($conversation->id, $newname);
         $this->assertEquals(
-                $newname,
+            $newname,
-                $DB->get_field('message_conversations', 'name', ['id' => $conversation->id])
+            $DB->get_field('message_conversations', 'name', ['id' => $conversation->id])
         );
+    }
         $conversation = api::create_conversation(
             api::MESSAGE_CONVERSATION_TYPE_GROUP,
+            [
                 $user1->id,
                 $user2->id,
-                $user3->id
+                $user3->id,
+            ]
         );
         $conversationid = $conversation->id;
         $members = api::get_conversation_members($user1->id, $conversationid, false);
         $conversation = api::create_conversation(
             api::MESSAGE_CONVERSATION_TYPE_GROUP,
+            [
                 $user1->id,
                 $user2->id,
-                $user3->id
+                $user3->id,
+            ]
         );
         $conversationid = $conversation->id;
      */
     public function test_send_message_to_conversation_individual_conversation(): void {
         $this->resetAfterTest();
         // Get a bunch of conversations, some group, some individual and in different states.
-        list($user1, $user2, $user3, $user4, $ic1, $ic2, $ic3,
+        [$user1, $user2, $user3, $user4, $ic1, $ic2, $ic3,
-            $gc1, $gc2, $gc3, $gc4, $gc5, $gc6) = $this->create_conversation_test_data();
+            $gc1, $gc2, $gc3, $gc4, $gc5, $gc6] = $this->create_conversation_test_data();
         // Enrol the users into the same course so the privacy checks will pass using default (contact+course members) setting.
         $course = $this->getDataGenerator()->create_course();
      * Test verifying that messages can be sent to existing group conversations.
      */
     public function test_send_message_to_conversation_group_conversation(): void {
         $this->resetAfterTest();
         // Get a bunch of conversations, some group, some individual and in different states.
-        list($user1, $user2, $user3, $user4, $ic1, $ic2, $ic3,
+        [$user1, $user2, $user3, $user4, $ic1, $ic2, $ic3,
-            $gc1, $gc2, $gc3, $gc4, $gc5, $gc6) = $this->create_conversation_test_data();
+            $gc1, $gc2, $gc3, $gc4, $gc5, $gc6] = $this->create_conversation_test_data();
         // Enrol the users into the same course so the privacy checks will pass using default (contact+course members) setting.
         $course = $this->getDataGenerator()->create_course();
         $this->getDataGenerator()->enrol_user($user1->id, $course->id);
         $this->getDataGenerator()->enrol_user($user2->id, $course->id);
         $this->getDataGenerator()->enrol_user($user3->id, $course->id);
         $group = $this->getDataGenerator()->create_group([
             'courseid' => $course->id,
             'enablemessaging' => 1,
-            'picturepath' => $CFG->dirroot . '/lib/tests/fixtures/gd-logo.png'
+            'picturepath' => $CFG->dirroot . '/lib/tests/fixtures/gd-logo.png',
         ]);
         // Add users to group.
-        $this->getDataGenerator()->create_group_member(array('groupid' => $group->id, 'userid' => $user1->id));
+        $this->getDataGenerator()->create_group_member(['groupid' => $group->id, 'userid' => $user1->id]);
-        $this->getDataGenerator()->create_group_member(array('groupid' => $group->id, 'userid' => $user2->id));
+        $this->getDataGenerator()->create_group_member(['groupid' => $group->id, 'userid' => $user2->id]);
         // Verify the group with the image works as expected.
         $conversations = api::get_conversations($user1->id);
         $this->preventResetByRollback();
         $sink = $this->redirectMessages();
         // Send a message to a group conversation.
         $messagessink = $this->redirectMessages();
+        $message1 = api::send_message_to_conversation(
+            $user1->id,
-        $message1 = api::send_message_to_conversation($user1->id, $conversations[0]->id,
+            $conversations[0]->id,
+            'message to the group',
+            FORMAT_MOODLE
-            'message to the group', FORMAT_MOODLE);
+        );
         $messages = $messagessink->get_messages();
         // Verify the message returned.
         $this->assertInstanceOf(\stdClass::class, $message1);
         $this->assertObjectHasProperty('id', $message1);
      */
     public function test_send_message_to_conversation_non_existent_conversation(): void {
         $this->resetAfterTest();
         // Get a bunch of conversations, some group, some individual and in different states.
-        list($user1, $user2, $user3, $user4, $ic1, $ic2, $ic3,
+        [$user1, $user2, $user3, $user4, $ic1, $ic2, $ic3,
-            $gc1, $gc2, $gc3, $gc4, $gc5, $gc6) = $this->create_conversation_test_data();
+            $gc1, $gc2, $gc3, $gc4, $gc5, $gc6] = $this->create_conversation_test_data();
         $this->expectException(\moodle_exception::class);
      */
     public function test_send_message_to_conversation_non_member(): void {
         $this->resetAfterTest();
         // Get a bunch of conversations, some group, some individual and in different states.
-        list($user1, $user2, $user3, $user4, $ic1, $ic2, $ic3,
+        [$user1, $user2, $user3, $user4, $ic1, $ic2, $ic3,
-            $gc1, $gc2, $gc3, $gc4, $gc5, $gc6) = $this->create_conversation_test_data();
+            $gc1, $gc2, $gc3, $gc4, $gc5, $gc6] = $this->create_conversation_test_data();
         // Enrol the users into the same course so the privacy checks will pass using default (contact+course members) setting.
         $course = $this->getDataGenerator()->create_course();
      */
     public function test_send_message_to_conversation_blocked_user(): void {
         $this->resetAfterTest();
         // Get a bunch of conversations, some group, some individual and in different states.
-        list($user1, $user2, $user3, $user4, $ic1, $ic2, $ic3,
+        [$user1, $user2, $user3, $user4, $ic1, $ic2, $ic3,
-            $gc1, $gc2, $gc3, $gc4, $gc5, $gc6) = $this->create_conversation_test_data();
+            $gc1, $gc2, $gc3, $gc4, $gc5, $gc6] = $this->create_conversation_test_data();
         // Enrol the users into the same course so the privacy checks will pass using default (contact+course members) setting.
         $course = $this->getDataGenerator()->create_course();
         $user1 = self::getDataGenerator()->create_user();
         $user2 = self::getDataGenerator()->create_user();
+        $this->setUser($user1);
-        $this->setUser($user1);
+        $conversation = api::create_conversation(
+            api::MESSAGE_CONVERSATION_TYPE_INDIVIDUAL,
-        $conversation = api::create_conversation(api::MESSAGE_CONVERSATION_TYPE_INDIVIDUAL,
+            [$user1->id, $user2->id]
-            [$user1->id, $user2->id]);
+        );
+    }
     /**
      * Data provider for test_get_conversation_counts().
      */
-    public function get_conversation_counts_test_cases() {
+    public static function get_conversation_counts_test_cases(): array {
         $typeindividual = api::MESSAGE_CONVERSATION_TYPE_INDIVIDUAL;
         $typegroup = api::MESSAGE_CONVERSATION_TYPE_GROUP;
         $typeself = api::MESSAGE_CONVERSATION_TYPE_SELF;
-        list($user1, $user2, $user3, $user4, $user5, $user6, $user7, $user8) = [0, 1, 2, 3, 4, 5, 6, 7];
+        [$user1, $user2, $user3, $user4, $user5, $user6, $user7, $user8] = [0, 1, 2, 3, 4, 5, 6, 7];
         $conversations = [
+            [
                 'type' => $typeindividual,
                 'users' => [$user1, $user2],
                 'messages' => [$user1, $user2, $user2],
                 'favourites' => [$user1],
-                'enabled' => null // Individual conversations cannot be disabled.
+                'enabled' => null, // Individual conversations cannot be disabled.
             ],
+            [
                 'type' => $typeindividual,
                 'users' => [$user1, $user3],
                 'messages' => [$user1, $user3, $user1],
                 'favourites' => [],
-                'enabled' => null // Individual conversations cannot be disabled.
+                'enabled' => null, // Individual conversations cannot be disabled.
             ],
+            [
                 'type' => $typegroup,
                 'users' => [$user1, $user2, $user3, $user4],
                 'messages' => [$user1, $user2, $user3, $user4],
                 'favourites' => [],
-                'enabled' => true
+                'enabled' => true,
             ],
+            [
                 'type' => $typegroup,
                 'users' => [$user2, $user3, $user4],
                 'messages' => [$user2, $user3, $user4],
                 'favourites' => [],
-                'enabled' => true
+                'enabled' => true,
             ],
+            [
                 'type' => $typegroup,
                 'users' => [$user6, $user7],
                 'messages' => [$user6, $user7, $user7],
                 'favourites' => [$user6],
-                'enabled' => false
+                'enabled' => false,
             ],
+            [
                 'type' => $typeself,
                 'users' => [$user8],
                 'messages' => [$user8],
                 'favourites' => [],
-                'enabled' => null // Self-conversations cannot be disabled.
+                'enabled' => null, // Self-conversations cannot be disabled.
             ],
         ];
         return [
             'No conversations' => [
-                'conversationConfigs' => $conversations,
+                'conversationconfigs' => $conversations,
                 'deletemessagesuser' => null,
                 'deletemessages' => [],
+                'arguments' => [$user5],
+                'expectedcounts' => [
-                'arguments' => [$user5],
+                    'favourites' => 1,
-                'expectedcounts' => ['favourites' => 1, 'types' => [
+                    'types' => [
-                    api::MESSAGE_CONVERSATION_TYPE_INDIVIDUAL => 0,
+                        api::MESSAGE_CONVERSATION_TYPE_INDIVIDUAL => 0,
+                        api::MESSAGE_CONVERSATION_TYPE_GROUP => 0,
-                    api::MESSAGE_CONVERSATION_TYPE_GROUP => 0,
+                        api::MESSAGE_CONVERSATION_TYPE_SELF => 0,
-                    api::MESSAGE_CONVERSATION_TYPE_SELF => 0
+                    ],
+                ],
+                'expectedunreadcounts' => [
-                ]],
+                    'favourites' => 0,
-                'expectedunreadcounts' => ['favourites' => 0, 'types' => [
+                    'types' => [
-                    api::MESSAGE_CONVERSATION_TYPE_INDIVIDUAL => 0,
+                        api::MESSAGE_CONVERSATION_TYPE_INDIVIDUAL => 0,
+                        api::MESSAGE_CONVERSATION_TYPE_GROUP => 0,
-                    api::MESSAGE_CONVERSATION_TYPE_GROUP => 0,
+                        api::MESSAGE_CONVERSATION_TYPE_SELF => 0,
-                    api::MESSAGE_CONVERSATION_TYPE_SELF => 0
+                    ],
-                ]],
+                ],
-                'deletedusers' => []
+                'deletedusers' => [],
             ],
             'No individual conversations, 2 group conversations' => [
-                'conversationConfigs' => $conversations,
+                'conversationconfigs' => $conversations,
                 'deletemessagesuser' => null,
                 'deletemessages' => [],
+                'arguments' => [$user4],
+                'expectedcounts' => [
-                'arguments' => [$user4],
+                    'favourites' => 1,
-                'expectedcounts' => ['favourites' => 1, 'types' => [
+                    'types' => [
-                    api::MESSAGE_CONVERSATION_TYPE_INDIVIDUAL => 0,
+                        api::MESSAGE_CONVERSATION_TYPE_INDIVIDUAL => 0,
+                        api::MESSAGE_CONVERSATION_TYPE_GROUP => 2,
-                    api::MESSAGE_CONVERSATION_TYPE_GROUP => 2,
+                        api::MESSAGE_CONVERSATION_TYPE_SELF => 0,
-                    api::MESSAGE_CONVERSATION_TYPE_SELF => 0
+                    ],
+                ],
+                'expectedunreadcounts' => [
-                ]],
+                    'favourites' => 0,
-                'expectedunreadcounts' => ['favourites' => 0, 'types' => [
+                    'types' => [
-                    api::MESSAGE_CONVERSATION_TYPE_INDIVIDUAL => 0,
+                        api::MESSAGE_CONVERSATION_TYPE_INDIVIDUAL => 0,
+                        api::MESSAGE_CONVERSATION_TYPE_GROUP => 2,
-                    api::MESSAGE_CONVERSATION_TYPE_GROUP => 2,
+                        api::MESSAGE_CONVERSATION_TYPE_SELF => 0,
-                    api::MESSAGE_CONVERSATION_TYPE_SELF => 0
+                    ],
-                ]],
+                ],
-                'deletedusers' => []
+                'deletedusers' => [],
             ],
             '2 individual conversations (one favourited), 1 group conversation' => [
-                'conversationConfigs' => $conversations,
+                'conversationconfigs' => $conversations,
                 'deletemessagesuser' => null,
                 'deletemessages' => [],
+                'arguments' => [$user1],
+                'expectedcounts' => [
-                'arguments' => [$user1],
+                    'favourites' => 2,
-                'expectedcounts' => ['favourites' => 2, 'types' => [
+                    'types' => [
-                    api::MESSAGE_CONVERSATION_TYPE_INDIVIDUAL => 1,
+                        api::MESSAGE_CONVERSATION_TYPE_INDIVIDUAL => 1,
+                        api::MESSAGE_CONVERSATION_TYPE_GROUP => 1,
-                    api::MESSAGE_CONVERSATION_TYPE_GROUP => 1,
+                        api::MESSAGE_CONVERSATION_TYPE_SELF => 0,
-                    api::MESSAGE_CONVERSATION_TYPE_SELF => 0
+                    ],
+                ],
+                'expectedunreadcounts' => [
-                ]],
+                    'favourites' => 1,
-                'expectedunreadcounts' => ['favourites' => 1, 'types' => [
+                    'types' => [
-                    api::MESSAGE_CONVERSATION_TYPE_INDIVIDUAL => 1,
+                        api::MESSAGE_CONVERSATION_TYPE_INDIVIDUAL => 1,
+                        api::MESSAGE_CONVERSATION_TYPE_GROUP => 1,
-                    api::MESSAGE_CONVERSATION_TYPE_GROUP => 1,
+                        api::MESSAGE_CONVERSATION_TYPE_SELF => 0,
-                    api::MESSAGE_CONVERSATION_TYPE_SELF => 0
+                    ],
-                ]],
+                ],
-                'deletedusers' => []
+                'deletedusers' => [],
             ],
             '1 individual conversation, 2 group conversations' => [
-                'conversationConfigs' => $conversations,
+                'conversationconfigs' => $conversations,
                 'deletemessagesuser' => null,
                 'deletemessages' => [],
+                'arguments' => [$user2],
+                'expectedcounts' => [
-                'arguments' => [$user2],
+                    'favourites' => 1,
-                'expectedcounts' => ['favourites' => 1, 'types' => [
+                    'types' => [
-                    api::MESSAGE_CONVERSATION_TYPE_INDIVIDUAL => 1,
+                        api::MESSAGE_CONVERSATION_TYPE_INDIVIDUAL => 1,
+                        api::MESSAGE_CONVERSATION_TYPE_GROUP => 2,
-                    api::MESSAGE_CONVERSATION_TYPE_GROUP => 2,
+                        api::MESSAGE_CONVERSATION_TYPE_SELF => 0,
-                    api::MESSAGE_CONVERSATION_TYPE_SELF => 0
+                    ],
+                ],
+                'expectedunreadcounts' => [
-                ]],
+                    'favourites' => 0,
-                'expectedunreadcounts' => ['favourites' => 0, 'types' => [
+                    'types' => [
-                    api::MESSAGE_CONVERSATION_TYPE_INDIVIDUAL => 1,
+                        api::MESSAGE_CONVERSATION_TYPE_INDIVIDUAL => 1,
+                        api::MESSAGE_CONVERSATION_TYPE_GROUP => 2,
-                    api::MESSAGE_CONVERSATION_TYPE_GROUP => 2,
+                        api::MESSAGE_CONVERSATION_TYPE_SELF => 0,
-                    api::MESSAGE_CONVERSATION_TYPE_SELF => 0
+                    ],
-                ]],
+                ],
-                'deletedusers' => []
+                'deletedusers' => [],
             ],
             '2 group conversations only' => [
-                'conversationConfigs' => $conversations,
+                'conversationconfigs' => $conversations,
                 'deletemessagesuser' => null,
                 'deletemessages' => [],
+                'arguments' => [$user4],
+                'expectedcounts' => [
-                'arguments' => [$user4],
+                    'favourites' => 1,
-                'expectedcounts' => ['favourites' => 1, 'types' => [
+                    'types' => [
-                    api::MESSAGE_CONVERSATION_TYPE_INDIVIDUAL => 0,
+                        api::MESSAGE_CONVERSATION_TYPE_INDIVIDUAL => 0,
+                        api::MESSAGE_CONVERSATION_TYPE_GROUP => 2,
-                    api::MESSAGE_CONVERSATION_TYPE_GROUP => 2,
+                        api::MESSAGE_CONVERSATION_TYPE_SELF => 0,
-                    api::MESSAGE_CONVERSATION_TYPE_SELF => 0
+                    ],
+                ],
+                'expectedunreadcounts' => [
-                ]],
+                    'favourites' => 0,
-                'expectedunreadcounts' => ['favourites' => 0, 'types' => [
+                    'types' => [
-                    api::MESSAGE_CONVERSATION_TYPE_INDIVIDUAL => 0,
+                        api::MESSAGE_CONVERSATION_TYPE_INDIVIDUAL => 0,
+                        api::MESSAGE_CONVERSATION_TYPE_GROUP => 2,
-                    api::MESSAGE_CONVERSATION_TYPE_GROUP => 2,
+                        api::MESSAGE_CONVERSATION_TYPE_SELF => 0,
-                    api::MESSAGE_CONVERSATION_TYPE_SELF => 0
+                    ],
-                ]],
+                ],
-                'deletedusers' => []
+                'deletedusers' => [],
             ],
             'All conversation types, delete a message from individual favourited, messages remaining' => [
-                'conversationConfigs' => $conversations,
+                'conversationconfigs' => $conversations,
                 'deletemessagesuser' => $user1,
                 'deletemessages' => [0],
+                'arguments' => [$user1],
+                'expectedcounts' => [
-                'arguments' => [$user1],
+                    'favourites' => 2,
-                'expectedcounts' => ['favourites' => 2, 'types' => [
+                    'types' => [
-                    api::MESSAGE_CONVERSATION_TYPE_INDIVIDUAL => 1,
+                        api::MESSAGE_CONVERSATION_TYPE_INDIVIDUAL => 1,
+                        api::MESSAGE_CONVERSATION_TYPE_GROUP => 1,
-                    api::MESSAGE_CONVERSATION_TYPE_GROUP => 1,
+                        api::MESSAGE_CONVERSATION_TYPE_SELF => 0,
-                    api::MESSAGE_CONVERSATION_TYPE_SELF => 0
+                    ],
+                ],
+                'expectedunreadcounts' => [
-                ]],
+                    'favourites' => 1,
-                'expectedunreadcounts' => ['favourites' => 1, 'types' => [
+                    'types' => [
-                    api::MESSAGE_CONVERSATION_TYPE_INDIVIDUAL => 1,
+                        api::MESSAGE_CONVERSATION_TYPE_INDIVIDUAL => 1,
+                        api::MESSAGE_CONVERSATION_TYPE_GROUP => 1,
-                    api::MESSAGE_CONVERSATION_TYPE_GROUP => 1,
+                        api::MESSAGE_CONVERSATION_TYPE_SELF => 0,
-                    api::MESSAGE_CONVERSATION_TYPE_SELF => 0
+                    ],
-                ]],
+                ],
-                'deletedusers' => []
+                'deletedusers' => [],
             ],
             'All conversation types, delete a message from individual non-favourited, messages remaining' => [
-                'conversationConfigs' => $conversations,
+                'conversationconfigs' => $conversations,
                 'deletemessagesuser' => $user1,
                 'deletemessages' => [3],
+                'arguments' => [$user1],
+                'expectedcounts' => [
-                'arguments' => [$user1],
+                    'favourites' => 2,
-                'expectedcounts' => ['favourites' => 2, 'types' => [
+                    'types' => [
-                    api::MESSAGE_CONVERSATION_TYPE_INDIVIDUAL => 1,
+                        api::MESSAGE_CONVERSATION_TYPE_INDIVIDUAL => 1,
+                        api::MESSAGE_CONVERSATION_TYPE_GROUP => 1,
-                    api::MESSAGE_CONVERSATION_TYPE_GROUP => 1,
+                        api::MESSAGE_CONVERSATION_TYPE_SELF => 0,
-                    api::MESSAGE_CONVERSATION_TYPE_SELF => 0
+                    ],
+                ],
+                'expectedunreadcounts' => [
-                ]],
+                    'favourites' => 1,
-                'expectedunreadcounts' => ['favourites' => 1, 'types' => [
+                    'types' => [
-                    api::MESSAGE_CONVERSATION_TYPE_INDIVIDUAL => 1,
+                        api::MESSAGE_CONVERSATION_TYPE_INDIVIDUAL => 1,
+                        api::MESSAGE_CONVERSATION_TYPE_GROUP => 1,
-                    api::MESSAGE_CONVERSATION_TYPE_GROUP => 1,
+                        api::MESSAGE_CONVERSATION_TYPE_SELF => 0,
-                    api::MESSAGE_CONVERSATION_TYPE_SELF => 0
+                    ],
-                ]],
+                ],
-                'deletedusers' => []
+                'deletedusers' => [],
             ],
             'All conversation types, delete all messages from individual favourited, no messages remaining' => [
-                'conversationConfigs' => $conversations,
+                'conversationconfigs' => $conversations,
                 'deletemessagesuser' => $user1,
                 'deletemessages' => [0, 1, 2],
+                'arguments' => [$user1],
+                'expectedcounts' => [
-                'arguments' => [$user1],
+                    'favourites' => 1,
-                'expectedcounts' => ['favourites' => 1, 'types' => [
+                    'types' => [
-                    api::MESSAGE_CONVERSATION_TYPE_INDIVIDUAL => 1,
+                        api::MESSAGE_CONVERSATION_TYPE_INDIVIDUAL => 1,
+                        api::MESSAGE_CONVERSATION_TYPE_GROUP => 1,
-                    api::MESSAGE_CONVERSATION_TYPE_GROUP => 1,
+                        api::MESSAGE_CONVERSATION_TYPE_SELF => 0,
-                    api::MESSAGE_CONVERSATION_TYPE_SELF => 0
+                    ],
+                ],
+                'expectedunreadcounts' => [
-                ]],
+                    'favourites' => 0,
-                'expectedunreadcounts' => ['favourites' => 0, 'types' => [
+                    'types' => [
-                    api::MESSAGE_CONVERSATION_TYPE_INDIVIDUAL => 1,
+                        api::MESSAGE_CONVERSATION_TYPE_INDIVIDUAL => 1,
+                        api::MESSAGE_CONVERSATION_TYPE_GROUP => 1,
-                    api::MESSAGE_CONVERSATION_TYPE_GROUP => 1,
+                        api::MESSAGE_CONVERSATION_TYPE_SELF => 0,
-                    api::MESSAGE_CONVERSATION_TYPE_SELF => 0
+                    ],
-                ]],
+                ],
-                'deletedusers' => []
+                'deletedusers' => [],
             ],
             'All conversation types, delete all messages from individual non-favourited, no messages remaining' => [
-                'conversationConfigs' => $conversations,
+                'conversationconfigs' => $conversations,
                 'deletemessagesuser' => $user1,
                 'deletemessages' => [3, 4, 5],
+                'arguments' => [$user1],
+                'expectedcounts' => [
-                'arguments' => [$user1],
+                    'favourites' => 2,
-                'expectedcounts' => ['favourites' => 2, 'types' => [
+                    'types' => [
-                    api::MESSAGE_CONVERSATION_TYPE_INDIVIDUAL => 0,
+                        api::MESSAGE_CONVERSATION_TYPE_INDIVIDUAL => 0,
+                        api::MESSAGE_CONVERSATION_TYPE_GROUP => 1,
-                    api::MESSAGE_CONVERSATION_TYPE_GROUP => 1,
+                        api::MESSAGE_CONVERSATION_TYPE_SELF => 0,
-                    api::MESSAGE_CONVERSATION_TYPE_SELF => 0
+                    ],
+                ],
+                'expectedunreadcounts' => [
-                ]],
+                    'favourites' => 1,
-                'expectedunreadcounts' => ['favourites' => 1, 'types' => [
+                    'types' => [
-                    api::MESSAGE_CONVERSATION_TYPE_INDIVIDUAL => 0,
+                        api::MESSAGE_CONVERSATION_TYPE_INDIVIDUAL => 0,
+                        api::MESSAGE_CONVERSATION_TYPE_GROUP => 1,
-                    api::MESSAGE_CONVERSATION_TYPE_GROUP => 1,
+                        api::MESSAGE_CONVERSATION_TYPE_SELF => 0,
-                    api::MESSAGE_CONVERSATION_TYPE_SELF => 0
+                    ],
-                ]],
+                ],
-                'deletedusers' => []
+                'deletedusers' => [],
             ],
             'All conversation types, delete all messages from individual favourited, no messages remaining, different user' => [
-                'conversationConfigs' => $conversations,
+                'conversationconfigs' => $conversations,
                 'deletemessagesuser' => $user1,
                 'deletemessages' => [0, 1, 2],
+                'arguments' => [$user2],
+                'expectedcounts' => [
-                'arguments' => [$user2],
+                    'favourites' => 1,
-                'expectedcounts' => ['favourites' => 1, 'types' => [
+                    'types' => [
-                    api::MESSAGE_CONVERSATION_TYPE_INDIVIDUAL => 1,
+                        api::MESSAGE_CONVERSATION_TYPE_INDIVIDUAL => 1,
+                        api::MESSAGE_CONVERSATION_TYPE_GROUP => 2,
-                    api::MESSAGE_CONVERSATION_TYPE_GROUP => 2,
+                        api::MESSAGE_CONVERSATION_TYPE_SELF => 0,
-                    api::MESSAGE_CONVERSATION_TYPE_SELF => 0
+                    ],
+                ],
+                'expectedunreadcounts' => [
-                ]],
+                    'favourites' => 0,
-                'expectedunreadcounts' => ['favourites' => 0, 'types' => [
+                    'types' => [
-                    api::MESSAGE_CONVERSATION_TYPE_INDIVIDUAL => 1,
+                        api::MESSAGE_CONVERSATION_TYPE_INDIVIDUAL => 1,
+                        api::MESSAGE_CONVERSATION_TYPE_GROUP => 2,
-                    api::MESSAGE_CONVERSATION_TYPE_GROUP => 2,
+                        api::MESSAGE_CONVERSATION_TYPE_SELF => 0,
-                    api::MESSAGE_CONVERSATION_TYPE_SELF => 0
+                    ],
-                ]],
+                ],
-                'deletedusers' => []
+                'deletedusers' => [],
             ],
             'All conversation types, delete all messages from individual non-favourited, no messages remaining, different user' => [
-                'conversationConfigs' => $conversations,
+                'conversationconfigs' => $conversations,
                 'deletemessagesuser' => $user1,
                 'deletemessages' => [3, 4, 5],
+                'arguments' => [$user3],
+                'expectedcounts' => [
-                'arguments' => [$user3],
+                    'favourites' => 1,
-                'expectedcounts' => ['favourites' => 1, 'types' => [
+                    'types' => [
-                    api::MESSAGE_CONVERSATION_TYPE_INDIVIDUAL => 1,
+                        api::MESSAGE_CONVERSATION_TYPE_INDIVIDUAL => 1,
+                        api::MESSAGE_CONVERSATION_TYPE_GROUP => 2,
-                    api::MESSAGE_CONVERSATION_TYPE_GROUP => 2,
+                        api::MESSAGE_CONVERSATION_TYPE_SELF => 0,
-                    api::MESSAGE_CONVERSATION_TYPE_SELF => 0
+                    ],
+                ],
+                'expectedunreadcounts' => [
-                ]],
+                    'favourites' => 0,
-                'expectedunreadcounts' => ['favourites' => 0, 'types' => [
+                    'types' => [
-                    api::MESSAGE_CONVERSATION_TYPE_INDIVIDUAL => 1,
+                        api::MESSAGE_CONVERSATION_TYPE_INDIVIDUAL => 1,
+                        api::MESSAGE_CONVERSATION_TYPE_GROUP => 2,
-                    api::MESSAGE_CONVERSATION_TYPE_GROUP => 2,
+                        api::MESSAGE_CONVERSATION_TYPE_SELF => 0,
-                    api::MESSAGE_CONVERSATION_TYPE_SELF => 0
+                    ],
-                ]],
+                ],
-                'deletedusers' => []
+                'deletedusers' => [],
             ],
             'All conversation types, delete some messages from group non-favourited, messages remaining,' => [
-                'conversationConfigs' => $conversations,
+                'conversationconfigs' => $conversations,
                 'deletemessagesuser' => $user1,
                 'deletemessages' => [6, 7],
+                'arguments' => [$user1],
+                'expectedcounts' => [
-                'arguments' => [$user1],
+                    'favourites' => 2,
-                'expectedcounts' => ['favourites' => 2, 'types' => [
+                    'types' => [
-                    api::MESSAGE_CONVERSATION_TYPE_INDIVIDUAL => 1,
+                        api::MESSAGE_CONVERSATION_TYPE_INDIVIDUAL => 1,
+                        api::MESSAGE_CONVERSATION_TYPE_GROUP => 1,
-                    api::MESSAGE_CONVERSATION_TYPE_GROUP => 1,
+                        api::MESSAGE_CONVERSATION_TYPE_SELF => 0,
-                    api::MESSAGE_CONVERSATION_TYPE_SELF => 0
+                    ],
+                ],
+                'expectedunreadcounts' => [
-                ]],
+                    'favourites' => 1,
-                'expectedunreadcounts' => ['favourites' => 1, 'types' => [
+                    'types' => [
-                    api::MESSAGE_CONVERSATION_TYPE_INDIVIDUAL => 1,
+                        api::MESSAGE_CONVERSATION_TYPE_INDIVIDUAL => 1,
+                        api::MESSAGE_CONVERSATION_TYPE_GROUP => 1,
-                    api::MESSAGE_CONVERSATION_TYPE_GROUP => 1,
+                        api::MESSAGE_CONVERSATION_TYPE_SELF => 0,
-                    api::MESSAGE_CONVERSATION_TYPE_SELF => 0
+                    ],
-                ]],
+                ],
-                'deletedusers' => []
+                'deletedusers' => [],
             ],
             'All conversation types, delete all messages from group non-favourited, no messages remaining,' => [
-                'conversationConfigs' => $conversations,
+                'conversationconfigs' => $conversations,
                 'deletemessagesuser' => $user1,
                 'deletemessages' => [6, 7, 8, 9],
+                'arguments' => [$user1],
+                'expectedcounts' => [
-                'arguments' => [$user1],
+                    'favourites' => 2,
-                'expectedcounts' => ['favourites' => 2, 'types' => [
+                    'types' => [
-                    api::MESSAGE_CONVERSATION_TYPE_INDIVIDUAL => 1,
+                        api::MESSAGE_CONVERSATION_TYPE_INDIVIDUAL => 1,
+                        api::MESSAGE_CONVERSATION_TYPE_GROUP => 1,
-                    api::MESSAGE_CONVERSATION_TYPE_GROUP => 1,
+                        api::MESSAGE_CONVERSATION_TYPE_SELF => 0,
-                    api::MESSAGE_CONVERSATION_TYPE_SELF => 0
+                    ],
+                ],
+                'expectedunreadcounts' => [
-                ]],
+                    'favourites' => 1,
-                'expectedunreadcounts' => ['favourites' => 1, 'types' => [
+                    'types' => [
-                    api::MESSAGE_CONVERSATION_TYPE_INDIVIDUAL => 1,
+                        api::MESSAGE_CONVERSATION_TYPE_INDIVIDUAL => 1,
+                        api::MESSAGE_CONVERSATION_TYPE_GROUP => 0,
-                    api::MESSAGE_CONVERSATION_TYPE_GROUP => 0,
+                        api::MESSAGE_CONVERSATION_TYPE_SELF => 0,
-                    api::MESSAGE_CONVERSATION_TYPE_SELF => 0
+                    ],
-                ]],
+                ],
-                'deletedusers' => []
+                'deletedusers' => [],
             ],
             'All conversation types, another user soft deleted' => [
-                'conversationConfigs' => $conversations,
+                'conversationconfigs' => $conversations,
                 'deletemessagesuser' => null,
                 'deletemessages' => [],
+                'arguments' => [$user1],
+                'expectedcounts' => [
-                'arguments' => [$user1],
+                    'favourites' => 2,
-                'expectedcounts' => ['favourites' => 2, 'types' => [
+                    'types' => [
-                    api::MESSAGE_CONVERSATION_TYPE_INDIVIDUAL => 1,
+                        api::MESSAGE_CONVERSATION_TYPE_INDIVIDUAL => 1,
+                        api::MESSAGE_CONVERSATION_TYPE_GROUP => 1,
-                    api::MESSAGE_CONVERSATION_TYPE_GROUP => 1,
+                        api::MESSAGE_CONVERSATION_TYPE_SELF => 0,
-                    api::MESSAGE_CONVERSATION_TYPE_SELF => 0
+                    ],
+                ],
+                'expectedunreadcounts' => [
-                ]],
+                    'favourites' => 1,
-                'expectedunreadcounts' => ['favourites' => 1, 'types' => [
+                    'types' => [
-                    api::MESSAGE_CONVERSATION_TYPE_INDIVIDUAL => 1,
+                        api::MESSAGE_CONVERSATION_TYPE_INDIVIDUAL => 1,
+                        api::MESSAGE_CONVERSATION_TYPE_GROUP => 1,
-                    api::MESSAGE_CONVERSATION_TYPE_GROUP => 1,
+                        api::MESSAGE_CONVERSATION_TYPE_SELF => 0,
-                    api::MESSAGE_CONVERSATION_TYPE_SELF => 0
+                    ],
-                ]],
+                ],
-                'deletedusers' => [$user2]
+                'deletedusers' => [$user2],
             ],
             'All conversation types, all group users soft deleted' => [
-                'conversationConfigs' => $conversations,
+                'conversationconfigs' => $conversations,
                 'deletemessagesuser' => null,
                 'deletemessages' => [],
+                'arguments' => [$user1],
+                'expectedcounts' => [
-                'arguments' => [$user1],
+                    'favourites' => 2,
-                'expectedcounts' => ['favourites' => 2, 'types' => [
+                    'types' => [
-                    api::MESSAGE_CONVERSATION_TYPE_INDIVIDUAL => 1,
+                        api::MESSAGE_CONVERSATION_TYPE_INDIVIDUAL => 1,
+                        api::MESSAGE_CONVERSATION_TYPE_GROUP => 1,
-                    api::MESSAGE_CONVERSATION_TYPE_GROUP => 1,
+                        api::MESSAGE_CONVERSATION_TYPE_SELF => 0,
-                    api::MESSAGE_CONVERSATION_TYPE_SELF => 0
+                    ],
+                ],
+                'expectedunreadcounts' => [
-                ]],
+                    'favourites' => 1,
-                'expectedunreadcounts' => ['favourites' => 1, 'types' => [
+                    'types' => [
-                    api::MESSAGE_CONVERSATION_TYPE_INDIVIDUAL => 1,
+                        api::MESSAGE_CONVERSATION_TYPE_INDIVIDUAL => 1,
+                        api::MESSAGE_CONVERSATION_TYPE_GROUP => 1,
-                    api::MESSAGE_CONVERSATION_TYPE_GROUP => 1,
+                        api::MESSAGE_CONVERSATION_TYPE_SELF => 0,
-                    api::MESSAGE_CONVERSATION_TYPE_SELF => 0
+                    ],
-                ]],
+                ],
-                'deletedusers' => [$user2, $user3, $user4]
+                'deletedusers' => [$user2, $user3, $user4],
             ],
             'Group conversation which is disabled, favourited' => [
-                'conversationConfigs' => $conversations,
+                'conversationconfigs' => $conversations,
                 'deletemessagesuser' => null,
                 'deletemessages' => [],
+                'arguments' => [$user6],
+                'expectedcounts' => [
-                'arguments' => [$user6],
+                    'favourites' => 1,
-                'expectedcounts' => ['favourites' => 1, 'types' => [
+                    'types' => [
-                    api::MESSAGE_CONVERSATION_TYPE_INDIVIDUAL => 0,
+                        api::MESSAGE_CONVERSATION_TYPE_INDIVIDUAL => 0,
+                        api::MESSAGE_CONVERSATION_TYPE_GROUP => 0,
-                    api::MESSAGE_CONVERSATION_TYPE_GROUP => 0,
+                        api::MESSAGE_CONVERSATION_TYPE_SELF => 0,
-                    api::MESSAGE_CONVERSATION_TYPE_SELF => 0
+                    ],
+                ],
+                'expectedunreadcounts' => [
-                ]],
+                    'favourites' => 0,
-                'expectedunreadcounts' => ['favourites' => 0, 'types' => [
+                    'types' => [
-                    api::MESSAGE_CONVERSATION_TYPE_INDIVIDUAL => 0,
+                        api::MESSAGE_CONVERSATION_TYPE_INDIVIDUAL => 0,
+                        api::MESSAGE_CONVERSATION_TYPE_GROUP => 0,
-                    api::MESSAGE_CONVERSATION_TYPE_GROUP => 0,
+                        api::MESSAGE_CONVERSATION_TYPE_SELF => 0,
-                    api::MESSAGE_CONVERSATION_TYPE_SELF => 0
+                    ],
-                ]],
+                ],
-                'deletedusers' => []
+                'deletedusers' => [],
             ],
             'Group conversation which is disabled, non-favourited' => [
-                'conversationConfigs' => $conversations,
+                'conversationconfigs' => $conversations,
                 'deletemessagesuser' => null,
                 'deletemessages' => [],
+                'arguments' => [$user7],
+                'expectedcounts' => [
-                'arguments' => [$user7],
+                    'favourites' => 1,
-                'expectedcounts' => ['favourites' => 1, 'types' => [
+                    'types' => [
-                    api::MESSAGE_CONVERSATION_TYPE_INDIVIDUAL => 0,
+                        api::MESSAGE_CONVERSATION_TYPE_INDIVIDUAL => 0,
+                        api::MESSAGE_CONVERSATION_TYPE_GROUP => 0,
-                    api::MESSAGE_CONVERSATION_TYPE_GROUP => 0,
+                        api::MESSAGE_CONVERSATION_TYPE_SELF => 0,
-                    api::MESSAGE_CONVERSATION_TYPE_SELF => 0
+                    ],
+                ],
+                'expectedunreadcounts' => [
-                ]],
+                    'favourites' => 0,
-                'expectedunreadcounts' => ['favourites' => 0, 'types' => [
+                    'types' => [
-                    api::MESSAGE_CONVERSATION_TYPE_INDIVIDUAL => 0,
+                        api::MESSAGE_CONVERSATION_TYPE_INDIVIDUAL => 0,
+                        api::MESSAGE_CONVERSATION_TYPE_GROUP => 0,
-                    api::MESSAGE_CONVERSATION_TYPE_GROUP => 0,
+                        api::MESSAGE_CONVERSATION_TYPE_SELF => 0,
-                    api::MESSAGE_CONVERSATION_TYPE_SELF => 0
+                    ],
-                ]],
+                ],
-                'deletedusers' => []
+                'deletedusers' => [],
             ],
             'Conversation with self' => [
-                'conversationConfigs' => $conversations,
+                'conversationconfigs' => $conversations,
                 'deletemessagesuser' => null,
                 'deletemessages' => [],
+                'arguments' => [$user8],
+                'expectedcounts' => [
-                'arguments' => [$user8],
+                    'favourites' => 0,
-                'expectedcounts' => ['favourites' => 0, 'types' => [
+                    'types' => [
-                    api::MESSAGE_CONVERSATION_TYPE_INDIVIDUAL => 0,
+                        api::MESSAGE_CONVERSATION_TYPE_INDIVIDUAL => 0,
+                        api::MESSAGE_CONVERSATION_TYPE_GROUP => 0,
-                    api::MESSAGE_CONVERSATION_TYPE_GROUP => 0,
+                        api::MESSAGE_CONVERSATION_TYPE_SELF => 1,
-                    api::MESSAGE_CONVERSATION_TYPE_SELF => 1
+                    ],
+                ],
+                'expectedunreadcounts' => [
-                ]],
+                    'favourites' => 0,
-                'expectedunreadcounts' => ['favourites' => 0, 'types' => [
+                    'types' => [
-                    api::MESSAGE_CONVERSATION_TYPE_INDIVIDUAL => 0,
+                        api::MESSAGE_CONVERSATION_TYPE_INDIVIDUAL => 0,
+                        api::MESSAGE_CONVERSATION_TYPE_GROUP => 0,
-                    api::MESSAGE_CONVERSATION_TYPE_GROUP => 0,
+                        api::MESSAGE_CONVERSATION_TYPE_SELF => 0,
-                    api::MESSAGE_CONVERSATION_TYPE_SELF => 0
+                    ],
-                ]],
+                ],
-                'deletedusers' => []
+                'deletedusers' => [],
             ],
         ];
             $generator->create_user(),
             $generator->create_user(),
             $generator->create_user(),
             $generator->create_user(),
             $generator->create_user(),
-            $generator->create_user()
+            $generator->create_user(),
         ];
         $deleteuser = !is_null($deletemessagesuser) ? $users[$deletemessagesuser] : null;
         $arguments[0] = $users[$arguments[0]]->id;
         $messageids = [];
         foreach ($conversationconfigs as $config) {
             $conversation = api::create_conversation(
                 $config['type'],
-                array_map(function($userindex) use ($users) {
+                array_map(function ($userindex) use ($users) {
                     return $users[$userindex]->id;
                 }, $config['users']),
                 null,
                 ($config['enabled'] ?? true)
                 $messageids[] = testhelper::send_fake_message_to_conversation($userfrom, $conversation->id);
+            }
             // Remove the self conversations created by the generator,
             // so we can choose to set that ourself and honour the original intention of the test.
-            $userids = array_map(function($userindex) use ($users) {
+            $userids = array_map(function ($userindex) use ($users) {
                 return $users[$userindex]->id;
             }, $config['users']);
             foreach ($userids as $userid) {
                 if ($conversation->type == api::MESSAGE_CONVERSATION_TYPE_SELF) {
+        }
         $counts = api::get_conversation_counts(...$arguments);
+        $this->assertEquals($expectedcounts['favourites'], $counts['favourites']);
-        $this->assertEquals($expectedcounts['favourites'], $counts['favourites']);
+        $this->assertEquals(
+            $expectedcounts['types'][api::MESSAGE_CONVERSATION_TYPE_INDIVIDUAL],
+            $counts['types'][api::MESSAGE_CONVERSATION_TYPE_INDIVIDUAL]
-        $this->assertEquals($expectedcounts['types'][api::MESSAGE_CONVERSATION_TYPE_INDIVIDUAL],
+        );
-            $counts['types'][api::MESSAGE_CONVERSATION_TYPE_INDIVIDUAL]);
+        $this->assertEquals(
+            $expectedcounts['types'][api::MESSAGE_CONVERSATION_TYPE_GROUP],
+            $counts['types'][api::MESSAGE_CONVERSATION_TYPE_GROUP]
-        $this->assertEquals($expectedcounts['types'][api::MESSAGE_CONVERSATION_TYPE_GROUP],
+        );
-            $counts['types'][api::MESSAGE_CONVERSATION_TYPE_GROUP]);
+        $this->assertEquals(
+            $expectedcounts['types'][api::MESSAGE_CONVERSATION_TYPE_SELF],
-        $this->assertEquals($expectedcounts['types'][api::MESSAGE_CONVERSATION_TYPE_SELF],
+            $counts['types'][api::MESSAGE_CONVERSATION_TYPE_SELF]
-            $counts['types'][api::MESSAGE_CONVERSATION_TYPE_SELF]);
+        );
+    }
             $generator->create_user(),
             $generator->create_user(),
             $generator->create_user(),
             $generator->create_user(),
             $generator->create_user(),
-            $generator->create_user()
+            $generator->create_user(),
         ];
         $deleteuser = !is_null($deletemessagesuser) ? $users[$deletemessagesuser] : null;
         $this->setUser($users[$arguments[0]]);
         $messageids = [];
         foreach ($conversationconfigs as $config) {
             $conversation = api::create_conversation(
                 $config['type'],
-                array_map(function($userindex) use ($users) {
+                array_map(function ($userindex) use ($users) {
                     return $users[$userindex]->id;
                 }, $config['users']),
                 null,
                 ($config['enabled'] ?? true)
+        }
         $counts = api::get_unread_conversation_counts(...$arguments);
+        $this->assertEquals($expectedunreadcounts['favourites'], $counts['favourites']);
-        $this->assertEquals($expectedunreadcounts['favourites'], $counts['favourites']);
+        $this->assertEquals(
+            $expectedunreadcounts['types'][api::MESSAGE_CONVERSATION_TYPE_INDIVIDUAL],
+            $counts['types'][api::MESSAGE_CONVERSATION_TYPE_INDIVIDUAL]
-        $this->assertEquals($expectedunreadcounts['types'][api::MESSAGE_CONVERSATION_TYPE_INDIVIDUAL],
+        );
-            $counts['types'][api::MESSAGE_CONVERSATION_TYPE_INDIVIDUAL]);
+        $this->assertEquals(
+            $expectedunreadcounts['types'][api::MESSAGE_CONVERSATION_TYPE_GROUP],
+            $counts['types'][api::MESSAGE_CONVERSATION_TYPE_GROUP]
-        $this->assertEquals($expectedunreadcounts['types'][api::MESSAGE_CONVERSATION_TYPE_GROUP],
+        );
-            $counts['types'][api::MESSAGE_CONVERSATION_TYPE_GROUP]);
+        $this->assertEquals(
+            $expectedunreadcounts['types'][api::MESSAGE_CONVERSATION_TYPE_SELF],
-        $this->assertEquals($expectedunreadcounts['types'][api::MESSAGE_CONVERSATION_TYPE_SELF],
+            $counts['types'][api::MESSAGE_CONVERSATION_TYPE_SELF]
-            $counts['types'][api::MESSAGE_CONVERSATION_TYPE_SELF]);
+        );
+    }
         $user2 = $this->getDataGenerator()->create_user();
         $this->getDataGenerator()->enrol_user($user1->id, $course1->id);
         $this->getDataGenerator()->enrol_user($user2->id, $course1->id);
-        $group1 = $this->getDataGenerator()->create_group(array('courseid' => $course1->id, 'enablemessaging' => 1));
+        $group1 = $this->getDataGenerator()->create_group(['courseid' => $course1->id, 'enablemessaging' => 1]);
-        $group2 = $this->getDataGenerator()->create_group(array('courseid' => $course1->id, 'enablemessaging' => 1));
+        $group2 = $this->getDataGenerator()->create_group(['courseid' => $course1->id, 'enablemessaging' => 1]);
         // Add users to both groups.
-        $this->getDataGenerator()->create_group_member(array('groupid' => $group1->id, 'userid' => $user1->id));
+        $this->getDataGenerator()->create_group_member(['groupid' => $group1->id, 'userid' => $user1->id]);
-        $this->getDataGenerator()->create_group_member(array('groupid' => $group1->id, 'userid' => $user2->id));
+        $this->getDataGenerator()->create_group_member(['groupid' => $group1->id, 'userid' => $user2->id]);
-        $this->getDataGenerator()->create_group_member(array('groupid' => $group2->id, 'userid' => $user1->id));
+        $this->getDataGenerator()->create_group_member(['groupid' => $group2->id, 'userid' => $user1->id]);
-        $this->getDataGenerator()->create_group_member(array('groupid' => $group2->id, 'userid' => $user2->id));
+        $this->getDataGenerator()->create_group_member(['groupid' => $group2->id, 'userid' => $user2->id]);
         $this->assertEquals(1, $DB->count_records('messages', ['id' => $g2m3]));
         $this->assertEquals(1, $DB->count_records('messages', ['id' => $g2m4]));
         // Confirm favourites were deleted for both users.
         $user1service = \core_favourites\service_factory::get_service_for_user_context(\context_user::instance($user1->id));
+        $this->assertFalse($user1service->favourite_exists(
+            'core_message',
+            'message_conversations',
-        $this->assertFalse($user1service->favourite_exists('core_message', 'message_conversations', $groupconversation1->id,
+            $groupconversation1->id,
+            $coursecontext1
-            $coursecontext1));
+        ));
         $user2service = \core_favourites\service_factory::get_service_for_user_context(\context_user::instance($user1->id));
+        $this->assertFalse($user2service->favourite_exists(
+            'core_message',
+            'message_conversations',
-        $this->assertFalse($user2service->favourite_exists('core_message', 'message_conversations', $groupconversation1->id,
+            $groupconversation1->id,
+            $coursecontext1
-            $coursecontext1));
+        ));
+    }
     /**
      * Tests the user can delete message for all users as a teacher.
      */
     public function test_can_delete_message_for_all_users_teacher(): void {
         global $DB;
         $this->resetAfterTest(true);
         // Create fake data to test it.
-        list($teacher, $student1, $student2, $convgroup, $convindividual) = $this->create_delete_message_test_data();
+        [$teacher, $student1, $student2, $convgroup, $convindividual] = $this->create_delete_message_test_data();
      */
     public function test_can_delete_message_for_all_users_student(): void {
         $this->resetAfterTest(true);
         // Create fake data to test it.
-        list($teacher, $student1, $student2, $convgroup, $convindividual) = $this->create_delete_message_test_data();
+        [$teacher, $student1, $student2, $convgroup, $convindividual] = $this->create_delete_message_test_data();
         // Set as the first user.
     public function test_delete_message_for_all_users_group_conversation(): void {
         global $DB;
         $this->resetAfterTest(true);
         // Create fake data to test it.
-        list($teacher, $student1, $student2, $convgroup, $convindividual) = $this->create_delete_message_test_data();
+        [$teacher, $student1, $student2, $convgroup, $convindividual] = $this->create_delete_message_test_data();
         // Send 3 messages to a group conversation.
         $mgid1 = testhelper::send_fake_message_to_conversation($teacher, $convgroup->id);
     public function test_delete_message_for_all_users_individual_conversation(): void {
         global $DB;
         $this->resetAfterTest(true);
         // Create fake data to test it.
-        list($teacher, $student1, $student2, $convgroup, $convindividual) = $this->create_delete_message_test_data();
+        [$teacher, $student1, $student2, $convgroup, $convindividual] = $this->create_delete_message_test_data();
         // Send 2 messages in a individual conversation.
         $this->getDataGenerator()->enrol_user($teacher->id, $course->id, 'editingteacher');
         $this->getDataGenerator()->enrol_user($student1->id, $course->id, 'student');
         $this->getDataGenerator()->enrol_user($student2->id, $course->id, 'student');
         // Create a group and added the users into.
-        $group1 = $this->getDataGenerator()->create_group(array('courseid' => $course->id));
+        $group1 = $this->getDataGenerator()->create_group(['courseid' => $course->id]);
         groups_add_member($group1->id, $teacher->id);
         groups_add_member($group1->id, $student1->id);
         groups_add_member($group1->id, $student2->id);
         // Create a group conversation linked with the course.
         $convgroup = api::create_conversation(
+            api::MESSAGE_CONVERSATION_TYPE_GROUP,
-            api::MESSAGE_CONVERSATION_TYPE_GROUP,
+            [$teacher->id, $student1->id, $student2->id],
-            [$teacher->id, $student1->id, $student2->id],
+            'Group test delete for everyone',
-            'Group test delete for everyone', api::MESSAGE_CONVERSATION_ENABLED,
+            api::MESSAGE_CONVERSATION_ENABLED,
             'core_group',
             'groups',
             $group1->id,

Proyectos de Subversion Moodle

(root)/message/tests/api_test.php – Rev 11 → 1441