Fix DIC and mark diagnostic classes as internal

Author: GromNaN

src/Command/ConnectionDiagnosticCommand.php

@@ -26,15 +26,12 @@
 )]
 final class ConnectionDiagnosticCommand extends Command
 {
-    // TODO: Inject as service?
-    private readonly EncryptionDiagnostic $encryptionDiagnostic;
-
     /** @param ServiceProviderInterface<ConnectionDiagnostic> $diagnostics */
-    public function __construct(private readonly ServiceProviderInterface $diagnostics)
-    {
+    public function __construct(
+        private readonly ServiceProviderInterface $diagnostics,
+        private readonly EncryptionDiagnostic $encryptionDiagnostic = new EncryptionDiagnostic(),
+    ) {
         parent::__construct();
-
-        $this->encryptionDiagnostic = new EncryptionDiagnostic();
     }
 
     protected function configure(): void

src/DataCollector/ConnectionDiagnostic.php

@@ -15,6 +15,7 @@
 use function iterator_count;
 use function version_compare;
 
+/** @internal */
 class ConnectionDiagnostic
 {
     private const CLIENT_ENCRYPTION_OPTION_NAMES = [
@@ -30,8 +31,10 @@ class ConnectionDiagnostic
         Server::TYPE_RS_SECONDARY,
     ];
 
-    public function __construct(private Client $client, private array $driverOptions)
-    {
+    public function __construct(
+        private readonly Client $client,
+        private readonly array $driverOptions,
+    ) {
     }
 
     /**

src/DataCollector/EncryptionDiagnostic.php

@@ -21,6 +21,7 @@
 use function sprintf;
 use function trim;
 
+/** @internal */
 class EncryptionDiagnostic
 {
     /** @return array{extensionLoaded: bool, extensionVersion: ?string, extensionSupportsLibmongocrypt: bool, libraryVersion: ?string} */