fix merge conflicts

Author: sten

routes/filament-flexible-blocks-asset-manager.php

@@ -5,7 +5,6 @@
 use Statikbe\FilamentFlexibleBlocksAssetManager\FilamentFlexibleBlocksAssetManagerConfig;
 use Statikbe\FilamentFlexibleBlocksAssetManager\Http\Controllers\AssetController;
 
-
 $assetRoutePrefix = FilamentFlexibleBlocksAssetManagerConfig::getAssetRoutePrefix();
 $assetRoutePrefix = Str::replaceEnd('/', '', $assetRoutePrefix);
 

src/Filament/Form/Fields/AssetMediaField.php

@@ -3,10 +3,10 @@
 namespace Statikbe\FilamentFlexibleBlocksAssetManager\Filament\Form\Fields;
 
 use Filament\Forms\Components\SpatieMediaLibraryFileUpload;
+use Filament\Support\Assets\Asset;
 use Illuminate\Database\Eloquent\Model;
 use Statikbe\FilamentFlexibleBlocksAssetManager\FilamentFlexibleBlocksAssetManagerConfig;
 use Statikbe\FilamentFlexibleContentBlocks\Filament\Form\Fields\ImageField;
-use Filament\Support\Assets\Asset;
 
 class AssetMediaField extends ImageField
 {
@@ -27,7 +27,7 @@ public static function create(bool $translatable = false): SpatieMediaLibraryFil
             ->conversion('thumbnail');
 
         $acceptedFileTypes = FilamentFlexibleBlocksAssetManagerConfig::getAcceptedFileTypes();
-        if(!empty($acceptedFileTypes)){
+        if (! empty($acceptedFileTypes)) {
             $component->acceptedFileTypes($acceptedFileTypes);
         }
 

src/Filament/Form/Fields/AssetNameField.php

@@ -22,6 +22,4 @@ public static function create(bool $required = false): static
             ->addsTranslatableHint()
             ->required($required);
     }
-
 }
-

src/Filament/Form/Fields/Blocks/Type/AssetCallToActionType.php

@@ -1,4 +1,5 @@
 <?php
+
 namespace Statikbe\FilamentFlexibleBlocksAssetManager\Filament\Form\Fields\Blocks\Type;
 
 use Statikbe\FilamentFlexibleBlocksAssetManager\Models\Asset;
@@ -15,7 +16,7 @@ protected function setUp(): void
         $this->label(trans('filament-flexible-blocks-asset-manager::filament-flexible-blocks-asset-manager.asset_lbl'));
 
         $this->searchColumns(['name']);
-        $this->getOptionLabelFromRecordUsing(function(Asset $record, ?string $locale){
+        $this->getOptionLabelFromRecordUsing(function (Asset $record, ?string $locale) {
             return $record->translate('name', $locale);
         });
     }

src/Filament/Resources/AssetResource.php

@@ -63,7 +63,7 @@ public static function table(Table $table): Table
         return $table
             ->columns([
                 TextColumn::make('name')
-                    ->label(trans("filament-flexible-blocks-asset-manager::filament-flexible-blocks-asset-manager.form_component.name_lbl"))
+                    ->label(trans('filament-flexible-blocks-asset-manager::filament-flexible-blocks-asset-manager.form_component.name_lbl'))
                     ->limit(50)
                     ->tooltip(function (TextColumn $column): ?string {
                         $state = $column->getState();
@@ -75,7 +75,7 @@ public static function table(Table $table): Table
                         // Only render the tooltip if the column contents exceeds the length limit.
                         return $state;
                     })
-                    ->sortable()
+                    ->sortable(),
             ])
             ->actions([
                 Tables\Actions\EditAction::make(),

src/Filament/Resources/AssetResource/Pages/ListAssets.php

@@ -21,4 +21,3 @@ protected function getHeaderActions(): array
         ];
     }
 }
-

src/FilamentFlexibleBlocksAssetManagerConfig.php

@@ -39,7 +39,7 @@ public static function getAcceptedFileTypes(): array
         return self::getConfig('accepted_file_types') ?? [];
     }
 
-    public static function getImageEditor(): array|null
+    public static function getImageEditor(): ?array
     {
         return self::getConfig('image_editor', null);
     }

src/FilamentFlexibleBlocksAssetManagerPlugin.php

@@ -16,7 +16,7 @@ public function getId(): string
     public function register(Panel $panel): void
     {
         $panel->resources([
-            AssetResource::class
+            AssetResource::class,
         ]);
     }
 

src/FilamentFlexibleBlocksAssetManagerServiceProvider.php

@@ -14,8 +14,8 @@
 use Spatie\LaravelPackageTools\Commands\InstallCommand;
 use Spatie\LaravelPackageTools\Package;
 use Spatie\LaravelPackageTools\PackageServiceProvider;
-use Statikbe\FilamentFlexibleBlocksAssetManager\Testing\TestsLaravelFilamentFlexibleBlocksAssetManager;
 use Statikbe\FilamentFlexibleBlocksAssetManager\Models\Asset as AssetModel;
+use Statikbe\FilamentFlexibleBlocksAssetManager\Testing\TestsLaravelFilamentFlexibleBlocksAssetManager;
 
 class FilamentFlexibleBlocksAssetManagerServiceProvider extends PackageServiceProvider
 {
@@ -93,7 +93,7 @@ public function packageBooted(): void
         Testable::mixin(new TestsLaravelFilamentFlexibleBlocksAssetManager());
 
         //add Asset to morph map when used:
-        if(Relation::requiresMorphMap()){
+        if (Relation::requiresMorphMap()) {
             Relation::morphMap([
                 'filament-flexible-blocks-asset-manager::asset' => AssetModel::class,
             ], true);
@@ -133,7 +133,7 @@ protected function getCommands(): array
     protected function getIcons(): array
     {
         return [
-            'heroicon-o-photo'
+            'heroicon-o-photo',
         ];
     }
 

src/Http/Controllers/AssetController.php

@@ -2,32 +2,31 @@
 
 namespace Statikbe\FilamentFlexibleBlocksAssetManager\Http\Controllers;
 
-
 use Illuminate\Http\Response;
 use Illuminate\Support\Facades\Gate;
 use Statikbe\FilamentFlexibleBlocksAssetManager\FilamentFlexibleBlocksAssetManagerConfig;
 use Statikbe\FilamentFlexibleBlocksAssetManager\Models\Asset;
 
 class AssetController
 {
-    public function index(Asset $asset, string $locale=null)
+    public function index(Asset $asset, ?string $locale = null)
     {
         //check if a gate needs to be applied:
         $authGate = FilamentFlexibleBlocksAssetManagerConfig::getAssetAuthorisationGate();
-        if($authGate) {
-            if (!Gate::allows($authGate, $asset)) {
+        if ($authGate) {
+            if (! Gate::allows($authGate, $asset)) {
                 abort(Response::HTTP_FORBIDDEN);
             }
         }
 
         //check if a policy needs to be applied:
-        if(FilamentFlexibleBlocksAssetManagerConfig::getAssetAuthorisationPolicy()) {
+        if (FilamentFlexibleBlocksAssetManagerConfig::getAssetAuthorisationPolicy()) {
             Gate::authorize('view', $asset);
         }
 
         //TODO conversions
         $filters = [];
-        if($locale){
+        if ($locale) {
             $filters = ['locale' => $locale];
         }