TASK: restructure code a bit

sandstorm · Feb 2, 2021 · 89ca6a0 · 89ca6a0
1 parent 396790b
commit 89ca6a0
Show file tree

Hide file tree

Showing 10 changed files with 15 additions and 13 deletions.
diff --git a/Classes/Query/Aggregation/TermsAggregationBuilder.php b/Classes/Query/Aggregation/TermsAggregationBuilder.php
@@ -4,7 +4,7 @@
 namespace Sandstorm\LightweightElasticsearch\Query\Aggregation;
 
 use Neos\Flow\Annotations as Flow;
-use Sandstorm\LightweightElasticsearch\Query\SearchQueryBuilderInterface;
+use Sandstorm\LightweightElasticsearch\Query\Query\SearchQueryBuilderInterface;
 
 /**
  * A Terms aggregation can be used to build faceted search.

diff --git a/Classes/Query/AggregationRequestBuilder.php b/Classes/Query/AggregationRequestBuilder.php
@@ -8,6 +8,7 @@
 use Sandstorm\LightweightElasticsearch\Query\Aggregation\AggregationBuilderInterface;
 use Sandstorm\LightweightElasticsearch\Query\Aggregation\AggregationResultInterface;
 use Sandstorm\LightweightElasticsearch\Query\Aggregation\QueryErrorAggregationResult;
+use Sandstorm\LightweightElasticsearch\Query\Query\SearchQueryBuilderInterface;
 
 /**
  * Specialized request builder which can run a SINGLE top-level aggregation.

diff --git a/Classes/Query/ElasticsearchHelper.php b/Classes/Query/ElasticsearchHelper.php
@@ -18,6 +18,9 @@
 use Neos\ContentRepository\Domain\Model\NodeInterface;
 use Sandstorm\LightweightElasticsearch\Query\Aggregation\AggregationsBuilder;
 use Sandstorm\LightweightElasticsearch\Query\Aggregation\TermsAggregationBuilder;
+use Sandstorm\LightweightElasticsearch\Query\Query\BooleanQueryBuilder;
+use Sandstorm\LightweightElasticsearch\Query\Query\NeosFulltextQueryBuilder;
+use Sandstorm\LightweightElasticsearch\Query\Query\TermQueryBuilder;
 
 /**
  * Eel Helper to write search queries.

diff --git a/Classes/Query/BooleanQueryBuilder.php → Classes/Query/Query/BooleanQueryBuilder.php b/Classes/Query/BooleanQueryBuilder.php → Classes/Query/Query/BooleanQueryBuilder.php
@@ -1,7 +1,7 @@
 <?php
 declare(strict_types=1);
 
-namespace Sandstorm\LightweightElasticsearch\Query;
+namespace Sandstorm\LightweightElasticsearch\Query\Query;
 
 use Neos\Eel\ProtectedContextAwareInterface;
 use Neos\Flow\Annotations as Flow;

diff --git a/Classes/Query/NeosFulltextQueryBuilder.php → .../Query/Query/NeosFulltextQueryBuilder.php b/Classes/Query/NeosFulltextQueryBuilder.php → .../Query/Query/NeosFulltextQueryBuilder.php
@@ -1,7 +1,7 @@
 <?php
 
 
-namespace Sandstorm\LightweightElasticsearch\Query;
+namespace Sandstorm\LightweightElasticsearch\Query\Query;
 
 use Neos\Eel\ProtectedContextAwareInterface;
 use Neos\Flow\Annotations as Flow;

diff --git a/...ses/Query/SearchQueryBuilderInterface.php → ...ery/Query/SearchQueryBuilderInterface.php b/...ses/Query/SearchQueryBuilderInterface.php → ...ery/Query/SearchQueryBuilderInterface.php
@@ -1,8 +1,7 @@
 <?php
 
 
-namespace Sandstorm\LightweightElasticsearch\Query;
-
+namespace Sandstorm\LightweightElasticsearch\Query\Query;
 
 interface SearchQueryBuilderInterface
 {

diff --git a/Classes/Query/SimpleQueryStringBuilder.php → .../Query/Query/SimpleQueryStringBuilder.php b/Classes/Query/SimpleQueryStringBuilder.php → .../Query/Query/SimpleQueryStringBuilder.php
@@ -1,7 +1,7 @@
 <?php
+declare(strict_types=1);
 
-
-namespace Sandstorm\LightweightElasticsearch\Query;
+namespace Sandstorm\LightweightElasticsearch\Query\Query;
 
 use Neos\Flow\Annotations as Flow;
 

diff --git a/Classes/Query/TermQueryBuilder.php → Classes/Query/Query/TermQueryBuilder.php b/Classes/Query/TermQueryBuilder.php → Classes/Query/Query/TermQueryBuilder.php
@@ -1,8 +1,7 @@
 <?php
+declare(strict_types=1);
 
-
-namespace Sandstorm\LightweightElasticsearch\Query;
-
+namespace Sandstorm\LightweightElasticsearch\Query\Query;
 use Neos\Flow\Annotations as Flow;
 
 /**

diff --git a/Classes/Query/TermsQueryBuilder.php → Classes/Query/Query/TermsQueryBuilder.php b/Classes/Query/TermsQueryBuilder.php → Classes/Query/Query/TermsQueryBuilder.php
@@ -1,8 +1,7 @@
 <?php
+declare(strict_types=1);
 
-
-namespace Sandstorm\LightweightElasticsearch\Query;
-
+namespace Sandstorm\LightweightElasticsearch\Query\Query;
 use Neos\Flow\Annotations as Flow;
 
 /**

diff --git a/Classes/Query/SearchRequestBuilder.php b/Classes/Query/SearchRequestBuilder.php
@@ -5,6 +5,7 @@
 
 use Neos\Flow\Annotations as Flow;
 use Flowpack\ElasticSearch\Transfer\Exception\ApiException;
+use Sandstorm\LightweightElasticsearch\Query\Query\SearchQueryBuilderInterface;
 use Sandstorm\LightweightElasticsearch\Query\Result\SearchResult;