Fixed issue when multiple calls to validate method triggers "must not specify both host and endpoint" exception

diabl0 · diabl0 · commit c1bb3a752789 · 2017-03-10T17:54:13.000+01:00
diff --git a/lib/ArangoDBClient/ConnectionOptions.php b/lib/ArangoDBClient/ConnectionOptions.php
@@ -368,12 +368,17 @@ private function validate()
             throw new ClientException('port should be an integer');
         }
 
-        if (isset($this->_values[self::OPTION_HOST]) && !isset($this->_values[self::OPTION_ENDPOINT])) {
-            // upgrade host/port to an endpoint
-            $this->_values[self::OPTION_ENDPOINT] = 'tcp://' . $this->_values[self::OPTION_HOST] . ':' . $this->_values[self::OPTION_PORT];
+        // can use either endpoint or host/port
+        if (isset($this->_values[self::OPTION_HOST], $this->_values[self::OPTION_ENDPOINT])) {
+            throw new ClientException('must not specify both host and endpoint');
+        } else {
+            if (isset($this->_values[self::OPTION_HOST]) && !isset($this->_values[self::OPTION_ENDPOINT])) {
+                // upgrade host/port to an endpoint
+                $this->_values[self::OPTION_ENDPOINT] = 'tcp://' . $this->_values[self::OPTION_HOST] . ':' . $this->_values[self::OPTION_PORT];
+                unset($this->_values[self::OPTION_HOST]);
+            }
         }
 
-
         // set up a new endpoint, this will also validate it
         $this->getEndpoint();
 
