Merge branch 'master' into sualko-patch-1

Author: FelixJacobi

src/Core/Attendee.php

@@ -58,7 +58,7 @@ class Attendee
     /**
      * @var array
      */
-    private $customData;
+    private $customData = [];
 
     /**
      * @var string

src/Core/Meeting.php

@@ -379,6 +379,36 @@ public function getAttendees()
         return $this->attendees;
     }
 
+    /**
+     * Moderators of Meeting - Subset of Attendees
+     * @return Attendee[]
+     */
+    public function getModerators(): array
+    {
+        $attendees = $this->getAttendees();
+
+        $moderators = array_filter($attendees, function ($attendee) {
+            return $attendee->getRole() === 'MODERATOR';
+        });
+
+        return array_values($moderators);
+    }
+
+    /**
+     * Viewers of Meeting - Subset of Attendees
+     * @return Attendee[]
+     */
+    public function getViewers(): array
+    {
+        $attendees = $this->getAttendees();
+
+        $viewers = array_filter($attendees, function ($attendee) {
+            return $attendee->getRole() === 'VIEWER';
+        });
+
+        return array_values($viewers);
+    }
+
     /**
      * @return array
      */

tests/fixtures/get_meeting_info.xml

@@ -50,6 +50,28 @@
                 <customStyle>a:focus{color:#0181eb}</customStyle>
             </customdata>
         </attendee>
+        <attendee>
+            <userID>srfd2uad4x9s</userID>
+            <fullName>Peter Parker</fullName>
+            <role>VIEWER</role>
+            <isPresenter>false</isPresenter>
+            <isListeningOnly>false</isListeningOnly>
+            <hasJoinedVoice>true</hasJoinedVoice>
+            <hasVideo>true</hasVideo>
+            <clientType>HTML5</clientType>
+            <customdata></customdata>
+        </attendee>
+        <attendee>
+            <userID>6ntb564ibhnq</userID>
+            <fullName>Bruce Wayne</fullName>
+            <role>VIEWER</role>
+            <isPresenter>false</isPresenter>
+            <isListeningOnly>true</isListeningOnly>
+            <hasJoinedVoice>false</hasJoinedVoice>
+            <hasVideo>false</hasVideo>
+            <clientType>HTML5</clientType>
+            <customdata></customdata>
+        </attendee>
     </attendees>
     <isBreakout>true</isBreakout>
     <parentMeetingID>b97b512f2c92c0ffe7a3476152525807daa1c676-1524213151782</parentMeetingID>

tests/unit/Responses/GetMeetingInfoResponseTest.php

@@ -36,7 +36,7 @@ public function setUp(): void
     public function testGetMeetingInfoResponseContent()
     {
         $this->assertInstanceOf('BigBlueButton\Core\Meeting', $this->meetingInfo->getMeeting());
-        $this->assertCount(2, $this->meetingInfo->getMeeting()->getAttendees());
+        $this->assertCount(4, $this->meetingInfo->getMeeting()->getAttendees());
         $this->assertEquals('SUCCESS', $this->meetingInfo->getReturnCode());
 
         $info = $this->meetingInfo->getMeeting();
@@ -68,6 +68,8 @@ public function testGetMeetingInfoResponseContent()
 
     public function testMeetingAttendeeContent()
     {
+        $this->assertCount(4, $this->meetingInfo->getMeeting()->getAttendees());
+
         $anAttendee = $this->meetingInfo->getMeeting()->getAttendees()[1];
 
         $this->assertEquals('xi7y7gpmyq1g', $anAttendee->getUserId());
@@ -78,7 +80,6 @@ public function testMeetingAttendeeContent()
         $this->assertEquals(true, $anAttendee->hasJoinedVoice());
         $this->assertEquals(false, $anAttendee->hasVideo());
         $this->assertEquals('FLASH', $anAttendee->getClientType());
-        $this->assertCount(2, $this->meetingInfo->getMeeting()->getAttendees());
 
         $customData = $anAttendee->getCustomData();
         $this->assertEquals(3, sizeof($customData));
@@ -87,6 +88,36 @@ public function testMeetingAttendeeContent()
         $this->assertEquals('a:focus{color:#0181eb}', $customData['customStyle']);
     }
 
+    public function testMeetingModerators(): void
+    {
+        $moderators = $this->meetingInfo->getMeeting()->getModerators();
+
+        $this->assertCount(2, $moderators);
+
+        $firstModerator = $moderators[0];
+        $this->assertEquals('Ernie Abernathy', $firstModerator->getFullName());
+        $this->assertEquals('MODERATOR', $firstModerator->getRole());
+
+        $secondModerator = $moderators[1];
+        $this->assertEquals('Barrett Kutch', $secondModerator->getFullName());
+        $this->assertEquals('MODERATOR', $secondModerator->getRole());
+    }
+
+    public function testMeetingViewers(): void
+    {
+        $viewers = $this->meetingInfo->getMeeting()->getViewers();
+
+        $this->assertCount(2, $viewers);
+
+        $firstViewer = $viewers[0];
+        $this->assertEquals('Peter Parker', $firstViewer->getFullName());
+        $this->assertEquals('VIEWER', $firstViewer->getRole());
+
+        $secondViewer = $viewers[1];
+        $this->assertEquals('Bruce Wayne', $secondViewer->getFullName());
+        $this->assertEquals('VIEWER', $secondViewer->getRole());
+    }
+
     public function testGetMeetingInfoResponseTypes()
     {
         $info = $this->meetingInfo->getMeeting();