Skip to content

Commit 4a88da6

Browse files
[11.x] Supports PHP 8.4 (#1281)
* [11.x] Supports PHP 8.4 * Apply fixes from StyleCI * wip * wip --------- Co-authored-by: StyleCI Bot <[email protected]>
1 parent 2704954 commit 4a88da6

File tree

4 files changed

+14
-9
lines changed

4 files changed

+14
-9
lines changed

.github/workflows/tests.yml

+5-2
Original file line numberDiff line numberDiff line change
@@ -16,8 +16,11 @@ jobs:
1616
strategy:
1717
fail-fast: true
1818
matrix:
19-
php: [8.2, 8.3]
19+
php: [8.2, 8.3, 8.4]
2020
stability: [prefer-lowest, prefer-stable]
21+
exclude:
22+
- php: 8.4
23+
stability: prefer-lowest
2124

2225
name: PHP ${{ matrix.php }} - ${{ matrix.stability }}
2326

@@ -38,4 +41,4 @@ jobs:
3841
run: composer update --${{ matrix.stability }} --prefer-dist --no-interaction --no-progress
3942

4043
- name: Execute tests
41-
run: vendor/bin/phpunit
44+
run: vendor/bin/phpunit --display-deprecations --fail-on-deprecation

.styleci.yml

+3-1
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,7 @@
11
php:
22
preset: laravel
3-
version: 8.1
3+
version: 8.2
4+
enabled:
5+
- nullable_type_declarations
46
js: true
57
css: true

composer.json

+2-2
Original file line numberDiff line numberDiff line change
@@ -54,8 +54,8 @@
5454
"vlucas/phpdotenv": "^5.4.1"
5555
},
5656
"require-dev": {
57-
"mockery/mockery": "^1.4.4",
58-
"phpunit/phpunit": "10.5.3"
57+
"mockery/mockery": "^1.6.10",
58+
"phpunit/phpunit": "^10.5.35"
5959
},
6060
"suggest": {
6161
"laravel/tinker": "Required to use the tinker console command (^2.7).",

src/Testing/Concerns/MakesHttpRequests.php

+4-4
Original file line numberDiff line numberDiff line change
@@ -195,7 +195,7 @@ public function handle(Request $request)
195195
* @param array|null $data
196196
* @return $this
197197
*/
198-
protected function shouldReturnJson(array $data = null)
198+
protected function shouldReturnJson(?array $data = null)
199199
{
200200
return $this->receiveJson($data);
201201
}
@@ -239,7 +239,7 @@ public function seeJsonEquals(array $data)
239239
* @param bool $negate
240240
* @return $this
241241
*/
242-
public function seeJson(array $data = null, $negate = false)
242+
public function seeJson(?array $data = null, $negate = false)
243243
{
244244
if (is_null($data)) {
245245
$decodedResponse = json_decode($this->response->getContent(), true);
@@ -262,7 +262,7 @@ public function seeJson(array $data = null, $negate = false)
262262
* @param array|null $data
263263
* @return $this
264264
*/
265-
public function dontSeeJson(array $data = null)
265+
public function dontSeeJson(?array $data = null)
266266
{
267267
return $this->seeJson($data, true);
268268
}
@@ -274,7 +274,7 @@ public function dontSeeJson(array $data = null)
274274
* @param array|null $responseData
275275
* @return $this
276276
*/
277-
public function seeJsonStructure(array $structure = null, $responseData = null)
277+
public function seeJsonStructure(?array $structure = null, $responseData = null)
278278
{
279279
$this->response->assertJsonStructure($structure, $responseData);
280280

0 commit comments

Comments
 (0)