Merge branch 'marcvdm-fix-sniffing' into 7.0

elastic · Jun 17, 2019 · b621e7d · b621e7d
2 parents e8d035b + 269b8fc
commit b621e7d
Show file tree

Hide file tree

Showing 3 changed files with 7 additions and 3 deletions.
diff --git a/README.md b/README.md
@@ -342,7 +342,8 @@ $handler = new MockHandler([
   'transfer_stats' => [
      'total_time' => 100
   ],
-  'body' => fopen('somefile.json')
+  'body' => fopen('somefile.json'),
+  'effective_url' => 'localhost'
 ]);
 $builder = ClientBuilder::create();
 $builder->setHosts(['somehost']);

diff --git a/src/Elasticsearch/ConnectionPool/SniffingConnectionPool.php b/src/Elasticsearch/ConnectionPool/SniffingConnectionPool.php
@@ -124,7 +124,7 @@ private function sniffConnection(Connection $connection): bool
         return true;
     }
 
-    private function parseClusterState(string $transportSchema, array $nodeInfo): array
+    private function parseClusterState(string $transportSchema, $nodeInfo): array
     {
         $pattern       = '/([^:]*):([0-9]+)/';
         $schemaAddress = $transportSchema . '_address';

diff --git a/src/Elasticsearch/Connections/Connection.php b/src/Elasticsearch/Connections/Connection.php
@@ -448,7 +448,10 @@ public function ping(): bool
         }
     }
 
-    public function sniff(): array
+    /**
+     * @return array|\GuzzleHttp\Ring\Future\FutureArray
+     */
+    public function sniff()
     {
         $options = [
             'client' => [