Updated index docs + README + fixed getSource

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/index-operations.asciidoc

@@ -35,18 +35,15 @@ $params = [
             'number_of_replicas' => 2
         ],
         'mappings' => [
-            'my_type' => [
-                '_source' => [
-                    'enabled' => true
+            '_source' => [
+                'enabled' => true
+            ],
+            'properties' => [
+                'first_name' => [
+                    'type' => 'keyword'
                 ],
-                'properties' => [
-                    'first_name' => [
-                        'type' => 'keyword',
-                        'analyzer' => 'standard'
-                    ],
-                    'age' => [
-                        'type' => 'integer'
-                    ]
+                'age' => [
+                    'type' => 'integer'
                 ]
             ]
         ]
@@ -101,40 +98,26 @@ $params = [
             ]
         ],
         'mappings' => [ <3>
-            '_default_' => [    <4>
-                'properties' => [
-                    'title' => [
-                        'type' => 'keyword',
-                        'analyzer' => 'reuters',
-                        'term_vector' => 'yes',
-                        'copy_to' => 'combined'
-                    ],
-                    'body' => [
-                        'type' => 'keyword',
-                        'analyzer' => 'reuters',
-                        'term_vector' => 'yes',
-                        'copy_to' => 'combined'
-                    ],
-                    'combined' => [
-                        'type' => 'keyword',
-                        'analyzer' => 'reuters',
-                        'term_vector' => 'yes'
-                    ],
-                    'topics' => [
-                        'type' => 'keyword',
-                        'index' => 'not_analyzed'
-                    ],
-                    'places' => [
-                        'type' => 'keyword',
-                        'index' => 'not_analyzed'
-                    ]
-                ]
-            ],
-            'my_type' => [  <5>
-                'properties' => [
-                    'my_field' => [
-                        'type' => 'keyword'
-                    ]
+            'properties' => [
+                'title' => [
+                    'type' => 'text',
+                    'analyzer' => 'reuters',
+                    'copy_to' => 'combined'
+                ],
+                'body' => [
+                    'type' => 'text',
+                    'analyzer' => 'reuters',
+                    'copy_to' => 'combined'
+                ],
+                'combined' => [
+                    'type' => 'text',
+                    'analyzer' => 'reuters'
+                ],
+                'topics' => [
+                    'type' => 'keyword'
+                ],
+                'places' => [
+                    'type' => 'keyword'
                 ]
             ]
         ]
@@ -145,8 +128,6 @@ $client->indices()->create($params);
 <1> The top level `settings` contains config about the index (# of shards, etc) as well as analyzers
 <2> `analysis` is nested inside of `settings`, and contains tokenizers, filters, char filters and analyzers
 <3> `mappings` is another element nested inside of `settings`, and contains the mappings for various types
-<4> The `_default_` type is a dynamic template that is applied to all fields that don't have an explicit mapping
-<5> The `my_type` type is an example of a user-defined type that holds a single field, `my_field`
 
 
 === Delete an index
@@ -206,20 +187,17 @@ The Put Mappings API allows you to modify or add to an existing index's mapping.
 // Set the index and type
 $params = [
     'index' => 'my_index',
-    'type' => 'my_type2',
     'body' => [
-        'my_type2' => [
-            '_source' => [
-                'enabled' => true
+        '_source' => [
+            'enabled' => true
+        ],
+        'properties' => [
+            'first_name' => [
+                'type' => 'text',
+                'analyzer' => 'standard'
             ],
-            'properties' => [
-                'first_name' => [
-                    'type' => 'keyword',
-                    'analyzer' => 'standard'
-                ],
-                'age' => [
-                    'type' => 'integer'
-                ]
+            'age' => [
+                'type' => 'integer'
             ]
         ]
     ]
@@ -232,28 +210,17 @@ $client->indices()->putMapping($params);
 
 === Get Mappings API
 
-The Get Mappings API will return the mapping details about your indexes and types.  Depending on the mappings that you wish to retrieve, you can specify a number of combinations of index and type:
+The Get Mappings API will return the mapping details about your indexes.  Depending on the mappings that you wish to retrieve, you can specify one of more indexes:
 
 [source,php]
 ----
-// Get mappings for all indexes and types
+// Get mappings for all indexes
 $response = $client->indices()->getMapping();
 
-// Get mappings for all types in 'my_index'
+// Get mappings in 'my_index'
 $params = ['index' => 'my_index'];
 $response = $client->indices()->getMapping($params);
 
-// Get mappings for all types of 'my_type', regardless of index
-$params = ['type' => 'my_type' ];
-$response = $client->indices()->getMapping($params);
-
-// Get mapping 'my_type' in 'my_index'
-$params = [
-    'index' => 'my_index'
-    'type' => 'my_type'
-];
-$response = $client->indices()->getMapping($params);
-
 // Get mappings for two indexes
 $params = [
     'index' => [ 'my_index', 'my_index2' ]

src/Elasticsearch/Client.php

@@ -268,7 +268,7 @@ public function getSource(array $params)
         /**
  * @var \Elasticsearch\Endpoints\Get $endpoint
 */
-        $endpoint = $endpointBuilder('Get');
+        $endpoint = $endpointBuilder('Source\Get');
         $endpoint->setID($id)
             ->setIndex($index)
             ->setType($type);