Merge branch 'main' into testing

Author: transistive

Jenkinsfile

@@ -23,11 +23,16 @@ pipeline {
         stage('Test') {
             steps {
                 sh 'docker-compose -f docker/docker-compose-4.2.yml run client php vendor/bin/phpunit'
+                sh 'docker-compose -f docker/docker-compose-4.2.yml down'
                 sh 'docker-compose -f docker/docker-compose-4.1.yml run client php vendor/bin/phpunit'
+                sh 'docker-compose -f docker/docker-compose-4.1.yml down'
                 sh 'docker-compose -f docker/docker-compose-4.0.yml run client php vendor/bin/phpunit'
+                sh 'docker-compose -f docker/docker-compose-4.0.yml down'
                 sh 'docker-compose -f docker/docker-compose-3.5.yml run client php vendor/bin/phpunit'
-                sh 'docker-compose -f docker/docker-compose-2.3.yml run client php vendor/bin/phpunit'
+                sh 'docker-compose -f docker/docker-compose-3.5.yml down'
+//                 sh 'docker-compose -f docker/docker-compose-2.3.yml run client php vendor/bin/phpunit'
                 sh 'docker-compose -f docker/docker-compose-php-7.4.yml run client php vendor/bin/phpunit'
+                sh 'docker-compose -f docker/docker-compose-php-7.4.yml down'
             }
         }
     }

docker-compose.yml

@@ -22,7 +22,7 @@ services:
     neo4j:
         networks:
             - neo4j
-        image: neo4j:4.2
+        image: neo4j:3.5
         ports:
             - "7474:7474"
             - "7687:7687"

docker/docker-compose-2.3.yml

@@ -13,6 +13,8 @@ services:
             - neo4j
         depends_on:
             - neo4j
+        volumes:
+            - ../:/opt/project
     neo4j:
         networks:
             - neo4j

docker/docker-compose-3.5.yml

@@ -12,7 +12,9 @@ services:
         networks:
             - neo4j
         depends_on:
-            -   neo4j
+            - neo4j
+        volumes:
+            - ../:/opt/project
     neo4j:
         networks:
             - neo4j

src/ClientBuilder.php

@@ -18,6 +18,8 @@
 use InvalidArgumentException;
 use Laudis\Neo4j\Contracts\ClientInterface;
 use Laudis\Neo4j\Contracts\DriverInterface;
+use Laudis\Neo4j\Formatter\HttpCypherFormatter;
+use Laudis\Neo4j\HttpDriver\RequestFactory;
 use Laudis\Neo4j\Network\Bolt\BoltDriver;
 use Laudis\Neo4j\Network\Bolt\BoltInjections;
 use Laudis\Neo4j\Network\Http\HttpDriver;
@@ -64,7 +66,10 @@ public function addHttpConnection(string $alias, string $url, HttpInjections $in
         if (!isset($parse['host'], $parse['user'], $parse['pass'])) {
             throw new InvalidArgumentException('The provided url must have a parsed host, user and pass value');
         }
-        $conneciton = new HttpDriver($parse, new VersionDiscovery(), $injections ?? new HttpInjections());
+        $injections = $injections ?? new HttpInjections();
+        $factory = $injections->requestFactory();
+        $requestFactory = new RequestFactory($factory, $injections->streamFactory(), new HttpCypherFormatter());
+        $conneciton = new HttpDriver($parse, new VersionDiscovery($requestFactory, $injections->client()), $injections);
         $this->connectionPool->put($alias, $conneciton);
 
         return $this;

src/HttpDriver/RequestFactory.php

@@ -40,7 +40,7 @@ public function openTransaction(RequestData $data): RequestInterface
         return $this->createRequest($data, 'POST');
     }
 
-    private function createRequest(RequestData $data, string $method, string $body = ''): RequestInterface
+    public function createRequest(RequestData $data, string $method, string $body = ''): RequestInterface
     {
         $combo = base64_encode($data->getUser().':'.$data->getPassword());
 

src/Network/Http/HttpDriver.php

@@ -59,19 +59,22 @@ public function aquireSession(): SessionInterface
             $this->parsedUrl['port'] ?? self::DEFAULT_PORT,
             $this->parsedUrl['path'] ?? ''
         );
-        $tsx = $this->decorator->discoverTransactionUrl($url, $this->injections);
+
+        $requestData = new RequestData(
+            $url,
+            $this->parsedUrl['user'],
+            $this->parsedUrl['pass'],
+            false
+        );
+        $tsx = $this->decorator->discoverTransactionUrl($requestData, $this->injections->database());
+        $requestData = $requestData->withEndpoint($tsx);
 
         $formatter = new HttpCypherFormatter();
         $this->session = new HttpSession(
             new RequestFactory($this->injections->requestFactory(), $this->injections->streamFactory(), $formatter),
             $this->injections->client(),
             $formatter,
-            new RequestData(
-                $tsx,
-                $this->parsedUrl['user'],
-                $this->parsedUrl['pass'],
-                false
-            )
+            $requestData
         );
 
         return $this->session;

src/Network/VersionDiscovery.php

@@ -14,18 +14,19 @@
 namespace Laudis\Neo4j\Network;
 
 use JsonException;
-use Laudis\Neo4j\Network\Http\HttpInjections;
+use Laudis\Neo4j\Databags\RequestData;
+use Laudis\Neo4j\HttpDriver\RequestFactory;
 use Psr\Http\Client\ClientExceptionInterface;
 use Psr\Http\Client\ClientInterface;
-use Psr\Http\Message\RequestFactoryInterface;
 
 /**
  * @psalm-type DiscoveryResult = array{
  *      bolt_routing:string,
  *      transaction: string,
  *      bolt_direct: string,
  *      neo4j_version: string,
- *      neo4j_edition: string
+ *      neo4j_edition: string,
+ *      data?: string
  * }
  * @psalm-type DiscoveryResultLegacy = array{
  *     extensions: array,
@@ -46,21 +47,30 @@
  */
 final class VersionDiscovery
 {
+    private RequestFactory $requestFactory;
+    private ClientInterface $client;
+
+    public function __construct(RequestFactory $requestFactory, ClientInterface $client)
+    {
+        $this->requestFactory = $requestFactory;
+        $this->client = $client;
+    }
+
     /**
      * @throws ClientExceptionInterface
      * @throws JsonException
      */
-    public function discoverTransactionUrl(string $url, HttpInjections $injections): string
+    public function discoverTransactionUrl(RequestData $data, string $database): string
     {
-        $discovery = $this->discovery($injections->client(), $injections->requestFactory(), $url);
+        $discovery = $this->discovery($data);
         $version = $discovery['neo4j_version'] ?? null;
 
         if ($version === null) {
-            $discovery = $this->discovery($injections->client(), $injections->requestFactory(), $url.'/db/data');
+            $discovery = $this->discovery($data->withEndpoint($discovery['data'] ?? $data->getEndpoint().'/db/data'));
         }
         $tsx = $discovery['transaction'];
 
-        return str_replace('{databaseName}', $injections->database(), $tsx);
+        return str_replace('{databaseName}', $database, $tsx);
     }
 
     /**
@@ -69,9 +79,9 @@ public function discoverTransactionUrl(string $url, HttpInjections $injections):
      *
      * @return DiscoveryResult|DiscoveryResultLegacy $discovery
      */
-    private function discovery(ClientInterface $client, RequestFactoryInterface $factory, string $uri): array
+    private function discovery(RequestData $data): array
     {
-        $response = $client->sendRequest($factory->createRequest('GET', $uri));
+        $response = $this->client->sendRequest($this->requestFactory->createRequest($data, 'GET'));
 
         /** @var DiscoveryResultLegacy|DiscoveryResult $result */
         $result = json_decode($response->getBody()->getContents(), true, 512, JSON_THROW_ON_ERROR);