woocommerce / woocommerce-gateway-stripe

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

Spacing +92 added lines, -92 removed lines

@@ -1,5 +1,5 @@ 
 <?php
-if ( ! defined( 'ABSPATH' ) ) {
+if ( ! defined('ABSPATH')) {
 	exit;
 }
 
@@ -72,9 +72,9 @@ 
 	public function __construct() {
 		$this->retry_interval = 1;
 		$this->id             = 'stripe_sepa';
-		$this->method_title   = __( 'Stripe SEPA Direct Debit', 'woocommerce-gateway-stripe' );
+		$this->method_title   = __('Stripe SEPA Direct Debit', '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->has_fields         = true;
 		$this->supports           = array(
 			'products',
@@ -100,28 +100,28 @@ 
 		// 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'));
 
-		if ( WC_Stripe_Helper::is_pre_orders_exists() ) {
+		if (WC_Stripe_Helper::is_pre_orders_exists()) {
 			$this->pre_orders = new WC_Stripe_Pre_Orders_Compat();
 
-			add_action( 'wc_pre_orders_process_pre_order_completion_payment_' . $this->id, array( $this->pre_orders, 'process_pre_order_release_payment' ) );
+			add_action('wc_pre_orders_process_pre_order_completion_payment_' . $this->id, array($this->pre_orders, 'process_pre_order_release_payment'));
 		}
 	}
 
@@ -149,11 +149,11 @@ 
 	 * @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;
 		}
 
-		if ( is_add_payment_method_page() && ! $this->saved_cards ) {
+		if (is_add_payment_method_page() && ! $this->saved_cards) {
 			return false;
 		}
 
@@ -172,9 +172,9 @@ 
 
 		$icons_str = '';
 
-		$icons_str .= isset( $icons['sepa'] ) ? $icons['sepa'] : '';
+		$icons_str .= isset($icons['sepa']) ? $icons['sepa'] : '';
 
-		return apply_filters( 'woocommerce_gateway_icon', $icons_str, $this->id );
+		return apply_filters('woocommerce_gateway_icon', $icons_str, $this->id);
 	}
 
 	/**
@@ -185,19 +185,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-sepa-settings.php' );
+		$this->form_fields = require(WC_STRIPE_PLUGIN_PATH . '/includes/admin/stripe-sepa-settings.php');
 	}
 
 	/**
@@ -209,7 +209,7 @@ 
 	 */
 	public function mandate_display() {
 		/* translators: statement descriptor */
-		printf( __( 'By providing your IBAN and confirming this payment, you are authorizing %s and Stripe, our payment service provider, to send instructions to your bank to debit your account and your bank to debit your account in accordance with those instructions. You are entitled to a refund from your bank under the terms and conditions of your agreement with your bank. A refund must be claimed within 8 weeks starting from the date on which your account was debited.', 'woocommerce-gateway-stripe' ), WC_Stripe_Helper::clean_statement_descriptor( $this->statement_descriptor ) );
+		printf(__('By providing your IBAN and confirming this payment, you are authorizing %s and Stripe, our payment service provider, to send instructions to your bank to debit your account and your bank to debit your account in accordance with those instructions. You are entitled to a refund from your bank under the terms and conditions of your agreement with your bank. A refund must be claimed within 8 weeks starting from the date on which your account was debited.', 'woocommerce-gateway-stripe'), WC_Stripe_Helper::clean_statement_descriptor($this->statement_descriptor));
 	}
 
 	/**
@@ -220,12 +220,12 @@ 
 	 */
 	public function form() {
 		?>
-		<fieldset id="wc-<?php echo esc_attr( $this->id ); ?>-form" class="wc-payment-form">
-			<?php do_action( 'woocommerce_credit_card_form_start', $this->id ); ?>
+		<fieldset id="wc-<?php echo esc_attr($this->id); ?>-form" class="wc-payment-form">
+			<?php do_action('woocommerce_credit_card_form_start', $this->id); ?>
 			<p class="wc-stripe-sepa-mandate" style="margin-bottom:40px;"><?php $this->mandate_display(); ?></p>
 			<p class="form-row form-row-wide">
 				<label for="stripe-iban-element">
-					<?php esc_html_e( 'IBAN.', 'woocommerce-gateway-stripe' ); ?> <span class="required">*</span>
+					<?php esc_html_e('IBAN.', 'woocommerce-gateway-stripe'); ?> <span class="required">*</span>
 				</label>
 				<div id="stripe-iban-element" class="wc-stripe-iban-element-field">
 					<!-- A Stripe Element will be inserted here. -->
@@ -235,7 +235,7 @@ 
 			<!-- Used to display form errors -->
 			<div class="stripe-source-errors" role="alert"></div>
 			<br />
-			<?php do_action( 'woocommerce_credit_card_form_end', $this->id ); ?>
+			<?php do_action('woocommerce_credit_card_form_end', $this->id); ?>
 			<div class="clear"></div>
 		</fieldset>
 		<?php
@@ -247,45 +247,45 @@ 
 	public function payment_fields() {
 		global $wp;
 		$total                = WC()->cart->total;
-		$display_tokenization = $this->supports( 'tokenization' ) && is_checkout() && $this->saved_cards;
+		$display_tokenization = $this->supports('tokenization') && is_checkout() && $this->saved_cards;
 		$description          = $this->get_description();
-		$description          = ! empty( $description ) ? $description : '';
+		$description          = ! empty($description) ? $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_clean( $wp->query_vars['order-pay'] ) );
+		if (isset($_GET['pay_for_order']) && ! empty($_GET['key'])) {
+			$order = wc_get_order(wc_clean($wp->query_vars['order-pay']));
 			$total = $order->get_total();
 		}
 
-		if ( is_add_payment_method_page() ) {
+		if (is_add_payment_method_page()) {
 			$total = '';
 		}
 
 		echo '<div
 			id="stripe-sepa_debit-payment-data"
-			data-amount="' . esc_attr( WC_Stripe_Helper::get_stripe_amount( $total ) ) . '"
-			data-currency="' . esc_attr( strtolower( get_woocommerce_currency() ) ) . '">';
+			data-amount="' . esc_attr(WC_Stripe_Helper::get_stripe_amount($total)) . '"
+			data-currency="' . esc_attr(strtolower(get_woocommerce_currency())) . '">';
 
-		if ( $this->testmode ) {
-			$description .= ' ' . __( 'TEST MODE ENABLED. In test mode, you can use IBAN number DE89370400440532013000.', 'woocommerce-gateway-stripe' );
+		if ($this->testmode) {
+			$description .= ' ' . __('TEST MODE ENABLED. In test mode, you can use IBAN number DE89370400440532013000.', 'woocommerce-gateway-stripe');
 		}
 
-		$description = trim( $description );
+		$description = trim($description);
 
-		echo apply_filters( 'wc_stripe_description', wpautop( wp_kses_post( $description ) ), $this->id );
+		echo apply_filters('wc_stripe_description', wpautop(wp_kses_post($description)), $this->id);
 
-		if ( $display_tokenization ) {
+		if ($display_tokenization) {
 			$this->tokenization_script();
 			$this->saved_payment_methods();
 		}
 
 		$this->form();
 
-		if ( apply_filters( 'wc_stripe_display_save_payment_method_checkbox', $display_tokenization ) && ! is_add_payment_method_page() && ! isset( $_GET['change_payment_method'] ) ) {
+		if (apply_filters('wc_stripe_display_save_payment_method_checkbox', $display_tokenization) && ! is_add_payment_method_page() && ! isset($_GET['change_payment_method'])) {
 			$this->save_payment_method_checkbox();
 		}
 
-		do_action( 'wc_stripe_sepa_payment_fields', $this->id );
+		do_action('wc_stripe_sepa_payment_fields', $this->id);
 
 		echo '</div>';
 	}
@@ -301,94 +301,94 @@ 
 	 *
 	 * @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);
 
-			if ( $this->maybe_process_pre_orders( $order_id ) ) {
-				return $this->pre_orders->process_pre_order( $order_id );
+			if ($this->maybe_process_pre_orders($order_id)) {
+				return $this->pre_orders->process_pre_order($order_id);
 			}
 
 			// This comes from the create account checkbox in the checkout page.
-			$create_account = ! empty( $_POST['createaccount'] ) ? true : false;
+			$create_account = ! empty($_POST['createaccount']) ? true : false;
 
-			if ( $create_account ) {
+			if ($create_account) {
 				$new_customer_id     = $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();
 			}
 
-			$prepared_source = $this->prepare_source( get_current_user_id(), $force_save_source );
+			$prepared_source = $this->prepare_source(get_current_user_id(), $force_save_source);
 
-			$this->save_source_to_order( $order, $prepared_source );
+			$this->save_source_to_order($order, $prepared_source);
 
 			// Result from Stripe API request.
 			$response = null;
 
-			if ( $order->get_total() > 0 ) {
+			if ($order->get_total() > 0) {
 				// This will throw exception if not valid.
-				$this->validate_minimum_order_amount( $order );
+				$this->validate_minimum_order_amount($order);
 
-				WC_Stripe_Logger::log( "Info: Begin processing payment for order $order_id for the amount of {$order->get_total()}" );
+				WC_Stripe_Logger::log("Info: Begin processing payment for order $order_id for the amount of {$order->get_total()}");
 
 				// Make the request.
-				$response = WC_Stripe_API::request( $this->generate_payment_request( $order, $prepared_source ) );
+				$response = WC_Stripe_API::request($this->generate_payment_request($order, $prepared_source));
 
-				if ( ! empty( $response->error ) ) {
+				if ( ! empty($response->error)) {
 					// Customer param wrong? The user may have been deleted on stripe's end. Remove customer_id. Can be retried without.
-					if ( $this->is_no_such_customer_error( $response->error ) ) {
-						delete_user_option( $order->get_customer_id(), '_stripe_customer_id' );
-						$order->delete_meta_data( '_stripe_customer_id' );
+					if ($this->is_no_such_customer_error($response->error)) {
+						delete_user_option($order->get_customer_id(), '_stripe_customer_id');
+						$order->delete_meta_data('_stripe_customer_id');
 						$order->save();
 					}
 
-					if ( $this->is_no_such_token_error( $response->error ) && $prepared_source->token_id ) {
+					if ($this->is_no_such_token_error($response->error) && $prepared_source->token_id) {
 						// Source param wrong? The CARD may have been deleted on stripe's end. Remove token and show message.
-						$wc_token = WC_Payment_Tokens::get( $prepared_source->token_id );
+						$wc_token = WC_Payment_Tokens::get($prepared_source->token_id);
 						$wc_token->delete();
-						$localized_message = __( 'This card is no longer available and has been removed.', 'woocommerce-gateway-stripe' );
-						$order->add_order_note( $localized_message );
-						throw new WC_Stripe_Exception( print_r( $response, true ), $localized_message );
+						$localized_message = __('This card is no longer available and has been removed.', 'woocommerce-gateway-stripe');
+						$order->add_order_note($localized_message);
+						throw new WC_Stripe_Exception(print_r($response, true), $localized_message);
 					}
 
 					// We want to retry.
-					if ( $this->is_retryable_error( $response->error ) ) {
-						if ( $retry ) {
+					if ($this->is_retryable_error($response->error)) {
+						if ($retry) {
 							// Don't do anymore retries after this.
-							if ( 5 <= $this->retry_interval ) {
+							if (5 <= $this->retry_interval) {
 
-								return $this->process_payment( $order_id, false, $force_save_source );
+								return $this->process_payment($order_id, false, $force_save_source);
 							}
 
-							sleep( $this->retry_interval );
+							sleep($this->retry_interval);
 
 							$this->retry_interval++;
 
-							return $this->process_payment( $order_id, true, $force_save_source );
+							return $this->process_payment($order_id, true, $force_save_source);
 						} else {
-							$localized_message = __( 'Sorry, we are unable to process your payment at this time. Please retry later.', 'woocommerce-gateway-stripe' );
-							$order->add_order_note( $localized_message );
-							throw new WC_Stripe_Exception( print_r( $response, true ), $localized_message );
+							$localized_message = __('Sorry, we are unable to process your payment at this time. Please retry later.', 'woocommerce-gateway-stripe');
+							$order->add_order_note($localized_message);
+							throw new WC_Stripe_Exception(print_r($response, true), $localized_message);
 						}
 					}
 
 					$localized_messages = WC_Stripe_Helper::get_localized_messages();
 
-					if ( 'card_error' === $response->error->type ) {
-						$localized_message = isset( $localized_messages[ $response->error->code ] ) ? $localized_messages[ $response->error->code ] : $response->error->message;
+					if ('card_error' === $response->error->type) {
+						$localized_message = isset($localized_messages[$response->error->code]) ? $localized_messages[$response->error->code] : $response->error->message;
 					} else {
-						$localized_message = isset( $localized_messages[ $response->error->type ] ) ? $localized_messages[ $response->error->type ] : $response->error->message;
+						$localized_message = isset($localized_messages[$response->error->type]) ? $localized_messages[$response->error->type] : $response->error->message;
 					}
 
-					$order->add_order_note( $localized_message );
+					$order->add_order_note($localized_message);
 
-					throw new WC_Stripe_Exception( print_r( $response, true ), $localized_message );
+					throw new WC_Stripe_Exception(print_r($response, true), $localized_message);
 				}
 
-				do_action( 'wc_gateway_stripe_process_payment', $response, $order );
+				do_action('wc_gateway_stripe_process_payment', $response, $order);
 
 				// Process valid response.
-				$this->process_response( $response, $order );
+				$this->process_response($response, $order);
 			} else {
 				$order->payment_complete();
 			}
@@ -399,17 +399,17 @@ 
 			// Return thank you page redirect.
 			return array(
 				'result'   => 'success',
-				'redirect' => $this->get_return_url( $order ),
+				'redirect' => $this->get_return_url($order),
 			);
 
-		} catch ( WC_Stripe_Exception $e ) {
-			wc_add_notice( $e->getLocalizedMessage(), 'error' );
-			WC_Stripe_Logger::log( 'Error: ' . $e->getMessage() );
+		} catch (WC_Stripe_Exception $e) {
+			wc_add_notice($e->getLocalizedMessage(), 'error');
+			WC_Stripe_Logger::log('Error: ' . $e->getMessage());
 
-			do_action( 'wc_gateway_stripe_process_payment_error', $e, $order );
+			do_action('wc_gateway_stripe_process_payment_error', $e, $order);
 
-			if ( $order->has_status( array( 'pending', 'failed' ) ) ) {
-				$this->send_failed_order_email( $order_id );
+			if ($order->has_status(array('pending', 'failed'))) {
+				$this->send_failed_order_email($order_id);
 			}
 
 			return array(

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

Spacing +65 added lines, -65 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'));
 	}
 
 	/**
@@ -114,7 +114,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;
 		}
 
@@ -133,9 +133,9 @@ 
 
 		$icons_str = '';
 
-		$icons_str .= isset( $icons['sofort'] ) ? $icons['sofort'] : '';
+		$icons_str .= isset($icons['sofort']) ? $icons['sofort'] : '';
 
-		return apply_filters( 'woocommerce_gateway_icon', $icons_str, $this->id );
+		return apply_filters('woocommerce_gateway_icon', $icons_str, $this->id);
 	}
 
 	/**
@@ -146,19 +146,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');
 	}
 
 	/**
@@ -171,13 +171,13 @@ 
 		$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_clean( $wp->query_vars['order-pay'] ) );
+		if (isset($_GET['pay_for_order']) && ! empty($_GET['key'])) {
+			$order = wc_get_order(wc_clean($wp->query_vars['order-pay']));
 			$total = $order->get_total();
 		}
 
-		if ( is_add_payment_method_page() ) {
-			$pay_button_text = __( 'Add Payment', 'woocommerce-gateway-stripe' );
+		if (is_add_payment_method_page()) {
+			$pay_button_text = __('Add Payment', 'woocommerce-gateway-stripe');
 			$total           = '';
 		} else {
 			$pay_button_text = '';
@@ -185,11 +185,11 @@ 
 
 		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>';
@@ -203,28 +203,28 @@ 
 	 * @param object $order
 	 * @return mixed
 	 */
-	public function create_source( $order ) {
+	public function create_source($order) {
 		$currency              = $order->get_currency();
 		$bank_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');
 	}
 
 	/**
@@ -238,55 +238,55 @@ 
 	 *
 	 * @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     = $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);
 			}
 
-			$order->update_meta_data( '_stripe_source_id', $response->id );
+			$order->update_meta_data('_stripe_source_id', $response->id);
 			$order->save();
 
-			WC_Stripe_Logger::log( 'Info: Redirecting to SOFORT...' );
+			WC_Stripe_Logger::log('Info: Redirecting to SOFORT...');
 
 			return array(
 				'result'   => 'success',
-				'redirect' => esc_url_raw( $response->redirect->url ),
+				'redirect' => esc_url_raw($response->redirect->url),
 			);
-		} catch ( WC_Stripe_Exception $e ) {
-			wc_add_notice( $e->getLocalizedMessage(), 'error' );
-			WC_Stripe_Logger::log( 'Error: ' . $e->getMessage() );
+		} catch (WC_Stripe_Exception $e) {
+			wc_add_notice($e->getLocalizedMessage(), 'error');
+			WC_Stripe_Logger::log('Error: ' . $e->getMessage());
 
-			do_action( 'wc_gateway_stripe_process_payment_error', $e, $order );
+			do_action('wc_gateway_stripe_process_payment_error', $e, $order);
 
-			if ( $order->has_status( array( 'pending', 'failed' ) ) ) {
-				$this->send_failed_order_email( $order_id );
+			if ($order->has_status(array('pending', 'failed'))) {
+				$this->send_failed_order_email($order_id);
 			}
 
 			return array(

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

Spacing +63 added lines, -63 removed lines

@@ -1,5 +1,5 @@ 
 <?php
-if ( ! defined( 'ABSPATH' ) ) {
+if ( ! defined('ABSPATH')) {
 	exit;
 }
 
@@ -57,9 +57,9 @@ 
 	 */
 	public function __construct() {
 		$this->id           = 'stripe_bancontact';
-		$this->method_title = __( 'Stripe Bancontact', 'woocommerce-gateway-stripe' );
+		$this->method_title = __('Stripe Bancontact', 'woocommerce-gateway-stripe');
 		/* translators: link */
-		$this->method_description = sprintf( __( 'All other general Stripe settings can be adjusted <a href="%s">here</a>.', 'woocommerce-gateway-stripe' ), admin_url( 'admin.php?page=wc-settings&tab=checkout&section=stripe' ) );
+		$this->method_description = sprintf(__('All other general Stripe settings can be adjusted <a href="%s">here</a>.', 'woocommerce-gateway-stripe'), admin_url('admin.php?page=wc-settings&tab=checkout&section=stripe'));
 		$this->supports           = array(
 			'products',
 			'refunds',
@@ -71,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'));
 	}
 
 	/**
@@ -114,7 +114,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;
 		}
 
@@ -133,9 +133,9 @@ 
 
 		$icons_str = '';
 
-		$icons_str .= isset( $icons['bancontact'] ) ? $icons['bancontact'] : '';
+		$icons_str .= isset($icons['bancontact']) ? $icons['bancontact'] : '';
 
-		return apply_filters( 'woocommerce_gateway_icon', $icons_str, $this->id );
+		return apply_filters('woocommerce_gateway_icon', $icons_str, $this->id);
 	}
 
 	/**
@@ -146,19 +146,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-bancontact-settings.php' );
+		$this->form_fields = require(WC_STRIPE_PLUGIN_PATH . '/includes/admin/stripe-bancontact-settings.php');
 	}
 
 	/**
@@ -171,13 +171,13 @@ 
 		$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_clean( $wp->query_vars['order-pay'] ) );
+		if (isset($_GET['pay_for_order']) && ! empty($_GET['key'])) {
+			$order = wc_get_order(wc_clean($wp->query_vars['order-pay']));
 			$total = $order->get_total();
 		}
 
-		if ( is_add_payment_method_page() ) {
-			$pay_button_text = __( 'Add Payment', 'woocommerce-gateway-stripe' );
+		if (is_add_payment_method_page()) {
+			$pay_button_text = __('Add Payment', 'woocommerce-gateway-stripe');
 			$total           = '';
 		} else {
 			$pay_button_text = '';
@@ -185,11 +185,11 @@ 
 
 		echo '<div
 			id="stripe-bancontact-payment-data"
-			data-amount="' . esc_attr( WC_Stripe_Helper::get_stripe_amount( $total ) ) . '"
-			data-currency="' . esc_attr( strtolower( get_woocommerce_currency() ) ) . '">';
+			data-amount="' . esc_attr(WC_Stripe_Helper::get_stripe_amount($total)) . '"
+			data-currency="' . esc_attr(strtolower(get_woocommerce_currency())) . '">';
 
-		if ( $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>';
@@ -203,24 +203,24 @@ 
 	 * @param object $order
 	 * @return mixed
 	 */
-	public function create_source( $order ) {
+	public function create_source($order) {
 		$currency                = $order->get_currency();
-		$return_url              = $this->get_stripe_return_url( $order );
+		$return_url              = $this->get_stripe_return_url($order);
 		$post_data               = array();
-		$post_data['amount']     = WC_Stripe_Helper::get_stripe_amount( $order->get_total(), $currency );
-		$post_data['currency']   = strtolower( $currency );
+		$post_data['amount']     = WC_Stripe_Helper::get_stripe_amount($order->get_total(), $currency);
+		$post_data['currency']   = strtolower($currency);
 		$post_data['type']       = 'bancontact';
-		$post_data['owner']      = $this->get_owner_details( $order );
-		$post_data['redirect']   = array( 'return_url' => $return_url );
-		$post_data['bancontact'] = array( 'preferred_language' => $this->get_locale() );
+		$post_data['owner']      = $this->get_owner_details($order);
+		$post_data['redirect']   = array('return_url' => $return_url);
+		$post_data['bancontact'] = array('preferred_language' => $this->get_locale());
 
-		if ( ! empty( $this->statement_descriptor ) ) {
-			$post_data['statement_descriptor'] = WC_Stripe_Helper::clean_statement_descriptor( $this->statement_descriptor );
+		if ( ! empty($this->statement_descriptor)) {
+			$post_data['statement_descriptor'] = WC_Stripe_Helper::clean_statement_descriptor($this->statement_descriptor);
 		}
 
-		WC_Stripe_Logger::log( 'Info: Begin creating Bancontact source' );
+		WC_Stripe_Logger::log('Info: Begin creating Bancontact source');
 
-		return WC_Stripe_API::request( apply_filters( 'wc_stripe_bancontact_source', $post_data, $order ), 'sources' );
+		return WC_Stripe_API::request(apply_filters('wc_stripe_bancontact_source', $post_data, $order), 'sources');
 	}
 
 	/**
@@ -234,47 +234,47 @@ 
 	 *
 	 * @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     = $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);
 			}
 
-			$order->update_meta_data( '_stripe_source_id', $response->id );
+			$order->update_meta_data('_stripe_source_id', $response->id);
 			$order->save();
 
-			WC_Stripe_Logger::log( 'Info: Redirecting to Bancontact...' );
+			WC_Stripe_Logger::log('Info: Redirecting to Bancontact...');
 
 			return array(
 				'result'   => 'success',
-				'redirect' => esc_url_raw( $response->redirect->url ),
+				'redirect' => esc_url_raw($response->redirect->url),
 			);
-		} catch ( WC_Stripe_Exception $e ) {
-			wc_add_notice( $e->getLocalizedMessage(), 'error' );
-			WC_Stripe_Logger::log( 'Error: ' . $e->getMessage() );
+		} catch (WC_Stripe_Exception $e) {
+			wc_add_notice($e->getLocalizedMessage(), 'error');
+			WC_Stripe_Logger::log('Error: ' . $e->getMessage());
 
-			do_action( 'wc_gateway_stripe_process_payment_error', $e, $order );
+			do_action('wc_gateway_stripe_process_payment_error', $e, $order);
 
-			if ( $order->has_status( array( 'pending', 'failed' ) ) ) {
-				$this->send_failed_order_email( $order_id );
+			if ($order->has_status(array('pending', 'failed'))) {
+				$this->send_failed_order_email($order_id);
 			}
 
 			return array(

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

Spacing +60 added lines, -60 removed lines

@@ -1,5 +1,5 @@ 
 <?php
-if ( ! defined( 'ABSPATH' ) ) {
+if ( ! defined('ABSPATH')) {
 	exit;
 }
 
@@ -57,9 +57,9 @@ 
 	 */
 	public function __construct() {
 		$this->id           = 'stripe_p24';
-		$this->method_title = __( 'Stripe P24', 'woocommerce-gateway-stripe' );
+		$this->method_title = __('Stripe P24', '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'));
 	}
 
 	/**
@@ -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;
 		}
 
@@ -134,9 +134,9 @@ 
 
 		$icons_str = '';
 
-		$icons_str .= isset( $icons['p24'] ) ? $icons['p24'] : '';
+		$icons_str .= isset($icons['p24']) ? $icons['p24'] : '';
 
-		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-p24-settings.php' );
+		$this->form_fields = require(WC_STRIPE_PLUGIN_PATH . '/includes/admin/stripe-p24-settings.php');
 	}
 
 	/**
@@ -172,13 +172,13 @@ 
 		$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_clean( $wp->query_vars['order-pay'] ) );
+		if (isset($_GET['pay_for_order']) && ! empty($_GET['key'])) {
+			$order = wc_get_order(wc_clean($wp->query_vars['order-pay']));
 			$total = $order->get_total();
 		}
 
-		if ( is_add_payment_method_page() ) {
-			$pay_button_text = __( 'Add Payment', 'woocommerce-gateway-stripe' );
+		if (is_add_payment_method_page()) {
+			$pay_button_text = __('Add Payment', 'woocommerce-gateway-stripe');
 			$total           = '';
 		} else {
 			$pay_button_text = '';
@@ -186,11 +186,11 @@ 
 
 		echo '<div
 			id="stripe-p24-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>';
@@ -204,19 +204,19 @@ 
 	 * @param object $order
 	 * @return mixed
 	 */
-	public function create_source( $order ) {
+	public function create_source($order) {
 		$currency              = $order->get_currency();
-		$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']     = 'p24';
-		$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);
 
-		WC_Stripe_Logger::log( 'Info: Begin creating P24 source' );
+		WC_Stripe_Logger::log('Info: Begin creating P24 source');
 
-		return WC_Stripe_API::request( apply_filters( 'wc_stripe_p24_source', $post_data, $order ), 'sources' );
+		return WC_Stripe_API::request(apply_filters('wc_stripe_p24_source', $post_data, $order), 'sources');
 	}
 
 	/**
@@ -230,47 +230,47 @@ 
 	 *
 	 * @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     = $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);
 			}
 
-			$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 P24...' );
+			WC_Stripe_Logger::log('Info: Redirecting to P24...');
 
 			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-giropay.php

Spacing +62 added lines, -62 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'));
 	}
 
 	/**
@@ -114,7 +114,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;
 		}
 
@@ -133,9 +133,9 @@ 
 
 		$icons_str = '';
 
-		$icons_str .= isset( $icons['giropay'] ) ? $icons['giropay'] : '';
+		$icons_str .= isset($icons['giropay']) ? $icons['giropay'] : '';
 
-		return apply_filters( 'woocommerce_gateway_icon', $icons_str, $this->id );
+		return apply_filters('woocommerce_gateway_icon', $icons_str, $this->id);
 	}
 
 	/**
@@ -146,19 +146,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');
 	}
 
 	/**
@@ -171,13 +171,13 @@ 
 		$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_clean( $wp->query_vars['order-pay'] ) );
+		if (isset($_GET['pay_for_order']) && ! empty($_GET['key'])) {
+			$order = wc_get_order(wc_clean($wp->query_vars['order-pay']));
 			$total = $order->get_total();
 		}
 
-		if ( is_add_payment_method_page() ) {
-			$pay_button_text = __( 'Add Payment', 'woocommerce-gateway-stripe' );
+		if (is_add_payment_method_page()) {
+			$pay_button_text = __('Add Payment', 'woocommerce-gateway-stripe');
 			$total           = '';
 		} else {
 			$pay_button_text = '';
@@ -185,11 +185,11 @@ 
 
 		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>';
@@ -203,23 +203,23 @@ 
 	 * @param object $order
 	 * @return mixed
 	 */
-	public function create_source( $order ) {
+	public function create_source($order) {
 		$currency              = $order->get_currency();
-		$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');
 	}
 
 	/**
@@ -233,47 +233,47 @@ 
 	 *
 	 * @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     = $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);
 			}
 
-			$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-eps.php

Spacing +62 added lines, -62 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'));
 	}
 
 	/**
@@ -114,7 +114,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;
 		}
 
@@ -133,9 +133,9 @@ 
 
 		$icons_str = '';
 
-		$icons_str .= isset( $icons['eps'] ) ? $icons['eps'] : '';
+		$icons_str .= isset($icons['eps']) ? $icons['eps'] : '';
 
-		return apply_filters( 'woocommerce_gateway_icon', $icons_str, $this->id );
+		return apply_filters('woocommerce_gateway_icon', $icons_str, $this->id);
 	}
 
 	/**
@@ -146,19 +146,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');
 	}
 
 	/**
@@ -171,13 +171,13 @@ 
 		$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_clean( $wp->query_vars['order-pay'] ) );
+		if (isset($_GET['pay_for_order']) && ! empty($_GET['key'])) {
+			$order = wc_get_order(wc_clean($wp->query_vars['order-pay']));
 			$total = $order->get_total();
 		}
 
-		if ( is_add_payment_method_page() ) {
-			$pay_button_text = __( 'Add Payment', 'woocommerce-gateway-stripe' );
+		if (is_add_payment_method_page()) {
+			$pay_button_text = __('Add Payment', 'woocommerce-gateway-stripe');
 			$total           = '';
 		} else {
 			$pay_button_text = '';
@@ -185,11 +185,11 @@ 
 
 		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>';
@@ -203,23 +203,23 @@ 
 	 * @param object $order
 	 * @return mixed
 	 */
-	public function create_source( $order ) {
+	public function create_source($order) {
 		$currency              = $order->get_currency();
-		$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');
 	}
 
 	/**
@@ -233,47 +233,47 @@ 
 	 *
 	 * @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     = $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);
 			}
 
-			$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-multibanco.php

Spacing +86 added lines, -86 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);
 	}
 
 	/**
@@ -118,7 +118,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;
 		}
 
@@ -137,9 +137,9 @@ 
 
 		$icons_str = '';
 
-		$icons_str .= isset( $icons['multibanco'] ) ? $icons['multibanco'] : '';
+		$icons_str .= isset($icons['multibanco']) ? $icons['multibanco'] : '';
 
-		return apply_filters( 'woocommerce_gateway_icon', $icons_str, $this->id );
+		return apply_filters('woocommerce_gateway_icon', $icons_str, $this->id);
 	}
 
 	/**
@@ -150,19 +150,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');
 	}
 
 	/**
@@ -175,13 +175,13 @@ 
 		$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_clean( $wp->query_vars['order-pay'] ) );
+		if (isset($_GET['pay_for_order']) && ! empty($_GET['key'])) {
+			$order = wc_get_order(wc_clean($wp->query_vars['order-pay']));
 			$total = $order->get_total();
 		}
 
-		if ( is_add_payment_method_page() ) {
-			$pay_button_text = __( 'Add Payment', 'woocommerce-gateway-stripe' );
+		if (is_add_payment_method_page()) {
+			$pay_button_text = __('Add Payment', 'woocommerce-gateway-stripe');
 			$total           = '';
 		} else {
 			$pay_button_text = '';
@@ -189,11 +189,11 @@ 
 
 		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>';
@@ -204,8 +204,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);
 	}
 
 	/**
@@ -217,15 +217,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 = $order->get_id();
 
 		$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);
 		}
 	}
 
@@ -236,34 +236,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>
@@ -279,7 +279,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,
@@ -288,7 +288,7 @@ 
 
 		$order_id = $order->get_id();
 
-		update_post_meta( $order_id, '_stripe_multibanco', $data );
+		update_post_meta($order_id, '_stripe_multibanco', $data);
 	}
 
 	/**
@@ -299,23 +299,23 @@ 
 	 * @param object $order
 	 * @return mixed
 	 */
-	public function create_source( $order ) {
+	public function create_source($order) {
 		$currency              = $order->get_currency();
-		$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');
 	}
 
 	/**
@@ -329,58 +329,58 @@ 
 	 *
 	 * @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     = $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);
 			}
 
-			$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/class-wc-stripe-logger.php

Spacing +13 added lines, -13 removed lines

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

tests/phpunit/test-wc-stripe-sub-renewal.php

Spacing +66 added lines, -66 removed lines

@@ -34,17 +34,17 @@ 
 	public function setUp() {
 		parent::setUp();
 
-		$this->wc_stripe_subs_compat = $this->getMockBuilder( 'WC_Stripe_Subs_Compat' )
+		$this->wc_stripe_subs_compat = $this->getMockBuilder('WC_Stripe_Subs_Compat')
 			->disableOriginalConstructor()
-			->setMethods( array( 'prepare_order_source', 'has_subscription', 'ensure_subscription_has_customer_id' ) )
+			->setMethods(array('prepare_order_source', 'has_subscription', 'ensure_subscription_has_customer_id'))
 			->getMock();
 
 		// Mocked in order to get metadata[payment_type] = recurring in the HTTP request.
 		$this->wc_stripe_subs_compat
-			->expects( $this->any() )
-			->method( 'has_subscription' )
+			->expects($this->any())
+			->method('has_subscription')
 			->will(
-				$this->returnValue( true )
+				$this->returnValue(true)
 			);
 
 		$this->statement_descriptor = 'This is a statement descriptor.';
@@ -62,7 +62,7 @@ 
 	public function tearDown() {
 		parent::tearDown();
 
-		delete_option( 'woocommerce_stripe_settings' );
+		delete_option('woocommerce_stripe_settings');
 	}
 
 	/**
@@ -79,22 +79,22 @@ 
 		// Arrange: Some variables we'll use later.
 		$renewal_order                 = WC_Helper_Order::create_order();
 		$amount                        = 20; // WC Subs sends an amount to be used, instead of using the order amount.
-		$stripe_amount                 = WC_Stripe_Helper::get_stripe_amount( $amount );
-		$currency                      = strtolower( $renewal_order->get_currency() );
+		$stripe_amount                 = WC_Stripe_Helper::get_stripe_amount($amount);
+		$currency                      = strtolower($renewal_order->get_currency());
 		$customer                      = 'cus_123abc';
 		$source                        = 'src_123abc';
-		$statement_descriptor          = WC_Stripe_Helper::clean_statement_descriptor( $this->statement_descriptor );
+		$statement_descriptor          = WC_Stripe_Helper::clean_statement_descriptor($this->statement_descriptor);
 		$should_retry                  = false;
 		$previous_error                = false;
 		$payments_intents_api_endpoint = 'https://api.stripe.com/v1/payment_intents';
 		$urls_used                     = array();
 
-		$renewal_order->set_payment_method( 'stripe' );
+		$renewal_order->set_payment_method('stripe');
 
 		// Arrange: Mock prepare_order_source() so that we have a customer and source.
 		$this->wc_stripe_subs_compat
-			->expects( $this->any() )
-			->method( 'prepare_order_source' )
+			->expects($this->any())
+			->method('prepare_order_source')
 			->will(
 				$this->returnValue(
 					(object) array(
@@ -108,7 +108,7 @@ 
 
 		// Arrange: Add filter that will return a mocked HTTP response for the payment_intent call.
 		// Note: There are assertions in the callback function.
-		$pre_http_request_response_callback = function( $preempt, $request_args, $url ) use (
+		$pre_http_request_response_callback = function($preempt, $request_args, $url) use (
 			$renewal_order,
 			$stripe_amount,
 			$currency,
@@ -119,35 +119,35 @@ 
 			&$urls_used
 		) {
 			// Add all urls to array so we can later make assertions about which endpoints were used.
-			array_push( $urls_used, $url );
+			array_push($urls_used, $url);
 
 			// Continue without mocking the request if it's not the endpoint we care about.
-			if ( $payments_intents_api_endpoint !== $url ) {
+			if ($payments_intents_api_endpoint !== $url) {
 				return false;
 			}
 
 			// Assert: the request method is POST.
-			$this->assertArrayHasKey( 'method', $request_args );
-			$this->assertSame( 'POST', $request_args['method'] );
+			$this->assertArrayHasKey('method', $request_args);
+			$this->assertSame('POST', $request_args['method']);
 
 			// Assert: the request has a body.
-			$this->assertArrayHasKey( 'body', $request_args );
+			$this->assertArrayHasKey('body', $request_args);
 
 			// Assert: the request body contains these values.
 			$expected_request_body_values = array(
 				'source'               => $source,
 				'amount'               => $stripe_amount,
 				'currency'             => $currency,
-				'payment_method_types' => array( 'card' ),
+				'payment_method_types' => array('card'),
 				'customer'             => $customer,
 				'off_session'          => 'true',
 				'confirm'              => 'true',
 				'confirmation_method'  => 'automatic',
 				'statement_descriptor' => $statement_descriptor,
 			);
-			foreach ( $expected_request_body_values as $key => $value ) {
-				$this->assertArrayHasKey( $key, $request_args['body'] );
-				$this->assertSame( $value, $request_args['body'][ $key ] );
+			foreach ($expected_request_body_values as $key => $value) {
+				$this->assertArrayHasKey($key, $request_args['body']);
+				$this->assertSame($value, $request_args['body'][$key]);
 			}
 
 			// Assert: the request body contains these keys, without checking for their value.
@@ -155,8 +155,8 @@ 
 				'description',
 				'metadata',
 			);
-			foreach ( $expected_request_body_keys as $key ) {
-				$this->assertArrayHasKey( $key, $request_args['body'] );
+			foreach ($expected_request_body_keys as $key) {
+				$this->assertArrayHasKey($key, $request_args['body']);
 			}
 
 			// Assert: the body metadata has these values.
@@ -165,9 +165,9 @@ 
 				'order_id'     => $order_id,
 				'payment_type' => 'recurring',
 			);
-			foreach ( $expected_metadata_values as $key => $value ) {
-				$this->assertArrayHasKey( $key, $request_args['body']['metadata'] );
-				$this->assertSame( $value, $request_args['body']['metadata'][ $key ] );
+			foreach ($expected_metadata_values as $key => $value) {
+				$this->assertArrayHasKey($key, $request_args['body']['metadata']);
+				$this->assertSame($value, $request_args['body']['metadata'][$key]);
 			}
 
 			// Assert: the body metadata has these keys, without checking for their value.
@@ -176,8 +176,8 @@ 
 				'customer_email',
 				'site_url',
 			);
-			foreach ( $expected_metadata_keys as $key ) {
-				$this->assertArrayHasKey( $key, $request_args['body']['metadata'] );
+			foreach ($expected_metadata_keys as $key) {
+				$this->assertArrayHasKey($key, $request_args['body']['metadata']);
 			}
 
 			// Assert: the request body does not contains these keys.
@@ -186,15 +186,15 @@ 
 				'capture_method', // The default ('automatic') is what we want in this case, so we leave it off.
 				'expand[]',
 			);
-			foreach ( $expected_missing_request_body_keys as $key ) {
-				$this->assertArrayNotHasKey( $key, $request_args['body'] );
+			foreach ($expected_missing_request_body_keys as $key) {
+				$this->assertArrayNotHasKey($key, $request_args['body']);
 			}
 
 			// Arrange: return dummy content as the response.
 			return array(
 				'headers'  => array(),
 				// Too bad we aren't dynamically setting things 'cus_123abc' when using this file.
-				'body'     => file_get_contents( 'tests/phpunit/dummy-data/subscription_renewal_response_success.json' ),
+				'body'     => file_get_contents('tests/phpunit/dummy-data/subscription_renewal_response_success.json'),
 				'response' => array(
 					'code'    => 200,
 					'message' => 'OK',
@@ -204,48 +204,48 @@ 
 			);
 		};
 
-		add_filter( 'pre_http_request', $pre_http_request_response_callback, 10, 3 );
+		add_filter('pre_http_request', $pre_http_request_response_callback, 10, 3);
 
 		// Arrange: Make sure to check that an action we care about was called
 		// by hooking into it.
 		$mock_action_process_payment = new MockAction();
 		add_action(
 			'wc_gateway_stripe_process_payment',
-			[ &$mock_action_process_payment, 'action' ]
+			[&$mock_action_process_payment, 'action']
 		);
 
 		// Act: call process_subscription_payment().
 		// We need to use `wc_stripe_subs_compat` here because we mocked this class earlier.
-		$result = $this->wc_stripe_subs_compat->process_subscription_payment( 20, $renewal_order, $should_retry, $previous_error );
+		$result = $this->wc_stripe_subs_compat->process_subscription_payment(20, $renewal_order, $should_retry, $previous_error);
 
 		// Assert: nothing was returned.
-		$this->assertEquals( $result, null );
+		$this->assertEquals($result, null);
 
 		// Assert that we saved the payment intent to the order.
 		$order_id   = $renewal_order->get_id();
-		$order      = wc_get_order( $order_id );
-		$order_data = $order->get_meta( '_stripe_intent_id'	);
+		$order      = wc_get_order($order_id);
+		$order_data = $order->get_meta('_stripe_intent_id');
 
-		$this->assertEquals( $order_data, 'pi_123abc' );
+		$this->assertEquals($order_data, 'pi_123abc');
 
 		// Transaction ID was saved to order.
 		$order_transaction_id = $order->get_transaction_id();
-		$this->assertEquals( $order_transaction_id, 'ch_123abc' );
+		$this->assertEquals($order_transaction_id, 'ch_123abc');
 
 		// Assert: the order was marked as processing (this is done in process_response()).
-		$this->assertEquals( $order->get_status(), 'processing' );
+		$this->assertEquals($order->get_status(), 'processing');
 
 		// Assert: called payment intents.
-		$this->assertTrue( in_array( $payments_intents_api_endpoint, $urls_used ) );
+		$this->assertTrue(in_array($payments_intents_api_endpoint, $urls_used));
 
 		// Assert: Our hook was called once.
-		$this->assertEquals( 1, $mock_action_process_payment->get_call_count() );
+		$this->assertEquals(1, $mock_action_process_payment->get_call_count());
 
 		// Assert: Only our hook was called.
-		$this->assertEquals( array( 'wc_gateway_stripe_process_payment' ), $mock_action_process_payment->get_tags() );
+		$this->assertEquals(array('wc_gateway_stripe_process_payment'), $mock_action_process_payment->get_tags());
 
 		// Clean up.
-		remove_filter( 'pre_http_request', array( $this, 'pre_http_request_response_success' ) );
+		remove_filter('pre_http_request', array($this, 'pre_http_request_response_success'));
 	}
 
 	/**
@@ -262,8 +262,8 @@ 
 		// Arrange: Some variables we'll use later.
 		$renewal_order                 = WC_Helper_Order::create_order();
 		$amount                        = 20;
-		$stripe_amount                 = WC_Stripe_Helper::get_stripe_amount( $amount );
-		$currency                      = strtolower( $renewal_order->get_currency() );
+		$stripe_amount                 = WC_Stripe_Helper::get_stripe_amount($amount);
+		$currency                      = strtolower($renewal_order->get_currency());
 		$customer                      = 'cus_123abc';
 		$source                        = 'src_123abc';
 		$should_retry                  = false;
@@ -273,8 +273,8 @@ 
 
 		// Arrange: Mock prepare_order_source() so that we have a customer and source.
 		$this->wc_stripe_subs_compat
-			->expects( $this->any() )
-			->method( 'prepare_order_source' )
+			->expects($this->any())
+			->method('prepare_order_source')
 			->will(
 				$this->returnValue(
 					(object) array(
@@ -287,7 +287,7 @@ 
 			);
 
 		// Arrange: Add filter that will return a mocked HTTP response for the payment_intent call.
-		$pre_http_request_response_callback = function( $preempt, $request_args, $url ) use (
+		$pre_http_request_response_callback = function($preempt, $request_args, $url) use (
 			$renewal_order,
 			$stripe_amount,
 			$currency,
@@ -297,10 +297,10 @@ 
 			&$urls_used
 		) {
 			// Add all urls to array so we can later make assertions about which endpoints were used.
-			array_push( $urls_used, $url );
+			array_push($urls_used, $url);
 
 			// Continue without mocking the request if it's not the endpoint we care about.
-			if ( $payments_intents_api_endpoint !== $url ) {
+			if ($payments_intents_api_endpoint !== $url) {
 				return false;
 			}
 
@@ -308,7 +308,7 @@ 
 			return array(
 				'headers'  => array(),
 				// Too bad we aren't dynamically setting things 'cus_123abc' when using this file.
-				'body'     => file_get_contents( 'tests/phpunit/dummy-data/subscription_renewal_response_authentication_required.json' ),
+				'body'     => file_get_contents('tests/phpunit/dummy-data/subscription_renewal_response_authentication_required.json'),
 				'response' => array(
 					'code'    => 402,
 					'message' => 'Payment Required',
@@ -317,48 +317,48 @@ 
 				'filename' => null,
 			);
 		};
-		add_filter( 'pre_http_request', $pre_http_request_response_callback, 10, 3 );
+		add_filter('pre_http_request', $pre_http_request_response_callback, 10, 3);
 
 		// Arrange: Make sure to check that an action we care about was called
 		// by hooking into it.
 		$mock_action_process_payment = new MockAction();
 		add_action(
 			'wc_gateway_stripe_process_payment_authentication_required',
-			[ &$mock_action_process_payment, 'action' ]
+			[&$mock_action_process_payment, 'action']
 		);
 
 		// Act: call process_subscription_payment().
 		// We need to use `wc_stripe_subs_compat` here because we mocked this class earlier.
-		$result = $this->wc_stripe_subs_compat->process_subscription_payment( 20, $renewal_order, $should_retry, $previous_error );
+		$result = $this->wc_stripe_subs_compat->process_subscription_payment(20, $renewal_order, $should_retry, $previous_error);
 
 		// Assert: nothing was returned.
-		$this->assertEquals( $result, null );
+		$this->assertEquals($result, null);
 
 		// Assert that we saved the payment intent to the order.
 		$order_id             = $renewal_order->get_id();
-		$order                = wc_get_order( $order_id );
-		$order_data           = $order->get_meta( '_stripe_intent_id' );
+		$order                = wc_get_order($order_id);
+		$order_data           = $order->get_meta('_stripe_intent_id');
 		$order_transaction_id = $order->get_transaction_id();
 
 		// Intent was saved to order even though there was an error in the response body.
-		$this->assertEquals( $order_data, 'pi_123abc' );
+		$this->assertEquals($order_data, 'pi_123abc');
 
 		// Transaction ID was saved to order.
-		$this->assertEquals( $order_transaction_id, 'ch_123abc' );
+		$this->assertEquals($order_transaction_id, 'ch_123abc');
 
 		// Assert: the order was marked as failed.
-		$this->assertEquals( $order->get_status(), 'failed' );
+		$this->assertEquals($order->get_status(), 'failed');
 
 		// Assert: called payment intents.
-		$this->assertTrue( in_array( $payments_intents_api_endpoint, $urls_used ) );
+		$this->assertTrue(in_array($payments_intents_api_endpoint, $urls_used));
 
 		// Assert: Our hook was called once.
-		$this->assertEquals( 1, $mock_action_process_payment->get_call_count() );
+		$this->assertEquals(1, $mock_action_process_payment->get_call_count());
 
 		// Assert: Only our hook was called.
-		$this->assertEquals( array( 'wc_gateway_stripe_process_payment_authentication_required' ), $mock_action_process_payment->get_tags() );
+		$this->assertEquals(array('wc_gateway_stripe_process_payment_authentication_required'), $mock_action_process_payment->get_tags());
 
 		// Clean up.
-		remove_filter( 'pre_http_request', array( $this, 'pre_http_request_response_success' ) );
+		remove_filter('pre_http_request', array($this, 'pre_http_request_response_success'));
 	}
 }