Use Auth facade to support Lumen

WildsideUK · Oct 21, 2019 · e530ea5 · e530ea5
1 parent c689c86
commit e530ea5
Show file tree

Hide file tree

Showing 4 changed files with 16 additions and 9 deletions.
diff --git a/src/Listeners/Creating.php b/src/Listeners/Creating.php
@@ -2,6 +2,8 @@
 
 namespace Wildside\Userstamps\Listeners;
 
+use Illuminate\Support\Facades\Auth;
+
 class Creating
 {
     /**
@@ -17,11 +19,11 @@ public function handle($model)
         }
 
         if (is_null($model->{$model->getCreatedByColumn()})) {
-            $model->{$model->getCreatedByColumn()} = auth()->id();
+            $model->{$model->getCreatedByColumn()} = Auth::id();
         }
 
         if (is_null($model->{$model->getUpdatedByColumn()}) && ! is_null($model->getUpdatedByColumn())) {
-            $model->{$model->getUpdatedByColumn()} = auth()->id();
+            $model->{$model->getUpdatedByColumn()} = Auth::id();
         }
     }
 }
diff --git a/src/Listeners/Deleting.php b/src/Listeners/Deleting.php
@@ -2,6 +2,8 @@
 
 namespace Wildside\Userstamps\Listeners;
 
+use Illuminate\Support\Facades\Auth;
+
 class Deleting
 {
     /**
@@ -17,7 +19,7 @@ public function handle($model)
         }
 
         if (is_null($model->{$model->getDeletedByColumn()})) {
-            $model->{$model->getDeletedByColumn()} = auth()->id();
+            $model->{$model->getDeletedByColumn()} = Auth::id();
         }
 
         $dispatcher = $model->getEventDispatcher();

diff --git a/src/Listeners/Updating.php b/src/Listeners/Updating.php
@@ -2,6 +2,8 @@
 
 namespace Wildside\Userstamps\Listeners;
 
+use Illuminate\Support\Facades\Auth;
+
 class Updating
 {
     /**
@@ -12,10 +14,10 @@ class Updating
      */
     public function handle($model)
     {
-        if (! $model->isUserstamping() || is_null(auth()->id())) {
+        if (! $model->isUserstamping() || is_null(Auth::id())) {
             return;
         }
 
-        $model->{$model->getUpdatedByColumn()} = auth()->id();
+        $model->{$model->getUpdatedByColumn()} = Auth::id();
     }
 }
diff --git a/src/UserstampsScope.php b/src/UserstampsScope.php
@@ -5,6 +5,7 @@
 use Illuminate\Database\Eloquent\Builder;
 use Illuminate\Database\Eloquent\Model;
 use Illuminate\Database\Eloquent\Scope;
+use Illuminate\Support\Facades\Auth;
 
 class UserstampsScope implements Scope
 {
@@ -29,22 +30,22 @@ public function apply(Builder $builder, Model $model)
     public function extend(Builder $builder)
     {
         $builder->macro('updateWithUserstamps', function (Builder $builder, $values) {
-            if (! $builder->getModel()->isUserstamping() || is_null(auth()->id())) {
+            if (! $builder->getModel()->isUserstamping() || is_null(Auth::id())) {
                 return $builder->update($values);
             }
 
-            $values[$builder->getModel()->getUpdatedByColumn()] = auth()->id();
+            $values[$builder->getModel()->getUpdatedByColumn()] = Auth::id();
 
             return $builder->update($values);
         });
 
         $builder->macro('deleteWithUserstamps', function (Builder $builder) {
-            if (! $builder->getModel()->isUserstamping() || is_null(auth()->id())) {
+            if (! $builder->getModel()->isUserstamping() || is_null(Auth::id())) {
                 return $builder->delete();
             }
 
             $builder->update([
-                $builder->getModel()->getDeletedByColumn() => auth()->id(),
+                $builder->getModel()->getDeletedByColumn() => Auth::id(),
             ]);
 
             return $builder->delete();