CS: Apply single_import_per_statement

.php-cs-fixer.dist.php

@@ -7,7 +7,6 @@ $localRules = [
     // Base
     'binary_operator_spaces' => false,
     'single_import_per_statement' => false,
-    'group_import' => true,
 
     // Realodix
     'no_empty_comment'  => false,

app/Actions/Fortify/CreateNewUser.php

@@ -20,7 +20,7 @@ class CreateNewUser implements CreatesNewUsers
     {
         Validator::make($input, [
             'name'     => ['required', 'string', 'max:50'],
-            'email'    => [ 'required', 'string', 'email', 'max:255', Rule::unique(User::class)],
+            'email'    => ['required', 'string', 'email', 'max:255', Rule::unique(User::class)],
             'password' => ['required', 'string', new Password, 'confirmed'],
         ])->validate();
 

app/Helpers/Helper.php

@@ -2,7 +2,8 @@
 
 namespace App\Helpers;
 
-use Illuminate\Support\{Str, Stringable};
+use Illuminate\Support\Str;
+use Illuminate\Support\Stringable;
 use Spatie\Url\Url as SpatieUrl;
 
 class Helper

app/Http/Controllers/API/UrlController.php

@@ -6,7 +6,8 @@ use App\Http\Controllers\Controller;
 use App\Http\Requests\StoreUrl;
 use App\Models\Url;
 use Illuminate\Http\Response;
-use Illuminate\Support\Facades\{Auth, Validator};
+use Illuminate\Support\Facades\Auth;
+use Illuminate\Support\Facades\Validator;
 
 class UrlController extends Controller
 {

app/Http/Controllers/Dashboard/DashboardController.php

@@ -3,7 +3,8 @@
 namespace App\Http\Controllers\Dashboard;
 
 use App\Http\Controllers\Controller;
-use App\Models\{Url, User};
+use App\Models\Url;
+use App\Models\User;
 use Illuminate\Http\Request;
 use Illuminate\Support\Facades\Auth;
 

app/Http/Controllers/UrlController.php

@@ -4,10 +4,12 @@ namespace App\Http\Controllers;
 
 use App\Http\Requests\StoreUrl;
 use App\Models\Url;
+use App\Rules\StrAlphaUnderscore;
+use App\Rules\StrLowercase;
 use App\Rules\Url\KeywordBlacklist;
-use App\Rules\{StrAlphaUnderscore, StrLowercase};
 use Illuminate\Http\Request;
-use Illuminate\Support\Facades\{Auth, Validator};
+use Illuminate\Support\Facades\Auth;
+use Illuminate\Support\Facades\Validator;
 
 class UrlController extends Controller
 {

app/Http/Livewire/MyUrlTable.php

@@ -5,7 +5,8 @@ namespace App\Http\Livewire;
 use App\Helpers\Helper;
 use App\Models\Url;
 use Illuminate\Database\Eloquent\Builder;
-use Illuminate\Support\Facades\{Auth, Blade};
+use Illuminate\Support\Facades\Auth;
+use Illuminate\Support\Facades\Blade;
 use Illuminate\Support\Str;
 use PowerComponents\LivewirePowerGrid\Traits\ActionButton;
 use PowerComponents\LivewirePowerGrid\{

app/Policies/UrlPolicy.php

@@ -2,7 +2,8 @@
 
 namespace App\Policies;
 
-use App\Models\{Url, User};
+use App\Models\Url;
+use App\Models\User;
 use Illuminate\Auth\Access\HandlesAuthorization;
 
 class UrlPolicy

app/Providers/FortifyServiceProvider.php

@@ -116,6 +116,7 @@ class FortifyServiceProvider extends ServiceProvider
 
     /**
      * @codeCoverageIgnore
+     *
      * @return void
      */
     private function twoFactor()

app/Providers/RouteServiceProvider.php

@@ -6,7 +6,8 @@ use App\Models\User;
 use Illuminate\Cache\RateLimiting\Limit;
 use Illuminate\Foundation\Support\Providers\RouteServiceProvider as ServiceProvider;
 use Illuminate\Http\Request;
-use Illuminate\Support\Facades\{RateLimiter, Route};
+use Illuminate\Support\Facades\RateLimiter;
+use Illuminate\Support\Facades\Route;
 use Vinkla\Hashids\Facades\Hashids;
 
 class RouteServiceProvider extends ServiceProvider

app/Rules/PwdCurrent.php

@@ -3,7 +3,8 @@
 namespace App\Rules;
 
 use Illuminate\Contracts\Validation\Rule;
-use Illuminate\Support\Facades\{Auth, Hash};
+use Illuminate\Support\Facades\Auth;
+use Illuminate\Support\Facades\Hash;
 
 class PwdCurrent implements Rule
 {

app/Services/UrlRedirectionService.php

@@ -2,7 +2,8 @@
 
 namespace App\Services;
 
-use App\Models\{Url, Visit};
+use App\Models\Url;
+use App\Models\Visit;
 
 class UrlRedirectionService
 {

config/flare.php

@@ -1,10 +1,16 @@
 <?php
 
-use Spatie\FlareClient\FlareMiddleware\{
-    AddGitInformation, CensorRequestBodyFields, CensorRequestHeaders, RemoveRequestIp};
-use Spatie\LaravelIgnition\FlareMiddleware\{
-    AddDumps, AddEnvironmentInformation, AddExceptionInformation, AddJobs, AddLogs, AddNotifierName,
-    AddQueries};
+use Spatie\FlareClient\FlareMiddleware\AddGitInformation;
+use Spatie\FlareClient\FlareMiddleware\CensorRequestBodyFields;
+use Spatie\FlareClient\FlareMiddleware\CensorRequestHeaders;
+use Spatie\FlareClient\FlareMiddleware\RemoveRequestIp;
+use Spatie\LaravelIgnition\FlareMiddleware\AddDumps;
+use Spatie\LaravelIgnition\FlareMiddleware\AddEnvironmentInformation;
+use Spatie\LaravelIgnition\FlareMiddleware\AddExceptionInformation;
+use Spatie\LaravelIgnition\FlareMiddleware\AddJobs;
+use Spatie\LaravelIgnition\FlareMiddleware\AddLogs;
+use Spatie\LaravelIgnition\FlareMiddleware\AddNotifierName;
+use Spatie\LaravelIgnition\FlareMiddleware\AddQueries;
 
 return [
     /*

config/ignition.php

@@ -1,13 +1,22 @@
 <?php
 
-use Spatie\Ignition\Solutions\SolutionProviders\{
-    BadMethodCallSolutionProvider, MergeConflictSolutionProvider, UndefinedPropertySolutionProvider};
-use Spatie\LaravelIgnition\Solutions\SolutionProviders\{
-    DefaultDbNameSolutionProvider, GenericLaravelExceptionSolutionProvider, IncorrectValetDbCredentialsSolutionProvider,
-    InvalidRouteActionSolutionProvider, MissingAppKeySolutionProvider, MissingColumnSolutionProvider,
-    MissingImportSolutionProvider, MissingLivewireComponentSolutionProvider, MissingMixManifestSolutionProvider,
-    RunningLaravelDuskInProductionProvider, TableNotFoundSolutionProvider, UndefinedViewVariableSolutionProvider,
-    UnknownValidationSolutionProvider, ViewNotFoundSolutionProvider};
+use Spatie\Ignition\Solutions\SolutionProviders\BadMethodCallSolutionProvider;
+use Spatie\Ignition\Solutions\SolutionProviders\MergeConflictSolutionProvider;
+use Spatie\Ignition\Solutions\SolutionProviders\UndefinedPropertySolutionProvider;
+use Spatie\LaravelIgnition\Solutions\SolutionProviders\DefaultDbNameSolutionProvider;
+use Spatie\LaravelIgnition\Solutions\SolutionProviders\GenericLaravelExceptionSolutionProvider;
+use Spatie\LaravelIgnition\Solutions\SolutionProviders\IncorrectValetDbCredentialsSolutionProvider;
+use Spatie\LaravelIgnition\Solutions\SolutionProviders\InvalidRouteActionSolutionProvider;
+use Spatie\LaravelIgnition\Solutions\SolutionProviders\MissingAppKeySolutionProvider;
+use Spatie\LaravelIgnition\Solutions\SolutionProviders\MissingColumnSolutionProvider;
+use Spatie\LaravelIgnition\Solutions\SolutionProviders\MissingImportSolutionProvider;
+use Spatie\LaravelIgnition\Solutions\SolutionProviders\MissingLivewireComponentSolutionProvider;
+use Spatie\LaravelIgnition\Solutions\SolutionProviders\MissingMixManifestSolutionProvider;
+use Spatie\LaravelIgnition\Solutions\SolutionProviders\RunningLaravelDuskInProductionProvider;
+use Spatie\LaravelIgnition\Solutions\SolutionProviders\TableNotFoundSolutionProvider;
+use Spatie\LaravelIgnition\Solutions\SolutionProviders\UndefinedViewVariableSolutionProvider;
+use Spatie\LaravelIgnition\Solutions\SolutionProviders\UnknownValidationSolutionProvider;
+use Spatie\LaravelIgnition\Solutions\SolutionProviders\ViewNotFoundSolutionProvider;
 
 return [
 

config/logging.php

@@ -1,6 +1,8 @@
 <?php
 
-use Monolog\Handler\{NullHandler, StreamHandler, SyslogUdpHandler};
+use Monolog\Handler\NullHandler;
+use Monolog\Handler\StreamHandler;
+use Monolog\Handler\SyslogUdpHandler;
 
 return [
 

database/factories/UrlFactory.php

@@ -2,7 +2,8 @@
 
 namespace Database\Factories;
 
-use App\Models\{Url, User};
+use App\Models\Url;
+use App\Models\User;
 use Illuminate\Database\Eloquent\Factories\Factory;
 
 class UrlFactory extends Factory

database/factories/VisitFactory.php

@@ -2,7 +2,8 @@
 
 namespace Database\Factories;
 
-use App\Models\{Url, Visit};
+use App\Models\Url;
+use App\Models\Visit;
 use Illuminate\Database\Eloquent\Factories\Factory;
 
 class VisitFactory extends Factory

database/seeders/RolesAndPermissionsSeeder.php

@@ -4,7 +4,8 @@ namespace Database\Seeders;
 
 use App\Models\User;
 use Illuminate\Database\Seeder;
-use Spatie\Permission\Models\{Permission, Role};
+use Spatie\Permission\Models\Permission;
+use Spatie\Permission\Models\Role;
 
 class RolesAndPermissionsSeeder extends Seeder
 {

database/seeders/UserSeeder.php

@@ -3,7 +3,8 @@
 namespace Database\Seeders;
 
 use Illuminate\Database\Seeder;
-use Illuminate\Support\Facades\{DB, Hash};
+use Illuminate\Support\Facades\DB;
+use Illuminate\Support\Facades\Hash;
 
 class UserSeeder extends Seeder
 {

routes/web.php

@@ -1,8 +1,11 @@
 <?php
 
-use App\Http\Controllers\Dashboard\User\{ChangePasswordController, UserController};
-use App\Http\Controllers\Dashboard\{AllUrlController, DashboardController};
-use App\Http\Controllers\{UrlController, UrlRedirectController};
+use App\Http\Controllers\Dashboard\AllUrlController;
+use App\Http\Controllers\Dashboard\DashboardController;
+use App\Http\Controllers\Dashboard\User\ChangePasswordController;
+use App\Http\Controllers\Dashboard\User\UserController;
+use App\Http\Controllers\UrlController;
+use App\Http\Controllers\UrlRedirectController;
 use Illuminate\Support\Facades\Route;
 
 Route::view('/', 'frontend.homepage')->name('home');

tests/DuskTestCase.php

@@ -3,7 +3,8 @@
 namespace Tests;
 
 use Facebook\WebDriver\Chrome\ChromeOptions;
-use Facebook\WebDriver\Remote\{DesiredCapabilities, RemoteWebDriver};
+use Facebook\WebDriver\Remote\DesiredCapabilities;
+use Facebook\WebDriver\Remote\RemoteWebDriver;
 use Laravel\Dusk\TestCase as BaseTestCase;
 use Tests\Support\CreatesApplication;
 

tests/Feature/Auth/ForgotPasswordTest.php

@@ -4,7 +4,9 @@ namespace Tests\Feature\Auth;
 
 use App\Models\User;
 use Illuminate\Auth\Notifications\ResetPassword;
-use Illuminate\Support\Facades\{DB, Hash, Notification};
+use Illuminate\Support\Facades\DB;
+use Illuminate\Support\Facades\Hash;
+use Illuminate\Support\Facades\Notification;
 use Tests\TestCase;
 
 class ForgotPasswordTest extends TestCase

tests/Feature/Auth/RegisterTest.php

@@ -4,7 +4,8 @@ namespace Tests\Feature\Auth;
 
 use App\Models\User;
 use Illuminate\Auth\Events\Registered;
-use Illuminate\Support\Facades\{Event, Hash};
+use Illuminate\Support\Facades\Event;
+use Illuminate\Support\Facades\Hash;
 use Tests\TestCase;
 
 class RegisterTest extends TestCase

tests/Support/Authentication.php

@@ -3,7 +3,8 @@
 namespace Tests\Support;
 
 use App\Models\User;
-use Spatie\Permission\Models\{Permission, Role};
+use Spatie\Permission\Models\Permission;
+use Spatie\Permission\Models\Role;
 
 trait Authentication
 {

tests/TestCase.php

@@ -2,8 +2,10 @@
 
 namespace Tests;
 
-use Illuminate\Foundation\Testing\{RefreshDatabase, TestCase as BaseTestCase};
-use Tests\Support\{Authentication, CreatesApplication};
+use Illuminate\Foundation\Testing\RefreshDatabase;
+use Illuminate\Foundation\Testing\TestCase as BaseTestCase;
+use Tests\Support\Authentication;
+use Tests\Support\CreatesApplication;
 
 abstract class TestCase extends BaseTestCase
 {

tests/Unit/Controllers/UrlControllerTest.php

@@ -3,8 +3,9 @@
 namespace Tests\Unit\Controllers;
 
 use App\Models\Url;
+use App\Rules\StrAlphaUnderscore;
+use App\Rules\StrLowercase;
 use App\Rules\Url\KeywordBlacklist;
-use App\Rules\{StrAlphaUnderscore, StrLowercase};
 use Illuminate\Http\Request;
 use Illuminate\Support\Facades\Validator;
 use Tests\TestCase;

tests/Unit/Controllers/UrlRedirectControllerTest.php

@@ -2,7 +2,8 @@
 
 namespace Tests\Unit\Controllers;
 
-use App\Models\{Url, Visit};
+use App\Models\Url;
+use App\Models\Visit;
 use Tests\TestCase;
 
 class UrlRedirectControllerTest extends TestCase

tests/Unit/Helpers/HelperTest.php

@@ -2,7 +2,8 @@
 
 namespace Tests\Unit\Helpers;
 
-use App\Helpers\{Helper, NumHelper};
+use App\Helpers\Helper;
+use App\Helpers\NumHelper;
 use Tests\TestCase;
 
 class HelperTest extends TestCase

tests/Unit/Models/UrlTest.php

@@ -2,7 +2,8 @@
 
 namespace Tests\Unit\Models;
 
-use App\Models\{Url, Visit};
+use App\Models\Url;
+use App\Models\Visit;
 use Tests\TestCase;
 
 class UrlTest extends TestCase

tests/Unit/Models/UserTest.php

@@ -2,7 +2,8 @@
 
 namespace Tests\Unit\Models;
 
-use App\Models\{Url, User};
+use App\Models\Url;
+use App\Models\User;
 use Tests\TestCase;
 
 class UserTest extends TestCase

tests/Unit/Models/VisitTest.php

@@ -2,7 +2,8 @@
 
 namespace Tests\Unit\Models;
 
-use App\Models\{Url, Visit};
+use App\Models\Url;
+use App\Models\Visit;
 use Tests\TestCase;
 
 class VisitTest extends TestCase

tests/Unit/Rule/StringTest.php

@@ -2,7 +2,8 @@
 
 namespace Tests\Unit\Rule;
 
-use App\Rules\{StrAlphaUnderscore, StrLowercase};
+use App\Rules\StrAlphaUnderscore;
+use App\Rules\StrLowercase;
 use Tests\TestCase;
 
 class StringTest extends TestCase

tests/Unit/Rule/UrlTest.php

@@ -2,7 +2,8 @@
 
 namespace Tests\Unit\Rule;
 
-use App\Rules\Url\{DomainBlacklist, KeywordBlacklist};
+use App\Rules\Url\DomainBlacklist;
+use App\Rules\Url\KeywordBlacklist;
 use Tests\TestCase;
 
 class UrlTest extends TestCase