From d6459384c3ad3f29426cfaeddcf8855922baab7b Mon Sep 17 00:00:00 2001
From: Federico Panini <fpanini@gmail.com>
Date: Thu, 17 Aug 2017 15:22:13 +0200
Subject: [PATCH] Index mapping field of type 'string' has been removed

---
 CHANGELOG.md               |  4 +++-
 test/Elastica/TypeTest.php | 12 +++++-------
 2 files changed, 8 insertions(+), 8 deletions(-)

diff --git a/CHANGELOG.md b/CHANGELOG.md
index 972f012137..09c53eb9c7 100644
--- a/CHANGELOG.md
+++ b/CHANGELOG.md
@@ -11,7 +11,8 @@ All notable changes to this project will be documented in this file based on the
 - [store](https://www.elastic.co/guide/en/elasticsearch/reference/6.0/mapping-store.html) field only accepts boolean
 - Replace IndexAlreadyExistsException with [ResourceAlreadyExistsException](https://github.com/elastic/elasticsearch/pull/21494) [#1350](https://github.com/ruflin/Elastica/pull/1350)
 - in order to delete an index you should not delete by its alias now you should delete using the [concrete index name](https://github.com/elastic/elasticsearch/blob/6.0/core/src/test/java/org/elasticsearch/aliases/IndexAliasesIT.java#L445) [#1348](https://github.com/ruflin/Elastica/pull/1348)
- 
+- Index mapping field of type [*'string'*](https://www.elastic.co/guide/en/elasticsearch/reference/5.5/string.html) has been removed from Elasticsearch 6.0 codebase [#1353](https://github.com/ruflin/Elastica/pull/1353)
+
 ### Bugfixes
 - Enforce [Content-Type requirement on the layer Rest](https://github.com/elastic/elasticsearch/pull/23146), a [PR on Elastica #1301](https://github.com/ruflin/Elastica/issues/1301) solved it (it has been implemented only in the HTTP Transport), but it was not implemented in the Guzzle Transport. [#1349](https://github.com/ruflin/Elastica/pull/1349)
   
@@ -23,6 +24,7 @@ All notable changes to this project will be documented in this file based on the
 
 ### Deprecated
 
+
 ## [5.3.0](https://github.com/ruflin/Elastica/compare/5.2.1...5.3.0)
 
 ### Backward Compatibility Breaks
diff --git a/test/Elastica/TypeTest.php b/test/Elastica/TypeTest.php
index cdaca169d0..2e95775231 100644
--- a/test/Elastica/TypeTest.php
+++ b/test/Elastica/TypeTest.php
@@ -509,21 +509,19 @@ public function testDeleteByQueryWithQueryAndOptions()
      */
     public function testGetDocumentWithFieldsSelection()
     {
-        $this->markTestSkipped('ES6 update: No handler for type [string] declared on field [name]');
-
         $index = $this->_createIndex();
 
         $type = new Type($index, 'test');
         $mapping = new Mapping();
         $mapping->setProperties([
             'name' => [
-                'type' => 'string',
-                'store' => 'yes', ],
+                'type' => 'text',
+                'store' => true, ],
             'email' => [
-                'type' => 'string',
-                'store' => 'yes', ],
+                'type' => 'text',
+                'store' => true, ],
             'country' => [
-                'type' => 'string',
+                'type' => 'text',
             ],
         ]);