Skip to content

Commit

Permalink
Merge pull request #112 from lolli42/lolli-1
Browse files Browse the repository at this point in the history
[TASK] Allow PHP 8
  • Loading branch information
bmack authored Mar 2, 2021
2 parents f626998 + ffc02d9 commit f307b64
Show file tree
Hide file tree
Showing 3 changed files with 5 additions and 6 deletions.
3 changes: 1 addition & 2 deletions .github/workflows/ci.yml
Original file line number Diff line number Diff line change
Expand Up @@ -11,11 +11,10 @@ jobs:
fail-fast: false
matrix:
php-versions:
- "7.0"
- "7.1"
- "7.2"
- "7.3"
- "7.4"
- "8.0"
composer-versions:
- "v1"
- "v2"
Expand Down
4 changes: 2 additions & 2 deletions composer.json
Original file line number Diff line number Diff line change
Expand Up @@ -38,13 +38,13 @@
"netresearch/composer-installers": "*"
},
"require": {
"php": ">=7.0.0 <7.5",
"php": "^7.2 || ^8.0",
"composer-plugin-api": "^1.0.0 || ^2.0.0"
},
"require-dev": {
"composer/composer": "1.2.*@dev || 2.0.*@dev",
"overtrue/phplint": "^2.0",
"phpunit/phpunit": "^6.5"
"phpunit/phpunit": "^8.5"
},
"conflict": {
"composer/installers": "<1.0.24 || >1.0.24"
Expand Down
4 changes: 2 additions & 2 deletions tests/Installer/InstallerTestCase.php
Original file line number Diff line number Diff line change
Expand Up @@ -62,7 +62,7 @@ class InstallerTestCase extends TestCase
*/
protected $io;

protected function setUp()
protected function setUp(): void
{
$this->previousDirectory = getcwd();
$this->rootDirectory = TestCase::getUniqueTmpDirectory();
Expand All @@ -87,7 +87,7 @@ protected function setUp()
$this->io = $this->createMock(IOInterface::class);
}

protected function tearDown()
protected function tearDown(): void
{
chdir($this->previousDirectory);
if (is_dir($this->rootDirectory)) {
Expand Down

0 comments on commit f307b64

Please sign in to comment.