Switch to QR code provider (#46)

composer.json

@@ -17,15 +17,16 @@
   "require": {
     "php": "^7.3|^8.0",
     "ext-mbstring": "*",
-    "rikudou/qr-payment-interface": "^1.0"
+    "rikudou/qr-payment-interface": "^1.0",
+    "rikudou/qr-payment-qr-code-provider": "^1.0"
   },
   "autoload": {
     "psr-4": {
       "rikudou\\EuQrPayment\\": "src/"
     }
   },
   "suggest": {
-    "endroid/qr-code": "^3.2"
+    "endroid/qr-code": "For generating QR code image"
   },
   "require-dev": {
     "phpoffice/phpspreadsheet": "^1.5",

phpstan.neon.dist

@@ -0,0 +1,4 @@
+parameters:
+  reportUnmatchedIgnoredErrors: false
+  ignoreErrors:
+    - '#Attribute class JetBrains.+? does not exist#'

src/QrPayment.php

@@ -4,6 +4,7 @@
 
 use DateTimeInterface;
 use Endroid\QrCode\QrCode;
+use JetBrains\PhpStorm\Deprecated;
 use rikudou\EuQrPayment\Config\Configuration;
 use rikudou\EuQrPayment\Config\ConfigurationInterface;
 use rikudou\EuQrPayment\Exceptions\InvalidIbanException;
@@ -14,9 +15,14 @@
 use rikudou\EuQrPayment\Iban\IbanInterface;
 use rikudou\EuQrPayment\Sepa\CharacterSet;
 use Rikudou\QrPayment\QrPaymentInterface;
+use Rikudou\QrPaymentQrCodeProvider\EndroidQrCode3;
+use Rikudou\QrPaymentQrCodeProvider\Exception\NoProviderFoundException;
+use Rikudou\QrPaymentQrCodeProvider\GetQrCodeTrait;
 
 final class QrPayment implements QrPaymentInterface
 {
+    use GetQrCodeTrait;
+
     /**
      * @var IbanInterface
      */
@@ -375,13 +381,24 @@ public function getQrString(): string
      *
      * @return \Endroid\QrCode\QrCode
      */
+    #[Deprecated('This method has been deprecated, please use getQrCode()', '%class%->getQrCode()->getRawObject()')]
     public function getQrImage(): QrCode
     {
-        if (!class_exists("Endroid\QrCode\QrCode")) {
+        try {
+            $code = $this->getQrCode();
+            if (!$code instanceof EndroidQrCode3) {
+                throw new \LogicException('Error: library endroid/qr-code is not loaded or is not a 3.x version. For newer versions please use method getQrCode()');
+            }
+            // @codeCoverageIgnoreStart
+        } catch (NoProviderFoundException $e) {
             throw new \LogicException('Error: library endroid/qr-code is not loaded.');
+            // @codeCoverageIgnoreEnd
         }
 
-        return new QrCode($this->getQrString());
+        $raw = $code->getRawObject();
+        assert($raw instanceof QrCode);
+
+        return $raw;
     }
 
     /**

tests/QrPaymentTest.php

@@ -332,23 +332,6 @@ public function testSetCurrency()
         $this->getDefaultPayment()->setCurrency('EURO');
     }
 
-    public function testGetQrImageFailure()
-    {
-        $this->expectException(LogicException::class);
-        $payment = $this->getDefaultPayment();
-
-        $this->unregisterAutoloader();
-
-        try {
-            $payment
-                ->setBeneficiaryName('My company')
-                ->getQrImage();
-        } catch (Throwable $exception) {
-            $this->reregisterAutoloader();
-            throw $exception;
-        }
-    }
-
     public function testGetQrImage()
     {
         $this->reregisterAutoloader();