Completed
Branch FET-8837-purchasing-agent (3c506c)
by
unknown
832:15 queued 816:38
created
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/batch/Helpers/JobParameters.php 2 patches
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/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.
core/libraries/rest_api/controllers/Base.php 3 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.
Doc Comments   +1 added lines, -1 removed lines patch added patch discarded remove patch
@@ -129,7 +129,7 @@
 block discarded – undo
129 129
 	 *
130 130
 	 * @param string $route
131 131
 	 * @param string $regex
132
-	 * @param array  $match_keys EXCLUDING matching the entire regex
132
+	 * @param string[]  $match_keys EXCLUDING matching the entire regex
133 133
 	 * @return array where  $match_keys are the keys (the first value of $match_keys
134 134
 	 * becomes the first key of the return value, etc. Eg passing in $match_keys of
135 135
 	 * array( 'model', 'id' ), will, if the regex is successful, will return
Please login to merge, or discard this patch.
Spacing   +53 added lines, -53 removed lines patch added patch discarded remove patch
@@ -1,8 +1,8 @@  discard block
 block discarded – undo
1 1
 <?php
2 2
 namespace EventEspresso\core\libraries\rest_api\controllers;
3 3
 
4
-if ( !defined( 'EVENT_ESPRESSO_VERSION' ) ) {
5
-	exit( 'No direct script access allowed' );
4
+if ( ! defined('EVENT_ESPRESSO_VERSION')) {
5
+	exit('No direct script access allowed');
6 6
 }
7 7
 
8 8
 /**
@@ -36,7 +36,7 @@  discard block
 block discarded – undo
36 36
 	protected $_requested_version;
37 37
 
38 38
 	public function __construct() {
39
-		$this->_debug_mode = defined( 'EE_REST_API_DEBUG_MODE' ) ? EE_REST_API_DEBUG_MODE : false;
39
+		$this->_debug_mode = defined('EE_REST_API_DEBUG_MODE') ? EE_REST_API_DEBUG_MODE : false;
40 40
 	}
41 41
 
42 42
 
@@ -44,7 +44,7 @@  discard block
 block discarded – undo
44 44
 	 * Sets the version the user requested
45 45
 	 * @param string $version eg '4.8'
46 46
 	 */
47
-	public function set_requested_version( $version ) {
47
+	public function set_requested_version($version) {
48 48
 		$this->_requested_version = $version;
49 49
 	}
50 50
 
@@ -53,8 +53,8 @@  discard block
 block discarded – undo
53 53
 	 * @param string $key
54 54
 	 * @param string|array $info
55 55
 	 */
56
-	protected function _set_debug_info( $key, $info ){
57
-		$this->_debug_info[ $key ] = $info;
56
+	protected function _set_debug_info($key, $info) {
57
+		$this->_debug_info[$key] = $info;
58 58
 	}
59 59
 	
60 60
 	/**
@@ -62,13 +62,13 @@  discard block
 block discarded – undo
62 62
 	 * @param \WP_Error $wp_error_response
63 63
 	 * @return \WP_Error
64 64
 	 */
65
-	protected function _add_ee_errors_to_response( \WP_Error $wp_error_response ) {
65
+	protected function _add_ee_errors_to_response(\WP_Error $wp_error_response) {
66 66
 		$notices_during_checkin = \EE_Error::get_raw_notices();
67
-		if( ! empty( $notices_during_checkin[ 'errors' ] ) ) {	
68
-			foreach( $notices_during_checkin[ 'errors' ] as $error_code => $error_message ) {
67
+		if ( ! empty($notices_during_checkin['errors'])) {	
68
+			foreach ($notices_during_checkin['errors'] as $error_code => $error_message) {
69 69
 				$wp_error_response->add( 
70
-					sanitize_key( $error_code ), 
71
-					strip_tags( $error_message ) );
70
+					sanitize_key($error_code), 
71
+					strip_tags($error_message) );
72 72
 			}
73 73
 		}
74 74
 		return $wp_error_response;
@@ -86,28 +86,28 @@  discard block
 block discarded – undo
86 86
 	 * @param array|\WP_Error|\Exception $response
87 87
 	 * @return \WP_REST_Response
88 88
 	 */
89
-	public function send_response( $response ) {
90
-		if( $response instanceof \Exception ) {
91
-			$response = new \WP_Error( $response->getCode(), $response->getMessage() );
89
+	public function send_response($response) {
90
+		if ($response instanceof \Exception) {
91
+			$response = new \WP_Error($response->getCode(), $response->getMessage());
92 92
 		}
93
-		if( $response instanceof \WP_Error ) {
94
-			$response = $this->_add_ee_errors_to_response( $response );
95
-			$rest_response = $this->_create_rest_response_from_wp_error( $response );
96
-		}else{
97
-			$rest_response = new \WP_REST_Response( $response, 200 );
93
+		if ($response instanceof \WP_Error) {
94
+			$response = $this->_add_ee_errors_to_response($response);
95
+			$rest_response = $this->_create_rest_response_from_wp_error($response);
96
+		} else {
97
+			$rest_response = new \WP_REST_Response($response, 200);
98 98
 		}
99 99
 		$headers = array();
100
-		if( $this->_debug_mode && is_array( $this->_debug_info ) ) {
101
-			foreach( $this->_debug_info  as $debug_key => $debug_info ) {
102
-				if( is_array( $debug_info ) ) {
103
-					$debug_info = json_encode( $debug_info );
100
+		if ($this->_debug_mode && is_array($this->_debug_info)) {
101
+			foreach ($this->_debug_info  as $debug_key => $debug_info) {
102
+				if (is_array($debug_info)) {
103
+					$debug_info = json_encode($debug_info);
104 104
 				}
105
-				$headers[ 'X-EE4-Debug-' . ucwords( $debug_key ) ] = $debug_info;
105
+				$headers['X-EE4-Debug-'.ucwords($debug_key)] = $debug_info;
106 106
 			}
107 107
 		}
108
-		$headers = array_merge( $headers, $this->_get_headers_from_ee_notices() );
108
+		$headers = array_merge($headers, $this->_get_headers_from_ee_notices());
109 109
 		
110
-		$rest_response->set_headers( $headers );
110
+		$rest_response->set_headers($headers);
111 111
 		return $rest_response;
112 112
 	}
113 113
 	
@@ -118,31 +118,31 @@  discard block
 block discarded – undo
118 118
 	 * @param \WP_Error $wp_error
119 119
 	 * @return \WP_REST_Response
120 120
 	 */
121
-	protected function _create_rest_response_from_wp_error( \WP_Error $wp_error ) {
121
+	protected function _create_rest_response_from_wp_error(\WP_Error $wp_error) {
122 122
 		$error_data = $wp_error->get_error_data();
123
-		if ( is_array( $error_data ) && isset( $error_data['status'] ) ) {
123
+		if (is_array($error_data) && isset($error_data['status'])) {
124 124
 			$status = $error_data['status'];
125 125
 		} else {
126 126
 			$status = 500;
127 127
 		}
128 128
 
129 129
 		$errors = array();
130
-		foreach ( (array) $wp_error->errors as $code => $messages ) {
131
-			foreach ( (array) $messages as $message ) {
130
+		foreach ((array) $wp_error->errors as $code => $messages) {
131
+			foreach ((array) $messages as $message) {
132 132
 				$errors[] = array(
133 133
 					'code'    => $code,
134 134
 					'message' => $message,
135
-					'data'    => $wp_error->get_error_data( $code )
135
+					'data'    => $wp_error->get_error_data($code)
136 136
 				);
137 137
 			}
138 138
 		}
139
-		$data = isset( $errors[0] ) ? $errors[0] : array();
140
-		if ( count( $errors ) > 1 ) {
139
+		$data = isset($errors[0]) ? $errors[0] : array();
140
+		if (count($errors) > 1) {
141 141
 			// Remove the primary error.
142
-			array_shift( $errors );
142
+			array_shift($errors);
143 143
 			$data['additional_errors'] = $errors;
144 144
 		}
145
-		return new \WP_REST_Response( $data, $status );
145
+		return new \WP_REST_Response($data, $status);
146 146
 	}
147 147
 	
148 148
 	/**
@@ -152,12 +152,12 @@  discard block
 block discarded – undo
152 152
 	protected function _get_headers_from_ee_notices() {
153 153
 		$headers = array();
154 154
 		$notices = \EE_Error::get_raw_notices();
155
-		foreach( $notices as $notice_type => $sub_notices ) {
156
-			if( ! is_array( $sub_notices ) ) {
155
+		foreach ($notices as $notice_type => $sub_notices) {
156
+			if ( ! is_array($sub_notices)) {
157 157
 				continue;
158 158
 			}
159
-			foreach( $sub_notices as $notice_code => $sub_notice ) {
160
-				$headers[ 'X-EE4-Notices-' . \EEH_Inflector::humanize( $notice_type ) . '[' . $notice_code . ']' ] = strip_tags( $sub_notice );
159
+			foreach ($sub_notices as $notice_code => $sub_notice) {
160
+				$headers['X-EE4-Notices-'.\EEH_Inflector::humanize($notice_type).'['.$notice_code.']'] = strip_tags($sub_notice);
161 161
 			}
162 162
 		}
163 163
 		return apply_filters( 
@@ -175,14 +175,14 @@  discard block
 block discarded – undo
175 175
 	 * @param string $route 
176 176
 	 * @return string
177 177
 	 */
178
-	public function get_requested_version( $route ) {
178
+	public function get_requested_version($route) {
179 179
 		$matches = $this->parse_route(
180 180
 			$route,
181
-			'~' . \EED_Core_Rest_Api::ee_api_namespace_for_regex . '~',
182
-			array( 'version' )
181
+			'~'.\EED_Core_Rest_Api::ee_api_namespace_for_regex.'~',
182
+			array('version')
183 183
 			);
184
-		if( isset( $matches[ 'version' ] ) ) {
185
-			return $matches[ 'version' ];
184
+		if (isset($matches['version'])) {
185
+			return $matches['version'];
186 186
 		} else {
187 187
 			return \EED_Core_Rest_Api::latest_rest_api_version();
188 188
 		}
@@ -207,23 +207,23 @@  discard block
 block discarded – undo
207 207
 	 * array( 'model' => 'foo', 'id' => 'bar' )
208 208
 	 * @throws \EE_Error if it couldn't be parsed
209 209
 	 */
210
-	public function parse_route( $route, $regex, $match_keys ) {
210
+	public function parse_route($route, $regex, $match_keys) {
211 211
 		$indexed_matches = array();
212
-		$success = preg_match( $regex, $route, $matches );
213
-		if(
214
-			is_array( $matches ) ) {
212
+		$success = preg_match($regex, $route, $matches);
213
+		if (
214
+			is_array($matches) ) {
215 215
 			//skip the overall regex match. Who cares
216
-			for( $i = 1; $i <= count( $match_keys ); $i++ ) {
217
-				if( ! isset( $matches[ $i ] ) ) {
216
+			for ($i = 1; $i <= count($match_keys); $i++) {
217
+				if ( ! isset($matches[$i])) {
218 218
 					$success = false;
219 219
 				} else {
220
-					$indexed_matches[ $match_keys[ $i - 1 ] ] = $matches[ $i ];
220
+					$indexed_matches[$match_keys[$i - 1]] = $matches[$i];
221 221
 				}
222 222
 			}
223 223
 		}
224
-		if( ! $success ) {
224
+		if ( ! $success) {
225 225
 			throw new \EE_Error(
226
-				__( 'We could not parse the URL. Please contact Event Espresso Support', 'event_espresso' ),
226
+				__('We could not parse the URL. Please contact Event Espresso Support', 'event_espresso'),
227 227
 				'endpoint_parsing_error'
228 228
 			);
229 229
 		}
Please login to merge, or discard this patch.
core/libraries/rest_api/Model_Version_Info.php 2 patches
Braces   +2 added lines, -2 removed lines patch added patch discarded remove patch
@@ -42,7 +42,7 @@  discard block
 block discarded – undo
42 42
 				$validation_error_message = $default_validation_strategy->get_validation_error_message();
43 43
 			}
44 44
 			throw new EE_Validation_Error( $validation_error_message, 'float_only' );
45
-		}else{
45
+		} else{
46 46
 			return floatval($normalized_value);
47 47
 		}
48 48
 	}
@@ -55,7 +55,7 @@  discard block
 block discarded – undo
55 55
 	public function unnormalize($normalized_value) {
56 56
 		if( empty( $normalized_value ) ){
57 57
 			return '0.00';
58
-		}else{
58
+		} else{
59 59
 			return "$normalized_value";
60 60
 		}
61 61
 	}
Please login to merge, or discard this patch.
Spacing   +57 added lines, -57 removed lines patch added patch discarded remove patch
@@ -1,8 +1,8 @@  discard block
 block discarded – undo
1 1
 <?php
2 2
 namespace EventEspresso\core\libraries\rest_api;
3 3
 
4
-if ( !defined( 'EVENT_ESPRESSO_VERSION' ) ) {
5
-	exit( 'No direct script access allowed' );
4
+if ( ! defined('EVENT_ESPRESSO_VERSION')) {
5
+	exit('No direct script access allowed');
6 6
 }
7 7
 
8 8
 /**
@@ -88,7 +88,7 @@  discard block
 block discarded – undo
88 88
 	protected $_cached_fields_on_models = array();
89 89
 
90 90
 
91
-	public function __construct( $requested_version ) {
91
+	public function __construct($requested_version) {
92 92
 		$this->_requested_version = $requested_version;
93 93
 		$this->_model_changes = array(
94 94
 			'4.8.28' => array(
@@ -110,13 +110,13 @@  discard block
 block discarded – undo
110 110
 			'table_column' => 'N/A',
111 111
 			'always_available' => true,
112 112
 		);
113
-		foreach( $this->_resource_changes as $version => $model_classnames ) {
114
-			foreach( $model_classnames as $model_classname => $extra_fields ) {
115
-				foreach( $extra_fields as $fieldname => $field_data ) {
116
-					$this->_resource_changes[ $model_classname ][ $fieldname ][ 'name' ] = $fieldname;
117
-					foreach( $defaults as $attribute => $default_value ) {
118
-						if( ! isset( $this->_resource_changes[ $model_classname ][ $fieldname ][ $attribute ] ) ) {
119
-							$this->_resource_changes[ $model_classname ][ $fieldname ][ $attribute ] = $default_value;
113
+		foreach ($this->_resource_changes as $version => $model_classnames) {
114
+			foreach ($model_classnames as $model_classname => $extra_fields) {
115
+				foreach ($extra_fields as $fieldname => $field_data) {
116
+					$this->_resource_changes[$model_classname][$fieldname]['name'] = $fieldname;
117
+					foreach ($defaults as $attribute => $default_value) {
118
+						if ( ! isset($this->_resource_changes[$model_classname][$fieldname][$attribute])) {
119
+							$this->_resource_changes[$model_classname][$fieldname][$attribute] = $default_value;
120 120
 						}
121 121
 					}
122 122
 				}
@@ -132,11 +132,11 @@  discard block
 block discarded – undo
132 132
 	 * @return array
133 133
 	 */
134 134
 	public function model_changes_between_requested_version_and_current() {
135
-		if( $this->_cached_model_changes_between_requested_version_and_current === null ) {
135
+		if ($this->_cached_model_changes_between_requested_version_and_current === null) {
136 136
 			$model_changes = array();
137
-			foreach( $this->model_changes() as $version => $models_changed_in_version ) {
138
-				if( $version <= \EED_Core_Rest_Api::core_version() && $version > $this->requested_version() ) {
139
-					$model_changes[ $version ] = $models_changed_in_version;
137
+			foreach ($this->model_changes() as $version => $models_changed_in_version) {
138
+				if ($version <= \EED_Core_Rest_Api::core_version() && $version > $this->requested_version()) {
139
+					$model_changes[$version] = $models_changed_in_version;
140 140
 				}
141 141
 			}
142 142
 			$this->_cached_model_changes_between_requested_version_and_current = $model_changes;
@@ -152,11 +152,11 @@  discard block
 block discarded – undo
152 152
 	 * @return array
153 153
 	 */
154 154
 	public function resource_changes_between_requested_version_and_current() {
155
-		if( $this->_cached_resource_changes_between_requested_version_and_current === null ) {
155
+		if ($this->_cached_resource_changes_between_requested_version_and_current === null) {
156 156
 			$resource_changes = array();
157
-			foreach( $this->resource_changes() as $version => $model_classnames ) {
158
-				if( $version <= \EED_Core_Rest_Api::core_version()  && $version > $this->requested_version()  ) {
159
-					$resource_changes[ $version ] = $model_classnames;
157
+			foreach ($this->resource_changes() as $version => $model_classnames) {
158
+				if ($version <= \EED_Core_Rest_Api::core_version() && $version > $this->requested_version()) {
159
+					$resource_changes[$version] = $model_classnames;
160 160
 				}
161 161
 			}
162 162
 			$this->_cached_resource_changes_between_requested_version_and_current = $resource_changes;
@@ -168,7 +168,7 @@  discard block
 block discarded – undo
168 168
 	 * If a request was sent to 'wp-json/ee/v4.7/events' this would be '4.7'
169 169
 	 * @return string like '4.6'
170 170
 	 */
171
-	public function requested_version(){
171
+	public function requested_version() {
172 172
 		return $this->_requested_version;
173 173
 	}
174 174
 
@@ -182,7 +182,7 @@  discard block
 block discarded – undo
182 182
 	 * If a version is missing then we don't know anything about what changes it introduced from the previous version
183 183
 	 * @return array
184 184
 	 */
185
-	public function model_changes(){
185
+	public function model_changes() {
186 186
 		return $this->_model_changes;
187 187
 	}
188 188
 
@@ -193,12 +193,12 @@  discard block
 block discarded – undo
193 193
 	 * @return array keys are model names, values are their classname
194 194
 	 */
195 195
 	public function models_for_requested_version() {
196
-		if( $this->_cached_models_for_requested_version === null ) {
196
+		if ($this->_cached_models_for_requested_version === null) {
197 197
 			$all_models_in_current_version = \EE_Registry::instance()->non_abstract_db_models;
198
-			foreach( $this->model_changes_between_requested_version_and_current() as $version => $models_changed ) {
199
-				foreach( $models_changed as $model_name => $new_indicator_or_fields_added ) {
200
-					if( $new_indicator_or_fields_added === Model_Version_Info::model_added ) {
201
-						unset( $all_models_in_current_version[ $model_name ] );
198
+			foreach ($this->model_changes_between_requested_version_and_current() as $version => $models_changed) {
199
+				foreach ($models_changed as $model_name => $new_indicator_or_fields_added) {
200
+					if ($new_indicator_or_fields_added === Model_Version_Info::model_added) {
201
+						unset($all_models_in_current_version[$model_name]);
202 202
 					}
203 203
 				}
204 204
 			}
@@ -217,11 +217,11 @@  discard block
 block discarded – undo
217 217
 	 * @param string $model_name eg 'Event'
218 218
 	 * @return boolean
219 219
 	 */
220
-	public function is_model_name_in_this_version( $model_name ) {
220
+	public function is_model_name_in_this_version($model_name) {
221 221
 		$model_names = $this->models_for_requested_version();
222
-		if( isset( $model_names[ $model_name ] ) ) {
222
+		if (isset($model_names[$model_name])) {
223 223
 			return true;
224
-		}else{
224
+		} else {
225 225
 			return false;
226 226
 		}
227 227
 	}
@@ -236,10 +236,10 @@  discard block
 block discarded – undo
236 236
 	 * @return \EEM_Base
237 237
 	 * @throws \EE_Error
238 238
 	 */
239
-	public function load_model( $model_name ) {
240
-		if( $this->is_model_name_in_this_version( $model_name ) ) {
241
-			return \EE_Registry::instance()->load_model( $model_name );
242
-		}else{
239
+	public function load_model($model_name) {
240
+		if ($this->is_model_name_in_this_version($model_name)) {
241
+			return \EE_Registry::instance()->load_model($model_name);
242
+		} else {
243 243
 			throw new \EE_Error(
244 244
 				sprintf(
245 245
 					__(
@@ -261,21 +261,21 @@  discard block
 block discarded – undo
261 261
 	 * @param \EEM_Base $model
262 262
 	 * @return array|\EE_Model_Field_Base[]
263 263
 	 */
264
-	public function fields_on_model_in_this_version( $model ) {
265
-		if( ! isset( $this->_cached_fields_on_models[ $model->get_this_model_name() ] ) ) {
264
+	public function fields_on_model_in_this_version($model) {
265
+		if ( ! isset($this->_cached_fields_on_models[$model->get_this_model_name()])) {
266 266
 			//get all model changes between the requested version and current core version
267 267
 			$changes = $this->model_changes_between_requested_version_and_current();
268 268
 			//fetch all fields currently on this model
269 269
 			$current_fields = $model->field_settings();
270 270
 			//remove all fields that have been added since
271
-			foreach( $changes as $version => $changes_in_version ) {
272
-				if(
273
-					isset( $changes_in_version[ $model->get_this_model_name() ] )
274
-					&& $changes_in_version[ $model->get_this_model_name() ] !== Model_Version_Info::model_added
271
+			foreach ($changes as $version => $changes_in_version) {
272
+				if (
273
+					isset($changes_in_version[$model->get_this_model_name()])
274
+					&& $changes_in_version[$model->get_this_model_name()] !== Model_Version_Info::model_added
275 275
 				) {
276 276
 					$current_fields = array_diff_key(
277 277
 						$current_fields,
278
-						array_flip( $changes_in_version[ $model->get_this_model_name() ] )
278
+						array_flip($changes_in_version[$model->get_this_model_name()])
279 279
 					);
280 280
 				}
281 281
 			}
@@ -293,9 +293,9 @@  discard block
 block discarded – undo
293 293
 	 * @param array $classnames
294 294
 	 * @return boolean
295 295
 	 */
296
-	public function is_subclass_of_one( $object, $classnames ) {
297
-		foreach( $classnames as $classname ) {
298
-			if( is_a( $object, $classname ) ) {
296
+	public function is_subclass_of_one($object, $classnames) {
297
+		foreach ($classnames as $classname) {
298
+			if (is_a($object, $classname)) {
299 299
 				return true;
300 300
 			}
301 301
 		}
@@ -306,10 +306,10 @@  discard block
 block discarded – undo
306 306
 	 * Returns the list of model field classes that that the API basically ignores
307 307
 	 * @return array
308 308
 	 */
309
-	public function fields_ignored(){
309
+	public function fields_ignored() {
310 310
 		return apply_filters(
311 311
 			'FHEE__Controller_Model_Read_fields_ignored',
312
-			array( 'EE_Foreign_Key_Field_Base', 'EE_Any_Foreign_Model_Name_Field' )
312
+			array('EE_Foreign_Key_Field_Base', 'EE_Any_Foreign_Model_Name_Field')
313 313
 		);
314 314
 	}
315 315
 
@@ -318,8 +318,8 @@  discard block
 block discarded – undo
318 318
 	 * @param EE_Model_Field_Base
319 319
 	 * @return boolean
320 320
 	 */
321
-	public function field_is_ignored( $field_obj ){
322
-		 return $this->is_subclass_of_one( $field_obj, $this->fields_ignored() );
321
+	public function field_is_ignored($field_obj) {
322
+		 return $this->is_subclass_of_one($field_obj, $this->fields_ignored());
323 323
 	}
324 324
 
325 325
 	/**
@@ -330,7 +330,7 @@  discard block
 block discarded – undo
330 330
 	public function fields_that_have_rendered_format() {
331 331
 		return apply_filters(
332 332
 			'FHEE__Controller_Model_Read__fields_raw',
333
-			array( 'EE_Post_Content_Field', 'EE_Full_HTML_Field' )
333
+			array('EE_Post_Content_Field', 'EE_Full_HTML_Field')
334 334
 		);
335 335
 	}
336 336
 
@@ -339,8 +339,8 @@  discard block
 block discarded – undo
339 339
 	 * @param EE_Model_Field_Base
340 340
 	 * @return boolean
341 341
 	 */
342
-	public function field_has_rendered_format( $field_obj ){
343
-		 return $this->is_subclass_of_one( $field_obj, $this->fields_that_have_rendered_format() );
342
+	public function field_has_rendered_format($field_obj) {
343
+		 return $this->is_subclass_of_one($field_obj, $this->fields_that_have_rendered_format());
344 344
 	}
345 345
 
346 346
 	/**
@@ -352,7 +352,7 @@  discard block
 block discarded – undo
352 352
 	public function fields_that_have_pretty_format() {
353 353
 		return apply_filters(
354 354
 			'FHEE__Controller_Model_Read__fields_pretty',
355
-			array( 'EE_Enum_Integer_Field', 'EE_Enum_Text_Field', 'EE_Money_Field' )
355
+			array('EE_Enum_Integer_Field', 'EE_Enum_Text_Field', 'EE_Money_Field')
356 356
 		);
357 357
 	}
358 358
 
@@ -361,8 +361,8 @@  discard block
 block discarded – undo
361 361
 	 * @param EE_Model_Field_Base
362 362
 	 * @return boolean
363 363
 	 */
364
-	public function field_has_pretty_format( $field_obj ){
365
-		 return $this->is_subclass_of_one( $field_obj, $this->fields_that_have_pretty_format() );
364
+	public function field_has_pretty_format($field_obj) {
365
+		 return $this->is_subclass_of_one($field_obj, $this->fields_that_have_pretty_format());
366 366
 	}
367 367
 
368 368
 	/**
@@ -379,12 +379,12 @@  discard block
 block discarded – undo
379 379
 	 * @param \EEM_Base $model
380 380
 	 * @return array
381 381
 	 */
382
-	public function extra_resource_properties_for_model( $model ) {
382
+	public function extra_resource_properties_for_model($model) {
383 383
 		$extra_properties = array();
384
-		foreach( $this->resource_changes_between_requested_version_and_current() as $version => $model_classnames ) {
385
-			foreach( $model_classnames as $model_classname => $properties_added_in_this_version ) {
386
-				if( is_subclass_of( $model, $model_classname ) ) {
387
-					$extra_properties = array_merge( $extra_properties, $properties_added_in_this_version );
384
+		foreach ($this->resource_changes_between_requested_version_and_current() as $version => $model_classnames) {
385
+			foreach ($model_classnames as $model_classname => $properties_added_in_this_version) {
386
+				if (is_subclass_of($model, $model_classname)) {
387
+					$extra_properties = array_merge($extra_properties, $properties_added_in_this_version);
388 388
 				}
389 389
 			}
390 390
 		}
Please login to merge, or discard this patch.
core/libraries/rest_api/controllers/model/Meta.php 2 patches
Braces   +3 added lines, -3 removed lines patch added patch discarded remove patch
@@ -44,11 +44,11 @@
 block discarded – undo
44 44
 
45 45
 				if( $field_obj instanceof \EE_Boolean_Field ) {
46 46
 					$datatype = 'Boolean';
47
-				}elseif( $field_obj->get_wpdb_data_type() == '%d' ) {
47
+				} elseif( $field_obj->get_wpdb_data_type() == '%d' ) {
48 48
 					$datatype = 'Number';
49
-				}elseif( $field_name instanceof \EE_Serialized_Text_Field ) {
49
+				} elseif( $field_name instanceof \EE_Serialized_Text_Field ) {
50 50
 					$datatype = 'Object';
51
-				}else{
51
+				} else{
52 52
 					$datatype = 'String';
53 53
 				}
54 54
 				$field_json = array(
Please login to merge, or discard this patch.
Spacing   +40 added lines, -40 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\model;
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
 /**
@@ -22,20 +22,20 @@  discard block
 block discarded – undo
22 22
 	 * @param \WP_REST_Request $request
23 23
 	 * @return array|\WP_REST_Response
24 24
 	 */
25
-	public static function handle_request_models_meta( \WP_REST_Request $request ) {
25
+	public static function handle_request_models_meta(\WP_REST_Request $request) {
26 26
 		$controller = new Meta();
27
-		try{
27
+		try {
28 28
 			$matches = $controller->parse_route(
29 29
 				$request->get_route(),
30
-				'~' . \EED_Core_Rest_Api::ee_api_namespace_for_regex . 'resources~',
31
-				array( 'version' ) );
32
-			if( $matches instanceof \WP_REST_Response ) {
30
+				'~'.\EED_Core_Rest_Api::ee_api_namespace_for_regex.'resources~',
31
+				array('version') );
32
+			if ($matches instanceof \WP_REST_Response) {
33 33
 				return $matches;
34 34
 			}
35
-			$controller->set_requested_version( $matches[ 'version' ] );
36
-			return $controller->send_response( $controller->_get_models_metadata_entity() );
37
-		} catch( \Exception $e ) {
38
-			return $controller->send_response( $e );
35
+			$controller->set_requested_version($matches['version']);
36
+			return $controller->send_response($controller->_get_models_metadata_entity());
37
+		} catch (\Exception $e) {
38
+			return $controller->send_response($e);
39 39
 		}
40 40
 	}
41 41
 
@@ -43,58 +43,58 @@  discard block
 block discarded – undo
43 43
 	 * Gets the model metadata resource entity
44 44
 	 * @return array for JSON response, describing all the models available in teh requested version
45 45
 	 */
46
-	protected function _get_models_metadata_entity(){
46
+	protected function _get_models_metadata_entity() {
47 47
 		$response = array();
48
-		foreach( $this->get_model_version_info()->models_for_requested_version() as $model_name => $model_classname ){
49
-			$model = $this->get_model_version_info()->load_model( $model_name );
48
+		foreach ($this->get_model_version_info()->models_for_requested_version() as $model_name => $model_classname) {
49
+			$model = $this->get_model_version_info()->load_model($model_name);
50 50
 			$fields_json = array();
51
-			foreach( $this->get_model_version_info()->fields_on_model_in_this_version( $model ) as $field_name => $field_obj ) {
52
-				if( $this->get_model_version_info()->field_is_ignored( $field_obj ) ) {
51
+			foreach ($this->get_model_version_info()->fields_on_model_in_this_version($model) as $field_name => $field_obj) {
52
+				if ($this->get_model_version_info()->field_is_ignored($field_obj)) {
53 53
 					continue;
54 54
 				}
55
-				if( $field_obj instanceof \EE_Boolean_Field ) {
55
+				if ($field_obj instanceof \EE_Boolean_Field) {
56 56
 					$datatype = 'Boolean';
57
-				}elseif( $field_obj->get_wpdb_data_type() == '%d' ) {
57
+				}elseif ($field_obj->get_wpdb_data_type() == '%d') {
58 58
 					$datatype = 'Number';
59
-				}elseif( $field_name instanceof \EE_Serialized_Text_Field ) {
59
+				}elseif ($field_name instanceof \EE_Serialized_Text_Field) {
60 60
 					$datatype = 'Object';
61
-				}else{
61
+				} else {
62 62
 					$datatype = 'String';
63 63
 				}
64 64
 				$default_value = $field_obj->get_default_value();
65
-				if( $default_value === EE_INF ) {
65
+				if ($default_value === EE_INF) {
66 66
 					$default_value = EE_INF_IN_DB;
67
-				} elseif( $field_obj instanceof \EE_Datetime_Field &&
68
-					$default_value instanceof \DateTime ) {
69
-					$default_value = $default_value->format( 'c' );
67
+				} elseif ($field_obj instanceof \EE_Datetime_Field &&
68
+					$default_value instanceof \DateTime) {
69
+					$default_value = $default_value->format('c');
70 70
 				}
71 71
 				$field_json = array(
72 72
 					'name' => $field_name,
73 73
 					'nicename' => $field_obj->get_nicename(),
74
-					'has_rendered_format' => $this->get_model_version_info()->field_has_rendered_format( $field_obj ),
75
-					'has_pretty_format' => $this->get_model_version_info()->field_has_pretty_format( $field_obj ),
76
-					'type' => str_replace('EE_', '', get_class( $field_obj ) ),
74
+					'has_rendered_format' => $this->get_model_version_info()->field_has_rendered_format($field_obj),
75
+					'has_pretty_format' => $this->get_model_version_info()->field_has_pretty_format($field_obj),
76
+					'type' => str_replace('EE_', '', get_class($field_obj)),
77 77
 					'datatype' => $datatype,
78 78
 					'nullable' => $field_obj->is_nullable(),
79 79
 					'default' => $default_value,
80 80
 					'table_alias' => $field_obj->get_table_alias(),
81 81
 					'table_column' => $field_obj->get_table_column(),
82 82
 				);
83
-				$fields_json[ $field_json[ 'name' ] ] = $field_json;
83
+				$fields_json[$field_json['name']] = $field_json;
84 84
 
85 85
 			}
86
-			$fields_json = array_merge( $fields_json, $this->get_model_version_info()->extra_resource_properties_for_model( $model ) );
87
-			$response[ $model_name ]['fields'] = apply_filters( 'FHEE__Meta__handle_request_models_meta__fields', $fields_json, $model );
86
+			$fields_json = array_merge($fields_json, $this->get_model_version_info()->extra_resource_properties_for_model($model));
87
+			$response[$model_name]['fields'] = apply_filters('FHEE__Meta__handle_request_models_meta__fields', $fields_json, $model);
88 88
 			$relations_json = array();
89
-			foreach( $model->relation_settings()  as $relation_name => $relation_obj ) {
89
+			foreach ($model->relation_settings()  as $relation_name => $relation_obj) {
90 90
 				$relation_json = array(
91 91
 					'name' => $relation_name,
92
-					'type' => str_replace( 'EE_', '', get_class( $relation_obj ) ),
92
+					'type' => str_replace('EE_', '', get_class($relation_obj)),
93 93
 					'single' => $relation_obj instanceof \EE_Belongs_To_Relation ? true : false,
94 94
 				);
95
-				$relations_json[ $relation_name ] = $relation_json;
95
+				$relations_json[$relation_name] = $relation_json;
96 96
 			}
97
-			$response[ $model_name ][ 'relations' ] = apply_filters( 'FHEE__Meta__handle_request_models_meta__relations', $relations_json, $model );
97
+			$response[$model_name]['relations'] = apply_filters('FHEE__Meta__handle_request_models_meta__relations', $relations_json, $model);
98 98
 		}
99 99
 		return $response;
100 100
 	}
@@ -104,23 +104,23 @@  discard block
 block discarded – undo
104 104
 	 * @param \WP_REST_Response $rest_response_obj
105 105
 	 * @return \WP_REST_Response
106 106
 	 */
107
-	public static function filter_ee_metadata_into_index( \WP_REST_Response $rest_response_obj ) {
107
+	public static function filter_ee_metadata_into_index(\WP_REST_Response $rest_response_obj) {
108 108
 		$response_data = $rest_response_obj->get_data();
109 109
 		$addons = array();
110
-		foreach( \EE_Registry::instance()->addons as $addon){
110
+		foreach (\EE_Registry::instance()->addons as $addon) {
111 111
 			$addon_json = array(
112 112
 				'name' => $addon->name(),
113 113
 				'version' => $addon->version()
114 114
 			);
115
-			$addons[ $addon_json[ 'name' ] ] = $addon_json;
115
+			$addons[$addon_json['name']] = $addon_json;
116 116
 		}
117
-		$response_data[ 'ee' ] = array(
117
+		$response_data['ee'] = array(
118 118
 			'version' => \EEM_System_Status::instance()->get_ee_version(),
119 119
 			'addons' => $addons,
120 120
 			'maintenance_mode' => \EE_Maintenance_Mode::instance()->real_level(),
121
-			'served_core_versions' => array_keys( \EED_Core_Rest_Api::versions_served() )
121
+			'served_core_versions' => array_keys(\EED_Core_Rest_Api::versions_served())
122 122
 		);
123
-		$rest_response_obj->set_data( $response_data );
123
+		$rest_response_obj->set_data($response_data);
124 124
 		return $rest_response_obj;
125 125
 	}
126 126
 }
Please login to merge, or discard this patch.
core/admin/templates/admin_details_wrapper.template.php 1 patch
Spacing   +5 added lines, -5 removed lines patch added patch discarded remove patch
@@ -1,7 +1,7 @@  discard block
 block discarded – undo
1 1
 <?php
2 2
 global $post_type, $post;
3 3
 //action for registering metaboxes
4
-do_action( 'add_meta_boxes', $post_type, $post );
4
+do_action('add_meta_boxes', $post_type, $post);
5 5
 ?>
6 6
 <div id="admin-page-header">
7 7
 	<?php echo $admin_page_header; ?>
@@ -10,7 +10,7 @@  discard block
 block discarded – undo
10 10
 		<!-- admin-page-header -->
11 11
 	<div id="post-body" class="metabox-holder columns-2">
12 12
 
13
-	<?php if ( ! empty( $post_body_content )) : ?>
13
+	<?php if ( ! empty($post_body_content)) : ?>
14 14
 		<div id="post-body-content">
15 15
 			<?php echo $post_body_content; ?>
16 16
 		</div>
@@ -18,13 +18,13 @@  discard block
 block discarded – undo
18 18
 	<?php endif; ?>
19 19
 
20 20
 		<div id="postbox-container-1" class="postbox-container">
21
-			<?php do_meta_boxes( $current_page, 'side', NULL ); ?>
21
+			<?php do_meta_boxes($current_page, 'side', NULL); ?>
22 22
 		</div>
23 23
 		<!-- postbox-container-1 -->
24 24
 
25 25
 		<div id="postbox-container-2" class="postbox-container">
26
-			<?php do_meta_boxes( $current_page, 'normal', NULL ); ?>
27
-			<?php do_meta_boxes( $current_page, 'advanced', NULL ); ?>
26
+			<?php do_meta_boxes($current_page, 'normal', NULL); ?>
27
+			<?php do_meta_boxes($current_page, 'advanced', NULL); ?>
28 28
 		</div>
29 29
 		<!-- postbox-container-2 -->
30 30
 
Please login to merge, or discard this patch.
core/db_models/strategies/EE_Restriction_Generator_Meta.strategy.php 1 patch
Spacing   +13 added lines, -13 removed lines patch added patch discarded remove patch
@@ -1,6 +1,6 @@  discard block
 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
 /**
@@ -14,7 +14,7 @@  discard block
 block discarded – undo
14 14
  * @author				Mike Nelson
15 15
  *
16 16
  */
17
-class EE_Restriction_Generator_Meta extends EE_Restriction_Generator_Base{
17
+class EE_Restriction_Generator_Meta extends EE_Restriction_Generator_Base {
18 18
 
19 19
 	/**
20 20
 	 *
@@ -33,7 +33,7 @@  discard block
 block discarded – undo
33 33
 	 * @param string $key_field_name
34 34
 	 * @param string $value_field_name
35 35
 	 */
36
-	public function __construct( $key_field_name, $value_field_name ) {
36
+	public function __construct($key_field_name, $value_field_name) {
37 37
 		$this->_key_field_name = $key_field_name;
38 38
 		$this->_value_field_name = $value_field_name;
39 39
 	}
@@ -45,21 +45,21 @@  discard block
 block discarded – undo
45 45
 	 * @throws EE_Error
46 46
 	 */
47 47
 	protected function _generate_restrictions() {
48
-		$whitelisted_meta_keys = apply_filters( 'FHEE__EE_Restriction_Generator_Meta___generate_restrictions__whitelisted_meta_keys', array() );
49
-		$blacklisted_meta_keys = apply_filters( 'FHEE__EE_Restriction_Generator_Meta___generate_restrictions__blacklisted_meta_keys', array() );
48
+		$whitelisted_meta_keys = apply_filters('FHEE__EE_Restriction_Generator_Meta___generate_restrictions__whitelisted_meta_keys', array());
49
+		$blacklisted_meta_keys = apply_filters('FHEE__EE_Restriction_Generator_Meta___generate_restrictions__blacklisted_meta_keys', array());
50 50
 		$conditions = array(
51
-			$this->_key_field_name => array( 'NOT_LIKE', "\\\\_%" ),//each slash is escaped because we are using double quotes, and 
51
+			$this->_key_field_name => array('NOT_LIKE', "\\\\_%"), //each slash is escaped because we are using double quotes, and 
52 52
 			//stripslashes will be called on this because the models assume this is from user input
53
-			$this->_value_field_name => array( 'NOT_REGEXP', '^[aOs]:[\d]:.*$')					
53
+			$this->_value_field_name => array('NOT_REGEXP', '^[aOs]:[\d]:.*$')					
54 54
 		);
55
-		if( ! empty( $blacklisted_meta_keys ) ) {
56
-			$conditions[ $this->_key_field_name . '*blacklisted' ] = array( 'NOT_IN', $blacklisted_meta_keys );
55
+		if ( ! empty($blacklisted_meta_keys)) {
56
+			$conditions[$this->_key_field_name.'*blacklisted'] = array('NOT_IN', $blacklisted_meta_keys);
57 57
 		}
58
-		if( ! empty( $whitelisted_meta_keys ) ) {
58
+		if ( ! empty($whitelisted_meta_keys)) {
59 59
 			$conditions = array(
60 60
 				'OR*whitelisted-or-normal' => array(
61 61
 					'AND' => $conditions,
62
-					$this->_key_field_name . '*whitelisted' => array( 'IN', $whitelisted_meta_keys ) 
62
+					$this->_key_field_name.'*whitelisted' => array('IN', $whitelisted_meta_keys) 
63 63
 				)
64 64
 			);
65 65
 		}
@@ -67,7 +67,7 @@  discard block
 block discarded – undo
67 67
 			//only allow access to non-protected metas if they're an admin
68 68
 			EE_Restriction_Generator_Base::get_default_restrictions_cap() => new EE_Return_None_Where_Conditions(),
69 69
 			//don't allow access to protected metas to anyone. If they want that, don't apply caps to the query
70
-			'apply-to-all-queries-using-caps' => new EE_Default_Where_Conditions( $conditions ),
70
+			'apply-to-all-queries-using-caps' => new EE_Default_Where_Conditions($conditions),
71 71
 		);
72 72
 	}
73 73
 }
Please login to merge, or discard this patch.