Skip to content

Commit c02385d

Browse files
committed
chore(deps): update dependencies and adjust larastan config
1 parent e69026c commit c02385d

File tree

4 files changed

+8
-24
lines changed

4 files changed

+8
-24
lines changed

.github/workflows/test.yml

Lines changed: 2 additions & 15 deletions
Original file line numberDiff line numberDiff line change
@@ -15,13 +15,9 @@ jobs:
1515
matrix:
1616
os: [ ubuntu-latest ]
1717
php: [8.1, 8.2, 8.3]
18-
laravel: [10.*, 11.*, 12.*]
18+
laravel: [11.*, 12.*]
1919
dependency-version: [ prefer-stable ]
2020
include:
21-
- laravel: 10.*
22-
testbench: 8.*
23-
pest: ^2.34
24-
enum: ^4.0
2521
- laravel: 11.*
2622
testbench: 9.*
2723
pest: ^3.11
@@ -65,16 +61,7 @@ jobs:
6561

6662
- name: Install dependencies - L${{ matrix.laravel }}
6763
run: |
68-
composer require "laravel/framework:${{ matrix.laravel }}" "orchestra/testbench:${{ matrix.testbench }}" "pestphp/pest:${{ matrix.pest }}" --no-interaction --no-update
69-
if [[ "${{ matrix.enum }}" != "" ]]; then
70-
composer require --dev "jiannei/laravel-enum:${{ matrix.enum }}" --no-interaction --no-update
71-
elif [[ "${{ matrix.laravel }}" == "12.*" ]]; then
72-
composer require --dev "jiannei/laravel-enum:^4.0" --no-interaction --no-update
73-
elif [[ "${{ matrix.laravel }}" == "11.*" ]]; then
74-
composer require --dev "jiannei/laravel-enum:^4.0" --no-interaction --no-update
75-
else
76-
composer require --dev "jiannei/laravel-enum:^3.0" --no-interaction --no-update
77-
fi
64+
composer require "laravel/framework:${{ matrix.laravel }}" "orchestra/testbench:${{ matrix.testbench }}" "pestphp/pest:${{ matrix.pest }}" "jiannei/laravel-enum:${{ matrix.enum }}" --no-interaction --no-update
7865
composer update --${{ matrix.dependency-version }} --prefer-dist --no-interaction
7966
8067
- name: Run code style check

composer.json

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -13,9 +13,9 @@
1313
"ext-json": "*"
1414
},
1515
"require-dev": {
16-
"orchestra/testbench": "^10.0.0",
17-
"pestphp/pest": "^3.5",
18-
"jiannei/laravel-enum": "dev-main",
16+
"orchestra/testbench": "^9.0|^10.0",
17+
"pestphp/pest": "^3.11",
18+
"jiannei/laravel-enum": "^4.0",
1919
"laravel/pint": "^1.18.1",
2020
"larastan/larastan": "^3.0"
2121
},

phpstan.neon

Lines changed: 2 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -2,10 +2,7 @@ includes:
22
- vendor/larastan/larastan/extension.neon
33

44
parameters:
5-
level: 9
5+
level: 6
66
paths:
77
- src
8-
ignoreErrors:
9-
- '#Call to function is_(string|int)\(\) with .* will always evaluate to true#'
10-
- '#Result of && is always false#'
11-
- '#Possibly invalid array key type mixed#'
8+
treatPhpDocTypesAsCertain: false

src/Support/Format.php

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -262,7 +262,7 @@ protected function formatError(?array $error): object|array
262262
protected function formatDataFields(array $data): array
263263
{
264264
foreach ($this->config as $key => $config) {
265-
if (! is_string($key) && ! is_int($key) || ! Arr::has($data, $key)) {
265+
if (! is_string($key) || ! Arr::has($data, $key)) {
266266
continue;
267267
}
268268

0 commit comments

Comments
 (0)