Skip to content

Commit 38b38f7

Browse files
lindyhopchrislindyhopchris
committed
Merge branch 'release/7.3.0'
2 parents bbf6ad1 + 0b58367 commit 38b38f7

7 files changed

Lines changed: 65 additions & 57 deletions

File tree

‎.github/workflows/tests.yml‎

Lines changed: 9 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -14,12 +14,17 @@ jobs:
1414
strategy:
1515
fail-fast: true
1616
matrix:
17-
php: [8.2, 8.3, 8.4]
18-
laravel: [11, 12]
17+
php: [ 8.2, 8.3, 8.4, 8.5 ]
18+
laravel: [ 11, 12, 13 ]
19+
exclude:
20+
- laravel: 13
21+
php: 8.2
22+
- laravel: 11
23+
php: 8.5
1924

2025
steps:
2126
- name: Checkout Code
22-
uses: actions/checkout@v4
27+
uses: actions/checkout@v6
2328

2429
- name: Setup PHP
2530
uses: shivammathur/setup-php@v2
@@ -34,7 +39,7 @@ jobs:
3439
run: composer require "laravel/framework:^${{ matrix.laravel }}" --no-update
3540

3641
- name: Install dependencies
37-
uses: nick-fields/retry@v3
42+
uses: nick-fields/retry@v4
3843
with:
3944
timeout_minutes: 5
4045
max_attempts: 5

‎CHANGELOG.md‎

Lines changed: 6 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -5,6 +5,12 @@ All notable changes to this project will be documented in this file. This projec
55

66
## Unreleased
77

8+
## [7.3.0] - 2026-03-30
9+
10+
### Added
11+
12+
- Package now supports Laravel 13.
13+
814
## [7.2.0] - 2025-03-21
915

1016
### Added

‎composer.json‎

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -25,19 +25,19 @@
2525
"php": "^8.2",
2626
"ext-json": "*",
2727
"laravel-json-api/neomerx-json-api": "^5.0.3",
28-
"laravel/framework": "^11.0|^12.0",
28+
"laravel/framework": "^11.0|^12.0|^13.0",
2929
"nyholm/psr7": "^1.8",
3030
"ramsey/uuid": "^4.0",
3131
"symfony/psr-http-message-bridge": "^7.0"
3232
},
3333
"require-dev": {
3434
"ext-sqlite3": "*",
3535
"guzzlehttp/guzzle": "^7.8",
36-
"laravel-json-api/testing": "^3.1",
36+
"laravel-json-api/testing": "^3.2",
3737
"laravel/legacy-factories": "^1.4.0",
3838
"laravel/ui": "^4.6",
3939
"mockery/mockery": "^1.6",
40-
"orchestra/testbench": "^9.0|^10.0",
40+
"orchestra/testbench": "^9.0|^10.0|^11.0",
4141
"phpunit/phpunit": "^10.5|^11.0"
4242
},
4343
"suggest": {

‎phpunit.xml‎

Lines changed: 24 additions & 24 deletions
Original file line numberDiff line numberDiff line change
@@ -11,29 +11,29 @@
1111
cacheDirectory=".phpunit.cache"
1212
backupStaticProperties="false"
1313
failOnWarning="true"
14-
failOnDeprecation="true"
14+
failOnDeprecation="false"
1515
failOnNotice="true"
1616
>
17-
<coverage/>
18-
<testsuites>
19-
<testsuite name="Unit">
20-
<directory suffix="Test.php">./tests/lib/Unit/</directory>
21-
</testsuite>
22-
<testsuite name="Integration">
23-
<directory suffix="Test.php">./tests/lib/Integration/</directory>
24-
</testsuite>
25-
<testsuite name="Acceptance">
26-
<directory suffix="Test.php">./tests/dummy/tests/</directory>
27-
</testsuite>
28-
</testsuites>
29-
<php>
30-
<ini name="error_reporting" value="E_ALL"/>
31-
<ini name="memory_limit" value="256M"/>
32-
<env name="APP_KEY" value="base64:BMfTqJC1cFk6A/jTPsjQgC+cROx7TDaEeGIAat6CuqY="/>
33-
</php>
34-
<source>
35-
<include>
36-
<directory suffix=".php">src/</directory>
37-
</include>
38-
</source>
39-
</phpunit>
17+
<coverage/>
18+
<testsuites>
19+
<testsuite name="Unit">
20+
<directory suffix="Test.php">./tests/lib/Unit/</directory>
21+
</testsuite>
22+
<testsuite name="Integration">
23+
<directory suffix="Test.php">./tests/lib/Integration/</directory>
24+
</testsuite>
25+
<testsuite name="Acceptance">
26+
<directory suffix="Test.php">./tests/dummy/tests/</directory>
27+
</testsuite>
28+
</testsuites>
29+
<php>
30+
<ini name="error_reporting" value="E_ALL"/>
31+
<ini name="memory_limit" value="256M"/>
32+
<env name="APP_KEY" value="base64:BMfTqJC1cFk6A/jTPsjQgC+cROx7TDaEeGIAat6CuqY="/>
33+
</php>
34+
<source>
35+
<include>
36+
<directory suffix=".php">src/</directory>
37+
</include>
38+
</source>
39+
</phpunit>

‎tests/dummy/composer.json‎

Lines changed: 17 additions & 20 deletions
Original file line numberDiff line numberDiff line change
@@ -1,22 +1,19 @@
11
{
2-
"name": "laravel/laravel",
3-
"description": "The Laravel Framework.",
4-
"keywords": ["framework", "laravel"],
5-
"license": "MIT",
6-
"type": "project",
7-
"require": {
8-
"laravel/framework": "~5.0"
9-
},
10-
"require-dev": {
11-
"phpunit/phpunit": "~4.0"
12-
},
13-
"autoload": {
14-
"classmap": [
15-
"database"
16-
],
17-
"psr-4": {
18-
"DummyApp\\": "app/"
19-
}
20-
},
21-
"minimum-stability": "dev"
2+
"name": "laravel/laravel",
3+
"description": "The Laravel Framework.",
4+
"keywords": [
5+
"framework",
6+
"laravel"
7+
],
8+
"license": "MIT",
9+
"type": "project",
10+
"autoload": {
11+
"classmap": [
12+
"database"
13+
],
14+
"psr-4": {
15+
"DummyApp\\": "app/"
16+
}
17+
},
18+
"minimum-stability": "dev"
2219
}

‎tests/dummy/tests/Feature/Avatars/ReadTest.php‎

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -75,9 +75,9 @@ public function testDownloadFileDoesNotExist(): void
7575
->accept('image/*')
7676
->get(url('/api/v1/avatars', $avatar));
7777

78-
$response
79-
->assertStatus(404)
80-
->assertHeader('Content-Type', 'text/html; charset=UTF-8');
78+
$response->assertStatus(404);
79+
80+
$this->assertSame('text/html; charset=utf-8', strtolower($response->headers->get('Content-Type')));
8181
}
8282

8383
/**

‎tests/lib/Integration/ContentNegotiation/DefaultTest.php‎

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -108,9 +108,9 @@ public function testUnsupportedMediaType()
108108
*/
109109
public function testAcceptable()
110110
{
111-
$this->get('/api/v1/posts', ['Accept' => 'text/plain'])
112-
->assertStatus(200)
113-
->assertHeader('Content-Type', 'text/plain; charset=UTF-8');
111+
$response = $this->get('/api/v1/posts', ['Accept' => 'text/plain']);
112+
$response->assertStatus(200);
113+
$this->assertSame('text/plain; charset=utf-8', strtolower($response->headers->get('Content-Type')));
114114
}
115115

116116
/**

0 commit comments

Comments
 (0)