mirror of
https://github.com/BookStackApp/BookStack.git
synced 2025-06-02 06:43:10 +08:00
Entity Repo & Controller Refactor (#1690)
* Started mass-refactoring of the current entity repos * Rewrote book tree logic - Now does two simple queries instead of one really complex one. - Extracted logic into its own class. - Remove model-level akward union field listing. - Logic now more readable than being large separate query and compilation functions. * Extracted and split book sort logic * Finished up Book controller/repo organisation * Refactored bookshelves controllers and repo parts * Fixed issues found via phpunit * Refactored Chapter controller * Updated Chapter export controller * Started Page controller/repo refactor * Refactored another chunk of PageController * Completed initial pagecontroller refactor pass * Fixed tests and continued reduction of old repos * Removed old page remove and further reduced entity repo * Removed old entity repo, split out page controller * Ran phpcbf and split out some page content methods * Tidied up some EntityProvider elements * Fixed issued caused by viewservice change
This commit is contained in:
@ -223,7 +223,7 @@ class AttachmentTest extends TestCase
|
||||
{
|
||||
$admin = $this->getAdmin();
|
||||
$viewer = $this->getViewer();
|
||||
$page = Page::first();
|
||||
$page = Page::first(); /** @var Page $page */
|
||||
|
||||
$this->actingAs($admin);
|
||||
$fileName = 'permission_test.txt';
|
||||
@ -233,7 +233,7 @@ class AttachmentTest extends TestCase
|
||||
$page->restricted = true;
|
||||
$page->permissions()->delete();
|
||||
$page->save();
|
||||
$this->app[PermissionService::class]->buildJointPermissionsForEntity($page);
|
||||
$page->rebuildPermissions();
|
||||
$page->load('jointPermissions');
|
||||
|
||||
$this->actingAs($viewer);
|
||||
|
@ -367,7 +367,7 @@ class ImageTest extends TestCase
|
||||
$image = Image::where('type', '=', 'gallery')->first();
|
||||
|
||||
$pageRepo = app(PageRepo::class);
|
||||
$pageRepo->updatePage($page, $page->book_id, [
|
||||
$pageRepo->update($page, [
|
||||
'name' => $page->name,
|
||||
'html' => $page->html . "<img src=\"{$image->url}\">",
|
||||
'summary' => ''
|
||||
@ -379,7 +379,7 @@ class ImageTest extends TestCase
|
||||
$this->assertCount(0, $toDelete);
|
||||
|
||||
// Save a revision of our page without the image;
|
||||
$pageRepo->updatePage($page, $page->book_id, [
|
||||
$pageRepo->update($page, [
|
||||
'name' => $page->name,
|
||||
'html' => "<p>Hello</p>",
|
||||
'summary' => ''
|
||||
|
Reference in New Issue
Block a user