Fix tests and CS

Author: GromNaN

src/Client.php

@@ -25,9 +25,7 @@
 
 final class Client extends MongoDBClient
 {
-    /**
-     * @internal
-     */
+    /** @internal */
     public function addSubscriber(Subscriber $subscriber): void
     {
         $this->getManager()->addSubscriber($subscriber);

src/DataCollector/DriverEventSubscriber.php

@@ -27,6 +27,7 @@
 use Symfony\Component\Stopwatch\Stopwatch;
 use Symfony\Component\Stopwatch\StopwatchEvent;
 
+use function array_shift;
 use function debug_backtrace;
 
 use const DEBUG_BACKTRACE_IGNORE_ARGS;

src/DataCollector/MongoDBDataCollector.php

@@ -35,8 +35,6 @@
 use function count;
 use function iterator_to_array;
 
-use const DEBUG_BACKTRACE_IGNORE_ARGS;
-
 /** @internal */
 final class MongoDBDataCollector extends DataCollector implements LateDataCollectorInterface
 {

src/DependencyInjection/Compiler/DataCollectorPass.php

@@ -20,12 +20,9 @@
 
 namespace MongoDB\Bundle\DependencyInjection\Compiler;
 
-use MongoDB\Bundle\DataCollector\DriverEventSubscriber;
 use Symfony\Component\DependencyInjection\ChildDefinition;
 use Symfony\Component\DependencyInjection\Compiler\CompilerPassInterface;
 use Symfony\Component\DependencyInjection\ContainerBuilder;
-use Symfony\Component\DependencyInjection\ContainerInterface;
-use Symfony\Component\DependencyInjection\Definition;
 use Symfony\Component\DependencyInjection\Reference;
 
 use function sprintf;

src/DependencyInjection/MongoDBExtension.php

@@ -25,7 +25,6 @@
 use Symfony\Component\Config\FileLocator;
 use Symfony\Component\DependencyInjection\ChildDefinition;
 use Symfony\Component\DependencyInjection\ContainerBuilder;
-use Symfony\Component\DependencyInjection\Definition;
 use Symfony\Component\DependencyInjection\Extension\Extension;
 use Symfony\Component\DependencyInjection\Loader\PhpFileLoader;
 
@@ -84,11 +83,13 @@ private function createClients(string $defaultClient, array $clients, ContainerB
         // Register an autowiring alias for the default client
         $container->setAlias(Client::class, self::createClientServiceId($defaultClient));
 
-        if (isset($clients[$defaultClient]['default_database'])) {
-            $container->setParameter(
-                sprintf('%s.default_database', Client::class),
-                $clients[$defaultClient]['default_database'],
-            );
+        if (! isset($clients[$defaultClient]['default_database'])) {
+            return;
         }
+
+        $container->setParameter(
+            sprintf('%s.default_database', Client::class),
+            $clients[$defaultClient]['default_database'],
+        );
     }
 }

tests/Unit/DependencyInjection/MongoDBExtensionTest.php

@@ -26,10 +26,16 @@
 use MongoDB\Client;
 use MongoDB\Driver\ServerApi;
 use PHPUnit\Framework\TestCase;
+use stdClass;
+use Symfony\Component\DependencyInjection\ChildDefinition;
 use Symfony\Component\DependencyInjection\ContainerBuilder;
 use Symfony\Component\DependencyInjection\Definition;
 use Symfony\Component\DependencyInjection\ParameterBag\EnvPlaceholderParameterBag;
 
+use function array_column;
+use function is_a;
+use function sprintf;
+
 /** @covers \MongoDB\Bundle\DependencyInjection\MongoDBExtension */
 final class MongoDBExtensionTest extends TestCase
 {
@@ -52,8 +58,9 @@ public function testLoadWithSingleClient(): void
             'clients' => [
                 ['id' => 'default', 'uri' => 'mongodb://localhost:27017'],
             ],
-        ]], [
-            'profiler' => new Definition(\stdClass::class),
+        ],
+        ], [
+            'profiler' => new Definition(stdClass::class),
         ]);
 
         $this->assertTrue($container->hasDefinition('mongodb.client.default'));
@@ -62,18 +69,17 @@ public function testLoadWithSingleClient(): void
 
         // Check service definition
         $definition = $container->getDefinition('mongodb.client.default');
-        $this->assertTrue(is_a($definition->getClass(), Client::class, true), sprintf('Expected "%s" to be a "%s"', $definition->getClass(), Client::class));
         $this->assertSame('mongodb://localhost:27017', $definition->getArgument('$uri'));
         $this->assertTrue($definition->hasMethodCall('addSubscriber'));
+        $this->assertInstanceOf(ChildDefinition::class, $definition);
+        $this->assertSame('mongodb.abstract.client', $definition->getParent());
+        $parentDefinition = $container->getDefinition($definition->getParent());
+        $this->assertTrue(is_a($parentDefinition->getClass(), Client::class, true), sprintf('Expected "%s" to be a "%s"', $definition->getClass(), Client::class));
+        $this->assertTrue($parentDefinition->isAbstract());
 
         // Check alias definition
         $alias = $container->getAlias(Client::class);
         $this->assertSame('mongodb.client.default', (string) $alias);
-
-        // Check data collector
-        $definition = $container->getDefinition('mongodb.data_collector');
-        $this->assertTrue($definition->hasMethodCall('addClient'));
-        $this->assertSame('default', $definition->getMethodCalls()[0][1][0]);
     }
 
     public function testLoadWithoutProfiler(): void
@@ -82,7 +88,8 @@ public function testLoadWithoutProfiler(): void
             'clients' => [
                 ['id' => 'default', 'uri' => 'mongodb://localhost:27017'],
             ],
-        ]]);
+        ],
+        ]);
 
         // Check service definition
         $definition = $container->getDefinition('mongodb.client.default');
@@ -109,8 +116,9 @@ public function testLoadWithMultipleClients(): void
                     'driver_options' => ['serverApi' => new ServerApi((string) ServerApi::V1)],
                 ],
             ],
-        ]], [
-            'profiler' => new Definition(\stdClass::class),
+        ],
+        ], [
+            'profiler' => new Definition(stdClass::class),
         ]);
 
         $this->assertTrue($container->hasDefinition('mongodb.client.default'));
@@ -120,13 +128,15 @@ public function testLoadWithMultipleClients(): void
 
         // Check service definitions
         $definition = $container->getDefinition('mongodb.client.default');
-        $this->assertTrue(is_a($definition->getClass(), Client::class, true), sprintf('Expected "%s" to be a "%s"', $definition->getClass(), Client::class));
+        $this->assertInstanceOf(ChildDefinition::class, $definition);
+        $this->assertSame('mongodb.abstract.client', $definition->getParent());
         $this->assertSame('mongodb://localhost:27017', $definition->getArgument('$uri'));
         $this->assertSame(['readPreference' => 'primary'], $definition->getArgument('$uriOptions'));
         $this->assertTrue($definition->hasMethodCall('addSubscriber'));
 
         $definition = $container->getDefinition('mongodb.client.secondary');
-        $this->assertTrue(is_a($definition->getClass(), Client::class, true), sprintf('Expected "%s" to be a "%s"', $definition->getClass(), Client::class));
+        $this->assertInstanceOf(ChildDefinition::class, $definition);
+        $this->assertSame('mongodb.abstract.client', $definition->getParent());
         $this->assertSame('mongodb://localhost:27018', $definition->getArgument('$uri'));
         $this->assertEquals(['serverApi' => new ServerApi((string) ServerApi::V1)], $definition->getArgument('$driverOptions'));
         $this->assertTrue($definition->hasMethodCall('addSubscriber'));