eventespresso / event-espresso-core

core/libraries/rest_api/Model_Data_Translator.php

Doc Comments +5 added lines, -1 removed lines

@@ -55,7 +55,7 @@ 
 	/**
 	 * Prepares incoming data from the json or $_REQUEST parameters for the models'
 	 * "$query_params". 
-	 * @param EE_Model_Field_Base $field_obj
+	 * @param \EE_Model_Field_Base $field_obj
 	 * @param mixed $original_value
 	 * @param string $requested_version
 	 * @return mixed
@@ -77,6 +77,7 @@ 
 	* Prepares a field's value for display in the API
 	* @param \EE_Model_Field_Base $field_obj
 	* @param mixed $original_value
+	* @param string $requested_version
 	* @return mixed
 	*/
    public static function prepare_field_value_for_json( $field_obj, $original_value, $requested_version ) {
@@ -131,6 +132,9 @@ 
 		return $query_param_for_models;
 	}
 	
+	/**
+	 * @return string
+	 */
 	public static function remove_stars_and_anything_after_from_condition_query_param_key( $condition_query_param_key ) {
 		$pos_of_star = strpos($condition_query_param_key, '*');
 		if($pos_of_star === FALSE){

Indentation +6 added lines, -6 removed lines

@@ -74,11 +74,11 @@ 
 	}
 	
 	/**
-	* Prepares a field's value for display in the API
-	* @param \EE_Model_Field_Base $field_obj
-	* @param mixed $original_value
-	* @return mixed
-	*/
+	 * Prepares a field's value for display in the API
+	 * @param \EE_Model_Field_Base $field_obj
+	 * @param mixed $original_value
+	 * @return mixed
+	 */
    public static function prepare_field_value_for_json( $field_obj, $original_value, $requested_version ) {
 		if( $original_value === EE_INF ) {
 			$new_value = self::ee_inf_in_rest;
@@ -95,7 +95,7 @@ 
 			$original_value,
 			$requested_version
 		);
-    }
+	}
 	
 	/**
 	 * Prepares condition-query-parameters (like what's in where and having) from

Spacing +44 added lines, -44 removed lines

@@ -21,8 +21,8 @@ 
  */
 	
 	
-if( !defined( 'EVENT_ESPRESSO_VERSION' ) ) {
-	exit( 'No direct script access allowed' );
+if ( ! defined('EVENT_ESPRESSO_VERSION')) {
+	exit('No direct script access allowed');
 }
 
 class Model_Data_Translator {
@@ -40,14 +40,14 @@ 
 	 * @param string  $requested_version
 	 * @return mixed
 	 */
-	public static function prepare_field_values_from_json( $field_obj, $original_value_maybe_array, $requested_version ) {
-		if( is_array( $original_value_maybe_array ) ) {
+	public static function prepare_field_values_from_json($field_obj, $original_value_maybe_array, $requested_version) {
+		if (is_array($original_value_maybe_array)) {
 			$new_value_maybe_array = array();
-			foreach( $original_value_maybe_array as $array_key => $array_item ) {
-				$new_value_maybe_array[ $array_key ] = self::prepare_field_value_from_json( $field_obj, $array_item, $requested_version );
+			foreach ($original_value_maybe_array as $array_key => $array_item) {
+				$new_value_maybe_array[$array_key] = self::prepare_field_value_from_json($field_obj, $array_item, $requested_version);
 			}
 		} else {
-			$new_value_maybe_array = self::prepare_field_value_from_json( $field_obj, $original_value_maybe_array, $requested_version );
+			$new_value_maybe_array = self::prepare_field_value_from_json($field_obj, $original_value_maybe_array, $requested_version);
 		}
 		return $new_value_maybe_array;
 	}
@@ -60,13 +60,13 @@ 
 	 * @param string $requested_version
 	 * @return mixed
 	 */
-	public static function prepare_field_value_from_json( $field_obj, $original_value, $requested_version ) {
+	public static function prepare_field_value_from_json($field_obj, $original_value, $requested_version) {
 		$new_value = null;
-		if( $field_obj instanceof \EE_Infinite_Integer_Field 
-			&& in_array( $original_value, array( null, '' ), true ) ) {
+		if ($field_obj instanceof \EE_Infinite_Integer_Field 
+			&& in_array($original_value, array(null, ''), true)) {
 			$new_value = EE_INF;
-		} elseif( $field_obj instanceof \EE_Datetime_Field ) {
-			$new_value = rest_parse_date( $original_value );
+		} elseif ($field_obj instanceof \EE_Datetime_Field) {
+			$new_value = rest_parse_date($original_value);
 		} else {
 			$new_value = $original_value;
 		}
@@ -79,17 +79,17 @@ 
 	* @param mixed $original_value
 	* @return mixed
 	*/
-   public static function prepare_field_value_for_json( $field_obj, $original_value, $requested_version ) {
-		if( $original_value === EE_INF ) {
+   public static function prepare_field_value_for_json($field_obj, $original_value, $requested_version) {
+		if ($original_value === EE_INF) {
 			$new_value = self::ee_inf_in_rest;
-		} elseif( $field_obj instanceof \EE_Datetime_Field &&
-			$original_value instanceof \DateTime ) {
-			$new_value = $original_value->format( 'c' );
-			$new_value = mysql_to_rfc3339( $new_value );
+		} elseif ($field_obj instanceof \EE_Datetime_Field &&
+			$original_value instanceof \DateTime) {
+			$new_value = $original_value->format('c');
+			$new_value = mysql_to_rfc3339($new_value);
 		} else {
 			$new_value = $original_value;
 		}
-		return apply_filters( 'FHEE__EventEspresso\core\libraries\rest_api\Model_Data_Translator__prepare_field_for_rest_api', 
+		return apply_filters('FHEE__EventEspresso\core\libraries\rest_api\Model_Data_Translator__prepare_field_for_rest_api', 
 			$new_value,
 			$field_obj,
 			$original_value,
@@ -105,37 +105,37 @@ 
 	 * @param string $requested_version
 	 * @return array
 	 */
-	public static function prepare_conditions_query_params_for_models( $inputted_query_params_of_this_type, \EEM_Base $model, $requested_version ) {
+	public static function prepare_conditions_query_params_for_models($inputted_query_params_of_this_type, \EEM_Base $model, $requested_version) {
 		$query_param_for_models = array();
-		foreach( $inputted_query_params_of_this_type as $query_param_key => $query_param_value ) {
+		foreach ($inputted_query_params_of_this_type as $query_param_key => $query_param_value) {
 			$field = self::deduce_field_from_query_param( 
-				self::remove_stars_and_anything_after_from_condition_query_param_key( $query_param_key ), 
+				self::remove_stars_and_anything_after_from_condition_query_param_key($query_param_key), 
 				$model
 			);
-			if( $field instanceof \EE_Model_Field_Base ) {
+			if ($field instanceof \EE_Model_Field_Base) {
 				//did they specify an operator?
-				if( is_array( $query_param_value ) ) {
-					$op = $query_param_value[ 0 ];
-					$value = $query_param_value[ 1 ];
-					$new_value = self::prepare_field_values_from_json( $field, $value, $requested_version );
-					$translated_value = array( $op, $new_value );
+				if (is_array($query_param_value)) {
+					$op = $query_param_value[0];
+					$value = $query_param_value[1];
+					$new_value = self::prepare_field_values_from_json($field, $value, $requested_version);
+					$translated_value = array($op, $new_value);
 				} else {
-					$translated_value  = self::prepare_field_value_from_json( $field, $query_param_value, $requested_version );
+					$translated_value = self::prepare_field_value_from_json($field, $query_param_value, $requested_version);
 				}
-				$query_param_for_models[ $query_param_key ] = $translated_value;
+				$query_param_for_models[$query_param_key] = $translated_value;
 			} else {
 				//so it's not for a field, assume it's a logic query param key
-				$query_param_for_models[ $query_param_key ] = self::prepare_conditions_query_params_for_models( $query_param_value, $model, $requested_version );
+				$query_param_for_models[$query_param_key] = self::prepare_conditions_query_params_for_models($query_param_value, $model, $requested_version);
 			}
 		}
 		return $query_param_for_models;
 	}
 	
-	public static function remove_stars_and_anything_after_from_condition_query_param_key( $condition_query_param_key ) {
+	public static function remove_stars_and_anything_after_from_condition_query_param_key($condition_query_param_key) {
 		$pos_of_star = strpos($condition_query_param_key, '*');
-		if($pos_of_star === FALSE){
+		if ($pos_of_star === FALSE) {
 			return $condition_query_param_key;
-		}else{
+		} else {
 			$condition_query_param_sans_star = substr($condition_query_param_key, 0, $pos_of_star);
 			return $condition_query_param_sans_star;
 		}
@@ -147,26 +147,26 @@ 
 	 * @throws EE_Error
 	 * @return EE_Model_Field_Base
 	 */
-	public static function deduce_field_from_query_param($query_param_name, \EEM_Base $model){
+	public static function deduce_field_from_query_param($query_param_name, \EEM_Base $model) {
 		//ok, now proceed with deducing which part is the model's name, and which is the field's name
 		//which will help us find the database table and column
 
-		$query_param_parts = explode(".",$query_param_name);
-		if(empty($query_param_parts)){
-			throw new \EE_Error(sprintf(__("_extract_column_name is empty when trying to extract column and table name from %s",'event_espresso'),$query_param_name));
+		$query_param_parts = explode(".", $query_param_name);
+		if (empty($query_param_parts)) {
+			throw new \EE_Error(sprintf(__("_extract_column_name is empty when trying to extract column and table name from %s", 'event_espresso'), $query_param_name));
 		}
 		$number_of_parts = count($query_param_parts);
-		$last_query_param_part = $query_param_parts[ count($query_param_parts) - 1 ];
-		if($number_of_parts == 1){
+		$last_query_param_part = $query_param_parts[count($query_param_parts) - 1];
+		if ($number_of_parts == 1) {
 			$field_name = $last_query_param_part;
-		}else{// $number_of_parts >= 2
+		} else {// $number_of_parts >= 2
 			//the last part is the column name, and there are only 2parts. therefore...
 			$field_name = $last_query_param_part;
-			$model = \EE_Registry::instance()->load_model( $query_param_parts[ $number_of_parts - 2 ]);
+			$model = \EE_Registry::instance()->load_model($query_param_parts[$number_of_parts - 2]);
 		}
-		try{
+		try {
 			return $model->field_settings_for($field_name);
-		}catch(\EE_Error $e){
+		} catch (\EE_Error $e) {
 			return null;
 		}
 	}

Braces +3 added lines, -3 removed lines

@@ -135,7 +135,7 @@ 
 		$pos_of_star = strpos($condition_query_param_key, '*');
 		if($pos_of_star === FALSE){
 			return $condition_query_param_key;
-		}else{
+		} else{
 			$condition_query_param_sans_star = substr($condition_query_param_key, 0, $pos_of_star);
 			return $condition_query_param_sans_star;
 		}
@@ -159,14 +159,14 @@ 
 		$last_query_param_part = $query_param_parts[ count($query_param_parts) - 1 ];
 		if($number_of_parts == 1){
 			$field_name = $last_query_param_part;
-		}else{// $number_of_parts >= 2
+		} else{// $number_of_parts >= 2
 			//the last part is the column name, and there are only 2parts. therefore...
 			$field_name = $last_query_param_part;
 			$model = \EE_Registry::instance()->load_model( $query_param_parts[ $number_of_parts - 2 ]);
 		}
 		try{
 			return $model->field_settings_for($field_name);
-		}catch(\EE_Error $e){
+		} catch(\EE_Error $e){
 			return null;
 		}
 	}

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

Spacing +36 added lines, -36 removed lines

@@ -1,8 +1,8 @@ 
 <?php
 namespace EventEspresso\core\libraries\rest_api\controllers\model;
 use EventEspresso\core\libraries\rest_api\Model_Data_Translator;
-if ( !defined( 'EVENT_ESPRESSO_VERSION' ) ) {
-	exit( 'No direct script access allowed' );
+if ( ! defined('EVENT_ESPRESSO_VERSION')) {
+	exit('No direct script access allowed');
 }
 
 /**
@@ -23,20 +23,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);
 		}
 	}
 
@@ -44,22 +44,22 @@ 
 	 * 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 = Model_Data_Translator::prepare_field_value_for_json(
@@ -70,30 +70,30 @@ 
 				$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;
 	}
@@ -103,23 +103,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/Base.php

Spacing +60 added lines, -60 removed lines

@@ -1,8 +1,8 @@ 
 <?php
 namespace EventEspresso\core\libraries\rest_api\controllers;
 use EventEspresso\core\libraries\rest_api\Rest_Exception;
-if ( !defined( 'EVENT_ESPRESSO_VERSION' ) ) {
-	exit( 'No direct script access allowed' );
+if ( ! defined('EVENT_ESPRESSO_VERSION')) {
+	exit('No direct script access allowed');
 }
 
 /**
@@ -49,7 +49,7 @@ 
 
 
 	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;
 	}
 
 
@@ -57,7 +57,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;
 	}
 
@@ -66,8 +66,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;
 	}
 
 	/**
@@ -79,14 +79,14 @@ 
 	 * @param boolean      $use_ee_prefix whether to use the EE prefix on the header, or fallback to
 	 *                                    the standard WP one
 	 */
-	protected function _set_response_header( $header_key, $value, $use_ee_prefix = true ) {
-		if( is_array( $value ) ) {
-			foreach( $value as $value_key => $value_value ) {
-				$this->_set_response_header(  $header_key . '[' . $value_key . ']', $value_value );
+	protected function _set_response_header($header_key, $value, $use_ee_prefix = true) {
+		if (is_array($value)) {
+			foreach ($value as $value_key => $value_value) {
+				$this->_set_response_header($header_key.'['.$value_key.']', $value_value);
 			}
 		} else {
 			$prefix = $use_ee_prefix ? Base::header_prefix_for_ee : Base::header_prefix_for_wp;
-			$this->_response_headers[ $prefix . $header_key  ] = $value;
+			$this->_response_headers[$prefix.$header_key] = $value;
 		}
 	}
 
@@ -95,7 +95,7 @@ 
 	 * @return array
 	 */
 	protected function _get_response_headers() {
-		return apply_filters( 'FHEE__EventEspresso\core\libraries\rest_api\controllers\Base___get_response_headers',
+		return apply_filters('FHEE__EventEspresso\core\libraries\rest_api\controllers\Base___get_response_headers',
 			$this->_response_headers,
 			$this,
 			$this->_requested_version
@@ -107,13 +107,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;
@@ -131,27 +131,27 @@ 
 	 * @param array|\WP_Error|\Exception $response
 	 * @return \WP_REST_Response
 	 */
-	public function send_response( $response ) {
-		if( $response instanceof Rest_Exception ) {
-			$response = new \WP_Error( $response->get_string_code(), $response->getMessage(), $response->get_data() );
+	public function send_response($response) {
+		if ($response instanceof Rest_Exception) {
+			$response = new \WP_Error($response->get_string_code(), $response->getMessage(), $response->get_data());
 		}
-		if( $response instanceof \Exception ) {
+		if ($response instanceof \Exception) {
 			$code = $response->getCode() ? $response->getCode() : 'error_occurred';
-			$response = new \WP_Error( $code, $response->getMessage() );
+			$response = new \WP_Error($code, $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(
@@ -160,7 +160,7 @@ 
 			$this->_get_headers_from_ee_notices()
 		);
 
-		$rest_response->set_headers( $headers );
+		$rest_response->set_headers($headers);
 		return $rest_response;
 	}
 
@@ -171,31 +171,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);
 	}
 
 	/**
@@ -205,12 +205,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(
@@ -228,14 +228,14 @@ 
 	 * @param string $route
 	 * @return string
 	 */
-	public function get_requested_version( $route = null ) {
+	public function get_requested_version($route = null) {
 		$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();
 		}
@@ -260,23 +260,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/calculations/Base.php

Spacing +7 added lines, -7 removed lines

@@ -13,19 +13,19 @@ 
  * @since		 	   $VID:$
  *
  */
-if( !defined( 'EVENT_ESPRESSO_VERSION' ) ) {
-	exit( 'No direct script access allowed' );
+if ( ! defined('EVENT_ESPRESSO_VERSION')) {
+	exit('No direct script access allowed');
 }
 
 class Base {
-	protected static function _verify_current_user_can( $required_permission, $attempted_calculation ) {
-		if( ! current_user_can( $required_permission ) ) {
+	protected static function _verify_current_user_can($required_permission, $attempted_calculation) {
+		if ( ! current_user_can($required_permission)) {
 			throw new Rest_Exception(
 				'permission_denied',
 				sprintf( 
-					__( 'Permission denied, you cannot calculate %1$s on %2$s because you do not have the capability "%3$s"', 'event_espresso' ),
+					__('Permission denied, you cannot calculate %1$s on %2$s because you do not have the capability "%3$s"', 'event_espresso'),
 					$attempted_calculation,
-					\EEH_Inflector::pluralize_and_lower( self::get_resource_name() ),
+					\EEH_Inflector::pluralize_and_lower(self::get_resource_name()),
 					$required_permission
 				)
 			);
@@ -38,6 +38,6 @@ 
 	 */
 	public static function get_resource_name() {
 		$classname = get_called_class();
-		return substr( $classname, strrpos( $classname, '\\' ) + 1 );
+		return substr($classname, strrpos($classname, '\\') + 1);
 	}
 }

core/libraries/rest_api/Calculated_Model_Fields.php

Spacing +15 added lines, -15 removed lines

@@ -15,8 +15,8 @@ 
  * @since		 	   4.8.35.rc.001
  *
  */
-if( !defined( 'EVENT_ESPRESSO_VERSION' ) ) {
-	exit( 'No direct script access allowed' );
+if ( ! defined('EVENT_ESPRESSO_VERSION')) {
+	exit('No direct script access allowed');
 }
 
 class Calculated_Model_Fields {
@@ -38,8 +38,8 @@ 
 	 * the WP_Request object,
 	 * the controller object
 	 */
-	public function mapping( $refresh = false ) {
-		if( ! $this->_mapping || $refresh ) {
+	public function mapping($refresh = false) {
+		if ( ! $this->_mapping || $refresh) {
 			$this->_mapping = $this->_generate_new_mapping();
 		}
 		return $this->_mapping;
@@ -52,8 +52,8 @@ 
 	 */
 	protected function _generate_new_mapping() {
 		$rest_api_calculations_namespace = 'EventEspresso\core\libraries\rest_api\calculations\\';
-		$event_calculations_class = $rest_api_calculations_namespace . 'Event';
-		$datetime_calculations_class = $rest_api_calculations_namespace . 'Datetime';
+		$event_calculations_class = $rest_api_calculations_namespace.'Event';
+		$datetime_calculations_class = $rest_api_calculations_namespace.'Datetime';
 		return apply_filters(
 			'FHEE__EventEspresso\core\libraries\rest_api\Calculated_Model_Fields__mapping',
 			array(
@@ -81,10 +81,10 @@ 
 	 * @param \EEM_Base $model
 	 * @return array allowable values for this field
 	 */
-	public function retrieve_calculated_fields_for_model( \EEM_Base $model ) {
+	public function retrieve_calculated_fields_for_model(\EEM_Base $model) {
 		$mapping = $this->mapping();
-		if( isset( $mapping[ $model->get_this_model_name() ] ) ) {
-			return array_keys( $mapping[ $model->get_this_model_name() ] );
+		if (isset($mapping[$model->get_this_model_name()])) {
+			return array_keys($mapping[$model->get_this_model_name()]);
 		} else {
 			return array();
 		}
@@ -103,17 +103,17 @@ 
 	 * @return mixed|null
 	 * @throws \EE_Error
 	 */
-	public function retrieve_calculated_field_value( \EEM_Base $model, $field_name, $wpdb_row, $rest_request, Base $controller ) {
+	public function retrieve_calculated_field_value(\EEM_Base $model, $field_name, $wpdb_row, $rest_request, Base $controller) {
 		$mapping = $this->mapping();
-		if( isset( $mapping[ $model->get_this_model_name() ] )
-			&& isset( $mapping[ $model->get_this_model_name() ][ $field_name ] ) ) {
-			$classname = $mapping[ $model->get_this_model_name() ][ $field_name ];
-			return call_user_func( array( $classname, $field_name ), $wpdb_row, $rest_request, $controller );
+		if (isset($mapping[$model->get_this_model_name()])
+			&& isset($mapping[$model->get_this_model_name()][$field_name])) {
+			$classname = $mapping[$model->get_this_model_name()][$field_name];
+			return call_user_func(array($classname, $field_name), $wpdb_row, $rest_request, $controller);
 		}
 		throw new Rest_Exception( 
 			'calculated_field_does_not_exist',
 			sprintf( 
-				__( 'There is no calculated field %1$s on resource %2$s', 'event_espresso' ), 
+				__('There is no calculated field %1$s on resource %2$s', 'event_espresso'), 
 				$field_name, 
 				$model->get_this_model_name() 
 			) 

core/libraries/rest_api/Rest_Exception.php

Spacing +3 added lines, -3 removed lines

@@ -13,8 +13,8 @@ 
  * @since		 	   $VID:$
  *
  */
-if( !defined( 'EVENT_ESPRESSO_VERSION' ) ) {
-	exit( 'No direct script access allowed' );
+if ( ! defined('EVENT_ESPRESSO_VERSION')) {
+	exit('No direct script access allowed');
 }
 
 class Rest_Exception extends \EE_Error {
@@ -24,7 +24,7 @@ 
 	 */
 	protected $_wp_error_data = array();
 	protected $_wp_error_code = '';
-	public function __construct( $string_code, $message, $wp_error_data = array(), $previous = null ) {
+	public function __construct($string_code, $message, $wp_error_data = array(), $previous = null) {
 		parent::__construct( 
 			$message,
 			500,

Indentation +12 added lines, -12 removed lines

@@ -1,18 +1,18 @@
 <?php
 namespace EventEspresso\core\libraries\rest_api\helpers;
 /**
- *
- * Class Exception
- *
- * similar to EE's EE_Error, except has space to hold the "data" we
- * want to eventually pass to WP_Error
- *
- * @package         Event Espresso
- * @subpackage    
- * @author				Mike Nelson
- * @since		 	   $VID:$
- *
- */
+	 *
+	 * Class Exception
+	 *
+	 * similar to EE's EE_Error, except has space to hold the "data" we
+	 * want to eventually pass to WP_Error
+	 *
+	 * @package         Event Espresso
+	 * @subpackage    
+	 * @author				Mike Nelson
+	 * @since		 	   $VID:$
+	 *
+	 */
 if( !defined( 'EVENT_ESPRESSO_VERSION' ) ) {
 	exit( 'No direct script access allowed' );
 }

core/EE_Bootstrap.core.php

Spacing +19 added lines, -19 removed lines

@@ -42,13 +42,13 @@ 
 
 	public function __construct() {
 		// construct request stack and run middleware apps as soon as all WP plugins are loaded
-		add_action( 'plugins_loaded', array( $this, 'run_request_stack' ), 0 );
+		add_action('plugins_loaded', array($this, 'run_request_stack'), 0);
 		// set framework for the rest of EE to hook into when loading
-		add_action( 'plugins_loaded', array( 'EE_Bootstrap', 'load_espresso_addons' ), 1 );
-		add_action( 'plugins_loaded', array( 'EE_Bootstrap', 'detect_activations_or_upgrades' ), 3 );
-		add_action( 'plugins_loaded', array( 'EE_Bootstrap', 'load_core_configuration' ), 5 );
-		add_action( 'plugins_loaded', array( 'EE_Bootstrap', 'register_shortcodes_modules_and_widgets' ), 7 );
-		add_action( 'plugins_loaded', array( 'EE_Bootstrap', 'brew_espresso' ), 9 );
+		add_action('plugins_loaded', array('EE_Bootstrap', 'load_espresso_addons'), 1);
+		add_action('plugins_loaded', array('EE_Bootstrap', 'detect_activations_or_upgrades'), 3);
+		add_action('plugins_loaded', array('EE_Bootstrap', 'load_core_configuration'), 5);
+		add_action('plugins_loaded', array('EE_Bootstrap', 'register_shortcodes_modules_and_widgets'), 7);
+		add_action('plugins_loaded', array('EE_Bootstrap', 'brew_espresso'), 9);
 	}
 
 
@@ -65,7 +65,7 @@ 
 			new EE_Load_Espresso_Core()
 		);
 		$this->_request_stack->handle_request(
-			new EE_Request( $_GET, $_POST, $_COOKIE ),
+			new EE_Request($_GET, $_POST, $_COOKIE),
 			new EE_Response()
 		);
 		$this->_request_stack->handle_response();
@@ -78,7 +78,7 @@ 
 	 */
 	protected function load_autoloader() {
 		// load interfaces
-		espresso_load_required( 'EEH_Autoloader', EE_CORE . 'helpers' . DS . 'EEH_Autoloader.helper.php' );
+		espresso_load_required('EEH_Autoloader', EE_CORE.'helpers'.DS.'EEH_Autoloader.helper.php');
 		EEH_Autoloader::instance();
 	}
 
@@ -89,13 +89,13 @@ 
 	 */
 	protected function set_autoloaders_for_required_files() {
 		// load interfaces
-		espresso_load_required( 'EEI_Interfaces', EE_CORE . 'interfaces' . DS . 'EEI_Interfaces.php' );
+		espresso_load_required('EEI_Interfaces', EE_CORE.'interfaces'.DS.'EEI_Interfaces.php');
 		// load helpers
-		EEH_Autoloader::register_autoloaders_for_each_file_in_folder( EE_HELPERS );
+		EEH_Autoloader::register_autoloaders_for_each_file_in_folder(EE_HELPERS);
 		// load request stack
-		EEH_Autoloader::register_autoloaders_for_each_file_in_folder( EE_CORE . 'request_stack' . DS );
+		EEH_Autoloader::register_autoloaders_for_each_file_in_folder(EE_CORE.'request_stack'.DS);
 		// load middleware
-		EEH_Autoloader::register_autoloaders_for_each_file_in_folder( EE_CORE . 'middleware' . DS );
+		EEH_Autoloader::register_autoloaders_for_each_file_in_folder(EE_CORE.'middleware'.DS);
 	}
 
 
@@ -118,9 +118,9 @@ 
 			)
 		);
 		// load middleware onto stack : FILO (First In Last Out)
-		foreach ( (array)$stack_apps as $stack_app ) {
+		foreach ((array) $stack_apps as $stack_app) {
 			//$request_stack_builder->push( $stack_app );
-			$request_stack_builder->unshift( $stack_app );
+			$request_stack_builder->unshift($stack_app);
 		}
 		return apply_filters(
 			'FHEE__EE_Bootstrap__build_request_stack__request_stack_builder',
@@ -137,7 +137,7 @@ 
 	 * no other logic should be performed at this point
 	 */
 	public static function load_espresso_addons() {
-		do_action( 'AHEE__EE_Bootstrap__load_espresso_addons' );
+		do_action('AHEE__EE_Bootstrap__load_espresso_addons');
 	}
 
 
@@ -149,7 +149,7 @@ 
 	 * we can determine if anything needs activating or upgrading
 	 */
 	public static function detect_activations_or_upgrades() {
-		do_action( 'AHEE__EE_Bootstrap__detect_activations_or_upgrades' );
+		do_action('AHEE__EE_Bootstrap__detect_activations_or_upgrades');
 	}
 
 
@@ -161,7 +161,7 @@ 
 	 * we can load and set all of the system configurations
 	 */
 	public static function load_core_configuration() {
-		do_action( 'AHEE__EE_Bootstrap__load_core_configuration' );
+		do_action('AHEE__EE_Bootstrap__load_core_configuration');
 	}
 
 
@@ -173,7 +173,7 @@ 
 	 * so that they are ready to be used throughout the system
 	 */
 	public static function register_shortcodes_modules_and_widgets() {
-		do_action( 'AHEE__EE_Bootstrap__register_shortcodes_modules_and_widgets' );
+		do_action('AHEE__EE_Bootstrap__register_shortcodes_modules_and_widgets');
 	}
 
 
@@ -185,7 +185,7 @@ 
 	 * so let the fun begin...
 	 */
 	public static function brew_espresso() {
-		do_action( 'AHEE__EE_Bootstrap__brew_espresso' );
+		do_action('AHEE__EE_Bootstrap__brew_espresso');
 	}
 
 

core/request_stack/EE_Request.core.php

Spacing +15 added lines, -15 removed lines

@@ -60,15 +60,15 @@ 
 	 * @param array $post
 	 * @param array $cookie
 	 */
-	public function __construct( $get, $post, $cookie ) {
+	public function __construct($get, $post, $cookie) {
 		// grab request vars
 		$this->_get    = $get;
 		$this->_post   = $post;
 		$this->_cookie = $cookie;
-		$this->_params = array_merge( $get, $post );
+		$this->_params = array_merge($get, $post);
 		// AJAX ???
-		$this->ajax       = defined( 'DOING_AJAX' ) ? true : false;
-		$this->front_ajax = $this->is_set( 'ee_front_ajax' ) && $this->get( 'ee_front_ajax' ) == 1 ? true : false;
+		$this->ajax       = defined('DOING_AJAX') ? true : false;
+		$this->front_ajax = $this->is_set('ee_front_ajax') && $this->get('ee_front_ajax') == 1 ? true : false;
 	}
 
 
@@ -119,10 +119,10 @@ 
 	 * @param bool $override_ee
 	 * @return    void
 	 */
-	public function set( $key, $value, $override_ee = FALSE ) {
+	public function set($key, $value, $override_ee = FALSE) {
 		// don't allow "ee" to be overwritten unless explicitly instructed to do so
-		if ( $key != 'ee' || ( $key == 'ee' && empty( $this->_params['ee'] )) || ( $key == 'ee' && ! empty( $this->_params['ee'] ) && $override_ee )) {
-			$this->_params[ $key ] = $value;
+		if ($key != 'ee' || ($key == 'ee' && empty($this->_params['ee'])) || ($key == 'ee' && ! empty($this->_params['ee']) && $override_ee)) {
+			$this->_params[$key] = $value;
 		}
 	}
 
@@ -136,8 +136,8 @@ 
 	 * @param null $default
 	 * @return    mixed
 	 */
-	public function get( $key, $default = NULL ) {
-		return isset( $this->_params[ $key ] ) ? $this->_params[ $key ] : $default;
+	public function get($key, $default = NULL) {
+		return isset($this->_params[$key]) ? $this->_params[$key] : $default;
 	}
 
 
@@ -149,8 +149,8 @@ 
 	 * @param $key
 	 * @return    boolean
 	 */
-	public function is_set( $key ) {
-		return isset( $this->_params[ $key ] ) ? TRUE : FALSE;
+	public function is_set($key) {
+		return isset($this->_params[$key]) ? TRUE : FALSE;
 	}
 
 
@@ -162,10 +162,10 @@ 
 	 * @param $key
 	 * @param bool $unset_from_global_too
 	 */
-	public function un_set( $key, $unset_from_global_too = false ) {
-		unset( $this->_params[ $key ] );
-		if ( $unset_from_global_too ) {
-			unset( $_REQUEST[ $key ] );
+	public function un_set($key, $unset_from_global_too = false) {
+		unset($this->_params[$key]);
+		if ($unset_from_global_too) {
+			unset($_REQUEST[$key]);
 		}
 	}
 

core/EE_Request_Handler.core.php

Spacing +78 added lines, -78 removed lines

@@ -65,14 +65,14 @@ 
 	 * @param WP $wp
 	 * @return \EE_Request_Handler
 	 */
-	public function __construct( $wp = null ) {
+	public function __construct($wp = null) {
 		// grab request vars
 		// NOTE: WHEN MERGING TO 4.9 PLZ FAVOUR THE CHANGES IN 4.9 OVER THE FOLLOWING LINE
-		$this->_params = array_merge( $_GET, $_POST );
+		$this->_params = array_merge($_GET, $_POST);
 		// AJAX ???
-		$this->ajax = defined( 'DOING_AJAX' ) ? true : false;
-		$this->front_ajax = $this->is_set( 'ee_front_ajax' ) && $this->get( 'ee_front_ajax' ) == 1 ? true : false;
-		do_action( 'AHEE__EE_Request_Handler__construct__complete' );
+		$this->ajax = defined('DOING_AJAX') ? true : false;
+		$this->front_ajax = $this->is_set('ee_front_ajax') && $this->get('ee_front_ajax') == 1 ? true : false;
+		do_action('AHEE__EE_Request_Handler__construct__complete');
 	}
 
 
@@ -84,12 +84,12 @@ 
 	 * @param WP $wp
 	 * @return void
 	 */
-	public function parse_request( $wp = null ) {
+	public function parse_request($wp = null) {
 		//if somebody forgot to provide us with WP, that's ok because its global
-		if ( ! $wp instanceof WP ) {
+		if ( ! $wp instanceof WP) {
 			global $wp;
 		}
-		$this->set_request_vars( $wp );
+		$this->set_request_vars($wp);
 	}
 
 
@@ -101,14 +101,14 @@ 
 	 * @param WP $wp
 	 * @return void
 	 */
-	public function set_request_vars( $wp = null ) {
-		if ( ! is_admin() ) {
+	public function set_request_vars($wp = null) {
+		if ( ! is_admin()) {
 			// set request post_id
-			$this->set( 'post_id', $this->get_post_id_from_request( $wp ));
+			$this->set('post_id', $this->get_post_id_from_request($wp));
 			// set request post name
-			$this->set( 'post_name', $this->get_post_name_from_request( $wp ));
+			$this->set('post_name', $this->get_post_name_from_request($wp));
 			// set request post_type
-			$this->set( 'post_type', $this->get_post_type_from_request( $wp ));
+			$this->set('post_type', $this->get_post_type_from_request($wp));
 			// true or false ? is this page being used by EE ?
 			$this->set_espresso_page();
 		}
@@ -123,20 +123,20 @@ 
 	 * @param WP $wp
 	 * @return int
 	 */
-	public function get_post_id_from_request( $wp = null ) {
-		if ( ! $wp instanceof WP ){
+	public function get_post_id_from_request($wp = null) {
+		if ( ! $wp instanceof WP) {
 			global $wp;
 		}
 		$post_id = null;
-		if ( isset( $wp->query_vars['p'] )) {
+		if (isset($wp->query_vars['p'])) {
 			$post_id = $wp->query_vars['p'];
 		}
-		if ( ! $post_id && isset( $wp->query_vars['page_id'] )) {
+		if ( ! $post_id && isset($wp->query_vars['page_id'])) {
 			$post_id = $wp->query_vars['page_id'];
 		}
-		if ( ! $post_id && isset( $wp->request )) {
-			if ( is_numeric( basename( $wp->request ))) {
-				$post_id = basename( $wp->request );
+		if ( ! $post_id && isset($wp->request)) {
+			if (is_numeric(basename($wp->request))) {
+				$post_id = basename($wp->request);
 			}
 		}
 		return $post_id;
@@ -151,35 +151,35 @@ 
 	 * @param WP $wp
 	 * @return string
 	 */
-	public function get_post_name_from_request( $wp = null ) {
-		if ( ! $wp instanceof WP ){
+	public function get_post_name_from_request($wp = null) {
+		if ( ! $wp instanceof WP) {
 			global $wp;
 		}
 		$post_name = null;
-		if ( isset( $wp->query_vars['name'] ) && ! empty( $wp->query_vars['name'] )) {
+		if (isset($wp->query_vars['name']) && ! empty($wp->query_vars['name'])) {
 			$post_name = $wp->query_vars['name'];
 		}
-		if ( ! $post_name && isset( $wp->query_vars['pagename'] ) && ! empty( $wp->query_vars['pagename'] )) {
+		if ( ! $post_name && isset($wp->query_vars['pagename']) && ! empty($wp->query_vars['pagename'])) {
 			$post_name = $wp->query_vars['pagename'];
 		}
-		if ( ! $post_name && isset( $wp->request ) && ! empty( $wp->request )) {
-			$possible_post_name = basename( $wp->request );
-			if ( ! is_numeric( $possible_post_name )) {
+		if ( ! $post_name && isset($wp->request) && ! empty($wp->request)) {
+			$possible_post_name = basename($wp->request);
+			if ( ! is_numeric($possible_post_name)) {
 				/** @type WPDB $wpdb */
 				global $wpdb;
 				$SQL = "SELECT ID from $wpdb->posts WHERE post_status='publish' AND post_name=%s";
-				$possible_post_name = $wpdb->get_var( $wpdb->prepare( $SQL, $possible_post_name ));
-				if ( $possible_post_name ) {
+				$possible_post_name = $wpdb->get_var($wpdb->prepare($SQL, $possible_post_name));
+				if ($possible_post_name) {
 					$post_name = $possible_post_name;
 				}
 			}
 		}
-		if ( ! $post_name && $this->get( 'post_id' )) {
+		if ( ! $post_name && $this->get('post_id')) {
 			/** @type WPDB $wpdb */
 			global $wpdb;
 			$SQL = "SELECT post_name from $wpdb->posts WHERE post_status='publish' AND ID=%d";
-			$possible_post_name = $wpdb->get_var( $wpdb->prepare( $SQL, $this->get( 'post_id' )));
-			if( $possible_post_name ) {
+			$possible_post_name = $wpdb->get_var($wpdb->prepare($SQL, $this->get('post_id')));
+			if ($possible_post_name) {
 				$post_name = $possible_post_name;
 			}
 		}
@@ -195,11 +195,11 @@ 
 	 * @param WP $wp
 	 * @return mixed
 	 */
-	public function get_post_type_from_request( $wp = null ) {
-		if ( ! $wp instanceof WP ){
+	public function get_post_type_from_request($wp = null) {
+		if ( ! $wp instanceof WP) {
 			global $wp;
 		}
-		return isset( $wp->query_vars['post_type'] ) ? $wp->query_vars['post_type'] : null;
+		return isset($wp->query_vars['post_type']) ? $wp->query_vars['post_type'] : null;
 	}
 
 
@@ -209,18 +209,18 @@ 
 	 * @param  WP $wp
 	 * @return bool|string|void
 	 */
-	public function get_current_page_permalink( $wp = null ) {
-		$post_id = $this->get_post_id_from_request( $wp );
-		if ( $post_id ) {
-			$current_page_permalink = get_permalink( $post_id );
+	public function get_current_page_permalink($wp = null) {
+		$post_id = $this->get_post_id_from_request($wp);
+		if ($post_id) {
+			$current_page_permalink = get_permalink($post_id);
 		} else {
-			if ( ! $wp instanceof WP ) {
+			if ( ! $wp instanceof WP) {
 				global $wp;
 			}
-			if ( $wp->request ) {
-				$current_page_permalink = site_url( $wp->request );
+			if ($wp->request) {
+				$current_page_permalink = site_url($wp->request);
 			} else {
-				$current_page_permalink = esc_url( site_url( $_SERVER[ 'REQUEST_URI' ] ) );
+				$current_page_permalink = esc_url(site_url($_SERVER['REQUEST_URI']));
 			}
 		}
 		return $current_page_permalink;
@@ -237,41 +237,41 @@ 
 	public function test_for_espresso_page() {
 		global $wp;
 		/** @type EE_CPT_Strategy $EE_CPT_Strategy */
-		$EE_CPT_Strategy = EE_Registry::instance()->load_core( 'CPT_Strategy' );
+		$EE_CPT_Strategy = EE_Registry::instance()->load_core('CPT_Strategy');
 		$espresso_CPT_taxonomies = $EE_CPT_Strategy->get_CPT_taxonomies();
-		if ( is_array( $espresso_CPT_taxonomies ) ) {
-			foreach ( $espresso_CPT_taxonomies as $espresso_CPT_taxonomy =>$details ) {
-				if ( isset( $wp->query_vars, $wp->query_vars[ $espresso_CPT_taxonomy ] ) ) {
+		if (is_array($espresso_CPT_taxonomies)) {
+			foreach ($espresso_CPT_taxonomies as $espresso_CPT_taxonomy =>$details) {
+				if (isset($wp->query_vars, $wp->query_vars[$espresso_CPT_taxonomy])) {
 					return true;
 				}
 			}
 		}
 		// load espresso CPT endpoints
 		$espresso_CPT_endpoints = $EE_CPT_Strategy->get_CPT_endpoints();
-		$post_type_CPT_endpoints = array_flip( $espresso_CPT_endpoints );
-		$post_types = (array)$this->get( 'post_type' );
-		foreach ( $post_types as $post_type ) {
+		$post_type_CPT_endpoints = array_flip($espresso_CPT_endpoints);
+		$post_types = (array) $this->get('post_type');
+		foreach ($post_types as $post_type) {
 			// was a post name passed ?
-			if ( isset( $post_type_CPT_endpoints[ $post_type ] ) ) {
+			if (isset($post_type_CPT_endpoints[$post_type])) {
 				// kk we know this is an espresso page, but is it a specific post ?
-				if ( ! $this->get( 'post_name' ) ) {
+				if ( ! $this->get('post_name')) {
 					// there's no specific post name set, so maybe it's one of our endpoints like www.domain.com/events
-					$post_name = isset( $post_type_CPT_endpoints[ $this->get( 'post_type' ) ] ) ? $post_type_CPT_endpoints[ $this->get( 'post_type' ) ] : null;
+					$post_name = isset($post_type_CPT_endpoints[$this->get('post_type')]) ? $post_type_CPT_endpoints[$this->get('post_type')] : null;
 					// if the post type matches on of our then set the endpoint
-					if ( $post_name ) {
-						$this->set( 'post_name', $post_name );
+					if ($post_name) {
+						$this->set('post_name', $post_name);
 					}
 				}
 				return true;
 			}
 		}
-		if ( $this->get( 'post_name' )) {
+		if ($this->get('post_name')) {
 			// load all pages using espresso shortcodes
-			$post_shortcodes = isset( EE_Registry::instance()->CFG->core->post_shortcodes ) ? EE_Registry::instance()->CFG->core->post_shortcodes : array();
+			$post_shortcodes = isset(EE_Registry::instance()->CFG->core->post_shortcodes) ? EE_Registry::instance()->CFG->core->post_shortcodes : array();
 			// make sure core pages are included
-			$espresso_pages = array_merge( $espresso_CPT_endpoints, $post_shortcodes );
+			$espresso_pages = array_merge($espresso_CPT_endpoints, $post_shortcodes);
 			// was a post name passed ?
-			if (  isset( $espresso_pages[ $this->get( 'post_name' ) ] )) {
+			if (isset($espresso_pages[$this->get('post_name')])) {
 				 return true;
 			}
 		}
@@ -287,7 +287,7 @@ 
 	 * @param null $value
 	 * @return    mixed
 	 */
-	public function set_espresso_page( $value = null ) {
+	public function set_espresso_page($value = null) {
 		$value = $value ? $value : $this->test_for_espresso_page();
 		$this->_params['is_espresso_page'] = $value;
 	}
@@ -301,7 +301,7 @@ 
 	 *  @return 	mixed
 	 */
 	public function is_espresso_page() {
-		return isset( $this->_params['is_espresso_page'] ) ? $this->_params['is_espresso_page'] : false;
+		return isset($this->_params['is_espresso_page']) ? $this->_params['is_espresso_page'] : false;
 	}
 
 
@@ -325,10 +325,10 @@ 
 	 * @param bool $override_ee
 	 * @return    void
 	 */
-	public function set( $key, $value, $override_ee = false ) {
+	public function set($key, $value, $override_ee = false) {
 		// don't allow "ee" to be overwritten unless explicitly instructed to do so
-		if ( $key != 'ee' || ( $key == 'ee' && empty( $this->_params['ee'] )) || ( $key == 'ee' && ! empty( $this->_params['ee'] ) && $override_ee )) {
-			$this->_params[ $key ] = $value;
+		if ($key != 'ee' || ($key == 'ee' && empty($this->_params['ee'])) || ($key == 'ee' && ! empty($this->_params['ee']) && $override_ee)) {
+			$this->_params[$key] = $value;
 		}
 	}
 
@@ -342,8 +342,8 @@ 
 	 * @param null $default
 	 * @return    mixed
 	 */
-	public function get( $key, $default = null ) {
-		return isset( $this->_params[ $key ] ) ? $this->_params[ $key ] : $default;
+	public function get($key, $default = null) {
+		return isset($this->_params[$key]) ? $this->_params[$key] : $default;
 	}
 
 
@@ -355,8 +355,8 @@ 
 	 * @param $key
 	 * @return    boolean
 	 */
-	public function is_set( $key ) {
-		return isset( $this->_params[ $key ] ) ? true : false;
+	public function is_set($key) {
+		return isset($this->_params[$key]) ? true : false;
 	}
 
 
@@ -368,8 +368,8 @@ 
 	 * @param $key
 	 * @return    void
 	 */
-	public function un_set( $key ) {
-		unset( $this->_params[ $key ] );
+	public function un_set($key) {
+		unset($this->_params[$key]);
 	}
 
 
@@ -382,8 +382,8 @@ 
 	 * @param $value
 	 * @return    void
 	 */
-	public function set_notice( $key, $value ) {
-		$this->_notice[ $key ] = $value;
+	public function set_notice($key, $value) {
+		$this->_notice[$key] = $value;
 	}
 
 
@@ -395,8 +395,8 @@ 
 	 * @param $key
 	 * @return    mixed
 	 */
-	public function get_notice( $key ) {
-		return isset( $this->_notice[ $key ] ) ? $this->_notice[ $key ] : null;
+	public function get_notice($key) {
+		return isset($this->_notice[$key]) ? $this->_notice[$key] : null;
 	}
 
 
@@ -408,7 +408,7 @@ 
 	 * @param $string
 	 * @return    void
 	 */
-	public function add_output( $string ) {
+	public function add_output($string) {
 		$this->_output .= $string;
 	}
 
@@ -430,8 +430,8 @@ 
 	 * @param $item
 	 * @param $key
 	 */
-	function sanitize_text_field_for_array_walk( &$item, &$key ) {
-		$item = strpos( $item, 'email' ) !== false ? sanitize_email( $item ) : sanitize_text_field( $item );
+	function sanitize_text_field_for_array_walk(&$item, &$key) {
+		$item = strpos($item, 'email') !== false ? sanitize_email($item) : sanitize_text_field($item);
 	}
 
 
@@ -441,7 +441,7 @@ 
 	 * @param $b
 	 * @return bool
 	 */
-	public function __set($a,$b) { return false; }
+	public function __set($a, $b) { return false; }