Refactoring

.github/workflows/ci.yaml

@@ -126,7 +126,7 @@ jobs:
         working-directory: './'
 
       - name: 'Run PHPUnit'
-        run: ./vendor/bin/phpunit -v -c phpunit.xml.dist
+        run: ./vendor/bin/phpunit -c phpunit.xml.dist
 
   code-coverage:
     needs: test
@@ -151,7 +151,7 @@ jobs:
         working-directory: './'
 
       - name: 'Run PHPUnit with Code Coverage'
-        run: ./vendor/bin/phpunit -v -c phpunit.xml.dist --coverage-clover=coverage.xml
+        run: ./vendor/bin/phpunit -c phpunit.xml.dist --coverage-clover=coverage.xml
 
       - name: 'Download Coverage Files'
         uses: actions/download-artifact@v2

Model/AbstractCommand.php

@@ -52,16 +52,14 @@ public function getChannels(): iterable
     }
 
     /**
-     * @return array<string, mixed>
+     * @return array|\stdClass
      */
-    public function jsonSerialize(): array
+    public function jsonSerialize(): array|\stdClass
     {
         if (!empty($this->params)) {
-            $data = $this->params;
-        } else {
-            $data = new \stdClass(); // To have {} in json, restrictions of Centrifugo
+            return $this->params;
         }
 
-        return $data;
+        return new \stdClass();
     }
 }

Model/BatchRequest.php

@@ -43,6 +43,14 @@ public function __construct(array $commands = [])
         }
     }
 
+    /**
+     * @return Method
+     */
+    public function getMethod(): Method
+    {
+        return Method::BATCH;
+    }
+
     /**
      * @param CommandInterface $command
      */
@@ -88,7 +96,7 @@ public function prepareLineDelimitedJson(): string
         $serializedCommands = [];
 
         foreach ($this->getCommands() as $command) {
-            $serializedCommands[] = \json_encode($command, \JSON_THROW_ON_ERROR);
+            $serializedCommands['commands'] = \json_encode($command, \JSON_THROW_ON_ERROR);
         }
 
         if (!empty($serializedCommands)) {

Model/Method.php

@@ -31,4 +31,5 @@ enum Method: string
     case HISTORY_REMOVE = 'history_remove';
     case CHANNELS = 'channels';
     case INFO = 'info';
+    case BATCH = 'batch';
 }

Resources/docs/authentication.md

@@ -150,6 +150,7 @@ class AdminsChannelAuthenticator implements ChannelAuthenticatorInterface
 
 ```php
 <?php
+declare(strict_types=1);
 
 namespace App\Controller;
 

Resources/docs/configuration.md

@@ -9,17 +9,17 @@ But you can customize bundle configuration for your own needs.
 # config/packages/fresh_centrifugo.yaml
 
 fresh_centrifugo:
-    # Default value is 255, if you changed it in Centrifugo configuration,
-    # then you can change it in bundle configuration, it effects only on validation
-    channel_max_length: 255
-    jwt:
-        # You can set default TTL for all JWT tokens, if it not set, then default value is NULL
-        # Default NULL value means that tokens will not be expired
-        ttl: 86400 
-    fake_mode: true # Enables fake mode for Centrifugo client, no real request will be sent.
-    api_key: '%env(CENTRIFUGO_API_KEY)%' # You can change API key here
-    api_endpoint: '%env(CENTRIFUGO_API_ENDPOINT)%' # You can change API endpoint here
-    secret: '%env(CENTRIFUGO_SECRET)%' # You can change secret here
+  # Default value is 255, if you changed it in Centrifugo configuration,
+  # then you can change it in bundle configuration, it effects only on validation
+  channel_max_length: 255
+  jwt:
+    # You can set default TTL for all JWT tokens, if it not set, then default value is NULL
+    # Default NULL value means that tokens will not be expired
+    ttl: 86400 
+  fake_mode: true # Enables fake mode for Centrifugo client, no real request will be sent.
+  api_key: '%env(CENTRIFUGO_API_KEY)%' # You can change API key here
+  api_endpoint: '%env(CENTRIFUGO_API_ENDPOINT)%' # You can change API endpoint here
+  secret: '%env(CENTRIFUGO_SECRET)%' # You can change secret here
 ```
 
 ## More features

Service/Centrifugo.php

@@ -64,7 +64,7 @@ public function broadcast(array $data, array $channels, bool $skipHistory = fals
     /**
      * {@inheritdoc}
      */
-    public function subscribe(string $user, string $channel, array $info = [], ?string $base64Info = null, ?string $client = null, ?string $session = null, array $data = [], ?string $base64Data = null, ?StreamPosition $recoverSince = null, ?Override $override = null): void
+    public function subscribe(string $user, string $channel, array $info = [], string $base64Info = null, string $client = null, string $session = null, array $data = [], string $base64Data = null, StreamPosition $recoverSince = null, Override $override = null): void
     {
         $this->doSendCommand(new Model\SubscribeCommand($user, $channel, $info, $base64Info, $client, $session, $data, $base64Data, $recoverSince, $override));
     }
@@ -80,15 +80,15 @@ public function unsubscribe(string $user, string $channel, string $client = '',
     /**
      * {@inheritdoc}
      */
-    public function disconnect(string $user, array $whitelist = [], ?string $client = null, ?string $session = null, ?Disconnect $disconnectObject = null): void
+    public function disconnect(string $user, array $whitelist = [], string $client = null, string $session = null, Disconnect $disconnectObject = null): void
     {
         $this->doSendCommand(new Model\DisconnectCommand($user, $whitelist, $client, $session, $disconnectObject));
     }
 
     /**
      * {@inheritdoc}
      */
-    public function refresh(string $user, ?string $client = null, ?string $session = null, ?bool $expired = null, ?int $expireAt = null): void
+    public function refresh(string $user, string $client = null, string $session = null, bool $expired = null, int $expireAt = null): void
     {
         $this->doSendCommand(new Model\RefreshCommand($user, $client, $session, $expired, $expireAt));
     }
@@ -112,7 +112,7 @@ public function presenceStats(string $channel): array
     /**
      * {@inheritdoc}
      */
-    public function history(string $channel, bool $reverse = false, ?int $limit = null, ?StreamPosition $streamPosition = null): array
+    public function history(string $channel, bool $reverse = false, int $limit = null, StreamPosition $streamPosition = null): array
     {
         return (array) $this->doSendCommand(new Model\HistoryCommand($channel, $reverse, $limit, $streamPosition));
     }
@@ -128,7 +128,7 @@ public function historyRemove(string $channel): void
     /**
      * {@inheritdoc}
      */
-    public function channels(?string $pattern = null): array
+    public function channels(string $pattern = null): array
     {
         return (array) $this->doSendCommand(new Model\ChannelsCommand($pattern));
     }
@@ -163,7 +163,7 @@ private function doSendCommand(CommandInterface $command): ?array
         if ($command instanceof Model\BatchRequest) {
             $json = $command->prepareLineDelimitedJson();
         } else {
-            $json = \json_encode($command, \JSON_THROW_ON_ERROR);
+            $json = json_encode($command, \JSON_THROW_ON_ERROR);
         }
 
         if ($this->profilerEnabled) {
@@ -172,7 +172,7 @@ private function doSendCommand(CommandInterface $command): ?array
 
         $response = $this->httpClient->request(
             Request::METHOD_POST,
-            \sprintf('%s/%s', $this->endpoint, $command->getMethod()),
+            sprintf('%s/%s', $this->endpoint, $command->getMethod()->value),
             [
                 'headers' => [
                     'X-API-Key' => $this->apiKey,