woocommerce / woocommerce-gateway-stripe

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

Spacing +184 added lines, -184 removed lines

@@ -1,5 +1,5 @@ 
 <?php
-if ( ! defined( 'ABSPATH' ) ) {
+if ( ! defined('ABSPATH')) {
 	exit;
 }
 
@@ -15,23 +15,23 @@ 
 	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 );
+		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);
 
 			// 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'));
 		}
 
-		if ( class_exists( 'WC_Pre_Orders_Order' ) ) {
-			add_action( 'wc_pre_orders_process_pre_order_completion_payment_' . $this->id, array( $this, 'process_pre_order_release_payment' ) );
+		if (class_exists('WC_Pre_Orders_Order')) {
+			add_action('wc_pre_orders_process_pre_order_completion_payment_' . $this->id, array($this, 'process_pre_order_release_payment'));
 		}
 	}
 
@@ -42,8 +42,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;
 		}
 
@@ -55,8 +55,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)));
 	}
 
 	/**
@@ -66,7 +66,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']));
 	}
 
 	/**
@@ -74,8 +74,8 @@ 
 	 * @param  int  $order_id
 	 * @return boolean
 	 */
-	public function is_pre_order( $order_id ) {
-		return ( class_exists( 'WC_Pre_Orders_Order' ) && WC_Pre_Orders_Order::order_contains_pre_order( $order_id ) );
+	public function is_pre_order($order_id) {
+		return (class_exists('WC_Pre_Orders_Order') && WC_Pre_Orders_Order::order_contains_pre_order($order_id));
 	}
 
 	/**
@@ -84,26 +84,26 @@ 
 	 * @since 4.0.4
 	 * @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 );
+			$subscription    = wc_get_order($order_id);
 			$source_object   = $this->get_source_object();
-			$prepared_source = $this->prepare_source( $source_object, get_current_user_id(), true );
+			$prepared_source = $this->prepare_source($source_object, get_current_user_id(), true);
 
 			// Check if we don't allow prepaid credit cards.
-			if ( ! apply_filters( 'wc_stripe_allow_prepaid_card', true ) ) {
-				if ( $source_object && 'token' === $source_object->object && 'prepaid' === $source_object->card->funding ) {
-					$localized_message = __( 'Sorry, we\'re not accepting prepaid cards at this time. Your credit card has not been charge. Please try with alternative payment method.', 'woocommerce-gateway-stripe' );
-					throw new WC_Stripe_Exception( print_r( $source_object, true ), $localized_message );
+			if ( ! apply_filters('wc_stripe_allow_prepaid_card', true)) {
+				if ($source_object && 'token' === $source_object->object && 'prepaid' === $source_object->card->funding) {
+					$localized_message = __('Sorry, we\'re not accepting prepaid cards at this time. Your credit card has not been charge. Please try with alternative payment method.', 'woocommerce-gateway-stripe');
+					throw new WC_Stripe_Exception(print_r($source_object, true), $localized_message);
 				}
 			}
 
-			if ( empty( $prepared_source->source ) ) {
-				$localized_message = __( 'Payment processing failed. Please retry.', 'woocommerce-gateway-stripe' );
-				throw new WC_Stripe_Exception( print_r( $prepared_source, true ), $localized_message );
+			if (empty($prepared_source->source)) {
+				$localized_message = __('Payment processing failed. Please retry.', 'woocommerce-gateway-stripe');
+				throw new WC_Stripe_Exception(print_r($prepared_source, true), $localized_message);
 			}
 
-			$this->save_source_to_order( $subscription, $prepared_source );
+			$this->save_source_to_order($subscription, $prepared_source);
 
 			/*
 			 * Check if card 3DS is required or optional with 3DS setting.
@@ -112,41 +112,41 @@ 
 			 * Note that if we need to save source, the original source must be first
 			 * attached to a customer in Stripe before it can be charged.
 			 */
-			if ( $this->is_3ds_required( $source_object ) ) {
+			if ($this->is_3ds_required($source_object)) {
 				$order    = $subscription->get_parent();
-				$response = $this->create_3ds_source( $order, $source_object, $subscription->get_view_order_url() );
+				$response = $this->create_3ds_source($order, $source_object, $subscription->get_view_order_url());
 
-				if ( ! empty( $response->error ) ) {
+				if ( ! empty($response->error)) {
 					$localized_message = $response->error->message;
 
-					$order->add_order_note( $localized_message );
+					$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);
 				}
 
 				// Update order meta with 3DS source.
-				if ( WC_Stripe_Helper::is_pre_30() ) {
-					update_post_meta( $order_id, '_stripe_source_id', $response->id );
+				if (WC_Stripe_Helper::is_pre_30()) {
+					update_post_meta($order_id, '_stripe_source_id', $response->id);
 				} else {
-					$subscription->update_meta_data( '_stripe_source_id', $response->id );
+					$subscription->update_meta_data('_stripe_source_id', $response->id);
 					$subscription->save();
 				}
 
-				WC_Stripe_Logger::log( 'Info: Redirecting to 3DS...' );
+				WC_Stripe_Logger::log('Info: Redirecting to 3DS...');
 
 				return array(
 					'result'   => 'success',
-					'redirect' => esc_url_raw( $response->redirect->url ),
+					'redirect' => esc_url_raw($response->redirect->url),
 				);
 			}
 
 			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());
 		}
 	}
 
@@ -155,18 +155,18 @@ 
 	 * @param  int $order_id
 	 * @return array
 	 */
-	public function process_payment( $order_id, $retry = true, $force_save_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) {
+		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, true, true );
-		} elseif ( $this->is_pre_order( $order_id ) ) {
-			return $this->process_pre_order( $order_id, $retry, $force_save_source );
+			return parent::process_payment($order_id, true, true);
+		} elseif ($this->is_pre_order($order_id)) {
+			return $this->process_pre_order($order_id, $retry, $force_save_source);
 		} else {
-			return parent::process_payment( $order_id, $retry, $force_save_source );
+			return parent::process_payment($order_id, $retry, $force_save_source);
 		}
 	}
 
@@ -176,24 +176,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 = WC_Stripe_Helper::is_pre_30() ? $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 = WC_Stripe_Helper::is_pre_30() ? $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);
 		}
 	}
 
@@ -206,45 +206,45 @@ 
 	 * @param mixed $renewal_order
 	 * @param bool $is_retry Is this a retry process.
 	 */
-	public function process_subscription_payment( $amount = 0.0, $renewal_order, $is_retry = false ) {
-		if ( $amount * 100 < WC_Stripe_Helper::get_minimum_amount() ) {
+	public function process_subscription_payment($amount = 0.0, $renewal_order, $is_retry = false) {
+		if ($amount * 100 < WC_Stripe_Helper::get_minimum_amount()) {
 			/* translators: minimum amount */
-			return new WP_Error( 'stripe_error', 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 ) ) );
+			return new WP_Error('stripe_error', 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)));
 		}
 
 		$order_id = WC_Stripe_Helper::is_pre_30() ? $renewal_order->id : $renewal_order->get_id();
 
 		// Get source from order
-		$prepared_source = $this->prepare_order_source( $renewal_order );
+		$prepared_source = $this->prepare_order_source($renewal_order);
 
-		if ( ! $prepared_source->customer ) {
-			return new WP_Error( 'stripe_error', __( 'Customer not found', 'woocommerce-gateway-stripe' ) );
+		if ( ! $prepared_source->customer) {
+			return new WP_Error('stripe_error', __('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 ( $is_retry ) {
+		if ($is_retry) {
 			// Passing empty source with charge customer default.
 			$prepared_source->source = '';
 		}
 
-		$request            = $this->generate_payment_request( $renewal_order, $prepared_source );
+		$request            = $this->generate_payment_request($renewal_order, $prepared_source);
 		$request['capture'] = 'true';
-		$request['amount']  = WC_Stripe_Helper::get_stripe_amount( $amount, $request['currency'] );
-		$response           = WC_Stripe_API::request( $request );
+		$request['amount']  = WC_Stripe_Helper::get_stripe_amount($amount, $request['currency']);
+		$response           = WC_Stripe_API::request($request);
 
-		if ( ! empty( $response->error ) || is_wp_error( $response ) ) {
-			if ( $is_retry ) {
+		if ( ! empty($response->error) || is_wp_error($response)) {
+			if ($is_retry) {
 				/* translators: error message */
-				$renewal_order->update_status( 'failed', sprintf( __( 'Stripe Transaction Failed (%s)', 'woocommerce-gateway-stripe' ), $response->error->message ) );
+				$renewal_order->update_status('failed', sprintf(__('Stripe Transaction Failed (%s)', 'woocommerce-gateway-stripe'), $response->error->message));
 			}
 
 			return $response; // Default catch all errors.
 		}
 
-		$this->process_response( $response, $renewal_order );
+		$this->process_response($response, $renewal_order);
 
-		if ( ! $is_retry ) {
+		if ( ! $is_retry) {
 			return $response;
 		}
 	}
@@ -253,21 +253,21 @@ 
 	 * 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( ( WC_Stripe_Helper::is_pre_30() ? $resubscribe_order->id : $resubscribe_order->get_id() ), '_stripe_customer_id' );
-		delete_post_meta( ( WC_Stripe_Helper::is_pre_30() ? $resubscribe_order->id : $resubscribe_order->get_id() ), '_stripe_source_id' );
+	public function delete_resubscribe_meta($resubscribe_order) {
+		delete_post_meta((WC_Stripe_Helper::is_pre_30() ? $resubscribe_order->id : $resubscribe_order->get_id()), '_stripe_customer_id');
+		delete_post_meta((WC_Stripe_Helper::is_pre_30() ? $resubscribe_order->id : $resubscribe_order->get_id()), '_stripe_source_id');
 		// For BW compat will remove in future
-		delete_post_meta( ( WC_Stripe_Helper::is_pre_30() ? $resubscribe_order->id : $resubscribe_order->get_id() ), '_stripe_card_id' );
-		$this->delete_renewal_meta( $resubscribe_order );
+		delete_post_meta((WC_Stripe_Helper::is_pre_30() ? $resubscribe_order->id : $resubscribe_order->get_id()), '_stripe_card_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 ) {
-		delete_post_meta( ( WC_Stripe_Helper::is_pre_30() ? $renewal_order->id : $renewal_order->get_id() ), 'Stripe Fee' );
-		delete_post_meta( ( WC_Stripe_Helper::is_pre_30() ? $renewal_order->id : $renewal_order->get_id() ), 'Net Revenue From Stripe' );
+	public function delete_renewal_meta($renewal_order) {
+		delete_post_meta((WC_Stripe_Helper::is_pre_30() ? $renewal_order->id : $renewal_order->get_id()), 'Stripe Fee');
+		delete_post_meta((WC_Stripe_Helper::is_pre_30() ? $renewal_order->id : $renewal_order->get_id()), 'Net Revenue From Stripe');
 		return $renewal_order;
 	}
 
@@ -277,21 +277,21 @@ 
 	 * @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 ) {
-		$response = $this->process_subscription_payment( $amount_to_charge, $renewal_order );
+	public function scheduled_subscription_payment($amount_to_charge, $renewal_order) {
+		$response = $this->process_subscription_payment($amount_to_charge, $renewal_order);
 
-		if ( is_wp_error( $response ) ) {
+		if (is_wp_error($response)) {
 			/* translators: error message */
-			$renewal_order->update_status( 'failed', sprintf( __( 'Stripe Transaction Failed (%s)', 'woocommerce-gateway-stripe' ), $response->get_error_message() ) );
+			$renewal_order->update_status('failed', sprintf(__('Stripe Transaction Failed (%s)', 'woocommerce-gateway-stripe'), $response->get_error_message()));
 		}
 
-		if ( ! empty( $response->error ) ) {
+		if ( ! empty($response->error)) {
 			// This is a very generic error to listen for but worth a retry before total fail.
-			if ( isset( $response->error->type ) && 'invalid_request_error' === $response->error->type && apply_filters( 'wc_stripe_use_default_customer_source', true ) ) {
-				$this->process_subscription_payment( $amount_to_charge, $renewal_order, true );
+			if (isset($response->error->type) && 'invalid_request_error' === $response->error->type && apply_filters('wc_stripe_use_default_customer_source', true)) {
+				$this->process_subscription_payment($amount_to_charge, $renewal_order, true);
 			} else {
 				/* translators: error message */
-				$renewal_order->update_status( 'failed', sprintf( __( 'Stripe Transaction Failed (%s)', 'woocommerce-gateway-stripe' ), $response->error->message ) );
+				$renewal_order->update_status('failed', sprintf(__('Stripe Transaction Failed (%s)', 'woocommerce-gateway-stripe'), $response->error->message));
 			}
 		}
 	}
@@ -300,20 +300,20 @@ 
 	 * Remove order meta
 	 * @param object $order
 	 */
-	public function remove_order_source_before_retry( $order ) {
+	public function remove_order_source_before_retry($order) {
 		$order_id = WC_Stripe_Helper::is_pre_30() ? $order->id : $order->get_id();
-		delete_post_meta( $order_id, '_stripe_source_id' );
+		delete_post_meta($order_id, '_stripe_source_id');
 		// For BW compat will remove in the future.
-		delete_post_meta( $order_id, '_stripe_card_id' );
+		delete_post_meta($order_id, '_stripe_card_id');
 	}
 
 	/**
 	 * Remove order meta
 	 * @param  object $order
 	 */
-	public function remove_order_customer_before_retry( $order ) {
+	public function remove_order_customer_before_retry($order) {
 		$order_id = WC_Stripe_Helper::is_pre_30() ? $order->id : $order->get_id();
-		delete_post_meta( $order_id, '_stripe_customer_id' );
+		delete_post_meta($order_id, '_stripe_customer_id');
 	}
 
 	/**
@@ -325,14 +325,14 @@ 
 	 * @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 ) {
-		if ( WC_Stripe_Helper::is_pre_30() ) {
-			update_post_meta( $subscription->id, '_stripe_customer_id', $renewal_order->stripe_customer_id );
-			update_post_meta( $subscription->id, '_stripe_source_id', $renewal_order->stripe_source_id );
+	public function update_failing_payment_method($subscription, $renewal_order) {
+		if (WC_Stripe_Helper::is_pre_30()) {
+			update_post_meta($subscription->id, '_stripe_customer_id', $renewal_order->stripe_customer_id);
+			update_post_meta($subscription->id, '_stripe_source_id', $renewal_order->stripe_source_id);
 
 		} else {
-			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 ) );
+			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));
 		}
 	}
 
@@ -345,21 +345,21 @@ 
 	 * @param WC_Subscription $subscription An instance of a subscription object
 	 * @return array
 	 */
-	public function add_subscription_payment_meta( $payment_meta, $subscription ) {
-		$source_id = get_post_meta( ( WC_Stripe_Helper::is_pre_30() ? $subscription->id : $subscription->get_id() ), '_stripe_source_id', true );
+	public function add_subscription_payment_meta($payment_meta, $subscription) {
+		$source_id = get_post_meta((WC_Stripe_Helper::is_pre_30() ? $subscription->id : $subscription->get_id()), '_stripe_source_id', true);
 
 		// For BW compat will remove in future.
-		if ( empty( $source_id ) ) {
-			$source_id = get_post_meta( ( WC_Stripe_Helper::is_pre_30() ? $subscription->id : $subscription->get_id() ), '_stripe_card_id', true );
+		if (empty($source_id)) {
+			$source_id = get_post_meta((WC_Stripe_Helper::is_pre_30() ? $subscription->id : $subscription->get_id()), '_stripe_card_id', true);
 
 			// Take this opportunity to update the key name.
-			WC_Stripe_Helper::is_pre_30() ? update_post_meta( $subscription->id, '_stripe_source_id', $source_id ) : update_post_meta( $subscription->get_id(), '_stripe_source_id', $source_id );
+			WC_Stripe_Helper::is_pre_30() ? update_post_meta($subscription->id, '_stripe_source_id', $source_id) : update_post_meta($subscription->get_id(), '_stripe_source_id', $source_id);
 		}
 
-		$payment_meta[ $this->id ] = array(
+		$payment_meta[$this->id] = array(
 			'post_meta' => array(
 				'_stripe_customer_id' => array(
-					'value' => get_post_meta( ( WC_Stripe_Helper::is_pre_30() ? $subscription->id : $subscription->get_id() ), '_stripe_customer_id', true ),
+					'value' => get_post_meta((WC_Stripe_Helper::is_pre_30() ? $subscription->id : $subscription->get_id()), '_stripe_customer_id', true),
 					'label' => 'Stripe Customer ID',
 				),
 				'_stripe_source_id' => array(
@@ -382,22 +382,22 @@ 
 	 * @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'] ) ) {
-				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' ) );
+			if ( ! isset($payment_meta['post_meta']['_stripe_customer_id']['value']) || empty($payment_meta['post_meta']['_stripe_customer_id']['value'])) {
+				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'));
 			}
 
 			if (
-				( ! empty( $payment_meta['post_meta']['_stripe_source_id']['value'] )
-				&& 0 !== strpos( $payment_meta['post_meta']['_stripe_source_id']['value'], 'card_' ) )
-				&& ( ! empty( $payment_meta['post_meta']['_stripe_source_id']['value'] )
-				&& 0 !== strpos( $payment_meta['post_meta']['_stripe_source_id']['value'], 'src_' ) ) ) {
+				( ! empty($payment_meta['post_meta']['_stripe_source_id']['value'])
+				&& 0 !== strpos($payment_meta['post_meta']['_stripe_source_id']['value'], 'card_'))
+				&& ( ! empty($payment_meta['post_meta']['_stripe_source_id']['value'])
+				&& 0 !== strpos($payment_meta['post_meta']['_stripe_source_id']['value'], 'src_')) ) {
 
-				throw new Exception( __( 'Invalid source ID. A valid source "Stripe Source ID" must begin with "src_" or "card_".', 'woocommerce-gateway-stripe' ) );
+				throw new Exception(__('Invalid source ID. A valid source "Stripe Source ID" must begin with "src_" or "card_".', 'woocommerce-gateway-stripe'));
 			}
 		}
 	}
@@ -410,91 +410,91 @@ 
 	 * @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 = WC_Stripe_Helper::is_pre_30() ? $subscription->customer_user : $subscription->get_customer_id();
 
 		// bail for other payment methods
-		if ( ( WC_Stripe_Helper::is_pre_30() ? $subscription->payment_method : $subscription->get_payment_method() ) !== $this->id || ! $customer_user ) {
+		if ((WC_Stripe_Helper::is_pre_30() ? $subscription->payment_method : $subscription->get_payment_method()) !== $this->id || ! $customer_user) {
 			return $payment_method_to_display;
 		}
 
-		$stripe_source_id = get_post_meta( ( WC_Stripe_Helper::is_pre_30() ? $subscription->id : $subscription->get_id() ), '_stripe_source_id', true );
+		$stripe_source_id = get_post_meta((WC_Stripe_Helper::is_pre_30() ? $subscription->id : $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( ( WC_Stripe_Helper::is_pre_30() ? $subscription->id : $subscription->get_id() ), '_stripe_card_id', true );
+		if (empty($stripe_source_id)) {
+			$stripe_source_id = get_post_meta((WC_Stripe_Helper::is_pre_30() ? $subscription->id : $subscription->get_id()), '_stripe_card_id', true);
 
 			// Take this opportunity to update the key name.
-			WC_Stripe_Helper::is_pre_30() ? update_post_meta( $subscription->id, '_stripe_source_id', $stripe_source_id ) : update_post_meta( $subscription->get_id(), '_stripe_source_id', $stripe_source_id );
+			WC_Stripe_Helper::is_pre_30() ? update_post_meta($subscription->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( ( WC_Stripe_Helper::is_pre_30() ? $subscription->id : $subscription->get_id() ), '_stripe_customer_id', true );
+		$stripe_customer_id = get_post_meta((WC_Stripe_Helper::is_pre_30() ? $subscription->id : $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_meta( $user_id, '_stripe_customer_id', true );
-			$stripe_source_id   = get_user_meta( $user_id, '_stripe_source_id', true );
+			$stripe_customer_id = get_user_meta($user_id, '_stripe_customer_id', true);
+			$stripe_source_id   = get_user_meta($user_id, '_stripe_source_id', true);
 
 			// For BW compat will remove in future.
-			if ( empty( $stripe_source_id ) ) {
-				$stripe_source_id = get_user_meta( $user_id, '_stripe_card_id', true );
+			if (empty($stripe_source_id)) {
+				$stripe_source_id = get_user_meta($user_id, '_stripe_card_id', true);
 
 				// Take this opportunity to update the key name.
-				update_user_meta( $user_id, '_stripe_source_id', $stripe_source_id );
+				update_user_meta($user_id, '_stripe_source_id', $stripe_source_id);
 			}
 		}
 
 		// 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( ( WC_Stripe_Helper::is_pre_30() ? $subscription->order->id : $subscription->get_parent_id() ), '_stripe_customer_id', true );
-			$stripe_source_id   = get_post_meta( ( WC_Stripe_Helper::is_pre_30() ? $subscription->order->id : $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((WC_Stripe_Helper::is_pre_30() ? $subscription->order->id : $subscription->get_parent_id()), '_stripe_customer_id', true);
+			$stripe_source_id   = get_post_meta((WC_Stripe_Helper::is_pre_30() ? $subscription->order->id : $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( ( WC_Stripe_Helper::is_pre_30() ? $subscription->order->id : $subscription->get_parent_id() ), '_stripe_card_id', true );
+			if (empty($stripe_source_id)) {
+				$stripe_source_id = get_post_meta((WC_Stripe_Helper::is_pre_30() ? $subscription->order->id : $subscription->get_parent_id()), '_stripe_card_id', true);
 
 				// Take this opportunity to update the key name.
-				WC_Stripe_Helper::is_pre_30() ? update_post_meta( $subscription->order->id, '_stripe_source_id', $stripe_source_id ) : update_post_meta( $subscription->get_parent_id(), '_stripe_source_id', $stripe_source_id );
+				WC_Stripe_Helper::is_pre_30() ? update_post_meta($subscription->order->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();
 
-		if ( $sources ) {
+		if ($sources) {
 			$found_source = 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 ($source->id === $stripe_source_id) {
 					$found_source = true;
 
-					if ( $card ) {
+					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);
 					} else {
-						$payment_method_to_display = __( 'N/A', 'woocommerce-gateway-stripe' );
+						$payment_method_to_display = __('N/A', 'woocommerce-gateway-stripe');
 					}
 					break;
 				}
 			}
 
-			if ( ! $found_source ) {
-				if ( 'card' === $sources[0]->type ) {
+			if ( ! $found_source) {
+				if ('card' === $sources[0]->type) {
 					$card = $sources[0]->card;
 				}
 
-				if ( $card ) {
+				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);
 				} else {
-					$payment_method_to_display = __( 'N/A', 'woocommerce-gateway-stripe' );
+					$payment_method_to_display = __('N/A', 'woocommerce-gateway-stripe');
 				}
 			}
 		}
@@ -507,42 +507,42 @@ 
 	 * @param int $order_id
 	 * @return array
 	 */
-	public function process_pre_order( $order_id, $retry, $force_save_source ) {
-		if ( WC_Pre_Orders_Order::order_requires_payment_tokenization( $order_id ) ) {
+	public function process_pre_order($order_id, $retry, $force_save_source) {
+		if (WC_Pre_Orders_Order::order_requires_payment_tokenization($order_id)) {
 			try {
-				$order = wc_get_order( $order_id );
+				$order = wc_get_order($order_id);
 
-				if ( $order->get_total() * 100 < WC_Stripe_Helper::get_minimum_amount() ) {
+				if ($order->get_total() * 100 < WC_Stripe_Helper::get_minimum_amount()) {
 					/* translators: minimum amount */
-					throw new Exception( 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 Exception(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)));
 				}
 
-				$source = $this->prepare_source( $this->get_source_object(), get_current_user_id(), true );
+				$source = $this->prepare_source($this->get_source_object(), get_current_user_id(), true);
 
 				// We need a source on file to continue.
-				if ( empty( $source->customer ) || empty( $source->source ) ) {
-					throw new Exception( __( 'Unable to store payment details. Please try again.', 'woocommerce-gateway-stripe' ) );
+				if (empty($source->customer) || empty($source->source)) {
+					throw new Exception(__('Unable to store payment details. Please try again.', 'woocommerce-gateway-stripe'));
 				}
 
-				$this->save_source_to_order( $order, $source );
+				$this->save_source_to_order($order, $source);
 
 				// Remove cart
 				WC()->cart->empty_cart();
 
 				// Is pre ordered!
-				WC_Pre_Orders_Order::mark_order_as_pre_ordered( $order );
+				WC_Pre_Orders_Order::mark_order_as_pre_ordered($order);
 
 				// Return thank you page redirect
 				return array(
 					'result'   => 'success',
-					'redirect' => $this->get_return_url( $order ),
+					'redirect' => $this->get_return_url($order),
 				);
-			} catch ( Exception $e ) {
-				wc_add_notice( $e->getMessage(), 'error' );
+			} catch (Exception $e) {
+				wc_add_notice($e->getMessage(), 'error');
 				return;
 			}
 		} else {
-			return parent::process_payment( $order_id, $retry, $force_save_source );
+			return parent::process_payment($order_id, $retry, $force_save_source);
 		}
 	}
 
@@ -551,7 +551,7 @@ 
 	 * @param WC_Order $order
 	 * @return void
 	 */
-	public function process_pre_order_release_payment( $order ) {
+	public function process_pre_order_release_payment($order) {
 		try {
 			// Define some callbacks if the first attempt fails.
 			$retry_callbacks = array(
@@ -559,33 +559,33 @@ 
 				'remove_order_customer_before_retry',
 			);
 
-			while ( 1 ) {
-				$source   = $this->prepare_order_source( $order );
-				$response = WC_Stripe_API::request( $this->generate_payment_request( $order, $source ) );
+			while (1) {
+				$source   = $this->prepare_order_source($order);
+				$response = WC_Stripe_API::request($this->generate_payment_request($order, $source));
 
-				if ( ! empty( $response->error ) ) {
-					if ( 0 === sizeof( $retry_callbacks ) ) {
-						throw new Exception( $response->error->message );
+				if ( ! empty($response->error)) {
+					if (0 === sizeof($retry_callbacks)) {
+						throw new Exception($response->error->message);
 					} else {
-						$retry_callback = array_shift( $retry_callbacks );
-						call_user_func( array( $this, $retry_callback ), $order );
+						$retry_callback = array_shift($retry_callbacks);
+						call_user_func(array($this, $retry_callback), $order);
 					}
 				} else {
 					// Successful
-					$this->process_response( $response, $order );
+					$this->process_response($response, $order);
 					break;
 				}
 			}
-		} catch ( Exception $e ) {
+		} catch (Exception $e) {
 			/* translators: error message */
-			$order_note = sprintf( __( 'Stripe Transaction Failed (%s)', 'woocommerce-gateway-stripe' ), $e->getMessage() );
+			$order_note = sprintf(__('Stripe Transaction Failed (%s)', 'woocommerce-gateway-stripe'), $e->getMessage());
 
 			// Mark order as failed if not already set,
 			// otherwise, make sure we add the order note so we can detect when someone fails to check out multiple times
-			if ( ! $order->has_status( 'failed' ) ) {
-				$order->update_status( 'failed', $order_note );
+			if ( ! $order->has_status('failed')) {
+				$order->update_status('failed', $order_note);
 			} else {
-				$order->add_order_note( $order_note );
+				$order->add_order_note($order_note);
 			}
 		}
 	}

woocommerce-gateway-stripe.php

Spacing +130 added lines, -130 removed lines

@@ -15,20 +15,20 @@ 
  *
  */
 
-if ( ! defined( 'ABSPATH' ) ) {
+if ( ! defined('ABSPATH')) {
 	exit;
 }
 
-if ( ! class_exists( 'WC_Stripe' ) ) :
+if ( ! class_exists('WC_Stripe')) :
 	/**
 	 * Required minimums and constants
 	 */
-	define( 'WC_STRIPE_VERSION', '4.0.5' );
-	define( 'WC_STRIPE_MIN_PHP_VER', '5.6.0' );
-	define( 'WC_STRIPE_MIN_WC_VER', '2.6.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.0.5');
+	define('WC_STRIPE_MIN_PHP_VER', '5.6.0');
+	define('WC_STRIPE_MIN_WC_VER', '2.6.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__)));
 
 	class WC_Stripe {
 
@@ -48,7 +48,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;
@@ -81,10 +81,10 @@ 
 		 * *Singleton* via the `new` operator from outside of this class.
 		 */
 		private function __construct() {
-			add_action( 'admin_init', array( $this, 'check_environment' ) );
-			add_action( 'admin_notices', array( $this, 'admin_notices' ), 15 );
-			add_action( 'plugins_loaded', array( $this, 'init' ) );
-			add_action( 'wp_loaded', array( $this, 'hide_notices' ) );
+			add_action('admin_init', array($this, 'check_environment'));
+			add_action('admin_notices', array($this, 'admin_notices'), 15);
+			add_action('plugins_loaded', array($this, 'init'));
+			add_action('wp_loaded', array($this, 'hide_notices'));
 		}
 
 		/**
@@ -94,44 +94,44 @@ 
 		 * @version 4.0.0
 		 */
 		public function init() {
-			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/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');
 
 			// Don't hook anything else in the plugin if we're in an incompatible environment
-			if ( self::get_environment_warning() ) {
+			if (self::get_environment_warning()) {
 				return;
 			}
 
-			load_plugin_textdomain( 'woocommerce-gateway-stripe', false, plugin_basename( dirname( __FILE__ ) ) . '/languages' );
-
-			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/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-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-bitcoin.php' );
-			require_once( dirname( __FILE__ ) . '/includes/payment-methods/class-wc-stripe-payment-request.php' );
-			require_once( dirname( __FILE__ ) . '/includes/compat/class-wc-stripe-compat.php' );
-			require_once( dirname( __FILE__ ) . '/includes/compat/class-wc-stripe-sepa-compat.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' );
+			load_plugin_textdomain('woocommerce-gateway-stripe', false, plugin_basename(dirname(__FILE__)) . '/languages');
+
+			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/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-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-bitcoin.php');
+			require_once(dirname(__FILE__) . '/includes/payment-methods/class-wc-stripe-payment-request.php');
+			require_once(dirname(__FILE__) . '/includes/compat/class-wc-stripe-compat.php');
+			require_once(dirname(__FILE__) . '/includes/compat/class-wc-stripe-sepa-compat.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');
 
 			// 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( 'plugin_action_links_' . plugin_basename( __FILE__ ), array( $this, 'plugin_action_links' ) );
-			add_filter( 'woocommerce_get_sections_checkout', array( $this, 'filter_gateway_order_admin' ) );
+			add_filter('woocommerce_payment_gateways', array($this, 'add_gateways'));
+			add_filter('plugin_action_links_' . plugin_basename(__FILE__), array($this, 'plugin_action_links'));
+			add_filter('woocommerce_get_sections_checkout', array($this, 'filter_gateway_order_admin'));
 		}
 
 		/**
@@ -141,23 +141,23 @@ 
 		 * @version 4.0.0
 		 */
 		public function hide_notices() {
-			if ( isset( $_GET['wc-stripe-hide-notice'] ) && isset( $_GET['_wc_stripe_notice_nonce'] ) ) {
-				if ( ! wp_verify_nonce( $_GET['_wc_stripe_notice_nonce'], 'wc_stripe_hide_notices_nonce' ) ) {
-					wp_die( __( 'Action failed. Please refresh the page and retry.', 'woocommerce-gateway-stripe' ) );
+			if (isset($_GET['wc-stripe-hide-notice']) && isset($_GET['_wc_stripe_notice_nonce'])) {
+				if ( ! wp_verify_nonce($_GET['_wc_stripe_notice_nonce'], 'wc_stripe_hide_notices_nonce')) {
+					wp_die(__('Action failed. Please refresh the page and retry.', 'woocommerce-gateway-stripe'));
 				}
 
-				if ( ! current_user_can( 'manage_woocommerce' ) ) {
-					wp_die( __( 'Cheatin’ huh?', 'woocommerce-gateway-stripe' ) );
+				if ( ! current_user_can('manage_woocommerce')) {
+					wp_die(__('Cheatin’ huh?', 'woocommerce-gateway-stripe'));
 				}
 
-				$notice = wc_clean( $_GET['wc-stripe-hide-notice'] );
+				$notice = wc_clean($_GET['wc-stripe-hide-notice']);
 
-				switch ( $notice ) {
+				switch ($notice) {
 					case 'ssl':
-						update_option( 'wc_stripe_show_ssl_notice', 'no' );
+						update_option('wc_stripe_show_ssl_notice', 'no');
 						break;
 					case 'keys':
-						update_option( 'wc_stripe_show_keys_notice', 'no' );
+						update_option('wc_stripe_show_keys_notice', 'no');
 						break;
 				}
 			}
@@ -169,8 +169,8 @@ 
 		 * @since 1.0.0
 		 * @version 4.0.0
 		 */
-		public function add_admin_notice( $slug, $class, $message, $dismissible = false ) {
-			$this->notices[ $slug ] = array(
+		public function add_admin_notice($slug, $class, $message, $dismissible = false) {
+			$this->notices[$slug] = array(
 				'class'       => $class,
 				'message'     => $message,
 				'dismissible' => $dismissible,
@@ -184,21 +184,21 @@ 
 		 * @version 4.0.0
 		 */
 		public function admin_notices() {
-			if ( ! current_user_can( 'manage_woocommerce' ) ) {
+			if ( ! current_user_can('manage_woocommerce')) {
 				return;
 			}
 
-			foreach ( (array) $this->notices as $notice_key => $notice ) {
-				echo '<div class="' . esc_attr( $notice['class'] ) . '" style="position:relative;">';
+			foreach ((array) $this->notices as $notice_key => $notice) {
+				echo '<div class="' . esc_attr($notice['class']) . '" style="position:relative;">';
 
-				if ( $notice['dismissible'] ) {
+				if ($notice['dismissible']) {
 				?>
-					<a href="<?php echo esc_url( wp_nonce_url( add_query_arg( 'wc-stripe-hide-notice', $notice_key ), 'wc_stripe_hide_notices_nonce', '_wc_stripe_notice_nonce' ) ); ?>" class="woocommerce-message-close notice-dismiss" style="position:absolute;right:1px;padding:9px;text-decoration:none;"></a>
+					<a href="<?php echo esc_url(wp_nonce_url(add_query_arg('wc-stripe-hide-notice', $notice_key), 'wc_stripe_hide_notices_nonce', '_wc_stripe_notice_nonce')); ?>" class="woocommerce-message-close notice-dismiss" style="position:absolute;right:1px;padding:9px;text-decoration:none;"></a>
 				<?php
 				}
 
 				echo '<p>';
-				echo wp_kses( $notice['message'], array( 'a' => array( 'href' => array() ) ) );
+				echo wp_kses($notice['message'], array('a' => array('href' => array())));
 				echo '</p></div>';
 			}
 		}
@@ -211,26 +211,26 @@ 
 		 * @version 4.0.0
 		 */
 		public function get_environment_warning() {
-			if ( version_compare( phpversion(), WC_STRIPE_MIN_PHP_VER, '<' ) ) {
+			if (version_compare(phpversion(), WC_STRIPE_MIN_PHP_VER, '<')) {
 				/* translators: 1) int version 2) int version */
-				$message = __( 'WooCommerce Stripe - The minimum PHP version required for this plugin is %1$s. You are running %2$s.', 'woocommerce-gateway-stripe' );
+				$message = __('WooCommerce Stripe - The minimum PHP version required for this plugin is %1$s. You are running %2$s.', 'woocommerce-gateway-stripe');
 
-				return sprintf( $message, WC_STRIPE_MIN_PHP_VER, phpversion() );
+				return sprintf($message, WC_STRIPE_MIN_PHP_VER, phpversion());
 			}
 
-			if ( ! defined( 'WC_VERSION' ) ) {
-				return __( 'WooCommerce Stripe requires WooCommerce to be activated to work.', 'woocommerce-gateway-stripe' );
+			if ( ! defined('WC_VERSION')) {
+				return __('WooCommerce Stripe requires WooCommerce to be activated to work.', 'woocommerce-gateway-stripe');
 			}
 
-			if ( version_compare( WC_VERSION, WC_STRIPE_MIN_WC_VER, '<' ) ) {
+			if (version_compare(WC_VERSION, WC_STRIPE_MIN_WC_VER, '<')) {
 				/* translators: 1) int version 2) int version */
-				$message = __( 'WooCommerce Stripe - The minimum WooCommerce version required for this plugin is %1$s. You are running %2$s.', 'woocommerce-gateway-stripe' );
+				$message = __('WooCommerce Stripe - The minimum WooCommerce version required for this plugin is %1$s. You are running %2$s.', 'woocommerce-gateway-stripe');
 
-				return sprintf( $message, WC_STRIPE_MIN_WC_VER, WC_VERSION );
+				return sprintf($message, WC_STRIPE_MIN_WC_VER, WC_VERSION);
 			}
 
-			if ( ! function_exists( 'curl_init' ) ) {
-				return __( 'WooCommerce Stripe - cURL is not installed.', 'woocommerce-gateway-stripe' );
+			if ( ! function_exists('curl_init')) {
+				return __('WooCommerce Stripe - cURL is not installed.', 'woocommerce-gateway-stripe');
 			}
 
 			return false;
@@ -244,11 +244,11 @@ 
 		 * @return string Setting link
 		 */
 		public function get_setting_link() {
-			$use_id_as_section = function_exists( 'WC' ) ? version_compare( WC()->version, '2.6', '>=' ) : false;
+			$use_id_as_section = function_exists('WC') ? version_compare(WC()->version, '2.6', '>=') : false;
 
-			$section_slug = $use_id_as_section ? 'stripe' : strtolower( 'WC_Gateway_Stripe' );
+			$section_slug = $use_id_as_section ? 'stripe' : strtolower('WC_Gateway_Stripe');
 
-			return admin_url( 'admin.php?page=wc-settings&tab=checkout&section=' . $section_slug );
+			return admin_url('admin.php?page=wc-settings&tab=checkout&section=' . $section_slug);
 		}
 
 		/**
@@ -259,65 +259,65 @@ 
 		 * @version 4.0.0
 		 */
 		public function check_environment() {
-			if ( ! defined( 'IFRAME_REQUEST' ) && ( WC_STRIPE_VERSION !== get_option( 'wc_stripe_version' ) ) ) {
+			if ( ! defined('IFRAME_REQUEST') && (WC_STRIPE_VERSION !== get_option('wc_stripe_version'))) {
 				$this->install();
 
-				do_action( 'woocommerce_stripe_updated' );
+				do_action('woocommerce_stripe_updated');
 			}
 
 			$environment_warning = $this->get_environment_warning();
 
-			if ( $environment_warning && is_plugin_active( plugin_basename( __FILE__ ) ) ) {
-				$this->add_admin_notice( 'bad_environment', 'error', $environment_warning );
+			if ($environment_warning && is_plugin_active(plugin_basename(__FILE__))) {
+				$this->add_admin_notice('bad_environment', 'error', $environment_warning);
 			}
 
-			$show_ssl_notice  = get_option( 'wc_stripe_show_ssl_notice' );
-			$show_keys_notice = get_option( 'wc_stripe_show_keys_notice' );
-			$options          = get_option( 'woocommerce_stripe_settings' );
-			$testmode         = ( isset( $options['testmode'] ) && 'yes' === $options['testmode'] ) ? true : false;
-			$test_pub_key     = isset( $options['test_publishable_key'] ) ? $options['test_publishable_key'] : '';
-			$test_secret_key  = isset( $options['test_secret_key'] ) ? $options['test_secret_key'] : '';
-			$live_pub_key     = isset( $options['publishable_key'] ) ? $options['publishable_key'] : '';
-			$live_secret_key  = isset( $options['secret_key'] ) ? $options['secret_key'] : '';
+			$show_ssl_notice  = get_option('wc_stripe_show_ssl_notice');
+			$show_keys_notice = get_option('wc_stripe_show_keys_notice');
+			$options          = get_option('woocommerce_stripe_settings');
+			$testmode         = (isset($options['testmode']) && 'yes' === $options['testmode']) ? true : false;
+			$test_pub_key     = isset($options['test_publishable_key']) ? $options['test_publishable_key'] : '';
+			$test_secret_key  = isset($options['test_secret_key']) ? $options['test_secret_key'] : '';
+			$live_pub_key     = isset($options['publishable_key']) ? $options['publishable_key'] : '';
+			$live_secret_key  = isset($options['secret_key']) ? $options['secret_key'] : '';
 
-			if ( isset( $options['enabled'] ) && 'yes' === $options['enabled'] && empty( $show_keys_notice ) ) {
-				$secret  = WC_Stripe_API::get_secret_key();
+			if (isset($options['enabled']) && 'yes' === $options['enabled'] && empty($show_keys_notice)) {
+				$secret = WC_Stripe_API::get_secret_key();
 
-				if ( empty( $secret ) && ! ( isset( $_GET['page'], $_GET['section'] ) && 'wc-settings' === $_GET['page'] && 'stripe' === $_GET['section'] ) ) {
+				if (empty($secret) && ! (isset($_GET['page'], $_GET['section']) && 'wc-settings' === $_GET['page'] && 'stripe' === $_GET['section'])) {
 					$setting_link = $this->get_setting_link();
 					/* translators: 1) link */
-					$this->add_admin_notice( 'keys', 'notice notice-warning', sprintf( __( 'Stripe is almost ready. To get started, <a href="%s">set your Stripe account keys</a>.', 'woocommerce-gateway-stripe' ), $setting_link ), true );
+					$this->add_admin_notice('keys', 'notice notice-warning', sprintf(__('Stripe is almost ready. To get started, <a href="%s">set your Stripe account keys</a>.', 'woocommerce-gateway-stripe'), $setting_link), true);
 				}
 
 				// Check if keys are entered properly per live/test mode.
-				if ( $testmode ) {
+				if ($testmode) {
 					if (
-						! empty( $test_pub_key ) && ! preg_match( '/^pk_test_/', $test_pub_key )
-						|| ( ! empty( $test_secret_key ) && ! preg_match( '/^sk_test_/', $test_secret_key )
-						&& ! empty( $test_secret_key ) && ! preg_match( '/^rk_test_/', $test_secret_key ) ) )
+						! empty($test_pub_key) && ! preg_match('/^pk_test_/', $test_pub_key)
+						|| ( ! empty($test_secret_key) && ! preg_match('/^sk_test_/', $test_secret_key)
+						&& ! empty($test_secret_key) && ! preg_match('/^rk_test_/', $test_secret_key)) )
 					{
 						$setting_link = $this->get_setting_link();
 						/* translators: 1) link */
-						$this->add_admin_notice( 'keys', 'notice notice-error', sprintf( __( 'Stripe is in test mode however your test keys may not be valid. Test keys start with pk_test and sk_test or rk_test. Please go to your settings and, <a href="%s">set your Stripe account keys</a>.', 'woocommerce-gateway-stripe' ), $setting_link ), true );
+						$this->add_admin_notice('keys', 'notice notice-error', sprintf(__('Stripe is in test mode however your test keys may not be valid. Test keys start with pk_test and sk_test or rk_test. Please go to your settings and, <a href="%s">set your Stripe account keys</a>.', 'woocommerce-gateway-stripe'), $setting_link), true);
 					}
 				} else {
 					if (
-						! empty( $live_pub_key ) && ! preg_match( '/^pk_live_/', $live_pub_key )
-						|| ( ! empty( $live_secret_key ) && ! preg_match( '/^sk_live_/', $live_secret_key )
-						&& ! empty( $live_secret_key ) && ! preg_match( '/^rk_live_/', $live_secret_key ) ) )
+						! empty($live_pub_key) && ! preg_match('/^pk_live_/', $live_pub_key)
+						|| ( ! empty($live_secret_key) && ! preg_match('/^sk_live_/', $live_secret_key)
+						&& ! empty($live_secret_key) && ! preg_match('/^rk_live_/', $live_secret_key)) )
 					{
 						$setting_link = $this->get_setting_link();
 						/* translators: 1) link */
-						$this->add_admin_notice( 'keys', 'notice notice-error', sprintf( __( 'Stripe is in live mode however your test keys may not be valid. Live keys start with pk_live and sk_live or rk_live. Please go to your settings and, <a href="%s">set your Stripe account keys</a>.', 'woocommerce-gateway-stripe' ), $setting_link ), true );
+						$this->add_admin_notice('keys', 'notice notice-error', sprintf(__('Stripe is in live mode however your test keys may not be valid. Live keys start with pk_live and sk_live or rk_live. Please go to your settings and, <a href="%s">set your Stripe account keys</a>.', 'woocommerce-gateway-stripe'), $setting_link), true);
 					}
 				}
 			}
 
-			if ( empty( $show_ssl_notice ) && isset( $options['enabled'] ) && 'yes' === $options['enabled'] ) {
+			if (empty($show_ssl_notice) && isset($options['enabled']) && 'yes' === $options['enabled']) {
 				// Show message if enabled and FORCE SSL is disabled and WordpressHTTPS plugin is not detected.
-				if ( ( function_exists( 'wc_site_is_https' ) && ! wc_site_is_https() ) && ( 'no' === get_option( 'woocommerce_force_ssl_checkout' ) && ! class_exists( 'WordPressHTTPS' ) ) ) {
+				if ((function_exists('wc_site_is_https') && ! wc_site_is_https()) && ('no' === get_option('woocommerce_force_ssl_checkout') && ! class_exists('WordPressHTTPS'))) {
 					/* translators: 1) link 2) link */
-					$this->add_admin_notice( 'ssl', 'notice notice-warning', sprintf( __( 'Stripe is enabled, but the <a href="%1$s">force SSL option</a> is disabled; your checkout may not be secure! Please enable SSL and ensure your server has a valid <a href="%2$s" target="_blank">SSL certificate</a> - Stripe will only work in test mode.', 'woocommerce-gateway-stripe' ), admin_url( 'admin.php?page=wc-settings&tab=checkout' ), 'https://en.wikipedia.org/wiki/Transport_Layer_Security' ), true );
+					$this->add_admin_notice('ssl', 'notice notice-warning', sprintf(__('Stripe is enabled, but the <a href="%1$s">force SSL option</a> is disabled; your checkout may not be secure! Please enable SSL and ensure your server has a valid <a href="%2$s" target="_blank">SSL certificate</a> - Stripe will only work in test mode.', 'woocommerce-gateway-stripe'), admin_url('admin.php?page=wc-settings&tab=checkout'), 'https://en.wikipedia.org/wiki/Transport_Layer_Security'), true);
 				}
 			}
 		}
@@ -329,8 +329,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);
 		}
 
 		/**
@@ -340,8 +340,8 @@ 
 		 * @version 3.1.0
 		 */
 		public function install() {
-			if ( ! defined( 'WC_STRIPE_INSTALLING' ) ) {
-				define( 'WC_STRIPE_INSTALLING', true );
+			if ( ! defined('WC_STRIPE_INSTALLING')) {
+				define('WC_STRIPE_INSTALLING', true);
 			}
 
 			$this->update_plugin_version();
@@ -353,13 +353,13 @@ 
 		 * @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="https://docs.woocommerce.com/document/stripe/">' . esc_html__( 'Docs', 'woocommerce-gateway-stripe' ) . '</a>',
-				'<a href="https://woocommerce.com/contact-us/">' . esc_html__( 'Support', 'woocommerce-gateway-stripe' ) . '</a>',
+				'<a href="admin.php?page=wc-settings&tab=checkout&section=stripe">' . esc_html__('Settings', 'woocommerce-gateway-stripe') . '</a>',
+				'<a href="https://docs.woocommerce.com/document/stripe/">' . esc_html__('Docs', 'woocommerce-gateway-stripe') . '</a>',
+				'<a href="https://woocommerce.com/contact-us/">' . esc_html__('Support', 'woocommerce-gateway-stripe') . '</a>',
 			);
-			return array_merge( $plugin_links, $links );
+			return array_merge($plugin_links, $links);
 		}
 
 		/**
@@ -368,8 +368,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' ) || class_exists( 'WC_Pre_Orders_Order' ) ) {
+		public function add_gateways($methods) {
+			if (class_exists('WC_Subscriptions_Order') && function_exists('wcs_create_renewal_order') || class_exists('WC_Pre_Orders_Order')) {
 				$methods[] = 'WC_Stripe_Compat';
 				$methods[] = 'WC_Stripe_Sepa_Compat';
 			} else {
@@ -394,26 +394,26 @@ 
 		 * @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_ideal'] );
-			unset( $sections['stripe_p24'] );
-			unset( $sections['stripe_alipay'] );
-			unset( $sections['stripe_sepa'] );
-			unset( $sections['stripe_bitcoin'] );
+		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_ideal']);
+			unset($sections['stripe_p24']);
+			unset($sections['stripe_alipay']);
+			unset($sections['stripe_sepa']);
+			unset($sections['stripe_bitcoin']);
 
 			$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_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_bitcoin']    = __( 'Stripe Bitcoin', '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_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_bitcoin']    = __('Stripe Bitcoin', 'woocommerce-gateway-stripe');
 
 			return $sections;
 		}

includes/class-wc-stripe-apple-pay-registration.php

Spacing +45 added lines, -45 removed lines

@@ -5,7 +5,7 @@ 
  * @since 4.0.6
  */
 
-if ( ! defined( 'ABSPATH' ) ) {
+if ( ! defined('ABSPATH')) {
 	exit;
 }
 
@@ -60,16 +60,16 @@ 
 	public $apple_pay_verify_notice;
 
 	public function __construct() {
-		$this->stripe_settings         = get_option( 'woocommerce_stripe_settings', array() );
-		$this->stripe_enabled          = $this->get_option( 'enabled' );
-		$this->payment_request         = 'yes' === $this->get_option( 'payment_request', 'yes' );
-		$this->apple_pay_domain_set    = 'yes' === $this->get_option( 'apple_pay_domain_set', 'no' );
+		$this->stripe_settings         = get_option('woocommerce_stripe_settings', array());
+		$this->stripe_enabled          = $this->get_option('enabled');
+		$this->payment_request         = 'yes' === $this->get_option('payment_request', 'yes');
+		$this->apple_pay_domain_set    = 'yes' === $this->get_option('apple_pay_domain_set', 'no');
 		$this->apple_pay_verify_notice = '';
-		$this->testmode                = 'yes' === $this->get_option( 'testmode', 'no' );
-		$this->secret_key              = $this->testmode ? $this->get_option( 'test_secret_key' ) : $this->get_option( 'secret_key' );
+		$this->testmode                = 'yes' === $this->get_option('testmode', 'no');
+		$this->secret_key              = $this->testmode ? $this->get_option('test_secret_key') : $this->get_option('secret_key');
 		$this->init_apple_pay();
 
-		add_action( 'admin_notices', array( $this, 'admin_notices' ) );
+		add_action('admin_notices', array($this, 'admin_notices'));
 	}
 
 	/**
@@ -80,13 +80,13 @@ 
 	 * @param string default
 	 * @return string $setting_value
 	 */
-	public function get_option( $setting = '', $default = '' ) {
-		if ( empty( $this->stripe_settings ) ) {
+	public function get_option($setting = '', $default = '') {
+		if (empty($this->stripe_settings)) {
 			return $default;
 		}
 
-		if ( ! empty( $this->stripe_settings[ $setting ] ) ) {
-			return $this->stripe_settings[ $setting ];
+		if ( ! empty($this->stripe_settings[$setting])) {
+			return $this->stripe_settings[$setting];
 		}
 
 		return $default;
@@ -101,9 +101,9 @@ 
 	public function init_apple_pay() {
 		if (
 			is_admin() &&
-			isset( $_GET['page'] ) && 'wc-settings' === $_GET['page'] &&
-			isset( $_GET['tab'] ) && 'checkout' === $_GET['tab'] &&
-			isset( $_GET['section'] ) && 'stripe' === $_GET['section'] &&
+			isset($_GET['page']) && 'wc-settings' === $_GET['page'] &&
+			isset($_GET['tab']) && 'checkout' === $_GET['tab'] &&
+			isset($_GET['section']) && 'stripe' === $_GET['section'] &&
 			$this->payment_request
 		) {
 			$this->process_apple_pay_verification();
@@ -117,9 +117,9 @@ 
 	 * @version 3.1.0
 	 * @param string $secret_key
 	 */
-	private function register_apple_pay_domain( $secret_key = '' ) {
-		if ( empty( $secret_key ) ) {
-			throw new Exception( __( 'Unable to verify domain - missing secret key.', 'woocommerce-gateway-stripe' ) );
+	private function register_apple_pay_domain($secret_key = '') {
+		if (empty($secret_key)) {
+			throw new Exception(__('Unable to verify domain - missing secret key.', 'woocommerce-gateway-stripe'));
 		}
 
 		$endpoint = 'https://api.stripe.com/v1/apple_pay/domains';
@@ -133,23 +133,23 @@ 
 			'Authorization' => 'Bearer ' . $secret_key,
 		);
 
-		$response = wp_remote_post( $endpoint, array(
+		$response = wp_remote_post($endpoint, array(
 			'headers' => $headers,
-			'body'    => http_build_query( $data ),
-		) );
+			'body'    => http_build_query($data),
+		));
 
-		if ( is_wp_error( $response ) ) {
+		if (is_wp_error($response)) {
 			/* translators: error message */
-			throw new Exception( sprintf( __( 'Unable to verify domain - %s', 'woocommerce-gateway-stripe' ), $response->get_error_message() ) );
+			throw new Exception(sprintf(__('Unable to verify domain - %s', 'woocommerce-gateway-stripe'), $response->get_error_message()));
 		}
 
-		if ( 200 !== $response['response']['code'] ) {
-			$parsed_response = json_decode( $response['body'] );
+		if (200 !== $response['response']['code']) {
+			$parsed_response = json_decode($response['body']);
 
 			$this->apple_pay_verify_notice = $parsed_response->error->message;
 
 			/* translators: error message */
-			throw new Exception( sprintf( __( 'Unable to verify domain - %s', 'woocommerce-gateway-stripe' ), $parsed_response->error->message ) );
+			throw new Exception(sprintf(__('Unable to verify domain - %s', 'woocommerce-gateway-stripe'), $parsed_response->error->message));
 		}
 	}
 
@@ -161,45 +161,45 @@ 
 	 */
 	public function process_apple_pay_verification() {
 		try {
-			$path     = untrailingslashit( $_SERVER['DOCUMENT_ROOT'] );
+			$path     = untrailingslashit($_SERVER['DOCUMENT_ROOT']);
 			$dir      = '.well-known';
 			$file     = 'apple-developer-merchantid-domain-association';
 			$fullpath = $path . '/' . $dir . '/' . $file;
 
-			if ( $this->apple_pay_domain_set && file_exists( $fullpath ) ) {
+			if ($this->apple_pay_domain_set && file_exists($fullpath)) {
 				return;
 			}
 
-			if ( ! file_exists( $path . '/' . $dir ) ) {
-				if ( ! @mkdir( $path . '/' . $dir, 0755 ) ) { // @codingStandardsIgnoreLine
-					throw new Exception( __( 'Unable to create domain association folder to domain root.', 'woocommerce-gateway-stripe' ) );
+			if ( ! file_exists($path . '/' . $dir)) {
+				if ( ! @mkdir($path . '/' . $dir, 0755)) { // @codingStandardsIgnoreLine
+					throw new Exception(__('Unable to create domain association folder to domain root.', 'woocommerce-gateway-stripe'));
 				}
 			}
 
-			if ( ! file_exists( $fullpath ) ) {
-				if ( ! @copy( WC_STRIPE_PLUGIN_PATH . '/' . $file, $fullpath ) ) { // @codingStandardsIgnoreLine
-					throw new Exception( __( 'Unable to copy domain association file to domain root.', 'woocommerce-gateway-stripe' ) );
+			if ( ! file_exists($fullpath)) {
+				if ( ! @copy(WC_STRIPE_PLUGIN_PATH . '/' . $file, $fullpath)) { // @codingStandardsIgnoreLine
+					throw new Exception(__('Unable to copy domain association file to domain root.', 'woocommerce-gateway-stripe'));
 				}
 			}
 
 			// At this point then the domain association folder and file should be available.
 			// Proceed to verify/and or verify again.
-			$this->register_apple_pay_domain( $this->secret_key );
+			$this->register_apple_pay_domain($this->secret_key);
 
 			// No errors to this point, verification success!
 			$this->stripe_settings['apple_pay_domain_set'] = 'yes';
 			$this->apple_pay_domain_set = true;
 
-			update_option( 'woocommerce_stripe_settings', $this->stripe_settings );
+			update_option('woocommerce_stripe_settings', $this->stripe_settings);
 
-			WC_Stripe_Logger::log( 'Your domain has been verified with Apple Pay!' );
+			WC_Stripe_Logger::log('Your domain has been verified with Apple Pay!');
 
-		} catch ( Exception $e ) {
+		} catch (Exception $e) {
 			$this->stripe_settings['apple_pay_domain_set'] = 'no';
 
-			update_option( 'woocommerce_stripe_settings', $this->stripe_settings );
+			update_option('woocommerce_stripe_settings', $this->stripe_settings);
 
-			WC_Stripe_Logger::log( 'Error: ' . $e->getMessage() );
+			WC_Stripe_Logger::log('Error: ' . $e->getMessage());
 		}
 	}
 
@@ -209,11 +209,11 @@ 
 	 * @since 4.0.6
 	 */
 	public function admin_notices() {
-		if ( ! $this->stripe_enabled ) {
+		if ( ! $this->stripe_enabled) {
 			return;
 		}
 
-		if ( $this->payment_request && ! empty( $this->apple_pay_verify_notice ) ) {
+		if ($this->payment_request && ! empty($this->apple_pay_verify_notice)) {
 			$allowed_html = array(
 				'a' => array(
 					'href' => array(),
@@ -221,7 +221,7 @@ 
 				),
 			);
 
-			echo '<div class="error stripe-apple-pay-message"><p>' . wp_kses( make_clickable( $this->apple_pay_verify_notice ), $allowed_html ) . '</p></div>';
+			echo '<div class="error stripe-apple-pay-message"><p>' . wp_kses(make_clickable($this->apple_pay_verify_notice), $allowed_html) . '</p></div>';
 		}
 
 		/**
@@ -229,9 +229,9 @@ 
 		 * when setting screen is displayed. So if domain verification is not set,
 		 * something went wrong so lets notify user.
 		 */
-		if ( ! empty( $this->secret_key ) && $this->payment_request && ! $this->apple_pay_domain_set ) {
+		if ( ! empty($this->secret_key) && $this->payment_request && ! $this->apple_pay_domain_set) {
 			/* translators: 1) HTML anchor open tag 2) HTML anchor closing tag */
-			echo '<div class="error stripe-apple-pay-message"><p>' . sprintf( __( 'Apple Pay domain verification failed. Please check the %1$slog%2$s to see the issue. (Logging must be enabled to see recorded logs)', 'woocommerce-gateway-stripe' ), '<a href="' . admin_url( 'admin.php?page=wc-status&tab=logs' ) . '">', '</a>' ) . '</p></div>';
+			echo '<div class="error stripe-apple-pay-message"><p>' . sprintf(__('Apple Pay domain verification failed. Please check the %1$slog%2$s to see the issue. (Logging must be enabled to see recorded logs)', 'woocommerce-gateway-stripe'), '<a href="' . admin_url('admin.php?page=wc-status&tab=logs') . '">', '</a>') . '</p></div>';
 		}
 	}
 }

includes/class-wc-gateway-stripe.php

Spacing +175 added lines, -175 removed lines

@@ -1,5 +1,5 @@ 
 <?php
-if ( ! defined( 'ABSPATH' ) ) {
+if ( ! defined('ABSPATH')) {
 	exit;
 }
 
@@ -101,9 +101,9 @@ 
 	public function __construct() {
 		$this->retry_interval       = 2;
 		$this->id                   = 'stripe';
-		$this->method_title         = __( 'Stripe', 'woocommerce-gateway-stripe' );
+		$this->method_title         = __('Stripe', 'woocommerce-gateway-stripe');
 		/* translators: 1) link to Stripe register page 2) link to Stripe api keys page */
-		$this->method_description   = sprintf( __( 'Stripe works by adding payment fields on the checkout and then sending the details to Stripe for verification. <a href="%1$s" target="_blank">Sign up</a> for a Stripe account, and <a href="%2$s" target="_blank">get your Stripe account keys</a>.', 'woocommerce-gateway-stripe' ), 'https://dashboard.stripe.com/register', 'https://dashboard.stripe.com/account/apikeys' );
+		$this->method_description   = sprintf(__('Stripe works by adding payment fields on the checkout and then sending the details to Stripe for verification. <a href="%1$s" target="_blank">Sign up</a> for a Stripe account, and <a href="%2$s" target="_blank">get your Stripe account keys</a>.', 'woocommerce-gateway-stripe'), 'https://dashboard.stripe.com/register', 'https://dashboard.stripe.com/account/apikeys');
 		$this->has_fields           = true;
 		$this->supports             = array(
 			'products',
@@ -130,32 +130,32 @@ 
 		$this->init_settings();
 
 		// Get setting values.
-		$this->title                   = $this->get_option( 'title' );
-		$this->description             = $this->get_option( 'description' );
-		$this->enabled                 = $this->get_option( 'enabled' );
-		$this->testmode                = 'yes' === $this->get_option( 'testmode' );
-		$this->inline_cc_form          = 'yes' === $this->get_option( 'inline_cc_form' );
-		$this->capture                 = 'yes' === $this->get_option( 'capture', 'yes' );
-		$this->statement_descriptor    = WC_Stripe_Helper::clean_statement_descriptor( $this->get_option( 'statement_descriptor' ) );
-		$this->three_d_secure          = 'yes' === $this->get_option( 'three_d_secure' );
-		$this->stripe_checkout         = 'yes' === $this->get_option( 'stripe_checkout' );
-		$this->stripe_checkout_image   = $this->get_option( 'stripe_checkout_image', '' );
-		$this->saved_cards             = 'yes' === $this->get_option( 'saved_cards' );
-		$this->secret_key              = $this->testmode ? $this->get_option( 'test_secret_key' ) : $this->get_option( 'secret_key' );
-		$this->publishable_key         = $this->testmode ? $this->get_option( 'test_publishable_key' ) : $this->get_option( 'publishable_key' );
-		$this->bitcoin                 = 'USD' === strtoupper( get_woocommerce_currency() ) && 'yes' === $this->get_option( 'stripe_bitcoin' );
-		$this->payment_request         = 'yes' === $this->get_option( 'payment_request', 'yes' );
-
-		if ( $this->stripe_checkout ) {
-			$this->order_button_text = __( 'Continue to payment', 'woocommerce-gateway-stripe' );
+		$this->title                   = $this->get_option('title');
+		$this->description             = $this->get_option('description');
+		$this->enabled                 = $this->get_option('enabled');
+		$this->testmode                = 'yes' === $this->get_option('testmode');
+		$this->inline_cc_form          = 'yes' === $this->get_option('inline_cc_form');
+		$this->capture                 = 'yes' === $this->get_option('capture', 'yes');
+		$this->statement_descriptor    = WC_Stripe_Helper::clean_statement_descriptor($this->get_option('statement_descriptor'));
+		$this->three_d_secure          = 'yes' === $this->get_option('three_d_secure');
+		$this->stripe_checkout         = 'yes' === $this->get_option('stripe_checkout');
+		$this->stripe_checkout_image   = $this->get_option('stripe_checkout_image', '');
+		$this->saved_cards             = 'yes' === $this->get_option('saved_cards');
+		$this->secret_key              = $this->testmode ? $this->get_option('test_secret_key') : $this->get_option('secret_key');
+		$this->publishable_key         = $this->testmode ? $this->get_option('test_publishable_key') : $this->get_option('publishable_key');
+		$this->bitcoin                 = 'USD' === strtoupper(get_woocommerce_currency()) && 'yes' === $this->get_option('stripe_bitcoin');
+		$this->payment_request         = 'yes' === $this->get_option('payment_request', 'yes');
+
+		if ($this->stripe_checkout) {
+			$this->order_button_text = __('Continue to payment', 'woocommerce-gateway-stripe');
 		}
 
-		WC_Stripe_API::set_secret_key( $this->secret_key );
+		WC_Stripe_API::set_secret_key($this->secret_key);
 
 		// Hooks.
-		add_action( 'wp_enqueue_scripts', array( $this, 'payment_scripts' ) );
-		add_action( 'admin_enqueue_scripts', array( $this, 'admin_scripts' ) );
-		add_action( 'woocommerce_update_options_payment_gateways_' . $this->id, array( $this, 'process_admin_options' ) );
+		add_action('wp_enqueue_scripts', array($this, 'payment_scripts'));
+		add_action('admin_enqueue_scripts', array($this, 'admin_scripts'));
+		add_action('woocommerce_update_options_payment_gateways_' . $this->id, array($this, 'process_admin_options'));
 	}
 
 	/**
@@ -164,7 +164,7 @@ 
 	 * @since 4.0.2
 	 */
 	public function is_available() {
-		if ( is_add_payment_method_page() && ! $this->saved_cards ) {
+		if (is_add_payment_method_page() && ! $this->saved_cards) {
 			return false;
 		}
 
@@ -187,24 +187,24 @@ 
 		$icons_str .= $icons['amex'];
 		$icons_str .= $icons['mastercard'];
 
-		if ( 'USD' === get_woocommerce_currency() ) {
+		if ('USD' === get_woocommerce_currency()) {
 			$icons_str .= $icons['discover'];
 			$icons_str .= $icons['jcb'];
 			$icons_str .= $icons['diners'];
 		}
 
-		if ( $this->bitcoin && $this->stripe_checkout ) {
+		if ($this->bitcoin && $this->stripe_checkout) {
 			$icons_str .= $icons['bitcoin'];
 		}
 
-		return apply_filters( 'woocommerce_gateway_icon', $icons_str, $this->id );
+		return apply_filters('woocommerce_gateway_icon', $icons_str, $this->id);
 	}
 
 	/**
 	 * Initialise Gateway Settings Form Fields
 	 */
 	public function init_form_fields() {
-		$this->form_fields = require( dirname( __FILE__ ) . '/admin/stripe-settings.php' );
+		$this->form_fields = require(dirname(__FILE__) . '/admin/stripe-settings.php');
 	}
 
 	/**
@@ -212,68 +212,68 @@ 
 	 */
 	public function payment_fields() {
 		$user                 = wp_get_current_user();
-		$display_tokenization = $this->supports( 'tokenization' ) && is_checkout() && $this->saved_cards;
+		$display_tokenization = $this->supports('tokenization') && is_checkout() && $this->saved_cards;
 		$total                = WC()->cart->total;
 		$user_email           = '';
 
 		// If paying from order, we need to get total from order not cart.
-		if ( isset( $_GET['pay_for_order'] ) && ! empty( $_GET['key'] ) ) {
-			$order      = wc_get_order( wc_get_order_id_by_order_key( wc_clean( $_GET['key'] ) ) );
+		if (isset($_GET['pay_for_order']) && ! empty($_GET['key'])) {
+			$order      = wc_get_order(wc_get_order_id_by_order_key(wc_clean($_GET['key'])));
 			$total      = $order->get_total();
 			$user_email = WC_Stripe_Helper::is_pre_30() ? $order->billing_email : $order->get_billing_email();
 		} else {
-			if ( $user->ID ) {
-				$user_email = get_user_meta( $user->ID, 'billing_email', true );
+			if ($user->ID) {
+				$user_email = get_user_meta($user->ID, 'billing_email', true);
 				$user_email = $user_email ? $user_email : $user->user_email;
 			}
 		}
 
-		if ( is_add_payment_method_page() ) {
-			$pay_button_text = __( 'Add Card', 'woocommerce-gateway-stripe' );
-			$total        = '';
+		if (is_add_payment_method_page()) {
+			$pay_button_text = __('Add Card', 'woocommerce-gateway-stripe');
+			$total = '';
 		} else {
 			$pay_button_text = '';
 		}
 
 		echo '<div
 			id="stripe-payment-data"
-			data-panel-label="' . esc_attr( $pay_button_text ) . '"
+			data-panel-label="' . esc_attr($pay_button_text) . '"
 			data-description=""
-			data-email="' . esc_attr( $user_email ) . '"
-			data-amount="' . esc_attr( WC_Stripe_Helper::get_stripe_amount( $total ) ) . '"
-			data-name="' . esc_attr( $this->statement_descriptor ) . '"
-			data-currency="' . esc_attr( strtolower( get_woocommerce_currency() ) ) . '"
-			data-image="' . esc_attr( $this->stripe_checkout_image ) . '"
-			data-bitcoin="' . esc_attr( ( $this->bitcoin && $this->capture ) ? 'true' : 'false' ) . '"
-			data-locale="' . esc_attr( apply_filters( 'wc_stripe_checkout_locale', $this->get_locale() ) ) . '"
-			data-three-d-secure="' . esc_attr( $this->three_d_secure ? 'true' : 'false' ) . '"
-			data-allow-remember-me="' . esc_attr( $this->saved_cards ? 'true' : 'false' ) . '">';
-
-		if ( $this->description ) {
-			if ( $this->testmode ) {
+			data-email="' . esc_attr($user_email) . '"
+			data-amount="' . esc_attr(WC_Stripe_Helper::get_stripe_amount($total)) . '"
+			data-name="' . esc_attr($this->statement_descriptor) . '"
+			data-currency="' . esc_attr(strtolower(get_woocommerce_currency())) . '"
+			data-image="' . esc_attr($this->stripe_checkout_image) . '"
+			data-bitcoin="' . esc_attr(($this->bitcoin && $this->capture) ? 'true' : 'false') . '"
+			data-locale="' . esc_attr(apply_filters('wc_stripe_checkout_locale', $this->get_locale())) . '"
+			data-three-d-secure="' . esc_attr($this->three_d_secure ? 'true' : 'false') . '"
+			data-allow-remember-me="' . esc_attr($this->saved_cards ? 'true' : 'false') . '">';
+
+		if ($this->description) {
+			if ($this->testmode) {
 				/* translators: link to Stripe testing page */
-				$this->description .= ' ' . sprintf( __( 'TEST MODE ENABLED. In test mode, you can use the card number 4242424242424242 with any CVC and a valid expiration date or check the documentation "<a href="%s" target="_blank">Testing Stripe</a>" for more card numbers.', 'woocommerce-gateway-stripe' ), 'https://stripe.com/docs/testing' );
-				$this->description  = trim( $this->description );
+				$this->description .= ' ' . sprintf(__('TEST MODE ENABLED. In test mode, you can use the card number 4242424242424242 with any CVC and a valid expiration date or check the documentation "<a href="%s" target="_blank">Testing Stripe</a>" for more card numbers.', 'woocommerce-gateway-stripe'), 'https://stripe.com/docs/testing');
+				$this->description  = trim($this->description);
 			}
-			echo apply_filters( 'wc_stripe_description', wpautop( wp_kses_post( $this->description ) ) );
+			echo apply_filters('wc_stripe_description', wpautop(wp_kses_post($this->description)));
 		}
 
-		if ( $display_tokenization ) {
+		if ($display_tokenization) {
 			$this->tokenization_script();
 			$this->saved_payment_methods();
 		}
 
-		if ( ! $this->stripe_checkout ) {
-			if ( apply_filters( 'wc_stripe_use_elements_checkout_form', true ) ) {
+		if ( ! $this->stripe_checkout) {
+			if (apply_filters('wc_stripe_use_elements_checkout_form', true)) {
 				$this->elements_form();
 			} else {
-				WC_Stripe_Logger::log( 'DEPRECATED! Since version 4.0. Stripe Elements is used. This legacy credit card form will be removed by version 4.1!' );
+				WC_Stripe_Logger::log('DEPRECATED! Since version 4.0. Stripe Elements is used. This legacy credit card form will be removed by version 4.1!');
 				$this->form();
 				echo '<div class="stripe-source-errors" role="alert"></div>';
 			}
 		}
 
-		if ( apply_filters( 'wc_stripe_display_save_payment_method_checkbox', $display_tokenization ) && ! is_add_payment_method_page() && ! isset( $_GET['change_payment_method'] ) ) {
+		if (apply_filters('wc_stripe_display_save_payment_method_checkbox', $display_tokenization) && ! is_add_payment_method_page() && ! isset($_GET['change_payment_method'])) {
 			$this->save_payment_method_checkbox();
 		}
 
@@ -288,12 +288,12 @@ 
 	 */
 	public function elements_form() {
 		?>
-		<fieldset id="wc-<?php echo esc_attr( $this->id ); ?>-cc-form" class="wc-credit-card-form wc-payment-form" style="background:transparent;">
-			<?php do_action( 'woocommerce_credit_card_form_start', $this->id ); ?>
+		<fieldset id="wc-<?php echo esc_attr($this->id); ?>-cc-form" class="wc-credit-card-form wc-payment-form" style="background:transparent;">
+			<?php do_action('woocommerce_credit_card_form_start', $this->id); ?>
 
-			<?php if ( $this->inline_cc_form ) { ?>
+			<?php if ($this->inline_cc_form) { ?>
 				<label for="card-element">
-					<?php esc_html_e( 'Credit or debit card', 'woocommerce-gateway-stripe' ); ?>
+					<?php esc_html_e('Credit or debit card', 'woocommerce-gateway-stripe'); ?>
 				</label>
 
 				<div id="stripe-card-element" style="background:#fff;padding:0 1em;border:1px solid #ddd;margin:5px 0;padding:10px 5px;">
@@ -301,7 +301,7 @@ 
 				</div>
 			<?php } else { ?>
 				<div class="form-row form-row-wide">
-					<label><?php _e( 'Card Number', 'woocommerce-gateway-stripe' ); ?> <span class="required">*</span></label>
+					<label><?php _e('Card Number', 'woocommerce-gateway-stripe'); ?> <span class="required">*</span></label>
 
 					<div id="stripe-card-element" style="background:#fff;padding:0 1em;border:1px solid #ddd;margin:5px 0;padding:10px 5px;">
 					<!-- a Stripe Element will be inserted here. -->
@@ -309,7 +309,7 @@ 
 				</div>
 
 				<div class="form-row form-row-first">
-					<label><?php _e( 'Expiry Date', 'woocommerce-gateway-stripe' ); ?> <span class="required">*</span></label>
+					<label><?php _e('Expiry Date', 'woocommerce-gateway-stripe'); ?> <span class="required">*</span></label>
 
 					<div id="stripe-exp-element" style="background:#fff;padding:0 1em;border:1px solid #ddd;margin:5px 0;padding:10px 5px;">
 					<!-- a Stripe Element will be inserted here. -->
@@ -317,7 +317,7 @@ 
 				</div>
 
 				<div class="form-row form-row-last">
-					<label><?php _e( 'Card Code (CVC)', 'woocommerce-gateway-stripe' ); ?> <span class="required">*</span></label>
+					<label><?php _e('Card Code (CVC)', 'woocommerce-gateway-stripe'); ?> <span class="required">*</span></label>
 				<div id="stripe-cvc-element" style="background:#fff;padding:0 1em;border:1px solid #ddd;margin:5px 0;padding:10px 5px;">
 				<!-- a Stripe Element will be inserted here. -->
 				</div>
@@ -327,7 +327,7 @@ 
 
 			<!-- Used to display form errors -->
 			<div class="stripe-source-errors" role="alert"></div>
-			<?php do_action( 'woocommerce_credit_card_form_end', $this->id ); ?>
+			<?php do_action('woocommerce_credit_card_form_end', $this->id); ?>
 			<div class="clear"></div>
 		</fieldset>
 		<?php
@@ -340,13 +340,13 @@ 
 	 * @version 3.1.0
 	 */
 	public function admin_scripts() {
-		if ( 'woocommerce_page_wc-settings' !== get_current_screen()->id ) {
+		if ('woocommerce_page_wc-settings' !== get_current_screen()->id) {
 			return;
 		}
 
-		$suffix = defined( 'SCRIPT_DEBUG' ) && SCRIPT_DEBUG ? '' : '.min';
+		$suffix = defined('SCRIPT_DEBUG') && SCRIPT_DEBUG ? '' : '.min';
 
-		wp_enqueue_script( 'woocommerce_stripe_admin', plugins_url( 'assets/js/stripe-admin' . $suffix . '.js', WC_STRIPE_MAIN_FILE ), array(), WC_STRIPE_VERSION, true );
+		wp_enqueue_script('woocommerce_stripe_admin', plugins_url('assets/js/stripe-admin' . $suffix . '.js', WC_STRIPE_MAIN_FILE), array(), WC_STRIPE_VERSION, true);
 	}
 
 	/**
@@ -358,33 +358,33 @@ 
 	 * @version 4.0.0
 	 */
 	public function payment_scripts() {
-		if ( ! is_cart() && ! is_checkout() && ! isset( $_GET['pay_for_order'] ) && ! is_add_payment_method_page() && ! isset( $_GET['change_payment_method'] ) ) {
+		if ( ! is_cart() && ! is_checkout() && ! isset($_GET['pay_for_order']) && ! is_add_payment_method_page() && ! isset($_GET['change_payment_method'])) {
 			return;
 		}
 
-		if ( 'no' === $this->enabled ) {
+		if ('no' === $this->enabled) {
 			return;
 		}
 
-		$suffix = defined( 'SCRIPT_DEBUG' ) && SCRIPT_DEBUG ? '' : '.min';
+		$suffix = defined('SCRIPT_DEBUG') && SCRIPT_DEBUG ? '' : '.min';
 
-		wp_register_style( 'stripe_paymentfonts', plugins_url( 'assets/css/stripe-paymentfonts.css', WC_STRIPE_MAIN_FILE ), array(), '1.2.5' );
-		wp_enqueue_style( 'stripe_paymentfonts' );
-		wp_register_script( 'stripe_checkout', 'https://checkout.stripe.com/checkout.js', '', WC_STRIPE_VERSION, true );
-		wp_register_script( 'stripev2', 'https://js.stripe.com/v2/', '', '2.0', true );
-		wp_register_script( 'stripe', 'https://js.stripe.com/v3/', '', '3.0', true );
-		wp_register_script( 'woocommerce_stripe', plugins_url( 'assets/js/stripe' . $suffix . '.js', WC_STRIPE_MAIN_FILE ), array( 'jquery-payment', 'stripev2', 'stripe' ), WC_STRIPE_VERSION, true );
+		wp_register_style('stripe_paymentfonts', plugins_url('assets/css/stripe-paymentfonts.css', WC_STRIPE_MAIN_FILE), array(), '1.2.5');
+		wp_enqueue_style('stripe_paymentfonts');
+		wp_register_script('stripe_checkout', 'https://checkout.stripe.com/checkout.js', '', WC_STRIPE_VERSION, true);
+		wp_register_script('stripev2', 'https://js.stripe.com/v2/', '', '2.0', true);
+		wp_register_script('stripe', 'https://js.stripe.com/v3/', '', '3.0', true);
+		wp_register_script('woocommerce_stripe', plugins_url('assets/js/stripe' . $suffix . '.js', WC_STRIPE_MAIN_FILE), array('jquery-payment', 'stripev2', 'stripe'), WC_STRIPE_VERSION, true);
 
 		$stripe_params = array(
 			'key'                  => $this->publishable_key,
-			'i18n_terms'           => __( 'Please accept the terms and conditions first', 'woocommerce-gateway-stripe' ),
-			'i18n_required_fields' => __( 'Please fill in required checkout fields first', 'woocommerce-gateway-stripe' ),
+			'i18n_terms'           => __('Please accept the terms and conditions first', 'woocommerce-gateway-stripe'),
+			'i18n_required_fields' => __('Please fill in required checkout fields first', 'woocommerce-gateway-stripe'),
 		);
 
 		// If we're on the pay page we need to pass stripe.js the address of the order.
-		if ( isset( $_GET['pay_for_order'] ) && 'true' === $_GET['pay_for_order'] ) {
-			$order_id = wc_get_order_id_by_order_key( urldecode( $_GET['key'] ) );
-			$order    = wc_get_order( $order_id );
+		if (isset($_GET['pay_for_order']) && 'true' === $_GET['pay_for_order']) {
+			$order_id = wc_get_order_id_by_order_key(urldecode($_GET['key']));
+			$order    = wc_get_order($order_id);
 
 			$stripe_params['billing_first_name'] = WC_Stripe_Helper::is_pre_30() ? $order->billing_first_name : $order->get_billing_first_name();
 			$stripe_params['billing_last_name']  = WC_Stripe_Helper::is_pre_30() ? $order->billing_last_name : $order->get_billing_last_name();
@@ -396,38 +396,38 @@ 
 			$stripe_params['billing_country']    = WC_Stripe_Helper::is_pre_30() ? $order->billing_country : $order->get_billing_country();
 		}
 
-		$stripe_params['no_prepaid_card_msg']                     = __( 'Sorry, we\'re not accepting prepaid cards at this time. Your credit card has not been charge. Please try with alternative payment method.', 'woocommerce-gateway-stripe' );
-		$stripe_params['no_sepa_owner_msg']                       = __( 'Please enter your IBAN account name.', 'woocommerce-gateway-stripe' );
-		$stripe_params['no_sepa_iban_msg']                        = __( 'Please enter your IBAN account number.', 'woocommerce-gateway-stripe' );
-		$stripe_params['sepa_mandate_notification']               = apply_filters( 'wc_stripe_sepa_mandate_notification', 'email' );
-		$stripe_params['allow_prepaid_card']                      = apply_filters( 'wc_stripe_allow_prepaid_card', true ) ? 'yes' : 'no';
+		$stripe_params['no_prepaid_card_msg']                     = __('Sorry, we\'re not accepting prepaid cards at this time. Your credit card has not been charge. Please try with alternative payment method.', 'woocommerce-gateway-stripe');
+		$stripe_params['no_sepa_owner_msg']                       = __('Please enter your IBAN account name.', 'woocommerce-gateway-stripe');
+		$stripe_params['no_sepa_iban_msg']                        = __('Please enter your IBAN account number.', 'woocommerce-gateway-stripe');
+		$stripe_params['sepa_mandate_notification']               = apply_filters('wc_stripe_sepa_mandate_notification', 'email');
+		$stripe_params['allow_prepaid_card']                      = apply_filters('wc_stripe_allow_prepaid_card', true) ? 'yes' : 'no';
 		$stripe_params['inline_cc_form']                          = $this->inline_cc_form ? 'yes' : 'no';
-		$stripe_params['stripe_checkout_require_billing_address'] = apply_filters( 'wc_stripe_checkout_require_billing_address', false ) ? 'yes' : 'no';
-		$stripe_params['is_checkout']                             = ( is_checkout() && empty( $_GET['pay_for_order'] ) );
+		$stripe_params['stripe_checkout_require_billing_address'] = apply_filters('wc_stripe_checkout_require_billing_address', false) ? 'yes' : 'no';
+		$stripe_params['is_checkout']                             = (is_checkout() && empty($_GET['pay_for_order']));
 		$stripe_params['return_url']                              = $this->get_stripe_return_url();
-		$stripe_params['ajaxurl']                                 = WC_AJAX::get_endpoint( '%%endpoint%%' );
-		$stripe_params['stripe_nonce']                            = wp_create_nonce( '_wc_stripe_nonce' );
+		$stripe_params['ajaxurl']                                 = WC_AJAX::get_endpoint('%%endpoint%%');
+		$stripe_params['stripe_nonce']                            = wp_create_nonce('_wc_stripe_nonce');
 		$stripe_params['statement_descriptor']                    = $this->statement_descriptor;
-		$stripe_params['use_elements']                            = apply_filters( 'wc_stripe_use_elements_checkout_form', true ) ? 'yes' : 'no';
-		$stripe_params['elements_options']                        = apply_filters( 'wc_stripe_elements_options', array() );
+		$stripe_params['use_elements']                            = apply_filters('wc_stripe_use_elements_checkout_form', true) ? 'yes' : 'no';
+		$stripe_params['elements_options']                        = apply_filters('wc_stripe_elements_options', array());
 		$stripe_params['is_stripe_checkout']                      = $this->stripe_checkout ? 'yes' : 'no';
-		$stripe_params['is_change_payment_page']                  = isset( $_GET['change_payment_method'] ) ? 'yes' : 'no';
-		$stripe_params['validate_modal_checkout']                 = apply_filters( 'wc_stripe_validate_model_checkout', true ) ? 'yes' : 'no';
-		$stripe_params['elements_styling']                        = apply_filters( 'wc_stripe_elements_styling', false );
-		$stripe_params['elements_classes']                        = apply_filters( 'wc_stripe_elements_classes', false );
+		$stripe_params['is_change_payment_page']                  = isset($_GET['change_payment_method']) ? 'yes' : 'no';
+		$stripe_params['validate_modal_checkout']                 = apply_filters('wc_stripe_validate_model_checkout', true) ? 'yes' : 'no';
+		$stripe_params['elements_styling']                        = apply_filters('wc_stripe_elements_styling', false);
+		$stripe_params['elements_classes']                        = apply_filters('wc_stripe_elements_classes', false);
 
 		// merge localized messages to be use in JS
-		$stripe_params = array_merge( $stripe_params, WC_Stripe_Helper::get_localized_messages() );
+		$stripe_params = array_merge($stripe_params, WC_Stripe_Helper::get_localized_messages());
 
-		wp_localize_script( 'woocommerce_stripe', 'wc_stripe_params', apply_filters( 'wc_stripe_params', $stripe_params ) );
-		wp_localize_script( 'woocommerce_stripe_checkout', 'wc_stripe_params', apply_filters( 'wc_stripe_params', $stripe_params ) );
+		wp_localize_script('woocommerce_stripe', 'wc_stripe_params', apply_filters('wc_stripe_params', $stripe_params));
+		wp_localize_script('woocommerce_stripe_checkout', 'wc_stripe_params', apply_filters('wc_stripe_params', $stripe_params));
 
-		if ( $this->stripe_checkout ) {
-			wp_enqueue_script( 'stripe_checkout' );
+		if ($this->stripe_checkout) {
+			wp_enqueue_script('stripe_checkout');
 		}
 
 		$this->tokenization_script();
-		wp_enqueue_script( 'woocommerce_stripe' );
+		wp_enqueue_script('woocommerce_stripe');
 	}
 
 	/**
@@ -443,43 +443,43 @@ 
 	 *
 	 * @return array|void
 	 */
-	public function process_payment( $order_id, $retry = true, $force_save_source = false ) {
+	public function process_payment($order_id, $retry = true, $force_save_source = false) {
 		try {
-			$order = wc_get_order( $order_id );
+			$order = wc_get_order($order_id);
 
 			// This comes from the create account checkbox in the checkout page.
-			$create_account = ! empty( $_POST['createaccount'] ) ? true : false;
+			$create_account = ! empty($_POST['createaccount']) ? true : false;
 
-			if ( $create_account ) {
+			if ($create_account) {
 				$new_customer_id     = WC_Stripe_Helper::is_pre_30() ? $order->customer_user : $order->get_customer_id();
-				$new_stripe_customer = new WC_Stripe_Customer( $new_customer_id );
+				$new_stripe_customer = new WC_Stripe_Customer($new_customer_id);
 				$new_stripe_customer->create_customer();
 			}
 
 			$source_object   = $this->get_source_object();
-			$prepared_source = $this->prepare_source( $source_object, get_current_user_id(), $force_save_source );
+			$prepared_source = $this->prepare_source($source_object, get_current_user_id(), $force_save_source);
 
 			// Check if we don't allow prepaid credit cards.
-			if ( ! apply_filters( 'wc_stripe_allow_prepaid_card', true ) ) {
-				if ( $source_object && 'token' === $source_object->object && 'prepaid' === $source_object->card->funding ) {
-					$localized_message = __( 'Sorry, we\'re not accepting prepaid cards at this time. Your credit card has not been charge. Please try with alternative payment method.', 'woocommerce-gateway-stripe' );
-					throw new WC_Stripe_Exception( print_r( $source_object, true ), $localized_message );
+			if ( ! apply_filters('wc_stripe_allow_prepaid_card', true)) {
+				if ($source_object && 'token' === $source_object->object && 'prepaid' === $source_object->card->funding) {
+					$localized_message = __('Sorry, we\'re not accepting prepaid cards at this time. Your credit card has not been charge. Please try with alternative payment method.', 'woocommerce-gateway-stripe');
+					throw new WC_Stripe_Exception(print_r($source_object, true), $localized_message);
 				}
 			}
 
-			if ( empty( $prepared_source->source ) ) {
-				$localized_message = __( 'Payment processing failed. Please retry.', 'woocommerce-gateway-stripe' );
-				throw new WC_Stripe_Exception( print_r( $prepared_source, true ), $localized_message );
+			if (empty($prepared_source->source)) {
+				$localized_message = __('Payment processing failed. Please retry.', 'woocommerce-gateway-stripe');
+				throw new WC_Stripe_Exception(print_r($prepared_source, true), $localized_message);
 			}
 
-			$this->save_source_to_order( $order, $prepared_source );
+			$this->save_source_to_order($order, $prepared_source);
 
 			// Result from Stripe API request.
 			$response = null;
 
-			if ( $order->get_total() > 0 ) {
+			if ($order->get_total() > 0) {
 				// This will throw exception if not valid.
-				$this->validate_minimum_order_amount( $order );
+				$this->validate_minimum_order_amount($order);
 
 				/*
 				 * Check if card 3DS is required or optional with 3DS setting.
@@ -488,109 +488,109 @@ 
 				 * Note that if we need to save source, the original source must be first
 				 * attached to a customer in Stripe before it can be charged.
 				 */
-				if ( $this->is_3ds_required( $source_object ) ) {
-					$response = $this->create_3ds_source( $order, $source_object );
+				if ($this->is_3ds_required($source_object)) {
+					$response = $this->create_3ds_source($order, $source_object);
 
-					if ( ! empty( $response->error ) ) {
+					if ( ! empty($response->error)) {
 						$localized_message = $response->error->message;
 
-						$order->add_order_note( $localized_message );
+						$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);
 					}
 
 					// Update order meta with 3DS source.
-					if ( WC_Stripe_Helper::is_pre_30() ) {
-						update_post_meta( $order_id, '_stripe_source_id', $response->id );
+					if (WC_Stripe_Helper::is_pre_30()) {
+						update_post_meta($order_id, '_stripe_source_id', $response->id);
 					} else {
-						$order->update_meta_data( '_stripe_source_id', $response->id );
+						$order->update_meta_data('_stripe_source_id', $response->id);
 						$order->save();
 					}
 
-					WC_Stripe_Logger::log( 'Info: Redirecting to 3DS...' );
+					WC_Stripe_Logger::log('Info: Redirecting to 3DS...');
 
 					return array(
 						'result'   => 'success',
-						'redirect' => esc_url_raw( $response->redirect->url ),
+						'redirect' => esc_url_raw($response->redirect->url),
 					);
 				}
 
-				WC_Stripe_Logger::log( "Info: Begin processing payment for order $order_id for the amount of {$order->get_total()}" );
+				WC_Stripe_Logger::log("Info: Begin processing payment for order $order_id for the amount of {$order->get_total()}");
 
 				// Make the request.
-				$response = WC_Stripe_API::request( $this->generate_payment_request( $order, $prepared_source ) );
+				$response = WC_Stripe_API::request($this->generate_payment_request($order, $prepared_source));
 
-				if ( ! empty( $response->error ) ) {
+				if ( ! empty($response->error)) {
 					// If it is an API error such connection or server, let's retry.
-					if ( 'api_connection_error' === $response->error->type || 'api_error' === $response->error->type ) {
-						if ( $retry ) {
-							sleep( 5 );
-							return $this->process_payment( $order_id, false, $force_save_source );
+					if ('api_connection_error' === $response->error->type || 'api_error' === $response->error->type) {
+						if ($retry) {
+							sleep(5);
+							return $this->process_payment($order_id, false, $force_save_source);
 						} else {
 							$localized_message = 'API connection error and retries exhausted.';
-							$order->add_order_note( $localized_message );
-							throw new WC_Stripe_Exception( print_r( $response, true ), $localized_message );
+							$order->add_order_note($localized_message);
+							throw new WC_Stripe_Exception(print_r($response, true), $localized_message);
 						}
 					}
 
 					// We want to retry.
-					if ( $this->is_retryable_error( $response->error ) ) {
-						if ( $retry ) {
+					if ($this->is_retryable_error($response->error)) {
+						if ($retry) {
 							// Don't do anymore retries after this.
-							if ( 5 <= $this->retry_interval ) {
+							if (5 <= $this->retry_interval) {
 
-								return $this->process_payment( $order_id, false, $force_save_source );
+								return $this->process_payment($order_id, false, $force_save_source);
 							}
 
-							sleep( $this->retry_interval );
+							sleep($this->retry_interval);
 
 							$this->retry_interval++;
-							return $this->process_payment( $order_id, true, $force_save_source );
+							return $this->process_payment($order_id, true, $force_save_source);
 						} else {
-							$localized_message = __( 'On going requests error and retries exhausted.', 'woocommerce-gateway-stripe' );
-							$order->add_order_note( $localized_message );
-							throw new WC_Stripe_Exception( print_r( $response, true ), $localized_message );
+							$localized_message = __('On going requests error and retries exhausted.', 'woocommerce-gateway-stripe');
+							$order->add_order_note($localized_message);
+							throw new WC_Stripe_Exception(print_r($response, true), $localized_message);
 						}
 					}
 
 					// Customer param wrong? The user may have been deleted on stripe's end. Remove customer_id. Can be retried without.
-					if ( preg_match( '/No such customer/i', $response->error->message ) && $retry ) {
-						if ( WC_Stripe_Helper::is_pre_30() ) {
-							delete_user_meta( $order->customer_user, '_stripe_customer_id' );
-							delete_post_meta( $order_id, '_stripe_customer_id' );
+					if (preg_match('/No such customer/i', $response->error->message) && $retry) {
+						if (WC_Stripe_Helper::is_pre_30()) {
+							delete_user_meta($order->customer_user, '_stripe_customer_id');
+							delete_post_meta($order_id, '_stripe_customer_id');
 						} else {
-							delete_user_meta( $order->get_customer_id(), '_stripe_customer_id' );
-							$order->delete_meta_data( '_stripe_customer_id' );
+							delete_user_meta($order->get_customer_id(), '_stripe_customer_id');
+							$order->delete_meta_data('_stripe_customer_id');
 							$order->save();
 						}
 
-						return $this->process_payment( $order_id, false, $force_save_source );
-					} elseif ( preg_match( '/No such token/i', $response->error->message ) && $prepared_source->token_id ) {
+						return $this->process_payment($order_id, false, $force_save_source);
+					} elseif (preg_match('/No such token/i', $response->error->message) && $prepared_source->token_id) {
 						// Source param wrong? The CARD may have been deleted on stripe's end. Remove token and show message.
-						$wc_token = WC_Payment_Tokens::get( $prepared_source->token_id );
+						$wc_token = WC_Payment_Tokens::get($prepared_source->token_id);
 						$wc_token->delete();
-						$localized_message = __( 'This card is no longer available and has been removed.', 'woocommerce-gateway-stripe' );
-						$order->add_order_note( $localized_message );
-						throw new WC_Stripe_Exception( print_r( $response, true ), $localized_message );
+						$localized_message = __('This card is no longer available and has been removed.', 'woocommerce-gateway-stripe');
+						$order->add_order_note($localized_message);
+						throw new WC_Stripe_Exception(print_r($response, true), $localized_message);
 					}
 
 					$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;
 					}
 
-					$order->add_order_note( $localized_message );
+					$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);
 				}
 
-				do_action( 'wc_gateway_stripe_process_payment', $response, $order );
+				do_action('wc_gateway_stripe_process_payment', $response, $order);
 
 				// Process valid response.
-				$this->process_response( $response, $order );
+				$this->process_response($response, $order);
 			} else {
 				$order->payment_complete();
 			}
@@ -601,17 +601,17 @@ 
 			// Return thank you page redirect.
 			return array(
 				'result'   => 'success',
-				'redirect' => $this->get_return_url( $order ),
+				'redirect' => $this->get_return_url($order),
 			);
 
-		} 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());
 
-			do_action( 'wc_gateway_stripe_process_payment_error', $e, $order );
+			do_action('wc_gateway_stripe_process_payment_error', $e, $order);
 
-			if ( $order->has_status( array( 'pending', 'failed' ) ) ) {
-				$this->send_failed_order_email( $order_id );
+			if ($order->has_status(array('pending', 'failed'))) {
+				$this->send_failed_order_email($order_id);
 			}
 
 			return array(

includes/payment-methods/class-wc-gateway-stripe-sofort.php

Spacing +79 added lines, -79 removed lines

@@ -1,5 +1,5 @@ 
 <?php
-if ( ! defined( 'ABSPATH' ) ) {
+if ( ! defined('ABSPATH')) {
 	exit;
 }
 
@@ -57,9 +57,9 @@ 
 	 */
 	public function __construct() {
 		$this->id                   = 'stripe_sofort';
-		$this->method_title         = __( 'Stripe SOFORT', 'woocommerce-gateway-stripe' );
+		$this->method_title         = __('Stripe SOFORT', 'woocommerce-gateway-stripe');
 		/* translators: link */
-		$this->method_description   = sprintf( __( 'All other general Stripe settings can be adjusted <a href="%s">here</a>.', 'woocommerce-gateway-stripe' ), admin_url( 'admin.php?page=wc-settings&tab=checkout&section=stripe' ) );
+		$this->method_description   = sprintf(__('All other general Stripe settings can be adjusted <a href="%s">here</a>.', 'woocommerce-gateway-stripe'), admin_url('admin.php?page=wc-settings&tab=checkout&section=stripe'));
 		$this->supports             = array(
 			'products',
 			'refunds',
@@ -71,25 +71,25 @@ 
 		// Load the settings.
 		$this->init_settings();
 
-		$main_settings              = get_option( 'woocommerce_stripe_settings' );
-		$this->title                = $this->get_option( 'title' );
-		$this->description          = $this->get_option( 'description' );
-		$this->enabled              = $this->get_option( 'enabled' );
-		$this->testmode             = ( ! empty( $main_settings['testmode'] ) && 'yes' === $main_settings['testmode'] ) ? true : false;
-		$this->saved_cards          = ( ! empty( $main_settings['saved_cards'] ) && 'yes' === $main_settings['saved_cards'] ) ? true : false;
-		$this->publishable_key      = ! empty( $main_settings['publishable_key'] ) ? $main_settings['publishable_key'] : '';
-		$this->secret_key           = ! empty( $main_settings['secret_key'] ) ? $main_settings['secret_key'] : '';
-		$this->statement_descriptor = ! empty( $main_settings['statement_descriptor'] ) ? $main_settings['statement_descriptor'] : '';
-
-		if ( $this->testmode ) {
-			$this->publishable_key = ! empty( $main_settings['test_publishable_key'] ) ? $main_settings['test_publishable_key'] : '';
-			$this->secret_key      = ! empty( $main_settings['test_secret_key'] ) ? $main_settings['test_secret_key'] : '';
+		$main_settings              = get_option('woocommerce_stripe_settings');
+		$this->title                = $this->get_option('title');
+		$this->description          = $this->get_option('description');
+		$this->enabled              = $this->get_option('enabled');
+		$this->testmode             = ( ! empty($main_settings['testmode']) && 'yes' === $main_settings['testmode']) ? true : false;
+		$this->saved_cards          = ( ! empty($main_settings['saved_cards']) && 'yes' === $main_settings['saved_cards']) ? true : false;
+		$this->publishable_key      = ! empty($main_settings['publishable_key']) ? $main_settings['publishable_key'] : '';
+		$this->secret_key           = ! empty($main_settings['secret_key']) ? $main_settings['secret_key'] : '';
+		$this->statement_descriptor = ! empty($main_settings['statement_descriptor']) ? $main_settings['statement_descriptor'] : '';
+
+		if ($this->testmode) {
+			$this->publishable_key = ! empty($main_settings['test_publishable_key']) ? $main_settings['test_publishable_key'] : '';
+			$this->secret_key      = ! empty($main_settings['test_secret_key']) ? $main_settings['test_secret_key'] : '';
 		}
 
-		add_action( 'woocommerce_update_options_payment_gateways_' . $this->id, array( $this, 'process_admin_options' ) );
-		add_action( 'admin_notices', array( $this, 'check_environment' ) );
-		add_action( 'admin_head', array( $this, 'remove_admin_notice' ) );
-		add_action( 'wp_enqueue_scripts', array( $this, 'payment_scripts' ) );
+		add_action('woocommerce_update_options_payment_gateways_' . $this->id, array($this, 'process_admin_options'));
+		add_action('admin_notices', array($this, 'check_environment'));
+		add_action('admin_head', array($this, 'remove_admin_notice'));
+		add_action('wp_enqueue_scripts', array($this, 'payment_scripts'));
 	}
 
 	/**
@@ -99,19 +99,19 @@ 
 	 * @version 4.0.0
 	 */
 	public function check_environment() {
-		if ( ! current_user_can( 'manage_woocommerce' ) ) {
+		if ( ! current_user_can('manage_woocommerce')) {
 			return;
 		}
 
 		$environment_warning = $this->get_environment_warning();
 
-		if ( $environment_warning ) {
-			$this->add_admin_notice( 'bad_environment', 'error', $environment_warning );
+		if ($environment_warning) {
+			$this->add_admin_notice('bad_environment', 'error', $environment_warning);
 		}
 
-		foreach ( (array) $this->notices as $notice_key => $notice ) {
-			echo "<div class='" . esc_attr( $notice['class'] ) . "'><p>";
-			echo wp_kses( $notice['message'], array( 'a' => array( 'href' => array() ) ) );
+		foreach ((array) $this->notices as $notice_key => $notice) {
+			echo "<div class='" . esc_attr($notice['class']) . "'><p>";
+			echo wp_kses($notice['message'], array('a' => array('href' => array())));
 			echo '</p></div>';
 		}
 	}
@@ -124,8 +124,8 @@ 
 	 * @version 4.0.0
 	 */
 	public function get_environment_warning() {
-		if ( 'yes' === $this->enabled && ! in_array( get_woocommerce_currency(), $this->get_supported_currency() ) ) {
-			$message = __( 'SOFORT is enabled - it requires store currency to be set to Euros.', 'woocommerce-gateway-stripe' );
+		if ('yes' === $this->enabled && ! in_array(get_woocommerce_currency(), $this->get_supported_currency())) {
+			$message = __('SOFORT is enabled - it requires store currency to be set to Euros.', 'woocommerce-gateway-stripe');
 
 			return $message;
 		}
@@ -141,9 +141,9 @@ 
 	 * @return array
 	 */
 	public function get_supported_currency() {
-		return apply_filters( 'wc_stripe_sofort_supported_currencies', array(
+		return apply_filters('wc_stripe_sofort_supported_currencies', array(
 			'EUR',
-		) );
+		));
 	}
 
 	/**
@@ -154,7 +154,7 @@ 
 	 * @return bool
 	 */
 	public function is_available() {
-		if ( ! in_array( get_woocommerce_currency(), $this->get_supported_currency() ) ) {
+		if ( ! in_array(get_woocommerce_currency(), $this->get_supported_currency())) {
 			return false;
 		}
 
@@ -175,7 +175,7 @@ 
 
 		$icons_str .= $icons['sofort'];
 
-		return apply_filters( 'woocommerce_gateway_icon', $icons_str, $this->id );
+		return apply_filters('woocommerce_gateway_icon', $icons_str, $this->id);
 	}
 
 	/**
@@ -186,19 +186,19 @@ 
 	 * @access public
 	 */
 	public function payment_scripts() {
-		if ( ! is_cart() && ! is_checkout() && ! isset( $_GET['pay_for_order'] ) && ! is_add_payment_method_page() ) {
+		if ( ! is_cart() && ! is_checkout() && ! isset($_GET['pay_for_order']) && ! is_add_payment_method_page()) {
 			return;
 		}
 
-		wp_enqueue_style( 'stripe_paymentfonts' );
-		wp_enqueue_script( 'woocommerce_stripe' );
+		wp_enqueue_style('stripe_paymentfonts');
+		wp_enqueue_script('woocommerce_stripe');
 	}
 
 	/**
 	 * Initialize Gateway Settings Form Fields.
 	 */
 	public function init_form_fields() {
-		$this->form_fields = require( WC_STRIPE_PLUGIN_PATH . '/includes/admin/stripe-sofort-settings.php' );
+		$this->form_fields = require(WC_STRIPE_PLUGIN_PATH . '/includes/admin/stripe-sofort-settings.php');
 	}
 
 	/**
@@ -209,25 +209,25 @@ 
 		$total = WC()->cart->total;
 
 		// If paying from order, we need to get total from order not cart.
-		if ( isset( $_GET['pay_for_order'] ) && ! empty( $_GET['key'] ) ) {
-			$order = wc_get_order( wc_get_order_id_by_order_key( wc_clean( $_GET['key'] ) ) );
+		if (isset($_GET['pay_for_order']) && ! empty($_GET['key'])) {
+			$order = wc_get_order(wc_get_order_id_by_order_key(wc_clean($_GET['key'])));
 			$total = $order->get_total();
 		}
 
-		if ( is_add_payment_method_page() ) {
-			$pay_button_text = __( 'Add Payment', 'woocommerce-gateway-stripe' );
-			$total        = '';
+		if (is_add_payment_method_page()) {
+			$pay_button_text = __('Add Payment', 'woocommerce-gateway-stripe');
+			$total = '';
 		} else {
 			$pay_button_text = '';
 		}
 
 		echo '<div
 			id="stripe-sofort-payment-data"
-			data-amount="' . esc_attr( WC_Stripe_Helper::get_stripe_amount( $total ) ) . '"
-			data-currency="' . esc_attr( strtolower( get_woocommerce_currency() ) ) . '">';
+			data-amount="' . esc_attr(WC_Stripe_Helper::get_stripe_amount($total)) . '"
+			data-currency="' . esc_attr(strtolower(get_woocommerce_currency())) . '">';
 
-		if ( $this->description ) {
-			echo apply_filters( 'wc_stripe_description', wpautop( wp_kses_post( $this->description ) ) );
+		if ($this->description) {
+			echo apply_filters('wc_stripe_description', wpautop(wp_kses_post($this->description)));
 		}
 
 		echo '</div>';
@@ -241,28 +241,28 @@ 
 	 * @param object $order
 	 * @return mixed
 	 */
-	public function create_source( $order ) {
+	public function create_source($order) {
 		$currency              = WC_Stripe_Helper::is_pre_30() ? $order->get_order_currency() : $order->get_currency();
 		$bank_country          = WC_Stripe_Helper::is_pre_30() ? $order->billing_country : $order->get_billing_country();
-		$return_url            = $this->get_stripe_return_url( $order );
+		$return_url            = $this->get_stripe_return_url($order);
 		$post_data             = array();
-		$post_data['amount']   = WC_Stripe_Helper::get_stripe_amount( $order->get_total(), $currency );
-		$post_data['currency'] = strtolower( $currency );
+		$post_data['amount']   = WC_Stripe_Helper::get_stripe_amount($order->get_total(), $currency);
+		$post_data['currency'] = strtolower($currency);
 		$post_data['type']     = 'sofort';
-		$post_data['owner']    = $this->get_owner_details( $order );
-		$post_data['redirect'] = array( 'return_url' => $return_url );
+		$post_data['owner']    = $this->get_owner_details($order);
+		$post_data['redirect'] = array('return_url' => $return_url);
 		$post_data['sofort']   = array(
 			'country'            => $bank_country,
 			'preferred_language' => $this->get_locale(),
 		);
 
-		if ( ! empty( $this->statement_descriptor ) ) {
-			$post_data['statement_descriptor'] = WC_Stripe_Helper::clean_statement_descriptor( $this->statement_descriptor );
+		if ( ! empty($this->statement_descriptor)) {
+			$post_data['statement_descriptor'] = WC_Stripe_Helper::clean_statement_descriptor($this->statement_descriptor);
 		}
 
-		WC_Stripe_Logger::log( 'Info: Begin creating SOFORT source' );
+		WC_Stripe_Logger::log('Info: Begin creating SOFORT source');
 
-		return WC_Stripe_API::request( apply_filters( 'wc_stripe_sofort_source', $post_data, $order ), 'sources' );
+		return WC_Stripe_API::request(apply_filters('wc_stripe_sofort_source', $post_data, $order), 'sources');
 	}
 
 	/**
@@ -276,59 +276,59 @@ 
 	 *
 	 * @return array|void
 	 */
-	public function process_payment( $order_id, $retry = true, $force_save_source = false ) {
+	public function process_payment($order_id, $retry = true, $force_save_source = false) {
 		try {
-			$order = wc_get_order( $order_id );
+			$order = wc_get_order($order_id);
 
 			// This will throw exception if not valid.
-			$this->validate_minimum_order_amount( $order );
+			$this->validate_minimum_order_amount($order);
 
 			// This comes from the create account checkbox in the checkout page.
-			$create_account = ! empty( $_POST['createaccount'] ) ? true : false;
+			$create_account = ! empty($_POST['createaccount']) ? true : false;
 
-			if ( $create_account ) {
+			if ($create_account) {
 				$new_customer_id     = WC_Stripe_Helper::is_pre_30() ? $order->customer_user : $order->get_customer_id();
-				$new_stripe_customer = new WC_Stripe_Customer( $new_customer_id );
+				$new_stripe_customer = new WC_Stripe_Customer($new_customer_id);
 				$new_stripe_customer->create_customer();
 			}
 
-			$response = $this->create_source( $order );
+			$response = $this->create_source($order);
 
-			if ( ! empty( $response->error ) ) {
-				$order->add_order_note( $response->error->message );
+			if ( ! empty($response->error)) {
+				$order->add_order_note($response->error->message);
 
 				$localized_messages = WC_Stripe_Helper::get_localized_messages();
 
-				if ( 'invalid_sofort_country' === $response->error->code ) {
-					$localized_message = isset( $localized_messages[ $response->error->code ] ) ? $localized_messages[ $response->error->code ] : $response->error->message;
+				if ('invalid_sofort_country' === $response->error->code) {
+					$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;
 				}
 
-				throw new WC_Stripe_Exception( print_r( $response, true ), $localized_message );
+				throw new WC_Stripe_Exception(print_r($response, true), $localized_message);
 			}
 
-			if ( WC_Stripe_Helper::is_pre_30() ) {
-				update_post_meta( $order_id, '_stripe_source_id', $response->id );
+			if (WC_Stripe_Helper::is_pre_30()) {
+				update_post_meta($order_id, '_stripe_source_id', $response->id);
 			} else {
-				$order->update_meta_data( '_stripe_source_id', $response->id );
+				$order->update_meta_data('_stripe_source_id', $response->id);
 				$order->save();
 			}
 
-			WC_Stripe_Logger::log( 'Info: Redirecting to SOFORT...' );
+			WC_Stripe_Logger::log('Info: Redirecting to SOFORT...');
 
 			return array(
 				'result'   => 'success',
-				'redirect' => esc_url_raw( $response->redirect->url ),
+				'redirect' => esc_url_raw($response->redirect->url),
 			);
-		} 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());
 
-			do_action( 'wc_gateway_stripe_process_payment_error', $e, $order );
+			do_action('wc_gateway_stripe_process_payment_error', $e, $order);
 
-			if ( $order->has_status( array( 'pending', 'failed' ) ) ) {
-				$this->send_failed_order_email( $order_id );
+			if ($order->has_status(array('pending', 'failed'))) {
+				$this->send_failed_order_email($order_id);
 			}
 
 			return array(

includes/payment-methods/class-wc-gateway-stripe-bancontact.php

Spacing +77 added lines, -77 removed lines

@@ -1,5 +1,5 @@ 
 <?php
-if ( ! defined( 'ABSPATH' ) ) {
+if ( ! defined('ABSPATH')) {
 	exit;
 }
 
@@ -57,9 +57,9 @@ 
 	 */
 	public function __construct() {
 		$this->id                   = 'stripe_bancontact';
-		$this->method_title         = __( 'Stripe Bancontact', 'woocommerce-gateway-stripe' );
+		$this->method_title         = __('Stripe Bancontact', 'woocommerce-gateway-stripe');
 		/* translators: link */
-		$this->method_description   = sprintf( __( 'All other general Stripe settings can be adjusted <a href="%s">here</a>.', 'woocommerce-gateway-stripe' ), admin_url( 'admin.php?page=wc-settings&tab=checkout&section=stripe' ) );
+		$this->method_description   = sprintf(__('All other general Stripe settings can be adjusted <a href="%s">here</a>.', 'woocommerce-gateway-stripe'), admin_url('admin.php?page=wc-settings&tab=checkout&section=stripe'));
 		$this->supports             = array(
 			'products',
 			'refunds',
@@ -71,25 +71,25 @@ 
 		// Load the settings.
 		$this->init_settings();
 
-		$main_settings              = get_option( 'woocommerce_stripe_settings' );
-		$this->title                = $this->get_option( 'title' );
-		$this->description          = $this->get_option( 'description' );
-		$this->enabled              = $this->get_option( 'enabled' );
-		$this->testmode             = ( ! empty( $main_settings['testmode'] ) && 'yes' === $main_settings['testmode'] ) ? true : false;
-		$this->saved_cards          = ( ! empty( $main_settings['saved_cards'] ) && 'yes' === $main_settings['saved_cards'] ) ? true : false;
-		$this->publishable_key      = ! empty( $main_settings['publishable_key'] ) ? $main_settings['publishable_key'] : '';
-		$this->secret_key           = ! empty( $main_settings['secret_key'] ) ? $main_settings['secret_key'] : '';
-		$this->statement_descriptor = ! empty( $main_settings['statement_descriptor'] ) ? $main_settings['statement_descriptor'] : '';
-
-		if ( $this->testmode ) {
-			$this->publishable_key = ! empty( $main_settings['test_publishable_key'] ) ? $main_settings['test_publishable_key'] : '';
-			$this->secret_key      = ! empty( $main_settings['test_secret_key'] ) ? $main_settings['test_secret_key'] : '';
+		$main_settings              = get_option('woocommerce_stripe_settings');
+		$this->title                = $this->get_option('title');
+		$this->description          = $this->get_option('description');
+		$this->enabled              = $this->get_option('enabled');
+		$this->testmode             = ( ! empty($main_settings['testmode']) && 'yes' === $main_settings['testmode']) ? true : false;
+		$this->saved_cards          = ( ! empty($main_settings['saved_cards']) && 'yes' === $main_settings['saved_cards']) ? true : false;
+		$this->publishable_key      = ! empty($main_settings['publishable_key']) ? $main_settings['publishable_key'] : '';
+		$this->secret_key           = ! empty($main_settings['secret_key']) ? $main_settings['secret_key'] : '';
+		$this->statement_descriptor = ! empty($main_settings['statement_descriptor']) ? $main_settings['statement_descriptor'] : '';
+
+		if ($this->testmode) {
+			$this->publishable_key = ! empty($main_settings['test_publishable_key']) ? $main_settings['test_publishable_key'] : '';
+			$this->secret_key      = ! empty($main_settings['test_secret_key']) ? $main_settings['test_secret_key'] : '';
 		}
 
-		add_action( 'woocommerce_update_options_payment_gateways_' . $this->id, array( $this, 'process_admin_options' ) );
-		add_action( 'admin_notices', array( $this, 'check_environment' ) );
-		add_action( 'admin_head', array( $this, 'remove_admin_notice' ) );
-		add_action( 'wp_enqueue_scripts', array( $this, 'payment_scripts' ) );
+		add_action('woocommerce_update_options_payment_gateways_' . $this->id, array($this, 'process_admin_options'));
+		add_action('admin_notices', array($this, 'check_environment'));
+		add_action('admin_head', array($this, 'remove_admin_notice'));
+		add_action('wp_enqueue_scripts', array($this, 'payment_scripts'));
 	}
 
 	/**
@@ -99,19 +99,19 @@ 
 	 * @version 4.0.0
 	 */
 	public function check_environment() {
-		if ( ! current_user_can( 'manage_woocommerce' ) ) {
+		if ( ! current_user_can('manage_woocommerce')) {
 			return;
 		}
 
 		$environment_warning = $this->get_environment_warning();
 
-		if ( $environment_warning ) {
-			$this->add_admin_notice( 'bad_environment', 'error', $environment_warning );
+		if ($environment_warning) {
+			$this->add_admin_notice('bad_environment', 'error', $environment_warning);
 		}
 
-		foreach ( (array) $this->notices as $notice_key => $notice ) {
-			echo "<div class='" . esc_attr( $notice['class'] ) . "'><p>";
-			echo wp_kses( $notice['message'], array( 'a' => array( 'href' => array() ) ) );
+		foreach ((array) $this->notices as $notice_key => $notice) {
+			echo "<div class='" . esc_attr($notice['class']) . "'><p>";
+			echo wp_kses($notice['message'], array('a' => array('href' => array())));
 			echo '</p></div>';
 		}
 	}
@@ -124,8 +124,8 @@ 
 	 * @version 4.0.0
 	 */
 	public function get_environment_warning() {
-		if ( 'yes' === $this->enabled && ! in_array( get_woocommerce_currency(), $this->get_supported_currency() ) ) {
-			$message = __( 'Bancontact is enabled - it requires store currency to be set to Euros.', 'woocommerce-gateway-stripe' );
+		if ('yes' === $this->enabled && ! in_array(get_woocommerce_currency(), $this->get_supported_currency())) {
+			$message = __('Bancontact is enabled - it requires store currency to be set to Euros.', 'woocommerce-gateway-stripe');
 
 			return $message;
 		}
@@ -141,9 +141,9 @@ 
 	 * @return array
 	 */
 	public function get_supported_currency() {
-		return apply_filters( 'wc_stripe_bancontact_supported_currencies', array(
+		return apply_filters('wc_stripe_bancontact_supported_currencies', array(
 			'EUR',
-		) );
+		));
 	}
 
 	/**
@@ -154,7 +154,7 @@ 
 	 * @return bool
 	 */
 	public function is_available() {
-		if ( ! in_array( get_woocommerce_currency(), $this->get_supported_currency() ) ) {
+		if ( ! in_array(get_woocommerce_currency(), $this->get_supported_currency())) {
 			return false;
 		}
 
@@ -175,7 +175,7 @@ 
 
 		$icons_str .= $icons['bancontact'];
 
-		return apply_filters( 'woocommerce_gateway_icon', $icons_str, $this->id );
+		return apply_filters('woocommerce_gateway_icon', $icons_str, $this->id);
 	}
 
 	/**
@@ -186,19 +186,19 @@ 
 	 * @access public
 	 */
 	public function payment_scripts() {
-		if ( ! is_cart() && ! is_checkout() && ! isset( $_GET['pay_for_order'] ) && ! is_add_payment_method_page() ) {
+		if ( ! is_cart() && ! is_checkout() && ! isset($_GET['pay_for_order']) && ! is_add_payment_method_page()) {
 			return;
 		}
 
-		wp_enqueue_style( 'stripe_paymentfonts' );
-		wp_enqueue_script( 'woocommerce_stripe' );
+		wp_enqueue_style('stripe_paymentfonts');
+		wp_enqueue_script('woocommerce_stripe');
 	}
 
 	/**
 	 * Initialize Gateway Settings Form Fields.
 	 */
 	public function init_form_fields() {
-		$this->form_fields = require( WC_STRIPE_PLUGIN_PATH . '/includes/admin/stripe-bancontact-settings.php' );
+		$this->form_fields = require(WC_STRIPE_PLUGIN_PATH . '/includes/admin/stripe-bancontact-settings.php');
 	}
 
 	/**
@@ -209,25 +209,25 @@ 
 		$total = WC()->cart->total;
 
 		// If paying from order, we need to get total from order not cart.
-		if ( isset( $_GET['pay_for_order'] ) && ! empty( $_GET['key'] ) ) {
-			$order = wc_get_order( wc_get_order_id_by_order_key( wc_clean( $_GET['key'] ) ) );
+		if (isset($_GET['pay_for_order']) && ! empty($_GET['key'])) {
+			$order = wc_get_order(wc_get_order_id_by_order_key(wc_clean($_GET['key'])));
 			$total = $order->get_total();
 		}
 
-		if ( is_add_payment_method_page() ) {
-			$pay_button_text = __( 'Add Payment', 'woocommerce-gateway-stripe' );
-			$total        = '';
+		if (is_add_payment_method_page()) {
+			$pay_button_text = __('Add Payment', 'woocommerce-gateway-stripe');
+			$total = '';
 		} else {
 			$pay_button_text = '';
 		}
 
 		echo '<div
 			id="stripe-bancontact-payment-data"
-			data-amount="' . esc_attr( WC_Stripe_Helper::get_stripe_amount( $total ) ) . '"
-			data-currency="' . esc_attr( strtolower( get_woocommerce_currency() ) ) . '">';
+			data-amount="' . esc_attr(WC_Stripe_Helper::get_stripe_amount($total)) . '"
+			data-currency="' . esc_attr(strtolower(get_woocommerce_currency())) . '">';
 
-		if ( $this->description ) {
-			echo apply_filters( 'wc_stripe_description', wpautop( wp_kses_post( $this->description ) ) );
+		if ($this->description) {
+			echo apply_filters('wc_stripe_description', wpautop(wp_kses_post($this->description)));
 		}
 
 		echo '</div>';
@@ -241,25 +241,25 @@ 
 	 * @param object $order
 	 * @return mixed
 	 */
-	public function create_source( $order ) {
+	public function create_source($order) {
 		$currency                = WC_Stripe_Helper::is_pre_30() ? $order->get_order_currency() : $order->get_currency();
 		$order_id                = WC_Stripe_Helper::is_pre_30() ? $order->id : $order->get_id();
-		$return_url              = $this->get_stripe_return_url( $order );
+		$return_url              = $this->get_stripe_return_url($order);
 		$post_data               = array();
-		$post_data['amount']     = WC_Stripe_Helper::get_stripe_amount( $order->get_total(), $currency );
-		$post_data['currency']   = strtolower( $currency );
+		$post_data['amount']     = WC_Stripe_Helper::get_stripe_amount($order->get_total(), $currency);
+		$post_data['currency']   = strtolower($currency);
 		$post_data['type']       = 'bancontact';
-		$post_data['owner']      = $this->get_owner_details( $order );
-		$post_data['redirect']   = array( 'return_url' => $return_url );
-		$post_data['bancontact'] = array( 'preferred_language' => $this->get_locale() );
+		$post_data['owner']      = $this->get_owner_details($order);
+		$post_data['redirect']   = array('return_url' => $return_url);
+		$post_data['bancontact'] = array('preferred_language' => $this->get_locale());
 
-		if ( ! empty( $this->statement_descriptor ) ) {
-			$post_data['statement_descriptor'] = WC_Stripe_Helper::clean_statement_descriptor( $this->statement_descriptor );
+		if ( ! empty($this->statement_descriptor)) {
+			$post_data['statement_descriptor'] = WC_Stripe_Helper::clean_statement_descriptor($this->statement_descriptor);
 		}
 
-		WC_Stripe_Logger::log( 'Info: Begin creating Bancontact source' );
+		WC_Stripe_Logger::log('Info: Begin creating Bancontact source');
 
-		return WC_Stripe_API::request( apply_filters( 'wc_stripe_bancontact_source', $post_data, $order ), 'sources' );
+		return WC_Stripe_API::request(apply_filters('wc_stripe_bancontact_source', $post_data, $order), 'sources');
 	}
 
 	/**
@@ -273,51 +273,51 @@ 
 	 *
 	 * @return array|void
 	 */
-	public function process_payment( $order_id, $retry = true, $force_save_source = false ) {
+	public function process_payment($order_id, $retry = true, $force_save_source = false) {
 		try {
-			$order = wc_get_order( $order_id );
+			$order = wc_get_order($order_id);
 
 			// This will throw exception if not valid.
-			$this->validate_minimum_order_amount( $order );
+			$this->validate_minimum_order_amount($order);
 
 			// This comes from the create account checkbox in the checkout page.
-			$create_account = ! empty( $_POST['createaccount'] ) ? true : false;
+			$create_account = ! empty($_POST['createaccount']) ? true : false;
 
-			if ( $create_account ) {
+			if ($create_account) {
 				$new_customer_id     = WC_Stripe_Helper::is_pre_30() ? $order->customer_user : $order->get_customer_id();
-				$new_stripe_customer = new WC_Stripe_Customer( $new_customer_id );
+				$new_stripe_customer = new WC_Stripe_Customer($new_customer_id);
 				$new_stripe_customer->create_customer();
 			}
 
-			$response = $this->create_source( $order );
+			$response = $this->create_source($order);
 
-			if ( ! empty( $response->error ) ) {
-				$order->add_order_note( $response->error->message );
+			if ( ! empty($response->error)) {
+				$order->add_order_note($response->error->message);
 
-				throw new WC_Stripe_Exception( print_r( $response, true ), $response->error->message );
+				throw new WC_Stripe_Exception(print_r($response, true), $response->error->message);
 			}
 
-			if ( WC_Stripe_Helper::is_pre_30() ) {
-				update_post_meta( $order_id, '_stripe_source_id', $response->id );
+			if (WC_Stripe_Helper::is_pre_30()) {
+				update_post_meta($order_id, '_stripe_source_id', $response->id);
 			} else {
-				$order->update_meta_data( '_stripe_source_id', $response->id );
+				$order->update_meta_data('_stripe_source_id', $response->id);
 				$order->save();
 			}
 
-			WC_Stripe_Logger::log( 'Info: Redirecting to Bancontact...' );
+			WC_Stripe_Logger::log('Info: Redirecting to Bancontact...');
 
 			return array(
 				'result'   => 'success',
-				'redirect' => esc_url_raw( $response->redirect->url ),
+				'redirect' => esc_url_raw($response->redirect->url),
 			);
-		} 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());
 
-			do_action( 'wc_gateway_stripe_process_payment_error', $e, $order );
+			do_action('wc_gateway_stripe_process_payment_error', $e, $order);
 
-			if ( $order->has_status( array( 'pending', 'failed' ) ) ) {
-				$this->send_failed_order_email( $order_id );
+			if ($order->has_status(array('pending', 'failed'))) {
+				$this->send_failed_order_email($order_id);
 			}
 
 			return array(

includes/abstracts/abstract-wc-stripe-payment-gateway.php

Spacing +207 added lines, -208 removed lines

@@ -1,5 +1,5 @@ 
 <?php
-if ( ! defined( 'ABSPATH' ) ) {
+if ( ! defined('ABSPATH')) {
 	exit;
 }
 
@@ -21,7 +21,7 @@ 
 	 * @since 4.0.5
 	 * @param array $error
 	 */
-	public function is_retryable_error( $error ) {
+	public function is_retryable_error($error) {
 		return (
 			'invalid_request_error' === $error->type ||
 			'idempotency_error' === $error->type ||
@@ -33,11 +33,11 @@ 
 	 * Check if this gateway is enabled
 	 */
 	public function is_available() {
-		if ( 'yes' === $this->enabled ) {
-			if ( ! $this->testmode && is_checkout() && ! is_ssl() ) {
+		if ('yes' === $this->enabled) {
+			if ( ! $this->testmode && is_checkout() && ! is_ssl()) {
 				return false;
 			}
-			if ( ! $this->secret_key || ! $this->publishable_key ) {
+			if ( ! $this->secret_key || ! $this->publishable_key) {
 				return false;
 			}
 			return true;
@@ -52,8 +52,8 @@ 
 	 * @since 4.0.0
 	 * @version 4.0.0
 	 */
-	public function add_admin_notice( $slug, $class, $message ) {
-		$this->notices[ $slug ] = array(
+	public function add_admin_notice($slug, $class, $message) {
+		$this->notices[$slug] = array(
 			'class'   => $class,
 			'message' => $message,
 		);
@@ -66,8 +66,8 @@ 
 	 * @version 4.0.0
 	 */
 	public function remove_admin_notice() {
-		if ( did_action( 'woocommerce_update_options' ) ) {
-			remove_action( 'admin_notices', array( $this, 'check_environment' ) );
+		if (did_action('woocommerce_update_options')) {
+			remove_action('admin_notices', array($this, 'check_environment'));
 		}
 	}
 
@@ -79,7 +79,7 @@ 
 	 * @return array
 	 */
 	public function payment_icons() {
-		return apply_filters( 'wc_stripe_payment_icons', array(
+		return apply_filters('wc_stripe_payment_icons', array(
 			'visa'       => '<i class="stripe-pf stripe-pf-visa stripe-pf-right" alt="Visa" aria-hidden="true"></i>',
 			'amex'       => '<i class="stripe-pf stripe-pf-american-express stripe-pf-right" alt="Amex" aria-hidden="true"></i>',
 			'mastercard' => '<i class="stripe-pf stripe-pf-mastercard stripe-pf-right" alt="Mastercard" aria-hidden="true"></i>',
@@ -96,7 +96,7 @@ 
 			'eps'        => '<i class="stripe-pf stripe-pf-eps stripe-pf-right" alt="EPS" aria-hidden="true"></i>',
 			'sofort'     => '<i class="stripe-pf stripe-pf-sofort stripe-pf-right" alt="SOFORT" aria-hidden="true"></i>',
 			'sepa'       => '<i class="stripe-pf stripe-pf-sepa stripe-pf-right" alt="SEPA" aria-hidden="true"></i>',
-		) );
+		));
 	}
 
 	/**
@@ -107,10 +107,10 @@ 
 	 * @version 4.0.0
 	 * @param object $order
 	 */
-	public function validate_minimum_order_amount( $order ) {
-		if ( $order->get_total() * 100 < WC_Stripe_Helper::get_minimum_amount() ) {
+	public function validate_minimum_order_amount($order) {
+		if ($order->get_total() * 100 < WC_Stripe_Helper::get_minimum_amount()) {
 			/* translators: 1) dollar amount */
-			throw new WC_Stripe_Exception( 'Did not meet minimum amount', 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('Did not meet minimum amount', 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)));
 		}
 	}
 
@@ -120,14 +120,14 @@ 
 	 * @since 4.0.0
 	 * @version 4.0.0
 	 */
-	public function get_transaction_url( $order ) {
-		if ( $this->testmode ) {
+	public function get_transaction_url($order) {
+		if ($this->testmode) {
 			$this->view_transaction_url = 'https://dashboard.stripe.com/test/payments/%s';
 		} else {
 			$this->view_transaction_url = 'https://dashboard.stripe.com/payments/%s';
 		}
 
-		return parent::get_transaction_url( $order );
+		return parent::get_transaction_url($order);
 	}
 
 	/**
@@ -136,15 +136,15 @@ 
 	 * @since 4.0.0
 	 * @version 4.0.0
 	 */
-	public function get_stripe_customer_id( $order ) {
-		$customer = get_user_meta( WC_Stripe_Helper::is_pre_30() ? $order->customer_user : $order->get_customer_id(), '_stripe_customer_id', true );
+	public function get_stripe_customer_id($order) {
+		$customer = get_user_meta(WC_Stripe_Helper::is_pre_30() ? $order->customer_user : $order->get_customer_id(), '_stripe_customer_id', true);
 
-		if ( empty( $customer ) ) {
+		if (empty($customer)) {
 			// Try to get it via the order.
-			if ( WC_Stripe_Helper::is_pre_30() ) {
-				return get_post_meta( $order->id, '_stripe_customer_id', true );
+			if (WC_Stripe_Helper::is_pre_30()) {
+				return get_post_meta($order->id, '_stripe_customer_id', true);
 			} else {
-				return $order->get_meta( '_stripe_customer_id', true );
+				return $order->get_meta('_stripe_customer_id', true);
 			}
 		} else {
 			return $customer;
@@ -161,9 +161,9 @@ 
 	 * @param object $order
 	 * @param int $id Stripe session id.
 	 */
-	public function get_stripe_return_url( $order = null, $id = null ) {
-		if ( is_object( $order ) ) {
-			if ( empty( $id ) ) {
+	public function get_stripe_return_url($order = null, $id = null) {
+		if (is_object($order)) {
+			if (empty($id)) {
 				$id = uniqid();
 			}
 
@@ -174,10 +174,10 @@ 
 				'order_id'       => $order_id,
 			);
 
-			return esc_url_raw( add_query_arg( $args, $this->get_return_url( $order ) ) );
+			return esc_url_raw(add_query_arg($args, $this->get_return_url($order)));
 		}
 
-		return esc_url_raw( add_query_arg( array( 'utm_nooverride' => '1' ), $this->get_return_url() ) );
+		return esc_url_raw(add_query_arg(array('utm_nooverride' => '1'), $this->get_return_url()));
 	}
 
 	/**
@@ -185,8 +185,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)));
 	}
 
 	/**
@@ -198,34 +198,33 @@ 
 	 * @param  object $source
 	 * @return array()
 	 */
-	public function generate_payment_request( $order, $source ) {
-		$settings                          = get_option( 'woocommerce_stripe_settings', array() );
-		$statement_descriptor              = ! empty( $settings['statement_descriptor'] ) ? str_replace( "'", '', $settings['statement_descriptor'] ) : '';
-		$capture                           = ! empty( $settings['capture'] ) && 'yes' === $settings['capture'] ? true : false;
+	public function generate_payment_request($order, $source) {
+		$settings                          = get_option('woocommerce_stripe_settings', array());
+		$statement_descriptor              = ! empty($settings['statement_descriptor']) ? str_replace("'", '', $settings['statement_descriptor']) : '';
+		$capture                           = ! empty($settings['capture']) && 'yes' === $settings['capture'] ? true : false;
 		$post_data                         = array();
-		$post_data['currency']             = strtolower( WC_Stripe_Helper::is_pre_30() ? $order->get_order_currency() : $order->get_currency() );
-		$post_data['amount']               = WC_Stripe_Helper::get_stripe_amount( $order->get_total(), $post_data['currency'] );
+		$post_data['currency']             = strtolower(WC_Stripe_Helper::is_pre_30() ? $order->get_order_currency() : $order->get_currency());
+		$post_data['amount']               = WC_Stripe_Helper::get_stripe_amount($order->get_total(), $post_data['currency']);
 		/* translators: 1) blog name 2) order number */
-		$post_data['description']          = sprintf( __( '%1$s - Order %2$s', 'woocommerce-gateway-stripe' ), wp_specialchars_decode( get_bloginfo( 'name' ), ENT_QUOTES ), $order->get_order_number() );
+		$post_data['description']          = sprintf(__('%1$s - Order %2$s', 'woocommerce-gateway-stripe'), wp_specialchars_decode(get_bloginfo('name'), ENT_QUOTES), $order->get_order_number());
 		$billing_email      = WC_Stripe_Helper::is_pre_30() ? $order->billing_email : $order->get_billing_email();
 		$billing_first_name = WC_Stripe_Helper::is_pre_30() ? $order->billing_first_name : $order->get_billing_first_name();
 		$billing_last_name  = WC_Stripe_Helper::is_pre_30() ? $order->billing_last_name : $order->get_billing_last_name();
 
-		if ( ! empty( $billing_email ) && apply_filters( 'wc_stripe_send_stripe_receipt', false ) ) {
+		if ( ! empty($billing_email) && apply_filters('wc_stripe_send_stripe_receipt', false)) {
 			$post_data['receipt_email'] = $billing_email;
 		}
 
-		switch ( WC_Stripe_Helper::is_pre_30() ? $order->payment_method : $order->get_payment_method() ) {
-			case 'stripe':
-				if ( ! empty( $statement_descriptor ) ) {
-					$post_data['statement_descriptor'] = WC_Stripe_Helper::clean_statement_descriptor( $statement_descriptor );
+		switch (WC_Stripe_Helper::is_pre_30() ? $order->payment_method : $order->get_payment_method()) {
+			case 'stripe' : if ( ! empty($statement_descriptor)) {
+					$post_data['statement_descriptor'] = WC_Stripe_Helper::clean_statement_descriptor($statement_descriptor);
 				}
 
 				$post_data['capture'] = $capture ? 'true' : 'false';
 				break;
 			case 'stripe_sepa':
-				if ( ! empty( $statement_descriptor ) ) {
-					$post_data['statement_descriptor'] = WC_Stripe_Helper::clean_statement_descriptor( $statement_descriptor );
+				if ( ! empty($statement_descriptor)) {
+					$post_data['statement_descriptor'] = WC_Stripe_Helper::clean_statement_descriptor($statement_descriptor);
 				}
 				break;
 		}
@@ -233,25 +232,25 @@ 
 		$post_data['expand[]'] = 'balance_transaction';
 
 		$metadata = array(
-			__( 'customer_name', 'woocommerce-gateway-stripe' ) => sanitize_text_field( $billing_first_name ) . ' ' . sanitize_text_field( $billing_last_name ),
-			__( 'customer_email', 'woocommerce-gateway-stripe' ) => sanitize_email( $billing_email ),
+			__('customer_name', 'woocommerce-gateway-stripe') => sanitize_text_field($billing_first_name) . ' ' . sanitize_text_field($billing_last_name),
+			__('customer_email', 'woocommerce-gateway-stripe') => sanitize_email($billing_email),
 			'order_id' => WC_Stripe_Helper::is_pre_30() ? $order->id : $order->get_id(),
 		);
 
-		if ( $this->has_subscription( WC_Stripe_Helper::is_pre_30() ? $order->id : $order->get_id() ) ) {
+		if ($this->has_subscription(WC_Stripe_Helper::is_pre_30() ? $order->id : $order->get_id())) {
 			$metadata += array(
 				'payment_type' => 'recurring',
-				'site_url'     => esc_url( get_site_url() ),
+				'site_url'     => esc_url(get_site_url()),
 			);
 		}
 
-		$post_data['metadata'] = apply_filters( 'wc_stripe_payment_metadata', $metadata, $order, $source );
+		$post_data['metadata'] = apply_filters('wc_stripe_payment_metadata', $metadata, $order, $source);
 
-		if ( $source->customer ) {
+		if ($source->customer) {
 			$post_data['customer'] = $source->customer;
 		}
 
-		if ( $source->source ) {
+		if ($source->source) {
 			$post_data['source'] = $source->source;
 		}
 
@@ -263,79 +262,79 @@ 
 		 * @param WC_Order $order
 		 * @param object $source
 		 */
-		return apply_filters( 'wc_stripe_generate_payment_request', $post_data, $order, $source );
+		return apply_filters('wc_stripe_generate_payment_request', $post_data, $order, $source);
 	}
 
 	/**
 	 * Store extra meta data for an order from a Stripe Response.
 	 */
-	public function process_response( $response, $order ) {
-		WC_Stripe_Logger::log( 'Processing response: ' . print_r( $response, true ) );
+	public function process_response($response, $order) {
+		WC_Stripe_Logger::log('Processing response: ' . print_r($response, true));
 
 		$order_id = WC_Stripe_Helper::is_pre_30() ? $order->id : $order->get_id();
 
-		$captured = ( isset( $response->captured ) && $response->captured ) ? 'yes' : 'no';
+		$captured = (isset($response->captured) && $response->captured) ? 'yes' : 'no';
 
 		// Store charge data
-		WC_Stripe_Helper::is_pre_30() ? update_post_meta( $order_id, '_stripe_charge_captured', $captured ) : $order->update_meta_data( '_stripe_charge_captured', $captured );
+		WC_Stripe_Helper::is_pre_30() ? update_post_meta($order_id, '_stripe_charge_captured', $captured) : $order->update_meta_data('_stripe_charge_captured', $captured);
 
 		// Store other data such as fees
-		if ( isset( $response->balance_transaction ) && isset( $response->balance_transaction->fee ) ) {
+		if (isset($response->balance_transaction) && isset($response->balance_transaction->fee)) {
 			// Fees and Net needs to both come from Stripe to be accurate as the returned
 			// values are in the local currency of the Stripe account, not from WC.
-			$fee = ! empty( $response->balance_transaction->fee ) ? WC_Stripe_Helper::format_balance_fee( $response->balance_transaction, 'fee' ) : 0;
-			$net = ! empty( $response->balance_transaction->net ) ? WC_Stripe_Helper::format_balance_fee( $response->balance_transaction, 'net' ) : 0;
-			WC_Stripe_Helper::is_pre_30() ? update_post_meta( $order_id, self::META_NAME_FEE, $fee ) : $order->update_meta_data( self::META_NAME_FEE, $fee );
-			WC_Stripe_Helper::is_pre_30() ? update_post_meta( $order_id, self::META_NAME_NET, $net ) : $order->update_meta_data( self::META_NAME_NET, $net );
+			$fee = ! empty($response->balance_transaction->fee) ? WC_Stripe_Helper::format_balance_fee($response->balance_transaction, 'fee') : 0;
+			$net = ! empty($response->balance_transaction->net) ? WC_Stripe_Helper::format_balance_fee($response->balance_transaction, 'net') : 0;
+			WC_Stripe_Helper::is_pre_30() ? update_post_meta($order_id, self::META_NAME_FEE, $fee) : $order->update_meta_data(self::META_NAME_FEE, $fee);
+			WC_Stripe_Helper::is_pre_30() ? update_post_meta($order_id, self::META_NAME_NET, $net) : $order->update_meta_data(self::META_NAME_NET, $net);
 		}
 
-		if ( 'yes' === $captured ) {
+		if ('yes' === $captured) {
 			/**
 			 * Charge can be captured but in a pending state. Payment methods
 			 * that are asynchronous may take couple days to clear. Webhook will
 			 * take care of the status changes.
 			 */
-			if ( 'pending' === $response->status ) {
-				$order_stock_reduced = WC_Stripe_Helper::is_pre_30() ? get_post_meta( $order_id, '_order_stock_reduced', true ) : $order->get_meta( '_order_stock_reduced', true );
+			if ('pending' === $response->status) {
+				$order_stock_reduced = WC_Stripe_Helper::is_pre_30() ? get_post_meta($order_id, '_order_stock_reduced', true) : $order->get_meta('_order_stock_reduced', true);
 
-				if ( ! $order_stock_reduced ) {
-					WC_Stripe_Helper::is_pre_30() ? $order->reduce_order_stock() : wc_reduce_stock_levels( $order_id );
+				if ( ! $order_stock_reduced) {
+					WC_Stripe_Helper::is_pre_30() ? $order->reduce_order_stock() : wc_reduce_stock_levels($order_id);
 				}
 
-				WC_Stripe_Helper::is_pre_30() ? update_post_meta( $order_id, '_transaction_id', $response->id ) : $order->set_transaction_id( $response->id );
+				WC_Stripe_Helper::is_pre_30() ? update_post_meta($order_id, '_transaction_id', $response->id) : $order->set_transaction_id($response->id);
 				/* translators: transaction id */
-				$order->update_status( 'on-hold', sprintf( __( 'Stripe charge awaiting payment: %s.', 'woocommerce-gateway-stripe' ), $response->id ) );
+				$order->update_status('on-hold', sprintf(__('Stripe charge awaiting payment: %s.', 'woocommerce-gateway-stripe'), $response->id));
 			}
 
-			if ( 'succeeded' === $response->status ) {
-				$order->payment_complete( $response->id );
+			if ('succeeded' === $response->status) {
+				$order->payment_complete($response->id);
 
 				/* translators: transaction id */
-				$message = sprintf( __( 'Stripe charge complete (Charge ID: %s)', 'woocommerce-gateway-stripe' ), $response->id );
-				$order->add_order_note( $message );
+				$message = sprintf(__('Stripe charge complete (Charge ID: %s)', 'woocommerce-gateway-stripe'), $response->id);
+				$order->add_order_note($message);
 			}
 
-			if ( 'failed' === $response->status ) {
-				$localized_message = __( 'Payment processing failed. Please retry.', 'woocommerce-gateway-stripe' );
-				$order->add_order_note( $localized_message );
-				throw new WC_Stripe_Exception( print_r( $response, true ), $localized_message );
+			if ('failed' === $response->status) {
+				$localized_message = __('Payment processing failed. Please retry.', 'woocommerce-gateway-stripe');
+				$order->add_order_note($localized_message);
+				throw new WC_Stripe_Exception(print_r($response, true), $localized_message);
 			}
 		} else {
-			WC_Stripe_Helper::is_pre_30() ? update_post_meta( $order_id, '_transaction_id', $response->id ) : $order->set_transaction_id( $response->id );
+			WC_Stripe_Helper::is_pre_30() ? update_post_meta($order_id, '_transaction_id', $response->id) : $order->set_transaction_id($response->id);
 
-			if ( $order->has_status( array( 'pending', 'failed' ) ) ) {
-				WC_Stripe_Helper::is_pre_30() ? $order->reduce_order_stock() : wc_reduce_stock_levels( $order_id );
+			if ($order->has_status(array('pending', 'failed'))) {
+				WC_Stripe_Helper::is_pre_30() ? $order->reduce_order_stock() : wc_reduce_stock_levels($order_id);
 			}
 
 			/* translators: transaction id */
-			$order->update_status( 'on-hold', sprintf( __( 'Stripe charge authorized (Charge ID: %s). Process order to take payment, or cancel to remove the pre-authorization.', 'woocommerce-gateway-stripe' ), $response->id ) );
+			$order->update_status('on-hold', sprintf(__('Stripe charge authorized (Charge ID: %s). Process order to take payment, or cancel to remove the pre-authorization.', 'woocommerce-gateway-stripe'), $response->id));
 		}
 
-		if ( is_callable( array( $order, 'save' ) ) ) {
+		if (is_callable(array($order, 'save'))) {
 			$order->save();
 		}
 
-		do_action( 'wc_gateway_stripe_process_response', $response, $order );
+		do_action('wc_gateway_stripe_process_response', $response, $order);
 
 		return $response;
 	}
@@ -348,10 +347,10 @@ 
 	 * @param int $order_id
 	 * @return null
 	 */
-	public function send_failed_order_email( $order_id ) {
+	public function send_failed_order_email($order_id) {
 		$emails = WC()->mailer()->get_emails();
-		if ( ! empty( $emails ) && ! empty( $order_id ) ) {
-			$emails['WC_Email_Failed_Order']->trigger( $order_id );
+		if ( ! empty($emails) && ! empty($order_id)) {
+			$emails['WC_Email_Failed_Order']->trigger($order_id);
 		}
 	}
 
@@ -363,7 +362,7 @@ 
 	 * @param object $order
 	 * @return object $details
 	 */
-	public function get_owner_details( $order ) {
+	public function get_owner_details($order) {
 		$billing_first_name = WC_Stripe_Helper::is_pre_30() ? $order->billing_first_name : $order->get_billing_first_name();
 		$billing_last_name  = WC_Stripe_Helper::is_pre_30() ? $order->billing_last_name : $order->get_billing_last_name();
 
@@ -374,8 +373,8 @@ 
 
 		$phone                             = WC_Stripe_Helper::is_pre_30() ? $order->billing_phone : $order->get_billing_phone();
 
-		if ( ! empty( $phone ) ) {
-			$details['phone']              = $phone;
+		if ( ! empty($phone)) {
+			$details['phone'] = $phone;
 		}
 
 		$details['address']['line1']       = WC_Stripe_Helper::is_pre_30() ? $order->billing_address_1 : $order->get_billing_address_1();
@@ -385,7 +384,7 @@ 
 		$details['address']['postal_code'] = WC_Stripe_Helper::is_pre_30() ? $order->billing_postcode : $order->get_billing_postcode();
 		$details['address']['country']     = WC_Stripe_Helper::is_pre_30() ? $order->billing_country : $order->get_billing_country();
 
-		return (object) apply_filters( 'wc_stripe_owner_details', $details, $order );
+		return (object) apply_filters('wc_stripe_owner_details', $details, $order);
 	}
 
 	/**
@@ -394,16 +393,16 @@ 
 	 * @since 4.0.3
 	 */
 	public function get_source_object() {
-		$source = ! empty( $_POST['stripe_source'] ) ? wc_clean( $_POST['stripe_source'] ) : '';
+		$source = ! empty($_POST['stripe_source']) ? wc_clean($_POST['stripe_source']) : '';
 
-		if ( empty( $source ) ) {
+		if (empty($source)) {
 			return '';
 		}
 
-		$source_object = WC_Stripe_API::retrieve( 'sources/' . $source );
+		$source_object = WC_Stripe_API::retrieve('sources/' . $source);
 
-		if ( ! empty( $source_object->error ) ) {
-			throw new WC_Stripe_Exception( print_r( $source_object, true ), $source_object->error->message );
+		if ( ! empty($source_object->error)) {
+			throw new WC_Stripe_Exception(print_r($source_object, true), $source_object->error->message);
 		}
 
 		return $source_object;
@@ -416,11 +415,11 @@ 
 	 * @param object $source_object
 	 * @return bool
 	 */
-	public function is_3ds_required( $source_object ) {
+	public function is_3ds_required($source_object) {
 		return (
-			$source_object && ! empty( $source_object->card ) ) &&
-			( 'card' === $source_object->type && 'required' === $source_object->card->three_d_secure ||
-			( $this->three_d_secure && 'optional' === $source_object->card->three_d_secure )
+			$source_object && ! empty($source_object->card) ) &&
+			('card' === $source_object->type && 'required' === $source_object->card->three_d_secure ||
+			($this->three_d_secure && 'optional' === $source_object->card->three_d_secure)
 		);
 	}
 
@@ -431,8 +430,8 @@ 
 	 * @param object $source_object
 	 * @return bool
 	 */
-	public function is_3ds_card( $source_object ) {
-		return ( $source_object && 'three_d_secure' === $source_object->type );
+	public function is_3ds_card($source_object) {
+		return ($source_object && 'three_d_secure' === $source_object->type);
 	}
 
 	/**
@@ -445,22 +444,22 @@ 
 	 * @param string $return_url
 	 * @return mixed
 	 */
-	public function create_3ds_source( $order, $source_object, $return_url = '' ) {
+	public function create_3ds_source($order, $source_object, $return_url = '') {
 		$currency                    = WC_Stripe_Helper::is_pre_30() ? $order->get_order_currency() : $order->get_currency();
 		$order_id                    = WC_Stripe_Helper::is_pre_30() ? $order->id : $order->get_id();
-		$return_url                  = empty( $return_url ) ? $this->get_stripe_return_url( $order ) : $return_url;
+		$return_url                  = empty($return_url) ? $this->get_stripe_return_url($order) : $return_url;
 
 		$post_data                   = array();
-		$post_data['amount']         = WC_Stripe_Helper::get_stripe_amount( $order->get_total(), $currency );
-		$post_data['currency']       = strtolower( $currency );
+		$post_data['amount']         = WC_Stripe_Helper::get_stripe_amount($order->get_total(), $currency);
+		$post_data['currency']       = strtolower($currency);
 		$post_data['type']           = 'three_d_secure';
-		$post_data['owner']          = $this->get_owner_details( $order );
-		$post_data['three_d_secure'] = array( 'card' => $source_object->id );
-		$post_data['redirect']       = array( 'return_url' => $return_url );
+		$post_data['owner']          = $this->get_owner_details($order);
+		$post_data['three_d_secure'] = array('card' => $source_object->id);
+		$post_data['redirect']       = array('return_url' => $return_url);
 
-		WC_Stripe_Logger::log( 'Info: Begin creating 3DS source...' );
+		WC_Stripe_Logger::log('Info: Begin creating 3DS source...');
 
-		return WC_Stripe_API::request( apply_filters( 'wc_stripe_3ds_source', $post_data, $order ), 'sources' );
+		return WC_Stripe_API::request(apply_filters('wc_stripe_3ds_source', $post_data, $order), 'sources');
 	}
 
 	/**
@@ -477,54 +476,54 @@ 
 	 * @throws Exception When card was not added or for and invalid card.
 	 * @return object
 	 */
-	public function prepare_source( $source_object = '', $user_id, $force_save_source = false ) {
-		$customer           = new WC_Stripe_Customer( $user_id );
+	public function prepare_source($source_object = '', $user_id, $force_save_source = false) {
+		$customer           = new WC_Stripe_Customer($user_id);
 		$set_customer       = true;
-		$force_save_source  = apply_filters( 'wc_stripe_force_save_source', $force_save_source, $customer );
+		$force_save_source  = apply_filters('wc_stripe_force_save_source', $force_save_source, $customer);
 		$source_id          = '';
 		$wc_token_id        = false;
-		$payment_method     = isset( $_POST['payment_method'] ) ? wc_clean( $_POST['payment_method'] ) : 'stripe';
+		$payment_method     = isset($_POST['payment_method']) ? wc_clean($_POST['payment_method']) : 'stripe';
 
 		// New CC info was entered and we have a new source to process.
-		if ( ! empty( $source_object ) ) {
+		if ( ! empty($source_object)) {
 			$source_id = $source_object->id;
 
 			// This checks to see if customer opted to save the payment method to file.
-			$maybe_saved_card = isset( $_POST[ 'wc-' . $payment_method . '-new-payment-method' ] ) && ! empty( $_POST[ 'wc-' . $payment_method . '-new-payment-method' ] );
+			$maybe_saved_card = isset($_POST['wc-' . $payment_method . '-new-payment-method']) && ! empty($_POST['wc-' . $payment_method . '-new-payment-method']);
 
 			/**
 			 * This is true if the user wants to store the card to their account.
 			 * Criteria to save to file is they are logged in, they opted to save or product requirements and the source is
 			 * actually reusable. Either that or force_save_source is true.
 			 */
-			if ( ( $user_id && $this->saved_cards && $maybe_saved_card && 'reusable' === $source_object->usage ) || $force_save_source ) {
-				$response = $customer->add_source( $source_object->id );
+			if (($user_id && $this->saved_cards && $maybe_saved_card && 'reusable' === $source_object->usage) || $force_save_source) {
+				$response = $customer->add_source($source_object->id);
 
-				if ( ! empty( $response->error ) ) {
-					throw new WC_Stripe_Exception( print_r( $response, true ), $response->error->message );
+				if ( ! empty($response->error)) {
+					throw new WC_Stripe_Exception(print_r($response, true), $response->error->message);
 				}
 			}
-		} elseif ( isset( $_POST[ 'wc-' . $payment_method . '-payment-token' ] ) && 'new' !== $_POST[ 'wc-' . $payment_method . '-payment-token' ] ) {
+		} elseif (isset($_POST['wc-' . $payment_method . '-payment-token']) && 'new' !== $_POST['wc-' . $payment_method . '-payment-token']) {
 			// Use an existing token, and then process the payment
-			$wc_token_id = wc_clean( $_POST[ 'wc-' . $payment_method . '-payment-token' ] );
-			$wc_token    = WC_Payment_Tokens::get( $wc_token_id );
+			$wc_token_id = wc_clean($_POST['wc-' . $payment_method . '-payment-token']);
+			$wc_token    = WC_Payment_Tokens::get($wc_token_id);
 
-			if ( ! $wc_token || $wc_token->get_user_id() !== get_current_user_id() ) {
-				WC()->session->set( 'refresh_totals', true );
-				throw new WC_Stripe_Exception( 'Invalid payment method', __( 'Invalid payment method. Please input a new card number.', 'woocommerce-gateway-stripe' ) );
+			if ( ! $wc_token || $wc_token->get_user_id() !== get_current_user_id()) {
+				WC()->session->set('refresh_totals', true);
+				throw new WC_Stripe_Exception('Invalid payment method', __('Invalid payment method. Please input a new card number.', 'woocommerce-gateway-stripe'));
 			}
 
 			$source_id = $wc_token->get_token();
-		} elseif ( isset( $_POST['stripe_token'] ) && 'new' !== $_POST['stripe_token'] ) {
-			$stripe_token     = wc_clean( $_POST['stripe_token'] );
-			$maybe_saved_card = isset( $_POST[ 'wc-' . $payment_method . '-new-payment-method' ] ) && ! empty( $_POST[ 'wc-' . $payment_method . '-new-payment-method' ] );
+		} elseif (isset($_POST['stripe_token']) && 'new' !== $_POST['stripe_token']) {
+			$stripe_token     = wc_clean($_POST['stripe_token']);
+			$maybe_saved_card = isset($_POST['wc-' . $payment_method . '-new-payment-method']) && ! empty($_POST['wc-' . $payment_method . '-new-payment-method']);
 
 			// This is true if the user wants to store the card to their account.
-			if ( ( $user_id && $this->saved_cards && $maybe_saved_card ) || $force_save_source ) {
-				$response = $customer->add_source( $stripe_token );
+			if (($user_id && $this->saved_cards && $maybe_saved_card) || $force_save_source) {
+				$response = $customer->add_source($stripe_token);
 
-				if ( ! empty( $response->error ) ) {
-					throw new WC_Stripe_Exception( print_r( $response, true ), $response->error->message );
+				if ( ! empty($response->error)) {
+					throw new WC_Stripe_Exception(print_r($response, true), $response->error->message);
 				}
 			} else {
 				$set_customer = false;
@@ -532,7 +531,7 @@ 
 			}
 		}
 
-		if ( ! $set_customer ) {
+		if ( ! $set_customer) {
 			$customer_id = false;
 		} else {
 			$customer_id = $customer->get_id() ? $customer->get_id() : false;
@@ -558,37 +557,37 @@ 
 	 * @param object $order
 	 * @return object
 	 */
-	public function prepare_order_source( $order = null ) {
+	public function prepare_order_source($order = null) {
 		$stripe_customer = new WC_Stripe_Customer();
 		$stripe_source   = false;
 		$token_id        = false;
 
-		if ( $order ) {
+		if ($order) {
 			$order_id = WC_Stripe_Helper::is_pre_30() ? $order->id : $order->get_id();
 
-			$stripe_customer_id = get_post_meta( $order_id, '_stripe_customer_id', true );
+			$stripe_customer_id = get_post_meta($order_id, '_stripe_customer_id', true);
 
-			if ( $stripe_customer_id ) {
-				$stripe_customer->set_id( $stripe_customer_id );
+			if ($stripe_customer_id) {
+				$stripe_customer->set_id($stripe_customer_id);
 			}
 
-			$source_id = WC_Stripe_Helper::is_pre_30() ? get_post_meta( $order_id, '_stripe_source_id', true ) : $order->get_meta( '_stripe_source_id', true );
+			$source_id = WC_Stripe_Helper::is_pre_30() ? get_post_meta($order_id, '_stripe_source_id', true) : $order->get_meta('_stripe_source_id', true);
 
 			// Since 4.0.0, we changed card to source so we need to account for that.
-			if ( empty( $source_id ) ) {
-				$source_id = WC_Stripe_Helper::is_pre_30() ? get_post_meta( $order_id, '_stripe_card_id', true ) : $order->get_meta( '_stripe_card_id', true );
+			if (empty($source_id)) {
+				$source_id = WC_Stripe_Helper::is_pre_30() ? get_post_meta($order_id, '_stripe_card_id', true) : $order->get_meta('_stripe_card_id', true);
 
 				// Take this opportunity to update the key name.
-				WC_Stripe_Helper::is_pre_30() ? update_post_meta( $order_id, '_stripe_source_id', $source_id ) : $order->update_meta_data( '_stripe_source_id', $source_id );
+				WC_Stripe_Helper::is_pre_30() ? update_post_meta($order_id, '_stripe_source_id', $source_id) : $order->update_meta_data('_stripe_source_id', $source_id);
 
-				if ( is_callable( array( $order, 'save' ) ) ) {
+				if (is_callable(array($order, 'save'))) {
 					$order->save();
 				}
 			}
 
-			if ( $source_id ) {
+			if ($source_id) {
 				$stripe_source = $source_id;
-			} elseif ( apply_filters( 'wc_stripe_use_default_customer_source', true ) ) {
+			} elseif (apply_filters('wc_stripe_use_default_customer_source', true)) {
 				/*
 				 * We can attempt to charge the customer's default source
 				 * by sending empty source id.
@@ -612,27 +611,27 @@ 
 	 * @param WC_Order $order For to which the source applies.
 	 * @param stdClass $source Source information.
 	 */
-	public function save_source_to_order( $order, $source ) {
+	public function save_source_to_order($order, $source) {
 		$order_id = WC_Stripe_Helper::is_pre_30() ? $order->id : $order->get_id();
 
 		// Store source in the order.
-		if ( $source->customer ) {
-			if ( WC_Stripe_Helper::is_pre_30() ) {
-				update_post_meta( $order_id, '_stripe_customer_id', $source->customer );
+		if ($source->customer) {
+			if (WC_Stripe_Helper::is_pre_30()) {
+				update_post_meta($order_id, '_stripe_customer_id', $source->customer);
 			} else {
-				$order->update_meta_data( '_stripe_customer_id', $source->customer );
+				$order->update_meta_data('_stripe_customer_id', $source->customer);
 			}
 		}
 
-		if ( $source->source ) {
-			if ( WC_Stripe_Helper::is_pre_30() ) {
-				update_post_meta( $order_id, '_stripe_source_id', $source->source );
+		if ($source->source) {
+			if (WC_Stripe_Helper::is_pre_30()) {
+				update_post_meta($order_id, '_stripe_source_id', $source->source);
 			} else {
-				$order->update_meta_data( '_stripe_source_id', $source->source );
+				$order->update_meta_data('_stripe_source_id', $source->source);
 			}
 		}
 
-		if ( is_callable( array( $order, 'save' ) ) ) {
+		if (is_callable(array($order, 'save'))) {
 			$order->save();
 		}
 	}
@@ -646,27 +645,27 @@ 
 	 * @param object $order The order object
 	 * @param int $balance_transaction_id
 	 */
-	public function update_fees( $order, $balance_transaction_id ) {
+	public function update_fees($order, $balance_transaction_id) {
 		$order_id = WC_Stripe_Helper::is_pre_30() ? $order->id : $order->get_id();
 
-		$balance_transaction = WC_Stripe_API::retrieve( 'balance/history/' . $balance_transaction_id );
+		$balance_transaction = WC_Stripe_API::retrieve('balance/history/' . $balance_transaction_id);
 
-		if ( empty( $balance_transaction->error ) ) {
-			if ( isset( $balance_transaction ) && isset( $balance_transaction->fee ) ) {
+		if (empty($balance_transaction->error)) {
+			if (isset($balance_transaction) && isset($balance_transaction->fee)) {
 				// Fees and Net needs to both come from Stripe to be accurate as the returned
 				// values are in the local currency of the Stripe account, not from WC.
-				$fee = ! empty( $balance_transaction->fee ) ? WC_Stripe_Helper::format_balance_fee( $balance_transaction, 'fee' ) : 0;
-				$net = ! empty( $balance_transaction->net ) ? WC_Stripe_Helper::format_balance_fee( $balance_transaction, 'net' ) : 0;
+				$fee = ! empty($balance_transaction->fee) ? WC_Stripe_Helper::format_balance_fee($balance_transaction, 'fee') : 0;
+				$net = ! empty($balance_transaction->net) ? WC_Stripe_Helper::format_balance_fee($balance_transaction, 'net') : 0;
 
-				WC_Stripe_Helper::is_pre_30() ? update_post_meta( $order_id, self::META_NAME_FEE, $fee ) : $order->update_meta_data( self::META_NAME_FEE, $fee );
-				WC_Stripe_Helper::is_pre_30() ? update_post_meta( $order_id, self::META_NAME_NET, $net ) : $order->update_meta_data( self::META_NAME_NET, $net );
+				WC_Stripe_Helper::is_pre_30() ? update_post_meta($order_id, self::META_NAME_FEE, $fee) : $order->update_meta_data(self::META_NAME_FEE, $fee);
+				WC_Stripe_Helper::is_pre_30() ? update_post_meta($order_id, self::META_NAME_NET, $net) : $order->update_meta_data(self::META_NAME_NET, $net);
 
-				if ( is_callable( array( $order, 'save' ) ) ) {
+				if (is_callable(array($order, 'save'))) {
 					$order->save();
 				}
 			}
 		} else {
-			WC_Stripe_Logger::log( "Unable to update fees/net meta for order: {$order_id}" );
+			WC_Stripe_Logger::log("Unable to update fees/net meta for order: {$order_id}");
 		}
 	}
 
@@ -679,33 +678,33 @@ 
 	 * @param  float $amount
 	 * @return bool
 	 */
-	public function process_refund( $order_id, $amount = null, $reason = '' ) {
-		$order = wc_get_order( $order_id );
+	public function process_refund($order_id, $amount = null, $reason = '') {
+		$order = wc_get_order($order_id);
 
-		if ( ! $order || ! $order->get_transaction_id() ) {
+		if ( ! $order || ! $order->get_transaction_id()) {
 			return false;
 		}
 
 		$request = array();
 
-		if ( WC_Stripe_Helper::is_pre_30() ) {
-			$order_currency = get_post_meta( $order_id, '_order_currency', true );
-			$captured       = get_post_meta( $order_id, '_stripe_charge_captured', true );
+		if (WC_Stripe_Helper::is_pre_30()) {
+			$order_currency = get_post_meta($order_id, '_order_currency', true);
+			$captured       = get_post_meta($order_id, '_stripe_charge_captured', true);
 		} else {
 			$order_currency = $order->get_currency();
-			$captured       = $order->get_meta( '_stripe_charge_captured', true );
+			$captured       = $order->get_meta('_stripe_charge_captured', true);
 		}
 
-		if ( ! is_null( $amount ) ) {
-			$request['amount'] = WC_Stripe_Helper::get_stripe_amount( $amount, $order_currency );
+		if ( ! is_null($amount)) {
+			$request['amount'] = WC_Stripe_Helper::get_stripe_amount($amount, $order_currency);
 		}
 
 		// If order is only authorized, don't pass amount.
-		if ( 'yes' !== $captured ) {
-			unset( $request['amount'] );
+		if ('yes' !== $captured) {
+			unset($request['amount']);
 		}
 
-		if ( $reason ) {
+		if ($reason) {
 			$request['metadata'] = array(
 				'reason' => $reason,
 			);
@@ -713,33 +712,33 @@ 
 
 		$request['charge'] = $order->get_transaction_id();
 
-		WC_Stripe_Logger::log( "Info: Beginning refund for order {$order->get_transaction_id()} for the amount of {$amount}" );
+		WC_Stripe_Logger::log("Info: Beginning refund for order {$order->get_transaction_id()} for the amount of {$amount}");
 
-		$response = WC_Stripe_API::request( $request, 'refunds' );
+		$response = WC_Stripe_API::request($request, 'refunds');
 
-		if ( ! empty( $response->error ) ) {
-			WC_Stripe_Logger::log( 'Error: ' . $response->error->message );
+		if ( ! empty($response->error)) {
+			WC_Stripe_Logger::log('Error: ' . $response->error->message);
 
 			return $response;
 
-		} elseif ( ! empty( $response->id ) ) {
-			WC_Stripe_Helper::is_pre_30() ? update_post_meta( $order_id, '_stripe_refund_id', $response->id ) : $order->update_meta_data( '_stripe_refund_id', $response->id );
+		} elseif ( ! empty($response->id)) {
+			WC_Stripe_Helper::is_pre_30() ? update_post_meta($order_id, '_stripe_refund_id', $response->id) : $order->update_meta_data('_stripe_refund_id', $response->id);
 
-			$amount = wc_price( $response->amount / 100 );
+			$amount = wc_price($response->amount / 100);
 
-			if ( in_array( strtolower( $order->get_currency() ), WC_Stripe_Helper::no_decimal_currencies() ) ) {
-				$amount = wc_price( $response->amount );
+			if (in_array(strtolower($order->get_currency()), WC_Stripe_Helper::no_decimal_currencies())) {
+				$amount = wc_price($response->amount);
 			}
 
-			if ( isset( $response->balance_transaction ) ) {
-				$this->update_fees( $order, $response->balance_transaction );
+			if (isset($response->balance_transaction)) {
+				$this->update_fees($order, $response->balance_transaction);
 			}
 
 			/* translators: 1) dollar amount 2) transaction id 3) refund message */
-			$refund_message = ( isset( $captured ) && 'yes' === $captured ) ? sprintf( __( 'Refunded %1$s - Refund ID: %2$s - Reason: %3$s', 'woocommerce-gateway-stripe' ), $amount, $response->id, $reason ) : __( 'Pre-Authorization Released', 'woocommerce-gateway-stripe' );
+			$refund_message = (isset($captured) && 'yes' === $captured) ? sprintf(__('Refunded %1$s - Refund ID: %2$s - Reason: %3$s', 'woocommerce-gateway-stripe'), $amount, $response->id, $reason) : __('Pre-Authorization Released', 'woocommerce-gateway-stripe');
 
-			$order->add_order_note( $refund_message );
-			WC_Stripe_Logger::log( 'Success: ' . html_entity_decode( strip_tags( $refund_message ) ) );
+			$order->add_order_note($refund_message);
+			WC_Stripe_Logger::log('Success: ' . html_entity_decode(strip_tags($refund_message)));
 
 			return true;
 		}
@@ -754,44 +753,44 @@ 
 	 */
 	public function add_payment_method() {
 		$error     = false;
-		$error_msg = __( 'There was a problem adding the card.', 'woocommerce-gateway-stripe' );
+		$error_msg = __('There was a problem adding the card.', 'woocommerce-gateway-stripe');
 		$source_id = '';
 
-		if ( empty( $_POST['stripe_source'] ) && empty( $_POST['stripe_token'] ) || ! is_user_logged_in() ) {
+		if (empty($_POST['stripe_source']) && empty($_POST['stripe_token']) || ! is_user_logged_in()) {
 			$error = true;
 		}
 
-		$stripe_customer = new WC_Stripe_Customer( get_current_user_id() );
+		$stripe_customer = new WC_Stripe_Customer(get_current_user_id());
 
-		$source = ! empty( $_POST['stripe_source'] ) ? wc_clean( $_POST['stripe_source'] ) : '';
+		$source = ! empty($_POST['stripe_source']) ? wc_clean($_POST['stripe_source']) : '';
 
-		$source_object = WC_Stripe_API::retrieve( 'sources/' . $source );
+		$source_object = WC_Stripe_API::retrieve('sources/' . $source);
 
-		if ( isset( $source_object ) ) {
-			if ( ! empty( $source_object->error ) ) {
+		if (isset($source_object)) {
+			if ( ! empty($source_object->error)) {
 				$error = true;
 			}
 
 			$source_id = $source_object->id;
-		} elseif ( isset( $_POST['stripe_token'] ) ) {
-			$source_id = wc_clean( $_POST['stripe_token'] );
+		} elseif (isset($_POST['stripe_token'])) {
+			$source_id = wc_clean($_POST['stripe_token']);
 		}
 
-		$response = $stripe_customer->add_source( $source_id );
+		$response = $stripe_customer->add_source($source_id);
 
-		if ( ! $response || is_wp_error( $response ) || ! empty( $response->error ) ) {
+		if ( ! $response || is_wp_error($response) || ! empty($response->error)) {
 			$error = true;
 		}
 
-		if ( $error ) {
-			wc_add_notice( $error_msg, 'error' );
-			WC_Stripe_Logger::log( 'Add payment method Error: ' . $error_msg );
+		if ($error) {
+			wc_add_notice($error_msg, 'error');
+			WC_Stripe_Logger::log('Add payment method Error: ' . $error_msg);
 			return;
 		}
 
 		return array(
 			'result'   => 'success',
-			'redirect' => wc_get_endpoint_url( 'payment-methods' ),
+			'redirect' => wc_get_endpoint_url('payment-methods'),
 		);
 	}
 
@@ -808,10 +807,10 @@ 
 		 * Stripe expects Norwegian to only be passed NO.
 		 * But WP has different dialects.
 		 */
-		if ( 'NO' === substr( $locale, 3, 2 ) ) {
+		if ('NO' === substr($locale, 3, 2)) {
 			$locale = 'no';
 		} else {
-			$locale = substr( get_locale(), 0, 2 );
+			$locale = substr(get_locale(), 0, 2);
 		}
 
 		return $locale;