Merge pull request #1 from Alymosul/analysis-8jojZr

Apply fixes from StyleCI

Author: Alymosul

src/ExpoChannel.php

@@ -2,12 +2,12 @@
 
 namespace NotificationChannels\ExpoPushNotifications;
 
-use ExponentPhpSDK\Exceptions\ExpoException;
 use ExponentPhpSDK\Expo;
 use Illuminate\Events\Dispatcher;
+use Illuminate\Notifications\Notification;
+use ExponentPhpSDK\Exceptions\ExpoException;
 use Illuminate\Notifications\Events\NotificationFailed;
 use NotificationChannels\ExpoPushNotifications\Exceptions\CouldNotSendNotification;
-use Illuminate\Notifications\Notification;
 
 class ExpoChannel
 {
@@ -34,7 +34,7 @@ public function __construct(Expo $expo, Dispatcher $events)
     }
 
     /**
-     * Send the given notification
+     * Send the given notification.
      *
      * @param mixed $notifiable
      * @param \Illuminate\Notifications\Notification $notification

src/ExpoMessage.php

@@ -106,7 +106,7 @@ public function badge(int $value)
     }
 
     /**
-     * Set the time to live of the notification
+     * Set the time to live of the notification.
      *
      * @param int $ttl
      *
@@ -120,7 +120,7 @@ public function setTtl(int $ttl)
     }
 
     /**
-     * Get an array representation of the message
+     * Get an array representation of the message.
      *
      * @return array
      */

src/ExpoPushNotificationsServiceProvider.php

@@ -5,8 +5,8 @@
 use ExponentPhpSDK\Expo;
 use ExponentPhpSDK\ExpoRegistrar;
 use ExponentPhpSDK\ExpoRepository;
-use ExponentPhpSDK\Repositories\ExpoFileDriver;
 use Illuminate\Support\ServiceProvider;
+use ExponentPhpSDK\Repositories\ExpoFileDriver;
 
 class ExpoPushNotificationsServiceProvider extends ServiceProvider
 {
@@ -22,7 +22,7 @@ public function boot()
             });
 
         //Load routes
-        $this->loadRoutesFrom(__DIR__ . '/Http/routes.php');
+        $this->loadRoutesFrom(__DIR__.'/Http/routes.php');
     }
 
     /**

src/Http/ExpoController.php

@@ -2,8 +2,8 @@
 
 namespace NotificationChannels\ExpoPushNotifications\Http;
 
-use Illuminate\Http\JsonResponse;
 use Illuminate\Http\Request;
+use Illuminate\Http\JsonResponse;
 use Illuminate\Routing\Controller;
 use Illuminate\Support\Facades\Auth;
 use Illuminate\Support\Facades\Validator;
@@ -27,7 +27,7 @@ public function __construct(ExpoChannel $expoChannel)
     }
 
     /**
-     * Handles subscription endpoint for an expo token
+     * Handles subscription endpoint for an expo token.
      *
      * @param Request $request
      *
@@ -36,15 +36,15 @@ public function __construct(ExpoChannel $expoChannel)
     public function subscribe(Request $request)
     {
         $validator = Validator::make($request->all(), [
-            'expo_token'    =>  'required|string'
+            'expo_token'    =>  'required|string',
         ]);
 
         if ($validator->fails()) {
             return JsonResponse::create([
                 'status' => 'failed',
                 'error' => [
-                    'message' => 'Expo Token is required'
-                ]
+                    'message' => 'Expo Token is required',
+                ],
             ], 422);
         }
 
@@ -58,19 +58,19 @@ public function subscribe(Request $request)
             return JsonResponse::create([
                 'status'    => 'failed',
                 'error'     =>  [
-                    'message' => $e->getMessage()
-                ]
+                    'message' => $e->getMessage(),
+                ],
             ], 500);
         }
 
         return JsonResponse::create([
             'status'    =>  'succeeded',
-            'expo_token' => $token
+            'expo_token' => $token,
         ], 200);
     }
 
     /**
-     * Handles removing subscription endpoint for the authenticated interest
+     * Handles removing subscription endpoint for the authenticated interest.
      *
      * @return \Illuminate\Http\JsonResponse
      */
@@ -84,8 +84,8 @@ public function unsubscribe()
             return JsonResponse::create([
                 'status'    => 'failed',
                 'error'     =>  [
-                    'message' => $e->getMessage()
-                ]
+                    'message' => $e->getMessage(),
+                ],
             ], 500);
         }
 

src/Http/routes.php

@@ -3,11 +3,11 @@
 Route::group(['prefix' => 'api/exponent/devices', 'middleware' => 'auth:api, bindings'], function () {
     Route::post('subscribe', [
         'as'    =>  'register-interest',
-        'uses'  =>  'NotificationChannels\ExpoPushNotifications\Http\ExpoController@subscribe'
+        'uses'  =>  'NotificationChannels\ExpoPushNotifications\Http\ExpoController@subscribe',
     ]);
 
     Route::post('unsubscribe', [
         'as'    =>  'remove-interest',
-        'uses'  =>  'NotificationChannels\ExpoPushNotifications\Http\ExpoController@unsubscribe'
+        'uses'  =>  'NotificationChannels\ExpoPushNotifications\Http\ExpoController@unsubscribe',
     ]);
 });

tests/ChannelTest.php

@@ -2,16 +2,16 @@
 
 namespace NotificationChannels\ExpoPushNotifications\Test;
 
-use ExponentPhpSDK\Exceptions\ExpoException;
+use Mockery;
 use ExponentPhpSDK\Expo;
+use PHPUnit\Framework\TestCase;
 use Illuminate\Events\Dispatcher;
-use Illuminate\Notifications\Events\NotificationFailed;
 use Illuminate\Notifications\Notifiable;
 use Illuminate\Notifications\Notification;
-use Mockery;
+use ExponentPhpSDK\Exceptions\ExpoException;
+use Illuminate\Notifications\Events\NotificationFailed;
 use NotificationChannels\ExpoPushNotifications\ExpoChannel;
 use NotificationChannels\ExpoPushNotifications\ExpoMessage;
-use PHPUnit\Framework\TestCase;
 
 class ChannelTest extends TestCase
 {
@@ -108,4 +108,4 @@ public function toExpoPush($notifiable)
     {
         return new ExpoMessage();
     }
-}
+}

tests/ExpoControllerTest.php

@@ -3,16 +3,14 @@
 namespace NotificationChannels\ExpoPushNotifications\Test;
 
 use ExponentPhpSDK\Expo;
-use ExponentPhpSDK\ExpoRegistrar;
-use ExponentPhpSDK\Repositories\ExpoFileDriver;
-use Illuminate\Events\Dispatcher;
 use Illuminate\Http\Request;
+use PHPUnit\Framework\TestCase;
+use Illuminate\Events\Dispatcher;
+use Illuminate\Validation\Factory;
 use Illuminate\Support\Facades\Auth;
 use Illuminate\Support\Facades\Validator;
-use Illuminate\Validation\Factory;
 use NotificationChannels\ExpoPushNotifications\ExpoChannel;
 use NotificationChannels\ExpoPushNotifications\Http\ExpoController;
-use PHPUnit\Framework\TestCase;
 
 class ExpoControllerTest extends TestCase
 {
@@ -134,7 +132,7 @@ public function unsubscribeReturnsErrorResponseIfExceptionIsThrown()
     }
 
     /**
-     * Mocks a request for the ExpoController
+     * Mocks a request for the ExpoController.
      *
      * @param $data
      *
@@ -163,6 +161,7 @@ private function mockValidator(bool $fails)
         $validator->shouldReceive('fails')->once()->andReturn($fails);
 
         Validator::swap($validation);
+
         return $validator;
     }
 }
@@ -173,4 +172,4 @@ public function getKey()
     {
         return 1;
     }
-}
+}

tests/MessageTest.php

@@ -3,8 +3,8 @@
 namespace NotificationChannels\ExpoPushNotifications\Test;
 
 use Illuminate\Support\Arr;
-use NotificationChannels\ExpoPushNotifications\ExpoMessage;
 use PHPUnit\Framework\TestCase;
+use NotificationChannels\ExpoPushNotifications\ExpoMessage;
 
 class MessageTest extends TestCase
 {