TASK: Use findClosestFulltextRoot from abstract driver in ES5 driver

Author: daniellienert

Classes/Driver/AbstractIndexerDriver.php

@@ -48,7 +48,7 @@ protected function findClosestFulltextRoot(NodeInterface $node)
             if ($closestFulltextNode === null) {
                 // root of hierarchy, no fulltext root found anymore, abort silently...
                 if ($node->getPath() !== '/' && $node->getPath() !== '/sites') {
-                    $this->logger->log(sprintf('NodeIndexer: No fulltext root found for node %s (%s)', $node->getContextPath(), $node->getIdentifier()), LOG_WARNING, null, 'ElasticSearch (CR)');
+                    $this->logger->log(sprintf('NodeIndexer: No fulltext root found for node %s (%s)', $node->getIdentifier(), $node->getContextPath()), LOG_WARNING, null, 'ElasticSearch (CR)');
                 }
 
                 return null;

Classes/Driver/Version5/IndexerDriver.php

@@ -77,15 +77,9 @@ public function document($indexName, NodeInterface $node, ElasticSearchDocument
      */
     public function fulltext(NodeInterface $node, array $fulltextIndexOfNode, $targetWorkspaceName = null)
     {
-        $closestFulltextNode = $node;
-        while (!$this->isFulltextRoot($closestFulltextNode)) {
-            $closestFulltextNode = $closestFulltextNode->getParent();
-            if ($closestFulltextNode === null) {
-                // root of hierarchy, no fulltext root found anymore, abort silently...
-                $this->logger->log(sprintf('NodeIndexer: No fulltext root found for node %s (%)', $node->getPath(), $node->getIdentifier()), LOG_WARNING, null, 'ElasticSearch (CR)');
-
-                return null;
-            }
+        $closestFulltextNode = $this->findClosestFulltextRoot($node);
+        if ($closestFulltextNode === null) {
+            return null;
         }
 
         $closestFulltextNodeContextPath = $closestFulltextNode->getContextPath();