Skip to content

Commit 14ff7c1

Browse files
committed
[enqueue] amqps schemes to dsn function.
1 parent f59096f commit 14ff7c1

2 files changed

Lines changed: 20 additions & 1 deletion

File tree

‎pkg/enqueue/Tests/Functions/DsnToConnectionFactoryFunctionTest.php‎

Lines changed: 12 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -3,6 +3,7 @@
33
namespace Enqueue\Tests\Functions;
44

55
use Enqueue\AmqpExt\AmqpConnectionFactory;
6+
use Enqueue\AmqpLib\AmqpConnectionFactory as AmqpLibConnectionFactory;
67
use Enqueue\Dbal\DbalConnectionFactory;
78
use Enqueue\Fs\FsConnectionFactory;
89
use Enqueue\Gearman\GearmanConnectionFactory;
@@ -58,6 +59,16 @@ public static function provideDSNs()
5859
{
5960
yield ['amqp:', AmqpConnectionFactory::class];
6061

62+
yield ['amqps:', AmqpConnectionFactory::class];
63+
64+
yield ['amqp+ext:', AmqpConnectionFactory::class];
65+
66+
yield ['amqps+ext:', AmqpConnectionFactory::class];
67+
68+
yield ['amqp+lib:', AmqpLibConnectionFactory::class];
69+
70+
yield ['amqps+lib:', AmqpLibConnectionFactory::class];
71+
6172
yield ['amqp://user:pass@foo/vhost', AmqpConnectionFactory::class];
6273

6374
yield ['file:', FsConnectionFactory::class];
@@ -72,7 +83,7 @@ public static function provideDSNs()
7283

7384
yield ['beanstalk:', PheanstalkConnectionFactory::class];
7485

75-
// yield ['gearman:', GearmanConnectionFactory::class];
86+
yield ['gearman:', GearmanConnectionFactory::class];
7687

7788
yield ['kafka:', RdKafkaConnectionFactory::class];
7889

‎pkg/enqueue/functions.php‎

Lines changed: 8 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -34,9 +34,11 @@ function dsn_to_connection_factory($dsn)
3434

3535
if (class_exists(AmqpExtConnectionFactory::class)) {
3636
$map['amqp+ext'] = AmqpExtConnectionFactory::class;
37+
$map['amqps+ext'] = AmqpExtConnectionFactory::class;
3738
}
3839
if (class_exists(AmqpLibConnectionFactory::class)) {
3940
$map['amqp+lib'] = AmqpLibConnectionFactory::class;
41+
$map['amqps+lib'] = AmqpLibConnectionFactory::class;
4042
}
4143
if (class_exists(AmqpBunnyConnectionFactory::class)) {
4244
$map['amqp+bunny'] = AmqpBunnyConnectionFactory::class;
@@ -50,6 +52,12 @@ function dsn_to_connection_factory($dsn)
5052
$map['amqp'] = AmqpLibConnectionFactory::class;
5153
}
5254

55+
if (class_exists(AmqpExtConnectionFactory::class)) {
56+
$map['amqps'] = AmqpExtConnectionFactory::class;
57+
} elseif (class_exists(AmqpLibConnectionFactory::class)) {
58+
$map['amqps'] = AmqpLibConnectionFactory::class;
59+
}
60+
5361
if (class_exists(NullConnectionFactory::class)) {
5462
$map['null'] = NullConnectionFactory::class;
5563
}

0 commit comments

Comments
 (0)