Merge branch 'master' into 2.0

Author: polyfractal

.travis.yml

@@ -26,7 +26,6 @@ matrix:
       env: ES_VERSION="1.5" TEST_BUILD_REF="origin/1.5"
   allow_failures:
     - php: hhvm
-    - php: 7.0
 
 env:
   global:

CHANGELOG.md

@@ -1,3 +1,12 @@
+## Release 2.1.4
+- Fix the host path handling [[15b5be3]](http://github.com/elasticsearch/elasticsearch-php/commit/15b5be3)
+- fix body setter in bulk endpoint [[fa283ea]](http://github.com/elasticsearch/elasticsearch-php/commit/fa283ea)
+- add support for generators and iterators in bulk endpoint [[b3d951e]](http://github.com/elasticsearch/elasticsearch-php/commit/b3d951e)
+
+### Testing
+- travis: drop PHP 7.0 from allowed failures, it passes well [[be5e710]](http://github.com/elasticsearch/elasticsearch-php/commit/be5e710)
+
+
 ## Release 2.1.3
 - Fix bug where ping() and sniff() encounter NPE [[61ba0c5]](http://github.com/elasticsearch/elasticsearch-php/commit/61ba0c5)
 - Add Indices/ForceMerge endpoint  [[4934583]](http://github.com/elasticsearch/elasticsearch-php/commit/4934583) [[6d61880]](http://github.com/elasticsearch/elasticsearch-php/commit/6d61880) [[58e63d7]](http://github.com/elasticsearch/elasticsearch-php/commit/58e63d7) [[dcd8833]](http://github.com/elasticsearch/elasticsearch-php/commit/dcd8833)

src/Elasticsearch/Connections/Connection.php

@@ -52,6 +52,11 @@ class Connection implements ConnectionInterface
      */
     protected $host;
 
+    /**
+     * @var string || null
+     */
+    protected $path;
+
     /**
      * @var LoggerInterface
      */
@@ -108,10 +113,12 @@ public function __construct($handler, $hostDetails, $connectionParams,
         }
 
         $host = $hostDetails['host'].':'.$hostDetails['port'];
+        $path = null;
         if (isset($hostDetails['path']) === true) {
-            $host .= $hostDetails['path'];
+            $path = $hostDetails['path'];
         }
         $this->host             = $host;
+        $this->path             = $path;
         $this->log              = $log;
         $this->trace            = $trace;
         $this->connectionParams = $connectionParams;
@@ -291,6 +298,10 @@ private function getURI($uri, $params)
             $uri .= '?' . http_build_query($params);
         }
 
+        if ($this->path !== null) {
+            $uri = $this->path . $uri;
+        }
+
         return $uri;
     }
 

src/Elasticsearch/Endpoints/Bulk.php

@@ -27,26 +27,24 @@ public function __construct(Transport $transport, SerializerInterface $serialize
     }
 
     /**
-     * @param string|array $body
+     * @param string|array|\Traversable $body
      *
      * @return $this
      */
     public function setBody($body)
     {
-        if (isset($body) !== true) {
+        if (empty($body)) {
             return $this;
         }
 
-        if (is_array($body) === true) {
-            $bulkBody = "";
+        if (is_array($body) === true || $body instanceof \Traversable) {
             foreach ($body as $item) {
-                $bulkBody .= $this->serializer->serialize($item)."\n";
+                $this->body .= $this->serializer->serialize($item) . "\n";
             }
-            $body = $bulkBody;
+        } else {
+            $this->body = $body;
         }
 
-        $this->body = $body;
-
         return $this;
     }