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

# Conflicts: # src/Models/Company.php # src/UI/Filament/Resources/CompanyResource.php
IBEC-BOX · Mar 10, 2024 · c74aa0e · c74aa0e
2 parents e3c8b08 + 68af5c4
commit c74aa0e
Show file tree

Hide file tree

Showing 9 changed files with 10 additions and 10 deletions.
diff --git a/.github/workflows/phpstan.yml b/.github/workflows/phpstan.yml
@@ -20,7 +20,7 @@ jobs:
           coverage: none
 
       - name: Install composer dependencies
-        uses: ramsey/composer-install@v2
+        uses: ramsey/composer-install@v3
 
       - name: Run PHPStan
         run: ./vendor/bin/phpstan --error-format=github
diff --git a/database/factories/CompanyFactory.php b/database/factories/CompanyFactory.php
@@ -2,8 +2,8 @@
 
 namespace AdminKit\Companies\Database\Factories;
 
-use Illuminate\Database\Eloquent\Factories\Factory;
 use AdminKit\Companies\Models\Company;
+use Illuminate\Database\Eloquent\Factories\Factory;
 
 class CompanyFactory extends Factory
 {

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

diff --git a/src/FilamentPlugin.php b/src/FilamentPlugin.php
@@ -2,9 +2,9 @@
 
 namespace AdminKit\Companies;
 
+use AdminKit\Companies\UI\Filament\Resources\CompanyResource;
 use Filament\Contracts\Plugin;
 use Filament\Panel;
-use AdminKit\Companies\UI\Filament\Resources\CompanyResource;
 
 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\Companies\UI\API\Controllers\CompanyController;
+use Illuminate\Support\Facades\Route;
 
 Route::get('company', [CompanyController::class, 'showFirst']);
diff --git a/src/UI/Filament/Resources/CompanyResource/Pages/CreateCompany.php b/src/UI/Filament/Resources/CompanyResource/Pages/CreateCompany.php
@@ -2,8 +2,8 @@
 
 namespace AdminKit\Companies\UI\Filament\Resources\CompanyResource\Pages;
 
-use Filament\Resources\Pages\CreateRecord;
 use AdminKit\Companies\UI\Filament\Resources\CompanyResource;
+use Filament\Resources\Pages\CreateRecord;
 
 class CreateCompany extends CreateRecord
 {

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

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

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