Skip to content

Commit 13167a4

Browse files
Merge pull request #40 from TheDragonCode/patch/2024-03-13/00-01
Drop old PHP and Laravel versions
2 parents 90b8a4b + 1ca64af commit 13167a4

File tree

4 files changed

+31
-61
lines changed

4 files changed

+31
-61
lines changed

.github/workflows/laravel.yml

Lines changed: 3 additions & 33 deletions
Original file line numberDiff line numberDiff line change
@@ -9,42 +9,12 @@ jobs:
99
strategy:
1010
fail-fast: true
1111
matrix:
12-
php: [ "7.3", "7.4", "8.0", "8.1", "8.2", "8.3" ]
13-
laravel: [ "6.0", "7.0", "8.0", "9.0", "10.0" ]
12+
php: [ "8.1", "8.2", "8.3" ]
13+
laravel: [ "10.0", "11.0" ]
1414
exclude:
15-
- laravel: "6.0"
15+
- laravel: "11.0"
1616
php: "8.1"
1717

18-
- laravel: "6.0"
19-
php: "8.2"
20-
21-
- laravel: "6.0"
22-
php: "8.3"
23-
24-
- laravel: "7.0"
25-
php: "8.1"
26-
27-
- laravel: "7.0"
28-
php: "8.2"
29-
30-
- laravel: "7.0"
31-
php: "8.3"
32-
33-
- laravel: "9.0"
34-
php: "7.3"
35-
36-
- laravel: "9.0"
37-
php: "7.4"
38-
39-
- laravel: "10.0"
40-
php: "7.3"
41-
42-
- laravel: "10.0"
43-
php: "7.4"
44-
45-
- laravel: "10.0"
46-
php: "8.0"
47-
4818

4919
name: PHP ${{ matrix.php }}, Laravel ${{ matrix.laravel }}
5020

README.md

Lines changed: 9 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -12,6 +12,14 @@
1212
1313
## Installation
1414

15+
### Compatibility
16+
17+
| PHP | Laravel | Json Response |
18+
|------------------------------|--------------------------|---------------|
19+
| 7.3, 7.4, 8.0, 8.1, 8.2, 8.3 | 6.x, 7.x, 8.x, 9.x, 10.x | `^2.0` |
20+
| 8.1, 8.2, 8.3 | 10.x, 11.x | `^3.0` |
21+
22+
1523
To get the latest version of `Laravel Json Response`, simply require the project using [Composer](https://getcomposer.org):
1624

1725
```bash
@@ -23,7 +31,7 @@ Or manually update `require` block of `composer.json` and run `composer update`.
2331
```json
2432
{
2533
"require": {
26-
"dragon-code/laravel-json-response": "^2.0"
34+
"dragon-code/laravel-json-response": "^3.0"
2735
}
2836
}
2937
```

composer.json

Lines changed: 8 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -38,21 +38,21 @@
3838
}
3939
],
4040
"require": {
41-
"php": "^7.3 || ^8.0",
42-
"illuminate/contracts": ">=6.0 <11.0",
43-
"illuminate/http": ">=6.0 <11.0",
44-
"illuminate/support": ">=6.0 <11.0",
41+
"php": "^8.1",
42+
"illuminate/contracts": "^10.0 || ^11.0",
43+
"illuminate/http": "^10.0 || ^11.0",
44+
"illuminate/support": "^10.0 || ^11.0",
4545
"lmc/http-constants": "^1.2",
46-
"symfony/http-foundation": "^4.3 || ^5.0 || ^6.0"
46+
"symfony/http-foundation": "^6.0 || ^7.0"
4747
},
4848
"require-dev": {
49-
"orchestra/testbench": ">=4.0 <9.0",
50-
"phpunit/phpunit": "^9.6"
49+
"orchestra/testbench": "^10.0 || ^11.0",
50+
"phpunit/phpunit": "^11.0"
5151
},
5252
"conflict": {
5353
"andrey-helldar/laravel-json-response": "*"
5454
},
55-
"minimum-stability": "stable",
55+
"minimum-stability": "dev",
5656
"prefer-stable": true,
5757
"autoload": {
5858
"psr-4": {

phpunit.xml

Lines changed: 11 additions & 19 deletions
Original file line numberDiff line numberDiff line change
@@ -1,23 +1,10 @@
11
<?xml version="1.0" encoding="UTF-8"?>
2-
<phpunit
3-
xsi:noNamespaceSchemaLocation="https://schema.phpunit.de/9.3/phpunit.xsd"
4-
xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
5-
backupGlobals="false"
6-
backupStaticAttributes="false"
7-
bootstrap="vendor/autoload.php"
8-
colors="true"
9-
convertErrorsToExceptions="true"
10-
convertNoticesToExceptions="true"
11-
convertWarningsToExceptions="true"
12-
processIsolation="false"
13-
stopOnError="false"
14-
stopOnFailure="false"
15-
verbose="true"
2+
<phpunit xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
3+
xsi:noNamespaceSchemaLocation="vendor/phpunit/phpunit/phpunit.xsd"
4+
bootstrap="vendor/autoload.php" colors="true"
5+
cacheDirectory=".phpunit.cache"
166
>
17-
<coverage processUncoveredFiles="true">
18-
<include>
19-
<directory suffix=".php">./src</directory>
20-
</include>
7+
<coverage>
218
<report>
229
<clover outputFile="build/logs/clover.xml"/>
2310
<html outputDirectory="build/logs/coverage"/>
@@ -29,7 +16,12 @@
2916
</php>
3017
<testsuites>
3118
<testsuite name="Test Suite">
32-
<directory suffix="Test.php">./tests</directory>
19+
<directory>./tests</directory>
3320
</testsuite>
3421
</testsuites>
22+
<source>
23+
<include>
24+
<directory>./src</directory>
25+
</include>
26+
</source>
3527
</phpunit>

0 commit comments

Comments
 (0)