Drop compatibility for old spomky-labs/otphp

Author: scheb

app/composer.json

@@ -10,7 +10,7 @@
         "endroid/qr-code": "^4.0",
         "lcobucci/clock": "^3.0",
         "lcobucci/jwt": "^5.0",
-        "spomky-labs/otphp": "^11.0",
+        "spomky-labs/otphp": "^11.3",
         "symfony/dotenv": "^7.4 || ^8.0",
         "symfony/mailer": "^7.4 || ^8.0",
         "symfony/monolog-bundle": "^3.1",

composer.json

@@ -16,7 +16,7 @@
         "ext-json": "*",
         "lcobucci/clock": "^3.0",
         "lcobucci/jwt": "^5.0",
-        "spomky-labs/otphp": "^11.0",
+        "spomky-labs/otphp": "^11.3",
         "symfony/config": "^7.4 || ^8.0",
         "symfony/dependency-injection": "^7.4 || ^8.0",
         "symfony/event-dispatcher": "^7.4 || ^8.0",

src/google-authenticator/Security/TwoFactor/Provider/Google/GoogleTotpFactory.php

@@ -7,7 +7,6 @@
 use OTPHP\TOTP;
 use OTPHP\TOTPInterface;
 use Psr\Clock\ClockInterface;
-use ReflectionClass;
 use Scheb\TwoFactorBundle\Model\Google\TwoFactorInterface;
 use Scheb\TwoFactorBundle\Security\TwoFactor\Provider\Exception\TwoFactorProviderLogicException;
 use function strlen;
@@ -32,14 +31,8 @@ public function createTotpForUser(TwoFactorInterface $user): TOTPInterface
             throw new TwoFactorProviderLogicException('Cannot initialize TOTP, no secret code provided.');
         }
 
-        // Compatibility for spomky-labs/otphp version 12
-        if ((new ReflectionClass(TOTP::class))->hasProperty('clock')) {
-            /** @psalm-suppress ArgumentTypeCoercion */
-            $totp = TOTP::create($secret, 30, 'sha1', $this->digits, clock: $this->clock);
-        } else {
-            /** @psalm-suppress ArgumentTypeCoercion */
-            $totp = TOTP::create($secret, 30, 'sha1', $this->digits);
-        }
+        /** @psalm-suppress ArgumentTypeCoercion */
+        $totp = TOTP::create($secret, 30, 'sha1', $this->digits, clock: $this->clock);
 
         $userAndHost = $user->getGoogleAuthenticatorUsername().(null !== $this->server && $this->server ? '@'.$this->server : '');
         $totp->setLabel($userAndHost);

src/google-authenticator/composer.json

@@ -14,7 +14,7 @@
     "require": {
         "php": "~8.4.0 || ~8.5.0",
         "scheb/2fa-bundle": "self.version",
-        "spomky-labs/otphp": "^11.0"
+        "spomky-labs/otphp": "^11.3"
     },
     "autoload": {
         "psr-4": {

src/totp/Security/TwoFactor/Provider/Totp/TotpFactory.php

@@ -7,7 +7,6 @@
 use OTPHP\TOTP;
 use OTPHP\TOTPInterface;
 use Psr\Clock\ClockInterface;
-use ReflectionClass;
 use Scheb\TwoFactorBundle\Model\Totp\TwoFactorInterface;
 use Scheb\TwoFactorBundle\Security\TwoFactor\Provider\Exception\TwoFactorProviderLogicException;
 use function strlen;
@@ -40,25 +39,14 @@ public function createTotpForUser(TwoFactorInterface $user): TOTPInterface
             throw new TwoFactorProviderLogicException('Cannot initialize TOTP, no secret code provided.');
         }
 
-        // Compatibility for spomky-labs/otphp version 12
-        if ((new ReflectionClass(TOTP::class))->hasProperty('clock')) {
-            /** @psalm-suppress ArgumentTypeCoercion */
-            $totp = TOTP::create(
-                $secret,
-                $totpConfiguration->getPeriod(),
-                $totpConfiguration->getAlgorithm(),
-                $totpConfiguration->getDigits(),
-                clock: $this->clock,
-            );
-        } else {
-            /** @psalm-suppress ArgumentTypeCoercion */
-            $totp = TOTP::create(
-                $secret,
-                $totpConfiguration->getPeriod(),
-                $totpConfiguration->getAlgorithm(),
-                $totpConfiguration->getDigits(),
-            );
-        }
+        /** @psalm-suppress ArgumentTypeCoercion */
+        $totp = TOTP::create(
+            $secret,
+            $totpConfiguration->getPeriod(),
+            $totpConfiguration->getAlgorithm(),
+            $totpConfiguration->getDigits(),
+            clock: $this->clock,
+        );
 
         $userAndHost = $user->getTotpAuthenticationUsername().(null !== $this->server && $this->server ? '@'.$this->server : '');
         $totp->setLabel($userAndHost);

src/totp/composer.json

@@ -14,7 +14,7 @@
     "require": {
         "php": "~8.4.0 || ~8.5.0",
         "scheb/2fa-bundle": "self.version",
-        "spomky-labs/otphp": "^11.0"
+        "spomky-labs/otphp": "^11.3"
     },
     "autoload": {
         "psr-4": {