diff --git a/src/PaymentPart/Output/AbstractOutput.php b/src/PaymentPart/Output/AbstractOutput.php index 4a23642f..ca66dc85 100644 --- a/src/PaymentPart/Output/AbstractOutput.php +++ b/src/PaymentPart/Output/AbstractOutput.php @@ -3,6 +3,7 @@ namespace Sprain\SwissQrBill\PaymentPart\Output; use Sprain\SwissQrBill\DataGroup\Element\PaymentReference; +use Sprain\SwissQrBill\PaymentPart\Output\Element\FurtherInformation; use Sprain\SwissQrBill\PaymentPart\Output\Element\Placeholder; use Sprain\SwissQrBill\PaymentPart\Output\Element\Text; use Sprain\SwissQrBill\PaymentPart\Output\Element\Title; @@ -157,7 +158,7 @@ protected function getFurtherInformationElements(): array foreach ($this->qrBill->getAlternativeSchemes() as $alternativeScheme) { $furtherInformationLines[] = $alternativeScheme->getParameter(); } - $furtherInformationElements[] = Text::create(implode("\n", $furtherInformationLines)); + $furtherInformationElements[] = FurtherInformation::create(implode("\n", $furtherInformationLines)); return $furtherInformationElements; } diff --git a/src/PaymentPart/Output/Element/FurtherInformation.php b/src/PaymentPart/Output/Element/FurtherInformation.php new file mode 100644 index 00000000..47b70a2a --- /dev/null +++ b/src/PaymentPart/Output/Element/FurtherInformation.php @@ -0,0 +1,24 @@ +furtherInformation = $furtherInformation; + + return $element; + } + + public function getText(): string + { + return $this->furtherInformation; + } +} diff --git a/src/PaymentPart/Output/FpdfOutput/FpdfOutput.php b/src/PaymentPart/Output/FpdfOutput/FpdfOutput.php index 4da32770..4cb99614 100644 --- a/src/PaymentPart/Output/FpdfOutput/FpdfOutput.php +++ b/src/PaymentPart/Output/FpdfOutput/FpdfOutput.php @@ -7,6 +7,7 @@ use setasign\Fpdi\Fpdi; use Sprain\SwissQrBill\Exception\InvalidFpdfImageFormat; use Sprain\SwissQrBill\PaymentPart\Output\AbstractOutput; +use Sprain\SwissQrBill\PaymentPart\Output\Element\FurtherInformation; use Sprain\SwissQrBill\PaymentPart\Output\Element\OutputElementInterface; use Sprain\SwissQrBill\PaymentPart\Output\Element\Placeholder; use Sprain\SwissQrBill\PaymentPart\Output\Element\Text; @@ -100,7 +101,7 @@ private function addSwissQrCodeImage(): void $yPosQrCode = 209.5 + $this->offsetY; $xPosQrCode = 67 + $this->offsetX; - if ((bool)ini_get('allow_url_fopen')) { + if (ini_get('allow_url_fopen')) { $this->fpdf->Image( $qrCode->getDataUri($this->getQrCodeImageFormat()), $xPosQrCode, @@ -212,11 +213,10 @@ private function addAmountContent(): void private function addFurtherInformationContent(): void { $this->SetXY(self::RIGHT_PART_X, 286); - $this->fpdf->SetFont(self::FONT, '', self::FONT_SIZE_FURTHER_INFORMATION); foreach ($this->getFurtherInformationElements() as $furtherInformationElement) { $this->setX(self::RIGHT_PART_X); - $this->setContentElement($furtherInformationElement, true); + $this->setContentElement($furtherInformationElement, false); } } @@ -234,6 +234,10 @@ private function addSeparatorContentIfNotPrintable(): void private function setContentElement(OutputElementInterface $element, bool $isReceiptPart): void { + if ($element instanceof FurtherInformation) { + $this->setFurtherInformationElement($element); + } + if ($element instanceof Title) { $this->setTitleElement($element, $isReceiptPart); } @@ -250,11 +254,15 @@ private function setContentElement(OutputElementInterface $element, bool $isRece private function setTitleElement(Title $element, bool $isReceiptPart): void { $this->fpdf->SetFont(self::FONT, 'B', $isReceiptPart ? self::FONT_SIZE_TITLE_RECEIPT : self::FONT_SIZE_TITLE_PAYMENT_PART); - $this->fpdf->MultiCell(0, 2.8, iconv( - 'UTF-8', - 'windows-1252', - Translation::get(str_replace("text.", "", $element->getTitle()), $this->language) - )); + $this->fpdf->MultiCell( + 0, + 2.8, + iconv( + 'UTF-8', + 'windows-1252', + Translation::get(str_replace('text.', '', $element->getTitle()), $this->language) + ) + ); $this->fpdf->Ln($this->amountLS); } @@ -264,13 +272,25 @@ private function setTextElement(Text $element, bool $isReceiptPart): void $this->fpdf->MultiCell( $isReceiptPart ? 54 : 0, $isReceiptPart ? 3.3 : 4, - str_replace("text.", "", iconv('UTF-8', 'windows-1252', $element->getText())), + str_replace('text.', '', iconv('UTF-8', 'windows-1252', $element->getText())), self::BORDER, self::ALIGN_LEFT ); $this->fpdf->Ln($isReceiptPart ? self::LINE_SPACING_RECEIPT : self::LINE_SPACING_PAYMENT_PART); } + private function setFurtherInformationElement(FurtherInformation $element): void + { + $this->fpdf->SetFont(self::FONT, '', self::FONT_SIZE_FURTHER_INFORMATION); + $this->fpdf->MultiCell( + 0, + 4, + iconv('UTF-8', 'windows-1252', $element->getText()), + self::BORDER, + self::ALIGN_LEFT + ); + } + private function setPlaceholderElement(Placeholder $element): void { $type = $element->getType(); diff --git a/src/PaymentPart/Output/HtmlOutput/HtmlOutput.php b/src/PaymentPart/Output/HtmlOutput/HtmlOutput.php index 0462b966..73b23e65 100644 --- a/src/PaymentPart/Output/HtmlOutput/HtmlOutput.php +++ b/src/PaymentPart/Output/HtmlOutput/HtmlOutput.php @@ -3,9 +3,11 @@ namespace Sprain\SwissQrBill\PaymentPart\Output\HtmlOutput; use Sprain\SwissQrBill\PaymentPart\Output\AbstractOutput; +use Sprain\SwissQrBill\PaymentPart\Output\Element\FurtherInformation; use Sprain\SwissQrBill\PaymentPart\Output\Element\Placeholder; use Sprain\SwissQrBill\PaymentPart\Output\Element\Text; use Sprain\SwissQrBill\PaymentPart\Output\Element\Title; +use Sprain\SwissQrBill\PaymentPart\Output\HtmlOutput\Template\FurtherInformationElementTemplate; use Sprain\SwissQrBill\PaymentPart\Output\HtmlOutput\Template\PlaceholderElementTemplate; use Sprain\SwissQrBill\PaymentPart\Output\HtmlOutput\Template\PrintableStylesTemplate; use Sprain\SwissQrBill\PaymentPart\Output\HtmlOutput\Template\TextElementTemplate; @@ -133,11 +135,12 @@ private function hideSeparatorContentIfPrintable(string $paymentPart): string return $paymentPart; } - private function getContentElement(Title|Text|Placeholder $element): string + private function getContentElement(FurtherInformation|Title|Text|Placeholder $element): string { # https://github.com/phpstan/phpstan/issues/4451 # @phpstan-ignore-next-line return match (get_class($element)) { + FurtherInformation::class => $this->getFurtherInformationElement($element), Title::class => $this->getTitleElement($element), Text::class => $this->getTextElement($element), Placeholder::class => $this->getPlaceholderElement($element) @@ -160,6 +163,14 @@ private function getTextElement(Text $element): string return $elementString; } + private function getFurtherInformationElement(FurtherInformation $element): string + { + $elementTemplate = FurtherInformationElementTemplate::TEMPLATE; + $elementString = str_replace('{{ text }}', nl2br($element->getText()), $elementTemplate); + + return $elementString; + } + private function getPlaceholderElement(Placeholder $element): string { $elementTemplate = PlaceholderElementTemplate::TEMPLATE; diff --git a/src/PaymentPart/Output/HtmlOutput/Template/FurtherInformationElementTemplate.php b/src/PaymentPart/Output/HtmlOutput/Template/FurtherInformationElementTemplate.php new file mode 100644 index 00000000..d868503a --- /dev/null +++ b/src/PaymentPart/Output/HtmlOutput/Template/FurtherInformationElementTemplate.php @@ -0,0 +1,10 @@ +{{ text }}

+EOT; +} diff --git a/src/PaymentPart/Output/TcPdfOutput/TcPdfOutput.php b/src/PaymentPart/Output/TcPdfOutput/TcPdfOutput.php index f552c2d5..585fa5b4 100644 --- a/src/PaymentPart/Output/TcPdfOutput/TcPdfOutput.php +++ b/src/PaymentPart/Output/TcPdfOutput/TcPdfOutput.php @@ -4,6 +4,7 @@ use setasign\Fpdi\Tcpdf\Fpdi; use Sprain\SwissQrBill\PaymentPart\Output\AbstractOutput; +use Sprain\SwissQrBill\PaymentPart\Output\Element\FurtherInformation; use Sprain\SwissQrBill\PaymentPart\Output\Element\OutputElementInterface; use Sprain\SwissQrBill\PaymentPart\Output\Element\Placeholder; use Sprain\SwissQrBill\PaymentPart\Output\Element\Text; @@ -29,6 +30,7 @@ final class TcPdfOutput extends AbstractOutput implements OutputInterface private const RIGHT_CELL_HEIGHT_RATIO_COMMON = 1.1; private const LEFT_CELL_HEIGHT_RATIO_CURRENCY_AMOUNT = 1.5; private const RIGHT_CELL_HEIGHT_RATIO_CURRENCY_AMOUNT = 1.5; + private const FURTHER_INFORMATION_CELL_HEIGHT_RATIO_COMMON = 1.5; // Positioning private const CURRENCY_AMOUNT_Y = 259; @@ -95,15 +97,15 @@ private function addSwissQrCodeImage(): void $qrCode = $this->getQrCode(); $method = match ($this->getQrCodeImageFormat()) { - QrCode::FILE_FORMAT_SVG => "ImageSVG", - default => "Image", + QrCode::FILE_FORMAT_SVG => 'ImageSVG', + default => 'Image', }; $yPosQrCode = 209.5 + $this->offsetY; $xPosQrCode = self::RIGHT_PART_X + 1 + $this->offsetX; $img = $qrCode->getAsString($this->getQrCodeImageFormat()); - $this->tcPdf->$method("@".$img, $xPosQrCode, $yPosQrCode, 46, 46); + $this->tcPdf->$method('@'.$img, $xPosQrCode, $yPosQrCode, 46, 46); } private function addInformationContentReceipt(): void @@ -201,13 +203,12 @@ private function addAmountContent(): void private function addFurtherInformationContent(): void { $x = self::RIGHT_PART_X; - $this->tcPdf->setCellHeightRatio(self::RIGHT_CELL_HEIGHT_RATIO_COMMON); + $this->tcPdf->setCellHeightRatio(self::FURTHER_INFORMATION_CELL_HEIGHT_RATIO_COMMON); $this->setY(286); - $this->tcPdf->SetFont(self::FONT, '', self::FONT_SIZE_FURTHER_INFORMATION); foreach ($this->getFurtherInformationElements() as $furtherInformationElement) { $this->setX($x); - $this->setContentElement($furtherInformationElement, true); + $this->setContentElement($furtherInformationElement, false); } } @@ -226,6 +227,10 @@ private function addSeparatorContentIfNotPrintable(): void private function setContentElement(OutputElementInterface $element, bool $isReceiptPart): void { + if ($element instanceof FurtherInformation) { + $this->setFurtherInformationElement($element); + } + if ($element instanceof Title) { $this->setTitleElement($element, $isReceiptPart); } @@ -247,7 +252,7 @@ private function setTitleElement(Title $element, bool $isReceiptPart): void $isReceiptPart ? self::FONT_SIZE_TITLE_RECEIPT : self::FONT_SIZE_TITLE_PAYMENT_PART ); $this->printCell( - Translation::get(str_replace("text.", "", $element->getTitle()), $this->language), + Translation::get(str_replace('text.', '', $element->getTitle()), $this->language), 0, 0, self::ALIGN_BELOW @@ -263,15 +268,26 @@ private function setTextElement(Text $element, bool $isReceiptPart): void ); $this->printMultiCell( - str_replace("text.", "", $element->getText()), + str_replace('text.', '', $element->getText()), $isReceiptPart ? 54 : 0, 0, - self::ALIGN_BELOW, - self::ALIGN_LEFT + self::ALIGN_BELOW ); + $this->tcPdf->Ln($isReceiptPart ? self::LINE_SPACING_RECEIPT : self::LINE_SPACING_PAYMENT_PART); } + private function setFurtherInformationElement(FurtherInformation $element): void + { + $this->tcPdf->SetFont(self::FONT, '', self::FONT_SIZE_FURTHER_INFORMATION); + $this->printMultiCell( + iconv('UTF-8', 'windows-1252', $element->getText()), + 0, + 0, + self::BORDER + ); + } + private function setPlaceholderElement(Placeholder $element): void { $type = $element->getType(); @@ -325,10 +341,9 @@ private function printMultiCell( string $text, int $w = 0, int $h = 0, - int $nextLineAlign = 0, - string $textAlign = self::ALIGN_LEFT + int $nextLineAlign = 0 ): void { - $this->tcPdf->MultiCell($w, $h, $text, self::BORDER, $textAlign, false, $nextLineAlign); + $this->tcPdf->MultiCell($w, $h, $text, self::BORDER, self::ALIGN_LEFT, false, $nextLineAlign); } private function printLine(int $x1, int $y1, int $x2, int $y2): void diff --git a/tests/QrBillTest.php b/tests/QrBillTest.php index f7b2fd7c..ff95bb62 100644 --- a/tests/QrBillTest.php +++ b/tests/QrBillTest.php @@ -42,8 +42,8 @@ public function testAlternativeSchemesCanBeSetAtOnce() ]); $qrBill->setAlternativeSchemes([ - AlternativeScheme::create('foo'), - AlternativeScheme::create('foo') + AlternativeScheme::create('CC/XRPL/10/bUuK6fwHtfZ3HGAgKvEV7Y5TzHEu8ChUj9'), + AlternativeScheme::create('CC/XRPL/10/bUuK6fwHtfZ3HGAgKvEV7Y5TzHEu8ChUj9') ]); $this->assertSame( @@ -214,7 +214,7 @@ public function testAlternativeSchemesMustBeValid() 'paymentReferenceQr', ]); - $qrBill->addAlternativeScheme(AlternativeScheme::create('foo')); + $qrBill->addAlternativeScheme(AlternativeScheme::create('CC/XRPL/10/bUuK6fwHtfZ3HGAgKvEV7Y5TzHEu8ChUj9')); $qrBill->addAlternativeScheme(AlternativeScheme::create('')); $this->assertFalse($qrBill->isValid()); @@ -230,9 +230,9 @@ public function testMaximumTwoAlternativeSchemesAreAllowed() 'paymentReferenceQr' ]); - $qrBill->addAlternativeScheme(AlternativeScheme::create('foo')); - $qrBill->addAlternativeScheme(AlternativeScheme::create('foo')); - $qrBill->addAlternativeScheme(AlternativeScheme::create('foo')); + $qrBill->addAlternativeScheme(AlternativeScheme::create('CC/XRPL/10/bUuK6fwHtfZ3HGAgKvEV7Y5TzHEu8ChUj9')); + $qrBill->addAlternativeScheme(AlternativeScheme::create('CC/XRPL/10/bUuK6fwHtfZ3HGAgKvEV7Y5TzHEu8ChUj9')); + $qrBill->addAlternativeScheme(AlternativeScheme::create('CC/XRPL/10/bUuK6fwHtfZ3HGAgKvEV7Y5TzHEu8ChUj9')); $this->assertFalse($qrBill->isValid()); } diff --git a/tests/TestData/FpdfOutput/qr-additional-information.pdf b/tests/TestData/FpdfOutput/qr-additional-information.pdf index 43d33cad..573b586a 100644 Binary files a/tests/TestData/FpdfOutput/qr-additional-information.pdf and b/tests/TestData/FpdfOutput/qr-additional-information.pdf differ diff --git a/tests/TestData/FpdfOutput/qr-additional-information.print.pdf b/tests/TestData/FpdfOutput/qr-additional-information.print.pdf index 7d9e7292..39c76f31 100644 Binary files a/tests/TestData/FpdfOutput/qr-additional-information.print.pdf and b/tests/TestData/FpdfOutput/qr-additional-information.print.pdf differ diff --git a/tests/TestData/FpdfOutput/qr-alternative-schemes.pdf b/tests/TestData/FpdfOutput/qr-alternative-schemes.pdf index 10ea63d3..0e0f6308 100644 Binary files a/tests/TestData/FpdfOutput/qr-alternative-schemes.pdf and b/tests/TestData/FpdfOutput/qr-alternative-schemes.pdf differ diff --git a/tests/TestData/FpdfOutput/qr-alternative-schemes.print.pdf b/tests/TestData/FpdfOutput/qr-alternative-schemes.print.pdf index 254c6bfd..fe404c66 100644 Binary files a/tests/TestData/FpdfOutput/qr-alternative-schemes.print.pdf and b/tests/TestData/FpdfOutput/qr-alternative-schemes.print.pdf differ diff --git a/tests/TestData/FpdfOutput/qr-full-set.pdf b/tests/TestData/FpdfOutput/qr-full-set.pdf index 51cd617c..6e8eda39 100644 Binary files a/tests/TestData/FpdfOutput/qr-full-set.pdf and b/tests/TestData/FpdfOutput/qr-full-set.pdf differ diff --git a/tests/TestData/FpdfOutput/qr-full-set.print.pdf b/tests/TestData/FpdfOutput/qr-full-set.print.pdf index de46a1b8..22e256e8 100644 Binary files a/tests/TestData/FpdfOutput/qr-full-set.print.pdf and b/tests/TestData/FpdfOutput/qr-full-set.print.pdf differ diff --git a/tests/TestData/FpdfOutput/qr-international-ultimate-debtor.pdf b/tests/TestData/FpdfOutput/qr-international-ultimate-debtor.pdf index 764325fc..cd64bf5f 100644 Binary files a/tests/TestData/FpdfOutput/qr-international-ultimate-debtor.pdf and b/tests/TestData/FpdfOutput/qr-international-ultimate-debtor.pdf differ diff --git a/tests/TestData/FpdfOutput/qr-international-ultimate-debtor.print.pdf b/tests/TestData/FpdfOutput/qr-international-ultimate-debtor.print.pdf index 12f4997f..6e4af910 100644 Binary files a/tests/TestData/FpdfOutput/qr-international-ultimate-debtor.print.pdf and b/tests/TestData/FpdfOutput/qr-international-ultimate-debtor.print.pdf differ diff --git a/tests/TestData/FpdfOutput/qr-minimal-setup.pdf b/tests/TestData/FpdfOutput/qr-minimal-setup.pdf index 85c38e65..cfea2210 100644 Binary files a/tests/TestData/FpdfOutput/qr-minimal-setup.pdf and b/tests/TestData/FpdfOutput/qr-minimal-setup.pdf differ diff --git a/tests/TestData/FpdfOutput/qr-minimal-setup.print.pdf b/tests/TestData/FpdfOutput/qr-minimal-setup.print.pdf index 586c6188..a4b7ecee 100644 Binary files a/tests/TestData/FpdfOutput/qr-minimal-setup.print.pdf and b/tests/TestData/FpdfOutput/qr-minimal-setup.print.pdf differ diff --git a/tests/TestData/FpdfOutput/qr-payment-information-with-mediumlong-creditor-and-unknown-debtor.pdf b/tests/TestData/FpdfOutput/qr-payment-information-with-mediumlong-creditor-and-unknown-debtor.pdf index e351a247..a083ba24 100644 Binary files a/tests/TestData/FpdfOutput/qr-payment-information-with-mediumlong-creditor-and-unknown-debtor.pdf and b/tests/TestData/FpdfOutput/qr-payment-information-with-mediumlong-creditor-and-unknown-debtor.pdf differ diff --git a/tests/TestData/FpdfOutput/qr-payment-information-with-mediumlong-creditor-and-unknown-debtor.print.pdf b/tests/TestData/FpdfOutput/qr-payment-information-with-mediumlong-creditor-and-unknown-debtor.print.pdf index 9b573603..230e8010 100644 Binary files a/tests/TestData/FpdfOutput/qr-payment-information-with-mediumlong-creditor-and-unknown-debtor.print.pdf and b/tests/TestData/FpdfOutput/qr-payment-information-with-mediumlong-creditor-and-unknown-debtor.print.pdf differ diff --git a/tests/TestData/FpdfOutput/qr-payment-information-without-amount-and-long-addresses.pdf b/tests/TestData/FpdfOutput/qr-payment-information-without-amount-and-long-addresses.pdf index fecb8371..86abf9b2 100644 Binary files a/tests/TestData/FpdfOutput/qr-payment-information-without-amount-and-long-addresses.pdf and b/tests/TestData/FpdfOutput/qr-payment-information-without-amount-and-long-addresses.pdf differ diff --git a/tests/TestData/FpdfOutput/qr-payment-information-without-amount-and-long-addresses.print.pdf b/tests/TestData/FpdfOutput/qr-payment-information-without-amount-and-long-addresses.print.pdf index 3fb657cf..98d0a40d 100644 Binary files a/tests/TestData/FpdfOutput/qr-payment-information-without-amount-and-long-addresses.print.pdf and b/tests/TestData/FpdfOutput/qr-payment-information-without-amount-and-long-addresses.print.pdf differ diff --git a/tests/TestData/FpdfOutput/qr-payment-information-without-amount-but-debtor.pdf b/tests/TestData/FpdfOutput/qr-payment-information-without-amount-but-debtor.pdf index b7d6225c..119201e1 100644 Binary files a/tests/TestData/FpdfOutput/qr-payment-information-without-amount-but-debtor.pdf and b/tests/TestData/FpdfOutput/qr-payment-information-without-amount-but-debtor.pdf differ diff --git a/tests/TestData/FpdfOutput/qr-payment-information-without-amount-but-debtor.print.pdf b/tests/TestData/FpdfOutput/qr-payment-information-without-amount-but-debtor.print.pdf index 1c8ca666..2fccc4a6 100644 Binary files a/tests/TestData/FpdfOutput/qr-payment-information-without-amount-but-debtor.print.pdf and b/tests/TestData/FpdfOutput/qr-payment-information-without-amount-but-debtor.print.pdf differ diff --git a/tests/TestData/FpdfOutput/qr-payment-information-without-amount.pdf b/tests/TestData/FpdfOutput/qr-payment-information-without-amount.pdf index b92f06f2..328d77ff 100644 Binary files a/tests/TestData/FpdfOutput/qr-payment-information-without-amount.pdf and b/tests/TestData/FpdfOutput/qr-payment-information-without-amount.pdf differ diff --git a/tests/TestData/FpdfOutput/qr-payment-information-without-amount.print.pdf b/tests/TestData/FpdfOutput/qr-payment-information-without-amount.print.pdf index 8a228aef..d7d849af 100644 Binary files a/tests/TestData/FpdfOutput/qr-payment-information-without-amount.print.pdf and b/tests/TestData/FpdfOutput/qr-payment-information-without-amount.print.pdf differ diff --git a/tests/TestData/FpdfOutput/qr-payment-information-zero-amount.pdf b/tests/TestData/FpdfOutput/qr-payment-information-zero-amount.pdf index 161a163a..c24a2b05 100644 Binary files a/tests/TestData/FpdfOutput/qr-payment-information-zero-amount.pdf and b/tests/TestData/FpdfOutput/qr-payment-information-zero-amount.pdf differ diff --git a/tests/TestData/FpdfOutput/qr-payment-information-zero-amount.print.pdf b/tests/TestData/FpdfOutput/qr-payment-information-zero-amount.print.pdf index 8fa32202..8c32c228 100644 Binary files a/tests/TestData/FpdfOutput/qr-payment-information-zero-amount.print.pdf and b/tests/TestData/FpdfOutput/qr-payment-information-zero-amount.print.pdf differ diff --git a/tests/TestData/FpdfOutput/qr-payment-reference-non.pdf b/tests/TestData/FpdfOutput/qr-payment-reference-non.pdf index e4678267..6f5780e2 100644 Binary files a/tests/TestData/FpdfOutput/qr-payment-reference-non.pdf and b/tests/TestData/FpdfOutput/qr-payment-reference-non.pdf differ diff --git a/tests/TestData/FpdfOutput/qr-payment-reference-non.print.pdf b/tests/TestData/FpdfOutput/qr-payment-reference-non.print.pdf index d326eebe..2c35a6d6 100644 Binary files a/tests/TestData/FpdfOutput/qr-payment-reference-non.print.pdf and b/tests/TestData/FpdfOutput/qr-payment-reference-non.print.pdf differ diff --git a/tests/TestData/FpdfOutput/qr-payment-reference-scor.pdf b/tests/TestData/FpdfOutput/qr-payment-reference-scor.pdf index e563b3da..cd00f165 100644 Binary files a/tests/TestData/FpdfOutput/qr-payment-reference-scor.pdf and b/tests/TestData/FpdfOutput/qr-payment-reference-scor.pdf differ diff --git a/tests/TestData/FpdfOutput/qr-payment-reference-scor.print.pdf b/tests/TestData/FpdfOutput/qr-payment-reference-scor.print.pdf index c1b155bf..bfb8d5e9 100644 Binary files a/tests/TestData/FpdfOutput/qr-payment-reference-scor.print.pdf and b/tests/TestData/FpdfOutput/qr-payment-reference-scor.print.pdf differ diff --git a/tests/TestData/FpdfOutput/qr-ultimate-debtor.pdf b/tests/TestData/FpdfOutput/qr-ultimate-debtor.pdf index 8fcdbc7c..edeb6203 100644 Binary files a/tests/TestData/FpdfOutput/qr-ultimate-debtor.pdf and b/tests/TestData/FpdfOutput/qr-ultimate-debtor.pdf differ diff --git a/tests/TestData/FpdfOutput/qr-ultimate-debtor.print.pdf b/tests/TestData/FpdfOutput/qr-ultimate-debtor.print.pdf index ce01503f..0baed6e9 100644 Binary files a/tests/TestData/FpdfOutput/qr-ultimate-debtor.print.pdf and b/tests/TestData/FpdfOutput/qr-ultimate-debtor.print.pdf differ diff --git a/tests/TestData/HtmlOutput/qr-alternative-schemes.svg.html b/tests/TestData/HtmlOutput/qr-alternative-schemes.svg.html index a8e71e23..f720b3c5 100644 --- a/tests/TestData/HtmlOutput/qr-alternative-schemes.svg.html +++ b/tests/TestData/HtmlOutput/qr-alternative-schemes.svg.html @@ -203,7 +203,7 @@

Acceptance point

Payment part

- +

Currency

CHF

@@ -222,8 +222,8 @@

Account / Payable to

CH44 3199 9123 0008 8901 2

-

foo
-foo

+

CC/XRPL/10/bUuK6fwHtfZ3HGAgKvEV7Y5TzHEu8ChUj9
+CC/XRPL/10/bUuK6fwHtfZ3HGAgKvEV7Y5TzHEu8ChUj9

diff --git a/tests/TestData/HtmlOutput/qr-alternative-schemes.svg.print.html b/tests/TestData/HtmlOutput/qr-alternative-schemes.svg.print.html index 6bc4a65f..81be778f 100644 --- a/tests/TestData/HtmlOutput/qr-alternative-schemes.svg.print.html +++ b/tests/TestData/HtmlOutput/qr-alternative-schemes.svg.print.html @@ -213,7 +213,7 @@

Acceptance point

Payment part

- +

Currency

CHF

@@ -232,8 +232,8 @@

Account / Payable to

CH44 3199 9123 0008 8901 2

-

foo
-foo

+

CC/XRPL/10/bUuK6fwHtfZ3HGAgKvEV7Y5TzHEu8ChUj9
+CC/XRPL/10/bUuK6fwHtfZ3HGAgKvEV7Y5TzHEu8ChUj9

diff --git a/tests/TestData/HtmlOutput/qr-full-set.svg.html b/tests/TestData/HtmlOutput/qr-full-set.svg.html index 8dad7c69..b8b063a7 100644 --- a/tests/TestData/HtmlOutput/qr-full-set.svg.html +++ b/tests/TestData/HtmlOutput/qr-full-set.svg.html @@ -205,7 +205,7 @@

Acceptance point

Payment part

- +

Currency

CHF

@@ -228,8 +228,8 @@

Account / Payable to

CH44 3199 9123 0008 8901 2

-

foo
-foo

+

CC/XRPL/10/bUuK6fwHtfZ3HGAgKvEV7Y5TzHEu8ChUj9
+CC/XRPL/10/bUuK6fwHtfZ3HGAgKvEV7Y5TzHEu8ChUj9

diff --git a/tests/TestData/HtmlOutput/qr-full-set.svg.print.html b/tests/TestData/HtmlOutput/qr-full-set.svg.print.html index f96fd1b0..61a241ac 100644 --- a/tests/TestData/HtmlOutput/qr-full-set.svg.print.html +++ b/tests/TestData/HtmlOutput/qr-full-set.svg.print.html @@ -215,7 +215,7 @@

Acceptance point

Payment part

- +

Currency

CHF

@@ -238,8 +238,8 @@

Account / Payable to

CH44 3199 9123 0008 8901 2

-

foo
-foo

+

CC/XRPL/10/bUuK6fwHtfZ3HGAgKvEV7Y5TzHEu8ChUj9
+CC/XRPL/10/bUuK6fwHtfZ3HGAgKvEV7Y5TzHEu8ChUj9

diff --git a/tests/TestData/QrCodes/TestDataTest.php b/tests/TestData/QrCodes/TestDataTest.php index 39ddc53b..5f6d41ec 100644 --- a/tests/TestData/QrCodes/TestDataTest.php +++ b/tests/TestData/QrCodes/TestDataTest.php @@ -23,21 +23,21 @@ public function testQrFile(string $file, string $hash): void public function qrFileProvider(): array { return [ - [__DIR__ . '/qr-additional-information.png', 'c690b3c552cb31057a34d1bbe1e3a158'], - [__DIR__ . '/qr-alternative-schemes.png', 'ca22587f45609486ec9128f8bfb9ef83'], - [__DIR__ . '/qr-full-set.png', 'ae3aa21373bb4b6ad61a8df96995f06b'], - [__DIR__ . '/qr-international-ultimate-debtor.png', '3178b54237dbbf43df99ea98bba82aaa'], - [__DIR__ . '/qr-minimal-setup.png', '246e856c5c75e92ad9e70298e870d957'], + [__DIR__ . '/qr-additional-information.png', '5089db74d380d6ece97d02c86cb35e2d'], + [__DIR__ . '/qr-alternative-schemes.png', 'd34aeb0d10da0663a5dfd9df54503e71'], + [__DIR__ . '/qr-full-set.png', 'b52be79babcc58485ee68fb4f722657c'], + [__DIR__ . '/qr-international-ultimate-debtor.png', 'c56676e8c98f3ba54fac959c450a0995'], + [__DIR__ . '/qr-minimal-setup.png', '72911d0c7d23298aeb14e4960204d6e0'], [__DIR__ . '/qr-payment-information-with-mediumlong-creditor-and-unknown-debtor.png', 'c347c35996eee781942ee2fa35da0a88'], [__DIR__ . '/qr-payment-information-without-amount-and-long-addresses.png', 'c5d23d3fe94aeed310bdf3b9349ce2f9'], - [__DIR__ . '/qr-payment-information-without-amount.png', 'd21e7106158945a52c7b2be00fbd5369'], - [__DIR__ . '/qr-payment-information-without-amount-but-debtor.png', '67b382fdaa8cd69eb328862d8393fb9f'], - [__DIR__ . '/qr-payment-information-zero-amount.png', '66c1373bac50b98705d94b33462a72c6'], - [__DIR__ . '/qr-payment-reference-non.png', '5843f882b1883f8202c43c17fa07ae86'], - [__DIR__ . '/qr-payment-reference-scor.png', '4ef959e7b428650ec4198491a6d91f1c'], - [__DIR__ . '/qr-ultimate-debtor.png', '9d1d257c2b65d9d04d4d7a20ced6ef1a'], + [__DIR__ . '/qr-payment-information-without-amount.png', '1da10251b49d72aa48c35207f54d4f1e'], + [__DIR__ . '/qr-payment-information-without-amount-but-debtor.png', '7f0276efa720448229a0cbeccc2aa805'], + [__DIR__ . '/qr-payment-information-zero-amount.png', 'd779c23775b755e7d193b22e93b51ed4'], + [__DIR__ . '/qr-payment-reference-non.png', '176a87b6743ebb3b4d15e9d85937780a'], + [__DIR__ . '/qr-payment-reference-scor.png', '7abd60316b137fa472165faff8e4a28c'], + [__DIR__ . '/qr-ultimate-debtor.png', 'ed279b73f429a8d9960b8dcb94c2c429'], - [__DIR__ . '/proof-of-validation.png', '5089538f592679b5cd69130b7f16fe24'], + [__DIR__ . '/proof-of-validation.png', 'a50bc5625703d22da79b46880ff3aef4'], ]; } } \ No newline at end of file diff --git a/tests/TestData/QrCodes/proof-of-validation.png b/tests/TestData/QrCodes/proof-of-validation.png index 1f55b433..2bb3b60e 100644 Binary files a/tests/TestData/QrCodes/proof-of-validation.png and b/tests/TestData/QrCodes/proof-of-validation.png differ diff --git a/tests/TestData/QrCodes/qr-additional-information.png b/tests/TestData/QrCodes/qr-additional-information.png index ad88fc41..13a19e89 100644 Binary files a/tests/TestData/QrCodes/qr-additional-information.png and b/tests/TestData/QrCodes/qr-additional-information.png differ diff --git a/tests/TestData/QrCodes/qr-alternative-schemes.png b/tests/TestData/QrCodes/qr-alternative-schemes.png index d3f47531..c7356387 100644 Binary files a/tests/TestData/QrCodes/qr-alternative-schemes.png and b/tests/TestData/QrCodes/qr-alternative-schemes.png differ diff --git a/tests/TestData/QrCodes/qr-alternative-schemes.txt b/tests/TestData/QrCodes/qr-alternative-schemes.txt index 925323ab..1dbbe2c8 100644 --- a/tests/TestData/QrCodes/qr-alternative-schemes.txt +++ b/tests/TestData/QrCodes/qr-alternative-schemes.txt @@ -29,5 +29,5 @@ QRR 123456789012345678901234567 EPD -foo -foo \ No newline at end of file +CC/XRPL/10/bUuK6fwHtfZ3HGAgKvEV7Y5TzHEu8ChUj9 +CC/XRPL/10/bUuK6fwHtfZ3HGAgKvEV7Y5TzHEu8ChUj9 \ No newline at end of file diff --git a/tests/TestData/QrCodes/qr-full-set.png b/tests/TestData/QrCodes/qr-full-set.png index 6def4199..0379877d 100644 Binary files a/tests/TestData/QrCodes/qr-full-set.png and b/tests/TestData/QrCodes/qr-full-set.png differ diff --git a/tests/TestData/QrCodes/qr-full-set.txt b/tests/TestData/QrCodes/qr-full-set.txt index f0e2227e..b83859f6 100644 --- a/tests/TestData/QrCodes/qr-full-set.txt +++ b/tests/TestData/QrCodes/qr-full-set.txt @@ -30,5 +30,5 @@ QRR Invoice 1234568 Gardening work EPD Bill Information -foo -foo \ No newline at end of file +CC/XRPL/10/bUuK6fwHtfZ3HGAgKvEV7Y5TzHEu8ChUj9 +CC/XRPL/10/bUuK6fwHtfZ3HGAgKvEV7Y5TzHEu8ChUj9 \ No newline at end of file diff --git a/tests/TestData/QrCodes/qr-international-ultimate-debtor.png b/tests/TestData/QrCodes/qr-international-ultimate-debtor.png index b5782783..397cd9e7 100644 Binary files a/tests/TestData/QrCodes/qr-international-ultimate-debtor.png and b/tests/TestData/QrCodes/qr-international-ultimate-debtor.png differ diff --git a/tests/TestData/QrCodes/qr-minimal-setup.png b/tests/TestData/QrCodes/qr-minimal-setup.png index efb2ebc7..b228ee11 100644 Binary files a/tests/TestData/QrCodes/qr-minimal-setup.png and b/tests/TestData/QrCodes/qr-minimal-setup.png differ diff --git a/tests/TestData/QrCodes/qr-payment-information-without-amount-but-debtor.png b/tests/TestData/QrCodes/qr-payment-information-without-amount-but-debtor.png index f4afface..67a121c1 100644 Binary files a/tests/TestData/QrCodes/qr-payment-information-without-amount-but-debtor.png and b/tests/TestData/QrCodes/qr-payment-information-without-amount-but-debtor.png differ diff --git a/tests/TestData/QrCodes/qr-payment-information-without-amount.png b/tests/TestData/QrCodes/qr-payment-information-without-amount.png index 3849a48c..b81acf9b 100644 Binary files a/tests/TestData/QrCodes/qr-payment-information-without-amount.png and b/tests/TestData/QrCodes/qr-payment-information-without-amount.png differ diff --git a/tests/TestData/QrCodes/qr-payment-information-zero-amount.png b/tests/TestData/QrCodes/qr-payment-information-zero-amount.png index 569692dd..812a5160 100644 Binary files a/tests/TestData/QrCodes/qr-payment-information-zero-amount.png and b/tests/TestData/QrCodes/qr-payment-information-zero-amount.png differ diff --git a/tests/TestData/QrCodes/qr-payment-reference-non.png b/tests/TestData/QrCodes/qr-payment-reference-non.png index d06c6520..03a4f0c6 100644 Binary files a/tests/TestData/QrCodes/qr-payment-reference-non.png and b/tests/TestData/QrCodes/qr-payment-reference-non.png differ diff --git a/tests/TestData/QrCodes/qr-payment-reference-scor.png b/tests/TestData/QrCodes/qr-payment-reference-scor.png index b6df4dce..281f6a32 100644 Binary files a/tests/TestData/QrCodes/qr-payment-reference-scor.png and b/tests/TestData/QrCodes/qr-payment-reference-scor.png differ diff --git a/tests/TestData/QrCodes/qr-ultimate-debtor.png b/tests/TestData/QrCodes/qr-ultimate-debtor.png index dfade632..c81042d1 100644 Binary files a/tests/TestData/QrCodes/qr-ultimate-debtor.png and b/tests/TestData/QrCodes/qr-ultimate-debtor.png differ diff --git a/tests/TestData/TcPdfOutput/qr-additional-information.svg.pdf b/tests/TestData/TcPdfOutput/qr-additional-information.svg.pdf index b1026674..b583a24c 100644 Binary files a/tests/TestData/TcPdfOutput/qr-additional-information.svg.pdf and b/tests/TestData/TcPdfOutput/qr-additional-information.svg.pdf differ diff --git a/tests/TestData/TcPdfOutput/qr-additional-information.svg.print.pdf b/tests/TestData/TcPdfOutput/qr-additional-information.svg.print.pdf index cc9d04ad..8a6e0da1 100644 Binary files a/tests/TestData/TcPdfOutput/qr-additional-information.svg.print.pdf and b/tests/TestData/TcPdfOutput/qr-additional-information.svg.print.pdf differ diff --git a/tests/TestData/TcPdfOutput/qr-alternative-schemes.svg.pdf b/tests/TestData/TcPdfOutput/qr-alternative-schemes.svg.pdf index 0e462e9e..6c2e5016 100644 Binary files a/tests/TestData/TcPdfOutput/qr-alternative-schemes.svg.pdf and b/tests/TestData/TcPdfOutput/qr-alternative-schemes.svg.pdf differ diff --git a/tests/TestData/TcPdfOutput/qr-alternative-schemes.svg.print.pdf b/tests/TestData/TcPdfOutput/qr-alternative-schemes.svg.print.pdf index 2ab84de1..f56c51a2 100644 Binary files a/tests/TestData/TcPdfOutput/qr-alternative-schemes.svg.print.pdf and b/tests/TestData/TcPdfOutput/qr-alternative-schemes.svg.print.pdf differ diff --git a/tests/TestData/TcPdfOutput/qr-full-set.svg.pdf b/tests/TestData/TcPdfOutput/qr-full-set.svg.pdf index 88f218a3..b3b93e75 100644 Binary files a/tests/TestData/TcPdfOutput/qr-full-set.svg.pdf and b/tests/TestData/TcPdfOutput/qr-full-set.svg.pdf differ diff --git a/tests/TestData/TcPdfOutput/qr-full-set.svg.print.pdf b/tests/TestData/TcPdfOutput/qr-full-set.svg.print.pdf index eaf0314d..cbdf5fd8 100644 Binary files a/tests/TestData/TcPdfOutput/qr-full-set.svg.print.pdf and b/tests/TestData/TcPdfOutput/qr-full-set.svg.print.pdf differ diff --git a/tests/TestData/TcPdfOutput/qr-international-ultimate-debtor.svg.pdf b/tests/TestData/TcPdfOutput/qr-international-ultimate-debtor.svg.pdf index 40966c22..a647e62b 100644 Binary files a/tests/TestData/TcPdfOutput/qr-international-ultimate-debtor.svg.pdf and b/tests/TestData/TcPdfOutput/qr-international-ultimate-debtor.svg.pdf differ diff --git a/tests/TestData/TcPdfOutput/qr-international-ultimate-debtor.svg.print.pdf b/tests/TestData/TcPdfOutput/qr-international-ultimate-debtor.svg.print.pdf index 85af159d..1d628e1b 100644 Binary files a/tests/TestData/TcPdfOutput/qr-international-ultimate-debtor.svg.print.pdf and b/tests/TestData/TcPdfOutput/qr-international-ultimate-debtor.svg.print.pdf differ diff --git a/tests/TestData/TcPdfOutput/qr-minimal-setup.svg.pdf b/tests/TestData/TcPdfOutput/qr-minimal-setup.svg.pdf index c21fae9c..6e7d8a54 100644 Binary files a/tests/TestData/TcPdfOutput/qr-minimal-setup.svg.pdf and b/tests/TestData/TcPdfOutput/qr-minimal-setup.svg.pdf differ diff --git a/tests/TestData/TcPdfOutput/qr-minimal-setup.svg.print.pdf b/tests/TestData/TcPdfOutput/qr-minimal-setup.svg.print.pdf index 39afa3bc..349c98b0 100644 Binary files a/tests/TestData/TcPdfOutput/qr-minimal-setup.svg.print.pdf and b/tests/TestData/TcPdfOutput/qr-minimal-setup.svg.print.pdf differ diff --git a/tests/TestData/TcPdfOutput/qr-payment-information-with-mediumlong-creditor-and-unknown-debtor.svg.pdf b/tests/TestData/TcPdfOutput/qr-payment-information-with-mediumlong-creditor-and-unknown-debtor.svg.pdf index 6e8036e5..85bedb45 100644 Binary files a/tests/TestData/TcPdfOutput/qr-payment-information-with-mediumlong-creditor-and-unknown-debtor.svg.pdf and b/tests/TestData/TcPdfOutput/qr-payment-information-with-mediumlong-creditor-and-unknown-debtor.svg.pdf differ diff --git a/tests/TestData/TcPdfOutput/qr-payment-information-with-mediumlong-creditor-and-unknown-debtor.svg.print.pdf b/tests/TestData/TcPdfOutput/qr-payment-information-with-mediumlong-creditor-and-unknown-debtor.svg.print.pdf index ffbbb555..e58fe263 100644 Binary files a/tests/TestData/TcPdfOutput/qr-payment-information-with-mediumlong-creditor-and-unknown-debtor.svg.print.pdf and b/tests/TestData/TcPdfOutput/qr-payment-information-with-mediumlong-creditor-and-unknown-debtor.svg.print.pdf differ diff --git a/tests/TestData/TcPdfOutput/qr-payment-information-without-amount-and-long-addresses.svg.pdf b/tests/TestData/TcPdfOutput/qr-payment-information-without-amount-and-long-addresses.svg.pdf index 7f34c2eb..0aabc808 100644 Binary files a/tests/TestData/TcPdfOutput/qr-payment-information-without-amount-and-long-addresses.svg.pdf and b/tests/TestData/TcPdfOutput/qr-payment-information-without-amount-and-long-addresses.svg.pdf differ diff --git a/tests/TestData/TcPdfOutput/qr-payment-information-without-amount-and-long-addresses.svg.print.pdf b/tests/TestData/TcPdfOutput/qr-payment-information-without-amount-and-long-addresses.svg.print.pdf index c2b76c55..2ca1cde0 100644 Binary files a/tests/TestData/TcPdfOutput/qr-payment-information-without-amount-and-long-addresses.svg.print.pdf and b/tests/TestData/TcPdfOutput/qr-payment-information-without-amount-and-long-addresses.svg.print.pdf differ diff --git a/tests/TestData/TcPdfOutput/qr-payment-information-without-amount-but-debtor.svg.pdf b/tests/TestData/TcPdfOutput/qr-payment-information-without-amount-but-debtor.svg.pdf index 0c62c84e..d4959dda 100644 Binary files a/tests/TestData/TcPdfOutput/qr-payment-information-without-amount-but-debtor.svg.pdf and b/tests/TestData/TcPdfOutput/qr-payment-information-without-amount-but-debtor.svg.pdf differ diff --git a/tests/TestData/TcPdfOutput/qr-payment-information-without-amount-but-debtor.svg.print.pdf b/tests/TestData/TcPdfOutput/qr-payment-information-without-amount-but-debtor.svg.print.pdf index ab6346be..7d5b3b43 100644 Binary files a/tests/TestData/TcPdfOutput/qr-payment-information-without-amount-but-debtor.svg.print.pdf and b/tests/TestData/TcPdfOutput/qr-payment-information-without-amount-but-debtor.svg.print.pdf differ diff --git a/tests/TestData/TcPdfOutput/qr-payment-information-without-amount.svg.pdf b/tests/TestData/TcPdfOutput/qr-payment-information-without-amount.svg.pdf index 8339ad8e..ea9826be 100644 Binary files a/tests/TestData/TcPdfOutput/qr-payment-information-without-amount.svg.pdf and b/tests/TestData/TcPdfOutput/qr-payment-information-without-amount.svg.pdf differ diff --git a/tests/TestData/TcPdfOutput/qr-payment-information-without-amount.svg.print.pdf b/tests/TestData/TcPdfOutput/qr-payment-information-without-amount.svg.print.pdf index f74131f1..fc771fa7 100644 Binary files a/tests/TestData/TcPdfOutput/qr-payment-information-without-amount.svg.print.pdf and b/tests/TestData/TcPdfOutput/qr-payment-information-without-amount.svg.print.pdf differ diff --git a/tests/TestData/TcPdfOutput/qr-payment-information-zero-amount.svg.pdf b/tests/TestData/TcPdfOutput/qr-payment-information-zero-amount.svg.pdf index 511bdba8..05363c57 100644 Binary files a/tests/TestData/TcPdfOutput/qr-payment-information-zero-amount.svg.pdf and b/tests/TestData/TcPdfOutput/qr-payment-information-zero-amount.svg.pdf differ diff --git a/tests/TestData/TcPdfOutput/qr-payment-information-zero-amount.svg.print.pdf b/tests/TestData/TcPdfOutput/qr-payment-information-zero-amount.svg.print.pdf index 6e20232f..89ba899d 100644 Binary files a/tests/TestData/TcPdfOutput/qr-payment-information-zero-amount.svg.print.pdf and b/tests/TestData/TcPdfOutput/qr-payment-information-zero-amount.svg.print.pdf differ diff --git a/tests/TestData/TcPdfOutput/qr-payment-reference-non.svg.pdf b/tests/TestData/TcPdfOutput/qr-payment-reference-non.svg.pdf index 9bc5c031..29ffd677 100644 Binary files a/tests/TestData/TcPdfOutput/qr-payment-reference-non.svg.pdf and b/tests/TestData/TcPdfOutput/qr-payment-reference-non.svg.pdf differ diff --git a/tests/TestData/TcPdfOutput/qr-payment-reference-non.svg.print.pdf b/tests/TestData/TcPdfOutput/qr-payment-reference-non.svg.print.pdf index 86ba93f5..c2ec749f 100644 Binary files a/tests/TestData/TcPdfOutput/qr-payment-reference-non.svg.print.pdf and b/tests/TestData/TcPdfOutput/qr-payment-reference-non.svg.print.pdf differ diff --git a/tests/TestData/TcPdfOutput/qr-payment-reference-scor.svg.pdf b/tests/TestData/TcPdfOutput/qr-payment-reference-scor.svg.pdf index 8c5b87f5..7b6ee3bb 100644 Binary files a/tests/TestData/TcPdfOutput/qr-payment-reference-scor.svg.pdf and b/tests/TestData/TcPdfOutput/qr-payment-reference-scor.svg.pdf differ diff --git a/tests/TestData/TcPdfOutput/qr-payment-reference-scor.svg.print.pdf b/tests/TestData/TcPdfOutput/qr-payment-reference-scor.svg.print.pdf index 653f57d8..91b91c6e 100644 Binary files a/tests/TestData/TcPdfOutput/qr-payment-reference-scor.svg.print.pdf and b/tests/TestData/TcPdfOutput/qr-payment-reference-scor.svg.print.pdf differ diff --git a/tests/TestData/TcPdfOutput/qr-ultimate-debtor.svg.pdf b/tests/TestData/TcPdfOutput/qr-ultimate-debtor.svg.pdf index b2db1b2a..782a7f1b 100644 Binary files a/tests/TestData/TcPdfOutput/qr-ultimate-debtor.svg.pdf and b/tests/TestData/TcPdfOutput/qr-ultimate-debtor.svg.pdf differ diff --git a/tests/TestData/TcPdfOutput/qr-ultimate-debtor.svg.print.pdf b/tests/TestData/TcPdfOutput/qr-ultimate-debtor.svg.print.pdf index 8da0ec6c..10e4adc5 100644 Binary files a/tests/TestData/TcPdfOutput/qr-ultimate-debtor.svg.print.pdf and b/tests/TestData/TcPdfOutput/qr-ultimate-debtor.svg.print.pdf differ diff --git a/tests/TestQrBillCreatorTrait.php b/tests/TestQrBillCreatorTrait.php index 0aaef8c4..f277938e 100644 --- a/tests/TestQrBillCreatorTrait.php +++ b/tests/TestQrBillCreatorTrait.php @@ -144,8 +144,8 @@ protected function getQrBillWithAdditonalSchemes() 'paymentReferenceQr', ]); - $qrBill->addAlternativeScheme(AlternativeScheme::create('foo')); - $qrBill->addAlternativeScheme(AlternativeScheme::create('foo')); + $qrBill->addAlternativeScheme(AlternativeScheme::create('CC/XRPL/10/bUuK6fwHtfZ3HGAgKvEV7Y5TzHEu8ChUj9')); + $qrBill->addAlternativeScheme(AlternativeScheme::create('CC/XRPL/10/bUuK6fwHtfZ3HGAgKvEV7Y5TzHEu8ChUj9')); return $qrBill; } @@ -162,8 +162,8 @@ protected function getQrBillFullSet() 'additionalInformation' ]); - $qrBill->addAlternativeScheme(AlternativeScheme::create('foo')); - $qrBill->addAlternativeScheme(AlternativeScheme::create('foo')); + $qrBill->addAlternativeScheme(AlternativeScheme::create('CC/XRPL/10/bUuK6fwHtfZ3HGAgKvEV7Y5TzHEu8ChUj9')); + $qrBill->addAlternativeScheme(AlternativeScheme::create('CC/XRPL/10/bUuK6fwHtfZ3HGAgKvEV7Y5TzHEu8ChUj9')); return $qrBill; }