Merge pull request #169 from viralsolani/analysis-XplWZW

Apply fixes from StyleCI

app/Exceptions/Handler.php

@@ -51,30 +51,30 @@ class Handler extends ExceptionHandler
      */
     public function render($request, Exception $exception)
     {
-         /*
-         * Redirect if token mismatch error
-         * Usually because user stayed on the same screen too long and their session expired
-         */
+        /*
+        * Redirect if token mismatch error
+        * Usually because user stayed on the same screen too long and their session expired
+        */
         if ($exception instanceof \Symfony\Component\HttpKernel\Exception\UnauthorizedHttpException) {
             switch (get_class($exception->getPrevious())) {
                 case \App\Exceptions\Handler::class:
                     return response()->json([
                         'status' => 'error',
                         'error'  => 'Token has not been provided',
-                        'data'   => json_decode("{}"),
+                        'data'   => json_decode('{}'),
                     ], $exception->getStatusCode());
                 case \Tymon\JWTAuth\Exceptions\TokenExpiredException::class:
                     return response()->json([
                         'status' => 'error',
-                        'error' => 'Token has expired',
-                        'data' => json_decode("{}"),
+                        'error'  => 'Token has expired',
+                        'data'   => json_decode('{}'),
                     ], $exception->getStatusCode());
                 case \Tymon\JWTAuth\Exceptions\TokenInvalidException::class:
                 case \Tymon\JWTAuth\Exceptions\TokenBlacklistedException::class:
                     return response()->json([
                         'status' => 'error',
-                        'error' => 'Token is invalid',
-                        'data' => json_decode("{}"),
+                        'error'  => 'Token is invalid',
+                        'data'   => json_decode('{}'),
                     ], $exception->getStatusCode());
                 default:
                     break;
@@ -93,8 +93,8 @@ class Handler extends ExceptionHandler
          */
         if ($exception instanceof GeneralException) {
             //Note:Below code is required when we use an extra class as api request then we need to pass accept:application/json in the header also
-            //if the header has accept application/json then $request->wantsJson() returns true 
-            // if ($request->ajax() || $request->wantsJson()){ 
+            //if the header has accept application/json then $request->wantsJson() returns true
+            // if ($request->ajax() || $request->wantsJson()){
             //     $json = [
             //         'success' => false,
             //         'error' => [
@@ -145,7 +145,6 @@ class Handler extends ExceptionHandler
      */
     protected function unauthenticated($request, AuthenticationException $exception)
     {
-        
         if ($request->expectsJson()) {
             return response()->json(['error' => 'Unauthenticated.'], 401);
         }

app/Http/Controllers/Api/V1/APIController.php

@@ -178,8 +178,7 @@ class APIController extends Controller
         return $this->setStatusCode(204)->respond(null);
     }
 
-
-    /**Note this function is same as the below function but instead of responding with error below function returns error json 
+    /**Note this function is same as the below function but instead of responding with error below function returns error json
      * Throw Validation.
      *
      * @param string $message
@@ -201,6 +200,6 @@ class APIController extends Controller
      */
     public function throwValidation($validation)
     {
-        return ["error"=>$validation->errors()];
+        return ['error'=>$validation->errors()];
     }
 }

app/Http/Controllers/Api/V1/BlogTagsController.php

@@ -2,13 +2,12 @@
 
 namespace App\Http\Controllers\Api\V1;
 
+use App\Http\Requests\Backend\BlogTags\StoreApiBlogTagsRequest;
 use App\Http\Resources\BlogTagsResource;
 use App\Models\BlogTags\BlogTag;
 use App\Repositories\Backend\BlogTags\BlogTagsRepository;
 use Illuminate\Http\Request;
-use App\Http\Requests\Backend\BlogTags\StoreApiBlogTagsRequest;
 use Validator;
-use Exception;
 
 class BlogTagsController extends APIController
 {
@@ -68,15 +67,13 @@ class BlogTagsController extends APIController
 
         return new BlogTagsResource(BlogTag::orderBy('created_at', 'desc')->first());
     }
-    
-    /** NOTE This function is same as about but uses StoreApiBlogTagsRequest for validation of the api 
+
+    /** NOTE This function is same as about but uses StoreApiBlogTagsRequest for validation of the api
      * Creates the Resource for BlogTag.
      *
      * @param Request $request
      *
      * @return \Illuminate\Http\Response
-     * 
-     * 
      */
     // public function store(StoreApiBlogTagsRequest $request)
     // {

app/Http/Controllers/Api/V1/DeactivatedUsersController.php

@@ -2,17 +2,14 @@
 
 namespace App\Http\Controllers\Api\V1;
 
-use App\Events\Backend\Access\User\UserCreated;
-use App\Events\Backend\Access\User\UserUpdated;
 use App\Http\Resources\UserResource;
-use App\Models\Access\User\User;
 use App\Repositories\Backend\Access\User\UserRepository;
 use Illuminate\Http\Request;
-use Validator;
 
 class DeactivatedUsersController extends APIController
 {
     protected $repository;
+
     /**
      * __construct.
      *

app/Http/Controllers/Api/V1/DeletedUsersController.php

@@ -2,17 +2,14 @@
 
 namespace App\Http\Controllers\Api\V1;
 
-use App\Events\Backend\Access\User\UserCreated;
-use App\Events\Backend\Access\User\UserUpdated;
 use App\Http\Resources\UserResource;
-use App\Models\Access\User\User;
 use App\Repositories\Backend\Access\User\UserRepository;
 use Illuminate\Http\Request;
-use Validator;
 
 class DeletedUsersController extends APIController
 {
     protected $repository;
+
     /**
      * __construct.
      *
@@ -38,5 +35,4 @@ class DeletedUsersController extends APIController
             $this->repository->getForDataTable(0, true)->paginate($limit)
         );
     }
-   
 }

app/Http/Controllers/Api/V1/RolesController.php

@@ -22,7 +22,6 @@ class RolesController extends APIController
         $this->repository = $repository;
     }
 
-
     /**
      * Return the roles.
      *
@@ -94,8 +93,8 @@ class RolesController extends APIController
     }
 
     /**
-     * @param Role              $role
-     * @param Request           $request
+     * @param Role    $role
+     * @param Request $request
      *
      * @return \Illuminate\Http\JsonResponse
      */
@@ -112,10 +111,9 @@ class RolesController extends APIController
      * validateUser User.
      *
      * @param $request
-     * 
-     * @return Validator object 
+     *
+     * @return Validator object
      */
-
     public function validateRole(Request $request)
     {
         $permissions = '';
@@ -125,7 +123,7 @@ class RolesController extends APIController
         }
 
         $validation = Validator::make($request->all(), [
-            'name' => 'required|max:191',
+            'name'        => 'required|max:191',
             'permissions' => $permissions,
         ]);
 

app/Http/Controllers/Api/V1/UsersController.php

@@ -76,7 +76,7 @@ class UsersController extends APIController
      * @param Request $request
      * @param User    $user
      *
-     * @return Validator object 
+     * @return Validator object
      */
     public function update(Request $request, User $user)
     {

app/Http/Requests/Backend/BlogTags/StoreApiBlogTagsRequest.php

@@ -26,7 +26,6 @@ class StoreApiBlogTagsRequest extends Request
      */
     public function rules()
     {
-        
         return [
             'name' => 'required|max:191',
         ];

routes/api.php

@@ -28,13 +28,12 @@ Route::group(['namespace' => 'Api\V1', 'prefix' => 'v1', 'as' => 'v1.'], functio
             // Route::post('password/reset', 'ResetPasswordController@reset')->name('password.reset');
         });
         // Users
-        Route::resource('users', 'UsersController', ['except' => ['create','edit']]);
+        Route::resource('users', 'UsersController', ['except' => ['create', 'edit']]);
         Route::get('deactivatedUsers', 'DeactivatedUsersController@index');
         Route::get('deletedUsers', 'DeletedUsersController@index');
 
-        
         // Roles
-        Route::resource('roles', 'RolesController' , ['except' => ['create', 'edit']]);
+        Route::resource('roles', 'RolesController', ['except' => ['create', 'edit']]);
         // Permission
         Route::resource('permission', 'PermissionController');