Skip to content

Commit

Permalink
upgrade to php 8 / phpunit 9 (#11)
Browse files Browse the repository at this point in the history
* upgrade to php 8 / phpunit 9
  • Loading branch information
maglnet authored May 4, 2021
1 parent 6e3bf3b commit 2730281
Show file tree
Hide file tree
Showing 4 changed files with 16 additions and 23 deletions.
29 changes: 12 additions & 17 deletions .travis.yml
Original file line number Diff line number Diff line change
@@ -1,22 +1,16 @@
language: php

matrix:
fast_finish: true
include:
- php: 7.0
env:
- PREFER_LOWEST="--prefer-stable --prefer-lowest"
- COVERAGE=1
- php: 7.1
- php: 7.2
env:
- DEP_CHECK=1
- php: nightly
- php: hhvm
allow_failures:
- php: hhvm
- php: nightly

fast_finish: true
include:
- php: 7.3
env:
- PREFER_LOWEST="--prefer-stable --prefer-lowest"
- COVERAGE=1
- php: 7.4
env:
- DEP_CHECK=1
- php: 8.0

before_script:
- composer self-update
Expand All @@ -25,7 +19,8 @@ before_script:


script:
- phpunit -c tests
- export XDEBUG_MODE=coverage
- vendor/bin/phpunit -c tests
- if [ $DEP_CHECK = "1" ]; then php composer-require-checker.phar; fi

after_script:
Expand Down
4 changes: 2 additions & 2 deletions composer.json
Original file line number Diff line number Diff line change
Expand Up @@ -17,7 +17,7 @@
}
],
"require": {
"php": "^7.0",
"php": "^7.3 || ^8.0",
"ext-curl": "*",
"ext-json": "*",
"michelf/php-markdown": "^1.4",
Expand All @@ -35,7 +35,7 @@
"container-interop/container-interop": "^1.1"
},
"require-dev": {
"phpunit/phpunit": "^6.0",
"phpunit/phpunit": "^9",
"zendframework/zend-log": "^2.4",
"zendframework/zend-i18n": "^2.4",
"zendframework/zend-console": "^2.4",
Expand Down
2 changes: 1 addition & 1 deletion tests/MaglMarkdownTest/ModuleTest.php
Original file line number Diff line number Diff line change
Expand Up @@ -19,7 +19,7 @@ class ModuleTest extends \PHPUnit\Framework\TestCase
*/
private $instance;

public function setUp()
public function setUp(): void
{
$this->instance = new Module();
}
Expand Down
4 changes: 1 addition & 3 deletions tests/phpunit.xml
Original file line number Diff line number Diff line change
Expand Up @@ -13,8 +13,6 @@
</filter>
<logging>
<log type="coverage-clover" target="./log/coverage.xml"/>
<log type="coverage-text" target="php://stdout"/>
</logging>
<logging>
<log type="coverage-text" target="php://stdout"/>
</logging>
</phpunit>

0 comments on commit 2730281

Please sign in to comment.