MERGE: Merge branch '2.0'

Author: kdambekalns

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

@@ -643,16 +643,17 @@ public function getFullElasticSearchHitForNode(NodeInterface $node)
      */
     public function fetch()
     {
+        $request = $this->getRequest();
         $timeBefore = microtime(true);
-        $response = $this->elasticSearchClient->getIndex()->request('GET', '/_search', array(), json_encode($this->request));
+        $response = $this->elasticSearchClient->getIndex()->request('GET', '/_search', array(), json_encode($request));
         $timeAfterwards = microtime(true);
 
         $this->result = $response->getTreatedContent();
 
         $this->result['nodes'] = array();
         if ($this->logThisQuery === true) {
             $this->logger->log(sprintf('Query Log (%s): %s -- execution time: %s ms -- Limit: %s -- Number of results returned: %s -- Total Results: %s',
-                $this->logMessage, json_encode($this->request), (($timeAfterwards - $timeBefore) * 1000), $this->limit, count($this->result['hits']['hits']), $this->result['hits']['total']), LOG_DEBUG);
+                $this->logMessage, json_encode($request), (($timeAfterwards - $timeBefore) * 1000), $this->limit, count($this->result['hits']['hits']), $this->result['hits']['total']), LOG_DEBUG);
         }
         if (array_key_exists('hits', $this->result) && is_array($this->result['hits']) && count($this->result['hits']) > 0) {
             $this->result['nodes'] = $this->convertHitsToNodes($this->result['hits']);
@@ -684,7 +685,7 @@ public function execute()
     public function count()
     {
         $timeBefore = microtime(true);
-        $request = $this->request;
+        $request = $this->getRequest();
         foreach ($this->unsupportedFieldsInCountRequest as $field) {
             if (isset($request[$field])) {
                 unset($request[$field]);
@@ -698,7 +699,7 @@ public function count()
         $count = $treatedContent['count'];
 
         if ($this->logThisQuery === true) {
-            $this->logger->log('Count Query Log (' . $this->logMessage . '): ' . json_encode($this->request) . ' -- execution time: ' . (($timeAfterwards - $timeBefore) * 1000) . ' ms -- Total Results: ' . $count, LOG_DEBUG);
+            $this->logger->log('Count Query Log (' . $this->logMessage . '): ' . json_encode($request) . ' -- execution time: ' . (($timeAfterwards - $timeBefore) * 1000) . ' ms -- Total Results: ' . $count, LOG_DEBUG);
         }
 
         return $count;

Classes/Flowpack/ElasticSearch/ContentRepositoryAdaptor/Eel/ElasticSearchQueryBuilder.php

@@ -255,4 +255,3 @@ public function allowsCallOfMethod($methodName)
         return true;
     }
 }
-

Classes/Flowpack/ElasticSearch/ContentRepositoryAdaptor/Eel/ElasticSearchQueryResult.php

@@ -137,7 +137,6 @@ public function getIndex()
     public function indexNode(NodeInterface $node, $targetWorkspaceName = null)
     {
         $indexer = function (NodeInterface $node, $targetWorkspaceName = null) {
-
             $contextPath = $node->getContextPath();
 
             if ($this->settings['indexAllWorkspaces'] === false) {
@@ -164,7 +163,7 @@ public function indexNode(NodeInterface $node, $targetWorkspaceName = null)
             $mappingType = $this->getIndex()->findType(NodeTypeMappingBuilder::convertNodeTypeNameToMappingName($nodeType));
 
             // Remove document with the same contextPathHash but different NodeType, required after NodeType change
-            $this->logger->log(sprintf('NodeIndexer: Removing node %s from index (if node type changed from %s). ID: %s', $contextPath, $node->getNodeType()->getName(), $contextPathHash), LOG_DEBUG, NULL, 'ElasticSearch (CR)');
+            $this->logger->log(sprintf('NodeIndexer: Removing node %s from index (if node type changed from %s). ID: %s', $contextPath, $node->getNodeType()->getName(), $contextPathHash), LOG_DEBUG, null, 'ElasticSearch (CR)');
             $this->getIndex()->request('DELETE', '/_query', array(), json_encode([
                 'query' => [
                     'bool' => [
@@ -273,11 +272,10 @@ public function indexNode(NodeInterface $node, $targetWorkspaceName = null)
         } else {
             $context = $this->contextFactory->create(array('workspaceName' => $workspaceName));
             $node = $context->getNodeByIdentifier($nodeIdentifier);
-            if ($node !== NULL) {
+            if ($node !== null) {
                 $indexer($node, $targetWorkspaceName);
             }
         }
-
     }
 
     /**

Classes/Flowpack/ElasticSearch/ContentRepositoryAdaptor/Indexer/NodeIndexer.php

@@ -45,7 +45,7 @@ class GetHitArrayForNodeViewHelper extends AbstractViewHelper
      * @param array|string $path
      * @return array
      */
-    public function render(ElasticSearchQueryResult $queryResultObject, NodeInterface $node, $path = NULL)
+    public function render(ElasticSearchQueryResult $queryResultObject, NodeInterface $node, $path = null)
     {
         $hitArray = $queryResultObject->searchHitForNode($node);
 

Classes/Flowpack/ElasticSearch/ContentRepositoryAdaptor/ViewHelpers/GetHitArrayForNodeViewHelper.php

@@ -212,7 +212,8 @@ Furthermore, the following operators are supported:
 * `greaterThanOrEqual('propertyName', value)` -- range filter with property values greater than or equal to the given value
 * `lessThan('propertyName', value)` -- range filter with property values less than the given value
 * `lessThanOrEqual('propertyName', value)` -- range filter with property values less than or equal to the given value
-* `sortAsc('propertyName')` and `sortDesc('propertyName')` -- can also be used multiple times, e.g. `sortAsc('tag').sortDesc(`date')` will first sort by tag ascending, and then by date descending.
+* `sortAsc('propertyName')` and `sortDesc('propertyName')` -- can also be used multiple times, e.g. `sortAsc('tag').sortDesc(`date')`
+   will first sort by tag ascending, and then by date descending.
 * `limit(5)` -- only return five results. If not specified, the default limit by Elasticsearch applies (which is at 10 by default)
 * `from(5)` -- return the results starting from the 6th one
 * `fulltext(...)` -- do a query_string query on the Fulltext Index
@@ -255,6 +256,18 @@ prototype(Acme.Blog:SingleTag) < prototype(TYPO3.Neos:Template) {
 }
 ```
 
+#### Making OR queries
+
+There's no OR operator provided in this package, so you need to use a custom Elasticsearch query filter for that:
+
+```
+....queryFilter('bool', {should: [
+	{term: {tags: tagNode.identifier}},
+	{term: {places: tagNode.identifier}},
+	{term: {projects: tagNode.identifier}}
+]})
+```
+
 ## Aggregations
 
 Aggregation is an easy way to aggregate your node data in different ways. Elasticsearch provides a couple of different types of
@@ -272,7 +285,9 @@ You can nest aggregations by providing a parent name.
 
 
 ### Examples
+
 #### Add a average aggregation
+
 To add an average aggregation you can use the fieldBasedAggregation. This snippet would add an average aggregation for
 a property price:
 ```
@@ -284,6 +299,7 @@ Now you can access your aggregations inside your fluid template with
 ```
 
 #### Create a nested aggregation
+
 In this scenario you could have a node that represents a product with the properties price and color. If you would like
 to know the average price for all your colors you just nest an aggregation in your TypoScript:
 ```
@@ -299,6 +315,7 @@ fieldBasedAggregation("anotherAggregation", "field", "avg", "colors.avgprice")
 ```
 
 #### Add a custom aggregation
+
 To add a custom aggregation you can use the `aggregation()` method. All you have to do is to provide an array with your
 aggregation definition. This example would do the same as the fieldBasedAggregation would do for you:
 ```
@@ -311,6 +328,7 @@ nodes = ${Search.query(site)...aggregation("color", this.aggregationDefinition).
 ```
 
 #### Product filter
+
 This is a more complex scenario. With this snippet we will create a full product filter based on your selected Nodes. Imagine
 an NodeTye ProductList with an property `products`. This property contains a comma separated list of sku's. This could also
 be a reference on other products.
@@ -356,8 +374,8 @@ be fetched and passed to your template.
 
 **Important notice**
 
-If you do use the terms filter be aware of Elasticsearchs analyze functionality. You might want to disable this for all
-your filterable properties like this:
+If you do use the terms filter be aware of Elasticsearchs analyze functionality for strings. You might want to disable this
+for all your filterable properties, or else filtering won't work on them properly:
 ```
 'Vendor.Name:Product'
   properties:
@@ -373,7 +391,7 @@ your filterable properties like this:
 
 ## Sorting
 
-This package adapts ElasticSearchs sorting capabilities. You can add multiple sort operations to your query.
+This package adapts Elasticsearchs sorting capabilities. You can add multiple sort operations to your query.
 Right now there are three methods you can use:
 
 * `sortAsc('propertyName')`
@@ -382,13 +400,16 @@ Right now there are three methods you can use:
 
 Just append those method to your query like this:
 ```
-# sort ascending by property title
+# Sort ascending by property title
+
 nodes = ${q(Search.query(site).....sortAsc("title").execute())}
 
-# sort for multiple properties
+# Sort for multiple properties
+
 nodes = ${q(Search.query(site).....sortAsc("title").sortDesc("name").execute())}
 
-# custom sort opertation
+# Custom sort operation
+
 geoSorting = TYPO3.TypoScript:RawArray {
     _geo_distance = TYPO3.TypoScript:RawArray {
         latlng = TYPO3.TypoScript:RawArray {
@@ -407,6 +428,7 @@ Check https://www.elastic.co/guide/en/elasticsearch/reference/current/search-req
 options.
 
 ### Example with pagination and sort by distance
+
 This is how a more complex example could look like. Imagine you a want to render a list of nodes and in addition to each
 node you want to display the distance to a specific point.
 
@@ -454,6 +476,7 @@ The ViewHelper will use \TYPO3\Flow\Utility\Arrays::getValueByPath() to return a
 of an array or a string. Check the documentation \TYPO3\Flow\Utility\Arrays::getValueByPath() for more informations.
 
 **Important notice**
+
 The ViewHelper GetHitArrayForNode will return the raw hit result array. The path poperty allows you to access some
 specific data like the the sort data. If there is only one value for your path the value will be returned.
 If there is more data the full array will be returned by GetHitArrayForNode-VH. So you might have to use the
@@ -489,26 +512,30 @@ Elasticsearch offers an easy way to get query suggestions based on your query. C
 you can build and use suggestion in your search.
 
 **Suggestion methods implemented**
-There are two methods implemented. `suggestions` is a generic one that allows to build the suggestion query of your 
-dreams. The other method is `termSuggestions` and is meant for basic term suggestions. They can be added to your totaly 
+
+There are two methods implemented. `suggestions` is a generic one that allows to build the suggestion query of your
+dreams. The other method is `termSuggestions` and is meant for basic term suggestions. They can be added to your totaly
 awesome TS search query.
-   
+
 * `suggestions($name, array $suggestionDefinition)` -- generic method to be filled with your own suggestionQuery
 * `termSuggestions($term, $field = '_all', $name = 'suggestions'` -- simple term suggestion query on all fields
 
 ### Examples
+
 #### Add a simple suggestion to a query
+
 Simple suggestion that returns a suggestion based on the sent term
 
 ```
 suggestions = $(Search.query(site)...termSuggestions('someTerm')}
 ```
-You can access your suggestions inside your fluid template with 
+You can access your suggestions inside your fluid template with
 ```
 {nodes.suggestions}
 ```
 
 ### Add a custom suggestion
+
 Phrase query that returns query suggestions
 
 ```
@@ -529,7 +556,8 @@ suggestions = ${Search.query(site)...suggestions('my_suggestions', this.suggesti
 
 ## Advanced: Configuration of Indexing
 
-**Normally, this does not need to be touched, as this package supports all Neos data types natively.**
+**The default configuration supports most usecases and often may not need to be touched, as this package comes
+with sane defaults for all Neos data types.**
 
 Indexing of properties is configured at two places. The defaults per-data-type are configured
 inside `TYPO3.TYPO3CR.Search.defaultConfigurationPerType` of `Settings.yaml`.
@@ -575,6 +603,9 @@ TYPO3:
         indexing: '${(node.hiddenBeforeDateTime ? Date.format(node.hiddenBeforeDateTime, "Y-m-d\TH:i:sP") : null)}'
 ```
 
+If your nodetypes schema defines custom properties of type DateTime, you have got to provide similar configuration for
+them as well in your `NodeTypes.yaml`, or else they will not be indexed correctly.
+
 There are a few indexing helpers inside the `Indexing` namespace which are usable inside the
 `indexing` expression. In most cases, you don't need to touch this, but they were needed to build up
 the standard indexing configuration:
@@ -647,6 +678,12 @@ currently configured in PHP, the configuration for any property in a node which
 This is important so that Date- and Time-based searches work as expected, both when using formatted DateTime strings and
 when using relative DateTime calculations (eg.: `now`, `now+1d`).
 
+If you want to filter items by date, e.g. to show items with date later than today, you can create a query like this:
+
+```
+${...greaterThan('date', Date.format(Date.Now(), "Y-m-d\TH:i:sP"))...}
+```
+
 For more information on Elasticsearch's Date Formats,
 [click here](http://www.elastic.co/guide/en/elasticsearch/reference/current/mapping-date-format.html).
 

README.md

@@ -14,6 +14,7 @@
 use Flowpack\ElasticSearch\ContentRepositoryAdaptor\Command\NodeIndexCommandController;
 use Flowpack\ElasticSearch\ContentRepositoryAdaptor\Eel\ElasticSearchQueryBuilder;
 use Flowpack\ElasticSearch\ContentRepositoryAdaptor\Eel\ElasticSearchQueryResult;
+use TYPO3\Flow\Persistence\QueryResultInterface;
 use TYPO3\TYPO3CR\Domain\Model\NodeInterface;
 use TYPO3\TYPO3CR\Domain\Model\Workspace;
 use TYPO3\TYPO3CR\Domain\Repository\NodeDataRepository;
@@ -67,19 +68,20 @@ class ElasticSearchQueryTest extends \TYPO3\Flow\Tests\FunctionalTestCase
      */
     protected $nodeDataRepository;
 
-
+    /**
+     * @var boolean
+     */
     protected static $indexInitialized = false;
 
-
     public function setUp()
     {
         parent::setUp();
-        $this->workspaceRepository = $this->objectManager->get('TYPO3\TYPO3CR\Domain\Repository\WorkspaceRepository');
+        $this->workspaceRepository = $this->objectManager->get(WorkspaceRepository::class);
         $liveWorkspace = new Workspace('live');
         $this->workspaceRepository->add($liveWorkspace);
 
-        $this->nodeTypeManager = $this->objectManager->get('TYPO3\TYPO3CR\Domain\Service\NodeTypeManager');
-        $this->contextFactory = $this->objectManager->get('TYPO3\TYPO3CR\Domain\Service\ContextFactoryInterface');
+        $this->nodeTypeManager = $this->objectManager->get(NodeTypeManager::class);
+        $this->contextFactory = $this->objectManager->get(ContextFactoryInterface::class);
         $this->context = $this->contextFactory->create([
             'workspaceName' => 'live',
             'dimensions' => ['language' => ['en_US']],
@@ -90,9 +92,9 @@ public function setUp()
         $this->siteNode = $rootNode->createNode('welcome', $this->nodeTypeManager->getNodeType('TYPO3.Neos.NodeTypes:Page'));
         $this->siteNode->setProperty('title', 'welcome');
 
-        $this->nodeDataRepository = $this->objectManager->get('TYPO3\TYPO3CR\Domain\Repository\NodeDataRepository');
+        $this->nodeDataRepository = $this->objectManager->get(NodeDataRepository::class);
 
-        $this->nodeIndexCommandController = $this->objectManager->get('Flowpack\ElasticSearch\ContentRepositoryAdaptor\Command\NodeIndexCommandController');
+        $this->nodeIndexCommandController = $this->objectManager->get(NodeIndexCommandController::class);
 
         $this->createNodesForNodeSearchTest();
     }
@@ -104,12 +106,13 @@ public function tearDown()
     }
 
     /**
-     * @return \Flowpack\ElasticSearch\ContentRepositoryAdaptor\Eel\ElasticSearchQueryBuilder
+     * @return ElasticSearchQueryBuilder
      */
     protected function getQueryBuilder()
     {
         /** @var ElasticSearchQueryBuilder $query */
-        $query = $this->objectManager->get('Flowpack\ElasticSearch\ContentRepositoryAdaptor\Eel\ElasticSearchQueryBuilder');
+        $query = $this->objectManager->get(ElasticSearchQueryBuilder::class);
+
         return $query->query($this->siteNode);
     }
 
@@ -221,9 +224,9 @@ public function nodesWillBeSortedDesc()
             ->sortDesc('title')
             ->execute();
 
-        /** @var \TYPO3\Flow\Persistence\QueryResultInterface $result $node */
+        /** @var QueryResultInterface $result $node */
 
-        $this->assertInstanceOf(\TYPO3\Flow\Persistence\QueryResultInterface::class, $result);
+        $this->assertInstanceOf(QueryResultInterface::class, $result);
         $this->assertCount(3, $result, 'The result should have 3 items');
         $this->assertEquals(3, $result->count(), 'Count should be 3');
 

Tests/Functional/Eel/ElasticSearchQueryTest.php

@@ -11,6 +11,7 @@
  * The TYPO3 project - inspiring people to share!                                                   *
  *                                                                                                  */
 
+use Flowpack\ElasticSearch\ContentRepositoryAdaptor\Eel\ElasticSearchQuery;
 use Flowpack\ElasticSearch\ContentRepositoryAdaptor\Eel\ElasticSearchQueryBuilder;
 use Flowpack\ElasticSearch\ContentRepositoryAdaptor\Eel\ElasticSearchQueryResult;
 
@@ -25,14 +26,14 @@ class ElasticSearchQueryBuilderResultTest extends \TYPO3\Flow\Tests\UnitTestCase
      */
     public function ifNoAggregationsAreSetInTheQueyBuilderResultAnEmptyArrayWillBeReturnedIfYouFetchTheAggregations()
     {
-        $resultArrayWithoutAggregations = array(
-            "nodes" => array("some", "nodes")
-        );
+        $resultArrayWithoutAggregations = [
+            "nodes" => ["some", "nodes"]
+        ];
 
-        $queryBuilder = $this->getMock(ElasticSearchQueryBuilder::class, array("fetch"));
+        $queryBuilder = $this->getMockBuilder(ElasticSearchQueryBuilder::class)->setMethods(["fetch"])->getMock();
         $queryBuilder->method("fetch")->will($this->returnValue($resultArrayWithoutAggregations));
 
-        $esQuery = new \Flowpack\ElasticSearch\ContentRepositoryAdaptor\Eel\ElasticSearchQuery($queryBuilder);
+        $esQuery = new ElasticSearchQuery($queryBuilder);
 
         $queryResult = new ElasticSearchQueryResult($esQuery);
 
@@ -41,4 +42,4 @@ public function ifNoAggregationsAreSetInTheQueyBuilderResultAnEmptyArrayWillBeRe
         $this->assertTrue(is_array($actual));
         $this->assertEmpty($actual);
     }
-}
+}