woocommerce / woocommerce-gateway-stripe

tests/phpunit/test-wc-stripe-payment-request.php

Spacing +31 added lines, -31 removed lines

@@ -63,21 +63,21 @@ 
 		$this->simple_product = WC_Helper_Product::create_simple_product();
 
 		$zone = new WC_Shipping_Zone();
-		$zone->set_zone_name( 'Worldwide' );
-		$zone->set_zone_order( 1 );
+		$zone->set_zone_name('Worldwide');
+		$zone->set_zone_order(1);
 		$zone->save();
 
-		$this->flat_rate_id = $zone->add_shipping_method( 'flat_rate' );
-		self::set_shipping_method_cost( $this->flat_rate_id, '5' );
+		$this->flat_rate_id = $zone->add_shipping_method('flat_rate');
+		self::set_shipping_method_cost($this->flat_rate_id, '5');
 
-		$this->local_pickup_id = $zone->add_shipping_method( 'local_pickup' );
-		self::set_shipping_method_cost( $this->local_pickup_id, '1' );
+		$this->local_pickup_id = $zone->add_shipping_method('local_pickup');
+		self::set_shipping_method_cost($this->local_pickup_id, '1');
 
 		$this->zone = $zone;
 
 		WC()->session->init();
-		WC()->cart->add_to_cart( $this->simple_product->get_id(), 1 );
-		$this->pr->update_shipping_method( [ self::get_shipping_option_rate_id( $this->flat_rate_id ) ] );
+		WC()->cart->add_to_cart($this->simple_product->get_id(), 1);
+		$this->pr->update_shipping_method([self::get_shipping_option_rate_id($this->flat_rate_id)]);
 		WC()->cart->calculate_totals();
 	}
 
@@ -94,12 +94,12 @@ 
 	 * @param string $instance_id Shipping method instance id
 	 * @param string $cost        Shipping method cost in USD
 	 */
-	private static function set_shipping_method_cost( $instance_id, $cost ) {
-		$method          = WC_Shipping_Zones::get_shipping_method( $instance_id );
+	private static function set_shipping_method_cost($instance_id, $cost) {
+		$method          = WC_Shipping_Zones::get_shipping_method($instance_id);
 		$option_key      = $method->get_instance_option_key();
-		$options         = get_option( $option_key );
+		$options         = get_option($option_key);
 		$options['cost'] = $cost;
-		update_option( $option_key, $options );
+		update_option($option_key, $options);
 	}
 
 	/**
@@ -109,13 +109,13 @@ 
 	 *
 	 * @return array Shipping option.
 	 */
-	private static function get_shipping_option( $instance_id ) {
-		$method = WC_Shipping_Zones::get_shipping_method( $instance_id );
+	private static function get_shipping_option($instance_id) {
+		$method = WC_Shipping_Zones::get_shipping_method($instance_id);
 		return [
 			'id'     => $method->get_rate_id(),
 			'label'  => $method->title,
 			'detail' => '',
-			'amount' => WC_Stripe_Helper::get_stripe_amount( $method->get_instance_option( 'cost' ) ),
+			'amount' => WC_Stripe_Helper::get_stripe_amount($method->get_instance_option('cost')),
 		];
 	}
 
@@ -126,28 +126,28 @@ 
 	 *
 	 * @return string Shipping option instance rate id.
 	 */
-	private static function get_shipping_option_rate_id( $instance_id ) {
-		$method = WC_Shipping_Zones::get_shipping_method( $instance_id );
+	private static function get_shipping_option_rate_id($instance_id) {
+		$method = WC_Shipping_Zones::get_shipping_method($instance_id);
 		return $method->get_rate_id();
 	}
 
 
 	public function test_get_shipping_options_returns_shipping_options() {
-		$data = $this->pr->get_shipping_options( self::SHIPPING_ADDRESS );
+		$data = $this->pr->get_shipping_options(self::SHIPPING_ADDRESS);
 
 		$expected_shipping_options = array_map(
 			'self::get_shipping_option',
-			[ $this->flat_rate_id, $this->local_pickup_id ]
+			[$this->flat_rate_id, $this->local_pickup_id]
 		);
 
-		$this->assertEquals( 'success', $data['result'] );
-		$this->assertEquals( $expected_shipping_options, $data['shipping_options'], 'Shipping options mismatch' );
+		$this->assertEquals('success', $data['result']);
+		$this->assertEquals($expected_shipping_options, $data['shipping_options'], 'Shipping options mismatch');
 	}
 
 	public function test_get_shipping_options_returns_chosen_option() {
-		$data = $this->pr->get_shipping_options( self::SHIPPING_ADDRESS );
+		$data = $this->pr->get_shipping_options(self::SHIPPING_ADDRESS);
 
-		$flat_rate              = $this->get_shipping_option( $this->flat_rate_id );
+		$flat_rate              = $this->get_shipping_option($this->flat_rate_id);
 		$expected_display_items = [
 			[
 				'label'  => 'Shipping',
@@ -155,22 +155,22 @@ 
 			],
 		];
 
-		$this->assertEquals( 1500, $data['total']['amount'], 'Total amount mismatch' );
-		$this->assertEquals( $expected_display_items, $data['displayItems'], 'Display items mismatch' );
+		$this->assertEquals(1500, $data['total']['amount'], 'Total amount mismatch');
+		$this->assertEquals($expected_display_items, $data['displayItems'], 'Display items mismatch');
 	}
 
 	public function test_get_shipping_options_keeps_chosen_option() {
-		$method_id = self::get_shipping_option_rate_id( $this->local_pickup_id );
-		$this->pr->update_shipping_method( [ $method_id ] );
+		$method_id = self::get_shipping_option_rate_id($this->local_pickup_id);
+		$this->pr->update_shipping_method([$method_id]);
 
-		$data = $this->pr->get_shipping_options( self::SHIPPING_ADDRESS );
+		$data = $this->pr->get_shipping_options(self::SHIPPING_ADDRESS);
 
 		$expected_shipping_options = array_map(
 			'self::get_shipping_option',
-			[ $this->local_pickup_id, $this->flat_rate_id ]
+			[$this->local_pickup_id, $this->flat_rate_id]
 		);
 
-		$this->assertEquals( 'success', $data['result'] );
-		$this->assertEquals( $expected_shipping_options, $data['shipping_options'], 'Shipping options mismatch' );
+		$this->assertEquals('success', $data['result']);
+		$this->assertEquals($expected_shipping_options, $data['shipping_options'], 'Shipping options mismatch');
 	}
 }

includes/class-wc-stripe-order-handler.php

Spacing +113 added lines, -113 removed lines

@@ -1,5 +1,5 @@ 
 <?php
-if ( ! defined( 'ABSPATH' ) ) {
+if ( ! defined('ABSPATH')) {
 	exit;
 }
 
@@ -23,12 +23,12 @@ 
 
 		$this->retry_interval = 1;
 
-		add_action( 'wp', array( $this, 'maybe_process_redirect_order' ) );
-		add_action( 'woocommerce_order_status_processing', array( $this, 'capture_payment' ) );
-		add_action( 'woocommerce_order_status_completed', array( $this, 'capture_payment' ) );
-		add_action( 'woocommerce_order_status_cancelled', array( $this, 'cancel_payment' ) );
-		add_action( 'woocommerce_order_status_refunded', array( $this, 'cancel_payment' ) );
-		add_filter( 'woocommerce_tracks_event_properties', array( $this, 'woocommerce_tracks_event_properties' ), 10, 2 );
+		add_action('wp', array($this, 'maybe_process_redirect_order'));
+		add_action('woocommerce_order_status_processing', array($this, 'capture_payment'));
+		add_action('woocommerce_order_status_completed', array($this, 'capture_payment'));
+		add_action('woocommerce_order_status_cancelled', array($this, 'cancel_payment'));
+		add_action('woocommerce_order_status_refunded', array($this, 'cancel_payment'));
+		add_filter('woocommerce_tracks_event_properties', array($this, 'woocommerce_tracks_event_properties'), 10, 2);
 	}
 
 	/**
@@ -52,25 +52,25 @@ 
 	 * @param bool $retry
 	 * @param mix $previous_error Any error message from previous request.
 	 */
-	public function process_redirect_payment( $order_id, $retry = true, $previous_error = false ) {
+	public function process_redirect_payment($order_id, $retry = true, $previous_error = false) {
 		try {
-			$source = wc_clean( $_GET['source'] );
+			$source = wc_clean($_GET['source']);
 
-			if ( empty( $source ) ) {
+			if (empty($source)) {
 				return;
 			}
 
-			if ( empty( $order_id ) ) {
+			if (empty($order_id)) {
 				return;
 			}
 
-			$order = wc_get_order( $order_id );
+			$order = wc_get_order($order_id);
 
-			if ( ! is_object( $order ) ) {
+			if ( ! is_object($order)) {
 				return;
 			}
 
-			if ( $order->has_status( array( 'processing', 'completed', 'on-hold' ) ) ) {
+			if ($order->has_status(array('processing', 'completed', 'on-hold'))) {
 				return;
 			}
 
@@ -78,119 +78,119 @@ 
 			$response = null;
 
 			// This will throw exception if not valid.
-			$this->validate_minimum_order_amount( $order );
+			$this->validate_minimum_order_amount($order);
 
-			WC_Stripe_Logger::log( "Info: (Redirect) Begin processing payment for order $order_id for the amount of {$order->get_total()}" );
+			WC_Stripe_Logger::log("Info: (Redirect) Begin processing payment for order $order_id for the amount of {$order->get_total()}");
 
 			/**
 			 * First check if the source is chargeable at this time. If not,
 			 * webhook will take care of it later.
 			 */
-			$source_info = WC_Stripe_API::retrieve( 'sources/' . $source );
+			$source_info = WC_Stripe_API::retrieve('sources/' . $source);
 
-			if ( ! empty( $source_info->error ) ) {
-				throw new WC_Stripe_Exception( print_r( $source_info, true ), $source_info->error->message );
+			if ( ! empty($source_info->error)) {
+				throw new WC_Stripe_Exception(print_r($source_info, true), $source_info->error->message);
 			}
 
-			if ( 'failed' === $source_info->status || 'canceled' === $source_info->status ) {
-				throw new WC_Stripe_Exception( print_r( $source_info, true ), __( 'Unable to process this payment, please try again or use alternative method.', 'woocommerce-gateway-stripe' ) );
+			if ('failed' === $source_info->status || 'canceled' === $source_info->status) {
+				throw new WC_Stripe_Exception(print_r($source_info, true), __('Unable to process this payment, please try again or use alternative method.', 'woocommerce-gateway-stripe'));
 			}
 
 			// If already consumed, then ignore request.
-			if ( 'consumed' === $source_info->status ) {
+			if ('consumed' === $source_info->status) {
 				return;
 			}
 
 			// If not chargeable, then ignore request.
-			if ( 'chargeable' !== $source_info->status ) {
+			if ('chargeable' !== $source_info->status) {
 				return;
 			}
 
 			// Prep source object.
 			$source_object           = new stdClass();
 			$source_object->token_id = '';
-			$source_object->customer = $this->get_stripe_customer_id( $order );
+			$source_object->customer = $this->get_stripe_customer_id($order);
 			$source_object->source   = $source_info->id;
 			$source_object->status   = 'chargeable';
 
 			/* If we're doing a retry and source is chargeable, we need to pass
 			 * a different idempotency key and retry for success.
 			 */
-			if ( $this->need_update_idempotency_key( $source_object, $previous_error ) ) {
-				add_filter( 'wc_stripe_idempotency_key', array( $this, 'change_idempotency_key' ), 10, 2 );
+			if ($this->need_update_idempotency_key($source_object, $previous_error)) {
+				add_filter('wc_stripe_idempotency_key', array($this, 'change_idempotency_key'), 10, 2);
 			}
 
 			// Make the request.
-			$response = WC_Stripe_API::request( $this->generate_payment_request( $order, $source_object ), 'charges', 'POST', true );
+			$response = WC_Stripe_API::request($this->generate_payment_request($order, $source_object), 'charges', 'POST', true);
 			$headers  = $response['headers'];
 			$response = $response['body'];
 
-			if ( ! empty( $response->error ) ) {
+			if ( ! empty($response->error)) {
 				// Customer param wrong? The user may have been deleted on stripe's end. Remove customer_id. Can be retried without.
-				if ( $this->is_no_such_customer_error( $response->error ) ) {
-					delete_user_option( $order->get_customer_id(), '_stripe_customer_id' );
-					$order->delete_meta_data( '_stripe_customer_id' );
+				if ($this->is_no_such_customer_error($response->error)) {
+					delete_user_option($order->get_customer_id(), '_stripe_customer_id');
+					$order->delete_meta_data('_stripe_customer_id');
 					$order->save();
 				}
 
-				if ( $this->is_no_such_token_error( $response->error ) && $prepared_source->token_id ) {
+				if ($this->is_no_such_token_error($response->error) && $prepared_source->token_id) {
 					// Source param wrong? The CARD may have been deleted on stripe's end. Remove token and show message.
-					$wc_token = WC_Payment_Tokens::get( $prepared_source->token_id );
+					$wc_token = WC_Payment_Tokens::get($prepared_source->token_id);
 					$wc_token->delete();
-					$localized_message = __( 'This card is no longer available and has been removed.', 'woocommerce-gateway-stripe' );
-					$order->add_order_note( $localized_message );
-					throw new WC_Stripe_Exception( print_r( $response, true ), $localized_message );
+					$localized_message = __('This card is no longer available and has been removed.', 'woocommerce-gateway-stripe');
+					$order->add_order_note($localized_message);
+					throw new WC_Stripe_Exception(print_r($response, true), $localized_message);
 				}
 
 				// We want to retry.
-				if ( $this->is_retryable_error( $response->error ) ) {
-					if ( $retry ) {
+				if ($this->is_retryable_error($response->error)) {
+					if ($retry) {
 						// Don't do anymore retries after this.
-						if ( 5 <= $this->retry_interval ) {
-							return $this->process_redirect_payment( $order_id, false, $response->error );
+						if (5 <= $this->retry_interval) {
+							return $this->process_redirect_payment($order_id, false, $response->error);
 						}
 
-						sleep( $this->retry_interval );
+						sleep($this->retry_interval);
 
 						$this->retry_interval++;
-						return $this->process_redirect_payment( $order_id, true, $response->error );
+						return $this->process_redirect_payment($order_id, true, $response->error);
 					} else {
-						$localized_message = __( 'Sorry, we are unable to process your payment at this time. Please retry later.', 'woocommerce-gateway-stripe' );
-						$order->add_order_note( $localized_message );
-						throw new WC_Stripe_Exception( print_r( $response, true ), $localized_message );
+						$localized_message = __('Sorry, we are unable to process your payment at this time. Please retry later.', 'woocommerce-gateway-stripe');
+						$order->add_order_note($localized_message);
+						throw new WC_Stripe_Exception(print_r($response, true), $localized_message);
 					}
 				}
 
 				$localized_messages = WC_Stripe_Helper::get_localized_messages();
 
-				if ( 'card_error' === $response->error->type ) {
-					$message = isset( $localized_messages[ $response->error->code ] ) ? $localized_messages[ $response->error->code ] : $response->error->message;
+				if ('card_error' === $response->error->type) {
+					$message = isset($localized_messages[$response->error->code]) ? $localized_messages[$response->error->code] : $response->error->message;
 				} else {
-					$message = isset( $localized_messages[ $response->error->type ] ) ? $localized_messages[ $response->error->type ] : $response->error->message;
+					$message = isset($localized_messages[$response->error->type]) ? $localized_messages[$response->error->type] : $response->error->message;
 				}
 
-				throw new WC_Stripe_Exception( print_r( $response, true ), $message );
+				throw new WC_Stripe_Exception(print_r($response, true), $message);
 			}
 
 			// To prevent double processing the order on WC side.
-			if ( ! $this->is_original_request( $headers ) ) {
+			if ( ! $this->is_original_request($headers)) {
 				return;
 			}
 
-			do_action( 'wc_gateway_stripe_process_redirect_payment', $response, $order );
+			do_action('wc_gateway_stripe_process_redirect_payment', $response, $order);
 
-			$this->process_response( $response, $order );
+			$this->process_response($response, $order);
 
-		} catch ( WC_Stripe_Exception $e ) {
-			WC_Stripe_Logger::log( 'Error: ' . $e->getMessage() );
+		} catch (WC_Stripe_Exception $e) {
+			WC_Stripe_Logger::log('Error: ' . $e->getMessage());
 
-			do_action( 'wc_gateway_stripe_process_redirect_payment_error', $e, $order );
+			do_action('wc_gateway_stripe_process_redirect_payment_error', $e, $order);
 
 			/* translators: error message */
-			$order->update_status( 'failed', sprintf( __( 'Stripe payment failed: %s', 'woocommerce-gateway-stripe' ), $e->getLocalizedMessage() ) );
+			$order->update_status('failed', sprintf(__('Stripe payment failed: %s', 'woocommerce-gateway-stripe'), $e->getLocalizedMessage()));
 
-			wc_add_notice( $e->getLocalizedMessage(), 'error' );
-			wp_safe_redirect( wc_get_checkout_url() );
+			wc_add_notice($e->getLocalizedMessage(), 'error');
+			wp_safe_redirect(wc_get_checkout_url());
 			exit;
 		}
 	}
@@ -202,13 +202,13 @@ 
 	 * @version 4.0.0
 	 */
 	public function maybe_process_redirect_order() {
-		if ( ! is_order_received_page() || empty( $_GET['client_secret'] ) || empty( $_GET['source'] ) ) {
+		if ( ! is_order_received_page() || empty($_GET['client_secret']) || empty($_GET['source'])) {
 			return;
 		}
 
-		$order_id = wc_clean( $_GET['order_id'] );
+		$order_id = wc_clean($_GET['order_id']);
 
-		$this->process_redirect_payment( $order_id );
+		$this->process_redirect_payment($order_id);
 	}
 
 	/**
@@ -218,32 +218,32 @@ 
 	 * @version 4.0.0
 	 * @param  int $order_id
 	 */
-	public function capture_payment( $order_id ) {
-		$order = wc_get_order( $order_id );
+	public function capture_payment($order_id) {
+		$order = wc_get_order($order_id);
 
-		if ( 'stripe' === $order->get_payment_method() ) {
+		if ('stripe' === $order->get_payment_method()) {
 			$charge             = $order->get_transaction_id();
-			$captured           = $order->get_meta( '_stripe_charge_captured', true );
+			$captured           = $order->get_meta('_stripe_charge_captured', true);
 			$is_stripe_captured = false;
 
-			if ( $charge && 'no' === $captured ) {
+			if ($charge && 'no' === $captured) {
 				$order_total = $order->get_total();
 
-				if ( 0 < $order->get_total_refunded() ) {
+				if (0 < $order->get_total_refunded()) {
 					$order_total = $order_total - $order->get_total_refunded();
 				}
 
-				$intent = $this->get_intent_from_order( $order );
-				if ( $intent ) {
+				$intent = $this->get_intent_from_order($order);
+				if ($intent) {
 					// If the order has a Payment Intent, then the Intent itself must be captured, not the Charge
-					if ( ! empty( $intent->error ) ) {
+					if ( ! empty($intent->error)) {
 						/* translators: error message */
-						$order->add_order_note( sprintf( __( 'Unable to capture charge! %s', 'woocommerce-gateway-stripe' ), $intent->error->message ) );
-					} elseif ( 'requires_capture' === $intent->status ) {
-						$level3_data = $this->get_level3_data_from_order( $order );
+						$order->add_order_note(sprintf(__('Unable to capture charge! %s', 'woocommerce-gateway-stripe'), $intent->error->message));
+					} elseif ('requires_capture' === $intent->status) {
+						$level3_data = $this->get_level3_data_from_order($order);
 						$result = WC_Stripe_API::request_with_level3_data(
 							array(
-								'amount'   => WC_Stripe_Helper::get_stripe_amount( $order_total ),
+								'amount'   => WC_Stripe_Helper::get_stripe_amount($order_total),
 								'expand[]' => 'charges.data.balance_transaction',
 							),
 							'payment_intents/' . $intent->id . '/capture',
@@ -251,30 +251,30 @@ 
 							$order
 						);
 
-						if ( ! empty( $result->error ) ) {
+						if ( ! empty($result->error)) {
 							/* translators: error message */
-							$order->update_status( 'failed', sprintf( __( 'Unable to capture charge! %s', 'woocommerce-gateway-stripe' ), $result->error->message ) );
+							$order->update_status('failed', sprintf(__('Unable to capture charge! %s', 'woocommerce-gateway-stripe'), $result->error->message));
 						} else {
 							$is_stripe_captured = true;
-							$result = end( $result->charges->data );
+							$result = end($result->charges->data);
 						}
-					} elseif ( 'succeeded' === $intent->status ) {
+					} elseif ('succeeded' === $intent->status) {
 						$is_stripe_captured = true;
 					}
 				} else {
 					// The order doesn't have a Payment Intent, fall back to capturing the Charge directly
 
 					// First retrieve charge to see if it has been captured.
-					$result = WC_Stripe_API::retrieve( 'charges/' . $charge );
+					$result = WC_Stripe_API::retrieve('charges/' . $charge);
 
-					if ( ! empty( $result->error ) ) {
+					if ( ! empty($result->error)) {
 						/* translators: error message */
-						$order->add_order_note( sprintf( __( 'Unable to capture charge! %s', 'woocommerce-gateway-stripe' ), $result->error->message ) );
-					} elseif ( false === $result->captured ) {
-						$level3_data = $this->get_level3_data_from_order( $order );
+						$order->add_order_note(sprintf(__('Unable to capture charge! %s', 'woocommerce-gateway-stripe'), $result->error->message));
+					} elseif (false === $result->captured) {
+						$level3_data = $this->get_level3_data_from_order($order);
 						$result = WC_Stripe_API::request_with_level3_data(
 							array(
-								'amount'   => WC_Stripe_Helper::get_stripe_amount( $order_total ),
+								'amount'   => WC_Stripe_Helper::get_stripe_amount($order_total),
 								'expand[]' => 'balance_transaction',
 							),
 							'charges/' . $charge . '/capture',
@@ -282,34 +282,34 @@ 
 							$order
 						);
 
-						if ( ! empty( $result->error ) ) {
+						if ( ! empty($result->error)) {
 							/* translators: error message */
-							$order->update_status( 'failed', sprintf( __( 'Unable to capture charge! %s', 'woocommerce-gateway-stripe' ), $result->error->message ) );
+							$order->update_status('failed', sprintf(__('Unable to capture charge! %s', 'woocommerce-gateway-stripe'), $result->error->message));
 						} else {
 							$is_stripe_captured = true;
 						}
-					} elseif ( true === $result->captured ) {
+					} elseif (true === $result->captured) {
 						$is_stripe_captured = true;
 					}
 				}
 
-				if ( $is_stripe_captured ) {
+				if ($is_stripe_captured) {
 					/* translators: transaction id */
-					$order->add_order_note( sprintf( __( 'Stripe charge complete (Charge ID: %s)', 'woocommerce-gateway-stripe' ), $result->id ) );
-					$order->update_meta_data( '_stripe_charge_captured', 'yes' );
+					$order->add_order_note(sprintf(__('Stripe charge complete (Charge ID: %s)', 'woocommerce-gateway-stripe'), $result->id));
+					$order->update_meta_data('_stripe_charge_captured', 'yes');
 
 					// Store other data such as fees
-					$order->set_transaction_id( $result->id );
+					$order->set_transaction_id($result->id);
 
-					if ( is_callable( array( $order, 'save' ) ) ) {
+					if (is_callable(array($order, 'save'))) {
 						$order->save();
 					}
 
-					$this->update_fees( $order, $result->balance_transaction->id );
+					$this->update_fees($order, $result->balance_transaction->id);
 				}
 
 				// This hook fires when admin manually changes order status to processing or completed.
-				do_action( 'woocommerce_stripe_process_manual_capture', $order, $result );
+				do_action('woocommerce_stripe_process_manual_capture', $order, $result);
 			}
 		}
 	}
@@ -321,17 +321,17 @@ 
 	 * @version 4.2.2
 	 * @param  int $order_id
 	 */
-	public function cancel_payment( $order_id ) {
-		$order = wc_get_order( $order_id );
+	public function cancel_payment($order_id) {
+		$order = wc_get_order($order_id);
 
-		if ( 'stripe' === $order->get_payment_method() ) {
-			$captured = $order->get_meta( '_stripe_charge_captured', true );
-			if ( 'no' === $captured ) {
-				$this->process_refund( $order_id );
+		if ('stripe' === $order->get_payment_method()) {
+			$captured = $order->get_meta('_stripe_charge_captured', true);
+			if ('no' === $captured) {
+				$this->process_refund($order_id);
 			}
 
 			// This hook fires when admin manually changes order status to cancel.
-			do_action( 'woocommerce_stripe_process_manual_cancel', $order );
+			do_action('woocommerce_stripe_process_manual_cancel', $order);
 		}
 	}
 
@@ -343,38 +343,38 @@ 
 	 * @param array Properties to be appended to.
 	 * @param string Event name, e.g. orders_edit_status_change.
 	 */
-	public function woocommerce_tracks_event_properties( $properties, $prefixed_event_name ) {
+	public function woocommerce_tracks_event_properties($properties, $prefixed_event_name) {
 		// Not the desired event? Bail.
-		if ( 'wcadmin_orders_edit_status_change' != $prefixed_event_name ) {
+		if ('wcadmin_orders_edit_status_change' != $prefixed_event_name) {
 			return $properties;
 		}
 
 		// Properties not an array? Bail.
-		if ( ! is_array( $properties ) ) {
+		if ( ! is_array($properties)) {
 			return $properties;
 		}
 
 		// No payment_method in properties? Bail.
-		if ( ! array_key_exists( 'payment_method', $properties ) ) {
+		if ( ! array_key_exists('payment_method', $properties)) {
 			return $properties;
 		}
 
 		// Not stripe? Bail.
-		if ( 'stripe' != $properties[ 'payment_method' ] ) {
+		if ('stripe' != $properties['payment_method']) {
 			return $properties;
 		}
 
 		// Due diligence done. Collect the metadata.
 		$is_live         = true;
-		$stripe_settings = get_option( 'woocommerce_stripe_settings', array() );
-		if ( array_key_exists( 'testmode', $stripe_settings ) ) {
-			$is_live = 'no' === $stripe_settings[ 'testmode' ];
+		$stripe_settings = get_option('woocommerce_stripe_settings', array());
+		if (array_key_exists('testmode', $stripe_settings)) {
+			$is_live = 'no' === $stripe_settings['testmode'];
 		}
 
-		$properties[ 'admin_email' ]                        = get_option( 'admin_email' );
-		$properties[ 'is_live' ]                            = $is_live;
-		$properties[ 'woocommerce_gateway_stripe_version' ] = WC_STRIPE_VERSION;
-		$properties[ 'woocommerce_default_country' ]        = get_option( 'woocommerce_default_country' );
+		$properties['admin_email']                        = get_option('admin_email');
+		$properties['is_live']                            = $is_live;
+		$properties['woocommerce_gateway_stripe_version'] = WC_STRIPE_VERSION;
+		$properties['woocommerce_default_country']        = get_option('woocommerce_default_country');
 
 		return $properties;
 	}

includes/connect/class-wc-stripe-connect-rest-oauth-connect-controller.php

Spacing +9 added lines, -9 removed lines

@@ -1,10 +1,10 @@ 
 <?php
 
-if ( ! defined( 'ABSPATH' ) ) {
+if ( ! defined('ABSPATH')) {
 	exit;
 }
 
-if ( ! class_exists( 'WC_Stripe_Connect_REST_Oauth_Connect_Controller' ) ) {
+if ( ! class_exists('WC_Stripe_Connect_REST_Oauth_Connect_Controller')) {
 	/**
 	 * Stripe Connect Oauth Connect controller class.
 	 */
@@ -30,9 +30,9 @@ 
 		 * @param WC_Stripe_Connect     $connect stripe connect.
 		 * @param WC_Stripe_Connect_API $api     stripe connect api.
 		 */
-		public function __construct( WC_Stripe_Connect $connect, WC_Stripe_Connect_API $api ) {
+		public function __construct(WC_Stripe_Connect $connect, WC_Stripe_Connect_API $api) {
 
-			parent::__construct( $api );
+			parent::__construct($api);
 
 			$this->connect = $connect;
 		}
@@ -44,19 +44,19 @@ 
 		 *
 		 * @return array|WP_Error
 		 */
-		public function post( $request ) {
+		public function post($request) {
 
 			$data     = $request->get_json_params();
-			$response = $this->connect->connect_oauth( $data['state'], $data['code'] );
+			$response = $this->connect->connect_oauth($data['state'], $data['code']);
 
-			if ( is_wp_error( $response ) ) {
+			if (is_wp_error($response)) {
 
-				WC_Stripe_Logger::log( $response, __CLASS__ );
+				WC_Stripe_Logger::log($response, __CLASS__);
 
 				return new WP_Error(
 					$response->get_error_code(),
 					$response->get_error_message(),
-					array( 'status' => 400 )
+					array('status' => 400)
 				);
 			}
 

includes/connect/class-wc-stripe-connect-rest-oauth-init-controller.php

Spacing +9 added lines, -9 removed lines

@@ -1,10 +1,10 @@ 
 <?php
 
-if ( ! defined( 'ABSPATH' ) ) {
+if ( ! defined('ABSPATH')) {
 	exit;
 }
 
-if ( ! class_exists( 'WC_Stripe_Connect_REST_Oauth_Init_Controller' ) ) {
+if ( ! class_exists('WC_Stripe_Connect_REST_Oauth_Init_Controller')) {
 	/**
 	 * Stripe Connect Oauth Init controller class.
 	 */
@@ -30,9 +30,9 @@ 
 		 * @param WC_Stripe_Connect     $connect stripe connect.
 		 * @param WC_Stripe_Connect_API $api     stripe connect api.
 		 */
-		public function __construct( WC_Stripe_Connect $connect, WC_Stripe_Connect_API $api ) {
+		public function __construct(WC_Stripe_Connect $connect, WC_Stripe_Connect_API $api) {
 
-			parent::__construct( $api );
+			parent::__construct($api);
 
 			$this->connect = $connect;
 		}
@@ -44,19 +44,19 @@ 
 		 *
 		 * @return array|WP_Error
 		 */
-		public function post( $request ) {
+		public function post($request) {
 
 			$data     = $request->get_json_params();
-			$response = $this->connect->get_oauth_url( isset( $data['returnUrl'] ) ? $data['returnUrl'] : '' );
+			$response = $this->connect->get_oauth_url(isset($data['returnUrl']) ? $data['returnUrl'] : '');
 
-			if ( is_wp_error( $response ) ) {
+			if (is_wp_error($response)) {
 
-				WC_Stripe_Logger::log( $response, __CLASS__ );
+				WC_Stripe_Logger::log($response, __CLASS__);
 
 				return new WP_Error(
 					$response->get_error_code(),
 					$response->get_error_message(),
-					array( 'status' => 400 )
+					array('status' => 400)
 				);
 			}
 

tests/phpunit/setup.php

Spacing +1 added lines, -1 removed lines

@@ -2,4 +2,4 @@
 /**
  * Set up shared by all tests.
  */
-update_option( 'woocommerce_default_country', 'US:CA' );
+update_option('woocommerce_default_country', 'US:CA');

includes/payment-methods/class-wc-stripe-payment-request.php

Spacing +304 added lines, -304 removed lines

@@ -8,7 +8,7 @@ 
  * @since   4.0.0
  */
 
-if ( ! defined( 'ABSPATH' ) ) {
+if ( ! defined('ABSPATH')) {
 	exit;
 }
 
@@ -66,35 +66,35 @@ 
 	 */
 	public function __construct() {
 		self::$_this           = $this;
-		$this->stripe_settings = get_option( 'woocommerce_stripe_settings', array() );
-		$this->testmode        = ( ! empty( $this->stripe_settings['testmode'] ) && 'yes' === $this->stripe_settings['testmode'] ) ? true : false;
-		$this->publishable_key = ! empty( $this->stripe_settings['publishable_key'] ) ? $this->stripe_settings['publishable_key'] : '';
-		$this->secret_key      = ! empty( $this->stripe_settings['secret_key'] ) ? $this->stripe_settings['secret_key'] : '';
-		$this->total_label     = ! empty( $this->stripe_settings['statement_descriptor'] ) ? WC_Stripe_Helper::clean_statement_descriptor( $this->stripe_settings['statement_descriptor'] ) : '';
+		$this->stripe_settings = get_option('woocommerce_stripe_settings', array());
+		$this->testmode        = ( ! empty($this->stripe_settings['testmode']) && 'yes' === $this->stripe_settings['testmode']) ? true : false;
+		$this->publishable_key = ! empty($this->stripe_settings['publishable_key']) ? $this->stripe_settings['publishable_key'] : '';
+		$this->secret_key      = ! empty($this->stripe_settings['secret_key']) ? $this->stripe_settings['secret_key'] : '';
+		$this->total_label     = ! empty($this->stripe_settings['statement_descriptor']) ? WC_Stripe_Helper::clean_statement_descriptor($this->stripe_settings['statement_descriptor']) : '';
 
-		if ( $this->testmode ) {
-			$this->publishable_key = ! empty( $this->stripe_settings['test_publishable_key'] ) ? $this->stripe_settings['test_publishable_key'] : '';
-			$this->secret_key      = ! empty( $this->stripe_settings['test_secret_key'] ) ? $this->stripe_settings['test_secret_key'] : '';
+		if ($this->testmode) {
+			$this->publishable_key = ! empty($this->stripe_settings['test_publishable_key']) ? $this->stripe_settings['test_publishable_key'] : '';
+			$this->secret_key      = ! empty($this->stripe_settings['test_secret_key']) ? $this->stripe_settings['test_secret_key'] : '';
 		}
 
-		$this->total_label = str_replace( "'", '', $this->total_label ) . apply_filters( 'wc_stripe_payment_request_total_label_suffix', ' (via WooCommerce)' );
+		$this->total_label = str_replace("'", '', $this->total_label) . apply_filters('wc_stripe_payment_request_total_label_suffix', ' (via WooCommerce)');
 
 		// Checks if Stripe Gateway is enabled.
-		if ( empty( $this->stripe_settings ) || ( isset( $this->stripe_settings['enabled'] ) && 'yes' !== $this->stripe_settings['enabled'] ) ) {
+		if (empty($this->stripe_settings) || (isset($this->stripe_settings['enabled']) && 'yes' !== $this->stripe_settings['enabled'])) {
 			return;
 		}
 
 		// Checks if Payment Request is enabled.
-		if ( ! isset( $this->stripe_settings['payment_request'] ) || 'yes' !== $this->stripe_settings['payment_request'] ) {
+		if ( ! isset($this->stripe_settings['payment_request']) || 'yes' !== $this->stripe_settings['payment_request']) {
 			return;
 		}
 
 		// Don't load for change payment method page.
-		if ( isset( $_GET['change_payment_method'] ) ) {
+		if (isset($_GET['change_payment_method'])) {
 			return;
 		}
 
-		add_action( 'template_redirect', array( $this, 'set_session' ) );
+		add_action('template_redirect', array($this, 'set_session'));
 		$this->init();
 	}
 
@@ -107,12 +107,12 @@ 
 	public function are_keys_set() {
 		// NOTE: updates to this function should be added to are_keys_set()
 		// in includes/abstracts/abstract-wc-stripe-payment-gateway.php
-		if ( $this->testmode ) {
-			return preg_match( '/^pk_test_/', $this->publishable_key )
-			       && preg_match( '/^[rs]k_test_/', $this->secret_key );
+		if ($this->testmode) {
+			return preg_match('/^pk_test_/', $this->publishable_key)
+			       && preg_match('/^[rs]k_test_/', $this->secret_key);
 		} else {
-			return preg_match( '/^pk_live_/', $this->publishable_key )
-			       && preg_match( '/^[rs]k_live_/', $this->secret_key );
+			return preg_match('/^pk_live_/', $this->publishable_key)
+			       && preg_match('/^[rs]k_live_/', $this->secret_key);
 		}
 	}
 
@@ -134,11 +134,11 @@ 
 	 * @return void
 	 */
 	public function set_session() {
-		if ( ! is_product() || ( isset( WC()->session ) && WC()->session->has_session() ) ) {
+		if ( ! is_product() || (isset(WC()->session) && WC()->session->has_session())) {
 			return;
 		}
 
-		WC()->session->set_customer_session_cookie( true );
+		WC()->session->set_customer_session_cookie(true);
 	}
 
 	/**
@@ -149,30 +149,30 @@ 
 	 * @return  void
 	 */
 	public function init() {
-		add_action( 'wp_enqueue_scripts', array( $this, 'scripts' ) );
+		add_action('wp_enqueue_scripts', array($this, 'scripts'));
 
-		add_action( 'woocommerce_after_add_to_cart_quantity', array( $this, 'display_payment_request_button_html' ), 1 );
-		add_action( 'woocommerce_after_add_to_cart_quantity', array( $this, 'display_payment_request_button_separator_html' ), 2 );
+		add_action('woocommerce_after_add_to_cart_quantity', array($this, 'display_payment_request_button_html'), 1);
+		add_action('woocommerce_after_add_to_cart_quantity', array($this, 'display_payment_request_button_separator_html'), 2);
 
-		add_action( 'woocommerce_proceed_to_checkout', array( $this, 'display_payment_request_button_html' ), 1 );
-		add_action( 'woocommerce_proceed_to_checkout', array( $this, 'display_payment_request_button_separator_html' ), 2 );
+		add_action('woocommerce_proceed_to_checkout', array($this, 'display_payment_request_button_html'), 1);
+		add_action('woocommerce_proceed_to_checkout', array($this, 'display_payment_request_button_separator_html'), 2);
 
-		add_action( 'woocommerce_checkout_before_customer_details', array( $this, 'display_payment_request_button_html' ), 1 );
-		add_action( 'woocommerce_checkout_before_customer_details', array( $this, 'display_payment_request_button_separator_html' ), 2 );
+		add_action('woocommerce_checkout_before_customer_details', array($this, 'display_payment_request_button_html'), 1);
+		add_action('woocommerce_checkout_before_customer_details', array($this, 'display_payment_request_button_separator_html'), 2);
 
-		add_action( 'wc_ajax_wc_stripe_get_cart_details', array( $this, 'ajax_get_cart_details' ) );
-		add_action( 'wc_ajax_wc_stripe_get_shipping_options', array( $this, 'ajax_get_shipping_options' ) );
-		add_action( 'wc_ajax_wc_stripe_update_shipping_method', array( $this, 'ajax_update_shipping_method' ) );
-		add_action( 'wc_ajax_wc_stripe_create_order', array( $this, 'ajax_create_order' ) );
-		add_action( 'wc_ajax_wc_stripe_add_to_cart', array( $this, 'ajax_add_to_cart' ) );
-		add_action( 'wc_ajax_wc_stripe_get_selected_product_data', array( $this, 'ajax_get_selected_product_data' ) );
-		add_action( 'wc_ajax_wc_stripe_clear_cart', array( $this, 'ajax_clear_cart' ) );
-		add_action( 'wc_ajax_wc_stripe_log_errors', array( $this, 'ajax_log_errors' ) );
+		add_action('wc_ajax_wc_stripe_get_cart_details', array($this, 'ajax_get_cart_details'));
+		add_action('wc_ajax_wc_stripe_get_shipping_options', array($this, 'ajax_get_shipping_options'));
+		add_action('wc_ajax_wc_stripe_update_shipping_method', array($this, 'ajax_update_shipping_method'));
+		add_action('wc_ajax_wc_stripe_create_order', array($this, 'ajax_create_order'));
+		add_action('wc_ajax_wc_stripe_add_to_cart', array($this, 'ajax_add_to_cart'));
+		add_action('wc_ajax_wc_stripe_get_selected_product_data', array($this, 'ajax_get_selected_product_data'));
+		add_action('wc_ajax_wc_stripe_clear_cart', array($this, 'ajax_clear_cart'));
+		add_action('wc_ajax_wc_stripe_log_errors', array($this, 'ajax_log_errors'));
 
-		add_filter( 'woocommerce_gateway_title', array( $this, 'filter_gateway_title' ), 10, 2 );
-		add_filter( 'woocommerce_validate_postcode', array( $this, 'postal_code_validation' ), 10, 3 );
+		add_filter('woocommerce_gateway_title', array($this, 'filter_gateway_title'), 10, 2);
+		add_filter('woocommerce_validate_postcode', array($this, 'postal_code_validation'), 10, 3);
 
-		add_action( 'woocommerce_checkout_order_processed', array( $this, 'add_order_meta' ), 10, 2 );
+		add_action('woocommerce_checkout_order_processed', array($this, 'add_order_meta'), 10, 2);
 	}
 
 	/**
@@ -183,7 +183,7 @@ 
 	 * @return  string
 	 */
 	public function get_button_type() {
-		return isset( $this->stripe_settings['payment_request_button_type'] ) ? $this->stripe_settings['payment_request_button_type'] : 'default';
+		return isset($this->stripe_settings['payment_request_button_type']) ? $this->stripe_settings['payment_request_button_type'] : 'default';
 	}
 
 	/**
@@ -194,7 +194,7 @@ 
 	 * @return  string
 	 */
 	public function get_button_theme() {
-		return isset( $this->stripe_settings['payment_request_button_theme'] ) ? $this->stripe_settings['payment_request_button_theme'] : 'dark';
+		return isset($this->stripe_settings['payment_request_button_theme']) ? $this->stripe_settings['payment_request_button_theme'] : 'dark';
 	}
 
 	/**
@@ -205,7 +205,7 @@ 
 	 * @return  string
 	 */
 	public function get_button_height() {
-		return isset( $this->stripe_settings['payment_request_button_height'] ) ? str_replace( 'px', '', $this->stripe_settings['payment_request_button_height'] ) : '64';
+		return isset($this->stripe_settings['payment_request_button_height']) ? str_replace('px', '', $this->stripe_settings['payment_request_button_height']) : '64';
 	}
 
 	/**
@@ -227,7 +227,7 @@ 
 	 * @return  string
 	 */
 	public function get_button_branded_type() {
-		return isset( $this->stripe_settings['payment_request_button_branded_type'] ) ? $this->stripe_settings['payment_request_button_branded_type'] : 'default';
+		return isset($this->stripe_settings['payment_request_button_branded_type']) ? $this->stripe_settings['payment_request_button_branded_type'] : 'default';
 	}
 
 	/**
@@ -260,7 +260,7 @@ 
 	 * @return  string
 	 */
 	public function get_button_label() {
-		return isset( $this->stripe_settings['payment_request_button_label'] ) ? $this->stripe_settings['payment_request_button_label'] : 'Buy now';
+		return isset($this->stripe_settings['payment_request_button_label']) ? $this->stripe_settings['payment_request_button_label'] : 'Buy now';
 	}
 
 	/**
@@ -271,22 +271,22 @@ 
 	 * @return  mixed Returns false if not on a product page, the product information otherwise.
 	 */
 	public function get_product_data() {
-		if ( ! is_product() ) {
+		if ( ! is_product()) {
 			return false;
 		}
 
 		global $post;
 
-		$product = wc_get_product( $post->ID );
+		$product = wc_get_product($post->ID);
 
-		if ( 'variable' === $product->get_type() ) {
-			$attributes = wc_clean( wp_unslash( $_GET ) );
+		if ('variable' === $product->get_type()) {
+			$attributes = wc_clean(wp_unslash($_GET));
 
-			$data_store   = WC_Data_Store::load( 'product' );
-			$variation_id = $data_store->find_matching_product_variation( $product, $attributes );
+			$data_store   = WC_Data_Store::load('product');
+			$variation_id = $data_store->find_matching_product_variation($product, $attributes);
 
-			if ( ! empty( $variation_id ) ) {
-				$product = wc_get_product( $variation_id );
+			if ( ! empty($variation_id)) {
+				$product = wc_get_product($variation_id);
 			}
 		}
 
@@ -295,27 +295,27 @@ 
 
 		$items[] = array(
 			'label'  => $product->get_name(),
-			'amount' => WC_Stripe_Helper::get_stripe_amount( $product->get_price() ),
+			'amount' => WC_Stripe_Helper::get_stripe_amount($product->get_price()),
 		);
 
-		if ( wc_tax_enabled() ) {
+		if (wc_tax_enabled()) {
 			$items[] = array(
-				'label'   => __( 'Tax', 'woocommerce-gateway-stripe' ),
+				'label'   => __('Tax', 'woocommerce-gateway-stripe'),
 				'amount'  => 0,
 				'pending' => true,
 			);
 		}
 
-		if ( wc_shipping_enabled() && $product->needs_shipping() ) {
+		if (wc_shipping_enabled() && $product->needs_shipping()) {
 			$items[] = array(
-				'label'   => __( 'Shipping', 'woocommerce-gateway-stripe' ),
+				'label'   => __('Shipping', 'woocommerce-gateway-stripe'),
 				'amount'  => 0,
 				'pending' => true,
 			);
 
 			$data['shippingOptions'] = array(
 				'id'     => 'pending',
-				'label'  => __( 'Pending', 'woocommerce-gateway-stripe' ),
+				'label'  => __('Pending', 'woocommerce-gateway-stripe'),
 				'detail' => '',
 				'amount' => 0,
 			);
@@ -323,36 +323,36 @@ 
 
 		$data['displayItems'] = $items;
 		$data['total']        = array(
-			'label'   => apply_filters( 'wc_stripe_payment_request_total_label', $this->total_label ),
-			'amount'  => WC_Stripe_Helper::get_stripe_amount( $product->get_price() ),
+			'label'   => apply_filters('wc_stripe_payment_request_total_label', $this->total_label),
+			'amount'  => WC_Stripe_Helper::get_stripe_amount($product->get_price()),
 			'pending' => true,
 		);
 
-		$data['requestShipping'] = ( wc_shipping_enabled() && $product->needs_shipping() );
-		$data['currency']        = strtolower( get_woocommerce_currency() );
-		$data['country_code']    = substr( get_option( 'woocommerce_default_country' ), 0, 2 );
+		$data['requestShipping'] = (wc_shipping_enabled() && $product->needs_shipping());
+		$data['currency']        = strtolower(get_woocommerce_currency());
+		$data['country_code']    = substr(get_option('woocommerce_default_country'), 0, 2);
 
-		return apply_filters( 'wc_stripe_payment_request_product_data', $data, $product );
+		return apply_filters('wc_stripe_payment_request_product_data', $data, $product);
 	}
 
 	/**
 	 * Filters the gateway title to reflect Payment Request type
 	 */
-	public function filter_gateway_title( $title, $id ) {
+	public function filter_gateway_title($title, $id) {
 		global $post;
 
-		if ( ! is_object( $post ) ) {
+		if ( ! is_object($post)) {
 			return $title;
 		}
 
-		$order        = wc_get_order( $post->ID );
-		$method_title = is_object( $order ) ? $order->get_payment_method_title() : '';
+		$order        = wc_get_order($post->ID);
+		$method_title = is_object($order) ? $order->get_payment_method_title() : '';
 
-		if ( 'stripe' === $id && ! empty( $method_title ) && 'Apple Pay (Stripe)' === $method_title ) {
+		if ('stripe' === $id && ! empty($method_title) && 'Apple Pay (Stripe)' === $method_title) {
 			return $method_title;
 		}
 
-		if ( 'stripe' === $id && ! empty( $method_title ) && 'Chrome Payment Request (Stripe)' === $method_title ) {
+		if ('stripe' === $id && ! empty($method_title) && 'Chrome Payment Request (Stripe)' === $method_title) {
 			return $method_title;
 		}
 
@@ -365,16 +365,16 @@ 
 	 * @since   3.1.4
 	 * @version 4.0.0
 	 */
-	public function postal_code_validation( $valid, $postcode, $country ) {
+	public function postal_code_validation($valid, $postcode, $country) {
 		$gateways = WC()->payment_gateways->get_available_payment_gateways();
 
-		if ( ! isset( $gateways['stripe'] ) ) {
+		if ( ! isset($gateways['stripe'])) {
 			return $valid;
 		}
 
-		$payment_request_type = isset( $_POST['payment_request_type'] ) ? wc_clean( $_POST['payment_request_type'] ) : '';
+		$payment_request_type = isset($_POST['payment_request_type']) ? wc_clean($_POST['payment_request_type']) : '';
 
-		if ( 'apple_pay' !== $payment_request_type ) {
+		if ('apple_pay' !== $payment_request_type) {
 			return $valid;
 		}
 
@@ -384,7 +384,7 @@ 
 		 * the order and not let it go through. The remedy for now is just to remove this validation.
 		 * Note that this only works with shipping providers that don't validate full postal codes.
 		 */
-		if ( 'GB' === $country || 'CA' === $country ) {
+		if ('GB' === $country || 'CA' === $country) {
 			return true;
 		}
 
@@ -401,22 +401,22 @@ 
 	 * @version 4.0.0
 	 * @return  void
 	 */
-	public function add_order_meta( $order_id, $posted_data ) {
-		if ( empty( $_POST['payment_request_type'] ) ) {
+	public function add_order_meta($order_id, $posted_data) {
+		if (empty($_POST['payment_request_type'])) {
 			return;
 		}
 
-		$order = wc_get_order( $order_id );
+		$order = wc_get_order($order_id);
 
-		$payment_request_type = wc_clean( $_POST['payment_request_type'] );
+		$payment_request_type = wc_clean($_POST['payment_request_type']);
 
-		if ( 'apple_pay' === $payment_request_type ) {
-			$order->set_payment_method_title( 'Apple Pay (Stripe)' );
+		if ('apple_pay' === $payment_request_type) {
+			$order->set_payment_method_title('Apple Pay (Stripe)');
 			$order->save();
 		}
 
-		if ( 'payment_request_api' === $payment_request_type ) {
-			$order->set_payment_method_title( 'Chrome Payment Request (Stripe)' );
+		if ('payment_request_api' === $payment_request_type) {
+			$order->set_payment_method_title('Chrome Payment Request (Stripe)');
 			$order->save();
 		}
 	}
@@ -454,20 +454,20 @@ 
 	 * @return  boolean
 	 */
 	public function allowed_items_in_cart() {
-		foreach ( WC()->cart->get_cart() as $cart_item_key => $cart_item ) {
-			$_product = apply_filters( 'woocommerce_cart_item_product', $cart_item['data'], $cart_item, $cart_item_key );
+		foreach (WC()->cart->get_cart() as $cart_item_key => $cart_item) {
+			$_product = apply_filters('woocommerce_cart_item_product', $cart_item['data'], $cart_item, $cart_item_key);
 
-			if ( ! in_array( $_product->get_type(), $this->supported_product_types() ) ) {
+			if ( ! in_array($_product->get_type(), $this->supported_product_types())) {
 				return false;
 			}
 
 			// Trial subscriptions with shipping are not supported
-			if ( class_exists( 'WC_Subscriptions_Order' ) && WC_Subscriptions_Cart::cart_contains_subscription() && $_product->needs_shipping() && WC_Subscriptions_Product::get_trial_length( $_product ) > 0 ) {
+			if (class_exists('WC_Subscriptions_Order') && WC_Subscriptions_Cart::cart_contains_subscription() && $_product->needs_shipping() && WC_Subscriptions_Product::get_trial_length($_product) > 0) {
 				return false;
 			}
 
 			// Pre Orders compatbility where we don't support charge upon release.
-			if ( class_exists( 'WC_Pre_Orders_Order' ) && WC_Pre_Orders_Cart::cart_contains_pre_order() && WC_Pre_Orders_Product::product_is_charged_upon_release( WC_Pre_Orders_Cart::get_pre_order_product() ) ) {
+			if (class_exists('WC_Pre_Orders_Order') && WC_Pre_Orders_Cart::cart_contains_pre_order() && WC_Pre_Orders_Product::product_is_charged_upon_release(WC_Pre_Orders_Cart::get_pre_order_product())) {
 				return false;
 			}
 		}
@@ -483,61 +483,61 @@ 
 	 */
 	public function scripts() {
 		// If keys are not set bail.
-		if ( ! $this->are_keys_set() ) {
-			WC_Stripe_Logger::log( 'Keys are not set correctly.' );
+		if ( ! $this->are_keys_set()) {
+			WC_Stripe_Logger::log('Keys are not set correctly.');
 			return;
 		}
 
 		// If no SSL bail.
-		if ( ! $this->testmode && ! is_ssl() ) {
-			WC_Stripe_Logger::log( 'Stripe Payment Request live mode requires SSL.' );
+		if ( ! $this->testmode && ! is_ssl()) {
+			WC_Stripe_Logger::log('Stripe Payment Request live mode requires SSL.');
 			return;
 		}
 
-		if ( ! is_product() && ! is_cart() && ! is_checkout() && ! isset( $_GET['pay_for_order'] ) ) {
+		if ( ! is_product() && ! is_cart() && ! is_checkout() && ! isset($_GET['pay_for_order'])) {
 			return;
 		}
 
-		if ( is_product() && ! $this->should_show_payment_button_on_product_page() ) {
+		if (is_product() && ! $this->should_show_payment_button_on_product_page()) {
 			return;
 		}
 
-		$suffix = defined( 'SCRIPT_DEBUG' ) && SCRIPT_DEBUG ? '' : '.min';
+		$suffix = defined('SCRIPT_DEBUG') && SCRIPT_DEBUG ? '' : '.min';
 
 		$stripe_params = array(
-			'ajax_url'        => WC_AJAX::get_endpoint( '%%endpoint%%' ),
+			'ajax_url'        => WC_AJAX::get_endpoint('%%endpoint%%'),
 			'stripe'          => array(
 				'key'                => $this->publishable_key,
-				'allow_prepaid_card' => apply_filters( 'wc_stripe_allow_prepaid_card', true ) ? 'yes' : 'no',
+				'allow_prepaid_card' => apply_filters('wc_stripe_allow_prepaid_card', true) ? 'yes' : 'no',
 			),
 			'nonce'           => array(
-				'payment'                   => wp_create_nonce( 'wc-stripe-payment-request' ),
-				'shipping'                  => wp_create_nonce( 'wc-stripe-payment-request-shipping' ),
-				'update_shipping'           => wp_create_nonce( 'wc-stripe-update-shipping-method' ),
-				'checkout'                  => wp_create_nonce( 'woocommerce-process_checkout' ),
-				'add_to_cart'               => wp_create_nonce( 'wc-stripe-add-to-cart' ),
-				'get_selected_product_data' => wp_create_nonce( 'wc-stripe-get-selected-product-data' ),
-				'log_errors'                => wp_create_nonce( 'wc-stripe-log-errors' ),
-				'clear_cart'                => wp_create_nonce( 'wc-stripe-clear-cart' ),
+				'payment'                   => wp_create_nonce('wc-stripe-payment-request'),
+				'shipping'                  => wp_create_nonce('wc-stripe-payment-request-shipping'),
+				'update_shipping'           => wp_create_nonce('wc-stripe-update-shipping-method'),
+				'checkout'                  => wp_create_nonce('woocommerce-process_checkout'),
+				'add_to_cart'               => wp_create_nonce('wc-stripe-add-to-cart'),
+				'get_selected_product_data' => wp_create_nonce('wc-stripe-get-selected-product-data'),
+				'log_errors'                => wp_create_nonce('wc-stripe-log-errors'),
+				'clear_cart'                => wp_create_nonce('wc-stripe-clear-cart'),
 			),
 			'i18n'            => array(
-				'no_prepaid_card'  => __( 'Sorry, we\'re not accepting prepaid cards at this time.', 'woocommerce-gateway-stripe' ),
+				'no_prepaid_card'  => __('Sorry, we\'re not accepting prepaid cards at this time.', 'woocommerce-gateway-stripe'),
 				/* translators: Do not translate the [option] placeholder */
-				'unknown_shipping' => __( 'Unknown shipping option "[option]".', 'woocommerce-gateway-stripe' ),
+				'unknown_shipping' => __('Unknown shipping option "[option]".', 'woocommerce-gateway-stripe'),
 			),
 			'checkout'        => array(
 				'url'               => wc_get_checkout_url(),
-				'currency_code'     => strtolower( get_woocommerce_currency() ),
-				'country_code'      => substr( get_option( 'woocommerce_default_country' ), 0, 2 ),
+				'currency_code'     => strtolower(get_woocommerce_currency()),
+				'country_code'      => substr(get_option('woocommerce_default_country'), 0, 2),
 				'needs_shipping'    => WC()->cart->needs_shipping() ? 'yes' : 'no',
 				// Defaults to 'required' to match how core initializes this option.
-				'needs_payer_phone' => 'required' === get_option( 'woocommerce_checkout_phone_field', 'required' ),
+				'needs_payer_phone' => 'required' === get_option('woocommerce_checkout_phone_field', 'required'),
 			),
 			'button'          => array(
 				'type'         => $this->get_button_type(),
 				'theme'        => $this->get_button_theme(),
 				'height'       => $this->get_button_height(),
-				'locale'       => apply_filters( 'wc_stripe_payment_request_button_locale', substr( get_locale(), 0, 2 ) ), // Default format is en_US.
+				'locale'       => apply_filters('wc_stripe_payment_request_button_locale', substr(get_locale(), 0, 2)), // Default format is en_US.
 				'is_custom'    => $this->is_custom_button(),
 				'is_branded'   => $this->is_branded_button(),
 				'css_selector' => $this->custom_button_selector(),
@@ -547,15 +547,15 @@ 
 			'product'         => $this->get_product_data(),
 		);
 
-		wp_register_script( 'stripe', 'https://js.stripe.com/v3/', '', '3.0', true );
-		wp_register_script( 'wc_stripe_payment_request', plugins_url( 'assets/js/stripe-payment-request' . $suffix . '.js', WC_STRIPE_MAIN_FILE ), array( 'jquery', 'stripe' ), WC_STRIPE_VERSION, true );
+		wp_register_script('stripe', 'https://js.stripe.com/v3/', '', '3.0', true);
+		wp_register_script('wc_stripe_payment_request', plugins_url('assets/js/stripe-payment-request' . $suffix . '.js', WC_STRIPE_MAIN_FILE), array('jquery', 'stripe'), WC_STRIPE_VERSION, true);
 
-		wp_localize_script( 'wc_stripe_payment_request', 'wc_stripe_payment_request_params', apply_filters( 'wc_stripe_payment_request_params', $stripe_params ) );
+		wp_localize_script('wc_stripe_payment_request', 'wc_stripe_payment_request_params', apply_filters('wc_stripe_payment_request_params', $stripe_params));
 
-		wp_enqueue_script( 'wc_stripe_payment_request' );
+		wp_enqueue_script('wc_stripe_payment_request');
 
 		$gateways = WC()->payment_gateways->get_available_payment_gateways();
-		if ( isset( $gateways['stripe'] ) ) {
+		if (isset($gateways['stripe'])) {
 			$gateways['stripe']->payment_scripts();
 		}
 	}
@@ -571,31 +571,31 @@ 
 
 		$gateways = WC()->payment_gateways->get_available_payment_gateways();
 
-		if ( ! isset( $gateways['stripe'] ) ) {
+		if ( ! isset($gateways['stripe'])) {
 			return;
 		}
 
-		if ( ! is_cart() && ! is_checkout() && ! is_product() && ! isset( $_GET['pay_for_order'] ) ) {
+		if ( ! is_cart() && ! is_checkout() && ! is_product() && ! isset($_GET['pay_for_order'])) {
 			return;
 		}
 
-		if ( is_checkout() && ! apply_filters( 'wc_stripe_show_payment_request_on_checkout', false, $post ) ) {
+		if (is_checkout() && ! apply_filters('wc_stripe_show_payment_request_on_checkout', false, $post)) {
 			return;
 		}
 
-		if ( is_product() && ! $this->should_show_payment_button_on_product_page() ) {
+		if (is_product() && ! $this->should_show_payment_button_on_product_page()) {
 			return;
-		} else if ( ! $this->should_show_payment_button_on_cart() ) {
+		} else if ( ! $this->should_show_payment_button_on_cart()) {
 			return;
 		}
 		?>
 		<div id="wc-stripe-payment-request-wrapper" style="clear:both;padding-top:1.5em;display:none;">
 			<div id="wc-stripe-payment-request-button">
 				<?php
-					if ( $this->is_custom_button() ) {
-						$label = esc_html( $this->get_button_label() );
-						$class_name = esc_attr( 'button ' .  $this->get_button_theme() );
-						$style = esc_attr( 'height:' . $this->get_button_height() . 'px;' );
+					if ($this->is_custom_button()) {
+						$label = esc_html($this->get_button_label());
+						$class_name = esc_attr('button ' . $this->get_button_theme());
+						$style = esc_attr('height:' . $this->get_button_height() . 'px;');
 						echo "<button id=\"wc-stripe-custom-button\" class=\"$class_name\" style=\"$style\"> $label </button>";
 					}
 				?>
@@ -616,25 +616,25 @@ 
 
 		$gateways = WC()->payment_gateways->get_available_payment_gateways();
 
-		if ( ! isset( $gateways['stripe'] ) ) {
+		if ( ! isset($gateways['stripe'])) {
 			return;
 		}
 
-		if ( ! is_cart() && ! is_checkout() && ! is_product() && ! isset( $_GET['pay_for_order'] ) ) {
+		if ( ! is_cart() && ! is_checkout() && ! is_product() && ! isset($_GET['pay_for_order'])) {
 			return;
 		}
 
-		if ( is_checkout() && ! apply_filters( 'wc_stripe_show_payment_request_on_checkout', false, $post ) ) {
+		if (is_checkout() && ! apply_filters('wc_stripe_show_payment_request_on_checkout', false, $post)) {
 			return;
 		}
 
-		if ( is_product() && ! $this->should_show_payment_button_on_product_page() ) {
+		if (is_product() && ! $this->should_show_payment_button_on_product_page()) {
 			return;
-		} else if ( ! $this->should_show_payment_button_on_cart() ) {
+		} else if ( ! $this->should_show_payment_button_on_cart()) {
 			return;
 		}
 		?>
-		<p id="wc-stripe-payment-request-button-separator" style="margin-top:1.5em;text-align:center;display:none;">&mdash; <?php esc_html_e( 'OR', 'woocommerce-gateway-stripe' ); ?> &mdash;</p>
+		<p id="wc-stripe-payment-request-button-separator" style="margin-top:1.5em;text-align:center;display:none;">&mdash; <?php esc_html_e('OR', 'woocommerce-gateway-stripe'); ?> &mdash;</p>
 		<?php
 	}
 
@@ -645,11 +645,11 @@ 
 	 * @return boolean
 	 */
 	private function should_show_payment_button_on_cart() {
-		if ( ! apply_filters( 'wc_stripe_show_payment_request_on_cart', true ) ) {
+		if ( ! apply_filters('wc_stripe_show_payment_request_on_cart', true)) {
 			return false;
 		}
-		if ( ! $this->allowed_items_in_cart() ) {
-			WC_Stripe_Logger::log( 'Items in the cart has unsupported product type ( Payment Request button disabled )' );
+		if ( ! $this->allowed_items_in_cart()) {
+			WC_Stripe_Logger::log('Items in the cart has unsupported product type ( Payment Request button disabled )');
 			return false;
 		}
 		return true;
@@ -664,32 +664,32 @@ 
 	private function should_show_payment_button_on_product_page() {
 		global $post;
 
-		$product = wc_get_product( $post->ID );
+		$product = wc_get_product($post->ID);
 
-		if ( apply_filters( 'wc_stripe_hide_payment_request_on_product_page', false, $post ) ) {
+		if (apply_filters('wc_stripe_hide_payment_request_on_product_page', false, $post)) {
 			return false;
 		}
 
-		if ( ! is_object( $product ) || ! in_array( $product->get_type(), $this->supported_product_types() ) ) {
+		if ( ! is_object($product) || ! in_array($product->get_type(), $this->supported_product_types())) {
 			return false;
 		}
 
 		// Trial subscriptions with shipping are not supported
-		if ( class_exists( 'WC_Subscriptions_Order' ) && $product->needs_shipping() && WC_Subscriptions_Product::get_trial_length( $product ) > 0 ) {
+		if (class_exists('WC_Subscriptions_Order') && $product->needs_shipping() && WC_Subscriptions_Product::get_trial_length($product) > 0) {
 			return false;
 		}
 
 		// Pre Orders charge upon release not supported.
-		if ( class_exists( 'WC_Pre_Orders_Order' ) && WC_Pre_Orders_Product::product_is_charged_upon_release( $product ) ) {
-			WC_Stripe_Logger::log( 'Pre Order charge upon release is not supported. ( Payment Request button disabled )' );
+		if (class_exists('WC_Pre_Orders_Order') && WC_Pre_Orders_Product::product_is_charged_upon_release($product)) {
+			WC_Stripe_Logger::log('Pre Order charge upon release is not supported. ( Payment Request button disabled )');
 			return false;
 		}
 
 		// File upload addon not supported
-		if ( class_exists( 'WC_Product_Addons_Helper' ) ) {
-			$product_addons = WC_Product_Addons_Helper::get_product_addons( $product->get_id() );
-			foreach ( $product_addons as $addon ) {
-				if ( 'file_upload' === $addon['type'] ) {
+		if (class_exists('WC_Product_Addons_Helper')) {
+			$product_addons = WC_Product_Addons_Helper::get_product_addons($product->get_id());
+			foreach ($product_addons as $addon) {
+				if ('file_upload' === $addon['type']) {
 					return false;
 				}
 			}
@@ -705,11 +705,11 @@ 
 	 * @version 4.0.0
 	 */
 	public function ajax_log_errors() {
-		check_ajax_referer( 'wc-stripe-log-errors', 'security' );
+		check_ajax_referer('wc-stripe-log-errors', 'security');
 
-		$errors = wc_clean( stripslashes( $_POST['errors'] ) );
+		$errors = wc_clean(stripslashes($_POST['errors']));
 
-		WC_Stripe_Logger::log( $errors );
+		WC_Stripe_Logger::log($errors);
 
 		exit;
 	}
@@ -721,7 +721,7 @@ 
 	 * @version 4.0.0
 	 */
 	public function ajax_clear_cart() {
-		check_ajax_referer( 'wc-stripe-clear-cart', 'security' );
+		check_ajax_referer('wc-stripe-clear-cart', 'security');
 
 		WC()->cart->empty_cart();
 		exit;
@@ -731,10 +731,10 @@ 
 	 * Get cart details.
 	 */
 	public function ajax_get_cart_details() {
-		check_ajax_referer( 'wc-stripe-payment-request', 'security' );
+		check_ajax_referer('wc-stripe-payment-request', 'security');
 
-		if ( ! defined( 'WOOCOMMERCE_CART' ) ) {
-			define( 'WOOCOMMERCE_CART', true );
+		if ( ! defined('WOOCOMMERCE_CART')) {
+			define('WOOCOMMERCE_CART', true);
 		}
 
 		WC()->cart->calculate_totals();
@@ -745,14 +745,14 @@ 
 		$data = array(
 			'shipping_required' => WC()->cart->needs_shipping(),
 			'order_data'        => array(
-				'currency'     => strtolower( $currency ),
-				'country_code' => substr( get_option( 'woocommerce_default_country' ), 0, 2 ),
+				'currency'     => strtolower($currency),
+				'country_code' => substr(get_option('woocommerce_default_country'), 0, 2),
 			),
 		);
 
 		$data['order_data'] += $this->build_display_items();
 
-		wp_send_json( $data );
+		wp_send_json($data);
 	}
 
 	/**
@@ -763,7 +763,7 @@ 
 	 * @see WC_Shipping::get_packages().
 	 */
 	public function ajax_get_shipping_options() {
-		check_ajax_referer( 'wc-stripe-payment-request-shipping', 'security' );
+		check_ajax_referer('wc-stripe-payment-request-shipping', 'security');
 
 		$shipping_address = filter_input_array(
 			INPUT_POST,
@@ -776,11 +776,11 @@ 
 				'address_2' => FILTER_SANITIZE_STRING,
 			)
 		);
-		$product_view_options      = filter_input_array( INPUT_POST, [ 'is_product_page' => FILTER_SANITIZE_STRING ] );
-		$should_show_itemized_view = ! isset( $product_view_options['is_product_page'] ) ?: filter_var( $product_view_options['is_product_page'], FILTER_VALIDATE_BOOLEAN );
+		$product_view_options      = filter_input_array(INPUT_POST, ['is_product_page' => FILTER_SANITIZE_STRING]);
+		$should_show_itemized_view = ! isset($product_view_options['is_product_page']) ?: filter_var($product_view_options['is_product_page'], FILTER_VALIDATE_BOOLEAN);
 
-		$data = $this->get_shipping_options( $shipping_address, $should_show_itemized_view );
-		wp_send_json( $data );
+		$data = $this->get_shipping_options($shipping_address, $should_show_itemized_view);
+		wp_send_json($data);
 	}
 
 	/**
@@ -792,66 +792,66 @@ 
 	 * @return array Shipping options data.
 	 * phpcs:ignore Squiz.Commenting.FunctionCommentThrowTag
 	 */
-	public function get_shipping_options( $shipping_address, $itemized_display_items = false ) {
+	public function get_shipping_options($shipping_address, $itemized_display_items = false) {
 		try {
 			// Set the shipping options.
 			$data = array();
 
 			// Remember current shipping method before resetting.
-			$chosen_shipping_methods = WC()->session->get( 'chosen_shipping_methods' );
-			$this->calculate_shipping( apply_filters( 'wc_stripe_payment_request_shipping_posted_values', $shipping_address ) );
+			$chosen_shipping_methods = WC()->session->get('chosen_shipping_methods');
+			$this->calculate_shipping(apply_filters('wc_stripe_payment_request_shipping_posted_values', $shipping_address));
 
 			$packages = WC()->shipping->get_packages();
 
-			if ( ! empty( $packages ) && WC()->customer->has_calculated_shipping() ) {
-				foreach ( $packages as $package_key => $package ) {
-					if ( empty( $package['rates'] ) ) {
-						throw new Exception( __( 'Unable to find shipping method for address.', 'woocommerce-gateway-stripe' ) );
+			if ( ! empty($packages) && WC()->customer->has_calculated_shipping()) {
+				foreach ($packages as $package_key => $package) {
+					if (empty($package['rates'])) {
+						throw new Exception(__('Unable to find shipping method for address.', 'woocommerce-gateway-stripe'));
 					}
 
-					foreach ( $package['rates'] as $key => $rate ) {
+					foreach ($package['rates'] as $key => $rate) {
 						$data['shipping_options'][] = array(
 							'id'     => $rate->id,
 							'label'  => $rate->label,
 							'detail' => '',
-							'amount' => WC_Stripe_Helper::get_stripe_amount( $rate->cost ),
+							'amount' => WC_Stripe_Helper::get_stripe_amount($rate->cost),
 						);
 					}
 				}
 			} else {
-				throw new Exception( __( 'Unable to find shipping method for address.', 'woocommerce-gateway-stripe' ) );
+				throw new Exception(__('Unable to find shipping method for address.', 'woocommerce-gateway-stripe'));
 			}
 
 			// The first shipping option is automatically applied on the client.
 			// Keep chosen shipping method by sorting shipping options if the method still available for new address.
 			// Fallback to the first available shipping method.
-			if ( isset( $data['shipping_options'][0] ) ) {
-				if ( isset( $chosen_shipping_methods[0] ) ) {
+			if (isset($data['shipping_options'][0])) {
+				if (isset($chosen_shipping_methods[0])) {
 					$chosen_method_id         = $chosen_shipping_methods[0];
-					$compare_shipping_options = function ( $a, $b ) use ( $chosen_method_id ) {
-						if ( $a['id'] === $chosen_method_id ) {
+					$compare_shipping_options = function($a, $b) use ($chosen_method_id) {
+						if ($a['id'] === $chosen_method_id) {
 							return -1;
 						}
 
-						if ( $b['id'] === $chosen_method_id ) {
+						if ($b['id'] === $chosen_method_id) {
 							return 1;
 						}
 
 						return 0;
 					};
-					usort( $data['shipping_options'], $compare_shipping_options );
+					usort($data['shipping_options'], $compare_shipping_options);
 				}
 
 				$first_shipping_method_id = $data['shipping_options'][0]['id'];
-				$this->update_shipping_method( [ $first_shipping_method_id ] );
+				$this->update_shipping_method([$first_shipping_method_id]);
 			}
 
 			WC()->cart->calculate_totals();
 
-			$data          += $this->build_display_items( $itemized_display_items );
+			$data          += $this->build_display_items($itemized_display_items);
 			$data['result'] = 'success';
-		} catch ( Exception $e ) {
-			$data          += $this->build_display_items( $itemized_display_items );
+		} catch (Exception $e) {
+			$data          += $this->build_display_items($itemized_display_items);
 			$data['result'] = 'invalid_shipping_address';
 		}
 
@@ -862,25 +862,25 @@ 
 	 * Update shipping method.
 	 */
 	public function ajax_update_shipping_method() {
-		check_ajax_referer( 'wc-stripe-update-shipping-method', 'security' );
+		check_ajax_referer('wc-stripe-update-shipping-method', 'security');
 
-		if ( ! defined( 'WOOCOMMERCE_CART' ) ) {
-			define( 'WOOCOMMERCE_CART', true );
+		if ( ! defined('WOOCOMMERCE_CART')) {
+			define('WOOCOMMERCE_CART', true);
 		}
 
-		$shipping_methods = filter_input( INPUT_POST, 'shipping_method', FILTER_DEFAULT, FILTER_REQUIRE_ARRAY );
-		$this->update_shipping_method( $shipping_methods );
+		$shipping_methods = filter_input(INPUT_POST, 'shipping_method', FILTER_DEFAULT, FILTER_REQUIRE_ARRAY);
+		$this->update_shipping_method($shipping_methods);
 
 		WC()->cart->calculate_totals();
 
-		$product_view_options      = filter_input_array( INPUT_POST, [ 'is_product_page' => FILTER_SANITIZE_STRING ] );
-		$should_show_itemized_view = ! isset( $product_view_options['is_product_page'] ) ?: filter_var( $product_view_options['is_product_page'], FILTER_VALIDATE_BOOLEAN );
+		$product_view_options      = filter_input_array(INPUT_POST, ['is_product_page' => FILTER_SANITIZE_STRING]);
+		$should_show_itemized_view = ! isset($product_view_options['is_product_page']) ?: filter_var($product_view_options['is_product_page'], FILTER_VALIDATE_BOOLEAN);
 
 		$data           = array();
-		$data          += $this->build_display_items( $should_show_itemized_view );
+		$data          += $this->build_display_items($should_show_itemized_view);
 		$data['result'] = 'success';
 
-		wp_send_json( $data );
+		wp_send_json($data);
 	}
 
 	/**
@@ -888,16 +888,16 @@ 
 	 *
 	 * @param array $shipping_methods Array of selected shipping methods ids.
 	 */
-	public function update_shipping_method( $shipping_methods ) {
-		$chosen_shipping_methods = WC()->session->get( 'chosen_shipping_methods' );
+	public function update_shipping_method($shipping_methods) {
+		$chosen_shipping_methods = WC()->session->get('chosen_shipping_methods');
 
-		if ( is_array( $shipping_methods ) ) {
-			foreach ( $shipping_methods as $i => $value ) {
-				$chosen_shipping_methods[ $i ] = wc_clean( $value );
+		if (is_array($shipping_methods)) {
+			foreach ($shipping_methods as $i => $value) {
+				$chosen_shipping_methods[$i] = wc_clean($value);
 			}
 		}
 
-		WC()->session->set( 'chosen_shipping_methods', $chosen_shipping_methods );
+		WC()->session->set('chosen_shipping_methods', $chosen_shipping_methods);
 	}
 
 	/**
@@ -908,38 +908,38 @@ 
 	 * @return  array $data
 	 */
 	public function ajax_get_selected_product_data() {
-		check_ajax_referer( 'wc-stripe-get-selected-product-data', 'security' );
+		check_ajax_referer('wc-stripe-get-selected-product-data', 'security');
 
 		try {
-			$product_id   = absint( $_POST['product_id'] );
-			$qty          = ! isset( $_POST['qty'] ) ? 1 : apply_filters( 'woocommerce_add_to_cart_quantity', absint( $_POST['qty'] ), $product_id );
-			$addon_value  = isset( $_POST['addon_value'] ) ? max( floatval( $_POST['addon_value'] ), 0 ) : 0;
-			$product      = wc_get_product( $product_id );
+			$product_id   = absint($_POST['product_id']);
+			$qty          = ! isset($_POST['qty']) ? 1 : apply_filters('woocommerce_add_to_cart_quantity', absint($_POST['qty']), $product_id);
+			$addon_value  = isset($_POST['addon_value']) ? max(floatval($_POST['addon_value']), 0) : 0;
+			$product      = wc_get_product($product_id);
 			$variation_id = null;
 
-			if ( ! is_a( $product, 'WC_Product' ) ) {
-				throw new Exception( sprintf( __( 'Product with the ID (%d) cannot be found.', 'woocommerce-gateway-stripe' ), $product_id ) );
+			if ( ! is_a($product, 'WC_Product')) {
+				throw new Exception(sprintf(__('Product with the ID (%d) cannot be found.', 'woocommerce-gateway-stripe'), $product_id));
 			}
 
-			if ( 'variable' === $product->get_type() && isset( $_POST['attributes'] ) ) {
-				$attributes = wc_clean( wp_unslash( $_POST['attributes'] ) );
+			if ('variable' === $product->get_type() && isset($_POST['attributes'])) {
+				$attributes = wc_clean(wp_unslash($_POST['attributes']));
 
-				$data_store   = WC_Data_Store::load( 'product' );
-				$variation_id = $data_store->find_matching_product_variation( $product, $attributes );
+				$data_store   = WC_Data_Store::load('product');
+				$variation_id = $data_store->find_matching_product_variation($product, $attributes);
 
-				if ( ! empty( $variation_id ) ) {
-					$product = wc_get_product( $variation_id );
+				if ( ! empty($variation_id)) {
+					$product = wc_get_product($variation_id);
 				}
 			}
 
 			// Force quantity to 1 if sold individually and check for existing item in cart.
-			if ( $product->is_sold_individually() ) {
-				$qty = apply_filters( 'wc_stripe_payment_request_add_to_cart_sold_individually_quantity', 1, $qty, $product_id, $variation_id );
+			if ($product->is_sold_individually()) {
+				$qty = apply_filters('wc_stripe_payment_request_add_to_cart_sold_individually_quantity', 1, $qty, $product_id, $variation_id);
 			}
 
-			if ( ! $product->has_enough_stock( $qty ) ) {
+			if ( ! $product->has_enough_stock($qty)) {
 				/* translators: 1: product name 2: quantity in stock */
-				throw new Exception( sprintf( __( 'You cannot add that amount of "%1$s"; to the cart because there is not enough stock (%2$s remaining).', 'woocommerce-gateway-stripe' ), $product->get_name(), wc_format_stock_quantity_for_display( $product->get_stock_quantity(), $product ) ) );
+				throw new Exception(sprintf(__('You cannot add that amount of "%1$s"; to the cart because there is not enough stock (%2$s remaining).', 'woocommerce-gateway-stripe'), $product->get_name(), wc_format_stock_quantity_for_display($product->get_stock_quantity(), $product)));
 			}
 
 			$total = $qty * $product->get_price() + $addon_value;
@@ -951,27 +951,27 @@ 
 
 			$items[] = array(
 				'label'  => $product->get_name() . $quantity_label,
-				'amount' => WC_Stripe_Helper::get_stripe_amount( $total ),
+				'amount' => WC_Stripe_Helper::get_stripe_amount($total),
 			);
 
-			if ( wc_tax_enabled() ) {
+			if (wc_tax_enabled()) {
 				$items[] = array(
-					'label'   => __( 'Tax', 'woocommerce-gateway-stripe' ),
+					'label'   => __('Tax', 'woocommerce-gateway-stripe'),
 					'amount'  => 0,
 					'pending' => true,
 				);
 			}
 
-			if ( wc_shipping_enabled() && $product->needs_shipping() ) {
+			if (wc_shipping_enabled() && $product->needs_shipping()) {
 				$items[] = array(
-					'label'   => __( 'Shipping', 'woocommerce-gateway-stripe' ),
+					'label'   => __('Shipping', 'woocommerce-gateway-stripe'),
 					'amount'  => 0,
 					'pending' => true,
 				);
 
 				$data['shippingOptions'] = array(
 					'id'     => 'pending',
-					'label'  => __( 'Pending', 'woocommerce-gateway-stripe' ),
+					'label'  => __('Pending', 'woocommerce-gateway-stripe'),
 					'detail' => '',
 					'amount' => 0,
 				);
@@ -980,17 +980,17 @@ 
 			$data['displayItems'] = $items;
 			$data['total']        = array(
 				'label'   => $this->total_label,
-				'amount'  => WC_Stripe_Helper::get_stripe_amount( $total ),
+				'amount'  => WC_Stripe_Helper::get_stripe_amount($total),
 				'pending' => true,
 			);
 
-			$data['requestShipping'] = ( wc_shipping_enabled() && $product->needs_shipping() );
-			$data['currency']        = strtolower( get_woocommerce_currency() );
-			$data['country_code']    = substr( get_option( 'woocommerce_default_country' ), 0, 2 );
+			$data['requestShipping'] = (wc_shipping_enabled() && $product->needs_shipping());
+			$data['currency']        = strtolower(get_woocommerce_currency());
+			$data['country_code']    = substr(get_option('woocommerce_default_country'), 0, 2);
 
-			wp_send_json( $data );
-		} catch ( Exception $e ) {
-			wp_send_json( array( 'error' => wp_strip_all_tags( $e->getMessage() ) ) );
+			wp_send_json($data);
+		} catch (Exception $e) {
+			wp_send_json(array('error' => wp_strip_all_tags($e->getMessage())));
 		}
 	}
 
@@ -1002,33 +1002,33 @@ 
 	 * @return  array $data
 	 */
 	public function ajax_add_to_cart() {
-		check_ajax_referer( 'wc-stripe-add-to-cart', 'security' );
+		check_ajax_referer('wc-stripe-add-to-cart', 'security');
 
-		if ( ! defined( 'WOOCOMMERCE_CART' ) ) {
-			define( 'WOOCOMMERCE_CART', true );
+		if ( ! defined('WOOCOMMERCE_CART')) {
+			define('WOOCOMMERCE_CART', true);
 		}
 
 		WC()->shipping->reset_shipping();
 
-		$product_id   = absint( $_POST['product_id'] );
-		$qty          = ! isset( $_POST['qty'] ) ? 1 : absint( $_POST['qty'] );
-		$product      = wc_get_product( $product_id );
+		$product_id   = absint($_POST['product_id']);
+		$qty          = ! isset($_POST['qty']) ? 1 : absint($_POST['qty']);
+		$product      = wc_get_product($product_id);
 		$product_type = $product->get_type();
 
 		// First empty the cart to prevent wrong calculation.
 		WC()->cart->empty_cart();
 
-		if ( ( 'variable' === $product_type || 'variable-subscription' === $product_type ) && isset( $_POST['attributes'] ) ) {
-			$attributes = wc_clean( wp_unslash( $_POST['attributes'] ) );
+		if (('variable' === $product_type || 'variable-subscription' === $product_type) && isset($_POST['attributes'])) {
+			$attributes = wc_clean(wp_unslash($_POST['attributes']));
 
-			$data_store   = WC_Data_Store::load( 'product' );
-			$variation_id = $data_store->find_matching_product_variation( $product, $attributes );
+			$data_store   = WC_Data_Store::load('product');
+			$variation_id = $data_store->find_matching_product_variation($product, $attributes);
 
-			WC()->cart->add_to_cart( $product->get_id(), $qty, $variation_id, $attributes );
+			WC()->cart->add_to_cart($product->get_id(), $qty, $variation_id, $attributes);
 		}
 
-		if ( 'simple' === $product_type || 'subscription' === $product_type ) {
-			WC()->cart->add_to_cart( $product->get_id(), $qty );
+		if ('simple' === $product_type || 'subscription' === $product_type) {
+			WC()->cart->add_to_cart($product->get_id(), $qty);
 		}
 
 		WC()->cart->calculate_totals();
@@ -1037,7 +1037,7 @@ 
 		$data          += $this->build_display_items();
 		$data['result'] = 'success';
 
-		wp_send_json( $data );
+		wp_send_json($data);
 	}
 
 	/**
@@ -1050,31 +1050,31 @@ 
 	 * @version 4.0.0
 	 */
 	public function normalize_state() {
-		$billing_country  = ! empty( $_POST['billing_country'] ) ? wc_clean( $_POST['billing_country'] ) : '';
-		$shipping_country = ! empty( $_POST['shipping_country'] ) ? wc_clean( $_POST['shipping_country'] ) : '';
-		$billing_state    = ! empty( $_POST['billing_state'] ) ? wc_clean( $_POST['billing_state'] ) : '';
-		$shipping_state   = ! empty( $_POST['shipping_state'] ) ? wc_clean( $_POST['shipping_state'] ) : '';
+		$billing_country  = ! empty($_POST['billing_country']) ? wc_clean($_POST['billing_country']) : '';
+		$shipping_country = ! empty($_POST['shipping_country']) ? wc_clean($_POST['shipping_country']) : '';
+		$billing_state    = ! empty($_POST['billing_state']) ? wc_clean($_POST['billing_state']) : '';
+		$shipping_state   = ! empty($_POST['shipping_state']) ? wc_clean($_POST['shipping_state']) : '';
 
-		if ( $billing_state && $billing_country ) {
-			$valid_states = WC()->countries->get_states( $billing_country );
+		if ($billing_state && $billing_country) {
+			$valid_states = WC()->countries->get_states($billing_country);
 
 			// Valid states found for country.
-			if ( ! empty( $valid_states ) && is_array( $valid_states ) && sizeof( $valid_states ) > 0 ) {
-				foreach ( $valid_states as $state_abbr => $state ) {
-					if ( preg_match( '/' . preg_quote( $state ) . '/i', $billing_state ) ) {
+			if ( ! empty($valid_states) && is_array($valid_states) && sizeof($valid_states) > 0) {
+				foreach ($valid_states as $state_abbr => $state) {
+					if (preg_match('/' . preg_quote($state) . '/i', $billing_state)) {
 						$_POST['billing_state'] = $state_abbr;
 					}
 				}
 			}
 		}
 
-		if ( $shipping_state && $shipping_country ) {
-			$valid_states = WC()->countries->get_states( $shipping_country );
+		if ($shipping_state && $shipping_country) {
+			$valid_states = WC()->countries->get_states($shipping_country);
 
 			// Valid states found for country.
-			if ( ! empty( $valid_states ) && is_array( $valid_states ) && sizeof( $valid_states ) > 0 ) {
-				foreach ( $valid_states as $state_abbr => $state ) {
-					if ( preg_match( '/' . preg_quote( $state ) . '/i', $shipping_state ) ) {
+			if ( ! empty($valid_states) && is_array($valid_states) && sizeof($valid_states) > 0) {
+				foreach ($valid_states as $state_abbr => $state) {
+					if (preg_match('/' . preg_quote($state) . '/i', $shipping_state)) {
 						$_POST['shipping_state'] = $state_abbr;
 					}
 				}
@@ -1089,19 +1089,19 @@ 
 	 * @version 4.0.0
 	 */
 	public function ajax_create_order() {
-		if ( WC()->cart->is_empty() ) {
-			wp_send_json_error( __( 'Empty cart', 'woocommerce-gateway-stripe' ) );
+		if (WC()->cart->is_empty()) {
+			wp_send_json_error(__('Empty cart', 'woocommerce-gateway-stripe'));
 		}
 
-		if ( ! defined( 'WOOCOMMERCE_CHECKOUT' ) ) {
-			define( 'WOOCOMMERCE_CHECKOUT', true );
+		if ( ! defined('WOOCOMMERCE_CHECKOUT')) {
+			define('WOOCOMMERCE_CHECKOUT', true);
 		}
 
 		$this->normalize_state();
 
 		WC()->checkout()->process_checkout();
 
-		die( 0 );
+		die(0);
 	}
 
 	/**
@@ -1112,38 +1112,38 @@ 
 	 * @since   3.1.0
 	 * @version 4.0.0
 	 */
-	protected function calculate_shipping( $address = array() ) {
+	protected function calculate_shipping($address = array()) {
 		$country   = $address['country'];
 		$state     = $address['state'];
 		$postcode  = $address['postcode'];
 		$city      = $address['city'];
 		$address_1 = $address['address'];
 		$address_2 = $address['address_2'];
-		$wc_states = WC()->countries->get_states( $country );
+		$wc_states = WC()->countries->get_states($country);
 
 		/**
 		 * In some versions of Chrome, state can be a full name. So we need
 		 * to convert that to abbreviation as WC is expecting that.
 		 */
-		if ( 2 < strlen( $state ) && ! empty( $wc_states ) && ! isset( $wc_states[ $state ] ) ) {
-			$state = array_search( ucwords( strtolower( $state ) ), $wc_states, true );
+		if (2 < strlen($state) && ! empty($wc_states) && ! isset($wc_states[$state])) {
+			$state = array_search(ucwords(strtolower($state)), $wc_states, true);
 		}
 
 		WC()->shipping->reset_shipping();
 
-		if ( $postcode && WC_Validation::is_postcode( $postcode, $country ) ) {
-			$postcode = wc_format_postcode( $postcode, $country );
+		if ($postcode && WC_Validation::is_postcode($postcode, $country)) {
+			$postcode = wc_format_postcode($postcode, $country);
 		}
 
-		if ( $country ) {
-			WC()->customer->set_location( $country, $state, $postcode, $city );
-			WC()->customer->set_shipping_location( $country, $state, $postcode, $city );
+		if ($country) {
+			WC()->customer->set_location($country, $state, $postcode, $city);
+			WC()->customer->set_shipping_location($country, $state, $postcode, $city);
 		} else {
 			WC()->customer->set_billing_address_to_base();
 			WC()->customer->set_shipping_address_to_base();
 		}
 
-		WC()->customer->set_calculated_shipping( true );
+		WC()->customer->set_calculated_shipping(true);
 		WC()->customer->save();
 
 		$packages = array();
@@ -1159,17 +1159,17 @@ 
 		$packages[0]['destination']['address']   = $address_1;
 		$packages[0]['destination']['address_2'] = $address_2;
 
-		foreach ( WC()->cart->get_cart() as $item ) {
-			if ( $item['data']->needs_shipping() ) {
-				if ( isset( $item['line_total'] ) ) {
+		foreach (WC()->cart->get_cart() as $item) {
+			if ($item['data']->needs_shipping()) {
+				if (isset($item['line_total'])) {
 					$packages[0]['contents_cost'] += $item['line_total'];
 				}
 			}
 		}
 
-		$packages = apply_filters( 'woocommerce_cart_shipping_packages', $packages );
+		$packages = apply_filters('woocommerce_cart_shipping_packages', $packages);
 
-		WC()->shipping->calculate_shipping( $packages );
+		WC()->shipping->calculate_shipping($packages);
 	}
 
 	/**
@@ -1178,19 +1178,19 @@ 
 	 * @since   3.1.0
 	 * @version 4.0.0
 	 */
-	protected function build_shipping_methods( $shipping_methods ) {
-		if ( empty( $shipping_methods ) ) {
+	protected function build_shipping_methods($shipping_methods) {
+		if (empty($shipping_methods)) {
 			return array();
 		}
 
 		$shipping = array();
 
-		foreach ( $shipping_methods as $method ) {
+		foreach ($shipping_methods as $method) {
 			$shipping[] = array(
 				'id'     => $method['id'],
 				'label'  => $method['label'],
 				'detail' => '',
-				'amount' => WC_Stripe_Helper::get_stripe_amount( $method['amount']['value'] ),
+				'amount' => WC_Stripe_Helper::get_stripe_amount($method['amount']['value']),
 			);
 		}
 
@@ -1203,9 +1203,9 @@ 
 	 * @since   3.1.0
 	 * @version 4.0.0
 	 */
-	protected function build_display_items( $itemized_display_items = false ) {
-		if ( ! defined( 'WOOCOMMERCE_CART' ) ) {
-			define( 'WOOCOMMERCE_CART', true );
+	protected function build_display_items($itemized_display_items = false) {
+		if ( ! defined('WOOCOMMERCE_CART')) {
+			define('WOOCOMMERCE_CART', true);
 		}
 
 		$items     = array();
@@ -1213,8 +1213,8 @@ 
 		$discounts = 0;
 
 		// Default show only subtotal instead of itemization.
-		if ( ! apply_filters( 'wc_stripe_payment_request_hide_itemization', true ) || $itemized_display_items ) {
-			foreach ( WC()->cart->get_cart() as $cart_item_key => $cart_item ) {
+		if ( ! apply_filters('wc_stripe_payment_request_hide_itemization', true) || $itemized_display_items) {
+			foreach (WC()->cart->get_cart() as $cart_item_key => $cart_item) {
 				$amount         = $cart_item['line_subtotal'];
 				$subtotal      += $cart_item['line_subtotal'];
 				$quantity_label = 1 < $cart_item['quantity'] ? ' (x' . $cart_item['quantity'] . ')' : '';
@@ -1223,61 +1223,61 @@ 
 
 				$item = array(
 					'label'  => $product_name . $quantity_label,
-					'amount' => WC_Stripe_Helper::get_stripe_amount( $amount ),
+					'amount' => WC_Stripe_Helper::get_stripe_amount($amount),
 				);
 
 				$items[] = $item;
 			}
 		}
 
-		if ( version_compare( WC_VERSION, '3.2', '<' ) ) {
-			$discounts = wc_format_decimal( WC()->cart->get_cart_discount_total(), WC()->cart->dp );
+		if (version_compare(WC_VERSION, '3.2', '<')) {
+			$discounts = wc_format_decimal(WC()->cart->get_cart_discount_total(), WC()->cart->dp);
 		} else {
-			$applied_coupons = array_values( WC()->cart->get_coupon_discount_totals() );
+			$applied_coupons = array_values(WC()->cart->get_coupon_discount_totals());
 
-			foreach ( $applied_coupons as $amount ) {
+			foreach ($applied_coupons as $amount) {
 				$discounts += (float) $amount;
 			}
 		}
 
-		$discounts   = wc_format_decimal( $discounts, WC()->cart->dp );
-		$tax         = wc_format_decimal( WC()->cart->tax_total + WC()->cart->shipping_tax_total, WC()->cart->dp );
-		$shipping    = wc_format_decimal( WC()->cart->shipping_total, WC()->cart->dp );
-		$items_total = wc_format_decimal( WC()->cart->cart_contents_total, WC()->cart->dp ) + $discounts;
-		$order_total = version_compare( WC_VERSION, '3.2', '<' ) ? wc_format_decimal( $items_total + $tax + $shipping - $discounts, WC()->cart->dp ) : WC()->cart->get_total( false );
+		$discounts   = wc_format_decimal($discounts, WC()->cart->dp);
+		$tax         = wc_format_decimal(WC()->cart->tax_total + WC()->cart->shipping_tax_total, WC()->cart->dp);
+		$shipping    = wc_format_decimal(WC()->cart->shipping_total, WC()->cart->dp);
+		$items_total = wc_format_decimal(WC()->cart->cart_contents_total, WC()->cart->dp) + $discounts;
+		$order_total = version_compare(WC_VERSION, '3.2', '<') ? wc_format_decimal($items_total + $tax + $shipping - $discounts, WC()->cart->dp) : WC()->cart->get_total(false);
 
-		if ( wc_tax_enabled() ) {
+		if (wc_tax_enabled()) {
 			$items[] = array(
-				'label'  => esc_html( __( 'Tax', 'woocommerce-gateway-stripe' ) ),
-				'amount' => WC_Stripe_Helper::get_stripe_amount( $tax ),
+				'label'  => esc_html(__('Tax', 'woocommerce-gateway-stripe')),
+				'amount' => WC_Stripe_Helper::get_stripe_amount($tax),
 			);
 		}
 
-		if ( WC()->cart->needs_shipping() ) {
+		if (WC()->cart->needs_shipping()) {
 			$items[] = array(
-				'label'  => esc_html( __( 'Shipping', 'woocommerce-gateway-stripe' ) ),
-				'amount' => WC_Stripe_Helper::get_stripe_amount( $shipping ),
+				'label'  => esc_html(__('Shipping', 'woocommerce-gateway-stripe')),
+				'amount' => WC_Stripe_Helper::get_stripe_amount($shipping),
 			);
 		}
 
-		if ( WC()->cart->has_discount() ) {
+		if (WC()->cart->has_discount()) {
 			$items[] = array(
-				'label'  => esc_html( __( 'Discount', 'woocommerce-gateway-stripe' ) ),
-				'amount' => WC_Stripe_Helper::get_stripe_amount( $discounts ),
+				'label'  => esc_html(__('Discount', 'woocommerce-gateway-stripe')),
+				'amount' => WC_Stripe_Helper::get_stripe_amount($discounts),
 			);
 		}
 
-		if ( version_compare( WC_VERSION, '3.2', '<' ) ) {
+		if (version_compare(WC_VERSION, '3.2', '<')) {
 			$cart_fees = WC()->cart->fees;
 		} else {
 			$cart_fees = WC()->cart->get_fees();
 		}
 
 		// Include fees and taxes as display items.
-		foreach ( $cart_fees as $key => $fee ) {
+		foreach ($cart_fees as $key => $fee) {
 			$items[] = array(
 				'label'  => $fee->name,
-				'amount' => WC_Stripe_Helper::get_stripe_amount( $fee->amount ),
+				'amount' => WC_Stripe_Helper::get_stripe_amount($fee->amount),
 			);
 		}
 
@@ -1285,7 +1285,7 @@ 
 			'displayItems' => $items,
 			'total'        => array(
 				'label'   => $this->total_label,
-				'amount'  => max( 0, apply_filters( 'woocommerce_stripe_calculated_total', WC_Stripe_Helper::get_stripe_amount( $order_total ), $order_total, WC()->cart ) ),
+				'amount'  => max(0, apply_filters('woocommerce_stripe_calculated_total', WC_Stripe_Helper::get_stripe_amount($order_total), $order_total, WC()->cart)),
 				'pending' => false,
 			),
 		);

includes/abstracts/abstract-wc-stripe-connect-rest-controller.php

Spacing +24 added lines, -24 removed lines

@@ -1,6 +1,6 @@ 
 <?php
 
-if ( ! defined( 'ABSPATH' ) ) {
+if ( ! defined('ABSPATH')) {
 	exit;
 }
 
@@ -28,7 +28,7 @@ 
 	 *
 	 * @param WC_Stripe_Connect_API $api stripe connect api.
 	 */
-	public function __construct( WC_Stripe_Connect_API $api ) {
+	public function __construct(WC_Stripe_Connect_API $api) {
 
 		$this->api = $api;
 	}
@@ -38,43 +38,43 @@ 
 	 */
 	public function register_routes() {
 
-		if ( method_exists( $this, 'get' ) ) {
+		if (method_exists($this, 'get')) {
 			register_rest_route(
 				$this->namespace,
 				'/' . $this->rest_base,
 				array(
 					array(
 						'methods'             => 'GET',
-						'callback'            => array( $this, 'get_internal' ),
-						'permission_callback' => array( $this, 'check_permission' ),
+						'callback'            => array($this, 'get_internal'),
+						'permission_callback' => array($this, 'check_permission'),
 					),
 				)
 			);
 		}
 
-		if ( method_exists( $this, 'post' ) ) {
+		if (method_exists($this, 'post')) {
 			register_rest_route(
 				$this->namespace,
 				'/' . $this->rest_base,
 				array(
 					array(
 						'methods'             => 'POST',
-						'callback'            => array( $this, 'post_internal' ),
-						'permission_callback' => array( $this, 'check_permission' ),
+						'callback'            => array($this, 'post_internal'),
+						'permission_callback' => array($this, 'check_permission'),
 					),
 				)
 			);
 		}
 
-		if ( method_exists( $this, 'delete' ) ) {
+		if (method_exists($this, 'delete')) {
 			register_rest_route(
 				$this->namespace,
 				'/' . $this->rest_base,
 				array(
 					array(
 						'methods'             => 'DELETE',
-						'callback'            => array( $this, 'delete_internal' ),
-						'permission_callback' => array( $this, 'check_permission' ),
+						'callback'            => array($this, 'delete_internal'),
+						'permission_callback' => array($this, 'check_permission'),
 					),
 				)
 			);
@@ -88,11 +88,11 @@ 
 	 *
 	 * @return array
 	 */
-	public function get_internal( $request ) {
+	public function get_internal($request) {
 
 		$this->prevent_route_caching();
 
-		return $this->get( $request );
+		return $this->get($request);
 	}
 
 	/**
@@ -102,11 +102,11 @@ 
 	 *
 	 * @return array
 	 */
-	public function post_internal( $request ) {
+	public function post_internal($request) {
 
 		$this->prevent_route_caching();
 
-		return $this->post( $request );
+		return $this->post($request);
 	}
 
 	/**
@@ -116,11 +116,11 @@ 
 	 *
 	 * @return array
 	 */
-	public function delete_internal( $request ) {
+	public function delete_internal($request) {
 
 		$this->prevent_route_caching();
 
-		return $this->delete( $request );
+		return $this->delete($request);
 	}
 
 	/**
@@ -130,9 +130,9 @@ 
 	 *
 	 * @return bool
 	 */
-	public function check_permission( $request ) {
+	public function check_permission($request) {
 
-		return current_user_can( 'manage_woocommerce' );
+		return current_user_can('manage_woocommerce');
 	}
 
 	/**
@@ -140,12 +140,12 @@ 
 	 */
 	public function prevent_route_caching() {
 
-		if ( ! defined( 'DONOTCACHEPAGE' ) ) {
-			define( 'DONOTCACHEPAGE', true ); // Play nice with WP-Super-Cache.
+		if ( ! defined('DONOTCACHEPAGE')) {
+			define('DONOTCACHEPAGE', true); // Play nice with WP-Super-Cache.
 		}
 
 		// Prevent our REST API endpoint responses from being added to browser cache.
-		add_filter( 'rest_post_dispatch', array( $this, 'send_nocache_header' ), PHP_INT_MAX, 2 );
+		add_filter('rest_post_dispatch', array($this, 'send_nocache_header'), PHP_INT_MAX, 2);
 	}
 
 	/**
@@ -159,9 +159,9 @@ 
 	 *
 	 * @return WP_REST_Response passthrough $response parameter
 	 */
-	public function send_nocache_header( $response, $server ) {
+	public function send_nocache_header($response, $server) {
 
-		$server->send_header( 'Cache-Control', 'no-cache, must-revalidate, max-age=0' );
+		$server->send_header('Cache-Control', 'no-cache, must-revalidate, max-age=0');
 
 		return $response;
 	}

includes/connect/class-wc-stripe-connect.php

Spacing +44 added lines, -44 removed lines

@@ -1,10 +1,10 @@ 
 <?php
 
-if ( ! defined( 'ABSPATH' ) ) {
+if ( ! defined('ABSPATH')) {
 	exit;
 }
 
-if ( ! class_exists( 'WC_Stripe_Connect' ) ) {
+if ( ! class_exists('WC_Stripe_Connect')) {
 	/**
 	 * Stripe Connect class.
 	 */
@@ -24,10 +24,10 @@ 
 		 *
 		 * @param WC_Stripe_Connect_API $api stripe connect api.
 		 */
-		public function __construct( WC_Stripe_Connect_API $api ) {
+		public function __construct(WC_Stripe_Connect_API $api) {
 			$this->api = $api;
 
-			add_action( 'admin_init', array( $this, 'maybe_handle_redirect' ) );
+			add_action('admin_init', array($this, 'maybe_handle_redirect'));
 		}
 
 		/**
@@ -37,19 +37,19 @@ 
 		 *
 		 * @return string|WP_Error
 		 */
-		public function get_oauth_url( $return_url = '' ) {
+		public function get_oauth_url($return_url = '') {
 
-			if ( empty( $return_url ) ) {
-				$return_url = admin_url( 'admin.php?page=wc-settings&tab=checkout&section=stripe' );
+			if (empty($return_url)) {
+				$return_url = admin_url('admin.php?page=wc-settings&tab=checkout&section=stripe');
 			}
 
-			if ( substr( $return_url, 0, 8 ) !== 'https://' ) {
-				return new WP_Error( 'invalid_url_protocol', __( 'Your site must be served over HTTPS in order to connect your Stripe account automatically.', 'woocommerce-gateway-stripe' ) );
+			if (substr($return_url, 0, 8) !== 'https://') {
+				return new WP_Error('invalid_url_protocol', __('Your site must be served over HTTPS in order to connect your Stripe account automatically.', 'woocommerce-gateway-stripe'));
 			}
 
-			$result = $this->api->get_stripe_oauth_init( $return_url );
+			$result = $this->api->get_stripe_oauth_init($return_url);
 
-			if ( is_wp_error( $result ) ) {
+			if (is_wp_error($result)) {
 				return $result;
 			}
 
@@ -64,37 +64,37 @@ 
 		 *
 		 * @return string|WP_Error
 		 */
-		public function connect_oauth( $state, $code ) {
+		public function connect_oauth($state, $code) {
 
-			$response = $this->api->get_stripe_oauth_keys( $code );
+			$response = $this->api->get_stripe_oauth_keys($code);
 
-			if ( is_wp_error( $response ) ) {
+			if (is_wp_error($response)) {
 				return $response;
 			}
 
-			return $this->save_stripe_keys( $response );
+			return $this->save_stripe_keys($response);
 		}
 
 		/**
 		 * Handle redirect back from oauth-init or credentials reset
 		 */
 		public function maybe_handle_redirect() {
-			if ( ! is_admin() ) {
+			if ( ! is_admin()) {
 				return;
 			}
 
 			// redirect from oauth-init
-			if ( isset( $_GET['wcs_stripe_code'], $_GET['wcs_stripe_state'] ) ) {
+			if (isset($_GET['wcs_stripe_code'], $_GET['wcs_stripe_state'])) {
 
-				$response = $this->connect_oauth( $_GET['wcs_stripe_state'], $_GET['wcs_stripe_code'] );
-				wp_safe_redirect( remove_query_arg( array( 'wcs_stripe_state', 'wcs_stripe_code' ) ) );
+				$response = $this->connect_oauth($_GET['wcs_stripe_state'], $_GET['wcs_stripe_code']);
+				wp_safe_redirect(remove_query_arg(array('wcs_stripe_state', 'wcs_stripe_code')));
 				exit;
 
 			// redirect from credentials reset
-			} elseif ( isset( $_GET['reset_stripe_api_credentials'], $_GET['_wpnonce'] ) ) {
+			} elseif (isset($_GET['reset_stripe_api_credentials'], $_GET['_wpnonce'])) {
 
-				if ( ! wp_verify_nonce( $_GET['_wpnonce'], 'reset_stripe_api_credentials' ) ) {
-					die( __( 'You are not authorized to clear Stripe account keys.', 'woocommerce-gateway-stripe' ) );
+				if ( ! wp_verify_nonce($_GET['_wpnonce'], 'reset_stripe_api_credentials')) {
+					die(__('You are not authorized to clear Stripe account keys.', 'woocommerce-gateway-stripe'));
 				}
 
 				$this->clear_stripe_keys();
@@ -118,27 +118,27 @@ 
 		 *
 		 * @return array|WP_Error
 		 */
-		private function save_stripe_keys( $result ) {
+		private function save_stripe_keys($result) {
 
-			if ( ! isset( $result->publishableKey, $result->secretKey ) ) { // phpcs:ignore WordPress.NamingConventions.ValidVariableName.UsedPropertyNotSnakeCase
-				return new WP_Error( 'Invalid credentials received from WooCommerce Connect server' );
+			if ( ! isset($result->publishableKey, $result->secretKey)) { // phpcs:ignore WordPress.NamingConventions.ValidVariableName.UsedPropertyNotSnakeCase
+				return new WP_Error('Invalid credentials received from WooCommerce Connect server');
 			}
 
-			$is_test                                = false !== strpos( $result->publishableKey, '_test_' ); // phpcs:ignore WordPress.NamingConventions.ValidVariableName.UsedPropertyNotSnakeCase
+			$is_test                                = false !== strpos($result->publishableKey, '_test_'); // phpcs:ignore WordPress.NamingConventions.ValidVariableName.UsedPropertyNotSnakeCase
 			$prefix                                 = $is_test ? 'test_' : '';
 			$default_options                        = $this->get_default_stripe_config();
-			$options                                = array_merge( $default_options, get_option( self::SETTINGS_OPTION, array() ) );
+			$options                                = array_merge($default_options, get_option(self::SETTINGS_OPTION, array()));
 			$options['enabled']                     = 'yes';
 			$options['testmode']                    = $is_test ? 'yes' : 'no';
-			$options[ $prefix . 'publishable_key' ] = $result->publishableKey; // phpcs:ignore WordPress.NamingConventions.ValidVariableName.UsedPropertyNotSnakeCase
-			$options[ $prefix . 'secret_key' ]      = $result->secretKey; // phpcs:ignore WordPress.NamingConventions.ValidVariableName.UsedPropertyNotSnakeCase
+			$options[$prefix . 'publishable_key'] = $result->publishableKey; // phpcs:ignore WordPress.NamingConventions.ValidVariableName.UsedPropertyNotSnakeCase
+			$options[$prefix . 'secret_key']      = $result->secretKey; // phpcs:ignore WordPress.NamingConventions.ValidVariableName.UsedPropertyNotSnakeCase
 
 			// While we are at it, let's also clear the account_id and
 			// test_account_id if present.
-			unset( $options['account_id'] );
-			unset( $options['test_account_id'] );
+			unset($options['account_id']);
+			unset($options['test_account_id']);
 
-			update_option( self::SETTINGS_OPTION, $options );
+			update_option(self::SETTINGS_OPTION, $options);
 
 			return $result;
 		}
@@ -148,21 +148,21 @@ 
 		 */
 		private function clear_stripe_keys() {
 
-			$options = get_option( self::SETTINGS_OPTION, array() );
+			$options = get_option(self::SETTINGS_OPTION, array());
 
-			if ( 'yes' === $options['testmode'] ) {
+			if ('yes' === $options['testmode']) {
 				$options['test_publishable_key'] = '';
 				$options['test_secret_key']      = '';
 				// clear test_account_id if present
-				unset( $options['test_account_id'] );
+				unset($options['test_account_id']);
 			} else {
 				$options['publishable_key'] = '';
 				$options['secret_key']      = '';
 				// clear account_id if present
-				unset( $options['account_id'] );
+				unset($options['account_id']);
 			}
 
-			update_option( self::SETTINGS_OPTION, $options );
+			update_option(self::SETTINGS_OPTION, $options);
 
 		}
 
@@ -173,9 +173,9 @@ 
 
 			$result = array();
 			$gateway = new WC_Gateway_Stripe();
-			foreach ( $gateway->form_fields as $key => $value ) {
-				if ( isset( $value['default'] ) ) {
-					$result[ $key ] = $value['default'];
+			foreach ($gateway->form_fields as $key => $value) {
+				if (isset($value['default'])) {
+					$result[$key] = $value['default'];
 				}
 			}
 
@@ -184,12 +184,12 @@ 
 
 		public function is_connected() {
 
-			$options = get_option( self::SETTINGS_OPTION, array() );
+			$options = get_option(self::SETTINGS_OPTION, array());
 
-			if ( isset( $options['testmode'] ) && 'yes' === $options['testmode'] ) {
-				return isset( $options['test_publishable_key'], $options['test_secret_key'] ) && trim( $options['test_publishable_key'] ) && trim( $options['test_secret_key'] );
+			if (isset($options['testmode']) && 'yes' === $options['testmode']) {
+				return isset($options['test_publishable_key'], $options['test_secret_key']) && trim($options['test_publishable_key']) && trim($options['test_secret_key']);
 			} else {
-				return isset( $options['publishable_key'], $options['secret_key'] ) && trim( $options['publishable_key'] ) && trim( $options['secret_key'] );
+				return isset($options['publishable_key'], $options['secret_key']) && trim($options['publishable_key']) && trim($options['secret_key']);
 			}
 		}
 	}

includes/connect/class-wc-stripe-connect-api.php

Spacing +47 added lines, -47 removed lines

@@ -1,13 +1,13 @@ 
 <?php
-if ( ! defined( 'ABSPATH' ) ) {
+if ( ! defined('ABSPATH')) {
 	exit;
 }
 
-if ( ! defined( 'WOOCOMMERCE_CONNECT_SERVER_URL' ) ) {
-	define( 'WOOCOMMERCE_CONNECT_SERVER_URL', 'https://api.woocommerce.com/' );
+if ( ! defined('WOOCOMMERCE_CONNECT_SERVER_URL')) {
+	define('WOOCOMMERCE_CONNECT_SERVER_URL', 'https://api.woocommerce.com/');
 }
 
-if ( ! class_exists( 'WC_Stripe_Connect_API' ) ) {
+if ( ! class_exists('WC_Stripe_Connect_API')) {
 	/**
 	 * Stripe Connect API class.
 	 */
@@ -22,12 +22,12 @@ 
 		 *
 		 * @return array
 		 */
-		public function get_stripe_oauth_init( $return_url ) {
+		public function get_stripe_oauth_init($return_url) {
 
 			$current_user                   = wp_get_current_user();
 			$business_data                  = array();
 			$business_data['url']           = get_site_url();
-			$business_data['business_name'] = html_entity_decode( get_bloginfo( 'name' ), ENT_QUOTES );
+			$business_data['business_name'] = html_entity_decode(get_bloginfo('name'), ENT_QUOTES);
 			$business_data['first_name']    = $current_user->user_firstname;
 			$business_data['last_name']     = $current_user->user_lastname;
 			$business_data['phone']         = '';
@@ -35,7 +35,7 @@ 
 
 			$wc_countries = WC()->countries;
 
-			if ( method_exists( $wc_countries, 'get_base_address' ) ) {
+			if (method_exists($wc_countries, 'get_base_address')) {
 				$business_data['country']        = $wc_countries->get_base_country();
 				$business_data['street_address'] = $wc_countries->get_base_address();
 				$business_data['city']           = $wc_countries->get_base_city();
@@ -55,7 +55,7 @@ 
 				'businessData' => $business_data,
 			);
 
-			return $this->request( 'POST', '/stripe/oauth-init', $request );
+			return $this->request('POST', '/stripe/oauth-init', $request);
 		}
 
 		/**
@@ -65,11 +65,11 @@ 
 		 *
 		 * @return array
 		 */
-		public function get_stripe_oauth_keys( $code ) {
+		public function get_stripe_oauth_keys($code) {
 
-			$request = array( 'code' => $code );
+			$request = array('code' => $code);
 
-			return $this->request( 'POST', '/stripe/oauth-keys', $request );
+			return $this->request('POST', '/stripe/oauth-keys', $request);
 		}
 
 		/**
@@ -81,39 +81,39 @@ 
 		 *
 		 * @return array|WP_Error
 		 */
-		protected function request( $method, $path, $body = array() ) {
+		protected function request($method, $path, $body = array()) {
 
-			if ( ! is_array( $body ) ) {
+			if ( ! is_array($body)) {
 				return new WP_Error(
 					'request_body_should_be_array',
-					__( 'Unable to send request to WooCommerce Connect server. Body must be an array.', 'woocommerce-gateway-stripe' )
+					__('Unable to send request to WooCommerce Connect server. Body must be an array.', 'woocommerce-gateway-stripe')
 				);
 			}
 
-			$url = trailingslashit( WOOCOMMERCE_CONNECT_SERVER_URL );
-			$url = apply_filters( 'wc_connect_server_url', $url );
-			$url = trailingslashit( $url ) . ltrim( $path, '/' );
+			$url = trailingslashit(WOOCOMMERCE_CONNECT_SERVER_URL);
+			$url = apply_filters('wc_connect_server_url', $url);
+			$url = trailingslashit($url) . ltrim($path, '/');
 
 			// Add useful system information to requests that contain bodies.
-			if ( in_array( $method, array( 'POST', 'PUT' ), true ) ) {
-				$body = $this->request_body( $body );
-				$body = wp_json_encode( apply_filters( 'wc_connect_api_client_body', $body ) );
+			if (in_array($method, array('POST', 'PUT'), true)) {
+				$body = $this->request_body($body);
+				$body = wp_json_encode(apply_filters('wc_connect_api_client_body', $body));
 
-				if ( ! $body ) {
+				if ( ! $body) {
 					return new WP_Error(
 						'unable_to_json_encode_body',
-						__( 'Unable to encode body for request to WooCommerce Connect server.', 'woocommerce-gateway-stripe' )
+						__('Unable to encode body for request to WooCommerce Connect server.', 'woocommerce-gateway-stripe')
 					);
 				}
 			}
 
 			$headers = $this->request_headers();
-			if ( is_wp_error( $headers ) ) {
+			if (is_wp_error($headers)) {
 				return $headers;
 			}
 
 			$http_timeout = 60; // 1 minute
-			wc_set_time_limit( $http_timeout + 10 );
+			wc_set_time_limit($http_timeout + 10);
 			$args = array(
 				'headers'     => $headers,
 				'method'      => $method,
@@ -123,18 +123,18 @@ 
 				'timeout'     => $http_timeout,
 			);
 
-			$args          = apply_filters( 'wc_connect_request_args', $args );
-			$response      = wp_remote_request( $url, $args );
-			$response_code = wp_remote_retrieve_response_code( $response );
-			$content_type  = wp_remote_retrieve_header( $response, 'content-type' );
+			$args          = apply_filters('wc_connect_request_args', $args);
+			$response      = wp_remote_request($url, $args);
+			$response_code = wp_remote_retrieve_response_code($response);
+			$content_type  = wp_remote_retrieve_header($response, 'content-type');
 
-			if ( false === strpos( $content_type, 'application/json' ) ) {
-				if ( 200 !== $response_code ) {
+			if (false === strpos($content_type, 'application/json')) {
+				if (200 !== $response_code) {
 					return new WP_Error(
 						'wcc_server_error',
 						sprintf(
 							// Translators: HTTP error code.
-							__( 'Error: The WooCommerce Connect server returned HTTP code: %d', 'woocommerce-gateway-stripe' ),
+							__('Error: The WooCommerce Connect server returned HTTP code: %d', 'woocommerce-gateway-stripe'),
 							$response_code
 						)
 					);
@@ -143,39 +143,39 @@ 
 						'wcc_server_error_content_type',
 						sprintf(
 							// Translators: content-type error code.
-							__( 'Error: The WooCommerce Connect server returned an invalid content-type: %s.', 'woocommerce-gateway-stripe' ),
+							__('Error: The WooCommerce Connect server returned an invalid content-type: %s.', 'woocommerce-gateway-stripe'),
 							$content_type
 						)
 					);
 				}
 			}
 
-			$response_body = wp_remote_retrieve_body( $response );
-			if ( ! empty( $response_body ) ) {
-				$response_body = json_decode( $response_body );
+			$response_body = wp_remote_retrieve_body($response);
+			if ( ! empty($response_body)) {
+				$response_body = json_decode($response_body);
 			}
 
-			if ( 200 !== $response_code ) {
-				if ( empty( $response_body ) ) {
+			if (200 !== $response_code) {
+				if (empty($response_body)) {
 					return new WP_Error(
 						'wcc_server_empty_response',
 						sprintf(
 							// Translators: HTTP error code.
-							__( 'Error: The WooCommerce Connect server returned ( %d ) and an empty response body.', 'woocommerce-gateway-stripe' ),
+							__('Error: The WooCommerce Connect server returned ( %d ) and an empty response body.', 'woocommerce-gateway-stripe'),
 							$response_code
 						)
 					);
 				}
 
-				$error   = property_exists( $response_body, 'error' ) ? $response_body->error : '';
-				$message = property_exists( $response_body, 'message' ) ? $response_body->message : '';
-				$data    = property_exists( $response_body, 'data' ) ? $response_body->data : '';
+				$error   = property_exists($response_body, 'error') ? $response_body->error : '';
+				$message = property_exists($response_body, 'message') ? $response_body->message : '';
+				$data    = property_exists($response_body, 'data') ? $response_body->data : '';
 
 				return new WP_Error(
 					'wcc_server_error_response',
 					sprintf(
 						/* translators: %1$s: error code, %2$s: error message, %3$d: HTTP response code */
-						__( 'Error: The WooCommerce Connect server returned: %1$s %2$s ( %3$d )', 'woocommerce-gateway-stripe' ),
+						__('Error: The WooCommerce Connect server returned: %1$s %2$s ( %3$d )', 'woocommerce-gateway-stripe'),
 						$error,
 						$message,
 						$response_code
@@ -194,13 +194,13 @@ 
 		 *
 		 * @return array
 		 */
-		protected function request_body( $initial_body = array() ) {
+		protected function request_body($initial_body = array()) {
 
 			$default_body = array(
 				'settings' => array(),
 			);
 
-			$body = array_merge( $default_body, $initial_body );
+			$body = array_merge($default_body, $initial_body);
 
 			// Add interesting fields to the body of each request.
 			$body['settings'] = wp_parse_args(
@@ -213,7 +213,7 @@ 
 					'currency'       => get_woocommerce_currency(),
 					'stripe_version' => WC_STRIPE_VERSION,
 					'wc_version'     => WC()->version,
-					'wp_version'     => get_bloginfo( 'version' ),
+					'wp_version'     => get_bloginfo('version'),
 				)
 			);
 
@@ -228,8 +228,8 @@ 
 		protected function request_headers() {
 
 			$headers                    = array();
-			$locale                     = strtolower( str_replace( '_', '-', get_locale() ) );
-			$locale_elements            = explode( '-', $locale );
+			$locale                     = strtolower(str_replace('_', '-', get_locale()));
+			$locale_elements            = explode('-', $locale);
 			$lang                       = $locale_elements[0];
 			$headers['Accept-Language'] = $locale . ',' . $lang;
 			$headers['Content-Type']    = 'application/json; charset=utf-8';