Unified driver create methods

Author: transistive

src/Bolt/BoltDriver.php

@@ -62,36 +62,42 @@ public function __construct(
         $this->formatter = $formatter;
     }
 
-    /**
-     * @param string|UriInterface $uri
-     *
-     * @return self<OGMResults>
-     */
-    public static function create($uri, ?DriverConfiguration $configuration = null, ?AuthenticateInterface $authenticate = null): self
-    {
-        return self::createWithFormatter($uri, OGMFormatter::create(), $configuration, $authenticate);
-    }
-
     /**
      * @template U
      *
-     * @param string|UriInterface   $uri
      * @param FormatterInterface<U> $formatter
+     * @param string|UriInterface   $uri
      *
-     * @return self<U>
+     * @return (
+     *           func_num_args() is 4
+     *           ? self<U>
+     *           : self<OGMResults>
+     *           )
+     * @psalm-mutation-free
      */
-    public static function createWithFormatter($uri, FormatterInterface $formatter, ?DriverConfiguration $configuration = null, ?AuthenticateInterface $authenticate = null): self
+    public static function create($uri, ?DriverConfiguration $configuration = null, ?AuthenticateInterface $authenticate = null, FormatterInterface $formatter = null): self
     {
         if (is_string($uri)) {
             $uri = Uri::create($uri);
         }
 
+        if ($formatter !== null) {
+            return new self(
+                $uri,
+                $authenticate ?? Authenticate::fromUrl(),
+                new BoltConnectionPool(),
+                $configuration ?? DriverConfiguration::default(),
+                $formatter
+            );
+        }
+
+
         return new self(
             $uri,
             $authenticate ?? Authenticate::fromUrl(),
             new BoltConnectionPool(),
             $configuration ?? DriverConfiguration::default(),
-            $formatter
+            OGMFormatter::create()
         );
     }
 

src/Http/HttpDriver.php

@@ -86,34 +86,38 @@ public function __construct(
         $this->auth = $auth;
     }
 
-    /**
-     * @param string|UriInterface $uri
-     *
-     * @return self<OGMResults>
-     */
-    public static function create($uri, ?DriverConfiguration $configuration = null, ?AuthenticateInterface $authenticate = null): self
-    {
-        return self::createWithFormatter($uri, OGMFormatter::create(), $configuration, $authenticate);
-    }
-
     /**
      * @template U
      *
-     * @param string|UriInterface   $uri
      * @param FormatterInterface<U> $formatter
+     * @param string|UriInterface   $uri
      *
-     * @return self<U>
+     * @return (
+     *           func_num_args() is 4
+     *           ? self<U>
+     *           : self<OGMResults>
+     *           )
+     * @psalm-mutation-free
      */
-    public static function createWithFormatter($uri, FormatterInterface $formatter, ?DriverConfiguration $configuration = null, ?AuthenticateInterface $authenticate = null): self
+    public static function create($uri, ?DriverConfiguration $configuration = null, ?AuthenticateInterface $authenticate = null, FormatterInterface $formatter = null): self
     {
         if (is_string($uri)) {
             $uri = Uri::create($uri);
         }
 
+        if ($formatter !== null) {
+            return new self(
+                $uri,
+                $configuration ?? DriverConfiguration::default(),
+                $formatter,
+                $authenticate ?? Authenticate::fromUrl()
+            );
+        }
+
         return new self(
             $uri,
             $configuration ?? DriverConfiguration::default(),
-            $formatter,
+            OGMFormatter::create(),
             $authenticate ?? Authenticate::fromUrl()
         );
     }

src/Neo4j/Neo4jDriver.php

@@ -27,13 +27,15 @@
 use Laudis\Neo4j\Contracts\SessionInterface;
 use Laudis\Neo4j\Databags\DriverConfiguration;
 use Laudis\Neo4j\Databags\SessionConfiguration;
-use Laudis\Neo4j\Formatter\BasicFormatter;
+use Laudis\Neo4j\Formatter\OGMFormatter;
 use Psr\Http\Message\UriInterface;
 
 /**
  * @template T
  *
  * @implements DriverInterface<T>
+ *
+ * @psalm-import-type OGMResults from \Laudis\Neo4j\Formatter\OGMFormatter
  */
 final class Neo4jDriver implements DriverInterface
 {
@@ -63,30 +65,40 @@ public function __construct(
     }
 
     /**
-     * @param string|UriInterface $uri
-     */
-    public static function create($uri, ?DriverConfiguration $configuration = null, ?AuthenticateInterface $authenticate = null): self
-    {
-        return self::createWithFormatter($uri, new BasicFormatter(), $configuration, $authenticate);
-    }
-
-    /**
-     * @param string|UriInterface $uri
+     * @template U
      *
-     * @throws Exception
+     * @param FormatterInterface<U> $formatter
+     * @param string|UriInterface   $uri
+     *
+     * @return (
+     *           func_num_args() is 4
+     *           ? self<U>
+     *           : self<OGMResults>
+     *           )
+     * @psalm-mutation-free
      */
-    public static function createWithFormatter($uri, FormatterInterface $formatter, ?DriverConfiguration $configuration = null, ?AuthenticateInterface $authenticate = null): self
+    public static function create($uri, ?DriverConfiguration $configuration = null, ?AuthenticateInterface $authenticate = null, FormatterInterface $formatter = null): self
     {
         if (is_string($uri)) {
             $uri = Uri::create($uri);
         }
 
+        if ($formatter !== null) {
+            return new self(
+                $uri,
+                $authenticate ?? Authenticate::fromUrl(),
+                new Neo4jConnectionPool(new BoltConnectionPool()),
+                $configuration ?? DriverConfiguration::default(),
+                $formatter
+            );
+        }
+
         return new self(
             $uri,
             $authenticate ?? Authenticate::fromUrl(),
             new Neo4jConnectionPool(new BoltConnectionPool()),
             $configuration ?? DriverConfiguration::default(),
-            $formatter
+            OGMFormatter::create()
         );
     }