github-mirror/BookStack
2
0
Fork 0
mirror of https://github.com/BookStackApp/BookStack.git synced 2024-11-22 12:55:14 +08:00
Code Issues Actions Packages Projects Releases Wiki Activity

Applied latest StyleCI changes

Browse Source
This commit is contained in:
Dan Brown 2022-04-25 18:42:31 +01:00
parent d5b7fff102
commit f1a8ad4980
No known key found for this signature in database
GPG Key ID: 46D9F943C24A2EF9
4 changed files with 18 additions and 18 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

8
app/Entities/Models/Deletion.php
View File

@ -10,10 +10,10 @@ use Illuminate\Database\Eloquent\Relations\BelongsTo;
use Illuminate\Database\Eloquent\Relations\MorphTo;
/**
* @property int $id
* @property int $deleted_by
* @property string $deletable_type
* @property int $deletable_id
* @property int $id
* @property int $deleted_by
* @property string $deletable_type
* @property int $deletable_id
* @property Deletable $deletable
*/
class Deletion extends Model implements Loggable

2
app/Http/Controllers/Api/RecycleBinApiController.php
View File

@ -71,7 +71,7 @@ class RecycleBinApiController extends ApiController
protected function listFormatter(Deletion $deletion)
{
$deletable = $deletion->deletable;
$withTrashedQuery = fn(Builder $query) => $query->withTrashed();
$withTrashedQuery = fn (Builder $query) => $query->withTrashed();
if ($deletable instanceof BookChild) {
$parent = $deletable->getParent();

16
database/migrations/2022_04_25_140741_update_polymorphic_types.php
View File

@ -19,15 +19,15 @@ class UpdatePolymorphicTypes extends Migration
* Mapping of tables and columns that contain polymorphic types.
*/
protected $columnsByTable = [
'activities' => 'entity_type',
'comments' => 'entity_type',
'deletions' => 'deletable_type',
'activities' => 'entity_type',
'comments' => 'entity_type',
'deletions' => 'deletable_type',
'entity_permissions' => 'restrictable_type',
'favourites' => 'favouritable_type',
'joint_permissions' => 'entity_type',
'search_terms' => 'entity_type',
'tags' => 'entity_type',
'views' => 'viewable_type',
'favourites' => 'favouritable_type',
'joint_permissions' => 'entity_type',
'search_terms' => 'entity_type',
'tags' => 'entity_type',
'views' => 'viewable_type',
];
/**

10
tests/Api/RecycleBinApiTest.php
View File

@ -125,9 +125,9 @@ class RecycleBinApiTest extends TestCase
'parent' => [
'id' => $page->chapter->id,
'name' => $page->chapter->name,
'type' => 'chapter'
]
]
'type' => 'chapter',
],
],
],
];
@ -152,7 +152,7 @@ class RecycleBinApiTest extends TestCase
$resp = $this->putJson($this->baseEndpoint . '/' . $deletion->id);
$resp->assertJson([
'restore_count' => 1
'restore_count' => 1,
]);
$this->assertDatabaseHas('pages', [
@ -176,7 +176,7 @@ class RecycleBinApiTest extends TestCase
$resp = $this->deleteJson($this->baseEndpoint . '/' . $deletion->id);
$resp->assertJson([
'delete_count' => 1
'delete_count' => 1,
]);
$this->assertDatabaseMissing('pages', ['id' => $page->id]);