Update PHPUnit (#28)

Firehed · Oct 26, 2021 · 58a97aa · 58a97aa
1 parent 31535c6
commit 58a97aa
Show file tree

Hide file tree

Showing 19 changed files with 22 additions and 287 deletions.
diff --git a/composer.json b/composer.json
@@ -17,7 +17,7 @@
  },
  "require-dev": {
  "phpstan/phpstan": "^0.12",
- "phpunit/phpunit": "^8.5",
+ "phpunit/phpunit": "^8.5 || ^9.0",
  "squizlabs/php_codesniffer": "^3.2",
  "phpstan/phpstan-phpunit": "^0.12"
  },

diff --git a/phpstan-baseline.neon b/phpstan-baseline.neon
@@ -21,7 +21,7 @@ parameters:
  path: tests/ResponseTraitTest.php
 
  -
- message: "#^Method class@anonymous/tests/ResponseTraitTest\\.php\\:18\\:\\:parseResponse\\(\\) has parameter \\$response with no value type specified in iterable type array\\.$#"
+ message: "#^Method class@anonymous/tests/ResponseTraitTest\\.php\\:16\\:\\:parseResponse\\(\\) has parameter \\$response with no value type specified in iterable type array\\.$#"
  count: 1
  path: tests/ResponseTraitTest.php
 
diff --git a/tests/AppIdTraitTest.php b/tests/AppIdTraitTest.php
@@ -4,17 +4,11 @@
 namespace Firehed\U2F;
 
 /**
- * @coversDefaultClass Firehed\U2F\AppIdTrait
- * @covers ::<protected>
- * @covers ::<private>
+ * @covers Firehed\U2F\AppIdTrait
  */
 class AppIdTraitTest extends \PHPUnit\Framework\TestCase
 {
 
- /**
- * @covers ::getAppId
- * @covers ::setAppId
- */
  public function testAccessors(): void
  {
  $obj = new class {
@@ -34,9 +28,6 @@ public function testAccessors(): void
  );
  }
 
- /**
- * @covers ::getApplicationParameter
- */
  public function testGetApplicationParameter(): void
  {
  $obj = new class {
@@ -51,9 +42,6 @@ public function testGetApplicationParameter(): void
  );
  }
 
- /**
- * @covers ::getRpIdHash
- */
  public function testGetRpIdHash(): void
  {
  $obj = new class {

diff --git a/tests/AttestationCertificateTest.php b/tests/AttestationCertificateTest.php
@@ -4,15 +4,10 @@
 namespace Firehed\U2F;
 
 /**
- * @coversDefaultClass Firehed\U2F\AttestationCertificate
- * @covers ::<protected>
- * @covers ::<private>
+ * @covers Firehed\U2F\AttestationCertificate
  */
 class AttestationCertificateTest extends \PHPUnit\Framework\TestCase
 {
- /**
- * @covers ::__construct
- */
  public function testConstruct(): void
  {
  // Note: a future, stricter implementation which actually parses and
@@ -23,9 +18,6 @@ public function testConstruct(): void
  $this->assertInstanceOf(AttestationCertificateInterface::class, $cert);
  }
 
- /**
- * @covers ::getBinary
- */
  public function testGetBinary(): void
  {
  $raw = random_bytes(128);
@@ -37,9 +29,6 @@ public function testGetBinary(): void
  );
  }
 
- /**
- * @covers ::getPemFormatted
- */
  public function testGetPemFormatted(): void
  {
  $raw = random_bytes(128);
@@ -54,9 +43,6 @@ public function testGetPemFormatted(): void
  );
  }
 
- /**
- * @covers ::__debugInfo
- */
  public function testDebugInfoEncodesBinary(): void
  {
  $cert = new AttestationCertificate(random_bytes(128));

diff --git a/tests/ChallengeTraitTest.php b/tests/ChallengeTraitTest.php
@@ -4,17 +4,11 @@
 namespace Firehed\U2F;
 
 /**
- * @coversDefaultClass Firehed\U2F\ChallengeTrait
- * @covers ::<protected>
- * @covers ::<private>
+ * @covers Firehed\U2F\ChallengeTrait
  */
 class ChallengeTraitTest extends \PHPUnit\Framework\TestCase
 {
 
- /**
- * @covers ::getChallenge
- * @covers ::setChallenge
- */
  public function testAccessors(): void
  {
  $obj = new class {

diff --git a/tests/ClientDataTest.php b/tests/ClientDataTest.php
@@ -4,15 +4,10 @@
 namespace Firehed\U2F;
 
 /**
- * @coversDefaultClass Firehed\U2F\ClientData
- * @covers ::<protected>
- * @covers ::<private>
+ * @covers Firehed\U2F\ClientData
  */
 class ClientDataTest extends \PHPUnit\Framework\TestCase
 {
- /**
- * @covers ::fromJson
- */
  public function testFromValidJson(): void
  {
  $goodData = [
@@ -27,9 +22,6 @@ public function testFromValidJson(): void
  $this->assertInstanceOf(ClientData::class, $clientData);
  }
 
- /**
- * @covers ::getChallengeParameter
- */
  public function testGetChallengeParameter(): void
  {
  $expected_param = base64_decode('exDPjyyKbizXMAAUNLpv0QYJNyXClbUqewUWojPtp0g=');
@@ -53,9 +45,6 @@ public function testGetChallengeParameter(): void
  );
  }
 
- /**
- * @covers ::getApplicationParameter
- */
  public function testGetApplicationParameter(): void
  {
  $goodData = [
@@ -73,9 +62,6 @@ public function testGetApplicationParameter(): void
  );
  }
 
- /**
- * @covers ::fromJson
- */
  public function testBadJson(): void
  {
  $json = 'this is not json';
@@ -85,7 +71,6 @@ public function testBadJson(): void
  }
 
  /**
- * @covers ::fromJson
  * @dataProvider missingData
  */
  public function testDataValidation(string $json): void

diff --git a/tests/ClientErrorExceptionTest.php b/tests/ClientErrorExceptionTest.php
@@ -4,14 +4,11 @@
 namespace Firehed\U2F;
 
 /**
- * @coversDefaultClass Firehed\U2F\ClientErrorException
- * @covers ::<protected>
- * @covers ::<private>
+ * @covers Firehed\U2F\ClientErrorException
  */
 class ClientErrorExceptionTest extends \PHPUnit\Framework\TestCase
 {
  /**
- * @covers ::__construct
  * @dataProvider clientErrors
  */
  public function testClientError(int $code): void

diff --git a/tests/ECPublicKeyTest.php b/tests/ECPublicKeyTest.php
@@ -4,25 +4,17 @@
 namespace Firehed\U2F;
 
 /**
- * @coversDefaultClass Firehed\U2F\ECPublicKey
- * @covers ::<protected>
- * @covers ::<private>
+ * @covers Firehed\U2F\ECPublicKey
  */
 class ECPublicKeyTest extends \PHPUnit\Framework\TestCase
 {
- /**
- * @covers ::__construct
- */
  public function testConstruct(): void
  {
  $key = "\x04".\random_bytes(64);
  $obj = new ECPublicKey($key);
  $this->assertInstanceOf(PublicKeyInterface::class, $obj);
  }
 
- /**
- * @covers ::__construct
- */
  public function testConstructThrowsWithBadFirstByte(): void
  {
  $key = "\x01".\random_bytes(64);
@@ -32,9 +24,6 @@ public function testConstructThrowsWithBadFirstByte(): void
  }
 
 
- /**
- * @covers ::__construct
- */
  public function testConstructThrowsWhenTooShort(): void
  {
  $key = "\x04".random_bytes(63);
@@ -43,9 +32,6 @@ public function testConstructThrowsWhenTooShort(): void
  new ECPublicKey($key);
  }
 
- /**
- * @covers ::__construct
- */
  public function testConstructThrowsWhenTooLong(): void
  {
  $key = "\x04".random_bytes(65);
@@ -54,9 +40,6 @@ public function testConstructThrowsWhenTooLong(): void
  new ECPublicKey($key);
  }
 
- /**
- * @covers ::getBinary
- */
  public function testGetBinary(): void
  {
  $key = "\x04".\random_bytes(64);
@@ -68,9 +51,6 @@ public function testGetBinary(): void
  );
  }
 
- /**
- * @covers ::getPemFormatted
- */
  public function testGetPublicKeyPem(): void
  {
  $key = hex2bin(
@@ -88,9 +68,6 @@ public function testGetPublicKeyPem(): void
  $this->assertSame($pem, $obj->getPemFormatted());
  }
 
- /**
- * @covers ::__debugInfo
- */
  public function testDebugInfoEncodesBinary(): void
  {
  $x = random_bytes(32);

diff --git a/tests/InvalidDataExceptionTest.php b/tests/InvalidDataExceptionTest.php
@@ -4,14 +4,11 @@
 namespace Firehed\U2F;
 
 /**
- * @coversDefaultClass Firehed\U2F\InvalidDataException
- * @covers ::<protected>
- * @covers ::<private>
+ * @covers Firehed\U2F\InvalidDataException
  */
 class InvalidDataExceptionTest extends \PHPUnit\Framework\TestCase
 {
  /**
- * @covers ::__construct
  * @dataProvider invalidDataExceptionCodes
  */
  public function testInvalidDataException(int $code): void

diff --git a/tests/KeyHandleTraitTest.php b/tests/KeyHandleTraitTest.php
@@ -4,16 +4,10 @@
 namespace Firehed\U2F;
 
 /**
- * @coversDefaultClass Firehed\U2F\KeyHandleTrait
- * @covers ::<protected>
- * @covers ::<private>
+ * @covers Firehed\U2F\KeyHandleTrait
  */
 class KeyHandleTraitTest extends \PHPUnit\Framework\TestCase
 {
- /**
- * @covers ::getKeyHandleBinary
- * @covers ::setKeyHandle
- */
  public function testAccessors(): void
  {
  $obj = new class {
@@ -32,9 +26,6 @@ public function testAccessors(): void
  );
  }
 
- /**
- * @covers ::getKeyHandleWeb
- */
  public function testGetKeyHandleWeb(): void
  {
  $obj = new class {

diff --git a/tests/RegisterRequestTest.php b/tests/RegisterRequestTest.php
@@ -4,16 +4,10 @@
 namespace Firehed\U2F;
 
 /**
- * @coversDefaultClass Firehed\U2F\RegisterRequest
- * @covers ::<protected>
- * @covers ::<private>
+ * @covers Firehed\U2F\RegisterRequest
  */
 class RegisterRequestTest extends \PHPUnit\Framework\TestCase
 {
-
- /**
- * @covers ::jsonSerialize
- */
  public function testJsonSerialize(): void
  {
  $appId = 'https://u2f.example.com';