injected the semaphore factory where needed

Author: transistive

src/Bolt/BoltDriver.php

@@ -80,11 +80,12 @@ public static function create($uri, ?DriverConfiguration $configuration = null,
 
         $configuration ??= DriverConfiguration::default();
         $authenticate ??= Authenticate::fromUrl($uri);
+        $semaphore = $configuration->getSemaphoreInterface()->create($uri, $configuration);
 
         /** @psalm-suppress InvalidArgument */
         return new self(
             $uri,
-            ConnectionPool::create($uri, $authenticate, $configuration),
+            ConnectionPool::create($uri, $authenticate, $configuration, $semaphore),
             $formatter ?? OGMFormatter::create(),
         );
     }

src/Bolt/ConnectionPool.php

@@ -46,10 +46,8 @@ public function __construct(SemaphoreInterface $semaphore, BoltFactory $factory,
         $this->data = $data;
     }
 
-    public static function create(UriInterface $uri, AuthenticateInterface $auth, DriverConfiguration $conf): self
+    public static function create(UriInterface $uri, AuthenticateInterface $auth, DriverConfiguration $conf, SemaphoreInterface $semaphore): self
     {
-        $semaphore = SemaphoreFactory::getInstance()->create($uri, $conf);
-
         return new self(
             $semaphore,
             BoltFactory::create(),

src/Contracts/DriverInterface.php

@@ -14,6 +14,8 @@
 namespace Laudis\Neo4j\Contracts;
 
 use Laudis\Neo4j\Databags\SessionConfiguration;
+use Laudis\Neo4j\Formatter\CypherList;
+use Laudis\Neo4j\Formatter\CypherMap;
 
 /**
  * The driver creates sessions for carrying out work.
@@ -22,7 +24,7 @@
  *
  * @psalm-type ParsedUrl = array{host: string, pass: string|null, path: string, port: int, query: array<string,string>, scheme: string, user: string|null}
  *
- * @psalm-type BasicDriver = DriverInterface<\Laudis\Neo4j\Formatter\CypherList<\Laudis\Neo4j\Formatter\CypherMap<string, scalar|array|null>>>
+ * @psalm-type BasicDriver = DriverInterface<CypherList<CypherMap<string, scalar|array|null>>>
  */
 interface DriverInterface
 {

src/Neo4j/Neo4jConnectionPool.php

@@ -83,10 +83,8 @@ public function __construct(SemaphoreInterface $semaphore, BoltFactory $factory,
         $this->resolver = $resolver;
     }
 
-    public static function create(UriInterface $uri, AuthenticateInterface $auth, DriverConfiguration $conf, AddressResolverInterface $resolver): self
+    public static function create(UriInterface $uri, AuthenticateInterface $auth, DriverConfiguration $conf, AddressResolverInterface $resolver, SemaphoreInterface $semaphore): self
     {
-        $semaphore = SemaphoreFactory::getInstance()->create($uri, $conf);
-
         return new self(
             $semaphore,
             BoltFactory::create(),

src/Neo4j/Neo4jDriver.php

@@ -84,11 +84,12 @@ public static function create($uri, ?DriverConfiguration $configuration = null,
         $configuration ??= DriverConfiguration::default();
         $authenticate ??= Authenticate::fromUrl($uri);
         $resolver ??= new DNSAddressResolver();
+        $semaphore = $configuration->getSemaphoreInterface()->create($uri, $configuration);
 
         /** @psalm-suppress InvalidArgument */
         return new self(
             $uri,
-            Neo4jConnectionPool::create($uri, $authenticate, $configuration, $resolver),
+            Neo4jConnectionPool::create($uri, $authenticate, $configuration, $resolver, $semaphore),
             $formatter ?? OGMFormatter::create(),
         );
     }