Merge pull request #27492 from crynobone/pheanstalk-4

[5.8] Update to pda/pheanstalk ^4.0

composer.json

@@ -84,7 +84,7 @@
         "mockery/mockery": "^1.0",
         "moontoast/math": "^1.1",
         "orchestra/testbench-core": "3.8.*",
-        "pda/pheanstalk": "^3.0",
+        "pda/pheanstalk": "^4.0",
         "phpunit/phpunit": "^7.5|^8.0",
         "predis/predis": "^1.1.1",
         "symfony/css-selector": "^4.2",
@@ -128,7 +128,7 @@
         "league/flysystem-sftp": "Required to use the Flysystem SFTP driver (^1.0).",
         "moontoast/math": "Required to use ordered UUIDs (^1.1).",
         "nexmo/client": "Required to use the Nexmo transport (^1.0).",
-        "pda/pheanstalk": "Required to use the beanstalk queue driver (^3.0).",
+        "pda/pheanstalk": "Required to use the beanstalk queue driver (^4.0).",
         "predis/predis": "Required to use the redis cache and queue drivers (^1.0).",
         "pusher/pusher-php-server": "Required to use the Pusher broadcast driver (^3.0).",
         "symfony/css-selector": "Required to use some of the crawler integration testing tools (^4.2).",

src/Illuminate/Queue/BeanstalkdQueue.php

@@ -126,7 +126,7 @@ public function pop($queue = null)
     {
         $queue = $this->getQueue($queue);
 
-        $job = $this->pheanstalk->watchOnly($queue)->reserve($this->blockFor);
+        $job = $this->pheanstalk->watchOnly($queue)->reserveWithTimeout($this->blockFor);
 
         if ($job instanceof PheanstalkJob) {
             return new BeanstalkdJob(

src/Illuminate/Queue/Connectors/BeanstalkdConnector.php

@@ -32,11 +32,10 @@ public function connect(array $config)
      */
     protected function pheanstalk(array $config)
     {
-        return new Pheanstalk(
+        return Pheanstalk::connect(
             $config['host'],
             $config['port'] ?? Pheanstalk::DEFAULT_PORT,
-            $config['timeout'] ?? Connection::DEFAULT_CONNECT_TIMEOUT,
-            $config['persistent'] ?? false
+            $config['timeout'] ?? Connection::DEFAULT_CONNECT_TIMEOUT
         );
     }
 }

src/Illuminate/Queue/composer.json

@@ -41,7 +41,7 @@
         "ext-posix": "Required to use all features of the queue worker.",
         "aws/aws-sdk-php": "Required to use the SQS queue driver (^3.0).",
         "illuminate/redis": "Required to use the Redis queue driver (5.8.*).",
-        "pda/pheanstalk": "Required to use the Beanstalk queue driver (^3.0)."
+        "pda/pheanstalk": "Required to use the Beanstalk queue driver (^4.0)."
     },
     "config": {
         "sort-packages": true

tests/Queue/QueueBeanstalkdQueueTest.php

@@ -48,7 +48,7 @@ public function testPopProperlyPopsJobOffOfBeanstalkd()
         $pheanstalk = $queue->getPheanstalk();
         $pheanstalk->shouldReceive('watchOnly')->once()->with('default')->andReturn($pheanstalk);
         $job = m::mock(Job::class);
-        $pheanstalk->shouldReceive('reserve')->once()->with(0)->andReturn($job);
+        $pheanstalk->shouldReceive('reserveWithTimeout')->once()->with(0)->andReturn($job);
 
         $result = $queue->pop();
 
@@ -62,7 +62,7 @@ public function testBlockingPopProperlyPopsJobOffOfBeanstalkd()
         $pheanstalk = $queue->getPheanstalk();
         $pheanstalk->shouldReceive('watchOnly')->once()->with('default')->andReturn($pheanstalk);
         $job = m::mock(Job::class);
-        $pheanstalk->shouldReceive('reserve')->once()->with(60)->andReturn($job);
+        $pheanstalk->shouldReceive('reserveWithTimeout')->once()->with(60)->andReturn($job);
 
         $result = $queue->pop();