Merge branch '12' into master

Author: affaron

.gitattributes

@@ -6,6 +6,7 @@
 .gitattributes export-ignore
 .gitignore export-ignore
 .scrutinizer.yml export-ignore
-.styleci.yml export-ignore
 phpstan.neon.dist export-ignore
 phpunit.xml.dist export-ignore
+pint.json export-ignore
+rector.php export-ignore

.github/workflows/continuous-integration.yml

@@ -1,23 +1,26 @@
-name: "Continuous Integration"
+name: Continuous Integration
 
 on:
   push:
+    branches:
+      - master
+      - '*.x'
   pull_request:
   schedule:
     - cron: '0 0 * * *'
 
 jobs:
-  phpunit:
+  tests:
 
     runs-on: ubuntu-latest
 
     strategy:
       fail-fast: true
       matrix:
-        php: [8.1, 8.2]
-        stability: [prefer-stable]
+        php: [ 8.2, 8.3, 8.4 ]
+        stability: [ prefer-stable ]
 
-    name: PHP ${{ matrix.php }} - ${{ matrix.stability }}
+    name: PHP ${{ matrix.php }} - STABILITY ${{ matrix.stability }}
 
     steps:
       - name: Checkout code
@@ -27,7 +30,6 @@ jobs:
         uses: shivammathur/setup-php@v2
         with:
           php-version: ${{ matrix.php }}
-          extensions: dom, curl, libxml, mbstring, zip, pcntl, pdo, sqlite, pdo_sqlite, gd, memcached
           tools: composer:v2
           coverage: none
 
@@ -39,7 +41,7 @@ jobs:
         with:
           timeout_minutes: 5
           max_attempts: 5
-          command: COMPOSER_ROOT_VERSION=dev-master composer update --${{ matrix.stability }} --prefer-dist --no-interaction --no-progress
+          command: composer update --${{ matrix.stability }} --prefer-dist --no-interaction --no-progress
 
       - name: Execute tests
         run: vendor/bin/phpunit

.github/workflows/pint.yml

@@ -0,0 +1,29 @@
+name: PHP Linting
+on:
+  pull_request:
+  push:
+    branches:
+      - master
+      - 11.x
+jobs:
+  phplint:
+    runs-on: ubuntu-latest
+
+    permissions:
+      contents: write
+      pull-requests: write
+
+    steps:
+      - uses: actions/checkout@v4
+        with:
+          ref: ${{ github.head_ref }}
+
+      - name: "laravel-pint"
+        uses: aglipanci/laravel-pint-action@latest
+        with:
+          preset: laravel
+          verboseMode: true
+
+      - uses: stefanzweifel/git-auto-commit-action@v5
+        with:
+          commit_message: "fix: pint :robot:"

.github/workflows/static-analysis.yml

@@ -1,54 +1,39 @@
-name: "Static Analysis"
+name: Static Analysis
 
 on:
   push:
-    paths:
-      - .github/workflows/static-analysis.yml
-      - composer.*
-      - phpstan.neon.dist
-      - src/**
-      - tests/**
+    branches:
+      - master
+      - '*.x'
 
   pull_request:
-    paths:
-      - .github/workflows/static-analysis.yml
-      - composer.*
-      - phpstan.neon.dist
-      - src/**
-      - tests/**
 
   schedule:
     - cron: '0 0 * * *'
 
 jobs:
   static-analysis-phpstan:
 
-    name: "Static Analysis with PHPStan"
+    name: Source Code
     runs-on: ubuntu-latest
 
-    strategy:
-      fail-fast: true
-      matrix:
-        php: [8.1]
-        stability: [prefer-stable]
-
     steps:
       - name: Checkout code
-        uses: actions/checkout@v2
+        uses: actions/checkout@v4
 
       - name: Setup PHP
         uses: shivammathur/setup-php@v2
         with:
-          php-version: ${{ matrix.php }}
+          php-version: 8.2
           tools: composer:v2
           coverage: none
 
       - name: Install dependencies
-        uses: nick-invision/retry@v1
+        uses: nick-fields/retry@v3
         with:
           timeout_minutes: 5
           max_attempts: 5
-          command: COMPOSER_ROOT_VERSION=dev-master composer update --${{ matrix.stability }} --prefer-dist --no-interaction --no-progress
+          command: composer update --prefer-stable --prefer-dist --no-interaction --no-progress
 
-      - name: "Run a static analysis with phpstan/phpstan"
-        run: "vendor/bin/phpstan --error-format=table"
+      - name: Run Static Analysis
+        run: vendor/bin/phpunit

.styleci.yml

@@ -1,194 +1,17 @@
-# Laravel DataTables CHANGELOG
+# Laravel DataTables 
 
-[![Latest Stable Version](https://poser.pugx.org/yajra/laravel-datatables-oracle/v/stable.png)](https://packagist.org/packages/yajra/laravel-datatables-oracle)
-[![Total Downloads](https://poser.pugx.org/yajra/laravel-datatables-oracle/downloads.png)](https://packagist.org/packages/yajra/laravel-datatables-oracle)
-[![Build Status](https://travis-ci.org/yajra/laravel-datatables.png?branch=master)](https://travis-ci.org/yajra/laravel-datatables)
-[![Latest Unstable Version](https://poser.pugx.org/yajra/laravel-datatables-oracle/v/unstable.svg)](https://packagist.org/packages/yajra/laravel-datatables-oracle)
-[![License](https://poser.pugx.org/yajra/laravel-datatables-oracle/license.svg)](https://packagist.org/packages/yajra/laravel-datatables-oracle)
+## CHANGELOG
 
 ### [Unreleased]
 
-### [v10.8.0] - 2023-08-12
+### v12.0.1 - 2025-04-07
 
-- feat: convert prepareQuery from protected to public #3045
+- fix: query results improvements #3224
 
-### [v10.7.0] - 2023-07-31
+### v12.0.0 - 2025-02-26
 
-- feat: add ability to disable eloquent getter mutator #3009
-- feat: Ability to use deep relations for searching #3035
+- feat: Laravel v12 Compatibility #3217
+- fix: prevent duplicate table name errors #3216
 
-### [v10.6.2] - 2023-07-15
+[Unreleased]: https://github.com/yajra/laravel-datatables/compare/v12.0.0...master
 
-- fix: #3010 - convert expressions to strings #3029
-
-### [v10.6.1] - 2023-07-05
-
-- fix: #3025 #3026
-- fix the error introduced in 10.4.4 as described in #3025.
-
-### [v10.6.0] - 2023-06-29
-
-- feat: Expose autoFilter setter to disable post filtering #2981
- 
-### [v10.5.0] - 2023-06-29
-
-- feat: Prevent editColumn when column is not shown #3018
-
-### [v10.4.4] - 2023-06-27
-
-- feat: Optimize countQuery with complex select #3008
-- fix: phpstan #3022
-
-### [v10.4.3] - 2023-06-07
-
-- Fix: Prevent the filteredCount() query if no filter is applied to the initial query #3007
-
-### [v10.4.2] - 2023-05-31
-
-- Fix return type for setTransformer() and setSerializer() #3003
-
-### [v10.4.1] - 2023-05-27
-
-- fix: Error when setting language config for "editor" #2983
-
-### [v10.4.0] - 2023-03-28
-
-- feat: Allow any callable in ->addColumn() #2977
-- fix: #2976
-
-### [v10.3.1] - 2023-02-20
-
-- fix: Fix anonymous resource collection data formatting #2944
-- fix: phpunit 10 deprecation #2955
-- fix: bump orchestra/testbench to 8 #2949
-
-### [v10.3.0] - 2023-02-07
-
-- Add Laravel 10 compatibility #2948
-
-### [v10.2.3] - 2023-01-18
-
-- fix: Custom Order on eager loaded relationships was not working
-- fix #2905
-
-### [v10.2.2] - 2023-01-11
-
-- fix: prevent deprecation errors in php 8.1+ #2931
-- fixes #2930
-
-### [v10.2.1] - 2022-12-07
-
-- fix: case insensitive starts with search #2917 #2916
-
-### [v10.2.0] - 2022-11-03
-
-- PHP 8.1 Depreciation Fix #2877
-- Methods pointing to the "uncustomizable" classes. #2861
-
-### [v10.1.6] - 2022-10-10
-
-- Fix anonymous resource collection #2870
-- Fix #2827
-- Add stale workflow
-
-### [v10.1.5] - 2022-10-06
-
-- Fix with method error with static analysis #2865
-
-### [v10.1.4] - 2022-09-27
-
-- Fixed the search column for same table relations #2856
-
-### [v10.1.3] - 2022-09-20
-
-- Fix relation key name for BelongsToMany #2850
-
-### [v10.1.2] - 2022-07-12
-
-- Fix HasOneThrough #2818
-
-### [v10.1.1] - 2022-06-24
-
-- Fix null recordsFiltered on empty collection #2806
-- Fix #2793
-
-### [v10.1.0] - 2022-06-21
-
-- Add support for dependency injection when using closure. #2800
-
-### [v10.0.8] - 2022-06-21
-
-- Make canCreate at QueryDataTable accept QueryBuilder only #2798
-
-### [v10.0.7] - 2022-05-23
-
-- Fix create eloquent datatable from relation #2789
-
-### [v10.0.6] - 2022-05-18
-
-- Added null parameter type as allowed to handle default Action column from laravel-datatables-html #2787
-
-### [v10.0.5] - 2022-05-17
-
-- Fix Return value must be of type int, string returned.
-
-### [v10.0.4] - 2022-05-08
-
-- Fix accidental formatter issue on eloquent 
-- Add formatColumn test for eloquent
-
-### [v10.0.3] - 2022-05-08
-
-- Additional fix & test for zero total records
-
-### [v10.0.2] - 2022-05-08
-
-- Fix set total & filtered records count https://github.com/yajra/laravel-datatables/pull/2778
-- Fix set total & filtered records count
-- Fix #1453 #1454 #2050 #2609
-- Add feature test
-- Deprecate `skipTotalRecords`, just use `setTotalRecords` directly.
-
-### [v10.0.1] - 2022-05-08
-
-- Code clean-up and several phpstan fixes
-
-### [v10.0.0] - 2022-05-08
-
-- Laravel DataTables v10.x to support Laravel 9.x
-- Added PHPStan with max level static analysis
-- Drop `queryBuilder()` method
-- Drop support for `ApiResourceDataTable`
-- PHP8 syntax / method signature changed
-
-[Unreleased]: https://github.com/yajra/laravel-datatables/compare/v10.8.0...10.x
-[v10.8.0]: https://github.com/yajra/laravel-datatables/compare/v10.8.0...v10.7.0
-[v10.7.0]: https://github.com/yajra/laravel-datatables/compare/v10.7.0...v10.6.2
-[v10.6.2]: https://github.com/yajra/laravel-datatables/compare/v10.6.2...v10.6.1
-[v10.6.1]: https://github.com/yajra/laravel-datatables/compare/v10.6.1...v10.6.0
-[v10.6.0]: https://github.com/yajra/laravel-datatables/compare/v10.6.0...v10.5.0
-[v10.5.0]: https://github.com/yajra/laravel-datatables/compare/v10.5.0...v10.4.4
-[v10.4.4]: https://github.com/yajra/laravel-datatables/compare/v10.4.4...v10.4.3
-[v10.3.1]: https://github.com/yajra/laravel-datatables/compare/v10.3.1...v10.3.0
-[v10.3.1]: https://github.com/yajra/laravel-datatables/compare/v10.3.1...v10.3.0
-[v10.3.0]: https://github.com/yajra/laravel-datatables/compare/v10.3.0...v10.2.3
-[v10.2.3]: https://github.com/yajra/laravel-datatables/compare/v10.2.3...v10.2.2
-[v10.2.2]: https://github.com/yajra/laravel-datatables/compare/v10.2.2...v10.2.1
-[v10.2.1]: https://github.com/yajra/laravel-datatables/compare/v10.2.1...v10.2.0
-[v10.2.0]: https://github.com/yajra/laravel-datatables/compare/v10.2.0...v10.1.6
-[v10.1.6]: https://github.com/yajra/laravel-datatables/compare/v10.1.6...v10.1.5
-[v10.1.5]: https://github.com/yajra/laravel-datatables/compare/v10.1.5...v10.1.4
-[v10.1.4]: https://github.com/yajra/laravel-datatables/compare/v10.1.4...v10.1.3
-[v10.1.3]: https://github.com/yajra/laravel-datatables/compare/v10.1.3...v10.1.2
-[v10.1.2]: https://github.com/yajra/laravel-datatables/compare/v10.1.2...v10.1.1
-[v10.1.1]: https://github.com/yajra/laravel-datatables/compare/v10.1.1...v10.1.0
-[v10.1.0]: https://github.com/yajra/laravel-datatables/compare/v10.1.0...v10.0.8
-[v10.0.8]: https://github.com/yajra/laravel-datatables/compare/v10.0.8...v10.0.7
-[v10.0.7]: https://github.com/yajra/laravel-datatables/compare/v10.0.7...v10.0.6
-[v10.0.6]: https://github.com/yajra/laravel-datatables/compare/v10.0.6...v10.0.5
-[v10.0.5]: https://github.com/yajra/laravel-datatables/compare/v10.0.5...v10.0.4
-[v10.0.4]: https://github.com/yajra/laravel-datatables/compare/v10.0.4...v10.0.3
-[v10.0.3]: https://github.com/yajra/laravel-datatables/compare/v10.0.3...v10.0.2
-[v10.0.2]: https://github.com/yajra/laravel-datatables/compare/v10.0.2...v10.0.1
-[v10.0.1]: https://github.com/yajra/laravel-datatables/compare/v10.0.1...v10.0.0
-[v10.0.0]: https://github.com/yajra/laravel-datatables/compare/v10.0.0...10.x