[UserBundle] Upgrade endroid/qr-code package (#306)

mpoiriert · Nov 25, 2024 · 3a33e42 · 3a33e42
1 parent 13bb969
commit 3a33e42
Show file tree

Hide file tree

Showing 5 changed files with 21 additions and 27 deletions.
diff --git a/composer.json b/composer.json
@@ -86,7 +86,7 @@
         "doctrine/doctrine-fixtures-bundle": "^3.5",
         "doctrine/doctrine-migrations-bundle": "^3.1",
         "doctrine/sql-formatter": "^1.1",
-        "endroid/qr-code": "^5.0",
+        "endroid/qr-code": "^6.0",
         "ext-pcntl": "*",
         "firebase/php-jwt": "^6.1",
         "monolog/monolog": "^3.5.0",
@@ -305,4 +305,4 @@
     },
     "minimum-stability": "dev",
     "prefer-stable": true
-}
+}
diff --git a/composer.lock b/composer.lock
diff --git a/packages/sonata-integration-bundle/composer.json b/packages/sonata-integration-bundle/composer.json
@@ -28,7 +28,7 @@
         "phpunit/phpunit": "^11.3",
         "scheb/2fa-bundle": "^6.0",
         "scheb/2fa-email": "^6.0",
-        "endroid/qr-code": "^5.0",
+        "endroid/qr-code": "^6.0",
         "scheb/2fa-totp": "^6.0"
     },
     "minimum-stability": "dev",

diff --git a/packages/user-bundle/Security/TwoFactorAuthentication/QrCodeGenerator.php b/packages/user-bundle/Security/TwoFactorAuthentication/QrCodeGenerator.php
@@ -3,26 +3,20 @@
 namespace Draw\Bundle\UserBundle\Security\TwoFactorAuthentication;
 
 use Endroid\QrCode\Builder\Builder;
-use Endroid\QrCode\Encoding\Encoding;
 use Endroid\QrCode\ErrorCorrectionLevel;
-use Endroid\QrCode\RoundBlockSizeMode;
 use Endroid\QrCode\Writer\Result\ResultInterface;
 use Endroid\QrCode\Writer\SvgWriter;
 
 class QrCodeGenerator
 {
     public function getTotpQrCode(string $qrCodeContent): ResultInterface
     {
-        return Builder::create()
-            ->writer(new SvgWriter())
-            ->writerOptions([])
-            ->data($qrCodeContent)
-            ->encoding(new Encoding('UTF-8'))
-            ->errorCorrectionLevel(ErrorCorrectionLevel::High)
-            ->size(200)
-            ->margin(0)
-            ->roundBlockSizeMode(RoundBlockSizeMode::Margin)
-            ->build()
-        ;
+        return (new Builder(
+            new SvgWriter(),
+            data: $qrCodeContent,
+            errorCorrectionLevel: ErrorCorrectionLevel::High,
+            size: 200,
+            margin: 0,
+        ))->build();
     }
 }
diff --git a/packages/user-bundle/composer.json b/packages/user-bundle/composer.json
@@ -29,7 +29,7 @@
         "draw/messenger": "^0.15",
         "draw/security": "^0.15",
         "draw/tester": "^0.15",
-        "endroid/qr-code": "^5.0",
+        "endroid/qr-code": "^6.0",
         "firebase/php-jwt": "^6.1",
         "phpunit/phpunit": "^11.3",
         "scheb/2fa-bundle": "^6.0",