woocommerce / woocommerce-gateway-stripe

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

Spacing +8 added lines, -8 removed lines

@@ -1,10 +1,10 @@ 
 <?php
 
-if ( ! defined( 'ABSPATH' ) ) {
+if ( ! defined('ABSPATH')) {
 	exit;
 }
 
-if ( ! class_exists( 'WC_Stripe_Connect_REST_Deauthorize_Controller' ) ) {
+if ( ! class_exists('WC_Stripe_Connect_REST_Deauthorize_Controller')) {
 	/**
 	 * Stripe Connect deauthorize 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,18 +44,18 @@ 
 		 *
 		 * @return array|WP_Error
 		 */
-		public function post( $request ) {
+		public function post($request) {
 
 			$response = $connect->deauthorize_account();
 
-			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)
 				);
 			}
 

tests/phpunit/bootstrap.php

Spacing +13 added lines, -13 removed lines

@@ -1,28 +1,28 @@
 <?php
-$_tests_dir = getenv( 'WP_TESTS_DIR' );
-if ( ! $_tests_dir ) {
+$_tests_dir = getenv('WP_TESTS_DIR');
+if ( ! $_tests_dir) {
 	$_tests_dir = '/tmp/wordpress-tests-lib';
 }
 
 require_once $_tests_dir . '/includes/functions.php';
 
 function _manually_load_plugin() {
-	$plugin_dir = dirname( dirname( dirname( dirname( __FILE__ ) ) ) ) . '/';
+	$plugin_dir = dirname(dirname(dirname(dirname(__FILE__)))) . '/';
 	require $plugin_dir . 'woocommerce/woocommerce.php';
-	require dirname( __FILE__ ) . '/setup.php';
+	require dirname(__FILE__) . '/setup.php';
 	require $plugin_dir . 'woocommerce-gateway-stripe/woocommerce-gateway-stripe.php';
 }
 
-tests_add_filter( 'muplugins_loaded', '_manually_load_plugin' );
+tests_add_filter('muplugins_loaded', '_manually_load_plugin');
 
 require $_tests_dir . '/includes/bootstrap.php';
 
-$wc_tests_framework_base_dir = dirname( dirname( dirname( dirname( __FILE__ ) ) ) ) . '/woocommerce/tests/framework/';
-require_once( $wc_tests_framework_base_dir . 'class-wc-mock-session-handler.php' );
+$wc_tests_framework_base_dir = dirname(dirname(dirname(dirname(__FILE__)))) . '/woocommerce/tests/framework/';
+require_once($wc_tests_framework_base_dir . 'class-wc-mock-session-handler.php');
 //require_once( $wc_tests_framework_base_dir . 'class-wc-unit-test-case.php' );
-require_once( $wc_tests_framework_base_dir . 'helpers/class-wc-helper-product.php' );
-require_once( $wc_tests_framework_base_dir . 'helpers/class-wc-helper-coupon.php' );
-require_once( $wc_tests_framework_base_dir . 'helpers/class-wc-helper-fee.php' );
-require_once( $wc_tests_framework_base_dir . 'helpers/class-wc-helper-shipping.php' );
-require_once( $wc_tests_framework_base_dir . 'helpers/class-wc-helper-customer.php' );
-require_once( $wc_tests_framework_base_dir . 'helpers/class-wc-helper-order.php' );
+require_once($wc_tests_framework_base_dir . 'helpers/class-wc-helper-product.php');
+require_once($wc_tests_framework_base_dir . 'helpers/class-wc-helper-coupon.php');
+require_once($wc_tests_framework_base_dir . 'helpers/class-wc-helper-fee.php');
+require_once($wc_tests_framework_base_dir . 'helpers/class-wc-helper-shipping.php');
+require_once($wc_tests_framework_base_dir . 'helpers/class-wc-helper-customer.php');
+require_once($wc_tests_framework_base_dir . 'helpers/class-wc-helper-order.php');

tests/phpunit/setup.php

Spacing +1 added lines, -1 removed lines

@@ -2,4 +2,4 @@
 /**
  * Set up shared by all tests.
  */
-update_option( 'woocommerce_default_country', 'US:CA' );
+update_option('woocommerce_default_country', 'US:CA');

woocommerce-gateway-stripe.php

Spacing +112 added lines, -112 removed lines

@@ -15,20 +15,20 @@ 
  *
  */
 
-if ( ! defined( 'ABSPATH' ) ) {
+if ( ! defined('ABSPATH')) {
 	exit;
 }
 
 /**
  * Required minimums and constants
  */
-define( 'WC_STRIPE_VERSION', '4.5.0' );
-define( 'WC_STRIPE_MIN_PHP_VER', '5.6.0' );
-define( 'WC_STRIPE_MIN_WC_VER', '3.0' );
-define( 'WC_STRIPE_FUTURE_MIN_WC_VER', '3.0' );
-define( 'WC_STRIPE_MAIN_FILE', __FILE__ );
-define( 'WC_STRIPE_PLUGIN_URL', untrailingslashit( plugins_url( basename( plugin_dir_path( __FILE__ ) ), basename( __FILE__ ) ) ) );
-define( 'WC_STRIPE_PLUGIN_PATH', untrailingslashit( plugin_dir_path( __FILE__ ) ) );
+define('WC_STRIPE_VERSION', '4.5.0');
+define('WC_STRIPE_MIN_PHP_VER', '5.6.0');
+define('WC_STRIPE_MIN_WC_VER', '3.0');
+define('WC_STRIPE_FUTURE_MIN_WC_VER', '3.0');
+define('WC_STRIPE_MAIN_FILE', __FILE__);
+define('WC_STRIPE_PLUGIN_URL', untrailingslashit(plugins_url(basename(plugin_dir_path(__FILE__)), basename(__FILE__))));
+define('WC_STRIPE_PLUGIN_PATH', untrailingslashit(plugin_dir_path(__FILE__)));
 
 // phpcs:disable WordPress.Files.FileName
 
@@ -40,7 +40,7 @@ 
  */
 function woocommerce_stripe_missing_wc_notice() {
 	/* translators: 1. URL link. */
-	echo '<div class="error"><p><strong>' . sprintf( esc_html__( 'Stripe requires WooCommerce to be installed and active. You can download %s here.', 'woocommerce-gateway-stripe' ), '<a href="https://woocommerce.com/" target="_blank">WooCommerce</a>' ) . '</strong></p></div>';
+	echo '<div class="error"><p><strong>' . sprintf(esc_html__('Stripe requires WooCommerce to be installed and active. You can download %s here.', 'woocommerce-gateway-stripe'), '<a href="https://woocommerce.com/" target="_blank">WooCommerce</a>') . '</strong></p></div>';
 }
 
 /**
@@ -51,7 +51,7 @@ 
  */
 function woocommerce_stripe_wc_not_supported() {
 	/* translators: $1. Minimum WooCommerce version. $2. Current WooCommerce version. */
-	echo '<div class="error"><p><strong>' . sprintf( esc_html__( 'Stripe requires WooCommerce %1$s or greater to be installed and active. WooCommerce %2$s is no longer supported.', 'woocommerce-gateway-stripe' ), WC_STRIPE_MIN_WC_VER, WC_VERSION ) . '</strong></p></div>';
+	echo '<div class="error"><p><strong>' . sprintf(esc_html__('Stripe requires WooCommerce %1$s or greater to be installed and active. WooCommerce %2$s is no longer supported.', 'woocommerce-gateway-stripe'), WC_STRIPE_MIN_WC_VER, WC_VERSION) . '</strong></p></div>';
 }
 
 /**
@@ -61,7 +61,7 @@ 
  * @return string
  */
 function woocommerce_stripe_wc_country_not_supported() {
-	echo '<div class="error"><p><strong>' . __( 'Stripe is not available in your store\'s country and will not be available for buyers to choose during checkout.', 'woocommerce-gateway-stripe' ) . '</strong></p></div>';
+	echo '<div class="error"><p><strong>' . __('Stripe is not available in your store\'s country and will not be available for buyers to choose during checkout.', 'woocommerce-gateway-stripe') . '</strong></p></div>';
 }
 
 /**
@@ -72,7 +72,7 @@ 
  * @return bool
  */
 function woocommerce_stripe_wc_country_is_supported_country() {
-	$wc_default_country = substr( get_option( 'woocommerce_default_country' ), 0, 2 );
+	$wc_default_country = substr(get_option('woocommerce_default_country'), 0, 2);
 
 	$supported_countries = apply_filters(
 		'wc_stripe_supported_countries',
@@ -118,30 +118,30 @@ 
 		)
 	);
 
-	return in_array( $wc_default_country, $supported_countries );
+	return in_array($wc_default_country, $supported_countries);
 }
 
-add_action( 'plugins_loaded', 'woocommerce_gateway_stripe_init' );
+add_action('plugins_loaded', 'woocommerce_gateway_stripe_init');
 
 function woocommerce_gateway_stripe_init() {
-	load_plugin_textdomain( 'woocommerce-gateway-stripe', false, plugin_basename( dirname( __FILE__ ) ) . '/languages' );
+	load_plugin_textdomain('woocommerce-gateway-stripe', false, plugin_basename(dirname(__FILE__)) . '/languages');
 
-	if ( ! class_exists( 'WooCommerce' ) ) {
-		add_action( 'admin_notices', 'woocommerce_stripe_missing_wc_notice' );
+	if ( ! class_exists('WooCommerce')) {
+		add_action('admin_notices', 'woocommerce_stripe_missing_wc_notice');
 		return;
 	}
 
-	if ( version_compare( WC_VERSION, WC_STRIPE_MIN_WC_VER, '<' ) ) {
-		add_action( 'admin_notices', 'woocommerce_stripe_wc_not_supported' );
+	if (version_compare(WC_VERSION, WC_STRIPE_MIN_WC_VER, '<')) {
+		add_action('admin_notices', 'woocommerce_stripe_wc_not_supported');
 		return;
 	}
 
-	if ( ! woocommerce_stripe_wc_country_is_supported_country() ) {
-		add_action( 'admin_notices', 'woocommerce_stripe_wc_country_not_supported' );
+	if ( ! woocommerce_stripe_wc_country_is_supported_country()) {
+		add_action('admin_notices', 'woocommerce_stripe_wc_country_not_supported');
 		return;
 	}
 
-	if ( ! class_exists( 'WC_Stripe' ) ) :
+	if ( ! class_exists('WC_Stripe')) :
 
 		class WC_Stripe {
 
@@ -156,7 +156,7 @@ 
 			 * @return Singleton The *Singleton* instance.
 			 */
 			public static function get_instance() {
-				if ( null === self::$instance ) {
+				if (null === self::$instance) {
 					self::$instance = new self();
 				}
 				return self::$instance;
@@ -197,17 +197,17 @@ 
 			 * *Singleton* via the `new` operator from outside of this class.
 			 */
 			private function __construct() {
-				add_action( 'admin_init', array( $this, 'install' ) );
+				add_action('admin_init', array($this, 'install'));
 
 				$this->init();
 
 				$this->api     = new WC_Stripe_Connect_API();
-				$this->connect = new WC_Stripe_Connect( $this->api );
+				$this->connect = new WC_Stripe_Connect($this->api);
 
-				add_action( 'rest_api_init', array( $this, 'register_connect_routes' ) );
+				add_action('rest_api_init', array($this, 'register_connect_routes'));
 
-				if ( get_option( 'stripe_state', false ) ) {
-					add_action( 'admin_enqueue_scripts', array( $this->connect, 'maybe_connect_oauth' ) );
+				if (get_option('stripe_state', false)) {
+					add_action('admin_enqueue_scripts', array($this->connect, 'maybe_connect_oauth'));
 				}
 			}
 
@@ -218,55 +218,55 @@ 
 			 * @version 4.0.0
 			 */
 			public function init() {
-				if ( is_admin() ) {
-					require_once dirname( __FILE__ ) . '/includes/admin/class-wc-stripe-privacy.php';
+				if (is_admin()) {
+					require_once dirname(__FILE__) . '/includes/admin/class-wc-stripe-privacy.php';
 				}
 
-				require_once dirname( __FILE__ ) . '/includes/class-wc-stripe-exception.php';
-				require_once dirname( __FILE__ ) . '/includes/class-wc-stripe-logger.php';
-				require_once dirname( __FILE__ ) . '/includes/class-wc-stripe-helper.php';
-				include_once dirname( __FILE__ ) . '/includes/class-wc-stripe-api.php';
-				require_once dirname( __FILE__ ) . '/includes/abstracts/abstract-wc-stripe-payment-gateway.php';
-				require_once dirname( __FILE__ ) . '/includes/class-wc-stripe-webhook-handler.php';
-				require_once dirname( __FILE__ ) . '/includes/class-wc-stripe-sepa-payment-token.php';
-				require_once dirname( __FILE__ ) . '/includes/class-wc-stripe-apple-pay-registration.php';
-				require_once dirname( __FILE__ ) . '/includes/compat/class-wc-stripe-pre-orders-compat.php';
-				require_once dirname( __FILE__ ) . '/includes/class-wc-gateway-stripe.php';
-				require_once dirname( __FILE__ ) . '/includes/payment-methods/class-wc-gateway-stripe-bancontact.php';
-				require_once dirname( __FILE__ ) . '/includes/payment-methods/class-wc-gateway-stripe-sofort.php';
-				require_once dirname( __FILE__ ) . '/includes/payment-methods/class-wc-gateway-stripe-giropay.php';
-				require_once dirname( __FILE__ ) . '/includes/payment-methods/class-wc-gateway-stripe-eps.php';
-				require_once dirname( __FILE__ ) . '/includes/payment-methods/class-wc-gateway-stripe-ideal.php';
-				require_once dirname( __FILE__ ) . '/includes/payment-methods/class-wc-gateway-stripe-p24.php';
-				require_once dirname( __FILE__ ) . '/includes/payment-methods/class-wc-gateway-stripe-alipay.php';
-				require_once dirname( __FILE__ ) . '/includes/payment-methods/class-wc-gateway-stripe-sepa.php';
-				require_once dirname( __FILE__ ) . '/includes/payment-methods/class-wc-gateway-stripe-multibanco.php';
-				require_once dirname( __FILE__ ) . '/includes/payment-methods/class-wc-stripe-payment-request.php';
-				require_once dirname( __FILE__ ) . '/includes/compat/class-wc-stripe-subs-compat.php';
-				require_once dirname( __FILE__ ) . '/includes/compat/class-wc-stripe-sepa-subs-compat.php';
-				require_once dirname( __FILE__ ) . '/includes/connect/class-wc-stripe-connect.php';
-				require_once dirname( __FILE__ ) . '/includes/connect/class-wc-stripe-connect-api.php';
-				require_once dirname( __FILE__ ) . '/includes/class-wc-stripe-order-handler.php';
-				require_once dirname( __FILE__ ) . '/includes/class-wc-stripe-payment-tokens.php';
-				require_once dirname( __FILE__ ) . '/includes/class-wc-stripe-customer.php';
-				require_once dirname( __FILE__ ) . '/includes/class-wc-stripe-intent-controller.php';
-
-				if ( is_admin() ) {
-					require_once dirname( __FILE__ ) . '/includes/admin/class-wc-stripe-admin-notices.php';
+				require_once dirname(__FILE__) . '/includes/class-wc-stripe-exception.php';
+				require_once dirname(__FILE__) . '/includes/class-wc-stripe-logger.php';
+				require_once dirname(__FILE__) . '/includes/class-wc-stripe-helper.php';
+				include_once dirname(__FILE__) . '/includes/class-wc-stripe-api.php';
+				require_once dirname(__FILE__) . '/includes/abstracts/abstract-wc-stripe-payment-gateway.php';
+				require_once dirname(__FILE__) . '/includes/class-wc-stripe-webhook-handler.php';
+				require_once dirname(__FILE__) . '/includes/class-wc-stripe-sepa-payment-token.php';
+				require_once dirname(__FILE__) . '/includes/class-wc-stripe-apple-pay-registration.php';
+				require_once dirname(__FILE__) . '/includes/compat/class-wc-stripe-pre-orders-compat.php';
+				require_once dirname(__FILE__) . '/includes/class-wc-gateway-stripe.php';
+				require_once dirname(__FILE__) . '/includes/payment-methods/class-wc-gateway-stripe-bancontact.php';
+				require_once dirname(__FILE__) . '/includes/payment-methods/class-wc-gateway-stripe-sofort.php';
+				require_once dirname(__FILE__) . '/includes/payment-methods/class-wc-gateway-stripe-giropay.php';
+				require_once dirname(__FILE__) . '/includes/payment-methods/class-wc-gateway-stripe-eps.php';
+				require_once dirname(__FILE__) . '/includes/payment-methods/class-wc-gateway-stripe-ideal.php';
+				require_once dirname(__FILE__) . '/includes/payment-methods/class-wc-gateway-stripe-p24.php';
+				require_once dirname(__FILE__) . '/includes/payment-methods/class-wc-gateway-stripe-alipay.php';
+				require_once dirname(__FILE__) . '/includes/payment-methods/class-wc-gateway-stripe-sepa.php';
+				require_once dirname(__FILE__) . '/includes/payment-methods/class-wc-gateway-stripe-multibanco.php';
+				require_once dirname(__FILE__) . '/includes/payment-methods/class-wc-stripe-payment-request.php';
+				require_once dirname(__FILE__) . '/includes/compat/class-wc-stripe-subs-compat.php';
+				require_once dirname(__FILE__) . '/includes/compat/class-wc-stripe-sepa-subs-compat.php';
+				require_once dirname(__FILE__) . '/includes/connect/class-wc-stripe-connect.php';
+				require_once dirname(__FILE__) . '/includes/connect/class-wc-stripe-connect-api.php';
+				require_once dirname(__FILE__) . '/includes/class-wc-stripe-order-handler.php';
+				require_once dirname(__FILE__) . '/includes/class-wc-stripe-payment-tokens.php';
+				require_once dirname(__FILE__) . '/includes/class-wc-stripe-customer.php';
+				require_once dirname(__FILE__) . '/includes/class-wc-stripe-intent-controller.php';
+
+				if (is_admin()) {
+					require_once dirname(__FILE__) . '/includes/admin/class-wc-stripe-admin-notices.php';
 				}
 
 				// REMOVE IN THE FUTURE.
-				require_once dirname( __FILE__ ) . '/includes/deprecated/class-wc-stripe-apple-pay.php';
+				require_once dirname(__FILE__) . '/includes/deprecated/class-wc-stripe-apple-pay.php';
 
-				add_filter( 'woocommerce_payment_gateways', array( $this, 'add_gateways' ) );
-				add_filter( 'plugin_action_links_' . plugin_basename( __FILE__ ), array( $this, 'plugin_action_links' ) );
-				add_filter( 'plugin_row_meta', array( $this, 'plugin_row_meta' ), 10, 2 );
+				add_filter('woocommerce_payment_gateways', array($this, 'add_gateways'));
+				add_filter('plugin_action_links_' . plugin_basename(__FILE__), array($this, 'plugin_action_links'));
+				add_filter('plugin_row_meta', array($this, 'plugin_row_meta'), 10, 2);
 
 				// Modify emails emails.
-				add_filter( 'woocommerce_email_classes', array( $this, 'add_emails' ), 20 );
+				add_filter('woocommerce_email_classes', array($this, 'add_emails'), 20);
 
-				if ( version_compare( WC_VERSION, '3.4', '<' ) ) {
-					add_filter( 'woocommerce_get_sections_checkout', array( $this, 'filter_gateway_order_admin' ) );
+				if (version_compare(WC_VERSION, '3.4', '<')) {
+					add_filter('woocommerce_get_sections_checkout', array($this, 'filter_gateway_order_admin'));
 				}
 			}
 
@@ -277,8 +277,8 @@ 
 			 * @version 4.0.0
 			 */
 			public function update_plugin_version() {
-				delete_option( 'wc_stripe_version' );
-				update_option( 'wc_stripe_version', WC_STRIPE_VERSION );
+				delete_option('wc_stripe_version');
+				update_option('wc_stripe_version', WC_STRIPE_VERSION);
 			}
 
 			/**
@@ -288,15 +288,15 @@ 
 			 * @version 3.1.0
 			 */
 			public function install() {
-				if ( ! is_plugin_active( plugin_basename( __FILE__ ) ) ) {
+				if ( ! is_plugin_active(plugin_basename(__FILE__))) {
 					return;
 				}
 
-				if ( ! defined( 'IFRAME_REQUEST' ) && ( WC_STRIPE_VERSION !== get_option( 'wc_stripe_version' ) ) ) {
-					do_action( 'woocommerce_stripe_updated' );
+				if ( ! defined('IFRAME_REQUEST') && (WC_STRIPE_VERSION !== get_option('wc_stripe_version'))) {
+					do_action('woocommerce_stripe_updated');
 
-					if ( ! defined( 'WC_STRIPE_INSTALLING' ) ) {
-						define( 'WC_STRIPE_INSTALLING', true );
+					if ( ! defined('WC_STRIPE_INSTALLING')) {
+						define('WC_STRIPE_INSTALLING', true);
 					}
 
 					$this->update_plugin_version();
@@ -309,11 +309,11 @@ 
 			 * @since 1.0.0
 			 * @version 4.0.0
 			 */
-			public function plugin_action_links( $links ) {
+			public function plugin_action_links($links) {
 				$plugin_links = array(
-					'<a href="admin.php?page=wc-settings&tab=checkout&section=stripe">' . esc_html__( 'Settings', 'woocommerce-gateway-stripe' ) . '</a>',
+					'<a href="admin.php?page=wc-settings&tab=checkout&section=stripe">' . esc_html__('Settings', 'woocommerce-gateway-stripe') . '</a>',
 				);
-				return array_merge( $plugin_links, $links );
+				return array_merge($plugin_links, $links);
 			}
 
 			/**
@@ -324,13 +324,13 @@ 
 			 * @param  string $file  Name of current file.
 			 * @return array  $links Update list of plugin links.
 			 */
-			public function plugin_row_meta( $links, $file ) {
-				if ( plugin_basename( __FILE__ ) === $file ) {
+			public function plugin_row_meta($links, $file) {
+				if (plugin_basename(__FILE__) === $file) {
 					$row_meta = array(
-						'docs'    => '<a href="' . esc_url( apply_filters( 'woocommerce_gateway_stripe_docs_url', 'https://docs.woocommerce.com/document/stripe/' ) ) . '" title="' . esc_attr( __( 'View Documentation', 'woocommerce-gateway-stripe' ) ) . '">' . __( 'Docs', 'woocommerce-gateway-stripe' ) . '</a>',
-						'support' => '<a href="' . esc_url( apply_filters( 'woocommerce_gateway_stripe_support_url', 'https://woocommerce.com/my-account/create-a-ticket?select=18627' ) ) . '" title="' . esc_attr( __( 'Open a support request at WooCommerce.com', 'woocommerce-gateway-stripe' ) ) . '">' . __( 'Support', 'woocommerce-gateway-stripe' ) . '</a>',
+						'docs'    => '<a href="' . esc_url(apply_filters('woocommerce_gateway_stripe_docs_url', 'https://docs.woocommerce.com/document/stripe/')) . '" title="' . esc_attr(__('View Documentation', 'woocommerce-gateway-stripe')) . '">' . __('Docs', 'woocommerce-gateway-stripe') . '</a>',
+						'support' => '<a href="' . esc_url(apply_filters('woocommerce_gateway_stripe_support_url', 'https://woocommerce.com/my-account/create-a-ticket?select=18627')) . '" title="' . esc_attr(__('Open a support request at WooCommerce.com', 'woocommerce-gateway-stripe')) . '">' . __('Support', 'woocommerce-gateway-stripe') . '</a>',
 					);
-					return array_merge( $links, $row_meta );
+					return array_merge($links, $row_meta);
 				}
 				return (array) $links;
 			}
@@ -341,8 +341,8 @@ 
 			 * @since 1.0.0
 			 * @version 4.0.0
 			 */
-			public function add_gateways( $methods ) {
-				if ( class_exists( 'WC_Subscriptions_Order' ) && function_exists( 'wcs_create_renewal_order' ) ) {
+			public function add_gateways($methods) {
+				if (class_exists('WC_Subscriptions_Order') && function_exists('wcs_create_renewal_order')) {
 					$methods[] = 'WC_Stripe_Subs_Compat';
 					$methods[] = 'WC_Stripe_Sepa_Subs_Compat';
 				} else {
@@ -368,28 +368,28 @@ 
 			 * @since 4.0.0
 			 * @version 4.0.0
 			 */
-			public function filter_gateway_order_admin( $sections ) {
-				unset( $sections['stripe'] );
-				unset( $sections['stripe_bancontact'] );
-				unset( $sections['stripe_sofort'] );
-				unset( $sections['stripe_giropay'] );
-				unset( $sections['stripe_eps'] );
-				unset( $sections['stripe_ideal'] );
-				unset( $sections['stripe_p24'] );
-				unset( $sections['stripe_alipay'] );
-				unset( $sections['stripe_sepa'] );
-				unset( $sections['stripe_multibanco'] );
+			public function filter_gateway_order_admin($sections) {
+				unset($sections['stripe']);
+				unset($sections['stripe_bancontact']);
+				unset($sections['stripe_sofort']);
+				unset($sections['stripe_giropay']);
+				unset($sections['stripe_eps']);
+				unset($sections['stripe_ideal']);
+				unset($sections['stripe_p24']);
+				unset($sections['stripe_alipay']);
+				unset($sections['stripe_sepa']);
+				unset($sections['stripe_multibanco']);
 
 				$sections['stripe']            = 'Stripe';
-				$sections['stripe_bancontact'] = __( 'Stripe Bancontact', 'woocommerce-gateway-stripe' );
-				$sections['stripe_sofort']     = __( 'Stripe SOFORT', 'woocommerce-gateway-stripe' );
-				$sections['stripe_giropay']    = __( 'Stripe Giropay', 'woocommerce-gateway-stripe' );
-				$sections['stripe_eps']        = __( 'Stripe EPS', 'woocommerce-gateway-stripe' );
-				$sections['stripe_ideal']      = __( 'Stripe iDeal', 'woocommerce-gateway-stripe' );
-				$sections['stripe_p24']        = __( 'Stripe P24', 'woocommerce-gateway-stripe' );
-				$sections['stripe_alipay']     = __( 'Stripe Alipay', 'woocommerce-gateway-stripe' );
-				$sections['stripe_sepa']       = __( 'Stripe SEPA Direct Debit', 'woocommerce-gateway-stripe' );
-				$sections['stripe_multibanco'] = __( 'Stripe Multibanco', 'woocommerce-gateway-stripe' );
+				$sections['stripe_bancontact'] = __('Stripe Bancontact', 'woocommerce-gateway-stripe');
+				$sections['stripe_sofort']     = __('Stripe SOFORT', 'woocommerce-gateway-stripe');
+				$sections['stripe_giropay']    = __('Stripe Giropay', 'woocommerce-gateway-stripe');
+				$sections['stripe_eps']        = __('Stripe EPS', 'woocommerce-gateway-stripe');
+				$sections['stripe_ideal']      = __('Stripe iDeal', 'woocommerce-gateway-stripe');
+				$sections['stripe_p24']        = __('Stripe P24', 'woocommerce-gateway-stripe');
+				$sections['stripe_alipay']     = __('Stripe Alipay', 'woocommerce-gateway-stripe');
+				$sections['stripe_sepa']       = __('Stripe SEPA Direct Debit', 'woocommerce-gateway-stripe');
+				$sections['stripe_multibanco'] = __('Stripe Multibanco', 'woocommerce-gateway-stripe');
 
 				return $sections;
 			}
@@ -400,16 +400,16 @@ 
 			 * @param WC_Email[] $email_classes All existing emails.
 			 * @return WC_Email[]
 			 */
-			public function add_emails( $email_classes ) {
+			public function add_emails($email_classes) {
 				require_once WC_STRIPE_PLUGIN_PATH . '/includes/compat/class-wc-stripe-email-failed-authentication.php';
 				require_once WC_STRIPE_PLUGIN_PATH . '/includes/compat/class-wc-stripe-email-failed-renewal-authentication.php';
 				require_once WC_STRIPE_PLUGIN_PATH . '/includes/compat/class-wc-stripe-email-failed-preorder-authentication.php';
 				require_once WC_STRIPE_PLUGIN_PATH . '/includes/compat/class-wc-stripe-email-failed-authentication-retry.php';
 
 				// Add all emails, generated by the gateway.
-				$email_classes['WC_Stripe_Email_Failed_Renewal_Authentication']  = new WC_Stripe_Email_Failed_Renewal_Authentication( $email_classes );
-				$email_classes['WC_Stripe_Email_Failed_Preorder_Authentication'] = new WC_Stripe_Email_Failed_Preorder_Authentication( $email_classes );
-				$email_classes['WC_Stripe_Email_Failed_Authentication_Retry'] = new WC_Stripe_Email_Failed_Authentication_Retry( $email_classes );
+				$email_classes['WC_Stripe_Email_Failed_Renewal_Authentication']  = new WC_Stripe_Email_Failed_Renewal_Authentication($email_classes);
+				$email_classes['WC_Stripe_Email_Failed_Preorder_Authentication'] = new WC_Stripe_Email_Failed_Preorder_Authentication($email_classes);
+				$email_classes['WC_Stripe_Email_Failed_Authentication_Retry'] = new WC_Stripe_Email_Failed_Authentication_Retry($email_classes);
 
 				return $email_classes;
 			}
@@ -424,9 +424,9 @@ 
 				require_once WC_STRIPE_PLUGIN_PATH . '/includes/connect/class-wc-stripe-connect-rest-oauth-connect-controller.php';
 				require_once WC_STRIPE_PLUGIN_PATH . '/includes/connect/class-wc-stripe-connect-rest-deauthorize-controller.php';
 
-				$oauth_init    = new WC_Stripe_Connect_REST_Oauth_Init_Controller( $this->connect, $this->api );
-				$oauth_connect = new WC_Stripe_Connect_REST_Oauth_Connect_Controller( $this->connect, $this->api );
-				$deauthorize   = new WC_Stripe_Connect_REST_Deauthorize_Controller( $this->connect, $this->api );
+				$oauth_init    = new WC_Stripe_Connect_REST_Oauth_Init_Controller($this->connect, $this->api);
+				$oauth_connect = new WC_Stripe_Connect_REST_Oauth_Connect_Controller($this->connect, $this->api);
+				$deauthorize   = new WC_Stripe_Connect_REST_Deauthorize_Controller($this->connect, $this->api);
 
 				$oauth_init->register_routes();
 				$oauth_connect->register_routes();

includes/connect/class-wc-stripe-connect.php

Spacing +42 added lines, -42 removed lines

@@ -1,10 +1,10 @@ 
 <?php
 
-if ( ! defined( 'ABSPATH' ) ) {
+if ( ! defined('ABSPATH')) {
 	exit;
 }
 
-if ( ! class_exists( 'WC_Stripe_Connect' ) ) {
+if ( ! class_exists('WC_Stripe_Connect')) {
 	/**
 	 * Stripe Connect class.
 	 */
@@ -24,11 +24,11 @@ 
 		 *
 		 * @param WC_Stripe_Connect_API $api stripe connect api.
 		 */
-		public function __construct( WC_Stripe_Connect_API $api ) {
+		public function __construct(WC_Stripe_Connect_API $api) {
 
 			$this->api = $api;
 
-			add_action( 'wc_ajax_wc_stripe_connect_oauth', array( $this, 'wc_ajax_connect_oauth' ) );
+			add_action('wc_ajax_wc_stripe_connect_oauth', array($this, 'wc_ajax_connect_oauth'));
 		}
 
 		/**
@@ -38,23 +38,23 @@ 
 		 *
 		 * @return string|WP_Error
 		 */
-		public function get_oauth_url( $return_url = '' ) {
+		public function get_oauth_url($return_url = '') {
 
-			if ( empty( $return_url ) ) {
-				$return_url = admin_url( 'admin.php?page=wc-settings&tab=checkout&section=stripe' );
+			if (empty($return_url)) {
+				$return_url = admin_url('admin.php?page=wc-settings&tab=checkout&section=stripe');
 			}
 
-			if ( substr( $return_url, 0, 8 ) !== 'https://' ) {
-				return new WP_Error( 'invalid_url_protocol', __( 'Your site must be served over HTTPS in order to connect your Stripe account automatically.', 'woocommerce-gateway-stripe' ) );
+			if (substr($return_url, 0, 8) !== 'https://') {
+				return new WP_Error('invalid_url_protocol', __('Your site must be served over HTTPS in order to connect your Stripe account automatically.', 'woocommerce-gateway-stripe'));
 			}
 
-			$result = $this->api->get_stripe_oauth_init( $return_url );
+			$result = $this->api->get_stripe_oauth_init($return_url);
 
-			if ( is_wp_error( $result ) ) {
+			if (is_wp_error($result)) {
 				return $result;
 			}
 
-			update_option( 'stripe_state', $result->state );
+			update_option('stripe_state', $result->state);
 
 			return $result->oauthUrl; // phpcs:ignore WordPress.NamingConventions.ValidVariableName.UsedPropertyNotSnakeCase
 		}
@@ -68,7 +68,7 @@ 
 
 			$response = $this->api->deauthorize_stripe_account();
 
-			if ( is_wp_error( $response ) ) {
+			if (is_wp_error($response)) {
 				return $response;
 			}
 
@@ -85,21 +85,21 @@ 
 		 *
 		 * @return string|WP_Error
 		 */
-		public function connect_oauth( $state, $code ) {
+		public function connect_oauth($state, $code) {
 
-			if ( get_option( 'stripe_state', false ) !== $state ) {
-				return new WP_Error( 'Invalid stripe state' );
+			if (get_option('stripe_state', false) !== $state) {
+				return new WP_Error('Invalid stripe state');
 			}
 
-			$response = $this->api->get_stripe_oauth_keys( $code );
+			$response = $this->api->get_stripe_oauth_keys($code);
 
-			if ( is_wp_error( $response ) ) {
+			if (is_wp_error($response)) {
 				return $response;
 			}
 
-			delete_option( 'stripe_state' );
+			delete_option('stripe_state');
 
-			return $this->save_stripe_keys( $response );
+			return $this->save_stripe_keys($response);
 		}
 
 		/**
@@ -107,10 +107,10 @@ 
 		 */
 		public function maybe_connect_oauth() {
 
-			if ( isset( $_GET['wcs_stripe_code'], $_GET['wcs_stripe_state'] ) ) {
-				$response = $this->connect_oauth( $_GET['wcs_stripe_state'], $_GET['wcs_stripe_code'] );
+			if (isset($_GET['wcs_stripe_code'], $_GET['wcs_stripe_state'])) {
+				$response = $this->connect_oauth($_GET['wcs_stripe_state'], $_GET['wcs_stripe_code']);
 
-				wp_safe_redirect( remove_query_arg( array( 'wcs_stripe_state', 'wcs_stripe_code' ) ) );
+				wp_safe_redirect(remove_query_arg(array('wcs_stripe_state', 'wcs_stripe_code')));
 				exit;
 			}
 		}
@@ -123,28 +123,28 @@ 
 		 *
 		 * @return array|WP_Error
 		 */
-		private function save_stripe_keys( $result ) {
+		private function save_stripe_keys($result) {
 
-			if ( ! isset( $result->publishableKey, $result->secretKey ) ) { // phpcs:ignore WordPress.NamingConventions.ValidVariableName.UsedPropertyNotSnakeCase
-				return new WP_Error( 'Invalid credentials received from WooCommerce Connect server' );
+			if ( ! isset($result->publishableKey, $result->secretKey)) { // phpcs:ignore WordPress.NamingConventions.ValidVariableName.UsedPropertyNotSnakeCase
+				return new WP_Error('Invalid credentials received from WooCommerce Connect server');
 			}
 
-			$is_test         = false !== strpos( $result->publishableKey, '_test_' ); // phpcs:ignore WordPress.NamingConventions.ValidVariableName.UsedPropertyNotSnakeCase
+			$is_test         = false !== strpos($result->publishableKey, '_test_'); // phpcs:ignore WordPress.NamingConventions.ValidVariableName.UsedPropertyNotSnakeCase
 			$prefix          = $is_test ? 'test_' : '';
 			$default_options = array();
 
-			$options                                = array_merge( $default_options, get_option( self::SETTINGS_OPTION, array() ) );
+			$options                                = array_merge($default_options, get_option(self::SETTINGS_OPTION, array()));
 			$options['enabled']                     = 'yes';
 			$options['testmode']                    = $is_test ? 'yes' : 'no';
-			$options[ $prefix . 'publishable_key' ] = $result->publishableKey; // phpcs:ignore WordPress.NamingConventions.ValidVariableName.UsedPropertyNotSnakeCase
-			$options[ $prefix . 'secret_key' ]      = $result->secretKey; // phpcs:ignore WordPress.NamingConventions.ValidVariableName.UsedPropertyNotSnakeCase
+			$options[$prefix . 'publishable_key'] = $result->publishableKey; // phpcs:ignore WordPress.NamingConventions.ValidVariableName.UsedPropertyNotSnakeCase
+			$options[$prefix . 'secret_key']      = $result->secretKey; // phpcs:ignore WordPress.NamingConventions.ValidVariableName.UsedPropertyNotSnakeCase
 
 			// While we are at it, let's also clear the account_id and
 			// test_account_id if present.
-			unset( $options['account_id'] );
-			unset( $options['test_account_id'] );
+			unset($options['account_id']);
+			unset($options['test_account_id']);
 
-			update_option( self::SETTINGS_OPTION, $options );
+			update_option(self::SETTINGS_OPTION, $options);
 
 			return $result;
 		}
@@ -155,9 +155,9 @@ 
 		private function clear_stripe_keys() {
 
 			$default_options = $this->get_default_config();
-			$options         = array_merge( $default_options, get_option( self::SETTINGS_OPTION, array() ) );
+			$options         = array_merge($default_options, get_option(self::SETTINGS_OPTION, array()));
 
-			if ( 'yes' === $options['testmode'] ) {
+			if ('yes' === $options['testmode']) {
 				$options['test_publishable_key'] = '';
 				$options['test_secret_key']      = '';
 			} else {
@@ -167,10 +167,10 @@ 
 
 			// While we are at it, let's also clear the account_id and
 			// test_account_id if present.
-			unset( $options['account_id'] );
-			unset( $options['test_account_id'] );
+			unset($options['account_id']);
+			unset($options['test_account_id']);
 
-			update_option( self::SETTINGS_OPTION, $options );
+			update_option(self::SETTINGS_OPTION, $options);
 
 		}
 
@@ -179,17 +179,17 @@ 
 		 */
 		public function wc_ajax_connect_oauth() {
 
-			if ( empty( $_POST['nonce'] ) || ! wp_verify_nonce( $_POST['nonce'], '_wc_stripe_connect_nonce' ) ) { // phpcs:ignore WordPress.Security.ValidatedSanitizedInput.InputNotSanitized,WordPress.Security.ValidatedSanitizedInput.MissingUnslash
-				wp_die( __( 'You are not authorized to automatically copy Stripe keys', 'woocommerce-gateway-stripe' ) ); // phpcs:ignore WordPress.Security.EscapeOutput.OutputNotEscaped
+			if (empty($_POST['nonce']) || ! wp_verify_nonce($_POST['nonce'], '_wc_stripe_connect_nonce')) { // phpcs:ignore WordPress.Security.ValidatedSanitizedInput.InputNotSanitized,WordPress.Security.ValidatedSanitizedInput.MissingUnslash
+				wp_die(__('You are not authorized to automatically copy Stripe keys', 'woocommerce-gateway-stripe')); // phpcs:ignore WordPress.Security.EscapeOutput.OutputNotEscaped
 			}
 
 			$oauth_url = $this->get_oauth_url();
 
-			if ( is_wp_error( $oauth_url ) ) {
+			if (is_wp_error($oauth_url)) {
 				wp_send_json_error();
 			}
 
-			wp_send_json_success( $oauth_url );
+			wp_send_json_success($oauth_url);
 		}
 	}
 }