Skip to content

Commit 768f3a3

Browse files
committed
Update dependencies
1 parent e9f2b35 commit 768f3a3

File tree

6 files changed

+19
-17
lines changed

6 files changed

+19
-17
lines changed

.github/workflows/psalm.yml

+6-1
Original file line numberDiff line numberDiff line change
@@ -30,5 +30,10 @@ jobs:
3030
composer config "http-basic.nova.laravel.com" "${{ secrets.NOVA_USERNAME }}" "${{ secrets.NOVA_4_LICENSE_KEY }}"
3131
composer install -n --prefer-dist
3232
33+
- name: Restore timestamps
34+
uses: chetan/git-restore-mtime-action@v2
35+
36+
- run: composer global require cpx/cpx
37+
3338
- name: Run Psalm
34-
run: ./vendor/bin/psalm --shepherd
39+
run: composer psalm -- --shepherd

.github/workflows/run-tests.yml

+3-3
Original file line numberDiff line numberDiff line change
@@ -37,7 +37,7 @@ jobs:
3737
- name: Install dependencies
3838
run: |
3939
composer config "http-basic.nova.laravel.com" "${{ secrets.NOVA_USERNAME }}" "${{ secrets.NOVA_4_LICENSE_KEY }}" --ansi
40-
composer update ${{ matrix.dependency-version }} --prefer-dist --no-interaction --ansi --with="laravel/framework:${{ matrix.laravel }}" --with="orchestra/testbench:${{ matrix.testbench }}"
40+
composer update ${{ matrix.dependency-version }} --prefer-dist --no-interaction --ansi --with="laravel/framework:${{ matrix.laravel }}" --with="orchestra/testbench-core:${{ matrix.testbench }}"
4141
4242
- name: Execute tests
4343
run: composer test
@@ -46,14 +46,14 @@ jobs:
4646
- name: Setup Node.js
4747
uses: actions/setup-node@v4
4848
with:
49-
node-version: 20
49+
node-version: 22
5050

5151
- name: Cache yarn dependencies
5252
uses: actions/cache@v4
5353
id: npm-node_modules-cache
5454
with:
5555
path: node_modules
56-
key: npm-${{ hashFiles('package.json') }}-node-20
56+
key: npm-${{ hashFiles('package.json') }}-node-22
5757

5858
- name: Compile assets
5959
run: npm install && npm run nova:install && npm run prod

composer.json

+7-5
Original file line numberDiff line numberDiff line change
@@ -13,13 +13,13 @@
1313
"require": {
1414
"php": "^8.1",
1515
"ext-json": "*",
16-
"laravel/nova": "^4.20"
16+
"laravel/nova": "^4.20 || ^5.0"
1717
},
1818
"require-dev": {
19-
"interaction-design-foundation/coding-standard": "^0.2.0",
20-
"orchestra/testbench": "^8.22 || ^9.0",
19+
"interaction-design-foundation/coding-standard": "^0.3",
20+
"orchestra/testbench-core": "^8.30 || ^9.7",
2121
"phpunit/phpunit": "^10.5 || ^11.0",
22-
"vimeo/psalm": "^5.22"
22+
"vimeo/psalm": "^5.26"
2323
},
2424
"repositories": [
2525
{
@@ -60,7 +60,9 @@
6060
"cs": "@cs:fix",
6161
"cs:check": "phpcs -p -s --colors --report-full --report-summary",
6262
"cs:fix": "phpcbf -p --colors",
63-
"psalm": "vendor/bin/psalm",
63+
"psalm": "cpx psalm",
64+
"sa": "@psalm",
65+
"sa:bl": "cpx psalm --set-baseline=psalm-baseline.xml --long-progress --threads=1",
6466
"test": "phpunit --colors=always"
6567
}
6668
}

psalm-baseline.xml

+1-6
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,5 @@
11
<?xml version="1.0" encoding="UTF-8"?>
2-
<files psalm-version="5.22.2@d768d914152dbbf3486c36398802f74e80cfde48">
2+
<files psalm-version="5.26.1@d747f6500b38ac4f7dfc5edbcae6e4b637d7add0">
33
<file src="src/CardServiceProvider.php">
44
<UndefinedInterfaceMethod>
55
<code><![CDATA[routesAreCached]]></code>
@@ -19,9 +19,4 @@
1919
<code><![CDATA[array{string, array{name: string, time: string, night: bool}}]]></code>
2020
</MoreSpecificReturnType>
2121
</file>
22-
<file src="src/WorldClock.php">
23-
<PropertyNotSetInConstructor>
24-
<code><![CDATA[WorldClock]]></code>
25-
</PropertyNotSetInConstructor>
26-
</file>
2722
</files>

src/CardServiceProvider.php

+1-1
Original file line numberDiff line numberDiff line change
@@ -6,7 +6,7 @@
66
use Illuminate\Support\ServiceProvider;
77
use Laravel\Nova\Nova;
88

9-
class CardServiceProvider extends ServiceProvider
9+
final class CardServiceProvider extends ServiceProvider
1010
{
1111
/** Bootstrap any application services. */
1212
public function boot(): void

src/WorldClock.php

+1-1
Original file line numberDiff line numberDiff line change
@@ -4,7 +4,7 @@
44

55
use Laravel\Nova\Card;
66

7-
class WorldClock extends Card
7+
final class WorldClock extends Card
88
{
99
/**
1010
* The width of the card (1/3, 1/2, or full).

0 commit comments

Comments
 (0)