colin
/
bookstack
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Applied stylci advisories

This commit is contained in:
Dan Brown 2021-08-24 21:23:55 +01:00
parent 610ee2c182
commit 4400ad7e8d
No known key found for this signature in database
GPG Key ID: 46D9F943C24A2EF9
4 changed files with 10 additions and 14 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
app/Entities/Models/BookChild.php
View File

@ -17,20 +17,20 @@ use Illuminate\Database\Eloquent\Relations\BelongsTo;
*/ */
abstract class BookChild extends Entity abstract class BookChild extends Entity
{ {
protected static function boot() protected static function boot()
{ {
parent::boot(); parent::boot();
// Load book slugs onto these models by default during query-time // Load book slugs onto these models by default during query-time
static::addGlobalScope('book_slug', function(Builder $builder) { static::addGlobalScope('book_slug', function (Builder $builder) {
$builder->addSelect(['book_slug' => function($builder) { $builder->addSelect(['book_slug' => function ($builder) {
$builder->select('slug') $builder->select('slug')
->from('books') ->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 * Scope a query to find items where the child has the given childSlug
* where its parent has the bookSlug. * where its parent has the bookSlug.

2
app/Entities/Repos/PageRepo.php
View File

@ -218,7 +218,7 @@ class PageRepo
$pageContent = new PageContent($page); $pageContent = new PageContent($page);
if (!empty($input['markdown'] ?? '')) { if (!empty($input['markdown'] ?? '')) {
$pageContent->setNewMarkdown($input['markdown']); $pageContent->setNewMarkdown($input['markdown']);
} else if (isset($input['html'])) { } elseif (isset($input['html'])) {
$pageContent->setNewHTML($input['html']); $pageContent->setNewHTML($input['html']);
} }
} }

4
app/Entities/Tools/PageContent.php
View File

@ -5,7 +5,6 @@ namespace BookStack\Entities\Tools;
use BookStack\Entities\Models\Page; use BookStack\Entities\Models\Page;
use BookStack\Entities\Tools\Markdown\CustomListItemRenderer; use BookStack\Entities\Tools\Markdown\CustomListItemRenderer;
use BookStack\Entities\Tools\Markdown\CustomStrikeThroughExtension; use BookStack\Entities\Tools\Markdown\CustomStrikeThroughExtension;
use BookStack\Entities\Tools\Markdown\CustomTaskListMarkerRenderer;
use BookStack\Exceptions\ImageUploadException; use BookStack\Exceptions\ImageUploadException;
use BookStack\Facades\Theme; use BookStack\Facades\Theme;
use BookStack\Theming\ThemeEvents; use BookStack\Theming\ThemeEvents;
@ -20,9 +19,6 @@ use League\CommonMark\CommonMarkConverter;
use League\CommonMark\Environment; use League\CommonMark\Environment;
use League\CommonMark\Extension\Table\TableExtension; use League\CommonMark\Extension\Table\TableExtension;
use League\CommonMark\Extension\TaskList\TaskListExtension; 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 class PageContent
{ {