Merge pull request #951 from gbourgeat/master

Add Field Data Fields property and possibility to get 'script_fields' in same time that '_source' fields in result

lib/Elastica/Query.php

@@ -285,6 +285,20 @@ public function setFields(array $fields)
         return $this->setParam('fields', $fields);
     }
 
+    /**
+     * Sets the fields not stored to be returned by the search
+     *
+     * @param array $fieldDataFields Fields not stored to be returned
+     *
+     * @return $this
+     *
+     * @link https://www.elastic.co/guide/en/elasticsearch/reference/current/search-request-fielddata-fields.html
+     */
+    public function setFieldDataFields(array $fieldDataFields)
+    {
+        return $this->setParam('fielddata_fields', $fieldDataFields);
+    }
+
     /**
      * Set script fields.
      *

lib/Elastica/Result.php

@@ -142,14 +142,16 @@ public function getVersion()
     /**
      * Returns result data.
      *
-     * Checks for partial result data with getFields, falls back to getSource
+     * Checks for partial result data with getFields, falls back to getSource or both
      *
      * @return array Result data array
      */
     public function getData()
     {
         if (isset($this->_hit['fields']) && !isset($this->_hit['_source'])) {
             return $this->getFields();
+        } else if (isset($this->_hit['fields']) && isset($this->_hit['_source'])) {
+            return array_merge($this->getFields(), $this->getSource());
         }
 
         return $this->getSource();