Adjust test for no longer supported passing of options array

Author: scheb

tests/Security/TwoFactor/Validator/Constraints/UserGoogleTotpCodeDummy.php

@@ -14,6 +14,11 @@ class UserGoogleTotpCodeDummy
     #[UserGoogleTotpCode(message: 'myMessage', translationDomain: 'myDomain', service: 'my_service')]
     public string $b;
 
-    #[UserGoogleTotpCode(['groups' => ['my_group'], 'payload' => 'some attached data'])]
+    #[UserGoogleTotpCode(groups: ['my_group'], payload: 'some attached data')]
     public string $c;
+
+    // Test backwards compatibility with Symfony 7.4
+    // Associative arrays are only supported under Symfony 7.4
+    #[UserGoogleTotpCode(['groups' => ['my_group'], 'payload' => 'some attached data'])]
+    public string $c74;
 }

tests/Security/TwoFactor/Validator/Constraints/UserGoogleTotpCodeTest.php

@@ -6,6 +6,7 @@
 
 use PHPUnit\Framework\Attributes\Test;
 use Scheb\TwoFactorBundle\Tests\TestCase;
+use Symfony\Component\HttpKernel\Kernel;
 use Symfony\Component\Validator\Mapping\ClassMetadata;
 use Symfony\Component\Validator\Mapping\Loader\AttributeLoader;
 
@@ -32,5 +33,12 @@ public function configureConstraintFromAttribute_configurationIsCorrect(): void
         [$cConstraint] = $metadata->getPropertyMetadata('c')[0]->getConstraints();
         $this->assertSame(['my_group'], $cConstraint->groups);
         $this->assertSame('some attached data', $cConstraint->payload);
+
+        // Backwards compatibility for Symfony 7.4
+        if (Kernel::VERSION_ID < 80000) {
+            [$cConstraint] = $metadata->getPropertyMetadata('c')[0]->getConstraints();
+            $this->assertSame(['my_group'], $cConstraint->groups);
+            $this->assertSame('some attached data', $cConstraint->payload);
+        }
     }
 }

tests/Security/TwoFactor/Validator/Constraints/UserGoogleTotpCodeValidatorTest.php

@@ -12,6 +12,7 @@
 use Scheb\TwoFactorBundle\Security\TwoFactor\Validator\Constraints\UserGoogleTotpCode;
 use Scheb\TwoFactorBundle\Security\TwoFactor\Validator\Constraints\UserGoogleTotpCodeValidator;
 use Scheb\TwoFactorBundle\Tests\Security\TwoFactor\Provider\Google\UserWithTwoFactorInterface;
+use Symfony\Component\HttpKernel\Kernel;
 use Symfony\Component\Security\Core\Authentication\Token\Storage\TokenStorageInterface;
 use Symfony\Component\Security\Core\Authentication\Token\TokenInterface;
 use Symfony\Component\Security\Core\User\UserInterface;
@@ -76,7 +77,10 @@ public function validate_invalidCode_raisedViolation(UserGoogleTotpCode $constra
      */
     public static function provideConstraints(): iterable
     {
-        yield 'Doctrine style' => [new UserGoogleTotpCode(['message' => 'myMessage', 'translationDomain' => 'myDomain'])];
+        // Test backwards compatibility with Symfony 7.4
+        if (Kernel::VERSION_ID < 80000) {
+            yield 'Doctrine style' => [new UserGoogleTotpCode(['message' => 'myMessage', 'translationDomain' => 'myDomain'])];
+        }
 
         yield 'named arguments' => [new UserGoogleTotpCode(message: 'myMessage', translationDomain: 'myDomain')];
     }

tests/Security/TwoFactor/Validator/Constraints/UserTotpCodeDummy.php

@@ -14,6 +14,11 @@ class UserTotpCodeDummy
     #[UserTotpCode(message: 'myMessage', translationDomain: 'myDomain', service: 'my_service')]
     public string $b;
 
-    #[UserTotpCode(['groups' => ['my_group'], 'payload' => 'some attached data'])]
+    #[UserTotpCode(groups: ['my_group'], payload: 'some attached data')]
     public string $c;
+
+    // Test backwards compatibility with Symfony 7.4
+    // Associative arrays are only supported under Symfony 7.4
+    #[UserTotpCode(['groups' => ['my_group'], 'payload' => 'some attached data'])]
+    public string $c74;
 }

tests/Security/TwoFactor/Validator/Constraints/UserTotpCodeTest.php

@@ -6,6 +6,7 @@
 
 use PHPUnit\Framework\Attributes\Test;
 use Scheb\TwoFactorBundle\Tests\TestCase;
+use Symfony\Component\HttpKernel\Kernel;
 use Symfony\Component\Validator\Mapping\ClassMetadata;
 use Symfony\Component\Validator\Mapping\Loader\AttributeLoader;
 
@@ -32,5 +33,12 @@ public function configureConstraintFromAttribute_configurationIsCorrect(): void
         [$cConstraint] = $metadata->getPropertyMetadata('c')[0]->getConstraints();
         $this->assertSame(['my_group'], $cConstraint->groups);
         $this->assertSame('some attached data', $cConstraint->payload);
+
+        // Backwards compatibility for Symfony 7.4
+        if (Kernel::VERSION_ID < 80000) {
+            [$cConstraint] = $metadata->getPropertyMetadata('c74')[0]->getConstraints();
+            $this->assertSame(['my_group'], $cConstraint->groups);
+            $this->assertSame('some attached data', $cConstraint->payload);
+        }
     }
 }

tests/Security/TwoFactor/Validator/Constraints/UserTotpCodeValidatorTest.php

@@ -13,6 +13,7 @@
 use Scheb\TwoFactorBundle\Security\TwoFactor\Validator\Constraints\UserTotpCode;
 use Scheb\TwoFactorBundle\Security\TwoFactor\Validator\Constraints\UserTotpCodeValidator;
 use Scheb\TwoFactorBundle\Tests\Security\TwoFactor\Provider\Totp\UserWithTwoFactorInterface;
+use Symfony\Component\HttpKernel\Kernel;
 use Symfony\Component\Security\Core\Authentication\Token\Storage\TokenStorageInterface;
 use Symfony\Component\Security\Core\Authentication\Token\TokenInterface;
 use Symfony\Component\Security\Core\User\UserInterface;
@@ -77,7 +78,10 @@ public function validate_invalidCode_raisedViolation(UserTotpCode $constraint):
      */
     public static function provideConstraints(): iterable
     {
-        yield 'Doctrine style' => [new UserTotpCode(['message' => 'myMessage', 'translationDomain' => 'myDomain'])];
+        // Test backwards compatibility with Symfony 7.4
+        if (Kernel::VERSION_ID < 80000) {
+            yield 'Doctrine style' => [new UserTotpCode(['message' => 'myMessage', 'translationDomain' => 'myDomain'])];
+        }
 
         yield 'named arguments' => [new UserTotpCode(message: 'myMessage', translationDomain: 'myDomain')];
     }