woocommerce/woocommerce-paypal-payments
2
0
Fork 0
mirror of https://github.com/woocommerce/woocommerce-paypal-payments.git synced 2025-09-08 19:48:52 +08:00
Code Issues Projects Packages Wiki Activity Actions

Fix psalm

Browse source
This commit is contained in:
dinamiko 2022-07-20 12:16:33 +02:00
parent e1cd7d5ad1
commit eb4fc639fc
3 changed files with 32 additions and 32 deletions
Download patch file Download diff file Expand all files Collapse all files

2
modules/ppcp-wc-gateway/src/Endpoint/ReturnUrlEndpoint.php
View file

@ -69,7 +69,7 @@ class ReturnUrlEndpoint {
}
$wc_order = wc_get_order( $wc_order_id );
if ( ! $wc_order ) {
if ( ! is_a( $wc_order, \WC_Order::class ) ) {
exit();
}

4
modules/ppcp-wc-gateway/src/Gateway/OXXO/OXXO.php
View file

@ -114,7 +114,7 @@ class OXXO {
add_filter(
'ppcp_payment_capture_reversed_webhook_update_status_note',
function( $note, $wc_order, $event_type ) {
function( string $note, WC_Order $wc_order, string $event_type ): string {
if ( $wc_order->get_payment_method() === OXXOGateway::ID && $event_type === 'PAYMENT.CAPTURE.DENIED' ) {
$note = __( 'OXXO voucher has expired or the buyer didn\'t complete the payment successfully.', 'woocommerce-paypal-payments' );
}
@ -122,7 +122,7 @@ class OXXO {
return $note;
},
10,
2
3
);
}

58
modules/ppcp-webhooks/src/Handler/PaymentCapturePending.php
View file

@ -10,6 +10,7 @@ declare(strict_types=1);
namespace WooCommerce\PayPalCommerce\Webhooks\Handler;
use Psr\Log\LoggerInterface;
use WP_REST_Request;
use WP_REST_Response;
/**
@ -60,12 +61,35 @@ class PaymentCapturePending implements RequestHandler {
/**
* Responsible for handling the request.
*
* @param \WP_REST_Request $request The request.
* @param WP_REST_Request $request The request.
*
* @return WP_REST_Response
*/
public function handle_request( \WP_REST_Request $request ): WP_REST_Response {
public function handle_request( WP_REST_Request $request ): WP_REST_Response {
$response = array( 'success' => false );
$order_id = $request['resource'] !== null && isset( $request['resource']['custom_id'] )
? $this->sanitize_custom_id( $request['resource']['custom_id'] )
: 0;
if ( ! $order_id ) {
$message = sprintf(
// translators: %s is the PayPal webhook Id.
__(
'No order for webhook event %s was found.',
'woocommerce-paypal-payments'
),
$request['id'] !== null && isset( $request['id'] ) ? $request['id'] : ''
);
$this->logger->log(
'warning',
$message,
array(
'request' => $request,
)
);
$response['message'] = $message;
return new WP_REST_Response( $response );
}
$resource = $request['resource'];
if ( ! is_array( $resource ) ) {
$message = 'Resource data not found in webhook request.';
@ -74,36 +98,12 @@ class PaymentCapturePending implements RequestHandler {
return new WP_REST_Response( $response );
}
$order_id = isset( $request['resource']['custom_id'] )
? $this->sanitize_custom_id( $request['resource']['custom_id'] )
: 0;
if ( ! $order_id ) {
$message = sprintf(
// translators: %s is the PayPal webhook Id.
__(
'No order for webhook event %s was found.',
'woocommerce-paypal-payments'
),
isset( $request['id'] ) ? $request['id'] : ''
);
$this->logger->log(
'warning',
$message,
array(
'request' => $request,
)
);
$response['message'] = $message;
return rest_ensure_response( $response );
}
$wc_order = wc_get_order( $order_id );
if ( ! is_a( $wc_order, \WC_Order::class ) ) {
$message = sprintf(
// translators: %s is the PayPal refund Id.
__( 'Order for PayPal refund %s not found.', 'woocommerce-paypal-payments' ),
isset( $request['resource']['id'] ) ? $request['resource']['id'] : ''
$request['resource'] !== null && isset( $request['resource']['id'] ) ? $request['resource']['id'] : ''
);
$this->logger->log(
'warning',
@ -113,11 +113,11 @@ class PaymentCapturePending implements RequestHandler {
)
);
$response['message'] = $message;
return rest_ensure_response( $response );
return new WP_REST_Response( $response );
}
if ( $wc_order->get_status() === 'pending' ) {
$wc_order->update_status('on-hold', __('Payment initiation was successful, and is waiting for the buyer to complete the payment.', 'woocommerce-paypal-payments'));
$wc_order->update_status( 'on-hold', __( 'Payment initiation was successful, and is waiting for the buyer to complete the payment.', 'woocommerce-paypal-payments' ) );
}