razisayyed / laravel-cascaded-soft-deletes

src/Traits/CascadedSoftDeletes.php

Braces +27 added lines, -23 removed lines

@@ -44,13 +44,13 @@ 
      */
     protected function deleteCascadedSoftDeletes() : void
     {
-        if($this->isHardDeleting())
-            return;
+        if($this->isHardDeleting()) {
+                    return;
+        }
 
         if(config('cascaded-soft-deletes.queue_cascades_by_default') === true) {
             CascadeSoftDeletes::dispatch($this, 'delete', null)->onQueue(config('cascaded-soft-deletes.queue_name'));
-        }
-        else {
+        } else {
             // @codeCoverageIgnoreStart
             Str::startsWith(app()->version(), "7") ? 
                 CascadeSoftDeletes::dispatchNow($this, 'delete', null) : 
@@ -67,8 +67,7 @@ 
     {
         if(config('cascaded-soft-deletes.queue_cascades_by_default') === true) {
             CascadeSoftDeletes::dispatch($this, 'restore', static::$instanceDeletedAt)->onQueue(config('cascaded-soft-deletes.queue_name'));
-        }
-        else {
+        } else {
             // @codeCoverageIgnoreStart
             Str::startsWith(app()->version(), "7") ? 
                 CascadeSoftDeletes::dispatchNow($this, 'restore', static::$instanceDeletedAt) :
@@ -96,26 +95,30 @@ 
         $relations->each(function($item, $key) use ($action, $instanceDeletedAt) {
 
             $relation = $key;
-            if(is_numeric($key))
-                $relation = $item;
-
-            if(!is_callable($item) && !$this->relationUsesSoftDelete($relation))
-                throw new LogicException('relationship '.$relation.' does not use SoftDeletes trait.');
-
-            if(is_callable($item))
-                $query = $item();
-            else
-                $query = $this->{$relation}();
-
-            if($action == 'delete')
-                $query->get()->each->delete();
-            else
-                $query
+            if(is_numeric($key)) {
+                            $relation = $item;
+            }
+
+            if(!is_callable($item) && !$this->relationUsesSoftDelete($relation)) {
+                            throw new LogicException('relationship '.$relation.' does not use SoftDeletes trait.');
+            }
+
+            if(is_callable($item)) {
+                            $query = $item();
+            } else {
+                            $query = $this->{$relation}();
+            }
+
+            if($action == 'delete') {
+                            $query->get()->each->delete();
+            } else {
+                            $query
                     ->onlyTrashed()
                     ->where($this->getDeletedAtColumn(), '>=', $instanceDeletedAt->format('Y-m-d H:i:s.u'))
                     ->get()
                     ->each
                     ->restore();
+            }
 
             // else {
             //     $query = $query
@@ -167,8 +170,9 @@ 
     {
         static $softDeletes;
 
-        if(is_null($softDeletes))
-            $softDeletes = collect([]);
+        if(is_null($softDeletes)) {
+                    $softDeletes = collect([]);
+        }
 
         return $softDeletes->get($relation, function() use($relation, $softDeletes) {
             $instance = new static;