Applied styleci changes for conversion work

diff --git a/app/Entities/Repos/BookshelfRepo.php b/app/Entities/Repos/BookshelfRepo.php
index f37db1f06b2728d9475dc8a6744d2240e1cfe8da..b85289b97d24d73ef7c3c17a5c9ab179c2114c62 100644 (file)
--- 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 c76f224b4f9130402301e5967078cc7a8d079d92..000f28a056f69d319a72c8d740a0dd56ed233c10 100644 (file)
--- 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<string, mixed>
      */
     public function entityToInputData(Entity $entity): array

diff --git a/app/Entities/Tools/HierarchyTransformer.php b/app/Entities/Tools/HierarchyTransformer.php
index 93c5bb9bb7103fb12ab3a60f2d76ebc0d75b22fc..50d9e2eaeef3db682deba89112dea6dca167e36e 100644 (file)
--- 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 9393006979ee1997b844b305d6c001dcddc934ed..15565c361f2ed6f3076a6dae6da92650c27f9901 100644 (file)
--- 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 937f7d28f1817670bf4af3a18135bbf0aaf2362e..681ed96bb7cfd4bfb2afcd520e6f005956c7f59d 100644 (file)
--- 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 2f966beed11cee6332549ae66b1f2f61e7ce1c24..121110e8335d83cff6cc67e04a1efaf636dab5f2 100644 (file)
--- 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 d1fe5249a2ae46fd281a602e8d0966ce9dfa22a2..60eb523800fc369edb694db27e0bcdb065825e15 100644 (file)
--- 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 fb3244e55b4d57b468fdea17582614a32a76ff0c..f426cff7358fba2e54a4bbfa63dd82b18f20f7d8 100644 (file)
--- 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 95b165402ccd612b3ce2659f5376a2731ed5550d..bc7b6f16493a91f9091b04cf0b002599477b9865 100644 (file)
--- 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 10b276a47e9611266c9e55a7b64a6cd68eaf4361..9791f77e44979f408049327db2b3675748127eaf 100644 (file)
--- 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 dd99b7befd90f1d15721ef6f06ff091e0940832d..43389ad787ccc245a9b1d6d980f790c723a09038 100644 (file)
--- 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 4a73c22c831b5c424dafa194846f4ea54284c082..ce57d56f51d0f473e73e6f63642997e11a7424fe 100644 (file)
--- 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();