Skip to content

Commit 41a1ba6

Browse files
FelixJacobiFelixJacobi
committed
Fix errors from merge
1 parent c0dc54c commit 41a1ba6

8 files changed

Lines changed: 26 additions & 101 deletions

‎src/BigBlueButton.php‎

Lines changed: 2 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -205,6 +205,8 @@ public function createMeeting(CreateMeetingParameters $createMeetingParams)
205205
}
206206

207207
/**
208+
* @param JoinMeetingParameters $joinMeetingParams
209+
*
208210
* @return string
209211
*/
210212
public function getJoinMeetingURL(JoinMeetingParameters $joinMeetingParams)
@@ -512,14 +514,6 @@ public function setJSessionId(string $jSessionId)
512514
$this->jSessionId = $jSessionId;
513515
}
514516

515-
/**
516-
* @param array $curlopts
517-
*/
518-
public function setCurlOpts($curlopts)
519-
{
520-
$this->curlopts = $curlopts;
521-
}
522-
523517
/* ____________________ INTERNAL CLASS METHODS ___________________ */
524518

525519
/**

‎src/Core/GetRecordingTextTracksResponse.php‎

Lines changed: 0 additions & 48 deletions
This file was deleted.

‎src/Parameters/CreateMeetingParameters.php‎

Lines changed: 7 additions & 18 deletions
Original file line numberDiff line numberDiff line change
@@ -34,6 +34,8 @@
3434
* @method $this setDialNumber(string $dialNumber)
3535
* @method string getVoiceBridge()
3636
* @method $this setVoiceBridge(string $voiceBridge)
37+
* @method string getWebVoice()
38+
* @method $this setWebVoice(string $webVoice)
3739
* @method int getMaxParticipants()
3840
* @method $this setMaxParticipants(int $maxParticipants)
3941
* @method string getLogoutURL()
@@ -165,6 +167,11 @@ class CreateMeetingParameters extends MetaParameters
165167
*/
166168
protected $voiceBridge;
167169

170+
/**
171+
* #@var string
172+
*/
173+
protected $webVoice;
174+
168175
/**
169176
* @var int
170177
*/
@@ -638,24 +645,6 @@ public function isGuestPolicyAlwaysAcceptAuth()
638645
return $this->guestPolicy === self::ALWAYS_ACCEPT_AUTH;
639646
}
640647

641-
/**
642-
* @return bool
643-
*/
644-
public function isAllowModsToEjectCameras(): bool
645-
{
646-
return $this->allowModsToEjectCameras;
647-
}
648-
649-
/**
650-
* @param bool $allowModsToEjectCameras
651-
* @return CreateMeetingParameters
652-
*/
653-
public function setAllowModsToEjectCameras(bool $allowModsToEjectCameras): self
654-
{
655-
$this->allowModsToEjectCameras = $allowModsToEjectCameras;
656-
657-
return $this;
658-
}
659648

660649
/**
661650
* Ask moderator on join of guests is allowed to enter the meeting, user are allowed to join directly

‎src/Parameters/MetaParameters.php‎

Lines changed: 0 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -48,15 +48,7 @@ public function addMeta(string $key, $value)
4848
return $this;
4949
}
5050

51-
<<<<<<< HEAD
52-
/**
53-
* @param $queries
54-
* @return void
55-
*/
56-
protected function buildMeta(&$queries)
57-
=======
5851
protected function getHTTPQueryArray(): array
59-
>>>>>>> origin/master
6052
{
6153
$properties = parent::getHTTPQueryArray();
6254

‎src/Responses/GetRecordingTextTracksResponse.php‎

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -16,12 +16,13 @@
1616
* You should have received a copy of the GNU Lesser General Public License along
1717
* with BigBlueButton; if not, see <http://www.gnu.org/licenses/>.
1818
*/
19-
namespace BigBlueButton\Core;
19+
namespace BigBlueButton\Responses;
2020

2121
use BigBlueButton\Core\Track;
2222

2323
/**
2424
* Class GetRecordingTextTracksResponse
25+
*
2526
* @package BigBlueButton\Responses
2627
*/
2728
class GetRecordingTextTracksResponse extends BaseResponseAsJson

‎tests/TestCase.php‎

Lines changed: 7 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -87,7 +87,7 @@ protected function generateCreateParams()
8787
'webcamsOnlyForModerator' => $this->faker->boolean(50),
8888
'logo' => $this->faker->imageUrl(330, 70),
8989
'copyright' => $this->faker->text,
90-
'guestPolicy' => $this->faker->randomElement([GuestPolicy::ALWAYS_ACCEPT, GuestPolicy::ALWAYS_DENY, GuestPolicy::ASK_MODERATOR]),
90+
'guestPolicy' => $this->faker->randomElement([GuestPolicy::ALWAYS_ACCEPT, GuestPolicy::ALWAYS_DENY, GuestPolicy::ASK_MODERATOR]),
9191
'muteOnStart' => $this->faker->boolean(50),
9292
'lockSettingsDisableCam' => $this->faker->boolean(50),
9393
'lockSettingsDisableMic' => $this->faker->boolean(50),
@@ -99,7 +99,7 @@ protected function generateCreateParams()
9999
'lockSettingsLockOnJoin' => $this->faker->boolean(50),
100100
'lockSettingsLockOnJoinConfigurable' => $this->faker->boolean(50),
101101
'allowModsToUnmuteUsers' => $this->faker->boolean(50),
102-
'allowModsToEjectCameras' => $this->faker->boolean(50),
102+
'allowModsToEjectCameras' => $this->faker->boolean(50),
103103
'meta_presenter' => $this->faker->name,
104104
'meta_endCallbackUrl' => $this->faker->url,
105105
'meta_bbb-recording-ready-url' => $this->faker->url,
@@ -116,9 +116,9 @@ protected function generateCreateParams()
116116
]),
117117
'learningDashboardEnabled' => $this->faker->boolean(50),
118118
'learningDashboardCleanupDelayInMinutes' => $this->faker->numberBetween(1, 100),
119-
'allowModsToEjectCameras' => $this->faker->boolean(50),
120119
'breakoutRoomsEnabled' => $this->faker->boolean(50),
121120
'breakoutRoomsPrivateChatEnabled' => $this->faker->boolean(50),
121+
'meetingEndedURL' => $this->faker->url,
122122
'breakoutRoomsRecord' => $this->faker->boolean(50),
123123
'allowRequestsWithoutSession' => $this->faker->boolean(50),
124124
'virtualBackgroundsDisabled' => $this->faker->boolean(50),
@@ -153,11 +153,12 @@ protected function getCreateMock($params)
153153
->setModeratorPassword($params['moderatorPW'])
154154
->setDialNumber($params['dialNumber'])
155155
->setVoiceBridge($params['voiceBridge'])
156-
->setLogoutUrl($params['logoutURL'])
156+
->setWebVoice($params['webVoice'])
157+
->setLogoutURL($params['logoutURL'])
157158
->setMaxParticipants($params['maxParticipants'])
158159
->setRecord($params['record'])
159160
->setDuration($params['duration'])
160-
->setWelcomeMessage($params['welcome'])
161+
->setWelcome($params['welcome'])
161162
->setAutoStartRecording($params['autoStartRecording'])
162163
->setAllowStartStopRecording($params['allowStartStopRecording'])
163164
->setModeratorOnlyMessage($params['moderatorOnlyMessage'])
@@ -177,7 +178,7 @@ protected function getCreateMock($params)
177178
->setLockSettingsLockOnJoin($params['lockSettingsLockOnJoin'])
178179
->setLockSettingsLockOnJoinConfigurable($params['lockSettingsLockOnJoinConfigurable'])
179180
->setAllowModsToUnmuteUsers($params['allowModsToUnmuteUsers'])
180-
->setGuestPolicyAlwaysAccept()
181+
->setGuestPolicy($params['guestPolicy'])
181182
->addMeta('presenter', $params['meta_presenter'])
182183
->setBannerText($params['bannerText'])
183184
->setBannerColor($params['bannerColor'])

‎tests/functional/AbstractBigBlueButtonFunctionalTest.php‎

Lines changed: 7 additions & 11 deletions
Original file line numberDiff line numberDiff line change
@@ -19,6 +19,7 @@
1919
namespace BigBlueButton\Tests\Functional;
2020

2121
use BigBlueButton\BigBlueButton;
22+
use BigBlueButton\Core\ApiMethod;
2223
use BigBlueButton\Http\Transport\TransportInterface;
2324
use BigBlueButton\Parameters\DeleteRecordingsParameters;
2425
use BigBlueButton\Parameters\EndMeetingParameters;
@@ -112,7 +113,7 @@ public function testCreateMeetingUrl()
112113
if (is_bool($value)) {
113114
$value = $value ? 'true' : 'false';
114115
}
115-
$this->assertStringContainsString('=' . urlencode($value), $url);
116+
$this->assertStringContainsString($key . '=' . rawurlencode($value), $url);
116117
}
117118
}
118119

@@ -204,14 +205,10 @@ public function testCreateJoinMeetingUrl()
204205
if (is_bool($value)) {
205206
$value = $value ? 'true' : 'false';
206207
}
207-
$this->assertStringContainsString('=' . urlencode($value), $url);
208+
$this->assertStringContainsString('=' . rawurlencode($value), $url);
208209
}
209210
}
210211

211-
/**
212-
* @expectedException \Exception
213-
* @expectedExceptionMessage String could not be parsed as XML
214-
*/
215212
public function testJoinMeeting()
216213
{
217214
$params = $this->generateCreateParams();
@@ -247,7 +244,7 @@ public function testCreateEndMeetingUrl()
247244
if (is_bool($value)) {
248245
$value = $value ? 'true' : 'false';
249246
}
250-
$this->assertStringContainsString('=' . urlencode($value), $url);
247+
$this->assertStringContainsString('=' . rawurlencode($value), $url);
251248
}
252249
}
253250

@@ -299,9 +296,8 @@ public function testGetMeetingInfoUrl()
299296
{
300297
$meeting = $this->createRealMeeting($this->bbb);
301298

302-
$url = $this->bbb->getMeetingInfoUrl(new GetMeetingInfoParameters($meeting->getMeetingId(), $meeting->getModeratorPassword()));
303-
$this->assertStringContainsString('=' . urlencode($meeting->getMeetingId()), $url);
304-
$this->assertStringContainsString('=' . urlencode($meeting->getModeratorPassword()), $url);
299+
$url = $this->bbb->getMeetingInfoUrl(new GetMeetingInfoParameters($meeting->getMeetingId()));
300+
$this->assertStringContainsString('=' . rawurlencode($meeting->getMeetingId()), $url);
305301
}
306302

307303
public function testGetMeetingInfo()
@@ -360,7 +356,7 @@ public function testUpdateRecordingsUrl()
360356
if (is_bool($value)) {
361357
$value = $value ? 'true' : 'false';
362358
}
363-
$this->assertStringContainsString('=' . urlencode($value), $url);
359+
$this->assertStringContainsString('=' . rawurlencode($value), $url);
364360
}
365361
}
366362

‎tests/unit/Responses/GetRecordingsTextTracksResponseTest.php‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
11
<?php
22

3-
namespace unit\Responses;
3+
namespace BigBlueButton\Tests\Unit\Responses;
44

55
use BigBlueButton\Responses\GetRecordingTextTracksResponse;
66
use BigBlueButton\TestCase;

0 commit comments

Comments
 (0)