Moving the "whereLike" macro to the right place

AXN-Informatique · Mar 20, 2019 · 36949b9 · 36949b9
1 parent 476c1b9
commit 36949b9
Show file tree

Hide file tree

Showing 3 changed files with 33 additions and 37 deletions.
diff --git a/changelog.md b/changelog.md
@@ -1,6 +1,12 @@
 Changelog
 =========
 
+2.1.1 (2019-03-20)
+------------------
+
+- Moving the "whereLike" macro to the right place
+- Register macro in the boot() method instead of the register() one
+
 2.1.0 (2019-03-20)
 ------------------
 

diff --git a/src/ServiceProvider.php b/src/ServiceProvider.php
@@ -3,54 +3,18 @@
 namespace Axn\Illuminate\Database;
 
 use Illuminate\Database\Connection;
-use Illuminate\Database\Eloquent\Builder;
 use Illuminate\Support\ServiceProvider as BaseServiceProvider;
-use Illuminate\Support\Str;
 
 class ServiceProvider extends BaseServiceProvider
 {
-    /**
-     * Register any application services.
-     *
-     * @return void
-     */
     public function register()
     {
         $this->replaceMySqlConnection();
-
-        require __DIR__.'/query-builder-macros.php';
     }
 
-    /**
-     * Bootstrap any application services.
-     *
-     * @return void
-     */
     public function boot()
     {
-        // Add an Eloquent "whereLike" query builder macro
-        Builder::macro('whereLike', function ($attributes, $searchTerm) {
-            $searchTerm = str_replace(' ', '%', $searchTerm);
-            $this->where(function (Builder $query) use ($attributes, $searchTerm) {
-                foreach (array_wrap($attributes) as $attribute) {
-                    $query->when(Str::contains($attribute, '.'),
-                        function (Builder $query) use ($attribute, $searchTerm) {
-                            list($relationName, $relationAttribute) = explode('.', $attribute);
-
-                            $query->orWhereHas($relationName, function (Builder $query) use ($relationAttribute, $searchTerm) {
-                                $query->where($relationAttribute, 'LIKE', "%{$searchTerm}%");
-                            });
-                        },
-                        function (Builder $query) use ($attribute, $searchTerm) {
-                            $query->orWhere($attribute, 'LIKE', "%{$searchTerm}%");
-                        }
-                    );
-                }
-            });
-
-            return $this;
-        });
-
+        require __DIR__.'/query-builder-macros.php';
     }
 
     /**

diff --git a/src/query-builder-macros.php b/src/query-builder-macros.php
@@ -1,6 +1,8 @@
 <?php
 
 use Illuminate\Database\Query\Builder as QueryBuilder;
+use Illuminate\Support\Arr;
+use Illuminate\Support\Str;
 
 /**
  * Natural sorting.
@@ -25,3 +27,27 @@ function($column, $direction = 'asc') {
         );
     }
 );
+
+// Add an Eloquent "whereLike" query builder macro
+QueryBuilder::macro('whereLike', function ($attributes, $searchTerm) {
+    $searchTerm = str_replace(' ', '%', $searchTerm);
+
+    $this->where(function (QueryBuilder $query) use ($attributes, $searchTerm) {
+        foreach (Arr::wrap($attributes) as $attribute) {
+            $query->when(Str::contains($attribute, '.'),
+                function (QueryBuilder $query) use ($attribute, $searchTerm) {
+                    list($relationName, $relationAttribute) = explode('.', $attribute);
+
+                    $query->orWhereHas($relationName, function (QueryBuilder $query) use ($relationAttribute, $searchTerm) {
+                        $query->where($relationAttribute, 'LIKE', "%{$searchTerm}%");
+                    });
+                },
+                function (QueryBuilder $query) use ($attribute, $searchTerm) {
+                    $query->orWhere($attribute, 'LIKE', "%{$searchTerm}%");
+                }
+            );
+        }
+    });
+
+    return $this;
+});