Merge pull request #354 from daniellienert/bugfix/multi-dimension-indexnode

BUGFIX: nodeindex:indexnode handles multiple dimensions

Author: daniellienert

.travis.yml

@@ -23,7 +23,7 @@ cache:
     - $HOME/.composer/cache
 
 before_install:
-  - export NEOS_TARGET_VERSION=5.2
+  - export NEOS_TARGET_VERSION=5.3
   - cd ..
   - if [ "$ES" = 6 ]; then wget --no-check-certificate https://artifacts.elastic.co/downloads/elasticsearch/elasticsearch-6.8.6.tar.gz && tar xvfz elasticsearch-6.8.6.tar.gz && mv elasticsearch-6.8.6 elasticsearch; fi
   - if [ "$ES" = 7 ]; then wget --no-check-certificate https://artifacts.elastic.co/downloads/elasticsearch/elasticsearch-7.9.0-linux-x86_64.tar.gz && tar xvfz elasticsearch-7.9.0-linux-x86_64.tar.gz && mv elasticsearch-7.9.0 elasticsearch; fi
@@ -35,7 +35,6 @@ before_install:
   - composer require --no-update --no-interaction neos/content-repository-search:dev-master
   - composer require --no-update --no-interaction flowpack/elasticsearch:dev-master
   - composer require --no-update --no-interaction flowpack/elasticsearch-contentrepositoryadaptor:dev-master
-  - composer require --no-update --no-interaction neos/nodetypes
   - composer remove --no-update --no-interaction neos/site-kickstarter
 install:
   - composer install --no-interaction

Classes/Command/NodeIndexCommandController.php

@@ -161,29 +161,29 @@ public function indexNodeCommand(string $identifier, string $workspace = null, s
             $node = $context->getNodeByIdentifier($identifier);
 
             if ($node === null) {
-                $this->outputLine('<error>Error: Node with the given identifier was not found.</error>');
-                $this->quit(1);
+                return [$workspace->getName(), '-', json_encode($dimensions), 'not found'];
             }
 
-            $this->outputLine();
-            $this->outputLine('Indexing node <b>"%s"</b> (%s)', [$node->getLabel(), $node->getIdentifier(),]);
-            $this->outputLine('  Workspace: %s', [$workspace->getName()]);
-            $this->outputLine('  Node type: %s', [$node->getNodeType()->getName()]);
-            $this->outputLine('  Dimensions: %s', [json_encode($dimensions)]);
-
             $this->nodeIndexer->setDimensions($dimensions);
             $this->nodeIndexer->indexNode($node);
+
+            return [$workspace->getName(), $node->getNodeType()->getName(), json_encode($dimensions), '<success>indexed</success>'];
         };
 
         $indexInWorkspace = function ($identifier, Workspace $workspace) use ($indexNode) {
             $combinations = $this->contentDimensionCombinator->getAllAllowedCombinations();
+
+            $results = [];
+
             if ($combinations === []) {
-                $indexNode($identifier, $workspace, []);
+                $results[] = $indexNode($identifier, $workspace, []);
             } else {
                 foreach ($combinations as $combination) {
-                    $indexNode($identifier, $workspace, $combination);
+                    $results[] = $indexNode($identifier, $workspace, $combination);
                 }
             }
+
+            $this->output->outputTable($results, ['Workspace', 'NodeType', 'Dimensions', 'State']);
         };
 
         if ($workspace === null) {