Applied styleci changes

diff --git a/app/Actions/TagRepo.php b/app/Actions/TagRepo.php
index 90d657e517b5fc781718581cf74291466c79562c..b892efe577901191c4a7fea292e134eefbff86ea 100644 (file)
--- 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 BookStack\Auth\Permissions\PermissionService;
 use BookStack\Entities\Models\Entity;

-use Illuminate\Support\Facades\DB;

 use Illuminate\Support\Collection;
 use Illuminate\Support\Collection;

+use Illuminate\Support\Facades\DB;

 
 class TagRepo
 {
 
 class TagRepo
 {

diff --git a/app/Console/Commands/RegenerateSearch.php b/app/Console/Commands/RegenerateSearch.php
index a285f6d72bfaa3aa0a68cef2ea9c430d436f7abd..50e81a2b8e2578edeb8b2d2208f158def6a0256f 100644 (file)
--- 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;
 namespace BookStack\Console\Commands;
 
 use BookStack\Entities\Tools\SearchIndex;

-use Illuminate\Support\Facades\DB;

 use Illuminate\Console\Command;
 use Illuminate\Console\Command;

+use Illuminate\Support\Facades\DB;

 
 class RegenerateSearch extends Command
 {
 
 class RegenerateSearch extends Command
 {

diff --git a/app/Providers/AppServiceProvider.php b/app/Providers/AppServiceProvider.php
index b016df56317af41c9b042e2adc5e497cea1bdb3d..8334bb179ae73b4e08982271d37dd4b0cf2ee971 100644 (file)
--- a/app/Providers/AppServiceProvider.php
+++ b/app/Providers/AppServiceProvider.php
@@ -2,7 +2,6 @@
 
 namespace BookStack\Providers;
 
 
 namespace BookStack\Providers;
 

-use Illuminate\Support\Facades\Blade;

 use BookStack\Auth\Access\LoginService;
 use BookStack\Auth\Access\SocialAuthService;
 use BookStack\Entities\BreadcrumbsViewComposer;
 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 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\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
 {
 
 class AppServiceProvider extends ServiceProvider
 {

diff --git a/app/Providers/AuthServiceProvider.php b/app/Providers/AuthServiceProvider.php
index 0d9dca7a12b8c8d7fe7bbc0d6bcc12c8b2461dfd..37b0e83b9ac9b6a6e4b390aa4e30d5f0c7d906b5 100644 (file)
--- a/app/Providers/AuthServiceProvider.php
+++ b/app/Providers/AuthServiceProvider.php
@@ -2,7 +2,6 @@
 
 namespace BookStack\Providers;
 
 
 namespace BookStack\Providers;
 

-use Illuminate\Support\Facades\Auth;

 use BookStack\Api\ApiTokenGuard;
 use BookStack\Auth\Access\ExternalBaseUserProvider;
 use BookStack\Auth\Access\Guards\LdapSessionGuard;
 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 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
 use Illuminate\Support\ServiceProvider;
 
 class AuthServiceProvider extends ServiceProvider

diff --git a/app/Uploads/AttachmentService.php b/app/Uploads/AttachmentService.php
index 5ba627040a7ba6cedb811f628d16a51ec2e6d709..b4cb1b88b15e26b0d982174b97fa5b80ed13c385 100644 (file)
--- 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\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\Facades\Log;

+use Illuminate\Support\Str;

 use Symfony\Component\HttpFoundation\File\UploadedFile;
 
 class AttachmentService
 use Symfony\Component\HttpFoundation\File\UploadedFile;
 
 class AttachmentService

diff --git a/app/Uploads/ImageService.php b/app/Uploads/ImageService.php
index 13d17f697b14fb470dc9d0da1b7724a1dc7c84a2..2c38c24f4f7c5f6d31646722937516e42b4cb042 100644 (file)
--- a/app/Uploads/ImageService.php
+++ b/app/Uploads/ImageService.php
@@ -3,7 +3,6 @@
 namespace BookStack\Uploads;
 
 use BookStack\Exceptions\ImageUploadException;
 namespace BookStack\Uploads;
 
 use BookStack\Exceptions\ImageUploadException;

-use Illuminate\Support\Facades\DB;

 use ErrorException;
 use Exception;
 use Illuminate\Contracts\Cache\Repository as Cache;
 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\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;
 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 d994dd5b9059f1048eb9fceb0c400b01ce866648..dcf9e23df9b829a10cfd175800d058247c1333fe 100644 (file)
--- 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 BookStack\Notifications\UserInvite;
 use Carbon\Carbon;
 use Illuminate\Support\Facades\DB;

-use Illuminate\Support\Str;

 use Illuminate\Support\Facades\Notification;
 use Illuminate\Support\Facades\Notification;

+use Illuminate\Support\Str;

 use Tests\TestCase;
 
 class UserInviteTest extends TestCase
 use Tests\TestCase;
 
 class UserInviteTest extends TestCase

diff --git a/tests/PublicActionTest.php b/tests/PublicActionTest.php
index 953a7dde06dce5818f9f26a6612b81f56fcf59eb..499c0c9f9710ab0bbd4c6f7401743c325dc2c6be 100644 (file)
--- a/tests/PublicActionTest.php
+++ b/tests/PublicActionTest.php
@@ -2,7 +2,6 @@
 
 namespace Tests;
 
 
 namespace Tests;
 

-use Illuminate\Support\Facades\Auth;

 use BookStack\Auth\Permissions\PermissionService;
 use BookStack\Auth\Permissions\RolePermission;
 use BookStack\Auth\Role;
 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 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
 use Illuminate\Support\Facades\View;
 
 class PublicActionTest extends TestCase

diff --git a/tests/RecycleBinTest.php b/tests/RecycleBinTest.php
index dbdc6daf6edec41851a7e7044311117d933b8e87..f3e30c0d07d442f894347f7599e97e3e1c9218fc 100644 (file)
--- 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 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\Carbon;

+use Illuminate\Support\Facades\DB;

 
 class RecycleBinTest extends TestCase
 {
 
 class RecycleBinTest extends TestCase
 {

diff --git a/tests/ThemeTest.php b/tests/ThemeTest.php
index 2d08fdb4a4f39b442231f442e6ea545a7753844f..2cab765ae4345c6958d2a2e54988dffb8cccab4b 100644 (file)
--- 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 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\Http\Request;
 use Illuminate\Http\Response;

+use Illuminate\Support\Facades\File;

 use League\CommonMark\ConfigurableEnvironmentInterface;
 
 class ThemeTest extends TestCase
 use League\CommonMark\ConfigurableEnvironmentInterface;
 
 class ThemeTest extends TestCase