Skip to content

Commit 0e39d2d

Browse files
committed
Revert phive>composer migration
1 parent 739f42f commit 0e39d2d

File tree

2 files changed

+6
-8
lines changed

2 files changed

+6
-8
lines changed

.github/workflows/php.yml

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -20,7 +20,7 @@ jobs:
2020
matrix:
2121
php-version: ['8.3', '8.4', '8.5']
2222

23-
uses: simplesamlphp/simplesamlphp-test-framework/.github/workflows/reusable_phplinter.yml@v1.11.3
23+
uses: simplesamlphp/simplesamlphp-test-framework/.github/workflows/reusable_phplinter.yml@v1.11.4
2424
with:
2525
php-version: ${{ matrix.php-version }}
2626

@@ -29,7 +29,7 @@ jobs:
2929
strategy:
3030
fail-fast: false
3131

32-
uses: simplesamlphp/simplesamlphp-test-framework/.github/workflows/reusable_linter.yml@v1.11.3
32+
uses: simplesamlphp/simplesamlphp-test-framework/.github/workflows/reusable_linter.yml@v1.11.4
3333
with:
3434
enable_eslinter: false
3535
enable_jsonlinter: true

.github/workflows/reusable_phplinter.yml

Lines changed: 4 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -40,14 +40,12 @@ jobs:
4040
- name: Setup PHP runtime
4141
uses: shivammathur/setup-php@v2
4242
with:
43-
tools: composer, phive
43+
tools: phive
4444
php-version: ${{ inputs.php-version }}
4545
coverage: "none"
46-
# A conflict exists between overtrue/phplint and redis
4746
extensions: :redis
4847

49-
- name: Install overtrue/phplint (v9.7)
50-
run: composer require overtrue/phplint --ignore-platform-reqs
51-
48+
- name: Install overtrue/phplint (latest)
49+
run: phive install overtrue/phplint --force-accept-unsigned --target ./bin
5250
- name: Lint PHP files
53-
run: vendor/bin/phplint --exclude=vendor --no-cache --no-progress -v
51+
run: ./bin/phplint --no-cache --no-progress -v

0 commit comments

Comments
 (0)