Skip to content

Commit 789d8ad

Browse files
committed
require php-amqplib/php-amqplib >= 3.0
1 parent 659bd43 commit 789d8ad

File tree

3 files changed

+6
-5
lines changed

3 files changed

+6
-5
lines changed

composer.json

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -30,7 +30,7 @@
3030
},
3131
"require-dev": {
3232
"ext-amqp": "*",
33-
"php-amqplib/php-amqplib": "*",
33+
"php-amqplib/php-amqplib": ">=3.0",
3434
"phpunit/phpunit": "<6.0.0",
3535
"predis/predis": "*"
3636
},

src/AMQPLibConnector.php

Lines changed: 4 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,5 @@
11
<?php
2+
23
/**
34
* This file contains a PHP client to Celery distributed task queue
45
*
@@ -67,7 +68,7 @@ class AMQPLibConnector extends AbstractAMQPConnector
6768

6869
public function GetConnectionObject($details)
6970
{
70-
return new \PhpAmqpLib\Connection\AMQPConnection(
71+
return new \PhpAmqpLib\Connection\AMQPStreamConnection(
7172
$details['host'],
7273
$details['port'],
7374
$details['login'],
@@ -129,14 +130,14 @@ public function Consume($msg)
129130

130131
/**
131132
* Return result of task execution for $task_id
132-
* @param \PhpAmqpLib\Connection\AMQPConnection $connection
133+
* @param \PhpAmqpLib\Connection\AMQPStreamConnection $connection
133134
* @param string $task_id Celery task identifier
134135
* @param int $expire expire time result queue, milliseconds
135136
* @param boolean $removeMessageFromQueue whether to remove message from queue
136137
* @return array array('body' => JSON-encoded message body, 'complete_result' => AMQPMessage object)
137138
* or false if result not ready yet
138139
*/
139-
public function GetMessageBody($connection, $task_id, $expire=0, $removeMessageFromQueue = true)
140+
public function GetMessageBody($connection, $task_id, $expire = 0, $removeMessageFromQueue = true)
140141
{
141142
if (!$this->receiving_channel) {
142143
$ch = $connection->channel();

src/AbstractAMQPConnector.php

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -53,7 +53,7 @@ public static function GetBestInstalledExtensionName($ssl = false)
5353
return 'php-amqplib-ssl';
5454
} elseif (class_exists('\AMQPConnection') && extension_loaded('amqp')) {
5555
return 'pecl';
56-
} elseif (class_exists('\PhpAmqpLib\Connection\AMQPConnection')) {
56+
} elseif (class_exists('\PhpAmqpLib\Connection\AMQPStreamConnection')) {
5757
return 'php-amqplib';
5858
} else {
5959
return 'unknown';

0 commit comments

Comments
 (0)