archive/BookStackApp_BookStack
0
0
Fork 0
mirror of https://github.com/BookStackApp/BookStack.git synced 2025-04-30 06:30:03 +00:00
Code Issues Projects Releases Wiki Activity

Applied stylci advisories

Browse source
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

16
app/Entities/Models/BookChild.php
View file

@ -8,29 +8,29 @@ use Illuminate\Database\Eloquent\Relations\BelongsTo;
/** /**
* Class BookChild. * Class BookChild.
* *
* @property int $book_id * @property int $book_id
* @property int $priority * @property int $priority
* @property string $book_slug * @property string $book_slug
* @property Book $book * @property Book $book
* *
* @method Builder whereSlugs(string $bookSlug, string $childSlug) * @method Builder whereSlugs(string $bookSlug, string $childSlug)
*/ */
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']);
} }
} }

2
app/Entities/Tools/Markdown/CustomListItemRenderer.php
View file

@ -40,4 +40,4 @@ class CustomListItemRenderer implements BlockRendererInterface
return $firstChild instanceof Paragraph && $firstChild->firstChild() instanceof TaskListItemMarker; return $firstChild instanceof Paragraph && $firstChild->firstChild() instanceof TaskListItemMarker;
} }
} }

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
{ {