Migrated non-static DataProviders

Author: kohlerdominik

phpunit.xml.dist

@@ -9,6 +9,10 @@
         displayDetailsOnTestsThatTriggerWarnings="true"
         displayDetailsOnPhpunitDeprecations="true"
 >
+    <extensions>
+        <bootstrap class="DG\BypassFinals\PHPUnitExtension"/>
+    </extensions>
+
     <php>
         <env name="SYMFONY_DEPRECATIONS_HELPER" value="weak"/>
     </php>

tests/Constraints/ValidCreditorInformationPaymentReferenceCombinationTest.php

@@ -3,7 +3,6 @@
 namespace Sprain\Tests\SwissQrBill\Constraints;
 
 use PHPUnit\Framework\Attributes\DataProvider;
-use DG\BypassFinals;
 use Sprain\SwissQrBill\Constraint\ValidCreditorInformationPaymentReferenceCombination;
 use Sprain\SwissQrBill\Constraint\ValidCreditorInformationPaymentReferenceCombinationValidator;
 use Sprain\SwissQrBill\DataGroup\Element\CreditorInformation;
@@ -34,59 +33,59 @@ public function testRandomClassIsValid()
     }
 
     #[DataProvider('emptyQrBillMocksProvider')]
-    public function testEmptyQrBillValuesAreValid(QrBill $qrBillMock)
+    public function testEmptyQrBillValuesAreValid(bool $createCreditorInformationMock, bool $createPaymentReferenceMock)
     {
+        $qrBillMock = $this->getQrBillMock(
+            ($createCreditorInformationMock) ? $this->getCreditorInformationMock() : null,
+            ($createPaymentReferenceMock) ? $this->getPaymentReferenceMock() : null,
+        );
+
         $this->validator->validate($qrBillMock, new ValidCreditorInformationPaymentReferenceCombination());
 
         $this->assertNoViolation();
     }
 
-    public function emptyQrBillMocksProvider(): array
+    public static function emptyQrBillMocksProvider(): array
     {
-        BypassFinals::enable();
-
         return [
-            [$this->getQrBillMock()],
-            [$this->getQrBillMock(
-                $this->getCreditorInformationMock(),
-                null
-            )],
-            [$this->getQrBillMock(
-                null,
-                $this->getPaymentReferenceMock()
-            )]
+         // createCreditorInformationMock, createPaymentReferenceMock
+            [false, false,],
+            [true, false,],
+            [false, true,],
         ];
     }
 
     #[DataProvider('validCombinationsQrBillMocksProvider')]
-    public function testValidCombinations(QrBill $qrBillMock)
+    public function testValidCombinations(bool $containsQrIban, string $paymentReferenceType)
     {
+        $qrBillMock = $this->getQrBillMock(
+            $this->getCreditorInformationMock('any-iban', $containsQrIban),
+            $this->getPaymentReferenceMock($paymentReferenceType)
+        );
+
         $this->validator->validate($qrBillMock, new ValidCreditorInformationPaymentReferenceCombination());
 
         $this->assertNoViolation();
     }
 
-    public function validCombinationsQrBillMocksProvider(): array
+    public static function validCombinationsQrBillMocksProvider(): array
     {
         return [
-            [$this->getQrBillMock(
-                $this->getCreditorInformationMock('any-iban', true),
-                $this->getPaymentReferenceMock(PaymentReference::TYPE_QR)
-            )],
-            [$this->getQrBillMock(
-                $this->getCreditorInformationMock('any-iban', false),
-                $this->getPaymentReferenceMock(PaymentReference::TYPE_SCOR)
-            )],
-            [$this->getQrBillMock(
-                $this->getCreditorInformationMock('any-iban', false),
-                $this->getPaymentReferenceMock(PaymentReference::TYPE_NON)
-            )],
+         // containsQrIban, paymentReferenceType
+            [true, PaymentReference::TYPE_QR,],
+            [false, PaymentReference::TYPE_SCOR,],
+            [false, PaymentReference::TYPE_NON,],
         ];
     }
 
     #[DataProvider('invalidCombinationsQrBillMocksProvider')]
-    public function testInvalidCombinations(QrBill $qrBillMock)
+    public function testInvalidCombinations(bool $containsQrIban, string $paymentReferenceType)
     {
+        $qrBillMock = $this->getQrBillMock(
+            $this->getCreditorInformationMock('any-iban', $containsQrIban),
+            $this->getPaymentReferenceMock($paymentReferenceType)
+        );
+
         $this->validator->validate($qrBillMock, new ValidCreditorInformationPaymentReferenceCombination([
             'message' => 'myMessage',
         ]));
@@ -97,21 +96,13 @@ public function testInvalidCombinations(QrBill $qrBillMock)
             ->assertRaised();
     }
 
-    public function invalidCombinationsQrBillMocksProvider(): array
+    public static function invalidCombinationsQrBillMocksProvider(): array
     {
         return [
-            [$this->getQrBillMock(
-                $this->getCreditorInformationMock('any-iban', false),
-                $this->getPaymentReferenceMock(PaymentReference::TYPE_QR)
-            )],
-            [$this->getQrBillMock(
-                $this->getCreditorInformationMock('any-iban', true),
-                $this->getPaymentReferenceMock(PaymentReference::TYPE_SCOR)
-            )],
-            [$this->getQrBillMock(
-                $this->getCreditorInformationMock('any-iban', true),
-                $this->getPaymentReferenceMock(PaymentReference::TYPE_NON)
-            )],
+        // containsQrIban, paymentReferenceType
+          [false, PaymentReference::TYPE_QR,],
+          [true, PaymentReference::TYPE_SCOR,],
+          [true, PaymentReference::TYPE_NON,],
         ];
     }
 

tests/QrCode/QrCodeTest.php

@@ -4,7 +4,7 @@
 
 trait TestCompactSvgQrCodeTrait
 {
-    public function getCompact(): string
+    public static function getCompact(): string
     {
         if (defined('Endroid\QrCode\Writer\SvgWriter::WRITER_OPTION_COMPACT')) {
             return '-compact';