woocommerce / woocommerce-gateway-stripe

includes/class-wc-stripe-logger.php

Spacing +13 added lines, -13 removed lines

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

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

Spacing +66 added lines, -66 removed lines

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

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

Spacing +24 added lines, -24 removed lines

@@ -25,8 +25,8 @@ 
 	/**
 	 * Helper function to update test order meta data
 	 */
-	private function updateOrderMeta( $order, $key, $value ) {
-		$order->update_meta_data( $key, $value );
+	private function updateOrderMeta($order, $key, $value) {
+		$order->update_meta_data($key, $value);
 	}
 
 	/**
@@ -34,8 +34,8 @@ 
 	 */
 	public function test_default_get_payment_intent_from_order() {
 		$order = WC_Helper_Order::create_order();
-		$intent = $this->gateway->get_intent_from_order( $order );
-		$this->assertFalse( $intent );
+		$intent = $this->gateway->get_intent_from_order($order);
+		$this->assertFalse($intent);
 	}
 
 	/**
@@ -43,30 +43,30 @@ 
 	 */
 	public function test_success_get_payment_intent_from_order() {
 		$order = WC_Helper_Order::create_order();
-		$this->updateOrderMeta( $order, '_stripe_intent_id', 'pi_123' );
-		$expected_intent = ( object ) [ 'id' => 'pi_123' ];
-		$callback = function( $preempt, $request_args, $url ) use ( $expected_intent ) {
+		$this->updateOrderMeta($order, '_stripe_intent_id', 'pi_123');
+		$expected_intent = (object) ['id' => 'pi_123'];
+		$callback = function($preempt, $request_args, $url) use ($expected_intent) {
 			$response = [
 				'headers' 	=> [],
-				'body'		=> json_encode( $expected_intent ),
+				'body'		=> json_encode($expected_intent),
 				'response'	=> [
 					'code' 		=> 200,
 					'message' 	=> 'OK',
 				],
 			];
 
-			$this->assertEquals( 'GET', $request_args['method'] );
-			$this->assertStringEndsWith( 'payment_intents/pi_123', $url );
+			$this->assertEquals('GET', $request_args['method']);
+			$this->assertStringEndsWith('payment_intents/pi_123', $url);
 
 			return $response;
 		};
 
-		add_filter( 'pre_http_request', $callback, 10, 3);
+		add_filter('pre_http_request', $callback, 10, 3);
 
-		$intent = $this->gateway->get_intent_from_order( $order );
-		$this->assertEquals( $expected_intent, $intent );
+		$intent = $this->gateway->get_intent_from_order($order);
+		$this->assertEquals($expected_intent, $intent);
 
-		remove_filter( 'pre_http_request', $callback );
+		remove_filter('pre_http_request', $callback);
 	}
 
 	/**
@@ -74,34 +74,34 @@ 
 	 */
 	public function test_error_get_payment_intent_from_order() {
 		$order = WC_Helper_Order::create_order();
-		$this->updateOrderMeta( $order, '_stripe_intent_id', 'pi_123' );
-		$response_error = ( object ) [
+		$this->updateOrderMeta($order, '_stripe_intent_id', 'pi_123');
+		$response_error = (object) [
 			'error' => [
 				'code' 		=> 'resource_missing',
 				'message' 	=> 'error_message'
 			]
 		];
-		$callback = function( $preempt, $request_args, $url ) use ( $response_error ) {
+		$callback = function($preempt, $request_args, $url) use ($response_error) {
 			$response = [
 				'headers' 	=> [],
-				'body'		=> json_encode( $response_error ),
+				'body'		=> json_encode($response_error),
 				'response'	=> [
 					'code' 		=> 404,
 					'message' 	=> 'ERR',
 				],
 			];
 
-			$this->assertEquals( 'GET', $request_args['method'] );
-			$this->assertStringEndsWith( 'payment_intents/pi_123', $url );
+			$this->assertEquals('GET', $request_args['method']);
+			$this->assertStringEndsWith('payment_intents/pi_123', $url);
 
 			return $response;
 		};
 
-		add_filter( 'pre_http_request', $callback, 10, 3);
+		add_filter('pre_http_request', $callback, 10, 3);
 
-		$intent = $this->gateway->get_intent_from_order( $order );
-		$this->assertFalse( $intent );
+		$intent = $this->gateway->get_intent_from_order($order);
+		$this->assertFalse($intent);
 
-		remove_filter( 'pre_http_request', $callback );
+		remove_filter('pre_http_request', $callback);
 	}
 }

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

Spacing +39 added lines, -39 removed lines

@@ -34,9 +34,9 @@ 
 	public function setUp() {
 		parent::setUp();
 
-		$this->wc_stripe_subs_compat = $this->getMockBuilder( 'WC_Stripe_Subs_Compat' )
+		$this->wc_stripe_subs_compat = $this->getMockBuilder('WC_Stripe_Subs_Compat')
 			->disableOriginalConstructor()
-			->setMethods( array( 'prepare_source', 'has_subscription' ) )
+			->setMethods(array('prepare_source', 'has_subscription'))
 			->getMock();
 
 		// Mocked in order to get metadata[payment_type] = recurring in the HTTP request.
@@ -54,7 +54,7 @@ 
 	 */
 	public function tearDown() {
 		parent::tearDown();
-		delete_option( 'woocommerce_stripe_settings' );
+		delete_option('woocommerce_stripe_settings');
 	}
 
 	/**
@@ -70,21 +70,21 @@ 
 	public function test_initial_intent_parameters() {
 		$initial_order        = WC_Helper_Order::create_order();
 		$order_id             = $initial_order->get_id();
-		$stripe_amount        = WC_Stripe_Helper::get_stripe_amount( $initial_order->get_total() );
-		$currency             = strtolower( $initial_order->get_currency() );
+		$stripe_amount        = WC_Stripe_Helper::get_stripe_amount($initial_order->get_total());
+		$currency             = strtolower($initial_order->get_currency());
 		$customer             = 'cus_123abc';
 		$source               = 'src_123abc';
-		$statement_descriptor = WC_Stripe_Helper::clean_statement_descriptor( $this->statement_descriptor );
+		$statement_descriptor = WC_Stripe_Helper::clean_statement_descriptor($this->statement_descriptor);
 		$intents_api_endpoint = 'https://api.stripe.com/v1/payment_intents';
 		$urls_used            = array();
 
-		$initial_order->set_payment_method( 'stripe' );
+		$initial_order->set_payment_method('stripe');
 		$initial_order->save();
 
 		// Arrange: Mock prepare_source() so that we have a customer and source.
 		$this->wc_stripe_subs_compat
-			->expects( $this->any() )
-			->method( 'prepare_source' )
+			->expects($this->any())
+			->method('prepare_source')
 			->will(
 				$this->returnValue(
 					(object) array(
@@ -98,11 +98,11 @@ 
 
 		// Emulate a subscription.
 		$this->wc_stripe_subs_compat
-			->expects( $this->any() )
-			->method( 'has_subscription' )
-			->will( $this->returnValue( true ) );
+			->expects($this->any())
+			->method('has_subscription')
+			->will($this->returnValue(true));
 
-		$pre_http_request_response_callback = function( $preempt, $request_args, $url ) use (
+		$pre_http_request_response_callback = function($preempt, $request_args, $url) use (
 			$stripe_amount,
 			$currency,
 			$customer,
@@ -113,9 +113,9 @@ 
 			&$urls_used
 		) {
 			// Add all urls to array so we can later make assertions about which endpoints were used.
-			array_push( $urls_used, $url );
+			array_push($urls_used, $url);
 			// Continue without mocking the request if it's not the endpoint we care about.
-			if ( 0 !== strpos( $url, $intents_api_endpoint ) ) {
+			if (0 !== strpos($url, $intents_api_endpoint)) {
 				return false;
 			}
 
@@ -123,7 +123,7 @@ 
 			$response = array(
 				'headers'  => array(),
 				// Too bad we aren't dynamically setting things 'cus_123abc' when using this file.
-				'body'     => file_get_contents( 'tests/phpunit/dummy-data/subscription_signup_response_success.json' ),
+				'body'     => file_get_contents('tests/phpunit/dummy-data/subscription_signup_response_success.json'),
 				'response' => array(
 					'code'    => 200,
 					'message' => 'OK',
@@ -133,17 +133,17 @@ 
 			);
 
 			// Respond with a successfull intent for confirmations.
-			if ( $url !== $intents_api_endpoint ) {
-				$response['body'] = str_replace( 'requires_confirmation', 'succeeded', $response['body'] );
+			if ($url !== $intents_api_endpoint) {
+				$response['body'] = str_replace('requires_confirmation', 'succeeded', $response['body']);
 				return $response;
 			}
 
 			// Assert: the request method is POST.
-			$this->assertArrayHasKey( 'method', $request_args );
-			$this->assertSame( 'POST', $request_args['method'] );
+			$this->assertArrayHasKey('method', $request_args);
+			$this->assertSame('POST', $request_args['method']);
 
 			// Assert: the request has a body.
-			$this->assertArrayHasKey( 'body', $request_args );
+			$this->assertArrayHasKey('body', $request_args);
 
 			// Assert: the request body contains these values.
 			$expected_request_body_values = array(
@@ -153,11 +153,11 @@ 
 				'statement_descriptor' => $statement_descriptor,
 				'customer'             => $customer,
 				'setup_future_usage'   => 'off_session',
-				'payment_method_types' => array( 'card' ),
+				'payment_method_types' => array('card'),
 			);
-			foreach ( $expected_request_body_values as $key => $value ) {
-				$this->assertArrayHasKey( $key, $request_args['body'] );
-				$this->assertSame( $value, $request_args['body'][ $key ] );
+			foreach ($expected_request_body_values as $key => $value) {
+				$this->assertArrayHasKey($key, $request_args['body']);
+				$this->assertSame($value, $request_args['body'][$key]);
 			}
 
 			// Assert: the request body contains these keys, without checking for their value.
@@ -165,44 +165,44 @@ 
 				'description',
 				'capture_method',
 			);
-			foreach ( $expected_request_body_keys as $key ) {
-				$this->assertArrayHasKey( $key, $request_args['body'] );
+			foreach ($expected_request_body_keys as $key) {
+				$this->assertArrayHasKey($key, $request_args['body']);
 			}
 
 			// Assert: the body metadata contains the order ID.
-			$this->assertSame( $order_id, absint( $request_args['body']['metadata']['order_id'] ) );
+			$this->assertSame($order_id, absint($request_args['body']['metadata']['order_id']));
 
 			// // Assert: the body metadata has these keys, without checking for their value.
 			$expected_metadata_keys = array(
 				'customer_name',
 				'customer_email',
 			);
-			foreach ( $expected_metadata_keys as $key ) {
-				$this->assertArrayHasKey( $key, $request_args['body']['metadata'] );
+			foreach ($expected_metadata_keys as $key) {
+				$this->assertArrayHasKey($key, $request_args['body']['metadata']);
 			}
 
 			// Return dummy content as the response.
 			return $response;
 		};
-		add_filter( 'pre_http_request', $pre_http_request_response_callback, 10, 3 );
+		add_filter('pre_http_request', $pre_http_request_response_callback, 10, 3);
 
 		// Act: call process_subscription_payment().
 		// We need to use `wc_stripe_subs_compat` here because we mocked this class earlier.
-		$result = $this->wc_stripe_subs_compat->process_payment( $order_id );
+		$result = $this->wc_stripe_subs_compat->process_payment($order_id);
 
 		// Assert: nothing was returned.
-		$this->assertEquals( $result['result'], 'success' );
-		$this->assertArrayHasKey( 'redirect', $result );
+		$this->assertEquals($result['result'], 'success');
+		$this->assertArrayHasKey('redirect', $result);
 
-		$order      = wc_get_order( $order_id );
-		$order_data = $order->get_meta( '_stripe_intent_id' );
+		$order      = wc_get_order($order_id);
+		$order_data = $order->get_meta('_stripe_intent_id');
 
-		$this->assertEquals( $order_data, 'pi_123abc' );
+		$this->assertEquals($order_data, 'pi_123abc');
 
 		// Assert: called payment intents.
-		$this->assertTrue( in_array( $intents_api_endpoint, $urls_used, true ) );
+		$this->assertTrue(in_array($intents_api_endpoint, $urls_used, true));
 
 		// Clean up.
-		remove_filter( 'pre_http_request', array( $this, 'pre_http_request_response_success' ) );
+		remove_filter('pre_http_request', array($this, 'pre_http_request_response_success'));
 	}
 }

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

Spacing +22 added lines, -22 removed lines

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

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

Spacing +100 added lines, -100 removed lines

@@ -1,5 +1,5 @@ 
 <?php
-if ( ! defined( 'ABSPATH' ) ) {
+if ( ! defined('ABSPATH')) {
 	exit;
 }
 
@@ -21,9 +21,9 @@ 
 	 * @since 4.1.0
 	 */
 	public function __construct() {
-		add_action( 'admin_notices', array( $this, 'admin_notices' ) );
-		add_action( 'wp_loaded', array( $this, 'hide_notices' ) );
-		add_action( 'woocommerce_stripe_updated', array( $this, 'stripe_updated' ) );
+		add_action('admin_notices', array($this, 'admin_notices'));
+		add_action('wp_loaded', array($this, 'hide_notices'));
+		add_action('woocommerce_stripe_updated', array($this, 'stripe_updated'));
 	}
 
 	/**
@@ -32,8 +32,8 @@ 
 	 * @since 1.0.0
 	 * @version 4.0.0
 	 */
-	public function add_admin_notice( $slug, $class, $message, $dismissible = false ) {
-		$this->notices[ $slug ] = array(
+	public function add_admin_notice($slug, $class, $message, $dismissible = false) {
+		$this->notices[$slug] = array(
 			'class'       => $class,
 			'message'     => $message,
 			'dismissible' => $dismissible,
@@ -47,7 +47,7 @@ 
 	 * @version 4.0.0
 	 */
 	public function admin_notices() {
-		if ( ! current_user_can( 'manage_woocommerce' ) ) {
+		if ( ! current_user_can('manage_woocommerce')) {
 			return;
 		}
 
@@ -57,17 +57,17 @@ 
 		// All other payment methods.
 		$this->payment_methods_check_environment();
 
-		foreach ( (array) $this->notices as $notice_key => $notice ) {
-			echo '<div class="' . esc_attr( $notice['class'] ) . '" style="position:relative;">';
+		foreach ((array) $this->notices as $notice_key => $notice) {
+			echo '<div class="' . esc_attr($notice['class']) . '" style="position:relative;">';
 
-			if ( $notice['dismissible'] ) {
+			if ($notice['dismissible']) {
 				?>
-				<a href="<?php echo esc_url( wp_nonce_url( add_query_arg( 'wc-stripe-hide-notice', $notice_key ), 'wc_stripe_hide_notices_nonce', '_wc_stripe_notice_nonce' ) ); ?>" class="woocommerce-message-close notice-dismiss" style="position:relative;float:right;padding:9px 0px 9px 9px 9px;text-decoration:none;"></a>
+				<a href="<?php echo esc_url(wp_nonce_url(add_query_arg('wc-stripe-hide-notice', $notice_key), 'wc_stripe_hide_notices_nonce', '_wc_stripe_notice_nonce')); ?>" class="woocommerce-message-close notice-dismiss" style="position:relative;float:right;padding:9px 0px 9px 9px 9px;text-decoration:none;"></a>
 				<?php
 			}
 
 			echo '<p>';
-			echo wp_kses( $notice['message'], array( 'a' => array( 'href' => array(), 'target' => array() ) ) );
+			echo wp_kses($notice['message'], array('a' => array('href' => array(), 'target' => array())));
 			echo '</p></div>';
 		}
 	}
@@ -100,111 +100,111 @@ 
 	 * @version 4.0.0
 	 */
 	public function stripe_check_environment() {
-		$show_style_notice   = get_option( 'wc_stripe_show_style_notice' );
-		$show_ssl_notice     = get_option( 'wc_stripe_show_ssl_notice' );
-		$show_keys_notice    = get_option( 'wc_stripe_show_keys_notice' );
-		$show_3ds_notice     = get_option( 'wc_stripe_show_3ds_notice' );
-		$show_phpver_notice  = get_option( 'wc_stripe_show_phpver_notice' );
-		$show_wcver_notice   = get_option( 'wc_stripe_show_wcver_notice' );
-		$show_curl_notice    = get_option( 'wc_stripe_show_curl_notice' );
-		$show_sca_notice     = get_option( 'wc_stripe_show_sca_notice' );
-		$changed_keys_notice = get_option( 'wc_stripe_show_changed_keys_notice' );
-		$options             = get_option( 'woocommerce_stripe_settings' );
-		$testmode            = ( isset( $options['testmode'] ) && 'yes' === $options['testmode'] ) ? true : false;
-		$test_pub_key        = isset( $options['test_publishable_key'] ) ? $options['test_publishable_key'] : '';
-		$test_secret_key     = isset( $options['test_secret_key'] ) ? $options['test_secret_key'] : '';
-		$live_pub_key        = isset( $options['publishable_key'] ) ? $options['publishable_key'] : '';
-		$live_secret_key     = isset( $options['secret_key'] ) ? $options['secret_key'] : '';
-		$three_d_secure      = isset( $options['three_d_secure'] ) && 'yes' === $options['three_d_secure'];
-
-		if ( isset( $options['enabled'] ) && 'yes' === $options['enabled'] ) {
-			if ( empty( $show_3ds_notice ) && $three_d_secure ) {
+		$show_style_notice   = get_option('wc_stripe_show_style_notice');
+		$show_ssl_notice     = get_option('wc_stripe_show_ssl_notice');
+		$show_keys_notice    = get_option('wc_stripe_show_keys_notice');
+		$show_3ds_notice     = get_option('wc_stripe_show_3ds_notice');
+		$show_phpver_notice  = get_option('wc_stripe_show_phpver_notice');
+		$show_wcver_notice   = get_option('wc_stripe_show_wcver_notice');
+		$show_curl_notice    = get_option('wc_stripe_show_curl_notice');
+		$show_sca_notice     = get_option('wc_stripe_show_sca_notice');
+		$changed_keys_notice = get_option('wc_stripe_show_changed_keys_notice');
+		$options             = get_option('woocommerce_stripe_settings');
+		$testmode            = (isset($options['testmode']) && 'yes' === $options['testmode']) ? true : false;
+		$test_pub_key        = isset($options['test_publishable_key']) ? $options['test_publishable_key'] : '';
+		$test_secret_key     = isset($options['test_secret_key']) ? $options['test_secret_key'] : '';
+		$live_pub_key        = isset($options['publishable_key']) ? $options['publishable_key'] : '';
+		$live_secret_key     = isset($options['secret_key']) ? $options['secret_key'] : '';
+		$three_d_secure      = isset($options['three_d_secure']) && 'yes' === $options['three_d_secure'];
+
+		if (isset($options['enabled']) && 'yes' === $options['enabled']) {
+			if (empty($show_3ds_notice) && $three_d_secure) {
 				$url = 'https://stripe.com/docs/payments/3d-secure#three-ds-radar';
 
 				/* translators: 1) A URL that explains Stripe Radar. */
-				$message = __( 'WooCommerce Stripe - We see that you had the "Require 3D secure when applicable" setting turned on. This setting is not available here anymore, because it is now replaced by Stripe Radar. You can learn more about it <a href="%s" target="_blank">here</a>.', 'woocommerce-gateway-stripe' );
+				$message = __('WooCommerce Stripe - We see that you had the "Require 3D secure when applicable" setting turned on. This setting is not available here anymore, because it is now replaced by Stripe Radar. You can learn more about it <a href="%s" target="_blank">here</a>.', 'woocommerce-gateway-stripe');
 
-				$this->add_admin_notice( '3ds', 'notice notice-warning', sprintf( $message, $url ), true );
+				$this->add_admin_notice('3ds', 'notice notice-warning', sprintf($message, $url), true);
 			}
 
-			if ( empty( $show_style_notice ) ) {
+			if (empty($show_style_notice)) {
 				/* translators: 1) int version 2) int version */
-				$message = __( 'WooCommerce Stripe - We recently made changes to Stripe that may impact the appearance of your checkout. If your checkout has changed unexpectedly, please follow these <a href="https://docs.woocommerce.com/document/stripe/#styling" target="_blank">instructions</a> to fix.', 'woocommerce-gateway-stripe' );
+				$message = __('WooCommerce Stripe - We recently made changes to Stripe that may impact the appearance of your checkout. If your checkout has changed unexpectedly, please follow these <a href="https://docs.woocommerce.com/document/stripe/#styling" target="_blank">instructions</a> to fix.', 'woocommerce-gateway-stripe');
 
-				$this->add_admin_notice( 'style', 'notice notice-warning', $message, true );
+				$this->add_admin_notice('style', 'notice notice-warning', $message, true);
 
 				return;
 			}
 
-			if ( empty( $show_phpver_notice ) ) {
-				if ( version_compare( phpversion(), WC_STRIPE_MIN_PHP_VER, '<' ) ) {
+			if (empty($show_phpver_notice)) {
+				if (version_compare(phpversion(), WC_STRIPE_MIN_PHP_VER, '<')) {
 					/* translators: 1) int version 2) int version */
-					$message = __( 'WooCommerce Stripe - The minimum PHP version required for this plugin is %1$s. You are running %2$s.', 'woocommerce-gateway-stripe' );
+					$message = __('WooCommerce Stripe - The minimum PHP version required for this plugin is %1$s. You are running %2$s.', 'woocommerce-gateway-stripe');
 
-					$this->add_admin_notice( 'phpver', 'error', sprintf( $message, WC_STRIPE_MIN_PHP_VER, phpversion() ), true );
+					$this->add_admin_notice('phpver', 'error', sprintf($message, WC_STRIPE_MIN_PHP_VER, phpversion()), true);
 
 					return;
 				}
 			}
 
-			if ( empty( $show_wcver_notice ) ) {
-				if ( WC_Stripe_Helper::is_wc_lt( WC_STRIPE_FUTURE_MIN_WC_VER ) ) {
+			if (empty($show_wcver_notice)) {
+				if (WC_Stripe_Helper::is_wc_lt(WC_STRIPE_FUTURE_MIN_WC_VER)) {
 					/* translators: 1) int version 2) int version */
-					$message = __( 'WooCommerce Stripe - This is the last version of the plugin compatible with WooCommerce %1$s. All furture versions of the plugin will require WooCommerce %2$s or greater.', 'woocommerce-gateway-stripe' );
-					$this->add_admin_notice( 'wcver', 'notice notice-warning', sprintf( $message, WC_VERSION, WC_STRIPE_FUTURE_MIN_WC_VER ), true );
+					$message = __('WooCommerce Stripe - This is the last version of the plugin compatible with WooCommerce %1$s. All furture versions of the plugin will require WooCommerce %2$s or greater.', 'woocommerce-gateway-stripe');
+					$this->add_admin_notice('wcver', 'notice notice-warning', sprintf($message, WC_VERSION, WC_STRIPE_FUTURE_MIN_WC_VER), true);
 				}
 			}
 
-			if ( empty( $show_curl_notice ) ) {
-				if ( ! function_exists( 'curl_init' ) ) {
-					$this->add_admin_notice( 'curl', 'notice notice-warning', __( 'WooCommerce Stripe - cURL is not installed.', 'woocommerce-gateway-stripe' ), true );
+			if (empty($show_curl_notice)) {
+				if ( ! function_exists('curl_init')) {
+					$this->add_admin_notice('curl', 'notice notice-warning', __('WooCommerce Stripe - cURL is not installed.', 'woocommerce-gateway-stripe'), true);
 				}
 			}
 
-			if ( empty( $show_keys_notice ) ) {
+			if (empty($show_keys_notice)) {
 				$secret = WC_Stripe_API::get_secret_key();
 
-				if ( empty( $secret ) && ! ( isset( $_GET['page'], $_GET['section'] ) && 'wc-settings' === $_GET['page'] && 'stripe' === $_GET['section'] ) ) {
+				if (empty($secret) && ! (isset($_GET['page'], $_GET['section']) && 'wc-settings' === $_GET['page'] && 'stripe' === $_GET['section'])) {
 					$setting_link = $this->get_setting_link();
 					/* translators: 1) link */
-					$this->add_admin_notice( 'keys', 'notice notice-warning', sprintf( __( 'Stripe is almost ready. To get started, <a href="%s">set your Stripe account keys</a>.', 'woocommerce-gateway-stripe' ), $setting_link ), true );
+					$this->add_admin_notice('keys', 'notice notice-warning', sprintf(__('Stripe is almost ready. To get started, <a href="%s">set your Stripe account keys</a>.', 'woocommerce-gateway-stripe'), $setting_link), true);
 				}
 
 				// Check if keys are entered properly per live/test mode.
-				if ( $testmode ) {
+				if ($testmode) {
 					if (
-						! empty( $test_pub_key ) && ! preg_match( '/^pk_test_/', $test_pub_key )
-						|| ! empty( $test_secret_key ) && ! preg_match( '/^[rs]k_test_/', $test_secret_key ) ) {
+						! empty($test_pub_key) && ! preg_match('/^pk_test_/', $test_pub_key)
+						|| ! empty($test_secret_key) && ! preg_match('/^[rs]k_test_/', $test_secret_key) ) {
 						$setting_link = $this->get_setting_link();
 						/* translators: 1) link */
-						$this->add_admin_notice( 'keys', 'notice notice-error', sprintf( __( 'Stripe is in test mode however your test keys may not be valid. Test keys start with pk_test and sk_test or rk_test. Please go to your settings and, <a href="%s">set your Stripe account keys</a>.', 'woocommerce-gateway-stripe' ), $setting_link ), true );
+						$this->add_admin_notice('keys', 'notice notice-error', sprintf(__('Stripe is in test mode however your test keys may not be valid. Test keys start with pk_test and sk_test or rk_test. Please go to your settings and, <a href="%s">set your Stripe account keys</a>.', 'woocommerce-gateway-stripe'), $setting_link), true);
 					}
 				} else {
 					if (
-						! empty( $live_pub_key ) && ! preg_match( '/^pk_live_/', $live_pub_key )
-						|| ! empty( $live_secret_key ) && ! preg_match( '/^[rs]k_live_/', $live_secret_key ) ) {
+						! empty($live_pub_key) && ! preg_match('/^pk_live_/', $live_pub_key)
+						|| ! empty($live_secret_key) && ! preg_match('/^[rs]k_live_/', $live_secret_key) ) {
 						$setting_link = $this->get_setting_link();
 						/* translators: 1) link */
-						$this->add_admin_notice( 'keys', 'notice notice-error', sprintf( __( 'Stripe is in live mode however your live keys may not be valid. Live keys start with pk_live and sk_live or rk_live. Please go to your settings and, <a href="%s">set your Stripe account keys</a>.', 'woocommerce-gateway-stripe' ), $setting_link ), true );
+						$this->add_admin_notice('keys', 'notice notice-error', sprintf(__('Stripe is in live mode however your live keys may not be valid. Live keys start with pk_live and sk_live or rk_live. Please go to your settings and, <a href="%s">set your Stripe account keys</a>.', 'woocommerce-gateway-stripe'), $setting_link), true);
 					}
 				}
 			}
 
-			if ( empty( $show_ssl_notice ) ) {
+			if (empty($show_ssl_notice)) {
 				// Show message if enabled and FORCE SSL is disabled and WordpressHTTPS plugin is not detected.
-				if ( ! wc_checkout_is_https() ) {
+				if ( ! wc_checkout_is_https()) {
 					/* translators: 1) link */
-					$this->add_admin_notice( 'ssl', 'notice notice-warning', sprintf( __( 'Stripe is enabled, but a SSL certificate is not detected. Your checkout may not be secure! Please ensure your server has a valid <a href="%1$s" target="_blank">SSL certificate</a>', 'woocommerce-gateway-stripe' ), 'https://en.wikipedia.org/wiki/Transport_Layer_Security' ), true );
+					$this->add_admin_notice('ssl', 'notice notice-warning', sprintf(__('Stripe is enabled, but a SSL certificate is not detected. Your checkout may not be secure! Please ensure your server has a valid <a href="%1$s" target="_blank">SSL certificate</a>', 'woocommerce-gateway-stripe'), 'https://en.wikipedia.org/wiki/Transport_Layer_Security'), true);
 				}
 			}
 
-			if ( empty( $show_sca_notice ) ) {
-				$this->add_admin_notice( 'sca', 'notice notice-success', sprintf( __( 'Stripe is now ready for Strong Customer Authentication (SCA) and 3D Secure 2! <a href="%1$s" target="_blank">Read about SCA</a>', 'woocommerce-gateway-stripe' ), 'https://woocommerce.com/posts/introducing-strong-customer-authentication-sca/' ), true );
+			if (empty($show_sca_notice)) {
+				$this->add_admin_notice('sca', 'notice notice-success', sprintf(__('Stripe is now ready for Strong Customer Authentication (SCA) and 3D Secure 2! <a href="%1$s" target="_blank">Read about SCA</a>', 'woocommerce-gateway-stripe'), 'https://woocommerce.com/posts/introducing-strong-customer-authentication-sca/'), true);
 			}
 
-			if ( 'yes' === $changed_keys_notice ) {
+			if ('yes' === $changed_keys_notice) {
 				// translators: %s is a the URL for the link.
-				$this->add_admin_notice( 'changed_keys', 'notice notice-warning', sprintf( __( 'The public and/or secret keys for the Stripe gateway have been changed. This might cause errors for existing customers and saved payment methods. <a href="%s" target="_blank">Click here to learn more</a>.', 'woocommerce-gateway-stripe' ), 'https://docs.woocommerce.com/document/stripe-fixing-customer-errors/' ), true );
+				$this->add_admin_notice('changed_keys', 'notice notice-warning', sprintf(__('The public and/or secret keys for the Stripe gateway have been changed. This might cause errors for existing customers and saved payment methods. <a href="%s" target="_blank">Click here to learn more</a>.', 'woocommerce-gateway-stripe'), 'https://docs.woocommerce.com/document/stripe-fixing-customer-errors/'), true);
 			}
 		}
 	}
@@ -217,17 +217,17 @@ 
 	public function payment_methods_check_environment() {
 		$payment_methods = $this->get_payment_methods();
 
-		foreach ( $payment_methods as $method => $class ) {
-			$show_notice = get_option( 'wc_stripe_show_' . strtolower( $method ) . '_notice' );
+		foreach ($payment_methods as $method => $class) {
+			$show_notice = get_option('wc_stripe_show_' . strtolower($method) . '_notice');
 			$gateway     = new $class();
 
-			if ( 'yes' !== $gateway->enabled || 'no' === $show_notice ) {
+			if ('yes' !== $gateway->enabled || 'no' === $show_notice) {
 				continue;
 			}
 
-			if ( ! in_array( get_woocommerce_currency(), $gateway->get_supported_currency() ) ) {
+			if ( ! in_array(get_woocommerce_currency(), $gateway->get_supported_currency())) {
 				/* translators: %1$s Payment method, %2$s List of supported currencies */
-				$this->add_admin_notice( $method, 'notice notice-error', sprintf( __( '%1$s is enabled - it requires store currency to be set to %2$s', 'woocommerce-gateway-stripe' ), $method, implode( ', ', $gateway->get_supported_currency() ) ), true );
+				$this->add_admin_notice($method, 'notice notice-error', sprintf(__('%1$s is enabled - it requires store currency to be set to %2$s', 'woocommerce-gateway-stripe'), $method, implode(', ', $gateway->get_supported_currency())), true);
 			}
 		}
 	}
@@ -239,71 +239,71 @@ 
 	 * @version 4.0.0
 	 */
 	public function hide_notices() {
-		if ( isset( $_GET['wc-stripe-hide-notice'] ) && isset( $_GET['_wc_stripe_notice_nonce'] ) ) {
-			if ( ! wp_verify_nonce( $_GET['_wc_stripe_notice_nonce'], 'wc_stripe_hide_notices_nonce' ) ) {
-				wp_die( __( 'Action failed. Please refresh the page and retry.', 'woocommerce-gateway-stripe' ) );
+		if (isset($_GET['wc-stripe-hide-notice']) && isset($_GET['_wc_stripe_notice_nonce'])) {
+			if ( ! wp_verify_nonce($_GET['_wc_stripe_notice_nonce'], 'wc_stripe_hide_notices_nonce')) {
+				wp_die(__('Action failed. Please refresh the page and retry.', 'woocommerce-gateway-stripe'));
 			}
 
-			if ( ! current_user_can( 'manage_woocommerce' ) ) {
-				wp_die( __( 'Cheatin&#8217; huh?', 'woocommerce-gateway-stripe' ) );
+			if ( ! current_user_can('manage_woocommerce')) {
+				wp_die(__('Cheatin&#8217; huh?', 'woocommerce-gateway-stripe'));
 			}
 
-			$notice = wc_clean( $_GET['wc-stripe-hide-notice'] );
+			$notice = wc_clean($_GET['wc-stripe-hide-notice']);
 
-			switch ( $notice ) {
+			switch ($notice) {
 				case 'style':
-					update_option( 'wc_stripe_show_style_notice', 'no' );
+					update_option('wc_stripe_show_style_notice', 'no');
 					break;
 				case 'phpver':
-					update_option( 'wc_stripe_show_phpver_notice', 'no' );
+					update_option('wc_stripe_show_phpver_notice', 'no');
 					break;
 				case 'wcver':
-					update_option( 'wc_stripe_show_wcver_notice', 'no' );
+					update_option('wc_stripe_show_wcver_notice', 'no');
 					break;
 				case 'curl':
-					update_option( 'wc_stripe_show_curl_notice', 'no' );
+					update_option('wc_stripe_show_curl_notice', 'no');
 					break;
 				case 'ssl':
-					update_option( 'wc_stripe_show_ssl_notice', 'no' );
+					update_option('wc_stripe_show_ssl_notice', 'no');
 					break;
 				case 'keys':
-					update_option( 'wc_stripe_show_keys_notice', 'no' );
+					update_option('wc_stripe_show_keys_notice', 'no');
 					break;
 				case '3ds':
-					update_option( 'wc_stripe_show_3ds_notice', 'no' );
+					update_option('wc_stripe_show_3ds_notice', 'no');
 					break;
 				case 'Alipay':
-					update_option( 'wc_stripe_show_alipay_notice', 'no' );
+					update_option('wc_stripe_show_alipay_notice', 'no');
 					break;
 				case 'Bancontact':
-					update_option( 'wc_stripe_show_bancontact_notice', 'no' );
+					update_option('wc_stripe_show_bancontact_notice', 'no');
 					break;
 				case 'EPS':
-					update_option( 'wc_stripe_show_eps_notice', 'no' );
+					update_option('wc_stripe_show_eps_notice', 'no');
 					break;
 				case 'Giropay':
-					update_option( 'wc_stripe_show_giropay_notice', 'no' );
+					update_option('wc_stripe_show_giropay_notice', 'no');
 					break;
 				case 'iDeal':
-					update_option( 'wc_stripe_show_ideal_notice', 'no' );
+					update_option('wc_stripe_show_ideal_notice', 'no');
 					break;
 				case 'Multibanco':
-					update_option( 'wc_stripe_show_multibanco_notice', 'no' );
+					update_option('wc_stripe_show_multibanco_notice', 'no');
 					break;
 				case 'P24':
-					update_option( 'wc_stripe_show_p24_notice', 'no' );
+					update_option('wc_stripe_show_p24_notice', 'no');
 					break;
 				case 'SEPA':
-					update_option( 'wc_stripe_show_sepa_notice', 'no' );
+					update_option('wc_stripe_show_sepa_notice', 'no');
 					break;
 				case 'SOFORT':
-					update_option( 'wc_stripe_show_sofort_notice', 'no' );
+					update_option('wc_stripe_show_sofort_notice', 'no');
 					break;
 				case 'sca':
-					update_option( 'wc_stripe_show_sca_notice', 'no' );
+					update_option('wc_stripe_show_sca_notice', 'no');
 					break;
 				case 'changed_keys':
-					update_option( 'wc_stripe_show_changed_keys_notice', 'no' );
+					update_option('wc_stripe_show_changed_keys_notice', 'no');
 			}
 		}
 	}
@@ -316,7 +316,7 @@ 
 	 * @return string Setting link
 	 */
 	public function get_setting_link() {
-		return admin_url( 'admin.php?page=wc-settings&tab=checkout&section=stripe' );
+		return admin_url('admin.php?page=wc-settings&tab=checkout&section=stripe');
 	}
 
 	/**
@@ -325,16 +325,16 @@ 
 	 * @since 4.3.0
 	 */
 	public function stripe_updated() {
-		$previous_version = get_option( 'wc_stripe_version' );
+		$previous_version = get_option('wc_stripe_version');
 
 		// Only show the style notice if the plugin was installed and older than 4.1.4.
-		if ( empty( $previous_version ) || version_compare( $previous_version, '4.1.4', 'ge' ) ) {
-			update_option( 'wc_stripe_show_style_notice', 'no' );
+		if (empty($previous_version) || version_compare($previous_version, '4.1.4', 'ge')) {
+			update_option('wc_stripe_show_style_notice', 'no');
 		}
 
 		// Only show the SCA notice on pre-4.3.0 installs.
-		if ( empty( $previous_version ) || version_compare( $previous_version, '4.3.0', 'ge' ) ) {
-			update_option( 'wc_stripe_show_sca_notice', 'no' );
+		if (empty($previous_version) || version_compare($previous_version, '4.3.0', 'ge')) {
+			update_option('wc_stripe_show_sca_notice', 'no');
 		}
 	}
 }

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

Spacing +31 added lines, -31 removed lines

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

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

Spacing +113 added lines, -113 removed lines

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

includes/connect/class-wc-stripe-connect-rest-oauth-connect-controller.php

Spacing +9 added lines, -9 removed lines

@@ -1,10 +1,10 @@ 
 <?php
 
-if ( ! defined( 'ABSPATH' ) ) {
+if ( ! defined('ABSPATH')) {
 	exit;
 }
 
-if ( ! class_exists( 'WC_Stripe_Connect_REST_Oauth_Connect_Controller' ) ) {
+if ( ! class_exists('WC_Stripe_Connect_REST_Oauth_Connect_Controller')) {
 	/**
 	 * Stripe Connect Oauth Connect controller class.
 	 */
@@ -30,9 +30,9 @@ 
 		 * @param WC_Stripe_Connect     $connect stripe connect.
 		 * @param WC_Stripe_Connect_API $api     stripe connect api.
 		 */
-		public function __construct( WC_Stripe_Connect $connect, WC_Stripe_Connect_API $api ) {
+		public function __construct(WC_Stripe_Connect $connect, WC_Stripe_Connect_API $api) {
 
-			parent::__construct( $api );
+			parent::__construct($api);
 
 			$this->connect = $connect;
 		}
@@ -44,19 +44,19 @@ 
 		 *
 		 * @return array|WP_Error
 		 */
-		public function post( $request ) {
+		public function post($request) {
 
 			$data     = $request->get_json_params();
-			$response = $this->connect->connect_oauth( $data['state'], $data['code'] );
+			$response = $this->connect->connect_oauth($data['state'], $data['code']);
 
-			if ( is_wp_error( $response ) ) {
+			if (is_wp_error($response)) {
 
-				WC_Stripe_Logger::log( $response, __CLASS__ );
+				WC_Stripe_Logger::log($response, __CLASS__);
 
 				return new WP_Error(
 					$response->get_error_code(),
 					$response->get_error_message(),
-					array( 'status' => 400 )
+					array('status' => 400)
 				);
 			}