Merge branch 'test_tx_func_run' into feat/tesktkit-session-run

Author: p123-stack

.github/workflows/testkit.yml

@@ -68,11 +68,5 @@ jobs:
 
       - name: Run integration tests
         run: |
-          docker compose up -d --remove-orphans --wait --no-build \
-            server1 \
-            server2 \
-            server3 \
-            server4 \
-            testkit_backend
-
-          docker compose run --rm testkit ./testkit.sh
+          docker compose up -d --remove-orphans --wait --no-build testkit_backend neo4j
+          docker compose up testkit

Dockerfile

@@ -1,4 +1,4 @@
-ARG PHP_VERSION
+ARG PHP_VERSION=8.1
 
 FROM php:${PHP_VERSION}-cli
 RUN apt-get update \
@@ -8,9 +8,6 @@ RUN apt-get update \
         git \
         wget \
     && docker-php-ext-install -j$(nproc) bcmath sockets \
-    && wget https://codeclimate.com/downloads/test-reporter/test-reporter-latest-linux-amd64 \
-    && mv test-reporter-latest-linux-amd64 /usr/bin/cc-test-reporter  \
-    && chmod +x /usr/bin/cc-test-reporter \
     && pecl install xdebug \
     && docker-php-ext-enable xdebug && \
     curl -sS https://getcomposer.org/installer | php -- --install-dir=/usr/local/bin --filename=composer

composer.json

@@ -28,7 +28,7 @@
         "psr/http-factory": "^1.0",
         "psr/http-client": "^1.0",
         "php-http/message": "^1.0",
-        "stefanak-michal/bolt": "^7.2.4",
+        "stefanak-michal/bolt": "^7.1.4",
         "symfony/polyfill-php80": "^1.2",
         "psr/simple-cache": ">=2.0",
         "ext-json": "*",

docker-compose.yml

@@ -53,7 +53,7 @@ services:
       - .env
   neo4j:
     <<: *common
-    image: neo4j:5.23-community
+    image: neo4j:5-enterprise
     hostname: neo4j
     networks:
       - neo4j
@@ -62,6 +62,7 @@ services:
       - "11474:7474"
     environment:
       <<: *common-env
+      NEO4J_ACCEPT_LICENSE_AGREEMENT: 'yes'
       NEO4J_server_bolt_advertised__address: neo4j:7687
       NEO4J_server_http_advertised__address: neo4j:7474
 
@@ -118,6 +119,7 @@ services:
 
   testkit:
     image: python:3.13
+    command: ./testkit.sh
     volumes:
       - .:/opt/project
     working_dir: /opt/project/testkit-backend
@@ -130,6 +132,9 @@ services:
       TEST_DRIVER_NAME: php
       TEST_DRIVER_REPO: /opt/project
       TEST_BACKEND_HOST: testkit_backend
+      TEST_STUB_HOST: testkit
+    depends_on:
+      - testkit_backend
 
   testkit_backend:
     <<: *common-php
@@ -140,7 +145,5 @@ services:
       - neo4j
     extra_hosts:
       - "host.docker.internal:host-gateway"
-    depends_on:
-      - neo4j
     ports:
       - "9876:9876"

src/Authentication/BasicAuth.php

@@ -13,16 +13,10 @@
 
 namespace Laudis\Neo4j\Authentication;
 
-use Bolt\protocol\V4_4;
-use Bolt\protocol\V5;
-use Bolt\protocol\V5_1;
-use Bolt\protocol\V5_2;
-use Bolt\protocol\V5_3;
-use Bolt\protocol\V5_4;
 use Exception;
+use Laudis\Neo4j\Bolt\BoltConnection;
 use Laudis\Neo4j\Bolt\BoltMessageFactory;
 use Laudis\Neo4j\Common\Neo4jLogger;
-use Laudis\Neo4j\Common\ResponseHelper;
 use Laudis\Neo4j\Contracts\AuthenticateInterface;
 use Psr\Http\Message\UriInterface;
 
@@ -43,27 +37,26 @@ public function __construct(
      *
      * @return array{server: string, connection_id: string, hints: list}
      */
-    public function authenticateBolt(V4_4|V5|V5_1|V5_2|V5_3|V5_4 $protocol, string $userAgent): array
+    public function authenticateBolt(BoltConnection $connection, string $userAgent): array
     {
-        $factory = $this->createMessageFactory($protocol);
+        $factory = $this->createMessageFactory($connection);
 
+        $protocol = $connection->protocol();
         if (method_exists($protocol, 'logon')) {
             $helloMetadata = ['user_agent' => $userAgent];
 
-            $factory->createHelloMessage($helloMetadata)->send();
-            $response = ResponseHelper::getResponse($protocol);
+            $responseHello = $factory->createHelloMessage($helloMetadata)->send()->getResponse();
 
             $credentials = [
                 'scheme' => 'basic',
                 'principal' => $this->username,
                 'credentials' => $this->password,
             ];
 
-            $factory->createLogonMessage($credentials)->send();
-            ResponseHelper::getResponse($protocol);
+            $response = $factory->createLogonMessage($credentials)->send()->getResponse();
 
             /** @var array{server: string, connection_id: string, hints: list} */
-            return $response->content;
+            return array_merge($responseHello->content, $response->content);
         }
 
         $helloMetadata = [
@@ -73,22 +66,15 @@ public function authenticateBolt(V4_4|V5|V5_1|V5_2|V5_3|V5_4 $protocol, string $
             'credentials' => $this->password,
         ];
 
-        $factory->createHelloMessage($helloMetadata)->send();
+        $response = $factory->createHelloMessage($helloMetadata)->send()->getResponse();
 
         /** @var array{server: string, connection_id: string, hints: list} */
-        return ResponseHelper::getResponse($protocol)->content;
+        return $response->content;
     }
 
     /**
      * @throws Exception
      */
-    public function logoff(V4_4|V5|V5_1|V5_2|V5_3|V5_4 $protocol): void
-    {
-        $factory = $this->createMessageFactory($protocol);
-        $factory->createLogoffMessage()->send();
-        ResponseHelper::getResponse($protocol);
-    }
-
     public function toString(UriInterface $uri): string
     {
         return sprintf('Basic %s:%s@%s:%s', $this->username, '######', $uri->getHost(), $uri->getPort() ?? '');
@@ -97,8 +83,8 @@ public function toString(UriInterface $uri): string
     /**
      * Helper to create message factory.
      */
-    private function createMessageFactory(V4_4|V5|V5_1|V5_2|V5_3|V5_4 $protocol): BoltMessageFactory
+    private function createMessageFactory(BoltConnection $connection): BoltMessageFactory
     {
-        return new BoltMessageFactory($protocol, $this->logger);
+        return new BoltMessageFactory($connection, $this->logger);
     }
 }

src/Authentication/KerberosAuth.php

@@ -13,18 +13,11 @@
 
 namespace Laudis\Neo4j\Authentication;
 
-use Bolt\protocol\V4_4;
-use Bolt\protocol\V5;
-use Bolt\protocol\V5_1;
-use Bolt\protocol\V5_2;
-use Bolt\protocol\V5_3;
-use Bolt\protocol\V5_4;
 use Exception;
+use Laudis\Neo4j\Bolt\BoltConnection;
 use Laudis\Neo4j\Bolt\BoltMessageFactory;
 use Laudis\Neo4j\Common\Neo4jLogger;
-use Laudis\Neo4j\Common\ResponseHelper;
 use Laudis\Neo4j\Contracts\AuthenticateInterface;
-use Psr\Http\Message\RequestInterface;
 use Psr\Http\Message\UriInterface;
 use Psr\Log\LogLevel;
 
@@ -41,38 +34,26 @@ public function __construct(
     ) {
     }
 
-    public function authenticateHttp(RequestInterface $request, UriInterface $uri, string $userAgent): RequestInterface
-    {
-        $this->logger?->log(LogLevel::DEBUG, 'Authenticating using KerberosAuth');
-
-        return $request->withHeader('Authorization', 'Kerberos '.$this->token)
-            ->withHeader('User-Agent', $userAgent);
-    }
-
     /**
      * @throws Exception
      *
      * @return array{server: string, connection_id: string, hints: list}
      */
-    public function authenticateBolt(V4_4|V5|V5_1|V5_2|V5_3|V5_4 $protocol, string $userAgent): array
+    public function authenticateBolt(BoltConnection $connection, string $userAgent): array
     {
-        $factory = $this->createMessageFactory($protocol);
+        $factory = $this->createMessageFactory($connection);
 
         $this->logger?->log(LogLevel::DEBUG, 'HELLO', ['user_agent' => $userAgent]);
 
-        $factory->createHelloMessage(['user_agent' => $userAgent])->send();
-
-        $response = ResponseHelper::getResponse($protocol);
+        $factory->createHelloMessage(['user_agent' => $userAgent])->send()->getResponse();
 
         $this->logger?->log(LogLevel::DEBUG, 'LOGON', ['scheme' => 'kerberos', 'principal' => '']);
 
-        $factory->createLogonMessage([
+        $response = $factory->createLogonMessage([
             'scheme' => 'kerberos',
             'principal' => '',
             'credentials' => $this->token,
-        ])->send();
-
-        ResponseHelper::getResponse($protocol);
+        ])->send()->getResponse();
 
         /**
          * @var array{server: string, connection_id: string, hints: list}
@@ -88,8 +69,8 @@ public function toString(UriInterface $uri): string
     /**
      * Helper to create the message factory.
      */
-    private function createMessageFactory(V4_4|V5|V5_1|V5_2|V5_3|V5_4 $protocol): BoltMessageFactory
+    private function createMessageFactory(BoltConnection $connection): BoltMessageFactory
     {
-        return new BoltMessageFactory($protocol, $this->logger);
+        return new BoltMessageFactory($connection, $this->logger);
     }
 }

src/Authentication/NoAuth.php

@@ -13,20 +13,13 @@
 
 namespace Laudis\Neo4j\Authentication;
 
-use Bolt\protocol\V4_4;
-use Bolt\protocol\V5;
-use Bolt\protocol\V5_1;
-use Bolt\protocol\V5_2;
-use Bolt\protocol\V5_3;
-use Bolt\protocol\V5_4;
 use Exception;
+use Laudis\Neo4j\Bolt\BoltConnection;
 use Laudis\Neo4j\Bolt\BoltMessageFactory;
 use Laudis\Neo4j\Common\Neo4jLogger;
-use Laudis\Neo4j\Common\ResponseHelper;
 use Laudis\Neo4j\Contracts\AuthenticateInterface;
-use Psr\Http\Message\RequestInterface;
+use Laudis\Neo4j\Enum\ConnectionProtocol;
 use Psr\Http\Message\UriInterface;
-use Psr\Log\LogLevel;
 
 use function sprintf;
 
@@ -37,30 +30,21 @@ public function __construct(
     ) {
     }
 
-    public function authenticateHttp(RequestInterface $request, UriInterface $uri, string $userAgent): RequestInterface
-    {
-        $this->logger?->log(LogLevel::DEBUG, 'Authentication disabled');
-
-        return $request->withHeader('User-Agent', $userAgent);
-    }
-
     /**
      * @throws Exception
      *
      * @return array{server: string, connection_id: string, hints: list}
      */
-    public function authenticateBolt(V4_4|V5|V5_1|V5_2|V5_3|V5_4 $protocol, string $userAgent): array
+    public function authenticateBolt(BoltConnection $connection, string $userAgent): array
     {
-        $factory = $this->createMessageFactory($protocol);
+        $factory = $this->createMessageFactory($connection);
 
-        if (method_exists($protocol, 'logon')) {
+        if ($connection->getProtocol()->compare(ConnectionProtocol::BOLT_V5_1()) >= 0) {
             $helloMetadata = ['user_agent' => $userAgent];
 
-            $factory->createHelloMessage($helloMetadata)->send();
-            $response = ResponseHelper::getResponse($protocol);
+            $factory->createHelloMessage($helloMetadata)->send()->getResponse();
 
-            $factory->createLogonMessage(['scheme' => 'none'])->send();
-            ResponseHelper::getResponse($protocol);
+            $response = $factory->createLogonMessage(['scheme' => 'none'])->send()->getResponse();
 
             /** @var array{server: string, connection_id: string, hints: list} */
             return $response->content;
@@ -71,26 +55,19 @@ public function authenticateBolt(V4_4|V5|V5_1|V5_2|V5_3|V5_4 $protocol, string $
             'scheme' => 'none',
         ];
 
-        $factory->createHelloMessage($helloMetadata)->send();
+        $response = $factory->createHelloMessage($helloMetadata)->send()->getResponse();
 
         /** @var array{server: string, connection_id: string, hints: list} */
-        return ResponseHelper::getResponse($protocol)->content;
-    }
-
-    public function logoff(V4_4|V5|V5_1|V5_2|V5_3|V5_4 $protocol): void
-    {
-        $factory = $this->createMessageFactory($protocol);
-        $factory->createLogoffMessage()->send();
-        ResponseHelper::getResponse($protocol);
+        return $response->content;
     }
 
     public function toString(UriInterface $uri): string
     {
         return sprintf('No Auth %s:%s', $uri->getHost(), $uri->getPort() ?? '');
     }
 
-    private function createMessageFactory(V4_4|V5|V5_1|V5_2|V5_3|V5_4 $protocol): BoltMessageFactory
+    private function createMessageFactory(BoltConnection $connection): BoltMessageFactory
     {
-        return new BoltMessageFactory($protocol, $this->logger);
+        return new BoltMessageFactory($connection, $this->logger);
     }
 }

src/Authentication/OpenIDConnectAuth.php

@@ -13,16 +13,10 @@
 
 namespace Laudis\Neo4j\Authentication;
 
-use Bolt\protocol\V4_4;
-use Bolt\protocol\V5;
-use Bolt\protocol\V5_1;
-use Bolt\protocol\V5_2;
-use Bolt\protocol\V5_3;
-use Bolt\protocol\V5_4;
 use Exception;
+use Laudis\Neo4j\Bolt\BoltConnection;
 use Laudis\Neo4j\Bolt\BoltMessageFactory;
 use Laudis\Neo4j\Common\Neo4jLogger;
-use Laudis\Neo4j\Common\ResponseHelper;
 use Laudis\Neo4j\Contracts\AuthenticateInterface;
 use Psr\Http\Message\RequestInterface;
 use Psr\Http\Message\UriInterface;
@@ -51,24 +45,20 @@ public function authenticateHttp(RequestInterface $request, UriInterface $uri, s
      *
      * @return array{server: string, connection_id: string, hints: list}
      */
-    public function authenticateBolt(V4_4|V5|V5_1|V5_2|V5_3|V5_4 $protocol, string $userAgent): array
+    public function authenticateBolt(BoltConnection $connection, string $userAgent): array
     {
-        $factory = $this->createMessageFactory($protocol);
+        $factory = $this->createMessageFactory($connection);
 
         $this->logger?->log(LogLevel::DEBUG, 'HELLO', ['user_agent' => $userAgent]);
 
-        $factory->createHelloMessage(['user_agent' => $userAgent])->send();
-
-        $response = ResponseHelper::getResponse($protocol);
+        $factory->createHelloMessage(['user_agent' => $userAgent])->send()->getResponse();
 
         $this->logger?->log(LogLevel::DEBUG, 'LOGON', ['scheme' => 'bearer']);
 
-        $factory->createLogonMessage([
+        $response = $factory->createLogonMessage([
             'scheme' => 'bearer',
             'credentials' => $this->token,
-        ])->send();
-
-        ResponseHelper::getResponse($protocol);
+        ])->send()->getResponse();
 
         /**
          * @var array{server: string, connection_id: string, hints: list}
@@ -84,8 +74,8 @@ public function toString(UriInterface $uri): string
     /**
      * Helper to create the message factory.
      */
-    public function createMessageFactory(V4_4|V5|V5_1|V5_2|V5_3|V5_4 $protocol): BoltMessageFactory
+    public function createMessageFactory(BoltConnection $connection): BoltMessageFactory
     {
-        return new BoltMessageFactory($protocol, $this->logger);
+        return new BoltMessageFactory($connection, $this->logger);
     }
 }