From 1f10d9af3239bbc767e78dc8de18ce0cfc7c7cda Mon Sep 17 00:00:00 2001 From: Nattfarinn Date: Wed, 1 Dec 2021 16:15:15 +0100 Subject: [PATCH 1/5] IBX-1334: Rebranded ibexa/solr to use new namespaces --- composer.json | 8 +-- .../ApiLoader/BoostFactorProviderFactory.php | 4 +- .../IndexingDepthProviderFactory.php | 4 +- src/bundle/ApiLoader/SolrEngineFactory.php | 18 ++--- .../IbexaSolrExtension.php | 10 +-- src/bundle/IbexaSolrBundle.php | 4 +- src/contracts/DocumentMapper.php | 6 +- .../FieldMapper/ContentFieldMapper.php | 4 +- .../ContentTranslationFieldMapper.php | 4 +- .../FieldMapper/LocationFieldMapper.php | 4 +- src/contracts/Query/AggregationVisitor.php | 2 +- .../AggregationFieldResolver.php | 2 +- src/contracts/Query/CriterionVisitor.php | 4 +- src/contracts/Query/SortClauseVisitor.php | 2 +- .../AggregationResultExtractor.php | 4 +- .../RangeAggregationKeyMapper.php | 2 +- .../TermAggregationKeyMapper.php | 2 +- src/lib/CoreFilter.php | 2 +- src/lib/CoreFilter/CoreFilterRegistry.php | 8 +-- src/lib/CoreFilter/NativeCoreFilter.php | 16 ++--- .../DocumentMapper/NativeDocumentMapper.php | 32 ++++----- src/lib/FieldMapper/BoostFactorProvider.php | 4 +- .../ContentFieldMapper/Aggregate.php | 6 +- .../BlockDocumentsBaseContentFields.php | 24 +++---- .../ContentDocumentBaseFields.php | 6 +- .../ContentDocumentLocationFields.php | 12 ++-- .../ContentFieldMapper/UserDocumentFields.php | 6 +- .../Aggregate.php | 6 +- .../BlockDocumentsContentFields.php | 26 ++++---- .../BlockDocumentsMetaFields.php | 6 +- .../ContentDocumentEmptyFields.php | 22 +++---- .../ContentDocumentFulltextFields.php | 38 +++++------ ...tentDocumentTranslatedContentNameField.php | 12 ++-- src/lib/FieldMapper/IndexingDepthProvider.php | 2 +- .../LocationFieldMapper/Aggregate.php | 6 +- .../LocationDocumentBaseFields.php | 10 +-- src/lib/Gateway.php | 4 +- .../AbstractDistributionStrategy.php | 4 +- src/lib/Gateway/Endpoint.php | 2 +- src/lib/Gateway/EndpointRegistry.php | 8 +-- src/lib/Gateway/EndpointResolver.php | 2 +- src/lib/Gateway/GatewayRegistry.php | 8 +-- src/lib/Gateway/HttpClient.php | 6 +- src/lib/Gateway/HttpClient/Stream.php | 4 +- src/lib/Gateway/Native.php | 40 +++++------ src/lib/Gateway/UpdateSerializer.php | 18 ++--- src/lib/Handler.php | 66 +++++++++---------- src/lib/Indexer.php | 10 +-- .../AbstractRangeAggregationVisitor.php | 6 +- .../AbstractStatsAggregationVisitor.php | 6 +- .../AbstractTermAggregationVisitor.php | 6 +- .../ContentFieldAggregationFieldResolver.php | 8 +-- .../RawAggregationFieldResolver.php | 4 +- .../SearchFieldAggregationFieldResolver.php | 2 +- .../DateMetadataRangeAggregationVisitor.php | 8 +-- .../DispatcherAggregationVisitor.php | 8 +-- .../ContentFieldAggregationVisitorFactory.php | 4 +- .../ObjectStateAggregationVisitor.php | 6 +- .../RangeAggregationVisitor.php | 6 +- .../StatsAggregationVisitor.php | 6 +- .../SubtreeTermAggregationVisitor.php | 6 +- .../TermAggregationVisitor.php | 6 +- .../UserMetadataTermAggregationVisitor.php | 10 +-- .../Common/CriterionVisitor/Aggregate.php | 12 ++-- .../CriterionVisitor/CompositeCriterion.php | 2 +- .../Common/CriterionVisitor/ContentIdIn.php | 6 +- .../CriterionVisitor/ContentTypeGroupIdIn.php | 6 +- .../CriterionVisitor/ContentTypeIdIn.php | 6 +- .../ContentTypeIdentifierIn.php | 12 ++-- .../CustomField/CustomFieldIn.php | 6 +- .../CustomField/CustomFieldRange.php | 6 +- .../DateMetadata/ModifiedBetween.php | 6 +- .../DateMetadata/ModifiedIn.php | 6 +- .../DateMetadata/PublishedBetween.php | 6 +- .../DateMetadata/PublishedIn.php | 6 +- .../Factory/FullTextFactoryAbstract.php | 10 +-- .../Query/Common/CriterionVisitor/Field.php | 18 ++--- .../CriterionVisitor/Field/FieldEmpty.php | 18 ++--- .../Common/CriterionVisitor/Field/FieldIn.php | 14 ++-- .../CriterionVisitor/Field/FieldLike.php | 14 ++-- .../CriterionVisitor/Field/FieldRange.php | 14 ++-- .../CriterionVisitor/Field/FieldRelation.php | 14 ++-- .../CriterionVisitor/LanguageCodeIn.php | 6 +- .../Common/CriterionVisitor/LogicalAnd.php | 6 +- .../Common/CriterionVisitor/LogicalNot.php | 4 +- .../Common/CriterionVisitor/LogicalOr.php | 6 +- .../Common/CriterionVisitor/MapLocation.php | 6 +- .../MapLocation/MapLocationDistanceIn.php | 16 ++--- .../MapLocation/MapLocationDistanceRange.php | 16 ++--- .../Common/CriterionVisitor/MatchAll.php | 4 +- .../Common/CriterionVisitor/MatchNone.php | 4 +- .../CriterionVisitor/ObjectStateIdIn.php | 6 +- .../ObjectStateIdentifierIn.php | 4 +- .../Common/CriterionVisitor/RemoteIdIn.php | 6 +- .../CriterionVisitor/SectionIdentifierIn.php | 4 +- .../Common/CriterionVisitor/SectionIn.php | 6 +- .../Common/CriterionVisitor/UserEmailIn.php | 4 +- .../Common/CriterionVisitor/UserIdIn.php | 4 +- .../Common/CriterionVisitor/UserLoginIn.php | 4 +- .../CriterionVisitor/UserMetadataIn.php | 10 +-- .../Common/FacetBuilderVisitor/Aggregate.php | 6 +- .../FacetBuilderVisitor/ContentType.php | 4 +- .../Common/FacetBuilderVisitor/Section.php | 4 +- .../Query/Common/FacetBuilderVisitor/User.php | 8 +-- .../QueryConverter/NativeQueryConverter.php | 20 +++--- .../Common/SortClauseVisitor/Aggregate.php | 10 +-- .../Common/SortClauseVisitor/ContentId.php | 2 +- .../Common/SortClauseVisitor/ContentName.php | 2 +- .../ContentTranslatedName.php | 2 +- .../Common/SortClauseVisitor/CustomField.php | 4 +- .../Common/SortClauseVisitor/DateModified.php | 2 +- .../SortClauseVisitor/DatePublished.php | 2 +- .../Query/Common/SortClauseVisitor/Field.php | 20 +++--- .../SortClauseVisitor/MapLocationDistance.php | 20 +++--- .../Query/Common/SortClauseVisitor/Random.php | 6 +- .../Query/Common/SortClauseVisitor/Score.php | 2 +- .../SortClauseVisitor/SectionIdentifier.php | 2 +- .../Common/SortClauseVisitor/SectionName.php | 2 +- .../Content/CriterionVisitor/Ancestor.php | 6 +- .../Factory/ContentFullTextFactory.php | 4 +- .../Factory/FullTextFactory.php | 14 ++-- .../Query/Content/CriterionVisitor/Field.php | 2 +- .../Content/CriterionVisitor/FullText.php | 14 ++-- .../Content/CriterionVisitor/LocationIdIn.php | 6 +- .../CriterionVisitor/LocationRemoteIdIn.php | 6 +- .../CriterionVisitor/ParentLocationIdIn.php | 6 +- .../Content/CriterionVisitor/SubtreeIn.php | 8 +-- .../Content/CriterionVisitor/Visibility.php | 6 +- src/lib/Query/FacetBuilderVisitor.php | 4 +- src/lib/Query/FacetFieldVisitor.php | 4 +- .../Location/CriterionVisitor/Ancestor.php | 6 +- .../Factory/LocationFullTextFactory.php | 4 +- .../Location/CriterionVisitor/FullText.php | 4 +- .../Location/DepthBetween.php | 6 +- .../CriterionVisitor/Location/DepthIn.php | 6 +- .../Location/IsMainLocation.php | 4 +- .../Location/PriorityBetween.php | 6 +- .../CriterionVisitor/Location/PriorityIn.php | 6 +- .../CriterionVisitor/LocationIdIn.php | 6 +- .../CriterionVisitor/LocationRemoteIdIn.php | 6 +- .../CriterionVisitor/ParentLocationIdIn.php | 6 +- .../Location/CriterionVisitor/SubtreeIn.php | 6 +- .../Location/CriterionVisitor/Visibility.php | 6 +- .../SortClauseVisitor/Location/Depth.php | 2 +- .../SortClauseVisitor/Location/Id.php | 2 +- .../Location/IsMainLocation.php | 2 +- .../SortClauseVisitor/Location/Path.php | 2 +- .../SortClauseVisitor/Location/Priority.php | 2 +- .../SortClauseVisitor/Location/Visibility.php | 2 +- src/lib/Query/QueryConverter.php | 2 +- .../solr/aggregation_result_extractors.yml | 52 +++++++-------- .../container/solr/aggregation_visitors.yml | 44 ++++++------- src/lib/ResultExtractor.php | 26 ++++---- .../DispatcherAggregationResultExtractor.php | 10 +-- .../NestedAggregationResultExtractor.php | 6 +- .../DateTimeRangeAggregationKeyMapper.php | 2 +- .../FloatRangeAggregationKeyMapper.php | 2 +- .../IntRangeAggregationKeyMapper.php | 2 +- .../NullRangeAggregationKeyMapper.php | 2 +- .../RangeAggregationResultExtractor.php | 20 +++--- .../StatsAggregationResultExtractor.php | 6 +- .../AuthorAggregationKeyMapper.php | 6 +- .../BooleanAggregationKeyMapper.php | 2 +- .../ContentTypeAggregationKeyMapper.php | 10 +-- .../ContentTypeGroupAggregationKeyMapper.php | 12 ++-- .../CountryAggregationKeyMapper.php | 6 +- .../InvertedBooleanAggregationKeyMapper.php | 2 +- .../LanguageAggregationKeyMapper.php | 6 +- .../LocationAggregationKeyMapper.php | 6 +- .../NullAggregationKeyMapper.php | 2 +- .../ObjectStateAggregationKeyMapper.php | 10 +-- .../SectionAggregationKeyMapper.php | 14 ++-- .../SubtreeAggregationKeyMapper.php | 4 +- .../UserMetadataAggregationKeyMapper.php | 16 ++--- .../TermAggregationResultExtractor.php | 10 +-- .../LoadingResultExtractor.php | 10 +-- .../ResultExtractor/NativeResultExtractor.php | 10 +-- tests/bootstrap.php | 1 - .../IbexaSolrExtensionExtensionTest.php | 2 +- .../lib/CoreFilter/CoreFilterRegistryTest.php | 2 +- tests/lib/Gateway/GatewayRegistryTest.php | 2 +- .../FieldMapper/BoostFactorProviderTest.php | 4 +- .../FieldMapper/IndexingDepthProviderTest.php | 2 +- .../CloudDistributionStrategyTest.php | 6 +- .../StandaloneDistributionStrategyTest.php | 6 +- tests/lib/Search/Gateway/EndpointTest.php | 2 +- .../AbstractAggregationVisitorTest.php | 6 +- ...earchFieldAggregationFieldResolverTest.php | 2 +- ...ateMetadataRangeAggregationVisitorTest.php | 6 +- .../DispatcherAggregationVisitorTest.php | 2 +- ...ObjectStateGroupAggregationVisitorTest.php | 4 +- .../RangeAggregationVisitorTest.php | 8 +-- .../StatsAggregationVisitorTest.php | 6 +- .../SubtreeTermAggregationVisitorTest.php | 4 +- .../TermAggregationVisitorTest.php | 6 +- ...UserMetadataTermAggregationVisitorTest.php | 4 +- .../Content/CriterionVisitor/FullTextTest.php | 10 +-- ...AbstractAggregationResultExtractorTest.php | 6 +- ...spatcherAggregationResultExtractorTest.php | 6 +- .../NestedAggregationResultExtractorTest.php | 8 +-- .../AbstractRangeAggregationKeyMapperTest.php | 2 +- .../RangeAggregationResultExtractorTest.php | 12 ++-- .../StatsAggregationResultExtractorTest.php | 6 +- .../AuthorAggregationKeyMapperTest.php | 6 +- .../BooleanAggregationKeyMapperTest.php | 2 +- .../ContentTypeAggregationKeyMapperTest.php | 8 +-- ...ntentTypeGroupAggregationKeyMapperTest.php | 8 +-- .../CountryAggregationKeyMapperTest.php | 4 +- ...nvertedBooleanAggregationKeyMapperTest.php | 2 +- .../LanguageAggregationKeyMapperTest.php | 10 +-- .../LocationAggregationKeyMapperTest.php | 10 +-- .../NullAggregationKeyMapperTest.php | 2 +- .../ObjectStateAggregationKeyMapperTest.php | 12 ++-- .../SectionAggregationKeyMapperTest.php | 10 +-- .../SubtreeAggregationKeyMapperTest.php | 6 +- .../UserMetadataAggregationKeyMapperTest.php | 14 ++-- .../TermAggregationResultExtractorTest.php | 10 +-- tests/lib/SetupFactory/LegacySetupFactory.php | 20 +++--- 218 files changed, 860 insertions(+), 861 deletions(-) diff --git a/composer.json b/composer.json index 28a8f52c..70f0ed65 100644 --- a/composer.json +++ b/composer.json @@ -13,9 +13,9 @@ } ], "require": { - "php": "^7.3", + "php": "^7.4", "ext-json": "*", - "ezsystems/ezplatform-kernel": "^4.0@dev", + "ibexa/core": "^4.0@dev", "netgen/query-translator": "^1.0.2", "symfony/http-kernel": "^5.0", "symfony/dependency-injection": "^5.0", @@ -24,10 +24,10 @@ "symfony/framework-bundle": "^5.0" }, "require-dev": { - "ezsystems/doctrine-dbal-schema": "^4.0@dev", + "ibexa/doctrine-dbal-schema": "^4.0@dev", "phpunit/phpunit": "^8.2", "matthiasnoback/symfony-dependency-injection-test": "^4.1", - "ezsystems/ezplatform-code-style": "^0.1.0" + "ibexa/code-style": "^1.0" }, "autoload": { "psr-4": { diff --git a/src/bundle/ApiLoader/BoostFactorProviderFactory.php b/src/bundle/ApiLoader/BoostFactorProviderFactory.php index 5866760c..f247d2cd 100644 --- a/src/bundle/ApiLoader/BoostFactorProviderFactory.php +++ b/src/bundle/ApiLoader/BoostFactorProviderFactory.php @@ -8,7 +8,7 @@ */ namespace Ibexa\Bundle\Solr\ApiLoader; -use eZ\Bundle\EzPublishCoreBundle\ApiLoader\RepositoryConfigurationProvider; +use Ibexa\Bundle\Core\ApiLoader\RepositoryConfigurationProvider; use Symfony\Component\DependencyInjection\ContainerAwareInterface; use Symfony\Component\DependencyInjection\ContainerAwareTrait; @@ -20,7 +20,7 @@ class BoostFactorProviderFactory implements ContainerAwareInterface use ContainerAwareTrait; /** - * @var \eZ\Bundle\EzPublishCoreBundle\ApiLoader\RepositoryConfigurationProvider + * @var \Ibexa\Bundle\Core\ApiLoader\RepositoryConfigurationProvider */ private $repositoryConfigurationProvider; diff --git a/src/bundle/ApiLoader/IndexingDepthProviderFactory.php b/src/bundle/ApiLoader/IndexingDepthProviderFactory.php index fcc2b637..39db3603 100644 --- a/src/bundle/ApiLoader/IndexingDepthProviderFactory.php +++ b/src/bundle/ApiLoader/IndexingDepthProviderFactory.php @@ -8,7 +8,7 @@ namespace Ibexa\Bundle\Solr\ApiLoader; -use eZ\Bundle\EzPublishCoreBundle\ApiLoader\RepositoryConfigurationProvider; +use Ibexa\Bundle\Core\ApiLoader\RepositoryConfigurationProvider; use Symfony\Component\DependencyInjection\ContainerAwareInterface; use Symfony\Component\DependencyInjection\ContainerAwareTrait; @@ -17,7 +17,7 @@ class IndexingDepthProviderFactory implements ContainerAwareInterface use ContainerAwareTrait; /** - * @var \eZ\Bundle\EzPublishCoreBundle\ApiLoader\RepositoryConfigurationProvider + * @var \Ibexa\Bundle\Core\ApiLoader\RepositoryConfigurationProvider */ private $repositoryConfigurationProvider; diff --git a/src/bundle/ApiLoader/SolrEngineFactory.php b/src/bundle/ApiLoader/SolrEngineFactory.php index 0ebfe226..db4ad31c 100644 --- a/src/bundle/ApiLoader/SolrEngineFactory.php +++ b/src/bundle/ApiLoader/SolrEngineFactory.php @@ -10,8 +10,8 @@ */ namespace Ibexa\Bundle\Solr\ApiLoader; -use eZ\Bundle\EzPublishCoreBundle\ApiLoader\RepositoryConfigurationProvider; -use eZ\Publish\SPI\Persistence\Content\Handler; +use Ibexa\Bundle\Core\ApiLoader\RepositoryConfigurationProvider; +use Ibexa\Contracts\Core\Persistence\Content\Handler; use Ibexa\Solr\CoreFilter\CoreFilterRegistry; use Ibexa\Contracts\Solr\DocumentMapper; use Ibexa\Solr\Gateway\GatewayRegistry; @@ -19,7 +19,7 @@ class SolrEngineFactory { - /** @var \eZ\Bundle\EzPublishCoreBundle\ApiLoader\RepositoryConfigurationProvider */ + /** @var \Ibexa\Bundle\Core\ApiLoader\RepositoryConfigurationProvider */ private $repositoryConfigurationProvider; /** @var string */ @@ -28,22 +28,22 @@ class SolrEngineFactory /** @var string */ private $searchEngineClass; - /** @var \EzSystems\EzPlatformSolrSearchEngine\Gateway\GatewayRegistry */ + /** @var \Ibexa\Solr\Gateway\GatewayRegistry */ private $gatewayRegistry; - /** @var \EzSystems\EzPlatformSolrSearchEngine\CoreFilter\CoreFilterRegistry */ + /** @var \Ibexa\Solr\CoreFilter\CoreFilterRegistry */ private $coreFilterRegistry; - /** @var \eZ\Publish\SPI\Persistence\Content\Handler */ + /** @var \Ibexa\Contracts\Core\Persistence\Content\Handler */ private $contentHandler; - /** @var \EzSystems\EzPlatformSolrSearchEngine\DocumentMapper */ + /** @var \Ibexa\Contracts\Solr\DocumentMapper */ private $documentMapper; - /** @var \EzSystems\EzPlatformSolrSearchEngine\ResultExtractor */ + /** @var \Ibexa\Solr\ResultExtractor */ private $contentResultExtractor; - /** @var \EzSystems\EzPlatformSolrSearchEngine\ResultExtractor */ + /** @var \Ibexa\Solr\ResultExtractor */ private $locationResultExtractor; public function __construct( diff --git a/src/bundle/DependencyInjection/IbexaSolrExtension.php b/src/bundle/DependencyInjection/IbexaSolrExtension.php index d52a7bec..599dd37c 100644 --- a/src/bundle/DependencyInjection/IbexaSolrExtension.php +++ b/src/bundle/DependencyInjection/IbexaSolrExtension.php @@ -98,7 +98,7 @@ private function getServicePrefix(): string * Loads a specific configuration. * * @param array $configs An array of configuration values - * @param ContainerBuilder $container A ContainerBuilder instance + * @param \Symfony\Component\DependencyInjection\ContainerBuilder $container A ContainerBuilder instance * * @throws \InvalidArgumentException When provided tag is not defined in this extension * @@ -173,7 +173,7 @@ protected function processConnectionConfiguration(ContainerBuilder $container, a /** * Creates needed search services for given connection name and parameters. * - * @param ContainerBuilder $container + * @param \Symfony\Component\DependencyInjection\ContainerBuilder $container * @param string $connectionName * @param array $connectionParams */ @@ -228,7 +228,7 @@ private function configureSearchServices(ContainerBuilder $container, $connectio /** * Creates boost factor map parameter for a given $connectionName. * - * @param ContainerBuilder $container + * @param \Symfony\Component\DependencyInjection\ContainerBuilder $container * @param string $connectionName * @param array $connectionParams */ @@ -244,7 +244,7 @@ private function configureBoostMap(ContainerBuilder $container, $connectionName, /** * Creates indexing depth map parameter for a given $connectionName. * - * @param ContainerBuilder $container + * @param \Symfony\Component\DependencyInjection\ContainerBuilder $container * @param string $connectionName * @param array $connectionParams */ @@ -285,7 +285,7 @@ public function getConfiguration(array $config, ContainerBuilder $container) /** * Builds boost factor map from the given $config. * - * @see \EzSystems\EzPlatformSolrSearchEngine\FieldMapper\BoostFactorProvider::$map + * @see \Ibexa\Solr\FieldMapper\BoostFactorProvider::$map * * @param array $config * diff --git a/src/bundle/IbexaSolrBundle.php b/src/bundle/IbexaSolrBundle.php index 782da10d..43b0578f 100644 --- a/src/bundle/IbexaSolrBundle.php +++ b/src/bundle/IbexaSolrBundle.php @@ -20,8 +20,8 @@ use Ibexa\Solr\Container\Compiler\AggregateSortClauseVisitorPass; use Ibexa\Solr\Container\Compiler\FieldMapperPass; use Ibexa\Solr\Container\Compiler\EndpointRegistryPass; -use eZ\Publish\Core\Base\Container\Compiler\Search\AggregateFieldValueMapperPass; -use eZ\Publish\Core\Base\Container\Compiler\Search\FieldRegistryPass; +use Ibexa\Core\Base\Container\Compiler\Search\AggregateFieldValueMapperPass; +use Ibexa\Core\Base\Container\Compiler\Search\FieldRegistryPass; class IbexaSolrBundle extends Bundle { diff --git a/src/contracts/DocumentMapper.php b/src/contracts/DocumentMapper.php index 9172917a..aba812f1 100644 --- a/src/contracts/DocumentMapper.php +++ b/src/contracts/DocumentMapper.php @@ -10,8 +10,8 @@ */ namespace Ibexa\Contracts\Solr; -use eZ\Publish\SPI\Persistence\Content; -use eZ\Publish\SPI\Persistence\Content\Location; +use Ibexa\Contracts\Core\Persistence\Content; +use Ibexa\Contracts\Core\Persistence\Content\Location; /** * Mapper maps Content and Location objects to a Document objects, representing a @@ -41,7 +41,7 @@ interface DocumentMapper * * Each Content Document contains nested Documents representing it's Locations. * - * @return \eZ\Publish\SPI\Search\Document[] + * @return \Ibexa\Contracts\Core\Search\Document[] */ public function mapContentBlock(Content $content); diff --git a/src/contracts/FieldMapper/ContentFieldMapper.php b/src/contracts/FieldMapper/ContentFieldMapper.php index f0fd0c1f..8b5ab882 100644 --- a/src/contracts/FieldMapper/ContentFieldMapper.php +++ b/src/contracts/FieldMapper/ContentFieldMapper.php @@ -8,7 +8,7 @@ */ namespace Ibexa\Contracts\Solr\FieldMapper; -use eZ\Publish\SPI\Persistence\Content as SPIContent; +use Ibexa\Contracts\Core\Persistence\Content as SPIContent; /** * Base class for Content document field mapper. @@ -27,7 +27,7 @@ abstract public function accept(SPIContent $content); /** * Maps given $content to an array of search fields. * - * @return \eZ\Publish\SPI\Search\Field[] + * @return \Ibexa\Contracts\Core\Search\Field[] */ abstract public function mapFields(SPIContent $content); } diff --git a/src/contracts/FieldMapper/ContentTranslationFieldMapper.php b/src/contracts/FieldMapper/ContentTranslationFieldMapper.php index d0071ba8..fdc7cd40 100644 --- a/src/contracts/FieldMapper/ContentTranslationFieldMapper.php +++ b/src/contracts/FieldMapper/ContentTranslationFieldMapper.php @@ -8,7 +8,7 @@ */ namespace Ibexa\Contracts\Solr\FieldMapper; -use eZ\Publish\SPI\Persistence\Content as SPIContent; +use Ibexa\Contracts\Core\Persistence\Content as SPIContent; /** * Base class for Content translation document field mapper. @@ -32,7 +32,7 @@ abstract public function accept(SPIContent $content, $languageCode); * * @param string $languageCode * - * @return \eZ\Publish\SPI\Search\Field[] + * @return \Ibexa\Contracts\Core\Search\Field[] */ abstract public function mapFields(SPIContent $content, $languageCode); } diff --git a/src/contracts/FieldMapper/LocationFieldMapper.php b/src/contracts/FieldMapper/LocationFieldMapper.php index a73bf525..702dcf3f 100644 --- a/src/contracts/FieldMapper/LocationFieldMapper.php +++ b/src/contracts/FieldMapper/LocationFieldMapper.php @@ -8,7 +8,7 @@ */ namespace Ibexa\Contracts\Solr\FieldMapper; -use eZ\Publish\SPI\Persistence\Content\Location as SPILocation; +use Ibexa\Contracts\Core\Persistence\Content\Location as SPILocation; /** * Base class for Location document field mappers. @@ -27,7 +27,7 @@ abstract public function accept(SPILocation $location); /** * Maps given $location to an array of search fields. * - * @return \eZ\Publish\SPI\Search\Field[] + * @return \Ibexa\Contracts\Core\Search\Field[] */ abstract public function mapFields(SPILocation $location); } diff --git a/src/contracts/Query/AggregationVisitor.php b/src/contracts/Query/AggregationVisitor.php index d546a2b7..3c101684 100644 --- a/src/contracts/Query/AggregationVisitor.php +++ b/src/contracts/Query/AggregationVisitor.php @@ -8,7 +8,7 @@ namespace Ibexa\Contracts\Solr\Query; -use eZ\Publish\API\Repository\Values\Content\Query\Aggregation; +use Ibexa\Contracts\Core\Repository\Values\Content\Query\Aggregation; interface AggregationVisitor { diff --git a/src/contracts/Query/Common/AggregationVisitor/AggregationFieldResolver.php b/src/contracts/Query/Common/AggregationVisitor/AggregationFieldResolver.php index 54048feb..196b37e3 100644 --- a/src/contracts/Query/Common/AggregationVisitor/AggregationFieldResolver.php +++ b/src/contracts/Query/Common/AggregationVisitor/AggregationFieldResolver.php @@ -8,7 +8,7 @@ namespace Ibexa\Contracts\Solr\Query\Common\AggregationVisitor; -use eZ\Publish\API\Repository\Values\Content\Query\Aggregation; +use Ibexa\Contracts\Core\Repository\Values\Content\Query\Aggregation; /** * Resolves search index field name used for aggregation. diff --git a/src/contracts/Query/CriterionVisitor.php b/src/contracts/Query/CriterionVisitor.php index 9a14810b..ef36670e 100644 --- a/src/contracts/Query/CriterionVisitor.php +++ b/src/contracts/Query/CriterionVisitor.php @@ -10,8 +10,8 @@ */ namespace Ibexa\Contracts\Solr\Query; -use eZ\Publish\API\Repository\Values\Content\Query\Criterion; -use eZ\Publish\API\Repository\Values\Content\Query\Criterion\Operator; +use Ibexa\Contracts\Core\Repository\Values\Content\Query\Criterion; +use Ibexa\Contracts\Core\Repository\Values\Content\Query\Criterion\Operator; /** * Visits the criterion tree into a Solr query. diff --git a/src/contracts/Query/SortClauseVisitor.php b/src/contracts/Query/SortClauseVisitor.php index c31ed09a..953c2ede 100644 --- a/src/contracts/Query/SortClauseVisitor.php +++ b/src/contracts/Query/SortClauseVisitor.php @@ -10,7 +10,7 @@ */ namespace Ibexa\Contracts\Solr\Query; -use eZ\Publish\API\Repository\Values\Content\Query\SortClause; +use Ibexa\Contracts\Core\Repository\Values\Content\Query\SortClause; /** * Visits the sort clause into a Solr query. diff --git a/src/contracts/ResultExtractor/AggregationResultExtractor.php b/src/contracts/ResultExtractor/AggregationResultExtractor.php index 68956035..f141fba2 100644 --- a/src/contracts/ResultExtractor/AggregationResultExtractor.php +++ b/src/contracts/ResultExtractor/AggregationResultExtractor.php @@ -8,8 +8,8 @@ namespace Ibexa\Contracts\Solr\ResultExtractor; -use eZ\Publish\API\Repository\Values\Content\Query\Aggregation; -use eZ\Publish\API\Repository\Values\Content\Search\AggregationResult; +use Ibexa\Contracts\Core\Repository\Values\Content\Query\Aggregation; +use Ibexa\Contracts\Core\Repository\Values\Content\Search\AggregationResult; use stdClass; interface AggregationResultExtractor diff --git a/src/contracts/ResultExtractor/AggregationResultExtractor/RangeAggregationKeyMapper.php b/src/contracts/ResultExtractor/AggregationResultExtractor/RangeAggregationKeyMapper.php index 21e3aac0..4f0f3db8 100644 --- a/src/contracts/ResultExtractor/AggregationResultExtractor/RangeAggregationKeyMapper.php +++ b/src/contracts/ResultExtractor/AggregationResultExtractor/RangeAggregationKeyMapper.php @@ -8,7 +8,7 @@ namespace Ibexa\Contracts\Solr\ResultExtractor\AggregationResultExtractor; -use eZ\Publish\API\Repository\Values\Content\Query\Aggregation; +use Ibexa\Contracts\Core\Repository\Values\Content\Query\Aggregation; interface RangeAggregationKeyMapper { diff --git a/src/contracts/ResultExtractor/AggregationResultExtractor/TermAggregationKeyMapper.php b/src/contracts/ResultExtractor/AggregationResultExtractor/TermAggregationKeyMapper.php index eac16f55..e2272d46 100644 --- a/src/contracts/ResultExtractor/AggregationResultExtractor/TermAggregationKeyMapper.php +++ b/src/contracts/ResultExtractor/AggregationResultExtractor/TermAggregationKeyMapper.php @@ -8,7 +8,7 @@ namespace Ibexa\Contracts\Solr\ResultExtractor\AggregationResultExtractor; -use eZ\Publish\API\Repository\Values\Content\Query\Aggregation; +use Ibexa\Contracts\Core\Repository\Values\Content\Query\Aggregation; interface TermAggregationKeyMapper { diff --git a/src/lib/CoreFilter.php b/src/lib/CoreFilter.php index 49a09111..81ec3635 100644 --- a/src/lib/CoreFilter.php +++ b/src/lib/CoreFilter.php @@ -10,7 +10,7 @@ */ namespace Ibexa\Solr; -use eZ\Publish\API\Repository\Values\Content\Query; +use Ibexa\Contracts\Core\Repository\Values\Content\Query; /** * Core filter applies conditions on a query object ensuring matching of correct diff --git a/src/lib/CoreFilter/CoreFilterRegistry.php b/src/lib/CoreFilter/CoreFilterRegistry.php index a1831362..4c76c82c 100644 --- a/src/lib/CoreFilter/CoreFilterRegistry.php +++ b/src/lib/CoreFilter/CoreFilterRegistry.php @@ -13,11 +13,11 @@ final class CoreFilterRegistry { - /** @var \EzSystems\EzPlatformSolrSearchEngine\CoreFilter[] */ + /** @var \Ibexa\Solr\CoreFilter[] */ private $coreFilters; /** - * @param \EzSystems\EzPlatformSolrSearchEngine\CoreFilter[] $coreFilters + * @param \Ibexa\Solr\CoreFilter[] $coreFilters */ public function __construct(array $coreFilters = []) { @@ -25,7 +25,7 @@ public function __construct(array $coreFilters = []) } /** - * @return \EzSystems\EzPlatformSolrSearchEngine\CoreFilter[] $coreFilters + * @return \Ibexa\Solr\CoreFilter[] $coreFilters */ public function getCoreFilters(): array { @@ -33,7 +33,7 @@ public function getCoreFilters(): array } /** - * @param \EzSystems\EzPlatformSolrSearchEngine\CoreFilter[] $coreFilters + * @param \Ibexa\Solr\CoreFilter[] $coreFilters */ public function setCoreFilters(array $coreFilters): void { diff --git a/src/lib/CoreFilter/NativeCoreFilter.php b/src/lib/CoreFilter/NativeCoreFilter.php index 7ac702ca..c16966b8 100644 --- a/src/lib/CoreFilter/NativeCoreFilter.php +++ b/src/lib/CoreFilter/NativeCoreFilter.php @@ -10,13 +10,13 @@ */ namespace Ibexa\Solr\CoreFilter; -use eZ\Publish\API\Repository\Values\Content\Query; -use eZ\Publish\API\Repository\Values\Content\Query\Criterion; -use eZ\Publish\API\Repository\Values\Content\Query\Criterion\CustomField; -use eZ\Publish\API\Repository\Values\Content\Query\Criterion\LogicalAnd; -use eZ\Publish\API\Repository\Values\Content\Query\Criterion\LogicalNot; -use eZ\Publish\API\Repository\Values\Content\Query\Criterion\LogicalOr; -use eZ\Publish\API\Repository\Values\Content\Query\Criterion\Operator; +use Ibexa\Contracts\Core\Repository\Values\Content\Query; +use Ibexa\Contracts\Core\Repository\Values\Content\Query\Criterion; +use Ibexa\Contracts\Core\Repository\Values\Content\Query\Criterion\CustomField; +use Ibexa\Contracts\Core\Repository\Values\Content\Query\Criterion\LogicalAnd; +use Ibexa\Contracts\Core\Repository\Values\Content\Query\Criterion\LogicalNot; +use Ibexa\Contracts\Core\Repository\Values\Content\Query\Criterion\LogicalOr; +use Ibexa\Contracts\Core\Repository\Values\Content\Query\Criterion\Operator; use Ibexa\Solr\CoreFilter; use Ibexa\Solr\Gateway\EndpointResolver; @@ -168,7 +168,7 @@ private function getCoreCriterion( * * @param string[] $languageCodes * - * @return \eZ\Publish\API\Repository\Values\Content\Query\Criterion + * @return \Ibexa\Contracts\Core\Repository\Values\Content\Query\Criterion */ private function getLanguageFilter(array $languageCodes) { diff --git a/src/lib/DocumentMapper/NativeDocumentMapper.php b/src/lib/DocumentMapper/NativeDocumentMapper.php index 97386d10..a8e0ed56 100644 --- a/src/lib/DocumentMapper/NativeDocumentMapper.php +++ b/src/lib/DocumentMapper/NativeDocumentMapper.php @@ -10,10 +10,10 @@ */ namespace Ibexa\Solr\DocumentMapper; -use eZ\Publish\SPI\Persistence\Content; -use eZ\Publish\SPI\Persistence\Content\Location; -use eZ\Publish\SPI\Persistence\Content\Location\Handler as LocationHandler; -use eZ\Publish\SPI\Search\Document; +use Ibexa\Contracts\Core\Persistence\Content; +use Ibexa\Contracts\Core\Persistence\Content\Location; +use Ibexa\Contracts\Core\Persistence\Content\Location\Handler as LocationHandler; +use Ibexa\Contracts\Core\Search\Document; use Ibexa\Contracts\Solr\DocumentMapper; use Ibexa\Contracts\Solr\FieldMapper\ContentFieldMapper; use Ibexa\Contracts\Solr\FieldMapper\ContentTranslationFieldMapper; @@ -25,34 +25,34 @@ class NativeDocumentMapper implements DocumentMapper { /** - * @var \EzSystems\EzPlatformSolrSearchEngine\FieldMapper\ContentFieldMapper + * @var \Ibexa\Contracts\Solr\FieldMapper\ContentFieldMapper */ private $blockFieldMapper; /** - * @var \EzSystems\EzPlatformSolrSearchEngine\FieldMapper\ContentTranslationFieldMapper + * @var \Ibexa\Contracts\Solr\FieldMapper\ContentTranslationFieldMapper */ private $blockTranslationFieldMapper; /** - * @var \EzSystems\EzPlatformSolrSearchEngine\FieldMapper\ContentFieldMapper + * @var \Ibexa\Contracts\Solr\FieldMapper\ContentFieldMapper */ private $contentFieldMapper; /** - * @var \EzSystems\EzPlatformSolrSearchEngine\FieldMapper\ContentTranslationFieldMapper + * @var \Ibexa\Contracts\Solr\FieldMapper\ContentTranslationFieldMapper */ private $contentTranslationFieldMapper; /** - * @var \EzSystems\EzPlatformSolrSearchEngine\FieldMapper\LocationFieldMapper + * @var \Ibexa\Contracts\Solr\FieldMapper\LocationFieldMapper */ private $locationFieldMapper; /** * Location handler. * - * @var \eZ\Publish\SPI\Persistence\Content\Location\Handler + * @var \Ibexa\Contracts\Core\Persistence\Content\Location\Handler */ protected $locationHandler; @@ -78,7 +78,7 @@ public function __construct( /** * Maps given Content to a Document. * - * @return \eZ\Publish\SPI\Search\Document[] + * @return \Ibexa\Contracts\Core\Search\Document[] */ public function mapContentBlock(Content $content) { @@ -187,7 +187,7 @@ public function generateLocationDocumentId($locationId, $languageCode = null) * Returns an array of fields for the given $content, to be added to the * corresponding block documents. * - * @return \eZ\Publish\SPI\Search\Field[] + * @return \Ibexa\Contracts\Core\Search\Field[] */ private function getBlockFields(Content $content) { @@ -206,7 +206,7 @@ private function getBlockFields(Content $content) * * @param string $languageCode * - * @return \eZ\Publish\SPI\Search\Field[] + * @return \Ibexa\Contracts\Core\Search\Field[] */ private function getBlockTranslationFields(Content $content, $languageCode) { @@ -223,7 +223,7 @@ private function getBlockTranslationFields(Content $content, $languageCode) * Returns an array of fields for the given $content, to be added to the corresponding * Content document. * - * @return \eZ\Publish\SPI\Search\Field[] + * @return \Ibexa\Contracts\Core\Search\Field[] */ private function getContentFields(Content $content) { @@ -242,7 +242,7 @@ private function getContentFields(Content $content) * * @param string $languageCode * - * @return \eZ\Publish\SPI\Search\Field[] + * @return \Ibexa\Contracts\Core\Search\Field[] */ private function getContentTranslationFields(Content $content, $languageCode) { @@ -259,7 +259,7 @@ private function getContentTranslationFields(Content $content, $languageCode) * Returns an array of fields for the given $location, to be added to the corresponding * Location document. * - * @return \eZ\Publish\SPI\Search\Field[] + * @return \Ibexa\Contracts\Core\Search\Field[] */ private function getLocationFields(Location $location) { diff --git a/src/lib/FieldMapper/BoostFactorProvider.php b/src/lib/FieldMapper/BoostFactorProvider.php index 252d99e1..d8366659 100644 --- a/src/lib/FieldMapper/BoostFactorProvider.php +++ b/src/lib/FieldMapper/BoostFactorProvider.php @@ -8,8 +8,8 @@ */ namespace Ibexa\Solr\FieldMapper; -use eZ\Publish\SPI\Persistence\Content\Type as ContentType; -use eZ\Publish\SPI\Persistence\Content\Type\FieldDefinition; +use Ibexa\Contracts\Core\Persistence\Content\Type as ContentType; +use Ibexa\Contracts\Core\Persistence\Content\Type\FieldDefinition; /** * BoostFactorProvider provides boost factors for indexed fields. diff --git a/src/lib/FieldMapper/ContentFieldMapper/Aggregate.php b/src/lib/FieldMapper/ContentFieldMapper/Aggregate.php index e51b294f..8482975d 100644 --- a/src/lib/FieldMapper/ContentFieldMapper/Aggregate.php +++ b/src/lib/FieldMapper/ContentFieldMapper/Aggregate.php @@ -8,7 +8,7 @@ */ namespace Ibexa\Solr\FieldMapper\ContentFieldMapper; -use eZ\Publish\SPI\Persistence\Content; +use Ibexa\Contracts\Core\Persistence\Content; use Ibexa\Contracts\Solr\FieldMapper\ContentFieldMapper; /** @@ -19,12 +19,12 @@ class Aggregate extends ContentFieldMapper /** * An array of aggregated field mappers, sorted by priority. * - * @var \EzSystems\EzPlatformSolrSearchEngine\FieldMapper\ContentFieldMapper[] + * @var \Ibexa\Contracts\Solr\FieldMapper\ContentFieldMapper[] */ protected $mappers = []; /** - * @param \EzSystems\EzPlatformSolrSearchEngine\FieldMapper\ContentFieldMapper[] $mappers + * @param \Ibexa\Contracts\Solr\FieldMapper\ContentFieldMapper[] $mappers * An array of mappers, sorted by priority. */ public function __construct(array $mappers = []) diff --git a/src/lib/FieldMapper/ContentFieldMapper/BlockDocumentsBaseContentFields.php b/src/lib/FieldMapper/ContentFieldMapper/BlockDocumentsBaseContentFields.php index b0eee7c6..fb32d3f3 100644 --- a/src/lib/FieldMapper/ContentFieldMapper/BlockDocumentsBaseContentFields.php +++ b/src/lib/FieldMapper/ContentFieldMapper/BlockDocumentsBaseContentFields.php @@ -8,14 +8,14 @@ */ namespace Ibexa\Solr\FieldMapper\ContentFieldMapper; -use eZ\Publish\API\Repository\Exceptions\NotFoundException; -use eZ\Publish\SPI\Persistence\Content; -use eZ\Publish\SPI\Persistence\Content\Location\Handler as LocationHandler; -use eZ\Publish\SPI\Persistence\Content\ObjectState\Handler as ObjectStateHandler; -use eZ\Publish\SPI\Persistence\Content\Section\Handler as SectionHandler; -use eZ\Publish\SPI\Persistence\Content\Type\Handler as ContentTypeHandler; -use eZ\Publish\SPI\Search\Field; -use eZ\Publish\SPI\Search\FieldType; +use Ibexa\Contracts\Core\Repository\Exceptions\NotFoundException; +use Ibexa\Contracts\Core\Persistence\Content; +use Ibexa\Contracts\Core\Persistence\Content\Location\Handler as LocationHandler; +use Ibexa\Contracts\Core\Persistence\Content\ObjectState\Handler as ObjectStateHandler; +use Ibexa\Contracts\Core\Persistence\Content\Section\Handler as SectionHandler; +use Ibexa\Contracts\Core\Persistence\Content\Type\Handler as ContentTypeHandler; +use Ibexa\Contracts\Core\Search\Field; +use Ibexa\Contracts\Core\Search\FieldType; use Ibexa\Contracts\Solr\FieldMapper\ContentFieldMapper; /** @@ -24,22 +24,22 @@ class BlockDocumentsBaseContentFields extends ContentFieldMapper { /** - * @var \eZ\Publish\SPI\Persistence\Content\Location\Handler + * @var \Ibexa\Contracts\Core\Persistence\Content\Location\Handler */ protected $locationHandler; /** - * @var \eZ\Publish\SPI\Persistence\Content\Type\Handler + * @var \Ibexa\Contracts\Core\Persistence\Content\Type\Handler */ protected $contentTypeHandler; /** - * @var \eZ\Publish\SPI\Persistence\Content\ObjectState\Handler + * @var \Ibexa\Contracts\Core\Persistence\Content\ObjectState\Handler */ protected $objectStateHandler; /** - * @var \eZ\Publish\SPI\Persistence\Content\Section\Handler + * @var \Ibexa\Contracts\Core\Persistence\Content\Section\Handler */ protected $sectionHandler; diff --git a/src/lib/FieldMapper/ContentFieldMapper/ContentDocumentBaseFields.php b/src/lib/FieldMapper/ContentFieldMapper/ContentDocumentBaseFields.php index d0ec3afb..9397721a 100644 --- a/src/lib/FieldMapper/ContentFieldMapper/ContentDocumentBaseFields.php +++ b/src/lib/FieldMapper/ContentFieldMapper/ContentDocumentBaseFields.php @@ -8,9 +8,9 @@ */ namespace Ibexa\Solr\FieldMapper\ContentFieldMapper; -use eZ\Publish\SPI\Persistence\Content; -use eZ\Publish\SPI\Search\Field; -use eZ\Publish\SPI\Search\FieldType; +use Ibexa\Contracts\Core\Persistence\Content; +use Ibexa\Contracts\Core\Search\Field; +use Ibexa\Contracts\Core\Search\FieldType; use Ibexa\Contracts\Solr\DocumentMapper; use Ibexa\Contracts\Solr\FieldMapper\ContentFieldMapper; diff --git a/src/lib/FieldMapper/ContentFieldMapper/ContentDocumentLocationFields.php b/src/lib/FieldMapper/ContentFieldMapper/ContentDocumentLocationFields.php index c6bc617a..1ca816a4 100644 --- a/src/lib/FieldMapper/ContentFieldMapper/ContentDocumentLocationFields.php +++ b/src/lib/FieldMapper/ContentFieldMapper/ContentDocumentLocationFields.php @@ -8,11 +8,11 @@ */ namespace Ibexa\Solr\FieldMapper\ContentFieldMapper; -use eZ\Publish\SPI\Persistence\Content; -use eZ\Publish\SPI\Persistence\Content\Location; -use eZ\Publish\SPI\Persistence\Content\Location\Handler as LocationHandler; -use eZ\Publish\SPI\Search\Field; -use eZ\Publish\SPI\Search\FieldType; +use Ibexa\Contracts\Core\Persistence\Content; +use Ibexa\Contracts\Core\Persistence\Content\Location; +use Ibexa\Contracts\Core\Persistence\Content\Location\Handler as LocationHandler; +use Ibexa\Contracts\Core\Search\Field; +use Ibexa\Contracts\Core\Search\FieldType; use Ibexa\Contracts\Solr\FieldMapper\ContentFieldMapper; /** @@ -21,7 +21,7 @@ class ContentDocumentLocationFields extends ContentFieldMapper { /** - * @var \eZ\Publish\SPI\Persistence\Content\Location\Handler + * @var \Ibexa\Contracts\Core\Persistence\Content\Location\Handler */ protected $locationHandler; diff --git a/src/lib/FieldMapper/ContentFieldMapper/UserDocumentFields.php b/src/lib/FieldMapper/ContentFieldMapper/UserDocumentFields.php index 8cc46efc..e635c036 100644 --- a/src/lib/FieldMapper/ContentFieldMapper/UserDocumentFields.php +++ b/src/lib/FieldMapper/ContentFieldMapper/UserDocumentFields.php @@ -8,9 +8,9 @@ namespace Ibexa\Solr\FieldMapper\ContentFieldMapper; -use eZ\Publish\SPI\Persistence\Content as SPIContent; -use eZ\Publish\SPI\Search\Field; -use eZ\Publish\SPI\Search\FieldType; +use Ibexa\Contracts\Core\Persistence\Content as SPIContent; +use Ibexa\Contracts\Core\Search\Field; +use Ibexa\Contracts\Core\Search\FieldType; use Ibexa\Contracts\Solr\FieldMapper\ContentFieldMapper; final class UserDocumentFields extends ContentFieldMapper diff --git a/src/lib/FieldMapper/ContentTranslationFieldMapper/Aggregate.php b/src/lib/FieldMapper/ContentTranslationFieldMapper/Aggregate.php index 4a533d58..3a191706 100644 --- a/src/lib/FieldMapper/ContentTranslationFieldMapper/Aggregate.php +++ b/src/lib/FieldMapper/ContentTranslationFieldMapper/Aggregate.php @@ -8,7 +8,7 @@ */ namespace Ibexa\Solr\FieldMapper\ContentTranslationFieldMapper; -use eZ\Publish\SPI\Persistence\Content; +use Ibexa\Contracts\Core\Persistence\Content; use Ibexa\Contracts\Solr\FieldMapper\ContentTranslationFieldMapper; /** @@ -19,12 +19,12 @@ class Aggregate extends ContentTranslationFieldMapper /** * An array of aggregated field mappers, sorted by priority. * - * @var \EzSystems\EzPlatformSolrSearchEngine\FieldMapper\ContentTranslationFieldMapper[] + * @var \Ibexa\Contracts\Solr\FieldMapper\ContentTranslationFieldMapper[] */ protected $mappers = []; /** - * @param \EzSystems\EzPlatformSolrSearchEngine\FieldMapper\ContentTranslationFieldMapper[] $mappers + * @param \Ibexa\Contracts\Solr\FieldMapper\ContentTranslationFieldMapper[] $mappers * An array of mappers, sorted by priority. */ public function __construct(array $mappers = []) diff --git a/src/lib/FieldMapper/ContentTranslationFieldMapper/BlockDocumentsContentFields.php b/src/lib/FieldMapper/ContentTranslationFieldMapper/BlockDocumentsContentFields.php index b522f502..250ea0cd 100644 --- a/src/lib/FieldMapper/ContentTranslationFieldMapper/BlockDocumentsContentFields.php +++ b/src/lib/FieldMapper/ContentTranslationFieldMapper/BlockDocumentsContentFields.php @@ -8,14 +8,14 @@ */ namespace Ibexa\Solr\FieldMapper\ContentTranslationFieldMapper; -use eZ\Publish\Core\Search\Common\FieldNameGenerator; -use eZ\Publish\Core\Search\Common\FieldRegistry; -use eZ\Publish\SPI\Persistence\Content; -use eZ\Publish\SPI\Persistence\Content\Type as ContentType; -use eZ\Publish\SPI\Persistence\Content\Type\FieldDefinition; -use eZ\Publish\SPI\Persistence\Content\Type\Handler as ContentTypeHandler; -use eZ\Publish\SPI\Search\Field; -use eZ\Publish\SPI\Search\FieldType; +use Ibexa\Core\Search\Common\FieldNameGenerator; +use Ibexa\Core\Search\Common\FieldRegistry; +use Ibexa\Contracts\Core\Persistence\Content; +use Ibexa\Contracts\Core\Persistence\Content\Type as ContentType; +use Ibexa\Contracts\Core\Persistence\Content\Type\FieldDefinition; +use Ibexa\Contracts\Core\Persistence\Content\Type\Handler as ContentTypeHandler; +use Ibexa\Contracts\Core\Search\Field; +use Ibexa\Contracts\Core\Search\FieldType; use Ibexa\Solr\FieldMapper\BoostFactorProvider; use Ibexa\Contracts\Solr\FieldMapper\ContentTranslationFieldMapper; @@ -25,22 +25,22 @@ class BlockDocumentsContentFields extends ContentTranslationFieldMapper { /** - * @var \eZ\Publish\SPI\Persistence\Content\Type\Handler + * @var \Ibexa\Contracts\Core\Persistence\Content\Type\Handler */ protected $contentTypeHandler; /** - * @var \eZ\Publish\Core\Search\Common\FieldRegistry + * @var \Ibexa\Core\Search\Common\FieldRegistry */ protected $fieldRegistry; /** - * @var \eZ\Publish\Core\Search\Common\FieldNameGenerator + * @var \Ibexa\Core\Search\Common\FieldNameGenerator */ protected $fieldNameGenerator; /** - * @var \EzSystems\EzPlatformSolrSearchEngine\FieldMapper\BoostFactorProvider + * @var \Ibexa\Solr\FieldMapper\BoostFactorProvider */ protected $boostFactorProvider; @@ -109,7 +109,7 @@ public function mapFields(Content $content, $languageCode) /** * Return index field type for the given arguments. * - * @return \eZ\Publish\SPI\Search\FieldType + * @return \Ibexa\Contracts\Core\Search\FieldType */ private function getIndexFieldType( ContentType $contentType, diff --git a/src/lib/FieldMapper/ContentTranslationFieldMapper/BlockDocumentsMetaFields.php b/src/lib/FieldMapper/ContentTranslationFieldMapper/BlockDocumentsMetaFields.php index 19adb954..019ced85 100644 --- a/src/lib/FieldMapper/ContentTranslationFieldMapper/BlockDocumentsMetaFields.php +++ b/src/lib/FieldMapper/ContentTranslationFieldMapper/BlockDocumentsMetaFields.php @@ -8,9 +8,9 @@ */ namespace Ibexa\Solr\FieldMapper\ContentTranslationFieldMapper; -use eZ\Publish\SPI\Persistence\Content; -use eZ\Publish\SPI\Search\Field; -use eZ\Publish\SPI\Search\FieldType; +use Ibexa\Contracts\Core\Persistence\Content; +use Ibexa\Contracts\Core\Search\Field; +use Ibexa\Contracts\Core\Search\FieldType; use Ibexa\Contracts\Solr\FieldMapper\ContentTranslationFieldMapper; /** diff --git a/src/lib/FieldMapper/ContentTranslationFieldMapper/ContentDocumentEmptyFields.php b/src/lib/FieldMapper/ContentTranslationFieldMapper/ContentDocumentEmptyFields.php index ce8c7d18..16d77a05 100644 --- a/src/lib/FieldMapper/ContentTranslationFieldMapper/ContentDocumentEmptyFields.php +++ b/src/lib/FieldMapper/ContentTranslationFieldMapper/ContentDocumentEmptyFields.php @@ -8,12 +8,12 @@ namespace Ibexa\Solr\FieldMapper\ContentTranslationFieldMapper; -use eZ\Publish\Core\Persistence\FieldTypeRegistry; -use eZ\Publish\Core\Search\Common\FieldNameGenerator; -use eZ\Publish\SPI\Persistence\Content; -use eZ\Publish\SPI\Persistence\Content\Type\Handler as ContentTypeHandler; -use eZ\Publish\SPI\Search\Field; -use eZ\Publish\SPI\Search\FieldType; +use Ibexa\Core\Persistence\FieldTypeRegistry; +use Ibexa\Core\Search\Common\FieldNameGenerator; +use Ibexa\Contracts\Core\Persistence\Content; +use Ibexa\Contracts\Core\Persistence\Content\Type\Handler as ContentTypeHandler; +use Ibexa\Contracts\Core\Search\Field; +use Ibexa\Contracts\Core\Search\FieldType; use Ibexa\Contracts\Solr\FieldMapper\ContentTranslationFieldMapper; /** @@ -24,17 +24,17 @@ class ContentDocumentEmptyFields extends ContentTranslationFieldMapper public const IS_EMPTY_NAME = 'is_empty'; /** - * @var \eZ\Publish\SPI\Persistence\Content\Type\Handler + * @var \Ibexa\Contracts\Core\Persistence\Content\Type\Handler */ private $contentTypeHandler; /** - * @var \eZ\Publish\Core\Search\Common\FieldNameGenerator + * @var \Ibexa\Core\Search\Common\FieldNameGenerator */ private $fieldNameGenerator; /** - * @var \eZ\Publish\Core\Persistence\FieldTypeRegistry + * @var \Ibexa\Core\Persistence\FieldTypeRegistry */ private $fieldTypeRegistry; @@ -61,7 +61,7 @@ public function accept(Content $content, $languageCode) /** * @param string $languageCode * - * @return \eZ\Publish\SPI\Search\Field[] + * @return \Ibexa\Contracts\Core\Search\Field[] */ public function mapFields(Content $content, $languageCode) { @@ -83,7 +83,7 @@ public function mapFields(Content $content, $languageCode) continue; } - /** @var \eZ\Publish\Core\Persistence\FieldType $fieldType */ + /** @var \Ibexa\Core\Persistence\FieldType $fieldType */ $fieldType = $this->fieldTypeRegistry->getFieldType($fieldDefinition->fieldType); $fields[] = new Field( $name = $this->fieldNameGenerator->getName( diff --git a/src/lib/FieldMapper/ContentTranslationFieldMapper/ContentDocumentFulltextFields.php b/src/lib/FieldMapper/ContentTranslationFieldMapper/ContentDocumentFulltextFields.php index bc2b6bfe..12860712 100644 --- a/src/lib/FieldMapper/ContentTranslationFieldMapper/ContentDocumentFulltextFields.php +++ b/src/lib/FieldMapper/ContentTranslationFieldMapper/ContentDocumentFulltextFields.php @@ -8,14 +8,14 @@ */ namespace Ibexa\Solr\FieldMapper\ContentTranslationFieldMapper; -use eZ\Publish\Core\Search\Common\FieldNameGenerator; -use eZ\Publish\Core\Search\Common\FieldRegistry; -use eZ\Publish\SPI\Persistence\Content; -use eZ\Publish\SPI\Persistence\Content\Handler as ContentHandler; -use eZ\Publish\SPI\Persistence\Content\Type as ContentType; -use eZ\Publish\SPI\Persistence\Content\Type\Handler as ContentTypeHandler; -use eZ\Publish\SPI\Search\Field; -use eZ\Publish\SPI\Search\FieldType; +use Ibexa\Core\Search\Common\FieldNameGenerator; +use Ibexa\Core\Search\Common\FieldRegistry; +use Ibexa\Contracts\Core\Persistence\Content; +use Ibexa\Contracts\Core\Persistence\Content\Handler as ContentHandler; +use Ibexa\Contracts\Core\Persistence\Content\Type as ContentType; +use Ibexa\Contracts\Core\Persistence\Content\Type\Handler as ContentTypeHandler; +use Ibexa\Contracts\Core\Search\Field; +use Ibexa\Contracts\Core\Search\FieldType; use Ibexa\Solr\FieldMapper\BoostFactorProvider; use Ibexa\Contracts\Solr\FieldMapper\ContentTranslationFieldMapper; use Ibexa\Solr\FieldMapper\IndexingDepthProvider; @@ -40,32 +40,32 @@ class ContentDocumentFulltextFields extends ContentTranslationFieldMapper private static $relatedContentFieldName = 'meta_related_content_%d__text'; /** - * @var \eZ\Publish\SPI\Persistence\Content\Type\Handler + * @var \Ibexa\Contracts\Core\Persistence\Content\Type\Handler */ protected $contentTypeHandler; /** - * @var \eZ\Publish\SPI\Persistence\Content\Handler + * @var \Ibexa\Contracts\Core\Persistence\Content\Handler */ protected $contentHandler; /** - * @var \eZ\Publish\Core\Search\Common\FieldRegistry + * @var \Ibexa\Core\Search\Common\FieldRegistry */ protected $fieldRegistry; /** - * @var \eZ\Publish\Core\Search\Common\FieldNameGenerator + * @var \Ibexa\Core\Search\Common\FieldNameGenerator */ protected $fieldNameGenerator; /** - * @var \EzSystems\EzPlatformSolrSearchEngine\FieldMapper\BoostFactorProvider + * @var \Ibexa\Solr\FieldMapper\BoostFactorProvider */ protected $boostFactorProvider; /** - * @var \EzSystems\EzPlatformSolrSearchEngine\FieldMapper\IndexingDepthProvider + * @var \Ibexa\Solr\FieldMapper\IndexingDepthProvider */ protected $indexingDepthProvider; @@ -114,9 +114,9 @@ public function mapFields(Content $content, $languageCode) * @param int $maxDepth * @param int $depth * - * @return \eZ\Publish\SPI\Search\Field[] + * @return \Ibexa\Contracts\Core\Search\Field[] * - * @throws \eZ\Publish\API\Repository\Exceptions\NotFoundException + * @throws \Ibexa\Contracts\Core\Repository\Exceptions\NotFoundException */ private function doMapFields(Content $content, ContentType $contentType, $languageCode, $maxDepth, $depth = 0) { @@ -170,9 +170,9 @@ private function doMapFields(Content $content, ContentType $contentType, $langua * @param int $maxDepth * @param int $depth * - * @return \eZ\Publish\SPI\Search\Field[] + * @return \Ibexa\Contracts\Core\Search\Field[] * - * @throws \eZ\Publish\API\Repository\Exceptions\NotFoundException + * @throws \Ibexa\Contracts\Core\Repository\Exceptions\NotFoundException */ private function doMapRelatedFields(Content $sourceContent, $languageCode, $maxDepth, $depth) { @@ -218,7 +218,7 @@ private function getIndexFieldName(int $depth): string /** * Return index field type for the given $contentType. * - * @return \eZ\Publish\SPI\Search\FieldType + * @return \Ibexa\Contracts\Core\Search\FieldType */ private function getIndexFieldType(ContentType $contentType) { diff --git a/src/lib/FieldMapper/ContentTranslationFieldMapper/ContentDocumentTranslatedContentNameField.php b/src/lib/FieldMapper/ContentTranslationFieldMapper/ContentDocumentTranslatedContentNameField.php index b68d98d3..210b3856 100644 --- a/src/lib/FieldMapper/ContentTranslationFieldMapper/ContentDocumentTranslatedContentNameField.php +++ b/src/lib/FieldMapper/ContentTranslationFieldMapper/ContentDocumentTranslatedContentNameField.php @@ -8,10 +8,10 @@ */ namespace Ibexa\Solr\FieldMapper\ContentTranslationFieldMapper; -use eZ\Publish\SPI\Persistence\Content; -use eZ\Publish\SPI\Persistence\Content\Type\Handler as ContentTypeHandler; -use eZ\Publish\SPI\Search\Field; -use eZ\Publish\SPI\Search\FieldType; +use Ibexa\Contracts\Core\Persistence\Content; +use Ibexa\Contracts\Core\Persistence\Content\Type\Handler as ContentTypeHandler; +use Ibexa\Contracts\Core\Search\Field; +use Ibexa\Contracts\Core\Search\FieldType; use Ibexa\Solr\FieldMapper\BoostFactorProvider; use Ibexa\Contracts\Solr\FieldMapper\ContentTranslationFieldMapper; @@ -28,12 +28,12 @@ class ContentDocumentTranslatedContentNameField extends ContentTranslationFieldM private static $fieldName = 'meta_content__name'; /** - * @var \eZ\Publish\SPI\Persistence\Content\Type\Handler + * @var \Ibexa\Contracts\Core\Persistence\Content\Type\Handler */ protected $contentTypeHandler; /** - * @var \EzSystems\EzPlatformSolrSearchEngine\FieldMapper\BoostFactorProvider + * @var \Ibexa\Solr\FieldMapper\BoostFactorProvider */ protected $boostFactorProvider; diff --git a/src/lib/FieldMapper/IndexingDepthProvider.php b/src/lib/FieldMapper/IndexingDepthProvider.php index 7b168ca0..349a8f94 100644 --- a/src/lib/FieldMapper/IndexingDepthProvider.php +++ b/src/lib/FieldMapper/IndexingDepthProvider.php @@ -8,7 +8,7 @@ namespace Ibexa\Solr\FieldMapper; -use eZ\Publish\SPI\Persistence\Content\Type as ContentType; +use Ibexa\Contracts\Core\Persistence\Content\Type as ContentType; class IndexingDepthProvider { diff --git a/src/lib/FieldMapper/LocationFieldMapper/Aggregate.php b/src/lib/FieldMapper/LocationFieldMapper/Aggregate.php index 789f5d6b..458190ce 100644 --- a/src/lib/FieldMapper/LocationFieldMapper/Aggregate.php +++ b/src/lib/FieldMapper/LocationFieldMapper/Aggregate.php @@ -8,7 +8,7 @@ */ namespace Ibexa\Solr\FieldMapper\LocationFieldMapper; -use eZ\Publish\SPI\Persistence\Content\Location; +use Ibexa\Contracts\Core\Persistence\Content\Location; use Ibexa\Contracts\Solr\FieldMapper\LocationFieldMapper; /** @@ -19,12 +19,12 @@ class Aggregate extends LocationFieldMapper /** * An array of aggregated field mappers, sorted by priority. * - * @var \EzSystems\EzPlatformSolrSearchEngine\FieldMapper\LocationFieldMapper[] + * @var \Ibexa\Contracts\Solr\FieldMapper\LocationFieldMapper[] */ protected $mappers = []; /** - * @param \EzSystems\EzPlatformSolrSearchEngine\FieldMapper\LocationFieldMapper[] $mappers + * @param \Ibexa\Contracts\Solr\FieldMapper\LocationFieldMapper[] $mappers * An array of mappers, sorted by priority. */ public function __construct(array $mappers = []) diff --git a/src/lib/FieldMapper/LocationFieldMapper/LocationDocumentBaseFields.php b/src/lib/FieldMapper/LocationFieldMapper/LocationDocumentBaseFields.php index b9336aaa..b03f025f 100644 --- a/src/lib/FieldMapper/LocationFieldMapper/LocationDocumentBaseFields.php +++ b/src/lib/FieldMapper/LocationFieldMapper/LocationDocumentBaseFields.php @@ -8,10 +8,10 @@ */ namespace Ibexa\Solr\FieldMapper\LocationFieldMapper; -use eZ\Publish\SPI\Persistence\Content\Handler as ContentHandler; -use eZ\Publish\SPI\Persistence\Content\Location; -use eZ\Publish\SPI\Search\Field; -use eZ\Publish\SPI\Search\FieldType; +use Ibexa\Contracts\Core\Persistence\Content\Handler as ContentHandler; +use Ibexa\Contracts\Core\Persistence\Content\Location; +use Ibexa\Contracts\Core\Search\Field; +use Ibexa\Contracts\Core\Search\FieldType; use Ibexa\Contracts\Solr\DocumentMapper; use Ibexa\Contracts\Solr\FieldMapper\LocationFieldMapper; @@ -21,7 +21,7 @@ class LocationDocumentBaseFields extends LocationFieldMapper { /** - * @var \eZ\Publish\SPI\Persistence\Content\Handler + * @var \Ibexa\Contracts\Core\Persistence\Content\Handler */ protected $contentHandler; diff --git a/src/lib/Gateway.php b/src/lib/Gateway.php index cc4fcbc3..f727c4fd 100644 --- a/src/lib/Gateway.php +++ b/src/lib/Gateway.php @@ -10,7 +10,7 @@ */ namespace Ibexa\Solr; -use eZ\Publish\API\Repository\Values\Content\Query; +use Ibexa\Contracts\Core\Repository\Values\Content\Query; /** * The Content Search Gateway provides the implementation for one database to @@ -51,7 +51,7 @@ abstract public function searchAllEndpoints(Query $query); * Documents are given as an array of the array of documents. The array of documents * holds documents for all translations of the particular entity. * - * @param \eZ\Publish\SPI\Search\Document[][] $documents + * @param \Ibexa\Contracts\Core\Search\Document[][] $documents */ abstract public function bulkIndexDocuments(array $documents); diff --git a/src/lib/Gateway/DistributionStrategy/AbstractDistributionStrategy.php b/src/lib/Gateway/DistributionStrategy/AbstractDistributionStrategy.php index 15f740e6..2dd65369 100644 --- a/src/lib/Gateway/DistributionStrategy/AbstractDistributionStrategy.php +++ b/src/lib/Gateway/DistributionStrategy/AbstractDistributionStrategy.php @@ -18,12 +18,12 @@ abstract class AbstractDistributionStrategy implements DistributionStrategy /** * Endpoint registry service. * - * @var \EzSystems\EzPlatformSolrSearchEngine\Gateway\EndpointRegistry + * @var \Ibexa\Solr\Gateway\EndpointRegistry */ protected $endpointRegistry; /** - * @var \EzSystems\EzPlatformSolrSearchEngine\Gateway\EndpointResolver + * @var \Ibexa\Solr\Gateway\EndpointResolver */ protected $endpointResolver; diff --git a/src/lib/Gateway/Endpoint.php b/src/lib/Gateway/Endpoint.php index a484e450..0da45ede 100644 --- a/src/lib/Gateway/Endpoint.php +++ b/src/lib/Gateway/Endpoint.php @@ -10,7 +10,7 @@ */ namespace Ibexa\Solr\Gateway; -use eZ\Publish\SPI\Persistence\ValueObject; +use Ibexa\Contracts\Core\Persistence\ValueObject; /** * @property-read string $scheme diff --git a/src/lib/Gateway/EndpointRegistry.php b/src/lib/Gateway/EndpointRegistry.php index 5c283e75..fb8cbd46 100644 --- a/src/lib/Gateway/EndpointRegistry.php +++ b/src/lib/Gateway/EndpointRegistry.php @@ -27,7 +27,7 @@ class EndpointRegistry /** * Construct from optional array of Endpoints. * - * @param \EzSystems\EzPlatformSolrSearchEngine\Gateway\Endpoint[] $endpoints + * @param \Ibexa\Solr\Gateway\Endpoint[] $endpoints */ public function __construct(array $endpoints = []) { @@ -40,7 +40,7 @@ public function __construct(array $endpoints = []) * Registers $endpoint with $name. * * @param string $name - * @param \EzSystems\EzPlatformSolrSearchEngine\Gateway\Endpoint $endpoint + * @param \Ibexa\Solr\Gateway\Endpoint $endpoint */ public function registerEndpoint($name, Endpoint $endpoint) { @@ -52,7 +52,7 @@ public function registerEndpoint($name, Endpoint $endpoint) * * @param string $name * - * @return \EzSystems\EzPlatformSolrSearchEngine\Gateway\Endpoint + * @return \Ibexa\Solr\Gateway\Endpoint */ public function getEndpoint($name) { @@ -66,7 +66,7 @@ public function getEndpoint($name) /** * Get first Endpoint, for usecases where there is only one. * - * @return \EzSystems\EzPlatformSolrSearchEngine\Gateway\Endpoint + * @return \Ibexa\Solr\Gateway\Endpoint */ public function getFirstEndpoint() { diff --git a/src/lib/Gateway/EndpointResolver.php b/src/lib/Gateway/EndpointResolver.php index dcab5bf2..ea09e8a9 100644 --- a/src/lib/Gateway/EndpointResolver.php +++ b/src/lib/Gateway/EndpointResolver.php @@ -16,7 +16,7 @@ interface EndpointResolver /** * Returns name of the Endpoint used as entry point for distributed search. * - * @return \EzSystems\EzPlatformSolrSearchEngine\Gateway\Endpoint + * @return \Ibexa\Solr\Gateway\Endpoint */ public function getEntryEndpoint(); diff --git a/src/lib/Gateway/GatewayRegistry.php b/src/lib/Gateway/GatewayRegistry.php index 482866f2..08bf9c75 100644 --- a/src/lib/Gateway/GatewayRegistry.php +++ b/src/lib/Gateway/GatewayRegistry.php @@ -16,11 +16,11 @@ */ final class GatewayRegistry { - /** @var \EzSystems\EzPlatformSolrSearchEngine\Gateway[] */ + /** @var \Ibexa\Solr\Gateway[] */ private $gateways; /** - * @param \EzSystems\EzPlatformSolrSearchEngine\Gateway[] $gateways + * @param \Ibexa\Solr\Gateway[] $gateways */ public function __construct(array $gateways = []) { @@ -28,7 +28,7 @@ public function __construct(array $gateways = []) } /** - * @return \EzSystems\EzPlatformSolrSearchEngine\Gateway[] + * @return \Ibexa\Solr\Gateway[] */ public function getGateways(): array { @@ -36,7 +36,7 @@ public function getGateways(): array } /** - * @param \EzSystems\EzPlatformSolrSearchEngine\Gateway[] $gateways + * @param \Ibexa\Solr\Gateway[] $gateways */ public function setGateways(array $gateways): void { diff --git a/src/lib/Gateway/HttpClient.php b/src/lib/Gateway/HttpClient.php index 80375875..c41b215d 100644 --- a/src/lib/Gateway/HttpClient.php +++ b/src/lib/Gateway/HttpClient.php @@ -21,11 +21,11 @@ interface HttpClient * Returns the result from the remote server. * * @param string $method - * @param \EzSystems\EzPlatformSolrSearchEngine\Gateway\Endpoint $endpoint + * @param \Ibexa\Solr\Gateway\Endpoint $endpoint * @param string $path - * @param \EzSystems\EzPlatformSolrSearchEngine\Gateway\Message $message + * @param \Ibexa\Solr\Gateway\Message $message * - * @return \EzSystems\EzPlatformSolrSearchEngine\Gateway\Message + * @return \Ibexa\Solr\Gateway\Message */ public function request($method, Endpoint $endpoint, $path, Message $message = null); } diff --git a/src/lib/Gateway/HttpClient/Stream.php b/src/lib/Gateway/HttpClient/Stream.php index 8c7e0797..58c3de4c 100644 --- a/src/lib/Gateway/HttpClient/Stream.php +++ b/src/lib/Gateway/HttpClient/Stream.php @@ -62,9 +62,9 @@ public function __construct(LoggerInterface $logger = null, $timeout = 10, $retr * * @param string $method * @param string $path - * @param Message $message + * @param \Ibexa\Solr\Gateway\Message $message * - * @return Message + * @return \Ibexa\Solr\Gateway\Message */ public function request($method, Endpoint $endpoint, $path, Message $message = null) { diff --git a/src/lib/Gateway/Native.php b/src/lib/Gateway/Native.php index 8247482f..985d0aa1 100644 --- a/src/lib/Gateway/Native.php +++ b/src/lib/Gateway/Native.php @@ -10,10 +10,10 @@ */ namespace Ibexa\Solr\Gateway; -use eZ\Publish\API\Repository\Values\Content\Query; -use eZ\Publish\SPI\Search\Document; -use eZ\Publish\SPI\Search\Field; -use eZ\Publish\SPI\Search\FieldType; +use Ibexa\Contracts\Core\Repository\Values\Content\Query; +use Ibexa\Contracts\Core\Search\Document; +use Ibexa\Contracts\Core\Search\Field; +use Ibexa\Contracts\Core\Search\FieldType; use Ibexa\Solr\Gateway; use Ibexa\Solr\Query\QueryConverter; use RuntimeException; @@ -27,52 +27,52 @@ class Native extends Gateway /** * HTTP client to communicate with Solr server. * - * @var \EzSystems\EzPlatformSolrSearchEngine\Gateway\HttpClient + * @var \Ibexa\Solr\Gateway\HttpClient */ protected $client; /** - * @var \EzSystems\EzPlatformSolrSearchEngine\Gateway\EndpointResolver + * @var \Ibexa\Solr\Gateway\EndpointResolver */ protected $endpointResolver; /** * Endpoint registry service. * - * @var \EzSystems\EzPlatformSolrSearchEngine\Gateway\EndpointRegistry + * @var \Ibexa\Solr\Gateway\EndpointRegistry */ protected $endpointRegistry; /** * Content Query converter. * - * @var \EzSystems\EzPlatformSolrSearchEngine\Query\QueryConverter + * @var \Ibexa\Solr\Query\QueryConverter */ protected $contentQueryConverter; /** * Location Query converter. * - * @var \EzSystems\EzPlatformSolrSearchEngine\Query\QueryConverter + * @var \Ibexa\Solr\Query\QueryConverter */ protected $locationQueryConverter; /** - * @var \EzSystems\EzPlatformSolrSearchEngine\Gateway\UpdateSerializer + * @var \Ibexa\Solr\Gateway\UpdateSerializer */ protected $updateSerializer; /** - * @var \EzSystems\EzPlatformSolrSearchEngine\Gateway\DistributionStrategy + * @var \Ibexa\Solr\Gateway\DistributionStrategy */ protected $distributionStrategy; /** - * @param \EzSystems\EzPlatformSolrSearchEngine\Gateway\HttpClient $client - * @param \EzSystems\EzPlatformSolrSearchEngine\Gateway\EndpointResolver $endpointResolver - * @param \EzSystems\EzPlatformSolrSearchEngine\Gateway\EndpointRegistry $endpointRegistry - * @param \EzSystems\EzPlatformSolrSearchEngine\Gateway\UpdateSerializer $updateSerializer - * @param \EzSystems\EzPlatformSolrSearchEngine\Gateway\DistributionStrategy $distributionStrategy + * @param \Ibexa\Solr\Gateway\HttpClient $client + * @param \Ibexa\Solr\Gateway\EndpointResolver $endpointResolver + * @param \Ibexa\Solr\Gateway\EndpointRegistry $endpointRegistry + * @param \Ibexa\Solr\Gateway\UpdateSerializer $updateSerializer + * @param \Ibexa\Solr\Gateway\DistributionStrategy $distributionStrategy */ public function __construct( HttpClient $client, @@ -228,7 +228,7 @@ protected function getAllSearchTargets() * - On large amounts of data make sure to iterate with several calls to this function with a limited * set of documents, amount you have memory for depends on server, size of documents, & PHP version. * - * @param \eZ\Publish\SPI\Search\Document[][] $documents + * @param \Ibexa\Contracts\Core\Search\Document[][] $documents */ public function bulkIndexDocuments(array $documents) { @@ -267,7 +267,7 @@ public function bulkIndexDocuments(array $documents) /** * Returns version of the $document to be indexed in the always available core. * - * @return \eZ\Publish\SPI\Search\Document + * @return \Ibexa\Contracts\Core\Search\Document */ protected function getMainTranslationDocument(Document $document) { @@ -302,8 +302,8 @@ protected function getMainTranslationDocument(Document $document) } /** - * @param \EzSystems\EzPlatformSolrSearchEngine\Gateway\Endpoint $endpoint - * @param \eZ\Publish\SPI\Search\Document[] $documents + * @param \Ibexa\Solr\Gateway\Endpoint $endpoint + * @param \Ibexa\Contracts\Core\Search\Document[] $documents */ protected function doBulkIndexDocuments(Endpoint $endpoint, array $documents) { diff --git a/src/lib/Gateway/UpdateSerializer.php b/src/lib/Gateway/UpdateSerializer.php index 228bf368..987593c9 100644 --- a/src/lib/Gateway/UpdateSerializer.php +++ b/src/lib/Gateway/UpdateSerializer.php @@ -8,11 +8,11 @@ */ namespace Ibexa\Solr\Gateway; -use eZ\Publish\Core\Search\Common\FieldNameGenerator; -use eZ\Publish\Core\Search\Common\FieldValueMapper; -use eZ\Publish\SPI\Search\Document; -use eZ\Publish\SPI\Search\Field; -use eZ\Publish\SPI\Search\FieldType; +use Ibexa\Core\Search\Common\FieldNameGenerator; +use Ibexa\Core\Search\Common\FieldValueMapper; +use Ibexa\Contracts\Core\Search\Document; +use Ibexa\Contracts\Core\Search\Field; +use Ibexa\Contracts\Core\Search\FieldType; use XMLWriter; /** @@ -22,12 +22,12 @@ class UpdateSerializer { /** - * @var \eZ\Publish\Core\Search\Common\FieldValueMapper + * @var \Ibexa\Core\Search\Common\FieldValueMapper */ protected $fieldValueMapper; /** - * @var \eZ\Publish\Core\Search\Common\FieldNameGenerator + * @var \Ibexa\Core\Search\Common\FieldNameGenerator */ protected $nameGenerator; @@ -42,7 +42,7 @@ public function __construct( /** * Create update XML for the given array of $documents. * - * @param \eZ\Publish\SPI\Search\Document[] $documents + * @param \Ibexa\Contracts\Core\Search\Document[] $documents * * @return string */ @@ -117,7 +117,7 @@ private function writeField(XMLWriter $xmlWriter, Field $field) * * @param string $id * - * @return \eZ\Publish\SPI\Search\Document + * @return \Ibexa\Contracts\Core\Search\Document */ private function getNestedDummyDocument($id) { diff --git a/src/lib/Handler.php b/src/lib/Handler.php index 2d50f30e..928986b8 100644 --- a/src/lib/Handler.php +++ b/src/lib/Handler.php @@ -8,16 +8,16 @@ */ namespace Ibexa\Solr; -use eZ\Publish\API\Repository\SearchService; -use eZ\Publish\API\Repository\Values\Content\LocationQuery; -use eZ\Publish\API\Repository\Values\Content\Query; -use eZ\Publish\API\Repository\Values\Content\Query\Criterion; -use eZ\Publish\Core\Base\Exceptions\InvalidArgumentException; -use eZ\Publish\Core\Base\Exceptions\NotFoundException; -use eZ\Publish\SPI\Persistence\Content; -use eZ\Publish\SPI\Persistence\Content\Handler as ContentHandler; -use eZ\Publish\SPI\Persistence\Content\Location; -use eZ\Publish\SPI\Search\VersatileHandler; +use Ibexa\Contracts\Core\Repository\SearchService; +use Ibexa\Contracts\Core\Repository\Values\Content\LocationQuery; +use Ibexa\Contracts\Core\Repository\Values\Content\Query; +use Ibexa\Contracts\Core\Repository\Values\Content\Query\Criterion; +use Ibexa\Core\Base\Exceptions\InvalidArgumentException; +use Ibexa\Core\Base\Exceptions\NotFoundException; +use Ibexa\Contracts\Core\Persistence\Content; +use Ibexa\Contracts\Core\Persistence\Content\Handler as ContentHandler; +use Ibexa\Contracts\Core\Persistence\Content\Location; +use Ibexa\Contracts\Core\Search\VersatileHandler; use Ibexa\Contracts\Solr\DocumentMapper; /** @@ -52,21 +52,21 @@ class Handler implements VersatileHandler /** * Content locator gateway. * - * @var \EzSystems\EzPlatformSolrSearchEngine\Gateway + * @var \Ibexa\Solr\Gateway */ protected $gateway; /** * Content handler. * - * @var \eZ\Publish\SPI\Persistence\Content\Handler + * @var \Ibexa\Contracts\Core\Persistence\Content\Handler */ protected $contentHandler; /** * Document mapper. * - * @var \EzSystems\EzPlatformSolrSearchEngine\DocumentMapper + * @var \Ibexa\Contracts\Solr\DocumentMapper */ protected $mapper; @@ -75,38 +75,38 @@ class Handler implements VersatileHandler * * @deprecated since eZ Platform 3.2.0, to be removed in eZ Platform 4.0.0. Use $contentResultExtractor or $locationResultExtractor instead of $resultExtractor. * - * @var \EzSystems\EzPlatformSolrSearchEngine\ResultExtractor + * @var \Ibexa\Solr\ResultExtractor */ protected $resultExtractor; /** * Content result extractor. * - * @var \EzSystems\EzPlatformSolrSearchEngine\ResultExtractor + * @var \Ibexa\Solr\ResultExtractor */ protected $contentResultExtractor; /** * Location result extractor. * - * @var \EzSystems\EzPlatformSolrSearchEngine\ResultExtractor + * @var \Ibexa\Solr\ResultExtractor */ protected $locationResultExtractor; /** * Core filter service. * - * @var \EzSystems\EzPlatformSolrSearchEngine\CoreFilter + * @var \Ibexa\Solr\CoreFilter */ protected $coreFilter; /** * Creates a new content handler. * - * @param \EzSystems\EzPlatformSolrSearchEngine\Gateway $gateway - * @param \EzSystems\EzPlatformSolrSearchEngine\DocumentMapper $mapper - * @param \EzSystems\EzPlatformSolrSearchEngine\ResultExtractor $resultExtractor - * @param \EzSystems\EzPlatformSolrSearchEngine\CoreFilter $coreFilter + * @param \Ibexa\Solr\Gateway $gateway + * @param \Ibexa\Contracts\Solr\DocumentMapper $mapper + * @param \Ibexa\Solr\ResultExtractor $resultExtractor + * @param \Ibexa\Solr\CoreFilter $coreFilter */ public function __construct( Gateway $gateway, @@ -130,14 +130,14 @@ public function __construct( /** * Finds content objects for the given query. * - * @throws \eZ\Publish\API\Repository\Exceptions\InvalidArgumentException if Query criterion is not applicable to its target + * @throws \Ibexa\Contracts\Core\Repository\Exceptions\InvalidArgumentException if Query criterion is not applicable to its target * * @param array $languageFilter - a map of language related filters specifying languages query will be performed on. * Also used to define which field languages are loaded for the returned content. * Currently supports: array("languages" => array(,..), "useAlwaysAvailable" => bool) * useAlwaysAvailable defaults to true to avoid exceptions on missing translations. * - * @return \eZ\Publish\API\Repository\Values\Content\Search\SearchResult + * @return \Ibexa\Contracts\Core\Repository\Values\Content\Search\SearchResult */ public function findContent(Query $query, array $languageFilter = []) { @@ -162,16 +162,16 @@ public function findContent(Query $query, array $languageFilter = []) /** * Performs a query for a single content object. * - * @throws \eZ\Publish\API\Repository\Exceptions\NotFoundException if the object was not found by the query or due to permissions - * @throws \eZ\Publish\API\Repository\Exceptions\InvalidArgumentException if Criterion is not applicable to its target - * @throws \eZ\Publish\API\Repository\Exceptions\InvalidArgumentException if there is more than than one result matching the criterions + * @throws \Ibexa\Contracts\Core\Repository\Exceptions\NotFoundException if the object was not found by the query or due to permissions + * @throws \Ibexa\Contracts\Core\Repository\Exceptions\InvalidArgumentException if Criterion is not applicable to its target + * @throws \Ibexa\Contracts\Core\Repository\Exceptions\InvalidArgumentException if there is more than than one result matching the criterions * * @param array $languageFilter - a map of language related filters specifying languages query will be performed on. * Also used to define which field languages are loaded for the returned content. * Currently supports: array("languages" => array(,..), "useAlwaysAvailable" => bool) * useAlwaysAvailable defaults to true to avoid exceptions on missing translations. * - * @return \eZ\Publish\SPI\Persistence\Content + * @return \Ibexa\Contracts\Core\Persistence\Content */ public function findSingle(Criterion $filter, array $languageFilter = []) { @@ -210,7 +210,7 @@ public function findSingle(Criterion $filter, array $languageFilter = []) * Currently supports: array("languages" => array(,..), "useAlwaysAvailable" => bool) * useAlwaysAvailable defaults to true to avoid exceptions on missing translations. * - * @return \eZ\Publish\API\Repository\Values\Content\Search\SearchResult + * @return \Ibexa\Contracts\Core\Repository\Values\Content\Search\SearchResult */ public function findLocations(LocationQuery $query, array $languageFilter = []) { @@ -236,7 +236,7 @@ public function findLocations(LocationQuery $query, array $languageFilter = []) * @param string $prefix * @param string[] $fieldPaths * @param int $limit - * @param \eZ\Publish\API\Repository\Values\Content\Query\Criterion $filter + * @param \Ibexa\Contracts\Core\Repository\Values\Content\Query\Criterion $filter */ public function suggest($prefix, $fieldPaths = [], $limit = 10, Criterion $filter = null) { @@ -266,7 +266,7 @@ public function indexContent(Content $content) * sure we match the features of these. * See also {@see Solr\Content\Search\Gateway\Native::bulkIndexContent} for further Solr specific info. * - * @param \eZ\Publish\SPI\Persistence\Content[] $contentObjects + * @param \Ibexa\Contracts\Core\Persistence\Content[] $contentObjects */ public function bulkIndexContent(array $contentObjects) { @@ -408,7 +408,7 @@ protected function updateAllElementsWithAdditionalLocation($locationId) * * @param int $limit * - * @return Query + * @return \Ibexa\Contracts\Core\Repository\Values\Content\Query */ protected function prepareQuery($limit = self::DEFAULT_QUERY_LIMIT) { @@ -449,7 +449,7 @@ protected function allItemsWithinLocationWithAdditionalLocation($locationId) /** * Generate search document for Content object to be indexed by a search engine. * - * @return \eZ\Publish\SPI\Search\Document + * @return \Ibexa\Contracts\Core\Search\Document */ public function generateDocument(Content $content) { @@ -464,7 +464,7 @@ public function generateDocument(Content $content) * - On large amounts of data make sure to iterate with several calls to this function with a limited * set of content objects, amount you have memory for depends on server, size of objects, & PHP version. * - * @param \eZ\Publish\SPI\Search\Document[] $documents + * @param \Ibexa\Contracts\Core\Search\Document[] $documents */ public function bulkIndexDocuments(array $documents) { diff --git a/src/lib/Indexer.php b/src/lib/Indexer.php index 158faa97..b15a390c 100644 --- a/src/lib/Indexer.php +++ b/src/lib/Indexer.php @@ -7,18 +7,18 @@ namespace Ibexa\Solr; use Doctrine\DBAL\Connection; -use eZ\Publish\API\Repository\Exceptions\NotFoundException; -use eZ\Publish\Core\Search\Common\IncrementalIndexer; -use eZ\Publish\SPI\Persistence\Content\ContentInfo; +use Ibexa\Contracts\Core\Repository\Exceptions\NotFoundException; +use Ibexa\Core\Search\Common\IncrementalIndexer; +use Ibexa\Contracts\Core\Persistence\Content\ContentInfo; use Ibexa\Solr\Handler as SolrSearchHandler; -use eZ\Publish\SPI\Persistence\Handler as PersistenceHandler; +use Ibexa\Contracts\Core\Persistence\Handler as PersistenceHandler; use Psr\Log\LoggerInterface; use Exception; class Indexer extends IncrementalIndexer { /** - * @var \EzSystems\EzPlatformSolrSearchEngine\Handler + * @var \Ibexa\Solr\Handler */ protected $searchHandler; diff --git a/src/lib/Query/Common/AggregationVisitor/AbstractRangeAggregationVisitor.php b/src/lib/Query/Common/AggregationVisitor/AbstractRangeAggregationVisitor.php index 95f5391f..a9cca9cb 100644 --- a/src/lib/Query/Common/AggregationVisitor/AbstractRangeAggregationVisitor.php +++ b/src/lib/Query/Common/AggregationVisitor/AbstractRangeAggregationVisitor.php @@ -9,14 +9,14 @@ namespace Ibexa\Solr\Query\Common\AggregationVisitor; use DateTimeInterface; -use eZ\Publish\API\Repository\Values\Content\Query\Aggregation\AbstractRangeAggregation; -use eZ\Publish\API\Repository\Values\Content\Query\Aggregation; +use Ibexa\Contracts\Core\Repository\Values\Content\Query\Aggregation\AbstractRangeAggregation; +use Ibexa\Contracts\Core\Repository\Values\Content\Query\Aggregation; use Ibexa\Contracts\Solr\Query\AggregationVisitor; abstract class AbstractRangeAggregationVisitor implements AggregationVisitor { /** - * @param \eZ\Publish\API\Repository\Values\Content\Query\Aggregation\AbstractRangeAggregation $aggregation + * @param \Ibexa\Contracts\Core\Repository\Values\Content\Query\Aggregation\AbstractRangeAggregation $aggregation */ public function visit( AggregationVisitor $dispatcherVisitor, diff --git a/src/lib/Query/Common/AggregationVisitor/AbstractStatsAggregationVisitor.php b/src/lib/Query/Common/AggregationVisitor/AbstractStatsAggregationVisitor.php index 468b11a1..18ae73ba 100644 --- a/src/lib/Query/Common/AggregationVisitor/AbstractStatsAggregationVisitor.php +++ b/src/lib/Query/Common/AggregationVisitor/AbstractStatsAggregationVisitor.php @@ -8,14 +8,14 @@ namespace Ibexa\Solr\Query\Common\AggregationVisitor; -use eZ\Publish\API\Repository\Values\Content\Query\Aggregation\AbstractStatsAggregation; -use eZ\Publish\API\Repository\Values\Content\Query\Aggregation; +use Ibexa\Contracts\Core\Repository\Values\Content\Query\Aggregation\AbstractStatsAggregation; +use Ibexa\Contracts\Core\Repository\Values\Content\Query\Aggregation; use Ibexa\Contracts\Solr\Query\AggregationVisitor; abstract class AbstractStatsAggregationVisitor implements AggregationVisitor { /** - * @param \eZ\Publish\API\Repository\Values\Content\Query\Aggregation\AbstractStatsAggregation $aggregation + * @param \Ibexa\Contracts\Core\Repository\Values\Content\Query\Aggregation\AbstractStatsAggregation $aggregation */ public function visit( AggregationVisitor $dispatcherVisitor, diff --git a/src/lib/Query/Common/AggregationVisitor/AbstractTermAggregationVisitor.php b/src/lib/Query/Common/AggregationVisitor/AbstractTermAggregationVisitor.php index 049e0d20..3a86901d 100644 --- a/src/lib/Query/Common/AggregationVisitor/AbstractTermAggregationVisitor.php +++ b/src/lib/Query/Common/AggregationVisitor/AbstractTermAggregationVisitor.php @@ -8,14 +8,14 @@ namespace Ibexa\Solr\Query\Common\AggregationVisitor; -use eZ\Publish\API\Repository\Values\Content\Query\Aggregation\AbstractTermAggregation; -use eZ\Publish\API\Repository\Values\Content\Query\Aggregation; +use Ibexa\Contracts\Core\Repository\Values\Content\Query\Aggregation\AbstractTermAggregation; +use Ibexa\Contracts\Core\Repository\Values\Content\Query\Aggregation; use Ibexa\Contracts\Solr\Query\AggregationVisitor; abstract class AbstractTermAggregationVisitor implements AggregationVisitor { /** - * @param \eZ\Publish\API\Repository\Values\Content\Query\Aggregation\AbstractTermAggregation $aggregation + * @param \Ibexa\Contracts\Core\Repository\Values\Content\Query\Aggregation\AbstractTermAggregation $aggregation */ public function visit( AggregationVisitor $dispatcherVisitor, diff --git a/src/lib/Query/Common/AggregationVisitor/AggregationFieldResolver/ContentFieldAggregationFieldResolver.php b/src/lib/Query/Common/AggregationVisitor/AggregationFieldResolver/ContentFieldAggregationFieldResolver.php index 8b100710..bb1a7559 100644 --- a/src/lib/Query/Common/AggregationVisitor/AggregationFieldResolver/ContentFieldAggregationFieldResolver.php +++ b/src/lib/Query/Common/AggregationVisitor/AggregationFieldResolver/ContentFieldAggregationFieldResolver.php @@ -8,15 +8,15 @@ namespace Ibexa\Solr\Query\Common\AggregationVisitor\AggregationFieldResolver; -use eZ\Publish\API\Repository\Values\Content\Query\Aggregation\FieldAggregation; -use eZ\Publish\API\Repository\Values\Content\Query\Aggregation; -use eZ\Publish\Core\Search\Common\FieldNameResolver; +use Ibexa\Contracts\Core\Repository\Values\Content\Query\Aggregation\FieldAggregation; +use Ibexa\Contracts\Core\Repository\Values\Content\Query\Aggregation; +use Ibexa\Core\Search\Common\FieldNameResolver; use Ibexa\Contracts\Solr\Query\Common\AggregationVisitor\AggregationFieldResolver; use RuntimeException; final class ContentFieldAggregationFieldResolver implements AggregationFieldResolver { - /** @var \eZ\Publish\Core\Search\Common\FieldNameResolver */ + /** @var \Ibexa\Core\Search\Common\FieldNameResolver */ private $fieldNameResolver; /** @var string */ diff --git a/src/lib/Query/Common/AggregationVisitor/AggregationFieldResolver/RawAggregationFieldResolver.php b/src/lib/Query/Common/AggregationVisitor/AggregationFieldResolver/RawAggregationFieldResolver.php index a207eb33..966a7a31 100644 --- a/src/lib/Query/Common/AggregationVisitor/AggregationFieldResolver/RawAggregationFieldResolver.php +++ b/src/lib/Query/Common/AggregationVisitor/AggregationFieldResolver/RawAggregationFieldResolver.php @@ -8,13 +8,13 @@ namespace Ibexa\Solr\Query\Common\AggregationVisitor\AggregationFieldResolver; -use eZ\Publish\API\Repository\Values\Content\Query\Aggregation; +use Ibexa\Contracts\Core\Repository\Values\Content\Query\Aggregation; use Ibexa\Contracts\Solr\Query\Common\AggregationVisitor\AggregationFieldResolver; final class RawAggregationFieldResolver implements AggregationFieldResolver { /** - * @param \eZ\Publish\API\Repository\Values\Content\Query\Aggregation\RawAggregation $aggregation + * @param \Ibexa\Contracts\Core\Repository\Values\Content\Query\Aggregation\RawAggregation $aggregation */ public function resolveTargetField(Aggregation $aggregation): string { diff --git a/src/lib/Query/Common/AggregationVisitor/AggregationFieldResolver/SearchFieldAggregationFieldResolver.php b/src/lib/Query/Common/AggregationVisitor/AggregationFieldResolver/SearchFieldAggregationFieldResolver.php index 87098f19..175a5518 100644 --- a/src/lib/Query/Common/AggregationVisitor/AggregationFieldResolver/SearchFieldAggregationFieldResolver.php +++ b/src/lib/Query/Common/AggregationVisitor/AggregationFieldResolver/SearchFieldAggregationFieldResolver.php @@ -8,7 +8,7 @@ namespace Ibexa\Solr\Query\Common\AggregationVisitor\AggregationFieldResolver; -use eZ\Publish\API\Repository\Values\Content\Query\Aggregation; +use Ibexa\Contracts\Core\Repository\Values\Content\Query\Aggregation; use Ibexa\Contracts\Solr\Query\Common\AggregationVisitor\AggregationFieldResolver; final class SearchFieldAggregationFieldResolver implements AggregationFieldResolver diff --git a/src/lib/Query/Common/AggregationVisitor/DateMetadataRangeAggregationVisitor.php b/src/lib/Query/Common/AggregationVisitor/DateMetadataRangeAggregationVisitor.php index c099b542..2b8eafc3 100644 --- a/src/lib/Query/Common/AggregationVisitor/DateMetadataRangeAggregationVisitor.php +++ b/src/lib/Query/Common/AggregationVisitor/DateMetadataRangeAggregationVisitor.php @@ -8,9 +8,9 @@ namespace Ibexa\Solr\Query\Common\AggregationVisitor; -use eZ\Publish\API\Repository\Values\Content\Query\Aggregation\AbstractRangeAggregation; -use eZ\Publish\API\Repository\Values\Content\Query\Aggregation\DateMetadataRangeAggregation; -use eZ\Publish\API\Repository\Values\Content\Query\Aggregation; +use Ibexa\Contracts\Core\Repository\Values\Content\Query\Aggregation\AbstractRangeAggregation; +use Ibexa\Contracts\Core\Repository\Values\Content\Query\Aggregation\DateMetadataRangeAggregation; +use Ibexa\Contracts\Core\Repository\Values\Content\Query\Aggregation; use RuntimeException; final class DateMetadataRangeAggregationVisitor extends AbstractRangeAggregationVisitor @@ -21,7 +21,7 @@ public function canVisit(Aggregation $aggregation, array $languageFilter): bool } /** - * @param \eZ\Publish\API\Repository\Values\Content\Query\Aggregation\DateMetadataRangeAggregation $aggregation + * @param \Ibexa\Contracts\Core\Repository\Values\Content\Query\Aggregation\DateMetadataRangeAggregation $aggregation */ protected function getTargetField(AbstractRangeAggregation $aggregation): string { diff --git a/src/lib/Query/Common/AggregationVisitor/DispatcherAggregationVisitor.php b/src/lib/Query/Common/AggregationVisitor/DispatcherAggregationVisitor.php index 7c53cc7d..285d372a 100644 --- a/src/lib/Query/Common/AggregationVisitor/DispatcherAggregationVisitor.php +++ b/src/lib/Query/Common/AggregationVisitor/DispatcherAggregationVisitor.php @@ -8,17 +8,17 @@ namespace Ibexa\Solr\Query\Common\AggregationVisitor; -use eZ\Publish\API\Repository\Exceptions\NotImplementedException; -use eZ\Publish\API\Repository\Values\Content\Query\Aggregation; +use Ibexa\Contracts\Core\Repository\Exceptions\NotImplementedException; +use Ibexa\Contracts\Core\Repository\Values\Content\Query\Aggregation; use Ibexa\Contracts\Solr\Query\AggregationVisitor; final class DispatcherAggregationVisitor implements AggregationVisitor { - /** @var \EzSystems\EzPlatformSolrSearchEngine\Query\AggregationVisitor[] */ + /** @var \Ibexa\Contracts\Solr\Query\AggregationVisitor[] */ private $visitors; /** - * @var \EzSystems\EzPlatformSolrSearchEngine\Query\AggregationVisitor[] + * @var \Ibexa\Contracts\Solr\Query\AggregationVisitor[] */ public function __construct(iterable $visitors) { diff --git a/src/lib/Query/Common/AggregationVisitor/Factory/ContentFieldAggregationVisitorFactory.php b/src/lib/Query/Common/AggregationVisitor/Factory/ContentFieldAggregationVisitorFactory.php index b2c49079..3ea6f86e 100644 --- a/src/lib/Query/Common/AggregationVisitor/Factory/ContentFieldAggregationVisitorFactory.php +++ b/src/lib/Query/Common/AggregationVisitor/Factory/ContentFieldAggregationVisitorFactory.php @@ -7,7 +7,7 @@ namespace Ibexa\Solr\Query\Common\AggregationVisitor\Factory; -use eZ\Publish\Core\Search\Common\FieldNameResolver; +use Ibexa\Core\Search\Common\FieldNameResolver; use Ibexa\Contracts\Solr\Query\AggregationVisitor; use Ibexa\Solr\Query\Common\AggregationVisitor\AggregationFieldResolver\ContentFieldAggregationFieldResolver; use Ibexa\Solr\Query\Common\AggregationVisitor\RangeAggregationVisitor; @@ -16,7 +16,7 @@ final class ContentFieldAggregationVisitorFactory { - /** @var \eZ\Publish\Core\Search\Common\FieldNameResolver */ + /** @var \Ibexa\Core\Search\Common\FieldNameResolver */ private $fieldNameResolver; public function __construct(FieldNameResolver $fieldNameResolver) diff --git a/src/lib/Query/Common/AggregationVisitor/ObjectStateAggregationVisitor.php b/src/lib/Query/Common/AggregationVisitor/ObjectStateAggregationVisitor.php index 5b338170..06ce8d5a 100644 --- a/src/lib/Query/Common/AggregationVisitor/ObjectStateAggregationVisitor.php +++ b/src/lib/Query/Common/AggregationVisitor/ObjectStateAggregationVisitor.php @@ -8,8 +8,8 @@ namespace Ibexa\Solr\Query\Common\AggregationVisitor; -use eZ\Publish\API\Repository\Values\Content\Query\Aggregation\ObjectStateTermAggregation; -use eZ\Publish\API\Repository\Values\Content\Query\Aggregation; +use Ibexa\Contracts\Core\Repository\Values\Content\Query\Aggregation\ObjectStateTermAggregation; +use Ibexa\Contracts\Core\Repository\Values\Content\Query\Aggregation; use Ibexa\Contracts\Solr\Query\AggregationVisitor; final class ObjectStateAggregationVisitor implements AggregationVisitor @@ -20,7 +20,7 @@ public function canVisit(Aggregation $aggregation, array $languageFilter): bool } /** - * @param \eZ\Publish\API\Repository\Values\Content\Query\Aggregation\ObjectStateTermAggregation $aggregation + * @param \Ibexa\Contracts\Core\Repository\Values\Content\Query\Aggregation\ObjectStateTermAggregation $aggregation */ public function visit( AggregationVisitor $dispatcherVisitor, diff --git a/src/lib/Query/Common/AggregationVisitor/RangeAggregationVisitor.php b/src/lib/Query/Common/AggregationVisitor/RangeAggregationVisitor.php index 17a0cba6..4751984c 100644 --- a/src/lib/Query/Common/AggregationVisitor/RangeAggregationVisitor.php +++ b/src/lib/Query/Common/AggregationVisitor/RangeAggregationVisitor.php @@ -8,8 +8,8 @@ namespace Ibexa\Solr\Query\Common\AggregationVisitor; -use eZ\Publish\API\Repository\Values\Content\Query\Aggregation\AbstractRangeAggregation; -use eZ\Publish\API\Repository\Values\Content\Query\Aggregation; +use Ibexa\Contracts\Core\Repository\Values\Content\Query\Aggregation\AbstractRangeAggregation; +use Ibexa\Contracts\Core\Repository\Values\Content\Query\Aggregation; use Ibexa\Contracts\Solr\Query\Common\AggregationVisitor\AggregationFieldResolver; final class RangeAggregationVisitor extends AbstractRangeAggregationVisitor @@ -17,7 +17,7 @@ final class RangeAggregationVisitor extends AbstractRangeAggregationVisitor /** @var string */ private $aggregationClass; - /** @var \EzSystems\EzPlatformSolrSearchEngine\Query\Common\AggregationVisitor\AggregationFieldResolver */ + /** @var \Ibexa\Contracts\Solr\Query\Common\AggregationVisitor\AggregationFieldResolver */ private $aggregationFieldResolver; public function __construct(string $aggregationClass, AggregationFieldResolver $aggregationFieldResolver) diff --git a/src/lib/Query/Common/AggregationVisitor/StatsAggregationVisitor.php b/src/lib/Query/Common/AggregationVisitor/StatsAggregationVisitor.php index abc607c0..b5d4a2bb 100644 --- a/src/lib/Query/Common/AggregationVisitor/StatsAggregationVisitor.php +++ b/src/lib/Query/Common/AggregationVisitor/StatsAggregationVisitor.php @@ -7,8 +7,8 @@ namespace Ibexa\Solr\Query\Common\AggregationVisitor; -use eZ\Publish\API\Repository\Values\Content\Query\Aggregation\AbstractStatsAggregation; -use eZ\Publish\API\Repository\Values\Content\Query\Aggregation; +use Ibexa\Contracts\Core\Repository\Values\Content\Query\Aggregation\AbstractStatsAggregation; +use Ibexa\Contracts\Core\Repository\Values\Content\Query\Aggregation; use Ibexa\Contracts\Solr\Query\Common\AggregationVisitor\AggregationFieldResolver; final class StatsAggregationVisitor extends AbstractStatsAggregationVisitor @@ -16,7 +16,7 @@ final class StatsAggregationVisitor extends AbstractStatsAggregationVisitor /** @var string */ private $aggregationClass; - /** @var \EzSystems\EzPlatformSolrSearchEngine\Query\Common\AggregationVisitor\AggregationFieldResolver */ + /** @var \Ibexa\Contracts\Solr\Query\Common\AggregationVisitor\AggregationFieldResolver */ private $aggregationFieldResolver; public function __construct(string $aggregationClass, AggregationFieldResolver $aggregationFieldResolver) diff --git a/src/lib/Query/Common/AggregationVisitor/SubtreeTermAggregationVisitor.php b/src/lib/Query/Common/AggregationVisitor/SubtreeTermAggregationVisitor.php index 2a431fd8..3ded1ede 100644 --- a/src/lib/Query/Common/AggregationVisitor/SubtreeTermAggregationVisitor.php +++ b/src/lib/Query/Common/AggregationVisitor/SubtreeTermAggregationVisitor.php @@ -8,8 +8,8 @@ namespace Ibexa\Solr\Query\Common\AggregationVisitor; -use eZ\Publish\API\Repository\Values\Content\Query\Aggregation; -use eZ\Publish\API\Repository\Values\Content\Query\Aggregation\Location\SubtreeTermAggregation; +use Ibexa\Contracts\Core\Repository\Values\Content\Query\Aggregation; +use Ibexa\Contracts\Core\Repository\Values\Content\Query\Aggregation\Location\SubtreeTermAggregation; use Ibexa\Contracts\Solr\Query\AggregationVisitor; final class SubtreeTermAggregationVisitor implements AggregationVisitor @@ -32,7 +32,7 @@ public function canVisit(Aggregation $aggregation, array $languageFilter): bool } /** - * @param \eZ\Publish\API\Repository\Values\Content\Query\Aggregation\Location\SubtreeTermAggregation $aggregation + * @param \Ibexa\Contracts\Core\Repository\Values\Content\Query\Aggregation\Location\SubtreeTermAggregation $aggregation */ public function visit( AggregationVisitor $dispatcherVisitor, diff --git a/src/lib/Query/Common/AggregationVisitor/TermAggregationVisitor.php b/src/lib/Query/Common/AggregationVisitor/TermAggregationVisitor.php index ac73eb66..8da0ad80 100644 --- a/src/lib/Query/Common/AggregationVisitor/TermAggregationVisitor.php +++ b/src/lib/Query/Common/AggregationVisitor/TermAggregationVisitor.php @@ -7,8 +7,8 @@ namespace Ibexa\Solr\Query\Common\AggregationVisitor; -use eZ\Publish\API\Repository\Values\Content\Query\Aggregation\AbstractTermAggregation; -use eZ\Publish\API\Repository\Values\Content\Query\Aggregation; +use Ibexa\Contracts\Core\Repository\Values\Content\Query\Aggregation\AbstractTermAggregation; +use Ibexa\Contracts\Core\Repository\Values\Content\Query\Aggregation; use Ibexa\Contracts\Solr\Query\Common\AggregationVisitor\AggregationFieldResolver; final class TermAggregationVisitor extends AbstractTermAggregationVisitor @@ -16,7 +16,7 @@ final class TermAggregationVisitor extends AbstractTermAggregationVisitor /** @var string */ private $aggregationClass; - /** @var \EzSystems\EzPlatformSolrSearchEngine\Query\Common\AggregationVisitor\AggregationFieldResolver */ + /** @var \Ibexa\Contracts\Solr\Query\Common\AggregationVisitor\AggregationFieldResolver */ private $aggregationFieldResolver; public function __construct(string $aggregationClass, AggregationFieldResolver $aggregationFieldResolver) diff --git a/src/lib/Query/Common/AggregationVisitor/UserMetadataTermAggregationVisitor.php b/src/lib/Query/Common/AggregationVisitor/UserMetadataTermAggregationVisitor.php index 9db3c9cc..da7a8ac6 100644 --- a/src/lib/Query/Common/AggregationVisitor/UserMetadataTermAggregationVisitor.php +++ b/src/lib/Query/Common/AggregationVisitor/UserMetadataTermAggregationVisitor.php @@ -8,10 +8,10 @@ namespace Ibexa\Solr\Query\Common\AggregationVisitor; -use eZ\Publish\API\Repository\Values\Content\Query\Aggregation\AbstractTermAggregation; -use eZ\Publish\API\Repository\Values\Content\Query\Aggregation\UserMetadataTermAggregation; -use eZ\Publish\API\Repository\Values\Content\Query\Aggregation; -use eZ\Publish\Core\Base\Exceptions\InvalidArgumentException; +use Ibexa\Contracts\Core\Repository\Values\Content\Query\Aggregation\AbstractTermAggregation; +use Ibexa\Contracts\Core\Repository\Values\Content\Query\Aggregation\UserMetadataTermAggregation; +use Ibexa\Contracts\Core\Repository\Values\Content\Query\Aggregation; +use Ibexa\Core\Base\Exceptions\InvalidArgumentException; final class UserMetadataTermAggregationVisitor extends AbstractTermAggregationVisitor { @@ -21,7 +21,7 @@ public function canVisit(Aggregation $aggregation, array $languageFilter): bool } /** - * @param \eZ\Publish\API\Repository\Values\Content\Query\Aggregation\UserMetadataTermAggregation $aggregation + * @param \Ibexa\Contracts\Core\Repository\Values\Content\Query\Aggregation\UserMetadataTermAggregation $aggregation */ protected function getTargetField(AbstractTermAggregation $aggregation): string { diff --git a/src/lib/Query/Common/CriterionVisitor/Aggregate.php b/src/lib/Query/Common/CriterionVisitor/Aggregate.php index fe8d899c..391f7eea 100644 --- a/src/lib/Query/Common/CriterionVisitor/Aggregate.php +++ b/src/lib/Query/Common/CriterionVisitor/Aggregate.php @@ -10,8 +10,8 @@ */ namespace Ibexa\Solr\Query\Common\CriterionVisitor; -use eZ\Publish\API\Repository\Exceptions\NotImplementedException; -use eZ\Publish\API\Repository\Values\Content\Query\Criterion; +use Ibexa\Contracts\Core\Repository\Exceptions\NotImplementedException; +use Ibexa\Contracts\Core\Repository\Values\Content\Query\Criterion; use Ibexa\Contracts\Solr\Query\CriterionVisitor; /** @@ -22,14 +22,14 @@ class Aggregate extends CriterionVisitor /** * Array of available visitors. * - * @var \EzSystems\EzPlatformSolrSearchEngine\Query\CriterionVisitor[] + * @var \Ibexa\Contracts\Solr\Query\CriterionVisitor[] */ protected $visitors = []; /** * Construct from optional visitor array. * - * @param \EzSystems\EzPlatformSolrSearchEngine\Query\CriterionVisitor[] $visitors + * @param \Ibexa\Contracts\Solr\Query\CriterionVisitor[] $visitors */ public function __construct(array $visitors = []) { @@ -59,9 +59,9 @@ public function canVisit(Criterion $criterion) /** * Map field value to a proper Solr representation. * - * @throws \eZ\Publish\API\Repository\Exceptions\NotImplementedException + * @throws \Ibexa\Contracts\Core\Repository\Exceptions\NotImplementedException * - * @param \EzSystems\EzPlatformSolrSearchEngine\Query\CriterionVisitor $subVisitor + * @param \Ibexa\Contracts\Solr\Query\CriterionVisitor $subVisitor * * @return string */ diff --git a/src/lib/Query/Common/CriterionVisitor/CompositeCriterion.php b/src/lib/Query/Common/CriterionVisitor/CompositeCriterion.php index 641c4fe7..ec02ba59 100644 --- a/src/lib/Query/Common/CriterionVisitor/CompositeCriterion.php +++ b/src/lib/Query/Common/CriterionVisitor/CompositeCriterion.php @@ -8,7 +8,7 @@ namespace Ibexa\Solr\Query\Common\CriterionVisitor; -use eZ\Publish\API\Repository\Values\Content\Query\Criterion; +use Ibexa\Contracts\Core\Repository\Values\Content\Query\Criterion; use Ibexa\Contracts\Solr\Query\CriterionVisitor; final class CompositeCriterion extends CriterionVisitor diff --git a/src/lib/Query/Common/CriterionVisitor/ContentIdIn.php b/src/lib/Query/Common/CriterionVisitor/ContentIdIn.php index 64c37e31..47cc5be6 100644 --- a/src/lib/Query/Common/CriterionVisitor/ContentIdIn.php +++ b/src/lib/Query/Common/CriterionVisitor/ContentIdIn.php @@ -10,8 +10,8 @@ */ namespace Ibexa\Solr\Query\Common\CriterionVisitor; -use eZ\Publish\API\Repository\Values\Content\Query\Criterion; -use eZ\Publish\API\Repository\Values\Content\Query\Criterion\Operator; +use Ibexa\Contracts\Core\Repository\Values\Content\Query\Criterion; +use Ibexa\Contracts\Core\Repository\Values\Content\Query\Criterion\Operator; use Ibexa\Contracts\Solr\Query\CriterionVisitor; /** @@ -37,7 +37,7 @@ public function canVisit(Criterion $criterion) /** * Map field value to a proper Solr representation. * - * @param \EzSystems\EzPlatformSolrSearchEngine\Query\CriterionVisitor $subVisitor + * @param \Ibexa\Contracts\Solr\Query\CriterionVisitor $subVisitor * * @return string */ diff --git a/src/lib/Query/Common/CriterionVisitor/ContentTypeGroupIdIn.php b/src/lib/Query/Common/CriterionVisitor/ContentTypeGroupIdIn.php index d8e375a1..c590863b 100644 --- a/src/lib/Query/Common/CriterionVisitor/ContentTypeGroupIdIn.php +++ b/src/lib/Query/Common/CriterionVisitor/ContentTypeGroupIdIn.php @@ -10,8 +10,8 @@ */ namespace Ibexa\Solr\Query\Common\CriterionVisitor; -use eZ\Publish\API\Repository\Values\Content\Query\Criterion; -use eZ\Publish\API\Repository\Values\Content\Query\Criterion\Operator; +use Ibexa\Contracts\Core\Repository\Values\Content\Query\Criterion; +use Ibexa\Contracts\Core\Repository\Values\Content\Query\Criterion\Operator; use Ibexa\Contracts\Solr\Query\CriterionVisitor; /** @@ -37,7 +37,7 @@ public function canVisit(Criterion $criterion) /** * Map field value to a proper Solr representation. * - * @param \EzSystems\EzPlatformSolrSearchEngine\Query\CriterionVisitor $subVisitor + * @param \Ibexa\Contracts\Solr\Query\CriterionVisitor $subVisitor * * @return string */ diff --git a/src/lib/Query/Common/CriterionVisitor/ContentTypeIdIn.php b/src/lib/Query/Common/CriterionVisitor/ContentTypeIdIn.php index a4033d16..005be378 100644 --- a/src/lib/Query/Common/CriterionVisitor/ContentTypeIdIn.php +++ b/src/lib/Query/Common/CriterionVisitor/ContentTypeIdIn.php @@ -10,8 +10,8 @@ */ namespace Ibexa\Solr\Query\Common\CriterionVisitor; -use eZ\Publish\API\Repository\Values\Content\Query\Criterion; -use eZ\Publish\API\Repository\Values\Content\Query\Criterion\Operator; +use Ibexa\Contracts\Core\Repository\Values\Content\Query\Criterion; +use Ibexa\Contracts\Core\Repository\Values\Content\Query\Criterion\Operator; use Ibexa\Contracts\Solr\Query\CriterionVisitor; /** @@ -37,7 +37,7 @@ public function canVisit(Criterion $criterion) /** * Map field value to a proper Solr representation. * - * @param \EzSystems\EzPlatformSolrSearchEngine\Query\CriterionVisitor $subVisitor + * @param \Ibexa\Contracts\Solr\Query\CriterionVisitor $subVisitor * * @return string */ diff --git a/src/lib/Query/Common/CriterionVisitor/ContentTypeIdentifierIn.php b/src/lib/Query/Common/CriterionVisitor/ContentTypeIdentifierIn.php index c6e0f0e5..bb24f29d 100644 --- a/src/lib/Query/Common/CriterionVisitor/ContentTypeIdentifierIn.php +++ b/src/lib/Query/Common/CriterionVisitor/ContentTypeIdentifierIn.php @@ -10,10 +10,10 @@ */ namespace Ibexa\Solr\Query\Common\CriterionVisitor; -use eZ\Publish\API\Repository\Exceptions\NotFoundException; -use eZ\Publish\API\Repository\Values\Content\Query\Criterion; -use eZ\Publish\API\Repository\Values\Content\Query\Criterion\Operator; -use eZ\Publish\SPI\Persistence\Content\Type\Handler; +use Ibexa\Contracts\Core\Repository\Exceptions\NotFoundException; +use Ibexa\Contracts\Core\Repository\Values\Content\Query\Criterion; +use Ibexa\Contracts\Core\Repository\Values\Content\Query\Criterion\Operator; +use Ibexa\Contracts\Core\Persistence\Content\Type\Handler; use Ibexa\Contracts\Solr\Query\CriterionVisitor; use Psr\Log\LoggerInterface; use Psr\Log\NullLogger; @@ -26,7 +26,7 @@ class ContentTypeIdentifierIn extends CriterionVisitor /** * ContentType handler. * - * @var \eZ\Publish\SPI\Persistence\Content\Type\Handler + * @var \Ibexa\Contracts\Core\Persistence\Content\Type\Handler */ protected $contentTypeHandler; @@ -62,7 +62,7 @@ public function canVisit(Criterion $criterion) /** * Map field value to a proper Solr representation. * - * @param \EzSystems\EzPlatformSolrSearchEngine\Query\CriterionVisitor $subVisitor + * @param \Ibexa\Contracts\Solr\Query\CriterionVisitor $subVisitor * * @return string */ diff --git a/src/lib/Query/Common/CriterionVisitor/CustomField/CustomFieldIn.php b/src/lib/Query/Common/CriterionVisitor/CustomField/CustomFieldIn.php index 2639dbd0..ea8e94bd 100644 --- a/src/lib/Query/Common/CriterionVisitor/CustomField/CustomFieldIn.php +++ b/src/lib/Query/Common/CriterionVisitor/CustomField/CustomFieldIn.php @@ -10,8 +10,8 @@ */ namespace Ibexa\Solr\Query\Common\CriterionVisitor\CustomField; -use eZ\Publish\API\Repository\Values\Content\Query\Criterion; -use eZ\Publish\API\Repository\Values\Content\Query\Criterion\Operator; +use Ibexa\Contracts\Core\Repository\Values\Content\Query\Criterion; +use Ibexa\Contracts\Core\Repository\Values\Content\Query\Criterion\Operator; use Ibexa\Contracts\Solr\Query\CriterionVisitor; /** @@ -38,7 +38,7 @@ public function canVisit(Criterion $criterion) /** * Map field value to a proper Solr representation. * - * @param \EzSystems\EzPlatformSolrSearchEngine\Query\CriterionVisitor $subVisitor + * @param \Ibexa\Contracts\Solr\Query\CriterionVisitor $subVisitor * * @return string */ diff --git a/src/lib/Query/Common/CriterionVisitor/CustomField/CustomFieldRange.php b/src/lib/Query/Common/CriterionVisitor/CustomField/CustomFieldRange.php index ff51d17a..d36568ab 100644 --- a/src/lib/Query/Common/CriterionVisitor/CustomField/CustomFieldRange.php +++ b/src/lib/Query/Common/CriterionVisitor/CustomField/CustomFieldRange.php @@ -10,8 +10,8 @@ */ namespace Ibexa\Solr\Query\Common\CriterionVisitor\CustomField; -use eZ\Publish\API\Repository\Values\Content\Query\Criterion; -use eZ\Publish\API\Repository\Values\Content\Query\Criterion\Operator; +use Ibexa\Contracts\Core\Repository\Values\Content\Query\Criterion; +use Ibexa\Contracts\Core\Repository\Values\Content\Query\Criterion\Operator; use Ibexa\Contracts\Solr\Query\CriterionVisitor; /** @@ -40,7 +40,7 @@ public function canVisit(Criterion $criterion) /** * Map field value to a proper Solr representation. * - * @param \EzSystems\EzPlatformSolrSearchEngine\Query\CriterionVisitor $subVisitor + * @param \Ibexa\Contracts\Solr\Query\CriterionVisitor $subVisitor * * @return string */ diff --git a/src/lib/Query/Common/CriterionVisitor/DateMetadata/ModifiedBetween.php b/src/lib/Query/Common/CriterionVisitor/DateMetadata/ModifiedBetween.php index 00173c0d..41ee9a19 100644 --- a/src/lib/Query/Common/CriterionVisitor/DateMetadata/ModifiedBetween.php +++ b/src/lib/Query/Common/CriterionVisitor/DateMetadata/ModifiedBetween.php @@ -10,8 +10,8 @@ */ namespace Ibexa\Solr\Query\Common\CriterionVisitor\DateMetadata; -use eZ\Publish\API\Repository\Values\Content\Query\Criterion; -use eZ\Publish\API\Repository\Values\Content\Query\Criterion\Operator; +use Ibexa\Contracts\Core\Repository\Values\Content\Query\Criterion; +use Ibexa\Contracts\Core\Repository\Values\Content\Query\Criterion\Operator; use Ibexa\Solr\Query\Common\CriterionVisitor\DateMetadata; use Ibexa\Contracts\Solr\Query\CriterionVisitor; @@ -40,7 +40,7 @@ public function canVisit(Criterion $criterion) /** * Map field value to a proper Solr representation. * - * @param \EzSystems\EzPlatformSolrSearchEngine\Query\CriterionVisitor $subVisitor + * @param \Ibexa\Contracts\Solr\Query\CriterionVisitor $subVisitor * * @return string */ diff --git a/src/lib/Query/Common/CriterionVisitor/DateMetadata/ModifiedIn.php b/src/lib/Query/Common/CriterionVisitor/DateMetadata/ModifiedIn.php index 14458701..efda5deb 100644 --- a/src/lib/Query/Common/CriterionVisitor/DateMetadata/ModifiedIn.php +++ b/src/lib/Query/Common/CriterionVisitor/DateMetadata/ModifiedIn.php @@ -10,8 +10,8 @@ */ namespace Ibexa\Solr\Query\Common\CriterionVisitor\DateMetadata; -use eZ\Publish\API\Repository\Values\Content\Query\Criterion; -use eZ\Publish\API\Repository\Values\Content\Query\Criterion\Operator; +use Ibexa\Contracts\Core\Repository\Values\Content\Query\Criterion; +use Ibexa\Contracts\Core\Repository\Values\Content\Query\Criterion\Operator; use Ibexa\Solr\Query\Common\CriterionVisitor\DateMetadata; use Ibexa\Contracts\Solr\Query\CriterionVisitor; @@ -39,7 +39,7 @@ public function canVisit(Criterion $criterion) /** * Map field value to a proper Solr representation. * - * @param \EzSystems\EzPlatformSolrSearchEngine\Query\CriterionVisitor $subVisitor + * @param \Ibexa\Contracts\Solr\Query\CriterionVisitor $subVisitor * * @return string */ diff --git a/src/lib/Query/Common/CriterionVisitor/DateMetadata/PublishedBetween.php b/src/lib/Query/Common/CriterionVisitor/DateMetadata/PublishedBetween.php index 31b18e2d..f53081ba 100644 --- a/src/lib/Query/Common/CriterionVisitor/DateMetadata/PublishedBetween.php +++ b/src/lib/Query/Common/CriterionVisitor/DateMetadata/PublishedBetween.php @@ -10,8 +10,8 @@ */ namespace Ibexa\Solr\Query\Common\CriterionVisitor\DateMetadata; -use eZ\Publish\API\Repository\Values\Content\Query\Criterion; -use eZ\Publish\API\Repository\Values\Content\Query\Criterion\Operator; +use Ibexa\Contracts\Core\Repository\Values\Content\Query\Criterion; +use Ibexa\Contracts\Core\Repository\Values\Content\Query\Criterion\Operator; use Ibexa\Solr\Query\Common\CriterionVisitor\DateMetadata; use Ibexa\Contracts\Solr\Query\CriterionVisitor; @@ -42,7 +42,7 @@ public function canVisit(Criterion $criterion) /** * Map field value to a proper Solr representation. * - * @param \EzSystems\EzPlatformSolrSearchEngine\Query\CriterionVisitor $subVisitor + * @param \Ibexa\Contracts\Solr\Query\CriterionVisitor $subVisitor * * @return string */ diff --git a/src/lib/Query/Common/CriterionVisitor/DateMetadata/PublishedIn.php b/src/lib/Query/Common/CriterionVisitor/DateMetadata/PublishedIn.php index 8ebd1f68..fff38663 100644 --- a/src/lib/Query/Common/CriterionVisitor/DateMetadata/PublishedIn.php +++ b/src/lib/Query/Common/CriterionVisitor/DateMetadata/PublishedIn.php @@ -10,8 +10,8 @@ */ namespace Ibexa\Solr\Query\Common\CriterionVisitor\DateMetadata; -use eZ\Publish\API\Repository\Values\Content\Query\Criterion; -use eZ\Publish\API\Repository\Values\Content\Query\Criterion\Operator; +use Ibexa\Contracts\Core\Repository\Values\Content\Query\Criterion; +use Ibexa\Contracts\Core\Repository\Values\Content\Query\Criterion\Operator; use Ibexa\Solr\Query\Common\CriterionVisitor\DateMetadata; use Ibexa\Contracts\Solr\Query\CriterionVisitor; @@ -39,7 +39,7 @@ public function canVisit(Criterion $criterion) /** * Map field value to a proper Solr representation. * - * @param \EzSystems\EzPlatformSolrSearchEngine\Query\CriterionVisitor $subVisitor + * @param \Ibexa\Contracts\Solr\Query\CriterionVisitor $subVisitor * * @return string */ diff --git a/src/lib/Query/Common/CriterionVisitor/Factory/FullTextFactoryAbstract.php b/src/lib/Query/Common/CriterionVisitor/Factory/FullTextFactoryAbstract.php index 7872fbc8..06e4a690 100644 --- a/src/lib/Query/Common/CriterionVisitor/Factory/FullTextFactoryAbstract.php +++ b/src/lib/Query/Common/CriterionVisitor/Factory/FullTextFactoryAbstract.php @@ -8,7 +8,7 @@ namespace Ibexa\Solr\Query\Common\CriterionVisitor\Factory; -use eZ\Publish\Core\Search\Common\FieldNameResolver; +use Ibexa\Core\Search\Common\FieldNameResolver; use Ibexa\Solr\FieldMapper\IndexingDepthProvider; use Ibexa\Contracts\Solr\Query\CriterionVisitor; use QueryTranslator\Languages\Galach\Generators\ExtendedDisMax; @@ -18,8 +18,8 @@ /** * Factory for FullText Criterion Visitor. * - * @see \EzSystems\EzPlatformSolrSearchEngine\Query\Content\CriterionVisitor\FullText - * @see \EzSystems\EzPlatformSolrSearchEngine\Query\Location\CriterionVisitor\FullText + * @see \Ibexa\Solr\Query\Content\CriterionVisitor\FullText + * @see \Ibexa\Solr\Query\Location\CriterionVisitor\FullText * * @internal */ @@ -28,7 +28,7 @@ abstract class FullTextFactoryAbstract /** * Field map. * - * @var \eZ\Publish\Core\Search\Common\FieldNameResolver + * @var \Ibexa\Core\Search\Common\FieldNameResolver */ protected $fieldNameResolver; @@ -48,7 +48,7 @@ abstract class FullTextFactoryAbstract protected $generator; /** - * @var \EzSystems\EzPlatformSolrSearchEngine\FieldMapper\IndexingDepthProvider + * @var \Ibexa\Solr\FieldMapper\IndexingDepthProvider */ protected $indexingDepthProvider; diff --git a/src/lib/Query/Common/CriterionVisitor/Field.php b/src/lib/Query/Common/CriterionVisitor/Field.php index b5cecd9f..7950535a 100644 --- a/src/lib/Query/Common/CriterionVisitor/Field.php +++ b/src/lib/Query/Common/CriterionVisitor/Field.php @@ -10,11 +10,11 @@ */ namespace Ibexa\Solr\Query\Common\CriterionVisitor; -use eZ\Publish\API\Repository\Values\Content\Query\Criterion; -use eZ\Publish\Core\Search\Common\FieldNameResolver; -use eZ\Publish\Core\Search\Common\FieldValueMapper; -use eZ\Publish\SPI\Search\Field as SearchField; -use eZ\Publish\SPI\Search\FieldType; +use Ibexa\Contracts\Core\Repository\Values\Content\Query\Criterion; +use Ibexa\Core\Search\Common\FieldNameResolver; +use Ibexa\Core\Search\Common\FieldValueMapper; +use Ibexa\Contracts\Core\Search\Field as SearchField; +use Ibexa\Contracts\Core\Search\FieldType; use Ibexa\Contracts\Solr\Query\CriterionVisitor; /** @@ -27,12 +27,12 @@ abstract class Field extends CriterionVisitor /** * Field map. * - * @var \eZ\Publish\Core\Search\Common\FieldNameResolver + * @var \Ibexa\Core\Search\Common\FieldNameResolver */ protected $fieldNameResolver; /** - * @var \eZ\Publish\Core\Search\Common\FieldValueMapper + * @var \Ibexa\Core\Search\Common\FieldValueMapper */ protected $fieldValueMapper; @@ -45,7 +45,7 @@ public function __construct(FieldNameResolver $fieldNameResolver, FieldValueMapp /** * Get array of search fields. * - * @return \eZ\Publish\SPI\Search\FieldType[] Array of field types indexed by name. + * @return \Ibexa\Contracts\Core\Search\FieldType[] Array of field types indexed by name. */ protected function getSearchFields(Criterion $criterion) { @@ -59,7 +59,7 @@ protected function getSearchFields(Criterion $criterion) * Map search field value to solr value using FieldValueMapper. * * @param mixed $value - * @param \eZ\Publish\SPI\Search\FieldType $searchFieldType + * @param \Ibexa\Contracts\Core\Search\FieldType $searchFieldType * * @return mixed */ diff --git a/src/lib/Query/Common/CriterionVisitor/Field/FieldEmpty.php b/src/lib/Query/Common/CriterionVisitor/Field/FieldEmpty.php index 69c6a14e..395e2435 100644 --- a/src/lib/Query/Common/CriterionVisitor/Field/FieldEmpty.php +++ b/src/lib/Query/Common/CriterionVisitor/Field/FieldEmpty.php @@ -8,12 +8,12 @@ namespace Ibexa\Solr\Query\Common\CriterionVisitor\Field; -use eZ\Publish\API\Repository\Values\Content\Query\Criterion; -use eZ\Publish\Core\Base\Exceptions\InvalidArgumentException; -use eZ\Publish\Core\Search\Common\FieldNameGenerator; -use eZ\Publish\Core\Search\Common\FieldNameResolver; -use eZ\Publish\Core\Search\Common\FieldValueMapper; -use eZ\Publish\SPI\Search\FieldType\BooleanField; +use Ibexa\Contracts\Core\Repository\Values\Content\Query\Criterion; +use Ibexa\Core\Base\Exceptions\InvalidArgumentException; +use Ibexa\Core\Search\Common\FieldNameGenerator; +use Ibexa\Core\Search\Common\FieldNameResolver; +use Ibexa\Core\Search\Common\FieldValueMapper; +use Ibexa\Contracts\Core\Search\FieldType\BooleanField; use Ibexa\Solr\FieldMapper\ContentTranslationFieldMapper\ContentDocumentEmptyFields; use Ibexa\Solr\Query\Common\CriterionVisitor\Field; use Ibexa\Contracts\Solr\Query\CriterionVisitor; @@ -24,7 +24,7 @@ final class FieldEmpty extends Field { /** - * @var \eZ\Publish\Core\Search\Common\FieldNameGenerator + * @var \Ibexa\Core\Search\Common\FieldNameGenerator */ private $fieldNameGenerator; @@ -49,9 +49,9 @@ public function canVisit(Criterion $criterion): bool /** * Map field value to a proper Solr representation. * - * @throws \eZ\Publish\API\Repository\Exceptions\InvalidArgumentException If no searchable fields are found for the given criterion target. + * @throws \Ibexa\Contracts\Core\Repository\Exceptions\InvalidArgumentException If no searchable fields are found for the given criterion target. * - * @param \EzSystems\EzPlatformSolrSearchEngine\Query\CriterionVisitor $subVisitor + * @param \Ibexa\Contracts\Solr\Query\CriterionVisitor $subVisitor */ public function visit(Criterion $criterion, CriterionVisitor $subVisitor = null): string { diff --git a/src/lib/Query/Common/CriterionVisitor/Field/FieldIn.php b/src/lib/Query/Common/CriterionVisitor/Field/FieldIn.php index 6f7433db..3dc37f13 100644 --- a/src/lib/Query/Common/CriterionVisitor/Field/FieldIn.php +++ b/src/lib/Query/Common/CriterionVisitor/Field/FieldIn.php @@ -10,9 +10,9 @@ use Ibexa\Contracts\Solr\Query\CriterionVisitor; use Ibexa\Solr\Query\Common\CriterionVisitor\Field; -use eZ\Publish\API\Repository\Values\Content\Query\Criterion; -use eZ\Publish\API\Repository\Values\Content\Query\Criterion\Operator; -use eZ\Publish\Core\Base\Exceptions\InvalidArgumentException; +use Ibexa\Contracts\Core\Repository\Values\Content\Query\Criterion; +use Ibexa\Contracts\Core\Repository\Values\Content\Query\Criterion\Operator; +use Ibexa\Core\Base\Exceptions\InvalidArgumentException; /** * Visits the Field criterion. @@ -22,7 +22,7 @@ class FieldIn extends Field /** * Check if visitor is applicable to current criterion. * - * @param Criterion $criterion + * @param \Ibexa\Contracts\Core\Repository\Values\Content\Query\Criterion $criterion * * @return bool */ @@ -38,10 +38,10 @@ public function canVisit(Criterion $criterion) /** * Map field value to a proper Solr representation. * - * @throws \eZ\Publish\Core\Base\Exceptions\InvalidArgumentException If no searchable fields are found for the given criterion target. + * @throws \Ibexa\Core\Base\Exceptions\InvalidArgumentException If no searchable fields are found for the given criterion target. * - * @param \eZ\Publish\API\Repository\Values\Content\Query\Criterion $criterion - * @param \EzSystems\EzPlatformSolrSearchEngine\Query\CriterionVisitor $subVisitor + * @param \Ibexa\Contracts\Core\Repository\Values\Content\Query\Criterion $criterion + * @param \Ibexa\Contracts\Solr\Query\CriterionVisitor $subVisitor * * @return string */ diff --git a/src/lib/Query/Common/CriterionVisitor/Field/FieldLike.php b/src/lib/Query/Common/CriterionVisitor/Field/FieldLike.php index e71145d2..1517ea7b 100644 --- a/src/lib/Query/Common/CriterionVisitor/Field/FieldLike.php +++ b/src/lib/Query/Common/CriterionVisitor/Field/FieldLike.php @@ -8,9 +8,9 @@ */ namespace Ibexa\Solr\Query\Common\CriterionVisitor\Field; -use eZ\Publish\API\Repository\Values\Content\Query\Criterion; -use eZ\Publish\API\Repository\Values\Content\Query\Criterion\Operator; -use eZ\Publish\Core\Base\Exceptions\InvalidArgumentException; +use Ibexa\Contracts\Core\Repository\Values\Content\Query\Criterion; +use Ibexa\Contracts\Core\Repository\Values\Content\Query\Criterion\Operator; +use Ibexa\Core\Base\Exceptions\InvalidArgumentException; use Ibexa\Solr\Query\Common\CriterionVisitor\Field; use Ibexa\Contracts\Solr\Query\CriterionVisitor; @@ -22,7 +22,7 @@ class FieldLike extends Field /** * Check if visitor is applicable to current criterion. * - * @param Criterion $criterion + * @param \Ibexa\Contracts\Core\Repository\Values\Content\Query\Criterion $criterion * * @return bool */ @@ -34,10 +34,10 @@ public function canVisit(Criterion $criterion) /** * Map field value to a proper Solr representation. * - * @throws \eZ\Publish\Core\Base\Exceptions\InvalidArgumentException If no searchable fields are found for the given criterion target. + * @throws \Ibexa\Core\Base\Exceptions\InvalidArgumentException If no searchable fields are found for the given criterion target. * - * @param \eZ\Publish\API\Repository\Values\Content\Query\Criterion $criterion - * @param \EzSystems\EzPlatformSolrSearchEngine\Query\CriterionVisitor $subVisitor + * @param \Ibexa\Contracts\Core\Repository\Values\Content\Query\Criterion $criterion + * @param \Ibexa\Contracts\Solr\Query\CriterionVisitor $subVisitor * * @return string */ diff --git a/src/lib/Query/Common/CriterionVisitor/Field/FieldRange.php b/src/lib/Query/Common/CriterionVisitor/Field/FieldRange.php index e83a790d..3eac138b 100644 --- a/src/lib/Query/Common/CriterionVisitor/Field/FieldRange.php +++ b/src/lib/Query/Common/CriterionVisitor/Field/FieldRange.php @@ -12,9 +12,9 @@ use Ibexa\Contracts\Solr\Query\CriterionVisitor; use Ibexa\Solr\Query\Common\CriterionVisitor\Field; -use eZ\Publish\API\Repository\Values\Content\Query\Criterion; -use eZ\Publish\API\Repository\Values\Content\Query\Criterion\Operator; -use eZ\Publish\Core\Base\Exceptions\InvalidArgumentException; +use Ibexa\Contracts\Core\Repository\Values\Content\Query\Criterion; +use Ibexa\Contracts\Core\Repository\Values\Content\Query\Criterion\Operator; +use Ibexa\Core\Base\Exceptions\InvalidArgumentException; /** * Visits the Field criterion. @@ -24,7 +24,7 @@ class FieldRange extends Field /** * Check if visitor is applicable to current criterion. * - * @param Criterion $criterion + * @param \Ibexa\Contracts\Core\Repository\Values\Content\Query\Criterion $criterion * * @return bool */ @@ -42,10 +42,10 @@ public function canVisit(Criterion $criterion) /** * Map field value to a proper Solr representation. * - * @throws \eZ\Publish\Core\Base\Exceptions\InvalidArgumentException If no searchable fields are found for the given criterion target. + * @throws \Ibexa\Core\Base\Exceptions\InvalidArgumentException If no searchable fields are found for the given criterion target. * - * @param \eZ\Publish\API\Repository\Values\Content\Query\Criterion $criterion - * @param \EzSystems\EzPlatformSolrSearchEngine\Query\CriterionVisitor $subVisitor + * @param \Ibexa\Contracts\Core\Repository\Values\Content\Query\Criterion $criterion + * @param \Ibexa\Contracts\Solr\Query\CriterionVisitor $subVisitor * * @return string */ diff --git a/src/lib/Query/Common/CriterionVisitor/Field/FieldRelation.php b/src/lib/Query/Common/CriterionVisitor/Field/FieldRelation.php index 9a34f1ea..2c873e05 100644 --- a/src/lib/Query/Common/CriterionVisitor/Field/FieldRelation.php +++ b/src/lib/Query/Common/CriterionVisitor/Field/FieldRelation.php @@ -12,9 +12,9 @@ use Ibexa\Contracts\Solr\Query\CriterionVisitor; use Ibexa\Solr\Query\Common\CriterionVisitor\Field; -use eZ\Publish\API\Repository\Values\Content\Query\Criterion; -use eZ\Publish\API\Repository\Values\Content\Query\Criterion\Operator; -use eZ\Publish\Core\Base\Exceptions\InvalidArgumentException; +use Ibexa\Contracts\Core\Repository\Values\Content\Query\Criterion; +use Ibexa\Contracts\Core\Repository\Values\Content\Query\Criterion\Operator; +use Ibexa\Core\Base\Exceptions\InvalidArgumentException; /** * Visits the FieldRelation criterion. @@ -24,7 +24,7 @@ class FieldRelation extends Field /** * Check if visitor is applicable to current criterion. * - * @param Criterion $criterion + * @param \Ibexa\Contracts\Core\Repository\Values\Content\Query\Criterion $criterion * * @return bool */ @@ -39,10 +39,10 @@ public function canVisit(Criterion $criterion) /** * Map field value to a proper Solr representation. * - * @throws \eZ\Publish\Core\Base\Exceptions\InvalidArgumentException If no searchable fields are found for the given criterion target. + * @throws \Ibexa\Core\Base\Exceptions\InvalidArgumentException If no searchable fields are found for the given criterion target. * - * @param Criterion $criterion - * @param CriterionVisitor $subVisitor + * @param \Ibexa\Contracts\Core\Repository\Values\Content\Query\Criterion $criterion + * @param \Ibexa\Contracts\Solr\Query\CriterionVisitor $subVisitor * * @return string */ diff --git a/src/lib/Query/Common/CriterionVisitor/LanguageCodeIn.php b/src/lib/Query/Common/CriterionVisitor/LanguageCodeIn.php index 7015cf19..b2494e3a 100644 --- a/src/lib/Query/Common/CriterionVisitor/LanguageCodeIn.php +++ b/src/lib/Query/Common/CriterionVisitor/LanguageCodeIn.php @@ -10,8 +10,8 @@ */ namespace Ibexa\Solr\Query\Common\CriterionVisitor; -use eZ\Publish\API\Repository\Values\Content\Query\Criterion; -use eZ\Publish\API\Repository\Values\Content\Query\Criterion\Operator; +use Ibexa\Contracts\Core\Repository\Values\Content\Query\Criterion; +use Ibexa\Contracts\Core\Repository\Values\Content\Query\Criterion\Operator; use Ibexa\Contracts\Solr\Query\CriterionVisitor; /** @@ -35,7 +35,7 @@ public function canVisit(Criterion $criterion) /** * Map field value to a proper Solr representation. * - * @param \EzSystems\EzPlatformSolrSearchEngine\Query\CriterionVisitor $subVisitor + * @param \Ibexa\Contracts\Solr\Query\CriterionVisitor $subVisitor * * @return string */ diff --git a/src/lib/Query/Common/CriterionVisitor/LogicalAnd.php b/src/lib/Query/Common/CriterionVisitor/LogicalAnd.php index 8d10c925..8cfd455f 100644 --- a/src/lib/Query/Common/CriterionVisitor/LogicalAnd.php +++ b/src/lib/Query/Common/CriterionVisitor/LogicalAnd.php @@ -10,7 +10,7 @@ */ namespace Ibexa\Solr\Query\Common\CriterionVisitor; -use eZ\Publish\API\Repository\Values\Content\Query\Criterion; +use Ibexa\Contracts\Core\Repository\Values\Content\Query\Criterion; use Ibexa\Contracts\Solr\Query\CriterionVisitor; use RuntimeException; @@ -32,13 +32,13 @@ public function canVisit(Criterion $criterion) /** * Map field value to a proper Solr representation. * - * @param CriterionVisitor $subVisitor + * @param \Ibexa\Contracts\Solr\Query\CriterionVisitor $subVisitor * * @return string */ public function visit(Criterion $criterion, CriterionVisitor $subVisitor = null) { - /** @var \eZ\Publish\API\Repository\Values\Content\Query\Criterion\LogicalAnd $criterion */ + /** @var \Ibexa\Contracts\Core\Repository\Values\Content\Query\Criterion\LogicalAnd $criterion */ if (!isset($criterion->criteria[0])) { throw new RuntimeException('Invalid aggregation in LogicalAnd criterion.'); } diff --git a/src/lib/Query/Common/CriterionVisitor/LogicalNot.php b/src/lib/Query/Common/CriterionVisitor/LogicalNot.php index 6eb6f57a..569b0488 100644 --- a/src/lib/Query/Common/CriterionVisitor/LogicalNot.php +++ b/src/lib/Query/Common/CriterionVisitor/LogicalNot.php @@ -10,7 +10,7 @@ */ namespace Ibexa\Solr\Query\Common\CriterionVisitor; -use eZ\Publish\API\Repository\Values\Content\Query\Criterion; +use Ibexa\Contracts\Core\Repository\Values\Content\Query\Criterion; use Ibexa\Contracts\Solr\Query\CriterionVisitor; /** @@ -31,7 +31,7 @@ public function canVisit(Criterion $criterion) /** * Map field value to a proper Solr representation. * - * @param CriterionVisitor $subVisitor + * @param \Ibexa\Contracts\Solr\Query\CriterionVisitor $subVisitor * * @return string */ diff --git a/src/lib/Query/Common/CriterionVisitor/LogicalOr.php b/src/lib/Query/Common/CriterionVisitor/LogicalOr.php index 4c3f2eb0..f11cae99 100644 --- a/src/lib/Query/Common/CriterionVisitor/LogicalOr.php +++ b/src/lib/Query/Common/CriterionVisitor/LogicalOr.php @@ -10,7 +10,7 @@ */ namespace Ibexa\Solr\Query\Common\CriterionVisitor; -use eZ\Publish\API\Repository\Values\Content\Query\Criterion; +use Ibexa\Contracts\Core\Repository\Values\Content\Query\Criterion; use Ibexa\Contracts\Solr\Query\CriterionVisitor; use RuntimeException; @@ -32,13 +32,13 @@ public function canVisit(Criterion $criterion) /** * Map field value to a proper Solr representation. * - * @param CriterionVisitor $subVisitor + * @param \Ibexa\Contracts\Solr\Query\CriterionVisitor $subVisitor * * @return string */ public function visit(Criterion $criterion, CriterionVisitor $subVisitor = null) { - /** @var \eZ\Publish\API\Repository\Values\Content\Query\Criterion\LogicalAnd $criterion */ + /** @var \Ibexa\Contracts\Core\Repository\Values\Content\Query\Criterion\LogicalAnd $criterion */ if (!isset($criterion->criteria[0])) { throw new RuntimeException('Invalid aggregation in LogicalOr criterion.'); } diff --git a/src/lib/Query/Common/CriterionVisitor/MapLocation.php b/src/lib/Query/Common/CriterionVisitor/MapLocation.php index 712d5acd..e71df255 100644 --- a/src/lib/Query/Common/CriterionVisitor/MapLocation.php +++ b/src/lib/Query/Common/CriterionVisitor/MapLocation.php @@ -10,8 +10,8 @@ */ namespace Ibexa\Solr\Query\Common\CriterionVisitor; -use eZ\Publish\API\Repository\Values\Content\Query\Criterion; -use eZ\Publish\Core\Search\Common\FieldNameResolver; +use Ibexa\Contracts\Core\Repository\Values\Content\Query\Criterion; +use Ibexa\Core\Search\Common\FieldNameResolver; use Ibexa\Contracts\Solr\Query\CriterionVisitor; /** @@ -22,7 +22,7 @@ abstract class MapLocation extends CriterionVisitor /** * Field map. * - * @var \eZ\Publish\Core\Search\Common\FieldNameResolver + * @var \Ibexa\Core\Search\Common\FieldNameResolver */ protected $fieldNameResolver; diff --git a/src/lib/Query/Common/CriterionVisitor/MapLocation/MapLocationDistanceIn.php b/src/lib/Query/Common/CriterionVisitor/MapLocation/MapLocationDistanceIn.php index fa1185ec..29f8eecd 100644 --- a/src/lib/Query/Common/CriterionVisitor/MapLocation/MapLocationDistanceIn.php +++ b/src/lib/Query/Common/CriterionVisitor/MapLocation/MapLocationDistanceIn.php @@ -12,9 +12,9 @@ use Ibexa\Solr\Query\Common\CriterionVisitor\MapLocation; use Ibexa\Contracts\Solr\Query\CriterionVisitor; -use eZ\Publish\API\Repository\Values\Content\Query\Criterion; -use eZ\Publish\API\Repository\Values\Content\Query\Criterion\Operator; -use eZ\Publish\Core\Base\Exceptions\InvalidArgumentException; +use Ibexa\Contracts\Core\Repository\Values\Content\Query\Criterion; +use Ibexa\Contracts\Core\Repository\Values\Content\Query\Criterion\Operator; +use Ibexa\Core\Base\Exceptions\InvalidArgumentException; /** * Visits the MapLocationDistance criterion. @@ -24,7 +24,7 @@ class MapLocationDistanceIn extends MapLocation /** * Check if visitor is applicable to current criterion. * - * @param \eZ\Publish\API\Repository\Values\Content\Query\Criterion $criterion + * @param \Ibexa\Contracts\Core\Repository\Values\Content\Query\Criterion $criterion * * @return bool */ @@ -39,16 +39,16 @@ public function canVisit(Criterion $criterion) /** * Map field value to a proper Solr representation. * - * @throws \eZ\Publish\Core\Base\Exceptions\InvalidArgumentException If no searchable fields are found for the given criterion target. + * @throws \Ibexa\Core\Base\Exceptions\InvalidArgumentException If no searchable fields are found for the given criterion target. * - * @param \eZ\Publish\API\Repository\Values\Content\Query\Criterion $criterion - * @param \EzSystems\EzPlatformSolrSearchEngine\Query\CriterionVisitor $subVisitor + * @param \Ibexa\Contracts\Core\Repository\Values\Content\Query\Criterion $criterion + * @param \Ibexa\Contracts\Solr\Query\CriterionVisitor $subVisitor * * @return string */ public function visit(Criterion $criterion, CriterionVisitor $subVisitor = null) { - /** @var \eZ\Publish\API\Repository\Values\Content\Query\Criterion\Value\MapLocationValue $location */ + /** @var \Ibexa\Contracts\Core\Repository\Values\Content\Query\Criterion\Value\MapLocationValue $location */ $location = $criterion->valueData; $criterion->value = (array)$criterion->value; diff --git a/src/lib/Query/Common/CriterionVisitor/MapLocation/MapLocationDistanceRange.php b/src/lib/Query/Common/CriterionVisitor/MapLocation/MapLocationDistanceRange.php index 2ae49c85..bc3ab62c 100644 --- a/src/lib/Query/Common/CriterionVisitor/MapLocation/MapLocationDistanceRange.php +++ b/src/lib/Query/Common/CriterionVisitor/MapLocation/MapLocationDistanceRange.php @@ -12,9 +12,9 @@ use Ibexa\Solr\Query\Common\CriterionVisitor\MapLocation; use Ibexa\Contracts\Solr\Query\CriterionVisitor; -use eZ\Publish\API\Repository\Values\Content\Query\Criterion; -use eZ\Publish\API\Repository\Values\Content\Query\Criterion\Operator; -use eZ\Publish\Core\Base\Exceptions\InvalidArgumentException; +use Ibexa\Contracts\Core\Repository\Values\Content\Query\Criterion; +use Ibexa\Contracts\Core\Repository\Values\Content\Query\Criterion\Operator; +use Ibexa\Core\Base\Exceptions\InvalidArgumentException; /** * Visits the MapLocationDistance criterion. @@ -24,7 +24,7 @@ class MapLocationDistanceRange extends MapLocation /** * Check if visitor is applicable to current criterion. * - * @param \eZ\Publish\API\Repository\Values\Content\Query\Criterion $criterion + * @param \Ibexa\Contracts\Core\Repository\Values\Content\Query\Criterion $criterion * * @return bool */ @@ -42,10 +42,10 @@ public function canVisit(Criterion $criterion) /** * Map field value to a proper Solr representation. * - * @throws \eZ\Publish\API\Repository\Exceptions\InvalidArgumentException If no searchable fields are found for the given criterion target. + * @throws \Ibexa\Contracts\Core\Repository\Exceptions\InvalidArgumentException If no searchable fields are found for the given criterion target. * - * @param \eZ\Publish\API\Repository\Values\Content\Query\Criterion $criterion - * @param \EzSystems\EzPlatformSolrSearchEngine\Query\CriterionVisitor $subVisitor + * @param \Ibexa\Contracts\Core\Repository\Values\Content\Query\Criterion $criterion + * @param \Ibexa\Contracts\Solr\Query\CriterionVisitor $subVisitor * * @return string */ @@ -76,7 +76,7 @@ public function visit(Criterion $criterion, CriterionVisitor $subVisitor = null) ); } - /** @var \eZ\Publish\API\Repository\Values\Content\Query\Criterion\Value\MapLocationValue $location */ + /** @var \Ibexa\Contracts\Core\Repository\Values\Content\Query\Criterion\Value\MapLocationValue $location */ $location = $criterion->valueData; $queries = []; diff --git a/src/lib/Query/Common/CriterionVisitor/MatchAll.php b/src/lib/Query/Common/CriterionVisitor/MatchAll.php index 6518482d..f2432404 100644 --- a/src/lib/Query/Common/CriterionVisitor/MatchAll.php +++ b/src/lib/Query/Common/CriterionVisitor/MatchAll.php @@ -10,7 +10,7 @@ */ namespace Ibexa\Solr\Query\Common\CriterionVisitor; -use eZ\Publish\API\Repository\Values\Content\Query\Criterion; +use Ibexa\Contracts\Core\Repository\Values\Content\Query\Criterion; use Ibexa\Contracts\Solr\Query\CriterionVisitor; /** @@ -31,7 +31,7 @@ public function canVisit(Criterion $criterion) /** * Map field value to a proper Solr representation. * - * @param CriterionVisitor $subVisitor + * @param \Ibexa\Contracts\Solr\Query\CriterionVisitor $subVisitor * * @return string */ diff --git a/src/lib/Query/Common/CriterionVisitor/MatchNone.php b/src/lib/Query/Common/CriterionVisitor/MatchNone.php index ced57dac..9bf5f878 100644 --- a/src/lib/Query/Common/CriterionVisitor/MatchNone.php +++ b/src/lib/Query/Common/CriterionVisitor/MatchNone.php @@ -8,7 +8,7 @@ */ namespace Ibexa\Solr\Query\Common\CriterionVisitor; -use eZ\Publish\API\Repository\Values\Content\Query\Criterion; +use Ibexa\Contracts\Core\Repository\Values\Content\Query\Criterion; use Ibexa\Contracts\Solr\Query\CriterionVisitor; /** @@ -29,7 +29,7 @@ public function canVisit(Criterion $criterion) /** * Map field value to a proper Solr representation. * - * @param CriterionVisitor $subVisitor + * @param \Ibexa\Contracts\Solr\Query\CriterionVisitor $subVisitor * * @return string */ diff --git a/src/lib/Query/Common/CriterionVisitor/ObjectStateIdIn.php b/src/lib/Query/Common/CriterionVisitor/ObjectStateIdIn.php index 246c6d98..cfdbd6b8 100644 --- a/src/lib/Query/Common/CriterionVisitor/ObjectStateIdIn.php +++ b/src/lib/Query/Common/CriterionVisitor/ObjectStateIdIn.php @@ -10,8 +10,8 @@ */ namespace Ibexa\Solr\Query\Common\CriterionVisitor; -use eZ\Publish\API\Repository\Values\Content\Query\Criterion; -use eZ\Publish\API\Repository\Values\Content\Query\Criterion\Operator; +use Ibexa\Contracts\Core\Repository\Values\Content\Query\Criterion; +use Ibexa\Contracts\Core\Repository\Values\Content\Query\Criterion\Operator; use Ibexa\Contracts\Solr\Query\CriterionVisitor; /** @@ -37,7 +37,7 @@ public function canVisit(Criterion $criterion) /** * Map field value to a proper Solr representation. * - * @param \EzSystems\EzPlatformSolrSearchEngine\Query\CriterionVisitor $subVisitor + * @param \Ibexa\Contracts\Solr\Query\CriterionVisitor $subVisitor * * @return string */ diff --git a/src/lib/Query/Common/CriterionVisitor/ObjectStateIdentifierIn.php b/src/lib/Query/Common/CriterionVisitor/ObjectStateIdentifierIn.php index fa2a95ec..543929d2 100644 --- a/src/lib/Query/Common/CriterionVisitor/ObjectStateIdentifierIn.php +++ b/src/lib/Query/Common/CriterionVisitor/ObjectStateIdentifierIn.php @@ -9,8 +9,8 @@ namespace Ibexa\Solr\Query\Common\CriterionVisitor; use Ibexa\Contracts\Solr\Query\CriterionVisitor; -use eZ\Publish\API\Repository\Values\Content\Query\Criterion; -use eZ\Publish\API\Repository\Values\Content\Query\Criterion\Operator; +use Ibexa\Contracts\Core\Repository\Values\Content\Query\Criterion; +use Ibexa\Contracts\Core\Repository\Values\Content\Query\Criterion\Operator; class ObjectStateIdentifierIn extends CriterionVisitor { diff --git a/src/lib/Query/Common/CriterionVisitor/RemoteIdIn.php b/src/lib/Query/Common/CriterionVisitor/RemoteIdIn.php index adda0093..01b5a3ec 100644 --- a/src/lib/Query/Common/CriterionVisitor/RemoteIdIn.php +++ b/src/lib/Query/Common/CriterionVisitor/RemoteIdIn.php @@ -10,8 +10,8 @@ */ namespace Ibexa\Solr\Query\Common\CriterionVisitor; -use eZ\Publish\API\Repository\Values\Content\Query\Criterion; -use eZ\Publish\API\Repository\Values\Content\Query\Criterion\Operator; +use Ibexa\Contracts\Core\Repository\Values\Content\Query\Criterion; +use Ibexa\Contracts\Core\Repository\Values\Content\Query\Criterion\Operator; use Ibexa\Contracts\Solr\Query\CriterionVisitor; /** @@ -37,7 +37,7 @@ public function canVisit(Criterion $criterion) /** * Map field value to a proper Solr representation. * - * @param \EzSystems\EzPlatformSolrSearchEngine\Query\CriterionVisitor $subVisitor + * @param \Ibexa\Contracts\Solr\Query\CriterionVisitor $subVisitor * * @return string */ diff --git a/src/lib/Query/Common/CriterionVisitor/SectionIdentifierIn.php b/src/lib/Query/Common/CriterionVisitor/SectionIdentifierIn.php index 13c0e766..70bcb12c 100644 --- a/src/lib/Query/Common/CriterionVisitor/SectionIdentifierIn.php +++ b/src/lib/Query/Common/CriterionVisitor/SectionIdentifierIn.php @@ -9,8 +9,8 @@ namespace Ibexa\Solr\Query\Common\CriterionVisitor; use Ibexa\Contracts\Solr\Query\CriterionVisitor; -use eZ\Publish\API\Repository\Values\Content\Query\Criterion; -use eZ\Publish\API\Repository\Values\Content\Query\Criterion\Operator; +use Ibexa\Contracts\Core\Repository\Values\Content\Query\Criterion; +use Ibexa\Contracts\Core\Repository\Values\Content\Query\Criterion\Operator; class SectionIdentifierIn extends CriterionVisitor { diff --git a/src/lib/Query/Common/CriterionVisitor/SectionIn.php b/src/lib/Query/Common/CriterionVisitor/SectionIn.php index 4f5b1be3..d1425950 100644 --- a/src/lib/Query/Common/CriterionVisitor/SectionIn.php +++ b/src/lib/Query/Common/CriterionVisitor/SectionIn.php @@ -10,8 +10,8 @@ */ namespace Ibexa\Solr\Query\Common\CriterionVisitor; -use eZ\Publish\API\Repository\Values\Content\Query\Criterion; -use eZ\Publish\API\Repository\Values\Content\Query\Criterion\Operator; +use Ibexa\Contracts\Core\Repository\Values\Content\Query\Criterion; +use Ibexa\Contracts\Core\Repository\Values\Content\Query\Criterion\Operator; use Ibexa\Contracts\Solr\Query\CriterionVisitor; /** @@ -37,7 +37,7 @@ public function canVisit(Criterion $criterion) /** * Map field value to a proper Solr representation. * - * @param \EzSystems\EzPlatformSolrSearchEngine\Query\CriterionVisitor $subVisitor + * @param \Ibexa\Contracts\Solr\Query\CriterionVisitor $subVisitor * * @return string */ diff --git a/src/lib/Query/Common/CriterionVisitor/UserEmailIn.php b/src/lib/Query/Common/CriterionVisitor/UserEmailIn.php index 509c1fb5..7cc226c2 100644 --- a/src/lib/Query/Common/CriterionVisitor/UserEmailIn.php +++ b/src/lib/Query/Common/CriterionVisitor/UserEmailIn.php @@ -8,8 +8,8 @@ namespace Ibexa\Solr\Query\Common\CriterionVisitor; -use eZ\Publish\API\Repository\Values\Content\Query\Criterion; -use eZ\Publish\API\Repository\Values\Content\Query\Criterion\Operator; +use Ibexa\Contracts\Core\Repository\Values\Content\Query\Criterion; +use Ibexa\Contracts\Core\Repository\Values\Content\Query\Criterion\Operator; use Ibexa\Contracts\Solr\Query\CriterionVisitor; use Ibexa\Solr\FieldMapper\ContentFieldMapper\UserDocumentFields; diff --git a/src/lib/Query/Common/CriterionVisitor/UserIdIn.php b/src/lib/Query/Common/CriterionVisitor/UserIdIn.php index f165fa64..34365833 100644 --- a/src/lib/Query/Common/CriterionVisitor/UserIdIn.php +++ b/src/lib/Query/Common/CriterionVisitor/UserIdIn.php @@ -8,8 +8,8 @@ namespace Ibexa\Solr\Query\Common\CriterionVisitor; -use eZ\Publish\API\Repository\Values\Content\Query\Criterion; -use eZ\Publish\API\Repository\Values\Content\Query\Criterion\Operator; +use Ibexa\Contracts\Core\Repository\Values\Content\Query\Criterion; +use Ibexa\Contracts\Core\Repository\Values\Content\Query\Criterion\Operator; use Ibexa\Contracts\Solr\Query\CriterionVisitor; final class UserIdIn extends CriterionVisitor diff --git a/src/lib/Query/Common/CriterionVisitor/UserLoginIn.php b/src/lib/Query/Common/CriterionVisitor/UserLoginIn.php index fa33319f..36065a95 100644 --- a/src/lib/Query/Common/CriterionVisitor/UserLoginIn.php +++ b/src/lib/Query/Common/CriterionVisitor/UserLoginIn.php @@ -8,8 +8,8 @@ namespace Ibexa\Solr\Query\Common\CriterionVisitor; -use eZ\Publish\API\Repository\Values\Content\Query\Criterion; -use eZ\Publish\API\Repository\Values\Content\Query\Criterion\Operator; +use Ibexa\Contracts\Core\Repository\Values\Content\Query\Criterion; +use Ibexa\Contracts\Core\Repository\Values\Content\Query\Criterion\Operator; use Ibexa\Contracts\Solr\Query\CriterionVisitor; use Ibexa\Solr\FieldMapper\ContentFieldMapper\UserDocumentFields; diff --git a/src/lib/Query/Common/CriterionVisitor/UserMetadataIn.php b/src/lib/Query/Common/CriterionVisitor/UserMetadataIn.php index ecb09c29..59c9c08a 100644 --- a/src/lib/Query/Common/CriterionVisitor/UserMetadataIn.php +++ b/src/lib/Query/Common/CriterionVisitor/UserMetadataIn.php @@ -10,9 +10,9 @@ */ namespace Ibexa\Solr\Query\Common\CriterionVisitor; -use eZ\Publish\API\Repository\Exceptions\NotImplementedException; -use eZ\Publish\API\Repository\Values\Content\Query\Criterion; -use eZ\Publish\API\Repository\Values\Content\Query\Criterion\Operator; +use Ibexa\Contracts\Core\Repository\Exceptions\NotImplementedException; +use Ibexa\Contracts\Core\Repository\Values\Content\Query\Criterion; +use Ibexa\Contracts\Core\Repository\Values\Content\Query\Criterion\Operator; use Ibexa\Contracts\Solr\Query\CriterionVisitor; /** @@ -36,9 +36,9 @@ public function canVisit(Criterion $criterion) /** * Map field value to a proper Solr representation. * - * @throws \eZ\Publish\API\Repository\Exceptions\NotImplementedException + * @throws \Ibexa\Contracts\Core\Repository\Exceptions\NotImplementedException * - * @param \EzSystems\EzPlatformSolrSearchEngine\Query\CriterionVisitor $subVisitor + * @param \Ibexa\Contracts\Solr\Query\CriterionVisitor $subVisitor * * @return string */ diff --git a/src/lib/Query/Common/FacetBuilderVisitor/Aggregate.php b/src/lib/Query/Common/FacetBuilderVisitor/Aggregate.php index ce9fb6dd..aedc3c3b 100644 --- a/src/lib/Query/Common/FacetBuilderVisitor/Aggregate.php +++ b/src/lib/Query/Common/FacetBuilderVisitor/Aggregate.php @@ -10,7 +10,7 @@ */ namespace Ibexa\Solr\Query\Common\FacetBuilderVisitor; -use eZ\Publish\API\Repository\Values\Content\Query\FacetBuilder; +use Ibexa\Contracts\Core\Repository\Values\Content\Query\FacetBuilder; use Ibexa\Solr\Query\FacetBuilderVisitor; use Ibexa\Solr\Query\FacetFieldVisitor; @@ -24,14 +24,14 @@ class Aggregate extends FacetBuilderVisitor implements FacetFieldVisitor /** * Array of available visitors. * - * @var \EzSystems\EzPlatformSolrSearchEngine\Query\FacetBuilderVisitor[] + * @var \Ibexa\Solr\Query\FacetBuilderVisitor[] */ protected $visitors = []; /** * Construct from optional visitor array. * - * @param \EzSystems\EzPlatformSolrSearchEngine\Query\FacetBuilderVisitor[] $visitors + * @param \Ibexa\Solr\Query\FacetBuilderVisitor[] $visitors */ public function __construct(array $visitors = []) { diff --git a/src/lib/Query/Common/FacetBuilderVisitor/ContentType.php b/src/lib/Query/Common/FacetBuilderVisitor/ContentType.php index 3f8b5405..287374ae 100644 --- a/src/lib/Query/Common/FacetBuilderVisitor/ContentType.php +++ b/src/lib/Query/Common/FacetBuilderVisitor/ContentType.php @@ -10,8 +10,8 @@ */ namespace Ibexa\Solr\Query\Common\FacetBuilderVisitor; -use eZ\Publish\API\Repository\Values\Content\Query\FacetBuilder; -use eZ\Publish\API\Repository\Values\Content\Search\Facet; +use Ibexa\Contracts\Core\Repository\Values\Content\Query\FacetBuilder; +use Ibexa\Contracts\Core\Repository\Values\Content\Search\Facet; use Ibexa\Solr\Query\FacetBuilderVisitor; use Ibexa\Solr\Query\FacetFieldVisitor; diff --git a/src/lib/Query/Common/FacetBuilderVisitor/Section.php b/src/lib/Query/Common/FacetBuilderVisitor/Section.php index 1b1b46ca..f8070f04 100644 --- a/src/lib/Query/Common/FacetBuilderVisitor/Section.php +++ b/src/lib/Query/Common/FacetBuilderVisitor/Section.php @@ -10,8 +10,8 @@ */ namespace Ibexa\Solr\Query\Common\FacetBuilderVisitor; -use eZ\Publish\API\Repository\Values\Content\Query\FacetBuilder; -use eZ\Publish\API\Repository\Values\Content\Search\Facet; +use Ibexa\Contracts\Core\Repository\Values\Content\Query\FacetBuilder; +use Ibexa\Contracts\Core\Repository\Values\Content\Search\Facet; use Ibexa\Solr\Query\FacetBuilderVisitor; use Ibexa\Solr\Query\FacetFieldVisitor; diff --git a/src/lib/Query/Common/FacetBuilderVisitor/User.php b/src/lib/Query/Common/FacetBuilderVisitor/User.php index c0c464ca..8a7d2d3c 100644 --- a/src/lib/Query/Common/FacetBuilderVisitor/User.php +++ b/src/lib/Query/Common/FacetBuilderVisitor/User.php @@ -10,9 +10,9 @@ */ namespace Ibexa\Solr\Query\Common\FacetBuilderVisitor; -use eZ\Publish\API\Repository\Values\Content\Query\FacetBuilder; -use eZ\Publish\API\Repository\Values\Content\Query\FacetBuilder\UserFacetBuilder; -use eZ\Publish\API\Repository\Values\Content\Search\Facet; +use Ibexa\Contracts\Core\Repository\Values\Content\Query\FacetBuilder; +use Ibexa\Contracts\Core\Repository\Values\Content\Query\FacetBuilder\UserFacetBuilder; +use Ibexa\Contracts\Core\Repository\Values\Content\Search\Facet; use Ibexa\Solr\Query\FacetBuilderVisitor; use Ibexa\Solr\Query\FacetFieldVisitor; @@ -58,7 +58,7 @@ public function canVisit(FacetBuilder $facetBuilder) */ public function visitBuilder(FacetBuilder $facetBuilder, $fieldId) { - /** @var \eZ\Publish\API\Repository\Values\Content\Query\FacetBuilder\UserFacetBuilder $facetBuilder */ + /** @var \Ibexa\Contracts\Core\Repository\Values\Content\Query\FacetBuilder\UserFacetBuilder $facetBuilder */ $field = self::DOC_FIELD_MAP[$facetBuilder->type]; return [ diff --git a/src/lib/Query/Common/QueryConverter/NativeQueryConverter.php b/src/lib/Query/Common/QueryConverter/NativeQueryConverter.php index 0cbcd132..e75bcb54 100644 --- a/src/lib/Query/Common/QueryConverter/NativeQueryConverter.php +++ b/src/lib/Query/Common/QueryConverter/NativeQueryConverter.php @@ -10,7 +10,7 @@ */ namespace Ibexa\Solr\Query\Common\QueryConverter; -use eZ\Publish\API\Repository\Values\Content\Query; +use Ibexa\Contracts\Core\Repository\Values\Content\Query; use Ibexa\Contracts\Solr\Query\AggregationVisitor; use Ibexa\Solr\Query\QueryConverter; use Ibexa\Contracts\Solr\Query\CriterionVisitor; @@ -25,35 +25,35 @@ class NativeQueryConverter extends QueryConverter /** * Query visitor. * - * @var \EzSystems\EzPlatformSolrSearchEngine\Query\CriterionVisitor + * @var \Ibexa\Contracts\Solr\Query\CriterionVisitor */ protected $criterionVisitor; /** * Sort clause visitor. * - * @var \EzSystems\EzPlatformSolrSearchEngine\Query\SortClauseVisitor + * @var \Ibexa\Contracts\Solr\Query\SortClauseVisitor */ protected $sortClauseVisitor; /** * Facet builder visitor. * - * @var \EzSystems\EzPlatformSolrSearchEngine\Query\FacetFieldVisitor + * @var \Ibexa\Solr\Query\FacetFieldVisitor */ protected $facetBuilderVisitor; /** - * @var \EzSystems\EzPlatformSolrSearchEngine\Query\AggregationVisitor + * @var \Ibexa\Contracts\Solr\Query\AggregationVisitor */ private $aggregationVisitor; /** * Construct from visitors. * - * @param \EzSystems\EzPlatformSolrSearchEngine\Query\CriterionVisitor $criterionVisitor - * @param \EzSystems\EzPlatformSolrSearchEngine\Query\SortClauseVisitor $sortClauseVisitor - * @param \EzSystems\EzPlatformSolrSearchEngine\Query\FacetFieldVisitor $facetBuilderVisitor + * @param \Ibexa\Contracts\Solr\Query\CriterionVisitor $criterionVisitor + * @param \Ibexa\Contracts\Solr\Query\SortClauseVisitor $sortClauseVisitor + * @param \Ibexa\Solr\Query\FacetFieldVisitor $facetBuilderVisitor */ public function __construct( CriterionVisitor $criterionVisitor, @@ -110,7 +110,7 @@ public function convert(Query $query, array $languageSettings = []) /** * Converts an array of sort clause objects to a proper Solr representation. * - * @param \eZ\Publish\API\Repository\Values\Content\Query\SortClause[] $sortClauses + * @param \Ibexa\Contracts\Core\Repository\Values\Content\Query\SortClause[] $sortClauses * * @return string */ @@ -131,7 +131,7 @@ private function getSortClauses(array $sortClauses) * This method uses spl_object_hash() to get id of each and every facet builder, as this * is expected by {@link \EzSystems\EzPlatformSolrSearchEngine\ResultExtractor}. * - * @param \eZ\Publish\API\Repository\Values\Content\Query\FacetBuilder[] $facetBuilders + * @param \Ibexa\Contracts\Core\Repository\Values\Content\Query\FacetBuilder[] $facetBuilders * * @return array */ diff --git a/src/lib/Query/Common/SortClauseVisitor/Aggregate.php b/src/lib/Query/Common/SortClauseVisitor/Aggregate.php index f2fb08f3..3339a018 100644 --- a/src/lib/Query/Common/SortClauseVisitor/Aggregate.php +++ b/src/lib/Query/Common/SortClauseVisitor/Aggregate.php @@ -10,8 +10,8 @@ */ namespace Ibexa\Solr\Query\Common\SortClauseVisitor; -use eZ\Publish\API\Repository\Exceptions\NotImplementedException; -use eZ\Publish\API\Repository\Values\Content\Query\SortClause; +use Ibexa\Contracts\Core\Repository\Exceptions\NotImplementedException; +use Ibexa\Contracts\Core\Repository\Values\Content\Query\SortClause; use Ibexa\Contracts\Solr\Query\SortClauseVisitor; /** @@ -22,14 +22,14 @@ class Aggregate extends SortClauseVisitor /** * Array of available visitors. * - * @var \EzSystems\EzPlatformSolrSearchEngine\Query\SortClauseVisitor[] + * @var \Ibexa\Contracts\Solr\Query\SortClauseVisitor[] */ protected $visitors = []; /** * Construct from optional visitor array. * - * @param \EzSystems\EzPlatformSolrSearchEngine\Query\SortClauseVisitor[] $visitors + * @param \Ibexa\Contracts\Solr\Query\SortClauseVisitor[] $visitors */ public function __construct(array $visitors = []) { @@ -59,7 +59,7 @@ public function canVisit(SortClause $sortClause) /** * Map field value to a proper Solr representation. * - * @throws \eZ\Publish\API\Repository\Exceptions\NotImplementedException + * @throws \Ibexa\Contracts\Core\Repository\Exceptions\NotImplementedException * * @return string */ diff --git a/src/lib/Query/Common/SortClauseVisitor/ContentId.php b/src/lib/Query/Common/SortClauseVisitor/ContentId.php index 2ae9e374..9986c0de 100644 --- a/src/lib/Query/Common/SortClauseVisitor/ContentId.php +++ b/src/lib/Query/Common/SortClauseVisitor/ContentId.php @@ -10,7 +10,7 @@ */ namespace Ibexa\Solr\Query\Common\SortClauseVisitor; -use eZ\Publish\API\Repository\Values\Content\Query\SortClause; +use Ibexa\Contracts\Core\Repository\Values\Content\Query\SortClause; use Ibexa\Contracts\Solr\Query\SortClauseVisitor; /** diff --git a/src/lib/Query/Common/SortClauseVisitor/ContentName.php b/src/lib/Query/Common/SortClauseVisitor/ContentName.php index c8531822..d384795e 100644 --- a/src/lib/Query/Common/SortClauseVisitor/ContentName.php +++ b/src/lib/Query/Common/SortClauseVisitor/ContentName.php @@ -10,7 +10,7 @@ */ namespace Ibexa\Solr\Query\Common\SortClauseVisitor; -use eZ\Publish\API\Repository\Values\Content\Query\SortClause; +use Ibexa\Contracts\Core\Repository\Values\Content\Query\SortClause; use Ibexa\Contracts\Solr\Query\SortClauseVisitor; /** diff --git a/src/lib/Query/Common/SortClauseVisitor/ContentTranslatedName.php b/src/lib/Query/Common/SortClauseVisitor/ContentTranslatedName.php index 4df557a5..a680de57 100644 --- a/src/lib/Query/Common/SortClauseVisitor/ContentTranslatedName.php +++ b/src/lib/Query/Common/SortClauseVisitor/ContentTranslatedName.php @@ -8,7 +8,7 @@ namespace Ibexa\Solr\Query\Common\SortClauseVisitor; -use eZ\Publish\API\Repository\Values\Content\Query\SortClause; +use Ibexa\Contracts\Core\Repository\Values\Content\Query\SortClause; use Ibexa\Contracts\Solr\Query\SortClauseVisitor; final class ContentTranslatedName extends SortClauseVisitor diff --git a/src/lib/Query/Common/SortClauseVisitor/CustomField.php b/src/lib/Query/Common/SortClauseVisitor/CustomField.php index d9ec87d4..46059a54 100644 --- a/src/lib/Query/Common/SortClauseVisitor/CustomField.php +++ b/src/lib/Query/Common/SortClauseVisitor/CustomField.php @@ -8,7 +8,7 @@ namespace Ibexa\Solr\Query\Common\SortClauseVisitor; -use eZ\Publish\API\Repository\Values\Content\Query\SortClause; +use Ibexa\Contracts\Core\Repository\Values\Content\Query\SortClause; use Ibexa\Contracts\Solr\Query\SortClauseVisitor; final class CustomField extends SortClauseVisitor @@ -20,7 +20,7 @@ public function canVisit(SortClause $sortClause): bool public function visit(SortClause $sortClause): string { - /** @var \eZ\Publish\API\Repository\Values\Content\Query\SortClause\Target\CustomFieldTarget $targetData */ + /** @var \Ibexa\Contracts\Core\Repository\Values\Content\Query\SortClause\Target\CustomFieldTarget $targetData */ $targetData = $sortClause->targetData; return $targetData->fieldName . ' ' . $this->getDirection($sortClause); diff --git a/src/lib/Query/Common/SortClauseVisitor/DateModified.php b/src/lib/Query/Common/SortClauseVisitor/DateModified.php index edba74ad..3debd71b 100644 --- a/src/lib/Query/Common/SortClauseVisitor/DateModified.php +++ b/src/lib/Query/Common/SortClauseVisitor/DateModified.php @@ -10,7 +10,7 @@ */ namespace Ibexa\Solr\Query\Common\SortClauseVisitor; -use eZ\Publish\API\Repository\Values\Content\Query\SortClause; +use Ibexa\Contracts\Core\Repository\Values\Content\Query\SortClause; use Ibexa\Contracts\Solr\Query\SortClauseVisitor; /** diff --git a/src/lib/Query/Common/SortClauseVisitor/DatePublished.php b/src/lib/Query/Common/SortClauseVisitor/DatePublished.php index 641b2f44..84541a50 100644 --- a/src/lib/Query/Common/SortClauseVisitor/DatePublished.php +++ b/src/lib/Query/Common/SortClauseVisitor/DatePublished.php @@ -10,7 +10,7 @@ */ namespace Ibexa\Solr\Query\Common\SortClauseVisitor; -use eZ\Publish\API\Repository\Values\Content\Query\SortClause; +use Ibexa\Contracts\Core\Repository\Values\Content\Query\SortClause; use Ibexa\Contracts\Solr\Query\SortClauseVisitor; /** diff --git a/src/lib/Query/Common/SortClauseVisitor/Field.php b/src/lib/Query/Common/SortClauseVisitor/Field.php index d94267c9..66f7a7bd 100644 --- a/src/lib/Query/Common/SortClauseVisitor/Field.php +++ b/src/lib/Query/Common/SortClauseVisitor/Field.php @@ -11,9 +11,9 @@ namespace Ibexa\Solr\Query\Common\SortClauseVisitor; use Ibexa\Contracts\Solr\Query\SortClauseVisitor; -use eZ\Publish\API\Repository\Values\Content\Query\SortClause; -use eZ\Publish\Core\Search\Common\FieldNameResolver; -use eZ\Publish\Core\Base\Exceptions\InvalidArgumentException; +use Ibexa\Contracts\Core\Repository\Values\Content\Query\SortClause; +use Ibexa\Core\Search\Common\FieldNameResolver; +use Ibexa\Core\Base\Exceptions\InvalidArgumentException; /** * Visits the sort clause into a Solr query. @@ -23,14 +23,14 @@ class Field extends SortClauseVisitor /** * Field name resolver. * - * @var \eZ\Publish\Core\Search\Common\FieldNameResolver + * @var \Ibexa\Core\Search\Common\FieldNameResolver */ protected $fieldNameResolver; /** * Create from field name resolver. * - * @param \eZ\Publish\Core\Search\Common\FieldNameResolver $fieldNameResolver + * @param \Ibexa\Core\Search\Common\FieldNameResolver $fieldNameResolver */ public function __construct(FieldNameResolver $fieldNameResolver) { @@ -40,7 +40,7 @@ public function __construct(FieldNameResolver $fieldNameResolver) /** * Get sort field name. * - * @param \eZ\Publish\API\Repository\Values\Content\Query\SortClause $sortClause + * @param \Ibexa\Contracts\Core\Repository\Values\Content\Query\SortClause $sortClause * @param string $contentTypeIdentifier * @param string $fieldDefinitionIdentifier * @@ -61,7 +61,7 @@ protected function getSortFieldName( /** * Check if visitor is applicable to the $sortClause. * - * @param \eZ\Publish\API\Repository\Values\Content\Query\SortClause $sortClause + * @param \Ibexa\Contracts\Core\Repository\Values\Content\Query\SortClause $sortClause * * @return bool */ @@ -73,16 +73,16 @@ public function canVisit(SortClause $sortClause) /** * Map the $sortClause to a proper Solr representation. * - * @throws \eZ\Publish\Core\Base\Exceptions\InvalidArgumentException If no sortable fields are + * @throws \Ibexa\Core\Base\Exceptions\InvalidArgumentException If no sortable fields are * found for the given sort clause target. * - * @param \eZ\Publish\API\Repository\Values\Content\Query\SortClause $sortClause + * @param \Ibexa\Contracts\Core\Repository\Values\Content\Query\SortClause $sortClause * * @return string */ public function visit(SortClause $sortClause) { - /** @var \eZ\Publish\API\Repository\Values\Content\Query\SortClause\Target\FieldTarget $target */ + /** @var \Ibexa\Contracts\Core\Repository\Values\Content\Query\SortClause\Target\FieldTarget $target */ $target = $sortClause->targetData; $fieldName = $this->getSortFieldName( $sortClause, diff --git a/src/lib/Query/Common/SortClauseVisitor/MapLocationDistance.php b/src/lib/Query/Common/SortClauseVisitor/MapLocationDistance.php index 6c8853bd..ee5b301e 100644 --- a/src/lib/Query/Common/SortClauseVisitor/MapLocationDistance.php +++ b/src/lib/Query/Common/SortClauseVisitor/MapLocationDistance.php @@ -11,9 +11,9 @@ namespace Ibexa\Solr\Query\Common\SortClauseVisitor; use Ibexa\Contracts\Solr\Query\SortClauseVisitor; -use eZ\Publish\API\Repository\Values\Content\Query\SortClause; -use eZ\Publish\Core\Search\Common\FieldNameResolver; -use eZ\Publish\Core\Base\Exceptions\InvalidArgumentException; +use Ibexa\Contracts\Core\Repository\Values\Content\Query\SortClause; +use Ibexa\Core\Search\Common\FieldNameResolver; +use Ibexa\Core\Base\Exceptions\InvalidArgumentException; /** * Visits the sortClause tree into a Solr query. @@ -30,14 +30,14 @@ class MapLocationDistance extends SortClauseVisitor /** * Field name resolver. * - * @var \eZ\Publish\Core\Search\Common\FieldNameResolver + * @var \Ibexa\Core\Search\Common\FieldNameResolver */ protected $fieldNameResolver; /** * Create from field name resolver and field name. * - * @param \eZ\Publish\Core\Search\Common\FieldNameResolver $fieldNameResolver + * @param \Ibexa\Core\Search\Common\FieldNameResolver $fieldNameResolver * @param string $fieldName */ public function __construct(FieldNameResolver $fieldNameResolver, $fieldName) @@ -49,7 +49,7 @@ public function __construct(FieldNameResolver $fieldNameResolver, $fieldName) /** * Get sort field name. * - * @param \eZ\Publish\API\Repository\Values\Content\Query\SortClause $sortClause + * @param \Ibexa\Contracts\Core\Repository\Values\Content\Query\SortClause $sortClause * @param string $contentTypeIdentifier * @param string $fieldDefinitionIdentifier * @param string $name @@ -73,7 +73,7 @@ protected function getSortFieldName( /** * Check if visitor is applicable to current sortClause. * - * @param \eZ\Publish\API\Repository\Values\Content\Query\SortClause $sortClause + * @param \Ibexa\Contracts\Core\Repository\Values\Content\Query\SortClause $sortClause * * @return bool */ @@ -85,15 +85,15 @@ public function canVisit(SortClause $sortClause) /** * Map field value to a proper Solr representation. * - * @throws \eZ\Publish\Core\Base\Exceptions\InvalidArgumentException If no sortable fields are found for the given sort clause target. + * @throws \Ibexa\Core\Base\Exceptions\InvalidArgumentException If no sortable fields are found for the given sort clause target. * - * @param \eZ\Publish\API\Repository\Values\Content\Query\SortClause $sortClause + * @param \Ibexa\Contracts\Core\Repository\Values\Content\Query\SortClause $sortClause * * @return string */ public function visit(SortClause $sortClause) { - /** @var \eZ\Publish\API\Repository\Values\Content\Query\SortClause\Target\MapLocationTarget $target */ + /** @var \Ibexa\Contracts\Core\Repository\Values\Content\Query\SortClause\Target\MapLocationTarget $target */ $target = $sortClause->targetData; $fieldName = $this->getSortFieldName( $sortClause, diff --git a/src/lib/Query/Common/SortClauseVisitor/Random.php b/src/lib/Query/Common/SortClauseVisitor/Random.php index 2b3d4fc5..24a8bf92 100644 --- a/src/lib/Query/Common/SortClauseVisitor/Random.php +++ b/src/lib/Query/Common/SortClauseVisitor/Random.php @@ -9,7 +9,7 @@ namespace Ibexa\Solr\Query\Common\SortClauseVisitor; use Ibexa\Contracts\Solr\Query\SortClauseVisitor; -use eZ\Publish\API\Repository\Values\Content\Query\SortClause; +use Ibexa\Contracts\Core\Repository\Values\Content\Query\SortClause; /** * Visits the sortClause tree into a Solr query. @@ -19,7 +19,7 @@ class Random extends SortClauseVisitor /** * Check if visitor is applicable to current sortClause. * - * @param SortClause $sortClause + * @param \Ibexa\Contracts\Core\Repository\Values\Content\Query\SortClause $sortClause * * @return bool */ @@ -31,7 +31,7 @@ public function canVisit(SortClause $sortClause) /** * Map field value to a proper Solr representation. * - * @param SortClause $sortClause + * @param \Ibexa\Contracts\Core\Repository\Values\Content\Query\SortClause $sortClause * * @return string */ diff --git a/src/lib/Query/Common/SortClauseVisitor/Score.php b/src/lib/Query/Common/SortClauseVisitor/Score.php index e6ea1df1..ac7cdf40 100644 --- a/src/lib/Query/Common/SortClauseVisitor/Score.php +++ b/src/lib/Query/Common/SortClauseVisitor/Score.php @@ -8,7 +8,7 @@ namespace Ibexa\Solr\Query\Common\SortClauseVisitor; -use eZ\Publish\API\Repository\Values\Content\Query\SortClause; +use Ibexa\Contracts\Core\Repository\Values\Content\Query\SortClause; use Ibexa\Contracts\Solr\Query\SortClauseVisitor; class Score extends SortClauseVisitor diff --git a/src/lib/Query/Common/SortClauseVisitor/SectionIdentifier.php b/src/lib/Query/Common/SortClauseVisitor/SectionIdentifier.php index 8830398e..a17a6a46 100644 --- a/src/lib/Query/Common/SortClauseVisitor/SectionIdentifier.php +++ b/src/lib/Query/Common/SortClauseVisitor/SectionIdentifier.php @@ -10,7 +10,7 @@ */ namespace Ibexa\Solr\Query\Common\SortClauseVisitor; -use eZ\Publish\API\Repository\Values\Content\Query\SortClause; +use Ibexa\Contracts\Core\Repository\Values\Content\Query\SortClause; use Ibexa\Contracts\Solr\Query\SortClauseVisitor; /** diff --git a/src/lib/Query/Common/SortClauseVisitor/SectionName.php b/src/lib/Query/Common/SortClauseVisitor/SectionName.php index f55bd139..3b607f4b 100644 --- a/src/lib/Query/Common/SortClauseVisitor/SectionName.php +++ b/src/lib/Query/Common/SortClauseVisitor/SectionName.php @@ -10,7 +10,7 @@ */ namespace Ibexa\Solr\Query\Common\SortClauseVisitor; -use eZ\Publish\API\Repository\Values\Content\Query\SortClause; +use Ibexa\Contracts\Core\Repository\Values\Content\Query\SortClause; use Ibexa\Contracts\Solr\Query\SortClauseVisitor; /** diff --git a/src/lib/Query/Content/CriterionVisitor/Ancestor.php b/src/lib/Query/Content/CriterionVisitor/Ancestor.php index c07f90c8..b346fbdb 100644 --- a/src/lib/Query/Content/CriterionVisitor/Ancestor.php +++ b/src/lib/Query/Content/CriterionVisitor/Ancestor.php @@ -10,8 +10,8 @@ */ namespace Ibexa\Solr\Query\Content\CriterionVisitor; -use eZ\Publish\API\Repository\Values\Content\Query\Criterion; -use eZ\Publish\API\Repository\Values\Content\Query\Criterion\Ancestor as AncestorCriterion; +use Ibexa\Contracts\Core\Repository\Values\Content\Query\Criterion; +use Ibexa\Contracts\Core\Repository\Values\Content\Query\Criterion\Ancestor as AncestorCriterion; use Ibexa\Contracts\Solr\Query\CriterionVisitor; /** @@ -32,7 +32,7 @@ public function canVisit(Criterion $criterion) /** * Map field value to a proper Solr representation. * - * @param CriterionVisitor $subVisitor + * @param \Ibexa\Contracts\Solr\Query\CriterionVisitor $subVisitor * * @return string */ diff --git a/src/lib/Query/Content/CriterionVisitor/Factory/ContentFullTextFactory.php b/src/lib/Query/Content/CriterionVisitor/Factory/ContentFullTextFactory.php index 4ab3cda3..e690b8ab 100644 --- a/src/lib/Query/Content/CriterionVisitor/Factory/ContentFullTextFactory.php +++ b/src/lib/Query/Content/CriterionVisitor/Factory/ContentFullTextFactory.php @@ -15,7 +15,7 @@ /** * Factory for FullText Criterion Visitor. * - * @see \EzSystems\EzPlatformSolrSearchEngine\Query\Content\CriterionVisitor\FullText + * @see \Ibexa\Solr\Query\Content\CriterionVisitor\FullText * * @internal */ @@ -24,7 +24,7 @@ final class ContentFullTextFactory extends FullTextFactoryAbstract /** * Create FullText Criterion Visitor. * - * @return \EzSystems\EzPlatformSolrSearchEngine\Query\CriterionVisitor|\EzSystems\EzPlatformSolrSearchEngine\Query\Content\CriterionVisitor\FullText + * @return \Ibexa\Contracts\Solr\Query\CriterionVisitor|\Ibexa\Solr\Query\Content\CriterionVisitor\FullText */ public function createCriterionVisitor(): CriterionVisitor { diff --git a/src/lib/Query/Content/CriterionVisitor/Factory/FullTextFactory.php b/src/lib/Query/Content/CriterionVisitor/Factory/FullTextFactory.php index 5a1477f2..f1de5247 100644 --- a/src/lib/Query/Content/CriterionVisitor/Factory/FullTextFactory.php +++ b/src/lib/Query/Content/CriterionVisitor/Factory/FullTextFactory.php @@ -8,7 +8,7 @@ namespace Ibexa\Solr\Query\Content\CriterionVisitor\Factory; -use eZ\Publish\Core\Search\Common\FieldNameResolver; +use Ibexa\Core\Search\Common\FieldNameResolver; use Ibexa\Solr\FieldMapper\IndexingDepthProvider; use Ibexa\Solr\Query\Content\CriterionVisitor\FullText; use QueryTranslator\Languages\Galach\Generators\ExtendedDisMax; @@ -18,7 +18,7 @@ /** * Factory for FullText Criterion Visitor. * - * @see \EzSystems\EzPlatformSolrSearchEngine\Query\Content\CriterionVisitor\FullText + * @see \Ibexa\Solr\Query\Content\CriterionVisitor\FullText * * @internal */ @@ -27,7 +27,7 @@ final class FullTextFactory /** * Field map. * - * @var \eZ\Publish\Core\Search\Common\FieldNameResolver + * @var \Ibexa\Core\Search\Common\FieldNameResolver */ private $fieldNameResolver; @@ -47,18 +47,18 @@ final class FullTextFactory private $generator; /** - * @var \EzSystems\EzPlatformSolrSearchEngine\FieldMapper\IndexingDepthProvider + * @var \Ibexa\Solr\FieldMapper\IndexingDepthProvider */ private $indexingDepthProvider; /** * Create from content type handler and field registry. * - * @param \eZ\Publish\Core\Search\Common\FieldNameResolver $fieldNameResolver + * @param \Ibexa\Core\Search\Common\FieldNameResolver $fieldNameResolver * @param \QueryTranslator\Languages\Galach\Tokenizer $tokenizer * @param \QueryTranslator\Languages\Galach\Parser $parser * @param \QueryTranslator\Languages\Galach\Generators\ExtendedDisMax $generator - * @param \EzSystems\EzPlatformSolrSearchEngine\FieldMapper\IndexingDepthProvider $indexingDepthProvider + * @param \Ibexa\Solr\FieldMapper\IndexingDepthProvider $indexingDepthProvider */ public function __construct( FieldNameResolver $fieldNameResolver, @@ -77,7 +77,7 @@ public function __construct( /** * Create FullText Criterion Visitor. * - * @return \EzSystems\EzPlatformSolrSearchEngine\Query\Content\CriterionVisitor\FullText + * @return \Ibexa\Solr\Query\Content\CriterionVisitor\FullText */ public function createCriterionVisitor(): FullText { diff --git a/src/lib/Query/Content/CriterionVisitor/Field.php b/src/lib/Query/Content/CriterionVisitor/Field.php index 074e36a0..243c4de1 100644 --- a/src/lib/Query/Content/CriterionVisitor/Field.php +++ b/src/lib/Query/Content/CriterionVisitor/Field.php @@ -14,7 +14,7 @@ * Kept for BC reasons. * * @deprecated since 1.2, to be removed in 2.0. Use extended class instead. - * @see \EzSystems\EzPlatformSolrSearchEngine\Query\Common\CriterionVisitor\Field + * @see \Ibexa\Solr\Query\Common\CriterionVisitor\Field */ abstract class Field extends FieldBase { diff --git a/src/lib/Query/Content/CriterionVisitor/FullText.php b/src/lib/Query/Content/CriterionVisitor/FullText.php index 5b0f7cd8..31b0f99f 100644 --- a/src/lib/Query/Content/CriterionVisitor/FullText.php +++ b/src/lib/Query/Content/CriterionVisitor/FullText.php @@ -10,9 +10,9 @@ */ namespace Ibexa\Solr\Query\Content\CriterionVisitor; -use eZ\Publish\API\Repository\Values\Content\Query\Criterion; -use eZ\Publish\API\Repository\Values\Content\Query\Criterion\FullText as FullTextCriterion; -use eZ\Publish\Core\Search\Common\FieldNameResolver; +use Ibexa\Contracts\Core\Repository\Values\Content\Query\Criterion; +use Ibexa\Contracts\Core\Repository\Values\Content\Query\Criterion\FullText as FullTextCriterion; +use Ibexa\Core\Search\Common\FieldNameResolver; use Ibexa\Contracts\Solr\Query\CriterionVisitor; use QueryTranslator\Languages\Galach\Generators\ExtendedDisMax; use QueryTranslator\Languages\Galach\Parser; @@ -26,7 +26,7 @@ class FullText extends CriterionVisitor /** * Field map. * - * @var \eZ\Publish\Core\Search\Common\FieldNameResolver + * @var \Ibexa\Core\Search\Common\FieldNameResolver */ protected $fieldNameResolver; @@ -94,13 +94,13 @@ public function canVisit(Criterion $criterion) /** * Map field value to a proper Solr representation. * - * @param \EzSystems\EzPlatformSolrSearchEngine\Query\CriterionVisitor $subVisitor + * @param \Ibexa\Contracts\Solr\Query\CriterionVisitor $subVisitor * * @return string */ public function visit(Criterion $criterion, CriterionVisitor $subVisitor = null) { - /** @var \eZ\Publish\API\Repository\Values\Content\Query\Criterion\FullText $criterion */ + /** @var \Ibexa\Contracts\Core\Repository\Values\Content\Query\Criterion\FullText $criterion */ $tokenSequence = $this->tokenizer->tokenize($criterion->value); $syntaxTree = $this->parser->parse($tokenSequence); @@ -118,7 +118,7 @@ public function visit(Criterion $criterion, CriterionVisitor $subVisitor = null) private function getQueryFields(Criterion $criterion) { - /** @var \eZ\Publish\API\Repository\Values\Content\Query\Criterion\FullText $criterion */ + /** @var \Ibexa\Contracts\Core\Repository\Values\Content\Query\Criterion\FullText $criterion */ $queryFields = ['meta_content__text_t']; for ($i = 1; $i <= $this->maxDepth; ++$i) { diff --git a/src/lib/Query/Content/CriterionVisitor/LocationIdIn.php b/src/lib/Query/Content/CriterionVisitor/LocationIdIn.php index 09a56203..2eac8810 100644 --- a/src/lib/Query/Content/CriterionVisitor/LocationIdIn.php +++ b/src/lib/Query/Content/CriterionVisitor/LocationIdIn.php @@ -10,8 +10,8 @@ */ namespace Ibexa\Solr\Query\Content\CriterionVisitor; -use eZ\Publish\API\Repository\Values\Content\Query\Criterion; -use eZ\Publish\API\Repository\Values\Content\Query\Criterion\Operator; +use Ibexa\Contracts\Core\Repository\Values\Content\Query\Criterion; +use Ibexa\Contracts\Core\Repository\Values\Content\Query\Criterion\Operator; use Ibexa\Contracts\Solr\Query\CriterionVisitor; /** @@ -35,7 +35,7 @@ public function canVisit(Criterion $criterion) /** * Map field value to a proper Solr representation. * - * @param CriterionVisitor $subVisitor + * @param \Ibexa\Contracts\Solr\Query\CriterionVisitor $subVisitor * * @return string */ diff --git a/src/lib/Query/Content/CriterionVisitor/LocationRemoteIdIn.php b/src/lib/Query/Content/CriterionVisitor/LocationRemoteIdIn.php index c5f7001e..87b158b9 100644 --- a/src/lib/Query/Content/CriterionVisitor/LocationRemoteIdIn.php +++ b/src/lib/Query/Content/CriterionVisitor/LocationRemoteIdIn.php @@ -10,8 +10,8 @@ */ namespace Ibexa\Solr\Query\Content\CriterionVisitor; -use eZ\Publish\API\Repository\Values\Content\Query\Criterion; -use eZ\Publish\API\Repository\Values\Content\Query\Criterion\Operator; +use Ibexa\Contracts\Core\Repository\Values\Content\Query\Criterion; +use Ibexa\Contracts\Core\Repository\Values\Content\Query\Criterion\Operator; use Ibexa\Contracts\Solr\Query\CriterionVisitor; /** @@ -35,7 +35,7 @@ public function canVisit(Criterion $criterion) /** * Map field value to a proper Solr representation. * - * @param CriterionVisitor $subVisitor + * @param \Ibexa\Contracts\Solr\Query\CriterionVisitor $subVisitor * * @return string */ diff --git a/src/lib/Query/Content/CriterionVisitor/ParentLocationIdIn.php b/src/lib/Query/Content/CriterionVisitor/ParentLocationIdIn.php index 2127e49b..d0861aaf 100644 --- a/src/lib/Query/Content/CriterionVisitor/ParentLocationIdIn.php +++ b/src/lib/Query/Content/CriterionVisitor/ParentLocationIdIn.php @@ -10,8 +10,8 @@ */ namespace Ibexa\Solr\Query\Content\CriterionVisitor; -use eZ\Publish\API\Repository\Values\Content\Query\Criterion; -use eZ\Publish\API\Repository\Values\Content\Query\Criterion\Operator; +use Ibexa\Contracts\Core\Repository\Values\Content\Query\Criterion; +use Ibexa\Contracts\Core\Repository\Values\Content\Query\Criterion\Operator; use Ibexa\Contracts\Solr\Query\CriterionVisitor; /** @@ -35,7 +35,7 @@ public function canVisit(Criterion $criterion) /** * Map field value to a proper Solr representation. * - * @param CriterionVisitor $subVisitor + * @param \Ibexa\Contracts\Solr\Query\CriterionVisitor $subVisitor * * @return string */ diff --git a/src/lib/Query/Content/CriterionVisitor/SubtreeIn.php b/src/lib/Query/Content/CriterionVisitor/SubtreeIn.php index 28d9c6e1..b2c1268b 100644 --- a/src/lib/Query/Content/CriterionVisitor/SubtreeIn.php +++ b/src/lib/Query/Content/CriterionVisitor/SubtreeIn.php @@ -10,9 +10,9 @@ */ namespace Ibexa\Solr\Query\Content\CriterionVisitor; -use eZ\Publish\API\Repository\Values\Content\Query\Criterion; -use eZ\Publish\API\Repository\Values\Content\Query\Criterion\Operator; -use eZ\Publish\Core\Repository\Values\Content\Query\Criterion\PermissionSubtree; +use Ibexa\Contracts\Core\Repository\Values\Content\Query\Criterion; +use Ibexa\Contracts\Core\Repository\Values\Content\Query\Criterion\Operator; +use Ibexa\Core\Repository\Values\Content\Query\Criterion\PermissionSubtree; use Ibexa\Contracts\Solr\Query\CriterionVisitor; /** @@ -36,7 +36,7 @@ public function canVisit(Criterion $criterion) /** * Map field value to a proper Solr representation. * - * @param CriterionVisitor $subVisitor + * @param \Ibexa\Contracts\Solr\Query\CriterionVisitor $subVisitor * * @return string */ diff --git a/src/lib/Query/Content/CriterionVisitor/Visibility.php b/src/lib/Query/Content/CriterionVisitor/Visibility.php index c27c549b..713db2f6 100644 --- a/src/lib/Query/Content/CriterionVisitor/Visibility.php +++ b/src/lib/Query/Content/CriterionVisitor/Visibility.php @@ -10,8 +10,8 @@ */ namespace Ibexa\Solr\Query\Content\CriterionVisitor; -use eZ\Publish\API\Repository\Values\Content\Query\Criterion; -use eZ\Publish\API\Repository\Values\Content\Query\Criterion\Operator; +use Ibexa\Contracts\Core\Repository\Values\Content\Query\Criterion; +use Ibexa\Contracts\Core\Repository\Values\Content\Query\Criterion\Operator; use Ibexa\Contracts\Solr\Query\CriterionVisitor; /** @@ -32,7 +32,7 @@ public function canVisit(Criterion $criterion) /** * Map field value to a proper Solr representation. * - * @param \EzSystems\EzPlatformSolrSearchEngine\Query\CriterionVisitor $subVisitor + * @param \Ibexa\Contracts\Solr\Query\CriterionVisitor $subVisitor * * @return string */ diff --git a/src/lib/Query/FacetBuilderVisitor.php b/src/lib/Query/FacetBuilderVisitor.php index d7e4b6bc..9bdb92d3 100644 --- a/src/lib/Query/FacetBuilderVisitor.php +++ b/src/lib/Query/FacetBuilderVisitor.php @@ -10,7 +10,7 @@ */ namespace Ibexa\Solr\Query; -use eZ\Publish\API\Repository\Values\Content\Query\FacetBuilder; +use Ibexa\Contracts\Core\Repository\Values\Content\Query\FacetBuilder; /** * Visits the facet builder tree into a Solr query. @@ -40,7 +40,7 @@ public function canMap($field) * * @param string $field * - * @return \eZ\Publish\API\Repository\Values\Content\Search\Facet + * @return \Ibexa\Contracts\Core\Repository\Values\Content\Search\Facet */ public function map($field, array $data) { diff --git a/src/lib/Query/FacetFieldVisitor.php b/src/lib/Query/FacetFieldVisitor.php index 54f0e669..644733c9 100644 --- a/src/lib/Query/FacetFieldVisitor.php +++ b/src/lib/Query/FacetFieldVisitor.php @@ -8,7 +8,7 @@ */ namespace Ibexa\Solr\Query; -use eZ\Publish\API\Repository\Values\Content\Query\FacetBuilder; +use Ibexa\Contracts\Core\Repository\Values\Content\Query\FacetBuilder; /** * Visits Solr results into correct facet and facet builder combination. @@ -22,7 +22,7 @@ interface FacetFieldVisitor * * @param string $field * - * @return \eZ\Publish\API\Repository\Values\Content\Search\Facet + * @return \Ibexa\Contracts\Core\Repository\Values\Content\Search\Facet */ public function mapField($field, array $data, FacetBuilder $facetBuilder); diff --git a/src/lib/Query/Location/CriterionVisitor/Ancestor.php b/src/lib/Query/Location/CriterionVisitor/Ancestor.php index 80fa442b..cb0a45d9 100644 --- a/src/lib/Query/Location/CriterionVisitor/Ancestor.php +++ b/src/lib/Query/Location/CriterionVisitor/Ancestor.php @@ -10,8 +10,8 @@ */ namespace Ibexa\Solr\Query\Location\CriterionVisitor; -use eZ\Publish\API\Repository\Values\Content\Query\Criterion; -use eZ\Publish\API\Repository\Values\Content\Query\Criterion\Ancestor as AncestorCriterion; +use Ibexa\Contracts\Core\Repository\Values\Content\Query\Criterion; +use Ibexa\Contracts\Core\Repository\Values\Content\Query\Criterion\Ancestor as AncestorCriterion; use Ibexa\Contracts\Solr\Query\CriterionVisitor; /** @@ -32,7 +32,7 @@ public function canVisit(Criterion $criterion) /** * Map field value to a proper Solr representation. * - * @param \EzSystems\EzPlatformSolrSearchEngine\Query\CriterionVisitor $subVisitor + * @param \Ibexa\Contracts\Solr\Query\CriterionVisitor $subVisitor * * @return string */ diff --git a/src/lib/Query/Location/CriterionVisitor/Factory/LocationFullTextFactory.php b/src/lib/Query/Location/CriterionVisitor/Factory/LocationFullTextFactory.php index b642f376..a0417785 100644 --- a/src/lib/Query/Location/CriterionVisitor/Factory/LocationFullTextFactory.php +++ b/src/lib/Query/Location/CriterionVisitor/Factory/LocationFullTextFactory.php @@ -15,7 +15,7 @@ /** * Factory for FullText Criterion Visitor. * - * @see \EzSystems\EzPlatformSolrSearchEngine\Query\Content\CriterionVisitor\FullText + * @see \Ibexa\Solr\Query\Content\CriterionVisitor\FullText * * @internal */ @@ -24,7 +24,7 @@ final class LocationFullTextFactory extends FullTextFactoryAbstract /** * Create FullText Criterion Visitor. * - * @return \EzSystems\EzPlatformSolrSearchEngine\Query\CriterionVisitor|\EzSystems\EzPlatformSolrSearchEngine\Query\Location\CriterionVisitor\FullText + * @return \Ibexa\Contracts\Solr\Query\CriterionVisitor|\Ibexa\Solr\Query\Location\CriterionVisitor\FullText */ public function createCriterionVisitor(): CriterionVisitor { diff --git a/src/lib/Query/Location/CriterionVisitor/FullText.php b/src/lib/Query/Location/CriterionVisitor/FullText.php index 05833a7e..b12ad508 100644 --- a/src/lib/Query/Location/CriterionVisitor/FullText.php +++ b/src/lib/Query/Location/CriterionVisitor/FullText.php @@ -10,7 +10,7 @@ */ namespace Ibexa\Solr\Query\Location\CriterionVisitor; -use eZ\Publish\API\Repository\Values\Content\Query\Criterion; +use Ibexa\Contracts\Core\Repository\Values\Content\Query\Criterion; use Ibexa\Solr\Query\Content\CriterionVisitor\FullText as ContentFullText; use Ibexa\Contracts\Solr\Query\CriterionVisitor; @@ -22,7 +22,7 @@ class FullText extends ContentFullText /** * Map field value to a proper Solr representation. * - * @param \EzSystems\EzPlatformSolrSearchEngine\Query\CriterionVisitor $subVisitor + * @param \Ibexa\Contracts\Solr\Query\CriterionVisitor $subVisitor * * @return string */ diff --git a/src/lib/Query/Location/CriterionVisitor/Location/DepthBetween.php b/src/lib/Query/Location/CriterionVisitor/Location/DepthBetween.php index 8af8c92b..75a1c004 100644 --- a/src/lib/Query/Location/CriterionVisitor/Location/DepthBetween.php +++ b/src/lib/Query/Location/CriterionVisitor/Location/DepthBetween.php @@ -10,8 +10,8 @@ */ namespace Ibexa\Solr\Query\Location\CriterionVisitor\Location; -use eZ\Publish\API\Repository\Values\Content\Query\Criterion; -use eZ\Publish\API\Repository\Values\Content\Query\Criterion\Operator; +use Ibexa\Contracts\Core\Repository\Values\Content\Query\Criterion; +use Ibexa\Contracts\Core\Repository\Values\Content\Query\Criterion\Operator; use Ibexa\Contracts\Solr\Query\CriterionVisitor; /** @@ -40,7 +40,7 @@ public function canVisit(Criterion $criterion) /** * Map field value to a proper Solr representation. * - * @param \EzSystems\EzPlatformSolrSearchEngine\Query\CriterionVisitor $subVisitor + * @param \Ibexa\Contracts\Solr\Query\CriterionVisitor $subVisitor * * @return string */ diff --git a/src/lib/Query/Location/CriterionVisitor/Location/DepthIn.php b/src/lib/Query/Location/CriterionVisitor/Location/DepthIn.php index c378f972..e28434c5 100644 --- a/src/lib/Query/Location/CriterionVisitor/Location/DepthIn.php +++ b/src/lib/Query/Location/CriterionVisitor/Location/DepthIn.php @@ -10,8 +10,8 @@ */ namespace Ibexa\Solr\Query\Location\CriterionVisitor\Location; -use eZ\Publish\API\Repository\Values\Content\Query\Criterion; -use eZ\Publish\API\Repository\Values\Content\Query\Criterion\Operator; +use Ibexa\Contracts\Core\Repository\Values\Content\Query\Criterion; +use Ibexa\Contracts\Core\Repository\Values\Content\Query\Criterion\Operator; use Ibexa\Contracts\Solr\Query\CriterionVisitor; /** @@ -37,7 +37,7 @@ public function canVisit(Criterion $criterion) /** * Map field value to a proper Solr representation. * - * @param \EzSystems\EzPlatformSolrSearchEngine\Query\CriterionVisitor $subVisitor + * @param \Ibexa\Contracts\Solr\Query\CriterionVisitor $subVisitor * * @return string */ diff --git a/src/lib/Query/Location/CriterionVisitor/Location/IsMainLocation.php b/src/lib/Query/Location/CriterionVisitor/Location/IsMainLocation.php index 14a2276d..fe7c9903 100644 --- a/src/lib/Query/Location/CriterionVisitor/Location/IsMainLocation.php +++ b/src/lib/Query/Location/CriterionVisitor/Location/IsMainLocation.php @@ -10,7 +10,7 @@ */ namespace Ibexa\Solr\Query\Location\CriterionVisitor\Location; -use eZ\Publish\API\Repository\Values\Content\Query\Criterion; +use Ibexa\Contracts\Core\Repository\Values\Content\Query\Criterion; use Ibexa\Contracts\Solr\Query\CriterionVisitor; /** @@ -31,7 +31,7 @@ public function canVisit(Criterion $criterion) /** * Map field value to a proper Solr representation. * - * @param \EzSystems\EzPlatformSolrSearchEngine\Query\CriterionVisitor $subVisitor + * @param \Ibexa\Contracts\Solr\Query\CriterionVisitor $subVisitor * * @return string */ diff --git a/src/lib/Query/Location/CriterionVisitor/Location/PriorityBetween.php b/src/lib/Query/Location/CriterionVisitor/Location/PriorityBetween.php index ec8f293c..3262fe6b 100644 --- a/src/lib/Query/Location/CriterionVisitor/Location/PriorityBetween.php +++ b/src/lib/Query/Location/CriterionVisitor/Location/PriorityBetween.php @@ -10,8 +10,8 @@ */ namespace Ibexa\Solr\Query\Location\CriterionVisitor\Location; -use eZ\Publish\API\Repository\Values\Content\Query\Criterion; -use eZ\Publish\API\Repository\Values\Content\Query\Criterion\Operator; +use Ibexa\Contracts\Core\Repository\Values\Content\Query\Criterion; +use Ibexa\Contracts\Core\Repository\Values\Content\Query\Criterion\Operator; use Ibexa\Contracts\Solr\Query\CriterionVisitor; /** @@ -40,7 +40,7 @@ public function canVisit(Criterion $criterion) /** * Map field value to a proper Solr representation. * - * @param \EzSystems\EzPlatformSolrSearchEngine\Query\CriterionVisitor $subVisitor + * @param \Ibexa\Contracts\Solr\Query\CriterionVisitor $subVisitor * * @return string */ diff --git a/src/lib/Query/Location/CriterionVisitor/Location/PriorityIn.php b/src/lib/Query/Location/CriterionVisitor/Location/PriorityIn.php index 4b2d20f1..9ce0a346 100644 --- a/src/lib/Query/Location/CriterionVisitor/Location/PriorityIn.php +++ b/src/lib/Query/Location/CriterionVisitor/Location/PriorityIn.php @@ -10,8 +10,8 @@ */ namespace Ibexa\Solr\Query\Location\CriterionVisitor\Location; -use eZ\Publish\API\Repository\Values\Content\Query\Criterion; -use eZ\Publish\API\Repository\Values\Content\Query\Criterion\Operator; +use Ibexa\Contracts\Core\Repository\Values\Content\Query\Criterion; +use Ibexa\Contracts\Core\Repository\Values\Content\Query\Criterion\Operator; use Ibexa\Contracts\Solr\Query\CriterionVisitor; /** @@ -37,7 +37,7 @@ public function canVisit(Criterion $criterion) /** * Map field value to a proper Solr representation. * - * @param \EzSystems\EzPlatformSolrSearchEngine\Query\CriterionVisitor $subVisitor + * @param \Ibexa\Contracts\Solr\Query\CriterionVisitor $subVisitor * * @return string */ diff --git a/src/lib/Query/Location/CriterionVisitor/LocationIdIn.php b/src/lib/Query/Location/CriterionVisitor/LocationIdIn.php index dd35a65f..0e02fe0b 100644 --- a/src/lib/Query/Location/CriterionVisitor/LocationIdIn.php +++ b/src/lib/Query/Location/CriterionVisitor/LocationIdIn.php @@ -10,8 +10,8 @@ */ namespace Ibexa\Solr\Query\Location\CriterionVisitor; -use eZ\Publish\API\Repository\Values\Content\Query\Criterion; -use eZ\Publish\API\Repository\Values\Content\Query\Criterion\Operator; +use Ibexa\Contracts\Core\Repository\Values\Content\Query\Criterion; +use Ibexa\Contracts\Core\Repository\Values\Content\Query\Criterion\Operator; use Ibexa\Contracts\Solr\Query\CriterionVisitor; /** @@ -35,7 +35,7 @@ public function canVisit(Criterion $criterion) /** * Map field value to a proper Solr representation. * - * @param \EzSystems\EzPlatformSolrSearchEngine\Query\CriterionVisitor $subVisitor + * @param \Ibexa\Contracts\Solr\Query\CriterionVisitor $subVisitor * * @return string */ diff --git a/src/lib/Query/Location/CriterionVisitor/LocationRemoteIdIn.php b/src/lib/Query/Location/CriterionVisitor/LocationRemoteIdIn.php index 30bdd65b..68915b3b 100644 --- a/src/lib/Query/Location/CriterionVisitor/LocationRemoteIdIn.php +++ b/src/lib/Query/Location/CriterionVisitor/LocationRemoteIdIn.php @@ -10,8 +10,8 @@ */ namespace Ibexa\Solr\Query\Location\CriterionVisitor; -use eZ\Publish\API\Repository\Values\Content\Query\Criterion; -use eZ\Publish\API\Repository\Values\Content\Query\Criterion\Operator; +use Ibexa\Contracts\Core\Repository\Values\Content\Query\Criterion; +use Ibexa\Contracts\Core\Repository\Values\Content\Query\Criterion\Operator; use Ibexa\Contracts\Solr\Query\CriterionVisitor; /** @@ -37,7 +37,7 @@ public function canVisit(Criterion $criterion) /** * Map field value to a proper Solr representation. * - * @param \EzSystems\EzPlatformSolrSearchEngine\Query\CriterionVisitor $subVisitor + * @param \Ibexa\Contracts\Solr\Query\CriterionVisitor $subVisitor * * @return string */ diff --git a/src/lib/Query/Location/CriterionVisitor/ParentLocationIdIn.php b/src/lib/Query/Location/CriterionVisitor/ParentLocationIdIn.php index 564fb8f9..9dd0c8e1 100644 --- a/src/lib/Query/Location/CriterionVisitor/ParentLocationIdIn.php +++ b/src/lib/Query/Location/CriterionVisitor/ParentLocationIdIn.php @@ -10,8 +10,8 @@ */ namespace Ibexa\Solr\Query\Location\CriterionVisitor; -use eZ\Publish\API\Repository\Values\Content\Query\Criterion; -use eZ\Publish\API\Repository\Values\Content\Query\Criterion\Operator; +use Ibexa\Contracts\Core\Repository\Values\Content\Query\Criterion; +use Ibexa\Contracts\Core\Repository\Values\Content\Query\Criterion\Operator; use Ibexa\Contracts\Solr\Query\CriterionVisitor; /** @@ -37,7 +37,7 @@ public function canVisit(Criterion $criterion) /** * Map field value to a proper Solr representation. * - * @param \EzSystems\EzPlatformSolrSearchEngine\Query\CriterionVisitor $subVisitor + * @param \Ibexa\Contracts\Solr\Query\CriterionVisitor $subVisitor * * @return string */ diff --git a/src/lib/Query/Location/CriterionVisitor/SubtreeIn.php b/src/lib/Query/Location/CriterionVisitor/SubtreeIn.php index 231ce0d4..c5787491 100644 --- a/src/lib/Query/Location/CriterionVisitor/SubtreeIn.php +++ b/src/lib/Query/Location/CriterionVisitor/SubtreeIn.php @@ -10,8 +10,8 @@ */ namespace Ibexa\Solr\Query\Location\CriterionVisitor; -use eZ\Publish\API\Repository\Values\Content\Query\Criterion; -use eZ\Publish\API\Repository\Values\Content\Query\Criterion\Operator; +use Ibexa\Contracts\Core\Repository\Values\Content\Query\Criterion; +use Ibexa\Contracts\Core\Repository\Values\Content\Query\Criterion\Operator; use Ibexa\Contracts\Solr\Query\CriterionVisitor; /** @@ -37,7 +37,7 @@ public function canVisit(Criterion $criterion) /** * Map field value to a proper Solr representation. * - * @param \EzSystems\EzPlatformSolrSearchEngine\Query\CriterionVisitor $subVisitor + * @param \Ibexa\Contracts\Solr\Query\CriterionVisitor $subVisitor * * @return string */ diff --git a/src/lib/Query/Location/CriterionVisitor/Visibility.php b/src/lib/Query/Location/CriterionVisitor/Visibility.php index eb262559..fc353ec6 100644 --- a/src/lib/Query/Location/CriterionVisitor/Visibility.php +++ b/src/lib/Query/Location/CriterionVisitor/Visibility.php @@ -10,8 +10,8 @@ */ namespace Ibexa\Solr\Query\Location\CriterionVisitor; -use eZ\Publish\API\Repository\Values\Content\Query\Criterion; -use eZ\Publish\API\Repository\Values\Content\Query\Criterion\Operator; +use Ibexa\Contracts\Core\Repository\Values\Content\Query\Criterion; +use Ibexa\Contracts\Core\Repository\Values\Content\Query\Criterion\Operator; use Ibexa\Contracts\Solr\Query\CriterionVisitor; /** @@ -32,7 +32,7 @@ public function canVisit(Criterion $criterion) /** * Map field value to a proper Solr representation. * - * @param \EzSystems\EzPlatformSolrSearchEngine\Query\CriterionVisitor $subVisitor + * @param \Ibexa\Contracts\Solr\Query\CriterionVisitor $subVisitor * * @return string */ diff --git a/src/lib/Query/Location/SortClauseVisitor/Location/Depth.php b/src/lib/Query/Location/SortClauseVisitor/Location/Depth.php index 0fd6ae0d..168c90ac 100644 --- a/src/lib/Query/Location/SortClauseVisitor/Location/Depth.php +++ b/src/lib/Query/Location/SortClauseVisitor/Location/Depth.php @@ -10,7 +10,7 @@ */ namespace Ibexa\Solr\Query\Location\SortClauseVisitor\Location; -use eZ\Publish\API\Repository\Values\Content\Query\SortClause; +use Ibexa\Contracts\Core\Repository\Values\Content\Query\SortClause; use Ibexa\Contracts\Solr\Query\SortClauseVisitor; /** diff --git a/src/lib/Query/Location/SortClauseVisitor/Location/Id.php b/src/lib/Query/Location/SortClauseVisitor/Location/Id.php index 98f780ae..0f6fa7cc 100644 --- a/src/lib/Query/Location/SortClauseVisitor/Location/Id.php +++ b/src/lib/Query/Location/SortClauseVisitor/Location/Id.php @@ -10,7 +10,7 @@ */ namespace Ibexa\Solr\Query\Location\SortClauseVisitor\Location; -use eZ\Publish\API\Repository\Values\Content\Query\SortClause; +use Ibexa\Contracts\Core\Repository\Values\Content\Query\SortClause; use Ibexa\Contracts\Solr\Query\SortClauseVisitor; /** diff --git a/src/lib/Query/Location/SortClauseVisitor/Location/IsMainLocation.php b/src/lib/Query/Location/SortClauseVisitor/Location/IsMainLocation.php index cdc3b92f..b522b337 100644 --- a/src/lib/Query/Location/SortClauseVisitor/Location/IsMainLocation.php +++ b/src/lib/Query/Location/SortClauseVisitor/Location/IsMainLocation.php @@ -10,7 +10,7 @@ */ namespace Ibexa\Solr\Query\Location\SortClauseVisitor\Location; -use eZ\Publish\API\Repository\Values\Content\Query\SortClause; +use Ibexa\Contracts\Core\Repository\Values\Content\Query\SortClause; use Ibexa\Contracts\Solr\Query\SortClauseVisitor; /** diff --git a/src/lib/Query/Location/SortClauseVisitor/Location/Path.php b/src/lib/Query/Location/SortClauseVisitor/Location/Path.php index 235a1cc2..b520b395 100644 --- a/src/lib/Query/Location/SortClauseVisitor/Location/Path.php +++ b/src/lib/Query/Location/SortClauseVisitor/Location/Path.php @@ -10,7 +10,7 @@ */ namespace Ibexa\Solr\Query\Location\SortClauseVisitor\Location; -use eZ\Publish\API\Repository\Values\Content\Query\SortClause; +use Ibexa\Contracts\Core\Repository\Values\Content\Query\SortClause; use Ibexa\Contracts\Solr\Query\SortClauseVisitor; /** diff --git a/src/lib/Query/Location/SortClauseVisitor/Location/Priority.php b/src/lib/Query/Location/SortClauseVisitor/Location/Priority.php index 46c451ca..47fa2a0c 100644 --- a/src/lib/Query/Location/SortClauseVisitor/Location/Priority.php +++ b/src/lib/Query/Location/SortClauseVisitor/Location/Priority.php @@ -10,7 +10,7 @@ */ namespace Ibexa\Solr\Query\Location\SortClauseVisitor\Location; -use eZ\Publish\API\Repository\Values\Content\Query\SortClause; +use Ibexa\Contracts\Core\Repository\Values\Content\Query\SortClause; use Ibexa\Contracts\Solr\Query\SortClauseVisitor; /** diff --git a/src/lib/Query/Location/SortClauseVisitor/Location/Visibility.php b/src/lib/Query/Location/SortClauseVisitor/Location/Visibility.php index 6ba8e228..1ad7d40f 100644 --- a/src/lib/Query/Location/SortClauseVisitor/Location/Visibility.php +++ b/src/lib/Query/Location/SortClauseVisitor/Location/Visibility.php @@ -10,7 +10,7 @@ */ namespace Ibexa\Solr\Query\Location\SortClauseVisitor\Location; -use eZ\Publish\API\Repository\Values\Content\Query\SortClause; +use Ibexa\Contracts\Core\Repository\Values\Content\Query\SortClause; use Ibexa\Contracts\Solr\Query\SortClauseVisitor; /** diff --git a/src/lib/Query/QueryConverter.php b/src/lib/Query/QueryConverter.php index dc60e20e..4203a4c9 100644 --- a/src/lib/Query/QueryConverter.php +++ b/src/lib/Query/QueryConverter.php @@ -10,7 +10,7 @@ */ namespace Ibexa\Solr\Query; -use eZ\Publish\API\Repository\Values\Content\Query; +use Ibexa\Contracts\Core\Repository\Values\Content\Query; /** * Converts the query tree into an array of Solr query parameters. diff --git a/src/lib/Resources/config/container/solr/aggregation_result_extractors.yml b/src/lib/Resources/config/container/solr/aggregation_result_extractors.yml index e4dca036..031ecda6 100644 --- a/src/lib/Resources/config/container/solr/aggregation_result_extractors.yml +++ b/src/lib/Resources/config/container/solr/aggregation_result_extractors.yml @@ -61,7 +61,7 @@ services: ezplatform.search.solr.query.common.aggregation_result_extractor.content_type_term: class: Ibexa\Solr\ResultExtractor\AggregationResultExtractor\TermAggregationResultExtractor arguments: - $aggregationClass: 'eZ\Publish\API\Repository\Values\Content\Query\Aggregation\ContentTypeTermAggregation' + $aggregationClass: 'Ibexa\Contracts\Core\Repository\Values\Content\Query\Aggregation\ContentTypeTermAggregation' $keyMapper: '@Ibexa\Solr\ResultExtractor\AggregationResultExtractor\TermAggregationKeyMapper\ContentTypeAggregationKeyMapper' tags: - { name: ezplatform.search.solr.query.content.aggregation_result_extractor } @@ -70,7 +70,7 @@ services: ezplatform.search.solr.query.common.aggregation_result_extractor.content_type_group_term: class: Ibexa\Solr\ResultExtractor\AggregationResultExtractor\TermAggregationResultExtractor arguments: - $aggregationClass: 'eZ\Publish\API\Repository\Values\Content\Query\Aggregation\ContentTypeGroupTermAggregation' + $aggregationClass: 'Ibexa\Contracts\Core\Repository\Values\Content\Query\Aggregation\ContentTypeGroupTermAggregation' $keyMapper: '@Ibexa\Solr\ResultExtractor\AggregationResultExtractor\TermAggregationKeyMapper\ContentTypeGroupAggregationKeyMapper' tags: - { name: ezplatform.search.solr.query.content.aggregation_result_extractor } @@ -79,7 +79,7 @@ services: ezplatform.search.solr.query.common.aggregation_result_extractor.data_metadata_range: class: Ibexa\Solr\ResultExtractor\AggregationResultExtractor\RangeAggregationResultExtractor arguments: - $aggregationClass: 'eZ\Publish\API\Repository\Values\Content\Query\Aggregation\DateMetadataRangeAggregation' + $aggregationClass: 'Ibexa\Contracts\Core\Repository\Values\Content\Query\Aggregation\DateMetadataRangeAggregation' $keyMapper: '@Ibexa\Solr\ResultExtractor\AggregationResultExtractor\RangeAggregationKeyMapper\DateTimeRangeAggregationKeyMapper' tags: - { name: ezplatform.search.solr.query.content.aggregation_result_extractor } @@ -88,7 +88,7 @@ services: ezplatform.search.solr.query.common.aggregation_result_extractor.langauge_term: class: Ibexa\Solr\ResultExtractor\AggregationResultExtractor\TermAggregationResultExtractor arguments: - $aggregationClass: 'eZ\Publish\API\Repository\Values\Content\Query\Aggregation\LanguageTermAggregation' + $aggregationClass: 'Ibexa\Contracts\Core\Repository\Values\Content\Query\Aggregation\LanguageTermAggregation' $keyMapper: '@Ibexa\Solr\ResultExtractor\AggregationResultExtractor\TermAggregationKeyMapper\LanguageAggregationKeyMapper' tags: - { name: ezplatform.search.solr.query.content.aggregation_result_extractor } @@ -97,7 +97,7 @@ services: ezplatform.search.solr.query.common.aggregation_result_extractor.raw_range: class: Ibexa\Solr\ResultExtractor\AggregationResultExtractor\RangeAggregationResultExtractor arguments: - $aggregationClass: 'eZ\Publish\API\Repository\Values\Content\Query\Aggregation\RawRangeAggregation' + $aggregationClass: 'Ibexa\Contracts\Core\Repository\Values\Content\Query\Aggregation\RawRangeAggregation' $keyMapper: '@Ibexa\Solr\ResultExtractor\AggregationResultExtractor\RangeAggregationKeyMapper\NullRangeAggregationKeyMapper' tags: - { name: ezplatform.search.solr.query.content.aggregation_result_extractor } @@ -106,7 +106,7 @@ services: ezplatform.search.solr.query.common.aggregation_result_extractor.raw_stats: class: Ibexa\Solr\ResultExtractor\AggregationResultExtractor\StatsAggregationResultExtractor arguments: - $aggregationClass: 'eZ\Publish\API\Repository\Values\Content\Query\Aggregation\RawStatsAggregation' + $aggregationClass: 'Ibexa\Contracts\Core\Repository\Values\Content\Query\Aggregation\RawStatsAggregation' tags: - { name: ezplatform.search.solr.query.content.aggregation_result_extractor } - { name: ezplatform.search.solr.query.location.aggregation_result_extractor } @@ -114,7 +114,7 @@ services: ezplatform.search.solr.query.common.aggregation_result_extractor.raw_term: class: Ibexa\Solr\ResultExtractor\AggregationResultExtractor\TermAggregationResultExtractor arguments: - $aggregationClass: 'eZ\Publish\API\Repository\Values\Content\Query\Aggregation\RawTermAggregation' + $aggregationClass: 'Ibexa\Contracts\Core\Repository\Values\Content\Query\Aggregation\RawTermAggregation' tags: - { name: ezplatform.search.solr.query.content.aggregation_result_extractor } - { name: ezplatform.search.solr.query.location.aggregation_result_extractor } @@ -122,7 +122,7 @@ services: ezplatform.search.solr.query.common.aggregation_result_extractor.object_state_term: class: Ibexa\Solr\ResultExtractor\AggregationResultExtractor\TermAggregationResultExtractor arguments: - $aggregationClass: 'eZ\Publish\API\Repository\Values\Content\Query\Aggregation\ObjectStateTermAggregation' + $aggregationClass: 'Ibexa\Contracts\Core\Repository\Values\Content\Query\Aggregation\ObjectStateTermAggregation' $keyMapper: '@Ibexa\Solr\ResultExtractor\AggregationResultExtractor\TermAggregationKeyMapper\ObjectStateAggregationKeyMapper' tags: - { name: ezplatform.search.solr.query.content.aggregation_result_extractor } @@ -131,7 +131,7 @@ services: ezplatform.search.solr.query.common.aggregation_result_extractor.section_term: class: Ibexa\Solr\ResultExtractor\AggregationResultExtractor\TermAggregationResultExtractor arguments: - $aggregationClass: 'eZ\Publish\API\Repository\Values\Content\Query\Aggregation\SectionTermAggregation' + $aggregationClass: 'Ibexa\Contracts\Core\Repository\Values\Content\Query\Aggregation\SectionTermAggregation' $keyMapper: '@Ibexa\Solr\ResultExtractor\AggregationResultExtractor\TermAggregationKeyMapper\SectionAggregationKeyMapper' tags: - { name: ezplatform.search.solr.query.content.aggregation_result_extractor } @@ -140,7 +140,7 @@ services: ezplatform.search.solr.query.common.aggregation_result_extractor.subtree_term: class: Ibexa\Solr\ResultExtractor\AggregationResultExtractor\TermAggregationResultExtractor arguments: - $aggregationClass: 'eZ\Publish\API\Repository\Values\Content\Query\Aggregation\Location\SubtreeTermAggregation' + $aggregationClass: 'Ibexa\Contracts\Core\Repository\Values\Content\Query\Aggregation\Location\SubtreeTermAggregation' $keyMapper: '@Ibexa\Solr\ResultExtractor\AggregationResultExtractor\TermAggregationKeyMapper\SubtreeAggregationKeyMapper' tags: - { name: ezplatform.search.solr.query.content.aggregation_result_extractor } @@ -149,7 +149,7 @@ services: ezplatform.search.solr.query.common.aggregation_result_extractor.location_children_term: class: Ibexa\Solr\ResultExtractor\AggregationResultExtractor\TermAggregationResultExtractor arguments: - $aggregationClass: 'eZ\Publish\API\Repository\Values\Content\Query\Aggregation\Location\LocationChildrenTermAggregation' + $aggregationClass: 'Ibexa\Contracts\Core\Repository\Values\Content\Query\Aggregation\Location\LocationChildrenTermAggregation' $keyMapper: '@Ibexa\Solr\ResultExtractor\AggregationResultExtractor\TermAggregationKeyMapper\LocationAggregationKeyMapper' tags: - { name: ezplatform.search.solr.query.location.aggregation_result_extractor } @@ -164,7 +164,7 @@ services: ezplatform.search.solr.query.common.aggregation_result_extractor.user_metadata_term: class: Ibexa\Solr\ResultExtractor\AggregationResultExtractor\TermAggregationResultExtractor arguments: - $aggregationClass: 'eZ\Publish\API\Repository\Values\Content\Query\Aggregation\UserMetadataTermAggregation' + $aggregationClass: 'Ibexa\Contracts\Core\Repository\Values\Content\Query\Aggregation\UserMetadataTermAggregation' $keyMapper: '@Ibexa\Solr\ResultExtractor\AggregationResultExtractor\TermAggregationKeyMapper\UserMetadataAggregationKeyMapper' tags: - { name: ezplatform.search.solr.query.content.aggregation_result_extractor } @@ -173,7 +173,7 @@ services: ezplatform.search.solr.query.common.aggregation_result_extractor.field.author_term: class: Ibexa\Solr\ResultExtractor\AggregationResultExtractor\TermAggregationResultExtractor arguments: - $aggregationClass: 'eZ\Publish\API\Repository\Values\Content\Query\Aggregation\Field\AuthorTermAggregation' + $aggregationClass: 'Ibexa\Contracts\Core\Repository\Values\Content\Query\Aggregation\Field\AuthorTermAggregation' $keyMapper: '@Ibexa\Solr\ResultExtractor\AggregationResultExtractor\TermAggregationKeyMapper\AuthorAggregationKeyMapper' tags: - { name: ezplatform.search.solr.query.content.aggregation_result_extractor } @@ -182,7 +182,7 @@ services: ezplatform.search.solr.query.common.aggregation_result_extractor.field.checkbox_term: class: Ibexa\Solr\ResultExtractor\AggregationResultExtractor\TermAggregationResultExtractor arguments: - $aggregationClass: 'eZ\Publish\API\Repository\Values\Content\Query\Aggregation\Field\CheckboxTermAggregation' + $aggregationClass: 'Ibexa\Contracts\Core\Repository\Values\Content\Query\Aggregation\Field\CheckboxTermAggregation' $keyMapper: '@Ibexa\Solr\ResultExtractor\AggregationResultExtractor\TermAggregationKeyMapper\BooleanAggregationKeyMapper' tags: - { name: ezplatform.search.solr.query.content.aggregation_result_extractor } @@ -191,7 +191,7 @@ services: ezplatform.search.solr.query.common.aggregation_result_extractor.field.country: class: Ibexa\Solr\ResultExtractor\AggregationResultExtractor\TermAggregationResultExtractor arguments: - $aggregationClass: 'eZ\Publish\API\Repository\Values\Content\Query\Aggregation\Field\CountryTermAggregation' + $aggregationClass: 'Ibexa\Contracts\Core\Repository\Values\Content\Query\Aggregation\Field\CountryTermAggregation' $keyMapper: '@Ibexa\Solr\ResultExtractor\AggregationResultExtractor\TermAggregationKeyMapper\CountryAggregationKeyMapper' tags: - { name: ezplatform.search.solr.query.content.aggregation_result_extractor } @@ -200,7 +200,7 @@ services: ezplatform.search.solr.query.common.aggregation_result_extractor.field.date_range: class: Ibexa\Solr\ResultExtractor\AggregationResultExtractor\RangeAggregationResultExtractor arguments: - $aggregationClass: 'eZ\Publish\API\Repository\Values\Content\Query\Aggregation\Field\DateRangeAggregation' + $aggregationClass: 'Ibexa\Contracts\Core\Repository\Values\Content\Query\Aggregation\Field\DateRangeAggregation' $keyMapper: '@Ibexa\Solr\ResultExtractor\AggregationResultExtractor\RangeAggregationKeyMapper\DateTimeRangeAggregationKeyMapper' tags: - { name: ezplatform.search.solr.query.content.aggregation_result_extractor } @@ -209,7 +209,7 @@ services: ezplatform.search.solr.query.common.aggregation_result_extractor.field.datetime_range: class: Ibexa\Solr\ResultExtractor\AggregationResultExtractor\RangeAggregationResultExtractor arguments: - $aggregationClass: 'eZ\Publish\API\Repository\Values\Content\Query\Aggregation\Field\DateTimeRangeAggregation' + $aggregationClass: 'Ibexa\Contracts\Core\Repository\Values\Content\Query\Aggregation\Field\DateTimeRangeAggregation' $keyMapper: '@Ibexa\Solr\ResultExtractor\AggregationResultExtractor\RangeAggregationKeyMapper\DateTimeRangeAggregationKeyMapper' tags: - { name: ezplatform.search.solr.query.content.aggregation_result_extractor } @@ -218,7 +218,7 @@ services: ezplatform.search.solr.query.common.aggregation_result_extractor.field.float_range: class: Ibexa\Solr\ResultExtractor\AggregationResultExtractor\RangeAggregationResultExtractor arguments: - $aggregationClass: 'eZ\Publish\API\Repository\Values\Content\Query\Aggregation\Field\FloatRangeAggregation' + $aggregationClass: 'Ibexa\Contracts\Core\Repository\Values\Content\Query\Aggregation\Field\FloatRangeAggregation' $keyMapper: '@Ibexa\Solr\ResultExtractor\AggregationResultExtractor\RangeAggregationKeyMapper\FloatRangeAggregationKeyMapper' tags: - { name: ezplatform.search.solr.query.content.aggregation_result_extractor } @@ -227,7 +227,7 @@ services: ezplatform.search.solr.query.common.aggregation_result_extractor.field.float_stats: class: Ibexa\Solr\ResultExtractor\AggregationResultExtractor\StatsAggregationResultExtractor arguments: - $aggregationClass: 'eZ\Publish\API\Repository\Values\Content\Query\Aggregation\Field\FloatStatsAggregation' + $aggregationClass: 'Ibexa\Contracts\Core\Repository\Values\Content\Query\Aggregation\Field\FloatStatsAggregation' tags: - { name: ezplatform.search.solr.query.content.aggregation_result_extractor } - { name: ezplatform.search.solr.query.location.aggregation_result_extractor } @@ -235,7 +235,7 @@ services: ezplatform.search.solr.query.common.aggregation_result_extractor.field.integer_range: class: Ibexa\Solr\ResultExtractor\AggregationResultExtractor\RangeAggregationResultExtractor arguments: - $aggregationClass: 'eZ\Publish\API\Repository\Values\Content\Query\Aggregation\Field\IntegerRangeAggregation' + $aggregationClass: 'Ibexa\Contracts\Core\Repository\Values\Content\Query\Aggregation\Field\IntegerRangeAggregation' $keyMapper: '@Ibexa\Solr\ResultExtractor\AggregationResultExtractor\RangeAggregationKeyMapper\IntRangeAggregationKeyMapper' tags: - { name: ezplatform.search.solr.query.content.aggregation_result_extractor } @@ -244,7 +244,7 @@ services: ezplatform.search.solr.query.common.aggregation_result_extractor.field.integer_stats: class: Ibexa\Solr\ResultExtractor\AggregationResultExtractor\StatsAggregationResultExtractor arguments: - $aggregationClass: 'eZ\Publish\API\Repository\Values\Content\Query\Aggregation\Field\IntegerStatsAggregation' + $aggregationClass: 'Ibexa\Contracts\Core\Repository\Values\Content\Query\Aggregation\Field\IntegerStatsAggregation' tags: - { name: ezplatform.search.solr.query.content.aggregation_result_extractor } - { name: ezplatform.search.solr.query.location.aggregation_result_extractor } @@ -252,7 +252,7 @@ services: ezplatform.search.solr.query.common.aggregation_result_extractor.field.keyword_term: class: Ibexa\Solr\ResultExtractor\AggregationResultExtractor\TermAggregationResultExtractor arguments: - $aggregationClass: 'eZ\Publish\API\Repository\Values\Content\Query\Aggregation\Field\KeywordTermAggregation' + $aggregationClass: 'Ibexa\Contracts\Core\Repository\Values\Content\Query\Aggregation\Field\KeywordTermAggregation' tags: - { name: ezplatform.search.solr.query.content.aggregation_result_extractor } - { name: ezplatform.search.solr.query.location.aggregation_result_extractor } @@ -260,7 +260,7 @@ services: ezplatform.search.solr.query.common.aggregation_result_extractor.field.selection_term: class: Ibexa\Solr\ResultExtractor\AggregationResultExtractor\TermAggregationResultExtractor arguments: - $aggregationClass: 'eZ\Publish\API\Repository\Values\Content\Query\Aggregation\Field\SelectionTermAggregation' + $aggregationClass: 'Ibexa\Contracts\Core\Repository\Values\Content\Query\Aggregation\Field\SelectionTermAggregation' tags: - { name: ezplatform.search.solr.query.content.aggregation_result_extractor } - { name: ezplatform.search.solr.query.location.aggregation_result_extractor } @@ -268,7 +268,7 @@ services: ezplatform.search.solr.query.common.aggregation_result_extractor.field.time_range: class: Ibexa\Solr\ResultExtractor\AggregationResultExtractor\RangeAggregationResultExtractor arguments: - $aggregationClass: 'eZ\Publish\API\Repository\Values\Content\Query\Aggregation\Field\TimeRangeAggregation' + $aggregationClass: 'Ibexa\Contracts\Core\Repository\Values\Content\Query\Aggregation\Field\TimeRangeAggregation' $keyMapper: '@Ibexa\Solr\ResultExtractor\AggregationResultExtractor\RangeAggregationKeyMapper\IntRangeAggregationKeyMapper' tags: - { name: ezplatform.search.solr.query.content.aggregation_result_extractor } @@ -279,7 +279,7 @@ services: ezplatform.search.solr.query.content.aggregation_result_extractor.visibility: class: Ibexa\Solr\ResultExtractor\AggregationResultExtractor\TermAggregationResultExtractor arguments: - $aggregationClass: 'eZ\Publish\API\Repository\Values\Content\Query\Aggregation\VisibilityTermAggregation' + $aggregationClass: 'Ibexa\Contracts\Core\Repository\Values\Content\Query\Aggregation\VisibilityTermAggregation' $keyMapper: '@Ibexa\Solr\ResultExtractor\AggregationResultExtractor\TermAggregationKeyMapper\BooleanAggregationKeyMapper' tags: - { name: ezplatform.search.solr.query.content.aggregation_result_extractor } @@ -289,7 +289,7 @@ services: ezplatform.search.solr.query.location.aggregation_result_extractor.visibility: class: Ibexa\Solr\ResultExtractor\AggregationResultExtractor\TermAggregationResultExtractor arguments: - $aggregationClass: 'eZ\Publish\API\Repository\Values\Content\Query\Aggregation\VisibilityTermAggregation' + $aggregationClass: 'Ibexa\Contracts\Core\Repository\Values\Content\Query\Aggregation\VisibilityTermAggregation' $keyMapper: '@Ibexa\Solr\ResultExtractor\AggregationResultExtractor\TermAggregationKeyMapper\InvertedBooleanAggregationKeyMapper' tags: - { name: ezplatform.search.solr.query.location.aggregation_result_extractor } diff --git a/src/lib/Resources/config/container/solr/aggregation_visitors.yml b/src/lib/Resources/config/container/solr/aggregation_visitors.yml index 397b2b13..19280918 100644 --- a/src/lib/Resources/config/container/solr/aggregation_visitors.yml +++ b/src/lib/Resources/config/container/solr/aggregation_visitors.yml @@ -30,7 +30,7 @@ services: class: Ibexa\Solr\Query\Common\AggregationVisitor\TermAggregationVisitor factory: ['@Ibexa\Solr\Query\Common\AggregationVisitor\Factory\SearchFieldAggregationVisitorFactory', 'createTermAggregationVisitor'] arguments: - $aggregationClass: 'eZ\Publish\API\Repository\Values\Content\Query\Aggregation\ContentTypeTermAggregation' + $aggregationClass: 'Ibexa\Contracts\Core\Repository\Values\Content\Query\Aggregation\ContentTypeTermAggregation' $searchIndexFieldName: 'content_type_id_id' tags: - { name: ezplatform.search.solr.query.content.aggregation_visitor } @@ -40,7 +40,7 @@ services: class: Ibexa\Solr\Query\Common\AggregationVisitor\TermAggregationVisitor factory: ['@Ibexa\Solr\Query\Common\AggregationVisitor\Factory\SearchFieldAggregationVisitorFactory', 'createTermAggregationVisitor'] arguments: - $aggregationClass: 'eZ\Publish\API\Repository\Values\Content\Query\Aggregation\ContentTypeGroupTermAggregation' + $aggregationClass: 'Ibexa\Contracts\Core\Repository\Values\Content\Query\Aggregation\ContentTypeGroupTermAggregation' $searchIndexFieldName: 'content_type_group_ids_mid' tags: - { name: ezplatform.search.solr.query.content.aggregation_visitor } @@ -50,7 +50,7 @@ services: class: Ibexa\Solr\Query\Common\AggregationVisitor\TermAggregationVisitor factory: ['@Ibexa\Solr\Query\Common\AggregationVisitor\Factory\ContentFieldAggregationVisitorFactory', 'createTermAggregationVisitor'] arguments: - $aggregationClass: 'eZ\Publish\API\Repository\Values\Content\Query\Aggregation\Field\AuthorTermAggregation' + $aggregationClass: 'Ibexa\Contracts\Core\Repository\Values\Content\Query\Aggregation\Field\AuthorTermAggregation' $searchIndexFieldName: 'aggregation_value' tags: - { name: ezplatform.search.solr.query.content.aggregation_visitor } @@ -60,7 +60,7 @@ services: class: Ibexa\Solr\Query\Common\AggregationVisitor\TermAggregationVisitor factory: ['@Ibexa\Solr\Query\Common\AggregationVisitor\Factory\ContentFieldAggregationVisitorFactory', 'createTermAggregationVisitor'] arguments: - $aggregationClass: 'eZ\Publish\API\Repository\Values\Content\Query\Aggregation\Field\CheckboxTermAggregation' + $aggregationClass: 'Ibexa\Contracts\Core\Repository\Values\Content\Query\Aggregation\Field\CheckboxTermAggregation' $searchIndexFieldName: 'value' tags: - { name: ezplatform.search.solr.query.content.aggregation_visitor } @@ -70,7 +70,7 @@ services: class: Ibexa\Solr\Query\Common\AggregationVisitor\RangeAggregationVisitor factory: ['@Ibexa\Solr\Query\Common\AggregationVisitor\Factory\ContentFieldAggregationVisitorFactory', 'createRangeAggregationVisitor'] arguments: - $aggregationClass: 'eZ\Publish\API\Repository\Values\Content\Query\Aggregation\Field\DateRangeAggregation' + $aggregationClass: 'Ibexa\Contracts\Core\Repository\Values\Content\Query\Aggregation\Field\DateRangeAggregation' $searchIndexFieldName: 'value' tags: - { name: ezplatform.search.solr.query.content.aggregation_visitor } @@ -80,7 +80,7 @@ services: class: Ibexa\Solr\Query\Common\AggregationVisitor\RangeAggregationVisitor factory: ['@Ibexa\Solr\Query\Common\AggregationVisitor\Factory\ContentFieldAggregationVisitorFactory', 'createRangeAggregationVisitor'] arguments: - $aggregationClass: 'eZ\Publish\API\Repository\Values\Content\Query\Aggregation\Field\DateTimeRangeAggregation' + $aggregationClass: 'Ibexa\Contracts\Core\Repository\Values\Content\Query\Aggregation\Field\DateTimeRangeAggregation' $searchIndexFieldName: 'value' tags: - { name: ezplatform.search.solr.query.content.aggregation_visitor } @@ -90,7 +90,7 @@ services: class: Ibexa\Solr\Query\Common\AggregationVisitor\TermAggregationVisitor factory: ['@Ibexa\Solr\Query\Common\AggregationVisitor\Factory\ContentFieldAggregationVisitorFactory', 'createTermAggregationVisitor'] arguments: - $aggregationClass: 'eZ\Publish\API\Repository\Values\Content\Query\Aggregation\Field\CountryTermAggregation' + $aggregationClass: 'Ibexa\Contracts\Core\Repository\Values\Content\Query\Aggregation\Field\CountryTermAggregation' $searchIndexFieldName: 'idc' tags: - { name: ezplatform.search.solr.query.content.aggregation_visitor } @@ -100,7 +100,7 @@ services: class: Ibexa\Solr\Query\Common\AggregationVisitor\RangeAggregationVisitor factory: ['@Ibexa\Solr\Query\Common\AggregationVisitor\Factory\ContentFieldAggregationVisitorFactory', 'createRangeAggregationVisitor'] arguments: - $aggregationClass: 'eZ\Publish\API\Repository\Values\Content\Query\Aggregation\Field\FloatRangeAggregation' + $aggregationClass: 'Ibexa\Contracts\Core\Repository\Values\Content\Query\Aggregation\Field\FloatRangeAggregation' $searchIndexFieldName: 'value' tags: - { name: ezplatform.search.solr.query.content.aggregation_visitor } @@ -110,7 +110,7 @@ services: class: Ibexa\Solr\Query\Common\AggregationVisitor\StatsAggregationVisitor factory: ['@Ibexa\Solr\Query\Common\AggregationVisitor\Factory\ContentFieldAggregationVisitorFactory', 'createStatsAggregationVisitor'] arguments: - $aggregationClass: 'eZ\Publish\API\Repository\Values\Content\Query\Aggregation\Field\FloatStatsAggregation' + $aggregationClass: 'Ibexa\Contracts\Core\Repository\Values\Content\Query\Aggregation\Field\FloatStatsAggregation' $searchIndexFieldName: 'value' tags: - { name: ezplatform.search.solr.query.content.aggregation_visitor } @@ -120,7 +120,7 @@ services: class: Ibexa\Solr\Query\Common\AggregationVisitor\RangeAggregationVisitor factory: ['@Ibexa\Solr\Query\Common\AggregationVisitor\Factory\ContentFieldAggregationVisitorFactory', 'createRangeAggregationVisitor'] arguments: - $aggregationClass: 'eZ\Publish\API\Repository\Values\Content\Query\Aggregation\Field\IntegerRangeAggregation' + $aggregationClass: 'Ibexa\Contracts\Core\Repository\Values\Content\Query\Aggregation\Field\IntegerRangeAggregation' $searchIndexFieldName: 'value' tags: - { name: ezplatform.search.solr.query.content.aggregation_visitor } @@ -130,7 +130,7 @@ services: class: Ibexa\Solr\Query\Common\AggregationVisitor\StatsAggregationVisitor factory: ['@Ibexa\Solr\Query\Common\AggregationVisitor\Factory\ContentFieldAggregationVisitorFactory', 'createStatsAggregationVisitor'] arguments: - $aggregationClass: 'eZ\Publish\API\Repository\Values\Content\Query\Aggregation\Field\IntegerStatsAggregation' + $aggregationClass: 'Ibexa\Contracts\Core\Repository\Values\Content\Query\Aggregation\Field\IntegerStatsAggregation' $searchIndexFieldName: 'value' tags: - { name: ezplatform.search.solr.query.content.aggregation_visitor } @@ -140,7 +140,7 @@ services: class: Ibexa\Solr\Query\Common\AggregationVisitor\TermAggregationVisitor factory: ['@Ibexa\Solr\Query\Common\AggregationVisitor\Factory\ContentFieldAggregationVisitorFactory', 'createTermAggregationVisitor'] arguments: - $aggregationClass: 'eZ\Publish\API\Repository\Values\Content\Query\Aggregation\Field\KeywordTermAggregation' + $aggregationClass: 'Ibexa\Contracts\Core\Repository\Values\Content\Query\Aggregation\Field\KeywordTermAggregation' $searchIndexFieldName: 'value' tags: - { name: ezplatform.search.solr.query.content.aggregation_visitor } @@ -150,7 +150,7 @@ services: class: Ibexa\Solr\Query\Common\AggregationVisitor\TermAggregationVisitor factory: ['@Ibexa\Solr\Query\Common\AggregationVisitor\Factory\ContentFieldAggregationVisitorFactory', 'createTermAggregationVisitor'] arguments: - $aggregationClass: 'eZ\Publish\API\Repository\Values\Content\Query\Aggregation\Field\SelectionTermAggregation' + $aggregationClass: 'Ibexa\Contracts\Core\Repository\Values\Content\Query\Aggregation\Field\SelectionTermAggregation' $searchIndexFieldName: 'selected_option_value' tags: - { name: ezplatform.search.solr.query.content.aggregation_visitor } @@ -160,7 +160,7 @@ services: class: Ibexa\Solr\Query\Common\AggregationVisitor\RangeAggregationVisitor factory: ['@Ibexa\Solr\Query\Common\AggregationVisitor\Factory\ContentFieldAggregationVisitorFactory', 'createRangeAggregationVisitor'] arguments: - $aggregationClass: 'eZ\Publish\API\Repository\Values\Content\Query\Aggregation\Field\TimeRangeAggregation' + $aggregationClass: 'Ibexa\Contracts\Core\Repository\Values\Content\Query\Aggregation\Field\TimeRangeAggregation' $searchIndexFieldName: 'value' tags: - { name: ezplatform.search.solr.query.content.aggregation_visitor } @@ -170,7 +170,7 @@ services: class: Ibexa\Solr\Query\Common\AggregationVisitor\TermAggregationVisitor factory: ['@Ibexa\Solr\Query\Common\AggregationVisitor\Factory\SearchFieldAggregationVisitorFactory', 'createTermAggregationVisitor'] arguments: - $aggregationClass: 'eZ\Publish\API\Repository\Values\Content\Query\Aggregation\LanguageTermAggregation' + $aggregationClass: 'Ibexa\Contracts\Core\Repository\Values\Content\Query\Aggregation\LanguageTermAggregation' $searchIndexFieldName: 'content_language_codes_raw_mid' tags: - { name: ezplatform.search.solr.query.content.aggregation_visitor } @@ -180,7 +180,7 @@ services: class: Ibexa\Solr\Query\Common\AggregationVisitor\RangeAggregationVisitor factory: ['@Ibexa\Solr\Query\Common\AggregationVisitor\Factory\RawAggregationVisitorFactory', 'createRangeAggregationVisitor'] arguments: - $aggregationClass: 'eZ\Publish\API\Repository\Values\Content\Query\Aggregation\RawRangeAggregation' + $aggregationClass: 'Ibexa\Contracts\Core\Repository\Values\Content\Query\Aggregation\RawRangeAggregation' tags: - { name: ezplatform.search.solr.query.content.aggregation_visitor } - { name: ezplatform.search.solr.query.location.aggregation_visitor } @@ -189,7 +189,7 @@ services: class: Ibexa\Solr\Query\Common\AggregationVisitor\StatsAggregationVisitor factory: ['@Ibexa\Solr\Query\Common\AggregationVisitor\Factory\RawAggregationVisitorFactory', 'createStatsAggregationVisitor'] arguments: - $aggregationClass: 'eZ\Publish\API\Repository\Values\Content\Query\Aggregation\RawStatsAggregation' + $aggregationClass: 'Ibexa\Contracts\Core\Repository\Values\Content\Query\Aggregation\RawStatsAggregation' tags: - { name: ezplatform.search.solr.query.content.aggregation_visitor } - { name: ezplatform.search.solr.query.location.aggregation_visitor } @@ -198,7 +198,7 @@ services: class: Ibexa\Solr\Query\Common\AggregationVisitor\TermAggregationVisitor factory: ['@Ibexa\Solr\Query\Common\AggregationVisitor\Factory\RawAggregationVisitorFactory', 'createTermAggregationVisitor'] arguments: - $aggregationClass: 'eZ\Publish\API\Repository\Values\Content\Query\Aggregation\RawTermAggregation' + $aggregationClass: 'Ibexa\Contracts\Core\Repository\Values\Content\Query\Aggregation\RawTermAggregation' tags: - { name: ezplatform.search.solr.query.content.aggregation_visitor } - { name: ezplatform.search.solr.query.location.aggregation_visitor } @@ -207,7 +207,7 @@ services: class: Ibexa\Solr\Query\Common\AggregationVisitor\TermAggregationVisitor factory: ['@Ibexa\Solr\Query\Common\AggregationVisitor\Factory\SearchFieldAggregationVisitorFactory', 'createTermAggregationVisitor'] arguments: - $aggregationClass: 'eZ\Publish\API\Repository\Values\Content\Query\Aggregation\SectionTermAggregation' + $aggregationClass: 'Ibexa\Contracts\Core\Repository\Values\Content\Query\Aggregation\SectionTermAggregation' $searchIndexFieldName: 'content_section_id_id' tags: - { name: ezplatform.search.solr.query.content.aggregation_visitor } @@ -234,7 +234,7 @@ services: class: Ibexa\Solr\Query\Common\AggregationVisitor\TermAggregationVisitor factory: ['@Ibexa\Solr\Query\Common\AggregationVisitor\Factory\SearchFieldAggregationVisitorFactory', 'createTermAggregationVisitor'] arguments: - $aggregationClass: 'eZ\Publish\API\Repository\Values\Content\Query\Aggregation\VisibilityTermAggregation' + $aggregationClass: 'Ibexa\Contracts\Core\Repository\Values\Content\Query\Aggregation\VisibilityTermAggregation' $searchIndexFieldName: 'location_visible_b' tags: - { name: ezplatform.search.solr.query.content.aggregation_visitor } @@ -253,7 +253,7 @@ services: class: Ibexa\Solr\Query\Common\AggregationVisitor\TermAggregationVisitor factory: ['@Ibexa\Solr\Query\Common\AggregationVisitor\Factory\SearchFieldAggregationVisitorFactory', 'createTermAggregationVisitor'] arguments: - $aggregationClass: 'eZ\Publish\API\Repository\Values\Content\Query\Aggregation\VisibilityTermAggregation' + $aggregationClass: 'Ibexa\Contracts\Core\Repository\Values\Content\Query\Aggregation\VisibilityTermAggregation' $searchIndexFieldName: 'invisible_b' tags: - { name: ezplatform.search.solr.query.location.aggregation_visitor } @@ -262,7 +262,7 @@ services: class: Ibexa\Solr\Query\Common\AggregationVisitor\LocationChildrenTermAggregationVisitor factory: [ '@Ibexa\Solr\Query\Common\AggregationVisitor\Factory\SearchFieldAggregationVisitorFactory', 'createTermAggregationVisitor' ] arguments: - $aggregationClass: 'eZ\Publish\API\Repository\Values\Content\Query\Aggregation\Location\LocationChildrenTermAggregation' + $aggregationClass: 'Ibexa\Contracts\Core\Repository\Values\Content\Query\Aggregation\Location\LocationChildrenTermAggregation' $searchIndexFieldName: 'parent_id_id' tags: - { name: ezplatform.search.solr.query.location.aggregation_visitor } diff --git a/src/lib/ResultExtractor.php b/src/lib/ResultExtractor.php index eb0f634c..3b150878 100644 --- a/src/lib/ResultExtractor.php +++ b/src/lib/ResultExtractor.php @@ -10,11 +10,11 @@ */ namespace Ibexa\Solr; -use eZ\Publish\API\Repository\Values\Content\Search\AggregationResultCollection; +use Ibexa\Contracts\Core\Repository\Values\Content\Search\AggregationResultCollection; use Ibexa\Solr\Gateway\EndpointRegistry; use Ibexa\Solr\Query\FacetFieldVisitor; -use eZ\Publish\API\Repository\Values\Content\Search\SearchResult; -use eZ\Publish\API\Repository\Values\Content\Search\SearchHit; +use Ibexa\Contracts\Core\Repository\Values\Content\Search\SearchResult; +use Ibexa\Contracts\Core\Repository\Values\Content\Search\SearchHit; use Ibexa\Contracts\Solr\ResultExtractor\AggregationResultExtractor; use stdClass; @@ -24,13 +24,13 @@ */ abstract class ResultExtractor { - /** @var \EzSystems\EzPlatformSolrSearchEngine\Query\FacetFieldVisitor */ + /** @var \Ibexa\Solr\Query\FacetFieldVisitor */ protected $facetBuilderVisitor; - /** @var \EzSystems\EzPlatformSolrSearchEngine\ResultExtractor\AggregationResultExtractor */ + /** @var \Ibexa\Contracts\Solr\ResultExtractor\AggregationResultExtractor */ protected $aggregationResultExtractor; - /** @var \EzSystems\EzPlatformSolrSearchEngine\Gateway\EndpointRegistry */ + /** @var \Ibexa\Solr\Gateway\EndpointRegistry */ protected $endpointRegistry; public function __construct( @@ -47,11 +47,11 @@ public function __construct( * Extracts search result from $data returned by Solr backend. * * @param mixed $data - * @param \eZ\Publish\API\Repository\Values\Content\Query\FacetBuilder[] $facetBuilders - * @param \eZ\Publish\API\Repository\Values\Content\Query\Aggregation[] $aggregations + * @param \Ibexa\Contracts\Core\Repository\Values\Content\Query\FacetBuilder[] $facetBuilders + * @param \Ibexa\Contracts\Core\Repository\Values\Content\Query\Aggregation[] $aggregations * @param array $languageFilter * - * @return \eZ\Publish\API\Repository\Values\Content\Search\SearchResult + * @return \Ibexa\Contracts\Core\Repository\Values\Content\Search\SearchResult */ public function extract($data, array $facetBuilders = [], array $aggregations = [], array $languageFilter = []) { @@ -80,7 +80,7 @@ public function extract($data, array $facetBuilders = [], array $aggregations = * * @param mixed $hit * - * @return \eZ\Publish\API\Repository\Values\ValueObject + * @return \Ibexa\Contracts\Core\Repository\Values\ValueObject */ abstract public function extractHit($hit); @@ -115,7 +115,7 @@ protected function getIndexIdentifier($hit) } /** - * @param \eZ\Publish\API\Repository\Values\Content\Query\Aggregation[] $aggregations + * @param \Ibexa\Contracts\Core\Repository\Values\Content\Query\Aggregation[] $aggregations */ protected function extractAggregations( stdClass $data, @@ -139,9 +139,9 @@ protected function extractAggregations( } /** - * @param \eZ\Publish\API\Repository\Values\Content\Query\FacetBuilder[] $facetBuilders + * @param \Ibexa\Contracts\Core\Repository\Values\Content\Query\FacetBuilder[] $facetBuilders * - * @return \eZ\Publish\API\Repository\Values\Content\Search\Facet[] + * @return \Ibexa\Contracts\Core\Repository\Values\Content\Search\Facet[] */ protected function extractFacets(stdClass $data, array $facetBuilders, array $languageFilter): array { diff --git a/src/lib/ResultExtractor/AggregationResultExtractor/DispatcherAggregationResultExtractor.php b/src/lib/ResultExtractor/AggregationResultExtractor/DispatcherAggregationResultExtractor.php index 14f9a47b..1f326693 100644 --- a/src/lib/ResultExtractor/AggregationResultExtractor/DispatcherAggregationResultExtractor.php +++ b/src/lib/ResultExtractor/AggregationResultExtractor/DispatcherAggregationResultExtractor.php @@ -8,19 +8,19 @@ namespace Ibexa\Solr\ResultExtractor\AggregationResultExtractor; -use eZ\Publish\API\Repository\Exceptions\NotImplementedException; -use eZ\Publish\API\Repository\Values\Content\Query\Aggregation; -use eZ\Publish\API\Repository\Values\Content\Search\AggregationResult; +use Ibexa\Contracts\Core\Repository\Exceptions\NotImplementedException; +use Ibexa\Contracts\Core\Repository\Values\Content\Query\Aggregation; +use Ibexa\Contracts\Core\Repository\Values\Content\Search\AggregationResult; use Ibexa\Contracts\Solr\ResultExtractor\AggregationResultExtractor; use stdClass; final class DispatcherAggregationResultExtractor implements AggregationResultExtractor { - /** @var \EzSystems\EzPlatformSolrSearchEngine\ResultExtractor\AggregationResultExtractor[] */ + /** @var \Ibexa\Contracts\Solr\ResultExtractor\AggregationResultExtractor[] */ private $extractors; /** - * @param \EzSystems\EzPlatformSolrSearchEngine\ResultExtractor\AggregationResultExtractor[] $extractors + * @param \Ibexa\Contracts\Solr\ResultExtractor\AggregationResultExtractor[] $extractors */ public function __construct(iterable $extractors) { diff --git a/src/lib/ResultExtractor/AggregationResultExtractor/NestedAggregationResultExtractor.php b/src/lib/ResultExtractor/AggregationResultExtractor/NestedAggregationResultExtractor.php index 6aeb3d82..8b5739d4 100644 --- a/src/lib/ResultExtractor/AggregationResultExtractor/NestedAggregationResultExtractor.php +++ b/src/lib/ResultExtractor/AggregationResultExtractor/NestedAggregationResultExtractor.php @@ -8,14 +8,14 @@ namespace Ibexa\Solr\ResultExtractor\AggregationResultExtractor; -use eZ\Publish\API\Repository\Values\Content\Query\Aggregation; -use eZ\Publish\API\Repository\Values\Content\Search\AggregationResult; +use Ibexa\Contracts\Core\Repository\Values\Content\Query\Aggregation; +use Ibexa\Contracts\Core\Repository\Values\Content\Search\AggregationResult; use Ibexa\Contracts\Solr\ResultExtractor\AggregationResultExtractor; use stdClass; final class NestedAggregationResultExtractor implements AggregationResultExtractor { - /** @var \EzSystems\EzPlatformSolrSearchEngine\ResultExtractor\AggregationResultExtractor */ + /** @var \Ibexa\Contracts\Solr\ResultExtractor\AggregationResultExtractor */ private $innerResultExtractor; /** @var string */ diff --git a/src/lib/ResultExtractor/AggregationResultExtractor/RangeAggregationKeyMapper/DateTimeRangeAggregationKeyMapper.php b/src/lib/ResultExtractor/AggregationResultExtractor/RangeAggregationKeyMapper/DateTimeRangeAggregationKeyMapper.php index 7d00aa04..3260c50e 100644 --- a/src/lib/ResultExtractor/AggregationResultExtractor/RangeAggregationKeyMapper/DateTimeRangeAggregationKeyMapper.php +++ b/src/lib/ResultExtractor/AggregationResultExtractor/RangeAggregationKeyMapper/DateTimeRangeAggregationKeyMapper.php @@ -9,7 +9,7 @@ namespace Ibexa\Solr\ResultExtractor\AggregationResultExtractor\RangeAggregationKeyMapper; use DateTimeImmutable; -use eZ\Publish\API\Repository\Values\Content\Query\Aggregation; +use Ibexa\Contracts\Core\Repository\Values\Content\Query\Aggregation; use Ibexa\Contracts\Solr\ResultExtractor\AggregationResultExtractor\RangeAggregationKeyMapper; final class DateTimeRangeAggregationKeyMapper implements RangeAggregationKeyMapper diff --git a/src/lib/ResultExtractor/AggregationResultExtractor/RangeAggregationKeyMapper/FloatRangeAggregationKeyMapper.php b/src/lib/ResultExtractor/AggregationResultExtractor/RangeAggregationKeyMapper/FloatRangeAggregationKeyMapper.php index 9bf24b13..18f5ff5e 100644 --- a/src/lib/ResultExtractor/AggregationResultExtractor/RangeAggregationKeyMapper/FloatRangeAggregationKeyMapper.php +++ b/src/lib/ResultExtractor/AggregationResultExtractor/RangeAggregationKeyMapper/FloatRangeAggregationKeyMapper.php @@ -8,7 +8,7 @@ namespace Ibexa\Solr\ResultExtractor\AggregationResultExtractor\RangeAggregationKeyMapper; -use eZ\Publish\API\Repository\Values\Content\Query\Aggregation; +use Ibexa\Contracts\Core\Repository\Values\Content\Query\Aggregation; use Ibexa\Contracts\Solr\ResultExtractor\AggregationResultExtractor\RangeAggregationKeyMapper; final class FloatRangeAggregationKeyMapper implements RangeAggregationKeyMapper diff --git a/src/lib/ResultExtractor/AggregationResultExtractor/RangeAggregationKeyMapper/IntRangeAggregationKeyMapper.php b/src/lib/ResultExtractor/AggregationResultExtractor/RangeAggregationKeyMapper/IntRangeAggregationKeyMapper.php index 864db487..9ca2e18b 100644 --- a/src/lib/ResultExtractor/AggregationResultExtractor/RangeAggregationKeyMapper/IntRangeAggregationKeyMapper.php +++ b/src/lib/ResultExtractor/AggregationResultExtractor/RangeAggregationKeyMapper/IntRangeAggregationKeyMapper.php @@ -8,7 +8,7 @@ namespace Ibexa\Solr\ResultExtractor\AggregationResultExtractor\RangeAggregationKeyMapper; -use eZ\Publish\API\Repository\Values\Content\Query\Aggregation; +use Ibexa\Contracts\Core\Repository\Values\Content\Query\Aggregation; use Ibexa\Contracts\Solr\ResultExtractor\AggregationResultExtractor\RangeAggregationKeyMapper; final class IntRangeAggregationKeyMapper implements RangeAggregationKeyMapper diff --git a/src/lib/ResultExtractor/AggregationResultExtractor/RangeAggregationKeyMapper/NullRangeAggregationKeyMapper.php b/src/lib/ResultExtractor/AggregationResultExtractor/RangeAggregationKeyMapper/NullRangeAggregationKeyMapper.php index 87f363c0..7e6d6a9d 100644 --- a/src/lib/ResultExtractor/AggregationResultExtractor/RangeAggregationKeyMapper/NullRangeAggregationKeyMapper.php +++ b/src/lib/ResultExtractor/AggregationResultExtractor/RangeAggregationKeyMapper/NullRangeAggregationKeyMapper.php @@ -8,7 +8,7 @@ namespace Ibexa\Solr\ResultExtractor\AggregationResultExtractor\RangeAggregationKeyMapper; -use eZ\Publish\API\Repository\Values\Content\Query\Aggregation; +use Ibexa\Contracts\Core\Repository\Values\Content\Query\Aggregation; use Ibexa\Contracts\Solr\ResultExtractor\AggregationResultExtractor\RangeAggregationKeyMapper; final class NullRangeAggregationKeyMapper implements RangeAggregationKeyMapper diff --git a/src/lib/ResultExtractor/AggregationResultExtractor/RangeAggregationResultExtractor.php b/src/lib/ResultExtractor/AggregationResultExtractor/RangeAggregationResultExtractor.php index 8dc1ff07..7b6f2aa5 100644 --- a/src/lib/ResultExtractor/AggregationResultExtractor/RangeAggregationResultExtractor.php +++ b/src/lib/ResultExtractor/AggregationResultExtractor/RangeAggregationResultExtractor.php @@ -8,12 +8,12 @@ namespace Ibexa\Solr\ResultExtractor\AggregationResultExtractor; -use eZ\Publish\API\Repository\Values\Content\Query\Aggregation\AbstractRangeAggregation; -use eZ\Publish\API\Repository\Values\Content\Query\Aggregation\Range; -use eZ\Publish\API\Repository\Values\Content\Query\Aggregation; -use eZ\Publish\API\Repository\Values\Content\Search\AggregationResult; -use eZ\Publish\API\Repository\Values\Content\Search\AggregationResult\RangeAggregationResult; -use eZ\Publish\API\Repository\Values\Content\Search\AggregationResult\RangeAggregationResultEntry; +use Ibexa\Contracts\Core\Repository\Values\Content\Query\Aggregation\AbstractRangeAggregation; +use Ibexa\Contracts\Core\Repository\Values\Content\Query\Aggregation\Range; +use Ibexa\Contracts\Core\Repository\Values\Content\Query\Aggregation; +use Ibexa\Contracts\Core\Repository\Values\Content\Search\AggregationResult; +use Ibexa\Contracts\Core\Repository\Values\Content\Search\AggregationResult\RangeAggregationResult; +use Ibexa\Contracts\Core\Repository\Values\Content\Search\AggregationResult\RangeAggregationResultEntry; use Ibexa\Contracts\Solr\ResultExtractor\AggregationResultExtractor; use Ibexa\Contracts\Solr\ResultExtractor\AggregationResultExtractor\RangeAggregationKeyMapper; use stdClass; @@ -23,7 +23,7 @@ final class RangeAggregationResultExtractor implements AggregationResultExtracto /** @var string */ private $aggregationClass; - /** @var \EzSystems\EzPlatformSolrSearchEngine\ResultExtractor\AggregationResultExtractor\RangeAggregationKeyMapper */ + /** @var \Ibexa\Contracts\Solr\ResultExtractor\AggregationResultExtractor\RangeAggregationKeyMapper */ private $keyMapper; public function __construct(string $aggregationClass, RangeAggregationKeyMapper $keyMapper) @@ -38,7 +38,7 @@ public function canVisit(Aggregation $aggregation, array $languageFilter): bool } /** - * @param \eZ\Publish\API\Repository\Values\Content\Query\Aggregation\AbstractRangeAggregation $aggregation + * @param \Ibexa\Contracts\Core\Repository\Values\Content\Query\Aggregation\AbstractRangeAggregation $aggregation */ public function extract(Aggregation $aggregation, array $languageFilter, stdClass $data): AggregationResult { @@ -72,8 +72,8 @@ public function extract(Aggregation $aggregation, array $languageFilter, stdClas /** * Ensures that results entries are in the exact same order as they ware defined in aggregation. * - * @param \eZ\Publish\API\Repository\Values\Content\Query\Aggregation\AbstractRangeAggregation $aggregation - * @param \eZ\Publish\API\Repository\Values\Content\Search\AggregationResult\RangeAggregationResultEntry[] $entries + * @param \Ibexa\Contracts\Core\Repository\Values\Content\Query\Aggregation\AbstractRangeAggregation $aggregation + * @param \Ibexa\Contracts\Core\Repository\Values\Content\Search\AggregationResult\RangeAggregationResultEntry[] $entries */ private function sort(AbstractRangeAggregation $aggregation, array &$entries): void { diff --git a/src/lib/ResultExtractor/AggregationResultExtractor/StatsAggregationResultExtractor.php b/src/lib/ResultExtractor/AggregationResultExtractor/StatsAggregationResultExtractor.php index 0698ac96..4d25003e 100644 --- a/src/lib/ResultExtractor/AggregationResultExtractor/StatsAggregationResultExtractor.php +++ b/src/lib/ResultExtractor/AggregationResultExtractor/StatsAggregationResultExtractor.php @@ -8,9 +8,9 @@ namespace Ibexa\Solr\ResultExtractor\AggregationResultExtractor; -use eZ\Publish\API\Repository\Values\Content\Query\Aggregation; -use eZ\Publish\API\Repository\Values\Content\Search\AggregationResult; -use eZ\Publish\API\Repository\Values\Content\Search\AggregationResult\StatsAggregationResult; +use Ibexa\Contracts\Core\Repository\Values\Content\Query\Aggregation; +use Ibexa\Contracts\Core\Repository\Values\Content\Search\AggregationResult; +use Ibexa\Contracts\Core\Repository\Values\Content\Search\AggregationResult\StatsAggregationResult; use Ibexa\Contracts\Solr\ResultExtractor\AggregationResultExtractor; use stdClass; diff --git a/src/lib/ResultExtractor/AggregationResultExtractor/TermAggregationKeyMapper/AuthorAggregationKeyMapper.php b/src/lib/ResultExtractor/AggregationResultExtractor/TermAggregationKeyMapper/AuthorAggregationKeyMapper.php index a493aac1..a858f1c3 100644 --- a/src/lib/ResultExtractor/AggregationResultExtractor/TermAggregationKeyMapper/AuthorAggregationKeyMapper.php +++ b/src/lib/ResultExtractor/AggregationResultExtractor/TermAggregationKeyMapper/AuthorAggregationKeyMapper.php @@ -8,14 +8,14 @@ namespace Ibexa\Solr\ResultExtractor\AggregationResultExtractor\TermAggregationKeyMapper; -use eZ\Publish\API\Repository\Values\Content\Query\Aggregation; -use eZ\Publish\Core\FieldType\Author\Author; +use Ibexa\Contracts\Core\Repository\Values\Content\Query\Aggregation; +use Ibexa\Core\FieldType\Author\Author; use Ibexa\Contracts\Solr\ResultExtractor\AggregationResultExtractor\TermAggregationKeyMapper; final class AuthorAggregationKeyMapper implements TermAggregationKeyMapper { /** - * @return \eZ\Publish\Core\FieldType\Author\Author[] + * @return \Ibexa\Core\FieldType\Author\Author[] */ public function map(Aggregation $aggregation, array $languageFilter, array $keys): array { diff --git a/src/lib/ResultExtractor/AggregationResultExtractor/TermAggregationKeyMapper/BooleanAggregationKeyMapper.php b/src/lib/ResultExtractor/AggregationResultExtractor/TermAggregationKeyMapper/BooleanAggregationKeyMapper.php index 14b5053e..2d2cc79c 100644 --- a/src/lib/ResultExtractor/AggregationResultExtractor/TermAggregationKeyMapper/BooleanAggregationKeyMapper.php +++ b/src/lib/ResultExtractor/AggregationResultExtractor/TermAggregationKeyMapper/BooleanAggregationKeyMapper.php @@ -8,7 +8,7 @@ namespace Ibexa\Solr\ResultExtractor\AggregationResultExtractor\TermAggregationKeyMapper; -use eZ\Publish\API\Repository\Values\Content\Query\Aggregation; +use Ibexa\Contracts\Core\Repository\Values\Content\Query\Aggregation; use Ibexa\Contracts\Solr\ResultExtractor\AggregationResultExtractor\TermAggregationKeyMapper; final class BooleanAggregationKeyMapper implements TermAggregationKeyMapper diff --git a/src/lib/ResultExtractor/AggregationResultExtractor/TermAggregationKeyMapper/ContentTypeAggregationKeyMapper.php b/src/lib/ResultExtractor/AggregationResultExtractor/TermAggregationKeyMapper/ContentTypeAggregationKeyMapper.php index a7dcc957..04c4c199 100644 --- a/src/lib/ResultExtractor/AggregationResultExtractor/TermAggregationKeyMapper/ContentTypeAggregationKeyMapper.php +++ b/src/lib/ResultExtractor/AggregationResultExtractor/TermAggregationKeyMapper/ContentTypeAggregationKeyMapper.php @@ -8,13 +8,13 @@ namespace Ibexa\Solr\ResultExtractor\AggregationResultExtractor\TermAggregationKeyMapper; -use eZ\Publish\API\Repository\ContentTypeService; -use eZ\Publish\API\Repository\Values\Content\Query\Aggregation; +use Ibexa\Contracts\Core\Repository\ContentTypeService; +use Ibexa\Contracts\Core\Repository\Values\Content\Query\Aggregation; use Ibexa\Contracts\Solr\ResultExtractor\AggregationResultExtractor\TermAggregationKeyMapper; final class ContentTypeAggregationKeyMapper implements TermAggregationKeyMapper { - /** @var \eZ\Publish\API\Repository\ContentTypeService */ + /** @var \Ibexa\Contracts\Core\Repository\ContentTypeService */ private $contentTypeService; public function __construct(ContentTypeService $contentTypeService) @@ -23,11 +23,11 @@ public function __construct(ContentTypeService $contentTypeService) } /** - * @param \eZ\Publish\API\Repository\Values\Content\Query\Aggregation\ContentTypeTermAggregation $aggregation + * @param \Ibexa\Contracts\Core\Repository\Values\Content\Query\Aggregation\ContentTypeTermAggregation $aggregation * @param array $languageFilter * @param string[] $keys * - * @return \eZ\Publish\API\Repository\Values\ContentType\ContentType[] + * @return \Ibexa\Contracts\Core\Repository\Values\ContentType\ContentType[] */ public function map(Aggregation $aggregation, array $languageFilter, array $keys): array { diff --git a/src/lib/ResultExtractor/AggregationResultExtractor/TermAggregationKeyMapper/ContentTypeGroupAggregationKeyMapper.php b/src/lib/ResultExtractor/AggregationResultExtractor/TermAggregationKeyMapper/ContentTypeGroupAggregationKeyMapper.php index e48bd254..a0a1705a 100644 --- a/src/lib/ResultExtractor/AggregationResultExtractor/TermAggregationKeyMapper/ContentTypeGroupAggregationKeyMapper.php +++ b/src/lib/ResultExtractor/AggregationResultExtractor/TermAggregationKeyMapper/ContentTypeGroupAggregationKeyMapper.php @@ -8,14 +8,14 @@ namespace Ibexa\Solr\ResultExtractor\AggregationResultExtractor\TermAggregationKeyMapper; -use eZ\Publish\API\Repository\ContentTypeService; -use eZ\Publish\API\Repository\Exceptions\NotFoundException; -use eZ\Publish\API\Repository\Values\Content\Query\Aggregation; +use Ibexa\Contracts\Core\Repository\ContentTypeService; +use Ibexa\Contracts\Core\Repository\Exceptions\NotFoundException; +use Ibexa\Contracts\Core\Repository\Values\Content\Query\Aggregation; use Ibexa\Contracts\Solr\ResultExtractor\AggregationResultExtractor\TermAggregationKeyMapper; final class ContentTypeGroupAggregationKeyMapper implements TermAggregationKeyMapper { - /** @var \eZ\Publish\API\Repository\ContentTypeService */ + /** @var \Ibexa\Contracts\Core\Repository\ContentTypeService */ private $contentTypeService; public function __construct(ContentTypeService $contentTypeService) @@ -24,10 +24,10 @@ public function __construct(ContentTypeService $contentTypeService) } /** - * @param \eZ\Publish\API\Repository\Values\Content\Query\Aggregation\ContentTypeGroupTermAggregation $aggregation + * @param \Ibexa\Contracts\Core\Repository\Values\Content\Query\Aggregation\ContentTypeGroupTermAggregation $aggregation * @param string[] $keys * - * @return \eZ\Publish\API\Repository\Values\ContentType\ContentTypeGroup[] + * @return \Ibexa\Contracts\Core\Repository\Values\ContentType\ContentTypeGroup[] */ public function map(Aggregation $aggregation, array $languageFilter, array $keys): array { diff --git a/src/lib/ResultExtractor/AggregationResultExtractor/TermAggregationKeyMapper/CountryAggregationKeyMapper.php b/src/lib/ResultExtractor/AggregationResultExtractor/TermAggregationKeyMapper/CountryAggregationKeyMapper.php index 23653d8f..cdb77079 100644 --- a/src/lib/ResultExtractor/AggregationResultExtractor/TermAggregationKeyMapper/CountryAggregationKeyMapper.php +++ b/src/lib/ResultExtractor/AggregationResultExtractor/TermAggregationKeyMapper/CountryAggregationKeyMapper.php @@ -8,8 +8,8 @@ namespace Ibexa\Solr\ResultExtractor\AggregationResultExtractor\TermAggregationKeyMapper; -use eZ\Publish\API\Repository\Values\Content\Query\Aggregation\Field\CountryTermAggregation; -use eZ\Publish\API\Repository\Values\Content\Query\Aggregation; +use Ibexa\Contracts\Core\Repository\Values\Content\Query\Aggregation\Field\CountryTermAggregation; +use Ibexa\Contracts\Core\Repository\Values\Content\Query\Aggregation; use Ibexa\Contracts\Solr\ResultExtractor\AggregationResultExtractor\TermAggregationKeyMapper; final class CountryAggregationKeyMapper implements TermAggregationKeyMapper @@ -26,7 +26,7 @@ public function __construct(array $countriesInfo) } /** - * @param \eZ\Publish\API\Repository\Values\Content\Query\Aggregation\Field\CountryTermAggregation $aggregation + * @param \Ibexa\Contracts\Core\Repository\Values\Content\Query\Aggregation\Field\CountryTermAggregation $aggregation */ public function map(Aggregation $aggregation, array $languageFilter, array $keys): array { diff --git a/src/lib/ResultExtractor/AggregationResultExtractor/TermAggregationKeyMapper/InvertedBooleanAggregationKeyMapper.php b/src/lib/ResultExtractor/AggregationResultExtractor/TermAggregationKeyMapper/InvertedBooleanAggregationKeyMapper.php index 5116a599..1e113289 100644 --- a/src/lib/ResultExtractor/AggregationResultExtractor/TermAggregationKeyMapper/InvertedBooleanAggregationKeyMapper.php +++ b/src/lib/ResultExtractor/AggregationResultExtractor/TermAggregationKeyMapper/InvertedBooleanAggregationKeyMapper.php @@ -8,7 +8,7 @@ namespace Ibexa\Solr\ResultExtractor\AggregationResultExtractor\TermAggregationKeyMapper; -use eZ\Publish\API\Repository\Values\Content\Query\Aggregation; +use Ibexa\Contracts\Core\Repository\Values\Content\Query\Aggregation; use Ibexa\Contracts\Solr\ResultExtractor\AggregationResultExtractor\TermAggregationKeyMapper; final class InvertedBooleanAggregationKeyMapper implements TermAggregationKeyMapper diff --git a/src/lib/ResultExtractor/AggregationResultExtractor/TermAggregationKeyMapper/LanguageAggregationKeyMapper.php b/src/lib/ResultExtractor/AggregationResultExtractor/TermAggregationKeyMapper/LanguageAggregationKeyMapper.php index ad8643e8..15806c0f 100644 --- a/src/lib/ResultExtractor/AggregationResultExtractor/TermAggregationKeyMapper/LanguageAggregationKeyMapper.php +++ b/src/lib/ResultExtractor/AggregationResultExtractor/TermAggregationKeyMapper/LanguageAggregationKeyMapper.php @@ -8,13 +8,13 @@ namespace Ibexa\Solr\ResultExtractor\AggregationResultExtractor\TermAggregationKeyMapper; -use eZ\Publish\API\Repository\LanguageService; -use eZ\Publish\API\Repository\Values\Content\Query\Aggregation; +use Ibexa\Contracts\Core\Repository\LanguageService; +use Ibexa\Contracts\Core\Repository\Values\Content\Query\Aggregation; use Ibexa\Contracts\Solr\ResultExtractor\AggregationResultExtractor\TermAggregationKeyMapper; final class LanguageAggregationKeyMapper implements TermAggregationKeyMapper { - /** @var \eZ\Publish\API\Repository\LanguageService */ + /** @var \Ibexa\Contracts\Core\Repository\LanguageService */ private $languageService; public function __construct(LanguageService $languageService) diff --git a/src/lib/ResultExtractor/AggregationResultExtractor/TermAggregationKeyMapper/LocationAggregationKeyMapper.php b/src/lib/ResultExtractor/AggregationResultExtractor/TermAggregationKeyMapper/LocationAggregationKeyMapper.php index 836b229a..403fceb1 100644 --- a/src/lib/ResultExtractor/AggregationResultExtractor/TermAggregationKeyMapper/LocationAggregationKeyMapper.php +++ b/src/lib/ResultExtractor/AggregationResultExtractor/TermAggregationKeyMapper/LocationAggregationKeyMapper.php @@ -8,13 +8,13 @@ namespace Ibexa\Solr\ResultExtractor\AggregationResultExtractor\TermAggregationKeyMapper; -use eZ\Publish\API\Repository\LocationService; -use eZ\Publish\API\Repository\Values\Content\Query\Aggregation; +use Ibexa\Contracts\Core\Repository\LocationService; +use Ibexa\Contracts\Core\Repository\Values\Content\Query\Aggregation; use Ibexa\Contracts\Solr\ResultExtractor\AggregationResultExtractor\TermAggregationKeyMapper; final class LocationAggregationKeyMapper implements TermAggregationKeyMapper { - /** @var \eZ\Publish\API\Repository\LocationService */ + /** @var \Ibexa\Contracts\Core\Repository\LocationService */ private $locationService; public function __construct(LocationService $locationService) diff --git a/src/lib/ResultExtractor/AggregationResultExtractor/TermAggregationKeyMapper/NullAggregationKeyMapper.php b/src/lib/ResultExtractor/AggregationResultExtractor/TermAggregationKeyMapper/NullAggregationKeyMapper.php index 74a787e8..3d15a6ee 100644 --- a/src/lib/ResultExtractor/AggregationResultExtractor/TermAggregationKeyMapper/NullAggregationKeyMapper.php +++ b/src/lib/ResultExtractor/AggregationResultExtractor/TermAggregationKeyMapper/NullAggregationKeyMapper.php @@ -8,7 +8,7 @@ namespace Ibexa\Solr\ResultExtractor\AggregationResultExtractor\TermAggregationKeyMapper; -use eZ\Publish\API\Repository\Values\Content\Query\Aggregation; +use Ibexa\Contracts\Core\Repository\Values\Content\Query\Aggregation; use Ibexa\Contracts\Solr\ResultExtractor\AggregationResultExtractor\TermAggregationKeyMapper; final class NullAggregationKeyMapper implements TermAggregationKeyMapper diff --git a/src/lib/ResultExtractor/AggregationResultExtractor/TermAggregationKeyMapper/ObjectStateAggregationKeyMapper.php b/src/lib/ResultExtractor/AggregationResultExtractor/TermAggregationKeyMapper/ObjectStateAggregationKeyMapper.php index 4181235f..2b519285 100644 --- a/src/lib/ResultExtractor/AggregationResultExtractor/TermAggregationKeyMapper/ObjectStateAggregationKeyMapper.php +++ b/src/lib/ResultExtractor/AggregationResultExtractor/TermAggregationKeyMapper/ObjectStateAggregationKeyMapper.php @@ -8,14 +8,14 @@ namespace Ibexa\Solr\ResultExtractor\AggregationResultExtractor\TermAggregationKeyMapper; -use eZ\Publish\API\Repository\Exceptions\NotFoundException; -use eZ\Publish\API\Repository\ObjectStateService; -use eZ\Publish\API\Repository\Values\Content\Query\Aggregation; +use Ibexa\Contracts\Core\Repository\Exceptions\NotFoundException; +use Ibexa\Contracts\Core\Repository\ObjectStateService; +use Ibexa\Contracts\Core\Repository\Values\Content\Query\Aggregation; use Ibexa\Contracts\Solr\ResultExtractor\AggregationResultExtractor\TermAggregationKeyMapper; final class ObjectStateAggregationKeyMapper implements TermAggregationKeyMapper { - /** @var \eZ\Publish\API\Repository\ObjectStateService */ + /** @var \Ibexa\Contracts\Core\Repository\ObjectStateService */ private $objectStateService; public function __construct(ObjectStateService $objectStateService) @@ -24,7 +24,7 @@ public function __construct(ObjectStateService $objectStateService) } /** - * @param \eZ\Publish\API\Repository\Values\Content\Query\Aggregation\ObjectStateTermAggregation $aggregation + * @param \Ibexa\Contracts\Core\Repository\Values\Content\Query\Aggregation\ObjectStateTermAggregation $aggregation */ public function map(Aggregation $aggregation, array $languageFilter, array $keys): array { diff --git a/src/lib/ResultExtractor/AggregationResultExtractor/TermAggregationKeyMapper/SectionAggregationKeyMapper.php b/src/lib/ResultExtractor/AggregationResultExtractor/TermAggregationKeyMapper/SectionAggregationKeyMapper.php index 187267b4..6a586b14 100644 --- a/src/lib/ResultExtractor/AggregationResultExtractor/TermAggregationKeyMapper/SectionAggregationKeyMapper.php +++ b/src/lib/ResultExtractor/AggregationResultExtractor/TermAggregationKeyMapper/SectionAggregationKeyMapper.php @@ -8,15 +8,15 @@ namespace Ibexa\Solr\ResultExtractor\AggregationResultExtractor\TermAggregationKeyMapper; -use eZ\Publish\API\Repository\Exceptions\NotFoundException; -use eZ\Publish\API\Repository\Exceptions\UnauthorizedException; -use eZ\Publish\API\Repository\SectionService; -use eZ\Publish\API\Repository\Values\Content\Query\Aggregation; +use Ibexa\Contracts\Core\Repository\Exceptions\NotFoundException; +use Ibexa\Contracts\Core\Repository\Exceptions\UnauthorizedException; +use Ibexa\Contracts\Core\Repository\SectionService; +use Ibexa\Contracts\Core\Repository\Values\Content\Query\Aggregation; use Ibexa\Contracts\Solr\ResultExtractor\AggregationResultExtractor\TermAggregationKeyMapper; final class SectionAggregationKeyMapper implements TermAggregationKeyMapper { - /** @var \eZ\Publish\API\Repository\SectionService */ + /** @var \Ibexa\Contracts\Core\Repository\SectionService */ private $sectionService; public function __construct(SectionService $sectionService) @@ -25,11 +25,11 @@ public function __construct(SectionService $sectionService) } /** - * @param \eZ\Publish\API\Repository\Values\Content\Query\Aggregation\SectionTermAggregation $aggregation + * @param \Ibexa\Contracts\Core\Repository\Values\Content\Query\Aggregation\SectionTermAggregation $aggregation * @param array $languageFilter * @param string[] $keys * - * @return \eZ\Publish\API\Repository\Values\Content\Section[] + * @return \Ibexa\Contracts\Core\Repository\Values\Content\Section[] */ public function map(Aggregation $aggregation, array $languageFilter, array $keys): array { diff --git a/src/lib/ResultExtractor/AggregationResultExtractor/TermAggregationKeyMapper/SubtreeAggregationKeyMapper.php b/src/lib/ResultExtractor/AggregationResultExtractor/TermAggregationKeyMapper/SubtreeAggregationKeyMapper.php index 56247c6d..1e023be1 100644 --- a/src/lib/ResultExtractor/AggregationResultExtractor/TermAggregationKeyMapper/SubtreeAggregationKeyMapper.php +++ b/src/lib/ResultExtractor/AggregationResultExtractor/TermAggregationKeyMapper/SubtreeAggregationKeyMapper.php @@ -8,12 +8,12 @@ namespace Ibexa\Solr\ResultExtractor\AggregationResultExtractor\TermAggregationKeyMapper; -use eZ\Publish\API\Repository\Values\Content\Query\Aggregation; +use Ibexa\Contracts\Core\Repository\Values\Content\Query\Aggregation; use Ibexa\Contracts\Solr\ResultExtractor\AggregationResultExtractor\TermAggregationKeyMapper; final class SubtreeAggregationKeyMapper implements TermAggregationKeyMapper { - /** @var \EzSystems\EzPlatformSolrSearchEngine\ResultExtractor\AggregationResultExtractor\TermAggregationKeyMapper */ + /** @var \Ibexa\Contracts\Solr\ResultExtractor\AggregationResultExtractor\TermAggregationKeyMapper */ private $locationAggregationKeyMapper; public function __construct(TermAggregationKeyMapper $locationAggregationKeyMapper) diff --git a/src/lib/ResultExtractor/AggregationResultExtractor/TermAggregationKeyMapper/UserMetadataAggregationKeyMapper.php b/src/lib/ResultExtractor/AggregationResultExtractor/TermAggregationKeyMapper/UserMetadataAggregationKeyMapper.php index 884da335..1fe3720a 100644 --- a/src/lib/ResultExtractor/AggregationResultExtractor/TermAggregationKeyMapper/UserMetadataAggregationKeyMapper.php +++ b/src/lib/ResultExtractor/AggregationResultExtractor/TermAggregationKeyMapper/UserMetadataAggregationKeyMapper.php @@ -8,16 +8,16 @@ namespace Ibexa\Solr\ResultExtractor\AggregationResultExtractor\TermAggregationKeyMapper; -use eZ\Publish\API\Repository\Exceptions\NotFoundException; -use eZ\Publish\API\Repository\Exceptions\UnauthorizedException; -use eZ\Publish\API\Repository\UserService; -use eZ\Publish\API\Repository\Values\Content\Query\Aggregation\UserMetadataTermAggregation; -use eZ\Publish\API\Repository\Values\Content\Query\Aggregation; +use Ibexa\Contracts\Core\Repository\Exceptions\NotFoundException; +use Ibexa\Contracts\Core\Repository\Exceptions\UnauthorizedException; +use Ibexa\Contracts\Core\Repository\UserService; +use Ibexa\Contracts\Core\Repository\Values\Content\Query\Aggregation\UserMetadataTermAggregation; +use Ibexa\Contracts\Core\Repository\Values\Content\Query\Aggregation; use Ibexa\Contracts\Solr\ResultExtractor\AggregationResultExtractor\TermAggregationKeyMapper; final class UserMetadataAggregationKeyMapper implements TermAggregationKeyMapper { - /** @var \eZ\Publish\API\Repository\UserService */ + /** @var \Ibexa\Contracts\Core\Repository\UserService */ private $userService; public function __construct(UserService $userService) @@ -26,10 +26,10 @@ public function __construct(UserService $userService) } /** - * @param \eZ\Publish\API\Repository\Values\Content\Query\Aggregation\UserMetadataTermAggregation $aggregation + * @param \Ibexa\Contracts\Core\Repository\Values\Content\Query\Aggregation\UserMetadataTermAggregation $aggregation * @param string[] $keys * - * @return \eZ\Publish\API\Repository\Values\User\User[] + * @return \Ibexa\Contracts\Core\Repository\Values\User\User[] */ public function map(Aggregation $aggregation, array $languageFilter, array $keys): array { diff --git a/src/lib/ResultExtractor/AggregationResultExtractor/TermAggregationResultExtractor.php b/src/lib/ResultExtractor/AggregationResultExtractor/TermAggregationResultExtractor.php index ce5e1eb9..97b9a079 100644 --- a/src/lib/ResultExtractor/AggregationResultExtractor/TermAggregationResultExtractor.php +++ b/src/lib/ResultExtractor/AggregationResultExtractor/TermAggregationResultExtractor.php @@ -8,10 +8,10 @@ namespace Ibexa\Solr\ResultExtractor\AggregationResultExtractor; -use eZ\Publish\API\Repository\Values\Content\Query\Aggregation; -use eZ\Publish\API\Repository\Values\Content\Search\AggregationResult; -use eZ\Publish\API\Repository\Values\Content\Search\AggregationResult\TermAggregationResult; -use eZ\Publish\API\Repository\Values\Content\Search\AggregationResult\TermAggregationResultEntry; +use Ibexa\Contracts\Core\Repository\Values\Content\Query\Aggregation; +use Ibexa\Contracts\Core\Repository\Values\Content\Search\AggregationResult; +use Ibexa\Contracts\Core\Repository\Values\Content\Search\AggregationResult\TermAggregationResult; +use Ibexa\Contracts\Core\Repository\Values\Content\Search\AggregationResult\TermAggregationResultEntry; use Ibexa\Contracts\Solr\ResultExtractor\AggregationResultExtractor; use Ibexa\Contracts\Solr\ResultExtractor\AggregationResultExtractor\TermAggregationKeyMapper; use Ibexa\Solr\ResultExtractor\AggregationResultExtractor\TermAggregationKeyMapper\NullAggregationKeyMapper; @@ -19,7 +19,7 @@ final class TermAggregationResultExtractor implements AggregationResultExtractor { - /** @var \EzSystems\EzPlatformSolrSearchEngine\ResultExtractor\AggregationResultExtractor\TermAggregationKeyMapper */ + /** @var \Ibexa\Contracts\Solr\ResultExtractor\AggregationResultExtractor\TermAggregationKeyMapper */ private $keyMapper; /** @var string */ diff --git a/src/lib/ResultExtractor/LoadingResultExtractor.php b/src/lib/ResultExtractor/LoadingResultExtractor.php index eb1a4bca..a336e259 100644 --- a/src/lib/ResultExtractor/LoadingResultExtractor.php +++ b/src/lib/ResultExtractor/LoadingResultExtractor.php @@ -10,8 +10,8 @@ */ namespace Ibexa\Solr\ResultExtractor; -use eZ\Publish\SPI\Persistence\Content\Handler as ContentHandler; -use eZ\Publish\SPI\Persistence\Content\Location\Handler as LocationHandler; +use Ibexa\Contracts\Core\Persistence\Content\Handler as ContentHandler; +use Ibexa\Contracts\Core\Persistence\Content\Location\Handler as LocationHandler; use Ibexa\Solr\Gateway\EndpointRegistry; use Ibexa\Solr\Query\FacetFieldVisitor; use Ibexa\Solr\ResultExtractor; @@ -26,14 +26,14 @@ class LoadingResultExtractor extends ResultExtractor /** * Content handler. * - * @var \eZ\Publish\SPI\Persistence\Content\Handler + * @var \Ibexa\Contracts\Core\Persistence\Content\Handler */ protected $contentHandler; /** * Location handler. * - * @var \eZ\Publish\SPI\Persistence\Content\Location\Handler + * @var \Ibexa\Contracts\Core\Persistence\Content\Location\Handler */ protected $locationHandler; @@ -57,7 +57,7 @@ public function __construct( * * @param mixed $hit * - * @return \eZ\Publish\API\Repository\Values\ValueObject + * @return \Ibexa\Contracts\Core\Repository\Values\ValueObject */ public function extractHit($hit) { diff --git a/src/lib/ResultExtractor/NativeResultExtractor.php b/src/lib/ResultExtractor/NativeResultExtractor.php index 4fc7a4d4..ca5ffd21 100644 --- a/src/lib/ResultExtractor/NativeResultExtractor.php +++ b/src/lib/ResultExtractor/NativeResultExtractor.php @@ -10,8 +10,8 @@ */ namespace Ibexa\Solr\ResultExtractor; -use eZ\Publish\SPI\Persistence\Content\ContentInfo; -use eZ\Publish\SPI\Persistence\Content\Location; +use Ibexa\Contracts\Core\Persistence\Content\ContentInfo; +use Ibexa\Contracts\Core\Persistence\Content\Location; use Ibexa\Solr\ResultExtractor; use RuntimeException; @@ -28,7 +28,7 @@ class NativeResultExtractor extends ResultExtractor * * @param mixed $hit * - * @return \eZ\Publish\API\Repository\Values\ValueObject + * @return \Ibexa\Contracts\Core\Repository\Values\ValueObject */ public function extractHit($hit) { @@ -46,7 +46,7 @@ public function extractHit($hit) /** * @param mixed $hit * - * @return \eZ\Publish\SPI\Persistence\Content\ContentInfo + * @return \Ibexa\Contracts\Core\Persistence\Content\ContentInfo */ protected function extractContentInfoFromHit($hit) { @@ -77,7 +77,7 @@ protected function extractContentInfoFromHit($hit) /** * @param mixed $hit * - * @return \eZ\Publish\SPI\Persistence\Content\Location + * @return \Ibexa\Contracts\Core\Persistence\Content\Location */ protected function extractLocationFromHit($hit) { diff --git a/tests/bootstrap.php b/tests/bootstrap.php index a1c626ed..5acc610b 100644 --- a/tests/bootstrap.php +++ b/tests/bootstrap.php @@ -4,7 +4,6 @@ * @copyright Copyright (C) eZ Systems AS. All rights reserved. * @license For full copyright and license information view LICENSE file distributed with this source code. */ - $file = __DIR__ . '/../vendor/autoload.php'; if (!file_exists($file)) { throw new RuntimeException('Install dependencies using composer to run the test suite.'); diff --git a/tests/bundle/DependencyInjection/IbexaSolrExtensionExtensionTest.php b/tests/bundle/DependencyInjection/IbexaSolrExtensionExtensionTest.php index cf8f8cee..08302792 100644 --- a/tests/bundle/DependencyInjection/IbexaSolrExtensionExtensionTest.php +++ b/tests/bundle/DependencyInjection/IbexaSolrExtensionExtensionTest.php @@ -17,7 +17,7 @@ class IbexaSolrExtensionExtensionTest extends AbstractExtensionTestCase { /** - * @var \EzSystems\EzPlatformSolrSearchEngineBundle\DependencyInjection\EzSystemsEzPlatformSolrSearchEngineExtension + * @var \Ibexa\Bundle\Solr\DependencyInjection\IbexaSolrExtension */ private $extension; diff --git a/tests/lib/CoreFilter/CoreFilterRegistryTest.php b/tests/lib/CoreFilter/CoreFilterRegistryTest.php index 97c5f978..e869193c 100644 --- a/tests/lib/CoreFilter/CoreFilterRegistryTest.php +++ b/tests/lib/CoreFilter/CoreFilterRegistryTest.php @@ -81,7 +81,7 @@ public function testGetCoreFilters(): void } /** - * @return \EzSystems\EzPlatformSolrSearchEngine\CoreFilter|\PHPUnit\Framework\MockObject\MockObject + * @return \Ibexa\Solr\CoreFilter|\PHPUnit\Framework\MockObject\MockObject */ private function getCoreFilterMock(): CoreFilter { diff --git a/tests/lib/Gateway/GatewayRegistryTest.php b/tests/lib/Gateway/GatewayRegistryTest.php index 43a9ac19..6878a36f 100644 --- a/tests/lib/Gateway/GatewayRegistryTest.php +++ b/tests/lib/Gateway/GatewayRegistryTest.php @@ -83,7 +83,7 @@ public function testGetGateways(): void } /** - * @return \EzSystems\EzPlatformSolrSearchEngine\Gateway|\PHPUnit\Framework\MockObject\MockObject + * @return \Ibexa\Solr\Gateway|\PHPUnit\Framework\MockObject\MockObject */ private function getGatewayMock(): Gateway { diff --git a/tests/lib/Search/FieldMapper/BoostFactorProviderTest.php b/tests/lib/Search/FieldMapper/BoostFactorProviderTest.php index 1e7b6097..735afeca 100644 --- a/tests/lib/Search/FieldMapper/BoostFactorProviderTest.php +++ b/tests/lib/Search/FieldMapper/BoostFactorProviderTest.php @@ -8,8 +8,8 @@ */ namespace Ibexa\Tests\Solr\Search\FieldMapper; -use eZ\Publish\SPI\Persistence\Content\Type as SPIContentType; -use eZ\Publish\SPI\Persistence\Content\Type\FieldDefinition as SPIFieldDefinition; +use Ibexa\Contracts\Core\Persistence\Content\Type as SPIContentType; +use Ibexa\Contracts\Core\Persistence\Content\Type\FieldDefinition as SPIFieldDefinition; use Ibexa\Solr\FieldMapper\BoostFactorProvider; use Ibexa\Tests\Solr\Search\TestCase; diff --git a/tests/lib/Search/FieldMapper/IndexingDepthProviderTest.php b/tests/lib/Search/FieldMapper/IndexingDepthProviderTest.php index a3ee26d8..87458137 100644 --- a/tests/lib/Search/FieldMapper/IndexingDepthProviderTest.php +++ b/tests/lib/Search/FieldMapper/IndexingDepthProviderTest.php @@ -8,7 +8,7 @@ namespace Ibexa\Tests\Solr\Search\FieldMapper; -use eZ\Publish\SPI\Persistence\Content\Type as SPIContentType; +use Ibexa\Contracts\Core\Persistence\Content\Type as SPIContentType; use Ibexa\Solr\FieldMapper\IndexingDepthProvider; use PHPUnit\Framework\TestCase; diff --git a/tests/lib/Search/Gateway/DistributionStrategy/CloudDistributionStrategyTest.php b/tests/lib/Search/Gateway/DistributionStrategy/CloudDistributionStrategyTest.php index 3071e727..0e137d81 100644 --- a/tests/lib/Search/Gateway/DistributionStrategy/CloudDistributionStrategyTest.php +++ b/tests/lib/Search/Gateway/DistributionStrategy/CloudDistributionStrategyTest.php @@ -16,13 +16,13 @@ class CloudDistributionStrategyTest extends TestCase { - /** @var \EzSystems\EzPlatformSolrSearchEngine\Gateway\DistributionStrategy\CloudDistributionStrategy */ + /** @var \Ibexa\Solr\Gateway\DistributionStrategy\CloudDistributionStrategy */ private $distributionStrategy; - /** @var \EzSystems\EzPlatformSolrSearchEngine\Gateway\EndpointResolver|\PHPUnit\Framework\MockObject\MockObject */ + /** @var \Ibexa\Solr\Gateway\EndpointResolver|\PHPUnit\Framework\MockObject\MockObject */ private $endpointResolver; - /** @var \EzSystems\EzPlatformSolrSearchEngine\Gateway\EndpointRegistry|\PHPUnit\Framework\MockObject\MockObject */ + /** @var \Ibexa\Solr\Gateway\EndpointRegistry|\PHPUnit\Framework\MockObject\MockObject */ private $endpointRegistry; protected function setUp(): void diff --git a/tests/lib/Search/Gateway/DistributionStrategy/StandaloneDistributionStrategyTest.php b/tests/lib/Search/Gateway/DistributionStrategy/StandaloneDistributionStrategyTest.php index 1d3b2091..d20f8d81 100644 --- a/tests/lib/Search/Gateway/DistributionStrategy/StandaloneDistributionStrategyTest.php +++ b/tests/lib/Search/Gateway/DistributionStrategy/StandaloneDistributionStrategyTest.php @@ -17,13 +17,13 @@ class StandaloneDistributionStrategyTest extends TestCase { - /** @var \EzSystems\EzPlatformSolrSearchEngine\Gateway\DistributionStrategy\StandaloneDistributionStrategy */ + /** @var \Ibexa\Solr\Gateway\DistributionStrategy\StandaloneDistributionStrategy */ private $distributionStrategy; - /** @var \EzSystems\EzPlatformSolrSearchEngine\Gateway\EndpointRegistry|\PHPUnit\Framework\MockObject\MockObject */ + /** @var \Ibexa\Solr\Gateway\EndpointRegistry|\PHPUnit\Framework\MockObject\MockObject */ private $endpointRegistry; - /** @var \EzSystems\EzPlatformSolrSearchEngine\Gateway\EndpointResolver|\PHPUnit\Framework\MockObject\MockObject */ + /** @var \Ibexa\Solr\Gateway\EndpointResolver|\PHPUnit\Framework\MockObject\MockObject */ private $endpointResolver; protected function setUp(): void diff --git a/tests/lib/Search/Gateway/EndpointTest.php b/tests/lib/Search/Gateway/EndpointTest.php index d8162709..d97107d0 100644 --- a/tests/lib/Search/Gateway/EndpointTest.php +++ b/tests/lib/Search/Gateway/EndpointTest.php @@ -10,7 +10,7 @@ */ namespace Ibexa\Tests\Solr\Search\Gateway; -use eZ\Publish\API\Repository\Exceptions\PropertyNotFoundException; +use Ibexa\Contracts\Core\Repository\Exceptions\PropertyNotFoundException; use Ibexa\Solr\Gateway\Endpoint; use Ibexa\Tests\Solr\Search\TestCase; diff --git a/tests/lib/Search/Query/Common/AggregationVisitor/AbstractAggregationVisitorTest.php b/tests/lib/Search/Query/Common/AggregationVisitor/AbstractAggregationVisitorTest.php index a08267d4..3ea3ab5e 100644 --- a/tests/lib/Search/Query/Common/AggregationVisitor/AbstractAggregationVisitorTest.php +++ b/tests/lib/Search/Query/Common/AggregationVisitor/AbstractAggregationVisitorTest.php @@ -8,7 +8,7 @@ namespace Ibexa\Tests\Solr\Search\Query\Common\AggregationVisitor; -use eZ\Publish\API\Repository\Values\Content\Query\Aggregation; +use Ibexa\Contracts\Core\Repository\Values\Content\Query\Aggregation; use Ibexa\Contracts\Solr\Query\AggregationVisitor; use PHPUnit\Framework\TestCase; @@ -18,10 +18,10 @@ abstract class AbstractAggregationVisitorTest extends TestCase 'languageCode' => 'eng-gb', ]; - /** @var \EzSystems\EzPlatformSolrSearchEngine\Query\AggregationVisitor */ + /** @var \Ibexa\Contracts\Solr\Query\AggregationVisitor */ protected $visitor; - /** @var \EzSystems\EzPlatformSolrSearchEngine\Query\AggregationVisitor|\PHPUnit\Framework\MockObject\MockObject */ + /** @var \Ibexa\Contracts\Solr\Query\AggregationVisitor|\PHPUnit\Framework\MockObject\MockObject */ protected $dispatcherVisitor; protected function setUp(): void diff --git a/tests/lib/Search/Query/Common/AggregationVisitor/AggregationFieldResolver/SearchFieldAggregationFieldResolverTest.php b/tests/lib/Search/Query/Common/AggregationVisitor/AggregationFieldResolver/SearchFieldAggregationFieldResolverTest.php index 952b19e1..240b1e0b 100644 --- a/tests/lib/Search/Query/Common/AggregationVisitor/AggregationFieldResolver/SearchFieldAggregationFieldResolverTest.php +++ b/tests/lib/Search/Query/Common/AggregationVisitor/AggregationFieldResolver/SearchFieldAggregationFieldResolverTest.php @@ -8,7 +8,7 @@ namespace Ibexa\Tests\Solr\Search\Query\Common\AggregationVisitor\AggregationFieldResolver; -use eZ\Publish\API\Repository\Values\Content\Query\Aggregation; +use Ibexa\Contracts\Core\Repository\Values\Content\Query\Aggregation; use Ibexa\Solr\Query\Common\AggregationVisitor\AggregationFieldResolver\SearchFieldAggregationFieldResolver; use PHPUnit\Framework\TestCase; diff --git a/tests/lib/Search/Query/Common/AggregationVisitor/DateMetadataRangeAggregationVisitorTest.php b/tests/lib/Search/Query/Common/AggregationVisitor/DateMetadataRangeAggregationVisitorTest.php index 84cfa92c..c52d86e4 100644 --- a/tests/lib/Search/Query/Common/AggregationVisitor/DateMetadataRangeAggregationVisitorTest.php +++ b/tests/lib/Search/Query/Common/AggregationVisitor/DateMetadataRangeAggregationVisitorTest.php @@ -9,9 +9,9 @@ namespace Ibexa\Tests\Solr\Search\Query\Common\AggregationVisitor; use DateTime; -use eZ\Publish\API\Repository\Values\Content\Query\Aggregation\DateMetadataRangeAggregation; -use eZ\Publish\API\Repository\Values\Content\Query\Aggregation\Range; -use eZ\Publish\API\Repository\Values\Content\Query\Aggregation; +use Ibexa\Contracts\Core\Repository\Values\Content\Query\Aggregation\DateMetadataRangeAggregation; +use Ibexa\Contracts\Core\Repository\Values\Content\Query\Aggregation\Range; +use Ibexa\Contracts\Core\Repository\Values\Content\Query\Aggregation; use Ibexa\Contracts\Solr\Query\AggregationVisitor; use Ibexa\Solr\Query\Common\AggregationVisitor\DateMetadataRangeAggregationVisitor; diff --git a/tests/lib/Search/Query/Common/AggregationVisitor/DispatcherAggregationVisitorTest.php b/tests/lib/Search/Query/Common/AggregationVisitor/DispatcherAggregationVisitorTest.php index d6f2c742..68608de8 100644 --- a/tests/lib/Search/Query/Common/AggregationVisitor/DispatcherAggregationVisitorTest.php +++ b/tests/lib/Search/Query/Common/AggregationVisitor/DispatcherAggregationVisitorTest.php @@ -8,7 +8,7 @@ namespace Ibexa\Tests\Solr\Search\Query\Common\AggregationVisitor; -use eZ\Publish\API\Repository\Values\Content\Query\Aggregation; +use Ibexa\Contracts\Core\Repository\Values\Content\Query\Aggregation; use Ibexa\Contracts\Solr\Query\AggregationVisitor; use Ibexa\Solr\Query\Common\AggregationVisitor\DispatcherAggregationVisitor; use Ibexa\Tests\Solr\Search\TestCase; diff --git a/tests/lib/Search/Query/Common/AggregationVisitor/ObjectStateGroupAggregationVisitorTest.php b/tests/lib/Search/Query/Common/AggregationVisitor/ObjectStateGroupAggregationVisitorTest.php index e5d718df..767a79cb 100644 --- a/tests/lib/Search/Query/Common/AggregationVisitor/ObjectStateGroupAggregationVisitorTest.php +++ b/tests/lib/Search/Query/Common/AggregationVisitor/ObjectStateGroupAggregationVisitorTest.php @@ -8,8 +8,8 @@ namespace Ibexa\Tests\Solr\Search\Query\Common\AggregationVisitor; -use eZ\Publish\API\Repository\Values\Content\Query\Aggregation\ObjectStateTermAggregation; -use eZ\Publish\API\Repository\Values\Content\Query\Aggregation; +use Ibexa\Contracts\Core\Repository\Values\Content\Query\Aggregation\ObjectStateTermAggregation; +use Ibexa\Contracts\Core\Repository\Values\Content\Query\Aggregation; use Ibexa\Contracts\Solr\Query\AggregationVisitor; use Ibexa\Solr\Query\Common\AggregationVisitor\ObjectStateAggregationVisitor; diff --git a/tests/lib/Search/Query/Common/AggregationVisitor/RangeAggregationVisitorTest.php b/tests/lib/Search/Query/Common/AggregationVisitor/RangeAggregationVisitorTest.php index 1de964f6..2d72e8d1 100644 --- a/tests/lib/Search/Query/Common/AggregationVisitor/RangeAggregationVisitorTest.php +++ b/tests/lib/Search/Query/Common/AggregationVisitor/RangeAggregationVisitorTest.php @@ -8,16 +8,16 @@ namespace Ibexa\Tests\Solr\Search\Query\Common\AggregationVisitor; -use eZ\Publish\API\Repository\Values\Content\Query\Aggregation\AbstractRangeAggregation; -use eZ\Publish\API\Repository\Values\Content\Query\Aggregation\Range; -use eZ\Publish\API\Repository\Values\Content\Query\Aggregation; +use Ibexa\Contracts\Core\Repository\Values\Content\Query\Aggregation\AbstractRangeAggregation; +use Ibexa\Contracts\Core\Repository\Values\Content\Query\Aggregation\Range; +use Ibexa\Contracts\Core\Repository\Values\Content\Query\Aggregation; use Ibexa\Contracts\Solr\Query\AggregationVisitor; use Ibexa\Contracts\Solr\Query\Common\AggregationVisitor\AggregationFieldResolver; use Ibexa\Solr\Query\Common\AggregationVisitor\RangeAggregationVisitor; final class RangeAggregationVisitorTest extends AbstractAggregationVisitorTest { - /** @var \EzSystems\EzPlatformSolrSearchEngine\Query\Common\AggregationVisitor\AggregationFieldResolver|\PHPUnit\Framework\MockObject\MockObject */ + /** @var \Ibexa\Contracts\Solr\Query\Common\AggregationVisitor\AggregationFieldResolver|\PHPUnit\Framework\MockObject\MockObject */ private $aggregationFieldResolver; protected function setUp(): void diff --git a/tests/lib/Search/Query/Common/AggregationVisitor/StatsAggregationVisitorTest.php b/tests/lib/Search/Query/Common/AggregationVisitor/StatsAggregationVisitorTest.php index 7b369f27..6be70a77 100644 --- a/tests/lib/Search/Query/Common/AggregationVisitor/StatsAggregationVisitorTest.php +++ b/tests/lib/Search/Query/Common/AggregationVisitor/StatsAggregationVisitorTest.php @@ -8,15 +8,15 @@ namespace Ibexa\Tests\Solr\Search\Query\Common\AggregationVisitor; -use eZ\Publish\API\Repository\Values\Content\Query\Aggregation\AbstractStatsAggregation; -use eZ\Publish\API\Repository\Values\Content\Query\Aggregation; +use Ibexa\Contracts\Core\Repository\Values\Content\Query\Aggregation\AbstractStatsAggregation; +use Ibexa\Contracts\Core\Repository\Values\Content\Query\Aggregation; use Ibexa\Contracts\Solr\Query\AggregationVisitor; use Ibexa\Contracts\Solr\Query\Common\AggregationVisitor\AggregationFieldResolver; use Ibexa\Solr\Query\Common\AggregationVisitor\StatsAggregationVisitor; final class StatsAggregationVisitorTest extends AbstractAggregationVisitorTest { - /** @var \EzSystems\EzPlatformSolrSearchEngine\Query\Common\AggregationVisitor\AggregationFieldResolver|\PHPUnit\Framework\MockObject\MockObject */ + /** @var \Ibexa\Contracts\Solr\Query\Common\AggregationVisitor\AggregationFieldResolver|\PHPUnit\Framework\MockObject\MockObject */ private $aggregationFieldResolver; protected function setUp(): void diff --git a/tests/lib/Search/Query/Common/AggregationVisitor/SubtreeTermAggregationVisitorTest.php b/tests/lib/Search/Query/Common/AggregationVisitor/SubtreeTermAggregationVisitorTest.php index 011f2e9b..aba6e09a 100644 --- a/tests/lib/Search/Query/Common/AggregationVisitor/SubtreeTermAggregationVisitorTest.php +++ b/tests/lib/Search/Query/Common/AggregationVisitor/SubtreeTermAggregationVisitorTest.php @@ -8,8 +8,8 @@ namespace Ibexa\Tests\Solr\Search\Query\Common\AggregationVisitor; -use eZ\Publish\API\Repository\Values\Content\Query\Aggregation; -use eZ\Publish\API\Repository\Values\Content\Query\Aggregation\Location\SubtreeTermAggregation; +use Ibexa\Contracts\Core\Repository\Values\Content\Query\Aggregation; +use Ibexa\Contracts\Core\Repository\Values\Content\Query\Aggregation\Location\SubtreeTermAggregation; use Ibexa\Contracts\Solr\Query\AggregationVisitor; use Ibexa\Solr\Query\Common\AggregationVisitor\SubtreeTermAggregationVisitor; diff --git a/tests/lib/Search/Query/Common/AggregationVisitor/TermAggregationVisitorTest.php b/tests/lib/Search/Query/Common/AggregationVisitor/TermAggregationVisitorTest.php index 513413c5..3cd5e28d 100644 --- a/tests/lib/Search/Query/Common/AggregationVisitor/TermAggregationVisitorTest.php +++ b/tests/lib/Search/Query/Common/AggregationVisitor/TermAggregationVisitorTest.php @@ -8,15 +8,15 @@ namespace Ibexa\Tests\Solr\Search\Query\Common\AggregationVisitor; -use eZ\Publish\API\Repository\Values\Content\Query\Aggregation\AbstractTermAggregation; -use eZ\Publish\API\Repository\Values\Content\Query\Aggregation; +use Ibexa\Contracts\Core\Repository\Values\Content\Query\Aggregation\AbstractTermAggregation; +use Ibexa\Contracts\Core\Repository\Values\Content\Query\Aggregation; use Ibexa\Contracts\Solr\Query\AggregationVisitor; use Ibexa\Contracts\Solr\Query\Common\AggregationVisitor\AggregationFieldResolver; use Ibexa\Solr\Query\Common\AggregationVisitor\TermAggregationVisitor; final class TermAggregationVisitorTest extends AbstractAggregationVisitorTest { - /** @var \EzSystems\EzPlatformSolrSearchEngine\Query\Common\AggregationVisitor\AggregationFieldResolver|\PHPUnit\Framework\MockObject\MockObject */ + /** @var \Ibexa\Contracts\Solr\Query\Common\AggregationVisitor\AggregationFieldResolver|\PHPUnit\Framework\MockObject\MockObject */ private $aggregationFieldResolver; protected function setUp(): void diff --git a/tests/lib/Search/Query/Common/AggregationVisitor/UserMetadataTermAggregationVisitorTest.php b/tests/lib/Search/Query/Common/AggregationVisitor/UserMetadataTermAggregationVisitorTest.php index 2598d0b7..64ddc8cf 100644 --- a/tests/lib/Search/Query/Common/AggregationVisitor/UserMetadataTermAggregationVisitorTest.php +++ b/tests/lib/Search/Query/Common/AggregationVisitor/UserMetadataTermAggregationVisitorTest.php @@ -8,8 +8,8 @@ namespace Ibexa\Tests\Solr\Search\Query\Common\AggregationVisitor; -use eZ\Publish\API\Repository\Values\Content\Query\Aggregation\UserMetadataTermAggregation; -use eZ\Publish\API\Repository\Values\Content\Query\Aggregation; +use Ibexa\Contracts\Core\Repository\Values\Content\Query\Aggregation\UserMetadataTermAggregation; +use Ibexa\Contracts\Core\Repository\Values\Content\Query\Aggregation; use Ibexa\Contracts\Solr\Query\AggregationVisitor; use Ibexa\Solr\Query\Common\AggregationVisitor\UserMetadataTermAggregationVisitor; diff --git a/tests/lib/Search/Query/Content/CriterionVisitor/FullTextTest.php b/tests/lib/Search/Query/Content/CriterionVisitor/FullTextTest.php index ee67038b..9aa62126 100644 --- a/tests/lib/Search/Query/Content/CriterionVisitor/FullTextTest.php +++ b/tests/lib/Search/Query/Content/CriterionVisitor/FullTextTest.php @@ -10,10 +10,10 @@ */ namespace Ibexa\Tests\Solr\Search\Query\Content\CriterionVisitor; -use eZ\Publish\API\Repository\Values\Content\Query\Criterion; -use eZ\Publish\Core\FieldType\TextLine\SearchField; -use eZ\Publish\Core\Search\Common\FieldNameResolver; -use eZ\Publish\SPI\Search\FieldType\StringField; +use Ibexa\Contracts\Core\Repository\Values\Content\Query\Criterion; +use Ibexa\Core\FieldType\TextLine\SearchField; +use Ibexa\Core\Search\Common\FieldNameResolver; +use Ibexa\Contracts\Core\Search\FieldType\StringField; use Ibexa\Solr\Query\Common\QueryTranslator\Generator\WordVisitor; use Ibexa\Solr\Query\Content\CriterionVisitor\FullText; use Ibexa\Tests\Solr\Search\TestCase; @@ -59,7 +59,7 @@ protected function getFullTextCriterionVisitor(array $fieldTypes = [], int $maxD $fieldTypes ); - /** @var \eZ\Publish\Core\Search\Common\FieldNameResolver $fieldNameResolver */ + /** @var \Ibexa\Core\Search\Common\FieldNameResolver $fieldNameResolver */ return new FullText( $fieldNameResolver, $this->getTokenizer(), diff --git a/tests/lib/Search/ResultExtractor/AggregationResultExtractor/AbstractAggregationResultExtractorTest.php b/tests/lib/Search/ResultExtractor/AggregationResultExtractor/AbstractAggregationResultExtractorTest.php index 080c77d3..aa421715 100644 --- a/tests/lib/Search/ResultExtractor/AggregationResultExtractor/AbstractAggregationResultExtractorTest.php +++ b/tests/lib/Search/ResultExtractor/AggregationResultExtractor/AbstractAggregationResultExtractorTest.php @@ -8,8 +8,8 @@ namespace Ibexa\Tests\Solr\Search\ResultExtractor\AggregationResultExtractor; -use eZ\Publish\API\Repository\Values\Content\Query\Aggregation; -use eZ\Publish\API\Repository\Values\Content\Search\AggregationResult; +use Ibexa\Contracts\Core\Repository\Values\Content\Query\Aggregation; +use Ibexa\Contracts\Core\Repository\Values\Content\Search\AggregationResult; use Ibexa\Contracts\Solr\ResultExtractor\AggregationResultExtractor; use PHPUnit\Framework\TestCase; use stdClass; @@ -19,7 +19,7 @@ abstract class AbstractAggregationResultExtractorTest extends TestCase protected const EXAMPLE_AGGREGATION_NAME = 'custom_aggregation'; protected const EXAMPLE_LANGUAGE_FILTER = []; - /** @var \EzSystems\EzPlatformSolrSearchEngine\ResultExtractor\AggregationResultExtractor */ + /** @var \Ibexa\Contracts\Solr\ResultExtractor\AggregationResultExtractor */ protected $extractor; protected function setUp(): void diff --git a/tests/lib/Search/ResultExtractor/AggregationResultExtractor/DispatcherAggregationResultExtractorTest.php b/tests/lib/Search/ResultExtractor/AggregationResultExtractor/DispatcherAggregationResultExtractorTest.php index 172baff7..48ee21ef 100644 --- a/tests/lib/Search/ResultExtractor/AggregationResultExtractor/DispatcherAggregationResultExtractorTest.php +++ b/tests/lib/Search/ResultExtractor/AggregationResultExtractor/DispatcherAggregationResultExtractorTest.php @@ -8,9 +8,9 @@ namespace Ibexa\Tests\Solr\Search\ResultExtractor\AggregationResultExtractor; -use eZ\Publish\API\Repository\Exceptions\NotImplementedException; -use eZ\Publish\API\Repository\Values\Content\Query\Aggregation; -use eZ\Publish\API\Repository\Values\Content\Search\AggregationResult; +use Ibexa\Contracts\Core\Repository\Exceptions\NotImplementedException; +use Ibexa\Contracts\Core\Repository\Values\Content\Query\Aggregation; +use Ibexa\Contracts\Core\Repository\Values\Content\Search\AggregationResult; use Ibexa\Contracts\Solr\ResultExtractor\AggregationResultExtractor; use Ibexa\Solr\ResultExtractor\AggregationResultExtractor\DispatcherAggregationResultExtractor; use PHPUnit\Framework\TestCase; diff --git a/tests/lib/Search/ResultExtractor/AggregationResultExtractor/NestedAggregationResultExtractorTest.php b/tests/lib/Search/ResultExtractor/AggregationResultExtractor/NestedAggregationResultExtractorTest.php index 2004347c..df86fa49 100644 --- a/tests/lib/Search/ResultExtractor/AggregationResultExtractor/NestedAggregationResultExtractorTest.php +++ b/tests/lib/Search/ResultExtractor/AggregationResultExtractor/NestedAggregationResultExtractorTest.php @@ -8,8 +8,8 @@ namespace Ibexa\Tests\Solr\Search\ResultExtractor\AggregationResultExtractor; -use eZ\Publish\API\Repository\Values\Content\Query\Aggregation; -use eZ\Publish\API\Repository\Values\Content\Search\AggregationResult; +use Ibexa\Contracts\Core\Repository\Values\Content\Query\Aggregation; +use Ibexa\Contracts\Core\Repository\Values\Content\Search\AggregationResult; use Ibexa\Contracts\Solr\ResultExtractor\AggregationResultExtractor; use Ibexa\Solr\ResultExtractor\AggregationResultExtractor\NestedAggregationResultExtractor; use PHPUnit\Framework\TestCase; @@ -19,10 +19,10 @@ final class NestedAggregationResultExtractorTest extends TestCase { private const EXAMPLE_NESTED_RESULT_KEY = 'foo'; - /** @var \EzSystems\EzPlatformSolrSearchEngine\ResultExtractor\AggregationResultExtractor|\PHPUnit\Framework\MockObject\MockObject */ + /** @var \Ibexa\Contracts\Solr\ResultExtractor\AggregationResultExtractor|\PHPUnit\Framework\MockObject\MockObject */ private $innerResultExtractor; - /** @var \EzSystems\EzPlatformSolrSearchEngine\ResultExtractor\AggregationResultExtractor\NestedAggregationResultExtractor */ + /** @var \Ibexa\Solr\ResultExtractor\AggregationResultExtractor\NestedAggregationResultExtractor */ private $resultExtractor; protected function setUp(): void diff --git a/tests/lib/Search/ResultExtractor/AggregationResultExtractor/RangeAggregationKeyMapper/AbstractRangeAggregationKeyMapperTest.php b/tests/lib/Search/ResultExtractor/AggregationResultExtractor/RangeAggregationKeyMapper/AbstractRangeAggregationKeyMapperTest.php index a18bac02..dfd3b5e6 100644 --- a/tests/lib/Search/ResultExtractor/AggregationResultExtractor/RangeAggregationKeyMapper/AbstractRangeAggregationKeyMapperTest.php +++ b/tests/lib/Search/ResultExtractor/AggregationResultExtractor/RangeAggregationKeyMapper/AbstractRangeAggregationKeyMapperTest.php @@ -8,7 +8,7 @@ namespace Ibexa\Tests\Solr\Search\ResultExtractor\AggregationResultExtractor\RangeAggregationKeyMapper; -use eZ\Publish\API\Repository\Values\Content\Query\Aggregation; +use Ibexa\Contracts\Core\Repository\Values\Content\Query\Aggregation; use Ibexa\Contracts\Solr\ResultExtractor\AggregationResultExtractor\RangeAggregationKeyMapper; use PHPUnit\Framework\TestCase; diff --git a/tests/lib/Search/ResultExtractor/AggregationResultExtractor/RangeAggregationResultExtractorTest.php b/tests/lib/Search/ResultExtractor/AggregationResultExtractor/RangeAggregationResultExtractorTest.php index a91a6b73..2c1d1b68 100644 --- a/tests/lib/Search/ResultExtractor/AggregationResultExtractor/RangeAggregationResultExtractorTest.php +++ b/tests/lib/Search/ResultExtractor/AggregationResultExtractor/RangeAggregationResultExtractorTest.php @@ -8,11 +8,11 @@ namespace Ibexa\Tests\Solr\Search\ResultExtractor\AggregationResultExtractor; -use eZ\Publish\API\Repository\Values\Content\Query\Aggregation\AbstractRangeAggregation; -use eZ\Publish\API\Repository\Values\Content\Query\Aggregation\Range; -use eZ\Publish\API\Repository\Values\Content\Query\Aggregation; -use eZ\Publish\API\Repository\Values\Content\Search\AggregationResult\RangeAggregationResult; -use eZ\Publish\API\Repository\Values\Content\Search\AggregationResult\RangeAggregationResultEntry; +use Ibexa\Contracts\Core\Repository\Values\Content\Query\Aggregation\AbstractRangeAggregation; +use Ibexa\Contracts\Core\Repository\Values\Content\Query\Aggregation\Range; +use Ibexa\Contracts\Core\Repository\Values\Content\Query\Aggregation; +use Ibexa\Contracts\Core\Repository\Values\Content\Search\AggregationResult\RangeAggregationResult; +use Ibexa\Contracts\Core\Repository\Values\Content\Search\AggregationResult\RangeAggregationResultEntry; use Ibexa\Contracts\Solr\ResultExtractor\AggregationResultExtractor; use Ibexa\Contracts\Solr\ResultExtractor\AggregationResultExtractor\RangeAggregationKeyMapper; use Ibexa\Solr\ResultExtractor\AggregationResultExtractor\RangeAggregationResultExtractor; @@ -20,7 +20,7 @@ final class RangeAggregationResultExtractorTest extends AbstractAggregationResultExtractorTest { - /** @var \EzSystems\EzPlatformSolrSearchEngine\ResultExtractor\AggregationResultExtractor\RangeAggregationKeyMapper|\PHPUnit\Framework\MockObject\MockObject */ + /** @var \Ibexa\Contracts\Solr\ResultExtractor\AggregationResultExtractor\RangeAggregationKeyMapper|\PHPUnit\Framework\MockObject\MockObject */ private $keyMapper; protected function setUp(): void diff --git a/tests/lib/Search/ResultExtractor/AggregationResultExtractor/StatsAggregationResultExtractorTest.php b/tests/lib/Search/ResultExtractor/AggregationResultExtractor/StatsAggregationResultExtractorTest.php index f7c46b23..adda8f7f 100644 --- a/tests/lib/Search/ResultExtractor/AggregationResultExtractor/StatsAggregationResultExtractorTest.php +++ b/tests/lib/Search/ResultExtractor/AggregationResultExtractor/StatsAggregationResultExtractorTest.php @@ -8,9 +8,9 @@ namespace Ibexa\Tests\Solr\Search\ResultExtractor\AggregationResultExtractor; -use eZ\Publish\API\Repository\Values\Content\Query\Aggregation\AbstractStatsAggregation; -use eZ\Publish\API\Repository\Values\Content\Query\Aggregation; -use eZ\Publish\API\Repository\Values\Content\Search\AggregationResult\StatsAggregationResult; +use Ibexa\Contracts\Core\Repository\Values\Content\Query\Aggregation\AbstractStatsAggregation; +use Ibexa\Contracts\Core\Repository\Values\Content\Query\Aggregation; +use Ibexa\Contracts\Core\Repository\Values\Content\Search\AggregationResult\StatsAggregationResult; use Ibexa\Contracts\Solr\ResultExtractor\AggregationResultExtractor; use Ibexa\Solr\ResultExtractor\AggregationResultExtractor\StatsAggregationResultExtractor; use stdClass; diff --git a/tests/lib/Search/ResultExtractor/AggregationResultExtractor/TermAggregationKeyMapper/AuthorAggregationKeyMapperTest.php b/tests/lib/Search/ResultExtractor/AggregationResultExtractor/TermAggregationKeyMapper/AuthorAggregationKeyMapperTest.php index 4239d868..c2eb1b1d 100644 --- a/tests/lib/Search/ResultExtractor/AggregationResultExtractor/TermAggregationKeyMapper/AuthorAggregationKeyMapperTest.php +++ b/tests/lib/Search/ResultExtractor/AggregationResultExtractor/TermAggregationKeyMapper/AuthorAggregationKeyMapperTest.php @@ -8,9 +8,9 @@ namespace Ibexa\Tests\Solr\Search\ResultExtractor\AggregationResultExtractor\TermAggregationKeyMapper; -use eZ\Publish\API\Repository\Values\Content\Query\Aggregation; -use eZ\Publish\API\Repository\Values\Content\Query\Aggregation\Field\AuthorTermAggregation; -use eZ\Publish\Core\FieldType\Author\Author; +use Ibexa\Contracts\Core\Repository\Values\Content\Query\Aggregation; +use Ibexa\Contracts\Core\Repository\Values\Content\Query\Aggregation\Field\AuthorTermAggregation; +use Ibexa\Core\FieldType\Author\Author; use Ibexa\Solr\ResultExtractor\AggregationResultExtractor\TermAggregationKeyMapper\AuthorAggregationKeyMapper; use Ibexa\Tests\Solr\Search\ResultExtractor\AggregationResultExtractor\AggregationResultExtractorTestUtils; use PHPUnit\Framework\TestCase; diff --git a/tests/lib/Search/ResultExtractor/AggregationResultExtractor/TermAggregationKeyMapper/BooleanAggregationKeyMapperTest.php b/tests/lib/Search/ResultExtractor/AggregationResultExtractor/TermAggregationKeyMapper/BooleanAggregationKeyMapperTest.php index 89a15166..1a833991 100644 --- a/tests/lib/Search/ResultExtractor/AggregationResultExtractor/TermAggregationKeyMapper/BooleanAggregationKeyMapperTest.php +++ b/tests/lib/Search/ResultExtractor/AggregationResultExtractor/TermAggregationKeyMapper/BooleanAggregationKeyMapperTest.php @@ -8,7 +8,7 @@ namespace Ibexa\Tests\Solr\Search\ResultExtractor\AggregationResultExtractor\TermAggregationKeyMapper; -use eZ\Publish\API\Repository\Values\Content\Query\Aggregation; +use Ibexa\Contracts\Core\Repository\Values\Content\Query\Aggregation; use Ibexa\Solr\ResultExtractor\AggregationResultExtractor\TermAggregationKeyMapper\BooleanAggregationKeyMapper; use Ibexa\Tests\Solr\Search\ResultExtractor\AggregationResultExtractor\AggregationResultExtractorTestUtils; use PHPUnit\Framework\TestCase; diff --git a/tests/lib/Search/ResultExtractor/AggregationResultExtractor/TermAggregationKeyMapper/ContentTypeAggregationKeyMapperTest.php b/tests/lib/Search/ResultExtractor/AggregationResultExtractor/TermAggregationKeyMapper/ContentTypeAggregationKeyMapperTest.php index 68207118..de2e3f1b 100644 --- a/tests/lib/Search/ResultExtractor/AggregationResultExtractor/TermAggregationKeyMapper/ContentTypeAggregationKeyMapperTest.php +++ b/tests/lib/Search/ResultExtractor/AggregationResultExtractor/TermAggregationKeyMapper/ContentTypeAggregationKeyMapperTest.php @@ -8,9 +8,9 @@ namespace Ibexa\Tests\Solr\Search\ResultExtractor\AggregationResultExtractor\TermAggregationKeyMapper; -use eZ\Publish\API\Repository\ContentTypeService; -use eZ\Publish\API\Repository\Values\Content\Query\Aggregation; -use eZ\Publish\API\Repository\Values\ContentType\ContentType; +use Ibexa\Contracts\Core\Repository\ContentTypeService; +use Ibexa\Contracts\Core\Repository\Values\Content\Query\Aggregation; +use Ibexa\Contracts\Core\Repository\Values\ContentType\ContentType; use Ibexa\Solr\ResultExtractor\AggregationResultExtractor\TermAggregationKeyMapper\ContentTypeAggregationKeyMapper; use Ibexa\Tests\Solr\Search\ResultExtractor\AggregationResultExtractor\AggregationResultExtractorTestUtils; use PHPUnit\Framework\TestCase; @@ -19,7 +19,7 @@ final class ContentTypeAggregationKeyMapperTest extends TestCase { private const EXAMPLE_CONTENT_TYPE_IDS = [1, 2, 3]; - /** @var \eZ\Publish\API\Repository\ContentTypeService|\PHPUnit\Framework\MockObject\MockObject */ + /** @var \Ibexa\Contracts\Core\Repository\ContentTypeService|\PHPUnit\Framework\MockObject\MockObject */ private $contentTypeService; protected function setUp(): void diff --git a/tests/lib/Search/ResultExtractor/AggregationResultExtractor/TermAggregationKeyMapper/ContentTypeGroupAggregationKeyMapperTest.php b/tests/lib/Search/ResultExtractor/AggregationResultExtractor/TermAggregationKeyMapper/ContentTypeGroupAggregationKeyMapperTest.php index 93a45896..4e0a22ea 100644 --- a/tests/lib/Search/ResultExtractor/AggregationResultExtractor/TermAggregationKeyMapper/ContentTypeGroupAggregationKeyMapperTest.php +++ b/tests/lib/Search/ResultExtractor/AggregationResultExtractor/TermAggregationKeyMapper/ContentTypeGroupAggregationKeyMapperTest.php @@ -8,9 +8,9 @@ namespace Ibexa\Tests\Solr\Search\ResultExtractor\AggregationResultExtractor\TermAggregationKeyMapper; -use eZ\Publish\API\Repository\ContentTypeService; -use eZ\Publish\API\Repository\Values\Content\Query\Aggregation; -use eZ\Publish\API\Repository\Values\ContentType\ContentTypeGroup; +use Ibexa\Contracts\Core\Repository\ContentTypeService; +use Ibexa\Contracts\Core\Repository\Values\Content\Query\Aggregation; +use Ibexa\Contracts\Core\Repository\Values\ContentType\ContentTypeGroup; use Ibexa\Solr\ResultExtractor\AggregationResultExtractor\TermAggregationKeyMapper\ContentTypeGroupAggregationKeyMapper; use Ibexa\Tests\Solr\Search\ResultExtractor\AggregationResultExtractor\AggregationResultExtractorTestUtils; use PHPUnit\Framework\MockObject\MockObject; @@ -20,7 +20,7 @@ final class ContentTypeGroupAggregationKeyMapperTest extends TestCase { private const EXAMPLE_CONTENT_TYPE_GROUPS_IDS = ['1', '2', '3']; - /** @var MockObject */ + /** @var \PHPUnit\Framework\MockObject\MockObject */ private $contentTypeService; protected function setUp(): void diff --git a/tests/lib/Search/ResultExtractor/AggregationResultExtractor/TermAggregationKeyMapper/CountryAggregationKeyMapperTest.php b/tests/lib/Search/ResultExtractor/AggregationResultExtractor/TermAggregationKeyMapper/CountryAggregationKeyMapperTest.php index 2fb9e1c9..196971cc 100644 --- a/tests/lib/Search/ResultExtractor/AggregationResultExtractor/TermAggregationKeyMapper/CountryAggregationKeyMapperTest.php +++ b/tests/lib/Search/ResultExtractor/AggregationResultExtractor/TermAggregationKeyMapper/CountryAggregationKeyMapperTest.php @@ -4,8 +4,8 @@ namespace Ibexa\Tests\Solr\Search\ResultExtractor\AggregationResultExtractor\TermAggregationKeyMapper; -use eZ\Publish\API\Repository\Values\Content\Query\Aggregation\Field\CountryTermAggregation; -use eZ\Publish\API\Repository\Values\Content\Query\Aggregation; +use Ibexa\Contracts\Core\Repository\Values\Content\Query\Aggregation\Field\CountryTermAggregation; +use Ibexa\Contracts\Core\Repository\Values\Content\Query\Aggregation; use Ibexa\Solr\ResultExtractor\AggregationResultExtractor\TermAggregationKeyMapper\CountryAggregationKeyMapper; use Ibexa\Tests\Solr\Search\ResultExtractor\AggregationResultExtractor\AggregationResultExtractorTestUtils; use PHPUnit\Framework\TestCase; diff --git a/tests/lib/Search/ResultExtractor/AggregationResultExtractor/TermAggregationKeyMapper/InvertedBooleanAggregationKeyMapperTest.php b/tests/lib/Search/ResultExtractor/AggregationResultExtractor/TermAggregationKeyMapper/InvertedBooleanAggregationKeyMapperTest.php index fb7256bf..3cf74447 100644 --- a/tests/lib/Search/ResultExtractor/AggregationResultExtractor/TermAggregationKeyMapper/InvertedBooleanAggregationKeyMapperTest.php +++ b/tests/lib/Search/ResultExtractor/AggregationResultExtractor/TermAggregationKeyMapper/InvertedBooleanAggregationKeyMapperTest.php @@ -8,7 +8,7 @@ namespace Ibexa\Tests\Solr\Search\ResultExtractor\AggregationResultExtractor\TermAggregationKeyMapper; -use eZ\Publish\API\Repository\Values\Content\Query\Aggregation; +use Ibexa\Contracts\Core\Repository\Values\Content\Query\Aggregation; use Ibexa\Solr\ResultExtractor\AggregationResultExtractor\TermAggregationKeyMapper\InvertedBooleanAggregationKeyMapper; use Ibexa\Tests\Solr\Search\ResultExtractor\AggregationResultExtractor\AggregationResultExtractorTestUtils; use PHPUnit\Framework\TestCase; diff --git a/tests/lib/Search/ResultExtractor/AggregationResultExtractor/TermAggregationKeyMapper/LanguageAggregationKeyMapperTest.php b/tests/lib/Search/ResultExtractor/AggregationResultExtractor/TermAggregationKeyMapper/LanguageAggregationKeyMapperTest.php index 23d18116..6d3fd697 100644 --- a/tests/lib/Search/ResultExtractor/AggregationResultExtractor/TermAggregationKeyMapper/LanguageAggregationKeyMapperTest.php +++ b/tests/lib/Search/ResultExtractor/AggregationResultExtractor/TermAggregationKeyMapper/LanguageAggregationKeyMapperTest.php @@ -8,9 +8,9 @@ namespace Ibexa\Tests\Solr\Search\ResultExtractor\AggregationResultExtractor\TermAggregationKeyMapper; -use eZ\Publish\API\Repository\LanguageService; -use eZ\Publish\API\Repository\Values\Content\Language; -use eZ\Publish\API\Repository\Values\Content\Query\Aggregation; +use Ibexa\Contracts\Core\Repository\LanguageService; +use Ibexa\Contracts\Core\Repository\Values\Content\Language; +use Ibexa\Contracts\Core\Repository\Values\Content\Query\Aggregation; use Ibexa\Solr\ResultExtractor\AggregationResultExtractor\TermAggregationKeyMapper\LanguageAggregationKeyMapper; use Ibexa\Tests\Solr\Search\ResultExtractor\AggregationResultExtractor\AggregationResultExtractorTestUtils; use PHPUnit\Framework\TestCase; @@ -19,10 +19,10 @@ final class LanguageAggregationKeyMapperTest extends TestCase { private const EXAMPLE_LANGUAGE_CODES = []; - /** @var \eZ\Publish\API\Repository\LanguageService|\PHPUnit\Framework\MockObject\MockObject */ + /** @var \Ibexa\Contracts\Core\Repository\LanguageService|\PHPUnit\Framework\MockObject\MockObject */ private $languageService; - /** @var \EzSystems\EzPlatformSolrSearchEngine\ResultExtractor\AggregationResultExtractor\TermAggregationKeyMapper\CountryAggregationKeyMapper */ + /** @var \Ibexa\Solr\ResultExtractor\AggregationResultExtractor\TermAggregationKeyMapper\CountryAggregationKeyMapper */ private $mapper; protected function setUp(): void diff --git a/tests/lib/Search/ResultExtractor/AggregationResultExtractor/TermAggregationKeyMapper/LocationAggregationKeyMapperTest.php b/tests/lib/Search/ResultExtractor/AggregationResultExtractor/TermAggregationKeyMapper/LocationAggregationKeyMapperTest.php index 0a8e0f76..4a036348 100644 --- a/tests/lib/Search/ResultExtractor/AggregationResultExtractor/TermAggregationKeyMapper/LocationAggregationKeyMapperTest.php +++ b/tests/lib/Search/ResultExtractor/AggregationResultExtractor/TermAggregationKeyMapper/LocationAggregationKeyMapperTest.php @@ -8,9 +8,9 @@ namespace Ibexa\Tests\Solr\Search\ResultExtractor\AggregationResultExtractor\TermAggregationKeyMapper; -use eZ\Publish\API\Repository\LocationService; -use eZ\Publish\API\Repository\Values\Content\Location; -use eZ\Publish\API\Repository\Values\Content\Query\Aggregation; +use Ibexa\Contracts\Core\Repository\LocationService; +use Ibexa\Contracts\Core\Repository\Values\Content\Location; +use Ibexa\Contracts\Core\Repository\Values\Content\Query\Aggregation; use Ibexa\Solr\ResultExtractor\AggregationResultExtractor\TermAggregationKeyMapper\LocationAggregationKeyMapper; use Ibexa\Tests\Solr\Search\ResultExtractor\AggregationResultExtractor\AggregationResultExtractorTestUtils; use PHPUnit\Framework\TestCase; @@ -19,10 +19,10 @@ final class LocationAggregationKeyMapperTest extends TestCase { private const EXAMPLE_LOCATION_IDS = ['2', '54', '47']; - /** @var \eZ\Publish\API\Repository\LocationService|\PHPUnit\Framework\MockObject\MockObject */ + /** @var \Ibexa\Contracts\Core\Repository\LocationService|\PHPUnit\Framework\MockObject\MockObject */ private $locationService; - /** @var \EzSystems\EzPlatformSolrSearchEngine\ResultExtractor\AggregationResultExtractor\TermAggregationKeyMapper\LocationAggregationKeyMapper */ + /** @var \Ibexa\Solr\ResultExtractor\AggregationResultExtractor\TermAggregationKeyMapper\LocationAggregationKeyMapper */ private $mapper; protected function setUp(): void diff --git a/tests/lib/Search/ResultExtractor/AggregationResultExtractor/TermAggregationKeyMapper/NullAggregationKeyMapperTest.php b/tests/lib/Search/ResultExtractor/AggregationResultExtractor/TermAggregationKeyMapper/NullAggregationKeyMapperTest.php index a947d8eb..ccea2d0d 100644 --- a/tests/lib/Search/ResultExtractor/AggregationResultExtractor/TermAggregationKeyMapper/NullAggregationKeyMapperTest.php +++ b/tests/lib/Search/ResultExtractor/AggregationResultExtractor/TermAggregationKeyMapper/NullAggregationKeyMapperTest.php @@ -8,7 +8,7 @@ namespace Ibexa\Tests\Solr\Search\ResultExtractor\AggregationResultExtractor\TermAggregationKeyMapper; -use eZ\Publish\API\Repository\Values\Content\Query\Aggregation; +use Ibexa\Contracts\Core\Repository\Values\Content\Query\Aggregation; use Ibexa\Solr\ResultExtractor\AggregationResultExtractor\TermAggregationKeyMapper\NullAggregationKeyMapper; use Ibexa\Tests\Solr\Search\ResultExtractor\AggregationResultExtractor\AggregationResultExtractorTestUtils; use PHPUnit\Framework\TestCase; diff --git a/tests/lib/Search/ResultExtractor/AggregationResultExtractor/TermAggregationKeyMapper/ObjectStateAggregationKeyMapperTest.php b/tests/lib/Search/ResultExtractor/AggregationResultExtractor/TermAggregationKeyMapper/ObjectStateAggregationKeyMapperTest.php index b73ef928..7dbf4baa 100644 --- a/tests/lib/Search/ResultExtractor/AggregationResultExtractor/TermAggregationKeyMapper/ObjectStateAggregationKeyMapperTest.php +++ b/tests/lib/Search/ResultExtractor/AggregationResultExtractor/TermAggregationKeyMapper/ObjectStateAggregationKeyMapperTest.php @@ -8,20 +8,20 @@ namespace Ibexa\Tests\Solr\Search\ResultExtractor\AggregationResultExtractor\TermAggregationKeyMapper; -use eZ\Publish\API\Repository\ObjectStateService; -use eZ\Publish\API\Repository\Values\Content\Query\Aggregation\ObjectStateTermAggregation; -use eZ\Publish\API\Repository\Values\ObjectState\ObjectState; -use eZ\Publish\API\Repository\Values\ObjectState\ObjectStateGroup; +use Ibexa\Contracts\Core\Repository\ObjectStateService; +use Ibexa\Contracts\Core\Repository\Values\Content\Query\Aggregation\ObjectStateTermAggregation; +use Ibexa\Contracts\Core\Repository\Values\ObjectState\ObjectState; +use Ibexa\Contracts\Core\Repository\Values\ObjectState\ObjectStateGroup; use Ibexa\Solr\ResultExtractor\AggregationResultExtractor\TermAggregationKeyMapper\ObjectStateAggregationKeyMapper; use Ibexa\Tests\Solr\Search\ResultExtractor\AggregationResultExtractor\AggregationResultExtractorTestUtils; use PHPUnit\Framework\TestCase; final class ObjectStateAggregationKeyMapperTest extends TestCase { - /** @var \eZ\Publish\API\Repository\ObjectStateService|\PHPUnit\Framework\MockObject\MockObject */ + /** @var \Ibexa\Contracts\Core\Repository\ObjectStateService|\PHPUnit\Framework\MockObject\MockObject */ private $objectStateService; - /** @var \EzSystems\EzPlatformSolrSearchEngine\ResultExtractor\AggregationResultExtractor\TermAggregationKeyMapper\ObjectStateAggregationKeyMapper */ + /** @var \Ibexa\Solr\ResultExtractor\AggregationResultExtractor\TermAggregationKeyMapper\ObjectStateAggregationKeyMapper */ private $mapper; protected function setUp(): void diff --git a/tests/lib/Search/ResultExtractor/AggregationResultExtractor/TermAggregationKeyMapper/SectionAggregationKeyMapperTest.php b/tests/lib/Search/ResultExtractor/AggregationResultExtractor/TermAggregationKeyMapper/SectionAggregationKeyMapperTest.php index 0748ddf2..936b4320 100644 --- a/tests/lib/Search/ResultExtractor/AggregationResultExtractor/TermAggregationKeyMapper/SectionAggregationKeyMapperTest.php +++ b/tests/lib/Search/ResultExtractor/AggregationResultExtractor/TermAggregationKeyMapper/SectionAggregationKeyMapperTest.php @@ -8,9 +8,9 @@ namespace Ibexa\Tests\Solr\Search\ResultExtractor\AggregationResultExtractor\TermAggregationKeyMapper; -use eZ\Publish\API\Repository\SectionService; -use eZ\Publish\API\Repository\Values\Content\Query\Aggregation; -use eZ\Publish\API\Repository\Values\Content\Section; +use Ibexa\Contracts\Core\Repository\SectionService; +use Ibexa\Contracts\Core\Repository\Values\Content\Query\Aggregation; +use Ibexa\Contracts\Core\Repository\Values\Content\Section; use Ibexa\Solr\ResultExtractor\AggregationResultExtractor\TermAggregationKeyMapper\SectionAggregationKeyMapper; use Ibexa\Tests\Solr\Search\ResultExtractor\AggregationResultExtractor\AggregationResultExtractorTestUtils; use PHPUnit\Framework\TestCase; @@ -19,10 +19,10 @@ final class SectionAggregationKeyMapperTest extends TestCase { private const EXAMPLE_SECTION_IDS = [1, 2, 3]; - /** @var \eZ\Publish\API\Repository\SectionService|\PHPUnit\Framework\MockObject\MockObject */ + /** @var \Ibexa\Contracts\Core\Repository\SectionService|\PHPUnit\Framework\MockObject\MockObject */ private $sectionService; - /** @var \EzSystems\EzPlatformSolrSearchEngine\ResultExtractor\AggregationResultExtractor\TermAggregationKeyMapper\SectionAggregationKeyMapper */ + /** @var \Ibexa\Solr\ResultExtractor\AggregationResultExtractor\TermAggregationKeyMapper\SectionAggregationKeyMapper */ private $mapper; protected function setUp(): void diff --git a/tests/lib/Search/ResultExtractor/AggregationResultExtractor/TermAggregationKeyMapper/SubtreeAggregationKeyMapperTest.php b/tests/lib/Search/ResultExtractor/AggregationResultExtractor/TermAggregationKeyMapper/SubtreeAggregationKeyMapperTest.php index 13e0e4fc..09587cd6 100644 --- a/tests/lib/Search/ResultExtractor/AggregationResultExtractor/TermAggregationKeyMapper/SubtreeAggregationKeyMapperTest.php +++ b/tests/lib/Search/ResultExtractor/AggregationResultExtractor/TermAggregationKeyMapper/SubtreeAggregationKeyMapperTest.php @@ -8,8 +8,8 @@ namespace Ibexa\Tests\Solr\Search\ResultExtractor\AggregationResultExtractor\TermAggregationKeyMapper; -use eZ\Publish\API\Repository\Values\Content\Location; -use eZ\Publish\API\Repository\Values\Content\Query\Aggregation\Location\SubtreeTermAggregation; +use Ibexa\Contracts\Core\Repository\Values\Content\Location; +use Ibexa\Contracts\Core\Repository\Values\Content\Query\Aggregation\Location\SubtreeTermAggregation; use Ibexa\Contracts\Solr\ResultExtractor\AggregationResultExtractor\TermAggregationKeyMapper; use Ibexa\Solr\ResultExtractor\AggregationResultExtractor\TermAggregationKeyMapper\SubtreeAggregationKeyMapper; use Ibexa\Tests\Solr\Search\ResultExtractor\AggregationResultExtractor\AggregationResultExtractorTestUtils; @@ -19,7 +19,7 @@ final class SubtreeAggregationKeyMapperTest extends TestCase { private const EXAMPLE_PATH_STRING = '/1/2/54/'; - /** @var \EzSystems\EzPlatformSolrSearchEngine\ResultExtractor\AggregationResultExtractor\TermAggregationKeyMapper|\PHPUnit\Framework\MockObject\MockObject */ + /** @var \Ibexa\Contracts\Solr\ResultExtractor\AggregationResultExtractor\TermAggregationKeyMapper|\PHPUnit\Framework\MockObject\MockObject */ private $locationAggregationKeyMapper; protected function setUp(): void diff --git a/tests/lib/Search/ResultExtractor/AggregationResultExtractor/TermAggregationKeyMapper/UserMetadataAggregationKeyMapperTest.php b/tests/lib/Search/ResultExtractor/AggregationResultExtractor/TermAggregationKeyMapper/UserMetadataAggregationKeyMapperTest.php index a6ea3b9d..4ed661d6 100644 --- a/tests/lib/Search/ResultExtractor/AggregationResultExtractor/TermAggregationKeyMapper/UserMetadataAggregationKeyMapperTest.php +++ b/tests/lib/Search/ResultExtractor/AggregationResultExtractor/TermAggregationKeyMapper/UserMetadataAggregationKeyMapperTest.php @@ -8,11 +8,11 @@ namespace Ibexa\Tests\Solr\Search\ResultExtractor\AggregationResultExtractor\TermAggregationKeyMapper; -use eZ\Publish\API\Repository\UserService; -use eZ\Publish\API\Repository\Values\Content\Query\Aggregation\UserMetadataTermAggregation; -use eZ\Publish\API\Repository\Values\Content\Query\Aggregation; -use eZ\Publish\API\Repository\Values\User\User; -use eZ\Publish\API\Repository\Values\User\UserGroup; +use Ibexa\Contracts\Core\Repository\UserService; +use Ibexa\Contracts\Core\Repository\Values\Content\Query\Aggregation\UserMetadataTermAggregation; +use Ibexa\Contracts\Core\Repository\Values\Content\Query\Aggregation; +use Ibexa\Contracts\Core\Repository\Values\User\User; +use Ibexa\Contracts\Core\Repository\Values\User\UserGroup; use Ibexa\Solr\ResultExtractor\AggregationResultExtractor\TermAggregationKeyMapper\UserMetadataAggregationKeyMapper; use Ibexa\Tests\Solr\Search\ResultExtractor\AggregationResultExtractor\AggregationResultExtractorTestUtils; use PHPUnit\Framework\TestCase; @@ -22,10 +22,10 @@ final class UserMetadataAggregationKeyMapperTest extends TestCase private const EXAMPLE_USER_IDS = [1, 2, 3]; private const EXAMPLE_USER_GROUP_IDS = [1, 2, 3]; - /** @var \eZ\Publish\API\Repository\UserService|\PHPUnit\Framework\MockObject\MockObject */ + /** @var \Ibexa\Contracts\Core\Repository\UserService|\PHPUnit\Framework\MockObject\MockObject */ private $userService; - /** @var \EzSystems\EzPlatformSolrSearchEngine\ResultExtractor\AggregationResultExtractor\TermAggregationKeyMapper\UserMetadataAggregationKeyMapper */ + /** @var \Ibexa\Solr\ResultExtractor\AggregationResultExtractor\TermAggregationKeyMapper\UserMetadataAggregationKeyMapper */ private $mapper; protected function setUp(): void diff --git a/tests/lib/Search/ResultExtractor/AggregationResultExtractor/TermAggregationResultExtractorTest.php b/tests/lib/Search/ResultExtractor/AggregationResultExtractor/TermAggregationResultExtractorTest.php index 3ca5c65b..2b89b696 100644 --- a/tests/lib/Search/ResultExtractor/AggregationResultExtractor/TermAggregationResultExtractorTest.php +++ b/tests/lib/Search/ResultExtractor/AggregationResultExtractor/TermAggregationResultExtractorTest.php @@ -8,10 +8,10 @@ namespace Ibexa\Tests\Solr\Search\ResultExtractor\AggregationResultExtractor; -use eZ\Publish\API\Repository\Values\Content\Query\Aggregation\AbstractTermAggregation; -use eZ\Publish\API\Repository\Values\Content\Query\Aggregation; -use eZ\Publish\API\Repository\Values\Content\Search\AggregationResult\TermAggregationResult; -use eZ\Publish\API\Repository\Values\Content\Search\AggregationResult\TermAggregationResultEntry; +use Ibexa\Contracts\Core\Repository\Values\Content\Query\Aggregation\AbstractTermAggregation; +use Ibexa\Contracts\Core\Repository\Values\Content\Query\Aggregation; +use Ibexa\Contracts\Core\Repository\Values\Content\Search\AggregationResult\TermAggregationResult; +use Ibexa\Contracts\Core\Repository\Values\Content\Search\AggregationResult\TermAggregationResultEntry; use Ibexa\Contracts\Solr\ResultExtractor\AggregationResultExtractor; use Ibexa\Contracts\Solr\ResultExtractor\AggregationResultExtractor\TermAggregationKeyMapper; use Ibexa\Solr\ResultExtractor\AggregationResultExtractor\TermAggregationResultExtractor; @@ -19,7 +19,7 @@ final class TermAggregationResultExtractorTest extends AbstractAggregationResultExtractorTest { - /** @var \EzSystems\EzPlatformSolrSearchEngine\ResultExtractor\AggregationResultExtractor\TermAggregationKeyMapper|\PHPUnit\Framework\MockObject\MockObject */ + /** @var \Ibexa\Contracts\Solr\ResultExtractor\AggregationResultExtractor\TermAggregationKeyMapper|\PHPUnit\Framework\MockObject\MockObject */ private $keyMapper; protected function setUp(): void diff --git a/tests/lib/SetupFactory/LegacySetupFactory.php b/tests/lib/SetupFactory/LegacySetupFactory.php index 817a1e16..623e4599 100644 --- a/tests/lib/SetupFactory/LegacySetupFactory.php +++ b/tests/lib/SetupFactory/LegacySetupFactory.php @@ -8,16 +8,16 @@ use Doctrine\DBAL\Connection; use Doctrine\DBAL\FetchMode; -use eZ\Publish\API\Repository\Tests\SearchServiceTranslationLanguageFallbackTest; -use eZ\Publish\API\Repository\Tests\SetupFactory\Legacy as CoreLegacySetupFactory; -use eZ\Publish\Core\Base\Container\Compiler\Search\AggregateFieldValueMapperPass; -use eZ\Publish\Core\Base\Container\Compiler\Search\FieldRegistryPass; +use Ibexa\Tests\Integration\Core\Repository\SearchServiceTranslationLanguageFallbackTest; +use Ibexa\Contracts\Core\Test\Repository\SetupFactory\Legacy as CoreLegacySetupFactory; +use Ibexa\Core\Base\Container\Compiler\Search\AggregateFieldValueMapperPass; +use Ibexa\Core\Base\Container\Compiler\Search\FieldRegistryPass; use Ibexa\Bundle\NamespaceCompatibility\DependencyInjection\Compiler\AliasDecoratorCompatibilityPass; use Ibexa\Bundle\NamespaceCompatibility\DependencyInjection\Compiler\ServiceCompatibilityPass; use Ibexa\Solr\Container\Compiler; -use eZ\Publish\Core\Base\ServiceContainer; -use eZ\Publish\Core\Persistence\Legacy\Content\Gateway as ContentGateway; -use eZ\Publish\SPI\Persistence\Content\Handler; +use Ibexa\Core\Base\ServiceContainer; +use Ibexa\Core\Persistence\Legacy\Content\Gateway as ContentGateway; +use Ibexa\Contracts\Core\Persistence\Content\Handler; use Ibexa\Solr\Handler as SolrSearchHandler; use RuntimeException; use Symfony\Component\Config\FileLocator; @@ -43,7 +43,7 @@ class LegacySetupFactory extends CoreLegacySetupFactory * * @param bool $initializeFromScratch * - * @return \eZ\Publish\API\Repository\Repository + * @return \Ibexa\Contracts\Core\Repository\Repository */ public function getRepository($initializeFromScratch = true) { @@ -102,7 +102,7 @@ protected function loadSolrSettings(ContainerBuilder $containerBuilder): void private function getPersistenceContentHandler( ServiceContainer $serviceContainer ): Handler { - /** @var \eZ\Publish\SPI\Persistence\Content\Handler $contentHandler */ + /** @var \Ibexa\Contracts\Core\Persistence\Content\Handler $contentHandler */ $contentHandler = $serviceContainer->get('ezpublish.spi.persistence.content_handler'); return $contentHandler; @@ -110,7 +110,7 @@ private function getPersistenceContentHandler( private function getSearchHandler(ServiceContainer $serviceContainer): SolrSearchHandler { - /** @var \EzSystems\EzPlatformSolrSearchEngine\Handler $searchHandler */ + /** @var \Ibexa\Solr\Handler $searchHandler */ $searchHandler = $serviceContainer->get('ezpublish.spi.search.solr'); return $searchHandler; From 29e5fa0c191946f2090e9b2f1048704ee955ccf3 Mon Sep 17 00:00:00 2001 From: Nattfarinn Date: Wed, 1 Dec 2021 16:30:19 +0100 Subject: [PATCH 2/5] fix: Rename ibexa/doctrine-dbal-schema dependency to new name --- composer.json | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/composer.json b/composer.json index 70f0ed65..52d8abab 100644 --- a/composer.json +++ b/composer.json @@ -24,7 +24,7 @@ "symfony/framework-bundle": "^5.0" }, "require-dev": { - "ibexa/doctrine-dbal-schema": "^4.0@dev", + "ibexa/doctrine-schema": "^4.0@dev", "phpunit/phpunit": "^8.2", "matthiasnoback/symfony-dependency-injection-test": "^4.1", "ibexa/code-style": "^1.0" From 60763d91c5ec19a801f9bbf8716570618b061dca Mon Sep 17 00:00:00 2001 From: Nattfarinn Date: Wed, 1 Dec 2021 17:23:45 +0100 Subject: [PATCH 3/5] fix: Update local configuration of friendsofphp/php-cs-fixer package --- .php-cs-fixer.php | 25 +++++++++++++++++++++++++ .php_cs | 9 --------- composer.json | 2 +- 3 files changed, 26 insertions(+), 10 deletions(-) create mode 100644 .php-cs-fixer.php delete mode 100644 .php_cs diff --git a/.php-cs-fixer.php b/.php-cs-fixer.php new file mode 100644 index 00000000..4ba28536 --- /dev/null +++ b/.php-cs-fixer.php @@ -0,0 +1,25 @@ +withRules([ + 'declare_strict_types' => false, +]); + +return $configFactory + ->buildConfig() + ->setFinder( + PhpCsFixer\Finder::create() + ->in([ + __DIR__ . '/src', + __DIR__ . '/tests', + ]) + ->files()->name('*.php') + ); diff --git a/.php_cs b/.php_cs deleted file mode 100644 index 2e63f5b1..00000000 --- a/.php_cs +++ /dev/null @@ -1,9 +0,0 @@ -setFinder( - PhpCsFixer\Finder::create() - ->in(__DIR__ . '/lib') - ->in(__DIR__ . '/bundle') - ->in(__DIR__ . '/tests') - ->files()->name('*.php') -); diff --git a/composer.json b/composer.json index 52d8abab..154b02f0 100644 --- a/composer.json +++ b/composer.json @@ -51,7 +51,7 @@ } }, "scripts": { - "fix-cs": "php-cs-fixer fix -v --show-progress=estimating", + "fix-cs": "php-cs-fixer fix --config=.php-cs-fixer.php --show-progress=dots", "check-cs": "php-cs-fixer fix --dry-run -v --show-progress=estimating" }, "extra": { From 0bc1844d3842938169d311e0421741dcb825fb0d Mon Sep 17 00:00:00 2001 From: Nattfarinn Date: Wed, 1 Dec 2021 17:51:01 +0100 Subject: [PATCH 4/5] fix: Coding Standards --- .../ApiLoader/BoostFactorProviderFactory.php | 4 +-- .../IndexingDepthProviderFactory.php | 2 +- src/bundle/ApiLoader/SolrEngineFactory.php | 8 ++--- .../DependencyInjection/Configuration.php | 16 +++++----- .../IbexaSolrExtension.php | 30 ++++++++----------- src/bundle/IbexaSolrBundle.php | 20 +++++-------- src/contracts/DocumentMapper.php | 10 ++----- .../FieldMapper/ContentFieldMapper.php | 4 +-- .../ContentTranslationFieldMapper.php | 4 +-- .../FieldMapper/LocationFieldMapper.php | 4 +-- src/contracts/Query/AggregationVisitor.php | 2 +- .../AggregationFieldResolver.php | 2 +- src/contracts/Query/CriterionVisitor.php | 8 ++--- src/contracts/Query/SortClauseVisitor.php | 6 +--- .../AggregationResultExtractor.php | 2 +- .../RangeAggregationKeyMapper.php | 2 +- .../TermAggregationKeyMapper.php | 2 +- .../AggregateCriterionVisitorPass.php | 6 +--- .../AggregateFacetBuilderVisitorPass.php | 6 +--- .../AggregateSortClauseVisitorPass.php | 6 +--- .../Compiler/BaseFieldMapperPass.php | 8 ++--- .../Compiler/CoreFilterRegistryPass.php | 6 ++-- .../Compiler/EndpointRegistryPass.php | 8 ++--- .../FieldMapperPass/BlockFieldMapperPass.php | 8 ++--- .../BlockTranslationFieldMapperPass.php | 8 ++--- .../ContentFieldMapperPass.php | 8 ++--- .../ContentTranslationFieldMapperPass.php | 8 ++--- .../LocationFieldMapperPass.php | 8 ++--- .../Compiler/GatewayRegistryPass.php | 6 ++-- src/lib/CoreFilter.php | 6 +--- src/lib/CoreFilter/CoreFilterRegistry.php | 4 +-- src/lib/CoreFilter/NativeCoreFilter.php | 18 +++++------ .../DocumentMapper/NativeDocumentMapper.php | 6 +--- src/lib/FieldMapper/BoostFactorProvider.php | 4 +-- .../ContentFieldMapper/Aggregate.php | 4 +-- .../BlockDocumentsBaseContentFields.php | 6 ++-- .../ContentDocumentBaseFields.php | 4 +-- .../ContentDocumentLocationFields.php | 4 +-- .../Aggregate.php | 4 +-- .../BlockDocumentsContentFields.php | 10 +++---- .../BlockDocumentsMetaFields.php | 4 +-- .../ContentDocumentEmptyFields.php | 6 ++-- .../ContentDocumentFulltextFields.php | 14 ++++----- ...tentDocumentTranslatedContentNameField.php | 6 ++-- src/lib/FieldMapper/IndexingDepthProvider.php | 2 +- .../LocationFieldMapper/Aggregate.php | 4 +-- .../LocationDocumentBaseFields.php | 4 +-- src/lib/Gateway.php | 6 +--- src/lib/Gateway/DistributionStrategy.php | 2 +- .../AbstractDistributionStrategy.php | 2 +- .../CloudDistributionStrategy.php | 2 +- .../StandaloneDistributionStrategy.php | 2 +- src/lib/Gateway/Endpoint.php | 6 +--- src/lib/Gateway/EndpointRegistry.php | 6 +--- src/lib/Gateway/EndpointResolver.php | 4 +-- .../NativeEndpointResolver.php | 6 +--- src/lib/Gateway/GatewayRegistry.php | 4 +-- src/lib/Gateway/HttpClient.php | 6 +--- .../HttpClient/ConnectionException.php | 6 +--- src/lib/Gateway/HttpClient/Stream.php | 6 +--- src/lib/Gateway/Message.php | 6 +--- src/lib/Gateway/Native.php | 6 +--- src/lib/Gateway/SingleEndpointResolver.php | 4 +-- src/lib/Gateway/UpdateSerializer.php | 8 ++--- src/lib/Handler.php | 27 +++++++++-------- src/lib/Indexer.php | 8 ++--- .../AbstractRangeAggregationVisitor.php | 4 +-- .../AbstractStatsAggregationVisitor.php | 4 +-- .../AbstractTermAggregationVisitor.php | 4 +-- .../ContentFieldAggregationFieldResolver.php | 6 ++-- .../RawAggregationFieldResolver.php | 2 +- .../SearchFieldAggregationFieldResolver.php | 2 +- .../DateMetadataRangeAggregationVisitor.php | 4 +-- .../DispatcherAggregationVisitor.php | 2 +- .../ContentFieldAggregationVisitorFactory.php | 5 ++-- .../Factory/RawAggregationVisitorFactory.php | 2 +- .../SearchFieldAggregationVisitorFactory.php | 2 +- .../ObjectStateAggregationVisitor.php | 4 +-- .../RangeAggregationVisitor.php | 4 +-- .../StatsAggregationVisitor.php | 5 ++-- .../SubtreeTermAggregationVisitor.php | 2 +- .../TermAggregationVisitor.php | 5 ++-- .../UserMetadataTermAggregationVisitor.php | 4 +-- .../Common/CriterionVisitor/Aggregate.php | 6 +--- .../CriterionVisitor/CompositeCriterion.php | 2 +- .../Common/CriterionVisitor/ContentIdIn.php | 8 ++--- .../CriterionVisitor/ContentTypeGroupIdIn.php | 8 ++--- .../CriterionVisitor/ContentTypeIdIn.php | 8 ++--- .../ContentTypeIdentifierIn.php | 8 ++--- .../CustomField/CustomFieldIn.php | 6 +--- .../CustomField/CustomFieldRange.php | 6 +--- .../Common/CriterionVisitor/DateMetadata.php | 6 +--- .../DateMetadata/ModifiedBetween.php | 8 ++--- .../DateMetadata/ModifiedIn.php | 8 ++--- .../DateMetadata/PublishedBetween.php | 8 ++--- .../DateMetadata/PublishedIn.php | 8 ++--- .../Factory/FullTextFactoryAbstract.php | 4 +-- .../Query/Common/CriterionVisitor/Field.php | 10 ++----- .../CriterionVisitor/Field/FieldEmpty.php | 6 ++-- .../Common/CriterionVisitor/Field/FieldIn.php | 8 ++--- .../CriterionVisitor/Field/FieldLike.php | 6 ++-- .../CriterionVisitor/Field/FieldRange.php | 10 ++----- .../CriterionVisitor/Field/FieldRelation.php | 10 ++----- .../CriterionVisitor/LanguageCodeIn.php | 8 ++--- .../Common/CriterionVisitor/LogicalAnd.php | 8 ++--- .../Common/CriterionVisitor/LogicalNot.php | 6 +--- .../Common/CriterionVisitor/LogicalOr.php | 8 ++--- .../Common/CriterionVisitor/MapLocation.php | 8 ++--- .../MapLocation/MapLocationDistanceIn.php | 10 ++----- .../MapLocation/MapLocationDistanceRange.php | 10 ++----- .../Common/CriterionVisitor/MatchAll.php | 6 +--- .../Common/CriterionVisitor/MatchNone.php | 4 +-- .../CriterionVisitor/ObjectStateIdIn.php | 8 ++--- .../ObjectStateIdentifierIn.php | 4 +-- .../Common/CriterionVisitor/RemoteIdIn.php | 8 ++--- .../CriterionVisitor/SectionIdentifierIn.php | 4 +-- .../Common/CriterionVisitor/SectionIn.php | 8 ++--- .../CriterionVisitor/UserMetadataIn.php | 8 ++--- .../Common/FacetBuilderVisitor/Aggregate.php | 6 +--- .../FacetBuilderVisitor/ContentType.php | 6 +--- .../Common/FacetBuilderVisitor/Section.php | 6 +--- .../Query/Common/FacetBuilderVisitor/User.php | 8 ++--- .../QueryConverter/NativeQueryConverter.php | 8 ++--- .../QueryTranslator/Generator/WordVisitor.php | 4 +-- .../Common/SortClauseVisitor/Aggregate.php | 6 +--- .../Common/SortClauseVisitor/ContentId.php | 6 +--- .../Common/SortClauseVisitor/ContentName.php | 6 +--- .../ContentTranslatedName.php | 2 +- .../Common/SortClauseVisitor/CustomField.php | 2 +- .../Common/SortClauseVisitor/DateModified.php | 6 +--- .../SortClauseVisitor/DatePublished.php | 6 +--- .../Query/Common/SortClauseVisitor/Field.php | 10 ++----- .../SortClauseVisitor/MapLocationDistance.php | 10 ++----- .../Query/Common/SortClauseVisitor/Random.php | 6 ++-- .../Query/Common/SortClauseVisitor/Score.php | 2 +- .../SortClauseVisitor/SectionIdentifier.php | 6 +--- .../Common/SortClauseVisitor/SectionName.php | 6 +--- .../Content/CriterionVisitor/Ancestor.php | 8 ++--- .../Factory/ContentFullTextFactory.php | 4 +-- .../Factory/FullTextFactory.php | 2 +- .../Query/Content/CriterionVisitor/Field.php | 4 +-- .../Content/CriterionVisitor/FullText.php | 8 ++--- .../Content/CriterionVisitor/LocationIdIn.php | 8 ++--- .../CriterionVisitor/LocationRemoteIdIn.php | 8 ++--- .../CriterionVisitor/ParentLocationIdIn.php | 8 ++--- .../Content/CriterionVisitor/SubtreeIn.php | 10 ++----- .../Content/CriterionVisitor/Visibility.php | 6 +--- src/lib/Query/FacetBuilderVisitor.php | 6 +--- src/lib/Query/FacetFieldVisitor.php | 4 +-- .../Location/CriterionVisitor/Ancestor.php | 8 ++--- .../Factory/LocationFullTextFactory.php | 4 +-- .../Location/CriterionVisitor/FullText.php | 8 ++--- .../Location/DepthBetween.php | 6 +--- .../CriterionVisitor/Location/DepthIn.php | 6 +--- .../Location/IsMainLocation.php | 6 +--- .../Location/PriorityBetween.php | 6 +--- .../CriterionVisitor/Location/PriorityIn.php | 6 +--- .../CriterionVisitor/LocationIdIn.php | 8 ++--- .../CriterionVisitor/LocationRemoteIdIn.php | 8 ++--- .../CriterionVisitor/ParentLocationIdIn.php | 8 ++--- .../Location/CriterionVisitor/SubtreeIn.php | 8 ++--- .../Location/CriterionVisitor/Visibility.php | 6 +--- .../SortClauseVisitor/Location/Depth.php | 6 +--- .../SortClauseVisitor/Location/Id.php | 6 +--- .../Location/IsMainLocation.php | 6 +--- .../SortClauseVisitor/Location/Path.php | 6 +--- .../SortClauseVisitor/Location/Priority.php | 6 +--- .../SortClauseVisitor/Location/Visibility.php | 6 +--- src/lib/Query/QueryConverter.php | 6 +--- src/lib/ResultExtractor.php | 15 ++++------ .../DispatcherAggregationResultExtractor.php | 2 +- .../NestedAggregationResultExtractor.php | 2 +- .../DateTimeRangeAggregationKeyMapper.php | 2 +- .../FloatRangeAggregationKeyMapper.php | 2 +- .../IntRangeAggregationKeyMapper.php | 2 +- .../NullRangeAggregationKeyMapper.php | 2 +- .../RangeAggregationResultExtractor.php | 4 +-- .../StatsAggregationResultExtractor.php | 2 +- .../AuthorAggregationKeyMapper.php | 4 +-- .../BooleanAggregationKeyMapper.php | 2 +- .../ContentTypeAggregationKeyMapper.php | 2 +- .../ContentTypeGroupAggregationKeyMapper.php | 2 +- .../CountryAggregationKeyMapper.php | 4 +-- .../InvertedBooleanAggregationKeyMapper.php | 2 +- .../LanguageAggregationKeyMapper.php | 2 +- .../LocationAggregationKeyMapper.php | 2 +- .../NullAggregationKeyMapper.php | 2 +- .../ObjectStateAggregationKeyMapper.php | 2 +- .../SectionAggregationKeyMapper.php | 2 +- .../SubtreeAggregationKeyMapper.php | 2 +- .../UserMetadataAggregationKeyMapper.php | 4 +-- .../TermAggregationResultExtractor.php | 2 +- .../LoadingResultExtractor.php | 6 +--- .../ResultExtractor/NativeResultExtractor.php | 6 +--- tests/bootstrap.php | 3 +- .../IbexaSolrExtensionExtensionTest.php | 6 +--- .../AggregateCriterionVisitorPassTest.php | 6 +--- .../AggregateFacetBuilderVisitorPassTest.php | 6 +--- .../AggregateSortClauseVisitorPassTest.php | 6 +--- .../Compiler/CoreFilterRegistryPassTest.php | 4 +-- .../Compiler/GatewayRegistryPassTest.php | 4 +-- .../lib/CoreFilter/CoreFilterRegistryTest.php | 4 +-- tests/lib/Gateway/GatewayRegistryTest.php | 4 +-- .../FieldMapper/BoostFactorProviderTest.php | 4 +-- .../FieldMapper/IndexingDepthProviderTest.php | 2 +- .../CloudDistributionStrategyTest.php | 4 +-- .../StandaloneDistributionStrategyTest.php | 2 +- .../NativeEndpointResolverTest.php | 6 +--- tests/lib/Search/Gateway/EndpointTest.php | 6 +--- .../AbstractAggregationVisitorTest.php | 2 +- ...earchFieldAggregationFieldResolverTest.php | 2 +- ...ateMetadataRangeAggregationVisitorTest.php | 4 +-- .../DispatcherAggregationVisitorTest.php | 8 ++--- ...ObjectStateGroupAggregationVisitorTest.php | 4 +-- .../RangeAggregationVisitorTest.php | 4 +-- .../StatsAggregationVisitorTest.php | 4 +-- .../SubtreeTermAggregationVisitorTest.php | 2 +- .../TermAggregationVisitorTest.php | 4 +-- ...UserMetadataTermAggregationVisitorTest.php | 4 +-- .../Content/CriterionVisitor/FullTextTest.php | 8 ++--- ...AbstractAggregationResultExtractorTest.php | 2 +- .../AggregationResultExtractorTestUtils.php | 2 +- ...spatcherAggregationResultExtractorTest.php | 2 +- .../NestedAggregationResultExtractorTest.php | 2 +- .../AbstractRangeAggregationKeyMapperTest.php | 2 +- .../DateTimeRangeAggregationKeyMapperTest.php | 2 +- .../FloatRangeAggregationKeyMapperTest.php | 2 +- .../IntRangeAggregationKeyMapperTest.php | 2 +- .../NullRangeAggregationKeyMapperTest.php | 2 +- .../RangeAggregationResultExtractorTest.php | 6 ++-- .../StatsAggregationResultExtractorTest.php | 4 +-- .../AuthorAggregationKeyMapperTest.php | 2 +- .../BooleanAggregationKeyMapperTest.php | 2 +- .../ContentTypeAggregationKeyMapperTest.php | 2 +- ...ntentTypeGroupAggregationKeyMapperTest.php | 3 +- .../CountryAggregationKeyMapperTest.php | 6 +++- ...nvertedBooleanAggregationKeyMapperTest.php | 2 +- .../LanguageAggregationKeyMapperTest.php | 2 +- .../LocationAggregationKeyMapperTest.php | 2 +- .../NullAggregationKeyMapperTest.php | 2 +- .../ObjectStateAggregationKeyMapperTest.php | 2 +- .../SectionAggregationKeyMapperTest.php | 2 +- .../SubtreeAggregationKeyMapperTest.php | 2 +- .../UserMetadataAggregationKeyMapperTest.php | 4 +-- .../TermAggregationResultExtractorTest.php | 6 ++-- tests/lib/Search/TestCase.php | 6 +--- tests/lib/SetupFactory/LegacySetupFactory.php | 12 ++++---- 247 files changed, 433 insertions(+), 914 deletions(-) diff --git a/src/bundle/ApiLoader/BoostFactorProviderFactory.php b/src/bundle/ApiLoader/BoostFactorProviderFactory.php index f247d2cd..e8e9d335 100644 --- a/src/bundle/ApiLoader/BoostFactorProviderFactory.php +++ b/src/bundle/ApiLoader/BoostFactorProviderFactory.php @@ -1,9 +1,7 @@ prototype('array') ->beforeNormalization() ->ifTrue( - function ($v) { + static function ($v) { return !empty($v['mapping']) && !\is_array($v['mapping']) ; } ) ->then( - function ($v) { + static function ($v) { // If single endpoint is set for Content mapping, use it as default // mapping for Content index $v['mapping'] = [ @@ -133,7 +131,7 @@ function ($v) { ->end() ->beforeNormalization() ->ifTrue( - function ($v) { + static function ($v) { return empty($v['entry_endpoints']) && ( @@ -146,7 +144,7 @@ function ($v) { ) ->then( // If entry endpoints are not provided use mapping endpoints - function ($v) { + static function ($v) { $endpointSet = []; if (!empty($v['mapping']['translations'])) { @@ -315,7 +313,7 @@ function ($v) { ->useAttributeAsKey('content_type_identifier') ->beforeNormalization() ->always( - function (array $v) { + static function (array $v) { $valuesMapped = []; foreach ($v as $key => $value) { if (\is_array($value)) { @@ -351,7 +349,7 @@ function (array $v) { ->useAttributeAsKey('content_type_identifier') ->beforeNormalization() ->always( - function (array $v) { + static function (array $v) { $valuesMapped = []; foreach ($v as $key => $value) { if (\is_array($value)) { diff --git a/src/bundle/DependencyInjection/IbexaSolrExtension.php b/src/bundle/DependencyInjection/IbexaSolrExtension.php index 599dd37c..e1efaa3a 100644 --- a/src/bundle/DependencyInjection/IbexaSolrExtension.php +++ b/src/bundle/DependencyInjection/IbexaSolrExtension.php @@ -1,22 +1,18 @@ contentHandler->loadRelations($sourceContent->versionInfo->contentInfo->id); $relatedContents = $this->contentHandler->loadContentList( - array_map(function (Content\Relation $relation) { + array_map(static function (Content\Relation $relation) { return $relation->destinationContentId; }, $relations) ); $contentTypes = $this->contentTypeHandler->loadContentTypeList( - array_map(function (Content $content) { + array_map(static function (Content $content) { return $content->versionInfo->contentInfo->contentTypeId; }, $relatedContents) ); diff --git a/src/lib/FieldMapper/ContentTranslationFieldMapper/ContentDocumentTranslatedContentNameField.php b/src/lib/FieldMapper/ContentTranslationFieldMapper/ContentDocumentTranslatedContentNameField.php index 210b3856..7308a293 100644 --- a/src/lib/FieldMapper/ContentTranslationFieldMapper/ContentDocumentTranslatedContentNameField.php +++ b/src/lib/FieldMapper/ContentTranslationFieldMapper/ContentDocumentTranslatedContentNameField.php @@ -1,9 +1,7 @@ value diff --git a/src/lib/Query/Common/CriterionVisitor/ContentTypeGroupIdIn.php b/src/lib/Query/Common/CriterionVisitor/ContentTypeGroupIdIn.php index c590863b..f4e08297 100644 --- a/src/lib/Query/Common/CriterionVisitor/ContentTypeGroupIdIn.php +++ b/src/lib/Query/Common/CriterionVisitor/ContentTypeGroupIdIn.php @@ -1,12 +1,8 @@ value diff --git a/src/lib/Query/Common/CriterionVisitor/ContentTypeIdentifierIn.php b/src/lib/Query/Common/CriterionVisitor/ContentTypeIdentifierIn.php index bb24f29d..f29df011 100644 --- a/src/lib/Query/Common/CriterionVisitor/ContentTypeIdentifierIn.php +++ b/src/lib/Query/Common/CriterionVisitor/ContentTypeIdentifierIn.php @@ -1,19 +1,15 @@ value diff --git a/src/lib/Query/Common/CriterionVisitor/LogicalAnd.php b/src/lib/Query/Common/CriterionVisitor/LogicalAnd.php index 8cfd455f..aec44179 100644 --- a/src/lib/Query/Common/CriterionVisitor/LogicalAnd.php +++ b/src/lib/Query/Common/CriterionVisitor/LogicalAnd.php @@ -1,12 +1,8 @@ visit($value); }, $criterion->criteria diff --git a/src/lib/Query/Common/CriterionVisitor/LogicalNot.php b/src/lib/Query/Common/CriterionVisitor/LogicalNot.php index 569b0488..237eb5e8 100644 --- a/src/lib/Query/Common/CriterionVisitor/LogicalNot.php +++ b/src/lib/Query/Common/CriterionVisitor/LogicalNot.php @@ -1,12 +1,8 @@ visit($value); }, $criterion->criteria diff --git a/src/lib/Query/Common/CriterionVisitor/MapLocation.php b/src/lib/Query/Common/CriterionVisitor/MapLocation.php index e71df255..9a091616 100644 --- a/src/lib/Query/Common/CriterionVisitor/MapLocation.php +++ b/src/lib/Query/Common/CriterionVisitor/MapLocation.php @@ -1,18 +1,14 @@ value diff --git a/src/lib/Query/Common/CriterionVisitor/SectionIdentifierIn.php b/src/lib/Query/Common/CriterionVisitor/SectionIdentifierIn.php index 70bcb12c..1ab2ff00 100644 --- a/src/lib/Query/Common/CriterionVisitor/SectionIdentifierIn.php +++ b/src/lib/Query/Common/CriterionVisitor/SectionIdentifierIn.php @@ -1,16 +1,16 @@ value diff --git a/src/lib/Query/Common/CriterionVisitor/UserMetadataIn.php b/src/lib/Query/Common/CriterionVisitor/UserMetadataIn.php index 59c9c08a..c8d615db 100644 --- a/src/lib/Query/Common/CriterionVisitor/UserMetadataIn.php +++ b/src/lib/Query/Common/CriterionVisitor/UserMetadataIn.php @@ -1,12 +1,8 @@ value diff --git a/src/lib/Query/Common/FacetBuilderVisitor/Aggregate.php b/src/lib/Query/Common/FacetBuilderVisitor/Aggregate.php index aedc3c3b..26d6244e 100644 --- a/src/lib/Query/Common/FacetBuilderVisitor/Aggregate.php +++ b/src/lib/Query/Common/FacetBuilderVisitor/Aggregate.php @@ -1,12 +1,8 @@ 'content_owner_user_id_id', UserFacetBuilder::GROUP => 'content_owner_user_group_ids_mid', UserFacetBuilder::MODIFIER => 'content_version_creator_user_id_id', diff --git a/src/lib/Query/Common/QueryConverter/NativeQueryConverter.php b/src/lib/Query/Common/QueryConverter/NativeQueryConverter.php index e75bcb54..bcf1322d 100644 --- a/src/lib/Query/Common/QueryConverter/NativeQueryConverter.php +++ b/src/lib/Query/Common/QueryConverter/NativeQueryConverter.php @@ -1,21 +1,17 @@ value diff --git a/src/lib/Query/Content/CriterionVisitor/LocationRemoteIdIn.php b/src/lib/Query/Content/CriterionVisitor/LocationRemoteIdIn.php index 87b158b9..f5032d31 100644 --- a/src/lib/Query/Content/CriterionVisitor/LocationRemoteIdIn.php +++ b/src/lib/Query/Content/CriterionVisitor/LocationRemoteIdIn.php @@ -1,12 +1,8 @@ value diff --git a/src/lib/Query/Content/CriterionVisitor/ParentLocationIdIn.php b/src/lib/Query/Content/CriterionVisitor/ParentLocationIdIn.php index d0861aaf..bd5ab8a8 100644 --- a/src/lib/Query/Content/CriterionVisitor/ParentLocationIdIn.php +++ b/src/lib/Query/Content/CriterionVisitor/ParentLocationIdIn.php @@ -1,12 +1,8 @@ value diff --git a/src/lib/Query/Content/CriterionVisitor/SubtreeIn.php b/src/lib/Query/Content/CriterionVisitor/SubtreeIn.php index b2c1268b..4e5d8655 100644 --- a/src/lib/Query/Content/CriterionVisitor/SubtreeIn.php +++ b/src/lib/Query/Content/CriterionVisitor/SubtreeIn.php @@ -1,19 +1,15 @@ value diff --git a/src/lib/Query/Content/CriterionVisitor/Visibility.php b/src/lib/Query/Content/CriterionVisitor/Visibility.php index 713db2f6..de462826 100644 --- a/src/lib/Query/Content/CriterionVisitor/Visibility.php +++ b/src/lib/Query/Content/CriterionVisitor/Visibility.php @@ -1,12 +1,8 @@ value diff --git a/src/lib/Query/Location/CriterionVisitor/LocationRemoteIdIn.php b/src/lib/Query/Location/CriterionVisitor/LocationRemoteIdIn.php index 68915b3b..fb301023 100644 --- a/src/lib/Query/Location/CriterionVisitor/LocationRemoteIdIn.php +++ b/src/lib/Query/Location/CriterionVisitor/LocationRemoteIdIn.php @@ -1,12 +1,8 @@ value diff --git a/src/lib/Query/Location/CriterionVisitor/ParentLocationIdIn.php b/src/lib/Query/Location/CriterionVisitor/ParentLocationIdIn.php index 9dd0c8e1..fad9a793 100644 --- a/src/lib/Query/Location/CriterionVisitor/ParentLocationIdIn.php +++ b/src/lib/Query/Location/CriterionVisitor/ParentLocationIdIn.php @@ -1,12 +1,8 @@ value diff --git a/src/lib/Query/Location/CriterionVisitor/SubtreeIn.php b/src/lib/Query/Location/CriterionVisitor/SubtreeIn.php index c5787491..fa1994a6 100644 --- a/src/lib/Query/Location/CriterionVisitor/SubtreeIn.php +++ b/src/lib/Query/Location/CriterionVisitor/SubtreeIn.php @@ -1,12 +1,8 @@ value diff --git a/src/lib/Query/Location/CriterionVisitor/Visibility.php b/src/lib/Query/Location/CriterionVisitor/Visibility.php index fc353ec6..baef6d64 100644 --- a/src/lib/Query/Location/CriterionVisitor/Visibility.php +++ b/src/lib/Query/Location/CriterionVisitor/Visibility.php @@ -1,12 +1,8 @@ \"{!ex=dt key=\${id}}${field}\",", - E_USER_DEPRECATED); + E_USER_DEPRECATED + ); } $facets[] = $this->facetBuilderVisitor->mapField( diff --git a/src/lib/ResultExtractor/AggregationResultExtractor/DispatcherAggregationResultExtractor.php b/src/lib/ResultExtractor/AggregationResultExtractor/DispatcherAggregationResultExtractor.php index 1f326693..ea75d27f 100644 --- a/src/lib/ResultExtractor/AggregationResultExtractor/DispatcherAggregationResultExtractor.php +++ b/src/lib/ResultExtractor/AggregationResultExtractor/DispatcherAggregationResultExtractor.php @@ -1,7 +1,7 @@ endpointRegistry = $this->createMock(EndpointRegistry::class); $this->endpointRegistry ->method('getEndpoint') - ->willReturnCallback(function ($name) { + ->willReturnCallback(static function ($name) { return new Endpoint([ 'core' => 'collection_' . $name, ]); diff --git a/tests/lib/Search/Gateway/DistributionStrategy/StandaloneDistributionStrategyTest.php b/tests/lib/Search/Gateway/DistributionStrategy/StandaloneDistributionStrategyTest.php index d20f8d81..9a76e03d 100644 --- a/tests/lib/Search/Gateway/DistributionStrategy/StandaloneDistributionStrategyTest.php +++ b/tests/lib/Search/Gateway/DistributionStrategy/StandaloneDistributionStrategyTest.php @@ -1,7 +1,7 @@ createMock(AggregationVisitor::class); $visitor->method('canVisit')->with($aggregation, $languageFilter)->willReturn($supports); diff --git a/tests/lib/Search/Query/Common/AggregationVisitor/ObjectStateGroupAggregationVisitorTest.php b/tests/lib/Search/Query/Common/AggregationVisitor/ObjectStateGroupAggregationVisitorTest.php index 767a79cb..b71c93b8 100644 --- a/tests/lib/Search/Query/Common/AggregationVisitor/ObjectStateGroupAggregationVisitorTest.php +++ b/tests/lib/Search/Query/Common/AggregationVisitor/ObjectStateGroupAggregationVisitorTest.php @@ -1,15 +1,15 @@ keyMapper = $this->createMock(RangeAggregationKeyMapper::class); $this->keyMapper ->method('map') - ->willReturnCallback(function ( + ->willReturnCallback(static function ( Aggregation $aggregation, array $languageFilter, string $key diff --git a/tests/lib/Search/ResultExtractor/AggregationResultExtractor/StatsAggregationResultExtractorTest.php b/tests/lib/Search/ResultExtractor/AggregationResultExtractor/StatsAggregationResultExtractorTest.php index adda8f7f..e88e69e6 100644 --- a/tests/lib/Search/ResultExtractor/AggregationResultExtractor/StatsAggregationResultExtractorTest.php +++ b/tests/lib/Search/ResultExtractor/AggregationResultExtractor/StatsAggregationResultExtractorTest.php @@ -1,15 +1,15 @@ keyMapper = $this->createMock(TermAggregationKeyMapper::class); $this->keyMapper ->method('map') - ->willReturnCallback(function ( + ->willReturnCallback(static function ( Aggregation $aggregation, array $languageFilter, array $keys diff --git a/tests/lib/Search/TestCase.php b/tests/lib/Search/TestCase.php index f8a54f97..00986edb 100644 --- a/tests/lib/Search/TestCase.php +++ b/tests/lib/Search/TestCase.php @@ -1,12 +1,8 @@ Date: Thu, 2 Dec 2021 14:43:03 +0100 Subject: [PATCH 5/5] fix: make php-cs-fixer verbose --- composer.json | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/composer.json b/composer.json index 154b02f0..dd6b2c8e 100644 --- a/composer.json +++ b/composer.json @@ -51,8 +51,8 @@ } }, "scripts": { - "fix-cs": "php-cs-fixer fix --config=.php-cs-fixer.php --show-progress=dots", - "check-cs": "php-cs-fixer fix --dry-run -v --show-progress=estimating" + "fix-cs": "php-cs-fixer fix --config=.php-cs-fixer.php -v --show-progress=dots", + "check-cs": "php-cs-fixer fix --dry-run -v --show-progress=dots" }, "extra": { "branch-alias": {