Several corrections and bugs fixed before first v3.0 live tests

composer.json

@@ -29,7 +29,8 @@
             "Webauthn\\Tests\\Functional\\": "src/webauthn/tests/functional/",
             "Webauthn\\Tests\\Unit\\": "src/webauthn/tests/unit/",
             "Webauthn\\Bundle\\Tests\\Functional\\": "src/symfony/tests/functional/",
-            "Webauthn\\MetadataService\\Tests\\Functional\\": "src/metadata-service/tests/functional/"
+            "Webauthn\\MetadataService\\Tests\\Functional\\": "src/metadata-service/tests/functional/",
+            "Webauthn\\MetadataService\\Tests\\Unit\\": "src/metadata-service/tests/unit/"
         }
     },
     "require": {
@@ -41,19 +42,18 @@
         "fgrosse/phpasn1": "^2.1",
         "league/uri": "^6.0",
         "league/uri-components": "^2.1",
-        "nyholm/psr7": "^1.1",
         "psr/http-client": "^1.0",
         "psr/http-factory": "^1.0",
         "psr/http-message": "^1.0",
         "spomky-labs/base64url": "^2.0",
         "spomky-labs/cbor-bundle": "^2.0",
-        "symfony/config": "^4.3|^5.0",
-        "symfony/dependency-injection": "^4.3|^5.0",
-        "symfony/framework-bundle": "^4.3|^5.0",
-        "symfony/process": "^4.3|^5.0",
+        "symfony/config": "^5.0",
+        "symfony/dependency-injection": "^5.0",
+        "symfony/framework-bundle": "^5.0",
+        "symfony/process": "^5.0",
         "symfony/psr-http-message-bridge": "^2.0",
-        "symfony/security-bundle": "^4.3|^5.0",
-        "symfony/twig-bundle": "^4.3|^5.0",
+        "symfony/security-bundle": "^5.0",
+        "symfony/twig-bundle": "^5.0",
         "web-token/jwt-key-mgmt": "^2.0.9",
         "web-token/jwt-signature": "^2.0.9",
         "web-token/signature-pack": "^2.0.9"
@@ -86,9 +86,10 @@
     },
     "require-dev": {
         "doctrine/dbal": "^2.9",
-        "doctrine/doctrine-bundle": "^1.10|^2.0",
+        "doctrine/doctrine-bundle": "^2.0",
         "doctrine/orm": "^2.6",
         "fzaninotto/faker": "^1.8",
+        "nyholm/psr7": "^1.1",
         "php-http/curl-client": "^2.0",
         "php-http/mock-client": "^1.0",
         "phpstan/phpstan": "^0.12",
@@ -98,14 +99,13 @@
         "phpstan/phpstan-strict-rules": "^0.12",
         "phpunit/phpunit": "^8.2.5",
         "ramsey/uuid": "^3.8",
-        "symfony/browser-kit": "^4.3|^5.0",
-        "symfony/http-client": "^4.3|^5.0",
-        "symfony/phpunit-bridge": "^4.3|^5.0",
-        "symfony/serializer": "^4.3|^5.0",
-        "symfony/translation": "^4.3|^5.0",
-        "symfony/validator": "^4.3|^5.0",
-        "symfony/var-dumper": "^4.3|^5.0",
-        "symfony/yaml": "^4.3|^5.0",
-        "vimeo/psalm": "^3.8"
+        "symfony/browser-kit": "^5.0",
+        "symfony/http-client": "^5.0",
+        "symfony/phpunit-bridge": "^5.0",
+        "symfony/serializer": "^5.0",
+        "symfony/translation": "^5.0",
+        "symfony/validator": "^5.0",
+        "symfony/var-dumper": "^5.0",
+        "symfony/yaml": "^5.0"
     }
 }

phpstan.neon

@@ -6,14 +6,12 @@ parameters:
         - %currentWorkingDirectory%/src/*/tests/*
         - %currentWorkingDirectory%/src/*/var/*
     ignoreErrors:
+        - '#Call to an undefined method Symfony\\Component\\Config\\Definition\\Builder\\NodeParentInterface::scalarNode\(\)\.#'
         - '#Call to function is_array\(\) with array\<string\, string\> will always evaluate to true\.#'
         - '#Call to an undefined method Symfony\\Component\\Config\\Definition\\Builder\\NodeDefinition::(.*)\(\)#'
-        - '#Cannot call method scalarNode\(\) on Symfony\\Component\\Config\\Definition\\Builder\\NodeParentInterface|null\.#'
         - '#Parameter (.*) of class FG\\ASN1\\Universal\\Integer constructor expects int, string given\.#'
         - '#Parameter (.*) of class Webauthn\\PublicKeyCredentialSource constructor expects string, string|null given\.#'
         - '#Instanceof between Symfony\\Component\\HttpFoundation\\Response and Symfony\\Component\\HttpFoundation\\Response will always evaluate to true\.#'
-        - '#Parameter (.*) of class Webauthn\\Bundle\\Security\\Authentication\\Token\\WebauthnToken constructor expects array(.*) given#'
-        - '#Call to deprecated method checkAttestationMedata\(\) of class Webauthn\\CertificateToolbox.*#'
     checkMissingIterableValueType: false
     checkGenericClassInNonGenericObjectType: false
 includes:

src/metadata-service/src/MetadataStatementRepository.php

@@ -16,4 +16,9 @@
 interface MetadataStatementRepository
 {
     public function findOneByAAGUID(string $aaguid): ?MetadataStatement;
+
+    /**
+     * @return StatusReport[]
+     */
+    public function findStatusReportsByAAGUID(string $aaguid): array;
 }

src/metadata-service/src/MetadataTOCPayloadEntry.php

@@ -172,7 +172,7 @@ public function jsonSerialize(): array
             'aaid' => $this->aaid,
             'aaguid' => $this->aaguid,
             'attestationCertificateKeyIdentifiers' => $this->attestationCertificateKeyIdentifiers,
-            'hash' => $this->hash,
+            'hash' => Base64Url::encode($this->hash),
             'url' => $this->url,
             'statusReports' => $this->statusReports,
             'timeOfLastStatusChange' => $this->timeOfLastStatusChange,

src/metadata-service/src/RgbPaletteEntry.php

@@ -35,9 +35,9 @@ class RgbPaletteEntry implements JsonSerializable
 
     public function __construct(int $r, int $g, int $b)
     {
-        Assertion::range($r, 0, 254, Utils::logicException('The key "r" is invalid'));
-        Assertion::range($g, 0, 254, Utils::logicException('The key "g" is invalid'));
-        Assertion::range($b, 0, 254, Utils::logicException('The key "b" is invalid'));
+        Assertion::range($r, 0, 255, Utils::logicException('The key "r" is invalid'));
+        Assertion::range($g, 0, 255, Utils::logicException('The key "g" is invalid'));
+        Assertion::range($b, 0, 255, Utils::logicException('The key "b" is invalid'));
         $this->r = $r;
         $this->g = $g;
         $this->b = $b;