merged conflicts

Author: hamidrezarj

.github/workflows/fix-php-code-style-issues.yml

@@ -19,7 +19,7 @@ jobs:
           ref: ${{ github.head_ref }}
 
       - name: Fix PHP code style issues
-        uses: aglipanci/laravel-pint-action@2.3.1
+        uses: aglipanci/laravel-pint-action@2.4
 
       - name: Commit changes
         uses: stefanzweifel/git-auto-commit-action@v4

src/DatatableInput.php

@@ -7,23 +7,15 @@
 
 class DatatableInput
 {
-    /**
-     * @param int $start
-     * @param int $size
-     * @param array $filters
-     * @param array $sorting
-     * @param array $rels
-     */
     public function __construct(
-        private int   $start,
-        private ?int   $size,
+        private int $start,
+        private ?int $size,
         private array $filters,
         private array $sorting,
         private array $rels,
         private array $allowedFilters,
         private array $allowedSortings,
-    )
-    {
+    ) {
     }
 
     public function getStart(): int
@@ -41,7 +33,7 @@ public function getSize(): ?int
      */
     public function getFilters(): array
     {
-        $filters = array();
+        $filters = [];
 
         foreach ($this->filters as $filter) {
             $filters[] = new Filter(
@@ -56,19 +48,14 @@ public function getFilters(): array
         return $filters;
     }
 
-    /**
-     * @return Sort|null
-     */
     public function getSorting(): ?Sort
     {
-        return !empty($this->sorting) ?
+        return ! empty($this->sorting) ?
             new Sort($this->sorting[0]->id, $this->sorting[0]->desc, $this->allowedSortings) : null;
     }
 
     public function getRelations(): array
     {
         return $this->rels;
     }
-
-
 }

src/Enums/DataType.php

@@ -1,6 +1,7 @@
 <?php
 
 namespace HamidRrj\LaravelDatatable\Enums;
+
 enum DataType: string
 {
     case NUMERIC = 'numeric';
@@ -9,6 +10,6 @@ enum DataType: string
 
     public static function values(): array
     {
-       return array_column(self::cases(), 'value');
+        return array_column(self::cases(), 'value');
     }
 }

src/Enums/SearchType.php

@@ -14,6 +14,6 @@ enum SearchType: string
 
     public static function values(): array
     {
-       return array_column(self::cases(), 'value');
+        return array_column(self::cases(), 'value');
     }
-}
+}

src/Exceptions/InvalidFilterException.php

@@ -8,7 +8,7 @@ class InvalidFilterException extends Exception implements InvalidParameterInterf
 {
     protected $fieldName;
 
-    public function __construct($fieldName, $message = "", $code = 400, \Throwable $previous = null)
+    public function __construct($fieldName, $message = '', $code = 400, ?\Throwable $previous = null)
     {
         $this->fieldName = $fieldName;
         parent::__construct($message, $code, $previous);

src/Exceptions/InvalidRelationException.php

@@ -8,7 +8,7 @@ class InvalidRelationException extends Exception implements InvalidParameterInte
 {
     protected $fieldName;
 
-    public function __construct($fieldName, $message = "", $code = 400, \Throwable $previous = null)
+    public function __construct($fieldName, $message = '', $code = 400, ?\Throwable $previous = null)
     {
         $this->fieldName = $fieldName;
         parent::__construct($message, $code, $previous);

src/Exceptions/InvalidSortingException.php

@@ -8,7 +8,7 @@ class InvalidSortingException extends Exception implements InvalidParameterInter
 {
     protected $fieldName;
 
-    public function __construct($fieldName, $message = "", $code = 400, \Throwable $previous = null)
+    public function __construct($fieldName, $message = '', $code = 400, ?\Throwable $previous = null)
     {
         $this->fieldName = $fieldName;
         parent::__construct($message, $code, $previous);

src/Filter/ApplyFilter.php

@@ -17,15 +17,10 @@ class ApplyFilter
 {
     private SearchFilter $searchFilter;
 
-    /**
-     * @param Builder $query
-     * @param Filter $filter
-     */
     public function __construct(
         private Builder $query,
-        private Filter  $filter,
-    )
-    {
+        private Filter $filter,
+    ) {
     }
 
     public function apply(): Builder
@@ -62,10 +57,10 @@ public function apply(): Builder
             default:
                 $searchFunction = $filter->getFn();
                 throw new InvalidFilterException($searchFunction, "search function `$searchFunction` is invalid.");
-
         }
 
         $relation = $this->filter->getRelation();
+
         return $relation ? $this->applyFilterToRelation($relation) : $this->searchFilter->apply();
     }
 

src/Filter/Filter.php

@@ -9,21 +9,15 @@ class Filter
     private static FilterValidator $filterValidator;
 
     /**
-     * @param string $id
-     * @param string|int|array $value
-     * @param string $fn
-     * @param string $datatype
-     * @param array $allowedFilters
      * @throws \HamidRrj\LaravelDatatable\Exceptions\InvalidFilterException
      */
     public function __construct(
-        private string           $id,
+        private string $id,
         private string|int|array $value,
-        private string           $fn,
-        private string           $datatype,
+        private string $fn,
+        private string $datatype,
         private array $allowedFilters
-    )
-    {
+    ) {
         self::$filterValidator = FilterValidator::getInstance();
         self::$filterValidator->isValid($this, $this->allowedFilters);
     }
@@ -51,12 +45,14 @@ public function getDatatype(): string
     public function getRelation(): string
     {
         $fieldArray = explode('.', $this->id);
+
         return count($fieldArray) > 1 ? $fieldArray[0] : '';
     }
 
     public function getColumn(): string
     {
         $fieldArray = explode('.', $this->id);
+
         return array_pop($fieldArray);
     }
 
@@ -69,5 +65,4 @@ public function setValue(int|array|string $value): void
     {
         $this->value = $value;
     }
-
 }

src/Filter/SearchFunctions/FilterBetween.php

@@ -6,7 +6,6 @@
 
 class FilterBetween extends SearchFilter
 {
-
     public function apply(): Builder
     {
         $query = $this->query;