add support for endroid/qr-code (with logo) version 6 (#143)

* add support for endroid/qr-code version 6

* add endroid v6 to github workflows

* remove negative conditional (endroid-related)

---------

Co-authored-by: Clifford Vickrey <cvickrey@insuranceautomationgroup.com>

.github/workflows/test-endroid.yml

@@ -11,7 +11,7 @@ jobs:
     strategy:
       matrix:
         php-version: ['8.2', '8.3']
-        endroid-version: ["^3","^4","^5"]
+        endroid-version: ["^3","^4","^5","^6"]
 
     steps:
     - uses: actions/checkout@v4

README.md

@@ -8,23 +8,16 @@ PHP library for [two-factor (or multi-factor) authentication](http://en.wikipedi
 <img src="https://raw.githubusercontent.com/RobThree/TwoFactorAuth/master/multifactorauthforeveryone.png">
 </p>
 
-## Warning:
-
-By default, this package uses the `lib/Providers/QRServerProvider.php` as QR code generator. This provider is __not__ suggested for applications where absolute security is needed, because it uses an external service for the QR code generation.
-
-
-You can make use of the included [Endroid](https://robthree.github.io/TwoFactorAuth/qr-codes/endroid.html) or [Bacon](https://robthree.github.io/TwoFactorAuth/qr-codes/bacon.html) providers which generate locally.
-
 ## Requirements
 
 * Requires PHP version >=8.2
-* [cURL](http://php.net/manual/en/book.curl.php) when using the provided `QRServerProvider` (default), `ImageChartsQRCodeProvider` or `QRicketProvider` but you can also provide your own QR-code provider.
 
 Optionally, you may need:
 
 * [sockets](https://www.php.net/manual/en/book.sockets.php) if you are using `NTPTimeProvider`
 * [endroid/qr-code](https://github.com/endroid/qr-code) if using `EndroidQrCodeProvider` or `EndroidQrCodeWithLogoProvider`.
 * [bacon/bacon-qr-code](https://github.com/Bacon/BaconQrCode) if using `BaconQrCodeProvider`.
+* [php-curl library](http://php.net/manual/en/book.curl.php) when using an external QR Code provider such as `QRServerProvider`, `ImageChartsQRCodeProvider`, `QRicketProvider` or any other custom provider connecting to an external service.
 
 ## Installation
 

lib/Providers/Qr/EndroidQrCodeProvider.php

@@ -28,10 +28,13 @@ class EndroidQrCodeProvider implements IQRCodeProvider
 
     protected $endroid5 = false;
 
+    protected $endroid6 = false;
+
     public function __construct($bgcolor = 'ffffff', $color = '000000', $margin = 0, $errorcorrectionlevel = 'H')
     {
-        $this->endroid4 = method_exists(QrCode::class, 'create');
         $this->endroid5 = enum_exists(ErrorCorrectionLevel::class);
+        $this->endroid6 = $this->endroid5 && !method_exists(QrCode::class, 'setSize');
+        $this->endroid4 = $this->endroid6 || method_exists(QrCode::class, 'create');
 
         $this->bgcolor = $this->handleColor($bgcolor);
         $this->color = $this->handleColor($color);
@@ -56,6 +59,17 @@ class EndroidQrCodeProvider implements IQRCodeProvider
 
     protected function qrCodeInstance(string $qrText, int $size): QrCode
     {
+        if ($this->endroid6) {
+            return new QrCode(
+                data: $qrText,
+                errorCorrectionLevel: $this->errorcorrectionlevel,
+                size: $size,
+                margin: $this->margin,
+                foregroundColor: $this->color,
+                backgroundColor: $this->bgcolor
+            );
+        }
+
         $qrCode = new QrCode($qrText);
         $qrCode->setSize($size);
 
@@ -63,7 +77,6 @@ class EndroidQrCodeProvider implements IQRCodeProvider
         $qrCode->setMargin($this->margin);
         $qrCode->setBackgroundColor($this->bgcolor);
         $qrCode->setForegroundColor($this->color);
-
         return $qrCode;
     }
 

lib/Providers/Qr/EndroidQrCodeWithLogoProvider.php

@@ -33,11 +33,15 @@ class EndroidQrCodeWithLogoProvider extends EndroidQrCodeProvider
 
         $logo = null;
         if ($this->logoPath) {
-            $logo = Logo::create($this->logoPath);
+            if ($this->endroid6) {
-            if ($this->logoSize) {
+                $logo = new Logo($this->logoPath, ...$this->logoSize);
-                $logo->setResizeToWidth($this->logoSize[0]);
+            } else {
-                if (isset($this->logoSize[1])) {
+                $logo = Logo::create($this->logoPath);
-                    $logo->setResizeToHeight($this->logoSize[1]);
+                if ($this->logoSize) {
+                    $logo->setResizeToWidth($this->logoSize[0]);
+                    if (isset($this->logoSize[1])) {
+                        $logo->setResizeToHeight($this->logoSize[1]);
+                    }
                 }
             }
         }