Skip to content

Commit a127b47

Browse files
committed
[CI] Fix temporary issue between laravel-ide-helper and psalm-laravel
1 parent ba633a1 commit a127b47

File tree

6 files changed

+825
-11
lines changed

6 files changed

+825
-11
lines changed

.github/workflows/ci-ex-dusk.yml

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -26,6 +26,8 @@ jobs:
2626
run: sudo apt-get install bgpq3
2727
- name: Install Dependencies
2828
run: composer install -q --no-ansi --no-interaction --no-scripts --no-progress --prefer-dist
29+
- name: Fix temporary issue between laravel-ide-helper and psalm-laravel
30+
run: cp -f data/ci/known-good/Alias.php vendor/barryvdh/laravel-ide-helper/src/Alias.php
2931
- name: Directory Permissions
3032
run: chmod -R 777 storage bootstrap/cache
3133
- name: Create Database

.gitignore

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -29,7 +29,7 @@
2929
composer.phar
3030
/tools/installers/Vagrantfile
3131

32-
/.phpstorm.meta.php
32+
/.phpstorm.meta.php/laravel.meta.php
3333
/_ide_helper.php
3434

3535
/storage/.local

.phpstorm.meta.php/.hello_git

Whitespace-only changes.

composer.json

Lines changed: 3 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -48,14 +48,15 @@
4848
"zendesk/zendesk_api_client_php": "^2.2.10"
4949
},
5050
"require-dev": {
51-
"barryvdh/laravel-ide-helper": "^3.6.1",
51+
"barryvdh/laravel-ide-helper": "^3.5.1",
5252
"fakerphp/faker": "^1.23",
5353
"laravel/boost": "^2.1",
5454
"laravel/dusk": "^8.0",
5555
"mockery/mockery": "^1.6",
5656
"phpunit/phpunit": "^11.5.3",
5757
"staudenmeir/dusk-updater": "^1.5",
58-
"vimeo/psalm": "^6.0"
58+
"vimeo/psalm": "^6.0",
59+
"psalm/plugin-laravel": "^3.0.0"
5960
},
6061
"support": {
6162
"issues": "https://www.ixpmanager.org/support",

composer.lock

Lines changed: 238 additions & 8 deletions
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

0 commit comments

Comments
 (0)