Merge remote-tracking branch 'origin/3.x' into 3.x

# Conflicts: # src/Models/EntryScreen.php
IBEC-BOX · Mar 12, 2024 · 038f304 · 038f304
2 parents 7888182 + 707a3a1
commit 038f304
Show file tree

Hide file tree

Showing 9 changed files with 11 additions and 11 deletions.
diff --git a/database/factories/EntryScreenFactory.php b/database/factories/EntryScreenFactory.php
@@ -2,8 +2,8 @@
 
 namespace AdminKit\EntryScreens\Database\Factories;
 
-use Illuminate\Database\Eloquent\Factories\Factory;
 use AdminKit\EntryScreens\Models\EntryScreen;
+use Illuminate\Database\Eloquent\Factories\Factory;
 
 class EntryScreenFactory extends Factory
 {

diff --git a/src/EntryScreensServiceProvider.php b/src/EntryScreensServiceProvider.php
@@ -2,10 +2,10 @@
 
 namespace AdminKit\EntryScreens;
 
-use Spatie\LaravelPackageTools\Package;
-use Spatie\LaravelPackageTools\PackageServiceProvider;
 use AdminKit\EntryScreens\Commands\EntryScreensCommand;
 use AdminKit\EntryScreens\Providers\RouteServiceProvider;
+use Spatie\LaravelPackageTools\Package;
+use Spatie\LaravelPackageTools\PackageServiceProvider;
 
 class EntryScreensServiceProvider extends PackageServiceProvider
 {

diff --git a/src/FilamentPlugin.php b/src/FilamentPlugin.php
@@ -2,9 +2,9 @@
 
 namespace AdminKit\EntryScreens;
 
+use AdminKit\EntryScreens\UI\Filament\Resources\EntryScreenResource;
 use Filament\Contracts\Plugin;
 use Filament\Panel;
-use AdminKit\EntryScreens\UI\Filament\Resources\EntryScreenResource;
 
 class FilamentPlugin implements Plugin
 {

diff --git a/src/UI/API/Routes/api.php b/src/UI/API/Routes/api.php
@@ -1,6 +1,6 @@
 <?php
 
-use Illuminate\Support\Facades\Route;
 use AdminKit\EntryScreens\UI\API\Controllers\EntryScreenController;
+use Illuminate\Support\Facades\Route;
 
 Route::get('/entry-screen', [EntryScreenController::class, 'showFirst']);
diff --git a/src/UI/Filament/Resources/EntryScreenResource.php b/src/UI/Filament/Resources/EntryScreenResource.php
@@ -4,11 +4,11 @@
 
 use Filament\Forms\Components\Tabs\Tab;
 use AdminKit\Core\Forms\Components\TranslatableTabs;
+use AdminKit\EntryScreens\Models\EntryScreen;
+use AdminKit\EntryScreens\UI\Filament\Resources\EntryScreenResource\Pages;
 use Filament\Forms;
 use Filament\Resources\Resource;
 use Filament\Tables;
-use AdminKit\EntryScreens\Models\EntryScreen;
-use AdminKit\EntryScreens\UI\Filament\Resources\EntryScreenResource\Pages;
 
 class EntryScreenResource extends Resource
 {

diff --git a/src/UI/Filament/Resources/EntryScreenResource/Pages/CreateEntryScreen.php b/src/UI/Filament/Resources/EntryScreenResource/Pages/CreateEntryScreen.php
@@ -2,8 +2,8 @@
 
 namespace AdminKit\EntryScreens\UI\Filament\Resources\EntryScreenResource\Pages;
 
-use Filament\Resources\Pages\CreateRecord;
 use AdminKit\EntryScreens\UI\Filament\Resources\EntryScreenResource;
+use Filament\Resources\Pages\CreateRecord;
 
 class CreateEntryScreen extends CreateRecord
 {

diff --git a/src/UI/Filament/Resources/EntryScreenResource/Pages/EditEntryScreen.php b/src/UI/Filament/Resources/EntryScreenResource/Pages/EditEntryScreen.php
@@ -2,9 +2,9 @@
 
 namespace AdminKit\EntryScreens\UI\Filament\Resources\EntryScreenResource\Pages;
 
+use AdminKit\EntryScreens\UI\Filament\Resources\EntryScreenResource;
 use Filament\Actions;
 use Filament\Resources\Pages\EditRecord;
-use AdminKit\EntryScreens\UI\Filament\Resources\EntryScreenResource;
 
 class EditEntryScreen extends EditRecord
 {

diff --git a/src/UI/Filament/Resources/EntryScreenResource/Pages/ListEntryScreen.php b/src/UI/Filament/Resources/EntryScreenResource/Pages/ListEntryScreen.php
@@ -2,9 +2,9 @@
 
 namespace AdminKit\EntryScreens\UI\Filament\Resources\EntryScreenResource\Pages;
 
+use AdminKit\EntryScreens\UI\Filament\Resources\EntryScreenResource;
 use Filament\Actions;
 use Filament\Resources\Pages\ListRecords;
-use AdminKit\EntryScreens\UI\Filament\Resources\EntryScreenResource;
 
 class ListEntryScreen extends ListRecords
 {

diff --git a/tests/TestCase.php b/tests/TestCase.php
@@ -2,10 +2,10 @@
 
 namespace AdminKit\EntryScreens\Tests;
 
+use AdminKit\EntryScreens\EntryScreensServiceProvider;
 use Illuminate\Database\Eloquent\Factories\Factory;
 use Livewire\LivewireServiceProvider;
 use Orchestra\Testbench\TestCase as Orchestra;
-use AdminKit\EntryScreens\EntryScreensServiceProvider;
 
 class TestCase extends Orchestra
 {