Skip to content

Commit 1237f36

Browse files
authored
Apply fixes from StyleCI (#204)
1 parent 4490b2c commit 1237f36

File tree

2 files changed

+36
-38
lines changed

2 files changed

+36
-38
lines changed

src/Traits/HasRoles.php

Lines changed: 17 additions & 17 deletions
Original file line numberDiff line numberDiff line change
@@ -200,23 +200,23 @@ public function hasPermissionTo($permission)
200200
return $this->hasDirectPermission($permission) || $this->hasPermissionViaRole($permission);
201201
}
202202

203-
/**
204-
* Determine if the user has any of the given permissions.
205-
*
206-
* @param array ...$permissions
207-
*
208-
* @return bool
209-
*/
210-
public function hasAnyPermission(...$permissions)
211-
{
212-
foreach($permissions as $permission){
213-
if($this->hasPermissionTo($permission)){
214-
return true;
215-
}
216-
}
217-
218-
return false;
219-
}
203+
/**
204+
* Determine if the user has any of the given permissions.
205+
*
206+
* @param array ...$permissions
207+
*
208+
* @return bool
209+
*/
210+
public function hasAnyPermission(...$permissions)
211+
{
212+
foreach ($permissions as $permission) {
213+
if ($this->hasPermissionTo($permission)) {
214+
return true;
215+
}
216+
}
217+
218+
return false;
219+
}
220220

221221
/**
222222
* @deprecated deprecated since version 1.0.1, use hasPermissionTo instead

tests/HasRolesTest.php

Lines changed: 19 additions & 21 deletions
Original file line numberDiff line numberDiff line change
@@ -347,36 +347,35 @@ public function it_can_revoke_a_permission_from_a_user()
347347
$this->assertFalse($this->testUser->hasPermissionTo($this->testPermission));
348348
}
349349

350-
/** @test */
351-
public function it_can_determine_that_the_user_has_any_of_the_permissions_directly() {
352-
353-
$this->assertFalse($this->testUser->hasAnyPermission('edit-articles'));
354-
355-
$this->testUser->givePermissionTo('edit-articles');
356-
357-
$this->refreshTestUser();
350+
/** @test */
351+
public function it_can_determine_that_the_user_has_any_of_the_permissions_directly()
352+
{
353+
$this->assertFalse($this->testUser->hasAnyPermission('edit-articles'));
358354

359-
$this->assertTrue($this->testUser->hasAnyPermission('edit-news', 'edit-articles'));
355+
$this->testUser->givePermissionTo('edit-articles');
360356

361-
$this->testUser->givePermissionTo('edit-news');
357+
$this->refreshTestUser();
362358

363-
$this->refreshTestUser();
359+
$this->assertTrue($this->testUser->hasAnyPermission('edit-news', 'edit-articles'));
364360

365-
$this->testUser->revokePermissionTo($this->testPermission);
361+
$this->testUser->givePermissionTo('edit-news');
366362

367-
$this->assertTrue($this->testUser->hasAnyPermission('edit-articles', 'edit-news'));
363+
$this->refreshTestUser();
368364

369-
}
365+
$this->testUser->revokePermissionTo($this->testPermission);
370366

371-
/** @test */
372-
public function it_can_determine_that_the_user_has_any_of_the_permissions_via_role() {
367+
$this->assertTrue($this->testUser->hasAnyPermission('edit-articles', 'edit-news'));
368+
}
373369

374-
$this->testRole->givePermissionTo('edit-articles');
370+
/** @test */
371+
public function it_can_determine_that_the_user_has_any_of_the_permissions_via_role()
372+
{
373+
$this->testRole->givePermissionTo('edit-articles');
375374

376-
$this->testUser->assignRole('testRole');
375+
$this->testUser->assignRole('testRole');
377376

378-
$this->assertTrue($this->testUser->hasAnyPermission('edit-news', 'edit-articles'));
379-
}
377+
$this->assertTrue($this->testUser->hasAnyPermission('edit-news', 'edit-articles'));
378+
}
380379

381380
/** @test */
382381
public function it_can_determine_that_user_has_direct_permission()
@@ -394,7 +393,6 @@ public function it_can_determine_that_user_has_direct_permission()
394393
$this->assertFalse($this->testUser->hasDirectPermission('edit-articles'));
395394
}
396395

397-
398396
/**
399397
* @test
400398
*

0 commit comments

Comments
 (0)