Upgrade to phpunit 10 (#1806)

Chris53897 · Chris8934 · web-flow · commit 856113021504 · 2023-06-20T15:56:11.000+02:00
Co-authored-by: Christopher Georg &lt;christopher.georg@sr-travel.de&gt;
diff --git a/.github/workflows/continuous-integration.yml b/.github/workflows/continuous-integration.yml
@@ -77,15 +77,15 @@ jobs:
           composer-options: "${{ matrix.composer-options }}"
 
       - name: "Run tests"
-        run: "composer exec phpunit -- --exclude-group Elasticsearch,Elastica --verbose"
+        run: "composer exec phpunit -- --exclude-group Elasticsearch,Elastica"
 
       - name: "Run tests with psr/log 3"
         if: "contains(matrix.dependencies, 'highest') && matrix.php-version >= '8.0'"
         run: |
           composer remove --no-update --dev graylog2/gelf-php ruflin/elastica elasticsearch/elasticsearch rollbar/rollbar
           composer require --no-update psr/log:^3
           composer update ${{ matrix.composer-options }}
-          composer exec phpunit -- --exclude-group Elasticsearch,Elastica --verbose
+          composer exec phpunit -- --exclude-group Elasticsearch,Elastica
 
   tests-es-7:
     name: "CI with ES ${{ matrix.es-version }} on PHP ${{ matrix.php-version }}"
@@ -152,7 +152,7 @@ jobs:
           dependency-versions: "${{ matrix.dependencies }}"
 
       - name: "Run tests"
-        run: "composer exec phpunit -- --group Elasticsearch,Elastica --verbose"
+        run: "composer exec phpunit -- --group Elasticsearch,Elastica"
 
       - name: "Run tests with psr/log 3"
         if: "contains(matrix.dependencies, 'highest') && matrix.php-version >= '8.0'"
@@ -161,7 +161,7 @@ jobs:
           composer require --no-update --no-interaction --dev ruflin/elastica elasticsearch/elasticsearch:^7
           composer require --no-update psr/log:^3
           composer update -W
-          composer exec phpunit -- --group Elasticsearch,Elastica --verbose
+          composer exec phpunit -- --group Elasticsearch,Elastica
 
   tests-es-8:
     name: "CI with ES ${{ matrix.es-version }} on PHP ${{ matrix.php-version }}"
@@ -230,11 +230,11 @@ jobs:
           dependency-versions: "${{ matrix.dependencies }}"
 
       - name: "Run tests"
-        run: "composer exec phpunit -- --group Elasticsearch,Elastica --verbose"
+        run: "composer exec phpunit -- --group Elasticsearch,Elastica"
 
       - name: "Run tests with psr/log 3"
         if: "contains(matrix.dependencies, 'highest') && matrix.php-version >= '8.0'"
         run: |
           composer require --no-update psr/log:^3
           composer update -W
-          composer exec phpunit -- --group Elasticsearch,Elastica --verbose
+          composer exec phpunit -- --group Elasticsearch,Elastica
diff --git a/.gitignore b/.gitignore
@@ -6,3 +6,4 @@ composer.lock
 .php-cs-fixer.cache
 .hg
 .phpunit.result.cache
+.phpunit.cache
diff --git a/composer.json b/composer.json
@@ -29,7 +29,7 @@
         "phpstan/phpstan": "^1.9",
         "phpstan/phpstan-deprecation-rules": "^1.0",
         "phpstan/phpstan-strict-rules": "^1.4",
-        "phpunit/phpunit": "^9.5.26",
+        "phpunit/phpunit": "^10.1",
         "predis/predis": "^1.1 || ^2",
         "ruflin/elastica": "^7",
         "symfony/mailer": "^5.4 || ^6",
diff --git a/phpunit.xml.dist b/phpunit.xml.dist
@@ -1,24 +1,25 @@
 <?xml version="1.0" encoding="UTF-8"?>
+<phpunit xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
+         xsi:noNamespaceSchemaLocation="vendor/phpunit/phpunit/phpunit.xsd"
+         bootstrap="tests/bootstrap.php"
+         colors="true"
+         beStrictAboutTestsThatDoNotTestAnything="false">
+  <testsuites>
+    <testsuite name="Monolog Test Suite">
+      <directory>tests/Monolog/</directory>
+    </testsuite>
+  </testsuites>
 
-<phpunit
-        xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
-        xsi:noNamespaceSchemaLocation="./vendor/phpunit/phpunit/phpunit.xsd"
-        bootstrap="tests/bootstrap.php" colors="true"
-        beStrictAboutTestsThatDoNotTestAnything="false"
->
-    <testsuites>
-        <testsuite name="Monolog Test Suite">
-            <directory>tests/Monolog/</directory>
-        </testsuite>
-    </testsuites>
+  <coverage/>
 
-    <coverage>
-        <include>
-            <directory suffix=".php">src/Monolog/</directory>
-        </include>
-    </coverage>
+  <php>
+    <ini name="date.timezone" value="UTC"/>
+  </php>
+
+  <source>
+    <include>
+      <directory suffix=".php">src/Monolog/</directory>
+    </include>
+  </source>
 
-    <php>
-        <ini name="date.timezone" value="UTC"/>
-    </php>
 </phpunit>
diff --git a/tests/Monolog/ErrorHandlerTest.php b/tests/Monolog/ErrorHandlerTest.php
@@ -51,7 +51,7 @@ public function testHandleError()
         }
     }
 
-    public function fatalHandlerProvider()
+    public static function fatalHandlerProvider()
     {
         return [
             [null, 10, str_repeat(' ', 1024 * 10), LogLevel::ALERT],
diff --git a/tests/Monolog/Formatter/JsonFormatterTest.php b/tests/Monolog/Formatter/JsonFormatterTest.php
@@ -327,7 +327,7 @@ class TestJsonNormPrivate
 
 class TestJsonNormWithToStringAndJson implements JsonSerializable
 {
-    public function jsonSerialize()
+    public function jsonSerialize(): mixed
     {
         return ['json serialized'];
     }
diff --git a/tests/Monolog/Formatter/LineFormatterTest.php b/tests/Monolog/Formatter/LineFormatterTest.php
@@ -160,15 +160,15 @@ public function testDefFormatWithExceptionAndStacktraceParserFull()
 
         $trace = explode('[stacktrace]', $message, 2)[1];
 
-        $this->assertStringContainsString('TestCase.php', $trace);
-        $this->assertStringContainsString('TestResult.php', $trace);
+        $this->assertStringContainsString('TestSuite.php', $trace);
+        $this->assertStringContainsString('TestRunner.php', $trace);
     }
 
     public function testDefFormatWithExceptionAndStacktraceParserCustom()
     {
         $formatter = new LineFormatter(null, 'Y-m-d');
         $formatter->includeStacktraces(true, function ($line) {
-            if (strpos($line, 'TestCase.php') === false) {
+            if (strpos($line, 'TestSuite.php') === false) {
                 return $line;
             }
         });
@@ -177,8 +177,8 @@ public function testDefFormatWithExceptionAndStacktraceParserCustom()
 
         $trace = explode('[stacktrace]', $message, 2)[1];
 
-        $this->assertStringNotContainsString('TestCase.php', $trace);
-        $this->assertStringContainsString('TestResult.php', $trace);
+        $this->assertStringNotContainsString('TestSuite.php', $trace);
+        $this->assertStringContainsString('TestRunner.php', $trace);
     }
 
     public function testDefFormatWithExceptionAndStacktraceParserEmpty()
diff --git a/tests/Monolog/Formatter/MongoDBFormatterTest.php b/tests/Monolog/Formatter/MongoDBFormatterTest.php
@@ -29,7 +29,7 @@ public function setUp(): void
         }
     }
 
-    public function constructArgumentProvider()
+    public static function constructArgumentProvider()
     {
         return [
             [1, true, 1, true],
diff --git a/tests/Monolog/Formatter/SyslogFormatterTest.php b/tests/Monolog/Formatter/SyslogFormatterTest.php
@@ -64,7 +64,7 @@ public function testFormat(
     /**
      * @return mixed[]
      */
-    public function formatDataProvider(): array
+    public static function formatDataProvider(): array
     {
         return [
             'error' => [
diff --git a/tests/Monolog/Handler/ElasticaHandlerTest.php b/tests/Monolog/Handler/ElasticaHandlerTest.php
@@ -146,7 +146,7 @@ public function testConnectionErrors($ignore, $expectedError)
         }
     }
 
-    public function providerTestConnectionErrors(): array
+    public static function providerTestConnectionErrors(): array
     {
         return [
             [false, ['RuntimeException', 'Error sending messages to Elasticsearch']],
diff --git a/tests/Monolog/Handler/ElasticsearchHandlerTest.php b/tests/Monolog/Handler/ElasticsearchHandlerTest.php
@@ -128,7 +128,7 @@ public function testConnectionErrors($ignore, $expectedError)
         }
     }
 
-    public function providerTestConnectionErrors(): array
+    public static function providerTestConnectionErrors(): array
     {
         return [
             [false, ['RuntimeException', 'Error sending messages to Elasticsearch']],
diff --git a/tests/Monolog/Handler/HandlerWrapperTest.php b/tests/Monolog/Handler/HandlerWrapperTest.php
@@ -37,7 +37,7 @@ public function tearDown(): void
         unset($this->wrapper);
     }
 
-    public function trueFalseDataProvider(): array
+    public static function trueFalseDataProvider(): array
     {
         return [
             [true],
diff --git a/tests/Monolog/Handler/NoopHandlerTest.php b/tests/Monolog/Handler/NoopHandlerTest.php
@@ -37,7 +37,7 @@ public function testHandle(Level $level)
         $this->assertFalse($handler->handle($this->getRecord($level)));
     }
 
-    public function logLevelsProvider()
+    public static function logLevelsProvider()
     {
         return array_map(
             fn ($level) => [$level],
diff --git a/tests/Monolog/Handler/ProcessHandlerTest.php b/tests/Monolog/Handler/ProcessHandlerTest.php
@@ -46,9 +46,16 @@ public function testWriteOpensProcessAndWritesToStdInOfProcess()
 
         $handler = $mockBuilder->getMock();
 
-        $handler->expects($this->exactly(2))
+        $matcher = $this->exactly(2);
+        $handler->expects($matcher)
             ->method('writeProcessInput')
-            ->withConsecutive([$this->stringContains($fixtures[0])], [$this->stringContains($fixtures[1])]);
+            ->willReturnCallback(function () use ($matcher, $fixtures) {
+                match ($matcher->numberOfInvocations()) {
+                    1 =>  $this->stringContains($fixtures[0]),
+                    2 =>  $this->stringContains($fixtures[1]),
+                };
+            })
+        ;
 
         /** @var ProcessHandler $handler */
         $handler->handle($this->getRecord(Level::Warning, $fixtures[0]));
@@ -58,7 +65,7 @@ public function testWriteOpensProcessAndWritesToStdInOfProcess()
     /**
      * Data provider for invalid commands.
      */
-    public function invalidCommandProvider(): array
+    public static function invalidCommandProvider(): array
     {
         return [
             [1337, 'TypeError'],
@@ -82,7 +89,7 @@ public function testConstructWithInvalidCommandThrowsInvalidArgumentException($i
     /**
      * Data provider for invalid CWDs.
      */
-    public function invalidCwdProvider(): array
+    public static function invalidCwdProvider(): array
     {
         return [
             [1337, 'TypeError'],
diff --git a/tests/Monolog/Handler/PsrHandlerTest.php b/tests/Monolog/Handler/PsrHandlerTest.php
@@ -20,7 +20,7 @@
  */
 class PsrHandlerTest extends TestCase
 {
-    public function logLevelProvider()
+    public static function logLevelProvider()
     {
         return array_map(
             fn (Level $level) => [$level->toPsrLogLevel(), $level],
diff --git a/tests/Monolog/Handler/RotatingFileHandlerTest.php b/tests/Monolog/Handler/RotatingFileHandlerTest.php
@@ -47,7 +47,7 @@ public function tearDown(): void
             unlink($file);
         }
 
-        if ('testRotationWithFolderByDate' === $this->getName(false)) {
+        if ('testRotationWithFolderByDate' === $this->name()) {
             foreach (glob(__DIR__.'/Fixtures/[0-9]*') as $folder) {
                 $this->rrmdir($folder);
             }
@@ -137,7 +137,7 @@ public function testRotation($createFile, $dateFormat, $timeCallback)
         $this->assertEquals('test', file_get_contents($log));
     }
 
-    public function rotationTests()
+    public static function rotationTests()
     {
         $now = time();
         $dayCallback = function ($ago) use ($now) {
@@ -207,7 +207,7 @@ public function testRotationWithFolderByDate($createFile, $dateFormat, $timeCall
         $this->assertEquals('test', file_get_contents($log));
     }
 
-    public function rotationWithFolderByDateTests()
+    public static function rotationWithFolderByDateTests()
     {
         $now = time();
         $dayCallback = function ($ago) use ($now) {
@@ -252,7 +252,7 @@ public function testAllowOnlyFixedDefinedDateFormats($dateFormat, $valid)
         $this->assertTrue(true);
     }
 
-    public function dateFormatProvider()
+    public static function dateFormatProvider()
     {
         return [
             [RotatingFileHandler::FILE_PER_DAY, true],
@@ -293,7 +293,7 @@ public function testDisallowFilenameFormatsWithoutDate($filenameFormat, $valid)
         $handler->setFilenameFormat($filenameFormat, RotatingFileHandler::FILE_PER_DAY);
     }
 
-    public function filenameFormatProvider()
+    public static function filenameFormatProvider()
     {
         return [
             ['{filename}', false],
@@ -326,7 +326,7 @@ public function testRotationWhenSimilarFileNamesExist($dateFormat)
         $this->assertTrue(file_exists($log));
     }
 
-    public function rotationWhenSimilarFilesExistTests()
+    public static function rotationWhenSimilarFilesExistTests()
     {
         return [
             'Rotation is triggered when the file of the current day is not present but similar exists'
diff --git a/tests/Monolog/Handler/Slack/SlackRecordTest.php b/tests/Monolog/Handler/Slack/SlackRecordTest.php
@@ -19,7 +19,7 @@
  */
 class SlackRecordTest extends TestCase
 {
-    public function dataGetAttachmentColor()
+    public static function dataGetAttachmentColor()
     {
         return [
             [Level::Debug, SlackRecord::COLOR_DEFAULT],
@@ -64,7 +64,7 @@ public function testNoUsernameByDefault()
         $this->assertArrayNotHasKey('username', $data);
     }
 
-    public function dataStringify(): array
+    public static function dataStringify(): array
     {
         $multipleDimensions = [[1, 2]];
         $numericKeys = ['library' => 'monolog'];
diff --git a/tests/Monolog/Handler/SlackHandlerTest.php b/tests/Monolog/Handler/SlackHandlerTest.php
@@ -116,7 +116,7 @@ public function testWriteContentWithPlainTextMessage()
         $this->assertMatchesRegularExpression('/text=test1/', $content);
     }
 
-    public function provideLevelColors()
+    public static function provideLevelColors()
     {
         return [
             [Level::Debug,    urlencode(SlackRecord::COLOR_DEFAULT)],
diff --git a/tests/Monolog/Handler/StreamHandlerTest.php b/tests/Monolog/Handler/StreamHandlerTest.php
@@ -117,7 +117,7 @@ public function testWriteMissingResource()
         $handler->handle($this->getRecord());
     }
 
-    public function invalidArgumentProvider()
+    public static function invalidArgumentProvider()
     {
         return [
             [1],
@@ -232,7 +232,7 @@ public function testWriteNonExistingAndNotCreatablePath($nonExistingAndNotCreata
         $handler->handle($this->getRecord());
     }
 
-    public function provideNonExistingAndNotCreatablePath()
+    public static function provideNonExistingAndNotCreatablePath()
     {
         return [
             '/foo/bar/…' => [
@@ -244,7 +244,7 @@ public function provideNonExistingAndNotCreatablePath()
         ];
     }
 
-    public function provideMemoryValues()
+    public static function provideMemoryValues()
     {
         return [
             ['1M', (int) (1024*1024/10)],
diff --git a/tests/Monolog/Handler/SyslogUdpHandlerTest.php b/tests/Monolog/Handler/SyslogUdpHandlerTest.php
diff --git a/tests/Monolog/Handler/TestHandlerTest.php b/tests/Monolog/Handler/TestHandlerTest.php
diff --git a/tests/Monolog/LoggerTest.php b/tests/Monolog/LoggerTest.php
diff --git a/tests/Monolog/Processor/ClosureContextProcessorTest.php b/tests/Monolog/Processor/ClosureContextProcessorTest.php
diff --git a/tests/Monolog/Processor/PsrLogMessageProcessorTest.php b/tests/Monolog/Processor/PsrLogMessageProcessorTest.php
diff --git a/tests/Monolog/PsrLogCompatTest.php b/tests/Monolog/PsrLogCompatTest.php
diff --git a/tests/Monolog/RegistryTest.php b/tests/Monolog/RegistryTest.php
diff --git a/tests/Monolog/SignalHandlerTest.php b/tests/Monolog/SignalHandlerTest.php
diff --git a/tests/Monolog/UtilsTest.php b/tests/Monolog/UtilsTest.php

Original file line number	Diff line number	Diff line change
`@@ -51,7 +51,7 @@ public function testHandleError()`
`51`	`51`	`}`
`52`	`52`	`}`
`53`	`53`
`54`		`- public function fatalHandlerProvider()`
	`54`	`+ public static function fatalHandlerProvider()`
`55`	`55`	`{`
`56`	`56`	`return [`
`57`	`57`	`[null, 10, str_repeat(' ', 1024 * 10), LogLevel::ALERT],`
Original file line number	Diff line number	Diff line change
`@@ -327,7 +327,7 @@ class TestJsonNormPrivate`
`327`	`327`
`328`	`328`	`class TestJsonNormWithToStringAndJson implements JsonSerializable`
`329`	`329`	`{`
`330`		`- public function jsonSerialize()`
	`330`	`+ public function jsonSerialize(): mixed`
`331`	`331`	`{`
`332`	`332`	`return ['json serialized'];`
`333`	`333`	`}`
Original file line number	Diff line number	Diff line change
`@@ -160,15 +160,15 @@ public function testDefFormatWithExceptionAndStacktraceParserFull()`
`160`	`160`
`161`	`161`	`$trace = explode('[stacktrace]', $message, 2)[1];`
`162`	`162`
`163`		`- $this->assertStringContainsString('TestCase.php', $trace);`
`164`		`- $this->assertStringContainsString('TestResult.php', $trace);`
	`163`	`+ $this->assertStringContainsString('TestSuite.php', $trace);`
	`164`	`+ $this->assertStringContainsString('TestRunner.php', $trace);`
`165`	`165`	`}`
`166`	`166`
`167`	`167`	`public function testDefFormatWithExceptionAndStacktraceParserCustom()`
`168`	`168`	`{`
`169`	`169`	`$formatter = new LineFormatter(null, 'Y-m-d');`
`170`	`170`	`$formatter->includeStacktraces(true, function ($line) {`
`171`		`- if (strpos($line, 'TestCase.php') === false) {`
	`171`	`+ if (strpos($line, 'TestSuite.php') === false) {`
`172`	`172`	`return $line;`
`173`	`173`	`}`
`174`	`174`	`});`
`@@ -177,8 +177,8 @@ public function testDefFormatWithExceptionAndStacktraceParserCustom()`
`177`	`177`
`178`	`178`	`$trace = explode('[stacktrace]', $message, 2)[1];`
`179`	`179`
`180`		`- $this->assertStringNotContainsString('TestCase.php', $trace);`
`181`		`- $this->assertStringContainsString('TestResult.php', $trace);`
	`180`	`+ $this->assertStringNotContainsString('TestSuite.php', $trace);`
	`181`	`+ $this->assertStringContainsString('TestRunner.php', $trace);`
`182`	`182`	`}`
`183`	`183`
`184`	`184`	`public function testDefFormatWithExceptionAndStacktraceParserEmpty()`
Original file line number	Diff line number	Diff line change
`@@ -29,7 +29,7 @@ public function setUp(): void`
`29`	`29`	`}`
`30`	`30`	`}`
`31`	`31`
`32`		`- public function constructArgumentProvider()`
	`32`	`+ public static function constructArgumentProvider()`
`33`	`33`	`{`
`34`	`34`	`return [`
`35`	`35`	`[1, true, 1, true],`
Original file line number	Diff line number	Diff line change
`@@ -64,7 +64,7 @@ public function testFormat(`
`64`	`64`	`/**`
`65`	`65`	`* @return mixed[]`
`66`	`66`	`*/`
`67`		`- public function formatDataProvider(): array`
	`67`	`+ public static function formatDataProvider(): array`
`68`	`68`	`{`
`69`	`69`	`return [`
`70`	`70`	`'error' => [`
Original file line number	Diff line number	Diff line change
`@@ -146,7 +146,7 @@ public function testConnectionErrors($ignore, $expectedError)`
`146`	`146`	`}`
`147`	`147`	`}`
`148`	`148`
`149`		`- public function providerTestConnectionErrors(): array`
	`149`	`+ public static function providerTestConnectionErrors(): array`
`150`	`150`	`{`
`151`	`151`	`return [`
`152`	`152`	`[false, ['RuntimeException', 'Error sending messages to Elasticsearch']],`