From ba25dda0313d257d9361f66993af15c00a53ce85 Mon Sep 17 00:00:00 2001 From: Dan Brown Date: Sun, 19 Jun 2022 18:14:53 +0100 Subject: [PATCH] Applied styleci changes for conversion work --- app/Entities/Repos/BookshelfRepo.php | 2 -- app/Entities/Tools/Cloner.php | 1 + app/Entities/Tools/HierarchyTransformer.php | 4 +++- app/Http/Controllers/Api/BookApiController.php | 3 ++- app/Http/Controllers/BookController.php | 2 +- app/Http/Controllers/BookshelfController.php | 2 +- app/Http/Controllers/ChapterController.php | 1 - tests/Api/BooksApiTest.php | 2 +- tests/Api/ShelvesApiTest.php | 2 +- tests/Entity/ConvertTest.php | 4 +--- tests/OpenGraphTest.php | 1 - tests/SharedTestHelpers.php | 2 +- 12 files changed, 12 insertions(+), 14 deletions(-) diff --git a/app/Entities/Repos/BookshelfRepo.php b/app/Entities/Repos/BookshelfRepo.php index f37db1f06..b85289b97 100644 --- a/app/Entities/Repos/BookshelfRepo.php +++ b/app/Entities/Repos/BookshelfRepo.php @@ -6,12 +6,10 @@ use BookStack\Actions\ActivityType; use BookStack\Entities\Models\Book; use BookStack\Entities\Models\Bookshelf; use BookStack\Entities\Tools\TrashCan; -use BookStack\Exceptions\ImageUploadException; use BookStack\Exceptions\NotFoundException; use BookStack\Facades\Activity; use Exception; use Illuminate\Contracts\Pagination\LengthAwarePaginator; -use Illuminate\Http\UploadedFile; use Illuminate\Support\Collection; class BookshelfRepo diff --git a/app/Entities/Tools/Cloner.php b/app/Entities/Tools/Cloner.php index c76f224b4..000f28a05 100644 --- a/app/Entities/Tools/Cloner.php +++ b/app/Entities/Tools/Cloner.php @@ -89,6 +89,7 @@ class Cloner /** * Convert an entity to a raw data array of input data. + * * @return array */ public function entityToInputData(Entity $entity): array diff --git a/app/Entities/Tools/HierarchyTransformer.php b/app/Entities/Tools/HierarchyTransformer.php index 93c5bb9bb..50d9e2eae 100644 --- a/app/Entities/Tools/HierarchyTransformer.php +++ b/app/Entities/Tools/HierarchyTransformer.php @@ -45,6 +45,7 @@ class HierarchyTransformer $this->trashCan->destroyEntity($chapter); Activity::add(ActivityType::BOOK_CREATE_FROM_CHAPTER, $book); + return $book; } @@ -80,6 +81,7 @@ class HierarchyTransformer $shelf->books()->sync($shelfBookSyncData); Activity::add(ActivityType::BOOKSHELF_CREATE_FROM_BOOK, $shelf); + return $shelf; } -} \ No newline at end of file +} diff --git a/app/Http/Controllers/Api/BookApiController.php b/app/Http/Controllers/Api/BookApiController.php index 939300697..15565c361 100644 --- a/app/Http/Controllers/Api/BookApiController.php +++ b/app/Http/Controllers/Api/BookApiController.php @@ -89,7 +89,8 @@ class BookApiController extends ApiController return response('', 204); } - protected function rules(): array { + protected function rules(): array + { return [ 'create' => [ 'name' => ['required', 'string', 'max:255'], diff --git a/app/Http/Controllers/BookController.php b/app/Http/Controllers/BookController.php index 937f7d28f..681ed96bb 100644 --- a/app/Http/Controllers/BookController.php +++ b/app/Http/Controllers/BookController.php @@ -167,7 +167,7 @@ class BookController extends Controller if ($request->has('image_reset')) { $validated['image'] = null; - } else if (array_key_exists('image', $validated) && is_null($validated['image'])) { + } elseif (array_key_exists('image', $validated) && is_null($validated['image'])) { unset($validated['image']); } diff --git a/app/Http/Controllers/BookshelfController.php b/app/Http/Controllers/BookshelfController.php index 2f966beed..121110e83 100644 --- a/app/Http/Controllers/BookshelfController.php +++ b/app/Http/Controllers/BookshelfController.php @@ -167,7 +167,7 @@ class BookshelfController extends Controller if ($request->has('image_reset')) { $validated['image'] = null; - } else if (array_key_exists('image', $validated) && is_null($validated['image'])) { + } elseif (array_key_exists('image', $validated) && is_null($validated['image'])) { unset($validated['image']); } diff --git a/app/Http/Controllers/ChapterController.php b/app/Http/Controllers/ChapterController.php index d1fe5249a..60eb52380 100644 --- a/app/Http/Controllers/ChapterController.php +++ b/app/Http/Controllers/ChapterController.php @@ -274,7 +274,6 @@ class ChapterController extends Controller return redirect($chapter->getUrl()); } - /** * Convert the chapter to a book. */ diff --git a/tests/Api/BooksApiTest.php b/tests/Api/BooksApiTest.php index fb3244e55..f426cff73 100644 --- a/tests/Api/BooksApiTest.php +++ b/tests/Api/BooksApiTest.php @@ -139,7 +139,7 @@ class BooksApiTest extends TestCase // Ensure further updates without image do not clear cover image $resp = $this->put($this->baseEndpoint . "/{$book->id}", [ - 'name' => 'My updated book again' + 'name' => 'My updated book again', ]); $book->refresh(); diff --git a/tests/Api/ShelvesApiTest.php b/tests/Api/ShelvesApiTest.php index 95b165402..bc7b6f164 100644 --- a/tests/Api/ShelvesApiTest.php +++ b/tests/Api/ShelvesApiTest.php @@ -167,7 +167,7 @@ class ShelvesApiTest extends TestCase // Ensure further updates without image do not clear cover image $resp = $this->put($this->baseEndpoint . "/{$shelf->id}", [ - 'name' => 'My updated shelf again' + 'name' => 'My updated shelf again', ]); $shelf->refresh(); diff --git a/tests/Entity/ConvertTest.php b/tests/Entity/ConvertTest.php index 10b276a47..9791f77e4 100644 --- a/tests/Entity/ConvertTest.php +++ b/tests/Entity/ConvertTest.php @@ -12,7 +12,6 @@ use Tests\TestCase; class ConvertTest extends TestCase { - public function test_chapter_edit_view_shows_convert_option() { /** @var Chapter $chapter */ @@ -143,5 +142,4 @@ class ConvertTest extends TestCase $this->assertNotPermissionError($resp); $resp->assertRedirect(); } - -} \ No newline at end of file +} diff --git a/tests/OpenGraphTest.php b/tests/OpenGraphTest.php index dd99b7bef..43389ad78 100644 --- a/tests/OpenGraphTest.php +++ b/tests/OpenGraphTest.php @@ -8,7 +8,6 @@ use BookStack\Entities\Models\Chapter; use BookStack\Entities\Models\Page; use BookStack\Entities\Repos\BaseRepo; use BookStack\Entities\Repos\BookRepo; -use BookStack\Entities\Repos\BookshelfRepo; use Illuminate\Support\Str; use Tests\Uploads\UsesImages; diff --git a/tests/SharedTestHelpers.php b/tests/SharedTestHelpers.php index 4a73c22c8..ce57d56f5 100644 --- a/tests/SharedTestHelpers.php +++ b/tests/SharedTestHelpers.php @@ -201,7 +201,7 @@ trait SharedTestHelpers /** @var RolePermission $permission */ $permission = RolePermission::query()->where('name', '=', $permissionName)->firstOrFail(); - $roles = $user->roles()->whereHas('permissions', function($query) use ($permission) { + $roles = $user->roles()->whereHas('permissions', function ($query) use ($permission) { $query->where('id', '=', $permission->id); })->get();