Merge pull request #210 from radmiraal/task/invalid-dependency

BUGFIX: Remove unneeded depency on Neos

Author: kdambekalns

Classes/Command/NodeIndexCommandController.php

@@ -13,9 +13,10 @@
 
 use Flowpack\ElasticSearch\ContentRepositoryAdaptor\Mapping\NodeTypeMappingBuilder;
 use Flowpack\ElasticSearch\ContentRepositoryAdaptor\Service\IndexWorkspaceTrait;
+use Neos\ContentRepository\Domain\Service\Context;
+use Neos\ContentRepository\Domain\Service\ContextFactoryInterface;
 use Neos\Flow\Annotations as Flow;
 use Neos\Flow\Cli\CommandController;
-use Neos\Neos\Controller\CreateContentContextTrait;
 use Neos\ContentRepository\Domain\Model\Workspace;
 
 /**
@@ -26,7 +27,6 @@
 class NodeIndexCommandController extends CommandController
 {
     use IndexWorkspaceTrait;
-    use CreateContentContextTrait;
 
     /**
      * @Flow\Inject
@@ -76,6 +76,12 @@ class NodeIndexCommandController extends CommandController
      */
     protected $configurationManager;
 
+    /**
+     * @Flow\Inject
+     * @var ContextFactoryInterface
+     */
+    protected $contextFactory;
+
     /**
      * @var array
      */
@@ -273,4 +279,30 @@ public function cleanupCommand()
             $this->logger->log(sprintf('Nothing removed. ElasticSearch responded with status %s, saying "%s: %s"', $response->status, $response->error->type, $response->error->reason));
         }
     }
+
+    /**
+     * Create a ContentContext based on the given workspace name
+     *
+     * @param string $workspaceName Name of the workspace to set for the context
+     * @param array $dimensions Optional list of dimensions and their values which should be set
+     * @return Context
+     */
+    protected function createContentContext($workspaceName, array $dimensions = [])
+    {
+        $contextProperties = [
+            'workspaceName' => $workspaceName,
+            'invisibleContentShown' => true,
+            'inaccessibleContentShown' => true
+        ];
+
+        if ($dimensions !== []) {
+            $contextProperties['dimensions'] = $dimensions;
+            $contextProperties['targetDimensions'] = array_map(function ($dimensionValues) {
+                return array_shift($dimensionValues);
+            }, $dimensions);
+        }
+
+        return $this->contextFactory->create($contextProperties);
+    }
+
 }