Merge branch 'ISSUE-198' into ISSUE-198_handle_failure

Author: exaby73

.github/workflows/integration-test-aura.yml

@@ -1,39 +1,39 @@
-name: Integration Tests
-
-on:
-  push:
-    branches:
-      - main
-  pull_request:
-    branches:
-      - main
-
-jobs:
-  tests:
-    runs-on: ubuntu-latest
-    env:
-      CONNECTION: ${{ secrets.AURA_PRO }}
-    name: "Running on all provided Aura instances"
-
-    steps:
-      - uses: actions/checkout@v2
-      - name: Cache Composer dependencies
-        uses: actions/cache@v2
-        with:
-          path: /tmp/composer-cache
-          key: ${{ runner.os }}-${{ hashFiles('**/composer.lock') }}
-      - uses: php-actions/composer@v6
-        with:
-          progress: yes
-          php_version: 8.1
-          version: 2
-      - name: clean database
-        run: CONNECTION=$CONNECTION php tests/clean-database.php
-      - uses: php-actions/phpunit@v3
-        with:
-          configuration: phpunit.xml.dist
-          php_version: 8.1
-          memory_limit: 1024M
-          version: 10
-          testsuite: Integration
-          bootstrap: vendor/autoload.php
+#name: Integration Tests
+#
+#on:
+#  push:
+#    branches:
+#      - main
+#  pull_request:
+#    branches:
+#      - main
+#
+#jobs:
+#  tests:
+#    runs-on: ubuntu-latest
+#    env:
+#      CONNECTION: ${{ secrets.AURA_PRO }}
+#    name: "Running on all provided Aura instances"
+#
+#    steps:
+#      - uses: actions/checkout@v2
+#      - name: Cache Composer dependencies
+#        uses: actions/cache@v2
+#        with:
+#          path: /tmp/composer-cache
+#          key: ${{ runner.os }}-${{ hashFiles('**/composer.lock') }}
+#      - uses: php-actions/composer@v6
+#        with:
+#          progress: yes
+#          php_version: 8.1
+#          version: 2
+#      - name: clean database
+#        run: CONNECTION=$CONNECTION php tests/clean-database.php
+#      - uses: php-actions/phpunit@v3
+#        with:
+#          configuration: phpunit.xml.dist
+#          php_version: 8.1
+#          memory_limit: 1024M
+#          version: 10
+#          testsuite: Integration
+#          bootstrap: vendor/autoload.php

.github/workflows/integration-test-cluster-neo4j-5.yml

@@ -13,7 +13,7 @@ jobs:
     runs-on: ubuntu-latest
     env:
       CONNECTION: neo4j://neo4j:testtest@localhost:7687
-    name: "Running on PHP 8.1 with a Neo4j 5.10-enterprise cluster"
+    name: "Running on PHP 8.1 with a Neo4j 5.20-enterprise cluster"
 
     steps:
       - uses: actions/checkout@v2
@@ -38,7 +38,7 @@ jobs:
 
     services:
       server1:
-        image: neo4j:5.10-enterprise
+        image: neo4j:5.20-enterprise
         ports:
           - 7687:7687
           - 7473:7473
@@ -59,7 +59,7 @@ jobs:
           --health-timeout "15s"
           --health-retries "5"
       server2:
-        image: neo4j:5.10-enterprise
+        image: neo4j:5.20-enterprise
         ports:
           - 8687:7687
           - 8473:7473
@@ -80,7 +80,7 @@ jobs:
           --health-timeout "15s"
           --health-retries "5"
       server3:
-        image: neo4j:5.10-enterprise
+        image: neo4j:5.20-enterprise
         ports:
           - 9474:7474
           - 9473:7473
@@ -101,7 +101,7 @@ jobs:
           --health-timeout "15s"
           --health-retries "5"
       read-server4:
-        image: neo4j:5.10-enterprise
+        image: neo4j:5.20-enterprise
         ports:
           - 10474:7474
           - 10473:7473

Dockerfile

@@ -1,4 +1,4 @@
-FROM php:8.0-cli
+FROM php:8.1-cli
 RUN apt-get update \
     && apt-get install -y \
         libzip-dev \

docker-compose.yml

@@ -52,7 +52,7 @@ services:
       - .env
   neo4j:
     <<: *common
-    image: neo4j:5.10-community
+    image: neo4j:5.20-community
     hostname: neo4j
     networks:
       - neo4j

src/Bolt/BoltConnection.php

@@ -243,10 +243,6 @@ public function commit(): void
     {
         $this->consumeResults();
 
-        if ($this->protocol()->serverState !== ServerState::TX_READY) {
-            throw new Neo4jException([Neo4jError::fromMessageAndCode('Neo.ClientError.Request.Invalid', 'Message \'COMMIT\' cannot be handled by a session which isn\'t in the TX_READY state.')]);
-        }
-
         $response = $this->protocol()
             ->commit()
             ->getResponse();
@@ -306,7 +302,7 @@ public function pull(?int $qid, ?int $fetchSize): array
     public function __destruct()
     {
         try {
-            if ($this->boltProtocol->serverState === ServerState::FAILED && $this->isOpen()) {
+            if ($this->isOpen()) {
                 if ($this->protocol()->serverState === ServerState::STREAMING || $this->protocol()->serverState === ServerState::TX_STREAMING) {
                     $this->consumeResults();
                 }

src/Neo4j/Neo4jConnectionPool.php

@@ -117,16 +117,20 @@ public function acquire(SessionConfiguration $config): Generator
         $key = $this->createKey($this->data, $config);
 
         /** @var RoutingTable|null */
-        $table = $this->cache->get($key, null);
+        $table = $this->cache->get($key);
         $triedAddresses = [];
 
         $latestError = null;
 
         if ($table == null) {
-            $addresses = $this->resolver->getAddresses((string) $this->data->getUri());
+            $addresses = (function () {
+                yield gethostbyname($this->data->getUri()->getHost());
+                yield from $this->resolver->getAddresses($this->data->getUri()->getHost());
+            })();
             foreach ($addresses as $address) {
                 $triedAddresses[] = $address;
-                $pool = $this->createOrGetPool(Uri::create($address));
+
+                $pool = $this->createOrGetPool($this->data->getUri()->withHost($address));
                 try {
                     /** @var BoltConnection $connection */
                     $connection = GeneratorHelper::getReturnFromGenerator($pool->acquire($config));

tests/Integration/EnvironmentAwareIntegrationTest.php renamed to tests/EnvironmentAwareIntegrationTest.php

@@ -11,7 +11,7 @@
  * file that was distributed with this source code.
  */
 
-namespace Laudis\Neo4j\Tests\Integration;
+namespace Laudis\Neo4j\Tests;
 
 use function is_string;
 

tests/Integration/BasicDriverTest.php

@@ -17,6 +17,7 @@
 use Laudis\Neo4j\Basic\Driver;
 use Laudis\Neo4j\Bolt\BoltDriver;
 use Laudis\Neo4j\Exception\Neo4jException;
+use Laudis\Neo4j\Tests\EnvironmentAwareIntegrationTest;
 use Laudis\Neo4j\Types\CypherMap;
 
 final class BasicDriverTest extends EnvironmentAwareIntegrationTest

tests/Integration/BoltDriverIntegrationTest.php

@@ -18,6 +18,7 @@
 use Laudis\Neo4j\Bolt\BoltDriver;
 use Laudis\Neo4j\Databags\SummarizedResult;
 use Laudis\Neo4j\Neo4j\Neo4jDriver;
+use Laudis\Neo4j\Tests\EnvironmentAwareIntegrationTest;
 use Throwable;
 
 final class BoltDriverIntegrationTest extends EnvironmentAwareIntegrationTest

tests/Integration/BoltResultIntegrationTest.php

@@ -23,6 +23,7 @@
 use Laudis\Neo4j\Databags\SessionConfiguration;
 use Laudis\Neo4j\Databags\SslConfiguration;
 use Laudis\Neo4j\Enum\SslMode;
+use Laudis\Neo4j\Tests\EnvironmentAwareIntegrationTest;
 
 final class BoltResultIntegrationTest extends EnvironmentAwareIntegrationTest
 {