Fix errors found by PHPStan

adriendupuis · adriendupuis · commit 373064514abc · 2025-02-12T11:06:59.000+01:00
diff --git a/code_samples/search/custom/src/EventSubscriber/CustomQueryFilterSubscriber.php b/code_samples/search/custom/src/EventSubscriber/CustomQueryFilterSubscriber.php
@@ -6,7 +6,7 @@
 
 use Ibexa\Contracts\Core\Repository\Values\Content\Query\Criterion\LogicalAnd;
 use Ibexa\Contracts\Core\Repository\Values\Content\Query\Criterion\ObjectStateIdentifier;
-use Ibexa\Contracts\ElasticSearch\Query\Event\QueryFilterEvent;
+use Ibexa\Contracts\Elasticsearch\Query\Event\QueryFilterEvent;
 use Symfony\Component\EventDispatcher\EventSubscriberInterface;
 
 final class CustomQueryFilterSubscriber implements EventSubscriberInterface
diff --git a/code_samples/search/custom/src/Query/Aggregation/Elasticsearch/PriorityRangeAggregationVisitor.php b/code_samples/search/custom/src/Query/Aggregation/Elasticsearch/PriorityRangeAggregationVisitor.php
@@ -18,6 +18,8 @@ public function supports(Aggregation $aggregation, LanguageFilter $languageFilte
 
     /**
      * @param \App\Query\Aggregation\PriorityRangeAggregation $aggregation
+     *
+     * @return array<string, array<string, mixed>>
      */
     public function visit(AggregationVisitor $dispatcher, Aggregation $aggregation, LanguageFilter $languageFilter): array
     {
diff --git a/code_samples/search/custom/src/Query/Criterion/Elasticsearch/CameraManufacturerVisitor.php b/code_samples/search/custom/src/Query/Criterion/Elasticsearch/CameraManufacturerVisitor.php
@@ -17,7 +17,7 @@ public function supports(Criterion $criterion, LanguageFilter $languageFilter):
     }
 
     /**
-     * @param \App\Query\Criterion\Elasticsearch\CameraManufacturerCriterion $criterion
+     * @param \App\Query\Criterion\CameraManufacturerCriterion $criterion
      */
     public function visit(CriterionVisitor $dispatcher, Criterion $criterion, LanguageFilter $languageFilter): array
     {
diff --git a/code_samples/search/custom/src/Query/Criterion/Solr/CameraManufacturerVisitor.php b/code_samples/search/custom/src/Query/Criterion/Solr/CameraManufacturerVisitor.php
@@ -16,7 +16,7 @@ public function canVisit(Criterion $criterion)
     }
 
     /**
-     * @param \App\Query\Criterion\Solr\CameraManufacturerCriterion $criterion
+     * @param \App\Query\Criterion\CameraManufacturerCriterion $criterion
      */
     public function visit(Criterion $criterion, CriterionVisitor $subVisitor = null)
     {
diff --git a/phpstan-baseline.neon b/phpstan-baseline.neon
@@ -355,11 +355,6 @@ parameters:
 			count: 1
 			path: code_samples/search/custom/src/Query/Aggregation/Elasticsearch/PriorityRangeAggregationResultExtractor.php
 
-		-
-			message: "#^Method App\\\\Query\\\\Aggregation\\\\Elasticsearch\\\\PriorityAggregationVisitor\\:\\:visit\\(\\) return type has no value type specified in iterable type array\\.$#"
-			count: 1
-			path: code_samples/search/elasticsearch/src/Query/Aggregation/Elasticsearch/PriorityAggregationVisitor.php
-
 		-
 			message: "#^Method App\\\\Query\\\\Criterion\\\\Elasticsearch\\\\CameraManufacturerVisitor\\:\\:visit\\(\\) return type has no value type specified in iterable type array\\.$#"
 			count: 1

Original file line number	Diff line number	Diff line change
`@@ -18,6 +18,8 @@ public function supports(Aggregation $aggregation, LanguageFilter $languageFilte`
`18`	`18`
`19`	`19`	`/**`
`20`	`20`	`* @param \App\Query\Aggregation\PriorityRangeAggregation $aggregation`
	`21`	`+ *`
	`22`	`+ * @return array<string, array<string, mixed>>`
`21`	`23`	`*/`
`22`	`24`	`public function visit(AggregationVisitor $dispatcher, Aggregation $aggregation, LanguageFilter $languageFilter): array`
`23`	`25`	`{`
Original file line number	Diff line number	Diff line change
`@@ -17,7 +17,7 @@ public function supports(Criterion $criterion, LanguageFilter $languageFilter):`
`17`	`17`	`}`
`18`	`18`
`19`	`19`	`/**`
`20`		`- * @param \App\Query\Criterion\Elasticsearch\CameraManufacturerCriterion $criterion`
	`20`	`+ * @param \App\Query\Criterion\CameraManufacturerCriterion $criterion`
`21`	`21`	`*/`
`22`	`22`	`public function visit(CriterionVisitor $dispatcher, Criterion $criterion, LanguageFilter $languageFilter): array`
`23`	`23`	`{`
Original file line number	Diff line number	Diff line change
`@@ -16,7 +16,7 @@ public function canVisit(Criterion $criterion)`
`16`	`16`	`}`
`17`	`17`
`18`	`18`	`/**`
`19`		`- * @param \App\Query\Criterion\Solr\CameraManufacturerCriterion $criterion`
	`19`	`+ * @param \App\Query\Criterion\CameraManufacturerCriterion $criterion`
`20`	`20`	`*/`
`21`	`21`	`public function visit(Criterion $criterion, CriterionVisitor $subVisitor = null)`
`22`	`22`	`{`