mirror of
https://github.com/BookStackApp/BookStack.git
synced 2025-08-07 23:03:00 +03: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:
@@ -3,7 +3,6 @@
|
||||
use BookStack\Entities\Book;
|
||||
use BookStack\Entities\Chapter;
|
||||
use BookStack\Entities\Page;
|
||||
use BookStack\Entities\Repos\EntityRepo;
|
||||
use BookStack\Auth\UserRepo;
|
||||
use BookStack\Entities\Repos\PageRepo;
|
||||
use Carbon\Carbon;
|
||||
@@ -192,7 +191,7 @@ class EntityTest extends BrowserKitTest
|
||||
$entities = $this->createEntityChainBelongingToUser($creator, $updater);
|
||||
$this->actingAs($creator);
|
||||
app(UserRepo::class)->destroy($creator);
|
||||
app(PageRepo::class)->savePageRevision($entities['page']);
|
||||
app(PageRepo::class)->update($entities['page'], ['html' => '<p>hello!</p>>']);
|
||||
|
||||
$this->checkEntitiesViewable($entities);
|
||||
}
|
||||
@@ -205,7 +204,7 @@ class EntityTest extends BrowserKitTest
|
||||
$entities = $this->createEntityChainBelongingToUser($creator, $updater);
|
||||
$this->actingAs($updater);
|
||||
app(UserRepo::class)->destroy($updater);
|
||||
app(PageRepo::class)->savePageRevision($entities['page']);
|
||||
app(PageRepo::class)->update($entities['page'], ['html' => '<p>Hello there!</p>']);
|
||||
|
||||
$this->checkEntitiesViewable($entities);
|
||||
}
|
||||
@@ -273,8 +272,7 @@ class EntityTest extends BrowserKitTest
|
||||
|
||||
public function test_slug_multi_byte_lower_casing()
|
||||
{
|
||||
$entityRepo = app(EntityRepo::class);
|
||||
$book = $entityRepo->createFromInput('book', [
|
||||
$book = $this->newBook([
|
||||
'name' => 'КНИГА'
|
||||
]);
|
||||
|
||||
@@ -284,8 +282,7 @@ class EntityTest extends BrowserKitTest
|
||||
|
||||
public function test_slug_format()
|
||||
{
|
||||
$entityRepo = app(EntityRepo::class);
|
||||
$book = $entityRepo->createFromInput('book', [
|
||||
$book = $this->newBook([
|
||||
'name' => 'PartA / PartB / PartC'
|
||||
]);
|
||||
|
||||
|
Reference in New Issue
Block a user