razisayyed / laravel-cascaded-soft-deletes

phpunit.php

Spacing +1 added lines, -1 removed lines

@@ -3,7 +3,7 @@
 include __DIR__.'/vendor/autoload.php';
 
 $capsule = new \Illuminate\Database\Capsule\Manager;
-$capsule->addConnection([ 'driver' => 'sqlite', 'database' => ':memory:', 'prefix' => 'prfx_' ]);
+$capsule->addConnection(['driver' => 'sqlite', 'database' => ':memory:', 'prefix' => 'prfx_']);
 $capsule->setEventDispatcher(new \Illuminate\Events\Dispatcher);
 $capsule->bootEloquent();
 $capsule->setAsGlobal();

src/Traits/CascadedSoftDeletes.php

Spacing +16 added lines, -18 removed lines

@@ -24,16 +24,16 @@ 
     protected static function bootCascadedSoftDeletes()
     {
 
-        static::deleted(function ($model) {
+        static::deleted(function($model) {
             $model->deleteCascadedSoftDeletes();
         });
 
         if (static::instanceUsesSoftDelete()) {
-            static::restoring(function ($model) {
+            static::restoring(function($model) {
                 static::$instanceDeletedAt = $model->{$model->getDeletedAtColumn()};
             });
 
-            static::restored(function ($model) {
+            static::restored(function($model) {
                 $model->restoreCascadedSoftDeleted();
             });
         }
@@ -44,17 +44,16 @@ 
      */
     protected function deleteCascadedSoftDeletes() : void
     {
-        if($this->isHardDeleting())
+        if ($this->isHardDeleting())
             return;
 
-        if(config('cascaded-soft-deletes.queue_cascades_by_default') === true) {
+        if (config('cascaded-soft-deletes.queue_cascades_by_default') === true) {
             CascadeSoftDeletes::dispatch($this, 'delete', null)->onQueue(config('cascaded-soft-deletes.queue_name'));
         }
         else {
             // @codeCoverageIgnoreStart
             Str::startsWith(app()->version(), "7") ? 
-                CascadeSoftDeletes::dispatchNow($this, 'delete', null) : 
-                CascadeSoftDeletes::dispatchSync($this, 'delete', null); 
+                CascadeSoftDeletes::dispatchNow($this, 'delete', null) : CascadeSoftDeletes::dispatchSync($this, 'delete', null); 
             // @codeCoverageIgnoreEnd
         }
 
@@ -65,14 +64,13 @@ 
      */
     protected function restoreCascadedSoftDeleted() : void
     {
-        if(config('cascaded-soft-deletes.queue_cascades_by_default') === true) {
+        if (config('cascaded-soft-deletes.queue_cascades_by_default') === true) {
             CascadeSoftDeletes::dispatch($this, 'restore', static::$instanceDeletedAt)->onQueue(config('cascaded-soft-deletes.queue_name'));
         }
         else {
             // @codeCoverageIgnoreStart
             Str::startsWith(app()->version(), "7") ? 
-                CascadeSoftDeletes::dispatchNow($this, 'restore', static::$instanceDeletedAt) :
-                CascadeSoftDeletes::dispatchSync($this, 'restore', static::$instanceDeletedAt);
+                CascadeSoftDeletes::dispatchNow($this, 'restore', static::$instanceDeletedAt) : CascadeSoftDeletes::dispatchSync($this, 'restore', static::$instanceDeletedAt);
             // @codeCoverageIgnoreEnd
         }
         // CascadeSoftDeletes::dispatch($this, 'restore', static::$instanceDeletedAt);
@@ -85,9 +83,9 @@ 
      */
     public function cascadeSoftDeletes(string $action, ?\Carbon\Carbon $instanceDeletedAt = null) : void
     {
-        if(method_exists($this, 'getCascadedSoftDeletes')) {
+        if (method_exists($this, 'getCascadedSoftDeletes')) {
             $relations = collect($this->getCascadedSoftDeletes());
-        } else if(property_exists($this, 'cascadedSoftDeletes')) {
+        } else if (property_exists($this, 'cascadedSoftDeletes')) {
             $relations = collect($this->cascadedSoftDeletes);
         } else {
             throw new RuntimeException('neither getCascadedSoftDeletes function or cascaded_soft_deletes property exists!');
@@ -96,18 +94,18 @@ 
         $relations->each(function($item, $key) use ($action, $instanceDeletedAt) {
 
             $relation = $key;
-            if(is_numeric($key))
+            if (is_numeric($key))
                 $relation = $item;
 
-            if(!is_callable($item) && !$this->relationUsesSoftDelete($relation))
+            if (!is_callable($item) && !$this->relationUsesSoftDelete($relation))
                 throw new LogicException('relationship '.$relation.' does not use SoftDeletes trait.');
 
-            if(is_callable($item))
+            if (is_callable($item))
                 $query = $item();
             else
                 $query = $this->{$relation}();
 
-            if($action == 'delete')
+            if ($action == 'delete')
                 $query->get()->each->delete();
             else
                 $query
@@ -137,7 +135,7 @@ 
      */
     protected function isHardDeleting() : bool
     {
-        return ! $this->instanceUsesSoftDelete() || $this->forceDeleting;
+        return !$this->instanceUsesSoftDelete() || $this->forceDeleting;
     }
 
     /**
@@ -167,7 +165,7 @@ 
     {
         static $softDeletes;
 
-        if(is_null($softDeletes))
+        if (is_null($softDeletes))
             $softDeletes = collect([]);
 
         return $softDeletes->get($relation, function() use($relation, $softDeletes) {

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;