Finish deprecation of all U2F-specific classes

CHANGELOG.md

@@ -15,6 +15,8 @@ and this project adheres to [Semantic Versioning](https://semver.org/spec/v2.0.0
 
 ### Changed
 - Server's constructor now can take `string $appId` as a parameter
+- WebAuthn\AuthenticatorData marked as internal
+- All traits marked as internal
 
 ### Deprecated
 - ChallengeProvider
@@ -24,6 +26,15 @@ and this project adheres to [Semantic Versioning](https://semver.org/spec/v2.0.0
 - Server::setRegisterRequest(RegisterRequest)
 - Server::setRegistrations(RegistrationInterface[])
 - Server::setSignRequests(SignRequest[])
+- Server::generateRegisterRequest()
+- Server::generateSignRequest(RegistrationInterface)
+- Server::generateSignRequests(RegistrationInterface[])
+- RegisterRequest
+- RegisterResponse (Replaced by WebAuthn/RegistrationResponse)
+- SignRequest
+- SignResponse (Replaced by WebAuthn/LoginResponse)
+- ClientData (internal)
+- ResponseTrait (internal)
 
 
 ## [1.2.0] - 2021-10-26

phpstan-baseline.neon

@@ -46,7 +46,7 @@ parameters:
  path: tests/ResponseTraitTest.php
 
  -
- message: "#^Method class@anonymous/tests/ResponseTraitTest\\.php\\:16\\:\\:parseResponse\\(\\) has parameter \\$response with no value type specified in iterable type array\\.$#"
+ message: "#^Method class@anonymous/tests/ResponseTraitTest\\.php\\:17\\:\\:parseResponse\\(\\) has parameter \\$response with no value type specified in iterable type array\\.$#"
  count: 1
  path: tests/ResponseTraitTest.php
 

src/AppIdTrait.php

@@ -3,6 +3,9 @@
 
 namespace Firehed\U2F;
 
+/**
+ * @internal
+ */
 trait AppIdTrait
 {
  /** @var string */

src/ChallengeTrait.php

@@ -2,6 +2,9 @@
 
 namespace Firehed\U2F;
 
+/**
+ * @internal
+ */
 trait ChallengeTrait
 {
  /** @var string */

src/ClientData.php

@@ -5,6 +5,10 @@
 
 use Firehed\U2F\InvalidDataException as IDE;
 
+/**
+ * @deprecated
+ * @internal
+ */
 class ClientData
 {
  use ChallengeTrait;

src/KeyHandleTrait.php

@@ -2,6 +2,9 @@
 
 namespace Firehed\U2F;
 
+/**
+ * @internal
+ */
 trait KeyHandleTrait
 {
  /** @var string (binary) */

src/RegisterRequest.php

@@ -4,6 +4,9 @@
 
 use JsonSerializable;
 
+/**
+ * @deprecated
+ */
 class RegisterRequest implements JsonSerializable, ChallengeProvider
 {
  use AppIdTrait;

src/RegisterResponse.php

@@ -5,6 +5,9 @@
 
 use Firehed\U2F\InvalidDataException as IDE;
 
+/**
+ * @deprecated U2F support is being removed. Migrate to WebAuthn flows.
+ */
 class RegisterResponse implements RegistrationResponseInterface
 {
  use ResponseTrait;

src/ResponseTrait.php

@@ -5,6 +5,10 @@
 
 use Firehed\U2F\InvalidDataException as IDE;
 
+/**
+ * @deprecated
+ * @internal
+ */
 trait ResponseTrait
 {
  use KeyHandleTrait;

src/Server.php

@@ -368,6 +368,8 @@ public function setSignRequests(array $signRequests): self
  * Creates a new RegisterRequest to be sent to the authenticated user to be
  * used by the `u2f.register` API.
  *
+ * @deprecated
+ *
  * @return RegisterRequest
  */
  public function generateRegisterRequest(): RegisterRequest
@@ -381,6 +383,8 @@ public function generateRegisterRequest(): RegisterRequest
  * Creates a new SignRequest for an existing registration for an
  * authenticating user, used by the `u2f.sign` API.
  *
+ * @deprecated
+ *
  * @param RegistrationInterface $reg one of the user's existing Registrations
  * @return SignRequest
  */
@@ -397,6 +401,8 @@ public function generateSignRequest(RegistrationInterface $reg): SignRequest
  * ensures that all sign requests share a single challenge, which greatly
  * simplifies compatibility with WebAuthn
  *
+ * @deprecated
+ *
  * @param RegistrationInterface[] $registrations
  * @return SignRequest[]
  */

src/SignRequest.php

@@ -4,6 +4,9 @@
 
 use JsonSerializable;
 
+/**
+ * @deprecated
+ */
 class SignRequest implements JsonSerializable, ChallengeProvider, KeyHandleInterface
 {
  use AppIdTrait;

src/SignResponse.php

@@ -5,6 +5,9 @@
 
 use Firehed\U2F\InvalidDataException as IDE;
 
+/**
+ * @deprecated U2F support is being removed. Migrate to WebAuthn flows.
+ */
 class SignResponse implements LoginResponseInterface
 {
  use ResponseTrait;

src/VersionTrait.php

@@ -3,6 +3,9 @@
 
 namespace Firehed\U2F;
 
+/**
+ * @internal
+ */
 trait VersionTrait
 {
  /** @var 'U2F_V2' */

src/WebAuthn/AuthenticatorData.php

@@ -7,6 +7,8 @@
 use Firehed\CBOR\Decoder;
 
 /**
+ * @internal
+ *
  * @phpstan-type AttestedCredentialData array{
  * aaguid: string,
  * credentialId: string,

tests/ClientDataTest.php

@@ -5,6 +5,7 @@
 
 /**
  * @covers Firehed\U2F\ClientData
+ * @deprecated
  */
 class ClientDataTest extends \PHPUnit\Framework\TestCase
 {

tests/RegisterRequestTest.php

@@ -5,6 +5,7 @@
 
 /**
  * @covers Firehed\U2F\RegisterRequest
+ * @deprecated
  */
 class RegisterRequestTest extends \PHPUnit\Framework\TestCase
 {

tests/RegisterResponseTest.php

@@ -5,6 +5,7 @@
 
 /**
  * @covers Firehed\U2F\RegisterResponse
+ * @deprecated
  */
 class RegisterResponseTest extends \PHPUnit\Framework\TestCase
 {

tests/ResponseTraitTest.php

@@ -5,6 +5,7 @@
 
 /**
  * @covers Firehed\U2F\ResponseTrait
+ * @deprecated
  */
 class ResponseTraitTest extends \PHPUnit\Framework\TestCase
 {