Skip to content

Commit

Permalink
refactor: updated endroid/qr-code
Browse files Browse the repository at this point in the history
  • Loading branch information
@petrknap
petrknap committed Oct 12, 2023
1 parent da11ea5 commit 0b2bca2
Show file tree
Hide file tree
Showing 7 changed files with 87 additions and 81 deletions.
2 changes: 1 addition & 1 deletion Dockerfile
View file
Original file line number Diff line number Diff line change
Expand Up @@ -38,4 +38,4 @@ RUN docker-php-ext-install \

WORKDIR /app
COPY . .
RUN composer install
RUN composer update --prefer-lowest
Empty file modified README.md
100644 → 100755
View file
Empty file.
2 changes: 1 addition & 1 deletion composer.json
View file
Original file line number Diff line number Diff line change
Expand Up @@ -28,7 +28,7 @@
"name": "petrknap/spayd-qr",
"require": {
"php": ">=8.0",
"endroid/qr-code": "^3.5",
"endroid/qr-code": "^4.1",
"moneyphp/money": "^4.0",
"sunfoxcz/spayd-php": "^2.0"
},
Expand Down
36 changes: 18 additions & 18 deletions src/SpaydQr.php
100644 → 100755
View file
Original file line number Diff line number Diff line change
Expand Up @@ -2,9 +2,12 @@

namespace PetrKnap\SpaydQr;

use Endroid\QrCode\QrCode;
use Endroid\QrCode\Builder\Builder;
use Endroid\QrCode\Builder\BuilderInterface;
use Endroid\QrCode\Encoding\Encoding;
use Endroid\QrCode\Writer\PngWriter;
use Endroid\QrCode\Writer\WriterInterface;
use Endroid\QrCode\Writer\Result\ResultInterface;
use Money\Currencies\ISOCurrencies;
use Money\Formatter\DecimalMoneyFormatter;
use Money\Money;
Expand All @@ -15,7 +18,7 @@ class SpaydQr implements SpaydQrInterface
/** @internal */
protected function __construct(
/** @internal */ protected Spayd $spayd,
private QrCode $qrCode,
/** @internal */ protected BuilderInterface $qrCodeBuilder,
string $iban,
Money $money
) {
Expand All @@ -27,12 +30,11 @@ protected function __construct(

public static function create(string $iban, Money $money, WriterInterface $writer = null): self
{
$qrCode = new QrCode();
$qrCode->setWriter($writer ?: new PngWriter());

return new self(
new Spayd(),
$qrCode,
Builder::create()
->writer($writer ?: new PngWriter())
->encoding(new Encoding('UTF-8')),
$iban,
$money
);
Expand Down Expand Up @@ -80,47 +82,45 @@ public function setInvoice(

public function setWriter(WriterInterface $writer): self
{
$this->qrCode->setWriter($writer);
$this->qrCodeBuilder->writer($writer);

return $this;
}

public function getContentType(): string
{
return $this->prepareQrCode(null, null, null)->getContentType();
return $this->buildQrCode(null, null)->getMimeType();
}

public function getContent(int $size = self::QR_SIZE, int $margin = self::QR_MARGIN): string
{
return $this->prepareQrCode($this->spayd, $size, $margin)->writeString();
return $this->buildQrCode($size, $margin)->getString();
}

public function getDataUri(int $size = self::QR_SIZE, int $margin = self::QR_MARGIN): string
{
return $this->prepareQrCode($this->spayd, $size, $margin)->writeDataUri();
return $this->buildQrCode($size, $margin)->getDataUri();
}

public function writeFile(string $path, int $size = self::QR_SIZE, int $margin = self::QR_MARGIN): void
{
$this->prepareQrCode($this->spayd, $size, $margin)->writeFile($path);
$this->buildQrCode($size, $margin)->saveToFile($path);
}

/** @internal */
protected function prepareQrCode(?Spayd $spayd, ?int $size, ?int $margin): QrCode
protected function buildQrCode(?int $size, ?int $margin): ResultInterface
{
if ($spayd !== null) {
$this->qrCode->setText($spayd->generate());
}
$this->qrCodeBuilder->data($this->spayd->generate());

if ($size !== null) {
$this->qrCode->setSize($size);
$this->qrCodeBuilder->size($size);
}

if ($margin !== null) {
$this->qrCode->setMargin($margin);
$this->qrCodeBuilder->margin($margin);
}

return $this->qrCode;
return $this->qrCodeBuilder->build();
}

private function getAmount(Money $money): string
Expand Down
1 change: 1 addition & 0 deletions src/SpaydQrInterface.php
100644 → 100755
View file
Original file line number Diff line number Diff line change
Expand Up @@ -38,6 +38,7 @@ public function setInvoice(
?string $buyerVatIdentificationNumber,
?string $description
): self;
/** @todo create own enum of writers */
public function setWriter(WriterInterface $writer): self;

public function getContentType(): string;
Expand Down
2 changes: 1 addition & 1 deletion tests/ExamplesTest/readme_1.html
100644 → 100755
View file
Original file line number Diff line number Diff line change
@@ -1 +1 @@
<img src="data:image/png;base64,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">
<img src="data:image/png;base64,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">
125 changes: 65 additions & 60 deletions tests/SpaydQrTest.php
100644 → 100755
View file
Original file line number Diff line number Diff line change
Expand Up @@ -2,7 +2,9 @@

namespace PetrKnap\SpaydQr\Test;

use Endroid\QrCode\QrCode;
use Endroid\QrCode\Builder\Builder;
use Endroid\QrCode\Builder\BuilderInterface;
use Endroid\QrCode\Writer\Result\ResultInterface;
use Endroid\QrCode\Writer\SvgWriter;
use Endroid\QrCode\Writer\WriterInterface;
use Money\Money;
Expand Down Expand Up @@ -30,16 +32,13 @@ public function testFactoryWorks()
public function testSetWriterWorks()
{
$writer = $this->getMockBuilder(WriterInterface::class)->getMock();
$qrCode = $this->getMockBuilder(QrCode::class)
->disableOriginalConstructor()
->setMethods(['setWriter'])
->getMock();
$qrCode->expects($this->once())
->method('setWriter')
$qrCodeBuilder = $this->getMockBuilder(BuilderInterface::class)->getMock();
$qrCodeBuilder->expects($this->once())
->method('writer')
->with($writer)
->willReturnSelf();

$this->getSpaydQr(null, $qrCode)->setWriter($writer);
$this->getSpaydQr(null, $qrCodeBuilder)->setWriter($writer);
}

public function testSetVariableSymbolWorks()
Expand Down Expand Up @@ -97,17 +96,18 @@ public function testGetContentTypeWorks()
{
$expectedContentType = 'Expected content type';

$qrCode = $this->getMockBuilder(QrCode::class)
->disableOriginalConstructor()
->setMethods(['getContentType'])
->getMock();
$qrCode->expects($this->once())
->method('getContentType')
$qrCodeBuilder = $this->getMockBuilder(BuilderInterface::class)->getMock();
$qrCodeResult = $this->getMockBuilder(ResultInterface::class)->getMock();
$qrCodeBuilder->expects($this->once())
->method('build')
->willReturn($qrCodeResult);
$qrCodeResult->expects($this->once())
->method('getMimeType')
->willReturn($expectedContentType);

$this->assertEquals(
$expectedContentType,
$this->getSpaydQr(null, $qrCode)->getContentType()
$this->getSpaydQr(null, $qrCodeBuilder)->getContentType()
);
}

Expand All @@ -125,26 +125,27 @@ public function testGetContentWorks(?int $expectedSize, ?int $expectedMargin)
->method('generate')
->willReturn($expectedSPayD);

$qrCode = $this->getMockBuilder(QrCode::class)
->disableOriginalConstructor()
->setMethods(['setSize', 'setMargin', 'setText', 'writeString'])
->getMock();
$qrCode->expects($this->once())
->method('setSize')
$qrCodeBuilder = $this->getMockBuilder(BuilderInterface::class)->getMock();
$qrCodeResult = $this->getMockBuilder(ResultInterface::class)->getMock();
$qrCodeBuilder->expects($this->once())
->method('size')
->with($expectedSize ?: SpaydQr::QR_SIZE);
$qrCode->expects($this->once())
->method('setMargin')
$qrCodeBuilder->expects($this->once())
->method('margin')
->with($expectedMargin ?: SpaydQr::QR_MARGIN);
$qrCode->expects($this->once())
->method('setText')
$qrCodeBuilder->expects($this->once())
->method('data')
->with($expectedSPayD);
$qrCode->expects($this->once())
->method('writeString')
$qrCodeBuilder->expects($this->once())
->method('build')
->willReturn($qrCodeResult);
$qrCodeResult->expects($this->once())
->method('getString')
->willReturn($expectedContent);

$this->assertEquals(
$expectedContent,
$this->getSpaydQr($spayd, $qrCode)->getContent(...$this->trimArgs([$expectedSize, $expectedMargin]))
$this->getSpaydQr($spayd, $qrCodeBuilder)->getContent(...$this->trimArgs([$expectedSize, $expectedMargin]))
);
}

Expand All @@ -171,26 +172,27 @@ public function testGetDataUriWorks(?int $expectedSize, ?int $expectedMargin)
->method('generate')
->willReturn($expectedSPayD);

$qrCode = $this->getMockBuilder(QrCode::class)
->disableOriginalConstructor()
->setMethods(['setSize', 'setMargin', 'setText', 'writeDataUri'])
->getMock();
$qrCode->expects($this->once())
->method('setSize')
$qrCodeBuilder = $this->getMockBuilder(BuilderInterface::class)->getMock();
$qrCodeResult = $this->getMockBuilder(ResultInterface::class)->getMock();
$qrCodeBuilder->expects($this->once())
->method('size')
->with($expectedSize ?: SpaydQr::QR_SIZE);
$qrCode->expects($this->once())
->method('setMargin')
$qrCodeBuilder->expects($this->once())
->method('margin')
->with($expectedMargin ?: SpaydQr::QR_MARGIN);
$qrCode->expects($this->once())
->method('setText')
$qrCodeBuilder->expects($this->once())
->method('data')
->with($expectedSPayD);
$qrCode->expects($this->once())
->method('writeDataUri')
$qrCodeBuilder->expects($this->once())
->method('build')
->willReturn($qrCodeResult);
$qrCodeResult->expects($this->once())
->method('getDataUri')
->willReturn($expectedDataUri);

$this->assertEquals(
$expectedDataUri,
$this->getSpaydQr($spayd, $qrCode)->getDataUri(...$this->trimArgs([$expectedSize, $expectedMargin]))
$this->getSpaydQr($spayd, $qrCodeBuilder)->getDataUri(...$this->trimArgs([$expectedSize, $expectedMargin]))
);
}

Expand All @@ -213,24 +215,25 @@ public function testWriteFileWorks(?int $expectedSize, ?int $expectedMargin)
->method('generate')
->willReturn($expectedSPayD);

$qrCode = $this->getMockBuilder(QrCode::class)
->disableOriginalConstructor()
->setMethods(['setSize', 'setMargin', 'setText', 'writeFile'])
->getMock();
$qrCode->expects($this->once())
->method('setSize')
$qrCodeBuilder = $this->getMockBuilder(BuilderInterface::class)->getMock();
$qrCodeResult = $this->getMockBuilder(ResultInterface::class)->getMock();
$qrCodeBuilder->expects($this->once())
->method('size')
->with($expectedSize ?: SpaydQr::QR_SIZE);
$qrCode->expects($this->once())
->method('setMargin')
$qrCodeBuilder->expects($this->once())
->method('margin')
->with($expectedMargin ?: SpaydQr::QR_MARGIN);
$qrCode->expects($this->once())
->method('setText')
$qrCodeBuilder->expects($this->once())
->method('data')
->with($expectedSPayD);
$qrCode->expects($this->once())
->method('writeFile')
$qrCodeBuilder->expects($this->once())
->method('build')
->willReturn($qrCodeResult);
$qrCodeResult->expects($this->once())
->method('saveToFile')
->with($expectedPath);

$this->getSpaydQr($spayd, $qrCode)->writeFile(...$this->trimArgs([$expectedPath, $expectedSize, $expectedMargin]));
$this->getSpaydQr($spayd, $qrCodeBuilder)->writeFile(...$this->trimArgs([$expectedPath, $expectedSize, $expectedMargin]));
}

public function dataWriteFileWorks()
Expand All @@ -240,7 +243,7 @@ public function dataWriteFileWorks()

public function testEndToEnd()
{
$spaydQr = $this->getSpaydQr(new Spayd(), new QrCode())
$spaydQr = $this->getSpaydQr(null, null)
->setWriter(new SvgWriter())
->setVariableSymbol(123)
->setInvoice(
Expand All @@ -254,14 +257,14 @@ public function testEndToEnd()
);

$this->assertNotEmpty($spaydQr->getSpayd()->generate());
$this->assertNotEmpty($spaydQr->getQrCode()->getData());
$this->assertNotEmpty($spaydQr->getQrCodeBuilder()->build()->getDataUri());
}

private function getSpaydQr(?Spayd $spayd, ?QrCode $qrCode)
private function getSpaydQr(?Spayd $spayd, ?BuilderInterface $qrCodeBuilder)
{
return new class (
$spayd ?: new Spayd(),
$qrCode ?: new QrCode(),
$qrCodeBuilder ?: Builder::create(),
self::IBAN,
Money::EUR(100)
) extends SpaydQr {
Expand All @@ -275,9 +278,11 @@ public function getSpayd(): Spayd
return $this->spayd;
}

public function getQrCode(): QrCode
public function getQrCodeBuilder(): BuilderInterface
{
return $this->prepareQrCode($this->spayd, null, null);
$this->buildQrCode(null, null);

return $this->qrCodeBuilder;
}
};
}
Expand Down

0 comments on commit 0b2bca2

Please sign in to comment.