Skip to content

Commit e38eacc

Browse files
authored
Merge branch 'phpactor:master' into fix-hide-lsp-popup
2 parents 500c263 + 6e49544 commit e38eacc

File tree

8 files changed

+538
-985
lines changed

8 files changed

+538
-985
lines changed

.github/workflows/ci.yml

Lines changed: 9 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -22,6 +22,13 @@ jobs:
2222
run: npm run prettier-check
2323
- name: Lint
2424
run: npm run eslint
25-
- name: Download Phpactor
26-
run: npm run download-phpactor
25+
# - name: Download Phpactor
26+
# run: npm run download-phpactor
27+
- name: Setup PHP
28+
uses: shivammathur/setup-php@v2
29+
with:
30+
php-version: '8.3'
31+
tools: composer
32+
- name: Composer Install
33+
run: composer install --prefer-dist --no-interaction --optimize-autoloader --no-dev
2734
- run: xvfb-run -a npm test

.github/workflows/release.yml

Lines changed: 9 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -15,8 +15,15 @@ jobs:
1515
with:
1616
node-version: 'v20.18.0'
1717
- run: npm ci
18-
- name: Download Phpactor
19-
run: npm run download-phpactor
18+
# - name: Download Phpactor
19+
# run: npm run download-phpactor
20+
- name: Setup PHP
21+
uses: shivammathur/setup-php@v2
22+
with:
23+
php-version: '8.3'
24+
tools: composer
25+
- name: Composer Install
26+
run: composer install --prefer-dist --no-interaction --optimize-autoloader --no-dev
2027
- run: npm run compile
2128
- run: mkdir artifacts
2229
- name: Package

.vscode/launch.json

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -9,7 +9,7 @@
99
"type": "extensionHost",
1010
"request": "launch",
1111
"runtimeExecutable": "${execPath}",
12-
"args": ["--extensionDevelopmentPath=${workspaceFolder}", "--disable-extensions"],
12+
"args": ["--extensionDevelopmentPath=${workspaceFolder}", "--Xdisable-extensions"],
1313
"outFiles": ["${workspaceFolder}/out/**/*.js"],
1414
"sourceMaps": true
1515
},

composer.json

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -2,6 +2,6 @@
22
"prefer-stable": true,
33
"minimum-stability": "dev",
44
"require": {
5-
"phpactor/phpactor": "*"
5+
"phpactor/phpactor": "2025.03.28.0"
66
}
77
}

0 commit comments

Comments
 (0)