Skip to content

Merge branch '4.6' #115

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
ciastektk merged 2 commits into from
Mar 27, 2026
Merged

Merge branch '4.6' #115

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
9347e82
IBX-9650: Used tagged iterator to inject criterion and sort clause vi…
ciastektk Mar 26, 2026
e92c428
Merge branch '4.6'
ciastektk Mar 26, 2026
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
4 changes: 0 additions & 4 deletions src/bundle/IbexaSolrBundle.php
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -8,8 +8,6 @@
namespace Ibexa\Bundle\Solr;

use Ibexa\Bundle\Solr\DependencyInjection\IbexaSolrExtension;
use Ibexa\Solr\Container\Compiler\AggregateCriterionVisitorPass;
use Ibexa\Solr\Container\Compiler\AggregateSortClauseVisitorPass;
use Ibexa\Solr\Container\Compiler\CoreFilterRegistryPass;
use Ibexa\Solr\Container\Compiler\EndpointRegistryPass;
use Ibexa\Solr\Container\Compiler\FieldMapperPass;
Expand All @@ -29,8 +27,6 @@ public function build(ContainerBuilder $container): void
$container->addCompilerPass(new FieldMapperPass\ContentFieldMapperPass());
$container->addCompilerPass(new FieldMapperPass\ContentTranslationFieldMapperPass());
$container->addCompilerPass(new FieldMapperPass\LocationFieldMapperPass());
$container->addCompilerPass(new AggregateCriterionVisitorPass());
$container->addCompilerPass(new AggregateSortClauseVisitorPass());
$container->addCompilerPass(new EndpointRegistryPass());
$container->addCompilerPass(new GatewayRegistryPass());
$container->addCompilerPass(new CoreFilterRegistryPass());
Expand Down
63 changes: 0 additions & 63 deletions src/lib/Container/Compiler/AggregateCriterionVisitorPass.php
View file
Open in desktop

This file was deleted.

66 changes: 0 additions & 66 deletions src/lib/Container/Compiler/AggregateSortClauseVisitorPass.php
View file
Open in desktop

This file was deleted.

21 changes: 5 additions & 16 deletions src/lib/Query/Common/CriterionVisitor/Aggregate.php
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -8,7 +8,6 @@
namespace Ibexa\Solr\Query\Common\CriterionVisitor;

use Ibexa\Contracts\Core\Repository\Exceptions\NotImplementedException;
use Ibexa\Contracts\Core\Repository\Values\Content\Query\Criterion;
use Ibexa\Contracts\Core\Repository\Values\Content\Query\CriterionInterface;
use Ibexa\Contracts\Solr\Query\CriterionVisitor;

Expand All @@ -20,28 +19,18 @@ class Aggregate extends CriterionVisitor
/**
* Array of available visitors.
*
* @var \Ibexa\Contracts\Solr\Query\CriterionVisitor[]
* @var iterable<\Ibexa\Contracts\Solr\Query\CriterionVisitor>
*/
protected array $visitors = [];
protected iterable $visitors;

/**
* Construct from optional visitor array.
*
* @param \Ibexa\Contracts\Solr\Query\CriterionVisitor[] $visitors
* @param iterable<\Ibexa\Contracts\Solr\Query\CriterionVisitor> $visitors
*/
public function __construct(array $visitors = [])
public function __construct(iterable $visitors)
{
foreach ($visitors as $visitor) {
$this->addVisitor($visitor);
}
}

/**
* Adds visitor.
*/
public function addVisitor(CriterionVisitor $visitor): void
{
$this->visitors[] = $visitor;
$this->visitors = $visitors;
}

/**
Expand Down
Empty file removed src/lib/Query/Common/FacetBuilderVisitor/Aggregate.php
View file
Open in desktop
Empty file.
19 changes: 5 additions & 14 deletions src/lib/Query/Common/SortClauseVisitor/Aggregate.php
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -19,25 +19,16 @@ class Aggregate extends SortClauseVisitor
/**
* Array of available visitors.
*
* @var \Ibexa\Contracts\Solr\Query\SortClauseVisitor[]
* @var iterable<\Ibexa\Contracts\Solr\Query\SortClauseVisitor>
*/
protected array $visitors = [];
protected iterable $visitors;

/**
* Construct from optional visitor array.
*
* @param \Ibexa\Contracts\Solr\Query\SortClauseVisitor[] $visitors
* @param iterable<\Ibexa\Contracts\Solr\Query\SortClauseVisitor> $visitors
*/
public function __construct(array $visitors = [])
{
foreach ($visitors as $visitor) {
$this->addVisitor($visitor);
}
}

public function addVisitor(SortClauseVisitor $visitor): void
public function __construct(iterable $visitors)
{
$this->visitors[] = $visitor;
$this->visitors = $visitors;
}

/**
Expand Down
18 changes: 9 additions & 9 deletions src/lib/Resources/config/container/solr/services.yml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -32,25 +32,25 @@ services:
arguments:
$visitors: !tagged_iterator ibexa.search.solr.query.content.embedding.visitor

# Note: services tagged with 'ibexa.search.solr.query.content.criterion.visitor'
# are registered to this one using compilation pass
ibexa.solr.query.content.criterion_visitor.aggregate:
class: Ibexa\Solr\Query\Common\CriterionVisitor\Aggregate
arguments:
$visitors: !tagged_iterator ibexa.search.solr.query.content.criterion.visitor

# Note: services tagged with 'ibexa.search.solr.query.content.sort_clause.visitor'
# are registered to this one using compilation pass
ibexa.solr.query.content.sort_clause_visitor.aggregate:
class: Ibexa\Solr\Query\Common\SortClauseVisitor\Aggregate
arguments:
$visitors: !tagged_iterator ibexa.search.solr.query.content.sort_clause.visitor

# Note: services tagged with 'ibexa.search.solr.query.location.criterion.visitor'
# are registered to this one using compilation pass
ibexa.solr.query.location.criterion_visitor.aggregate:
class: Ibexa\Solr\Query\Common\CriterionVisitor\Aggregate
arguments:
$visitors: !tagged_iterator ibexa.search.solr.query.location.criterion.visitor

# Note: services tagged with 'ibexa.search.solr.query.location.sort_clause.visitor'
# are registered to this one using compilation pass
ibexa.solr.query.location.sort_clause_visitor.aggregate:
class: Ibexa\Solr\Query\Common\SortClauseVisitor\Aggregate
arguments:
$visitors: !tagged_iterator ibexa.search.solr.query.location.sort_clause.visitor

# Note: services tagged with 'ibexa.search.solr.field.mapper.block'
# are registered to this one using compilation pass
Expand Down Expand Up @@ -81,7 +81,7 @@ services:
- '%ibexa.search.solr.field_mapper.boost_factor_provider.map%'

Ibexa\Solr\FieldMapper\IndexingDepthProvider:
class: \Ibexa\Solr\FieldMapper\IndexingDepthProvider
class: Ibexa\Solr\FieldMapper\IndexingDepthProvider
arguments:
- '%ibexa.search.solr.field_mapper.indexing_depth_provider.map%'
- '%ibexa.search.solr.field_mapper.indexing_depth_provider.default%'
54 changes: 0 additions & 54 deletions tests/lib/Container/Compiler/AggregateCriterionVisitorPassTest.php
View file
Open in desktop

This file was deleted.

54 changes: 0 additions & 54 deletions tests/lib/Container/Compiler/AggregateSortClauseVisitorPassTest.php
View file
Open in desktop

This file was deleted.

2 changes: 0 additions & 2 deletions tests/lib/SetupFactory/LegacySetupFactory.php
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -78,8 +78,6 @@ protected function loadSolrSettings(ContainerBuilder $containerBuilder): void
$containerBuilder->addCompilerPass(new Compiler\FieldMapperPass\ContentFieldMapperPass());
$containerBuilder->addCompilerPass(new Compiler\FieldMapperPass\ContentTranslationFieldMapperPass());
$containerBuilder->addCompilerPass(new Compiler\FieldMapperPass\LocationFieldMapperPass());
$containerBuilder->addCompilerPass(new Compiler\AggregateCriterionVisitorPass());
$containerBuilder->addCompilerPass(new Compiler\AggregateSortClauseVisitorPass());
$containerBuilder->addCompilerPass(new Compiler\EndpointRegistryPass());
$containerBuilder->addCompilerPass(new AggregateFieldValueMapperPass());
$containerBuilder->addCompilerPass(new FieldRegistryPass());
Expand Down
Loading