Feat/php cs fixer

.gitignore

@@ -12,3 +12,4 @@ npm-debug.log
 yarn-error.log
 /.idea
 /.vscode
+.php-cs-fixer.cache

.php-cs-fixer.php

@@ -0,0 +1,166 @@
+<?php
+
+use PhpCsFixer\Config;
+use PhpCsFixer\Finder;
+
+$rules = [
+    'array_indentation' => true,
+    'array_syntax' => ['syntax' => 'short'],
+    'binary_operator_spaces' => [
+        'default' => 'single_space',
+        'operators' => ['=>' => null],
+    ],
+    'blank_line_after_namespace' => true,
+    'blank_line_after_opening_tag' => true,
+    'blank_line_before_statement' => [
+        'statements' => ['return'],
+    ],
+    'braces' => true,
+    'cast_spaces' => true,
+    'class_attributes_separation' => [
+        'elements' => [
+            'const' => 'one',
+            'method' => 'one',
+            'property' => 'one',
+            'trait_import' => 'none',
+        ],
+    ],
+    'class_definition' => [
+        'multi_line_extends_each_single_line' => true,
+        'single_item_single_line' => true,
+        'single_line' => true,
+    ],
+    'concat_space' => [
+        'spacing' => 'none',
+    ],
+    'constant_case' => ['case' => 'lower'],
+    'declare_equal_normalize' => true,
+    'elseif' => true,
+    'encoding' => true,
+    'full_opening_tag' => true,
+    'fully_qualified_strict_types' => true, // added by Shift
+    'function_declaration' => true,
+    'function_typehint_space' => true,
+    'general_phpdoc_tag_rename' => true,
+    'heredoc_to_nowdoc' => true,
+    'include' => true,
+    'increment_style' => ['style' => 'post'],
+    'indentation_type' => true,
+    'linebreak_after_opening_tag' => true,
+    'line_ending' => true,
+    'lowercase_cast' => true,
+    'lowercase_keywords' => true,
+    'lowercase_static_reference' => true, // added from Symfony
+    'magic_method_casing' => true, // added from Symfony
+    'magic_constant_casing' => true,
+    'method_argument_space' => [
+        'on_multiline' => 'ignore',
+    ],
+    'multiline_whitespace_before_semicolons' => [
+        'strategy' => 'no_multi_line',
+    ],
+    'native_function_casing' => true,
+    'no_alias_functions' => true,
+    'no_extra_blank_lines' => [
+        'tokens' => [
+            'extra',
+            'throw',
+            'use',
+        ],
+    ],
+    'no_blank_lines_after_class_opening' => true,
+    'no_blank_lines_after_phpdoc' => true,
+    'no_closing_tag' => true,
+    'no_empty_phpdoc' => true,
+    'no_empty_statement' => true,
+    'no_leading_import_slash' => true,
+    'no_leading_namespace_whitespace' => true,
+    'no_mixed_echo_print' => [
+        'use' => 'echo',
+    ],
+    'no_multiline_whitespace_around_double_arrow' => true,
+    'no_short_bool_cast' => true,
+    'no_singleline_whitespace_before_semicolons' => true,
+    'no_spaces_after_function_name' => true,
+    'no_spaces_around_offset' => [
+        'positions' => ['inside', 'outside'],
+    ],
+    'no_spaces_inside_parenthesis' => true,
+    'no_trailing_comma_in_list_call' => true,
+    'no_trailing_comma_in_singleline_array' => true,
+    'no_trailing_whitespace' => true,
+    'no_trailing_whitespace_in_comment' => true,
+    'no_unneeded_control_parentheses' => [
+        'statements' => ['break', 'clone', 'continue', 'echo_print', 'return', 'switch_case', 'yield'],
+    ],
+    'no_unreachable_default_argument_value' => true,
+    'no_unused_imports' => true,
+    'no_useless_return' => true,
+    'no_whitespace_before_comma_in_array' => true,
+    'no_whitespace_in_blank_line' => true,
+    'normalize_index_brace' => true,
+    'not_operator_with_successor_space' => true,
+    'object_operator_without_whitespace' => true,
+    'ordered_imports' => ['sort_algorithm' => 'alpha'],
+    'psr_autoloading' => true,
+    'phpdoc_indent' => true,
+    'phpdoc_inline_tag_normalizer' => true,
+    'phpdoc_no_access' => true,
+    'phpdoc_no_package' => true,
+    'phpdoc_no_useless_inheritdoc' => true,
+    'phpdoc_scalar' => true,
+    'phpdoc_single_line_var_spacing' => true,
+    'phpdoc_summary' => false,
+    'phpdoc_to_comment' => false, // override to preserve user preference
+    'phpdoc_tag_type' => true,
+    'phpdoc_trim' => true,
+    'phpdoc_types' => true,
+    'phpdoc_var_without_name' => true,
+    'self_accessor' => true,
+    'short_scalar_cast' => true,
+    'simplified_null_return' => false, // disabled as "risky"
+    'single_blank_line_at_eof' => true,
+    'single_blank_line_before_namespace' => true,
+    'single_class_element_per_statement' => [
+        'elements' => ['const', 'property'],
+    ],
+    'single_import_per_statement' => true,
+    'single_line_after_imports' => true,
+    'single_line_comment_style' => [
+        'comment_types' => ['hash'],
+    ],
+    'single_quote' => true,
+    'space_after_semicolon' => true,
+    'standardize_not_equals' => true,
+    'switch_case_semicolon_to_colon' => true,
+    'switch_case_space' => true,
+    'ternary_operator_spaces' => true,
+    'trailing_comma_in_multiline' => ['elements' => ['arrays']],
+    'trim_array_spaces' => true,
+    'unary_operator_spaces' => true,
+    'visibility_required' => [
+        'elements' => ['method', 'property'],
+    ],
+    'whitespace_after_comma_in_array' => true,
+];
+
+
+$finder = Finder::create()
+    ->in([
+        __DIR__ . '/app',
+        __DIR__ . '/config',
+        __DIR__ . '/database',
+        __DIR__ . '/resources',
+        __DIR__ . '/routes',
+        __DIR__ . '/tests',
+    ])
+    ->name('*.php')
+    ->notName('*.blade.php')
+    ->ignoreDotFiles(true)
+    ->ignoreVCS(true);
+
+return (new Config)
+    ->setFinder($finder)
+    ->setRules($rules)
+    ->setRiskyAllowed(true)
+    ->setUsingCache(true);

app/Exceptions/Handler.php

@@ -35,7 +35,6 @@ class Handler extends ExceptionHandler
     public function register()
     {
         $this->reportable(function (Throwable $e) {
-
         });
     }
 }

app/Http/Controllers/AdminController.php

@@ -3,15 +3,15 @@
 namespace App\Http\Controllers;
 
 use App\Http\Requests\MemberInviteRequest;
+use App\Http\Resources\AdminResource;
+use App\Http\Resources\RoleResource;
+use App\Models\User;
 use App\Models\UserRole;
 use App\Services\InviteService;
 use App\Services\UserService;
 use Illuminate\Http\Request;
-use App\Models\User;
-use Mockery\Exception;
-use App\Http\Resources\AdminResource;
-use App\Http\Resources\RoleResource;
 use Illuminate\Http\Response;
+use Mockery\Exception;
 
 class AdminController extends Controller
 {
@@ -21,30 +21,28 @@ public function deleteUser($id)
 
         $deleteStatus = UserService::checkUserIdExists($id);
 
-        if (!$deleteStatus) {
+        if (! $deleteStatus) {
             return response()->json([
-                'message' => 'User does not exist with given id'
+                'message' => 'User does not exist with given id',
             ], Response::HTTP_NOT_FOUND);
         }
 
         $roles = $user->roles()->pluck('role');
 
         if ($roles->contains('admin')) {
-
             return response()->json([
-                'message' => 'Admin User cannot be deleted'
+                'message' => 'Admin User cannot be deleted',
             ], 403);
         }
 
         if ($user->delete()) {
-
             return response()->json([
-                'message' => 'User deleted Successfully'
+                'message' => 'User deleted Successfully',
             ], 200);
         }
 
         return response()->json([
-            'message' => 'Oops Something Went Wrong'
+            'message' => 'Oops Something Went Wrong',
         ], 403);
     }
 
@@ -54,7 +52,7 @@ public function viewAllUsers()
 
         return response()->json([
             'total' => count($users),
-            'users' => AdminResource::collection($users)
+            'users' => AdminResource::collection($users),
         ], 200);
     }
 
@@ -64,7 +62,7 @@ public function viewUserRole(Request $request)
 
         return response()->json([
             'total' => count($role),
-            'roles' => RoleResource::collection($role)
+            'roles' => RoleResource::collection($role),
         ], 200);
     }
 
@@ -77,7 +75,7 @@ public function assignRoles(Request $request)
             $user = UserService::getUser($request->toArray(), $rules);
             $role = UserRole::create([
                 'user_id' => $user['id'],
-                'role_id' => $request->role_id
+                'role_id' => $request->role_id,
             ]);
             $result = [
                 'status' => 200,
@@ -87,9 +85,10 @@ public function assignRoles(Request $request)
         } catch (Exception $e) {
             $result = [
                 'status' => 404,
-                'error' => $e->getMessage()
+                'error' => $e->getMessage(),
             ];
         }
+
         return response()->json($result, $result['status']);
     }
 
@@ -98,37 +97,38 @@ public function inviteOthers(MemberInviteRequest $request, InviteService $invite
         $validated = $request->safe()->only(['role_id', 'email', 'user_id', 'name']);
         $status = $inviteService->invite($validated['name'], $validated['email'], $validated['role_id'], $validated['user_id']);
 
-        if (!$status) {
+        if (! $status) {
             return response()->json([
-                'message' => 'User could not be invited'
+                'message' => 'User could not be invited',
             ], 500);
         }
 
         return response()->json([
-            'message' => 'User invited successfully'
+            'message' => 'User invited successfully',
         ], 200);
     }
 
     public function updateUserStatus(Request $request)
     {
         $user = User::where('id', $request->id)->first();
         try {
-            if (!$user->activeStatus) {
+            if (! $user->activeStatus) {
                 $user->activeStatus = true;
             } else {
                 $user->activeStatus = false;
             }
             $user->save();
             $result = [
                 'status' => 200,
-                'message' => 'User status updated'
+                'message' => 'User status updated',
             ];
         } catch (Exception $e) {
             $result = [
                 'status' => 500,
-                'error' => $e->getMessage()
+                'error' => $e->getMessage(),
             ];
         }
+
         return response()->json($result, $result['status']);
     }
 }