Skip to content

Commit 85b2a8a

Browse files
michalsnmichalsn
committed
remove var annotations
1 parent 6393116 commit 85b2a8a

26 files changed

Lines changed: 4 additions & 91 deletions

‎src/Authentication/Actions/Email2FA.php‎

Lines changed: 0 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -145,7 +145,6 @@ public function verify(IncomingRequest $request)
145145
*/
146146
public function createIdentity(User $user): string
147147
{
148-
/** @var UserIdentityModel $identityModel */
149148
$identityModel = model(UserIdentityModel::class);
150149

151150
// Delete any previous identities for action
@@ -169,7 +168,6 @@ public function createIdentity(User $user): string
169168
*/
170169
private function getIdentity(User $user): ?UserIdentity
171170
{
172-
/** @var UserIdentityModel $identityModel */
173171
$identityModel = model(UserIdentityModel::class);
174172

175173
return $identityModel->getIdentityByType(

‎src/Authentication/Actions/EmailActivator.php‎

Lines changed: 0 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -137,7 +137,6 @@ public function verify(IncomingRequest $request)
137137
*/
138138
public function createIdentity(User $user): string
139139
{
140-
/** @var UserIdentityModel $identityModel */
141140
$identityModel = model(UserIdentityModel::class);
142141

143142
// Delete any previous identities for action
@@ -161,7 +160,6 @@ public function createIdentity(User $user): string
161160
*/
162161
private function getIdentity(User $user): ?UserIdentity
163162
{
164-
/** @var UserIdentityModel $identityModel */
165163
$identityModel = model(UserIdentityModel::class);
166164

167165
return $identityModel->getIdentityByType(

‎src/Authentication/Authenticators/AccessTokens.php‎

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -140,7 +140,6 @@ public function check(array $credentials): Result
140140
$credentials['token'] = trim(substr((string) $credentials['token'], 6));
141141
}
142142

143-
/** @var UserIdentityModel $identityModel */
144143
$identityModel = model(UserIdentityModel::class);
145144

146145
$token = $identityModel->getAccessTokenByRawToken($credentials['token']);

‎src/Authentication/Authenticators/HmacSha256.php‎

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -144,7 +144,6 @@ public function check(array $credentials): Result
144144
// Extract UserToken and HMACSHA256 Signature from Authorization token
145145
[$userToken, $signature] = $this->getHmacAuthTokens($credentials['token']);
146146

147-
/** @var UserIdentityModel $identityModel */
148147
$identityModel = model(UserIdentityModel::class);
149148

150149
$token = $identityModel->getHmacTokenByKey($userToken);

‎src/Authentication/Traits/HasAccessTokens.php‎

Lines changed: 0 additions & 9 deletions
Original file line numberDiff line numberDiff line change
@@ -45,7 +45,6 @@ trait HasAccessTokens
4545
*/
4646
public function generateAccessToken(string $name, array $scopes = ['*'], ?Time $expiresAt = null): AccessToken
4747
{
48-
/** @var UserIdentityModel $identityModel */
4948
$identityModel = model(UserIdentityModel::class);
5049

5150
return $identityModel->generateAccessToken($this, $name, $scopes, $expiresAt);
@@ -56,7 +55,6 @@ public function generateAccessToken(string $name, array $scopes = ['*'], ?Time $
5655
*/
5756
public function revokeAccessToken(string $rawToken): void
5857
{
59-
/** @var UserIdentityModel $identityModel */
6058
$identityModel = model(UserIdentityModel::class);
6159

6260
$identityModel->revokeAccessToken($this, $rawToken);
@@ -67,7 +65,6 @@ public function revokeAccessToken(string $rawToken): void
6765
*/
6866
public function revokeAccessTokenBySecret(string $secretToken): void
6967
{
70-
/** @var UserIdentityModel $identityModel */
7168
$identityModel = model(UserIdentityModel::class);
7269

7370
$identityModel->revokeAccessTokenBySecret($this, $secretToken);
@@ -78,7 +75,6 @@ public function revokeAccessTokenBySecret(string $secretToken): void
7875
*/
7976
public function revokeAllAccessTokens(): void
8077
{
81-
/** @var UserIdentityModel $identityModel */
8278
$identityModel = model(UserIdentityModel::class);
8379

8480
$identityModel->revokeAllAccessTokens($this);
@@ -91,7 +87,6 @@ public function revokeAllAccessTokens(): void
9187
*/
9288
public function accessTokens(): array
9389
{
94-
/** @var UserIdentityModel $identityModel */
9590
$identityModel = model(UserIdentityModel::class);
9691

9792
return $identityModel->getAllAccessTokens($this);
@@ -107,7 +102,6 @@ public function getAccessToken(?string $rawToken): ?AccessToken
107102
return null;
108103
}
109104

110-
/** @var UserIdentityModel $identityModel */
111105
$identityModel = model(UserIdentityModel::class);
112106

113107
return $identityModel->getAccessToken($this, $rawToken);
@@ -118,7 +112,6 @@ public function getAccessToken(?string $rawToken): ?AccessToken
118112
*/
119113
public function getAccessTokenById(int $id): ?AccessToken
120114
{
121-
/** @var UserIdentityModel $identityModel */
122115
$identityModel = model(UserIdentityModel::class);
123116

124117
return $identityModel->getAccessTokenById($id, $this);
@@ -190,7 +183,6 @@ public function isAccessTokenExpired(AccessToken $accessToken): bool
190183
*/
191184
public function updateAccessTokenExpiration(int $id, Time $expiresAt): bool
192185
{
193-
/** @var UserIdentityModel $identityModel */
194186
$identityModel = model(UserIdentityModel::class);
195187
$result = $identityModel->setIdentityExpirationById($id, $this, $expiresAt);
196188

@@ -211,7 +203,6 @@ public function updateAccessTokenExpiration(int $id, Time $expiresAt): bool
211203
*/
212204
public function removeAccessTokenExpiration(int $id): bool
213205
{
214-
/** @var UserIdentityModel $identityModel */
215206
$identityModel = model(UserIdentityModel::class);
216207
$result = $identityModel->setIdentityExpirationById($id, $this);
217208

‎src/Authentication/Traits/HasHmacTokens.php‎

Lines changed: 0 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -46,7 +46,6 @@ trait HasHmacTokens
4646
*/
4747
public function generateHmacToken(string $name, array $scopes = ['*'], ?Time $expiresAt = null): AccessToken
4848
{
49-
/** @var UserIdentityModel $identityModel */
5049
$identityModel = model(UserIdentityModel::class);
5150

5251
return $identityModel->generateHmacToken($this, $name, $scopes, $expiresAt);
@@ -57,7 +56,6 @@ public function generateHmacToken(string $name, array $scopes = ['*'], ?Time $ex
5756
*/
5857
public function revokeHmacToken(string $key): void
5958
{
60-
/** @var UserIdentityModel $identityModel */
6159
$identityModel = model(UserIdentityModel::class);
6260

6361
$identityModel->revokeHmacToken($this, $key);
@@ -68,7 +66,6 @@ public function revokeHmacToken(string $key): void
6866
*/
6967
public function revokeAllHmacTokens(): void
7068
{
71-
/** @var UserIdentityModel $identityModel */
7269
$identityModel = model(UserIdentityModel::class);
7370

7471
$identityModel->revokeAllHmacTokens($this);
@@ -81,7 +78,6 @@ public function revokeAllHmacTokens(): void
8178
*/
8279
public function hmacTokens(): array
8380
{
84-
/** @var UserIdentityModel $identityModel */
8581
$identityModel = model(UserIdentityModel::class);
8682

8783
return $identityModel->getAllHmacTokens($this);
@@ -96,7 +92,6 @@ public function getHmacToken(?string $key): ?AccessToken
9692
return null;
9793
}
9894

99-
/** @var UserIdentityModel $identityModel */
10095
$identityModel = model(UserIdentityModel::class);
10196

10297
return $identityModel->getHmacToken($this, $key);
@@ -107,7 +102,6 @@ public function getHmacToken(?string $key): ?AccessToken
107102
*/
108103
public function getHmacTokenById(int $id): ?AccessToken
109104
{
110-
/** @var UserIdentityModel $identityModel */
111105
$identityModel = model(UserIdentityModel::class);
112106

113107
return $identityModel->getHmacTokenById($id, $this);
@@ -179,7 +173,6 @@ public function isHmacTokenExpired(AccessToken $hmacToken): bool
179173
*/
180174
public function updateHmacTokenExpiration(int $id, Time $expiresAt): bool
181175
{
182-
/** @var UserIdentityModel $identityModel */
183176
$identityModel = model(UserIdentityModel::class);
184177
$result = $identityModel->setIdentityExpirationById($id, $this, $expiresAt);
185178

@@ -200,7 +193,6 @@ public function updateHmacTokenExpiration(int $id, Time $expiresAt): bool
200193
*/
201194
public function removeHmacTokenExpiration(int $id): bool
202195
{
203-
/** @var UserIdentityModel $identityModel */
204196
$identityModel = model(UserIdentityModel::class);
205197
$result = $identityModel->setIdentityExpirationById($id, $this);
206198

‎src/Authorization/Traits/Authorizable.php‎

Lines changed: 0 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -43,7 +43,6 @@ public function addGroup(string ...$groups): self
4343
continue;
4444
}
4545

46-
/** @var GroupModel $groupModel */
4746
$groupModel = model(GroupModel::class);
4847

4948
// make sure it's a valid group
@@ -97,7 +96,6 @@ public function syncGroups(string ...$groups): self
9796
{
9897
$this->populateGroups();
9998

100-
/** @var GroupModel $groupModel */
10199
$groupModel = model(GroupModel::class);
102100

103101
foreach ($groups as $group) {
@@ -313,7 +311,6 @@ private function populateGroups(): void
313311
return;
314312
}
315313

316-
/** @var GroupModel $groupModel */
317314
$groupModel = model(GroupModel::class);
318315

319316
$this->groupCache = $groupModel->getForUser($this);
@@ -329,7 +326,6 @@ private function populatePermissions(): void
329326
return;
330327
}
331328

332-
/** @var PermissionModel $permissionModel */
333329
$permissionModel = model(PermissionModel::class);
334330

335331
$this->permissionsCache = $permissionModel->getForUser($this);
@@ -340,7 +336,6 @@ private function populatePermissions(): void
340336
*/
341337
private function saveGroups(): void
342338
{
343-
/** @var GroupModel $model */
344339
$model = model(GroupModel::class);
345340

346341
$cache = $this->groupCache;
@@ -353,7 +348,6 @@ private function saveGroups(): void
353348
*/
354349
private function savePermissions(): void
355350
{
356-
/** @var PermissionModel $model */
357351
$model = model(PermissionModel::class);
358352

359353
$cache = $this->permissionsCache;

‎src/Commands/User.php‎

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -335,7 +335,6 @@ private function create(?string $username = null, ?string $email = null, ?string
335335

336336
private function validateGroup(string $group): bool
337337
{
338-
/** @var GroupModel $groupModel */
339338
$groupModel = model(GroupModel::class);
340339

341340
return $groupModel->isValidGroup($group);

‎src/Controllers/MagicLinkController.php‎

Lines changed: 0 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -97,7 +97,6 @@ public function loginAction()
9797
return redirect()->route('magic-link')->with('error', lang('Auth.invalidEmail', [$email]));
9898
}
9999

100-
/** @var UserIdentityModel $identityModel */
101100
$identityModel = model(UserIdentityModel::class);
102101

103102
// Delete any previous magic-link identities
@@ -168,7 +167,6 @@ public function verify(): RedirectResponse
168167

169168
$token = $this->request->getGet('token');
170169

171-
/** @var UserIdentityModel $identityModel */
172170
$identityModel = model(UserIdentityModel::class);
173171

174172
$identity = $identityModel->getIdentityBySecret(Session::ID_TYPE_MAGIC_LINK, $token);
@@ -237,7 +235,6 @@ private function recordLoginAttempt(
237235
bool $success,
238236
$userId = null,
239237
): void {
240-
/** @var LoginModel $loginModel */
241238
$loginModel = model(LoginModel::class);
242239

243240
$loginModel->recordLoginAttempt(

‎src/Entities/User.php‎

Lines changed: 0 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -93,7 +93,6 @@ public function getIdentity(string $type): ?UserIdentity
9393
private function populateIdentities(): void
9494
{
9595
if ($this->identities === null) {
96-
/** @var UserIdentityModel $identityModel */
9796
$identityModel = model(UserIdentityModel::class);
9897

9998
$this->identities = $identityModel->getIdentities($this);
@@ -140,7 +139,6 @@ public function setIdentities(array $identities): void
140139
*/
141140
public function createEmailIdentity(array $credentials): void
142141
{
143-
/** @var UserIdentityModel $identityModel */
144142
$identityModel = model(UserIdentityModel::class);
145143

146144
$identityModel->createEmailIdentity($this, $credentials);
@@ -193,7 +191,6 @@ public function saveEmailIdentity(): bool
193191
$identity->secret2 = $this->password_hash;
194192
}
195193

196-
/** @var UserIdentityModel $identityModel */
197194
$identityModel = model(UserIdentityModel::class);
198195

199196
try {
@@ -220,7 +217,6 @@ public function saveEmailIdentity(): bool
220217
*/
221218
public function touchIdentity(UserIdentity $identity): void
222219
{
223-
/** @var UserIdentityModel $identityModel */
224220
$identityModel = model(UserIdentityModel::class);
225221

226222
$identityModel->touchIdentity($identity);
@@ -283,7 +279,6 @@ public function getPasswordHash(): ?string
283279
*/
284280
public function previousLogin(): ?Login
285281
{
286-
/** @var LoginModel $logins */
287282
$logins = model(LoginModel::class);
288283

289284
return $logins->previousLogin($this);
@@ -294,7 +289,6 @@ public function previousLogin(): ?Login
294289
*/
295290
public function lastLogin(): ?Login
296291
{
297-
/** @var LoginModel $logins */
298292
$logins = model(LoginModel::class);
299293

300294
return $logins->lastLogin($this);

0 commit comments

Comments
 (0)