diff --git a/migrations/Version202106011320101488_taoAdvancedSearch.php b/migrations/Version202106011320101488_taoAdvancedSearch.php index 3d143746..d1b93fa6 100644 --- a/migrations/Version202106011320101488_taoAdvancedSearch.php +++ b/migrations/Version202106011320101488_taoAdvancedSearch.php @@ -14,7 +14,6 @@ final class Version202106011320101488_taoAdvancedSearch extends AbstractMigration { - public function getDescription(): string { return 'Adds task queue for indexation events.'; @@ -26,10 +25,15 @@ public function up(Schema $schema): void $this->propagate($registrationService); $registrationService->__invoke([]); - if ( BrokerFactory::BROKER_MEMORY !== $this->getAssocitationService()->guessDefaultBrokerType()){ - $this->addReport(Report::createWarning( - sprintf('New worker must be created to proceed tasks from queue named `%s`',$registrationService->getQueueName()) - )); + if (BrokerFactory::BROKER_MEMORY !== $this->getAssocitationService()->guessDefaultBrokerType()) { + $this->addReport( + Report::createWarning( + sprintf( + 'New worker must be created to proceed tasks from queue named `%s`', + $registrationService->getQueueName() + ) + ) + ); } } diff --git a/migrations/Version202209081525261488_taoAdvancedSearch.php b/migrations/Version202209081525261488_taoAdvancedSearch.php index f9f10776..2908c786 100644 --- a/migrations/Version202209081525261488_taoAdvancedSearch.php +++ b/migrations/Version202209081525261488_taoAdvancedSearch.php @@ -35,7 +35,7 @@ public function up(Schema $schema): void /** @var ServiceOptions $serviceOptions */ $serviceOptions = $this->getServiceManager()->get(ServiceOptions::SERVICE_ID); - + if ($oldElasticSearch) { $serviceOptions->save(ElasticSearchConfig::class, 'hosts', $oldElasticSearch->getOption('hosts')); } diff --git a/model/Index/Report/IndexSummarizer.php b/model/Index/Report/IndexSummarizer.php index ff099da4..fd9afbcb 100644 --- a/model/Index/Report/IndexSummarizer.php +++ b/model/Index/Report/IndexSummarizer.php @@ -79,8 +79,7 @@ private function createReport( string $label, string $index, int $totalInDb - ): array - { + ): array { $totalIndexed = $this->getTotalResults($index); $percentageIndexed = $totalIndexed === 0 || $totalInDb === 0 ? 0 diff --git a/model/Metadata/Listener/MetadataInheritanceListener.php b/model/Metadata/Listener/MetadataInheritanceListener.php index c8725f7f..72ed72c3 100644 --- a/model/Metadata/Listener/MetadataInheritanceListener.php +++ b/model/Metadata/Listener/MetadataInheritanceListener.php @@ -58,5 +58,4 @@ private function getIndexer(): IndexerInterface ); return $indexer; } - } diff --git a/model/Metadata/Repository/ClassUriCachedRepository.php b/model/Metadata/Repository/ClassUriCachedRepository.php index 38a7390f..cab0d3fc 100644 --- a/model/Metadata/Repository/ClassUriCachedRepository.php +++ b/model/Metadata/Repository/ClassUriCachedRepository.php @@ -29,10 +29,11 @@ class ClassUriCachedRepository extends ConfigurableService implements ClassUriRepositoryInterface { + use OntologyAwareTrait; + private const CLASSES_INDEX = self::class . '::CLASSES_URIS'; - private const CLASSES_INDEX_TOTAL = self::class . '::CLASSES_URIS_TOTAL'; - use OntologyAwareTrait; + private const CLASSES_INDEX_TOTAL = self::class . '::CLASSES_URIS_TOTAL'; public function cacheWarmup(): void { diff --git a/model/Metadata/Service/AdvancedSearchSettingsService.php b/model/Metadata/Service/AdvancedSearchSettingsService.php index e3ca313b..fa4fec88 100644 --- a/model/Metadata/Service/AdvancedSearchSettingsService.php +++ b/model/Metadata/Service/AdvancedSearchSettingsService.php @@ -72,7 +72,9 @@ public function getSettingsByClassMetadataSearchRequest( ->getSettingsByClassMetadataSearchRequest($classMetadataSearchRequest); } - $classCollection = $this->classMetadataSearcher->findAll(new ClassMetadataSearchInput($classMetadataSearchRequest)); + $classCollection = $this->classMetadataSearcher->findAll( + new ClassMetadataSearchInput($classMetadataSearchRequest) + ); if ($classMetadataSearchRequest->getStructure() === 'results') { return new SearchSettings( diff --git a/model/Metadata/Service/ClassMetadataSearcher.php b/model/Metadata/Service/ClassMetadataSearcher.php index 8a02d8a4..4a3c87a5 100644 --- a/model/Metadata/Service/ClassMetadataSearcher.php +++ b/model/Metadata/Service/ClassMetadataSearcher.php @@ -42,6 +42,8 @@ class ClassMetadataSearcher extends ConfigurableService implements ClassMetadataSearcherInterface { + use OntologyAwareTrait; + private const BASE_LIST_ITEMS_URI = '/tao/PropertyValues/get?propertyUri=%s'; private const UNACCEPTABLE_PROPERTIES = [ @@ -50,8 +52,6 @@ class ClassMetadataSearcher extends ConfigurableService implements ClassMetadata TaoOntology::PROPERTY_TRANSLATION_ORIGINAL_RESOURCE_URI, ]; - use OntologyAwareTrait; - public function findAll(ClassMetadataSearchInput $input): ClassCollection { if ($this->getAdvancedSearchChecker()->isEnabled()) { diff --git a/model/Metadata/ServiceProvider/MetadataServiceProvider.php b/model/Metadata/ServiceProvider/MetadataServiceProvider.php index b1271892..f6a550d0 100644 --- a/model/Metadata/ServiceProvider/MetadataServiceProvider.php +++ b/model/Metadata/ServiceProvider/MetadataServiceProvider.php @@ -32,6 +32,7 @@ use oat\taoAdvancedSearch\model\Metadata\Specification\PropertyAllowedSpecification; use oat\taoAdvancedSearch\model\Resource\Service\ResourceIndexer; use Symfony\Component\DependencyInjection\Loader\Configurator\ContainerConfigurator; + use function Symfony\Component\DependencyInjection\Loader\Configurator\param; use function Symfony\Component\DependencyInjection\Loader\Configurator\service; diff --git a/model/SearchEngine/Driver/Elasticsearch/LogIndexOperationsTrait.php b/model/SearchEngine/Driver/Elasticsearch/LogIndexOperationsTrait.php index d4061acd..f49e7c79 100644 --- a/model/SearchEngine/Driver/Elasticsearch/LogIndexOperationsTrait.php +++ b/model/SearchEngine/Driver/Elasticsearch/LogIndexOperationsTrait.php @@ -148,7 +148,7 @@ private function logIndexFailure( LoggerInterface $logger, Throwable $e, string $method, - string $script='', + string $script = '', $type = null, array $query = [] ): void { diff --git a/scripts/tools/CacheWarmup.php b/scripts/tools/CacheWarmup.php index 701b864d..a344d90c 100644 --- a/scripts/tools/CacheWarmup.php +++ b/scripts/tools/CacheWarmup.php @@ -76,7 +76,10 @@ protected function run(): Report $report->add( Report::createSuccess( - sprintf('Cache warmed up! ROOT classUris (%s) in cache', implode(', ', $indexableClassRepository->findAllUris())) + sprintf( + 'Cache warmed up! ROOT classUris (%s) in cache', + implode(', ', $indexableClassRepository->findAllUris()) + ) ) ); diff --git a/scripts/uninstall/UnRegisterTaskQueueServices.php b/scripts/uninstall/UnRegisterTaskQueueServices.php index 5f82e864..fe1513df 100644 --- a/scripts/uninstall/UnRegisterTaskQueueServices.php +++ b/scripts/uninstall/UnRegisterTaskQueueServices.php @@ -39,8 +39,8 @@ public function __invoke($params) return new Report(Report::TYPE_SUCCESS, 'Indexation TaskQueue `%s` was unregistered', $queueName); } - private function getAssociationService(): QueueAssociationService{ + private function getAssociationService(): QueueAssociationService + { return $this->getServiceManager()->get(QueueAssociationService::class); } - }