TASK: Clean up code

kdambekalns · kdambekalns · commit 0c3ddf27c750 · 2019-03-12T11:12:55.000+01:00
- tweak use statement order
- whitespace fixes
diff --git a/Classes/Command/NodeIndexCommandController.php b/Classes/Command/NodeIndexCommandController.php
@@ -11,8 +11,8 @@
  * source code.
  */
 
-use Flowpack\ElasticSearch\ContentRepositoryAdaptor\Indexer\Error\ErrorInterface;
 use Flowpack\ElasticSearch\ContentRepositoryAdaptor\Driver\NodeTypeMappingBuilderInterface;
+use Flowpack\ElasticSearch\ContentRepositoryAdaptor\Indexer\Error\ErrorInterface;
 use Flowpack\ElasticSearch\ContentRepositoryAdaptor\LoggerInterface;
 use Flowpack\ElasticSearch\ContentRepositoryAdaptor\Service\ErrorHandlingService;
 use Flowpack\ElasticSearch\ContentRepositoryAdaptor\Service\IndexWorkspaceTrait;
diff --git a/Classes/Driver/AbstractIndexerDriver.php b/Classes/Driver/AbstractIndexerDriver.php
@@ -11,8 +11,8 @@
  * source code.
  */
 
-use Neos\Flow\Annotations as Flow;
 use Neos\ContentRepository\Domain\Model\NodeInterface;
+use Neos\Flow\Annotations as Flow;
 
 /**
  * Abstract Fulltext Indexer Driver
diff --git a/Classes/Driver/AbstractNodeTypeMappingBuilder.php b/Classes/Driver/AbstractNodeTypeMappingBuilder.php
@@ -14,8 +14,8 @@
 use Neos\ContentRepository\Domain\Service\NodeTypeManager;
 use Neos\Error\Messages\Result;
 use Neos\Flow\Annotations as Flow;
-use Neos\Flow\Configuration\Exception\InvalidConfigurationTypeException;
 use Neos\Flow\Configuration\ConfigurationManager;
+use Neos\Flow\Configuration\Exception\InvalidConfigurationTypeException;
 use Neos\Flow\ObjectManagement\ObjectManagerInterface;
 
 /**
diff --git a/Classes/Driver/AbstractQuery.php b/Classes/Driver/AbstractQuery.php
@@ -121,7 +121,7 @@ public function moreLikeThis(array $like, array $fields = [], $options = [])
         if (!empty($fields)) {
             $moreLikeThis['fields'] = $fields;
         }
-        
+
         $this->appendAtPath('query.bool.filter.bool.must', ['more_like_this' => $moreLikeThis]);
     }
 
diff --git a/Classes/Driver/QueryInterface.php b/Classes/Driver/QueryInterface.php
@@ -96,8 +96,8 @@ public function highlight($fragmentSize, $fragmentCount = null);
      * @param array $aggregationDefinition
      * @param string $parentPath ParentPath to define the parent of a sub aggregation
      * @return void
-     * @api
      * @throws Exception\QueryBuildingException
+     * @api
      */
     public function aggregation($name, array $aggregationDefinition, $parentPath = '');
 
diff --git a/Classes/Driver/RequestDriverInterface.php b/Classes/Driver/RequestDriverInterface.php
@@ -10,6 +10,7 @@
  * information, please view the LICENSE file which was distributed with this
  * source code.
  */
+
 use Flowpack\ElasticSearch\Domain\Model\Index;
 
 /**
diff --git a/Classes/Driver/Version5/DocumentDriver.php b/Classes/Driver/Version5/DocumentDriver.php
@@ -11,13 +11,13 @@
  * source code.
  */
 
-use Neos\Flow\Annotations as Flow;
 use Flowpack\ElasticSearch\ContentRepositoryAdaptor\Driver\AbstractDriver;
 use Flowpack\ElasticSearch\ContentRepositoryAdaptor\Driver\DocumentDriverInterface;
 use Flowpack\ElasticSearch\ContentRepositoryAdaptor\Driver\NodeTypeMappingBuilderInterface;
 use Flowpack\ElasticSearch\Domain\Model\Index;
 use Neos\ContentRepository\Domain\Model\NodeInterface;
 use Neos\ContentRepository\Domain\Model\NodeType;
+use Neos\Flow\Annotations as Flow;
 
 /**
  * Document driver for Elasticsearch version 5.x
diff --git a/Classes/Driver/Version5/IndexDriver.php b/Classes/Driver/Version5/IndexDriver.php
@@ -11,10 +11,10 @@
  * source code.
  */
 
-use Neos\Flow\Annotations as Flow;
 use Flowpack\ElasticSearch\ContentRepositoryAdaptor\Driver\AbstractDriver;
 use Flowpack\ElasticSearch\ContentRepositoryAdaptor\Driver\IndexDriverInterface;
 use Flowpack\ElasticSearch\ContentRepositoryAdaptor\Exception;
+use Neos\Flow\Annotations as Flow;
 
 /**
  * Index management driver for Elasticsearch version 5.x
diff --git a/Classes/Driver/Version5/IndexerDriver.php b/Classes/Driver/Version5/IndexerDriver.php
@@ -11,11 +11,11 @@
  * source code.
  */
 
+use Flowpack\ElasticSearch\ContentRepositoryAdaptor\Driver\AbstractIndexerDriver;
+use Flowpack\ElasticSearch\ContentRepositoryAdaptor\Driver\IndexerDriverInterface;
 use Flowpack\ElasticSearch\Domain\Model\Document as ElasticSearchDocument;
 use Neos\ContentRepository\Domain\Model\NodeInterface;
 use Neos\Flow\Annotations as Flow;
-use Flowpack\ElasticSearch\ContentRepositoryAdaptor\Driver\AbstractIndexerDriver;
-use Flowpack\ElasticSearch\ContentRepositoryAdaptor\Driver\IndexerDriverInterface;
 
 /**
  * Indexer driver for Elasticsearch version 5.x
diff --git a/Classes/Driver/Version5/Mapping/NodeTypeMappingBuilder.php b/Classes/Driver/Version5/Mapping/NodeTypeMappingBuilder.php
@@ -11,14 +11,14 @@
  * source code.
  */
 
-use Neos\Flow\Annotations as Flow;
 use Flowpack\ElasticSearch\ContentRepositoryAdaptor\Driver\AbstractNodeTypeMappingBuilder;
 use Flowpack\ElasticSearch\Domain\Model\Index;
 use Flowpack\ElasticSearch\Domain\Model\Mapping;
 use Flowpack\ElasticSearch\Mapping\MappingCollection;
 use Neos\ContentRepository\Domain\Model\NodeType;
 use Neos\Error\Messages\Result;
 use Neos\Error\Messages\Warning;
+use Neos\Flow\Annotations as Flow;
 use Neos\Flow\Configuration\Exception\InvalidConfigurationTypeException;
 use Neos\Flow\ObjectManagement\ObjectManagerInterface;
 
diff --git a/Classes/Driver/Version5/Query/FilteredQuery.php b/Classes/Driver/Version5/Query/FilteredQuery.php
@@ -12,7 +12,6 @@
  */
 
 use Flowpack\ElasticSearch\ContentRepositoryAdaptor\Driver\AbstractQuery;
-use Flowpack\ElasticSearch\ContentRepositoryAdaptor\Exception;
 use Flowpack\ElasticSearch\ContentRepositoryAdaptor\Exception\QueryBuildingException;
 
 /**
diff --git a/Classes/Driver/Version5/RequestDriver.php b/Classes/Driver/Version5/RequestDriver.php
@@ -11,10 +11,10 @@
  * source code.
  */
 
-use Neos\Flow\Annotations as Flow;
 use Flowpack\ElasticSearch\ContentRepositoryAdaptor\Driver\AbstractDriver;
 use Flowpack\ElasticSearch\ContentRepositoryAdaptor\Driver\RequestDriverInterface;
 use Flowpack\ElasticSearch\Domain\Model\Index;
+use Neos\Flow\Annotations as Flow;
 
 /**
  * Request driver for Elasticsearch version 5.x
diff --git a/Classes/Driver/Version5/SystemDriver.php b/Classes/Driver/Version5/SystemDriver.php
@@ -11,9 +11,9 @@
  * source code.
  */
 
-use Neos\Flow\Annotations as Flow;
 use Flowpack\ElasticSearch\ContentRepositoryAdaptor\Driver\AbstractDriver;
 use Flowpack\ElasticSearch\ContentRepositoryAdaptor\Driver\SystemDriverInterface;
+use Neos\Flow\Annotations as Flow;
 
 /**
  * System driver for Elasticsearch version 5.x
diff --git a/Classes/Eel/ElasticSearchQueryBuilder.php b/Classes/Eel/ElasticSearchQueryBuilder.php
@@ -11,7 +11,6 @@
  * source code.
  */
 
-use Neos\Flow\Annotations as Flow;
 use Flowpack\ElasticSearch\ContentRepositoryAdaptor\Driver\QueryInterface;
 use Flowpack\ElasticSearch\ContentRepositoryAdaptor\Dto\SearchResult;
 use Flowpack\ElasticSearch\ContentRepositoryAdaptor\ElasticSearchClient;
@@ -22,6 +21,7 @@
 use Neos\ContentRepository\Domain\Model\NodeInterface;
 use Neos\ContentRepository\Search\Search\QueryBuilderInterface;
 use Neos\Eel\ProtectedContextAwareInterface;
+use Neos\Flow\Annotations as Flow;
 use Neos\Flow\ObjectManagement\ObjectManagerInterface;
 use Neos\Flow\Utility\Now;
 use Neos\Utility\Arrays;
@@ -234,8 +234,8 @@ public function from($from)
      * @param string $propertyName Name of the property
      * @param mixed $value Value for comparison
      * @return ElasticSearchQueryBuilder
-     * @api
      * @throws QueryBuildingException
+     * @api
      */
     public function exactMatch($propertyName, $value)
     {
@@ -290,8 +290,8 @@ public function greaterThanOrEqual($propertyName, $value, string $clauseType = '
      * @param mixed $value Value for comparison
      * @param string $clauseType one of must, should, must_not
      * @return ElasticSearchQueryBuilder
-     * @api
      * @throws QueryBuildingException
+     * @api
      */
     public function lessThan($propertyName, $value, string $clauseType = 'must')
     {
@@ -323,8 +323,8 @@ public function lessThanOrEqual($propertyName, $value, string $clauseType = 'mus
      * @param string $filterType
      * @param mixed $filterOptions
      * @param string $clauseType one of must, should, must_not
-     * @throws QueryBuildingException
      * @return ElasticSearchQueryBuilder
+     * @throws QueryBuildingException
      * @api
      */
     public function queryFilter($filterType, $filterOptions, string $clauseType = 'must')
@@ -341,8 +341,8 @@ public function queryFilter($filterType, $filterOptions, string $clauseType = 'm
      *
      * @param string $path
      * @param array $data
-     * @throws QueryBuildingException
      * @return ElasticSearchQueryBuilder
+     * @throws QueryBuildingException
      */
     public function appendAtPath($path, array $data)
     {
@@ -369,8 +369,8 @@ public function appendAtPath($path, array $data)
      * @param array $data An associative array of keys as variable names and values as variable values
      * @param string $clauseType one of must, should, must_not
      * @return ElasticSearchQueryBuilder
-     * @api
      * @throws QueryBuildingException
+     * @api
      */
     public function queryFilterMultiple($data, $clauseType = 'must')
     {
@@ -644,8 +644,8 @@ public function executeUncached()
      * Return the total number of hits for the query.
      *
      * @return integer
-     * @api
      * @throws \Flowpack\ElasticSearch\Exception
+     * @api
      */
     public function count()
     {
@@ -757,8 +757,8 @@ public function moreLikeThis($like, array $fields = [], array $options = [])
      *
      * @param NodeInterface $contextNode
      * @return QueryBuilderInterface
-     * @api
      * @throws QueryBuildingException
+     * @api
      */
     public function query(NodeInterface $contextNode)
     {
diff --git a/Classes/Factory/NodeTypeMappingBuilderFactory.php b/Classes/Factory/NodeTypeMappingBuilderFactory.php
@@ -11,8 +11,8 @@
  * source code.
  */
 
-use Flowpack\ElasticSearch\ContentRepositoryAdaptor\Exception\DriverConfigurationException;
 use Flowpack\ElasticSearch\ContentRepositoryAdaptor\Driver\NodeTypeMappingBuilderInterface;
+use Flowpack\ElasticSearch\ContentRepositoryAdaptor\Exception\DriverConfigurationException;
 use Neos\Flow\Annotations as Flow;
 
 /**
diff --git a/Classes/Service/IndexWorkspaceTrait.php b/Classes/Service/IndexWorkspaceTrait.php
@@ -11,8 +11,8 @@
  * source code.
  */
 
-use Neos\Flow\Annotations as Flow;
 use Neos\ContentRepository\Domain\Model\NodeInterface;
+use Neos\Flow\Annotations as Flow;
 
 /**
  * Index Workspace Trait
diff --git a/Configuration/Settings.yaml b/Configuration/Settings.yaml
@@ -12,21 +12,21 @@ Flowpack:
                   query:
                     bool:
                       must:
-                      - match_all:
-                          boost: 1.0 # force match_all to be an object
+                        - match_all:
+                            boost: 1.0 # force match_all to be an object
                       filter:
                         bool:
                           must: []
                           should: []
                           must_not:
-                          - term:
-                              _hidden: true
-                          - range:
-                              _hiddenBeforeDateTime:
-                                gt: now
-                          - range:
-                              _hiddenAfterDateTime:
-                                lt: now
+                            - term:
+                                _hidden: true
+                            - range:
+                                _hiddenBeforeDateTime:
+                                  gt: now
+                            - range:
+                                _hiddenAfterDateTime:
+                                  lt: now
                   _source:
                     - '__path'
                 unsupportedFieldsInCountRequest:
diff --git a/Tests/Functional/Eel/ElasticSearchQueryTest.php b/Tests/Functional/Eel/ElasticSearchQueryTest.php
@@ -15,19 +15,18 @@
 use Flowpack\ElasticSearch\ContentRepositoryAdaptor\Eel\ElasticSearchQueryBuilder;
 use Flowpack\ElasticSearch\ContentRepositoryAdaptor\Eel\ElasticSearchQueryResult;
 use Flowpack\ElasticSearch\ContentRepositoryAdaptor\Exception\QueryBuildingException;
-use Neos\ContentRepository\Exception\NodeExistsException;
-use Neos\ContentRepository\Exception\NodeTypeNotFoundException;
-use Neos\Flow\Mvc\Exception\StopActionException;
-use Neos\Flow\Persistence\QueryResultInterface;
-use Neos\Flow\Tests\FunctionalTestCase;
 use Neos\ContentRepository\Domain\Model\NodeInterface;
 use Neos\ContentRepository\Domain\Model\Workspace;
 use Neos\ContentRepository\Domain\Repository\NodeDataRepository;
 use Neos\ContentRepository\Domain\Repository\WorkspaceRepository;
 use Neos\ContentRepository\Domain\Service\Context;
 use Neos\ContentRepository\Domain\Service\ContextFactoryInterface;
 use Neos\ContentRepository\Domain\Service\NodeTypeManager;
-use Neos\ContentRepository\Search\Search\QueryBuilderInterface;
+use Neos\ContentRepository\Exception\NodeExistsException;
+use Neos\ContentRepository\Exception\NodeTypeNotFoundException;
+use Neos\Flow\Mvc\Exception\StopActionException;
+use Neos\Flow\Persistence\QueryResultInterface;
+use Neos\Flow\Tests\FunctionalTestCase;
 
 class ElasticSearchQueryTest extends FunctionalTestCase
 {
@@ -369,6 +368,7 @@ protected function getLogMessagePrefix($method)
 
     /**
      * Creates some sample nodes to run tests against
+     *
      * @throws NodeExistsException
      * @throws NodeTypeNotFoundException
      * @throws StopActionException
@@ -398,7 +398,6 @@ protected function createNodesForNodeSearchTest()
         $newDocumentNode3->setProperty('title', 'egg');
         $newDocumentNode3->setProperty('title_analyzed', 'egg');
 
-
         $dimensionContext = $this->contextFactory->create([
             'workspaceName' => 'live',
             'dimensions' => ['language' => ['de']]
diff --git a/Tests/Unit/Eel/ElasticSearchQueryBuilderTest.php b/Tests/Unit/Eel/ElasticSearchQueryBuilderTest.php
@@ -13,10 +13,10 @@
 
 use Flowpack\ElasticSearch\ContentRepositoryAdaptor\Driver\Version5\Query\FilteredQuery;
 use Flowpack\ElasticSearch\ContentRepositoryAdaptor\Eel\ElasticSearchQueryBuilder;
-use Neos\Flow\Tests\UnitTestCase;
 use Neos\ContentRepository\Domain\Model\NodeInterface;
 use Neos\ContentRepository\Domain\Model\Workspace;
 use Neos\ContentRepository\Domain\Service\Context;
+use Neos\Flow\Tests\UnitTestCase;
 
 /**
  * Testcase for ElasticSearchQueryBuilder

Original file line number	Diff line number	Diff line change
`@@ -121,7 +121,7 @@ public function moreLikeThis(array $like, array $fields = [], $options = [])`
`121`	`121`	`if (!empty($fields)) {`
`122`	`122`	`$moreLikeThis['fields'] = $fields;`
`123`	`123`	`}`
`124`		`-`
	`124`	`+`
`125`	`125`	`$this->appendAtPath('query.bool.filter.bool.must', ['more_like_this' => $moreLikeThis]);`
`126`	`126`	`}`
`127`	`127`