Remove MeetingInfo class and use Meeting class instead as getMeetings and getMeetingInfo returns the same set of information since BBB 2.0

Author: GhaziTriki

src/Core/Meeting.php

@@ -25,6 +25,12 @@
  */
 class Meeting
 {
+
+    /**
+     * @var \SimpleXMLElement
+     */
+    protected $rawXml;
+
     /**
      * @var string
      */
@@ -105,12 +111,53 @@ class Meeting
      */
     private $hasUserJoined;
 
+    /**
+     * @var string
+     */
+    private $internalMeetingId;
+
+    /**
+     * @var bool
+     */
+    private $isRecording;
+
+    /**
+     * @var double
+     */
+    private $startTime;
+
+    /**
+     * @var double
+     */
+    private $endTime;
+
+    /**
+     * @var int
+     */
+    private $maxUsers;
+
+    /**
+     * @var int
+     */
+    private $moderatorCount;
+
+    /**
+     * @var Attendee[]
+     */
+    private $attendees;
+
+    /**
+     * @var array
+     */
+    private $metas;
+
     /**
      * Meeting constructor.
      * @param $xml \SimpleXMLElement
      */
     public function __construct($xml)
     {
+        $this->rawXml                = $xml;
         $this->meetingId             = $xml->meetingID->__toString();
         $this->meetingName           = $xml->meetingName->__toString();
         $this->creationTime          = (float) $xml->createTime;
@@ -127,6 +174,12 @@ public function __construct($xml)
         $this->videoCount            = (int) $xml->videoCount;
         $this->duration              = (int) $xml->duration;
         $this->hasUserJoined         = $xml->hasUserJoined->__toString() === 'true';
+        $this->internalMeetingId     = $xml->internalMeetingID->__toString();
+        $this->isRecording           = $xml->recording->__toString() === 'true';
+        $this->startTime             = (float) $xml->startTime;
+        $this->endTime               = (float) $xml->endTime;
+        $this->maxUsers              = (int) $xml->maxUsers->__toString();
+        $this->moderatorCount        = (int) $xml->moderatorCount->__toString();
     }
 
     /**
@@ -256,4 +309,82 @@ public function hasUserJoined()
     {
         return $this->hasUserJoined;
     }
+
+    /**
+     * @return string
+     */
+    public function getInternalMeetingId()
+    {
+        return $this->internalMeetingId;
+    }
+
+    /**
+     * @return bool
+     */
+    public function isRecording()
+    {
+        return $this->isRecording;
+    }
+
+    /**
+     * @return double
+     */
+    public function getStartTime()
+    {
+        return $this->startTime;
+    }
+
+    /**
+     * @return double
+     */
+    public function getEndTime()
+    {
+        return $this->endTime;
+    }
+
+    /**
+     * @return int
+     */
+    public function getMaxUsers()
+    {
+        return $this->maxUsers;
+    }
+
+    /**
+     * @return int
+     */
+    public function getModeratorCount()
+    {
+        return $this->moderatorCount;
+    }
+
+    /**
+     * @return Attendee[]
+     */
+    public function getAttendees()
+    {
+        if ($this->attendees === null) {
+            $this->attendees = [];
+            foreach ($this->rawXml->attendees->attendee as $attendeeXml) {
+                $this->attendees[] = new Attendee($attendeeXml);
+            }
+        }
+
+        return $this->attendees;
+    }
+
+    /**
+     * @return array
+     */
+    public function getMetas()
+    {
+        if ($this->metas === null) {
+            $this->metas = [];
+            foreach ($this->rawXml->metadata->children() as $metadataXml) {
+                $this->metas[$metadataXml->getName()] = $metadataXml->__toString();
+            }
+        }
+
+        return $this->metas;
+    }
 }

src/Core/MeetingInfo.php

@@ -18,8 +18,7 @@
  */
 namespace BigBlueButton\Responses;
 
-use BigBlueButton\Core\Attendee;
-use BigBlueButton\Core\MeetingInfo;
+use BigBlueButton\Core\Meeting;
 
 /**
  * Class GetMeetingInfoResponse
@@ -28,59 +27,19 @@
 class GetMeetingInfoResponse extends BaseResponse
 {
     /**
-     * @var MeetingInfo
+     * @var Meeting
      */
-    private $meetingInfo;
+    private $meeting;
 
     /**
-     * @var Attendee[]
+     * @return Meeting
      */
-    private $attendees;
-
-    /**
-     * @var array
-     */
-    private $metas;
-
-    /**
-     * @return MeetingInfo
-     */
-    public function getMeetingInfo()
-    {
-        if ($this->meetingInfo === null) {
-            $this->meetingInfo = new MeetingInfo($this->rawXml);
-        }
-
-        return $this->meetingInfo;
-    }
-
-    /**
-     * @return Attendee[]
-     */
-    public function getAttendees()
-    {
-        if ($this->attendees === null) {
-            $this->attendees = [];
-            foreach ($this->rawXml->attendees->attendee as $attendeeXml) {
-                $this->attendees[] = new Attendee($attendeeXml);
-            }
-        }
-
-        return $this->attendees;
-    }
-
-    /**
-     * @return array
-     */
-    public function getMetadata()
+    public function getMeeting()
     {
-        if ($this->metas === null) {
-            $this->metas = [];
-            foreach ($this->rawXml->metadata->children() as $metadataXml) {
-                $this->metas[$metadataXml->getName()] = $metadataXml->__toString();
-            }
+        if ($this->meeting === null) {
+            $this->meeting = new Meeting($this->rawXml);
         }
 
-        return $this->metas;
+        return $this->meeting;
     }
 }

src/Responses/GetMeetingInfoResponse.php

@@ -34,6 +34,8 @@ public function testJoinMeetingParameters()
         $this->assertEquals($params['webVoiceConf'], $joinMeetingParams->getWebVoiceConf());
         $this->assertEquals($params['creationTime'], $joinMeetingParams->getCreationTime());
         $this->assertEquals($params['userdata_countrycode'], $joinMeetingParams->getUserData('countrycode'));
+        $this->assertEquals($params['userdata_email'], $joinMeetingParams->getUserData('email'));
+        $this->assertEquals($params['userdata_commercial'], $joinMeetingParams->getUserData('commercial'));
 
         // Test setters that are ignored by the constructor
         $joinMeetingParams->setMeetingId($newId = $this->faker->uuid);