Merge 6f6918a into e4d0453

pheanstalk · Dec 22, 2021 · bacc3e1 · bacc3e1
2 parents e4d0453 + 6f6918a
commit bacc3e1
Show file tree

Hide file tree

Showing 28 changed files with 233 additions and 185 deletions.
diff --git a/src/Command/AbstractCommand.php b/src/Command/AbstractCommand.php
@@ -5,6 +5,7 @@
 namespace Pheanstalk\Command;
 
 use Pheanstalk\Contract\CommandInterface;
+use Pheanstalk\Contract\ResponseInterface;
 use Pheanstalk\Contract\ResponseParserInterface;
 use Pheanstalk\Exception\CommandException;
 use Pheanstalk\Response\ArrayResponse;
@@ -40,7 +41,7 @@ public function getResponseParser(): ResponseParserInterface
     /**
      * Creates a Response for the given data.
      */
-    protected function createResponse(string $name, array $data = []): ArrayResponse
+    protected function createResponse(string $name, array $data = []): ResponseInterface
     {
         return new ArrayResponse($name, $data);
     }

diff --git a/src/Command/BuryCommand.php b/src/Command/BuryCommand.php
@@ -33,7 +33,7 @@ public function getCommandLine(): string
         );
     }
 
-    public function parseResponse(string $responseLine, ?string $responseData): ArrayResponse
+    public function parseResponse(\Pheanstalk\ResponseLine $responseLine, ?string $responseData): \Pheanstalk\Contract\ResponseInterface
     {
         if ($responseLine == ResponseInterface::RESPONSE_NOT_FOUND) {
             throw new Exception\JobNotFoundException(sprintf(

diff --git a/src/Command/DeleteCommand.php b/src/Command/DeleteCommand.php
@@ -20,7 +20,7 @@ public function getCommandLine(): string
         return 'delete ' . $this->jobId;
     }
 
-    public function parseResponse(string $responseLine, ?string $responseData): ArrayResponse
+    public function parseResponse(\Pheanstalk\ResponseLine $responseLine, ?string $responseData): \Pheanstalk\Contract\ResponseInterface
     {
         if ($responseLine == ResponseInterface::RESPONSE_NOT_FOUND) {
             throw new Exception\JobNotFoundException(sprintf(

diff --git a/src/Command/IgnoreCommand.php b/src/Command/IgnoreCommand.php
@@ -8,6 +8,7 @@
 use Pheanstalk\Contract\ResponseParserInterface;
 use Pheanstalk\Exception;
 use Pheanstalk\Response\ArrayResponse;
+use Pheanstalk\ResponseLine;
 
 /**
  * The 'ignore' command.
@@ -20,18 +21,14 @@ public function getCommandLine(): string
         return 'ignore ' . $this->tube;
     }
 
-    public function parseResponse(string $responseLine, ?string $responseData): ArrayResponse
+    public function parseResponse(ResponseLine $responseLine, ?string $responseData): ResponseInterface
     {
-        if (preg_match('#^WATCHING (\d+)$#', $responseLine, $matches)) {
-            return $this->createResponse('WATCHING', [
-                'count' => (int) $matches[1],
-            ]);
-        } elseif ($responseLine == ResponseInterface::RESPONSE_NOT_IGNORED) {
-            throw new Exception\ServerException(
-                $responseLine . ': cannot ignore last tube in watchlist'
-            );
+        if ($responseLine->getName() === ResponseInterface::RESPONSE_WATCHING) {
+            return $this->createResponse($responseLine->getName(), ['count' => (int)$responseLine->getArguments()[0]]);
+        } elseif ($responseLine->getName() === ResponseInterface::RESPONSE_NOT_IGNORED) {
+            throw new Exception\ServerException('Cannot ignore last tube in watchlist');
         } else {
-            throw new Exception('Unhandled response: ' . $responseLine);
+            throw new Exception("Unhandled response: {$responseLine->getName()}");
         }
     }
 }
diff --git a/src/Command/KickCommand.php b/src/Command/KickCommand.php
@@ -34,7 +34,7 @@ public function getCommandLine(): string
     /* (non-phpdoc)
      * @see ResponseParser::parseResponse()
      */
-    public function parseResponse(string $responseLine, ?string $responseData): ArrayResponse
+    public function parseResponse(\Pheanstalk\ResponseLine $responseLine, ?string $responseData): \Pheanstalk\Contract\ResponseInterface
     {
         list($code, $count) = explode(' ', $responseLine);
 

diff --git a/src/Command/KickJobCommand.php b/src/Command/KickJobCommand.php
@@ -29,7 +29,7 @@ public function getCommandLine(): string
     /* (non-phpdoc)
      * @see ResponseParser::parseResponse()
      */
-    public function parseResponse(string $responseLine, ?string $responseData): ArrayResponse
+    public function parseResponse(\Pheanstalk\ResponseLine $responseLine, ?string $responseData): \Pheanstalk\Contract\ResponseInterface
     {
         if ($responseLine == ResponseInterface::RESPONSE_NOT_FOUND) {
             throw new Exception\JobNotFoundException(sprintf(

diff --git a/src/Command/ListTubeUsedCommand.php b/src/Command/ListTubeUsedCommand.php
@@ -19,7 +19,7 @@ public function getCommandLine(): string
         return 'list-tube-used';
     }
 
-    public function parseResponse(string $responseLine, ?string $responseData): ArrayResponse
+    public function parseResponse(\Pheanstalk\ResponseLine $responseLine, ?string $responseData): \Pheanstalk\Contract\ResponseInterface
     {
         return $this->createResponse('USING', [
             'tube' => preg_replace('#^USING (.+)$#', '$1', $responseLine),

diff --git a/src/Command/PauseTubeCommand.php b/src/Command/PauseTubeCommand.php
@@ -8,6 +8,7 @@
 use Pheanstalk\Contract\ResponseParserInterface;
 use Pheanstalk\Exception;
 use Pheanstalk\Response\ArrayResponse;
+use Pheanstalk\ResponseLine;
 
 /**
  * The 'pause-tube' command.
@@ -40,18 +41,15 @@ public function getCommandLine(): string
         );
     }
 
-    public function parseResponse(string $responseLine, ?string $responseData): ArrayResponse
+    public function parseResponse(ResponseLine $responseLine, ?string $responseData): ResponseInterface
     {
-        if ($responseLine == ResponseInterface::RESPONSE_NOT_FOUND) {
-            throw new Exception\ServerException(sprintf(
+        return match ($responseLine->getName()) {
+            ResponseInterface::RESPONSE_NOT_FOUND => throw new Exception\ServerException(sprintf(
                 '%s: tube %s does not exist.',
-                $responseLine,
+                $responseLine->getName(),
                 $this->tube
-            ));
-        } elseif ($responseLine == ResponseInterface::RESPONSE_PAUSED) {
-            return $this->createResponse(ResponseInterface::RESPONSE_PAUSED);
-        } else {
-            throw new Exception('Unhandled response: "' . $responseLine . '"');
-        }
+            )),
+            ResponseInterface::RESPONSE_PAUSED => $this->createResponse($responseLine->getName())
+        };
     }
 }
diff --git a/src/Command/PeekCommand.php b/src/Command/PeekCommand.php
@@ -8,6 +8,7 @@
 use Pheanstalk\Contract\ResponseParserInterface;
 use Pheanstalk\Exception;
 use Pheanstalk\Response\ArrayResponse;
+use Pheanstalk\ResponseLine;
 
 /**
  * The 'peek', 'peek-ready', 'peek-delayed' and 'peek-buried' commands.
@@ -28,10 +29,7 @@ class PeekCommand extends AbstractCommand implements ResponseParserInterface
         self::TYPE_BURIED,
     ];
 
-    /**
-     * @var string
-     */
-    private $subcommand;
+    private string $subcommand;
 
     public function __construct(string $peekSubject)
     {
@@ -50,22 +48,12 @@ public function getCommandLine(): string
         return sprintf('peek-%s', $this->subcommand);
     }
 
-    public function parseResponse(string $responseLine, ?string $responseData): ArrayResponse
+    public function parseResponse(ResponseLine $responseLine, ?string $responseData): ResponseInterface
     {
-        if ($responseLine == ResponseInterface::RESPONSE_NOT_FOUND) {
-            return $this->createResponse(ResponseInterface::RESPONSE_NOT_FOUND);
-        }
-
-        if (preg_match('#^FOUND (\d+) \d+$#', $responseLine, $matches)) {
-            return $this->createResponse(
-                ResponseInterface::RESPONSE_FOUND,
-                [
-                    'id'      => (int) $matches[1],
-                    'jobdata' => $responseData,
-                ]
-            );
-        }
-
-        throw new Exception\ServerException("Unexpected response");
+        return match($responseLine->getName()) {
+            ResponseInterface::RESPONSE_NOT_FOUND => $this->createResponse($responseLine->getName()),
+            ResponseInterface::RESPONSE_FOUND => $this->createResponse(
+                $responseLine->getName(), ['id' => (int) $responseLine->getArguments()[0], 'jobdata' => $responseData]),
+        };
     }
 }
diff --git a/src/Command/PeekJobCommand.php b/src/Command/PeekJobCommand.php
@@ -21,7 +21,7 @@ public function getCommandLine(): string
         return sprintf('peek %u', $this->jobId);
     }
 
-    public function parseResponse(string $responseLine, ?string $responseData): ArrayResponse
+    public function parseResponse(\Pheanstalk\ResponseLine $responseLine, ?string $responseData): \Pheanstalk\Contract\ResponseInterface
     {
         if ($responseLine == ResponseInterface::RESPONSE_NOT_FOUND) {
             $message = sprintf(

diff --git a/src/Command/PutCommand.php b/src/Command/PutCommand.php
@@ -4,9 +4,12 @@
 
 namespace Pheanstalk\Command;
 
+use Pheanstalk\Contract\ResponseInterface;
 use Pheanstalk\Contract\ResponseParserInterface;
 use Pheanstalk\Exception;
+use Pheanstalk\Exception\ServerOutOfMemoryException;
 use Pheanstalk\Response\ArrayResponse;
+use Pheanstalk\ResponseLine;
 
 /**
  * The 'put' command.
@@ -64,37 +67,23 @@ public function getDataLength(): int
         return mb_strlen($this->data, '8bit');
     }
 
-    public function parseResponse(string $responseLine, ?string $responseData): ArrayResponse
+    public function parseResponse(\Pheanstalk\ResponseLine $responseLine, ?string $responseData): \Pheanstalk\Contract\ResponseInterface
     {
-        if (preg_match('#^INSERTED (\d+)$#', $responseLine, $matches)) {
-            return $this->createResponse('INSERTED', [
-                'id' => (int) $matches[1],
-            ]);
-        } elseif (preg_match('#^BURIED (\d)+$#', $responseLine, $matches)) {
-            throw new Exception\ServerOutOfMemoryException(sprintf(
-                '%s: server ran out of memory trying to grow the priority queue data structure.',
+        return match($responseLine->getName()) {
+            ResponseInterface::RESPONSE_INSERTED => $this->createResponse($responseLine->getName(), ['id' => (int) $responseLine->getArguments()]),
+            ResponseInterface::RESPONSE_BURIED => throw new ServerOutOfMemoryException(sprintf(
+        '%s: server ran out of memory trying to grow the priority queue data structure.',
                 $responseLine
-            ));
-        } elseif (preg_match('#^JOB_TOO_BIG$#', $responseLine)) {
-            throw new Exception\JobTooBigException(sprintf(
+            )),
+            ResponseInterface::RESPONSE_JOB_TOO_BIG => throw new Exception\JobTooBigException(sprintf(
                 '%s: job data exceeds server-enforced limit',
                 $responseLine
-            ));
-        } elseif (preg_match('#^EXPECTED_CRLF#', $responseLine)) {
-            throw new Exception\ClientBadFormatException(sprintf(
+            )),
+            ResponseInterface::RESPONSE_EXPECTED_CRLF => throw new Exception\ClientBadFormatException(sprintf(
                 '%s: CRLF expected',
                 $responseLine
-            ));
-        } elseif (preg_match('#^DRAINING#', $responseLine)) {
-            throw new Exception\ServerDrainingException(sprintf(
-                '%s: server is in drain mode and no longer accepting new jobs',
-                $responseLine
-            ));
-        } else {
-            throw new Exception(sprintf(
-                'Unhandled response: %s',
-                $responseLine
-            ));
-        }
+            )),
+
+        };
     }
 }
diff --git a/src/Command/ReleaseCommand.php b/src/Command/ReleaseCommand.php
@@ -9,6 +9,7 @@
 use Pheanstalk\Contract\ResponseParserInterface;
 use Pheanstalk\Exception;
 use Pheanstalk\Response\ArrayResponse;
+use Pheanstalk\ResponseLine;
 
 /**
  * The 'release' command.
@@ -40,24 +41,24 @@ public function getCommandLine(): string
         );
     }
 
-    public function parseResponse(string $responseLine, ?string $responseData): ArrayResponse
+    public function parseResponse(ResponseLine $responseLine, ?string $responseData): \Pheanstalk\Contract\ResponseInterface
     {
-        if ($responseLine == ResponseInterface::RESPONSE_BURIED) {
+        if ($responseLine->getName() === ResponseInterface::RESPONSE_BURIED) {
             throw new Exception\ServerOutOfMemoryException(sprintf(
                 'Job %u %s: out of memory trying to grow data structure',
                 $this->jobId,
                 $responseLine
             ));
         }
 
-        if ($responseLine == ResponseInterface::RESPONSE_NOT_FOUND) {
+        if ($responseLine->getName() === ResponseInterface::RESPONSE_NOT_FOUND) {
             throw new Exception\JobNotFoundException(sprintf(
                 'Job %u %s: does not exist or is not reserved by client',
                 $this->jobId,
                 $responseLine
             ));
         }
 
-        return $this->createResponse($responseLine);
+        return $this->createResponse($responseLine->getName());
     }
 }
diff --git a/src/Command/ReserveCommand.php b/src/Command/ReserveCommand.php
@@ -21,7 +21,7 @@ public function getCommandLine(): string
         return 'reserve';
     }
 
-    public function parseResponse(string $responseLine, ?string $responseData): ArrayResponse
+    public function parseResponse(\Pheanstalk\ResponseLine $responseLine, ?string $responseData): \Pheanstalk\Contract\ResponseInterface
     {
         if ($responseLine === ResponseInterface::RESPONSE_DEADLINE_SOON) {
             throw new DeadlineSoonException();

diff --git a/src/Command/ReserveJobCommand.php b/src/Command/ReserveJobCommand.php
@@ -9,6 +9,7 @@
 use Pheanstalk\Contract\ResponseParserInterface;
 use Pheanstalk\Exception\JobNotFoundException;
 use Pheanstalk\Response\ArrayResponse;
+use Pheanstalk\ResponseLine;
 
 /**
  * The 'reserve-job' command.
@@ -28,15 +29,14 @@ public function getCommandLine(): string
         return sprintf('reserve-job %d', $this->job);
     }
 
-    public function parseResponse(string $responseLine, ?string $responseData): ArrayResponse
+    public function parseResponse(ResponseLine $responseLine, ?string $responseData): ResponseInterface
     {
-        if ($responseLine === ResponseInterface::RESPONSE_NOT_FOUND) {
+        if ($responseLine->getName() === ResponseInterface::RESPONSE_NOT_FOUND) {
             throw new JobNotFoundException();
         }
 
-        list($code, $id) = explode(' ', $responseLine);
-        return $this->createResponse($code, [
-            'id'      => (int) $id,
+        return $this->createResponse($responseLine->getName(), [
+            'id'      => (int) $responseLine->getArguments()[0],
             'jobdata' => $responseData,
         ]);
     }

diff --git a/src/Command/ReserveWithTimeoutCommand.php b/src/Command/ReserveWithTimeoutCommand.php
@@ -32,7 +32,7 @@ public function getCommandLine(): string
         return sprintf('reserve-with-timeout %s', $this->timeout);
     }
 
-    public function parseResponse(string $responseLine, ?string $responseData): ArrayResponse
+    public function parseResponse(\Pheanstalk\ResponseLine $responseLine, ?string $responseData): \Pheanstalk\Contract\ResponseInterface
     {
         if (
             $responseLine === ResponseInterface::RESPONSE_DEADLINE_SOON

diff --git a/src/Command/TouchCommand.php b/src/Command/TouchCommand.php
@@ -24,7 +24,7 @@ public function getCommandLine(): string
         return sprintf('touch %u', $this->jobId);
     }
 
-    public function parseResponse(string $responseLine, ?string $responseData): ArrayResponse
+    public function parseResponse(\Pheanstalk\ResponseLine $responseLine, ?string $responseData): \Pheanstalk\Contract\ResponseInterface
     {
         if ($responseLine == ResponseInterface::RESPONSE_NOT_FOUND) {
             throw new Exception\JobNotFoundException(sprintf(

diff --git a/src/Command/UseCommand.php b/src/Command/UseCommand.php
@@ -21,10 +21,10 @@ public function getCommandLine(): string
         return 'use ' . $this->tube;
     }
 
-    public function parseResponse(string $responseLine, ?string $responseData): ArrayResponse
+    public function parseResponse(\Pheanstalk\ResponseLine $responseLine, ?string $responseData): \Pheanstalk\Contract\ResponseInterface
     {
-        return $this->createResponse('USING', [
-            'tube' => preg_replace('#^USING (.+)$#', '$1', $responseLine),
+        return $this->createResponse($responseLine->getName(), [
+            'tube' => $responseLine->getArguments()[0]
         ]);
     }
 }
diff --git a/src/Command/WatchCommand.php b/src/Command/WatchCommand.php
@@ -18,10 +18,10 @@ public function getCommandLine(): string
         return 'watch ' . $this->tube;
     }
 
-    public function parseResponse(string $responseLine, ?string $responseData): ArrayResponse
+    public function parseResponse(\Pheanstalk\ResponseLine $responseLine, ?string $responseData): \Pheanstalk\Contract\ResponseInterface
     {
-        return $this->createResponse('WATCHING', [
-            'count' => preg_replace('#^WATCHING (.+)$#', '$1', $responseLine),
+        return $this->createResponse($responseLine->getName(), [
+            'count' => $responseLine->getArguments()[0],
         ]);
     }
 }