Merge pull request #36 from defstudio/php8.4

php 8.4 support

Author: fabio-ivona

.github/workflows/phpstan.yml

@@ -16,7 +16,7 @@ jobs:
       - name: Setup PHP
         uses: shivammathur/setup-php@v2
         with:
-          php-version: '8.1'
+          php-version: [8.3, 8.4]
           coverage: none
 
       - name: Install composer dependencies

.github/workflows/run-tests.yml

@@ -13,7 +13,7 @@ jobs:
       fail-fast: true
       matrix:
         os: [ubuntu-latest, macos-latest, windows-latest]
-        php: [8.1]
+        php: [8.3, 8.4]
         laravel: [9.*]
         stability: [prefer-lowest, prefer-stable]
 

.github/workflows/x-ray.yml

@@ -16,7 +16,7 @@ jobs:
       - name: Setup PHP
         uses: shivammathur/setup-php@v2
         with:
-          php-version: '8.1'
+          php-version: [8.3, 8.4]
           coverage: none
 
       - name: Install composer dependencies

composer.json

@@ -16,7 +16,7 @@
         }
     ],
     "require": {
-        "php": "^8.1",
+        "php": "^8.3|8.4",
         "spatie/laravel-package-tools": "^1.9.2",
         "illuminate/contracts": "^9.0|^10.0",
         "illuminate/database": "^9.0|^10.0",
@@ -50,8 +50,8 @@
     },
     "scripts": {
         "x-ray": "vendor/bin/x-ray .",
-        "lint": "vendor/bin/php-cs-fixer fix -v",
-        "test:lint": "vendor/bin/php-cs-fixer fix -v --dry-run",
+        "lint": "PHP_CS_FIXER_IGNORE_ENV=1 vendor/bin/php-cs-fixer fix -v",
+        "test:lint": "PHP_CS_FIXER_IGNORE_ENV=1 vendor/bin/php-cs-fixer fix -v --dry-run",
         "test:types": "vendor/bin/phpstan analyse --ansi",
         "test:unit": "vendor/bin/pest --colors=always --exclude-group=sandbox",
         "test": [

src/Concerns/BuildsQuery.php

@@ -65,7 +65,7 @@ public function getRowsProperty(): Collection|LengthAwarePaginator
         return $this->paginatedResults();
     }
 
-    public function debugQuery(Builder|Relation $query = null): string
+    public function debugQuery(Builder|Relation|null $query = null): string
     {
         $paginationEnabled = $query === null && $this->paginationEnabled();
 
@@ -79,7 +79,7 @@ public function debugQuery(Builder|Relation $query = null): string
             ->replaceArray('?', collect($query->getBindings())->map(function ($binding) {
                 return is_numeric($binding) ? $binding : "'{$binding}'";
             })->toArray())
-            ->when($paginationEnabled, fn (Stringable $str) => $str->append(' limit ', $this->pageSize, ' offset ', $this->pageSize * ($this->rows->currentPage() - 1)));
+            ->when($paginationEnabled, fn (Stringable $str) => $str->append(' limit ', $this->pageSize, ' offset ', intval($this->pageSize) * ($this->rows->currentPage() - 1)));
     }
 
     public function selectedRows(): Builder|Relation

src/Concerns/HasActions.php

@@ -40,7 +40,7 @@ public function getActionsProperty(): array
         return $this->_actions;
     }
 
-    public function action(string $name, string $method = null): Action
+    public function action(string $name, ?string $method = null): Action
     {
         if ($this->_actionsLocked) {
             throw ActionException::locked();

src/Concerns/HasColumns.php

@@ -40,7 +40,7 @@ public function getColumnsProperty(): array
         return $this->_columns;
     }
 
-    protected function column(string $name, string $dbColumn = null): Column
+    protected function column(string $name, ?string $dbColumn = null): Column
     {
         if ($this->_columnsLocked) {
             throw ColumnException::locked();

src/Concerns/HasFilters.php

@@ -60,7 +60,7 @@ public function getFiltersProperty(): array
         return $this->_filters;
     }
 
-    public function filter(string $name, string $key = null): Filter
+    public function filter(string $name, ?string $key = null): Filter
     {
         if ($this->_filtersLocked) {
             throw FilterException::locked();
@@ -153,7 +153,7 @@ public function applyFilters(Builder|Relation $query): void
             ->each(fn (Filter $filter) => $filter->apply($query));
     }
 
-    public function getFilterValue(string $key, string|int|bool $default = null): string|int|bool|null
+    public function getFilterValue(string $key, string|int|bool|null $default = null): string|int|bool|null
     {
         if (!$this->_filtersLocked && request()->input('updates.0.payload.name') === "filterValues.$key") {
             return request()->input('updates.0.payload.value', 0);

src/Concerns/HasSorting.php

@@ -69,7 +69,7 @@ public function sort(string $columnName): void
         $this->storeState('sorting', $this->sorting);
     }
 
-    public function clearSorting(string $columnName = null): bool
+    public function clearSorting(?string $columnName = null): bool
     {
         if ($columnName) {
             unset($this->sorting[$columnName]);

src/Elements/Column.php

@@ -45,7 +45,7 @@ protected function initDefaults(): void
         $this->set(Config::is_searchable, false);
     }
 
-    protected function runClosure(Closure $formatClosure): mixed
+    public function runClosure(Closure $formatClosure): mixed
     {
         $reflection = new \ReflectionFunction($formatClosure);
 
@@ -116,7 +116,7 @@ public function wrapText(bool $enable = true): static
     /**
      * @param null|Closure(Builder $query, Sorting $dir): void $sortClosure
      */
-    public function sortable(Closure $sortClosure = null): static
+    public function sortable(?Closure $sortClosure = null): static
     {
         return $this->set(Config::is_sortable, true)
             ->set(Config::sort_closure, $sortClosure);
@@ -135,7 +135,7 @@ public function hasSortClosure(): bool
     /**
      * @param (Closure(mixed $value, Model $model, Column $column): (string|null))|(Closure(Model $model, Column $column): (string|null)) $urlClosure
      */
-    public function url(Closure $urlClosure, string $target = null): static
+    public function url(Closure $urlClosure, ?string $target = null): static
     {
         return $this->set(Config::url, $urlClosure)
             ->set(Config::url_target, $target);
@@ -144,7 +144,7 @@ public function url(Closure $urlClosure, string $target = null): static
     /**
      * @param (Closure(mixed $value, Model $model, Column $column): (string|array|null))|(Closure(Model $model, Column $column): (string|array|null)) $emitClosure
      */
-    public function emit(Closure $emitClosure, string $target = null): static
+    public function emit(Closure $emitClosure, ?string $target = null): static
     {
         return $this->set(Config::emit, $emitClosure);
     }
@@ -175,7 +175,7 @@ public function applySortClosure(Builder|Relation $query, Sorting $dir): void
         $this->get(Config::sort_closure)($query, $dir);
     }
 
-    public function searchable(callable $searchClosure = null): static
+    public function searchable(?callable $searchClosure = null): static
     {
         return $this->set(Config::is_searchable, true)
             ->set(Config::search_closure, $searchClosure);
@@ -206,7 +206,7 @@ public function format(Closure $formatClosure): static
         return $this->set(Config::format_closure, $formatClosure);
     }
 
-    public function date(string $format = null): static
+    public function date(?string $format = null): static
     {
         return $this->format(function ($value) use ($format) {
             if (empty($value)) {