woocommerce / woocommerce-gateway-stripe

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/bootstrap.php

Spacing +13 added lines, -13 removed lines

@@ -1,28 +1,28 @@
 <?php
-$_tests_dir = getenv( 'WP_TESTS_DIR' );
-if ( ! $_tests_dir ) {
+$_tests_dir = getenv('WP_TESTS_DIR');
+if ( ! $_tests_dir) {
 	$_tests_dir = '/tmp/wordpress-tests-lib';
 }
 
 require_once $_tests_dir . '/includes/functions.php';
 
 function _manually_load_plugin() {
-	$plugin_dir = dirname( dirname( dirname( dirname( __FILE__ ) ) ) ) . '/';
+	$plugin_dir = dirname(dirname(dirname(dirname(__FILE__)))) . '/';
 	require $plugin_dir . 'woocommerce/woocommerce.php';
-	require dirname( __FILE__ ) . '/setup.php';
+	require dirname(__FILE__) . '/setup.php';
 	require $plugin_dir . 'woocommerce-gateway-stripe/woocommerce-gateway-stripe.php';
 }
 
-tests_add_filter( 'muplugins_loaded', '_manually_load_plugin' );
+tests_add_filter('muplugins_loaded', '_manually_load_plugin');
 
 require $_tests_dir . '/includes/bootstrap.php';
 
-$wc_tests_framework_base_dir = dirname( dirname( dirname( dirname( __FILE__ ) ) ) ) . '/woocommerce/tests/framework/';
-require_once( $wc_tests_framework_base_dir . 'class-wc-mock-session-handler.php' );
+$wc_tests_framework_base_dir = dirname(dirname(dirname(dirname(__FILE__)))) . '/woocommerce/tests/framework/';
+require_once($wc_tests_framework_base_dir . 'class-wc-mock-session-handler.php');
 //require_once( $wc_tests_framework_base_dir . 'class-wc-unit-test-case.php' );
-require_once( $wc_tests_framework_base_dir . 'helpers/class-wc-helper-product.php' );
-require_once( $wc_tests_framework_base_dir . 'helpers/class-wc-helper-coupon.php' );
-require_once( $wc_tests_framework_base_dir . 'helpers/class-wc-helper-fee.php' );
-require_once( $wc_tests_framework_base_dir . 'helpers/class-wc-helper-shipping.php' );
-require_once( $wc_tests_framework_base_dir . 'helpers/class-wc-helper-customer.php' );
-require_once( $wc_tests_framework_base_dir . 'helpers/class-wc-helper-order.php' );
+require_once($wc_tests_framework_base_dir . 'helpers/class-wc-helper-product.php');
+require_once($wc_tests_framework_base_dir . 'helpers/class-wc-helper-coupon.php');
+require_once($wc_tests_framework_base_dir . 'helpers/class-wc-helper-fee.php');
+require_once($wc_tests_framework_base_dir . 'helpers/class-wc-helper-shipping.php');
+require_once($wc_tests_framework_base_dir . 'helpers/class-wc-helper-customer.php');
+require_once($wc_tests_framework_base_dir . 'helpers/class-wc-helper-order.php');

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/class-wc-stripe-apple-pay-registration.php

Braces +5 added lines, -2 removed lines

@@ -328,8 +328,11 @@
 		<div class="error stripe-apple-pay-message">
 			<?php if ( $empty_notice ) : ?>
 				<p><?php echo esc_html( $verification_failed_without_error ); ?></p>
-			<?php else : ?>
-				<p><?php echo esc_html( $verification_failed_with_error ); ?></p>
+			<?php else {
+	: ?>
+				<p><?php echo esc_html( $verification_failed_with_error );
+}
+?></p>
 				<p><i><?php echo wp_kses( make_clickable( esc_html( $this->apple_pay_verify_notice ) ), $allowed_html ); ?></i></p>
 			<?php endif; ?>
 			<p><?php echo $check_log_text; ?></p>

Doc Comments +2 added lines, -2 removed lines

@@ -69,7 +69,7 @@ 
 	 * Whether the gateway and Payment Request Button (prerequisites for Apple Pay) are enabled.
 	 *
 	 * @since 4.5.4
-	 * @return string Whether Apple Pay required settings are enabled.
+	 * @return boolean Whether Apple Pay required settings are enabled.
 	 */
 	private function is_enabled() {
 		$stripe_enabled                 = 'yes' === $this->get_option( 'enabled', 'no' );
@@ -103,7 +103,7 @@ 
 	 * Add to the list of publicly allowed query variables.
 	 *
 	 * @param  array $query_vars - provided public query vars.
-	 * @return array Updated public query vars.
+	 * @return string[] Updated public query vars.
 	 */
 	public function whitelist_domain_association_query_param( $query_vars ) {
 		$query_vars[] = 'apple-developer-merchantid-domain-association';

Spacing +60 added lines, -60 removed lines

@@ -5,7 +5,7 @@ 
  * @since 4.0.6
  */
 
-if ( ! defined( 'ABSPATH' ) ) {
+if ( ! defined('ABSPATH')) {
 	exit;
 }
 
@@ -32,17 +32,17 @@ 
 	public $apple_pay_verify_notice;
 
 	public function __construct() {
-		add_action( 'init', array( $this, 'add_domain_association_rewrite_rule' ) );
-		add_filter( 'query_vars', array( $this, 'whitelist_domain_association_query_param' ), 10, 1 );
-		add_action( 'parse_request', array( $this, 'parse_domain_association_request' ), 10, 1 );
+		add_action('init', array($this, 'add_domain_association_rewrite_rule'));
+		add_filter('query_vars', array($this, 'whitelist_domain_association_query_param'), 10, 1);
+		add_action('parse_request', array($this, 'parse_domain_association_request'), 10, 1);
 
-		add_action( 'woocommerce_stripe_updated', array( $this, 'verify_domain_if_configured' ) );
-		add_action( 'add_option_woocommerce_stripe_settings', array( $this, 'verify_domain_on_new_settings' ), 10, 2 );
-		add_action( 'update_option_woocommerce_stripe_settings', array( $this, 'verify_domain_on_updated_settings' ), 10, 2 );
-		add_action( 'admin_notices', array( $this, 'admin_notices' ) );
+		add_action('woocommerce_stripe_updated', array($this, 'verify_domain_if_configured'));
+		add_action('add_option_woocommerce_stripe_settings', array($this, 'verify_domain_on_new_settings'), 10, 2);
+		add_action('update_option_woocommerce_stripe_settings', array($this, 'verify_domain_on_updated_settings'), 10, 2);
+		add_action('admin_notices', array($this, 'admin_notices'));
 
-		$this->stripe_settings         = get_option( 'woocommerce_stripe_settings', array() );
-		$this->apple_pay_domain_set    = 'yes' === $this->get_option( 'apple_pay_domain_set', 'no' );
+		$this->stripe_settings         = get_option('woocommerce_stripe_settings', array());
+		$this->apple_pay_domain_set    = 'yes' === $this->get_option('apple_pay_domain_set', 'no');
 		$this->apple_pay_verify_notice = '';
 	}
 
@@ -54,13 +54,13 @@ 
 	 * @param string default
 	 * @return string $setting_value
 	 */
-	public function get_option( $setting = '', $default = '' ) {
-		if ( empty( $this->stripe_settings ) ) {
+	public function get_option($setting = '', $default = '') {
+		if (empty($this->stripe_settings)) {
 			return $default;
 		}
 
-		if ( ! empty( $this->stripe_settings[ $setting ] ) ) {
-			return $this->stripe_settings[ $setting ];
+		if ( ! empty($this->stripe_settings[$setting])) {
+			return $this->stripe_settings[$setting];
 		}
 
 		return $default;
@@ -73,8 +73,8 @@ 
 	 * @return string Whether Apple Pay required settings are enabled.
 	 */
 	private function is_enabled() {
-		$stripe_enabled                 = 'yes' === $this->get_option( 'enabled', 'no' );
-		$payment_request_button_enabled = 'yes' === $this->get_option( 'payment_request', 'yes' );
+		$stripe_enabled                 = 'yes' === $this->get_option('enabled', 'no');
+		$payment_request_button_enabled = 'yes' === $this->get_option('payment_request', 'yes');
 
 		return $stripe_enabled && $payment_request_button_enabled;
 	}
@@ -86,8 +86,8 @@ 
 	 * @return string Secret key.
 	 */
 	private function get_secret_key() {
-		$testmode = 'yes' === $this->get_option( 'testmode', 'no' );
-		return $testmode ? $this->get_option( 'test_secret_key' ) : $this->get_option( 'secret_key' );
+		$testmode = 'yes' === $this->get_option('testmode', 'no');
+		return $testmode ? $this->get_option('test_secret_key') : $this->get_option('secret_key');
 	}
 
 	/**
@@ -97,7 +97,7 @@ 
 		$regex    = '^\.well-known\/apple-developer-merchantid-domain-association$';
 		$redirect = 'index.php?apple-developer-merchantid-domain-association=1';
 
-		add_rewrite_rule( $regex, $redirect, 'top' );
+		add_rewrite_rule($regex, $redirect, 'top');
 	}
 
 	/**
@@ -106,7 +106,7 @@ 
 	 * @param  array $query_vars - provided public query vars.
 	 * @return array Updated public query vars.
 	 */
-	public function whitelist_domain_association_query_param( $query_vars ) {
+	public function whitelist_domain_association_query_param($query_vars) {
 		$query_vars[] = 'apple-developer-merchantid-domain-association';
 		return $query_vars;
 	}
@@ -116,17 +116,17 @@ 
 	 *
 	 * @param WP WordPress environment object.
 	 */
-	public function parse_domain_association_request( $wp ) {
+	public function parse_domain_association_request($wp) {
 		if (
-			! isset( $wp->query_vars['apple-developer-merchantid-domain-association'] ) ||
+			! isset($wp->query_vars['apple-developer-merchantid-domain-association']) ||
 			'1' !== $wp->query_vars['apple-developer-merchantid-domain-association']
 		) {
 			return;
 		}
 
 		$path = WC_STRIPE_PLUGIN_PATH . '/apple-developer-merchantid-domain-association';
-		header( 'Content-Type: application/octet-stream' );
-		echo esc_html( file_get_contents( $path ) );
+		header('Content-Type: application/octet-stream');
+		echo esc_html(file_get_contents($path));
 		exit;
 	}
 
@@ -137,9 +137,9 @@ 
 	 * @version 4.5.4
 	 * @param string $secret_key
 	 */
-	private function make_domain_registration_request( $secret_key ) {
-		if ( empty( $secret_key ) ) {
-			throw new Exception( __( 'Unable to verify domain - missing secret key.', 'woocommerce-gateway-stripe' ) );
+	private function make_domain_registration_request($secret_key) {
+		if (empty($secret_key)) {
+			throw new Exception(__('Unable to verify domain - missing secret key.', 'woocommerce-gateway-stripe'));
 		}
 
 		$endpoint = 'https://api.stripe.com/v1/apple_pay/domains';
@@ -157,22 +157,22 @@ 
 			$endpoint,
 			array(
 				'headers' => $headers,
-				'body'    => http_build_query( $data ),
+				'body'    => http_build_query($data),
 			)
 		);
 
-		if ( is_wp_error( $response ) ) {
+		if (is_wp_error($response)) {
 			/* translators: error message */
-			throw new Exception( sprintf( __( 'Unable to verify domain - %s', 'woocommerce-gateway-stripe' ), $response->get_error_message() ) );
+			throw new Exception(sprintf(__('Unable to verify domain - %s', 'woocommerce-gateway-stripe'), $response->get_error_message()));
 		}
 
-		if ( 200 !== $response['response']['code'] ) {
-			$parsed_response = json_decode( $response['body'] );
+		if (200 !== $response['response']['code']) {
+			$parsed_response = json_decode($response['body']);
 
 			$this->apple_pay_verify_notice = $parsed_response->error->message;
 
 			/* translators: error message */
-			throw new Exception( sprintf( __( 'Unable to verify domain - %s', 'woocommerce-gateway-stripe' ), $parsed_response->error->message ) );
+			throw new Exception(sprintf(__('Unable to verify domain - %s', 'woocommerce-gateway-stripe'), $parsed_response->error->message));
 		}
 	}
 
@@ -186,27 +186,27 @@ 
 	 *
 	 * @return bool Whether domain verification succeeded.
 	 */
-	public function register_domain_with_apple( $secret_key ) {
+	public function register_domain_with_apple($secret_key) {
 		try {
-			$this->make_domain_registration_request( $secret_key );
+			$this->make_domain_registration_request($secret_key);
 
 			// No errors to this point, verification success!
 			$this->stripe_settings['apple_pay_domain_set'] = 'yes';
 			$this->apple_pay_domain_set                    = true;
 
-			update_option( 'woocommerce_stripe_settings', $this->stripe_settings );
+			update_option('woocommerce_stripe_settings', $this->stripe_settings);
 
-			WC_Stripe_Logger::log( 'Your domain has been verified with Apple Pay!' );
+			WC_Stripe_Logger::log('Your domain has been verified with Apple Pay!');
 
 			return true;
 
-		} catch ( Exception $e ) {
+		} catch (Exception $e) {
 			$this->stripe_settings['apple_pay_domain_set'] = 'no';
 			$this->apple_pay_domain_set                    = false;
 
-			update_option( 'woocommerce_stripe_settings', $this->stripe_settings );
+			update_option('woocommerce_stripe_settings', $this->stripe_settings);
 
-			WC_Stripe_Logger::log( 'Error: ' . $e->getMessage() );
+			WC_Stripe_Logger::log('Error: ' . $e->getMessage());
 
 			return false;
 		}
@@ -221,7 +221,7 @@ 
 	public function verify_domain_if_configured() {
 		$secret_key = $this->get_secret_key();
 
-		if ( ! $this->is_enabled() || empty( $secret_key ) ) {
+		if ( ! $this->is_enabled() || empty($secret_key)) {
 			return;
 		}
 
@@ -229,10 +229,10 @@ 
 		flush_rewrite_rules();
 
 		// Register the domain with Apple Pay.
-		$verification_complete = $this->register_domain_with_apple( $secret_key );
+		$verification_complete = $this->register_domain_with_apple($secret_key);
 
 		// Show/hide notes if necessary.
-		WC_Stripe_Inbox_Notes::notify_on_apple_pay_domain_verification( $verification_complete );
+		WC_Stripe_Inbox_Notes::notify_on_apple_pay_domain_verification($verification_complete);
 	}
 
 	/**
@@ -241,8 +241,8 @@ 
 	 * @since 4.5.4
 	 * @version 4.5.4
 	 */
-	public function verify_domain_on_new_settings( $option, $settings ) {
-		$this->verify_domain_on_updated_settings( array(), $settings );
+	public function verify_domain_on_new_settings($option, $settings) {
+		$this->verify_domain_on_updated_settings(array(), $settings);
 	}
 
 	/**
@@ -251,7 +251,7 @@ 
 	 * @since 4.5.3
 	 * @version 4.5.4
 	 */
-	public function verify_domain_on_updated_settings( $prev_settings, $settings ) {
+	public function verify_domain_on_updated_settings($prev_settings, $settings) {
 		// Grab previous state and then update cached settings.
 		$this->stripe_settings = $prev_settings;
 		$prev_secret_key       = $this->get_secret_key();
@@ -259,7 +259,7 @@ 
 		$this->stripe_settings = $settings;
 
 		// If Stripe or Payment Request Button wasn't enabled (or secret key was different) then might need to verify now.
-		if ( ! $prev_is_enabled || ( $this->get_secret_key() !== $prev_secret_key ) ) {
+		if ( ! $prev_is_enabled || ($this->get_secret_key() !== $prev_secret_key)) {
 			$this->verify_domain_if_configured();
 		}
 	}
@@ -270,16 +270,16 @@ 
 	 * @since 4.0.6
 	 */
 	public function admin_notices() {
-		if ( ! $this->is_enabled() ) {
+		if ( ! $this->is_enabled()) {
 			return;
 		}
 
-		if ( ! current_user_can( 'manage_woocommerce' ) ) {
+		if ( ! current_user_can('manage_woocommerce')) {
 			return;
 		}
 
-		$empty_notice = empty( $this->apple_pay_verify_notice );
-		if ( $empty_notice && ( $this->apple_pay_domain_set || empty( $this->secret_key ) ) ) {
+		$empty_notice = empty($this->apple_pay_verify_notice);
+		if ($empty_notice && ($this->apple_pay_domain_set || empty($this->secret_key))) {
 			return;
 		}
 
@@ -288,28 +288,28 @@ 
 		 * when setting screen is displayed. So if domain verification is not set,
 		 * something went wrong so lets notify user.
 		 */
-		$allowed_html                      = array(
+		$allowed_html = array(
 			'a' => array(
 				'href'  => array(),
 				'title' => array(),
 			),
 		);
-		$verification_failed_without_error = __( 'Apple Pay domain verification failed.', 'woocommerce-gateway-stripe' );
-		$verification_failed_with_error    = __( 'Apple Pay domain verification failed with the following error:', 'woocommerce-gateway-stripe' );
+		$verification_failed_without_error = __('Apple Pay domain verification failed.', 'woocommerce-gateway-stripe');
+		$verification_failed_with_error    = __('Apple Pay domain verification failed with the following error:', 'woocommerce-gateway-stripe');
 		$check_log_text                    = sprintf(
 			/* translators: 1) HTML anchor open tag 2) HTML anchor closing tag */
-			esc_html__( 'Please check the %1$slogs%2$s for more details on this issue. Logging must be enabled to see recorded logs.', 'woocommerce-gateway-stripe' ),
-			'<a href="' . admin_url( 'admin.php?page=wc-status&tab=logs' ) . '">',
+			esc_html__('Please check the %1$slogs%2$s for more details on this issue. Logging must be enabled to see recorded logs.', 'woocommerce-gateway-stripe'),
+			'<a href="' . admin_url('admin.php?page=wc-status&tab=logs') . '">',
 			'</a>'
 		);
 
 		?>
 		<div class="error stripe-apple-pay-message">
-			<?php if ( $empty_notice ) : ?>
-				<p><?php echo esc_html( $verification_failed_without_error ); ?></p>
+			<?php if ($empty_notice) : ?>
+				<p><?php echo esc_html($verification_failed_without_error); ?></p>
 			<?php else : ?>
-				<p><?php echo esc_html( $verification_failed_with_error ); ?></p>
-				<p><i><?php echo wp_kses( make_clickable( esc_html( $this->apple_pay_verify_notice ) ), $allowed_html ); ?></i></p>
+				<p><?php echo esc_html($verification_failed_with_error); ?></p>
+				<p><i><?php echo wp_kses(make_clickable(esc_html($this->apple_pay_verify_notice)), $allowed_html); ?></i></p>
 			<?php endif; ?>
 			<p><?php echo $check_log_text; ?></p>
 		</div>

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';