Skip to content

Commit 3a1846a

Browse files
committed
1 parent 31c0c01 commit 3a1846a

File tree

3 files changed

+11
-22
lines changed

3 files changed

+11
-22
lines changed

DependencyInjection/PlatinumPixsAwsExtension.php

Lines changed: 7 additions & 18 deletions
Original file line numberDiff line numberDiff line change
@@ -16,12 +16,11 @@
1616

1717
namespace PlatinumPixs\Aws\DependencyInjection;
1818

19-
use \Symfony\Component\DependencyInjection\ContainerBuilder,
20-
\Symfony\Component\HttpKernel\DependencyInjection\Extension,
21-
\Symfony\Component\DependencyInjection\Definition,
22-
\Symfony\Component\DependencyInjection\ContainerInterface,
23-
\Symfony\Component\Config\FileLocator,
24-
\Symfony\Component\DependencyInjection\Loader\XmlFileLoader;
19+
use \Symfony\Component\DependencyInjection\ContainerBuilder;
20+
use \Symfony\Component\HttpKernel\DependencyInjection\Extension;
21+
use \Symfony\Component\DependencyInjection\Definition;
22+
use \Symfony\Component\Config\FileLocator;
23+
use \Symfony\Component\DependencyInjection\Loader\XmlFileLoader;
2524

2625
class PlatinumPixsAwsExtension extends Extension
2726
{
@@ -34,22 +33,12 @@ public function load(array $configs, ContainerBuilder $container)
3433

3534
$configs['default'] = array();
3635

37-
foreach ($configs as $name => $config)
38-
{
36+
foreach ($configs as $name => $config) {
3937
$definition = new Definition('%platinum_pixs_aws.class%');
4038

41-
// Handle Symfony >= 2.7
42-
if (method_exists($definition, 'setFactory')) {
43-
$definition->setFactory(array('%platinum_pixs_aws.class%', 'factory'));
44-
} else {
45-
$definition
46-
->setFactoryClass('%platinum_pixs_aws.class%')
47-
->setFactoryMethod('factory');
48-
}
49-
5039
$definition->setArguments(array($config))->addTag('platinum_pixs_aws');
5140

52-
$container->setDefinition('platinum_pixs_aws.' . $name, $definition);
41+
$container->setDefinition('platinum_pixs_aws.'.$name, $definition);
5342
}
5443
}
5544

Resources/config/platinum_pixs_aws.xml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -4,6 +4,6 @@
44
xsi:schemaLocation="http://symfony.com/schema/dic/services http://symfony.com/schema/dic/services/services-1.0.xsd">
55

66
<parameters>
7-
<parameter key="platinum_pixs_aws.class">Aws\Common\Aws</parameter>
7+
<parameter key="platinum_pixs_aws.class">Aws\Sdk</parameter>
88
</parameters>
99
</container>

Tests/DependencyInjection/PlatinumPixsAwsExtensionTest.php

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -52,7 +52,7 @@ public function testDefaultSetup()
5252
{
5353
$this->extension->load(array(), $this->container);
5454

55-
$this->assertInstanceOf('Guzzle\Service\Builder\ServiceBuilder', $this->container->get('platinum_pixs_aws.default'));
55+
$this->assertInstanceOf('Aws\Sdk', $this->container->get('platinum_pixs_aws.default'));
5656
}
5757

5858

@@ -68,7 +68,7 @@ public function testBaseSetup()
6868

6969
$this->extension->load(array($config), $this->container);
7070

71-
$this->assertInstanceOf('Guzzle\Service\Builder\ServiceBuilder', $this->container->get('platinum_pixs_aws.standard'));
71+
$this->assertInstanceOf('Aws\Sdk', $this->container->get('platinum_pixs_aws.standard'));
7272
}
7373

7474

@@ -82,7 +82,7 @@ public function testBaseSetupWithKeyandSecret()
8282

8383
$this->extension->load(array($config), $this->container);
8484

85-
$this->assertInstanceOf('Guzzle\Service\Builder\ServiceBuilder', $this->container->get('platinum_pixs_aws.standard'));
85+
$this->assertInstanceOf('Aws\Sdk', $this->container->get('platinum_pixs_aws.standard'));
8686
}
8787

8888
}

0 commit comments

Comments
 (0)