eventespresso / event-espresso-core

core/db_models/EEM_Term_Relationship.model.php

Spacing +45 added lines, -45 removed lines

@@ -1,7 +1,7 @@ 
-<?php if ( ! defined( 'EVENT_ESPRESSO_VERSION' ) ) {
-	exit( 'No direct script access allowed' );
+<?php if ( ! defined('EVENT_ESPRESSO_VERSION')) {
+	exit('No direct script access allowed');
 }
-require_once( EE_MODELS . 'EEM_Base.model.php' );
+require_once(EE_MODELS.'EEM_Base.model.php');
 
 
 
@@ -24,18 +24,18 @@ 
 	 *
 	 * @param string $timezone
 	 */
-	protected function __construct( $timezone = null ) {
-		$this->singular_item = __( 'Term Relationship', 'event_espresso' );
-		$this->plural_item = __( 'Term Relationships', 'event_espresso' );
+	protected function __construct($timezone = null) {
+		$this->singular_item = __('Term Relationship', 'event_espresso');
+		$this->plural_item = __('Term Relationships', 'event_espresso');
 		$this->_tables = array(
-			'Term_Relationship' => new EE_Primary_Table( 'term_relationships' ),
+			'Term_Relationship' => new EE_Primary_Table('term_relationships'),
 		);
-		$models_this_can_attach_to = array_keys( EE_Registry::instance()->cpt_models() );
+		$models_this_can_attach_to = array_keys(EE_Registry::instance()->cpt_models());
 		$this->_fields = array(
 			'Term_Relationship' => array(
 				'object_id'        => new EE_Foreign_Key_Int_Field(
 					'object_id',
-					__( 'Object(Post) ID', 'event_espresso' ),
+					__('Object(Post) ID', 'event_espresso'),
 					false,
 					0,
 					$models_this_can_attach_to
@@ -51,63 +51,63 @@ 
 					'Term_Taxonomy'
 				),
 				'term_order'       => new EE_Integer_Field(
-					'term_order', __( 'Term Order', 'event_espresso' ), false, 0
+					'term_order', __('Term Order', 'event_espresso'), false, 0
 				),
 			),
 		);
 		$this->_model_relations = array(
 			'Term_Taxonomy' => new EE_Belongs_To_Relation(),
 		);
-		foreach ( $models_this_can_attach_to as $model_name ) {
-			$this->_model_relations[ $model_name ] = new EE_Belongs_To_Relation();
+		foreach ($models_this_can_attach_to as $model_name) {
+			$this->_model_relations[$model_name] = new EE_Belongs_To_Relation();
 		}
 		$this->_indexes = array(
-			'PRIMARY' => new EE_Primary_Key_Index( array( 'object_id', 'term_taxonomy_id' ) ),
+			'PRIMARY' => new EE_Primary_Key_Index(array('object_id', 'term_taxonomy_id')),
 		);
 		$path_to_event_model = 'Event.';
-		$this->_cap_restriction_generators[ EEM_Base::caps_read ] = new EE_Restriction_Generator_Event_Related_Public(
+		$this->_cap_restriction_generators[EEM_Base::caps_read] = new EE_Restriction_Generator_Event_Related_Public(
 			$path_to_event_model
 		);
-		$this->_cap_restriction_generators[ EEM_Base::caps_read_admin ] = new EE_Restriction_Generator_Event_Related_Protected(
+		$this->_cap_restriction_generators[EEM_Base::caps_read_admin] = new EE_Restriction_Generator_Event_Related_Protected(
 			$path_to_event_model
 		);
-		$this->_cap_restriction_generators[ EEM_Base::caps_edit ] = new EE_Restriction_Generator_Event_Related_Protected(
+		$this->_cap_restriction_generators[EEM_Base::caps_edit] = new EE_Restriction_Generator_Event_Related_Protected(
 			$path_to_event_model
 		);
-		$this->_cap_restriction_generators[ EEM_Base::caps_delete ] = new EE_Restriction_Generator_Event_Related_Protected(
+		$this->_cap_restriction_generators[EEM_Base::caps_delete] = new EE_Restriction_Generator_Event_Related_Protected(
 			$path_to_event_model, EEM_Base::caps_edit
 		);
 		$path_to_tax_model = 'Term_Taxonomy.';
 		//add cap restrictions for editing term relations to the "ee_assign_*"
 		//and for deleting term relations too
-		$cap_contexts_affected = array( EEM_Base::caps_edit, EEM_Base::caps_delete );
-		foreach ( $cap_contexts_affected as $cap_context_affected ) {
-			$this->_cap_restrictions[ $cap_context_affected ]['ee_assign_event_category'] = new EE_Default_Where_Conditions(
+		$cap_contexts_affected = array(EEM_Base::caps_edit, EEM_Base::caps_delete);
+		foreach ($cap_contexts_affected as $cap_context_affected) {
+			$this->_cap_restrictions[$cap_context_affected]['ee_assign_event_category'] = new EE_Default_Where_Conditions(
 				array(
-					$path_to_tax_model . 'taxonomy*ee_assign_event_category' => array(
+					$path_to_tax_model.'taxonomy*ee_assign_event_category' => array(
 						'!=',
 						'espresso_event_categories',
 					),
 				)
 			);
-			$this->_cap_restrictions[ $cap_context_affected ]['ee_assign_venue_category'] = new EE_Default_Where_Conditions(
+			$this->_cap_restrictions[$cap_context_affected]['ee_assign_venue_category'] = new EE_Default_Where_Conditions(
 				array(
-					$path_to_tax_model . 'taxonomy*ee_assign_venue_category' => array(
+					$path_to_tax_model.'taxonomy*ee_assign_venue_category' => array(
 						'!=',
 						'espresso_venue_categories',
 					),
 				)
 			);
-			$this->_cap_restrictions[ $cap_context_affected ]['ee_assign_event_type'] = new EE_Default_Where_Conditions(
+			$this->_cap_restrictions[$cap_context_affected]['ee_assign_event_type'] = new EE_Default_Where_Conditions(
 				array(
-					$path_to_tax_model . 'taxonomy*ee_assign_event_type' => array( '!=', 'espresso_event_type' ),
+					$path_to_tax_model.'taxonomy*ee_assign_event_type' => array('!=', 'espresso_event_type'),
 				)
 			);
 		}
-		parent::__construct( $timezone );
+		parent::__construct($timezone);
 		add_filter(
 			'FHEE__Read__create_model_query_params',
-			array( 'EEM_Term_Relationship', 'rest_api_query_params' ),
+			array('EEM_Term_Relationship', 'rest_api_query_params'),
 			10,
 			3
 		);
@@ -122,12 +122,12 @@ 
 	 * @global wpdb $wpdb
 	 * @return int the number of rows affected
 	 */
-	public function update_term_taxonomy_counts( $term_taxonomy_id = null ) {
+	public function update_term_taxonomy_counts($term_taxonomy_id = null) {
 		//because this uses a subquery and sometimes assigning to column to be another column's
 		//value, we just write the SQL directly.
 		global $wpdb;
-		if ( $term_taxonomy_id ) {
-			$second_operand = $wpdb->prepare( '%d', $term_taxonomy_id );
+		if ($term_taxonomy_id) {
+			$second_operand = $wpdb->prepare('%d', $term_taxonomy_id);
 		} else {
 			$second_operand = 'tr.term_taxonomy_id';
 		}
@@ -152,10 +152,10 @@ 
 	 * @param array $field_n_values @see EEM_Base::insert
 	 * @return boolean
 	 */
-	public function insert( $field_n_values ) {
-		$return = parent::insert( $field_n_values );
-		if ( isset( $field_n_values['term_taxonomy_id'] ) ) {
-			$this->update_term_taxonomy_counts( $field_n_values['term_taxonomy_id'] );
+	public function insert($field_n_values) {
+		$return = parent::insert($field_n_values);
+		if (isset($field_n_values['term_taxonomy_id'])) {
+			$this->update_term_taxonomy_counts($field_n_values['term_taxonomy_id']);
 		}
 		return $return;
 	}
@@ -175,9 +175,9 @@ 
 	 *                                         could get out-of-sync with the database
 	 * @return int
 	 */
-	public function update( $fields_n_values, $query_params, $keep_model_objs_in_sync = true ) {
-		$count = parent::update( $fields_n_values, $query_params, $keep_model_objs_in_sync );
-		if ( $count ) {
+	public function update($fields_n_values, $query_params, $keep_model_objs_in_sync = true) {
+		$count = parent::update($fields_n_values, $query_params, $keep_model_objs_in_sync);
+		if ($count) {
 			$this->update_term_taxonomy_counts();
 		}
 		return $count;
@@ -193,9 +193,9 @@ 
 	 * @param boolean $allow_blocking
 	 * @return int @see EEM_Base::delete
 	 */
-	public function delete( $query_params, $allow_blocking = true ) {
-		$count = parent::delete( $query_params, $allow_blocking );
-		if ( $count ) {
+	public function delete($query_params, $allow_blocking = true) {
+		$count = parent::delete($query_params, $allow_blocking);
+		if ($count) {
 			$this->update_term_taxonomy_counts();
 		}
 		return $count;
@@ -212,11 +212,11 @@ 
 	 * @param EEM_Base $model
 	 * @return array
 	 */
-	public static function rest_api_query_params( $model_query_params, $querystring_query_params, $model ) {
-		if ( $model === EEM_Term_Relationship::instance() ) {
-			$taxonomies = get_taxonomies( array( 'show_in_rest' => true ) );
-			if ( ! empty( $taxonomies ) ) {
-				$model_query_params[0]['Term_Taxonomy.taxonomy'] = array( 'IN', $taxonomies );
+	public static function rest_api_query_params($model_query_params, $querystring_query_params, $model) {
+		if ($model === EEM_Term_Relationship::instance()) {
+			$taxonomies = get_taxonomies(array('show_in_rest' => true));
+			if ( ! empty($taxonomies)) {
+				$model_query_params[0]['Term_Taxonomy.taxonomy'] = array('IN', $taxonomies);
 			}
 		}
 		return $model_query_params;

core/db_models/EEM_Term.model.php

Spacing +55 added lines, -55 removed lines

@@ -1,7 +1,7 @@ 
-<?php if ( ! defined( 'EVENT_ESPRESSO_VERSION' ) ) {
-	exit( 'No direct script access allowed' );
+<?php if ( ! defined('EVENT_ESPRESSO_VERSION')) {
+	exit('No direct script access allowed');
 }
-require_once( EE_MODELS . 'EEM_Base.model.php' );
+require_once(EE_MODELS.'EEM_Base.model.php');
 
 
 
@@ -25,65 +25,65 @@ 
 	 *
 	 * @param string $timezone
 	 */
-	protected function __construct( $timezone = null ) {
-		$this->singular_item = __( 'Term', 'event_espresso' );
-		$this->plural_item = __( 'Terms', 'event_espresso' );
+	protected function __construct($timezone = null) {
+		$this->singular_item = __('Term', 'event_espresso');
+		$this->plural_item = __('Terms', 'event_espresso');
 		$this->_tables = array(
-			'Term' => new EE_Primary_Table( 'terms', 'term_id' ),
+			'Term' => new EE_Primary_Table('terms', 'term_id'),
 		);
 		$this->_fields = array(
 			'Term' => array(
-				'term_id'    => new EE_Primary_Key_Int_Field( 'term_id', __( 'Term ID', 'event_espresso' ) ),
-				'name'       => new EE_Plain_Text_Field( 'name', __( 'Term Name', 'event_espresso' ), false, '' ),
-				'slug'       => new EE_Slug_Field( 'slug', __( 'Term Slug', 'event_espresso' ), false ),
-				'term_group' => new EE_Integer_Field( 'term_group', __( "Term Group", "event_espresso" ), false, 0 ),
+				'term_id'    => new EE_Primary_Key_Int_Field('term_id', __('Term ID', 'event_espresso')),
+				'name'       => new EE_Plain_Text_Field('name', __('Term Name', 'event_espresso'), false, ''),
+				'slug'       => new EE_Slug_Field('slug', __('Term Slug', 'event_espresso'), false),
+				'term_group' => new EE_Integer_Field('term_group', __("Term Group", "event_espresso"), false, 0),
 			),
 		);
 		$this->_model_relations = array(
 			'Term_Taxonomy' => new EE_Has_Many_Relation(),
 		);
 		$path_to_tax_model = 'Term_Taxonomy';
-		$this->_cap_restriction_generators[ EEM_Base::caps_read ] = new EE_Restriction_Generator_Public();
-		$this->_cap_restriction_generators[ EEM_Base::caps_read_admin ] = new EE_Restriction_Generator_Taxonomy_Protected(
+		$this->_cap_restriction_generators[EEM_Base::caps_read] = new EE_Restriction_Generator_Public();
+		$this->_cap_restriction_generators[EEM_Base::caps_read_admin] = new EE_Restriction_Generator_Taxonomy_Protected(
 			$path_to_tax_model
 		);
-		$this->_cap_restriction_generators[ EEM_Base::caps_edit ] = false;
-		$this->_cap_restriction_generators[ EEM_Base::caps_delete ] = false;
-		$path_to_tax_model = $path_to_tax_model . '.';
+		$this->_cap_restriction_generators[EEM_Base::caps_edit] = false;
+		$this->_cap_restriction_generators[EEM_Base::caps_delete] = false;
+		$path_to_tax_model = $path_to_tax_model.'.';
 		//add cap restrictions for editing relating to the "ee_edit_*"
-		$this->_cap_restrictions[ EEM_Base::caps_edit ]['ee_edit_event_category'] = new EE_Default_Where_Conditions(
+		$this->_cap_restrictions[EEM_Base::caps_edit]['ee_edit_event_category'] = new EE_Default_Where_Conditions(
 			array(
-				$path_to_tax_model . 'taxonomy*ee_edit_event_category' => array( '!=', 'espresso_event_categories' ),
+				$path_to_tax_model.'taxonomy*ee_edit_event_category' => array('!=', 'espresso_event_categories'),
 			)
 		);
-		$this->_cap_restrictions[ EEM_Base::caps_edit ]['ee_edit_venue_category'] = new EE_Default_Where_Conditions(
+		$this->_cap_restrictions[EEM_Base::caps_edit]['ee_edit_venue_category'] = new EE_Default_Where_Conditions(
 			array(
-				$path_to_tax_model . 'taxonomy*ee_edit_venue_category' => array( '!=', 'espresso_venue_categories' ),
+				$path_to_tax_model.'taxonomy*ee_edit_venue_category' => array('!=', 'espresso_venue_categories'),
 			)
 		);
-		$this->_cap_restrictions[ EEM_Base::caps_edit ]['ee_edit_event_type'] = new EE_Default_Where_Conditions(
+		$this->_cap_restrictions[EEM_Base::caps_edit]['ee_edit_event_type'] = new EE_Default_Where_Conditions(
 			array(
-				$path_to_tax_model . 'taxonomy*ee_edit_event_type' => array( '!=', 'espresso_event_type' ),
+				$path_to_tax_model.'taxonomy*ee_edit_event_type' => array('!=', 'espresso_event_type'),
 			)
 		);
 		//add cap restrictions for deleting relating to the "ee_deleting_*"
-		$this->_cap_restrictions[ EEM_Base::caps_delete ]['ee_delete_event_category'] = new EE_Default_Where_Conditions(
+		$this->_cap_restrictions[EEM_Base::caps_delete]['ee_delete_event_category'] = new EE_Default_Where_Conditions(
 			array(
-				$path_to_tax_model . 'taxonomy*ee_delete_event_category' => array( '!=', 'espresso_event_categories' ),
+				$path_to_tax_model.'taxonomy*ee_delete_event_category' => array('!=', 'espresso_event_categories'),
 			)
 		);
-		$this->_cap_restrictions[ EEM_Base::caps_delete ]['ee_delete_venue_category'] = new EE_Default_Where_Conditions(
+		$this->_cap_restrictions[EEM_Base::caps_delete]['ee_delete_venue_category'] = new EE_Default_Where_Conditions(
 			array(
-				$path_to_tax_model . 'taxonomy*ee_delete_venue_category' => array( '!=', 'espresso_venue_categories' ),
+				$path_to_tax_model.'taxonomy*ee_delete_venue_category' => array('!=', 'espresso_venue_categories'),
 			)
 		);
-		$this->_cap_restrictions[ EEM_Base::caps_delete ]['ee_delete_event_type'] = new EE_Default_Where_Conditions(
+		$this->_cap_restrictions[EEM_Base::caps_delete]['ee_delete_event_type'] = new EE_Default_Where_Conditions(
 			array(
-				$path_to_tax_model . 'taxonomy*ee_delete_event_type' => array( '!=', 'espresso_event_type' ),
+				$path_to_tax_model.'taxonomy*ee_delete_event_type' => array('!=', 'espresso_event_type'),
 			)
 		);
-		parent::__construct( $timezone );
-		add_filter( 'FHEE__Read__create_model_query_params', array( 'EEM_Term', 'rest_api_query_params' ), 10, 3 );
+		parent::__construct($timezone);
+		add_filter('FHEE__Read__create_model_query_params', array('EEM_Term', 'rest_api_query_params'), 10, 3);
 	}
 
 
@@ -95,18 +95,18 @@ 
 	 * @param bool $show_uncategorized
 	 * @return \EE_Base_Class[]
 	 */
-	public function get_all_ee_categories( $show_uncategorized = false ) {
+	public function get_all_ee_categories($show_uncategorized = false) {
 		$where_params = array(
 			'Term_Taxonomy.taxonomy' => 'espresso_event_categories',
-			'NOT'                    => array( 'name' => __( 'Uncategorized', 'event_espresso' ) ),
+			'NOT'                    => array('name' => __('Uncategorized', 'event_espresso')),
 		);
-		if ( $show_uncategorized ) {
-			unset( $where_params['NOT'] );
+		if ($show_uncategorized) {
+			unset($where_params['NOT']);
 		}
 		return EEM_Term::instance()->get_all(
 			array(
 				$where_params,
-				'order_by' => array( 'name' => 'ASC' ),
+				'order_by' => array('name' => 'ASC'),
 			)
 		);
 	}
@@ -120,8 +120,8 @@ 
 	 * @param string $post_type
 	 * @return array
 	 */
-	public function get_all_CPT_post_tags( $post_type = '' ) {
-		switch ( $post_type ) {
+	public function get_all_CPT_post_tags($post_type = '') {
+		switch ($post_type) {
 			case 'espresso_events' :
 				return $this->get_all_event_post_tags();
 				break;
@@ -131,7 +131,7 @@ 
 			default :
 				$event_tags = $this->get_all_event_post_tags();
 				$venue_tags = $this->get_all_venue_post_tags();
-				return array_merge( $event_tags, $venue_tags );
+				return array_merge($event_tags, $venue_tags);
 		}
 	}
 
@@ -149,15 +149,15 @@ 
 					'Term_Taxonomy.taxonomy'        => 'post_tag',
 					'Term_Taxonomy.Event.post_type' => 'espresso_events',
 				),
-				'order_by'   => array( 'name' => 'ASC' ),
-				'force_join' => array( 'Term_Taxonomy.Event' ),
+				'order_by'   => array('name' => 'ASC'),
+				'force_join' => array('Term_Taxonomy.Event'),
 			)
 		);
-		foreach ( $post_tags as $key => $post_tag ) {
-			if ( ! isset( $post_tags[ $key ]->post_type ) ) {
-				$post_tags[ $key ]->post_type = array();
+		foreach ($post_tags as $key => $post_tag) {
+			if ( ! isset($post_tags[$key]->post_type)) {
+				$post_tags[$key]->post_type = array();
 			}
-			$post_tags[ $key ]->post_type[] = 'espresso_events';
+			$post_tags[$key]->post_type[] = 'espresso_events';
 		}
 		return $post_tags;
 	}
@@ -176,15 +176,15 @@ 
 					'Term_Taxonomy.taxonomy'        => 'post_tag',
 					'Term_Taxonomy.Venue.post_type' => 'espresso_venues',
 				),
-				'order_by'   => array( 'name' => 'ASC' ),
-				'force_join' => array( 'Term_Taxonomy' ),
+				'order_by'   => array('name' => 'ASC'),
+				'force_join' => array('Term_Taxonomy'),
 			)
 		);
-		foreach ( $post_tags as $key => $post_tag ) {
-			if ( ! isset( $post_tags[ $key ]->post_type ) ) {
-				$post_tags[ $key ]->post_type = array();
+		foreach ($post_tags as $key => $post_tag) {
+			if ( ! isset($post_tags[$key]->post_type)) {
+				$post_tags[$key]->post_type = array();
 			}
-			$post_tags[ $key ]->post_type[] = 'espresso_venues';
+			$post_tags[$key]->post_type[] = 'espresso_venues';
 		}
 		return $post_tags;
 	}
@@ -200,11 +200,11 @@ 
 	 * @param EEM_Base $model
 	 * @return array
 	 */
-	public static function rest_api_query_params( $model_query_params, $querystring_query_params, $model ) {
-		if ( $model === EEM_Term::instance() ) {
-			$taxonomies = get_taxonomies( array( 'show_in_rest' => true ) );
-			if ( ! empty( $taxonomies ) ) {
-				$model_query_params[0]['Term_Taxonomy.taxonomy'] = array( 'IN', $taxonomies );
+	public static function rest_api_query_params($model_query_params, $querystring_query_params, $model) {
+		if ($model === EEM_Term::instance()) {
+			$taxonomies = get_taxonomies(array('show_in_rest' => true));
+			if ( ! empty($taxonomies)) {
+				$model_query_params[0]['Term_Taxonomy.taxonomy'] = array('IN', $taxonomies);
 			}
 		}
 		return $model_query_params;

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

Spacing +311 added lines, -311 removed lines

@@ -6,8 +6,8 @@ 
 use EventEspresso\core\libraries\rest_api\Rest_Exception;
 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');
 }
 
 /**
@@ -46,22 +46,22 @@ 
 	 * @param \WP_REST_Request $request
 	 * @return \WP_REST_Response|\WP_Error
 	 */
-	public static function handle_request_get_all( \WP_REST_Request $request) {
+	public static function handle_request_get_all(\WP_REST_Request $request) {
 		$controller = new Read();
-		try{
+		try {
 			$matches = $controller->parse_route(
 				$request->get_route(),
-				'~' . \EED_Core_Rest_Api::ee_api_namespace_for_regex . '(.*)~',
-				array( 'version', 'model' )
+				'~'.\EED_Core_Rest_Api::ee_api_namespace_for_regex.'(.*)~',
+				array('version', 'model')
 			);
-			$controller->set_requested_version( $matches[ 'version' ] );
-			$model_name_singular = \EEH_Inflector::singularize_and_upper( $matches[ 'model' ] );
-			if ( ! $controller->get_model_version_info()->is_model_name_in_this_version( $model_name_singular ) ) {
+			$controller->set_requested_version($matches['version']);
+			$model_name_singular = \EEH_Inflector::singularize_and_upper($matches['model']);
+			if ( ! $controller->get_model_version_info()->is_model_name_in_this_version($model_name_singular)) {
 				return $controller->send_response(
 					new \WP_Error(
 						'endpoint_parsing_error',
 						sprintf(
-							__( 'There is no model for endpoint %s. Please contact event espresso support', 'event_espresso' ),
+							__('There is no model for endpoint %s. Please contact event espresso support', 'event_espresso'),
 							$model_name_singular
 						)
 					)
@@ -69,12 +69,12 @@ 
 			}
 			return $controller->send_response(
 					$controller->get_entities_from_model(
-							$controller->get_model_version_info()->load_model( $model_name_singular ),
+							$controller->get_model_version_info()->load_model($model_name_singular),
 							$request
 					)
 			);
-		} catch( \Exception $e ) {
-			return $controller->send_response( $e );
+		} catch (\Exception $e) {
+			return $controller->send_response($e);
 		}
 	}
 
@@ -84,21 +84,21 @@ 
 	 * @param \WP_REST_Request $request
 	 * @return \WP_REST_Response|\WP_Error
 	 */
-	public static function handle_request_get_one( \WP_REST_Request $request ) {
+	public static function handle_request_get_one(\WP_REST_Request $request) {
 		$controller = new Read();
-		try{
+		try {
 			$matches = $controller->parse_route(
 				$request->get_route(),
-				'~' . \EED_Core_Rest_Api::ee_api_namespace_for_regex . '(.*)/(.*)~',
-				array( 'version', 'model', 'id' ) );
-			$controller->set_requested_version( $matches[ 'version' ] );
-			$model_name_singular = \EEH_Inflector::singularize_and_upper( $matches[ 'model' ] );
-			if ( ! $controller->get_model_version_info()->is_model_name_in_this_version( $model_name_singular ) ) {
+				'~'.\EED_Core_Rest_Api::ee_api_namespace_for_regex.'(.*)/(.*)~',
+				array('version', 'model', 'id') );
+			$controller->set_requested_version($matches['version']);
+			$model_name_singular = \EEH_Inflector::singularize_and_upper($matches['model']);
+			if ( ! $controller->get_model_version_info()->is_model_name_in_this_version($model_name_singular)) {
 				return $controller->send_response(
 					new \WP_Error(
 						'endpoint_parsing_error',
 						sprintf(
-							__( 'There is no model for endpoint %s. Please contact event espresso support', 'event_espresso' ),
+							__('There is no model for endpoint %s. Please contact event espresso support', 'event_espresso'),
 							$model_name_singular
 						)
 					)
@@ -106,12 +106,12 @@ 
 			}
 			return $controller->send_response(
 					$controller->get_entity_from_model(
-							$controller->get_model_version_info()->load_model( $model_name_singular ),
+							$controller->get_model_version_info()->load_model($model_name_singular),
 							$request
 						)
 				);
-		} catch( \Exception $e ) {
-			return $controller->send_response( $e );
+		} catch (\Exception $e) {
+			return $controller->send_response($e);
 		}
 	}
 
@@ -123,40 +123,40 @@ 
 	 * @param \WP_REST_Request $request
 	 * @return \WP_REST_Response|\WP_Error
 	 */
-	public static function handle_request_get_related( \WP_REST_Request $request ) {
+	public static function handle_request_get_related(\WP_REST_Request $request) {
 		$controller = new Read();
-		try{
+		try {
 			$matches = $controller->parse_route(
 				$request->get_route(),
-				'~' . \EED_Core_Rest_Api::ee_api_namespace_for_regex . '(.*)/(.*)/(.*)~',
-				array( 'version', 'model', 'id', 'related_model' )
+				'~'.\EED_Core_Rest_Api::ee_api_namespace_for_regex.'(.*)/(.*)/(.*)~',
+				array('version', 'model', 'id', 'related_model')
 			);
-			$controller->set_requested_version( $matches[ 'version' ] );
-			$main_model_name_singular = \EEH_Inflector::singularize_and_upper( $matches[ 'model' ] );
-			if ( ! $controller->get_model_version_info()->is_model_name_in_this_version( $main_model_name_singular ) ) {
+			$controller->set_requested_version($matches['version']);
+			$main_model_name_singular = \EEH_Inflector::singularize_and_upper($matches['model']);
+			if ( ! $controller->get_model_version_info()->is_model_name_in_this_version($main_model_name_singular)) {
 				return $controller->send_response(
 					new \WP_Error(
 						'endpoint_parsing_error',
 						sprintf(
-							__( 'There is no model for endpoint %s. Please contact event espresso support', 'event_espresso' ),
+							__('There is no model for endpoint %s. Please contact event espresso support', 'event_espresso'),
 							$main_model_name_singular
 						)
 					)
 				);
 			}
-			$main_model = $controller->get_model_version_info()->load_model( $main_model_name_singular );
+			$main_model = $controller->get_model_version_info()->load_model($main_model_name_singular);
 			//assume the related model name is plural and try to find the model's name
-			$related_model_name_singular = \EEH_Inflector::singularize_and_upper( $matches[ 'related_model' ] );
-			if ( ! $controller->get_model_version_info()->is_model_name_in_this_version( $related_model_name_singular ) ) {
+			$related_model_name_singular = \EEH_Inflector::singularize_and_upper($matches['related_model']);
+			if ( ! $controller->get_model_version_info()->is_model_name_in_this_version($related_model_name_singular)) {
 				//so the word didn't singularize well. Maybe that's just because it's a singular word?
-				$related_model_name_singular = \EEH_Inflector::humanize( $matches[ 'related_model' ] );
+				$related_model_name_singular = \EEH_Inflector::humanize($matches['related_model']);
 			}
-			if ( ! $controller->get_model_version_info()->is_model_name_in_this_version( $related_model_name_singular ) ) {
+			if ( ! $controller->get_model_version_info()->is_model_name_in_this_version($related_model_name_singular)) {
 				return $controller->send_response(
 					new \WP_Error(
 						'endpoint_parsing_error',
 						sprintf(
-							__( 'There is no model for endpoint %s. Please contact event espresso support', 'event_espresso' ),
+							__('There is no model for endpoint %s. Please contact event espresso support', 'event_espresso'),
 							$related_model_name_singular
 						)
 					)
@@ -165,13 +165,13 @@ 
 
 			return $controller->send_response(
 					$controller->get_entities_from_relation(
-						$request->get_param( 'id' ),
-						$main_model->related_settings_for( $related_model_name_singular ) ,
+						$request->get_param('id'),
+						$main_model->related_settings_for($related_model_name_singular),
 						$request
 					)
 				);
-		} catch( \Exception $e ) {
-			return $controller->send_response( $e );
+		} catch (\Exception $e) {
+			return $controller->send_response($e);
 		}
 	}
 
@@ -184,28 +184,28 @@ 
 	 * @param \WP_REST_Request $request
 	 * @return array|\WP_Error
 	 */
-	public function get_entities_from_model( $model, $request) {
-		$query_params = $this->create_model_query_params( $model, $request->get_params() );
-		if( ! Capabilities::current_user_has_partial_access_to( $model, $query_params[ 'caps' ] ) ) {
-			$model_name_plural = \EEH_Inflector::pluralize_and_lower( $model->get_this_model_name() );
+	public function get_entities_from_model($model, $request) {
+		$query_params = $this->create_model_query_params($model, $request->get_params());
+		if ( ! Capabilities::current_user_has_partial_access_to($model, $query_params['caps'])) {
+			$model_name_plural = \EEH_Inflector::pluralize_and_lower($model->get_this_model_name());
 			return new \WP_Error(
-				sprintf( 'rest_%s_cannot_list', $model_name_plural ),
+				sprintf('rest_%s_cannot_list', $model_name_plural),
 				sprintf(
-					__( 'Sorry, you are not allowed to list %1$s. Missing permissions: %2$s', 'event_espresso' ),
+					__('Sorry, you are not allowed to list %1$s. Missing permissions: %2$s', 'event_espresso'),
 					$model_name_plural,
-					Capabilities::get_missing_permissions_string( $model, $query_params[ 'caps' ] )
+					Capabilities::get_missing_permissions_string($model, $query_params['caps'])
 				),
-				array( 'status' => 403 )
+				array('status' => 403)
 			);
 		}
-		if( ! $request->get_header( 'no_rest_headers' ) ) {
-			$this->_set_headers_from_query_params( $model, $query_params );
+		if ( ! $request->get_header('no_rest_headers')) {
+			$this->_set_headers_from_query_params($model, $query_params);
 		}
 		/** @type array $results */
-		$results = $model->get_all_wpdb_results( $query_params );
+		$results = $model->get_all_wpdb_results($query_params);
 		$nice_results = array( );
-		foreach ( $results as $result ) {
-			$nice_results[ ] = $this->create_entity_from_wpdb_result(
+		foreach ($results as $result) {
+			$nice_results[] = $this->create_entity_from_wpdb_result(
 					$model,
 					$result,
 					$request
@@ -221,11 +221,11 @@ 
 	 * @param \WP_REST_Request $request
 	 * @return \WP_Error|array
 	 */
-	protected function _get_entities_from_relation( $primary_model_query_params, $relation, $request ) {
-		$context = $this->validate_context( $request->get_param( 'caps' ));
+	protected function _get_entities_from_relation($primary_model_query_params, $relation, $request) {
+		$context = $this->validate_context($request->get_param('caps'));
 		$model = $relation->get_this_model();
 		$related_model = $relation->get_other_model();
-		if( ! isset( $primary_model_query_params[0]) ) {
+		if ( ! isset($primary_model_query_params[0])) {
 			$primary_model_query_params[0] = array();
 		}
 		//check if they can access the 1st model object
@@ -233,60 +233,60 @@ 
 			0 => $primary_model_query_params[0],
 			'limit' => 1
 		);
-		if( $model instanceof \EEM_Soft_Delete_Base ){
-			$primary_model_query_params = $model->alter_query_params_so_deleted_and_undeleted_items_included( $primary_model_query_params );
+		if ($model instanceof \EEM_Soft_Delete_Base) {
+			$primary_model_query_params = $model->alter_query_params_so_deleted_and_undeleted_items_included($primary_model_query_params);
 		}
 		$restricted_query_params = $primary_model_query_params;
-		$restricted_query_params[ 'caps' ] = $context;
-		$this->_set_debug_info( 'main model query params', $restricted_query_params );
-		$this->_set_debug_info( 'missing caps', Capabilities::get_missing_permissions_string( $related_model, $context ) );
+		$restricted_query_params['caps'] = $context;
+		$this->_set_debug_info('main model query params', $restricted_query_params);
+		$this->_set_debug_info('missing caps', Capabilities::get_missing_permissions_string($related_model, $context));
 
-		if(
+		if (
 			! (
-				Capabilities::current_user_has_partial_access_to( $related_model, $context )
-				&& $model->exists( $restricted_query_params )
+				Capabilities::current_user_has_partial_access_to($related_model, $context)
+				&& $model->exists($restricted_query_params)
 			)
-		){
-			if( $relation instanceof \EE_Belongs_To_Relation ) {
-				$related_model_name_maybe_plural = strtolower( $related_model->get_this_model_name() );
-			}else{
-				$related_model_name_maybe_plural = \EEH_Inflector::pluralize_and_lower( $related_model->get_this_model_name() );
+		) {
+			if ($relation instanceof \EE_Belongs_To_Relation) {
+				$related_model_name_maybe_plural = strtolower($related_model->get_this_model_name());
+			} else {
+				$related_model_name_maybe_plural = \EEH_Inflector::pluralize_and_lower($related_model->get_this_model_name());
 			}
 			return new \WP_Error(
-				sprintf( 'rest_%s_cannot_list', $related_model_name_maybe_plural ),
+				sprintf('rest_%s_cannot_list', $related_model_name_maybe_plural),
 				sprintf(
-					__(	'Sorry, you are not allowed to list %1$s related to %2$s. Missing permissions: %3$s', 'event_espresso' ),
+					__('Sorry, you are not allowed to list %1$s related to %2$s. Missing permissions: %3$s', 'event_espresso'),
 					$related_model_name_maybe_plural,
 					$relation->get_this_model()->get_this_model_name(),
 					implode(
 						',',
 						array_keys(
-							Capabilities::get_missing_permissions( $related_model, $context )
+							Capabilities::get_missing_permissions($related_model, $context)
 						)
 					)
 				),
-				array( 'status' => 403 )
+				array('status' => 403)
 			);
 		}
-		$query_params = $this->create_model_query_params( $relation->get_other_model(), $request->get_params() );
-		foreach( $primary_model_query_params[0] as $where_condition_key => $where_condition_value ) {
-			 $query_params[0][ $relation->get_this_model()->get_this_model_name() . '.' . $where_condition_key ] = $where_condition_value;
+		$query_params = $this->create_model_query_params($relation->get_other_model(), $request->get_params());
+		foreach ($primary_model_query_params[0] as $where_condition_key => $where_condition_value) {
+			 $query_params[0][$relation->get_this_model()->get_this_model_name().'.'.$where_condition_key] = $where_condition_value;
 		}
-		$query_params[ 'default_where_conditions' ] = 'none';
-		$query_params[ 'caps' ] = $context;
-		if( ! $request->get_header( 'no_rest_headers' ) ) {
-			$this->_set_headers_from_query_params( $relation->get_other_model(), $query_params );
+		$query_params['default_where_conditions'] = 'none';
+		$query_params['caps'] = $context;
+		if ( ! $request->get_header('no_rest_headers')) {
+			$this->_set_headers_from_query_params($relation->get_other_model(), $query_params);
 		}
 		/** @type array $results */
-		$results = $relation->get_other_model()->get_all_wpdb_results( $query_params );
+		$results = $relation->get_other_model()->get_all_wpdb_results($query_params);
 		$nice_results = array();
-		foreach( $results as $result ) {
+		foreach ($results as $result) {
 			$nice_result = $this->create_entity_from_wpdb_result(
 				$relation->get_other_model(),
 				$result,
 				$request
 			);
-			if( $relation instanceof \EE_HABTM_Relation ) {
+			if ($relation instanceof \EE_HABTM_Relation) {
 				//put the unusual stuff (properties from the HABTM relation) first, and make sure
 				//if there are conflicts we prefer the properties from the main model
 				$join_model_result = $this->create_entity_from_wpdb_result(
@@ -294,18 +294,18 @@ 
 					$result,
 					$request
 				);
-				$joined_result = array_merge( $nice_result, $join_model_result );
+				$joined_result = array_merge($nice_result, $join_model_result);
 				//but keep the meta stuff from the main model
-				if( isset( $nice_result['meta'] ) ){
+				if (isset($nice_result['meta'])) {
 					$joined_result['meta'] = $nice_result['meta'];
 				}
 				$nice_result = $joined_result;
 			}
 			$nice_results[] = $nice_result;
 		}
-		if( $relation instanceof \EE_Belongs_To_Relation ){
-			return array_shift( $nice_results );
-		}else{
+		if ($relation instanceof \EE_Belongs_To_Relation) {
+			return array_shift($nice_results);
+		} else {
 			return $nice_results;
 		}
 	}
@@ -324,11 +324,11 @@ 
 	 * @return array|\WP_Error
 	 * @throws \EE_Error
 	 */
-	public function get_entities_from_relation( $id, $relation, $request ) {
-		if( ! $relation->get_this_model()->has_primary_key_field() ) {
+	public function get_entities_from_relation($id, $relation, $request) {
+		if ( ! $relation->get_this_model()->has_primary_key_field()) {
 			throw new \EE_Error(
 				sprintf(
-					__( 'Read::get_entities_from_relation should only be called from a model with a primary key, it was called from %1$s', 'event_espresso'),
+					__('Read::get_entities_from_relation should only be called from a model with a primary key, it was called from %1$s', 'event_espresso'),
 					$relation->get_this_model()->get_this_model_name()
 				)
 			);
@@ -352,30 +352,30 @@ 
 	 * @param array $query_params
 	 * @return void
 	 */
-	protected function _set_headers_from_query_params( $model, $query_params ) {
-		$this->_set_debug_info( 'model query params', $query_params );
-		$this->_set_debug_info( 'missing caps', Capabilities::get_missing_permissions_string( $model, $query_params[ 'caps' ] ) );
+	protected function _set_headers_from_query_params($model, $query_params) {
+		$this->_set_debug_info('model query params', $query_params);
+		$this->_set_debug_info('missing caps', Capabilities::get_missing_permissions_string($model, $query_params['caps']));
 		//normally the limit to a 2-part array, where the 2nd item is the limit
-		if( ! isset( $query_params[ 'limit' ] ) ) {
-			$query_params[ 'limit' ] = \EED_Core_Rest_Api::get_default_query_limit();
+		if ( ! isset($query_params['limit'])) {
+			$query_params['limit'] = \EED_Core_Rest_Api::get_default_query_limit();
 		}
-		if( is_array( $query_params[ 'limit' ] )  ) {
-			$limit_parts = $query_params[ 'limit' ];
+		if (is_array($query_params['limit'])) {
+			$limit_parts = $query_params['limit'];
 		} else {
-			$limit_parts = explode(',', $query_params[ 'limit' ] );
-			if( count( $limit_parts ) == 1 ){
-				$limit_parts = array(0, $limit_parts[ 0 ] );
+			$limit_parts = explode(',', $query_params['limit']);
+			if (count($limit_parts) == 1) {
+				$limit_parts = array(0, $limit_parts[0]);
 			}
 		}
 		//remove the group by and having parts of the query, as those will
 		//make the sql query return an array of values, instead of just a single value
-		unset( $query_params[ 'group_by' ], $query_params[ 'having' ], $query_params[ 'limit' ] );
-		$count = $model->count( $query_params, null, true );
+		unset($query_params['group_by'], $query_params['having'], $query_params['limit']);
+		$count = $model->count($query_params, null, true);
 
-		$pages = $count / $limit_parts[ 1 ];
-		$this->_set_response_header( 'Total', $count, false );
-		$this->_set_response_header( 'PageSize', $limit_parts[ 1 ], false );
-		$this->_set_response_header( 'TotalPages', ceil( $pages ), false );
+		$pages = $count / $limit_parts[1];
+		$this->_set_response_header('Total', $count, false);
+		$this->_set_response_header('PageSize', $limit_parts[1], false);
+		$this->_set_response_header('TotalPages', ceil($pages), false);
 	}
 
 
@@ -388,50 +388,50 @@ 
 	 * @param string $deprecated no longer used
 	 * @return array ready for being converted into json for sending to client
 	 */
-	public function create_entity_from_wpdb_result( $model, $db_row, $rest_request, $deprecated = null ) {
-		if( ! $rest_request instanceof \WP_REST_Request ) {
+	public function create_entity_from_wpdb_result($model, $db_row, $rest_request, $deprecated = null) {
+		if ( ! $rest_request instanceof \WP_REST_Request) {
 			//ok so this was called in the old style, where the 3rd arg was
 			//$include, and the 4th arg was $context
 			//now setup the request just to avoid fatal errors, although we won't be able
 			//to truly make use of it because it's kinda devoid of info
 			$rest_request = new \WP_REST_Request();
-			$rest_request->set_param( 'include', $rest_request );
-			$rest_request->set_param( 'caps', $deprecated );
+			$rest_request->set_param('include', $rest_request);
+			$rest_request->set_param('caps', $deprecated);
 		}
-		if( $rest_request->get_param( 'caps' ) == null ) {
-			$rest_request->set_param( 'caps', \EEM_Base::caps_read );
+		if ($rest_request->get_param('caps') == null) {
+			$rest_request->set_param('caps', \EEM_Base::caps_read);
 		}
-		$entity_array = $this->_create_bare_entity_from_wpdb_results( $model, $db_row );
-		$entity_array = $this->_add_extra_fields( $model, $db_row, $entity_array );
-		$entity_array[ '_links' ] = $this->_get_entity_links( $model, $db_row, $entity_array );
-		$entity_array[ '_calculated_fields'] = $this->_get_entity_calculations( $model, $db_row, $rest_request );
-		$entity_array = $this->_include_requested_models( $model, $rest_request, $entity_array, $db_row );
+		$entity_array = $this->_create_bare_entity_from_wpdb_results($model, $db_row);
+		$entity_array = $this->_add_extra_fields($model, $db_row, $entity_array);
+		$entity_array['_links'] = $this->_get_entity_links($model, $db_row, $entity_array);
+		$entity_array['_calculated_fields'] = $this->_get_entity_calculations($model, $db_row, $rest_request);
+		$entity_array = $this->_include_requested_models($model, $rest_request, $entity_array, $db_row);
 		$entity_array = apply_filters(
 			'FHEE__Read__create_entity_from_wpdb_results__entity_before_inaccessible_field_removal',
 			$entity_array,
 			$model,
-			$rest_request->get_param( 'caps' ),
+			$rest_request->get_param('caps'),
 			$rest_request,
 			$this
 		);
 		$result_without_inaccessible_fields = Capabilities::filter_out_inaccessible_entity_fields(
 			$entity_array,
 			$model,
-			$rest_request->get_param( 'caps' ),
+			$rest_request->get_param('caps'),
 			$this->get_model_version_info(),
 			$model->get_index_primary_key_string(
-				$model->deduce_fields_n_values_from_cols_n_values($db_row )
+				$model->deduce_fields_n_values_from_cols_n_values($db_row)
 			)
 		);
 		$this->_set_debug_info(
 			'inaccessible fields',
-			array_keys( array_diff_key( $entity_array, $result_without_inaccessible_fields ) )
+			array_keys(array_diff_key($entity_array, $result_without_inaccessible_fields))
 		);
 		return apply_filters(
 			'FHEE__Read__create_entity_from_wpdb_results__entity_return',
 			$result_without_inaccessible_fields,
 			$model,
-			$rest_request->get_param( 'caps' )
+			$rest_request->get_param('caps')
 		);
 	}
 
@@ -443,39 +443,39 @@ 
 	 * @param array $db_row
 	 * @return array entity mostly ready for converting to JSON and sending in the response
 	 */
-	protected function _create_bare_entity_from_wpdb_results( \EEM_Base $model, $db_row ) {
-		$result = $model->deduce_fields_n_values_from_cols_n_values( $db_row );
-		$result = array_intersect_key( $result, $this->get_model_version_info()->fields_on_model_in_this_version( $model ) );
-		foreach( $result as $field_name => $raw_field_value ) {
+	protected function _create_bare_entity_from_wpdb_results(\EEM_Base $model, $db_row) {
+		$result = $model->deduce_fields_n_values_from_cols_n_values($db_row);
+		$result = array_intersect_key($result, $this->get_model_version_info()->fields_on_model_in_this_version($model));
+		foreach ($result as $field_name => $raw_field_value) {
 			$field_obj = $model->field_settings_for($field_name);
-			$field_value = $field_obj->prepare_for_set_from_db( $raw_field_value );
-			if( $this->is_subclass_of_one(  $field_obj, $this->get_model_version_info()->fields_ignored() ) ){
-				unset( $result[ $field_name ] );
-			}elseif(
-				$this->is_subclass_of_one( $field_obj, $this->get_model_version_info()->fields_that_have_rendered_format() )
-			){
-				$result[ $field_name ] = array(
-					'raw' => $field_obj->prepare_for_get( $field_value ),
-					'rendered' => $field_obj->prepare_for_pretty_echoing( $field_value )
+			$field_value = $field_obj->prepare_for_set_from_db($raw_field_value);
+			if ($this->is_subclass_of_one($field_obj, $this->get_model_version_info()->fields_ignored())) {
+				unset($result[$field_name]);
+			}elseif (
+				$this->is_subclass_of_one($field_obj, $this->get_model_version_info()->fields_that_have_rendered_format())
+			) {
+				$result[$field_name] = array(
+					'raw' => $field_obj->prepare_for_get($field_value),
+					'rendered' => $field_obj->prepare_for_pretty_echoing($field_value)
 				);
-			}elseif(
-				$this->is_subclass_of_one( $field_obj, $this->get_model_version_info()->fields_that_have_pretty_format() )
-			){
-				$result[ $field_name ] = array(
-					'raw' => $field_obj->prepare_for_get( $field_value ),
-					'pretty' => $field_obj->prepare_for_pretty_echoing( $field_value )
+			}elseif (
+				$this->is_subclass_of_one($field_obj, $this->get_model_version_info()->fields_that_have_pretty_format())
+			) {
+				$result[$field_name] = array(
+					'raw' => $field_obj->prepare_for_get($field_value),
+					'pretty' => $field_obj->prepare_for_pretty_echoing($field_value)
 				);
-			} elseif ( $field_obj instanceof \EE_Datetime_Field ) {
-				if( $field_value instanceof \DateTime ) {
+			} elseif ($field_obj instanceof \EE_Datetime_Field) {
+				if ($field_value instanceof \DateTime) {
 					$timezone = $field_value->getTimezone();
-					$field_value->setTimezone( new \DateTimeZone( 'UTC' ) );
-					$result[ $field_name . '_gmt' ] = Model_Data_Translator::prepare_field_value_for_json(
+					$field_value->setTimezone(new \DateTimeZone('UTC'));
+					$result[$field_name.'_gmt'] = Model_Data_Translator::prepare_field_value_for_json(
 						$field_obj,
 						$field_value,
 						$this->get_model_version_info()->requested_version()
 					);
-					$field_value->setTimezone( $timezone );
-					$result[ $field_name ] = Model_Data_Translator::prepare_field_value_for_json(
+					$field_value->setTimezone($timezone);
+					$result[$field_name] = Model_Data_Translator::prepare_field_value_for_json(
 						$field_obj,
 						$field_value,
 						$this->get_model_version_info()->requested_version()
@@ -483,9 +483,9 @@ 
 				}
 
 			} else {
-				$result[ $field_name ] = Model_Data_Translator::prepare_field_value_for_json(
+				$result[$field_name] = Model_Data_Translator::prepare_field_value_for_json(
 					$field_obj,
-					$field_obj->prepare_for_get( $field_value ),
+					$field_obj->prepare_for_get($field_value),
 					$this->get_model_version_info()->requested_version()
 				);
 			}
@@ -500,9 +500,9 @@ 
 	 * @param array $entity_array
 	 * @return array modified entity
 	 */
-	protected function _add_extra_fields( \EEM_Base $model, $db_row, $entity_array ) {
-		if( $model instanceof \EEM_CPT_Base ) {
-			$entity_array[ 'link' ] = get_permalink( $db_row[ $model->get_primary_key_field()->get_qualified_column() ] );
+	protected function _add_extra_fields(\EEM_Base $model, $db_row, $entity_array) {
+		if ($model instanceof \EEM_CPT_Base) {
+			$entity_array['link'] = get_permalink($db_row[$model->get_primary_key_field()->get_qualified_column()]);
 		}
 		return $entity_array;
 	}
@@ -516,14 +516,14 @@ 
 	 * @param array $entity_array
 	 * @return array the _links item in the entity
 	 */
-	protected function _get_entity_links( $model, $db_row, $entity_array ) {
+	protected function _get_entity_links($model, $db_row, $entity_array) {
 		//add basic links
 		$links = array();
-		if( $model->has_primary_key_field() ) {
+		if ($model->has_primary_key_field()) {
 			$links['self'] = array(
 				array(
 					'href' => $this->get_versioned_link_to(
-						\EEH_Inflector::pluralize_and_lower( $model->get_this_model_name() ) . '/' . $entity_array[ $model->primary_key_name() ]
+						\EEH_Inflector::pluralize_and_lower($model->get_this_model_name()).'/'.$entity_array[$model->primary_key_name()]
 					)
 				)
 			);
@@ -531,33 +531,33 @@ 
 		$links['collection'] = array(
 			array(
 				'href' => $this->get_versioned_link_to(
-					\EEH_Inflector::pluralize_and_lower( $model->get_this_model_name() )
+					\EEH_Inflector::pluralize_and_lower($model->get_this_model_name())
 				)
 			)
 		);
 
 		//add link to the wp core endpoint, if wp api is active
 		global $wp_rest_server;
-		if( $model instanceof \EEM_CPT_Base &&
+		if ($model instanceof \EEM_CPT_Base &&
 			$wp_rest_server instanceof \WP_REST_Server &&
-			$wp_rest_server->get_route_options( '/wp/v2/posts' ) &&
-			$model->has_primary_key_field() ) {
-			$links[ \EED_Core_Rest_Api::ee_api_link_namespace . 'self_wp_post' ] = array(
+			$wp_rest_server->get_route_options('/wp/v2/posts') &&
+			$model->has_primary_key_field()) {
+			$links[\EED_Core_Rest_Api::ee_api_link_namespace.'self_wp_post'] = array(
 				array(
-					'href' => rest_url( '/wp/v2/posts/' . $db_row[ $model->get_primary_key_field()->get_qualified_column() ] ),
+					'href' => rest_url('/wp/v2/posts/'.$db_row[$model->get_primary_key_field()->get_qualified_column()]),
 					'single' => true
 				)
 			);
 		}
 
 		//add links to related models
-		if( $model->has_primary_key_field() ) {
-			foreach( $this->get_model_version_info()->relation_settings( $model ) as $relation_name => $relation_obj ) {
-				$related_model_part = Read::get_related_entity_name( $relation_name, $relation_obj );
-				$links[ \EED_Core_Rest_Api::ee_api_link_namespace . $related_model_part ] = array(
+		if ($model->has_primary_key_field()) {
+			foreach ($this->get_model_version_info()->relation_settings($model) as $relation_name => $relation_obj) {
+				$related_model_part = Read::get_related_entity_name($relation_name, $relation_obj);
+				$links[\EED_Core_Rest_Api::ee_api_link_namespace.$related_model_part] = array(
 					array(
 						'href' => $this->get_versioned_link_to(
-							\EEH_Inflector::pluralize_and_lower( $model->get_this_model_name() ) . '/' . $entity_array[ $model->primary_key_name() ] . '/' . $related_model_part
+							\EEH_Inflector::pluralize_and_lower($model->get_this_model_name()).'/'.$entity_array[$model->primary_key_name()].'/'.$related_model_part
 						),
 						'single' => $relation_obj instanceof \EE_Belongs_To_Relation ? true : false
 					)
@@ -575,52 +575,52 @@ 
 	 * @param array $db_row
 	 * @return array the modified entity
 	 */
-	protected function _include_requested_models( \EEM_Base $model, \WP_REST_Request $rest_request, $entity_array, $db_row = array() ) {
+	protected function _include_requested_models(\EEM_Base $model, \WP_REST_Request $rest_request, $entity_array, $db_row = array()) {
 		//if $db_row not included, hope the entity array has what we need
-		if( ! $db_row ) {
+		if ( ! $db_row) {
 			$db_row = $entity_array;
 		}
-		$includes_for_this_model = $this->explode_and_get_items_prefixed_with( $rest_request->get_param( 'include' ), '' );
-		$includes_for_this_model = $this->_remove_model_names_from_array( $includes_for_this_model );
+		$includes_for_this_model = $this->explode_and_get_items_prefixed_with($rest_request->get_param('include'), '');
+		$includes_for_this_model = $this->_remove_model_names_from_array($includes_for_this_model);
 		//if they passed in * or didn't specify any includes, return everything
-		if( ! in_array( '*', $includes_for_this_model )
-			&& ! empty( $includes_for_this_model ) ) {
-			if( $model->has_primary_key_field() ) {
+		if ( ! in_array('*', $includes_for_this_model)
+			&& ! empty($includes_for_this_model)) {
+			if ($model->has_primary_key_field()) {
 				//always include the primary key. ya just gotta know that at least
 				$includes_for_this_model[] = $model->primary_key_name();
 			}
-			if( $this->explode_and_get_items_prefixed_with( $rest_request->get_param( 'calculate' ), '' ) ) {
+			if ($this->explode_and_get_items_prefixed_with($rest_request->get_param('calculate'), '')) {
 				$includes_for_this_model[] = '_calculated_fields';
 			}
-			$entity_array = array_intersect_key( $entity_array, array_flip( $includes_for_this_model ) );
+			$entity_array = array_intersect_key($entity_array, array_flip($includes_for_this_model));
 		}
-		$relation_settings = $this->get_model_version_info()->relation_settings( $model );
-		foreach( $relation_settings as $relation_name => $relation_obj ) {
+		$relation_settings = $this->get_model_version_info()->relation_settings($model);
+		foreach ($relation_settings as $relation_name => $relation_obj) {
 			$related_fields_to_include = $this->explode_and_get_items_prefixed_with(
-				$rest_request->get_param( 'include' ),
+				$rest_request->get_param('include'),
 				$relation_name
 			);
 			$related_fields_to_calculate = $this->explode_and_get_items_prefixed_with(
-				$rest_request->get_param( 'calculate' ),
+				$rest_request->get_param('calculate'),
 				$relation_name
 			);
 			//did they specify they wanted to include a related model, or
 			//specific fields from a related model?
 			//or did they specify to calculate a field from a related model?
-			if( $related_fields_to_include || $related_fields_to_calculate ) {
+			if ($related_fields_to_include || $related_fields_to_calculate) {
 				//if so, we should include at least some part of the related model
 				$pretend_related_request = new \WP_REST_Request();
 				$pretend_related_request->set_query_params(
 					array(
-						'caps' => $rest_request->get_param( 'caps' ),
+						'caps' => $rest_request->get_param('caps'),
 						'include' => $related_fields_to_include,
 						'calculate' => $related_fields_to_calculate,
 					)
 				);
-				$pretend_related_request->add_header( 'no_rest_headers', true );
+				$pretend_related_request->add_header('no_rest_headers', true);
 				$primary_model_query_params = $model->alter_query_params_to_restrict_by_ID(
 					$model->get_index_primary_key_string(
-						$model->deduce_fields_n_values_from_cols_n_values( $db_row )
+						$model->deduce_fields_n_values_from_cols_n_values($db_row)
 					)
 				);
 				$related_results = $this->_get_entities_from_relation(
@@ -628,7 +628,7 @@ 
 					$relation_obj,
 					$pretend_related_request
 				);
-				$entity_array[ Read::get_related_entity_name( $relation_name, $relation_obj ) ] = $related_results instanceof \WP_Error
+				$entity_array[Read::get_related_entity_name($relation_name, $relation_obj)] = $related_results instanceof \WP_Error
 					? null
 					: $related_results;
 			}
@@ -642,8 +642,8 @@ 
 	 * @param array $arr
 	 * @return array
 	 */
-	private function _remove_model_names_from_array( $arr ) {
-		return array_diff( $arr, array_keys( \EE_Registry::instance()->non_abstract_db_models ) );
+	private function _remove_model_names_from_array($arr) {
+		return array_diff($arr, array_keys(\EE_Registry::instance()->non_abstract_db_models));
 	}
 	/**
 	 * Gets the calculated fields for the response
@@ -653,15 +653,15 @@ 
 	 * @param \WP_REST_Request $rest_request
 	 * @return \stdClass the _calculations item in the entity
 	 */
-	protected function _get_entity_calculations( $model, $wpdb_row, $rest_request ) {
+	protected function _get_entity_calculations($model, $wpdb_row, $rest_request) {
 		$calculated_fields = $this->explode_and_get_items_prefixed_with(
-			$rest_request->get_param( 'calculate' ),
+			$rest_request->get_param('calculate'),
 			''
 		);
 		//note: setting calculate=* doesn't do anything
 		$calculated_fields_to_return = new \stdClass();
-		foreach( $calculated_fields as $field_to_calculate ) {
-			try{
+		foreach ($calculated_fields as $field_to_calculate) {
+			try {
 				$calculated_fields_to_return->$field_to_calculate = Model_Data_Translator::prepare_field_value_for_json(
 					null,
 					$this->_fields_calculator->retrieve_calculated_field_value(
@@ -673,10 +673,10 @@ 
 					),
 					$this->get_model_version_info()->requested_version()
 				);
-			} catch( Rest_Exception $e ) {
+			} catch (Rest_Exception $e) {
 				//if we don't have permission to read it, just leave it out. but let devs know about the problem
 				$this->_set_response_header(
-					'Notices-Field-Calculation-Errors[' . $e->get_string_code() . '][' . $model->get_this_model_name() . '][' . $field_to_calculate . ']',
+					'Notices-Field-Calculation-Errors['.$e->get_string_code().']['.$model->get_this_model_name().']['.$field_to_calculate.']',
 					$e->getMessage(),
 					true
 				);
@@ -690,7 +690,7 @@ 
 	 * @param string $link_part_after_version_and_slash eg "events/10/datetimes"
 	 * @return string url eg "http://mysite.com/wp-json/ee/v4.6/events/10/datetimes"
 	 */
-	public function get_versioned_link_to( $link_part_after_version_and_slash ) {
+	public function get_versioned_link_to($link_part_after_version_and_slash) {
 		return rest_url(
 			\EED_Core_Rest_Api::ee_api_namespace
 			. $this->get_model_version_info()->requested_version()
@@ -706,11 +706,11 @@ 
 	 * @param \EE_Model_Relation_Base $relation_obj
 	 * @return string
 	 */
-	public static function get_related_entity_name( $relation_name, $relation_obj ){
-		if( $relation_obj instanceof \EE_Belongs_To_Relation ) {
-			return strtolower( $relation_name );
-		}else{
-			return \EEH_Inflector::pluralize_and_lower( $relation_name );
+	public static function get_related_entity_name($relation_name, $relation_obj) {
+		if ($relation_obj instanceof \EE_Belongs_To_Relation) {
+			return strtolower($relation_name);
+		} else {
+			return \EEH_Inflector::pluralize_and_lower($relation_name);
 		}
 	}
 
@@ -723,43 +723,43 @@ 
 	 * @param \WP_REST_Request $request
 	 * @return array|\WP_Error
 	 */
-	public function get_entity_from_model( $model, $request ) {
-		$query_params = array( array( $model->primary_key_name() => $request->get_param( 'id' ) ),'limit' => 1);
-		if( $model instanceof \EEM_Soft_Delete_Base ){
+	public function get_entity_from_model($model, $request) {
+		$query_params = array(array($model->primary_key_name() => $request->get_param('id')), 'limit' => 1);
+		if ($model instanceof \EEM_Soft_Delete_Base) {
 			$query_params = $model->alter_query_params_so_deleted_and_undeleted_items_included($query_params);
 		}
 		$restricted_query_params = $query_params;
-		$restricted_query_params[ 'caps' ] =  $this->validate_context(  $request->get_param( 'caps' ) );
-		$this->_set_debug_info( 'model query params', $restricted_query_params );
-		$model_rows = $model->get_all_wpdb_results( $restricted_query_params );
-		if ( ! empty ( $model_rows ) ) {
+		$restricted_query_params['caps'] = $this->validate_context($request->get_param('caps'));
+		$this->_set_debug_info('model query params', $restricted_query_params);
+		$model_rows = $model->get_all_wpdb_results($restricted_query_params);
+		if ( ! empty ($model_rows)) {
 			return $this->create_entity_from_wpdb_result(
 				$model,
-				array_shift( $model_rows ),
+				array_shift($model_rows),
 				$request );
 		} else {
 			//ok let's test to see if we WOULD have found it, had we not had restrictions from missing capabilities
-			$lowercase_model_name = strtolower( $model->get_this_model_name() );
-			$model_rows_found_sans_restrictions = $model->get_all_wpdb_results( $query_params );
-			if( ! empty( $model_rows_found_sans_restrictions ) ) {
+			$lowercase_model_name = strtolower($model->get_this_model_name());
+			$model_rows_found_sans_restrictions = $model->get_all_wpdb_results($query_params);
+			if ( ! empty($model_rows_found_sans_restrictions)) {
 				//you got shafted- it existed but we didn't want to tell you!
 				return new \WP_Error(
 					'rest_user_cannot_read',
 					sprintf(
-						__( 'Sorry, you cannot read this %1$s. Missing permissions are: %2$s', 'event_espresso' ),
-						strtolower( $model->get_this_model_name() ),
+						__('Sorry, you cannot read this %1$s. Missing permissions are: %2$s', 'event_espresso'),
+						strtolower($model->get_this_model_name()),
 						Capabilities::get_missing_permissions_string(
 							$model,
-							$this->validate_context( $request->get_param( 'caps' ) ) )
+							$this->validate_context($request->get_param('caps')) )
 					),
-					array( 'status' => 403 )
+					array('status' => 403)
 				);
 			} else {
 				//it's not you. It just doesn't exist
 				return new \WP_Error(
-					sprintf( 'rest_%s_invalid_id', $lowercase_model_name ),
-					sprintf( __( 'Invalid %s ID.', 'event_espresso' ), $lowercase_model_name ),
-					array( 'status' => 404 )
+					sprintf('rest_%s_invalid_id', $lowercase_model_name),
+					sprintf(__('Invalid %s ID.', 'event_espresso'), $lowercase_model_name),
+					array('status' => 404)
 				);
 			}
 		}
@@ -772,14 +772,14 @@ 
 	 * @param string $context
 	 * @return string array key of EEM_Base::cap_contexts_to_cap_action_map()
 	 */
-	public function validate_context( $context ) {
-		if( ! $context ) {
+	public function validate_context($context) {
+		if ( ! $context) {
 			$context = \EEM_Base::caps_read;
 		}
 		$valid_contexts = \EEM_Base::valid_cap_contexts();
-		if( in_array( $context, $valid_contexts )  ){
+		if (in_array($context, $valid_contexts)) {
 			return $context;
-		}else{
+		} else {
 			return \EEM_Base::caps_read;
 		}
 	}
@@ -798,87 +798,87 @@ 
 	 *                          that absolutely no results should be returned
 	 * @throws \EE_Error
 	 */
-	public function create_model_query_params( $model, $query_parameters ) {
+	public function create_model_query_params($model, $query_parameters) {
 		$model_query_params = array( );
-		if ( isset( $query_parameters[ 'where' ] ) ) {
-			$model_query_params[ 0 ] = Model_Data_Translator::prepare_conditions_query_params_for_models(
-				$query_parameters[ 'where' ],
+		if (isset($query_parameters['where'])) {
+			$model_query_params[0] = Model_Data_Translator::prepare_conditions_query_params_for_models(
+				$query_parameters['where'],
 				$model,
 				$this->get_model_version_info()->requested_version()
 			);
 		}
-		if ( isset( $query_parameters[ 'order_by' ] ) ) {
-			$order_by = $query_parameters[ 'order_by' ];
-		} elseif ( isset( $query_parameters[ 'orderby' ] ) ) {
-			$order_by = $query_parameters[ 'orderby' ];
-		}else{
+		if (isset($query_parameters['order_by'])) {
+			$order_by = $query_parameters['order_by'];
+		} elseif (isset($query_parameters['orderby'])) {
+			$order_by = $query_parameters['orderby'];
+		} else {
 			$order_by = null;
 		}
-		if( $order_by !== null ){
-			if( is_array( $order_by ) ) {
-				$order_by = Model_Data_Translator::prepare_field_names_in_array_keys_from_json( $order_by );
+		if ($order_by !== null) {
+			if (is_array($order_by)) {
+				$order_by = Model_Data_Translator::prepare_field_names_in_array_keys_from_json($order_by);
 			} else {
 				//it's a single item
-				$order_by = Model_Data_Translator::prepare_field_name_from_json( $order_by );
+				$order_by = Model_Data_Translator::prepare_field_name_from_json($order_by);
 			}
-			$model_query_params[ 'order_by' ] =  $order_by;
+			$model_query_params['order_by'] = $order_by;
 		}
-		if ( isset( $query_parameters[ 'group_by' ] ) ) {
-			$group_by = $query_parameters[ 'group_by' ];
-		} elseif ( isset( $query_parameters[ 'groupby' ] ) ) {
-			$group_by = $query_parameters[ 'groupby' ];
-		}else{
-			$group_by = array_keys( $model->get_combined_primary_key_fields() );
+		if (isset($query_parameters['group_by'])) {
+			$group_by = $query_parameters['group_by'];
+		} elseif (isset($query_parameters['groupby'])) {
+			$group_by = $query_parameters['groupby'];
+		} else {
+			$group_by = array_keys($model->get_combined_primary_key_fields());
 		}
 		//make sure they're all real names
-		if( is_array( $group_by ) ) {
-			$group_by = Model_Data_Translator::prepare_field_names_from_json( $group_by );
+		if (is_array($group_by)) {
+			$group_by = Model_Data_Translator::prepare_field_names_from_json($group_by);
 		}
-		if( $group_by !== null ){
-			$model_query_params[ 'group_by' ] = $group_by;
+		if ($group_by !== null) {
+			$model_query_params['group_by'] = $group_by;
 		}
-		if ( isset( $query_parameters[ 'having' ] ) ) {
-			$model_query_params[ 'having' ] = Model_Data_Translator::prepare_conditions_query_params_for_models(
-				$query_parameters[ 'having' ],
+		if (isset($query_parameters['having'])) {
+			$model_query_params['having'] = Model_Data_Translator::prepare_conditions_query_params_for_models(
+				$query_parameters['having'],
 				$model,
 				$this->get_model_version_info()->requested_version()
 			);
 		}
-		if ( isset( $query_parameters[ 'order' ] ) ) {
-			$model_query_params[ 'order' ] = $query_parameters[ 'order' ];
+		if (isset($query_parameters['order'])) {
+			$model_query_params['order'] = $query_parameters['order'];
 		}
-		if ( isset( $query_parameters[ 'mine' ] ) ){
-			$model_query_params = $model->alter_query_params_to_only_include_mine( $model_query_params );
+		if (isset($query_parameters['mine'])) {
+			$model_query_params = $model->alter_query_params_to_only_include_mine($model_query_params);
 		}
-		if( isset( $query_parameters[ 'limit' ] ) ) {
+		if (isset($query_parameters['limit'])) {
 			//limit should be either a string like '23' or '23,43', or an array with two items in it
-			if( ! is_array( $query_parameters[ 'limit' ] ) ) {
-				$limit_array = explode(',', (string)$query_parameters['limit']);
-			}else {
-				$limit_array = $query_parameters[ 'limit' ];
+			if ( ! is_array($query_parameters['limit'])) {
+				$limit_array = explode(',', (string) $query_parameters['limit']);
+			} else {
+				$limit_array = $query_parameters['limit'];
 			}
 			$sanitized_limit = array();
-			foreach( $limit_array as $key => $limit_part ) {
-				if( $this->_debug_mode && ( ! is_numeric( $limit_part ) || count( $sanitized_limit ) > 2 ) ) {
+			foreach ($limit_array as $key => $limit_part) {
+				if ($this->_debug_mode && ( ! is_numeric($limit_part) || count($sanitized_limit) > 2)) {
 					throw new \EE_Error(
 						sprintf(
-							__( 'An invalid limit filter was provided. It was: %s. If the EE4 JSON REST API weren\'t in debug mode, this message would not appear.', 'event_espresso' ),
-							json_encode( $query_parameters[ 'limit' ] )
+							__('An invalid limit filter was provided. It was: %s. If the EE4 JSON REST API weren\'t in debug mode, this message would not appear.', 'event_espresso'),
+							json_encode($query_parameters['limit'])
 						)
 					);
 				}
-				$sanitized_limit[] = (int)$limit_part;
+				$sanitized_limit[] = (int) $limit_part;
 			}
-			$model_query_params[ 'limit' ] = implode( ',', $sanitized_limit );
-		}else{
-			$model_query_params[ 'limit' ] = \EED_Core_Rest_Api::get_default_query_limit();
+			$model_query_params['limit'] = implode(',', $sanitized_limit);
+		} else {
+			$model_query_params['limit'] = \EED_Core_Rest_Api::get_default_query_limit();
 		}
-		if( isset( $query_parameters[ 'caps' ] ) ) {
-			$model_query_params[ 'caps' ] = $this->validate_context( $query_parameters[ 'caps' ] );
-		}else{
-			$model_query_params[ 'caps' ] = \EEM_Base::caps_read;
+		if (isset($query_parameters['caps'])) {
+			$model_query_params['caps'] = $this->validate_context($query_parameters['caps']);
+		} else {
+			$model_query_params['caps'] = \EEM_Base::caps_read;
 		}
-		return apply_filters( 'FHEE__Read__create_model_query_params', $model_query_params, $query_parameters, $model );
+		return apply_filters('FHEE__Read__create_model_query_params', $model_query_params, $query_parameters, $model);
 	}
 
 
@@ -890,13 +890,13 @@ 
 	 * @param array     $query_params sub-array from @see EEM_Base::get_all()
 	 * @return array
 	 */
-	public function prepare_rest_query_params_key_for_models( $model,  $query_params ) {
+	public function prepare_rest_query_params_key_for_models($model, $query_params) {
 		$model_ready_query_params = array();
-		foreach( $query_params as $key => $value ) {
-			if( is_array( $value ) ) {
-				$model_ready_query_params[ $key ] = $this->prepare_rest_query_params_key_for_models( $model, $value );
-			}else{
-				$model_ready_query_params[ $key ] = $value;
+		foreach ($query_params as $key => $value) {
+			if (is_array($value)) {
+				$model_ready_query_params[$key] = $this->prepare_rest_query_params_key_for_models($model, $value);
+			} else {
+				$model_ready_query_params[$key] = $value;
 			}
 		}
 		return $model_ready_query_params;
@@ -910,13 +910,13 @@ 
 	 * @param $query_params
 	 * @return array
 	 */
-	public function prepare_rest_query_params_values_for_models( $model, $query_params ) {
+	public function prepare_rest_query_params_values_for_models($model, $query_params) {
 		$model_ready_query_params = array();
-		foreach( $query_params as $key => $value ) {
-			if( is_array( $value ) ) {
-				$model_ready_query_params[ $key ] = $this->prepare_rest_query_params_values_for_models( $model, $value );
+		foreach ($query_params as $key => $value) {
+			if (is_array($value)) {
+				$model_ready_query_params[$key] = $this->prepare_rest_query_params_values_for_models($model, $value);
 			} else {
-				$model_ready_query_params[ $key ] = $value;
+				$model_ready_query_params[$key] = $value;
 			}
 		}
 		return $model_ready_query_params;
@@ -931,33 +931,33 @@ 
 	 * we only return strings starting with that and a period; if no prefix was specified
 	 * we return all items containing NO periods
 	 */
-	public function explode_and_get_items_prefixed_with( $string_to_explode, $prefix ) {
-		if( is_string( $string_to_explode ) ) {
-			$exploded_contents = explode( ',', $string_to_explode );
-		} else if( is_array( $string_to_explode ) ) {
+	public function explode_and_get_items_prefixed_with($string_to_explode, $prefix) {
+		if (is_string($string_to_explode)) {
+			$exploded_contents = explode(',', $string_to_explode);
+		} else if (is_array($string_to_explode)) {
 			$exploded_contents = $string_to_explode;
 		} else {
 			$exploded_contents = array();
 		}
 		//if the string was empty, we want an empty array
-		$exploded_contents = array_filter( $exploded_contents );
+		$exploded_contents = array_filter($exploded_contents);
 		$contents_with_prefix = array();
-		foreach( $exploded_contents as $item ) {
-			$item = trim( $item );
+		foreach ($exploded_contents as $item) {
+			$item = trim($item);
 			//if no prefix was provided, so we look for items with no "." in them
-			if( ! $prefix ) {
+			if ( ! $prefix) {
 				//does this item have a period?
-				if( strpos( $item, '.' ) === false ) {
+				if (strpos($item, '.') === false) {
 					//if not, then its what we're looking for
 					$contents_with_prefix[] = $item;
 				}
-			} else if( strpos( $item, $prefix . '.' ) === 0 ) {
+			} else if (strpos($item, $prefix.'.') === 0) {
 				//this item has the prefix and a period, grab it
 				$contents_with_prefix[] = substr(
 					$item,
-					strpos( $item, $prefix . '.' ) + strlen( $prefix . '.' )
+					strpos($item, $prefix.'.') + strlen($prefix.'.')
 					);
-			} else if( $item === $prefix ) {
+			} else if ($item === $prefix) {
 				//this item is JUST the prefix
 				//so let's grab everything after, which is a blank string
 				$contents_with_prefix[] = '';
@@ -980,33 +980,33 @@ 
 	 * the fields for that model, with the model's name removed from each.
 	 * If $include_string was blank or '*' returns an empty array
 	 */
-	public function extract_includes_for_this_model( $include_string, $model_name = null ) {
-		if( is_array( $include_string ) ) {
-			$include_string = implode( ',', $include_string );
+	public function extract_includes_for_this_model($include_string, $model_name = null) {
+		if (is_array($include_string)) {
+			$include_string = implode(',', $include_string);
 		}
-		if( $include_string === '*' || $include_string === '' ) {
+		if ($include_string === '*' || $include_string === '') {
 			return array();
 		}
-		$includes = explode( ',', $include_string );
+		$includes = explode(',', $include_string);
 		$extracted_fields_to_include = array();
-		if( $model_name ){
-			foreach( $includes as $field_to_include ) {
-				$field_to_include = trim( $field_to_include );
-				if( strpos( $field_to_include, $model_name . '.' ) === 0 ) {
+		if ($model_name) {
+			foreach ($includes as $field_to_include) {
+				$field_to_include = trim($field_to_include);
+				if (strpos($field_to_include, $model_name.'.') === 0) {
 					//found the model name at the exact start
-					$field_sans_model_name = str_replace( $model_name . '.', '', $field_to_include );
+					$field_sans_model_name = str_replace($model_name.'.', '', $field_to_include);
 					$extracted_fields_to_include[] = $field_sans_model_name;
-				}elseif( $field_to_include == $model_name ){
+				}elseif ($field_to_include == $model_name) {
 					$extracted_fields_to_include[] = '*';
 				}
 			}
-		}else{
+		} else {
 			//look for ones with no period
-			foreach( $includes as $field_to_include ) {
-				$field_to_include = trim( $field_to_include );
+			foreach ($includes as $field_to_include) {
+				$field_to_include = trim($field_to_include);
 				if (
-					strpos( $field_to_include, '.' ) === false
-					&& ! $this->get_model_version_info()->is_model_name_in_this_version( $field_to_include )
+					strpos($field_to_include, '.') === false
+					&& ! $this->get_model_version_info()->is_model_name_in_this_version($field_to_include)
 				) {
 					$extracted_fields_to_include[] = $field_to_include;
 				}

core/libraries/rest_api/Capabilities.php

Indentation +1 added lines, -1 removed lines

@@ -111,7 +111,7 @@
 		//we only care to do this for frontend reads and when the user can't edit the item
 		if (
 			$request_type !== \EEM_Base::caps_read
-		     || $model->exists(
+			 || $model->exists(
 				$model->alter_query_params_to_restrict_by_ID(
 					$primary_key_string,
 					array(

Spacing +17 added lines, -17 removed lines

@@ -1,8 +1,8 @@ 
 <?php
 namespace EventEspresso\core\libraries\rest_api;
 
-if ( ! defined( 'EVENT_ESPRESSO_VERSION' ) ) {
-	exit( 'No direct script access allowed' );
+if ( ! defined('EVENT_ESPRESSO_VERSION')) {
+	exit('No direct script access allowed');
 }
 
 
@@ -23,7 +23,7 @@ 
 	 * @param string    $model_context one of the return values from EEM_Base::valid_cap_contexts()
 	 * @return boolean
 	 */
-	public static function current_user_has_partial_access_to( $model, $model_context = \EEM_Base::caps_read ) {
+	public static function current_user_has_partial_access_to($model, $model_context = \EEM_Base::caps_read) {
 		if (
 			apply_filters(
 				'FHEE__Capabilities__current_user_has_partial_access_to__override_begin',
@@ -34,8 +34,8 @@ 
 		) {
 			return true;
 		}
-		foreach ( $model->caps_missing( $model_context ) as $capability_name => $restriction_obj ) {
-			if ( $restriction_obj instanceof \EE_Return_None_Where_Conditions ) {
+		foreach ($model->caps_missing($model_context) as $capability_name => $restriction_obj) {
+			if ($restriction_obj instanceof \EE_Return_None_Where_Conditions) {
 				return false;
 			}
 		}
@@ -62,8 +62,8 @@ 
 	 * @param string    $request_type one of the constants on WP_JSON_Server
 	 * @return array
 	 */
-	public static function get_missing_permissions( $model, $request_type = \EEM_Base::caps_read ) {
-		return $model->caps_missing( $request_type );
+	public static function get_missing_permissions($model, $request_type = \EEM_Base::caps_read) {
+		return $model->caps_missing($request_type);
 	}
 
 
@@ -76,8 +76,8 @@ 
 	 * @param string    $model_context one of the return values from EEM_Base::valid_cap_contexts()
 	 * @return string
 	 */
-	public static function get_missing_permissions_string( $model, $model_context = \EEM_Base::caps_read ) {
-		return implode( ',', array_keys( self::get_missing_permissions( $model, $model_context ) ) );
+	public static function get_missing_permissions_string($model, $model_context = \EEM_Base::caps_read) {
+		return implode(',', array_keys(self::get_missing_permissions($model, $model_context)));
 	}
 
 
@@ -103,9 +103,9 @@ 
 		//if they didn't provide the primary key string, we'll just hope we can figure it out
 		//from the entity (although it's preferred client code does it, because the entity might be missing
 		//necessary fields for creating the primary key string, or they could be named differently)
-		if ( $primary_key_string === null ) {
+		if ($primary_key_string === null) {
 			$primary_key_string = $model->get_index_primary_key_string(
-				$model->deduce_fields_n_values_from_cols_n_values( $entity )
+				$model->deduce_fields_n_values_from_cols_n_values($entity)
 			);
 		}
 		//we only care to do this for frontend reads and when the user can't edit the item
@@ -123,14 +123,14 @@ 
 		) {
 			return $entity;
 		}
-		foreach ( $model->field_settings() as $field_name => $field_obj ) {
+		foreach ($model->field_settings() as $field_name => $field_obj) {
 			if (
-				$model_version_info->field_has_rendered_format( $field_obj )
-				&& isset( $entity[ $field_name ] )
-				&& is_array( $entity[ $field_name ] )
-				&& isset( $entity[ $field_name ]['raw'] )
+				$model_version_info->field_has_rendered_format($field_obj)
+				&& isset($entity[$field_name])
+				&& is_array($entity[$field_name])
+				&& isset($entity[$field_name]['raw'])
 			) {
-				unset( $entity[ $field_name ]['raw'] );
+				unset($entity[$field_name]['raw']);
 			}
 		}
 		//theoretically we may want to filter out specific fields for specific models

core/helpers/EEH_Activation.helper.php

Doc Comments +3 added lines, -3 removed lines

@@ -600,7 +600,7 @@ 
 	 * @since  4.6.0
 	 * @global WPDB $wpdb
 	 *
-	 * @return mixed null|int WP_user ID or NULL
+	 * @return integer|null null|int WP_user ID or NULL
 	 */
 	public static function get_default_creator_id() {
 		global $wpdb;
@@ -759,7 +759,7 @@ 
 	 * @static
 	 * @deprecated instead use TableManager::dropTable()
 	 * @param string $table_name
-	 * @return bool | int
+	 * @return integer | int
 	 */
 	public static function delete_unused_db_table( $table_name ) {
 		return \EEH_Activation::getTableManager()->dropTable( $table_name );
@@ -775,7 +775,7 @@ 
 	 * @deprecated instead use TableManager::dropIndex()
 	 * @param string $table_name
 	 * @param string $index_name
-	 * @return bool | int
+	 * @return integer | int
 	 */
 	public static function drop_index( $table_name, $index_name ) {
 		return \EEH_Activation::getTableManager()->dropIndex( $table_name, $index_name );

Indentation +20 added lines, -20 removed lines

@@ -251,7 +251,7 @@ 
 			if ( is_array( $hooks_to_fire_at_time ) ) {
 				foreach ( $hooks_to_fire_at_time as $hook_name => $hook_actions ) {
 					if ( isset( $ee_cron_tasks_to_remove[ $hook_name ] )
-					     && is_array( $ee_cron_tasks_to_remove[ $hook_name ] )
+						 && is_array( $ee_cron_tasks_to_remove[ $hook_name ] )
 					) {
 						unset( $crons[ $timestamp ][ $hook_name ] );
 					}
@@ -736,13 +736,13 @@ 
 
 
 /**
-	 * delete_db_table_if_empty
-	 *
-	 * @access public
-	 * @static
-	 * @param string $table_name
-	 * @return bool | int
-	 */
+ * delete_db_table_if_empty
+ *
+ * @access public
+ * @static
+ * @param string $table_name
+ * @return bool | int
+ */
 	public static function delete_db_table_if_empty( $table_name ) {
 		if ( \EEH_Activation::getTableAnalysis()->tableIsEmpty( $table_name ) ) {
 			return \EEH_Activation::getTableManager()->dropTable( $table_name );
@@ -1103,14 +1103,14 @@ 
 							$QSG_ID = reset( $id_col );
 						} else {
 							//ok so we didn't find it in the db either?? that's weird because we should have inserted it at the start of this method
-                                                        EE_Log::instance()->log(
-                                                                __FILE__,
-                                                                __FUNCTION__,
-                                                                sprintf(
-                                                                        __( 'Could not associate question %1$s to a question group because no system question group existed', 'event_espresso'),
-                                                                        $QST_ID ),
-                                                                'error' );
-                                                        continue;
+														EE_Log::instance()->log(
+																__FILE__,
+																__FUNCTION__,
+																sprintf(
+																		__( 'Could not associate question %1$s to a question group because no system question group existed', 'event_espresso'),
+																		$QST_ID ),
+																'error' );
+														continue;
 						}
 					}
 
@@ -1118,8 +1118,8 @@ 
 					$wpdb->insert(
 						\EEH_Activation::getTableAnalysis()->ensureTableNameHasPrefix( 'esp_question_group_question' ),
 						array( 'QSG_ID'    => $QSG_ID,
-						       'QST_ID'    => $QST_ID,
-						       'QGQ_order' => ( $QSG_ID === 1 ) ? $order_for_group_1++ : $order_for_group_2++
+							   'QST_ID'    => $QST_ID,
+							   'QGQ_order' => ( $QSG_ID === 1 ) ? $order_for_group_1++ : $order_for_group_2++
 						),
 						array( '%d', '%d', '%d' )
 					);
@@ -1663,8 +1663,8 @@ 
 				}
 			}
 		}
-                //also, let's make sure the "ee_config_option_names" wp option stays out by removing the action that adds it
-                remove_action( 'shutdown', array( EE_Config::instance(), 'shutdown' ), 10 );
+				//also, let's make sure the "ee_config_option_names" wp option stays out by removing the action that adds it
+				remove_action( 'shutdown', array( EE_Config::instance(), 'shutdown' ), 10 );
 
 		if ( $remove_all && $espresso_db_update = get_option( 'espresso_db_update' )) {
 			$db_update_sans_ee4 = array();

Spacing +318 added lines, -318 removed lines

@@ -1,4 +1,4 @@ 
-<?php if ( ! defined( 'EVENT_ESPRESSO_VERSION')) {exit('No direct script access allowed');}
+<?php if ( ! defined('EVENT_ESPRESSO_VERSION')) {exit('No direct script access allowed'); }
 /**
  * EEH_Activation Helper
  *
@@ -54,8 +54,8 @@ 
 	 * @return \EventEspresso\core\services\database\TableAnalysis
 	 */
 	public static function getTableAnalysis() {
-		if ( ! self::$table_analysis instanceof \EventEspresso\core\services\database\TableAnalysis ) {
-			self::$table_analysis = EE_Registry::instance()->create( 'TableAnalysis', array(), true );
+		if ( ! self::$table_analysis instanceof \EventEspresso\core\services\database\TableAnalysis) {
+			self::$table_analysis = EE_Registry::instance()->create('TableAnalysis', array(), true);
 		}
 		return self::$table_analysis;
 	}
@@ -66,8 +66,8 @@ 
 	 * @return \EventEspresso\core\services\database\TableManager
 	 */
 	public static function getTableManager() {
-		if ( ! self::$table_manager instanceof \EventEspresso\core\services\database\TableManager ) {
-			self::$table_manager = EE_Registry::instance()->create( 'TableManager', array(), true );
+		if ( ! self::$table_manager instanceof \EventEspresso\core\services\database\TableManager) {
+			self::$table_manager = EE_Registry::instance()->create('TableManager', array(), true);
 		}
 		return self::$table_manager;
 	}
@@ -82,8 +82,8 @@ 
 	 * @param $table_name
 	 * @return string
 	 */
-	public static function ensure_table_name_has_prefix( $table_name ) {
-		return \EEH_Activation::getTableAnalysis()->ensureTableNameHasPrefix( $table_name );
+	public static function ensure_table_name_has_prefix($table_name) {
+		return \EEH_Activation::getTableAnalysis()->ensureTableNameHasPrefix($table_name);
 	}
 
 
@@ -111,7 +111,7 @@ 
 	 * @return boolean success, whether the database and folders are setup properly
 	 * @throws \EE_Error
 	 */
-	public static function initialize_db_and_folders(){
+	public static function initialize_db_and_folders() {
 		$good_filesystem = EEH_Activation::create_upload_directories();
 		$good_db = EEH_Activation::create_database_tables();
 		return $good_filesystem && $good_db;
@@ -127,9 +127,9 @@ 
 	 *
 	 * @throws \EE_Error
 	 */
-	public static function initialize_db_content(){
+	public static function initialize_db_content() {
 		//let's avoid doing all this logic repeatedly, especially when addons are requesting it
-		if( EEH_Activation::$_initialized_db_content_already_in_this_request ) {
+		if (EEH_Activation::$_initialized_db_content_already_in_this_request) {
 			return;
 		}
 		EEH_Activation::$_initialized_db_content_already_in_this_request = true;
@@ -146,9 +146,9 @@ 
 		EEH_Activation::remove_cron_tasks();
 		EEH_Activation::create_cron_tasks();
 		// remove all TXN locks since that is being done via extra meta now
-		delete_option( 'ee_locked_transactions' );
+		delete_option('ee_locked_transactions');
 		//also, check for CAF default db content
-		do_action( 'AHEE__EEH_Activation__initialize_db_content' );
+		do_action('AHEE__EEH_Activation__initialize_db_content');
 		//also: EEM_Gateways::load_all_gateways() outputs a lot of success messages
 		//which users really won't care about on initial activation
 		EE_Error::overwrite_success();
@@ -168,7 +168,7 @@ 
 	 * @return array
 	 * @throws \EE_Error
 	 */
-	public static function get_cron_tasks( $which_to_include ) {
+	public static function get_cron_tasks($which_to_include) {
 		$cron_tasks = apply_filters(
 			'FHEE__EEH_Activation__get_cron_tasks',
 			array(
@@ -177,16 +177,16 @@ 
 				'AHEE__EE_Cron_Tasks__update_transaction_with_payment' => EEH_Activation::cron_task_no_longer_in_use, //there may have been a bug which prevented from these cron tasks from getting unscheduled, so we might want to remove these for a few updates
 			)
 		);
-		if ( $which_to_include === 'old' ) {
+		if ($which_to_include === 'old') {
 			$cron_tasks = array_filter(
 				$cron_tasks,
-				function ( $value ) {
+				function($value) {
 					return $value === EEH_Activation::cron_task_no_longer_in_use;
 				}
 			);
-		} elseif ( $which_to_include === 'current' ) {
-			$cron_tasks = array_filter( $cron_tasks );
-		} elseif ( WP_DEBUG && $which_to_include !== 'all' ) {
+		} elseif ($which_to_include === 'current') {
+			$cron_tasks = array_filter($cron_tasks);
+		} elseif (WP_DEBUG && $which_to_include !== 'all') {
 			throw new EE_Error(
 				sprintf(
 					__(
@@ -209,9 +209,9 @@ 
 	 */
 	public static function create_cron_tasks() {
 
-		foreach( EEH_Activation::get_cron_tasks( 'current' ) as $hook_name => $frequency ) {
-			if( ! wp_next_scheduled( $hook_name ) ) {
-				wp_schedule_event( time(), $frequency, $hook_name );
+		foreach (EEH_Activation::get_cron_tasks('current') as $hook_name => $frequency) {
+			if ( ! wp_next_scheduled($hook_name)) {
+				wp_schedule_event(time(), $frequency, $hook_name);
 			}
 		}
 
@@ -225,10 +225,10 @@ 
 	 * @param boolean $remove_all whether to only remove the old ones, or remove absolutely ALL the EE ones
 	 * @throws \EE_Error
 	 */
-	public static function remove_cron_tasks( $remove_all = true ) {
+	public static function remove_cron_tasks($remove_all = true) {
 		$cron_tasks_to_remove = $remove_all ? 'all' : 'old';
 		$crons = _get_cron_array();
-		$crons = is_array( $crons ) ? $crons : array();
+		$crons = is_array($crons) ? $crons : array();
 		/* reminder of what $crons look like:
 		 * Top-level keys are timestamps, and their values are arrays.
 		 * The 2nd level arrays have keys with each of the cron task hook names to run at that time
@@ -246,23 +246,23 @@ 
 		 *					...
 		 *      ...
 		 */
-		$ee_cron_tasks_to_remove = EEH_Activation::get_cron_tasks( $cron_tasks_to_remove );
-		foreach ( $crons as $timestamp => $hooks_to_fire_at_time ) {
-			if ( is_array( $hooks_to_fire_at_time ) ) {
-				foreach ( $hooks_to_fire_at_time as $hook_name => $hook_actions ) {
-					if ( isset( $ee_cron_tasks_to_remove[ $hook_name ] )
-					     && is_array( $ee_cron_tasks_to_remove[ $hook_name ] )
+		$ee_cron_tasks_to_remove = EEH_Activation::get_cron_tasks($cron_tasks_to_remove);
+		foreach ($crons as $timestamp => $hooks_to_fire_at_time) {
+			if (is_array($hooks_to_fire_at_time)) {
+				foreach ($hooks_to_fire_at_time as $hook_name => $hook_actions) {
+					if (isset($ee_cron_tasks_to_remove[$hook_name])
+					     && is_array($ee_cron_tasks_to_remove[$hook_name])
 					) {
-						unset( $crons[ $timestamp ][ $hook_name ] );
+						unset($crons[$timestamp][$hook_name]);
 					}
 				}
 				//also take care of any empty cron timestamps.
-				if ( empty( $hooks_to_fire_at_time ) ) {
-					unset( $crons[ $timestamp ] );
+				if (empty($hooks_to_fire_at_time)) {
+					unset($crons[$timestamp]);
 				}
 			}
 		}
-		_set_cron_array( $crons );
+		_set_cron_array($crons);
 	}
 
 
@@ -277,7 +277,7 @@ 
 	 */
 	public static function CPT_initialization() {
 		// register Custom Post Types
-		EE_Registry::instance()->load_core( 'Register_CPTs' );
+		EE_Registry::instance()->load_core('Register_CPTs');
 		flush_rewrite_rules();
 	}
 
@@ -295,8 +295,8 @@ 
 	 * 	@return void
 	 */
 	public static function reset_and_update_config() {
-		do_action( 'AHEE__EE_Config___load_core_config__start', array( 'EEH_Activation', 'load_calendar_config' ) );
-		add_filter( 'FHEE__EE_Config___load_core_config__config_settings', array( 'EEH_Activation', 'migrate_old_config_data' ), 10, 3 );
+		do_action('AHEE__EE_Config___load_core_config__start', array('EEH_Activation', 'load_calendar_config'));
+		add_filter('FHEE__EE_Config___load_core_config__config_settings', array('EEH_Activation', 'migrate_old_config_data'), 10, 3);
 		//EE_Config::reset();
 	}
 
@@ -309,28 +309,28 @@ 
 	 */
 	public static function load_calendar_config() {
 		// grab array of all plugin folders and loop thru it
-		$plugins = glob( WP_PLUGIN_DIR . DS . '*', GLOB_ONLYDIR );
-		if ( empty( $plugins ) ) {
+		$plugins = glob(WP_PLUGIN_DIR.DS.'*', GLOB_ONLYDIR);
+		if (empty($plugins)) {
 			return;
 		}
-		foreach ( $plugins as $plugin_path ) {
+		foreach ($plugins as $plugin_path) {
 			// grab plugin folder name from path
-			$plugin = basename( $plugin_path );
+			$plugin = basename($plugin_path);
 			// drill down to Espresso plugins
 			// then to calendar related plugins
 			if (
-				strpos( $plugin, 'espresso' ) !== FALSE
-				|| strpos( $plugin, 'Espresso' ) !== FALSE
-				|| strpos( $plugin, 'ee4' ) !== FALSE
-				|| strpos( $plugin, 'EE4' ) !== FALSE
-				|| strpos( $plugin, 'calendar' ) !== false
+				strpos($plugin, 'espresso') !== FALSE
+				|| strpos($plugin, 'Espresso') !== FALSE
+				|| strpos($plugin, 'ee4') !== FALSE
+				|| strpos($plugin, 'EE4') !== FALSE
+				|| strpos($plugin, 'calendar') !== false
 			) {
 				// this is what we are looking for
-				$calendar_config = $plugin_path . DS . 'EE_Calendar_Config.php';
+				$calendar_config = $plugin_path.DS.'EE_Calendar_Config.php';
 				// does it exist in this folder ?
-				if ( is_readable( $calendar_config )) {
+				if (is_readable($calendar_config)) {
 					// YEAH! let's load it
-					require_once( $calendar_config );
+					require_once($calendar_config);
 				}
 			}
 		}
@@ -346,21 +346,21 @@ 
 	 * @param \EE_Config     $EE_Config
 	 * @return \stdClass
 	 */
-	public static function migrate_old_config_data( $settings = array(), $config = '', EE_Config $EE_Config ) {
-		$convert_from_array = array( 'addons' );
+	public static function migrate_old_config_data($settings = array(), $config = '', EE_Config $EE_Config) {
+		$convert_from_array = array('addons');
 		// in case old settings were saved as an array
-		if ( is_array( $settings ) && in_array( $config, $convert_from_array )) {
+		if (is_array($settings) && in_array($config, $convert_from_array)) {
 			// convert existing settings to an object
 			$config_array = $settings;
 			$settings = new stdClass();
-			foreach ( $config_array as $key => $value ){
-				if ( $key === 'calendar' && class_exists( 'EE_Calendar_Config' )) {
-					$EE_Config->set_config( 'addons', 'EE_Calendar', 'EE_Calendar_Config', $value );
+			foreach ($config_array as $key => $value) {
+				if ($key === 'calendar' && class_exists('EE_Calendar_Config')) {
+					$EE_Config->set_config('addons', 'EE_Calendar', 'EE_Calendar_Config', $value);
 				} else {
 					$settings->{$key} = $value;
 				}
 			}
-			add_filter( 'FHEE__EE_Config___load_core_config__update_espresso_config', '__return_true' );
+			add_filter('FHEE__EE_Config___load_core_config__update_espresso_config', '__return_true');
 		}
 		return $settings;
 	}
@@ -376,8 +376,8 @@ 
 	 */
 	public static function deactivate_event_espresso() {
 		// check permissions
-		if ( current_user_can( 'activate_plugins' )) {
-			deactivate_plugins( EE_PLUGIN_BASENAME, TRUE );
+		if (current_user_can('activate_plugins')) {
+			deactivate_plugins(EE_PLUGIN_BASENAME, TRUE);
 		}
 	}
 
@@ -399,25 +399,25 @@ 
 		$critical_pages = array(
 			array(
 				'id' =>'reg_page_id',
-				'name' => __( 'Registration Checkout', 'event_espresso' ),
+				'name' => __('Registration Checkout', 'event_espresso'),
 				'post' => NULL,
 				'code' => 'ESPRESSO_CHECKOUT'
 			),
 			array(
 				'id' => 'txn_page_id',
-				'name' => __( 'Transactions', 'event_espresso' ),
+				'name' => __('Transactions', 'event_espresso'),
 				'post' => NULL,
 				'code' => 'ESPRESSO_TXN_PAGE'
 			),
 			array(
 				'id' => 'thank_you_page_id',
-				'name' => __( 'Thank You', 'event_espresso' ),
+				'name' => __('Thank You', 'event_espresso'),
 				'post' => NULL,
 				'code' => 'ESPRESSO_THANK_YOU'
 			),
 			array(
 				'id' => 'cancel_page_id',
-				'name' => __( 'Registration Cancelled', 'event_espresso' ),
+				'name' => __('Registration Cancelled', 'event_espresso'),
 				'post' => NULL,
 				'code' => 'ESPRESSO_CANCELLED'
 			),
@@ -425,62 +425,62 @@ 
 
 		$EE_Core_Config = EE_Registry::instance()->CFG->core;
 
-		foreach ( $critical_pages as $critical_page ) {
+		foreach ($critical_pages as $critical_page) {
 			// is critical page ID set in config ?
-			if ( $EE_Core_Config->{$critical_page[ 'id' ]} !== FALSE ) {
+			if ($EE_Core_Config->{$critical_page['id']} !== FALSE) {
 				// attempt to find post by ID
-				$critical_page['post'] = get_post( $EE_Core_Config->{$critical_page[ 'id' ]} );
+				$critical_page['post'] = get_post($EE_Core_Config->{$critical_page['id']} );
 			}
 			// no dice?
-			if ( $critical_page['post'] === null ) {
+			if ($critical_page['post'] === null) {
 				// attempt to find post by title
-				$critical_page['post'] = self::get_page_by_ee_shortcode( $critical_page['code'] );
+				$critical_page['post'] = self::get_page_by_ee_shortcode($critical_page['code']);
 				// still nothing?
-				if ( $critical_page['post'] === null ) {
-					$critical_page = EEH_Activation::create_critical_page( $critical_page );
+				if ($critical_page['post'] === null) {
+					$critical_page = EEH_Activation::create_critical_page($critical_page);
 					// REALLY? Still nothing ??!?!?
-					if ( $critical_page['post'] === null ) {
-						$msg = __( 'The Event Espresso critical page configuration settings could not be updated.', 'event_espresso' );
-						EE_Error::add_error( $msg, __FILE__, __FUNCTION__, __LINE__ );
+					if ($critical_page['post'] === null) {
+						$msg = __('The Event Espresso critical page configuration settings could not be updated.', 'event_espresso');
+						EE_Error::add_error($msg, __FILE__, __FUNCTION__, __LINE__);
 						break;
 					}
 				}
 			}
 			// track post_shortcodes
-			if ( $critical_page['post'] ) {
-				EEH_Activation::_track_critical_page_post_shortcodes( $critical_page );
+			if ($critical_page['post']) {
+				EEH_Activation::_track_critical_page_post_shortcodes($critical_page);
 			}
 			// check that Post ID matches critical page ID in config
 			if (
-				isset( $critical_page['post']->ID )
-				&& $critical_page['post']->ID !== $EE_Core_Config->{$critical_page[ 'id' ]}
+				isset($critical_page['post']->ID)
+				&& $critical_page['post']->ID !== $EE_Core_Config->{$critical_page['id']}
 			) {
 				//update Config with post ID
-				$EE_Core_Config->{$critical_page[ 'id' ]} = $critical_page['post']->ID;
-				if ( ! EE_Config::instance()->update_espresso_config( FALSE, FALSE ) ) {
-					$msg = __( 'The Event Espresso critical page configuration settings could not be updated.', 'event_espresso' );
-					EE_Error::add_error( $msg, __FILE__, __FUNCTION__, __LINE__ );
+				$EE_Core_Config->{$critical_page['id']} = $critical_page['post']->ID;
+				if ( ! EE_Config::instance()->update_espresso_config(FALSE, FALSE)) {
+					$msg = __('The Event Espresso critical page configuration settings could not be updated.', 'event_espresso');
+					EE_Error::add_error($msg, __FILE__, __FUNCTION__, __LINE__);
 				}
 			}
 
 			$critical_page_problem =
-				! isset( $critical_page['post']->post_status )
+				! isset($critical_page['post']->post_status)
 				|| $critical_page['post']->post_status !== 'publish'
-				|| strpos( $critical_page['post']->post_content, $critical_page['code'] ) === FALSE
+				|| strpos($critical_page['post']->post_content, $critical_page['code']) === FALSE
 					? TRUE
 					: $critical_page_problem;
 
 		}
 
-		if ( $critical_page_problem ) {
+		if ($critical_page_problem) {
 			$msg = sprintf(
-				__('A potential issue has been detected with one or more of your Event Espresso pages. Go to %s to view your Event Espresso pages.', 'event_espresso' ),
-				'<a href="' . admin_url('admin.php?page=espresso_general_settings&action=critical_pages') . '">' . __('Event Espresso Critical Pages Settings', 'event_espresso') . '</a>'
+				__('A potential issue has been detected with one or more of your Event Espresso pages. Go to %s to view your Event Espresso pages.', 'event_espresso'),
+				'<a href="'.admin_url('admin.php?page=espresso_general_settings&action=critical_pages').'">'.__('Event Espresso Critical Pages Settings', 'event_espresso').'</a>'
 			);
-			EE_Error::add_persistent_admin_notice( 'critical_page_problem', $msg );
+			EE_Error::add_persistent_admin_notice('critical_page_problem', $msg);
 		}
-		if ( EE_Error::has_notices() ) {
-			EE_Error::get_notices( FALSE, TRUE, TRUE );
+		if (EE_Error::has_notices()) {
+			EE_Error::get_notices(FALSE, TRUE, TRUE);
 		}
 	}
 
@@ -492,13 +492,13 @@ 
 	 * parameter to the shortcode
 	 * @return WP_Post or NULl
 	 */
-	public static function get_page_by_ee_shortcode($ee_shortcode){
+	public static function get_page_by_ee_shortcode($ee_shortcode) {
 		global $wpdb;
 		$shortcode_and_opening_bracket = '['.$ee_shortcode;
 		$post_id = $wpdb->get_var("SELECT ID FROM {$wpdb->posts} WHERE post_content LIKE '%$shortcode_and_opening_bracket%' LIMIT 1");
-		if($post_id){
+		if ($post_id) {
 			return get_post($post_id);
-		}else{
+		} else {
 			return NULL;
 		}
 
@@ -515,32 +515,32 @@ 
 	 * @param array $critical_page
 	 * @return array
 	 */
-	public static function create_critical_page( $critical_page ) {
+	public static function create_critical_page($critical_page) {
 
 		$post_args = array(
 			'post_title' => $critical_page['name'],
 			'post_status' => 'publish',
 			'post_type' => 'page',
 			'comment_status' => 'closed',
-			'post_content' => '[' . $critical_page['code'] . ']'
+			'post_content' => '['.$critical_page['code'].']'
 		);
 
-		$post_id = wp_insert_post( $post_args );
-		if ( ! $post_id ) {
+		$post_id = wp_insert_post($post_args);
+		if ( ! $post_id) {
 			$msg = sprintf(
-				__( 'The Event Espresso  critical page entitled "%s" could not be created.', 'event_espresso' ),
+				__('The Event Espresso  critical page entitled "%s" could not be created.', 'event_espresso'),
 				$critical_page['name']
 			);
-			EE_Error::add_error( $msg, __FILE__, __FUNCTION__, __LINE__ );
+			EE_Error::add_error($msg, __FILE__, __FUNCTION__, __LINE__);
 			return $critical_page;
 		}
 		// get newly created post's details
-		if ( ! $critical_page['post'] = get_post( $post_id )) {
+		if ( ! $critical_page['post'] = get_post($post_id)) {
 			$msg = sprintf(
-				__( 'The Event Espresso critical page entitled "%s" could not be retrieved.', 'event_espresso' ),
+				__('The Event Espresso critical page entitled "%s" could not be retrieved.', 'event_espresso'),
 				$critical_page['name']
 			);
-			EE_Error::add_error( $msg, __FILE__, __FUNCTION__, __LINE__ );
+			EE_Error::add_error($msg, __FILE__, __FUNCTION__, __LINE__);
 		}
 
 		return $critical_page;
@@ -559,35 +559,35 @@ 
 	 * @param array $critical_page
 	 * @return void
 	 */
-	private static function _track_critical_page_post_shortcodes( $critical_page = array() ) {
+	private static function _track_critical_page_post_shortcodes($critical_page = array()) {
 		// check the goods
-		if ( ! $critical_page['post'] instanceof WP_Post ) {
+		if ( ! $critical_page['post'] instanceof WP_Post) {
 			$msg = sprintf(
-				__( 'The Event Espresso critical page shortcode for the page %s can not be tracked because it is not a WP_Post object.', 'event_espresso' ),
+				__('The Event Espresso critical page shortcode for the page %s can not be tracked because it is not a WP_Post object.', 'event_espresso'),
 				$critical_page['name']
 			);
-			EE_Error::add_error( $msg, __FILE__, __FUNCTION__, __LINE__ );
+			EE_Error::add_error($msg, __FILE__, __FUNCTION__, __LINE__);
 			return;
 		}
 		$EE_Core_Config = EE_Registry::instance()->CFG->core;
 		// map shortcode to post
-		$EE_Core_Config->post_shortcodes[ $critical_page['post']->post_name ][ $critical_page['code'] ] = $critical_page['post']->ID;
+		$EE_Core_Config->post_shortcodes[$critical_page['post']->post_name][$critical_page['code']] = $critical_page['post']->ID;
 		// and make sure it's NOT added to the WP "Posts Page"
 		// name of the WP Posts Page
 		$posts_page = EE_Config::get_page_for_posts();
-		if ( isset( $EE_Core_Config->post_shortcodes[ $posts_page ] )) {
-			unset( $EE_Core_Config->post_shortcodes[ $posts_page ][ $critical_page['code'] ] );
+		if (isset($EE_Core_Config->post_shortcodes[$posts_page])) {
+			unset($EE_Core_Config->post_shortcodes[$posts_page][$critical_page['code']]);
 		}
-		if ( $posts_page !== 'posts' && isset( $EE_Core_Config->post_shortcodes['posts'] )) {
-			unset( $EE_Core_Config->post_shortcodes['posts'][ $critical_page['code'] ] );
+		if ($posts_page !== 'posts' && isset($EE_Core_Config->post_shortcodes['posts'])) {
+			unset($EE_Core_Config->post_shortcodes['posts'][$critical_page['code']]);
 		}
 		// update post_shortcode CFG
-		if ( ! EE_Config::instance()->update_espresso_config( FALSE, FALSE )) {
+		if ( ! EE_Config::instance()->update_espresso_config(FALSE, FALSE)) {
 			$msg = sprintf(
-				__( 'The Event Espresso critical page shortcode for the %s page could not be configured properly.', 'event_espresso' ),
+				__('The Event Espresso critical page shortcode for the %s page could not be configured properly.', 'event_espresso'),
 				$critical_page['name']
 			);
-			EE_Error::add_error( $msg, __FILE__, __FUNCTION__, __LINE__ );
+			EE_Error::add_error($msg, __FILE__, __FUNCTION__, __LINE__);
 		}
 	}
 
@@ -605,24 +605,24 @@ 
 	public static function get_default_creator_id() {
 		global $wpdb;
 
-		if ( ! empty( self::$_default_creator_id ) ) {
+		if ( ! empty(self::$_default_creator_id)) {
 			return self::$_default_creator_id;
 		}/**/
 
-		$role_to_check = apply_filters( 'FHEE__EEH_Activation__get_default_creator_id__role_to_check', 'administrator' );
+		$role_to_check = apply_filters('FHEE__EEH_Activation__get_default_creator_id__role_to_check', 'administrator');
 
 		//let's allow pre_filtering for early exits by alternative methods for getting id.  We check for truthy result and if so then exit early.
-		$pre_filtered_id = apply_filters( 'FHEE__EEH_Activation__get_default_creator_id__pre_filtered_id', false, $role_to_check );
-		if ( $pre_filtered_id !== false ) {
+		$pre_filtered_id = apply_filters('FHEE__EEH_Activation__get_default_creator_id__pre_filtered_id', false, $role_to_check);
+		if ($pre_filtered_id !== false) {
 			return (int) $pre_filtered_id;
 		}
 
-		$capabilities_key = \EEH_Activation::getTableAnalysis()->ensureTableNameHasPrefix( 'capabilities' );
-		$query = $wpdb->prepare( "SELECT user_id FROM $wpdb->usermeta WHERE meta_key = '$capabilities_key' AND meta_value LIKE %s ORDER BY user_id ASC LIMIT 0,1", '%' . $role_to_check . '%' );
-		$user_id = $wpdb->get_var( $query );
-		 $user_id = apply_filters( 'FHEE__EEH_Activation_Helper__get_default_creator_id__user_id', $user_id );
-		 if ( $user_id && (int)$user_id ) {
-		 	self::$_default_creator_id = (int)$user_id;
+		$capabilities_key = \EEH_Activation::getTableAnalysis()->ensureTableNameHasPrefix('capabilities');
+		$query = $wpdb->prepare("SELECT user_id FROM $wpdb->usermeta WHERE meta_key = '$capabilities_key' AND meta_value LIKE %s ORDER BY user_id ASC LIMIT 0,1", '%'.$role_to_check.'%');
+		$user_id = $wpdb->get_var($query);
+		 $user_id = apply_filters('FHEE__EEH_Activation_Helper__get_default_creator_id__user_id', $user_id);
+		 if ($user_id && (int) $user_id) {
+		 	self::$_default_creator_id = (int) $user_id;
 		 	return self::$_default_creator_id;
 		 } else {
 		 	return NULL;
@@ -651,28 +651,28 @@ 
 	 * 	@return void
 	 * @throws EE_Error if there are database errors
 	 */
-	public static function create_table( $table_name, $sql, $engine = 'ENGINE=MyISAM ', $drop_pre_existing_table = false ) {
-		if( apply_filters( 'FHEE__EEH_Activation__create_table__short_circuit', FALSE, $table_name, $sql ) ){
+	public static function create_table($table_name, $sql, $engine = 'ENGINE=MyISAM ', $drop_pre_existing_table = false) {
+		if (apply_filters('FHEE__EEH_Activation__create_table__short_circuit', FALSE, $table_name, $sql)) {
 			return;
 		}
-		do_action( 'AHEE_log', __FILE__, __FUNCTION__, '' );
-		if ( ! function_exists( 'dbDelta' )) {
-			require_once( ABSPATH . 'wp-admin/includes/upgrade.php' );
+		do_action('AHEE_log', __FILE__, __FUNCTION__, '');
+		if ( ! function_exists('dbDelta')) {
+			require_once(ABSPATH.'wp-admin/includes/upgrade.php');
 		}
 		$tableAnalysis = \EEH_Activation::getTableAnalysis();
-		$wp_table_name = $tableAnalysis->ensureTableNameHasPrefix( $table_name );
+		$wp_table_name = $tableAnalysis->ensureTableNameHasPrefix($table_name);
 		// do we need to first delete an existing version of this table ?
-		if ( $drop_pre_existing_table && $tableAnalysis->tableExists( $wp_table_name ) ){
+		if ($drop_pre_existing_table && $tableAnalysis->tableExists($wp_table_name)) {
 			// ok, delete the table... but ONLY if it's empty
-			$deleted_safely = EEH_Activation::delete_db_table_if_empty( $wp_table_name );
+			$deleted_safely = EEH_Activation::delete_db_table_if_empty($wp_table_name);
 			// table is NOT empty, are you SURE you want to delete this table ???
-			if ( ! $deleted_safely && defined( 'EE_DROP_BAD_TABLES' ) && EE_DROP_BAD_TABLES ){
-				\EEH_Activation::getTableManager()->dropTable( $wp_table_name );
-			} else if ( ! $deleted_safely ) {
+			if ( ! $deleted_safely && defined('EE_DROP_BAD_TABLES') && EE_DROP_BAD_TABLES) {
+				\EEH_Activation::getTableManager()->dropTable($wp_table_name);
+			} else if ( ! $deleted_safely) {
 				// so we should be more cautious rather than just dropping tables so easily
 				EE_Error::add_persistent_admin_notice(
-						'bad_table_' . $wp_table_name . '_detected',
-						sprintf( __( 'Database table %1$s exists when it shouldn\'t, and may contain erroneous data. If you have previously restored your database from a backup that didn\'t remove the old tables, then we recommend adding %2$s to your %3$s file then restore to that backup again. This will clear out the invalid data from %1$s. Afterwards you should undo that change from your %3$s file. %4$sIf you cannot edit %3$s, you should remove the data from %1$s manually then restore to the backup again.', 'event_espresso' ),
+						'bad_table_'.$wp_table_name.'_detected',
+						sprintf(__('Database table %1$s exists when it shouldn\'t, and may contain erroneous data. If you have previously restored your database from a backup that didn\'t remove the old tables, then we recommend adding %2$s to your %3$s file then restore to that backup again. This will clear out the invalid data from %1$s. Afterwards you should undo that change from your %3$s file. %4$sIf you cannot edit %3$s, you should remove the data from %1$s manually then restore to the backup again.', 'event_espresso'),
 								$wp_table_name,
 								"<pre>define( 'EE_DROP_BAD_TABLES', TRUE );</pre>",
 								'<b>wp-config.php</b>',
@@ -680,8 +680,8 @@ 
 								TRUE );
 			}
 		}
-		$engine = str_replace( 'ENGINE=', '', $engine );
-		\EEH_Activation::getTableManager()->createTable( $table_name, $sql, $engine );
+		$engine = str_replace('ENGINE=', '', $engine);
+		\EEH_Activation::getTableManager()->createTable($table_name, $sql, $engine);
 	}
 
 
@@ -699,8 +699,8 @@ 
 	 *                            'VARCHAR(10)'
 	 * @return bool|int
 	 */
-	public static function add_column_if_it_doesnt_exist($table_name,$column_name,$column_info='INT UNSIGNED NOT NULL'){
-		return \EEH_Activation::getTableManager()->addColumn( $table_name, $column_name, $column_info );
+	public static function add_column_if_it_doesnt_exist($table_name, $column_name, $column_info = 'INT UNSIGNED NOT NULL') {
+		return \EEH_Activation::getTableManager()->addColumn($table_name, $column_name, $column_info);
 	}
 
 
@@ -716,8 +716,8 @@ 
 	 * @param string $table_name, without prefixed $wpdb->prefix
 	 * @return array of database column names
 	 */
-	public static function get_fields_on_table( $table_name = NULL ) {
-		return \EEH_Activation::getTableManager()->getTableColumns( $table_name );
+	public static function get_fields_on_table($table_name = NULL) {
+		return \EEH_Activation::getTableManager()->getTableColumns($table_name);
 	}
 
 
@@ -731,8 +731,8 @@ 
 	 * @param string $table_name
 	 * @return bool
 	 */
-	public static function db_table_is_empty( $table_name ) {
-		return \EEH_Activation::getTableAnalysis()->tableIsEmpty( $table_name );
+	public static function db_table_is_empty($table_name) {
+		return \EEH_Activation::getTableAnalysis()->tableIsEmpty($table_name);
 }
 
 
@@ -745,9 +745,9 @@ 
 	 * @param string $table_name
 	 * @return bool | int
 	 */
-	public static function delete_db_table_if_empty( $table_name ) {
-		if ( \EEH_Activation::getTableAnalysis()->tableIsEmpty( $table_name ) ) {
-			return \EEH_Activation::getTableManager()->dropTable( $table_name );
+	public static function delete_db_table_if_empty($table_name) {
+		if (\EEH_Activation::getTableAnalysis()->tableIsEmpty($table_name)) {
+			return \EEH_Activation::getTableManager()->dropTable($table_name);
 		}
 		return false;
 	}
@@ -763,8 +763,8 @@ 
 	 * @param string $table_name
 	 * @return bool | int
 	 */
-	public static function delete_unused_db_table( $table_name ) {
-		return \EEH_Activation::getTableManager()->dropTable( $table_name );
+	public static function delete_unused_db_table($table_name) {
+		return \EEH_Activation::getTableManager()->dropTable($table_name);
 	}
 
 
@@ -779,8 +779,8 @@ 
 	 * @param string $index_name
 	 * @return bool | int
 	 */
-	public static function drop_index( $table_name, $index_name ) {
-		return \EEH_Activation::getTableManager()->dropIndex( $table_name, $index_name );
+	public static function drop_index($table_name, $index_name) {
+		return \EEH_Activation::getTableManager()->dropIndex($table_name, $index_name);
 	}
 
 
@@ -794,27 +794,27 @@ 
 	 * @return boolean success (whether database is setup properly or not)
 	 */
 	public static function create_database_tables() {
-		EE_Registry::instance()->load_core( 'Data_Migration_Manager' );
+		EE_Registry::instance()->load_core('Data_Migration_Manager');
 		//find the migration script that sets the database to be compatible with the code
 		$dms_name = EE_Data_Migration_Manager::instance()->get_most_up_to_date_dms();
-		if( $dms_name ){
-			$current_data_migration_script = EE_Registry::instance()->load_dms( $dms_name );
-			$current_data_migration_script->set_migrating( false );
+		if ($dms_name) {
+			$current_data_migration_script = EE_Registry::instance()->load_dms($dms_name);
+			$current_data_migration_script->set_migrating(false);
 			$current_data_migration_script->schema_changes_before_migration();
 			$current_data_migration_script->schema_changes_after_migration();
-			if( $current_data_migration_script->get_errors() ){
-				if( WP_DEBUG ){
-					foreach( $current_data_migration_script->get_errors() as $error ){
-						EE_Error::add_error($error, __FILE__, __FUNCTION__, __LINE__ );
+			if ($current_data_migration_script->get_errors()) {
+				if (WP_DEBUG) {
+					foreach ($current_data_migration_script->get_errors() as $error) {
+						EE_Error::add_error($error, __FILE__, __FUNCTION__, __LINE__);
 					}
-				}else{
-					EE_Error::add_error( __( 'There were errors creating the Event Espresso database tables and Event Espresso has been deactivated. To view the errors, please enable WP_DEBUG in your wp-config.php file.', 'event_espresso' ) );
+				} else {
+					EE_Error::add_error(__('There were errors creating the Event Espresso database tables and Event Espresso has been deactivated. To view the errors, please enable WP_DEBUG in your wp-config.php file.', 'event_espresso'));
 				}
 				return false;
 			}
 			EE_Data_Migration_Manager::instance()->update_current_database_state_to();
-		}else{
-			EE_Error::add_error( __( 'Could not determine most up-to-date data migration script from which to pull database schema structure. So database is probably not setup properly', 'event_espresso' ), __FILE__, __FUNCTION__, __LINE__);
+		} else {
+			EE_Error::add_error(__('Could not determine most up-to-date data migration script from which to pull database schema structure. So database is probably not setup properly', 'event_espresso'), __FILE__, __FUNCTION__, __LINE__);
 			return false;
 		}
 		return true;
@@ -834,27 +834,27 @@ 
 	public static function initialize_system_questions() {
 		// QUESTION GROUPS
 		global $wpdb;
-		$table_name = \EEH_Activation::getTableAnalysis()->ensureTableNameHasPrefix( 'esp_question_group' );
+		$table_name = \EEH_Activation::getTableAnalysis()->ensureTableNameHasPrefix('esp_question_group');
 		$SQL = "SELECT QSG_system FROM $table_name WHERE QSG_system != 0";
 		// what we have
-		$question_groups = $wpdb->get_col( $SQL );
+		$question_groups = $wpdb->get_col($SQL);
 		// check the response
-		$question_groups = is_array( $question_groups ) ? $question_groups : array();
+		$question_groups = is_array($question_groups) ? $question_groups : array();
 		// what we should have
-		$QSG_systems = array( 1, 2 );
+		$QSG_systems = array(1, 2);
 		// loop thru what we should have and compare to what we have
-		foreach ( $QSG_systems as $QSG_system ) {
+		foreach ($QSG_systems as $QSG_system) {
 			// reset values array
 			$QSG_values = array();
 			// if we don't have what we should have (but use $QST_system as as string because that's what we got from the db)
-			if ( ! in_array( "$QSG_system", $question_groups )) {
+			if ( ! in_array("$QSG_system", $question_groups)) {
 				// add it
-				switch ( $QSG_system ) {
+				switch ($QSG_system) {
 
 					case 1:
 							$QSG_values = array(
-									'QSG_name' => __( 'Personal Information', 'event_espresso' ),
-									'QSG_identifier' => 'personal-information-' . time(),
+									'QSG_name' => __('Personal Information', 'event_espresso'),
+									'QSG_identifier' => 'personal-information-'.time(),
 									'QSG_desc' => '',
 									'QSG_order' => 1,
 									'QSG_show_group_name' => 1,
@@ -866,8 +866,8 @@ 
 
 					case 2:
 							$QSG_values = array(
-									'QSG_name' => __( 'Address Information','event_espresso' ),
-									'QSG_identifier' => 'address-information-' . time(),
+									'QSG_name' => __('Address Information', 'event_espresso'),
+									'QSG_identifier' => 'address-information-'.time(),
 									'QSG_desc' => '',
 									'QSG_order' => 2,
 									'QSG_show_group_name' => 1,
@@ -879,14 +879,14 @@ 
 
 				}
 				// make sure we have some values before inserting them
-				if ( ! empty( $QSG_values )) {
+				if ( ! empty($QSG_values)) {
 					// insert system question
 					$wpdb->insert(
 						$table_name,
 						$QSG_values,
-						array('%s', '%s', '%s', '%d', '%d', '%d', '%d', '%d' )
+						array('%s', '%s', '%s', '%d', '%d', '%d', '%d', '%d')
 					);
-					$QSG_IDs[ $QSG_system ] = $wpdb->insert_id;
+					$QSG_IDs[$QSG_system] = $wpdb->insert_id;
 				}
 			}
 		}
@@ -895,10 +895,10 @@ 
 
 		// QUESTIONS
 		global $wpdb;
-		$table_name = \EEH_Activation::getTableAnalysis()->ensureTableNameHasPrefix( 'esp_question' );
+		$table_name = \EEH_Activation::getTableAnalysis()->ensureTableNameHasPrefix('esp_question');
 		$SQL = "SELECT QST_system FROM $table_name WHERE QST_system != ''";
 		// what we have
-		$questions = $wpdb->get_col( $SQL );
+		$questions = $wpdb->get_col($SQL);
 		// what we should have
 		$QST_systems = array(
 			'fname',
@@ -915,25 +915,25 @@ 
 		$order_for_group_1 = 1;
 		$order_for_group_2 = 1;
 		// loop thru what we should have and compare to what we have
-		foreach ( $QST_systems as $QST_system ) {
+		foreach ($QST_systems as $QST_system) {
 			// reset values array
 			$QST_values = array();
 			// if we don't have what we should have
-			if ( ! in_array( $QST_system, $questions )) {
+			if ( ! in_array($QST_system, $questions)) {
 				// add it
-				switch ( $QST_system ) {
+				switch ($QST_system) {
 
 					case 'fname':
 							$QST_values = array(
-									'QST_display_text' => __( 'First Name', 'event_espresso' ),
-									'QST_admin_label' => __( 'First Name - System Question', 'event_espresso' ),
+									'QST_display_text' => __('First Name', 'event_espresso'),
+									'QST_admin_label' => __('First Name - System Question', 'event_espresso'),
 									'QST_system' => 'fname',
 									'QST_type' => 'TEXT',
 									'QST_required' => 1,
-									'QST_required_text' => __( 'This field is required', 'event_espresso' ),
+									'QST_required_text' => __('This field is required', 'event_espresso'),
 									'QST_order' => 1,
 									'QST_admin_only' => 0,
-									'QST_max' => EEM_Question::instance()->absolute_max_for_system_question( $QST_system ),
+									'QST_max' => EEM_Question::instance()->absolute_max_for_system_question($QST_system),
 									'QST_wp_user' => self::get_default_creator_id(),
 									'QST_deleted' => 0
 								);
@@ -941,15 +941,15 @@ 
 
 					case 'lname':
 							$QST_values = array(
-									'QST_display_text' => __( 'Last Name', 'event_espresso' ),
-									'QST_admin_label' => __( 'Last Name - System Question', 'event_espresso' ),
+									'QST_display_text' => __('Last Name', 'event_espresso'),
+									'QST_admin_label' => __('Last Name - System Question', 'event_espresso'),
 									'QST_system' => 'lname',
 									'QST_type' => 'TEXT',
 									'QST_required' => 1,
-									'QST_required_text' => __( 'This field is required', 'event_espresso' ),
+									'QST_required_text' => __('This field is required', 'event_espresso'),
 									'QST_order' => 2,
 									'QST_admin_only' => 0,
-									'QST_max' => EEM_Question::instance()->absolute_max_for_system_question( $QST_system ),
+									'QST_max' => EEM_Question::instance()->absolute_max_for_system_question($QST_system),
 									'QST_wp_user' => self::get_default_creator_id(),
 									'QST_deleted' => 0
 								);
@@ -957,15 +957,15 @@ 
 
 					case 'email':
 							$QST_values = array(
-									'QST_display_text' => __( 'Email Address', 'event_espresso' ),
-									'QST_admin_label' => __( 'Email Address - System Question', 'event_espresso' ),
+									'QST_display_text' => __('Email Address', 'event_espresso'),
+									'QST_admin_label' => __('Email Address - System Question', 'event_espresso'),
 									'QST_system' => 'email',
 									'QST_type' => 'EMAIL',
 									'QST_required' => 1,
-									'QST_required_text' => __( 'This field is required', 'event_espresso' ),
+									'QST_required_text' => __('This field is required', 'event_espresso'),
 									'QST_order' => 3,
 									'QST_admin_only' => 0,
-									'QST_max' => EEM_Question::instance()->absolute_max_for_system_question( $QST_system ),
+									'QST_max' => EEM_Question::instance()->absolute_max_for_system_question($QST_system),
 									'QST_wp_user' => self::get_default_creator_id(),
 									'QST_deleted' => 0
 								);
@@ -973,15 +973,15 @@ 
 
 					case 'address':
 							$QST_values = array(
-									'QST_display_text' => __( 'Address', 'event_espresso' ),
-									'QST_admin_label' => __( 'Address - System Question', 'event_espresso' ),
+									'QST_display_text' => __('Address', 'event_espresso'),
+									'QST_admin_label' => __('Address - System Question', 'event_espresso'),
 									'QST_system' => 'address',
 									'QST_type' => 'TEXT',
 									'QST_required' => 0,
-									'QST_required_text' => __( 'This field is required', 'event_espresso' ),
+									'QST_required_text' => __('This field is required', 'event_espresso'),
 									'QST_order' => 4,
 									'QST_admin_only' => 0,
-									'QST_max' => EEM_Question::instance()->absolute_max_for_system_question( $QST_system ),
+									'QST_max' => EEM_Question::instance()->absolute_max_for_system_question($QST_system),
 									'QST_wp_user' => self::get_default_creator_id(),
 									'QST_deleted' => 0
 								);
@@ -989,15 +989,15 @@ 
 
 					case 'address2':
 							$QST_values = array(
-									'QST_display_text' => __( 'Address2', 'event_espresso' ),
-									'QST_admin_label' => __( 'Address2 - System Question', 'event_espresso' ),
+									'QST_display_text' => __('Address2', 'event_espresso'),
+									'QST_admin_label' => __('Address2 - System Question', 'event_espresso'),
 									'QST_system' => 'address2',
 									'QST_type' => 'TEXT',
 									'QST_required' => 0,
-									'QST_required_text' => __( 'This field is required', 'event_espresso' ),
+									'QST_required_text' => __('This field is required', 'event_espresso'),
 									'QST_order' => 5,
 									'QST_admin_only' => 0,
-									'QST_max' => EEM_Question::instance()->absolute_max_for_system_question( $QST_system ),
+									'QST_max' => EEM_Question::instance()->absolute_max_for_system_question($QST_system),
 									'QST_wp_user' => self::get_default_creator_id(),
 									'QST_deleted' => 0
 								);
@@ -1005,15 +1005,15 @@ 
 
 					case 'city':
 							$QST_values = array(
-									'QST_display_text' => __( 'City', 'event_espresso' ),
-									'QST_admin_label' => __( 'City - System Question', 'event_espresso' ),
+									'QST_display_text' => __('City', 'event_espresso'),
+									'QST_admin_label' => __('City - System Question', 'event_espresso'),
 									'QST_system' => 'city',
 									'QST_type' => 'TEXT',
 									'QST_required' => 0,
-									'QST_required_text' => __( 'This field is required', 'event_espresso' ),
+									'QST_required_text' => __('This field is required', 'event_espresso'),
 									'QST_order' => 6,
 									'QST_admin_only' => 0,
-									'QST_max' => EEM_Question::instance()->absolute_max_for_system_question( $QST_system ),
+									'QST_max' => EEM_Question::instance()->absolute_max_for_system_question($QST_system),
 									'QST_wp_user' => self::get_default_creator_id(),
 									'QST_deleted' => 0
 								);
@@ -1021,12 +1021,12 @@ 
 
 					case 'state':
 							$QST_values = array(
-									'QST_display_text' => __( 'State/Province', 'event_espresso' ),
-									'QST_admin_label' => __( 'State/Province - System Question', 'event_espresso' ),
+									'QST_display_text' => __('State/Province', 'event_espresso'),
+									'QST_admin_label' => __('State/Province - System Question', 'event_espresso'),
 									'QST_system' => 'state',
 									'QST_type' => 'STATE',
 									'QST_required' => 0,
-									'QST_required_text' => __( 'This field is required', 'event_espresso' ),
+									'QST_required_text' => __('This field is required', 'event_espresso'),
 									'QST_order' => 7,
 									'QST_admin_only' => 0,
 									'QST_wp_user' => self::get_default_creator_id(),
@@ -1036,12 +1036,12 @@ 
 
 					case 'country' :
 							$QST_values = array(
-									'QST_display_text' => __( 'Country', 'event_espresso' ),
-									'QST_admin_label' => __( 'Country - System Question', 'event_espresso' ),
+									'QST_display_text' => __('Country', 'event_espresso'),
+									'QST_admin_label' => __('Country - System Question', 'event_espresso'),
 									'QST_system' => 'country',
 									'QST_type' => 'COUNTRY',
 									'QST_required' => 0,
-									'QST_required_text' => __( 'This field is required', 'event_espresso' ),
+									'QST_required_text' => __('This field is required', 'event_espresso'),
 									'QST_order' => 8,
 									'QST_admin_only' => 0,
 									'QST_wp_user' => self::get_default_creator_id(),
@@ -1051,15 +1051,15 @@ 
 
 					case 'zip':
 							$QST_values = array(
-									'QST_display_text' => __( 'Zip/Postal Code', 'event_espresso' ),
-									'QST_admin_label' => __( 'Zip/Postal Code - System Question', 'event_espresso' ),
+									'QST_display_text' => __('Zip/Postal Code', 'event_espresso'),
+									'QST_admin_label' => __('Zip/Postal Code - System Question', 'event_espresso'),
 									'QST_system' => 'zip',
 									'QST_type' => 'TEXT',
 									'QST_required' => 0,
-									'QST_required_text' => __( 'This field is required', 'event_espresso' ),
+									'QST_required_text' => __('This field is required', 'event_espresso'),
 									'QST_order' => 9,
 									'QST_admin_only' => 0,
-									'QST_max' => EEM_Question::instance()->absolute_max_for_system_question( $QST_system ),
+									'QST_max' => EEM_Question::instance()->absolute_max_for_system_question($QST_system),
 									'QST_wp_user' => self::get_default_creator_id(),
 									'QST_deleted' => 0
 								);
@@ -1067,49 +1067,49 @@ 
 
 					case 'phone':
 							$QST_values = array(
-									'QST_display_text' => __( 'Phone Number', 'event_espresso' ),
-									'QST_admin_label' => __( 'Phone Number - System Question', 'event_espresso' ),
+									'QST_display_text' => __('Phone Number', 'event_espresso'),
+									'QST_admin_label' => __('Phone Number - System Question', 'event_espresso'),
 									'QST_system' => 'phone',
 									'QST_type' => 'TEXT',
 									'QST_required' => 0,
-									'QST_required_text' => __( 'This field is required', 'event_espresso' ),
+									'QST_required_text' => __('This field is required', 'event_espresso'),
 									'QST_order' => 10,
 									'QST_admin_only' => 0,
-									'QST_max' => EEM_Question::instance()->absolute_max_for_system_question( $QST_system ),
+									'QST_max' => EEM_Question::instance()->absolute_max_for_system_question($QST_system),
 									'QST_wp_user' => self::get_default_creator_id(),
 									'QST_deleted' => 0
 								);
 						break;
 
 				}
-				if ( ! empty( $QST_values )) {
+				if ( ! empty($QST_values)) {
 					// insert system question
 					$wpdb->insert(
 						$table_name,
 						$QST_values,
-						array( '%s', '%s', '%s', '%s', '%d', '%s', '%d', '%d', '%d', '%d' )
+						array('%s', '%s', '%s', '%s', '%d', '%s', '%d', '%d', '%d', '%d')
 					);
 					$QST_ID = $wpdb->insert_id;
 
 					// QUESTION GROUP QUESTIONS
-					if(  in_array( $QST_system, array( 'fname', 'lname', 'email' ) ) ) {
+					if (in_array($QST_system, array('fname', 'lname', 'email'))) {
 						$system_question_we_want = EEM_Question_Group::system_personal;
 					} else {
 						$system_question_we_want = EEM_Question_Group::system_address;
 					}
-					if( isset( $QSG_IDs[ $system_question_we_want ] ) ) {
-						$QSG_ID = $QSG_IDs[ $system_question_we_want ];
+					if (isset($QSG_IDs[$system_question_we_want])) {
+						$QSG_ID = $QSG_IDs[$system_question_we_want];
 					} else {
-						$id_col = EEM_Question_Group::instance()->get_col( array( array( 'QSG_system' => $system_question_we_want ) ) );
-						if( is_array( $id_col ) ) {
-							$QSG_ID = reset( $id_col );
+						$id_col = EEM_Question_Group::instance()->get_col(array(array('QSG_system' => $system_question_we_want)));
+						if (is_array($id_col)) {
+							$QSG_ID = reset($id_col);
 						} else {
 							//ok so we didn't find it in the db either?? that's weird because we should have inserted it at the start of this method
                                                         EE_Log::instance()->log(
                                                                 __FILE__,
                                                                 __FUNCTION__,
                                                                 sprintf(
-                                                                        __( 'Could not associate question %1$s to a question group because no system question group existed', 'event_espresso'),
+                                                                        __('Could not associate question %1$s to a question group because no system question group existed', 'event_espresso'),
                                                                         $QST_ID ),
                                                                 'error' );
                                                         continue;
@@ -1118,12 +1118,12 @@ 
 
 					// add system questions to groups
 					$wpdb->insert(
-						\EEH_Activation::getTableAnalysis()->ensureTableNameHasPrefix( 'esp_question_group_question' ),
-						array( 'QSG_ID'    => $QSG_ID,
+						\EEH_Activation::getTableAnalysis()->ensureTableNameHasPrefix('esp_question_group_question'),
+						array('QSG_ID'    => $QSG_ID,
 						       'QST_ID'    => $QST_ID,
-						       'QGQ_order' => ( $QSG_ID === 1 ) ? $order_for_group_1++ : $order_for_group_2++
+						       'QGQ_order' => ($QSG_ID === 1) ? $order_for_group_1++ : $order_for_group_2++
 						),
-						array( '%d', '%d', '%d' )
+						array('%d', '%d', '%d')
 					);
 				}
 			}
@@ -1139,11 +1139,11 @@ 
 	 *
 	 * @throws \EE_Error
 	 */
-	public static function insert_default_payment_methods(){
-		if( ! EEM_Payment_Method::instance()->count_active( EEM_Payment_Method::scope_cart ) ){
-			EE_Registry::instance()->load_lib( 'Payment_Method_Manager' );
-			EE_Payment_Method_Manager::instance()->activate_a_payment_method_of_type( 'Invoice' );
-		}else{
+	public static function insert_default_payment_methods() {
+		if ( ! EEM_Payment_Method::instance()->count_active(EEM_Payment_Method::scope_cart)) {
+			EE_Registry::instance()->load_lib('Payment_Method_Manager');
+			EE_Payment_Method_Manager::instance()->activate_a_payment_method_of_type('Invoice');
+		} else {
 			EEM_Payment_Method::instance()->verify_button_urls();
 		}
 	}
@@ -1159,7 +1159,7 @@ 
 
 		global $wpdb;
 
-		if ( \EEH_Activation::getTableAnalysis()->tableExists( EEM_Status::instance()->table() ) ) {
+		if (\EEH_Activation::getTableAnalysis()->tableExists(EEM_Status::instance()->table())) {
 
 			$table_name = EEM_Status::instance()->table();
 
@@ -1235,33 +1235,33 @@ 
 		$folders = array(
 				EVENT_ESPRESSO_TEMPLATE_DIR,
 				EVENT_ESPRESSO_GATEWAY_DIR,
-				EVENT_ESPRESSO_UPLOAD_DIR . 'logs/',
-				EVENT_ESPRESSO_UPLOAD_DIR . 'css/',
-				EVENT_ESPRESSO_UPLOAD_DIR . 'tickets/'
+				EVENT_ESPRESSO_UPLOAD_DIR.'logs/',
+				EVENT_ESPRESSO_UPLOAD_DIR.'css/',
+				EVENT_ESPRESSO_UPLOAD_DIR.'tickets/'
 		);
-		foreach ( $folders as $folder ) {
+		foreach ($folders as $folder) {
 			try {
-				EEH_File::ensure_folder_exists_and_is_writable( $folder );
-				@ chmod( $folder, 0755 );
-			} catch( EE_Error $e ){
+				EEH_File::ensure_folder_exists_and_is_writable($folder);
+				@ chmod($folder, 0755);
+			} catch (EE_Error $e) {
 				EE_Error::add_error(
 					sprintf(
-						__(  'Could not create the folder at "%1$s" because: %2$s', 'event_espresso' ),
+						__('Could not create the folder at "%1$s" because: %2$s', 'event_espresso'),
 						$folder,
-						'<br />' . $e->getMessage()
+						'<br />'.$e->getMessage()
 					),
 					__FILE__, __FUNCTION__, __LINE__
 				);
 				//indicate we'll need to fix this later
-				update_option( EEH_Activation::upload_directories_incomplete_option_name, true );
+				update_option(EEH_Activation::upload_directories_incomplete_option_name, true);
 				return FALSE;
 			}
 		}
 		//just add the .htaccess file to the logs directory to begin with. Even if logging
 		//is disabled, there might be activation errors recorded in there
-		EEH_File::add_htaccess_deny_from_all( EVENT_ESPRESSO_UPLOAD_DIR . 'logs/' );
+		EEH_File::add_htaccess_deny_from_all(EVENT_ESPRESSO_UPLOAD_DIR.'logs/');
 		//remember EE's folders are all good
-		delete_option( EEH_Activation::upload_directories_incomplete_option_name );
+		delete_option(EEH_Activation::upload_directories_incomplete_option_name);
 		return TRUE;
 	}
 
@@ -1274,7 +1274,7 @@ 
 	 * @return boolean
 	 */
 	public static function upload_directories_incomplete() {
-		return get_option( EEH_Activation::upload_directories_incomplete_option_name, false );
+		return get_option(EEH_Activation::upload_directories_incomplete_option_name, false);
 	}
 
 
@@ -1291,7 +1291,7 @@ 
 	 */
 	public static function generate_default_message_templates() {
 		/** @type EE_Message_Resource_Manager $message_resource_manager */
-		$message_resource_manager = EE_Registry::instance()->load_lib( 'Message_Resource_Manager' );
+		$message_resource_manager = EE_Registry::instance()->load_lib('Message_Resource_Manager');
 		/*
 		 * This first method is taking care of ensuring any default messengers
 		 * that should be made active and have templates generated are done.
@@ -1327,22 +1327,22 @@ 
 		$active_messengers = $message_resource_manager->active_messengers();
 		$installed_message_types = $message_resource_manager->installed_message_types();
 		$templates_created = false;
-		foreach ( $active_messengers as $active_messenger ) {
+		foreach ($active_messengers as $active_messenger) {
 			$default_message_type_names_for_messenger = $active_messenger->get_default_message_types();
 			$default_message_type_names_to_activate = array();
 			// looping through each default message type reported by the messenger
 			// and setup the actual message types to activate.
-			foreach ( $default_message_type_names_for_messenger as $default_message_type_name_for_messenger ) {
+			foreach ($default_message_type_names_for_messenger as $default_message_type_name_for_messenger) {
 				// if already active or has already been activated before we skip
 				// (otherwise we might reactivate something user's intentionally deactivated.)
 				// we also skip if the message type is not installed.
 				if (
-					$message_resource_manager->has_message_type_been_activated_for_messenger( $default_message_type_name_for_messenger, $active_messenger->name )
+					$message_resource_manager->has_message_type_been_activated_for_messenger($default_message_type_name_for_messenger, $active_messenger->name)
 					|| $message_resource_manager->is_message_type_active_for_messenger(
 						$active_messenger->name,
 						$default_message_type_name_for_messenger
 					)
-					|| ! isset( $installed_message_types[ $default_message_type_name_for_messenger ] )
+					|| ! isset($installed_message_types[$default_message_type_name_for_messenger])
 				) {
 					continue;
 				}
@@ -1355,7 +1355,7 @@ 
 				false
 			);
 			//activate the templates for these message types
-			if ( ! empty( $default_message_type_names_to_activate ) ) {
+			if ( ! empty($default_message_type_names_to_activate)) {
 				$templates_created = EEH_MSG_Template::generate_new_templates(
 					$active_messenger->name,
 					$default_message_type_names_for_messenger,
@@ -1382,18 +1382,18 @@ 
 		EE_Message_Resource_Manager $message_resource_manager
 	) {
 		/** @type EE_messenger[] $messengers_to_generate */
-		$messengers_to_generate = self::_get_default_messengers_to_generate_on_activation( $message_resource_manager );
+		$messengers_to_generate = self::_get_default_messengers_to_generate_on_activation($message_resource_manager);
 		$installed_message_types = $message_resource_manager->installed_message_types();
 		$templates_generated = false;
-		foreach ( $messengers_to_generate as $messenger_to_generate ) {
+		foreach ($messengers_to_generate as $messenger_to_generate) {
 			$default_message_type_names_for_messenger = $messenger_to_generate->get_default_message_types();
 			//verify the default message types match an installed message type.
-			foreach ( $default_message_type_names_for_messenger as $key => $name ) {
+			foreach ($default_message_type_names_for_messenger as $key => $name) {
 				if (
-					! isset( $installed_message_types[ $name ] )
-					|| $message_resource_manager->has_message_type_been_activated_for_messenger( $name, $messenger_to_generate->name )
+					! isset($installed_message_types[$name])
+					|| $message_resource_manager->has_message_type_been_activated_for_messenger($name, $messenger_to_generate->name)
 				) {
-					unset( $default_message_type_names_for_messenger[ $key ] );
+					unset($default_message_type_names_for_messenger[$key]);
 				}
 			}
 			// in previous iterations, the active_messengers option in the db
@@ -1407,7 +1407,7 @@ 
 				false
 			);
 			//create any templates needing created (or will reactivate templates already generated as necessary).
-			if ( ! empty( $default_message_type_names_for_messenger ) ) {
+			if ( ! empty($default_message_type_names_for_messenger)) {
 				$templates_generated = EEH_MSG_Template::generate_new_templates(
 					$messenger_to_generate->name,
 					$default_message_type_names_for_messenger,
@@ -1439,18 +1439,18 @@ 
 		$has_activated = $message_resource_manager->get_has_activated_messengers_option();
 
 		$messengers_to_generate = array();
-		foreach ( $installed_messengers as $installed_messenger ) {
+		foreach ($installed_messengers as $installed_messenger) {
 			//if installed messenger is a messenger that should be activated on install
 			//and is not already active
 			//and has never been activated
 			if (
 				! $installed_messenger->activate_on_install
-				|| isset( $active_messengers[ $installed_messenger->name ] )
-				|| isset( $has_activated[ $installed_messenger->name ] )
+				|| isset($active_messengers[$installed_messenger->name])
+				|| isset($has_activated[$installed_messenger->name])
 			) {
 				continue;
 			}
-			$messengers_to_generate[ $installed_messenger->name ] = $installed_messenger;
+			$messengers_to_generate[$installed_messenger->name] = $installed_messenger;
 		}
 		return $messengers_to_generate;
 	}
@@ -1475,9 +1475,9 @@ 
 	 */
 	public static function validate_messages_system() {
 		/** @type EE_Message_Resource_Manager $message_resource_manager */
-		$message_resource_manager = EE_Registry::instance()->load_lib( 'Message_Resource_Manager' );
+		$message_resource_manager = EE_Registry::instance()->load_lib('Message_Resource_Manager');
 		$message_resource_manager->validate_active_message_types_are_installed();
-		do_action( 'AHEE__EEH_Activation__validate_messages_system' );
+		do_action('AHEE__EEH_Activation__validate_messages_system');
 	}
 
 
@@ -1490,12 +1490,12 @@ 
 	 * 	@static
 	 * 	@return void
 	 */
-	public static function create_no_ticket_prices_array(){
+	public static function create_no_ticket_prices_array() {
 		// this creates an array for tracking events that have no active ticket prices created
 		// this allows us to warn admins of the situation so that it can be corrected
-		$espresso_no_ticket_prices = get_option( 'ee_no_ticket_prices', FALSE );
-		if ( ! $espresso_no_ticket_prices ) {
-			add_option( 'ee_no_ticket_prices', array(), '', FALSE );
+		$espresso_no_ticket_prices = get_option('ee_no_ticket_prices', FALSE);
+		if ( ! $espresso_no_ticket_prices) {
+			add_option('ee_no_ticket_prices', array(), '', FALSE);
 		}
 	}
 
@@ -1520,24 +1520,24 @@ 
 	 * @global wpdb $wpdb
 	 * @throws \EE_Error
 	 */
-	public static function delete_all_espresso_cpt_data(){
+	public static function delete_all_espresso_cpt_data() {
 		global $wpdb;
 		//get all the CPT post_types
 		$ee_post_types = array();
-		foreach(EE_Registry::instance()->non_abstract_db_models as $model_name){
-			if ( method_exists( $model_name, 'instance' )) {
-				$model_obj = call_user_func( array( $model_name, 'instance' ));
-				if ( $model_obj instanceof EEM_CPT_Base ) {
-					$ee_post_types[] = $wpdb->prepare("%s",$model_obj->post_type());
+		foreach (EE_Registry::instance()->non_abstract_db_models as $model_name) {
+			if (method_exists($model_name, 'instance')) {
+				$model_obj = call_user_func(array($model_name, 'instance'));
+				if ($model_obj instanceof EEM_CPT_Base) {
+					$ee_post_types[] = $wpdb->prepare("%s", $model_obj->post_type());
 				}
 			}
 		}
 		//get all our CPTs
-		$query = "SELECT ID FROM {$wpdb->posts} WHERE post_type IN (".implode(",",$ee_post_types).")";
+		$query = "SELECT ID FROM {$wpdb->posts} WHERE post_type IN (".implode(",", $ee_post_types).")";
 		$cpt_ids = $wpdb->get_col($query);
 		//delete each post meta and term relations too
-		foreach($cpt_ids as $post_id){
-			wp_delete_post($post_id,true);
+		foreach ($cpt_ids as $post_id) {
+			wp_delete_post($post_id, true);
 		}
 	}
 
@@ -1549,12 +1549,12 @@ 
 	public static function drop_espresso_tables() {
 		$tables = array();
 		// load registry
-		foreach( EE_Registry::instance()->non_abstract_db_models as $model_name ){
-			if ( method_exists( $model_name, 'instance' )) {
-				$model_obj = call_user_func( array( $model_name, 'instance' ));
-				if ( $model_obj instanceof EEM_Base ) {
-					foreach ( $model_obj->get_tables() as $table ) {
-						if ( strpos( $table->get_table_name(), 'esp_' )
+		foreach (EE_Registry::instance()->non_abstract_db_models as $model_name) {
+			if (method_exists($model_name, 'instance')) {
+				$model_obj = call_user_func(array($model_name, 'instance'));
+				if ($model_obj instanceof EEM_Base) {
+					foreach ($model_obj->get_tables() as $table) {
+						if (strpos($table->get_table_name(), 'esp_')
 							&& 
 							( 
 								is_main_site()//main site? nuke them all
@@ -1577,10 +1577,10 @@ 
 			'esp_promotion_rule',
 			'esp_rule'
 		);
-		foreach( $tables_without_models as $table ){
+		foreach ($tables_without_models as $table) {
 			$tables[] = $table;
 		}
-		return \EEH_Activation::getTableManager()->dropTables( $tables );
+		return \EEH_Activation::getTableManager()->dropTables($tables);
 	}
 
 	/**
@@ -1592,8 +1592,8 @@ 
 	 * @param array $table_names
 	 * @return array of table names which we deleted
 	 */
-	public static function drop_tables( $table_names ) {
-		return \EEH_Activation::getTableManager()->dropTables( $table_names );
+	public static function drop_tables($table_names) {
+		return \EEH_Activation::getTableManager()->dropTables($table_names);
 	}
 	/**
 	 * plugin_uninstall
@@ -1603,7 +1603,7 @@ 
 	 * @param bool $remove_all
 	 * @return void
 	 */
-	public static function delete_all_espresso_tables_and_data( $remove_all = true ) {
+	public static function delete_all_espresso_tables_and_data($remove_all = true) {
 		global $wpdb;
 		self::drop_espresso_tables();
 
@@ -1641,50 +1641,50 @@ 
 			'ee_job_parameters_' => false,
 			'ee_upload_directories_incomplete' => true,
 		);
-		if( is_main_site() ) {
-			$wp_options_to_delete[ 'ee_network_config' ] = true;
+		if (is_main_site()) {
+			$wp_options_to_delete['ee_network_config'] = true;
 		}
 
 		$undeleted_options = array();
-		foreach ( $wp_options_to_delete as $option_name => $no_wildcard ) {
+		foreach ($wp_options_to_delete as $option_name => $no_wildcard) {
 
-			if( $no_wildcard ){
-				if( ! delete_option( $option_name ) ){
+			if ($no_wildcard) {
+				if ( ! delete_option($option_name)) {
 					$undeleted_options[] = $option_name;
 				}
-			}else{
-				$option_names_to_delete_from_wildcard = $wpdb->get_col( "SELECT option_name FROM $wpdb->options WHERE option_name LIKE '%$option_name%'" );
-				foreach($option_names_to_delete_from_wildcard as $option_name_from_wildcard ){
-					if( ! delete_option( $option_name_from_wildcard ) ){
+			} else {
+				$option_names_to_delete_from_wildcard = $wpdb->get_col("SELECT option_name FROM $wpdb->options WHERE option_name LIKE '%$option_name%'");
+				foreach ($option_names_to_delete_from_wildcard as $option_name_from_wildcard) {
+					if ( ! delete_option($option_name_from_wildcard)) {
 						$undeleted_options[] = $option_name_from_wildcard;
 					}
 				}
 			}
 		}
                 //also, let's make sure the "ee_config_option_names" wp option stays out by removing the action that adds it
-                remove_action( 'shutdown', array( EE_Config::instance(), 'shutdown' ), 10 );
+                remove_action('shutdown', array(EE_Config::instance(), 'shutdown'), 10);
 
-		if ( $remove_all && $espresso_db_update = get_option( 'espresso_db_update' )) {
+		if ($remove_all && $espresso_db_update = get_option('espresso_db_update')) {
 			$db_update_sans_ee4 = array();
-			foreach($espresso_db_update as $version => $times_activated){
-				if( (string)$version[0] === '3'){//if its NON EE4
+			foreach ($espresso_db_update as $version => $times_activated) {
+				if ((string) $version[0] === '3') {//if its NON EE4
 					$db_update_sans_ee4[$version] = $times_activated;
 				}
 			}
-			update_option( 'espresso_db_update', $db_update_sans_ee4 );
+			update_option('espresso_db_update', $db_update_sans_ee4);
 		}
 
 		$errors = '';
-		if ( ! empty( $undeleted_options )) {
+		if ( ! empty($undeleted_options)) {
 			$errors .= sprintf(
-				__( 'The following wp-options could not be deleted: %s%s', 'event_espresso' ),
+				__('The following wp-options could not be deleted: %s%s', 'event_espresso'),
 				'<br/>',
-				implode( ',<br/>', $undeleted_options )
+				implode(',<br/>', $undeleted_options)
 			);
 
 		}
-		if ( ! empty( $errors ) ) {
-			EE_Error::add_attention( $errors, __FILE__, __FUNCTION__, __LINE__ );
+		if ( ! empty($errors)) {
+			EE_Error::add_attention($errors, __FILE__, __FUNCTION__, __LINE__);
 		}
 	}
 
@@ -1694,10 +1694,10 @@ 
 	 */
 	public static function last_wpdb_error_code() {
 		global $wpdb;
-		if( $wpdb->use_mysqli ) {
-			return mysqli_errno( $wpdb->dbh );
+		if ($wpdb->use_mysqli) {
+			return mysqli_errno($wpdb->dbh);
 		} else {
-			return mysql_errno( $wpdb->dbh );
+			return mysql_errno($wpdb->dbh);
 		}
 	}
 
@@ -1708,14 +1708,14 @@ 
 	 * @param string $table_name with or without $wpdb->prefix
 	 * @return boolean
 	 */
-	public static function table_exists( $table_name ){
-		return \EEH_Activation::getTableAnalysis()->tableExists( $table_name );
+	public static function table_exists($table_name) {
+		return \EEH_Activation::getTableAnalysis()->tableExists($table_name);
 	}
 
 	/**
 	 * Resets the cache on EEH_Activation
 	 */
-	public static function reset(){
+	public static function reset() {
 		self::$_default_creator_id = NULL;
 		self::$_initialized_db_content_already_in_this_request = false;
 	}

core/services/database/TableAnalysis.php

Spacing +17 added lines, -17 removed lines

@@ -24,10 +24,10 @@ 
 	 * @param string $table_name
 	 * @return string $tableName, having ensured it has the wpdb prefix on the front
 	 */
-	public function ensureTableNameHasPrefix( $table_name )
+	public function ensureTableNameHasPrefix($table_name)
 	{
 		global $wpdb;
-		return strpos( $table_name, $wpdb->base_prefix ) === 0 ? $table_name : $wpdb->prefix . $table_name;
+		return strpos($table_name, $wpdb->base_prefix) === 0 ? $table_name : $wpdb->prefix.$table_name;
 	}
 
 
@@ -36,13 +36,13 @@ 
 	 * @param $table_name
 	 * @return bool
 	 */
-	public function tableIsEmpty( $table_name )
+	public function tableIsEmpty($table_name)
 	{
 		global $wpdb;
-		$table_name = $this->ensureTableNameHasPrefix( $table_name );
-		if ( $this->tableExists( $table_name ) ) {
-			$count = $wpdb->get_var( "SELECT COUNT(*) FROM $table_name" );
-			return absint( $count ) === 0 ? true : false;
+		$table_name = $this->ensureTableNameHasPrefix($table_name);
+		if ($this->tableExists($table_name)) {
+			$count = $wpdb->get_var("SELECT COUNT(*) FROM $table_name");
+			return absint($count) === 0 ? true : false;
 		}
 		return false;
 	}
@@ -53,24 +53,24 @@ 
 	 * @param $table_name
 	 * @return bool
 	 */
-	public function tableExists( $table_name )
+	public function tableExists($table_name)
 	{
 		global $wpdb, $EZSQL_ERROR;
-		$table_name = $this->ensureTableNameHasPrefix( $table_name );
+		$table_name = $this->ensureTableNameHasPrefix($table_name);
 		//ignore if this causes an sql error
 		$old_error = $wpdb->last_error;
 		$old_suppress_errors = $wpdb->suppress_errors();
-		$old_show_errors_value = $wpdb->show_errors( FALSE );
+		$old_show_errors_value = $wpdb->show_errors(FALSE);
 		$ezsql_error_cache = $EZSQL_ERROR;
-		$wpdb->get_results( "SELECT * from $table_name LIMIT 1");
-		$wpdb->show_errors( $old_show_errors_value );
-		$wpdb->suppress_errors( $old_suppress_errors );
+		$wpdb->get_results("SELECT * from $table_name LIMIT 1");
+		$wpdb->show_errors($old_show_errors_value);
+		$wpdb->suppress_errors($old_suppress_errors);
 		$new_error = $wpdb->last_error;
 		$wpdb->last_error = $old_error;
 		$EZSQL_ERROR = $ezsql_error_cache;
 		//if there was a table doesn't exist error
-		if( ! empty( $new_error ) ) {
-			if(
+		if ( ! empty($new_error)) {
+			if (
 				in_array(
 					\EEH_Activation::last_wpdb_error_code(),
 					array(
@@ -80,14 +80,14 @@ 
 					)
 				)
 				||
-				preg_match( '~^Table .* doesn\'t exist~', $new_error ) //in case not using mysql and error codes aren't reliable, just check for this error string
+				preg_match('~^Table .* doesn\'t exist~', $new_error) //in case not using mysql and error codes aren't reliable, just check for this error string
 			) {
 				return false;
 			} else {
 				//log this because that's weird. Just use the normal PHP error log
 				error_log(
 					sprintf(
-						__( 'Event Espresso error detected when checking if table existed: %1$s (it wasn\'t just that the table didn\'t exist either)', 'event_espresso' ),
+						__('Event Espresso error detected when checking if table existed: %1$s (it wasn\'t just that the table didn\'t exist either)', 'event_espresso'),
 					$new_error
 					)
 				);

core/libraries/messages/messenger/EE_Html_messenger.class.php

Spacing +61 added lines, -61 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');
 }
 
 
@@ -43,16 +43,16 @@ 
 	public function __construct() {
 		//set properties
 		$this->name = 'html';
-		$this->description = __( 'This messenger outputs a message to a browser for display.', 'event_espresso' );
+		$this->description = __('This messenger outputs a message to a browser for display.', 'event_espresso');
 		$this->label = array(
-			'singular' => __( 'html', 'event_espresso' ),
-			'plural'   => __( 'html', 'event_espresso' ),
+			'singular' => __('html', 'event_espresso'),
+			'plural'   => __('html', 'event_espresso'),
 		);
 		$this->activate_on_install = true;
 		// add the "powered by EE" credit link to the HTML receipt and invoice
 		add_filter(
 			'FHEE__EE_Html_messenger___send_message__main_body',
-			array( $this, 'add_powered_by_credit_link_to_receipt_and_invoice' ),
+			array($this, 'add_powered_by_credit_link_to_receipt_and_invoice'),
 			10,
 			3
 		);
@@ -91,7 +91,7 @@ 
 	 * @see abstract declaration in EE_messenger for details.
 	 */
 	protected function _set_admin_pages() {
-		$this->admin_registered_pages = array( 'events_edit' => true );
+		$this->admin_registered_pages = array('events_edit' => true);
 	}
 
 
@@ -111,7 +111,7 @@ 
 	protected function _set_validator_config() {
 		$this->_validator_config = array(
 			'subject'                       => array(
-				'shortcodes' => array( 'organization', 'primary_registration_details', 'email', 'transaction' ),
+				'shortcodes' => array('organization', 'primary_registration_details', 'email', 'transaction'),
 			),
 			'content'                       => array(
 				'shortcodes' => array(
@@ -137,7 +137,7 @@ 
 					'primary_registration_list',
 					'event_author',
 				),
-				'required'   => array( '[EVENT_LIST]' ),
+				'required'   => array('[EVENT_LIST]'),
 			),
 			'ticket_list'                   => array(
 				'shortcodes' => array(
@@ -148,39 +148,39 @@ 
 					'line_item_list',
 					'venue',
 				),
-				'required'   => array( '[TICKET_LIST]' ),
+				'required'   => array('[TICKET_LIST]'),
 			),
 			'ticket_line_item_no_pms'       => array(
-				'shortcodes' => array( 'line_item', 'ticket' ),
-				'required'   => array( '[TICKET_LINE_ITEM_LIST]' ),
+				'shortcodes' => array('line_item', 'ticket'),
+				'required'   => array('[TICKET_LINE_ITEM_LIST]'),
 			),
 			'ticket_line_item_pms'          => array(
-				'shortcodes' => array( 'line_item', 'ticket', 'line_item_list' ),
-				'required'   => array( '[TICKET_LINE_ITEM_LIST]' ),
+				'shortcodes' => array('line_item', 'ticket', 'line_item_list'),
+				'required'   => array('[TICKET_LINE_ITEM_LIST]'),
 			),
 			'price_modifier_line_item_list' => array(
-				'shortcodes' => array( 'line_item' ),
-				'required'   => array( '[PRICE_MODIFIER_LINE_ITEM_LIST]' ),
+				'shortcodes' => array('line_item'),
+				'required'   => array('[PRICE_MODIFIER_LINE_ITEM_LIST]'),
 			),
 			'datetime_list'                 => array(
-				'shortcodes' => array( 'datetime' ),
-				'required'   => array( '[DATETIME_LIST]' ),
+				'shortcodes' => array('datetime'),
+				'required'   => array('[DATETIME_LIST]'),
 			),
 			'attendee_list'                 => array(
-				'shortcodes' => array( 'attendee' ),
-				'required'   => array( '[ATTENDEE_LIST]' ),
+				'shortcodes' => array('attendee'),
+				'required'   => array('[ATTENDEE_LIST]'),
 			),
 			'tax_line_item_list'            => array(
-				'shortcodes' => array( 'line_item' ),
-				'required'   => array( '[TAX_LINE_ITEM_LIST]' ),
+				'shortcodes' => array('line_item'),
+				'required'   => array('[TAX_LINE_ITEM_LIST]'),
 			),
 			'additional_line_item_list'     => array(
-				'shortcodes' => array( 'line_item' ),
-				'required'   => array( '[ADDITIONAL_LINE_ITEM_LIST]' ),
+				'shortcodes' => array('line_item'),
+				'required'   => array('[ADDITIONAL_LINE_ITEM_LIST]'),
 			),
 			'payment_list'                  => array(
-				'shortcodes' => array( 'payment' ),
-				'required'   => array( '[PAYMENT_LIST_*]' ),
+				'shortcodes' => array('payment'),
+				'required'   => array('[PAYMENT_LIST_*]'),
 			),
 		);
 	}
@@ -196,9 +196,9 @@ 
 	 * @param string $sending_messenger_name the name of the sending messenger so we only set the hooks needed.
 	 * @return void
 	 */
-	public function do_secondary_messenger_hooks( $sending_messenger_name ) {
-		if ( $sending_messenger_name = 'pdf' ) {
-			add_filter( 'EE_messenger__get_variation__variation', array( $this, 'add_html_css' ), 10, 8 );
+	public function do_secondary_messenger_hooks($sending_messenger_name) {
+		if ($sending_messenger_name = 'pdf') {
+			add_filter('EE_messenger__get_variation__variation', array($this, 'add_html_css'), 10, 8);
 		}
 	}
 
@@ -247,7 +247,7 @@ 
 	 */
 	public function enqueue_scripts_styles() {
 		parent::enqueue_scripts_styles();
-		do_action( 'AHEE__EE_Html_messenger__enqueue_scripts_styles' );
+		do_action('AHEE__EE_Html_messenger__enqueue_scripts_styles');
 	}
 
 
@@ -275,7 +275,7 @@ 
 		$this->_template_fields = array(
 			'subject' => array(
 				'input'      => 'text',
-				'label'      => __( 'Page Title', 'event_espresso' ),
+				'label'      => __('Page Title', 'event_espresso'),
 				'type'       => 'string',
 				'required'   => true,
 				'validation' => true,
@@ -288,7 +288,7 @@ 
 				'content' => array(
 					'main'                          => array(
 						'input'      => 'wp_editor',
-						'label'      => __( 'Main Content', 'event_espresso' ),
+						'label'      => __('Main Content', 'event_espresso'),
 						'type'       => 'string',
 						'required'   => true,
 						'validation' => true,
@@ -303,7 +303,7 @@ 
 						'validation'          => true,
 						'format'              => '%s',
 						'rows'                => '15',
-						'shortcodes_required' => array( '[EVENT_LIST]' ),
+						'shortcodes_required' => array('[EVENT_LIST]'),
 					),
 					'ticket_list'                   => array(
 						'input'               => 'textarea',
@@ -314,11 +314,11 @@ 
 						'format'              => '%s',
 						'css_class'           => 'large-text',
 						'rows'                => '10',
-						'shortcodes_required' => array( '[TICKET_LIST]' ),
+						'shortcodes_required' => array('[TICKET_LIST]'),
 					),
 					'ticket_line_item_no_pms'       => array(
 						'input'               => 'textarea',
-						'label'               => '[TICKET_LINE_ITEM_LIST] <br>' . __(
+						'label'               => '[TICKET_LINE_ITEM_LIST] <br>'.__(
 								'Ticket Line Item List with no Price Modifiers',
 								'event_espresso'
 							),
@@ -328,11 +328,11 @@ 
 						'format'              => '%s',
 						'css_class'           => 'large-text',
 						'rows'                => '5',
-						'shortcodes_required' => array( '[TICKET_LINE_ITEM_LIST]' ),
+						'shortcodes_required' => array('[TICKET_LINE_ITEM_LIST]'),
 					),
 					'ticket_line_item_pms'          => array(
 						'input'               => 'textarea',
-						'label'               => '[TICKET_LINE_ITEM_LIST] <br>' . __(
+						'label'               => '[TICKET_LINE_ITEM_LIST] <br>'.__(
 								'Ticket Line Item List with Price Modifiers',
 								'event_espresso'
 							),
@@ -342,7 +342,7 @@ 
 						'format'              => '%s',
 						'css_class'           => 'large-text',
 						'rows'                => '5',
-						'shortcodes_required' => array( '[TICKET_LINE_ITEM_LIST]' ),
+						'shortcodes_required' => array('[TICKET_LINE_ITEM_LIST]'),
 					),
 					'price_modifier_line_item_list' => array(
 						'input'               => 'textarea',
@@ -353,7 +353,7 @@ 
 						'format'              => '%s',
 						'css_class'           => 'large-text',
 						'rows'                => '5',
-						'shortcodes_required' => array( '[PRICE_MODIFIER_LINE_ITEM_LIST]' ),
+						'shortcodes_required' => array('[PRICE_MODIFIER_LINE_ITEM_LIST]'),
 					),
 					'datetime_list'                 => array(
 						'input'               => 'textarea',
@@ -364,7 +364,7 @@ 
 						'format'              => '%s',
 						'css_class'           => 'large-text',
 						'rows'                => '5',
-						'shortcodes_required' => array( '[DATETIME_LIST]' ),
+						'shortcodes_required' => array('[DATETIME_LIST]'),
 					),
 					'attendee_list'                 => array(
 						'input'               => 'textarea',
@@ -375,7 +375,7 @@ 
 						'format'              => '%s',
 						'css_class'           => 'large-text',
 						'rows'                => '5',
-						'shortcodes_required' => array( '[ATTENDEE_LIST]' ),
+						'shortcodes_required' => array('[ATTENDEE_LIST]'),
 					),
 					'tax_line_item_list'            => array(
 						'input'               => 'textarea',
@@ -386,7 +386,7 @@ 
 						'format'              => '%s',
 						'css_class'           => 'large-text',
 						'rows'                => '5',
-						'shortcodes_required' => array( '[TAX_LINE_ITEM_LIST]' ),
+						'shortcodes_required' => array('[TAX_LINE_ITEM_LIST]'),
 					),
 					'additional_line_item_list'     => array(
 						'input'               => 'textarea',
@@ -397,7 +397,7 @@ 
 						'format'              => '%s',
 						'css_class'           => 'large-text',
 						'rows'                => '5',
-						'shortcodes_required' => array( '[ADDITIONAL_LINE_ITEM_LIST]' ),
+						'shortcodes_required' => array('[ADDITIONAL_LINE_ITEM_LIST]'),
 					),
 					'payment_list'                  => array(
 						'input'               => 'textarea',
@@ -408,7 +408,7 @@ 
 						'format'              => '%s',
 						'css_class'           => 'large-text',
 						'rows'                => '5',
-						'shortcodes_required' => array( '[PAYMENT_LIST_*]' ),
+						'shortcodes_required' => array('[PAYMENT_LIST_*]'),
 					),
 				),
 			),
@@ -422,7 +422,7 @@ 
 	 * @since 4.5.0
 	 */
 	protected function _set_default_message_types() {
-		$this->_default_message_types = array( 'receipt', 'invoice' );
+		$this->_default_message_types = array('receipt', 'invoice');
 	}
 
 
@@ -432,7 +432,7 @@ 
 	 * @since 4.5.0
 	 */
 	protected function _set_valid_message_types() {
-		$this->_valid_message_types = array( 'receipt', 'invoice' );
+		$this->_valid_message_types = array('receipt', 'invoice');
 	}
 
 
@@ -445,7 +445,7 @@ 
 	 */
 	protected function _send_message() {
 		$this->_template_args = array(
-			'page_title' => html_entity_decode( stripslashes( $this->_subject ), ENT_QUOTES, "UTF-8" ),
+			'page_title' => html_entity_decode(stripslashes($this->_subject), ENT_QUOTES, "UTF-8"),
 			'base_css'   => $this->get_variation(
 				$this->_tmp_pack,
 				$this->_incoming_message_type->name,
@@ -483,7 +483,7 @@ 
 			),
 		);
 		$this->_deregister_wp_hooks();
-		add_action( 'wp_enqueue_scripts', array( $this, 'enqueue_scripts_styles' ) );
+		add_action('wp_enqueue_scripts', array($this, 'enqueue_scripts_styles'));
 		echo $this->_get_main_template();
 		exit();
 	}
@@ -499,16 +499,16 @@ 
 	 * @return void
 	 */
 	protected function _deregister_wp_hooks() {
-		remove_all_actions( 'wp_head' );
-		remove_all_actions( 'wp_footer' );
-		remove_all_actions( 'wp_print_footer_scripts' );
-		remove_all_actions( 'wp_enqueue_scripts' );
+		remove_all_actions('wp_head');
+		remove_all_actions('wp_footer');
+		remove_all_actions('wp_print_footer_scripts');
+		remove_all_actions('wp_enqueue_scripts');
 		global $wp_scripts, $wp_styles;
 		$wp_scripts = $wp_styles = array();
 		//just add back in wp_enqueue_scripts and wp_print_footer_scripts cause that's all we want to load.
-		add_action( 'wp_footer', 'wp_print_footer_scripts' );
-		add_action( 'wp_print_footer_scripts', '_wp_footer_scripts' );
-		add_action( 'wp_head', 'wp_enqueue_scripts' );
+		add_action('wp_footer', 'wp_print_footer_scripts');
+		add_action('wp_print_footer_scripts', '_wp_footer_scripts');
+		add_action('wp_head', 'wp_enqueue_scripts');
 	}
 
 
@@ -520,11 +520,11 @@ 
 	 * @param bool $preview
 	 * @return string
 	 */
-	protected function _get_main_template( $preview = false ) {
-		$wrapper_template = $this->_tmp_pack->get_wrapper( $this->name, 'main' );
+	protected function _get_main_template($preview = false) {
+		$wrapper_template = $this->_tmp_pack->get_wrapper($this->name, 'main');
 		//include message type as a template arg
 		$this->_template_args['message_type'] = $this->_incoming_message_type;
-		return EEH_Template::display_template( $wrapper_template, $this->_template_args, true );
+		return EEH_Template::display_template($wrapper_template, $this->_template_args, true);
 	}
 
 
@@ -557,10 +557,10 @@ 
 		EE_message_type $incoming_message_type
 	) {
 		if (
-			( $incoming_message_type->name === 'invoice' || $incoming_message_type->name === 'receipt' )
-			&& apply_filters( 'FHEE_EE_Html_messenger__add_powered_by_credit_link_to_receipt_and_invoice', true )
+			($incoming_message_type->name === 'invoice' || $incoming_message_type->name === 'receipt')
+			&& apply_filters('FHEE_EE_Html_messenger__add_powered_by_credit_link_to_receipt_and_invoice', true)
 		) {
-			$content .= \EEH_Template::powered_by_event_espresso( 'aln-cntr' ) . EEH_HTML::div( EEH_HTML::p('&nbsp;') );
+			$content .= \EEH_Template::powered_by_event_espresso('aln-cntr').EEH_HTML::div(EEH_HTML::p('&nbsp;'));
 		}
 		return $content;
 	}

modules/gateways/Invoice/lib/invoice_functions.php

Spacing +4 added lines, -4 removed lines

@@ -8,9 +8,9 @@ 
  * @param $class_file
  * @return array
  */
-function espresso_invoice_template_files( $class_file) {
+function espresso_invoice_template_files($class_file) {
 	// read our template dir and build an array of files
-	$dhandle = opendir(dirname($class_file) . '/lib/templates/css/'); //If the template files have been moved to the uploads folder
+	$dhandle = opendir(dirname($class_file).'/lib/templates/css/'); //If the template files have been moved to the uploads folder
 	//} else return FALSE;
 
 	$files = array();
@@ -50,8 +50,8 @@ 
  * @param string $selected
  * @return string
  */
-function espresso_invoice_is_selected( $input_item, $selected='') {
-	if ( $input_item === $selected ) {
+function espresso_invoice_is_selected($input_item, $selected = '') {
+	if ($input_item === $selected) {
 		return 'selected="selected"';
 	} else {
 		return '';

core/data_migration_scripts/EE_DMS_Unknown_1_0_0.core.php

Spacing +4 added lines, -4 removed lines

@@ -2,7 +2,7 @@ 
 use EventEspresso\core\services\database\TableAnalysis;
 use EventEspresso\core\services\database\TableManager;
 
-if ( ! defined( 'EVENT_ESPRESSO_VERSION')) {
+if ( ! defined('EVENT_ESPRESSO_VERSION')) {
 	exit('No direct script access allowed');
 }
 
@@ -20,7 +20,7 @@ 
  */
 /**
  */
-class EE_DMS_Unknown_1_0_0 extends EE_Data_Migration_Script_Base{
+class EE_DMS_Unknown_1_0_0 extends EE_Data_Migration_Script_Base {
 
 	/**
 	 * Returns whether or not this data migration script can operate on the given version of the database.
@@ -47,11 +47,11 @@ 
 	 * @param TableManager  $table_manager
 	 * @param TableAnalysis $table_analysis
 	 */
-	public function __construct( TableManager $table_manager = null, TableAnalysis $table_analysis = null ) {
+	public function __construct(TableManager $table_manager = null, TableAnalysis $table_analysis = null) {
 		$this->_migration_stages = array();
 		$this->_pretty_name = __("Fatal Uncatchable Error Occurred", "event_espresso");
 //		dd($this);
-		parent::__construct( $table_manager, $table_analysis );
+		parent::__construct($table_manager, $table_analysis);
 	}
 	public function migration_page_hooks() {