Apply fixes from StyleCI

routes/api.php

@@ -52,7 +52,7 @@
 Route::delete('/{repository}/{repositoryId}', '\\'.RepositoryDestroyController::class);
 
 // Fields
-Route::delete('/{repository}/{repositoryId}/field/{field}', '\\' . FieldDestroyController::class);
+Route::delete('/{repository}/{repositoryId}/field/{field}', '\\'.FieldDestroyController::class);
 
 // Attach related repository id
 Route::post('/{repository}/{repositoryId}/attach/{relatedRepository}', '\\'.RepositoryAttachController::class);

src/Fields/File.php

@@ -2,8 +2,8 @@
 
 namespace Binaryk\LaravelRestify\Fields;
 
-use Binaryk\LaravelRestify\Contracts\FileStorable as StorableContract;
 use Binaryk\LaravelRestify\Contracts\Deletable as DeletableContract;
+use Binaryk\LaravelRestify\Contracts\FileStorable as StorableContract;
 use Binaryk\LaravelRestify\Fields\Concerns\AcceptsTypes;
 use Binaryk\LaravelRestify\Fields\Concerns\Deletable;
 use Binaryk\LaravelRestify\Fields\Concerns\FileStorable;
@@ -82,10 +82,10 @@ public function storeAs($storeAs): self
     protected function prepareStorageCallback(callable $storageCallback = null): void
     {
         $this->storageCallback = $storageCallback ?? function ($request, $model) {
-                return $this->mergeExtraStorageColumns($request, [
-                    $this->attribute => $this->storeFile($request, $this->attribute),
-                ]);
-            };
+            return $this->mergeExtraStorageColumns($request, [
+                $this->attribute => $this->storeFile($request, $this->attribute),
+            ]);
+        };
     }
 
     /**
@@ -116,7 +116,7 @@ public function storeSize($column)
 
     protected function storeFile(Request $request, string $requestAttribute)
     {
-        if (!$this->storeAs) {
+        if (! $this->storeAs) {
             return $request->file($requestAttribute)->store($this->getStorageDir(), $this->getStorageDisk());
         }
 
@@ -142,7 +142,6 @@ public function store($storageCallback): self
         return $this;
     }
 
-
     /**
      * Merge the specified extra file information columns into the storable attributes.
      *
@@ -187,7 +186,7 @@ protected function columnsThatShouldBeDeleted(): array
 
     public function fillAttribute(RestifyRequest $request, $model, int $bulkRow = null)
     {
-        if (is_null($file = $request->file($this->attribute)) || !$file->isValid()) {
+        if (is_null($file = $request->file($this->attribute)) || ! $file->isValid()) {
             return $this;
         }
 
@@ -208,7 +207,7 @@ public function fillAttribute(RestifyRequest $request, $model, int $bulkRow = nu
             return $result;
         }
 
-        if (!is_array($result)) {
+        if (! is_array($result)) {
             return $model->{$attribute} = $result;
         }
 

src/Http/Controllers/Concerns/DeletesFields.php

@@ -14,8 +14,8 @@ protected function deleteFields(RestifyRequest $request, $model)
         ($repository = $request->newRepositoryWith($model))
             ->collectFields($request)
             ->whereInstanceOf(Deletable::class)
-            ->filter(fn(Field $field) => $field instanceof Deletable)
-            ->filter(fn(Deletable $field) => $field->isPrunable())
+            ->filter(fn (Field $field) => $field instanceof Deletable)
+            ->filter(fn (Deletable $field) => $field->isPrunable())
             ->resolve($repository)
             ->each(function ($field) use ($request, $model) {
                 DeleteField::forRequest($request, $field, $model)->save();

src/Http/Controllers/FieldDestroyController.php

@@ -3,7 +3,6 @@
 namespace Binaryk\LaravelRestify\Http\Controllers;
 
 use Binaryk\LaravelRestify\Contracts\Deletable;
-use Binaryk\LaravelRestify\Fields\Field;
 use Binaryk\LaravelRestify\Http\Requests\RestifyRequest;
 use Binaryk\LaravelRestify\Repositories\DeleteField;
 use Illuminate\Routing\Controller;
@@ -20,7 +19,7 @@ public function __invoke(RestifyRequest $request)
 
         $field = $repository->collectFields($request)
             ->whereInstanceOf(Deletable::class)
-            ->filter(fn(Deletable $field) => $field->isDeletable())
+            ->filter(fn (Deletable $field) => $field->isDeletable())
             ->resolve($repository)
             ->findFieldByAttribute($request->field, function () {
                 abort(404);

src/Repositories/DeleteField.php

@@ -34,7 +34,7 @@ public static function forRequest(RestifyRequest $request, $field, $model): Mode
             return $model;
         }
 
-        if (!is_array($result)) {
+        if (! is_array($result)) {
             $model->{$field->getAttribute()} = $result;
         } else {
             foreach ($result as $key => $value) {

tests/Controllers/ProfileControllerTest.php

@@ -2,7 +2,6 @@
 
 namespace Binaryk\LaravelRestify\Tests\Controllers;
 
-use Binaryk\LaravelRestify\Fields\File;
 use Binaryk\LaravelRestify\Fields\Image;
 use Binaryk\LaravelRestify\Tests\Fixtures\User\User;
 use Binaryk\LaravelRestify\Tests\Fixtures\User\UserRepository;
@@ -220,7 +219,7 @@ public function test_can_upload_avatar()
                     ->disk('customDisk')
                     ->storeOriginalName('avatar_original')
                     ->storeSize('avatar_size')
-                    ->storeAs('avatar.jpg')
+                    ->storeAs('avatar.jpg'),
             ]);
 
         $this->post('profile', [

tests/Fields/FileTest.php

@@ -52,12 +52,12 @@ public function test_can_upload_file()
                     ->disk('customDisk')
                     ->storeOriginalName('avatar_original')
                     ->storeSize('avatar_size')
-                    ->storeAs('avatar.jpg')
+                    ->storeAs('avatar.jpg'),
             ]);
 
         $user = $this->mockUsers()->first();
 
-        $this->post(UserRepository::uriKey() . "/{$user->id}", [
+        $this->post(UserRepository::uriKey()."/{$user->id}", [
             'avatar' => UploadedFile::fake()->image('image.jpg'),
         ])->assertOk()->assertJsonFragment([
             'avatar_original' => 'image.jpg',
@@ -90,10 +90,10 @@ public function test_can_prune_prunable_files()
                 Image::make('avatar')
                     ->disk('customDisk')
                     ->prunable()
-                    ->storeAs('avatar.jpg')
+                    ->storeAs('avatar.jpg'),
             ]);
 
-        $this->delete(UserRepository::uriKey() . "/{$user->id}")
+        $this->delete(UserRepository::uriKey()."/{$user->id}")
             ->dump()
             ->assertNoContent();
 
@@ -114,10 +114,10 @@ public function test_cannot_prune_unpruneable_files()
         UserRepository::partialMock()
             ->shouldReceive('fields')
             ->andReturn([
-                Image::make('avatar')->disk('customDisk')->storeAs('avatar.jpg')
+                Image::make('avatar')->disk('customDisk')->storeAs('avatar.jpg'),
             ]);
 
-        $this->delete(UserRepository::uriKey() . "/{$user->id}")
+        $this->delete(UserRepository::uriKey()."/{$user->id}")
             ->assertNoContent();
 
         Storage::disk('customDisk')->assertExists('avatar.jpg');
@@ -137,10 +137,10 @@ public function test_deletable_file_could_be_deleted()
         UserRepository::partialMock()
             ->shouldReceive('fields')
             ->andReturn([
-                Image::make('avatar')->disk('customDisk')->storeAs('avatar.jpg')->deletable(true)
+                Image::make('avatar')->disk('customDisk')->storeAs('avatar.jpg')->deletable(true),
             ]);
 
-        $this->delete(UserRepository::uriKey() . "/{$user->id}/field/avatar")
+        $this->delete(UserRepository::uriKey()."/{$user->id}/field/avatar")
             ->assertNoContent();
 
         Storage::disk('customDisk')->assertMissing('avatar.jpg');
@@ -160,10 +160,10 @@ public function test_not_deletable_file_cannot_be_deleted()
         UserRepository::partialMock()
             ->shouldReceive('fields')
             ->andReturn([
-                Image::make('avatar')->disk('customDisk')->storeAs('avatar.jpg')->deletable(false)
+                Image::make('avatar')->disk('customDisk')->storeAs('avatar.jpg')->deletable(false),
             ]);
 
-        $this->delete(UserRepository::uriKey() . "/{$user->id}/field/avatar")
+        $this->delete(UserRepository::uriKey()."/{$user->id}/field/avatar")
             ->assertNotFound();
     }
 
@@ -174,12 +174,12 @@ public function test_can_upload_file_using_storable()
         UserRepository::partialMock()
             ->shouldReceive('fields')
             ->andReturn([
-                Image::make('avatar')->store(AvatarStore::class)
+                Image::make('avatar')->store(AvatarStore::class),
             ]);
 
         $user = $this->mockUsers()->first();
 
-        $this->post(UserRepository::uriKey() . "/{$user->id}", [
+        $this->post(UserRepository::uriKey()."/{$user->id}", [
             'avatar' => UploadedFile::fake()->image('image.jpg'),
         ])->assertOk()->assertJsonFragment([
             'avatar' => '/storage/avatar.jpg',

tests/Fixtures/User/AvatarFile.php

@@ -6,5 +6,4 @@
 
 class AvatarFile extends File
 {
-
 }

tests/Fixtures/User/AvatarStore.php

@@ -11,7 +11,7 @@ class AvatarStore implements Storable
     public function handle(Request $request, Model $model, $attribute): array
     {
         return [
-            'avatar' => $request->file('avatar')->storeAs('/', 'avatar.jpg', 'customDisk')
+            'avatar' => $request->file('avatar')->storeAs('/', 'avatar.jpg', 'customDisk'),
         ];
     }
 }

tests/Fixtures/User/User.php

@@ -41,7 +41,7 @@ class User extends Authenticatable implements Sanctumable, MustVerifyEmail, Rest
     protected $fillable = [
         'name', 'email', 'password', 'email_verified_at', 'avatar', 'created_at',
         'avatar_size',
-        'avatar_original'
+        'avatar_original',
     ];
 
     /**