fixes phpunit

neo4j-php · Mar 28, 2024 · ffdaf5b · ffdaf5b
1 parent 1ecbd9e
commit ffdaf5b
Show file tree

Hide file tree

Showing 6 changed files with 40 additions and 33 deletions.
diff --git a/.github/workflows/unit-test.yml b/.github/workflows/unit-test.yml
@@ -23,13 +23,13 @@ jobs:
       - uses: php-actions/composer@v6
         with:
           progress: yes
-          php_version: 8.2
+          php_version: 8.1
           version: 2
       - uses: php-actions/phpunit@v3
         with:
           configuration: phpunit.xml.dist
-          php_version: 8.2
+          php_version: 8.1
           memory_limit: 1024M
-          version: 9
+          version: 10
           testsuite: Unit
           bootstrap: vendor/autoload.php
diff --git a/.gitignore b/.gitignore
@@ -13,3 +13,4 @@ composer.lock
 .env
 /docs/_build
 cachegrind.out.*
+.phpunit.cache/
diff --git a/phpunit.xml.dist b/phpunit.xml.dist
@@ -1,20 +1,17 @@
-<phpunit colors="true" verbose="true"
-         xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
-         xsi:noNamespaceSchemaLocation="vendor/phpunit/phpunit/phpunit.xsd"
-         convertDeprecationsToExceptions="true"
->
-    <testsuites>
-        <testsuite name="Integration">
-            <directory>./tests/Integration</directory>
-        </testsuite>
-        <testsuite name="Performance">
-            <directory>./tests/Performance</directory>
-        </testsuite>
-        <testsuite name="Unit">
-            <directory>./tests/Unit</directory>
-        </testsuite>
-    </testsuites>
-    <php>
-        <env name="CONNECTION" value="neo4j://neo4j:testtest@localhost:11687" />
-    </php>
+<?xml version="1.0"?>
+<phpunit xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" colors="true" xsi:noNamespaceSchemaLocation="https://schema.phpunit.de/10.5/phpunit.xsd" cacheDirectory=".phpunit.cache">
+  <testsuites>
+    <testsuite name="Integration">
+      <directory>./tests/Integration</directory>
+    </testsuite>
+    <testsuite name="Performance">
+      <directory>./tests/Performance</directory>
+    </testsuite>
+    <testsuite name="Unit">
+      <directory>./tests/Unit</directory>
+    </testsuite>
+  </testsuites>
+  <php>
+    <env name="CONNECTION" value="neo4j://neo4j:testtest@localhost:11687"/>
+  </php>
 </phpunit>
diff --git a/src/Bolt/BoltConnection.php b/src/Bolt/BoltConnection.php
@@ -284,14 +284,18 @@ public function pull(?int $qid, ?int $fetchSize): array
 
     public function __destruct()
     {
-        if ($this->protocol()->serverState === ServerState::FAILED && $this->isOpen()) {
-            if ($this->protocol()->serverState === ServerState::STREAMING || $this->protocol()->serverState === ServerState::TX_STREAMING) {
-                $this->consumeResults();
-            }
+        try {
+            if ($this->boltProtocol->serverState === ServerState::FAILED && $this->isOpen()) {
+                if ($this->protocol()->serverState === ServerState::STREAMING || $this->protocol()->serverState === ServerState::TX_STREAMING) {
+                    $this->consumeResults();
+                }
+
+                $this->protocol()->goodbye();
 
-            $this->protocol()->goodbye();
+                unset($this->boltProtocol); // has to be set to null as the sockets don't recover nicely contrary to what the underlying code might lead you to believe;
+            }
+        } catch (\Throwable) {
 
-            unset($this->boltProtocol); // has to be set to null as the sockets don't recover nicely contrary to what the underlying code might lead you to believe;
         }
     }
 

diff --git a/tests/Unit/BoltConnectionPoolTest.php b/tests/Unit/BoltConnectionPoolTest.php
@@ -13,6 +13,7 @@
 
 namespace Laudis\Neo4j\Tests\Unit;
 
+use Bolt\protocol\V5;
 use Generator;
 use Laudis\Neo4j\Authentication\Authenticate;
 use Laudis\Neo4j\Bolt\BoltConnection;
@@ -147,8 +148,12 @@ private function setupPool(Generator $semaphoreGenerator): void
                         ->willReturn($semaphoreGenerator);
 
         $this->factory = $this->createMock(BoltFactory::class);
+        $boltConnection = $this->createMock(BoltConnection::class);
+        $boltConnection->method('protocol')->willReturn($this->createMock(V5::class));
         $this->factory->method('createConnection')
-                      ->willReturn($this->createMock(BoltConnection::class));
+                      ->willReturn($boltConnection);
+        $this->factory->method('reuseConnection')
+            ->willReturnCallback(fn (MockObject $x): MockObject => $x);
 
         $this->pool = new ConnectionPool(
             $this->semaphore, $this->factory, new ConnectionRequestData(

diff --git a/tests/Unit/DNSAddressResolverTest.php b/tests/Unit/DNSAddressResolverTest.php
@@ -28,7 +28,7 @@ protected function setUp(): void
 
     public function testResolverGhlenDotCom(): void
     {
-        $records = iterator_to_array($this->resolver->getAddresses('test.ghlen.com'));
+        $records = iterator_to_array($this->resolver->getAddresses('test.ghlen.com'), false);
 
         $this->assertEqualsCanonicalizing(['test.ghlen.com', '123.123.123.123', '123.123.123.124'], $records);
         $this->assertNotEmpty($records);
@@ -37,15 +37,15 @@ public function testResolverGhlenDotCom(): void
 
     public function testResolverGoogleDotComReverse(): void
     {
-        $records = iterator_to_array($this->resolver->getAddresses('8.8.8.8'));
+        $records = iterator_to_array($this->resolver->getAddresses('8.8.8.8'), false);
 
         $this->assertNotEmpty($records);
         $this->assertContains('8.8.8.8', $records);
     }
 
     public function testBogus(): void
     {
-        $addresses = iterator_to_array($this->resolver->getAddresses('bogus'));
-        $this->assertEquals('bogus', $addresses);
+        $addresses = iterator_to_array($this->resolver->getAddresses('bogus'), false);
+        $this->assertEquals(['bogus'], $addresses);
     }
 }