Skip to content

Commit 64a9cc1

Browse files
committed
[symfony] Add missing supported DSNs to default transport factory.
1 parent 62c0b76 commit 64a9cc1

11 files changed

Lines changed: 144 additions & 19 deletions

‎pkg/amqp-bunny/AmqpConnectionFactory.php‎

Lines changed: 4 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -45,11 +45,12 @@ class AmqpConnectionFactory implements InteropAmqpConnectionFactory, DelayStrate
4545
*/
4646
public function __construct($config = 'amqp://')
4747
{
48-
if (is_string($config) && 0 === strpos($config, 'amqp+bunny://')) {
49-
$config = str_replace('amqp+bunny://', 'amqp://', $config);
48+
if (is_string($config) && 0 === strpos($config, 'amqp+bunny:')) {
49+
$config = str_replace('amqp+bunny:', 'amqp:', $config);
5050
}
5151

52-
if (empty($config) || 'amqp://' === $config) {
52+
// third argument is deprecated will be removed in 0.8
53+
if (empty($config) || 'amqp:' === $config || 'amqp://' === $config) {
5354
$config = [];
5455
} elseif (is_string($config)) {
5556
$config = $this->parseDsn($config);

‎pkg/amqp-bunny/Tests/AmqpConnectionFactoryConfigTest.php‎

Lines changed: 17 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -79,6 +79,23 @@ public static function provideConfigs()
7979

8080
// some examples from Appendix A: Examples (https://www.rabbitmq.com/uri-spec.html)
8181

82+
yield [
83+
'amqp+bunny:',
84+
[
85+
'host' => 'localhost',
86+
'port' => 5672,
87+
'vhost' => '/',
88+
'user' => 'guest',
89+
'pass' => 'guest',
90+
'receive_method' => 'basic_get',
91+
'heartbeat' => 0,
92+
'qos_prefetch_size' => 0,
93+
'qos_prefetch_count' => 1,
94+
'qos_global' => false,
95+
'lazy' => true,
96+
],
97+
];
98+
8299
yield [
83100
'amqp+bunny://user:pass@host:10000/vhost',
84101
[

‎pkg/amqp-ext/AmqpConnectionFactory.php‎

Lines changed: 4 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -47,11 +47,12 @@ class AmqpConnectionFactory implements InteropAmqpConnectionFactory, DelayStrate
4747
*/
4848
public function __construct($config = 'amqp://')
4949
{
50-
if (is_string($config) && 0 === strpos($config, 'amqp+ext://')) {
51-
$config = str_replace('amqp+ext://', 'amqp://', $config);
50+
if (is_string($config) && 0 === strpos($config, 'amqp+ext:')) {
51+
$config = str_replace('amqp+ext:', 'amqp:', $config);
5252
}
5353

54-
if (empty($config) || 'amqp://' === $config) {
54+
// third argument is deprecated will be removed in 0.8
55+
if (empty($config) || 'amqp:' === $config || 'amqp://' === $config) {
5556
$config = [];
5657
} elseif (is_string($config)) {
5758
$config = $this->parseDsn($config);

‎pkg/amqp-ext/Tests/AmqpConnectionFactoryConfigTest.php‎

Lines changed: 19 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -81,6 +81,25 @@ public static function provideConfigs()
8181

8282
// some examples from Appendix A: Examples (https://www.rabbitmq.com/uri-spec.html)
8383

84+
yield [
85+
'amqp+ext:',
86+
[
87+
'host' => 'localhost',
88+
'port' => 5672,
89+
'vhost' => '/',
90+
'user' => 'guest',
91+
'pass' => 'guest',
92+
'read_timeout' => null,
93+
'write_timeout' => null,
94+
'connect_timeout' => null,
95+
'persisted' => false,
96+
'lazy' => true,
97+
'pre_fetch_count' => null,
98+
'pre_fetch_size' => null,
99+
'receive_method' => 'basic_get',
100+
],
101+
];
102+
84103
yield [
85104
'amqp+ext://user:pass@host:10000/vhost',
86105
[

‎pkg/amqp-lib/AmqpConnectionFactory.php‎

Lines changed: 4 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -50,11 +50,12 @@ class AmqpConnectionFactory implements InteropAmqpConnectionFactory, DelayStrate
5050
*/
5151
public function __construct($config = 'amqp://')
5252
{
53-
if (is_string($config) && 0 === strpos($config, 'amqp+lib://')) {
54-
$config = str_replace('amqp+lib://', 'amqp://', $config);
53+
if (is_string($config) && 0 === strpos($config, 'amqp+lib:')) {
54+
$config = str_replace('amqp+lib:', 'amqp:', $config);
5555
}
5656

57-
if (empty($config) || 'amqp://' === $config) {
57+
// third argument is deprecated will be removed in 0.8
58+
if (empty($config) || 'amqp:' === $config || 'amqp://' === $config) {
5859
$config = [];
5960
} elseif (is_string($config)) {
6061
$config = $this->parseDsn($config);

‎pkg/amqp-lib/Tests/AmqpConnectionFactoryConfigTest.php‎

Lines changed: 27 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -89,6 +89,33 @@ public static function provideConfigs()
8989

9090
// some examples from Appendix A: Examples (https://www.rabbitmq.com/uri-spec.html)
9191

92+
yield [
93+
'amqp+lib:',
94+
[
95+
'host' => 'localhost',
96+
'port' => 5672,
97+
'vhost' => '/',
98+
'user' => 'guest',
99+
'pass' => 'guest',
100+
'read_timeout' => 3,
101+
'write_timeout' => 3,
102+
'lazy' => true,
103+
'receive_method' => 'basic_get',
104+
'stream' => true,
105+
'insist' => false,
106+
'login_method' => 'AMQPLAIN',
107+
'login_response' => null,
108+
'locale' => 'en_US',
109+
'keepalive' => false,
110+
'heartbeat' => 0,
111+
'connection_timeout' => 3.0,
112+
'read_write_timeout' => 3.0,
113+
'qos_prefetch_size' => 0,
114+
'qos_prefetch_count' => 1,
115+
'qos_global' => false,
116+
],
117+
];
118+
92119
yield [
93120
'amqp+lib://user:pass@host:10000/vhost',
94121
[

‎pkg/enqueue/Symfony/DefaultTransportFactory.php‎

Lines changed: 44 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -2,14 +2,26 @@
22

33
namespace Enqueue\Symfony;
44

5-
use Enqueue\AmqpExt\AmqpConnectionFactory;
5+
use Enqueue\AmqpBunny\AmqpConnectionFactory as AmqpBunnyConnectionFactory;
6+
use Enqueue\AmqpBunny\Symfony\AmqpBunnyTransportFactory;
7+
use Enqueue\AmqpExt\AmqpConnectionFactory as AmqpExtConnectionFactory;
68
use Enqueue\AmqpExt\Symfony\AmqpTransportFactory;
9+
use Enqueue\AmqpLib\AmqpConnectionFactory as AmqpLibConnectionFactory;
10+
use Enqueue\AmqpLib\Symfony\AmqpLibTransportFactory;
711
use Enqueue\Dbal\DbalConnectionFactory;
812
use Enqueue\Dbal\Symfony\DbalTransportFactory;
913
use Enqueue\Fs\FsConnectionFactory;
1014
use Enqueue\Fs\Symfony\FsTransportFactory;
15+
use Enqueue\Gps\GpsConnectionFactory;
16+
use Enqueue\Gps\Symfony\GpsTransportFactory;
1117
use Enqueue\Null\NullConnectionFactory;
1218
use Enqueue\Null\Symfony\NullTransportFactory;
19+
use Enqueue\Redis\RedisConnectionFactory;
20+
use Enqueue\Redis\Symfony\RedisTransportFactory;
21+
use Enqueue\Sqs\SqsConnectionFactory;
22+
use Enqueue\Sqs\Symfony\SqsTransportFactory;
23+
use Enqueue\Stomp\StompConnectionFactory;
24+
use Enqueue\Stomp\Symfony\StompTransportFactory;
1325
use Symfony\Component\Config\Definition\Builder\ArrayNodeDefinition;
1426
use Symfony\Component\DependencyInjection\ContainerBuilder;
1527
use function Enqueue\dsn_to_connection_factory;
@@ -167,27 +179,51 @@ private function resolveDSN(ContainerBuilder $container, $dsn)
167179
*/
168180
private function findFactory($dsn)
169181
{
170-
$connectionFactory = dsn_to_connection_factory($dsn);
182+
$factory = dsn_to_connection_factory($dsn);
171183

172-
if ($connectionFactory instanceof AmqpConnectionFactory) {
173-
return new AmqpTransportFactory('default_amqp');
184+
if ($factory instanceof AmqpExtConnectionFactory) {
185+
return new AmqpTransportFactory('default_amqp_ext');
174186
}
175187

176-
if ($connectionFactory instanceof FsConnectionFactory) {
188+
if ($factory instanceof AmqpLibConnectionFactory) {
189+
return new AmqpLibTransportFactory('default_amqp_lib');
190+
}
191+
192+
if ($factory instanceof AmqpBunnyConnectionFactory) {
193+
return new AmqpBunnyTransportFactory('default_amqp_bunny');
194+
}
195+
196+
if ($factory instanceof FsConnectionFactory) {
177197
return new FsTransportFactory('default_fs');
178198
}
179199

180-
if ($connectionFactory instanceof DbalConnectionFactory) {
200+
if ($factory instanceof DbalConnectionFactory) {
181201
return new DbalTransportFactory('default_dbal');
182202
}
183203

184-
if ($connectionFactory instanceof NullConnectionFactory) {
204+
if ($factory instanceof NullConnectionFactory) {
185205
return new NullTransportFactory('default_null');
186206
}
187207

208+
if ($factory instanceof GpsConnectionFactory) {
209+
return new GpsTransportFactory('default_gps');
210+
}
211+
212+
if ($factory instanceof RedisConnectionFactory) {
213+
return new RedisTransportFactory('default_redis');
214+
}
215+
216+
if ($factory instanceof SqsConnectionFactory) {
217+
return new SqsTransportFactory('default_sqs');
218+
}
219+
220+
if ($factory instanceof StompConnectionFactory) {
221+
return new StompTransportFactory('default_stomp');
222+
}
223+
188224
throw new \LogicException(sprintf(
189225
'There is no supported transport factory for the connection factory "%s" created from DSN "%s"',
190-
get_class($connectionFactory),
226+
get_class($factory),
191227
$dsn
192228
));
193229
}

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

Lines changed: 3 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -6,6 +6,7 @@
66
use Enqueue\Dbal\DbalConnectionFactory;
77
use Enqueue\Fs\FsConnectionFactory;
88
use Enqueue\Gearman\GearmanConnectionFactory;
9+
use Enqueue\Gps\GpsConnectionFactory;
910
use Enqueue\Null\NullConnectionFactory;
1011
use Enqueue\Pheanstalk\PheanstalkConnectionFactory;
1112
use Enqueue\RdKafka\RdKafkaConnectionFactory;
@@ -80,5 +81,7 @@ public static function provideDSNs()
8081
yield ['stomp:', StompConnectionFactory::class];
8182

8283
yield ['sqs:', SqsConnectionFactory::class];
84+
85+
yield ['gps:', GpsConnectionFactory::class];
8386
}
8487
}

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

Lines changed: 3 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -4,6 +4,7 @@
44

55
use Enqueue\AmqpExt\AmqpContext;
66
use Enqueue\Fs\FsContext;
7+
use Enqueue\Gps\GpsContext;
78
use Enqueue\Null\NullContext;
89
use Enqueue\Redis\RedisContext;
910
use Enqueue\Sqs\SqsContext;
@@ -66,5 +67,7 @@ public static function provideDSNs()
6667
yield ['stomp:', StompContext::class];
6768

6869
yield ['sqs:', SqsContext::class];
70+
71+
yield ['gps:', GpsContext::class];
6972
}
7073
}

‎pkg/enqueue/Tests/Symfony/DefaultTransportFactoryTest.php‎

Lines changed: 13 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -250,7 +250,11 @@ public function testShouldCreateDriverFromDsn($dsn, $expectedName)
250250

251251
public static function provideDSNs()
252252
{
253-
yield ['amqp://', 'default_amqp'];
253+
yield ['amqp+ext://', 'default_amqp_ext'];
254+
255+
yield ['amqp+lib:', 'default_amqp_lib'];
256+
257+
yield ['amqp+bunny://', 'default_amqp_bunny'];
254258

255259
yield ['null://', 'default_null'];
256260

@@ -259,5 +263,13 @@ public static function provideDSNs()
259263
yield ['mysql://', 'default_dbal'];
260264

261265
yield ['pgsql://', 'default_dbal'];
266+
267+
yield ['gps:', 'default_gps'];
268+
269+
yield ['sqs:', 'default_sqs'];
270+
271+
yield ['redis:', 'default_redis'];
272+
273+
yield ['stomp:', 'default_stomp'];
262274
}
263275
}

0 commit comments

Comments
 (0)