Merge remote-tracking branch 'origin/main' into ssl

Author: transistive

src/Http/HttpDriver.php

@@ -127,7 +127,7 @@ public function createSession(?SessionConfiguration $config = null): SessionInte
 
                 $discovery = HttpHelper::interpretResponse($response);
                 /** @var string|null */
-                $version = $discovery->neo4j_version;
+                $version = $discovery->neo4j_version ?? null;
 
                 if ($version === null) {
                     /** @var string */

tests/Integration/BasicDriverTest.php

@@ -11,6 +11,7 @@
 
 namespace Laudis\Neo4j\Tests\Integration;
 
+use Dotenv\Dotenv;
 use function explode;
 use function is_string;
 use Laudis\Neo4j\Basic\Driver;
@@ -27,7 +28,12 @@ public function getConnections(): array
         /** @var string|mixed $connections */
         $connections = $_ENV['NEO4J_CONNECTIONS'] ?? false;
         if (!is_string($connections)) {
-            $connections = 'bolt://neo4j:test@neo4j,neo4j://neo4j:test@core1,http://neo4j:test@neo4j';
+            Dotenv::createImmutable(__DIR__ . '/../../')->load();
+            /** @var string|mixed $connections */
+            $connections = $_ENV['NEO4J_CONNECTIONS'] ?? false;
+            if (!is_string($connections)) {
+                $connections = 'bolt://neo4j:test@neo4j,neo4j://neo4j:test@core1,http://neo4j:test@neo4j';
+            }
         }
 
         $tbr = [];

tests/Integration/BoltDriverIntegrationTest.php

@@ -14,6 +14,7 @@
 namespace Laudis\Neo4j\Tests\Integration;
 
 use Bolt\error\ConnectException;
+use Dotenv\Dotenv;
 use Exception;
 use Laudis\Neo4j\Bolt\BoltDriver;
 use Laudis\Neo4j\Common\Uri;
@@ -22,31 +23,45 @@
 
 final class BoltDriverIntegrationTest extends TestCase
 {
-    private UriInterface $uri;
+    private ?UriInterface $uri;
 
     protected function setUp(): void
     {
         parent::setUp();
         $this->uri = $this->getBoltUri();
     }
 
-    private function getBoltUri(): UriInterface
+    private function getBoltUri(): ?UriInterface
     {
-        foreach (explode(',', (string) getenv('NEO4J_CONNECTIONS')) as $uri) {
+        /** @var string|mixed $connections */
+        $connections = $_ENV['NEO4J_CONNECTIONS'] ?? false;
+        if (!is_string($connections)) {
+            Dotenv::createImmutable(__DIR__ . '/../../')->load();
+            /** @var string|mixed $connections */
+            $connections = $_ENV['NEO4J_CONNECTIONS'] ?? false;
+            if (!is_string($connections)) {
+                $connections = 'bolt://neo4j:test@neo4j,neo4j://neo4j:test@core1,http://neo4j:test@neo4j';
+            }
+        }
+        foreach (explode(',', $connections) as $uri) {
             $psrUri = Uri::create($uri);
             if ($psrUri->getScheme() === 'bolt') {
                 return $psrUri;
             }
         }
 
-        return Uri::create('bolt://neo4j:test@neo4j');
+        return null;
     }
 
     /**
      * @throws Exception
      */
     public function testValidHostname(): void
     {
+        if ($this->uri === null) {
+            self::markTestSkipped('No bolt uri provided');
+        }
+
         $results = BoltDriver::create($this->uri->__toString())->createSession()->run(<<<'CYPHER'
 RETURN 1 AS x
 CYPHER);
@@ -58,6 +73,10 @@ public function testValidHostname(): void
      */
     public function testValidUrl(): void
     {
+        if ($this->uri === null) {
+            self::markTestSkipped('No bolt uri provided');
+        }
+
         $ip = gethostbyname($this->uri->getHost());
         $results = BoltDriver::create($this->uri->withHost($ip)->__toString())->createSession()->run(<<<'CYPHER'
 RETURN 1 AS x

tests/Integration/ClientBuilderTest.php

@@ -13,28 +13,42 @@
 
 namespace Laudis\Neo4j\Tests\Integration;
 
+use Dotenv\Dotenv;
 use function explode;
-use function getenv;
 use Laudis\Neo4j\ClientBuilder;
 use Laudis\Neo4j\Common\Uri;
 use PHPUnit\Framework\TestCase;
 
 final class ClientBuilderTest extends TestCase
 {
-    private function getBoltUri(): string
+    private function getBoltUri(): ?string
     {
-        foreach (explode(',', (string) getenv('NEO4J_CONNECTIONS')) as $uri) {
+        /** @var string|mixed $connections */
+        $connections = $_ENV['NEO4J_CONNECTIONS'] ?? false;
+        if (!is_string($connections)) {
+            Dotenv::createImmutable(__DIR__ . '/../../')->load();
+            /** @var string|mixed $connections */
+            $connections = $_ENV['NEO4J_CONNECTIONS'] ?? false;
+            if (!is_string($connections)) {
+                $connections = '';
+            }
+        }
+        foreach (explode(',', $connections) as $uri) {
             $psrUri = Uri::create($uri);
             if ($psrUri->getScheme() === 'bolt') {
                 return $psrUri->__toString();
             }
         }
 
-        return 'bolt://neo4j:test@neo4j:7687';
+        return null;
     }
 
     public function testBoltSetupWithScheme(): void
     {
+        if ($this->getBoltUri() === null) {
+            self::markTestSkipped('No bolt uri provided');
+        }
+
         $client = ClientBuilder::create()->addBoltConnection('bolt', $this->getBoltUri())->build();
         $tsx = $client->beginTransaction();
         self::assertTrue(true);
@@ -43,6 +57,10 @@ public function testBoltSetupWithScheme(): void
 
     public function testBoltSetupWithoutPort(): void
     {
+        if ($this->getBoltUri() === null) {
+            self::markTestSkipped('No bolt uri provided');
+        }
+
         $client = ClientBuilder::create()->addBoltConnection('bolt', $this->getBoltUri())->build();
         $tsx = $client->beginTransaction();
         self::assertTrue(true);
@@ -51,6 +69,10 @@ public function testBoltSetupWithoutPort(): void
 
     public function testBoltSetupWrongScheme(): void
     {
+        if ($this->getBoltUri() === null) {
+            self::markTestSkipped('No bolt uri provided');
+        }
+
         $client = ClientBuilder::create()->addBoltConnection('bolt', $this->getBoltUri())->build();
         $tsx = $client->beginTransaction();
         self::assertTrue(true);

tests/Integration/EnvironmentAwareIntegrationTest.php

@@ -88,7 +88,12 @@ protected static function buildConnections(): array
     {
         $connections = $_ENV['NEO4J_CONNECTIONS'] ?? false;
         if (!is_string($connections)) {
-            return ['bolt://neo4j:test@neo4j', 'neo4j://neo4j:test@core1', 'http://neo4j:test@neo4j'];
+            Dotenv::createImmutable(__DIR__ . '/../../')->load();
+            /** @var string|mixed $connections */
+            $connections = $_ENV['NEO4J_CONNECTIONS'] ?? false;
+            if (!is_string($connections)) {
+                return ['bolt://neo4j:test@neo4j', 'neo4j://neo4j:test@core1', 'http://neo4j:test@neo4j'];
+            }
         }
 
         return explode(',', $connections);