Completed
Branch BUG-9467-never-double-install-... (7d31d4)
by
unknown
358:28 queued 341:17
created
admin/new/pricing/templates/event_tickets_datetime_row_wrapper.template.php 1 patch
Indentation   +6 added lines, -6 removed lines patch added patch discarded remove patch
@@ -2,9 +2,9 @@
 block discarded – undo
2 2
 <?php echo $dtt_attached_tickets_row; ?>
3 3
 <?php
4 4
 /**
5
- * template vars used in template
6
- *
7
- * $dtt_row
8
- * $dtt_edit_row
9
- * $dtt_attached_tickets_row
10
- */
11 5
\ No newline at end of file
6
+						 * template vars used in template
7
+						 *
8
+						 * $dtt_row
9
+						 * $dtt_edit_row
10
+						 * $dtt_attached_tickets_row
11
+						 */
12 12
\ No newline at end of file
Please login to merge, or discard this patch.
core/db_models/relations/EE_HABTM_Any_Relation.php 3 patches
Doc Comments   -1 removed lines patch added patch discarded remove patch
@@ -32,7 +32,6 @@
 block discarded – undo
32 32
 	/**
33 33
 	 * 
34 34
 	 * @param string $model_name
35
-	 * @param string $comparison_model_name
36 35
 	 * @param string $id_or_name_field should be the string 'ID' or 'name' only
37 36
 	 * @return EE_Model_Field_Base
38 37
 	 */
Please login to merge, or discard this patch.
Indentation   +3 added lines, -3 removed lines patch added patch discarded remove patch
@@ -1,8 +1,8 @@
 block discarded – undo
1 1
 <?php
2 2
 /**
3
- * Joins any two models together via a has-and-belongs-to-many relation, using 
4
- * the esp_extra_join table.
5
- */
3
+	  * Joins any two models together via a has-and-belongs-to-many relation, using 
4
+	  * the esp_extra_join table.
5
+	  */
6 6
 class EE_HABTM_Any_Relation extends EE_HABTM_Relation{	
7 7
 	/**
8 8
 	 *
Please login to merge, or discard this patch.
Spacing   +35 added lines, -35 removed lines patch added patch discarded remove patch
@@ -3,7 +3,7 @@  discard block
 block discarded – undo
3 3
  * Joins any two models together via a has-and-belongs-to-many relation, using 
4 4
  * the esp_extra_join table.
5 5
  */
6
-class EE_HABTM_Any_Relation extends EE_HABTM_Relation{	
6
+class EE_HABTM_Any_Relation extends EE_HABTM_Relation {	
7 7
 	/**
8 8
 	 *
9 9
 	 * @var string
@@ -17,16 +17,16 @@  discard block
 block discarded – undo
17 17
 	 * @param boolean $block_deletes for this type of relation, we block by default for now. if there are related models across this relation, block (prevent and add an error) the deletion of this model
18 18
 	 * @param type $blocking_delete_error_message a customized error message on blocking deletes instead of the default
19 19
 	 */
20
-	function __construct( $block_deletes = true, $blocking_delete_error_message =''){
21
-		parent::__construct( 'Extra_Join', $block_deletes, $blocking_delete_error_message);
20
+	function __construct($block_deletes = true, $blocking_delete_error_message = '') {
21
+		parent::__construct('Extra_Join', $block_deletes, $blocking_delete_error_message);
22 22
 	}
23
-	function _construct_finalize_set_models($this_model_name, $other_model_name){
24
-		if( $this_model_name < $other_model_name ) {
23
+	function _construct_finalize_set_models($this_model_name, $other_model_name) {
24
+		if ($this_model_name < $other_model_name) {
25 25
 			$this->_alphabetically_first_model_name = $this_model_name;
26
-		} else{
26
+		} else {
27 27
 			$this->_alphabetically_first_model_name = $other_model_name;
28 28
 		}
29
-		return parent::_construct_finalize_set_models( $this_model_name, $other_model_name );
29
+		return parent::_construct_finalize_set_models($this_model_name, $other_model_name);
30 30
 	}
31 31
 	
32 32
 	/**
@@ -36,21 +36,21 @@  discard block
 block discarded – undo
36 36
 	 * @param string $id_or_name_field should be the string 'ID' or 'name' only
37 37
 	 * @return EE_Model_Field_Base
38 38
 	 */
39
-	function get_join_table_fk_field_to( $model_name, $id_or_name_field ) {
39
+	function get_join_table_fk_field_to($model_name, $id_or_name_field) {
40 40
 		$order = null;
41
-		if( $model_name === $this->_alphabetically_first_model_name ) {
41
+		if ($model_name === $this->_alphabetically_first_model_name) {
42 42
 			$order = 'first';
43 43
 		} else {
44 44
 			$order = 'second';
45 45
 		}
46
-		return $this->get_join_model()->field_settings_for( 'EXJ_' . $order . '_model_' . $id_or_name_field );
46
+		return $this->get_join_model()->field_settings_for('EXJ_'.$order.'_model_'.$id_or_name_field);
47 47
 	}
48 48
 	/**
49 49
 	 * Gets the SQL string for joining the main model's table containing the pk to the join table. Eg "LEFT JOIN real_join_table AS join_table_alias ON this_table_alias.pk = join_table_alias.fk_to_this_table"
50 50
 	 * @param string $model_relation_chain like 'Event.Event_Venue.Venue'
51 51
 	 * @return string of SQL
52 52
 	 */
53
-	function get_join_to_intermediate_model_statement($model_relation_chain){
53
+	function get_join_to_intermediate_model_statement($model_relation_chain) {
54 54
 		//create sql like
55 55
 		//LEFT JOIN join_table AS join_table_alias ON this_table_alias.this_table_pk = join_table_alias.join_table_fk_to_this
56 56
 		//LEFT JOIN other_table AS other_table_alias ON join_table_alias.join_table_fk_to_other = other_table_alias.other_table_pk
@@ -64,8 +64,8 @@  discard block
 block discarded – undo
64 64
 		$field_with_model_name = $this->get_join_table_fk_field_to( 
65 65
 				$this->get_this_model()->get_this_model_name(), 
66 66
 				'name' );
67
-		$this_table_alias = EE_Model_Parser::extract_table_alias_model_relation_chain_prefix($model_relation_chain, $this->get_this_model()->get_this_model_name()) . $this_table_pk_field->get_table_alias();
68
-		$join_table_alias = EE_Model_Parser::extract_table_alias_model_relation_chain_prefix($model_relation_chain, $this->get_join_model()->get_this_model_name()) . $join_table_fk_field_to_this_table->get_table_alias();
67
+		$this_table_alias = EE_Model_Parser::extract_table_alias_model_relation_chain_prefix($model_relation_chain, $this->get_this_model()->get_this_model_name()).$this_table_pk_field->get_table_alias();
68
+		$join_table_alias = EE_Model_Parser::extract_table_alias_model_relation_chain_prefix($model_relation_chain, $this->get_join_model()->get_this_model_name()).$join_table_fk_field_to_this_table->get_table_alias();
69 69
 		$join_table = $this->get_join_model()->get_table_for_alias($join_table_alias);
70 70
 		//phew! ok, we have all the info we need, now we can create the SQL join string
71 71
 		$SQL = $this->_left_join(
@@ -74,7 +74,7 @@  discard block
 block discarded – undo
74 74
 					$join_table_fk_field_to_this_table->get_table_column(), 
75 75
 					$this_table_alias, 
76 76
 					$this_table_pk_field->get_table_column(),
77
-					$field_with_model_name->get_qualified_column()."='".$this->get_this_model()->get_this_model_name()."'" ) .
77
+					$field_with_model_name->get_qualified_column()."='".$this->get_this_model()->get_this_model_name()."'" ).
78 78
 				$this->get_join_model()->_construct_internal_join_to_table_with_alias($join_table_alias);
79 79
 
80 80
 		return $SQL;
@@ -87,9 +87,9 @@  discard block
 block discarded – undo
87 87
 	 * @param string $model_relation_chain like 'Event.Event_Venue.Venue'
88 88
 	 * @return string of SQL
89 89
 	 */
90
-	function get_join_statement($model_relation_chain){
91
-		if( $this->_model_relation_chain_to_join_model === NULL ){
92
-			throw new EE_Error( sprintf( __( 'When using EE_HABTM_Relation to create a join, you must call get_join_to_intermediate_model_statement BEFORE get_join_statement', 'event_espresso' )));
90
+	function get_join_statement($model_relation_chain) {
91
+		if ($this->_model_relation_chain_to_join_model === NULL) {
92
+			throw new EE_Error(sprintf(__('When using EE_HABTM_Relation to create a join, you must call get_join_to_intermediate_model_statement BEFORE get_join_statement', 'event_espresso')));
93 93
 		}
94 94
 		$join_table_fk_field_to_this_table = $this->get_join_table_fk_field_to( 
95 95
 				$this->get_this_model()->get_this_model_name(), 
@@ -101,10 +101,10 @@  discard block
 block discarded – undo
101 101
 				$this->get_other_model()->get_this_model_name(), 
102 102
 				'name' );
103 103
 		
104
-		$join_table_alias = EE_Model_Parser::extract_table_alias_model_relation_chain_prefix($this->_model_relation_chain_to_join_model, $this->get_join_model()->get_this_model_name()) . $join_table_fk_field_to_this_table->get_table_alias();
104
+		$join_table_alias = EE_Model_Parser::extract_table_alias_model_relation_chain_prefix($this->_model_relation_chain_to_join_model, $this->get_join_model()->get_this_model_name()).$join_table_fk_field_to_this_table->get_table_alias();
105 105
 		
106 106
 		$other_table_pk_field = $this->get_other_model()->get_primary_key_field();
107
-		$other_table_alias = EE_Model_Parser::extract_table_alias_model_relation_chain_prefix($model_relation_chain, $this->get_other_model()->get_this_model_name()) . $other_table_pk_field->get_table_alias();
107
+		$other_table_alias = EE_Model_Parser::extract_table_alias_model_relation_chain_prefix($model_relation_chain, $this->get_other_model()->get_this_model_name()).$other_table_pk_field->get_table_alias();
108 108
 		$other_table = $this->get_other_model()->get_table_for_alias($other_table_alias);
109 109
 
110 110
 		$SQL = $this->_left_join(
@@ -114,7 +114,7 @@  discard block
 block discarded – undo
114 114
 					$join_table_alias, 
115 115
 					$join_table_fk_field_to_other_table->get_table_column(),
116 116
 					$field_with_other_model_name->get_qualified_column()."='".$this->get_other_model()->get_this_model_name()."'" 
117
-				) . 
117
+				). 
118 118
 				$this->get_other_model()->_construct_internal_join_to_table_with_alias($other_table_alias);
119 119
 		return $SQL;
120 120
 	}
@@ -126,7 +126,7 @@  discard block
 block discarded – undo
126 126
 	 * @param array             $extra_join_model_fields_n_values col=>val pairs that are used as extra conditions for checking existing values and for setting new rows if no exact matches.
127 127
 	 * @return EE_Base_Class
128 128
 	 */
129
-	 function add_relation_to($this_obj_or_id, $other_obj_or_id, $extra_join_model_fields_n_values = array() ){
129
+	 function add_relation_to($this_obj_or_id, $other_obj_or_id, $extra_join_model_fields_n_values = array()) {
130 130
 		 $this_model_obj = $this->get_this_model()->ensure_is_obj($this_obj_or_id, true);
131 131
 		 $other_model_obj = $this->get_other_model()->ensure_is_obj($other_obj_or_id, true);
132 132
 		//check if such a relationship already exists
@@ -143,31 +143,31 @@  discard block
 block discarded – undo
143 143
 				$this->get_other_model()->get_this_model_name(),
144 144
 				'name' );
145 145
 
146
-		$cols_n_values =  array(
146
+		$cols_n_values = array(
147 147
 				$join_model_fk_to_this_model->get_name() => $this_model_obj->ID(),
148 148
 				$join_model_name_field_to_this_model->get_name() => $this_model_obj->get_model()->get_this_model_name(),
149 149
 				$join_model_fk_to_other_model->get_name() => $other_model_obj->ID(),
150 150
 				$join_model_name_field_to_other_model->get_name() => $other_model_obj->get_model()->get_this_model_name() );
151 151
 
152 152
 		//if $where_query exists lets add them to the query_params.
153
-		if ( !empty( $extra_join_model_fields_n_values ) ) {
153
+		if ( ! empty($extra_join_model_fields_n_values)) {
154 154
 		   //make sure we strip any of the join model names from the $where_query cause we don't need that in here (why? because client code may have used the same conditionals for get_all_related which DOES need the join model name)
155 155
 		   //make sure we strip THIS models name from the query param
156
-		   foreach ( $extra_join_model_fields_n_values as $query_param => $val ) {
157
-			   $query_param = str_replace($this->get_join_model()->get_this_model_name().".","", $query_param);
156
+		   foreach ($extra_join_model_fields_n_values as $query_param => $val) {
157
+			   $query_param = str_replace($this->get_join_model()->get_this_model_name().".", "", $query_param);
158 158
 			   $parsed_query[$query_param] = $val;
159 159
 		   }
160
-		   $cols_n_values = array_merge( $cols_n_values, $parsed_query );
160
+		   $cols_n_values = array_merge($cols_n_values, $parsed_query);
161 161
 		}
162 162
 
163
-		$query_params = array( $cols_n_values );
163
+		$query_params = array($cols_n_values);
164 164
 
165 165
 
166 166
 		$existing_entry_in_join_table = $this->get_join_model()->get_one($query_params);
167 167
 		//if there is already an entry in the join table, indicating a relationship, we're done
168 168
 		 //again, if you want more sophisticated logic or insertions (handling more columns than just 2 foreign keys to
169 169
 		 //the other tables, use the joining model directly!
170
-		if( ! $existing_entry_in_join_table ){
170
+		if ( ! $existing_entry_in_join_table) {
171 171
 			$this->get_join_model()->insert($cols_n_values);
172 172
 		}
173 173
 		return $other_model_obj;
@@ -179,7 +179,7 @@  discard block
 block discarded – undo
179 179
 	 * * @param array           $where_query col=>val pairs that are used as extra conditions for checking existing values and for removing existing rows if exact matches exist.
180 180
 	 * @return EE_Base_Class
181 181
 	 */
182
-	 function remove_relation_to($this_obj_or_id, $other_obj_or_id, $where_query = array() ){
182
+	 function remove_relation_to($this_obj_or_id, $other_obj_or_id, $where_query = array()) {
183 183
 		 $this_model_obj = $this->get_this_model()->ensure_is_obj($this_obj_or_id, true);
184 184
 		 $other_model_obj = $this->get_other_model()->ensure_is_obj($other_obj_or_id, true);
185 185
 		//check if such a relationship already exists
@@ -196,24 +196,24 @@  discard block
 block discarded – undo
196 196
 				$this->get_other_model()->get_this_model_name(), 
197 197
 				'name' );
198 198
 
199
-		$cols_n_values =  array(
199
+		$cols_n_values = array(
200 200
 				$join_model_fk_to_this_model->get_name() => $this_model_obj->ID(),
201 201
 				$join_model_name_field_to_this_model->get_name() => $this_model_obj->get_model()->get_this_model_name(),
202 202
 				$join_model_fk_to_other_model->get_name() => $other_model_obj->ID(),
203 203
 				$join_model_name_field_to_other_model->get_name() => $other_model_obj->get_model()->get_this_model_name() );
204 204
 
205 205
 		//if $where_query exists lets add them to the query_params.
206
-		if ( !empty( $where_query ) ) {
206
+		if ( ! empty($where_query)) {
207 207
 		 	//make sure we strip any of the join model names from the $where_query cause we don't need that in here (why? because client code may have used the same conditionals for get_all_related which DOES need the join model name)
208 208
 		 	//make sure we strip THIS models name from the query param
209
-		 	foreach ( $where_query as $query_param => $val ) {
210
-				$query_param = str_replace($this->get_join_model()->get_this_model_name().".","", $query_param);
209
+		 	foreach ($where_query as $query_param => $val) {
210
+				$query_param = str_replace($this->get_join_model()->get_this_model_name().".", "", $query_param);
211 211
 				$parsed_query[$query_param] = $val;
212 212
 			}
213
-		 	$cols_n_values = array_merge( $cols_n_values, $parsed_query );
213
+		 	$cols_n_values = array_merge($cols_n_values, $parsed_query);
214 214
 		}
215 215
 
216
-		$existing_entry_in_join_table = $this->get_join_model()->delete( array($cols_n_values) );
216
+		$existing_entry_in_join_table = $this->get_join_model()->delete(array($cols_n_values));
217 217
 		return $other_model_obj;
218 218
 	 }
219 219
 }
Please login to merge, or discard this patch.
core/db_classes/EE_Extra_Join.class.php 2 patches
Spacing   +5 added lines, -5 removed lines patch added patch discarded remove patch
@@ -22,9 +22,9 @@  discard block
 block discarded – undo
22 22
 	 * @param null  $timezone
23 23
 	 * @return EE_Event_Message_Template|mixed
24 24
 	 */
25
-	public static function new_instance( $props_n_values = array(), $timezone = NULL ) {
26
-		$has_object = parent::_check_for_object( $props_n_values, __CLASS__, $timezone );
27
-		return $has_object ? $has_object : new self( $props_n_values, FALSE, $timezone );
25
+	public static function new_instance($props_n_values = array(), $timezone = NULL) {
26
+		$has_object = parent::_check_for_object($props_n_values, __CLASS__, $timezone);
27
+		return $has_object ? $has_object : new self($props_n_values, FALSE, $timezone);
28 28
 	}
29 29
 
30 30
 
@@ -34,8 +34,8 @@  discard block
 block discarded – undo
34 34
 	 * @param null  $timezone
35 35
 	 * @return EE_Event_Message_Template
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
 }
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.
core/libraries/batch/JobHandlerBaseClasses/JobHandlerFile.php 2 patches
Indentation   +12 added lines, -12 removed lines patch added patch discarded remove patch
@@ -1,17 +1,17 @@
 block discarded – undo
1 1
 <?php
2 2
 /**
3
- *
4
- * Class JobHandlerFile
5
- *
6
- * Base class for common implementations of JobHandlerInterface, but ones
7
- * which write to a temporary file
8
- *
9
- * @package         Event Espresso
10
- * @subpackage    batch
11
- * @author				Mike Nelson
12
- * @since		 	   4.8.26
13
- *
14
- */
3
+	 *
4
+	 * Class JobHandlerFile
5
+	 *
6
+	 * Base class for common implementations of JobHandlerInterface, but ones
7
+	 * which write to a temporary file
8
+	 *
9
+	 * @package         Event Espresso
10
+	 * @subpackage    batch
11
+	 * @author				Mike Nelson
12
+	 * @since		 	   4.8.26
13
+	 *
14
+	 */
15 15
 namespace EventEspressoBatchRequest\JobHandlerBaseClasses;
16 16
 
17 17
 use EventEspressoBatchRequest\Helpers\BatchRequestException;
Please login to merge, or discard this patch.
Spacing   +23 added lines, -23 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
 			$success = $this->_file_helper->ensure_folder_exists_and_is_writable(
63
-				EVENT_ESPRESSO_UPLOAD_DIR . JobHandlerFile::temp_folder_name
63
+				EVENT_ESPRESSO_UPLOAD_DIR.JobHandlerFile::temp_folder_name
64 64
 			);
65
-			if ( $success ) {
65
+			if ($success) {
66 66
 				$success = $this->_file_helper->ensure_folder_exists_and_is_writable(
67
-					EVENT_ESPRESSO_UPLOAD_DIR . JobHandlerFile::temp_folder_name . DS . $job_id
67
+					EVENT_ESPRESSO_UPLOAD_DIR.JobHandlerFile::temp_folder_name.DS.$job_id
68 68
 				);
69 69
 			}
70
-			if( $success ) {
71
-				$filepath = EVENT_ESPRESSO_UPLOAD_DIR . JobHandlerFile::temp_folder_name . DS . $job_id . DS. $filename;
72
-				$success = $this->_file_helper->ensure_file_exists_and_is_writable( $filepath );
70
+			if ($success) {
71
+				$filepath = EVENT_ESPRESSO_UPLOAD_DIR.JobHandlerFile::temp_folder_name.DS.$job_id.DS.$filename;
72
+				$success = $this->_file_helper->ensure_file_exists_and_is_writable($filepath);
73 73
 			}
74 74
 			//let's add the .htaccess file so safari will open the file properly
75
-			if( $success ) {
76
-				$extension = \EEH_File::get_file_extension( $filepath );
75
+			if ($success) {
76
+				$extension = \EEH_File::get_file_extension($filepath);
77 77
 				\EEH_File::write_to_file(
78
-					EVENT_ESPRESSO_UPLOAD_DIR . JobHandlerFile::temp_folder_name . DS . $job_id . DS . '.htaccess',
79
-					'AddType ' . $filetype . ' ' . $extension,
78
+					EVENT_ESPRESSO_UPLOAD_DIR.JobHandlerFile::temp_folder_name.DS.$job_id.DS.'.htaccess',
79
+					'AddType '.$filetype.' '.$extension,
80 80
 					'.htaccess'
81 81
 				);
82 82
 			}
83 83
 			//those methods normally fail with an exception, but if not, let's do it
84
-			if( ! $success ) {
85
-				throw new \EE_Error( 'could_not_create_temp_file',
86
-				__( 'An unknown error occurred', 'event_espresso' ));
84
+			if ( ! $success) {
85
+				throw new \EE_Error('could_not_create_temp_file',
86
+				__('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( EVENT_ESPRESSO_UPLOAD_DIR, EVENT_ESPRESSO_UPLOAD_URL, $filepath );
107
+	public function get_url_to_file($filepath) {
108
+		return str_replace(EVENT_ESPRESSO_UPLOAD_DIR, EVENT_ESPRESSO_UPLOAD_URL, $filepath);
109 109
 	}
110 110
 }
111 111
 
Please login to merge, or discard this patch.
core/libraries/batch/Helpers/JobParameters.php 3 patches
Indentation   +12 added lines, -12 removed lines patch added patch discarded remove patch
@@ -1,17 +1,17 @@
 block discarded – undo
1 1
 <?php
2 2
 /**
3
- *
4
- * Class JobParameters
5
- *
6
- * Class for storing information about a job. Takes care of serializing the
7
- * data for storing in a wordpress option
8
- *
9
- * @package         Event Espresso
10
- * @subpackage    batch
11
- * @author				Mike Nelson
12
- * @since		 	   4.8.26
13
- *
14
- */
3
+	 *
4
+	 * Class JobParameters
5
+	 *
6
+	 * Class for storing information about a job. Takes care of serializing the
7
+	 * data for storing in a wordpress option
8
+	 *
9
+	 * @package         Event Espresso
10
+	 * @subpackage    batch
11
+	 * @author				Mike Nelson
12
+	 * @since		 	   4.8.26
13
+	 *
14
+	 */
15 15
 namespace EventEspressoBatchRequest\Helpers;
16 16
 
17 17
 if ( ! defined('EVENT_ESPRESSO_VERSION')) { exit('No direct script access allowed'); }
Please login to merge, or discard this patch.
Doc Comments   +1 added lines, -1 removed lines patch added patch discarded remove patch
@@ -214,7 +214,7 @@
 block discarded – undo
214 214
 	/**
215 215
 	 * Gets a single item from the request data
216 216
 	 * @param string $key
217
-	 * @param string|array $default
217
+	 * @param string $default
218 218
 	 * @return string|array
219 219
 	 */
220 220
 	function request_datum( $key, $default = '' ) {
Please login to merge, or discard this patch.
Spacing   +40 added lines, -40 removed lines patch added patch discarded remove patch
@@ -96,12 +96,12 @@  discard block
 block discarded – undo
96 96
 	 * @param array $request_data
97 97
 	 * @param array $extra_data
98 98
 	 */
99
-	function __construct( $job_id, $classname, $request_data, $extra_data = array() ) {
100
-		$this->set_job_id( $job_id );
101
-		$this->set_classname( $classname );
102
-		$this->set_request_data( $request_data );
103
-		$this->set_extra_data( $extra_data );
104
-		$this->set_status( JobParameters::status_continue );
99
+	function __construct($job_id, $classname, $request_data, $extra_data = array()) {
100
+		$this->set_job_id($job_id);
101
+		$this->set_classname($classname);
102
+		$this->set_request_data($request_data);
103
+		$this->set_extra_data($extra_data);
104
+		$this->set_status(JobParameters::status_continue);
105 105
 	}
106 106
 
107 107
 
@@ -126,12 +126,12 @@  discard block
 block discarded – undo
126 126
 	 * @param boolean $first
127 127
 	 * @return boolean success
128 128
 	 */
129
-	function save( $first = false ) {
130
-		$object_vars = wp_json_encode( get_object_vars( $this ) );
131
-		if( $first ) {
132
-			return add_option( $this->option_name(), $object_vars, null, 'no' );
133
-		} else{
134
-			return update_option( $this->option_name(), $object_vars );
129
+	function save($first = false) {
130
+		$object_vars = wp_json_encode(get_object_vars($this));
131
+		if ($first) {
132
+			return add_option($this->option_name(), $object_vars, null, 'no');
133
+		} else {
134
+			return update_option($this->option_name(), $object_vars);
135 135
 		}
136 136
 	}
137 137
 
@@ -143,7 +143,7 @@  discard block
 block discarded – undo
143 143
 	 * @return boolean
144 144
 	 */
145 145
 	function delete() {
146
-		return delete_option( $this->option_name() );
146
+		return delete_option($this->option_name());
147 147
 	}
148 148
 
149 149
 
@@ -154,26 +154,26 @@  discard block
 block discarded – undo
154 154
 	 * @return JobParameters
155 155
 	 * @throws BatchRequestException
156 156
 	 */
157
-	static function load( $job_id ) {
158
-		$job_parameter_vars = json_decode( get_option( JobParameters::wp_option_prefix . $job_id ), true );
159
-		if(
160
-			! is_array( $job_parameter_vars ) ||
161
-			! isset( $job_parameter_vars[ '_classname' ] ) ||
162
-			! isset( $job_parameter_vars[ '_request_data' ] )
157
+	static function load($job_id) {
158
+		$job_parameter_vars = json_decode(get_option(JobParameters::wp_option_prefix.$job_id), true);
159
+		if (
160
+			! is_array($job_parameter_vars) ||
161
+			! isset($job_parameter_vars['_classname']) ||
162
+			! isset($job_parameter_vars['_request_data'])
163 163
 		) {
164 164
 			throw new BatchRequestException(
165 165
 				sprintf(
166 166
 					__('Could not retrieve job %1$s from the Wordpress options table, and so the job could not continue. The wordpress option was %2$s', 'event_espresso'),
167 167
 					$job_id,
168
-					get_option( JobParameters::wp_option_prefix . $job_id )
168
+					get_option(JobParameters::wp_option_prefix.$job_id)
169 169
 				)
170 170
 			);
171 171
 		}
172 172
 		$job_parameters = new JobParameters(
173 173
 				$job_id,
174
-				$job_parameter_vars[ '_classname' ],
175
-				$job_parameter_vars[ '_request_data'] );
176
-		foreach( $job_parameter_vars as $key => $value ) {
174
+				$job_parameter_vars['_classname'],
175
+				$job_parameter_vars['_request_data'] );
176
+		foreach ($job_parameter_vars as $key => $value) {
177 177
 			$job_parameters->{$key} = $value;
178 178
 		}
179 179
 		return $job_parameters;
@@ -217,9 +217,9 @@  discard block
 block discarded – undo
217 217
 	 * @param string|array $default
218 218
 	 * @return string|array
219 219
 	 */
220
-	function request_datum( $key, $default = '' ) {
221
-		if( isset( $this->_request_data[ $key ] ) ) {
222
-			return $this->_request_data[ $key ];
220
+	function request_datum($key, $default = '') {
221
+		if (isset($this->_request_data[$key])) {
222
+			return $this->_request_data[$key];
223 223
 		} else {
224 224
 			return $default;
225 225
 		}
@@ -233,9 +233,9 @@  discard block
 block discarded – undo
233 233
 	 * @param string|array $default
234 234
 	 * @return string|array
235 235
 	 */
236
-	function extra_datum( $key, $default = '' ) {
237
-		if( isset( $this->_extra_data[ $key ] ) ) {
238
-			return $this->_extra_data[ $key ];
236
+	function extra_datum($key, $default = '') {
237
+		if (isset($this->_extra_data[$key])) {
238
+			return $this->_extra_data[$key];
239 239
 		} else {
240 240
 			return $default;
241 241
 		}
@@ -248,8 +248,8 @@  discard block
 block discarded – undo
248 248
 	 * @param string $key
249 249
 	 * @param string|int|array|null $value almost any extra data you want to store
250 250
 	 */
251
-	function add_extra_data( $key, $value ) {
252
-		$this->_extra_data[ $key ] = $value;
251
+	function add_extra_data($key, $value) {
252
+		$this->_extra_data[$key] = $value;
253 253
 	}
254 254
 
255 255
 
@@ -278,7 +278,7 @@  discard block
 block discarded – undo
278 278
 	 * Sets the job size. You decide what units to use
279 279
 	 * @param int $size
280 280
 	 */
281
-	function set_job_size( $size ) {
281
+	function set_job_size($size) {
282 282
 		$this->_job_size = $size;
283 283
 	}
284 284
 
@@ -299,7 +299,7 @@  discard block
 block discarded – undo
299 299
 	 * @param int $newly_processed
300 300
 	 * @return int updated units processed
301 301
 	 */
302
-	function mark_processed( $newly_processed ) {
302
+	function mark_processed($newly_processed) {
303 303
 		$this->_units_processed += $newly_processed;
304 304
 		return $this->_units_processed;
305 305
 	}
@@ -310,7 +310,7 @@  discard block
 block discarded – undo
310 310
 	 * Sets the total count of units processed. You might prefer to use mark_processed
311 311
 	 * @param int $total_units_processed
312 312
 	 */
313
-	function set_units_processed( $total_units_processed ) {
313
+	function set_units_processed($total_units_processed) {
314 314
 		$this->_units_processed = $total_units_processed;
315 315
 	}
316 316
 
@@ -320,7 +320,7 @@  discard block
 block discarded – undo
320 320
 	 * Sets the job's ID
321 321
 	 * @param string $job_id
322 322
 	 */
323
-	function set_job_id( $job_id ) {
323
+	function set_job_id($job_id) {
324 324
 		$this->_job_id = $job_id;
325 325
 	}
326 326
 
@@ -330,7 +330,7 @@  discard block
 block discarded – undo
330 330
 	 * sets the classname
331 331
 	 * @param string $classname
332 332
 	 */
333
-	function set_classname( $classname ) {
333
+	function set_classname($classname) {
334 334
 		$this->_classname = $classname;
335 335
 	}
336 336
 
@@ -340,7 +340,7 @@  discard block
 block discarded – undo
340 340
 	 * Sets the request data
341 341
 	 * @param array $request_data
342 342
 	 */
343
-	function set_request_data( $request_data ) {
343
+	function set_request_data($request_data) {
344 344
 		$this->_request_data = $request_data;
345 345
 	}
346 346
 
@@ -350,7 +350,7 @@  discard block
 block discarded – undo
350 350
 	 * Sets the array of extra data we want to store on this request
351 351
 	 * @param array $extra_data
352 352
 	 */
353
-	function set_extra_data( $extra_data ) {
353
+	function set_extra_data($extra_data) {
354 354
 		$this->_extra_data = $extra_data;
355 355
 	}
356 356
 
@@ -361,7 +361,7 @@  discard block
 block discarded – undo
361 361
 	 * @return string
362 362
 	 */
363 363
 	function option_name() {
364
-		return JobParameters::wp_option_prefix . $this->job_id();
364
+		return JobParameters::wp_option_prefix.$this->job_id();
365 365
 	}
366 366
 
367 367
 
@@ -380,7 +380,7 @@  discard block
 block discarded – undo
380 380
 	 *
381 381
 	 * @param string $status on eof JobParameters::valid_stati()
382 382
 	 */
383
-	public function set_status( $status ) {
383
+	public function set_status($status) {
384 384
 		$this->_status = $status;
385 385
 	}
386 386
 
Please login to merge, or discard this patch.
core/libraries/batch/JobHandlerBaseClasses/JobHandler.php 2 patches
Indentation   +11 added lines, -11 removed lines patch added patch discarded remove patch
@@ -1,16 +1,16 @@
 block discarded – undo
1 1
 <?php
2 2
 /**
3
- *
4
- * Class JobHandler
5
- *
6
- * Base class for common implementations of JobHandlerInterface.
7
- *
8
- * @package         Event Espresso
9
- * @subpackage    batch
10
- * @author				Mike Nelson
11
- * @since		 	   4.8.26
12
- *
13
- */
3
+	 *
4
+	 * Class JobHandler
5
+	 *
6
+	 * Base class for common implementations of JobHandlerInterface.
7
+	 *
8
+	 * @package         Event Espresso
9
+	 * @subpackage    batch
10
+	 * @author				Mike Nelson
11
+	 * @since		 	   4.8.26
12
+	 *
13
+	 */
14 14
 namespace EventEspressoBatchRequest\JobHandlerBaseClasses;
15 15
 
16 16
 use EventEspressoBatchRequest\Helpers\BatchRequestException;
Please login to merge, or discard this patch.
Spacing   +2 added lines, -2 removed lines patch added patch discarded remove patch
@@ -1,6 +1,6 @@
 block discarded – undo
1 1
 <?php
2
-if ( ! defined( 'EVENT_ESPRESSO_VERSION' ) ) {
3
-	exit( 'No direct script access allowed' );
2
+if ( ! defined('EVENT_ESPRESSO_VERSION')) {
3
+	exit('No direct script access allowed');
4 4
 }
5 5
 /**
6 6
  * Class EE_Line_Item_Filter_Collection
Please login to merge, or discard this patch.
core/db_models/EEM_Extra_Join.model.php 1 patch
Spacing   +9 added lines, -9 removed lines patch added patch discarded remove patch
@@ -21,26 +21,26 @@
 block discarded – undo
21 21
  * @since		 	   $VID:$
22 22
  *
23 23
  */
24
-if (!defined('EVENT_ESPRESSO_VERSION')) {
24
+if ( ! defined('EVENT_ESPRESSO_VERSION')) {
25 25
 	exit('No direct script access allowed');
26 26
 }
27 27
 
28
-class EEM_Extra_Join extends EEM_Base{
28
+class EEM_Extra_Join extends EEM_Base {
29 29
 	// private instance of the Extra Join object
30 30
 	protected static $_instance = NULL;
31 31
 	
32 32
 	public function __construct($timezone = NULL) {
33
-		$models_this_can_join = array_keys( EE_Registry::instance()->non_abstract_db_models );
33
+		$models_this_can_join = array_keys(EE_Registry::instance()->non_abstract_db_models);
34 34
 		$this->_tables = array(
35
-			'Extra_Join' => new EE_Primary_Table( 'esp_extra_join', 'EXJ_ID' ),
35
+			'Extra_Join' => new EE_Primary_Table('esp_extra_join', 'EXJ_ID'),
36 36
 		);
37 37
 		$this->_fields = array(
38 38
 			'Extra_Join' => array(
39
-				'EXJ_ID' => new EE_Primary_Key_Int_Field( 'EXJ_ID', __( 'Extra Join ID', 'event_espresso' ) ),
40
-				'EXJ_first_model_ID' => new EE_Foreign_Key_String_Field( 'EXJ_first_model_ID', __( 'First Model ID', 'event_espresso' ), true, 0, $models_this_can_join ),
41
-				'EXJ_first_model_name' => new EE_Any_Foreign_Model_Name_Field( 'EXJ_first_model_name', __( 'First Model Name', 'event_espresso'), true, '', $models_this_can_join ),
42
-				'EXJ_second_model_ID' => new EE_Foreign_Key_String_Field( 'EXJ_second_model_ID', __( 'Second Model ID', 'event_espresso' ), true, 0, $models_this_can_join ),
43
-				'EXJ_second_model_name' => new EE_Any_Foreign_Model_Name_Field( 'EXJ_second_model_name', __( 'Second Model Name', 'event_espresso'), true, '', $models_this_can_join ),
39
+				'EXJ_ID' => new EE_Primary_Key_Int_Field('EXJ_ID', __('Extra Join ID', 'event_espresso')),
40
+				'EXJ_first_model_ID' => new EE_Foreign_Key_String_Field('EXJ_first_model_ID', __('First Model ID', 'event_espresso'), true, 0, $models_this_can_join),
41
+				'EXJ_first_model_name' => new EE_Any_Foreign_Model_Name_Field('EXJ_first_model_name', __('First Model Name', 'event_espresso'), true, '', $models_this_can_join),
42
+				'EXJ_second_model_ID' => new EE_Foreign_Key_String_Field('EXJ_second_model_ID', __('Second Model ID', 'event_espresso'), true, 0, $models_this_can_join),
43
+				'EXJ_second_model_name' => new EE_Any_Foreign_Model_Name_Field('EXJ_second_model_name', __('Second Model Name', 'event_espresso'), true, '', $models_this_can_join),
44 44
 				
45 45
 			)
46 46
 		);
Please login to merge, or discard this patch.
core/libraries/rest_api/controllers/config/Read.php 2 patches
Braces   +1 added lines, -1 removed lines patch added patch discarded remove patch
@@ -90,7 +90,7 @@
 block discarded – undo
90 90
 		//so in case teh IPN is arriving later, let's try to process an IPN!
91 91
 		if($_SERVER['REQUEST_METHOD'] == 'POST'){
92 92
 			return $this->handle_ipn($_POST, $transaction );
93
-		}else{
93
+		} else{
94 94
 			return parent::finalize_payment_for( $transaction );
95 95
 		}
96 96
 	}
Please login to merge, or discard this patch.
Spacing   +6 added lines, -6 removed lines patch added patch discarded remove patch
@@ -1,7 +1,7 @@  discard block
 block discarded – undo
1 1
 <?php
2 2
 namespace EventEspresso\core\libraries\rest_api\controllers\config;
3
-if ( !defined( 'EVENT_ESPRESSO_VERSION' ) ) {
4
-	exit( 'No direct script access allowed' );
3
+if ( ! defined('EVENT_ESPRESSO_VERSION')) {
4
+	exit('No direct script access allowed');
5 5
 }
6 6
 
7 7
 /**
@@ -21,11 +21,11 @@  discard block
 block discarded – undo
21 21
 	 * @param \WP_REST_Request $request
22 22
 	 * @return \EE_Config|\WP_Error
23 23
 	 */
24
-	public static function handle_request( \WP_REST_Request $request) {
24
+	public static function handle_request(\WP_REST_Request $request) {
25 25
 		$cap = \EE_Restriction_Generator_Base::get_default_restrictions_cap();
26
-		if( \EE_Capabilities::instance()->current_user_can( $cap, 'read_over_api' ) ){
26
+		if (\EE_Capabilities::instance()->current_user_can($cap, 'read_over_api')) {
27 27
 			return \EE_Config::instance();
28
-		}else{
28
+		} else {
29 29
 			return new \WP_Error(
30 30
 				'cannot_read_config',
31 31
 				sprintf(
@@ -35,7 +35,7 @@  discard block
 block discarded – undo
35 35
 					),
36 36
 					$cap
37 37
 				),
38
-				array( 'status' => 403 )
38
+				array('status' => 403)
39 39
 			);
40 40
 		}
41 41
 	}
Please login to merge, or discard this patch.
core/libraries/rest_api/controllers/model/Base.php 2 patches
Indentation   +3 added lines, -3 removed lines patch added patch discarded remove patch
@@ -26,9 +26,9 @@
 block discarded – undo
26 26
 	protected $_model_version_info;
27 27
 
28 28
 /**
29
-	 * Sets the version the user requested
30
-	 * @param string $version eg '4.8'
31
-	 */
29
+ * Sets the version the user requested
30
+ * @param string $version eg '4.8'
31
+ */
32 32
 	public function set_requested_version( $version ) {
33 33
 		parent::set_requested_version( $version );
34 34
 		$this->_model_version_info = new Model_Version_Info( $version );
Please login to merge, or discard this patch.
Spacing   +10 added lines, -10 removed lines patch added patch discarded remove patch
@@ -3,8 +3,8 @@  discard block
 block discarded – undo
3 3
 use EventEspresso\core\libraries\rest_api\controllers\Base as Controller_Base;
4 4
 use EventEspresso\core\libraries\rest_api\Model_Version_Info;
5 5
 
6
-if ( !defined( 'EVENT_ESPRESSO_VERSION' ) ) {
7
-	exit( 'No direct script access allowed' );
6
+if ( ! defined('EVENT_ESPRESSO_VERSION')) {
7
+	exit('No direct script access allowed');
8 8
 }
9 9
 
10 10
 /**
@@ -29,9 +29,9 @@  discard block
 block discarded – undo
29 29
 	 * Sets the version the user requested
30 30
 	 * @param string $version eg '4.8'
31 31
 	 */
32
-	public function set_requested_version( $version ) {
33
-		parent::set_requested_version( $version );
34
-		$this->_model_version_info = new Model_Version_Info( $version );
32
+	public function set_requested_version($version) {
33
+		parent::set_requested_version($version);
34
+		$this->_model_version_info = new Model_Version_Info($version);
35 35
 	}
36 36
 
37 37
 
@@ -43,8 +43,8 @@  discard block
 block discarded – undo
43 43
 	 * @return \EventEspresso\core\libraries\rest_api\Model_Version_Info
44 44
 	 * @throws \EE_Error
45 45
 	 */
46
-	public function get_model_version_info(){
47
-		if( ! $this->_model_version_info ) {
46
+	public function get_model_version_info() {
47
+		if ( ! $this->_model_version_info) {
48 48
 			throw new \EE_Error(
49 49
 				sprintf(
50 50
 					__(
@@ -66,9 +66,9 @@  discard block
 block discarded – undo
66 66
 	 * @param array $classnames
67 67
 	 * @return boolean
68 68
 	 */
69
-	public function is_subclass_of_one( $object, $classnames ) {
70
-		foreach( $classnames as $classname ) {
71
-			if( is_a( $object, $classname ) ) {
69
+	public function is_subclass_of_one($object, $classnames) {
70
+		foreach ($classnames as $classname) {
71
+			if (is_a($object, $classname)) {
72 72
 				return true;
73 73
 			}
74 74
 		}
Please login to merge, or discard this patch.