Add compatibility with endroid/qr-code v6

CHANGELOG-5.x.md

@@ -1,3 +1,8 @@
+5.4.0
+-----
+
+* QR code generation: Add compatibility with endroid/qr-code v6
+
 5.3.2
 -----
 

composer.json

@@ -43,7 +43,7 @@
         "doctrine/data-fixtures": "^1.6",
         "doctrine/persistence": "^3.2",
         "easycorp/easyadmin-bundle": "^4.8.5",
-        "endroid/qr-code": "^4.8 || ^5.0",
+        "endroid/qr-code": "^4.8 || ^5.0 || ^6.0",
         "friendsofphp/php-cs-fixer": "^3.49.0",
         "fakerphp/faker": "^1.23",
         "google/recaptcha": "^1.3",

phpstan-baseline.neon

@@ -25,6 +25,16 @@ parameters:
 			count: 1
 			path: src/Paginator/DoctrineORMPaginator.php
 
+		-
+			message: "#^Call to an undefined static method Endroid\\\\QrCode\\\\Builder\\\\Builder\\:\\:create\\(\\)\\.$#"
+			count: 1
+			path: src/Twig/Extension/QrCodeExtension.php
+
+		-
+			message: "#^Call to function method_exists\\(\\) with 'Endroid\\\\\\\\QrCode\\\\\\\\Builder\\\\\\\\Builder' and 'createBuilder' will always evaluate to false\\.$#"
+			count: 1
+			path: src/Twig/Extension/QrCodeExtension.php
+
 		-
 			message: "#^Method Leapt\\\\CoreBundle\\\\Tests\\\\LeaptCoreTestingKernel\\:\\:configureContainer\\(\\) is unused\\.$#"
 			count: 1

src/Twig/Extension/QrCodeExtension.php

@@ -41,16 +41,33 @@ public function getQrCodeFromString(string $qrCodeContent, int $size = 200, int
             $roundBlockSizeMode = new RoundBlockSizeModeMargin();
         }
 
-        $result = Builder::create()
-            ->writer(new PngWriter())
-            ->writerOptions([])
-            ->data($qrCodeContent)
-            ->encoding(new Encoding('UTF-8'))
-            ->errorCorrectionLevel($errorCorrectionLevel)
-            ->size($size)
-            ->margin($margin)
-            ->roundBlockSizeMode($roundBlockSizeMode)
-            ->build();
+        if (method_exists(Builder::class, 'createBuilder')) {
+            // v4 & v5
+            $result = Builder::create()
+                ->writer(new PngWriter())
+                ->writerOptions([])
+                ->data($qrCodeContent)
+                ->encoding(new Encoding('UTF-8'))
+                ->errorCorrectionLevel($errorCorrectionLevel)
+                ->size($size)
+                ->margin($margin)
+                ->roundBlockSizeMode($roundBlockSizeMode)
+                ->build();
+        } else {
+            // v6
+            $builder = new Builder(
+                writer: new PngWriter(),
+                writerOptions: [],
+                data: $qrCodeContent,
+                encoding: new Encoding('UTF-8'),
+                errorCorrectionLevel: $errorCorrectionLevel,
+                size: $size,
+                margin: $margin,
+                roundBlockSizeMode: $roundBlockSizeMode,
+            );
+
+            $result = $builder->build();
+        }
 
         return $result->getDataUri();
     }