DONE: update syntax based on php 7

app/Http/Controllers/AuthMobile/AuthController.php

@@ -14,12 +14,6 @@ use Illuminate\Support\Facades\Hash;
 use Illuminate\Support\Facades\Mail;
 use Illuminate\Support\Facades\Validator;
 use Illuminate\Support\Str;
-<<<<<<< HEAD
-use Illuminate\Support\Facades\Mail;
-use App\Mail\ResetPassword;
-use App\Mail\VerifyEmail;
-=======
->>>>>>> e29a5891c8ed9b8bdaf3fa1af5d422cd2edb6a75
 
 class AuthController extends Controller
 {
@@ -65,11 +59,6 @@ class AuthController extends Controller
         $currentdate = Carbon::now();
         $currentdate = $currentdate->toDateTimeString();
         $verificationToken = Str::random(60);
-<<<<<<< HEAD
-        
-=======
-
->>>>>>> e29a5891c8ed9b8bdaf3fa1af5d422cd2edb6a75
         $user = new User;
         $user->name = $fields['name'];
         $user->username = $fields['username'];
@@ -87,11 +76,7 @@ class AuthController extends Controller
         $user->email_verified_at = null;
         $user->save();
 
-<<<<<<< HEAD
-        $verifyUrl = url('/api/verifyEmail') . '?' . http_build_query([
-=======
         $verifyUrl = url('/api/verifyEmail').'?'.http_build_query([
->>>>>>> e29a5891c8ed9b8bdaf3fa1af5d422cd2edb6a75
             'email' => $user->email,
             'token' => $verificationToken,
         ]);
@@ -117,11 +102,7 @@ class AuthController extends Controller
         ]);
 
         if ($validator->fails()) {
-<<<<<<< HEAD
-            return redirect()->away($redirectBase . '?email_verified=0&message=' . urlencode('Pautan pengesahan tidak sah.'));
-=======
             return redirect()->away($redirectBase.'?email_verified=0&message='.urlencode('Pautan pengesahan tidak sah.'));
->>>>>>> e29a5891c8ed9b8bdaf3fa1af5d422cd2edb6a75
         }
 
         $user = User::where('email', $request->email)
@@ -129,13 +110,8 @@ class AuthController extends Controller
             ->where('is_verified', 0)
             ->first();
 
-<<<<<<< HEAD
-        if (!$user) {
-            return redirect()->away($redirectBase . '?email_verified=0&message=' . urlencode('Pautan pengesahan tidak sah atau emel telah disahkan.'));
-=======
         if (! $user) {
             return redirect()->away($redirectBase.'?email_verified=0&message='.urlencode('Pautan pengesahan tidak sah atau emel telah disahkan.'));
->>>>>>> e29a5891c8ed9b8bdaf3fa1af5d422cd2edb6a75
         }
 
         $user->is_verified = 1;
@@ -174,11 +150,7 @@ class AuthController extends Controller
                             'statusAkaun' => 7,
                             'message' => 'Sila sahkan emel anda sebelum log masuk. Semak peti masuk anda untuk pautan pengesahan.',
                         ]);
-<<<<<<< HEAD
-                    } else if ($user->status == 'active') {
-=======
                     } elseif ($user->status == 'active') {
->>>>>>> e29a5891c8ed9b8bdaf3fa1af5d422cd2edb6a75
                         $user->tokens()->delete();
                         $token = $user->createToken('myapptoken')->plainTextToken;
 
@@ -220,7 +192,8 @@ class AuthController extends Controller
 
     public function logoutUser(Request $request)
     {
-        $token = $request->user()?->currentAccessToken();
+        $user = $request->user();
+        $token = $user ? $user->currentAccessToken() : null;
         if ($token) {
             $token->delete();
         }
@@ -245,11 +218,7 @@ class AuthController extends Controller
         $user['is_verified'] = 0;
         $user->save();
 
-<<<<<<< HEAD
-        $resetUrl = rtrim(config('app.app_pembida'), '/') . '/reset-password/' . $token;
-=======
         $resetUrl = rtrim(config('app.app_pembida'), '/').'/reset-password/'.$token;
->>>>>>> e29a5891c8ed9b8bdaf3fa1af5d422cd2edb6a75
 
         Mail::to($request->email)->send(new ResetPassword($user->name, $resetUrl));
 
@@ -320,59 +289,6 @@ class AuthController extends Controller
         ]);
     }
 
-    public function validateResetToken($token)
-    {
-        $user = User::where('token', $token)->where('is_verified', 0)->first();
-
-        if (!$user) {
-            return response()->json([
-                'success' => false,
-                'message' => 'Pautan tetapan semula kata laluan tidak sah atau telah tamat tempoh.',
-            ], 422);
-        }
-
-        return response()->json([
-            'success' => true,
-            'email' => $user->email,
-        ]);
-    }
-
-    public function updatePassword(Request $request)
-    {
-        $validator = Validator::make($request->all(), [
-            'token' => 'required|string',
-            'password' => 'required|string|min:6',
-            'confirm_password' => 'required|same:password',
-        ]);
-
-        if ($validator->fails()) {
-            return response()->json([
-                'success' => false,
-                'message' => $validator->errors()->first(),
-                'errors' => $validator->errors(),
-            ], 422);
-        }
-
-        $user = User::where('token', $request->token)->where('is_verified', 0)->first();
-
-        if (!$user) {
-            return response()->json([
-                'success' => false,
-                'message' => 'Pautan tetapan semula kata laluan tidak sah atau telah tamat tempoh.',
-            ], 422);
-        }
-
-        $user->password = Hash::make($request->password);
-        $user->token = null;
-        $user->is_verified = 0;
-        $user->save();
-
-        return response()->json([
-            'success' => true,
-            'message' => 'Katalaluan anda telah berjaya dikemaskini.',
-        ]);
-    }
-
     public function getProfile()
     {
         $user = Auth::user();

composer.json

@@ -17,6 +17,7 @@
         "laravel/horizon": "^5.0",
         "laravel/sanctum": "^2.13",
         "laravel/tinker": "^2.5",
+        "laravel/ui": "^3.3",
         "laravelcollective/html": "^6.3",
         "php-http/guzzle7-adapter": "^1.0",
         "pusher/pusher-php-server": "^7.0",
@@ -31,7 +32,6 @@
         "laravel/pint": "^1.20",
         "laravel/sail": "^1.0.1",
         "laravel/telescope": "^4.10",
-        "laravel/ui": "^3.3",
         "mockery/mockery": "^1.4.4",
         "nunomaduro/collision": "^5.10",
         "phpunit/phpunit": "^9.5.10"

composer.lock

@@ -4,7 +4,7 @@
         "Read more about it at https://getcomposer.org/doc/01-basic-usage.md#installing-dependencies",
         "This file is @generated automatically"
     ],
-    "content-hash": "3a3a2541e7cefa699354fcd6550350f6",
+    "content-hash": "12d6fd8c1ff3bc3073e29ed407c0817f",
     "packages": [
         {
             "name": "asm89/stack-cors",
@@ -2774,6 +2774,67 @@
             ],
             "time": "2022-03-23T12:38:24+00:00"
         },
+        {
+            "name": "laravel/ui",
+            "version": "v3.4.6",
+            "source": {
+                "type": "git",
+                "url": "https://github.com/laravel/ui.git",
+                "reference": "65ec5c03f7fee2c8ecae785795b829a15be48c2c"
+            },
+            "dist": {
+                "type": "zip",
+                "url": "https://api.github.com/repos/laravel/ui/zipball/65ec5c03f7fee2c8ecae785795b829a15be48c2c",
+                "reference": "65ec5c03f7fee2c8ecae785795b829a15be48c2c",
+                "shasum": ""
+            },
+            "require": {
+                "illuminate/console": "^8.42|^9.0",
+                "illuminate/filesystem": "^8.42|^9.0",
+                "illuminate/support": "^8.82|^9.0",
+                "illuminate/validation": "^8.42|^9.0",
+                "php": "^7.3|^8.0"
+            },
+            "require-dev": {
+                "orchestra/testbench": "^6.23|^7.0"
+            },
+            "type": "library",
+            "extra": {
+                "laravel": {
+                    "providers": [
+                        "Laravel\\Ui\\UiServiceProvider"
+                    ]
+                },
+                "branch-alias": {
+                    "dev-master": "3.x-dev"
+                }
+            },
+            "autoload": {
+                "psr-4": {
+                    "Laravel\\Ui\\": "src/",
+                    "Illuminate\\Foundation\\Auth\\": "auth-backend/"
+                }
+            },
+            "notification-url": "https://packagist.org/downloads/",
+            "license": [
+                "MIT"
+            ],
+            "authors": [
+                {
+                    "name": "Taylor Otwell",
+                    "email": "taylor@laravel.com"
+                }
+            ],
+            "description": "Laravel UI utilities and presets.",
+            "keywords": [
+                "laravel",
+                "ui"
+            ],
+            "support": {
+                "source": "https://github.com/laravel/ui/tree/v3.4.6"
+            },
+            "time": "2022-05-20T13:38:08+00:00"
+        },
         {
             "name": "laravelcollective/html",
             "version": "v6.3.0",
@@ -9472,64 +9533,6 @@
             },
             "time": "2022-12-19T11:20:10+00:00"
         },
-        {
-            "name": "laravel/ui",
-            "version": "v3.4.6",
-            "source": {
-                "type": "git",
-                "url": "https://github.com/laravel/ui.git",
-                "reference": "65ec5c03f7fee2c8ecae785795b829a15be48c2c"
-            },
-            "dist": {
-                "type": "zip",
-                "url": "https://api.github.com/repos/laravel/ui/zipball/65ec5c03f7fee2c8ecae785795b829a15be48c2c",
-                "reference": "65ec5c03f7fee2c8ecae785795b829a15be48c2c",
-                "shasum": ""
-            },
-            "require": {
-                "illuminate/console": "^8.42|^9.0",
-                "illuminate/filesystem": "^8.42|^9.0",
-                "illuminate/support": "^8.82|^9.0",
-                "illuminate/validation": "^8.42|^9.0",
-                "php": "^7.3|^8.0"
-            },
-            "require-dev": {
-                "orchestra/testbench": "^6.23|^7.0"
-            },
-            "type": "library",
-            "extra": {
-                "branch-alias": {
-                    "dev-master": "3.x-dev"
-                },
-                "laravel": {
-                    "providers": [
-                        "Laravel\\Ui\\UiServiceProvider"
-                    ]
-                }
-            },
-            "autoload": {
-                "psr-4": {
-                    "Laravel\\Ui\\": "src/",
-                    "Illuminate\\Foundation\\Auth\\": "auth-backend/"
-                }
-            },
-            "notification-url": "https://packagist.org/downloads/",
-            "license": [
-                "MIT"
-            ],
-            "authors": [
-                {
-                    "name": "Taylor Otwell",
-                    "email": "taylor@laravel.com"
-                }
-            ],
-            "description": "Laravel UI utilities and presets.",
-            "keywords": [
-                "laravel",
-                "ui"
-            ],
-            "time": "2022-05-20T13:38:08+00:00"
-        },
         {
             "name": "maximebf/debugbar",
             "version": "v1.18.1",