Skip to content

[CC-2379] Fix fatal error when payment type is null in performCharge and performSca #233

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
Ryouzanpaku merged 4 commits into from
Jun 17, 2026
Merged

[CC-2379] Fix fatal error when payment type is null in performCharge and performSca #233

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
4 commits
Select commit Hold shift + click to select a range
3a76b4f
[CC-2379] Fix fatal error when payment type resolves to null in perfo…
Ryouzanpaku Jun 16, 2026
3c9f6de
[CC-2379] Apply consistent nullsafe operator in performAuthorization.
Ryouzanpaku Jun 16, 2026
9d8d94e
[CC-2379] Use explicit try/catch in null payment type tests for clear…
Ryouzanpaku Jun 17, 2026
c3d1678
Merge branch 'main' into CC-2379/fix-null-payment-type-special-params
Ryouzanpaku Jun 17, 2026
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
6 changes: 3 additions & 3 deletions src/Services/PaymentService.php
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -86,7 +86,7 @@ public function performAuthorization(
): Authorization {
$payment = $this->createPayment($paymentType);
$paymentType = $payment->getPaymentType();
$authorization->setSpecialParams($paymentType !== null ? $paymentType->getTransactionParams() : []);
$authorization->setSpecialParams($paymentType?->getTransactionParams() ?? []);
Comment thread
sixer1182 marked this conversation as resolved.

$payment->setAuthorization($authorization)
->setCustomer($customer)
Expand Down Expand Up @@ -157,7 +157,7 @@ public function performCharge(Charge $charge, $paymentType, $customer = null, ?M
$paymentType = $payment->getPaymentType();

/** @var Charge $charge */
$charge->setSpecialParams($paymentType->getTransactionParams() ?? []);
$charge->setSpecialParams($paymentType?->getTransactionParams() ?? []);
$payment->addCharge($charge)->setCustomer($customer)->setMetadata($metadata)->setBasket($basket);

$this->getResourceService()->createResource($charge);
Expand Down Expand Up @@ -417,7 +417,7 @@ public function performSca(Sca $sca, $paymentType, $customer = null, ?Metadata $
$paymentType = $payment->getPaymentType();

/** @var Sca $sca */
$sca->setSpecialParams($paymentType->getTransactionParams() ?? []);
$sca->setSpecialParams($paymentType?->getTransactionParams() ?? []);
$payment->setSca($sca)->setCustomer($customer)->setMetadata($metadata)->setBasket($basket);

$this->getResourceService()->createResource($sca);
Expand Down
37 changes: 37 additions & 0 deletions test/unit/Services/PaymentServiceTest.php
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -31,6 +31,7 @@
use UnzerSDK\Resources\TransactionTypes\Cancellation;
use UnzerSDK\Resources\TransactionTypes\Charge;
use UnzerSDK\Resources\TransactionTypes\Payout;
use UnzerSDK\Resources\TransactionTypes\Sca;
use UnzerSDK\Resources\TransactionTypes\Shipment;
use UnzerSDK\Services\CancelService;
use UnzerSDK\Services\PaymentService;
Expand Down Expand Up @@ -283,6 +284,42 @@ public function chargePaymentShouldSetArgumentsInNewChargeObject(): void
$this->assertEquals([$returnedCharge], $payment->getCharges());
}

/**
* Verify performCharge does not throw a fatal error when the payment type resolves to null.
*
* @test
*/
public function performChargeWithNullPaymentTypeShouldNotThrowFatalError(): void
{
$resourceSrvMock = $this->getMockBuilder(ResourceService::class)->disableOriginalConstructor()->setMethods(['createResource'])->getMock();
$paymentSrv = (new Unzer('s-priv-123'))->setResourceService($resourceSrvMock)->getPaymentService();

try {
$paymentSrv->performCharge(new Charge(), null);
$this->assertTrue(true);
} catch (\Throwable $e) {
$this->fail('performCharge threw an unexpected error: ' . $e->getMessage());
}
}

/**
* Verify performSca does not throw a fatal error when the payment type resolves to null.
*
* @test
*/
public function performScaWithNullPaymentTypeShouldNotThrowFatalError(): void
{
$resourceSrvMock = $this->getMockBuilder(ResourceService::class)->disableOriginalConstructor()->setMethods(['createResource'])->getMock();
$paymentSrv = (new Unzer('s-priv-123'))->setResourceService($resourceSrvMock)->getPaymentService();

try {
$paymentSrv->performSca(new Sca(), null);
$this->assertTrue(true);
} catch (\Throwable $e) {
$this->fail('performSca threw an unexpected error: ' . $e->getMessage());
}
}

//</editor-fold>

//<editor-fold desc="Cancel">
Expand Down
Loading