Inspection of "Add invalid email info for checkout screen." - woocommerce/woocommerce-gateway-stripe - Measure and Improve Code Quality continuously with Scrutinizer

Completed

Pull Request — master (#953)

by asdf

created 2019-08-08 07:52 UTC

Status

Spacing +9 added lines, -9 removed lines patch added patch discarded remove patch

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

Please login to merge, or discard this patch.

includes/compat/class-wc-stripe-pre-orders-compat.php 1 patch

Spacing +39 added lines, -39 removed lines patch added patch discarded remove patch

@@ -1,5 +1,5 @@  discard block
 block discarded – undo
 <?php
-if ( ! defined( 'ABSPATH' ) ) {
+if ( ! defined('ABSPATH')) {
 	exit;
 }
 
@@ -11,7 +11,7 @@  discard block
 block discarded – undo
 	public $saved_cards;
 
 	public function __construct() {
-		$this->saved_cards = WC_Stripe_Helper::get_settings( 'stripe', 'saved_cards' );
+		$this->saved_cards = WC_Stripe_Helper::get_settings('stripe', 'saved_cards');
 	}
 
 	/**
@@ -19,68 +19,68 @@  discard block
 block discarded – undo
 	 * @param  int  $order_id
 	 * @return boolean
 	 */
-	public function is_pre_order( $order_id ) {
-		return WC_Pre_Orders_Order::order_contains_pre_order( $order_id );
+	public function is_pre_order($order_id) {
+		return WC_Pre_Orders_Order::order_contains_pre_order($order_id);
 	}
 
 	/**
 	 * Remove order meta
 	 * @param object $order
 	 */
-	public function remove_order_source_before_retry( $order ) {
-		$order_id = WC_Stripe_Helper::is_wc_lt( '3.0' ) ? $order->id : $order->get_id();
-		delete_post_meta( $order_id, '_stripe_source_id' );
+	public function remove_order_source_before_retry($order) {
+		$order_id = WC_Stripe_Helper::is_wc_lt('3.0') ? $order->id : $order->get_id();
+		delete_post_meta($order_id, '_stripe_source_id');
 		// For BW compat will remove in the future.
-		delete_post_meta( $order_id, '_stripe_card_id' );
+		delete_post_meta($order_id, '_stripe_card_id');
 	}
 
 	/**
 	 * Remove order meta
 	 * @param  object $order
 	 */
-	public function remove_order_customer_before_retry( $order ) {
-		$order_id = WC_Stripe_Helper::is_wc_lt( '3.0' ) ? $order->id : $order->get_id();
-		delete_post_meta( $order_id, '_stripe_customer_id' );
+	public function remove_order_customer_before_retry($order) {
+		$order_id = WC_Stripe_Helper::is_wc_lt('3.0') ? $order->id : $order->get_id();
+		delete_post_meta($order_id, '_stripe_customer_id');
 	}
 
 	/**
 	 * Process the pre-order when pay upon release is used.
 	 * @param int $order_id
 	 */
-	public function process_pre_order( $order_id ) {
+	public function process_pre_order($order_id) {
 		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);
 
-			$prepared_source = $this->prepare_source( get_current_user_id(), true );
+			$prepared_source = $this->prepare_source(get_current_user_id(), true);
 
 			// We need a source on file to continue.
-			if ( empty( $prepared_source->customer ) || empty( $prepared_source->source ) ) {
-				throw new WC_Stripe_Exception( __( 'Unable to store payment details. Please try again.', 'woocommerce-gateway-stripe' ) );
+			if (empty($prepared_source->customer) || empty($prepared_source->source)) {
+				throw new WC_Stripe_Exception(__('Unable to store payment details. Please try again.', 'woocommerce-gateway-stripe'));
 			}
 
-			$this->save_source_to_order( $order, $prepared_source );
+			$this->save_source_to_order($order, $prepared_source);
 
 			// Remove cart
 			WC()->cart->empty_cart();
 
 			// Is pre ordered!
-			WC_Pre_Orders_Order::mark_order_as_pre_ordered( $order );
+			WC_Pre_Orders_Order::mark_order_as_pre_ordered($order);
 
 			// Return thank you page redirect
 			return array(
 				'result'   => 'success',
-				'redirect' => $this->get_return_url( $order ),
+				'redirect' => $this->get_return_url($order),
 			);
-		} catch ( WC_Stripe_Exception $e ) {
-			wc_add_notice( $e->getLocalizedMessage(), 'error' );
-			WC_Stripe_Logger::log( 'Pre Orders Error: ' . $e->getMessage() );
+		} catch (WC_Stripe_Exception $e) {
+			wc_add_notice($e->getLocalizedMessage(), 'error');
+			WC_Stripe_Logger::log('Pre Orders Error: ' . $e->getMessage());
 
 			return array(
 				'result'   => 'success',
-				'redirect' => $order->get_checkout_payment_url( true ),
+				'redirect' => $order->get_checkout_payment_url(true),
 			);
 		}
 	}
@@ -90,7 +90,7 @@  discard block
 block discarded – undo
 	 * @param WC_Order $order
 	 * @return void
 	 */
-	public function process_pre_order_release_payment( $order ) {
+	public function process_pre_order_release_payment($order) {
 		try {
 			// Define some callbacks if the first attempt fails.
 			$retry_callbacks = array(
@@ -98,33 +98,33 @@  discard block
 block discarded – undo
 				'remove_order_customer_before_retry',
 			);
 
-			while ( 1 ) {
-				$source   = $this->prepare_order_source( $order );
-				$response = WC_Stripe_API::request( $this->generate_payment_request( $order, $source ) );
+			while (1) {
+				$source   = $this->prepare_order_source($order);
+				$response = WC_Stripe_API::request($this->generate_payment_request($order, $source));
 
-				if ( ! empty( $response->error ) ) {
-					if ( 0 === sizeof( $retry_callbacks ) ) {
-						throw new Exception( $response->error->message );
+				if ( ! empty($response->error)) {
+					if (0 === sizeof($retry_callbacks)) {
+						throw new Exception($response->error->message);
 					} else {
-						$retry_callback = array_shift( $retry_callbacks );
-						call_user_func( array( $this, $retry_callback ), $order );
+						$retry_callback = array_shift($retry_callbacks);
+						call_user_func(array($this, $retry_callback), $order);
 					}
 				} else {
 					// Successful
-					$this->process_response( $response, $order );
+					$this->process_response($response, $order);
 					break;
 				}
 			}
-		} catch ( Exception $e ) {
+		} catch (Exception $e) {
 			/* translators: error message */
-			$order_note = sprintf( __( 'Stripe Transaction Failed (%s)', 'woocommerce-gateway-stripe' ), $e->getMessage() );
+			$order_note = sprintf(__('Stripe Transaction Failed (%s)', 'woocommerce-gateway-stripe'), $e->getMessage());
 
 			// Mark order as failed if not already set,
 			// otherwise, make sure we add the order note so we can detect when someone fails to check out multiple times
-			if ( ! $order->has_status( 'failed' ) ) {
-				$order->update_status( 'failed', $order_note );
+			if ( ! $order->has_status('failed')) {
+				$order->update_status('failed', $order_note);
 			} else {
-				$order->add_order_note( $order_note );
+				$order->add_order_note($order_note);
 			}
 		}
 	}

Please login to merge, or discard this patch.

includes/admin/stripe-giropay-settings.php 1 patch

Spacing +13 added lines, -13 removed lines patch added patch discarded remove patch

@@ -1,5 +1,5 @@  discard block
 block discarded – undo
 <?php
-if ( ! defined( 'ABSPATH' ) ) {
+if ( ! defined('ABSPATH')) {
 	exit;
 }
 
@@ -7,40 +7,40 @@  discard block
 block discarded – undo
 	'wc_stripe_giropay_settings',
 	array(
 		'geo_target'  => array(
-			'description' => __( 'Relevant Payer Geography: Germany', 'woocommerce-gateway-stripe' ),
+			'description' => __('Relevant Payer Geography: Germany', 'woocommerce-gateway-stripe'),
 			'type'        => 'title',
 		),
 		'guide'       => array(
-			'description' => __( '<a href="https://stripe.com/payments/payment-methods-guide#giropay" target="_blank">Payment Method Guide</a>', 'woocommerce-gateway-stripe' ),
+			'description' => __('<a href="https://stripe.com/payments/payment-methods-guide#giropay" target="_blank">Payment Method Guide</a>', 'woocommerce-gateway-stripe'),
 			'type'        => 'title',
 		),
 		'activation'  => array(
-			'description' => __( 'Must be activated from your Stripe Dashboard Settings <a href="https://dashboard.stripe.com/account/payments/settings" target="_blank">here</a>', 'woocommerce-gateway-stripe' ),
+			'description' => __('Must be activated from your Stripe Dashboard Settings <a href="https://dashboard.stripe.com/account/payments/settings" target="_blank">here</a>', 'woocommerce-gateway-stripe'),
 			'type'        => 'title',
 		),
 		'enabled'     => array(
-			'title'       => __( 'Enable/Disable', 'woocommerce-gateway-stripe' ),
-			'label'       => __( 'Enable Stripe Giropay', 'woocommerce-gateway-stripe' ),
+			'title'       => __('Enable/Disable', 'woocommerce-gateway-stripe'),
+			'label'       => __('Enable Stripe Giropay', 'woocommerce-gateway-stripe'),
 			'type'        => 'checkbox',
 			'description' => '',
 			'default'     => 'no',
 		),
 		'title'       => array(
-			'title'       => __( 'Title', 'woocommerce-gateway-stripe' ),
+			'title'       => __('Title', 'woocommerce-gateway-stripe'),
 			'type'        => 'text',
-			'description' => __( 'This controls the title which the user sees during checkout.', 'woocommerce-gateway-stripe' ),
-			'default'     => __( 'Giropay', 'woocommerce-gateway-stripe' ),
+			'description' => __('This controls the title which the user sees during checkout.', 'woocommerce-gateway-stripe'),
+			'default'     => __('Giropay', 'woocommerce-gateway-stripe'),
 			'desc_tip'    => true,
 		),
 		'description' => array(
-			'title'       => __( 'Description', 'woocommerce-gateway-stripe' ),
+			'title'       => __('Description', 'woocommerce-gateway-stripe'),
 			'type'        => 'text',
-			'description' => __( 'This controls the description which the user sees during checkout.', 'woocommerce-gateway-stripe' ),
-			'default'     => __( 'You will be redirected to Giropay.', 'woocommerce-gateway-stripe' ),
+			'description' => __('This controls the description which the user sees during checkout.', 'woocommerce-gateway-stripe'),
+			'default'     => __('You will be redirected to Giropay.', 'woocommerce-gateway-stripe'),
 			'desc_tip'    => true,
 		),
 		'webhook'     => array(
-			'title'       => __( 'Webhook Endpoints', 'woocommerce-gateway-stripe' ),
+			'title'       => __('Webhook Endpoints', 'woocommerce-gateway-stripe'),
 			'type'        => 'title',
 			/* translators: webhook URL */
 			'description' => $this->display_admin_settings_webhook_description(),

Please login to merge, or discard this patch.

includes/admin/stripe-bancontact-settings.php 1 patch

Spacing +13 added lines, -13 removed lines patch added patch discarded remove patch

@@ -1,5 +1,5 @@  discard block
 block discarded – undo
 <?php
-if ( ! defined( 'ABSPATH' ) ) {
+if ( ! defined('ABSPATH')) {
 	exit;
 }
 
@@ -7,40 +7,40 @@  discard block
 block discarded – undo
 	'wc_stripe_bancontact_settings',
 	array(
 		'geo_target'  => array(
-			'description' => __( 'Relevant Payer Geography: Belgium', 'woocommerce-gateway-stripe' ),
+			'description' => __('Relevant Payer Geography: Belgium', 'woocommerce-gateway-stripe'),
 			'type'        => 'title',
 		),
 		'guide'       => array(
-			'description' => __( '<a href="https://stripe.com/payments/payment-methods-guide#bancontact" target="_blank">Payment Method Guide</a>', 'woocommerce-gateway-stripe' ),
+			'description' => __('<a href="https://stripe.com/payments/payment-methods-guide#bancontact" target="_blank">Payment Method Guide</a>', 'woocommerce-gateway-stripe'),
 			'type'        => 'title',
 		),
 		'activation'  => array(
-			'description' => __( 'Must be activated from your Stripe Dashboard Settings <a href="https://dashboard.stripe.com/account/payments/settings" target="_blank">here</a>', 'woocommerce-gateway-stripe' ),
+			'description' => __('Must be activated from your Stripe Dashboard Settings <a href="https://dashboard.stripe.com/account/payments/settings" target="_blank">here</a>', 'woocommerce-gateway-stripe'),
 			'type'        => 'title',
 		),
 		'enabled'     => array(
-			'title'       => __( 'Enable/Disable', 'woocommerce-gateway-stripe' ),
-			'label'       => __( 'Enable Stripe Bancontact', 'woocommerce-gateway-stripe' ),
+			'title'       => __('Enable/Disable', 'woocommerce-gateway-stripe'),
+			'label'       => __('Enable Stripe Bancontact', 'woocommerce-gateway-stripe'),
 			'type'        => 'checkbox',
 			'description' => '',
 			'default'     => 'no',
 		),
 		'title'       => array(
-			'title'       => __( 'Title', 'woocommerce-gateway-stripe' ),
+			'title'       => __('Title', 'woocommerce-gateway-stripe'),
 			'type'        => 'text',
-			'description' => __( 'This controls the title which the user sees during checkout.', 'woocommerce-gateway-stripe' ),
-			'default'     => __( 'Bancontact', 'woocommerce-gateway-stripe' ),
+			'description' => __('This controls the title which the user sees during checkout.', 'woocommerce-gateway-stripe'),
+			'default'     => __('Bancontact', 'woocommerce-gateway-stripe'),
 			'desc_tip'    => true,
 		),
 		'description' => array(
-			'title'       => __( 'Description', 'woocommerce-gateway-stripe' ),
+			'title'       => __('Description', 'woocommerce-gateway-stripe'),
 			'type'        => 'text',
-			'description' => __( 'This controls the description which the user sees during checkout.', 'woocommerce-gateway-stripe' ),
-			'default'     => __( 'You will be redirected to Bancontact.', 'woocommerce-gateway-stripe' ),
+			'description' => __('This controls the description which the user sees during checkout.', 'woocommerce-gateway-stripe'),
+			'default'     => __('You will be redirected to Bancontact.', 'woocommerce-gateway-stripe'),
 			'desc_tip'    => true,
 		),
 		'webhook'     => array(
-			'title'       => __( 'Webhook Endpoints', 'woocommerce-gateway-stripe' ),
+			'title'       => __('Webhook Endpoints', 'woocommerce-gateway-stripe'),
 			'type'        => 'title',
 			/* translators: webhook URL */
 			'description' => $this->display_admin_settings_webhook_description(),

Please login to merge, or discard this patch.

includes/admin/stripe-multibanco-settings.php 1 patch

Spacing +12 added lines, -12 removed lines patch added patch discarded remove patch

@@ -1,5 +1,5 @@  discard block
 block discarded – undo
 <?php
-if ( ! defined( 'ABSPATH' ) ) {
+if ( ! defined('ABSPATH')) {
 	exit;
 }
 
@@ -7,36 +7,36 @@  discard block
 block discarded – undo
 	'wc_stripe_multibanco_settings',
 	array(
 		'geo_target'  => array(
-			'description' => __( 'Relevant Payer Geography: Portugal', 'woocommerce-gateway-stripe' ),
+			'description' => __('Relevant Payer Geography: Portugal', 'woocommerce-gateway-stripe'),
 			'type'        => 'title',
 		),
 		'activation'  => array(
-			'description' => __( 'Must be activated from your Stripe Dashboard Settings <a href="https://dashboard.stripe.com/account/payments/settings" target="_blank">here</a>', 'woocommerce-gateway-stripe' ),
+			'description' => __('Must be activated from your Stripe Dashboard Settings <a href="https://dashboard.stripe.com/account/payments/settings" target="_blank">here</a>', 'woocommerce-gateway-stripe'),
 			'type'        => 'title',
 		),
 		'enabled'     => array(
-			'title'       => __( 'Enable/Disable', 'woocommerce-gateway-stripe' ),
-			'label'       => __( 'Enable Stripe Multibanco', 'woocommerce-gateway-stripe' ),
+			'title'       => __('Enable/Disable', 'woocommerce-gateway-stripe'),
+			'label'       => __('Enable Stripe Multibanco', 'woocommerce-gateway-stripe'),
 			'type'        => 'checkbox',
 			'description' => '',
 			'default'     => 'no',
 		),
 		'title'       => array(
-			'title'       => __( 'Title', 'woocommerce-gateway-stripe' ),
+			'title'       => __('Title', 'woocommerce-gateway-stripe'),
 			'type'        => 'text',
-			'description' => __( 'This controls the title which the user sees during checkout.', 'woocommerce-gateway-stripe' ),
-			'default'     => __( 'Multibanco', 'woocommerce-gateway-stripe' ),
+			'description' => __('This controls the title which the user sees during checkout.', 'woocommerce-gateway-stripe'),
+			'default'     => __('Multibanco', 'woocommerce-gateway-stripe'),
 			'desc_tip'    => true,
 		),
 		'description' => array(
-			'title'       => __( 'Description', 'woocommerce-gateway-stripe' ),
+			'title'       => __('Description', 'woocommerce-gateway-stripe'),
 			'type'        => 'text',
-			'description' => __( 'This controls the description which the user sees during checkout.', 'woocommerce-gateway-stripe' ),
-			'default'     => __( 'You will be redirected to Multibanco.', 'woocommerce-gateway-stripe' ),
+			'description' => __('This controls the description which the user sees during checkout.', 'woocommerce-gateway-stripe'),
+			'default'     => __('You will be redirected to Multibanco.', 'woocommerce-gateway-stripe'),
 			'desc_tip'    => true,
 		),
 		'webhook'     => array(
-			'title'       => __( 'Webhook Endpoints', 'woocommerce-gateway-stripe' ),
+			'title'       => __('Webhook Endpoints', 'woocommerce-gateway-stripe'),
 			'type'        => 'title',
 			/* translators: webhook URL */
 			'description' => $this->display_admin_settings_webhook_description(),

Please login to merge, or discard this patch.

includes/admin/stripe-ideal-settings.php 1 patch

Spacing +13 added lines, -13 removed lines patch added patch discarded remove patch

@@ -1,5 +1,5 @@  discard block
 block discarded – undo
 <?php
-if ( ! defined( 'ABSPATH' ) ) {
+if ( ! defined('ABSPATH')) {
 	exit;
 }
 
@@ -7,40 +7,40 @@  discard block
 block discarded – undo
 	'wc_stripe_ideal_settings',
 	array(
 		'geo_target'  => array(
-			'description' => __( 'Relevant Payer Geography: The Netherlands', 'woocommerce-gateway-stripe' ),
+			'description' => __('Relevant Payer Geography: The Netherlands', 'woocommerce-gateway-stripe'),
 			'type'        => 'title',
 		),
 		'guide'       => array(
-			'description' => __( '<a href="https://stripe.com/payments/payment-methods-guide#ideal" target="_blank">Payment Method Guide</a>', 'woocommerce-gateway-stripe' ),
+			'description' => __('<a href="https://stripe.com/payments/payment-methods-guide#ideal" target="_blank">Payment Method Guide</a>', 'woocommerce-gateway-stripe'),
 			'type'        => 'title',
 		),
 		'activation'  => array(
-			'description' => __( 'Must be activated from your Stripe Dashboard Settings <a href="https://dashboard.stripe.com/account/payments/settings" target="_blank">here</a>', 'woocommerce-gateway-stripe' ),
+			'description' => __('Must be activated from your Stripe Dashboard Settings <a href="https://dashboard.stripe.com/account/payments/settings" target="_blank">here</a>', 'woocommerce-gateway-stripe'),
 			'type'        => 'title',
 		),
 		'enabled'     => array(
-			'title'       => __( 'Enable/Disable', 'woocommerce-gateway-stripe' ),
-			'label'       => __( 'Enable Stripe iDeal', 'woocommerce-gateway-stripe' ),
+			'title'       => __('Enable/Disable', 'woocommerce-gateway-stripe'),
+			'label'       => __('Enable Stripe iDeal', 'woocommerce-gateway-stripe'),
 			'type'        => 'checkbox',
 			'description' => '',
 			'default'     => 'no',
 		),
 		'title'       => array(
-			'title'       => __( 'Title', 'woocommerce-gateway-stripe' ),
+			'title'       => __('Title', 'woocommerce-gateway-stripe'),
 			'type'        => 'text',
-			'description' => __( 'This controls the title which the user sees during checkout.', 'woocommerce-gateway-stripe' ),
-			'default'     => __( 'iDeal', 'woocommerce-gateway-stripe' ),
+			'description' => __('This controls the title which the user sees during checkout.', 'woocommerce-gateway-stripe'),
+			'default'     => __('iDeal', 'woocommerce-gateway-stripe'),
 			'desc_tip'    => true,
 		),
 		'description' => array(
-			'title'       => __( 'Description', 'woocommerce-gateway-stripe' ),
+			'title'       => __('Description', 'woocommerce-gateway-stripe'),
 			'type'        => 'text',
-			'description' => __( 'This controls the description which the user sees during checkout.', 'woocommerce-gateway-stripe' ),
-			'default'     => __( 'You will be redirected to iDeal.', 'woocommerce-gateway-stripe' ),
+			'description' => __('This controls the description which the user sees during checkout.', 'woocommerce-gateway-stripe'),
+			'default'     => __('You will be redirected to iDeal.', 'woocommerce-gateway-stripe'),
 			'desc_tip'    => true,
 		),
 		'webhook'     => array(
-			'title'       => __( 'Webhook Endpoints', 'woocommerce-gateway-stripe' ),
+			'title'       => __('Webhook Endpoints', 'woocommerce-gateway-stripe'),
 			'type'        => 'title',
 			/* translators: webhook URL */
 			'description' => $this->display_admin_settings_webhook_description(),

Please login to merge, or discard this patch.

includes/admin/stripe-sepa-settings.php 1 patch

Spacing +13 added lines, -13 removed lines patch added patch discarded remove patch

@@ -1,5 +1,5 @@  discard block
 block discarded – undo
 <?php
-if ( ! defined( 'ABSPATH' ) ) {
+if ( ! defined('ABSPATH')) {
 	exit;
 }
 
@@ -7,40 +7,40 @@  discard block
 block discarded – undo
 	'wc_stripe_sepa_settings',
 	array(
 		'geo_target'  => array(
-			'description' => __( 'Relevant Payer Geography: France, Germany, Spain, Belgium, Netherlands, Luxembourg, Italy, Portugal, Austria, Ireland', 'woocommerce-gateway-stripe' ),
+			'description' => __('Relevant Payer Geography: France, Germany, Spain, Belgium, Netherlands, Luxembourg, Italy, Portugal, Austria, Ireland', 'woocommerce-gateway-stripe'),
 			'type'        => 'title',
 		),
 		'guide'       => array(
-			'description' => __( '<a href="https://stripe.com/payments/payment-methods-guide#sepa-direct-debit" target="_blank">Payment Method Guide</a>', 'woocommerce-gateway-stripe' ),
+			'description' => __('<a href="https://stripe.com/payments/payment-methods-guide#sepa-direct-debit" target="_blank">Payment Method Guide</a>', 'woocommerce-gateway-stripe'),
 			'type'        => 'title',
 		),
 		'activation'  => array(
-			'description' => __( 'Must be activated from your Stripe Dashboard Settings <a href="https://dashboard.stripe.com/account/payments/settings" target="_blank">here</a>', 'woocommerce-gateway-stripe' ),
+			'description' => __('Must be activated from your Stripe Dashboard Settings <a href="https://dashboard.stripe.com/account/payments/settings" target="_blank">here</a>', 'woocommerce-gateway-stripe'),
 			'type'        => 'title',
 		),
 		'enabled'     => array(
-			'title'       => __( 'Enable/Disable', 'woocommerce-gateway-stripe' ),
-			'label'       => __( 'Enable Stripe SEPA Direct Debit', 'woocommerce-gateway-stripe' ),
+			'title'       => __('Enable/Disable', 'woocommerce-gateway-stripe'),
+			'label'       => __('Enable Stripe SEPA Direct Debit', 'woocommerce-gateway-stripe'),
 			'type'        => 'checkbox',
 			'description' => '',
 			'default'     => 'no',
 		),
 		'title'       => array(
-			'title'       => __( 'Title', 'woocommerce-gateway-stripe' ),
+			'title'       => __('Title', 'woocommerce-gateway-stripe'),
 			'type'        => 'text',
-			'description' => __( 'This controls the title which the user sees during checkout.', 'woocommerce-gateway-stripe' ),
-			'default'     => __( 'SEPA Direct Debit', 'woocommerce-gateway-stripe' ),
+			'description' => __('This controls the title which the user sees during checkout.', 'woocommerce-gateway-stripe'),
+			'default'     => __('SEPA Direct Debit', 'woocommerce-gateway-stripe'),
 			'desc_tip'    => true,
 		),
 		'description' => array(
-			'title'       => __( 'Description', 'woocommerce-gateway-stripe' ),
+			'title'       => __('Description', 'woocommerce-gateway-stripe'),
 			'type'        => 'text',
-			'description' => __( 'This controls the description which the user sees during checkout.', 'woocommerce-gateway-stripe' ),
-			'default'     => __( 'Mandate Information.', 'woocommerce-gateway-stripe' ),
+			'description' => __('This controls the description which the user sees during checkout.', 'woocommerce-gateway-stripe'),
+			'default'     => __('Mandate Information.', 'woocommerce-gateway-stripe'),
 			'desc_tip'    => true,
 		),
 		'webhook'     => array(
-			'title'       => __( 'Webhook Endpoints', 'woocommerce-gateway-stripe' ),
+			'title'       => __('Webhook Endpoints', 'woocommerce-gateway-stripe'),
 			'type'        => 'title',
 			/* translators: webhook URL */
 			'description' => $this->display_admin_settings_webhook_description(),

Please login to merge, or discard this patch.

includes/admin/stripe-sofort-settings.php 1 patch

Spacing +13 added lines, -13 removed lines patch added patch discarded remove patch

@@ -1,5 +1,5 @@  discard block
 block discarded – undo
 <?php
-if ( ! defined( 'ABSPATH' ) ) {
+if ( ! defined('ABSPATH')) {
 	exit;
 }
 
@@ -7,40 +7,40 @@  discard block
 block discarded – undo
 	'wc_stripe_sofort_settings',
 	array(
 		'geo_target'  => array(
-			'description' => __( 'Relevant Payer Geography: Germany, Austria', 'woocommerce-gateway-stripe' ),
+			'description' => __('Relevant Payer Geography: Germany, Austria', 'woocommerce-gateway-stripe'),
 			'type'        => 'title',
 		),
 		'guide'       => array(
-			'description' => __( '<a href="https://stripe.com/payments/payment-methods-guide#sofort" target="_blank">Payment Method Guide</a>', 'woocommerce-gateway-stripe' ),
+			'description' => __('<a href="https://stripe.com/payments/payment-methods-guide#sofort" target="_blank">Payment Method Guide</a>', 'woocommerce-gateway-stripe'),
 			'type'        => 'title',
 		),
 		'activation'  => array(
-			'description' => __( 'Must be activated from your Stripe Dashboard Settings <a href="https://dashboard.stripe.com/account/payments/settings" target="_blank">here</a>', 'woocommerce-gateway-stripe' ),
+			'description' => __('Must be activated from your Stripe Dashboard Settings <a href="https://dashboard.stripe.com/account/payments/settings" target="_blank">here</a>', 'woocommerce-gateway-stripe'),
 			'type'        => 'title',
 		),
 		'enabled'     => array(
-			'title'       => __( 'Enable/Disable', 'woocommerce-gateway-stripe' ),
-			'label'       => __( 'Enable Stripe SOFORT', 'woocommerce-gateway-stripe' ),
+			'title'       => __('Enable/Disable', 'woocommerce-gateway-stripe'),
+			'label'       => __('Enable Stripe SOFORT', 'woocommerce-gateway-stripe'),
 			'type'        => 'checkbox',
 			'description' => '',
 			'default'     => 'no',
 		),
 		'title'       => array(
-			'title'       => __( 'Title', 'woocommerce-gateway-stripe' ),
+			'title'       => __('Title', 'woocommerce-gateway-stripe'),
 			'type'        => 'text',
-			'description' => __( 'This controls the title which the user sees during checkout.', 'woocommerce-gateway-stripe' ),
-			'default'     => __( 'SOFORT', 'woocommerce-gateway-stripe' ),
+			'description' => __('This controls the title which the user sees during checkout.', 'woocommerce-gateway-stripe'),
+			'default'     => __('SOFORT', 'woocommerce-gateway-stripe'),
 			'desc_tip'    => true,
 		),
 		'description' => array(
-			'title'       => __( 'Description', 'woocommerce-gateway-stripe' ),
+			'title'       => __('Description', 'woocommerce-gateway-stripe'),
 			'type'        => 'text',
-			'description' => __( 'This controls the description which the user sees during checkout.', 'woocommerce-gateway-stripe' ),
-			'default'     => __( 'You will be redirected to SOFORT.', 'woocommerce-gateway-stripe' ),
+			'description' => __('This controls the description which the user sees during checkout.', 'woocommerce-gateway-stripe'),
+			'default'     => __('You will be redirected to SOFORT.', 'woocommerce-gateway-stripe'),
 			'desc_tip'    => true,
 		),
 		'webhook'     => array(
-			'title'       => __( 'Webhook Endpoints', 'woocommerce-gateway-stripe' ),
+			'title'       => __('Webhook Endpoints', 'woocommerce-gateway-stripe'),
 			'type'        => 'title',
 			/* translators: webhook URL */
 			'description' => $this->display_admin_settings_webhook_description(),

Please login to merge, or discard this patch.

includes/admin/stripe-p24-settings.php 1 patch

Spacing +12 added lines, -12 removed lines patch added patch discarded remove patch

@@ -1,5 +1,5 @@  discard block
 block discarded – undo
 <?php
-if ( ! defined( 'ABSPATH' ) ) {
+if ( ! defined('ABSPATH')) {
 	exit;
 }
 
@@ -7,36 +7,36 @@  discard block
 block discarded – undo
 	'wc_stripe_p24_settings',
 	array(
 		'geo_target'  => array(
-			'description' => __( 'Relevant Payer Geography: Poland', 'woocommerce-gateway-stripe' ),
+			'description' => __('Relevant Payer Geography: Poland', 'woocommerce-gateway-stripe'),
 			'type'        => 'title',
 		),
 		'activation'  => array(
-			'description' => __( 'Must be activated from your Stripe Dashboard Settings <a href="https://dashboard.stripe.com/account/payments/settings" target="_blank">here</a>', 'woocommerce-gateway-stripe' ),
+			'description' => __('Must be activated from your Stripe Dashboard Settings <a href="https://dashboard.stripe.com/account/payments/settings" target="_blank">here</a>', 'woocommerce-gateway-stripe'),
 			'type'        => 'title',
 		),
 		'enabled'     => array(
-			'title'       => __( 'Enable/Disable', 'woocommerce-gateway-stripe' ),
-			'label'       => __( 'Enable Stripe P24', 'woocommerce-gateway-stripe' ),
+			'title'       => __('Enable/Disable', 'woocommerce-gateway-stripe'),
+			'label'       => __('Enable Stripe P24', 'woocommerce-gateway-stripe'),
 			'type'        => 'checkbox',
 			'description' => '',
 			'default'     => 'no',
 		),
 		'title'       => array(
-			'title'       => __( 'Title', 'woocommerce-gateway-stripe' ),
+			'title'       => __('Title', 'woocommerce-gateway-stripe'),
 			'type'        => 'text',
-			'description' => __( 'This controls the title which the user sees during checkout.', 'woocommerce-gateway-stripe' ),
-			'default'     => __( 'Przelewy24 (P24)', 'woocommerce-gateway-stripe' ),
+			'description' => __('This controls the title which the user sees during checkout.', 'woocommerce-gateway-stripe'),
+			'default'     => __('Przelewy24 (P24)', 'woocommerce-gateway-stripe'),
 			'desc_tip'    => true,
 		),
 		'description' => array(
-			'title'       => __( 'Description', 'woocommerce-gateway-stripe' ),
+			'title'       => __('Description', 'woocommerce-gateway-stripe'),
 			'type'        => 'text',
-			'description' => __( 'This controls the description which the user sees during checkout.', 'woocommerce-gateway-stripe' ),
-			'default'     => __( 'You will be redirected to P24.', 'woocommerce-gateway-stripe' ),
+			'description' => __('This controls the description which the user sees during checkout.', 'woocommerce-gateway-stripe'),
+			'default'     => __('You will be redirected to P24.', 'woocommerce-gateway-stripe'),
 			'desc_tip'    => true,
 		),
 		'webhook'     => array(
-			'title'       => __( 'Webhook Endpoints', 'woocommerce-gateway-stripe' ),
+			'title'       => __('Webhook Endpoints', 'woocommerce-gateway-stripe'),
 			'type'        => 'title',
 			/* translators: webhook URL */
 			'description' => $this->display_admin_settings_webhook_description(),

Please login to merge, or discard this patch.

		@@ -1,5 +1,5 @@ discard block
		block discarded – undo
1	1	<?php
2		-if ( ! defined( 'ABSPATH' ) ) {
	2	+if ( ! defined('ABSPATH')) {
3	3	exit;
4	4	}
5	5
		@@ -11,7 +11,7 @@ discard block
		block discarded – undo
11	11	public $saved_cards;
12	12
13	13	public function __construct() {
14		- $this->saved_cards = WC_Stripe_Helper::get_settings( 'stripe', 'saved_cards' );
	14	+ $this->saved_cards = WC_Stripe_Helper::get_settings('stripe', 'saved_cards');
15	15	}
16	16
17	17	/**
		@@ -19,68 +19,68 @@ discard block
		block discarded – undo
19	19	* @param int $order_id
20	20	* @return boolean
21	21	*/
22		- public function is_pre_order( $order_id ) {
23		- return WC_Pre_Orders_Order::order_contains_pre_order( $order_id );
	22	+ public function is_pre_order($order_id) {
	23	+ return WC_Pre_Orders_Order::order_contains_pre_order($order_id);
24	24	}
25	25
26	26	/**
27	27	* Remove order meta
28	28	* @param object $order
29	29	*/
30		- public function remove_order_source_before_retry( $order ) {
31		- $order_id = WC_Stripe_Helper::is_wc_lt( '3.0' ) ? $order->id : $order->get_id();
32		- delete_post_meta( $order_id, '_stripe_source_id' );
	30	+ public function remove_order_source_before_retry($order) {
	31	+ $order_id = WC_Stripe_Helper::is_wc_lt('3.0') ? $order->id : $order->get_id();
	32	+ delete_post_meta($order_id, '_stripe_source_id');
33	33	// For BW compat will remove in the future.
34		- delete_post_meta( $order_id, '_stripe_card_id' );
	34	+ delete_post_meta($order_id, '_stripe_card_id');
35	35	}
36	36
37	37	/**
38	38	* Remove order meta
39	39	* @param object $order
40	40	*/
41		- public function remove_order_customer_before_retry( $order ) {
42		- $order_id = WC_Stripe_Helper::is_wc_lt( '3.0' ) ? $order->id : $order->get_id();
43		- delete_post_meta( $order_id, '_stripe_customer_id' );
	41	+ public function remove_order_customer_before_retry($order) {
	42	+ $order_id = WC_Stripe_Helper::is_wc_lt('3.0') ? $order->id : $order->get_id();
	43	+ delete_post_meta($order_id, '_stripe_customer_id');
44	44	}
45	45
46	46	/**
47	47	* Process the pre-order when pay upon release is used.
48	48	* @param int $order_id
49	49	*/
50		- public function process_pre_order( $order_id ) {
	50	+ public function process_pre_order($order_id) {
51	51	try {
52		- $order = wc_get_order( $order_id );
	52	+ $order = wc_get_order($order_id);
53	53
54	54	// This will throw exception if not valid.
55		- $this->validate_minimum_order_amount( $order );
	55	+ $this->validate_minimum_order_amount($order);
56	56
57		- $prepared_source = $this->prepare_source( get_current_user_id(), true );
	57	+ $prepared_source = $this->prepare_source(get_current_user_id(), true);
58	58
59	59	// We need a source on file to continue.
60		- if ( empty( $prepared_source->customer ) \|\| empty( $prepared_source->source ) ) {
61		- throw new WC_Stripe_Exception( __( 'Unable to store payment details. Please try again.', 'woocommerce-gateway-stripe' ) );
	60	+ if (empty($prepared_source->customer) \|\| empty($prepared_source->source)) {
	61	+ throw new WC_Stripe_Exception(__('Unable to store payment details. Please try again.', 'woocommerce-gateway-stripe'));
62	62	}
63	63
64		- $this->save_source_to_order( $order, $prepared_source );
	64	+ $this->save_source_to_order($order, $prepared_source);
65	65
66	66	// Remove cart
67	67	WC()->cart->empty_cart();
68	68
69	69	// Is pre ordered!
70		- WC_Pre_Orders_Order::mark_order_as_pre_ordered( $order );
	70	+ WC_Pre_Orders_Order::mark_order_as_pre_ordered($order);
71	71
72	72	// Return thank you page redirect
73	73	return array(
74	74	'result' => 'success',
75		- 'redirect' => $this->get_return_url( $order ),
	75	+ 'redirect' => $this->get_return_url($order),
76	76	);
77		- } catch ( WC_Stripe_Exception $e ) {
78		- wc_add_notice( $e->getLocalizedMessage(), 'error' );
79		- WC_Stripe_Logger::log( 'Pre Orders Error: ' . $e->getMessage() );
	77	+ } catch (WC_Stripe_Exception $e) {
	78	+ wc_add_notice($e->getLocalizedMessage(), 'error');
	79	+ WC_Stripe_Logger::log('Pre Orders Error: ' . $e->getMessage());
80	80
81	81	return array(
82	82	'result' => 'success',
83		- 'redirect' => $order->get_checkout_payment_url( true ),
	83	+ 'redirect' => $order->get_checkout_payment_url(true),
84	84	);
85	85	}
86	86	}
		@@ -90,7 +90,7 @@ discard block
		block discarded – undo
90	90	* @param WC_Order $order
91	91	* @return void
92	92	*/
93		- public function process_pre_order_release_payment( $order ) {
	93	+ public function process_pre_order_release_payment($order) {
94	94	try {
95	95	// Define some callbacks if the first attempt fails.
96	96	$retry_callbacks = array(
		@@ -98,33 +98,33 @@ discard block
		block discarded – undo
98	98	'remove_order_customer_before_retry',
99	99	);
100	100
101		- while ( 1 ) {
102		- $source = $this->prepare_order_source( $order );
103		- $response = WC_Stripe_API::request( $this->generate_payment_request( $order, $source ) );
	101	+ while (1) {
	102	+ $source = $this->prepare_order_source($order);
	103	+ $response = WC_Stripe_API::request($this->generate_payment_request($order, $source));
104	104
105		- if ( ! empty( $response->error ) ) {
106		- if ( 0 === sizeof( $retry_callbacks ) ) {
107		- throw new Exception( $response->error->message );
	105	+ if ( ! empty($response->error)) {
	106	+ if (0 === sizeof($retry_callbacks)) {
	107	+ throw new Exception($response->error->message);
108	108	} else {
109		- $retry_callback = array_shift( $retry_callbacks );
110		- call_user_func( array( $this, $retry_callback ), $order );
	109	+ $retry_callback = array_shift($retry_callbacks);
	110	+ call_user_func(array($this, $retry_callback), $order);
111	111	}
112	112	} else {
113	113	// Successful
114		- $this->process_response( $response, $order );
	114	+ $this->process_response($response, $order);
115	115	break;
116	116	}
117	117	}
118		- } catch ( Exception $e ) {
	118	+ } catch (Exception $e) {
119	119	/* translators: error message */
120		- $order_note = sprintf( __( 'Stripe Transaction Failed (%s)', 'woocommerce-gateway-stripe' ), $e->getMessage() );
	120	+ $order_note = sprintf(__('Stripe Transaction Failed (%s)', 'woocommerce-gateway-stripe'), $e->getMessage());
121	121
122	122	// Mark order as failed if not already set,
123	123	// otherwise, make sure we add the order note so we can detect when someone fails to check out multiple times
124		- if ( ! $order->has_status( 'failed' ) ) {
125		- $order->update_status( 'failed', $order_note );
	124	+ if ( ! $order->has_status('failed')) {
	125	+ $order->update_status('failed', $order_note);
126	126	} else {
127		- $order->add_order_note( $order_note );
	127	+ $order->add_order_note($order_note);
128	128	}
129	129	}
130	130	}

		@@ -1,6 +1,6 @@ discard block
		block discarded – undo
1	1	<?php
2	2
3		-if ( ! defined( 'ABSPATH' ) ) {
	3	+if ( ! defined('ABSPATH')) {
4	4	exit; // Exit if accessed directly
5	5	}
6	6
		@@ -35,10 +35,10 @@ discard block
		block discarded – undo
35	35	* @param string $deprecated Deprecated since WooCommerce 3.0
36	36	* @return string
37	37	*/
38		- public function get_display_name( $deprecated = '' ) {
	38	+ public function get_display_name($deprecated = '') {
39	39	$display = sprintf(
40	40	/* translators: last 4 digits of IBAN account */
41		- __( 'SEPA IBAN ending in %s', 'woocommerce-gateway-stripe' ),
	41	+ __('SEPA IBAN ending in %s', 'woocommerce-gateway-stripe'),
42	42	$this->get_last4()
43	43	);
44	44
		@@ -66,11 +66,11 @@ discard block
		block discarded – undo
66	66	* @return boolean True if the passed data is valid
67	67	*/
68	68	public function validate() {
69		- if ( false === parent::validate() ) {
	69	+ if (false === parent::validate()) {
70	70	return false;
71	71	}
72	72
73		- if ( ! $this->get_last4( 'edit' ) ) {
	73	+ if ( ! $this->get_last4('edit')) {
74	74	return false;
75	75	}
76	76
		@@ -85,8 +85,8 @@ discard block
		block discarded – undo
85	85	* @param string $context
86	86	* @return string Last 4 digits
87	87	*/
88		- public function get_last4( $context = 'view' ) {
89		- return WC_Stripe_Helper::is_wc_lt( '3.0' ) ? $this->get_meta( 'last4' ) : $this->get_prop( 'last4', $context );
	88	+ public function get_last4($context = 'view') {
	89	+ return WC_Stripe_Helper::is_wc_lt('3.0') ? $this->get_meta('last4') : $this->get_prop('last4', $context);
90	90	}
91	91
92	92	/**
		@@ -95,7 +95,7 @@ discard block
		block discarded – undo
95	95	* @version 4.0.0
96	96	* @param string $last4
97	97	*/
98		- public function set_last4( $last4 ) {
99		- WC_Stripe_Helper::is_wc_lt( '3.0' ) ? $this->add_meta_data( 'last4', $last4, true ) : $this->set_prop( 'last4', $last4 );
	98	+ public function set_last4($last4) {
	99	+ WC_Stripe_Helper::is_wc_lt('3.0') ? $this->add_meta_data('last4', $last4, true) : $this->set_prop('last4', $last4);
100	100	}
101	101	}

woocommerce / woocommerce-gateway-stripe

Pull Request — master (#953)

Status

Category

Spacing +9 added lines, -9 removed lines patch added patch discarded remove patch

Spacing +39 added lines, -39 removed lines patch added patch discarded remove patch

Spacing +13 added lines, -13 removed lines patch added patch discarded remove patch

Spacing +13 added lines, -13 removed lines patch added patch discarded remove patch

Spacing +12 added lines, -12 removed lines patch added patch discarded remove patch

Spacing +13 added lines, -13 removed lines patch added patch discarded remove patch

Spacing +13 added lines, -13 removed lines patch added patch discarded remove patch

Spacing +13 added lines, -13 removed lines patch added patch discarded remove patch

Spacing +12 added lines, -12 removed lines patch added patch discarded remove patch