Skip to content

Commit b570688

Browse files
andrey-helldarandrey-helldar
authored
Merge pull request #42 from TheDragonCode/andrey-helldar-patch-1
Added Laravel 12 support
2 parents f1e708b + 98fddce commit b570688

47 files changed

Lines changed: 75 additions & 88 deletions

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

‎.github/workflows/phpunit.yml‎

Lines changed: 19 additions & 25 deletions
Original file line numberDiff line numberDiff line change
@@ -9,59 +9,53 @@ jobs:
99
strategy:
1010
fail-fast: true
1111
matrix:
12-
php: [ "8.0", "8.1", "8.2", "8.3" ]
13-
laravel: [ "6.0", "7.0", "8.0", "9.0", "10.0", "11.0" ]
14-
doctrine: [ "2.0", "3.0" ]
12+
php: [ "8.0", "8.1", "8.2", "8.3", "8.4" ]
13+
laravel: [ "6.0", "7.0", "8.0", "9.0", "10.0", "11.0", "12.0" ]
1514
exclude:
16-
- laravel: "6.0"
17-
doctrine: "3.0"
18-
1915
- laravel: "6.0"
2016
php: "8.1"
21-
2217
- laravel: "6.0"
2318
php: "8.2"
24-
2519
- laravel: "6.0"
2620
php: "8.3"
27-
28-
- laravel: "7.0"
29-
doctrine: "3.0"
21+
- laravel: "6.0"
22+
php: "8.4"
3023

3124
- laravel: "7.0"
3225
php: "8.1"
33-
3426
- laravel: "7.0"
3527
php: "8.2"
36-
3728
- laravel: "7.0"
3829
php: "8.3"
39-
40-
- laravel: "8.0"
41-
doctrine: "2.0"
30+
- laravel: "7.0"
31+
php: "8.4"
4232

4333
- laravel: "8.0"
4434
php: "8.2"
45-
4635
- laravel: "8.0"
4736
php: "8.3"
37+
- laravel: "8.0"
38+
php: "8.4"
4839

49-
- laravel: "10.0"
50-
doctrine: "2.0"
40+
- laravel: "9.0"
41+
php: "8.3"
42+
- laravel: "9.0"
43+
php: "8.4"
5144

5245
- laravel: "10.0"
5346
php: "8.0"
5447

55-
- laravel: "11.0"
56-
doctrine: "2.0"
57-
5848
- laravel: "11.0"
5949
php: "8.0"
60-
6150
- laravel: "11.0"
6251
php: "8.1"
6352

64-
name: PHP ${{ matrix.php }}, Laravel ${{ matrix.laravel }}, Doctrine ${{ matrix.doctrine }}
53+
- laravel: "12.0"
54+
php: "8.0"
55+
- laravel: "12.0"
56+
php: "8.1"
57+
58+
name: PHP ${{ matrix.php }}, Laravel ${{ matrix.laravel }}
6559

6660
services:
6761
mysql:
@@ -88,7 +82,7 @@ jobs:
8882
coverage: xdebug
8983

9084
- name: Install dependencies
91-
run: composer require --dev laravel/framework:^${{ matrix.laravel }} doctrine/dbal:^${{ matrix.doctrine }}
85+
run: composer require --dev laravel/framework:^${{ matrix.laravel }}
9286

9387
- name: Execute tests
9488
run: sudo vendor/bin/phpunit

‎composer.json‎

Lines changed: 10 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -36,27 +36,29 @@
3636
],
3737
"require": {
3838
"php": "^8.0",
39-
"doctrine/dbal": "^2.6 || ^3.0",
40-
"dragon-code/laravel-cache": "^3.3",
39+
"dragon-code/laravel-cache": "^3.3 || ^4.0",
4140
"dragon-code/simple-dto": "^2.3",
4241
"dragon-code/support": "^6.0",
4342
"fig/http-message-util": "^1.1",
44-
"illuminate/console": ">=6.0 <12.0",
45-
"illuminate/database": ">=6.0 <12.0",
46-
"illuminate/support": ">=6.0 <12.0",
43+
"illuminate/console": ">=6.0 <13.0",
44+
"illuminate/database": ">=6.0 <13.0",
45+
"illuminate/support": ">=6.0 <13.0",
4746
"lmc/http-constants": "^1.2",
4847
"nesbot/carbon": "^1.20 || ^2.0 || ^3.0",
4948
"psr/http-message": "^1.0.1 || ^2.0"
5049
},
5150
"require-dev": {
5251
"ext-json": "*",
5352
"mockery/mockery": "^1.3.1",
54-
"orchestra/testbench": ">=4.0 <10.0",
55-
"phpunit/phpunit": "^9.6 || ^10.0"
53+
"orchestra/testbench": ">=4.0 <11.0",
54+
"phpunit/phpunit": "^9.6 || ^10.0 || ^11.0 || ^12.0"
5655
},
5756
"conflict": {
5857
"andrey-helldar/last-modified": "*"
5958
},
59+
"suggest": {
60+
"doctrine/dbal": "It is necessary to install when working with Laravel from 6 to 10"
61+
},
6062
"minimum-stability": "stable",
6163
"prefer-stable": true,
6264
"autoload": {
@@ -87,4 +89,4 @@
8789
]
8890
}
8991
}
90-
}
92+
}

‎config/last_modified.php‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -8,7 +8,7 @@
88
*
99
* @author Andrey Helldar <helldar@ai-rus.com>
1010
*
11-
* @copyright 2024 Andrey Helldar
11+
* @copyright 2025 Andrey Helldar
1212
*
1313
* @license MIT
1414
*

‎phpunit.xml‎

Lines changed: 2 additions & 11 deletions
Original file line numberDiff line numberDiff line change
@@ -8,7 +8,7 @@
88
~
99
~ @author Andrey Helldar <helldar@ai-rus.com>
1010
~
11-
~ @copyright 2024 Andrey Helldar
11+
~ @copyright 2025 Andrey Helldar
1212
~
1313
~ @license MIT
1414
~
@@ -30,16 +30,6 @@
3030
stopOnFailure="false"
3131
verbose="true"
3232
>
33-
<coverage processUncoveredFiles="true">
34-
<include>
35-
<directory suffix=".php">./src</directory>
36-
</include>
37-
<report>
38-
<clover outputFile="build/logs/clover.xml"/>
39-
<html outputDirectory="build/logs/coverage"/>
40-
<text outputFile="build/logs/coverage.txt"/>
41-
</report>
42-
</coverage>
4333
<php>
4434
<env name="APP_KEY" value="AckfSECXIvnK5r28GVIWUAxmbBSjTsmF"/>
4535
<env name="APP_URL" value="http://localhost"/>
@@ -49,6 +39,7 @@
4939
<env name="REDIS_HOST" value="127.0.0.1"/>
5040
<env name="REDIS_PORT" value="6379"/>
5141
<env name="CACHE_DRIVER" value="redis"/>
42+
<env name="CACHE_STORE" value="redis"/>
5243
</php>
5344
<testsuites>
5445
<testsuite name="Test Suite">

‎src/Concerns/Cacheable.php‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -8,7 +8,7 @@
88
*
99
* @author Andrey Helldar <helldar@ai-rus.com>
1010
*
11-
* @copyright 2024 Andrey Helldar
11+
* @copyright 2025 Andrey Helldar
1212
*
1313
* @license MIT
1414
*

‎src/Concerns/Urlable.php‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -8,7 +8,7 @@
88
*
99
* @author Andrey Helldar <helldar@ai-rus.com>
1010
*
11-
* @copyright 2024 Andrey Helldar
11+
* @copyright 2025 Andrey Helldar
1212
*
1313
* @license MIT
1414
*

‎src/Constants/Field.php‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -8,7 +8,7 @@
88
*
99
* @author Andrey Helldar <helldar@ai-rus.com>
1010
*
11-
* @copyright 2024 Andrey Helldar
11+
* @copyright 2025 Andrey Helldar
1212
*
1313
* @license MIT
1414
*

‎src/Facades/Config.php‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -8,7 +8,7 @@
88
*
99
* @author Andrey Helldar <helldar@ai-rus.com>
1010
*
11-
* @copyright 2024 Andrey Helldar
11+
* @copyright 2025 Andrey Helldar
1212
*
1313
* @license MIT
1414
*

‎src/Facades/Url.php‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -8,7 +8,7 @@
88
*
99
* @author Andrey Helldar <helldar@ai-rus.com>
1010
*
11-
* @copyright 2024 Andrey Helldar
11+
* @copyright 2025 Andrey Helldar
1212
*
1313
* @license MIT
1414
*

‎src/Middlewares/CheckLastModified.php‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -8,7 +8,7 @@
88
*
99
* @author Andrey Helldar <helldar@ai-rus.com>
1010
*
11-
* @copyright 2024 Andrey Helldar
11+
* @copyright 2025 Andrey Helldar
1212
*
1313
* @license MIT
1414
*

0 commit comments

Comments
 (0)