Add sprintf utility usage across multiple classes

Introduced `sprintf` function in various classes to improve code consistency and formatting operations. Additionally, minor adjustments were made to PHP versions in workflows and the removal of unnecessary PHPUnit configurations.

.github/workflows/integrate.yml

@@ -59,9 +59,7 @@ jobs:
           - "8.1"
           - "8.2"
           - "8.3"
-        dependencies:
-          - "lowest"
-          - "highest"
+          - "8.4"
     runs-on: ${{ matrix.operating-system }}
     steps:
       - name: "Set up PHP"
@@ -98,7 +96,7 @@ jobs:
         operating-system:
           - "ubuntu-latest"
         php-version:
-          - "8.2"
+          - "8.3"
     runs-on: ${{ matrix.operating-system }}
     steps:
       - name: "Set up PHP"

composer.json

@@ -120,7 +120,6 @@
         "symfony/filesystem": "^6.4|^7.0",
         "symfony/finder": "^6.4|^7.0",
         "symfony/monolog-bundle": "^3.8",
-        "symfony/phpunit-bridge": "^6.4|^7.0",
         "symfony/var-dumper": "^6.4|^7.0",
         "symfony/yaml": "^6.4|^7.0",
         "symplify/easy-coding-standard": "^12.0"

phpstan-baseline.neon

@@ -2706,6 +2706,11 @@ parameters:
 			count: 1
 			path: src/webauthn/src/MetadataService/Service/DistantResourceMetadataService.php
 
+		-
+			message: "#^Property Webauthn\\\\MetadataService\\\\Service\\\\DistantResourceMetadataService\\:\\:\\$serializer \\(Symfony\\\\Component\\\\Serializer\\\\SerializerInterface\\|null\\) is never assigned null so it can be removed from the property type\\.$#"
+			count: 1
+			path: src/webauthn/src/MetadataService/Service/DistantResourceMetadataService.php
+
 		-
 			message: "#^Argument of an invalid type mixed supplied for foreach, only iterables are supported\\.$#"
 			count: 1
@@ -2759,6 +2764,11 @@ parameters:
 			count: 1
 			path: src/webauthn/src/MetadataService/Service/FidoAllianceCompliantMetadataService.php
 
+		-
+			message: "#^Property Webauthn\\\\MetadataService\\\\Service\\\\FidoAllianceCompliantMetadataService\\:\\:\\$serializer \\(Symfony\\\\Component\\\\Serializer\\\\SerializerInterface\\|null\\) is never assigned null so it can be removed from the property type\\.$#"
+			count: 1
+			path: src/webauthn/src/MetadataService/Service/FidoAllianceCompliantMetadataService.php
+
 		-
 			message: """
 				#^Call to deprecated method createFromString\\(\\) of class Webauthn\\\\MetadataService\\\\Statement\\\\MetadataStatement\\:
@@ -2772,6 +2782,11 @@ parameters:
 			count: 1
 			path: src/webauthn/src/MetadataService/Service/FolderResourceMetadataService.php
 
+		-
+			message: "#^Property Webauthn\\\\MetadataService\\\\Service\\\\FolderResourceMetadataService\\:\\:\\$serializer \\(Symfony\\\\Component\\\\Serializer\\\\SerializerInterface\\|null\\) is never assigned null so it can be removed from the property type\\.$#"
+			count: 1
+			path: src/webauthn/src/MetadataService/Service/FolderResourceMetadataService.php
+
 		-
 			message: """
 				#^Call to deprecated method createFromString\\(\\) of class Webauthn\\\\MetadataService\\\\Statement\\\\MetadataStatement\\:
@@ -2780,6 +2795,11 @@ parameters:
 			count: 1
 			path: src/webauthn/src/MetadataService/Service/JsonMetadataService.php
 
+		-
+			message: "#^Property Webauthn\\\\MetadataService\\\\Service\\\\JsonMetadataService\\:\\:\\$serializer \\(Symfony\\\\Component\\\\Serializer\\\\SerializerInterface\\|null\\) is never assigned null so it can be removed from the property type\\.$#"
+			count: 1
+			path: src/webauthn/src/MetadataService/Service/JsonMetadataService.php
+
 		-
 			message: """
 				#^Call to deprecated method createFromString\\(\\) of class Webauthn\\\\MetadataService\\\\Statement\\\\MetadataStatement\\:
@@ -2798,6 +2818,11 @@ parameters:
 			count: 1
 			path: src/webauthn/src/MetadataService/Service/LocalResourceMetadataService.php
 
+		-
+			message: "#^Property Webauthn\\\\MetadataService\\\\Service\\\\LocalResourceMetadataService\\:\\:\\$serializer \\(Symfony\\\\Component\\\\Serializer\\\\SerializerInterface\\|null\\) is never assigned null so it can be removed from the property type\\.$#"
+			count: 1
+			path: src/webauthn/src/MetadataService/Service/LocalResourceMetadataService.php
+
 		-
 			message: "#^Parameter \\#1 \\$data of static method Webauthn\\\\MetadataService\\\\Service\\\\MetadataBLOBPayloadEntry\\:\\:createFromArray\\(\\) expects array\\<string, mixed\\>, mixed given\\.$#"
 			count: 1

phpunit.xml.dist

@@ -18,9 +18,6 @@
         <ini name="error_reporting" value="-1"/>
         <server name="APP_ENV" value="test" force="true"/>
         <server name="SHELL_VERBOSITY" value="-1"/>
-        <server name="SYMFONY_PHPUNIT_REMOVE" value=""/>
-        <server name="SYMFONY_PHPUNIT_VERSION" value="10.1"/>
-        <env name="SYMFONY_DEPRECATIONS_HELPER" value="max[self]=0"/>
         <env name="APP_DEBUG" value="true"/>
         <server name="KERNEL_CLASS" value="Webauthn\Tests\Bundle\Functional\AppKernel"/>
         <ini name="memory_limit" value="-1"/>

src/symfony/src/Controller/AttestationResponseController.php

@@ -25,6 +25,7 @@
 use Webauthn\PublicKeyCredentialLoader;
 use Webauthn\PublicKeyCredentialSourceRepository;
 use Webauthn\PublicKeyCredentialUserEntity;
+use function sprintf;
 
 final class AttestationResponseController
 {

src/symfony/src/CredentialOptionsBuilder/ProfileBasedCreationOptionsBuilder.php

@@ -22,6 +22,7 @@
 use Webauthn\PublicKeyCredentialUserEntity;
 use function count;
 use function is_array;
+use function sprintf;
 use const FILTER_VALIDATE_BOOLEAN;
 
 final class ProfileBasedCreationOptionsBuilder implements PublicKeyCredentialCreationOptionsBuilder

src/symfony/src/CredentialOptionsBuilder/ProfileBasedRequestOptionsBuilder.php

@@ -23,6 +23,7 @@
 use Webauthn\PublicKeyCredentialUserEntity;
 use function count;
 use function is_array;
+use function sprintf;
 
 final class ProfileBasedRequestOptionsBuilder implements PublicKeyCredentialRequestOptionsBuilder
 {

src/symfony/src/DependencyInjection/Compiler/DynamicRouteCompilerPass.php

@@ -9,6 +9,7 @@
 use Symfony\Component\DependencyInjection\ContainerBuilder;
 use Webauthn\Bundle\Routing\Loader;
 use function array_key_exists;
+use function sprintf;
 
 final class DynamicRouteCompilerPass implements CompilerPassInterface
 {

src/symfony/src/DependencyInjection/Factory/Security/WebauthnFactory.php

@@ -39,6 +39,7 @@
 use Webauthn\FakeCredentialGenerator;
 use function array_key_exists;
 use function assert;
+use function sprintf;
 
 final class WebauthnFactory implements FirewallListenerFactoryInterface, AuthenticatorFactoryInterface
 {

src/symfony/src/DependencyInjection/WebauthnExtension.php

@@ -57,6 +57,7 @@
 use function array_key_exists;
 use function count;
 use function is_array;
+use function sprintf;
 
 final class WebauthnExtension extends Extension implements PrependExtensionInterface
 {

src/symfony/src/Doctrine/Type/PublicKeyCredentialDescriptorCollectionType.php

@@ -8,6 +8,7 @@
 use Doctrine\DBAL\Types\Type;
 use InvalidArgumentException;
 use function is_string;
+use function sprintf;
 use const JSON_THROW_ON_ERROR;
 
 /**

src/symfony/src/Event/AuthenticatorAssertionResponseValidationFailedEvent.php

@@ -10,6 +10,7 @@
 use Webauthn\Event\AuthenticatorAssertionResponseValidationFailedEvent as BaseAuthenticatorAssertionResponseValidationFailedEvent;
 use Webauthn\PublicKeyCredentialRequestOptions;
 use Webauthn\PublicKeyCredentialSource;
+use function sprintf;
 
 /**
  * @deprecated since 4.3.0, use {@link \Webauthn\Event\AuthenticatorAssertionResponseValidationFailedEvent} instead.

src/symfony/src/Event/AuthenticatorAssertionResponseValidationSucceededEvent.php

@@ -9,6 +9,7 @@
 use Webauthn\Event\AuthenticatorAssertionResponseValidationSucceededEvent as BaseAuthenticatorAssertionResponseValidationSucceededEvent;
 use Webauthn\PublicKeyCredentialRequestOptions;
 use Webauthn\PublicKeyCredentialSource;
+use function sprintf;
 
 /**
  * @deprecated since 4.3.0, use {@link \Webauthn\Event\AuthenticatorAssertionResponseValidationSucceededEvent} instead.

src/symfony/src/Event/AuthenticatorAttestationResponseValidationFailedEvent.php

@@ -9,6 +9,7 @@
 use Webauthn\AuthenticatorAttestationResponse;
 use Webauthn\Event\AuthenticatorAttestationResponseValidationFailedEvent as BaseAuthenticatorAttestationResponseValidationFailedEvent;
 use Webauthn\PublicKeyCredentialCreationOptions;
+use function sprintf;
 
 /**
  * @deprecated since 4.3.0, use {@link \Webauthn\Event\AuthenticatorAttestationResponseValidationFailedEvent} instead.

src/symfony/src/Event/AuthenticatorAttestationResponseValidationSucceededEvent.php

@@ -9,6 +9,7 @@
 use Webauthn\Event\AuthenticatorAttestationResponseValidationSucceededEvent as BaseAuthenticatorAttestationResponseValidationSucceededEvent;
 use Webauthn\PublicKeyCredentialCreationOptions;
 use Webauthn\PublicKeyCredentialSource;
+use function sprintf;
 
 /**
  * @deprecated since 4.3.0, use {@link \Webauthn\Event\AuthenticatorAttestationResponseValidationSucceededEvent} instead.

src/symfony/src/Repository/DoctrineCredentialSourceRepository.php

@@ -9,6 +9,7 @@
 use InvalidArgumentException;
 use Webauthn\PublicKeyCredentialSource;
 use Webauthn\PublicKeyCredentialUserEntity;
+use function sprintf;
 
 /**
  * @template T of PublicKeyCredentialSource

src/symfony/src/Routing/Loader.php

@@ -7,6 +7,7 @@
 use Symfony\Component\Config\Loader\Loader as SymfonyLoader;
 use Symfony\Component\Routing\Route;
 use Symfony\Component\Routing\RouteCollection;
+use function sprintf;
 
 class Loader extends SymfonyLoader
 {

src/symfony/src/Security/Http/Authenticator/WebauthnAuthenticator.php

@@ -44,6 +44,7 @@
 use Webauthn\PublicKeyCredentialRequestOptions;
 use Webauthn\PublicKeyCredentialSourceRepository;
 use Webauthn\PublicKeyCredentialUserEntity;
+use function sprintf;
 
 final class WebauthnAuthenticator implements AuthenticatorInterface, InteractiveAuthenticatorInterface, CanLogData
 {

src/symfony/src/Security/Storage/CacheStorage.php

@@ -6,6 +6,7 @@
 
 use Psr\Cache\CacheItemPoolInterface;
 use Symfony\Component\HttpKernel\Exception\BadRequestHttpException;
+use function sprintf;
 
 final class CacheStorage implements OptionsStorage
 {

src/symfony/src/Service/AuthenticatorAssertionResponseValidator.php

@@ -17,6 +17,7 @@
 use Webauthn\PublicKeyCredentialRequestOptions;
 use Webauthn\PublicKeyCredentialSource;
 use Webauthn\TokenBinding\TokenBindingHandler;
+use function sprintf;
 
 /**
  * @deprecated since 4.3.0. The class is deprecated and will be removed in 5.0.0. Please use "Webauthn\AuthenticatorAssertionResponseValidator" instead.

src/symfony/src/Service/AuthenticatorAttestationResponseValidator.php

@@ -17,6 +17,7 @@
 use Webauthn\PublicKeyCredentialCreationOptions;
 use Webauthn\PublicKeyCredentialSource;
 use Webauthn\TokenBinding\TokenBindingHandler;
+use function sprintf;
 
 /**
  * @deprecated since 4.3.0. The class is deprecated and will be removed in 5.0.0. Please use "Webauthn\BaseAuthenticatorAttestationResponseValidator" instead.

src/symfony/src/Service/PublicKeyCredentialCreationOptionsFactory.php

@@ -22,6 +22,7 @@
 use function gettype;
 use function is_int;
 use function is_string;
+use function sprintf;
 
 final class PublicKeyCredentialCreationOptionsFactory implements CanDispatchEvents
 {

src/symfony/src/Service/PublicKeyCredentialRequestOptionsFactory.php

@@ -18,6 +18,7 @@
 use function gettype;
 use function is_int;
 use function is_string;
+use function sprintf;
 
 final class PublicKeyCredentialRequestOptionsFactory implements CanDispatchEvents
 {

src/webauthn/src/AttestationStatement/AndroidKeyAttestationStatementSupport.php

@@ -29,6 +29,7 @@
 use function is_array;
 use function openssl_pkey_get_public;
 use function openssl_verify;
+use function sprintf;
 
 final class AndroidKeyAttestationStatementSupport implements AttestationStatementSupport, CanDispatchEvents
 {

src/webauthn/src/AttestationStatement/AndroidSafetyNetAttestationStatementSupport.php

@@ -41,6 +41,7 @@
 use function is_array;
 use function is_int;
 use function is_string;
+use function sprintf;
 use const JSON_THROW_ON_ERROR;
 
 /**

src/webauthn/src/AttestationStatement/AttestationStatement.php

@@ -9,6 +9,7 @@
 use Webauthn\TrustPath\TrustPath;
 use Webauthn\TrustPath\TrustPathLoader;
 use function array_key_exists;
+use function sprintf;
 
 class AttestationStatement implements JsonSerializable
 {

src/webauthn/src/AttestationStatement/AttestationStatementSupportManager.php

@@ -6,6 +6,7 @@
 
 use Webauthn\Exception\InvalidDataException;
 use function array_key_exists;
+use function sprintf;
 
 class AttestationStatementSupportManager
 {

src/webauthn/src/AttestationStatement/FidoU2FAttestationStatementSupport.php

@@ -24,6 +24,7 @@
 use function is_array;
 use function openssl_pkey_get_public;
 use function openssl_verify;
+use function sprintf;
 use const OPENSSL_ALGO_SHA256;
 
 final class FidoU2FAttestationStatementSupport implements AttestationStatementSupport, CanDispatchEvents

src/webauthn/src/AttestationStatement/TPMAttestationStatementSupport.php

@@ -36,6 +36,7 @@
 use function is_array;
 use function is_int;
 use function openssl_verify;
+use function sprintf;
 use function unpack;
 
 final class TPMAttestationStatementSupport implements AttestationStatementSupport, CanDispatchEvents

src/webauthn/src/AuthenticationExtensions/AuthenticationExtensions.php

@@ -14,6 +14,7 @@
 use function array_key_exists;
 use function count;
 use function is_string;
+use function sprintf;
 use const COUNT_NORMAL;
 
 /**

src/webauthn/src/AuthenticatorAssertionResponseValidator.php

@@ -22,6 +22,7 @@
 use Webauthn\MetadataService\CanLogData;
 use Webauthn\TokenBinding\TokenBindingHandler;
 use function is_string;
+use function sprintf;
 
 class AuthenticatorAssertionResponseValidator implements CanLogData, CanDispatchEvents
 {

src/webauthn/src/AuthenticatorAttestationResponseValidator.php

@@ -24,6 +24,7 @@
 use Webauthn\MetadataService\StatusReportRepository;
 use Webauthn\TokenBinding\TokenBindingHandler;
 use function is_string;
+use function sprintf;
 
 class AuthenticatorAttestationResponseValidator implements CanLogData, CanDispatchEvents
 {

src/webauthn/src/CeremonyStep/CheckAlgorithm.php

@@ -19,6 +19,7 @@
 use function count;
 use function in_array;
 use function is_array;
+use function sprintf;
 
 class CheckAlgorithm implements CeremonyStep
 {
@@ -33,7 +34,7 @@ public function process(
             return;
         }
         $credentialPublicKey = $publicKeyCredentialSource->getAttestedCredentialData()
-->credentialPublicKey;
+            ->credentialPublicKey;
         $credentialPublicKey !== null || throw AuthenticatorResponseVerificationException::create(
             'No public key available.'
         );

src/webauthn/src/CeremonyStep/CheckMetadataStatement.php

@@ -22,6 +22,7 @@
 use Webauthn\TrustPath\CertificateTrustPath;
 use function count;
 use function in_array;
+use function sprintf;
 
 final class CheckMetadataStatement implements CeremonyStep, CanLogData
 {

src/webauthn/src/CeremonyStep/CheckSignature.php

@@ -43,7 +43,7 @@ public function process(
             return;
         }
         $credentialPublicKey = $publicKeyCredentialSource->getAttestedCredentialData()
-->credentialPublicKey;
+            ->credentialPublicKey;
         $credentialPublicKey !== null || throw AuthenticatorResponseVerificationException::create(
             'No public key available.'
         );

src/webauthn/src/ClientDataCollector/WebauthnAuthenticationCollector.php

@@ -9,6 +9,7 @@
 use Webauthn\Exception\AuthenticatorResponseVerificationException;
 use Webauthn\PublicKeyCredentialOptions;
 use function in_array;
+use function sprintf;
 
 final class WebauthnAuthenticationCollector implements ClientDataCollector
 {

src/webauthn/src/CollectedClientData.php

@@ -10,6 +10,7 @@
 use function array_key_exists;
 use function is_array;
 use function is_string;
+use function sprintf;
 use const JSON_THROW_ON_ERROR;
 
 class CollectedClientData

src/webauthn/src/Denormalizer/AttestationObjectDenormalizer.php

@@ -46,8 +46,12 @@ public function denormalize(mixed $data, string $type, ?string $format = null, a
         );
     }
 
-    public function supportsDenormalization(mixed $data, string $type, ?string $format = null, array $context = []): bool
-    {
+    public function supportsDenormalization(
+        mixed $data,
+        string $type,
+        ?string $format = null,
+        array $context = []
+    ): bool {
         return $type === AttestationObject::class;
     }