Add default value for prefix and handle empty string as default value

Setono · Oct 23, 2024 · 7441968 · 7441968
1 parent e1dc7e5
commit 7441968
Show file tree

Hide file tree

Showing 4 changed files with 36 additions and 4 deletions.
diff --git a/src/DependencyInjection/Configuration.php b/src/DependencyInjection/Configuration.php
@@ -61,7 +61,7 @@ public function getConfigTreeBuilder(): TreeBuilder
                                 ->defaultNull()
                             ->end()
                             ->scalarNode('prefix')
-                                ->defaultNull()
+                                ->defaultValue('%env(MEILISEARCH_PREFIX)%')
                                 ->info('If you want to prepend a string to the index name, you can set it here. This can be useful in a development setup where each developer has their own prefix. Notice that the environment is already prefixed by default, so you do not have to prefix that.')
                                 ->cannotBeEmpty()
                             ->end()

diff --git a/src/DependencyInjection/SetonoSyliusMeilisearchExtension.php b/src/DependencyInjection/SetonoSyliusMeilisearchExtension.php
@@ -283,7 +283,7 @@ private static function registerIndexesConfiguration(array $config, ContainerBui
                     IndexUidResolverInterface::class => new Reference(IndexUidResolverInterface::class),
                     MetadataFactoryInterface::class => new Reference(MetadataFactoryInterface::class),
                 ]),
-                $index['prefix'],
+                '' === $index['prefix'] ? null : $index['prefix'],
             ]));
 
             $indexRegistry->addMethodCall('add', [new Reference($indexServiceId)]);

diff --git a/src/Resolver/IndexUid/IndexUidResolver.php b/src/Resolver/IndexUid/IndexUidResolver.php
@@ -30,13 +30,15 @@ public function resolve(Index $index): string
 
     public function resolveFromIndexScope(IndexScope $indexScope): string
     {
-        return strtolower(implode($this->separator, array_filter([
+        return strtolower(
+            implode($this->separator, array_filter([
             $indexScope->index->prefix,
             $this->environment,
             $indexScope->index->name,
             $indexScope->channelCode,
             $indexScope->localeCode,
             $indexScope->currencyCode,
-        ])));
+        ], static fn (?string $part): bool => ((string) $part) !== '')),
+        );
     }
 }
diff --git a/tests/Unit/Resolver/IndexUid/IndexUidResolverTest.php b/tests/Unit/Resolver/IndexUid/IndexUidResolverTest.php
@@ -34,4 +34,34 @@ public function it_resolves_from_index_scope(): void
 
         self::assertSame('prefix__prod__products__fashion_web__en_us__usd', $resolver->resolveFromIndexScope($indexScope));
     }
+
+    /**
+     * @test
+     */
+    public function it_handles_empty_strings(): void
+    {
+        $index = new Index('products', Product::class, [], new Container(), '');
+        $indexScope = new IndexScope($index, 'FASHION_WEB', 'en_US', 'USD');
+        $resolver = new IndexUidResolver(
+            $this->prophesize(IndexScopeProviderInterface::class)->reveal(),
+            'prod',
+        );
+
+        self::assertSame('prod__products__fashion_web__en_us__usd', $resolver->resolveFromIndexScope($indexScope));
+    }
+
+    /**
+     * @test
+     */
+    public function it_handles_null_values(): void
+    {
+        $index = new Index('products', Product::class, [], new Container(), null);
+        $indexScope = new IndexScope($index, 'FASHION_WEB', 'en_US', 'USD');
+        $resolver = new IndexUidResolver(
+            $this->prophesize(IndexScopeProviderInterface::class)->reveal(),
+            'prod',
+        );
+
+        self::assertSame('prod__products__fashion_web__en_us__usd', $resolver->resolveFromIndexScope($indexScope));
+    }
 }