Fix response parser (#38)

fre5h · May 25, 2024 · 9549ca8 · 9549ca8
1 parent 903d834
commit 9549ca8
Show file tree

Hide file tree

Showing 74 changed files with 568 additions and 221 deletions.
diff --git a/Model/ChannelsCommand.php b/Model/ChannelsCommand.php
@@ -32,4 +32,12 @@ public function __construct(string $pattern = null)
 
         parent::__construct(Method::CHANNELS, $params);
     }
+
+    /**
+     * {@inheritdoc}
+     */
+    public function processResponse(array $data): array
+    {
+        return $data;
+    }
 }
diff --git a/Model/HistoryCommand.php b/Model/HistoryCommand.php
@@ -53,4 +53,12 @@ public function __construct(protected readonly string $channel, bool $reverse =
 
         parent::__construct(Method::HISTORY, $params);
     }
+
+    /**
+     * {@inheritdoc}
+     */
+    public function processResponse(array $data): array
+    {
+        return $data['result'];
+    }
 }
diff --git a/Model/InfoCommand.php b/Model/InfoCommand.php
@@ -26,4 +26,12 @@ public function __construct()
     {
         parent::__construct(Method::INFO, []);
     }
+
+    /**
+     * {@inheritdoc}
+     */
+    public function processResponse(array $data): array
+    {
+        return $data['result'];
+    }
 }
diff --git a/Model/PresenceCommand.php b/Model/PresenceCommand.php
@@ -33,4 +33,12 @@ public function __construct(protected readonly string $channel)
             ]
         );
     }
+
+    /**
+     * {@inheritdoc}
+     */
+    public function processResponse(array $data): array
+    {
+        return $data['result']['presence'];
+    }
 }
diff --git a/Model/PresenceStatsCommand.php b/Model/PresenceStatsCommand.php
@@ -33,4 +33,12 @@ public function __construct(protected readonly string $channel)
             ]
         );
     }
+
+    /**
+     * {@inheritdoc}
+     */
+    public function processResponse(array $data): array
+    {
+        return $data['result'];
+    }
 }
diff --git a/Model/ResultableCommandInterface.php b/Model/ResultableCommandInterface.php
@@ -19,4 +19,10 @@
  */
 interface ResultableCommandInterface extends CommandInterface
 {
+    /**
+     * @param array $data
+     *
+     * @return array
+     */
+    public function processResponse(array $data): array;
 }
diff --git a/Service/ResponseProcessor.php b/Service/ResponseProcessor.php
@@ -129,7 +129,7 @@ private function decodeAndProcessResponseResult(CommandInterface $command, Respo
             $result = $data;
             $successfulCommand = false;
         } elseif ($command instanceof ResultableCommandInterface) {
-            $result = $data[$command->getMethod()->value];
+            $result = $command->processResponse($data);
         }
 
         if ($this->profilerEnabled) {

diff --git a/Tests/Command/Argument/ArgumentChannelTraitTest.php b/Tests/Command/Argument/ArgumentChannelTraitTest.php
@@ -16,6 +16,7 @@
 use Fresh\CentrifugoBundle\Exception\InvalidArgumentException as CentrifugoInvalidArgumentException;
 use Fresh\CentrifugoBundle\Service\CentrifugoChecker;
 use Fresh\CentrifugoBundle\Service\CentrifugoInterface;
+use PHPUnit\Framework\Attributes\Test;
 use PHPUnit\Framework\MockObject\MockObject;
 use PHPUnit\Framework\TestCase;
 use Symfony\Component\Console\Application;
@@ -64,7 +65,8 @@ protected function tearDown(): void
         );
     }
 
-    public function testInvalidChannelName(): void
+    #[Test]
+    public function invalidChannelName(): void
     {
         $this->centrifugoChecker
             ->expects(self::once())
@@ -89,7 +91,8 @@ public function testInvalidChannelName(): void
         );
     }
 
-    public function testChannelNameIsNotString(): void
+    #[Test]
+    public function channelNameIsNotString(): void
     {
         $this->centrifugoChecker
             ->expects(self::never())
@@ -112,7 +115,8 @@ public function testChannelNameIsNotString(): void
         );
     }
 
-    public function testChannelNameIsMissed(): void
+    #[Test]
+    public function channelNameIsMissed(): void
     {
         $this->centrifugoChecker
             ->expects(self::never())

diff --git a/Tests/Command/Argument/ArgumentChannelsTraitTest.php b/Tests/Command/Argument/ArgumentChannelsTraitTest.php
@@ -15,6 +15,7 @@
 use Fresh\CentrifugoBundle\Command\BroadcastCommand;
 use Fresh\CentrifugoBundle\Service\CentrifugoChecker;
 use Fresh\CentrifugoBundle\Service\CentrifugoInterface;
+use PHPUnit\Framework\Attributes\Test;
 use PHPUnit\Framework\MockObject\MockObject;
 use PHPUnit\Framework\TestCase;
 use Symfony\Component\Console\Application;
@@ -63,7 +64,8 @@ protected function tearDown(): void
         );
     }
 
-    public function testInvalidChannelName(): void
+    #[Test]
+    public function invalidChannelName(): void
     {
         $this->centrifugoChecker
             ->expects(self::once())

diff --git a/Tests/Command/Argument/ArgumentDataTraitTest.php b/Tests/Command/Argument/ArgumentDataTraitTest.php
@@ -15,6 +15,7 @@
 use Fresh\CentrifugoBundle\Command\BroadcastCommand;
 use Fresh\CentrifugoBundle\Service\CentrifugoChecker;
 use Fresh\CentrifugoBundle\Service\CentrifugoInterface;
+use PHPUnit\Framework\Attributes\Test;
 use PHPUnit\Framework\MockObject\MockObject;
 use PHPUnit\Framework\TestCase;
 use Symfony\Component\Console\Application;
@@ -63,7 +64,8 @@ protected function tearDown(): void
         );
     }
 
-    public function testDataIsNotValidJson(): void
+    #[Test]
+    public function dataIsNotValidJson(): void
     {
         $this->centrifugo
             ->expects(self::never())
@@ -82,7 +84,8 @@ public function testDataIsNotValidJson(): void
         );
     }
 
-    public function testDataIsNotString(): void
+    #[Test]
+    public function dataIsNotString(): void
     {
         $this->centrifugo
             ->expects(self::never())

diff --git a/Tests/Command/Argument/ArgumentUserTraitTest.php b/Tests/Command/Argument/ArgumentUserTraitTest.php
@@ -14,6 +14,7 @@
 
 use Fresh\CentrifugoBundle\Command\DisconnectCommand;
 use Fresh\CentrifugoBundle\Service\CentrifugoInterface;
+use PHPUnit\Framework\Attributes\Test;
 use PHPUnit\Framework\MockObject\MockObject;
 use PHPUnit\Framework\TestCase;
 use Symfony\Component\Console\Application;
@@ -57,7 +58,8 @@ protected function tearDown(): void
         );
     }
 
-    public function testInvalidUser(): void
+    #[Test]
+    public function invalidUser(): void
     {
         $this->centrifugo
             ->expects(self::never())

diff --git a/Tests/Command/BroadcastCommandTest.php b/Tests/Command/BroadcastCommandTest.php
@@ -15,6 +15,7 @@
 use Fresh\CentrifugoBundle\Command\BroadcastCommand;
 use Fresh\CentrifugoBundle\Service\CentrifugoChecker;
 use Fresh\CentrifugoBundle\Service\CentrifugoInterface;
+use PHPUnit\Framework\Attributes\Test;
 use PHPUnit\Framework\MockObject\MockObject;
 use PHPUnit\Framework\TestCase;
 use Symfony\Component\Console\Application;
@@ -62,7 +63,8 @@ protected function tearDown(): void
         );
     }
 
-    public function testSuccessfulExecutionWithRequiredParameters(): void
+    #[Test]
+    public function successfulExecutionWithRequiredParameters(): void
     {
         $this->centrifugo
             ->expects(self::once())
@@ -83,7 +85,8 @@ public function testSuccessfulExecutionWithRequiredParameters(): void
         self::assertStringContainsString('DONE', $output);
     }
 
-    public function testSuccessfulExecutionWithAllParameters(): void
+    #[Test]
+    public function successfulExecutionWithAllParameters(): void
     {
         $this->centrifugo
             ->expects(self::once())
@@ -107,7 +110,8 @@ public function testSuccessfulExecutionWithAllParameters(): void
         self::assertStringContainsString('DONE', $output);
     }
 
-    public function testException(): void
+    #[Test]
+    public function exception(): void
     {
         $this->centrifugo
             ->expects(self::once())

diff --git a/Tests/Command/ChannelsCommandTest.php b/Tests/Command/ChannelsCommandTest.php
@@ -14,6 +14,7 @@
 
 use Fresh\CentrifugoBundle\Command\ChannelsCommand;
 use Fresh\CentrifugoBundle\Service\CentrifugoInterface;
+use PHPUnit\Framework\Attributes\Test;
 use PHPUnit\Framework\MockObject\MockObject;
 use PHPUnit\Framework\TestCase;
 use Symfony\Component\Console\Application;
@@ -56,7 +57,8 @@ protected function tearDown(): void
         );
     }
 
-    public function testSuccessfulExecutionWithoutPattern(): void
+    #[Test]
+    public function successfulExecutionWithoutPattern(): void
     {
         $this->centrifugo
             ->expects(self::once())
@@ -73,7 +75,8 @@ public function testSuccessfulExecutionWithoutPattern(): void
         self::assertStringContainsString('Total Channels: 2', $output);
     }
 
-    public function testSuccessfulExecutionWithPattern(): void
+    #[Test]
+    public function successfulExecutionWithPattern(): void
     {
         $this->centrifugo
             ->expects(self::once())
@@ -94,7 +97,8 @@ public function testSuccessfulExecutionWithPattern(): void
         self::assertStringContainsString('Total Channels: 1', $output);
     }
 
-    public function testNoData(): void
+    #[Test]
+    public function noData(): void
     {
         $this->centrifugo
             ->expects(self::once())
@@ -109,7 +113,8 @@ public function testNoData(): void
         self::assertStringContainsString('NO DATA', $output);
     }
 
-    public function testException(): void
+    #[Test]
+    public function exception(): void
     {
         $this->centrifugo
             ->expects(self::once())
@@ -124,7 +129,8 @@ public function testException(): void
         self::assertStringContainsString('test', $output);
     }
 
-    public function testAutocomplete(): void
+    #[Test]
+    public function autocomplete(): void
     {
         $this->centrifugo
             ->expects(self::once())

diff --git a/Tests/Command/DisconnectCommandTest.php b/Tests/Command/DisconnectCommandTest.php
@@ -15,6 +15,7 @@
 use Fresh\CentrifugoBundle\Command\DisconnectCommand;
 use Fresh\CentrifugoBundle\Model\Disconnect;
 use Fresh\CentrifugoBundle\Service\CentrifugoInterface;
+use PHPUnit\Framework\Attributes\Test;
 use PHPUnit\Framework\MockObject\MockObject;
 use PHPUnit\Framework\TestCase;
 use Symfony\Component\Console\Application;
@@ -58,7 +59,8 @@ protected function tearDown(): void
         );
     }
 
-    public function testSuccessfulExecutionWithRequiredParameters(): void
+    #[Test]
+    public function successfulExecutionWithRequiredParameters(): void
     {
         $this->centrifugo
             ->expects(self::once())
@@ -78,7 +80,8 @@ public function testSuccessfulExecutionWithRequiredParameters(): void
         self::assertStringContainsString('DONE', $output);
     }
 
-    public function testSuccessfulExecutionWithAllParameters(): void
+    #[Test]
+    public function successfulExecutionWithAllParameters(): void
     {
         $this->centrifugo
             ->expects(self::once())
@@ -103,7 +106,8 @@ public function testSuccessfulExecutionWithAllParameters(): void
         self::assertStringContainsString('DONE', $output);
     }
 
-    public function testExceptionForMissingDisconnectCode(): void
+    #[Test]
+    public function exceptionForMissingDisconnectCode(): void
     {
         $this->centrifugo
             ->expects(self::never())
@@ -129,7 +133,8 @@ public function testExceptionForMissingDisconnectCode(): void
         self::assertStringContainsString('DONE', $output);
     }
 
-    public function testExceptionForMissingDisconnectReason(): void
+    #[Test]
+    public function exceptionForMissingDisconnectReason(): void
     {
         $this->centrifugo
             ->expects(self::never())
@@ -155,7 +160,8 @@ public function testExceptionForMissingDisconnectReason(): void
         self::assertStringContainsString('DONE', $output);
     }
 
-    public function testException(): void
+    #[Test]
+    public function exception(): void
     {
         $this->centrifugo
             ->expects(self::once())

diff --git a/Tests/Command/HistoryCommandTest.php b/Tests/Command/HistoryCommandTest.php
@@ -16,6 +16,7 @@
 use Fresh\CentrifugoBundle\Model\StreamPosition;
 use Fresh\CentrifugoBundle\Service\CentrifugoChecker;
 use Fresh\CentrifugoBundle\Service\CentrifugoInterface;
+use PHPUnit\Framework\Attributes\Test;
 use PHPUnit\Framework\MockObject\MockObject;
 use PHPUnit\Framework\TestCase;
 use Symfony\Component\Console\Application;
@@ -63,7 +64,8 @@ protected function tearDown(): void
         );
     }
 
-    public function testSuccessfulExecutionWithRequiredParameters(): void
+    #[Test]
+    public function successfulExecutionWithRequiredParameters(): void
     {
         $this->centrifugo
             ->expects(self::once())
@@ -106,7 +108,8 @@ public function testSuccessfulExecutionWithRequiredParameters(): void
         self::assertStringContainsString('Epoch: test', $output);
     }
 
-    public function testSuccessfulExecutionWithAllParameters(): void
+    #[Test]
+    public function successfulExecutionWithAllParameters(): void
     {
         $this->centrifugo
             ->expects(self::once())
@@ -153,7 +156,8 @@ public function testSuccessfulExecutionWithAllParameters(): void
         self::assertStringContainsString('Epoch: test', $output);
     }
 
-    public function testException(): void
+    #[Test]
+    public function exception(): void
     {
         $this->centrifugo
             ->expects(self::once())