Fix prependMissingScheme with underscore

elastic · Sep 18, 2019 · 9c6e356 · 9c6e356
1 parent c40d3b3
commit 9c6e356
Show file tree

Hide file tree

Showing 2 changed files with 13 additions and 2 deletions.
diff --git a/src/Elasticsearch/ClientBuilder.php b/src/Elasticsearch/ClientBuilder.php
@@ -686,7 +686,7 @@ private function extractURIParts(string $host): array
 
     private function prependMissingScheme(string $host): string
     {
-        if (!filter_var($host, FILTER_VALIDATE_URL)) {
+        if (!preg_match("/^https?:\/\//", $host)) {
             $host = 'http://' . $host;
         }
 

diff --git a/tests/Elasticsearch/Tests/ClientTest.php b/tests/Elasticsearch/Tests/ClientTest.php
@@ -312,6 +312,17 @@ public function testInlineHosts()
         $this->assertSame(9200, $host->getPort());
         $this->assertSame("https", $host->getTransportSchema());
         $this->assertSame("user:pass", $host->getUserPass());
+
+        $client = Elasticsearch\ClientBuilder::create()->setHosts(
+            [
+            'https://user:pass@the_foo.com:9200'
+            ]
+        )->build();
+        $host = $client->transport->getConnection();
+        $this->assertSame("the_foo.com", $host->getHost());
+        $this->assertSame(9200, $host->getPort());
+        $this->assertSame("https", $host->getTransportSchema());
+        $this->assertSame("user:pass", $host->getUserPass());
     }
 
     public function testExtendedHosts()
@@ -417,7 +428,7 @@ public function testExtendedHosts()
             // good
         }
 
-        // Underscore host, questionably legal, but inline method would break
+        // Underscore host, questionably legal
         $client = Elasticsearch\ClientBuilder::create()->setHosts(
             [
             [