Merge branch 'master' into 2019-04-05-mapping-generation-changes

Author: pmishev

.travis.yml

@@ -4,18 +4,18 @@ php:
   - '7.0'
 
 env:
-  - SYMFONY_VERSION="3.4.*" ES_VERSION="5.6.8"
+  - SYMFONY_VERSION="3.4.*" ES_VERSION="6.2.4"
 
 matrix:
   allow_failures:
     - php: hhvm
   include:
     - php: 7.1
-      env: SYMFONY_VERSION="3.3.*" ES_VERSION="5.6.8"
+      env: SYMFONY_VERSION="3.3.*" ES_VERSION="6.2.4"
     - php: 7.1
-      env: SYMFONY_VERSION="3.2.*" ES_VERSION="5.6.8"
+      env: SYMFONY_VERSION="3.2.*" ES_VERSION="6.2.4"
     - php: 7.1
-      env: SYMFONY_VERSION="2.7.*" ES_VERSION="5.6.8"
+      env: SYMFONY_VERSION="2.7.*" ES_VERSION="6.2.4"
 
 install:
   - composer require --no-update symfony/symfony:${SYMFONY_VERSION}

Annotation/Document.php

@@ -22,13 +22,6 @@ final class Document implements DumperInterface
      */
     public $repositoryClass;
 
-    /**
-     * Document parent type.
-     *
-     * @var string
-     */
-    public $parent;
-
     /**
      * Settings directly passed to Elasticsearch client as-is
      *

Annotation/ParentId.php

@@ -54,7 +54,7 @@ public function __construct($operation, $index, $type, array $query, array $meta
 
         // in case some meta param is specified as part of the query and not in $metaParams, move it there
         // (this happens when converting a document entity to an array)
-        foreach (['_id', '_parent'] as $metaParam) {
+        foreach (['_id'] as $metaParam) {
             if (isset($query[$metaParam])) {
                 $metaParams[$metaParam] = $query[$metaParam];
                 unset($query[$metaParam]);

DTO/BulkQueryItem.php

@@ -7,7 +7,6 @@
 use Sineflow\ElasticsearchBundle\Annotation\DocObject;
 use Sineflow\ElasticsearchBundle\Annotation\Document;
 use Sineflow\ElasticsearchBundle\Annotation\Id;
-use Sineflow\ElasticsearchBundle\Annotation\ParentId;
 use Sineflow\ElasticsearchBundle\Annotation\Property;
 use Sineflow\ElasticsearchBundle\Annotation\Score;
 use Sineflow\ElasticsearchBundle\LanguageProvider\LanguageProviderInterface;
@@ -88,27 +87,15 @@ public function parse(\ReflectionClass $documentReflection, array $indexAnalyzer
         /** @var Document $classAnnotation */
         $classAnnotation = $this->reader->getClassAnnotation($documentReflection, Document::class);
 
-        if ($classAnnotation !== null) {
-            if ($classAnnotation->parent !== null) {
-                $parent = $this->getDocumentType(
-                    new \ReflectionClass($this->documentLocator->resolveClassName($classAnnotation->parent))
-                );
-            } else {
-                $parent = null;
-            }
+        if (null !== $classAnnotation) {
             $type = $this->getDocumentType($documentReflection);
 
             $properties = $this->getProperties($documentReflection, $indexAnalyzers);
 
             $metadata = [
                 'type' => $type,
                 'properties' => $properties,
-                'fields' => array_filter(
-                    array_merge(
-                        $classAnnotation->dump(),
-                        ['_parent' => $parent === null ? null : ['type' => $parent]]
-                    )
-                ),
+                'fields' => array_filter($classAnnotation->dump()),
                 'propertiesMetadata' => $this->getPropertiesMetadata($documentReflection),
                 'objects' => $this->getObjects(),
                 'repositoryClass' => $classAnnotation->repositoryClass,
@@ -140,7 +127,6 @@ public function getPropertiesMetadata(\ReflectionClass $documentReflection)
         foreach ($this->getDocumentPropertiesReflection($documentReflection) as $propertyName => $property) {
             $propertyAnnotation = $this->getPropertyAnnotationData($property);
             $propertyAnnotation = $propertyAnnotation ?: $this->reader->getPropertyAnnotation($property, Id::class);
-            $propertyAnnotation = $propertyAnnotation ?: $this->reader->getPropertyAnnotation($property, ParentId::class);
             $propertyAnnotation = $propertyAnnotation ?: $this->reader->getPropertyAnnotation($property, Score::class);
 
             // Ignore class properties without any recognized annotation
@@ -184,15 +170,6 @@ public function getPropertiesMetadata(\ReflectionClass $documentReflection)
                     ];
                     break;
 
-                case ParentId::class:
-                    $propertyAnnotation->name = '_parent';
-                    $propertyAnnotation->type = 'keyword';
-                    $propertyMetadata[$propertyAnnotation->name] = [
-                        'propertyName' => $propertyName,
-                        'type' => $propertyAnnotation->type,
-                    ];
-                    break;
-
                 case Score::class:
                     $propertyAnnotation->name = '_score';
                     $propertyAnnotation->type = 'float';
@@ -283,7 +260,6 @@ private function registerAnnotations()
             'Property',
             'DocObject',
             'Id',
-            'ParentId',
             'Score',
         ];
 
@@ -314,7 +290,7 @@ private function getDocumentPropertiesReflection(\ReflectionClass $documentRefle
         }
 
         $parentReflection = $documentReflection->getParentClass();
-        if ($parentReflection !== false) {
+        if (false !== $parentReflection) {
             $properties = array_merge(
                 $properties,
                 array_diff_key($this->getDocumentPropertiesReflection($parentReflection), $properties)

Mapping/DocumentParser.php

@@ -26,13 +26,13 @@ sineflow_elasticsearch:
                 analysis:
                     filter:
                         unigram_filter:
-                            type: nGram
+                            type: ngram
                             min_gram: 1
                             max_gram: 20
 
                     tokenizer:
                         email_tokenizer:
-                            type: nGram
+                            type: ngram
                             min_gram: 3
                             max_gram: 60
 

Resources/doc/configuration.md

@@ -86,7 +86,7 @@ $repo->persistRaw($product);
 $im->getConnection()->commit();
 ```
 
-> **id** is a special field that comes from `AbstractDocument` and translates to **\_id** in Elasticsearch, just like **parent**, which translates to **\_parent**.
+> **id** is a special field that comes from `AbstractDocument` and translates to **\_id** in Elasticsearch.
 
 ## Update a document
 

Resources/doc/crud.md

@@ -40,12 +40,6 @@ The class representing a document must be annotated as `@ES\Document`. The follo
 repositoryClass="AppBundle\Document\Repository\ProductRepository"
 ```
 
-- `parent` Allows you to specify a parent type ([more info here](https://www.elastic.co/guide/en/elasticsearch/reference/current/mapping-parent-field.html))
-```
-parent="AppBundle:ParentDoc"
-```
-This should be used in conjunction with the <a href="#parentid">@ES\ParentId</a> meta annotation
-
 - `options` Allows to specify any type option supported by Elasticsearch, such as [\_all](https://www.elastic.co/guide/en/elasticsearch/reference/current/mapping-all-field.html), [dynamic_templates](https://www.elastic.co/guide/en/elasticsearch/reference/current/dynamic-templates.html), [dynamic_date_formats](https://www.elastic.co/guide/en/elasticsearch/reference/current/dynamic-field-mapping.html#date-detection), etc. 
 
 ### Property annotation
@@ -147,34 +141,6 @@ class Product
 ```
 > Such property is already defined in `AbstractDocument`, so you can just extend it.
 
-#### <a name=parentid></a>@ES\ParentId
-
-When you need to have a parent-child relation between two types in your index, you'd need access to the `_parent` meta field of the document.
-To do that, you will need a class property with that annotation that can be used for both setting and getting the `_parent` value.
-
-```php
-use Sineflow\ElasticsearchBundle\Annotation as ES;
-
-/**
- * @ES\Document(
- *     type="answers",
- *     parent="AppBundle:Question"
- * );
- */
-class Answer
-{
-    /**
-     * @var string
-     *
-     * @ES\ParentId
-     */
-    public $parent;
-}
-```
-> Do not forget to also set the `parent` property of the `@ES\Document` annotation to specify the parent entity for that type. 
-
-**WARNING**: If using Elasticsearch 1.x, the parent property value will NOT be populated when retrieving documents, as Elasticsearch does not return it by default! 
-
 ## DocObject class annotation
 
 Object classes are almost the same as document classes:

Resources/doc/mapping.md

@@ -71,7 +71,7 @@ public function convertToDocument($rawData, $documentClass)
         }
 
         // Add special fields to data
-        foreach (['_id', '_parent', '_score'] as $specialField) {
+        foreach (['_id', '_score'] as $specialField) {
             if (isset($rawData[$specialField])) {
                 $data[$specialField] = $rawData[$specialField];
             }

Result/DocumentConverter.php

@@ -70,7 +70,7 @@ public function onPostCommit(PostCommitEvent $postCommitEvent)
             $idValue = current($postCommitEvent->getBulkResponse()['items'][$bulkOperationIndex])['_id'];
             $idPropertyMetadata = $entityData['metadata']['_id'];
             $entity = $entityData['entity'];
-            if ($idPropertyMetadata['propertyAccess'] == DocumentMetadata::PROPERTY_ACCESS_PRIVATE) {
+            if (DocumentMetadata::PROPERTY_ACCESS_PRIVATE === $idPropertyMetadata['propertyAccess']) {
                 $entity->{$idPropertyMetadata['methods']['setter']}($idValue);
             } else {
                 $entity->{$idPropertyMetadata['propertyName']} = $idValue;