Skip to content

Commit aea618e

Browse files
wiewiurdpwiewiurdp
authored
IBX-8532: Removed deprecated Facets API (#484)
1 parent 12fd0ad commit aea618e

File tree

18 files changed

+2
-731
lines changed

18 files changed

+2
-731
lines changed

‎phpstan-baseline.neon‎

Lines changed: 1 addition & 76 deletions
Original file line numberDiff line numberDiff line change
@@ -755,46 +755,6 @@ parameters:
755755
count: 1
756756
path: src/lib/Query/Common/CriterionVisitor/UserMetadataIn.php
757757

758-
-
759-
message: "#^Method Ibexa\\\\Solr\\\\Query\\\\Common\\\\FacetBuilderVisitor\\\\Aggregate\\:\\:addVisitor\\(\\) has no return type specified\\.$#"
760-
count: 1
761-
path: src/lib/Query/Common/FacetBuilderVisitor/Aggregate.php
762-
763-
-
764-
message: "#^Method Ibexa\\\\Solr\\\\Query\\\\Common\\\\FacetBuilderVisitor\\\\Aggregate\\:\\:mapField\\(\\) has parameter \\$data with no value type specified in iterable type array\\.$#"
765-
count: 1
766-
path: src/lib/Query/Common/FacetBuilderVisitor/Aggregate.php
767-
768-
-
769-
message: "#^Method Ibexa\\\\Solr\\\\Query\\\\Common\\\\FacetBuilderVisitor\\\\ContentType\\:\\:mapField\\(\\) has parameter \\$data with no value type specified in iterable type array\\.$#"
770-
count: 1
771-
path: src/lib/Query/Common/FacetBuilderVisitor/ContentType.php
772-
773-
-
774-
message: "#^Method Ibexa\\\\Solr\\\\Query\\\\Common\\\\FacetBuilderVisitor\\\\ContentType\\:\\:visitBuilder\\(\\) should return array\\<string\\> but returns array\\<string, int\\|string\\>\\.$#"
775-
count: 1
776-
path: src/lib/Query/Common/FacetBuilderVisitor/ContentType.php
777-
778-
-
779-
message: "#^Method Ibexa\\\\Solr\\\\Query\\\\Common\\\\FacetBuilderVisitor\\\\Section\\:\\:mapField\\(\\) has parameter \\$data with no value type specified in iterable type array\\.$#"
780-
count: 1
781-
path: src/lib/Query/Common/FacetBuilderVisitor/Section.php
782-
783-
-
784-
message: "#^Method Ibexa\\\\Solr\\\\Query\\\\Common\\\\FacetBuilderVisitor\\\\Section\\:\\:visitBuilder\\(\\) should return array\\<string\\> but returns array\\<string, int\\|string\\>\\.$#"
785-
count: 1
786-
path: src/lib/Query/Common/FacetBuilderVisitor/Section.php
787-
788-
-
789-
message: "#^Method Ibexa\\\\Solr\\\\Query\\\\Common\\\\FacetBuilderVisitor\\\\User\\:\\:mapField\\(\\) has parameter \\$data with no value type specified in iterable type array\\.$#"
790-
count: 1
791-
path: src/lib/Query/Common/FacetBuilderVisitor/User.php
792-
793-
-
794-
message: "#^Method Ibexa\\\\Solr\\\\Query\\\\Common\\\\FacetBuilderVisitor\\\\User\\:\\:visitBuilder\\(\\) should return array\\<string\\> but returns array\\<string, int\\|string\\>\\.$#"
795-
count: 1
796-
path: src/lib/Query/Common/FacetBuilderVisitor/User.php
797-
798758
-
799759
message: "#^Default value of the parameter \\#2 \\$languageSettings \\(array\\{\\}\\) of method Ibexa\\\\Solr\\\\Query\\\\Common\\\\QueryConverter\\\\NativeQueryConverter\\:\\:convert\\(\\) is incompatible with type array\\{languages\\: array\\<string\\>\\}\\.$#"
800760
count: 1
@@ -805,11 +765,6 @@ parameters:
805765
count: 1
806766
path: src/lib/Query/Common/QueryConverter/NativeQueryConverter.php
807767

808-
-
809-
message: "#^Method Ibexa\\\\Solr\\\\Query\\\\Common\\\\QueryConverter\\\\NativeQueryConverter\\:\\:getFacetParams\\(\\) return type has no value type specified in iterable type array\\.$#"
810-
count: 1
811-
path: src/lib/Query/Common/QueryConverter/NativeQueryConverter.php
812-
813768
-
814769
message: "#^Method Ibexa\\\\Solr\\\\Query\\\\Common\\\\QueryTranslator\\\\Generator\\\\WordVisitor\\:\\:escapeWord\\(\\) should return string but returns string\\|null\\.$#"
815770
count: 1
@@ -905,26 +860,6 @@ parameters:
905860
count: 1
906861
path: src/lib/Query/Content/CriterionVisitor/Visibility.php
907862

908-
-
909-
message: "#^Method Ibexa\\\\Solr\\\\Query\\\\FacetBuilderVisitor\\:\\:map\\(\\) has parameter \\$data with no value type specified in iterable type array\\.$#"
910-
count: 1
911-
path: src/lib/Query/FacetBuilderVisitor.php
912-
913-
-
914-
message: "#^Method Ibexa\\\\Solr\\\\Query\\\\FacetBuilderVisitor\\:\\:mapData\\(\\) has parameter \\$data with no value type specified in iterable type array\\.$#"
915-
count: 1
916-
path: src/lib/Query/FacetBuilderVisitor.php
917-
918-
-
919-
message: "#^Method Ibexa\\\\Solr\\\\Query\\\\FacetBuilderVisitor\\:\\:mapData\\(\\) return type has no value type specified in iterable type array\\.$#"
920-
count: 1
921-
path: src/lib/Query/FacetBuilderVisitor.php
922-
923-
-
924-
message: "#^Method Ibexa\\\\Solr\\\\Query\\\\FacetFieldVisitor\\:\\:mapField\\(\\) has parameter \\$data with no value type specified in iterable type array\\.$#"
925-
count: 1
926-
path: src/lib/Query/FacetFieldVisitor.php
927-
928863
-
929864
message: "#^Argument of an invalid type array\\<bool\\|float\\|int\\|string\\>\\|bool\\|float\\|int\\|string supplied for foreach, only iterables are supported\\.$#"
930865
count: 1
@@ -1005,18 +940,13 @@ parameters:
1005940
count: 1
1006941
path: src/lib/ResultExtractor.php
1007942

1008-
-
1009-
message: "#^Method Ibexa\\\\Solr\\\\ResultExtractor\\:\\:extractFacets\\(\\) has parameter \\$languageFilter with no value type specified in iterable type array\\.$#"
1010-
count: 1
1011-
path: src/lib/ResultExtractor.php
1012-
1013943
-
1014944
message: "#^Method Ibexa\\\\Solr\\\\ResultExtractor\\:\\:extractSearchHit\\(\\) has parameter \\$languageFilter with no value type specified in iterable type array\\.$#"
1015945
count: 1
1016946
path: src/lib/ResultExtractor.php
1017947

1018948
-
1019-
message: "#^Parameter \\#3 \\$facetBuilder of method Ibexa\\\\Solr\\\\Query\\\\FacetFieldVisitor\\:\\:mapField\\(\\) expects Ibexa\\\\Contracts\\\\Core\\\\Repository\\\\Values\\\\Content\\\\Query\\\\FacetBuilder, Ibexa\\\\Contracts\\\\Core\\\\Repository\\\\Values\\\\Content\\\\Query\\\\FacetBuilder\\|null given\\.$#"
949+
message: "#^Method Ibexa\\\\Solr\\\\ResultExtractor\\:\\:extractSearchHit\\(\\) return type with generic class Ibexa\\\\Contracts\\\\Core\\\\Repository\\\\Values\\\\Content\\\\Search\\\\SearchHit does not specify its types\\: T$#"
1020950
count: 1
1021951
path: src/lib/ResultExtractor.php
1022952

@@ -1415,11 +1345,6 @@ parameters:
14151345
count: 1
14161346
path: tests/lib/Container/Compiler/AggregateCriterionVisitorPassTest.php
14171347

1418-
-
1419-
message: "#^Method Ibexa\\\\Tests\\\\Solr\\\\Container\\\\Compiler\\\\AggregateFacetBuilderVisitorPassTest\\:\\:testAddVisitor\\(\\) has no return type specified\\.$#"
1420-
count: 1
1421-
path: tests/lib/Container/Compiler/AggregateFacetBuilderVisitorPassTest.php
1422-
14231348
-
14241349
message: "#^Method Ibexa\\\\Tests\\\\Solr\\\\Container\\\\Compiler\\\\AggregateSortClauseVisitorPassTest\\:\\:testAddVisitor\\(\\) has no return type specified\\.$#"
14251350
count: 1

‎src/bundle/IbexaSolrBundle.php‎

Lines changed: 0 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -9,7 +9,6 @@
99

1010
use Ibexa\Bundle\Solr\DependencyInjection\IbexaSolrExtension;
1111
use Ibexa\Solr\Container\Compiler\AggregateCriterionVisitorPass;
12-
use Ibexa\Solr\Container\Compiler\AggregateFacetBuilderVisitorPass;
1312
use Ibexa\Solr\Container\Compiler\AggregateSortClauseVisitorPass;
1413
use Ibexa\Solr\Container\Compiler\CoreFilterRegistryPass;
1514
use Ibexa\Solr\Container\Compiler\EndpointRegistryPass;
@@ -31,7 +30,6 @@ public function build(ContainerBuilder $container): void
3130
$container->addCompilerPass(new FieldMapperPass\ContentTranslationFieldMapperPass());
3231
$container->addCompilerPass(new FieldMapperPass\LocationFieldMapperPass());
3332
$container->addCompilerPass(new AggregateCriterionVisitorPass());
34-
$container->addCompilerPass(new AggregateFacetBuilderVisitorPass());
3533
$container->addCompilerPass(new AggregateSortClauseVisitorPass());
3634
$container->addCompilerPass(new EndpointRegistryPass());
3735
$container->addCompilerPass(new GatewayRegistryPass());

‎src/lib/Container/Compiler/AggregateFacetBuilderVisitorPass.php‎

Lines changed: 0 additions & 44 deletions
Original file line numberDiff line numberDiff line change
@@ -1,44 +0,0 @@
1-
<?php
2-
3-
/**
4-
* @copyright Copyright (C) Ibexa AS. All rights reserved.
5-
* @license For full copyright and license information view LICENSE file distributed with this source code.
6-
*/
7-
8-
namespace Ibexa\Solr\Container\Compiler;
9-
10-
use Symfony\Component\DependencyInjection\Compiler\CompilerPassInterface;
11-
use Symfony\Component\DependencyInjection\ContainerBuilder;
12-
use Symfony\Component\DependencyInjection\Reference;
13-
14-
/**
15-
* This compiler pass will register Solr Storage facet builder visitors.
16-
*/
17-
class AggregateFacetBuilderVisitorPass implements CompilerPassInterface
18-
{
19-
public function process(ContainerBuilder $container): void
20-
{
21-
$this->processVisitors($container, 'content');
22-
$this->processVisitors($container, 'location');
23-
}
24-
25-
private function processVisitors(ContainerBuilder $container, string $name = 'content'): void
26-
{
27-
if (!$container->hasDefinition("ibexa.solr.query.$name.facet_builder_visitor.aggregate")) {
28-
return;
29-
}
30-
31-
$aggregateFacetBuilderVisitorDefinition = $container->getDefinition(
32-
"ibexa.solr.query.$name.facet_builder_visitor.aggregate"
33-
);
34-
35-
foreach ($container->findTaggedServiceIds("ibexa.search.solr.query.$name.facet_builder.visitor") as $id => $attributes) {
36-
$aggregateFacetBuilderVisitorDefinition->addMethodCall(
37-
'addVisitor',
38-
[
39-
new Reference($id),
40-
]
41-
);
42-
}
43-
}
44-
}

‎src/lib/Handler.php‎

Lines changed: 0 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -142,7 +142,6 @@ public function findContent(Query $query, array $languageFilter = []): SearchRes
142142
/** @phpstan-var \Ibexa\Contracts\Core\Repository\Values\Content\Search\SearchResult<\Ibexa\Contracts\Core\Persistence\Content\ContentInfo> */
143143
return $this->contentResultExtractor->extract(
144144
$this->gateway->findContent($query, $languageFilter),
145-
$query->facetBuilders,
146145
$query->aggregations,
147146
$languageFilter,
148147
$query->spellcheck
@@ -193,7 +192,6 @@ public function findLocations(LocationQuery $query, array $languageFilter = []):
193192
/** @phpstan-var \Ibexa\Contracts\Core\Repository\Values\Content\Search\SearchResult<\Ibexa\Contracts\Core\Persistence\Content\Location> */
194193
return $this->locationResultExtractor->extract(
195194
$this->gateway->findLocations($query, $languageFilter),
196-
$query->facetBuilders,
197195
$query->aggregations,
198196
$languageFilter,
199197
$query->spellcheck
@@ -448,7 +446,6 @@ public function supports(int $capabilityFlag): bool
448446
{
449447
switch ($capabilityFlag) {
450448
case SearchService::CAPABILITY_SCORING:
451-
case SearchService::CAPABILITY_FACETS:
452449
case SearchService::CAPABILITY_CUSTOM_FIELDS:
453450
case SearchService::CAPABILITY_SPELLCHECK:
454451
case SearchService::CAPABILITY_ADVANCED_FULLTEXT:

‎src/lib/Query/Common/FacetBuilderVisitor/Aggregate.php‎

Lines changed: 0 additions & 92 deletions
This file was deleted.

‎src/lib/Query/Common/FacetBuilderVisitor/ContentType.php‎

Lines changed: 0 additions & 54 deletions
This file was deleted.

0 commit comments

Comments
 (0)