Merge pull request #818 from web-auth/fix/reduce-phpstan-baseline-v3

fix: reduce PHPStan baseline from 82 to 67 errors

Author: Spomky

.ci-tools/phpstan-baseline.neon

@@ -54,12 +54,6 @@ parameters:
 			count: 1
 			path: ../src/symfony/src/Controller/AttestationControllerFactory.php
 
-		-
-			rawMessage: 'Method Webauthn\Bundle\CredentialOptionsBuilder\PublicKeyCredentialCreationOptionsBuilder::getFromRequest() invoked with 3 parameters, 2 required.'
-			identifier: arguments.count
-			count: 1
-			path: ../src/symfony/src/Controller/AttestationRequestController.php
-
 		-
 			rawMessage: '''
 				Instanceof references deprecated interface Webauthn\Bundle\Repository\CanSaveCredentialSource:
@@ -123,18 +117,6 @@ parameters:
 			count: 1
 			path: ../src/symfony/src/CredentialOptionsBuilder/ProfileBasedRequestOptionsBuilder.php
 
-		-
-			rawMessage: 'Method Webauthn\Bundle\DataCollector\WebauthnCollector::getData() return type has no value type specified in iterable type array.'
-			identifier: missingType.iterableValue
-			count: 1
-			path: ../src/symfony/src/DataCollector/WebauthnCollector.php
-
-		-
-			rawMessage: 'Method Webauthn\Bundle\DataCollector\WebauthnCollector::getData() return type has no value type specified in iterable type array|Symfony\Component\VarDumper\Cloner\Data.'
-			identifier: missingType.iterableValue
-			count: 1
-			path: ../src/symfony/src/DataCollector/WebauthnCollector.php
-
 		-
 			rawMessage: '''
 				Call to deprecated method setSecuredRelyingPartyId() of class Webauthn\Bundle\DependencyInjection\Compiler\CeremonyStepManagerFactoryCompilerPass:
@@ -144,12 +126,6 @@ parameters:
 			count: 1
 			path: ../src/symfony/src/DependencyInjection/Compiler/CeremonyStepManagerFactoryCompilerPass.php
 
-		-
-			rawMessage: 'Parameter #1 $value of method Webauthn\Bundle\DependencyInjection\Compiler\PasskeyEndpointsCompilerPass::createUrlDefinition() expects array<string, mixed>|string, array|bool|float|int|string given.'
-			identifier: argument.type
-			count: 3
-			path: ../src/symfony/src/DependencyInjection/Compiler/PasskeyEndpointsCompilerPass.php
-
 		-
 			rawMessage: '''
 				Access to constant on deprecated interface Webauthn\Bundle\Repository\PublicKeyCredentialSourceRepositoryInterface:
@@ -174,48 +150,6 @@ parameters:
 			count: 3
 			path: ../src/symfony/src/DependencyInjection/WebauthnExtension.php
 
-		-
-			rawMessage: Cannot access offset 'types' on mixed.
-			identifier: offsetAccess.nonOffsetAccessible
-			count: 2
-			path: ../src/symfony/src/DependencyInjection/WebauthnExtension.php
-
-		-
-			rawMessage: 'Method Webauthn\Bundle\DependencyInjection\WebauthnExtension::loadControllersSupport() has parameter $config with no value type specified in iterable type array.'
-			identifier: missingType.iterableValue
-			count: 1
-			path: ../src/symfony/src/DependencyInjection/WebauthnExtension.php
-
-		-
-			rawMessage: 'Parameter #2 $config of method Webauthn\Bundle\DependencyInjection\WebauthnExtension::loadCreationControllersSupport() expects array<string, array{options_builder: string|null, profile: string, user_entity_guesser: string, options_storage: string|null, options_handler: string, failure_handler: string, success_handler: string, hide_existing_credentials: bool, ...}>, mixed given.'
-			identifier: argument.type
-			count: 1
-			path: ../src/symfony/src/DependencyInjection/WebauthnExtension.php
-
-		-
-			rawMessage: 'Parameter #2 $config of method Webauthn\Bundle\DependencyInjection\WebauthnExtension::loadRequestControllersSupport() expects array<string, array{options_builder: string|null, profile: string, options_storage: string|null, options_handler: string, failure_handler: string, success_handler: string, options_method: string, options_path: string, ...}>, mixed given.'
-			identifier: argument.type
-			count: 1
-			path: ../src/symfony/src/DependencyInjection/WebauthnExtension.php
-
-		-
-			rawMessage: 'Parameter #1 $value (string|Webauthn\AttestedCredentialData|null) of method Webauthn\Bundle\Doctrine\Type\AttestedCredentialDataType::convertToDatabaseValue() should be contravariant with parameter $value (mixed) of method Doctrine\DBAL\Types\JsonType::convertToDatabaseValue()'
-			identifier: method.childParameterType
-			count: 1
-			path: ../src/symfony/src/Doctrine/Type/AttestedCredentialDataType.php
-
-		-
-			rawMessage: 'Parameter #1 $value (string|Webauthn\PublicKeyCredentialDescriptor|null) of method Webauthn\Bundle\Doctrine\Type\PublicKeyCredentialDescriptorType::convertToDatabaseValue() should be contravariant with parameter $value (mixed) of method Doctrine\DBAL\Types\JsonType::convertToDatabaseValue()'
-			identifier: method.childParameterType
-			count: 1
-			path: ../src/symfony/src/Doctrine/Type/PublicKeyCredentialDescriptorType.php
-
-		-
-			rawMessage: 'Parameter #1 $value (string|Webauthn\TrustPath\TrustPath|null) of method Webauthn\Bundle\Doctrine\Type\TrustPathDataType::convertToDatabaseValue() should be contravariant with parameter $value (mixed) of method Doctrine\DBAL\Types\JsonType::convertToDatabaseValue()'
-			identifier: method.childParameterType
-			count: 1
-			path: ../src/symfony/src/Doctrine/Type/TrustPathDataType.php
-
 		-
 			rawMessage: '''
 				Class Webauthn\Bundle\Repository\DummyPublicKeyCredentialSourceRepository implements deprecated interface Webauthn\Bundle\Repository\PublicKeyCredentialSourceRepositoryInterface:
@@ -255,42 +189,6 @@ parameters:
 			count: 1
 			path: ../src/symfony/src/Security/Authentication/WebauthnBadge.php
 
-		-
-			rawMessage: Class Webauthn\Bundle\Security\Authentication\WebauthnBadge has an uninitialized property $authenticatorResponse. Give it default value or assign it in the constructor.
-			identifier: property.uninitialized
-			count: 1
-			path: ../src/symfony/src/Security/Authentication/WebauthnBadge.php
-
-		-
-			rawMessage: Class Webauthn\Bundle\Security\Authentication\WebauthnBadge has an uninitialized property $publicKeyCredentialOptions. Give it default value or assign it in the constructor.
-			identifier: property.uninitialized
-			count: 1
-			path: ../src/symfony/src/Security/Authentication/WebauthnBadge.php
-
-		-
-			rawMessage: Class Webauthn\Bundle\Security\Authentication\WebauthnBadge has an uninitialized property $publicKeyCredentialSource. Give it default value or assign it in the constructor.
-			identifier: property.uninitialized
-			count: 1
-			path: ../src/symfony/src/Security/Authentication/WebauthnBadge.php
-
-		-
-			rawMessage: Class Webauthn\Bundle\Security\Authentication\WebauthnBadge has an uninitialized property $publicKeyCredentialUserEntity. Give it default value or assign it in the constructor.
-			identifier: property.uninitialized
-			count: 1
-			path: ../src/symfony/src/Security/Authentication/WebauthnBadge.php
-
-		-
-			rawMessage: Class Webauthn\Bundle\Security\Authentication\WebauthnBadge has an uninitialized property $user. Give it default value or assign it in the constructor.
-			identifier: property.uninitialized
-			count: 1
-			path: ../src/symfony/src/Security/Authentication/WebauthnBadge.php
-
-		-
-			rawMessage: 'Webauthn\Bundle\Security\Authentication\WebauthnBadge::__construct() does not call parent constructor from Symfony\Component\Security\Http\Authenticator\Passport\Badge\UserBadge.'
-			identifier: constructor.missingParentCall
-			count: 1
-			path: ../src/symfony/src/Security/Authentication/WebauthnBadge.php
-
 		-
 			rawMessage: '''
 				Access to deprecated property $name of class Webauthn\PublicKeyCredentialEntity:
@@ -369,36 +267,12 @@ parameters:
 			count: 1
 			path: ../src/symfony/src/Security/Http/Authenticator/WebauthnAuthenticator.php
 
-		-
-			rawMessage: Cannot cast mixed to int.
-			identifier: cast.int
-			count: 1
-			path: ../src/webauthn/src/AttestationStatement/AndroidKeyAttestationStatementSupport.php
-
-		-
-			rawMessage: Class Webauthn\AttestationStatement\CompoundAttestationStatementSupport has an uninitialized property $attestationStatementSupportManager. Give it default value or assign it in the constructor.
-			identifier: property.uninitialized
-			count: 1
-			path: ../src/webauthn/src/AttestationStatement/CompoundAttestationStatementSupport.php
-
 		-
 			rawMessage: 'Parameter #2 $attStmt of static method Webauthn\AttestationStatement\AttestationStatement::create() expects array<string, mixed>, list<Webauthn\AttestationStatement\AttestationStatement> given.'
 			identifier: argument.type
 			count: 1
 			path: ../src/webauthn/src/AttestationStatement/CompoundAttestationStatementSupport.php
 
-		-
-			rawMessage: Cannot cast mixed to int.
-			identifier: cast.int
-			count: 2
-			path: ../src/webauthn/src/AttestationStatement/PackedAttestationStatementSupport.php
-
-		-
-			rawMessage: Cannot cast mixed to int.
-			identifier: cast.int
-			count: 2
-			path: ../src/webauthn/src/AttestationStatement/TPMAttestationStatementSupport.php
-
 		-
 			rawMessage: '''
 				Instanceof references deprecated class Webauthn\PublicKeyCredentialSource:
@@ -672,18 +546,6 @@ parameters:
 			count: 1
 			path: ../src/webauthn/src/MetadataService/Psr18HttpClient.php
 
-		-
-			rawMessage: 'Return type (array<array<string>>) of method Symfony\Contracts\HttpClient\ResponseInterface@anonymous/webauthn/src/MetadataService/Psr18HttpClient.php:84::getHeaders() should be covariant with return type (array<string, list<string>>) of method Symfony\Contracts\HttpClient\ResponseInterface::getHeaders()'
-			identifier: method.childReturnType
-			count: 1
-			path: ../src/webauthn/src/MetadataService/Psr18HttpClient.php
-
-		-
-			rawMessage: 'Parameter &$rootCertificates by-ref type of method Webauthn\MetadataService\Service\FidoAllianceCompliantMetadataService::getJwsPayload() expects array<string>, array<mixed, mixed> given.'
-			identifier: parameterByRef.type
-			count: 1
-			path: ../src/webauthn/src/MetadataService/Service/FidoAllianceCompliantMetadataService.php
-
 		-
 			rawMessage: '''
 				Fetching deprecated class constant AUTHENTICATOR_TRANSPORT_CABLE of class Webauthn\PublicKeyCredentialDescriptor:

src/symfony/src/CredentialOptionsBuilder/PublicKeyCredentialCreationOptionsBuilder.php

@@ -13,6 +13,6 @@ interface PublicKeyCredentialCreationOptionsBuilder
     public function getFromRequest(
         Request $request,
         PublicKeyCredentialUserEntity $userEntity,
-        /*bool $hideExistingExcludedCredentials = false*/
+        bool $hideExistingExcludedCredentials = false,
     ): PublicKeyCredentialCreationOptions;
 }

src/symfony/src/DataCollector/WebauthnCollector.php

@@ -73,9 +73,14 @@ public function collect(Request $request, Response $response, ?Throwable $except
         ];
     }
 
+    /**
+     * @return array<string, mixed>|Data
+     */
     public function getData(): array|Data
     {
-        return $this->data;
+        /** @var array<string, mixed>|Data $data */
+        $data = $this->data;
+        return $data;
     }
 
     public function getName(): string

src/symfony/src/DependencyInjection/Compiler/PasskeyEndpointsCompilerPass.php

@@ -38,8 +38,11 @@ public function process(ContainerBuilder $container): void
 
     private function createPasskeyEndpointsResponse(ContainerBuilder $container): void
     {
+        /** @var string|array<string, mixed>|null $enroll */
         $enroll = $container->getParameter('webauthn.passkey_endpoints.enroll');
+        /** @var string|array<string, mixed>|null $manage */
         $manage = $container->getParameter('webauthn.passkey_endpoints.manage');
+        /** @var string|array<string, mixed>|null $prfUsageDetails */
         $prfUsageDetails = $container->getParameter('webauthn.passkey_endpoints.prf_usage_details');
 
         // Create Url definitions from string configuration

src/symfony/src/DependencyInjection/WebauthnExtension.php

@@ -140,7 +140,7 @@ public function prepend(ContainerBuilder $container): void
         if (! is_array($config)) {
             return;
         }
-        /** @var array<string, class-string> $types */
+        /** @var array{dbal?: array{types?: array<string, class-string>}} $config */
         $types = $config['dbal']['types'] ?? [];
         $types += [
             'attested_credential_data' => DbalType\AttestedCredentialDataType::class,
@@ -170,14 +170,21 @@ private function getDoctrineBundleConfiguration(ContainerBuilder $container): ?a
         return count($configs) === 0 ? null : current($configs);
     }
 
+    /**
+     * @param array{enabled: bool, creation?: array<string, mixed>, request?: array<string, mixed>} $config
+     */
     private function loadControllersSupport(ContainerBuilder $container, array $config): void
     {
         if ($config['enabled'] === false) {
             return;
         }
 
-        $this->loadCreationControllersSupport($container, $config['creation'] ?? []);
-        $this->loadRequestControllersSupport($container, $config['request'] ?? []);
+        /** @var array<string, array{options_builder: string|null, profile: string, user_entity_guesser: string, options_storage: string|null, options_handler: string, failure_handler: string, success_handler: string, hide_existing_credentials: bool, options_method: string, options_path: string, result_method: string, result_path: string|null, host: string|null, secured_rp_ids: array<string>}> $creation */
+        $creation = $config['creation'] ?? [];
+        /** @var array<string, array{options_builder: string|null, profile: string, options_storage: string|null, options_handler: string, failure_handler: string, success_handler: string, options_method: string, options_path: string, result_method: string, result_path: string|null, host: string|null, secured_rp_ids: array<string>}> $request */
+        $request = $config['request'] ?? [];
+        $this->loadCreationControllersSupport($container, $creation);
+        $this->loadRequestControllersSupport($container, $request);
     }
 
     /**

src/symfony/src/Doctrine/Type/AttestedCredentialDataType.php

@@ -4,20 +4,20 @@
 
 namespace Webauthn\Bundle\Doctrine\Type;
 
+use function assert;
 use Doctrine\DBAL\Platforms\AbstractPlatform;
 use Doctrine\DBAL\Types\JsonType;
+use function is_string;
 use Webauthn\AttestedCredentialData;
 
 final class AttestedCredentialDataType extends JsonType
 {
     use SerializerTrait;
 
-    /**
-     * @param AttestedCredentialData|string|null $value
-     */
-    public function convertToDatabaseValue($value, AbstractPlatform $platform): ?string
+    public function convertToDatabaseValue(mixed $value, AbstractPlatform $platform): ?string
     {
         if (! $value instanceof AttestedCredentialData) {
+            assert($value === null || is_string($value));
             return $value;
         }
 

src/symfony/src/Doctrine/Type/PublicKeyCredentialDescriptorType.php

@@ -4,20 +4,20 @@
 
 namespace Webauthn\Bundle\Doctrine\Type;
 
+use function assert;
 use Doctrine\DBAL\Platforms\AbstractPlatform;
 use Doctrine\DBAL\Types\JsonType;
+use function is_string;
 use Webauthn\PublicKeyCredentialDescriptor;
 
 final class PublicKeyCredentialDescriptorType extends JsonType
 {
     use SerializerTrait;
 
-    /**
-     * @param PublicKeyCredentialDescriptor|string|null $value
-     */
-    public function convertToDatabaseValue($value, AbstractPlatform $platform): ?string
+    public function convertToDatabaseValue(mixed $value, AbstractPlatform $platform): ?string
     {
         if (! $value instanceof PublicKeyCredentialDescriptor) {
+            assert($value === null || is_string($value));
             return $value;
         }
 

src/symfony/src/Doctrine/Type/TrustPathDataType.php

@@ -4,20 +4,20 @@
 
 namespace Webauthn\Bundle\Doctrine\Type;
 
+use function assert;
 use Doctrine\DBAL\Platforms\AbstractPlatform;
 use Doctrine\DBAL\Types\JsonType;
+use function is_string;
 use Webauthn\TrustPath\TrustPath;
 
 final class TrustPathDataType extends JsonType
 {
     use SerializerTrait;
 
-    /**
-     * @param TrustPath|string|null $value
-     */
-    public function convertToDatabaseValue($value, AbstractPlatform $platform): ?string
+    public function convertToDatabaseValue(mixed $value, AbstractPlatform $platform): ?string
     {
         if (! $value instanceof TrustPath) {
+            assert($value === null || is_string($value));
             return $value;
         }