Fix styling

Author: hamidrezarj

database/factories/UserFactory.php

@@ -5,7 +5,6 @@
 use HamidRrj\LaravelDatatable\Tests\Models\User;
 use Illuminate\Database\Eloquent\Factories\Factory;
 
-
 class UserFactory extends Factory
 {
     protected $model = User::class;
@@ -16,17 +15,16 @@ public function definition()
             'name' => $this->faker->name(),
             'username' => $this->faker->userName(),
             'email' => $this->faker->email,
-//            'position' => $this->faker->randomElement(['boss']),
-//            'city_id' => City::factory(),
-//            'province_id' => function (array $attributes) {
-//                return City::find($attributes['city_id'])->province_id;
-//            },
-//            'city_name' => function (array $attributes) {
-//                return City::find($attributes['city_id'])->name;
-//            },
+            //            'position' => $this->faker->randomElement(['boss']),
+            //            'city_id' => City::factory(),
+            //            'province_id' => function (array $attributes) {
+            //                return City::find($attributes['city_id'])->province_id;
+            //            },
+            //            'city_name' => function (array $attributes) {
+            //                return City::find($attributes['city_id'])->name;
+            //            },
 
         ];
 
     }
 }
-

src/DatatableInput.php

@@ -15,8 +15,7 @@ public function __construct(
         private array $rels,
         private array $allowedFilters,
         private array $allowedSortings,
-    ) {
-    }
+    ) {}
 
     public function getStart(): int
     {

src/DatatableService.php

@@ -8,59 +8,63 @@
 
 class DatatableService
 {
-
     protected array $allowedFilters;
+
     protected array $allowedRelations;
+
     protected array $allowedSortings;
+
     protected array $allowedSelects;
+
     private int $totalRowCount;
 
     public function __construct(
-        protected Builder      $query,
+        protected Builder $query,
         private DatatableInput $dataTableInput
-    )
-    {
-    }
+    ) {}
 
     public function setAllowedFilters(array $allowedFilters): DatatableService
     {
         $this->allowedFilters = $allowedFilters;
+
         return $this;
     }
 
     public function setAllowedRelations(array $allowedRelations): DatatableService
     {
         $this->allowedRelations = $allowedRelations;
+
         return $this;
     }
 
     public function setAllowedSortings(array $allowedSortings): DatatableService
     {
         $this->allowedSortings = $allowedSortings;
+
         return $this;
     }
 
     public function setAllowedSelects(array $allowedSelects): DatatableService
     {
         $this->allowedSelects = $allowedSelects;
+
         return $this;
     }
 
     /**
      * Handle 'getData' operations
-     * @return array
      */
     public function getData(): array
     {
         $query = $this->buildQuery();
         $data = $query->get()->toArray();
 
-        return array(
+        return [
             'data' => $data,
             'meta' => [
-                'totalRowCount' => $this->totalRowCount
-            ]
-        );
+                'totalRowCount' => $this->totalRowCount,
+            ],
+        ];
     }
 
     protected function buildQuery(): Builder

src/DatatableServiceProvider.php

@@ -2,7 +2,6 @@
 
 namespace HamidRrj\LaravelDatatable;
 
-use HamidRrj\LaravelDatatable\Commands\LaravelDatatableCommand;
 use Spatie\LaravelPackageTools\Package;
 use Spatie\LaravelPackageTools\PackageServiceProvider;
 

src/Exceptions/InvalidParameterInterface.php

@@ -2,6 +2,4 @@
 
 namespace HamidRrj\LaravelDatatable\Exceptions;
 
-interface InvalidParameterInterface
-{
-}
+interface InvalidParameterInterface {}

src/Facades/Datatable.php

@@ -13,28 +13,21 @@ class Datatable
 {
     /**
      * Extracts data from request, passes to datatable service and prepares data for response.
-     * @param Model|Builder $mixed
-     * @param array $requestParameters
-     * @param array $allowedFilters
-     * @param array $allowedRelations
-     * @param array $allowedSortings
-     * @param array $allowedSelects
-     * @return array
+     *
      * @throws InvalidParameterInterface if input parameters are invalid.
      */
     public function run(
         Model|Builder $mixed,
-        array         $requestParameters,
-        array         $allowedFilters = [],
-        array         $allowedRelations = [],
-        array         $allowedSortings = [],
-        array         $allowedSelects = []
-    ): array
-    {
+        array $requestParameters,
+        array $allowedFilters = [],
+        array $allowedRelations = [],
+        array $allowedSortings = [],
+        array $allowedSelects = []
+    ): array {
 
         $filters = json_decode($requestParameters['filters']);
         $sorting = json_decode($requestParameters['sorting']);
-        $rels = array_key_exists('rels', $requestParameters) ? $requestParameters['rels'] : array();
+        $rels = array_key_exists('rels', $requestParameters) ? $requestParameters['rels'] : [];
 
         $dataTableInput = new DataTableInput(
             $requestParameters['start'],

src/Filter/ApplyFilter.php

@@ -20,8 +20,7 @@ class ApplyFilter
     public function __construct(
         private Builder $query,
         private Filter $filter,
-    ) {
-    }
+    ) {}
 
     public function apply(): Builder
     {

src/Filter/SearchFunctions/SearchFilter.php

@@ -10,8 +10,7 @@ abstract class SearchFilter
     public function __construct(
         protected Builder $query,
         protected Filter $filter,
-    ) {
-    }
+    ) {}
 
     abstract public function apply(): Builder;
 }

src/Sort/ApplySort.php

@@ -12,8 +12,7 @@ class ApplySort
     public function __construct(
         private Builder $query,
         private ?Sort $sort,
-    ) {
-    }
+    ) {}
 
     public function apply(): Builder
     {

src/Sort/Sort.php

@@ -9,24 +9,17 @@ class Sort
     private static SortingValidator $sortingValidator;
 
     /**
-     * @param string $id
-     * @param bool $desc
-     * @param array $allowedSortings
      * @throws InvalidSortingException
      */
     public function __construct(
         private string $id,
-        private bool   $desc,
+        private bool $desc,
         private array $allowedSortings,
-    )
-    {
+    ) {
         self::$sortingValidator = SortingValidator::getInstance();
         self::$sortingValidator->isValid($this, $this->allowedSortings);
     }
 
-    /**
-     * @return string
-     */
     public function getId(): string
     {
         return $this->id;