Merge pull request #231 from thePanz/updarte-phpstan-level-6

Update to phpstan level 6
sprain · Oct 5, 2023 · 378ae01 · 378ae01
2 parents ca54b08 + 6802f05
commit 378ae01
Show file tree

Hide file tree

Showing 35 changed files with 139 additions and 74 deletions.
diff --git a/composer.json b/composer.json
@@ -6,6 +6,7 @@
     "require": {
         "php": "^8.0.0|^8.1.0|^8.2.0",
         "ext-dom": "*",
+        "ext-bcmath": "*",
         "symfony/validator": "^4.4|^5.0|^6.0",
         "symfony/intl": "^4.4|^5.0|^6.0",
         "kmukku/php-iso11649": "^1.5",
@@ -41,7 +42,11 @@
     },
     "autoload": {
         "psr-4": {
-            "Sprain\\SwissQrBill\\": "src",
+            "Sprain\\SwissQrBill\\": "src"
+        }
+    },
+    "autoload-dev": {
+        "psr-4": {
             "Sprain\\Tests\\SwissQrBill\\": "tests"
         }
     }

diff --git a/composer.lock b/composer.lock
diff --git a/example/HtmlOutput/html-example.php b/example/HtmlOutput/html-example.php
@@ -18,4 +18,4 @@
 $examplePath = __DIR__ . '/html-example.htm';
 file_put_contents($examplePath, $html);
 
-print 'HTML example created here: ' . $examplePath;
+print 'HTML example created here: ' . $examplePath;
diff --git a/example/TcPdfOutput/tcpdf-example.php b/example/TcPdfOutput/tcpdf-example.php
@@ -24,4 +24,4 @@
 $examplePath = __DIR__ . "/tcpdf_example.pdf";
 $tcPdf->Output($examplePath, 'F');
 
-print "PDF example created here : ".$examplePath;
+print "PDF example created here : ".$examplePath;
diff --git a/example/example.php b/example/example.php
@@ -24,12 +24,14 @@
         'Rue du Lac 1268',
         '2501 Biel',
         'CH'
-    ));
+    )
+);
 
 $qrBill->setCreditorInformation(
     QrBill\DataGroup\Element\CreditorInformation::create(
         'CH4431999123000889012' // This is a special QR-IBAN. Classic IBANs will not be valid here.
-    ));
+    )
+);
 
 // Add debtor information
 // Who has to pay the invoice? This part is optional.
@@ -44,15 +46,17 @@
         '9400',
         'Rorschach',
         'CH'
-    ));
+    )
+);
 
 // Add payment amount information
 // What amount is to be paid?
 $qrBill->setPaymentAmountInformation(
     QrBill\DataGroup\Element\PaymentAmountInformation::create(
         'CHF',
         2500.25
-    ));
+    )
+);
 
 // Add payment reference
 // This is what you will need to identify incoming payments.
@@ -65,7 +69,8 @@
     QrBill\DataGroup\Element\PaymentReference::create(
         QrBill\DataGroup\Element\PaymentReference::TYPE_QR,
         $referenceNumber
-    ));
+    )
+);
 
 // Optionally, add some human-readable information about what the bill is for.
 $qrBill->setAdditionalInformation(
@@ -79,10 +84,10 @@
     $qrBill->getQrCode()->writeFile(__DIR__ . '/qr.png');
     $qrBill->getQrCode()->writeFile(__DIR__ . '/qr.svg');
 } catch (Exception $e) {
-	foreach($qrBill->getViolations() as $violation) {
-		print $violation->getMessage()."\n";
-	}
-	exit;
+    foreach ($qrBill->getViolations() as $violation) {
+        print $violation->getMessage()."\n";
+    }
+    exit;
 }
 
 // Next: Output full payment parts, depending on the format you want to use:

diff --git a/example/example_minimal.php b/example/example_minimal.php
@@ -20,26 +20,30 @@
         'Rue du Lac 1268',
         '2501 Biel',
         'CH'
-    ));
+    )
+);
 
 $qrBill->setCreditorInformation(
     QrBill\DataGroup\Element\CreditorInformation::create(
         'CH9300762011623852957' // This is a classic iban. QR-IBANs will not be valid in this minmal setup.
-    ));
+    )
+);
 
 // Add payment amount information
 // The currency must be defined.
 $qrBill->setPaymentAmountInformation(
     QrBill\DataGroup\Element\PaymentAmountInformation::create(
         'CHF'
-    ));
+    )
+);
 
 // Add payment reference
 // Explicitly define that no reference number will be used by setting TYPE_NON.
 $qrBill->setPaymentReference(
     QrBill\DataGroup\Element\PaymentReference::create(
         QrBill\DataGroup\Element\PaymentReference::TYPE_NON
-    ));
+    )
+);
 
 // Time to output something!
 //
@@ -48,14 +52,14 @@
     $qrBill->getQrCode()->writeFile(__DIR__ . '/qr.png');
     $qrBill->getQrCode()->writeFile(__DIR__ . '/qr.svg');
 } catch (Exception $e) {
-	foreach($qrBill->getViolations() as $violation) {
-		print $violation->getMessage()."\n";
-	}
-	exit;
+    foreach ($qrBill->getViolations() as $violation) {
+        print $violation->getMessage()."\n";
+    }
+    exit;
 }
 
 // Next: Output full payment parts, depending on the format you want to use:
 //
 // - FpdfOutput/fpdf-example.php
 // - HtmlOutput/html-example.php
-// - TcPdfOutput/tcpdf-example.php
+// - TcPdfOutput/tcpdf-example.php
diff --git a/example/example_scor.php b/example/example_scor.php
@@ -17,12 +17,14 @@
         'Rue du Lac 1268',
         '2501 Biel',
         'CH'
-    ));
+    )
+);
 
 $qrBill->setCreditorInformation(
     QrBill\DataGroup\Element\CreditorInformation::create(
         'CH9300762011623852957' // With SCOR, this is a classic iban. QR-IBANs will not be valid here.
-    ));
+    )
+);
 
 // Add debtor information
 // Who has to pay the invoice? This part is optional.
@@ -37,23 +39,26 @@
         '9400',
         'Rorschach',
         'CH'
-    ));
+    )
+);
 
 // Add payment amount information
 // What amount is to be paid?
 $qrBill->setPaymentAmountInformation(
     QrBill\DataGroup\Element\PaymentAmountInformation::create(
         'CHF',
         2500.25
-    ));
+    )
+);
 
 // Add payment reference
 // This is what you will need to identify incoming payments.
 $qrBill->setPaymentReference(
     QrBill\DataGroup\Element\PaymentReference::create(
         QrBill\DataGroup\Element\PaymentReference::TYPE_SCOR,
         QrBill\Reference\RfCreditorReferenceGenerator::generate('I20200631')
-    ));
+    )
+);
 
 // Optionally, add some human-readable information about what the bill is for.
 $qrBill->setAdditionalInformation(
@@ -69,14 +74,14 @@
     $qrBill->getQrCode()->writeFile(__DIR__ . '/qr.png');
     $qrBill->getQrCode()->writeFile(__DIR__ . '/qr.svg');
 } catch (Exception $e) {
-	foreach($qrBill->getViolations() as $violation) {
-		print $violation->getMessage()."\n";
-	}
-	exit;
+    foreach ($qrBill->getViolations() as $violation) {
+        print $violation->getMessage()."\n";
+    }
+    exit;
 }
 
 // Next: Output full payment parts, depending on the format you want to use:
 //
 // - FpdfOutput/fpdf-example.php
 // - HtmlOutput/html-example.php
-// - TcPdfOutput/tcpdf-example.php
+// - TcPdfOutput/tcpdf-example.php
diff --git a/example/example_zero_amount.php b/example/example_zero_amount.php
@@ -21,19 +21,22 @@
         'Rue du Lac 1268',
         '2501 Biel',
         'CH'
-    ));
+    )
+);
 
 $qrBill->setCreditorInformation(
     QrBill\DataGroup\Element\CreditorInformation::create(
         'CH4431999123000889012' // This is a special QR-IBAN. Classic IBANs will not be valid here.
-    ));
+    )
+);
 
 // Add payment amount information of 0.00
 $qrBill->setPaymentAmountInformation(
     QrBill\DataGroup\Element\PaymentAmountInformation::create(
         'CHF',
         0.00
-    ));
+    )
+);
 
 // Add payment reference
 $referenceNumber = QrBill\Reference\QrPaymentReferenceGenerator::generate(
@@ -45,7 +48,8 @@
     QrBill\DataGroup\Element\PaymentReference::create(
         QrBill\DataGroup\Element\PaymentReference::TYPE_QR,
         $referenceNumber
-    ));
+    )
+);
 
 // Add do-not-use-for-payment information
 $qrBill->setAdditionalInformation(
@@ -59,7 +63,7 @@
     $qrBill->getQrCode()->writeFile(__DIR__ . '/qr.png');
     $qrBill->getQrCode()->writeFile(__DIR__ . '/qr.svg');
 } catch (Exception $e) {
-    foreach($qrBill->getViolations() as $violation) {
+    foreach ($qrBill->getViolations() as $violation) {
         print $violation->getMessage()."\n";
     }
     exit;

diff --git a/phpstan.neon.dist b/phpstan.neon.dist
@@ -1,5 +1,5 @@
 parameters:
-    level: 5
+    level: 6
     paths:
         - src/
     ignoreErrors:

diff --git a/src/Constraint/ValidCreditorInformationPaymentReferenceCombinationValidator.php b/src/Constraint/ValidCreditorInformationPaymentReferenceCombinationValidator.php
@@ -19,7 +19,7 @@ final class ValidCreditorInformationPaymentReferenceCombinationValidator extends
         PaymentReference::TYPE_NON  => false,
     ];
 
-    public function validate($qrBill, Constraint $constraint): void
+    public function validate(mixed $qrBill, Constraint $constraint): void
     {
         if (!$constraint instanceof ValidCreditorInformationPaymentReferenceCombination) {
             throw new UnexpectedTypeException($constraint, __NAMESPACE__.'\ValidCreditorInformationPaymentReferenceCombination');

diff --git a/src/Constraint/ValidCreditorReferenceValidator.php b/src/Constraint/ValidCreditorReferenceValidator.php
@@ -12,7 +12,7 @@
  */
 final class ValidCreditorReferenceValidator extends ConstraintValidator
 {
-    public function validate($value, Constraint $constraint): void
+    public function validate(mixed $value, Constraint $constraint): void
     {
         if (!$constraint instanceof ValidCreditorReference) {
             throw new UnexpectedTypeException($constraint, __NAMESPACE__.'\ValidCreditorReference');

diff --git a/src/DataGroup/Element/Abstracts/Address.php b/src/DataGroup/Element/Abstracts/Address.php
@@ -20,11 +20,13 @@ protected static function normalizeString(?string $string): ?string
 
         $string = trim($string);
         $string = StringModifier::replaceLineBreaksAndTabsWithSpaces($string);
-        $string = StringModifier::replaceMultipleSpacesWithOne($string);
-
-        return $string;
+        return StringModifier::replaceMultipleSpacesWithOne($string);
     }
 
+    /**
+     * @param string[] $lines
+     * @return string[]
+     */
     protected static function clearMultilines(array $lines): array
     {
         $noOfLongLines = 0;

diff --git a/src/DataGroup/QrCodeableInterface.php b/src/DataGroup/QrCodeableInterface.php
@@ -7,5 +7,8 @@
  */
 interface QrCodeableInterface
 {
+    /**
+     * @return list<string|int|null>
+     */
     public function getQrCodeData(): array;
 }