Merge pull request #139 from littleredbutton/revert-126-sync-upstream

Revert "Sync upstream"

Author: FelixJacobi

composer.json

@@ -12,7 +12,7 @@
   "authors": [
     {
       "name": "Ghazi Triki",
-      "email": "ghazi.triki@riadvice.tn",
+      "email": "ghazi.nocturne@gmail.com",
       "role": "Developer"
     },
     {

src/BigBlueButton.php

@@ -587,9 +587,4 @@ private function requestUrl(string $url, string $payload = '', string $contentTy
 
         return $response->getBody();
     }
-
-    public function buildUrl(string $method = '', string $params = '', bool $append = true): string
-    {
-        return $this->urlBuilder->buildUrl($method, $params, $append);
-    }
 }

src/Core/GuestPolicy.php

@@ -18,9 +18,6 @@
  */
 namespace BigBlueButton\Parameters;
 
-use BigBlueButton\Core\GuestPolicy;
-use BigBlueButton\Core\MeetingLayout;
-
 /**
  * @method string getName()
  * @method $this setName(string $name)
@@ -36,8 +33,6 @@
  * @method $this setDialNumber(string $dialNumber)
  * @method string getVoiceBridge()
  * @method $this setVoiceBridge(string $voiceBridge)
- * @method string getWebVoice()
- * @method $this setWebVoice(string $webVoice)
  * @method int getMaxParticipants()
  * @method $this setMaxParticipants(int $maxParticipants)
  * @method string getLogoutURL()
@@ -106,8 +101,6 @@
  * @method $this setEndWhenNoModeratorDelayInMinutes(int $endWhenNoModeratorDelayInMinutes)
  * @method string getMeetingLayout()
  * @method $this setMeetingLayout(string $meetingLayout)
- * @method string getMeetingEndedURL()
- * @method $this setMeetingEndedURL(string $meetingEndedURL)
  * @method bool|null isLearningDashboardEnabled()
  * @method $this setLearningDashboardEnabled(bool $isLearningDashboardEnabled)
  * @method int getLearningDashboardCleanupDelayInMinutes()
@@ -124,39 +117,15 @@
  */
 class CreateMeetingParameters extends MetaParameters
 {
-    /**
-     * @deprecated Use GuestPolicy::ALWAYS_ACCEPT instead.
-     */
-    public const ALWAYS_ACCEPT      = GuestPolicy::ALWAYS_ACCEPT;
-    /**
-     * @deprecated Use GuestPolicy::ALWAYS_DENY instead.
-     */
-    public const ALWAYS_DENY        = GuestPolicy::ALWAYS_DENY;
-    /**
-     * @deprecated Use GuestPolicy::ASK_MODERATOR instead.
-     */
-    public const ASK_MODERATOR      = GuestPolicy::ASK_MODERATOR;
-    /**
-     * @deprecated Use GuestPolicy::ALWAYS_ACCEPT_AUTH instead.
-     */
-    public const ALWAYS_ACCEPT_AUTH = GuestPolicy::ALWAYS_ACCEPT_AUTH;
+    public const ALWAYS_ACCEPT      = 'ALWAYS_ACCEPT';
+    public const ALWAYS_DENY        = 'ALWAYS_DENY';
+    public const ASK_MODERATOR      = 'ASK_MODERATOR';
+    public const ALWAYS_ACCEPT_AUTH = 'ALWAYS_ACCEPT_AUTH';
 
-    /**
-     * @deprecated Use MeetingLayout::CUSTOM_LAYOUT instead.
-     */
-    public const CUSTOM_LAYOUT      = MeetingLayout::CUSTOM_LAYOUT;
-    /**
-     * @deprecated Use MeetingLayout::SMART_LAYOUT instead.
-     */
-    public const SMART_LAYOUT       = MeetingLayout::SMART_LAYOUT;
-    /**
-     * @deprecated Use MeetingLayout::PRESENTATION_FOCUS instead.
-     */
-    public const PRESENTATION_FOCUS = MeetingLayout::PRESENTATION_FOCUS;
-    /**
-     * @deprecated Use MeetingLayout::VIDEO_FOCUS instead.
-     */
-    public const VIDEO_FOCUS        = MeetingLayout::VIDEO_FOCUS;
+    const CUSTOM_LAYOUT      = 'CUSTOM_LAYOUT';
+    const SMART_LAYOUT       = 'SMART_LAYOUT';
+    const PRESENTATION_FOCUS = 'PRESENTATION_FOCUS';
+    const VIDEO_FOCUS        = 'VIDEO_FOCUS';
 
     /**
      * @var string
@@ -193,11 +162,6 @@ class CreateMeetingParameters extends MetaParameters
      */
     protected $voiceBridge;
 
-    /**
-     * @var string
-     */
-    protected $webVoice;
-
     /**
      * @var int
      */
@@ -351,7 +315,7 @@ class CreateMeetingParameters extends MetaParameters
     /**
      * @var string
      */
-    protected $guestPolicy = GuestPolicy::ALWAYS_ACCEPT;
+    protected $guestPolicy = self::ALWAYS_ACCEPT;
 
     /**
      * @var bool
@@ -373,11 +337,6 @@ class CreateMeetingParameters extends MetaParameters
      */
     protected $meetingLayout;
 
-    /**
-     * @var string
-     */
-    protected $meetingEndedURL;
-
     /**
      * @var bool
      */
@@ -630,15 +589,15 @@ public function setParentMeetingId(string $parentMeetingID)
      */
     public function isGuestPolicyAlwaysDeny()
     {
-        return $this->guestPolicy === GuestPolicy::ALWAYS_DENY;
+        return $this->guestPolicy === self::ALWAYS_DENY;
     }
 
     /**
      * @return CreateMeetingParameters
      */
     public function setGuestPolicyAlwaysDeny()
     {
-        $this->guestPolicy = GuestPolicy::ALWAYS_DENY;
+        $this->guestPolicy = self::ALWAYS_DENY;
 
         return $this;
     }
@@ -648,7 +607,7 @@ public function setGuestPolicyAlwaysDeny()
      */
     public function isGuestPolicyAskModerator()
     {
-        return $this->guestPolicy === GuestPolicy::ASK_MODERATOR;
+        return $this->guestPolicy === self::ASK_MODERATOR;
     }
 
     /**
@@ -657,7 +616,7 @@ public function isGuestPolicyAskModerator()
      */
     public function setGuestPolicyAskModerator()
     {
-        $this->guestPolicy = GuestPolicy::ASK_MODERATOR;
+        $this->guestPolicy = self::ASK_MODERATOR;
 
         return $this;
     }
@@ -667,7 +626,7 @@ public function setGuestPolicyAskModerator()
      */
     public function isGuestPolicyAlwaysAcceptAuth()
     {
-        return $this->guestPolicy === GuestPolicy::ALWAYS_ACCEPT_AUTH;
+        return $this->guestPolicy === self::ALWAYS_ACCEPT_AUTH;
     }
 
     /**
@@ -676,7 +635,7 @@ public function isGuestPolicyAlwaysAcceptAuth()
      */
     public function setGuestPolicyAlwaysAcceptAuth()
     {
-        $this->guestPolicy = GuestPolicy::ALWAYS_ACCEPT_AUTH;
+        $this->guestPolicy = self::ALWAYS_ACCEPT_AUTH;
 
         return $this;
     }

src/Core/MeetingLayout.php

@@ -2,7 +2,7 @@
 /**
  * BigBlueButton open source conferencing system - https://www.bigbluebutton.org/.
  *
- * Copyright (c) 2016-2021 BigBlueButton Inc. and by respective authors (see below).
+ * Copyright (c) 2016-2018 BigBlueButton Inc. and by respective authors (see below).
  *
  * This program is free software; you can redistribute it and/or modify it under the
  * terms of the GNU Lesser General Public License as published by the Free Software

src/Parameters/CreateMeetingParameters.php

@@ -18,8 +18,6 @@
  */
 namespace BigBlueButton;
 
-use BigBlueButton\Core\GuestPolicy;
-use BigBlueButton\Core\MeetingLayout;
 use BigBlueButton\Parameters\CreateMeetingParameters as CreateMeetingParameters;
 use BigBlueButton\Parameters\EndMeetingParameters;
 use BigBlueButton\Parameters\JoinMeetingParameters as JoinMeetingParameters;
@@ -75,7 +73,6 @@ protected function generateCreateParams()
             'autoStartRecording'                        => $this->faker->boolean(50),
             'dialNumber'                                => $this->faker->phoneNumber,
             'voiceBridge'                               => $this->faker->randomNumber(5),
-            'webVoice'                                  => $this->faker->word,
             'logoutURL'                                 => $this->faker->url,
             'maxParticipants'                           => $this->faker->numberBetween(2, 100),
             'record'                                    => $this->faker->boolean(50),
@@ -86,7 +83,7 @@ protected function generateCreateParams()
             'webcamsOnlyForModerator'                   => $this->faker->boolean(50),
             'logo'                                      => $this->faker->imageUrl(330, 70),
             'copyright'                                 => $this->faker->text,
-            'guestPolicy'                               => $this->faker->randomElement([GuestPolicy::ALWAYS_ACCEPT, GuestPolicy::ALWAYS_DENY, GuestPolicy::ASK_MODERATOR]),
+            'guestPolicy'                               => CreateMeetingParameters::ALWAYS_ACCEPT,
             'muteOnStart'                               => $this->faker->boolean(50),
             'lockSettingsDisableCam'                    => $this->faker->boolean(50),
             'lockSettingsDisableMic'                    => $this->faker->boolean(50),
@@ -98,7 +95,6 @@ protected function generateCreateParams()
             'lockSettingsLockOnJoin'                    => $this->faker->boolean(50),
             'lockSettingsLockOnJoinConfigurable'        => $this->faker->boolean(50),
             'allowModsToUnmuteUsers'                    => $this->faker->boolean(50),
-            'allowModsToEjectCameras'                   => $this->faker->boolean(50),
             'meta_presenter'                            => $this->faker->name,
             'meta_endCallbackUrl'                       => $this->faker->url,
             'meta_bbb-recording-ready-url'              => $this->faker->url,
@@ -108,16 +104,16 @@ protected function generateCreateParams()
             'endWhenNoModerator'                        => $this->faker->boolean(50),
             'endWhenNoModeratorDelayInMinutes'          => $this->faker->numberBetween(1, 100),
             'meetingLayout'                             => $this->faker->randomElement([
-                                                                MeetingLayout::CUSTOM_LAYOUT,
-                                                                MeetingLayout::SMART_LAYOUT,
-                                                                MeetingLayout::PRESENTATION_FOCUS,
-                                                                MeetingLayout::VIDEO_FOCUS
+                                                                CreateMeetingParameters::CUSTOM_LAYOUT,
+                                                                CreateMeetingParameters::SMART_LAYOUT,
+                                                                CreateMeetingParameters::PRESENTATION_FOCUS,
+                                                                CreateMeetingParameters::VIDEO_FOCUS
                                                            ]),
             'learningDashboardEnabled'                  => $this->faker->boolean(50),
             'learningDashboardCleanupDelayInMinutes'    => $this->faker->numberBetween(1, 100),
+            'allowModsToEjectCameras'                   => $this->faker->boolean(50),
             'breakoutRoomsEnabled'                      => $this->faker->boolean(50),
             'breakoutRoomsPrivateChatEnabled'           => $this->faker->boolean(50),
-            'meetingEndedURL'                           => $this->faker->url,
             'breakoutRoomsRecord'                       => $this->faker->boolean(50),
             'allowRequestsWithoutSession'               => $this->faker->boolean(50),
             'virtualBackgroundsDisabled'                => $this->faker->boolean(50),
@@ -152,12 +148,11 @@ protected function getCreateMock($params)
             ->setModeratorPassword($params['moderatorPW'])
             ->setDialNumber($params['dialNumber'])
             ->setVoiceBridge($params['voiceBridge'])
-            ->setWebVoice($params['webVoice'])
-            ->setLogoutURL($params['logoutURL'])
+            ->setLogoutUrl($params['logoutURL'])
             ->setMaxParticipants($params['maxParticipants'])
             ->setRecord($params['record'])
             ->setDuration($params['duration'])
-            ->setWelcome($params['welcome'])
+            ->setWelcomeMessage($params['welcome'])
             ->setAutoStartRecording($params['autoStartRecording'])
             ->setAllowStartStopRecording($params['allowStartStopRecording'])
             ->setModeratorOnlyMessage($params['moderatorOnlyMessage'])
@@ -177,17 +172,14 @@ protected function getCreateMock($params)
             ->setLockSettingsLockOnJoin($params['lockSettingsLockOnJoin'])
             ->setLockSettingsLockOnJoinConfigurable($params['lockSettingsLockOnJoinConfigurable'])
             ->setAllowModsToUnmuteUsers($params['allowModsToUnmuteUsers'])
-            ->setGuestPolicy($params['guestPolicy'])
+            ->setGuestPolicyAlwaysAccept()
             ->addMeta('presenter', $params['meta_presenter'])
             ->setBannerText($params['bannerText'])
             ->setBannerColor($params['bannerColor'])
             ->setMeetingKeepEvents($params['meetingKeepEvents'])
             ->setEndWhenNoModerator($params['endWhenNoModerator'])
             ->setEndWhenNoModeratorDelayInMinutes($params['endWhenNoModeratorDelayInMinutes'])
-            ->setAllowModsToEjectCameras($params['allowModsToEjectCameras'])
-            ->setMeetingEndedURL($params['meetingEndedURL'])
             ->setMeetingLayout($params['meetingLayout'])
-            ->setMeetingKeepEvents($params['meetingKeepEvents'])
             ->setLearningDashboardEnabled($params['learningDashboardEnabled'])
             ->setLearningDashboardCleanupDelayInMinutes($params['learningDashboardCleanupDelayInMinutes'])
             ->setAllowModsToEjectCameras($params['allowModsToEjectCameras'])