Commit d98cd4e

sanmaimartin-helmich

and

authored

Update composer.json to allow PHP 8 (#24)

* Update composer.json to allow PHP 8 * Update php.yml Co-authored-by: Martin Helmich <kontakt@martin-helmich.de>

1 parent d1733a6 commit d98cd4eCopy full SHA for d98cd4e

File tree

+14

-5

lines changed

+14

-5

lines changed

Lines changed: 12 additions & 3 deletions

Original file line number	Diff line number	Diff line change
`@@ -14,11 +14,20 @@ jobs:`
`14`	`14`	`matrix:`
`15`	`15`	`php: ['7.2', '7.3', '7.4']`
`16`	`16`	`phpunit: ['8.0', '9.0']`
	`17`	`+ composer-arg: ['']`
	`18`	`+ include:`
	`19`	`+ - php: '8.0'`
	`20`	`+ phpunit: '9.0'`
	`21`	`+ composer-arg: 'ignore-platform-req=php'`
`17`	`22`	`exclude:`
	`23`	`+ - php: '8.0'`
	`24`	`+ phpunit: '8.0'`
`18`	`25`	`- php: '7.2'`
`19`	`26`	`phpunit: '9.0'`
`20`	`27`	`runs-on: ubuntu-latest`
`21`		`-`
	`28`	`+ continue-on-error: ${{ matrix.php == '8.0' }}`
	`29`	`+ name: PHP ${{ matrix.php }}, PHPUnit ${{ matrix.phpunit }}`
	`30`	`+`
`22`	`31`	`steps:`
`23`	`32`	`- uses: actions/checkout@v1`
`24`	`33`
`@@ -28,7 +37,7 @@ jobs:`
`28`	`37`	`php-version: ${{ matrix.php }}`
`29`	`38`	`extensions: mbstring, intl, json`
`30`	`39`	`coverage: pcov`
`31`		`-`
	`40`	`+ tools: composer:v2`
`32`	`41`	`- name: Validate composer.json and composer.lock`
`33`	`42`	`run: composer validate`
`34`	`43`
`@@ -37,7 +46,7 @@ jobs:`
`37`	`46`	`composer require --no-update --dev phpunit/phpunit ~${{ matrix.phpunit }}`
`38`	`47`
`39`	`48`	`- name: Install dependencies`
`40`		`- run: composer install --prefer-dist --no-progress --no-suggest`
	`49`	`+ run: composer install --prefer-dist --no-progress --no-suggest --${{ matrix.composer-arg }}`
`41`	`50`
`42`	`51`	`#- name: Run type checker`
`43`	`52`	`# run: ./vendor/bin/psalm`

Lines changed: 2 additions & 2 deletions

Comments

(0)