Merge branch 'master' into bump-meilisearch-v0.19.0

Author: curquiza

CONTRIBUTING.md

@@ -16,7 +16,7 @@ First of all, thank you for contributing to MeiliSearch! The goal of this docume
 
 1. **You're familiar with [GitHub](https://github.com) and the [Pull Request](https://help.github.com/en/github/collaborating-with-issues-and-pull-requests/about-pull-requests) (PR) workflow.**
 2. **You've read the MeiliSearch [documentation](https://docs.meilisearch.com) and the [README](/README.md).**
-3. **You know about the [MeiliSearch community](https://docs.meilisearch.com/resources/contact.html). Please use this for help.**
+3. **You know about the [MeiliSearch community](https://docs.meilisearch.com/learn/what_is_meilisearch/contact.html). Please use this for help.**
 
 ## How to Contribute
 
@@ -124,6 +124,8 @@ _[Read more about this](https://github.com/meilisearch/integration-guides/blob/m
 
 ### How to Publish the Release
 
+⚠️ Before doing anything, make sure you got through the guide about [Releasing an Integration Tool](https://github.com/meilisearch/integration-guides/blob/master/guides/integration-tool-release.md).
+
 Make a PR modifying the file [`src/MeiliSearchBundle.php`](/src/MeiliSearchBundle.php) with the right version.
 
 ```ruby

README.md

@@ -28,26 +28,38 @@
 
 ## Table of Contents <!-- omit in toc -->
 
-- [🤖 Compatibility with MeiliSearch](#-compatibility-with-meilisearch)
-- [✨ Features](#-features)
 - [📖 Documentation](#-documentation)
+- [📝 Requirements](#-requirements)
+- [🤖 Compatibility with MeiliSearch](#-compatibility-with-meilisearch)
+- [💡 Learn More](#-learn-more)
 - [⚙️ Development Workflow and Contributing](#️-development-workflow-and-contributing)
 
-## 🤖 Compatibility with MeiliSearch
+## 📖 Documentation
 
-This package only guarantees the compatibility with the [version v0.19.0 of MeiliSearch](https://github.com/meilisearch/MeiliSearch/releases/tag/v0.19.0).
+Check out the [Uncyclo](https://github.com/meilisearch/meilisearch-symfony/wiki) of this repository to get started! 🚀
+
+Also, see our [Documentation](https://docs.meilisearch.com/learn/tutorials/getting_started.html) or our [API References](https://docs.meilisearch.com/reference/api/).
 
-## ✨ Features
+## 📝 Requirements
 
 * **Require** PHP 7.2 and later.
 * **Compatible** with Symfony 4.0 and later.
 * **Support** Doctrine ORM and Doctrine MongoDB.
 
-## 📖 Documentation
+## 🤖 Compatibility with MeiliSearch
+
+This package only guarantees the compatibility with the [version v0.19.0 of MeiliSearch](https://github.com/meilisearch/MeiliSearch/releases/tag/v0.19.0).
+
+## 💡 Learn More
+
+The following sections may interest you:
 
-Complete documentation of the MeiliSearch Bundle is available in the [Uncyclo section](https://github.com/meilisearch/meilisearch-symfony/wiki).
+- **Manipulate documents**: see the [API references](https://docs.meilisearch.com/reference/api/documents.html) or read more about [documents](https://docs.meilisearch.com/learn/core_concepts/documents.html).
+- **Search**: see the [API references](https://docs.meilisearch.com/reference/api/search.html) or follow our guide on [search parameters](https://docs.meilisearch.com/reference/features/search_parameters.html).
+- **Manage the indexes**: see the [API references](https://docs.meilisearch.com/reference/api/indexes.html) or read more about [indexes](https://docs.meilisearch.com/learn/core_concepts/indexes.html).
+- **Configure the index settings**: see the [API references](https://docs.meilisearch.com/reference/api/settings.html) or follow our guide on [settings parameters](https://docs.meilisearch.com/reference/features/settings.html).
 
-You can also check out the [MeiliSearch documentation](https://docs.meilisearch.com/guides/introduction/quick_start_guide.html).
+📖 Also, check out the [Uncyclo](https://github.com/meilisearch/meilisearch-symfony/wiki) of this repository!
 
 ## ⚙️ Development Workflow and Contributing
 

composer.json

@@ -20,7 +20,7 @@
     "require": {
         "php": "^7.2",
         "ext-json": "*",
-        "meilisearch/meilisearch-php": "^0.15",
+        "meilisearch/meilisearch-php": "^0.16",
         "symfony/filesystem": "^4.0 || ^5.0",
         "symfony/property-access": "^4.0 || ^5.0",
         "symfony/serializer": "^4.0 || ^5.0"

src/Command/MeiliSearchImportCommand.php

@@ -182,7 +182,7 @@ private function formatIndexingResponse(array $batch): array
                     $formattedResponse[$indexName] = 0;
                 }
 
-                $indexInstance = $this->searchClient->getIndex($indexName);
+                $indexInstance = $this->searchClient->index($indexName);
 
                 // Get Update status from updateID
                 $indexInstance->waitForPendingUpdate($apiResponse['updateId']);

src/Engine.php

@@ -106,7 +106,7 @@ public function remove($searchableEntities): array
         $result = [];
         foreach ($data as $indexName => $objects) {
             $result[$indexName] = $this->client
-                ->getIndex($indexName)
+                ->index($indexName)
                 ->deleteDocument(reset($objects));
         }
 
@@ -148,17 +148,17 @@ public function delete(string $indexName): ?array
      *
      * @param string $query
      * @param string $indexName
-     * @param array  $requestOptions
+     * @param array  $searchParams
      *
      * @return array
      */
-    public function search(string $query, string $indexName, array $requestOptions): array
+    public function search(string $query, string $indexName, array $searchParams): array
     {
         if ('' === $query) {
             $query = null;
         }
 
-        return $this->client->getIndex($indexName)->search($query, $requestOptions);
+        return $this->client->index($indexName)->rawSearch($query, $searchParams);
     }
 
     /**
@@ -172,6 +172,6 @@ public function search(string $query, string $indexName, array $requestOptions):
      */
     public function count(string $query, string $indexName, array $requestOptions): int
     {
-        return (int) $this->client->getIndex($indexName)->search($query, $requestOptions)['nbHits'];
+        return (int) $this->client->index($indexName)->search($query, $requestOptions)['nbHits'];
     }
 }

src/MeiliSearchBundle.php

@@ -11,5 +11,5 @@
  */
 final class MeiliSearchBundle extends Bundle
 {
-    const VERSION = '0.2.4';
+    const VERSION = '0.2.5';
 }

tests/TestCase/SettingsTest.php

@@ -93,7 +93,7 @@ public function testUpdateSettings()
             ]
         );
 
-        $settings = $this->client->getIndex('sf_phpunit__posts')->getSettings();
+        $settings = $this->client->index('sf_phpunit__posts')->getSettings();
 
         $this->assertNotEmpty($settings['stopWords']);
         $this->assertEquals(['a', 'an', 'the'], $settings['stopWords']);