Merge branch 'docs-review'

Author: ezimuel

README.md

@@ -88,11 +88,12 @@ The recommended method to install _Elasticsearch-PHP_ is through [Composer](http
 
         $client = ClientBuilder::create()->build();
     ```
+
 You can find out more on how to install Composer, configure autoloading, and other best-practices for defining dependencies at [getcomposer.org](http://getcomposer.org).
 
 PHP Version Requirement
 ----
-Version 7.0 of this library requires at least PHP version 7.1 to function.  In addition, it requires the native JSON
+Version 7.0 of this library requires at least PHP version 7.1. In addition, it requires the native JSON
 extension to be version 1.3.7 or higher.
 
 | Elasticsearch-PHP Branch | PHP Version |
@@ -110,16 +111,15 @@ Quickstart
 
 ### Index a document
 
-In elasticsearch-php, almost everything is configured by associative arrays.  The REST endpoint, document and optional parameters - everything is an associative array.
+In elasticsearch-php, almost everything is configured by associative arrays. The REST endpoint, document and optional parameters - everything is an associative array.
 
-To index a document, we need to specify four pieces of information: index, type, id and a document body. This is done by
+To index a document, we need to specify four pieces of information: index, id and a document body. This is done by
 constructing an associative array of key:value pairs.  The request body is itself an associative array with key:value pairs
 corresponding to the data in your document:
 
 ```php
 $params = [
     'index' => 'my_index',
-    'type' => 'my_type',
     'id' => 'my_id',
     'body' => ['testField' => 'abc']
 ];
@@ -135,12 +135,20 @@ associative array containing a decoded version of the JSON that Elasticsearch re
 Array
 (
     [_index] => my_index
-    [_type] => my_type
+    [_type] => _doc
     [_id] => my_id
     [_version] => 1
-    [created] => 1
-)
+    [result] => created
+    [_shards] => Array
+        (
+            [total] => 1
+            [successful] => 1
+            [failed] => 0
+        )
 
+    [_seq_no] => 0
+    [_primary_term] => 1
+)
 ```
 
 ### Get a document
@@ -150,24 +158,25 @@ Let's get the document that we just indexed.  This will simply return the docume
 ```php
 $params = [
     'index' => 'my_index',
-    'type' => 'my_type',
     'id' => 'my_id'
 ];
 
 $response = $client->get($params);
 print_r($response);
 ```
 
-The response contains some metadata (index, type, etc.) as well as a `_source` field...this is the original document
+The response contains some metadata (index, version, etc.) as well as a `_source` field, this is the original document
 that you sent to Elasticsearch.
 
 ```php
 Array
 (
     [_index] => my_index
-    [_type] => my_type
+    [_type] => _doc
     [_id] => my_id
     [_version] => 1
+    [_seq_no] => 0
+    [_primary_term] => 1
     [found] => 1
     [_source] => Array
         (
@@ -182,12 +191,20 @@ If you want to retrieve the `_source` field directly, there is the `getSource` m
 ```php
 $params = [
     'index' => 'my_index',
-    'type' => 'my_type',
     'id' => 'my_id'
 ];
 
 $source = $client->getSource($params);
-doSomething($source);
+print_r($source);
+```
+
+The response will be just the `_source` value:
+
+```php
+Array
+(
+    [testField] => abc
+)
 ```
 
 ### Search for a document
@@ -197,7 +214,6 @@ Searching is a hallmark of Elasticsearch, so let's perform a search.  We are goi
 ```php
 $params = [
     'index' => 'my_index',
-    'type' => 'my_type',
     'body' => [
         'query' => [
             'match' => [
@@ -218,34 +234,44 @@ individual search results:
 ```php
 Array
 (
-    [took] => 1
+    [took] => 33
     [timed_out] =>
     [_shards] => Array
         (
-            [total] => 5
-            [successful] => 5
+            [total] => 1
+            [successful] => 1
+            [skipped] => 0
             [failed] => 0
         )
 
     [hits] => Array
         (
-            [total] => 1
-            [max_score] => 0.30685282
+            [total] => Array
+                (
+                    [value] => 1
+                    [relation] => eq
+                )
+
+            [max_score] => 0.2876821
             [hits] => Array
                 (
                     [0] => Array
                         (
                             [_index] => my_index
-                            [_type] => my_type
+                            [_type] => _doc
                             [_id] => my_id
-                            [_score] => 0.30685282
+                            [_score] => 0.2876821
                             [_source] => Array
                                 (
                                     [testField] => abc
                                 )
+
                         )
+
                 )
+
         )
+
 )
 ```
 
@@ -256,7 +282,6 @@ Alright, let's go ahead and delete the document that we added previously:
 ```php
 $params = [
     'index' => 'my_index',
-    'type' => 'my_type',
     'id' => 'my_id'
 ];
 
@@ -270,11 +295,20 @@ You'll notice this is identical syntax to the `get` syntax.  The only difference
 ```php
 Array
 (
-    [found] => 1
     [_index] => my_index
-    [_type] => my_type
+    [_type] => _doc
     [_id] => my_id
     [_version] => 2
+    [result] => deleted
+    [_shards] => Array
+        (
+            [total] => 1
+            [successful] => 1
+            [failed] => 0
+        )
+
+    [_seq_no] => 1
+    [_primary_term] => 1
 )
 ```
 

docs/crud.asciidoc

@@ -1,9 +1,11 @@
 [[indexing_documents]]
 == Indexing Documents
 
+IMPORTANT: Please note that mapping types will disappear from Elasticsearch, read more https://www.elastic.co/guide/en/elasticsearch/reference/7.x/removal-of-types.html[here]. If you migrated types from Elasticsearch 6 to 7, you can address these with the `type` param.
+
 When you add documents to Elasticsearch, you index JSON documents.  This maps naturally to PHP associative arrays, since
 they can easily be encoded in JSON.  Therefore, in Elasticsearch-PHP you create and pass associative arrays to the client
-for indexing.  There are several methods of ingesting data into Elasticsearch, which we will cover here
+for indexing.  There are several methods of ingesting data into Elasticsearch, which we will cover here.
 
 === Single document indexing
 
@@ -16,12 +18,11 @@ When indexing a document, you can either provide an ID or let elasticsearch gene
 ----
 $params = [
     'index' => 'my_index',
-    'type' => 'my_type',
-    'id' => 'my_id',
-    'body' => [ 'testField' => 'abc']
+    'id'    => 'my_id',
+    'body'  => [ 'testField' => 'abc']
 ];
 
-// Document will be indexed to my_index/my_type/my_id
+// Document will be indexed to my_index/_doc/my_id
 $response = $client->index($params);
 ----
 {zwsp} +
@@ -31,28 +32,25 @@ $response = $client->index($params);
 ----
 $params = [
     'index' => 'my_index',
-    'type' => 'my_type',
-    'body' => [ 'testField' => 'abc']
+    'body'  => [ 'testField' => 'abc']
 ];
 
-// Document will be indexed to my_index/my_type/<autogenerated ID>
+// Document will be indexed to my_index/_doc/<autogenerated ID>
 $response = $client->index($params);
 ----
 {zwsp} +
 
-If you need to set other parameters, such as a `routing` value, you specify those in the array alongside the `index`,
-`type`, etc.  For example, let's set the routing and timestamp of this new document:
+If you need to set other parameters, such as a `routing` value, you specify those in the array alongside the `index`, etc.  For example, let's set the routing and timestamp of this new document:
 
 .Additional parameters
 [source,php]
 ----
 $params = [
-    'index' => 'my_index',
-    'type' => 'my_type',
-    'id' => 'my_id',
-    'routing' => 'company_xyz',
+    'index'     => 'my_index',
+    'id'        => 'my_id',
+    'routing'   => 'company_xyz',
     'timestamp' => strtotime("-1d"),
-    'body' => [ 'testField' => 'abc']
+    'body'      => [ 'testField' => 'abc']
 ];
 
 
@@ -75,12 +73,11 @@ for($i = 0; $i < 100; $i++) {
     $params['body'][] = [
         'index' => [
             '_index' => 'my_index',
-            '_type' => 'my_type',
-	]
+	    ]
     ];
 
     $params['body'][] = [
-        'my_field' => 'my_value',
+        'my_field'     => 'my_value',
         'second_field' => 'some more values'
     ];
 }
@@ -101,13 +98,12 @@ for ($i = 1; $i <= 1234567; $i++) {
     $params['body'][] = [
         'index' => [
             '_index' => 'my_index',
-            '_type' => 'my_type',
-            '_id' => $i
+            '_id'    => $i
         ]
     ];
 
     $params['body'][] = [
-        'my_field' => 'my_value',
+        'my_field'     => 'my_value',
         'second_field' => 'some more values'
     ];
 
@@ -140,11 +136,10 @@ performed by requesting a document by it's full `index/type/id` path:
 ----
 $params = [
     'index' => 'my_index',
-    'type' => 'my_type',
-    'id' => 'my_id'
+    'id'    => 'my_id'
 ];
 
-// Get doc at /my_index/my_type/my_id
+// Get doc at /my_index/_doc/my_id
 $response = $client->get($params);
 ----
 {zwsp} +
@@ -165,16 +160,15 @@ the `doc` in the `body` parameter.  This will merge the fields in `doc` with the
 ----
 $params = [
     'index' => 'my_index',
-    'type' => 'my_type',
-    'id' => 'my_id',
-    'body' => [
+    'id'    => 'my_id',
+    'body'  => [
         'doc' => [
             'new_field' => 'abc'
         ]
     ]
 ];
 
-// Update doc at /my_index/my_type/my_id
+// Update doc at /my_index/_doc/my_id
 $response = $client->update($params);
 ----
 {zwsp} +
@@ -188,9 +182,8 @@ To perform a scripted update, you need to provide a script and (usually) a set o
 ----
 $params = [
     'index' => 'my_index',
-    'type' => 'my_type',
-    'id' => 'my_id',
-    'body' => [
+    'id'    => 'my_id',
+    'body'  => [
         'script' => 'ctx._source.counter += count',
         'params' => [
             'count' => 4
@@ -211,9 +204,8 @@ does not exist (or the field you are trying to update doesn't exist), default va
 ----
 $params = [
     'index' => 'my_index',
-    'type' => 'my_type',
-    'id' => 'my_id',
-    'body' => [
+    'id'    => 'my_id',
+    'body'  => [
         'script' => [
             'source' => 'ctx._source.counter += params.count',
             'params' => [
@@ -233,17 +225,16 @@ $response = $client->update($params);
 [[deleting_documents]]
 == Deleting documents
 
-Finally, you can delete documents by specifying their full `/index/type/id` path:
+Finally, you can delete documents by specifying their full `/index/_doc_/id` path:
 
 [source,php]
 ----
 $params = [
     'index' => 'my_index',
-    'type' => 'my_type',
-    'id' => 'my_id'
+    'id'    => 'my_id'
 ];
 
-// Delete doc at /my_index/my_type/my_id
+// Delete doc at /my_index/_doc_/my_id
 $response = $client->delete($params);
 ----
 {zwsp} +