Skip to content

Commit cbe96d1

Browse files
committed
Add Symfony4 support.
1 parent ad68604 commit cbe96d1

5 files changed

Lines changed: 30 additions & 30 deletions

File tree

RabbitmqAmqpExtension.php

Lines changed: 6 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -12,16 +12,16 @@ trait RabbitmqAmqpExtension
1212
*/
1313
private function buildAmqpContext()
1414
{
15-
if (false == getenv('SYMFONY__RABBITMQ__HOST')) {
15+
if (false == getenv('RABBITMQ_HOST')) {
1616
throw new \PHPUnit_Framework_SkippedTestError('Functional tests are not allowed in this environment');
1717
}
1818

1919
$config = [
20-
'host' => getenv('SYMFONY__RABBITMQ__HOST'),
21-
'port' => getenv('SYMFONY__RABBITMQ__AMQP__PORT'),
22-
'user' => getenv('SYMFONY__RABBITMQ__USER'),
23-
'pass' => getenv('SYMFONY__RABBITMQ__PASSWORD'),
24-
'vhost' => getenv('SYMFONY__RABBITMQ__VHOST'),
20+
'host' => getenv('RABBITMQ_HOST'),
21+
'port' => getenv('RABBITMQ_AMQP__PORT'),
22+
'user' => getenv('RABBITMQ_USER'),
23+
'pass' => getenv('RABBITMQ_PASSWORD'),
24+
'vhost' => getenv('RABBITMQ_VHOST'),
2525
];
2626

2727
return (new AmqpConnectionFactory($config))->createContext();

RabbitmqManagmentExtensionTrait.php

Lines changed: 8 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -9,10 +9,10 @@ trait RabbitmqManagmentExtensionTrait
99
*/
1010
private function removeQueue($queueName)
1111
{
12-
$rabbitmqHost = getenv('SYMFONY__RABBITMQ__HOST');
13-
$rabbitmqUser = getenv('SYMFONY__RABBITMQ__USER');
14-
$rabbitmqPassword = getenv('SYMFONY__RABBITMQ__PASSWORD');
15-
$rabbitmqVhost = getenv('SYMFONY__RABBITMQ__VHOST');
12+
$rabbitmqHost = getenv('RABBITMQ_HOST');
13+
$rabbitmqUser = getenv('RABBITMQ_USER');
14+
$rabbitmqPassword = getenv('RABBITMQ_PASSWORD');
15+
$rabbitmqVhost = getenv('RABBITMQ_VHOST');
1616

1717
$url = sprintf(
1818
'http://%s:15672/api/queues/%s/%s',
@@ -46,10 +46,10 @@ private function removeQueue($queueName)
4646
*/
4747
private function removeExchange($exchangeName)
4848
{
49-
$rabbitmqHost = getenv('SYMFONY__RABBITMQ__HOST');
50-
$rabbitmqUser = getenv('SYMFONY__RABBITMQ__USER');
51-
$rabbitmqPassword = getenv('SYMFONY__RABBITMQ__PASSWORD');
52-
$rabbitmqVhost = getenv('SYMFONY__RABBITMQ__VHOST');
49+
$rabbitmqHost = getenv('RABBITMQ_HOST');
50+
$rabbitmqUser = getenv('RABBITMQ_USER');
51+
$rabbitmqPassword = getenv('RABBITMQ_PASSWORD');
52+
$rabbitmqVhost = getenv('RABBITMQ_VHOST');
5353

5454
$url = sprintf(
5555
'http://%s:15672/api/exchanges/%s/%s',

RabbitmqStompExtension.php

Lines changed: 6 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -12,16 +12,16 @@ trait RabbitmqStompExtension
1212
*/
1313
private function buildStompContext()
1414
{
15-
if (false == getenv('SYMFONY__RABBITMQ__HOST')) {
15+
if (false == getenv('RABBITMQ_HOST')) {
1616
throw new \PHPUnit_Framework_SkippedTestError('Functional tests are not allowed in this environment');
1717
}
1818

1919
$config = [
20-
'host' => getenv('SYMFONY__RABBITMQ__HOST'),
21-
'port' => getenv('SYMFONY__RABBITMQ__STOMP__PORT'),
22-
'login' => getenv('SYMFONY__RABBITMQ__USER'),
23-
'password' => getenv('SYMFONY__RABBITMQ__PASSWORD'),
24-
'vhost' => getenv('SYMFONY__RABBITMQ__VHOST'),
20+
'host' => getenv('RABBITMQ_HOST'),
21+
'port' => getenv('RABBITMQ_STOMP_PORT'),
22+
'login' => getenv('RABBITMQ_USER'),
23+
'password' => getenv('RABBITMQ_PASSWORD'),
24+
'vhost' => getenv('RABBITMQ_VHOST'),
2525
'sync' => true,
2626
];
2727

RedisExtension.php

Lines changed: 6 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -12,13 +12,13 @@ trait RedisExtension
1212
*/
1313
private function buildPhpRedisContext()
1414
{
15-
if (false == getenv('SYMFONY__REDIS__HOST')) {
15+
if (false == getenv('REDIS_HOST')) {
1616
throw new \PHPUnit_Framework_SkippedTestError('Functional tests are not allowed in this environment');
1717
}
1818

1919
$config = [
20-
'host' => getenv('SYMFONY__REDIS__HOST'),
21-
'port' => getenv('SYMFONY__REDIS__PORT'),
20+
'host' => getenv('REDIS_HOST'),
21+
'port' => getenv('REDIS_PORT'),
2222
'vendor' => 'phpredis',
2323
'lazy' => false,
2424
];
@@ -31,13 +31,13 @@ private function buildPhpRedisContext()
3131
*/
3232
private function buildPRedisContext()
3333
{
34-
if (false == getenv('SYMFONY__REDIS__HOST')) {
34+
if (false == getenv('REDIS_HOST')) {
3535
throw new \PHPUnit_Framework_SkippedTestError('Functional tests are not allowed in this environment');
3636
}
3737

3838
$config = [
39-
'host' => getenv('SYMFONY__REDIS__HOST'),
40-
'port' => getenv('SYMFONY__REDIS__PORT'),
39+
'host' => getenv('REDIS_HOST'),
40+
'port' => getenv('REDIS_PORT'),
4141
'vendor' => 'predis',
4242
'lazy' => false,
4343
];

SqsExtension.php

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -12,14 +12,14 @@ trait SqsExtension
1212
*/
1313
private function buildSqsContext()
1414
{
15-
if (false == getenv('AWS__SQS__KEY')) {
15+
if (false == getenv('AWS_SQS_KEY')) {
1616
throw new \PHPUnit_Framework_SkippedTestError('Functional tests are not allowed in this environment');
1717
}
1818

1919
$config = [
20-
'key' => getenv('AWS__SQS__KEY'),
21-
'secret' => getenv('AWS__SQS__SECRET'),
22-
'region' => getenv('AWS__SQS__REGION'),
20+
'key' => getenv('AWS_SQS_KEY'),
21+
'secret' => getenv('AWS_SQS_SECRET'),
22+
'region' => getenv('AWS_SQS_REGION'),
2323
'lazy' => false,
2424
];
2525

0 commit comments

Comments
 (0)