merged main into ssl

Author: transistive

tests/Integration/BasicDriverTest.php

@@ -28,7 +28,7 @@ public function getConnections(): array
         /** @var string|mixed $connections */
         $connections = $_ENV['NEO4J_CONNECTIONS'] ?? false;
         if (!is_string($connections)) {
-            Dotenv::createImmutable(__DIR__ . '/../../')->load();
+            Dotenv::createImmutable(__DIR__.'/../../')->load();
             /** @var string|mixed $connections */
             $connections = $_ENV['NEO4J_CONNECTIONS'] ?? false;
             if (!is_string($connections)) {

tests/Integration/BoltDriverIntegrationTest.php

@@ -36,7 +36,7 @@ private function getBoltUri(): ?UriInterface
         /** @var string|mixed $connections */
         $connections = $_ENV['NEO4J_CONNECTIONS'] ?? false;
         if (!is_string($connections)) {
-            Dotenv::createImmutable(__DIR__ . '/../../')->load();
+            Dotenv::createImmutable(__DIR__.'/../../')->load();
             /** @var string|mixed $connections */
             $connections = $_ENV['NEO4J_CONNECTIONS'] ?? false;
             if (!is_string($connections)) {

tests/Integration/ClientBuilderTest.php

@@ -26,7 +26,7 @@ private function getBoltUri(): ?string
         /** @var string|mixed $connections */
         $connections = $_ENV['NEO4J_CONNECTIONS'] ?? false;
         if (!is_string($connections)) {
-            Dotenv::createImmutable(__DIR__ . '/../../')->load();
+            Dotenv::createImmutable(__DIR__.'/../../')->load();
             /** @var string|mixed $connections */
             $connections = $_ENV['NEO4J_CONNECTIONS'] ?? false;
             if (!is_string($connections)) {
@@ -45,35 +45,38 @@ private function getBoltUri(): ?string
 
     public function testBoltSetupWithScheme(): void
     {
-        if ($this->getBoltUri() === null) {
+        $uri = $this->getBoltUri();
+        if ($uri === null) {
             self::markTestSkipped('No bolt uri provided');
         }
 
-        $client = ClientBuilder::create()->addBoltConnection('bolt', $this->getBoltUri())->build();
+        $client = ClientBuilder::create()->addBoltConnection('bolt', $uri)->build();
         $tsx = $client->beginTransaction();
         self::assertTrue(true);
         $tsx->rollback();
     }
 
     public function testBoltSetupWithoutPort(): void
     {
-        if ($this->getBoltUri() === null) {
+        $uri = $this->getBoltUri();
+        if ($uri === null) {
             self::markTestSkipped('No bolt uri provided');
         }
 
-        $client = ClientBuilder::create()->addBoltConnection('bolt', $this->getBoltUri())->build();
+        $client = ClientBuilder::create()->addBoltConnection('bolt', $uri)->build();
         $tsx = $client->beginTransaction();
         self::assertTrue(true);
         $tsx->rollback();
     }
 
     public function testBoltSetupWrongScheme(): void
     {
-        if ($this->getBoltUri() === null) {
+        $uri = $this->getBoltUri();
+        if ($uri === null) {
             self::markTestSkipped('No bolt uri provided');
         }
 
-        $client = ClientBuilder::create()->addBoltConnection('bolt', $this->getBoltUri())->build();
+        $client = ClientBuilder::create()->addBoltConnection('bolt', $uri)->build();
         $tsx = $client->beginTransaction();
         self::assertTrue(true);
         $tsx->rollback();

tests/Integration/EnvironmentAwareIntegrationTest.php

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