webapp/bookstack
1
0
Fork 0
mirror of https://github.com/BookStackApp/BookStack.git synced 2026-01-03 23:42:28 +03:00
Code Activity

Applied StyleCi changes, updated php deps

Browse Source
This commit is contained in:
Dan Brown
2022-08-29 17:46:41 +01:00
parent e537d0c4e8
commit 1cc7c649dc
26 changed files with 435 additions and 526 deletions
Download Patch File Download Diff File Expand all files Collapse all files

3
app/References/CrossLinkParser.php
View File

@@ -99,5 +99,4 @@ class CrossLinkParser
new BookshelfLinkModelResolver(),
]);
}
}
}

4
app/References/ModelResolvers/BookLinkModelResolver.php
View File

@@ -19,8 +19,8 @@ class BookLinkModelResolver implements CrossLinkModelResolver
$bookSlug = $matches[1];
/** @var ?Book $model */
$model = Book::query()->where('slug', '=', $bookSlug)->first(['id']);
$model = Book::query()->where('slug', '=', $bookSlug)->first(['id']);
return $model;
}
}
}

4
app/References/ModelResolvers/BookshelfLinkModelResolver.php
View File

@@ -19,8 +19,8 @@ class BookshelfLinkModelResolver implements CrossLinkModelResolver
$shelfSlug = $matches[1];
/** @var ?Bookshelf $model */
$model = Bookshelf::query()->where('slug', '=', $shelfSlug)->first(['id']);
$model = Bookshelf::query()->where('slug', '=', $shelfSlug)->first(['id']);
return $model;
}
}
}

2
app/References/ModelResolvers/ChapterLinkModelResolver.php
View File

@@ -24,4 +24,4 @@ class ChapterLinkModelResolver implements CrossLinkModelResolver
return $model;
}
}
}

2
app/References/ModelResolvers/CrossLinkModelResolver.php
View File

@@ -10,4 +10,4 @@ interface CrossLinkModelResolver
* Resolve the given href link value to a model.
*/
public function resolve(string $link): ?Model;
}
}

2
app/References/ModelResolvers/PageLinkModelResolver.php
View File

@@ -24,4 +24,4 @@ class PageLinkModelResolver implements CrossLinkModelResolver
return $model;
}
}
}

2
app/References/ModelResolvers/PagePermalinkModelResolver.php
View File

@@ -22,4 +22,4 @@ class PagePermalinkModelResolver implements CrossLinkModelResolver
return $model;
}
}
}

5
app/References/Reference.php
View File

@@ -2,14 +2,13 @@
namespace BookStack\References;
use Illuminate\Database\Eloquent\Factories\HasFactory;
use Illuminate\Database\Eloquent\Model;
use Illuminate\Database\Eloquent\Relations\MorphTo;
/**
* @property int $from_id
* @property int $from_id
* @property string $from_type
* @property int $to_id
* @property int $to_id
* @property string $to_type
*/
class Reference extends Model

8
app/References/ReferenceFetcher.php
View File

@@ -26,9 +26,9 @@ class ReferenceFetcher
$baseQuery = $entity->referencesTo()
->where('from_type', '=', (new Page())->getMorphClass())
->with([
'from' => fn(Relation $query) => $query->select(Page::$listAttributes),
'from.book' => fn(Relation $query) => $query->scopes('visible'),
'from.chapter' => fn(Relation $query) => $query->scopes('visible')
'from' => fn (Relation $query) => $query->select(Page::$listAttributes),
'from.book' => fn (Relation $query) => $query->scopes('visible'),
'from.chapter' => fn (Relation $query) => $query->scopes('visible'),
]);
$references = $this->permissions->restrictEntityRelationQuery(
@@ -59,4 +59,4 @@ class ReferenceFetcher
return $count;
}
}
}

14
app/References/ReferenceStore.php
View File

@@ -7,7 +7,6 @@ use Illuminate\Database\Eloquent\Collection;
class ReferenceStore
{
/**
* Update the outgoing references for the given page.
*/
@@ -25,7 +24,7 @@ class ReferenceStore
->where('from_type', '=', (new Page())->getMorphClass())
->delete();
Page::query()->select(['id', 'html'])->chunk(100, function(Collection $pages) {
Page::query()->select(['id', 'html'])->chunk(100, function (Collection $pages) {
$this->updateForPages($pages->all());
});
}
@@ -44,7 +43,7 @@ class ReferenceStore
$parser = CrossLinkParser::createWithEntityResolvers();
$references = [];
$pageIds = array_map(fn(Page $page) => $page->id, $pages);
$pageIds = array_map(fn (Page $page) => $page->id, $pages);
Reference::query()
->where('from_type', '=', $pages[0]->getMorphClass())
->whereIn('from_id', $pageIds)
@@ -55,10 +54,10 @@ class ReferenceStore
foreach ($models as $model) {
$references[] = [
'from_id' => $page->id,
'from_id' => $page->id,
'from_type' => $page->getMorphClass(),
'to_id' => $model->id,
'to_type' => $model->getMorphClass(),
'to_id' => $model->id,
'to_type' => $model->getMorphClass(),
];
}
}
@@ -67,5 +66,4 @@ class ReferenceStore
Reference::query()->insert($referenceDataChunk);
}
}
}
}

2
app/References/ReferenceUpdater.php
View File

@@ -91,4 +91,4 @@ class ReferenceUpdater
return $html;
}
}
}