Replace deprecated lockSettingsDisableNote by lockSettingsDisableNotes

src/Parameters/CreateMeetingParameters.php

@@ -79,7 +79,7 @@ class CreateMeetingParameters extends MetaParameters
 
     private ?bool $lockSettingsDisablePublicChat = null;
 
-    private ?bool $lockSettingsDisableNote = null;
+    private ?bool $lockSettingsDisableNotes = null;
 
     private ?bool $lockSettingsHideUserList = null;
 
@@ -780,9 +780,29 @@ public function setLockSettingsDisablePublicChat(bool $lockSettingsDisablePublic
         return $this;
     }
 
+    /**
+     * @deprecated isLockSettingsDisableNote is replaced by isLockSettingsDisableNotes
+     */
     public function isLockSettingsDisableNote(): ?bool
     {
-        return $this->lockSettingsDisableNote;
+        return $this->isLockSettingsDisableNotes();
+    }
+
+    /**
+     * Setting to true will disable notes in the meeting.
+     *
+     * @deprecated setLockSettingsDisableNote is replaced by setLockSettingsDisableNotes
+     */
+    public function setLockSettingsDisableNote(bool $lockSettingsDisableNote): self
+    {
+        $this->setLockSettingsDisableNotes($lockSettingsDisableNote);
+
+        return $this;
+    }
+
+    public function isLockSettingsDisableNotes(): ?bool
+    {
+        return $this->lockSettingsDisableNotes;
     }
 
     /**
@@ -792,9 +812,9 @@ public function isLockSettingsDisableNote(): ?bool
      *
      * @since 2.2
      */
-    public function setLockSettingsDisableNote(bool $lockSettingsDisableNote): self
+    public function setLockSettingsDisableNotes(bool $lockSettingsDisableNotes): self
     {
-        $this->lockSettingsDisableNote = $lockSettingsDisableNote;
+        $this->lockSettingsDisableNotes = $lockSettingsDisableNotes;
 
         return $this;
     }
@@ -1424,7 +1444,7 @@ public function getHTTPQuery(): string
             'lockSettingsDisableMic'                 => !is_null($this->lockSettingsDisableMic) ? ($this->lockSettingsDisableMic ? 'true' : 'false') : $this->lockSettingsDisableMic,
             'lockSettingsDisablePrivateChat'         => !is_null($this->lockSettingsDisablePrivateChat) ? ($this->lockSettingsDisablePrivateChat ? 'true' : 'false') : $this->lockSettingsDisablePrivateChat,
             'lockSettingsDisablePublicChat'          => !is_null($this->lockSettingsDisablePublicChat) ? ($this->lockSettingsDisablePublicChat ? 'true' : 'false') : $this->lockSettingsDisablePublicChat,
-            'lockSettingsDisableNote'                => !is_null($this->lockSettingsDisableNote) ? ($this->lockSettingsDisableNote ? 'true' : 'false') : $this->lockSettingsDisableNote,
+            'lockSettingsDisableNotes'               => !is_null($this->lockSettingsDisableNotes) ? ($this->lockSettingsDisableNotes ? 'true' : 'false') : $this->lockSettingsDisableNotes,
             'lockSettingsHideUserList'               => !is_null($this->lockSettingsHideUserList) ? ($this->lockSettingsHideUserList ? 'true' : 'false') : $this->lockSettingsHideUserList,
             'lockSettingsLockedLayout'               => !is_null($this->lockSettingsLockedLayout) ? ($this->lockSettingsLockedLayout ? 'true' : 'false') : $this->lockSettingsLockedLayout,
             'lockSettingsLockOnJoin'                 => !is_null($this->lockSettingsLockOnJoin) ? ($this->lockSettingsLockOnJoin ? 'true' : 'false') : $this->lockSettingsLockOnJoin,

src/Parameters/DocumentableTrait.php

@@ -37,10 +37,10 @@ public function getPresentations(): array
         return $this->presentations;
     }
 
-    public function addPresentation(string $nameOrUrl, $content = null, ?string $filename = null, ?DocumentOptionsStore $attributes = null): self
+    public function addPresentation(string $nameOrUrl, ?string $content = null, ?string $filename = null, DocumentOptionsStore $attributes = null): self
     {
         $this->presentations[$nameOrUrl] = [
-            'content'    => !$content ?: base64_encode($content),
+            'content'    => $content ? base64_encode($content) : null,
             'filename'   => $filename,
             'attributes' => $attributes,
         ];
@@ -73,8 +73,10 @@ public function getPresentationsAsXML(): string
                 }
 
                 // Add attributes using DocumentAttributes class
-                foreach ($data['attributes']->getAttributes() as $attrName => $attrValue) {
-                    $presentation->addAttribute($attrName, $attrValue);
+                if (!empty($data['attributes'])) {
+                    foreach ($data['attributes']->getAttributes() as $attrName => $attrValue) {
+                        $presentation->addAttribute($attrName, $attrValue);
+                    }
                 }
             }
             $result = $xml->asXML();

tests/Parameters/CreateMeetingParametersTest.php

@@ -59,7 +59,8 @@ public function testCreateMeetingParameters(): void
         $this->assertEquals($params['lockSettingsDisableMic'], $createMeetingParams->isLockSettingsDisableMic());
         $this->assertEquals($params['lockSettingsDisablePrivateChat'], $createMeetingParams->isLockSettingsDisablePrivateChat());
         $this->assertEquals($params['lockSettingsDisablePublicChat'], $createMeetingParams->isLockSettingsDisablePublicChat());
-        $this->assertEquals($params['lockSettingsDisableNote'], $createMeetingParams->isLockSettingsDisableNote());
+        $this->assertEquals($params['lockSettingsDisableNotes'], $createMeetingParams->isLockSettingsDisableNote());
+        $this->assertEquals($params['lockSettingsDisableNotes'], $createMeetingParams->isLockSettingsDisableNotes());
         $this->assertEquals($params['lockSettingsHideUserList'], $createMeetingParams->isLockSettingsHideUserList());
         $this->assertEquals($params['lockSettingsLockedLayout'], $createMeetingParams->isLockSettingsLockedLayout());
         $this->assertEquals($params['lockSettingsLockOnJoin'], $createMeetingParams->isLockSettingsLockOnJoin());

tests/TestCase.php

@@ -175,7 +175,7 @@ protected function generateCreateParams(): array
             'lockSettingsDisableMic'                 => $this->faker->boolean(50),
             'lockSettingsDisablePrivateChat'         => $this->faker->boolean(50),
             'lockSettingsDisablePublicChat'          => $this->faker->boolean(50),
-            'lockSettingsDisableNote'                => $this->faker->boolean(50),
+            'lockSettingsDisableNotes'               => $this->faker->boolean(50),
             'lockSettingsHideUserList'               => $this->faker->boolean(50),
             'lockSettingsLockedLayout'               => $this->faker->boolean(50),
             'lockSettingsLockOnJoin'                 => $this->faker->boolean(50),
@@ -284,7 +284,8 @@ protected function getCreateMock(array $params): CreateMeetingParameters
             ->setLockSettingsDisableMic($params['lockSettingsDisableMic'])
             ->setLockSettingsDisablePrivateChat($params['lockSettingsDisablePrivateChat'])
             ->setLockSettingsDisablePublicChat($params['lockSettingsDisablePublicChat'])
-            ->setLockSettingsDisableNote($params['lockSettingsDisableNote'])
+            ->setLockSettingsDisableNote($params['lockSettingsDisableNotes'])
+            ->setLockSettingsDisableNotes($params['lockSettingsDisableNotes'])
             ->setLockSettingsHideUserList($params['lockSettingsHideUserList'])
             ->setLockSettingsLockedLayout($params['lockSettingsLockedLayout'])
             ->setLockSettingsLockOnJoin($params['lockSettingsLockOnJoin'])

tests/TestServices/Fixtures.php

@@ -107,7 +107,7 @@ public static function generateCreateParams(): array
             'lockSettingsDisableMic'                 => $faker->boolean(50),
             'lockSettingsDisablePrivateChat'         => $faker->boolean(50),
             'lockSettingsDisablePublicChat'          => $faker->boolean(50),
-            'lockSettingsDisableNote'                => $faker->boolean(50),
+            'lockSettingsDisableNotes'               => $faker->boolean(50),
             'lockSettingsHideUserList'               => $faker->boolean(50),
             'lockSettingsLockedLayout'               => $faker->boolean(50),
             'lockSettingsLockOnJoin'                 => $faker->boolean(50),
@@ -269,7 +269,8 @@ public static function getCreateMeetingParametersMock(array $params): CreateMeet
             ->setLockSettingsDisableMic($params['lockSettingsDisableMic'])
             ->setLockSettingsDisablePrivateChat($params['lockSettingsDisablePrivateChat'])
             ->setLockSettingsDisablePublicChat($params['lockSettingsDisablePublicChat'])
-            ->setLockSettingsDisableNote($params['lockSettingsDisableNote'])
+            ->setLockSettingsDisableNote($params['lockSettingsDisableNotes'])
+            ->setLockSettingsDisableNotes($params['lockSettingsDisableNotes'])
             ->setLockSettingsHideUserList($params['lockSettingsHideUserList'])
             ->setLockSettingsLockedLayout($params['lockSettingsLockedLayout'])
             ->setLockSettingsLockOnJoin($params['lockSettingsLockOnJoin'])