Completed
Branch BUG-10324-unit-tests-php7.1 (acc21a)
by
unknown
139:31 queued 129:15
created
core/request_stack/EE_Response.core.php 2 patches
Spacing   +9 added lines, -9 removed lines patch added patch discarded remove patch
@@ -40,7 +40,7 @@  discard block
 block discarded – undo
40 40
 	 * @return \EE_Response
41 41
 	 */
42 42
 	public function __construct() {
43
-		$this->terminate_request( false );
43
+		$this->terminate_request(false);
44 44
 	}
45 45
 
46 46
 
@@ -53,8 +53,8 @@  discard block
 block discarded – undo
53 53
 	 * @param $value
54 54
 	 * @return    void
55 55
 	 */
56
-	public function set_notice( $key, $value ) {
57
-		$this->_notice[ $key ] = $value;
56
+	public function set_notice($key, $value) {
57
+		$this->_notice[$key] = $value;
58 58
 	}
59 59
 
60 60
 
@@ -66,8 +66,8 @@  discard block
 block discarded – undo
66 66
 	 * @param $key
67 67
 	 * @return    mixed
68 68
 	 */
69
-	public function get_notice( $key ) {
70
-		return isset( $this->_notice[ $key ] ) ? $this->_notice[ $key ] : NULL;
69
+	public function get_notice($key) {
70
+		return isset($this->_notice[$key]) ? $this->_notice[$key] : NULL;
71 71
 	}
72 72
 
73 73
 
@@ -91,8 +91,8 @@  discard block
 block discarded – undo
91 91
 	 * @param $string
92 92
 	 * @param bool $append
93 93
 	 */
94
-	public function add_output( $string, $append = true ) {
95
-		$this->_output = $append ? $this->_output . $string : $string . $this->_output;
94
+	public function add_output($string, $append = true) {
95
+		$this->_output = $append ? $this->_output.$string : $string.$this->_output;
96 96
 	}
97 97
 
98 98
 
@@ -121,8 +121,8 @@  discard block
 block discarded – undo
121 121
 	/**
122 122
 	 * @param boolean $request_terminated
123 123
 	 */
124
-	public function terminate_request( $request_terminated = true ) {
125
-		$this->request_terminated = filter_var( $request_terminated, FILTER_VALIDATE_BOOLEAN );
124
+	public function terminate_request($request_terminated = true) {
125
+		$this->request_terminated = filter_var($request_terminated, FILTER_VALIDATE_BOOLEAN);
126 126
 	}
127 127
 
128 128
 
Please login to merge, or discard this patch.
Braces   +3 added lines, -1 removed lines patch added patch discarded remove patch
@@ -1,4 +1,6 @@
 block discarded – undo
1
-<?php if ( ! defined('EVENT_ESPRESSO_VERSION')) exit('No direct script access allowed');
1
+<?php if ( ! defined('EVENT_ESPRESSO_VERSION')) {
2
+	exit('No direct script access allowed');
3
+}
2 4
 /**
3 5
  * Event Espresso
4 6
  *
Please login to merge, or discard this patch.
reg_steps/payment_options/events_requiring_pre_approval.template.php 1 patch
Spacing   +1 added lines, -1 removed lines patch added patch discarded remove patch
@@ -3,7 +3,7 @@
 block discarded – undo
3 3
 /** @type string $events_requiring_pre_approval_msg */
4 4
 ?>
5 5
 
6
-<h4><span class="orange-text"><?php _e('Important Notice: Events Requiring Pre-Approval', 'event_espresso');?></span></h4>
6
+<h4><span class="orange-text"><?php _e('Important Notice: Events Requiring Pre-Approval', 'event_espresso'); ?></span></h4>
7 7
 	<p id="events-requiring-pre-approval-pg" class="small-text drk-grey-text">
8 8
 		<?php echo $events_requiring_pre_approval_msg; ?>
9 9
 	</p>
Please login to merge, or discard this patch.
single_page_checkout/reg_steps/payment_options/sold_out_events.template.php 1 patch
Spacing   +2 added lines, -2 removed lines patch added patch discarded remove patch
@@ -3,9 +3,9 @@
 block discarded – undo
3 3
 /** @type string $sold_out_events_msg */
4 4
 ?>
5 5
 
6
-<h4 class="ee-status sold-out"><b><?php _e('Sold Out', 'event_espresso');?></b></h4>
6
+<h4 class="ee-status sold-out"><b><?php _e('Sold Out', 'event_espresso'); ?></b></h4>
7 7
 	<ul id="spco-sold-out-events-ul"><?php echo $sold_out_events; ?></ul>
8
-	<h6 class="pink-text"><?php _e("We're Sorry", 'event_espresso');?></h6>
8
+	<h6 class="pink-text"><?php _e("We're Sorry", 'event_espresso'); ?></h6>
9 9
 	<p id="events-requiring-pre-approval-pg" class="small-text drk-grey-text">
10 10
 		<?php echo $sold_out_events_msg; ?>
11 11
 	</p>
Please login to merge, or discard this patch.
reg_steps/payment_options/sold_out_tickets.template.php 1 patch
Spacing   +2 added lines, -2 removed lines patch added patch discarded remove patch
@@ -3,8 +3,8 @@
 block discarded – undo
3 3
 /** @type string $sold_out_tickets_msg */
4 4
 ?>
5 5
 
6
-	<h4 ><b><?php _e('Sold Out', 'event_espresso');?></b></h4>
7
-	<h6 class="pink-text"><?php _e("We're Sorry", 'event_espresso');?></h6>
6
+	<h4 ><b><?php _e('Sold Out', 'event_espresso'); ?></b></h4>
7
+	<h6 class="pink-text"><?php _e("We're Sorry", 'event_espresso'); ?></h6>
8 8
 	<p id="tickets-requiring-pre-approval-pg" class="small-text drk-grey-text">
9 9
 		<?php echo $sold_out_tickets_msg; ?>
10 10
 	</p>
Please login to merge, or discard this patch.
modules/ticket_selector/templates/ticket_selector_chart_iframe.template.php 2 patches
Spacing   +3 added lines, -3 removed lines patch added patch discarded remove patch
@@ -19,13 +19,13 @@
 block discarded – undo
19 19
 <html>
20 20
 <head>
21 21
 	<title><?php _e('Ticket Selector', 'event_espresso'); ?></title>
22
-	<?php foreach ( $css as $url ) : ?>
23
-		<link rel="stylesheet" type="text/css" href="<?php echo $url;?>">
22
+	<?php foreach ($css as $url) : ?>
23
+		<link rel="stylesheet" type="text/css" href="<?php echo $url; ?>">
24 24
 	<?php endforeach; ?>
25 25
 	<script type="text/javascript">
26 26
 		<?php echo  $eei18n; ?>
27 27
 	</script>
28
-	<?php foreach ( $js as $jsurl ) : ?>
28
+	<?php foreach ($js as $jsurl) : ?>
29 29
 		<script type="text/javascript" src="<?php echo $jsurl; ?>"></script>
30 30
 	<?php endforeach; ?>
31 31
 </head>
Please login to merge, or discard this patch.
Indentation   -3 removed lines patch added patch discarded remove patch
@@ -25,9 +25,6 @@
 block discarded – undo
25 25
 				
26 26
 			)
27 27
 		);
28
-
29
-
30
-
31 28
  * 
32 29
  */
33 30
 class EE_DMS_4_1_0_event_venue extends EE_Data_Migration_Script_Stage{
Please login to merge, or discard this patch.
public/Espresso_Arabica_2014/content-espresso_events-shortcode.php 1 patch
Spacing   +16 added lines, -16 removed lines patch added patch discarded remove patch
@@ -21,22 +21,22 @@  discard block
 block discarded – undo
21 21
  * and/or use any of the template tags functions found in:
22 22
  * \wp-content\plugins\event-espresso-core\public\template_tags.php
23 23
  ************************** IMPORTANT **************************/
24
-add_filter( 'FHEE__content_espresso_events__template_loaded', '__return_false' );
24
+add_filter('FHEE__content_espresso_events__template_loaded', '__return_false');
25 25
 
26 26
 //echo '<br/><h6 style="color:#2EA2CC;">'. __FILE__ . ' &nbsp; <span style="font-weight:normal;color:#E76700"> Line #: ' . __LINE__ . '</span></h6>';
27 27
 
28 28
 global $post;
29
-$event_class = has_excerpt( $post->ID ) ? ' has-excerpt' : '';
30
-$event_class = apply_filters( 'FHEE__content_espresso_events__event_class', $event_class );
29
+$event_class = has_excerpt($post->ID) ? ' has-excerpt' : '';
30
+$event_class = apply_filters('FHEE__content_espresso_events__event_class', $event_class);
31 31
 ?>
32
-<?php do_action( 'AHEE_event_details_before_post', $post ); ?>
33
-<article id="post-<?php the_ID(); ?>" <?php post_class( $event_class ); ?>>
32
+<?php do_action('AHEE_event_details_before_post', $post); ?>
33
+<article id="post-<?php the_ID(); ?>" <?php post_class($event_class); ?>>
34 34
 
35
-<?php if ( is_single() ) : ?>
35
+<?php if (is_single()) : ?>
36 36
 
37
-	<div id="espresso-event-header-dv-<?php echo $post->ID;?>" class="espresso-event-header-dv">
38
-		<?php espresso_get_template_part( 'content', 'espresso_events-thumbnail' ); ?>
39
-		<?php espresso_get_template_part( 'content', 'espresso_events-header' ); ?>
37
+	<div id="espresso-event-header-dv-<?php echo $post->ID; ?>" class="espresso-event-header-dv">
38
+		<?php espresso_get_template_part('content', 'espresso_events-thumbnail'); ?>
39
+		<?php espresso_get_template_part('content', 'espresso_events-header'); ?>
40 40
 	</div>
41 41
 
42 42
 	<div class="espresso-event-wrapper-dv">
@@ -46,16 +46,16 @@  discard block
 block discarded – undo
46 46
 		<?php //espresso_get_template_part( 'content', 'espresso_events-details' ); ?>
47 47
 		<?php //espresso_get_template_part( 'content', 'espresso_events-venues' ); ?>
48 48
 		<footer class="event-meta">
49
-			<?php do_action( 'AHEE_event_details_footer_top', $post ); ?>
50
-			<?php do_action( 'AHEE_event_details_footer_bottom', $post ); ?>
49
+			<?php do_action('AHEE_event_details_footer_top', $post); ?>
50
+			<?php do_action('AHEE_event_details_footer_bottom', $post); ?>
51 51
 		</footer>
52 52
 	</div>
53 53
 
54
-<?php elseif ( is_archive() ) : ?>
54
+<?php elseif (is_archive()) : ?>
55 55
 
56
-	<div id="espresso-event-list-header-dv-<?php echo $post->ID;?>" class="espresso-event-header-dv">
57
-		<?php espresso_get_template_part( 'content', 'espresso_events-thumbnail' ); ?>
58
-		<?php espresso_get_template_part( 'content', 'espresso_events-header' ); ?>
56
+	<div id="espresso-event-list-header-dv-<?php echo $post->ID; ?>" class="espresso-event-header-dv">
57
+		<?php espresso_get_template_part('content', 'espresso_events-thumbnail'); ?>
58
+		<?php espresso_get_template_part('content', 'espresso_events-header'); ?>
59 59
 	</div>
60 60
 
61 61
 	<div class="espresso-event-list-wrapper-dv">
@@ -70,5 +70,5 @@  discard block
 block discarded – undo
70 70
 
71 71
 </article>
72 72
 <!-- #post -->
73
-<?php do_action( 'AHEE_event_details_after_post', $post );
73
+<?php do_action('AHEE_event_details_after_post', $post);
74 74
 
Please login to merge, or discard this patch.
public/Espresso_Arabica_2014/content-espresso_events.php 1 patch
Spacing   +24 added lines, -24 removed lines patch added patch discarded remove patch
@@ -18,52 +18,52 @@
 block discarded – undo
18 18
  * and/or use any of the template tags functions found in:
19 19
  * \wp-content\plugins\event-espresso-core\public\template_tags.php
20 20
  ************************** IMPORTANT **************************/
21
-add_filter( 'FHEE__content_espresso_events__template_loaded', '__return_true' );
21
+add_filter('FHEE__content_espresso_events__template_loaded', '__return_true');
22 22
 
23 23
 //echo '<br/><h6 style="color:#2EA2CC;">'. __FILE__ . ' &nbsp; <span style="font-weight:normal;color:#E76700"> Line #: ' . __LINE__ . '</span></h6>';
24 24
 
25 25
 global $post;
26
-$event_class = has_excerpt( $post->ID ) ? ' has-excerpt' : '';
27
-$event_class = apply_filters( 'FHEE__content_espresso_events__event_class', $event_class );
26
+$event_class = has_excerpt($post->ID) ? ' has-excerpt' : '';
27
+$event_class = apply_filters('FHEE__content_espresso_events__event_class', $event_class);
28 28
 ?>
29
-<?php do_action( 'AHEE_event_details_before_post', $post ); ?>
30
-<article id="post-<?php the_ID(); ?>" <?php post_class( $event_class ); ?>>
29
+<?php do_action('AHEE_event_details_before_post', $post); ?>
30
+<article id="post-<?php the_ID(); ?>" <?php post_class($event_class); ?>>
31 31
 
32
-<?php if ( is_single() ) : ?>
32
+<?php if (is_single()) : ?>
33 33
 
34
-	<div id="espresso-event-header-dv-<?php echo $post->ID;?>" class="espresso-event-header-dv">
35
-		<?php espresso_get_template_part( 'content', 'espresso_events-thumbnail' ); ?>
36
-		<?php espresso_get_template_part( 'content', 'espresso_events-header' ); ?>
34
+	<div id="espresso-event-header-dv-<?php echo $post->ID; ?>" class="espresso-event-header-dv">
35
+		<?php espresso_get_template_part('content', 'espresso_events-thumbnail'); ?>
36
+		<?php espresso_get_template_part('content', 'espresso_events-header'); ?>
37 37
 	</div>
38 38
 
39 39
 	<div class="espresso-event-wrapper-dv">
40
-		<?php espresso_get_template_part( 'content', 'espresso_events-tickets' ); ?>
41
-		<?php espresso_get_template_part( 'content', 'espresso_events-datetimes' ); ?>
42
-		<?php espresso_get_template_part( 'content', 'espresso_events-details' ); ?>
43
-		<?php espresso_get_template_part( 'content', 'espresso_events-venues' ); ?>
40
+		<?php espresso_get_template_part('content', 'espresso_events-tickets'); ?>
41
+		<?php espresso_get_template_part('content', 'espresso_events-datetimes'); ?>
42
+		<?php espresso_get_template_part('content', 'espresso_events-details'); ?>
43
+		<?php espresso_get_template_part('content', 'espresso_events-venues'); ?>
44 44
 		<footer class="event-meta">
45
-			<?php do_action( 'AHEE_event_details_footer_top', $post ); ?>
46
-			<?php do_action( 'AHEE_event_details_footer_bottom', $post ); ?>
45
+			<?php do_action('AHEE_event_details_footer_top', $post); ?>
46
+			<?php do_action('AHEE_event_details_footer_bottom', $post); ?>
47 47
 		</footer>
48 48
 	</div>
49 49
 
50
-<?php elseif ( is_archive() ) : ?>
50
+<?php elseif (is_archive()) : ?>
51 51
 
52
-	<div id="espresso-event-list-header-dv-<?php echo $post->ID;?>" class="espresso-event-header-dv">
53
-		<?php espresso_get_template_part( 'content', 'espresso_events-thumbnail' ); ?>
54
-		<?php espresso_get_template_part( 'content', 'espresso_events-header' ); ?>
52
+	<div id="espresso-event-list-header-dv-<?php echo $post->ID; ?>" class="espresso-event-header-dv">
53
+		<?php espresso_get_template_part('content', 'espresso_events-thumbnail'); ?>
54
+		<?php espresso_get_template_part('content', 'espresso_events-header'); ?>
55 55
 	</div>
56 56
 
57 57
 	<div class="espresso-event-list-wrapper-dv">
58
-		<?php espresso_get_template_part( 'content', 'espresso_events-tickets' ); ?>
59
-		<?php espresso_get_template_part( 'content', 'espresso_events-datetimes' ); ?>
60
-		<?php espresso_get_template_part( 'content', 'espresso_events-details' ); ?>
61
-		<?php espresso_get_template_part( 'content', 'espresso_events-venues' ); ?>
58
+		<?php espresso_get_template_part('content', 'espresso_events-tickets'); ?>
59
+		<?php espresso_get_template_part('content', 'espresso_events-datetimes'); ?>
60
+		<?php espresso_get_template_part('content', 'espresso_events-details'); ?>
61
+		<?php espresso_get_template_part('content', 'espresso_events-venues'); ?>
62 62
 	</div>
63 63
 
64 64
 <?php endif; ?>
65 65
 
66 66
 </article>
67 67
 <!-- #post -->
68
-<?php do_action( 'AHEE_event_details_after_post', $post );
68
+<?php do_action('AHEE_event_details_after_post', $post);
69 69
 
Please login to merge, or discard this patch.
core/libraries/batch/JobHandlers/AttendeesReport.php 3 patches
Doc Comments   +5 added lines patch added patch discarded remove patch
@@ -87,6 +87,11 @@
 block discarded – undo
87 87
 	public function count_units_to_process() {
88 88
 		return \EEM_Attendee::instance()->count();
89 89
 	}
90
+
91
+	/**
92
+	 * @param integer $offset
93
+	 * @param integer $limit
94
+	 */
90 95
 	public function get_csv_data( $offset, $limit ) {
91 96
 		$attendee_rows = \EEM_Attendee::instance()->get_all_wpdb_results( 
92 97
 				array( 
Please login to merge, or discard this patch.
Braces   +2 added lines, -2 removed lines patch added patch discarded remove patch
@@ -99,10 +99,10 @@
 block discarded – undo
99 99
 				if( $field_name == 'STA_ID' ){
100 100
 					$state_name_field = \EEM_State::instance()->field_settings_for( 'STA_name' );
101 101
 					$csv_row[ __( 'State', 'event_espresso' ) ] = $attendee_row[ $state_name_field->get_qualified_column() ];
102
-				}elseif( $field_name == 'CNT_ISO' ){
102
+				} elseif( $field_name == 'CNT_ISO' ){
103 103
 					$country_name_field = \EEM_Country::instance()->field_settings_for( 'CNT_name' );
104 104
 					$csv_row[ __( 'Country', 'event_espresso' ) ] = $attendee_row[ $country_name_field->get_qualified_column() ];
105
-				}else{
105
+				} else{
106 106
 					$csv_row[ $field_obj->get_nicename() ] = $attendee_row[ $field_obj->get_qualified_column() ];
107 107
 				}
108 108
 			}
Please login to merge, or discard this patch.
Spacing   +35 added lines, -35 removed lines patch added patch discarded remove patch
@@ -18,7 +18,7 @@  discard block
 block discarded – undo
18 18
 use EventEspressoBatchRequest\Helpers\JobParameters;
19 19
 use EventEspressoBatchRequest\Helpers\JobStepResponse;
20 20
 
21
-if (!defined('EVENT_ESPRESSO_VERSION')) {
21
+if ( ! defined('EVENT_ESPRESSO_VERSION')) {
22 22
 	exit('No direct script access allowed');
23 23
 }
24 24
 
@@ -27,84 +27,84 @@  discard block
 block discarded – undo
27 27
 
28 28
 
29 29
 	public function create_job(JobParameters $job_parameters) {
30
-		if( ! \EE_Capabilities::instance()->current_user_can( 'ee_read_contacts', 'generating_report' ) ) {
30
+		if ( ! \EE_Capabilities::instance()->current_user_can('ee_read_contacts', 'generating_report')) {
31 31
 			throw new BatchRequestException(
32
-				__( 'You do not have permission to view contacts', 'event_espresso')
32
+				__('You do not have permission to view contacts', 'event_espresso')
33 33
 			);
34 34
 		}
35 35
 		$filepath = $this->create_file_from_job_with_name(
36 36
 			$job_parameters->job_id(),
37 37
 			__('contact-list-report.csv', 'event_espresso')
38 38
 		);
39
-		$job_parameters->add_extra_data( 'filepath', $filepath );
40
-		$job_parameters->set_job_size( $this->count_units_to_process() );
39
+		$job_parameters->add_extra_data('filepath', $filepath);
40
+		$job_parameters->set_job_size($this->count_units_to_process());
41 41
 		//we should also set the header columns
42
-		$csv_data_for_row = $this->get_csv_data( 0, 1 );
43
-		\EEH_Export::write_data_array_to_csv( $filepath, $csv_data_for_row, true );
42
+		$csv_data_for_row = $this->get_csv_data(0, 1);
43
+		\EEH_Export::write_data_array_to_csv($filepath, $csv_data_for_row, true);
44 44
 		//if we actually processed a row there, record it
45
-		if( $job_parameters->job_size() ) {
46
-			$job_parameters->mark_processed( 1 );
45
+		if ($job_parameters->job_size()) {
46
+			$job_parameters->mark_processed(1);
47 47
 		}
48 48
 		return new JobStepResponse(
49 49
 			$job_parameters,
50
-			__( 'Contacts report started successfully...', 'event_espresso' )
50
+			__('Contacts report started successfully...', 'event_espresso')
51 51
 		);
52 52
 	}
53 53
 
54 54
 
55 55
 	public function continue_job(JobParameters $job_parameters, $batch_size = 50) {
56
-		$csv_data = $this->get_csv_data( $job_parameters->units_processed(), $batch_size );
57
-		\EEH_Export::write_data_array_to_csv( $job_parameters->extra_datum( 'filepath' ), $csv_data, false );
58
-		$units_processed = count( $csv_data );
59
-		$job_parameters->mark_processed( $units_processed );
56
+		$csv_data = $this->get_csv_data($job_parameters->units_processed(), $batch_size);
57
+		\EEH_Export::write_data_array_to_csv($job_parameters->extra_datum('filepath'), $csv_data, false);
58
+		$units_processed = count($csv_data);
59
+		$job_parameters->mark_processed($units_processed);
60 60
 		$extra_response_data = array(
61 61
 			'file_url' => ''
62 62
 		);
63
-		if( $units_processed < $batch_size ) {
64
-			$job_parameters->set_status( JobParameters::status_complete );
65
-			$extra_response_data[ 'file_url' ] = $this->get_url_to_file( $job_parameters->extra_datum( 'filepath' ) );
63
+		if ($units_processed < $batch_size) {
64
+			$job_parameters->set_status(JobParameters::status_complete);
65
+			$extra_response_data['file_url'] = $this->get_url_to_file($job_parameters->extra_datum('filepath'));
66 66
 		}
67 67
 		return new JobStepResponse(
68 68
 				$job_parameters,
69 69
 				sprintf(
70
-					__( 'Wrote %1$s rows to report CSV file...', 'event_espresso' ),
71
-					count( $csv_data ) ),
70
+					__('Wrote %1$s rows to report CSV file...', 'event_espresso'),
71
+					count($csv_data) ),
72 72
 				$extra_response_data );
73 73
 	}
74 74
 
75 75
 
76 76
 	public function cleanup_job(JobParameters $job_parameters) {
77 77
 		$this->_file_helper->delete(
78
-			\EEH_File::remove_filename_from_filepath( $job_parameters->extra_datum( 'filepath' ) ),
78
+			\EEH_File::remove_filename_from_filepath($job_parameters->extra_datum('filepath')),
79 79
 			true,
80 80
 			'd'
81 81
 		);
82
-		return new JobStepResponse( $job_parameters, __( 'Cleaned up temporary file', 'event_espresso' ) );
82
+		return new JobStepResponse($job_parameters, __('Cleaned up temporary file', 'event_espresso'));
83 83
 	}
84 84
 
85 85
 	public function count_units_to_process() {
86
-		return \EEM_Attendee::instance()->count( array( 'caps' => \EEM_Base::caps_read_admin ));
86
+		return \EEM_Attendee::instance()->count(array('caps' => \EEM_Base::caps_read_admin));
87 87
 	}
88
-	public function get_csv_data( $offset, $limit ) {
88
+	public function get_csv_data($offset, $limit) {
89 89
 		$attendee_rows = \EEM_Attendee::instance()->get_all_wpdb_results( 
90 90
 			array( 
91
-				'limit' => array( $offset, $limit ),
92
-				'force_join' => array( 'State', 'Country' ),
91
+				'limit' => array($offset, $limit),
92
+				'force_join' => array('State', 'Country'),
93 93
 				'caps' => \EEM_Base::caps_read_admin
94 94
 			) 
95 95
 		);
96 96
 		$csv_data = array();
97
-		foreach( $attendee_rows as $attendee_row ){
97
+		foreach ($attendee_rows as $attendee_row) {
98 98
 			$csv_row = array();
99
-			foreach( \EEM_Attendee::instance()->field_settings() as $field_name => $field_obj ){
100
-				if( $field_name == 'STA_ID' ){
101
-					$state_name_field = \EEM_State::instance()->field_settings_for( 'STA_name' );
102
-					$csv_row[ __( 'State', 'event_espresso' ) ] = $attendee_row[ $state_name_field->get_qualified_column() ];
103
-				}elseif( $field_name == 'CNT_ISO' ){
104
-					$country_name_field = \EEM_Country::instance()->field_settings_for( 'CNT_name' );
105
-					$csv_row[ __( 'Country', 'event_espresso' ) ] = $attendee_row[ $country_name_field->get_qualified_column() ];
106
-				}else{
107
-					$csv_row[ $field_obj->get_nicename() ] = $attendee_row[ $field_obj->get_qualified_column() ];
99
+			foreach (\EEM_Attendee::instance()->field_settings() as $field_name => $field_obj) {
100
+				if ($field_name == 'STA_ID') {
101
+					$state_name_field = \EEM_State::instance()->field_settings_for('STA_name');
102
+					$csv_row[__('State', 'event_espresso')] = $attendee_row[$state_name_field->get_qualified_column()];
103
+				}elseif ($field_name == 'CNT_ISO') {
104
+					$country_name_field = \EEM_Country::instance()->field_settings_for('CNT_name');
105
+					$csv_row[__('Country', 'event_espresso')] = $attendee_row[$country_name_field->get_qualified_column()];
106
+				} else {
107
+					$csv_row[$field_obj->get_nicename()] = $attendee_row[$field_obj->get_qualified_column()];
108 108
 				}
109 109
 			}
110 110
 			$csv_data[] = $csv_row;
Please login to merge, or discard this patch.
core/EE_Psr4AutoloaderInit.core.php 1 patch
Spacing   +4 added lines, -4 removed lines patch added patch discarded remove patch
@@ -24,15 +24,15 @@
 block discarded – undo
24 24
 	 */
25 25
 	public function __construct() {
26 26
 		static $initialized = false;
27
-		if ( ! $initialized ) {
27
+		if ( ! $initialized) {
28 28
 			// instantiate PSR4 autoloader
29
-			espresso_load_required( 'Psr4Autoloader', EE_CORE . 'Psr4Autoloader.php' );
29
+			espresso_load_required('Psr4Autoloader', EE_CORE.'Psr4Autoloader.php');
30 30
 			EE_Psr4AutoloaderInit::$psr4_loader = new \EventEspresso\Core\Psr4Autoloader();
31 31
 			// register the autoloader
32 32
 			EE_Psr4AutoloaderInit::$psr4_loader->register();
33 33
 			// register the base directories for the namespace prefix
34
-			EE_Psr4AutoloaderInit::$psr4_loader->addNamespace( 'EventEspresso', EE_PLUGIN_DIR_PATH );
35
-			EE_Psr4AutoloaderInit::$psr4_loader->addNamespace( 'EventEspressoBatchRequest', EE_LIBRARIES . 'batch' );
34
+			EE_Psr4AutoloaderInit::$psr4_loader->addNamespace('EventEspresso', EE_PLUGIN_DIR_PATH);
35
+			EE_Psr4AutoloaderInit::$psr4_loader->addNamespace('EventEspressoBatchRequest', EE_LIBRARIES.'batch');
36 36
 			$initialized = true;
37 37
 		}
38 38
 	}
Please login to merge, or discard this patch.