MERGE: Merge branch 'task/update-neos-3.0' into task/merge-master

Author: daniellienert

.travis.yml

@@ -2,26 +2,32 @@ language: php
 matrix:
   include:
     - php: 7.0
+      env: ES=1
+    - php: 7.0
+      env: ES=2
+    - php: 5.6
+      env: ES=1
     - php: 5.6
-    - php: 5.5
+      env: ES=2
 sudo: false
 before_install:
+  - export NEOS_TARGET_VERSION=2.3
   - cd ..
-  - wget --no-check-certificate https://download.elastic.co/elasticsearch/release/org/elasticsearch/distribution/zip/elasticsearch/2.4.1/elasticsearch-2.4.1.zip && unzip elasticsearch-2.4.1.zip
-  - mv elasticsearch-2.4.1 elasticsearch
+  - if [ "$ES" = 1 ]; then wget --no-check-certificate https://download.elastic.co/elasticsearch/elasticsearch/elasticsearch-1.7.5.zip && unzip elasticsearch-1.7.5.zip && mv elasticsearch-1.7.5 elasticsearch; fi
+  - if [ "$ES" = 2 ]; then wget --no-check-certificate https://download.elastic.co/elasticsearch/elasticsearch/elasticsearch-2.4.3.zip && unzip elasticsearch-2.4.3.zip && mv elasticsearch-2.4.3 elasticsearch; fi
   - cd elasticsearch
   - bin/elasticsearch -d
   - cd ..
-  - git clone https://github.com/neos/neos-base-distribution.git
+  - git clone https://github.com/neos/neos-base-distribution.git -b ${NEOS_TARGET_VERSION}
   - cd neos-base-distribution
-  - composer require flowpack/elasticsearch-contentrepositoryadaptor dev-master
-  - composer require typo3/typo3cr-search dev-master
+  - composer require --no-update --no-interaction flowpack/elasticsearch-contentrepositoryadaptor:3.0.x-dev
 install:
-  - composer install
+  - composer install --no-interaction
   - cd ..
   - rm -rf neos-base-distribution/Packages/Application/Flowpack.ElasticSearch.ContentRepositoryAdaptor
   - mv Flowpack.ElasticSearch.ContentRepositoryAdaptor neos-base-distribution/Packages/Application/Flowpack.ElasticSearch.ContentRepositoryAdaptor
   - cd neos-base-distribution
 script:
-  - bin/phpunit -c Build/BuildEssentials/PhpUnit/UnitTests.xml Packages/Application/Flowpack.ElasticSearch.ContentRepositoryAdaptor/Tests/Unit
-  - bin/phpunit -c Build/BuildEssentials/PhpUnit/FunctionalTests.xml Packages/Application/Flowpack.ElasticSearch.ContentRepositoryAdaptor/Tests/Functional
+  - bin/phpunit --colors -c Build/BuildEssentials/PhpUnit/UnitTests.xml Packages/Application/Flowpack.ElasticSearch.ContentRepositoryAdaptor/Tests/Unit
+  - if [ "$ES" = 1 ]; then FLOW_CONTEXT="Testing/ElasticVersion1" bin/phpunit --colors --stop-on-failure -c Build/BuildEssentials/PhpUnit/FunctionalTests.xml Packages/Application/Flowpack.ElasticSearch.ContentRepositoryAdaptor/Tests/Functional; fi
+  - if [ "$ES" = 2 ]; then FLOW_CONTEXT="Testing/ElasticVersion2" bin/phpunit --colors --stop-on-failure -c Build/BuildEssentials/PhpUnit/FunctionalTests.xml Packages/Application/Flowpack.ElasticSearch.ContentRepositoryAdaptor/Tests/Functional; fi

Classes/Command/NodeIndexCommandController.php

@@ -15,7 +15,8 @@
 use Flowpack\ElasticSearch\ContentRepositoryAdaptor\Service\IndexWorkspaceTrait;
 use Neos\Flow\Annotations as Flow;
 use Neos\Flow\Cli\CommandController;
-use Neos\ContentRepository\Domain\Model\NodeInterface;
+use Neos\Neos\Controller\CreateContentContextTrait;
+use Neos\ContentRepository\Domain\Model\Workspace;
 
 /**
  * Provides CLI features for index handling
@@ -25,6 +26,7 @@
 class NodeIndexCommandController extends CommandController
 {
     use IndexWorkspaceTrait;
+    use CreateContentContextTrait;
 
     /**
      * @Flow\Inject
@@ -131,6 +133,64 @@ public function showMappingCommand()
         }
     }
 
+    /**
+     * Index a single node by the given identifier and workspace name
+     *
+     * @param string $identifier
+     * @param string $workspace
+     * @return void
+     */
+    public function indexNodeCommand($identifier, $workspace = null)
+    {
+        if ($workspace === null && $this->settings['indexAllWorkspaces'] === false) {
+            $workspace = 'live';
+        }
+
+        $indexNode = function ($identifier, Workspace $workspace, array $dimensions) {
+            $context = $this->createContentContext($workspace->getName(), $dimensions);
+            $node = $context->getNodeByIdentifier($identifier);
+            if ($node === null) {
+                $this->outputLine('Node with the given identifier is not found.');
+                $this->quit();
+            }
+            $this->outputLine();
+            $this->outputLine('Index node "%s" (%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->indexNode($node);
+        };
+
+        $indexInWorkspace = function ($identifier, Workspace $workspace) use ($indexNode) {
+            $combinations = $this->contentDimensionCombinator->getAllAllowedCombinations();
+            if ($combinations === []) {
+                $indexNode($identifier, $workspace, []);
+            } else {
+                foreach ($combinations as $combination) {
+                    $indexNode($identifier, $workspace, $combination);
+                }
+            }
+        };
+
+        if ($workspace === null) {
+            foreach ($this->workspaceRepository->findAll() as $workspace) {
+                $indexInWorkspace($identifier, $workspace);
+            }
+        } else {
+            $workspace = $this->workspaceRepository->findByIdentifier($workspace);
+            $indexInWorkspace($identifier, $workspace);
+        }
+    }
+
     /**
      * Index all nodes by creating a new index and when everything was completed, switch the index alias.
      *

Classes/Driver/AbstractDriver.php

@@ -0,0 +1,34 @@
+<?php
+namespace Flowpack\ElasticSearch\ContentRepositoryAdaptor\Driver;
+
+/*
+ * This file is part of the Flowpack.ElasticSearch.ContentRepositoryAdaptor package.
+ *
+ * (c) Contributors of the Neos Project - www.neos.io
+ *
+ * This package is Open Source Software. For the full copyright and license
+ * information, please view the LICENSE file which was distributed with this
+ * source code.
+ */
+
+use Flowpack\ElasticSearch\ContentRepositoryAdaptor\ElasticSearchClient;
+use Flowpack\ElasticSearch\ContentRepositoryAdaptor\LoggerInterface;
+use Neos\Flow\Annotations as Flow;
+
+/**
+ * Abstract Elasticsearch driver
+ */
+abstract class AbstractDriver
+{
+    /**
+     * @Flow\Inject
+     * @var ElasticSearchClient
+     */
+    protected $searchClient;
+
+    /**
+     * @Flow\Inject
+     * @var LoggerInterface
+     */
+    protected $logger;
+}

Classes/Driver/AbstractIndexerDriver.php

@@ -0,0 +1,38 @@
+<?php
+namespace Flowpack\ElasticSearch\ContentRepositoryAdaptor\Driver;
+
+/*
+ * This file is part of the Flowpack.ElasticSearch.ContentRepositoryAdaptor package.
+ *
+ * (c) Contributors of the Neos Project - www.neos.io
+ *
+ * This package is Open Source Software. For the full copyright and license
+ * information, please view the LICENSE file which was distributed with this
+ * source code.
+ */
+
+use Neos\ContentRepository\Domain\Model\NodeInterface;
+
+/**
+ * Abstract Fulltext Indexer Driver
+ */
+abstract class AbstractIndexerDriver extends AbstractDriver
+{
+    /**
+     * Whether the node is configured as fulltext root.
+     *
+     * @param NodeInterface $node
+     * @return boolean
+     */
+    protected function isFulltextRoot(NodeInterface $node)
+    {
+        if ($node->getNodeType()->hasConfiguration('search')) {
+            $elasticSearchSettingsForNode = $node->getNodeType()->getConfiguration('search');
+            if (isset($elasticSearchSettingsForNode['fulltext']['isRoot']) && $elasticSearchSettingsForNode['fulltext']['isRoot'] === true) {
+                return true;
+            }
+        }
+
+        return false;
+    }
+}