Added support for Pheanstalk 4

chesszebra · Jan 31, 2020 · 3ef2787 · 3ef2787
1 parent c46269f
commit 3ef2787
Show file tree

Hide file tree

Showing 6 changed files with 60 additions and 49 deletions.
diff --git a/composer.json b/composer.json
@@ -11,7 +11,7 @@
     },
     "require-dev": {
         "chesszebra/coding-standards": "dev-master",
-        "pda/pheanstalk": "^3.1",
+        "pda/pheanstalk": "^4.0",
         "phpunit/phpunit": "^6.3",
         "squizlabs/php_codesniffer": "^3.0"
     },

diff --git a/composer.lock b/composer.lock
diff --git a/src/Storage/Pheanstalk.php b/src/Storage/Pheanstalk.php
@@ -4,10 +4,11 @@
 
 namespace ChessZebra\JobSystem\Storage;
 
+use ArrayObject;
 use ChessZebra\JobSystem\Job\JobInterface;
 use ChessZebra\JobSystem\Storage\Pheanstalk\StoredJob;
+use Pheanstalk\Contract\PheanstalkInterface;
 use Pheanstalk\Job;
-use Pheanstalk\PheanstalkInterface;
 use function assert;
 use function json_encode;
 use function microtime;
@@ -73,7 +74,12 @@ public function addJob(JobInterface $job): void
         $delay = $job->getDelay() ?: PheanstalkInterface::DEFAULT_DELAY;
         $ttr = $job->getTimeToRun() ?: PheanstalkInterface::DEFAULT_TTR;
 
-        $this->connection->putInTube($tube, $data, $priority, $delay, $ttr);
+        $tubeBackup = $this->connection->listTubeUsed();
+
+        $this->connection->useTube($tube);
+        $this->connection->put($data, $priority, $delay, $ttr);
+
+        $this->connection->useTube($tubeBackup);
     }
 
     /**
@@ -124,14 +130,16 @@ public function rescheduleJob(StoredJobInterface $storedJob, ?int $delay, ?int $
      */
     public function retrieveJob(): ?StoredJobInterface
     {
-        $job = $this->connection->reserve($this->getReserveTimeout());
+        $job = $this->connection->reserve();
         assert($job instanceof Job || $job === null);
 
-        if (!$job) {
+        if ($job === null) {
             return null;
         }
 
-        $stats = $this->connection->statsJob($job)->getArrayCopy();
+        $statsResponse = $this->connection->statsJob($job);
+
+        $stats = (new ArrayObject($statsResponse))->getArrayCopy();
 
         return new StoredJob($job, $stats);
     }

diff --git a/src/Storage/Pheanstalk/StoredJob.php b/src/Storage/Pheanstalk/StoredJob.php
@@ -7,8 +7,8 @@
 use ChessZebra\JobSystem\Job\Job;
 use ChessZebra\JobSystem\Job\JobInterface;
 use ChessZebra\JobSystem\Storage\StoredJobInterface;
+use Pheanstalk\Contract\PheanstalkInterface;
 use Pheanstalk\Job as PheanstalkJob;
-use Pheanstalk\PheanstalkInterface;
 use RuntimeException;
 use function array_key_exists;
 use function json_decode;

diff --git a/tests/Storage/Pheanstalk/StoredJobTest.php b/tests/Storage/Pheanstalk/StoredJobTest.php
@@ -11,8 +11,8 @@
 namespace ChessZebra\JobSystem\Storage\Pheanstalk;
 
 use ChessZebra\JobSystem\Job\JobInterface;
+use Pheanstalk\Contract\PheanstalkInterface;
 use Pheanstalk\Job;
-use Pheanstalk\PheanstalkInterface;
 use PHPUnit\Framework\TestCase;
 use RuntimeException;
 use function json_encode;

diff --git a/tests/Storage/PheanstalkTest.php b/tests/Storage/PheanstalkTest.php
@@ -13,18 +13,19 @@
 use ArrayObject;
 use ChessZebra\JobSystem\Job\Job;
 use ChessZebra\JobSystem\Storage\Pheanstalk\StoredJob;
+use Pheanstalk\Contract\PheanstalkInterface;
+use Pheanstalk\Contract\ResponseInterface;
 use Pheanstalk\Job as PheanstalkJob;
-use Pheanstalk\PheanstalkInterface;
+use PHPUnit\Framework\MockObject\MockObject;
 use PHPUnit\Framework\TestCase;
-use PHPUnit_Framework_MockObject_MockObject;
 use function json_encode;
 
 final class PheanstalkTest extends TestCase
 {
     /**
      * The connection used to create tests.
      *
-     * @var PHPUnit_Framework_MockObject_MockObject
+     * @var MockObject|PheanstalkInterface
      */
     private $connection;
 
@@ -82,8 +83,9 @@ public function testSetGetReserveTimeout(): void
     public function testAddJobWithNullQueue(): void
     {
         // Arrange
-        $this->connection->expects($this->once())->method('putInTube')->with(
-            $this->equalTo('default')
+        $this->connection->expects(static::exactly(2))->method('useTube')->withConsecutive(
+            [static::equalTo('default')],
+            [static::equalTo('')]
         );
 
         $storage = new Pheanstalk($this->connection);
@@ -105,8 +107,9 @@ public function testAddJobWithNullQueue(): void
     public function testAddJobWithQueueName(): void
     {
         // Arrange
-        $this->connection->expects($this->once())->method('putInTube')->with(
-            $this->equalTo('awesome')
+        $this->connection->expects(static::exactly(2))->method('useTube')->withConsecutive(
+            [static::equalTo('awesome')],
+            [static::equalTo('')]
         );
 
         $storage = new Pheanstalk($this->connection);
@@ -130,8 +133,8 @@ public function testDeleteJob(): void
         // Arrange
         $job = new PheanstalkJob(123, '');
 
-        $this->connection->expects($this->once())->method('delete')->with(
-            $this->equalTo($job)
+        $this->connection->expects(static::once())->method('delete')->with(
+            static::equalTo($job)
         );
 
         $storage = new Pheanstalk($this->connection);
@@ -155,8 +158,8 @@ public function testFailJob(): void
         // Arrange
         $job = new PheanstalkJob(123, '');
 
-        $this->connection->expects($this->once())->method('bury')->with(
-            $this->equalTo($job)
+        $this->connection->expects(static::once())->method('bury')->with(
+            static::equalTo($job)
         );
 
         $storage = new Pheanstalk($this->connection);
@@ -183,8 +186,8 @@ public function testRescheduleJob(): void
             'data' => [],
         ]));
 
-        $this->connection->expects($this->once())->method('release')->with(
-            $this->equalTo($job)
+        $this->connection->expects(static::once())->method('release')->with(
+            static::equalTo($job)
         );
 
         $storage = new Pheanstalk($this->connection);
@@ -211,11 +214,8 @@ public function testRescheduleJob(): void
     public function testRetrieveJobWithoutJobPresent(): void
     {
         // Arrange
-        $this->connection->expects($this->once())->method('reserve')->with(
-            $this->equalTo(1)
-        );
-
-        $this->connection->expects($this->never())->method('statsJob');
+        $this->connection->expects(static::once())->method('reserve');
+        $this->connection->expects(static::never())->method('statsJob');
 
         $storage = new Pheanstalk($this->connection);
 
@@ -236,13 +236,13 @@ public function testRetrieveJobWithJobPresent(): void
         // Arrange
         $job = new PheanstalkJob(123, '');
 
-        $this->connection->expects($this->once())->method('reserve')->with(
-            $this->equalTo(1)
-        )->willReturn($job);
+        $this->connection->expects(static::once())->method('reserve')->willReturn($job);
 
-        $this->connection->expects($this->once())->method('statsJob')->with(
-            $this->equalTo($job)
-        )->willReturn(new ArrayObject(['ttr' => 0]));
+        $statsResponse = $this->getMockForAbstractClass(ResponseInterface::class);
+
+        $this->connection->expects(static::once())->method('statsJob')->with(
+            static::equalTo($job)
+        )->willReturn($statsResponse);
 
         $storage = new Pheanstalk($this->connection);
 
@@ -264,9 +264,9 @@ public function testPingJob(): void
         $job = new PheanstalkJob(123, '');
         $storedJob = new StoredJob($job, []);
 
-        $this->connection->expects($this->once())->method('touch')->with(
-            $this->equalTo($job)
-        )->willReturn($job);
+        $this->connection->expects(static::once())->method('touch')->with(
+            static::equalTo($job)
+        );
 
         $storage = new Pheanstalk($this->connection);