@@ -2,4 +2,4 @@ |
||
2 | 2 | /** |
3 | 3 | * Set up shared by all tests. |
4 | 4 | */ |
5 | -update_option( 'woocommerce_default_country', 'US:CA' ); |
|
5 | +update_option('woocommerce_default_country', 'US:CA'); |
@@ -328,8 +328,11 @@ |
||
328 | 328 | <div class="error stripe-apple-pay-message"> |
329 | 329 | <?php if ( $empty_notice ) : ?> |
330 | 330 | <p><?php echo esc_html( $verification_failed_without_error ); ?></p> |
331 | - <?php else : ?> |
|
332 | - <p><?php echo esc_html( $verification_failed_with_error ); ?></p> |
|
331 | + <?php else { |
|
332 | + : ?> |
|
333 | + <p><?php echo esc_html( $verification_failed_with_error ); |
|
334 | +} |
|
335 | +?></p> |
|
333 | 336 | <p><i><?php echo wp_kses( make_clickable( esc_html( $this->apple_pay_verify_notice ) ), $allowed_html ); ?></i></p> |
334 | 337 | <?php endif; ?> |
335 | 338 | <p><?php echo $check_log_text; ?></p> |
@@ -69,7 +69,7 @@ discard block |
||
69 | 69 | * Whether the gateway and Payment Request Button (prerequisites for Apple Pay) are enabled. |
70 | 70 | * |
71 | 71 | * @since 4.5.4 |
72 | - * @return string Whether Apple Pay required settings are enabled. |
|
72 | + * @return boolean Whether Apple Pay required settings are enabled. |
|
73 | 73 | */ |
74 | 74 | private function is_enabled() { |
75 | 75 | $stripe_enabled = 'yes' === $this->get_option( 'enabled', 'no' ); |
@@ -103,7 +103,7 @@ discard block |
||
103 | 103 | * Add to the list of publicly allowed query variables. |
104 | 104 | * |
105 | 105 | * @param array $query_vars - provided public query vars. |
106 | - * @return array Updated public query vars. |
|
106 | + * @return string[] Updated public query vars. |
|
107 | 107 | */ |
108 | 108 | public function whitelist_domain_association_query_param( $query_vars ) { |
109 | 109 | $query_vars[] = 'apple-developer-merchantid-domain-association'; |
@@ -5,7 +5,7 @@ discard block |
||
5 | 5 | * @since 4.0.6 |
6 | 6 | */ |
7 | 7 | |
8 | -if ( ! defined( 'ABSPATH' ) ) { |
|
8 | +if ( ! defined('ABSPATH')) { |
|
9 | 9 | exit; |
10 | 10 | } |
11 | 11 | |
@@ -32,17 +32,17 @@ discard block |
||
32 | 32 | public $apple_pay_verify_notice; |
33 | 33 | |
34 | 34 | public function __construct() { |
35 | - add_action( 'init', array( $this, 'add_domain_association_rewrite_rule' ) ); |
|
36 | - add_filter( 'query_vars', array( $this, 'whitelist_domain_association_query_param' ), 10, 1 ); |
|
37 | - add_action( 'parse_request', array( $this, 'parse_domain_association_request' ), 10, 1 ); |
|
35 | + add_action('init', array($this, 'add_domain_association_rewrite_rule')); |
|
36 | + add_filter('query_vars', array($this, 'whitelist_domain_association_query_param'), 10, 1); |
|
37 | + add_action('parse_request', array($this, 'parse_domain_association_request'), 10, 1); |
|
38 | 38 | |
39 | - add_action( 'woocommerce_stripe_updated', array( $this, 'verify_domain_if_configured' ) ); |
|
40 | - add_action( 'add_option_woocommerce_stripe_settings', array( $this, 'verify_domain_on_new_settings' ), 10, 2 ); |
|
41 | - add_action( 'update_option_woocommerce_stripe_settings', array( $this, 'verify_domain_on_updated_settings' ), 10, 2 ); |
|
42 | - add_action( 'admin_notices', array( $this, 'admin_notices' ) ); |
|
39 | + add_action('woocommerce_stripe_updated', array($this, 'verify_domain_if_configured')); |
|
40 | + add_action('add_option_woocommerce_stripe_settings', array($this, 'verify_domain_on_new_settings'), 10, 2); |
|
41 | + add_action('update_option_woocommerce_stripe_settings', array($this, 'verify_domain_on_updated_settings'), 10, 2); |
|
42 | + add_action('admin_notices', array($this, 'admin_notices')); |
|
43 | 43 | |
44 | - $this->stripe_settings = get_option( 'woocommerce_stripe_settings', array() ); |
|
45 | - $this->apple_pay_domain_set = 'yes' === $this->get_option( 'apple_pay_domain_set', 'no' ); |
|
44 | + $this->stripe_settings = get_option('woocommerce_stripe_settings', array()); |
|
45 | + $this->apple_pay_domain_set = 'yes' === $this->get_option('apple_pay_domain_set', 'no'); |
|
46 | 46 | $this->apple_pay_verify_notice = ''; |
47 | 47 | } |
48 | 48 | |
@@ -54,13 +54,13 @@ discard block |
||
54 | 54 | * @param string default |
55 | 55 | * @return string $setting_value |
56 | 56 | */ |
57 | - public function get_option( $setting = '', $default = '' ) { |
|
58 | - if ( empty( $this->stripe_settings ) ) { |
|
57 | + public function get_option($setting = '', $default = '') { |
|
58 | + if (empty($this->stripe_settings)) { |
|
59 | 59 | return $default; |
60 | 60 | } |
61 | 61 | |
62 | - if ( ! empty( $this->stripe_settings[ $setting ] ) ) { |
|
63 | - return $this->stripe_settings[ $setting ]; |
|
62 | + if ( ! empty($this->stripe_settings[$setting])) { |
|
63 | + return $this->stripe_settings[$setting]; |
|
64 | 64 | } |
65 | 65 | |
66 | 66 | return $default; |
@@ -73,8 +73,8 @@ discard block |
||
73 | 73 | * @return string Whether Apple Pay required settings are enabled. |
74 | 74 | */ |
75 | 75 | private function is_enabled() { |
76 | - $stripe_enabled = 'yes' === $this->get_option( 'enabled', 'no' ); |
|
77 | - $payment_request_button_enabled = 'yes' === $this->get_option( 'payment_request', 'yes' ); |
|
76 | + $stripe_enabled = 'yes' === $this->get_option('enabled', 'no'); |
|
77 | + $payment_request_button_enabled = 'yes' === $this->get_option('payment_request', 'yes'); |
|
78 | 78 | |
79 | 79 | return $stripe_enabled && $payment_request_button_enabled; |
80 | 80 | } |
@@ -86,8 +86,8 @@ discard block |
||
86 | 86 | * @return string Secret key. |
87 | 87 | */ |
88 | 88 | private function get_secret_key() { |
89 | - $testmode = 'yes' === $this->get_option( 'testmode', 'no' ); |
|
90 | - return $testmode ? $this->get_option( 'test_secret_key' ) : $this->get_option( 'secret_key' ); |
|
89 | + $testmode = 'yes' === $this->get_option('testmode', 'no'); |
|
90 | + return $testmode ? $this->get_option('test_secret_key') : $this->get_option('secret_key'); |
|
91 | 91 | } |
92 | 92 | |
93 | 93 | /** |
@@ -97,7 +97,7 @@ discard block |
||
97 | 97 | $regex = '^\.well-known\/apple-developer-merchantid-domain-association$'; |
98 | 98 | $redirect = 'index.php?apple-developer-merchantid-domain-association=1'; |
99 | 99 | |
100 | - add_rewrite_rule( $regex, $redirect, 'top' ); |
|
100 | + add_rewrite_rule($regex, $redirect, 'top'); |
|
101 | 101 | } |
102 | 102 | |
103 | 103 | /** |
@@ -106,7 +106,7 @@ discard block |
||
106 | 106 | * @param array $query_vars - provided public query vars. |
107 | 107 | * @return array Updated public query vars. |
108 | 108 | */ |
109 | - public function whitelist_domain_association_query_param( $query_vars ) { |
|
109 | + public function whitelist_domain_association_query_param($query_vars) { |
|
110 | 110 | $query_vars[] = 'apple-developer-merchantid-domain-association'; |
111 | 111 | return $query_vars; |
112 | 112 | } |
@@ -116,17 +116,17 @@ discard block |
||
116 | 116 | * |
117 | 117 | * @param WP WordPress environment object. |
118 | 118 | */ |
119 | - public function parse_domain_association_request( $wp ) { |
|
119 | + public function parse_domain_association_request($wp) { |
|
120 | 120 | if ( |
121 | - ! isset( $wp->query_vars['apple-developer-merchantid-domain-association'] ) || |
|
121 | + ! isset($wp->query_vars['apple-developer-merchantid-domain-association']) || |
|
122 | 122 | '1' !== $wp->query_vars['apple-developer-merchantid-domain-association'] |
123 | 123 | ) { |
124 | 124 | return; |
125 | 125 | } |
126 | 126 | |
127 | 127 | $path = WC_STRIPE_PLUGIN_PATH . '/apple-developer-merchantid-domain-association'; |
128 | - header( 'Content-Type: application/octet-stream' ); |
|
129 | - echo esc_html( file_get_contents( $path ) ); |
|
128 | + header('Content-Type: application/octet-stream'); |
|
129 | + echo esc_html(file_get_contents($path)); |
|
130 | 130 | exit; |
131 | 131 | } |
132 | 132 | |
@@ -137,9 +137,9 @@ discard block |
||
137 | 137 | * @version 4.5.4 |
138 | 138 | * @param string $secret_key |
139 | 139 | */ |
140 | - private function make_domain_registration_request( $secret_key ) { |
|
141 | - if ( empty( $secret_key ) ) { |
|
142 | - throw new Exception( __( 'Unable to verify domain - missing secret key.', 'woocommerce-gateway-stripe' ) ); |
|
140 | + private function make_domain_registration_request($secret_key) { |
|
141 | + if (empty($secret_key)) { |
|
142 | + throw new Exception(__('Unable to verify domain - missing secret key.', 'woocommerce-gateway-stripe')); |
|
143 | 143 | } |
144 | 144 | |
145 | 145 | $endpoint = 'https://api.stripe.com/v1/apple_pay/domains'; |
@@ -157,22 +157,22 @@ discard block |
||
157 | 157 | $endpoint, |
158 | 158 | array( |
159 | 159 | 'headers' => $headers, |
160 | - 'body' => http_build_query( $data ), |
|
160 | + 'body' => http_build_query($data), |
|
161 | 161 | ) |
162 | 162 | ); |
163 | 163 | |
164 | - if ( is_wp_error( $response ) ) { |
|
164 | + if (is_wp_error($response)) { |
|
165 | 165 | /* translators: error message */ |
166 | - throw new Exception( sprintf( __( 'Unable to verify domain - %s', 'woocommerce-gateway-stripe' ), $response->get_error_message() ) ); |
|
166 | + throw new Exception(sprintf(__('Unable to verify domain - %s', 'woocommerce-gateway-stripe'), $response->get_error_message())); |
|
167 | 167 | } |
168 | 168 | |
169 | - if ( 200 !== $response['response']['code'] ) { |
|
170 | - $parsed_response = json_decode( $response['body'] ); |
|
169 | + if (200 !== $response['response']['code']) { |
|
170 | + $parsed_response = json_decode($response['body']); |
|
171 | 171 | |
172 | 172 | $this->apple_pay_verify_notice = $parsed_response->error->message; |
173 | 173 | |
174 | 174 | /* translators: error message */ |
175 | - throw new Exception( sprintf( __( 'Unable to verify domain - %s', 'woocommerce-gateway-stripe' ), $parsed_response->error->message ) ); |
|
175 | + throw new Exception(sprintf(__('Unable to verify domain - %s', 'woocommerce-gateway-stripe'), $parsed_response->error->message)); |
|
176 | 176 | } |
177 | 177 | } |
178 | 178 | |
@@ -186,27 +186,27 @@ discard block |
||
186 | 186 | * |
187 | 187 | * @return bool Whether domain verification succeeded. |
188 | 188 | */ |
189 | - public function register_domain_with_apple( $secret_key ) { |
|
189 | + public function register_domain_with_apple($secret_key) { |
|
190 | 190 | try { |
191 | - $this->make_domain_registration_request( $secret_key ); |
|
191 | + $this->make_domain_registration_request($secret_key); |
|
192 | 192 | |
193 | 193 | // No errors to this point, verification success! |
194 | 194 | $this->stripe_settings['apple_pay_domain_set'] = 'yes'; |
195 | 195 | $this->apple_pay_domain_set = true; |
196 | 196 | |
197 | - update_option( 'woocommerce_stripe_settings', $this->stripe_settings ); |
|
197 | + update_option('woocommerce_stripe_settings', $this->stripe_settings); |
|
198 | 198 | |
199 | - WC_Stripe_Logger::log( 'Your domain has been verified with Apple Pay!' ); |
|
199 | + WC_Stripe_Logger::log('Your domain has been verified with Apple Pay!'); |
|
200 | 200 | |
201 | 201 | return true; |
202 | 202 | |
203 | - } catch ( Exception $e ) { |
|
203 | + } catch (Exception $e) { |
|
204 | 204 | $this->stripe_settings['apple_pay_domain_set'] = 'no'; |
205 | 205 | $this->apple_pay_domain_set = false; |
206 | 206 | |
207 | - update_option( 'woocommerce_stripe_settings', $this->stripe_settings ); |
|
207 | + update_option('woocommerce_stripe_settings', $this->stripe_settings); |
|
208 | 208 | |
209 | - WC_Stripe_Logger::log( 'Error: ' . $e->getMessage() ); |
|
209 | + WC_Stripe_Logger::log('Error: ' . $e->getMessage()); |
|
210 | 210 | |
211 | 211 | return false; |
212 | 212 | } |
@@ -221,7 +221,7 @@ discard block |
||
221 | 221 | public function verify_domain_if_configured() { |
222 | 222 | $secret_key = $this->get_secret_key(); |
223 | 223 | |
224 | - if ( ! $this->is_enabled() || empty( $secret_key ) ) { |
|
224 | + if ( ! $this->is_enabled() || empty($secret_key)) { |
|
225 | 225 | return; |
226 | 226 | } |
227 | 227 | |
@@ -229,10 +229,10 @@ discard block |
||
229 | 229 | flush_rewrite_rules(); |
230 | 230 | |
231 | 231 | // Register the domain with Apple Pay. |
232 | - $verification_complete = $this->register_domain_with_apple( $secret_key ); |
|
232 | + $verification_complete = $this->register_domain_with_apple($secret_key); |
|
233 | 233 | |
234 | 234 | // Show/hide notes if necessary. |
235 | - WC_Stripe_Inbox_Notes::notify_on_apple_pay_domain_verification( $verification_complete ); |
|
235 | + WC_Stripe_Inbox_Notes::notify_on_apple_pay_domain_verification($verification_complete); |
|
236 | 236 | } |
237 | 237 | |
238 | 238 | /** |
@@ -241,8 +241,8 @@ discard block |
||
241 | 241 | * @since 4.5.4 |
242 | 242 | * @version 4.5.4 |
243 | 243 | */ |
244 | - public function verify_domain_on_new_settings( $option, $settings ) { |
|
245 | - $this->verify_domain_on_updated_settings( array(), $settings ); |
|
244 | + public function verify_domain_on_new_settings($option, $settings) { |
|
245 | + $this->verify_domain_on_updated_settings(array(), $settings); |
|
246 | 246 | } |
247 | 247 | |
248 | 248 | /** |
@@ -251,7 +251,7 @@ discard block |
||
251 | 251 | * @since 4.5.3 |
252 | 252 | * @version 4.5.4 |
253 | 253 | */ |
254 | - public function verify_domain_on_updated_settings( $prev_settings, $settings ) { |
|
254 | + public function verify_domain_on_updated_settings($prev_settings, $settings) { |
|
255 | 255 | // Grab previous state and then update cached settings. |
256 | 256 | $this->stripe_settings = $prev_settings; |
257 | 257 | $prev_secret_key = $this->get_secret_key(); |
@@ -259,7 +259,7 @@ discard block |
||
259 | 259 | $this->stripe_settings = $settings; |
260 | 260 | |
261 | 261 | // If Stripe or Payment Request Button wasn't enabled (or secret key was different) then might need to verify now. |
262 | - if ( ! $prev_is_enabled || ( $this->get_secret_key() !== $prev_secret_key ) ) { |
|
262 | + if ( ! $prev_is_enabled || ($this->get_secret_key() !== $prev_secret_key)) { |
|
263 | 263 | $this->verify_domain_if_configured(); |
264 | 264 | } |
265 | 265 | } |
@@ -270,16 +270,16 @@ discard block |
||
270 | 270 | * @since 4.0.6 |
271 | 271 | */ |
272 | 272 | public function admin_notices() { |
273 | - if ( ! $this->is_enabled() ) { |
|
273 | + if ( ! $this->is_enabled()) { |
|
274 | 274 | return; |
275 | 275 | } |
276 | 276 | |
277 | - if ( ! current_user_can( 'manage_woocommerce' ) ) { |
|
277 | + if ( ! current_user_can('manage_woocommerce')) { |
|
278 | 278 | return; |
279 | 279 | } |
280 | 280 | |
281 | - $empty_notice = empty( $this->apple_pay_verify_notice ); |
|
282 | - if ( $empty_notice && ( $this->apple_pay_domain_set || empty( $this->secret_key ) ) ) { |
|
281 | + $empty_notice = empty($this->apple_pay_verify_notice); |
|
282 | + if ($empty_notice && ($this->apple_pay_domain_set || empty($this->secret_key))) { |
|
283 | 283 | return; |
284 | 284 | } |
285 | 285 | |
@@ -288,28 +288,28 @@ discard block |
||
288 | 288 | * when setting screen is displayed. So if domain verification is not set, |
289 | 289 | * something went wrong so lets notify user. |
290 | 290 | */ |
291 | - $allowed_html = array( |
|
291 | + $allowed_html = array( |
|
292 | 292 | 'a' => array( |
293 | 293 | 'href' => array(), |
294 | 294 | 'title' => array(), |
295 | 295 | ), |
296 | 296 | ); |
297 | - $verification_failed_without_error = __( 'Apple Pay domain verification failed.', 'woocommerce-gateway-stripe' ); |
|
298 | - $verification_failed_with_error = __( 'Apple Pay domain verification failed with the following error:', 'woocommerce-gateway-stripe' ); |
|
297 | + $verification_failed_without_error = __('Apple Pay domain verification failed.', 'woocommerce-gateway-stripe'); |
|
298 | + $verification_failed_with_error = __('Apple Pay domain verification failed with the following error:', 'woocommerce-gateway-stripe'); |
|
299 | 299 | $check_log_text = sprintf( |
300 | 300 | /* translators: 1) HTML anchor open tag 2) HTML anchor closing tag */ |
301 | - esc_html__( 'Please check the %1$slogs%2$s for more details on this issue. Logging must be enabled to see recorded logs.', 'woocommerce-gateway-stripe' ), |
|
302 | - '<a href="' . admin_url( 'admin.php?page=wc-status&tab=logs' ) . '">', |
|
301 | + esc_html__('Please check the %1$slogs%2$s for more details on this issue. Logging must be enabled to see recorded logs.', 'woocommerce-gateway-stripe'), |
|
302 | + '<a href="' . admin_url('admin.php?page=wc-status&tab=logs') . '">', |
|
303 | 303 | '</a>' |
304 | 304 | ); |
305 | 305 | |
306 | 306 | ?> |
307 | 307 | <div class="error stripe-apple-pay-message"> |
308 | - <?php if ( $empty_notice ) : ?> |
|
309 | - <p><?php echo esc_html( $verification_failed_without_error ); ?></p> |
|
308 | + <?php if ($empty_notice) : ?> |
|
309 | + <p><?php echo esc_html($verification_failed_without_error); ?></p> |
|
310 | 310 | <?php else : ?> |
311 | - <p><?php echo esc_html( $verification_failed_with_error ); ?></p> |
|
312 | - <p><i><?php echo wp_kses( make_clickable( esc_html( $this->apple_pay_verify_notice ) ), $allowed_html ); ?></i></p> |
|
311 | + <p><?php echo esc_html($verification_failed_with_error); ?></p> |
|
312 | + <p><i><?php echo wp_kses(make_clickable(esc_html($this->apple_pay_verify_notice)), $allowed_html); ?></i></p> |
|
313 | 313 | <?php endif; ?> |
314 | 314 | <p><?php echo $check_log_text; ?></p> |
315 | 315 | </div> |
@@ -1,6 +1,6 @@ discard block |
||
1 | 1 | <?php |
2 | 2 | |
3 | -if ( ! defined( 'ABSPATH' ) ) { |
|
3 | +if ( ! defined('ABSPATH')) { |
|
4 | 4 | exit; |
5 | 5 | } |
6 | 6 | |
@@ -28,7 +28,7 @@ discard block |
||
28 | 28 | * |
29 | 29 | * @param WC_Stripe_Connect_API $api stripe connect api. |
30 | 30 | */ |
31 | - public function __construct( WC_Stripe_Connect_API $api ) { |
|
31 | + public function __construct(WC_Stripe_Connect_API $api) { |
|
32 | 32 | |
33 | 33 | $this->api = $api; |
34 | 34 | } |
@@ -38,43 +38,43 @@ discard block |
||
38 | 38 | */ |
39 | 39 | public function register_routes() { |
40 | 40 | |
41 | - if ( method_exists( $this, 'get' ) ) { |
|
41 | + if (method_exists($this, 'get')) { |
|
42 | 42 | register_rest_route( |
43 | 43 | $this->namespace, |
44 | 44 | '/' . $this->rest_base, |
45 | 45 | array( |
46 | 46 | array( |
47 | 47 | 'methods' => 'GET', |
48 | - 'callback' => array( $this, 'get_internal' ), |
|
49 | - 'permission_callback' => array( $this, 'check_permission' ), |
|
48 | + 'callback' => array($this, 'get_internal'), |
|
49 | + 'permission_callback' => array($this, 'check_permission'), |
|
50 | 50 | ), |
51 | 51 | ) |
52 | 52 | ); |
53 | 53 | } |
54 | 54 | |
55 | - if ( method_exists( $this, 'post' ) ) { |
|
55 | + if (method_exists($this, 'post')) { |
|
56 | 56 | register_rest_route( |
57 | 57 | $this->namespace, |
58 | 58 | '/' . $this->rest_base, |
59 | 59 | array( |
60 | 60 | array( |
61 | 61 | 'methods' => 'POST', |
62 | - 'callback' => array( $this, 'post_internal' ), |
|
63 | - 'permission_callback' => array( $this, 'check_permission' ), |
|
62 | + 'callback' => array($this, 'post_internal'), |
|
63 | + 'permission_callback' => array($this, 'check_permission'), |
|
64 | 64 | ), |
65 | 65 | ) |
66 | 66 | ); |
67 | 67 | } |
68 | 68 | |
69 | - if ( method_exists( $this, 'delete' ) ) { |
|
69 | + if (method_exists($this, 'delete')) { |
|
70 | 70 | register_rest_route( |
71 | 71 | $this->namespace, |
72 | 72 | '/' . $this->rest_base, |
73 | 73 | array( |
74 | 74 | array( |
75 | 75 | 'methods' => 'DELETE', |
76 | - 'callback' => array( $this, 'delete_internal' ), |
|
77 | - 'permission_callback' => array( $this, 'check_permission' ), |
|
76 | + 'callback' => array($this, 'delete_internal'), |
|
77 | + 'permission_callback' => array($this, 'check_permission'), |
|
78 | 78 | ), |
79 | 79 | ) |
80 | 80 | ); |
@@ -88,11 +88,11 @@ discard block |
||
88 | 88 | * |
89 | 89 | * @return array |
90 | 90 | */ |
91 | - public function get_internal( $request ) { |
|
91 | + public function get_internal($request) { |
|
92 | 92 | |
93 | 93 | $this->prevent_route_caching(); |
94 | 94 | |
95 | - return $this->get( $request ); |
|
95 | + return $this->get($request); |
|
96 | 96 | } |
97 | 97 | |
98 | 98 | /** |
@@ -102,11 +102,11 @@ discard block |
||
102 | 102 | * |
103 | 103 | * @return array |
104 | 104 | */ |
105 | - public function post_internal( $request ) { |
|
105 | + public function post_internal($request) { |
|
106 | 106 | |
107 | 107 | $this->prevent_route_caching(); |
108 | 108 | |
109 | - return $this->post( $request ); |
|
109 | + return $this->post($request); |
|
110 | 110 | } |
111 | 111 | |
112 | 112 | /** |
@@ -116,11 +116,11 @@ discard block |
||
116 | 116 | * |
117 | 117 | * @return array |
118 | 118 | */ |
119 | - public function delete_internal( $request ) { |
|
119 | + public function delete_internal($request) { |
|
120 | 120 | |
121 | 121 | $this->prevent_route_caching(); |
122 | 122 | |
123 | - return $this->delete( $request ); |
|
123 | + return $this->delete($request); |
|
124 | 124 | } |
125 | 125 | |
126 | 126 | /** |
@@ -130,9 +130,9 @@ discard block |
||
130 | 130 | * |
131 | 131 | * @return bool |
132 | 132 | */ |
133 | - public function check_permission( $request ) { |
|
133 | + public function check_permission($request) { |
|
134 | 134 | |
135 | - return current_user_can( 'manage_woocommerce' ); |
|
135 | + return current_user_can('manage_woocommerce'); |
|
136 | 136 | } |
137 | 137 | |
138 | 138 | /** |
@@ -140,12 +140,12 @@ discard block |
||
140 | 140 | */ |
141 | 141 | public function prevent_route_caching() { |
142 | 142 | |
143 | - if ( ! defined( 'DONOTCACHEPAGE' ) ) { |
|
144 | - define( 'DONOTCACHEPAGE', true ); // Play nice with WP-Super-Cache. |
|
143 | + if ( ! defined('DONOTCACHEPAGE')) { |
|
144 | + define('DONOTCACHEPAGE', true); // Play nice with WP-Super-Cache. |
|
145 | 145 | } |
146 | 146 | |
147 | 147 | // Prevent our REST API endpoint responses from being added to browser cache. |
148 | - add_filter( 'rest_post_dispatch', array( $this, 'send_nocache_header' ), PHP_INT_MAX, 2 ); |
|
148 | + add_filter('rest_post_dispatch', array($this, 'send_nocache_header'), PHP_INT_MAX, 2); |
|
149 | 149 | } |
150 | 150 | |
151 | 151 | /** |
@@ -159,9 +159,9 @@ discard block |
||
159 | 159 | * |
160 | 160 | * @return WP_REST_Response passthrough $response parameter |
161 | 161 | */ |
162 | - public function send_nocache_header( $response, $server ) { |
|
162 | + public function send_nocache_header($response, $server) { |
|
163 | 163 | |
164 | - $server->send_header( 'Cache-Control', 'no-cache, must-revalidate, max-age=0' ); |
|
164 | + $server->send_header('Cache-Control', 'no-cache, must-revalidate, max-age=0'); |
|
165 | 165 | |
166 | 166 | return $response; |
167 | 167 | } |
@@ -1,10 +1,10 @@ discard block |
||
1 | 1 | <?php |
2 | 2 | |
3 | -if ( ! defined( 'ABSPATH' ) ) { |
|
3 | +if ( ! defined('ABSPATH')) { |
|
4 | 4 | exit; |
5 | 5 | } |
6 | 6 | |
7 | -if ( ! class_exists( 'WC_Stripe_Connect' ) ) { |
|
7 | +if ( ! class_exists('WC_Stripe_Connect')) { |
|
8 | 8 | /** |
9 | 9 | * Stripe Connect class. |
10 | 10 | */ |
@@ -24,10 +24,10 @@ discard block |
||
24 | 24 | * |
25 | 25 | * @param WC_Stripe_Connect_API $api stripe connect api. |
26 | 26 | */ |
27 | - public function __construct( WC_Stripe_Connect_API $api ) { |
|
27 | + public function __construct(WC_Stripe_Connect_API $api) { |
|
28 | 28 | $this->api = $api; |
29 | 29 | |
30 | - add_action( 'admin_init', array( $this, 'maybe_handle_redirect' ) ); |
|
30 | + add_action('admin_init', array($this, 'maybe_handle_redirect')); |
|
31 | 31 | } |
32 | 32 | |
33 | 33 | /** |
@@ -37,19 +37,19 @@ discard block |
||
37 | 37 | * |
38 | 38 | * @return string|WP_Error |
39 | 39 | */ |
40 | - public function get_oauth_url( $return_url = '' ) { |
|
40 | + public function get_oauth_url($return_url = '') { |
|
41 | 41 | |
42 | - if ( empty( $return_url ) ) { |
|
43 | - $return_url = admin_url( 'admin.php?page=wc-settings&tab=checkout§ion=stripe' ); |
|
42 | + if (empty($return_url)) { |
|
43 | + $return_url = admin_url('admin.php?page=wc-settings&tab=checkout§ion=stripe'); |
|
44 | 44 | } |
45 | 45 | |
46 | - if ( substr( $return_url, 0, 8 ) !== 'https://' ) { |
|
47 | - 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' ) ); |
|
46 | + if (substr($return_url, 0, 8) !== 'https://') { |
|
47 | + 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')); |
|
48 | 48 | } |
49 | 49 | |
50 | - $result = $this->api->get_stripe_oauth_init( $return_url ); |
|
50 | + $result = $this->api->get_stripe_oauth_init($return_url); |
|
51 | 51 | |
52 | - if ( is_wp_error( $result ) ) { |
|
52 | + if (is_wp_error($result)) { |
|
53 | 53 | return $result; |
54 | 54 | } |
55 | 55 | |
@@ -64,37 +64,37 @@ discard block |
||
64 | 64 | * |
65 | 65 | * @return string|WP_Error |
66 | 66 | */ |
67 | - public function connect_oauth( $state, $code ) { |
|
67 | + public function connect_oauth($state, $code) { |
|
68 | 68 | |
69 | - $response = $this->api->get_stripe_oauth_keys( $code ); |
|
69 | + $response = $this->api->get_stripe_oauth_keys($code); |
|
70 | 70 | |
71 | - if ( is_wp_error( $response ) ) { |
|
71 | + if (is_wp_error($response)) { |
|
72 | 72 | return $response; |
73 | 73 | } |
74 | 74 | |
75 | - return $this->save_stripe_keys( $response ); |
|
75 | + return $this->save_stripe_keys($response); |
|
76 | 76 | } |
77 | 77 | |
78 | 78 | /** |
79 | 79 | * Handle redirect back from oauth-init or credentials reset |
80 | 80 | */ |
81 | 81 | public function maybe_handle_redirect() { |
82 | - if ( ! is_admin() ) { |
|
82 | + if ( ! is_admin()) { |
|
83 | 83 | return; |
84 | 84 | } |
85 | 85 | |
86 | 86 | // redirect from oauth-init |
87 | - if ( isset( $_GET['wcs_stripe_code'], $_GET['wcs_stripe_state'] ) ) { |
|
87 | + if (isset($_GET['wcs_stripe_code'], $_GET['wcs_stripe_state'])) { |
|
88 | 88 | |
89 | - $response = $this->connect_oauth( $_GET['wcs_stripe_state'], $_GET['wcs_stripe_code'] ); |
|
90 | - wp_safe_redirect( remove_query_arg( array( 'wcs_stripe_state', 'wcs_stripe_code' ) ) ); |
|
89 | + $response = $this->connect_oauth($_GET['wcs_stripe_state'], $_GET['wcs_stripe_code']); |
|
90 | + wp_safe_redirect(remove_query_arg(array('wcs_stripe_state', 'wcs_stripe_code'))); |
|
91 | 91 | exit; |
92 | 92 | |
93 | 93 | // redirect from credentials reset |
94 | - } elseif ( isset( $_GET['reset_stripe_api_credentials'], $_GET['_wpnonce'] ) ) { |
|
94 | + } elseif (isset($_GET['reset_stripe_api_credentials'], $_GET['_wpnonce'])) { |
|
95 | 95 | |
96 | - if ( ! wp_verify_nonce( $_GET['_wpnonce'], 'reset_stripe_api_credentials' ) ) { |
|
97 | - die( __( 'You are not authorized to clear Stripe account keys.', 'woocommerce-gateway-stripe' ) ); |
|
96 | + if ( ! wp_verify_nonce($_GET['_wpnonce'], 'reset_stripe_api_credentials')) { |
|
97 | + die(__('You are not authorized to clear Stripe account keys.', 'woocommerce-gateway-stripe')); |
|
98 | 98 | } |
99 | 99 | |
100 | 100 | $this->clear_stripe_keys(); |
@@ -118,27 +118,27 @@ discard block |
||
118 | 118 | * |
119 | 119 | * @return array|WP_Error |
120 | 120 | */ |
121 | - private function save_stripe_keys( $result ) { |
|
121 | + private function save_stripe_keys($result) { |
|
122 | 122 | |
123 | - if ( ! isset( $result->publishableKey, $result->secretKey ) ) { // phpcs:ignore WordPress.NamingConventions.ValidVariableName.UsedPropertyNotSnakeCase |
|
124 | - return new WP_Error( 'Invalid credentials received from WooCommerce Connect server' ); |
|
123 | + if ( ! isset($result->publishableKey, $result->secretKey)) { // phpcs:ignore WordPress.NamingConventions.ValidVariableName.UsedPropertyNotSnakeCase |
|
124 | + return new WP_Error('Invalid credentials received from WooCommerce Connect server'); |
|
125 | 125 | } |
126 | 126 | |
127 | - $is_test = false !== strpos( $result->publishableKey, '_test_' ); // phpcs:ignore WordPress.NamingConventions.ValidVariableName.UsedPropertyNotSnakeCase |
|
127 | + $is_test = false !== strpos($result->publishableKey, '_test_'); // phpcs:ignore WordPress.NamingConventions.ValidVariableName.UsedPropertyNotSnakeCase |
|
128 | 128 | $prefix = $is_test ? 'test_' : ''; |
129 | 129 | $default_options = $this->get_default_stripe_config(); |
130 | - $options = array_merge( $default_options, get_option( self::SETTINGS_OPTION, array() ) ); |
|
130 | + $options = array_merge($default_options, get_option(self::SETTINGS_OPTION, array())); |
|
131 | 131 | $options['enabled'] = 'yes'; |
132 | 132 | $options['testmode'] = $is_test ? 'yes' : 'no'; |
133 | - $options[ $prefix . 'publishable_key' ] = $result->publishableKey; // phpcs:ignore WordPress.NamingConventions.ValidVariableName.UsedPropertyNotSnakeCase |
|
134 | - $options[ $prefix . 'secret_key' ] = $result->secretKey; // phpcs:ignore WordPress.NamingConventions.ValidVariableName.UsedPropertyNotSnakeCase |
|
133 | + $options[$prefix . 'publishable_key'] = $result->publishableKey; // phpcs:ignore WordPress.NamingConventions.ValidVariableName.UsedPropertyNotSnakeCase |
|
134 | + $options[$prefix . 'secret_key'] = $result->secretKey; // phpcs:ignore WordPress.NamingConventions.ValidVariableName.UsedPropertyNotSnakeCase |
|
135 | 135 | |
136 | 136 | // While we are at it, let's also clear the account_id and |
137 | 137 | // test_account_id if present. |
138 | - unset( $options['account_id'] ); |
|
139 | - unset( $options['test_account_id'] ); |
|
138 | + unset($options['account_id']); |
|
139 | + unset($options['test_account_id']); |
|
140 | 140 | |
141 | - update_option( self::SETTINGS_OPTION, $options ); |
|
141 | + update_option(self::SETTINGS_OPTION, $options); |
|
142 | 142 | |
143 | 143 | return $result; |
144 | 144 | } |
@@ -148,21 +148,21 @@ discard block |
||
148 | 148 | */ |
149 | 149 | private function clear_stripe_keys() { |
150 | 150 | |
151 | - $options = get_option( self::SETTINGS_OPTION, array() ); |
|
151 | + $options = get_option(self::SETTINGS_OPTION, array()); |
|
152 | 152 | |
153 | - if ( 'yes' === $options['testmode'] ) { |
|
153 | + if ('yes' === $options['testmode']) { |
|
154 | 154 | $options['test_publishable_key'] = ''; |
155 | 155 | $options['test_secret_key'] = ''; |
156 | 156 | // clear test_account_id if present |
157 | - unset( $options['test_account_id'] ); |
|
157 | + unset($options['test_account_id']); |
|
158 | 158 | } else { |
159 | 159 | $options['publishable_key'] = ''; |
160 | 160 | $options['secret_key'] = ''; |
161 | 161 | // clear account_id if present |
162 | - unset( $options['account_id'] ); |
|
162 | + unset($options['account_id']); |
|
163 | 163 | } |
164 | 164 | |
165 | - update_option( self::SETTINGS_OPTION, $options ); |
|
165 | + update_option(self::SETTINGS_OPTION, $options); |
|
166 | 166 | |
167 | 167 | } |
168 | 168 | |
@@ -173,9 +173,9 @@ discard block |
||
173 | 173 | |
174 | 174 | $result = array(); |
175 | 175 | $gateway = new WC_Gateway_Stripe(); |
176 | - foreach ( $gateway->form_fields as $key => $value ) { |
|
177 | - if ( isset( $value['default'] ) ) { |
|
178 | - $result[ $key ] = $value['default']; |
|
176 | + foreach ($gateway->form_fields as $key => $value) { |
|
177 | + if (isset($value['default'])) { |
|
178 | + $result[$key] = $value['default']; |
|
179 | 179 | } |
180 | 180 | } |
181 | 181 | |
@@ -184,12 +184,12 @@ discard block |
||
184 | 184 | |
185 | 185 | public function is_connected() { |
186 | 186 | |
187 | - $options = get_option( self::SETTINGS_OPTION, array() ); |
|
187 | + $options = get_option(self::SETTINGS_OPTION, array()); |
|
188 | 188 | |
189 | - if ( isset( $options['testmode'] ) && 'yes' === $options['testmode'] ) { |
|
190 | - return isset( $options['test_publishable_key'], $options['test_secret_key'] ) && trim( $options['test_publishable_key'] ) && trim( $options['test_secret_key'] ); |
|
189 | + if (isset($options['testmode']) && 'yes' === $options['testmode']) { |
|
190 | + return isset($options['test_publishable_key'], $options['test_secret_key']) && trim($options['test_publishable_key']) && trim($options['test_secret_key']); |
|
191 | 191 | } else { |
192 | - return isset( $options['publishable_key'], $options['secret_key'] ) && trim( $options['publishable_key'] ) && trim( $options['secret_key'] ); |
|
192 | + return isset($options['publishable_key'], $options['secret_key']) && trim($options['publishable_key']) && trim($options['secret_key']); |
|
193 | 193 | } |
194 | 194 | } |
195 | 195 | } |
@@ -1,13 +1,13 @@ discard block |
||
1 | 1 | <?php |
2 | -if ( ! defined( 'ABSPATH' ) ) { |
|
2 | +if ( ! defined('ABSPATH')) { |
|
3 | 3 | exit; |
4 | 4 | } |
5 | 5 | |
6 | -if ( ! defined( 'WOOCOMMERCE_CONNECT_SERVER_URL' ) ) { |
|
7 | - define( 'WOOCOMMERCE_CONNECT_SERVER_URL', 'https://api.woocommerce.com/' ); |
|
6 | +if ( ! defined('WOOCOMMERCE_CONNECT_SERVER_URL')) { |
|
7 | + define('WOOCOMMERCE_CONNECT_SERVER_URL', 'https://api.woocommerce.com/'); |
|
8 | 8 | } |
9 | 9 | |
10 | -if ( ! class_exists( 'WC_Stripe_Connect_API' ) ) { |
|
10 | +if ( ! class_exists('WC_Stripe_Connect_API')) { |
|
11 | 11 | /** |
12 | 12 | * Stripe Connect API class. |
13 | 13 | */ |
@@ -22,12 +22,12 @@ discard block |
||
22 | 22 | * |
23 | 23 | * @return array |
24 | 24 | */ |
25 | - public function get_stripe_oauth_init( $return_url ) { |
|
25 | + public function get_stripe_oauth_init($return_url) { |
|
26 | 26 | |
27 | 27 | $current_user = wp_get_current_user(); |
28 | 28 | $business_data = array(); |
29 | 29 | $business_data['url'] = get_site_url(); |
30 | - $business_data['business_name'] = html_entity_decode( get_bloginfo( 'name' ), ENT_QUOTES ); |
|
30 | + $business_data['business_name'] = html_entity_decode(get_bloginfo('name'), ENT_QUOTES); |
|
31 | 31 | $business_data['first_name'] = $current_user->user_firstname; |
32 | 32 | $business_data['last_name'] = $current_user->user_lastname; |
33 | 33 | $business_data['phone'] = ''; |
@@ -35,7 +35,7 @@ discard block |
||
35 | 35 | |
36 | 36 | $wc_countries = WC()->countries; |
37 | 37 | |
38 | - if ( method_exists( $wc_countries, 'get_base_address' ) ) { |
|
38 | + if (method_exists($wc_countries, 'get_base_address')) { |
|
39 | 39 | $business_data['country'] = $wc_countries->get_base_country(); |
40 | 40 | $business_data['street_address'] = $wc_countries->get_base_address(); |
41 | 41 | $business_data['city'] = $wc_countries->get_base_city(); |
@@ -55,7 +55,7 @@ discard block |
||
55 | 55 | 'businessData' => $business_data, |
56 | 56 | ); |
57 | 57 | |
58 | - return $this->request( 'POST', '/stripe/oauth-init', $request ); |
|
58 | + return $this->request('POST', '/stripe/oauth-init', $request); |
|
59 | 59 | } |
60 | 60 | |
61 | 61 | /** |
@@ -65,11 +65,11 @@ discard block |
||
65 | 65 | * |
66 | 66 | * @return array |
67 | 67 | */ |
68 | - public function get_stripe_oauth_keys( $code ) { |
|
68 | + public function get_stripe_oauth_keys($code) { |
|
69 | 69 | |
70 | - $request = array( 'code' => $code ); |
|
70 | + $request = array('code' => $code); |
|
71 | 71 | |
72 | - return $this->request( 'POST', '/stripe/oauth-keys', $request ); |
|
72 | + return $this->request('POST', '/stripe/oauth-keys', $request); |
|
73 | 73 | } |
74 | 74 | |
75 | 75 | /** |
@@ -81,39 +81,39 @@ discard block |
||
81 | 81 | * |
82 | 82 | * @return array|WP_Error |
83 | 83 | */ |
84 | - protected function request( $method, $path, $body = array() ) { |
|
84 | + protected function request($method, $path, $body = array()) { |
|
85 | 85 | |
86 | - if ( ! is_array( $body ) ) { |
|
86 | + if ( ! is_array($body)) { |
|
87 | 87 | return new WP_Error( |
88 | 88 | 'request_body_should_be_array', |
89 | - __( 'Unable to send request to WooCommerce Connect server. Body must be an array.', 'woocommerce-gateway-stripe' ) |
|
89 | + __('Unable to send request to WooCommerce Connect server. Body must be an array.', 'woocommerce-gateway-stripe') |
|
90 | 90 | ); |
91 | 91 | } |
92 | 92 | |
93 | - $url = trailingslashit( WOOCOMMERCE_CONNECT_SERVER_URL ); |
|
94 | - $url = apply_filters( 'wc_connect_server_url', $url ); |
|
95 | - $url = trailingslashit( $url ) . ltrim( $path, '/' ); |
|
93 | + $url = trailingslashit(WOOCOMMERCE_CONNECT_SERVER_URL); |
|
94 | + $url = apply_filters('wc_connect_server_url', $url); |
|
95 | + $url = trailingslashit($url) . ltrim($path, '/'); |
|
96 | 96 | |
97 | 97 | // Add useful system information to requests that contain bodies. |
98 | - if ( in_array( $method, array( 'POST', 'PUT' ), true ) ) { |
|
99 | - $body = $this->request_body( $body ); |
|
100 | - $body = wp_json_encode( apply_filters( 'wc_connect_api_client_body', $body ) ); |
|
98 | + if (in_array($method, array('POST', 'PUT'), true)) { |
|
99 | + $body = $this->request_body($body); |
|
100 | + $body = wp_json_encode(apply_filters('wc_connect_api_client_body', $body)); |
|
101 | 101 | |
102 | - if ( ! $body ) { |
|
102 | + if ( ! $body) { |
|
103 | 103 | return new WP_Error( |
104 | 104 | 'unable_to_json_encode_body', |
105 | - __( 'Unable to encode body for request to WooCommerce Connect server.', 'woocommerce-gateway-stripe' ) |
|
105 | + __('Unable to encode body for request to WooCommerce Connect server.', 'woocommerce-gateway-stripe') |
|
106 | 106 | ); |
107 | 107 | } |
108 | 108 | } |
109 | 109 | |
110 | 110 | $headers = $this->request_headers(); |
111 | - if ( is_wp_error( $headers ) ) { |
|
111 | + if (is_wp_error($headers)) { |
|
112 | 112 | return $headers; |
113 | 113 | } |
114 | 114 | |
115 | 115 | $http_timeout = 60; // 1 minute |
116 | - wc_set_time_limit( $http_timeout + 10 ); |
|
116 | + wc_set_time_limit($http_timeout + 10); |
|
117 | 117 | $args = array( |
118 | 118 | 'headers' => $headers, |
119 | 119 | 'method' => $method, |
@@ -123,18 +123,18 @@ discard block |
||
123 | 123 | 'timeout' => $http_timeout, |
124 | 124 | ); |
125 | 125 | |
126 | - $args = apply_filters( 'wc_connect_request_args', $args ); |
|
127 | - $response = wp_remote_request( $url, $args ); |
|
128 | - $response_code = wp_remote_retrieve_response_code( $response ); |
|
129 | - $content_type = wp_remote_retrieve_header( $response, 'content-type' ); |
|
126 | + $args = apply_filters('wc_connect_request_args', $args); |
|
127 | + $response = wp_remote_request($url, $args); |
|
128 | + $response_code = wp_remote_retrieve_response_code($response); |
|
129 | + $content_type = wp_remote_retrieve_header($response, 'content-type'); |
|
130 | 130 | |
131 | - if ( false === strpos( $content_type, 'application/json' ) ) { |
|
132 | - if ( 200 !== $response_code ) { |
|
131 | + if (false === strpos($content_type, 'application/json')) { |
|
132 | + if (200 !== $response_code) { |
|
133 | 133 | return new WP_Error( |
134 | 134 | 'wcc_server_error', |
135 | 135 | sprintf( |
136 | 136 | // Translators: HTTP error code. |
137 | - __( 'Error: The WooCommerce Connect server returned HTTP code: %d', 'woocommerce-gateway-stripe' ), |
|
137 | + __('Error: The WooCommerce Connect server returned HTTP code: %d', 'woocommerce-gateway-stripe'), |
|
138 | 138 | $response_code |
139 | 139 | ) |
140 | 140 | ); |
@@ -143,39 +143,39 @@ discard block |
||
143 | 143 | 'wcc_server_error_content_type', |
144 | 144 | sprintf( |
145 | 145 | // Translators: content-type error code. |
146 | - __( 'Error: The WooCommerce Connect server returned an invalid content-type: %s.', 'woocommerce-gateway-stripe' ), |
|
146 | + __('Error: The WooCommerce Connect server returned an invalid content-type: %s.', 'woocommerce-gateway-stripe'), |
|
147 | 147 | $content_type |
148 | 148 | ) |
149 | 149 | ); |
150 | 150 | } |
151 | 151 | } |
152 | 152 | |
153 | - $response_body = wp_remote_retrieve_body( $response ); |
|
154 | - if ( ! empty( $response_body ) ) { |
|
155 | - $response_body = json_decode( $response_body ); |
|
153 | + $response_body = wp_remote_retrieve_body($response); |
|
154 | + if ( ! empty($response_body)) { |
|
155 | + $response_body = json_decode($response_body); |
|
156 | 156 | } |
157 | 157 | |
158 | - if ( 200 !== $response_code ) { |
|
159 | - if ( empty( $response_body ) ) { |
|
158 | + if (200 !== $response_code) { |
|
159 | + if (empty($response_body)) { |
|
160 | 160 | return new WP_Error( |
161 | 161 | 'wcc_server_empty_response', |
162 | 162 | sprintf( |
163 | 163 | // Translators: HTTP error code. |
164 | - __( 'Error: The WooCommerce Connect server returned ( %d ) and an empty response body.', 'woocommerce-gateway-stripe' ), |
|
164 | + __('Error: The WooCommerce Connect server returned ( %d ) and an empty response body.', 'woocommerce-gateway-stripe'), |
|
165 | 165 | $response_code |
166 | 166 | ) |
167 | 167 | ); |
168 | 168 | } |
169 | 169 | |
170 | - $error = property_exists( $response_body, 'error' ) ? $response_body->error : ''; |
|
171 | - $message = property_exists( $response_body, 'message' ) ? $response_body->message : ''; |
|
172 | - $data = property_exists( $response_body, 'data' ) ? $response_body->data : ''; |
|
170 | + $error = property_exists($response_body, 'error') ? $response_body->error : ''; |
|
171 | + $message = property_exists($response_body, 'message') ? $response_body->message : ''; |
|
172 | + $data = property_exists($response_body, 'data') ? $response_body->data : ''; |
|
173 | 173 | |
174 | 174 | return new WP_Error( |
175 | 175 | 'wcc_server_error_response', |
176 | 176 | sprintf( |
177 | 177 | /* translators: %1$s: error code, %2$s: error message, %3$d: HTTP response code */ |
178 | - __( 'Error: The WooCommerce Connect server returned: %1$s %2$s ( %3$d )', 'woocommerce-gateway-stripe' ), |
|
178 | + __('Error: The WooCommerce Connect server returned: %1$s %2$s ( %3$d )', 'woocommerce-gateway-stripe'), |
|
179 | 179 | $error, |
180 | 180 | $message, |
181 | 181 | $response_code |
@@ -194,13 +194,13 @@ discard block |
||
194 | 194 | * |
195 | 195 | * @return array |
196 | 196 | */ |
197 | - protected function request_body( $initial_body = array() ) { |
|
197 | + protected function request_body($initial_body = array()) { |
|
198 | 198 | |
199 | 199 | $default_body = array( |
200 | 200 | 'settings' => array(), |
201 | 201 | ); |
202 | 202 | |
203 | - $body = array_merge( $default_body, $initial_body ); |
|
203 | + $body = array_merge($default_body, $initial_body); |
|
204 | 204 | |
205 | 205 | // Add interesting fields to the body of each request. |
206 | 206 | $body['settings'] = wp_parse_args( |
@@ -213,7 +213,7 @@ discard block |
||
213 | 213 | 'currency' => get_woocommerce_currency(), |
214 | 214 | 'stripe_version' => WC_STRIPE_VERSION, |
215 | 215 | 'wc_version' => WC()->version, |
216 | - 'wp_version' => get_bloginfo( 'version' ), |
|
216 | + 'wp_version' => get_bloginfo('version'), |
|
217 | 217 | ) |
218 | 218 | ); |
219 | 219 | |
@@ -228,8 +228,8 @@ discard block |
||
228 | 228 | protected function request_headers() { |
229 | 229 | |
230 | 230 | $headers = array(); |
231 | - $locale = strtolower( str_replace( '_', '-', get_locale() ) ); |
|
232 | - $locale_elements = explode( '-', $locale ); |
|
231 | + $locale = strtolower(str_replace('_', '-', get_locale())); |
|
232 | + $locale_elements = explode('-', $locale); |
|
233 | 233 | $lang = $locale_elements[0]; |
234 | 234 | $headers['Accept-Language'] = $locale . ',' . $lang; |
235 | 235 | $headers['Content-Type'] = 'application/json; charset=utf-8'; |
@@ -1,5 +1,5 @@ discard block |
||
1 | 1 | <?php |
2 | -if ( ! defined( 'ABSPATH' ) ) { |
|
2 | +if ( ! defined('ABSPATH')) { |
|
3 | 3 | exit; |
4 | 4 | } |
5 | 5 | |
@@ -7,40 +7,40 @@ discard block |
||
7 | 7 | 'wc_stripe_giropay_settings', |
8 | 8 | array( |
9 | 9 | 'geo_target' => array( |
10 | - 'description' => __( 'Customer Geography: Germany', 'woocommerce-gateway-stripe' ), |
|
10 | + 'description' => __('Customer Geography: Germany', 'woocommerce-gateway-stripe'), |
|
11 | 11 | 'type' => 'title', |
12 | 12 | ), |
13 | 13 | 'guide' => array( |
14 | - 'description' => __( '<a href="https://stripe.com/payments/payment-methods-guide#giropay" target="_blank">Payment Method Guide</a>', 'woocommerce-gateway-stripe' ), |
|
14 | + 'description' => __('<a href="https://stripe.com/payments/payment-methods-guide#giropay" target="_blank">Payment Method Guide</a>', 'woocommerce-gateway-stripe'), |
|
15 | 15 | 'type' => 'title', |
16 | 16 | ), |
17 | 17 | 'activation' => array( |
18 | - 'description' => __( 'Must be activated from your Stripe Dashboard Settings <a href="https://dashboard.stripe.com/account/payments/settings" target="_blank">here</a>', 'woocommerce-gateway-stripe' ), |
|
18 | + 'description' => __('Must be activated from your Stripe Dashboard Settings <a href="https://dashboard.stripe.com/account/payments/settings" target="_blank">here</a>', 'woocommerce-gateway-stripe'), |
|
19 | 19 | 'type' => 'title', |
20 | 20 | ), |
21 | 21 | 'enabled' => array( |
22 | - 'title' => __( 'Enable/Disable', 'woocommerce-gateway-stripe' ), |
|
23 | - 'label' => __( 'Enable Stripe Giropay', 'woocommerce-gateway-stripe' ), |
|
22 | + 'title' => __('Enable/Disable', 'woocommerce-gateway-stripe'), |
|
23 | + 'label' => __('Enable Stripe Giropay', 'woocommerce-gateway-stripe'), |
|
24 | 24 | 'type' => 'checkbox', |
25 | 25 | 'description' => '', |
26 | 26 | 'default' => 'no', |
27 | 27 | ), |
28 | 28 | 'title' => array( |
29 | - 'title' => __( 'Title', 'woocommerce-gateway-stripe' ), |
|
29 | + 'title' => __('Title', 'woocommerce-gateway-stripe'), |
|
30 | 30 | 'type' => 'text', |
31 | - 'description' => __( 'This controls the title which the user sees during checkout.', 'woocommerce-gateway-stripe' ), |
|
32 | - 'default' => __( 'Giropay', 'woocommerce-gateway-stripe' ), |
|
31 | + 'description' => __('This controls the title which the user sees during checkout.', 'woocommerce-gateway-stripe'), |
|
32 | + 'default' => __('Giropay', 'woocommerce-gateway-stripe'), |
|
33 | 33 | 'desc_tip' => true, |
34 | 34 | ), |
35 | 35 | 'description' => array( |
36 | - 'title' => __( 'Description', 'woocommerce-gateway-stripe' ), |
|
36 | + 'title' => __('Description', 'woocommerce-gateway-stripe'), |
|
37 | 37 | 'type' => 'text', |
38 | - 'description' => __( 'This controls the description which the user sees during checkout.', 'woocommerce-gateway-stripe' ), |
|
39 | - 'default' => __( 'You will be redirected to Giropay.', 'woocommerce-gateway-stripe' ), |
|
38 | + 'description' => __('This controls the description which the user sees during checkout.', 'woocommerce-gateway-stripe'), |
|
39 | + 'default' => __('You will be redirected to Giropay.', 'woocommerce-gateway-stripe'), |
|
40 | 40 | 'desc_tip' => true, |
41 | 41 | ), |
42 | 42 | 'webhook' => array( |
43 | - 'title' => __( 'Webhook Endpoints', 'woocommerce-gateway-stripe' ), |
|
43 | + 'title' => __('Webhook Endpoints', 'woocommerce-gateway-stripe'), |
|
44 | 44 | 'type' => 'title', |
45 | 45 | /* translators: webhook URL */ |
46 | 46 | 'description' => $this->display_admin_settings_webhook_description(), |
@@ -1,5 +1,5 @@ discard block |
||
1 | 1 | <?php |
2 | -if ( ! defined( 'ABSPATH' ) ) { |
|
2 | +if ( ! defined('ABSPATH')) { |
|
3 | 3 | exit; |
4 | 4 | } |
5 | 5 | |
@@ -7,40 +7,40 @@ discard block |
||
7 | 7 | 'wc_stripe_alipay_settings', |
8 | 8 | array( |
9 | 9 | 'geo_target' => array( |
10 | - 'description' => __( 'Customer Geography: China', 'woocommerce-gateway-stripe' ), |
|
10 | + 'description' => __('Customer Geography: China', 'woocommerce-gateway-stripe'), |
|
11 | 11 | 'type' => 'title', |
12 | 12 | ), |
13 | 13 | 'guide' => array( |
14 | - 'description' => __( '<a href="https://stripe.com/payments/payment-methods-guide#alipay" target="_blank">Payment Method Guide</a>', 'woocommerce-gateway-stripe' ), |
|
14 | + 'description' => __('<a href="https://stripe.com/payments/payment-methods-guide#alipay" target="_blank">Payment Method Guide</a>', 'woocommerce-gateway-stripe'), |
|
15 | 15 | 'type' => 'title', |
16 | 16 | ), |
17 | 17 | 'activation' => array( |
18 | - 'description' => __( 'Must be activated from your Stripe Dashboard Settings <a href="https://dashboard.stripe.com/account/payments/settings" target="_blank">here</a>', 'woocommerce-gateway-stripe' ), |
|
18 | + 'description' => __('Must be activated from your Stripe Dashboard Settings <a href="https://dashboard.stripe.com/account/payments/settings" target="_blank">here</a>', 'woocommerce-gateway-stripe'), |
|
19 | 19 | 'type' => 'title', |
20 | 20 | ), |
21 | 21 | 'enabled' => array( |
22 | - 'title' => __( 'Enable/Disable', 'woocommerce-gateway-stripe' ), |
|
23 | - 'label' => __( 'Enable Stripe Alipay', 'woocommerce-gateway-stripe' ), |
|
22 | + 'title' => __('Enable/Disable', 'woocommerce-gateway-stripe'), |
|
23 | + 'label' => __('Enable Stripe Alipay', 'woocommerce-gateway-stripe'), |
|
24 | 24 | 'type' => 'checkbox', |
25 | 25 | 'description' => '', |
26 | 26 | 'default' => 'no', |
27 | 27 | ), |
28 | 28 | 'title' => array( |
29 | - 'title' => __( 'Title', 'woocommerce-gateway-stripe' ), |
|
29 | + 'title' => __('Title', 'woocommerce-gateway-stripe'), |
|
30 | 30 | 'type' => 'text', |
31 | - 'description' => __( 'This controls the title which the user sees during checkout.', 'woocommerce-gateway-stripe' ), |
|
32 | - 'default' => __( 'Alipay', 'woocommerce-gateway-stripe' ), |
|
31 | + 'description' => __('This controls the title which the user sees during checkout.', 'woocommerce-gateway-stripe'), |
|
32 | + 'default' => __('Alipay', 'woocommerce-gateway-stripe'), |
|
33 | 33 | 'desc_tip' => true, |
34 | 34 | ), |
35 | 35 | 'description' => array( |
36 | - 'title' => __( 'Description', 'woocommerce-gateway-stripe' ), |
|
36 | + 'title' => __('Description', 'woocommerce-gateway-stripe'), |
|
37 | 37 | 'type' => 'text', |
38 | - 'description' => __( 'This controls the description which the user sees during checkout.', 'woocommerce-gateway-stripe' ), |
|
39 | - 'default' => __( 'You will be redirected to Alipay.', 'woocommerce-gateway-stripe' ), |
|
38 | + 'description' => __('This controls the description which the user sees during checkout.', 'woocommerce-gateway-stripe'), |
|
39 | + 'default' => __('You will be redirected to Alipay.', 'woocommerce-gateway-stripe'), |
|
40 | 40 | 'desc_tip' => true, |
41 | 41 | ), |
42 | 42 | 'webhook' => array( |
43 | - 'title' => __( 'Webhook Endpoints', 'woocommerce-gateway-stripe' ), |
|
43 | + 'title' => __('Webhook Endpoints', 'woocommerce-gateway-stripe'), |
|
44 | 44 | 'type' => 'title', |
45 | 45 | /* translators: webhook URL */ |
46 | 46 | 'description' => $this->display_admin_settings_webhook_description(), |
@@ -1,5 +1,5 @@ discard block |
||
1 | 1 | <?php |
2 | -if ( ! defined( 'ABSPATH' ) ) { |
|
2 | +if ( ! defined('ABSPATH')) { |
|
3 | 3 | exit; |
4 | 4 | } |
5 | 5 | |
@@ -7,40 +7,40 @@ discard block |
||
7 | 7 | 'wc_stripe_sepa_settings', |
8 | 8 | array( |
9 | 9 | 'geo_target' => array( |
10 | - 'description' => __( 'Customer Geography: France, Germany, Spain, Belgium, Netherlands, Luxembourg, Italy, Portugal, Austria, Ireland', 'woocommerce-gateway-stripe' ), |
|
10 | + 'description' => __('Customer Geography: France, Germany, Spain, Belgium, Netherlands, Luxembourg, Italy, Portugal, Austria, Ireland', 'woocommerce-gateway-stripe'), |
|
11 | 11 | 'type' => 'title', |
12 | 12 | ), |
13 | 13 | 'guide' => array( |
14 | - 'description' => __( '<a href="https://stripe.com/payments/payment-methods-guide#sepa-direct-debit" target="_blank">Payment Method Guide</a>', 'woocommerce-gateway-stripe' ), |
|
14 | + 'description' => __('<a href="https://stripe.com/payments/payment-methods-guide#sepa-direct-debit" target="_blank">Payment Method Guide</a>', 'woocommerce-gateway-stripe'), |
|
15 | 15 | 'type' => 'title', |
16 | 16 | ), |
17 | 17 | 'activation' => array( |
18 | - 'description' => __( 'Must be activated from your Stripe Dashboard Settings <a href="https://dashboard.stripe.com/account/payments/settings" target="_blank">here</a>', 'woocommerce-gateway-stripe' ), |
|
18 | + 'description' => __('Must be activated from your Stripe Dashboard Settings <a href="https://dashboard.stripe.com/account/payments/settings" target="_blank">here</a>', 'woocommerce-gateway-stripe'), |
|
19 | 19 | 'type' => 'title', |
20 | 20 | ), |
21 | 21 | 'enabled' => array( |
22 | - 'title' => __( 'Enable/Disable', 'woocommerce-gateway-stripe' ), |
|
23 | - 'label' => __( 'Enable Stripe SEPA Direct Debit', 'woocommerce-gateway-stripe' ), |
|
22 | + 'title' => __('Enable/Disable', 'woocommerce-gateway-stripe'), |
|
23 | + 'label' => __('Enable Stripe SEPA Direct Debit', 'woocommerce-gateway-stripe'), |
|
24 | 24 | 'type' => 'checkbox', |
25 | 25 | 'description' => '', |
26 | 26 | 'default' => 'no', |
27 | 27 | ), |
28 | 28 | 'title' => array( |
29 | - 'title' => __( 'Title', 'woocommerce-gateway-stripe' ), |
|
29 | + 'title' => __('Title', 'woocommerce-gateway-stripe'), |
|
30 | 30 | 'type' => 'text', |
31 | - 'description' => __( 'This controls the title which the user sees during checkout.', 'woocommerce-gateway-stripe' ), |
|
32 | - 'default' => __( 'SEPA Direct Debit', 'woocommerce-gateway-stripe' ), |
|
31 | + 'description' => __('This controls the title which the user sees during checkout.', 'woocommerce-gateway-stripe'), |
|
32 | + 'default' => __('SEPA Direct Debit', 'woocommerce-gateway-stripe'), |
|
33 | 33 | 'desc_tip' => true, |
34 | 34 | ), |
35 | 35 | 'description' => array( |
36 | - 'title' => __( 'Description', 'woocommerce-gateway-stripe' ), |
|
36 | + 'title' => __('Description', 'woocommerce-gateway-stripe'), |
|
37 | 37 | 'type' => 'text', |
38 | - 'description' => __( 'This controls the description which the user sees during checkout.', 'woocommerce-gateway-stripe' ), |
|
39 | - 'default' => __( 'Mandate Information.', 'woocommerce-gateway-stripe' ), |
|
38 | + 'description' => __('This controls the description which the user sees during checkout.', 'woocommerce-gateway-stripe'), |
|
39 | + 'default' => __('Mandate Information.', 'woocommerce-gateway-stripe'), |
|
40 | 40 | 'desc_tip' => true, |
41 | 41 | ), |
42 | 42 | 'webhook' => array( |
43 | - 'title' => __( 'Webhook Endpoints', 'woocommerce-gateway-stripe' ), |
|
43 | + 'title' => __('Webhook Endpoints', 'woocommerce-gateway-stripe'), |
|
44 | 44 | 'type' => 'title', |
45 | 45 | /* translators: webhook URL */ |
46 | 46 | 'description' => $this->display_admin_settings_webhook_description(), |
@@ -1,5 +1,5 @@ discard block |
||
1 | 1 | <?php |
2 | -if ( ! defined( 'ABSPATH' ) ) { |
|
2 | +if ( ! defined('ABSPATH')) { |
|
3 | 3 | exit; |
4 | 4 | } |
5 | 5 | |
@@ -7,36 +7,36 @@ discard block |
||
7 | 7 | 'wc_stripe_multibanco_settings', |
8 | 8 | array( |
9 | 9 | 'geo_target' => array( |
10 | - 'description' => __( 'Customer Geography: Portugal', 'woocommerce-gateway-stripe' ), |
|
10 | + 'description' => __('Customer Geography: Portugal', 'woocommerce-gateway-stripe'), |
|
11 | 11 | 'type' => 'title', |
12 | 12 | ), |
13 | 13 | 'activation' => array( |
14 | - 'description' => __( 'Must be activated from your Stripe Dashboard Settings <a href="https://dashboard.stripe.com/account/payments/settings" target="_blank">here</a>', 'woocommerce-gateway-stripe' ), |
|
14 | + 'description' => __('Must be activated from your Stripe Dashboard Settings <a href="https://dashboard.stripe.com/account/payments/settings" target="_blank">here</a>', 'woocommerce-gateway-stripe'), |
|
15 | 15 | 'type' => 'title', |
16 | 16 | ), |
17 | 17 | 'enabled' => array( |
18 | - 'title' => __( 'Enable/Disable', 'woocommerce-gateway-stripe' ), |
|
19 | - 'label' => __( 'Enable Stripe Multibanco', 'woocommerce-gateway-stripe' ), |
|
18 | + 'title' => __('Enable/Disable', 'woocommerce-gateway-stripe'), |
|
19 | + 'label' => __('Enable Stripe Multibanco', 'woocommerce-gateway-stripe'), |
|
20 | 20 | 'type' => 'checkbox', |
21 | 21 | 'description' => '', |
22 | 22 | 'default' => 'no', |
23 | 23 | ), |
24 | 24 | 'title' => array( |
25 | - 'title' => __( 'Title', 'woocommerce-gateway-stripe' ), |
|
25 | + 'title' => __('Title', 'woocommerce-gateway-stripe'), |
|
26 | 26 | 'type' => 'text', |
27 | - 'description' => __( 'This controls the title which the user sees during checkout.', 'woocommerce-gateway-stripe' ), |
|
28 | - 'default' => __( 'Multibanco', 'woocommerce-gateway-stripe' ), |
|
27 | + 'description' => __('This controls the title which the user sees during checkout.', 'woocommerce-gateway-stripe'), |
|
28 | + 'default' => __('Multibanco', 'woocommerce-gateway-stripe'), |
|
29 | 29 | 'desc_tip' => true, |
30 | 30 | ), |
31 | 31 | 'description' => array( |
32 | - 'title' => __( 'Description', 'woocommerce-gateway-stripe' ), |
|
32 | + 'title' => __('Description', 'woocommerce-gateway-stripe'), |
|
33 | 33 | 'type' => 'text', |
34 | - 'description' => __( 'This controls the description which the user sees during checkout.', 'woocommerce-gateway-stripe' ), |
|
35 | - 'default' => __( 'You will be redirected to Multibanco.', 'woocommerce-gateway-stripe' ), |
|
34 | + 'description' => __('This controls the description which the user sees during checkout.', 'woocommerce-gateway-stripe'), |
|
35 | + 'default' => __('You will be redirected to Multibanco.', 'woocommerce-gateway-stripe'), |
|
36 | 36 | 'desc_tip' => true, |
37 | 37 | ), |
38 | 38 | 'webhook' => array( |
39 | - 'title' => __( 'Webhook Endpoints', 'woocommerce-gateway-stripe' ), |
|
39 | + 'title' => __('Webhook Endpoints', 'woocommerce-gateway-stripe'), |
|
40 | 40 | 'type' => 'title', |
41 | 41 | /* translators: webhook URL */ |
42 | 42 | 'description' => $this->display_admin_settings_webhook_description(), |