chore(deps): update dependency phpunit/phpunit to v12 (#275)

* chore(deps): update dependency phpunit/phpunit to v12 * fix test * fix test part 2 --------- Co-authored-by: renovate[bot] <29139614+renovate[bot]@users.noreply.github.com> Co-authored-by: Antoine Giasson <[email protected]>
kronostechnologies · Feb 10, 2025 · 3690457 · 3690457
1 parent 4f3ec70
commit 3690457
Show file tree

Hide file tree

Showing 9 changed files with 239 additions and 379 deletions.
diff --git a/composer.json b/composer.json
@@ -32,7 +32,7 @@
   "require-dev": {
     "guzzlehttp/guzzle": "7.9.2",
     "fluent/logger": "1.0.1",
-    "phpunit/phpunit": "11.5.7",
+    "phpunit/phpunit": "12.0.2",
     "vimeo/psalm": "6.5.0",
     "dealerdirect/phpcodesniffer-composer-installer": "1.0.0",
     "phpcompatibility/php-compatibility": "9.3.5",

diff --git a/composer.lock b/composer.lock
diff --git a/tests/LogLevelHelperTest.php b/tests/LogLevelHelperTest.php
@@ -2,6 +2,7 @@
 
 use Kronos\Log\Exception\InvalidLogLevel;
 use Kronos\Log\LogLevelHelper;
+use PHPUnit\Framework\Attributes\DataProvider;
 use PHPUnit\Framework\TestCase;
 use Psr\Log\LogLevel;
 
@@ -14,9 +15,7 @@ public function test_isLower_shouldReturnFalseWhenLevelIsEqual(): void
         self::assertFalse($isLower);
     }
 
-    /**
-     * @dataProvider provideLevels
-     */
+    #[DataProvider('provideLevels')]
     public function test_isLower_shouldReturnFalseWhenLevelIsHigher($baseLevel, $toCompare): void
     {
         $isLower = LogLevelHelper::isLower($baseLevel, $toCompare);

diff --git a/tests/LoggerDecoratorTest.php b/tests/LoggerDecoratorTest.php
@@ -3,6 +3,7 @@
 use Kronos\Log\Logger;
 use Kronos\Log\LoggerDecorator;
 use Kronos\Log\LoggerInterface;
+use PHPUnit\Framework\Attributes\DataProvider;
 use PHPUnit\Framework\MockObject\MockObject;
 use PHPUnit\Framework\TestCase;
 use Psr\Log\LoggerInterface as PsrLoggerInterface;
@@ -28,9 +29,7 @@ public function test_shouldLogWhenMessageLevelIsHigherThanLogger(): void
         $decorator->log(LogLevel::WARNING, 'a message');
     }
 
-    /**
-     * @dataProvider  provideLowerLogLevels
-     */
+    #[DataProvider('provideLowerLogLevels')]
     public function test_shouldNotLogWhenLoggerLevelIsHigherThanMessage($loggerLevel, $levelOfMessage): void
     {
         $decorator = $this->givenDecoratorForPsrLoggerInterface();

diff --git a/tests/Traits/InterpolateTest.php b/tests/Traits/InterpolateTest.php
@@ -1,32 +1,26 @@
 <?php
 
-namespace Kronos\Tests\Log;
+namespace Kronos\Tests\Log\Traits;
 
 use Kronos\Log\Traits\Interpolate;
 use Kronos\Tests\Log\Formatter\ObjectWithoutToString;
 use Kronos\Tests\Log\Formatter\ObjectWithToString;
+use PHPUnit\Framework\TestCase;
 
-class InterpolateTest extends \PHPUnit\Framework\TestCase
+class InterpolateTest extends TestCase
 {
-
+    use Interpolate;
     const A_MESSAGE = 'Some message {key}';
     const INTERPOLATED_MESSAGE = 'Some message value';
     const KEY = 'key';
     const VALUE = 'value';
     const MESSAGE_WITH_UNDEFINED = 'Some message ~UNDEFINED~';
 
-    private $interpolator;
-
-    public function setUp(): void
-    {
-        $this->interpolator = $this->getMockForTrait(Interpolate::class);
-    }
-
     public function test_MessageWithPlaceholder_Interpolate_ShouldReplacePlaceholderWithContextValue()
     {
         $original_message = self::A_MESSAGE;
 
-        $interpolated_message = $this->interpolator->interpolate($original_message, [self::KEY => self::VALUE]);
+        $interpolated_message = $this->interpolate($original_message, [self::KEY => self::VALUE]);
 
         $this->assertEquals(self::INTERPOLATED_MESSAGE, $interpolated_message);
     }
@@ -35,7 +29,7 @@ public function test_ContextWithoutMessagePlaceholder_Interpolate_ShouldReplaceP
     {
         $original_message = self::A_MESSAGE;
 
-        $interpolated_message = $this->interpolator->interpolate($original_message, []);
+        $interpolated_message = $this->interpolate($original_message, []);
 
         $this->assertEquals(self::MESSAGE_WITH_UNDEFINED, $interpolated_message);
     }
@@ -46,7 +40,7 @@ public function test_ObjectInContext_Interpolate_ShouldReplaceWithUndefined()
         $object = new ObjectWithoutToString();
         $object->property = 'value';
 
-        $interpolated_message = $this->interpolator->interpolate($original_message, [self::KEY => $object]);
+        $interpolated_message = $this->interpolate($original_message, [self::KEY => $object]);
 
         $this->assertEquals(self::MESSAGE_WITH_UNDEFINED, $interpolated_message);
     }
@@ -58,7 +52,7 @@ public function test_ObjectWithToStringInContext_Interpolate_ShouldReplacePlaceh
         $object->property = 'value';
         $expectedMessage = str_replace('{' . self::KEY . '}', (string)$object, self::A_MESSAGE);
 
-        $interpolated_message = $this->interpolator->interpolate($original_message, [self::KEY => $object]);
+        $interpolated_message = $this->interpolate($original_message, [self::KEY => $object]);
 
         $this->assertEquals($expectedMessage, $interpolated_message);
     }
@@ -68,7 +62,7 @@ public function test_ArrayInContext_Interpolate_ShouldReplaceWithUndefined()
         $original_message = self::A_MESSAGE;
         $array = ['index' => 'value'];
 
-        $interpolated_message = $this->interpolator->interpolate($original_message, [self::KEY => $array]);
+        $interpolated_message = $this->interpolate($original_message, [self::KEY => $array]);
 
         $this->assertEquals(self::MESSAGE_WITH_UNDEFINED, $interpolated_message);
     }
@@ -79,7 +73,7 @@ public function test_ZeroInContext_Interpolate_ShouldReplaceWithZero()
         $value = 0;
         $expectedMessage = str_replace('{' . self::KEY . '}', $value, self::A_MESSAGE);
 
-        $interpolated_message = $this->interpolator->interpolate($original_message, [self::KEY => $value]);
+        $interpolated_message = $this->interpolate($original_message, [self::KEY => $value]);
 
         $this->assertEquals($expectedMessage, $interpolated_message);
     }

diff --git a/tests/Traits/PrependContextTest.php b/tests/Traits/PrependContextTest.php
@@ -3,9 +3,11 @@
 namespace Kronos\Tests\Log\Traits;
 
 use Kronos\Log\Traits\PrependContext;
+use PHPUnit\Framework\TestCase;
 
-class PrependContextTest extends \PHPUnit\Framework\TestCase
+class PrependContextTest extends TestCase
 {
+    use PrependContext;
 
     const A_MESSAGE = 'a message';
     const CONTEXT_KEY = 'key';
@@ -18,14 +20,9 @@ class PrependContextTest extends \PHPUnit\Framework\TestCase
 
     private $context_prepender;
 
-    public function setUp(): void
-    {
-        $this->context_prepender = $this->getMockForTrait(PrependContext::class);
-    }
-
     public function test_NewPrependContext_PrependContext_ShouldReturnMessageUnchanged()
     {
-        $returned_message = $this->context_prepender->prependContext(self::A_MESSAGE, []);
+        $returned_message = $this->prependContext(self::A_MESSAGE, []);
 
         $this->assertEquals(self::A_MESSAGE, $returned_message);
     }
@@ -35,9 +32,9 @@ public function test_ContextKeyToPrepend_PrependContext_ShouldReturnMessagePrepe
         $context = [
             self::CONTEXT_KEY => self::CONTEXT_VALUE
         ];
-        $this->context_prepender->addContextKeyToPrepend(self::CONTEXT_KEY);
+        $this->addContextKeyToPrepend(self::CONTEXT_KEY);
 
-        $returned_message = $this->context_prepender->prependContext(self::A_MESSAGE, $context);
+        $returned_message = $this->prependContext(self::A_MESSAGE, $context);
 
         $this->assertEquals(self::CONTEXT_VALUE . ' ' . self::A_MESSAGE, $returned_message);
     }
@@ -47,9 +44,9 @@ public function test_UnknownContextKeyToPrepend_PrependContext_ShouldReturnMessa
         $context = [
             self::CONTEXT_KEY => self::CONTEXT_VALUE
         ];
-        $this->context_prepender->addContextKeyToPrepend(self::ANOTHER_CONTEXT_KEY);
+        $this->addContextKeyToPrepend(self::ANOTHER_CONTEXT_KEY);
 
-        $returned_message = $this->context_prepender->prependContext(self::A_MESSAGE, $context);
+        $returned_message = $this->prependContext(self::A_MESSAGE, $context);
 
         $this->assertEquals(self::A_MESSAGE, $returned_message);
     }
@@ -60,10 +57,10 @@ public function test_MoreThanOneKeyToPrepend_PrependContext_ShouldPrependThemInO
             self::FIRST_KEY => self::FIRST_VALUE,
             self::SECOND_KEY => self::SECOND_VALUE
         ];
-        $this->context_prepender->addContextKeyToPrepend(self::FIRST_KEY);
-        $this->context_prepender->addContextKeyToPrepend(self::SECOND_KEY);
+        $this->addContextKeyToPrepend(self::FIRST_KEY);
+        $this->addContextKeyToPrepend(self::SECOND_KEY);
 
-        $returned_message = $this->context_prepender->prependContext(self::A_MESSAGE, $context);
+        $returned_message = $this->prependContext(self::A_MESSAGE, $context);
 
         $expected_message = self::FIRST_VALUE . ' ' . self::SECOND_VALUE . ' ' . self::A_MESSAGE;
         $this->assertEquals($expected_message, $returned_message);

diff --git a/tests/Traits/PrependDateTimeTest.php b/tests/Traits/PrependDateTimeTest.php
@@ -3,32 +3,26 @@
 namespace Kronos\Tests\Log\Traits;
 
 use Kronos\Log\Traits\PrependDateTime;
+use PHPUnit\Framework\TestCase;
 
-class PrependDateTimeTest extends \PHPUnit\Framework\TestCase
+class PrependDateTimeTest extends TestCase
 {
-
+    use PrependDateTime;
     const A_MESSAGE = ' a message';
     const DATETIME_REGEX = '\[\d{4}-\d{2}-\d{2} \d{2}:\d{2}:\d{2}\]';
 
-    private $datetime_prepender;
-
-    public function setUp(): void
-    {
-        $this->datetime_prepender = $this->getMockForTrait(PrependDateTime::class);
-    }
-
     public function test_NewPrepender_PrependDateTime_ShouldReturnGivenMessage()
     {
-        $returned_message = $this->datetime_prepender->prependDateTime(self::A_MESSAGE);
+        $returned_message = $this->prependDateTime(self::A_MESSAGE);
 
         $this->assertSame(self::A_MESSAGE, $returned_message);
     }
 
     public function test_PrependerSetPrependDateTime_PrependDateTime_ShouldReturnGivenMessagePrependedWithTime()
     {
-        $this->datetime_prepender->setPrependDateTime();
+        $this->setPrependDateTime();
 
-        $returned_message = $this->datetime_prepender->prependDateTime(self::A_MESSAGE);
+        $returned_message = $this->prependDateTime(self::A_MESSAGE);
 
         $this->assertMatchesRegularExpression('/' . self::DATETIME_REGEX . '' . self::A_MESSAGE . '/', $returned_message);
     }

diff --git a/tests/Traits/PrependLogLevelTest.php b/tests/Traits/PrependLogLevelTest.php
@@ -3,33 +3,28 @@
 namespace Kronos\Tests\Log\Traits;
 
 use Kronos\Log\Traits\PrependLogLevel;
+use PHPUnit\Framework\TestCase;
 use Psr\Log\LogLevel;
 
-class PrependLogLevelTest extends \PHPUnit\Framework\TestCase
+class PrependLogLevelTest extends TestCase
 {
+    use PrependLogLevel;
 
     const A_MESSAGE = 'a message';
     const ANY_LOG_LEVEL = LogLevel::INFO;
 
-    private $loglevel_prepender;
-
-    public function setUp(): void
-    {
-        $this->loglevel_prepender = $this->getMockForTrait(PrependLogLevel::class);
-    }
-
     public function test_NewPrepender_PrependLogLevel_ShouldReturnGivenMessage()
     {
-        $returned_message = $this->loglevel_prepender->prependLogLevel(self::ANY_LOG_LEVEL, self::A_MESSAGE);
+        $returned_message = $this->prependLogLevel(self::ANY_LOG_LEVEL, self::A_MESSAGE);
 
         $this->assertEquals(self::A_MESSAGE, $returned_message);
     }
 
     public function test_PrependerSetPrependLogLevel_PrependLogLevel_ShouldPrependMessageWithLogLevelInUpperCase()
     {
-        $this->loglevel_prepender->setPrependLogLevel();
+        $this->setPrependLogLevel();
 
-        $returned_message = $this->loglevel_prepender->prependLogLevel(self::ANY_LOG_LEVEL, self::A_MESSAGE);
+        $returned_message = $this->prependLogLevel(self::ANY_LOG_LEVEL, self::A_MESSAGE);
 
         $this->assertEquals(strtoupper(self::ANY_LOG_LEVEL) . ' : ' . self::A_MESSAGE, $returned_message);
     }

diff --git a/tests/Writer/ConsoleTest.php b/tests/Writer/ConsoleTest.php
@@ -242,10 +242,10 @@ private function givenFactoryReturnFileAdaptors()
 
         $this->fileFactory
             ->method('createTTYAdaptor')
-            ->will(self::returnValueMap([
+            ->willReturnMap([
                 [Console::STDOUT, $this->stdout],
                 [Console::STDERR, $this->stderr],
-            ]));
+            ]);
     }
 
     private function expectsWriteToBeCalled(TTY&MockObject $file, $message, $text_color = null, $background_color = null)