Skip to content

Commit a3669b3

Browse files
committed
Merge remote-tracking branch 'origin/master'
2 parents 2050668 + b2f7a4c commit a3669b3

2 files changed

Lines changed: 4 additions & 4 deletions

File tree

.github/workflows/phpstan.yml

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -26,10 +26,10 @@ jobs:
2626
- name: Setup PHP
2727
uses: shivammathur/setup-php@c541c155eee45413f5b09a52248675b1a2575231 # v2.31.1
2828
with:
29-
php-version: '8.3'
29+
php-version: '8.4'
3030

31-
- name: Install PHPStan
32-
run: composer require --dev phpstan/phpstan
31+
- name: Remove phpDocumentor temporarily and Install PHPStan
32+
run: composer remove --dev --no-update phpdocumentor/phpdocumentor; composer update
3333

3434
- name: Restore cached baseline for PHPStan
3535
id: cache-baseline-restore

README.md

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -92,7 +92,7 @@ FMDataAPI has "composer.json," so you can add your composer.json file in your pr
9292
- test
9393
- Some files for unit testing.
9494
- .github, docker-compose.yml
95-
- Files for GitHub Actions to run CI Jobs.
95+
- Files for GitHub Actions to run CI jobs.
9696

9797
## Licence
9898

0 commit comments

Comments
 (0)