Merge pull request #115 from Mattie112/endroidqr-v5

Fix issue #114 (Support for EndroidQR v5)
RobThree · Nov 14, 2023 · ab93dd4 · ab93dd4
2 parents 137df4d + ec35073
commit ab93dd4
Show file tree

Hide file tree

Showing 2 changed files with 30 additions and 6 deletions.
diff --git a/.github/workflows/test-endroid.yml b/.github/workflows/test-endroid.yml
@@ -11,7 +11,7 @@ jobs:
     strategy:
       matrix:
         php-version: ['8.1', '8.2']
-        endroid-version: ["^4"]
+        endroid-version: ["^3","^4","^5"]
 
     steps:
     - uses: actions/checkout@v3
@@ -25,7 +25,7 @@ jobs:
 
     - uses: ramsey/composer-install@v2
 
-    - run: composer require endroid/qrcode:${{ matrix.endroid-version }}
+    - run: composer require endroid/qrcode:${{ matrix.endroid-version }} -W
 
     - run: composer lint-ci
     - run: composer test testsDependency/EndroidQRCodeTest.php
diff --git a/lib/Providers/Qr/EndroidQrCodeProvider.php b/lib/Providers/Qr/EndroidQrCodeProvider.php
@@ -26,9 +26,12 @@ class EndroidQrCodeProvider implements IQRCodeProvider
 
     protected $endroid4 = false;
 
+    protected $endroid5 = 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->bgcolor = $this->handleColor($bgcolor);
         $this->color = $this->handleColor($color);
@@ -76,11 +79,32 @@ private function handleColor(string $color): Color|array
 
     private function handleErrorCorrectionLevel(string $level): ErrorCorrectionLevelInterface|ErrorCorrectionLevel
     {
+        // First check for version 5 (using enums)
+        if ($this->endroid5) {
+            return match ($level) {
+                'L' => ErrorCorrectionLevel::Low,
+                'M' => ErrorCorrectionLevel::Medium,
+                'Q' => ErrorCorrectionLevel::Quartile,
+                default => ErrorCorrectionLevel::High,
+            };
+        }
+
+        // If not check for version 4 (using classes)
+        if ($this->endroid4) {
+            return match ($level) {
+                'L' => new ErrorCorrectionLevelLow(),
+                'M' => new ErrorCorrectionLevelMedium(),
+                'Q' => new ErrorCorrectionLevelQuartile(),
+                default => new ErrorCorrectionLevelHigh(),
+            };
+        }
+
+        // Any other version will be using strings
         return match ($level) {
-            'L' => $this->endroid4 ? new ErrorCorrectionLevelLow() : ErrorCorrectionLevel::LOW(),
-            'M' => $this->endroid4 ? new ErrorCorrectionLevelMedium() : ErrorCorrectionLevel::MEDIUM(),
-            'Q' => $this->endroid4 ? new ErrorCorrectionLevelQuartile() : ErrorCorrectionLevel::QUARTILE(),
-            default => $this->endroid4 ? new ErrorCorrectionLevelHigh() : ErrorCorrectionLevel::HIGH(),
+            'L' => ErrorCorrectionLevel::LOW(),
+            'M' => ErrorCorrectionLevel::MEDIUM(),
+            'Q' => ErrorCorrectionLevel::QUARTILE(),
+            default => ErrorCorrectionLevel::HIGH(),
         };
     }
 }