Skip to content

Commit cea6956

Browse files
makasimmakasim
committed
[client] fixes
1 parent db8b269 commit cea6956

File tree

4 files changed

+67
-67
lines changed

4 files changed

+67
-67
lines changed

‎pkg/enqueue-bundle/Tests/Functional/UseCasesTest.php‎

Lines changed: 62 additions & 62 deletions
Original file line numberDiff line numberDiff line change
@@ -52,9 +52,9 @@ public function provideEnqueueConfigs()
5252
$certDir = $baseDir.'/var/rabbitmq_certificates';
5353
$this->assertDirectoryExists($certDir);
5454

55-
// yield 'amqp_dsn' => [[
56-
// 'transport' => getenv('AMQP_DSN'),
57-
// ]];
55+
yield 'amqp_dsn' => [[
56+
'transport' => getenv('AMQP_DSN'),
57+
]];
5858

5959
yield 'amqps_dsn' => [[
6060
'transport' => [
@@ -65,65 +65,65 @@ public function provideEnqueueConfigs()
6565
'ssl_key' => $certDir.'/key.pem',
6666
],
6767
]];
68-
//
69-
// yield 'dsn_as_env' => [[
70-
// 'transport' => '%env(AMQP_DSN)%',
71-
// ]];
72-
//
73-
// yield 'dbal_dsn' => [[
74-
// 'transport' => getenv('DOCTRINE_DSN'),
75-
// ]];
76-
//
77-
// yield 'rabbitmq_stomp' => [[
78-
// 'transport' => [
79-
// 'dsn' => getenv('STOMP_DSN'),
80-
// 'lazy' => false,
81-
// 'management_plugin_installed' => true,
82-
// ],
83-
// ]];
84-
//
85-
// yield 'predis_dsn' => [[
86-
// 'transport' => [
87-
// 'dsn' => getenv('PREDIS_DSN'),
88-
// 'lazy' => false,
89-
// ],
90-
// ]];
91-
//
92-
// yield 'phpredis_dsn' => [[
93-
// 'transport' => [
94-
// 'dsn' => getenv('PHPREDIS_DSN'),
95-
// 'lazy' => false,
96-
// ],
97-
// ]];
98-
//
99-
// yield 'fs_dsn' => [[
100-
// 'transport' => 'file://'.sys_get_temp_dir(),
101-
// ]];
102-
//
103-
// yield 'sqs' => [[
104-
// 'transport' => [
105-
// 'dsn' => 'sqs:',
106-
// 'key' => getenv('AWS_SQS_KEY'),
107-
// 'secret' => getenv('AWS_SQS_SECRET'),
108-
// 'region' => getenv('AWS_SQS_REGION'),
109-
// 'endpoint' => getenv('AWS_SQS_ENDPOINT'),
110-
// ],
111-
// ]];
112-
//
113-
// yield 'sqs_client' => [[
114-
// 'transport' => [
115-
// 'dsn' => 'sqs:',
116-
// 'client' => 'test.sqs_client',
117-
// ],
118-
// ]];
119-
//
120-
// yield 'mongodb_dsn' => [[
121-
// 'transport' => getenv('MONGO_DSN'),
122-
// ]];
123-
//
124-
// yield 'gps' => [[
125-
// 'transport' => 'gps:',
126-
// ]];
68+
69+
yield 'dsn_as_env' => [[
70+
'transport' => '%env(AMQP_DSN)%',
71+
]];
72+
73+
yield 'dbal_dsn' => [[
74+
'transport' => getenv('DOCTRINE_DSN'),
75+
]];
76+
77+
yield 'rabbitmq_stomp' => [[
78+
'transport' => [
79+
'dsn' => getenv('STOMP_DSN'),
80+
'lazy' => false,
81+
'management_plugin_installed' => true,
82+
],
83+
]];
84+
85+
yield 'predis_dsn' => [[
86+
'transport' => [
87+
'dsn' => getenv('PREDIS_DSN'),
88+
'lazy' => false,
89+
],
90+
]];
91+
92+
yield 'phpredis_dsn' => [[
93+
'transport' => [
94+
'dsn' => getenv('PHPREDIS_DSN'),
95+
'lazy' => false,
96+
],
97+
]];
98+
99+
yield 'fs_dsn' => [[
100+
'transport' => 'file://'.sys_get_temp_dir(),
101+
]];
102+
103+
yield 'sqs' => [[
104+
'transport' => [
105+
'dsn' => 'sqs:',
106+
'key' => getenv('AWS_SQS_KEY'),
107+
'secret' => getenv('AWS_SQS_SECRET'),
108+
'region' => getenv('AWS_SQS_REGION'),
109+
'endpoint' => getenv('AWS_SQS_ENDPOINT'),
110+
],
111+
]];
112+
113+
yield 'sqs_client' => [[
114+
'transport' => [
115+
'dsn' => 'sqs:',
116+
'client' => 'test.sqs_client',
117+
],
118+
]];
119+
120+
yield 'mongodb_dsn' => [[
121+
'transport' => getenv('MONGO_DSN'),
122+
]];
123+
124+
yield 'gps' => [[
125+
'transport' => 'gps:',
126+
]];
127127
}
128128

129129
/**

‎pkg/enqueue/Client/DriverFactory.php‎

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -109,12 +109,12 @@ private function findDriverClass(Dsn $dsn, array $factories): ?string
109109
continue;
110110
}
111111

112-
if (false == $dsn->getSchemeExtensions()) {
112+
if (empty($info['requiredSchemeExtensions'])) {
113113
return $driverClass;
114114
}
115115

116-
if (empty($info['requiredSchemeExtensions'])) {
117-
continue;
116+
if (false == $dsn->getSchemeExtensions()) {
117+
return null;
118118
}
119119

120120
$diff = array_diff($dsn->getSchemeExtensions(), $info['requiredSchemeExtensions']);

‎pkg/enqueue/Client/Resources.php‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -121,7 +121,7 @@ public static function getKnownDrivers(): array
121121
'sqlite3',
122122
'sqlite',
123123
],
124-
'requiredSchemeExtensions' => ['pdo'],
124+
'requiredSchemeExtensions' => [],
125125
'package' => ['enqueue/enqueue', 'enqueue/dbal'],
126126
];
127127

‎pkg/enqueue/ConnectionFactoryFactory.php‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -24,7 +24,7 @@ public function create($config): PsrConnectionFactory
2424
$dsn = new Dsn($config['dsn']);
2525

2626
if ($factoryClass = $this->findFactoryClass($dsn, Resources::getAvailableConnections())) {
27-
return new $factoryClass($config);
27+
return new $factoryClass(1 === count($config) ? $config['dsn'] : $config);
2828
}
2929

3030
$knownConnections = Resources::getKnownConnections();

0 commit comments

Comments
 (0)