Completed
Pull Request — master (#1192)
by Dwain
01:49
created
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
1 1
 <?php
2
-if ( ! defined( 'ABSPATH' ) ) {
2
+if ( ! defined('ABSPATH')) {
3 3
 	exit;
4 4
 }
5 5
 
@@ -7,40 +7,40 @@  discard block
 block discarded – undo
7 7
 	'wc_stripe_sofort_settings',
8 8
 	array(
9 9
 		'geo_target'  => array(
10
-			'description' => __( 'Relevant Payer Geography: Germany, Austria', 'woocommerce-gateway-stripe' ),
10
+			'description' => __('Relevant Payer Geography: Germany, Austria', 'woocommerce-gateway-stripe'),
11 11
 			'type'        => 'title',
12 12
 		),
13 13
 		'guide'       => array(
14
-			'description' => __( '<a href="https://stripe.com/payments/payment-methods-guide#sofort" target="_blank">Payment Method Guide</a>', 'woocommerce-gateway-stripe' ),
14
+			'description' => __('<a href="https://stripe.com/payments/payment-methods-guide#sofort" target="_blank">Payment Method Guide</a>', 'woocommerce-gateway-stripe'),
15 15
 			'type'        => 'title',
16 16
 		),
17 17
 		'activation'  => array(
18
-			'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' ),
18
+			'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'),
19 19
 			'type'        => 'title',
20 20
 		),
21 21
 		'enabled'     => array(
22
-			'title'       => __( 'Enable/Disable', 'woocommerce-gateway-stripe' ),
23
-			'label'       => __( 'Enable Stripe SOFORT', 'woocommerce-gateway-stripe' ),
22
+			'title'       => __('Enable/Disable', 'woocommerce-gateway-stripe'),
23
+			'label'       => __('Enable Stripe SOFORT', 'woocommerce-gateway-stripe'),
24 24
 			'type'        => 'checkbox',
25 25
 			'description' => '',
26 26
 			'default'     => 'no',
27 27
 		),
28 28
 		'title'       => array(
29
-			'title'       => __( 'Title', 'woocommerce-gateway-stripe' ),
29
+			'title'       => __('Title', 'woocommerce-gateway-stripe'),
30 30
 			'type'        => 'text',
31
-			'description' => __( 'This controls the title which the user sees during checkout.', 'woocommerce-gateway-stripe' ),
32
-			'default'     => __( 'SOFORT', 'woocommerce-gateway-stripe' ),
31
+			'description' => __('This controls the title which the user sees during checkout.', 'woocommerce-gateway-stripe'),
32
+			'default'     => __('SOFORT', 'woocommerce-gateway-stripe'),
33 33
 			'desc_tip'    => true,
34 34
 		),
35 35
 		'description' => array(
36
-			'title'       => __( 'Description', 'woocommerce-gateway-stripe' ),
36
+			'title'       => __('Description', 'woocommerce-gateway-stripe'),
37 37
 			'type'        => 'text',
38
-			'description' => __( 'This controls the description which the user sees during checkout.', 'woocommerce-gateway-stripe' ),
39
-			'default'     => __( 'You will be redirected to SOFORT.', 'woocommerce-gateway-stripe' ),
38
+			'description' => __('This controls the description which the user sees during checkout.', 'woocommerce-gateway-stripe'),
39
+			'default'     => __('You will be redirected to SOFORT.', 'woocommerce-gateway-stripe'),
40 40
 			'desc_tip'    => true,
41 41
 		),
42 42
 		'webhook'     => array(
43
-			'title'       => __( 'Webhook Endpoints', 'woocommerce-gateway-stripe' ),
43
+			'title'       => __('Webhook Endpoints', 'woocommerce-gateway-stripe'),
44 44
 			'type'        => 'title',
45 45
 			/* translators: webhook URL */
46 46
 			'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
1 1
 <?php
2
-if ( ! defined( 'ABSPATH' ) ) {
2
+if ( ! defined('ABSPATH')) {
3 3
 	exit;
4 4
 }
5 5
 
@@ -7,36 +7,36 @@  discard block
 block discarded – undo
7 7
 	'wc_stripe_p24_settings',
8 8
 	array(
9 9
 		'geo_target'  => array(
10
-			'description' => __( 'Relevant Payer Geography: Poland', 'woocommerce-gateway-stripe' ),
10
+			'description' => __('Relevant Payer Geography: Poland', 'woocommerce-gateway-stripe'),
11 11
 			'type'        => 'title',
12 12
 		),
13 13
 		'activation'  => array(
14
-			'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' ),
14
+			'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'),
15 15
 			'type'        => 'title',
16 16
 		),
17 17
 		'enabled'     => array(
18
-			'title'       => __( 'Enable/Disable', 'woocommerce-gateway-stripe' ),
19
-			'label'       => __( 'Enable Stripe P24', 'woocommerce-gateway-stripe' ),
18
+			'title'       => __('Enable/Disable', 'woocommerce-gateway-stripe'),
19
+			'label'       => __('Enable Stripe P24', 'woocommerce-gateway-stripe'),
20 20
 			'type'        => 'checkbox',
21 21
 			'description' => '',
22 22
 			'default'     => 'no',
23 23
 		),
24 24
 		'title'       => array(
25
-			'title'       => __( 'Title', 'woocommerce-gateway-stripe' ),
25
+			'title'       => __('Title', 'woocommerce-gateway-stripe'),
26 26
 			'type'        => 'text',
27
-			'description' => __( 'This controls the title which the user sees during checkout.', 'woocommerce-gateway-stripe' ),
28
-			'default'     => __( 'Przelewy24 (P24)', 'woocommerce-gateway-stripe' ),
27
+			'description' => __('This controls the title which the user sees during checkout.', 'woocommerce-gateway-stripe'),
28
+			'default'     => __('Przelewy24 (P24)', 'woocommerce-gateway-stripe'),
29 29
 			'desc_tip'    => true,
30 30
 		),
31 31
 		'description' => array(
32
-			'title'       => __( 'Description', 'woocommerce-gateway-stripe' ),
32
+			'title'       => __('Description', 'woocommerce-gateway-stripe'),
33 33
 			'type'        => 'text',
34
-			'description' => __( 'This controls the description which the user sees during checkout.', 'woocommerce-gateway-stripe' ),
35
-			'default'     => __( 'You will be redirected to P24.', 'woocommerce-gateway-stripe' ),
34
+			'description' => __('This controls the description which the user sees during checkout.', 'woocommerce-gateway-stripe'),
35
+			'default'     => __('You will be redirected to P24.', 'woocommerce-gateway-stripe'),
36 36
 			'desc_tip'    => true,
37 37
 		),
38 38
 		'webhook'     => array(
39
-			'title'       => __( 'Webhook Endpoints', 'woocommerce-gateway-stripe' ),
39
+			'title'       => __('Webhook Endpoints', 'woocommerce-gateway-stripe'),
40 40
 			'type'        => 'title',
41 41
 			/* translators: webhook URL */
42 42
 			'description' => $this->display_admin_settings_webhook_description(),
Please login to merge, or discard this patch.
includes/admin/stripe-alipay-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
1 1
 <?php
2
-if ( ! defined( 'ABSPATH' ) ) {
2
+if ( ! defined('ABSPATH')) {
3 3
 	exit;
4 4
 }
5 5
 
@@ -7,40 +7,40 @@  discard block
 block discarded – undo
7 7
 	'wc_stripe_alipay_settings',
8 8
 	array(
9 9
 		'geo_target'  => array(
10
-			'description' => __( 'Relevant Payer Geography: China', 'woocommerce-gateway-stripe' ),
10
+			'description' => __('Relevant Payer Geography: China', 'woocommerce-gateway-stripe'),
11 11
 			'type'        => 'title',
12 12
 		),
13 13
 		'guide'       => array(
14
-			'description' => __( '<a href="https://stripe.com/payments/payment-methods-guide#alipay" target="_blank">Payment Method Guide</a>', 'woocommerce-gateway-stripe' ),
14
+			'description' => __('<a href="https://stripe.com/payments/payment-methods-guide#alipay" target="_blank">Payment Method Guide</a>', 'woocommerce-gateway-stripe'),
15 15
 			'type'        => 'title',
16 16
 		),
17 17
 		'activation'  => array(
18
-			'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' ),
18
+			'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'),
19 19
 			'type'        => 'title',
20 20
 		),
21 21
 		'enabled'     => array(
22
-			'title'       => __( 'Enable/Disable', 'woocommerce-gateway-stripe' ),
23
-			'label'       => __( 'Enable Stripe Alipay', 'woocommerce-gateway-stripe' ),
22
+			'title'       => __('Enable/Disable', 'woocommerce-gateway-stripe'),
23
+			'label'       => __('Enable Stripe Alipay', 'woocommerce-gateway-stripe'),
24 24
 			'type'        => 'checkbox',
25 25
 			'description' => '',
26 26
 			'default'     => 'no',
27 27
 		),
28 28
 		'title'       => array(
29
-			'title'       => __( 'Title', 'woocommerce-gateway-stripe' ),
29
+			'title'       => __('Title', 'woocommerce-gateway-stripe'),
30 30
 			'type'        => 'text',
31
-			'description' => __( 'This controls the title which the user sees during checkout.', 'woocommerce-gateway-stripe' ),
32
-			'default'     => __( 'Alipay', 'woocommerce-gateway-stripe' ),
31
+			'description' => __('This controls the title which the user sees during checkout.', 'woocommerce-gateway-stripe'),
32
+			'default'     => __('Alipay', 'woocommerce-gateway-stripe'),
33 33
 			'desc_tip'    => true,
34 34
 		),
35 35
 		'description' => array(
36
-			'title'       => __( 'Description', 'woocommerce-gateway-stripe' ),
36
+			'title'       => __('Description', 'woocommerce-gateway-stripe'),
37 37
 			'type'        => 'text',
38
-			'description' => __( 'This controls the description which the user sees during checkout.', 'woocommerce-gateway-stripe' ),
39
-			'default'     => __( 'You will be redirected to Alipay.', 'woocommerce-gateway-stripe' ),
38
+			'description' => __('This controls the description which the user sees during checkout.', 'woocommerce-gateway-stripe'),
39
+			'default'     => __('You will be redirected to Alipay.', 'woocommerce-gateway-stripe'),
40 40
 			'desc_tip'    => true,
41 41
 		),
42 42
 		'webhook'     => array(
43
-			'title'       => __( 'Webhook Endpoints', 'woocommerce-gateway-stripe' ),
43
+			'title'       => __('Webhook Endpoints', 'woocommerce-gateway-stripe'),
44 44
 			'type'        => 'title',
45 45
 			/* translators: webhook URL */
46 46
 			'description' => $this->display_admin_settings_webhook_description(),
Please login to merge, or discard this patch.
includes/class-wc-stripe-exception.php 1 patch
Spacing   +3 added lines, -3 removed lines patch added patch discarded remove patch
@@ -7,7 +7,7 @@  discard block
 block discarded – undo
7 7
  * @since 4.0.2
8 8
  */
9 9
 
10
-if ( ! defined( 'ABSPATH' ) ) {
10
+if ( ! defined('ABSPATH')) {
11 11
 	exit;
12 12
 }
13 13
 
@@ -23,9 +23,9 @@  discard block
 block discarded – undo
23 23
 	 * @param string $error_message Full response
24 24
 	 * @param string $localized_message user-friendly translated error message
25 25
 	 */
26
-	public function __construct( $error_message = '', $localized_message = '' ) {
26
+	public function __construct($error_message = '', $localized_message = '') {
27 27
 		$this->localized_message = $localized_message;
28
-		parent::__construct( $error_message );
28
+		parent::__construct($error_message);
29 29
 	}
30 30
 
31 31
 	/**
Please login to merge, or discard this patch.
includes/class-wc-stripe-logger.php 1 patch
Spacing   +16 added lines, -16 removed lines patch added patch discarded remove patch
@@ -1,5 +1,5 @@  discard block
 block discarded – undo
1 1
 <?php
2
-if ( ! defined( 'ABSPATH' ) ) {
2
+if ( ! defined('ABSPATH')) {
3 3
 	exit; // Exit if accessed directly
4 4
 }
5 5
 
@@ -20,32 +20,32 @@  discard block
 block discarded – undo
20 20
 	 * @since 4.0.0
21 21
 	 * @version 4.0.0
22 22
 	 */
23
-	public static function log( $message, $start_time = null, $end_time = null ) {
24
-		if ( ! class_exists( 'WC_Logger' ) ) {
23
+	public static function log($message, $start_time = null, $end_time = null) {
24
+		if ( ! class_exists('WC_Logger')) {
25 25
 			return;
26 26
 		}
27 27
 
28
-		if ( apply_filters( 'wc_stripe_logging', true, $message ) ) {
29
-			if ( empty( self::$logger ) ) {
30
-				if ( WC_Stripe_Helper::is_wc_lt( '3.0' ) ) {
28
+		if (apply_filters('wc_stripe_logging', true, $message)) {
29
+			if (empty(self::$logger)) {
30
+				if (WC_Stripe_Helper::is_wc_lt('3.0')) {
31 31
 					self::$logger = new WC_Logger();
32 32
 				} else {
33 33
 					self::$logger = wc_get_logger();
34 34
 				}
35 35
 			}
36 36
 
37
-			$settings = get_option( 'woocommerce_stripe_settings' );
37
+			$settings = get_option('woocommerce_stripe_settings');
38 38
 
39
-			if ( empty( $settings ) || isset( $settings['logging'] ) && 'yes' !== $settings['logging'] ) {
39
+			if (empty($settings) || isset($settings['logging']) && 'yes' !== $settings['logging']) {
40 40
 				return;
41 41
 			}
42 42
 
43
-			if ( ! is_null( $start_time ) ) {
43
+			if ( ! is_null($start_time)) {
44 44
 
45
-				$formatted_start_time = date_i18n( get_option( 'date_format' ) . ' g:ia', $start_time );
46
-				$end_time             = is_null( $end_time ) ? current_time( 'timestamp' ) : $end_time;
47
-				$formatted_end_time   = date_i18n( get_option( 'date_format' ) . ' g:ia', $end_time );
48
-				$elapsed_time         = round( abs( $end_time - $start_time ) / 60, 2 );
45
+				$formatted_start_time = date_i18n(get_option('date_format') . ' g:ia', $start_time);
46
+				$end_time             = is_null($end_time) ? current_time('timestamp') : $end_time;
47
+				$formatted_end_time   = date_i18n(get_option('date_format') . ' g:ia', $end_time);
48
+				$elapsed_time         = round(abs($end_time - $start_time) / 60, 2);
49 49
 
50 50
 				$log_entry  = "\n" . '====Stripe Version: ' . WC_STRIPE_VERSION . '====' . "\n";
51 51
 				$log_entry .= '====Start Log ' . $formatted_start_time . '====' . "\n" . $message . "\n";
@@ -57,10 +57,10 @@  discard block
 block discarded – undo
57 57
 
58 58
 			}
59 59
 
60
-			if ( WC_Stripe_Helper::is_wc_lt( '3.0' ) ) {
61
-				self::$logger->add( self::WC_LOG_FILENAME, $log_entry );
60
+			if (WC_Stripe_Helper::is_wc_lt('3.0')) {
61
+				self::$logger->add(self::WC_LOG_FILENAME, $log_entry);
62 62
 			} else {
63
-				self::$logger->debug( $log_entry, array( 'source' => self::WC_LOG_FILENAME ) );
63
+				self::$logger->debug($log_entry, array('source' => self::WC_LOG_FILENAME));
64 64
 			}
65 65
 		}
66 66
 	}
Please login to merge, or discard this patch.
uninstall.php 1 patch
Spacing   +28 added lines, -28 removed lines patch added patch discarded remove patch
@@ -1,10 +1,10 @@  discard block
 block discarded – undo
1 1
 <?php
2
-if ( ! defined( 'ABSPATH' ) ) {
2
+if ( ! defined('ABSPATH')) {
3 3
 	exit; // Exit if accessed directly
4 4
 }
5 5
 
6 6
 // if uninstall not called from WordPress exit
7
-if ( ! defined( 'WP_UNINSTALL_PLUGIN' ) ) {
7
+if ( ! defined('WP_UNINSTALL_PLUGIN')) {
8 8
 	exit;
9 9
 }
10 10
 
@@ -13,31 +13,31 @@  discard block
 block discarded – undo
13 13
  * wp-config.php. This is to prevent data loss when deleting the plugin from the backend
14 14
  * and to ensure only the site owner can perform this action.
15 15
  */
16
-if ( defined( 'WC_REMOVE_ALL_DATA' ) && true === WC_REMOVE_ALL_DATA ) {
16
+if (defined('WC_REMOVE_ALL_DATA') && true === WC_REMOVE_ALL_DATA) {
17 17
 	// Delete options.
18
-	delete_option( 'woocommerce_stripe_settings' );
19
-	delete_option( 'wc_stripe_show_styles_notice' );
20
-	delete_option( 'wc_stripe_show_request_api_notice' );
21
-	delete_option( 'wc_stripe_show_apple_pay_notice' );
22
-	delete_option( 'wc_stripe_show_ssl_notice' );
23
-	delete_option( 'wc_stripe_show_keys_notice' );
24
-	delete_option( 'wc_stripe_show_alipay_notice' );
25
-	delete_option( 'wc_stripe_show_bancontact_notice' );
26
-	delete_option( 'wc_stripe_show_bitcoin_notice' );
27
-	delete_option( 'wc_stripe_show_eps_notice' );
28
-	delete_option( 'wc_stripe_show_giropay_notice' );
29
-	delete_option( 'wc_stripe_show_ideal_notice' );
30
-	delete_option( 'wc_stripe_show_multibanco_notice' );
31
-	delete_option( 'wc_stripe_show_p24_notice' );
32
-	delete_option( 'wc_stripe_show_sepa_notice' );
33
-	delete_option( 'wc_stripe_show_sofort_notice' );
34
-	delete_option( 'wc_stripe_version' );
35
-	delete_option( 'woocommerce_stripe_bancontact_settings' );
36
-	delete_option( 'woocommerce_stripe_alipay_settings' );
37
-	delete_option( 'woocommerce_stripe_bitcoin_settings' );
38
-	delete_option( 'woocommerce_stripe_ideal_settings' );
39
-	delete_option( 'woocommerce_stripe_p24_settings' );
40
-	delete_option( 'woocommerce_stripe_giropay_settings' );
41
-	delete_option( 'woocommerce_stripe_sepa_settings' );
42
-	delete_option( 'woocommerce_stripe_sofort_settings' );
18
+	delete_option('woocommerce_stripe_settings');
19
+	delete_option('wc_stripe_show_styles_notice');
20
+	delete_option('wc_stripe_show_request_api_notice');
21
+	delete_option('wc_stripe_show_apple_pay_notice');
22
+	delete_option('wc_stripe_show_ssl_notice');
23
+	delete_option('wc_stripe_show_keys_notice');
24
+	delete_option('wc_stripe_show_alipay_notice');
25
+	delete_option('wc_stripe_show_bancontact_notice');
26
+	delete_option('wc_stripe_show_bitcoin_notice');
27
+	delete_option('wc_stripe_show_eps_notice');
28
+	delete_option('wc_stripe_show_giropay_notice');
29
+	delete_option('wc_stripe_show_ideal_notice');
30
+	delete_option('wc_stripe_show_multibanco_notice');
31
+	delete_option('wc_stripe_show_p24_notice');
32
+	delete_option('wc_stripe_show_sepa_notice');
33
+	delete_option('wc_stripe_show_sofort_notice');
34
+	delete_option('wc_stripe_version');
35
+	delete_option('woocommerce_stripe_bancontact_settings');
36
+	delete_option('woocommerce_stripe_alipay_settings');
37
+	delete_option('woocommerce_stripe_bitcoin_settings');
38
+	delete_option('woocommerce_stripe_ideal_settings');
39
+	delete_option('woocommerce_stripe_p24_settings');
40
+	delete_option('woocommerce_stripe_giropay_settings');
41
+	delete_option('woocommerce_stripe_sepa_settings');
42
+	delete_option('woocommerce_stripe_sofort_settings');
43 43
 }
Please login to merge, or discard this patch.
includes/class-wc-stripe-intent-controller.php 1 patch
Spacing   +29 added lines, -29 removed lines patch added patch discarded remove 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
 
@@ -23,7 +23,7 @@  discard block
 block discarded – undo
23 23
 	 * @since 4.2.0
24 24
 	 */
25 25
 	public function __construct() {
26
-		add_action( 'wc_ajax_wc_stripe_verify_intent', array( $this, 'verify_intent' ) );
26
+		add_action('wc_ajax_wc_stripe_verify_intent', array($this, 'verify_intent'));
27 27
 	}
28 28
 
29 29
 	/**
@@ -33,8 +33,8 @@  discard block
 block discarded – undo
33 33
 	 * @return WC_Gateway_Stripe
34 34
 	 */
35 35
 	protected function get_gateway() {
36
-		if ( ! isset( $this->gateway ) ) {
37
-			if ( class_exists( 'WC_Subscriptions_Order' ) && function_exists( 'wcs_create_renewal_order' ) ) {
36
+		if ( ! isset($this->gateway)) {
37
+			if (class_exists('WC_Subscriptions_Order') && function_exists('wcs_create_renewal_order')) {
38 38
 				$class_name = 'WC_Stripe_Subs_Compat';
39 39
 			} else {
40 40
 				$class_name = 'WC_Gateway_Stripe';
@@ -54,21 +54,21 @@  discard block
 block discarded – undo
54 54
 	 * @return WC_Order
55 55
 	 */
56 56
 	protected function get_order_from_request() {
57
-		if ( ! isset( $_GET['nonce'] ) || ! wp_verify_nonce( sanitize_key( $_GET['nonce'] ), 'wc_stripe_confirm_pi' ) ) {
58
-			throw new WC_Stripe_Exception( 'missing-nonce', __( 'CSRF verification failed.', 'woocommerce-gateway-stripe' ) );
57
+		if ( ! isset($_GET['nonce']) || ! wp_verify_nonce(sanitize_key($_GET['nonce']), 'wc_stripe_confirm_pi')) {
58
+			throw new WC_Stripe_Exception('missing-nonce', __('CSRF verification failed.', 'woocommerce-gateway-stripe'));
59 59
 		}
60 60
 
61 61
 		// Load the order ID.
62 62
 		$order_id = null;
63
-		if ( isset( $_GET['order'] ) && absint( $_GET['order'] ) ) {
64
-			$order_id = absint( $_GET['order'] );
63
+		if (isset($_GET['order']) && absint($_GET['order'])) {
64
+			$order_id = absint($_GET['order']);
65 65
 		}
66 66
 
67 67
 		// Retrieve the order.
68
-		$order = wc_get_order( $order_id );
68
+		$order = wc_get_order($order_id);
69 69
 
70
-		if ( ! $order ) {
71
-			throw new WC_Stripe_Exception( 'missing-order', __( 'Missing order ID for payment confirmation', 'woocommerce-gateway-stripe' ) );
70
+		if ( ! $order) {
71
+			throw new WC_Stripe_Exception('missing-order', __('Missing order ID for payment confirmation', 'woocommerce-gateway-stripe'));
72 72
 		}
73 73
 
74 74
 		return $order;
@@ -86,32 +86,32 @@  discard block
 block discarded – undo
86 86
 
87 87
 		try {
88 88
 			$order = $this->get_order_from_request();
89
-		} catch ( WC_Stripe_Exception $e ) {
89
+		} catch (WC_Stripe_Exception $e) {
90 90
 			/* translators: Error message text */
91
-			$message = sprintf( __( 'Payment verification error: %s', 'woocommerce-gateway-stripe' ), $e->getLocalizedMessage() );
92
-			wc_add_notice( esc_html( $message ), 'error' );
91
+			$message = sprintf(__('Payment verification error: %s', 'woocommerce-gateway-stripe'), $e->getLocalizedMessage());
92
+			wc_add_notice(esc_html($message), 'error');
93 93
 
94 94
 			$redirect_url = $woocommerce->cart->is_empty()
95
-				? get_permalink( WC_Stripe_Helper::is_wc_lt( '3.0' ) ? woocommerce_get_page_id( 'shop' ) : wc_get_page_id( 'shop' ) )
95
+				? get_permalink(WC_Stripe_Helper::is_wc_lt('3.0') ? woocommerce_get_page_id('shop') : wc_get_page_id('shop'))
96 96
 				: wc_get_checkout_url();
97 97
 
98
-			$this->handle_error( $e, $redirect_url );
98
+			$this->handle_error($e, $redirect_url);
99 99
 		}
100 100
 
101 101
 		try {
102
-			$gateway->verify_intent_after_checkout( $order );
102
+			$gateway->verify_intent_after_checkout($order);
103 103
 
104
-			if ( ! isset( $_GET['is_ajax'] ) ) {
105
-				$redirect_url = isset( $_GET['redirect_to'] ) // wpcs: csrf ok.
106
-					? esc_url_raw( wp_unslash( $_GET['redirect_to'] ) ) // wpcs: csrf ok.
107
-					: $gateway->get_return_url( $order );
104
+			if ( ! isset($_GET['is_ajax'])) {
105
+				$redirect_url = isset($_GET['redirect_to']) // wpcs: csrf ok.
106
+					? esc_url_raw(wp_unslash($_GET['redirect_to'])) // wpcs: csrf ok.
107
+					: $gateway->get_return_url($order);
108 108
 
109
-				wp_safe_redirect( $redirect_url );
109
+				wp_safe_redirect($redirect_url);
110 110
 			}
111 111
 
112 112
 			exit;
113
-		} catch ( WC_Stripe_Exception $e ) {
114
-			$this->handle_error( $e, $gateway->get_return_url( $order ) );
113
+		} catch (WC_Stripe_Exception $e) {
114
+			$this->handle_error($e, $gateway->get_return_url($order));
115 115
 		}
116 116
 	}
117 117
 
@@ -122,17 +122,17 @@  discard block
 block discarded – undo
122 122
 	 * @param WC_Stripe_Exception $e           The exception that was thrown.
123 123
 	 * @param string              $redirect_url An URL to use if a redirect is needed.
124 124
 	 */
125
-	protected function handle_error( $e, $redirect_url ) {
125
+	protected function handle_error($e, $redirect_url) {
126 126
 		// Log the exception before redirecting.
127
-		$message = sprintf( 'PaymentIntent verification exception: %s', $e->getLocalizedMessage() );
128
-		WC_Stripe_Logger::log( $message );
127
+		$message = sprintf('PaymentIntent verification exception: %s', $e->getLocalizedMessage());
128
+		WC_Stripe_Logger::log($message);
129 129
 
130 130
 		// `is_ajax` is only used for PI error reporting, a response is not expected.
131
-		if ( isset( $_GET['is_ajax'] ) ) {
131
+		if (isset($_GET['is_ajax'])) {
132 132
 			exit;
133 133
 		}
134 134
 
135
-		wp_safe_redirect( $redirect_url );
135
+		wp_safe_redirect($redirect_url);
136 136
 		exit;
137 137
 	}
138 138
 }
Please login to merge, or discard this patch.
includes/class-wc-stripe-helper.php 1 patch
Spacing   +105 added lines, -105 removed lines patch added patch discarded remove 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
 
@@ -22,14 +22,14 @@  discard block
 block discarded – undo
22 22
 	 * @param object $order
23 23
 	 * @return string $currency
24 24
 	 */
25
-	public static function get_stripe_currency( $order = null ) {
26
-		if ( is_null( $order ) ) {
25
+	public static function get_stripe_currency($order = null) {
26
+		if (is_null($order)) {
27 27
 			return false;
28 28
 		}
29 29
 
30
-		$order_id = WC_Stripe_Helper::is_wc_lt( '3.0' ) ? $order->id : $order->get_id();
30
+		$order_id = WC_Stripe_Helper::is_wc_lt('3.0') ? $order->id : $order->get_id();
31 31
 
32
-		return WC_Stripe_Helper::is_wc_lt( '3.0' ) ? get_post_meta( $order_id, self::META_NAME_STRIPE_CURRENCY, true ) : $order->get_meta( self::META_NAME_STRIPE_CURRENCY, true );
32
+		return WC_Stripe_Helper::is_wc_lt('3.0') ? get_post_meta($order_id, self::META_NAME_STRIPE_CURRENCY, true) : $order->get_meta(self::META_NAME_STRIPE_CURRENCY, true);
33 33
 	}
34 34
 
35 35
 	/**
@@ -39,14 +39,14 @@  discard block
 block discarded – undo
39 39
 	 * @param object $order
40 40
 	 * @param string $currency
41 41
 	 */
42
-	public static function update_stripe_currency( $order = null, $currency ) {
43
-		if ( is_null( $order ) ) {
42
+	public static function update_stripe_currency($order = null, $currency) {
43
+		if (is_null($order)) {
44 44
 			return false;
45 45
 		}
46 46
 
47
-		$order_id = WC_Stripe_Helper::is_wc_lt( '3.0' ) ? $order->id : $order->get_id();
47
+		$order_id = WC_Stripe_Helper::is_wc_lt('3.0') ? $order->id : $order->get_id();
48 48
 
49
-		WC_Stripe_Helper::is_wc_lt( '3.0' ) ? update_post_meta( $order_id, self::META_NAME_STRIPE_CURRENCY, $currency ) : $order->update_meta_data( self::META_NAME_STRIPE_CURRENCY, $currency );
49
+		WC_Stripe_Helper::is_wc_lt('3.0') ? update_post_meta($order_id, self::META_NAME_STRIPE_CURRENCY, $currency) : $order->update_meta_data(self::META_NAME_STRIPE_CURRENCY, $currency);
50 50
 	}
51 51
 
52 52
 	/**
@@ -56,22 +56,22 @@  discard block
 block discarded – undo
56 56
 	 * @param object $order
57 57
 	 * @return string $amount
58 58
 	 */
59
-	public static function get_stripe_fee( $order = null ) {
60
-		if ( is_null( $order ) ) {
59
+	public static function get_stripe_fee($order = null) {
60
+		if (is_null($order)) {
61 61
 			return false;
62 62
 		}
63 63
 
64
-		$order_id = WC_Stripe_Helper::is_wc_lt( '3.0' ) ? $order->id : $order->get_id();
64
+		$order_id = WC_Stripe_Helper::is_wc_lt('3.0') ? $order->id : $order->get_id();
65 65
 
66
-		$amount = WC_Stripe_Helper::is_wc_lt( '3.0' ) ? get_post_meta( $order_id, self::META_NAME_FEE, true ) : $order->get_meta( self::META_NAME_FEE, true );
66
+		$amount = WC_Stripe_Helper::is_wc_lt('3.0') ? get_post_meta($order_id, self::META_NAME_FEE, true) : $order->get_meta(self::META_NAME_FEE, true);
67 67
 
68 68
 		// If not found let's check for legacy name.
69
-		if ( empty( $amount ) ) {
70
-			$amount = WC_Stripe_Helper::is_wc_lt( '3.0' ) ? get_post_meta( $order_id, self::LEGACY_META_NAME_FEE, true ) : $order->get_meta( self::LEGACY_META_NAME_FEE, true );
69
+		if (empty($amount)) {
70
+			$amount = WC_Stripe_Helper::is_wc_lt('3.0') ? get_post_meta($order_id, self::LEGACY_META_NAME_FEE, true) : $order->get_meta(self::LEGACY_META_NAME_FEE, true);
71 71
 
72 72
 			// If found update to new name.
73
-			if ( $amount ) {
74
-				self::update_stripe_fee( $order, $amount );
73
+			if ($amount) {
74
+				self::update_stripe_fee($order, $amount);
75 75
 			}
76 76
 		}
77 77
 
@@ -85,14 +85,14 @@  discard block
 block discarded – undo
85 85
 	 * @param object $order
86 86
 	 * @param float $amount
87 87
 	 */
88
-	public static function update_stripe_fee( $order = null, $amount = 0.0 ) {
89
-		if ( is_null( $order ) ) {
88
+	public static function update_stripe_fee($order = null, $amount = 0.0) {
89
+		if (is_null($order)) {
90 90
 			return false;
91 91
 		}
92 92
 
93
-		$order_id = WC_Stripe_Helper::is_wc_lt( '3.0' ) ? $order->id : $order->get_id();
93
+		$order_id = WC_Stripe_Helper::is_wc_lt('3.0') ? $order->id : $order->get_id();
94 94
 
95
-		WC_Stripe_Helper::is_wc_lt( '3.0' ) ? update_post_meta( $order_id, self::META_NAME_FEE, $amount ) : $order->update_meta_data( self::META_NAME_FEE, $amount );
95
+		WC_Stripe_Helper::is_wc_lt('3.0') ? update_post_meta($order_id, self::META_NAME_FEE, $amount) : $order->update_meta_data(self::META_NAME_FEE, $amount);
96 96
 	}
97 97
 
98 98
 	/**
@@ -101,15 +101,15 @@  discard block
 block discarded – undo
101 101
 	 * @since 4.1.0
102 102
 	 * @param object $order
103 103
 	 */
104
-	public static function delete_stripe_fee( $order = null ) {
105
-		if ( is_null( $order ) ) {
104
+	public static function delete_stripe_fee($order = null) {
105
+		if (is_null($order)) {
106 106
 			return false;
107 107
 		}
108 108
 
109
-		$order_id = WC_Stripe_Helper::is_wc_lt( '3.0' ) ? $order->id : $order->get_id();
109
+		$order_id = WC_Stripe_Helper::is_wc_lt('3.0') ? $order->id : $order->get_id();
110 110
 
111
-		delete_post_meta( $order_id, self::META_NAME_FEE );
112
-		delete_post_meta( $order_id, self::LEGACY_META_NAME_FEE );
111
+		delete_post_meta($order_id, self::META_NAME_FEE);
112
+		delete_post_meta($order_id, self::LEGACY_META_NAME_FEE);
113 113
 	}
114 114
 
115 115
 	/**
@@ -119,22 +119,22 @@  discard block
 block discarded – undo
119 119
 	 * @param object $order
120 120
 	 * @return string $amount
121 121
 	 */
122
-	public static function get_stripe_net( $order = null ) {
123
-		if ( is_null( $order ) ) {
122
+	public static function get_stripe_net($order = null) {
123
+		if (is_null($order)) {
124 124
 			return false;
125 125
 		}
126 126
 
127
-		$order_id = WC_Stripe_Helper::is_wc_lt( '3.0' ) ? $order->id : $order->get_id();
127
+		$order_id = WC_Stripe_Helper::is_wc_lt('3.0') ? $order->id : $order->get_id();
128 128
 
129
-		$amount = WC_Stripe_Helper::is_wc_lt( '3.0' ) ? get_post_meta( $order_id, self::META_NAME_NET, true ) : $order->get_meta( self::META_NAME_NET, true );
129
+		$amount = WC_Stripe_Helper::is_wc_lt('3.0') ? get_post_meta($order_id, self::META_NAME_NET, true) : $order->get_meta(self::META_NAME_NET, true);
130 130
 
131 131
 		// If not found let's check for legacy name.
132
-		if ( empty( $amount ) ) {
133
-			$amount = WC_Stripe_Helper::is_wc_lt( '3.0' ) ? get_post_meta( $order_id, self::LEGACY_META_NAME_NET, true ) : $order->get_meta( self::LEGACY_META_NAME_NET, true );
132
+		if (empty($amount)) {
133
+			$amount = WC_Stripe_Helper::is_wc_lt('3.0') ? get_post_meta($order_id, self::LEGACY_META_NAME_NET, true) : $order->get_meta(self::LEGACY_META_NAME_NET, true);
134 134
 
135 135
 			// If found update to new name.
136
-			if ( $amount ) {
137
-				self::update_stripe_net( $order, $amount );
136
+			if ($amount) {
137
+				self::update_stripe_net($order, $amount);
138 138
 			}
139 139
 		}
140 140
 
@@ -148,14 +148,14 @@  discard block
 block discarded – undo
148 148
 	 * @param object $order
149 149
 	 * @param float $amount
150 150
 	 */
151
-	public static function update_stripe_net( $order = null, $amount = 0.0 ) {
152
-		if ( is_null( $order ) ) {
151
+	public static function update_stripe_net($order = null, $amount = 0.0) {
152
+		if (is_null($order)) {
153 153
 			return false;
154 154
 		}
155 155
 
156
-		$order_id = WC_Stripe_Helper::is_wc_lt( '3.0' ) ? $order->id : $order->get_id();
156
+		$order_id = WC_Stripe_Helper::is_wc_lt('3.0') ? $order->id : $order->get_id();
157 157
 
158
-		WC_Stripe_Helper::is_wc_lt( '3.0' ) ? update_post_meta( $order_id, self::META_NAME_NET, $amount ) : $order->update_meta_data( self::META_NAME_NET, $amount );
158
+		WC_Stripe_Helper::is_wc_lt('3.0') ? update_post_meta($order_id, self::META_NAME_NET, $amount) : $order->update_meta_data(self::META_NAME_NET, $amount);
159 159
 	}
160 160
 
161 161
 	/**
@@ -164,15 +164,15 @@  discard block
 block discarded – undo
164 164
 	 * @since 4.1.0
165 165
 	 * @param object $order
166 166
 	 */
167
-	public static function delete_stripe_net( $order = null ) {
168
-		if ( is_null( $order ) ) {
167
+	public static function delete_stripe_net($order = null) {
168
+		if (is_null($order)) {
169 169
 			return false;
170 170
 		}
171 171
 
172
-		$order_id = WC_Stripe_Helper::is_wc_lt( '3.0' ) ? $order->id : $order->get_id();
172
+		$order_id = WC_Stripe_Helper::is_wc_lt('3.0') ? $order->id : $order->get_id();
173 173
 
174
-		delete_post_meta( $order_id, self::META_NAME_NET );
175
-		delete_post_meta( $order_id, self::LEGACY_META_NAME_NET );
174
+		delete_post_meta($order_id, self::META_NAME_NET);
175
+		delete_post_meta($order_id, self::LEGACY_META_NAME_NET);
176 176
 	}
177 177
 
178 178
 	/**
@@ -183,15 +183,15 @@  discard block
 block discarded – undo
183 183
 	 *
184 184
 	 * @return float|int
185 185
 	 */
186
-	public static function get_stripe_amount( $total, $currency = '' ) {
187
-		if ( ! $currency ) {
186
+	public static function get_stripe_amount($total, $currency = '') {
187
+		if ( ! $currency) {
188 188
 			$currency = get_woocommerce_currency();
189 189
 		}
190 190
 
191
-		if ( in_array( strtolower( $currency ), self::no_decimal_currencies() ) ) {
192
-			return absint( $total );
191
+		if (in_array(strtolower($currency), self::no_decimal_currencies())) {
192
+			return absint($total);
193 193
 		} else {
194
-			return absint( wc_format_decimal( ( (float) $total * 100 ), wc_get_price_decimals() ) ); // In cents.
194
+			return absint(wc_format_decimal(((float) $total * 100), wc_get_price_decimals())); // In cents.
195 195
 		}
196 196
 	}
197 197
 
@@ -206,24 +206,24 @@  discard block
 block discarded – undo
206 206
 		return apply_filters(
207 207
 			'wc_stripe_localized_messages',
208 208
 			array(
209
-				'invalid_number'           => __( 'The card number is not a valid credit card number.', 'woocommerce-gateway-stripe' ),
210
-				'invalid_expiry_month'     => __( 'The card\'s expiration month is invalid.', 'woocommerce-gateway-stripe' ),
211
-				'invalid_expiry_year'      => __( 'The card\'s expiration year is invalid.', 'woocommerce-gateway-stripe' ),
212
-				'invalid_cvc'              => __( 'The card\'s security code is invalid.', 'woocommerce-gateway-stripe' ),
213
-				'incorrect_number'         => __( 'The card number is incorrect.', 'woocommerce-gateway-stripe' ),
214
-				'incomplete_number'        => __( 'The card number is incomplete.', 'woocommerce-gateway-stripe' ),
215
-				'incomplete_cvc'           => __( 'The card\'s security code is incomplete.', 'woocommerce-gateway-stripe' ),
216
-				'incomplete_expiry'        => __( 'The card\'s expiration date is incomplete.', 'woocommerce-gateway-stripe' ),
217
-				'expired_card'             => __( 'The card has expired.', 'woocommerce-gateway-stripe' ),
218
-				'incorrect_cvc'            => __( 'The card\'s security code is incorrect.', 'woocommerce-gateway-stripe' ),
219
-				'incorrect_zip'            => __( 'The card\'s zip code failed validation.', 'woocommerce-gateway-stripe' ),
220
-				'invalid_expiry_year_past' => __( 'The card\'s expiration year is in the past', 'woocommerce-gateway-stripe' ),
221
-				'card_declined'            => __( 'The card was declined.', 'woocommerce-gateway-stripe' ),
222
-				'missing'                  => __( 'There is no card on a customer that is being charged.', 'woocommerce-gateway-stripe' ),
223
-				'processing_error'         => __( 'An error occurred while processing the card.', 'woocommerce-gateway-stripe' ),
224
-				'invalid_request_error'    => __( 'Unable to process this payment, please try again or use alternative method.', 'woocommerce-gateway-stripe' ),
225
-				'invalid_sofort_country'   => __( 'The billing country is not accepted by SOFORT. Please try another country.', 'woocommerce-gateway-stripe' ),
226
-				'email_invalid'            => __( 'Invalid email address, please correct and try again.', 'woocommerce-gateway-stripe' ),
209
+				'invalid_number'           => __('The card number is not a valid credit card number.', 'woocommerce-gateway-stripe'),
210
+				'invalid_expiry_month'     => __('The card\'s expiration month is invalid.', 'woocommerce-gateway-stripe'),
211
+				'invalid_expiry_year'      => __('The card\'s expiration year is invalid.', 'woocommerce-gateway-stripe'),
212
+				'invalid_cvc'              => __('The card\'s security code is invalid.', 'woocommerce-gateway-stripe'),
213
+				'incorrect_number'         => __('The card number is incorrect.', 'woocommerce-gateway-stripe'),
214
+				'incomplete_number'        => __('The card number is incomplete.', 'woocommerce-gateway-stripe'),
215
+				'incomplete_cvc'           => __('The card\'s security code is incomplete.', 'woocommerce-gateway-stripe'),
216
+				'incomplete_expiry'        => __('The card\'s expiration date is incomplete.', 'woocommerce-gateway-stripe'),
217
+				'expired_card'             => __('The card has expired.', 'woocommerce-gateway-stripe'),
218
+				'incorrect_cvc'            => __('The card\'s security code is incorrect.', 'woocommerce-gateway-stripe'),
219
+				'incorrect_zip'            => __('The card\'s zip code failed validation.', 'woocommerce-gateway-stripe'),
220
+				'invalid_expiry_year_past' => __('The card\'s expiration year is in the past', 'woocommerce-gateway-stripe'),
221
+				'card_declined'            => __('The card was declined.', 'woocommerce-gateway-stripe'),
222
+				'missing'                  => __('There is no card on a customer that is being charged.', 'woocommerce-gateway-stripe'),
223
+				'processing_error'         => __('An error occurred while processing the card.', 'woocommerce-gateway-stripe'),
224
+				'invalid_request_error'    => __('Unable to process this payment, please try again or use alternative method.', 'woocommerce-gateway-stripe'),
225
+				'invalid_sofort_country'   => __('The billing country is not accepted by SOFORT. Please try another country.', 'woocommerce-gateway-stripe'),
226
+				'email_invalid'            => __('Invalid email address, please correct and try again.', 'woocommerce-gateway-stripe'),
227 227
 			)
228 228
 		);
229 229
 	}
@@ -264,24 +264,24 @@  discard block
 block discarded – undo
264 264
 	 * @param string $type Type of number to format
265 265
 	 * @return string
266 266
 	 */
267
-	public static function format_balance_fee( $balance_transaction, $type = 'fee' ) {
268
-		if ( ! is_object( $balance_transaction ) ) {
267
+	public static function format_balance_fee($balance_transaction, $type = 'fee') {
268
+		if ( ! is_object($balance_transaction)) {
269 269
 			return;
270 270
 		}
271 271
 
272
-		if ( in_array( strtolower( $balance_transaction->currency ), self::no_decimal_currencies() ) ) {
273
-			if ( 'fee' === $type ) {
272
+		if (in_array(strtolower($balance_transaction->currency), self::no_decimal_currencies())) {
273
+			if ('fee' === $type) {
274 274
 				return $balance_transaction->fee;
275 275
 			}
276 276
 
277 277
 			return $balance_transaction->net;
278 278
 		}
279 279
 
280
-		if ( 'fee' === $type ) {
281
-			return number_format( $balance_transaction->fee / 100, 2, '.', '' );
280
+		if ('fee' === $type) {
281
+			return number_format($balance_transaction->fee / 100, 2, '.', '');
282 282
 		}
283 283
 
284
-		return number_format( $balance_transaction->net / 100, 2, '.', '' );
284
+		return number_format($balance_transaction->net / 100, 2, '.', '');
285 285
 	}
286 286
 
287 287
 	/**
@@ -289,7 +289,7 @@  discard block
 block discarded – undo
289 289
 	 */
290 290
 	public static function get_minimum_amount() {
291 291
 		// Check order amount
292
-		switch ( get_woocommerce_currency() ) {
292
+		switch (get_woocommerce_currency()) {
293 293
 			case 'USD':
294 294
 			case 'CAD':
295 295
 			case 'EUR':
@@ -334,14 +334,14 @@  discard block
 block discarded – undo
334 334
 	 * @param string $method The payment method to get the settings from.
335 335
 	 * @param string $setting The name of the setting to get.
336 336
 	 */
337
-	public static function get_settings( $method = null, $setting = null ) {
338
-		$all_settings = null === $method ? get_option( 'woocommerce_stripe_settings', array() ) : get_option( 'woocommerce_stripe_' . $method . '_settings', array() );
337
+	public static function get_settings($method = null, $setting = null) {
338
+		$all_settings = null === $method ? get_option('woocommerce_stripe_settings', array()) : get_option('woocommerce_stripe_' . $method . '_settings', array());
339 339
 
340
-		if ( null === $setting ) {
340
+		if (null === $setting) {
341 341
 			return $all_settings;
342 342
 		}
343 343
 
344
-		return isset( $all_settings[ $setting ] ) ? $all_settings[ $setting ] : '';
344
+		return isset($all_settings[$setting]) ? $all_settings[$setting] : '';
345 345
 	}
346 346
 
347 347
 	/**
@@ -351,7 +351,7 @@  discard block
 block discarded – undo
351 351
 	 * @return bool
352 352
 	 */
353 353
 	public static function is_pre_orders_exists() {
354
-		return class_exists( 'WC_Pre_Orders_Order' );
354
+		return class_exists('WC_Pre_Orders_Order');
355 355
 	}
356 356
 
357 357
 	/**
@@ -363,9 +363,9 @@  discard block
 block discarded – undo
363 363
 	 * @return bool
364 364
 	 */
365 365
 	public static function is_pre_30() {
366
-		error_log( 'is_pre_30() function has been deprecated since 4.1.11. Please use is_wc_lt( $version ) instead.' );
366
+		error_log('is_pre_30() function has been deprecated since 4.1.11. Please use is_wc_lt( $version ) instead.');
367 367
 
368
-		return self::is_wc_lt( '3.0' );
368
+		return self::is_wc_lt('3.0');
369 369
 	}
370 370
 
371 371
 	/**
@@ -375,8 +375,8 @@  discard block
 block discarded – undo
375 375
 	 * @param string $version Version to check against.
376 376
 	 * @return bool
377 377
 	 */
378
-	public static function is_wc_lt( $version ) {
379
-		return version_compare( WC_VERSION, $version, '<' );
378
+	public static function is_wc_lt($version) {
379
+		return version_compare(WC_VERSION, $version, '<');
380 380
 	}
381 381
 
382 382
 	/**
@@ -389,7 +389,7 @@  discard block
 block discarded – undo
389 389
 	 * @return string
390 390
 	 */
391 391
 	public static function get_webhook_url() {
392
-		return add_query_arg( 'wc-api', 'wc_stripe', trailingslashit( get_home_url() ) );
392
+		return add_query_arg('wc-api', 'wc_stripe', trailingslashit(get_home_url()));
393 393
 	}
394 394
 
395 395
 	/**
@@ -399,13 +399,13 @@  discard block
 block discarded – undo
399 399
 	 * @version 4.0.0
400 400
 	 * @param string $source_id
401 401
 	 */
402
-	public static function get_order_by_source_id( $source_id ) {
402
+	public static function get_order_by_source_id($source_id) {
403 403
 		global $wpdb;
404 404
 
405
-		$order_id = $wpdb->get_var( $wpdb->prepare( "SELECT DISTINCT ID FROM $wpdb->posts as posts LEFT JOIN $wpdb->postmeta as meta ON posts.ID = meta.post_id WHERE meta.meta_value = %s AND meta.meta_key = %s", $source_id, '_stripe_source_id' ) );
405
+		$order_id = $wpdb->get_var($wpdb->prepare("SELECT DISTINCT ID FROM $wpdb->posts as posts LEFT JOIN $wpdb->postmeta as meta ON posts.ID = meta.post_id WHERE meta.meta_value = %s AND meta.meta_key = %s", $source_id, '_stripe_source_id'));
406 406
 
407
-		if ( ! empty( $order_id ) ) {
408
-			return wc_get_order( $order_id );
407
+		if ( ! empty($order_id)) {
408
+			return wc_get_order($order_id);
409 409
 		}
410 410
 
411 411
 		return false;
@@ -418,17 +418,17 @@  discard block
 block discarded – undo
418 418
 	 * @since 4.1.16 Return false if charge_id is empty.
419 419
 	 * @param string $charge_id
420 420
 	 */
421
-	public static function get_order_by_charge_id( $charge_id ) {
421
+	public static function get_order_by_charge_id($charge_id) {
422 422
 		global $wpdb;
423 423
 
424
-		if ( empty( $charge_id ) ) {
424
+		if (empty($charge_id)) {
425 425
 			return false;
426 426
 		}
427 427
 
428
-		$order_id = $wpdb->get_var( $wpdb->prepare( "SELECT DISTINCT ID FROM $wpdb->posts as posts LEFT JOIN $wpdb->postmeta as meta ON posts.ID = meta.post_id WHERE meta.meta_value = %s AND meta.meta_key = %s", $charge_id, '_transaction_id' ) );
428
+		$order_id = $wpdb->get_var($wpdb->prepare("SELECT DISTINCT ID FROM $wpdb->posts as posts LEFT JOIN $wpdb->postmeta as meta ON posts.ID = meta.post_id WHERE meta.meta_value = %s AND meta.meta_key = %s", $charge_id, '_transaction_id'));
429 429
 
430
-		if ( ! empty( $order_id ) ) {
431
-			return wc_get_order( $order_id );
430
+		if ( ! empty($order_id)) {
431
+			return wc_get_order($order_id);
432 432
 		}
433 433
 
434 434
 		return false;
@@ -441,13 +441,13 @@  discard block
 block discarded – undo
441 441
 	 * @param string $intent_id The ID of the intent.
442 442
 	 * @return WC_Order|bool Either an order or false when not found.
443 443
 	 */
444
-	public static function get_order_by_intent_id( $intent_id ) {
444
+	public static function get_order_by_intent_id($intent_id) {
445 445
 		global $wpdb;
446 446
 
447
-		$order_id = $wpdb->get_var( $wpdb->prepare( "SELECT DISTINCT ID FROM $wpdb->posts as posts LEFT JOIN $wpdb->postmeta as meta ON posts.ID = meta.post_id WHERE meta.meta_value = %s AND meta.meta_key = %s", $intent_id, '_stripe_intent_id' ) );
447
+		$order_id = $wpdb->get_var($wpdb->prepare("SELECT DISTINCT ID FROM $wpdb->posts as posts LEFT JOIN $wpdb->postmeta as meta ON posts.ID = meta.post_id WHERE meta.meta_value = %s AND meta.meta_key = %s", $intent_id, '_stripe_intent_id'));
448 448
 
449
-		if ( ! empty( $order_id ) ) {
450
-			return wc_get_order( $order_id );
449
+		if ( ! empty($order_id)) {
450
+			return wc_get_order($order_id);
451 451
 		}
452 452
 
453 453
 		return false;
@@ -460,13 +460,13 @@  discard block
 block discarded – undo
460 460
 	 * @param string $intent_id The ID of the intent.
461 461
 	 * @return WC_Order|bool Either an order or false when not found.
462 462
 	 */
463
-	public static function get_order_by_setup_intent_id( $intent_id ) {
463
+	public static function get_order_by_setup_intent_id($intent_id) {
464 464
 		global $wpdb;
465 465
 
466
-		$order_id = $wpdb->get_var( $wpdb->prepare( "SELECT DISTINCT ID FROM $wpdb->posts as posts LEFT JOIN $wpdb->postmeta as meta ON posts.ID = meta.post_id WHERE meta.meta_value = %s AND meta.meta_key = %s", $intent_id, '_stripe_setup_intent' ) );
466
+		$order_id = $wpdb->get_var($wpdb->prepare("SELECT DISTINCT ID FROM $wpdb->posts as posts LEFT JOIN $wpdb->postmeta as meta ON posts.ID = meta.post_id WHERE meta.meta_value = %s AND meta.meta_key = %s", $intent_id, '_stripe_setup_intent'));
467 467
 
468
-		if ( ! empty( $order_id ) ) {
469
-			return wc_get_order( $order_id );
468
+		if ( ! empty($order_id)) {
469
+			return wc_get_order($order_id);
470 470
 		}
471 471
 
472 472
 		return false;
@@ -482,13 +482,13 @@  discard block
 block discarded – undo
482 482
 	 * @param string $statement_descriptor
483 483
 	 * @return string $statement_descriptor Sanitized statement descriptor
484 484
 	 */
485
-	public static function clean_statement_descriptor( $statement_descriptor = '' ) {
486
-		$disallowed_characters = array( '<', '>', '"', "'" );
485
+	public static function clean_statement_descriptor($statement_descriptor = '') {
486
+		$disallowed_characters = array('<', '>', '"', "'");
487 487
 
488 488
 		// Remove special characters.
489
-		$statement_descriptor = str_replace( $disallowed_characters, '', $statement_descriptor );
489
+		$statement_descriptor = str_replace($disallowed_characters, '', $statement_descriptor);
490 490
 
491
-		$statement_descriptor = substr( trim( $statement_descriptor ), 0, 22 );
491
+		$statement_descriptor = substr(trim($statement_descriptor), 0, 22);
492 492
 
493 493
 		return $statement_descriptor;
494 494
 	}
Please login to merge, or discard this patch.
tests/phpunit/test-wc-stripe-sub-initial.php 1 patch
Spacing   +44 added lines, -44 removed lines patch added patch discarded remove patch
@@ -34,9 +34,9 @@  discard block
 block discarded – undo
34 34
 	public function setUp() {
35 35
 		parent::setUp();
36 36
 
37
-		$this->wc_stripe_subs_compat = $this->getMockBuilder( 'WC_Stripe_Subs_Compat' )
37
+		$this->wc_stripe_subs_compat = $this->getMockBuilder('WC_Stripe_Subs_Compat')
38 38
 			->disableOriginalConstructor()
39
-			->setMethods( array( 'prepare_source', 'has_subscription' ) )
39
+			->setMethods(array('prepare_source', 'has_subscription'))
40 40
 			->getMock();
41 41
 
42 42
 		// Mocked in order to get metadata[payment_type] = recurring in the HTTP request.
@@ -54,7 +54,7 @@  discard block
 block discarded – undo
54 54
 	 */
55 55
 	public function tearDown() {
56 56
 		parent::tearDown();
57
-		delete_option( 'woocommerce_stripe_settings' );
57
+		delete_option('woocommerce_stripe_settings');
58 58
 	}
59 59
 
60 60
 	/**
@@ -69,27 +69,27 @@  discard block
 block discarded – undo
69 69
 	 */
70 70
 	public function test_initial_intent_parameters() {
71 71
 		$initial_order        = WC_Helper_Order::create_order();
72
-		$order_id             = WC_Stripe_Helper::is_wc_lt( '3.0' ) ? $initial_order->id : $initial_order->get_id();
73
-		$stripe_amount        = WC_Stripe_Helper::get_stripe_amount( $initial_order->get_total() );
74
-		$currency             = strtolower( WC_Stripe_Helper::is_wc_lt( '3.0' ) ? $initial_order->get_order_currency() : $initial_order->get_currency() );
72
+		$order_id             = WC_Stripe_Helper::is_wc_lt('3.0') ? $initial_order->id : $initial_order->get_id();
73
+		$stripe_amount        = WC_Stripe_Helper::get_stripe_amount($initial_order->get_total());
74
+		$currency             = strtolower(WC_Stripe_Helper::is_wc_lt('3.0') ? $initial_order->get_order_currency() : $initial_order->get_currency());
75 75
 		$customer             = 'cus_123abc';
76 76
 		$source               = 'src_123abc';
77
-		$statement_descriptor = WC_Stripe_Helper::clean_statement_descriptor( $this->statement_descriptor );
77
+		$statement_descriptor = WC_Stripe_Helper::clean_statement_descriptor($this->statement_descriptor);
78 78
 		$intents_api_endpoint = 'https://api.stripe.com/v1/payment_intents';
79 79
 		$urls_used            = array();
80 80
 
81
-		if ( WC_Stripe_Helper::is_wc_lt( '3.0' ) ) {
81
+		if (WC_Stripe_Helper::is_wc_lt('3.0')) {
82 82
 			$initial_order->payment_method = 'stripe';
83
-			update_post_meta( $order_id, '_payment_method', 'stripe' ); // for `wc_get_order()`.
83
+			update_post_meta($order_id, '_payment_method', 'stripe'); // for `wc_get_order()`.
84 84
 		} else {
85
-			$initial_order->set_payment_method( 'stripe' );
85
+			$initial_order->set_payment_method('stripe');
86 86
 			$initial_order->save();
87 87
 		}
88 88
 
89 89
 		// Arrange: Mock prepare_source() so that we have a customer and source.
90 90
 		$this->wc_stripe_subs_compat
91
-			->expects( $this->any() )
92
-			->method( 'prepare_source' )
91
+			->expects($this->any())
92
+			->method('prepare_source')
93 93
 			->will(
94 94
 				$this->returnValue(
95 95
 					(object) array(
@@ -103,11 +103,11 @@  discard block
 block discarded – undo
103 103
 
104 104
 		// Emulate a subscription.
105 105
 		$this->wc_stripe_subs_compat
106
-			->expects( $this->any() )
107
-			->method( 'has_subscription' )
108
-			->will( $this->returnValue( true ) );
106
+			->expects($this->any())
107
+			->method('has_subscription')
108
+			->will($this->returnValue(true));
109 109
 
110
-		$pre_http_request_response_callback = function( $preempt, $request_args, $url ) use (
110
+		$pre_http_request_response_callback = function($preempt, $request_args, $url) use (
111 111
 			$stripe_amount,
112 112
 			$currency,
113 113
 			$customer,
@@ -118,9 +118,9 @@  discard block
 block discarded – undo
118 118
 			&$urls_used
119 119
 		) {
120 120
 			// Add all urls to array so we can later make assertions about which endpoints were used.
121
-			array_push( $urls_used, $url );
121
+			array_push($urls_used, $url);
122 122
 			// Continue without mocking the request if it's not the endpoint we care about.
123
-			if ( 0 !== strpos( $url, $intents_api_endpoint ) ) {
123
+			if (0 !== strpos($url, $intents_api_endpoint)) {
124 124
 				return false;
125 125
 			}
126 126
 
@@ -128,7 +128,7 @@  discard block
 block discarded – undo
128 128
 			$response = array(
129 129
 				'headers'  => array(),
130 130
 				// Too bad we aren't dynamically setting things 'cus_123abc' when using this file.
131
-				'body'     => file_get_contents( 'tests/phpunit/dummy-data/subscription_signup_response_success.json' ),
131
+				'body'     => file_get_contents('tests/phpunit/dummy-data/subscription_signup_response_success.json'),
132 132
 				'response' => array(
133 133
 					'code'    => 200,
134 134
 					'message' => 'OK',
@@ -138,17 +138,17 @@  discard block
 block discarded – undo
138 138
 			);
139 139
 
140 140
 			// Respond with a successfull intent for confirmations.
141
-			if ( $url !== $intents_api_endpoint ) {
142
-				$response['body'] = str_replace( 'requires_confirmation', 'succeeded', $response['body'] );
141
+			if ($url !== $intents_api_endpoint) {
142
+				$response['body'] = str_replace('requires_confirmation', 'succeeded', $response['body']);
143 143
 				return $response;
144 144
 			}
145 145
 
146 146
 			// Assert: the request method is POST.
147
-			$this->assertArrayHasKey( 'method', $request_args );
148
-			$this->assertSame( 'POST', $request_args['method'] );
147
+			$this->assertArrayHasKey('method', $request_args);
148
+			$this->assertSame('POST', $request_args['method']);
149 149
 
150 150
 			// Assert: the request has a body.
151
-			$this->assertArrayHasKey( 'body', $request_args );
151
+			$this->assertArrayHasKey('body', $request_args);
152 152
 
153 153
 			// Assert: the request body contains these values.
154 154
 			$expected_request_body_values = array(
@@ -158,11 +158,11 @@  discard block
 block discarded – undo
158 158
 				'statement_descriptor' => $statement_descriptor,
159 159
 				'customer'             => $customer,
160 160
 				'setup_future_usage'   => 'off_session',
161
-				'payment_method_types' => array( 'card' ),
161
+				'payment_method_types' => array('card'),
162 162
 			);
163
-			foreach ( $expected_request_body_values as $key => $value ) {
164
-				$this->assertArrayHasKey( $key, $request_args['body'] );
165
-				$this->assertSame( $value, $request_args['body'][ $key ] );
163
+			foreach ($expected_request_body_values as $key => $value) {
164
+				$this->assertArrayHasKey($key, $request_args['body']);
165
+				$this->assertSame($value, $request_args['body'][$key]);
166 166
 			}
167 167
 
168 168
 			// Assert: the request body contains these keys, without checking for their value.
@@ -170,48 +170,48 @@  discard block
 block discarded – undo
170 170
 				'description',
171 171
 				'capture_method',
172 172
 			);
173
-			foreach ( $expected_request_body_keys as $key ) {
174
-				$this->assertArrayHasKey( $key, $request_args['body'] );
173
+			foreach ($expected_request_body_keys as $key) {
174
+				$this->assertArrayHasKey($key, $request_args['body']);
175 175
 			}
176 176
 
177 177
 			// Assert: the body metadata contains the order ID.
178
-			$this->assertSame( $order_id, absint( $request_args['body']['metadata']['order_id'] ) );
178
+			$this->assertSame($order_id, absint($request_args['body']['metadata']['order_id']));
179 179
 
180 180
 			// // Assert: the body metadata has these keys, without checking for their value.
181 181
 			$expected_metadata_keys = array(
182 182
 				'customer_name',
183 183
 				'customer_email',
184 184
 			);
185
-			foreach ( $expected_metadata_keys as $key ) {
186
-				$this->assertArrayHasKey( $key, $request_args['body']['metadata'] );
185
+			foreach ($expected_metadata_keys as $key) {
186
+				$this->assertArrayHasKey($key, $request_args['body']['metadata']);
187 187
 			}
188 188
 
189 189
 			// Return dummy content as the response.
190 190
 			return $response;
191 191
 		};
192
-		add_filter( 'pre_http_request', $pre_http_request_response_callback, 10, 3 );
192
+		add_filter('pre_http_request', $pre_http_request_response_callback, 10, 3);
193 193
 
194 194
 		// Act: call process_subscription_payment().
195 195
 		// We need to use `wc_stripe_subs_compat` here because we mocked this class earlier.
196
-		$result = $this->wc_stripe_subs_compat->process_payment( $order_id );
196
+		$result = $this->wc_stripe_subs_compat->process_payment($order_id);
197 197
 
198 198
 		// Assert: nothing was returned.
199
-		$this->assertEquals( $result['result'], 'success' );
200
-		$this->assertArrayHasKey( 'redirect', $result );
199
+		$this->assertEquals($result['result'], 'success');
200
+		$this->assertArrayHasKey('redirect', $result);
201 201
 
202
-		$order      = wc_get_order( $order_id );
202
+		$order      = wc_get_order($order_id);
203 203
 		$order_data = (
204
-			WC_Stripe_Helper::is_wc_lt( '3.0' )
205
-				? get_post_meta( $order_id, '_stripe_intent_id', true )
206
-				: $order->get_meta( '_stripe_intent_id' )
204
+			WC_Stripe_Helper::is_wc_lt('3.0')
205
+				? get_post_meta($order_id, '_stripe_intent_id', true)
206
+				: $order->get_meta('_stripe_intent_id')
207 207
 		);
208 208
 
209
-		$this->assertEquals( $order_data, 'pi_123abc' );
209
+		$this->assertEquals($order_data, 'pi_123abc');
210 210
 
211 211
 		// Assert: called payment intents.
212
-		$this->assertTrue( in_array( $intents_api_endpoint, $urls_used, true ) );
212
+		$this->assertTrue(in_array($intents_api_endpoint, $urls_used, true));
213 213
 
214 214
 		// Clean up.
215
-		remove_filter( 'pre_http_request', array( $this, 'pre_http_request_response_success' ) );
215
+		remove_filter('pre_http_request', array($this, 'pre_http_request_response_success'));
216 216
 	}
217 217
 }
Please login to merge, or discard this patch.