From 704b808e9e6d7e90167e9b1e9f98ba6d90245762 Mon Sep 17 00:00:00 2001 From: imanghafoori Date: Fri, 16 Oct 2020 02:57:36 +0330 Subject: [PATCH 1/2] fixes from laravel-microscope --- app/Auth/Permissions/PermissionService.php | 3 --- app/Http/Controllers/Images/ImageController.php | 2 +- tests/Permissions/RestrictionsTest.php | 2 +- tests/User/UserApiTokenTest.php | 2 +- tests/User/UserPreferencesTest.php | 2 +- tests/User/UserProfileTest.php | 2 +- 6 files changed, 5 insertions(+), 8 deletions(-) diff --git a/app/Auth/Permissions/PermissionService.php b/app/Auth/Permissions/PermissionService.php index 97cc1ca24..043227aab 100644 --- a/app/Auth/Permissions/PermissionService.php +++ b/app/Auth/Permissions/PermissionService.php @@ -3,11 +3,8 @@ use BookStack\Auth\Permissions; use BookStack\Auth\Role; use BookStack\Entities\Book; -use BookStack\Entities\Bookshelf; -use BookStack\Entities\Chapter; use BookStack\Entities\Entity; use BookStack\Entities\EntityProvider; -use BookStack\Entities\Page; use BookStack\Ownable; use Illuminate\Database\Connection; use Illuminate\Database\Eloquent\Builder; diff --git a/app/Http/Controllers/Images/ImageController.php b/app/Http/Controllers/Images/ImageController.php index 7d06facff..52cc463c8 100644 --- a/app/Http/Controllers/Images/ImageController.php +++ b/app/Http/Controllers/Images/ImageController.php @@ -3,7 +3,7 @@ use BookStack\Entities\Page; use BookStack\Exceptions\ImageUploadException; use BookStack\Http\Controllers\Controller; -use BookStack\Repos\PageRepo; +use BookStack\Entities\Repos\PageRepo; use BookStack\Uploads\Image; use BookStack\Uploads\ImageRepo; use Exception; diff --git a/tests/Permissions/RestrictionsTest.php b/tests/Permissions/RestrictionsTest.php index 7d6c1831a..a43a65e58 100644 --- a/tests/Permissions/RestrictionsTest.php +++ b/tests/Permissions/RestrictionsTest.php @@ -58,7 +58,7 @@ class RestrictionsTest extends BrowserKitTest public function test_bookshelf_update_restriction() { - $shelf = BookShelf::first(); + $shelf = Bookshelf::first(); $this->actingAs($this->user) ->visit($shelf->getUrl('/edit')) diff --git a/tests/User/UserApiTokenTest.php b/tests/User/UserApiTokenTest.php index f738eb579..c89a590f0 100644 --- a/tests/User/UserApiTokenTest.php +++ b/tests/User/UserApiTokenTest.php @@ -1,4 +1,4 @@ - Date: Fri, 16 Oct 2020 18:40:44 +0330 Subject: [PATCH 2/2] Adds laravel-microscope package --- composer.json | 1 + 1 file changed, 1 insertion(+) diff --git a/composer.json b/composer.json index 59fc909d6..c6e45462e 100644 --- a/composer.json +++ b/composer.json @@ -35,6 +35,7 @@ "socialiteproviders/twitch": "^5.0" }, "require-dev": { + "imanghafoori/laravel-microscope": "^1.0", "barryvdh/laravel-debugbar": "^3.2.8", "barryvdh/laravel-ide-helper": "^2.6.4", "fzaninotto/faker": "^1.4",