Skip to content

Commit 866b29c

Browse files
committed
Backwards compatibility for dcd5cab
1 parent 7d16a3e commit 866b29c

2 files changed

Lines changed: 15 additions & 4 deletions

File tree

DependencyInjection/BernardBernardExtension.php

Lines changed: 8 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -7,6 +7,7 @@
77
use Symfony\Component\DependencyInjection\Definition;
88
use Symfony\Component\DependencyInjection\Loader\XmlFileLoader;
99
use Symfony\Component\DependencyInjection\Reference;
10+
use Symfony\Component\HttpKernel\Kernel;
1011

1112
class BernardBernardExtension extends \Symfony\Component\HttpKernel\DependencyInjection\Extension
1213
{
@@ -55,9 +56,13 @@ protected function registerFlatFileConfiguration($config, $container)
5556
protected function registerSqsConfiguration(array $config, ContainerBuilder $container)
5657
{
5758
$sqsClientDefinition = new Definition();
58-
$sqsClientDefinition->setClass('Aws\Sqs\SqsClient')
59-
->setFactory('Aws\Sqs\SqsClient::factory')
60-
->setArguments(
59+
if (Kernel::MAJOR_VERSION == 2 && Kernel::MINOR_VERSION < 6) {
60+
$sqsClientDefinition->setFactoryClass('Aws\Sqs\SqsClient')
61+
->setFactoryMethod('factory');
62+
} else {
63+
$sqsClientDefinition->setFactory('Aws\Sqs\SqsClient::factory');
64+
}
65+
$sqsClientDefinition->setArguments(
6166
array(
6267
array(
6368
'region' => $config['sqs']['region'],

Tests/DependencyInjection/BernardBernardExtensionTest.php

Lines changed: 7 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -5,6 +5,7 @@
55
use Bernard\BernardBundle\DependencyInjection\BernardBernardExtension;
66
use Symfony\Component\DependencyInjection\ContainerBuilder;
77
use Symfony\Component\DependencyInjection\Definition;
8+
use Symfony\Component\HttpKernel\Kernel;
89

910
class BernardBernardExtensionTest extends \PHPUnit_Framework_TestCase
1011
{
@@ -135,7 +136,12 @@ public function testSqsDriverCanBeBuildFromConfiguration()
135136

136137
/** @var Definition $resultingSqsClientArgument */
137138
$resultingSqsClientArgument = $driverDefinition->getArgument(0);
138-
$this->assertSame(array('Aws\Sqs\SqsClient', 'factory'), $resultingSqsClientArgument->getFactory());
139+
if (Kernel::MAJOR_VERSION == 2 && Kernel::MINOR_VERSION < 6) {
140+
$this->assertSame('Aws\Sqs\SqsClient', $resultingSqsClientArgument->getFactoryClass());
141+
$this->assertSame('factory', $resultingSqsClientArgument->getFactoryMethod());
142+
} else {
143+
$this->assertSame(array('Aws\Sqs\SqsClient', 'factory'), $resultingSqsClientArgument->getFactory());
144+
}
139145

140146
$sqsClientFactoryArguments = $resultingSqsClientArgument->getArguments();
141147
$sqsClientFactoryConfiguration = $sqsClientFactoryArguments[0];

0 commit comments

Comments
 (0)