Merge pull request #670 from viralsolani/analysis-or2ZMb

viralsolani · web-flow · commit a5af0d8a47ec · 2020-08-20T21:15:53.000+05:30
Apply fixes from StyleCI
diff --git a/app/Console/Kernel.php b/app/Console/Kernel.php
@@ -14,7 +14,7 @@ class Kernel extends ConsoleKernel
      * @var array
      */
     protected $commands = [
-    InstallAppCommand::class,
+        InstallAppCommand::class,
     ];
 
     /**
diff --git a/app/Exceptions/Handler.php b/app/Exceptions/Handler.php
@@ -165,10 +165,10 @@ public function setStatusCode($statusCode)
     protected function respondWithError($message)
     {
         return $this->respond([
-                'error' => [
-                    'message'     => $message,
-                    'status_code' => $this->getStatusCode(),
-                ],
+            'error' => [
+                'message'     => $message,
+                'status_code' => $this->getStatusCode(),
+            ],
             ]);
     }
 
diff --git a/app/Http/Controllers/Api/V1/APIController.php b/app/Http/Controllers/Api/V1/APIController.php
@@ -71,7 +71,7 @@ public function respondWithPagination($items, $data)
                 'total_pages'  => ceil($items->total() / $items->perPage()),
                 'current_page' => $items->currentPage(),
                 'limit'        => $items->perPage(),
-             ],
+            ],
         ]);
 
         return $this->respond($data);
@@ -113,10 +113,10 @@ public function respondCreatedWithData($data)
     public function respondWithError($message)
     {
         return $this->respond([
-                'error' => [
-                    'message'     => $message,
-                    'status_code' => $this->getStatusCode(),
-                ],
+            'error' => [
+                'message'     => $message,
+                'status_code' => $this->getStatusCode(),
+            ],
             ]);
     }
 
diff --git a/app/Http/Controllers/Backend/DashboardController.php b/app/Http/Controllers/Backend/DashboardController.php
@@ -74,7 +74,7 @@ public function getPermissionByRole(Request $request)
             $results['rolePermissions'] = $rolePermissions;
             $results['allPermissions'] = $rsRolePermissions->all;
             echo json_encode($results);
-            die;
+            exit;
         }
     }
 }
diff --git a/app/Http/Controllers/Backend/NotificationController.php b/app/Http/Controllers/Backend/NotificationController.php
@@ -58,7 +58,7 @@ public function ajaxNotifications()
          * pass jsonencode array
          */
         echo json_encode($passArray);
-        die;
+        exit;
     }
 
     /*
@@ -68,7 +68,7 @@ public function clearCurrentNotifications()
     {
         $userId = Auth::user()->id;
         echo $this->notification->clearNotifications(5);
-        die;
+        exit;
     }
 
     /**
diff --git a/app/Http/Controllers/Controller.php b/app/Http/Controllers/Controller.php
@@ -9,5 +9,7 @@
 
 class Controller extends BaseController
 {
-    use AuthorizesRequests, DispatchesJobs, ValidatesRequests;
+    use AuthorizesRequests;
+    use DispatchesJobs;
+    use ValidatesRequests;
 }
diff --git a/app/Mail/ConfirmAcoountMail.php b/app/Mail/ConfirmAcoountMail.php
@@ -8,7 +8,8 @@
 
 class ConfirmAcoountMail extends Mailable
 {
-    use Queueable, SerializesModels;
+    use Queueable;
+    use SerializesModels;
 
     /**
      * Create a new message instance.
diff --git a/app/Mail/ForgotPasswordMail.php b/app/Mail/ForgotPasswordMail.php
@@ -8,7 +8,8 @@
 
 class ForgotPasswordMail extends Mailable
 {
-    use Queueable, SerializesModels;
+    use Queueable;
+    use SerializesModels;
 
     /**
      * Create a new message instance.
diff --git a/app/Models/Access/PasswordReset/PasswordReset.php b/app/Models/Access/PasswordReset/PasswordReset.php
@@ -14,8 +14,8 @@ class PasswordReset extends BaseModel
     protected $table = 'password_resets';
 
     protected $fillable = [
-                            'email',
-                            'token',
-                            '',
-                ];
+        'email',
+        'token',
+        '',
+    ];
 }
diff --git a/app/Models/Access/User/Traits/Attribute/UserAttribute.php b/app/Models/Access/User/Traits/Attribute/UserAttribute.php
@@ -235,9 +235,9 @@ public function getLoginAsButtonAttribute($class)
                     'admin.access.user.login-as',
                     $this
                 ).'"><i class="fa fa-lock" data-toggle="tooltip" data-placement="top" title="'.trans(
-                        'buttons.backend.access.users.login_as',
-                        ['user' => $this->name]
-                    ).'"></i>'.$name.'</a>';
+                    'buttons.backend.access.users.login_as',
+                    ['user' => $this->name]
+                ).'"></i>'.$name.'</a>';
             }
         }
 
diff --git a/app/Models/Access/User/User.php b/app/Models/Access/User/User.php
@@ -17,14 +17,14 @@
  */
 class User extends Authenticatable
 {
-    use UserScope,
-        UserAccess,
-        Notifiable,
-        SoftDeletes,
-        UserAttribute,
-        UserRelationship,
-        UserSendPasswordReset,
-        HasApiTokens;
+    use UserScope;
+    use UserAccess;
+    use Notifiable;
+    use SoftDeletes;
+    use UserAttribute;
+    use UserRelationship;
+    use UserSendPasswordReset;
+    use HasApiTokens;
 
     /**
      * The database table used by the model.
diff --git a/app/Repositories/Backend/Access/Permission/PermissionRepository.php b/app/Repositories/Backend/Access/Permission/PermissionRepository.php
@@ -88,7 +88,7 @@ public function update($permission, array $input)
         $permission->status = 1;
         $permission->updated_by = access()->user()->id;
 
-        DB::transaction(function () use ($permission, $input) {
+        DB::transaction(function () use ($permission) {
             if ($permission->save()) {
                 event(new PermissionUpdated($permission));
 
diff --git a/config/cors.php b/config/cors.php
@@ -40,13 +40,13 @@
         ],
 
          'expose_headers' => [
-            'Cache-Control',
-            'Content-Language',
-            'Content-Type',
-            'Expires',
-            'Last-Modified',
-            'Pragma',
-        ],
+             'Cache-Control',
+             'Content-Language',
+             'Content-Type',
+             'Expires',
+             'Last-Modified',
+             'Pragma',
+         ],
 
         'forbidden_response' => [
             'message' => 'Forbidden (cors).',
diff --git a/config/generator.php b/config/generator.php
@@ -2,20 +2,20 @@
 
 return [
 
-// After App\Http\Controllers
-// Default : Backend
-'controller_namespace' => 'Backend',
+    // After App\Http\Controllers
+    // Default : Backend
+    'controller_namespace' => 'Backend',
 
-// After App\Http\Requests
-// Default : Backend
-'request_namespace' => 'Backend',
+    // After App\Http\Requests
+    // Default : Backend
+    'request_namespace' => 'Backend',
 
-// After App\Repositories
-// Default : Backend
-'repository_namespace'=> 'Backend',
+    // After App\Repositories
+    // Default : Backend
+    'repository_namespace'=> 'Backend',
 
-// views folder after resources/views
-// Default : backend
-'views_folder' => 'backend',
+    // views folder after resources/views
+    // Default : backend
+    'views_folder' => 'backend',
 
 ];
diff --git a/database/DisableForeignKeys.php b/database/DisableForeignKeys.php
@@ -14,12 +14,12 @@ trait DisableForeignKeys
      */
     private $commands = [
         'mysql' => [
-          'enable'  => 'SET FOREIGN_KEY_CHECKS=1;',
-          'disable' => 'SET FOREIGN_KEY_CHECKS=0;',
+            'enable'  => 'SET FOREIGN_KEY_CHECKS=1;',
+            'disable' => 'SET FOREIGN_KEY_CHECKS=0;',
         ],
         'sqlite' => [
-          'enable'  => 'PRAGMA foreign_keys = ON;',
-          'disable' => 'PRAGMA foreign_keys = OFF;',
+            'enable'  => 'PRAGMA foreign_keys = ON;',
+            'disable' => 'PRAGMA foreign_keys = OFF;',
         ],
         'sqlsrv' => [
             'enable'  => 'EXEC sp_msforeachtable @command1="print \'?\'", @command2="ALTER TABLE ? WITH CHECK CHECK CONSTRAINT all";',
diff --git a/database/seeds/Access/PermissionRoleSeeder.php b/database/seeds/Access/PermissionRoleSeeder.php
@@ -10,7 +10,8 @@
  */
 class PermissionRoleSeeder extends Seeder
 {
-    use DisableForeignKeys, TruncateTable;
+    use DisableForeignKeys;
+    use TruncateTable;
 
     /**
      * Run the database seed.
diff --git a/database/seeds/Access/PermissionTableSeeder.php b/database/seeds/Access/PermissionTableSeeder.php
@@ -10,7 +10,8 @@
  */
 class PermissionTableSeeder extends Seeder
 {
-    use DisableForeignKeys, TruncateTable;
+    use DisableForeignKeys;
+    use TruncateTable;
 
     /**
      * Run the database seed.
diff --git a/database/seeds/Access/PermissionUserSeeder.php b/database/seeds/Access/PermissionUserSeeder.php
@@ -9,7 +9,8 @@
  */
 class PermissionUserSeeder extends Seeder
 {
-    use DisableForeignKeys, TruncateTable;
+    use DisableForeignKeys;
+    use TruncateTable;
 
     /**
      * Run the database seed.
diff --git a/database/seeds/Access/RoleTableSeeder.php b/database/seeds/Access/RoleTableSeeder.php
@@ -11,7 +11,8 @@
  */
 class RoleTableSeeder extends Seeder
 {
-    use DisableForeignKeys, TruncateTable;
+    use DisableForeignKeys;
+    use TruncateTable;
 
     /**
      * Run the database seed.
diff --git a/database/seeds/Access/UserRoleSeeder.php b/database/seeds/Access/UserRoleSeeder.php
@@ -9,7 +9,8 @@
  */
 class UserRoleSeeder extends Seeder
 {
-    use DisableForeignKeys, TruncateTable;
+    use DisableForeignKeys;
+    use TruncateTable;
 
     /**
      * Run the database seed.
diff --git a/database/seeds/Access/UserTableSeeder.php b/database/seeds/Access/UserTableSeeder.php
@@ -11,7 +11,8 @@
  */
 class UserTableSeeder extends Seeder
 {
-    use DisableForeignKeys, TruncateTable;
+    use DisableForeignKeys;
+    use TruncateTable;
 
     /**
      * Run the database seed.
diff --git a/database/seeds/HistoryTypeTableSeeder.php b/database/seeds/HistoryTypeTableSeeder.php
@@ -11,7 +11,8 @@
  */
 class HistoryTypeTableSeeder extends Seeder
 {
-    use DisableForeignKeys, TruncateTable;
+    use DisableForeignKeys;
+    use TruncateTable;
 
     /**
      * Run the database seed.
diff --git a/database/seeds/PagesTableSeeder.php b/database/seeds/PagesTableSeeder.php
@@ -8,7 +8,8 @@
 
 class PagesTableSeeder extends Seeder
 {
-    use DisableForeignKeys, TruncateTable;
+    use DisableForeignKeys;
+    use TruncateTable;
 
     /**
      * Run the database seeds.
diff --git a/resources/lang/en/labels.php b/resources/lang/en/labels.php
@@ -228,8 +228,8 @@
                 'url'       => 'URL',
                 'url_type'  => 'URL Type',
                 'url_types' => [
-                  'route'  => 'Route',
-                  'static' => 'Static',
+                    'route'  => 'Route',
+                    'static' => 'Static',
                 ],
                 'open_in_new_tab'    => 'Open URL in new tab',
                 'view_permission_id' => 'Permission',
diff --git a/resources/lang/en/menus.php b/resources/lang/en/menus.php
@@ -50,7 +50,7 @@
                 'add-new'           => 'Add new',
                 'deactivated-users' => 'Deactivated Users',
                 'deleted-users'     => 'Deleted Users',
-             ],
+            ],
         ],
 
         'log-viewer' => [
diff --git a/resources/lang/en/validation.php b/resources/lang/en/validation.php
@@ -218,9 +218,9 @@
                 ],
             ],
             'faqs' => [
-                    'question' => 'Question',
-                    'answer'   => 'Answer',
-                    'status'   => 'Status',
+                'question' => 'Question',
+                'answer'   => 'Answer',
+                'status'   => 'Status',
             ],
         ],
 
@@ -274,9 +274,9 @@
             'city_required'  => 'Please enter city.',
         ],
         'confirmaccount' => [
-           'already_confirmed' => 'Account is already confirmed.',
-           'invalid_otp'       => 'Please enter valid otp.',
-            'invalid_email'    => 'Email is not register with fin builders',
+            'already_confirmed' => 'Account is already confirmed.',
+            'invalid_otp'       => 'Please enter valid otp.',
+            'invalid_email'     => 'Email is not register with fin builders',
         ],
     ],
 
diff --git a/resources/lang/fr/exceptions.php b/resources/lang/fr/exceptions.php
@@ -89,15 +89,15 @@
             'delete_error'   => 'Il y a eu un problème lors de la suppression de ce menu. Veuillez essayer à nouveau.',
             'not_found'      => "Ce menu n'existe pas.",
             'update_error'   => 'Il y a eu un problème lors de la mise à jour de ce menu. Veuillez essayer à nouveau.',
-         ],
+        ],
 
         'modules' => [
             'already_exists' => 'Ce module existe déjà. Veuillez choisr un autre nom.',
             'create_error'   => 'Il y a eu un problème lors de la création de ce module. Veuillez essayer à nouveau.',
             'delete_error'   => 'Il y a eu un problème lors de la suppression de ce module. Veuillez essayer à nouveau.',
             'not_found'      => "Ce module n'existe pas.",
             'update_error'   => 'Il y a eu un problème lors de la mise à jour de ce module. Veuillez essayer à nouveau.',
-          ],
+        ],
 
     ],
 
diff --git a/resources/lang/fr/labels.php b/resources/lang/fr/labels.php
@@ -227,8 +227,8 @@
                 'url'       => 'URL',
                 'url_type'  => 'URL Type',
                 'url_types' => [
-                  'route'  => 'Route',
-                  'static' => 'Statique',
+                    'route'  => 'Route',
+                    'static' => 'Statique',
                 ],
                 'open_in_new_tab'    => 'Ouvrir dans un nouvel onglet',
                 'view_permission_id' => 'Permission',
diff --git a/resources/lang/fr/validation.php b/resources/lang/fr/validation.php
diff --git a/tests/BrowserKitTestCase.php b/tests/BrowserKitTestCase.php

Original file line number	Diff line number	Diff line change
`@@ -165,10 +165,10 @@ public function setStatusCode($statusCode)`
`165`	`165`	`protected function respondWithError($message)`
`166`	`166`	`{`
`167`	`167`	`return $this->respond([`
`168`		`- 'error' => [`
`169`		`- 'message' => $message,`
`170`		`- 'status_code' => $this->getStatusCode(),`
`171`		`- ],`
	`168`	`+ 'error' => [`
	`169`	`+ 'message' => $message,`
	`170`	`+ 'status_code' => $this->getStatusCode(),`
	`171`	`+ ],`
`172`	`172`	`]);`
`173`	`173`	`}`
`174`	`174`
Original file line number	Diff line number	Diff line change
`@@ -74,7 +74,7 @@ public function getPermissionByRole(Request $request)`
`74`	`74`	`$results['rolePermissions'] = $rolePermissions;`
`75`	`75`	`$results['allPermissions'] = $rsRolePermissions->all;`
`76`	`76`	`echo json_encode($results);`
`77`		`- die;`
	`77`	`+ exit;`
`78`	`78`	`}`
`79`	`79`	`}`
`80`	`80`	`}`
Original file line number	Diff line number	Diff line change
`@@ -58,7 +58,7 @@ public function ajaxNotifications()`
`58`	`58`	`* pass jsonencode array`
`59`	`59`	`*/`
`60`	`60`	`echo json_encode($passArray);`
`61`		`- die;`
	`61`	`+ exit;`
`62`	`62`	`}`
`63`	`63`
`64`	`64`	`/*`
`@@ -68,7 +68,7 @@ public function clearCurrentNotifications()`
`68`	`68`	`{`
`69`	`69`	`$userId = Auth::user()->id;`
`70`	`70`	`echo $this->notification->clearNotifications(5);`
`71`		`- die;`
	`71`	`+ exit;`
`72`	`72`	`}`
`73`	`73`
`74`	`74`	`/**`
Original file line number	Diff line number	Diff line change
`@@ -9,5 +9,7 @@`
`9`	`9`
`10`	`10`	`class Controller extends BaseController`
`11`	`11`	`{`
`12`		`- use AuthorizesRequests, DispatchesJobs, ValidatesRequests;`
	`12`	`+ use AuthorizesRequests;`
	`13`	`+ use DispatchesJobs;`
	`14`	`+ use ValidatesRequests;`
`13`	`15`	`}`
Original file line number	Diff line number	Diff line change
`@@ -8,7 +8,8 @@`
`8`	`8`
`9`	`9`	`class ConfirmAcoountMail extends Mailable`
`10`	`10`	`{`
`11`		`- use Queueable, SerializesModels;`
	`11`	`+ use Queueable;`
	`12`	`+ use SerializesModels;`
`12`	`13`
`13`	`14`	`/**`
`14`	`15`	`* Create a new message instance.`
Original file line number	Diff line number	Diff line change
`@@ -8,7 +8,8 @@`
`8`	`8`
`9`	`9`	`class ForgotPasswordMail extends Mailable`
`10`	`10`	`{`
`11`		`- use Queueable, SerializesModels;`
	`11`	`+ use Queueable;`
	`12`	`+ use SerializesModels;`
`12`	`13`
`13`	`14`	`/**`
`14`	`15`	`* Create a new message instance.`
Original file line number	Diff line number	Diff line change
`@@ -235,9 +235,9 @@ public function getLoginAsButtonAttribute($class)`
`235`	`235`	`'admin.access.user.login-as',`
`236`	`236`	`$this`
`237`	`237`	`).'"><i class="fa fa-lock" data-toggle="tooltip" data-placement="top" title="'.trans(`
`238`		`- 'buttons.backend.access.users.login_as',`
`239`		`- ['user' => $this->name]`
`240`		`- ).'"></i>'.$name.'</a>';`
	`238`	`+ 'buttons.backend.access.users.login_as',`
	`239`	`+ ['user' => $this->name]`
	`240`	`+ ).'"></i>'.$name.'</a>';`
`241`	`241`	`}`
`242`	`242`	`}`
`243`	`243`