@@ -33,7 +33,7 @@ discard block |
||
33 | 33 | /** |
34 | 34 | * Execute the console command. |
35 | 35 | * |
36 | - * @return bool|null |
|
36 | + * @return false|null |
|
37 | 37 | */ |
38 | 38 | public function handle() |
39 | 39 | { |
@@ -75,9 +75,8 @@ discard block |
||
75 | 75 | * Replace the User model, if it was moved to App\Models\User. |
76 | 76 | * |
77 | 77 | * @param string $stub |
78 | - * @param string $name |
|
79 | 78 | * |
80 | - * @return $this |
|
79 | + * @return string |
|
81 | 80 | */ |
82 | 81 | protected function makeReplacements(&$stub) |
83 | 82 | { |
@@ -17,7 +17,7 @@ discard block |
||
17 | 17 | * |
18 | 18 | * @param \Illuminate\Http\Request $request |
19 | 19 | * |
20 | - * @return \Illuminate\Http\RedirectResponse|\Illuminate\Http\JsonResponse |
|
20 | + * @return \Illuminate\Http\Response |
|
21 | 21 | */ |
22 | 22 | public function reset(Request $request) |
23 | 23 | { |
@@ -105,7 +105,7 @@ discard block |
||
105 | 105 | * @param \Illuminate\Http\Request $request |
106 | 106 | * @param string $response |
107 | 107 | * |
108 | - * @return \Illuminate\Http\RedirectResponse|\Illuminate\Http\JsonResponse |
|
108 | + * @return \Illuminate\Http\Response |
|
109 | 109 | */ |
110 | 110 | protected function sendResetResponse(Request $request, $response) |
111 | 111 | { |
@@ -118,7 +118,7 @@ discard block |
||
118 | 118 | * @param \Illuminate\Http\Request $request |
119 | 119 | * @param string $response |
120 | 120 | * |
121 | - * @return \Illuminate\Http\RedirectResponse|\Illuminate\Http\JsonResponse |
|
121 | + * @return \Illuminate\Http\Response |
|
122 | 122 | */ |
123 | 123 | protected function sendResetFailedResponse(Request $request, $response) |
124 | 124 | { |
@@ -14,7 +14,7 @@ discard block |
||
14 | 14 | * |
15 | 15 | * @param \Illuminate\Http\Request $request |
16 | 16 | * |
17 | - * @return \Illuminate\Http\RedirectResponse|\Illuminate\Http\JsonResponse |
|
17 | + * @return \Illuminate\Http\Response |
|
18 | 18 | */ |
19 | 19 | public function sendResetLinkEmail(Request $request) |
20 | 20 | { |
@@ -84,7 +84,7 @@ discard block |
||
84 | 84 | * @param \Illuminate\Http\Request $request |
85 | 85 | * @param string $response |
86 | 86 | * |
87 | - * @return \Illuminate\Http\RedirectResponse|\Illuminate\Http\JsonResponse |
|
87 | + * @return \Illuminate\Http\Response |
|
88 | 88 | */ |
89 | 89 | protected function sendResetLinkResponse(Request $request, $response) |
90 | 90 | { |
@@ -97,7 +97,7 @@ discard block |
||
97 | 97 | * @param \Illuminate\Http\Request $request |
98 | 98 | * @param string $response |
99 | 99 | * |
100 | - * @return \Illuminate\Http\RedirectResponse|\Illuminate\Http\JsonResponse |
|
100 | + * @return \Illuminate\Http\Response |
|
101 | 101 | */ |
102 | 102 | protected function sendResetLinkFailedResponse(Request $request, $response) |
103 | 103 | { |
@@ -26,6 +26,10 @@ |
||
26 | 26 | */ |
27 | 27 | private $message; |
28 | 28 | |
29 | + /** |
|
30 | + * @param integer $responseCode |
|
31 | + * @param string $message |
|
32 | + */ |
|
29 | 33 | private function __construct($data, $status, $responseCode, $message) |
30 | 34 | { |
31 | 35 | $this->data = $data; |
@@ -2,10 +2,10 @@ |
||
2 | 2 | |
3 | 3 | namespace MedianetDev\LaravelAuthApi\Models; |
4 | 4 | |
5 | +use Laravel\Passport\HasApiTokens; |
|
5 | 6 | use MedianetDev\LaravelAuthApi\Http\Controllers\Interfaces\MustVerifyEmail; |
6 | -use MedianetDev\LaravelAuthApi\Models\User as Authenticatable; |
|
7 | 7 | use MedianetDev\LaravelAuthApi\Models\Traits\InheritsRelationsFromParentModel; |
8 | -use Laravel\Passport\HasApiTokens; |
|
8 | +use MedianetDev\LaravelAuthApi\Models\User as Authenticatable; |
|
9 | 9 | |
10 | 10 | class ApiUser extends Authenticatable implements MustVerifyEmail |
11 | 11 | { |
@@ -2,8 +2,8 @@ |
||
2 | 2 | |
3 | 3 | namespace MedianetDev\LaravelAuthApi\Models\Traits; |
4 | 4 | |
5 | -use ReflectionClass; |
|
6 | 5 | use Illuminate\Support\Str; |
6 | +use ReflectionClass; |
|
7 | 7 | |
8 | 8 | /** |
9 | 9 | * This trait helps a child model (ex: BackpackUser) inherit all relationships of its parent model (ex: User). |
@@ -3,15 +3,14 @@ |
||
3 | 3 | namespace MedianetDev\LaravelAuthApi\Models; |
4 | 4 | |
5 | 5 | use Illuminate\Auth\Authenticatable; |
6 | -use MedianetDev\LaravelAuthApi\Http\Controllers\Traits\MustVerifyEmail; |
|
7 | 6 | use Illuminate\Auth\Passwords\CanResetPassword; |
8 | 7 | use Illuminate\Contracts\Auth\Access\Authorizable as AuthorizableContract; |
9 | 8 | use Illuminate\Contracts\Auth\Authenticatable as AuthenticatableContract; |
10 | 9 | use Illuminate\Contracts\Auth\CanResetPassword as CanResetPasswordContract; |
11 | 10 | use Illuminate\Database\Eloquent\Model; |
12 | 11 | use Illuminate\Foundation\Auth\Access\Authorizable; |
13 | -use MedianetDev\LaravelAuthApi\Http\Controllers\Traits\Notifications\ResetPassword as ResetPasswordNotification; |
|
14 | 12 | use Illuminate\Notifications\Notifiable; |
13 | +use MedianetDev\LaravelAuthApi\Http\Controllers\Traits\MustVerifyEmail; |
|
15 | 14 | |
16 | 15 | class User extends Model implements |
17 | 16 | AuthenticatableContract, |