Merge pull request symfony#28 from jeskew/schodemeiss-patch-1

jeskew · web-flow · commit 3c083b84b805 · 2017-07-12T14:00:20.000-07:00
Alias services with class name
diff --git a/.travis.yml b/.travis.yml
@@ -1,9 +1,11 @@
 language: php
+dist: trusty
 
 php:
   - 5.5
   - 5.6
   - 7.0
+  - 7.1
   - hhvm
 
 env:
diff --git a/composer.json b/composer.json
@@ -18,7 +18,7 @@
         "symfony/http-kernel": "~2.3|~3.0"
     },
     "require-dev": {
-        "phpunit/phpunit": "~4.7",
+        "phpunit/phpunit": "^4.8.35|^5.4.0|^6.0.0",
         "symfony/framework-bundle": "~2.3|~3.0",
         "symfony/yaml": "~2.3|~3.0"
     },
diff --git a/src/DependencyInjection/AwsExtension.php b/src/DependencyInjection/AwsExtension.php
@@ -35,10 +35,11 @@ public function load(array $configs, ContainerBuilder $container)
             ]]);
 
         foreach (array_column(Aws\manifest(), 'namespace') as $awsService) {
-            $container->setDefinition(
-                'aws.' . strtolower($awsService),
-                $this->createServiceDefinition($awsService)
-            );
+            $serviceName = 'aws.' . strtolower($awsService);
+            $serviceDefinition = $this->createServiceDefinition($awsService);
+            $container->setDefinition($serviceName, $serviceDefinition);
+
+            $container->setAlias($serviceDefinition->getClass(), $serviceName);
         }
     }
 
diff --git a/tests/DependencyInjection/AwsExtensionTest.php b/tests/DependencyInjection/AwsExtensionTest.php
@@ -4,13 +4,12 @@
 
 use AppKernel;
 use Aws\AwsClient;
-use Aws\Sdk;
-use ReflectionClass;
+use PHPUnit\Framework\TestCase;
 use Symfony\Component\DependencyInjection\ContainerBuilder;
 use Symfony\Component\DependencyInjection\ContainerInterface;
 use Symfony\Component\DependencyInjection\Reference;
 
-class AwsExtensionTest extends \PHPUnit_Framework_TestCase
+class AwsExtensionTest extends TestCase
 {
     /**
      * @var ContainerInterface
@@ -81,7 +80,9 @@ public function extension_should_escape_strings_that_begin_with_at_sign()
             'key' => '@@key',
             'secret' => '@@secret'
         ]];
-        $container = $this->getMock(ContainerBuilder::class, ['getDefinition', 'replaceArgument']);
+        $container = $this->getMockBuilder(ContainerBuilder::class)
+            ->setMethods(['getDefinition', 'replaceArgument'])
+            ->getMock();
         $container->expects($this->once())
             ->method('getDefinition')
             ->with('aws_sdk')
@@ -107,7 +108,9 @@ public function extension_should_expand_service_references()
     {
         $extension = new AwsExtension;
         $config = ['credentials' => '@aws_sdk'];
-        $container = $this->getMock(ContainerBuilder::class, ['getDefinition', 'replaceArgument']);
+        $container = $this->getMockBuilder(ContainerBuilder::class)
+            ->setMethods(['getDefinition', 'replaceArgument'])
+            ->getMock();
         $container->expects($this->once())
             ->method('getDefinition')
             ->with('aws_sdk')
@@ -157,4 +160,20 @@ function (array $service) use ($config) {
             $this->serviceProvider()
         );
     }
+
+    /**
+     * @test
+     *
+     * @dataProvider serviceProvider
+     */
+    public function extension_should_load_services_by_class_name(
+        $webServiceName,
+        $containerServiceName,
+        $clientClassName
+    ) {
+        $this->assertInstanceOf(
+            $clientClassName,
+            $this->container->get($clientClassName)
+        );
+    }
 }
diff --git a/tests/DependencyInjection/ConfigurationTest.php b/tests/DependencyInjection/ConfigurationTest.php
@@ -1,11 +1,11 @@
 <?php
 namespace Aws\Symfony\DependencyInjection;
 
-
 use AppKernel;
+use PHPUnit\Framework\TestCase;
 use Symfony\Component\Filesystem\Filesystem;
 
-class ConfigurationTest extends \PHPUnit_Framework_TestCase
+class ConfigurationTest extends TestCase
 {
     public function setUp()
     {
diff --git a/tests/fixtures/config.php b/tests/fixtures/config.php
@@ -1,5 +1,6 @@
 <?php
 
+use Aws\DynamoDb\DynamoDbClient;
 use Symfony\Component\DependencyInjection\Reference;
 
 $container->loadFromExtension('framework', [
@@ -31,3 +32,10 @@
     ->register('a_service', 'Aws\\Credentials\\Credentials')
     ->addArgument('a-different-fake-key')
     ->addArgument('a-different-fake-secret');
+
+$container
+    ->register(DynamoDbClient::class, DynamoDbClient::class)
+    ->addArgument([
+        'region' => 'eu-central-1',
+        'version' => '2012-08-10',
+    ]);
diff --git a/tests/fixtures/config.xml b/tests/fixtures/config.xml
@@ -18,10 +18,21 @@
         <aws:Sqs credentials="@a_service"/>
     </aws:config>
 
+    <parameters>
+        <parameter key="dynamodb_client_config" type="collection">
+            <parameter key="region">eu-central-1</parameter>
+            <parameter key="version">2012-08-10</parameter>
+        </parameter>
+    </parameters>
+
     <services>
         <service id="a_service" class="Aws\Credentials\Credentials">
             <argument>a-different-fake-key</argument>
             <argument>a-different-fake-secret</argument>
         </service>
+
+        <service id="Aws\DynamoDb\DynamoDbClient" class="Aws\DynamoDb\DynamoDbClient">
+            <argument>%dynamodb_client_config%</argument>
+        </service>
     </services>
 </container>
diff --git a/tests/fixtures/config.yml b/tests/fixtures/config.yml
@@ -17,6 +17,12 @@ aws:
         endpoint: https://search-with-some-subdomain.us-east-1.cloudsearch.amazonaws.com
 
 services:
+    'Aws\DynamoDb\DynamoDbClient':
+        class: Aws\DynamoDb\DynamoDbClient
+        arguments:
+            -
+                region: eu-central-1
+                version: '2012-08-10'
     a_service:
         class: Aws\Credentials\Credentials
         arguments:

-Original file line number
+Diff line change
@@ @@ -1,9 +1,11 @@ @@
 language: php
 +dist: trusty
 php:
   - 5.5
   - 5.6
   - 7.0
 +  - 7.1
   - hhvm
 env:
Original file line number	Diff line number	Diff line change
`@@ -35,10 +35,11 @@ public function load(array $configs, ContainerBuilder $container)`
`35`	`35`	`]]);`
`36`	`36`
`37`	`37`	`foreach (array_column(Aws\manifest(), 'namespace') as $awsService) {`
`38`		`- $container->setDefinition(`
`39`		`- 'aws.' . strtolower($awsService),`
`40`		`- $this->createServiceDefinition($awsService)`
`41`		`- );`
	`38`	`+ $serviceName = 'aws.' . strtolower($awsService);`
	`39`	`+ $serviceDefinition = $this->createServiceDefinition($awsService);`
	`40`	`+ $container->setDefinition($serviceName, $serviceDefinition);`
	`41`	`+`
	`42`	`+ $container->setAlias($serviceDefinition->getClass(), $serviceName);`
`42`	`43`	`}`
`43`	`44`	`}`
`44`	`45`
Original file line number	Diff line number	Diff line change
`@@ -1,11 +1,11 @@`
`1`	`1`	`<?php`
`2`	`2`	`namespace Aws\Symfony\DependencyInjection;`
`3`	`3`
`4`		`-`
`5`	`4`	`use AppKernel;`
	`5`	`+use PHPUnit\Framework\TestCase;`
`6`	`6`	`use Symfony\Component\Filesystem\Filesystem;`
`7`	`7`
`8`		`-class ConfigurationTest extends \PHPUnit_Framework_TestCase`
	`8`	`+class ConfigurationTest extends TestCase`
`9`	`9`	`{`
`10`	`10`	`public function setUp()`
`11`	`11`	`{`