woocommerce / woocommerce-gateway-stripe

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

Spacing +67 added lines, -67 removed lines

@@ -1,5 +1,5 @@ 
 <?php
-if ( ! defined( 'ABSPATH' ) ) {
+if ( ! defined('ABSPATH')) {
 	exit;
 }
 
@@ -57,9 +57,9 @@ 
 	 */
 	public function __construct() {
 		$this->id                   = 'stripe_alipay';
-		$this->method_title         = __( 'Stripe Alipay', 'woocommerce-gateway-stripe' );
+		$this->method_title         = __('Stripe Alipay', 'woocommerce-gateway-stripe');
 		/* translators: link */
-		$this->method_description   = sprintf( __( 'All other general Stripe settings can be adjusted <a href="%s">here</a>.', 'woocommerce-gateway-stripe' ), admin_url( 'admin.php?page=wc-settings&tab=checkout&section=stripe' ) );
+		$this->method_description   = sprintf(__('All other general Stripe settings can be adjusted <a href="%s">here</a>.', 'woocommerce-gateway-stripe'), admin_url('admin.php?page=wc-settings&tab=checkout&section=stripe'));
 		$this->supports             = array(
 			'products',
 			'refunds',
@@ -71,23 +71,23 @@ 
 		// Load the settings.
 		$this->init_settings();
 
-		$main_settings              = get_option( 'woocommerce_stripe_settings' );
-		$this->title                = $this->get_option( 'title' );
-		$this->description          = $this->get_option( 'description' );
-		$this->enabled              = $this->get_option( 'enabled' );
-		$this->testmode             = ( ! empty( $main_settings['testmode'] ) && 'yes' === $main_settings['testmode'] ) ? true : false;
-		$this->saved_cards          = ( ! empty( $main_settings['saved_cards'] ) && 'yes' === $main_settings['saved_cards'] ) ? true : false;
-		$this->publishable_key      = ! empty( $main_settings['publishable_key'] ) ? $main_settings['publishable_key'] : '';
-		$this->secret_key           = ! empty( $main_settings['secret_key'] ) ? $main_settings['secret_key'] : '';
-		$this->statement_descriptor = ! empty( $main_settings['statement_descriptor'] ) ? $main_settings['statement_descriptor'] : '';
-
-		if ( $this->testmode ) {
-			$this->publishable_key = ! empty( $main_settings['test_publishable_key'] ) ? $main_settings['test_publishable_key'] : '';
-			$this->secret_key      = ! empty( $main_settings['test_secret_key'] ) ? $main_settings['test_secret_key'] : '';
+		$main_settings              = get_option('woocommerce_stripe_settings');
+		$this->title                = $this->get_option('title');
+		$this->description          = $this->get_option('description');
+		$this->enabled              = $this->get_option('enabled');
+		$this->testmode             = ( ! empty($main_settings['testmode']) && 'yes' === $main_settings['testmode']) ? true : false;
+		$this->saved_cards          = ( ! empty($main_settings['saved_cards']) && 'yes' === $main_settings['saved_cards']) ? true : false;
+		$this->publishable_key      = ! empty($main_settings['publishable_key']) ? $main_settings['publishable_key'] : '';
+		$this->secret_key           = ! empty($main_settings['secret_key']) ? $main_settings['secret_key'] : '';
+		$this->statement_descriptor = ! empty($main_settings['statement_descriptor']) ? $main_settings['statement_descriptor'] : '';
+
+		if ($this->testmode) {
+			$this->publishable_key = ! empty($main_settings['test_publishable_key']) ? $main_settings['test_publishable_key'] : '';
+			$this->secret_key      = ! empty($main_settings['test_secret_key']) ? $main_settings['test_secret_key'] : '';
 		}
 
-		add_action( 'woocommerce_update_options_payment_gateways_' . $this->id, array( $this, 'process_admin_options' ) );
-		add_action( 'wp_enqueue_scripts', array( $this, 'payment_scripts' ) );
+		add_action('woocommerce_update_options_payment_gateways_' . $this->id, array($this, 'process_admin_options'));
+		add_action('wp_enqueue_scripts', array($this, 'payment_scripts'));
 	}
 
 	/**
@@ -98,7 +98,7 @@ 
 	 * @return array
 	 */
 	public function get_supported_currency() {
-		return apply_filters( 'wc_stripe_alipay_supported_currencies', array(
+		return apply_filters('wc_stripe_alipay_supported_currencies', array(
 			'EUR',
 			'AUD',
 			'CAD',
@@ -108,7 +108,7 @@ 
 			'NZD',
 			'SGD',
 			'USD',
-		) );
+		));
 	}
 
 	/**
@@ -119,7 +119,7 @@ 
 	 * @return bool
 	 */
 	public function is_available() {
-		if ( ! in_array( get_woocommerce_currency(), $this->get_supported_currency() ) ) {
+		if ( ! in_array(get_woocommerce_currency(), $this->get_supported_currency())) {
 			return false;
 		}
 
@@ -140,7 +140,7 @@ 
 
 		$icons_str .= $icons['alipay'];
 
-		return apply_filters( 'woocommerce_gateway_icon', $icons_str, $this->id );
+		return apply_filters('woocommerce_gateway_icon', $icons_str, $this->id);
 	}
 
 	/**
@@ -150,19 +150,19 @@ 
 	 * @version 4.0.0
 	 */
 	public function payment_scripts() {
-		if ( ! is_cart() && ! is_checkout() && ! isset( $_GET['pay_for_order'] ) && ! is_add_payment_method_page() ) {
+		if ( ! is_cart() && ! is_checkout() && ! isset($_GET['pay_for_order']) && ! is_add_payment_method_page()) {
 			return;
 		}
 
-		wp_enqueue_style( 'stripe_styles' );
-		wp_enqueue_script( 'woocommerce_stripe' );
+		wp_enqueue_style('stripe_styles');
+		wp_enqueue_script('woocommerce_stripe');
 	}
 
 	/**
 	 * Initialize Gateway Settings Form Fields.
 	 */
 	public function init_form_fields() {
-		$this->form_fields = require( WC_STRIPE_PLUGIN_PATH . '/includes/admin/stripe-alipay-settings.php' );
+		$this->form_fields = require(WC_STRIPE_PLUGIN_PATH . '/includes/admin/stripe-alipay-settings.php');
 	}
 
 	/**
@@ -174,25 +174,25 @@ 
 		$description = $this->get_description();
 
 		// If paying from order, we need to get total from order not cart.
-		if ( isset( $_GET['pay_for_order'] ) && ! empty( $_GET['key'] ) ) {
-			$order = wc_get_order( wc_get_order_id_by_order_key( wc_clean( $_GET['key'] ) ) );
+		if (isset($_GET['pay_for_order']) && ! empty($_GET['key'])) {
+			$order = wc_get_order(wc_get_order_id_by_order_key(wc_clean($_GET['key'])));
 			$total = $order->get_total();
 		}
 
-		if ( is_add_payment_method_page() ) {
-			$pay_button_text = __( 'Add Payment', 'woocommerce-gateway-stripe' );
-			$total        = '';
+		if (is_add_payment_method_page()) {
+			$pay_button_text = __('Add Payment', 'woocommerce-gateway-stripe');
+			$total = '';
 		} else {
 			$pay_button_text = '';
 		}
 
 		echo '<div
 			id="stripe-alipay-payment-data"
-			data-amount="' . esc_attr( WC_Stripe_Helper::get_stripe_amount( $total ) ) . '"
-			data-currency="' . esc_attr( strtolower( get_woocommerce_currency() ) ) . '">';
+			data-amount="' . esc_attr(WC_Stripe_Helper::get_stripe_amount($total)) . '"
+			data-currency="' . esc_attr(strtolower(get_woocommerce_currency())) . '">';
 
-		if ( $description ) {
-			echo apply_filters( 'wc_stripe_description', wpautop( wp_kses_post( $description ) ), $this->id );
+		if ($description) {
+			echo apply_filters('wc_stripe_description', wpautop(wp_kses_post($description)), $this->id);
 		}
 
 		echo '</div>';
@@ -206,24 +206,24 @@ 
 	 * @param object $order
 	 * @return mixed
 	 */
-	public function create_source( $order ) {
+	public function create_source($order) {
 		$currency              = WC_Stripe_Helper::is_pre_30() ? $order->get_order_currency() : $order->get_currency();
 		$order_id              = WC_Stripe_Helper::is_pre_30() ? $order->id : $order->get_id();
-		$return_url            = $this->get_stripe_return_url( $order );
+		$return_url            = $this->get_stripe_return_url($order);
 		$post_data             = array();
-		$post_data['amount']   = WC_Stripe_Helper::get_stripe_amount( $order->get_total(), $currency );
-		$post_data['currency'] = strtolower( $currency );
+		$post_data['amount']   = WC_Stripe_Helper::get_stripe_amount($order->get_total(), $currency);
+		$post_data['currency'] = strtolower($currency);
 		$post_data['type']     = 'alipay';
-		$post_data['owner']    = $this->get_owner_details( $order );
-		$post_data['redirect'] = array( 'return_url' => $return_url );
+		$post_data['owner']    = $this->get_owner_details($order);
+		$post_data['redirect'] = array('return_url' => $return_url);
 
-		if ( ! empty( $this->statement_descriptor ) ) {
-			$post_data['statement_descriptor'] = WC_Stripe_Helper::clean_statement_descriptor( $this->statement_descriptor );
+		if ( ! empty($this->statement_descriptor)) {
+			$post_data['statement_descriptor'] = WC_Stripe_Helper::clean_statement_descriptor($this->statement_descriptor);
 		}
 
-		WC_Stripe_Logger::log( 'Info: Begin creating Alipay source' );
+		WC_Stripe_Logger::log('Info: Begin creating Alipay source');
 
-		return WC_Stripe_API::request( apply_filters( 'wc_stripe_alipay_source', $post_data, $order ), 'sources' );
+		return WC_Stripe_API::request(apply_filters('wc_stripe_alipay_source', $post_data, $order), 'sources');
 	}
 
 	/**
@@ -237,53 +237,53 @@ 
 	 *
 	 * @return array|void
 	 */
-	public function process_payment( $order_id, $retry = true, $force_save_save = false ) {
+	public function process_payment($order_id, $retry = true, $force_save_save = false) {
 		try {
-			$order = wc_get_order( $order_id );
+			$order = wc_get_order($order_id);
 
 			// This will throw exception if not valid.
-			$this->validate_minimum_order_amount( $order );
+			$this->validate_minimum_order_amount($order);
 
 			// This comes from the create account checkbox in the checkout page.
-			$create_account = ! empty( $_POST['createaccount'] ) ? true : false;
+			$create_account = ! empty($_POST['createaccount']) ? true : false;
 
-			if ( $create_account ) {
+			if ($create_account) {
 				$new_customer_id     = WC_Stripe_Helper::is_pre_30() ? $order->customer_user : $order->get_customer_id();
-				$new_stripe_customer = new WC_Stripe_Customer( $new_customer_id );
+				$new_stripe_customer = new WC_Stripe_Customer($new_customer_id);
 				$new_stripe_customer->create_customer();
 			}
 
-			$response = $this->create_source( $order );
+			$response = $this->create_source($order);
 
-			if ( ! empty( $response->error ) ) {
-				$order->add_order_note( $response->error->message );
+			if ( ! empty($response->error)) {
+				$order->add_order_note($response->error->message);
 
-				throw new WC_Stripe_Exception( print_r( $response, true ), $response->error->message );
+				throw new WC_Stripe_Exception(print_r($response, true), $response->error->message);
 			}
 
-			if ( WC_Stripe_Helper::is_pre_30() ) {
-				update_post_meta( $order_id, '_stripe_source_id', $response->id );
+			if (WC_Stripe_Helper::is_pre_30()) {
+				update_post_meta($order_id, '_stripe_source_id', $response->id);
 			} else {
-				$order->update_meta_data( '_stripe_source_id', $response->id );
+				$order->update_meta_data('_stripe_source_id', $response->id);
 				$order->save();
 			}
 
-			WC_Stripe_Logger::log( 'Info: Redirecting to Alipay...' );
+			WC_Stripe_Logger::log('Info: Redirecting to Alipay...');
 
 			return array(
 				'result'   => 'success',
-				'redirect' => esc_url_raw( $response->redirect->url ),
+				'redirect' => esc_url_raw($response->redirect->url),
 			);
-		} catch ( WC_Stripe_Exception $e ) {
-			wc_add_notice( $e->getLocalizedMessage(), 'error' );
-			WC_Stripe_Logger::log( 'Error: ' . $e->getMessage() );
+		} catch (WC_Stripe_Exception $e) {
+			wc_add_notice($e->getLocalizedMessage(), 'error');
+			WC_Stripe_Logger::log('Error: ' . $e->getMessage());
 
-			do_action( 'wc_gateway_stripe_process_payment_error', $e, $order );
+			do_action('wc_gateway_stripe_process_payment_error', $e, $order);
 
-			$statuses = array( 'pending', 'failed' );
+			$statuses = array('pending', 'failed');
 
-			if ( $order->has_status( $statuses ) ) {
-				$this->send_failed_order_email( $order_id );
+			if ($order->has_status($statuses)) {
+				$this->send_failed_order_email($order_id);
 			}
 
 			return array(

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

Spacing +69 added lines, -69 removed lines

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

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

Spacing +66 added lines, -66 removed lines

@@ -1,5 +1,5 @@ 
 <?php
-if ( ! defined( 'ABSPATH' ) ) {
+if ( ! defined('ABSPATH')) {
 	exit;
 }
 
@@ -57,9 +57,9 @@ 
 	 */
 	public function __construct() {
 		$this->id                   = 'stripe_eps';
-		$this->method_title         = __( 'Stripe EPS', 'woocommerce-gateway-stripe' );
+		$this->method_title         = __('Stripe EPS', 'woocommerce-gateway-stripe');
 		/* translators: link */
-		$this->method_description   = sprintf( __( 'All other general Stripe settings can be adjusted <a href="%s">here</a>.', 'woocommerce-gateway-stripe' ), admin_url( 'admin.php?page=wc-settings&tab=checkout&section=stripe' ) );
+		$this->method_description   = sprintf(__('All other general Stripe settings can be adjusted <a href="%s">here</a>.', 'woocommerce-gateway-stripe'), admin_url('admin.php?page=wc-settings&tab=checkout&section=stripe'));
 		$this->supports             = array(
 			'products',
 			'refunds',
@@ -71,23 +71,23 @@ 
 		// Load the settings.
 		$this->init_settings();
 
-		$main_settings              = get_option( 'woocommerce_stripe_settings' );
-		$this->title                = $this->get_option( 'title' );
-		$this->description          = $this->get_option( 'description' );
-		$this->enabled              = $this->get_option( 'enabled' );
-		$this->testmode             = ( ! empty( $main_settings['testmode'] ) && 'yes' === $main_settings['testmode'] ) ? true : false;
-		$this->saved_cards          = ( ! empty( $main_settings['saved_cards'] ) && 'yes' === $main_settings['saved_cards'] ) ? true : false;
-		$this->publishable_key      = ! empty( $main_settings['publishable_key'] ) ? $main_settings['publishable_key'] : '';
-		$this->secret_key           = ! empty( $main_settings['secret_key'] ) ? $main_settings['secret_key'] : '';
-		$this->statement_descriptor = ! empty( $main_settings['statement_descriptor'] ) ? $main_settings['statement_descriptor'] : '';
-
-		if ( $this->testmode ) {
-			$this->publishable_key = ! empty( $main_settings['test_publishable_key'] ) ? $main_settings['test_publishable_key'] : '';
-			$this->secret_key      = ! empty( $main_settings['test_secret_key'] ) ? $main_settings['test_secret_key'] : '';
+		$main_settings              = get_option('woocommerce_stripe_settings');
+		$this->title                = $this->get_option('title');
+		$this->description          = $this->get_option('description');
+		$this->enabled              = $this->get_option('enabled');
+		$this->testmode             = ( ! empty($main_settings['testmode']) && 'yes' === $main_settings['testmode']) ? true : false;
+		$this->saved_cards          = ( ! empty($main_settings['saved_cards']) && 'yes' === $main_settings['saved_cards']) ? true : false;
+		$this->publishable_key      = ! empty($main_settings['publishable_key']) ? $main_settings['publishable_key'] : '';
+		$this->secret_key           = ! empty($main_settings['secret_key']) ? $main_settings['secret_key'] : '';
+		$this->statement_descriptor = ! empty($main_settings['statement_descriptor']) ? $main_settings['statement_descriptor'] : '';
+
+		if ($this->testmode) {
+			$this->publishable_key = ! empty($main_settings['test_publishable_key']) ? $main_settings['test_publishable_key'] : '';
+			$this->secret_key      = ! empty($main_settings['test_secret_key']) ? $main_settings['test_secret_key'] : '';
 		}
 
-		add_action( 'woocommerce_update_options_payment_gateways_' . $this->id, array( $this, 'process_admin_options' ) );
-		add_action( 'wp_enqueue_scripts', array( $this, 'payment_scripts' ) );
+		add_action('woocommerce_update_options_payment_gateways_' . $this->id, array($this, 'process_admin_options'));
+		add_action('wp_enqueue_scripts', array($this, 'payment_scripts'));
 	}
 
 	/**
@@ -98,9 +98,9 @@ 
 	 * @return array
 	 */
 	public function get_supported_currency() {
-		return apply_filters( 'wc_stripe_eps_supported_currencies', array(
+		return apply_filters('wc_stripe_eps_supported_currencies', array(
 			'EUR',
-		) );
+		));
 	}
 
 	/**
@@ -111,7 +111,7 @@ 
 	 * @return bool
 	 */
 	public function is_available() {
-		if ( ! in_array( get_woocommerce_currency(), $this->get_supported_currency() ) ) {
+		if ( ! in_array(get_woocommerce_currency(), $this->get_supported_currency())) {
 			return false;
 		}
 
@@ -132,7 +132,7 @@ 
 
 		$icons_str .= $icons['eps'];
 
-		return apply_filters( 'woocommerce_gateway_icon', $icons_str, $this->id );
+		return apply_filters('woocommerce_gateway_icon', $icons_str, $this->id);
 	}
 
 	/**
@@ -143,19 +143,19 @@ 
 	 * @access public
 	 */
 	public function payment_scripts() {
-		if ( ! is_cart() && ! is_checkout() && ! isset( $_GET['pay_for_order'] ) && ! is_add_payment_method_page() ) {
+		if ( ! is_cart() && ! is_checkout() && ! isset($_GET['pay_for_order']) && ! is_add_payment_method_page()) {
 			return;
 		}
 
-		wp_enqueue_style( 'stripe_styles' );
-		wp_enqueue_script( 'woocommerce_stripe' );
+		wp_enqueue_style('stripe_styles');
+		wp_enqueue_script('woocommerce_stripe');
 	}
 
 	/**
 	 * Initialize Gateway Settings Form Fields.
 	 */
 	public function init_form_fields() {
-		$this->form_fields = require( WC_STRIPE_PLUGIN_PATH . '/includes/admin/stripe-eps-settings.php' );
+		$this->form_fields = require(WC_STRIPE_PLUGIN_PATH . '/includes/admin/stripe-eps-settings.php');
 	}
 
 	/**
@@ -167,25 +167,25 @@ 
 		$description = $this->get_description();
 
 		// If paying from order, we need to get total from order not cart.
-		if ( isset( $_GET['pay_for_order'] ) && ! empty( $_GET['key'] ) ) {
-			$order = wc_get_order( wc_get_order_id_by_order_key( wc_clean( $_GET['key'] ) ) );
+		if (isset($_GET['pay_for_order']) && ! empty($_GET['key'])) {
+			$order = wc_get_order(wc_get_order_id_by_order_key(wc_clean($_GET['key'])));
 			$total = $order->get_total();
 		}
 
-		if ( is_add_payment_method_page() ) {
-			$pay_button_text = __( 'Add Payment', 'woocommerce-gateway-stripe' );
-			$total        = '';
+		if (is_add_payment_method_page()) {
+			$pay_button_text = __('Add Payment', 'woocommerce-gateway-stripe');
+			$total = '';
 		} else {
 			$pay_button_text = '';
 		}
 
 		echo '<div
 			id="stripe-eps-payment-data"
-			data-amount="' . esc_attr( WC_Stripe_Helper::get_stripe_amount( $total ) ) . '"
-			data-currency="' . esc_attr( strtolower( get_woocommerce_currency() ) ) . '">';
+			data-amount="' . esc_attr(WC_Stripe_Helper::get_stripe_amount($total)) . '"
+			data-currency="' . esc_attr(strtolower(get_woocommerce_currency())) . '">';
 
-		if ( $description ) {
-			echo apply_filters( 'wc_stripe_description', wpautop( wp_kses_post( $description ) ), $this->id );
+		if ($description) {
+			echo apply_filters('wc_stripe_description', wpautop(wp_kses_post($description)), $this->id);
 		}
 
 		echo '</div>';
@@ -199,24 +199,24 @@ 
 	 * @param object $order
 	 * @return mixed
 	 */
-	public function create_source( $order ) {
+	public function create_source($order) {
 		$currency              = WC_Stripe_Helper::is_pre_30() ? $order->get_order_currency() : $order->get_currency();
 		$order_id              = WC_Stripe_Helper::is_pre_30() ? $order->id : $order->get_id();
-		$return_url            = $this->get_stripe_return_url( $order );
+		$return_url            = $this->get_stripe_return_url($order);
 		$post_data             = array();
-		$post_data['amount']   = WC_Stripe_Helper::get_stripe_amount( $order->get_total(), $currency );
-		$post_data['currency'] = strtolower( $currency );
+		$post_data['amount']   = WC_Stripe_Helper::get_stripe_amount($order->get_total(), $currency);
+		$post_data['currency'] = strtolower($currency);
 		$post_data['type']     = 'eps';
-		$post_data['owner']    = $this->get_owner_details( $order );
-		$post_data['redirect'] = array( 'return_url' => $return_url );
+		$post_data['owner']    = $this->get_owner_details($order);
+		$post_data['redirect'] = array('return_url' => $return_url);
 
-		if ( ! empty( $this->statement_descriptor ) ) {
-			$post_data['statement_descriptor'] = WC_Stripe_Helper::clean_statement_descriptor( $this->statement_descriptor );
+		if ( ! empty($this->statement_descriptor)) {
+			$post_data['statement_descriptor'] = WC_Stripe_Helper::clean_statement_descriptor($this->statement_descriptor);
 		}
 
-		WC_Stripe_Logger::log( 'Info: Begin creating EPS source' );
+		WC_Stripe_Logger::log('Info: Begin creating EPS source');
 
-		return WC_Stripe_API::request( $post_data, 'sources' );
+		return WC_Stripe_API::request($post_data, 'sources');
 	}
 
 	/**
@@ -230,51 +230,51 @@ 
 	 *
 	 * @return array|void
 	 */
-	public function process_payment( $order_id, $retry = true, $force_save_source = false ) {
+	public function process_payment($order_id, $retry = true, $force_save_source = false) {
 		try {
-			$order = wc_get_order( $order_id );
+			$order = wc_get_order($order_id);
 
 			// This will throw exception if not valid.
-			$this->validate_minimum_order_amount( $order );
+			$this->validate_minimum_order_amount($order);
 
 			// This comes from the create account checkbox in the checkout page.
-			$create_account = ! empty( $_POST['createaccount'] ) ? true : false;
+			$create_account = ! empty($_POST['createaccount']) ? true : false;
 
-			if ( $create_account ) {
+			if ($create_account) {
 				$new_customer_id     = WC_Stripe_Helper::is_pre_30() ? $order->customer_user : $order->get_customer_id();
-				$new_stripe_customer = new WC_Stripe_Customer( $new_customer_id );
+				$new_stripe_customer = new WC_Stripe_Customer($new_customer_id);
 				$new_stripe_customer->create_customer();
 			}
 
-			$response = $this->create_source( $order );
+			$response = $this->create_source($order);
 
-			if ( ! empty( $response->error ) ) {
-				$order->add_order_note( $response->error->message );
+			if ( ! empty($response->error)) {
+				$order->add_order_note($response->error->message);
 
-				throw new Exception( $response->error->message );
+				throw new Exception($response->error->message);
 			}
 
-			if ( WC_Stripe_Helper::is_pre_30() ) {
-				update_post_meta( $order_id, '_stripe_source_id', $response->id );
+			if (WC_Stripe_Helper::is_pre_30()) {
+				update_post_meta($order_id, '_stripe_source_id', $response->id);
 			} else {
-				$order->update_meta_data( '_stripe_source_id', $response->id );
+				$order->update_meta_data('_stripe_source_id', $response->id);
 				$order->save();
 			}
 
-			WC_Stripe_Logger::log( 'Info: Redirecting to EPS...' );
+			WC_Stripe_Logger::log('Info: Redirecting to EPS...');
 
 			return array(
 				'result'   => 'success',
-				'redirect' => esc_url_raw( $response->redirect->url ),
+				'redirect' => esc_url_raw($response->redirect->url),
 			);
-		} catch ( Exception $e ) {
-			wc_add_notice( $e->getMessage(), 'error' );
-			WC_Stripe_Logger::log( 'Error: ' . $e->getMessage() );
+		} catch (Exception $e) {
+			wc_add_notice($e->getMessage(), 'error');
+			WC_Stripe_Logger::log('Error: ' . $e->getMessage());
 
-			do_action( 'wc_gateway_stripe_process_payment_error', $e, $order );
+			do_action('wc_gateway_stripe_process_payment_error', $e, $order);
 
-			if ( $order->has_status( array( 'pending', 'failed' ) ) ) {
-				$this->send_failed_order_email( $order_id );
+			if ($order->has_status(array('pending', 'failed'))) {
+				$this->send_failed_order_email($order_id);
 			}
 
 			return array(

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

Spacing +66 added lines, -66 removed lines

@@ -1,5 +1,5 @@ 
 <?php
-if ( ! defined( 'ABSPATH' ) ) {
+if ( ! defined('ABSPATH')) {
 	exit;
 }
 
@@ -57,9 +57,9 @@ 
 	 */
 	public function __construct() {
 		$this->id                   = 'stripe_giropay';
-		$this->method_title         = __( 'Stripe Giropay', 'woocommerce-gateway-stripe' );
+		$this->method_title         = __('Stripe Giropay', 'woocommerce-gateway-stripe');
 		/* translators: link */
-		$this->method_description   = sprintf( __( 'All other general Stripe settings can be adjusted <a href="%s">here</a>.', 'woocommerce-gateway-stripe' ), admin_url( 'admin.php?page=wc-settings&tab=checkout&section=stripe' ) );
+		$this->method_description   = sprintf(__('All other general Stripe settings can be adjusted <a href="%s">here</a>.', 'woocommerce-gateway-stripe'), admin_url('admin.php?page=wc-settings&tab=checkout&section=stripe'));
 		$this->supports             = array(
 			'products',
 			'refunds',
@@ -71,23 +71,23 @@ 
 		// Load the settings.
 		$this->init_settings();
 
-		$main_settings              = get_option( 'woocommerce_stripe_settings' );
-		$this->title                = $this->get_option( 'title' );
-		$this->description          = $this->get_option( 'description' );
-		$this->enabled              = $this->get_option( 'enabled' );
-		$this->testmode             = ( ! empty( $main_settings['testmode'] ) && 'yes' === $main_settings['testmode'] ) ? true : false;
-		$this->saved_cards          = ( ! empty( $main_settings['saved_cards'] ) && 'yes' === $main_settings['saved_cards'] ) ? true : false;
-		$this->publishable_key      = ! empty( $main_settings['publishable_key'] ) ? $main_settings['publishable_key'] : '';
-		$this->secret_key           = ! empty( $main_settings['secret_key'] ) ? $main_settings['secret_key'] : '';
-		$this->statement_descriptor = ! empty( $main_settings['statement_descriptor'] ) ? $main_settings['statement_descriptor'] : '';
-
-		if ( $this->testmode ) {
-			$this->publishable_key = ! empty( $main_settings['test_publishable_key'] ) ? $main_settings['test_publishable_key'] : '';
-			$this->secret_key      = ! empty( $main_settings['test_secret_key'] ) ? $main_settings['test_secret_key'] : '';
+		$main_settings              = get_option('woocommerce_stripe_settings');
+		$this->title                = $this->get_option('title');
+		$this->description          = $this->get_option('description');
+		$this->enabled              = $this->get_option('enabled');
+		$this->testmode             = ( ! empty($main_settings['testmode']) && 'yes' === $main_settings['testmode']) ? true : false;
+		$this->saved_cards          = ( ! empty($main_settings['saved_cards']) && 'yes' === $main_settings['saved_cards']) ? true : false;
+		$this->publishable_key      = ! empty($main_settings['publishable_key']) ? $main_settings['publishable_key'] : '';
+		$this->secret_key           = ! empty($main_settings['secret_key']) ? $main_settings['secret_key'] : '';
+		$this->statement_descriptor = ! empty($main_settings['statement_descriptor']) ? $main_settings['statement_descriptor'] : '';
+
+		if ($this->testmode) {
+			$this->publishable_key = ! empty($main_settings['test_publishable_key']) ? $main_settings['test_publishable_key'] : '';
+			$this->secret_key      = ! empty($main_settings['test_secret_key']) ? $main_settings['test_secret_key'] : '';
 		}
 
-		add_action( 'woocommerce_update_options_payment_gateways_' . $this->id, array( $this, 'process_admin_options' ) );
-		add_action( 'wp_enqueue_scripts', array( $this, 'payment_scripts' ) );
+		add_action('woocommerce_update_options_payment_gateways_' . $this->id, array($this, 'process_admin_options'));
+		add_action('wp_enqueue_scripts', array($this, 'payment_scripts'));
 	}
 
 	/**
@@ -98,9 +98,9 @@ 
 	 * @return array
 	 */
 	public function get_supported_currency() {
-		return apply_filters( 'wc_stripe_giropay_supported_currencies', array(
+		return apply_filters('wc_stripe_giropay_supported_currencies', array(
 			'EUR',
-		) );
+		));
 	}
 
 	/**
@@ -111,7 +111,7 @@ 
 	 * @return bool
 	 */
 	public function is_available() {
-		if ( ! in_array( get_woocommerce_currency(), $this->get_supported_currency() ) ) {
+		if ( ! in_array(get_woocommerce_currency(), $this->get_supported_currency())) {
 			return false;
 		}
 
@@ -132,7 +132,7 @@ 
 
 		$icons_str .= $icons['giropay'];
 
-		return apply_filters( 'woocommerce_gateway_icon', $icons_str, $this->id );
+		return apply_filters('woocommerce_gateway_icon', $icons_str, $this->id);
 	}
 
 	/**
@@ -143,19 +143,19 @@ 
 	 * @access public
 	 */
 	public function payment_scripts() {
-		if ( ! is_cart() && ! is_checkout() && ! isset( $_GET['pay_for_order'] ) && ! is_add_payment_method_page() ) {
+		if ( ! is_cart() && ! is_checkout() && ! isset($_GET['pay_for_order']) && ! is_add_payment_method_page()) {
 			return;
 		}
 
-		wp_enqueue_style( 'stripe_styles' );
-		wp_enqueue_script( 'woocommerce_stripe' );
+		wp_enqueue_style('stripe_styles');
+		wp_enqueue_script('woocommerce_stripe');
 	}
 
 	/**
 	 * Initialize Gateway Settings Form Fields.
 	 */
 	public function init_form_fields() {
-		$this->form_fields = require( WC_STRIPE_PLUGIN_PATH . '/includes/admin/stripe-giropay-settings.php' );
+		$this->form_fields = require(WC_STRIPE_PLUGIN_PATH . '/includes/admin/stripe-giropay-settings.php');
 	}
 
 	/**
@@ -167,25 +167,25 @@ 
 		$description = $this->get_description();
 
 		// If paying from order, we need to get total from order not cart.
-		if ( isset( $_GET['pay_for_order'] ) && ! empty( $_GET['key'] ) ) {
-			$order = wc_get_order( wc_get_order_id_by_order_key( wc_clean( $_GET['key'] ) ) );
+		if (isset($_GET['pay_for_order']) && ! empty($_GET['key'])) {
+			$order = wc_get_order(wc_get_order_id_by_order_key(wc_clean($_GET['key'])));
 			$total = $order->get_total();
 		}
 
-		if ( is_add_payment_method_page() ) {
-			$pay_button_text = __( 'Add Payment', 'woocommerce-gateway-stripe' );
-			$total        = '';
+		if (is_add_payment_method_page()) {
+			$pay_button_text = __('Add Payment', 'woocommerce-gateway-stripe');
+			$total = '';
 		} else {
 			$pay_button_text = '';
 		}
 
 		echo '<div
 			id="stripe-giropay-payment-data"
-			data-amount="' . esc_attr( WC_Stripe_Helper::get_stripe_amount( $total ) ) . '"
-			data-currency="' . esc_attr( strtolower( get_woocommerce_currency() ) ) . '">';
+			data-amount="' . esc_attr(WC_Stripe_Helper::get_stripe_amount($total)) . '"
+			data-currency="' . esc_attr(strtolower(get_woocommerce_currency())) . '">';
 
-		if ( $description ) {
-			echo apply_filters( 'wc_stripe_description', wpautop( wp_kses_post( $description ) ), $this->id );
+		if ($description) {
+			echo apply_filters('wc_stripe_description', wpautop(wp_kses_post($description)), $this->id);
 		}
 
 		echo '</div>';
@@ -199,24 +199,24 @@ 
 	 * @param object $order
 	 * @return mixed
 	 */
-	public function create_source( $order ) {
+	public function create_source($order) {
 		$currency              = WC_Stripe_Helper::is_pre_30() ? $order->get_order_currency() : $order->get_currency();
 		$order_id              = WC_Stripe_Helper::is_pre_30() ? $order->id : $order->get_id();
-		$return_url            = $this->get_stripe_return_url( $order );
+		$return_url            = $this->get_stripe_return_url($order);
 		$post_data             = array();
-		$post_data['amount']   = WC_Stripe_Helper::get_stripe_amount( $order->get_total(), $currency );
-		$post_data['currency'] = strtolower( $currency );
+		$post_data['amount']   = WC_Stripe_Helper::get_stripe_amount($order->get_total(), $currency);
+		$post_data['currency'] = strtolower($currency);
 		$post_data['type']     = 'giropay';
-		$post_data['owner']    = $this->get_owner_details( $order );
-		$post_data['redirect'] = array( 'return_url' => $return_url );
+		$post_data['owner']    = $this->get_owner_details($order);
+		$post_data['redirect'] = array('return_url' => $return_url);
 
-		if ( ! empty( $this->statement_descriptor ) ) {
-			$post_data['statement_descriptor'] = WC_Stripe_Helper::clean_statement_descriptor( $this->statement_descriptor );
+		if ( ! empty($this->statement_descriptor)) {
+			$post_data['statement_descriptor'] = WC_Stripe_Helper::clean_statement_descriptor($this->statement_descriptor);
 		}
 
-		WC_Stripe_Logger::log( 'Info: Begin creating Giropay source' );
+		WC_Stripe_Logger::log('Info: Begin creating Giropay source');
 
-		return WC_Stripe_API::request( apply_filters( 'wc_stripe_giropay_source', $post_data, $order ), 'sources' );
+		return WC_Stripe_API::request(apply_filters('wc_stripe_giropay_source', $post_data, $order), 'sources');
 	}
 
 	/**
@@ -230,51 +230,51 @@ 
 	 *
 	 * @return array|void
 	 */
-	public function process_payment( $order_id, $retry = true, $force_save_source = false ) {
+	public function process_payment($order_id, $retry = true, $force_save_source = false) {
 		try {
-			$order = wc_get_order( $order_id );
+			$order = wc_get_order($order_id);
 
 			// This will throw exception if not valid.
-			$this->validate_minimum_order_amount( $order );
+			$this->validate_minimum_order_amount($order);
 
 			// This comes from the create account checkbox in the checkout page.
-			$create_account = ! empty( $_POST['createaccount'] ) ? true : false;
+			$create_account = ! empty($_POST['createaccount']) ? true : false;
 
-			if ( $create_account ) {
+			if ($create_account) {
 				$new_customer_id     = WC_Stripe_Helper::is_pre_30() ? $order->customer_user : $order->get_customer_id();
-				$new_stripe_customer = new WC_Stripe_Customer( $new_customer_id );
+				$new_stripe_customer = new WC_Stripe_Customer($new_customer_id);
 				$new_stripe_customer->create_customer();
 			}
 
-			$response = $this->create_source( $order );
+			$response = $this->create_source($order);
 
-			if ( ! empty( $response->error ) ) {
-				$order->add_order_note( $response->error->message );
+			if ( ! empty($response->error)) {
+				$order->add_order_note($response->error->message);
 
-				throw new WC_Stripe_Exception( print_r( $response, true ), $response->error->message );
+				throw new WC_Stripe_Exception(print_r($response, true), $response->error->message);
 			}
 
-			if ( WC_Stripe_Helper::is_pre_30() ) {
-				update_post_meta( $order_id, '_stripe_source_id', $response->id );
+			if (WC_Stripe_Helper::is_pre_30()) {
+				update_post_meta($order_id, '_stripe_source_id', $response->id);
 			} else {
-				$order->update_meta_data( '_stripe_source_id', $response->id );
+				$order->update_meta_data('_stripe_source_id', $response->id);
 				$order->save();
 			}
 
-			WC_Stripe_Logger::log( 'Info: Redirecting to Giropay...' );
+			WC_Stripe_Logger::log('Info: Redirecting to Giropay...');
 
 			return array(
 				'result'   => 'success',
-				'redirect' => esc_url_raw( $response->redirect->url ),
+				'redirect' => esc_url_raw($response->redirect->url),
 			);
-		} catch ( WC_Stripe_Exception $e ) {
-			wc_add_notice( $e->getLocalizedMessage(), 'error' );
-			WC_Stripe_Logger::log( 'Error: ' . $e->getMessage() );
+		} catch (WC_Stripe_Exception $e) {
+			wc_add_notice($e->getLocalizedMessage(), 'error');
+			WC_Stripe_Logger::log('Error: ' . $e->getMessage());
 
-			do_action( 'wc_gateway_stripe_process_payment_error', $e, $order );
+			do_action('wc_gateway_stripe_process_payment_error', $e, $order);
 
-			if ( $order->has_status( array( 'pending', 'failed' ) ) ) {
-				$this->send_failed_order_email( $order_id );
+			if ($order->has_status(array('pending', 'failed'))) {
+				$this->send_failed_order_email($order_id);
 			}
 
 			return array(

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

Spacing +90 added lines, -90 removed lines

@@ -1,5 +1,5 @@ 
 <?php
-if ( ! defined( 'ABSPATH' ) ) {
+if ( ! defined('ABSPATH')) {
 	exit;
 }
 
@@ -57,9 +57,9 @@ 
 	 */
 	public function __construct() {
 		$this->id                   = 'stripe_multibanco';
-		$this->method_title         = __( 'Stripe Multibanco', 'woocommerce-gateway-stripe' );
+		$this->method_title         = __('Stripe Multibanco', 'woocommerce-gateway-stripe');
 		/* translators: link */
-		$this->method_description   = sprintf( __( 'All other general Stripe settings can be adjusted <a href="%s">here</a>.', 'woocommerce-gateway-stripe' ), admin_url( 'admin.php?page=wc-settings&tab=checkout&section=stripe' ) );
+		$this->method_description   = sprintf(__('All other general Stripe settings can be adjusted <a href="%s">here</a>.', 'woocommerce-gateway-stripe'), admin_url('admin.php?page=wc-settings&tab=checkout&section=stripe'));
 		$this->supports             = array(
 			'products',
 			'refunds',
@@ -71,27 +71,27 @@ 
 		// Load the settings.
 		$this->init_settings();
 
-		$main_settings              = get_option( 'woocommerce_stripe_settings' );
-		$this->title                = $this->get_option( 'title' );
-		$this->description          = $this->get_option( 'description' );
-		$this->enabled              = $this->get_option( 'enabled' );
-		$this->testmode             = ( ! empty( $main_settings['testmode'] ) && 'yes' === $main_settings['testmode'] ) ? true : false;
-		$this->saved_cards          = ( ! empty( $main_settings['saved_cards'] ) && 'yes' === $main_settings['saved_cards'] ) ? true : false;
-		$this->publishable_key      = ! empty( $main_settings['publishable_key'] ) ? $main_settings['publishable_key'] : '';
-		$this->secret_key           = ! empty( $main_settings['secret_key'] ) ? $main_settings['secret_key'] : '';
-		$this->statement_descriptor = ! empty( $main_settings['statement_descriptor'] ) ? $main_settings['statement_descriptor'] : '';
-
-		if ( $this->testmode ) {
-			$this->publishable_key = ! empty( $main_settings['test_publishable_key'] ) ? $main_settings['test_publishable_key'] : '';
-			$this->secret_key      = ! empty( $main_settings['test_secret_key'] ) ? $main_settings['test_secret_key'] : '';
+		$main_settings              = get_option('woocommerce_stripe_settings');
+		$this->title                = $this->get_option('title');
+		$this->description          = $this->get_option('description');
+		$this->enabled              = $this->get_option('enabled');
+		$this->testmode             = ( ! empty($main_settings['testmode']) && 'yes' === $main_settings['testmode']) ? true : false;
+		$this->saved_cards          = ( ! empty($main_settings['saved_cards']) && 'yes' === $main_settings['saved_cards']) ? true : false;
+		$this->publishable_key      = ! empty($main_settings['publishable_key']) ? $main_settings['publishable_key'] : '';
+		$this->secret_key           = ! empty($main_settings['secret_key']) ? $main_settings['secret_key'] : '';
+		$this->statement_descriptor = ! empty($main_settings['statement_descriptor']) ? $main_settings['statement_descriptor'] : '';
+
+		if ($this->testmode) {
+			$this->publishable_key = ! empty($main_settings['test_publishable_key']) ? $main_settings['test_publishable_key'] : '';
+			$this->secret_key      = ! empty($main_settings['test_secret_key']) ? $main_settings['test_secret_key'] : '';
 		}
 
-		add_action( 'woocommerce_update_options_payment_gateways_' . $this->id, array( $this, 'process_admin_options' ) );
-		add_action( 'wp_enqueue_scripts', array( $this, 'payment_scripts' ) );
-		add_action( 'woocommerce_thankyou_stripe_multibanco', array( $this, 'thankyou_page' ) );
+		add_action('woocommerce_update_options_payment_gateways_' . $this->id, array($this, 'process_admin_options'));
+		add_action('wp_enqueue_scripts', array($this, 'payment_scripts'));
+		add_action('woocommerce_thankyou_stripe_multibanco', array($this, 'thankyou_page'));
 
 		// Customer Emails
-		add_action( 'woocommerce_email_before_order_table', array( $this, 'email_instructions' ), 10, 3 );
+		add_action('woocommerce_email_before_order_table', array($this, 'email_instructions'), 10, 3);
 	}
 
 	/**
@@ -102,9 +102,9 @@ 
 	 * @return array
 	 */
 	public function get_supported_currency() {
-		return apply_filters( 'wc_stripe_multibanco_supported_currencies', array(
+		return apply_filters('wc_stripe_multibanco_supported_currencies', array(
 			'EUR',
-		) );
+		));
 	}
 
 	/**
@@ -115,7 +115,7 @@ 
 	 * @return bool
 	 */
 	public function is_available() {
-		if ( ! in_array( get_woocommerce_currency(), $this->get_supported_currency() ) ) {
+		if ( ! in_array(get_woocommerce_currency(), $this->get_supported_currency())) {
 			return false;
 		}
 
@@ -136,7 +136,7 @@ 
 
 		$icons_str .= $icons['multibanco'];
 
-		return apply_filters( 'woocommerce_gateway_icon', $icons_str, $this->id );
+		return apply_filters('woocommerce_gateway_icon', $icons_str, $this->id);
 	}
 
 	/**
@@ -147,19 +147,19 @@ 
 	 * @access public
 	 */
 	public function payment_scripts() {
-		if ( ! is_cart() && ! is_checkout() && ! isset( $_GET['pay_for_order'] ) && ! is_add_payment_method_page() ) {
+		if ( ! is_cart() && ! is_checkout() && ! isset($_GET['pay_for_order']) && ! is_add_payment_method_page()) {
 			return;
 		}
 
-		wp_enqueue_style( 'stripe_styles' );
-		wp_enqueue_script( 'woocommerce_stripe' );
+		wp_enqueue_style('stripe_styles');
+		wp_enqueue_script('woocommerce_stripe');
 	}
 
 	/**
 	 * Initialize Gateway Settings Form Fields.
 	 */
 	public function init_form_fields() {
-		$this->form_fields = require( WC_STRIPE_PLUGIN_PATH . '/includes/admin/stripe-multibanco-settings.php' );
+		$this->form_fields = require(WC_STRIPE_PLUGIN_PATH . '/includes/admin/stripe-multibanco-settings.php');
 	}
 
 	/**
@@ -171,25 +171,25 @@ 
 		$description = $this->get_description();
 
 		// If paying from order, we need to get total from order not cart.
-		if ( isset( $_GET['pay_for_order'] ) && ! empty( $_GET['key'] ) ) {
-			$order = wc_get_order( wc_get_order_id_by_order_key( wc_clean( $_GET['key'] ) ) );
+		if (isset($_GET['pay_for_order']) && ! empty($_GET['key'])) {
+			$order = wc_get_order(wc_get_order_id_by_order_key(wc_clean($_GET['key'])));
 			$total = $order->get_total();
 		}
 
-		if ( is_add_payment_method_page() ) {
-			$pay_button_text = __( 'Add Payment', 'woocommerce-gateway-stripe' );
-			$total        = '';
+		if (is_add_payment_method_page()) {
+			$pay_button_text = __('Add Payment', 'woocommerce-gateway-stripe');
+			$total = '';
 		} else {
 			$pay_button_text = '';
 		}
 
 		echo '<div
 			id="stripe-multibanco-payment-data"
-			data-amount="' . esc_attr( WC_Stripe_Helper::get_stripe_amount( $total ) ) . '"
-			data-currency="' . esc_attr( strtolower( get_woocommerce_currency() ) ) . '">';
+			data-amount="' . esc_attr(WC_Stripe_Helper::get_stripe_amount($total)) . '"
+			data-currency="' . esc_attr(strtolower(get_woocommerce_currency())) . '">';
 
-		if ( $description ) {
-			echo apply_filters( 'wc_stripe_description', wpautop( wp_kses_post( $description ) ), $this->id );
+		if ($description) {
+			echo apply_filters('wc_stripe_description', wpautop(wp_kses_post($description)), $this->id);
 		}
 
 		echo '</div>';
@@ -200,8 +200,8 @@ 
 	 *
 	 * @param int $order_id
 	 */
-	public function thankyou_page( $order_id ) {
-		$this->get_instructions( $order_id );
+	public function thankyou_page($order_id) {
+		$this->get_instructions($order_id);
 	}
 
 	/**
@@ -213,15 +213,15 @@ 
 	 * @param bool $sent_to_admin
 	 * @param bool $plain_text
 	 */
-	public function email_instructions( $order, $sent_to_admin, $plain_text = false ) {
+	public function email_instructions($order, $sent_to_admin, $plain_text = false) {
 		$order_id = WC_Stripe_Helper::is_pre_30() ? $order->id : $order->get_id();
 
 		$payment_method = WC_Stripe_Helper::is_pre_30() ? $order->payment_method : $order->get_payment_method();
 
-		if ( ! $sent_to_admin && 'stripe_multibanco' === $payment_method && $order->has_status( 'on-hold' ) ) {
-			WC_Stripe_Logger::log( 'Sending multibanco email for order #' . $order_id );
+		if ( ! $sent_to_admin && 'stripe_multibanco' === $payment_method && $order->has_status('on-hold')) {
+			WC_Stripe_Logger::log('Sending multibanco email for order #' . $order_id);
 
-			$this->get_instructions( $order_id, $plain_text );
+			$this->get_instructions($order_id, $plain_text);
 		}
 	}
 
@@ -232,34 +232,34 @@ 
 	 * @version 4.1.0
 	 * @param int $order_id
 	 */
-	public function get_instructions( $order_id, $plain_text = false ) {
-		$data = get_post_meta( $order_id, '_stripe_multibanco', true );
+	public function get_instructions($order_id, $plain_text = false) {
+		$data = get_post_meta($order_id, '_stripe_multibanco', true);
 
-		if ( $plain_text ) {
-			esc_html_e( 'MULTIBANCO INFORMAÇÕES DE ENCOMENDA:', 'woocommerce-gateway-stripe' ) . "\n\n";
+		if ($plain_text) {
+			esc_html_e('MULTIBANCO INFORMAÇÕES DE ENCOMENDA:', 'woocommerce-gateway-stripe') . "\n\n";
 			echo "=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=\n\n";
-			esc_html_e( 'Montante:', 'woocommerce-gateway-stripe' ) . "\n\n";
+			esc_html_e('Montante:', 'woocommerce-gateway-stripe') . "\n\n";
 			echo $data['amount'] . "\n\n";
 			echo "=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=\n\n";
-			esc_html_e( 'Entidade:', 'woocommerce-gateway-stripe' ) . "\n\n";
+			esc_html_e('Entidade:', 'woocommerce-gateway-stripe') . "\n\n";
 			echo $data['entity'] . "\n\n";
 			echo "=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=\n\n";
-			esc_html_e( 'Referencia:', 'woocommerce-gateway-stripe' ) . "\n\n";
+			esc_html_e('Referencia:', 'woocommerce-gateway-stripe') . "\n\n";
 			echo $data['reference'] . "\n\n";
 		} else {
 			?>
-			<h3><?php esc_html_e( 'MULTIBANCO INFORMAÇÕES DE ENCOMENDA:', 'woocommerce-gateway-stripe' ); ?></h3>
+			<h3><?php esc_html_e('MULTIBANCO INFORMAÇÕES DE ENCOMENDA:', 'woocommerce-gateway-stripe'); ?></h3>
 			<ul class="woocommerce-order-overview woocommerce-thankyou-order-details order_details">
 			<li class="woocommerce-order-overview__order order">
-				<?php esc_html_e( 'Montante:', 'woocommerce-gateway-stripe' ); ?>
+				<?php esc_html_e('Montante:', 'woocommerce-gateway-stripe'); ?>
 				<strong><?php echo $data['amount']; ?></strong>
 			</li>
 			<li class="woocommerce-order-overview__order order">
-				<?php esc_html_e( 'Entidade:', 'woocommerce-gateway-stripe' ); ?>
+				<?php esc_html_e('Entidade:', 'woocommerce-gateway-stripe'); ?>
 				<strong><?php echo $data['entity']; ?></strong>
 			</li>
 			<li class="woocommerce-order-overview__order order">
-				<?php esc_html_e( 'Referencia:', 'woocommerce-gateway-stripe' ); ?>
+				<?php esc_html_e('Referencia:', 'woocommerce-gateway-stripe'); ?>
 				<strong><?php echo $data['reference']; ?></strong>
 			</li>
 			</ul>
@@ -275,7 +275,7 @@ 
 	 * @param object $order
 	 * @param object $source_object
 	 */
-	public function save_instructions( $order, $source_object ) {
+	public function save_instructions($order, $source_object) {
 		$data = array(
 			'amount'    => $order->get_formatted_order_total(),
 			'entity'    => $source_object->multibanco->entity,
@@ -284,7 +284,7 @@ 
 
 		$order_id = WC_Stripe_Helper::is_pre_30() ? $order->id : $order->get_id();
 
-		update_post_meta( $order_id, '_stripe_multibanco', $data );
+		update_post_meta($order_id, '_stripe_multibanco', $data);
 	}
 
 	/**
@@ -295,24 +295,24 @@ 
 	 * @param object $order
 	 * @return mixed
 	 */
-	public function create_source( $order ) {
+	public function create_source($order) {
 		$currency              = WC_Stripe_Helper::is_pre_30() ? $order->get_order_currency() : $order->get_currency();
 		$order_id              = WC_Stripe_Helper::is_pre_30() ? $order->id : $order->get_id();
-		$return_url            = $this->get_stripe_return_url( $order );
+		$return_url            = $this->get_stripe_return_url($order);
 		$post_data             = array();
-		$post_data['amount']   = WC_Stripe_Helper::get_stripe_amount( $order->get_total(), $currency );
-		$post_data['currency'] = strtolower( $currency );
+		$post_data['amount']   = WC_Stripe_Helper::get_stripe_amount($order->get_total(), $currency);
+		$post_data['currency'] = strtolower($currency);
 		$post_data['type']     = 'multibanco';
-		$post_data['owner']    = $this->get_owner_details( $order );
-		$post_data['redirect'] = array( 'return_url' => $return_url );
+		$post_data['owner']    = $this->get_owner_details($order);
+		$post_data['redirect'] = array('return_url' => $return_url);
 
-		if ( ! empty( $this->statement_descriptor ) ) {
-			$post_data['statement_descriptor'] = WC_Stripe_Helper::clean_statement_descriptor( $this->statement_descriptor );
+		if ( ! empty($this->statement_descriptor)) {
+			$post_data['statement_descriptor'] = WC_Stripe_Helper::clean_statement_descriptor($this->statement_descriptor);
 		}
 
-		WC_Stripe_Logger::log( 'Info: Begin creating Multibanco source' );
+		WC_Stripe_Logger::log('Info: Begin creating Multibanco source');
 
-		return WC_Stripe_API::request( $post_data, 'sources' );
+		return WC_Stripe_API::request($post_data, 'sources');
 	}
 
 	/**
@@ -326,62 +326,62 @@ 
 	 *
 	 * @return array|void
 	 */
-	public function process_payment( $order_id, $retry = true, $force_save_source = false ) {
+	public function process_payment($order_id, $retry = true, $force_save_source = false) {
 		try {
-			$order = wc_get_order( $order_id );
+			$order = wc_get_order($order_id);
 
 			// This will throw exception if not valid.
-			$this->validate_minimum_order_amount( $order );
+			$this->validate_minimum_order_amount($order);
 
 			// This comes from the create account checkbox in the checkout page.
-			$create_account = ! empty( $_POST['createaccount'] ) ? true : false;
+			$create_account = ! empty($_POST['createaccount']) ? true : false;
 
-			if ( $create_account ) {
+			if ($create_account) {
 				$new_customer_id     = WC_Stripe_Helper::is_pre_30() ? $order->customer_user : $order->get_customer_id();
-				$new_stripe_customer = new WC_Stripe_Customer( $new_customer_id );
+				$new_stripe_customer = new WC_Stripe_Customer($new_customer_id);
 				$new_stripe_customer->create_customer();
 			}
 
-			$response = $this->create_source( $order );
+			$response = $this->create_source($order);
 
-			if ( ! empty( $response->error ) ) {
-				$order->add_order_note( $response->error->message );
+			if ( ! empty($response->error)) {
+				$order->add_order_note($response->error->message);
 
-				throw new Exception( $response->error->message );
+				throw new Exception($response->error->message);
 			}
 
-			if ( WC_Stripe_Helper::is_pre_30() ) {
-				update_post_meta( $order_id, '_stripe_source_id', $response->id );
+			if (WC_Stripe_Helper::is_pre_30()) {
+				update_post_meta($order_id, '_stripe_source_id', $response->id);
 			} else {
-				$order->update_meta_data( '_stripe_source_id', $response->id );
+				$order->update_meta_data('_stripe_source_id', $response->id);
 				$order->save();
 			}
 
-			$this->save_instructions( $order, $response );
+			$this->save_instructions($order, $response);
 
 			// Mark as on-hold (we're awaiting the payment)
-			$order->update_status( 'on-hold', __( 'Awaiting Multibanco payment', 'woocommerce-gateway-stripe' ) );
+			$order->update_status('on-hold', __('Awaiting Multibanco payment', 'woocommerce-gateway-stripe'));
 
 			// Reduce stock levels
-			wc_reduce_stock_levels( $order_id );
+			wc_reduce_stock_levels($order_id);
 
 			// Remove cart
 			WC()->cart->empty_cart();
 
-			WC_Stripe_Logger::log( 'Info: Redirecting to Multibanco...' );
+			WC_Stripe_Logger::log('Info: Redirecting to Multibanco...');
 
 			return array(
 				'result'   => 'success',
-				'redirect' => esc_url_raw( $response->redirect->url ),
+				'redirect' => esc_url_raw($response->redirect->url),
 			);
-		} catch ( Exception $e ) {
-			wc_add_notice( $e->getMessage(), 'error' );
-			WC_Stripe_Logger::log( 'Error: ' . $e->getMessage() );
+		} catch (Exception $e) {
+			wc_add_notice($e->getMessage(), 'error');
+			WC_Stripe_Logger::log('Error: ' . $e->getMessage());
 
-			do_action( 'wc_gateway_stripe_process_payment_error', $e, $order );
+			do_action('wc_gateway_stripe_process_payment_error', $e, $order);
 
-			if ( $order->has_status( array( 'pending', 'failed' ) ) ) {
-				$this->send_failed_order_email( $order_id );
+			if ($order->has_status(array('pending', 'failed'))) {
+				$this->send_failed_order_email($order_id);
 			}
 
 			return array(

includes/admin/stripe-settings.php

Spacing +63 added lines, -63 removed lines

@@ -1,181 +1,181 @@
 <?php
-if ( ! defined( 'ABSPATH' ) ) {
+if ( ! defined('ABSPATH')) {
 	exit;
 }
 
-return apply_filters( 'wc_stripe_settings',
+return apply_filters('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'        => 'password',
-			'description' => __( 'Get your API keys from your stripe account.', 'woocommerce-gateway-stripe' ),
+			'description' => __('Get your API keys from your stripe account.', '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.', 'woocommerce-gateway-stripe' ),
+			'description' => __('Get your API keys from 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'        => 'password',
-			'description' => __( 'Get your API keys from your stripe account.', 'woocommerce-gateway-stripe' ),
+			'description' => __('Get your API keys from your stripe account.', '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.', 'woocommerce-gateway-stripe' ),
+			'description' => __('Get your API keys from 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' => __( 'This may be up to 22 characters. The statement description must contain at least one letter, may not include ><"\' characters, and will appear on your customer\'s statement in capital letters.', 'woocommerce-gateway-stripe' ),
+			'description' => __('This may be up to 22 characters. The statement description must contain at least one letter, may not include ><"\' characters, and 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,
 		),
 		'three_d_secure' => array(
-			'title'       => __( '3D Secure', 'woocommerce-gateway-stripe' ),
-			'label'       => __( 'Require 3D Secure when applicable', 'woocommerce-gateway-stripe' ),
+			'title'       => __('3D Secure', 'woocommerce-gateway-stripe'),
+			'label'       => __('Require 3D Secure when applicable', 'woocommerce-gateway-stripe'),
 			'type'        => 'checkbox',
-			'description' => __( 'Some payment methods have 3D Secure feature. This is an extra security layer for your store. Choose how to handle payments when 3D Secure is recommended. Enabling would require customers to use 3D Secure when recommended.', 'woocommerce-gateway-stripe' ),
+			'description' => __('Some payment methods have 3D Secure feature. This is an extra security layer for your store. Choose how to handle payments when 3D Secure is recommended. Enabling would require customers to use 3D Secure when recommended.', 'woocommerce-gateway-stripe'),
 			'default'     => 'yes',
 			'desc_tip'    => true,
 		),
 		'stripe_checkout' => array(
-			'title'       => __( 'Stripe Modal Checkout', 'woocommerce-gateway-stripe' ),
-			'label'       => __( 'Enable Stripe Checkout', 'woocommerce-gateway-stripe' ),
+			'title'       => __('Stripe Modal Checkout', 'woocommerce-gateway-stripe'),
+			'label'       => __('Enable Stripe Checkout', 'woocommerce-gateway-stripe'),
 			'type'        => 'checkbox',
-			'description' => __( 'If enabled, this option shows a "pay" button and modal credit card form on the checkout, instead of credit card fields directly on the page. We recommend you leave this disabled and use the embedded form as that is the preferred method.', 'woocommerce-gateway-stripe' ),
+			'description' => __('If enabled, this option shows a "pay" button and modal credit card form on the checkout, instead of credit card fields directly on the page. We recommend you leave this disabled and use the embedded form as that is the preferred method.', 'woocommerce-gateway-stripe'),
 			'default'     => 'no',
 			'desc_tip'    => true,
 		),
 		'stripe_checkout_image' => array(
-			'title'       => __( 'Stripe Checkout Image', 'woocommerce-gateway-stripe' ),
-			'description' => __( 'Optionally enter the URL to a 128x128px image of your brand or product. e.g. <code>https://yoursite.com/wp-content/uploads/2013/09/yourimage.jpg</code>', 'woocommerce-gateway-stripe' ),
+			'title'       => __('Stripe Checkout Image', 'woocommerce-gateway-stripe'),
+			'description' => __('Optionally enter the URL to a 128x128px image of your brand or product. e.g. <code>https://yoursite.com/wp-content/uploads/2013/09/yourimage.jpg</code>', 'woocommerce-gateway-stripe'),
 			'type'        => 'text',
 			'default'     => '',
 			'desc_tip'    => true,
 		),
 		'stripe_checkout_description' => array(
-			'title'       => __( 'Stripe Checkout Description', 'woocommerce-gateway-stripe' ),
+			'title'       => __('Stripe Checkout Description', 'woocommerce-gateway-stripe'),
 			'type'        => 'text',
-			'description' => __( 'Shows a description of your store on Stripe Modal Checkout.', 'woocommerce-gateway-stripe' ),
+			'description' => __('Shows a description of your store on Stripe Modal Checkout.', 'woocommerce-gateway-stripe'),
 			'default'     => '',
 			'desc_tip'    => true,
 		),
 		'payment_request' => array(
-			'title'       => __( 'Payment Request Buttons', 'woocommerce-gateway-stripe' ),
+			'title'       => __('Payment Request Buttons', 'woocommerce-gateway-stripe'),
 			/* translators: 1) br tag 2) opening anchor tag 3) closing anchor tag */
-			'label'       => sprintf( __( 'Enable Payment Request Buttons. (Apple Pay/Chrome Payment Request API) %1$sBy using Apple Pay, you agree to %2$s and %3$s\'s terms of service.', '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>' ),
+			'label'       => sprintf(__('Enable Payment Request Buttons. (Apple Pay/Chrome Payment Request API) %1$sBy using Apple Pay, you agree to %2$s and %3$s\'s terms of service.', '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>'),
 			'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' ),
+				'default' => __('Default', 'woocommerce-gateway-stripe'),
+				'buy'     => __('Buy', 'woocommerce-gateway-stripe'),
+				'donate'  => __('Donate', '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,
 		),
 		'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'     => 'no',
 			'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,
 		),

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

Spacing +63 added lines, -63 removed lines

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

tests/phpunit/bootstrap.php

Spacing +14 added lines, -14 removed lines

@@ -1,34 +1,34 @@
 <?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 $plugin_dir . 'woocommerce-gateway-stripe/woocommerce-gateway-stripe.php';
 }
 
-if ( ! function_exists( 'wc_stripe_is_wc_active' ) ) {
+if ( ! function_exists('wc_stripe_is_wc_active')) {
 	function wc_stripe_is_wc_active() {
 		return true;
 	}
 }
 
-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' );
-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' );
+$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');

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

Spacing +90 added lines, -90 removed lines

@@ -1,5 +1,5 @@ 
 <?php
-if ( ! defined( 'ABSPATH' ) ) {
+if ( ! defined('ABSPATH')) {
 	exit;
 }
 
@@ -23,11 +23,11 @@ 
 
 		$this->retry_interval = 1;
 
-		add_action( 'wp', array( $this, 'maybe_process_redirect_order' ) );
-		add_action( 'woocommerce_order_status_on-hold_to_processing', array( $this, 'capture_payment' ) );
-		add_action( 'woocommerce_order_status_on-hold_to_completed', array( $this, 'capture_payment' ) );
-		add_action( 'woocommerce_order_status_on-hold_to_cancelled', array( $this, 'cancel_payment' ) );
-		add_action( 'woocommerce_order_status_on-hold_to_refunded', array( $this, 'cancel_payment' ) );
+		add_action('wp', array($this, 'maybe_process_redirect_order'));
+		add_action('woocommerce_order_status_on-hold_to_processing', array($this, 'capture_payment'));
+		add_action('woocommerce_order_status_on-hold_to_completed', array($this, 'capture_payment'));
+		add_action('woocommerce_order_status_on-hold_to_cancelled', array($this, 'cancel_payment'));
+		add_action('woocommerce_order_status_on-hold_to_refunded', array($this, 'cancel_payment'));
 	}
 
 	/**
@@ -48,25 +48,25 @@ 
 	 * @since 4.0.0
 	 * @version 4.0.0
 	 */
-	public function process_redirect_payment( $order_id, $retry = true ) {
+	public function process_redirect_payment($order_id, $retry = true) {
 		try {
-			$source = wc_clean( $_GET['source'] );
+			$source = wc_clean($_GET['source']);
 
-			if ( empty( $source ) ) {
+			if (empty($source)) {
 				return;
 			}
 
-			if ( empty( $order_id ) ) {
+			if (empty($order_id)) {
 				return;
 			}
 
-			$order = wc_get_order( $order_id );
+			$order = wc_get_order($order_id);
 
-			if ( ! is_object( $order ) ) {
+			if ( ! is_object($order)) {
 				return;
 			}
 
-			if ( 'processing' === $order->get_status() || 'completed' === $order->get_status() || 'on-hold' === $order->get_status() ) {
+			if ('processing' === $order->get_status() || 'completed' === $order->get_status() || 'on-hold' === $order->get_status()) {
 				return;
 			}
 
@@ -74,123 +74,123 @@ 
 			$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;
 
 			/* If we're doing a retry and source is chargeable, we need to pass
 			 * a different idempotency key and retry for success.
 			 */
-			if ( 1 < $this->retry_interval && 'chargeable' === $source_info->status ) {
-				add_filter( 'wc_stripe_idempotency_key', array( $this, 'change_idempotency_key' ), 10, 2 );
+			if (1 < $this->retry_interval && 'chargeable' === $source_info->status) {
+				add_filter('wc_stripe_idempotency_key', array($this, 'change_idempotency_key'), 10, 2);
 			}
 
 			// Make the request.
-			$response = WC_Stripe_API::request( $this->generate_payment_request( $order, $source_object ), 'charges', 'POST', true );
+			$response = WC_Stripe_API::request($this->generate_payment_request($order, $source_object), 'charges', 'POST', true);
 			$headers  = $response['headers'];
 			$response = $response['body'];
 
-			if ( ! empty( $response->error ) ) {
+			if ( ! empty($response->error)) {
 				// Customer param wrong? The user may have been deleted on stripe's end. Remove customer_id. Can be retried without.
-				if ( $this->is_no_such_customer_error( $response->error ) ) {
-					if ( WC_Stripe_Helper::is_pre_30() ) {
-						delete_user_meta( $order->customer_user, '_stripe_customer_id' );
-						delete_post_meta( $order_id, '_stripe_customer_id' );
+				if ($this->is_no_such_customer_error($response->error)) {
+					if (WC_Stripe_Helper::is_pre_30()) {
+						delete_user_meta($order->customer_user, '_stripe_customer_id');
+						delete_post_meta($order_id, '_stripe_customer_id');
 					} else {
-						delete_user_meta( $order->get_customer_id(), '_stripe_customer_id' );
-						$order->delete_meta_data( '_stripe_customer_id' );
+						delete_user_meta($order->get_customer_id(), '_stripe_customer_id');
+						$order->delete_meta_data('_stripe_customer_id');
 						$order->save();
 					}
 				}
 
-				if ( $this->is_no_such_token_error( $response->error ) && $prepared_source->token_id ) {
+				if ($this->is_no_such_token_error($response->error) && $prepared_source->token_id) {
 					// Source param wrong? The CARD may have been deleted on stripe's end. Remove token and show message.
-					$wc_token = WC_Payment_Tokens::get( $prepared_source->token_id );
+					$wc_token = WC_Payment_Tokens::get($prepared_source->token_id);
 					$wc_token->delete();
-					$localized_message = __( 'This card is no longer available and has been removed.', 'woocommerce-gateway-stripe' );
-					$order->add_order_note( $localized_message );
-					throw new WC_Stripe_Exception( print_r( $response, true ), $localized_message );
+					$localized_message = __('This card is no longer available and has been removed.', 'woocommerce-gateway-stripe');
+					$order->add_order_note($localized_message);
+					throw new WC_Stripe_Exception(print_r($response, true), $localized_message);
 				}
 
 				// We want to retry.
-				if ( $this->is_retryable_error( $response->error ) ) {
-					if ( $retry ) {
+				if ($this->is_retryable_error($response->error)) {
+					if ($retry) {
 						// Don't do anymore retries after this.
-						if ( 5 <= $this->retry_interval ) {
-							return $this->process_redirect_payment( $order_id, false );
+						if (5 <= $this->retry_interval) {
+							return $this->process_redirect_payment($order_id, false);
 						}
 
-						sleep( $this->retry_interval );
+						sleep($this->retry_interval);
 
 						$this->retry_interval++;
-						return $this->process_redirect_payment( $order_id, true );
+						return $this->process_redirect_payment($order_id, true);
 					} else {
-						$localized_message = __( 'Sorry, we are unable to process your payment at this time. Please retry later.', 'woocommerce-gateway-stripe' );
-						$order->add_order_note( $localized_message );
-						throw new WC_Stripe_Exception( print_r( $response, true ), $localized_message );
+						$localized_message = __('Sorry, we are unable to process your payment at this time. Please retry later.', 'woocommerce-gateway-stripe');
+						$order->add_order_note($localized_message);
+						throw new WC_Stripe_Exception(print_r($response, true), $localized_message);
 					}
 				}
 
 				$localized_messages = WC_Stripe_Helper::get_localized_messages();
 
-				if ( 'card_error' === $response->error->type ) {
-					$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,52 +218,52 @@ 
 	 * @version 4.0.0
 	 * @param  int $order_id
 	 */
-	public function capture_payment( $order_id ) {
-		$order = wc_get_order( $order_id );
+	public function capture_payment($order_id) {
+		$order = wc_get_order($order_id);
 
-		if ( 'stripe' === ( WC_Stripe_Helper::is_pre_30() ? $order->payment_method : $order->get_payment_method() ) ) {
-			$charge   = WC_Stripe_Helper::is_pre_30() ? get_post_meta( $order_id, '_transaction_id', true ) : $order->get_transaction_id();
-			$captured = WC_Stripe_Helper::is_pre_30() ? get_post_meta( $order_id, '_stripe_charge_captured', true ) : $order->get_meta( '_stripe_charge_captured', true );
+		if ('stripe' === (WC_Stripe_Helper::is_pre_30() ? $order->payment_method : $order->get_payment_method())) {
+			$charge   = WC_Stripe_Helper::is_pre_30() ? get_post_meta($order_id, '_transaction_id', true) : $order->get_transaction_id();
+			$captured = WC_Stripe_Helper::is_pre_30() ? get_post_meta($order_id, '_stripe_charge_captured', true) : $order->get_meta('_stripe_charge_captured', true);
 
-			if ( $charge && 'no' === $captured ) {
+			if ($charge && 'no' === $captured) {
 				$order_total = $order->get_total();
 
-				if ( 0 < $order->get_total_refunded() ) {
+				if (0 < $order->get_total_refunded()) {
 					$order_total = $order_total - $order->get_total_refunded();
 				}
 
-				$result = WC_Stripe_API::request( array(
-					'amount'   => WC_Stripe_Helper::get_stripe_amount( $order_total ),
+				$result = WC_Stripe_API::request(array(
+					'amount'   => WC_Stripe_Helper::get_stripe_amount($order_total),
 					'expand[]' => 'balance_transaction',
-				), 'charges/' . $charge . '/capture' );
+				), 'charges/' . $charge . '/capture');
 
-				if ( ! empty( $result->error ) ) {
+				if ( ! empty($result->error)) {
 					/* translators: error message */
-					$order->update_status( 'failed', sprintf( __( 'Unable to capture charge! %s', 'woocommerce-gateway-stripe' ), $result->error->message ) );
+					$order->update_status('failed', sprintf(__('Unable to capture charge! %s', 'woocommerce-gateway-stripe'), $result->error->message));
 				} else {
 					/* translators: transaction id */
-					$order->add_order_note( sprintf( __( 'Stripe charge complete (Charge ID: %s)', 'woocommerce-gateway-stripe' ), $result->id ) );
-					WC_Stripe_Helper::is_pre_30() ? update_post_meta( $order_id, '_stripe_charge_captured', 'yes' ) : $order->update_meta_data( '_stripe_charge_captured', 'yes' );
+					$order->add_order_note(sprintf(__('Stripe charge complete (Charge ID: %s)', 'woocommerce-gateway-stripe'), $result->id));
+					WC_Stripe_Helper::is_pre_30() ? update_post_meta($order_id, '_stripe_charge_captured', 'yes') : $order->update_meta_data('_stripe_charge_captured', 'yes');
 
 					// Store other data such as fees
-					WC_Stripe_Helper::is_pre_30() ? update_post_meta( $order_id, '_transaction_id', $result->id ) : $order->set_transaction_id( $result->id );
+					WC_Stripe_Helper::is_pre_30() ? update_post_meta($order_id, '_transaction_id', $result->id) : $order->set_transaction_id($result->id);
 
-					if ( isset( $result->balance_transaction ) && isset( $result->balance_transaction->fee ) ) {
+					if (isset($result->balance_transaction) && isset($result->balance_transaction->fee)) {
 						// Fees and Net needs to both come from Stripe to be accurate as the returned
 						// values are in the local currency of the Stripe account, not from WC.
-						$fee = ! empty( $result->balance_transaction->fee ) ? WC_Stripe_Helper::format_balance_fee( $result->balance_transaction, 'fee' ) : 0;
-						$net = ! empty( $result->balance_transaction->net ) ? WC_Stripe_Helper::format_balance_fee( $result->balance_transaction, 'net' ) : 0;
-						WC_Stripe_Helper::update_stripe_fee( $order, $fee );
-						WC_Stripe_Helper::update_stripe_net( $order, $net );
+						$fee = ! empty($result->balance_transaction->fee) ? WC_Stripe_Helper::format_balance_fee($result->balance_transaction, 'fee') : 0;
+						$net = ! empty($result->balance_transaction->net) ? WC_Stripe_Helper::format_balance_fee($result->balance_transaction, 'net') : 0;
+						WC_Stripe_Helper::update_stripe_fee($order, $fee);
+						WC_Stripe_Helper::update_stripe_net($order, $net);
 					}
 
-					if ( is_callable( array( $order, 'save' ) ) ) {
+					if (is_callable(array($order, 'save'))) {
 						$order->save();
 					}
 				}
 
 				// This hook fires when admin manually changes order status to processing or completed.
-				do_action( 'woocommerce_stripe_process_manual_capture', $order, $result );
+				do_action('woocommerce_stripe_process_manual_capture', $order, $result);
 			}
 		}
 	}
@@ -275,14 +275,14 @@ 
 	 * @version 4.0.0
 	 * @param  int $order_id
 	 */
-	public function cancel_payment( $order_id ) {
-		$order = wc_get_order( $order_id );
+	public function cancel_payment($order_id) {
+		$order = wc_get_order($order_id);
 
-		if ( 'stripe' === ( WC_Stripe_Helper::is_pre_30() ? $order->payment_method : $order->get_payment_method() ) ) {
-			$this->process_refund( $order_id );
+		if ('stripe' === (WC_Stripe_Helper::is_pre_30() ? $order->payment_method : $order->get_payment_method())) {
+			$this->process_refund($order_id);
 
 			// This hook fires when admin manually changes order status to cancel.
-			do_action( 'woocommerce_stripe_process_manual_cancel', $order );
+			do_action('woocommerce_stripe_process_manual_cancel', $order);
 		}
 	}
 }