Applied changes from styleci

diff --git a/app/Entities/Tools/PageEditActivity.php b/app/Entities/Tools/PageEditActivity.php
index f23506a8c138ebb5be2e9020f8b3dd97fb0a0603..ef6c085ac72c54e086442f80f7be532ba31fe442 100644 (file)
--- a/app/Entities/Tools/PageEditActivity.php
+++ b/app/Entities/Tools/PageEditActivity.php
@@ -43,7 +43,9 @@ class PageEditActivity
 
     /**
      * Get any editor clash warning messages to show for the given draft revision.
+     *
      * @param PageRevision|Page $draft
+     *
      * @return string[]
      */
     public function getWarningMessagesForDraft($draft): array

diff --git a/app/Http/Controllers/PageController.php b/app/Http/Controllers/PageController.php
index 9025db162ab949709287a298c6918464c177cfb1..a94a6180304d9abe8f909c7a4ea020cddbb5d205 100644 (file)
--- a/app/Http/Controllers/PageController.php
+++ b/app/Http/Controllers/PageController.php
@@ -4,7 +4,6 @@ namespace BookStack\Http\Controllers;
 
 use BookStack\Actions\View;
 use BookStack\Entities\Models\Page;
-use BookStack\Entities\Models\PageRevision;
 use BookStack\Entities\Repos\PageRepo;
 use BookStack\Entities\Tools\BookContents;
 use BookStack\Entities\Tools\NextPreviousContentLocator;

diff --git a/app/Http/Kernel.php b/app/Http/Kernel.php
index 8c71e2194700d220d7e425f37bdf1aea2e2ae39a..7a09493afc80488ca3d09832662e90e85a81ce67 100644 (file)
--- a/app/Http/Kernel.php
+++ b/app/Http/Kernel.php
@@ -2,7 +2,6 @@
 
 namespace BookStack\Http;
 
-use BookStack\Http\Middleware\PreventAuthenticatedResponseCaching;
 use Illuminate\Foundation\Http\Kernel as HttpKernel;
 
 class Kernel extends HttpKernel

diff --git a/app/Http/Middleware/PreventAuthenticatedResponseCaching.php b/app/Http/Middleware/PreventAuthenticatedResponseCaching.php
index 3ad5b3914a13869558b13cf7d8346f7230cb6048..60c9138110a1665947c56a5c06f5896b1c4fd273 100644 (file)
--- a/app/Http/Middleware/PreventAuthenticatedResponseCaching.php
+++ b/app/Http/Middleware/PreventAuthenticatedResponseCaching.php
@@ -10,8 +10,9 @@ class PreventAuthenticatedResponseCaching
     /**
      * Handle an incoming request.
      *
-     * @param  \Illuminate\Http\Request  $request
-     * @param  \Closure  $next
+     * @param \Illuminate\Http\Request $request
+     * @param \Closure                 $next
+     *
      * @return mixed
      */
     public function handle($request, Closure $next)

diff --git a/app/Uploads/AttachmentService.php b/app/Uploads/AttachmentService.php
index c957e8beafb29ee1277bd858e01ba08fe4132f70..3de0a0dae98c4f08abdc6755eac689e3774cc2ca 100644 (file)
--- a/app/Uploads/AttachmentService.php
+++ b/app/Uploads/AttachmentService.php
@@ -75,6 +75,7 @@ class AttachmentService
 
     /**
      * Store a new attachment upon user upload.
+     *
      * @throws FileUploadException
      */
     public function saveNewUpload(UploadedFile $uploadedFile, int $page_id): Attachment
@@ -174,6 +175,7 @@ class AttachmentService
 
     /**
      * Delete a File from the database and storage.
+     *
      * @throws Exception
      */
     public function deleteFile(Attachment $attachment)
@@ -205,6 +207,7 @@ class AttachmentService
 
     /**
      * Store a file in storage with the given filename.
+     *
      * @throws FileUploadException
      */
     protected function putFileInStorage(UploadedFile $uploadedFile): string

diff --git a/app/Uploads/ImageService.php b/app/Uploads/ImageService.php
index eff8005d716fe3515deddf35a8b3afe8c7c8b903..d6c74c751c774e258aeabd1151a60b52fc52655c 100644 (file)
--- a/app/Uploads/ImageService.php
+++ b/app/Uploads/ImageService.php
@@ -308,6 +308,7 @@ class ImageService
     public function getImageData(Image $image): string
     {
         $storage = $this->getStorage();
+
         return $storage->get($this->adjustPathForStorageDisk($image->path, $image->type));
     }
 

diff --git a/tests/Entity/PageDraftTest.php b/tests/Entity/PageDraftTest.php
index 21a74768f319b92100d023d2cb49fc546e02d103..4fb7d7ab6e5226d01910ef57ac4cda633057a00d 100644 (file)
--- a/tests/Entity/PageDraftTest.php
+++ b/tests/Entity/PageDraftTest.php
@@ -138,8 +138,6 @@ class PageDraftTest extends TestCase
         ]);
     }
 
-
-
     public function test_draft_pages_show_on_homepage()
     {
         /** @var Book $book */