fixed tests

Author: transistive

Dockerfile

@@ -7,8 +7,8 @@ RUN apt-get update \
         wget \
     && docker-php-ext-install -j$(nproc) bcmath sockets \
     && pecl install xdebug \
-    && docker-php-ext-enable xdebug && \
-    curl -sS https://getcomposer.org/installer | php -- --install-dir=/usr/local/bin --filename=composer
+    && docker-php-ext-enable xdebug \
+    && curl -sS https://getcomposer.org/installer | php -- --install-dir=/usr/local/bin --filename=composer
 
 WORKDIR /opt/project
 

docs/README.md

@@ -20,7 +20,7 @@ Applications that use Symfony Flex
 Open a command console, enter your project directory and execute:
 
 ```console
-$ composer require neo4j/neo4j-bundle
+$ composer require neo4j
 ```
 
 Applications that don't use Symfony Flex

src/ClientFactory.php

@@ -44,6 +44,7 @@ public function __construct(
         private array|null $sessionConfiguration,
         private array|null $transactionConfiguration,
         private array $connections,
+        private string|null $defaultDriver,
         private ClientInterface|null $client,
         private StreamFactoryInterface|null $streamFactory,
         private RequestFactoryInterface|null $requestFactory,
@@ -76,6 +77,10 @@ public function create(): SymfonyClient
             );
         }
 
+        if ($this->defaultDriver) {
+            $builder = $builder->withDefaultDriver($this->defaultDriver);
+        }
+
         return new SymfonyClient($builder->build(), $this->eventHandler);
     }
 

src/DependencyInjection/Neo4jExtension.php

@@ -35,9 +35,10 @@ public function load(array $configs, ContainerBuilder $container): ContainerBuil
             ->setArgument(2, $mergedConfig['default_session_config'] ?? null)
             ->setArgument(3, $mergedConfig['default_transaction_config'] ?? null)
             ->setArgument(4, $mergedConfig['drivers'] ?? [])
-            ->setArgument(5, new Reference(ClientInterface::class, ContainerInterface::NULL_ON_INVALID_REFERENCE))
-            ->setArgument(6, new Reference(StreamFactoryInterface::class, ContainerInterface::NULL_ON_INVALID_REFERENCE))
-            ->setArgument(7, new Reference(RequestFactoryInterface::class, ContainerInterface::NULL_ON_INVALID_REFERENCE))
+            ->setArgument(5, $mergedConfig['default_driver'] ?? null)
+            ->setArgument(6, new Reference(ClientInterface::class, ContainerInterface::NULL_ON_INVALID_REFERENCE))
+            ->setArgument(7, new Reference(StreamFactoryInterface::class, ContainerInterface::NULL_ON_INVALID_REFERENCE))
+            ->setArgument(8, new Reference(RequestFactoryInterface::class, ContainerInterface::NULL_ON_INVALID_REFERENCE))
             ->setAbstract(false)
         ;
 

tests/App/config/default.yml

@@ -40,4 +40,7 @@ neo4j:
             priority: 1000
             dsn: bolt://localhost
 
+        -   alias: neo4j-test
+            dsn: neo4j://neo4j:testtest@neo4j
+
 

tests/Functional/BundleInitializationTest.php renamed to tests/Functional/Integration.php

@@ -5,32 +5,51 @@
 namespace Neo4j\Neo4jBundle\Tests\Functional;
 
 use Laudis\Neo4j\Contracts\ClientInterface;
+use Laudis\Neo4j\Contracts\DriverInterface;
 use Neo4j\Neo4jBundle\Tests\App\TestKernel;
 use Symfony\Bundle\FrameworkBundle\Test\KernelTestCase;
 
-/**
- * @author Tobias Nyholm <[email protected]>
- */
-class BundleInitializationTest extends KernelTestCase
+class Integration extends KernelTestCase
 {
     protected static function getKernelClass(): string
     {
         return TestKernel::class;
     }
 
-    public function testRegisterBundle(): void
+    public static function setUpBeforeClass(): void
+    {
+        parent::setUpBeforeClass();
+        self::bootKernel();
+    }
+
+    public function testClient(): void
     {
         static::bootKernel();
         $container = static::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));
-        self::assertInstanceOf(ClientInterface::class, $client);
         $this->assertInstanceOf(ClientInterface::class, $client);
+
+        $this->assertSame($client, $container->get('neo4j.client'));
+    }
+
+    public function testDriver(): void
+    {
+        static::bootKernel();
+        $container = static::getContainer();
+
+        $this->assertTrue($container->has('neo4j.driver'));
+        $driver = $container->get('neo4j.driver');
+        $this->assertInstanceOf(DriverInterface::class, $driver);
+
+        $this->assertTrue($container->has(DriverInterface::class));
+        $this->assertInstanceOf(DriverInterface::class, $driver);
+
+        $this->assertSame($driver, $container->get('neo4j.driver'));
     }
 
     public function testDefaultDsn(): void