MERGE: Merge branch 'master' into task/debugging-tweaks

Author: kdambekalns

Classes/Driver/AbstractIndexerDriver.php

@@ -22,9 +22,9 @@ abstract class AbstractIndexerDriver extends AbstractDriver
      * Whether the node is configured as fulltext root.
      *
      * @param NodeInterface $node
-     * @return boolean
+     * @return bool
      */
-    protected function isFulltextRoot(NodeInterface $node)
+    protected function isFulltextRoot(NodeInterface $node): bool
     {
         if ($node->getNodeType()->hasConfiguration('search')) {
             $elasticSearchSettingsForNode = $node->getNodeType()->getConfiguration('search');
@@ -35,4 +35,24 @@ protected function isFulltextRoot(NodeInterface $node)
 
         return false;
     }
+
+    /**
+     * @param NodeInterface $node
+     * @return NodeInterface|null
+     */
+    protected function findClosestFulltextRoot(NodeInterface $node)
+    {
+        $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 (%s)', $node->getContextPath(), $node->getIdentifier()), LOG_WARNING, null, 'ElasticSearch (CR)');
+
+                return null;
+            }
+        }
+
+        return $closestFulltextNode;
+    }
 }

Classes/Driver/Version1/IndexerDriver.php

@@ -76,15 +76,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 (%s)', $node->getPath(), $node->getIdentifier()), LOG_WARNING, null, 'ElasticSearch (CR)');
-
-                return null;
-            }
+        $closestFulltextNode = $this->findClosestFulltextRoot($node);
+        if ($closestFulltextNode === null) {
+            return null;
         }
 
         $closestFulltextNodeContextPath = $closestFulltextNode->getContextPath();

Classes/Driver/Version2/IndexerDriver.php

@@ -79,15 +79,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 (%s)', $node->getContextPath(), $node->getIdentifier()), LOG_WARNING, null, 'ElasticSearch (CR)');
-
-                return null;
-            }
+        $closestFulltextNode = $this->findClosestFulltextRoot($node);
+        if ($closestFulltextNode === null) {
+            return null;
         }
 
         $closestFulltextNodeContextPath = $closestFulltextNode->getContextPath();