Merge pull request #23 from petrknap/revert-v3

Reverted to v3
petrknap · Jun 4, 2024 · b1accf4 · b1accf4
2 parents 5cd3d38 + 92c40dd
commit b1accf4
Show file tree

Hide file tree

Showing 4 changed files with 12 additions and 38 deletions.
diff --git a/src/QrCodeWriter.php b/src/QrCodeWriter.php
diff --git a/src/SpaydQr.php b/src/SpaydQr.php
@@ -7,7 +7,9 @@
 use Endroid\QrCode\Builder\Builder;
 use Endroid\QrCode\Builder\BuilderInterface;
 use Endroid\QrCode\Encoding\Encoding;
+use Endroid\QrCode\Writer\PngWriter;
 use Endroid\QrCode\Writer\Result\ResultInterface;
+use Endroid\QrCode\Writer\WriterInterface;
 use Money\Currencies\ISOCurrencies;
 use Money\Formatter\DecimalMoneyFormatter;
 use Money\Money;
@@ -34,13 +36,13 @@ protected function __construct(
             ->add(self::SPAYD_CURRENCY, $money->getCurrency()->getCode());
     }
 
-    public static function create(string $iban, Money $money, QrCodeWriter $writer = QrCodeWriter::Png): self
+    public static function create(string $iban, Money $money, WriterInterface $writer = null): self
     {
         return new self(
             new Spayd(),
             Builder::create()
-                   ->writer($writer->endroid())
-                   ->encoding(new Encoding('UTF-8')),
+                ->writer($writer ?: new PngWriter())
+                ->encoding(new Encoding('UTF-8')),
             $iban,
             $money
         );
@@ -151,9 +153,9 @@ public function setInvoice(
         return $this;
     }
 
-    public function setWriter(QrCodeWriter $writer): self
+    public function setWriter(WriterInterface $writer): self
     {
-        $this->qrCodeBuilder->writer($writer->endroid());
+        $this->qrCodeBuilder->writer($writer);
 
         return $this;
     }

diff --git a/src/SpaydQrInterface.php b/src/SpaydQrInterface.php
@@ -5,6 +5,7 @@
 namespace PetrKnap\SpaydQr;
 
 use Endroid\QrCode\Builder\BuilderInterface;
+use Endroid\QrCode\Writer\WriterInterface;
 use Money\Money;
 use Sunfox\Spayd\Spayd;
 
@@ -139,7 +140,7 @@ public function setInvoice(
         ?string $description
     ): self;
 
-    public function setWriter(QrCodeWriter $writer): self;
+    public function setWriter(WriterInterface $writer): self;
 
     public function getContentType(): string;
 

diff --git a/tests/SpaydQrTest.php b/tests/SpaydQrTest.php
@@ -32,11 +32,11 @@ public function testFactoryWorks()
 
     public function testSetWriterWorks()
     {
-        $writer = QrCodeWriter::Svg;
+        $writer = new SvgWriter();
         $qrCodeBuilder = $this->getMockBuilder(BuilderInterface::class)->getMock();
         $qrCodeBuilder->expects($this->once())
             ->method('writer')
-            ->with($writer->endroid())
+            ->with($writer)
             ->willReturnSelf();
 
         $this->getSpaydQr(null, $qrCodeBuilder)->setWriter($writer);
@@ -245,7 +245,7 @@ public function dataWriteFileWorks()
     public function testEndToEnd()
     {
         $spaydQr = $this->getSpaydQr(null, null)
-            ->setWriter(QrCodeWriter::Svg)
+            ->setWriter(new SvgWriter())
             ->setVariableSymbol(123)
             ->setInvoice(
                 '1',