set OGMFormatter as the default

Author: transistive

src/ClientBuilder.php

@@ -14,7 +14,6 @@
 namespace Laudis\Neo4j;
 
 use Ds\Map;
-use Ds\Vector;
 use function http_build_query;
 use function in_array;
 use Laudis\Neo4j\Authentication\Authenticate;
@@ -26,13 +25,15 @@
 use Laudis\Neo4j\Databags\DriverConfiguration;
 use Laudis\Neo4j\Databags\HttpPsrBindings;
 use Laudis\Neo4j\Exception\UnsupportedScheme;
-use Laudis\Neo4j\Formatter\BasicFormatter;
+use Laudis\Neo4j\Formatter\OGMFormatter;
 use Laudis\Neo4j\Http\HttpConfig;
+use Laudis\Neo4j\Types\CypherList;
+use Laudis\Neo4j\Types\CypherMap;
 
 /**
  * @template T
  *
- * @see Client::create()
+ * @psalm-import-type OGMTypes from \Laudis\Neo4j\Formatter\OGMFormatter
  */
 final class ClientBuilder
 {
@@ -57,11 +58,11 @@ public function __construct(DriverConfiguration $configuration, FormatterInterfa
     }
 
     /**
-     * @return ClientBuilder<Vector<Map<string, scalar|array|null>>>
+     * @return ClientBuilder<CypherList<CypherMap<OGMTypes>>>
      */
     public static function create(): ClientBuilder
     {
-        return new self(DriverConfiguration::default(), new BasicFormatter(), new Map(), null);
+        return new self(DriverConfiguration::default(), OGMFormatter::create(), new Map(), null);
     }
 
     /**

src/Formatter/OGMFormatter.php

@@ -22,6 +22,8 @@
 use Exception;
 use Laudis\Neo4j\Contracts\FormatterInterface;
 use Laudis\Neo4j\Formatter\Specialised\BoltOGMTranslator;
+use Laudis\Neo4j\Formatter\Specialised\HttpOGMArrayTranslator;
+use Laudis\Neo4j\Formatter\Specialised\HttpOGMStringTranslator;
 use Laudis\Neo4j\Formatter\Specialised\HttpOGMTranslator;
 use Laudis\Neo4j\Types\CypherList;
 use Laudis\Neo4j\Types\CypherMap;
@@ -52,6 +54,17 @@ public function __construct(BoltOGMTranslator $boltTranslator, HttpOGMTranslator
         $this->httpTranslator = $httpTranslator;
     }
 
+    public static function create(): OGMFormatter
+    {
+        return new self(
+            new BoltOGMTranslator(),
+            new HttpOGMTranslator(
+                new HttpOGMArrayTranslator(),
+                new HttpOGMStringTranslator()
+            )
+        );
+    }
+
     /**
      * @param BoltMeta $meta
      *

tests/Integration/ClientIntegrationTest.php

@@ -22,6 +22,7 @@
 use Laudis\Neo4j\Contracts\TransactionInterface;
 use Laudis\Neo4j\Databags\Statement;
 use Laudis\Neo4j\Exception\Neo4jException;
+use Laudis\Neo4j\Formatter\BasicFormatter;
 use PHPUnit\Framework\TestCase;
 
 final class ClientIntegrationTest extends TestCase
@@ -52,6 +53,7 @@ public function createClient(): ClientInterface
             ->addBoltConnection('bolt', 'bolt://neo4j:test@neo4j')
             ->addHttpConnection('http', 'http://neo4j:test@neo4j')
             ->addBoltConnection('cluster', 'bolt://neo4j:test@core1', BoltConfiguration::create()->withAutoRouting(true))
+            ->withFormatter(new BasicFormatter())
             ->build();
     }
 

tests/Integration/ClusterIntegrationTest.php

@@ -18,6 +18,7 @@
 use Laudis\Neo4j\Bolt\BoltConfiguration;
 use Laudis\Neo4j\ClientBuilder;
 use Laudis\Neo4j\Contracts\ClientInterface;
+use Laudis\Neo4j\Formatter\BasicFormatter;
 use PHPUnit\Framework\TestCase;
 
 final class ClusterIntegrationTest extends TestCase
@@ -31,6 +32,7 @@ protected function setUp(): void
         $boltInjections = BoltConfiguration::create()->withAutoRouting(true);
         $this->client = ClientBuilder::create()
             ->addBoltConnection('cluster', 'bolt://neo4j:test@core1', $boltInjections)
+            ->withFormatter(new BasicFormatter())
             ->build();
     }
 

tests/Integration/ComplexQueryTests.php

@@ -19,6 +19,7 @@
 use InvalidArgumentException;
 use Laudis\Neo4j\ClientBuilder;
 use Laudis\Neo4j\Contracts\ClientInterface;
+use Laudis\Neo4j\Formatter\BasicFormatter;
 use Laudis\Neo4j\ParameterHelper;
 use PHPUnit\Framework\TestCase;
 
@@ -34,6 +35,7 @@ protected function setUp(): void
             ->withDriver('bolt', 'bolt://neo4j:test@neo4j')
             ->withDriver('http', 'http://neo4j:test@neo4j')
             ->withDriver('cluster', 'neo4j://neo4j:test@core1')
+            ->withFormatter(new BasicFormatter())
             ->build();
     }
 

tests/Integration/ConsistencyTest.php

@@ -18,6 +18,7 @@
 use Laudis\Neo4j\ClientBuilder;
 use Laudis\Neo4j\Contracts\ClientInterface;
 use Laudis\Neo4j\Databags\Statement;
+use Laudis\Neo4j\Formatter\BasicFormatter;
 use PHPUnit\Framework\TestCase;
 
 final class ConsistencyTest extends TestCase
@@ -32,6 +33,7 @@ protected function setUp(): void
             ->withDriver('http', 'http://neo4j:test@neo4j')
             ->withDriver('bolt', 'bolt://neo4j:test@neo4j')
             ->withDriver('cluster', 'neo4j://neo4j:test@core1')
+            ->withFormatter(new BasicFormatter())
             ->build();
     }
 

tests/Integration/TransactionIntegrationTest.php

@@ -19,6 +19,7 @@
 use Laudis\Neo4j\Contracts\ClientInterface;
 use Laudis\Neo4j\Databags\Statement;
 use Laudis\Neo4j\Exception\Neo4jException;
+use Laudis\Neo4j\Formatter\BasicFormatter;
 use PHPUnit\Framework\TestCase;
 
 final class TransactionIntegrationTest extends TestCase
@@ -34,6 +35,7 @@ public function setUp(): void
             ->withDriver('bolt', 'bolt://neo4j:test@neo4j')
             ->withDriver('cluster', 'neo4j://neo4j:test@core1')
             ->withDriver('http', 'http://neo4j:test@neo4j')
+            ->withFormatter(new BasicFormatter())
             ->build();
     }