formatting and fixes

src/ModelObserver.php

@@ -2,6 +2,7 @@
 
 namespace Laravel\Scout;
 
+use Closure;
 use Illuminate\Database\Eloquent\SoftDeletes;
 use Illuminate\Support\Facades\Config;
 
@@ -22,19 +23,18 @@ class ModelObserver
     protected $usingSoftDeletes;
 
     /**
-     * The class names that syncing is disabled for.
+     * Indicates if the model is currently force saving.
      *
-     * @var array
+     * @var bool
      */
-    protected static $syncingDisabledFor = [];
+    protected $forceSaving = false;
 
     /**
-     * Indicates if the model is currently force saving.
-     * When force saving we dismiss the sensitive attributes check.
+     * The class names that syncing is disabled for.
      *
-     * @var bool
+     * @var array
      */
-    protected $forceSaving = false;
+    protected static $syncingDisabledFor = [];
 
     /**
      * Create a new observer instance.
@@ -109,19 +109,6 @@ public function saved($model)
         $model->searchable();
     }
 
-    /**
-     * Handle the saved event for the model without checking for sensitive attributes.
-     *
-     * @param  \Illuminate\Database\Eloquent\Model  $model
-     * @return void
-     */
-    protected function forceSaved($model)
-    {
-        $this->forceSaving = true;
-        $this->saved($model);
-        $this->forceSaving = false;
-    }
-
     /**
      * Handle the deleted event for the model.
      *
@@ -139,7 +126,9 @@ public function deleted($model)
         }
 
         if ($this->usingSoftDeletes && $this->usesSoftDelete($model)) {
-            $this->forceSaved($model);
+            $this->whileForcingUpdate(function () use ($model) {
+                $this->saved($model);
+            });
         } else {
             $model->unsearchable();
         }
@@ -168,7 +157,26 @@ public function forceDeleted($model)
      */
     public function restored($model)
     {
-        $this->forceSaved($model);
+        $this->whileForcingUpdate(function () use ($model) {
+            $this->saved($model);
+        });
+    }
+
+    /**
+     * Execute the given callback while forcing updates.
+     *
+     * @param  \Closure  $callback
+     * @return mixed
+     */
+    protected function whileForcingUpdate(Closure $callback)
+    {
+        $this->forceSaving = true;
+
+        $result = $callback();
+
+        $this->forceSaving = false;
+
+        return $result;
     }
 
     /**

src/Searchable.php

@@ -99,12 +99,11 @@ public function shouldBeSearchable()
     }
 
     /**
-     * When updating a model, this method determines if we
-     * should perform a search engine update or not.
+     * When updating a model, this method determines if we should update the search index.
      *
      * @return bool
      */
-    public function searchShouldUpdate(): bool
+    public function searchIndexShouldBeUpdated()
     {
         return true;
     }