Merge pull request #240 from sprain/empty-line-before-alternative-sch…

…emes Add empty line before alternative schemes, if needed
sprain · Nov 16, 2023 · eb68c11 · eb68c11
2 parents fbb0564 + 207bdda
commit eb68c11
Show file tree

Hide file tree

Showing 12 changed files with 36 additions and 4 deletions.
diff --git a/src/DataGroup/EmptyElement/EmptyLine.php b/src/DataGroup/EmptyElement/EmptyLine.php
@@ -0,0 +1,18 @@
+<?php declare(strict_types=1);
+
+namespace Sprain\SwissQrBill\DataGroup\EmptyElement;
+
+use Sprain\SwissQrBill\DataGroup\QrCodeableInterface;
+
+/**
+ * @internal
+ */
+final class EmptyLine implements QrCodeableInterface
+{
+    public function getQrCodeData(): array
+    {
+        return [
+            null
+        ];
+    }
+}
diff --git a/src/QrBill.php b/src/QrBill.php
@@ -12,6 +12,7 @@
 use Sprain\SwissQrBill\DataGroup\Element\PaymentReference;
 use Sprain\SwissQrBill\DataGroup\EmptyElement\EmptyAdditionalInformation;
 use Sprain\SwissQrBill\DataGroup\EmptyElement\EmptyAddress;
+use Sprain\SwissQrBill\DataGroup\EmptyElement\EmptyLine;
 use Sprain\SwissQrBill\DataGroup\QrCodeableInterface;
 use Sprain\SwissQrBill\Exception\InvalidQrBillDataException;
 use Sprain\SwissQrBill\QrCode\QrCode;
@@ -189,6 +190,7 @@ private function getQrCodeContent(): string
             $this->getUltimateDebtor() ?: new EmptyAddress(),
             $this->getPaymentReference(),
             $this->getAdditionalInformation() ?: new EmptyAdditionalInformation(),
+            $this->getPossibleEmptyLine(),
             $this->getAlternativeSchemes()
         ];
 
@@ -197,6 +199,17 @@ private function getQrCodeContent(): string
         return implode("\n", $qrCodeStringElements);
     }
 
+    private function getPossibleEmptyLine(): ?EmptyLine
+    {
+        if ($this->getAlternativeSchemes()) {
+            if (null === $this->getAdditionalInformation()?->getBillInformation()) {
+                return new EmptyLine();
+            }
+        }
+
+        return null;
+    }
+
     /**
      * @param list<QrCodeableInterface|AddressInterface|list<AddressInterface|QrCodeableInterface>> $elements
      * @return list<string|int|null>

diff --git a/tests/TestData/FpdfOutput/qr-alternative-schemes.pdf b/tests/TestData/FpdfOutput/qr-alternative-schemes.pdf
diff --git a/tests/TestData/FpdfOutput/qr-alternative-schemes.print.pdf b/tests/TestData/FpdfOutput/qr-alternative-schemes.print.pdf
diff --git a/tests/TestData/HtmlOutput/qr-alternative-schemes.svg.html b/tests/TestData/HtmlOutput/qr-alternative-schemes.svg.html
diff --git a/tests/TestData/HtmlOutput/qr-alternative-schemes.svg.print.html b/tests/TestData/HtmlOutput/qr-alternative-schemes.svg.print.html
diff --git a/tests/TestData/QrCodes/TestDataTest.php b/tests/TestData/QrCodes/TestDataTest.php
@@ -24,7 +24,7 @@ public function qrFileProvider(): array
     {
         return [
             [__DIR__ . '/qr-additional-information.png', '5089db74d380d6ece97d02c86cb35e2d'],
-            [__DIR__ . '/qr-alternative-schemes.png', 'd34aeb0d10da0663a5dfd9df54503e71'],
+            [__DIR__ . '/qr-alternative-schemes.png', '0ac1061daa0114ba49708a5593471da0'],
             [__DIR__ . '/qr-full-set.png', 'b52be79babcc58485ee68fb4f722657c'],
             [__DIR__ . '/qr-international-ultimate-debtor.png', 'c56676e8c98f3ba54fac959c450a0995'],
             [__DIR__ . '/qr-minimal-setup.png', '72911d0c7d23298aeb14e4960204d6e0'],
@@ -37,7 +37,7 @@ public function qrFileProvider(): array
             [__DIR__ . '/qr-payment-reference-scor.png', '7abd60316b137fa472165faff8e4a28c'],
             [__DIR__ . '/qr-ultimate-debtor.png', 'ed279b73f429a8d9960b8dcb94c2c429'],
 
-            [__DIR__ . '/proof-of-validation.png', 'a50bc5625703d22da79b46880ff3aef4'],
+            [__DIR__ . '/proof-of-validation.png', 'f40119eaf7bf58159f9da521e51f9278'],
         ];
     }
 }
diff --git a/tests/TestData/QrCodes/proof-of-validation.png b/tests/TestData/QrCodes/proof-of-validation.png
diff --git a/tests/TestData/QrCodes/qr-alternative-schemes.png b/tests/TestData/QrCodes/qr-alternative-schemes.png
diff --git a/tests/TestData/QrCodes/qr-alternative-schemes.txt b/tests/TestData/QrCodes/qr-alternative-schemes.txt
@@ -29,5 +29,6 @@ QRR
 123456789012345678901234567
 
 EPD
+
 CC/XRPL/10/bUuK6fwHtfZ3HGAgKvEV7Y5TzHEu8ChUj9
 CC/XRPL/10/bUuK6fwHtfZ3HGAgKvEV7Y5TzHEu8ChUj9
diff --git a/tests/TestData/TcPdfOutput/qr-alternative-schemes.svg.pdf b/tests/TestData/TcPdfOutput/qr-alternative-schemes.svg.pdf
diff --git a/tests/TestData/TcPdfOutput/qr-alternative-schemes.svg.print.pdf b/tests/TestData/TcPdfOutput/qr-alternative-schemes.svg.print.pdf