Merge remote-tracking branch 'origin/master' into remove-configToken

littleredbutton · Aug 30, 2023 · 3d76cc4 · 3d76cc4
2 parents d7099ed + 7ea8e13
commit 3d76cc4
Show file tree

Hide file tree

Showing 18 changed files with 11 additions and 64 deletions.
diff --git a/.php-cs-fixer.php b/.php-cs-fixer.php
@@ -18,6 +18,8 @@
         'yoda_style' => false,
         'single_line_throw' => false,
         'increment_style' => false,
+        'modernize_strpos' => false,
+        'get_class_to_class_keyword' => false,
     ])
     ->setRiskyAllowed(true)
     ->setFinder($finder);
diff --git a/src/BigBlueButton.php b/src/BigBlueButton.php
@@ -59,7 +59,6 @@
 use BigBlueButton\Responses\PutRecordingTextTrackResponse;
 use BigBlueButton\Responses\UpdateRecordingsResponse;
 use BigBlueButton\Util\UrlBuilder;
-use SimpleXMLElement;
 
 /**
  * Class BigBlueButton.
@@ -108,7 +107,7 @@ class BigBlueButton
      *
      * @throws ConfigException
      */
-    public function __construct(?string $baseUrl = null, ?string $secret = null, ?TransportInterface $transport = null)
+    public function __construct(string $baseUrl = null, string $secret = null, TransportInterface $transport = null)
     {
         // Keeping backward compatibility with older deployed versions
         $this->securitySecret = $secret ?: getenv('BBB_SECURITY_SALT') ?: getenv('BBB_SECRET');
@@ -478,10 +477,10 @@ public function setJSessionId(string $jSessionId): void
      * @throws ParsingException
      * @throws RuntimeException
      */
-    private function processXmlResponse(string $url, string $payload = '', string $contentType = 'application/xml'): SimpleXMLElement
+    private function processXmlResponse(string $url, string $payload = '', string $contentType = 'application/xml'): \SimpleXMLElement
     {
         try {
-            return new SimpleXMLElement($this->requestUrl($url, $payload, $contentType));
+            return new \SimpleXMLElement($this->requestUrl($url, $payload, $contentType));
         } catch (NetworkException|RuntimeException $e) {
             throw $e;
         } catch (\Throwable $e) {

diff --git a/src/Exceptions/BaseException.php b/src/Exceptions/BaseException.php
@@ -21,11 +21,9 @@
 
 namespace BigBlueButton\Exceptions;
 
-use Exception;
-
 /**
  * @abstract since 4.0.
  */
-class BaseException extends Exception
+class BaseException extends \Exception
 {
 }
diff --git a/src/Http/Transport/Bridge/PsrHttpClient/PsrHttpClientTransport.php b/src/Http/Transport/Bridge/PsrHttpClient/PsrHttpClientTransport.php
@@ -104,9 +104,6 @@ public function __construct(
         $this->defaultHeaders = $defaultHeaders;
     }
 
-    /**
-     * {@inheritDoc}
-     */
     public function request(TransportRequest $request): TransportResponse
     {
         if ('' !== $payload = $request->getPayload()) {

diff --git a/src/Http/Transport/Bridge/SymfonyHttpClient/SymfonyHttpClientTransport.php b/src/Http/Transport/Bridge/SymfonyHttpClient/SymfonyHttpClientTransport.php
@@ -101,9 +101,6 @@ public static function create(array $defaultHeaders = [], array $defaultOptions
         // @codeCoverageIgnoreEnd
     }
 
-    /**
-     * {@inheritDoc}
-     */
     public function request(TransportRequest $request): TransportResponse
     {
         $headers = $this->defaultHeaders;

diff --git a/src/Http/Transport/CurlTransport.php b/src/Http/Transport/CurlTransport.php
@@ -84,9 +84,6 @@ public static function createWithDefaultOptions(array $additionalCurlOptions = [
         // @codeCoverageIgnoreEnd
     }
 
-    /**
-     * {@inheritDoc}
-     */
     public function request(TransportRequest $request): TransportResponse
     {
         // @codeCoverageIgnoreStart

diff --git a/src/Parameters/BaseParameters.php b/src/Parameters/BaseParameters.php
@@ -45,9 +45,6 @@ public function __call(string $name, array $arguments)
         return null;
     }
 
-    /**
-     * @return mixed
-     */
     protected function getter(string $name)
     {
         if (property_exists($this, $name)) {

diff --git a/src/Parameters/CreateMeetingParameters.php b/src/Parameters/CreateMeetingParameters.php
@@ -483,7 +483,6 @@ public function setGuestPolicyAlwaysAccept(): self
 
     /**
      * @deprecated old flash client parameter, not used anymore
-     * @return string
      */
     public function getConfigToken(): ?string
     {
@@ -492,7 +491,6 @@ public function getConfigToken(): ?string
 
     /**
      * @deprecated old flash client parameter, not used anymore
-     * @param string $configToken
      *
      * @return JoinMeetingParameters
      */
@@ -503,7 +501,7 @@ public function setConfigToken(string $configToken): self
         return $this;
     }
 
-    public function addPresentation(string $nameOrUrl, ?string $content = null, ?string $filename = null): self
+    public function addPresentation(string $nameOrUrl, string $content = null, string $filename = null): self
     {
         if (!$filename) {
             $this->presentations[$nameOrUrl] = !$content ?: base64_encode($content);
@@ -519,9 +517,6 @@ public function getPresentations(): array
         return $this->presentations;
     }
 
-    /**
-     * @return mixed
-     */
     public function getPresentationsAsXML()
     {
         $result = '';

diff --git a/src/Parameters/InsertDocumentParameters.php b/src/Parameters/InsertDocumentParameters.php
@@ -42,7 +42,7 @@ public function __construct(string $meetingID)
         $this->meetingID = $meetingID;
     }
 
-    public function addPresentation(string $url, string $filename, ?bool $downloadable = null, ?bool $removable = null): self
+    public function addPresentation(string $url, string $filename, bool $downloadable = null, bool $removable = null): self
     {
         $this->presentations[$url] = [
             'filename' => $filename,
@@ -60,9 +60,6 @@ public function removePresentation(string $url): self
         return $this;
     }
 
-    /**
-     * @return mixed
-     */
     public function getPresentationsAsXML()
     {
         $result = '';

diff --git a/src/Parameters/PutRecordingTextTrackParameters.php b/src/Parameters/PutRecordingTextTrackParameters.php
@@ -62,15 +62,10 @@ class PutRecordingTextTrackParameters extends BaseParameters
      */
     protected $contentType;
 
-    /**
-     * @var mixed
-     */
     protected $file;
 
     /**
      * GetRecordingTextTracksParameters constructor.
-     *
-     * @param $recordID
      */
     public function __construct(string $recordID, string $kind, string $lang, string $label)
     {

diff --git a/src/Responses/BaseResponseAsJson.php b/src/Responses/BaseResponseAsJson.php
@@ -28,9 +28,6 @@ abstract class BaseResponseAsJson
     public const FAILED = 'FAILED';
     public const CHECKSUM_ERROR = 'checksumError';
 
-    /**
-     * @var mixed
-     */
     protected $data;
 
     /**

diff --git a/tests/TestCase.php b/tests/TestCase.php
@@ -40,9 +40,6 @@ class TestCase extends \PHPUnit\Framework\TestCase
      */
     protected $faker;
 
-    /**
-     * {@inheritdoc}
-     */
     protected function setUp(): void
     {
         parent::setUp();
@@ -127,8 +124,6 @@ protected function generateCreateParams()
     }
 
     /**
-     * @param $createParams
-     *
      * @return array
      */
     protected function generateBreakoutCreateParams($createParams)
@@ -202,8 +197,6 @@ protected function getCreateMock($params)
     }
 
     /**
-     * @param $params
-     *
      * @return CreateMeetingParameters
      */
     protected function getBreakoutCreateMock($params)

diff --git a/tests/functional/BigBlueButtonWithCurlTransportTest.php b/tests/functional/BigBlueButtonWithCurlTransportTest.php
@@ -26,9 +26,6 @@
 
 final class BigBlueButtonWithCurlTransportTest extends AbstractBigBlueButtonFunctionalTest
 {
-    /**
-     * {@inheritDoc}
-     */
     protected static function createTransport(): TransportInterface
     {
         return CurlTransport::createWithDefaultOptions();

diff --git a/tests/functional/BigBlueButtonWithPsrHttpClientTransport.php b/tests/functional/BigBlueButtonWithPsrHttpClientTransport.php
@@ -29,9 +29,6 @@
 
 final class BigBlueButtonWithPsrHttpClientTransport extends AbstractBigBlueButtonFunctionalTest
 {
-    /**
-     * {@inheritDoc}
-     */
     protected static function createTransport(): TransportInterface
     {
         $psr17Factory = new Psr17Factory();

diff --git a/tests/functional/BigBlueButtonWithSymfonyHttpClientTransportTest.php b/tests/functional/BigBlueButtonWithSymfonyHttpClientTransportTest.php
@@ -26,9 +26,6 @@
 
 final class BigBlueButtonWithSymfonyHttpClientTransportTest extends AbstractBigBlueButtonFunctionalTest
 {
-    /**
-     * {@inheritDoc}
-     */
     protected static function createTransport(): TransportInterface
     {
         return SymfonyHttpClientTransport::create();

diff --git a/tests/integration/Http/Transport/CurlTransportTest.php b/tests/integration/Http/Transport/CurlTransportTest.php
@@ -34,9 +34,6 @@
  */
 final class CurlTransportTest extends TestCase
 {
-    /**
-     * {@inheritDoc}
-     */
     public static function setUpBeforeClass(): void
     {
         TestHttpServer::start();
@@ -45,9 +42,9 @@ public static function setUpBeforeClass(): void
     public function provideBadResponseCodes(): iterable
     {
         // cURL does not understand codes below 200 properly.
-//        foreach (range(100, 199) as $badCode) {
-//            yield 'HTTP code ' . $badCode => [$badCode];
-//        }
+        //        foreach (range(100, 199) as $badCode) {
+        //            yield 'HTTP code ' . $badCode => [$badCode];
+        //        }
 
         foreach (range(300, 599) as $badCode) {
             yield 'HTTP code '.$badCode => [$badCode];

diff --git a/tests/unit/Http/Transport/Bridge/PsrHttpClient/PsrHttpClientTransportTest.php b/tests/unit/Http/Transport/Bridge/PsrHttpClient/PsrHttpClientTransportTest.php
@@ -62,9 +62,6 @@ final class PsrHttpClientTransportTest extends TestCase
      */
     private $streamFactoryMock;
 
-    /**
-     * {@inheritDoc}
-     */
     protected function setUp(): void
     {
         $this->transport = $this->createTransport();

diff --git a/tests/unit/Http/Transport/HeaderTest.php b/tests/unit/Http/Transport/HeaderTest.php
@@ -78,8 +78,6 @@ public function provideNonStringHeaders(): iterable
 
     /**
      * @dataProvider provideNonStringHeaders
-     *
-     * @param mixed $badHeader
      */
     public function testMergeCurlHeadersWithNonStringHeaders($badHeader): void
     {