refactor: rename Select to Search

src/Console/Command/Search.php

@@ -5,10 +5,10 @@
 namespace Atoolo\Search\Console\Command;
 
 use Atoolo\Search\Console\Command\Io\TypifiedInput;
-use Atoolo\Search\Dto\Search\Query\SelectQuery;
-use Atoolo\Search\Dto\Search\Query\SelectQueryBuilder;
+use Atoolo\Search\Dto\Search\Query\SearchQuery;
+use Atoolo\Search\Dto\Search\Query\SearchQueryBuilder;
 use Atoolo\Search\Dto\Search\Result\SearchResult;
-use Atoolo\Search\Service\Search\SolrSelect;
+use Atoolo\Search\Service\Search\SolrSearch;
 use Symfony\Component\Console\Attribute\AsCommand;
 use Symfony\Component\Console\Command\Command;
 use Symfony\Component\Console\Input\InputArgument;
@@ -26,7 +26,7 @@ class Search extends Command
     private TypifiedInput $input;
 
     public function __construct(
-        private readonly SolrSelect $searcher
+        private readonly SolrSearch $searcher
     ) {
         parent::__construct();
     }
@@ -60,16 +60,16 @@ protected function execute(
 
         $query = $this->buildQuery($input);
 
-        $result = $this->searcher->select($query);
+        $result = $this->searcher->search($query);
 
         $this->outputResult($result);
 
         return Command::SUCCESS;
     }
 
-    protected function buildQuery(InputInterface $input): SelectQuery
+    protected function buildQuery(InputInterface $input): SearchQuery
     {
-        $builder = new SelectQueryBuilder();
+        $builder = new SearchQueryBuilder();
 
         $text = $this->input->getStringArgument('text');
         $builder->text($text);

src/Console/Command/Suggest.php

@@ -62,7 +62,7 @@ protected function execute(
 
         $query = $this->buildQuery($terms, $lang);
 
-        $result = $this->search->suggest($query);
+        $result = $this->search->search($query);
 
         $this->outputResult($result);
 

src/Dto/Search/Query/SelectQuery.php → src/Dto/Search/Query/SearchQuery.php

@@ -11,14 +11,14 @@
 /**
  * @codeCoverageIgnore
  */
-class SelectQuery
+class SearchQuery
 {
     /**
      * @param Criteria[] $sort
      * @param Filter[] $filter
      * @param Facet[] $facets
      * @internal Do not use the constructor directly,
-     *  but the SelectQueryBuilder
+     *  but the SearchQueryBuilder
      */
     public function __construct(
         public readonly string $text,

src/Dto/Search/Query/SelectQueryBuilder.php → src/Dto/Search/Query/SearchQueryBuilder.php

@@ -8,7 +8,7 @@
 use Atoolo\Search\Dto\Search\Query\Filter\Filter;
 use Atoolo\Search\Dto\Search\Query\Sort\Criteria;
 
-class SelectQueryBuilder
+class SearchQueryBuilder
 {
     private string $text = '';
     private string $lang = '';
@@ -132,9 +132,9 @@ public function defaultQueryOperator(
         return $this;
     }
 
-    public function build(): SelectQuery
+    public function build(): SearchQuery
     {
-        return new SelectQuery(
+        return new SearchQuery(
             $this->text,
             $this->lang,
             $this->offset,

src/MoreLikeThisSearcher.php → src/MoreLikeThis.php

@@ -18,7 +18,7 @@
  *
  * The reference point is specified via the location of a resource.
  */
-interface MoreLikeThisSearcher
+interface MoreLikeThis
 {
     public function moreLikeThis(
         MoreLikeThisQuery $query

src/SelectSearcher.php → src/Searcher.php

@@ -4,13 +4,13 @@
 
 namespace Atoolo\Search;
 
-use Atoolo\Search\Dto\Search\Query\SelectQuery;
+use Atoolo\Search\Dto\Search\Query\SearchQuery;
 use Atoolo\Search\Dto\Search\Result\SearchResult;
 
 /**
  * The service interface for a search with full-text, filter and facet support.
  */
-interface SelectSearcher
+interface Searcher
 {
-    public function select(SelectQuery $query): SearchResult;
+    public function search(SearchQuery $query): SearchResult;
 }

src/Service/Search/SolrMoreLikeThis.php

@@ -6,7 +6,7 @@
 
 use Atoolo\Search\Dto\Search\Query\MoreLikeThisQuery;
 use Atoolo\Search\Dto\Search\Result\SearchResult;
-use Atoolo\Search\MoreLikeThisSearcher;
+use Atoolo\Search\MoreLikeThis;
 use Atoolo\Search\Service\IndexName;
 use Atoolo\Search\Service\SolrClientFactory;
 use Solarium\Core\Client\Client;
@@ -16,7 +16,7 @@
 /**
  * Implementation of the "More-Like-This" on the basis of a Solr index.
  */
-class SolrMoreLikeThis implements MoreLikeThisSearcher
+class SolrMoreLikeThis implements MoreLikeThis
 {
     public function __construct(
         private readonly IndexName $index,

src/Service/Search/SolrSelect.php → src/Service/Search/SolrSearch.php

@@ -9,7 +9,7 @@
 use Atoolo\Search\Dto\Search\Query\Facet\FacetQuery;
 use Atoolo\Search\Dto\Search\Query\Filter\Filter;
 use Atoolo\Search\Dto\Search\Query\QueryOperator;
-use Atoolo\Search\Dto\Search\Query\SelectQuery;
+use Atoolo\Search\Dto\Search\Query\SearchQuery;
 use Atoolo\Search\Dto\Search\Query\Sort\Criteria;
 use Atoolo\Search\Dto\Search\Query\Sort\Date;
 use Atoolo\Search\Dto\Search\Query\Sort\Headline;
@@ -19,7 +19,7 @@
 use Atoolo\Search\Dto\Search\Result\Facet;
 use Atoolo\Search\Dto\Search\Result\FacetGroup;
 use Atoolo\Search\Dto\Search\Result\SearchResult;
-use Atoolo\Search\SelectSearcher;
+use Atoolo\Search\Searcher;
 use Atoolo\Search\Service\IndexName;
 use Atoolo\Search\Service\SolrClientFactory;
 use InvalidArgumentException;
@@ -31,7 +31,7 @@
 /**
  * Implementation of the searcher on the basis of a Solr index.
  */
-class SolrSelect implements SelectSearcher
+class SolrSearch implements Searcher
 {
     /**
      * @param iterable<SolrQueryModifier> $solrQueryModifierList
@@ -44,7 +44,7 @@ public function __construct(
     ) {
     }
 
-    public function select(SelectQuery $query): SearchResult
+    public function search(SearchQuery $query): SearchResult
     {
         $index = $this->index->name($query->lang);
         $client = $this->clientFactory->create($index);
@@ -57,7 +57,7 @@ public function select(SelectQuery $query): SearchResult
 
     private function buildSolrQuery(
         Client $client,
-        SelectQuery $query
+        SearchQuery $query
     ): SolrSelectQuery {
 
         $solrQuery = $client->createSelect();
@@ -245,7 +245,7 @@ private function addFacetMultiQueryToSolrQuery(
     }
 
     private function buildResult(
-        SelectQuery $query,
+        SearchQuery $query,
         SelectResult $result,
         string $lang
     ): SearchResult {
@@ -268,7 +268,7 @@ private function buildResult(
      * @return FacetGroup[]
      */
     private function buildFacetGroupList(
-        SelectQuery $query,
+        SearchQuery $query,
         SelectResult $result
     ): array {
 

src/Service/Search/SolrSuggest.php

@@ -10,7 +10,7 @@
 use Atoolo\Search\Exception\UnexpectedResultException;
 use Atoolo\Search\Service\IndexName;
 use Atoolo\Search\Service\SolrClientFactory;
-use Atoolo\Search\SuggestSearcher;
+use Atoolo\Search\Suggest;
 use JsonException;
 use Solarium\Core\Client\Client;
 use Solarium\QueryType\Select\Query\Query as SolrSelectQuery;
@@ -25,7 +25,7 @@
  *      }
  *  }
  */
-class SolrSuggest implements SuggestSearcher
+class SolrSuggest implements Suggest
 {
     private const INDEX_SUGGEST_FIELD = 'raw_content';
 
@@ -38,7 +38,7 @@ public function __construct(
     /**
      * @throws UnexpectedResultException
      */
-    public function suggest(SuggestQuery $query): SuggestResult
+    public function search(SuggestQuery $query): SuggestResult
     {
         $index = $this->index->name($query->lang);
         $client = $this->clientFactory->create($index);

src/SuggestSearcher.php → src/Suggest.php

@@ -13,7 +13,7 @@
  * A "suggest search" is a search function that automatically displays
  * suggestions or auto-completions to users as they enter search queries.
  */
-interface SuggestSearcher
+interface Suggest
 {
-    public function suggest(SuggestQuery $query): SuggestResult;
+    public function search(SuggestQuery $query): SuggestResult;
 }

test/Console/Command/SearchTest.php

@@ -10,7 +10,7 @@
 use Atoolo\Search\Dto\Search\Result\Facet;
 use Atoolo\Search\Dto\Search\Result\FacetGroup;
 use Atoolo\Search\Dto\Search\Result\SearchResult;
-use Atoolo\Search\Service\Search\SolrSelect;
+use Atoolo\Search\Service\Search\SolrSearch;
 use PHPUnit\Framework\Attributes\CoversClass;
 use PHPUnit\Framework\MockObject\Exception;
 use PHPUnit\Framework\TestCase;
@@ -43,8 +43,8 @@ public function setUp(): void
             )],
             10
         );
-        $solrSelect = $this->createStub(SolrSelect::class);
-        $solrSelect->method('select')
+        $solrSelect = $this->createStub(SolrSearch::class);
+        $solrSelect->method('search')
             ->willReturn($result);
 
         $command = new Search($solrSelect);

test/Console/Command/SuggestTest.php

@@ -33,7 +33,7 @@ public function setUp(): void
             10
         );
         $solrSuggest = $this->createStub(SolrSuggest::class);
-        $solrSuggest->method('suggest')
+        $solrSuggest->method('search')
             ->willReturn($result);
 
         $command = new Suggest($solrSuggest);

test/Dto/Search/Query/SelectQueryBuilderTest.php → test/Dto/Search/Query/SearchQueryBuilderTest.php

@@ -7,21 +7,21 @@
 use Atoolo\Search\Dto\Search\Query\Facet\Facet;
 use Atoolo\Search\Dto\Search\Query\Filter\Filter;
 use Atoolo\Search\Dto\Search\Query\QueryOperator;
-use Atoolo\Search\Dto\Search\Query\SelectQueryBuilder;
+use Atoolo\Search\Dto\Search\Query\SearchQueryBuilder;
 use Atoolo\Search\Dto\Search\Query\Sort\Criteria;
 use InvalidArgumentException;
 use PHPUnit\Framework\Attributes\CoversClass;
 use PHPUnit\Framework\MockObject\Exception;
 use PHPUnit\Framework\TestCase;
 
-#[CoversClass(SelectQueryBuilder::class)]
-class SelectQueryBuilderTest extends TestCase
+#[CoversClass(SearchQueryBuilder::class)]
+class SearchQueryBuilderTest extends TestCase
 {
-    private SelectQueryBuilder $builder;
+    private SearchQueryBuilder $builder;
 
     protected function setUp(): void
     {
-        $this->builder = new SelectQueryBuilder();
+        $this->builder = new SearchQueryBuilder();
     }
 
     public function testSetText(): void