Merge branch '4.0.x'

Author: XWB

CHANGELOG-4.0.md

@@ -8,9 +8,12 @@ in 4.0 versions.
 
  * Add `ruflin/Elastica` 3.x support.
  * Add new repository manager.
+ * Add support for `DateTimeInterface` in `ModelToElasticaAutoTransformer`.
+ * Add support for suggesters.
  * Dropped PHP 5.3 and 5.4 support.
  * Removed Symfony < 2.7 support.
  * [BC break] Allow additional parameters to `AbstractProvider::queryBuilder`.
+ * [BC break] Added `PaginatorAdapterInterface::getSuggests`.
  * [BC break] Removed faceted search support.
  * [BC break] Removed `AbstractProvider::isObjectIndexable`.
  * [BC break] Removed `AbstractProvider::getMemoryUsage`.

Paginator/FantaPaginatorAdapter.php

@@ -47,6 +47,18 @@ public function getAggregations()
         return $this->adapter->getAggregations();
     }
 
+    /**
+     * Returns Suggestions.
+     *
+     * @return mixed
+     *
+     * @api
+     */
+    public function getSuggests()
+    {
+        return $this->adapter->getSuggests();
+    }
+
     /**
      * Returns a slice of the results.
      *

Paginator/PaginatorAdapterInterface.php

@@ -36,4 +36,11 @@ public function getResults($offset, $length);
      * @return mixed
      */
     public function getAggregations();
+
+    /**
+     * Returns Suggests.
+     *
+     * @return mixed
+     */
+    public function getSuggests();
 }

Paginator/RawPaginatorAdapter.php

@@ -46,6 +46,11 @@ class RawPaginatorAdapter implements PaginatorAdapterInterface
      */
     private $aggregations;
 
+    /**
+     * @var array for the suggesters
+     */
+    private $suggests;
+
     /**
      * @see PaginatorAdapterInterface::__construct
      *
@@ -92,8 +97,8 @@ protected function getElasticaResults($offset, $itemCountPerPage)
 
         $resultSet = $this->searchable->search($query, $this->options);
         $this->totalHits = $resultSet->getTotalHits();
-
         $this->aggregations = $resultSet->getAggregations();
+        $this->suggests = $resultSet->getSuggests();
 
         return $resultSet;
     }
@@ -138,6 +143,18 @@ public function getAggregations()
         return $this->aggregations;
     }
 
+    /**
+     * {@inheritdoc}
+     */
+    public function getSuggests()
+    {
+        if (!isset($this->suggests)) {
+            $this->suggests = $this->searchable->search($this->query)->getSuggests();
+        }
+
+        return $this->suggests;
+    }
+
     /**
      * Returns the Query.
      *

Paginator/RawPartialResults.php

@@ -58,4 +58,16 @@ public function getAggregations()
 
         return;
     }
+
+    /**
+     * {@inheritDoc}
+     */
+    public function getSuggests()
+    {
+        if ($this->resultSet->hasSuggests()) {
+            return $this->resultSet->getSuggests();
+        }
+
+        return;
+    }
 }

Transformer/ModelToElasticaAutoTransformer.php

@@ -119,7 +119,7 @@ protected function transformNested($objects, array $fields)
     protected function normalizeValue($value)
     {
         $normalizeValue = function (&$v) {
-            if ($v instanceof \DateTime) {
+            if ($v instanceof \DateTimeInterface) {
                 $v = $v->format('c');
             } elseif (!is_scalar($v) && !is_null($v)) {
                 $v = (string) $v;