Merge branch 'afrozenpeach-master'

Author: ezimuel

src/Elasticsearch/ClientBuilder.php

@@ -582,7 +582,7 @@ private function normalizeExtendedHost(array $host): array
             $host['scheme'] = 'http';
         }
         if (isset($host['port']) === false) {
-            $host['port'] = '9200';
+            $host['port'] = 9200;
         }
         return $host;
     }

src/Elasticsearch/Connections/Connection.php

@@ -65,6 +65,11 @@ class Connection implements ConnectionInterface
      */
     protected $path;
 
+    /**
+    * @var int
+    */
+    protected $port;
+
     /**
      * @var LoggerInterface
      */
@@ -129,6 +134,8 @@ public function __construct(
             $connectionParams['client']['curl'][CURLOPT_USERPWD] = $hostDetails['user'].':'.$hostDetails['pass'];
         }
 
+        $connectionParams['client']['curl'][CURLOPT_PORT] = $hostDetails['port'];
+
         if (isset($connectionParams['client']['headers'])) {
             $this->headers = $connectionParams['client']['headers'];
             unset($connectionParams['client']['headers']);
@@ -143,13 +150,16 @@ public function __construct(
             phpversion()
         )];
 
-        $host = $hostDetails['host'].':'.$hostDetails['port'];
+        $host = $hostDetails['host'];
         $path = null;
         if (isset($hostDetails['path']) === true) {
             $path = $hostDetails['path'];
         }
+        $port = $hostDetails['port'];
+
         $this->host             = $host;
         $this->path             = $path;
+        $this->port             = $port;
         $this->log              = $log;
         $this->trace            = $trace;
         $this->connectionParams = $connectionParams;
@@ -494,6 +504,14 @@ public function getPath(): ?string
         return $this->path;
     }
 
+    /**
+     * @return int
+     */
+    public function getPort()
+    {
+        return $this->port;
+    }
+
     protected function getCurlRetryException(array $request, array $response): ElasticsearchException
     {
         $exception = null;

src/Elasticsearch/Connections/ConnectionInterface.php

@@ -29,6 +29,13 @@ public function getTransportSchema(): string;
      */
     public function getHost(): string;
 
+    /**
+     * Get the port for this connection
+     *
+     * @return int
+     */
+    public function getPort();
+
     /**
      * Get the username:password string for this connection, null if not set
      */

tests/Elasticsearch/Tests/ClientTest.php

@@ -264,7 +264,8 @@ public function testInlineHosts()
             ]
         )->build();
         $host = $client->transport->getConnection();
-        $this->assertSame("localhost:9200", $host->getHost());
+        $this->assertSame("localhost", $host->getHost());
+        $this->assertSame(9200, $host->getPort());
         $this->assertSame("http", $host->getTransportSchema());
 
 
@@ -274,7 +275,8 @@ public function testInlineHosts()
             ]
         )->build();
         $host = $client->transport->getConnection();
-        $this->assertSame("localhost:9200", $host->getHost());
+        $this->assertSame("localhost", $host->getHost());
+        $this->assertSame(9200, $host->getPort());
         $this->assertSame("http", $host->getTransportSchema());
 
         $client = Elasticsearch\ClientBuilder::create()->setHosts(
@@ -283,7 +285,8 @@ public function testInlineHosts()
             ]
         )->build();
         $host = $client->transport->getConnection();
-        $this->assertSame("foo.com:9200", $host->getHost());
+        $this->assertSame("foo.com", $host->getHost());
+        $this->assertSame(9200, $host->getPort());
         $this->assertSame("http", $host->getTransportSchema());
 
         $client = Elasticsearch\ClientBuilder::create()->setHosts(
@@ -292,7 +295,8 @@ public function testInlineHosts()
             ]
         )->build();
         $host = $client->transport->getConnection();
-        $this->assertSame("foo.com:9200", $host->getHost());
+        $this->assertSame("foo.com", $host->getHost());
+        $this->assertSame(9200, $host->getPort());
         $this->assertSame("https", $host->getTransportSchema());
 
 
@@ -302,7 +306,8 @@ public function testInlineHosts()
             ]
         )->build();
         $host = $client->transport->getConnection();
-        $this->assertSame("foo.com:9200", $host->getHost());
+        $this->assertSame("foo.com", $host->getHost());
+        $this->assertSame(9200, $host->getPort());
         $this->assertSame("https", $host->getTransportSchema());
         $this->assertSame("user:pass", $host->getUserPass());
     }
@@ -319,7 +324,8 @@ public function testExtendedHosts()
             ]
         )->build();
         $host = $client->transport->getConnection();
-        $this->assertSame("localhost:9200", $host->getHost());
+        $this->assertSame("localhost", $host->getHost());
+        $this->assertSame(9200, $host->getPort());
         $this->assertSame("http", $host->getTransportSchema());
 
 
@@ -333,7 +339,8 @@ public function testExtendedHosts()
             ]
         )->build();
         $host = $client->transport->getConnection();
-        $this->assertSame("foo.com:9200", $host->getHost());
+        $this->assertSame("foo.com", $host->getHost());
+        $this->assertSame(9200, $host->getPort());
         $this->assertSame("http", $host->getTransportSchema());
 
 
@@ -347,7 +354,8 @@ public function testExtendedHosts()
             ]
         )->build();
         $host = $client->transport->getConnection();
-        $this->assertSame("foo.com:9200", $host->getHost());
+        $this->assertSame("foo.com", $host->getHost());
+        $this->assertSame(9200, $host->getPort());
         $this->assertSame("https", $host->getTransportSchema());
 
 
@@ -360,7 +368,8 @@ public function testExtendedHosts()
             ]
         )->build();
         $host = $client->transport->getConnection();
-        $this->assertSame("foo.com:9200", $host->getHost());
+        $this->assertSame("foo.com", $host->getHost());
+        $this->assertSame(9200, $host->getPort());
         $this->assertSame("http", $host->getTransportSchema());
 
 
@@ -372,7 +381,8 @@ public function testExtendedHosts()
             ]
         )->build();
         $host = $client->transport->getConnection();
-        $this->assertSame("foo.com:9200", $host->getHost());
+        $this->assertSame("foo.com", $host->getHost());
+        $this->assertSame(9200, $host->getPort());
         $this->assertSame("http", $host->getTransportSchema());
 
 
@@ -386,7 +396,8 @@ public function testExtendedHosts()
             ]
         )->build();
         $host = $client->transport->getConnection();
-        $this->assertSame("foo.com:9500", $host->getHost());
+        $this->assertSame("foo.com", $host->getHost());
+        $this->assertSame(9500, $host->getPort());
         $this->assertSame("https", $host->getTransportSchema());
 
 
@@ -413,7 +424,8 @@ public function testExtendedHosts()
             ]
         )->build();
         $host = $client->transport->getConnection();
-        $this->assertSame("the_foo.com:9200", $host->getHost());
+        $this->assertSame("the_foo.com", $host->getHost());
+        $this->assertSame(9200, $host->getPort());
         $this->assertSame("http", $host->getTransportSchema());
 
 
@@ -428,7 +440,8 @@ public function testExtendedHosts()
             ]
         )->build();
         $host = $client->transport->getConnection();
-        $this->assertSame("foo.com:9200", $host->getHost());
+        $this->assertSame("foo.com", $host->getHost());
+        $this->assertSame(9200, $host->getPort());
         $this->assertSame("http", $host->getTransportSchema());
         $this->assertSame("user:abc#$@?%!abc", $host->getUserPass());
     }