Merge pull request #3274 from yajra/laravel-13-support

feat: add Laravel 13 support

Author: yajra

.github/workflows/continuous-integration.yml

@@ -17,7 +17,7 @@ jobs:
     strategy:
       fail-fast: true
       matrix:
-        php: [ 8.2, 8.3, 8.4, 8.5 ]
+        php: [ 8.3, 8.4, 8.5 ]
         stability: [ prefer-stable ]
 
     name: PHP ${{ matrix.php }} - STABILITY ${{ matrix.stability }}

.github/workflows/pint.yml

@@ -3,7 +3,8 @@ on:
   push:
     branches:
       - master
-      - 11.x
+      - '*.x'
+
 jobs:
   phplint:
     runs-on: ubuntu-latest

.github/workflows/static-analysis.yml

@@ -30,7 +30,7 @@ jobs:
       - name: Setup PHP
         uses: shivammathur/setup-php@v2
         with:
-          php-version: 8.2
+          php-version: 8.3
           tools: composer:v2
           coverage: none
 

CHANGELOG.md

@@ -1,122 +1,5 @@
-# [12.7.0](https://github.com/yajra/laravel-datatables/compare/v12.6.3...v12.7.0) (2026-02-20)
+### v13.0.0 - 2026-03-18
 
+- feat: Laravel 13 Compatibility #3274
 
-### Bug Fixes
-
-* address phpstan and fork phplint checkout ([7c416ef](https://github.com/yajra/laravel-datatables/commit/7c416ef38347d23bc52eca5439f0889c4e493440))
-* allow editing DT_RowIndex via editColumn ([fd161f0](https://github.com/yajra/laravel-datatables/commit/fd161f019f54fc13995bd4f2664f12e4f8aa3317))
-* cast index column config for static analysis ([468f44c](https://github.com/yajra/laravel-datatables/commit/468f44ce845a4a40734eaaca9d5753095ced013a))
-* **ci:** support fork PR checkout in pint workflow ([fe30c00](https://github.com/yajra/laravel-datatables/commit/fe30c005f15eccc5c1d5314199f35740a5ed2192))
-* **ci:** update memcached action to v8 ([c9e7f15](https://github.com/yajra/laravel-datatables/commit/c9e7f15ea3833311664c3c818e1f29c2c23918f9))
-
-
-### Features
-
-* support LengthAwarePaginator engine ([b8f9bb3](https://github.com/yajra/laravel-datatables/commit/b8f9bb33189d069d81901af59c73057aa8d84abd))
-
-## [12.6.3](https://github.com/yajra/laravel-datatables/compare/v12.6.2...v12.6.3) (2025-12-09)
-
-
-### Bug Fixes
-
-* [#3266](https://github.com/yajra/laravel-datatables/issues/3266), replace ConfigRepository's type helper methods with get() ([#3267](https://github.com/yajra/laravel-datatables/issues/3267)) ([b9e5f78](https://github.com/yajra/laravel-datatables/commit/b9e5f785851a21779b0c88c2b0eb5c02e9714a76))
-* pint :robot: ([e74e6ce](https://github.com/yajra/laravel-datatables/commit/e74e6cea55d552dd4ac66483c73cc0029050f52e))
-
-## [12.6.2](https://github.com/yajra/laravel-datatables/compare/v12.6.1...v12.6.2) (2025-12-02)
-
-
-### Bug Fixes
-
-* pint :robot: ([41a22c7](https://github.com/yajra/laravel-datatables/commit/41a22c7b52f4d154e6ee8b9c0834c51d20001c00))
-* resolve PHPStan array key type errors ([3b5e668](https://github.com/yajra/laravel-datatables/commit/3b5e66832fd4c708c2fc6c4afffc12815c43b248))
-
-## [12.6.1](https://github.com/yajra/laravel-datatables/compare/v12.6.0...v12.6.1) (2025-10-11)
-
-
-### Bug Fixes
-
-* value when mask uses "/" ([c771900](https://github.com/yajra/laravel-datatables/commit/c77190030c713e5b64c433bd161d9f33a210f22b))
-
-# [12.6.0](https://github.com/yajra/laravel-datatables/compare/v12.5.1...v12.6.0) (2025-10-08)
-
-
-### Bug Fixes
-
-* replace unsafe eval() with Blade::render() in compileBlade ([7f46d58](https://github.com/yajra/laravel-datatables/commit/7f46d5872b0324493c28ecc8d848c182e88f30e0))
-
-
-### Features
-
-* add __isset() method to Request for attribute existence check ([33f44d4](https://github.com/yajra/laravel-datatables/commit/33f44d42d284d6ea0a054de81ad5a57c3050867d))
-
-# Laravel DataTables 
-
-## CHANGELOG
-
-### [Unreleased]
-
-### v12.5.1 - 2025-10-02
-
-- fix: ambiguous column in columnControlSearch() method #3252
-
-### v12.5.0 - 2025-10-01
-
-- feat: server-side column control #3251
-- fix: https://github.com/yajra/laravel-datatables/issues/3250
-
-### v12.4.2 - 2025-09-09
-
-- fix: remove @internal annotation from orderColumn() method #3248
-
-### v12.4.1 - 2025-08-29
-
-- fix: request handling with playwright / pest 4 #3247
-
-### v12.4.0 - 2025-06-15
-
-- feat: add min search length control #3242
-- fix: #3241
-
-### v12.3.1 - 2025-06-10
-
-- fix: support for array notation #3243
-
-### v12.3.0 - 2025-05-17
-
-- feat: add option to enable alias on relation tables #3234
-- tests: Add tests to cover prefix detection #3239
-- fix: https://github.com/yajra/laravel-datatables/pull/1782
-
-### v12.2.1 - 2025-05-09
-
-- fix: improve prefix detection #3238
-- fix: #3237
-
-### v12.2.0 - 2025-05-08
-
-- feat: add relation resolver param to order callback #3232
-- fix: improve column alias detection #3236
-- fix: #3235
-
-### v12.1.2 - 2025-05-07
-
-- fix: prevent prefixing null/empty string #3233
-
-### v12.1.1 - 2025-05-05
-
-- fix: prevent ambiguous column names #3227
-
-### v12.1.0 - 2025-04-28
-
-- feat: add relation resolver param to filter callbacks #3229
-
-### v12.0.1 - 2025-04-07
-
-- fix: query results improvements #3224
-
-### v12.0.0 - 2025-02-26
-
-- feat: Laravel v12 Compatibility #3217
-- fix: prevent duplicate table name errors #3216
-
-[Unreleased]: https://github.com/yajra/laravel-datatables/compare/v12.0.0...master
+[Unreleased]: https://github.com/yajra/laravel-datatables/compare/v13.0.0...master

composer.json

@@ -15,20 +15,20 @@
         }
     ],
     "require": {
-        "php": "^8.2",
-        "illuminate/database": "^12",
-        "illuminate/filesystem": "^12",
-        "illuminate/http": "^12",
-        "illuminate/support": "^12",
-        "illuminate/view": "^12"
+        "php": "^8.3",
+        "illuminate/database": "^13",
+        "illuminate/filesystem": "^13",
+        "illuminate/http": "^13",
+        "illuminate/support": "^13",
+        "illuminate/view": "^13"
     },
     "require-dev": {
         "algolia/algoliasearch-client-php": "^3.4.1",
         "larastan/larastan": "^3.1.0",
         "laravel/pint": "^1.14",
         "laravel/scout": "^10.8.3",
         "meilisearch/meilisearch-php": "^1.6.1",
-        "orchestra/testbench": "^10",
+        "orchestra/testbench": "^11",
         "rector/rector": "^2.0"
     },
     "suggest": {
@@ -53,7 +53,7 @@
     },
     "extra": {
         "branch-alias": {
-            "dev-master": "12.x-dev"
+            "dev-master": "13.x-dev"
         },
         "laravel": {
             "providers": [

src/ApiResourceDataTable.php

@@ -3,6 +3,7 @@
 namespace Yajra\DataTables;
 
 use Illuminate\Http\Resources\Json\AnonymousResourceCollection;
+use Illuminate\Support\Collection;
 
 class ApiResourceDataTable extends CollectionDataTable
 {
@@ -20,7 +21,7 @@ public static function canCreate($source)
     /**
      * Factory method, create and return an instance for the DataTable engine.
      *
-     * @param  \Illuminate\Http\Resources\Json\AnonymousResourceCollection<array-key, array>|array  $source
+     * @param  AnonymousResourceCollection<array-key, array>|array  $source
      * @return ApiResourceDataTable|DataTableAbstract
      */
     public static function create($source)
@@ -31,11 +32,11 @@ public static function create($source)
     /**
      * CollectionEngine constructor.
      *
-     * @param  \Illuminate\Http\Resources\Json\AnonymousResourceCollection<array-key, array>  $resourceCollection
+     * @param  AnonymousResourceCollection<array-key, array>  $resourceCollection
      */
     public function __construct(AnonymousResourceCollection $resourceCollection)
     {
-        /** @var \Illuminate\Support\Collection<(int|string), array> $collection */
+        /** @var Collection<(int|string), array> $collection */
         $collection = collect($resourceCollection)->pluck('resource');
         $this->request = app('datatables.request');
         $this->config = app('datatables.config');

src/CollectionDataTable.php

@@ -18,7 +18,7 @@ class CollectionDataTable extends DataTableAbstract
     /**
      * Collection object.
      *
-     * @var \Illuminate\Support\Collection<array-key, array>
+     * @var Collection<array-key, array>
      */
     public Collection $original;
 
@@ -30,7 +30,7 @@ class CollectionDataTable extends DataTableAbstract
     /**
      * CollectionEngine constructor.
      *
-     * @param  \Illuminate\Support\Collection<array-key, array>  $collection
+     * @param  Collection<array-key, array>  $collection
      */
     public function __construct(public Collection $collection)
     {
@@ -62,7 +62,7 @@ public static function canCreate($source)
     /**
      * Factory method, create and return an instance for the DataTable engine.
      *
-     * @param  AnonymousResourceCollection|array|\Illuminate\Support\Collection<array-key, array>  $source
+     * @param  AnonymousResourceCollection|array|Collection<array-key, array>  $source
      * @return static
      */
     public static function create($source)
@@ -140,7 +140,7 @@ public function paging(): void
     /**
      * Organizes works.
      *
-     * @throws \Exception
+     * @throws Exception
      */
     public function make(bool $mDataSupport = true): JsonResponse
     {
@@ -171,7 +171,7 @@ public function make(bool $mDataSupport = true): JsonResponse
     /**
      * Get results.
      *
-     * @return \Illuminate\Support\Collection<array-key, array>
+     * @return Collection<array-key, array>
      */
     public function results(): Collection
     {

src/Contracts/DataTable.php

@@ -10,7 +10,7 @@ interface DataTable
     /**
      * Get results.
      *
-     * @return \Illuminate\Support\Collection<int, \stdClass>|\Illuminate\Support\Collection<array-key, array>
+     * @return Collection<int, \stdClass>|Collection<array-key, array>
      */
     public function results(): Collection;
 

src/Contracts/Formatter.php

@@ -2,10 +2,12 @@
 
 namespace Yajra\DataTables\Contracts;
 
+use Illuminate\Database\Eloquent\Model;
+
 interface Formatter
 {
     /**
-     * @param  array|\Illuminate\Database\Eloquent\Model|object  $row
+     * @param  array|Model|object  $row
      * @return string
      */
     public function format(mixed $value, $row);

src/DataTableAbstract.php

@@ -146,7 +146,7 @@ public static function create(mixed $source)
 
     /**
      * @param  string|array  $columns
-     * @param  string|callable|\Yajra\DataTables\Contracts\Formatter  $formatter
+     * @param  string|callable|Formatter  $formatter
      * @return $this
      */
     public function formatColumn($columns, $formatter): static
@@ -664,7 +664,7 @@ public function filter(callable $callback, bool $globalSearch = false): self
      * Convert the object to its JSON representation.
      *
      * @param  int  $options
-     * @return \Illuminate\Http\JsonResponse
+     * @return JsonResponse
      */
     public function toJson($options = 0)
     {
@@ -892,7 +892,7 @@ protected function showDebugger(array $output): array
     /**
      * Return an error json response.
      *
-     * @throws \Yajra\DataTables\Exceptions\Exception|\Exception
+     * @throws Exceptions\Exception|\Exception
      */
     protected function errorResponse(\Exception $exception): JsonResponse
     {
@@ -918,7 +918,7 @@ protected function errorResponse(\Exception $exception): JsonResponse
     /**
      * Get monolog/logger instance.
      *
-     * @return \Psr\Log\LoggerInterface
+     * @return LoggerInterface
      */
     public function getLogger()
     {