Skip to content

Commit 97fc361

Browse files
authored
Merge pull request #41 from douglasmiller/php8
Adding support for PHP 8.x
2 parents 05e3529 + d9f4397 commit 97fc361

File tree

4 files changed

+120
-38
lines changed

4 files changed

+120
-38
lines changed

.github/workflows/push.yml

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -40,7 +40,7 @@ jobs:
4040
- name: Install phive
4141
run: make install-phive
4242
- name: Install PHAR dependencies
43-
run: tools/phive.phar --no-progress install --copy --trust-gpg-keys 4AA394086372C20A,D2CCAC42F6295E7D,E82B2FB314E9906E,8E730BA25823D8B5,8A03EA3B385DBAA1 --force-accept-unsigned
43+
run: tools/phive.phar --no-progress install --copy --trust-gpg-keys 4AA394086372C20A,D2CCAC42F6295E7D,8A03EA3B385DBAA1,CF1A108D0E7AE720 --force-accept-unsigned
4444

4545
phpunit-with-coverage:
4646
runs-on: ubuntu-latest
@@ -168,7 +168,7 @@ jobs:
168168
- ubuntu-latest
169169
- windows-latest
170170
- macOS-latest
171-
php-versions: ['7.2', '7.3', '7.4']
171+
php-versions: ['7.2', '7.3', '7.4', '8.0']
172172
name: Unit tests for PHP version ${{ matrix.php-versions }} on ${{ matrix.operating-system }}
173173
needs:
174174
- setup

composer.json

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -18,7 +18,7 @@
1818
}
1919
},
2020
"require": {
21-
"php": "^7.2",
21+
"php": "^7.2||^8.0",
2222
"league/flysystem": "^1.0"
2323
},
2424
"minimum-stability": "stable",

composer.lock

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

phive.xml

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,7 @@
11
<?xml version="1.0" encoding="UTF-8"?>
22
<phive xmlns="https://phar.io/phive">
3-
<phar name="phpunit" version="^8.4.3" installed="8.4.3" location="./tools/phpunit" copy="true"/>
4-
<phar name="phpstan" version="^0.12.1" installed="0.12.2" location="./tools/phpstan" copy="true"/>
5-
<phar name="psalm" version="^3.7.2" installed="3.7.2" location="./tools/psalm" copy="true"/>
6-
<phar name="composer-require-checker" version="^1.0.0" installed="1.0.0" location="./tools/composer-require-checker" copy="true"/>
3+
<phar name="phpunit" version="^8.4.3" installed="8.5.15" location="./tools/phpunit" copy="true"/>
4+
<phar name="phpstan" version="^0.12.1" installed="0.12.85" location="./tools/phpstan" copy="true"/>
5+
<phar name="psalm" version="^3.7.2" installed="3.18.2" location="./tools/psalm" copy="true"/>
6+
<phar name="composer-require-checker" version="^1.0.0" installed="1.1.0" location="./tools/composer-require-checker" copy="true"/>
77
</phive>

0 commit comments

Comments
 (0)