starred/BookStack
1
0
Fork 0
mirror of https://github.com/BookStackApp/BookStack.git synced 2026-03-01 11:19:40 +03:00
Code Issues 784 Packages Projects Releases 15 Wiki Activity

Renamed and cleaned up existing permission service classes use

Browse Source
This commit is contained in:
Dan Brown
2022-07-12 20:15:41 +01:00
parent 2d4f708c79
commit b0a4d3d059
22 changed files with 140 additions and 194 deletions
Download Patch File Download Diff File Expand all files Collapse all files

8
tests/SharedTestHelpers.php
View File

@@ -3,7 +3,7 @@
namespace Tests;
use BookStack\Auth\Permissions\JointPermissionBuilder;
use BookStack\Auth\Permissions\PermissionService;
use BookStack\Auth\Permissions\PermissionApplicator;
use BookStack\Auth\Permissions\PermissionsRepo;
use BookStack\Auth\Permissions\RolePermission;
use BookStack\Auth\Role;
@@ -177,7 +177,7 @@ trait SharedTestHelpers
$entity->save();
$entity->load('permissions');
$this->app->make(JointPermissionBuilder::class)->buildJointPermissionsForEntity($entity);
$this->app->make(JointPermissionBuilder::class)->rebuildForEntity($entity);
$entity->load('jointPermissions');
}
@@ -209,7 +209,7 @@ trait SharedTestHelpers
/** @var Role $role */
foreach ($roles as $role) {
$role->detachPermission($permission);
$permissionBuilder->buildJointPermissionForRole($role);
$permissionBuilder->rebuildForRole($role);
}
$user->clearPermissionCache();
@@ -243,7 +243,7 @@ trait SharedTestHelpers
$chapter = Chapter::factory()->create(array_merge(['book_id' => $book->id], $userAttrs));
$page = Page::factory()->create(array_merge(['book_id' => $book->id, 'chapter_id' => $chapter->id], $userAttrs));
$this->app->make(JointPermissionBuilder::class)->buildJointPermissionsForEntity($book);
$this->app->make(JointPermissionBuilder::class)->rebuildForEntity($book);
return compact('book', 'chapter', 'page');
}