Merge pull request #1 from Laralum/analysis-Xk73Mj

Apply fixes from StyleCI
Laralum · Apr 15, 2017 · 84bc2dd · 84bc2dd
2 parents a9e7b8d + b4ec8f1
commit 84bc2dd
Show file tree

Hide file tree

Showing 19 changed files with 297 additions and 297 deletions.
diff --git a/src/Controllers/NotificationsController.php b/src/Controllers/NotificationsController.php
@@ -3,12 +3,12 @@
 namespace Laralum\Notifications\Controllers;
 
 use App\Http\Controllers\Controller;
+use Auth;
+use Illuminate\Http\Request;
 use Laralum\Notifications\Models\Notification;
 use Laralum\Notifications\Models\Settings;
-use Illuminate\Http\Request;
-use Laralum\Users\Models\User;
 use Laralum\Notifications\Notifications\MessageNotification;
-use Auth;
+use Laralum\Users\Models\User;
 
 class NotificationsController extends Controller
 {
@@ -32,6 +32,7 @@ public function show(Notification $notification)
         $this->authorize('view', $notification);
 
         $notification->markAsRead();
+
         return view('laralum_notifications::show', ['notification' => $notification]);
     }
 
@@ -50,15 +51,16 @@ public function create()
     /**
      * Store a newly created notification in storage.
      *
-     * @param  \Illuminate\Http\Request  $request
+     * @param \Illuminate\Http\Request $request
+     *
      * @return \Illuminate\Http\Response
      */
     public function store(Request $request)
     {
         $this->authorize('create', Notification::class);
 
         $this->validate($request, [
-            'email' => 'required|email|exists:users,email',
+            'email'   => 'required|email|exists:users,email',
             'subject' => 'required|min:10|max:30',
             'message' => 'required|max:1500',
         ]);
@@ -68,7 +70,6 @@ public function store(Request $request)
         User::where(['email' => $request->email])->first()
                     ->notify(new MessageNotification($request->subject, $request->message, $me));
 
-
         return redirect()->route('laralum::notifications.index')->with('success', __('laralum_notifications::general.notification_sent'));
     }
 

diff --git a/src/DatabaseNotification.php b/src/DatabaseNotification.php
@@ -33,7 +33,7 @@ class DatabaseNotification extends Model
      * @var array
      */
     protected $casts = [
-        'data' => 'array',
+        'data'    => 'array',
         'read_at' => 'datetime',
     ];
 
@@ -80,7 +80,8 @@ public function unread()
     /**
      * Create a new database notification collection instance.
      *
-     * @param  array  $models
+     * @param array $models
+     *
      * @return \Illuminate\Notifications\DatabaseNotificationCollection
      */
     public function newCollection(array $models = [])

diff --git a/src/Injectors/user.php b/src/Injectors/user.php
@@ -2,12 +2,12 @@
 
 return [
     [
-        'text'  => __('laralum_notifications::general.my_notifications'),
-        'url'   => route('laralum::notifications.index'),
+        'text'    => __('laralum_notifications::general.my_notifications'),
+        'url'     => route('laralum::notifications.index'),
         'counter' => Laralum\Users\Models\User::findOrFail(Auth::id())->unreadNotifications->count(),
     ],
     [
         'text'  => __('laralum_notifications::general.create_notification'),
         'url'   => route('laralum::notifications.create'),
-    ]
+    ],
 ];
diff --git a/src/Migrations/2017_02_23_182920_create_laralum_notifications.php b/src/Migrations/2017_02_23_182920_create_laralum_notifications.php
@@ -1,8 +1,8 @@
 <?php
 
-use Illuminate\Support\Facades\Schema;
-use Illuminate\Database\Schema\Blueprint;
 use Illuminate\Database\Migrations\Migration;
+use Illuminate\Database\Schema\Blueprint;
+use Illuminate\Support\Facades\Schema;
 
 class CreateLaralumNotifications extends Migration
 {

diff --git a/src/Migrations/2017_02_24_182920_create_laralum_notifications_settings.php b/src/Migrations/2017_02_24_182920_create_laralum_notifications_settings.php
@@ -1,8 +1,8 @@
 <?php
 
-use Illuminate\Support\Facades\Schema;
-use Illuminate\Database\Schema\Blueprint;
 use Illuminate\Database\Migrations\Migration;
+use Illuminate\Database\Schema\Blueprint;
+use Illuminate\Support\Facades\Schema;
 use Laralum\Notifications\Models\Settings;
 
 class CreateLaralumNotificationsSettings extends Migration
@@ -21,7 +21,7 @@ public function up()
         });
 
         Settings::create([
-            'mail_enabled'  => false
+            'mail_enabled'  => false,
         ]);
     }
 

diff --git a/src/Models/Notification.php b/src/Models/Notification.php
@@ -12,5 +12,4 @@ class Notification extends DatabaseNotification
      * @var string
      */
     protected $table = 'laralum_notifications';
-
 }
diff --git a/src/Models/Settings.php b/src/Models/Settings.php
@@ -19,7 +19,6 @@ class Settings extends DatabaseNotification
      * @var array
      */
     protected $fillable = [
-        'mail_enabled'
+        'mail_enabled',
     ];
-
 }
diff --git a/src/Notifications/MessageNotification.php b/src/Notifications/MessageNotification.php
@@ -3,9 +3,8 @@
 namespace Laralum\Notifications\Notifications;
 
 use Illuminate\Bus\Queueable;
-use Illuminate\Notifications\Notification;
-use Illuminate\Contracts\Queue\ShouldQueue;
 use Illuminate\Notifications\Messages\MailMessage;
+use Illuminate\Notifications\Notification;
 use Laralum\Notifications\Models\Settings;
 
 class MessageNotification extends Notification
@@ -31,7 +30,8 @@ public function __construct($subject, $message, $user = null)
     /**
      * Get the notification's delivery channels.
      *
-     * @param  mixed  $notifiable
+     * @param mixed $notifiable
+     *
      * @return array
      */
     public function via($notifiable)
@@ -42,12 +42,13 @@ public function via($notifiable)
     /**
      * Get the mail representation of the notification.
      *
-     * @param  mixed  $notifiable
+     * @param mixed $notifiable
+     *
      * @return \Illuminate\Notifications\Messages\MailMessage
      */
     public function toMail($notifiable)
     {
-        return (new MailMessage)
+        return (new MailMessage())
                     ->subject($this->subject)
                     ->greeting(__('laralum_notifications::general.new_notification'))
                     ->line(__('laralum_notifications::general.new_message'))
@@ -57,15 +58,16 @@ public function toMail($notifiable)
     /**
      * Get the database representation of the notification.
      *
-     * @param  mixed  $notifiable
+     * @param mixed $notifiable
+     *
      * @return array
      */
-    public function toDatabase ($notifiable)
+    public function toDatabase($notifiable)
     {
         return [
             'subject' => $this->subject,
             'message' => $this->message,
-            'user' => $this->user,
+            'user'    => $this->user,
         ];
     }
 }
diff --git a/src/NotificationsServiceProvider.php b/src/NotificationsServiceProvider.php
@@ -2,14 +2,12 @@
 
 namespace Laralum\Notifications;
 
-use Illuminate\Support\ServiceProvider;
 use Illuminate\Support\Facades\Gate;
-
+use Illuminate\Support\ServiceProvider;
 use Laralum\Notifications\Models\Notification;
-use Laralum\Notifications\Policies\NotificationsPolicy;
 use Laralum\Notifications\Models\Settings;
+use Laralum\Notifications\Policies\NotificationsPolicy;
 use Laralum\Notifications\Policies\SettingsPolicy;
-
 use Laralum\Permissions\PermissionsChecker;
 
 class NotificationsServiceProvider extends ServiceProvider
@@ -21,7 +19,7 @@ class NotificationsServiceProvider extends ServiceProvider
      */
     protected $policies = [
         Notification::class => NotificationsPolicy::class,
-        Settings::class => SettingsPolicy::class,
+        Settings::class     => SettingsPolicy::class,
     ];
 
     /**
@@ -33,23 +31,23 @@ class NotificationsServiceProvider extends ServiceProvider
         [
             'name' => 'Notifications Access',
             'slug' => 'laralum::notifications.access',
-            'desc' => "Grants access to laralum/notifications module",
+            'desc' => 'Grants access to laralum/notifications module',
         ],
         [
             'name' => 'Create Notifications',
             'slug' => 'laralum::notifications.create',
-            'desc' => "Allows creating notifications",
+            'desc' => 'Allows creating notifications',
         ],
         [
             'name' => 'View Notifications',
             'slug' => 'laralum::notifications.view',
-            'desc' => "Allows viewing notifications",
+            'desc' => 'Allows viewing notifications',
         ],
         [
             'name' => 'Edit Notifications Settings',
             'slug' => 'laralum::notifications.settings',
             'desc' => 'Allows edititing the notification settings',
-        ]
+        ],
     ];
 
     /**
@@ -75,7 +73,7 @@ public function boot()
     }
 
     /**
-     * I cheated this comes from the AuthServiceProvider extended by the App\Providers\AuthServiceProvider
+     * I cheated this comes from the AuthServiceProvider extended by the App\Providers\AuthServiceProvider.
      *
      * Register the application's policies.
      *

diff --git a/src/Policies/NotificationsPolicy.php b/src/Policies/NotificationsPolicy.php
@@ -2,9 +2,9 @@
 
 namespace Laralum\Notifications\Policies;
 
-use Laralum\Users\Models\User;
-use Laralum\Notifications\Models\Notification;
 use Illuminate\Auth\Access\HandlesAuthorization;
+use Laralum\Notifications\Models\Notification;
+use Laralum\Users\Models\User;
 
 class NotificationsPolicy
 {
@@ -26,7 +26,8 @@ public function before($user, $ability)
     /**
      * Determine if the current user can access notifications module.
      *
-     * @param  mixed $user
+     * @param mixed $user
+     *
      * @return bool
      */
     public function access($user)
@@ -37,7 +38,8 @@ public function access($user)
     /**
      * Determine if the current user can view the notifications.
      *
-     * @param  mixed $user
+     * @param mixed $user
+     *
      * @return bool
      */
     public function view($user, Notification $notification)
@@ -58,12 +60,12 @@ public function view($user, Notification $notification)
     /**
      * Determine if the current user can create notifications.
      *
-     * @param  mixed  $user
+     * @param mixed $user
+     *
      * @return bool
      */
     public function create($user)
     {
         return User::findOrFail($user->id)->hasPermission('laralum::notifications.create');
     }
-
 }
diff --git a/src/Policies/SettingsPolicy.php b/src/Policies/SettingsPolicy.php
@@ -2,8 +2,8 @@
 
 namespace Laralum\Notifications\Policies;
 
-use Laralum\Users\Models\User;
 use Illuminate\Auth\Access\HandlesAuthorization;
+use Laralum\Users\Models\User;
 
 class SettingsPolicy
 {
@@ -25,12 +25,12 @@ public function before($user, $ability)
     /**
      * Determine if the current user can edit the notification settings.
      *
-     * @param  mixed  $user
+     * @param mixed $user
+     *
      * @return bool
      */
     public function update($user)
     {
         return User::findOrFail($user->id)->hasPermission('laralum::notifications.settings');
     }
-
 }
diff --git a/src/Routes/web.php b/src/Routes/web.php
@@ -5,10 +5,10 @@
             'web', 'laralum.base', 'laralum.auth',
             'can:access,Laralum\Notifications\Models\Notification',
         ],
-        'prefix' => config('laralum.settings.base_url'),
+        'prefix'    => config('laralum.settings.base_url'),
         'namespace' => 'Laralum\Notifications\Controllers',
-        'as' => 'laralum::'
+        'as'        => 'laralum::',
     ], function () {
         Route::post('notifications/settings', 'NotificationsController@settings')->name('notifications.settings.update');
         Route::resource('notifications', 'NotificationsController', ['only' => ['index', 'show', 'create', 'store']]);
-});
+    });
diff --git a/src/Traits/HasLaralumNotifications.php b/src/Traits/HasLaralumNotifications.php
@@ -3,7 +3,6 @@
 namespace Laralum\Notifications\Traits;
 
 use Illuminate\Notifications\HasDatabaseNotifications;
-use Laralum\Notifications\DatabaseNotification;
 use Laralum\Notifications\Models\Notification;
 
 trait HasLaralumNotifications
@@ -18,5 +17,4 @@ public function notifications()
         return $this->morphMany(Notification::class, 'notifiable')
                             ->orderBy('created_at', 'desc');
     }
-
 }
-Original file line number
+Diff line change
@@ Expand Up / @@ -12,5 +12,4 @@ class Notification extends DatabaseNotification @@
          * @var string
          */
         protected $table = 'laralum_notifications';
     }