updated tests to account for multiple drivers and clients

Author: transistive

DependencyInjection/Configuration.php

@@ -62,16 +62,6 @@ public function getConfigTreeBuilder(): TreeBuilder
                     ->end()
                 ->end()
             ->end()->end()
-            ->arrayNode('entity_managers')
-                ->requiresAtLeastOneElement()
-                ->useAttributeAsKey('name')
-                ->prototype('array')
-                ->addDefaultsIfNotSet()
-                ->children()
-                    ->scalarNode('client')->defaultValue('default')->end()
-                    ->scalarNode('cache_dir')->defaultNull()->end()
-                ->end()
-            ->end()->end()
             ->arrayNode('connections')
                 ->isRequired()
                 ->requiresAtLeastOneElement()

DependencyInjection/Neo4jExtension.php

@@ -4,15 +4,12 @@
 
 namespace Neo4j\Neo4jBundle\DependencyInjection;
 
-use Laudis\Neo4j\ClientBuilder;
 use Laudis\Neo4j\Contracts\ClientInterface;
 use Symfony\Component\Config\Definition\Exception\InvalidConfigurationException;
 use Symfony\Component\Config\FileLocator;
 use Symfony\Component\DependencyInjection\ChildDefinition;
 use Symfony\Component\DependencyInjection\ContainerBuilder;
-use Symfony\Component\DependencyInjection\Definition;
 use Symfony\Component\DependencyInjection\Loader\XmlFileLoader;
-use Symfony\Component\DependencyInjection\Reference;
 use Symfony\Component\HttpKernel\DependencyInjection\Extension;
 use function sprintf;
 
@@ -34,8 +31,10 @@ public function load(array $configs, ContainerBuilder $container): void
 
         $this->handleClients($config, $container);
 
-        $container->setAlias('neo4j.client', 'neo4j.client.default');
-        $container->setAlias(ClientInterface::class, 'neo4j.client.default');
+        $container->setAlias('neo4j.client', 'neo4j.client.default')
+            ->setPublic(true);
+        $container->setAlias(ClientInterface::class, 'neo4j.client.default')
+            ->setPublic(true);
 
         // Configure toolbar
         if ($this->isConfigEnabled($container, $config['profiling'])) {
@@ -78,10 +77,10 @@ private function handleClients(array &$config, ContainerBuilder $container): voi
             $config['clients']['default'] = ['connections' => ['default']];
         }
 
-        $serviceIds = [];
         foreach ($config['clients'] as $name => $data) {
             $connections = [];
-            $serviceIds[$name] = $serviceId = sprintf('neo4j.client.%s', $name);
+            $serviceId = sprintf('neo4j.client.%s', $name);
+
             foreach ($data['connections'] as $connectionName) {
                 if (empty($config['connections'][$connectionName])) {
                     throw new InvalidConfigurationException(sprintf('Client "%s" is configured to use connection named "%s" but there is no such connection', $name, $connectionName));
@@ -95,7 +94,8 @@ private function handleClients(array &$config, ContainerBuilder $container): voi
             $definition = new ChildDefinition('neo4j.client.abstract');
 
             $container->setDefinition($serviceId, $definition)
-                ->setArguments([$connections, $config['connections'], null]);
+                ->setArguments([$connections, $config['connections'], null])
+                ->setPublic(true);
         }
     }
 }

Resources/config/services.xml

@@ -7,7 +7,7 @@
         <service id="neo4j.factory.client" class="Neo4j\Neo4jBundle\Factory\ClientFactory" public="false">
         </service>
 
-        <service id="neo4j.client.abstract" class="Laudis\Neo4j\Contracts\ClientInterface" abstract="true">
+        <service id="neo4j.client.abstract" class="Neo4j\Neo4jBundle\SymfonyClient" abstract="true">
             <factory service="neo4j.factory.client" method="create" />
         </service>
     </services>

Tests/Functional/BundleInitializationTest.php

@@ -2,20 +2,61 @@
 
 namespace Neo4j\Neo4jBundle\Tests\Functional;
 
+use InvalidArgumentException;
 use Laudis\Neo4j\Contracts\ClientInterface;
 
 /**
  * @author Tobias Nyholm <[email protected]>
  */
 class BundleInitializationTest extends BaseTestCase
 {
-    public function testRegisterBundle()
+    public function testRegisterBundle(): void
     {
         static::bootKernel();
         $container = static::$kernel->getContainer();
 
         $this->assertTrue($container->has('neo4j.client'));
         $client = $container->get('neo4j.client');
+        self::assertInstanceOf(ClientInterface::class, $client);
         $this->assertInstanceOf(ClientInterface::class, $client);
+
+        $this->assertTrue($container->has(ClientInterface::class));
+        $client = $container->get(ClientInterface::class);
+        self::assertInstanceOf(ClientInterface::class, $client);
+        $this->assertInstanceOf(ClientInterface::class, $client);
+    }
+
+
+    public function testDefaultDsn(): void
+    {
+        static::bootKernel();
+        $container = static::$kernel->getContainer();
+
+        $client = $container->get('neo4j.client');
+        $this->expectNotToPerformAssertions();
+        $client->getDriver('default');
+    }
+
+    public function testDsn(): void
+    {
+        static::bootKernel();
+        $container = static::$kernel->getContainer();
+
+        $client = $container->get('neo4j.client');
+        $this->expectNotToPerformAssertions();
+        $client->getDriver('bolt');
+    }
+
+    public function testSecond(): void
+    {
+        static::bootKernel();
+        $container = static::$kernel->getContainer();
+
+        $client = $container->get('neo4j.client.other_client');
+        self::assertInstanceOf(ClientInterface::class, $client);
+        $client->getDriver('default');
+
+        $this->expectException(InvalidArgumentException::class);
+        $client->getDriver('bolt');
     }
 }

Tests/Functional/app/AppKernel.php

@@ -3,6 +3,8 @@
 namespace Neo4j\Neo4jBundle\Tests\Functional\app;
 
 use Neo4j\Neo4jBundle\Neo4jBundle;
+use RuntimeException;
+use Symfony\Bundle\FrameworkBundle\FrameworkBundle;
 use Symfony\Component\Config\Loader\LoaderInterface;
 use Symfony\Component\DependencyInjection\Compiler\CompilerPassInterface;
 use Symfony\Component\DependencyInjection\ContainerBuilder;
@@ -24,7 +26,7 @@ public function __construct($config)
         }
 
         if (!file_exists($config)) {
-            throw new \RuntimeException(sprintf('The config file "%s" does not exist', $config));
+            throw new RuntimeException(sprintf('The config file "%s" does not exist', $config));
         }
 
         $this->config = $config;
@@ -33,7 +35,7 @@ public function __construct($config)
     public function registerBundles()
     {
         return [
-            new \Symfony\Bundle\FrameworkBundle\FrameworkBundle(),
+            new FrameworkBundle(),
             new Neo4jBundle(),
         ];
     }

Tests/Functional/app/config/default.yml

@@ -5,3 +5,10 @@ imports:
 neo4j:
   connections:
     default: ~
+    bolt:
+        dsn: 'bolt://foo:bar@localhost:7687'
+  clients:
+      default:
+          connections: [ default, bolt ]
+      other_client:
+          connections: [ default ]