@@ -1,7 +1,7 @@ discard block |
||
1 | 1 | <div class="padding"> |
2 | 2 | <?php |
3 | 3 | //we'll only show site-license keys if this is main_site() (which works for both multi-site and single-site wp installations) |
4 | - if ( is_main_site() ) { ?> |
|
4 | + if (is_main_site()) { ?> |
|
5 | 5 | <h2 class="ee-admin-settings-hdr" style="width:300px;"> |
6 | 6 | <?php _e('Your Event Espresso License Key', 'event_espresso'); ?> |
7 | 7 | </h2> |
@@ -11,13 +11,13 @@ discard block |
||
11 | 11 | <tr <?php echo isset($_REQUEST['license_key']) && $_REQUEST['license_key'] == true ? 'class="yellow_alert"' : '' ?>> |
12 | 12 | <th> |
13 | 13 | <label for="site_license_key"> |
14 | - <?php _e('Support License Key', 'event_espresso'); ?> <?php echo EEH_Template::get_help_tab_link('site_license_key_info');?> |
|
14 | + <?php _e('Support License Key', 'event_espresso'); ?> <?php echo EEH_Template::get_help_tab_link('site_license_key_info'); ?> |
|
15 | 15 | </label> |
16 | 16 | </th> |
17 | 17 | <td> |
18 | 18 | <input name="site_license_key" id="site_license_key" size="10" class="regular-text" type="text" value="<?php echo $site_license_key; ?>" /><?php echo $site_license_key_verified; ?><br/> |
19 | 19 | <p class="description"> |
20 | - <?php printf( __('Adding a valid Support License Key will enable automatic update notifications and backend updates for Event Espresso Core and any installed add-ons. If this is a Development or Test site, %sDO NOT%s enter your Support License Key.', 'event_espresso'), '<strong>', '</strong>' ); ?> |
|
20 | + <?php printf(__('Adding a valid Support License Key will enable automatic update notifications and backend updates for Event Espresso Core and any installed add-ons. If this is a Development or Test site, %sDO NOT%s enter your Support License Key.', 'event_espresso'), '<strong>', '</strong>'); ?> |
|
21 | 21 | </p> |
22 | 22 | </td> |
23 | 23 | </tr> |
@@ -30,7 +30,7 @@ discard block |
||
30 | 30 | |
31 | 31 | |
32 | 32 | <h2 id="contact_info_h4" class="ee-admin-settings-hdr"> |
33 | - <?php _e('Contact Information', 'event_espresso'); ?> <?php echo EEH_Template::get_help_tab_link('contact_info_info');?> |
|
33 | + <?php _e('Contact Information', 'event_espresso'); ?> <?php echo EEH_Template::get_help_tab_link('contact_info_info'); ?> |
|
34 | 34 | </h2> |
35 | 35 | |
36 | 36 | <table class="form-table"> |
@@ -78,8 +78,8 @@ discard block |
||
78 | 78 | <input id="organization_city" class="regular-text" type="text" name="organization_city" value="<?php echo $organization_city; ?>" /> |
79 | 79 | </td> |
80 | 80 | </tr> |
81 | - <?php echo EEH_Form_Fields::generate_form_input( $states ); ?> |
|
82 | - <?php echo EEH_Form_Fields::generate_form_input( $countries ); ?> |
|
81 | + <?php echo EEH_Form_Fields::generate_form_input($states); ?> |
|
82 | + <?php echo EEH_Form_Fields::generate_form_input($countries); ?> |
|
83 | 83 | <tr> |
84 | 84 | <th> |
85 | 85 | <label for="organization_zip"> |
@@ -99,7 +99,7 @@ discard block |
||
99 | 99 | <td> |
100 | 100 | <input class="regular-text" type="text" name="organization_email" value="<?php echo $organization_email; ?>" /> |
101 | 101 | <p class="description"> |
102 | - <?php echo sprintf( esc_html__('This is where notifications go to when you use the %1$s and %2$s shortcodes in the message templates.', 'event_espresso'), '<code>[CO_FORMATTED_EMAIL]</code>', '<code>[CO_EMAIL]</code>' ); ?> |
|
102 | + <?php echo sprintf(esc_html__('This is where notifications go to when you use the %1$s and %2$s shortcodes in the message templates.', 'event_espresso'), '<code>[CO_FORMATTED_EMAIL]</code>', '<code>[CO_EMAIL]</code>'); ?> |
|
103 | 103 | </p> |
104 | 104 | </td> |
105 | 105 | </tr> |
@@ -133,7 +133,7 @@ discard block |
||
133 | 133 | </table> |
134 | 134 | |
135 | 135 | <h2 class="ee-admin-settings-hdr"> |
136 | - <?php _e('Company Logo', 'event_espresso'); ?> <?php echo EEH_Template::get_help_tab_link('organization_logo_info');?> |
|
136 | + <?php _e('Company Logo', 'event_espresso'); ?> <?php echo EEH_Template::get_help_tab_link('organization_logo_info'); ?> |
|
137 | 137 | </h2> |
138 | 138 | |
139 | 139 | <table class="form-table"> |
@@ -161,7 +161,7 @@ discard block |
||
161 | 161 | </th> |
162 | 162 | <td> |
163 | 163 | <?php |
164 | - if ( $organization_logo_url ) { |
|
164 | + if ($organization_logo_url) { |
|
165 | 165 | ?> |
166 | 166 | <p id="default-logo-thumb"> |
167 | 167 | <img id="current-image-thumb" src="<?php echo $organization_logo_url ?>" alt="" /><br /> |
@@ -179,7 +179,7 @@ discard block |
||
179 | 179 | <br/><br/> |
180 | 180 | |
181 | 181 | <h2 class="ee-admin-settings-hdr"> |
182 | - <?php _e('Social Links', 'event_espresso'); ?> <?php echo EEH_Template::get_help_tab_link('social_links_info');?> |
|
182 | + <?php _e('Social Links', 'event_espresso'); ?> <?php echo EEH_Template::get_help_tab_link('social_links_info'); ?> |
|
183 | 183 | </h2> |
184 | 184 | <p class="description"><?php _e('Enter any links to social accounts for your organization here', 'event_espresso'); ?></p> |
185 | 185 | |
@@ -256,9 +256,9 @@ discard block |
||
256 | 256 | <br/><br/> |
257 | 257 | |
258 | 258 | |
259 | - <?php if ( is_main_site() ) : ?> |
|
259 | + <?php if (is_main_site()) : ?> |
|
260 | 260 | <p> |
261 | - <?php echo EE_PUE::espresso_data_collection_optin_text( FALSE ); ?> |
|
261 | + <?php echo EE_PUE::espresso_data_collection_optin_text(FALSE); ?> |
|
262 | 262 | </p> |
263 | 263 | |
264 | 264 | <table class="form-table"> |
@@ -272,11 +272,11 @@ discard block |
||
272 | 272 | </th> |
273 | 273 | <td> |
274 | 274 | <?php |
275 | - $values=array( |
|
276 | - array('id'=>'yes','text'=> __('Yes! I want to help improve Event Espresso!','event_espresso')), |
|
277 | - array('id'=>'no','text'=> __('Not at this time. Maybe later.','event_espresso')) |
|
275 | + $values = array( |
|
276 | + array('id'=>'yes', 'text'=> __('Yes! I want to help improve Event Espresso!', 'event_espresso')), |
|
277 | + array('id'=>'no', 'text'=> __('Not at this time. Maybe later.', 'event_espresso')) |
|
278 | 278 | ); |
279 | - echo EEH_Form_Fields::select_input('ueip_optin', $values, !empty($ee_ueip_optin) ? $ee_ueip_optin : 'yes'); |
|
279 | + echo EEH_Form_Fields::select_input('ueip_optin', $values, ! empty($ee_ueip_optin) ? $ee_ueip_optin : 'yes'); |
|
280 | 280 | ?> |
281 | 281 | </td> |
282 | 282 | </tr> |
@@ -51,7 +51,7 @@ |
||
51 | 51 | </table> |
52 | 52 | <div class="ee-editor-footer-container"> |
53 | 53 | <div class="ee-editor-id-container"> |
54 | - <span class="ee-item-id"><?php echo $DTT_ID ? sprintf( esc_html__( 'Datetime ID: %d', 'event_espresso' ), $DTT_ID ) : ''; ?></span> |
|
54 | + <span class="ee-item-id"><?php echo $DTT_ID ? sprintf(esc_html__('Datetime ID: %d', 'event_espresso'), $DTT_ID) : ''; ?></span> |
|
55 | 55 | </div> |
56 | 56 | <div class="save-cancel-button-container"> |
57 | 57 | <button data-context="short-ticket" data-datetime-row="<?php echo $dtt_row; ?>" class="button-primary ee-create-button"> |
@@ -1,1 +1,1 @@ |
||
1 | -<?php printf( esc_html__('Authorize.Net AIM is an on-site payment method for accepting credit and debit card payments and is available to event organizers in the United States, Canada, United Kingdom, and Australia. An account with Authorize.Net is required to accept payments. Need an Authorize.Net account? %1$sClick here to sign up for a merchant account%2$s.', 'event_espresso'), '<a href="https://eventespresso.com/go/authorizenetaim/" target="_blank">','</a>' ); |
|
2 | 1 | \ No newline at end of file |
2 | +<?php printf(esc_html__('Authorize.Net AIM is an on-site payment method for accepting credit and debit card payments and is available to event organizers in the United States, Canada, United Kingdom, and Australia. An account with Authorize.Net is required to accept payments. Need an Authorize.Net account? %1$sClick here to sign up for a merchant account%2$s.', 'event_espresso'), '<a href="https://eventespresso.com/go/authorizenetaim/" target="_blank">', '</a>'); |
|
3 | 3 | \ No newline at end of file |
@@ -1,1 +1,1 @@ |
||
1 | -<?php printf( esc_html__('Mijireh is an off-site payment method for accepting payments online through over 80+ payment gateways and is available to event organizers in many countries. An account with Mijireh is required to accept payments. Need a Mijireh account? %1$sClick here to sign up for a merchant account%2$s.', 'event_espresso'), '<a href="https://eventespresso.com/go/mijireh/" target="_blank">','</a>' ); |
|
2 | 1 | \ No newline at end of file |
2 | +<?php printf(esc_html__('Mijireh is an off-site payment method for accepting payments online through over 80+ payment gateways and is available to event organizers in many countries. An account with Mijireh is required to accept payments. Need a Mijireh account? %1$sClick here to sign up for a merchant account%2$s.', 'event_espresso'), '<a href="https://eventespresso.com/go/mijireh/" target="_blank">', '</a>'); |
|
3 | 3 | \ No newline at end of file |
@@ -1,1 +1,1 @@ |
||
1 | -<?php printf( esc_html__('PayPal Pro (Website Payments Pro) is an on-site payment method for accepting credit and debit cards and is available to event organizers in the United States, United Kingdom, and Canada. An account with PayPal is required to accept payments. Need a PayPal Pro account? Call 1-855-456-1338 or %1$sclick here to sign up for a merchant account%2$s.', 'event_espresso'), '<a href="https://eventespresso.com/go/paypalpro/" target="_blank">','</a>' ); |
|
2 | 1 | \ No newline at end of file |
2 | +<?php printf(esc_html__('PayPal Pro (Website Payments Pro) is an on-site payment method for accepting credit and debit cards and is available to event organizers in the United States, United Kingdom, and Canada. An account with PayPal is required to accept payments. Need a PayPal Pro account? Call 1-855-456-1338 or %1$sclick here to sign up for a merchant account%2$s.', 'event_espresso'), '<a href="https://eventespresso.com/go/paypalpro/" target="_blank">', '</a>'); |
|
3 | 3 | \ No newline at end of file |
@@ -2,7 +2,7 @@ |
||
2 | 2 | $closing_tag = '</a>'; |
3 | 3 | //if this is decaf, which is put on WordPress.org, we need to inform users that |
4 | 4 | //we just put an affiliate link there. See https://developer.wordpress.org/plugins/wordpress-org/detailed-plugin-guidelines/ section 12 |
5 | -if( apply_filters( 'FHEE__ee_show_affiliate_links', true ) ) { |
|
6 | - $closing_tag .= esc_html__( ' (affiliate link)', 'event_espresso' ); |
|
5 | +if (apply_filters('FHEE__ee_show_affiliate_links', true)) { |
|
6 | + $closing_tag .= esc_html__(' (affiliate link)', 'event_espresso'); |
|
7 | 7 | } |
8 | -printf( esc_html__('PayPal Standard (PayPal Payments Standard) is an off-site payment method and is available to event organizers in many countries. A PayPal premier or business account is needed to accept payments. Need a PayPal account? Call 1-855-456-1338 or %1$sclick here to sign up for a merchant account%2$s.', 'event_espresso'), '<a href="https://eventespresso.com/go/paypalstandard/" target="_blank">', $closing_tag ); |
|
9 | 8 | \ No newline at end of file |
9 | +printf(esc_html__('PayPal Standard (PayPal Payments Standard) is an off-site payment method and is available to event organizers in many countries. A PayPal premier or business account is needed to accept payments. Need a PayPal account? Call 1-855-456-1338 or %1$sclick here to sign up for a merchant account%2$s.', 'event_espresso'), '<a href="https://eventespresso.com/go/paypalstandard/" target="_blank">', $closing_tag); |
|
10 | 10 | \ No newline at end of file |
@@ -15,27 +15,27 @@ |
||
15 | 15 | * @type bool $show_gravatar whether to show gravatar or not. |
16 | 16 | */ |
17 | 17 | |
18 | -$no_attendees_message = apply_filters( 'FHEE__loop-espresso_attendees-shortcode__template__no_attendees_message', __('No Attendees Yet', 'event_espresso' ) ); |
|
18 | +$no_attendees_message = apply_filters('FHEE__loop-espresso_attendees-shortcode__template__no_attendees_message', __('No Attendees Yet', 'event_espresso')); |
|
19 | 19 | |
20 | 20 | |
21 | 21 | ?> |
22 | 22 | |
23 | 23 | <div class="event-attendees"> |
24 | - <?php do_action( 'AHEE__loop-espresso_event_attendees__before', $contacts, $event, $datetime, $ticket, $show_gravatar ); ?> |
|
25 | - <?php if ( $contacts ) : ?> |
|
24 | + <?php do_action('AHEE__loop-espresso_event_attendees__before', $contacts, $event, $datetime, $ticket, $show_gravatar); ?> |
|
25 | + <?php if ($contacts) : ?> |
|
26 | 26 | <ul class="event-attendees-list"> |
27 | - <?php foreach( $contacts as $contact ) : |
|
28 | - EEH_Template::get_template_part( 'content', 'espresso_event_attendees', array( |
|
27 | + <?php foreach ($contacts as $contact) : |
|
28 | + EEH_Template::get_template_part('content', 'espresso_event_attendees', array( |
|
29 | 29 | 'contact' => $contact, |
30 | 30 | 'event' => $event, |
31 | 31 | 'datetime' => $datetime, |
32 | 32 | 'ticket' => $ticket, |
33 | 33 | 'show_gravatar' => $show_gravatar |
34 | - ) ); |
|
34 | + )); |
|
35 | 35 | endforeach; ?> |
36 | 36 | </ul> |
37 | 37 | <?php else : ?> |
38 | 38 | <p><?php echo $no_attendees_message; ?></p> |
39 | 39 | <?php endif; ?> |
40 | - <?php do_action( 'AHEE__loop-espresso_event_attendees__after', $contacts, $event, $datetime, $ticket, $show_gravatar ); ?> |
|
40 | + <?php do_action('AHEE__loop-espresso_event_attendees__after', $contacts, $event, $datetime, $ticket, $show_gravatar); ?> |
|
41 | 41 | </div> |
42 | 42 | \ No newline at end of file |
@@ -34,8 +34,11 @@ |
||
34 | 34 | ) ); |
35 | 35 | endforeach; ?> |
36 | 36 | </ul> |
37 | - <?php else : ?> |
|
38 | - <p><?php echo $no_attendees_message; ?></p> |
|
37 | + <?php else { |
|
38 | + : ?> |
|
39 | + <p><?php echo $no_attendees_message; |
|
40 | +} |
|
41 | +?></p> |
|
39 | 42 | <?php endif; ?> |
40 | 43 | <?php do_action( 'AHEE__loop-espresso_event_attendees__after', $contacts, $event, $datetime, $ticket, $show_gravatar ); ?> |
41 | 44 | </div> |
42 | 45 | \ No newline at end of file |
@@ -187,7 +187,7 @@ discard block |
||
187 | 187 | |
188 | 188 | /** |
189 | 189 | * start_timer |
190 | - * @param null $timer_name |
|
190 | + * @param string $timer_name |
|
191 | 191 | */ |
192 | 192 | public function start_timer( $timer_name = NULL ){ |
193 | 193 | $this->_start_times[$timer_name] = microtime( TRUE ); |
@@ -468,12 +468,13 @@ discard block |
||
468 | 468 | |
469 | 469 | |
470 | 470 | /** |
471 | - * @param mixed $var |
|
471 | + * @param string $var |
|
472 | 472 | * @param string $var_name |
473 | 473 | * @param string $file |
474 | 474 | * @param int $line |
475 | 475 | * @param int $heading_tag |
476 | 476 | * @param bool $die |
477 | + * @param string $margin |
|
477 | 478 | */ |
478 | 479 | public static function printv( $var, $var_name = '', $file = __FILE__, $line = __LINE__, $heading_tag = 5, $die = false, $margin ) { |
479 | 480 | $var_name = ! $var_name ? 'string' : $var_name; |
@@ -480,9 +480,9 @@ discard block |
||
480 | 480 | $var_name = ucwords( str_replace( '$', '', $var_name ) ); |
481 | 481 | $is_method = method_exists( $var_name, $var ); |
482 | 482 | $var_name = ucwords( str_replace( '_', ' ', $var_name ) ); |
483 | - $heading_tag = is_int($heading_tag) ? "h{$heading_tag}" : "h5"; |
|
484 | - $result = EEH_Debug_Tools::heading($var_name, $heading_tag, $margin); |
|
485 | - $result .= $is_method |
|
483 | + $heading_tag = is_int($heading_tag) ? "h{$heading_tag}" : "h5"; |
|
484 | + $result = EEH_Debug_Tools::heading($var_name, $heading_tag, $margin); |
|
485 | + $result .= $is_method |
|
486 | 486 | ? \EEH_Debug_Tools::grey_span('::') . \EEH_Debug_Tools::orange_span($var . "()") |
487 | 487 | : \EEH_Debug_Tools::grey_span(' : ') . \EEH_Debug_Tools::orange_span($var); |
488 | 488 | $result .= \EEH_Debug_Tools::file_and_line($file, $line); |
@@ -496,93 +496,93 @@ discard block |
||
496 | 496 | |
497 | 497 | |
498 | 498 | |
499 | - /** |
|
500 | - * @param string $var_name |
|
501 | - * @param string $heading_tag |
|
502 | - * @param string $margin |
|
503 | - * @return string |
|
504 | - */ |
|
499 | + /** |
|
500 | + * @param string $var_name |
|
501 | + * @param string $heading_tag |
|
502 | + * @param string $margin |
|
503 | + * @return string |
|
504 | + */ |
|
505 | 505 | protected static function heading( $var_name = '', $heading_tag = 'h5', $margin = '' ) { |
506 | - if (defined('EE_TESTS_DIR')) { |
|
507 | - return "\n\n{$var_name}"; |
|
508 | - } |
|
509 | - return '<'.$heading_tag.' style="color:#2EA2CC; margin:25px 0 0'.$margin.';"><b>'.$var_name.'</b>'; |
|
510 | - } |
|
506 | + if (defined('EE_TESTS_DIR')) { |
|
507 | + return "\n\n{$var_name}"; |
|
508 | + } |
|
509 | + return '<'.$heading_tag.' style="color:#2EA2CC; margin:25px 0 0'.$margin.';"><b>'.$var_name.'</b>'; |
|
510 | + } |
|
511 | 511 | |
512 | 512 | |
513 | 513 | |
514 | - /** |
|
515 | - * @param string $heading_tag |
|
516 | - * @return string |
|
517 | - */ |
|
514 | + /** |
|
515 | + * @param string $heading_tag |
|
516 | + * @return string |
|
517 | + */ |
|
518 | 518 | protected static function headingx( $heading_tag = 'h5' ) { |
519 | - if (defined('EE_TESTS_DIR')) { |
|
520 | - return "\n"; |
|
521 | - } |
|
522 | - return '</' . $heading_tag . '>'; |
|
523 | - } |
|
519 | + if (defined('EE_TESTS_DIR')) { |
|
520 | + return "\n"; |
|
521 | + } |
|
522 | + return '</' . $heading_tag . '>'; |
|
523 | + } |
|
524 | 524 | |
525 | 525 | |
526 | 526 | |
527 | - /** |
|
528 | - * @param string $content |
|
529 | - * @return string |
|
530 | - */ |
|
527 | + /** |
|
528 | + * @param string $content |
|
529 | + * @return string |
|
530 | + */ |
|
531 | 531 | protected static function grey_span( $content = '' ) { |
532 | - if (defined('EE_TESTS_DIR')) { |
|
533 | - return $content; |
|
534 | - } |
|
535 | - return '<span style="color:#999">' . $content . '</span>'; |
|
536 | - } |
|
532 | + if (defined('EE_TESTS_DIR')) { |
|
533 | + return $content; |
|
534 | + } |
|
535 | + return '<span style="color:#999">' . $content . '</span>'; |
|
536 | + } |
|
537 | 537 | |
538 | 538 | |
539 | 539 | |
540 | - /** |
|
541 | - * @param string $file |
|
542 | - * @param int $line |
|
543 | - * @return string |
|
544 | - */ |
|
540 | + /** |
|
541 | + * @param string $file |
|
542 | + * @param int $line |
|
543 | + * @return string |
|
544 | + */ |
|
545 | 545 | protected static function file_and_line($file, $line) { |
546 | - if (defined('EE_TESTS_DIR')) { |
|
547 | - return "\n (" . $file . ' line no: ' . $line . ' ) '; |
|
548 | - } |
|
549 | - return '<br /><span style="font-size:9px;font-weight:normal;color:#666;line-height: 12px;">' . $file . '<br />line no: ' . $line . '</span>'; |
|
550 | - } |
|
551 | - |
|
552 | - |
|
553 | - |
|
554 | - /** |
|
555 | - * @param string $content |
|
556 | - * @return string |
|
557 | - */ |
|
558 | - protected static function orange_span($content = '') |
|
559 | - { |
|
560 | - if (defined('EE_TESTS_DIR')) { |
|
561 | - return $content; |
|
562 | - } |
|
563 | - return '<span style="color:#E76700">' . $content . '</span>'; |
|
564 | - } |
|
565 | - |
|
566 | - |
|
567 | - |
|
568 | - /** |
|
569 | - * @param mixed $var |
|
570 | - * @return string |
|
571 | - */ |
|
572 | - protected static function pre_span($var) |
|
573 | - { |
|
574 | - ob_start(); |
|
575 | - var_dump($var); |
|
576 | - $var = ob_get_clean(); |
|
577 | - if (defined('EE_TESTS_DIR')) { |
|
578 | - return "\n" . $var; |
|
579 | - } |
|
580 | - return '<pre style="color:#999; padding:1em; background: #fff">' . $var . '</pre>'; |
|
581 | - } |
|
582 | - |
|
583 | - |
|
584 | - |
|
585 | - /** |
|
546 | + if (defined('EE_TESTS_DIR')) { |
|
547 | + return "\n (" . $file . ' line no: ' . $line . ' ) '; |
|
548 | + } |
|
549 | + return '<br /><span style="font-size:9px;font-weight:normal;color:#666;line-height: 12px;">' . $file . '<br />line no: ' . $line . '</span>'; |
|
550 | + } |
|
551 | + |
|
552 | + |
|
553 | + |
|
554 | + /** |
|
555 | + * @param string $content |
|
556 | + * @return string |
|
557 | + */ |
|
558 | + protected static function orange_span($content = '') |
|
559 | + { |
|
560 | + if (defined('EE_TESTS_DIR')) { |
|
561 | + return $content; |
|
562 | + } |
|
563 | + return '<span style="color:#E76700">' . $content . '</span>'; |
|
564 | + } |
|
565 | + |
|
566 | + |
|
567 | + |
|
568 | + /** |
|
569 | + * @param mixed $var |
|
570 | + * @return string |
|
571 | + */ |
|
572 | + protected static function pre_span($var) |
|
573 | + { |
|
574 | + ob_start(); |
|
575 | + var_dump($var); |
|
576 | + $var = ob_get_clean(); |
|
577 | + if (defined('EE_TESTS_DIR')) { |
|
578 | + return "\n" . $var; |
|
579 | + } |
|
580 | + return '<pre style="color:#999; padding:1em; background: #fff">' . $var . '</pre>'; |
|
581 | + } |
|
582 | + |
|
583 | + |
|
584 | + |
|
585 | + /** |
|
586 | 586 | * @param mixed $var |
587 | 587 | * @param string $var_name |
588 | 588 | * @param string $file |
@@ -593,8 +593,8 @@ discard block |
||
593 | 593 | public static function printr( $var, $var_name = '', $file = __FILE__, $line = __LINE__, $heading_tag = 5, $die = false ) { |
594 | 594 | // return; |
595 | 595 | $file = str_replace( rtrim( ABSPATH, '\\/' ), '', $file ); |
596 | - $margin = is_admin() ? ' 180px' : '0'; |
|
597 | - //$print_r = false; |
|
596 | + $margin = is_admin() ? ' 180px' : '0'; |
|
597 | + //$print_r = false; |
|
598 | 598 | if ( is_string( $var ) ) { |
599 | 599 | EEH_Debug_Tools::printv( $var, $var_name, $file, $line, $heading_tag, $die, $margin ); |
600 | 600 | return; |
@@ -610,11 +610,11 @@ discard block |
||
610 | 610 | $var_name = ! $var_name ? 'null' : $var_name; |
611 | 611 | } |
612 | 612 | $var_name = ucwords( str_replace( array( '$', '_' ), array( '', ' ' ), $var_name ) ); |
613 | - $heading_tag = is_int($heading_tag) ? "h{$heading_tag}" : "h5"; |
|
614 | - $result = EEH_Debug_Tools::heading($var_name, $heading_tag, $margin); |
|
613 | + $heading_tag = is_int($heading_tag) ? "h{$heading_tag}" : "h5"; |
|
614 | + $result = EEH_Debug_Tools::heading($var_name, $heading_tag, $margin); |
|
615 | 615 | $result .= \EEH_Debug_Tools::grey_span(' : ') . \EEH_Debug_Tools::orange_span( |
616 | - \EEH_Debug_Tools::pre_span($var) |
|
617 | - ); |
|
616 | + \EEH_Debug_Tools::pre_span($var) |
|
617 | + ); |
|
618 | 618 | $result .= \EEH_Debug_Tools::file_and_line($file, $line); |
619 | 619 | $result .= \EEH_Debug_Tools::headingx($heading_tag); |
620 | 620 | if ( $die ) { |
@@ -1,4 +1,4 @@ discard block |
||
1 | -<?php if ( ! defined('EVENT_ESPRESSO_VERSION')) {exit('No direct script access allowed');} |
|
1 | +<?php if ( ! defined('EVENT_ESPRESSO_VERSION')) {exit('No direct script access allowed'); } |
|
2 | 2 | /** |
3 | 3 | * Class EEH_Debug_Tools |
4 | 4 | * |
@@ -8,7 +8,7 @@ discard block |
||
8 | 8 | * @since 4.0 |
9 | 9 | * |
10 | 10 | */ |
11 | -class EEH_Debug_Tools{ |
|
11 | +class EEH_Debug_Tools { |
|
12 | 12 | |
13 | 13 | /** |
14 | 14 | * instance of the EEH_Autoloader object |
@@ -41,7 +41,7 @@ discard block |
||
41 | 41 | */ |
42 | 42 | public static function instance() { |
43 | 43 | // check if class object is instantiated, and instantiated properly |
44 | - if ( ! self::$_instance instanceof EEH_Debug_Tools ) { |
|
44 | + if ( ! self::$_instance instanceof EEH_Debug_Tools) { |
|
45 | 45 | self::$_instance = new self(); |
46 | 46 | } |
47 | 47 | return self::$_instance; |
@@ -57,21 +57,21 @@ discard block |
||
57 | 57 | */ |
58 | 58 | private function __construct() { |
59 | 59 | // load Kint PHP debugging library |
60 | - if ( ! class_exists( 'Kint' ) && file_exists( EE_PLUGIN_DIR_PATH . 'tests' . DS . 'kint' . DS . 'Kint.class.php' )){ |
|
60 | + if ( ! class_exists('Kint') && file_exists(EE_PLUGIN_DIR_PATH.'tests'.DS.'kint'.DS.'Kint.class.php')) { |
|
61 | 61 | // despite EE4 having a check for an existing copy of the Kint debugging class, |
62 | 62 | // if another plugin was loaded AFTER EE4 and they did NOT perform a similar check, |
63 | 63 | // then hilarity would ensue as PHP throws a "Cannot redeclare class Kint" error |
64 | 64 | // so we've moved it to our test folder so that it is not included with production releases |
65 | 65 | // plz use https://wordpress.org/plugins/kint-debugger/ if testing production versions of EE |
66 | - require_once( EE_PLUGIN_DIR_PATH . 'tests' . DS . 'kint' . DS . 'Kint.class.php' ); |
|
66 | + require_once(EE_PLUGIN_DIR_PATH.'tests'.DS.'kint'.DS.'Kint.class.php'); |
|
67 | 67 | } |
68 | 68 | // if ( ! defined('DOING_AJAX') || $_REQUEST['noheader'] !== 'true' || ! isset( $_REQUEST['noheader'], $_REQUEST['TB_iframe'] ) ) { |
69 | 69 | //add_action( 'shutdown', array($this,'espresso_session_footer_dump') ); |
70 | 70 | // } |
71 | - $plugin = basename( EE_PLUGIN_DIR_PATH ); |
|
72 | - add_action( "activate_{$plugin}", array( 'EEH_Debug_Tools', 'ee_plugin_activation_errors' )); |
|
73 | - add_action( 'activated_plugin', array( 'EEH_Debug_Tools', 'ee_plugin_activation_errors' )); |
|
74 | - add_action( 'shutdown', array( 'EEH_Debug_Tools', 'show_db_name' )); |
|
71 | + $plugin = basename(EE_PLUGIN_DIR_PATH); |
|
72 | + add_action("activate_{$plugin}", array('EEH_Debug_Tools', 'ee_plugin_activation_errors')); |
|
73 | + add_action('activated_plugin', array('EEH_Debug_Tools', 'ee_plugin_activation_errors')); |
|
74 | + add_action('shutdown', array('EEH_Debug_Tools', 'show_db_name')); |
|
75 | 75 | } |
76 | 76 | |
77 | 77 | |
@@ -82,10 +82,10 @@ discard block |
||
82 | 82 | * @return void |
83 | 83 | */ |
84 | 84 | public static function show_db_name() { |
85 | - if ( ! defined( 'DOING_AJAX' ) && ( defined( 'EE_ERROR_EMAILS' ) && EE_ERROR_EMAILS )) { |
|
86 | - echo '<p style="font-size:10px;font-weight:normal;color:#E76700;margin: 1em 2em; text-align: right;">DB_NAME: '. DB_NAME .'</p>'; |
|
85 | + if ( ! defined('DOING_AJAX') && (defined('EE_ERROR_EMAILS') && EE_ERROR_EMAILS)) { |
|
86 | + echo '<p style="font-size:10px;font-weight:normal;color:#E76700;margin: 1em 2em; text-align: right;">DB_NAME: '.DB_NAME.'</p>'; |
|
87 | 87 | } |
88 | - if ( EE_DEBUG ) { |
|
88 | + if (EE_DEBUG) { |
|
89 | 89 | EEH_Debug_Tools::instance()->show_times(); |
90 | 90 | } |
91 | 91 | } |
@@ -99,15 +99,15 @@ discard block |
||
99 | 99 | */ |
100 | 100 | public function espresso_session_footer_dump() { |
101 | 101 | if ( |
102 | - ( defined( 'WP_DEBUG' ) && WP_DEBUG ) |
|
103 | - && ! defined( 'DOING_AJAX' ) |
|
104 | - && class_exists( 'Kint' ) |
|
105 | - && function_exists( 'wp_get_current_user' ) |
|
106 | - && current_user_can( 'update_core' ) |
|
107 | - && class_exists( 'EE_Registry' ) |
|
102 | + (defined('WP_DEBUG') && WP_DEBUG) |
|
103 | + && ! defined('DOING_AJAX') |
|
104 | + && class_exists('Kint') |
|
105 | + && function_exists('wp_get_current_user') |
|
106 | + && current_user_can('update_core') |
|
107 | + && class_exists('EE_Registry') |
|
108 | 108 | ) { |
109 | - Kint::dump( EE_Registry::instance()->SSN->id() ); |
|
110 | - Kint::dump( EE_Registry::instance()->SSN ); |
|
109 | + Kint::dump(EE_Registry::instance()->SSN->id()); |
|
110 | + Kint::dump(EE_Registry::instance()->SSN); |
|
111 | 111 | // Kint::dump( EE_Registry::instance()->SSN->get_session_data('cart')->get_tickets() ); |
112 | 112 | $this->espresso_list_hooked_functions(); |
113 | 113 | $this->show_times(); |
@@ -124,27 +124,27 @@ discard block |
||
124 | 124 | * @param string $tag |
125 | 125 | * @return void |
126 | 126 | */ |
127 | - public function espresso_list_hooked_functions( $tag='' ){ |
|
127 | + public function espresso_list_hooked_functions($tag = '') { |
|
128 | 128 | global $wp_filter; |
129 | 129 | echo '<br/><br/><br/><h3>Hooked Functions</h3>'; |
130 | - if ( $tag ) { |
|
131 | - $hook[$tag]=$wp_filter[$tag]; |
|
132 | - if ( ! is_array( $hook[$tag] )) { |
|
133 | - trigger_error( "Nothing found for '$tag' hook", E_USER_WARNING ); |
|
130 | + if ($tag) { |
|
131 | + $hook[$tag] = $wp_filter[$tag]; |
|
132 | + if ( ! is_array($hook[$tag])) { |
|
133 | + trigger_error("Nothing found for '$tag' hook", E_USER_WARNING); |
|
134 | 134 | return; |
135 | 135 | } |
136 | - echo '<h5>For Tag: '. $tag .'</h5>'; |
|
136 | + echo '<h5>For Tag: '.$tag.'</h5>'; |
|
137 | 137 | } |
138 | 138 | else { |
139 | - $hook=$wp_filter; |
|
140 | - ksort( $hook ); |
|
139 | + $hook = $wp_filter; |
|
140 | + ksort($hook); |
|
141 | 141 | } |
142 | - foreach( $hook as $tag_name => $priorities ) { |
|
142 | + foreach ($hook as $tag_name => $priorities) { |
|
143 | 143 | echo "<br />>>>>>\t<strong>$tag_name</strong><br />"; |
144 | - ksort( $priorities ); |
|
145 | - foreach( $priorities as $priority => $function ){ |
|
144 | + ksort($priorities); |
|
145 | + foreach ($priorities as $priority => $function) { |
|
146 | 146 | echo $priority; |
147 | - foreach( $function as $name => $properties ) { |
|
147 | + foreach ($function as $name => $properties) { |
|
148 | 148 | echo "\t$name<br />"; |
149 | 149 | } |
150 | 150 | } |
@@ -159,15 +159,15 @@ discard block |
||
159 | 159 | * @param string $hook_name |
160 | 160 | * @return array |
161 | 161 | */ |
162 | - public static function registered_filter_callbacks( $hook_name = '' ) { |
|
162 | + public static function registered_filter_callbacks($hook_name = '') { |
|
163 | 163 | $filters = array(); |
164 | 164 | global $wp_filter; |
165 | - if ( isset( $wp_filter[ $hook_name ] ) ) { |
|
166 | - $filters[ $hook_name ] = array(); |
|
167 | - foreach ( $wp_filter[ $hook_name ] as $priority => $callbacks ) { |
|
168 | - $filters[ $hook_name ][ $priority ] = array(); |
|
169 | - foreach ( $callbacks as $callback ) { |
|
170 | - $filters[ $hook_name ][ $priority ][] = $callback['function']; |
|
165 | + if (isset($wp_filter[$hook_name])) { |
|
166 | + $filters[$hook_name] = array(); |
|
167 | + foreach ($wp_filter[$hook_name] as $priority => $callbacks) { |
|
168 | + $filters[$hook_name][$priority] = array(); |
|
169 | + foreach ($callbacks as $callback) { |
|
170 | + $filters[$hook_name][$priority][] = $callback['function']; |
|
171 | 171 | } |
172 | 172 | } |
173 | 173 | } |
@@ -179,7 +179,7 @@ discard block |
||
179 | 179 | /** |
180 | 180 | * reset_times |
181 | 181 | */ |
182 | - public function reset_times(){ |
|
182 | + public function reset_times() { |
|
183 | 183 | $this->_times = array(); |
184 | 184 | } |
185 | 185 | |
@@ -189,8 +189,8 @@ discard block |
||
189 | 189 | * start_timer |
190 | 190 | * @param null $timer_name |
191 | 191 | */ |
192 | - public function start_timer( $timer_name = NULL ){ |
|
193 | - $this->_start_times[$timer_name] = microtime( TRUE ); |
|
192 | + public function start_timer($timer_name = NULL) { |
|
193 | + $this->_start_times[$timer_name] = microtime(TRUE); |
|
194 | 194 | } |
195 | 195 | |
196 | 196 | |
@@ -199,15 +199,15 @@ discard block |
||
199 | 199 | * stop_timer |
200 | 200 | * @param string $timer_name |
201 | 201 | */ |
202 | - public function stop_timer( $timer_name = '' ){ |
|
202 | + public function stop_timer($timer_name = '') { |
|
203 | 203 | $timer_name = $timer_name !== '' ? $timer_name : get_called_class(); |
204 | - if( isset( $this->_start_times[ $timer_name ] ) ){ |
|
205 | - $start_time = $this->_start_times[ $timer_name ]; |
|
206 | - unset( $this->_start_times[ $timer_name ] ); |
|
207 | - }else{ |
|
208 | - $start_time = array_pop( $this->_start_times ); |
|
204 | + if (isset($this->_start_times[$timer_name])) { |
|
205 | + $start_time = $this->_start_times[$timer_name]; |
|
206 | + unset($this->_start_times[$timer_name]); |
|
207 | + } else { |
|
208 | + $start_time = array_pop($this->_start_times); |
|
209 | 209 | } |
210 | - $this->_times[ $timer_name ] = number_format( microtime( true ) - $start_time, 8 ); |
|
210 | + $this->_times[$timer_name] = number_format(microtime(true) - $start_time, 8); |
|
211 | 211 | } |
212 | 212 | |
213 | 213 | |
@@ -217,10 +217,10 @@ discard block |
||
217 | 217 | * @param boolean $output_now whether to echo now, or wait until EEH_Debug_Tools::show_times() is called |
218 | 218 | * @return void |
219 | 219 | */ |
220 | - public function measure_memory( $label, $output_now = false ) { |
|
221 | - $memory_used = $this->convert( memory_get_peak_usage( true ) ); |
|
222 | - $this->_memory_usage_points[ $label ] = $memory_used; |
|
223 | - if( $output_now ) { |
|
220 | + public function measure_memory($label, $output_now = false) { |
|
221 | + $memory_used = $this->convert(memory_get_peak_usage(true)); |
|
222 | + $this->_memory_usage_points[$label] = $memory_used; |
|
223 | + if ($output_now) { |
|
224 | 224 | echo "\r\n<br>$label : $memory_used"; |
225 | 225 | } |
226 | 226 | } |
@@ -230,9 +230,9 @@ discard block |
||
230 | 230 | * @param int $size |
231 | 231 | * @return string |
232 | 232 | */ |
233 | - public function convert( $size ) { |
|
234 | - $unit=array('b','kb','mb','gb','tb','pb'); |
|
235 | - return @round( $size / pow( 1024, $i = floor( log( $size, 1024 ) ) ), 2 ) . ' ' . $unit[ absint( $i ) ]; |
|
233 | + public function convert($size) { |
|
234 | + $unit = array('b', 'kb', 'mb', 'gb', 'tb', 'pb'); |
|
235 | + return @round($size / pow(1024, $i = floor(log($size, 1024))), 2).' '.$unit[absint($i)]; |
|
236 | 236 | } |
237 | 237 | |
238 | 238 | |
@@ -242,25 +242,25 @@ discard block |
||
242 | 242 | * @param bool $output_now |
243 | 243 | * @return string |
244 | 244 | */ |
245 | - public function show_times($output_now=true){ |
|
245 | + public function show_times($output_now = true) { |
|
246 | 246 | $output = ''; |
247 | - if ( ! empty( $this->_times )) { |
|
247 | + if ( ! empty($this->_times)) { |
|
248 | 248 | $total = 0; |
249 | 249 | $output .= '<h2 style="margin:1em .5em 0;">Times:</h2>'; |
250 | 250 | $output .= '<span style="color:#9999CC; font-size:.8em; margin:0 1.5em 0;">( in milliseconds )</span><br />'; |
251 | - foreach( $this->_times as $timer_name => $total_time ) { |
|
252 | - $output .= $this->format_time( $timer_name, $total_time ); |
|
251 | + foreach ($this->_times as $timer_name => $total_time) { |
|
252 | + $output .= $this->format_time($timer_name, $total_time); |
|
253 | 253 | $total += $total_time; |
254 | 254 | } |
255 | 255 | $output .= '<br />'; |
256 | 256 | $output .= '<h4 style="margin:1em .5em 0;">TOTAL TIME</h4>'; |
257 | - $output .= $this->format_time( '', $total ); |
|
257 | + $output .= $this->format_time('', $total); |
|
258 | 258 | $output .= '<br />'; |
259 | 259 | } |
260 | - if ( ! empty( $this->_memory_usage_points )) { |
|
261 | - $output .= '<h2 style="margin:1em .5em 0;">Memory</h2>' . implode( '<br />', $this->_memory_usage_points ); |
|
260 | + if ( ! empty($this->_memory_usage_points)) { |
|
261 | + $output .= '<h2 style="margin:1em .5em 0;">Memory</h2>'.implode('<br />', $this->_memory_usage_points); |
|
262 | 262 | } |
263 | - if( $output_now ){ |
|
263 | + if ($output_now) { |
|
264 | 264 | echo $output; |
265 | 265 | return ''; |
266 | 266 | } |
@@ -274,9 +274,9 @@ discard block |
||
274 | 274 | * @param float $total_time |
275 | 275 | * @return string |
276 | 276 | */ |
277 | - public function format_time( $timer_name, $total_time ) { |
|
277 | + public function format_time($timer_name, $total_time) { |
|
278 | 278 | $total_time = $total_time * 1000; |
279 | - switch ( $total_time ) { |
|
279 | + switch ($total_time) { |
|
280 | 280 | case $total_time < 0.01 : |
281 | 281 | $color = '#8A549A'; |
282 | 282 | $bold = 'normal'; |
@@ -307,7 +307,7 @@ discard block |
||
307 | 307 | . '; font-weight:' |
308 | 308 | . $bold |
309 | 309 | . '; font-size:1.2em;">' |
310 | - . str_pad( number_format( $total_time, 5 ), 11, '0', STR_PAD_LEFT ) |
|
310 | + . str_pad(number_format($total_time, 5), 11, '0', STR_PAD_LEFT) |
|
311 | 311 | . '</span> ' |
312 | 312 | . $timer_name |
313 | 313 | . '<br />'; |
@@ -321,25 +321,25 @@ discard block |
||
321 | 321 | * @return void |
322 | 322 | */ |
323 | 323 | public static function ee_plugin_activation_errors() { |
324 | - if ( WP_DEBUG ) { |
|
324 | + if (WP_DEBUG) { |
|
325 | 325 | $activation_errors = ob_get_contents(); |
326 | - if ( ! empty( $activation_errors ) ) { |
|
327 | - $activation_errors = date( 'Y-m-d H:i:s' ) . "\n" . $activation_errors; |
|
326 | + if ( ! empty($activation_errors)) { |
|
327 | + $activation_errors = date('Y-m-d H:i:s')."\n".$activation_errors; |
|
328 | 328 | } |
329 | - espresso_load_required( 'EEH_File', EE_HELPERS . 'EEH_File.helper.php' ); |
|
330 | - if ( class_exists( 'EEH_File' )) { |
|
329 | + espresso_load_required('EEH_File', EE_HELPERS.'EEH_File.helper.php'); |
|
330 | + if (class_exists('EEH_File')) { |
|
331 | 331 | try { |
332 | - EEH_File::ensure_file_exists_and_is_writable( EVENT_ESPRESSO_UPLOAD_DIR . 'logs' . DS . 'espresso_plugin_activation_errors.html' ); |
|
333 | - EEH_File::write_to_file( EVENT_ESPRESSO_UPLOAD_DIR . 'logs' . DS . 'espresso_plugin_activation_errors.html', $activation_errors ); |
|
334 | - } catch( EE_Error $e ){ |
|
335 | - EE_Error::add_error( sprintf( __( 'The Event Espresso activation errors file could not be setup because: %s', 'event_espresso' ), $e->getMessage() ), __FILE__, __FUNCTION__, __LINE__ ); |
|
332 | + EEH_File::ensure_file_exists_and_is_writable(EVENT_ESPRESSO_UPLOAD_DIR.'logs'.DS.'espresso_plugin_activation_errors.html'); |
|
333 | + EEH_File::write_to_file(EVENT_ESPRESSO_UPLOAD_DIR.'logs'.DS.'espresso_plugin_activation_errors.html', $activation_errors); |
|
334 | + } catch (EE_Error $e) { |
|
335 | + EE_Error::add_error(sprintf(__('The Event Espresso activation errors file could not be setup because: %s', 'event_espresso'), $e->getMessage()), __FILE__, __FUNCTION__, __LINE__); |
|
336 | 336 | } |
337 | 337 | } else { |
338 | 338 | // old school attempt |
339 | - file_put_contents( EVENT_ESPRESSO_UPLOAD_DIR . 'logs' . DS . 'espresso_plugin_activation_errors.html', $activation_errors ); |
|
339 | + file_put_contents(EVENT_ESPRESSO_UPLOAD_DIR.'logs'.DS.'espresso_plugin_activation_errors.html', $activation_errors); |
|
340 | 340 | } |
341 | - $activation_errors = get_option( 'ee_plugin_activation_errors', '' ) . $activation_errors; |
|
342 | - update_option( 'ee_plugin_activation_errors', $activation_errors ); |
|
341 | + $activation_errors = get_option('ee_plugin_activation_errors', '').$activation_errors; |
|
342 | + update_option('ee_plugin_activation_errors', $activation_errors); |
|
343 | 343 | } |
344 | 344 | } |
345 | 345 | |
@@ -368,33 +368,33 @@ discard block |
||
368 | 368 | $applies_when = '', |
369 | 369 | $error_type = null |
370 | 370 | ) { |
371 | - $applies_when = ! empty( $applies_when ) ? $applies_when : espresso_version(); |
|
371 | + $applies_when = ! empty($applies_when) ? $applies_when : espresso_version(); |
|
372 | 372 | $error_type = $error_type !== null ? $error_type : E_USER_NOTICE; |
373 | 373 | // because we swapped the parameter order around for the last two params, |
374 | 374 | // let's verify that some third party isn't still passing an error type value for the third param |
375 | - if ( is_int( $applies_when ) ) { |
|
375 | + if (is_int($applies_when)) { |
|
376 | 376 | $error_type = $applies_when; |
377 | 377 | $applies_when = espresso_version(); |
378 | 378 | } |
379 | 379 | // if not displaying notices yet, then just leave |
380 | - if ( version_compare( espresso_version(), $applies_when, '<' ) ) { |
|
380 | + if (version_compare(espresso_version(), $applies_when, '<')) { |
|
381 | 381 | return; |
382 | 382 | } |
383 | - do_action( 'AHEE__EEH_Debug_Tools__doing_it_wrong_run', $function, $message, $version); |
|
384 | - $version = $version === null ? '' : sprintf( __('(This message was added in version %s of Event Espresso)', 'event_espresso' ), $version ); |
|
385 | - $error_message = sprintf( esc_html__('%1$s was called %2$sincorrectly%3$s. %4$s %5$s','event_espresso' ), $function, '<strong>', '</strong>', $message, $version ); |
|
383 | + do_action('AHEE__EEH_Debug_Tools__doing_it_wrong_run', $function, $message, $version); |
|
384 | + $version = $version === null ? '' : sprintf(__('(This message was added in version %s of Event Espresso)', 'event_espresso'), $version); |
|
385 | + $error_message = sprintf(esc_html__('%1$s was called %2$sincorrectly%3$s. %4$s %5$s', 'event_espresso'), $function, '<strong>', '</strong>', $message, $version); |
|
386 | 386 | |
387 | 387 | //don't trigger error if doing ajax, instead we'll add a transient EE_Error notice that in theory should show on the next request. |
388 | - if ( defined( 'DOING_AJAX' ) && DOING_AJAX ) { |
|
389 | - $error_message .= ' ' . esc_html__( 'This is a doing_it_wrong message that was triggered during an ajax request. The request params on this request were: ', 'event_espresso' ); |
|
388 | + if (defined('DOING_AJAX') && DOING_AJAX) { |
|
389 | + $error_message .= ' '.esc_html__('This is a doing_it_wrong message that was triggered during an ajax request. The request params on this request were: ', 'event_espresso'); |
|
390 | 390 | $error_message .= '<ul><li>'; |
391 | - $error_message .= implode( '</li><li>', EE_Registry::instance()->REQ->params() ); |
|
391 | + $error_message .= implode('</li><li>', EE_Registry::instance()->REQ->params()); |
|
392 | 392 | $error_message .= '</ul>'; |
393 | - EE_Error::add_error( $error_message, 'debug::doing_it_wrong', $function, '42' ); |
|
393 | + EE_Error::add_error($error_message, 'debug::doing_it_wrong', $function, '42'); |
|
394 | 394 | //now we set this on the transient so it shows up on the next request. |
395 | - EE_Error::get_notices( false, true ); |
|
395 | + EE_Error::get_notices(false, true); |
|
396 | 396 | } else { |
397 | - trigger_error( $error_message, $error_type ); |
|
397 | + trigger_error($error_message, $error_type); |
|
398 | 398 | } |
399 | 399 | } |
400 | 400 | |
@@ -416,22 +416,22 @@ discard block |
||
416 | 416 | * @param string $debug_index |
417 | 417 | * @param string $debug_key |
418 | 418 | */ |
419 | - public static function log( $class='', $func = '', $line = '', $info = array(), $display_request = false, $debug_index = '', $debug_key = 'EE_DEBUG_SPCO' ) { |
|
420 | - if ( WP_DEBUG && false ) { |
|
421 | - $debug_key = $debug_key . '_' . EE_Session::instance()->id(); |
|
422 | - $debug_data = get_option( $debug_key, array() ); |
|
419 | + public static function log($class = '', $func = '', $line = '', $info = array(), $display_request = false, $debug_index = '', $debug_key = 'EE_DEBUG_SPCO') { |
|
420 | + if (WP_DEBUG && false) { |
|
421 | + $debug_key = $debug_key.'_'.EE_Session::instance()->id(); |
|
422 | + $debug_data = get_option($debug_key, array()); |
|
423 | 423 | $default_data = array( |
424 | - $class => $func . '() : ' . $line, |
|
424 | + $class => $func.'() : '.$line, |
|
425 | 425 | 'REQ' => $display_request ? $_REQUEST : '', |
426 | 426 | ); |
427 | 427 | // don't serialize objects |
428 | - $info = self::strip_objects( $info ); |
|
429 | - $index = ! empty( $debug_index ) ? $debug_index : 0; |
|
430 | - if ( ! isset( $debug_data[$index] ) ) { |
|
428 | + $info = self::strip_objects($info); |
|
429 | + $index = ! empty($debug_index) ? $debug_index : 0; |
|
430 | + if ( ! isset($debug_data[$index])) { |
|
431 | 431 | $debug_data[$index] = array(); |
432 | 432 | } |
433 | - $debug_data[$index][microtime()] = array_merge( $default_data, $info ); |
|
434 | - update_option( $debug_key, $debug_data ); |
|
433 | + $debug_data[$index][microtime()] = array_merge($default_data, $info); |
|
434 | + update_option($debug_key, $debug_data); |
|
435 | 435 | } |
436 | 436 | } |
437 | 437 | |
@@ -443,26 +443,26 @@ discard block |
||
443 | 443 | * @param array $info |
444 | 444 | * @return array |
445 | 445 | */ |
446 | - public static function strip_objects( $info = array() ) { |
|
447 | - foreach ( $info as $key => $value ) { |
|
448 | - if ( is_array( $value ) ) { |
|
449 | - $info[ $key ] = self::strip_objects( $value ); |
|
450 | - } else if ( is_object( $value ) ) { |
|
451 | - $object_class = get_class( $value ); |
|
452 | - $info[ $object_class ] = array(); |
|
453 | - $info[ $object_class ][ 'ID' ] = method_exists( $value, 'ID' ) ? $value->ID() : spl_object_hash( $value ); |
|
454 | - if ( method_exists( $value, 'ID' ) ) { |
|
455 | - $info[ $object_class ][ 'ID' ] = $value->ID(); |
|
446 | + public static function strip_objects($info = array()) { |
|
447 | + foreach ($info as $key => $value) { |
|
448 | + if (is_array($value)) { |
|
449 | + $info[$key] = self::strip_objects($value); |
|
450 | + } else if (is_object($value)) { |
|
451 | + $object_class = get_class($value); |
|
452 | + $info[$object_class] = array(); |
|
453 | + $info[$object_class]['ID'] = method_exists($value, 'ID') ? $value->ID() : spl_object_hash($value); |
|
454 | + if (method_exists($value, 'ID')) { |
|
455 | + $info[$object_class]['ID'] = $value->ID(); |
|
456 | 456 | } |
457 | - if ( method_exists( $value, 'status' ) ) { |
|
458 | - $info[ $object_class ][ 'status' ] = $value->status(); |
|
459 | - } else if ( method_exists( $value, 'status_ID' ) ) { |
|
460 | - $info[ $object_class ][ 'status' ] = $value->status_ID(); |
|
457 | + if (method_exists($value, 'status')) { |
|
458 | + $info[$object_class]['status'] = $value->status(); |
|
459 | + } else if (method_exists($value, 'status_ID')) { |
|
460 | + $info[$object_class]['status'] = $value->status_ID(); |
|
461 | 461 | } |
462 | - unset( $info[ $key ] ); |
|
462 | + unset($info[$key]); |
|
463 | 463 | } |
464 | 464 | } |
465 | - return (array)$info; |
|
465 | + return (array) $info; |
|
466 | 466 | } |
467 | 467 | |
468 | 468 | |
@@ -475,20 +475,20 @@ discard block |
||
475 | 475 | * @param int $heading_tag |
476 | 476 | * @param bool $die |
477 | 477 | */ |
478 | - public static function printv( $var, $var_name = '', $file = __FILE__, $line = __LINE__, $heading_tag = 5, $die = false, $margin ) { |
|
478 | + public static function printv($var, $var_name = '', $file = __FILE__, $line = __LINE__, $heading_tag = 5, $die = false, $margin) { |
|
479 | 479 | $var_name = ! $var_name ? 'string' : $var_name; |
480 | - $var_name = ucwords( str_replace( '$', '', $var_name ) ); |
|
481 | - $is_method = method_exists( $var_name, $var ); |
|
482 | - $var_name = ucwords( str_replace( '_', ' ', $var_name ) ); |
|
480 | + $var_name = ucwords(str_replace('$', '', $var_name)); |
|
481 | + $is_method = method_exists($var_name, $var); |
|
482 | + $var_name = ucwords(str_replace('_', ' ', $var_name)); |
|
483 | 483 | $heading_tag = is_int($heading_tag) ? "h{$heading_tag}" : "h5"; |
484 | 484 | $result = EEH_Debug_Tools::heading($var_name, $heading_tag, $margin); |
485 | 485 | $result .= $is_method |
486 | - ? \EEH_Debug_Tools::grey_span('::') . \EEH_Debug_Tools::orange_span($var . "()") |
|
487 | - : \EEH_Debug_Tools::grey_span(' : ') . \EEH_Debug_Tools::orange_span($var); |
|
486 | + ? \EEH_Debug_Tools::grey_span('::').\EEH_Debug_Tools::orange_span($var."()") |
|
487 | + : \EEH_Debug_Tools::grey_span(' : ').\EEH_Debug_Tools::orange_span($var); |
|
488 | 488 | $result .= \EEH_Debug_Tools::file_and_line($file, $line); |
489 | 489 | $result .= \EEH_Debug_Tools::headingx($heading_tag); |
490 | - if ( $die ) { |
|
491 | - die( $result ); |
|
490 | + if ($die) { |
|
491 | + die($result); |
|
492 | 492 | } else { |
493 | 493 | echo $result; |
494 | 494 | } |
@@ -502,7 +502,7 @@ discard block |
||
502 | 502 | * @param string $margin |
503 | 503 | * @return string |
504 | 504 | */ |
505 | - protected static function heading( $var_name = '', $heading_tag = 'h5', $margin = '' ) { |
|
505 | + protected static function heading($var_name = '', $heading_tag = 'h5', $margin = '') { |
|
506 | 506 | if (defined('EE_TESTS_DIR')) { |
507 | 507 | return "\n\n{$var_name}"; |
508 | 508 | } |
@@ -515,11 +515,11 @@ discard block |
||
515 | 515 | * @param string $heading_tag |
516 | 516 | * @return string |
517 | 517 | */ |
518 | - protected static function headingx( $heading_tag = 'h5' ) { |
|
518 | + protected static function headingx($heading_tag = 'h5') { |
|
519 | 519 | if (defined('EE_TESTS_DIR')) { |
520 | 520 | return "\n"; |
521 | 521 | } |
522 | - return '</' . $heading_tag . '>'; |
|
522 | + return '</'.$heading_tag.'>'; |
|
523 | 523 | } |
524 | 524 | |
525 | 525 | |
@@ -528,11 +528,11 @@ discard block |
||
528 | 528 | * @param string $content |
529 | 529 | * @return string |
530 | 530 | */ |
531 | - protected static function grey_span( $content = '' ) { |
|
531 | + protected static function grey_span($content = '') { |
|
532 | 532 | if (defined('EE_TESTS_DIR')) { |
533 | 533 | return $content; |
534 | 534 | } |
535 | - return '<span style="color:#999">' . $content . '</span>'; |
|
535 | + return '<span style="color:#999">'.$content.'</span>'; |
|
536 | 536 | } |
537 | 537 | |
538 | 538 | |
@@ -544,9 +544,9 @@ discard block |
||
544 | 544 | */ |
545 | 545 | protected static function file_and_line($file, $line) { |
546 | 546 | if (defined('EE_TESTS_DIR')) { |
547 | - return "\n (" . $file . ' line no: ' . $line . ' ) '; |
|
547 | + return "\n (".$file.' line no: '.$line.' ) '; |
|
548 | 548 | } |
549 | - return '<br /><span style="font-size:9px;font-weight:normal;color:#666;line-height: 12px;">' . $file . '<br />line no: ' . $line . '</span>'; |
|
549 | + return '<br /><span style="font-size:9px;font-weight:normal;color:#666;line-height: 12px;">'.$file.'<br />line no: '.$line.'</span>'; |
|
550 | 550 | } |
551 | 551 | |
552 | 552 | |
@@ -560,7 +560,7 @@ discard block |
||
560 | 560 | if (defined('EE_TESTS_DIR')) { |
561 | 561 | return $content; |
562 | 562 | } |
563 | - return '<span style="color:#E76700">' . $content . '</span>'; |
|
563 | + return '<span style="color:#E76700">'.$content.'</span>'; |
|
564 | 564 | } |
565 | 565 | |
566 | 566 | |
@@ -575,9 +575,9 @@ discard block |
||
575 | 575 | var_dump($var); |
576 | 576 | $var = ob_get_clean(); |
577 | 577 | if (defined('EE_TESTS_DIR')) { |
578 | - return "\n" . $var; |
|
578 | + return "\n".$var; |
|
579 | 579 | } |
580 | - return '<pre style="color:#999; padding:1em; background: #fff">' . $var . '</pre>'; |
|
580 | + return '<pre style="color:#999; padding:1em; background: #fff">'.$var.'</pre>'; |
|
581 | 581 | } |
582 | 582 | |
583 | 583 | |
@@ -590,35 +590,35 @@ discard block |
||
590 | 590 | * @param int $heading_tag |
591 | 591 | * @param bool $die |
592 | 592 | */ |
593 | - public static function printr( $var, $var_name = '', $file = __FILE__, $line = __LINE__, $heading_tag = 5, $die = false ) { |
|
593 | + public static function printr($var, $var_name = '', $file = __FILE__, $line = __LINE__, $heading_tag = 5, $die = false) { |
|
594 | 594 | // return; |
595 | - $file = str_replace( rtrim( ABSPATH, '\\/' ), '', $file ); |
|
595 | + $file = str_replace(rtrim(ABSPATH, '\\/'), '', $file); |
|
596 | 596 | $margin = is_admin() ? ' 180px' : '0'; |
597 | 597 | //$print_r = false; |
598 | - if ( is_string( $var ) ) { |
|
599 | - EEH_Debug_Tools::printv( $var, $var_name, $file, $line, $heading_tag, $die, $margin ); |
|
598 | + if (is_string($var)) { |
|
599 | + EEH_Debug_Tools::printv($var, $var_name, $file, $line, $heading_tag, $die, $margin); |
|
600 | 600 | return; |
601 | - } else if ( is_object( $var ) ) { |
|
601 | + } else if (is_object($var)) { |
|
602 | 602 | $var_name = ! $var_name ? 'object' : $var_name; |
603 | 603 | //$print_r = true; |
604 | - } else if ( is_array( $var ) ) { |
|
604 | + } else if (is_array($var)) { |
|
605 | 605 | $var_name = ! $var_name ? 'array' : $var_name; |
606 | 606 | //$print_r = true; |
607 | - } else if ( is_numeric( $var ) ) { |
|
607 | + } else if (is_numeric($var)) { |
|
608 | 608 | $var_name = ! $var_name ? 'numeric' : $var_name; |
609 | - } else if ( is_null( $var ) ) { |
|
609 | + } else if (is_null($var)) { |
|
610 | 610 | $var_name = ! $var_name ? 'null' : $var_name; |
611 | 611 | } |
612 | - $var_name = ucwords( str_replace( array( '$', '_' ), array( '', ' ' ), $var_name ) ); |
|
612 | + $var_name = ucwords(str_replace(array('$', '_'), array('', ' '), $var_name)); |
|
613 | 613 | $heading_tag = is_int($heading_tag) ? "h{$heading_tag}" : "h5"; |
614 | 614 | $result = EEH_Debug_Tools::heading($var_name, $heading_tag, $margin); |
615 | - $result .= \EEH_Debug_Tools::grey_span(' : ') . \EEH_Debug_Tools::orange_span( |
|
615 | + $result .= \EEH_Debug_Tools::grey_span(' : ').\EEH_Debug_Tools::orange_span( |
|
616 | 616 | \EEH_Debug_Tools::pre_span($var) |
617 | 617 | ); |
618 | 618 | $result .= \EEH_Debug_Tools::file_and_line($file, $line); |
619 | 619 | $result .= \EEH_Debug_Tools::headingx($heading_tag); |
620 | - if ( $die ) { |
|
621 | - die( $result ); |
|
620 | + if ($die) { |
|
621 | + die($result); |
|
622 | 622 | } else { |
623 | 623 | echo $result; |
624 | 624 | } |
@@ -635,8 +635,8 @@ discard block |
||
635 | 635 | * borrowed from Kint Debugger |
636 | 636 | * Plugin URI: http://upthemes.com/plugins/kint-debugger/ |
637 | 637 | */ |
638 | -if ( class_exists('Kint') && ! function_exists( 'dump_wp_query' ) ) { |
|
639 | - function dump_wp_query(){ |
|
638 | +if (class_exists('Kint') && ! function_exists('dump_wp_query')) { |
|
639 | + function dump_wp_query() { |
|
640 | 640 | global $wp_query; |
641 | 641 | d($wp_query); |
642 | 642 | } |
@@ -646,8 +646,8 @@ discard block |
||
646 | 646 | * borrowed from Kint Debugger |
647 | 647 | * Plugin URI: http://upthemes.com/plugins/kint-debugger/ |
648 | 648 | */ |
649 | -if ( class_exists('Kint') && ! function_exists( 'dump_wp' ) ) { |
|
650 | - function dump_wp(){ |
|
649 | +if (class_exists('Kint') && ! function_exists('dump_wp')) { |
|
650 | + function dump_wp() { |
|
651 | 651 | global $wp; |
652 | 652 | d($wp); |
653 | 653 | } |
@@ -657,8 +657,8 @@ discard block |
||
657 | 657 | * borrowed from Kint Debugger |
658 | 658 | * Plugin URI: http://upthemes.com/plugins/kint-debugger/ |
659 | 659 | */ |
660 | -if ( class_exists('Kint') && ! function_exists( 'dump_post' ) ) { |
|
661 | - function dump_post(){ |
|
660 | +if (class_exists('Kint') && ! function_exists('dump_post')) { |
|
661 | + function dump_post() { |
|
662 | 662 | global $post; |
663 | 663 | d($post); |
664 | 664 | } |
@@ -134,8 +134,7 @@ discard block |
||
134 | 134 | return; |
135 | 135 | } |
136 | 136 | echo '<h5>For Tag: '. $tag .'</h5>'; |
137 | - } |
|
138 | - else { |
|
137 | + } else { |
|
139 | 138 | $hook=$wp_filter; |
140 | 139 | ksort( $hook ); |
141 | 140 | } |
@@ -204,7 +203,7 @@ discard block |
||
204 | 203 | if( isset( $this->_start_times[ $timer_name ] ) ){ |
205 | 204 | $start_time = $this->_start_times[ $timer_name ]; |
206 | 205 | unset( $this->_start_times[ $timer_name ] ); |
207 | - }else{ |
|
206 | + } else{ |
|
208 | 207 | $start_time = array_pop( $this->_start_times ); |
209 | 208 | } |
210 | 209 | $this->_times[ $timer_name ] = number_format( microtime( true ) - $start_time, 8 ); |
@@ -33,7 +33,7 @@ discard block |
||
33 | 33 | * OpenCoffeeShop constructor. |
34 | 34 | */ |
35 | 35 | public function __construct() |
36 | - { |
|
36 | + { |
|
37 | 37 | // instantiate the container |
38 | 38 | $this->CoffeeShop = new CoffeeShop(); |
39 | 39 | // create a dependency injector class for resolving class constructor arguments |
@@ -83,11 +83,11 @@ discard block |
||
83 | 83 | new Recipe( |
84 | 84 | 'CommandHandlerManager', |
85 | 85 | 'EventEspresso\core\services\commands\CommandHandlerManager', |
86 | - array( |
|
87 | - 'CommandHandlerManagerInterface', |
|
88 | - 'EventEspresso\core\services\commands\CommandHandlerManagerInterface', |
|
89 | - ), |
|
90 | - array(), |
|
86 | + array( |
|
87 | + 'CommandHandlerManagerInterface', |
|
88 | + 'EventEspresso\core\services\commands\CommandHandlerManagerInterface', |
|
89 | + ), |
|
90 | + array(), |
|
91 | 91 | CoffeeMaker::BREW_SHARED |
92 | 92 | ) |
93 | 93 | ); |
@@ -96,11 +96,11 @@ discard block |
||
96 | 96 | new Recipe( |
97 | 97 | 'CommandBus', |
98 | 98 | 'EventEspresso\core\services\commands\CommandBus', |
99 | - array( |
|
100 | - 'CommandBusInterface', |
|
101 | - 'EventEspresso\core\services\commands\CommandBusInterface', |
|
102 | - ), |
|
103 | - array(), |
|
99 | + array( |
|
100 | + 'CommandBusInterface', |
|
101 | + 'EventEspresso\core\services\commands\CommandBusInterface', |
|
102 | + ), |
|
103 | + array(), |
|
104 | 104 | CoffeeMaker::BREW_SHARED |
105 | 105 | ) |
106 | 106 | ); |
@@ -110,22 +110,22 @@ discard block |
||
110 | 110 | new Recipe( |
111 | 111 | 'EEI_*', |
112 | 112 | '', |
113 | - array(), |
|
114 | - array(), |
|
113 | + array(), |
|
114 | + array(), |
|
115 | 115 | CoffeeMaker::BREW_LOAD_ONLY, |
116 | - array( |
|
117 | - EE_INTERFACES . '*.php', |
|
118 | - EE_INTERFACES . '*.interfaces.php', |
|
119 | - ) |
|
116 | + array( |
|
117 | + EE_INTERFACES . '*.php', |
|
118 | + EE_INTERFACES . '*.interfaces.php', |
|
119 | + ) |
|
120 | 120 | ) |
121 | 121 | ); |
122 | 122 | // add a wildcard recipe for loading models |
123 | 123 | $this->CoffeeShop->addRecipe( |
124 | 124 | new Recipe( |
125 | 125 | 'EEM_*', |
126 | - '', |
|
127 | - array(), |
|
128 | - array(), |
|
126 | + '', |
|
127 | + array(), |
|
128 | + array(), |
|
129 | 129 | CoffeeMaker::BREW_SHARED, |
130 | 130 | EE_MODELS . '*.model.php' |
131 | 131 | ) |
@@ -134,10 +134,10 @@ discard block |
||
134 | 134 | $this->CoffeeShop->addRecipe( |
135 | 135 | new Recipe( |
136 | 136 | 'EE_*', |
137 | - '', |
|
138 | - array(), |
|
139 | - array(), |
|
140 | - CoffeeMaker::BREW_SHARED, |
|
137 | + '', |
|
138 | + array(), |
|
139 | + array(), |
|
140 | + CoffeeMaker::BREW_SHARED, |
|
141 | 141 | array( |
142 | 142 | EE_CORE . '*.core.php', |
143 | 143 | EE_ADMIN . '*.core.php', |
@@ -152,10 +152,10 @@ discard block |
||
152 | 152 | $this->CoffeeShop->addRecipe( |
153 | 153 | new Recipe( |
154 | 154 | 'EE_Admin_Page*', |
155 | - '', |
|
156 | - array(), |
|
157 | - array(), |
|
158 | - CoffeeMaker::BREW_LOAD_ONLY, |
|
155 | + '', |
|
156 | + array(), |
|
157 | + array(), |
|
158 | + CoffeeMaker::BREW_LOAD_ONLY, |
|
159 | 159 | array( EE_ADMIN . '*.core.php' ) |
160 | 160 | ) |
161 | 161 | ); |
@@ -163,10 +163,10 @@ discard block |
||
163 | 163 | // $this->CoffeeShop->addRecipe( |
164 | 164 | // new Recipe( |
165 | 165 | // '*_Admin_Page', |
166 | - // '', |
|
167 | - // array(), |
|
168 | - // array(), |
|
169 | - // CoffeeMaker::BREW_SHARED, |
|
166 | + // '', |
|
167 | + // array(), |
|
168 | + // array(), |
|
169 | + // CoffeeMaker::BREW_SHARED, |
|
170 | 170 | // array( |
171 | 171 | // EE_ADMIN_PAGES . 'transactions' . DS . '*.core.php', |
172 | 172 | // ) |
@@ -1,8 +1,8 @@ discard block |
||
1 | 1 | <?php |
2 | 2 | namespace EventEspresso\core\services\container; |
3 | 3 | |
4 | -if ( ! defined( 'EVENT_ESPRESSO_VERSION' ) ) { |
|
5 | - exit( 'No direct script access allowed' ); |
|
4 | +if ( ! defined('EVENT_ESPRESSO_VERSION')) { |
|
5 | + exit('No direct script access allowed'); |
|
6 | 6 | } |
7 | 7 | |
8 | 8 | |
@@ -43,17 +43,17 @@ discard block |
||
43 | 43 | ); |
44 | 44 | // and some coffeemakers, one for creating new instances |
45 | 45 | $this->CoffeeShop->addCoffeeMaker( |
46 | - new NewCoffeeMaker( $this->CoffeeShop, $this->DependencyInjector ), |
|
46 | + new NewCoffeeMaker($this->CoffeeShop, $this->DependencyInjector), |
|
47 | 47 | CoffeeMaker::BREW_NEW |
48 | 48 | ); |
49 | 49 | // one for shared services |
50 | 50 | $this->CoffeeShop->addCoffeeMaker( |
51 | - new SharedCoffeeMaker( $this->CoffeeShop, $this->DependencyInjector ), |
|
51 | + new SharedCoffeeMaker($this->CoffeeShop, $this->DependencyInjector), |
|
52 | 52 | CoffeeMaker::BREW_SHARED |
53 | 53 | ); |
54 | 54 | // and one for classes that only get loaded |
55 | 55 | $this->CoffeeShop->addCoffeeMaker( |
56 | - new LoadOnlyCoffeeMaker( $this->CoffeeShop, $this->DependencyInjector ), |
|
56 | + new LoadOnlyCoffeeMaker($this->CoffeeShop, $this->DependencyInjector), |
|
57 | 57 | CoffeeMaker::BREW_LOAD_ONLY |
58 | 58 | ); |
59 | 59 | // add default recipe, which should handle loading for most PSR-4 compatible classes |
@@ -114,8 +114,8 @@ discard block |
||
114 | 114 | array(), |
115 | 115 | CoffeeMaker::BREW_LOAD_ONLY, |
116 | 116 | array( |
117 | - EE_INTERFACES . '*.php', |
|
118 | - EE_INTERFACES . '*.interfaces.php', |
|
117 | + EE_INTERFACES.'*.php', |
|
118 | + EE_INTERFACES.'*.interfaces.php', |
|
119 | 119 | ) |
120 | 120 | ) |
121 | 121 | ); |
@@ -127,7 +127,7 @@ discard block |
||
127 | 127 | array(), |
128 | 128 | array(), |
129 | 129 | CoffeeMaker::BREW_SHARED, |
130 | - EE_MODELS . '*.model.php' |
|
130 | + EE_MODELS.'*.model.php' |
|
131 | 131 | ) |
132 | 132 | ); |
133 | 133 | // add a wildcard recipe for loading core classes |
@@ -139,12 +139,12 @@ discard block |
||
139 | 139 | array(), |
140 | 140 | CoffeeMaker::BREW_SHARED, |
141 | 141 | array( |
142 | - EE_CORE . '*.core.php', |
|
143 | - EE_ADMIN . '*.core.php', |
|
144 | - EE_CPTS . '*.core.php', |
|
145 | - EE_CORE . 'data_migration_scripts' . DS . '*.core.php', |
|
146 | - EE_CORE . 'request_stack' . DS . '*.core.php', |
|
147 | - EE_CORE . 'middleware' . DS . '*.core.php', |
|
142 | + EE_CORE.'*.core.php', |
|
143 | + EE_ADMIN.'*.core.php', |
|
144 | + EE_CPTS.'*.core.php', |
|
145 | + EE_CORE.'data_migration_scripts'.DS.'*.core.php', |
|
146 | + EE_CORE.'request_stack'.DS.'*.core.php', |
|
147 | + EE_CORE.'middleware'.DS.'*.core.php', |
|
148 | 148 | ) |
149 | 149 | ) |
150 | 150 | ); |
@@ -156,7 +156,7 @@ discard block |
||
156 | 156 | array(), |
157 | 157 | array(), |
158 | 158 | CoffeeMaker::BREW_LOAD_ONLY, |
159 | - array( EE_ADMIN . '*.core.php' ) |
|
159 | + array(EE_ADMIN.'*.core.php') |
|
160 | 160 | ) |
161 | 161 | ); |
162 | 162 | // add a wildcard recipe for loading core classes |