From 4400ad7e8d308a33927fb4ffdf4b7d6285bb58d8 Mon Sep 17 00:00:00 2001 From: Dan Brown Date: Tue, 24 Aug 2021 21:23:55 +0100 Subject: [PATCH] Applied stylci advisories --- app/Entities/Models/BookChild.php | 16 ++++++++-------- app/Entities/Repos/PageRepo.php | 2 +- .../Tools/Markdown/CustomListItemRenderer.php | 2 +- app/Entities/Tools/PageContent.php | 4 ---- 4 files changed, 10 insertions(+), 14 deletions(-) diff --git a/app/Entities/Models/BookChild.php b/app/Entities/Models/BookChild.php index 263eceb58..e1ba0b6f7 100644 --- a/app/Entities/Models/BookChild.php +++ b/app/Entities/Models/BookChild.php @@ -8,29 +8,29 @@ use Illuminate\Database\Eloquent\Relations\BelongsTo; /** * Class BookChild. * - * @property int $book_id - * @property int $priority - * @property string $book_slug - * @property Book $book + * @property int $book_id + * @property int $priority + * @property string $book_slug + * @property Book $book * * @method Builder whereSlugs(string $bookSlug, string $childSlug) */ abstract class BookChild extends Entity { - protected static function boot() { parent::boot(); // Load book slugs onto these models by default during query-time - static::addGlobalScope('book_slug', function(Builder $builder) { - $builder->addSelect(['book_slug' => function($builder) { + static::addGlobalScope('book_slug', function (Builder $builder) { + $builder->addSelect(['book_slug' => function ($builder) { $builder->select('slug') ->from('books') - ->whereColumn('books.id', '=', 'book_id'); + ->whereColumn('books.id', '=', 'book_id'); }]); }); } + /** * Scope a query to find items where the child has the given childSlug * where its parent has the bookSlug. diff --git a/app/Entities/Repos/PageRepo.php b/app/Entities/Repos/PageRepo.php index c37c64373..ffa06d459 100644 --- a/app/Entities/Repos/PageRepo.php +++ b/app/Entities/Repos/PageRepo.php @@ -218,7 +218,7 @@ class PageRepo $pageContent = new PageContent($page); if (!empty($input['markdown'] ?? '')) { $pageContent->setNewMarkdown($input['markdown']); - } else if (isset($input['html'])) { + } elseif (isset($input['html'])) { $pageContent->setNewHTML($input['html']); } } diff --git a/app/Entities/Tools/Markdown/CustomListItemRenderer.php b/app/Entities/Tools/Markdown/CustomListItemRenderer.php index 9d6ec7c87..be4cac4a7 100644 --- a/app/Entities/Tools/Markdown/CustomListItemRenderer.php +++ b/app/Entities/Tools/Markdown/CustomListItemRenderer.php @@ -40,4 +40,4 @@ class CustomListItemRenderer implements BlockRendererInterface return $firstChild instanceof Paragraph && $firstChild->firstChild() instanceof TaskListItemMarker; } -} \ No newline at end of file +} diff --git a/app/Entities/Tools/PageContent.php b/app/Entities/Tools/PageContent.php index dfc8e332b..b4cc1b81c 100644 --- a/app/Entities/Tools/PageContent.php +++ b/app/Entities/Tools/PageContent.php @@ -5,7 +5,6 @@ namespace BookStack\Entities\Tools; use BookStack\Entities\Models\Page; use BookStack\Entities\Tools\Markdown\CustomListItemRenderer; use BookStack\Entities\Tools\Markdown\CustomStrikeThroughExtension; -use BookStack\Entities\Tools\Markdown\CustomTaskListMarkerRenderer; use BookStack\Exceptions\ImageUploadException; use BookStack\Facades\Theme; use BookStack\Theming\ThemeEvents; @@ -20,9 +19,6 @@ use League\CommonMark\CommonMarkConverter; use League\CommonMark\Environment; use League\CommonMark\Extension\Table\TableExtension; use League\CommonMark\Extension\TaskList\TaskListExtension; -use League\CommonMark\Extension\TaskList\TaskListItemMarker; -use League\CommonMark\Extension\TaskList\TaskListItemMarkerParser; -use League\CommonMark\Extension\TaskList\TaskListItemMarkerRenderer; class PageContent {