From 3cf5ea5e9f6a2e6e2800a3884fcf11ff8d019b5c Mon Sep 17 00:00:00 2001 From: Antoine Makdessi Date: Fri, 16 Jun 2023 12:33:04 +0200 Subject: [PATCH] Services naming --- config/services.xml | 32 +++++++++++++++---- .../MeilisearchExtension.php | 8 ++--- tests/BaseKernelTestCase.php | 2 +- tests/Integration/CommandsTest.php | 4 +-- tests/Integration/DependencyInjectionTest.php | 2 +- tests/Integration/EngineTest.php | 2 +- .../DoctrineEventSubscriberTest.php | 2 +- tests/Integration/SearchTest.php | 2 +- tests/Integration/SettingsTest.php | 2 +- 9 files changed, 38 insertions(+), 18 deletions(-) diff --git a/config/services.xml b/config/services.xml index 7691418b..550455a7 100644 --- a/config/services.xml +++ b/config/services.xml @@ -4,17 +4,22 @@ xsi:schemaLocation="http://symfony.com/schema/dic/services https://symfony.com/schema/dic/services/services-1.0.xsd"> - + - - + + + + + The "%alias_id%" service alias is deprecated. Use "meilisearch.search_indexer_subscriber" instead. + - + %meili_url% %meili_api_key% @@ -22,8 +27,23 @@ %meili_symfony_version% + + + The "%alias_id%" service alias is deprecated. Use "meilisearch.client" instead. + + - - + + + + The "%alias_id%" service alias is deprecated. Use "meilisearch.client" instead. + + + + + + The "%alias_id%" service alias is deprecated. Use "meilisearch.service" instead. + + diff --git a/src/DependencyInjection/MeilisearchExtension.php b/src/DependencyInjection/MeilisearchExtension.php index 6bf53c94..25160606 100644 --- a/src/DependencyInjection/MeilisearchExtension.php +++ b/src/DependencyInjection/MeilisearchExtension.php @@ -40,24 +40,24 @@ public function load(array $configs, ContainerBuilder $container): void $container->setParameter('meili_symfony_version', MeilisearchBundle::qualifiedVersion()); if (\count($doctrineEvents = $config['doctrineSubscribedEvents']) > 0) { - $subscriber = $container->getDefinition('search.search_indexer_subscriber'); + $subscriber = $container->getDefinition('meilisearch.search_indexer_subscriber'); foreach ($doctrineEvents as $event) { $subscriber->addTag('doctrine.event_listener', ['event' => $event]); $subscriber->addTag('doctrine_mongodb.odm.event_listener', ['event' => $event]); } } else { - $container->removeDefinition('search.search_indexer_subscriber'); + $container->removeDefinition('meilisearch.search_indexer_subscriber'); } - $engineDefinition = new Definition(Engine::class, [new Reference('search.client')]); + $engineDefinition = new Definition(Engine::class, [new Reference('meilisearch.client')]); $searchDefinition = (new Definition( MeilisearchService::class, [new Reference($config['serializer']), $engineDefinition, $config] )); - $container->setDefinition('search.service', $searchDefinition->setPublic(true)); + $container->setDefinition('meilisearch.service', $searchDefinition->setPublic(true)); } /** diff --git a/tests/BaseKernelTestCase.php b/tests/BaseKernelTestCase.php index a1021b37..be12e70c 100644 --- a/tests/BaseKernelTestCase.php +++ b/tests/BaseKernelTestCase.php @@ -29,7 +29,7 @@ protected function setUp(): void self::bootKernel(); $this->entityManager = $this->get('doctrine.orm.entity_manager'); - $this->searchService = $this->get('search.service'); + $this->searchService = $this->get('meilisearch.service'); $metaData = $this->entityManager->getMetadataFactory()->getAllMetadata(); $tool = new SchemaTool($this->entityManager); diff --git a/tests/Integration/CommandsTest.php b/tests/Integration/CommandsTest.php index 405a5750..3f24a1c3 100644 --- a/tests/Integration/CommandsTest.php +++ b/tests/Integration/CommandsTest.php @@ -34,7 +34,7 @@ protected function setUp(): void { parent::setUp(); - $this->client = $this->get('search.client'); + $this->client = $this->get('meilisearch.client'); $this->index = $this->client->index($this->getPrefix().self::$indexName); $this->application = new Application(self::createKernel()); } @@ -498,7 +498,7 @@ public function testImportWithDynamicSettings(string $command): void EOD, $importOutput); } - $settings = $this->get('search.client')->index('sf_phpunit__dynamic_settings')->getSettings(); + $settings = $this->get('meilisearch.client')->index('sf_phpunit__dynamic_settings')->getSettings(); $getSetting = static fn ($value) => $value instanceof \IteratorAggregate ? iterator_to_array($value) : $value; diff --git a/tests/Integration/DependencyInjectionTest.php b/tests/Integration/DependencyInjectionTest.php index d5588cec..c16d09af 100644 --- a/tests/Integration/DependencyInjectionTest.php +++ b/tests/Integration/DependencyInjectionTest.php @@ -19,7 +19,7 @@ public function testHasMeilisearchVersionDefinitionAfterLoad(): void { $this->load(); - $this->assertContainerBuilderHasServiceDefinitionWithArgument('search.client', '$clientAgents', ['%meili_symfony_version%']); + $this->assertContainerBuilderHasServiceDefinitionWithArgument('meilisearch.client', '$clientAgents', ['%meili_symfony_version%']); } public function testHasMeilisearchVersionFromConstantAfterLoad(): void diff --git a/tests/Integration/EngineTest.php b/tests/Integration/EngineTest.php index ca0b36a0..b2e7a676 100644 --- a/tests/Integration/EngineTest.php +++ b/tests/Integration/EngineTest.php @@ -19,7 +19,7 @@ public function setUp(): void { parent::setUp(); - $this->engine = new Engine($this->get('search.client')); + $this->engine = new Engine($this->get('meilisearch.client')); } /** diff --git a/tests/Integration/EventListener/DoctrineEventSubscriberTest.php b/tests/Integration/EventListener/DoctrineEventSubscriberTest.php index ad0b099e..47f45eb2 100644 --- a/tests/Integration/EventListener/DoctrineEventSubscriberTest.php +++ b/tests/Integration/EventListener/DoctrineEventSubscriberTest.php @@ -22,7 +22,7 @@ public function setUp(): void { parent::setUp(); - $this->client = $this->get('search.client'); + $this->client = $this->get('meilisearch.client'); } /** diff --git a/tests/Integration/SearchTest.php b/tests/Integration/SearchTest.php index fcd808ab..33da6b75 100644 --- a/tests/Integration/SearchTest.php +++ b/tests/Integration/SearchTest.php @@ -36,7 +36,7 @@ protected function setUp(): void { parent::setUp(); - $this->client = $this->get('search.client'); + $this->client = $this->get('meilisearch.client'); $this->objectManager = $this->get('doctrine')->getManager(); $this->index = $this->client->index($this->getPrefix().self::$indexName); $this->application = new Application(self::createKernel()); diff --git a/tests/Integration/SettingsTest.php b/tests/Integration/SettingsTest.php index fa230771..1781c2fc 100644 --- a/tests/Integration/SettingsTest.php +++ b/tests/Integration/SettingsTest.php @@ -37,7 +37,7 @@ public function setUp(): void { parent::setUp(); - $this->client = $this->get('search.client'); + $this->client = $this->get('meilisearch.client'); $this->application = new Application(self::$kernel); }