upgrade phpunit/phpunit (9.6.34 => 12.5.14) & phpunit/php-code-coverage (9.2.32 => 12.5.3)

WengerK · WengerK · commit 2842100b784f · 2026-02-23T11:45:13.000+01:00
diff --git a/CHANGELOG.md b/CHANGELOG.md
@@ -9,6 +9,8 @@ and this project adheres to [Semantic Versioning](https://semver.org/spec/v2.0.0
 - update PHP versions to run on PHP 8.5
 - update symfony/dotenv (v5.4.48 => v7.4.0)
 - upgrade vimeo/psalm (4.30.0 = => 6.15.1)
+- upgrade phpunit/php-code-coverage (9.2.32 => 12.5.3)
+- upgrade phpunit/phpunit (9.6.34 => 12.5.14)
 
 ### Removed
 - removed support PHP 8.0
diff --git a/composer.json b/composer.json
@@ -8,14 +8,14 @@
     "ext-json": "*"
   },
   "require-dev": {
-    "phpunit/phpunit": "^9.6",
+    "phpunit/phpunit": "^12",
     "symfony/dotenv": "^7.4",
     "friendsofphp/php-cs-fixer": "^3.94",
     "phpmd/phpmd": "^2.6",
     "php-coveralls/php-coveralls": "^2.9",
     "php-mock/php-mock-phpunit": "^2.15",
     "vimeo/psalm": "^6.0",
-    "phpunit/php-code-coverage": "^9.2"
+    "phpunit/php-code-coverage": "^12"
   },
   "autoload": {
     "psr-4": {
diff --git a/phpunit.xml b/phpunit.xml
@@ -1,27 +1,29 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <phpunit backupGlobals="false"
-         backupStaticAttributes="false"
          colors="true"
          failOnRisky="true"
          failOnWarning="true"
          stopOnFailure="false">
     <testsuites>
         <testsuite name="Pricehubble Test Suite">
             <directory suffix=".php">./tests/</directory>
+            <exclude>./tests/Traits/</exclude>
         </testsuite>
     </testsuites>
-    <logging>
-        <log type="coverage-clover" target="./build/logs/clover.xml"/>
-        <log type="coverage-html" target="./build/logs/coverage-html"/>
-    </logging>
-    <filter>
-        <whitelist processUncoveredFilesFromWhitelist="true">
+    <source>
+        <include>
             <directory suffix=".php">src</directory>
-        </whitelist>
-    </filter>
+        </include>
+    </source>
+    <coverage>
+        <report>
+            <clover outputFile="./build/logs/clover.xml"/>
+            <html outputDirectory="./build/logs/coverage-html"/>
+        </report>
+    </coverage>
     <php>
         <!-- Temporarily preventing https://github.com/xdebug/xdebug/pull/699 -->
         <const name="XDEBUG_CC_UNUSED"  value=""/>
         <const name="XDEBUG_CC_DEAD_CODE"  value="-1"/>
     </php>
-</phpunit>
+</phpunit>
diff --git a/tests/Unit/AbstractResourceTest.php b/tests/Unit/AbstractResourceTest.php
@@ -4,38 +4,36 @@
 
 use Antistatique\Pricehubble\Pricehubble;
 use Antistatique\Pricehubble\Resource\AbstractResource;
+use PHPUnit\Framework\Attributes\CoversClass;
+use PHPUnit\Framework\Attributes\CoversMethod;
+use PHPUnit\Framework\Attributes\Group;
 use PHPUnit\Framework\TestCase;
 
 /**
- * @coversDefaultClass \Antistatique\Pricehubble\Resource\AbstractResource
- *
- * @group pricehubble
- * @group pricehubble_unit
- *
  * @internal
  */
+#[CoversClass(AbstractResource::class)]
+#[CoversMethod(AbstractResource::class, '__construct')]
+#[CoversMethod(AbstractResource::class, 'setPricehubble')]
+#[CoversMethod(AbstractResource::class, 'getPricehubble')]
+#[Group('pricehubble')]
+#[Group('pricehubble_unit')]
 final class AbstractResourceTest extends TestCase
 {
-    /**
-     * @covers ::__construct
-     */
     public function testConstructorArgumentCount(): void
     {
         $this->expectException(\ArgumentCountError::class);
         new class extends AbstractResource {};
     }
 
-    /**
-     * @covers ::__construct
-     */
     public function testConstructor(): void
     {
         $pricehubble = new Pricehubble();
         // Get mock, without the constructor being called
         $mock = $this->getMockBuilder(AbstractResource::class)
             ->disableOriginalConstructor()
             ->onlyMethods(['setPricehubble'])
-            ->getMockForAbstractClass();
+            ->getMock();
 
         // Set expectations for constructor calls.
         $mock->expects($this->once())
@@ -48,26 +46,16 @@ public function testConstructor(): void
         $constructor->invoke($mock, $pricehubble);
     }
 
-    /**
-     * @covers ::setPricehubble
-     */
     public function testSetPricehubbleReturnsExpected(): void
     {
         $pricehubble = new Pricehubble();
+        $testResource = new class(new Pricehubble()) extends AbstractResource {};
 
-        // Get mock, without the constructor being called
-        $mock = $this->getMockBuilder(AbstractResource::class)
-            ->disableOriginalConstructor()
-            ->getMockForAbstractClass();
-
-        $mock->setPricehubble($pricehubble);
-        $result = $mock->getPricehubble();
+        $testResource->setPricehubble($pricehubble);
+        $result = $testResource->getPricehubble();
         self::assertSame($result, $pricehubble);
     }
 
-    /**
-     * @covers ::getPricehubble
-     */
     public function testGetPricehubbleReturnsExpected(): void
     {
         $pricehubble = new Pricehubble();
diff --git a/tests/Unit/CurlAvailabilitiesTest.php b/tests/Unit/CurlAvailabilitiesTest.php
@@ -4,16 +4,17 @@
 
 use Antistatique\Pricehubble\Pricehubble;
 use phpmock\phpunit\PHPMock;
+use PHPUnit\Framework\Attributes\DoesNotPerformAssertions;
+use PHPUnit\Framework\Attributes\Group;
 use PHPUnit\Framework\TestCase;
 
 /**
  * @coversDefaultClass \Antistatique\Pricehubble\Pricehubble
  *
- * @group pricehubble
- * @group pricehubble_unit
- *
  * @internal
  */
+#[Group('pricehubble')]
+#[Group('pricehubble_unit')]
 final class CurlAvailabilitiesTest extends TestCase
 {
     use PHPMock;
@@ -46,9 +47,8 @@ public function testcurlNotAvailable(): void
     /**
      * @covers ::__construct
      * @covers ::isCurlAvailable
-     *
-     * @doesNotPerformAssertions
      */
+    #[DoesNotPerformAssertions]
     public function testCurlAvailable(): void
     {
         $pricehubbleMock = $this->createMock(Pricehubble::class);
diff --git a/tests/Unit/PricehubbleAttachRequestPayloadTest.php b/tests/Unit/PricehubbleAttachRequestPayloadTest.php
@@ -5,16 +5,16 @@
 use Antistatique\Pricehubble\Pricehubble;
 use Antistatique\Pricehubble\Tests\Traits\TestPrivateTrait;
 use phpmock\phpunit\PHPMock;
+use PHPUnit\Framework\Attributes\Group;
 use PHPUnit\Framework\TestCase;
 
 /**
  * @coversDefaultClass \Antistatique\Pricehubble\Pricehubble
  *
- * @group pricehubble
- * @group pricehubble_unit
- *
  * @internal
  */
+#[Group('pricehubble')]
+#[Group('pricehubble_unit')]
 final class PricehubbleAttachRequestPayloadTest extends TestCase
 {
     use TestPrivateTrait;
diff --git a/tests/Unit/PricehubbleTest.php b/tests/Unit/PricehubbleTest.php
@@ -6,16 +6,17 @@
 use Antistatique\Pricehubble\Resource\AbstractResource;
 use Antistatique\Pricehubble\Tests\Traits\TestPrivateTrait;
 use phpmock\phpunit\PHPMock;
+use PHPUnit\Framework\Attributes\DataProvider;
+use PHPUnit\Framework\Attributes\Group;
 use PHPUnit\Framework\TestCase;
 
 /**
  * @coversDefaultClass \Antistatique\Pricehubble\Pricehubble
  *
- * @group pricehubble
- * @group pricehubble_unit
- *
  * @internal
  */
+#[Group('pricehubble')]
+#[Group('pricehubble_unit')]
 final class PricehubbleTest extends TestCase
 {
     use TestPrivateTrait;
@@ -125,7 +126,7 @@ public function testAuthenticateOnSuccessSetApiToken(): void
         $mock = $this->getMockBuilder(Pricehubble::class)
             ->disableOriginalConstructor()
             ->onlyMethods(['makeRequest', 'setApiToken'])
-            ->getMockForAbstractClass();
+            ->getMock();
 
         $mock->expects(self::once())
             ->method('makeRequest')
@@ -149,7 +150,7 @@ public function testAuthenticateOnError(): void
         $mock = $this->getMockBuilder(Pricehubble::class)
             ->disableOriginalConstructor()
             ->onlyMethods(['makeRequest', 'setApiToken'])
-            ->getMockForAbstractClass();
+            ->getMock();
 
         $mock->expects(self::once())
             ->method('makeRequest')
@@ -243,9 +244,8 @@ public function testGetHeadersAsArray()
 
     /**
      * @covers ::findHttpStatus
-     *
-     * @dataProvider providerHttpStatus
      */
+    #[DataProvider('providerHttpStatus')]
     public function testFindHttpStatus($response, $formatted_response, $expected_code)
     {
         $code = $this->callPrivateMethod($this->pricehubble, 'findHttpStatus', [
@@ -261,7 +261,7 @@ public function testFindHttpStatus($response, $formatted_response, $expected_cod
      * @return array
      *               Variation of HTTP Status response
      */
-    public function providerHttpStatus()
+    public static function providerHttpStatus()
     {
         return [
             [
@@ -309,9 +309,8 @@ public function providerHttpStatus()
 
     /**
      * @covers ::determineSuccess
-     *
-     * @dataProvider providerStatus200
      */
+    #[DataProvider('providerStatus200')]
     public function testDetermineSuccessStatus200($code)
     {
         $pricehubble_mock = $this->getMockBuilder(Pricehubble::class)
@@ -336,7 +335,7 @@ public function testDetermineSuccessStatus200($code)
      * @return array
      *               Variation of HTTP Status response
      */
-    public function providerStatus200()
+    public static function providerStatus200()
     {
         return [
             [
@@ -608,9 +607,8 @@ public function testMakeRequestGet(): void
 
     /**
      * @covers ::makeRequest
-     *
-     * @dataProvider providerHttpVerbs
      */
+    #[DataProvider('providerHttpVerbs')]
     public function testMakeRequestByVerbs(string $verb): void
     {
         $pricehubble_mock = $this->getMockBuilder(Pricehubble::class)
@@ -693,7 +691,7 @@ public function testMakeRequestArgsLanguage(): void
      *
      * @return iterable Variation of HTTP Verbs
      */
-    public function providerHttpVerbs(): iterable
+    public static function providerHttpVerbs(): iterable
     {
         yield ['post'];
         yield ['delete'];
diff --git a/tests/Unit/Resource/PointsOfInterestTest.php b/tests/Unit/Resource/PointsOfInterestTest.php
@@ -4,14 +4,14 @@
 
 use Antistatique\Pricehubble\Pricehubble;
 use Antistatique\Pricehubble\Resource\AbstractResource;
+use PHPUnit\Framework\Attributes\Group;
 use PHPUnit\Framework\TestCase;
 
 /**
  * @coversDefaultClass \Antistatique\Pricehubble\Resource\PointsOfInterest
- *
- * @group pricehubble
- * @group pricehubble_unit
  */
+#[Group('pricehubble')]
+#[Group('pricehubble_unit')]
 class PointsOfInterestTest extends TestCase
 {
     /**
diff --git a/tests/Unit/Resource/ValuationTest.php b/tests/Unit/Resource/ValuationTest.php
@@ -4,14 +4,14 @@
 
 use Antistatique\Pricehubble\Pricehubble;
 use Antistatique\Pricehubble\Resource\AbstractResource;
+use PHPUnit\Framework\Attributes\Group;
 use PHPUnit\Framework\TestCase;
 
 /**
  * @coversDefaultClass \Antistatique\Pricehubble\Resource\Valuation
- *
- * @group pricehubble
- * @group pricehubble_unit
  */
+#[Group('pricehubble')]
+#[Group('pricehubble_unit')]
 class ValuationTest extends TestCase
 {
     /**
