Skip to content

Commit 0219053

Browse files
authored
Add PHP 8 support (#2)
1 parent cc32331 commit 0219053

File tree

4 files changed

+11
-12
lines changed

4 files changed

+11
-12
lines changed

.github/workflows/psalm.yml

+2-2
Original file line numberDiff line numberDiff line change
@@ -16,7 +16,7 @@ jobs:
1616
- name: Setup PHP
1717
uses: shivammathur/setup-php@v2
1818
with:
19-
php-version: '7.4'
19+
php-version: '8.0'
2020
extensions: dom, curl, libxml, mbstring, zip, pcntl, pdo, sqlite, pdo_sqlite, bcmath, soap, intl, gd, exif, iconv, imagick
2121
coverage: none
2222

@@ -30,4 +30,4 @@ jobs:
3030
run: composer install -n --prefer-dist
3131

3232
- name: Run psalm
33-
run: ./vendor/bin/psalm -c psalm.xml
33+
run: ./vendor/bin/psalm -c psalm.xml --shepherd --stats

.github/workflows/run-tests.yml

+3-3
Original file line numberDiff line numberDiff line change
@@ -9,7 +9,7 @@ jobs:
99
fail-fast: true
1010
matrix:
1111
os: [ubuntu-latest, windows-latest]
12-
php: [7.4, 7.3]
12+
php: [8.0, 7.4, 7.3]
1313
laravel: [8.*]
1414
dependency-version: [prefer-lowest, prefer-stable]
1515

@@ -34,8 +34,8 @@ jobs:
3434

3535
- name: Install dependencies
3636
run: |
37-
composer require "laravel/framework:${{ matrix.laravel }}" --no-interaction --no-update
38-
composer update --${{ matrix.dependency-version }} --prefer-dist --no-interaction --no-suggest
37+
composer require "laravel/framework:${{ matrix.laravel }}" --no-interaction --no-update --ignore-platform-reqs
38+
composer update --${{ matrix.dependency-version }} --prefer-dist --no-interaction --ignore-platform-reqs
3939
4040
- name: Execute tests
4141
run: vendor/bin/phpunit

composer.json

+3-4
Original file line numberDiff line numberDiff line change
@@ -17,14 +17,13 @@
1717
}
1818
],
1919
"require": {
20-
"php": ">=7.3",
20+
"php": "^7.3|^8.0",
2121
"illuminate/database": "^8.0",
2222
"illuminate/support": "^8.0"
2323
},
2424
"require-dev": {
25-
"phpunit/phpunit": "^9.0",
26-
"psalm/plugin-laravel": "^1.4",
27-
"vimeo/psalm": "^4.0"
25+
"phpunit/phpunit": "^9.4",
26+
"vimeo/psalm": "^4.1"
2827
},
2928
"autoload": {
3029
"psr-4": {

psalm.xml

+3-3
Original file line numberDiff line numberDiff line change
@@ -18,7 +18,7 @@
1818
<issueHandlers>
1919
</issueHandlers>
2020

21-
<plugins>
22-
<pluginClass class="Psalm\LaravelPlugin\Plugin"/>
23-
</plugins>
21+
<!-- <plugins>-->
22+
<!-- <pluginClass class="Psalm\LaravelPlugin\Plugin"/>-->
23+
<!-- </plugins>-->
2424
</psalm>

0 commit comments

Comments
 (0)