Completed
Branch BUG-10381-asset-loading (7390a7)
by
unknown
39:00 queued 27:53
created
core/middleware/EE_Alpha_Banner_Warning.core.php 1 patch
Spacing   +10 added lines, -10 removed lines patch added patch discarded remove patch
@@ -21,11 +21,11 @@  discard block
 block discarded – undo
21 21
 	 * @param 	EE_Response $response
22 22
 	 * @return 	EE_Response
23 23
 	 */
24
-	public function handle_request( EE_Request $request, EE_Response $response ) {
24
+	public function handle_request(EE_Request $request, EE_Response $response) {
25 25
 		$this->_request = $request;
26 26
 		$this->_response = $response;
27 27
 		$this->display_alpha_banner_warning();
28
-		$this->_response = $this->process_request_stack( $this->_request, $this->_response );
28
+		$this->_response = $this->process_request_stack($this->_request, $this->_response);
29 29
 		return $this->_response;
30 30
 	}
31 31
 
@@ -41,22 +41,22 @@  discard block
 block discarded – undo
41 41
 	 */
42 42
 	public function display_alpha_banner_warning() {
43 43
 		// skip AJAX requests
44
-		if ( defined( 'DOING_AJAX' ) && DOING_AJAX ) {
44
+		if (defined('DOING_AJAX') && DOING_AJAX) {
45 45
 			return;
46 46
 		}
47 47
 		// skip stable releases
48
-		if ( strpos( EVENT_ESPRESSO_VERSION, '.alpha' ) === false ) {
48
+		if (strpos(EVENT_ESPRESSO_VERSION, '.alpha') === false) {
49 49
 			return;
50 50
 		}
51 51
 		// post release candidate warning
52
-		if ( is_admin() ) {
53
-			add_action( 'admin_notices', array( $this, 'alpha_banner_admin_notice' ), -999 );
52
+		if (is_admin()) {
53
+			add_action('admin_notices', array($this, 'alpha_banner_admin_notice'), -999);
54 54
 		} else {
55 55
 			// site admin has authorized use of non-stable release candidate for production
56
-			if ( defined( 'ALLOW_NON_STABLE_RELEASE_ON_LIVE_SITE' ) && ALLOW_NON_STABLE_RELEASE_ON_LIVE_SITE ) {
56
+			if (defined('ALLOW_NON_STABLE_RELEASE_ON_LIVE_SITE') && ALLOW_NON_STABLE_RELEASE_ON_LIVE_SITE) {
57 57
 				return;
58 58
 			}
59
-			add_action( 'shutdown', array( $this, 'alpha_banner_warning_notice' ), 10 );
59
+			add_action('shutdown', array($this, 'alpha_banner_warning_notice'), 10);
60 60
 		}
61 61
 	}
62 62
 
@@ -72,7 +72,7 @@  discard block
 block discarded – undo
72 72
 	public function alpha_banner_admin_notice() {
73 73
 		EE_Error::add_attention(
74 74
 			sprintf(
75
-				__( 'This version of Event Espresso is for testing and/or evaluation purposes only. It is %1$snot%2$s considered a stable release and should therefore %1$snot%2$s be activated on a live or production website.', 'event_espresso' ),
75
+				__('This version of Event Espresso is for testing and/or evaluation purposes only. It is %1$snot%2$s considered a stable release and should therefore %1$snot%2$s be activated on a live or production website.', 'event_espresso'),
76 76
 				'<strong>',
77 77
 				'</strong>'
78 78
 			),
@@ -91,7 +91,7 @@  discard block
 block discarded – undo
91 91
 	 */
92 92
 	public function alpha_banner_warning_notice() {
93 93
 		printf(
94
-			__( '%1$sThis version of Event Espresso is for testing and/or evaluation purposes only. It is %2$snot%3$s considered a stable release and should therefore %2$snot%3$s be activated on a live or production website.%4$s', 'event_espresso' ),
94
+			__('%1$sThis version of Event Espresso is for testing and/or evaluation purposes only. It is %2$snot%3$s considered a stable release and should therefore %2$snot%3$s be activated on a live or production website.%4$s', 'event_espresso'),
95 95
 			'<div id="ee-release-candidate-notice-dv" class="ee-really-important-notice-dv"><p>',
96 96
 			'<strong>',
97 97
 			'</strong>',
Please login to merge, or discard this patch.
core/request_stack/EE_Request_Stack.core.php 1 patch
Spacing   +6 added lines, -6 removed lines patch added patch discarded remove patch
@@ -43,7 +43,7 @@  discard block
 block discarded – undo
43 43
 	 * @param 	EEI_Request_Decorator $application
44 44
 	 * @param 	array $middlewares
45 45
 	 */
46
-	public function __construct( EEI_Request_Decorator $application, $middlewares = array() ) {
46
+	public function __construct(EEI_Request_Decorator $application, $middlewares = array()) {
47 47
 		$this->_application = $application;
48 48
 		$this->_middlewares = $middlewares;
49 49
 	}
@@ -55,10 +55,10 @@  discard block
 block discarded – undo
55 55
 	 * @param 	EE_Response $response
56 56
 	 * @return 	EE_Response
57 57
 	 */
58
-	public function handle_request( EE_Request $request, EE_Response $response ) {
58
+	public function handle_request(EE_Request $request, EE_Response $response) {
59 59
 		$this->_request = $request;
60 60
 		$this->_response = $response;
61
-		return $this->_application->handle_request( $request, $response );
61
+		return $this->_application->handle_request($request, $response);
62 62
 	}
63 63
 
64 64
 
@@ -69,9 +69,9 @@  discard block
 block discarded – undo
69 69
 	 * after the request stack has been fully processed
70 70
 	 */
71 71
 	public function handle_response() {
72
-		foreach ( $this->_middlewares as $middleware ) {
73
-			if ( $middleware instanceof EEI_Request_Stack_Core_App ) {
74
-				$middleware->handle_response( $this->_request, $this->_response );
72
+		foreach ($this->_middlewares as $middleware) {
73
+			if ($middleware instanceof EEI_Request_Stack_Core_App) {
74
+				$middleware->handle_response($this->_request, $this->_response);
75 75
 				// exit loop since we should be done
76 76
 				// (also in case someone has accidentally labeled multiple apps as the EEI_Request_Stack_Core_App )
77 77
 				break;
Please login to merge, or discard this patch.
caffeinated/admin/extend/about/templates/whats_new.template.php 1 patch
Spacing   +9 added lines, -9 removed lines patch added patch discarded remove patch
@@ -1,25 +1,25 @@
 block discarded – undo
1 1
 <div class="changelog point-releases">
2
-	<!-- <h3><?php echo _n( 'Minor Release Information', 'Minor Releases', 1 ); ?></h3> -->
3
-	<h3><?php echo _n( 'Major Release Information', 'Major Releases', 1 ); ?></h3>
2
+	<!-- <h3><?php echo _n('Minor Release Information', 'Minor Releases', 1); ?></h3> -->
3
+	<h3><?php echo _n('Major Release Information', 'Major Releases', 1); ?></h3>
4 4
 	<?php //$type = 'minor'; ?>
5 5
 	<?php $type = 'major'; ?>
6
-	<p><?php printf( __( '<strong>Version %1$s</strong> is a %2$s release.', 'event_espresso'), EVENT_ESPRESSO_VERSION, $type ); ?>
6
+	<p><?php printf(__('<strong>Version %1$s</strong> is a %2$s release.', 'event_espresso'), EVENT_ESPRESSO_VERSION, $type); ?>
7 7
 		<?php
8
-			$ver = explode( '.', EVENT_ESPRESSO_VERSION );
9
-			array_pop( $ver );
10
-			$ver = implode( '.', $ver );
8
+			$ver = explode('.', EVENT_ESPRESSO_VERSION);
9
+			array_pop($ver);
10
+			$ver = implode('.', $ver);
11 11
 		?>
12
-		<?php printf( __( 'For more information, see <a href="%s" target="_blank">the release notes</a>.' ), 'http://eventespresso.com/wiki/ee4-changelog/#' . $ver ); ?>
12
+		<?php printf(__('For more information, see <a href="%s" target="_blank">the release notes</a>.'), 'http://eventespresso.com/wiki/ee4-changelog/#'.$ver); ?>
13 13
  	</p>
14 14
 </div>
15 15
 
16 16
 <div class="changelog">
17 17
 	<?php
18 18
 	//maintenance mode on?
19
-	if ( EE_Maintenance_Mode::instance()->level() == EE_Maintenance_Mode::level_2_complete_maintenance ) {
19
+	if (EE_Maintenance_Mode::instance()->level() == EE_Maintenance_Mode::level_2_complete_maintenance) {
20 20
 		?>
21 21
 		<div class="ee-attention">
22
-			<h2 class="ee-maintenance-mode-callout"><?php  _e('Event Espresso is in full maintenance mode.' , 'event_espresso'); ?></h2>
22
+			<h2 class="ee-maintenance-mode-callout"><?php  _e('Event Espresso is in full maintenance mode.', 'event_espresso'); ?></h2>
23 23
 			<p>
24 24
 			<?php
25 25
 				printf(
Please login to merge, or discard this patch.
core/libraries/batch/JobHandlerBaseClasses/JobHandlerFile.php 1 patch
Spacing   +22 added lines, -22 removed lines patch added patch discarded remove patch
@@ -16,8 +16,8 @@  discard block
 block discarded – undo
16 16
 
17 17
 use EventEspressoBatchRequest\Helpers\BatchRequestException;
18 18
 
19
-if ( ! defined( 'EVENT_ESPRESSO_VERSION' ) ) {
20
-	exit( 'No direct script access allowed' );
19
+if ( ! defined('EVENT_ESPRESSO_VERSION')) {
20
+	exit('No direct script access allowed');
21 21
 }
22 22
 
23 23
 
@@ -39,8 +39,8 @@  discard block
 block discarded – undo
39 39
 	 *
40 40
 	 * @param \EEHI_File|null $file_helper
41 41
 	 */
42
-	public function __construct( \EEHI_File $file_helper = null ) {
43
-		if( ! $file_helper ) {
42
+	public function __construct(\EEHI_File $file_helper = null) {
43
+		if ( ! $file_helper) {
44 44
 			$this->_file_helper = new \EEH_File();
45 45
 		}
46 46
 	}
@@ -56,39 +56,39 @@  discard block
 block discarded – undo
56 56
 	 * @return string
57 57
 	 * @throws \EventEspressoBatchRequest\Helpers\BatchRequestException
58 58
 	 */
59
-	public function create_file_from_job_with_name( $job_id, $filename, $filetype = 'application/ms-excel' ) {
59
+	public function create_file_from_job_with_name($job_id, $filename, $filetype = 'application/ms-excel') {
60 60
 		$filepath = '';
61
-		try{
61
+		try {
62 62
 			$base_folder = $this->get_base_folder();
63 63
 			$success = $this->_file_helper->ensure_folder_exists_and_is_writable(
64
-				$base_folder . JobHandlerFile::temp_folder_name
64
+				$base_folder.JobHandlerFile::temp_folder_name
65 65
 			);
66
-			if ( $success ) {
66
+			if ($success) {
67 67
 				$success = $this->_file_helper->ensure_folder_exists_and_is_writable(
68
-					$base_folder . JobHandlerFile::temp_folder_name . DS . $job_id
68
+					$base_folder.JobHandlerFile::temp_folder_name.DS.$job_id
69 69
 				);
70 70
 			}
71
-			if( $success ) {
72
-				$filepath = $base_folder . JobHandlerFile::temp_folder_name . DS . $job_id . DS. $filename;
73
-				$success = $this->_file_helper->ensure_file_exists_and_is_writable( $filepath );
71
+			if ($success) {
72
+				$filepath = $base_folder.JobHandlerFile::temp_folder_name.DS.$job_id.DS.$filename;
73
+				$success = $this->_file_helper->ensure_file_exists_and_is_writable($filepath);
74 74
 			}
75 75
 			//let's add the .htaccess file so safari will open the file properly
76
-			if( $success ) {
77
-				$extension = \EEH_File::get_file_extension( $filepath );
76
+			if ($success) {
77
+				$extension = \EEH_File::get_file_extension($filepath);
78 78
 				\EEH_File::write_to_file(
79
-					$base_folder . JobHandlerFile::temp_folder_name . DS . $job_id . DS . '.htaccess',
80
-					'AddType ' . $filetype . ' ' . $extension,
79
+					$base_folder.JobHandlerFile::temp_folder_name.DS.$job_id.DS.'.htaccess',
80
+					'AddType '.$filetype.' '.$extension,
81 81
 					'.htaccess'
82 82
 				);
83 83
 			}
84 84
 			//those methods normally fail with an exception, but if not, let's do it
85
-			if( ! $success ) {
86
-				throw new \EE_Error( __( 'Could not create temporary file, an unknown error occurred', 'event_espresso' ) );
85
+			if ( ! $success) {
86
+				throw new \EE_Error(__('Could not create temporary file, an unknown error occurred', 'event_espresso'));
87 87
 			}
88
-		} catch( \EE_Error $e ) {
88
+		} catch (\EE_Error $e) {
89 89
 			throw new BatchRequestException(
90 90
 				sprintf(
91
-					__( 'Could not create temporary file for job %1$s, because: %2$s ', 'event_espresso' ),
91
+					__('Could not create temporary file for job %1$s, because: %2$s ', 'event_espresso'),
92 92
 					$job_id,
93 93
 					$e->getMessage()
94 94
 				),
@@ -104,8 +104,8 @@  discard block
 block discarded – undo
104 104
 	 * @param string $filepath
105 105
 	 * @return string url to file
106 106
 	 */
107
-	public function get_url_to_file( $filepath ) {
108
-		return str_replace( $this->get_base_folder(), $this->get_base_url(), $filepath );
107
+	public function get_url_to_file($filepath) {
108
+		return str_replace($this->get_base_folder(), $this->get_base_url(), $filepath);
109 109
 	}
110 110
 	
111 111
 	/**
Please login to merge, or discard this patch.
espresso_thank_you/templates/thank-you-page-overview.template.php 1 patch
Spacing   +6 added lines, -6 removed lines patch added patch discarded remove patch
@@ -3,13 +3,13 @@  discard block
 block discarded – undo
3 3
 /** @var boolean $revisit */
4 4
 /** @var string $order_conf_desc */
5 5
 
6
-do_action( 'AHEE__thank_you_page_overview_template__top', $transaction );
6
+do_action('AHEE__thank_you_page_overview_template__top', $transaction);
7 7
 
8 8
 ?>
9 9
 
10 10
 <div id="espresso-thank-you-page-overview-dv" class="width-100" >
11 11
 
12
-	<?php if ( ! $revisit ) : ?>
12
+	<?php if ( ! $revisit) : ?>
13 13
 	<div class="ee-attention">
14 14
 		<div class="extra-padding-sides">
15 15
 			<?php echo apply_filters(
@@ -21,10 +21,10 @@  discard block
 block discarded – undo
21 21
 					'<br />'
22 22
 				)
23 23
 			);
24
-			if ( ! empty( $TXN_receipt_url )) : ?>
24
+			if ( ! empty($TXN_receipt_url)) : ?>
25 25
 			<br/>
26 26
 			<div class="jst-rght">
27
-				<a class="ee-button ee-roundish indented-text big-text" href="<?php echo $TXN_receipt_url;?>"><span class="ee-icon ee-icon-PDF-file-type"></span><?php echo apply_filters( 'FHEE__thank_you_page_overview_template__order_conf_button_text', __( 'View Full Order Confirmation Receipt', 'event_espresso' )); ?></a>
27
+				<a class="ee-button ee-roundish indented-text big-text" href="<?php echo $TXN_receipt_url; ?>"><span class="ee-icon ee-icon-PDF-file-type"></span><?php echo apply_filters('FHEE__thank_you_page_overview_template__order_conf_button_text', __('View Full Order Confirmation Receipt', 'event_espresso')); ?></a>
28 28
 			</div>
29 29
 			<?php endif; ?>
30 30
 		</div>
@@ -33,9 +33,9 @@  discard block
 block discarded – undo
33 33
 	<?php endif; ?>
34 34
 	<br/>
35 35
 
36
-	<?php  do_action( 'AHEE__thank_you_page_overview_template__content', $transaction ); ?>
36
+	<?php  do_action('AHEE__thank_you_page_overview_template__content', $transaction); ?>
37 37
 
38 38
 </div>
39 39
 <!-- end of espresso-thank-you-page-overview-dv -->
40 40
 
41
-<?php  do_action( 'AHEE__thank_you_page_overview_template__bottom', $transaction ); ?>
41
+<?php  do_action('AHEE__thank_you_page_overview_template__bottom', $transaction); ?>
Please login to merge, or discard this patch.
core/db_models/EEM_Question.model.php 2 patches
Doc Comments   +2 added lines, -2 removed lines patch added patch discarded remove patch
@@ -310,7 +310,7 @@  discard block
 block discarded – undo
310 310
 	 * Gets an array for converting between QST_system and QST_IDs for system questions. Eg, if you want to know
311 311
 	 * which system question QST_ID corresponds to the QST_system 'city', use EEM_Question::instance()->get_Question_ID_from_system_string('city');
312 312
 	 * @param $QST_system
313
-	 * @return int of QST_ID for the question that corresponds to that QST_system
313
+	 * @return string of QST_ID for the question that corresponds to that QST_system
314 314
 	 */
315 315
 	public function get_Question_ID_from_system_string( $QST_system ){
316 316
 		 return $this->get_var( array( array( 'QST_system' => $QST_system ) ) );
@@ -369,7 +369,7 @@  discard block
 block discarded – undo
369 369
 
370 370
 
371 371
 	/**
372
-	 * @return array
372
+	 * @return EEM_Question
373 373
 	 */
374 374
 	public function question_descriptions() {
375 375
 		return $this->_question_descriptions;
Please login to merge, or discard this patch.
Spacing   +81 added lines, -81 removed lines patch added patch discarded remove patch
@@ -1,8 +1,8 @@  discard block
 block discarded – undo
1 1
 <?php if ( ! defined('EVENT_ESPRESSO_VERSION')) {
2 2
 	exit('No direct script access allowed');
3 3
 }
4
-require_once( EE_MODELS . 'EEM_Soft_Delete_Base.model.php' );
5
-require_once( EE_CLASSES . 'EE_Question.class.php' );
4
+require_once(EE_MODELS.'EEM_Soft_Delete_Base.model.php');
5
+require_once(EE_CLASSES.'EE_Question.class.php');
6 6
 
7 7
 
8 8
 
@@ -101,52 +101,52 @@  discard block
 block discarded – undo
101 101
 	 *
102 102
 	 * @param null $timezone
103 103
 	 */
104
-	protected function __construct( $timezone = NULL ) {
105
-		$this->singular_item = __('Question','event_espresso');
106
-		$this->plural_item = __('Questions','event_espresso');
107
-		$this->_allowed_question_types=apply_filters(
104
+	protected function __construct($timezone = NULL) {
105
+		$this->singular_item = __('Question', 'event_espresso');
106
+		$this->plural_item = __('Questions', 'event_espresso');
107
+		$this->_allowed_question_types = apply_filters(
108 108
 			'FHEE__EEM_Question__construct__allowed_question_types',
109 109
 			array(
110
-				EEM_Question::QST_type_text =>__('Text','event_espresso'),
111
-				EEM_Question::QST_type_textarea =>__('Textarea','event_espresso'),
112
-				EEM_Question::QST_type_checkbox =>__('Checkboxes','event_espresso'),
113
-				EEM_Question::QST_type_radio =>__('Radio Buttons','event_espresso'),
114
-				EEM_Question::QST_type_dropdown =>__('Dropdown','event_espresso'),
115
-				EEM_Question::QST_type_state =>__('State/Province Dropdown','event_espresso'),
116
-				EEM_Question::QST_type_country =>__('Country Dropdown','event_espresso'),
117
-				EEM_Question::QST_type_date =>__('Date Picker','event_espresso'),
118
-				EEM_Question::QST_type_html_textarea => __( 'HTML Textarea', 'event_espresso' ),
119
-				EEM_Question::QST_type_email => __( 'Email', 'event_espresso' ),
120
-				EEM_Question::QST_type_us_phone => __( 'USA - Format Phone', 'event_espresso' ),
121
-				EEM_Question::QST_type_decimal => __( 'Number', 'event_espresso' ),
122
-				EEM_Question::QST_type_int => __( 'Whole Number', 'event_espresso' ),
123
-				EEM_Question::QST_type_url => __( 'URL', 'event_espresso' ),
124
-				EEM_Question::QST_type_year => __( 'Year', 'event_espresso' ),
125
-				EEM_Question::QST_type_multi_select => __( 'Multi Select', 'event_espresso' )
110
+				EEM_Question::QST_type_text =>__('Text', 'event_espresso'),
111
+				EEM_Question::QST_type_textarea =>__('Textarea', 'event_espresso'),
112
+				EEM_Question::QST_type_checkbox =>__('Checkboxes', 'event_espresso'),
113
+				EEM_Question::QST_type_radio =>__('Radio Buttons', 'event_espresso'),
114
+				EEM_Question::QST_type_dropdown =>__('Dropdown', 'event_espresso'),
115
+				EEM_Question::QST_type_state =>__('State/Province Dropdown', 'event_espresso'),
116
+				EEM_Question::QST_type_country =>__('Country Dropdown', 'event_espresso'),
117
+				EEM_Question::QST_type_date =>__('Date Picker', 'event_espresso'),
118
+				EEM_Question::QST_type_html_textarea => __('HTML Textarea', 'event_espresso'),
119
+				EEM_Question::QST_type_email => __('Email', 'event_espresso'),
120
+				EEM_Question::QST_type_us_phone => __('USA - Format Phone', 'event_espresso'),
121
+				EEM_Question::QST_type_decimal => __('Number', 'event_espresso'),
122
+				EEM_Question::QST_type_int => __('Whole Number', 'event_espresso'),
123
+				EEM_Question::QST_type_url => __('URL', 'event_espresso'),
124
+				EEM_Question::QST_type_year => __('Year', 'event_espresso'),
125
+				EEM_Question::QST_type_multi_select => __('Multi Select', 'event_espresso')
126 126
 			)
127 127
 		);
128 128
 		$this->_question_descriptions = apply_filters(
129 129
 			'FHEE__EEM_Question__construct__allowed_question_types',
130 130
 			array(
131
-				EEM_Question::QST_type_text          => __( 'A single line text input field', 'event_espresso' ),
132
-				EEM_Question::QST_type_textarea      => __( 'A multi line text input field', 'event_espresso' ),
133
-				EEM_Question::QST_type_checkbox      => __( 'Allows multiple preset options to be selected', 'event_espresso' ),
134
-				EEM_Question::QST_type_radio         => __( 'Allows a single preset option to be selected', 'event_espresso' ),
135
-				EEM_Question::QST_type_dropdown      => __( 'A dropdown that allows a single selection', 'event_espresso' ),
136
-				EEM_Question::QST_type_state         => __( 'A dropdown that lists states/provinces', 'event_espresso' ),
137
-				EEM_Question::QST_type_country       => __( 'A dropdown that lists countries', 'event_espresso' ),
138
-				EEM_Question::QST_type_date          => __( 'A popup calendar that allows date selections', 'event_espresso' ),
139
-				EEM_Question::QST_type_html_textarea => __( 'A multi line text input field that allows HTML', 'event_espresso' ),
140
-				EEM_Question::QST_type_email         => __( 'A text field that must contain a valid Email address', 'event_espresso' ),
141
-				EEM_Question::QST_type_us_phone      => __( 'A text field that must contain a valid US phone number', 'event_espresso' ),
142
-				EEM_Question::QST_type_decimal       => __( 'A text field that allows number values with decimals', 'event_espresso' ),
143
-				EEM_Question::QST_type_int           => __( 'A text field that only allows whole numbers (no decimals)', 'event_espresso' ),
144
-				EEM_Question::QST_type_url           => __( 'A text field that must contain a valid URL', 'event_espresso' ),
145
-				EEM_Question::QST_type_year          => __( 'A dropdown that lists the last 100 years', 'event_espresso' ),
146
-				EEM_Question::QST_type_multi_select  => __( 'A dropdown that allows multiple selections', 'event_espresso' )
131
+				EEM_Question::QST_type_text          => __('A single line text input field', 'event_espresso'),
132
+				EEM_Question::QST_type_textarea      => __('A multi line text input field', 'event_espresso'),
133
+				EEM_Question::QST_type_checkbox      => __('Allows multiple preset options to be selected', 'event_espresso'),
134
+				EEM_Question::QST_type_radio         => __('Allows a single preset option to be selected', 'event_espresso'),
135
+				EEM_Question::QST_type_dropdown      => __('A dropdown that allows a single selection', 'event_espresso'),
136
+				EEM_Question::QST_type_state         => __('A dropdown that lists states/provinces', 'event_espresso'),
137
+				EEM_Question::QST_type_country       => __('A dropdown that lists countries', 'event_espresso'),
138
+				EEM_Question::QST_type_date          => __('A popup calendar that allows date selections', 'event_espresso'),
139
+				EEM_Question::QST_type_html_textarea => __('A multi line text input field that allows HTML', 'event_espresso'),
140
+				EEM_Question::QST_type_email         => __('A text field that must contain a valid Email address', 'event_espresso'),
141
+				EEM_Question::QST_type_us_phone      => __('A text field that must contain a valid US phone number', 'event_espresso'),
142
+				EEM_Question::QST_type_decimal       => __('A text field that allows number values with decimals', 'event_espresso'),
143
+				EEM_Question::QST_type_int           => __('A text field that only allows whole numbers (no decimals)', 'event_espresso'),
144
+				EEM_Question::QST_type_url           => __('A text field that must contain a valid URL', 'event_espresso'),
145
+				EEM_Question::QST_type_year          => __('A dropdown that lists the last 100 years', 'event_espresso'),
146
+				EEM_Question::QST_type_multi_select  => __('A dropdown that allows multiple selections', 'event_espresso')
147 147
 			)
148 148
 		);
149
-		$this->_question_type_categories = (array)apply_filters(
149
+		$this->_question_type_categories = (array) apply_filters(
150 150
 				'FHEE__EEM_Question__construct__question_type_categories',
151 151
 				array(
152 152
 				'text' => array(
@@ -171,22 +171,22 @@  discard block
 block discarded – undo
171 171
 		);
172 172
 
173 173
 		$this->_tables = array(
174
-			'Question'=>new EE_Primary_Table('esp_question','QST_ID')
174
+			'Question'=>new EE_Primary_Table('esp_question', 'QST_ID')
175 175
 		);
176 176
 		$this->_fields = array(
177 177
 			'Question'=>array(
178
-				'QST_ID'=>new EE_Primary_Key_Int_Field('QST_ID', __('Question ID','event_espresso')),
179
-				'QST_display_text'=>new EE_Post_Content_Field('QST_display_text', __('Question Text','event_espresso'), true, ''),
180
-				'QST_admin_label'=>new EE_Plain_Text_Field('QST_admin_label', __('Question Label (admin-only)','event_espresso'), true, ''),
181
-				'QST_system'=>new EE_Plain_Text_Field('QST_system', __('Internal string ID for question','event_espresso'), false, '' ),
182
-				'QST_type'=>new EE_Enum_Text_Field('QST_type', __('Question Type','event_espresso'),false, 'TEXT',$this->_allowed_question_types),
183
-				'QST_required'=>new EE_Boolean_Field('QST_required', __('Required Question?','event_espresso'), false, false),
184
-				'QST_required_text'=>new EE_Simple_HTML_Field('QST_required_text', __('Text to Display if Not Provided','event_espresso'), true, ''),
185
-				'QST_order'=>new EE_Integer_Field('QST_order', __('Question Order','event_espresso'), false, 0),
186
-				'QST_admin_only'=>new EE_Boolean_Field('QST_admin_only', __('Admin-Only Question?','event_espresso'), false, false),
187
-				'QST_max' => new EE_Infinite_Integer_Field( 'QST_max', __( 'Max Size', 'event_espresso'	), false, EE_INF ),
188
-				'QST_wp_user'=>new EE_WP_User_Field('QST_wp_user', __('Question Creator ID','event_espresso'), false ),
189
-				'QST_deleted'=>new EE_Trashed_Flag_Field('QST_deleted', __('Flag Indicating question was deleted','event_espresso'), false, false)
178
+				'QST_ID'=>new EE_Primary_Key_Int_Field('QST_ID', __('Question ID', 'event_espresso')),
179
+				'QST_display_text'=>new EE_Post_Content_Field('QST_display_text', __('Question Text', 'event_espresso'), true, ''),
180
+				'QST_admin_label'=>new EE_Plain_Text_Field('QST_admin_label', __('Question Label (admin-only)', 'event_espresso'), true, ''),
181
+				'QST_system'=>new EE_Plain_Text_Field('QST_system', __('Internal string ID for question', 'event_espresso'), false, ''),
182
+				'QST_type'=>new EE_Enum_Text_Field('QST_type', __('Question Type', 'event_espresso'), false, 'TEXT', $this->_allowed_question_types),
183
+				'QST_required'=>new EE_Boolean_Field('QST_required', __('Required Question?', 'event_espresso'), false, false),
184
+				'QST_required_text'=>new EE_Simple_HTML_Field('QST_required_text', __('Text to Display if Not Provided', 'event_espresso'), true, ''),
185
+				'QST_order'=>new EE_Integer_Field('QST_order', __('Question Order', 'event_espresso'), false, 0),
186
+				'QST_admin_only'=>new EE_Boolean_Field('QST_admin_only', __('Admin-Only Question?', 'event_espresso'), false, false),
187
+				'QST_max' => new EE_Infinite_Integer_Field('QST_max', __('Max Size', 'event_espresso'), false, EE_INF),
188
+				'QST_wp_user'=>new EE_WP_User_Field('QST_wp_user', __('Question Creator ID', 'event_espresso'), false),
189
+				'QST_deleted'=>new EE_Trashed_Flag_Field('QST_deleted', __('Flag Indicating question was deleted', 'event_espresso'), false, false)
190 190
 			)
191 191
 		);
192 192
 		$this->_model_relations = array(
@@ -198,11 +198,11 @@  discard block
 block discarded – undo
198 198
 			'Question_Group_Question'=>new EE_Has_Many_Relation()
199 199
 		);
200 200
 		//this model is generally available for reading
201
-		$this->_cap_restriction_generators[ EEM_Base::caps_read ] = new EE_Restriction_Generator_Public();
202
-		$this->_cap_restriction_generators[ EEM_Base::caps_read_admin ] = new EE_Restriction_Generator_Reg_Form('QST_system');
203
-		$this->_cap_restriction_generators[ EEM_Base::caps_edit ] = new EE_Restriction_Generator_Reg_Form('QST_system');
204
-		$this->_cap_restriction_generators[ EEM_Base::caps_delete ] = new EE_Restriction_Generator_Reg_Form('QST_system');
205
-		parent::__construct( $timezone );
201
+		$this->_cap_restriction_generators[EEM_Base::caps_read] = new EE_Restriction_Generator_Public();
202
+		$this->_cap_restriction_generators[EEM_Base::caps_read_admin] = new EE_Restriction_Generator_Reg_Form('QST_system');
203
+		$this->_cap_restriction_generators[EEM_Base::caps_edit] = new EE_Restriction_Generator_Reg_Form('QST_system');
204
+		$this->_cap_restriction_generators[EEM_Base::caps_delete] = new EE_Restriction_Generator_Reg_Form('QST_system');
205
+		parent::__construct($timezone);
206 206
 	}
207 207
 
208 208
 	/**
@@ -210,7 +210,7 @@  discard block
 block discarded – undo
210 210
 	 * but they can be extended
211 211
 	 * @return string[]
212 212
 	 */
213
-	public function allowed_question_types(){
213
+	public function allowed_question_types() {
214 214
 		return $this->_allowed_question_types;
215 215
 	}
216 216
 	/**
@@ -218,16 +218,16 @@  discard block
 block discarded – undo
218 218
 	 * @param string $question_type one of EEM_Question::allowed_question_types(
219 219
 	 * @return string[] like EEM_Question::allowed_question_types()
220 220
 	 */
221
-	public function question_types_in_same_category( $question_type ) {
222
-		$question_types = array( $question_type );
223
-		foreach( $this->_question_type_categories as $category => $question_types_in_category ) {
224
-			if( in_array( $question_type, $question_types_in_category ) ) {
221
+	public function question_types_in_same_category($question_type) {
222
+		$question_types = array($question_type);
223
+		foreach ($this->_question_type_categories as $category => $question_types_in_category) {
224
+			if (in_array($question_type, $question_types_in_category)) {
225 225
 				$question_types = $question_types_in_category;
226 226
 				break;
227 227
 			}
228 228
 		}
229 229
 
230
-		return array_intersect_key( $this->allowed_question_types(), array_flip( $question_types ) );
230
+		return array_intersect_key($this->allowed_question_types(), array_flip($question_types));
231 231
 	}
232 232
 
233 233
 	/**
@@ -236,11 +236,11 @@  discard block
 block discarded – undo
236 236
 	 * @param string $category one of the top-level keys of EEM_Question::question_type_categories()
237 237
 	 * @return boolean
238 238
 	 */
239
-	public function question_type_is_in_category( $question_type, $category ) {
240
-		if( ! isset( $this->_question_type_categories[ $category ] ) ) {
239
+	public function question_type_is_in_category($question_type, $category) {
240
+		if ( ! isset($this->_question_type_categories[$category])) {
241 241
 			return false;
242 242
 		}
243
-		return in_array( $question_type, $this->_question_type_categories[ $category ] );
243
+		return in_array($question_type, $this->_question_type_categories[$category]);
244 244
 	}
245 245
 
246 246
 	/**
@@ -257,9 +257,9 @@  discard block
 block discarded – undo
257 257
 	 * @param string $system_question_group_id QSG_system
258 258
 	 * @return array of system question names (QST_system)
259 259
 	 */
260
-	public function allowed_system_questions_in_system_question_group( $system_question_group_id ) {
260
+	public function allowed_system_questions_in_system_question_group($system_question_group_id) {
261 261
 		$question_system_ids = array();
262
-		switch( $system_question_group_id ) {
262
+		switch ($system_question_group_id) {
263 263
 			case EEM_Question_Group::system_personal:
264 264
 				$question_system_ids = array(
265 265
 					EEM_Attendee::system_question_fname,
@@ -280,7 +280,7 @@  discard block
 block discarded – undo
280 280
 				);
281 281
 				break;
282 282
 		}
283
-		return apply_filters( 'FHEE__EEM_Question__system_questions_allowed_in_system_question_group__return', $question_system_ids, $system_question_group_id );
283
+		return apply_filters('FHEE__EEM_Question__system_questions_allowed_in_system_question_group__return', $question_system_ids, $system_question_group_id);
284 284
 	}
285 285
 
286 286
 	/**
@@ -289,11 +289,11 @@  discard block
 block discarded – undo
289 289
 	 * @param string $system_question_group_id QSG_system
290 290
 	 * @return array of system question names (QST_system)
291 291
 	 */
292
-	public function required_system_questions_in_system_question_group( $system_question_group_id ) {
292
+	public function required_system_questions_in_system_question_group($system_question_group_id) {
293 293
 		$question_system_ids = null;
294
-		switch( $system_question_group_id ) {
294
+		switch ($system_question_group_id) {
295 295
 			case EEM_Question_Group::system_personal:
296
-				$question_system_ids =  array(
296
+				$question_system_ids = array(
297 297
 					EEM_Attendee::system_question_fname,
298 298
 					EEM_Attendee::system_question_email,
299 299
 				);
@@ -301,7 +301,7 @@  discard block
 block discarded – undo
301 301
 			default:
302 302
 				$question_system_ids = array();
303 303
 		}
304
-		return apply_filters( 'FHEE__EEM_Question__system_questions_required_in_system_question_group', $question_system_ids, $system_question_group_id );
304
+		return apply_filters('FHEE__EEM_Question__system_questions_required_in_system_question_group', $question_system_ids, $system_question_group_id);
305 305
 	}
306 306
 
307 307
 
@@ -312,8 +312,8 @@  discard block
 block discarded – undo
312 312
 	 * @param $QST_system
313 313
 	 * @return int of QST_ID for the question that corresponds to that QST_system
314 314
 	 */
315
-	public function get_Question_ID_from_system_string( $QST_system ){
316
-		 return $this->get_var( array( array( 'QST_system' => $QST_system ) ) );
315
+	public function get_Question_ID_from_system_string($QST_system) {
316
+		 return $this->get_var(array(array('QST_system' => $QST_system)));
317 317
 	}
318 318
 
319 319
 
@@ -325,10 +325,10 @@  discard block
 block discarded – undo
325 325
 	 */
326 326
 	public function get_latest_question_order() {
327 327
 		$columns_to_select = array(
328
-			'max_order' => array("MAX(QST_order)","%d")
328
+			'max_order' => array("MAX(QST_order)", "%d")
329 329
 		);
330
-		$max = $this->_get_all_wpdb_results( array(), ARRAY_A, $columns_to_select );
331
-		return isset( $max[0], $max[0]['max_order'] ) ? $max[0]['max_order'] : 0;
330
+		$max = $this->_get_all_wpdb_results(array(), ARRAY_A, $columns_to_select);
331
+		return isset($max[0], $max[0]['max_order']) ? $max[0]['max_order'] : 0;
332 332
 	}
333 333
 
334 334
 	/**
@@ -357,10 +357,10 @@  discard block
 block discarded – undo
357 357
 	 * @param string $system_question_value
358 358
 	 * @return int|float
359 359
 	 */
360
-	public function absolute_max_for_system_question( $system_question_value ) {
360
+	public function absolute_max_for_system_question($system_question_value) {
361 361
 		$maxes = $this->system_question_maxes();
362
-		if( isset( $maxes[ $system_question_value ] ) ) {
363
-			return $maxes[ $system_question_value ];
362
+		if (isset($maxes[$system_question_value])) {
363
+			return $maxes[$system_question_value];
364 364
 		} else {
365 365
 			return EE_INF;
366 366
 		}
Please login to merge, or discard this patch.
core/business/EE_Transaction_Payments.class.php 3 patches
Doc Comments   +1 added lines, -1 removed lines patch added patch discarded remove patch
@@ -161,7 +161,7 @@
 block discarded – undo
161 161
 	 * @param EE_Transaction $transaction
162 162
 	 * @param string         $payment_status One of EEM_Payment's statuses, like 'PAP' (Approved).
163 163
 	 *                                       By default, searches for approved payments
164
-	 * @return float|false   float on success, false on fail
164
+	 * @return double   float on success, false on fail
165 165
 	 * @throws \EE_Error
166 166
 	 */
167 167
 	public function recalculate_total_payments_for_transaction( EE_Transaction $transaction, $payment_status = EEM_Payment::status_id_approved ) {
Please login to merge, or discard this patch.
Indentation   +2 added lines, -2 removed lines patch added patch discarded remove patch
@@ -233,8 +233,8 @@
 block discarded – undo
233 233
 					if ( $registration instanceof EE_Registration ) {
234 234
 						$registration->set_paid( $registration->paid() - $amount_paid );
235 235
 						if ($registration->save() !== false) {
236
-						    $registration_payment->delete_permanently();
237
-                            $save_payment = true;
236
+							$registration_payment->delete_permanently();
237
+							$save_payment = true;
238 238
 						}
239 239
 					} else {
240 240
 						EE_Error::add_error(
Please login to merge, or discard this patch.
Spacing   +43 added lines, -43 removed lines patch added patch discarded remove patch
@@ -1,5 +1,5 @@  discard block
 block discarded – undo
1 1
 <?php if ( ! defined('EVENT_ESPRESSO_VERSION')) { exit('No direct script access allowed'); }
2
-EE_Registry::instance()->load_class( 'Processor_Base' );
2
+EE_Registry::instance()->load_class('Processor_Base');
3 3
 
4 4
 /**
5 5
  * Class EE_Transaction_Payments
@@ -42,7 +42,7 @@  discard block
 block discarded – undo
42 42
 	 */
43 43
 	public static function instance() {
44 44
 		// check if class object is instantiated
45
-		if ( ! self::$_instance instanceof EE_Transaction_Payments ) {
45
+		if ( ! self::$_instance instanceof EE_Transaction_Payments) {
46 46
 			self::$_instance = new self();
47 47
 		}
48 48
 		return self::$_instance;
@@ -59,18 +59,18 @@  discard block
 block discarded – undo
59 59
 	 * @return bool true if TXN total was updated, false if not
60 60
 	 * @throws \EE_Error
61 61
 	 */
62
-	public function recalculate_transaction_total( EE_Transaction $transaction, $update_txn = true ) {
62
+	public function recalculate_transaction_total(EE_Transaction $transaction, $update_txn = true) {
63 63
 		$total_line_item = $transaction->total_line_item();
64
-		if ( ! $total_line_item instanceof EE_Line_Item ) {
64
+		if ( ! $total_line_item instanceof EE_Line_Item) {
65 65
 			EE_Error::add_error(
66
-				sprintf( __( 'The Total Line Item for Transaction %1$d\'s was not found or is invalid.', 'event_espresso' ), $transaction->ID() ),
66
+				sprintf(__('The Total Line Item for Transaction %1$d\'s was not found or is invalid.', 'event_espresso'), $transaction->ID()),
67 67
 				__FILE__, __FUNCTION__, __LINE__
68 68
 			);
69 69
 			return false;
70 70
 		}
71 71
 		$new_total = $total_line_item->recalculate_total_including_taxes();
72
-		$transaction->set_total( $new_total );
73
-		if ( $update_txn ) {
72
+		$transaction->set_total($new_total);
73
+		if ($update_txn) {
74 74
 			return $transaction->save() ? true : false;
75 75
 		}
76 76
 		return false;
@@ -93,20 +93,20 @@  discard block
 block discarded – undo
93 93
 	 * @return    boolean        whether the TXN was saved
94 94
 	 * @throws \EE_Error
95 95
 	 */
96
-	public function calculate_total_payments_and_update_status( EE_Transaction $transaction, $update_txn = true ){
96
+	public function calculate_total_payments_and_update_status(EE_Transaction $transaction, $update_txn = true) {
97 97
 		// verify transaction
98
-		if ( ! $transaction instanceof EE_Transaction ) {
99
-			EE_Error::add_error( __( 'Please provide a valid EE_Transaction object.', 'event_espresso' ), __FILE__, __FUNCTION__, __LINE__ );
98
+		if ( ! $transaction instanceof EE_Transaction) {
99
+			EE_Error::add_error(__('Please provide a valid EE_Transaction object.', 'event_espresso'), __FILE__, __FUNCTION__, __LINE__);
100 100
 			return false;
101 101
 		}
102 102
 		// calculate total paid
103
-		$total_paid = $this->recalculate_total_payments_for_transaction( $transaction );
103
+		$total_paid = $this->recalculate_total_payments_for_transaction($transaction);
104 104
 		// if total paid has changed
105
-		if ( $total_paid !== false && (float)$total_paid !== $transaction->paid() ) {
106
-			$transaction->set_paid( $total_paid );
105
+		if ($total_paid !== false && (float) $total_paid !== $transaction->paid()) {
106
+			$transaction->set_paid($total_paid);
107 107
 			// maybe update status, and make sure to save transaction if not done already
108
-			if ( ! $transaction->update_status_based_on_total_paid( $update_txn ) ) {
109
-				if ( $update_txn ) {
108
+			if ( ! $transaction->update_status_based_on_total_paid($update_txn)) {
109
+				if ($update_txn) {
110 110
 					return $transaction->save() ? true : false;
111 111
 				}
112 112
 			} else {
@@ -130,18 +130,18 @@  discard block
 block discarded – undo
130 130
 	 * @return float|false   float on success, false on fail
131 131
 	 * @throws \EE_Error
132 132
 	 */
133
-	public function recalculate_total_payments_for_transaction( EE_Transaction $transaction, $payment_status = EEM_Payment::status_id_approved ) {
133
+	public function recalculate_total_payments_for_transaction(EE_Transaction $transaction, $payment_status = EEM_Payment::status_id_approved) {
134 134
 		// verify transaction
135
-		if ( ! $transaction instanceof EE_Transaction ) {
136
-			EE_Error::add_error( __( 'Please provide a valid EE_Transaction object.', 'event_espresso' ), __FILE__, __FUNCTION__, __LINE__ );
135
+		if ( ! $transaction instanceof EE_Transaction) {
136
+			EE_Error::add_error(__('Please provide a valid EE_Transaction object.', 'event_espresso'), __FILE__, __FUNCTION__, __LINE__);
137 137
 			return false;
138 138
 		}
139 139
 		// ensure Payment model is loaded
140
-		EE_Registry::instance()->load_model( 'Payment' );
140
+		EE_Registry::instance()->load_model('Payment');
141 141
 		// calls EEM_Base::sum()
142 142
 		return EEM_Payment::instance()->sum(
143 143
 			// query params
144
-			array( array( 'TXN_ID' => $transaction->ID(), 'STS_ID' => $payment_status )),
144
+			array(array('TXN_ID' => $transaction->ID(), 'STS_ID' => $payment_status)),
145 145
 			// field to sum
146 146
 			'PAY_amount'
147 147
 		);
@@ -159,17 +159,17 @@  discard block
 block discarded – undo
159 159
 	 * @return boolean
160 160
 	 * @throws \EE_Error
161 161
 	 */
162
-	public function delete_payment_and_update_transaction( EE_Payment $payment ) {
162
+	public function delete_payment_and_update_transaction(EE_Payment $payment) {
163 163
 		// verify payment
164
-		if ( ! $payment instanceof EE_Payment ) {
165
-			EE_Error::add_error( __( 'A valid Payment object was not received.', 'event_espresso' ), __FILE__, __FUNCTION__, __LINE__ );
164
+		if ( ! $payment instanceof EE_Payment) {
165
+			EE_Error::add_error(__('A valid Payment object was not received.', 'event_espresso'), __FILE__, __FUNCTION__, __LINE__);
166 166
 			return false;
167 167
 		}
168
-		if ( ! $this->delete_registration_payments_and_update_registrations( $payment ) ) {
168
+		if ( ! $this->delete_registration_payments_and_update_registrations($payment)) {
169 169
 			return false;
170 170
 		}
171
-		if ( ! $payment->delete() ) {
172
-			EE_Error::add_error( __( 'The payment could not be deleted.', 'event_espresso' ), __FILE__, __FUNCTION__, __LINE__ );
171
+		if ( ! $payment->delete()) {
172
+			EE_Error::add_error(__('The payment could not be deleted.', 'event_espresso'), __FILE__, __FUNCTION__, __LINE__);
173 173
 			return false;
174 174
 		}
175 175
 
@@ -180,14 +180,14 @@  discard block
 block discarded – undo
180 180
 			|| $TXN_status === EEM_Transaction::failed_status_code
181 181
 			|| $payment->amount() === 0
182 182
 		) {
183
-			EE_Error::add_success( __( 'The Payment was successfully deleted.', 'event_espresso' ) );
183
+			EE_Error::add_success(__('The Payment was successfully deleted.', 'event_espresso'));
184 184
 			return true;
185 185
 		}
186 186
 
187 187
 
188 188
 		//if this fails, that just means that the transaction didn't get its status changed and/or updated.
189 189
 		//however the payment was still deleted.
190
-		if ( ! $this->calculate_total_payments_and_update_status( $transaction ) ) {
190
+		if ( ! $this->calculate_total_payments_and_update_status($transaction)) {
191 191
 
192 192
 			EE_Error::add_attention(
193 193
 				__(
@@ -221,17 +221,17 @@  discard block
 block discarded – undo
221 221
 	 * @return bool
222 222
 	 * @throws \EE_Error
223 223
 	 */
224
-	public function delete_registration_payments_and_update_registrations( EE_Payment $payment, $reg_payment_query_params = array() ) {
224
+	public function delete_registration_payments_and_update_registrations(EE_Payment $payment, $reg_payment_query_params = array()) {
225 225
 		$save_payment = false;
226
-		$reg_payment_query_params = ! empty( $reg_payment_query_params ) ? $reg_payment_query_params : array( array( 'PAY_ID' => $payment->ID() ) );
227
-		$registration_payments = EEM_Registration_Payment::instance()->get_all( $reg_payment_query_params );
228
-		if ( ! empty( $registration_payments )) {
229
-			foreach ( $registration_payments as $registration_payment ) {
230
-				if ( $registration_payment instanceof EE_Registration_Payment ) {
226
+		$reg_payment_query_params = ! empty($reg_payment_query_params) ? $reg_payment_query_params : array(array('PAY_ID' => $payment->ID()));
227
+		$registration_payments = EEM_Registration_Payment::instance()->get_all($reg_payment_query_params);
228
+		if ( ! empty($registration_payments)) {
229
+			foreach ($registration_payments as $registration_payment) {
230
+				if ($registration_payment instanceof EE_Registration_Payment) {
231 231
 					$amount_paid = $registration_payment->amount();
232 232
 					$registration = $registration_payment->registration();
233
-					if ( $registration instanceof EE_Registration ) {
234
-						$registration->set_paid( $registration->paid() - $amount_paid );
233
+					if ($registration instanceof EE_Registration) {
234
+						$registration->set_paid($registration->paid() - $amount_paid);
235 235
 						if ($registration->save() !== false) {
236 236
 						    $registration_payment->delete_permanently();
237 237
                             $save_payment = true;
@@ -239,7 +239,7 @@  discard block
 block discarded – undo
239 239
 					} else {
240 240
 						EE_Error::add_error(
241 241
 							sprintf(
242
-								__( 'An invalid Registration object was associated with Registration Payment ID# %1$d.', 'event_espresso' ),
242
+								__('An invalid Registration object was associated with Registration Payment ID# %1$d.', 'event_espresso'),
243 243
 								$registration_payment->ID()
244 244
 							),
245 245
 							__FILE__, __FUNCTION__, __LINE__
@@ -249,7 +249,7 @@  discard block
 block discarded – undo
249 249
 				} else {
250 250
 					EE_Error::add_error(
251 251
 						sprintf(
252
-							__( 'An invalid Registration Payment object was associated with payment ID# %1$d.', 'event_espresso' ),
252
+							__('An invalid Registration Payment object was associated with payment ID# %1$d.', 'event_espresso'),
253 253
 							$payment->ID()
254 254
 						),
255 255
 						__FILE__, __FUNCTION__, __LINE__
@@ -258,7 +258,7 @@  discard block
 block discarded – undo
258 258
 				}
259 259
 			}
260 260
 		}
261
-		if ( $save_payment ) {
261
+		if ($save_payment) {
262 262
 			$payment->save();
263 263
 		}
264 264
 		return true;
@@ -282,7 +282,7 @@  discard block
 block discarded – undo
282 282
 	public function update_transaction_status_based_on_total_paid(EE_Transaction $transaction, $update_txn = true)
283 283
 	{
284 284
 		EE_Error::doing_it_wrong(
285
-			__CLASS__ . '::' . __FUNCTION__,
285
+			__CLASS__.'::'.__FUNCTION__,
286 286
 			sprintf(__('This method is deprecated. Please use "%s" instead', 'event_espresso'),
287 287
 				'EE_Transaction::update_status_based_on_total_paid()'),
288 288
 			'4.9.1',
@@ -324,7 +324,7 @@  discard block
 block discarded – undo
324 324
 	 * @deprecated 4.9.12
325 325
 	 * @param string $old_txn_status
326 326
 	 */
327
-	public function set_old_txn_status( $old_txn_status ) {
327
+	public function set_old_txn_status($old_txn_status) {
328 328
 		EE_Error::doing_it_wrong(
329 329
 			__METHOD__,
330 330
 			esc_html__(
@@ -334,7 +334,7 @@  discard block
 block discarded – undo
334 334
 			'4.9.12'
335 335
 		);
336 336
 		// only set the first time
337
-		if ( $this->_old_txn_status === null ) {
337
+		if ($this->_old_txn_status === null) {
338 338
 			$this->_old_txn_status = $old_txn_status;
339 339
 		}
340 340
 	}
@@ -363,7 +363,7 @@  discard block
 block discarded – undo
363 363
 	 * @deprecated 4.9.12
364 364
 	 * @param string $new_txn_status
365 365
 	 */
366
-	public function set_new_txn_status( $new_txn_status ) {
366
+	public function set_new_txn_status($new_txn_status) {
367 367
 		EE_Error::doing_it_wrong(
368 368
 			__METHOD__,
369 369
 			esc_html__(
Please login to merge, or discard this patch.
core/db_classes/EE_Message_Template_Group.class.php 2 patches
Doc Comments   +1 added lines, -1 removed lines patch added patch discarded remove patch
@@ -224,7 +224,7 @@
 block discarded – undo
224 224
 	 * appropriately.
225 225
 	 *
226 226
 	 * @throws EE_Error
227
-	 * @return EE_message_type|false if exception thrown.
227
+	 * @return null|EE_message_type if exception thrown.
228 228
 	 */
229 229
 	public function message_type_obj() {
230 230
 		$message_type = $this->message_type();
Please login to merge, or discard this patch.
Spacing   +51 added lines, -51 removed lines patch added patch discarded remove patch
@@ -1,5 +1,5 @@  discard block
 block discarded – undo
1
-<?php if ( !defined( 'EVENT_ESPRESSO_VERSION' ) ) {
2
-	exit( 'No direct script access allowed' );
1
+<?php if ( ! defined('EVENT_ESPRESSO_VERSION')) {
2
+	exit('No direct script access allowed');
3 3
 }
4 4
 /**
5 5
  * EE_Message_Template_Group class
@@ -18,9 +18,9 @@  discard block
 block discarded – undo
18 18
 	 * @param string $timezone
19 19
 	 * @return EE_Message_Template_Group|mixed
20 20
 	 */
21
-	public static function new_instance( $props_n_values = array(), $timezone = '' ) {
22
-		$has_object = parent::_check_for_object( $props_n_values, __CLASS__, $timezone );
23
-		return $has_object ? $has_object : new self( $props_n_values, FALSE, $timezone );
21
+	public static function new_instance($props_n_values = array(), $timezone = '') {
22
+		$has_object = parent::_check_for_object($props_n_values, __CLASS__, $timezone);
23
+		return $has_object ? $has_object : new self($props_n_values, FALSE, $timezone);
24 24
 	}
25 25
 
26 26
 
@@ -30,8 +30,8 @@  discard block
 block discarded – undo
30 30
 	 * @param string $timezone
31 31
 	 * @return EE_Message_Template_Group
32 32
 	 */
33
-	public static function new_instance_from_db( $props_n_values = array(), $timezone = '' ) {
34
-		return new self( $props_n_values, TRUE, $timezone );
33
+	public static function new_instance_from_db($props_n_values = array(), $timezone = '') {
34
+		return new self($props_n_values, TRUE, $timezone);
35 35
 	}
36 36
 
37 37
 
@@ -40,11 +40,11 @@  discard block
 block discarded – undo
40 40
 	 * @param bool $message_type
41 41
 	 * @throws EE_Error
42 42
 	 */
43
-	public function set_message_type( $message_type = FALSE ) {
44
-		if ( ! $message_type ) {
45
-			throw new EE_Error( __( 'Missing required value for the message_type parameter', 'event_espresso' ) );
43
+	public function set_message_type($message_type = FALSE) {
44
+		if ( ! $message_type) {
45
+			throw new EE_Error(__('Missing required value for the message_type parameter', 'event_espresso'));
46 46
 		}
47
-		$this->set( 'MTP_message_type', $message_type );
47
+		$this->set('MTP_message_type', $message_type);
48 48
 	}
49 49
 
50 50
 
@@ -53,11 +53,11 @@  discard block
 block discarded – undo
53 53
 	 * @param bool $messenger
54 54
 	 * @throws EE_Error
55 55
 	 */
56
-	public function set_messenger( $messenger = FALSE ) {
57
-		if ( ! $messenger ) {
58
-			throw new EE_Error( __( 'Missing required value for the messenger parameter', 'event_espresso' ) );
56
+	public function set_messenger($messenger = FALSE) {
57
+		if ( ! $messenger) {
58
+			throw new EE_Error(__('Missing required value for the messenger parameter', 'event_espresso'));
59 59
 		}
60
-		$this->set( 'MTP_messenger', $messenger );
60
+		$this->set('MTP_messenger', $messenger);
61 61
 	}
62 62
 
63 63
 
@@ -66,11 +66,11 @@  discard block
 block discarded – undo
66 66
 	 * @param bool $GRP_ID
67 67
 	 * @throws EE_Error
68 68
 	 */
69
-	public function set_group_template_id( $GRP_ID = FALSE ) {
70
-		if ( ! $GRP_ID ) {
71
-			throw new EE_Error( __( 'Missing required value for the message template group id', 'event_espresso' ) );
69
+	public function set_group_template_id($GRP_ID = FALSE) {
70
+		if ( ! $GRP_ID) {
71
+			throw new EE_Error(__('Missing required value for the message template group id', 'event_espresso'));
72 72
 		}
73
-		$this->set( 'GRP_ID', $GRP_ID );
73
+		$this->set('GRP_ID', $GRP_ID);
74 74
 	}
75 75
 
76 76
 
@@ -81,7 +81,7 @@  discard block
 block discarded – undo
81 81
 	 * @return int
82 82
 	 */
83 83
 	public function GRP_ID() {
84
-		return $this->get( 'GRP_ID' );
84
+		return $this->get('GRP_ID');
85 85
 	}
86 86
 
87 87
 
@@ -92,8 +92,8 @@  discard block
 block discarded – undo
92 92
 	 * @return int
93 93
 	 */
94 94
 	public function user() {
95
-		$user_id = $this->get( 'MTP_user_id' );
96
-		return empty( $user_id ) ? get_current_user_id() : $user_id;
95
+		$user_id = $this->get('MTP_user_id');
96
+		return empty($user_id) ? get_current_user_id() : $user_id;
97 97
 	}
98 98
 
99 99
 
@@ -116,7 +116,7 @@  discard block
 block discarded – undo
116 116
 	 * @return int
117 117
 	 */
118 118
 	public function count_events() {
119
-		return $this->count_related( 'Event' );
119
+		return $this->count_related('Event');
120 120
 	}
121 121
 
122 122
 
@@ -126,7 +126,7 @@  discard block
 block discarded – undo
126 126
 	 * @return string
127 127
 	 */
128 128
 	public function name() {
129
-		return $this->get( 'MTP_name' );
129
+		return $this->get('MTP_name');
130 130
 	}
131 131
 
132 132
 
@@ -136,7 +136,7 @@  discard block
 block discarded – undo
136 136
 	 * @return string
137 137
 	 */
138 138
 	public function description() {
139
-		return $this->get( 'MTP_description' );
139
+		return $this->get('MTP_description');
140 140
 	}
141 141
 
142 142
 
@@ -146,8 +146,8 @@  discard block
 block discarded – undo
146 146
 	 * @param  array $query_params like EEM_Base::get_all()
147 147
 	 * @return EE_Message_Template[]
148 148
 	 */
149
-	public function message_templates( $query_params = array() ) {
150
-		return $this->get_many_related( 'Message_Template', $query_params );
149
+	public function message_templates($query_params = array()) {
150
+		return $this->get_many_related('Message_Template', $query_params);
151 151
 	}
152 152
 
153 153
 
@@ -158,7 +158,7 @@  discard block
 block discarded – undo
158 158
 	 * @return string
159 159
 	 */
160 160
 	public function messenger() {
161
-		return $this->get( 'MTP_messenger' );
161
+		return $this->get('MTP_messenger');
162 162
 	}
163 163
 
164 164
 
@@ -175,10 +175,10 @@  discard block
 block discarded – undo
175 175
 	public function messenger_obj() {
176 176
 		$messenger = $this->messenger();
177 177
 		try {
178
-			$messenger = EEH_MSG_Template::messenger_obj( $messenger );
179
-		} catch( EE_Error $e ) {
178
+			$messenger = EEH_MSG_Template::messenger_obj($messenger);
179
+		} catch (EE_Error $e) {
180 180
 			//if an exception was thrown then let's deactivate this message template group because it means there is no class for this messenger in this group.
181
-			$this->set( 'MTP_is_active', false );
181
+			$this->set('MTP_is_active', false);
182 182
 			$this->save();
183 183
 			return null;
184 184
 		}
@@ -194,7 +194,7 @@  discard block
 block discarded – undo
194 194
 	 * @return string
195 195
 	 */
196 196
 	public function message_type() {
197
-		return $this->get( 'MTP_message_type' );
197
+		return $this->get('MTP_message_type');
198 198
 	}
199 199
 
200 200
 
@@ -212,10 +212,10 @@  discard block
 block discarded – undo
212 212
 	public function message_type_obj() {
213 213
 		$message_type = $this->message_type();
214 214
 		try {
215
-			$message_type = EEH_MSG_Template::message_type_obj( $message_type );
216
-		} catch(EE_Error $e) {
215
+			$message_type = EEH_MSG_Template::message_type_obj($message_type);
216
+		} catch (EE_Error $e) {
217 217
 			//if an exception was thrown then let's deactivate this message template group because it means there is no class for the message type in this group.
218
-			$this->set( 'MTP_is_active', false );
218
+			$this->set('MTP_is_active', false);
219 219
 			$this->save();
220 220
 			return null;
221 221
 		}
@@ -252,13 +252,13 @@  discard block
 block discarded – undo
252 252
 	 */
253 253
 	public function context_templates() {
254 254
 		$mtps_arr = array();
255
-		$mtps = $this->get_many_related( 'Message_Template' );
256
-		if ( empty( $mtps ) ) {
255
+		$mtps = $this->get_many_related('Message_Template');
256
+		if (empty($mtps)) {
257 257
 			return array();
258 258
 		}
259 259
 		//note contexts could have CHECKBOX fields per context. So we return the objects indexed by context AND field.
260
-		foreach ( $mtps as $mtp ) {
261
-			$mtps_arr[ $mtp->get( 'MTP_context' ) ][ $mtp->get( 'MTP_template_field' ) ] = $mtp;
260
+		foreach ($mtps as $mtp) {
261
+			$mtps_arr[$mtp->get('MTP_context')][$mtp->get('MTP_template_field')] = $mtp;
262 262
 		}
263 263
 		return $mtps_arr;
264 264
 	}
@@ -270,7 +270,7 @@  discard block
 block discarded – undo
270 270
 	 * @return boolean true if it is, false if it isn't
271 271
 	 */
272 272
 	public function is_global() {
273
-		return $this->get( 'MTP_is_global' );
273
+		return $this->get('MTP_is_global');
274 274
 	}
275 275
 
276 276
 
@@ -280,7 +280,7 @@  discard block
 block discarded – undo
280 280
 	 * @return boolean true if it is, false if it isn't
281 281
 	 */
282 282
 	public function is_active() {
283
-		return $this->get( 'MTP_is_active' );
283
+		return $this->get('MTP_is_active');
284 284
 	}
285 285
 
286 286
 
@@ -296,10 +296,10 @@  discard block
 block discarded – undo
296 296
 	 * @param bool   $merged  If TRUE then we don't return shortcodes indexed by field but instead an array of the unique shortcodes for all the given (or all) fields.
297 297
 	 * @return mixed (array|bool) an array of shortcodes in the format array( '[shortcode] => 'label') OR FALSE if no shortcodes found.
298 298
 	 */
299
-	public function get_shortcodes( $context, $fields = array(), $merged = FALSE ) {
299
+	public function get_shortcodes($context, $fields = array(), $merged = FALSE) {
300 300
 		$messenger = $this->messenger();
301 301
 		$message_type = $this->message_type();
302
-		return EEH_MSG_Template::get_shortcodes( $message_type, $messenger, $fields, $context, $merged );
302
+		return EEH_MSG_Template::get_shortcodes($message_type, $messenger, $fields, $context, $merged);
303 303
 	}
304 304
 
305 305
 
@@ -340,7 +340,7 @@  discard block
 block discarded – undo
340 340
 	 * @return string
341 341
 	 */
342 342
 	public function get_template_pack_name() {
343
-		return $this->get_extra_meta( 'MTP_template_pack', true, 'default' );
343
+		return $this->get_extra_meta('MTP_template_pack', true, 'default');
344 344
 	}
345 345
 
346 346
 
@@ -355,8 +355,8 @@  discard block
 block discarded – undo
355 355
 	 */
356 356
 	public function get_template_pack() {
357 357
 		$pack_name = $this->get_template_pack_name();
358
-		EE_Registry::instance()->load_helper( 'MSG_Template' );
359
-		return EEH_MSG_Template::get_template_pack( $pack_name );
358
+		EE_Registry::instance()->load_helper('MSG_Template');
359
+		return EEH_MSG_Template::get_template_pack($pack_name);
360 360
 	}
361 361
 
362 362
 
@@ -369,7 +369,7 @@  discard block
 block discarded – undo
369 369
 	 * @return string
370 370
 	 */
371 371
 	public function get_template_pack_variation() {
372
-		return $this->get_extra_meta( 'MTP_variation', TRUE, 'default' );
372
+		return $this->get_extra_meta('MTP_variation', TRUE, 'default');
373 373
 	}
374 374
 
375 375
 
@@ -381,8 +381,8 @@  discard block
 block discarded – undo
381 381
 	 * @param string $template_pack_name What message template pack is assigned.
382 382
 	 * @return int
383 383
 	 */
384
-	public function set_template_pack_name( $template_pack_name ) {
385
-		return $this->update_extra_meta( 'MTP_template_pack', $template_pack_name );
384
+	public function set_template_pack_name($template_pack_name) {
385
+		return $this->update_extra_meta('MTP_template_pack', $template_pack_name);
386 386
 	}
387 387
 
388 388
 
@@ -394,8 +394,8 @@  discard block
 block discarded – undo
394 394
 	 * @param string $variation What variation is being set on the message template group.
395 395
 	 * @return int
396 396
 	 */
397
-	public function set_template_pack_variation( $variation ) {
398
-		return $this->update_extra_meta( 'MTP_variation', $variation );
397
+	public function set_template_pack_variation($variation) {
398
+		return $this->update_extra_meta('MTP_variation', $variation);
399 399
 	}
400 400
 }
401 401
 //end EE_Message_Template_Group class
Please login to merge, or discard this patch.
core/db_classes/EE_Payment.class.php 3 patches
Doc Comments   +2 added lines, -2 removed lines patch added patch discarded remove patch
@@ -15,7 +15,7 @@  discard block
 block discarded – undo
15 15
 	 * @param array  $props_n_values          incoming values
16 16
 	 * @param string $timezone                incoming timezone (if not set the timezone set for the website will be
17 17
 	 *                                        used.)
18
-	 * @param array  $date_formats            incoming date_formats in an array where the first value is the
18
+	 * @param string[]  $date_formats            incoming date_formats in an array where the first value is the
19 19
 	 *                                        date_format and the second value is the time format
20 20
 	 * @return EE_Payment
21 21
 	 * @throws \EE_Error
@@ -590,7 +590,7 @@  discard block
 block discarded – undo
590 590
 	 * Gets all the extra meta info on this payment
591 591
 	 *
592 592
 	 * @param array $query_params like EEM_Base::get_all
593
-	 * @return EE_Extra_Meta
593
+	 * @return EE_Base_Class[]
594 594
 	 * @throws \EE_Error
595 595
 	 */
596 596
 	public function extra_meta( $query_params = array() ) {
Please login to merge, or discard this patch.
Spacing   +104 added lines, -104 removed lines patch added patch discarded remove patch
@@ -1,5 +1,5 @@  discard block
 block discarded – undo
1
-<?php if ( ! defined( 'EVENT_ESPRESSO_VERSION' ) ) {
2
-	exit( 'No direct script access allowed' );
1
+<?php if ( ! defined('EVENT_ESPRESSO_VERSION')) {
2
+	exit('No direct script access allowed');
3 3
 }
4 4
 
5 5
 /**
@@ -20,9 +20,9 @@  discard block
 block discarded – undo
20 20
 	 * @return EE_Payment
21 21
 	 * @throws \EE_Error
22 22
 	 */
23
-	public static function new_instance( $props_n_values = array(), $timezone = null, $date_formats = array() ) {
24
-		$has_object = parent::_check_for_object( $props_n_values, __CLASS__, $timezone, $date_formats );
25
-		return $has_object ? $has_object : new self( $props_n_values, false, $timezone, $date_formats );
23
+	public static function new_instance($props_n_values = array(), $timezone = null, $date_formats = array()) {
24
+		$has_object = parent::_check_for_object($props_n_values, __CLASS__, $timezone, $date_formats);
25
+		return $has_object ? $has_object : new self($props_n_values, false, $timezone, $date_formats);
26 26
 	}
27 27
 
28 28
 
@@ -34,8 +34,8 @@  discard block
 block discarded – undo
34 34
 	 * @return EE_Payment
35 35
 	 * @throws \EE_Error
36 36
 	 */
37
-	public static function new_instance_from_db( $props_n_values = array(), $timezone = null ) {
38
-		return new self( $props_n_values, true, $timezone );
37
+	public static function new_instance_from_db($props_n_values = array(), $timezone = null) {
38
+		return new self($props_n_values, true, $timezone);
39 39
 	}
40 40
 
41 41
 
@@ -47,8 +47,8 @@  discard block
 block discarded – undo
47 47
 	 * @param int $TXN_ID
48 48
 	 * @throws \EE_Error
49 49
 	 */
50
-	public function set_transaction_id( $TXN_ID = 0 ) {
51
-		$this->set( 'TXN_ID', $TXN_ID );
50
+	public function set_transaction_id($TXN_ID = 0) {
51
+		$this->set('TXN_ID', $TXN_ID);
52 52
 	}
53 53
 
54 54
 
@@ -60,7 +60,7 @@  discard block
 block discarded – undo
60 60
 	 * @throws \EE_Error
61 61
 	 */
62 62
 	public function transaction() {
63
-		return $this->get_first_related( 'Transaction' );
63
+		return $this->get_first_related('Transaction');
64 64
 	}
65 65
 
66 66
 
@@ -72,8 +72,8 @@  discard block
 block discarded – undo
72 72
 	 * @param string $STS_ID
73 73
 	 * @throws \EE_Error
74 74
 	 */
75
-	public function set_status( $STS_ID = '' ) {
76
-		$this->set( 'STS_ID', $STS_ID );
75
+	public function set_status($STS_ID = '') {
76
+		$this->set('STS_ID', $STS_ID);
77 77
 	}
78 78
 
79 79
 
@@ -85,8 +85,8 @@  discard block
 block discarded – undo
85 85
 	 * @param int $timestamp
86 86
 	 * @throws \EE_Error
87 87
 	 */
88
-	public function set_timestamp( $timestamp = 0 ) {
89
-		$this->set( 'PAY_timestamp', $timestamp );
88
+	public function set_timestamp($timestamp = 0) {
89
+		$this->set('PAY_timestamp', $timestamp);
90 90
 	}
91 91
 
92 92
 
@@ -98,8 +98,8 @@  discard block
 block discarded – undo
98 98
 	 * @param string $PAY_source
99 99
 	 * @throws \EE_Error
100 100
 	 */
101
-	public function set_source( $PAY_source = '' ) {
102
-		$this->set( 'PAY_source', $PAY_source );
101
+	public function set_source($PAY_source = '') {
102
+		$this->set('PAY_source', $PAY_source);
103 103
 	}
104 104
 
105 105
 
@@ -111,8 +111,8 @@  discard block
 block discarded – undo
111 111
 	 * @param float $amount
112 112
 	 * @throws \EE_Error
113 113
 	 */
114
-	public function set_amount( $amount = 0.00 ) {
115
-		$this->set( 'PAY_amount', (float)$amount );
114
+	public function set_amount($amount = 0.00) {
115
+		$this->set('PAY_amount', (float) $amount);
116 116
 	}
117 117
 
118 118
 
@@ -124,8 +124,8 @@  discard block
 block discarded – undo
124 124
 	 * @param string $gateway_response
125 125
 	 * @throws \EE_Error
126 126
 	 */
127
-	public function set_gateway_response( $gateway_response = '' ) {
128
-		$this->set( 'PAY_gateway_response', $gateway_response );
127
+	public function set_gateway_response($gateway_response = '') {
128
+		$this->set('PAY_gateway_response', $gateway_response);
129 129
 	}
130 130
 
131 131
 
@@ -148,7 +148,7 @@  discard block
 block discarded – undo
148 148
 			),
149 149
 			'4.6.0'
150 150
 		);
151
-		return $this->payment_method() ? $this->payment_method()->name() : __( 'Unknown', 'event_espresso' );
151
+		return $this->payment_method() ? $this->payment_method()->name() : __('Unknown', 'event_espresso');
152 152
 	}
153 153
 
154 154
 
@@ -160,8 +160,8 @@  discard block
 block discarded – undo
160 160
 	 * @param string $txn_id_chq_nmbr
161 161
 	 * @throws \EE_Error
162 162
 	 */
163
-	public function set_txn_id_chq_nmbr( $txn_id_chq_nmbr = '' ) {
164
-		$this->set( 'PAY_txn_id_chq_nmbr', $txn_id_chq_nmbr );
163
+	public function set_txn_id_chq_nmbr($txn_id_chq_nmbr = '') {
164
+		$this->set('PAY_txn_id_chq_nmbr', $txn_id_chq_nmbr);
165 165
 	}
166 166
 
167 167
 
@@ -173,8 +173,8 @@  discard block
 block discarded – undo
173 173
 	 * @param string $po_number
174 174
 	 * @throws \EE_Error
175 175
 	 */
176
-	public function set_po_number( $po_number = '' ) {
177
-		$this->set( 'PAY_po_number', $po_number );
176
+	public function set_po_number($po_number = '') {
177
+		$this->set('PAY_po_number', $po_number);
178 178
 	}
179 179
 
180 180
 
@@ -186,8 +186,8 @@  discard block
 block discarded – undo
186 186
 	 * @param string $extra_accntng
187 187
 	 * @throws \EE_Error
188 188
 	 */
189
-	public function set_extra_accntng( $extra_accntng = '' ) {
190
-		$this->set( 'PAY_extra_accntng', $extra_accntng );
189
+	public function set_extra_accntng($extra_accntng = '') {
190
+		$this->set('PAY_extra_accntng', $extra_accntng);
191 191
 	}
192 192
 
193 193
 
@@ -199,11 +199,11 @@  discard block
 block discarded – undo
199 199
 	 * @param bool $via_admin
200 200
 	 * @throws \EE_Error
201 201
 	 */
202
-	public function set_payment_made_via_admin( $via_admin = false ) {
203
-		if ( $via_admin ) {
204
-			$this->set( 'PAY_source', EEM_Payment_Method::scope_admin );
202
+	public function set_payment_made_via_admin($via_admin = false) {
203
+		if ($via_admin) {
204
+			$this->set('PAY_source', EEM_Payment_Method::scope_admin);
205 205
 		} else {
206
-			$this->set( 'PAY_source', EEM_Payment_Method::scope_cart );
206
+			$this->set('PAY_source', EEM_Payment_Method::scope_cart);
207 207
 		}
208 208
 	}
209 209
 
@@ -216,13 +216,13 @@  discard block
 block discarded – undo
216 216
 	 * @param string|array $details
217 217
 	 * @throws \EE_Error
218 218
 	 */
219
-	public function set_details( $details = '' ) {
220
-		if ( is_array( $details ) ) {
221
-			array_walk_recursive( $details, array( $this, '_strip_all_tags_within_array' ) );
219
+	public function set_details($details = '') {
220
+		if (is_array($details)) {
221
+			array_walk_recursive($details, array($this, '_strip_all_tags_within_array'));
222 222
 		} else {
223
-			$details = wp_strip_all_tags( $details );
223
+			$details = wp_strip_all_tags($details);
224 224
 		}
225
-		$this->set( 'PAY_details', $details );
225
+		$this->set('PAY_details', $details);
226 226
 	}
227 227
 
228 228
 
@@ -233,8 +233,8 @@  discard block
 block discarded – undo
233 233
 	 * @param string $redirect_url
234 234
 	 * @throws \EE_Error
235 235
 	 */
236
-	public function set_redirect_url( $redirect_url ) {
237
-		$this->set( 'PAY_redirect_url', $redirect_url );
236
+	public function set_redirect_url($redirect_url) {
237
+		$this->set('PAY_redirect_url', $redirect_url);
238 238
 	}
239 239
 
240 240
 
@@ -245,8 +245,8 @@  discard block
 block discarded – undo
245 245
 	 * @param array $redirect_args
246 246
 	 * @throws \EE_Error
247 247
 	 */
248
-	public function set_redirect_args( $redirect_args ) {
249
-		$this->set( 'PAY_redirect_args', $redirect_args );
248
+	public function set_redirect_args($redirect_args) {
249
+		$this->set('PAY_redirect_args', $redirect_args);
250 250
 	}
251 251
 
252 252
 
@@ -258,7 +258,7 @@  discard block
 block discarded – undo
258 258
 	 * @throws \EE_Error
259 259
 	 */
260 260
 	public function TXN_ID() {
261
-		return $this->get( 'TXN_ID' );
261
+		return $this->get('TXN_ID');
262 262
 	}
263 263
 
264 264
 
@@ -270,7 +270,7 @@  discard block
 block discarded – undo
270 270
 	 * @throws \EE_Error
271 271
 	 */
272 272
 	public function status() {
273
-		return $this->get( 'STS_ID' );
273
+		return $this->get('STS_ID');
274 274
 	}
275 275
 
276 276
 
@@ -282,7 +282,7 @@  discard block
 block discarded – undo
282 282
 	 * @throws \EE_Error
283 283
 	 */
284 284
 	public function STS_ID() {
285
-		return $this->get( 'STS_ID' );
285
+		return $this->get('STS_ID');
286 286
 	}
287 287
 
288 288
 
@@ -296,8 +296,8 @@  discard block
 block discarded – undo
296 296
 	 * @return string
297 297
 	 * @throws \EE_Error
298 298
 	 */
299
-	public function timestamp( $dt_frmt = '', $tm_frmt = '' ) {
300
-		return $this->get_i18n_datetime( 'PAY_timestamp', trim( $dt_frmt . ' ' . $tm_frmt) );
299
+	public function timestamp($dt_frmt = '', $tm_frmt = '') {
300
+		return $this->get_i18n_datetime('PAY_timestamp', trim($dt_frmt.' '.$tm_frmt));
301 301
 	}
302 302
 
303 303
 
@@ -309,7 +309,7 @@  discard block
 block discarded – undo
309 309
 	 * @throws \EE_Error
310 310
 	 */
311 311
 	public function source() {
312
-		return $this->get( 'PAY_source' );
312
+		return $this->get('PAY_source');
313 313
 	}
314 314
 
315 315
 
@@ -322,7 +322,7 @@  discard block
 block discarded – undo
322 322
 	 * @throws \EE_Error
323 323
 	 */
324 324
 	public function amount() {
325
-		return (float)$this->get( 'PAY_amount' );
325
+		return (float) $this->get('PAY_amount');
326 326
 	}
327 327
 
328 328
 
@@ -332,7 +332,7 @@  discard block
 block discarded – undo
332 332
 	 * @throws \EE_Error
333 333
 	 */
334 334
 	public function amount_no_code() {
335
-		return $this->get_pretty( 'PAY_amount', 'no_currency_code' );
335
+		return $this->get_pretty('PAY_amount', 'no_currency_code');
336 336
 	}
337 337
 
338 338
 
@@ -344,7 +344,7 @@  discard block
 block discarded – undo
344 344
 	 * @throws \EE_Error
345 345
 	 */
346 346
 	public function gateway_response() {
347
-		return $this->get( 'PAY_gateway_response' );
347
+		return $this->get('PAY_gateway_response');
348 348
 	}
349 349
 
350 350
 
@@ -356,7 +356,7 @@  discard block
 block discarded – undo
356 356
 	 * @throws \EE_Error
357 357
 	 */
358 358
 	public function txn_id_chq_nmbr() {
359
-		return $this->get( 'PAY_txn_id_chq_nmbr' );
359
+		return $this->get('PAY_txn_id_chq_nmbr');
360 360
 	}
361 361
 
362 362
 
@@ -368,7 +368,7 @@  discard block
 block discarded – undo
368 368
 	 * @throws \EE_Error
369 369
 	 */
370 370
 	public function po_number() {
371
-		return $this->get( 'PAY_po_number' );
371
+		return $this->get('PAY_po_number');
372 372
 	}
373 373
 
374 374
 
@@ -380,7 +380,7 @@  discard block
 block discarded – undo
380 380
 	 * @throws \EE_Error
381 381
 	 */
382 382
 	public function extra_accntng() {
383
-		return $this->get( 'PAY_extra_accntng' );
383
+		return $this->get('PAY_extra_accntng');
384 384
 	}
385 385
 
386 386
 
@@ -392,7 +392,7 @@  discard block
 block discarded – undo
392 392
 	 * @throws \EE_Error
393 393
 	 */
394 394
 	public function payment_made_via_admin() {
395
-		return ( $this->get( 'PAY_source' ) === EEM_Payment_Method::scope_admin );
395
+		return ($this->get('PAY_source') === EEM_Payment_Method::scope_admin);
396 396
 	}
397 397
 
398 398
 
@@ -404,7 +404,7 @@  discard block
 block discarded – undo
404 404
 	 * @throws \EE_Error
405 405
 	 */
406 406
 	public function details() {
407
-		return $this->get( 'PAY_details' );
407
+		return $this->get('PAY_details');
408 408
 	}
409 409
 
410 410
 
@@ -416,7 +416,7 @@  discard block
 block discarded – undo
416 416
 	 * @throws \EE_Error
417 417
 	 */
418 418
 	public function redirect_url() {
419
-		return $this->get( 'PAY_redirect_url' );
419
+		return $this->get('PAY_redirect_url');
420 420
 	}
421 421
 
422 422
 
@@ -428,7 +428,7 @@  discard block
 block discarded – undo
428 428
 	 * @throws \EE_Error
429 429
 	 */
430 430
 	public function redirect_args() {
431
-		return $this->get( 'PAY_redirect_args' );
431
+		return $this->get('PAY_redirect_args');
432 432
 	}
433 433
 
434 434
 
@@ -440,8 +440,8 @@  discard block
 block discarded – undo
440 440
 	 * @return void
441 441
 	 * @throws \EE_Error
442 442
 	 */
443
-	public function e_pretty_status( $show_icons = false ) {
444
-		echo $this->pretty_status( $show_icons );
443
+	public function e_pretty_status($show_icons = false) {
444
+		echo $this->pretty_status($show_icons);
445 445
 	}
446 446
 
447 447
 
@@ -453,14 +453,14 @@  discard block
 block discarded – undo
453 453
 	 * @return string
454 454
 	 * @throws \EE_Error
455 455
 	 */
456
-	public function pretty_status( $show_icons = false ) {
456
+	public function pretty_status($show_icons = false) {
457 457
 		$status = EEM_Status::instance()->localized_status(
458
-			array( $this->STS_ID() => __( 'unknown', 'event_espresso' ) ),
458
+			array($this->STS_ID() => __('unknown', 'event_espresso')),
459 459
 			false,
460 460
 			'sentence'
461 461
 		);
462 462
 		$icon = '';
463
-		switch ( $this->STS_ID() ) {
463
+		switch ($this->STS_ID()) {
464 464
 			case EEM_Payment::status_id_approved:
465 465
 				$icon = $show_icons
466 466
 					? '<span class="dashicons dashicons-yes ee-icon-size-24 green-text"></span>'
@@ -482,7 +482,7 @@  discard block
 block discarded – undo
482 482
 					: '';
483 483
 				break;
484 484
 		}
485
-		return $icon . $status[ $this->STS_ID() ];
485
+		return $icon.$status[$this->STS_ID()];
486 486
 	}
487 487
 
488 488
 
@@ -494,7 +494,7 @@  discard block
 block discarded – undo
494 494
 	 * @throws \EE_Error
495 495
 	 */
496 496
 	public function is_approved() {
497
-		return $this->status_is( EEM_Payment::status_id_approved );
497
+		return $this->status_is(EEM_Payment::status_id_approved);
498 498
 	}
499 499
 
500 500
 
@@ -508,7 +508,7 @@  discard block
 block discarded – undo
508 508
 	 * @return boolean whether the status of this payment equals the status id
509 509
 	 * @throws \EE_Error
510 510
 	 */
511
-	protected function status_is( $STS_ID ) {
511
+	protected function status_is($STS_ID) {
512 512
 		return $STS_ID === $this->STS_ID() ? true : false;
513 513
 	}
514 514
 
@@ -521,7 +521,7 @@  discard block
 block discarded – undo
521 521
 	 * @throws \EE_Error
522 522
 	 */
523 523
 	public function is_pending() {
524
-		return $this->status_is( EEM_Payment::status_id_pending );
524
+		return $this->status_is(EEM_Payment::status_id_pending);
525 525
 	}
526 526
 
527 527
 
@@ -533,7 +533,7 @@  discard block
 block discarded – undo
533 533
 	 * @throws \EE_Error
534 534
 	 */
535 535
 	public function is_cancelled() {
536
-		return $this->status_is( EEM_Payment::status_id_cancelled );
536
+		return $this->status_is(EEM_Payment::status_id_cancelled);
537 537
 	}
538 538
 
539 539
 
@@ -545,7 +545,7 @@  discard block
 block discarded – undo
545 545
 	 * @throws \EE_Error
546 546
 	 */
547 547
 	public function is_declined() {
548
-		return $this->status_is( EEM_Payment::status_id_declined );
548
+		return $this->status_is(EEM_Payment::status_id_declined);
549 549
 	}
550 550
 
551 551
 
@@ -557,7 +557,7 @@  discard block
 block discarded – undo
557 557
 	 * @throws \EE_Error
558 558
 	 */
559 559
 	public function is_failed() {
560
-		return $this->status_is( EEM_Payment::status_id_failed );
560
+		return $this->status_is(EEM_Payment::status_id_failed);
561 561
 	}
562 562
 
563 563
 
@@ -581,7 +581,7 @@  discard block
 block discarded – undo
581 581
 	 * @throws \EE_Error
582 582
 	 */
583 583
 	public function status_obj() {
584
-		return $this->get_first_related( 'Status' );
584
+		return $this->get_first_related('Status');
585 585
 	}
586 586
 
587 587
 
@@ -593,8 +593,8 @@  discard block
 block discarded – undo
593 593
 	 * @return EE_Extra_Meta
594 594
 	 * @throws \EE_Error
595 595
 	 */
596
-	public function extra_meta( $query_params = array() ) {
597
-		return $this->get_many_related( 'Extra_Meta', $query_params );
596
+	public function extra_meta($query_params = array()) {
597
+		return $this->get_many_related('Extra_Meta', $query_params);
598 598
 	}
599 599
 
600 600
 
@@ -608,7 +608,7 @@  discard block
 block discarded – undo
608 608
 	 * @throws \EE_Error
609 609
 	 */
610 610
 	public function payment_method() {
611
-		return $this->get_first_related( 'Payment_Method' );
611
+		return $this->get_first_related('Payment_Method');
612 612
 	}
613 613
 
614 614
 
@@ -626,18 +626,18 @@  discard block
 block discarded – undo
626 626
 	 * @return string html
627 627
 	 * @throws \EE_Error
628 628
 	 */
629
-	public function redirect_form( $inside_form_html = null ) {
629
+	public function redirect_form($inside_form_html = null) {
630 630
 		$redirect_url = $this->redirect_url();
631
-		if ( ! empty( $redirect_url ) ) {
631
+		if ( ! empty($redirect_url)) {
632 632
 			// what ? no inner form content?
633
-			if ( $inside_form_html === null ) {
633
+			if ($inside_form_html === null) {
634 634
 				$inside_form_html = EEH_HTML::p(
635 635
 					sprintf(
636 636
 						__(
637 637
 							'If you are not automatically redirected to the payment website within 10 seconds... %1$s %2$s Click Here %3$s',
638 638
 							'event_espresso'
639 639
 						),
640
-						EEH_HTML::br( 2 ),
640
+						EEH_HTML::br(2),
641 641
 						'<input type="submit" value="',
642 642
 						'">'
643 643
 					),
@@ -653,22 +653,22 @@  discard block
 block discarded – undo
653 653
 			);
654 654
 			//if it's a GET request, we need to remove all the GET params in the querystring
655 655
 			//and put them into the form instead
656
-			if ( $method === 'GET' ) {
657
-				$querystring = parse_url( $redirect_url, PHP_URL_QUERY );
656
+			if ($method === 'GET') {
657
+				$querystring = parse_url($redirect_url, PHP_URL_QUERY);
658 658
 				$get_params = null;
659
-				parse_str( $querystring, $get_params );
660
-				$inside_form_html .= $this->_args_as_inputs( $get_params );
661
-				$redirect_url = str_replace( '?' . $querystring, '', $redirect_url );
659
+				parse_str($querystring, $get_params);
660
+				$inside_form_html .= $this->_args_as_inputs($get_params);
661
+				$redirect_url = str_replace('?'.$querystring, '', $redirect_url);
662 662
 			}
663
-			$form = EEH_HTML::nl( 1 )
663
+			$form = EEH_HTML::nl(1)
664 664
 			        . '<form method="'
665 665
 			        . $method
666 666
 			        . '" name="gateway_form" action="'
667 667
 			        . $redirect_url
668 668
 			        . '">';
669
-			$form .= EEH_HTML::nl( 1 ) . $this->redirect_args_as_inputs();
669
+			$form .= EEH_HTML::nl(1).$this->redirect_args_as_inputs();
670 670
 			$form .= $inside_form_html;
671
-			$form .= EEH_HTML::nl( -1 ) . '</form>' . EEH_HTML::nl( -1 );
671
+			$form .= EEH_HTML::nl( -1 ).'</form>'.EEH_HTML::nl( -1 );
672 672
 			return $form;
673 673
 		} else {
674 674
 			return null;
@@ -685,7 +685,7 @@  discard block
 block discarded – undo
685 685
 	 * @throws \EE_Error
686 686
 	 */
687 687
 	public function redirect_args_as_inputs() {
688
-		return $this->_args_as_inputs( $this->redirect_args() );
688
+		return $this->_args_as_inputs($this->redirect_args());
689 689
 	}
690 690
 
691 691
 
@@ -697,15 +697,15 @@  discard block
 block discarded – undo
697 697
 	 * @param array $args key-value pairs
698 698
 	 * @return string
699 699
 	 */
700
-	protected function _args_as_inputs( $args ) {
700
+	protected function _args_as_inputs($args) {
701 701
 		$html = '';
702
-		if ( $args !== null && is_array( $args ) ) {
703
-			foreach ( $args as $name => $value ) {
704
-				$html .= EEH_HTML::nl( 0 )
702
+		if ($args !== null && is_array($args)) {
703
+			foreach ($args as $name => $value) {
704
+				$html .= EEH_HTML::nl(0)
705 705
 				         . '<input type="hidden" name="'
706 706
 				         . $name
707 707
 				         . '" value="'
708
-				         . esc_attr( $value )
708
+				         . esc_attr($value)
709 709
 				         . '"/>';
710 710
 			}
711 711
 		}
@@ -734,14 +734,14 @@  discard block
 block discarded – undo
734 734
 	 * @access private
735 735
 	 * @param mixed $item
736 736
 	 */
737
-	private function _strip_all_tags_within_array( &$item ) {
738
-		if ( is_object( $item ) ) {
739
-			$item = (array)$item;
737
+	private function _strip_all_tags_within_array(&$item) {
738
+		if (is_object($item)) {
739
+			$item = (array) $item;
740 740
 		}
741
-		if ( is_array( $item ) ) {
742
-			array_walk_recursive( $item, array( $this, '_strip_all_tags_within_array' ) );
741
+		if (is_array($item)) {
742
+			array_walk_recursive($item, array($this, '_strip_all_tags_within_array'));
743 743
 		} else {
744
-			$item = wp_strip_all_tags( $item );
744
+			$item = wp_strip_all_tags($item);
745 745
 		}
746 746
 	}
747 747
 
@@ -758,7 +758,7 @@  discard block
 block discarded – undo
758 758
 		$original_status = EEH_Array::is_set(
759 759
 			$this->_props_n_values_provided_in_constructor,
760 760
 			'STS_ID',
761
-			$this->get_model()->field_settings_for( 'STS_ID' )->get_default_value()
761
+			$this->get_model()->field_settings_for('STS_ID')->get_default_value()
762 762
 		);
763 763
 		$current_status = $this->status();
764 764
 		if (
@@ -784,11 +784,11 @@  discard block
 block discarded – undo
784 784
 	 * @return mixed
785 785
 	 * @throws \EE_Error
786 786
 	 */
787
-	public function get_pretty( $field_name, $extra_cache_ref = null ) {
788
-		if ( $field_name === 'PAY_gateway' ) {
789
-			return $this->payment_method() ? $this->payment_method()->name() : __( 'Unknown', 'event_espresso' );
787
+	public function get_pretty($field_name, $extra_cache_ref = null) {
788
+		if ($field_name === 'PAY_gateway') {
789
+			return $this->payment_method() ? $this->payment_method()->name() : __('Unknown', 'event_espresso');
790 790
 		}
791
-		return $this->_get_cached_property( $field_name, true, $extra_cache_ref );
791
+		return $this->_get_cached_property($field_name, true, $extra_cache_ref);
792 792
 	}
793 793
 
794 794
 
@@ -800,8 +800,8 @@  discard block
 block discarded – undo
800 800
 	 * @return EE_Registration_Payment[]
801 801
 	 * @throws \EE_Error
802 802
 	 */
803
-	public function registration_payments( $query_params = array() ) {
804
-		return $this->get_many_related( 'Registration_Payment', $query_params );
803
+	public function registration_payments($query_params = array()) {
804
+		return $this->get_many_related('Registration_Payment', $query_params);
805 805
 	}
806 806
 
807 807
 
@@ -862,7 +862,7 @@  discard block
 block discarded – undo
862 862
     public function get_primary_attendee()
863 863
     {
864 864
         $primary_reg = $this->get_primary_registration();
865
-        if( $primary_reg instanceof EE_Registration) {
865
+        if ($primary_reg instanceof EE_Registration) {
866 866
             return $primary_reg->attendee();
867 867
         }
868 868
         return null;
Please login to merge, or discard this patch.
Indentation   +68 added lines, -68 removed lines patch added patch discarded remove patch
@@ -661,11 +661,11 @@  discard block
 block discarded – undo
661 661
 				$redirect_url = str_replace( '?' . $querystring, '', $redirect_url );
662 662
 			}
663 663
 			$form = EEH_HTML::nl( 1 )
664
-			        . '<form method="'
665
-			        . $method
666
-			        . '" name="gateway_form" action="'
667
-			        . $redirect_url
668
-			        . '">';
664
+					. '<form method="'
665
+					. $method
666
+					. '" name="gateway_form" action="'
667
+					. $redirect_url
668
+					. '">';
669 669
 			$form .= EEH_HTML::nl( 1 ) . $this->redirect_args_as_inputs();
670 670
 			$form .= $inside_form_html;
671 671
 			$form .= EEH_HTML::nl( -1 ) . '</form>' . EEH_HTML::nl( -1 );
@@ -702,11 +702,11 @@  discard block
 block discarded – undo
702 702
 		if ( $args !== null && is_array( $args ) ) {
703 703
 			foreach ( $args as $name => $value ) {
704 704
 				$html .= EEH_HTML::nl( 0 )
705
-				         . '<input type="hidden" name="'
706
-				         . $name
707
-				         . '" value="'
708
-				         . esc_attr( $value )
709
-				         . '"/>';
705
+						 . '<input type="hidden" name="'
706
+						 . $name
707
+						 . '" value="'
708
+						 . esc_attr( $value )
709
+						 . '"/>';
710 710
 			}
711 711
 		}
712 712
 		return $html;
@@ -806,64 +806,64 @@  discard block
 block discarded – undo
806 806
 
807 807
 
808 808
 
809
-    /**
810
-     * Gets the first event for this payment (it's possible that it could be for multiple)
811
-     *
812
-     * @return EE_Event|null
813
-     */
814
-    public function get_first_event()
815
-    {
816
-        $transaction = $this->transaction();
817
-        if ($transaction instanceof EE_Transaction) {
818
-            $primary_registrant = $transaction->primary_registration();
819
-            if ($primary_registrant instanceof EE_Registration) {
820
-                return $primary_registrant->event_obj();
821
-            }
822
-        }
823
-        return null;
824
-    }
825
-
826
-
827
-
828
-    /**
829
-     * Gets the name of the first event for which is being paid
830
-     *
831
-     * @return string
832
-     */
833
-    public function get_first_event_name()
834
-    {
835
-        $event = $this->get_first_event();
836
-        return $event instanceof EE_Event ? $event->name() : __('Event', 'event_espresso');
837
-    }
838
-
839
-
840
-
841
-    /**
842
-     * Returns the payment's transaction's primary registration
843
-     * @return EE_Registration|null
844
-     */
845
-    public function get_primary_registration()
846
-    {
847
-        if ($this->transaction() instanceof EE_Transaction) {
848
-            return $this->transaction()->primary_registration();
849
-        }
850
-        return null;
851
-    }
852
-
853
-
854
-
855
-    /**
856
-     * Gets the payment's transaction's primary registration's attendee, or null
857
-     * @return EE_Attendee|null
858
-     */
859
-    public function get_primary_attendee()
860
-    {
861
-        $primary_reg = $this->get_primary_registration();
862
-        if( $primary_reg instanceof EE_Registration) {
863
-            return $primary_reg->attendee();
864
-        }
865
-        return null;
866
-    }
809
+	/**
810
+	 * Gets the first event for this payment (it's possible that it could be for multiple)
811
+	 *
812
+	 * @return EE_Event|null
813
+	 */
814
+	public function get_first_event()
815
+	{
816
+		$transaction = $this->transaction();
817
+		if ($transaction instanceof EE_Transaction) {
818
+			$primary_registrant = $transaction->primary_registration();
819
+			if ($primary_registrant instanceof EE_Registration) {
820
+				return $primary_registrant->event_obj();
821
+			}
822
+		}
823
+		return null;
824
+	}
825
+
826
+
827
+
828
+	/**
829
+	 * Gets the name of the first event for which is being paid
830
+	 *
831
+	 * @return string
832
+	 */
833
+	public function get_first_event_name()
834
+	{
835
+		$event = $this->get_first_event();
836
+		return $event instanceof EE_Event ? $event->name() : __('Event', 'event_espresso');
837
+	}
838
+
839
+
840
+
841
+	/**
842
+	 * Returns the payment's transaction's primary registration
843
+	 * @return EE_Registration|null
844
+	 */
845
+	public function get_primary_registration()
846
+	{
847
+		if ($this->transaction() instanceof EE_Transaction) {
848
+			return $this->transaction()->primary_registration();
849
+		}
850
+		return null;
851
+	}
852
+
853
+
854
+
855
+	/**
856
+	 * Gets the payment's transaction's primary registration's attendee, or null
857
+	 * @return EE_Attendee|null
858
+	 */
859
+	public function get_primary_attendee()
860
+	{
861
+		$primary_reg = $this->get_primary_registration();
862
+		if( $primary_reg instanceof EE_Registration) {
863
+			return $primary_reg->attendee();
864
+		}
865
+		return null;
866
+	}
867 867
 }
868 868
 /* End of file EE_Payment.class.php */
869 869
 /* Location: /includes/classes/EE_Payment.class.php */
Please login to merge, or discard this patch.