Merge remote-tracking branch 'remotes/origin/5.x' into 6.x

# Conflicts:
#	composer.json

Author: Simonas Šerlinskas

Diff for: composer.json

@@ -13,7 +13,7 @@
     "require": {
         "php": "^7.0",
         "symfony/serializer": "^3.0|^4.0",
-        "paragonie/random_compat": "^1.0|^2.0"
+        "paragonie/random_compat": "*"
     },
     "require-dev": {
         "elasticsearch/elasticsearch": "^6.0",

Diff for: src/Aggregation/Bucketing/DateHistogramAggregation.php

@@ -28,19 +28,25 @@ class DateHistogramAggregation extends AbstractAggregation
      */
     protected $interval;
 
+    /**
+     * @var string
+     */
+    protected $format;
+
     /**
      * Inner aggregations container init.
      *
      * @param string $name
      * @param string $field
      * @param string $interval
      */
-    public function __construct($name, $field = null, $interval = null)
+    public function __construct($name, $field = null, $interval = null, $format = null)
     {
         parent::__construct($name);
 
         $this->setField($field);
         $this->setInterval($interval);
+        $this->setFormat($format);
     }
 
     /**
@@ -59,6 +65,14 @@ public function setInterval($interval)
         $this->interval = $interval;
     }
 
+    /**
+     * @param string $format
+     */
+    public function setFormat($format)
+    {
+        $this->format = $format;
+    }
+
     /**
      * {@inheritdoc}
      */
@@ -81,6 +95,10 @@ public function getArray()
             'interval' => $this->getInterval(),
         ];
 
+        if (!empty($this->format)) {
+            $out['format'] = $this->format;
+        }
+
         return $out;
     }
 }

Diff for: src/Aggregation/Bucketing/DateRangeAggregation.php

@@ -86,7 +86,10 @@ public function addRange($from = null, $to = null, $key = null)
                 'from' => $from,
                 'to' => $to,
                 'key' => $key,
-            ]
+            ],
+            function ($v) {
+                return !is_null($v);
+            }
         );
 
         if (empty($range)) {

Diff for: src/Aggregation/Bucketing/GeoDistanceAggregation.php

@@ -132,7 +132,10 @@ public function addRange($from = null, $to = null)
             [
                 'from' => $from,
                 'to' => $to,
-            ]
+            ],
+            function ($v) {
+                return !is_null($v);
+            }
         );
 
         if (empty($range)) {

Diff for: src/Aggregation/Bucketing/Ipv4RangeAggregation.php

@@ -65,7 +65,10 @@ public function addRange($from = null, $to = null)
             [
                 'from' => $from,
                 'to' => $to,
-            ]
+            ],
+            function ($v) {
+                return !is_null($v);
+            }
         );
 
         $this->ranges[] = $range;

Diff for: src/Aggregation/Bucketing/RangeAggregation.php

@@ -84,7 +84,10 @@ public function addRange($from = null, $to = null, $key = '')
             [
                 'from' => $from,
                 'to' => $to,
-            ]
+            ],
+            function ($v) {
+                return !is_null($v);
+            }
         );
 
         if ($this->keyed && !empty($key)) {

Diff for: src/Query/Compound/BoolQuery.php

@@ -116,6 +116,10 @@ public function toArray()
 
         $output = $this->processArray($output);
 
+        if (empty($output)) {
+            $output = new \stdClass();
+        }
+
         return [$this->getType() => $output];
     }
 

Diff for: src/Search.php

@@ -155,7 +155,7 @@ class Search
     /**
      * @var OrderedSerializer
      */
-    private $serializer;
+    private static $serializer;
 
     /**
      * @var SearchEndpointInterface[]
@@ -167,12 +167,14 @@ class Search
      */
     public function __construct()
     {
-        $this->serializer = new OrderedSerializer(
-            [
-                new CustomReferencedNormalizer(),
-                new CustomNormalizer(),
-            ]
-        );
+        if (static::$serializer === null) {
+            static::$serializer = new OrderedSerializer(
+                [
+                    new CustomReferencedNormalizer(),
+                    new CustomNormalizer(),
+                ]
+            );
+        }
     }
 
     /**
@@ -703,7 +705,7 @@ public function getUriParams()
      */
     public function toArray()
     {
-        $output = array_filter($this->serializer->normalize($this->endpoints));
+        $output = array_filter(static::$serializer->normalize($this->endpoints));
 
         $params = [
             'from' => 'from',

Diff for: tests/Unit/Query/Compound/BoolQueryTest.php

@@ -69,6 +69,16 @@ public function testBoolToArray()
         $this->assertEquals($expected, $bool->toArray());
     }
 
+    /**
+     * Tests bool query with empty body if it forms \stdObject
+     */
+    public function testEmptyBoolQuery()
+    {
+        $bool = new BoolQuery();
+
+        $this->assertEquals(['bool' => new \stdClass()], $bool->toArray());
+    }
+
     /**
      * Tests bool query in filter context.
      */