Merge branch '6.x'

Author: saimaz

.travis.yml

@@ -12,11 +12,11 @@ install:
   - tar -xzf elasticsearch-${ES_VERSION}.tar.gz
   - ./elasticsearch-${ES_VERSION}/bin/elasticsearch -d
 before_script:
-  - composer config -g github-oauth.github.com $GITHUB_COMPOSER_AUTH
+  - if [ "$GITHUB_COMPOSER_AUTH" ]; then composer config -g github-oauth.github.com $GITHUB_COMPOSER_AUTH; fi
   - composer install --no-interaction --prefer-dist
 script:
   - wget -q --waitretry=1 --retry-connrefused -T 10 -O - http://127.0.0.1:9200
   - vendor/bin/phpunit --coverage-clover=coverage.xml
   - vendor/bin/phpcs -p --standard=PSR2 --ignore=vendor/ ./
 after_script:
-  - travis_retry bash <(curl -s https://codecov.io/bash)
+  - travis_retry bash <(curl -s https://codecov.io/bash)

docs/Query/Compound/FunctionScore.md

@@ -105,7 +105,7 @@ $queryArray = $search->toArray();
 ```php
 $functionScoreQuery = new FunctionScoreQuery(new MatchAllQuery());
 $existsQuery = new ExistsQuery('price');
-$functionScoreQuery->addFieldValueFactorFunction('price', 0.5, 'ln', $existsQuery);
+$functionScoreQuery->addFieldValueFactorFunction('price', 0.5, 'ln', $existsQuery, 0);
 
 $search = new Search();
 $search->addQuery($functionScoreQuery);

src/Aggregation/AbstractAggregation.php

@@ -58,10 +58,14 @@ public function __construct($name)
 
     /**
      * @param string $field
+     *
+     * @return $this
      */
     public function setField($field)
     {
         $this->field = $field;
+
+        return $this;
     }
 
     /**

src/Aggregation/Bucketing/ChildrenAggregation.php

@@ -50,13 +50,15 @@ public function __construct($name, $children = null)
     }
 
     /**
-     * Sets children.
-     *
      * @param string $children
+     *
+     * @return $this
      */
     public function setChildren($children)
     {
         $this->children = $children;
+
+        return $this;
     }
 
     /**

src/Aggregation/Bucketing/CompositeAggregation.php

@@ -29,11 +29,21 @@ class CompositeAggregation extends AbstractAggregation
      */
     private $sources = [];
 
+    /**
+     * @var int
+     */
+    private $size;
+
+    /**
+     * @var array
+     */
+    private $after;
+
     /**
      * Inner aggregations container init.
      *
      * @param string             $name
-     * @param BuilderInterface[] $sources
+     * @param AbstractAggregation[] $sources
      */
     public function __construct($name, $sources = [])
     {
@@ -45,16 +55,20 @@ public function __construct($name, $sources = [])
     }
 
     /**
-     * @param BuilderInterface $agg
+     * @param AbstractAggregation $agg
      *
      * @throws \LogicException
      *
      * @return self
      */
-    public function addSource(BuilderInterface $agg)
+    public function addSource(AbstractAggregation $agg)
     {
+        $array = $agg->getArray();
+
+        $array = is_array($array) ? array_merge($array, $agg->getParameters()) : $array;
+
         $this->sources[] = [
-            $agg->getName() => [ $agg->getType() => $agg->getArray() ]
+            $agg->getName() => [ $agg->getType() => $array ]
         ];
 
         return $this;
@@ -65,9 +79,19 @@ public function addSource(BuilderInterface $agg)
      */
     public function getArray()
     {
-        return [
+        $array = [
             'sources' => $this->sources,
         ];
+
+        if ($this->size !== null) {
+            $array['size'] = $this->size;
+        }
+
+        if (!empty($this->after)) {
+            $array['after'] = $this->after;
+        }
+
+        return $array;
     }
 
     /**
@@ -77,4 +101,52 @@ public function getType()
     {
         return 'composite';
     }
+
+    /**
+     * Sets size
+     *
+     * @param int $size Size
+     *
+     * @return $this
+     */
+    public function setSize($size)
+    {
+        $this->size = $size;
+
+        return $this;
+    }
+
+    /**
+     * Returns size
+     *
+     * @return int
+     */
+    public function getSize()
+    {
+        return $this->size;
+    }
+
+    /**
+     * Sets after
+     *
+     * @param array $after After
+     *
+     * @return $this
+     */
+    public function setAfter(array $after)
+    {
+        $this->after = $after;
+
+        return $this;
+    }
+
+    /**
+     * Returns after
+     *
+     * @return array
+     */
+    public function getAfter()
+    {
+        return $this->after;
+    }
 }

src/Aggregation/Bucketing/DateHistogramAggregation.php

@@ -59,18 +59,26 @@ public function getInterval()
 
     /**
      * @param string $interval
+     *
+     * @return $this
      */
     public function setInterval($interval)
     {
         $this->interval = $interval;
+
+        return $this;
     }
 
     /**
      * @param string $format
+     *
+     * @return $this
      */
     public function setFormat($format)
     {
         $this->format = $format;
+
+        return $this;
     }
 
     /**

src/Aggregation/Bucketing/DateRangeAggregation.php

@@ -29,25 +29,29 @@ class DateRangeAggregation extends AbstractAggregation
     private $format;
 
     /**
-     * @return string
+     * @var array
      */
-    public function getFormat()
-    {
-        return $this->format;
-    }
+    private $ranges = [];
+
+    /**
+     * @var bool
+     */
+    private $keyed = false;
 
     /**
      * @param string $name
      * @param string $field
      * @param string $format
      * @param array  $ranges
+     * @param bool   $keyed
      */
-    public function __construct($name, $field = null, $format = null, array $ranges = [])
+    public function __construct($name, $field = null, $format = null, array $ranges = [], $keyed = false)
     {
         parent::__construct($name);
 
         $this->setField($field);
         $this->setFormat($format);
+        $this->setKeyed($keyed);
         foreach ($ranges as $range) {
             $from = isset($range['from']) ? $range['from'] : null;
             $to = isset($range['to']) ? $range['to'] : null;
@@ -57,23 +61,41 @@ public function __construct($name, $field = null, $format = null, array $ranges
     }
 
     /**
-     * @param string $format
+     * Sets if result buckets should be keyed.
+     *
+     * @param bool $keyed
+     *
+     * @return DateRangeAggregation
      */
-    public function setFormat($format)
+    public function setKeyed($keyed)
     {
-        $this->format = $format;
+        $this->keyed = $keyed;
+
+        return $this;
     }
 
     /**
-     * @var array
+     * @return string
      */
-    private $ranges = [];
+    public function getFormat()
+    {
+        return $this->format;
+    }
+
+    /**
+     * @param string $format
+     */
+    public function setFormat($format)
+    {
+        $this->format = $format;
+    }
 
     /**
      * Add range to aggregation.
      *
      * @param string|null $from
      * @param string|null $to
+     * @param string|null $key
      *
      * @return $this
      *
@@ -111,6 +133,7 @@ public function getArray()
                 'format' => $this->getFormat(),
                 'field' => $this->getField(),
                 'ranges' => $this->ranges,
+                'keyed' => $this->keyed,
             ];
 
             return $data;

src/Aggregation/Bucketing/DiversifiedSamplerAggregation.php

@@ -54,10 +54,14 @@ public function getShardSize()
 
     /**
      * @param mixed $shardSize
+     *
+     * @return $this
      */
     public function setShardSize($shardSize)
     {
         $this->shardSize = $shardSize;
+
+        return $this;
     }
 
     /**

src/Aggregation/Bucketing/FilterAggregation.php

@@ -45,13 +45,15 @@ public function __construct($name, BuilderInterface $filter = null)
     }
 
     /**
-     * Sets a filter.
-     *
      * @param BuilderInterface $filter
+     *
+     * @return $this
      */
     public function setFilter(BuilderInterface $filter)
     {
         $this->filter = $filter;
+
+        return $this;
     }
 
     /**

src/Aggregation/Bucketing/FiltersAggregation.php

@@ -58,7 +58,7 @@ public function __construct($name, $filters = [], $anonymous = false)
     /**
      * @param bool $anonymous
      *
-     * @return FiltersAggregation
+     * @return $this
      */
     public function setAnonymous($anonymous)
     {