woocommerce / woocommerce-gateway-stripe

tests/phpunit/test-wc-stripe-level-3-data.php

Spacing +22 added lines, -22 removed lines

@@ -7,19 +7,19 @@ 
 class WC_Stripe_level3_Data_Test extends WP_UnitTestCase {
 	public function test_data_for_mutli_item_order() {
 		$store_postcode = '90210';
-		update_option( 'woocommerce_store_postcode', $store_postcode );
+		update_option('woocommerce_store_postcode', $store_postcode);
 
 		// Arrange: Create a couple of products to use.
 		$variation_product = WC_Helper_Product::create_variation_product();
 		$variation_ids     = $variation_product->get_children();
 
-		$product_1 = wc_get_product ( $variation_ids[0] );
-		$product_1->set_regular_price( 19.19 );
-		$product_1->set_sale_price( 11.83 );
+		$product_1 = wc_get_product($variation_ids[0]);
+		$product_1->set_regular_price(19.19);
+		$product_1->set_sale_price(11.83);
 		$product_1->save();
 
-		$product_2 = wc_get_product( $variation_ids[1] );
-		$product_2->set_regular_price( 20.05 );
+		$product_2 = wc_get_product($variation_ids[1]);
+		$product_2->set_regular_price(20.05);
 		$product_2->save();
 
 		// Arrange: Set up an order with:
@@ -27,16 +27,16 @@ 
 		// 2) The same product added several times.
 		// 3) A valid US ZIP code
 		$order = new WC_Order();
-		$order->set_shipping_postcode( '90210' );
-		$order->add_product( $product_1, 1 ); // Add one item of the first product variation
-		$order->add_product( $product_2, 2 ); // Add two items of the second product variation
+		$order->set_shipping_postcode('90210');
+		$order->add_product($product_1, 1); // Add one item of the first product variation
+		$order->add_product($product_2, 2); // Add two items of the second product variation
 
 		$order->save();
 		$order->calculate_totals();
 
 		// Act: Call get_level3_data_from_order().
 		$gateway = new WC_Gateway_Stripe();
-		$result = $gateway->get_level3_data_from_order( $order );
+		$result = $gateway->get_level3_data_from_order($order);
 
 		// Assert.
 		$this->assertEquals(
@@ -48,7 +48,7 @@ 
 				'line_items' => array(
 					(object) array(
 						'product_code'        => (string) $product_1->get_id(),
-						'product_description' => substr( $product_1->get_name(), 0, 26 ),
+						'product_description' => substr($product_1->get_name(), 0, 26),
 						'unit_cost'           => 1183,
 						'quantity'            => 1,
 						'tax_amount'          => 0,
@@ -56,7 +56,7 @@ 
 					),
 					(object) array(
 						'product_code'        => (string) $product_2->get_id(),
-						'product_description' => substr( $product_2->get_name(), 0, 26 ),
+						'product_description' => substr($product_2->get_name(), 0, 26),
 						'unit_cost'           => 2005,
 						'quantity'            => 2,
 						'tax_amount'          => 0,
@@ -68,14 +68,14 @@ 
 		);
 
 		// Assert: Check that Stripe's total charge check passes.
-		$total_charged = WC_Stripe_Helper::get_stripe_amount( $order->get_total() );
-		$sum_of_unit_costs = array_reduce( $result['line_items'], function( $sum, $item ) {
+		$total_charged = WC_Stripe_Helper::get_stripe_amount($order->get_total());
+		$sum_of_unit_costs = array_reduce($result['line_items'], function($sum, $item) {
 			return $sum + $item->quantity * $item->unit_cost;
 		}  );
-		$sum_of_taxes = array_reduce( $result['line_items'], function( $sum, $item ) {
+		$sum_of_taxes = array_reduce($result['line_items'], function($sum, $item) {
 			return $sum + $item->tax_amount;
 		}  );
-		$sum_of_discounts = array_reduce( $result['line_items'], function( $sum, $item ) {
+		$sum_of_discounts = array_reduce($result['line_items'], function($sum, $item) {
 			return $sum + $item->discount_amount;
 		}  );
 		$shipping_amount = $result['shipping_amount'];
@@ -87,24 +87,24 @@ 
 
 	public function test_non_us_shipping_zip_codes() {
 		// Update the store with the right post code.
-		update_option( 'woocommerce_store_postcode', 1040 );
+		update_option('woocommerce_store_postcode', 1040);
 
 		// Arrange: Create a couple of products to use.
 		$product = WC_Helper_Product::create_simple_product();
-		$product->set_regular_price( 19.19 );
+		$product->set_regular_price(19.19);
 		$product->save();
 
 		// Arrange: Set up an order with a non-US postcode.
 		$order = new WC_Order();
-		$order->set_shipping_postcode( '1050' );
-		$order->add_product( $product, 1 );
+		$order->set_shipping_postcode('1050');
+		$order->add_product($product, 1);
 		$order->save();
 		$order->calculate_totals();
 
 		// Act: Call get_level3_data_from_order().
 		$store_postcode = '1100';
 		$gateway = new WC_Gateway_Stripe();
-		$result = $gateway->get_level3_data_from_order( $order );
+		$result = $gateway->get_level3_data_from_order($order);
 
 		// Assert.
 		$this->assertEquals(
@@ -114,7 +114,7 @@ 
 				'line_items' => array(
 					(object) array(
 						'product_code'        => (string) $product->get_id(),
-						'product_description' => substr( $product->get_name(), 0, 26 ),
+						'product_description' => substr($product->get_name(), 0, 26),
 						'unit_cost'           => 1919,
 						'quantity'            => 1,
 						'tax_amount'          => 0,

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

Indentation +2 added lines, -2 removed lines

@@ -123,10 +123,10 @@
 		// in includes/abstracts/abstract-wc-stripe-payment-gateway.php
 		if ( $this->testmode ) {
 			return preg_match( '/^pk_test_/', $this->publishable_key )
-			       && preg_match( '/^[rs]k_test_/', $this->secret_key );
+				   && preg_match( '/^[rs]k_test_/', $this->secret_key );
 		} else {
 			return preg_match( '/^pk_live_/', $this->publishable_key )
-			       && preg_match( '/^[rs]k_live_/', $this->secret_key );
+				   && preg_match( '/^[rs]k_live_/', $this->secret_key );
 		}
 	}
 

Doc Comments +1 added lines, -1 removed lines

@@ -121,7 +121,7 @@
 	 * Get this instance.
 	 *
 	 * @since  4.0.6
-	 * @return class
+	 * @return WC_Stripe_Payment_Request
 	 */
 	public static function instance() {
 		return self::$_this;

Spacing +304 added lines, -304 removed lines

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

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

Spacing +100 added lines, -100 removed lines

@@ -1,5 +1,5 @@ 
 <?php
-if ( ! defined( 'ABSPATH' ) ) {
+if ( ! defined('ABSPATH')) {
 	exit;
 }
 
@@ -21,9 +21,9 @@ 
 	 * @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( 'woocommerce_stripe_updated', array( $this, 'stripe_updated' ) );
+		add_action('admin_notices', array($this, 'admin_notices'));
+		add_action('wp_loaded', array($this, 'hide_notices'));
+		add_action('woocommerce_stripe_updated', array($this, 'stripe_updated'));
 	}
 
 	/**
@@ -32,8 +32,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,
@@ -47,7 +47,7 @@ 
 	 * @version 4.0.0
 	 */
 	public function admin_notices() {
-		if ( ! current_user_can( 'manage_woocommerce' ) ) {
+		if ( ! current_user_can('manage_woocommerce')) {
 			return;
 		}
 
@@ -57,17 +57,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:relative;float:right;padding:9px 0px 9px 9px 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:relative;float:right;padding:9px 0px 9px 9px 9px;text-decoration:none;"></a>
 				<?php
 			}
 
 			echo '<p>';
-			echo wp_kses( $notice['message'], array( 'a' => array( 'href' => array(), 'target' => array() ) ) );
+			echo wp_kses($notice['message'], array('a' => array('href' => array(), 'target' => array())));
 			echo '</p></div>';
 		}
 	}
@@ -100,111 +100,111 @@ 
 	 * @version 4.0.0
 	 */
 	public function stripe_check_environment() {
-		$show_style_notice   = get_option( 'wc_stripe_show_style_notice' );
-		$show_ssl_notice     = get_option( 'wc_stripe_show_ssl_notice' );
-		$show_keys_notice    = get_option( 'wc_stripe_show_keys_notice' );
-		$show_3ds_notice     = get_option( 'wc_stripe_show_3ds_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' );
-		$show_sca_notice     = get_option( 'wc_stripe_show_sca_notice' );
-		$changed_keys_notice = get_option( 'wc_stripe_show_changed_keys_notice' );
-		$options             = get_option( 'woocommerce_stripe_settings' );
-		$testmode            = ( isset( $options['testmode'] ) && 'yes' === $options['testmode'] ) ? true : false;
-		$test_pub_key        = isset( $options['test_publishable_key'] ) ? $options['test_publishable_key'] : '';
-		$test_secret_key     = isset( $options['test_secret_key'] ) ? $options['test_secret_key'] : '';
-		$live_pub_key        = isset( $options['publishable_key'] ) ? $options['publishable_key'] : '';
-		$live_secret_key     = isset( $options['secret_key'] ) ? $options['secret_key'] : '';
-		$three_d_secure      = isset( $options['three_d_secure'] ) && 'yes' === $options['three_d_secure'];
-
-		if ( isset( $options['enabled'] ) && 'yes' === $options['enabled'] ) {
-			if ( empty( $show_3ds_notice ) && $three_d_secure ) {
+		$show_style_notice   = get_option('wc_stripe_show_style_notice');
+		$show_ssl_notice     = get_option('wc_stripe_show_ssl_notice');
+		$show_keys_notice    = get_option('wc_stripe_show_keys_notice');
+		$show_3ds_notice     = get_option('wc_stripe_show_3ds_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');
+		$show_sca_notice     = get_option('wc_stripe_show_sca_notice');
+		$changed_keys_notice = get_option('wc_stripe_show_changed_keys_notice');
+		$options             = get_option('woocommerce_stripe_settings');
+		$testmode            = (isset($options['testmode']) && 'yes' === $options['testmode']) ? true : false;
+		$test_pub_key        = isset($options['test_publishable_key']) ? $options['test_publishable_key'] : '';
+		$test_secret_key     = isset($options['test_secret_key']) ? $options['test_secret_key'] : '';
+		$live_pub_key        = isset($options['publishable_key']) ? $options['publishable_key'] : '';
+		$live_secret_key     = isset($options['secret_key']) ? $options['secret_key'] : '';
+		$three_d_secure      = isset($options['three_d_secure']) && 'yes' === $options['three_d_secure'];
+
+		if (isset($options['enabled']) && 'yes' === $options['enabled']) {
+			if (empty($show_3ds_notice) && $three_d_secure) {
 				$url = 'https://stripe.com/docs/payments/3d-secure#three-ds-radar';
 
 				/* translators: 1) A URL that explains Stripe Radar. */
-				$message = __( 'WooCommerce Stripe - We see that you had the "Require 3D secure when applicable" setting turned on. This setting is not available here anymore, because it is now replaced by Stripe Radar. You can learn more about it <a href="%s" target="_blank">here</a>.', 'woocommerce-gateway-stripe' );
+				$message = __('WooCommerce Stripe - We see that you had the "Require 3D secure when applicable" setting turned on. This setting is not available here anymore, because it is now replaced by Stripe Radar. You can learn more about it <a href="%s" target="_blank">here</a>.', 'woocommerce-gateway-stripe');
 
-				$this->add_admin_notice( '3ds', 'notice notice-warning', sprintf( $message, $url ), true );
+				$this->add_admin_notice('3ds', 'notice notice-warning', sprintf($message, $url), true);
 			}
 
-			if ( empty( $show_style_notice ) ) {
+			if (empty($show_style_notice)) {
 				/* translators: 1) int version 2) int version */
-				$message = __( 'WooCommerce Stripe - We recently made changes to Stripe that may impact the appearance of your checkout. If your checkout has changed unexpectedly, please follow these <a href="https://docs.woocommerce.com/document/stripe/#styling" target="_blank">instructions</a> to fix.', 'woocommerce-gateway-stripe' );
+				$message = __('WooCommerce Stripe - We recently made changes to Stripe that may impact the appearance of your checkout. If your checkout has changed unexpectedly, please follow these <a href="https://docs.woocommerce.com/document/stripe/#styling" target="_blank">instructions</a> to fix.', 'woocommerce-gateway-stripe');
 
-				$this->add_admin_notice( 'style', 'notice notice-warning', $message, true );
+				$this->add_admin_notice('style', 'notice notice-warning', $message, true);
 
 				return;
 			}
 
-			if ( empty( $show_phpver_notice ) ) {
-				if ( version_compare( phpversion(), WC_STRIPE_MIN_PHP_VER, '<' ) ) {
+			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 ( WC_Stripe_Helper::is_wc_lt( WC_STRIPE_FUTURE_MIN_WC_VER ) ) {
+			if (empty($show_wcver_notice)) {
+				if (WC_Stripe_Helper::is_wc_lt(WC_STRIPE_FUTURE_MIN_WC_VER)) {
 					/* translators: 1) int version 2) int version */
-					$message = __( 'WooCommerce Stripe - This is the last version of the plugin compatible with WooCommerce %1$s. All furture versions of the plugin will require WooCommerce %2$s or greater.', 'woocommerce-gateway-stripe' );
-					$this->add_admin_notice( 'wcver', 'notice notice-warning', sprintf( $message, WC_VERSION, WC_STRIPE_FUTURE_MIN_WC_VER ), true );
+					$message = __('WooCommerce Stripe - This is the last version of the plugin compatible with WooCommerce %1$s. All furture versions of the plugin will require WooCommerce %2$s or greater.', 'woocommerce-gateway-stripe');
+					$this->add_admin_notice('wcver', 'notice notice-warning', sprintf($message, WC_VERSION, WC_STRIPE_FUTURE_MIN_WC_VER), 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_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( '/^[rs]k_test_/', $test_secret_key ) ) {
+						! empty($test_pub_key) && ! preg_match('/^pk_test_/', $test_pub_key)
+						|| ! empty($test_secret_key) && ! preg_match('/^[rs]k_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( '/^[rs]k_live_/', $live_secret_key ) ) {
+						! empty($live_pub_key) && ! preg_match('/^pk_live_/', $live_pub_key)
+						|| ! empty($live_secret_key) && ! preg_match('/^[rs]k_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 live 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 live 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);
 				}
 			}
 
-			if ( empty( $show_sca_notice ) ) {
-				$this->add_admin_notice( 'sca', 'notice notice-success', sprintf( __( 'Stripe is now ready for Strong Customer Authentication (SCA) and 3D Secure 2! <a href="%1$s" target="_blank">Read about SCA</a>', 'woocommerce-gateway-stripe' ), 'https://woocommerce.com/posts/introducing-strong-customer-authentication-sca/' ), true );
+			if (empty($show_sca_notice)) {
+				$this->add_admin_notice('sca', 'notice notice-success', sprintf(__('Stripe is now ready for Strong Customer Authentication (SCA) and 3D Secure 2! <a href="%1$s" target="_blank">Read about SCA</a>', 'woocommerce-gateway-stripe'), 'https://woocommerce.com/posts/introducing-strong-customer-authentication-sca/'), true);
 			}
 
-			if ( 'yes' === $changed_keys_notice ) {
+			if ('yes' === $changed_keys_notice) {
 				// translators: %s is a the URL for the link.
-				$this->add_admin_notice( 'changed_keys', 'notice notice-warning', sprintf( __( 'The public and/or secret keys for the Stripe gateway have been changed. This might cause errors for existing customers and saved payment methods. <a href="%s" target="_blank">Click here to learn more</a>.', 'woocommerce-gateway-stripe' ), 'https://docs.woocommerce.com/document/stripe-fixing-customer-errors/' ), true );
+				$this->add_admin_notice('changed_keys', 'notice notice-warning', sprintf(__('The public and/or secret keys for the Stripe gateway have been changed. This might cause errors for existing customers and saved payment methods. <a href="%s" target="_blank">Click here to learn more</a>.', 'woocommerce-gateway-stripe'), 'https://docs.woocommerce.com/document/stripe-fixing-customer-errors/'), true);
 			}
 		}
 	}
@@ -217,17 +217,17 @@ 
 	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() ) ) {
+			if ( ! in_array(get_woocommerce_currency(), $gateway->get_supported_currency())) {
 				/* translators: %1$s Payment method, %2$s List of supported currencies */
-				$this->add_admin_notice( $method, 'notice notice-error', sprintf( __( '%1$s is enabled - it requires store currency to be set to %2$s', 'woocommerce-gateway-stripe' ), $method, implode( ', ', $gateway->get_supported_currency() ) ), true );
+				$this->add_admin_notice($method, 'notice notice-error', sprintf(__('%1$s is enabled - it requires store currency to be set to %2$s', 'woocommerce-gateway-stripe'), $method, implode(', ', $gateway->get_supported_currency())), true);
 			}
 		}
 	}
@@ -239,71 +239,71 @@ 
 	 * @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 'style':
-					update_option( 'wc_stripe_show_style_notice', 'no' );
+					update_option('wc_stripe_show_style_notice', 'no');
 					break;
 				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 '3ds':
-					update_option( 'wc_stripe_show_3ds_notice', 'no' );
+					update_option('wc_stripe_show_3ds_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;
 				case 'sca':
-					update_option( 'wc_stripe_show_sca_notice', 'no' );
+					update_option('wc_stripe_show_sca_notice', 'no');
 					break;
 				case 'changed_keys':
-					update_option( 'wc_stripe_show_changed_keys_notice', 'no' );
+					update_option('wc_stripe_show_changed_keys_notice', 'no');
 			}
 		}
 	}
@@ -316,7 +316,7 @@ 
 	 * @return string Setting link
 	 */
 	public function get_setting_link() {
-		return admin_url( 'admin.php?page=wc-settings&tab=checkout&section=stripe' );
+		return admin_url('admin.php?page=wc-settings&tab=checkout&section=stripe');
 	}
 
 	/**
@@ -325,16 +325,16 @@ 
 	 * @since 4.3.0
 	 */
 	public function stripe_updated() {
-		$previous_version = get_option( 'wc_stripe_version' );
+		$previous_version = get_option('wc_stripe_version');
 
 		// Only show the style notice if the plugin was installed and older than 4.1.4.
-		if ( empty( $previous_version ) || version_compare( $previous_version, '4.1.4', 'ge' ) ) {
-			update_option( 'wc_stripe_show_style_notice', 'no' );
+		if (empty($previous_version) || version_compare($previous_version, '4.1.4', 'ge')) {
+			update_option('wc_stripe_show_style_notice', 'no');
 		}
 
 		// Only show the SCA notice on pre-4.3.0 installs.
-		if ( empty( $previous_version ) || version_compare( $previous_version, '4.3.0', 'ge' ) ) {
-			update_option( 'wc_stripe_show_sca_notice', 'no' );
+		if (empty($previous_version) || version_compare($previous_version, '4.3.0', 'ge')) {
+			update_option('wc_stripe_show_sca_notice', 'no');
 		}
 	}
 }

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

Spacing +31 added lines, -31 removed lines

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

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

Spacing +113 added lines, -113 removed lines

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

tests/phpunit/bootstrap.php

Spacing +13 added lines, -13 removed lines

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

tests/phpunit/setup.php

Spacing +1 added lines, -1 removed lines

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

woocommerce-gateway-stripe.php

Spacing +98 added lines, -98 removed lines

@@ -15,20 +15,20 @@ 
  *
  */
 
-if ( ! defined( 'ABSPATH' ) ) {
+if ( ! defined('ABSPATH')) {
 	exit;
 }
 
 /**
  * Required minimums and constants
  */
-define( 'WC_STRIPE_VERSION', '4.5.3' );
-define( 'WC_STRIPE_MIN_PHP_VER', '5.6.0' );
-define( 'WC_STRIPE_MIN_WC_VER', '3.0' );
-define( 'WC_STRIPE_FUTURE_MIN_WC_VER', '3.0' );
-define( 'WC_STRIPE_MAIN_FILE', __FILE__ );
-define( 'WC_STRIPE_PLUGIN_URL', untrailingslashit( plugins_url( basename( plugin_dir_path( __FILE__ ) ), basename( __FILE__ ) ) ) );
-define( 'WC_STRIPE_PLUGIN_PATH', untrailingslashit( plugin_dir_path( __FILE__ ) ) );
+define('WC_STRIPE_VERSION', '4.5.3');
+define('WC_STRIPE_MIN_PHP_VER', '5.6.0');
+define('WC_STRIPE_MIN_WC_VER', '3.0');
+define('WC_STRIPE_FUTURE_MIN_WC_VER', '3.0');
+define('WC_STRIPE_MAIN_FILE', __FILE__);
+define('WC_STRIPE_PLUGIN_URL', untrailingslashit(plugins_url(basename(plugin_dir_path(__FILE__)), basename(__FILE__))));
+define('WC_STRIPE_PLUGIN_PATH', untrailingslashit(plugin_dir_path(__FILE__)));
 
 // phpcs:disable WordPress.Files.FileName
 
@@ -40,7 +40,7 @@ 
  */
 function woocommerce_stripe_missing_wc_notice() {
 	/* translators: 1. URL link. */
-	echo '<div class="error"><p><strong>' . sprintf( esc_html__( 'Stripe requires WooCommerce to be installed and active. You can download %s here.', 'woocommerce-gateway-stripe' ), '<a href="https://woocommerce.com/" target="_blank">WooCommerce</a>' ) . '</strong></p></div>';
+	echo '<div class="error"><p><strong>' . sprintf(esc_html__('Stripe requires WooCommerce to be installed and active. You can download %s here.', 'woocommerce-gateway-stripe'), '<a href="https://woocommerce.com/" target="_blank">WooCommerce</a>') . '</strong></p></div>';
 }
 
 /**
@@ -51,25 +51,25 @@ 
  */
 function woocommerce_stripe_wc_not_supported() {
 	/* translators: $1. Minimum WooCommerce version. $2. Current WooCommerce version. */
-	echo '<div class="error"><p><strong>' . sprintf( esc_html__( 'Stripe requires WooCommerce %1$s or greater to be installed and active. WooCommerce %2$s is no longer supported.', 'woocommerce-gateway-stripe' ), WC_STRIPE_MIN_WC_VER, WC_VERSION ) . '</strong></p></div>';
+	echo '<div class="error"><p><strong>' . sprintf(esc_html__('Stripe requires WooCommerce %1$s or greater to be installed and active. WooCommerce %2$s is no longer supported.', 'woocommerce-gateway-stripe'), WC_STRIPE_MIN_WC_VER, WC_VERSION) . '</strong></p></div>';
 }
 
-add_action( 'plugins_loaded', 'woocommerce_gateway_stripe_init' );
+add_action('plugins_loaded', 'woocommerce_gateway_stripe_init');
 
 function woocommerce_gateway_stripe_init() {
-	load_plugin_textdomain( 'woocommerce-gateway-stripe', false, plugin_basename( dirname( __FILE__ ) ) . '/languages' );
+	load_plugin_textdomain('woocommerce-gateway-stripe', false, plugin_basename(dirname(__FILE__)) . '/languages');
 
-	if ( ! class_exists( 'WooCommerce' ) ) {
-		add_action( 'admin_notices', 'woocommerce_stripe_missing_wc_notice' );
+	if ( ! class_exists('WooCommerce')) {
+		add_action('admin_notices', 'woocommerce_stripe_missing_wc_notice');
 		return;
 	}
 
-	if ( version_compare( WC_VERSION, WC_STRIPE_MIN_WC_VER, '<' ) ) {
-		add_action( 'admin_notices', 'woocommerce_stripe_wc_not_supported' );
+	if (version_compare(WC_VERSION, WC_STRIPE_MIN_WC_VER, '<')) {
+		add_action('admin_notices', 'woocommerce_stripe_wc_not_supported');
 		return;
 	}
 
-	if ( ! class_exists( 'WC_Stripe' ) ) :
+	if ( ! class_exists('WC_Stripe')) :
 
 		class WC_Stripe {
 
@@ -84,7 +84,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;
@@ -111,7 +111,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();
 			}
 
@@ -122,53 +122,53 @@ 
 			 * @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';
-				require_once dirname( __FILE__ ) . '/includes/class-wc-stripe-intent-controller.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';
+				require_once dirname(__FILE__) . '/includes/class-wc-stripe-intent-controller.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( 'plugin_row_meta', array( $this, 'plugin_row_meta' ), 10, 2 );
+				add_filter('woocommerce_payment_gateways', array($this, 'add_gateways'));
+				add_filter('plugin_action_links_' . plugin_basename(__FILE__), array($this, 'plugin_action_links'));
+				add_filter('plugin_row_meta', array($this, 'plugin_row_meta'), 10, 2);
 
 				// Modify emails emails.
-				add_filter( 'woocommerce_email_classes', array( $this, 'add_emails' ), 20 );
+				add_filter('woocommerce_email_classes', array($this, 'add_emails'), 20);
 
-				if ( version_compare( WC_VERSION, '3.4', '<' ) ) {
-					add_filter( 'woocommerce_get_sections_checkout', array( $this, 'filter_gateway_order_admin' ) );
+				if (version_compare(WC_VERSION, '3.4', '<')) {
+					add_filter('woocommerce_get_sections_checkout', array($this, 'filter_gateway_order_admin'));
 				}
 			}
 
@@ -179,8 +179,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);
 			}
 
 			/**
@@ -190,15 +190,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();
@@ -211,11 +211,11 @@ 
 			 * @since 1.0.0
 			 * @version 4.0.0
 			 */
-			public function plugin_action_links( $links ) {
+			public function plugin_action_links($links) {
 				$plugin_links = array(
-					'<a href="admin.php?page=wc-settings&tab=checkout&section=stripe">' . esc_html__( 'Settings', 'woocommerce-gateway-stripe' ) . '</a>',
+					'<a href="admin.php?page=wc-settings&tab=checkout&section=stripe">' . esc_html__('Settings', 'woocommerce-gateway-stripe') . '</a>',
 				);
-				return array_merge( $plugin_links, $links );
+				return array_merge($plugin_links, $links);
 			}
 
 			/**
@@ -226,13 +226,13 @@ 
 			 * @param  string $file  Name of current file.
 			 * @return array  $links Update list of plugin links.
 			 */
-			public function plugin_row_meta( $links, $file ) {
-				if ( plugin_basename( __FILE__ ) === $file ) {
+			public function plugin_row_meta($links, $file) {
+				if (plugin_basename(__FILE__) === $file) {
 					$row_meta = array(
-						'docs'    => '<a href="' . esc_url( apply_filters( 'woocommerce_gateway_stripe_docs_url', 'https://docs.woocommerce.com/document/stripe/' ) ) . '" title="' . esc_attr( __( 'View Documentation', 'woocommerce-gateway-stripe' ) ) . '">' . __( 'Docs', 'woocommerce-gateway-stripe' ) . '</a>',
-						'support' => '<a href="' . esc_url( apply_filters( 'woocommerce_gateway_stripe_support_url', 'https://woocommerce.com/my-account/create-a-ticket?select=18627' ) ) . '" title="' . esc_attr( __( 'Open a support request at WooCommerce.com', 'woocommerce-gateway-stripe' ) ) . '">' . __( 'Support', 'woocommerce-gateway-stripe' ) . '</a>',
+						'docs'    => '<a href="' . esc_url(apply_filters('woocommerce_gateway_stripe_docs_url', 'https://docs.woocommerce.com/document/stripe/')) . '" title="' . esc_attr(__('View Documentation', 'woocommerce-gateway-stripe')) . '">' . __('Docs', 'woocommerce-gateway-stripe') . '</a>',
+						'support' => '<a href="' . esc_url(apply_filters('woocommerce_gateway_stripe_support_url', 'https://woocommerce.com/my-account/create-a-ticket?select=18627')) . '" title="' . esc_attr(__('Open a support request at WooCommerce.com', 'woocommerce-gateway-stripe')) . '">' . __('Support', 'woocommerce-gateway-stripe') . '</a>',
 					);
-					return array_merge( $links, $row_meta );
+					return array_merge($links, $row_meta);
 				}
 				return (array) $links;
 			}
@@ -243,8 +243,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 {
@@ -270,28 +270,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;
 			}
@@ -302,16 +302,16 @@ 
 			 * @param WC_Email[] $email_classes All existing emails.
 			 * @return WC_Email[]
 			 */
-			public function add_emails( $email_classes ) {
+			public function add_emails($email_classes) {
 				require_once WC_STRIPE_PLUGIN_PATH . '/includes/compat/class-wc-stripe-email-failed-authentication.php';
 				require_once WC_STRIPE_PLUGIN_PATH . '/includes/compat/class-wc-stripe-email-failed-renewal-authentication.php';
 				require_once WC_STRIPE_PLUGIN_PATH . '/includes/compat/class-wc-stripe-email-failed-preorder-authentication.php';
 				require_once WC_STRIPE_PLUGIN_PATH . '/includes/compat/class-wc-stripe-email-failed-authentication-retry.php';
 
 				// Add all emails, generated by the gateway.
-				$email_classes['WC_Stripe_Email_Failed_Renewal_Authentication']  = new WC_Stripe_Email_Failed_Renewal_Authentication( $email_classes );
-				$email_classes['WC_Stripe_Email_Failed_Preorder_Authentication'] = new WC_Stripe_Email_Failed_Preorder_Authentication( $email_classes );
-				$email_classes['WC_Stripe_Email_Failed_Authentication_Retry'] = new WC_Stripe_Email_Failed_Authentication_Retry( $email_classes );
+				$email_classes['WC_Stripe_Email_Failed_Renewal_Authentication']  = new WC_Stripe_Email_Failed_Renewal_Authentication($email_classes);
+				$email_classes['WC_Stripe_Email_Failed_Preorder_Authentication'] = new WC_Stripe_Email_Failed_Preorder_Authentication($email_classes);
+				$email_classes['WC_Stripe_Email_Failed_Authentication_Retry'] = new WC_Stripe_Email_Failed_Authentication_Retry($email_classes);
 
 				return $email_classes;
 			}

includes/admin/stripe-settings.php

Spacing +67 added lines, -67 removed lines

@@ -1,5 +1,5 @@ 
 <?php
-if ( ! defined( 'ABSPATH' ) ) {
+if ( ! defined('ABSPATH')) {
 	exit;
 }
 
@@ -7,109 +7,109 @@ 
 	'wc_stripe_settings',
 	array(
 		'enabled'                       => array(
-			'title'       => __( 'Enable/Disable', 'woocommerce-gateway-stripe' ),
-			'label'       => __( 'Enable Stripe', 'woocommerce-gateway-stripe' ),
+			'title'       => __('Enable/Disable', 'woocommerce-gateway-stripe'),
+			'label'       => __('Enable Stripe', 'woocommerce-gateway-stripe'),
 			'type'        => 'checkbox',
 			'description' => '',
 			'default'     => 'no',
 		),
 		'title'                         => array(
-			'title'       => __( 'Title', 'woocommerce-gateway-stripe' ),
+			'title'       => __('Title', 'woocommerce-gateway-stripe'),
 			'type'        => 'text',
-			'description' => __( 'This controls the title which the user sees during checkout.', 'woocommerce-gateway-stripe' ),
-			'default'     => __( 'Credit Card (Stripe)', 'woocommerce-gateway-stripe' ),
+			'description' => __('This controls the title which the user sees during checkout.', 'woocommerce-gateway-stripe'),
+			'default'     => __('Credit Card (Stripe)', 'woocommerce-gateway-stripe'),
 			'desc_tip'    => true,
 		),
 		'description'                   => array(
-			'title'       => __( 'Description', 'woocommerce-gateway-stripe' ),
+			'title'       => __('Description', 'woocommerce-gateway-stripe'),
 			'type'        => 'text',
-			'description' => __( 'This controls the description which the user sees during checkout.', 'woocommerce-gateway-stripe' ),
-			'default'     => __( 'Pay with your credit card via Stripe.', 'woocommerce-gateway-stripe' ),
+			'description' => __('This controls the description which the user sees during checkout.', 'woocommerce-gateway-stripe'),
+			'default'     => __('Pay with your credit card via Stripe.', 'woocommerce-gateway-stripe'),
 			'desc_tip'    => true,
 		),
 		'webhook'                       => array(
-			'title'       => __( 'Webhook Endpoints', 'woocommerce-gateway-stripe' ),
+			'title'       => __('Webhook Endpoints', 'woocommerce-gateway-stripe'),
 			'type'        => 'title',
 			/* translators: webhook URL */
 			'description' => $this->display_admin_settings_webhook_description(),
 		),
 		'testmode'                      => array(
-			'title'       => __( 'Test mode', 'woocommerce-gateway-stripe' ),
-			'label'       => __( 'Enable Test Mode', 'woocommerce-gateway-stripe' ),
+			'title'       => __('Test mode', 'woocommerce-gateway-stripe'),
+			'label'       => __('Enable Test Mode', 'woocommerce-gateway-stripe'),
 			'type'        => 'checkbox',
-			'description' => __( 'Place the payment gateway in test mode using test API keys.', 'woocommerce-gateway-stripe' ),
+			'description' => __('Place the payment gateway in test mode using test API keys.', 'woocommerce-gateway-stripe'),
 			'default'     => 'yes',
 			'desc_tip'    => true,
 		),
 		'test_publishable_key'          => array(
-			'title'       => __( 'Test Publishable Key', 'woocommerce-gateway-stripe' ),
+			'title'       => __('Test Publishable Key', 'woocommerce-gateway-stripe'),
 			'type'        => 'text',
-			'description' => __( 'Get your API keys from your stripe account. Invalid values will be rejected. Only values starting with "pk_test_" will be saved.', 'woocommerce-gateway-stripe' ),
+			'description' => __('Get your API keys from your stripe account. Invalid values will be rejected. Only values starting with "pk_test_" will be saved.', 'woocommerce-gateway-stripe'),
 			'default'     => '',
 			'desc_tip'    => true,
 		),
 		'test_secret_key'               => array(
-			'title'       => __( 'Test Secret Key', 'woocommerce-gateway-stripe' ),
+			'title'       => __('Test Secret Key', 'woocommerce-gateway-stripe'),
 			'type'        => 'password',
-			'description' => __( 'Get your API keys from your stripe account. Invalid values will be rejected. Only values starting with "sk_test_" or "rk_test_" will be saved.', 'woocommerce-gateway-stripe' ),
+			'description' => __('Get your API keys from your stripe account. Invalid values will be rejected. Only values starting with "sk_test_" or "rk_test_" will be saved.', 'woocommerce-gateway-stripe'),
 			'default'     => '',
 			'desc_tip'    => true,
 		),
 		'test_webhook_secret'           => array(
-			'title'       => __( 'Test Webhook Secret', 'woocommerce-gateway-stripe' ),
+			'title'       => __('Test Webhook Secret', 'woocommerce-gateway-stripe'),
 			'type'        => 'password',
-			'description' => __( 'Get your webhook signing secret from the webhooks section in your stripe account.', 'woocommerce-gateway-stripe' ),
+			'description' => __('Get your webhook signing secret from the webhooks section in your stripe account.', 'woocommerce-gateway-stripe'),
 			'default'     => '',
 			'desc_tip'    => true,
 		),
 		'publishable_key'               => array(
-			'title'       => __( 'Live Publishable Key', 'woocommerce-gateway-stripe' ),
+			'title'       => __('Live Publishable Key', 'woocommerce-gateway-stripe'),
 			'type'        => 'text',
-			'description' => __( 'Get your API keys from your stripe account. Invalid values will be rejected. Only values starting with "pk_live_" will be saved.', 'woocommerce-gateway-stripe' ),
+			'description' => __('Get your API keys from your stripe account. Invalid values will be rejected. Only values starting with "pk_live_" will be saved.', 'woocommerce-gateway-stripe'),
 			'default'     => '',
 			'desc_tip'    => true,
 		),
 		'secret_key'                    => array(
-			'title'       => __( 'Live Secret Key', 'woocommerce-gateway-stripe' ),
+			'title'       => __('Live Secret Key', 'woocommerce-gateway-stripe'),
 			'type'        => 'password',
-			'description' => __( 'Get your API keys from your stripe account. Invalid values will be rejected. Only values starting with "sk_live_" or "rk_live_" will be saved.', 'woocommerce-gateway-stripe' ),
+			'description' => __('Get your API keys from your stripe account. Invalid values will be rejected. Only values starting with "sk_live_" or "rk_live_" will be saved.', 'woocommerce-gateway-stripe'),
 			'default'     => '',
 			'desc_tip'    => true,
 		),
 		'webhook_secret'               => array(
-			'title'       => __( 'Webhook Secret', 'woocommerce-gateway-stripe' ),
+			'title'       => __('Webhook Secret', 'woocommerce-gateway-stripe'),
 			'type'        => 'password',
-			'description' => __( 'Get your webhook signing secret from the webhooks section in your stripe account.', 'woocommerce-gateway-stripe' ),
+			'description' => __('Get your webhook signing secret from the webhooks section in your stripe account.', 'woocommerce-gateway-stripe'),
 			'default'     => '',
 			'desc_tip'    => true,
 		),
 		'inline_cc_form'                => array(
-			'title'       => __( 'Inline Credit Card Form', 'woocommerce-gateway-stripe' ),
+			'title'       => __('Inline Credit Card Form', 'woocommerce-gateway-stripe'),
 			'type'        => 'checkbox',
-			'description' => __( 'Choose the style you want to show for your credit card form. When unchecked, the credit card form will display separate credit card number field, expiry date field and cvc field.', 'woocommerce-gateway-stripe' ),
+			'description' => __('Choose the style you want to show for your credit card form. When unchecked, the credit card form will display separate credit card number field, expiry date field and cvc field.', 'woocommerce-gateway-stripe'),
 			'default'     => 'no',
 			'desc_tip'    => true,
 		),
 		'statement_descriptor'          => array(
-			'title'       => __( 'Statement Descriptor', 'woocommerce-gateway-stripe' ),
+			'title'       => __('Statement Descriptor', 'woocommerce-gateway-stripe'),
 			'type'        => 'text',
-			'description' => __( 'Statement descriptors are limited to 22 characters, cannot use the special characters >, <, ", \, \', *, and must not consist solely of numbers. This will appear on your customer\'s statement in capital letters.', 'woocommerce-gateway-stripe' ),
+			'description' => __('Statement descriptors are limited to 22 characters, cannot use the special characters >, <, ", \, \', *, and must not consist solely of numbers. This will appear on your customer\'s statement in capital letters.', 'woocommerce-gateway-stripe'),
 			'default'     => '',
 			'desc_tip'    => true,
 		),
 		'capture'                       => array(
-			'title'       => __( 'Capture', 'woocommerce-gateway-stripe' ),
-			'label'       => __( 'Capture charge immediately', 'woocommerce-gateway-stripe' ),
+			'title'       => __('Capture', 'woocommerce-gateway-stripe'),
+			'label'       => __('Capture charge immediately', 'woocommerce-gateway-stripe'),
 			'type'        => 'checkbox',
-			'description' => __( 'Whether or not to immediately capture the charge. When unchecked, the charge issues an authorization and will need to be captured later. Uncaptured charges expire in 7 days.', 'woocommerce-gateway-stripe' ),
+			'description' => __('Whether or not to immediately capture the charge. When unchecked, the charge issues an authorization and will need to be captured later. Uncaptured charges expire in 7 days.', 'woocommerce-gateway-stripe'),
 			'default'     => 'yes',
 			'desc_tip'    => true,
 		),
 		'payment_request'               => array(
-			'title'       => __( 'Payment Request Buttons', 'woocommerce-gateway-stripe' ),
+			'title'       => __('Payment Request Buttons', 'woocommerce-gateway-stripe'),
 			'label'       => sprintf(
 				/* translators: 1) br tag 2) Stripe anchor tag 3) Apple anchor tag 4) Stripe dashboard opening anchor tag 5) Stripe dashboard closing anchor tag */
-				__( 'Enable Payment Request Buttons. (Apple Pay/Google Pay) %1$sBy using Apple Pay, you agree to %2$s and %3$s\'s terms of service. %4$sLog into your Stripe dashboard%5$s to complete or update your Apple Pay setup.', 'woocommerce-gateway-stripe' ),
+				__('Enable Payment Request Buttons. (Apple Pay/Google Pay) %1$sBy using Apple Pay, you agree to %2$s and %3$s\'s terms of service. %4$sLog into your Stripe dashboard%5$s to complete or update your Apple Pay setup.', 'woocommerce-gateway-stripe'),
 				'<br />',
 				'<a href="https://stripe.com/apple-pay/legal" target="_blank">Stripe</a>',
 				'<a href="https://developer.apple.com/apple-pay/acceptable-use-guidelines-for-websites/" target="_blank">Apple</a>',
@@ -117,79 +117,79 @@ 
 				'</a>'
 			),
 			'type'        => 'checkbox',
-			'description' => __( 'If enabled, users will be able to pay using Apple Pay or Chrome Payment Request if supported by the browser.', 'woocommerce-gateway-stripe' ),
+			'description' => __('If enabled, users will be able to pay using Apple Pay or Chrome Payment Request if supported by the browser.', 'woocommerce-gateway-stripe'),
 			'default'     => 'yes',
 			'desc_tip'    => true,
 		),
 		'payment_request_button_type'   => array(
-			'title'       => __( 'Payment Request Button Type', 'woocommerce-gateway-stripe' ),
-			'label'       => __( 'Button Type', 'woocommerce-gateway-stripe' ),
+			'title'       => __('Payment Request Button Type', 'woocommerce-gateway-stripe'),
+			'label'       => __('Button Type', 'woocommerce-gateway-stripe'),
 			'type'        => 'select',
-			'description' => __( 'Select the button type you would like to show.', 'woocommerce-gateway-stripe' ),
+			'description' => __('Select the button type you would like to show.', 'woocommerce-gateway-stripe'),
 			'default'     => 'buy',
 			'desc_tip'    => true,
 			'options'     => array(
-				'default' => __( 'Default', 'woocommerce-gateway-stripe' ),
-				'buy'     => __( 'Buy', 'woocommerce-gateway-stripe' ),
-				'donate'  => __( 'Donate', 'woocommerce-gateway-stripe' ),
-				'branded' => __( 'Branded', 'woocommerce-gateway-stripe' ),
-				'custom'  => __( 'Custom', 'woocommerce-gateway-stripe' ),
+				'default' => __('Default', 'woocommerce-gateway-stripe'),
+				'buy'     => __('Buy', 'woocommerce-gateway-stripe'),
+				'donate'  => __('Donate', 'woocommerce-gateway-stripe'),
+				'branded' => __('Branded', 'woocommerce-gateway-stripe'),
+				'custom'  => __('Custom', 'woocommerce-gateway-stripe'),
 			),
 		),
 		'payment_request_button_theme'  => array(
-			'title'       => __( 'Payment Request Button Theme', 'woocommerce-gateway-stripe' ),
-			'label'       => __( 'Button Theme', 'woocommerce-gateway-stripe' ),
+			'title'       => __('Payment Request Button Theme', 'woocommerce-gateway-stripe'),
+			'label'       => __('Button Theme', 'woocommerce-gateway-stripe'),
 			'type'        => 'select',
-			'description' => __( 'Select the button theme you would like to show.', 'woocommerce-gateway-stripe' ),
+			'description' => __('Select the button theme you would like to show.', 'woocommerce-gateway-stripe'),
 			'default'     => 'dark',
 			'desc_tip'    => true,
 			'options'     => array(
-				'dark'          => __( 'Dark', 'woocommerce-gateway-stripe' ),
-				'light'         => __( 'Light', 'woocommerce-gateway-stripe' ),
-				'light-outline' => __( 'Light-Outline', 'woocommerce-gateway-stripe' ),
+				'dark'          => __('Dark', 'woocommerce-gateway-stripe'),
+				'light'         => __('Light', 'woocommerce-gateway-stripe'),
+				'light-outline' => __('Light-Outline', 'woocommerce-gateway-stripe'),
 			),
 		),
 		'payment_request_button_height' => array(
-			'title'       => __( 'Payment Request Button Height', 'woocommerce-gateway-stripe' ),
-			'label'       => __( 'Button Height', 'woocommerce-gateway-stripe' ),
+			'title'       => __('Payment Request Button Height', 'woocommerce-gateway-stripe'),
+			'label'       => __('Button Height', 'woocommerce-gateway-stripe'),
 			'type'        => 'text',
-			'description' => __( 'Enter the height you would like the button to be in pixels. Width will always be 100%.', 'woocommerce-gateway-stripe' ),
+			'description' => __('Enter the height you would like the button to be in pixels. Width will always be 100%.', 'woocommerce-gateway-stripe'),
 			'default'     => '44',
 			'desc_tip'    => true,
 		),
 		'payment_request_button_label' => array(
-			'title'       => __( 'Payment Request Button Label', 'woocommerce-gateway-stripe' ),
-			'label'       => __( 'Button Label', 'woocommerce-gateway-stripe' ),
+			'title'       => __('Payment Request Button Label', 'woocommerce-gateway-stripe'),
+			'label'       => __('Button Label', 'woocommerce-gateway-stripe'),
 			'type'        => 'text',
-			'description' => __( 'Enter the custom text you would like the button to have.', 'woocommerce-gateway-stripe' ),
-			'default'     => __( 'Buy now', 'woocommerce-gateway-stripe' ),
+			'description' => __('Enter the custom text you would like the button to have.', 'woocommerce-gateway-stripe'),
+			'default'     => __('Buy now', 'woocommerce-gateway-stripe'),
 			'desc_tip'    => true,
 		),
 		'payment_request_button_branded_type' => array(
-			'title'       => __( 'Payment Request Branded Button Label Format', 'woocommerce-gateway-stripe' ),
-			'label'       => __( 'Branded Button Label Format', 'woocommerce-gateway-stripe' ),
+			'title'       => __('Payment Request Branded Button Label Format', 'woocommerce-gateway-stripe'),
+			'label'       => __('Branded Button Label Format', 'woocommerce-gateway-stripe'),
 			'type'        => 'select',
-			'description' => __( 'Select the branded button label format.', 'woocommerce-gateway-stripe' ),
+			'description' => __('Select the branded button label format.', 'woocommerce-gateway-stripe'),
 			'default'     => 'long',
 			'desc_tip'    => true,
 			'options'     => array(
-				'short' => __( 'Logo only', 'woocommerce-gateway-stripe' ),
-				'long'  => __( 'Text and logo', 'woocommerce-gateway-stripe' ),
+				'short' => __('Logo only', 'woocommerce-gateway-stripe'),
+				'long'  => __('Text and logo', 'woocommerce-gateway-stripe'),
 			),
 		),
 		'saved_cards'                   => array(
-			'title'       => __( 'Saved Cards', 'woocommerce-gateway-stripe' ),
-			'label'       => __( 'Enable Payment via Saved Cards', 'woocommerce-gateway-stripe' ),
+			'title'       => __('Saved Cards', 'woocommerce-gateway-stripe'),
+			'label'       => __('Enable Payment via Saved Cards', 'woocommerce-gateway-stripe'),
 			'type'        => 'checkbox',
-			'description' => __( 'If enabled, users will be able to pay with a saved card during checkout. Card details are saved on Stripe servers, not on your store.', 'woocommerce-gateway-stripe' ),
+			'description' => __('If enabled, users will be able to pay with a saved card during checkout. Card details are saved on Stripe servers, not on your store.', 'woocommerce-gateway-stripe'),
 			'default'     => 'yes',
 			'desc_tip'    => true,
 		),
 		'logging'                       => array(
-			'title'       => __( 'Logging', 'woocommerce-gateway-stripe' ),
-			'label'       => __( 'Log debug messages', 'woocommerce-gateway-stripe' ),
+			'title'       => __('Logging', 'woocommerce-gateway-stripe'),
+			'label'       => __('Log debug messages', 'woocommerce-gateway-stripe'),
 			'type'        => 'checkbox',
-			'description' => __( 'Save debug messages to the WooCommerce System Status log.', 'woocommerce-gateway-stripe' ),
+			'description' => __('Save debug messages to the WooCommerce System Status log.', 'woocommerce-gateway-stripe'),
 			'default'     => 'no',
 			'desc_tip'    => true,
 		),