Merge branch 'master' into feat_tests_strict_assert

Author: Minishlink

.php-cs-fixer.php

@@ -7,9 +7,10 @@
     '@PHP81Migration'                     => true, // Must be the same as the min PHP version.
     'blank_line_after_opening_tag'        => false, // Do not waste space between <?php and declare.
     'global_namespace_import'             => ['import_classes' => false, 'import_constants' => false, 'import_functions' => false],
-    'php_unit_test_class_requires_covers' => true,
     'php_unit_construct'                  => true,
+    'php_unit_attributes'                 => true,
     'php_unit_method_casing'              => true,
+    'php_unit_test_class_requires_covers' => true,
     // Do not enable by default. These rules require review!! (but they are useful)
     // '@PHP80Migration:risky'      => true,
     // '@PHPUnit100Migration:risky' => true,

composer.json

@@ -42,9 +42,9 @@
     "ext-gmp": "Optional for performance."
   },
   "require-dev": {
-    "phpunit/phpunit": "^10.5.9",
-    "phpstan/phpstan": "^1.10.57",
-    "friendsofphp/php-cs-fixer": "^v3.68.3"
+    "phpunit/phpunit": "^10.5.44|^11.5.6",
+    "phpstan/phpstan": "^2.1.2",
+    "friendsofphp/php-cs-fixer": "^v3.68.5"
   },
   "autoload": {
     "psr-4": {

tests/EncryptionTest.php

@@ -12,11 +12,10 @@
 use Jose\Component\Core\JWK;
 use Minishlink\WebPush\Encryption;
 use Minishlink\WebPush\Utils;
+use PHPUnit\Framework\Attributes\CoversClass;
 use PHPUnit\Framework\Attributes\DataProvider;
 
-/**
- * @covers \Minishlink\WebPush\Encryption
- */
+#[CoversClass(Encryption::class)]
 final class EncryptionTest extends PHPUnit\Framework\TestCase
 {
     public function testBase64Encode(): void

tests/MessageSentReportTest.php

@@ -7,12 +7,11 @@
 use GuzzleHttp\Psr7\Request;
 use GuzzleHttp\Psr7\Response;
 use Minishlink\WebPush\MessageSentReport;
+use PHPUnit\Framework\Attributes\CoversClass;
 use PHPUnit\Framework\Attributes\DataProvider;
 use PHPUnit\Framework\TestCase;
 
-/**
- * @covers \Minishlink\WebPush\MessageSentReport
- */
+#[CoversClass(MessageSentReport::class)]
 class MessageSentReportTest extends TestCase
 {
     #[dataProvider('generateReportsWithExpiration')]

tests/PushServiceTest.php

@@ -11,14 +11,15 @@
 use Minishlink\WebPush\MessageSentReport;
 use Minishlink\WebPush\Subscription;
 use Minishlink\WebPush\WebPush;
+use PHPUnit\Framework\Attributes\CoversNothing;
 use PHPUnit\Framework\Attributes\DataProvider;
 use PHPUnit\Framework\Attributes\Group;
 
 /**
  * Test with test server.
- * @coversNothing
  */
 #[group('online')]
+#[CoversNothing]
 final class PushServiceTest extends PHPUnit\Framework\TestCase
 {
     private static int    $timeout    = 30;

tests/SubscriptionTest.php

@@ -1,10 +1,9 @@
 <?php declare(strict_types=1);
 
 use Minishlink\WebPush\Subscription;
+use PHPUnit\Framework\Attributes\CoversClass;
 
-/**
- * @covers \Minishlink\WebPush\Subscription
- */
+#[CoversClass(Subscription::class)]
 class SubscriptionTest extends PHPUnit\Framework\TestCase
 {
     public function testCreateMinimal(): void

tests/UtilsTest.php

@@ -2,11 +2,10 @@
 
 use Jose\Component\KeyManagement\JWKFactory;
 use Minishlink\WebPush\Utils;
+use PHPUnit\Framework\Attributes\CoversClass;
 use PHPUnit\Framework\TestCase;
 
-/**
- * @covers \Minishlink\WebPush\Utils
- */
+#[CoversClass(Utils::class)]
 final class UtilsTest extends TestCase
 {
     public function testSerializePublicKey(): void

tests/VAPIDTest.php

@@ -10,11 +10,10 @@
 
 use Minishlink\WebPush\Utils;
 use Minishlink\WebPush\VAPID;
+use PHPUnit\Framework\Attributes\CoversClass;
 use PHPUnit\Framework\Attributes\DataProvider;
 
-/**
- * @covers \Minishlink\WebPush\VAPID
- */
+#[CoversClass(VAPID::class)]
 final class VAPIDTest extends PHPUnit\Framework\TestCase
 {
     public static function vapidProvider(): array
@@ -74,10 +73,6 @@ public function testGetVapidHeaders(string $audience, array $vapid, string $cont
         }
     }
 
-    /**
-     * @param string $auth
-     * @return array
-     */
     private function explodeAuthorization(string $auth): array
     {
         $auth = explode('.', $auth);

tests/WebPushTest.php

@@ -11,11 +11,10 @@
 use Minishlink\WebPush\Subscription;
 use Minishlink\WebPush\SubscriptionInterface;
 use Minishlink\WebPush\WebPush;
+use PHPUnit\Framework\Attributes\CoversClass;
 use PHPUnit\Framework\Attributes\DataProvider;
 
-/**
- * @covers \Minishlink\WebPush\WebPush
- */
+#[CoversClass(WebPush::class)]
 final class WebPushTest extends PHPUnit\Framework\TestCase
 {
     private static array $endpoints;
@@ -135,8 +134,6 @@ public static function notificationProvider(): array
     }
 
     /**
-     * @param SubscriptionInterface $subscription
-     * @param string                $payload
      * @throws ErrorException
      */
     #[dataProvider('notificationProvider')]