Skip to content

Commit 3ba6c77

Browse files
committed
Add Symfony4 support.
1 parent 26921e4 commit 3ba6c77

File tree

4 files changed

+18
-14
lines changed

4 files changed

+18
-14
lines changed

Symfony/AmqpTransportFactory.php

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -166,6 +166,7 @@ public function createContext(ContainerBuilder $container, array $config)
166166
$factoryId = sprintf('enqueue.transport.%s.connection_factory', $this->getName());
167167

168168
$context = new Definition(AmqpContext::class);
169+
$context->setPublic(true);
169170
$context->setFactory([new Reference($factoryId), 'createContext']);
170171

171172
$contextId = sprintf('enqueue.transport.%s.context', $this->getName());
@@ -180,6 +181,7 @@ public function createContext(ContainerBuilder $container, array $config)
180181
public function createDriver(ContainerBuilder $container, array $config)
181182
{
182183
$driver = new Definition(AmqpDriver::class);
184+
$driver->setPublic(true);
183185
$driver->setArguments([
184186
new Reference(sprintf('enqueue.transport.%s.context', $this->getName())),
185187
new Reference('enqueue.client.config'),

Symfony/DefaultTransportFactory.php

Lines changed: 7 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -18,6 +18,7 @@
1818
use Enqueue\Stomp\Symfony\StompTransportFactory;
1919
use Interop\Amqp\AmqpConnectionFactory;
2020
use Symfony\Component\Config\Definition\Builder\ArrayNodeDefinition;
21+
use Symfony\Component\DependencyInjection\Alias;
2122
use Symfony\Component\DependencyInjection\ContainerBuilder;
2223
use function Enqueue\dsn_to_connection_factory;
2324

@@ -83,8 +84,8 @@ public function createConnectionFactory(ContainerBuilder $container, array $conf
8384

8485
$factoryId = sprintf('enqueue.transport.%s.connection_factory', $this->getName());
8586

86-
$container->setAlias($factoryId, $aliasId);
87-
$container->setAlias('enqueue.transport.connection_factory', $factoryId);
87+
$container->setAlias($factoryId, new Alias($aliasId, true));
88+
$container->setAlias('enqueue.transport.connection_factory', new Alias($factoryId, true));
8889

8990
return $factoryId;
9091
}
@@ -104,8 +105,8 @@ public function createContext(ContainerBuilder $container, array $config)
104105

105106
$contextId = sprintf('enqueue.transport.%s.context', $this->getName());
106107

107-
$container->setAlias($contextId, $aliasId);
108-
$container->setAlias('enqueue.transport.context', $contextId);
108+
$container->setAlias($contextId, new Alias($aliasId, true));
109+
$container->setAlias('enqueue.transport.context', new Alias($contextId, true));
109110

110111
return $contextId;
111112
}
@@ -125,8 +126,8 @@ public function createDriver(ContainerBuilder $container, array $config)
125126

126127
$driverId = sprintf('enqueue.client.%s.driver', $this->getName());
127128

128-
$container->setAlias($driverId, $aliasId);
129-
$container->setAlias('enqueue.client.driver', $driverId);
129+
$container->setAlias($driverId, new Alias($aliasId, true));
130+
$container->setAlias('enqueue.client.driver', new Alias($driverId, true));
130131

131132
return $driverId;
132133
}

Symfony/RabbitMqAmqpTransportFactory.php

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -55,6 +55,7 @@ public function createConnectionFactory(ContainerBuilder $container, array $conf
5555
public function createDriver(ContainerBuilder $container, array $config)
5656
{
5757
$driver = new Definition(RabbitMqDriver::class);
58+
$driver->setPublic(true);
5859
$driver->setArguments([
5960
new Reference(sprintf('enqueue.transport.%s.context', $this->getName())),
6061
new Reference('enqueue.client.config'),

composer.json

Lines changed: 8 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -14,11 +14,11 @@
1414
},
1515
"require-dev": {
1616
"phpunit/phpunit": "~5.5",
17-
"symfony/console": "^2.8|^3",
18-
"symfony/dependency-injection": "^2.8|^3",
19-
"symfony/config": "^2.8|^3",
20-
"symfony/event-dispatcher": "^2.8|^3",
21-
"symfony/http-kernel": "^2.8|^3",
17+
"symfony/console": "^2.8|^3|^4",
18+
"symfony/dependency-injection": "^2.8|^3|^4",
19+
"symfony/config": "^2.8|^3|^4",
20+
"symfony/event-dispatcher": "^2.8|^3|^4",
21+
"symfony/http-kernel": "^2.8|^3|^4",
2222
"enqueue/amqp-ext": "^0.8@dev",
2323
"enqueue/amqp-lib": "^0.8@dev",
2424
"enqueue/amqp-bunny": "^0.8@dev",
@@ -36,9 +36,9 @@
3636
"empi89/php-amqp-stubs": "*@dev"
3737
},
3838
"suggest": {
39-
"symfony/console": "^2.8|^3 If you want to use li commands",
40-
"symfony/dependency-injection": "^2.8|^3",
41-
"symfony/config": "^2.8|^3",
39+
"symfony/console": "^2.8|^3|^4 If you want to use li commands",
40+
"symfony/dependency-injection": "^2.8|^3|^4",
41+
"symfony/config": "^2.8|^3|^4",
4242
"enqueue/amqp-ext": "AMQP transport (based on php extension)",
4343
"enqueue/stomp": "STOMP transport",
4444
"enqueue/fs": "Filesystem transport",

0 commit comments

Comments
 (0)