removed type from params and adjusted array key indentation

Author: philkra

docs/crud.asciidoc

@@ -1,7 +1,7 @@
 [[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]. 
+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
@@ -18,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']
 ];
 
-// 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} +
@@ -33,24 +32,21 @@ $response = $client->index($params);
 ----
 $params = [
     'index' => 'my_index',
-    'type'  => 'my_type',
     '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',
     'timestamp' => strtotime("-1d"),
@@ -77,8 +73,7 @@ for($i = 0; $i < 100; $i++) {
     $params['body'][] = [
         'index' => [
             '_index' => 'my_index',
-            '_type'  => 'my_type',
-	]
+	    ]
     ];
 
     $params['body'][] = [
@@ -103,7 +98,6 @@ for ($i = 1; $i <= 1234567; $i++) {
     $params['body'][] = [
         'index' => [
             '_index' => 'my_index',
-            '_type'  => 'my_type',
             '_id'    => $i
         ]
     ];
@@ -142,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} +
@@ -167,7 +160,6 @@ 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'  => [
         'doc' => [
@@ -176,7 +168,7 @@ $params = [
     ]
 ];
 
-// Update doc at /my_index/my_type/my_id
+// Update doc at /my_index/_doc/my_id
 $response = $client->update($params);
 ----
 {zwsp} +
@@ -190,7 +182,6 @@ 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'  => [
         'script' => 'ctx._source.counter += count',
@@ -213,7 +204,6 @@ 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'  => [
         'script' => [
@@ -235,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'
 ];
 
-// Delete doc at /my_index/my_type/my_id
+// Delete doc at /my_index/_doc_/my_id
 $response = $client->delete($params);
 ----
 {zwsp} +

docs/futures.asciidoc

@@ -25,9 +25,8 @@ future mode, set the `future` flag in the client options to `'lazy'`:
 $client = ClientBuilder::create()->build();
 
 $params = [
-    'index' => 'test',
-    'type' => 'test',
-    'id' => 1,
+    'index'  => 'test',
+    'id'     => 1,
     'client' => [
         'future' => 'lazy'
     ]
@@ -53,9 +52,8 @@ act like a simple associative array.  For example:
 $client = ClientBuilder::create()->build();
 
 $params = [
-    'index' => 'test',
-    'type' => 'test',
-    'id' => 1,
+    'index'  => 'test',
+    'id'     => 1,
     'client' => [
         'future' => 'lazy'
     ]
@@ -76,9 +74,8 @@ $futures = [];
 
 for ($i = 0; $i < 1000; $i++) {
     $params = [
-        'index' => 'test',
-        'type' => 'test',
-        'id' => $i,
+        'index'  => 'test',
+        'id'     => $i,
         'client' => [
             'future' => 'lazy'
         ]
@@ -107,9 +104,8 @@ $futures = [];
 
 for ($i = 0; $i < 1000; $i++) {
     $params = [
-        'index' => 'test',
-        'type' => 'test',
-        'id' => $i,
+        'index'  => 'test',
+        'id'     => $i,
         'client' => [
             'future' => 'lazy'
         ]
@@ -162,9 +158,8 @@ $futures = [];
 
 for ($i = 0; $i < 499; $i++) {
     $params = [
-        'index' => 'test',
-        'type' => 'test',
-        'id' => $i,
+        'index'  => 'test',
+        'id'     => $i,
         'client' => [
             'future' => 'lazy'
         ]
@@ -188,9 +183,8 @@ $client = ClientBuilder::create()->build();
 $futures = [];
 
 $params = [
-    'index' => 'test',
-    'type' => 'test',
-    'id' => 1,
+    'index'  => 'test',
+    'id'     => 1,
     'client' => [
         'future' => 'lazy'
     ]
@@ -200,9 +194,8 @@ $futures['getRequest'] = $client->get($params);     // First request
 
 $params = [
     'index' => 'test',
-    'type' => 'test',
-    'id' => 2,
-    'body' => [
+    'id'    => 2,
+    'body'  => [
         'field' => 'value'
     ],
     'client' => [
@@ -214,8 +207,7 @@ $futures['indexRequest'] = $client->index($params);       // Second request
 
 $params = [
     'index' => 'test',
-    'type' => 'test',
-    'body' => [
+    'body'  => [
         'query' => [
             'match' => [
                 'field' => 'value'

docs/per-request-configuration.asciidoc

@@ -23,13 +23,12 @@ $client = ClientBuilder::create()->build();
 
 $params = [
     'index'  => 'test_missing',
-    'type'   => 'test',
     'id'     => 1,
     'client' => [ 'ignore' => 404 ] <1>
 ];
 echo $client->get($params);
 
-> {"_index":"test_missing","_type":"test","_id":"1","found":false}
+> {"_index":"test_missing","_type":"_doc","_id":"1","found":false}
 ----
 <1> This will ignore just the 404 missing exception
 
@@ -41,7 +40,6 @@ $client = ClientBuilder::create()->build();
 
 $params = [
     'index'  => 'test_missing',
-    'type'   => 'test',
     'client' => [ 'ignore' => [400, 404] ] <1>
 ];
 echo $client->get($params);
@@ -72,14 +70,13 @@ parameter as an array of values:
 $client = ClientBuilder::create()->build();
 
 $params = [
-    'index' => 'test',
-    'type' => 'test',
-    'id' => 1,
+    'index'  => 'test',
+    'id'     => 1,
     'parent' => 'abc',              // white-listed Elasticsearch parameter
     'client' => [
         'custom' => [
             'customToken' => 'abc', // user-defined, not white listed, not checked
-            'otherToken' => 123
+            'otherToken'  => 123
         ]
     ]
 ];
@@ -101,8 +98,7 @@ $client = ClientBuilder::create()->build();
 
 $params = [
     'index' => 'test',
-    'type' => 'test',
-    'id' => 1
+    'id'    => 1
 ];
 $response = $client->get($params);
 print_r($response);
@@ -111,7 +107,7 @@ print_r($response);
 Array
 (
     [_index] => test
-    [_type] => test
+    [_type] => _doc
     [_id] => 1
     [_version] => 1
     [found] => 1
@@ -130,9 +126,8 @@ With verbosity turned on, you will see all of the transfer stats:
 $client = ClientBuilder::create()->build();
 
 $params = [
-    'index' => 'test',
-    'type' => 'test',
-    'id' => 1,
+    'index'  => 'test',
+    'id'     => 1,
     'client' => [
         'verbose' => true
     ]
@@ -202,7 +197,7 @@ Array
     [body] => Array
         (
             [_index] => test
-            [_type] => test
+            [_type] => _doc
             [_id] => 1
             [_version] => 1
             [found] => 1
@@ -236,9 +231,8 @@ client.  In these situations, you will see the appropriate threadpool queue grow
 $client = ClientBuilder::create()->build();
 
 $params = [
-    'index' => 'test',
-    'type' => 'test',
-    'id' => 1,
+    'index'  => 'test',
+    'id'     => 1,
     'client' => [
         'timeout' => 10,        // ten second timeout
         'connect_timeout' => 10
@@ -257,9 +251,8 @@ a per-request basis via the `future` parameter in the client options:
 $client = ClientBuilder::create()->build();
 
 $params = [
-    'index' => 'test',
-    'type' => 'test',
-    'id' => 1,
+    'index'  => 'test',
+    'id'     => 1,
     'client' => [
         'future' => 'lazy'
     ]
@@ -285,9 +278,8 @@ in the client options:
 $client = ClientBuilder::create()->build();
 
 $params = [
-    'index' => 'test',
-    'type' => 'test',
-    'id' => 1,
+    'index'  => 'test',
+    'id'     => 1,
     'client' => [
         'verify' => 'path/to/cacert.pem'      //Use a self-signed certificate
     ]