eventespresso / event-espresso-core

core/libraries/qtips/EE_Qtip_Config.lib.php

Braces +6 added lines, -4 removed lines

@@ -177,8 +177,9 @@ 
 	protected function _construct_tips() {
 		foreach ( $this->_qtipsa as $qt ) {
 			//make sure we have what we need.
-			if ( !isset( $qt['content_id'] ) || !isset( $qt['target'] ) || !isset( $qt['content'] ) )
-				throw new EE_Error( sprintf( __('There is something wrong with the _qtipsa property setup for the %s qtip config class.  The dump of the current array index is: %s.<br /><br />Please check that it is setup correctly.', 'event_espresso'), get_class($this), var_export($qt, true) ) );
+			if ( !isset( $qt['content_id'] ) || !isset( $qt['target'] ) || !isset( $qt['content'] ) ) {
+							throw new EE_Error( sprintf( __('There is something wrong with the _qtipsa property setup for the %s qtip config class.  The dump of the current array index is: %s.<br /><br />Please check that it is setup correctly.', 'event_espresso'), get_class($this), var_export($qt, true) ) );
+			}
 
 			//make sure the options include defaults and just override via set config.
 			$options_override = isset( $qt['options'] ) ? (array) $qt['options'] : array();
@@ -266,8 +267,9 @@ 
 
 	public function __construct( $setup_array ) {
 		foreach ( $setup_array as $prop => $value ) {
-			if ( EEH_Class_Tools::has_property( $this, $prop ) )
-				$this->{$prop} = $value;
+			if ( EEH_Class_Tools::has_property( $this, $prop ) ) {
+							$this->{$prop} = $value;
+			}
 		}
 	}
 }
\ No newline at end of file

core/libraries/rest_api/changes/Changes_In_4_8_33.php

Spacing +7 added lines, -7 removed lines

@@ -13,13 +13,13 @@ 
 		//is for lower than 4.8.33
 		add_filter( 
 			'FHEE__EED_Core_Rest_Api___register_rpc_routes__this_versions_routes',
-			array( $this, 'remove_checkin_routes_earlier_than_4_8_33' ),
+			array($this, 'remove_checkin_routes_earlier_than_4_8_33'),
 			10,
 			2
 		);
 		add_filter( 
 			'FHEE__EventEspresso\core\libraries\rest_api\controllers\Base___get_headers_from_ee_notices__return',
-			array( $this, 'dont_add_headers_from_ee_notices' ),
+			array($this, 'dont_add_headers_from_ee_notices'),
 			10,
 			2
 		);
@@ -32,9 +32,9 @@ 
 	 * @param string $version
 	 * @return array like $routes_on_this_version
 	 */
-	public function remove_checkin_routes_earlier_than_4_8_33( $routes_on_this_version, $version ) {
-		if( $this->applies_to_version(  $version ) ) {
-			unset( $routes_on_this_version[ 'registrations/(?P<REG_ID>\d+)/toggle_checkin_for_datetime/(?P<DTT_ID>\d+)' ] );
+	public function remove_checkin_routes_earlier_than_4_8_33($routes_on_this_version, $version) {
+		if ($this->applies_to_version($version)) {
+			unset($routes_on_this_version['registrations/(?P<REG_ID>\d+)/toggle_checkin_for_datetime/(?P<DTT_ID>\d+)']);
 		}
 		return $routes_on_this_version;
 	}
@@ -45,8 +45,8 @@ 
 	 * @param string $requested_version
 	 * @return array
 	 */
-	public function dont_add_headers_from_ee_notices( $headers_from_ee_notices, $requested_version ) {
-		if( $this->applies_to_version(  $requested_version ) ) {
+	public function dont_add_headers_from_ee_notices($headers_from_ee_notices, $requested_version) {
+		if ($this->applies_to_version($requested_version)) {
 			return array();
 		}
 		return $headers_from_ee_notices;

core/libraries/rest_api/changes/Changes_In_Base.php

Spacing +8 added lines, -8 removed lines

@@ -56,8 +56,8 @@ 
 	 * @return boolean true: this class' name indicates its filters and actions
 	 * should take effect. False: this class' name indicates it shouldn't do anything
 	 */
-	public function applies_to_version( $requested_version ) {
-		if( $this->version() > $requested_version ) {
+	public function applies_to_version($requested_version) {
+		if ($this->version() > $requested_version) {
 			return true;
 		}
 		return false;
@@ -71,24 +71,24 @@ 
 	 * @throws \EE_Error
 	 */
 	public function version() {
-		if( $this->_version === null ) {
+		if ($this->_version === null) {
 			$matches = array();
 			$regex = '~Changes_In_(.*)_(.*)_(.*)$~';
 			$success = preg_match(
 				$regex,
-				get_class( $this ),
+				get_class($this),
 				$matches
 			);
-			if( ! $success ) {
+			if ( ! $success) {
 				throw new \EE_Error(
 					sprintf(
-						__( 'The class %1$s was misnamed. It name should match the regex "%2$s"', 'event_espresso' ),
-						get_class( $this ),
+						__('The class %1$s was misnamed. It name should match the regex "%2$s"', 'event_espresso'),
+						get_class($this),
 						$regex
 					)
 				);
 			}
-			$this->_version = $matches[1] . '.' . $matches[2] . '.' . $matches[3];
+			$this->_version = $matches[1].'.'.$matches[2].'.'.$matches[3];
 		}
 		return $this->_version;
 	}

core/libraries/rest_api/controllers/Base.php

Spacing +53 added lines, -53 removed lines

@@ -1,8 +1,8 @@ 
 <?php
 namespace EventEspresso\core\libraries\rest_api\controllers;
 
-if ( !defined( 'EVENT_ESPRESSO_VERSION' ) ) {
-	exit( 'No direct script access allowed' );
+if ( ! defined('EVENT_ESPRESSO_VERSION')) {
+	exit('No direct script access allowed');
 }
 
 /**
@@ -36,7 +36,7 @@ 
 	protected $_requested_version;
 
 	public function __construct() {
-		$this->_debug_mode = defined( 'EE_REST_API_DEBUG_MODE' ) ? EE_REST_API_DEBUG_MODE : false;
+		$this->_debug_mode = defined('EE_REST_API_DEBUG_MODE') ? EE_REST_API_DEBUG_MODE : false;
 	}
 
 
@@ -44,7 +44,7 @@ 
 	 * Sets the version the user requested
 	 * @param string $version eg '4.8'
 	 */
-	public function set_requested_version( $version ) {
+	public function set_requested_version($version) {
 		$this->_requested_version = $version;
 	}
 
@@ -53,8 +53,8 @@ 
 	 * @param string $key
 	 * @param string|array $info
 	 */
-	protected function _set_debug_info( $key, $info ){
-		$this->_debug_info[ $key ] = $info;
+	protected function _set_debug_info($key, $info) {
+		$this->_debug_info[$key] = $info;
 	}
 	
 	/**
@@ -62,13 +62,13 @@ 
 	 * @param \WP_Error $wp_error_response
 	 * @return \WP_Error
 	 */
-	protected function _add_ee_errors_to_response( \WP_Error $wp_error_response ) {
+	protected function _add_ee_errors_to_response(\WP_Error $wp_error_response) {
 		$notices_during_checkin = \EE_Error::get_raw_notices();
-		if( ! empty( $notices_during_checkin[ 'errors' ] ) ) {	
-			foreach( $notices_during_checkin[ 'errors' ] as $error_code => $error_message ) {
+		if ( ! empty($notices_during_checkin['errors'])) {	
+			foreach ($notices_during_checkin['errors'] as $error_code => $error_message) {
 				$wp_error_response->add( 
-					sanitize_key( $error_code ), 
-					strip_tags( $error_message ) );
+					sanitize_key($error_code), 
+					strip_tags($error_message) );
 			}
 		}
 		return $wp_error_response;
@@ -86,28 +86,28 @@ 
 	 * @param array|\WP_Error|\Exception $response
 	 * @return \WP_REST_Response
 	 */
-	public function send_response( $response ) {
-		if( $response instanceof \Exception ) {
-			$response = new \WP_Error( $response->getCode(), $response->getMessage() );
+	public function send_response($response) {
+		if ($response instanceof \Exception) {
+			$response = new \WP_Error($response->getCode(), $response->getMessage());
 		}
-		if( $response instanceof \WP_Error ) {
-			$response = $this->_add_ee_errors_to_response( $response );
-			$rest_response = $this->_create_rest_response_from_wp_error( $response );
-		}else{
-			$rest_response = new \WP_REST_Response( $response, 200 );
+		if ($response instanceof \WP_Error) {
+			$response = $this->_add_ee_errors_to_response($response);
+			$rest_response = $this->_create_rest_response_from_wp_error($response);
+		} else {
+			$rest_response = new \WP_REST_Response($response, 200);
 		}
 		$headers = array();
-		if( $this->_debug_mode && is_array( $this->_debug_info ) ) {
-			foreach( $this->_debug_info  as $debug_key => $debug_info ) {
-				if( is_array( $debug_info ) ) {
-					$debug_info = json_encode( $debug_info );
+		if ($this->_debug_mode && is_array($this->_debug_info)) {
+			foreach ($this->_debug_info  as $debug_key => $debug_info) {
+				if (is_array($debug_info)) {
+					$debug_info = json_encode($debug_info);
 				}
-				$headers[ 'X-EE4-Debug-' . ucwords( $debug_key ) ] = $debug_info;
+				$headers['X-EE4-Debug-'.ucwords($debug_key)] = $debug_info;
 			}
 		}
-		$headers = array_merge( $headers, $this->_get_headers_from_ee_notices() );
+		$headers = array_merge($headers, $this->_get_headers_from_ee_notices());
 		
-		$rest_response->set_headers( $headers );
+		$rest_response->set_headers($headers);
 		return $rest_response;
 	}
 	
@@ -118,31 +118,31 @@ 
 	 * @param \WP_Error $wp_error
 	 * @return \WP_REST_Response
 	 */
-	protected function _create_rest_response_from_wp_error( \WP_Error $wp_error ) {
+	protected function _create_rest_response_from_wp_error(\WP_Error $wp_error) {
 		$error_data = $wp_error->get_error_data();
-		if ( is_array( $error_data ) && isset( $error_data['status'] ) ) {
+		if (is_array($error_data) && isset($error_data['status'])) {
 			$status = $error_data['status'];
 		} else {
 			$status = 500;
 		}
 
 		$errors = array();
-		foreach ( (array) $wp_error->errors as $code => $messages ) {
-			foreach ( (array) $messages as $message ) {
+		foreach ((array) $wp_error->errors as $code => $messages) {
+			foreach ((array) $messages as $message) {
 				$errors[] = array(
 					'code'    => $code,
 					'message' => $message,
-					'data'    => $wp_error->get_error_data( $code )
+					'data'    => $wp_error->get_error_data($code)
 				);
 			}
 		}
-		$data = isset( $errors[0] ) ? $errors[0] : array();
-		if ( count( $errors ) > 1 ) {
+		$data = isset($errors[0]) ? $errors[0] : array();
+		if (count($errors) > 1) {
 			// Remove the primary error.
-			array_shift( $errors );
+			array_shift($errors);
 			$data['additional_errors'] = $errors;
 		}
-		return new \WP_REST_Response( $data, $status );
+		return new \WP_REST_Response($data, $status);
 	}
 	
 	/**
@@ -152,12 +152,12 @@ 
 	protected function _get_headers_from_ee_notices() {
 		$headers = array();
 		$notices = \EE_Error::get_raw_notices();
-		foreach( $notices as $notice_type => $sub_notices ) {
-			if( ! is_array( $sub_notices ) ) {
+		foreach ($notices as $notice_type => $sub_notices) {
+			if ( ! is_array($sub_notices)) {
 				continue;
 			}
-			foreach( $sub_notices as $notice_code => $sub_notice ) {
-				$headers[ 'X-EE4-Notices-' . \EEH_Inflector::humanize( $notice_type ) . '[' . $notice_code . ']' ] = strip_tags( $sub_notice );
+			foreach ($sub_notices as $notice_code => $sub_notice) {
+				$headers['X-EE4-Notices-'.\EEH_Inflector::humanize($notice_type).'['.$notice_code.']'] = strip_tags($sub_notice);
 			}
 		}
 		return apply_filters( 
@@ -175,14 +175,14 @@ 
 	 * @param string $route 
 	 * @return string
 	 */
-	public function get_requested_version( $route ) {
+	public function get_requested_version($route) {
 		$matches = $this->parse_route(
 			$route,
-			'~' . \EED_Core_Rest_Api::ee_api_namespace_for_regex . '~',
-			array( 'version' )
+			'~'.\EED_Core_Rest_Api::ee_api_namespace_for_regex.'~',
+			array('version')
 			);
-		if( isset( $matches[ 'version' ] ) ) {
-			return $matches[ 'version' ];
+		if (isset($matches['version'])) {
+			return $matches['version'];
 		} else {
 			return \EED_Core_Rest_Api::latest_rest_api_version();
 		}
@@ -207,23 +207,23 @@ 
 	 * array( 'model' => 'foo', 'id' => 'bar' )
 	 * @throws \EE_Error if it couldn't be parsed
 	 */
-	public function parse_route( $route, $regex, $match_keys ) {
+	public function parse_route($route, $regex, $match_keys) {
 		$indexed_matches = array();
-		$success = preg_match( $regex, $route, $matches );
-		if(
-			is_array( $matches ) ) {
+		$success = preg_match($regex, $route, $matches);
+		if (
+			is_array($matches) ) {
 			//skip the overall regex match. Who cares
-			for( $i = 1; $i <= count( $match_keys ); $i++ ) {
-				if( ! isset( $matches[ $i ] ) ) {
+			for ($i = 1; $i <= count($match_keys); $i++) {
+				if ( ! isset($matches[$i])) {
 					$success = false;
 				} else {
-					$indexed_matches[ $match_keys[ $i - 1 ] ] = $matches[ $i ];
+					$indexed_matches[$match_keys[$i - 1]] = $matches[$i];
 				}
 			}
 		}
-		if( ! $success ) {
+		if ( ! $success) {
 			throw new \EE_Error(
-				__( 'We could not parse the URL. Please contact Event Espresso Support', 'event_espresso' ),
+				__('We could not parse the URL. Please contact Event Espresso Support', 'event_espresso'),
 				'endpoint_parsing_error'
 			);
 		}

core/libraries/rest_api/controllers/model/Meta.php

Spacing +40 added lines, -40 removed lines

@@ -1,7 +1,7 @@ 
 <?php
 namespace EventEspresso\core\libraries\rest_api\controllers\model;
-if ( !defined( 'EVENT_ESPRESSO_VERSION' ) ) {
-	exit( 'No direct script access allowed' );
+if ( ! defined('EVENT_ESPRESSO_VERSION')) {
+	exit('No direct script access allowed');
 }
 
 /**
@@ -22,20 +22,20 @@ 
 	 * @param \WP_REST_Request $request
 	 * @return array|\WP_REST_Response
 	 */
-	public static function handle_request_models_meta( \WP_REST_Request $request ) {
+	public static function handle_request_models_meta(\WP_REST_Request $request) {
 		$controller = new Meta();
-		try{
+		try {
 			$matches = $controller->parse_route(
 				$request->get_route(),
-				'~' . \EED_Core_Rest_Api::ee_api_namespace_for_regex . 'resources~',
-				array( 'version' ) );
-			if( $matches instanceof \WP_REST_Response ) {
+				'~'.\EED_Core_Rest_Api::ee_api_namespace_for_regex.'resources~',
+				array('version') );
+			if ($matches instanceof \WP_REST_Response) {
 				return $matches;
 			}
-			$controller->set_requested_version( $matches[ 'version' ] );
-			return $controller->send_response( $controller->_get_models_metadata_entity() );
-		} catch( \Exception $e ) {
-			return $controller->send_response( $e );
+			$controller->set_requested_version($matches['version']);
+			return $controller->send_response($controller->_get_models_metadata_entity());
+		} catch (\Exception $e) {
+			return $controller->send_response($e);
 		}
 	}
 
@@ -43,58 +43,58 @@ 
 	 * Gets the model metadata resource entity
 	 * @return array for JSON response, describing all the models available in teh requested version
 	 */
-	protected function _get_models_metadata_entity(){
+	protected function _get_models_metadata_entity() {
 		$response = array();
-		foreach( $this->get_model_version_info()->models_for_requested_version() as $model_name => $model_classname ){
-			$model = $this->get_model_version_info()->load_model( $model_name );
+		foreach ($this->get_model_version_info()->models_for_requested_version() as $model_name => $model_classname) {
+			$model = $this->get_model_version_info()->load_model($model_name);
 			$fields_json = array();
-			foreach( $this->get_model_version_info()->fields_on_model_in_this_version( $model ) as $field_name => $field_obj ) {
-				if( $this->get_model_version_info()->field_is_ignored( $field_obj ) ) {
+			foreach ($this->get_model_version_info()->fields_on_model_in_this_version($model) as $field_name => $field_obj) {
+				if ($this->get_model_version_info()->field_is_ignored($field_obj)) {
 					continue;
 				}
-				if( $field_obj instanceof \EE_Boolean_Field ) {
+				if ($field_obj instanceof \EE_Boolean_Field) {
 					$datatype = 'Boolean';
-				}elseif( $field_obj->get_wpdb_data_type() == '%d' ) {
+				}elseif ($field_obj->get_wpdb_data_type() == '%d') {
 					$datatype = 'Number';
-				}elseif( $field_name instanceof \EE_Serialized_Text_Field ) {
+				}elseif ($field_name instanceof \EE_Serialized_Text_Field) {
 					$datatype = 'Object';
-				}else{
+				} else {
 					$datatype = 'String';
 				}
 				$default_value = $field_obj->get_default_value();
-				if( $default_value === EE_INF ) {
+				if ($default_value === EE_INF) {
 					$default_value = EE_INF_IN_DB;
-				} elseif( $field_obj instanceof \EE_Datetime_Field &&
-					$default_value instanceof \DateTime ) {
-					$default_value = $default_value->format( 'c' );
+				} elseif ($field_obj instanceof \EE_Datetime_Field &&
+					$default_value instanceof \DateTime) {
+					$default_value = $default_value->format('c');
 				}
 				$field_json = array(
 					'name' => $field_name,
 					'nicename' => $field_obj->get_nicename(),
-					'has_rendered_format' => $this->get_model_version_info()->field_has_rendered_format( $field_obj ),
-					'has_pretty_format' => $this->get_model_version_info()->field_has_pretty_format( $field_obj ),
-					'type' => str_replace('EE_', '', get_class( $field_obj ) ),
+					'has_rendered_format' => $this->get_model_version_info()->field_has_rendered_format($field_obj),
+					'has_pretty_format' => $this->get_model_version_info()->field_has_pretty_format($field_obj),
+					'type' => str_replace('EE_', '', get_class($field_obj)),
 					'datatype' => $datatype,
 					'nullable' => $field_obj->is_nullable(),
 					'default' => $default_value,
 					'table_alias' => $field_obj->get_table_alias(),
 					'table_column' => $field_obj->get_table_column(),
 				);
-				$fields_json[ $field_json[ 'name' ] ] = $field_json;
+				$fields_json[$field_json['name']] = $field_json;
 
 			}
-			$fields_json = array_merge( $fields_json, $this->get_model_version_info()->extra_resource_properties_for_model( $model ) );
-			$response[ $model_name ]['fields'] = apply_filters( 'FHEE__Meta__handle_request_models_meta__fields', $fields_json, $model );
+			$fields_json = array_merge($fields_json, $this->get_model_version_info()->extra_resource_properties_for_model($model));
+			$response[$model_name]['fields'] = apply_filters('FHEE__Meta__handle_request_models_meta__fields', $fields_json, $model);
 			$relations_json = array();
-			foreach( $model->relation_settings()  as $relation_name => $relation_obj ) {
+			foreach ($model->relation_settings()  as $relation_name => $relation_obj) {
 				$relation_json = array(
 					'name' => $relation_name,
-					'type' => str_replace( 'EE_', '', get_class( $relation_obj ) ),
+					'type' => str_replace('EE_', '', get_class($relation_obj)),
 					'single' => $relation_obj instanceof \EE_Belongs_To_Relation ? true : false,
 				);
-				$relations_json[ $relation_name ] = $relation_json;
+				$relations_json[$relation_name] = $relation_json;
 			}
-			$response[ $model_name ][ 'relations' ] = apply_filters( 'FHEE__Meta__handle_request_models_meta__relations', $relations_json, $model );
+			$response[$model_name]['relations'] = apply_filters('FHEE__Meta__handle_request_models_meta__relations', $relations_json, $model);
 		}
 		return $response;
 	}
@@ -104,23 +104,23 @@ 
 	 * @param \WP_REST_Response $rest_response_obj
 	 * @return \WP_REST_Response
 	 */
-	public static function filter_ee_metadata_into_index( \WP_REST_Response $rest_response_obj ) {
+	public static function filter_ee_metadata_into_index(\WP_REST_Response $rest_response_obj) {
 		$response_data = $rest_response_obj->get_data();
 		$addons = array();
-		foreach( \EE_Registry::instance()->addons as $addon){
+		foreach (\EE_Registry::instance()->addons as $addon) {
 			$addon_json = array(
 				'name' => $addon->name(),
 				'version' => $addon->version()
 			);
-			$addons[ $addon_json[ 'name' ] ] = $addon_json;
+			$addons[$addon_json['name']] = $addon_json;
 		}
-		$response_data[ 'ee' ] = array(
+		$response_data['ee'] = array(
 			'version' => \EEM_System_Status::instance()->get_ee_version(),
 			'addons' => $addons,
 			'maintenance_mode' => \EE_Maintenance_Mode::instance()->real_level(),
-			'served_core_versions' => array_keys( \EED_Core_Rest_Api::versions_served() )
+			'served_core_versions' => array_keys(\EED_Core_Rest_Api::versions_served())
 		);
-		$rest_response_obj->set_data( $response_data );
+		$rest_response_obj->set_data($response_data);
 		return $rest_response_obj;
 	}
 }

core/libraries/rest_api/controllers/rpc/Checkin.php

Spacing +24 added lines, -24 removed lines

@@ -2,8 +2,8 @@ 
 use EventEspresso\core\libraries\rest_api\controllers\Base as Base;
 use EventEspresso\core\libraries\rest_api\controllers\model\Read;
 
-if ( !defined( 'EVENT_ESPRESSO_VERSION' ) ) {
-	exit( 'No direct script access allowed' );
+if ( ! defined('EVENT_ESPRESSO_VERSION')) {
+	exit('No direct script access allowed');
 }
 
 /**
@@ -24,9 +24,9 @@ 
 	 * @param \WP_REST_Request $request
 	 * @return \WP_Error|\WP_REST_Response
 	 */
-	public static function handle_request_toggle_checkin( \WP_REST_Request $request ) {
+	public static function handle_request_toggle_checkin(\WP_REST_Request $request) {
 		$controller = new Checkin();
-		return $controller->_create_checkin_checkout_object( $request );
+		return $controller->_create_checkin_checkout_object($request);
 	}
 
 
@@ -37,47 +37,47 @@ 
 	 * @param \WP_REST_Request $request
 	 * @return \WP_Error|\WP_REST_Response
 	 */
-	protected function _create_checkin_checkout_object( \WP_REST_Request $request ) {
-		$reg_id = $request->get_param( 'REG_ID' );
-		$dtt_id = $request->get_param( 'DTT_ID' );
-		$force = $request->get_param( 'force' );
-		if( $force == 'true' ) {
+	protected function _create_checkin_checkout_object(\WP_REST_Request $request) {
+		$reg_id = $request->get_param('REG_ID');
+		$dtt_id = $request->get_param('DTT_ID');
+		$force = $request->get_param('force');
+		if ($force == 'true') {
 			$force = true;
 		} else {
 			$force = false;
 		}
-		$reg = \EEM_Registration::instance()->get_one_by_ID( $reg_id );
-		if( ! $reg instanceof \EE_Registration ) {
+		$reg = \EEM_Registration::instance()->get_one_by_ID($reg_id);
+		if ( ! $reg instanceof \EE_Registration) {
 			return $this->send_response(
 				new \WP_Error(
 					'rest_registration_toggle_checkin_invalid_id',
 					sprintf(
-						__( 'You cannot checkin registration with ID %1$s because it doesn\'t exist.', 'event_espresso' ),
+						__('You cannot checkin registration with ID %1$s because it doesn\'t exist.', 'event_espresso'),
 						$reg_id
 					),
-					array( 'status' => 422 )
+					array('status' => 422)
 				)
 			);
 		}
-		if( ! \EE_Capabilities::instance()->current_user_can( 'ee_edit_checkin', 'rest_api_checkin_endpoint', $reg_id ) ) {
+		if ( ! \EE_Capabilities::instance()->current_user_can('ee_edit_checkin', 'rest_api_checkin_endpoint', $reg_id)) {
 			return $this->send_response(
 				new \WP_Error(
 					'rest_user_cannot_toggle_checkin',
 					sprintf(
-						__( 'You are not allowed to checkin registration with ID %1$s.', 'event_espresso' ),
+						__('You are not allowed to checkin registration with ID %1$s.', 'event_espresso'),
 						$reg_id
 					),
-					array( 'status' => 403 )
+					array('status' => 403)
 				)
 			);
 		}
-		$success = $reg->toggle_checkin_status( $dtt_id, ! $force );
-		if( $success === false ) {
+		$success = $reg->toggle_checkin_status($dtt_id, ! $force);
+		if ($success === false) {
 			//rely on EE_Error::add_error messages to have been added to give more data about hwy it failed
 			return $this->send_response(
 				new \WP_Error(
 					'rest_toggle_checkin_failed',
-					__( 'Registration checkin failed. Please see additional error data.', 'event_espresso' )
+					__('Registration checkin failed. Please see additional error data.', 'event_espresso')
 				)
 			);
 		}
@@ -92,28 +92,28 @@ 
 				)
 			)
 		);
-		if( ! $checkin instanceof \EE_Checkin ) {
+		if ( ! $checkin instanceof \EE_Checkin) {
 			return $this->send_response(
 				new \WP_Error(
 					'rest_toggle_checkin_error',
 					sprintf(
-						__( 'Supposedly we created a new checkin object for registration %1$s at datetime %2$s, but we can\'t find it.', 'event_espresso' ),
+						__('Supposedly we created a new checkin object for registration %1$s at datetime %2$s, but we can\'t find it.', 'event_espresso'),
 						$reg_id,
 						$dtt_id
 					)
 				)
 			);
 		}
-		$requested_version = $this->get_requested_version( $request->get_route() );
+		$requested_version = $this->get_requested_version($request->get_route());
 		$get_request = new \WP_REST_Request(
 			'GET',
-			\EED_Core_Rest_Api::ee_api_namespace . $requested_version . '/checkins/' . $checkin->ID()
+			\EED_Core_Rest_Api::ee_api_namespace.$requested_version.'/checkins/'.$checkin->ID()
 		);
 		$get_request->set_url_params(
 			array(
 				'id' => $checkin->ID()
 			)
 		);
-		return Read::handle_request_get_one( $get_request );
+		return Read::handle_request_get_one($get_request);
 	}
 }
\ No newline at end of file

core/middleware/EE_Recommended_Versions.core.php

Spacing +27 added lines, -27 removed lines

@@ -22,35 +22,35 @@ 
 	 * @param 	EE_Response $response
 	 * @return 	EE_Response
 	 */
-	public function handle_request( EE_Request $request, EE_Response $response ) {
+	public function handle_request(EE_Request $request, EE_Response $response) {
 		$this->_request = $request;
 		$this->_response = $response;
 		//$this->_response->add_output( "\n\t IN >>  " . __CLASS__ );
 		//$this->_response->set_notice( 1, 'hey look at this' );
 		// check required WP version
-		if ( ! $this->_minimum_wp_version_required() ) {
-			$this->_request->un_set( 'activate', true );
-			add_action( 'admin_notices', array( $this, 'minimum_wp_version_error' ), 1 );
+		if ( ! $this->_minimum_wp_version_required()) {
+			$this->_request->un_set('activate', true);
+			add_action('admin_notices', array($this, 'minimum_wp_version_error'), 1);
 			//$this->_response->add_output( "\n<br />" . 'minimum_wp_version_error' );
 			$this->_response->terminate_request();
 		}
 		// check required PHP version
-		if ( ! $this->_minimum_php_version_required() ) {
-			$this->_request->un_set( 'activate', true );
-			add_action( 'admin_notices', array( $this, 'minimum_php_version_error' ), 1 );
+		if ( ! $this->_minimum_php_version_required()) {
+			$this->_request->un_set('activate', true);
+			add_action('admin_notices', array($this, 'minimum_php_version_error'), 1);
 			//$this->_response->add_output( "\n<br />" . 'minimum_php_version_error' );
 			$this->_response->terminate_request();
 		}
 		// check recommended WP version
-		if ( ! $this->_minimum_wp_version_recommended() ) {
+		if ( ! $this->_minimum_wp_version_recommended()) {
 			$this->_display_minimum_recommended_wp_version_notice();
 		}
 		// check recommended PHP version
-		if ( ! $this->_minimum_php_version_recommended() ) {
+		if ( ! $this->_minimum_php_version_recommended()) {
 			$this->_display_minimum_recommended_php_version_notice();
 		}
 		$this->_test_for_php_version_7();
-		$this->_response = $this->process_request_stack( $this->_request, $this->_response );
+		$this->_response = $this->process_request_stack($this->_request, $this->_response);
 		//$this->_response->add_output( "\n\t OUT << " . __CLASS__ );
 		return $this->_response;
 	}
@@ -64,9 +64,9 @@ 
 	 * @param string $min_version
 	 * @return boolean
 	 */
-	private function _check_wp_version( $min_version = EE_MIN_WP_VER_REQUIRED ) {
+	private function _check_wp_version($min_version = EE_MIN_WP_VER_REQUIRED) {
 		global $wp_version;
-		return version_compare( $wp_version, $min_version, '>=' ) ? true : false;
+		return version_compare($wp_version, $min_version, '>=') ? true : false;
 	}
 
 
@@ -78,7 +78,7 @@ 
 	 * @return boolean
 	 */
 	private function _minimum_wp_version_required() {
-		return $this->_check_wp_version( EE_MIN_WP_VER_REQUIRED );
+		return $this->_check_wp_version(EE_MIN_WP_VER_REQUIRED);
 	}
 
 
@@ -90,7 +90,7 @@ 
 	 * @return boolean
 	 */
 	private function _minimum_wp_version_recommended() {
-		return $this->_check_wp_version( EE_MIN_WP_VER_RECOMMENDED );
+		return $this->_check_wp_version(EE_MIN_WP_VER_RECOMMENDED);
 	}
 
 
@@ -102,8 +102,8 @@ 
 	 * @param string $min_version
 	 * @return boolean
 	 */
-	private function _check_php_version( $min_version = EE_MIN_PHP_VER_RECOMMENDED ) {
-		return version_compare( PHP_VERSION, $min_version, '>=' ) ? true : false;
+	private function _check_php_version($min_version = EE_MIN_PHP_VER_RECOMMENDED) {
+		return version_compare(PHP_VERSION, $min_version, '>=') ? true : false;
 	}
 
 
@@ -115,7 +115,7 @@ 
 	 * @return boolean
 	 */
 	private function _minimum_php_version_required() {
-		return $this->_check_php_version( EE_MIN_PHP_VER_REQUIRED );
+		return $this->_check_php_version(EE_MIN_PHP_VER_REQUIRED);
 	}
 
 
@@ -127,7 +127,7 @@ 
 	 * @return boolean
 	 */
 	private function _minimum_php_version_recommended() {
-		return $this->_check_php_version( EE_MIN_PHP_VER_RECOMMENDED );
+		return $this->_check_php_version(EE_MIN_PHP_VER_RECOMMENDED);
 	}
 
 
@@ -144,7 +144,7 @@ 
 			<p>
 				<?php
 				printf(
-					__( 'We\'re sorry, but Event Espresso requires WordPress version %1$s or greater in order to operate. You are currently running version %2$s.%3$sFor information on how to update your version of WordPress, please go to %4$s.', 'event_espresso' ),
+					__('We\'re sorry, but Event Espresso requires WordPress version %1$s or greater in order to operate. You are currently running version %2$s.%3$sFor information on how to update your version of WordPress, please go to %4$s.', 'event_espresso'),
 					EE_MIN_WP_VER_REQUIRED,
 					$wp_version,
 					'<br/>',
@@ -169,7 +169,7 @@ 
 			<p>
 				<?php
 				printf(
-					__( 'We\'re sorry, but Event Espresso requires PHP version %1$s or greater in order to operate. You are currently running version %2$s.%3$sIn order to update your version of PHP, you will need to contact your current hosting provider.%3$sFor information on stable PHP versions, please go to %4$s.', 'event_espresso' ),
+					__('We\'re sorry, but Event Espresso requires PHP version %1$s or greater in order to operate. You are currently running version %2$s.%3$sIn order to update your version of PHP, you will need to contact your current hosting provider.%3$sFor information on stable PHP versions, please go to %4$s.', 'event_espresso'),
 					EE_MIN_PHP_VER_REQUIRED,
 					PHP_VERSION,
 					'<br/>',
@@ -192,9 +192,9 @@ 
 	private function _display_minimum_recommended_wp_version_notice() {
 		global $wp_version;
 		EE_Error::add_persistent_admin_notice(
-			'wp_version_' . str_replace( '.', '-', EE_MIN_WP_VER_RECOMMENDED ) . '_recommended',
+			'wp_version_'.str_replace('.', '-', EE_MIN_WP_VER_RECOMMENDED).'_recommended',
 			sprintf(
-				__( 'Event Espresso recommends WordPress version %1$s or greater in order for everything to operate properly. You are currently running version %2$s.%3$sFor information on how to update your version of WordPress, please go to %4$s.', 'event_espresso' ),
+				__('Event Espresso recommends WordPress version %1$s or greater in order for everything to operate properly. You are currently running version %2$s.%3$sFor information on how to update your version of WordPress, please go to %4$s.', 'event_espresso'),
 				EE_MIN_WP_VER_RECOMMENDED,
 				$wp_version,
 				'<br/>',
@@ -213,9 +213,9 @@ 
 	 */
 	private function _display_minimum_recommended_php_version_notice() {
 		EE_Error::add_persistent_admin_notice(
-			'php_version_' . str_replace( '.', '-', EE_MIN_PHP_VER_RECOMMENDED ) . '_recommended',
+			'php_version_'.str_replace('.', '-', EE_MIN_PHP_VER_RECOMMENDED).'_recommended',
 			sprintf(
-				__( 'Event Espresso recommends PHP version %1$s or greater for optimal performance. You are currently running version %2$s.%3$sIn order to update your version of PHP, you will need to contact your current hosting provider.%3$sFor information on stable PHP versions, please go to %4$s.', 'event_espresso' ),
+				__('Event Espresso recommends PHP version %1$s or greater for optimal performance. You are currently running version %2$s.%3$sIn order to update your version of PHP, you will need to contact your current hosting provider.%3$sFor information on stable PHP versions, please go to %4$s.', 'event_espresso'),
 				EE_MIN_PHP_VER_RECOMMENDED,
 				PHP_VERSION,
 				'<br/>',
@@ -232,10 +232,10 @@ 
 	 * @access private
 	 */
 	private function _test_for_php_version_7() {
-		if ( $this->_check_php_version( '7' ) ) {
-			define( 'EE_PHP_7', true );
+		if ($this->_check_php_version('7')) {
+			define('EE_PHP_7', true);
 		} else {
-			define( 'EE_PHP_7', false );
+			define('EE_PHP_7', false);
 		}
 	}
 

modules/core_rest_api/EED_Core_Rest_Api.module.php

Spacing +82 added lines, -82 removed lines

@@ -1,6 +1,6 @@ 
 <?php
-if ( !defined( 'EVENT_ESPRESSO_VERSION' ) ) {
-	exit( 'No direct script access allowed' );
+if ( ! defined('EVENT_ESPRESSO_VERSION')) {
+	exit('No direct script access allowed');
 }
 
 /**
@@ -27,7 +27,7 @@ 
 	 * @return EED_Core_Rest_Api
 	 */
 	public static function instance() {
-		return parent::get_instance( __CLASS__ );
+		return parent::get_instance(__CLASS__);
 	}
 
 
@@ -57,10 +57,10 @@ 
 
 
 	public static function set_hooks_both() {
-		add_action( 'rest_api_init', array( 'EED_Core_Rest_Api', 'register_routes' ), 10 );
-		add_action( 'rest_api_init', array( 'EED_Core_Rest_Api', 'set_hooks_rest_api' ), 5 );
-		add_filter( 'rest_route_data', array( 'EED_Core_Rest_Api', 'hide_old_endpoints' ), 10, 2 );
-		add_filter( 'rest_index', array( 'EventEspresso\core\libraries\rest_api\controllers\model\Meta', 'filter_ee_metadata_into_index' ) );
+		add_action('rest_api_init', array('EED_Core_Rest_Api', 'register_routes'), 10);
+		add_action('rest_api_init', array('EED_Core_Rest_Api', 'set_hooks_rest_api'), 5);
+		add_filter('rest_route_data', array('EED_Core_Rest_Api', 'hide_old_endpoints'), 10, 2);
+		add_filter('rest_index', array('EventEspresso\core\libraries\rest_api\controllers\model\Meta', 'filter_ee_metadata_into_index'));
 	}
 
 	/**
@@ -73,16 +73,16 @@ 
 	}
 
 	protected static function _set_hooks_for_changes() {
-		$folder_contents = EEH_File::get_contents_of_folders( array( EE_LIBRARIES . 'rest_api' . DS . 'changes' ), false );
-		foreach( $folder_contents as $classname_in_namespace => $filepath ) {
+		$folder_contents = EEH_File::get_contents_of_folders(array(EE_LIBRARIES.'rest_api'.DS.'changes'), false);
+		foreach ($folder_contents as $classname_in_namespace => $filepath) {
 			//ignore the base parent class
-			if( $classname_in_namespace === 'Changes_In_Base' ) {
+			if ($classname_in_namespace === 'Changes_In_Base') {
 				continue;
 			}
-			$full_classname = 'EventEspresso\core\libraries\rest_api\changes\\' . $classname_in_namespace;
-			if ( class_exists( $full_classname )) {
+			$full_classname = 'EventEspresso\core\libraries\rest_api\changes\\'.$classname_in_namespace;
+			if (class_exists($full_classname)) {
 				$instance_of_class = new $full_classname;
-				if ( $instance_of_class instanceof EventEspresso\core\libraries\rest_api\changes\Changes_In_Base ) {
+				if ($instance_of_class instanceof EventEspresso\core\libraries\rest_api\changes\Changes_In_Base) {
 					$instance_of_class->set_hooks();
 				}
 			}
@@ -95,16 +95,16 @@ 
 	 * so we actually prefer to only do it when an EE plugin is activated or upgraded
 	 */
 	public static function register_routes() {
-		foreach( EED_Core_Rest_Api::get_ee_route_data() as $namespace => $relative_urls ) {
-			foreach( $relative_urls as $endpoint => $routes ) {
-				foreach( $routes as $route ) {
+		foreach (EED_Core_Rest_Api::get_ee_route_data() as $namespace => $relative_urls) {
+			foreach ($relative_urls as $endpoint => $routes) {
+				foreach ($routes as $route) {
 					register_rest_route(
 						$namespace,
 						$endpoint,
 						array(
-							'callback' => $route[ 'callback' ],
-							'methods' => $route[ 'methods' ],
-							'args' => isset( $route[ 'args' ] ) ? $route[ 'args' ] : array(),
+							'callback' => $route['callback'],
+							'methods' => $route['methods'],
+							'args' => isset($route['args']) ? $route['args'] : array(),
 						)
 					);
 				}
@@ -121,10 +121,10 @@ 
 	 * }
 	 */
 	public static function get_ee_route_data() {
-		$ee_routes = get_option( self::saved_routes_option_names, null );
-		if( ! $ee_routes || ( defined('EE_REST_API_DEBUG_MODE') && EE_REST_API_DEBUG_MODE )){
+		$ee_routes = get_option(self::saved_routes_option_names, null);
+		if ( ! $ee_routes || (defined('EE_REST_API_DEBUG_MODE') && EE_REST_API_DEBUG_MODE)) {
 			self::save_ee_routes();
-			$ee_routes = get_option( self::saved_routes_option_names, array() );
+			$ee_routes = get_option(self::saved_routes_option_names, array());
 		}
 		return $ee_routes;
 	}
@@ -135,7 +135,7 @@ 
 	 * @return void
 	 */
 	public static function save_ee_routes() {
-		if( EE_Maintenance_Mode::instance()->models_can_query() ){
+		if (EE_Maintenance_Mode::instance()->models_can_query()) {
 			$instance = self::instance();
 			$routes = apply_filters(
 				'EED_Core_Rest_Api__save_ee_routes__routes',
@@ -146,7 +146,7 @@ 
 					$instance->_register_rpc_routes()
 				)
 			);
-			update_option( self::saved_routes_option_names, $routes, true );
+			update_option(self::saved_routes_option_names, $routes, true);
 		}
 	}
 
@@ -155,7 +155,7 @@ 
 	 * @return array @see get_ee_route_data
 	 */
 	protected function _register_model_routes() {
-		EE_Registry::instance()->load_helper( 'Inflector' );
+		EE_Registry::instance()->load_helper('Inflector');
 		$models_to_register = apply_filters(
 			'FHEE__EED_Core_REST_API___register_model_routes',
 			EE_Registry::instance()->non_abstract_db_models
@@ -164,23 +164,23 @@ 
 		unset($models_to_register['Extra_Meta']);
 		unset($models_to_register['Extra_Join']);
 		$model_routes = array( );
-		foreach( self::versions_served() as $version => $hidden_endpoint ) {
+		foreach (self::versions_served() as $version => $hidden_endpoint) {
 
-			foreach ( $models_to_register as $model_name => $model_classname ) {
+			foreach ($models_to_register as $model_name => $model_classname) {
 				//yes we could just register one route for ALL models, but then they wouldn't show up in the index
-				$ee_namespace = self::ee_api_namespace . $version;
-				$plural_model_route = EEH_Inflector::pluralize_and_lower( $model_name );
-				$singular_model_route = $plural_model_route . '/(?P<id>\d+)' ;
-				$model_routes[ $ee_namespace ][ $plural_model_route ] = array(
+				$ee_namespace = self::ee_api_namespace.$version;
+				$plural_model_route = EEH_Inflector::pluralize_and_lower($model_name);
+				$singular_model_route = $plural_model_route.'/(?P<id>\d+)';
+				$model_routes[$ee_namespace][$plural_model_route] = array(
 						array(
 							'callback' => array(
 								'EventEspresso\core\libraries\rest_api\controllers\model\Read',
 								'handle_request_get_all' ),
 							'methods' => WP_REST_Server::READABLE,
 							'hidden_endpoint' => $hidden_endpoint,
-							'args' => $this->_get_read_query_params( $model_name ),
+							'args' => $this->_get_read_query_params($model_name),
 							'_links' => array(
-								'self' => rest_url( $ee_namespace . $singular_model_route ),
+								'self' => rest_url($ee_namespace.$singular_model_route),
 							)
 						),
 //						array(
@@ -191,7 +191,7 @@ 
 //							'hidden_endpoint' => $hidden_endpoint
 //						)
 					);
-				$model_routes[ $ee_namespace ][ $singular_model_route ] = array(
+				$model_routes[$ee_namespace][$singular_model_route] = array(
 						array(
 							'callback' => array(
 								'EventEspresso\core\libraries\rest_api\controllers\model\Read',
@@ -202,7 +202,7 @@ 
 								'include' => array(
 									'required' => false,
 									'default' => '*',
-									'description' => __( 'See http://developer.eventespresso.com/docs/ee4-rest-api-reading/#Including_Specific_Fields_and_Related_Entities_in_Results for documentation', 'event_espresso' ),
+									'description' => __('See http://developer.eventespresso.com/docs/ee4-rest-api-reading/#Including_Specific_Fields_and_Related_Entities_in_Results for documentation', 'event_espresso'),
 								),
 							)
 						),
@@ -215,20 +215,20 @@ 
 //							),
 				);
 				//@todo: also handle  DELETE for a single item
-				$model = EE_Registry::instance()->load_model( $model_classname );
-				foreach ( $model->relation_settings() as $relation_name => $relation_obj ) {
+				$model = EE_Registry::instance()->load_model($model_classname);
+				foreach ($model->relation_settings() as $relation_name => $relation_obj) {
 					$related_model_name_endpoint_part = EventEspresso\core\libraries\rest_api\controllers\model\Read::get_related_entity_name(
 						$relation_name,
 						$relation_obj
 					);
-					$model_routes[ $ee_namespace ][ $singular_model_route . '/' . $related_model_name_endpoint_part ] = array(
+					$model_routes[$ee_namespace][$singular_model_route.'/'.$related_model_name_endpoint_part] = array(
 							array(
 								'callback' => array(
 									'EventEspresso\core\libraries\rest_api\controllers\model\Read',
 									'handle_request_get_related' ),
 								'methods' => WP_REST_Server::READABLE,
 								'hidden_endpoint' => $hidden_endpoint,
-								'args' => $this->_get_read_query_params( $relation_name ),
+								'args' => $this->_get_read_query_params($relation_name),
 							),
 //							array(
 //								'callback' => array(
@@ -252,11 +252,11 @@ 
 	 */
 	protected function _register_rpc_routes() {
 		$routes = array();
-		foreach( self::versions_served() as $version => $hidden_endpoint ) {
-			$ee_namespace = self::ee_api_namespace . $version;
+		foreach (self::versions_served() as $version => $hidden_endpoint) {
+			$ee_namespace = self::ee_api_namespace.$version;
 			$this_versions_routes = array();
 			//checkin endpoint
-			$this_versions_routes[ 'registrations/(?P<REG_ID>\d+)/toggle_checkin_for_datetime/(?P<DTT_ID>\d+)' ] = array(
+			$this_versions_routes['registrations/(?P<REG_ID>\d+)/toggle_checkin_for_datetime/(?P<DTT_ID>\d+)'] = array(
 				array(
 					'callback' => array(
 						'EventEspresso\core\libraries\rest_api\controllers\rpc\Checkin',
@@ -267,12 +267,12 @@ 
 						'force' => array(
 							'required' => false,
 							'default' => false,
-							'description' => __( 'Whether to force toggle checkin, or to verify the registration status and allowed ticket uses', 'event_espresso' )
+							'description' => __('Whether to force toggle checkin, or to verify the registration status and allowed ticket uses', 'event_espresso')
 						)
 					)
 				)
 			);
-			$routes[ $ee_namespace ] = apply_filters(
+			$routes[$ee_namespace] = apply_filters(
 				'FHEE__EED_Core_Rest_Api___register_rpc_routes__this_versions_routes',
 				$this_versions_routes,
 				$version,
@@ -287,47 +287,47 @@ 
 	 * @param string $model_name eg 'Event' or 'Venue'
 	 * @return array describing the args acceptable when querying this model
 	 */
-	protected function _get_read_query_params( $model_name ) {
-		$model = EE_Registry::instance()->load_model( $model_name );
+	protected function _get_read_query_params($model_name) {
+		$model = EE_Registry::instance()->load_model($model_name);
 		$default_orderby = array();
-		foreach( $model->get_combined_primary_key_fields() as $key_field ) {
-			$default_orderby[ $key_field->get_name() ] = 'ASC';
+		foreach ($model->get_combined_primary_key_fields() as $key_field) {
+			$default_orderby[$key_field->get_name()] = 'ASC';
 		}
 		return array(
 			'where' => array(
 				'required' => false,
 				'default' => array(),
-				'description' => __( 'See http://developer.eventespresso.com/docs/ee4-rest-api-reading/#where for documentation', 'event_espresso' ),
+				'description' => __('See http://developer.eventespresso.com/docs/ee4-rest-api-reading/#where for documentation', 'event_espresso'),
 				),
 			'limit' => array(
 				'required' => false,
 				'default' => 50,
-				'description' => __( 'See http://developer.eventespresso.com/docs/ee4-rest-api-reading/#limit for documentation', 'event_espresso' )
+				'description' => __('See http://developer.eventespresso.com/docs/ee4-rest-api-reading/#limit for documentation', 'event_espresso')
 			),
 			'order_by' => array(
 				'required' => false,
 				'default' => $default_orderby,
-				'description' => __( 'See http://developer.eventespresso.com/docs/ee4-rest-api-reading/#order_by for documentation', 'event_espresso' )
+				'description' => __('See http://developer.eventespresso.com/docs/ee4-rest-api-reading/#order_by for documentation', 'event_espresso')
 			),
 			'group_by' => array(
 				'required' => false,
 				'default' => null,
-				'description' => __( 'See http://developer.eventespresso.com/docs/ee4-rest-api-reading/#group_by for documentation', 'event_espresso' )
+				'description' => __('See http://developer.eventespresso.com/docs/ee4-rest-api-reading/#group_by for documentation', 'event_espresso')
 			),
 			'having' => array(
 				'required' => false,
 				'default' => null,
-				'description' => __( 'See http://developer.eventespresso.com/docs/ee4-rest-api-reading/#having for documentation', 'event_espresso' )
+				'description' => __('See http://developer.eventespresso.com/docs/ee4-rest-api-reading/#having for documentation', 'event_espresso')
 			),
 			'caps' => array(
 				'required' => false,
 				'default' => EEM_Base::caps_read,
-				'description' => __( 'See http://developer.eventespresso.com/docs/ee4-rest-api-reading/#caps for documentation', 'event_espresso' )
+				'description' => __('See http://developer.eventespresso.com/docs/ee4-rest-api-reading/#caps for documentation', 'event_espresso')
 			),
 			'include' => array(
 				'required' => false,
 				'default' => '*',
-				'description' => __( 'See http://developer.eventespresso.com/docs/ee4-rest-api-reading/#Including_Specific_Fields_and_Related_Entities_in_Results for documentation', 'event_espresso' ),
+				'description' => __('See http://developer.eventespresso.com/docs/ee4-rest-api-reading/#Including_Specific_Fields_and_Related_Entities_in_Results for documentation', 'event_espresso'),
 			),
 		);
 	}
@@ -338,8 +338,8 @@ 
 	 */
 	protected function _register_config_routes() {
 		$config_routes = array();
-		foreach( self::versions_served() as $version => $hidden_endpoint ) {
-			$config_routes[ self::ee_api_namespace . $version ][ 'config' ] = array(
+		foreach (self::versions_served() as $version => $hidden_endpoint) {
+			$config_routes[self::ee_api_namespace.$version]['config'] = array(
 					array(
 						'callback' => array(
 							'EventEspresso\core\libraries\rest_api\controllers\config\Read',
@@ -358,8 +358,8 @@ 
 	 */
 	protected function _register_meta_routes() {
 		$meta_routes = array();
-		foreach( self::versions_served() as $version => $hidden_endpoint ) {
-			$meta_routes[ self::ee_api_namespace . $version ][ '/resources' ] = array(
+		foreach (self::versions_served() as $version => $hidden_endpoint) {
+			$meta_routes[self::ee_api_namespace.$version]['/resources'] = array(
 				array(
 					'callback' => array(
 						'EventEspresso\core\libraries\rest_api\controllers\model\Meta',
@@ -380,13 +380,13 @@ 
 	 * @param array $route_data
 	 * @return array
 	 */
-	public static function hide_old_endpoints( $route_data ) {
-		foreach( EED_Core_Rest_Api::get_ee_route_data() as $namespace => $relative_urls ) {
-			foreach( $relative_urls as $endpoint => $routes ) {
-				foreach( $routes as $route ) {
-					if( $route[ 'hidden_endpoint' ] ) {
-						$full_route = '/' . ltrim( $namespace, '/' ) . '/' . ltrim( $endpoint, '/' );
-						unset( $route_data[ $full_route ] );
+	public static function hide_old_endpoints($route_data) {
+		foreach (EED_Core_Rest_Api::get_ee_route_data() as $namespace => $relative_urls) {
+			foreach ($relative_urls as $endpoint => $routes) {
+				foreach ($routes as $route) {
+					if ($route['hidden_endpoint']) {
+						$full_route = '/'.ltrim($namespace, '/').'/'.ltrim($endpoint, '/');
+						unset($route_data[$full_route]);
 					}
 				}
 			}
@@ -423,7 +423,7 @@ 
 	 */
 	public static function latest_rest_api_version() {
 		$versions_served = \EED_Core_Rest_Api::versions_served();
-		return end( array_keys( $versions_served ) );
+		return end(array_keys($versions_served));
 	}
 
 	/**
@@ -437,32 +437,32 @@ 
 	public static function versions_served() {
 		$versions_served = array();
 		$possibly_served_versions = EED_Core_Rest_Api::version_compatibilities();
-		$lowest_compatible_version = end( $possibly_served_versions);
-		reset( $possibly_served_versions );
-		$versions_served_historically = array_keys( $possibly_served_versions );
-		$latest_version = end( $versions_served_historically );
-		reset( $versions_served_historically );
+		$lowest_compatible_version = end($possibly_served_versions);
+		reset($possibly_served_versions);
+		$versions_served_historically = array_keys($possibly_served_versions);
+		$latest_version = end($versions_served_historically);
+		reset($versions_served_historically);
 		//for each version of core we have ever served:
-		foreach ( $versions_served_historically as $key_versioned_endpoint ) {
+		foreach ($versions_served_historically as $key_versioned_endpoint) {
 			//if it's not above the current core version, and it's compatible with the current version of core
-			if( $key_versioned_endpoint == $latest_version ) {
+			if ($key_versioned_endpoint == $latest_version) {
 				//don't hide the latest version in the index
-				$versions_served[ $key_versioned_endpoint ] = false;
-			} else if(
+				$versions_served[$key_versioned_endpoint] = false;
+			} else if (
 				$key_versioned_endpoint < EED_Core_Rest_Api::core_version()
 				&& $key_versioned_endpoint >= $lowest_compatible_version
 			) {
 				//include, but hide, previous versions which are still supported
-				$versions_served[ $key_versioned_endpoint ] = true;
-			} elseif(
+				$versions_served[$key_versioned_endpoint] = true;
+			} elseif (
 				apply_filters(
 					'FHEE__EED_Core_Rest_Api__versions_served__include_incompatible_versions',
 					false,
 					$possibly_served_versions
 				)
-			){
+			) {
 				//if a version is no longer supported, don't include it in index or list of versions served
-				$versions_served[ $key_versioned_endpoint ] = true;
+				$versions_served[$key_versioned_endpoint] = true;
 			}
 		}
 		return $versions_served;
@@ -475,7 +475,7 @@ 
 	 * @return string
 	 */
 	public static function core_version() {
-		return apply_filters( 'FHEE__EED_Core_REST_API__core_version', implode('.', array_slice( explode( '.', espresso_version() ), 0, 3 ) ) );
+		return apply_filters('FHEE__EED_Core_REST_API__core_version', implode('.', array_slice(explode('.', espresso_version()), 0, 3)));
 	}
 
 
@@ -487,7 +487,7 @@ 
 	 * @param  WP $WP
 	 * @return    void
 	 */
-	public function run( $WP ) {
+	public function run($WP) {
 
 	}
 

modules/single_page_checkout/inc/EE_Checkout.class.php

Spacing +205 added lines, -205 removed lines

@@ -242,9 +242,9 @@ 
 		$this->reg_page_base_url = EE_Registry::instance()->CFG->core->reg_page_url();
 		$this->thank_you_page_url = EE_Registry::instance()->CFG->core->thank_you_page_url();
 		$this->cancel_page_url = EE_Registry::instance()->CFG->core->cancel_page_url();
-		$this->continue_reg = apply_filters( 'FHEE__EE_Checkout___construct___continue_reg', TRUE );
+		$this->continue_reg = apply_filters('FHEE__EE_Checkout___construct___continue_reg', TRUE);
 		$this->admin_request = is_admin() && ! EE_Registry::instance()->REQ->ajax;
-		$this->reg_cache_where_params = array( 'order_by' => array( 'REG_count' => 'ASC' ));
+		$this->reg_cache_where_params = array('order_by' => array('REG_count' => 'ASC'));
 	}
 
 
@@ -254,8 +254,8 @@ 
 	 * @return array
 	 */
 	public function any_reg_status_updated() {
-		foreach ( $this->reg_status_updated as $reg_status ) {
-			if ( $reg_status ) {
+		foreach ($this->reg_status_updated as $reg_status) {
+			if ($reg_status) {
 				return true;
 			}
 		}
@@ -268,8 +268,8 @@ 
 	 * @param $REG_ID
 	 * @return array
 	 */
-	public function reg_status_updated( $REG_ID ) {
-		return isset( $this->reg_status_updated[ $REG_ID ] ) ? $this->reg_status_updated[ $REG_ID ] : false;
+	public function reg_status_updated($REG_ID) {
+		return isset($this->reg_status_updated[$REG_ID]) ? $this->reg_status_updated[$REG_ID] : false;
 	}
 
 
@@ -278,8 +278,8 @@ 
 	 * @param $REG_ID
 	 * @param $reg_status
 	 */
-	public function set_reg_status_updated( $REG_ID, $reg_status ) {
-		$this->reg_status_updated[ $REG_ID ] = filter_var( $reg_status, FILTER_VALIDATE_BOOLEAN );
+	public function set_reg_status_updated($REG_ID, $reg_status) {
+		$this->reg_status_updated[$REG_ID] = filter_var($reg_status, FILTER_VALIDATE_BOOLEAN);
 	}
 
 
@@ -300,7 +300,7 @@ 
 	 * can ONLY be set by the  Finalize_Registration reg step
 	 */
 	public function set_exit_spco() {
-		if ( $this->current_step instanceof EE_SPCO_Reg_Step_Finalize_Registration ) {
+		if ($this->current_step instanceof EE_SPCO_Reg_Step_Finalize_Registration) {
 			$this->exit_spco = true;
 		}
 	}
@@ -317,12 +317,12 @@ 
 	 */
 	public function reset_for_current_request() {
 		$this->process_form_submission = FALSE;
-		$this->continue_reg = apply_filters( 'FHEE__EE_Checkout___construct___continue_reg', true );
+		$this->continue_reg = apply_filters('FHEE__EE_Checkout___construct___continue_reg', true);
 		$this->admin_request = is_admin() && ! EE_Registry::instance()->REQ->front_ajax;
 		$this->continue_reg = true;
 		$this->redirect = false;
 		// don't reset the cached redirect form if we're about to be asked to display it !!!
-		if ( EE_Registry::instance()->REQ->get( 'action', 'display_spco_reg_step' ) !== 'redirect_form' ) {
+		if (EE_Registry::instance()->REQ->get('action', 'display_spco_reg_step') !== 'redirect_form') {
 			$this->redirect_form = '';
 		}
 		$this->redirect_url = '';
@@ -339,8 +339,8 @@ 
 	 * @param EE_SPCO_Reg_Step $reg_step_obj
 	 * @return    void
 	 */
-	public function add_reg_step( EE_SPCO_Reg_Step $reg_step_obj ) {
-		$this->reg_steps[ $reg_step_obj->slug()  ] = $reg_step_obj;
+	public function add_reg_step(EE_SPCO_Reg_Step $reg_step_obj) {
+		$this->reg_steps[$reg_step_obj->slug()] = $reg_step_obj;
 	}
 
 
@@ -356,22 +356,22 @@ 
 	 * @param string $reg_step_slug
 	 * @return    void
 	 */
-	public function skip_reg_step( $reg_step_slug = '' ) {
-		$step_to_skip = $this->find_reg_step( $reg_step_slug );
-		if ( $step_to_skip instanceof EE_SPCO_Reg_Step && $step_to_skip->is_current_step() ) {
-			$step_to_skip->set_is_current_step( false );
+	public function skip_reg_step($reg_step_slug = '') {
+		$step_to_skip = $this->find_reg_step($reg_step_slug);
+		if ($step_to_skip instanceof EE_SPCO_Reg_Step && $step_to_skip->is_current_step()) {
+			$step_to_skip->set_is_current_step(false);
 			$step_to_skip->set_completed();
 			// advance to the next step
-			$this->set_current_step( $this->next_step->slug() );
+			$this->set_current_step($this->next_step->slug());
 			// also reset the step param in the request in case any other code references that directly
-			EE_Registry::instance()->REQ->set( 'step', $this->current_step->slug() );
+			EE_Registry::instance()->REQ->set('step', $this->current_step->slug());
 			// since we are skipping a step and setting the current step to be what was previously the next step,
 			// we need to check that the next step is now correct, and not still set to the current step.
-			if ( $this->current_step->slug() == $this->next_step->slug() ) {
+			if ($this->current_step->slug() == $this->next_step->slug()) {
 				// correctly setup the next step
 				$this->set_next_step();
 			}
-			$this->set_reg_step_initiated( $this->current_step );
+			$this->set_reg_step_initiated($this->current_step);
 		}
 	}
 
@@ -385,16 +385,16 @@ 
 	 * @param bool   $reset whether to reset reg steps after removal
 	 * @throws EE_Error
 	 */
-	public function remove_reg_step( $reg_step_slug = '', $reset = true ) {
-		unset( $this->reg_steps[ $reg_step_slug  ] );
-		if ( $this->transaction instanceof EE_Transaction ) {
+	public function remove_reg_step($reg_step_slug = '', $reset = true) {
+		unset($this->reg_steps[$reg_step_slug]);
+		if ($this->transaction instanceof EE_Transaction) {
 			/** @type EE_Transaction_Processor $transaction_processor */
-			$transaction_processor = EE_Registry::instance()->load_class( 'Transaction_Processor' );
+			$transaction_processor = EE_Registry::instance()->load_class('Transaction_Processor');
 			// now remove reg step from TXN and save
-			$transaction_processor->remove_reg_step( $this->transaction, $reg_step_slug );
+			$transaction_processor->remove_reg_step($this->transaction, $reg_step_slug);
 			$this->transaction->save();
 		}
-		if ( $reset ) {
+		if ($reset) {
 			$this->reset_reg_steps();
 		}
 	}
@@ -409,9 +409,9 @@ 
 	 * @param int    $order
 	 * @return    void
 	 */
-	public function set_reg_step_order( $reg_step_slug = '', $order = 100 ) {
-		if ( isset( $this->reg_steps[ $reg_step_slug  ] )) {
-			$this->reg_steps[ $reg_step_slug ]->set_order( $order );
+	public function set_reg_step_order($reg_step_slug = '', $order = 100) {
+		if (isset($this->reg_steps[$reg_step_slug])) {
+			$this->reg_steps[$reg_step_slug]->set_order($order);
 		}
 	}
 
@@ -424,25 +424,25 @@ 
 	 * @param string $current_step
 	 * @return    void
 	 */
-	public function set_current_step( $current_step ) {
+	public function set_current_step($current_step) {
 		// grab what step we're on
-		$this->current_step = isset( $this->reg_steps[ $current_step ] ) ? $this->reg_steps[ $current_step ] : reset( $this->reg_steps );
+		$this->current_step = isset($this->reg_steps[$current_step]) ? $this->reg_steps[$current_step] : reset($this->reg_steps);
 		// verify instance
-		if ( $this->current_step instanceof EE_SPCO_Reg_Step ) {
+		if ($this->current_step instanceof EE_SPCO_Reg_Step) {
 			// we don't want to repeat completed steps if this is the first time through SPCO
-			if ( $this->continue_reg && $this->current_step->completed() && ! $this->revisit ) {
+			if ($this->continue_reg && $this->current_step->completed() && ! $this->revisit) {
 				// so advance to the next step
 				$this->set_next_step();
-				if ( $this->next_step instanceof EE_SPCO_Reg_Step ) {
+				if ($this->next_step instanceof EE_SPCO_Reg_Step) {
 					// and attempt to set it as the current step
-					$this->set_current_step( $this->next_step->slug() );
+					$this->set_current_step($this->next_step->slug());
 				}
 				return;
 			}
-			$this->current_step->set_is_current_step( TRUE );
+			$this->current_step->set_is_current_step(TRUE);
 		} else {
 			EE_Error::add_error(
-				__( 'The current step could not be set.', 'event_espresso' ),
+				__('The current step could not be set.', 'event_espresso'),
 				__FILE__, __FUNCTION__, __LINE__
 			);
 		}
@@ -459,20 +459,20 @@ 
 	 */
 	public function set_next_step() {
 		// set pointer to start of array
-		reset( $this->reg_steps );
+		reset($this->reg_steps);
 		// if there is more than one step
-		if ( count( $this->reg_steps ) > 1 ) {
+		if (count($this->reg_steps) > 1) {
 			// advance to the current step and set pointer
-			while ( key( $this->reg_steps ) != $this->current_step->slug() && key( $this->reg_steps ) != '' ) {
-				next( $this->reg_steps );
+			while (key($this->reg_steps) != $this->current_step->slug() && key($this->reg_steps) != '') {
+				next($this->reg_steps);
 			}
 		}
 		// advance one more spot ( if it exists )
-		$this->next_step = next( $this->reg_steps );
+		$this->next_step = next($this->reg_steps);
 		// verify instance
-		$this->next_step = $this->next_step instanceof EE_SPCO_Reg_Step ? $this->next_step  : NULL;
+		$this->next_step = $this->next_step instanceof EE_SPCO_Reg_Step ? $this->next_step : NULL;
 		// then back to current step to reset
-		prev( $this->reg_steps );
+		prev($this->reg_steps);
 	}
 
 
@@ -486,8 +486,8 @@ 
 	 *  @return 	EE_SPCO_Reg_Step | null
 	 */
 	public function get_next_reg_step() {
-		$next = next( $this->reg_steps );
-		prev( $this->reg_steps );
+		$next = next($this->reg_steps);
+		prev($this->reg_steps);
 		return $next instanceof EE_SPCO_Reg_Step ? $next : null;
 	}
 
@@ -502,8 +502,8 @@ 
 	 *  @return 	EE_SPCO_Reg_Step | null
 	 */
 	public function get_prev_reg_step() {
-		$prev = prev( $this->reg_steps );
-		next( $this->reg_steps );
+		$prev = prev($this->reg_steps);
+		next($this->reg_steps);
 		return $prev instanceof EE_SPCO_Reg_Step ? $prev : null;
 	}
 
@@ -516,8 +516,8 @@ 
 	 * @return void
 	 */
 	public function sort_reg_steps() {
-		$reg_step_sorting_callback = apply_filters( 'FHEE__EE_Checkout__sort_reg_steps__reg_step_sorting_callback', 'reg_step_sorting_callback' );
-		uasort( $this->reg_steps, array( $this, $reg_step_sorting_callback ));
+		$reg_step_sorting_callback = apply_filters('FHEE__EE_Checkout__sort_reg_steps__reg_step_sorting_callback', 'reg_step_sorting_callback');
+		uasort($this->reg_steps, array($this, $reg_step_sorting_callback));
 	}
 
 
@@ -530,19 +530,19 @@ 
 	 * @param string $reg_step_slug
 	 * @return EE_SPCO_Reg_Step|null
 	 */
-	public function find_reg_step( $reg_step_slug = '' ) {
-		if ( ! empty( $reg_step_slug ) ) {
+	public function find_reg_step($reg_step_slug = '') {
+		if ( ! empty($reg_step_slug)) {
 			// copy reg step array
 			$reg_steps = $this->reg_steps;
 			// set pointer to start of array
-			reset( $reg_steps );
+			reset($reg_steps);
 			// if there is more than one step
-			if ( count( $reg_steps ) > 1 ) {
+			if (count($reg_steps) > 1) {
 				// advance to the current step and set pointer
-				while ( key( $reg_steps ) != $reg_step_slug && key( $reg_steps ) != '' ) {
-					next( $reg_steps );
+				while (key($reg_steps) != $reg_step_slug && key($reg_steps) != '') {
+					next($reg_steps);
 				}
-				return current( $reg_steps );
+				return current($reg_steps);
 			}
 		}
 		return null;
@@ -558,17 +558,17 @@ 
 	 * @param EE_SPCO_Reg_Step $reg_step_B
 	 * @return array()
 	 */
-	public function reg_step_sorting_callback( EE_SPCO_Reg_Step $reg_step_A, EE_SPCO_Reg_Step $reg_step_B ) {
+	public function reg_step_sorting_callback(EE_SPCO_Reg_Step $reg_step_A, EE_SPCO_Reg_Step $reg_step_B) {
 		// send finalize_registration step to the end of the array
-		if ( $reg_step_A->slug() == 'finalize_registration' ) {
+		if ($reg_step_A->slug() == 'finalize_registration') {
 			return 1;
-		} else if ( $reg_step_B->slug() == 'finalize_registration' ) {
+		} else if ($reg_step_B->slug() == 'finalize_registration') {
 			return -1;
 		}
-		if ( $reg_step_A->order() == $reg_step_B->order() ) {
+		if ($reg_step_A->order() == $reg_step_B->order()) {
 			return 0;
 		}
-		return ( $reg_step_A->order() > $reg_step_B->order() ) ? 1 : -1;
+		return ($reg_step_A->order() > $reg_step_B->order()) ? 1 : -1;
 	}
 
 
@@ -579,7 +579,7 @@ 
 	 * @access 	public
 	 * @param 	EE_SPCO_Reg_Step $reg_step
 	 */
-	public function set_reg_step_initiated( EE_SPCO_Reg_Step $reg_step ) {
+	public function set_reg_step_initiated(EE_SPCO_Reg_Step $reg_step) {
 		// call set_reg_step_initiated ???
 		if (
 			// first time visiting SPCO ?
@@ -592,13 +592,13 @@ 
 			)
 		) {
 			/** @type EE_Transaction_Processor $transaction_processor */
-			$transaction_processor = EE_Registry::instance()->load_class( 'Transaction_Processor' );
+			$transaction_processor = EE_Registry::instance()->load_class('Transaction_Processor');
 			// set the start time for this reg step
-			if ( ! $transaction_processor->set_reg_step_initiated( $this->transaction, $reg_step->slug() ) ) {
-				if ( WP_DEBUG ) {
+			if ( ! $transaction_processor->set_reg_step_initiated($this->transaction, $reg_step->slug())) {
+				if (WP_DEBUG) {
 					EE_Error::add_error(
 						sprintf(
-							__( 'The "%1$s" registration step was not initialized properly.', 'event_espresso' ),
+							__('The "%1$s" registration step was not initialized properly.', 'event_espresso'),
 							$reg_step->name()
 						),
 						__FILE__, __FUNCTION__, __LINE__
@@ -617,10 +617,10 @@ 
 	 * 	@return 	void
 	 */
 	public function set_reg_step_JSON_info() {
-		EE_Registry::$i18n_js_strings[ 'reg_steps' ] = array();
+		EE_Registry::$i18n_js_strings['reg_steps'] = array();
 		// pass basic reg step data to JS
-		foreach ( $this->reg_steps as $reg_step ) {
-			EE_Registry::$i18n_js_strings[ 'reg_steps' ][] = $reg_step->slug();
+		foreach ($this->reg_steps as $reg_step) {
+			EE_Registry::$i18n_js_strings['reg_steps'][] = $reg_step->slug();
 		}
 		// reset reg step html
 //		$this->json_response->set_reg_step_html( '' );
@@ -636,7 +636,7 @@ 
 	 */
 	public function reset_reg_steps() {
 		$this->sort_reg_steps();
-		$this->set_current_step( EE_Registry::instance()->REQ->get( 'step' ));
+		$this->set_current_step(EE_Registry::instance()->REQ->get('step'));
 		$this->set_next_step();
 		// the text that appears on the reg step form submit button
 		$this->current_step->set_submit_button_text();
@@ -653,9 +653,9 @@ 
 	 */
 	public function get_registration_time_limit() {
 
-		$registration_time_limit = (float)( EE_Registry::instance()	->SSN->expiration() - time() );
+		$registration_time_limit = (float) (EE_Registry::instance()	->SSN->expiration() - time());
 		$time_limit_format = $registration_time_limit > 60 * MINUTE_IN_SECONDS ? 'H:i:s' : 'i:s';
-		$registration_time_limit = gmdate( $time_limit_format, $registration_time_limit );
+		$registration_time_limit = gmdate($time_limit_format, $registration_time_limit);
 		return apply_filters(
 			'FHEE__EE_Checkout__get_registration_time_limit__registration_time_limit',
 			$registration_time_limit
@@ -675,7 +675,7 @@ 
 		//		overpaid TXN
 		//		free TXN ( total = 0.00 )
 		// then payment required is TRUE
-		return ! ( $this->admin_request || $this->transaction->is_completed() || $this->transaction->is_overpaid() || $this->transaction->is_free() ) ? TRUE : FALSE;
+		return ! ($this->admin_request || $this->transaction->is_completed() || $this->transaction->is_overpaid() || $this->transaction->is_free()) ? TRUE : FALSE;
 	}
 
 
@@ -688,8 +688,8 @@ 
 	 */
 	public function initialize_txn_reg_steps_array() {
 		$txn_reg_steps_array = array();
-		foreach ( $this->reg_steps as $reg_step ) {
-			$txn_reg_steps_array[ $reg_step->slug() ] = FALSE;
+		foreach ($this->reg_steps as $reg_step) {
+			$txn_reg_steps_array[$reg_step->slug()] = FALSE;
 		}
 		return $txn_reg_steps_array;
 	}
@@ -705,13 +705,13 @@ 
 	public function update_txn_reg_steps_array() {
 		$updated = FALSE;
 		/** @type EE_Transaction_Processor $transaction_processor */
-		$transaction_processor = EE_Registry::instance()->load_class( 'Transaction_Processor' );
-		foreach ( $this->reg_steps as $reg_step ) {
-			if ( $reg_step->completed() ) {
-				$updated = $transaction_processor->set_reg_step_completed( $this->transaction, $reg_step->slug() ) ? TRUE : $updated;
+		$transaction_processor = EE_Registry::instance()->load_class('Transaction_Processor');
+		foreach ($this->reg_steps as $reg_step) {
+			if ($reg_step->completed()) {
+				$updated = $transaction_processor->set_reg_step_completed($this->transaction, $reg_step->slug()) ? TRUE : $updated;
 			}
 		}
-		if ( $updated ) {
+		if ($updated) {
 			$this->transaction->save();
 		}
 		return $updated;
@@ -726,14 +726,14 @@ 
 	 * 	@return 	void
 	 */
 	public function stash_transaction_and_checkout() {
-		if ( ! $this->revisit ) {
+		if ( ! $this->revisit) {
 			$this->update_txn_reg_steps_array();
 		}
 		$this->track_transaction_and_registration_status_updates();
 		// save all data to the db, but suppress errors
 		//$this->save_all_data( FALSE );
 		// cache the checkout in the session
-		EE_Registry::instance()->SSN->set_checkout( $this );
+		EE_Registry::instance()->SSN->set_checkout($this);
 	}
 
 
@@ -749,21 +749,21 @@ 
 	 */
 	public function track_transaction_and_registration_status_updates() {
 		// verify the transaction
-		if ( $this->transaction instanceof EE_Transaction ) {
+		if ($this->transaction instanceof EE_Transaction) {
 			/** @type EE_Transaction_Payments $transaction_payments */
-			$transaction_payments = EE_Registry::instance()->load_class( 'Transaction_Payments' );
+			$transaction_payments = EE_Registry::instance()->load_class('Transaction_Payments');
 			/** @type EE_Transaction_Processor $transaction_processor */
-			$transaction_processor = EE_Registry::instance()->load_class( 'Transaction_Processor' );
+			$transaction_processor = EE_Registry::instance()->load_class('Transaction_Processor');
 			// has there been a TXN status change during this checkout?
-			if ( $transaction_payments->txn_status_updated() || $transaction_processor->txn_status_updated() ) {
+			if ($transaction_payments->txn_status_updated() || $transaction_processor->txn_status_updated()) {
 				$this->txn_status_updated = true;
 			}
 			/** @type EE_Registration_Processor $registration_processor */
-			$registration_processor = EE_Registry::instance()->load_class( 'Registration_Processor' );
+			$registration_processor = EE_Registry::instance()->load_class('Registration_Processor');
 			// grab the saved registrations from the transaction
-			foreach ( $this->transaction->registrations( $this->reg_cache_where_params ) as $registration ) {
-				if ( $registration_processor->reg_status_updated( $registration->ID() ) ) {
-					$this->set_reg_status_updated( $registration->ID(), true );
+			foreach ($this->transaction->registrations($this->reg_cache_where_params) as $registration) {
+				if ($registration_processor->reg_status_updated($registration->ID())) {
+					$this->set_reg_status_updated($registration->ID(), true);
 				}
 			}
 		}
@@ -785,8 +785,8 @@ 
 	 * @param 	EE_Registration 	$registration
 	 * 	@return 	bool
 	 */
-	public function visit_allows_processing_of_this_registration( EE_Registration $registration ) {
-		return ! $this->revisit || $this->primary_revisit || ( $this->revisit && $this->reg_url_link == $registration->reg_url_link() ) ? TRUE : FALSE;
+	public function visit_allows_processing_of_this_registration(EE_Registration $registration) {
+		return ! $this->revisit || $this->primary_revisit || ($this->revisit && $this->reg_url_link == $registration->reg_url_link()) ? TRUE : FALSE;
 	}
 
 
@@ -811,18 +811,18 @@ 
 	 * @param bool $show_errors
 	 * @return bool
 	 */
-	public function save_all_data( $show_errors = TRUE ) {
+	public function save_all_data($show_errors = TRUE) {
 		// verify the transaction
-		if ( $this->transaction instanceof EE_Transaction ) {
+		if ($this->transaction instanceof EE_Transaction) {
 			// save to ensure that TXN has ID
 			$this->transaction->save();
 			// grab the saved registrations from the transaction
-			foreach ( $this->transaction->registrations( $this->reg_cache_where_params ) as  $registration ) {
-				$this->_save_registration( $registration, $show_errors );
+			foreach ($this->transaction->registrations($this->reg_cache_where_params) as  $registration) {
+				$this->_save_registration($registration, $show_errors);
 			}
 		} else {
-			if ( $show_errors ) {
-				EE_Error::add_error( __( 'A valid Transaction was not found when attempting to save your registration information.', 'event_espresso' ), __FILE__, __FUNCTION__, __LINE__);
+			if ($show_errors) {
+				EE_Error::add_error(__('A valid Transaction was not found when attempting to save your registration information.', 'event_espresso'), __FILE__, __FUNCTION__, __LINE__);
 			}
 			return FALSE;
 		}
@@ -837,32 +837,32 @@ 
 	 * @param bool $show_errors
 	 * @return void
 	 */
-	private function _save_registration( $registration, $show_errors = TRUE  ) {
+	private function _save_registration($registration, $show_errors = TRUE) {
 		// verify object
-		if ( $registration instanceof EE_Registration ) {
+		if ($registration instanceof EE_Registration) {
 			// should this registration be processed during this visit ?
-			if ( $this->visit_allows_processing_of_this_registration( $registration ) ) {
+			if ($this->visit_allows_processing_of_this_registration($registration)) {
 				//set TXN ID
-				if ( ! $registration->transaction_ID() ) {
-					$registration->set_transaction_id( $this->transaction->ID() );
+				if ( ! $registration->transaction_ID()) {
+					$registration->set_transaction_id($this->transaction->ID());
 				}
 				// verify and save the attendee
-				$this->_save_registration_attendee( $registration, $show_errors );
+				$this->_save_registration_attendee($registration, $show_errors);
 				// save answers to reg form questions
-				$this->_save_registration_answers( $registration, $show_errors );
+				$this->_save_registration_answers($registration, $show_errors);
 				// save changes
 				$registration->save();
 				// update txn cache
-				if ( ! $this->transaction->update_cache_after_object_save( 'Registration', $registration )) {
-					if ( $show_errors ) {
-						EE_Error::add_error( __( 'The newly saved Registration object could not be cached on the Transaction.', 'event_espresso' ), __FILE__, __FUNCTION__, __LINE__);
+				if ( ! $this->transaction->update_cache_after_object_save('Registration', $registration)) {
+					if ($show_errors) {
+						EE_Error::add_error(__('The newly saved Registration object could not be cached on the Transaction.', 'event_espresso'), __FILE__, __FUNCTION__, __LINE__);
 					}
 				}
 			}
 		} else {
-			if ( $show_errors ) {
+			if ($show_errors) {
 				EE_Error::add_error(
-					__( 'An invalid Registration object was discovered when attempting to save your registration information.', 'event_espresso' ),
+					__('An invalid Registration object was discovered when attempting to save your registration information.', 'event_espresso'),
 					__FILE__, __FUNCTION__, __LINE__
 				);
 			}
@@ -878,26 +878,26 @@ 
 	 * @param bool $show_errors
 	 * @return void
 	 */
-	private function _save_registration_attendee( $registration, $show_errors = TRUE ) {
-		if ( $registration->attendee() instanceof EE_Attendee ) {
+	private function _save_registration_attendee($registration, $show_errors = TRUE) {
+		if ($registration->attendee() instanceof EE_Attendee) {
 			// save so that ATT has ID
 			$registration->attendee()->save();
-			if ( ! $registration->update_cache_after_object_save( 'Attendee', $registration->attendee() )) {
-				if ( $show_errors ) {
+			if ( ! $registration->update_cache_after_object_save('Attendee', $registration->attendee())) {
+				if ($show_errors) {
 					EE_Error::add_error(
-						__( 'The newly saved Attendee object could not be cached on the registration.', 'event_espresso' ),
+						__('The newly saved Attendee object could not be cached on the registration.', 'event_espresso'),
 						__FILE__, __FUNCTION__, __LINE__
 					);
 				}
 			}
 		} else {
-			if ( $show_errors ) {
+			if ($show_errors) {
 				ob_start();
-				var_dump( $registration->attendee() );
+				var_dump($registration->attendee());
 				EE_Error::add_error(
 					sprintf(
 						'%1$s||%1$s $attendee = %2$s',
-						__( 'Either no Attendee information was found, or an invalid Attendee object was discovered when attempting to save your registration information.', 'event_espresso' ),
+						__('Either no Attendee information was found, or an invalid Attendee object was discovered when attempting to save your registration information.', 'event_espresso'),
 						ob_get_clean()
 					),
 					__FILE__, __FUNCTION__, __LINE__
@@ -915,25 +915,25 @@ 
 	 * @param bool $show_errors
 	 * @return void
 	 */
-	private function _save_registration_answers( $registration, $show_errors = TRUE ) {
+	private function _save_registration_answers($registration, $show_errors = TRUE) {
 		// now save the answers
-		foreach ( $registration->answers() as $cache_key => $answer ) {
+		foreach ($registration->answers() as $cache_key => $answer) {
 			// verify object
-			if ( $answer instanceof EE_Answer ) {
-				$answer->set_registration( $registration->ID() );
+			if ($answer instanceof EE_Answer) {
+				$answer->set_registration($registration->ID());
 				$answer->save();
-				if ( ! $registration->update_cache_after_object_save( 'Answer', $answer, $cache_key )) {
-					if ( $show_errors ) {
+				if ( ! $registration->update_cache_after_object_save('Answer', $answer, $cache_key)) {
+					if ($show_errors) {
 						EE_Error::add_error(
-							__( 'The newly saved Answer object could not be cached on the registration.', 'event_espresso' ),
+							__('The newly saved Answer object could not be cached on the registration.', 'event_espresso'),
 							__FILE__, __FUNCTION__, __LINE__
 						);
 					}
 				}
 			} else {
-				if ( $show_errors ) {
+				if ($show_errors) {
 					EE_Error::add_error(
-						__( 'An invalid Answer object was discovered when attempting to save your registration information.', 'event_espresso' ),
+						__('An invalid Answer object was discovered when attempting to save your registration information.', 'event_espresso'),
 						__FILE__, __FUNCTION__, __LINE__
 					);
 				}
@@ -951,7 +951,7 @@ 
 	 * @param bool $from_db
 	 * @return bool
 	 */
-	public function refresh_all_entities( $from_db = false ) {
+	public function refresh_all_entities($from_db = false) {
 		$from_db = $this->current_step->is_final_step() || $this->action == 'process_gateway_response' ? true : $from_db;
 		//$this->log(
 		//	__CLASS__, __FUNCTION__, __LINE__,
@@ -972,11 +972,11 @@ 
 	 */
 	protected function refresh_from_db() {
 		// verify the transaction
-		if ( $this->transaction instanceof EE_Transaction && $this->transaction->ID() ) {
+		if ($this->transaction instanceof EE_Transaction && $this->transaction->ID()) {
 			// pull fresh TXN data from the db
-			$this->transaction = $this->transaction->get_model()->refresh_entity_map_from_db( $this->transaction->ID() );
+			$this->transaction = $this->transaction->get_model()->refresh_entity_map_from_db($this->transaction->ID());
 			// update EE_Checkout's cached primary_attendee object
-			$this->primary_attendee_obj = $this->_refresh_primary_attendee_obj_from_db( $this->transaction );
+			$this->primary_attendee_obj = $this->_refresh_primary_attendee_obj_from_db($this->transaction);
 			// update EE_Checkout's cached payment object
 			$payment = $this->transaction->last_payment();
 			$this->payment = $payment instanceof EE_Payment ? $payment : $this->payment;
@@ -984,15 +984,15 @@ 
 			$payment_method = $this->payment instanceof EE_Payment ? $this->payment->payment_method() : null;
 			$this->payment_method = $payment_method instanceof EE_Payment_Method ? $payment_method : $this->payment_method;
 			//now refresh the cart, based on the TXN
-			$this->cart = EE_Cart::get_cart_from_txn( $this->transaction );
+			$this->cart = EE_Cart::get_cart_from_txn($this->transaction);
 			// verify and update the cart because inaccurate totals are not so much fun
-			if ( $this->cart instanceof EE_Cart ) {
+			if ($this->cart instanceof EE_Cart) {
 				$this->cart->get_grand_total()->recalculate_total_including_taxes();
 			} else {
-				$this->cart = EE_Registry::instance()->load_core( 'Cart' );
+				$this->cart = EE_Registry::instance()->load_core('Cart');
 			}
 		} else {
-			EE_Error::add_error( __( 'A valid Transaction was not found when attempting to update the model entity mapper.', 'event_espresso' ), __FILE__, __FUNCTION__, __LINE__);
+			EE_Error::add_error(__('A valid Transaction was not found when attempting to update the model entity mapper.', 'event_espresso'), __FILE__, __FUNCTION__, __LINE__);
 			return FALSE;
 		}
 		return TRUE;
@@ -1006,24 +1006,24 @@ 
 	 * @param   EE_Transaction $transaction
 	 * @return  EE_Attendee | null
 	 */
-	protected function _refresh_primary_attendee_obj_from_db( EE_Transaction $transaction ) {
+	protected function _refresh_primary_attendee_obj_from_db(EE_Transaction $transaction) {
 
 		$primary_attendee_obj = null;
 		// grab the saved registrations from the transaction
-		foreach ( $transaction->registrations( $this->reg_cache_where_params, true ) as $registration ) {
+		foreach ($transaction->registrations($this->reg_cache_where_params, true) as $registration) {
 			// verify object
-			if ( $registration instanceof EE_Registration ) {
+			if ($registration instanceof EE_Registration) {
 				$attendee = $registration->attendee();
 				// verify object
-				if ( $attendee instanceof EE_Attendee  ) {
+				if ($attendee instanceof EE_Attendee) {
 					// maybe cache primary_attendee_obj ?
-					if ( $registration->is_primary_registrant() ) {
+					if ($registration->is_primary_registrant()) {
 						$primary_attendee_obj = $attendee;
 					}
 				}
 			} else {
 				EE_Error::add_error(
-						__( 'An invalid Registration object was discovered when attempting to update the model entity mapper.', 'event_espresso' ),
+						__('An invalid Registration object was discovered when attempting to update the model entity mapper.', 'event_espresso'),
 						__FILE__, __FUNCTION__, __LINE__
 				);
 			}
@@ -1043,43 +1043,43 @@ 
 	 */
 	protected function refresh_entity_map() {
 		// verify the transaction
-		if ( $this->transaction instanceof EE_Transaction && $this->transaction->ID() ) {
+		if ($this->transaction instanceof EE_Transaction && $this->transaction->ID()) {
 			// never cache payment info
-			$this->transaction->clear_cache( 'Payment' );
+			$this->transaction->clear_cache('Payment');
 			/** @type EE_Transaction_Processor $transaction_processor */
-			$transaction_processor = EE_Registry::instance()->load_class( 'Transaction_Processor' );
+			$transaction_processor = EE_Registry::instance()->load_class('Transaction_Processor');
 			// is the Payment Options Reg Step completed ?
-			if ( $transaction_processor->reg_step_completed( $this->transaction, 'payment_options' ) ) {
+			if ($transaction_processor->reg_step_completed($this->transaction, 'payment_options')) {
 				// then check for payments and update TXN accordingly
 				/** @type EE_Transaction_Payments $transaction_payments */
-				$transaction_payments = EE_Registry::instance()->load_class( 'Transaction_Payments' );
-				$transaction_payments->calculate_total_payments_and_update_status( $this->transaction );
+				$transaction_payments = EE_Registry::instance()->load_class('Transaction_Payments');
+				$transaction_payments->calculate_total_payments_and_update_status($this->transaction);
 			}
 			// grab the saved registrations from the transaction
-			foreach ( $this->transaction->registrations( $this->reg_cache_where_params ) as $reg_cache_ID => $registration ) {
-				$this->_refresh_registration( $reg_cache_ID, $registration );
+			foreach ($this->transaction->registrations($this->reg_cache_where_params) as $reg_cache_ID => $registration) {
+				$this->_refresh_registration($reg_cache_ID, $registration);
 			}
 			// make sure our cached TXN is added to the model entity mapper
-			$this->transaction = $this->transaction->get_model()->refresh_entity_map_with( $this->transaction->ID(), $this->transaction );
+			$this->transaction = $this->transaction->get_model()->refresh_entity_map_with($this->transaction->ID(), $this->transaction);
 
 		} else {
-			EE_Error::add_error( __( 'A valid Transaction was not found when attempting to update the model entity mapper.', 'event_espresso' ), __FILE__, __FUNCTION__, __LINE__);
+			EE_Error::add_error(__('A valid Transaction was not found when attempting to update the model entity mapper.', 'event_espresso'), __FILE__, __FUNCTION__, __LINE__);
 			return FALSE;
 		}
 		// verify and update the cart because inaccurate totals are not so much fun
-		if ( $this->cart instanceof EE_Cart ) {
+		if ($this->cart instanceof EE_Cart) {
 			$grand_total = $this->cart->get_grand_total();
-			if ( $grand_total instanceof EE_Line_Item && $grand_total->ID() ) {
+			if ($grand_total instanceof EE_Line_Item && $grand_total->ID()) {
 				$grand_total->recalculate_total_including_taxes();
 				$grand_total = $grand_total->get_model()->refresh_entity_map_with(
 					$this->cart->get_grand_total()->ID(),
 					$this->cart->get_grand_total()
 				);
 			}
-			if ( $grand_total instanceof EE_Line_Item ) {
-				$this->cart = EE_Cart::instance( $grand_total );
+			if ($grand_total instanceof EE_Line_Item) {
+				$this->cart = EE_Cart::instance($grand_total);
 			} else {
-				EE_Error::add_error( __( 'A valid Cart was not found when attempting to update the model entity mapper.', 'event_espresso' ), __FILE__, __FUNCTION__, __LINE__ );
+				EE_Error::add_error(__('A valid Cart was not found when attempting to update the model entity mapper.', 'event_espresso'), __FILE__, __FUNCTION__, __LINE__);
 				return false;
 			}
 		}
@@ -1095,19 +1095,19 @@ 
 	 * @param 	EE_Registration 	$registration
 	 * @return void
 	 */
-	protected function _refresh_registration( $reg_cache_ID, $registration ) {
+	protected function _refresh_registration($reg_cache_ID, $registration) {
 
 		// verify object
-		if ( $registration instanceof EE_Registration ) {
+		if ($registration instanceof EE_Registration) {
 			// update the entity mapper attendee
-			$this->_refresh_registration_attendee( $registration );
+			$this->_refresh_registration_attendee($registration);
 			// update the entity mapper answers for reg form questions
-			$this->_refresh_registration_answers( $registration );
+			$this->_refresh_registration_answers($registration);
 			// make sure the cached registration is added to the model entity mapper
-			$registration->get_model()->refresh_entity_map_with( $reg_cache_ID, $registration );
+			$registration->get_model()->refresh_entity_map_with($reg_cache_ID, $registration);
 		} else {
 			EE_Error::add_error(
-				__( 'An invalid Registration object was discovered when attempting to update the model entity mapper.', 'event_espresso' ),
+				__('An invalid Registration object was discovered when attempting to update the model entity mapper.', 'event_espresso'),
 				__FILE__, __FUNCTION__, __LINE__
 			);
 		}
@@ -1121,15 +1121,15 @@ 
 	 * @param 	EE_Registration 	$registration
 	 * @return void
 	 */
-	protected function _refresh_registration_attendee( $registration ) {
+	protected function _refresh_registration_attendee($registration) {
 
 		$attendee = $registration->attendee();
 		// verify object
-		if ( $attendee instanceof EE_Attendee && $attendee->ID() ) {
+		if ($attendee instanceof EE_Attendee && $attendee->ID()) {
 			// make sure the cached attendee is added to the model entity mapper
-			$registration->attendee()->get_model()->refresh_entity_map_with( $attendee->ID(), $attendee );
+			$registration->attendee()->get_model()->refresh_entity_map_with($attendee->ID(), $attendee);
 			// maybe cache primary_attendee_obj ?
-			if ( $registration->is_primary_registrant() ) {
+			if ($registration->is_primary_registrant()) {
 				$this->primary_attendee_obj = $attendee;
 			}
 		}
@@ -1143,19 +1143,19 @@ 
 	 * @param 	EE_Registration 	$registration
 	 * @return void
 	 */
-	protected function _refresh_registration_answers( $registration ) {
+	protected function _refresh_registration_answers($registration) {
 
 		// now update the answers
-		foreach ( $registration->answers() as $cache_key => $answer ) {
+		foreach ($registration->answers() as $cache_key => $answer) {
 			// verify object
-			if ( $answer instanceof EE_Answer ) {
-				if ( $answer->ID() ) {
+			if ($answer instanceof EE_Answer) {
+				if ($answer->ID()) {
 					// make sure the cached answer is added to the model entity mapper
-					$answer->get_model()->refresh_entity_map_with( $answer->ID(), $answer );
+					$answer->get_model()->refresh_entity_map_with($answer->ID(), $answer);
 				}
 			} else {
 				EE_Error::add_error(
-					__( 'An invalid Answer object was discovered when attempting to update the model entity mapper.', 'event_espresso' ),
+					__('An invalid Answer object was discovered when attempting to update the model entity mapper.', 'event_espresso'),
 					__FILE__, __FUNCTION__, __LINE__
 				);
 			}
@@ -1170,7 +1170,7 @@ 
 	 * this will reinstate the EE_Checkout object on each EE_SPCO_Reg_Step object
 	 */
 	function __wakeup() {
-		foreach ( $this->reg_steps as $reg_step ) {
+		foreach ($this->reg_steps as $reg_step) {
 			$reg_step->checkout = $this;
 		}
 	}
@@ -1186,11 +1186,11 @@ 
 	 * @param array $info
 	 * @param bool $display_request
 	 */
-	function log( $class = '', $func = '', $line = '', $info = array(), $display_request = false ) {
-		if ( WP_DEBUG && false ) {
-			$debug_data = get_option( 'EE_DEBUG_SPCO_' . EE_Session::instance()->id(), array() );
+	function log($class = '', $func = '', $line = '', $info = array(), $display_request = false) {
+		if (WP_DEBUG && false) {
+			$debug_data = get_option('EE_DEBUG_SPCO_'.EE_Session::instance()->id(), array());
 			$default_data = array(
-				$class 		=> $func . '() : ' . $line,
+				$class 		=> $func.'() : '.$line,
 				'request->step' 		=> $this->step,
 				'request->action' 	=> $this->action,
 				'current_step->slug' => $this->current_step instanceof EE_SPCO_Reg_Step ?
@@ -1202,24 +1202,24 @@ 
 				'reg_url_link' => $this->reg_url_link,
 				'REQ' => $display_request ? $_REQUEST : '',
 			);
-			if ( $this->transaction instanceof EE_Transaction ) {
-				$default_data[ 'TXN_status' ] 		= $this->transaction->status_ID();
-				$default_data[ 'TXN_reg_steps' ] 	= $this->transaction->reg_steps();
-				foreach ( $this->transaction->registrations( $this->reg_cache_where_params ) as $REG_ID => $registration ) {
-					$default_data[ 'registrations' ][ $REG_ID ] = $registration->status_ID();
+			if ($this->transaction instanceof EE_Transaction) {
+				$default_data['TXN_status'] = $this->transaction->status_ID();
+				$default_data['TXN_reg_steps'] = $this->transaction->reg_steps();
+				foreach ($this->transaction->registrations($this->reg_cache_where_params) as $REG_ID => $registration) {
+					$default_data['registrations'][$REG_ID] = $registration->status_ID();
 				}
-				if ( $this->transaction->ID() ) {
-					$TXN_ID = 'EE_Transaction: ' . $this->transaction->ID();
+				if ($this->transaction->ID()) {
+					$TXN_ID = 'EE_Transaction: '.$this->transaction->ID();
 					// don't serialize objects
-					$info = $this->_strip_objects( $info );
-					if ( ! isset( $debug_data[ $TXN_ID ] ) ) {
-						$debug_data[ $TXN_ID ] = array();
+					$info = $this->_strip_objects($info);
+					if ( ! isset($debug_data[$TXN_ID])) {
+						$debug_data[$TXN_ID] = array();
 					}
-					$debug_data[ $TXN_ID ][ microtime() ] = array_merge(
+					$debug_data[$TXN_ID][microtime()] = array_merge(
 						$default_data,
 						$info
 					);
-					update_option( 'EE_DEBUG_SPCO_' . EE_Session::instance()->id(), $debug_data );
+					update_option('EE_DEBUG_SPCO_'.EE_Session::instance()->id(), $debug_data);
 				}
 			}
 		}
@@ -1232,23 +1232,23 @@ 
 	 * @param array $info
 	 * @return array
 	 */
-	function _strip_objects( $info = array() ) {
-		foreach ( $info as $key => $value ) {
-			if ( is_array( $value )) {
-				$info[ $key ] = $this->_strip_objects( $value );
-			} else if ( is_object( $value ) ) {
-				$object_class = get_class( $value );
-				$info[ $object_class ] = array();
-				$info[ $object_class ][ 'ID' ] = method_exists( $value, 'ID' ) ? $value->ID() : 0;
-				if ( method_exists( $value, 'status' ) ) {
-					$info[ $object_class ][ 'status' ] = $value->status();
-				} else if ( method_exists( $value, 'status_ID' ) ) {
-					$info[ $object_class ][ 'status' ] = $value->status_ID();
+	function _strip_objects($info = array()) {
+		foreach ($info as $key => $value) {
+			if (is_array($value)) {
+				$info[$key] = $this->_strip_objects($value);
+			} else if (is_object($value)) {
+				$object_class = get_class($value);
+				$info[$object_class] = array();
+				$info[$object_class]['ID'] = method_exists($value, 'ID') ? $value->ID() : 0;
+				if (method_exists($value, 'status')) {
+					$info[$object_class]['status'] = $value->status();
+				} else if (method_exists($value, 'status_ID')) {
+					$info[$object_class]['status'] = $value->status_ID();
 				}
-				unset( $info[ $key ] );
+				unset($info[$key]);
 			}
 		}
-		return (array)$info;
+		return (array) $info;
 	}