Skip to content

Commit 9cb59d6

Browse files
committed
[dsn] replace xxx:// to xxx:
1 parent a8129bb commit 9cb59d6

12 files changed

Lines changed: 47 additions & 45 deletions

‎docs/transport/kafka.md‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -25,7 +25,7 @@ use Enqueue\RdKafka\RdKafkaConnectionFactory;
2525
$connectionFactory = new RdKafkaConnectionFactory();
2626

2727
// same as above
28-
$connectionFactory = new RdKafkaConnectionFactory('rdkafka://');
28+
$connectionFactory = new RdKafkaConnectionFactory('rdkafka:');
2929

3030
// same as above
3131
$connectionFactory = new RdKafkaConnectionFactory([]);

‎pkg/amqp-bunny/AmqpConnectionFactory.php‎

Lines changed: 2 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -43,14 +43,13 @@ class AmqpConnectionFactory implements InteropAmqpConnectionFactory, DelayStrate
4343
*
4444
* @param array|string $config
4545
*/
46-
public function __construct($config = 'amqp://')
46+
public function __construct($config = 'amqp:')
4747
{
4848
if (is_string($config) && 0 === strpos($config, 'amqp+bunny:')) {
4949
$config = str_replace('amqp+bunny:', 'amqp:', $config);
5050
}
5151

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

‎pkg/amqp-ext/AmqpConnectionFactory.php‎

Lines changed: 2 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -45,14 +45,13 @@ class AmqpConnectionFactory implements InteropAmqpConnectionFactory, DelayStrate
4545
*
4646
* @param array|string $config
4747
*/
48-
public function __construct($config = 'amqp://')
48+
public function __construct($config = 'amqp:')
4949
{
5050
if (is_string($config) && 0 === strpos($config, 'amqp+ext:')) {
5151
$config = str_replace('amqp+ext:', 'amqp:', $config);
5252
}
5353

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

‎pkg/amqp-lib/AmqpConnectionFactory.php‎

Lines changed: 2 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -48,14 +48,13 @@ class AmqpConnectionFactory implements InteropAmqpConnectionFactory, DelayStrate
4848
*
4949
* @param array|string $config
5050
*/
51-
public function __construct($config = 'amqp://')
51+
public function __construct($config = 'amqp:')
5252
{
5353
if (is_string($config) && 0 === strpos($config, 'amqp+lib:')) {
5454
$config = str_replace('amqp+lib:', 'amqp:', $config);
5555
}
5656

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

‎pkg/dbal/DbalConnectionFactory.php‎

Lines changed: 9 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -34,10 +34,10 @@ class DbalConnectionFactory implements PsrConnectionFactory
3434
*
3535
* @param array|string|null $config
3636
*/
37-
public function __construct($config = 'mysql://')
37+
public function __construct($config = 'mysql:')
3838
{
3939
if (empty($config)) {
40-
$config = $this->parseDsn('mysql://');
40+
$config = $this->parseDsn('mysql:');
4141
} elseif (is_string($config)) {
4242
$config = $this->parseDsn($config);
4343
} elseif (is_array($config)) {
@@ -94,11 +94,14 @@ private function establishConnection()
9494
*/
9595
private function parseDsn($dsn)
9696
{
97-
if (false === strpos($dsn, '://')) {
98-
throw new \LogicException(sprintf('The given DSN "%s" is not valid. Must contain "://".', $dsn));
97+
if (false === parse_url($dsn)) {
98+
throw new \LogicException(sprintf('Failed to parse DSN "%s"', $dsn));
9999
}
100100

101-
list($schema, $rest) = explode('://', $dsn, 2);
101+
$schema = parse_url($dsn, PHP_URL_SCHEME);
102+
if (empty($schema)) {
103+
throw new \LogicException('Schema is empty');
104+
}
102105

103106
$supported = [
104107
'db2' => true,
@@ -128,7 +131,7 @@ private function parseDsn($dsn)
128131
return [
129132
'lazy' => true,
130133
'connection' => [
131-
'url' => empty($rest) ? $schema.'://root@localhost' : $dsn,
134+
'url' => $schema.':' === $dsn ? $schema.'://root@localhost' : $dsn,
132135
],
133136
];
134137
}

‎pkg/dbal/Tests/DbalConnectionFactoryConfigTest.php‎

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -32,7 +32,7 @@ public function testThrowIfSchemeIsNotSupported()
3232
public function testThrowIfDsnCouldNotBeParsed()
3333
{
3434
$this->expectException(\LogicException::class);
35-
$this->expectExceptionMessage('The given DSN "invalidDSN" is not valid. Must contain "://".');
35+
$this->expectExceptionMessage('Schema is empty');
3636

3737
new DbalConnectionFactory('invalidDSN');
3838
}
@@ -63,7 +63,7 @@ public static function provideConfigs()
6363
];
6464

6565
yield [
66-
'mysql://',
66+
'mysql:',
6767
[
6868
'lazy' => true,
6969
'connection' => [
@@ -73,7 +73,7 @@ public static function provideConfigs()
7373
];
7474

7575
yield [
76-
'pgsql://',
76+
'pgsql:',
7777
[
7878
'lazy' => true,
7979
'connection' => [

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

Lines changed: 8 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -56,25 +56,25 @@ public function testReturnsExpectedFactoryInstance($dsn, $expectedFactoryClass)
5656

5757
public static function provideDSNs()
5858
{
59-
yield ['amqp://', AmqpConnectionFactory::class];
59+
yield ['amqp:', AmqpConnectionFactory::class];
6060

6161
yield ['amqp://user:pass@foo/vhost', AmqpConnectionFactory::class];
6262

63-
yield ['file://', FsConnectionFactory::class];
63+
yield ['file:', FsConnectionFactory::class];
6464

6565
yield ['file:///foo/bar/baz', FsConnectionFactory::class];
6666

67-
yield ['null://', NullConnectionFactory::class];
67+
yield ['null:', NullConnectionFactory::class];
6868

69-
yield ['mysql://', DbalConnectionFactory::class];
69+
yield ['mysql:', DbalConnectionFactory::class];
7070

71-
yield ['pgsql://', DbalConnectionFactory::class];
71+
yield ['pgsql:', DbalConnectionFactory::class];
7272

73-
yield ['beanstalk://', PheanstalkConnectionFactory::class];
73+
yield ['beanstalk:', PheanstalkConnectionFactory::class];
7474

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

77-
yield ['rdkafka://', RdKafkaConnectionFactory::class];
77+
yield ['kafka:', RdKafkaConnectionFactory::class];
7878

7979
yield ['redis:', RedisConnectionFactory::class];
8080

‎pkg/fs/FsConnectionFactory.php‎

Lines changed: 5 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -23,14 +23,15 @@ class FsConnectionFactory implements PsrConnectionFactory
2323
*
2424
* or
2525
*
26+
* file: - create queue files in tmp dir.
2627
* file://home/foo/enqueue
2728
* file://home/foo/enqueue?pre_fetch_count=20&chmod=0777
2829
*
2930
* @param array|string|null $config
3031
*/
31-
public function __construct($config = 'file://')
32+
public function __construct($config = 'file:')
3233
{
33-
if (empty($config) || 'file://' === $config) {
34+
if (empty($config) || 'file:' === $config) {
3435
$config = ['path' => sys_get_temp_dir().'/enqueue'];
3536
} elseif (is_string($config)) {
3637
$config = $this->parseDsn($config);
@@ -68,8 +69,8 @@ private function parseDsn($dsn)
6869
return ['path' => $dsn];
6970
}
7071

71-
if (false === strpos($dsn, 'file://')) {
72-
throw new \LogicException(sprintf('The given DSN "%s" is not supported. Must start with "file://".', $dsn));
72+
if (false === strpos($dsn, 'file:')) {
73+
throw new \LogicException(sprintf('The given DSN "%s" is not supported. Must start with "file:".', $dsn));
7374
}
7475

7576
$dsn = substr($dsn, 7);

‎pkg/gearman/GearmanConnectionFactory.php‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -25,9 +25,9 @@ class GearmanConnectionFactory implements PsrConnectionFactory
2525
*
2626
* @param array|string $config
2727
*/
28-
public function __construct($config = 'gearman://')
28+
public function __construct($config = 'gearman:')
2929
{
30-
if (empty($config) || 'gearman://' === $config) {
30+
if (empty($config) || 'gearman:' === $config) {
3131
$config = [];
3232
} elseif (is_string($config)) {
3333
$config = $this->parseDsn($config);

‎pkg/pheanstalk/PheanstalkConnectionFactory.php‎

Lines changed: 3 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -29,13 +29,14 @@ class PheanstalkConnectionFactory implements PsrConnectionFactory
2929
*
3030
* or
3131
*
32+
* beanstalk: - connects to localhost:11300
3233
* beanstalk://host:port
3334
*
3435
* @param array|string $config
3536
*/
36-
public function __construct($config = 'beanstalk://')
37+
public function __construct($config = 'beanstalk:')
3738
{
38-
if (empty($config) || 'beanstalk://' === $config) {
39+
if (empty($config) || 'beanstalk:' === $config) {
3940
$config = [];
4041
} elseif (is_string($config)) {
4142
$config = $this->parseDsn($config);

0 commit comments

Comments
 (0)