Merge branch 'master' into feature/collection-prefix

Author: npotier

README.md

@@ -85,6 +85,22 @@ acseo_typesense:
                     type: datetime
                     optional: true                   # Declare field as optional
             default_sorting_field: sortable_id       # Default sorting field. Must be int32 or float
+            symbols_to_index: ['+']                  # Optional - You can add + to this list to make the word c++ indexable verbatim.
+        users:
+            entity: App\Entity\User
+            fields:
+                id:
+                    name: id
+                    type: primary
+                sortable_id:
+                    entity_attribute: id
+                    name: sortable_id
+                    type: int32
+                email:
+                    name: email
+                    type: string
+            default_sorting_field: sortable_id
+            token_separators: ['+', '-', '@', '.']  # Optional - This will cause contact+docs-example@typesense.org to be indexed as contact, docs, example, typesense and org.
 ```
 
 You can use basic types supported by Typesense for your fields : string, int32, float, etc.

composer.json

@@ -13,7 +13,7 @@
         "php": "^7.4||^8.0",
         "doctrine/orm": "~2.8,>=2.8.0",
         "symfony/framework-bundle": "^3.4|^4.3|^5|^6.0",
-        "symfony/http-client-contracts": "^1.0|^2.0",
+        "symfony/http-client-contracts": "^1.0|^2.0|^3.0",
         "typesense/typesense-php": "^4.1.0",
         "php-http/curl-client": "^2.2",
         "monolog/monolog": "^2.3",

src/Client/CollectionClient.php

@@ -58,7 +58,7 @@ public function list()
         return $this->client->collections->retrieve();
     }
 
-    public function create($name, $fields, $defaultSortingField)
+    public function create($name, $fields, $defaultSortingField, array $tokenSeparators, array $symbolsToIndex)
     {
         if (!$this->client->isOperationnal()) {
             return null;
@@ -68,6 +68,8 @@ public function create($name, $fields, $defaultSortingField)
             'name'                  => $name,
             'fields'                => $fields,
             'default_sorting_field' => $defaultSortingField,
+            'token_separators'      => $tokenSeparators,
+            'symbols_to_index'      => $symbolsToIndex,
         ]);
     }
 

src/DependencyInjection/ACSEOTypesenseExtension.php

@@ -138,6 +138,8 @@ private function loadCollections(array $collections, ContainerBuilder $container
                 'name'                  => $name,
                 'fields'                => $config['fields'],
                 'default_sorting_field' => $config['default_sorting_field'],
+                'token_separators'      => $config['token_separators'],
+                'symbols_to_index'      => $config['symbols_to_index'],
             ];
         }
     }

src/DependencyInjection/Configuration.php

@@ -31,22 +31,22 @@ public function getConfigTreeBuilder(): TreeBuilder
                         ->children()
                             ->scalarNode('collection_name')->end()
                             ->scalarNode('entity')->end()
-                                ->arrayNode('fields')
-                                    ->arrayPrototype()
-                                        ->children()
-                                            ->scalarNode('entity_attribute')->end()
-                                            ->scalarNode('name')->end()
-                                            ->scalarNode('type')->end()
-                                            ->booleanNode('facet')->end()
-                                            ->booleanNode('optional')->end()
-                                        ->end()
+                            ->arrayNode('fields')
+                                ->arrayPrototype()
+                                    ->children()
+                                        ->scalarNode('entity_attribute')->end()
+                                        ->scalarNode('name')->end()
+                                        ->scalarNode('type')->end()
+                                        ->booleanNode('facet')->end()
+                                        ->booleanNode('optional')->end()
                                     ->end()
                                 ->end()
-                                ->scalarNode('default_sorting_field')->isRequired()->cannotBeEmpty()->end()
-                                ->arrayNode('finders')
-                                    ->info('Entity specific finders declaration')
-                                    ->useAttributeAsKey('name')
-                                    ->arrayPrototype()
+                            ->end()
+                            ->scalarNode('default_sorting_field')->isRequired()->cannotBeEmpty()->end()
+                            ->arrayNode('finders')
+                                ->info('Entity specific finders declaration')
+                                ->useAttributeAsKey('name')
+                                ->arrayPrototype()
                                     ->children()
                                         ->scalarNode('finder_service')->end()
                                         ->arrayNode('finder_parameters')
@@ -55,6 +55,14 @@ public function getConfigTreeBuilder(): TreeBuilder
                                     ->end()
                                 ->end()
                             ->end()
+                            ->arrayNode('token_separators')
+                                ->defaultValue([])
+                                ->scalarPrototype()->end()
+                            ->end()
+                            ->arrayNode('symbols_to_index')
+                                ->defaultValue([])
+                                ->scalarPrototype()->end()
+                            ->end()
                         ->end()
                     ->end()
                 ->end()

src/Manager/CollectionManager.php

@@ -48,12 +48,17 @@ public function createAllCollections()
         }
     }
 
-    public function deleteCollextion($collectionDefinitionName)
+    public function deleteCollection($collectionDefinitionName)
     {
         $definition = $this->collectionDefinitions[$collectionDefinitionName];
         $this->collectionClient->delete($definition['typesense_name']);
     }
 
+    public function deleteCollextion($collectionDefinitionName)
+    {
+        return $this->deleteCollection($collectionDefinitionName);
+    }
+
     public function createCollection($collectionDefinitionName)
     {
         $definition       = $this->collectionDefinitions[$collectionDefinitionName];
@@ -64,10 +69,16 @@ public function createCollection($collectionDefinitionName)
             $fields[]                = $fieldDefinition;
         }
 
+        //to pass the tests
+        $tokenSeparators = array_key_exists('token_separators', $definition) ? $definition['token_separators'] : [];
+        $symbolsToIndex  = array_key_exists('symbols_to_index', $definition) ? $definition['symbols_to_index'] : [];
+
         $this->collectionClient->create(
             $definition['typesense_name'],
             $fields,
-            $definition['default_sorting_field']
+            $definition['default_sorting_field'],
+            $tokenSeparators,
+            $symbolsToIndex
         );
     }
 }

tests/Functional/TypesenseInteractionsTest.php

@@ -308,7 +308,7 @@ private function getMockedEntityManager($books)
      *
      * @param $eventType
      */
-    private function getmockedEventCreate($book): \PHPUnit_Framework_MockObject_MockObject
+    private function getmockedEventCreate($book): \PHPUnit\Framework\MockObject\MockObject
     {
         $lifeCycleEvent = $this->createMock(LifecycleEventArgs::class);
         $lifeCycleEvent->method('getObject')->willReturn($book);