woocommerce / woocommerce-gateway-stripe

includes/compat/class-wc-stripe-subs-compat.php

Doc Comments +1 added lines, -1 removed lines

@@ -321,7 +321,7 @@
 
 	/**
 	 * Don't transfer Stripe fee/ID meta to renewal orders.
-	 * @param int $resubscribe_order The order created for the customer to resubscribe to the old expired/cancelled subscription
+	 * @param integer $renewal_order
 	 */
 	public function delete_renewal_meta( $renewal_order ) {
 		WC_Stripe_Helper::delete_stripe_fee( $renewal_order );

Spacing +201 added lines, -201 removed lines

@@ -1,5 +1,5 @@ 
 <?php
-if ( ! defined( 'ABSPATH' ) ) {
+if ( ! defined('ABSPATH')) {
 	exit;
 }
 
@@ -15,22 +15,22 @@ 
 	public function __construct() {
 		parent::__construct();
 
-		if ( class_exists( 'WC_Subscriptions_Order' ) ) {
-			add_action( 'woocommerce_scheduled_subscription_payment_' . $this->id, array( $this, 'scheduled_subscription_payment' ), 10, 2 );
-			add_action( 'wcs_resubscribe_order_created', array( $this, 'delete_resubscribe_meta' ), 10 );
-			add_action( 'wcs_renewal_order_created', array( $this, 'delete_renewal_meta' ), 10 );
-			add_action( 'woocommerce_subscription_failing_payment_method_updated_stripe', array( $this, 'update_failing_payment_method' ), 10, 2 );
-			add_action( 'wc_stripe_cards_payment_fields', array( $this, 'display_update_subs_payment_checkout' ) );
-			add_action( 'wc_stripe_add_payment_method_' . $this->id . '_success', array( $this, 'handle_add_payment_method_success' ), 10, 2 );
-			add_action( 'woocommerce_subscriptions_change_payment_before_submit', array( $this, 'differentiate_change_payment_method_form' ) );
+		if (class_exists('WC_Subscriptions_Order')) {
+			add_action('woocommerce_scheduled_subscription_payment_' . $this->id, array($this, 'scheduled_subscription_payment'), 10, 2);
+			add_action('wcs_resubscribe_order_created', array($this, 'delete_resubscribe_meta'), 10);
+			add_action('wcs_renewal_order_created', array($this, 'delete_renewal_meta'), 10);
+			add_action('woocommerce_subscription_failing_payment_method_updated_stripe', array($this, 'update_failing_payment_method'), 10, 2);
+			add_action('wc_stripe_cards_payment_fields', array($this, 'display_update_subs_payment_checkout'));
+			add_action('wc_stripe_add_payment_method_' . $this->id . '_success', array($this, 'handle_add_payment_method_success'), 10, 2);
+			add_action('woocommerce_subscriptions_change_payment_before_submit', array($this, 'differentiate_change_payment_method_form'));
 
 			// display the credit card used for a subscription in the "My Subscriptions" table
-			add_filter( 'woocommerce_my_subscriptions_payment_method', array( $this, 'maybe_render_subscription_payment_method' ), 10, 2 );
+			add_filter('woocommerce_my_subscriptions_payment_method', array($this, 'maybe_render_subscription_payment_method'), 10, 2);
 
 			// allow store managers to manually set Stripe as the payment method on a subscription
-			add_filter( 'woocommerce_subscription_payment_meta', array( $this, 'add_subscription_payment_meta' ), 10, 2 );
-			add_filter( 'woocommerce_subscription_validate_payment_meta', array( $this, 'validate_subscription_payment_meta' ), 10, 2 );
-			add_filter( 'wc_stripe_display_save_payment_method_checkbox', array( $this, 'maybe_hide_save_checkbox' ) );
+			add_filter('woocommerce_subscription_payment_meta', array($this, 'add_subscription_payment_meta'), 10, 2);
+			add_filter('woocommerce_subscription_validate_payment_meta', array($this, 'validate_subscription_payment_meta'), 10, 2);
+			add_filter('wc_stripe_display_save_payment_method_checkbox', array($this, 'maybe_hide_save_checkbox'));
 
 			/*
 			 * WC subscriptions hooks into the "template_redirect" hook with priority 100.
@@ -38,8 +38,8 @@ 
 			 * See: https://github.com/woocommerce/woocommerce-subscriptions/blob/99a75687e109b64cbc07af6e5518458a6305f366/includes/class-wcs-cart-renewal.php#L165
 			 * If we are in the "You just need to authorize SCA" flow, we don't want that redirection to happen.
 			 */
-			add_action( 'template_redirect', array( $this, 'remove_order_pay_var' ), 99 );
-			add_action( 'template_redirect', array( $this, 'restore_order_pay_var' ), 101 );
+			add_action('template_redirect', array($this, 'remove_order_pay_var'), 99);
+			add_action('template_redirect', array($this, 'restore_order_pay_var'), 101);
 		}
 	}
 
@@ -50,8 +50,8 @@ 
 	 * @since 4.0.0
 	 * @version 4.0.0
 	 */
-	public function maybe_hide_save_checkbox( $display_tokenization ) {
-		if ( WC_Subscriptions_Cart::cart_contains_subscription() ) {
+	public function maybe_hide_save_checkbox($display_tokenization) {
+		if (WC_Subscriptions_Cart::cart_contains_subscription()) {
 			return false;
 		}
 
@@ -63,8 +63,8 @@ 
 	 * @param  int  $order_id
 	 * @return boolean
 	 */
-	public function has_subscription( $order_id ) {
-		return ( function_exists( 'wcs_order_contains_subscription' ) && ( wcs_order_contains_subscription( $order_id ) || wcs_is_subscription( $order_id ) || wcs_order_contains_renewal( $order_id ) ) );
+	public function has_subscription($order_id) {
+		return (function_exists('wcs_order_contains_subscription') && (wcs_order_contains_subscription($order_id) || wcs_is_subscription($order_id) || wcs_order_contains_renewal($order_id)));
 	}
 
 	/**
@@ -74,7 +74,7 @@ 
 	 * @return bool
 	 */
 	public function is_subs_change_payment() {
-		return ( isset( $_GET['pay_for_order'] ) && isset( $_GET['change_payment_method'] ) );
+		return (isset($_GET['pay_for_order']) && isset($_GET['change_payment_method']));
 	}
 
 	/**
@@ -84,20 +84,20 @@ 
 	 * @since 4.1.11
 	 */
 	public function display_update_subs_payment_checkout() {
-		$subs_statuses = apply_filters( 'wc_stripe_update_subs_payment_method_card_statuses', array( 'active' ) );
+		$subs_statuses = apply_filters('wc_stripe_update_subs_payment_method_card_statuses', array('active'));
 		if (
-			apply_filters( 'wc_stripe_display_update_subs_payment_method_card_checkbox', true ) &&
-			wcs_user_has_subscription( get_current_user_id(), '', $subs_statuses ) &&
+			apply_filters('wc_stripe_display_update_subs_payment_method_card_checkbox', true) &&
+			wcs_user_has_subscription(get_current_user_id(), '', $subs_statuses) &&
 			is_add_payment_method_page()
 		) {
-			$label = esc_html( apply_filters( 'wc_stripe_save_to_subs_text', __( 'Update the Payment Method used for all of my active subscriptions.', 'woocommerce-gateway-stripe' ) ) );
-			$id    = sprintf( 'wc-%1$s-update-subs-payment-method-card', $this->id );
+			$label = esc_html(apply_filters('wc_stripe_save_to_subs_text', __('Update the Payment Method used for all of my active subscriptions.', 'woocommerce-gateway-stripe')));
+			$id    = sprintf('wc-%1$s-update-subs-payment-method-card', $this->id);
 			woocommerce_form_field(
 				$id,
 				array(
 					'type'    => 'checkbox',
 					'label'   => $label,
-					'default' => apply_filters( 'wc_stripe_save_to_subs_checked', false ),
+					'default' => apply_filters('wc_stripe_save_to_subs_checked', false),
 				)
 			);
 		}
@@ -110,22 +110,22 @@ 
 	 * @param string $source_id
 	 * @param object $source_object
 	 */
-	public function handle_add_payment_method_success( $source_id, $source_object ) {
-		if ( isset( $_POST[ 'wc-' . $this->id . '-update-subs-payment-method-card' ] ) ) {
+	public function handle_add_payment_method_success($source_id, $source_object) {
+		if (isset($_POST['wc-' . $this->id . '-update-subs-payment-method-card'])) {
 			$all_subs        = wcs_get_users_subscriptions();
-			$subs_statuses   = apply_filters( 'wc_stripe_update_subs_payment_method_card_statuses', array( 'active' ) );
-			$stripe_customer = new WC_Stripe_Customer( get_current_user_id() );
+			$subs_statuses   = apply_filters('wc_stripe_update_subs_payment_method_card_statuses', array('active'));
+			$stripe_customer = new WC_Stripe_Customer(get_current_user_id());
 
-			if ( ! empty( $all_subs ) ) {
-				foreach ( $all_subs as $sub ) {
-					if ( $sub->has_status( $subs_statuses ) ) {
+			if ( ! empty($all_subs)) {
+				foreach ($all_subs as $sub) {
+					if ($sub->has_status($subs_statuses)) {
 						WC_Subscriptions_Change_Payment_Gateway::update_payment_method(
 							$sub,
 							$this->id,
 							array(
 								'post_meta' => array(
-									'_stripe_source_id' => array( 'value' => $source_id ),
-									'_stripe_customer_id' => array( 'value' => $stripe_customer->get_id() ),
+									'_stripe_source_id' => array('value' => $source_id),
+									'_stripe_customer_id' => array('value' => $stripe_customer->get_id()),
 								),
 							)
 						);
@@ -152,24 +152,24 @@ 
 	 * @since 4.1.11 Remove 3DS check as it is not needed.
 	 * @param int $order_id
 	 */
-	public function change_subs_payment_method( $order_id ) {
+	public function change_subs_payment_method($order_id) {
 		try {
-			$subscription    = wc_get_order( $order_id );
-			$prepared_source = $this->prepare_source( get_current_user_id(), true );
+			$subscription    = wc_get_order($order_id);
+			$prepared_source = $this->prepare_source(get_current_user_id(), true);
 
-			$this->maybe_disallow_prepaid_card( $prepared_source );
-			$this->check_source( $prepared_source );
-			$this->save_source_to_order( $subscription, $prepared_source );
+			$this->maybe_disallow_prepaid_card($prepared_source);
+			$this->check_source($prepared_source);
+			$this->save_source_to_order($subscription, $prepared_source);
 
-			do_action( 'wc_stripe_change_subs_payment_method_success', $prepared_source->source, $prepared_source );
+			do_action('wc_stripe_change_subs_payment_method_success', $prepared_source->source, $prepared_source);
 
 			return array(
 				'result'   => 'success',
-				'redirect' => $this->get_return_url( $subscription ),
+				'redirect' => $this->get_return_url($subscription),
 			);
-		} catch ( WC_Stripe_Exception $e ) {
-			wc_add_notice( $e->getLocalizedMessage(), 'error' );
-			WC_Stripe_Logger::log( 'Error: ' . $e->getMessage() );
+		} catch (WC_Stripe_Exception $e) {
+			wc_add_notice($e->getLocalizedMessage(), 'error');
+			WC_Stripe_Logger::log('Error: ' . $e->getMessage());
 		}
 	}
 
@@ -178,16 +178,16 @@ 
 	 * @param  int $order_id
 	 * @return array
 	 */
-	public function process_payment( $order_id, $retry = true, $force_save_source = false, $previous_error = false, $use_order_source = false ) {
-		if ( $this->has_subscription( $order_id ) ) {
-			if ( $this->is_subs_change_payment() ) {
-				return $this->change_subs_payment_method( $order_id );
+	public function process_payment($order_id, $retry = true, $force_save_source = false, $previous_error = false, $use_order_source = false) {
+		if ($this->has_subscription($order_id)) {
+			if ($this->is_subs_change_payment()) {
+				return $this->change_subs_payment_method($order_id);
 			}
 
 			// Regular payment with force customer enabled
-			return parent::process_payment( $order_id, $retry, true, $previous_error, $use_order_source );
+			return parent::process_payment($order_id, $retry, true, $previous_error, $use_order_source);
 		} else {
-			return parent::process_payment( $order_id, $retry, $force_save_source, $previous_error, $use_order_source );
+			return parent::process_payment($order_id, $retry, $force_save_source, $previous_error, $use_order_source);
 		}
 	}
 
@@ -199,11 +199,11 @@ 
 	 * @param object   $prepared_source The source that is used for the payment.
 	 * @return array                    The arguments for the request.
 	 */
-	public function generate_create_intent_request( $order, $prepared_source ) {
-		$request = parent::generate_create_intent_request( $order, $prepared_source );
+	public function generate_create_intent_request($order, $prepared_source) {
+		$request = parent::generate_create_intent_request($order, $prepared_source);
 
 		// Non-subscription orders do not need any additional parameters.
-		if ( ! $this->has_subscription( $order ) ) {
+		if ( ! $this->has_subscription($order)) {
 			return $request;
 		}
 
@@ -219,8 +219,8 @@ 
 	 * @param $amount_to_charge float The amount to charge.
 	 * @param $renewal_order WC_Order A WC_Order object created to record the renewal payment.
 	 */
-	public function scheduled_subscription_payment( $amount_to_charge, $renewal_order ) {
-		$this->process_subscription_payment( $amount_to_charge, $renewal_order, true, false );
+	public function scheduled_subscription_payment($amount_to_charge, $renewal_order) {
+		$this->process_subscription_payment($amount_to_charge, $renewal_order, true, false);
 	}
 
 	/**
@@ -234,11 +234,11 @@ 
 	 * @param bool $retry Should we retry the process?
 	 * @param object $previous_error
 	 */
-	public function process_subscription_payment( $amount, $renewal_order, $retry = true, $previous_error = false ) {
+	public function process_subscription_payment($amount, $renewal_order, $retry = true, $previous_error = false) {
 		try {
-			if ( $amount * 100 < WC_Stripe_Helper::get_minimum_amount() ) {
+			if ($amount * 100 < WC_Stripe_Helper::get_minimum_amount()) {
 				/* translators: minimum amount */
-				$message = sprintf( __( 'Sorry, the minimum allowed order total is %1$s to use this payment method.', 'woocommerce-gateway-stripe' ), wc_price( WC_Stripe_Helper::get_minimum_amount() / 100 ) );
+				$message = sprintf(__('Sorry, the minimum allowed order total is %1$s to use this payment method.', 'woocommerce-gateway-stripe'), wc_price(WC_Stripe_Helper::get_minimum_amount() / 100));
 				throw new WC_Stripe_Exception(
 					'Error while processing renewal order ' . $renewal_order->get_id() . ' : ' . $message,
 					$message
@@ -247,141 +247,141 @@ 
 
 			$order_id = $renewal_order->get_id();
 
-			$this->ensure_subscription_has_customer_id( $order_id );
+			$this->ensure_subscription_has_customer_id($order_id);
 
 			// Unlike regular off-session subscription payments, early renewals are treated as on-session payments, involving the customer.
-			if ( isset( $_REQUEST['process_early_renewal'] ) ) { // wpcs: csrf ok.
-				$response = parent::process_payment( $order_id, true, false, $previous_error, true );
+			if (isset($_REQUEST['process_early_renewal'])) { // wpcs: csrf ok.
+				$response = parent::process_payment($order_id, true, false, $previous_error, true);
 
-				if( 'success' === $response['result'] && isset( $response['payment_intent_secret'] ) ) {
+				if ('success' === $response['result'] && isset($response['payment_intent_secret'])) {
 					$verification_url = add_query_arg(
 						array(
 							'order'         => $order_id,
-							'nonce'         => wp_create_nonce( 'wc_stripe_confirm_pi' ),
-							'redirect_to'   => remove_query_arg( array( 'process_early_renewal', 'subscription_id', 'wcs_nonce' ) ),
+							'nonce'         => wp_create_nonce('wc_stripe_confirm_pi'),
+							'redirect_to'   => remove_query_arg(array('process_early_renewal', 'subscription_id', 'wcs_nonce')),
 							'early_renewal' => true,
 						),
-						WC_AJAX::get_endpoint( 'wc_stripe_verify_intent' )
+						WC_AJAX::get_endpoint('wc_stripe_verify_intent')
 					);
 
-					echo wp_json_encode( array(
+					echo wp_json_encode(array(
 						'stripe_sca_required' => true,
 						'intent_secret'       => $response['payment_intent_secret'],
 						'redirect_url'        => $verification_url,
-					) );
+					));
 
 					exit;
 				}
 
 				// Hijack all other redirects in order to do the redirection in JavaScript.
-				add_action( 'wp_redirect', array( $this, 'redirect_after_early_renewal' ), 100 );
+				add_action('wp_redirect', array($this, 'redirect_after_early_renewal'), 100);
 
 				return;
 			}
 
 			// Check for an existing intent, which is associated with the order.
-			if ( $this->has_authentication_already_failed( $renewal_order ) ) {
+			if ($this->has_authentication_already_failed($renewal_order)) {
 				return;
 			}
 
 			// Get source from order
-			$prepared_source = $this->prepare_order_source( $renewal_order );
+			$prepared_source = $this->prepare_order_source($renewal_order);
 			$source_object   = $prepared_source->source_object;
 
-			if ( ! $prepared_source->customer ) {
+			if ( ! $prepared_source->customer) {
 				throw new WC_Stripe_Exception(
 					'Failed to process renewal for order ' . $renewal_order->get_id() . '. Stripe customer id is missing in the order',
-					__( 'Customer not found', 'woocommerce-gateway-stripe' )
+					__('Customer not found', 'woocommerce-gateway-stripe')
 				);
 			}
 
-			WC_Stripe_Logger::log( "Info: Begin processing subscription payment for order {$order_id} for the amount of {$amount}" );
+			WC_Stripe_Logger::log("Info: Begin processing subscription payment for order {$order_id} for the amount of {$amount}");
 
 			/* If we're doing a retry and source is chargeable, we need to pass
 			 * a different idempotency key and retry for success.
 			 */
-			if ( is_object( $source_object ) && empty( $source_object->error ) && $this->need_update_idempotency_key( $source_object, $previous_error ) ) {
-				add_filter( 'wc_stripe_idempotency_key', array( $this, 'change_idempotency_key' ), 10, 2 );
+			if (is_object($source_object) && empty($source_object->error) && $this->need_update_idempotency_key($source_object, $previous_error)) {
+				add_filter('wc_stripe_idempotency_key', array($this, 'change_idempotency_key'), 10, 2);
 			}
 
-			if ( ( $this->is_no_such_source_error( $previous_error ) || $this->is_no_linked_source_error( $previous_error ) ) && apply_filters( 'wc_stripe_use_default_customer_source', true ) ) {
+			if (($this->is_no_such_source_error($previous_error) || $this->is_no_linked_source_error($previous_error)) && apply_filters('wc_stripe_use_default_customer_source', true)) {
 				// Passing empty source will charge customer default.
 				$prepared_source->source = '';
 			}
 
-			$this->lock_order_payment( $renewal_order );
+			$this->lock_order_payment($renewal_order);
 
-			$response                   = $this->create_and_confirm_intent_for_off_session( $renewal_order, $prepared_source, $amount );
-			$is_authentication_required = $this->is_authentication_required_for_payment( $response );
+			$response                   = $this->create_and_confirm_intent_for_off_session($renewal_order, $prepared_source, $amount);
+			$is_authentication_required = $this->is_authentication_required_for_payment($response);
 
 			// It's only a failed payment if it's an error and it's not of the type 'authentication_required'.
 			// If it's 'authentication_required', then we should email the user and ask them to authenticate.
-			if ( ! empty( $response->error ) && ! $is_authentication_required ) {
+			if ( ! empty($response->error) && ! $is_authentication_required) {
 				// 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_subscription_payment( $amount, $renewal_order, false, $response->error );
+						if (5 <= $this->retry_interval) {
+							return $this->process_subscription_payment($amount, $renewal_order, false, $response->error);
 						}
 
-						sleep( $this->retry_interval );
+						sleep($this->retry_interval);
 
 						$this->retry_interval++;
 
-						return $this->process_subscription_payment( $amount, $renewal_order, true, $response->error );
+						return $this->process_subscription_payment($amount, $renewal_order, true, $response->error);
 					} else {
-						$localized_message = __( 'Sorry, we are unable to process your payment at this time. Please retry later.', 'woocommerce-gateway-stripe' );
-						$renewal_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');
+						$renewal_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 ) {
-					$localized_message = isset( $localized_messages[ $response->error->code ] ) ? $localized_messages[ $response->error->code ] : $response->error->message;
+				if ('card_error' === $response->error->type) {
+					$localized_message = isset($localized_messages[$response->error->code]) ? $localized_messages[$response->error->code] : $response->error->message;
 				} else {
-					$localized_message = isset( $localized_messages[ $response->error->type ] ) ? $localized_messages[ $response->error->type ] : $response->error->message;
+					$localized_message = isset($localized_messages[$response->error->type]) ? $localized_messages[$response->error->type] : $response->error->message;
 				}
 
-				$renewal_order->add_order_note( $localized_message );
+				$renewal_order->add_order_note($localized_message);
 
-				throw new WC_Stripe_Exception( print_r( $response, true ), $localized_message );
+				throw new WC_Stripe_Exception(print_r($response, true), $localized_message);
 			}
 
 			// Either the charge was successfully captured, or it requires further authentication.
 
-			if ( $is_authentication_required ) {
-				do_action( 'wc_gateway_stripe_process_payment_authentication_required', $renewal_order, $response );
+			if ($is_authentication_required) {
+				do_action('wc_gateway_stripe_process_payment_authentication_required', $renewal_order, $response);
 
-				$error_message = __( 'This transaction requires authentication.', 'woocommerce-gateway-stripe' );
-				$renewal_order->add_order_note( $error_message );
+				$error_message = __('This transaction requires authentication.', 'woocommerce-gateway-stripe');
+				$renewal_order->add_order_note($error_message);
 
-				$charge = end( $response->error->payment_intent->charges->data );
+				$charge = end($response->error->payment_intent->charges->data);
 				$id = $charge->id;
 				$order_id = $renewal_order->get_id();
 
-				$renewal_order->set_transaction_id( $id );
-				$renewal_order->update_status( 'failed', sprintf( __( 'Stripe charge awaiting authentication by user: %s.', 'woocommerce-gateway-stripe' ), $id ) );
-				if ( is_callable( array( $renewal_order, 'save' ) ) ) {
+				$renewal_order->set_transaction_id($id);
+				$renewal_order->update_status('failed', sprintf(__('Stripe charge awaiting authentication by user: %s.', 'woocommerce-gateway-stripe'), $id));
+				if (is_callable(array($renewal_order, 'save'))) {
 					$renewal_order->save();
 				}
 			} else {
 				// The charge was successfully captured
-				do_action( 'wc_gateway_stripe_process_payment', $response, $renewal_order );
+				do_action('wc_gateway_stripe_process_payment', $response, $renewal_order);
 
-				$this->process_response( end( $response->charges->data ), $renewal_order );
+				$this->process_response(end($response->charges->data), $renewal_order);
 			}
 
-			$this->unlock_order_payment( $renewal_order );
-		} catch ( WC_Stripe_Exception $e ) {
-			WC_Stripe_Logger::log( 'Error: ' . $e->getMessage() );
+			$this->unlock_order_payment($renewal_order);
+		} catch (WC_Stripe_Exception $e) {
+			WC_Stripe_Logger::log('Error: ' . $e->getMessage());
 
-			do_action( 'wc_gateway_stripe_process_payment_error', $e, $renewal_order );
+			do_action('wc_gateway_stripe_process_payment_error', $e, $renewal_order);
 
 			/* translators: error message */
-			$renewal_order->update_status( 'failed' );
+			$renewal_order->update_status('failed');
 		}
 	}
 
@@ -391,24 +391,24 @@ 
 	 * @since 3.1.0
 	 * @version 4.0.0
 	 */
-	public function save_source_to_order( $order, $source ) {
-		parent::save_source_to_order( $order, $source );
+	public function save_source_to_order($order, $source) {
+		parent::save_source_to_order($order, $source);
 
 		$order_id = $order->get_id();
 
 		// Also store it on the subscriptions being purchased or paid for in the order
-		if ( function_exists( 'wcs_order_contains_subscription' ) && wcs_order_contains_subscription( $order_id ) ) {
-			$subscriptions = wcs_get_subscriptions_for_order( $order_id );
-		} elseif ( function_exists( 'wcs_order_contains_renewal' ) && wcs_order_contains_renewal( $order_id ) ) {
-			$subscriptions = wcs_get_subscriptions_for_renewal_order( $order_id );
+		if (function_exists('wcs_order_contains_subscription') && wcs_order_contains_subscription($order_id)) {
+			$subscriptions = wcs_get_subscriptions_for_order($order_id);
+		} elseif (function_exists('wcs_order_contains_renewal') && wcs_order_contains_renewal($order_id)) {
+			$subscriptions = wcs_get_subscriptions_for_renewal_order($order_id);
 		} else {
 			$subscriptions = array();
 		}
 
-		foreach ( $subscriptions as $subscription ) {
+		foreach ($subscriptions as $subscription) {
 			$subscription_id = $subscription->get_id();
-			update_post_meta( $subscription_id, '_stripe_customer_id', $source->customer );
-			update_post_meta( $subscription_id, '_stripe_source_id', $source->source );
+			update_post_meta($subscription_id, '_stripe_customer_id', $source->customer);
+			update_post_meta($subscription_id, '_stripe_source_id', $source->source);
 		}
 	}
 
@@ -416,26 +416,26 @@ 
 	 * Don't transfer Stripe customer/token meta to resubscribe orders.
 	 * @param int $resubscribe_order The order created for the customer to resubscribe to the old expired/cancelled subscription
 	 */
-	public function delete_resubscribe_meta( $resubscribe_order ) {
-		delete_post_meta( $resubscribe_order->get_id(), '_stripe_customer_id' );
-		delete_post_meta( $resubscribe_order->get_id(), '_stripe_source_id' );
+	public function delete_resubscribe_meta($resubscribe_order) {
+		delete_post_meta($resubscribe_order->get_id(), '_stripe_customer_id');
+		delete_post_meta($resubscribe_order->get_id(), '_stripe_source_id');
 		// For BW compat will remove in future
-		delete_post_meta( $resubscribe_order->get_id(), '_stripe_card_id' );
+		delete_post_meta($resubscribe_order->get_id(), '_stripe_card_id');
 		// delete payment intent ID
-		delete_post_meta( $resubscribe_order->get_id(), '_stripe_intent_id' );
-		$this->delete_renewal_meta( $resubscribe_order );
+		delete_post_meta($resubscribe_order->get_id(), '_stripe_intent_id');
+		$this->delete_renewal_meta($resubscribe_order);
 	}
 
 	/**
 	 * Don't transfer Stripe fee/ID meta to renewal orders.
 	 * @param int $resubscribe_order The order created for the customer to resubscribe to the old expired/cancelled subscription
 	 */
-	public function delete_renewal_meta( $renewal_order ) {
-		WC_Stripe_Helper::delete_stripe_fee( $renewal_order );
-		WC_Stripe_Helper::delete_stripe_net( $renewal_order );
+	public function delete_renewal_meta($renewal_order) {
+		WC_Stripe_Helper::delete_stripe_fee($renewal_order);
+		WC_Stripe_Helper::delete_stripe_net($renewal_order);
 
 		// delete payment intent ID
-		delete_post_meta( $renewal_order->get_id(), '_stripe_intent_id' );
+		delete_post_meta($renewal_order->get_id(), '_stripe_intent_id');
 
 		return $renewal_order;
 	}
@@ -449,9 +449,9 @@ 
 	 * @param WC_Order $renewal_order The order which recorded the successful payment (to make up for the failed automatic payment).
 	 * @return void
 	 */
-	public function update_failing_payment_method( $subscription, $renewal_order ) {
-		update_post_meta( $subscription->get_id(), '_stripe_customer_id', $renewal_order->get_meta( '_stripe_customer_id', true ) );
-		update_post_meta( $subscription->get_id(), '_stripe_source_id', $renewal_order->get_meta( '_stripe_source_id', true ) );
+	public function update_failing_payment_method($subscription, $renewal_order) {
+		update_post_meta($subscription->get_id(), '_stripe_customer_id', $renewal_order->get_meta('_stripe_customer_id', true));
+		update_post_meta($subscription->get_id(), '_stripe_source_id', $renewal_order->get_meta('_stripe_source_id', true));
 	}
 
 	/**
@@ -463,23 +463,23 @@ 
 	 * @param WC_Subscription $subscription An instance of a subscription object
 	 * @return array
 	 */
-	public function add_subscription_payment_meta( $payment_meta, $subscription ) {
+	public function add_subscription_payment_meta($payment_meta, $subscription) {
 		$subscription_id = $subscription->get_id();
-		$source_id       = get_post_meta( $subscription_id, '_stripe_source_id', true );
+		$source_id       = get_post_meta($subscription_id, '_stripe_source_id', true);
 
 		// For BW compat will remove in future.
-		if ( empty( $source_id ) ) {
-			$source_id = get_post_meta( $subscription_id, '_stripe_card_id', true );
+		if (empty($source_id)) {
+			$source_id = get_post_meta($subscription_id, '_stripe_card_id', true);
 
 			// Take this opportunity to update the key name.
-			update_post_meta( $subscription_id, '_stripe_source_id', $source_id );
-			delete_post_meta( $subscription_id, '_stripe_card_id', $source_id );
+			update_post_meta($subscription_id, '_stripe_source_id', $source_id);
+			delete_post_meta($subscription_id, '_stripe_card_id', $source_id);
 		}
 
-		$payment_meta[ $this->id ] = array(
+		$payment_meta[$this->id] = array(
 			'post_meta' => array(
 				'_stripe_customer_id' => array(
-					'value' => get_post_meta( $subscription_id, '_stripe_customer_id', true ),
+					'value' => get_post_meta($subscription_id, '_stripe_customer_id', true),
 					'label' => 'Stripe Customer ID',
 				),
 				'_stripe_source_id'   => array(
@@ -502,27 +502,27 @@ 
 	 * @param array $payment_meta associative array of meta data required for automatic payments
 	 * @return array
 	 */
-	public function validate_subscription_payment_meta( $payment_method_id, $payment_meta ) {
-		if ( $this->id === $payment_method_id ) {
+	public function validate_subscription_payment_meta($payment_method_id, $payment_meta) {
+		if ($this->id === $payment_method_id) {
 
-			if ( ! isset( $payment_meta['post_meta']['_stripe_customer_id']['value'] ) || empty( $payment_meta['post_meta']['_stripe_customer_id']['value'] ) ) {
+			if ( ! isset($payment_meta['post_meta']['_stripe_customer_id']['value']) || empty($payment_meta['post_meta']['_stripe_customer_id']['value'])) {
 
 				// Allow empty stripe customer id during subscription renewal. It will be added when processing payment if required.
-				if ( ! isset( $_POST['wc_order_action'] ) || 'wcs_process_renewal' !== $_POST['wc_order_action'] ) {
-					throw new Exception( __( 'A "Stripe Customer ID" value is required.', 'woocommerce-gateway-stripe' ) );
+				if ( ! isset($_POST['wc_order_action']) || 'wcs_process_renewal' !== $_POST['wc_order_action']) {
+					throw new Exception(__('A "Stripe Customer ID" value is required.', 'woocommerce-gateway-stripe'));
 				}
-			} elseif ( 0 !== strpos( $payment_meta['post_meta']['_stripe_customer_id']['value'], 'cus_' ) ) {
-				throw new Exception( __( 'Invalid customer ID. A valid "Stripe Customer ID" must begin with "cus_".', 'woocommerce-gateway-stripe' ) );
+			} elseif (0 !== strpos($payment_meta['post_meta']['_stripe_customer_id']['value'], 'cus_')) {
+				throw new Exception(__('Invalid customer ID. A valid "Stripe Customer ID" must begin with "cus_".', 'woocommerce-gateway-stripe'));
 			}
 
 			if (
-				! empty( $payment_meta['post_meta']['_stripe_source_id']['value'] ) && (
-					0 !== strpos( $payment_meta['post_meta']['_stripe_source_id']['value'], 'card_' )
-					&& 0 !== strpos( $payment_meta['post_meta']['_stripe_source_id']['value'], 'src_' )
-					&& 0 !== strpos( $payment_meta['post_meta']['_stripe_source_id']['value'], 'pm_' )
+				! empty($payment_meta['post_meta']['_stripe_source_id']['value']) && (
+					0 !== strpos($payment_meta['post_meta']['_stripe_source_id']['value'], 'card_')
+					&& 0 !== strpos($payment_meta['post_meta']['_stripe_source_id']['value'], 'src_')
+					&& 0 !== strpos($payment_meta['post_meta']['_stripe_source_id']['value'], 'pm_')
 				)
 			) {
-				throw new Exception( __( 'Invalid source ID. A valid source "Stripe Source ID" must begin with "src_", "pm_", or "card_".', 'woocommerce-gateway-stripe' ) );
+				throw new Exception(__('Invalid source ID. A valid source "Stripe Source ID" must begin with "src_", "pm_", or "card_".', 'woocommerce-gateway-stripe'));
 			}
 		}
 	}
@@ -535,75 +535,75 @@ 
 	 * @param WC_Subscription $subscription the subscription details
 	 * @return string the subscription payment method
 	 */
-	public function maybe_render_subscription_payment_method( $payment_method_to_display, $subscription ) {
+	public function maybe_render_subscription_payment_method($payment_method_to_display, $subscription) {
 		$customer_user = $subscription->get_customer_id();
 
 		// bail for other payment methods
-		if ( $subscription->get_payment_method() !== $this->id || ! $customer_user ) {
+		if ($subscription->get_payment_method() !== $this->id || ! $customer_user) {
 			return $payment_method_to_display;
 		}
 
-		$stripe_source_id = get_post_meta( $subscription->get_id(), '_stripe_source_id', true );
+		$stripe_source_id = get_post_meta($subscription->get_id(), '_stripe_source_id', true);
 
 		// For BW compat will remove in future.
-		if ( empty( $stripe_source_id ) ) {
-			$stripe_source_id = get_post_meta( $subscription->get_id(), '_stripe_card_id', true );
+		if (empty($stripe_source_id)) {
+			$stripe_source_id = get_post_meta($subscription->get_id(), '_stripe_card_id', true);
 
 			// Take this opportunity to update the key name.
-			update_post_meta( $subscription->get_id(), '_stripe_source_id', $stripe_source_id );
+			update_post_meta($subscription->get_id(), '_stripe_source_id', $stripe_source_id);
 		}
 
 		$stripe_customer    = new WC_Stripe_Customer();
-		$stripe_customer_id = get_post_meta( $subscription->get_id(), '_stripe_customer_id', true );
+		$stripe_customer_id = get_post_meta($subscription->get_id(), '_stripe_customer_id', true);
 
 		// If we couldn't find a Stripe customer linked to the subscription, fallback to the user meta data.
-		if ( ! $stripe_customer_id || ! is_string( $stripe_customer_id ) ) {
+		if ( ! $stripe_customer_id || ! is_string($stripe_customer_id)) {
 			$user_id            = $customer_user;
-			$stripe_customer_id = get_user_option( '_stripe_customer_id', $user_id );
-			$stripe_source_id   = get_user_option( '_stripe_source_id', $user_id );
+			$stripe_customer_id = get_user_option('_stripe_customer_id', $user_id);
+			$stripe_source_id   = get_user_option('_stripe_source_id', $user_id);
 
 			// For BW compat will remove in future.
-			if ( empty( $stripe_source_id ) ) {
-				$stripe_source_id = get_user_option( '_stripe_card_id', $user_id );
+			if (empty($stripe_source_id)) {
+				$stripe_source_id = get_user_option('_stripe_card_id', $user_id);
 
 				// Take this opportunity to update the key name.
-				update_user_option( $user_id, '_stripe_source_id', $stripe_source_id, false );
+				update_user_option($user_id, '_stripe_source_id', $stripe_source_id, false);
 			}
 		}
 
 		// If we couldn't find a Stripe customer linked to the account, fallback to the order meta data.
-		if ( ( ! $stripe_customer_id || ! is_string( $stripe_customer_id ) ) && false !== $subscription->order ) {
-			$stripe_customer_id = get_post_meta( $subscription->get_parent_id(), '_stripe_customer_id', true );
-			$stripe_source_id   = get_post_meta( $subscription->get_parent_id(), '_stripe_source_id', true );
+		if (( ! $stripe_customer_id || ! is_string($stripe_customer_id)) && false !== $subscription->order) {
+			$stripe_customer_id = get_post_meta($subscription->get_parent_id(), '_stripe_customer_id', true);
+			$stripe_source_id   = get_post_meta($subscription->get_parent_id(), '_stripe_source_id', true);
 
 			// For BW compat will remove in future.
-			if ( empty( $stripe_source_id ) ) {
-				$stripe_source_id = get_post_meta( $subscription->get_parent_id(), '_stripe_card_id', true );
+			if (empty($stripe_source_id)) {
+				$stripe_source_id = get_post_meta($subscription->get_parent_id(), '_stripe_card_id', true);
 
 				// Take this opportunity to update the key name.
-				update_post_meta( $subscription->get_parent_id(), '_stripe_source_id', $stripe_source_id );
+				update_post_meta($subscription->get_parent_id(), '_stripe_source_id', $stripe_source_id);
 			}
 		}
 
-		$stripe_customer->set_id( $stripe_customer_id );
+		$stripe_customer->set_id($stripe_customer_id);
 
 		$sources                   = $stripe_customer->get_sources();
-		$payment_method_to_display = __( 'N/A', 'woocommerce-gateway-stripe' );
+		$payment_method_to_display = __('N/A', 'woocommerce-gateway-stripe');
 
-		if ( $sources ) {
+		if ($sources) {
 			$card = false;
 
-			foreach ( $sources as $source ) {
-				if ( isset( $source->type ) && 'card' === $source->type ) {
+			foreach ($sources as $source) {
+				if (isset($source->type) && 'card' === $source->type) {
 					$card = $source->card;
-				} elseif ( isset( $source->object ) && 'card' === $source->object ) {
+				} elseif (isset($source->object) && 'card' === $source->object) {
 					$card = $source;
 				}
 
-				if ( $source->id === $stripe_source_id ) {
-					if ( $card ) {
+				if ($source->id === $stripe_source_id) {
+					if ($card) {
 						/* translators: 1) card brand 2) last 4 digits */
-						$payment_method_to_display = sprintf( __( 'Via %1$s card ending in %2$s', 'woocommerce-gateway-stripe' ), ( isset( $card->brand ) ? $card->brand : __( 'N/A', 'woocommerce-gateway-stripe' ) ), $card->last4 );
+						$payment_method_to_display = sprintf(__('Via %1$s card ending in %2$s', 'woocommerce-gateway-stripe'), (isset($card->brand) ? $card->brand : __('N/A', 'woocommerce-gateway-stripe')), $card->last4);
 					}
 
 					break;
@@ -620,7 +620,7 @@ 
 	 */
 	public function remove_order_pay_var() {
 		global $wp;
-		if ( isset( $_GET['wc-stripe-confirmation'] ) ) {
+		if (isset($_GET['wc-stripe-confirmation'])) {
 			$this->order_pay_var = $wp->query_vars['order-pay'];
 			$wp->query_vars['order-pay'] = null;
 		}
@@ -631,7 +631,7 @@ 
 	 */
 	public function restore_order_pay_var() {
 		global $wp;
-		if ( isset( $this->order_pay_var ) ) {
+		if (isset($this->order_pay_var)) {
 			$wp->query_vars['order-pay'] = $this->order_pay_var;
 		}
 	}
@@ -642,13 +642,13 @@ 
 	 * @param WC_Order $renewal_order The renewal order.
 	 * @return boolean
 	 */
-	public function has_authentication_already_failed( $renewal_order ) {
-		$existing_intent = $this->get_intent_from_order( $renewal_order );
+	public function has_authentication_already_failed($renewal_order) {
+		$existing_intent = $this->get_intent_from_order($renewal_order);
 
 		if (
 			! $existing_intent
 			|| 'requires_payment_method' !== $existing_intent->status
-			|| empty( $existing_intent->last_payment_error )
+			|| empty($existing_intent->last_payment_error)
 			|| 'authentication_required' !== $existing_intent->last_payment_error->code
 		) {
 			return false;
@@ -662,12 +662,12 @@ 
 		 *
 		 * @param WC_Order $renewal_order The order that is being renewed.
 		 */
-		do_action( 'wc_gateway_stripe_process_payment_authentication_required', $renewal_order );
+		do_action('wc_gateway_stripe_process_payment_authentication_required', $renewal_order);
 
 		// Fail the payment attempt (order would be currently pending because of retry rules).
-		$charge    = end( $existing_intent->charges->data );
+		$charge    = end($existing_intent->charges->data);
 		$charge_id = $charge->id;
-		$renewal_order->update_status( 'failed', sprintf( __( 'Stripe charge awaiting authentication by user: %s.', 'woocommerce-gateway-stripe' ), $charge_id ) );
+		$renewal_order->update_status('failed', sprintf(__('Stripe charge awaiting authentication by user: %s.', 'woocommerce-gateway-stripe'), $charge_id));
 
 		return true;
 	}
@@ -678,7 +678,7 @@ 
 	 * @param string $url The URL that Subscriptions attempts a redirect to.
 	 * @return void
 	 */
-	public function redirect_after_early_renewal( $url ) {
+	public function redirect_after_early_renewal($url) {
 		echo wp_json_encode(
 			array(
 				'stripe_sca_required' => false,
@@ -695,12 +695,12 @@ 
 	 * @param WC_Order $order The renewal order.
 	 * @param stdClass $intent The Payment Intent object.
 	 */
-	protected function handle_intent_verification_success( $order, $intent ) {
-		parent::handle_intent_verification_success( $order, $intent );
+	protected function handle_intent_verification_success($order, $intent) {
+		parent::handle_intent_verification_success($order, $intent);
 
-		if ( isset( $_GET['early_renewal'] ) ) { // wpcs: csrf ok.
-			wcs_update_dates_after_early_renewal( wcs_get_subscription( $order->get_meta( '_subscription_renewal' ) ), $order );
-			wc_add_notice( __( 'Your early renewal order was successful.', 'woocommerce-gateway-stripe' ), 'success' );
+		if (isset($_GET['early_renewal'])) { // wpcs: csrf ok.
+			wcs_update_dates_after_early_renewal(wcs_get_subscription($order->get_meta('_subscription_renewal')), $order);
+			wc_add_notice(__('Your early renewal order was successful.', 'woocommerce-gateway-stripe'), 'success');
 		}
 	}
 
@@ -710,12 +710,12 @@ 
 	 * @param WC_Order $order The renewal order.
 	 * @param stdClass $intent The Payment Intent object (unused).
 	 */
-	protected function handle_intent_verification_failure( $order, $intent ) {
-		if ( isset( $_GET['early_renewal'] ) ) {
-			$order->delete( true );
-			wc_add_notice( __( 'Payment authorization for the renewal order was unsuccessful, please try again.', 'woocommerce-gateway-stripe' ), 'error' );
-			$renewal_url = wcs_get_early_renewal_url( wcs_get_subscription( $order->get_meta( '_subscription_renewal' ) ) );
-			wp_redirect( $renewal_url ); exit;
+	protected function handle_intent_verification_failure($order, $intent) {
+		if (isset($_GET['early_renewal'])) {
+			$order->delete(true);
+			wc_add_notice(__('Payment authorization for the renewal order was unsuccessful, please try again.', 'woocommerce-gateway-stripe'), 'error');
+			$renewal_url = wcs_get_early_renewal_url(wcs_get_subscription($order->get_meta('_subscription_renewal')));
+			wp_redirect($renewal_url); exit;
 		}
 	}
 }

includes/admin/class-wc-stripe-inbox-notes.php

Doc Comments +1 added lines

@@ -21,6 +21,7 @@
 
 	/**
 	 * Manage notes to show after Apple Pay domain verification.
+	 * @param boolean $verification_complete
 	 */
 	public static function notify_on_apple_pay_domain_verification( $verification_complete ) {
 		if ( ! class_exists( 'Automattic\WooCommerce\Admin\Notes\WC_Admin_Notes' ) ) {

Spacing +62 added lines, -62 removed lines

@@ -1,5 +1,5 @@ 
 <?php
-if ( ! defined( 'ABSPATH' ) ) {
+if ( ! defined('ABSPATH')) {
 	exit;
 }
 
@@ -19,64 +19,64 @@ 
 	const CAMPAIGN_2020_CLEANUP_ACTION = 'wc_stripe_apple_pay_2020_cleanup';
 
 	public function __construct() {
-		add_action( self::POST_SETUP_SUCCESS_ACTION, array( self::class, 'create_marketing_note' ) );
-		add_action( self::CAMPAIGN_2020_CLEANUP_ACTION, array( self::class, 'cleanup_campaign_2020' ) );
+		add_action(self::POST_SETUP_SUCCESS_ACTION, array(self::class, 'create_marketing_note'));
+		add_action(self::CAMPAIGN_2020_CLEANUP_ACTION, array(self::class, 'cleanup_campaign_2020'));
 
 		// Schedule a 2020 holiday campaign cleanup action if needed.
 		// First, check to see if we are still before the cutoff.
 		// We don't need to (re)schedule this after the cutoff.
-		if ( current_time( 'timestamp', true ) < self::get_campaign_2020_cutoff() ) {
+		if (current_time('timestamp', true) < self::get_campaign_2020_cutoff()) {
 			// If we don't have the clean up action scheduled, add it.
-			if ( ! wp_next_scheduled( self::CAMPAIGN_2020_CLEANUP_ACTION ) ) {
-				wp_schedule_single_event( self::get_campaign_2020_cutoff(), self::CAMPAIGN_2020_CLEANUP_ACTION );
+			if ( ! wp_next_scheduled(self::CAMPAIGN_2020_CLEANUP_ACTION)) {
+				wp_schedule_single_event(self::get_campaign_2020_cutoff(), self::CAMPAIGN_2020_CLEANUP_ACTION);
 			}
 		}
 	}
 
 	public static function get_campaign_2020_cutoff() {
-		return strtotime( '22 December 2020' );
+		return strtotime('22 December 2020');
 	}
 
 	public static function get_success_title() {
-		if ( current_time( 'timestamp', true ) < self::get_campaign_2020_cutoff() ) {
-			return __( 'Boost sales this holiday season with Apple Pay!', 'woocommerce-gateway-stripe' );
+		if (current_time('timestamp', true) < self::get_campaign_2020_cutoff()) {
+			return __('Boost sales this holiday season with Apple Pay!', 'woocommerce-gateway-stripe');
 		}
 
-		return__( 'Boost sales with Apple Pay!', 'woocommerce-gateway-stripe' );
+		return__('Boost sales with Apple Pay!', 'woocommerce-gateway-stripe');
 	}
 
 	/**
 	 * Manage notes to show after Apple Pay domain verification.
 	 */
-	public static function notify_on_apple_pay_domain_verification( $verification_complete ) {
-		if ( ! class_exists( 'Automattic\WooCommerce\Admin\Notes\WC_Admin_Notes' ) ) {
+	public static function notify_on_apple_pay_domain_verification($verification_complete) {
+		if ( ! class_exists('Automattic\WooCommerce\Admin\Notes\WC_Admin_Notes')) {
 			return;
 		}
 
-		if ( ! class_exists( 'WC_Data_Store' ) ) {
+		if ( ! class_exists('WC_Data_Store')) {
 			return;
 		}
 
-		if ( $verification_complete ) {
-			if ( self::should_show_marketing_note() && ! wp_next_scheduled( self::POST_SETUP_SUCCESS_ACTION ) ) {
-				wp_schedule_single_event( time() + DAY_IN_SECONDS, self::POST_SETUP_SUCCESS_ACTION );
+		if ($verification_complete) {
+			if (self::should_show_marketing_note() && ! wp_next_scheduled(self::POST_SETUP_SUCCESS_ACTION)) {
+				wp_schedule_single_event(time() + DAY_IN_SECONDS, self::POST_SETUP_SUCCESS_ACTION);
 			}
 
 			// If the domain verification completed after failure note was created, make sure it's marked as actioned.
 			try {
-				$data_store       = WC_Data_Store::load( 'admin-note' );
-				$failure_note_ids = $data_store->get_notes_with_name( self::FAILURE_NOTE_NAME );
-				if ( ! empty( $failure_note_ids ) ) {
-					$note_id = array_pop( $failure_note_ids );
-					$note    = WC_Admin_Notes::get_note( $note_id );
-					if ( false !== $note && WC_Admin_Note::E_WC_ADMIN_NOTE_ACTIONED !== $note->get_status() ) {
-						$note->set_status( WC_Admin_Note::E_WC_ADMIN_NOTE_ACTIONED );
+				$data_store       = WC_Data_Store::load('admin-note');
+				$failure_note_ids = $data_store->get_notes_with_name(self::FAILURE_NOTE_NAME);
+				if ( ! empty($failure_note_ids)) {
+					$note_id = array_pop($failure_note_ids);
+					$note    = WC_Admin_Notes::get_note($note_id);
+					if (false !== $note && WC_Admin_Note::E_WC_ADMIN_NOTE_ACTIONED !== $note->get_status()) {
+						$note->set_status(WC_Admin_Note::E_WC_ADMIN_NOTE_ACTIONED);
 						$note->save();
 					}
 				}
-			} catch ( Exception $e ) {}  // @codingStandardsIgnoreLine.
+			} catch (Exception $e) {}  // @codingStandardsIgnoreLine.
 		} else {
-			if ( empty( $failure_note_ids ) ) {
+			if (empty($failure_note_ids)) {
 				self::create_failure_note();
 			}
 		}
@@ -88,27 +88,27 @@ 
 	public static function should_show_marketing_note() {
 		// Display to US merchants only.
 		$base_location = wc_get_base_location();
-		if ( ! $base_location || 'US' !== $base_location['country'] ) {
+		if ( ! $base_location || 'US' !== $base_location['country']) {
 			return false;
 		}
 
 		// Make sure Apple Pay is enabled and setup is successful.
-		$stripe_settings       = get_option( 'woocommerce_stripe_settings', array() );
-		$stripe_enabled        = isset( $stripe_settings['enabled'] ) && 'yes' === $stripe_settings['enabled'];
-		$button_enabled        = isset( $stripe_settings['payment_request'] ) && 'yes' === $stripe_settings['payment_request'];
-		$verification_complete = isset( $stripe_settings['apple_pay_domain_set'] ) && 'yes' === $stripe_settings['apple_pay_domain_set'];
-		if ( ! $stripe_enabled || ! $button_enabled || ! $verification_complete ) {
+		$stripe_settings       = get_option('woocommerce_stripe_settings', array());
+		$stripe_enabled        = isset($stripe_settings['enabled']) && 'yes' === $stripe_settings['enabled'];
+		$button_enabled        = isset($stripe_settings['payment_request']) && 'yes' === $stripe_settings['payment_request'];
+		$verification_complete = isset($stripe_settings['apple_pay_domain_set']) && 'yes' === $stripe_settings['apple_pay_domain_set'];
+		if ( ! $stripe_enabled || ! $button_enabled || ! $verification_complete) {
 			return false;
 		}
 
 		// Make sure note doesn't already exist.
 		try {
-			$data_store       = WC_Data_Store::load( 'admin-note' );
-			$success_note_ids = $data_store->get_notes_with_name( self::SUCCESS_NOTE_NAME );
-			if ( ! empty( $success_note_ids ) ) {
+			$data_store       = WC_Data_Store::load('admin-note');
+			$success_note_ids = $data_store->get_notes_with_name(self::SUCCESS_NOTE_NAME);
+			if ( ! empty($success_note_ids)) {
 				return false;
 			}
-		} catch ( Exception $e ) {
+		} catch (Exception $e) {
 			return false; // If unable to check, assume it shouldn't show note.
 		}
 
@@ -120,24 +120,24 @@ 
 	 */
 	public static function create_marketing_note() {
 		// Make sure conditions for this note still hold.
-		if ( ! self::should_show_marketing_note() ) {
+		if ( ! self::should_show_marketing_note()) {
 			return;
 		}
 
 		try {
 			$note = new WC_Admin_Note();
-			$note->set_title( self::get_success_title() );
-			$note->set_content( __( 'Now that you accept Apple Pay® with Stripe, you can increase conversion rates by letting your customers know that Apple Pay is available. Here’s a marketing guide to help you get started.', 'woocommerce-gateway-stripe' ) );
-			$note->set_type( WC_Admin_Note::E_WC_ADMIN_NOTE_MARKETING );
-			$note->set_name( self::SUCCESS_NOTE_NAME );
-			$note->set_source( 'woocommerce-gateway-stripe' );
+			$note->set_title(self::get_success_title());
+			$note->set_content(__('Now that you accept Apple Pay® with Stripe, you can increase conversion rates by letting your customers know that Apple Pay is available. Here’s a marketing guide to help you get started.', 'woocommerce-gateway-stripe'));
+			$note->set_type(WC_Admin_Note::E_WC_ADMIN_NOTE_MARKETING);
+			$note->set_name(self::SUCCESS_NOTE_NAME);
+			$note->set_source('woocommerce-gateway-stripe');
 			$note->add_action(
 				'marketing-guide',
-				__( 'See marketing guide', 'woocommerce-gateway-stripe' ),
+				__('See marketing guide', 'woocommerce-gateway-stripe'),
 				'https://developer.apple.com/apple-pay/marketing/'
 			);
 			$note->save();
-		} catch ( Exception $e ) {} // @codingStandardsIgnoreLine.
+		} catch (Exception $e) {} // @codingStandardsIgnoreLine.
 	}
 
 	/**
@@ -146,18 +146,18 @@ 
 	public static function create_failure_note() {
 		try {
 			$note = new WC_Admin_Note();
-			$note->set_title( __( 'Apple Pay domain verification needed', 'woocommerce-gateway-stripe' ) );
-			$note->set_content( __( 'The WooCommerce Stripe Gateway extension attempted to perform domain verification on behalf of your store, but was unable to do so. This must be resolved before Apple Pay can be offered to your customers.', 'woocommerce-gateway-stripe' ) );
-			$note->set_type( WC_Admin_Note::E_WC_ADMIN_NOTE_INFORMATIONAL );
-			$note->set_name( self::FAILURE_NOTE_NAME );
-			$note->set_source( 'woocommerce-gateway-stripe' );
+			$note->set_title(__('Apple Pay domain verification needed', 'woocommerce-gateway-stripe'));
+			$note->set_content(__('The WooCommerce Stripe Gateway extension attempted to perform domain verification on behalf of your store, but was unable to do so. This must be resolved before Apple Pay can be offered to your customers.', 'woocommerce-gateway-stripe'));
+			$note->set_type(WC_Admin_Note::E_WC_ADMIN_NOTE_INFORMATIONAL);
+			$note->set_name(self::FAILURE_NOTE_NAME);
+			$note->set_source('woocommerce-gateway-stripe');
 			$note->add_action(
 				'learn-more',
-				__( 'Learn more', 'woocommerce-gateway-stripe' ),
+				__('Learn more', 'woocommerce-gateway-stripe'),
 				'https://docs.woocommerce.com/document/stripe/#apple-pay'
 			);
 			$note->save();
-		} catch ( Exception $e ) {} // @codingStandardsIgnoreLine.
+		} catch (Exception $e) {} // @codingStandardsIgnoreLine.
 	}
 
 	/**
@@ -166,40 +166,40 @@ 
 	 * on/about 2020 Dec 22.
 	 */
 	public static function cleanup_campaign_2020() {
-		if ( ! class_exists( 'Automattic\WooCommerce\Admin\Notes\WC_Admin_Notes') ) {
+		if ( ! class_exists('Automattic\WooCommerce\Admin\Notes\WC_Admin_Notes')) {
 			return;
 		}
 
-		if ( ! class_exists( 'WC_Data_Store' ) ) {
+		if ( ! class_exists('WC_Data_Store')) {
 			return;
 		}
 
 		$note_ids = array();
 
 		try {
-			$data_store = WC_Data_Store::load( 'admin-note' );
-			$note_ids   = $data_store->get_notes_with_name( self::SUCCESS_NOTE_NAME );
-			if ( empty( $note_ids ) ) {
+			$data_store = WC_Data_Store::load('admin-note');
+			$note_ids   = $data_store->get_notes_with_name(self::SUCCESS_NOTE_NAME);
+			if (empty($note_ids)) {
 				return;
 			}
-		} catch ( Exception $e ) {
+		} catch (Exception $e) {
 			return;
 		}
 
 		$deleted_an_unactioned_note = false;
 
-		foreach ( (array) $note_ids as $note_id ) {
+		foreach ((array) $note_ids as $note_id) {
 			try {
-				$note = new WC_Admin_Note( $note_id );
-				if ( WC_Admin_Note::E_WC_ADMIN_NOTE_UNACTIONED == $note->get_status() ) {
+				$note = new WC_Admin_Note($note_id);
+				if (WC_Admin_Note::E_WC_ADMIN_NOTE_UNACTIONED == $note->get_status()) {
 					$note->delete();
 					$deleted_an_unactioned_note = true;
 				}
-				unset( $note );
-			} catch ( Exception $e ) {} // @codingStandardsIgnoreLine.
+				unset($note);
+			} catch (Exception $e) {} // @codingStandardsIgnoreLine.
 		}
 
-		if ( $deleted_an_unactioned_note ) {
+		if ($deleted_an_unactioned_note) {
 			self::create_marketing_note();
 		}
 	}

includes/admin/stripe-settings.php

Spacing +75 added lines, -75 removed lines

@@ -1,19 +1,19 @@ 
 <?php
-if ( ! defined( 'ABSPATH' ) ) {
+if ( ! defined('ABSPATH')) {
 	exit;
 }
 
-if ( woocommerce_gateway_stripe()->connect->is_connected() ) {
+if (woocommerce_gateway_stripe()->connect->is_connected()) {
 	$reset_link = add_query_arg(
 		array(
-			'_wpnonce'                     => wp_create_nonce( 'reset_stripe_api_credentials' ),
+			'_wpnonce'                     => wp_create_nonce('reset_stripe_api_credentials'),
 			'reset_stripe_api_credentials' => true,
 		),
-		admin_url( 'admin.php?page=wc-settings&tab=checkout&section=stripe' )
+		admin_url('admin.php?page=wc-settings&tab=checkout&section=stripe')
 	);
 
 	$api_credentials_text = sprintf(
-		__( '%1$sClear all Stripe account keys.%2$s %3$sThis will disable any connection to Stripe.%4$s', 'woocommerce-gateway-stripe' ),
+		__('%1$sClear all Stripe account keys.%2$s %3$sThis will disable any connection to Stripe.%4$s', 'woocommerce-gateway-stripe'),
 		'<a id="wc_stripe_connect_button" href="' . $reset_link . '" class="button button-secondary">',
 		'</a>',
 		'<span style="color:red;">',
@@ -22,16 +22,16 @@ 
 } else {
 	$oauth_url = woocommerce_gateway_stripe()->connect->get_oauth_url();
 
-	if ( ! is_wp_error( $oauth_url ) ) {
+	if ( ! is_wp_error($oauth_url)) {
 		$api_credentials_text = sprintf(
-			__( '%1$sSetup or link an existing Stripe account.%2$s By clicking this button you agree to the %3$sTerms of Service%2$s. Or, manually enter Stripe account keys below.', 'woocommerce-gateway-stripe' ),
+			__('%1$sSetup or link an existing Stripe account.%2$s By clicking this button you agree to the %3$sTerms of Service%2$s. Or, manually enter Stripe account keys below.', 'woocommerce-gateway-stripe'),
 			'<a id="wc_stripe_connect_button" href="' . $oauth_url . '" class="button button-primary">',
 			'</a>',
 			'<a href="https://wordpress.com/tos">'
 
 		);
 	} else {
-		$api_credentials_text = __( 'Manually enter Stripe keys below.', 'woocommerce-gateway-stripe' );
+		$api_credentials_text = __('Manually enter Stripe keys below.', 'woocommerce-gateway-stripe');
 	}
 }
 
@@ -39,114 +39,114 @@ 
 	'wc_stripe_settings',
 	array(
 		'enabled'                       => array(
-			'title'       => __( 'Enable/Disable', 'woocommerce-gateway-stripe' ),
-			'label'       => __( 'Enable Stripe', 'woocommerce-gateway-stripe' ),
+			'title'       => __('Enable/Disable', 'woocommerce-gateway-stripe'),
+			'label'       => __('Enable Stripe', 'woocommerce-gateway-stripe'),
 			'type'        => 'checkbox',
 			'description' => '',
 			'default'     => 'no',
 		),
 		'title'                         => array(
-			'title'       => __( 'Title', 'woocommerce-gateway-stripe' ),
+			'title'       => __('Title', 'woocommerce-gateway-stripe'),
 			'type'        => 'text',
-			'description' => __( 'This controls the title which the user sees during checkout.', 'woocommerce-gateway-stripe' ),
-			'default'     => __( 'Credit Card (Stripe)', 'woocommerce-gateway-stripe' ),
+			'description' => __('This controls the title which the user sees during checkout.', 'woocommerce-gateway-stripe'),
+			'default'     => __('Credit Card (Stripe)', 'woocommerce-gateway-stripe'),
 			'desc_tip'    => true,
 		),
 		'description'                   => array(
-			'title'       => __( 'Description', 'woocommerce-gateway-stripe' ),
+			'title'       => __('Description', 'woocommerce-gateway-stripe'),
 			'type'        => 'text',
-			'description' => __( 'This controls the description which the user sees during checkout.', 'woocommerce-gateway-stripe' ),
-			'default'     => __( 'Pay with your credit card via Stripe.', 'woocommerce-gateway-stripe' ),
+			'description' => __('This controls the description which the user sees during checkout.', 'woocommerce-gateway-stripe'),
+			'default'     => __('Pay with your credit card via Stripe.', 'woocommerce-gateway-stripe'),
 			'desc_tip'    => true,
 		),
 		'webhook'                       => array(
-			'title'       => __( 'Webhook Endpoints', 'woocommerce-gateway-stripe' ),
+			'title'       => __('Webhook Endpoints', 'woocommerce-gateway-stripe'),
 			'type'        => 'title',
 			/* translators: webhook URL */
 			'description' => $this->display_admin_settings_webhook_description(),
 		),
 		'api_credentials'               => array(
-			'title'       => __( 'Stripe Account Keys', 'woocommerce-gateway-stripe' ),
+			'title'       => __('Stripe Account Keys', 'woocommerce-gateway-stripe'),
 			'type'        => 'title',
 			'description' => $api_credentials_text
 		),
 		'testmode'                      => array(
-			'title'       => __( 'Test mode', 'woocommerce-gateway-stripe' ),
-			'label'       => __( 'Enable Test Mode', 'woocommerce-gateway-stripe' ),
+			'title'       => __('Test mode', 'woocommerce-gateway-stripe'),
+			'label'       => __('Enable Test Mode', 'woocommerce-gateway-stripe'),
 			'type'        => 'checkbox',
-			'description' => __( 'Place the payment gateway in test mode using test API keys.', 'woocommerce-gateway-stripe' ),
+			'description' => __('Place the payment gateway in test mode using test API keys.', 'woocommerce-gateway-stripe'),
 			'default'     => 'yes',
 			'desc_tip'    => true,
 		),
 		'test_publishable_key'          => array(
-			'title'       => __( 'Test Publishable Key', 'woocommerce-gateway-stripe' ),
+			'title'       => __('Test Publishable Key', 'woocommerce-gateway-stripe'),
 			'type'        => 'text',
-			'description' => __( 'Get your API keys from your stripe account. Invalid values will be rejected. Only values starting with "pk_test_" will be saved.', 'woocommerce-gateway-stripe' ),
+			'description' => __('Get your API keys from your stripe account. Invalid values will be rejected. Only values starting with "pk_test_" will be saved.', 'woocommerce-gateway-stripe'),
 			'default'     => '',
 			'desc_tip'    => true,
 		),
 		'test_secret_key'               => array(
-			'title'       => __( 'Test Secret Key', 'woocommerce-gateway-stripe' ),
+			'title'       => __('Test Secret Key', 'woocommerce-gateway-stripe'),
 			'type'        => 'password',
-			'description' => __( 'Get your API keys from your stripe account. Invalid values will be rejected. Only values starting with "sk_test_" or "rk_test_" will be saved.', 'woocommerce-gateway-stripe' ),
+			'description' => __('Get your API keys from your stripe account. Invalid values will be rejected. Only values starting with "sk_test_" or "rk_test_" will be saved.', 'woocommerce-gateway-stripe'),
 			'default'     => '',
 			'desc_tip'    => true,
 		),
 		'test_webhook_secret'           => array(
-			'title'       => __( 'Test Webhook Secret', 'woocommerce-gateway-stripe' ),
+			'title'       => __('Test Webhook Secret', 'woocommerce-gateway-stripe'),
 			'type'        => 'password',
-			'description' => __( 'Get your webhook signing secret from the webhooks section in your stripe account.', 'woocommerce-gateway-stripe' ),
+			'description' => __('Get your webhook signing secret from the webhooks section in your stripe account.', 'woocommerce-gateway-stripe'),
 			'default'     => '',
 			'desc_tip'    => true,
 		),
 		'publishable_key'               => array(
-			'title'       => __( 'Live Publishable Key', 'woocommerce-gateway-stripe' ),
+			'title'       => __('Live Publishable Key', 'woocommerce-gateway-stripe'),
 			'type'        => 'text',
-			'description' => __( 'Get your API keys from your stripe account. Invalid values will be rejected. Only values starting with "pk_live_" will be saved.', 'woocommerce-gateway-stripe' ),
+			'description' => __('Get your API keys from your stripe account. Invalid values will be rejected. Only values starting with "pk_live_" will be saved.', 'woocommerce-gateway-stripe'),
 			'default'     => '',
 			'desc_tip'    => true,
 		),
 		'secret_key'                    => array(
-			'title'       => __( 'Live Secret Key', 'woocommerce-gateway-stripe' ),
+			'title'       => __('Live Secret Key', 'woocommerce-gateway-stripe'),
 			'type'        => 'password',
-			'description' => __( 'Get your API keys from your stripe account. Invalid values will be rejected. Only values starting with "sk_live_" or "rk_live_" will be saved.', 'woocommerce-gateway-stripe' ),
+			'description' => __('Get your API keys from your stripe account. Invalid values will be rejected. Only values starting with "sk_live_" or "rk_live_" will be saved.', 'woocommerce-gateway-stripe'),
 			'default'     => '',
 			'desc_tip'    => true,
 		),
 		'webhook_secret'               => array(
-			'title'       => __( 'Webhook Secret', 'woocommerce-gateway-stripe' ),
+			'title'       => __('Webhook Secret', 'woocommerce-gateway-stripe'),
 			'type'        => 'password',
-			'description' => __( 'Get your webhook signing secret from the webhooks section in your stripe account.', 'woocommerce-gateway-stripe' ),
+			'description' => __('Get your webhook signing secret from the webhooks section in your stripe account.', 'woocommerce-gateway-stripe'),
 			'default'     => '',
 			'desc_tip'    => true,
 		),
 		'inline_cc_form'                => array(
-			'title'       => __( 'Inline Credit Card Form', 'woocommerce-gateway-stripe' ),
+			'title'       => __('Inline Credit Card Form', 'woocommerce-gateway-stripe'),
 			'type'        => 'checkbox',
-			'description' => __( 'Choose the style you want to show for your credit card form. When unchecked, the credit card form will display separate credit card number field, expiry date field and cvc field.', 'woocommerce-gateway-stripe' ),
+			'description' => __('Choose the style you want to show for your credit card form. When unchecked, the credit card form will display separate credit card number field, expiry date field and cvc field.', 'woocommerce-gateway-stripe'),
 			'default'     => 'no',
 			'desc_tip'    => true,
 		),
 		'statement_descriptor'          => array(
-			'title'       => __( 'Statement Descriptor', 'woocommerce-gateway-stripe' ),
+			'title'       => __('Statement Descriptor', 'woocommerce-gateway-stripe'),
 			'type'        => 'text',
-			'description' => __( 'Statement descriptors are limited to 22 characters, cannot use the special characters >, <, ", \, \', *, and must not consist solely of numbers. This will appear on your customer\'s statement in capital letters.', 'woocommerce-gateway-stripe' ),
+			'description' => __('Statement descriptors are limited to 22 characters, cannot use the special characters >, <, ", \, \', *, and must not consist solely of numbers. This will appear on your customer\'s statement in capital letters.', 'woocommerce-gateway-stripe'),
 			'default'     => '',
 			'desc_tip'    => true,
 		),
 		'capture'                       => array(
-			'title'       => __( 'Capture', 'woocommerce-gateway-stripe' ),
-			'label'       => __( 'Capture charge immediately', 'woocommerce-gateway-stripe' ),
+			'title'       => __('Capture', 'woocommerce-gateway-stripe'),
+			'label'       => __('Capture charge immediately', 'woocommerce-gateway-stripe'),
 			'type'        => 'checkbox',
-			'description' => __( 'Whether or not to immediately capture the charge. When unchecked, the charge issues an authorization and will need to be captured later. Uncaptured charges expire in 7 days.', 'woocommerce-gateway-stripe' ),
+			'description' => __('Whether or not to immediately capture the charge. When unchecked, the charge issues an authorization and will need to be captured later. Uncaptured charges expire in 7 days.', 'woocommerce-gateway-stripe'),
 			'default'     => 'yes',
 			'desc_tip'    => true,
 		),
 		'payment_request'               => array(
-			'title'       => __( 'Payment Request Buttons', 'woocommerce-gateway-stripe' ),
+			'title'       => __('Payment Request Buttons', 'woocommerce-gateway-stripe'),
 			'label'       => sprintf(
 				/* translators: 1) br tag 2) Stripe anchor tag 3) Apple anchor tag 4) Stripe dashboard opening anchor tag 5) Stripe dashboard closing anchor tag */
-				__( 'Enable Payment Request Buttons. (Apple Pay/Google Pay) %1$sBy using Apple Pay, you agree to %2$s and %3$s\'s terms of service. (Apple Pay domain verification is performed automatically; configuration can be found on the %4$sStripe dashboard%5$s.)', 'woocommerce-gateway-stripe' ),
+				__('Enable Payment Request Buttons. (Apple Pay/Google Pay) %1$sBy using Apple Pay, you agree to %2$s and %3$s\'s terms of service. (Apple Pay domain verification is performed automatically; configuration can be found on the %4$sStripe dashboard%5$s.)', 'woocommerce-gateway-stripe'),
 				'<br />',
 				'<a href="https://stripe.com/apple-pay/legal" target="_blank">Stripe</a>',
 				'<a href="https://developer.apple.com/apple-pay/acceptable-use-guidelines-for-websites/" target="_blank">Apple</a>',
@@ -154,79 +154,79 @@ 
 				'</a>'
 			),
 			'type'        => 'checkbox',
-			'description' => __( 'If enabled, users will be able to pay using Apple Pay or Chrome Payment Request if supported by the browser.', 'woocommerce-gateway-stripe' ),
+			'description' => __('If enabled, users will be able to pay using Apple Pay or Chrome Payment Request if supported by the browser.', 'woocommerce-gateway-stripe'),
 			'default'     => 'yes',
 			'desc_tip'    => true,
 		),
 		'payment_request_button_type'   => array(
-			'title'       => __( 'Payment Request Button Type', 'woocommerce-gateway-stripe' ),
-			'label'       => __( 'Button Type', 'woocommerce-gateway-stripe' ),
+			'title'       => __('Payment Request Button Type', 'woocommerce-gateway-stripe'),
+			'label'       => __('Button Type', 'woocommerce-gateway-stripe'),
 			'type'        => 'select',
-			'description' => __( 'Select the button type you would like to show.', 'woocommerce-gateway-stripe' ),
+			'description' => __('Select the button type you would like to show.', 'woocommerce-gateway-stripe'),
 			'default'     => 'buy',
 			'desc_tip'    => true,
 			'options'     => array(
-				'default' => __( 'Default', 'woocommerce-gateway-stripe' ),
-				'buy'     => __( 'Buy', 'woocommerce-gateway-stripe' ),
-				'donate'  => __( 'Donate', 'woocommerce-gateway-stripe' ),
-				'branded' => __( 'Branded', 'woocommerce-gateway-stripe' ),
-				'custom'  => __( 'Custom', 'woocommerce-gateway-stripe' ),
+				'default' => __('Default', 'woocommerce-gateway-stripe'),
+				'buy'     => __('Buy', 'woocommerce-gateway-stripe'),
+				'donate'  => __('Donate', 'woocommerce-gateway-stripe'),
+				'branded' => __('Branded', 'woocommerce-gateway-stripe'),
+				'custom'  => __('Custom', 'woocommerce-gateway-stripe'),
 			),
 		),
 		'payment_request_button_theme'  => array(
-			'title'       => __( 'Payment Request Button Theme', 'woocommerce-gateway-stripe' ),
-			'label'       => __( 'Button Theme', 'woocommerce-gateway-stripe' ),
+			'title'       => __('Payment Request Button Theme', 'woocommerce-gateway-stripe'),
+			'label'       => __('Button Theme', 'woocommerce-gateway-stripe'),
 			'type'        => 'select',
-			'description' => __( 'Select the button theme you would like to show.', 'woocommerce-gateway-stripe' ),
+			'description' => __('Select the button theme you would like to show.', 'woocommerce-gateway-stripe'),
 			'default'     => 'dark',
 			'desc_tip'    => true,
 			'options'     => array(
-				'dark'          => __( 'Dark', 'woocommerce-gateway-stripe' ),
-				'light'         => __( 'Light', 'woocommerce-gateway-stripe' ),
-				'light-outline' => __( 'Light-Outline', 'woocommerce-gateway-stripe' ),
+				'dark'          => __('Dark', 'woocommerce-gateway-stripe'),
+				'light'         => __('Light', 'woocommerce-gateway-stripe'),
+				'light-outline' => __('Light-Outline', 'woocommerce-gateway-stripe'),
 			),
 		),
 		'payment_request_button_height' => array(
-			'title'       => __( 'Payment Request Button Height', 'woocommerce-gateway-stripe' ),
-			'label'       => __( 'Button Height', 'woocommerce-gateway-stripe' ),
+			'title'       => __('Payment Request Button Height', 'woocommerce-gateway-stripe'),
+			'label'       => __('Button Height', 'woocommerce-gateway-stripe'),
 			'type'        => 'text',
-			'description' => __( 'Enter the height you would like the button to be in pixels. Width will always be 100%.', 'woocommerce-gateway-stripe' ),
+			'description' => __('Enter the height you would like the button to be in pixels. Width will always be 100%.', 'woocommerce-gateway-stripe'),
 			'default'     => '44',
 			'desc_tip'    => true,
 		),
 		'payment_request_button_label' => array(
-			'title'       => __( 'Payment Request Button Label', 'woocommerce-gateway-stripe' ),
-			'label'       => __( 'Button Label', 'woocommerce-gateway-stripe' ),
+			'title'       => __('Payment Request Button Label', 'woocommerce-gateway-stripe'),
+			'label'       => __('Button Label', 'woocommerce-gateway-stripe'),
 			'type'        => 'text',
-			'description' => __( 'Enter the custom text you would like the button to have.', 'woocommerce-gateway-stripe' ),
-			'default'     => __( 'Buy now', 'woocommerce-gateway-stripe' ),
+			'description' => __('Enter the custom text you would like the button to have.', 'woocommerce-gateway-stripe'),
+			'default'     => __('Buy now', 'woocommerce-gateway-stripe'),
 			'desc_tip'    => true,
 		),
 		'payment_request_button_branded_type' => array(
-			'title'       => __( 'Payment Request Branded Button Label Format', 'woocommerce-gateway-stripe' ),
-			'label'       => __( 'Branded Button Label Format', 'woocommerce-gateway-stripe' ),
+			'title'       => __('Payment Request Branded Button Label Format', 'woocommerce-gateway-stripe'),
+			'label'       => __('Branded Button Label Format', 'woocommerce-gateway-stripe'),
 			'type'        => 'select',
-			'description' => __( 'Select the branded button label format.', 'woocommerce-gateway-stripe' ),
+			'description' => __('Select the branded button label format.', 'woocommerce-gateway-stripe'),
 			'default'     => 'long',
 			'desc_tip'    => true,
 			'options'     => array(
-				'short' => __( 'Logo only', 'woocommerce-gateway-stripe' ),
-				'long'  => __( 'Text and logo', 'woocommerce-gateway-stripe' ),
+				'short' => __('Logo only', 'woocommerce-gateway-stripe'),
+				'long'  => __('Text and logo', 'woocommerce-gateway-stripe'),
 			),
 		),
 		'saved_cards'                   => array(
-			'title'       => __( 'Saved Cards', 'woocommerce-gateway-stripe' ),
-			'label'       => __( 'Enable Payment via Saved Cards', 'woocommerce-gateway-stripe' ),
+			'title'       => __('Saved Cards', 'woocommerce-gateway-stripe'),
+			'label'       => __('Enable Payment via Saved Cards', 'woocommerce-gateway-stripe'),
 			'type'        => 'checkbox',
-			'description' => __( 'If enabled, users will be able to pay with a saved card during checkout. Card details are saved on Stripe servers, not on your store.', 'woocommerce-gateway-stripe' ),
+			'description' => __('If enabled, users will be able to pay with a saved card during checkout. Card details are saved on Stripe servers, not on your store.', 'woocommerce-gateway-stripe'),
 			'default'     => 'yes',
 			'desc_tip'    => true,
 		),
 		'logging'                       => array(
-			'title'       => __( 'Logging', 'woocommerce-gateway-stripe' ),
-			'label'       => __( 'Log debug messages', 'woocommerce-gateway-stripe' ),
+			'title'       => __('Logging', 'woocommerce-gateway-stripe'),
+			'label'       => __('Log debug messages', 'woocommerce-gateway-stripe'),
 			'type'        => 'checkbox',
-			'description' => __( 'Save debug messages to the WooCommerce System Status log.', 'woocommerce-gateway-stripe' ),
+			'description' => __('Save debug messages to the WooCommerce System Status log.', 'woocommerce-gateway-stripe'),
 			'default'     => 'no',
 			'desc_tip'    => true,
 		),

woocommerce-gateway-stripe.php

Spacing +110 added lines, -110 removed lines

@@ -15,20 +15,20 @@ 
  *
  */
 
-if ( ! defined( 'ABSPATH' ) ) {
+if ( ! defined('ABSPATH')) {
 	exit;
 }
 
 /**
  * Required minimums and constants
  */
-define( 'WC_STRIPE_VERSION', '4.6.0' ); // WRCS: DEFINED_VERSION.
-define( 'WC_STRIPE_MIN_PHP_VER', '5.6.0' );
-define( 'WC_STRIPE_MIN_WC_VER', '3.0' );
-define( 'WC_STRIPE_FUTURE_MIN_WC_VER', '3.0' );
-define( 'WC_STRIPE_MAIN_FILE', __FILE__ );
-define( 'WC_STRIPE_PLUGIN_URL', untrailingslashit( plugins_url( basename( plugin_dir_path( __FILE__ ) ), basename( __FILE__ ) ) ) );
-define( 'WC_STRIPE_PLUGIN_PATH', untrailingslashit( plugin_dir_path( __FILE__ ) ) );
+define('WC_STRIPE_VERSION', '4.6.0'); // WRCS: DEFINED_VERSION.
+define('WC_STRIPE_MIN_PHP_VER', '5.6.0');
+define('WC_STRIPE_MIN_WC_VER', '3.0');
+define('WC_STRIPE_FUTURE_MIN_WC_VER', '3.0');
+define('WC_STRIPE_MAIN_FILE', __FILE__);
+define('WC_STRIPE_PLUGIN_URL', untrailingslashit(plugins_url(basename(plugin_dir_path(__FILE__)), basename(__FILE__))));
+define('WC_STRIPE_PLUGIN_PATH', untrailingslashit(plugin_dir_path(__FILE__)));
 
 // phpcs:disable WordPress.Files.FileName
 
@@ -40,7 +40,7 @@ 
  */
 function woocommerce_stripe_missing_wc_notice() {
 	/* translators: 1. URL link. */
-	echo '<div class="error"><p><strong>' . sprintf( esc_html__( 'Stripe requires WooCommerce to be installed and active. You can download %s here.', 'woocommerce-gateway-stripe' ), '<a href="https://woocommerce.com/" target="_blank">WooCommerce</a>' ) . '</strong></p></div>';
+	echo '<div class="error"><p><strong>' . sprintf(esc_html__('Stripe requires WooCommerce to be installed and active. You can download %s here.', 'woocommerce-gateway-stripe'), '<a href="https://woocommerce.com/" target="_blank">WooCommerce</a>') . '</strong></p></div>';
 }
 
 /**
@@ -51,14 +51,14 @@ 
  */
 function woocommerce_stripe_wc_not_supported() {
 	/* translators: $1. Minimum WooCommerce version. $2. Current WooCommerce version. */
-	echo '<div class="error"><p><strong>' . sprintf( esc_html__( 'Stripe requires WooCommerce %1$s or greater to be installed and active. WooCommerce %2$s is no longer supported.', 'woocommerce-gateway-stripe' ), WC_STRIPE_MIN_WC_VER, WC_VERSION ) . '</strong></p></div>';
+	echo '<div class="error"><p><strong>' . sprintf(esc_html__('Stripe requires WooCommerce %1$s or greater to be installed and active. WooCommerce %2$s is no longer supported.', 'woocommerce-gateway-stripe'), WC_STRIPE_MIN_WC_VER, WC_VERSION) . '</strong></p></div>';
 }
 
 function woocommerce_gateway_stripe() {
 
 	static $plugin;
 
-	if ( ! isset( $plugin ) ) {
+	if ( ! isset($plugin)) {
 
 		class WC_Stripe {
 
@@ -73,7 +73,7 @@ 
 			 * @return Singleton The *Singleton* instance.
 			 */
 			public static function get_instance() {
-				if ( null === self::$instance ) {
+				if (null === self::$instance) {
 					self::$instance = new self();
 				}
 				return self::$instance;
@@ -114,14 +114,14 @@ 
 			 * *Singleton* via the `new` operator from outside of this class.
 			 */
 			public function __construct() {
-				add_action( 'admin_init', array( $this, 'install' ) );
+				add_action('admin_init', array($this, 'install'));
 
 				$this->init();
 
 				$this->api     = new WC_Stripe_Connect_API();
-				$this->connect = new WC_Stripe_Connect( $this->api );
+				$this->connect = new WC_Stripe_Connect($this->api);
 
-				add_action( 'rest_api_init', array( $this, 'register_connect_routes' ) );
+				add_action('rest_api_init', array($this, 'register_connect_routes'));
 			}
 
 			/**
@@ -131,57 +131,57 @@ 
 			 * @version 4.0.0
 			 */
 			public function init() {
-				if ( is_admin() ) {
-					require_once dirname( __FILE__ ) . '/includes/admin/class-wc-stripe-privacy.php';
+				if (is_admin()) {
+					require_once dirname(__FILE__) . '/includes/admin/class-wc-stripe-privacy.php';
 				}
 
-				require_once dirname( __FILE__ ) . '/includes/class-wc-stripe-exception.php';
-				require_once dirname( __FILE__ ) . '/includes/class-wc-stripe-logger.php';
-				require_once dirname( __FILE__ ) . '/includes/class-wc-stripe-helper.php';
-				include_once dirname( __FILE__ ) . '/includes/class-wc-stripe-api.php';
-				require_once dirname( __FILE__ ) . '/includes/abstracts/abstract-wc-stripe-payment-gateway.php';
-				require_once dirname( __FILE__ ) . '/includes/class-wc-stripe-webhook-handler.php';
-				require_once dirname( __FILE__ ) . '/includes/class-wc-stripe-sepa-payment-token.php';
-				require_once dirname( __FILE__ ) . '/includes/class-wc-stripe-apple-pay-registration.php';
-				require_once dirname( __FILE__ ) . '/includes/compat/class-wc-stripe-pre-orders-compat.php';
-				require_once dirname( __FILE__ ) . '/includes/class-wc-gateway-stripe.php';
-				require_once dirname( __FILE__ ) . '/includes/payment-methods/class-wc-gateway-stripe-bancontact.php';
-				require_once dirname( __FILE__ ) . '/includes/payment-methods/class-wc-gateway-stripe-sofort.php';
-				require_once dirname( __FILE__ ) . '/includes/payment-methods/class-wc-gateway-stripe-giropay.php';
-				require_once dirname( __FILE__ ) . '/includes/payment-methods/class-wc-gateway-stripe-eps.php';
-				require_once dirname( __FILE__ ) . '/includes/payment-methods/class-wc-gateway-stripe-ideal.php';
-				require_once dirname( __FILE__ ) . '/includes/payment-methods/class-wc-gateway-stripe-p24.php';
-				require_once dirname( __FILE__ ) . '/includes/payment-methods/class-wc-gateway-stripe-alipay.php';
-				require_once dirname( __FILE__ ) . '/includes/payment-methods/class-wc-gateway-stripe-sepa.php';
-				require_once dirname( __FILE__ ) . '/includes/payment-methods/class-wc-gateway-stripe-multibanco.php';
-				require_once dirname( __FILE__ ) . '/includes/payment-methods/class-wc-stripe-payment-request.php';
-				require_once dirname( __FILE__ ) . '/includes/compat/class-wc-stripe-subs-compat.php';
-				require_once dirname( __FILE__ ) . '/includes/compat/class-wc-stripe-sepa-subs-compat.php';
-				require_once dirname( __FILE__ ) . '/includes/connect/class-wc-stripe-connect.php';
-				require_once dirname( __FILE__ ) . '/includes/connect/class-wc-stripe-connect-api.php';
-				require_once dirname( __FILE__ ) . '/includes/class-wc-stripe-order-handler.php';
-				require_once dirname( __FILE__ ) . '/includes/class-wc-stripe-payment-tokens.php';
-				require_once dirname( __FILE__ ) . '/includes/class-wc-stripe-customer.php';
-				require_once dirname( __FILE__ ) . '/includes/class-wc-stripe-intent-controller.php';
-				require_once dirname( __FILE__ ) . '/includes/admin/class-wc-stripe-inbox-notes.php';
-
-				if ( is_admin() ) {
-					require_once dirname( __FILE__ ) . '/includes/admin/class-wc-stripe-admin-notices.php';
+				require_once dirname(__FILE__) . '/includes/class-wc-stripe-exception.php';
+				require_once dirname(__FILE__) . '/includes/class-wc-stripe-logger.php';
+				require_once dirname(__FILE__) . '/includes/class-wc-stripe-helper.php';
+				include_once dirname(__FILE__) . '/includes/class-wc-stripe-api.php';
+				require_once dirname(__FILE__) . '/includes/abstracts/abstract-wc-stripe-payment-gateway.php';
+				require_once dirname(__FILE__) . '/includes/class-wc-stripe-webhook-handler.php';
+				require_once dirname(__FILE__) . '/includes/class-wc-stripe-sepa-payment-token.php';
+				require_once dirname(__FILE__) . '/includes/class-wc-stripe-apple-pay-registration.php';
+				require_once dirname(__FILE__) . '/includes/compat/class-wc-stripe-pre-orders-compat.php';
+				require_once dirname(__FILE__) . '/includes/class-wc-gateway-stripe.php';
+				require_once dirname(__FILE__) . '/includes/payment-methods/class-wc-gateway-stripe-bancontact.php';
+				require_once dirname(__FILE__) . '/includes/payment-methods/class-wc-gateway-stripe-sofort.php';
+				require_once dirname(__FILE__) . '/includes/payment-methods/class-wc-gateway-stripe-giropay.php';
+				require_once dirname(__FILE__) . '/includes/payment-methods/class-wc-gateway-stripe-eps.php';
+				require_once dirname(__FILE__) . '/includes/payment-methods/class-wc-gateway-stripe-ideal.php';
+				require_once dirname(__FILE__) . '/includes/payment-methods/class-wc-gateway-stripe-p24.php';
+				require_once dirname(__FILE__) . '/includes/payment-methods/class-wc-gateway-stripe-alipay.php';
+				require_once dirname(__FILE__) . '/includes/payment-methods/class-wc-gateway-stripe-sepa.php';
+				require_once dirname(__FILE__) . '/includes/payment-methods/class-wc-gateway-stripe-multibanco.php';
+				require_once dirname(__FILE__) . '/includes/payment-methods/class-wc-stripe-payment-request.php';
+				require_once dirname(__FILE__) . '/includes/compat/class-wc-stripe-subs-compat.php';
+				require_once dirname(__FILE__) . '/includes/compat/class-wc-stripe-sepa-subs-compat.php';
+				require_once dirname(__FILE__) . '/includes/connect/class-wc-stripe-connect.php';
+				require_once dirname(__FILE__) . '/includes/connect/class-wc-stripe-connect-api.php';
+				require_once dirname(__FILE__) . '/includes/class-wc-stripe-order-handler.php';
+				require_once dirname(__FILE__) . '/includes/class-wc-stripe-payment-tokens.php';
+				require_once dirname(__FILE__) . '/includes/class-wc-stripe-customer.php';
+				require_once dirname(__FILE__) . '/includes/class-wc-stripe-intent-controller.php';
+				require_once dirname(__FILE__) . '/includes/admin/class-wc-stripe-inbox-notes.php';
+
+				if (is_admin()) {
+					require_once dirname(__FILE__) . '/includes/admin/class-wc-stripe-admin-notices.php';
 				}
 
 				// REMOVE IN THE FUTURE.
-				require_once dirname( __FILE__ ) . '/includes/deprecated/class-wc-stripe-apple-pay.php';
+				require_once dirname(__FILE__) . '/includes/deprecated/class-wc-stripe-apple-pay.php';
 
-				add_filter( 'woocommerce_payment_gateways', array( $this, 'add_gateways' ) );
-				add_filter( 'pre_update_option_woocommerce_stripe_settings', array( $this, 'gateway_settings_update' ), 10, 2 );
-				add_filter( 'plugin_action_links_' . plugin_basename( __FILE__ ), array( $this, 'plugin_action_links' ) );
-				add_filter( 'plugin_row_meta', array( $this, 'plugin_row_meta' ), 10, 2 );
+				add_filter('woocommerce_payment_gateways', array($this, 'add_gateways'));
+				add_filter('pre_update_option_woocommerce_stripe_settings', array($this, 'gateway_settings_update'), 10, 2);
+				add_filter('plugin_action_links_' . plugin_basename(__FILE__), array($this, 'plugin_action_links'));
+				add_filter('plugin_row_meta', array($this, 'plugin_row_meta'), 10, 2);
 
 				// Modify emails emails.
-				add_filter( 'woocommerce_email_classes', array( $this, 'add_emails' ), 20 );
+				add_filter('woocommerce_email_classes', array($this, 'add_emails'), 20);
 
-				if ( version_compare( WC_VERSION, '3.4', '<' ) ) {
-					add_filter( 'woocommerce_get_sections_checkout', array( $this, 'filter_gateway_order_admin' ) );
+				if (version_compare(WC_VERSION, '3.4', '<')) {
+					add_filter('woocommerce_get_sections_checkout', array($this, 'filter_gateway_order_admin'));
 				}
 			}
 
@@ -192,8 +192,8 @@ 
 			 * @version 4.0.0
 			 */
 			public function update_plugin_version() {
-				delete_option( 'wc_stripe_version' );
-				update_option( 'wc_stripe_version', WC_STRIPE_VERSION );
+				delete_option('wc_stripe_version');
+				update_option('wc_stripe_version', WC_STRIPE_VERSION);
 			}
 
 			/**
@@ -203,15 +203,15 @@ 
 			 * @version 3.1.0
 			 */
 			public function install() {
-				if ( ! is_plugin_active( plugin_basename( __FILE__ ) ) ) {
+				if ( ! is_plugin_active(plugin_basename(__FILE__))) {
 					return;
 				}
 
-				if ( ! defined( 'IFRAME_REQUEST' ) && ( WC_STRIPE_VERSION !== get_option( 'wc_stripe_version' ) ) ) {
-					do_action( 'woocommerce_stripe_updated' );
+				if ( ! defined('IFRAME_REQUEST') && (WC_STRIPE_VERSION !== get_option('wc_stripe_version'))) {
+					do_action('woocommerce_stripe_updated');
 
-					if ( ! defined( 'WC_STRIPE_INSTALLING' ) ) {
-						define( 'WC_STRIPE_INSTALLING', true );
+					if ( ! defined('WC_STRIPE_INSTALLING')) {
+						define('WC_STRIPE_INSTALLING', true);
 					}
 
 					$this->update_plugin_version();
@@ -224,11 +224,11 @@ 
 			 * @since 1.0.0
 			 * @version 4.0.0
 			 */
-			public function plugin_action_links( $links ) {
+			public function plugin_action_links($links) {
 				$plugin_links = array(
-					'<a href="admin.php?page=wc-settings&tab=checkout&section=stripe">' . esc_html__( 'Settings', 'woocommerce-gateway-stripe' ) . '</a>',
+					'<a href="admin.php?page=wc-settings&tab=checkout&section=stripe">' . esc_html__('Settings', 'woocommerce-gateway-stripe') . '</a>',
 				);
-				return array_merge( $plugin_links, $links );
+				return array_merge($plugin_links, $links);
 			}
 
 			/**
@@ -239,13 +239,13 @@ 
 			 * @param  string $file  Name of current file.
 			 * @return array  $links Update list of plugin links.
 			 */
-			public function plugin_row_meta( $links, $file ) {
-				if ( plugin_basename( __FILE__ ) === $file ) {
+			public function plugin_row_meta($links, $file) {
+				if (plugin_basename(__FILE__) === $file) {
 					$row_meta = array(
-						'docs'    => '<a href="' . esc_url( apply_filters( 'woocommerce_gateway_stripe_docs_url', 'https://docs.woocommerce.com/document/stripe/' ) ) . '" title="' . esc_attr( __( 'View Documentation', 'woocommerce-gateway-stripe' ) ) . '">' . __( 'Docs', 'woocommerce-gateway-stripe' ) . '</a>',
-						'support' => '<a href="' . esc_url( apply_filters( 'woocommerce_gateway_stripe_support_url', 'https://woocommerce.com/my-account/create-a-ticket?select=18627' ) ) . '" title="' . esc_attr( __( 'Open a support request at WooCommerce.com', 'woocommerce-gateway-stripe' ) ) . '">' . __( 'Support', 'woocommerce-gateway-stripe' ) . '</a>',
+						'docs'    => '<a href="' . esc_url(apply_filters('woocommerce_gateway_stripe_docs_url', 'https://docs.woocommerce.com/document/stripe/')) . '" title="' . esc_attr(__('View Documentation', 'woocommerce-gateway-stripe')) . '">' . __('Docs', 'woocommerce-gateway-stripe') . '</a>',
+						'support' => '<a href="' . esc_url(apply_filters('woocommerce_gateway_stripe_support_url', 'https://woocommerce.com/my-account/create-a-ticket?select=18627')) . '" title="' . esc_attr(__('Open a support request at WooCommerce.com', 'woocommerce-gateway-stripe')) . '">' . __('Support', 'woocommerce-gateway-stripe') . '</a>',
 					);
-					return array_merge( $links, $row_meta );
+					return array_merge($links, $row_meta);
 				}
 				return (array) $links;
 			}
@@ -256,8 +256,8 @@ 
 			 * @since 1.0.0
 			 * @version 4.0.0
 			 */
-			public function add_gateways( $methods ) {
-				if ( class_exists( 'WC_Subscriptions_Order' ) && function_exists( 'wcs_create_renewal_order' ) ) {
+			public function add_gateways($methods) {
+				if (class_exists('WC_Subscriptions_Order') && function_exists('wcs_create_renewal_order')) {
 					$methods[] = 'WC_Stripe_Subs_Compat';
 					$methods[] = 'WC_Stripe_Sepa_Subs_Compat';
 				} else {
@@ -283,28 +283,28 @@ 
 			 * @since 4.0.0
 			 * @version 4.0.0
 			 */
-			public function filter_gateway_order_admin( $sections ) {
-				unset( $sections['stripe'] );
-				unset( $sections['stripe_bancontact'] );
-				unset( $sections['stripe_sofort'] );
-				unset( $sections['stripe_giropay'] );
-				unset( $sections['stripe_eps'] );
-				unset( $sections['stripe_ideal'] );
-				unset( $sections['stripe_p24'] );
-				unset( $sections['stripe_alipay'] );
-				unset( $sections['stripe_sepa'] );
-				unset( $sections['stripe_multibanco'] );
+			public function filter_gateway_order_admin($sections) {
+				unset($sections['stripe']);
+				unset($sections['stripe_bancontact']);
+				unset($sections['stripe_sofort']);
+				unset($sections['stripe_giropay']);
+				unset($sections['stripe_eps']);
+				unset($sections['stripe_ideal']);
+				unset($sections['stripe_p24']);
+				unset($sections['stripe_alipay']);
+				unset($sections['stripe_sepa']);
+				unset($sections['stripe_multibanco']);
 
 				$sections['stripe']            = 'Stripe';
-				$sections['stripe_bancontact'] = __( 'Stripe Bancontact', 'woocommerce-gateway-stripe' );
-				$sections['stripe_sofort']     = __( 'Stripe SOFORT', 'woocommerce-gateway-stripe' );
-				$sections['stripe_giropay']    = __( 'Stripe Giropay', 'woocommerce-gateway-stripe' );
-				$sections['stripe_eps']        = __( 'Stripe EPS', 'woocommerce-gateway-stripe' );
-				$sections['stripe_ideal']      = __( 'Stripe iDeal', 'woocommerce-gateway-stripe' );
-				$sections['stripe_p24']        = __( 'Stripe P24', 'woocommerce-gateway-stripe' );
-				$sections['stripe_alipay']     = __( 'Stripe Alipay', 'woocommerce-gateway-stripe' );
-				$sections['stripe_sepa']       = __( 'Stripe SEPA Direct Debit', 'woocommerce-gateway-stripe' );
-				$sections['stripe_multibanco'] = __( 'Stripe Multibanco', 'woocommerce-gateway-stripe' );
+				$sections['stripe_bancontact'] = __('Stripe Bancontact', 'woocommerce-gateway-stripe');
+				$sections['stripe_sofort']     = __('Stripe SOFORT', 'woocommerce-gateway-stripe');
+				$sections['stripe_giropay']    = __('Stripe Giropay', 'woocommerce-gateway-stripe');
+				$sections['stripe_eps']        = __('Stripe EPS', 'woocommerce-gateway-stripe');
+				$sections['stripe_ideal']      = __('Stripe iDeal', 'woocommerce-gateway-stripe');
+				$sections['stripe_p24']        = __('Stripe P24', 'woocommerce-gateway-stripe');
+				$sections['stripe_alipay']     = __('Stripe Alipay', 'woocommerce-gateway-stripe');
+				$sections['stripe_sepa']       = __('Stripe SEPA Direct Debit', 'woocommerce-gateway-stripe');
+				$sections['stripe_multibanco'] = __('Stripe Multibanco', 'woocommerce-gateway-stripe');
 
 				return $sections;
 			}
@@ -319,12 +319,12 @@ 
 			 * @param array|bool $old_settings Existing settings, if any.
 			 * @return array New value but with defaults initially filled in for missing settings.
 			 */
-			public function gateway_settings_update( $settings, $old_settings ) {
-				if ( false === $old_settings ) {
+			public function gateway_settings_update($settings, $old_settings) {
+				if (false === $old_settings) {
 					$gateway  = new WC_Gateway_Stripe();
 					$fields   = $gateway->get_form_fields();
-					$defaults = array_merge( array_fill_keys( array_keys( $fields ), '' ), wp_list_pluck( $fields, 'default' ) );
-					return array_merge( $defaults, $settings );
+					$defaults = array_merge(array_fill_keys(array_keys($fields), ''), wp_list_pluck($fields, 'default'));
+					return array_merge($defaults, $settings);
 				}
 				return $settings;
 			}
@@ -335,16 +335,16 @@ 
 			 * @param WC_Email[] $email_classes All existing emails.
 			 * @return WC_Email[]
 			 */
-			public function add_emails( $email_classes ) {
+			public function add_emails($email_classes) {
 				require_once WC_STRIPE_PLUGIN_PATH . '/includes/compat/class-wc-stripe-email-failed-authentication.php';
 				require_once WC_STRIPE_PLUGIN_PATH . '/includes/compat/class-wc-stripe-email-failed-renewal-authentication.php';
 				require_once WC_STRIPE_PLUGIN_PATH . '/includes/compat/class-wc-stripe-email-failed-preorder-authentication.php';
 				require_once WC_STRIPE_PLUGIN_PATH . '/includes/compat/class-wc-stripe-email-failed-authentication-retry.php';
 
 				// Add all emails, generated by the gateway.
-				$email_classes['WC_Stripe_Email_Failed_Renewal_Authentication']  = new WC_Stripe_Email_Failed_Renewal_Authentication( $email_classes );
-				$email_classes['WC_Stripe_Email_Failed_Preorder_Authentication'] = new WC_Stripe_Email_Failed_Preorder_Authentication( $email_classes );
-				$email_classes['WC_Stripe_Email_Failed_Authentication_Retry'] = new WC_Stripe_Email_Failed_Authentication_Retry( $email_classes );
+				$email_classes['WC_Stripe_Email_Failed_Renewal_Authentication']  = new WC_Stripe_Email_Failed_Renewal_Authentication($email_classes);
+				$email_classes['WC_Stripe_Email_Failed_Preorder_Authentication'] = new WC_Stripe_Email_Failed_Preorder_Authentication($email_classes);
+				$email_classes['WC_Stripe_Email_Failed_Authentication_Retry'] = new WC_Stripe_Email_Failed_Authentication_Retry($email_classes);
 
 				return $email_classes;
 			}
@@ -358,8 +358,8 @@ 
 				require_once WC_STRIPE_PLUGIN_PATH . '/includes/connect/class-wc-stripe-connect-rest-oauth-init-controller.php';
 				require_once WC_STRIPE_PLUGIN_PATH . '/includes/connect/class-wc-stripe-connect-rest-oauth-connect-controller.php';
 
-				$oauth_init    = new WC_Stripe_Connect_REST_Oauth_Init_Controller( $this->connect, $this->api );
-				$oauth_connect = new WC_Stripe_Connect_REST_Oauth_Connect_Controller( $this->connect, $this->api );
+				$oauth_init    = new WC_Stripe_Connect_REST_Oauth_Init_Controller($this->connect, $this->api);
+				$oauth_connect = new WC_Stripe_Connect_REST_Oauth_Connect_Controller($this->connect, $this->api);
 
 				$oauth_init->register_routes();
 				$oauth_connect->register_routes();
@@ -373,18 +373,18 @@ 
 	return $plugin;
 }
 
-add_action( 'plugins_loaded', 'woocommerce_gateway_stripe_init' );
+add_action('plugins_loaded', 'woocommerce_gateway_stripe_init');
 
 function woocommerce_gateway_stripe_init() {
-	load_plugin_textdomain( 'woocommerce-gateway-stripe', false, plugin_basename( dirname( __FILE__ ) ) . '/languages' );
+	load_plugin_textdomain('woocommerce-gateway-stripe', false, plugin_basename(dirname(__FILE__)) . '/languages');
 
-	if ( ! class_exists( 'WooCommerce' ) ) {
-		add_action( 'admin_notices', 'woocommerce_stripe_missing_wc_notice' );
+	if ( ! class_exists('WooCommerce')) {
+		add_action('admin_notices', 'woocommerce_stripe_missing_wc_notice');
 		return;
 	}
 
-	if ( version_compare( WC_VERSION, WC_STRIPE_MIN_WC_VER, '<' ) ) {
-		add_action( 'admin_notices', 'woocommerce_stripe_wc_not_supported' );
+	if (version_compare(WC_VERSION, WC_STRIPE_MIN_WC_VER, '<')) {
+		add_action('admin_notices', 'woocommerce_stripe_wc_not_supported');
 		return;
 	}
 

includes/class-wc-stripe-intent-controller.php

Spacing +49 added lines, -49 removed lines

@@ -1,5 +1,5 @@ 
 <?php
-if ( ! defined( 'ABSPATH' ) ) {
+if ( ! defined('ABSPATH')) {
 	exit;
 }
 
@@ -23,8 +23,8 @@ 
 	 * @since 4.2.0
 	 */
 	public function __construct() {
-		add_action( 'wc_ajax_wc_stripe_verify_intent', array( $this, 'verify_intent' ) );
-		add_action( 'wc_ajax_wc_stripe_create_setup_intent', array( $this, 'create_setup_intent' ) );
+		add_action('wc_ajax_wc_stripe_verify_intent', array($this, 'verify_intent'));
+		add_action('wc_ajax_wc_stripe_create_setup_intent', array($this, 'create_setup_intent'));
 	}
 
 	/**
@@ -34,8 +34,8 @@ 
 	 * @return WC_Gateway_Stripe
 	 */
 	protected function get_gateway() {
-		if ( ! isset( $this->gateway ) ) {
-			if ( class_exists( 'WC_Subscriptions_Order' ) && function_exists( 'wcs_create_renewal_order' ) ) {
+		if ( ! isset($this->gateway)) {
+			if (class_exists('WC_Subscriptions_Order') && function_exists('wcs_create_renewal_order')) {
 				$class_name = 'WC_Stripe_Subs_Compat';
 			} else {
 				$class_name = 'WC_Gateway_Stripe';
@@ -55,21 +55,21 @@ 
 	 * @return WC_Order
 	 */
 	protected function get_order_from_request() {
-		if ( ! isset( $_GET['nonce'] ) || ! wp_verify_nonce( sanitize_key( $_GET['nonce'] ), 'wc_stripe_confirm_pi' ) ) {
-			throw new WC_Stripe_Exception( 'missing-nonce', __( 'CSRF verification failed.', 'woocommerce-gateway-stripe' ) );
+		if ( ! isset($_GET['nonce']) || ! wp_verify_nonce(sanitize_key($_GET['nonce']), 'wc_stripe_confirm_pi')) {
+			throw new WC_Stripe_Exception('missing-nonce', __('CSRF verification failed.', 'woocommerce-gateway-stripe'));
 		}
 
 		// Load the order ID.
 		$order_id = null;
-		if ( isset( $_GET['order'] ) && absint( $_GET['order'] ) ) {
-			$order_id = absint( $_GET['order'] );
+		if (isset($_GET['order']) && absint($_GET['order'])) {
+			$order_id = absint($_GET['order']);
 		}
 
 		// Retrieve the order.
-		$order = wc_get_order( $order_id );
+		$order = wc_get_order($order_id);
 
-		if ( ! $order ) {
-			throw new WC_Stripe_Exception( 'missing-order', __( 'Missing order ID for payment confirmation', 'woocommerce-gateway-stripe' ) );
+		if ( ! $order) {
+			throw new WC_Stripe_Exception('missing-order', __('Missing order ID for payment confirmation', 'woocommerce-gateway-stripe'));
 		}
 
 		return $order;
@@ -87,32 +87,32 @@ 
 
 		try {
 			$order = $this->get_order_from_request();
-		} catch ( WC_Stripe_Exception $e ) {
+		} catch (WC_Stripe_Exception $e) {
 			/* translators: Error message text */
-			$message = sprintf( __( 'Payment verification error: %s', 'woocommerce-gateway-stripe' ), $e->getLocalizedMessage() );
-			wc_add_notice( esc_html( $message ), 'error' );
+			$message = sprintf(__('Payment verification error: %s', 'woocommerce-gateway-stripe'), $e->getLocalizedMessage());
+			wc_add_notice(esc_html($message), 'error');
 
 			$redirect_url = $woocommerce->cart->is_empty()
-				? get_permalink( wc_get_page_id( 'shop' ) )
+				? get_permalink(wc_get_page_id('shop'))
 				: wc_get_checkout_url();
 
-			$this->handle_error( $e, $redirect_url );
+			$this->handle_error($e, $redirect_url);
 		}
 
 		try {
-			$gateway->verify_intent_after_checkout( $order );
+			$gateway->verify_intent_after_checkout($order);
 
-			if ( ! isset( $_GET['is_ajax'] ) ) {
-				$redirect_url = isset( $_GET['redirect_to'] ) // wpcs: csrf ok.
-					? esc_url_raw( wp_unslash( $_GET['redirect_to'] ) ) // wpcs: csrf ok.
-					: $gateway->get_return_url( $order );
+			if ( ! isset($_GET['is_ajax'])) {
+				$redirect_url = isset($_GET['redirect_to']) // wpcs: csrf ok.
+					? esc_url_raw(wp_unslash($_GET['redirect_to'])) // wpcs: csrf ok.
+					: $gateway->get_return_url($order);
 
-				wp_safe_redirect( $redirect_url );
+				wp_safe_redirect($redirect_url);
 			}
 
 			exit;
-		} catch ( WC_Stripe_Exception $e ) {
-			$this->handle_error( $e, $gateway->get_return_url( $order ) );
+		} catch (WC_Stripe_Exception $e) {
+			$this->handle_error($e, $gateway->get_return_url($order));
 		}
 	}
 
@@ -123,17 +123,17 @@ 
 	 * @param WC_Stripe_Exception $e           The exception that was thrown.
 	 * @param string              $redirect_url An URL to use if a redirect is needed.
 	 */
-	protected function handle_error( $e, $redirect_url ) {
+	protected function handle_error($e, $redirect_url) {
 		// Log the exception before redirecting.
-		$message = sprintf( 'PaymentIntent verification exception: %s', $e->getLocalizedMessage() );
-		WC_Stripe_Logger::log( $message );
+		$message = sprintf('PaymentIntent verification exception: %s', $e->getLocalizedMessage());
+		WC_Stripe_Logger::log($message);
 
 		// `is_ajax` is only used for PI error reporting, a response is not expected.
-		if ( isset( $_GET['is_ajax'] ) ) {
+		if (isset($_GET['is_ajax'])) {
 			exit;
 		}
 
-		wp_safe_redirect( $redirect_url );
+		wp_safe_redirect($redirect_url);
 		exit;
 	}
 
@@ -143,31 +143,31 @@ 
 	public function create_setup_intent() {
 		if (
 			! is_user_logged_in()
-			|| ! isset( $_POST['stripe_source_id'] )
-			|| ! isset( $_POST['nonce'] )
+			|| ! isset($_POST['stripe_source_id'])
+			|| ! isset($_POST['nonce'])
 		) {
 			return;
 		}
 
 		try {
-			$source_id = wc_clean( $_POST['stripe_source_id'] );
+			$source_id = wc_clean($_POST['stripe_source_id']);
 
 			// 1. Verify.
 			if (
-				! wp_verify_nonce( sanitize_key( $_POST['nonce'] ), 'wc_stripe_create_si' )
-				|| ! preg_match( '/^src_.*$/', $source_id )
+				! wp_verify_nonce(sanitize_key($_POST['nonce']), 'wc_stripe_create_si')
+				|| ! preg_match('/^src_.*$/', $source_id)
 			) {
-				throw new Exception( __( 'Unable to verify your request. Please reload the page and try again.', 'woocommerce-gateway-stripe' ) );
+				throw new Exception(__('Unable to verify your request. Please reload the page and try again.', 'woocommerce-gateway-stripe'));
 			}
 
 
 			// 2. Load the customer ID (and create a customer eventually).
-			$customer = new WC_Stripe_Customer( wp_get_current_user()->ID );
+			$customer = new WC_Stripe_Customer(wp_get_current_user()->ID);
 
 			// 3. Attach the source to the customer (Setup Intents require that).
-			$source_object = $customer->attach_source( $source_id );
-			if ( is_wp_error( $source_object ) ) {
-				throw new Exception( $source_object->get_error_message() );
+			$source_object = $customer->attach_source($source_id);
+			if (is_wp_error($source_object)) {
+				throw new Exception($source_object->get_error_message());
 			}
 
 			// 4. Generate the setup intent
@@ -180,28 +180,28 @@ 
 				'setup_intents'
 			);
 
-			if ( $setup_intent->error ) {
-				$error_response_message = print_r( $setup_intent, true );
+			if ($setup_intent->error) {
+				$error_response_message = print_r($setup_intent, true);
 				WC_Stripe_Logger::log("Failed create Setup Intent while saving a card.");
 				WC_Stripe_Logger::log("Response: $error_response_message");
-				throw new Exception( __( 'Your card could not be set up for future usage.', 'woocommerce-gateway-stripe' ) );
+				throw new Exception(__('Your card could not be set up for future usage.', 'woocommerce-gateway-stripe'));
 			}
 
 			// 5. Respond.
-			if ( 'requires_action' === $setup_intent->status ) {
+			if ('requires_action' === $setup_intent->status) {
 				$response = [
 					'status'        => 'requires_action',
 					'client_secret' => $setup_intent->client_secret,
 				];
-			} elseif ( 'requires_payment_method' === $setup_intent->status
+			} elseif ('requires_payment_method' === $setup_intent->status
 				|| 'requires_confirmation' === $setup_intent->status
-				|| 'canceled' === $setup_intent->status ) {
+				|| 'canceled' === $setup_intent->status) {
 				// These statuses should not be possible, as such we return an error.
 				$response = [
 					'status' => 'error',
 					'error'  => [
 						'type'    => 'setup_intent_error',
-						'message' => __( 'Failed to save payment method.', 'woocommerce-gateway-stripe' ),
+						'message' => __('Failed to save payment method.', 'woocommerce-gateway-stripe'),
 					],
 				];
 			} else {
@@ -211,7 +211,7 @@ 
 					'status' => 'success',
 				];
 			}
-		} catch ( Exception $e ) {
+		} catch (Exception $e) {
 			$response = [
 				'status' => 'error',
 				'error'  => array(
@@ -221,7 +221,7 @@ 
 			];
 		}
 
-		echo wp_json_encode( $response );
+		echo wp_json_encode($response);
 		exit;
 	}
 }