From 05d99a312d29fdae6073c1205ffc2005db23f55b Mon Sep 17 00:00:00 2001 From: Dan Brown Date: Sun, 26 Sep 2021 15:48:22 +0100 Subject: [PATCH] Applied styleci changes --- app/Actions/TagRepo.php | 2 +- app/Console/Commands/RegenerateSearch.php | 2 +- app/Providers/AppServiceProvider.php | 6 +++--- app/Providers/AuthServiceProvider.php | 2 +- app/Uploads/AttachmentService.php | 2 +- app/Uploads/ImageService.php | 2 +- tests/Auth/UserInviteTest.php | 2 +- tests/PublicActionTest.php | 2 +- tests/RecycleBinTest.php | 2 +- tests/ThemeTest.php | 2 +- 10 files changed, 12 insertions(+), 12 deletions(-) diff --git a/app/Actions/TagRepo.php b/app/Actions/TagRepo.php index 90d657e51..b892efe57 100644 --- a/app/Actions/TagRepo.php +++ b/app/Actions/TagRepo.php @@ -4,8 +4,8 @@ namespace BookStack\Actions; use BookStack\Auth\Permissions\PermissionService; use BookStack\Entities\Models\Entity; -use Illuminate\Support\Facades\DB; use Illuminate\Support\Collection; +use Illuminate\Support\Facades\DB; class TagRepo { diff --git a/app/Console/Commands/RegenerateSearch.php b/app/Console/Commands/RegenerateSearch.php index a285f6d72..50e81a2b8 100644 --- a/app/Console/Commands/RegenerateSearch.php +++ b/app/Console/Commands/RegenerateSearch.php @@ -3,8 +3,8 @@ namespace BookStack\Console\Commands; use BookStack\Entities\Tools\SearchIndex; -use Illuminate\Support\Facades\DB; use Illuminate\Console\Command; +use Illuminate\Support\Facades\DB; class RegenerateSearch extends Command { diff --git a/app/Providers/AppServiceProvider.php b/app/Providers/AppServiceProvider.php index b016df563..8334bb179 100644 --- a/app/Providers/AppServiceProvider.php +++ b/app/Providers/AppServiceProvider.php @@ -2,7 +2,6 @@ namespace BookStack\Providers; -use Illuminate\Support\Facades\Blade; use BookStack\Auth\Access\LoginService; use BookStack\Auth\Access\SocialAuthService; use BookStack\Entities\BreadcrumbsViewComposer; @@ -15,11 +14,12 @@ use BookStack\Settings\SettingService; use BookStack\Util\CspService; use Illuminate\Contracts\Cache\Repository; use Illuminate\Database\Eloquent\Relations\Relation; +use Illuminate\Support\Facades\Blade; +use Illuminate\Support\Facades\Schema; +use Illuminate\Support\Facades\URL; use Illuminate\Support\Facades\View; use Illuminate\Support\ServiceProvider; use Laravel\Socialite\Contracts\Factory as SocialiteFactory; -use Illuminate\Support\Facades\Schema; -use Illuminate\Support\Facades\URL; class AppServiceProvider extends ServiceProvider { diff --git a/app/Providers/AuthServiceProvider.php b/app/Providers/AuthServiceProvider.php index 0d9dca7a1..37b0e83b9 100644 --- a/app/Providers/AuthServiceProvider.php +++ b/app/Providers/AuthServiceProvider.php @@ -2,7 +2,6 @@ namespace BookStack\Providers; -use Illuminate\Support\Facades\Auth; use BookStack\Api\ApiTokenGuard; use BookStack\Auth\Access\ExternalBaseUserProvider; use BookStack\Auth\Access\Guards\LdapSessionGuard; @@ -10,6 +9,7 @@ use BookStack\Auth\Access\Guards\Saml2SessionGuard; use BookStack\Auth\Access\LdapService; use BookStack\Auth\Access\LoginService; use BookStack\Auth\Access\RegistrationService; +use Illuminate\Support\Facades\Auth; use Illuminate\Support\ServiceProvider; class AuthServiceProvider extends ServiceProvider diff --git a/app/Uploads/AttachmentService.php b/app/Uploads/AttachmentService.php index 5ba627040..b4cb1b88b 100644 --- a/app/Uploads/AttachmentService.php +++ b/app/Uploads/AttachmentService.php @@ -7,8 +7,8 @@ use Exception; use Illuminate\Contracts\Filesystem\Factory as FileSystem; use Illuminate\Contracts\Filesystem\FileNotFoundException; use Illuminate\Contracts\Filesystem\Filesystem as FileSystemInstance; -use Illuminate\Support\Str; use Illuminate\Support\Facades\Log; +use Illuminate\Support\Str; use Symfony\Component\HttpFoundation\File\UploadedFile; class AttachmentService diff --git a/app/Uploads/ImageService.php b/app/Uploads/ImageService.php index 13d17f697..2c38c24f4 100644 --- a/app/Uploads/ImageService.php +++ b/app/Uploads/ImageService.php @@ -3,7 +3,6 @@ namespace BookStack\Uploads; use BookStack\Exceptions\ImageUploadException; -use Illuminate\Support\Facades\DB; use ErrorException; use Exception; use Illuminate\Contracts\Cache\Repository as Cache; @@ -11,6 +10,7 @@ use Illuminate\Contracts\Filesystem\Factory as FileSystem; use Illuminate\Contracts\Filesystem\FileNotFoundException; use Illuminate\Contracts\Filesystem\Filesystem as FileSystemInstance; use Illuminate\Contracts\Filesystem\Filesystem as Storage; +use Illuminate\Support\Facades\DB; use Illuminate\Support\Str; use Intervention\Image\Exception\NotSupportedException; use Intervention\Image\ImageManager; diff --git a/tests/Auth/UserInviteTest.php b/tests/Auth/UserInviteTest.php index d994dd5b9..dcf9e23df 100644 --- a/tests/Auth/UserInviteTest.php +++ b/tests/Auth/UserInviteTest.php @@ -7,8 +7,8 @@ use BookStack\Auth\User; use BookStack\Notifications\UserInvite; use Carbon\Carbon; use Illuminate\Support\Facades\DB; -use Illuminate\Support\Str; use Illuminate\Support\Facades\Notification; +use Illuminate\Support\Str; use Tests\TestCase; class UserInviteTest extends TestCase diff --git a/tests/PublicActionTest.php b/tests/PublicActionTest.php index 953a7dde0..499c0c9f9 100644 --- a/tests/PublicActionTest.php +++ b/tests/PublicActionTest.php @@ -2,7 +2,6 @@ namespace Tests; -use Illuminate\Support\Facades\Auth; use BookStack\Auth\Permissions\PermissionService; use BookStack\Auth\Permissions\RolePermission; use BookStack\Auth\Role; @@ -10,6 +9,7 @@ use BookStack\Auth\User; use BookStack\Entities\Models\Book; use BookStack\Entities\Models\Chapter; use BookStack\Entities\Models\Page; +use Illuminate\Support\Facades\Auth; use Illuminate\Support\Facades\View; class PublicActionTest extends TestCase diff --git a/tests/RecycleBinTest.php b/tests/RecycleBinTest.php index dbdc6daf6..f3e30c0d0 100644 --- a/tests/RecycleBinTest.php +++ b/tests/RecycleBinTest.php @@ -8,8 +8,8 @@ use BookStack\Entities\Models\Chapter; use BookStack\Entities\Models\Deletion; use BookStack\Entities\Models\Entity; use BookStack\Entities\Models\Page; -use Illuminate\Support\Facades\DB; use Illuminate\Support\Carbon; +use Illuminate\Support\Facades\DB; class RecycleBinTest extends TestCase { diff --git a/tests/ThemeTest.php b/tests/ThemeTest.php index 2d08fdb4a..2cab765ae 100644 --- a/tests/ThemeTest.php +++ b/tests/ThemeTest.php @@ -7,9 +7,9 @@ use BookStack\Entities\Models\Page; use BookStack\Entities\Tools\PageContent; use BookStack\Facades\Theme; use BookStack\Theming\ThemeEvents; -use Illuminate\Support\Facades\File; use Illuminate\Http\Request; use Illuminate\Http\Response; +use Illuminate\Support\Facades\File; use League\CommonMark\ConfigurableEnvironmentInterface; class ThemeTest extends TestCase