Merge branch '4.4' into main

ibexa · Mar 28, 2023 · 4f07b02 · 4f07b02
2 parents e82f7c2 + 530453c
commit 4f07b02
Show file tree

Hide file tree

Showing 9 changed files with 50 additions and 226 deletions.
diff --git a/phpstan-baseline.neon b/phpstan-baseline.neon
diff --git a/src/bundle/Resources/config/services.yml b/src/bundle/Resources/config/services.yml
@@ -21,6 +21,7 @@ services:
         calls:
             -   setLogger: [ '@logger' ]
         tags:
+            - { name: http_client.client }
             - { name: monolog.logger, channel: ibexa.solr }
 
     Ibexa\Solr\Gateway\HttpClient\Stream:

diff --git a/src/contracts/Query/AggregationVisitor.php b/src/contracts/Query/AggregationVisitor.php
@@ -14,10 +14,14 @@ interface AggregationVisitor
 {
     /**
      * Check if visitor is applicable to current aggreagtion.
+     *
+     * @param array{languages: string[]} $languageFilter
      */
     public function canVisit(Aggregation $aggregation, array $languageFilter): bool;
 
     /**
+     * @param array{languages: string[]} $languageFilter
+     *
      * @return string[]
      */
     public function visit(

diff --git a/src/lib/Gateway/Native.php b/src/lib/Gateway/Native.php
@@ -84,6 +84,8 @@ public function __construct(
     /**
      * Returns search hits for the given query.
      *
+     * @phpstan-param array{languages: string[]} $languageSettings
+     *
      * @param array $languageSettings - a map of filters for the returned fields.
      *        Currently supported: <code>array("languages" => array(<language1>,..))</code>.
      *

diff --git a/src/lib/Query/Common/AggregationVisitor/DispatcherAggregationVisitor.php b/src/lib/Query/Common/AggregationVisitor/DispatcherAggregationVisitor.php
@@ -14,11 +14,11 @@
 
 final class DispatcherAggregationVisitor implements AggregationVisitor
 {
-    /** @var \Ibexa\Contracts\Solr\Query\AggregationVisitor[] */
+    /** @var iterable<\Ibexa\Contracts\Solr\Query\AggregationVisitor> */
     private $visitors;
 
     /**
-     * @var \Ibexa\Contracts\Solr\Query\AggregationVisitor[]
+     * @param iterable<\Ibexa\Contracts\Solr\Query\AggregationVisitor> $visitors
      */
     public function __construct(iterable $visitors)
     {
@@ -46,6 +46,9 @@ public function visit(
         return $visitor->visit($this, $aggregation, $languageFilter);
     }
 
+    /**
+     * @param array{languages: string[]} $languageFilter
+     */
     private function findVisitor(Aggregation $aggregation, array $languageFilter): ?AggregationVisitor
     {
         foreach ($this->visitors as $visitor) {

diff --git a/src/lib/Query/QueryConverter.php b/src/lib/Query/QueryConverter.php
@@ -16,6 +16,8 @@ abstract class QueryConverter
     /**
      * Map query to a proper Solr representation.
      *
+     * @phpstan-param array{languages: string[]} $languageSettings
+     *
      * @param array $languageSettings - a map of filters for the returned fields.
      *        Currently supported: <code>array("languages" => array(<language1>,..))</code>.
      *

diff --git a/src/lib/Resources/config/container/solr.yml b/src/lib/Resources/config/container/solr.yml
@@ -150,4 +150,3 @@ services:
         tags:
             - {name: ibexa.search.engine.indexer, alias: solr}
         lazy: true
-
diff --git a/tests/lib/Search/Query/Common/AggregationVisitor/AbstractAggregationVisitorTest.php b/tests/lib/Search/Query/Common/AggregationVisitor/AbstractAggregationVisitorTest.php
@@ -15,7 +15,7 @@
 abstract class AbstractAggregationVisitorTest extends TestCase
 {
     protected const EXAMPLE_LANGUAGE_FILTER = [
-        'languageCode' => 'eng-gb',
+        'languages' => ['eng-GB'],
     ];
 
     /** @var \Ibexa\Contracts\Solr\Query\AggregationVisitor */
@@ -33,6 +33,8 @@ protected function setUp(): void
     abstract protected function createVisitor(): AggregationVisitor;
 
     /**
+     * @param array{languages: string[]} $languageFilter
+     *
      * @dataProvider dataProviderForCanVisit
      */
     final public function testCanVisit(
@@ -46,9 +48,19 @@ final public function testCanVisit(
         );
     }
 
+    /**
+     * @return iterable<array{
+     *     \Ibexa\Contracts\Core\Repository\Values\Content\Query\Aggregation,
+     *     array{languages: string[]},
+     *     bool,
+     * }>
+     */
     abstract public function dataProviderForCanVisit(): iterable;
 
     /**
+     * @param array{languages: string[]} $languageFilter
+     * @param array<mixed> $expectedResult
+     *
      * @dataProvider dataProviderForVisit
      */
     final public function testVisit(
@@ -64,8 +76,19 @@ final public function testVisit(
         );
     }
 
+    /**
+     * @return iterable<array{
+     *     \Ibexa\Contracts\Core\Repository\Values\Content\Query\Aggregation,
+     *     array{languages: string[]},
+     *     array<mixed>,
+     * }>
+     */
     abstract public function dataProviderForVisit(): iterable;
 
+    /**
+     * @param array{languages: string[]} $languageFilter
+     * @param array<mixed> $expectedResult
+     */
     protected function configureMocksForTestVisit(
         Aggregation $aggregation,
         array $languageFilter,

diff --git a/tests/lib/Search/Query/Common/AggregationVisitor/DispatcherAggregationVisitorTest.php b/tests/lib/Search/Query/Common/AggregationVisitor/DispatcherAggregationVisitorTest.php
@@ -17,7 +17,7 @@
 final class DispatcherAggregationVisitorTest extends TestCase
 {
     private const EXAMPLE_LANGUAGE_FILTER = [
-        'languageCode' => 'eng-gb',
+        'languages' => ['eng-GB'],
     ];
 
     private const EXAMPLE_VISITOR_RESULT = [
@@ -74,6 +74,11 @@ public function testVisit(): void
         );
     }
 
+    /**
+     * @param array{languages: string[]} $languageFilter
+     *
+     * @return \PHPUnit\Framework\MockObject\MockObject&\Ibexa\Contracts\Solr\Query\AggregationVisitor
+     */
     private function createVisitorMock(
         Aggregation $aggregation,
         array $languageFilter,
Original file line number	Diff line number	Diff line change
Expand Up		@@ -150,4 +150,3 @@ services:
		tags:
		- {name: ibexa.search.engine.indexer, alias: solr}
		lazy: true