Thanks to visit codestin.com
Credit goes to github.com

Skip to content

feat(PHP Upgrade): add PHP 8.4 support #14

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
mguzowski-shift4 merged 1 commit into from
Apr 23, 2025
Merged

feat(PHP Upgrade): add PHP 8.4 support #14

Changes from all commits
Commits
Show all changes
1 commit
Select commit
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
44 changes: 22 additions & 22 deletions lib/Shift4/Shift4Gateway.php
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -29,7 +29,7 @@ class Shift4Gateway

private $userAgent;

public function __construct($privateKey = null, Connection $connection = null)
public function __construct($privateKey = null, ?Connection $connection = null)
{
$this->objectSerializer = new ObjectSerializer();

Expand All @@ -41,7 +41,7 @@ public function __construct($privateKey = null, Connection $connection = null)
* @param \Shift4\Request\ChargeRequest $request
* @return \Shift4\Response\Charge
*/
public function createCharge($request, RequestOptions $requestOptions = null)
public function createCharge($request, ?RequestOptions $requestOptions = null)
{
return $this->post('/charges', $request, '\Shift4\Response\Charge', $requestOptions);
}
Expand All @@ -50,7 +50,7 @@ public function createCharge($request, RequestOptions $requestOptions = null)
* @param \Shift4\Request\CaptureRequest $request
* @return \Shift4\Response\Charge
*/
public function captureCharge($request, RequestOptions $requestOptions = null)
public function captureCharge($request, ?RequestOptions $requestOptions = null)
{
return $this->post('/charges/{chargeId}/capture', $request, '\Shift4\Response\Charge', $requestOptions);
}
Expand All @@ -68,7 +68,7 @@ public function retrieveCharge($chargeId)
* @param \Shift4\Request\ChargeUpdateRequest $request
* @return \Shift4\Response\Charge
*/
public function updateCharge($request, RequestOptions $requestOptions = null)
public function updateCharge($request, ?RequestOptions $requestOptions = null)
{
return $this->post('/charges/{chargeId}', $request, '\Shift4\Response\Charge', $requestOptions);
}
Expand All @@ -79,7 +79,7 @@ public function updateCharge($request, RequestOptions $requestOptions = null)
*
* @deprecated For backward compatibility only. Use "createRefund($request)".
*/
public function refundCharge($request, RequestOptions $requestOptions = null)
public function refundCharge($request, ?RequestOptions $requestOptions = null)
{
return $this->createRefund($request, $requestOptions);
}
Expand All @@ -97,7 +97,7 @@ public function listCharges($request = null)
* @param \Shift4\Request\CustomerRequest $request
* @return \Shift4\Response\Customer
*/
public function createCustomer($request, RequestOptions $requestOptions = null)
public function createCustomer($request, ?RequestOptions $requestOptions = null)
{
return $this->post('/customers', $request, '\Shift4\Response\Customer', $requestOptions);
}
Expand All @@ -115,7 +115,7 @@ public function retrieveCustomer($customerId)
* @param \Shift4\Request\CustomerUpdateRequest $request
* @return \Shift4\Response\Customer
*/
public function updateCustomer($request, RequestOptions $requestOptions = null)
public function updateCustomer($request, ?RequestOptions $requestOptions = null)
{
return $this->post('/customers/{customerId}', $request, '\Shift4\Response\Customer', $requestOptions);
}
Expand All @@ -142,7 +142,7 @@ public function listCustomers($request = null)
* @param \Shift4\Request\CardRequest $request
* @return \Shift4\Response\Card
*/
public function createCard($request, RequestOptions $requestOptions = null)
public function createCard($request, ?RequestOptions $requestOptions = null)
{
return $this->post('/customers/{customerId}/cards', $request, '\Shift4\Response\Card', $requestOptions);
}
Expand All @@ -161,7 +161,7 @@ public function retrieveCard($customerId, $cardId)
* @param \Shift4\Request\CardUpdateRequest $request
* @return \Shift4\Response\Card
*/
public function updateCard($request, RequestOptions $requestOptions = null)
public function updateCard($request, ?RequestOptions $requestOptions = null)
{
return $this->post('/customers/{customerId}/cards/{cardId}', $request, '\Shift4\Response\Card', $requestOptions);
}
Expand Down Expand Up @@ -198,7 +198,7 @@ public function retrievePaymentMethod($paymentMethodId)
* @param \Shift4\Request\PaymentMethodRequest $request
* @return \Shift4\Response\PaymentMethod
*/
public function createPaymentMethod($request, RequestOptions $requestOptions = null)
public function createPaymentMethod($request, ?RequestOptions $requestOptions = null)
{
return $this->post("/payment-methods", $request, '\Shift4\Response\PaymentMethod', $requestOptions);
}
Expand All @@ -225,7 +225,7 @@ public function listPaymentMethods($request)
* @param \Shift4\Request\SubscriptionRequest $request
* @return \Shift4\Response\Subscription
*/
public function createSubscription($request, RequestOptions $requestOptions = null)
public function createSubscription($request, ?RequestOptions $requestOptions = null)
{
return $this->post('/customers/{customerId}/subscriptions', $request, '\Shift4\Response\Subscription', $requestOptions);
}
Expand All @@ -244,7 +244,7 @@ public function retrieveSubscription($customerId, $subscriptionId)
* @param \Shift4\Request\SubscriptionUpdateRequest $request
* @return \Shift4\Response\Subscription
*/
public function updateSubscription($request, RequestOptions $requestOptions = null)
public function updateSubscription($request, ?RequestOptions $requestOptions = null)
{
return $this->post('/customers/{customerId}/subscriptions/{subscriptionId}', $request, '\Shift4\Response\Subscription', $requestOptions);
}
Expand All @@ -271,7 +271,7 @@ public function listSubscriptions($request)
* @param \Shift4\Request\PlanRequest $request
* @return \Shift4\Response\Plan
*/
public function createPlan($request, RequestOptions $requestOptions = null)
public function createPlan($request, ?RequestOptions $requestOptions = null)
{
return $this->post('/plans', $request, '\Shift4\Response\Plan', $requestOptions);
}
Expand All @@ -289,7 +289,7 @@ public function retrievePlan($planId)
* @param \Shift4\Request\PlanUpdateRequest $request
* @return \Shift4\Response\Plan
*/
public function updatePlan($request, RequestOptions $requestOptions = null)
public function updatePlan($request, ?RequestOptions $requestOptions = null)
{
return $this->post('/plans/{planId}', $request, '\Shift4\Response\Plan', $requestOptions);
}
Expand Down Expand Up @@ -352,7 +352,7 @@ public function retrieveToken($tokenId)
* @param \Shift4\Request\BlacklistRuleRequest $request
* @return \Shift4\Response\BlacklistRule
*/
public function createBlacklistRule($request, RequestOptions $requestOptions = null)
public function createBlacklistRule($request, ?RequestOptions $requestOptions = null)
{
return $this->post('/blacklist', $request, '\Shift4\Response\BlacklistRule', $requestOptions);
}
Expand Down Expand Up @@ -388,7 +388,7 @@ public function listBlacklistRules($request = null)
* @param \Shift4\Request\CreditRequest $request
* @return \Shift4\Response\Credit
*/
public function createCredit($request, RequestOptions $requestOptions = null)
public function createCredit($request, ?RequestOptions $requestOptions = null)
{
return $this->post('/credits', $request, '\Shift4\Response\Credit', $requestOptions);
}
Expand All @@ -406,7 +406,7 @@ public function retrieveCredit($creditId)
* @param \Shift4\Request\CreditUpdateRequest $request
* @return \Shift4\Response\Credit
*/
public function updateCredit($request, RequestOptions $requestOptions = null)
public function updateCredit($request, ?RequestOptions $requestOptions = null)
{
return $this->post('/credits/{creditId}', $request, '\Shift4\Response\Credit', $requestOptions);
}
Expand Down Expand Up @@ -464,7 +464,7 @@ public function retrieveDispute($disputeId)
* @param \Shift4\Request\DisputeUpdateRequest $request
* @return \Shift4\Response\Dispute
*/
public function updateDispute($request, RequestOptions $requestOptions = null)
public function updateDispute($request, ?RequestOptions $requestOptions = null)
{
return $this->post('/disputes/{disputeId}', $request, '\Shift4\Response\Dispute', $requestOptions);
}
Expand All @@ -473,7 +473,7 @@ public function updateDispute($request, RequestOptions $requestOptions = null)
* @param string $disputeId
* @return \Shift4\Response\Dispute
*/
public function closeDispute($disputeId, RequestOptions $requestOptions = null)
public function closeDispute($disputeId, ?RequestOptions $requestOptions = null)
{
return $this->post("/disputes/{$disputeId}/close", null, '\Shift4\Response\Dispute', $requestOptions);
}
Expand Down Expand Up @@ -518,7 +518,7 @@ public function retrieveRefund($refundId)
* @param \Shift4\Request\RefundRequest $request
* @return \Shift4\Response\Refund
*/
public function createRefund($request, RequestOptions $requestOptions = null)
public function createRefund($request, ?RequestOptions $requestOptions = null)
{
return $this->post('/refunds', $request, '\Shift4\Response\Refund', $requestOptions);
}
Expand Down Expand Up @@ -593,7 +593,7 @@ private function getFromEndpoint($endpoint, $path, $responseClass)
return $this->objectSerializer->deserialize($response['body'], $responseClass);
}

private function post($path, $request, $responseClass, RequestOptions $requestOptions = null)
private function post($path, $request, $responseClass, ?RequestOptions $requestOptions = null)
{
$requestBody = $this->objectSerializer->serialize($request, $path);
$response = $this->connection->post($this->endpoint . $path, $requestBody, $this->buildHeaders($requestOptions));
Expand Down Expand Up @@ -648,7 +648,7 @@ private function buildQueryString($path, $request)
return $path . $queryString;
}

private function buildHeaders(RequestOptions $requestOptions = null)
private function buildHeaders(?RequestOptions $requestOptions = null)
{
$headers = [
'Authorization' => 'Basic ' . base64_encode($this->privateKey . ':'),
Expand Down