Merge pull request #1 from driftphp/feature/some-naming-fixes

Feature/some naming fixes

Author: mmoreram

DependencyInjection/CompilerPass/PostgresqlCompilerPass.php

@@ -22,46 +22,49 @@
 use Symfony\Component\DependencyInjection\Definition;
 use Symfony\Component\DependencyInjection\Reference;
 
+/**
+ * Class PostgresqlCompilerPass.
+ */
 class PostgresqlCompilerPass implements CompilerPassInterface
 {
     /**
      * You can modify the container here before it is dumped to PHP code.
      */
     public function process(ContainerBuilder $container)
     {
-        $connectionsConfiguration = $container->getParameter('postgresql.connections_configuration');
-        if (empty($connectionsConfiguration)) {
+        $clientsConfiguration = $container->getParameter('postgresql.clients_configuration');
+        if (empty($clientsConfiguration)) {
             return;
         }
 
-        foreach ($connectionsConfiguration as $connectionName => $connectionConfiguration) {
-            $connectionAlias = $this->createConnection($container, $connectionConfiguration);
+        foreach ($clientsConfiguration as $clientName => $clientConfiguration) {
+            $clientAlias = $this->createclient($container, $clientConfiguration);
 
             $container->setAlias(
-                "postgresql.{$connectionName}_connection",
-                $connectionAlias
+                "postgresql.{$clientName}_client",
+                $clientAlias
             );
 
-            $container->setAlias(Client::class, $connectionAlias);
-            $container->registerAliasForArgument($connectionAlias, Client::class, "{$connectionName} connection");
+            $container->setAlias(Client::class, $clientAlias);
+            $container->registerAliasForArgument($clientAlias, Client::class, "{$clientName} client");
         }
     }
 
     /**
-     * Create connection and return it's reference.
+     * Create client and return it's reference.
      *
      * @param ContainerBuilder $container
      * @param array            $configuration
      *
      * @return string
      */
-    private function createConnection(
+    private function createclient(
         ContainerBuilder $container,
         array $configuration
     ): string {
         ksort($configuration);
-        $connectionHash = substr(md5(json_encode($configuration)), 0, 10);
-        $definitionName = "postgresql.connection.$connectionHash";
+        $clientHash = substr(md5(json_encode($configuration)), 0, 10);
+        $definitionName = "postgresql.client.$clientHash";
 
         if (!$container->hasDefinition($definitionName)) {
             $definition = new Definition(Client::class, [$configuration, new Reference(LoopInterface::class)]);

DependencyInjection/PostgresqlConfiguration.php

@@ -18,6 +18,9 @@
 use Mmoreram\BaseBundle\DependencyInjection\BaseConfiguration;
 use Symfony\Component\Config\Definition\Builder\ArrayNodeDefinition;
 
+/**
+ * Class PostgresqlConfiguration.
+ */
 class PostgresqlConfiguration extends BaseConfiguration
 {
     /**
@@ -29,7 +32,7 @@ protected function setupTree(ArrayNodeDefinition $rootNode)
     {
         $rootNode
             ->children()
-                ->arrayNode('connections')
+                ->arrayNode('clients')
                     ->prototype('array')
                         ->children()
                             ->scalarNode('host')

DependencyInjection/PostgresqlExtension.php

@@ -7,6 +7,8 @@
  * file that was distributed with this source code.
  *
  * Feel free to edit as you please, and have fun.
+ *
+ * @author Marc Morera <yuhu@mmoreram.com>
  */
 
 declare(strict_types=1);
@@ -16,6 +18,9 @@
 use Mmoreram\BaseBundle\DependencyInjection\BaseExtension;
 use Symfony\Component\Config\Definition\ConfigurationInterface;
 
+/**
+ * Class PostgresqlExtension.
+ */
 class PostgresqlExtension extends BaseExtension
 {
     /**
@@ -89,7 +94,7 @@ protected function getConfigurationInstance(): ? ConfigurationInterface
     protected function getParametrizationValues(array $config): array
     {
         return [
-            'postgresql.connections_configuration' => $config['connections'],
+            'postgresql.clients_configuration' => $config['clients'],
         ];
     }
 }

PostgresqlBundle.php

@@ -7,6 +7,8 @@
  * file that was distributed with this source code.
  *
  * Feel free to edit as you please, and have fun.
+ *
+ * @author Marc Morera <yuhu@mmoreram.com>
  */
 
 declare(strict_types=1);

Tests/AutowiringTest.php

@@ -47,7 +47,7 @@ protected static function getKernel(): KernelInterface
                 'test' => true,
             ],
             'imports' => [
-                ['resource' => __DIR__ .'/autowiring.yml'],
+                ['resource' => __DIR__.'/autowiring.yml'],
             ],
             'services' => [
                 'reactphp.event_loop' => [
@@ -59,7 +59,7 @@ protected static function getKernel(): KernelInterface
                 ],
             ],
             'postgresql' => [
-                'connections' => [
+                'clients' => [
                     'users' => [
                         'host' => '127.0.0.1',
                         'database' => 'orders',

Tests/ConfigurationTest.php

@@ -7,6 +7,8 @@
  * file that was distributed with this source code.
  *
  * Feel free to edit as you please, and have fun.
+ *
+ * @author Marc Morera <yuhu@mmoreram.com>
  */
 
 declare(strict_types=1);
@@ -45,7 +47,7 @@ protected static function getKernel(): KernelInterface
                 'test' => true,
             ],
             'imports' => [
-                ['resource' => __DIR__ .'/clients.yml'],
+                ['resource' => __DIR__.'/clients.yml'],
             ],
             'services' => [
                 'reactphp.event_loop' => [
@@ -57,7 +59,7 @@ protected static function getKernel(): KernelInterface
                 ],
             ],
             'postgresql' => [
-                'connections' => [
+                'clients' => [
                     'users' => [
                         'host' => '127.0.0.1',
                         'user' => 'user',
@@ -72,10 +74,10 @@ protected static function getKernel(): KernelInterface
     /**
      * Test.
      */
-    public function testProperConnection()
+    public function testProperClient()
     {
-        $connection = static::get('postgresql.users_connection.test');
-        $this->assertInstanceOf(Client::class, $connection);
-        $this->assertInstanceOf(Client::class, $connection);
+        $client = static::get('postgresql.users_client.test');
+        $this->assertInstanceOf(Client::class, $client);
+        $this->assertInstanceOf(Client::class, $client);
     }
 }

Tests/Services/AService.php

@@ -17,43 +17,46 @@
 
 use PgAsync\Client;
 
+/**
+ * Class AService.
+ */
 class AService
 {
     /**
      * @var Client
      */
-    private $connection1;
+    private $client1;
 
     /**
      * @var Client
      */
-    private $connection2;
+    private $client2;
 
     /**
      * @var Client
      */
-    private $connection3;
+    private $client3;
 
     /**
      * AService constructor.
      *
-     * @param Client $connection1
-     * @param Client $connection2
-     * @param Client $connection3
+     * @param Client $client1
+     * @param Client $client2
+     * @param Client $client3
      */
-    public function __construct(Client $usersConnection, Client $ordersConnection, Client $users2Connection)
+    public function __construct(Client $usersClient, Client $ordersClient, Client $users2Client)
     {
-        $this->connection1 = $usersConnection;
-        $this->connection2 = $ordersConnection;
-        $this->connection3 = $users2Connection;
+        $this->client1 = $usersClient;
+        $this->client2 = $ordersClient;
+        $this->client3 = $users2Client;
     }
 
     /**
      * Are equal.
      */
     public function areOK(): bool
     {
-        return $this->connection1 !== $this->connection2
-            && $this->connection1 === $this->connection3;
+        return $this->client1 !== $this->client2
+            && $this->client1 === $this->client3;
     }
 }

Tests/clients.yml

@@ -1,5 +1,5 @@
 services:
 
-    postgresql.users_connection.test:
-        alias: postgresql.users_connection
+    postgresql.users_client.test:
+        alias: postgresql.users_client
         public: true