Skip to content

Commit

Permalink
let Rector modernize code
Browse files Browse the repository at this point in the history
  • Loading branch information
kohlerdominik committed Dec 6, 2024
1 parent 1f73d6b commit 2f84a27
Show file tree
Hide file tree
Showing 11 changed files with 8 additions and 14 deletions.
1 change: 0 additions & 1 deletion src/DataGroup/Element/Abstracts/Address.php
Original file line number Diff line number Diff line change
Expand Up @@ -2,7 +2,6 @@

namespace Sprain\SwissQrBill\DataGroup\Element\Abstracts;

use Sprain\SwissQrBill\String\StringAnalyzer;
use Sprain\SwissQrBill\String\StringModifier;

/**
Expand Down
2 changes: 1 addition & 1 deletion src/DataGroup/Element/CombinedAddress.php
Original file line number Diff line number Diff line change
Expand Up @@ -44,7 +44,7 @@ private function __construct(
$this->name = self::normalizeString($name);
$this->addressLine1 = self::normalizeString($addressLine1);
$this->addressLine2 = self::normalizeString($addressLine2);
$this->country = strtoupper(self::normalizeString($country));
$this->country = strtoupper((string) self::normalizeString($country));
}

public static function create(
Expand Down
4 changes: 2 additions & 2 deletions src/DataGroup/Element/PaymentReference.php
Original file line number Diff line number Diff line change
Expand Up @@ -53,8 +53,8 @@ public function getReference(): ?string
public function getFormattedReference(): ?string
{
return match ($this->type) {
self::TYPE_QR => trim(strrev(chunk_split(strrev($this->reference), 5, ' '))),
self::TYPE_SCOR => trim(chunk_split($this->reference, 4, ' ')),
self::TYPE_QR => trim(strrev(chunk_split(strrev((string) $this->reference), 5, ' '))),
self::TYPE_SCOR => trim(chunk_split((string) $this->reference, 4, ' ')),
default => null,
};
}
Expand Down
2 changes: 1 addition & 1 deletion src/DataGroup/Element/StructuredAddress.php
Original file line number Diff line number Diff line change
Expand Up @@ -54,7 +54,7 @@ private function __construct(
$this->buildingNumber = self::normalizeString($buildingNumber);
$this->postalCode = self::normalizeString($postalCode);
$this->city = self::normalizeString($city);
$this->country = strtoupper(self::normalizeString($country));
$this->country = strtoupper((string) self::normalizeString($country));
}

public static function createWithoutStreet(
Expand Down
6 changes: 3 additions & 3 deletions src/PaymentPart/Output/TcPdfOutput/TcPdfOutput.php
Original file line number Diff line number Diff line change
Expand Up @@ -59,9 +59,9 @@ final class TcPdfOutput extends AbstractOutput
public function __construct(
QrBill $qrBill,
string $language,
private TCPDF|Fpdi $tcPdf,
private float $offsetX = 0,
private float $offsetY = 0
private readonly TCPDF|Fpdi $tcPdf,
private readonly float $offsetX = 0,
private readonly float $offsetY = 0
) {
parent::__construct($qrBill, $language);
$this->setQrCodeImageFormat(QrCode::FILE_FORMAT_SVG);
Expand Down
2 changes: 1 addition & 1 deletion src/Reference/QrPaymentReferenceGenerator.php
Original file line number Diff line number Diff line change
Expand Up @@ -53,7 +53,7 @@ public function doGenerate(): string
$completeReferenceNumber = $this->getCustomerIdentificationNumber();

$strlen = $completeReferenceNumber ? strlen($completeReferenceNumber) : 0;
$completeReferenceNumber .= str_pad($this->getReferenceNumber(), 26 - $strlen, '0', STR_PAD_LEFT);
$completeReferenceNumber .= str_pad((string) $this->getReferenceNumber(), 26 - $strlen, '0', STR_PAD_LEFT);
$completeReferenceNumber .= $this->modulo10($completeReferenceNumber);

return $completeReferenceNumber;
Expand Down
1 change: 0 additions & 1 deletion tests/PaymentPart/Output/FpdfOutput/FpdfOutputTest.php
Original file line number Diff line number Diff line change
Expand Up @@ -9,7 +9,6 @@
use Sprain\SwissQrBill\PaymentPart\Output\FpdfOutput\FpdfOutput;
use Sprain\SwissQrBill\PaymentPart\Output\FpdfOutput\UnsupportedEnvironmentException;
use Sprain\SwissQrBill\PaymentPart\Output\DisplayOptions;
use Sprain\SwissQrBill\PaymentPart\Output\VerticalSeparatorSymbolPosition;
use Sprain\SwissQrBill\QrBill;
use Sprain\SwissQrBill\QrCode\QrCode;
use Sprain\Tests\SwissQrBill\TestQrBillCreatorTrait;
Expand Down
1 change: 0 additions & 1 deletion tests/PaymentPart/Output/FpdfOutput/FpdiOutputTest.php
Original file line number Diff line number Diff line change
Expand Up @@ -8,7 +8,6 @@
use Sprain\SwissQrBill\Exception\InvalidFpdfImageFormat;
use Sprain\SwissQrBill\PaymentPart\Output\FpdfOutput\FpdfOutput;
use Sprain\SwissQrBill\PaymentPart\Output\DisplayOptions;
use Sprain\SwissQrBill\PaymentPart\Output\VerticalSeparatorSymbolPosition;
use Sprain\SwissQrBill\QrBill;
use Sprain\SwissQrBill\QrCode\QrCode;
use Sprain\Tests\SwissQrBill\TestQrBillCreatorTrait;
Expand Down
1 change: 0 additions & 1 deletion tests/PaymentPart/Output/HtmlOutput/HtmlOutputTest.php
Original file line number Diff line number Diff line change
Expand Up @@ -5,7 +5,6 @@
use PHPUnit\Framework\TestCase;
use Sprain\SwissQrBill\PaymentPart\Output\HtmlOutput\HtmlOutput;
use Sprain\SwissQrBill\PaymentPart\Output\DisplayOptions;
use Sprain\SwissQrBill\PaymentPart\Output\VerticalSeparatorSymbolPosition;
use Sprain\SwissQrBill\QrBill;
use Sprain\SwissQrBill\QrCode\QrCode;
use Sprain\Tests\SwissQrBill\TestCompactSvgQrCodeTrait;
Expand Down
1 change: 0 additions & 1 deletion tests/PaymentPart/Output/TcPdfOutput/FpdiOutputTest.php
Original file line number Diff line number Diff line change
Expand Up @@ -5,7 +5,6 @@
use PHPUnit\Framework\TestCase;
use setasign\Fpdi\Tcpdf\Fpdi;
use Sprain\SwissQrBill\PaymentPart\Output\DisplayOptions;
use Sprain\SwissQrBill\PaymentPart\Output\VerticalSeparatorSymbolPosition;
use Sprain\SwissQrBill\PaymentPart\Output\TcPdfOutput\TcPdfOutput;
use Sprain\SwissQrBill\QrBill;
use Sprain\SwissQrBill\QrCode\QrCode;
Expand Down
1 change: 0 additions & 1 deletion tests/PaymentPart/Output/TcPdfOutput/TcPdfOutputTest.php
Original file line number Diff line number Diff line change
Expand Up @@ -4,7 +4,6 @@

use PHPUnit\Framework\TestCase;
use Sprain\SwissQrBill\PaymentPart\Output\DisplayOptions;
use Sprain\SwissQrBill\PaymentPart\Output\VerticalSeparatorSymbolPosition;
use Sprain\SwissQrBill\PaymentPart\Output\TcPdfOutput\TcPdfOutput;
use Sprain\SwissQrBill\QrBill;
use Sprain\SwissQrBill\QrCode\QrCode;
Expand Down

0 comments on commit 2f84a27

Please sign in to comment.