diff options
author | Stefan Giehl <stefan@matomo.org> | 2021-08-17 10:58:59 +0300 |
---|---|---|
committer | GitHub <noreply@github.com> | 2021-08-17 10:58:59 +0300 |
commit | 0829d6e6ac487bf47e4197123d6683b271db8266 (patch) | |
tree | 77f8edd0c326b29c50d9fefd174cd45d5ebcbc92 /plugins/Monolog | |
parent | 8c7fa7d8d414b5201c36661fb4828d14e4c33c53 (diff) |
Run AllTests on PHP8 (#16897)
* Run AllTests on PHP8
* use newer phpunit for tests on PHP8
* fix notices/errors
* handle trace of phpunit 9
* ensure to compare same types for range check
* adjust expected result for php8
* try handling hasDependencies does not exist in PHPUnit 9
* fix: ArgumentCountError: mysqli_stmt::bind_param() does not accept unknown named parameters
* Fix usercountry tests
* remove incorrect date check
* fix expected exception message
* fix referrers api test for php8
* add test hint
* try to fix session related tests
* debug test failure
* try to fix mail tests
* fix filterUser method
* exlucde phpunit from build size calculation
* fix scheduled reports test
* update release checklist test
* unset climode
* improves some tests
Diffstat (limited to 'plugins/Monolog')
-rw-r--r-- | plugins/Monolog/tests/Unit/Processor/ExceptionToTextProcessorTest.php | 19 |
1 files changed, 14 insertions, 5 deletions
diff --git a/plugins/Monolog/tests/Unit/Processor/ExceptionToTextProcessorTest.php b/plugins/Monolog/tests/Unit/Processor/ExceptionToTextProcessorTest.php index e06049f8ba..eb427bf01c 100644 --- a/plugins/Monolog/tests/Unit/Processor/ExceptionToTextProcessorTest.php +++ b/plugins/Monolog/tests/Unit/Processor/ExceptionToTextProcessorTest.php @@ -8,13 +8,13 @@ namespace Piwik\Plugins\Monolog\tests\Unit\Processor; +use PHPUnit\Runner\Version; use Piwik\Access; use Piwik\Common; use Piwik\Db; use Piwik\Log; use Piwik\Piwik; use Piwik\Plugins\Monolog\Processor\ExceptionToTextProcessor; -use Piwik\SettingsPiwik; /** * @group Log @@ -167,7 +167,7 @@ test message #11 {main} EOI; - $this->assertEquals($expected, $wholeTrace); + $this->assertEquals($this->handleNewerPHPUnitTrace($expected), $wholeTrace); } public function test_getMessageAndWholeBacktrace_printsBacktraceIf_PIWIK_PRINT_ERROR_BACKTRACE_isDefined() @@ -196,7 +196,7 @@ test message #11 {main} EOI; - $this->assertEquals($expected, $wholeTrace); + $this->assertEquals($this->handleNewerPHPUnitTrace($expected), $wholeTrace); } public function test_getMessageAndWholeBacktrace_printsBacktraceIf_PIWIK_TRACKER_DEBUG_globalIsSet() @@ -225,7 +225,7 @@ test message #11 {main} EOI; - $this->assertEquals($expected, $wholeTrace); + $this->assertEquals($this->handleNewerPHPUnitTrace($expected), $wholeTrace); } public function test_getMessageAndWholeBacktrace_handlesArrayInput_whenBacktraceIsEnabled() @@ -315,6 +315,15 @@ caused by: caused by 2 #11 {main} EOI; - $this->assertEquals($expected, $wholeTrace); + $this->assertEquals($this->handleNewerPHPUnitTrace($expected), $wholeTrace); + } + + private function handleNewerPHPUnitTrace($input) + { + if (version_compare(Version::id(), '9.0', '>=')) { + $input = str_replace('TestRunner->doRun', 'TestRunner->run', $input); + } + + return $input; } } |