Merge branch '2.0' into dfeyer-bugfix-escape-slash

# Conflicts:
#	Classes/Flowpack/ElasticSearch/ContentRepositoryAdaptor/Eel/ElasticSearchQueryBuilder.php

Author: dfeyer

.styleci.yaml .styleci.yml.styleci.yaml renamed to .styleci.yml

@@ -1,19 +1,21 @@
 language: php
 matrix:
   include:
+    - php: 7.0
     - php: 5.6
     - php: 5.5
 sudo: false
 before_install:
   - cd ..
-  - wget --no-check-certificate https://download.elastic.co/elasticsearch/elasticsearch/elasticsearch-1.7.0.zip && unzip elasticsearch-1.7.0.zip
-  - mv elasticsearch-1.7.0 elasticsearch
+  - 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
   - cd elasticsearch
   - bin/elasticsearch -d
   - cd ..
   - git clone https://github.com/neos/neos-base-distribution.git
   - cd neos-base-distribution
   - composer require flowpack/elasticsearch-contentrepositoryadaptor dev-master
+  - composer require typo3/typo3cr-search dev-master
 install:
   - composer install
   - cd ..

.travis.yml

@@ -1,16 +1,18 @@
 <?php
 namespace Flowpack\ElasticSearch\ContentRepositoryAdaptor\Client;
 
-/*                                                                                                  *
- * This script belongs to the TYPO3 Flow package "Flowpack.ElasticSearch.ContentRepositoryAdaptor". *
- *                                                                                                  *
- * It is free software; you can redistribute it and/or modify it under                              *
- * the terms of the GNU Lesser General Public License, either version 3                             *
- *  of the License, or (at your option) any later version.                                          *
- *                                                                                                  *
- * The TYPO3 project - inspiring people to share!                                                   *
- *                                                                                                  */
+/*
+ * 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\Domain\Model\Client;
 use TYPO3\Flow\Annotations as Flow;
 
 /**
@@ -29,10 +31,10 @@ class ClientFactory
     /**
      * Create a client
      *
-     * @return \Flowpack\ElasticSearch\Domain\Model\Client
+     * @return Client
      */
     public function create()
     {
-        return $this->clientFactory->create(null, 'Flowpack\ElasticSearch\ContentRepositoryAdaptor\ElasticSearchClient');
+        return $this->clientFactory->create(null, ElasticSearchClient::class);
     }
 }

Classes/Flowpack/ElasticSearch/ContentRepositoryAdaptor/Client/ClientFactory.php

@@ -1,21 +1,20 @@
 <?php
 namespace Flowpack\ElasticSearch\ContentRepositoryAdaptor\Command;
 
-/*                                                                                                  *
- * This script belongs to the TYPO3 Flow package "Flowpack.ElasticSearch.ContentRepositoryAdaptor". *
- *                                                                                                  *
- * It is free software; you can redistribute it and/or modify it under                              *
- * the terms of the GNU Lesser General Public License, either version 3                             *
- *  of the License, or (at your option) any later version.                                          *
- *                                                                                                  *
- * The TYPO3 project - inspiring people to share!                                                   *
- *                                                                                                  */
+/*
+ * 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\Mapping\NodeTypeMappingBuilder;
+use Flowpack\ElasticSearch\ContentRepositoryAdaptor\Service\IndexWorkspaceTrait;
 use TYPO3\Flow\Annotations as Flow;
 use TYPO3\Flow\Cli\CommandController;
-use Flowpack\ElasticSearch\ContentRepositoryAdaptor\Mapping\NodeTypeMappingBuilder;
-use TYPO3\TYPO3CR\Domain\Service\ContentDimensionCombinator;
-use TYPO3\TYPO3CR\Search\Indexer\NodeIndexingManager;
 
 /**
  * Provides CLI features for index handling
@@ -24,18 +23,14 @@
  */
 class NodeIndexCommandController extends CommandController
 {
+    use IndexWorkspaceTrait;
+
     /**
      * @Flow\Inject
      * @var \Flowpack\ElasticSearch\ContentRepositoryAdaptor\Indexer\NodeIndexer
      */
     protected $nodeIndexer;
 
-    /**
-     * @Flow\Inject
-     * @var NodeIndexingManager
-     */
-    protected $nodeIndexingManager;
-
     /**
      * @Flow\Inject
      * @var \TYPO3\TYPO3CR\Domain\Repository\WorkspaceRepository
@@ -54,12 +49,6 @@ class NodeIndexCommandController extends CommandController
      */
     protected $nodeFactory;
 
-    /**
-     * @Flow\Inject
-     * @var \TYPO3\TYPO3CR\Domain\Service\ContextFactory
-     */
-    protected $contextFactory;
-
     /**
      * @Flow\Inject
      * @var \TYPO3\Neos\Domain\Service\ContentDimensionPresetSourceInterface
@@ -72,21 +61,6 @@ class NodeIndexCommandController extends CommandController
      */
     protected $nodeTypeMappingBuilder;
 
-    /**
-     * @var integer
-     */
-    protected $indexedNodes;
-
-    /**
-     * @var integer
-     */
-    protected $countedIndexedNodes;
-
-    /**
-     * @var integer
-     */
-    protected $limit;
-
     /**
      * @Flow\Inject
      * @var \Flowpack\ElasticSearch\ContentRepositoryAdaptor\LoggerInterface
@@ -99,12 +73,6 @@ class NodeIndexCommandController extends CommandController
      */
     protected $configurationManager;
 
-    /**
-     * @Flow\Inject
-     * @var ContentDimensionCombinator
-     */
-    protected $contentDimensionCombinator;
-
     /**
      * @var array
      */
@@ -192,23 +160,24 @@ public function buildCommand($limit = null, $update = false, $workspace = null,
         $this->logger->log(sprintf('Indexing %snodes ... ', ($limit !== null ? 'the first ' . $limit . ' ' : '')), LOG_INFO);
 
         $count = 0;
-        $this->limit = $limit;
-        $this->indexedNodes = 0;
-        $this->countedIndexedNodes = 0;
 
         if ($workspace === null && $this->settings['indexAllWorkspaces'] === false) {
             $workspace = 'live';
         }
 
+        $callback = function ($workspaceName, $indexedNodes, $dimensions) {
+            if ($dimensions === []) {
+                $this->outputLine('Workspace "' . $workspaceName . '" without dimensions done. (Indexed ' . $indexedNodes . ' nodes)');
+            } else {
+                $this->outputLine('Workspace "' . $workspaceName . '" and dimensions "' . json_encode($dimensions) . '" done. (Indexed ' . $indexedNodes . ' nodes)');
+            }
+        };
         if ($workspace === null) {
             foreach ($this->workspaceRepository->findAll() as $workspace) {
-                $this->indexWorkspace($workspace->getName());
-
-                $count = $count + $this->countedIndexedNodes;
+                $count += $this->indexWorkspace($workspace->getName(), $limit, $callback);
             }
         } else {
-            $this->indexWorkspace($workspace);
-            $count = $count + $this->countedIndexedNodes;
+            $count += $this->indexWorkspace($workspace, $limit, $callback);
         }
 
         $this->nodeIndexingManager->flushQueues();
@@ -243,60 +212,4 @@ public function cleanupCommand()
             $this->logger->log(sprintf('Nothing removed. ElasticSearch responded with status %s, saying "%s"', $response->status, $response->error));
         }
     }
-
-    /**
-     * @param string $workspaceName
-     * @return void
-     */
-    protected function indexWorkspace($workspaceName)
-    {
-        $combinations = $this->contentDimensionCombinator->getAllAllowedCombinations();
-        if ($combinations === array()) {
-            $this->indexWorkspaceWithDimensions($workspaceName);
-        } else {
-            foreach ($combinations as $combination) {
-                $this->indexWorkspaceWithDimensions($workspaceName, $combination);
-            }
-        }
-    }
-
-    /**
-     * @param string $workspaceName
-     * @param array $dimensions
-     * @return void
-     */
-    protected function indexWorkspaceWithDimensions($workspaceName, array $dimensions = array())
-    {
-        $context = $this->contextFactory->create(array('workspaceName' => $workspaceName, 'dimensions' => $dimensions));
-        $rootNode = $context->getRootNode();
-
-        $this->traverseNodes($rootNode);
-
-        if ($dimensions === array()) {
-            $this->outputLine('Workspace "' . $workspaceName . '" without dimensions done. (Indexed ' . $this->indexedNodes . ' nodes)');
-        } else {
-            $this->outputLine('Workspace "' . $workspaceName . '" and dimensions "' . json_encode($dimensions) . '" done. (Indexed ' . $this->indexedNodes . ' nodes)');
-        }
-
-        $this->countedIndexedNodes = $this->countedIndexedNodes + $this->indexedNodes;
-        $this->indexedNodes = 0;
-    }
-
-    /**
-     * @param \TYPO3\TYPO3CR\Domain\Model\NodeInterface $currentNode
-     * @return void
-     */
-    protected function traverseNodes(\TYPO3\TYPO3CR\Domain\Model\NodeInterface $currentNode)
-    {
-        if ($this->limit !== null && $this->indexedNodes > $this->limit) {
-            return;
-        }
-
-        $this->nodeIndexingManager->indexNode($currentNode);
-        $this->indexedNodes++;
-
-        foreach ($currentNode->getChildNodes() as $childNode) {
-            $this->traverseNodes($childNode);
-        }
-    }
 }

Classes/Flowpack/ElasticSearch/ContentRepositoryAdaptor/Command/NodeIndexCommandController.php

@@ -1,15 +1,15 @@
 <?php
 namespace Flowpack\ElasticSearch\ContentRepositoryAdaptor\Command;
 
-/*                                                                                                  *
- * This script belongs to the TYPO3 Flow package "Flowpack.ElasticSearch.ContentRepositoryAdaptor". *
- *                                                                                                  *
- * It is free software; you can redistribute it and/or modify it under                              *
- * the terms of the GNU Lesser General Public License, either version 3                             *
- *  of the License, or (at your option) any later version.                                          *
- *                                                                                                  *
- * The TYPO3 project - inspiring people to share!                                                   *
- *                                                                                                  */
+/*
+ * 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 TYPO3\Flow\Annotations as Flow;
 use TYPO3\Flow\Cli\CommandController;
@@ -43,7 +43,7 @@ public function showCommand($nodeType = null)
             $configuration = $nodeType->getFullConfiguration();
         } else {
             $nodeTypes = $this->nodeTypeManager->getNodeTypes();
-            $configuration = array();
+            $configuration = [];
             /** @var \TYPO3\TYPO3CR\Domain\Model\NodeType $nodeType */
             foreach ($nodeTypes as $nodeTypeName => $nodeType) {
                 $configuration[$nodeTypeName] = $nodeType->getFullConfiguration();

Classes/Flowpack/ElasticSearch/ContentRepositoryAdaptor/Command/NodeTypeCommandController.php

@@ -1,15 +1,15 @@
 <?php
 namespace Flowpack\ElasticSearch\ContentRepositoryAdaptor\Eel;
 
-/*                                                                                                  *
- * This script belongs to the TYPO3 Flow package "Flowpack.ElasticSearch.ContentRepositoryAdaptor". *
- *                                                                                                  *
- * It is free software; you can redistribute it and/or modify it under                              *
- * the terms of the GNU Lesser General Public License, either version 3                             *
- *  of the License, or (at your option) any later version.                                          *
- *                                                                                                  *
- * The TYPO3 project - inspiring people to share!                                                   *
- *                                                                                                  */
+/*
+ * 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\Exception;
 use TYPO3\Flow\Persistence\QueryInterface;
@@ -30,6 +30,11 @@ class ElasticSearchQuery implements QueryInterface
      */
     protected static $runtimeQueryResultCache;
 
+    /**
+     * ElasticSearchQuery constructor.
+     *
+     * @param ElasticSearchQueryBuilder $elasticSearchQueryBuilder
+     */
     public function __construct(ElasticSearchQueryBuilder $elasticSearchQueryBuilder)
     {
         $this->queryBuilder = $elasticSearchQueryBuilder;
@@ -46,6 +51,7 @@ public function execute($cacheResult = false)
         }
         $queryResult = new ElasticSearchQueryResult($this);
         self::$runtimeQueryResultCache[$queryHash] = $queryResult;
+
         return $queryResult;
     }