Skip to content

Commit

Permalink
Removing support for facets
Browse files Browse the repository at this point in the history
  • Loading branch information
MateuszKolankowski committed Feb 17, 2025
1 parent bb67a79 commit a1bd506
Show file tree
Hide file tree
Showing 18 changed files with 2 additions and 731 deletions.
77 changes: 1 addition & 76 deletions phpstan-baseline.neon
View file
Original file line number Diff line number Diff line change
Expand Up @@ -760,46 +760,6 @@ parameters:
count: 1
path: src/lib/Query/Common/CriterionVisitor/UserMetadataIn.php

-
message: "#^Method Ibexa\\\\Solr\\\\Query\\\\Common\\\\FacetBuilderVisitor\\\\Aggregate\\:\\:addVisitor\\(\\) has no return type specified\\.$#"
count: 1
path: src/lib/Query/Common/FacetBuilderVisitor/Aggregate.php

-
message: "#^Method Ibexa\\\\Solr\\\\Query\\\\Common\\\\FacetBuilderVisitor\\\\Aggregate\\:\\:mapField\\(\\) has parameter \\$data with no value type specified in iterable type array\\.$#"
count: 1
path: src/lib/Query/Common/FacetBuilderVisitor/Aggregate.php

-
message: "#^Method Ibexa\\\\Solr\\\\Query\\\\Common\\\\FacetBuilderVisitor\\\\ContentType\\:\\:mapField\\(\\) has parameter \\$data with no value type specified in iterable type array\\.$#"
count: 1
path: src/lib/Query/Common/FacetBuilderVisitor/ContentType.php

-
message: "#^Method Ibexa\\\\Solr\\\\Query\\\\Common\\\\FacetBuilderVisitor\\\\ContentType\\:\\:visitBuilder\\(\\) should return array\\<string\\> but returns array\\<string, int\\|string\\>\\.$#"
count: 1
path: src/lib/Query/Common/FacetBuilderVisitor/ContentType.php

-
message: "#^Method Ibexa\\\\Solr\\\\Query\\\\Common\\\\FacetBuilderVisitor\\\\Section\\:\\:mapField\\(\\) has parameter \\$data with no value type specified in iterable type array\\.$#"
count: 1
path: src/lib/Query/Common/FacetBuilderVisitor/Section.php

-
message: "#^Method Ibexa\\\\Solr\\\\Query\\\\Common\\\\FacetBuilderVisitor\\\\Section\\:\\:visitBuilder\\(\\) should return array\\<string\\> but returns array\\<string, int\\|string\\>\\.$#"
count: 1
path: src/lib/Query/Common/FacetBuilderVisitor/Section.php

-
message: "#^Method Ibexa\\\\Solr\\\\Query\\\\Common\\\\FacetBuilderVisitor\\\\User\\:\\:mapField\\(\\) has parameter \\$data with no value type specified in iterable type array\\.$#"
count: 1
path: src/lib/Query/Common/FacetBuilderVisitor/User.php

-
message: "#^Method Ibexa\\\\Solr\\\\Query\\\\Common\\\\FacetBuilderVisitor\\\\User\\:\\:visitBuilder\\(\\) should return array\\<string\\> but returns array\\<string, int\\|string\\>\\.$#"
count: 1
path: src/lib/Query/Common/FacetBuilderVisitor/User.php

-
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\\>\\}\\.$#"
count: 1
Expand All @@ -810,11 +770,6 @@ parameters:
count: 1
path: src/lib/Query/Common/QueryConverter/NativeQueryConverter.php

-
message: "#^Method Ibexa\\\\Solr\\\\Query\\\\Common\\\\QueryConverter\\\\NativeQueryConverter\\:\\:getFacetParams\\(\\) return type has no value type specified in iterable type array\\.$#"
count: 1
path: src/lib/Query/Common/QueryConverter/NativeQueryConverter.php

-
message: "#^Method Ibexa\\\\Solr\\\\Query\\\\Common\\\\QueryTranslator\\\\Generator\\\\WordVisitor\\:\\:escapeWord\\(\\) should return string but returns string\\|null\\.$#"
count: 1
Expand Down Expand Up @@ -910,26 +865,6 @@ parameters:
count: 1
path: src/lib/Query/Content/CriterionVisitor/Visibility.php

-
message: "#^Method Ibexa\\\\Solr\\\\Query\\\\FacetBuilderVisitor\\:\\:map\\(\\) has parameter \\$data with no value type specified in iterable type array\\.$#"
count: 1
path: src/lib/Query/FacetBuilderVisitor.php

-
message: "#^Method Ibexa\\\\Solr\\\\Query\\\\FacetBuilderVisitor\\:\\:mapData\\(\\) has parameter \\$data with no value type specified in iterable type array\\.$#"
count: 1
path: src/lib/Query/FacetBuilderVisitor.php

-
message: "#^Method Ibexa\\\\Solr\\\\Query\\\\FacetBuilderVisitor\\:\\:mapData\\(\\) return type has no value type specified in iterable type array\\.$#"
count: 1
path: src/lib/Query/FacetBuilderVisitor.php

-
message: "#^Method Ibexa\\\\Solr\\\\Query\\\\FacetFieldVisitor\\:\\:mapField\\(\\) has parameter \\$data with no value type specified in iterable type array\\.$#"
count: 1
path: src/lib/Query/FacetFieldVisitor.php

-
message: "#^Argument of an invalid type array\\<bool\\|float\\|int\\|string\\>\\|bool\\|float\\|int\\|string supplied for foreach, only iterables are supported\\.$#"
count: 1
Expand Down Expand Up @@ -1010,18 +945,13 @@ parameters:
count: 1
path: src/lib/ResultExtractor.php

-
message: "#^Method Ibexa\\\\Solr\\\\ResultExtractor\\:\\:extractFacets\\(\\) has parameter \\$languageFilter with no value type specified in iterable type array\\.$#"
count: 1
path: src/lib/ResultExtractor.php

-
message: "#^Method Ibexa\\\\Solr\\\\ResultExtractor\\:\\:extractSearchHit\\(\\) has parameter \\$languageFilter with no value type specified in iterable type array\\.$#"
count: 1
path: src/lib/ResultExtractor.php

-
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\\.$#"
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$#"
count: 1
path: src/lib/ResultExtractor.php

Expand Down Expand Up @@ -1420,11 +1350,6 @@ parameters:
count: 1
path: tests/lib/Container/Compiler/AggregateCriterionVisitorPassTest.php

-
message: "#^Method Ibexa\\\\Tests\\\\Solr\\\\Container\\\\Compiler\\\\AggregateFacetBuilderVisitorPassTest\\:\\:testAddVisitor\\(\\) has no return type specified\\.$#"
count: 1
path: tests/lib/Container/Compiler/AggregateFacetBuilderVisitorPassTest.php

-
message: "#^Method Ibexa\\\\Tests\\\\Solr\\\\Container\\\\Compiler\\\\AggregateSortClauseVisitorPassTest\\:\\:testAddVisitor\\(\\) has no return type specified\\.$#"
count: 1
Expand Down
2 changes: 0 additions & 2 deletions src/bundle/IbexaSolrBundle.php
View file
Original file line number Diff line number Diff line change
Expand Up @@ -9,7 +9,6 @@

use Ibexa\Bundle\Solr\DependencyInjection\IbexaSolrExtension;
use Ibexa\Solr\Container\Compiler\AggregateCriterionVisitorPass;
use Ibexa\Solr\Container\Compiler\AggregateFacetBuilderVisitorPass;
use Ibexa\Solr\Container\Compiler\AggregateSortClauseVisitorPass;
use Ibexa\Solr\Container\Compiler\CoreFilterRegistryPass;
use Ibexa\Solr\Container\Compiler\EndpointRegistryPass;
Expand All @@ -31,7 +30,6 @@ public function build(ContainerBuilder $container): void
$container->addCompilerPass(new FieldMapperPass\ContentTranslationFieldMapperPass());
$container->addCompilerPass(new FieldMapperPass\LocationFieldMapperPass());
$container->addCompilerPass(new AggregateCriterionVisitorPass());
$container->addCompilerPass(new AggregateFacetBuilderVisitorPass());
$container->addCompilerPass(new AggregateSortClauseVisitorPass());
$container->addCompilerPass(new EndpointRegistryPass());
$container->addCompilerPass(new GatewayRegistryPass());
Expand Down
44 changes: 0 additions & 44 deletions src/lib/Container/Compiler/AggregateFacetBuilderVisitorPass.php
View file
Original file line number Diff line number Diff line change
@@ -1,44 +0,0 @@
<?php

/**
* @copyright Copyright (C) Ibexa AS. All rights reserved.
* @license For full copyright and license information view LICENSE file distributed with this source code.
*/

namespace Ibexa\Solr\Container\Compiler;

use Symfony\Component\DependencyInjection\Compiler\CompilerPassInterface;
use Symfony\Component\DependencyInjection\ContainerBuilder;
use Symfony\Component\DependencyInjection\Reference;

/**
* This compiler pass will register Solr Storage facet builder visitors.
*/
class AggregateFacetBuilderVisitorPass implements CompilerPassInterface
{
public function process(ContainerBuilder $container): void
{
$this->processVisitors($container, 'content');
$this->processVisitors($container, 'location');
}

private function processVisitors(ContainerBuilder $container, string $name = 'content'): void
{
if (!$container->hasDefinition("ibexa.solr.query.$name.facet_builder_visitor.aggregate")) {
return;
}

$aggregateFacetBuilderVisitorDefinition = $container->getDefinition(
"ibexa.solr.query.$name.facet_builder_visitor.aggregate"
);

foreach ($container->findTaggedServiceIds("ibexa.search.solr.query.$name.facet_builder.visitor") as $id => $attributes) {
$aggregateFacetBuilderVisitorDefinition->addMethodCall(
'addVisitor',
[
new Reference($id),
]
);
}
}
}
3 changes: 0 additions & 3 deletions src/lib/Handler.php
View file
Original file line number Diff line number Diff line change
Expand Up @@ -142,7 +142,6 @@ public function findContent(Query $query, array $languageFilter = []): SearchRes
/** @phpstan-var \Ibexa\Contracts\Core\Repository\Values\Content\Search\SearchResult<\Ibexa\Contracts\Core\Persistence\Content\ContentInfo> */
return $this->contentResultExtractor->extract(
$this->gateway->findContent($query, $languageFilter),
$query->facetBuilders,
$query->aggregations,
$languageFilter,
$query->spellcheck
Expand Down Expand Up @@ -193,7 +192,6 @@ public function findLocations(LocationQuery $query, array $languageFilter = []):
/** @phpstan-var \Ibexa\Contracts\Core\Repository\Values\Content\Search\SearchResult<\Ibexa\Contracts\Core\Persistence\Content\Location> */
return $this->locationResultExtractor->extract(
$this->gateway->findLocations($query, $languageFilter),
$query->facetBuilders,
$query->aggregations,
$languageFilter,
$query->spellcheck
Expand Down Expand Up @@ -448,7 +446,6 @@ public function supports(int $capabilityFlag): bool
{
switch ($capabilityFlag) {
case SearchService::CAPABILITY_SCORING:
case SearchService::CAPABILITY_FACETS:
case SearchService::CAPABILITY_CUSTOM_FIELDS:
case SearchService::CAPABILITY_SPELLCHECK:
case SearchService::CAPABILITY_ADVANCED_FULLTEXT:
Expand Down
92 changes: 0 additions & 92 deletions src/lib/Query/Common/FacetBuilderVisitor/Aggregate.php
View file

This file was deleted.

54 changes: 0 additions & 54 deletions src/lib/Query/Common/FacetBuilderVisitor/ContentType.php
View file

This file was deleted.

Loading

0 comments on commit a1bd506

Please sign in to comment.