From e527b72567c1eda6d724f501db41b1d21763b1e1 Mon Sep 17 00:00:00 2001
From: Ryan Mitchell <ryan@thoughtcollective.com>
Date: Tue, 17 Oct 2023 07:08:46 +0100
Subject: [PATCH] Fix naming issues

---
 .editorconfig                              | 21 +++++++++++++++++++++
 composer.json                              | 17 +++++++----------
 src/{Mellisearch => Meilisearch}/Index.php |  7 +++----
 src/{Mellisearch => Meilisearch}/Query.php |  2 +-
 src/ServiceProvider.php                    |  6 +++---
 5 files changed, 35 insertions(+), 18 deletions(-)
 create mode 100644 .editorconfig
 rename src/{Mellisearch => Meilisearch}/Index.php (96%)
 rename src/{Mellisearch => Meilisearch}/Query.php (78%)

diff --git a/.editorconfig b/.editorconfig
new file mode 100644
index 0000000..c420b99
--- /dev/null
+++ b/.editorconfig
@@ -0,0 +1,21 @@
+root = true
+
+[*]
+charset = utf-8
+end_of_line = lf
+insert_final_newline = true
+indent_style = space
+indent_size = 4
+trim_trailing_whitespace = true
+
+[*.md]
+trim_trailing_whitespace = false
+
+[*.{yml,yaml}]
+indent_size = 2
+
+[docker-compose.yml]
+indent_size = 4
+
+[*.{js,vue}]
+indent_size = 4
diff --git a/composer.json b/composer.json
index 1362411..92b2589 100644
--- a/composer.json
+++ b/composer.json
@@ -36,12 +36,12 @@
     },
     "autoload": {
         "psr-4": {
-            "StatamicRadPack\\meilisearch\\": "src"
+            "StatamicRadPack\\Meilisearch\\": "src"
         }
     },
     "autoload-dev": {
         "psr-4": {
-            "StatamicRadPack\\meilisearch\\Tests\\": "tests"
+            "StatamicRadPack\\Meilisearch\\Tests\\": "tests"
         }
     },
     "scripts": {
@@ -56,17 +56,14 @@
         }
     },
     "extra": {
-        "statamic": {
-            "name": "meilisearch",
-            "description": "meilisearch search driver for Statamic"
-        },
         "laravel": {
             "providers": [
-                "StatamicRadPack\\meilisearch\\ServiceProvider"
+                "StatamicRadPack\\Meilisearch\\ServiceProvider"
             ]
+        },
+        "statamic": {
+            "name": "Meilisearch",
+            "description": "Meilisearch search driver for Statamic"
         }
-    },
-    "conflict": {
-        "elvenstar/statamic-meilisearch": "*"
     }
 }
diff --git a/src/Mellisearch/Index.php b/src/Meilisearch/Index.php
similarity index 96%
rename from src/Mellisearch/Index.php
rename to src/Meilisearch/Index.php
index a75ad56..9dfc662 100644
--- a/src/Mellisearch/Index.php
+++ b/src/Meilisearch/Index.php
@@ -1,12 +1,11 @@
 <?php
 
-namespace StatamicRadPack\meilisearch\meilisearch;
+namespace StatamicRadPack\Meilisearch\Meilisearch;
 
 use Illuminate\Support\Str;
-use meilisearch\Client;
-use meilisearch\Exceptions\ApiException;
+use Meilisearch\Client;
+use Meilisearch\Exceptions\ApiException;
 use Statamic\Contracts\Search\Searchable;
-use Statamic\Entries\Entry;
 use Statamic\Search\Documents;
 use Statamic\Search\Index as BaseIndex;
 
diff --git a/src/Mellisearch/Query.php b/src/Meilisearch/Query.php
similarity index 78%
rename from src/Mellisearch/Query.php
rename to src/Meilisearch/Query.php
index 92ad6d1..785132d 100644
--- a/src/Mellisearch/Query.php
+++ b/src/Meilisearch/Query.php
@@ -1,6 +1,6 @@
 <?php
 
-namespace StatamicRadPack\meilisearch\meilisearch;
+namespace StatamicRadPack\Meilisearch\Meilisearch;
 
 use Statamic\Search\QueryBuilder;
 
diff --git a/src/ServiceProvider.php b/src/ServiceProvider.php
index 77c2b9a..1486d50 100644
--- a/src/ServiceProvider.php
+++ b/src/ServiceProvider.php
@@ -1,9 +1,9 @@
 <?php
 
-namespace StatamicRadPack\meilisearch;
+namespace StatamicRadPack\Meilisearch;
 
 use Illuminate\Foundation\Application;
-use meilisearch\Client;
+use Meilisearch\Client;
 use Statamic\Facades\Search;
 use Statamic\Providers\AddonServiceProvider;
 
@@ -17,7 +17,7 @@ public function bootAddon()
                 'apiKey' => $config['credentials']['secret'],
             ]);
 
-            return $app->makeWith(meilisearch\Index::class, [
+            return $app->makeWith(Meilisearch\Index::class, [
                 'client' => $client,
                 'name' => $name,
                 'config' => $config,