Skip to content

Commit e699e81

Browse files
author
jelte
committed
Deprecated: The Definition::setFactoryService method is deprecated since version 2.6
1 parent 1db502a commit e699e81

File tree

2 files changed

+12
-6
lines changed

2 files changed

+12
-6
lines changed

DependencyInjection/OldSoundRabbitMqExtension.php

Lines changed: 8 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -82,8 +82,14 @@ protected function loadConnections()
8282
$this->container->setDefinition($factoryName, $definition);
8383

8484
$definition = new Definition($classParam);
85-
$definition->setFactoryService($factoryName);
86-
$definition->setFactoryMethod('createConnection');
85+
if (method_exists($definition, 'setFactory')) {
86+
// to be inlined in services.xml when dependency on Symfony DependencyInjection is bumped to 2.6
87+
$definition->setFactory(array(new Reference($factoryName), 'createConnection'));
88+
} else {
89+
// to be removed when dependency on Symfony DependencyInjection is bumped to 2.6
90+
$definition->setFactoryService($factoryName);
91+
$definition->setFactoryMethod('createConnection');
92+
}
8793

8894
$this->container->setDefinition(sprintf('old_sound_rabbit_mq.connection.%s', $key), $definition);
8995
}

Tests/DependencyInjection/OldSoundRabbitMqExtensionTest.php

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -19,7 +19,7 @@ public function testFooConnectionDefinition()
1919
$definition = $container->getDefinition('old_sound_rabbit_mq.connection.foo_connection');
2020
$this->assertTrue($container->has('old_sound_rabbit_mq.connection_factory.foo_connection'));
2121
$factory = $container->getDefinition('old_sound_rabbit_mq.connection_factory.foo_connection');
22-
$this->assertEquals('old_sound_rabbit_mq.connection_factory.foo_connection', $definition->getFactoryService());
22+
$this->assertEquals(array('old_sound_rabbit_mq.connection_factory.foo_connection', 'createConnection'), $definition->getFactory());
2323
$this->assertEquals(array(
2424
'host' => 'foo_host',
2525
'port' => 123,
@@ -44,7 +44,7 @@ public function testSslConnectionDefinition()
4444
$definition = $container->getDefinition('old_sound_rabbit_mq.connection.ssl_connection');
4545
$this->assertTrue($container->has('old_sound_rabbit_mq.connection_factory.ssl_connection'));
4646
$factory = $container->getDefinition('old_sound_rabbit_mq.connection_factory.ssl_connection');
47-
$this->assertEquals('old_sound_rabbit_mq.connection_factory.ssl_connection', $definition->getFactoryService());
47+
$this->assertEquals(array('old_sound_rabbit_mq.connection_factory.ssl_connection', 'createConnection'), $definition->getFactory());
4848
$this->assertEquals(array(
4949
'host' => 'ssl_host',
5050
'port' => 123,
@@ -71,7 +71,7 @@ public function testLazyConnectionDefinition()
7171
$definition = $container->getDefinition('old_sound_rabbit_mq.connection.lazy_connection');
7272
$this->assertTrue($container->has('old_sound_rabbit_mq.connection_factory.lazy_connection'));
7373
$factory = $container->getDefinition('old_sound_rabbit_mq.connection_factory.lazy_connection');
74-
$this->assertEquals('old_sound_rabbit_mq.connection_factory.lazy_connection', $definition->getFactoryService());
74+
$this->assertEquals(array('old_sound_rabbit_mq.connection_factory.lazy_connection', 'createConnection'), $definition->getFactory());
7575
$this->assertEquals(array(
7676
'host' => 'lazy_host',
7777
'port' => 456,
@@ -96,7 +96,7 @@ public function testDefaultConnectionDefinition()
9696
$definition = $container->getDefinition('old_sound_rabbit_mq.connection.default');
9797
$this->assertTrue($container->has('old_sound_rabbit_mq.connection_factory.default'));
9898
$factory = $container->getDefinition('old_sound_rabbit_mq.connection_factory.default');
99-
$this->assertEquals('old_sound_rabbit_mq.connection_factory.default', $definition->getFactoryService());
99+
$this->assertEquals(array('old_sound_rabbit_mq.connection_factory.default', 'createConnection'), $definition->getFactory());
100100
$this->assertEquals(array(
101101
'host' => 'localhost',
102102
'port' => 5672,

0 commit comments

Comments
 (0)