Merge branch '3.0' into master

Author: johannessteu

Classes/Driver/Version1/IndexerDriver.php

@@ -114,7 +114,7 @@ public function fulltext(NodeInterface $node, array $fulltextIndexOfNode, $targe
             [
                 // first, update the __fulltextParts, then re-generate the __fulltext from all __fulltextParts
                 'script' => '
-                    if (!ctx._source.containsKey("__fulltextParts")) {
+                    if (!(ctx._source.containsKey("__fulltextParts") && ctx._source.__fulltextParts instanceof Map)) {
                         ctx._source.__fulltextParts = new LinkedHashMap();
                     }
 

Classes/Driver/Version2/IndexerDriver.php

@@ -123,19 +123,19 @@ public function fulltext(NodeInterface $node, array $fulltextIndexOfNode, $targe
                 'script' => [
                     'inline' => '
                         ctx._source.__fulltext = new HashMap();
-                        
-                        if (!ctx._source.containsKey("__fulltextParts")) {
+
+                        if (!(ctx._source.containsKey("__fulltextParts") && ctx._source.__fulltextParts instanceof Map)) {
                             ctx._source.__fulltextParts = new HashMap();
                         }
-                        
+
                         if (nodeIsRemoved || nodeIsHidden || fulltext.size() == 0) {
                             if (ctx._source.__fulltextParts.containsKey(identifier)) {
                                 ctx._source.__fulltextParts.remove(identifier);
                             }
                         } else {
                             ctx._source.__fulltextParts.put(identifier, fulltext);
                         }
-    
+
                         ctx._source.__fulltextParts.each { originNodeIdentifier, partContent -> partContent.each { bucketKey, content ->
                                 if (ctx._source.__fulltext.containsKey(bucketKey)) {
                                     value = ctx._source.__fulltext[bucketKey] + " " + content.trim();

Classes/Eel/ElasticSearchQueryBuilder.php

@@ -651,7 +651,17 @@ public function query(NodeInterface $contextNode)
         // on indexing, the __parentPath is tokenized to contain ALL parent path parts,
         // e.g. /foo, /foo/bar/, /foo/bar/baz; to speed up matching.. That's why we use a simple "term" filter here.
         // http://www.elasticsearch.org/guide/en/elasticsearch/reference/current/query-dsl-term-filter.html
-        $this->queryFilter('term', ['__parentPath' => $contextNode->getPath()]);
+        // another term filter against the path allows the context node itself to be found
+        $this->queryFilter('bool', [
+            'should' => [
+                [
+                    'term' => ['__parentPath' => $contextNode->getPath()]
+                ],
+                [
+                    'term' => ['__path' => $contextNode->getPath()]
+                ]
+            ]
+        ]);
 
         //
         // http://www.elasticsearch.org/guide/en/elasticsearch/reference/current/query-dsl-terms-filter.html

Tests/Functional/Eel/ElasticSearchQueryTest.php

@@ -140,7 +140,7 @@ public function filterByNodeType()
             ->log($this->getLogMessagePrefix(__METHOD__))
             ->nodeType('Neos.NodeTypes:Page')
             ->count();
-        $this->assertEquals(3, $resultCount);
+        $this->assertEquals(4, $resultCount);
     }
 
     /**
@@ -166,7 +166,7 @@ public function limitDoesNotImpactCount()
             ->limit(1);
 
         $resultCount = $query->count();
-        $this->assertEquals(3, $resultCount, 'Asserting the count query returns the total count.');
+        $this->assertEquals(4, $resultCount, 'Asserting the count query returns the total count.');
     }
 
     /**
@@ -198,7 +198,7 @@ public function fieldBasedAggregations()
 
         $this->assertArrayHasKey($aggregationTitle, $result);
 
-        $this->assertCount(2, $result[$aggregationTitle]['buckets']);
+        $this->assertCount(3, $result[$aggregationTitle]['buckets']);
 
         $expectedChickenBucket = [
             'key' => 'chicken',
@@ -268,13 +268,13 @@ public function nodesWillBeSortedDesc()
         /** @var QueryResultInterface $result $node */
 
         $this->assertInstanceOf(QueryResultInterface::class, $result);
-        $this->assertCount(3, $result, 'The result should have 3 items');
-        $this->assertEquals(3, $result->count(), 'Count should be 3');
+        $this->assertCount(4, $result, 'The result should have 3 items');
+        $this->assertEquals(4, $result->count(), 'Count should be 3');
 
         $node = $result->getFirst();
 
         $this->assertInstanceOf(NodeInterface::class, $node);
-        $this->assertEquals('egg', $node->getProperty('title'), 'Asserting a desc sort order by property title');
+        $this->assertEquals('welcome', $node->getProperty('title'), 'Asserting a desc sort order by property title');
     }
 
     /**

Tests/Unit/Eel/ElasticSearchQueryBuilderTest.php

@@ -111,8 +111,19 @@ public function basicRequestStructureTakesContextNodeIntoAccount()
                         'bool' => [
                             'must' => [
                                 0 => [
-                                    'term' => [
-                                        '__parentPath' => '/foo/bar'
+                                    'bool' => [
+                                        'should' => [
+                                            0 => [
+                                                'term' => [
+                                                    '__parentPath' => '/foo/bar'
+                                                ]
+                                            ],
+                                            1 => [
+                                                'term' => [
+                                                    '__path' => '/foo/bar'
+                                                ]
+                                            ]
+                                        ]
                                     ]
                                 ],
                                 1 => [