Skip to content

Commit 0f50b3f

Browse files
authored
Add sprintf utility usage across multiple classes (#669)
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.
1 parent 3cd37d3 commit 0f50b3f

File tree

78 files changed

+178
-42
lines changed

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

78 files changed

+178
-42
lines changed

.github/workflows/integrate.yml

Lines changed: 2 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -59,9 +59,7 @@ jobs:
5959
- "8.1"
6060
- "8.2"
6161
- "8.3"
62-
dependencies:
63-
- "lowest"
64-
- "highest"
62+
- "8.4"
6563
runs-on: ${{ matrix.operating-system }}
6664
steps:
6765
- name: "Set up PHP"
@@ -98,7 +96,7 @@ jobs:
9896
operating-system:
9997
- "ubuntu-latest"
10098
php-version:
101-
- "8.2"
99+
- "8.3"
102100
runs-on: ${{ matrix.operating-system }}
103101
steps:
104102
- name: "Set up PHP"

composer.json

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -120,7 +120,6 @@
120120
"symfony/filesystem": "^6.4|^7.0",
121121
"symfony/finder": "^6.4|^7.0",
122122
"symfony/monolog-bundle": "^3.8",
123-
"symfony/phpunit-bridge": "^6.4|^7.0",
124123
"symfony/var-dumper": "^6.4|^7.0",
125124
"symfony/yaml": "^6.4|^7.0",
126125
"symplify/easy-coding-standard": "^12.0"

phpstan-baseline.neon

Lines changed: 25 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -2706,6 +2706,11 @@ parameters:
27062706
count: 1
27072707
path: src/webauthn/src/MetadataService/Service/DistantResourceMetadataService.php
27082708

2709+
-
2710+
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\\.$#"
2711+
count: 1
2712+
path: src/webauthn/src/MetadataService/Service/DistantResourceMetadataService.php
2713+
27092714
-
27102715
message: "#^Argument of an invalid type mixed supplied for foreach, only iterables are supported\\.$#"
27112716
count: 1
@@ -2759,6 +2764,11 @@ parameters:
27592764
count: 1
27602765
path: src/webauthn/src/MetadataService/Service/FidoAllianceCompliantMetadataService.php
27612766

2767+
-
2768+
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\\.$#"
2769+
count: 1
2770+
path: src/webauthn/src/MetadataService/Service/FidoAllianceCompliantMetadataService.php
2771+
27622772
-
27632773
message: """
27642774
#^Call to deprecated method createFromString\\(\\) of class Webauthn\\\\MetadataService\\\\Statement\\\\MetadataStatement\\:
@@ -2772,6 +2782,11 @@ parameters:
27722782
count: 1
27732783
path: src/webauthn/src/MetadataService/Service/FolderResourceMetadataService.php
27742784

2785+
-
2786+
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\\.$#"
2787+
count: 1
2788+
path: src/webauthn/src/MetadataService/Service/FolderResourceMetadataService.php
2789+
27752790
-
27762791
message: """
27772792
#^Call to deprecated method createFromString\\(\\) of class Webauthn\\\\MetadataService\\\\Statement\\\\MetadataStatement\\:
@@ -2780,6 +2795,11 @@ parameters:
27802795
count: 1
27812796
path: src/webauthn/src/MetadataService/Service/JsonMetadataService.php
27822797

2798+
-
2799+
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\\.$#"
2800+
count: 1
2801+
path: src/webauthn/src/MetadataService/Service/JsonMetadataService.php
2802+
27832803
-
27842804
message: """
27852805
#^Call to deprecated method createFromString\\(\\) of class Webauthn\\\\MetadataService\\\\Statement\\\\MetadataStatement\\:
@@ -2798,6 +2818,11 @@ parameters:
27982818
count: 1
27992819
path: src/webauthn/src/MetadataService/Service/LocalResourceMetadataService.php
28002820

2821+
-
2822+
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\\.$#"
2823+
count: 1
2824+
path: src/webauthn/src/MetadataService/Service/LocalResourceMetadataService.php
2825+
28012826
-
28022827
message: "#^Parameter \\#1 \\$data of static method Webauthn\\\\MetadataService\\\\Service\\\\MetadataBLOBPayloadEntry\\:\\:createFromArray\\(\\) expects array\\<string, mixed\\>, mixed given\\.$#"
28032828
count: 1

phpunit.xml.dist

Lines changed: 0 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -18,9 +18,6 @@
1818
<ini name="error_reporting" value="-1"/>
1919
<server name="APP_ENV" value="test" force="true"/>
2020
<server name="SHELL_VERBOSITY" value="-1"/>
21-
<server name="SYMFONY_PHPUNIT_REMOVE" value=""/>
22-
<server name="SYMFONY_PHPUNIT_VERSION" value="10.1"/>
23-
<env name="SYMFONY_DEPRECATIONS_HELPER" value="max[self]=0"/>
2421
<env name="APP_DEBUG" value="true"/>
2522
<server name="KERNEL_CLASS" value="Webauthn\Tests\Bundle\Functional\AppKernel"/>
2623
<ini name="memory_limit" value="-1"/>

src/symfony/src/Controller/AttestationResponseController.php

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -25,6 +25,7 @@
2525
use Webauthn\PublicKeyCredentialLoader;
2626
use Webauthn\PublicKeyCredentialSourceRepository;
2727
use Webauthn\PublicKeyCredentialUserEntity;
28+
use function sprintf;
2829

2930
final class AttestationResponseController
3031
{

src/symfony/src/CredentialOptionsBuilder/ProfileBasedCreationOptionsBuilder.php

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -22,6 +22,7 @@
2222
use Webauthn\PublicKeyCredentialUserEntity;
2323
use function count;
2424
use function is_array;
25+
use function sprintf;
2526
use const FILTER_VALIDATE_BOOLEAN;
2627

2728
final class ProfileBasedCreationOptionsBuilder implements PublicKeyCredentialCreationOptionsBuilder

src/symfony/src/CredentialOptionsBuilder/ProfileBasedRequestOptionsBuilder.php

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -23,6 +23,7 @@
2323
use Webauthn\PublicKeyCredentialUserEntity;
2424
use function count;
2525
use function is_array;
26+
use function sprintf;
2627

2728
final class ProfileBasedRequestOptionsBuilder implements PublicKeyCredentialRequestOptionsBuilder
2829
{

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

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -9,6 +9,7 @@
99
use Symfony\Component\DependencyInjection\ContainerBuilder;
1010
use Webauthn\Bundle\Routing\Loader;
1111
use function array_key_exists;
12+
use function sprintf;
1213

1314
final class DynamicRouteCompilerPass implements CompilerPassInterface
1415
{

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

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -39,6 +39,7 @@
3939
use Webauthn\FakeCredentialGenerator;
4040
use function array_key_exists;
4141
use function assert;
42+
use function sprintf;
4243

4344
final class WebauthnFactory implements FirewallListenerFactoryInterface, AuthenticatorFactoryInterface
4445
{

src/symfony/src/DependencyInjection/WebauthnExtension.php

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -57,6 +57,7 @@
5757
use function array_key_exists;
5858
use function count;
5959
use function is_array;
60+
use function sprintf;
6061

6162
final class WebauthnExtension extends Extension implements PrependExtensionInterface
6263
{

0 commit comments

Comments
 (0)