Merge branch 'marcvdm-fix-sniffing'

elastic · Jun 17, 2019 · f90ca0e · f90ca0e
2 parents b99c41b + 269b8fc
commit f90ca0e
Show file tree

Hide file tree

Showing 2 changed files with 5 additions and 2 deletions.
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' => [