From da23be6d4cf29fba4ca0c4c398fceada6dc6897d Mon Sep 17 00:00:00 2001 From: Kirill Braslavsky Date: Mon, 15 Mar 2021 17:57:55 +0200 Subject: [PATCH] remove redundant parameter --- .../src/Gateway/class-processpaymenttrait.php | 3 +-- .../ppcp-wc-gateway/src/Processor/class-orderprocessor.php | 5 ++--- 2 files changed, 3 insertions(+), 5 deletions(-) diff --git a/modules/ppcp-wc-gateway/src/Gateway/class-processpaymenttrait.php b/modules/ppcp-wc-gateway/src/Gateway/class-processpaymenttrait.php index 4bf9b1954..8bf5d4480 100644 --- a/modules/ppcp-wc-gateway/src/Gateway/class-processpaymenttrait.php +++ b/modules/ppcp-wc-gateway/src/Gateway/class-processpaymenttrait.php @@ -24,7 +24,6 @@ trait ProcessPaymentTrait { * @return array */ public function process_payment( $order_id ) { - global $woocommerce; $failure_data = array( 'result' => 'failure', @@ -55,7 +54,7 @@ trait ProcessPaymentTrait { //phpcs:enable WordPress.Security.NonceVerification.Recommended try { - if ( $this->order_processor->process( $wc_order, $woocommerce ) ) { + if ( $this->order_processor->process( $wc_order ) ) { $this->session_handler->destroy_session_data(); return array( 'result' => 'success', diff --git a/modules/ppcp-wc-gateway/src/Processor/class-orderprocessor.php b/modules/ppcp-wc-gateway/src/Processor/class-orderprocessor.php index 875951c24..4b9ea0577 100644 --- a/modules/ppcp-wc-gateway/src/Processor/class-orderprocessor.php +++ b/modules/ppcp-wc-gateway/src/Processor/class-orderprocessor.php @@ -146,11 +146,10 @@ class OrderProcessor { * Processes a given WooCommerce order and captured/authorizes the connected PayPal orders. * * @param \WC_Order $wc_order The WooCommerce order. - * @param \WooCommerce $woocommerce The WooCommerce object. * * @return bool */ - public function process( \WC_Order $wc_order, \WooCommerce $woocommerce ): bool { + public function process( \WC_Order $wc_order): bool { $order = $this->session_handler->order(); if ( ! $order ) { return false; @@ -212,7 +211,7 @@ class OrderProcessor { $wc_order->update_meta_data( PayPalGateway::CAPTURED_META_KEY, 'true' ); $wc_order->update_status( 'processing' ); } - $woocommerce->cart->empty_cart(); + wc()->cart->empty_cart(); $this->session_handler->destroy_session_data(); $this->last_error = ''; return true;