Fix formatting.

liran-co · Jan 15, 2021 · 9f2898f · 9f2898f
1 parent 6cc6687
commit 9f2898f
Show file tree

Hide file tree

Showing 6 changed files with 74 additions and 75 deletions.
diff --git a/config/notification-subscriptions.php b/config/notification-subscriptions.php
@@ -1,7 +1,7 @@
 <?php
 
 return [
-	
-	'excluded_channels' => ['database'],
+    
+    'excluded_channels' => ['database'],
 
 ];
diff --git a/src/Listeners/NotificationSendingListener.php b/src/Listeners/NotificationSendingListener.php
@@ -33,8 +33,10 @@ public function handle(NotificationSending $event)
 
         $subscribed = $event->notifiable->isSubscribed(get_class($event->notification), $event->channel, $model, $optin);
 
-        if (! $subscribed) return false;
+        if (! $subscribed) {
+            return false;
+        }
 
         return $event;
     }
-}
+}
diff --git a/src/Models/NotificationSubscription.php b/src/Models/NotificationSubscription.php
@@ -1,12 +1,11 @@
-<?php 
+<?php
 
 namespace LiranCo\NotificationSubscriptions\Models;
 
 use Illuminate\Database\Eloquent\Model;
 
 class NotificationSubscription extends Model
 {
-
     public $incrementing = true;
 
     protected $table = 'notification_subscriptions';
@@ -41,5 +40,4 @@ public function resubscribe()
     {
         $this->forceFill(['unsubscribed_at' => null])->save();
     }
-
 }
diff --git a/src/NotificationSubscriptionsServiceProvider.php b/src/NotificationSubscriptionsServiceProvider.php
@@ -18,9 +18,10 @@ public function boot()
     public function register()
     {
         $this->mergeConfigFrom(
-            __DIR__.'/../config/notification-subscriptions.php', 'notification-subscriptions'
+            __DIR__.'/../config/notification-subscriptions.php',
+            'notification-subscriptions'
         );
 
-    	$this->app->register(\LiranCo\NotificationSubscriptions\Providers\EventServiceProvider::class);
+        $this->app->register(\LiranCo\NotificationSubscriptions\Providers\EventServiceProvider::class);
     }
 }
diff --git a/src/Providers/EventServiceProvider.php b/src/Providers/EventServiceProvider.php
@@ -6,10 +6,10 @@
 
 class EventServiceProvider extends ServiceProvider
 {
-	protected $listen = [
-	    'Illuminate\Notifications\Events\NotificationSending' => [
-	        'LiranCo\NotificationSubscriptions\Listeners\NotificationSendingListener',
-	    ],
+    protected $listen = [
+        'Illuminate\Notifications\Events\NotificationSending' => [
+            'LiranCo\NotificationSubscriptions\Listeners\NotificationSendingListener',
+        ],
     ];
 
     public function boot()

diff --git a/src/Traits/HasNotificationSubscriptions.php b/src/Traits/HasNotificationSubscriptions.php
@@ -6,66 +6,64 @@
 
 trait HasNotificationSubscriptions
 {
-
-	public function notificationSubscriptions()
-	{
-		return $this->morphMany(NotificationSubscription::class, 'notifiable');
-	}
-
-	public function subscribe($type, $channel = '*', $model = null) 
-	{
-		$subscription = $this->findSubscription($type, $channel, $model);
-
-		if ($subscription) {
-			return $subscription->resubscribe();
-		}
-
-		return $this->createSubscription($type, $channel, $model);
-	}
-
-	public function unsubscribe($type, $channel = '*', $model = null)
-	{
-		$subscription = $this->findSubscription($type, $channel, $model);
-
-		if ($subscription) {
-			return $subscription->unsubscribe();
-		}
-
-		return $this->createSubscription($type, $channel, $model, true);
-	}
-
-	public function findSubscription($type, $channel = '*', $model = null)
-	{
-		return $this->notificationSubscriptions()->where('type', $type)->where('channel', $channel)->model($model)->first();
-	}
-
-	public function createSubscription($type, $channel = '*', $model = null, $unsubscribe = false) 
-	{
-		return $this->notificationSubscriptions()->create([
-			'type' => $type,
-			'channel' => $channel,
-			'model_type' => $model ? get_class($model) : null,
-			'model_id' => optional($model)->id,
-			'unsubscribed_at' => $unsubscribe ? $this->freshTimestamp() : null
-		]);
-	}
+    public function notificationSubscriptions()
+    {
+        return $this->morphMany(NotificationSubscription::class, 'notifiable');
+    }
+
+    public function subscribe($type, $channel = '*', $model = null)
+    {
+        $subscription = $this->findSubscription($type, $channel, $model);
+
+        if ($subscription) {
+            return $subscription->resubscribe();
+        }
+
+        return $this->createSubscription($type, $channel, $model);
+    }
+
+    public function unsubscribe($type, $channel = '*', $model = null)
+    {
+        $subscription = $this->findSubscription($type, $channel, $model);
+
+        if ($subscription) {
+            return $subscription->unsubscribe();
+        }
+
+        return $this->createSubscription($type, $channel, $model, true);
+    }
+
+    public function findSubscription($type, $channel = '*', $model = null)
+    {
+        return $this->notificationSubscriptions()->where('type', $type)->where('channel', $channel)->model($model)->first();
+    }
+
+    public function createSubscription($type, $channel = '*', $model = null, $unsubscribe = false)
+    {
+        return $this->notificationSubscriptions()->create([
+            'type' => $type,
+            'channel' => $channel,
+            'model_type' => $model ? get_class($model) : null,
+            'model_id' => optional($model)->id,
+            'unsubscribed_at' => $unsubscribe ? $this->freshTimestamp() : null
+        ]);
+    }
 
-	public function isSubscribed($type, $channel, $model = null, $optin = [])
-	{
-		$subscription = $this->findSubscription($type, $channel, $model) ?: $this->findSubscription($type, "*", $model);
-
-		if (! $subscription) {
-			return ! in_array($channel, $optin);
-		}
-
-		return $subscription->isSubscribed();
-	}
-
-	public function resetSubscriptions($type, $model = null)
-	{
-		$this->notificationSubscriptions()->where('type', $type)->model($model)->delete();
-
-		return $this;
-	}
-
-}
+    public function isSubscribed($type, $channel, $model = null, $optin = [])
+    {
+        $subscription = $this->findSubscription($type, $channel, $model) ?: $this->findSubscription($type, "*", $model);
+
+        if (! $subscription) {
+            return ! in_array($channel, $optin);
+        }
+
+        return $subscription->isSubscribed();
+    }
+
+    public function resetSubscriptions($type, $model = null)
+    {
+        $this->notificationSubscriptions()->where('type', $type)->model($model)->delete();
+
+        return $this;
+    }
+}