Skip to content

Commit 76e50bd

Browse files
authored
Merge branch 'master' into refactor-presentation-files
2 parents a62a2f0 + c6766ca commit 76e50bd

44 files changed

Lines changed: 71 additions & 59 deletions

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

src/Core/Attendee.php

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -22,7 +22,7 @@
2222

2323
namespace BigBlueButton\Core;
2424

25-
class Attendee
25+
final class Attendee
2626
{
2727
private readonly string $userId;
2828

src/Core/Hook.php

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -25,7 +25,7 @@
2525
/**
2626
* Class Meeting.
2727
*/
28-
class Hook
28+
final class Hook
2929
{
3030
private readonly int $hookId;
3131

@@ -37,7 +37,7 @@ class Hook
3737

3838
private readonly bool $rawData;
3939

40-
public function __construct(protected \SimpleXMLElement $rawXml)
40+
public function __construct(private readonly \SimpleXMLElement $rawXml)
4141
{
4242
$this->hookId = (int) $this->rawXml->hookID->__toString();
4343
$this->callbackUrl = $this->rawXml->callbackURL->__toString();

src/Core/ImagePreview.php

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -21,7 +21,7 @@
2121

2222
namespace BigBlueButton\Core;
2323

24-
class ImagePreview
24+
final class ImagePreview
2525
{
2626
public function __construct(
2727
private readonly int $width,

src/Core/Meeting.php

Lines changed: 5 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -27,7 +27,7 @@
2727
/**
2828
* Class Meeting.
2929
*/
30-
class Meeting
30+
final class Meeting
3131
{
3232
private readonly string $meetingId;
3333

@@ -37,7 +37,7 @@ class Meeting
3737

3838
private readonly string $creationDate;
3939

40-
private readonly int $voiceBridge;
40+
private readonly string $voiceBridge;
4141

4242
private readonly string $dialNumber;
4343

@@ -80,13 +80,13 @@ class Meeting
8080

8181
private readonly bool $isBreakout;
8282

83-
public function __construct(protected \SimpleXMLElement $rawXml)
83+
public function __construct(private readonly \SimpleXMLElement $rawXml)
8484
{
8585
$this->meetingId = $this->rawXml->meetingID->__toString();
8686
$this->meetingName = $this->rawXml->meetingName->__toString();
8787
$this->creationTime = (float) $this->rawXml->createTime;
8888
$this->creationDate = $this->rawXml->createDate->__toString();
89-
$this->voiceBridge = (int) $this->rawXml->voiceBridge;
89+
$this->voiceBridge = $this->rawXml->voiceBridge->__toString();
9090
$this->dialNumber = $this->rawXml->dialNumber->__toString();
9191
$this->hasBeenForciblyEnded = $this->rawXml->hasBeenForciblyEnded->__toString() === 'true';
9292
$this->isRunning = $this->rawXml->running->__toString() === 'true';
@@ -126,7 +126,7 @@ public function getCreationDate(): string
126126
return $this->creationDate;
127127
}
128128

129-
public function getVoiceBridge(): int
129+
public function getVoiceBridge(): string
130130
{
131131
return $this->voiceBridge;
132132
}

src/Core/PlaybackFormat.php

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -21,7 +21,7 @@
2121

2222
namespace BigBlueButton\Core;
2323

24-
class PlaybackFormat
24+
final class PlaybackFormat
2525
{
2626
private readonly string $type;
2727

src/Core/Record.php

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -25,7 +25,7 @@
2525
/**
2626
* Class Record.
2727
*/
28-
class Record
28+
final class Record
2929
{
3030
private readonly string $recordId;
3131
private readonly string $meetingId;

src/Core/Track.php

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -25,7 +25,7 @@
2525
/**
2626
* Class Track.
2727
*/
28-
class Track
28+
final class Track
2929
{
3030
private readonly string $href;
3131

src/Http/Transport/TransportRequest.php

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -24,7 +24,7 @@
2424
/**
2525
* Represents request data to be passed to {@link TransportInterface} for talking to BBB server.
2626
*/
27-
class TransportRequest
27+
final class TransportRequest
2828
{
2929
public function __construct(private readonly string $url, private readonly string $payload, private readonly string $contentType)
3030
{

src/Http/Transport/TransportResponse.php

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -24,7 +24,7 @@
2424
/**
2525
* Represents response returned by {@link TransportInterface} from BBB server.
2626
*/
27-
class TransportResponse
27+
final class TransportResponse
2828
{
2929
public function __construct(private readonly string $body, private readonly ?string $sessionId)
3030
{

src/Parameters/CreateMeetingParameters.php

Lines changed: 16 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -39,8 +39,8 @@
3939
* @method $this setWelcome(string $welcome)
4040
* @method string getDialNumber()
4141
* @method $this setDialNumber(string $dialNumber)
42-
* @method int getVoiceBridge()
43-
* @method $this setVoiceBridge(int $voiceBridge)
42+
* @method string getVoiceBridge()
43+
* @method $this setVoiceBridge(string $voiceBridge)
4444
* @method string getWebVoice()
4545
* @method $this setWebVoice(string $webVoice)
4646
* @method int getMaxParticipants()
@@ -165,12 +165,20 @@
165165
* @method $this setAllowOverrideClientSettingsOnCreateCall(bool $allowOverrideClientSettingsOnCreateCall)
166166
* @method string getClientSettingsOverride()
167167
* @method $this setClientSettingsOverride(string $clientSettingsOverride)
168+
* @method string getClientSettingsOverrideJsonUrl()
169+
* @method $this setClientSettingsOverrideJsonUrl(string $clientSettingsOverrideJsonUrl)
170+
* @method bool|null isMultiUserWhiteboardEnabled()
171+
* @method $this setMultiUserWhiteboardEnabled(bool $multiUserWhiteboardEnabled)
172+
* @method string getSharedNotesEditor()
173+
* @method $this setSharedNotesEditor(string $sharedNotesEditor)
174+
* @method string getSharedNotesInitialContentJsonUrl()
175+
* @method $this setSharedNotesInitialContentJsonUrl(string $sharedNotesInitialContentJsonUrl)
168176
*/
169-
class CreateMeetingParameters extends MetaParameters
177+
final class CreateMeetingParameters extends MetaParameters
170178
{
171179
protected ?string $welcome = null;
172180
protected ?string $dialNumber = null;
173-
protected ?int $voiceBridge = null;
181+
protected ?string $voiceBridge = null;
174182
protected ?string $webVoice = null;
175183
protected ?int $maxParticipants = null;
176184
protected ?string $loginURL = null;
@@ -249,6 +257,10 @@ class CreateMeetingParameters extends MetaParameters
249257
protected ?bool $presentationConversionCacheEnabled = null;
250258
protected ?bool $allowOverrideClientSettingsOnCreateCall = null;
251259
protected ?string $clientSettingsOverride = null;
260+
protected ?string $clientSettingsOverrideJsonUrl = null;
261+
protected ?bool $multiUserWhiteboardEnabled = null;
262+
protected ?string $sharedNotesEditor = null;
263+
protected ?string $sharedNotesInitialContentJsonUrl = null;
252264

253265
/** @var array<string,Presentation> */
254266
private array $presentations = [];

0 commit comments

Comments
 (0)