Skip to content

Commit

Permalink
Add PHP 8 testrunner, update composer.json and small fix in OrmFuncti…
Browse files Browse the repository at this point in the history
…onalTestCase for new PHPUnit behvaior
  • Loading branch information
beberlei committed Nov 7, 2020
1 parent fe6eeb2 commit 9f46d7d
Show file tree
Hide file tree
Showing 3 changed files with 3 additions and 2 deletions.
1 change: 1 addition & 0 deletions .github/workflows/continuous-integration.yml
Original file line number Diff line number Diff line change
Expand Up @@ -18,6 +18,7 @@ jobs:
- "7.2"
- "7.3"
- "7.4"
- "8.0"
deps:
- "normal"
include:
Expand Down
2 changes: 1 addition & 1 deletion composer.json
Original file line number Diff line number Diff line change
Expand Up @@ -16,7 +16,7 @@
"sort-packages": true
},
"require": {
"php": "^7.2",
"php": "^7.2|^8.0",
"ext-pdo": "*",
"composer/package-versions-deprecated": "^1.8",
"doctrine/annotations": "^1.11.1",
Expand Down
2 changes: 1 addition & 1 deletion tests/Doctrine/Tests/OrmFunctionalTestCase.php
Original file line number Diff line number Diff line change
Expand Up @@ -787,7 +787,7 @@ protected function _getEntityManager(
*/
protected function onNotSuccessfulTest(Throwable $e) : void
{
if ($e instanceof AssertionFailedError) {
if ($e instanceof AssertionFailedError || $e instanceof Warning) {
throw $e;
}

Expand Down

0 comments on commit 9f46d7d

Please sign in to comment.