fix: host/port endpoint configuration

test: added tests for transactionManager getter/setter.

Author: LaravelFreelancerNL

src/ArangoClient.php

@@ -61,7 +61,7 @@ public function generateEndpoint(array $config): string
             $endpoint = (string) $config['host'];
         }
         if (isset($config['port'])) {
-            $endpoint .= (string) $config['port'];
+            $endpoint .= ':' . (string) $config['port'];
         }
 
         return $endpoint;

src/Http/HttpClientConfig.php

@@ -21,6 +21,16 @@ class HttpClientConfig extends DataTransferObject
      */
     public string $endpoint = 'http://localhost:8529';
 
+    /**
+     * @var string|null
+     */
+    public ?string $host = null;
+
+    /**
+     * @var string|int|null
+     */
+    public $port = null;
+
     /**
      * @var float|int
      */

tests/ArangoClientTest.php

@@ -21,6 +21,8 @@ public function testGetConfig()
     {
         $defaultConfig = [
             'endpoint' => 'http://localhost:8529',
+            'host' => null,
+            'port' => null,
             'version' => 1.1,
             'connection' => 'Keep-Alive',
             'allow_redirects' => false,
@@ -34,6 +36,18 @@ public function testGetConfig()
         $this->assertSame($defaultConfig, $config);
     }
 
+    public function testClientWithHostPortConfig()
+    {
+        $config = [
+            'host' => 'http://127.0.0.1',
+            'port' => '1234',
+            'username' => 'root',
+        ];
+        $client = new ArangoClient($config);
+        $retrievedConfig = $client->getConfig();
+
+        $this->assertEquals('http://127.0.0.1:1234', $retrievedConfig['endpoint']);
+    }
 
     public function testSetAndGetHttpClient()
     {

tests/SupportsTransactionsTest.php

@@ -107,4 +107,16 @@ public function testCommit()
         $this->arangoClient->schema()->deleteCollection('Users');
         $this->arangoClient->schema()->deleteCollection('Customers');
     }
+
+    public function testTransactionManagerSetterAndGetter()
+    {
+        $oldTransactionManager = $this->arangoClient->getTransactionManager();
+        $newTransactionManager = new TransactionManager($this->arangoClient);
+        $this->arangoClient->setTransactionManager($newTransactionManager);
+        $retrievedNewTransactionManager = $this->arangoClient->getTransactionManager();
+
+        $this->assertNull($oldTransactionManager);
+        $this->assertEquals(spl_object_id($newTransactionManager), spl_object_id($retrievedNewTransactionManager));
+
+    }
 }