Skip to content

Commit 05dcb36

Browse files
gauravmakgauravmak
authored
Merge pull request #116 from freshbitsweb/l13-compatibility-and-cleanup-7880973649231374818
2 parents 3103417 + 3c2f4ca commit 05dcb36

11 files changed

Lines changed: 111 additions & 52 deletions

‎.github/workflows/run-tests.yml‎

Lines changed: 10 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -12,8 +12,8 @@ jobs:
1212
fail-fast: true
1313
matrix:
1414
os: [ubuntu-latest]
15-
php: [8.2, 8.1, 8.0]
16-
laravel: ['9.*', '10.*', '11.*', '12.*']
15+
php: ['8.0', '8.1', '8.2', '8.3', '8.4', '8.5']
16+
laravel: ['9.*', '10.*', '11.*', '12.*', '13.*']
1717
dependency-version: [prefer-lowest, prefer-stable]
1818
include:
1919
- laravel: 9.*
@@ -24,6 +24,8 @@ jobs:
2424
testbench: 9.*
2525
- laravel: 12.*
2626
testbench: 10.*
27+
- laravel: 13.*
28+
testbench: 11.*
2729
exclude:
2830
- laravel: 10.*
2931
php: 8.0
@@ -35,6 +37,12 @@ jobs:
3537
php: 8.1
3638
- laravel: 12.*
3739
php: 8.0
40+
- laravel: 13.*
41+
php: '8.0'
42+
- laravel: 13.*
43+
php: '8.1'
44+
- laravel: 13.*
45+
php: '8.2'
3846

3947
name: P${{ matrix.php }} - L${{ matrix.laravel }} - ${{ matrix.dependency-version }}
4048

‎CHANGELOG.md‎

Lines changed: 4 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -4,6 +4,10 @@ All notable changes to this project will be documented in this file.
44
The format is based on [Keep a Changelog](https://keepachangelog.com/en/1.0.0/),
55
and this project adheres to [Semantic Versioning](https://semver.org/spec/v2.0.0.html).
66

7+
## [6.0.0] - 2026-03-21
8+
### Added
9+
- Support for Laravel 13.x
10+
711
## [5.0.0] - 2025-02-26
812
### Added
913
- Support for Laravel 12.x

‎README.md‎

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -87,6 +87,7 @@ There are multiple ways to customize query/data/logic. Check [Customization](#cu
8787
## Requirements
8888
| PHP | Laravel | Package |
8989
|--------|---------|---------|
90+
| 8.3+ | 13.x | v6.0.0 |
9091
| 8.3+ | 12.x | v5.0.0 |
9192
| 8.2+ | 11.x | v4.0.0 |
9293
| 8.0+ | 10.x | v3.0.0 |

‎composer.json‎

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -3,12 +3,12 @@
33
"description": "Ajax support of DataTables for Laravel",
44
"require": {
55
"php": "^8.0",
6-
"illuminate/support": "^9.33.0|^10.0|^11.0|^12.0"
6+
"illuminate/support": "^9.33.0|^10.0|^11.0|^12.0|^13.0"
77
},
88
"require-dev": {
9-
"orchestra/testbench": "^7.9|^8.0|^9.0|^10.0",
10-
"phpunit/phpunit": "^9.3.9|^10.0|^11.0",
11-
"laravel/legacy-factories": "^1.3.0"
9+
"orchestra/testbench": "^7.9|^8.0|^9.0|^10.0|^11.0",
10+
"phpunit/phpunit": "^9.3.9|^10.0|^11.0|^12.5.12",
11+
"laravel/legacy-factories": "^1.3.0|dev-master"
1212
},
1313
"license": "MIT",
1414
"authors": [

‎tests/ColumnTest.php‎

Lines changed: 16 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -6,8 +6,10 @@
66

77
class ColumnTest extends TestCase
88
{
9-
/** @test */
10-
public function it_returns_the_custom_column_value()
9+
/**
10+
* @test
11+
*/
12+
public function test_it_returns_the_custom_column_value()
1113
{
1214
$users = $this->createUsers();
1315

@@ -24,8 +26,10 @@ public function it_returns_the_custom_column_value()
2426
]);
2527
}
2628

27-
/** @test */
28-
public function it_returns_the_customized_column_value()
29+
/**
30+
* @test
31+
*/
32+
public function test_it_returns_the_customized_column_value()
2933
{
3034
$users = $this->createUsers();
3135

@@ -42,8 +46,10 @@ public function it_returns_the_customized_column_value()
4246
]);
4347
}
4448

45-
/** @test */
46-
public function it_loads_additional_columns()
49+
/**
50+
* @test
51+
*/
52+
public function test_it_loads_additional_columns()
4753
{
4854
$users = $this->createUsers();
4955

@@ -60,8 +66,10 @@ public function it_loads_additional_columns()
6066
]);
6167
}
6268

63-
/** @test */
64-
public function it_converts_carbon_to_dates()
69+
/**
70+
* @test
71+
*/
72+
public function test_it_converts_carbon_to_dates()
6573
{
6674
$users = $this->createUsers();
6775

‎tests/DataFetchTest.php‎

Lines changed: 20 additions & 10 deletions
Original file line numberDiff line numberDiff line change
@@ -4,8 +4,10 @@
44

55
class DataFetchTest extends TestCase
66
{
7-
/** @test */
8-
public function it_returns_the_simple_data_as_expected()
7+
/**
8+
* @test
9+
*/
10+
public function test_it_returns_the_simple_data_as_expected()
911
{
1012
$users = $this->createUsers();
1113

@@ -21,8 +23,10 @@ public function it_returns_the_simple_data_as_expected()
2123
]);
2224
}
2325

24-
/** @test */
25-
public function it_applies_the_closure_condition_with_records_of_call()
26+
/**
27+
* @test
28+
*/
29+
public function test_it_applies_the_closure_condition_with_records_of_call()
2630
{
2731
$users = $this->createUsers(2);
2832

@@ -38,8 +42,10 @@ public function it_applies_the_closure_condition_with_records_of_call()
3842
]);
3943
}
4044

41-
/** @test */
42-
public function it_uses_the_separate_class_specified_with_records_of_call()
45+
/**
46+
* @test
47+
*/
48+
public function test_it_uses_the_separate_class_specified_with_records_of_call()
4349
{
4450
$users = $this->createUsers();
4551

@@ -56,8 +62,10 @@ public function it_uses_the_separate_class_specified_with_records_of_call()
5662
]);
5763
}
5864

59-
/** @test */
60-
public function it_applies_the_custom_query_conditions()
65+
/**
66+
* @test
67+
*/
68+
public function test_it_applies_the_custom_query_conditions()
6169
{
6270
$users = $this->createUsers(2);
6371

@@ -73,8 +81,10 @@ public function it_applies_the_custom_query_conditions()
7381
]);
7482
}
7583

76-
/** @test */
77-
public function it_works_on_the_collection_after_fetching_data()
84+
/**
85+
* @test
86+
*/
87+
public function test_it_works_on_the_collection_after_fetching_data()
7888
{
7989
$users = $this->createUsers();
8090

‎tests/DataTableAttributesTest.php‎

Lines changed: 4 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -4,8 +4,10 @@
44

55
class DataTableAttributesTest extends TestCase
66
{
7-
/** @test */
8-
public function it_returns_the_simple_data_as_expected()
7+
/**
8+
* @test
9+
*/
10+
public function test_it_returns_the_simple_data_as_expected()
911
{
1012
$users = $this->createUsers();
1113

‎tests/OrderingTest.php‎

Lines changed: 16 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -4,8 +4,10 @@
44

55
class OrderingTest extends TestCase
66
{
7-
/** @test */
8-
public function it_orders_the_records_as_expected()
7+
/**
8+
* @test
9+
*/
10+
public function test_it_orders_the_records_as_expected()
911
{
1012
$user1 = $this->createUsers(
1113
$count = 1,
@@ -42,8 +44,10 @@ public function it_orders_the_records_as_expected()
4244
]);
4345
}
4446

45-
/** @test */
46-
public function it_orders_the_records_as_per_custom_ordering()
47+
/**
48+
* @test
49+
*/
50+
public function test_it_orders_the_records_as_per_custom_ordering()
4751
{
4852
$user1 = $this->createUsers(
4953
$count = 1,
@@ -92,8 +96,10 @@ public function it_orders_the_records_as_per_custom_ordering()
9296
]);
9397
}
9498

95-
/** @test */
96-
public function it_orders_the_records_with_order_by_raw()
99+
/**
100+
* @test
101+
*/
102+
public function test_it_orders_the_records_with_order_by_raw()
97103
{
98104
$user1 = $this->createUsers(
99105
$count = 1,
@@ -144,8 +150,10 @@ public function it_orders_the_records_with_order_by_raw()
144150
]);
145151
}
146152

147-
/** @test */
148-
public function it_orders_the_records_by_multi_column_order()
153+
/**
154+
* @test
155+
*/
156+
public function test_it_orders_the_records_by_multi_column_order()
149157
{
150158
$user1 = $this->createUsers(
151159
$count = 1,

‎tests/RecordsLimitTest.php‎

Lines changed: 16 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -4,8 +4,10 @@
44

55
class RecordsLimitTest extends TestCase
66
{
7-
/** @test */
8-
public function it_can_limit_records_to_maximum_as_per_the_configuration()
7+
/**
8+
* @test
9+
*/
10+
public function test_it_can_limit_records_to_maximum_as_per_the_configuration()
911
{
1012
$users = $this->createUsers(2);
1113

@@ -18,8 +20,10 @@ public function it_can_limit_records_to_maximum_as_per_the_configuration()
1820
$response->assertJsonCount(1, 'data');
1921
}
2022

21-
/** @test */
22-
public function it_can_allow_unlimited_records_as_per_the_configuration()
23+
/**
24+
* @test
25+
*/
26+
public function test_it_can_allow_unlimited_records_as_per_the_configuration()
2327
{
2428
$users = $this->createUsers(50);
2529

@@ -32,8 +36,10 @@ public function it_can_allow_unlimited_records_as_per_the_configuration()
3236
$response->assertJsonCount(50, 'data');
3337
}
3438

35-
/** @test */
36-
public function it_can_limit_records_based_on_the_request_even_when_unlimited_records_are_allowed()
39+
/**
40+
* @test
41+
*/
42+
public function test_it_can_limit_records_based_on_the_request_even_when_unlimited_records_are_allowed()
3743
{
3844
$users = $this->createUsers(50);
3945

@@ -46,8 +52,10 @@ public function it_can_limit_records_based_on_the_request_even_when_unlimited_re
4652
$response->assertJsonCount(20, 'data');
4753
}
4854

49-
/** @test */
50-
public function it_prioritizes_request_limit_compared_to_configuration_limit()
55+
/**
56+
* @test
57+
*/
58+
public function test_it_prioritizes_request_limit_compared_to_configuration_limit()
5159
{
5260
$users = $this->createUsers(50);
5361

‎tests/RelationshipTest.php‎

Lines changed: 8 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -4,8 +4,10 @@
44

55
class RelationshipTest extends TestCase
66
{
7-
/** @test */
8-
public function it_returns_the_relationship_column_value()
7+
/**
8+
* @test
9+
*/
10+
public function test_it_returns_the_relationship_column_value()
911
{
1012
$users = $this->createUsers();
1113

@@ -23,8 +25,10 @@ public function it_returns_the_relationship_column_value()
2325
]);
2426
}
2527

26-
/** @test */
27-
public function it_uses_the_custom_relationship_query()
28+
/**
29+
* @test
30+
*/
31+
public function test_it_uses_the_custom_relationship_query()
2832
{
2933
$users = $this->createUsers();
3034

0 commit comments

Comments
 (0)