woocommerce / woocommerce-gateway-stripe

includes/class-wc-stripe-payment-tokens.php

Spacing +63 added lines, -63 removed lines

@@ -1,5 +1,5 @@ 
 <?php
-if ( ! defined( 'ABSPATH' ) ) {
+if ( ! defined('ABSPATH')) {
 	exit;
 }
 
@@ -21,11 +21,11 @@ 
 	public function __construct() {
 		self::$_this = $this;
 
-		add_filter( 'woocommerce_get_customer_payment_tokens', array( $this, 'woocommerce_get_customer_payment_tokens' ), 10, 3 );
-		add_filter( 'woocommerce_payment_methods_list_item', array( $this, 'get_account_saved_payment_methods_list_item_sepa' ), 10, 2 );
-		add_filter( 'woocommerce_get_credit_card_type_label', array( $this, 'normalize_sepa_label' ) );
-		add_action( 'woocommerce_payment_token_deleted', array( $this, 'woocommerce_payment_token_deleted' ), 10, 2 );
-		add_action( 'woocommerce_payment_token_set_default', array( $this, 'woocommerce_payment_token_set_default' ) );
+		add_filter('woocommerce_get_customer_payment_tokens', array($this, 'woocommerce_get_customer_payment_tokens'), 10, 3);
+		add_filter('woocommerce_payment_methods_list_item', array($this, 'get_account_saved_payment_methods_list_item_sepa'), 10, 2);
+		add_filter('woocommerce_get_credit_card_type_label', array($this, 'normalize_sepa_label'));
+		add_action('woocommerce_payment_token_deleted', array($this, 'woocommerce_payment_token_deleted'), 10, 2);
+		add_action('woocommerce_payment_token_set_default', array($this, 'woocommerce_payment_token_set_default'));
 	}
 
 	/**
@@ -46,8 +46,8 @@ 
 	 * @param string $label
 	 * @return string $label
 	 */
-	public function normalize_sepa_label( $label ) {
-		if ( 'sepa iban' === strtolower( $label ) ) {
+	public function normalize_sepa_label($label) {
+		if ('sepa iban' === strtolower($label)) {
 			return 'SEPA IBAN';
 		}
 
@@ -61,19 +61,19 @@ 
 	 * @param int $customer_id
 	 * @return bool
 	 */
-	public static function customer_has_saved_methods( $customer_id ) {
-		$gateways = array( 'stripe', 'stripe_sepa' );
+	public static function customer_has_saved_methods($customer_id) {
+		$gateways = array('stripe', 'stripe_sepa');
 
-		if ( empty( $customer_id ) ) {
+		if (empty($customer_id)) {
 			return false;
 		}
 
 		$has_token = false;
 
-		foreach ( $gateways as $gateway ) {
-			$tokens = WC_Payment_Tokens::get_customer_tokens( $customer_id, $gateway );
+		foreach ($gateways as $gateway) {
+			$tokens = WC_Payment_Tokens::get_customer_tokens($customer_id, $gateway);
 
-			if ( ! empty( $tokens ) ) {
+			if ( ! empty($tokens)) {
 				$has_token = true;
 				break;
 			}
@@ -90,67 +90,67 @@ 
 	 * @param array $tokens
 	 * @return array
 	 */
-	public function woocommerce_get_customer_payment_tokens( $tokens = array(), $customer_id, $gateway_id ) {
-		if ( is_user_logged_in() && class_exists( 'WC_Payment_Token_CC' ) ) {
+	public function woocommerce_get_customer_payment_tokens($tokens = array(), $customer_id, $gateway_id) {
+		if (is_user_logged_in() && class_exists('WC_Payment_Token_CC')) {
 			$stored_tokens = array();
 
-			foreach ( $tokens as $token ) {
+			foreach ($tokens as $token) {
 				$stored_tokens[] = $token->get_token();
 			}
 
-			if ( 'stripe' === $gateway_id ) {
-				$stripe_customer = new WC_Stripe_Customer( $customer_id );
+			if ('stripe' === $gateway_id) {
+				$stripe_customer = new WC_Stripe_Customer($customer_id);
 				$stripe_sources  = $stripe_customer->get_sources();
 
-				foreach ( $stripe_sources as $source ) {
-					if ( isset( $source->type ) && 'card' === $source->type ) {
-						if ( ! in_array( $source->id, $stored_tokens ) ) {
+				foreach ($stripe_sources as $source) {
+					if (isset($source->type) && 'card' === $source->type) {
+						if ( ! in_array($source->id, $stored_tokens)) {
 							$token = new WC_Payment_Token_CC();
-							$token->set_token( $source->id );
-							$token->set_gateway_id( 'stripe' );
-
-							if ( 'source' === $source->object && 'card' === $source->type ) {
-								$token->set_card_type( strtolower( $source->card->brand ) );
-								$token->set_last4( $source->card->last4 );
-								$token->set_expiry_month( $source->card->exp_month );
-								$token->set_expiry_year( $source->card->exp_year );
+							$token->set_token($source->id);
+							$token->set_gateway_id('stripe');
+
+							if ('source' === $source->object && 'card' === $source->type) {
+								$token->set_card_type(strtolower($source->card->brand));
+								$token->set_last4($source->card->last4);
+								$token->set_expiry_month($source->card->exp_month);
+								$token->set_expiry_year($source->card->exp_year);
 							}
 
-							$token->set_user_id( $customer_id );
+							$token->set_user_id($customer_id);
 							$token->save();
-							$tokens[ $token->get_id() ] = $token;
+							$tokens[$token->get_id()] = $token;
 						}
 					} else {
-						if ( ! in_array( $source->id, $stored_tokens ) && 'card' === $source->object ) {
+						if ( ! in_array($source->id, $stored_tokens) && 'card' === $source->object) {
 							$token = new WC_Payment_Token_CC();
-							$token->set_token( $source->id );
-							$token->set_gateway_id( 'stripe' );
-							$token->set_card_type( strtolower( $source->brand ) );
-							$token->set_last4( $source->last4 );
-							$token->set_expiry_month( $source->exp_month );
-							$token->set_expiry_year( $source->exp_year );
-							$token->set_user_id( $customer_id );
+							$token->set_token($source->id);
+							$token->set_gateway_id('stripe');
+							$token->set_card_type(strtolower($source->brand));
+							$token->set_last4($source->last4);
+							$token->set_expiry_month($source->exp_month);
+							$token->set_expiry_year($source->exp_year);
+							$token->set_user_id($customer_id);
 							$token->save();
-							$tokens[ $token->get_id() ] = $token;
+							$tokens[$token->get_id()] = $token;
 						}
 					}
 				}
 			}
 
-			if ( 'stripe_sepa' === $gateway_id ) {
-				$stripe_customer = new WC_Stripe_Customer( $customer_id );
+			if ('stripe_sepa' === $gateway_id) {
+				$stripe_customer = new WC_Stripe_Customer($customer_id);
 				$stripe_sources  = $stripe_customer->get_sources();
 
-				foreach ( $stripe_sources as $source ) {
-					if ( isset( $source->type ) && 'sepa_debit' === $source->type ) {
-						if ( ! in_array( $source->id, $stored_tokens ) ) {
+				foreach ($stripe_sources as $source) {
+					if (isset($source->type) && 'sepa_debit' === $source->type) {
+						if ( ! in_array($source->id, $stored_tokens)) {
 							$token = new WC_Payment_Token_SEPA();
-							$token->set_token( $source->id );
-							$token->set_gateway_id( 'stripe_sepa' );
-							$token->set_last4( $source->sepa_debit->last4 );
-							$token->set_user_id( $customer_id );
+							$token->set_token($source->id);
+							$token->set_gateway_id('stripe_sepa');
+							$token->set_last4($source->sepa_debit->last4);
+							$token->set_user_id($customer_id);
 							$token->save();
-							$tokens[ $token->get_id() ] = $token;
+							$tokens[$token->get_id()] = $token;
 						}
 					}
 				}
@@ -169,10 +169,10 @@ 
 	 * @param  WC_Payment_Token $payment_token The payment token associated with this method entry
 	 * @return array                           Filtered item
 	 */
-	public function get_account_saved_payment_methods_list_item_sepa( $item, $payment_token ) {
-		if ( 'sepa' === strtolower( $payment_token->get_type() ) ) {
+	public function get_account_saved_payment_methods_list_item_sepa($item, $payment_token) {
+		if ('sepa' === strtolower($payment_token->get_type())) {
 			$item['method']['last4'] = $payment_token->get_last4();
-			$item['method']['brand'] = esc_html__( 'SEPA IBAN', 'woocommerce-gateway-stripe' );
+			$item['method']['brand'] = esc_html__('SEPA IBAN', 'woocommerce-gateway-stripe');
 		}
 
 		return $item;
@@ -184,10 +184,10 @@ 
 	 * @since 3.1.0
 	 * @version 4.0.0
 	 */
-	public function woocommerce_payment_token_deleted( $token_id, $token ) {
-		if ( 'stripe' === $token->get_gateway_id() || 'stripe_sepa' === $token->get_gateway_id() ) {
-			$stripe_customer = new WC_Stripe_Customer( get_current_user_id() );
-			$stripe_customer->delete_source( $token->get_token() );
+	public function woocommerce_payment_token_deleted($token_id, $token) {
+		if ('stripe' === $token->get_gateway_id() || 'stripe_sepa' === $token->get_gateway_id()) {
+			$stripe_customer = new WC_Stripe_Customer(get_current_user_id());
+			$stripe_customer->delete_source($token->get_token());
 		}
 	}
 
@@ -197,12 +197,12 @@ 
 	 * @since 3.1.0
 	 * @version 4.0.0
 	 */
-	public function woocommerce_payment_token_set_default( $token_id ) {
-		$token = WC_Payment_Tokens::get( $token_id );
+	public function woocommerce_payment_token_set_default($token_id) {
+		$token = WC_Payment_Tokens::get($token_id);
 
-		if ( 'stripe' === $token->get_gateway_id() || 'stripe_sepa' === $token->get_gateway_id() ) {
-			$stripe_customer = new WC_Stripe_Customer( get_current_user_id() );
-			$stripe_customer->set_default_source( $token->get_token() );
+		if ('stripe' === $token->get_gateway_id() || 'stripe_sepa' === $token->get_gateway_id()) {
+			$stripe_customer = new WC_Stripe_Customer(get_current_user_id());
+			$stripe_customer->set_default_source($token->get_token());
 		}
 	}
 }

includes/admin/class-wc-stripe-privacy.php

Spacing +112 added lines, -112 removed lines

@@ -1,5 +1,5 @@ 
 <?php
-if ( ! class_exists( 'WC_Abstract_Privacy' ) ) {
+if ( ! class_exists('WC_Abstract_Privacy')) {
 	return;
 }
 
@@ -9,20 +9,20 @@ 
 	 *
 	 */
 	public function __construct() {
-		parent::__construct( __( 'Stripe', 'woocommerce-gateway-stripe' ) );
+		parent::__construct(__('Stripe', 'woocommerce-gateway-stripe'));
 
-		$this->add_exporter( 'woocommerce-gateway-stripe-order-data', __( 'WooCommerce Stripe Order Data', 'woocommerce-gateway-stripe' ), array( $this, 'order_data_exporter' ) );
+		$this->add_exporter('woocommerce-gateway-stripe-order-data', __('WooCommerce Stripe Order Data', 'woocommerce-gateway-stripe'), array($this, 'order_data_exporter'));
 
-		if ( function_exists( 'wcs_get_subscriptions' ) ) {
-			$this->add_exporter( 'woocommerce-gateway-stripe-subscriptions-data', __( 'WooCommerce Stripe Subscriptions Data', 'woocommerce-gateway-stripe' ), array( $this, 'subscriptions_data_exporter' ) );
+		if (function_exists('wcs_get_subscriptions')) {
+			$this->add_exporter('woocommerce-gateway-stripe-subscriptions-data', __('WooCommerce Stripe Subscriptions Data', 'woocommerce-gateway-stripe'), array($this, 'subscriptions_data_exporter'));
 		}
 
-		$this->add_exporter( 'woocommerce-gateway-stripe-customer-data', __( 'WooCommerce Stripe Customer Data', 'woocommerce-gateway-stripe' ), array( $this, 'customer_data_exporter' ) );
+		$this->add_exporter('woocommerce-gateway-stripe-customer-data', __('WooCommerce Stripe Customer Data', 'woocommerce-gateway-stripe'), array($this, 'customer_data_exporter'));
 
-		$this->add_eraser( 'woocommerce-gateway-stripe-customer-data', __( 'WooCommerce Stripe Customer Data', 'woocommerce-gateway-stripe' ), array( $this, 'customer_data_eraser' ) );
-		$this->add_eraser( 'woocommerce-gateway-stripe-order-data', __( 'WooCommerce Stripe Data', 'woocommerce-gateway-stripe' ), array( $this, 'order_data_eraser' ) );
+		$this->add_eraser('woocommerce-gateway-stripe-customer-data', __('WooCommerce Stripe Customer Data', 'woocommerce-gateway-stripe'), array($this, 'customer_data_eraser'));
+		$this->add_eraser('woocommerce-gateway-stripe-order-data', __('WooCommerce Stripe Data', 'woocommerce-gateway-stripe'), array($this, 'order_data_eraser'));
 
-		add_filter( 'woocommerce_get_settings_account', array( $this, 'account_settings' ) );
+		add_filter('woocommerce_get_settings_account', array($this, 'account_settings'));
 	}
 
 	/**
@@ -31,20 +31,20 @@ 
 	 * @param array $settings
 	 * @return array $settings Updated
 	 */
-	public function account_settings( $settings ) {
+	public function account_settings($settings) {
 		$insert_setting = array(
 			array(
-				'title'       => __( 'Retain Stripe Data', 'woocommerce-gateway-stripe' ),
-				'desc_tip'    => __( 'Retains any Stripe data such as Stripe customer ID, source ID.', 'woocommerce-gateway-stripe' ),
+				'title'       => __('Retain Stripe Data', 'woocommerce-gateway-stripe'),
+				'desc_tip'    => __('Retains any Stripe data such as Stripe customer ID, source ID.', 'woocommerce-gateway-stripe'),
 				'id'          => 'woocommerce_gateway_stripe_retention',
 				'type'        => 'relative_date_selector',
-				'placeholder' => __( 'N/A', 'woocommerce-gateway-stripe' ),
+				'placeholder' => __('N/A', 'woocommerce-gateway-stripe'),
 				'default'     => '',
 				'autoload'    => false,
 			),
 		);
 
-		array_splice( $settings, ( count( $settings ) - 1 ), 0, $insert_setting );
+		array_splice($settings, (count($settings) - 1), 0, $insert_setting);
 
 		return $settings;
 	}
@@ -57,22 +57,22 @@ 
 	 *
 	 * @return array WP_Post
 	 */
-	protected function get_stripe_orders( $email_address, $page ) {
-		$user = get_user_by( 'email', $email_address ); // Check if user has an ID in the DB to load stored personal data.
+	protected function get_stripe_orders($email_address, $page) {
+		$user = get_user_by('email', $email_address); // Check if user has an ID in the DB to load stored personal data.
 
-		$order_query    = array(
-			'payment_method' => array( 'stripe', 'stripe_alipay', 'stripe_bancontact', 'stripe_eps', 'stripe_giropay', 'stripe_ideal', 'stripe_multibanco', 'stripe_p24', 'stripe_sepa', 'stripe_sofort' ),
+		$order_query = array(
+			'payment_method' => array('stripe', 'stripe_alipay', 'stripe_bancontact', 'stripe_eps', 'stripe_giropay', 'stripe_ideal', 'stripe_multibanco', 'stripe_p24', 'stripe_sepa', 'stripe_sofort'),
 			'limit'          => 10,
 			'page'           => $page,
 		);
 
-		if ( $user instanceof WP_User ) {
+		if ($user instanceof WP_User) {
 			$order_query['customer_id'] = (int) $user->ID;
 		} else {
 			$order_query['billing_email'] = $email_address;
 		}
 
-		return wc_get_orders( $order_query );
+		return wc_get_orders($order_query);
 	}
 
 	/**
@@ -80,7 +80,7 @@ 
 	 *
 	 */
 	public function get_privacy_message() {
-		return wpautop( sprintf( __( 'By using this extension, you may be storing personal data or sharing data with an external service. <a href="%s" target="_blank">Learn more about how this works, including what you may want to include in your privacy policy.</a>', 'woocommerce-gateway-stripe' ), 'https://docs.woocommerce.com/document/privacy-payments/#woocommerce-gateway-stripe' ) );
+		return wpautop(sprintf(__('By using this extension, you may be storing personal data or sharing data with an external service. <a href="%s" target="_blank">Learn more about how this works, including what you may want to include in your privacy policy.</a>', 'woocommerce-gateway-stripe'), 'https://docs.woocommerce.com/document/privacy-payments/#woocommerce-gateway-stripe'));
 	}
 
 	/**
@@ -91,34 +91,34 @@ 
 	 *
 	 * @return array
 	 */
-	public function order_data_exporter( $email_address, $page = 1 ) {
+	public function order_data_exporter($email_address, $page = 1) {
 		$done           = false;
 		$data_to_export = array();
 
-		$orders = $this->get_stripe_orders( $email_address, (int) $page );
+		$orders = $this->get_stripe_orders($email_address, (int) $page);
 
 		$done = true;
 
-		if ( 0 < count( $orders ) ) {
-			foreach ( $orders as $order ) {
+		if (0 < count($orders)) {
+			foreach ($orders as $order) {
 				$data_to_export[] = array(
 					'group_id'    => 'woocommerce_orders',
-					'group_label' => __( 'Orders', 'woocommerce-gateway-stripe' ),
+					'group_label' => __('Orders', 'woocommerce-gateway-stripe'),
 					'item_id'     => 'order-' . $order->get_id(),
 					'data'        => array(
 						array(
-							'name'  => __( 'Stripe payment id', 'woocommerce-gateway-stripe' ),
-							'value' => get_post_meta( $order->get_id(), '_stripe_source_id', true ),
+							'name'  => __('Stripe payment id', 'woocommerce-gateway-stripe'),
+							'value' => get_post_meta($order->get_id(), '_stripe_source_id', true),
 						),
 						array(
-							'name'  => __( 'Stripe customer id', 'woocommerce-gateway-stripe' ),
-							'value' => get_post_meta( $order->get_id(), '_stripe_customer_id', true ),
+							'name'  => __('Stripe customer id', 'woocommerce-gateway-stripe'),
+							'value' => get_post_meta($order->get_id(), '_stripe_customer_id', true),
 						),
 					),
 				);
 			}
 
-			$done = 10 > count( $orders );
+			$done = 10 > count($orders);
 		}
 
 		return array(
@@ -135,7 +135,7 @@ 
 	 *
 	 * @return array
 	 */
-	public function subscriptions_data_exporter( $email_address, $page = 1 ) {
+	public function subscriptions_data_exporter($email_address, $page = 1) {
 		$done           = false;
 		$page           = (int) $page;
 		$data_to_export = array();
@@ -144,7 +144,7 @@ 
 			'relation'    => 'AND',
 			array(
 				'key'     => '_payment_method',
-				'value'   => array( 'stripe', 'stripe_alipay', 'stripe_bancontact', 'stripe_eps', 'stripe_giropay', 'stripe_ideal', 'stripe_multibanco', 'stripe_p24', 'stripe_sepa', 'stripe_sofort' ),
+				'value'   => array('stripe', 'stripe_alipay', 'stripe_bancontact', 'stripe_eps', 'stripe_giropay', 'stripe_ideal', 'stripe_multibanco', 'stripe_p24', 'stripe_sepa', 'stripe_sofort'),
 				'compare' => 'IN',
 			),
 			array(
@@ -154,36 +154,36 @@ 
 			),
 		);
 
-		$subscription_query    = array(
+		$subscription_query = array(
 			'posts_per_page'  => 10,
 			'page'            => $page,
 			'meta_query'      => $meta_query,
 		);
 
-		$subscriptions = wcs_get_subscriptions( $subscription_query );
+		$subscriptions = wcs_get_subscriptions($subscription_query);
 
 		$done = true;
 
-		if ( 0 < count( $subscriptions ) ) {
-			foreach ( $subscriptions as $subscription ) {
+		if (0 < count($subscriptions)) {
+			foreach ($subscriptions as $subscription) {
 				$data_to_export[] = array(
 					'group_id'    => 'woocommerce_subscriptions',
-					'group_label' => __( 'Subscriptions', 'woocommerce-gateway-stripe' ),
+					'group_label' => __('Subscriptions', 'woocommerce-gateway-stripe'),
 					'item_id'     => 'subscription-' . $subscription->get_id(),
 					'data'        => array(
 						array(
-							'name'  => __( 'Stripe payment id', 'woocommerce-gateway-stripe' ),
-							'value' => get_post_meta( $subscription->get_id(), '_stripe_source_id', true ),
+							'name'  => __('Stripe payment id', 'woocommerce-gateway-stripe'),
+							'value' => get_post_meta($subscription->get_id(), '_stripe_source_id', true),
 						),
 						array(
-							'name'  => __( 'Stripe customer id', 'woocommerce-gateway-stripe' ),
-							'value' => get_post_meta( $subscription->get_id(), '_stripe_customer_id', true ),
+							'name'  => __('Stripe customer id', 'woocommerce-gateway-stripe'),
+							'value' => get_post_meta($subscription->get_id(), '_stripe_customer_id', true),
 						),
 					),
 				);
 			}
 
-			$done = 10 > count( $subscriptions );
+			$done = 10 > count($subscriptions);
 		}
 
 		return array(
@@ -199,24 +199,24 @@ 
 	 * @param int    $page  Page.
 	 * @return array An array of personal data in name value pairs
 	 */
-	public function customer_data_exporter( $email_address, $page ) {
-		$user           = get_user_by( 'email', $email_address ); // Check if user has an ID in the DB to load stored personal data.
+	public function customer_data_exporter($email_address, $page) {
+		$user           = get_user_by('email', $email_address); // Check if user has an ID in the DB to load stored personal data.
 		$data_to_export = array();
 
-		if ( $user instanceof WP_User ) {
-			$stripe_user = new WC_Stripe_Customer( $user->ID );
+		if ($user instanceof WP_User) {
+			$stripe_user = new WC_Stripe_Customer($user->ID);
 
 			$data_to_export[] = array(
 				'group_id'    => 'woocommerce_customer',
-				'group_label' => __( 'Customer Data', 'woocommerce-gateway-stripe' ),
+				'group_label' => __('Customer Data', 'woocommerce-gateway-stripe'),
 				'item_id'     => 'user',
 				'data'        => array(
 					array(
-						'name'  => __( 'Stripe payment id', 'woocommerce-gateway-stripe' ),
-						'value' => get_user_meta( $user->ID, '_stripe_source_id', true ),
+						'name'  => __('Stripe payment id', 'woocommerce-gateway-stripe'),
+						'value' => get_user_meta($user->ID, '_stripe_source_id', true),
 					),
 					array(
-						'name'  => __( 'Stripe customer id', 'woocommerce-gateway-stripe' ),
+						'name'  => __('Stripe customer id', 'woocommerce-gateway-stripe'),
 						'value' => $stripe_user->get_id(),
 					),
 				),
@@ -236,25 +236,25 @@ 
 	 * @param int    $page  Page.
 	 * @return array An array of personal data in name value pairs
 	 */
-	public function customer_data_eraser( $email_address, $page ) {
+	public function customer_data_eraser($email_address, $page) {
 		$page               = (int) $page;
-		$user               = get_user_by( 'email', $email_address ); // Check if user has an ID in the DB to load stored personal data.
+		$user               = get_user_by('email', $email_address); // Check if user has an ID in the DB to load stored personal data.
 		$stripe_customer_id = '';
 		$stripe_source_id   = '';
 
-		if ( $user instanceof WP_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 );
+		if ($user instanceof WP_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);
 		}
 
 		$items_removed  = false;
 		$messages       = array();
 
-		if ( ! empty( $stripe_customer_id ) || ! empty( $stripe_source_id ) ) {
+		if ( ! empty($stripe_customer_id) || ! empty($stripe_source_id)) {
 			$items_removed = true;
-			delete_user_meta( $user->ID, '_stripe_customer_id' );
-			delete_user_meta( $user->ID, '_stripe_source_id' );
-			$messages[] = __( 'Stripe User Data Erased.', 'woocommerce-gateway-stripe' );
+			delete_user_meta($user->ID, '_stripe_customer_id');
+			delete_user_meta($user->ID, '_stripe_source_id');
+			$messages[] = __('Stripe User Data Erased.', 'woocommerce-gateway-stripe');
 		}
 
 		return array(
@@ -272,29 +272,29 @@ 
 	 * @param int    $page  Page.
 	 * @return array An array of personal data in name value pairs
 	 */
-	public function order_data_eraser( $email_address, $page ) {
-		$orders = $this->get_stripe_orders( $email_address, (int) $page );
+	public function order_data_eraser($email_address, $page) {
+		$orders = $this->get_stripe_orders($email_address, (int) $page);
 
 		$items_removed  = false;
 		$items_retained = false;
 		$messages       = array();
 
-		foreach ( (array) $orders as $order ) {
-			$order = wc_get_order( $order->get_id() );
+		foreach ((array) $orders as $order) {
+			$order = wc_get_order($order->get_id());
 
-			list( $removed, $retained, $msgs ) = $this->maybe_handle_order( $order );
+			list($removed, $retained, $msgs) = $this->maybe_handle_order($order);
 			$items_removed  |= $removed;
 			$items_retained |= $retained;
-			$messages        = array_merge( $messages, $msgs );
+			$messages        = array_merge($messages, $msgs);
 
-			list( $removed, $retained, $msgs ) = $this->maybe_handle_subscription( $order );
+			list($removed, $retained, $msgs) = $this->maybe_handle_subscription($order);
 			$items_removed  |= $removed;
 			$items_retained |= $retained;
-			$messages        = array_merge( $messages, $msgs );
+			$messages        = array_merge($messages, $msgs);
 		}
 
 		// Tell core if we have more orders to work on still
-		$done = count( $orders ) < 10;
+		$done = count($orders) < 10;
 
 		return array(
 			'items_removed'  => $items_removed,
@@ -310,45 +310,45 @@ 
 	 * @param WC_Order $order
 	 * @return array
 	 */
-	protected function maybe_handle_subscription( $order ) {
-		if ( ! class_exists( 'WC_Subscriptions' ) ) {
-			return array( false, false, array() );
+	protected function maybe_handle_subscription($order) {
+		if ( ! class_exists('WC_Subscriptions')) {
+			return array(false, false, array());
 		}
 
-		if ( ! wcs_order_contains_subscription( $order ) ) {
-			return array( false, false, array() );
+		if ( ! wcs_order_contains_subscription($order)) {
+			return array(false, false, array());
 		}
 
-		$subscription    = current( wcs_get_subscriptions_for_order( $order->get_id() ) );
+		$subscription    = current(wcs_get_subscriptions_for_order($order->get_id()));
 		$subscription_id = $subscription->get_id();
 
-		$stripe_source_id = get_post_meta( $subscription_id, '_stripe_source_id', true );
+		$stripe_source_id = get_post_meta($subscription_id, '_stripe_source_id', true);
 
-		if ( empty( $stripe_source_id ) ) {
-			return array( false, false, array() );
+		if (empty($stripe_source_id)) {
+			return array(false, false, array());
 		}
 
-		if ( ! $this->is_retention_expired( $order->get_date_created()->getTimestamp() ) ) {
-			return array( false, true, array( sprintf( __( 'Order ID %d is less than set retention days. Personal data retained. (Stripe)', 'woocommerce-gateway-stripe' ), $order->get_id() ) ) );
+		if ( ! $this->is_retention_expired($order->get_date_created()->getTimestamp())) {
+			return array(false, true, array(sprintf(__('Order ID %d is less than set retention days. Personal data retained. (Stripe)', 'woocommerce-gateway-stripe'), $order->get_id())));
 		}
 
-		if ( $subscription->has_status( apply_filters( 'wc_stripe_privacy_eraser_subs_statuses', array( 'on-hold', 'active' ) ) ) ) {
-			return array( false, true, array( sprintf( __( 'Order ID %d contains an active Subscription. Personal data retained. (Stripe)', 'woocommerce-gateway-stripe' ), $order->get_id() ) ) );
+		if ($subscription->has_status(apply_filters('wc_stripe_privacy_eraser_subs_statuses', array('on-hold', 'active')))) {
+			return array(false, true, array(sprintf(__('Order ID %d contains an active Subscription. Personal data retained. (Stripe)', 'woocommerce-gateway-stripe'), $order->get_id())));
 		}
 
-		$renewal_orders = WC_Subscriptions_Renewal_Order::get_renewal_orders( $order->get_id() );
+		$renewal_orders = WC_Subscriptions_Renewal_Order::get_renewal_orders($order->get_id());
 
-		foreach ( $renewal_orders as $renewal_order_id ) {
-			delete_post_meta( $renewal_order_id, '_stripe_source_id' );
-			delete_post_meta( $renewal_order_id, '_stripe_refund_id' );
-			delete_post_meta( $renewal_order_id, '_stripe_customer_id' );
+		foreach ($renewal_orders as $renewal_order_id) {
+			delete_post_meta($renewal_order_id, '_stripe_source_id');
+			delete_post_meta($renewal_order_id, '_stripe_refund_id');
+			delete_post_meta($renewal_order_id, '_stripe_customer_id');
 		}
 
-		delete_post_meta( $subscription_id, '_stripe_source_id' );
-		delete_post_meta( $subscription_id, '_stripe_refund_id' );
-		delete_post_meta( $subscription_id, '_stripe_customer_id' );
+		delete_post_meta($subscription_id, '_stripe_source_id');
+		delete_post_meta($subscription_id, '_stripe_refund_id');
+		delete_post_meta($subscription_id, '_stripe_customer_id');
 
-		return array( true, false, array( __( 'Stripe Subscription Data Erased.', 'woocommerce-gateway-stripe' ) ) );
+		return array(true, false, array(__('Stripe Subscription Data Erased.', 'woocommerce-gateway-stripe')));
 	}
 
 	/**
@@ -357,60 +357,60 @@ 
 	 * @param WC_Order $order
 	 * @return array
 	 */
-	protected function maybe_handle_order( $order ) {
+	protected function maybe_handle_order($order) {
 		$order_id           = $order->get_id();
-		$stripe_source_id   = get_post_meta( $order_id, '_stripe_source_id', true );
-		$stripe_refund_id   = get_post_meta( $order_id, '_stripe_refund_id', true );
-		$stripe_customer_id = get_post_meta( $order_id, '_stripe_customer_id', true );
+		$stripe_source_id   = get_post_meta($order_id, '_stripe_source_id', true);
+		$stripe_refund_id   = get_post_meta($order_id, '_stripe_refund_id', true);
+		$stripe_customer_id = get_post_meta($order_id, '_stripe_customer_id', true);
 
-		if ( ! $this->is_retention_expired( $order->get_date_created()->getTimestamp() ) ) {
-			return array( false, true, array( sprintf( __( 'Order ID %d is less than set retention days. Personal data retained. (Stripe)', 'woocommerce-gateway-stripe' ), $order->get_id() ) ) );
+		if ( ! $this->is_retention_expired($order->get_date_created()->getTimestamp())) {
+			return array(false, true, array(sprintf(__('Order ID %d is less than set retention days. Personal data retained. (Stripe)', 'woocommerce-gateway-stripe'), $order->get_id())));
 		}
 
-		if ( empty( $stripe_source_id ) && empty( $stripe_refund_id ) && empty( $stripe_customer_id ) ) {
-			return array( false, false, array() );
+		if (empty($stripe_source_id) && empty($stripe_refund_id) && empty($stripe_customer_id)) {
+			return array(false, false, array());
 		}
 
-		delete_post_meta( $order_id, '_stripe_source_id' );
-		delete_post_meta( $order_id, '_stripe_refund_id' );
-		delete_post_meta( $order_id, '_stripe_customer_id' );
+		delete_post_meta($order_id, '_stripe_source_id');
+		delete_post_meta($order_id, '_stripe_refund_id');
+		delete_post_meta($order_id, '_stripe_customer_id');
 
-		return array( true, false, array( __( 'Stripe personal data erased.', 'woocommerce-gateway-stripe' ) ) );
+		return array(true, false, array(__('Stripe personal data erased.', 'woocommerce-gateway-stripe')));
 	}
 
 	/**
 	 * Checks if create date is passed retention duration.
 	 *
 	 */
-	public function is_retention_expired( $created_date ) {
-		$retention  = wc_parse_relative_date_option( get_option( 'woocommerce_gateway_stripe_retention' ) );
+	public function is_retention_expired($created_date) {
+		$retention  = wc_parse_relative_date_option(get_option('woocommerce_gateway_stripe_retention'));
 		$is_expired = false;
-		$time_span  = time() - strtotime( $created_date );
-		if ( empty( $retention ) || empty( $created_date ) ) {
+		$time_span  = time() - strtotime($created_date);
+		if (empty($retention) || empty($created_date)) {
 			return false;
 		}
-		switch ( $retention['unit'] ) {
+		switch ($retention['unit']) {
 			case 'days':
 				$retention = $retention['number'] * DAY_IN_SECONDS;
-				if ( $time_span > $retention ) {
+				if ($time_span > $retention) {
 					$is_expired = true;
 				}
 				break;
 			case 'weeks':
 				$retention = $retention['number'] * WEEK_IN_SECONDS;
-				if ( $time_span > $retention ) {
+				if ($time_span > $retention) {
 					$is_expired = true;
 				}
 				break;
 			case 'months':
 				$retention = $retention['number'] * MONTH_IN_SECONDS;
-				if ( $time_span > $retention ) {
+				if ($time_span > $retention) {
 					$is_expired = true;
 				}
 				break;
 			case 'years':
 				$retention = $retention['number'] * YEAR_IN_SECONDS;
-				if ( $time_span > $retention ) {
+				if ($time_span > $retention) {
 					$is_expired = true;
 				}
 				break;

includes/admin/class-wc-stripe-admin-notices.php

Spacing +79 added lines, -79 removed lines

@@ -1,5 +1,5 @@ 
 <?php
-if ( ! defined( 'ABSPATH' ) ) {
+if ( ! defined('ABSPATH')) {
 	exit;
 }
 
@@ -21,8 +21,8 @@ 
 	 * @since 4.1.0
 	 */
 	public function __construct() {
-		add_action( 'admin_notices', array( $this, 'admin_notices' ) );
-		add_action( 'wp_loaded', array( $this, 'hide_notices' ) );
+		add_action('admin_notices', array($this, 'admin_notices'));
+		add_action('wp_loaded', array($this, 'hide_notices'));
 	}
 
 	/**
@@ -31,8 +31,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,
@@ -46,7 +46,7 @@ 
 	 * @version 4.0.0
 	 */
 	public function admin_notices() {
-		if ( ! current_user_can( 'manage_woocommerce' ) ) {
+		if ( ! current_user_can('manage_woocommerce')) {
 			return;
 		}
 
@@ -56,17 +56,17 @@ 
 		// All other payment methods.
 		$this->payment_methods_check_environment();
 
-		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>';
 		}
 	}
@@ -99,85 +99,85 @@ 
 	 * @version 4.0.0
 	 */
 	public function stripe_check_environment() {
-		$show_ssl_notice    = get_option( 'wc_stripe_show_ssl_notice' );
-		$show_keys_notice   = get_option( 'wc_stripe_show_keys_notice' );
-		$show_phpver_notice = get_option( 'wc_stripe_show_phpver_notice' );
-		$show_wcver_notice  = get_option( 'wc_stripe_show_wcver_notice' );
-		$show_curl_notice   = get_option( 'wc_stripe_show_curl_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'] ) {
-			if ( empty( $show_phpver_notice ) ) {
-				if ( version_compare( phpversion(), WC_STRIPE_MIN_PHP_VER, '<' ) ) {
+		$show_ssl_notice    = get_option('wc_stripe_show_ssl_notice');
+		$show_keys_notice   = get_option('wc_stripe_show_keys_notice');
+		$show_phpver_notice = get_option('wc_stripe_show_phpver_notice');
+		$show_wcver_notice  = get_option('wc_stripe_show_wcver_notice');
+		$show_curl_notice   = get_option('wc_stripe_show_curl_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']) {
+			if (empty($show_phpver_notice)) {
+				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');
 
-					$this->add_admin_notice( 'phpver', 'error', sprintf( $message, WC_STRIPE_MIN_PHP_VER, phpversion() ), true );
+					$this->add_admin_notice('phpver', 'error', sprintf($message, WC_STRIPE_MIN_PHP_VER, phpversion()), true);
 
 					return;
 				}
 			}
 
-			if ( empty( $show_wcver_notice ) ) {
-				if ( version_compare( WC_VERSION, WC_STRIPE_MIN_WC_VER, '<' ) ) {
+			if (empty($show_wcver_notice)) {
+				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');
 
-					$this->add_admin_notice( 'wcver', 'notice notice-warning', sprintf( $message, WC_STRIPE_MIN_WC_VER, WC_VERSION ), true );
+					$this->add_admin_notice('wcver', 'notice notice-warning', sprintf($message, WC_STRIPE_MIN_WC_VER, WC_VERSION), true);
 
 					return;
 				}
 			}
 
-			if ( empty( $show_curl_notice ) ) {
-				if ( ! function_exists( 'curl_init' ) ) {
-					$this->add_admin_notice( 'curl', 'notice notice-warning', __( 'WooCommerce Stripe - cURL is not installed.', 'woocommerce-gateway-stripe' ), true );
+			if (empty($show_curl_notice)) {
+				if ( ! function_exists('curl_init')) {
+					$this->add_admin_notice('curl', 'notice notice-warning', __('WooCommerce Stripe - cURL is not installed.', 'woocommerce-gateway-stripe'), true);
 				}
 			}
 
-			if ( empty( $show_keys_notice ) ) {
+			if (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 ) ) {
+			if (empty($show_ssl_notice)) {
 				// Show message if enabled and FORCE SSL is disabled and WordpressHTTPS plugin is not detected.
-				if ( ! wc_checkout_is_https() ) {
+				if ( ! wc_checkout_is_https()) {
 					/* translators: 1) link */
-					$this->add_admin_notice( 'ssl', 'notice notice-warning', sprintf( __( 'Stripe is enabled, but a SSL certificate is not detected. Your checkout may not be secure! Please ensure your server has a valid <a href="%1$s" target="_blank">SSL certificate</a>', 'woocommerce-gateway-stripe' ), 'https://en.wikipedia.org/wiki/Transport_Layer_Security' ), true );
+					$this->add_admin_notice('ssl', 'notice notice-warning', sprintf(__('Stripe is enabled, but a SSL certificate is not detected. Your checkout may not be secure! Please ensure your server has a valid <a href="%1$s" target="_blank">SSL certificate</a>', 'woocommerce-gateway-stripe'), 'https://en.wikipedia.org/wiki/Transport_Layer_Security'), true);
 				}
 			}
 		}
@@ -191,16 +191,16 @@ 
 	public function payment_methods_check_environment() {
 		$payment_methods = $this->get_payment_methods();
 
-		foreach ( $payment_methods as $method => $class ) {
-			$show_notice = get_option( 'wc_stripe_show_' . strtolower( $method ) . '_notice' );
+		foreach ($payment_methods as $method => $class) {
+			$show_notice = get_option('wc_stripe_show_' . strtolower($method) . '_notice');
 			$gateway     = new $class();
 
-			if ( 'yes' !== $gateway->enabled || 'no' === $show_notice ) {
+			if ('yes' !== $gateway->enabled || 'no' === $show_notice) {
 				continue;
 			}
 
-			if ( ! in_array( get_woocommerce_currency(), $gateway->get_supported_currency() ) ) {
-				$this->add_admin_notice( $method, 'notice notice-error', sprintf( __( '%s is enabled - it requires store currency to be set to %s', 'woocommerce-gateway-stripe' ), $method, implode( ', ', $gateway->get_supported_currency() ) ), true );
+			if ( ! in_array(get_woocommerce_currency(), $gateway->get_supported_currency())) {
+				$this->add_admin_notice($method, 'notice notice-error', sprintf(__('%s is enabled - it requires store currency to be set to %s', 'woocommerce-gateway-stripe'), $method, implode(', ', $gateway->get_supported_currency())), true);
 			}
 		}
 	}
@@ -212,59 +212,59 @@ 
 	 * @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&#8217; huh?', 'woocommerce-gateway-stripe' ) );
+			if ( ! current_user_can('manage_woocommerce')) {
+				wp_die(__('Cheatin&#8217; 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 'phpver':
-					update_option( 'wc_stripe_show_phpver_notice', 'no' );
+					update_option('wc_stripe_show_phpver_notice', 'no');
 					break;
 				case 'wcver':
-					update_option( 'wc_stripe_show_wcver_notice', 'no' );
+					update_option('wc_stripe_show_wcver_notice', 'no');
 					break;
 				case 'curl':
-					update_option( 'wc_stripe_show_curl_notice', 'no' );
+					update_option('wc_stripe_show_curl_notice', 'no');
 					break;
 				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;
 				case 'Alipay':
-					update_option( 'wc_stripe_show_alipay_notice', 'no' );
+					update_option('wc_stripe_show_alipay_notice', 'no');
 					break;
 				case 'Bancontact':
-					update_option( 'wc_stripe_show_bancontact_notice', 'no' );
+					update_option('wc_stripe_show_bancontact_notice', 'no');
 					break;
 				case 'EPS':
-					update_option( 'wc_stripe_show_eps_notice', 'no' );
+					update_option('wc_stripe_show_eps_notice', 'no');
 					break;
 				case 'Giropay':
-					update_option( 'wc_stripe_show_giropay_notice', 'no' );
+					update_option('wc_stripe_show_giropay_notice', 'no');
 					break;
 				case 'iDeal':
-					update_option( 'wc_stripe_show_ideal_notice', 'no' );
+					update_option('wc_stripe_show_ideal_notice', 'no');
 					break;
 				case 'Multibanco':
-					update_option( 'wc_stripe_show_multibanco_notice', 'no' );
+					update_option('wc_stripe_show_multibanco_notice', 'no');
 					break;
 				case 'P24':
-					update_option( 'wc_stripe_show_p24_notice', 'no' );
+					update_option('wc_stripe_show_p24_notice', 'no');
 					break;
 				case 'SEPA':
-					update_option( 'wc_stripe_show_sepa_notice', 'no' );
+					update_option('wc_stripe_show_sepa_notice', 'no');
 					break;
 				case 'SOFORT':
-					update_option( 'wc_stripe_show_sofort_notice', 'no' );
+					update_option('wc_stripe_show_sofort_notice', 'no');
 					break;
 			}
 		}
@@ -278,11 +278,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);
 	}
 }
 

includes/class-wc-stripe-logger.php

Spacing +16 added lines, -16 removed lines

@@ -1,5 +1,5 @@ 
 <?php
-if ( ! defined( 'ABSPATH' ) ) {
+if ( ! defined('ABSPATH')) {
 	exit; // Exit if accessed directly
 }
 
@@ -20,32 +20,32 @@ 
 	 * @since 4.0.0
 	 * @version 4.0.0
 	 */
-	public static function log( $message, $start_time = null, $end_time = null ) {
-		if ( ! class_exists( 'WC_Logger' ) ) {
+	public static function log($message, $start_time = null, $end_time = null) {
+		if ( ! class_exists('WC_Logger')) {
 			return;
 		}
 
-		if ( apply_filters( 'wc_stripe_logging', true, $message ) ) {
-			if ( empty( self::$logger ) ) {
-				if ( version_compare( WC_VERSION, '3.0.0', '>=' ) ) {
+		if (apply_filters('wc_stripe_logging', true, $message)) {
+			if (empty(self::$logger)) {
+				if (version_compare(WC_VERSION, '3.0.0', '>=')) {
 					self::$logger = wc_get_logger();
 				} else {
 					self::$logger = new WC_Logger();
 				}
 			}
 
-			$settings = get_option( 'woocommerce_stripe_settings' );
+			$settings = get_option('woocommerce_stripe_settings');
 
-			if ( empty( $settings ) || isset( $settings['logging'] ) && 'yes' !== $settings['logging'] ) {
+			if (empty($settings) || isset($settings['logging']) && 'yes' !== $settings['logging']) {
 				return;
 			}
 
-			if ( ! is_null( $start_time ) ) {
+			if ( ! is_null($start_time)) {
 
-				$formatted_start_time = date_i18n( get_option( 'date_format' ) . ' g:ia', $start_time );
-				$end_time             = is_null( $end_time ) ? current_time( 'timestamp' ) : $end_time;
-				$formatted_end_time   = date_i18n( get_option( 'date_format' ) . ' g:ia', $end_time );
-				$elapsed_time         = round( abs( $end_time - $start_time ) / 60, 2 );
+				$formatted_start_time = date_i18n(get_option('date_format') . ' g:ia', $start_time);
+				$end_time             = is_null($end_time) ? current_time('timestamp') : $end_time;
+				$formatted_end_time   = date_i18n(get_option('date_format') . ' g:ia', $end_time);
+				$elapsed_time         = round(abs($end_time - $start_time) / 60, 2);
 
 				$log_entry = "\n" . '====Stripe Version: ' . WC_STRIPE_VERSION . '====' . "\n";
 				$log_entry .= '====Start Log ' . $formatted_start_time . '====' . "\n" . $message . "\n";
@@ -57,10 +57,10 @@ 
 
 			}
 
-			if ( version_compare( WC_VERSION, '3.0.0', '>=' ) ) {
-				self::$logger->debug( $log_entry, array( 'source' => self::WC_LOG_FILENAME ) );
+			if (version_compare(WC_VERSION, '3.0.0', '>=')) {
+				self::$logger->debug($log_entry, array('source' => self::WC_LOG_FILENAME));
 			} else {
-				self::$logger->add( self::WC_LOG_FILENAME, $log_entry );
+				self::$logger->add(self::WC_LOG_FILENAME, $log_entry);
 			}
 		}
 	}

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

Spacing +184 added lines, -184 removed lines

@@ -1,5 +1,5 @@ 
 <?php
-if ( ! defined( 'ABSPATH' ) ) {
+if ( ! defined('ABSPATH')) {
 	exit;
 }
 
@@ -32,9 +32,9 @@ 
 	 */
 	public function __construct() {
 		$this->retry_interval = 2;
-		$stripe_settings      = get_option( 'woocommerce_stripe_settings', array() );
-		$this->testmode       = ( ! empty( $stripe_settings['testmode'] ) && 'yes' === $stripe_settings['testmode'] ) ? true : false;
-		add_action( 'woocommerce_api_wc_stripe', array( $this, 'check_for_webhook' ) );
+		$stripe_settings      = get_option('woocommerce_stripe_settings', array());
+		$this->testmode       = ( ! empty($stripe_settings['testmode']) && 'yes' === $stripe_settings['testmode']) ? true : false;
+		add_action('woocommerce_api_wc_stripe', array($this, 'check_for_webhook'));
 	}
 
 	/**
@@ -44,24 +44,24 @@ 
 	 * @version 4.0.0
 	 */
 	public function check_for_webhook() {
-		if ( ( 'POST' !== $_SERVER['REQUEST_METHOD'] )
-			|| ! isset( $_GET['wc-api'] )
-			|| ( 'wc_stripe' !== $_GET['wc-api'] )
+		if (('POST' !== $_SERVER['REQUEST_METHOD'])
+			|| ! isset($_GET['wc-api'])
+			|| ('wc_stripe' !== $_GET['wc-api'])
 		) {
 			return;
 		}
 
-		$request_body    = file_get_contents( 'php://input' );
-		$request_headers = array_change_key_case( $this->get_request_headers(), CASE_UPPER );
+		$request_body    = file_get_contents('php://input');
+		$request_headers = array_change_key_case($this->get_request_headers(), CASE_UPPER);
 
 		// Validate it to make sure it is legit.
-		if ( $this->is_valid_request( $request_headers, $request_body ) ) {
-			$this->process_webhook( $request_body );
-			status_header( 200 );
+		if ($this->is_valid_request($request_headers, $request_body)) {
+			$this->process_webhook($request_body);
+			status_header(200);
 			exit;
 		} else {
-			WC_Stripe_Logger::log( 'Incoming webhook failed validation: ' . print_r( $request_body, true ) );
-			status_header( 400 );
+			WC_Stripe_Logger::log('Incoming webhook failed validation: ' . print_r($request_body, true));
+			status_header(400);
 			exit;
 		}
 	}
@@ -76,12 +76,12 @@ 
 	 * @param string $request_body The request body from Stripe.
 	 * @return bool
 	 */
-	public function is_valid_request( $request_headers = null, $request_body = null ) {
-		if ( null === $request_headers || null === $request_body ) {
+	public function is_valid_request($request_headers = null, $request_body = null) {
+		if (null === $request_headers || null === $request_body) {
 			return false;
 		}
 
-		if ( ! empty( $request_headers['USER-AGENT'] ) && ! preg_match( '/Stripe/', $request_headers['USER-AGENT'] ) ) {
+		if ( ! empty($request_headers['USER-AGENT']) && ! preg_match('/Stripe/', $request_headers['USER-AGENT'])) {
 			return false;
 		}
 
@@ -97,12 +97,12 @@ 
 	 * @version 4.0.0
 	 */
 	public function get_request_headers() {
-		if ( ! function_exists( 'getallheaders' ) ) {
+		if ( ! function_exists('getallheaders')) {
 			$headers = array();
 
-			foreach ( $_SERVER as $name => $value ) {
-				if ( 'HTTP_' === substr( $name, 0, 5 ) ) {
-					$headers[ str_replace( ' ', '-', ucwords( strtolower( str_replace( '_', ' ', substr( $name, 5 ) ) ) ) ) ] = $value;
+			foreach ($_SERVER as $name => $value) {
+				if ('HTTP_' === substr($name, 0, 5)) {
+					$headers[str_replace(' ', '-', ucwords(strtolower(str_replace('_', ' ', substr($name, 5)))))] = $value;
 				}
 			}
 
@@ -121,30 +121,30 @@ 
 	 * @param object $notification
 	 * @param bool $retry
 	 */
-	public function process_webhook_payment( $notification, $retry = true ) {
+	public function process_webhook_payment($notification, $retry = true) {
 		// The following 3 payment methods are synchronous so does not need to be handle via webhook.
-		if ( 'card' === $notification->data->object->type || 'sepa_debit' === $notification->data->object->type || 'three_d_secure' === $notification->data->object->type ) {
+		if ('card' === $notification->data->object->type || 'sepa_debit' === $notification->data->object->type || 'three_d_secure' === $notification->data->object->type) {
 			return;
 		}
 
-		$order = WC_Stripe_Helper::get_order_by_source_id( $notification->data->object->id );
+		$order = WC_Stripe_Helper::get_order_by_source_id($notification->data->object->id);
 
-		if ( ! $order ) {
-			WC_Stripe_Logger::log( 'Could not find order via source ID: ' . $notification->data->object->id );
+		if ( ! $order) {
+			WC_Stripe_Logger::log('Could not find order via source ID: ' . $notification->data->object->id);
 			return;
 		}
 
 		$order_id  = WC_Stripe_Helper::is_pre_30() ? $order->id : $order->get_id();
 		$source_id = $notification->data->object->id;
 
-		$is_pending_receiver = ( 'receiver' === $notification->data->object->flow );
+		$is_pending_receiver = ('receiver' === $notification->data->object->flow);
 
 		try {
-			if ( 'processing' === $order->get_status() || 'completed' === $order->get_status() ) {
+			if ('processing' === $order->get_status() || 'completed' === $order->get_status()) {
 				return;
 			}
 
-			if ( 'on-hold' === $order->get_status() && ! $is_pending_receiver ) {
+			if ('on-hold' === $order->get_status() && ! $is_pending_receiver) {
 				return;
 			}
 
@@ -152,94 +152,94 @@ 
 			$response = null;
 
 			// This will throw exception if not valid.
-			$this->validate_minimum_order_amount( $order );
+			$this->validate_minimum_order_amount($order);
 
-			WC_Stripe_Logger::log( "Info: (Webhook) Begin processing payment for order $order_id for the amount of {$order->get_total()}" );
+			WC_Stripe_Logger::log("Info: (Webhook) Begin processing payment for order $order_id for the amount of {$order->get_total()}");
 
 			// Prep source object.
 			$source_object           = new stdClass();
 			$source_object->token_id = '';
-			$source_object->customer = $this->get_stripe_customer_id( $order );
+			$source_object->customer = $this->get_stripe_customer_id($order);
 			$source_object->source   = $source_id;
 
 			// Make the request.
-			$response = WC_Stripe_API::request( $this->generate_payment_request( $order, $source_object ), 'charges', 'POST', true );
+			$response = WC_Stripe_API::request($this->generate_payment_request($order, $source_object), 'charges', 'POST', true);
 			$headers  = $response['headers'];
 			$response = $response['body'];
 
-			if ( ! empty( $response->error ) ) {
+			if ( ! empty($response->error)) {
 				// Customer param wrong? The user may have been deleted on stripe's end. Remove customer_id. Can be retried without.
-				if ( $this->is_no_such_customer_error( $response->error ) ) {
-					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 ($this->is_no_such_customer_error($response->error)) {
+					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();
 					}
 				}
 
-				if ( $this->is_no_such_token_error( $response->error ) && $prepared_source->token_id ) {
+				if ($this->is_no_such_token_error($response->error) && $prepared_source->token_id) {
 					// Source param wrong? The CARD may have been deleted on stripe's end. Remove token and show message.
-					$wc_token = WC_Payment_Tokens::get( $prepared_source->token_id );
+					$wc_token = WC_Payment_Tokens::get($prepared_source->token_id);
 					$wc_token->delete();
-					$localized_message = __( 'This card is no longer available and has been removed.', 'woocommerce-gateway-stripe' );
-					$order->add_order_note( $localized_message );
-					throw new WC_Stripe_Exception( print_r( $response, true ), $localized_message );
+					$localized_message = __('This card is no longer available and has been removed.', 'woocommerce-gateway-stripe');
+					$order->add_order_note($localized_message);
+					throw new WC_Stripe_Exception(print_r($response, true), $localized_message);
 				}
 
 				// We want to retry.
-				if ( $this->is_retryable_error( $response->error ) ) {
-					if ( $retry ) {
+				if ($this->is_retryable_error($response->error)) {
+					if ($retry) {
 						// Don't do anymore retries after this.
-						if ( 5 <= $this->retry_interval ) {
+						if (5 <= $this->retry_interval) {
 
-							return $this->process_webhook_payment( $notification, false );
+							return $this->process_webhook_payment($notification, false);
 						}
 
-						sleep( $this->retry_interval );
+						sleep($this->retry_interval);
 
 						$this->retry_interval++;
-						return $this->process_webhook_payment( $notification, true );
+						return $this->process_webhook_payment($notification, true);
 					} else {
-						$localized_message = __( 'Sorry, we are unable to process your payment at this time. Please retry later.', 'woocommerce-gateway-stripe' );
-						$order->add_order_note( $localized_message );
-						throw new WC_Stripe_Exception( print_r( $response, true ), $localized_message );
+						$localized_message = __('Sorry, we are unable to process your payment at this time. Please retry later.', 'woocommerce-gateway-stripe');
+						$order->add_order_note($localized_message);
+						throw new WC_Stripe_Exception(print_r($response, true), $localized_message);
 					}
 				}
 
 				$localized_messages = WC_Stripe_Helper::get_localized_messages();
 
-				if ( 'card_error' === $response->error->type ) {
-					$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);
 			}
 
 			// To prevent double processing the order on WC side.
-			if ( ! $this->is_original_request( $headers ) ) {
+			if ( ! $this->is_original_request($headers)) {
 				return;
 			}
 
-			do_action( 'wc_gateway_stripe_process_webhook_payment', $response, $order );
+			do_action('wc_gateway_stripe_process_webhook_payment', $response, $order);
 
-			$this->process_response( $response, $order );
+			$this->process_response($response, $order);
 
-		} catch ( WC_Stripe_Exception $e ) {
-			WC_Stripe_Logger::log( 'Error: ' . $e->getMessage() );
+		} catch (WC_Stripe_Exception $e) {
+			WC_Stripe_Logger::log('Error: ' . $e->getMessage());
 
-			do_action( 'wc_gateway_stripe_process_webhook_payment_error', $order, $notification, $e );
+			do_action('wc_gateway_stripe_process_webhook_payment_error', $order, $notification, $e);
 
-			$statuses = array( 'pending', 'failed' );
+			$statuses = array('pending', 'failed');
 
-			if ( $order->has_status( $statuses ) ) {
-				$this->send_failed_order_email( $order_id );
+			if ($order->has_status($statuses)) {
+				$this->send_failed_order_email($order_id);
 			}
 		}
 	}
@@ -252,21 +252,21 @@ 
 	 * @since 4.0.0
 	 * @param object $notification
 	 */
-	public function process_webhook_dispute( $notification ) {
-		$order = WC_Stripe_Helper::get_order_by_charge_id( $notification->data->object->charge );
+	public function process_webhook_dispute($notification) {
+		$order = WC_Stripe_Helper::get_order_by_charge_id($notification->data->object->charge);
 
-		if ( ! $order ) {
-			WC_Stripe_Logger::log( 'Could not find order via charge ID: ' . $notification->data->object->charge );
+		if ( ! $order) {
+			WC_Stripe_Logger::log('Could not find order via charge ID: ' . $notification->data->object->charge);
 			return;
 		}
 
 		/* translators: 1) The URL to the order. */
-		$order->update_status( 'on-hold', sprintf( __( 'A dispute was created for this order. Response is needed. Please go to your <a href="%s" title="Stripe Dashboard" target="_blank">Stripe Dashboard</a> to review this dispute.', 'woocommerce-gateway-stripe' ), $this->get_transaction_url( $order ) ) );
+		$order->update_status('on-hold', sprintf(__('A dispute was created for this order. Response is needed. Please go to your <a href="%s" title="Stripe Dashboard" target="_blank">Stripe Dashboard</a> to review this dispute.', 'woocommerce-gateway-stripe'), $this->get_transaction_url($order)));
 
-		do_action( 'wc_gateway_stripe_process_webhook_payment_error', $order, $notification );
+		do_action('wc_gateway_stripe_process_webhook_payment_error', $order, $notification);
 
 		$order_id = WC_Stripe_Helper::is_pre_30() ? $order->id : $order->get_id();
-		$this->send_failed_order_email( $order_id );
+		$this->send_failed_order_email($order_id);
 	}
 
 	/**
@@ -277,44 +277,44 @@ 
 	 * @version 4.0.0
 	 * @param object $notification
 	 */
-	public function process_webhook_capture( $notification ) {
-		$order = WC_Stripe_Helper::get_order_by_charge_id( $notification->data->object->id );
+	public function process_webhook_capture($notification) {
+		$order = WC_Stripe_Helper::get_order_by_charge_id($notification->data->object->id);
 
-		if ( ! $order ) {
-			WC_Stripe_Logger::log( 'Could not find order via charge ID: ' . $notification->data->object->id );
+		if ( ! $order) {
+			WC_Stripe_Logger::log('Could not find order via charge ID: ' . $notification->data->object->id);
 			return;
 		}
 
 		$order_id = WC_Stripe_Helper::is_pre_30() ? $order->id : $order->get_id();
 
-		if ( 'stripe' === ( WC_Stripe_Helper::is_pre_30() ? $order->payment_method : $order->get_payment_method() ) ) {
-			$charge   = WC_Stripe_Helper::is_pre_30() ? get_post_meta( $order_id, '_transaction_id', true ) : $order->get_transaction_id();
-			$captured = WC_Stripe_Helper::is_pre_30() ? get_post_meta( $order_id, '_stripe_charge_captured', true ) : $order->get_meta( '_stripe_charge_captured', true );
+		if ('stripe' === (WC_Stripe_Helper::is_pre_30() ? $order->payment_method : $order->get_payment_method())) {
+			$charge   = WC_Stripe_Helper::is_pre_30() ? get_post_meta($order_id, '_transaction_id', true) : $order->get_transaction_id();
+			$captured = WC_Stripe_Helper::is_pre_30() ? get_post_meta($order_id, '_stripe_charge_captured', true) : $order->get_meta('_stripe_charge_captured', true);
 
-			if ( $charge && 'no' === $captured ) {
-				WC_Stripe_Helper::is_pre_30() ? update_post_meta( $order_id, '_stripe_charge_captured', 'yes' ) : $order->update_meta_data( '_stripe_charge_captured', 'yes' );
+			if ($charge && 'no' === $captured) {
+				WC_Stripe_Helper::is_pre_30() ? update_post_meta($order_id, '_stripe_charge_captured', 'yes') : $order->update_meta_data('_stripe_charge_captured', 'yes');
 
 				// Store other data such as fees
-				WC_Stripe_Helper::is_pre_30() ? update_post_meta( $order_id, '_transaction_id', $notification->data->object->id ) : $order->set_transaction_id( $notification->data->object->id );
+				WC_Stripe_Helper::is_pre_30() ? update_post_meta($order_id, '_transaction_id', $notification->data->object->id) : $order->set_transaction_id($notification->data->object->id);
 
-				if ( isset( $notification->data->object->balance_transaction ) ) {
-					$this->update_fees( $order, $notification->data->object->balance_transaction );
+				if (isset($notification->data->object->balance_transaction)) {
+					$this->update_fees($order, $notification->data->object->balance_transaction);
 				}
 
 				// Check and see if capture is partial.
-				if ( $this->is_partial_capture( $notification ) ) {
-					$partial_amount = $this->get_partial_amount_to_charge( $notification );
-					$order->set_total( $partial_amount );
+				if ($this->is_partial_capture($notification)) {
+					$partial_amount = $this->get_partial_amount_to_charge($notification);
+					$order->set_total($partial_amount);
 					/* translators: partial captured amount */
-					$order->add_order_note( sprintf( __( 'This charge was partially captured via Stripe Dashboard in the amount of: %s', 'woocommerce-gateway-stripe' ), $partial_amount ) );
+					$order->add_order_note(sprintf(__('This charge was partially captured via Stripe Dashboard in the amount of: %s', 'woocommerce-gateway-stripe'), $partial_amount));
 				} else {
-					$order->payment_complete( $notification->data->object->id );
+					$order->payment_complete($notification->data->object->id);
 
 					/* translators: transaction id */
-					$order->add_order_note( sprintf( __( 'Stripe charge complete (Charge ID: %s)', 'woocommerce-gateway-stripe' ), $notification->data->object->id ) );
+					$order->add_order_note(sprintf(__('Stripe charge complete (Charge ID: %s)', 'woocommerce-gateway-stripe'), $notification->data->object->id));
 				}
 
-				if ( is_callable( array( $order, 'save' ) ) ) {
+				if (is_callable(array($order, 'save'))) {
 					$order->save();
 				}
 			}
@@ -329,39 +329,39 @@ 
 	 * @version 4.0.0
 	 * @param object $notification
 	 */
-	public function process_webhook_charge_succeeded( $notification ) {
+	public function process_webhook_charge_succeeded($notification) {
 		// The following payment methods are synchronous so does not need to be handle via webhook.
-		if ( ( isset( $notification->data->object->source->type ) && 'card' === $notification->data->object->source->type ) || ( isset( $notification->data->object->source->type ) && 'three_d_secure' === $notification->data->object->source->type ) ) {
+		if ((isset($notification->data->object->source->type) && 'card' === $notification->data->object->source->type) || (isset($notification->data->object->source->type) && 'three_d_secure' === $notification->data->object->source->type)) {
 			return;
 		}
 
-		$order = WC_Stripe_Helper::get_order_by_charge_id( $notification->data->object->id );
+		$order = WC_Stripe_Helper::get_order_by_charge_id($notification->data->object->id);
 
-		if ( ! $order ) {
-			WC_Stripe_Logger::log( 'Could not find order via charge ID: ' . $notification->data->object->id );
+		if ( ! $order) {
+			WC_Stripe_Logger::log('Could not find order via charge ID: ' . $notification->data->object->id);
 			return;
 		}
 
 		$order_id = WC_Stripe_Helper::is_pre_30() ? $order->id : $order->get_id();
 
-		if ( 'on-hold' !== $order->get_status() ) {
+		if ('on-hold' !== $order->get_status()) {
 			return;
 		}
 
 		// Store other data such as fees
-		WC_Stripe_Helper::is_pre_30() ? update_post_meta( $order_id, '_transaction_id', $notification->data->object->id ) : $order->set_transaction_id( $notification->data->object->id );
+		WC_Stripe_Helper::is_pre_30() ? update_post_meta($order_id, '_transaction_id', $notification->data->object->id) : $order->set_transaction_id($notification->data->object->id);
 
-		if ( isset( $notification->data->object->balance_transaction ) ) {
-			$this->update_fees( $order, $notification->data->object->balance_transaction );
-			$this->update_currency( $order, $notification->data->object->balance_transaction );
+		if (isset($notification->data->object->balance_transaction)) {
+			$this->update_fees($order, $notification->data->object->balance_transaction);
+			$this->update_currency($order, $notification->data->object->balance_transaction);
 		}
 
-		$order->payment_complete( $notification->data->object->id );
+		$order->payment_complete($notification->data->object->id);
 
 		/* translators: transaction id */
-		$order->add_order_note( sprintf( __( 'Stripe charge complete (Charge ID: %s)', 'woocommerce-gateway-stripe' ), $notification->data->object->id ) );
+		$order->add_order_note(sprintf(__('Stripe charge complete (Charge ID: %s)', 'woocommerce-gateway-stripe'), $notification->data->object->id));
 
-		if ( is_callable( array( $order, 'save' ) ) ) {
+		if (is_callable(array($order, 'save'))) {
 			$order->save();
 		}
 	}
@@ -373,24 +373,24 @@ 
 	 * @since 4.1.5 Can handle any fail payments from any methods.
 	 * @param object $notification
 	 */
-	public function process_webhook_charge_failed( $notification ) {
-		$order = WC_Stripe_Helper::get_order_by_charge_id( $notification->data->object->id );
+	public function process_webhook_charge_failed($notification) {
+		$order = WC_Stripe_Helper::get_order_by_charge_id($notification->data->object->id);
 
-		if ( ! $order ) {
-			WC_Stripe_Logger::log( 'Could not find order via charge ID: ' . $notification->data->object->id );
+		if ( ! $order) {
+			WC_Stripe_Logger::log('Could not find order via charge ID: ' . $notification->data->object->id);
 			return;
 		}
 
 		$order_id = WC_Stripe_Helper::is_pre_30() ? $order->id : $order->get_id();
 
 		// If order status is already in failed status don't continue.
-		if ( 'failed' === $order->get_status() ) {
+		if ('failed' === $order->get_status()) {
 			return;
 		}
 
-		$order->update_status( 'failed', __( 'This payment failed to clear.', 'woocommerce-gateway-stripe' ) );
+		$order->update_status('failed', __('This payment failed to clear.', 'woocommerce-gateway-stripe'));
 
-		do_action( 'wc_gateway_stripe_process_webhook_payment_error', $order, $notification );
+		do_action('wc_gateway_stripe_process_webhook_payment_error', $order, $notification);
 	}
 
 	/**
@@ -401,23 +401,23 @@ 
 	 * @version 4.0.0
 	 * @param object $notification
 	 */
-	public function process_webhook_source_canceled( $notification ) {
-		$order = WC_Stripe_Helper::get_order_by_charge_id( $notification->data->object->id );
+	public function process_webhook_source_canceled($notification) {
+		$order = WC_Stripe_Helper::get_order_by_charge_id($notification->data->object->id);
 
-		if ( ! $order ) {
-			WC_Stripe_Logger::log( 'Could not find order via charge ID: ' . $notification->data->object->id );
+		if ( ! $order) {
+			WC_Stripe_Logger::log('Could not find order via charge ID: ' . $notification->data->object->id);
 			return;
 		}
 
 		$order_id = WC_Stripe_Helper::is_pre_30() ? $order->id : $order->get_id();
 
-		if ( 'on-hold' !== $order->get_status() || 'cancelled' !== $order->get_status() ) {
+		if ('on-hold' !== $order->get_status() || 'cancelled' !== $order->get_status()) {
 			return;
 		}
 
-		$order->update_status( 'cancelled', __( 'This payment has cancelled.', 'woocommerce-gateway-stripe' ) );
+		$order->update_status('cancelled', __('This payment has cancelled.', 'woocommerce-gateway-stripe'));
 
-		do_action( 'wc_gateway_stripe_process_webhook_payment_error', $order, $notification );
+		do_action('wc_gateway_stripe_process_webhook_payment_error', $order, $notification);
 	}
 
 	/**
@@ -427,57 +427,57 @@ 
 	 * @version 4.0.0
 	 * @param object $notification
 	 */
-	public function process_webhook_refund( $notification ) {
-		$order = WC_Stripe_Helper::get_order_by_charge_id( $notification->data->object->id );
+	public function process_webhook_refund($notification) {
+		$order = WC_Stripe_Helper::get_order_by_charge_id($notification->data->object->id);
 
-		if ( ! $order ) {
-			WC_Stripe_Logger::log( 'Could not find order via charge ID: ' . $notification->data->object->id );
+		if ( ! $order) {
+			WC_Stripe_Logger::log('Could not find order via charge ID: ' . $notification->data->object->id);
 			return;
 		}
 
 		$order_id = WC_Stripe_Helper::is_pre_30() ? $order->id : $order->get_id();
 
-		if ( 'stripe' === ( WC_Stripe_Helper::is_pre_30() ? $order->payment_method : $order->get_payment_method() ) ) {
-			$charge    = WC_Stripe_Helper::is_pre_30() ? get_post_meta( $order_id, '_transaction_id', true ) : $order->get_transaction_id();
-			$captured  = WC_Stripe_Helper::is_pre_30() ? get_post_meta( $order_id, '_stripe_charge_captured', true ) : $order->get_meta( '_stripe_charge_captured', true );
-			$refund_id = WC_Stripe_Helper::is_pre_30() ? get_post_meta( $order_id, '_stripe_refund_id', true ) : $order->get_meta( '_stripe_refund_id', true );
+		if ('stripe' === (WC_Stripe_Helper::is_pre_30() ? $order->payment_method : $order->get_payment_method())) {
+			$charge    = WC_Stripe_Helper::is_pre_30() ? get_post_meta($order_id, '_transaction_id', true) : $order->get_transaction_id();
+			$captured  = WC_Stripe_Helper::is_pre_30() ? get_post_meta($order_id, '_stripe_charge_captured', true) : $order->get_meta('_stripe_charge_captured', true);
+			$refund_id = WC_Stripe_Helper::is_pre_30() ? get_post_meta($order_id, '_stripe_refund_id', true) : $order->get_meta('_stripe_refund_id', true);
 
 			// If the refund ID matches, don't continue to prevent double refunding.
-			if ( $notification->data->object->refunds->data[0]->id === $refund_id ) {
+			if ($notification->data->object->refunds->data[0]->id === $refund_id) {
 				return;
 			}
 
 			// Only refund captured charge.
-			if ( $charge ) {
-				$reason = ( isset( $captured ) && 'yes' === $captured ) ? __( 'Refunded via Stripe Dashboard', 'woocommerce-gateway-stripe' ) : __( 'Pre-Authorization Released via Stripe Dashboard', 'woocommerce-gateway-stripe' );
+			if ($charge) {
+				$reason = (isset($captured) && 'yes' === $captured) ? __('Refunded via Stripe Dashboard', 'woocommerce-gateway-stripe') : __('Pre-Authorization Released via Stripe Dashboard', 'woocommerce-gateway-stripe');
 
 				// Create the refund.
-				$refund = wc_create_refund( array(
+				$refund = wc_create_refund(array(
 					'order_id' => $order_id,
-					'amount'   => $this->get_refund_amount( $notification ),
+					'amount'   => $this->get_refund_amount($notification),
 					'reason'   => $reason,
-				) );
+				));
 
-				if ( is_wp_error( $refund ) ) {
-					WC_Stripe_Logger::log( $refund->get_error_message() );
+				if (is_wp_error($refund)) {
+					WC_Stripe_Logger::log($refund->get_error_message());
 				}
 
-				WC_Stripe_Helper::is_pre_30() ? update_post_meta( $order_id, '_stripe_refund_id', $notification->data->object->refunds->data[0]->id ) : $order->update_meta_data( '_stripe_refund_id', $notification->data->object->refunds->data[0]->id );
+				WC_Stripe_Helper::is_pre_30() ? update_post_meta($order_id, '_stripe_refund_id', $notification->data->object->refunds->data[0]->id) : $order->update_meta_data('_stripe_refund_id', $notification->data->object->refunds->data[0]->id);
 
-				$amount = wc_price( $notification->data->object->refunds->data[0]->amount / 100 );
+				$amount = wc_price($notification->data->object->refunds->data[0]->amount / 100);
 
-				if ( in_array( strtolower( WC_Stripe_Helper::is_pre_30() ? $order->get_order_currency() : $order->get_currency() ), WC_Stripe_Helper::no_decimal_currencies() ) ) {
-					$amount = wc_price( $notification->data->object->refunds->data[0]->amount );
+				if (in_array(strtolower(WC_Stripe_Helper::is_pre_30() ? $order->get_order_currency() : $order->get_currency()), WC_Stripe_Helper::no_decimal_currencies())) {
+					$amount = wc_price($notification->data->object->refunds->data[0]->amount);
 				}
 
-				if ( isset( $notification->data->object->refunds->data[0]->balance_transaction ) ) {
-					$this->update_fees( $order, $notification->data->object->refunds->data[0]->balance_transaction );
+				if (isset($notification->data->object->refunds->data[0]->balance_transaction)) {
+					$this->update_fees($order, $notification->data->object->refunds->data[0]->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 - %3$s', 'woocommerce-gateway-stripe' ), $amount, $notification->data->object->refunds->data[0]->id, $reason ) : __( 'Pre-Authorization Released via Stripe Dashboard', 'woocommerce-gateway-stripe' );
+				$refund_message = (isset($captured) && 'yes' === $captured) ? sprintf(__('Refunded %1$s - Refund ID: %2$s - %3$s', 'woocommerce-gateway-stripe'), $amount, $notification->data->object->refunds->data[0]->id, $reason) : __('Pre-Authorization Released via Stripe Dashboard', 'woocommerce-gateway-stripe');
 
-				$order->add_order_note( $refund_message );
+				$order->add_order_note($refund_message);
 			}
 		}
 	}
@@ -488,21 +488,21 @@ 
 	 * @since 4.0.6
 	 * @param object $notification
 	 */
-	public function process_review_opened( $notification ) {
-		$order = WC_Stripe_Helper::get_order_by_charge_id( $notification->data->object->charge );
+	public function process_review_opened($notification) {
+		$order = WC_Stripe_Helper::get_order_by_charge_id($notification->data->object->charge);
 
-		if ( ! $order ) {
-			WC_Stripe_Logger::log( 'Could not find order via charge ID: ' . $notification->data->object->charge );
+		if ( ! $order) {
+			WC_Stripe_Logger::log('Could not find order via charge ID: ' . $notification->data->object->charge);
 			return;
 		}
 
 		/* translators: 1) The URL to the order. 2) The reason type. */
-		$message = sprintf( __( 'A review has been opened for this order. Action is needed. Please go to your <a href="%1$s" title="Stripe Dashboard" target="_blank">Stripe Dashboard</a> to review the issue. Reason: (%2$s)', 'woocommerce-gateway-stripe' ), $this->get_transaction_url( $order ), $notification->data->object->reason );
+		$message = sprintf(__('A review has been opened for this order. Action is needed. Please go to your <a href="%1$s" title="Stripe Dashboard" target="_blank">Stripe Dashboard</a> to review the issue. Reason: (%2$s)', 'woocommerce-gateway-stripe'), $this->get_transaction_url($order), $notification->data->object->reason);
 
-		if ( apply_filters( 'wc_stripe_webhook_review_change_order_status', true, $order, $notification ) ) {
-			$order->update_status( 'on-hold', $message );
+		if (apply_filters('wc_stripe_webhook_review_change_order_status', true, $order, $notification)) {
+			$order->update_status('on-hold', $message);
 		} else {
-			$order->add_order_note( $message );
+			$order->add_order_note($message);
 		}
 	}
 
@@ -512,25 +512,25 @@ 
 	 * @since 4.0.6
 	 * @param object $notification
 	 */
-	public function process_review_closed( $notification ) {
-		$order = WC_Stripe_Helper::get_order_by_charge_id( $notification->data->object->charge );
+	public function process_review_closed($notification) {
+		$order = WC_Stripe_Helper::get_order_by_charge_id($notification->data->object->charge);
 
-		if ( ! $order ) {
-			WC_Stripe_Logger::log( 'Could not find order via charge ID: ' . $notification->data->object->charge );
+		if ( ! $order) {
+			WC_Stripe_Logger::log('Could not find order via charge ID: ' . $notification->data->object->charge);
 			return;
 		}
 
 		/* translators: 1) The reason type. */
-		$message = sprintf( __( 'The opened review for this order is now closed. Reason: (%s)', 'woocommerce-gateway-stripe' ), $notification->data->object->reason );
+		$message = sprintf(__('The opened review for this order is now closed. Reason: (%s)', 'woocommerce-gateway-stripe'), $notification->data->object->reason);
 
-		if ( 'on-hold' === $order->get_status() ) {
-			if ( apply_filters( 'wc_stripe_webhook_review_change_order_status', true, $order, $notification ) ) {
-				$order->update_status( 'processing', $message );
+		if ('on-hold' === $order->get_status()) {
+			if (apply_filters('wc_stripe_webhook_review_change_order_status', true, $order, $notification)) {
+				$order->update_status('processing', $message);
 			} else {
-				$order->add_order_note( $message );
+				$order->add_order_note($message);
 			}
 		} else {
-			$order->add_order_note( $message );
+			$order->add_order_note($message);
 		}
 	}
 
@@ -541,7 +541,7 @@ 
 	 * @version 4.0.0
 	 * @param object $notification
 	 */
-	public function is_partial_capture( $notification ) {
+	public function is_partial_capture($notification) {
 		return 0 < $notification->data->object->amount_refunded;
 	}
 
@@ -552,11 +552,11 @@ 
 	 * @version 4.0.0
 	 * @param object $notification
 	 */
-	public function get_refund_amount( $notification ) {
-		if ( $this->is_partial_capture( $notification ) ) {
+	public function get_refund_amount($notification) {
+		if ($this->is_partial_capture($notification)) {
 			$amount = $notification->data->object->refunds->data[0]->amount / 100;
 
-			if ( in_array( strtolower( $notification->data->object->currency ), WC_Stripe_Helper::no_decimal_currencies() ) ) {
+			if (in_array(strtolower($notification->data->object->currency), WC_Stripe_Helper::no_decimal_currencies())) {
 				$amount = $notification->data->object->refunds->data[0]->amount;
 			}
 
@@ -573,12 +573,12 @@ 
 	 * @version 4.0.0
 	 * @param object $notification
 	 */
-	public function get_partial_amount_to_charge( $notification ) {
-		if ( $this->is_partial_capture( $notification ) ) {
-			$amount = ( $notification->data->object->amount - $notification->data->object->amount_refunded ) / 100;
+	public function get_partial_amount_to_charge($notification) {
+		if ($this->is_partial_capture($notification)) {
+			$amount = ($notification->data->object->amount - $notification->data->object->amount_refunded) / 100;
 
-			if ( in_array( strtolower( $notification->data->object->currency ), WC_Stripe_Helper::no_decimal_currencies() ) ) {
-				$amount = ( $notification->data->object->amount - $notification->data->object->amount_refunded );
+			if (in_array(strtolower($notification->data->object->currency), WC_Stripe_Helper::no_decimal_currencies())) {
+				$amount = ($notification->data->object->amount - $notification->data->object->amount_refunded);
 			}
 
 			return $amount;
@@ -594,44 +594,44 @@ 
 	 * @version 4.0.0
 	 * @param string $request_body
 	 */
-	public function process_webhook( $request_body ) {
-		$notification = json_decode( $request_body );
+	public function process_webhook($request_body) {
+		$notification = json_decode($request_body);
 
-		switch ( $notification->type ) {
+		switch ($notification->type) {
 			case 'source.chargeable':
-				$this->process_webhook_payment( $notification );
+				$this->process_webhook_payment($notification);
 				break;
 
 			case 'source.canceled':
-				$this->process_webhook_source_canceled( $notification );
+				$this->process_webhook_source_canceled($notification);
 				break;
 
 			case 'charge.succeeded':
-				$this->process_webhook_charge_succeeded( $notification );
+				$this->process_webhook_charge_succeeded($notification);
 				break;
 
 			case 'charge.failed':
-				$this->process_webhook_charge_failed( $notification );
+				$this->process_webhook_charge_failed($notification);
 				break;
 
 			case 'charge.captured':
-				$this->process_webhook_capture( $notification );
+				$this->process_webhook_capture($notification);
 				break;
 
 			case 'charge.dispute.created':
-				$this->process_webhook_dispute( $notification );
+				$this->process_webhook_dispute($notification);
 				break;
 
 			case 'charge.refunded':
-				$this->process_webhook_refund( $notification );
+				$this->process_webhook_refund($notification);
 				break;
 
 			case 'review.opened':
-				$this->process_review_opened( $notification );
+				$this->process_review_opened($notification);
 				break;
 
 			case 'review.closed':
-				$this->process_review_closed( $notification );
+				$this->process_review_closed($notification);
 				break;
 
 		}

includes/class-wc-stripe-sepa-payment-token.php

Spacing +9 added lines, -9 removed lines

@@ -1,6 +1,6 @@ 
 <?php
 
-if ( ! defined( 'ABSPATH' ) ) {
+if ( ! defined('ABSPATH')) {
 	exit; // Exit if accessed directly
 }
 
@@ -35,10 +35,10 @@ 
 	 * @param  string $deprecated Deprecated since WooCommerce 3.0
 	 * @return string
 	 */
-	public function get_display_name( $deprecated = '' ) {
+	public function get_display_name($deprecated = '') {
 		$display = sprintf(
 			/* translators: last 4 digits of IBAN account */
-			__( 'SEPA IBAN ending in %s', 'woocommerce-gateway-stripe' ),
+			__('SEPA IBAN ending in %s', 'woocommerce-gateway-stripe'),
 			$this->get_last4()
 		);
 
@@ -66,11 +66,11 @@ 
 	 * @return boolean True if the passed data is valid
 	 */
 	public function validate() {
-		if ( false === parent::validate() ) {
+		if (false === parent::validate()) {
 			return false;
 		}
 
-		if ( ! $this->get_last4( 'edit' ) ) {
+		if ( ! $this->get_last4('edit')) {
 			return false;
 		}
 
@@ -85,8 +85,8 @@ 
 	 * @param  string $context
 	 * @return string Last 4 digits
 	 */
-	public function get_last4( $context = 'view' ) {
-		return WC_Stripe_Helper::is_pre_30() ? $this->get_meta( 'last4' ) : $this->get_prop( 'last4', $context );
+	public function get_last4($context = 'view') {
+		return WC_Stripe_Helper::is_pre_30() ? $this->get_meta('last4') : $this->get_prop('last4', $context);
 	}
 
 	/**
@@ -95,7 +95,7 @@ 
 	 * @version 4.0.0
 	 * @param string $last4
 	 */
-	public function set_last4( $last4 ) {
-		WC_Stripe_Helper::is_pre_30() ? $this->add_meta_data( 'last4', $last4, true ) : $this->set_prop( 'last4', $last4 );
+	public function set_last4($last4) {
+		WC_Stripe_Helper::is_pre_30() ? $this->add_meta_data('last4', $last4, true) : $this->set_prop('last4', $last4);
 	}
 }

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

Spacing +47 added lines, -47 removed lines

@@ -5,7 +5,7 @@ 
  * @since 4.0.6
  */
 
-if ( ! defined( 'ABSPATH' ) ) {
+if ( ! defined('ABSPATH')) {
 	exit;
 }
 
@@ -60,21 +60,21 @@ 
 	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');
 
-		if ( empty( $this->stripe_settings ) ) {
+		if (empty($this->stripe_settings)) {
 			return;
 		}
 
 		$this->init_apple_pay();
 
-		add_action( 'admin_notices', array( $this, 'admin_notices' ) );
+		add_action('admin_notices', array($this, 'admin_notices'));
 	}
 
 	/**
@@ -85,13 +85,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;
@@ -106,9 +106,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();
@@ -122,9 +122,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';
@@ -138,23 +138,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));
 		}
 	}
 
@@ -166,45 +166,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());
 		}
 	}
 
@@ -214,15 +214,15 @@ 
 	 * @since 4.0.6
 	 */
 	public function admin_notices() {
-		if ( ! $this->stripe_enabled ) {
+		if ( ! $this->stripe_enabled) {
 			return;
 		}
 		
-		if ( ! current_user_can( 'manage_woocommerce' ) ) {
+		if ( ! current_user_can('manage_woocommerce')) {
 			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(),
@@ -230,7 +230,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>';
 		}
 
 		/**
@@ -238,9 +238,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-stripe-order-handler.php

Spacing +92 added lines, -92 removed lines

@@ -1,5 +1,5 @@ 
 <?php
-if ( ! defined( 'ABSPATH' ) ) {
+if ( ! defined('ABSPATH')) {
 	exit;
 }
 
@@ -23,11 +23,11 @@ 
 
 		$this->retry_interval = 1;
 
-		add_action( 'wp', array( $this, 'maybe_process_redirect_order' ) );
-		add_action( 'woocommerce_order_status_on-hold_to_processing', array( $this, 'capture_payment' ) );
-		add_action( 'woocommerce_order_status_on-hold_to_completed', array( $this, 'capture_payment' ) );
-		add_action( 'woocommerce_order_status_on-hold_to_cancelled', array( $this, 'cancel_payment' ) );
-		add_action( 'woocommerce_order_status_on-hold_to_refunded', array( $this, 'cancel_payment' ) );
+		add_action('wp', array($this, 'maybe_process_redirect_order'));
+		add_action('woocommerce_order_status_on-hold_to_processing', array($this, 'capture_payment'));
+		add_action('woocommerce_order_status_on-hold_to_completed', array($this, 'capture_payment'));
+		add_action('woocommerce_order_status_on-hold_to_cancelled', array($this, 'cancel_payment'));
+		add_action('woocommerce_order_status_on-hold_to_refunded', array($this, 'cancel_payment'));
 	}
 
 	/**
@@ -51,25 +51,25 @@ 
 	 * @param bool $retry
 	 * @param mix $previous_error Any error message from previous request.
 	 */
-	public function process_redirect_payment( $order_id, $retry = true, $previous_error = false ) {
+	public function process_redirect_payment($order_id, $retry = true, $previous_error = false) {
 		try {
-			$source = wc_clean( $_GET['source'] );
+			$source = wc_clean($_GET['source']);
 
-			if ( empty( $source ) ) {
+			if (empty($source)) {
 				return;
 			}
 
-			if ( empty( $order_id ) ) {
+			if (empty($order_id)) {
 				return;
 			}
 
-			$order = wc_get_order( $order_id );
+			$order = wc_get_order($order_id);
 
-			if ( ! is_object( $order ) ) {
+			if ( ! is_object($order)) {
 				return;
 			}
 
-			if ( 'processing' === $order->get_status() || 'completed' === $order->get_status() || 'on-hold' === $order->get_status() ) {
+			if ('processing' === $order->get_status() || 'completed' === $order->get_status() || 'on-hold' === $order->get_status()) {
 				return;
 			}
 
@@ -77,124 +77,124 @@ 
 			$response = null;
 
 			// This will throw exception if not valid.
-			$this->validate_minimum_order_amount( $order );
+			$this->validate_minimum_order_amount($order);
 
-			WC_Stripe_Logger::log( "Info: (Redirect) Begin processing payment for order $order_id for the amount of {$order->get_total()}" );
+			WC_Stripe_Logger::log("Info: (Redirect) Begin processing payment for order $order_id for the amount of {$order->get_total()}");
 
 			/**
 			 * First check if the source is chargeable at this time. If not,
 			 * webhook will take care of it later.
 			 */
-			$source_info = WC_Stripe_API::retrieve( 'sources/' . $source );
+			$source_info = WC_Stripe_API::retrieve('sources/' . $source);
 
-			if ( ! empty( $source_info->error ) ) {
-				throw new WC_Stripe_Exception( print_r( $source_info, true ), $source_info->error->message );
+			if ( ! empty($source_info->error)) {
+				throw new WC_Stripe_Exception(print_r($source_info, true), $source_info->error->message);
 			}
 
-			if ( 'failed' === $source_info->status || 'canceled' === $source_info->status ) {
-				throw new WC_Stripe_Exception( print_r( $source_info, true ), __( 'Unable to process this payment, please try again or use alternative method.', 'woocommerce-gateway-stripe' ) );
+			if ('failed' === $source_info->status || 'canceled' === $source_info->status) {
+				throw new WC_Stripe_Exception(print_r($source_info, true), __('Unable to process this payment, please try again or use alternative method.', 'woocommerce-gateway-stripe'));
 			}
 
 			// If already consumed, then ignore request.
-			if ( 'consumed' === $source_info->status ) {
+			if ('consumed' === $source_info->status) {
 				return;
 			}
 
 			// If not chargeable, then ignore request.
-			if ( 'chargeable' !== $source_info->status ) {
+			if ('chargeable' !== $source_info->status) {
 				return;
 			}
 
 			// Prep source object.
 			$source_object           = new stdClass();
 			$source_object->token_id = '';
-			$source_object->customer = $this->get_stripe_customer_id( $order );
+			$source_object->customer = $this->get_stripe_customer_id($order);
 			$source_object->source   = $source_info->id;
 			$source_object->status   = 'chargeable';
 
 			/* If we're doing a retry and source is chargeable, we need to pass
 			 * a different idempotency key and retry for success.
 			 */
-			if ( $this->need_update_idempotency_key( $source_object, $previous_error ) ) {
-				add_filter( 'wc_stripe_idempotency_key', array( $this, 'change_idempotency_key' ), 10, 2 );
+			if ($this->need_update_idempotency_key($source_object, $previous_error)) {
+				add_filter('wc_stripe_idempotency_key', array($this, 'change_idempotency_key'), 10, 2);
 			}
 
 			// Make the request.
-			$response = WC_Stripe_API::request( $this->generate_payment_request( $order, $source_object ), 'charges', 'POST', true );
+			$response = WC_Stripe_API::request($this->generate_payment_request($order, $source_object), 'charges', 'POST', true);
 			$headers  = $response['headers'];
 			$response = $response['body'];
 
-			if ( ! empty( $response->error ) ) {
+			if ( ! empty($response->error)) {
 				// Customer param wrong? The user may have been deleted on stripe's end. Remove customer_id. Can be retried without.
-				if ( $this->is_no_such_customer_error( $response->error ) ) {
-					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 ($this->is_no_such_customer_error($response->error)) {
+					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();
 					}
 				}
 
-				if ( $this->is_no_such_token_error( $response->error ) && $prepared_source->token_id ) {
+				if ($this->is_no_such_token_error($response->error) && $prepared_source->token_id) {
 					// Source param wrong? The CARD may have been deleted on stripe's end. Remove token and show message.
-					$wc_token = WC_Payment_Tokens::get( $prepared_source->token_id );
+					$wc_token = WC_Payment_Tokens::get($prepared_source->token_id);
 					$wc_token->delete();
-					$localized_message = __( 'This card is no longer available and has been removed.', 'woocommerce-gateway-stripe' );
-					$order->add_order_note( $localized_message );
-					throw new WC_Stripe_Exception( print_r( $response, true ), $localized_message );
+					$localized_message = __('This card is no longer available and has been removed.', 'woocommerce-gateway-stripe');
+					$order->add_order_note($localized_message);
+					throw new WC_Stripe_Exception(print_r($response, true), $localized_message);
 				}
 
 				// We want to retry.
-				if ( $this->is_retryable_error( $response->error ) ) {
-					if ( $retry ) {
+				if ($this->is_retryable_error($response->error)) {
+					if ($retry) {
 						// Don't do anymore retries after this.
-						if ( 5 <= $this->retry_interval ) {
-							return $this->process_redirect_payment( $order_id, false, $response->error );
+						if (5 <= $this->retry_interval) {
+							return $this->process_redirect_payment($order_id, false, $response->error);
 						}
 
-						sleep( $this->retry_interval );
+						sleep($this->retry_interval);
 
 						$this->retry_interval++;
-						return $this->process_redirect_payment( $order_id, true, $response->error );
+						return $this->process_redirect_payment($order_id, true, $response->error);
 					} else {
-						$localized_message = __( 'Sorry, we are unable to process your payment at this time. Please retry later.', 'woocommerce-gateway-stripe' );
-						$order->add_order_note( $localized_message );
-						throw new WC_Stripe_Exception( print_r( $response, true ), $localized_message );
+						$localized_message = __('Sorry, we are unable to process your payment at this time. Please retry later.', 'woocommerce-gateway-stripe');
+						$order->add_order_note($localized_message);
+						throw new WC_Stripe_Exception(print_r($response, true), $localized_message);
 					}
 				}
 
 				$localized_messages = WC_Stripe_Helper::get_localized_messages();
 
-				if ( 'card_error' === $response->error->type ) {
-					$message = isset( $localized_messages[ $response->error->code ] ) ? $localized_messages[ $response->error->code ] : $response->error->message;
+				if ('card_error' === $response->error->type) {
+					$message = isset($localized_messages[$response->error->code]) ? $localized_messages[$response->error->code] : $response->error->message;
 				} else {
-					$message = isset( $localized_messages[ $response->error->type ] ) ? $localized_messages[ $response->error->type ] : $response->error->message;
+					$message = isset($localized_messages[$response->error->type]) ? $localized_messages[$response->error->type] : $response->error->message;
 				}
 
-				throw new WC_Stripe_Exception( print_r( $response, true ), $message );
+				throw new WC_Stripe_Exception(print_r($response, true), $message);
 			}
 
 			// To prevent double processing the order on WC side.
-			if ( ! $this->is_original_request( $headers ) ) {
+			if ( ! $this->is_original_request($headers)) {
 				return;
 			}
 
-			do_action( 'wc_gateway_stripe_process_redirect_payment', $response, $order );
+			do_action('wc_gateway_stripe_process_redirect_payment', $response, $order);
 
-			$this->process_response( $response, $order );
+			$this->process_response($response, $order);
 
-		} catch ( WC_Stripe_Exception $e ) {
-			WC_Stripe_Logger::log( 'Error: ' . $e->getMessage() );
+		} catch (WC_Stripe_Exception $e) {
+			WC_Stripe_Logger::log('Error: ' . $e->getMessage());
 
-			do_action( 'wc_gateway_stripe_process_redirect_payment_error', $e, $order );
+			do_action('wc_gateway_stripe_process_redirect_payment_error', $e, $order);
 
 			/* translators: error message */
-			$order->update_status( 'failed', sprintf( __( 'Stripe payment failed: %s', 'woocommerce-gateway-stripe' ), $e->getLocalizedMessage() ) );
+			$order->update_status('failed', sprintf(__('Stripe payment failed: %s', 'woocommerce-gateway-stripe'), $e->getLocalizedMessage()));
 
-			wc_add_notice( $e->getLocalizedMessage(), 'error' );
-			wp_safe_redirect( wc_get_checkout_url() );
+			wc_add_notice($e->getLocalizedMessage(), 'error');
+			wp_safe_redirect(wc_get_checkout_url());
 			exit;
 		}
 	}
@@ -206,13 +206,13 @@ 
 	 * @version 4.0.0
 	 */
 	public function maybe_process_redirect_order() {
-		if ( ! is_order_received_page() || empty( $_GET['client_secret'] ) || empty( $_GET['source'] ) ) {
+		if ( ! is_order_received_page() || empty($_GET['client_secret']) || empty($_GET['source'])) {
 			return;
 		}
 
-		$order_id = wc_clean( $_GET['order_id'] );
+		$order_id = wc_clean($_GET['order_id']);
 
-		$this->process_redirect_payment( $order_id );
+		$this->process_redirect_payment($order_id);
 	}
 
 	/**
@@ -222,56 +222,56 @@ 
 	 * @version 4.0.0
 	 * @param  int $order_id
 	 */
-	public function capture_payment( $order_id ) {
-		$order = wc_get_order( $order_id );
+	public function capture_payment($order_id) {
+		$order = wc_get_order($order_id);
 
-		if ( 'stripe' === ( WC_Stripe_Helper::is_pre_30() ? $order->payment_method : $order->get_payment_method() ) ) {
-			$charge   = WC_Stripe_Helper::is_pre_30() ? get_post_meta( $order_id, '_transaction_id', true ) : $order->get_transaction_id();
-			$captured = WC_Stripe_Helper::is_pre_30() ? get_post_meta( $order_id, '_stripe_charge_captured', true ) : $order->get_meta( '_stripe_charge_captured', true );
+		if ('stripe' === (WC_Stripe_Helper::is_pre_30() ? $order->payment_method : $order->get_payment_method())) {
+			$charge   = WC_Stripe_Helper::is_pre_30() ? get_post_meta($order_id, '_transaction_id', true) : $order->get_transaction_id();
+			$captured = WC_Stripe_Helper::is_pre_30() ? get_post_meta($order_id, '_stripe_charge_captured', true) : $order->get_meta('_stripe_charge_captured', true);
 
-			if ( $charge && 'no' === $captured ) {
+			if ($charge && 'no' === $captured) {
 				$order_total = $order->get_total();
 
-				if ( 0 < $order->get_total_refunded() ) {
+				if (0 < $order->get_total_refunded()) {
 					$order_total = $order_total - $order->get_total_refunded();
 				}
 
-				$result = WC_Stripe_API::request( array(
-					'amount'   => WC_Stripe_Helper::get_stripe_amount( $order_total ),
+				$result = WC_Stripe_API::request(array(
+					'amount'   => WC_Stripe_Helper::get_stripe_amount($order_total),
 					'expand[]' => 'balance_transaction',
-				), 'charges/' . $charge . '/capture' );
+				), 'charges/' . $charge . '/capture');
 
-				if ( ! empty( $result->error ) ) {
+				if ( ! empty($result->error)) {
 					/* translators: error message */
-					$order->update_status( 'failed', sprintf( __( 'Unable to capture charge! %s', 'woocommerce-gateway-stripe' ), $result->error->message ) );
+					$order->update_status('failed', sprintf(__('Unable to capture charge! %s', 'woocommerce-gateway-stripe'), $result->error->message));
 				} else {
 					/* translators: transaction id */
-					$order->add_order_note( sprintf( __( 'Stripe charge complete (Charge ID: %s)', 'woocommerce-gateway-stripe' ), $result->id ) );
-					WC_Stripe_Helper::is_pre_30() ? update_post_meta( $order_id, '_stripe_charge_captured', 'yes' ) : $order->update_meta_data( '_stripe_charge_captured', 'yes' );
+					$order->add_order_note(sprintf(__('Stripe charge complete (Charge ID: %s)', 'woocommerce-gateway-stripe'), $result->id));
+					WC_Stripe_Helper::is_pre_30() ? update_post_meta($order_id, '_stripe_charge_captured', 'yes') : $order->update_meta_data('_stripe_charge_captured', 'yes');
 
 					// Store other data such as fees
-					WC_Stripe_Helper::is_pre_30() ? update_post_meta( $order_id, '_transaction_id', $result->id ) : $order->set_transaction_id( $result->id );
+					WC_Stripe_Helper::is_pre_30() ? update_post_meta($order_id, '_transaction_id', $result->id) : $order->set_transaction_id($result->id);
 
-					if ( isset( $result->balance_transaction ) && isset( $result->balance_transaction->fee ) ) {
+					if (isset($result->balance_transaction) && isset($result->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( $result->balance_transaction->fee ) ? WC_Stripe_Helper::format_balance_fee( $result->balance_transaction, 'fee' ) : 0;
-						$net = ! empty( $result->balance_transaction->net ) ? WC_Stripe_Helper::format_balance_fee( $result->balance_transaction, 'net' ) : 0;
-						WC_Stripe_Helper::update_stripe_fee( $order, $fee );
-						WC_Stripe_Helper::update_stripe_net( $order, $net );
+						$fee = ! empty($result->balance_transaction->fee) ? WC_Stripe_Helper::format_balance_fee($result->balance_transaction, 'fee') : 0;
+						$net = ! empty($result->balance_transaction->net) ? WC_Stripe_Helper::format_balance_fee($result->balance_transaction, 'net') : 0;
+						WC_Stripe_Helper::update_stripe_fee($order, $fee);
+						WC_Stripe_Helper::update_stripe_net($order, $net);
 
 						// Store currency stripe.
-						$currency = ! empty( $result->balance_transaction->currency ) ? strtoupper( $result->balance_transaction->currency ) : null;
-						WC_Stripe_Helper::update_stripe_currency( $order, $currency );
+						$currency = ! empty($result->balance_transaction->currency) ? strtoupper($result->balance_transaction->currency) : null;
+						WC_Stripe_Helper::update_stripe_currency($order, $currency);
 					}
 
-					if ( is_callable( array( $order, 'save' ) ) ) {
+					if (is_callable(array($order, 'save'))) {
 						$order->save();
 					}
 				}
 
 				// This hook fires when admin manually changes order status to processing or completed.
-				do_action( 'woocommerce_stripe_process_manual_capture', $order, $result );
+				do_action('woocommerce_stripe_process_manual_capture', $order, $result);
 			}
 		}
 	}
@@ -283,14 +283,14 @@ 
 	 * @version 4.0.0
 	 * @param  int $order_id
 	 */
-	public function cancel_payment( $order_id ) {
-		$order = wc_get_order( $order_id );
+	public function cancel_payment($order_id) {
+		$order = wc_get_order($order_id);
 
-		if ( 'stripe' === ( WC_Stripe_Helper::is_pre_30() ? $order->payment_method : $order->get_payment_method() ) ) {
-			$this->process_refund( $order_id );
+		if ('stripe' === (WC_Stripe_Helper::is_pre_30() ? $order->payment_method : $order->get_payment_method())) {
+			$this->process_refund($order_id);
 
 			// This hook fires when admin manually changes order status to cancel.
-			do_action( 'woocommerce_stripe_process_manual_cancel', $order );
+			do_action('woocommerce_stripe_process_manual_cancel', $order);
 		}
 	}
 }

woocommerce-gateway-stripe.php

Spacing +84 added lines, -84 removed lines

@@ -15,7 +15,7 @@ 
  *
  */
 
-if ( ! defined( 'ABSPATH' ) ) {
+if ( ! defined('ABSPATH')) {
 	exit;
 }
 
@@ -27,29 +27,29 @@ 
  */
 function woocommerce_stripe_missing_wc_notice() {
 	/* translators: 1. URL link. */
-	echo '<div class="error"><p><strong>' . sprintf( esc_html__( 'Stripe requires WooCommerce to be installed and active. You can download %s here.', 'woocommerce-gateway-stripe' ), '<a href="https://woocommerce.com/" target="_blank">WooCommerce</a>' ) . '</strong></p></div>';
+	echo '<div class="error"><p><strong>' . sprintf(esc_html__('Stripe requires WooCommerce to be installed and active. You can download %s here.', 'woocommerce-gateway-stripe'), '<a href="https://woocommerce.com/" target="_blank">WooCommerce</a>') . '</strong></p></div>';
 }
 
-add_action( 'plugins_loaded', 'woocommerce_gateway_stripe_init' );
+add_action('plugins_loaded', 'woocommerce_gateway_stripe_init');
 
 function woocommerce_gateway_stripe_init() {
-	load_plugin_textdomain( 'woocommerce-gateway-stripe', false, plugin_basename( dirname( __FILE__ ) ) . '/languages' );
+	load_plugin_textdomain('woocommerce-gateway-stripe', false, plugin_basename(dirname(__FILE__)) . '/languages');
 
-	if ( ! class_exists( 'WooCommerce' ) ) {
-		add_action( 'admin_notices', 'woocommerce_stripe_missing_wc_notice' );
+	if ( ! class_exists('WooCommerce')) {
+		add_action('admin_notices', 'woocommerce_stripe_missing_wc_notice');
 		return;
 	}
 
-	if ( ! class_exists( 'WC_Stripe' ) ) :
+	if ( ! class_exists('WC_Stripe')) :
 		/**
 		 * Required minimums and constants
 		 */
-		define( 'WC_STRIPE_VERSION', '4.1.9' );
-		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.1.9');
+		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 {
 
@@ -69,7 +69,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;
@@ -96,7 +96,7 @@ 
 			 * *Singleton* via the `new` operator from outside of this class.
 			 */
 			private function __construct() {
-				add_action( 'admin_init', array( $this, 'install' ) );
+				add_action('admin_init', array($this, 'install'));
 				$this->init();
 			}
 
@@ -107,48 +107,48 @@ 
 			 * @version 4.0.0
 			 */
 			public function init() {
-				if ( is_admin() ) {
-					require_once( dirname( __FILE__ ) . '/includes/admin/class-wc-stripe-privacy.php' );
+				if (is_admin()) {
+					require_once(dirname(__FILE__) . '/includes/admin/class-wc-stripe-privacy.php');
 				}
 
-				require_once( dirname( __FILE__ ) . '/includes/class-wc-stripe-exception.php' );
-				require_once( dirname( __FILE__ ) . '/includes/class-wc-stripe-logger.php' );
-				require_once( dirname( __FILE__ ) . '/includes/class-wc-stripe-helper.php' );
-				include_once( dirname( __FILE__ ) . '/includes/class-wc-stripe-api.php' );
-				require_once( dirname( __FILE__ ) . '/includes/abstracts/abstract-wc-stripe-payment-gateway.php' );
-				require_once( dirname( __FILE__ ) . '/includes/class-wc-stripe-webhook-handler.php' );
-				require_once( dirname( __FILE__ ) . '/includes/class-wc-stripe-sepa-payment-token.php' );
-				require_once( dirname( __FILE__ ) . '/includes/class-wc-stripe-apple-pay-registration.php' );
-				require_once( dirname( __FILE__ ) . '/includes/compat/class-wc-stripe-pre-orders-compat.php' );
-				require_once( dirname( __FILE__ ) . '/includes/class-wc-gateway-stripe.php' );
-				require_once( dirname( __FILE__ ) . '/includes/payment-methods/class-wc-gateway-stripe-bancontact.php' );
-				require_once( dirname( __FILE__ ) . '/includes/payment-methods/class-wc-gateway-stripe-sofort.php' );
-				require_once( dirname( __FILE__ ) . '/includes/payment-methods/class-wc-gateway-stripe-giropay.php' );
-				require_once( dirname( __FILE__ ) . '/includes/payment-methods/class-wc-gateway-stripe-eps.php' );
-				require_once( dirname( __FILE__ ) . '/includes/payment-methods/class-wc-gateway-stripe-ideal.php' );
-				require_once( dirname( __FILE__ ) . '/includes/payment-methods/class-wc-gateway-stripe-p24.php' );
-				require_once( dirname( __FILE__ ) . '/includes/payment-methods/class-wc-gateway-stripe-alipay.php' );
-				require_once( dirname( __FILE__ ) . '/includes/payment-methods/class-wc-gateway-stripe-sepa.php' );
-				require_once( dirname( __FILE__ ) . '/includes/payment-methods/class-wc-gateway-stripe-multibanco.php' );
-				require_once( dirname( __FILE__ ) . '/includes/payment-methods/class-wc-stripe-payment-request.php' );
-				require_once( dirname( __FILE__ ) . '/includes/compat/class-wc-stripe-subs-compat.php' );
-				require_once( dirname( __FILE__ ) . '/includes/compat/class-wc-stripe-sepa-subs-compat.php' );
-				require_once( dirname( __FILE__ ) . '/includes/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' );
-
-				if ( is_admin() ) {
-					require_once( dirname( __FILE__ ) . '/includes/admin/class-wc-stripe-admin-notices.php' );
+				require_once(dirname(__FILE__) . '/includes/class-wc-stripe-exception.php');
+				require_once(dirname(__FILE__) . '/includes/class-wc-stripe-logger.php');
+				require_once(dirname(__FILE__) . '/includes/class-wc-stripe-helper.php');
+				include_once(dirname(__FILE__) . '/includes/class-wc-stripe-api.php');
+				require_once(dirname(__FILE__) . '/includes/abstracts/abstract-wc-stripe-payment-gateway.php');
+				require_once(dirname(__FILE__) . '/includes/class-wc-stripe-webhook-handler.php');
+				require_once(dirname(__FILE__) . '/includes/class-wc-stripe-sepa-payment-token.php');
+				require_once(dirname(__FILE__) . '/includes/class-wc-stripe-apple-pay-registration.php');
+				require_once(dirname(__FILE__) . '/includes/compat/class-wc-stripe-pre-orders-compat.php');
+				require_once(dirname(__FILE__) . '/includes/class-wc-gateway-stripe.php');
+				require_once(dirname(__FILE__) . '/includes/payment-methods/class-wc-gateway-stripe-bancontact.php');
+				require_once(dirname(__FILE__) . '/includes/payment-methods/class-wc-gateway-stripe-sofort.php');
+				require_once(dirname(__FILE__) . '/includes/payment-methods/class-wc-gateway-stripe-giropay.php');
+				require_once(dirname(__FILE__) . '/includes/payment-methods/class-wc-gateway-stripe-eps.php');
+				require_once(dirname(__FILE__) . '/includes/payment-methods/class-wc-gateway-stripe-ideal.php');
+				require_once(dirname(__FILE__) . '/includes/payment-methods/class-wc-gateway-stripe-p24.php');
+				require_once(dirname(__FILE__) . '/includes/payment-methods/class-wc-gateway-stripe-alipay.php');
+				require_once(dirname(__FILE__) . '/includes/payment-methods/class-wc-gateway-stripe-sepa.php');
+				require_once(dirname(__FILE__) . '/includes/payment-methods/class-wc-gateway-stripe-multibanco.php');
+				require_once(dirname(__FILE__) . '/includes/payment-methods/class-wc-stripe-payment-request.php');
+				require_once(dirname(__FILE__) . '/includes/compat/class-wc-stripe-subs-compat.php');
+				require_once(dirname(__FILE__) . '/includes/compat/class-wc-stripe-sepa-subs-compat.php');
+				require_once(dirname(__FILE__) . '/includes/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');
+
+				if (is_admin()) {
+					require_once(dirname(__FILE__) . '/includes/admin/class-wc-stripe-admin-notices.php');
 				}
 
 				// REMOVE IN THE FUTURE.
-				require_once( dirname( __FILE__ ) . '/includes/deprecated/class-wc-stripe-apple-pay.php' );
+				require_once(dirname(__FILE__) . '/includes/deprecated/class-wc-stripe-apple-pay.php');
 
-				add_filter( 'woocommerce_payment_gateways', array( $this, 'add_gateways' ) );
-				add_filter( 'plugin_action_links_' . plugin_basename( __FILE__ ), array( $this, 'plugin_action_links' ) );
+				add_filter('woocommerce_payment_gateways', array($this, 'add_gateways'));
+				add_filter('plugin_action_links_' . plugin_basename(__FILE__), array($this, 'plugin_action_links'));
 
-				if ( version_compare( WC_VERSION, '3.4', '<' ) ) {
-					add_filter( 'woocommerce_get_sections_checkout', array( $this, 'filter_gateway_order_admin' ) );
+				if (version_compare(WC_VERSION, '3.4', '<')) {
+					add_filter('woocommerce_get_sections_checkout', array($this, 'filter_gateway_order_admin'));
 				}
 			}
 
@@ -159,8 +159,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);
 			}
 
 			/**
@@ -170,15 +170,15 @@ 
 			 * @version 3.1.0
 			 */
 			public function install() {
-				if ( ! is_plugin_active( plugin_basename( __FILE__ ) ) ) {
+				if ( ! is_plugin_active(plugin_basename(__FILE__))) {
 					return;
 				}
 
-				if ( ! defined( 'IFRAME_REQUEST' ) && ( WC_STRIPE_VERSION !== get_option( 'wc_stripe_version' ) ) ) {
-					do_action( 'woocommerce_stripe_updated' );
+				if ( ! defined('IFRAME_REQUEST') && (WC_STRIPE_VERSION !== get_option('wc_stripe_version'))) {
+					do_action('woocommerce_stripe_updated');
 
-					if ( ! defined( 'WC_STRIPE_INSTALLING' ) ) {
-						define( 'WC_STRIPE_INSTALLING', true );
+					if ( ! defined('WC_STRIPE_INSTALLING')) {
+						define('WC_STRIPE_INSTALLING', true);
 					}
 
 					$this->update_plugin_version();
@@ -191,13 +191,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);
 			}
 
 			/**
@@ -206,8 +206,8 @@ 
 			 * @since 1.0.0
 			 * @version 4.0.0
 			 */
-			public function add_gateways( $methods ) {
-				if ( class_exists( 'WC_Subscriptions_Order' ) && function_exists( 'wcs_create_renewal_order' ) ) {
+			public function add_gateways($methods) {
+				if (class_exists('WC_Subscriptions_Order') && function_exists('wcs_create_renewal_order')) {
 					$methods[] = 'WC_Stripe_Subs_Compat';
 					$methods[] = 'WC_Stripe_Sepa_Subs_Compat';
 				} else {
@@ -233,28 +233,28 @@ 
 			 * @since 4.0.0
 			 * @version 4.0.0
 			 */
-			public function filter_gateway_order_admin( $sections ) {
-				unset( $sections['stripe'] );
-				unset( $sections['stripe_bancontact'] );
-				unset( $sections['stripe_sofort'] );
-				unset( $sections['stripe_giropay'] );
-				unset( $sections['stripe_eps'] );
-				unset( $sections['stripe_ideal'] );
-				unset( $sections['stripe_p24'] );
-				unset( $sections['stripe_alipay'] );
-				unset( $sections['stripe_sepa'] );
-				unset( $sections['stripe_multibanco'] );
+			public function filter_gateway_order_admin($sections) {
+				unset($sections['stripe']);
+				unset($sections['stripe_bancontact']);
+				unset($sections['stripe_sofort']);
+				unset($sections['stripe_giropay']);
+				unset($sections['stripe_eps']);
+				unset($sections['stripe_ideal']);
+				unset($sections['stripe_p24']);
+				unset($sections['stripe_alipay']);
+				unset($sections['stripe_sepa']);
+				unset($sections['stripe_multibanco']);
 
 				$sections['stripe']            = 'Stripe';
-				$sections['stripe_bancontact'] = __( 'Stripe Bancontact', 'woocommerce-gateway-stripe' );
-				$sections['stripe_sofort']     = __( 'Stripe SOFORT', 'woocommerce-gateway-stripe' );
-				$sections['stripe_giropay']    = __( 'Stripe Giropay', 'woocommerce-gateway-stripe' );
-				$sections['stripe_eps']        = __( 'Stripe EPS', 'woocommerce-gateway-stripe' );
-				$sections['stripe_ideal']      = __( 'Stripe iDeal', 'woocommerce-gateway-stripe' );
-				$sections['stripe_p24']        = __( 'Stripe P24', 'woocommerce-gateway-stripe' );
-				$sections['stripe_alipay']     = __( 'Stripe Alipay', 'woocommerce-gateway-stripe' );
-				$sections['stripe_sepa']       = __( 'Stripe SEPA Direct Debit', 'woocommerce-gateway-stripe' );
-				$sections['stripe_multibanco'] = __( 'Stripe Multibanco', 'woocommerce-gateway-stripe' );
+				$sections['stripe_bancontact'] = __('Stripe Bancontact', 'woocommerce-gateway-stripe');
+				$sections['stripe_sofort']     = __('Stripe SOFORT', 'woocommerce-gateway-stripe');
+				$sections['stripe_giropay']    = __('Stripe Giropay', 'woocommerce-gateway-stripe');
+				$sections['stripe_eps']        = __('Stripe EPS', 'woocommerce-gateway-stripe');
+				$sections['stripe_ideal']      = __('Stripe iDeal', 'woocommerce-gateway-stripe');
+				$sections['stripe_p24']        = __('Stripe P24', 'woocommerce-gateway-stripe');
+				$sections['stripe_alipay']     = __('Stripe Alipay', 'woocommerce-gateway-stripe');
+				$sections['stripe_sepa']       = __('Stripe SEPA Direct Debit', 'woocommerce-gateway-stripe');
+				$sections['stripe_multibanco'] = __('Stripe Multibanco', 'woocommerce-gateway-stripe');
 
 				return $sections;
 			}