eventespresso / event-espresso-core

core/db_classes/EE_Base_Class.class.php

Spacing +483 added lines, -483 removed lines

@@ -1,5 +1,5 @@ 
-<?php if (!defined('EVENT_ESPRESSO_VERSION')) {exit('No direct script access allowed');}
-do_action( 'AHEE_log', __FILE__, ' FILE LOADED', '' );
+<?php if ( ! defined('EVENT_ESPRESSO_VERSION')) {exit('No direct script access allowed'); }
+do_action('AHEE_log', __FILE__, ' FILE LOADED', '');
 /**
  *
  * Event Espresso
@@ -117,59 +117,59 @@ 
 	 * @throws EE_Error
 	 * @return \EE_Base_Class
 	 */
-	protected function __construct( $fieldValues = array(), $bydb = FALSE, $timezone = '', $date_formats = array() ){
+	protected function __construct($fieldValues = array(), $bydb = FALSE, $timezone = '', $date_formats = array()) {
 
-		$className=get_class($this);
+		$className = get_class($this);
 
-		do_action("AHEE__{$className}__construct",$this,$fieldValues);
-		$model=$this->get_model();
-		$model_fields = $model->field_settings( FALSE );
+		do_action("AHEE__{$className}__construct", $this, $fieldValues);
+		$model = $this->get_model();
+		$model_fields = $model->field_settings(FALSE);
 		// ensure $fieldValues is an array
-		$fieldValues = is_array( $fieldValues ) ? $fieldValues : array( $fieldValues );
+		$fieldValues = is_array($fieldValues) ? $fieldValues : array($fieldValues);
 		// EEH_Debug_Tools::printr( $fieldValues, '$fieldValues  <br /><span style="font-size:10px;font-weight:normal;">' . __FILE__ . '<br />line no: ' . __LINE__ . '</span>', 'auto' );
 		// verify client code has not passed any invalid field names
-		foreach($fieldValues as $field_name=> $field_value){
-			if( ! isset( $model_fields[ $field_name] ) ){
-				throw new EE_Error(sprintf(__("Invalid field (%s) passed to constructor of %s. Allowed fields are :%s", "event_espresso"),$field_name,get_class($this),implode(", ",array_keys($model_fields))));
+		foreach ($fieldValues as $field_name=> $field_value) {
+			if ( ! isset($model_fields[$field_name])) {
+				throw new EE_Error(sprintf(__("Invalid field (%s) passed to constructor of %s. Allowed fields are :%s", "event_espresso"), $field_name, get_class($this), implode(", ", array_keys($model_fields))));
 			}
 		}
 		// EEH_Debug_Tools::printr( $model_fields, '$model_fields  <br /><span style="font-size:10px;font-weight:normal;">' . __FILE__ . '<br />line no: ' . __LINE__ . '</span>', 'auto' );
-		$this->_timezone = EEH_DTT_Helper::get_valid_timezone_string( $timezone );
+		$this->_timezone = EEH_DTT_Helper::get_valid_timezone_string($timezone);
 
-		if ( ! empty( $date_formats ) && is_array( $date_formats ) ) {
+		if ( ! empty($date_formats) && is_array($date_formats)) {
 			$this->_dt_frmt = $date_formats[0];
 			$this->_tm_frmt = $date_formats[1];
 		} else {
 			//set default formats for date and time
-			$this->_dt_frmt = get_option( 'date_format' );
-			$this->_tm_frmt = get_option( 'time_format' );
+			$this->_dt_frmt = get_option('date_format');
+			$this->_tm_frmt = get_option('time_format');
 		}
 
 		//if db model is instantiating
-		if ( $bydb ){
+		if ($bydb) {
 			//client code has indicated these field values are from the database
-			foreach( $model_fields as $fieldName => $field ){
-				$this->set_from_db( $fieldName, isset( $fieldValues[ $fieldName] ) ? $fieldValues[ $fieldName ] : null );
+			foreach ($model_fields as $fieldName => $field) {
+				$this->set_from_db($fieldName, isset($fieldValues[$fieldName]) ? $fieldValues[$fieldName] : null);
 			}
 		} else {
 			//we're constructing a brand
 			//new instance of the model object. Generally, this means we'll need to do more field validation
-			foreach( $model_fields as $fieldName => $field ){
-				$this->set( $fieldName, isset( $fieldValues[ $fieldName ] ) ? $fieldValues[ $fieldName ] : null, true );
+			foreach ($model_fields as $fieldName => $field) {
+				$this->set($fieldName, isset($fieldValues[$fieldName]) ? $fieldValues[$fieldName] : null, true);
 			}
 		}
 
 		//remember what values were passed to this constructor
 		$this->_props_n_values_provided_in_constructor = $fieldValues;
 		//remember in entity mapper
-		if( ! $bydb  && $model->has_primary_key_field() && $this->ID() ){
+		if ( ! $bydb && $model->has_primary_key_field() && $this->ID()) {
 			$model->add_to_entity_map($this);
 		}
 		//setup all the relations
-		foreach($this->get_model()->relation_settings() as $relation_name=>$relation_obj){
-			if($relation_obj instanceof EE_Belongs_To_Relation){
+		foreach ($this->get_model()->relation_settings() as $relation_name=>$relation_obj) {
+			if ($relation_obj instanceof EE_Belongs_To_Relation) {
 				$this->_model_relations[$relation_name] = NULL;
-			}else{
+			} else {
 				$this->_model_relations[$relation_name] = array();
 			}
 		}
@@ -177,7 +177,7 @@ 
 		 * Action done at the end of each model object construction
 		 * @param EE_Base_Class $this the model object just created
 		 */
-		do_action( 'AHEE__EE_Base_Class__construct__finished', $this );
+		do_action('AHEE__EE_Base_Class__construct__finished', $this);
 	}
 
 	/**
@@ -197,7 +197,7 @@ 
 	 * @param boolean $allow_persist
 	 * @return boolean
 	 */
-	public function set_allow_persist( $allow_persist ) {
+	public function set_allow_persist($allow_persist) {
 		return $this->_allow_persist = $allow_persist;
 	}
 
@@ -211,11 +211,11 @@ 
 	 * @return mixed|null
 	 * @throws \EE_Error
 	 */
-	public function get_original( $field_name ){
-		if( isset( $this->_props_n_values_provided_in_constructor[ $field_name ] ) &&
-				$field_settings = $this->get_model()->field_settings_for( $field_name )){
-			return $field_settings->prepare_for_get( $this->_props_n_values_provided_in_constructor[ $field_name ] );
-		}else{
+	public function get_original($field_name) {
+		if (isset($this->_props_n_values_provided_in_constructor[$field_name]) &&
+				$field_settings = $this->get_model()->field_settings_for($field_name)) {
+			return $field_settings->prepare_for_get($this->_props_n_values_provided_in_constructor[$field_name]);
+		} else {
 			return NULL;
 		}
 	}
@@ -225,7 +225,7 @@ 
 	 * @param EE_Base_Class $obj
 	 * @return string
 	 */
-	public function get_class($obj){
+	public function get_class($obj) {
 		return get_class($obj);
 	}
 
@@ -240,19 +240,19 @@ 
 	 * @param bool      $use_default
 	 * @throws \EE_Error
 	 */
-	public function set( $field_name, $field_value, $use_default = FALSE ){
-		$field_obj = $this->get_model()->field_settings_for( $field_name );
-		if ( $field_obj instanceof EE_Model_Field_Base ) {
+	public function set($field_name, $field_value, $use_default = FALSE) {
+		$field_obj = $this->get_model()->field_settings_for($field_name);
+		if ($field_obj instanceof EE_Model_Field_Base) {
 //			if ( method_exists( $field_obj, 'set_timezone' )) {
-			if ( $field_obj instanceof EE_Datetime_Field ) {
-				$field_obj->set_timezone( $this->_timezone );
-				$field_obj->set_date_format( $this->_dt_frmt );
-				$field_obj->set_time_format( $this->_tm_frmt );
+			if ($field_obj instanceof EE_Datetime_Field) {
+				$field_obj->set_timezone($this->_timezone);
+				$field_obj->set_date_format($this->_dt_frmt);
+				$field_obj->set_time_format($this->_tm_frmt);
 			}
 
 			$holder_of_value = $field_obj->prepare_for_set($field_value);
 			//should the value be null?
-			if( ($field_value === NULL || $holder_of_value === NULL || $holder_of_value ==='') && $use_default){
+			if (($field_value === NULL || $holder_of_value === NULL || $holder_of_value === '') && $use_default) {
 				$this->_fields[$field_name] = $field_obj->get_default_value();
 
 				/**
@@ -264,26 +264,26 @@ 
 				 */
 				if (
 					$field_obj instanceof EE_Datetime_Field
-					&& $this->_fields[ $field_name ] !== null
+					&& $this->_fields[$field_name] !== null
 					&& ! $this->_fields[$field_name] instanceof DateTime
 				) {
-					empty( $this->_fields[$field_name] )
-						? $this->set( $field_name, time() )
-						: $this->set( $field_name, $this->_fields[$field_name] );
+					empty($this->_fields[$field_name])
+						? $this->set($field_name, time())
+						: $this->set($field_name, $this->_fields[$field_name]);
 				}
 
-			}else{
+			} else {
 				$this->_fields[$field_name] = $holder_of_value;
 			}
 
 			//if we're not in the constructor...
 			//now check if what we set was a primary key
-			if(
+			if (
 				//note: props_n_values_provided_in_constructor is only set at the END of the constructor
 				$this->_props_n_values_provided_in_constructor
 				&& $field_value
-				&& $field_name === self::_get_primary_key_name( get_class( $this ) )
-			){
+				&& $field_name === self::_get_primary_key_name(get_class($this))
+			) {
 				//if so, we want all this object's fields to be filled either with
 				//what we've explicitly set on this model
 				//or what we have in the db
@@ -291,20 +291,20 @@ 
 				$fields_on_model = self::_get_model(get_class($this))->field_settings();
 
 				$obj_in_db = self::_get_model(get_class($this))->get_one_by_ID($field_value);
-				foreach($fields_on_model as $field_obj){
-					if( ! array_key_exists($field_obj->get_name(), $this->_props_n_values_provided_in_constructor)
-						&& $field_obj->get_name() !== $field_name ){
+				foreach ($fields_on_model as $field_obj) {
+					if ( ! array_key_exists($field_obj->get_name(), $this->_props_n_values_provided_in_constructor)
+						&& $field_obj->get_name() !== $field_name) {
 
-						$this->set($field_obj->get_name(),$obj_in_db->get($field_obj->get_name()));
+						$this->set($field_obj->get_name(), $obj_in_db->get($field_obj->get_name()));
 					}
 				}
 				//oh this model object has an ID? well make sure its in the entity mapper
 				$this->get_model()->add_to_entity_map($this);
 			}
 			//let's unset any cache for this field_name from the $_cached_properties property.
-			$this->_clear_cached_property( $field_name );
-		}else{
-			throw new EE_Error( sprintf( __( "A valid EE_Model_Field_Base could not be found for the given field name: %s", "event_espresso" ), $field_name  ) );
+			$this->_clear_cached_property($field_name);
+		} else {
+			throw new EE_Error(sprintf(__("A valid EE_Model_Field_Base could not be found for the given field name: %s", "event_espresso"), $field_name));
 		}
 
 	}
@@ -321,14 +321,14 @@ 
 	 * @return int|bool @see EE_Base_Class::update_extra_meta() for return docs.
 	 * @throws \EE_Error
 	 */
-	public function set_field_or_extra_meta( $field_name, $field_value ) {
-		if ( $this->get_model()->has_field( $field_name ) ) {
-			$this->set( $field_name, $field_value );
+	public function set_field_or_extra_meta($field_name, $field_value) {
+		if ($this->get_model()->has_field($field_name)) {
+			$this->set($field_name, $field_value);
 			return true;
 		} else {
 			//ensure this object is saved first so that extra meta can be properly related.
 			$this->save();
-			return $this->update_extra_meta( $field_name, $field_value );
+			return $this->update_extra_meta($field_name, $field_value);
 		}
 	}
 
@@ -349,12 +349,12 @@ 
 	 * @return mixed|null  value for the field if found.  null if not found.
 	 * @throws \EE_Error
 	 */
-	public function get_field_or_extra_meta( $field_name ) {
-		if ( $this->get_model()->has_field( $field_name ) ) {
-			$column_value = $this->get( $field_name );
+	public function get_field_or_extra_meta($field_name) {
+		if ($this->get_model()->has_field($field_name)) {
+			$column_value = $this->get($field_name);
 		} else {
 			//This isn't a column in the main table, let's see if it is in the extra meta.
-			$column_value = $this->get_extra_meta( $field_name, true, null );
+			$column_value = $this->get_extra_meta($field_name, true, null);
 		}
 		return $column_value;
 	}
@@ -370,18 +370,18 @@ 
 	 * @return void
 	 * @throws \EE_Error
 	 */
-	public function set_timezone( $timezone = '' ) {
-		$this->_timezone = EEH_DTT_Helper::get_valid_timezone_string( $timezone );
+	public function set_timezone($timezone = '') {
+		$this->_timezone = EEH_DTT_Helper::get_valid_timezone_string($timezone);
 		//make sure we clear all cached properties because they won't be relevant now
 		$this->_clear_cached_properties();
 
 		//make sure we update field settings and the date for all EE_Datetime_Fields
-		$model_fields = $this->get_model()->field_settings( false );
-		foreach ( $model_fields as $field_name => $field_obj ) {
-			if ( $field_obj instanceof EE_Datetime_Field ) {
-				$field_obj->set_timezone( $this->_timezone );
-				if ( isset( $this->_fields[$field_name] ) && $this->_fields[$field_name] instanceof DateTime ) {
-					$this->_fields[$field_name]->setTimezone( new DateTimeZone( $this->_timezone ) );
+		$model_fields = $this->get_model()->field_settings(false);
+		foreach ($model_fields as $field_name => $field_obj) {
+			if ($field_obj instanceof EE_Datetime_Field) {
+				$field_obj->set_timezone($this->_timezone);
+				if (isset($this->_fields[$field_name]) && $this->_fields[$field_name] instanceof DateTime) {
+					$this->_fields[$field_name]->setTimezone(new DateTimeZone($this->_timezone));
 				}
 			}
 		}
@@ -410,7 +410,7 @@ 
 	 *
 	 * @param string $format   should be a format recognizable by PHP date() functions.
 	 */
-	public function set_date_format( $format ) {
+	public function set_date_format($format) {
 		$this->_dt_frmt = $format;
 		//clear cached_properties because they won't be relevant now.
 		$this->_clear_cached_properties();
@@ -426,7 +426,7 @@ 
 	 * @since 4.6
 	 * @param string $format should be a format recognizable by PHP date() functions.
 	 */
-	public function set_time_format( $format ) {
+	public function set_time_format($format) {
 		$this->_tm_frmt = $format;
 		//clear cached_properties because they won't be relevant now.
 		$this->_clear_cached_properties();
@@ -443,8 +443,8 @@ 
 	 *
 	 * @return mixed string|array
 	 */
-	public function get_format( $full = true ) {
-		return $full ? $this->_dt_frmt . ' ' . $this->_tm_frmt : array( $this->_dt_frmt, $this->_tm_frmt );
+	public function get_format($full = true) {
+		return $full ? $this->_dt_frmt.' '.$this->_tm_frmt : array($this->_dt_frmt, $this->_tm_frmt);
 	}
 
 
@@ -462,17 +462,17 @@ 
 	 * @throws EE_Error
 	 * @return mixed    index into cache, or just TRUE if the relation is of type Belongs_To (because there's only one related thing, no array)
 	 */
-	public function cache( $relationName = '', $object_to_cache = NULL, $cache_id = NULL ){
+	public function cache($relationName = '', $object_to_cache = NULL, $cache_id = NULL) {
 		// its entirely possible that there IS no related object yet in which case there is nothing to cache.
-		if ( ! $object_to_cache instanceof EE_Base_Class ) {
+		if ( ! $object_to_cache instanceof EE_Base_Class) {
 			return FALSE;
 		}
 		// also get "how" the object is related, or throw an error
-		if( ! $relationship_to_model = $this->get_model()->related_settings_for( $relationName )) {
-			throw new EE_Error( sprintf( __( 'There is no relationship to %s on a %s. Cannot cache it', 'event_espresso' ), $relationName, get_class( $this )));
+		if ( ! $relationship_to_model = $this->get_model()->related_settings_for($relationName)) {
+			throw new EE_Error(sprintf(__('There is no relationship to %s on a %s. Cannot cache it', 'event_espresso'), $relationName, get_class($this)));
 		}
 		// how many things are related ?
-		if( $relationship_to_model instanceof EE_Belongs_To_Relation ){
+		if ($relationship_to_model instanceof EE_Belongs_To_Relation) {
 			// if it's a "belongs to" relationship, then there's only one related model object  eg, if this is a registration, there's only 1 attendee for it
 			// so for these model objects just set it to be cached
 			$this->_model_relations[$relationName] = $object_to_cache;
@@ -480,26 +480,26 @@ 
 		} else {
 			// otherwise, this is the "many" side of a one to many relationship, so we'll add the object to the array of related objects for that type.
 			// eg: if this is an event, there are many registrations for that event, so we cache the registrations in an array
-			if( ! is_array( $this->_model_relations[$relationName] )) {
+			if ( ! is_array($this->_model_relations[$relationName])) {
 				// if for some reason, the cached item is a model object, then stick that in the array, otherwise start with an empty array
-				$this->_model_relations[$relationName] = $this->_model_relations[$relationName] instanceof EE_Base_Class ? array( $this->_model_relations[$relationName] ) : array();
+				$this->_model_relations[$relationName] = $this->_model_relations[$relationName] instanceof EE_Base_Class ? array($this->_model_relations[$relationName]) : array();
 			}
 			// first check for a cache_id which is normally empty
-			if ( ! empty( $cache_id )) {
+			if ( ! empty($cache_id)) {
 				// if the cache_id exists, then it means we are purposely trying to cache this with a known key that can then be used to retrieve the object later on
-				$this->_model_relations[$relationName][ $cache_id ] = $object_to_cache;
+				$this->_model_relations[$relationName][$cache_id] = $object_to_cache;
 				$return = $cache_id;
-			} elseif ( $object_to_cache->ID() ) {
+			} elseif ($object_to_cache->ID()) {
 				// OR the cached object originally came from the db, so let's just use it's PK for an ID
-				$this->_model_relations[$relationName][ $object_to_cache->ID() ] = $object_to_cache;
+				$this->_model_relations[$relationName][$object_to_cache->ID()] = $object_to_cache;
 				$return = $object_to_cache->ID();
 			} else {
 				// OR it's a new object with no ID, so just throw it in the array with an auto-incremented ID
 				$this->_model_relations[$relationName][] = $object_to_cache;
 				  // move the internal pointer to the end of the array
-				end( $this->_model_relations[$relationName] );
+				end($this->_model_relations[$relationName]);
 				// and grab the key so that we can return it
-				$return = key( $this->_model_relations[$relationName] );
+				$return = key($this->_model_relations[$relationName]);
 			}
 
 		}
@@ -518,11 +518,11 @@ 
 	 * @return void
 	 * @throws \EE_Error
 	 */
-	protected function _set_cached_property( $fieldname, $value, $cache_type = NULL ) {
+	protected function _set_cached_property($fieldname, $value, $cache_type = NULL) {
 		//first make sure this property exists
 		$this->get_model()->field_settings_for($fieldname);
 
-		$cache_type = empty( $cache_type ) ? 'standard' : $cache_type;
+		$cache_type = empty($cache_type) ? 'standard' : $cache_type;
 		$this->_cached_properties[$fieldname][$cache_type] = $value;
 	}
 
@@ -543,36 +543,36 @@ 
 	 * @return mixed                   whatever the value for the property is we're retrieving
 	 * @throws \EE_Error
 	 */
-	protected function _get_cached_property( $fieldname, $pretty = FALSE, $extra_cache_ref = NULL ) {
+	protected function _get_cached_property($fieldname, $pretty = FALSE, $extra_cache_ref = NULL) {
 		//verify the field exists
 		$this->get_model()->field_settings_for($fieldname);
 
 		$cache_type = $pretty ? 'pretty' : 'standard';
-		$cache_type .= !empty( $extra_cache_ref ) ? '_' . $extra_cache_ref : '';
+		$cache_type .= ! empty($extra_cache_ref) ? '_'.$extra_cache_ref : '';
 
-		if ( isset( $this->_cached_properties[$fieldname][$cache_type] ) ) {
+		if (isset($this->_cached_properties[$fieldname][$cache_type])) {
 			return $this->_cached_properties[$fieldname][$cache_type];
 		}
 
 		$field_obj = $this->get_model()->field_settings_for($fieldname);
-		if ( $field_obj instanceof EE_Model_Field_Base ) {
+		if ($field_obj instanceof EE_Model_Field_Base) {
 			/**
 			 * maybe this is EE_Datetime_Field.  If so we need to make sure timezone and
 			 * formats are correct.
 			 */
-			if ( $field_obj instanceof EE_Datetime_Field ) {
-				$field_obj->set_timezone( $this->_timezone );
-				$field_obj->set_date_format( $this->_dt_frmt, $pretty );
-				$field_obj->set_time_format( $this->_tm_frmt, $pretty );
+			if ($field_obj instanceof EE_Datetime_Field) {
+				$field_obj->set_timezone($this->_timezone);
+				$field_obj->set_date_format($this->_dt_frmt, $pretty);
+				$field_obj->set_time_format($this->_tm_frmt, $pretty);
 			}
 
-			if( ! isset($this->_fields[$fieldname])){
+			if ( ! isset($this->_fields[$fieldname])) {
 				$this->_fields[$fieldname] = NULL;
 			}
 			$value = $pretty
 				? $field_obj->prepare_for_pretty_echoing($this->_fields[$fieldname], $extra_cache_ref)
-				: $field_obj->prepare_for_get($this->_fields[$fieldname] );
-			$this->_set_cached_property( $fieldname, $value, $cache_type );
+				: $field_obj->prepare_for_get($this->_fields[$fieldname]);
+			$this->_set_cached_property($fieldname, $value, $cache_type);
 			return $value;
 		}
 		return null;
@@ -598,9 +598,9 @@ 
 	 * @param  string $property_name the property to remove if it exists (from the _cached_properties array)
 	 * @return void
 	 */
-	protected function _clear_cached_property( $property_name ) {
-		if ( isset( $this->_cached_properties[ $property_name ] ) ) {
-			unset( $this->_cached_properties[ $property_name ] );
+	protected function _clear_cached_property($property_name) {
+		if (isset($this->_cached_properties[$property_name])) {
+			unset($this->_cached_properties[$property_name]);
 		}
 	}
 
@@ -614,12 +614,12 @@ 
 	 * @return EE_Base_Class
 	 * @throws \EE_Error
 	 */
-	protected function ensure_related_thing_is_model_obj($object_or_id,$model_name){
+	protected function ensure_related_thing_is_model_obj($object_or_id, $model_name) {
 		$other_model_instance = self::_get_model_instance_with_name(
-			self::_get_model_classname( $model_name ),
+			self::_get_model_classname($model_name),
 			$this->_timezone
 		);
-		return $other_model_instance->ensure_is_obj( $object_or_id );
+		return $other_model_instance->ensure_is_obj($object_or_id);
 	}
 
 
@@ -636,32 +636,32 @@ 
 	 * @throws EE_Error
 	 * @return EE_Base_Class | boolean from which was cleared from the cache, or true if we requested to remove a relation from all
 	 */
-	public function clear_cache($relationName, $object_to_remove_or_index_into_array = NULL, $clear_all = FALSE){
+	public function clear_cache($relationName, $object_to_remove_or_index_into_array = NULL, $clear_all = FALSE) {
 		$relationship_to_model = $this->get_model()->related_settings_for($relationName);
 		$index_in_cache = '';
-		if( ! $relationship_to_model){
+		if ( ! $relationship_to_model) {
 			throw new EE_Error(
 				sprintf(
-					__( "There is no relationship to %s on a %s. Cannot clear that cache", 'event_espresso' ),
+					__("There is no relationship to %s on a %s. Cannot clear that cache", 'event_espresso'),
 					$relationName,
-					get_class( $this )
+					get_class($this)
 				)
 			);
 		}
-		if($clear_all){
+		if ($clear_all) {
 			$obj_removed = true;
 			$this->_model_relations[$relationName]  = null;
-		}elseif($relationship_to_model instanceof EE_Belongs_To_Relation){
+		}elseif ($relationship_to_model instanceof EE_Belongs_To_Relation) {
 			$obj_removed = $this->_model_relations[$relationName];
 			$this->_model_relations[$relationName]  = null;
-		}else{
-			if($object_to_remove_or_index_into_array instanceof EE_Base_Class && $object_to_remove_or_index_into_array->ID()){
+		} else {
+			if ($object_to_remove_or_index_into_array instanceof EE_Base_Class && $object_to_remove_or_index_into_array->ID()) {
 				$index_in_cache = $object_to_remove_or_index_into_array->ID();
-				if( is_array($this->_model_relations[$relationName]) && ! isset($this->_model_relations[$relationName][$index_in_cache])){
+				if (is_array($this->_model_relations[$relationName]) && ! isset($this->_model_relations[$relationName][$index_in_cache])) {
 					$index_found_at = NULL;
 					//find this object in the array even though it has a different key
-					foreach($this->_model_relations[$relationName] as $index=>$obj){
-						if(
+					foreach ($this->_model_relations[$relationName] as $index=>$obj) {
+						if (
 							$obj instanceof EE_Base_Class
 							&& (
 								$obj == $object_to_remove_or_index_into_array
@@ -672,34 +672,34 @@ 
 							break;
 						}
 					}
-					if($index_found_at){
+					if ($index_found_at) {
 						$index_in_cache = $index_found_at;
-					}else{
+					} else {
 						//it wasn't found. huh. well obviously it doesn't need to be removed from teh cache
 						//if it wasn't in it to begin with. So we're done
 						return $object_to_remove_or_index_into_array;
 					}
 				}
-			}elseif($object_to_remove_or_index_into_array instanceof EE_Base_Class){
+			}elseif ($object_to_remove_or_index_into_array instanceof EE_Base_Class) {
 				//so they provided a model object, but it's not yet saved to the DB... so let's go hunting for it!
-				foreach($this->get_all_from_cache($relationName) as $index => $potentially_obj_we_want){
-					if($potentially_obj_we_want == $object_to_remove_or_index_into_array){
+				foreach ($this->get_all_from_cache($relationName) as $index => $potentially_obj_we_want) {
+					if ($potentially_obj_we_want == $object_to_remove_or_index_into_array) {
 						$index_in_cache = $index;
 					}
 				}
-			}else{
+			} else {
 				$index_in_cache = $object_to_remove_or_index_into_array;
 			}
 			//supposedly we've found it. But it could just be that the client code
 			//provided a bad index/object
 			if (
 				isset(
-					$this->_model_relations[ $relationName ],
-					$this->_model_relations[ $relationName ][ $index_in_cache ]
+					$this->_model_relations[$relationName],
+					$this->_model_relations[$relationName][$index_in_cache]
 				)
 			) {
-				$obj_removed = $this->_model_relations[ $relationName ][ $index_in_cache ];
-				unset( $this->_model_relations[ $relationName ][ $index_in_cache ] );
+				$obj_removed = $this->_model_relations[$relationName][$index_in_cache];
+				unset($this->_model_relations[$relationName][$index_in_cache]);
 			} else {
 				//that thing was never cached anyways.
 				$obj_removed = null;
@@ -720,24 +720,24 @@ 
 	 * @return boolean TRUE on success, FALSE on fail
 	 * @throws \EE_Error
 	 */
-	public function update_cache_after_object_save( $relationName, EE_Base_Class $newly_saved_object, $current_cache_id = '') {
+	public function update_cache_after_object_save($relationName, EE_Base_Class $newly_saved_object, $current_cache_id = '') {
 		// verify that incoming object is of the correct type
-		$obj_class = 'EE_' . $relationName;
-		if ( $newly_saved_object instanceof $obj_class ) {
+		$obj_class = 'EE_'.$relationName;
+		if ($newly_saved_object instanceof $obj_class) {
 			/* @type EE_Base_Class $newly_saved_object*/
 			// now get the type of relation
-			$relationship_to_model = $this->get_model()->related_settings_for( $relationName );
+			$relationship_to_model = $this->get_model()->related_settings_for($relationName);
 			// if this is a 1:1 relationship
-			if( $relationship_to_model instanceof EE_Belongs_To_Relation ) {
+			if ($relationship_to_model instanceof EE_Belongs_To_Relation) {
 				// then just replace the cached object with the newly saved object
 				$this->_model_relations[$relationName] = $newly_saved_object;
 				return TRUE;
 			// or if it's some kind of sordid feral polyamorous relationship...
-			} elseif ( is_array( $this->_model_relations[$relationName] ) && isset( $this->_model_relations[$relationName][ $current_cache_id ] )) {
+			} elseif (is_array($this->_model_relations[$relationName]) && isset($this->_model_relations[$relationName][$current_cache_id])) {
 				// then remove the current cached item
-				unset( $this->_model_relations[$relationName][ $current_cache_id ] );
+				unset($this->_model_relations[$relationName][$current_cache_id]);
 				// and cache the newly saved object using it's new ID
-				$this->_model_relations[$relationName][ $newly_saved_object->ID() ] = $newly_saved_object;
+				$this->_model_relations[$relationName][$newly_saved_object->ID()] = $newly_saved_object;
 				return TRUE;
 			}
 		}
@@ -753,11 +753,11 @@ 
 	 * @param string $relationName
 	 * @return EE_Base_Class
 	 */
-	public function get_one_from_cache($relationName){
-		$cached_array_or_object = isset( $this->_model_relations[$relationName] ) ? $this->_model_relations[$relationName] : null;
-		if(is_array($cached_array_or_object)){
+	public function get_one_from_cache($relationName) {
+		$cached_array_or_object = isset($this->_model_relations[$relationName]) ? $this->_model_relations[$relationName] : null;
+		if (is_array($cached_array_or_object)) {
 			return array_shift($cached_array_or_object);
-		}else{
+		} else {
 			return $cached_array_or_object;
 		}
 	}
@@ -772,23 +772,23 @@ 
 	 * @throws \EE_Error
 	 * @return EE_Base_Class[] NOT necessarily indexed by primary keys
 	 */
-	public function get_all_from_cache($relationName){
-		$objects = isset( $this->_model_relations[$relationName] ) ? $this->_model_relations[$relationName] : array();
+	public function get_all_from_cache($relationName) {
+		$objects = isset($this->_model_relations[$relationName]) ? $this->_model_relations[$relationName] : array();
 		// if the result is not an array, but exists, make it an array
-		$objects = is_array( $objects ) ? $objects : array( $objects );
+		$objects = is_array($objects) ? $objects : array($objects);
 		//bugfix for https://events.codebasehq.com/projects/event-espresso/tickets/7143
 		//basically, if this model object was stored in the session, and these cached model objects
 		//already have IDs, let's make sure they're in their model's entity mapper
 		//otherwise we will have duplicates next time we call
 		// EE_Registry::instance()->load_model( $relationName )->get_one_by_ID( $result->ID() );
-		$model = EE_Registry::instance()->load_model( $relationName );
-		foreach( $objects as $model_object ){
-			if( $model instanceof EEM_Base && $model_object instanceof EE_Base_Class ){
+		$model = EE_Registry::instance()->load_model($relationName);
+		foreach ($objects as $model_object) {
+			if ($model instanceof EEM_Base && $model_object instanceof EE_Base_Class) {
 				//ensure its in the map if it has an ID; otherwise it will be added to the map when its saved
-				if( $model_object->ID() ){
-					$model->add_to_entity_map( $model_object );
+				if ($model_object->ID()) {
+					$model->add_to_entity_map($model_object);
 				}
-			}else{
+			} else {
 				throw new EE_Error(
 					sprintf(
 						__(
@@ -796,7 +796,7 @@ 
 							'event_espresso'
 						),
 						$relationName,
-						gettype( $model_object )
+						gettype($model_object)
 					)
 				);
 			}
@@ -818,15 +818,15 @@ 
 	 * @return array|EE_Base_Class[]
 	 * @throws \EE_Error
 	 */
-	public function next_x( $field_to_order_by = null, $limit = 1, $query_params = array(), $columns_to_select = null ) {
-		$field = empty( $field_to_order_by ) && $this->get_model()->has_primary_key_field()
+	public function next_x($field_to_order_by = null, $limit = 1, $query_params = array(), $columns_to_select = null) {
+		$field = empty($field_to_order_by) && $this->get_model()->has_primary_key_field()
 			? $this->get_model()->get_primary_key_field()->get_name()
 			: $field_to_order_by;
-		$current_value = ! empty( $field ) ? $this->get( $field ) : null;
-		if ( empty( $field ) || empty( $current_value ) ) {
+		$current_value = ! empty($field) ? $this->get($field) : null;
+		if (empty($field) || empty($current_value)) {
 			return array();
 		}
-		return $this->get_model()->next_x( $current_value, $field, $limit, $query_params, $columns_to_select );
+		return $this->get_model()->next_x($current_value, $field, $limit, $query_params, $columns_to_select);
 	}
 
 
@@ -843,15 +843,15 @@ 
 	 * @return array|EE_Base_Class[]
 	 * @throws \EE_Error
 	 */
-	public function previous_x( $field_to_order_by = null, $limit = 1, $query_params = array(), $columns_to_select = null ) {
-		$field = empty( $field_to_order_by ) && $this->get_model()->has_primary_key_field()
+	public function previous_x($field_to_order_by = null, $limit = 1, $query_params = array(), $columns_to_select = null) {
+		$field = empty($field_to_order_by) && $this->get_model()->has_primary_key_field()
 			? $this->get_model()->get_primary_key_field()->get_name()
 			: $field_to_order_by;
-		$current_value = ! empty( $field ) ? $this->get( $field ) : null;
-		if ( empty( $field ) || empty( $current_value ) ) {
+		$current_value = ! empty($field) ? $this->get($field) : null;
+		if (empty($field) || empty($current_value)) {
 			return array();
 		}
-		return $this->get_model()->previous_x( $current_value, $field, $limit, $query_params, $columns_to_select );
+		return $this->get_model()->previous_x($current_value, $field, $limit, $query_params, $columns_to_select);
 	}
 
 
@@ -867,15 +867,15 @@ 
 	 * @return array|EE_Base_Class
 	 * @throws \EE_Error
 	 */
-	public function next( $field_to_order_by = null, $query_params = array(), $columns_to_select = null ) {
-		$field = empty( $field_to_order_by ) && $this->get_model()->has_primary_key_field()
+	public function next($field_to_order_by = null, $query_params = array(), $columns_to_select = null) {
+		$field = empty($field_to_order_by) && $this->get_model()->has_primary_key_field()
 			? $this->get_model()->get_primary_key_field()->get_name()
 			: $field_to_order_by;
-		$current_value = ! empty( $field ) ? $this->get( $field ) : null;
-		if ( empty( $field ) || empty( $current_value ) ) {
+		$current_value = ! empty($field) ? $this->get($field) : null;
+		if (empty($field) || empty($current_value)) {
 			return array();
 		}
-		return $this->get_model()->next( $current_value, $field, $query_params, $columns_to_select );
+		return $this->get_model()->next($current_value, $field, $query_params, $columns_to_select);
 	}
 
 
@@ -891,15 +891,15 @@ 
 	 * @return array|EE_Base_Class
 	 * @throws \EE_Error
 	 */
-	public function previous( $field_to_order_by = null, $query_params = array(), $columns_to_select = null ) {
-		$field = empty( $field_to_order_by ) && $this->get_model()->has_primary_key_field()
+	public function previous($field_to_order_by = null, $query_params = array(), $columns_to_select = null) {
+		$field = empty($field_to_order_by) && $this->get_model()->has_primary_key_field()
 			? $this->get_model()->get_primary_key_field()->get_name()
 			: $field_to_order_by;
-		$current_value = ! empty( $field ) ? $this->get( $field ) : null;
-		if ( empty( $field ) || empty( $current_value ) ) {
+		$current_value = ! empty($field) ? $this->get($field) : null;
+		if (empty($field) || empty($current_value)) {
 			return array();
 		}
-		return $this->get_model()->previous( $current_value, $field, $query_params, $columns_to_select );
+		return $this->get_model()->previous($current_value, $field, $query_params, $columns_to_select);
 	}
 
 
@@ -912,25 +912,25 @@ 
 	 * @param mixed  $field_value_from_db
 	 * @throws \EE_Error
 	 */
-	public function set_from_db($field_name,$field_value_from_db){
+	public function set_from_db($field_name, $field_value_from_db) {
 		$field_obj = $this->get_model()->field_settings_for($field_name);
-		if ( $field_obj instanceof EE_Model_Field_Base ) {
+		if ($field_obj instanceof EE_Model_Field_Base) {
 			//you would think the DB has no NULLs for non-null label fields right? wrong!
 			//eg, a CPT model object could have an entry in the posts table, but no
 			//entry in the meta table. Meaning that all its columns in the meta table
 			//are null! yikes! so when we find one like that, use defaults for its meta columns
-			if($field_value_from_db === NULL ){
-				if( $field_obj->is_nullable()){
+			if ($field_value_from_db === NULL) {
+				if ($field_obj->is_nullable()) {
 					//if the field allows nulls, then let it be null
 					$field_value = NULL;
-				}else{
+				} else {
 					$field_value = $field_obj->get_default_value();
 				}
-			}else{
-				$field_value = $field_obj->prepare_for_set_from_db( $field_value_from_db );
+			} else {
+				$field_value = $field_obj->prepare_for_set_from_db($field_value_from_db);
 			}
 			$this->_fields[$field_name] = $field_value;
-			$this->_clear_cached_property( $field_name );
+			$this->_clear_cached_property($field_name);
 		}
 	}
 
@@ -946,8 +946,8 @@ 
 	 * @return mixed
 	 * @throws \EE_Error
 	 */
-	public function get($field_name, $extra_cache_ref = NULL ){
-		return $this->_get_cached_property( $field_name, FALSE, $extra_cache_ref );
+	public function get($field_name, $extra_cache_ref = NULL) {
+		return $this->_get_cached_property($field_name, FALSE, $extra_cache_ref);
 	}
 
 
@@ -980,10 +980,10 @@ 
 	 *                                         just null is returned (because that indicates that likely
 	 *                                         this field is nullable).
 	 */
-	public function get_DateTime_object( $field_name ) {
-		$field_settings = $this->get_model()->field_settings_for( $field_name );
+	public function get_DateTime_object($field_name) {
+		$field_settings = $this->get_model()->field_settings_for($field_name);
 
-		if ( ! $field_settings instanceof EE_Datetime_Field ) {
+		if ( ! $field_settings instanceof EE_Datetime_Field) {
 			EE_Error::add_error(
 				sprintf(
 					__(
@@ -1015,7 +1015,7 @@ 
 	 * @return void
 	 * @throws \EE_Error
 	 */
-	public function e($field_name, $extra_cache_ref = NULL){
+	public function e($field_name, $extra_cache_ref = NULL) {
 		echo $this->get_pretty($field_name, $extra_cache_ref);
 	}
 
@@ -1029,8 +1029,8 @@ 
 	 * @return void
 	 * @throws \EE_Error
 	 */
-	public function f($field_name){
-		$this->e($field_name,'form_input');
+	public function f($field_name) {
+		$this->e($field_name, 'form_input');
 	}
 
 
@@ -1043,8 +1043,8 @@ 
 	 * @return mixed
 	 * @throws \EE_Error
 	 */
-	public function get_pretty($field_name, $extra_cache_ref = NULL){
-		return  $this->_get_cached_property( $field_name, TRUE, $extra_cache_ref );
+	public function get_pretty($field_name, $extra_cache_ref = NULL) {
+		return  $this->_get_cached_property($field_name, TRUE, $extra_cache_ref);
 	}
 
 
@@ -1062,36 +1062,36 @@ 
 	 * @return void | string | bool | EE_Error string on success, FALSE on fail, or EE_Error Exception is thrown if field is not a valid dtt field, or void if echoing
 	 * @throws \EE_Error
 	 */
-	protected function _get_datetime( $field_name, $dt_frmt = NULL, $tm_frmt = NULL, $date_or_time = NULL, $echo = FALSE ) {
+	protected function _get_datetime($field_name, $dt_frmt = NULL, $tm_frmt = NULL, $date_or_time = NULL, $echo = FALSE) {
 
-		$in_dt_frmt = empty($dt_frmt) ? $this->_dt_frmt :  $dt_frmt;
+		$in_dt_frmt = empty($dt_frmt) ? $this->_dt_frmt : $dt_frmt;
 		$in_tm_frmt = empty($tm_frmt) ? $this->_tm_frmt : $tm_frmt;
 
 		//validate field for datetime and returns field settings if valid.
-		$field = $this->_get_dtt_field_settings( $field_name );
+		$field = $this->_get_dtt_field_settings($field_name);
 
 		//clear cached property if either formats are not null.
-		if( $dt_frmt !== null || $tm_frmt !== null ) {
-			$this->_clear_cached_property( $field_name );
+		if ($dt_frmt !== null || $tm_frmt !== null) {
+			$this->_clear_cached_property($field_name);
 			//reset format properties because they are used in get()
 			$this->_dt_frmt = $in_dt_frmt;
 			$this->_tm_frmt = $in_tm_frmt;
 		}
-		if ( $echo ) {
-			$field->set_pretty_date_format( $in_dt_frmt );
+		if ($echo) {
+			$field->set_pretty_date_format($in_dt_frmt);
 		} else {
-			$field->set_date_format( $in_dt_frmt );
+			$field->set_date_format($in_dt_frmt);
 		}
-		if ( $echo ) {
-			$field->set_pretty_time_format( $in_tm_frmt );
+		if ($echo) {
+			$field->set_pretty_time_format($in_tm_frmt);
 		} else {
-			$field->set_time_format( $in_tm_frmt );
+			$field->set_time_format($in_tm_frmt);
 		}
 		//set timezone in field object
-		$field->set_timezone( $this->_timezone );
+		$field->set_timezone($this->_timezone);
 
 		//set the output returned
-		switch ( $date_or_time ) {
+		switch ($date_or_time) {
 
 			case 'D' :
 				$field->set_date_time_output('date');
@@ -1106,11 +1106,11 @@ 
 		}
 
 
-		if ( $echo ) {
-			$this->e( $field_name, $date_or_time );
+		if ($echo) {
+			$this->e($field_name, $date_or_time);
 			return '';
 		 }
-		return $this->get( $field_name, $date_or_time );
+		return $this->get($field_name, $date_or_time);
 	}
 
 
@@ -1123,8 +1123,8 @@ 
 	 * @return string            datetime value formatted
 	 * @throws \EE_Error
 	 */
-	public function get_date( $field_name, $format = NULL ) {
-		return $this->_get_datetime( $field_name, $format, NULL, 'D' );
+	public function get_date($field_name, $format = NULL) {
+		return $this->_get_datetime($field_name, $format, NULL, 'D');
 	}
 
 
@@ -1134,8 +1134,8 @@ 
 	 * @param null $format
 	 * @throws \EE_Error
 	 */
-	public function e_date( $field_name, $format = NULL ) {
-		$this->_get_datetime( $field_name, $format, NULL, 'D', TRUE );
+	public function e_date($field_name, $format = NULL) {
+		$this->_get_datetime($field_name, $format, NULL, 'D', TRUE);
 	}
 
 
@@ -1148,8 +1148,8 @@ 
 	 * @return string             datetime value formatted
 	 * @throws \EE_Error
 	 */
-	public function get_time( $field_name, $format = NULL ) {
-		return $this->_get_datetime( $field_name, NULL, $format, 'T' );
+	public function get_time($field_name, $format = NULL) {
+		return $this->_get_datetime($field_name, NULL, $format, 'T');
 	}
 
 
@@ -1159,8 +1159,8 @@ 
 	 * @param null $format
 	 * @throws \EE_Error
 	 */
-	public function e_time( $field_name, $format = NULL ) {
-		$this->_get_datetime( $field_name, NULL, $format, 'T', TRUE );
+	public function e_time($field_name, $format = NULL) {
+		$this->_get_datetime($field_name, NULL, $format, 'T', TRUE);
 	}
 
 
@@ -1174,8 +1174,8 @@ 
 	 * @return string             datetime value formatted
 	 * @throws \EE_Error
 	 */
-	public function get_datetime( $field_name, $dt_frmt = NULL, $tm_frmt = NULL ) {
-		return $this->_get_datetime( $field_name, $dt_frmt, $tm_frmt );
+	public function get_datetime($field_name, $dt_frmt = NULL, $tm_frmt = NULL) {
+		return $this->_get_datetime($field_name, $dt_frmt, $tm_frmt);
 	}
 
 
@@ -1186,8 +1186,8 @@ 
 	 * @param null $tm_frmt
 	 * @throws \EE_Error
 	 */
-	public function e_datetime( $field_name, $dt_frmt = NULL, $tm_frmt = NULL ) {
-		$this->_get_datetime( $field_name, $dt_frmt, $tm_frmt, NULL, TRUE);
+	public function e_datetime($field_name, $dt_frmt = NULL, $tm_frmt = NULL) {
+		$this->_get_datetime($field_name, $dt_frmt, $tm_frmt, NULL, TRUE);
 	}
 
 
@@ -1201,11 +1201,11 @@ 
 	 * @throws \EE_Error
 	 *                           field name.
 	 */
-	public function get_i18n_datetime( $field_name, $format = NULL ) {
-		$format = empty( $format ) ? $this->_dt_frmt . ' ' . $this->_tm_frmt : $format;
+	public function get_i18n_datetime($field_name, $format = NULL) {
+		$format = empty($format) ? $this->_dt_frmt.' '.$this->_tm_frmt : $format;
 		return date_i18n(
 			$format,
-			EEH_DTT_Helper::get_timestamp_with_offset( $this->get_raw( $field_name ), $this->_timezone )
+			EEH_DTT_Helper::get_timestamp_with_offset($this->get_raw($field_name), $this->_timezone)
 		);
 	}
 
@@ -1218,14 +1218,14 @@ 
 	 * @throws EE_Error
 	 * @return EE_Datetime_Field
 	 */
-	protected function _get_dtt_field_settings( $field_name ) {
+	protected function _get_dtt_field_settings($field_name) {
 		$field = $this->get_model()->field_settings_for($field_name);
 
 		//check if field is dtt
-		if ( $field instanceof EE_Datetime_Field ) {
+		if ($field instanceof EE_Datetime_Field) {
 			return $field;
 		} else {
-			throw new EE_Error( sprintf( __('The field name "%s" has been requested for the EE_Base_Class datetime functions and it is not a valid EE_Datetime_Field.  Please check the spelling of the field and make sure it has been setup as a EE_Datetime_Field in the %s model constructor', 'event_espresso'), $field_name, self::_get_model_classname( get_class($this) ) ) );
+			throw new EE_Error(sprintf(__('The field name "%s" has been requested for the EE_Base_Class datetime functions and it is not a valid EE_Datetime_Field.  Please check the spelling of the field and make sure it has been setup as a EE_Datetime_Field in the %s model constructor', 'event_espresso'), $field_name, self::_get_model_classname(get_class($this))));
 		}
 	}
 
@@ -1246,8 +1246,8 @@ 
 	 * @param string          $fieldname the name of the field the time is being set on (must match a EE_Datetime_Field)
 	 * @throws \EE_Error
 	 */
-	protected function _set_time_for( $time, $fieldname ) {
-		$this->_set_date_time( 'T', $time, $fieldname );
+	protected function _set_time_for($time, $fieldname) {
+		$this->_set_date_time('T', $time, $fieldname);
 	}
 
 
@@ -1260,8 +1260,8 @@ 
 	 * @param string          $fieldname the name of the field the date is being set on (must match a EE_Datetime_Field)
 	 * @throws \EE_Error
 	 */
-	protected function _set_date_for( $date, $fieldname ) {
-		$this->_set_date_time( 'D', $date, $fieldname );
+	protected function _set_date_for($date, $fieldname) {
+		$this->_set_date_time('D', $date, $fieldname);
 	}
 
 
@@ -1275,26 +1275,26 @@ 
 	 * @param string          $fieldname      the name of the field the date OR time is being set on (must match a EE_Datetime_Field property)
 	 * @throws \EE_Error
 	 */
-	protected function _set_date_time( $what = 'T', $datetime_value, $fieldname ) {
-		$field = $this->_get_dtt_field_settings( $fieldname );
-		$field->set_timezone( $this->_timezone );
-		$field->set_date_format( $this->_dt_frmt );
-		$field->set_time_format( $this->_tm_frmt );
-		switch ( $what ) {
+	protected function _set_date_time($what = 'T', $datetime_value, $fieldname) {
+		$field = $this->_get_dtt_field_settings($fieldname);
+		$field->set_timezone($this->_timezone);
+		$field->set_date_format($this->_dt_frmt);
+		$field->set_time_format($this->_tm_frmt);
+		switch ($what) {
 			case 'T' :
-				$this->_fields[ $fieldname ] = $field->prepare_for_set_with_new_time(
+				$this->_fields[$fieldname] = $field->prepare_for_set_with_new_time(
 					$datetime_value,
-					$this->_fields[ $fieldname ]
+					$this->_fields[$fieldname]
 				);
 				break;
 			case 'D' :
-				$this->_fields[ $fieldname ] = $field->prepare_for_set_with_new_date(
+				$this->_fields[$fieldname] = $field->prepare_for_set_with_new_date(
 					$datetime_value,
-					$this->_fields[ $fieldname ]
+					$this->_fields[$fieldname]
 				);
 				break;
 			case 'B' :
-				$this->_fields[ $fieldname ] = $field->prepare_for_set( $datetime_value );
+				$this->_fields[$fieldname] = $field->prepare_for_set($datetime_value);
 				break;
 		}
 		$this->_clear_cached_property($fieldname);
@@ -1316,17 +1316,17 @@ 
 	 * @throws EE_Error
 	 * @return string timestamp
 	 */
-	public function display_in_my_timezone( $field_name, $callback = 'get_datetime', $args = NULL, $prepend = '', $append = '' ) {
+	public function display_in_my_timezone($field_name, $callback = 'get_datetime', $args = NULL, $prepend = '', $append = '') {
 		$timezone = EEH_DTT_Helper::get_timezone();
-		if ( $timezone === $this->_timezone ) {
+		if ($timezone === $this->_timezone) {
 			return '';
 		}
 		$original_timezone = $this->_timezone;
-		$this->set_timezone( $timezone );
+		$this->set_timezone($timezone);
 
 		$fn = (array) $field_name;
-		$args = array_merge( $fn, (array) $args );
-		if ( ! method_exists( $this, $callback ) ) {
+		$args = array_merge($fn, (array) $args);
+		if ( ! method_exists($this, $callback)) {
 			throw new EE_Error(
 				sprintf(
 					__(
@@ -1338,9 +1338,9 @@ 
 			);
 		}
 		$args = (array) $args;
-		$return =  $prepend . call_user_func_array( array( $this, $callback ), $args ) . $append;
+		$return = $prepend.call_user_func_array(array($this, $callback), $args).$append;
 
-		$this->set_timezone( $original_timezone );
+		$this->set_timezone($original_timezone);
 		return $return;
 	}
 
@@ -1354,7 +1354,7 @@ 
 	 * @return boolean | int
 	 * @throws \EE_Error
 	 */
-	public function delete(){
+	public function delete() {
 		/**
 		 * Called just before the `EE_Base_Class::_delete` method call.
 		 * Note: `EE_Base_Class::_delete` might be overridden by child classes so any client code hooking into these actions
@@ -1363,7 +1363,7 @@ 
 		 *
 		 * @param EE_Base_Class $model_object about to be 'deleted'
 		 */
-		do_action( 'AHEE__EE_Base_Class__delete__before', $this );
+		do_action('AHEE__EE_Base_Class__delete__before', $this);
 		$result = $this->_delete();
 		/**
 		 * Called just after the `EE_Base_Class::_delete` method call.
@@ -1373,7 +1373,7 @@ 
 		 * @param EE_Base_Class $model_object that was just 'deleted'
 		 * @param boolean $result
 		 */
-		do_action( 'AHEE__EE_Base_Class__delete__end', $this, $result );
+		do_action('AHEE__EE_Base_Class__delete__end', $this, $result);
 		return $result;
 	}
 
@@ -1399,22 +1399,22 @@ 
 	 * @return bool | int
 	 * @throws \EE_Error
 	 */
-	public function delete_permanently(){
+	public function delete_permanently() {
 		/**
 		 * Called just before HARD deleting a model object
 		 *
 		 * @param EE_Base_Class $model_object about to be 'deleted'
 		 */
-		do_action( 'AHEE__EE_Base_Class__delete_permanently__before', $this );
-		$model=$this->get_model();
-		$result=$model->delete_permanently_by_ID($this->ID());
+		do_action('AHEE__EE_Base_Class__delete_permanently__before', $this);
+		$model = $this->get_model();
+		$result = $model->delete_permanently_by_ID($this->ID());
 		$this->refresh_cache_of_related_objects();
 		/**
 		 * Called just after HARD deleting a model object
 		 * @param EE_Base_Class $model_object that was just 'deleted'
 		 * @param boolean $result
 		 */
-		do_action( 'AHEE__EE_Base_Class__delete_permanently__end', $this, $result );
+		do_action('AHEE__EE_Base_Class__delete_permanently__end', $this, $result);
 		return $result;
 	}
 
@@ -1427,18 +1427,18 @@ 
 	 * @throws \EE_Error
 	 */
         public function refresh_cache_of_related_objects() {
-            foreach( $this->get_model()->relation_settings() as $relation_name => $relation_obj ) {
-                if( ! empty( $this->_model_relations[ $relation_name ] ) ) {
-                    $related_objects = $this->_model_relations[ $relation_name ];
-                    if( $relation_obj instanceof EE_Belongs_To_Relation ) {
+            foreach ($this->get_model()->relation_settings() as $relation_name => $relation_obj) {
+                if ( ! empty($this->_model_relations[$relation_name])) {
+                    $related_objects = $this->_model_relations[$relation_name];
+                    if ($relation_obj instanceof EE_Belongs_To_Relation) {
                         //this relation only stores a single model object, not an array
                         //but let's make it consistent
-                        $related_objects = array( $related_objects );
+                        $related_objects = array($related_objects);
                     }
-                    foreach( $related_objects as $related_object ) {
+                    foreach ($related_objects as $related_object) {
                         //only refresh their cache if they're in memory
-                        if( $related_object instanceof EE_Base_Class ) {
-							$related_object->clear_cache( $this->get_model()->get_this_model_name(), $this );
+                        if ($related_object instanceof EE_Base_Class) {
+							$related_object->clear_cache($this->get_model()->get_this_model_name(), $this);
                         }
                     }
                 }
@@ -1458,17 +1458,17 @@ 
 	 * @return int , 1 on a successful update, the ID of the new entry on insert; 0 on failure or if the model object
 	 * isn't allowed to persist (as determined by EE_Base_Class::allow_persist())
 	 */
-	public function save($set_cols_n_values=array()) {
+	public function save($set_cols_n_values = array()) {
 		/**
 		 * Filters the fields we're about to save on the model object
 		 *
 		 * @param array $set_cols_n_values
 		 * @param EE_Base_Class $model_object
 		 */
-		$set_cols_n_values = (array)apply_filters( 'FHEE__EE_Base_Class__save__set_cols_n_values', $set_cols_n_values, $this  );
+		$set_cols_n_values = (array) apply_filters('FHEE__EE_Base_Class__save__set_cols_n_values', $set_cols_n_values, $this);
 		//set attributes as provided in $set_cols_n_values
-		foreach($set_cols_n_values as $column=>$value){
-			$this->set($column,$value);
+		foreach ($set_cols_n_values as $column=>$value) {
+			$this->set($column, $value);
 		}
 		/**
 		 * Saving a model object.
@@ -1476,8 +1476,8 @@ 
 		 * Before we perform a save, this action is fired.
 		 * @param EE_Base_Class $model_object the model object about to be saved.
 		 */
-		do_action( 'AHEE__EE_Base_Class__save__begin', $this );
-		if( ! $this->allow_persist() ) {
+		do_action('AHEE__EE_Base_Class__save__begin', $this);
+		if ( ! $this->allow_persist()) {
 			return 0;
 		}
 		//now get current attribute values
@@ -1487,61 +1487,61 @@ 
 		$old_assumption_concerning_value_preparation = $this->get_model()->get_assumption_concerning_values_already_prepared_by_model_object();
 		$this->get_model()->assume_values_already_prepared_by_model_object(true);
 		//does this model have an autoincrement PK?
-		if($this->get_model()->has_primary_key_field()){
-			if($this->get_model()->get_primary_key_field()->is_auto_increment()){
+		if ($this->get_model()->has_primary_key_field()) {
+			if ($this->get_model()->get_primary_key_field()->is_auto_increment()) {
 				//ok check if it's set, if so: update; if not, insert
-				if ( ! empty( $save_cols_n_values[self::_get_primary_key_name( get_class($this) )] ) ){
-					$results = $this->get_model()->update_by_ID ( $save_cols_n_values, $this->ID() );
+				if ( ! empty($save_cols_n_values[self::_get_primary_key_name(get_class($this))])) {
+					$results = $this->get_model()->update_by_ID($save_cols_n_values, $this->ID());
 				} else {
-					unset($save_cols_n_values[self::_get_primary_key_name( get_class( $this) )]);
-					$results = $this->get_model()->insert( $save_cols_n_values );
-					if($results){
+					unset($save_cols_n_values[self::_get_primary_key_name(get_class($this))]);
+					$results = $this->get_model()->insert($save_cols_n_values);
+					if ($results) {
 						//if successful, set the primary key
 						//but don't use the normal SET method, because it will check if
 						//an item with the same ID exists in the mapper & db, then
 						//will find it in the db (because we just added it) and THAT object
 						//will get added to the mapper before we can add this one!
 						//but if we just avoid using the SET method, all that headache can be avoided
-						$pk_field_name =self::_get_primary_key_name( get_class($this));
+						$pk_field_name = self::_get_primary_key_name(get_class($this));
 						$this->_fields[$pk_field_name] = $results;
 						$this->_clear_cached_property($pk_field_name);
-						$this->get_model()->add_to_entity_map( $this );
+						$this->get_model()->add_to_entity_map($this);
 						$this->_update_cached_related_model_objs_fks();
 					}
 				}
-			}else{//PK is NOT auto-increment
+			} else {//PK is NOT auto-increment
 				//so check if one like it already exists in the db
-				if( $this->get_model()->exists_by_ID( $this->ID() ) ){
-					if( WP_DEBUG && ! $this->in_entity_map() ){
+				if ($this->get_model()->exists_by_ID($this->ID())) {
+					if (WP_DEBUG && ! $this->in_entity_map()) {
 						throw new EE_Error(
 							sprintf(
-								__( 'Using a model object %1$s that is NOT in the entity map, can lead to unexpected errors. You should either: %4$s 1. Put it in the entity mapper by calling %2$s %4$s 2. Discard this model object and use what is in the entity mapper %4$s 3. Fetch from the database using %3$s', 'event_espresso' ),
+								__('Using a model object %1$s that is NOT in the entity map, can lead to unexpected errors. You should either: %4$s 1. Put it in the entity mapper by calling %2$s %4$s 2. Discard this model object and use what is in the entity mapper %4$s 3. Fetch from the database using %3$s', 'event_espresso'),
 								get_class($this),
-								get_class( $this->get_model() ) . '::instance()->add_to_entity_map()',
-								get_class( $this->get_model() ) . '::instance()->get_one_by_ID()',
+								get_class($this->get_model()).'::instance()->add_to_entity_map()',
+								get_class($this->get_model()).'::instance()->get_one_by_ID()',
 								'<br />'
 							)
 						);
 					}
 					$results = $this->get_model()->update_by_ID($save_cols_n_values, $this->ID());
-				}else{
+				} else {
 					$results = $this->get_model()->insert($save_cols_n_values);
 					$this->_update_cached_related_model_objs_fks();
 				}
 			}
-		}else{//there is NO primary key
+		} else {//there is NO primary key
 			$already_in_db = false;
-			foreach($this->get_model()->unique_indexes() as $index){
+			foreach ($this->get_model()->unique_indexes() as $index) {
 				$uniqueness_where_params = array_intersect_key($save_cols_n_values, $index->fields());
-				if($this->get_model()->exists(array($uniqueness_where_params))){
+				if ($this->get_model()->exists(array($uniqueness_where_params))) {
 					$already_in_db = true;
 				}
 			}
-			if( $already_in_db ){
-				$combined_pk_fields_n_values = array_intersect_key( $save_cols_n_values, $this->get_model()->get_combined_primary_key_fields() );
-				$results = $this->get_model()->update( $save_cols_n_values,$combined_pk_fields_n_values );
-			}else{
-				$results = $this->get_model()->insert( $save_cols_n_values );
+			if ($already_in_db) {
+				$combined_pk_fields_n_values = array_intersect_key($save_cols_n_values, $this->get_model()->get_combined_primary_key_fields());
+				$results = $this->get_model()->update($save_cols_n_values, $combined_pk_fields_n_values);
+			} else {
+				$results = $this->get_model()->insert($save_cols_n_values);
 			}
 		}
 		//restore the old assumption about values being prepared by the model object
@@ -1554,7 +1554,7 @@ 
 		 * @param boolean|int $results if it were updated, TRUE or FALSE; if it were newly inserted
 		 * the new ID (or 0 if an error occurred and it wasn't updated)
 		 */
-		do_action( 'AHEE__EE_Base_Class__save__end', $this, $results );
+		do_action('AHEE__EE_Base_Class__save__end', $this, $results);
 		return $results;
 	}
 
@@ -1569,15 +1569,15 @@ 
 	 * @return void
 	 * @throws \EE_Error
 	 */
-	protected function _update_cached_related_model_objs_fks(){
-		foreach( $this->get_model()->relation_settings() as $relation_name => $relation_obj ){
-			if( $relation_obj instanceof EE_Has_Many_Relation ){
-				foreach( $this->get_all_from_cache( $relation_name ) as $related_model_obj_in_cache) {
+	protected function _update_cached_related_model_objs_fks() {
+		foreach ($this->get_model()->relation_settings() as $relation_name => $relation_obj) {
+			if ($relation_obj instanceof EE_Has_Many_Relation) {
+				foreach ($this->get_all_from_cache($relation_name) as $related_model_obj_in_cache) {
 					$fk_to_this = $related_model_obj_in_cache->get_model()->get_foreign_key_to(
 						$this->get_model()->get_this_model_name()
 					);
-					$related_model_obj_in_cache->set($fk_to_this->get_name(), $this->ID() );
-					if( $related_model_obj_in_cache->ID() ){
+					$related_model_obj_in_cache->set($fk_to_this->get_name(), $this->ID());
+					if ($related_model_obj_in_cache->ID()) {
 						$related_model_obj_in_cache->save();
 					}
 				}
@@ -1598,21 +1598,21 @@ 
 	 * @return int ID of new model object on save; 0 on failure+
 	 * @throws \EE_Error
 	 */
-	public function save_new_cached_related_model_objs(){
+	public function save_new_cached_related_model_objs() {
 		//make sure this has been saved
-		if( ! $this->ID()){
+		if ( ! $this->ID()) {
 			$id = $this->save();
-		}else{
+		} else {
 			$id = $this->ID();
 		}
 		//now save all the NEW cached model objects  (ie they don't exist in the DB)
-		foreach($this->get_model()->relation_settings() as $relationName => $relationObj){
+		foreach ($this->get_model()->relation_settings() as $relationName => $relationObj) {
 
 
-			if($this->_model_relations[$relationName]){
+			if ($this->_model_relations[$relationName]) {
 				//is this a relation where we should expect just ONE related object (ie, EE_Belongs_To_relation)
 				//or MANY related objects (ie, EE_HABTM_Relation or EE_Has_Many_Relation)?
-				if($relationObj instanceof EE_Belongs_To_Relation){
+				if ($relationObj instanceof EE_Belongs_To_Relation) {
 					//add a relation to that relation type (which saves the appropriate thing in the process)
 					//but ONLY if it DOES NOT exist in the DB
 					/* @var $related_model_obj EE_Base_Class */
@@ -1621,8 +1621,8 @@ 
 						$this->_add_relation_to($related_model_obj, $relationName);
 						$related_model_obj->save_new_cached_related_model_objs();
 //					}
-				}else{
-					foreach($this->_model_relations[$relationName] as $related_model_obj){
+				} else {
+					foreach ($this->_model_relations[$relationName] as $related_model_obj) {
 						//add a relation to that relation type (which saves the appropriate thing in the process)
 						//but ONLY if it DOES NOT exist in the DB
 //						if( ! $related_model_obj->ID()){
@@ -1643,8 +1643,8 @@ 
 	 * @return \EEM_Base | \EEM_CPT_Base
 	 */
 	public function get_model() {
-		$modelName = self::_get_model_classname( get_class($this) );
-		return self::_get_model_instance_with_name($modelName, $this->_timezone );
+		$modelName = self::_get_model_classname(get_class($this));
+		return self::_get_model_instance_with_name($modelName, $this->_timezone);
 	}
 
 
@@ -1655,10 +1655,10 @@ 
 	 * @return mixed bool|EE_Base_Class|EEM_CPT_Base
 	 * @throws \EE_Error
 	 */
-	protected static function _get_object_from_entity_mapper($props_n_values, $classname){
+	protected static function _get_object_from_entity_mapper($props_n_values, $classname) {
 		//TODO: will not work for Term_Relationships because they have no PK!
-		$primary_id_ref = self::_get_primary_key_name( $classname );
-		if ( array_key_exists( $primary_id_ref, $props_n_values ) && !empty( $props_n_values[$primary_id_ref] ) ) {
+		$primary_id_ref = self::_get_primary_key_name($classname);
+		if (array_key_exists($primary_id_ref, $props_n_values) && ! empty($props_n_values[$primary_id_ref])) {
 			$id = $props_n_values[$primary_id_ref];
 			return self::_get_model($classname)->get_from_entity_map($id);
 		}
@@ -1679,37 +1679,37 @@ 
 	 * @return mixed (EE_Base_Class|bool)
 	 * @throws \EE_Error
 	 */
-	protected static function _check_for_object( $props_n_values, $classname, $timezone = NULL, $date_formats = array() ) {
+	protected static function _check_for_object($props_n_values, $classname, $timezone = NULL, $date_formats = array()) {
 		$existing = null;
-		if ( self::_get_model( $classname )->has_primary_key_field() ) {
-			$primary_id_ref = self::_get_primary_key_name( $classname );
-			if ( array_key_exists( $primary_id_ref, $props_n_values )
-			     && ! empty( $props_n_values[ $primary_id_ref ] )
+		if (self::_get_model($classname)->has_primary_key_field()) {
+			$primary_id_ref = self::_get_primary_key_name($classname);
+			if (array_key_exists($primary_id_ref, $props_n_values)
+			     && ! empty($props_n_values[$primary_id_ref])
 			) {
-				$existing = self::_get_model( $classname, $timezone )->get_one_by_ID(
-					$props_n_values[ $primary_id_ref ]
+				$existing = self::_get_model($classname, $timezone)->get_one_by_ID(
+					$props_n_values[$primary_id_ref]
 				);
 			}
-		} elseif ( self::_get_model( $classname, $timezone )->has_all_combined_primary_key_fields( $props_n_values ) ) {
+		} elseif (self::_get_model($classname, $timezone)->has_all_combined_primary_key_fields($props_n_values)) {
 			//no primary key on this model, but there's still a matching item in the DB
-			$existing = self::_get_model( $classname, $timezone )->get_one_by_ID(
-				self::_get_model( $classname, $timezone )->get_index_primary_key_string( $props_n_values )
+			$existing = self::_get_model($classname, $timezone)->get_one_by_ID(
+				self::_get_model($classname, $timezone)->get_index_primary_key_string($props_n_values)
 			);
 		}
-		if ( $existing ) {
+		if ($existing) {
 
 			//set date formats if present before setting values
-			if ( ! empty( $date_formats ) && is_array( $date_formats ) ) {
-				$existing->set_date_format( $date_formats[0] );
-				$existing->set_time_format( $date_formats[1] );
+			if ( ! empty($date_formats) && is_array($date_formats)) {
+				$existing->set_date_format($date_formats[0]);
+				$existing->set_time_format($date_formats[1]);
 			} else {
 				//set default formats for date and time
-				$existing->set_date_format( get_option( 'date_format' ) );
-				$existing->set_time_format( get_option( 'time_format' ) );
+				$existing->set_date_format(get_option('date_format'));
+				$existing->set_time_format(get_option('time_format'));
 			}
 
-			foreach ( $props_n_values as $property => $field_value ) {
-				$existing->set( $property, $field_value );
+			foreach ($props_n_values as $property => $field_value) {
+				$existing->set($property, $field_value);
 			}
 			return $existing;
 		} else {
@@ -1727,9 +1727,9 @@ 
 	 * @throws EE_Error
 	 * @return EEM_Base
 	 */
-	protected static function  _get_model( $classname, $timezone = NULL ){
+	protected static function  _get_model($classname, $timezone = NULL) {
 		//find model for this class
-		if( ! $classname ){
+		if ( ! $classname) {
 			throw new EE_Error(
 				sprintf(
 					__(
@@ -1740,8 +1740,8 @@ 
 				)
 			);
 		}
-		$modelName=self::_get_model_classname($classname);
-		return self::_get_model_instance_with_name($modelName, $timezone );
+		$modelName = self::_get_model_classname($classname);
+		return self::_get_model_instance_with_name($modelName, $timezone);
 	}
 
 
@@ -1752,10 +1752,10 @@ 
 	 * @param null   $timezone
 	 * @return EEM_Base
 	 */
-	protected static function _get_model_instance_with_name($model_classname, $timezone = NULL){
-		$model_classname = str_replace( 'EEM_', '', $model_classname );
-		$model = EE_Registry::instance()->load_model( $model_classname );
-		$model->set_timezone( $timezone );
+	protected static function _get_model_instance_with_name($model_classname, $timezone = NULL) {
+		$model_classname = str_replace('EEM_', '', $model_classname);
+		$model = EE_Registry::instance()->load_model($model_classname);
+		$model->set_timezone($timezone);
 		return $model;
 	}
 
@@ -1767,10 +1767,10 @@ 
 	 * @param null $model_name
 	 * @return string like EEM_Attendee
 	 */
-	private static function _get_model_classname( $model_name = null){
-		if(strpos($model_name,"EE_")===0){
-			$model_classname=str_replace("EE_","EEM_",$model_name);
-		}else{
+	private static function _get_model_classname($model_name = null) {
+		if (strpos($model_name, "EE_") === 0) {
+			$model_classname = str_replace("EE_", "EEM_", $model_name);
+		} else {
 			$model_classname = "EEM_".$model_name;
 		}
 		return $model_classname;
@@ -1784,16 +1784,16 @@ 
 	 * @throws EE_Error
 	 * @return string
 	 */
-	protected static function _get_primary_key_name( $classname = NULL ){
-		if( ! $classname){
+	protected static function _get_primary_key_name($classname = NULL) {
+		if ( ! $classname) {
 			throw new EE_Error(
 				sprintf(
-					__( "What were you thinking calling _get_primary_key_name(%s)", "event_espresso" ),
+					__("What were you thinking calling _get_primary_key_name(%s)", "event_espresso"),
 					$classname
 				)
 			);
 		}
-		return self::_get_model( $classname )->get_primary_key_field()->get_name();
+		return self::_get_model($classname)->get_primary_key_field()->get_name();
 	}
 
 
@@ -1807,12 +1807,12 @@ 
 	 * @return mixed, if the primary key is of type INT it'll be an int. Otherwise it could be a string
 	 * @throws \EE_Error
 	 */
-	public function ID(){
+	public function ID() {
 		//now that we know the name of the variable, use a variable variable to get its value and return its
-		if( $this->get_model()->has_primary_key_field() ) {
-			return $this->_fields[ self::_get_primary_key_name( get_class($this) ) ];
-		}else{
-			return $this->get_model()->get_index_primary_key_string( $this->_fields );
+		if ($this->get_model()->has_primary_key_field()) {
+			return $this->_fields[self::_get_primary_key_name(get_class($this))];
+		} else {
+			return $this->get_model()->get_index_primary_key_string($this->_fields);
 		}
 	}
 
@@ -1830,38 +1830,38 @@ 
 	 * @throws EE_Error
 	 * @return EE_Base_Class the object the relation was added to
 	 */
-	public function _add_relation_to( $otherObjectModelObjectOrID,$relationName, $extra_join_model_fields_n_values = array(), $cache_id = NULL ){
+	public function _add_relation_to($otherObjectModelObjectOrID, $relationName, $extra_join_model_fields_n_values = array(), $cache_id = NULL) {
 		//if this thing exists in the DB, save the relation to the DB
-		if( $this->ID() ){
-			$otherObject = $this->get_model()->add_relationship_to( $this, $otherObjectModelObjectOrID, $relationName, $extra_join_model_fields_n_values );
+		if ($this->ID()) {
+			$otherObject = $this->get_model()->add_relationship_to($this, $otherObjectModelObjectOrID, $relationName, $extra_join_model_fields_n_values);
 			//clear cache so future get_many_related and get_first_related() return new results.
-			$this->clear_cache( $relationName, $otherObject, TRUE );
-                        if( $otherObject instanceof EE_Base_Class ) {
-                            $otherObject->clear_cache( $this->get_model()->get_this_model_name(), $this );
+			$this->clear_cache($relationName, $otherObject, TRUE);
+                        if ($otherObject instanceof EE_Base_Class) {
+                            $otherObject->clear_cache($this->get_model()->get_this_model_name(), $this);
                         }
 		} else {
 			//this thing doesn't exist in the DB,  so just cache it
-			if( ! $otherObjectModelObjectOrID instanceof EE_Base_Class){
-				throw new EE_Error( sprintf(
-					__( 'Before a model object is saved to the database, calls to _add_relation_to must be passed an actual object, not just an ID. You provided %s as the model object to a %s', 'event_espresso' ),
+			if ( ! $otherObjectModelObjectOrID instanceof EE_Base_Class) {
+				throw new EE_Error(sprintf(
+					__('Before a model object is saved to the database, calls to _add_relation_to must be passed an actual object, not just an ID. You provided %s as the model object to a %s', 'event_espresso'),
 					$otherObjectModelObjectOrID,
-					get_class( $this )
+					get_class($this)
 				));
 			} else {
 				$otherObject = $otherObjectModelObjectOrID;
 			}
-			$this->cache( $relationName, $otherObjectModelObjectOrID, $cache_id );
+			$this->cache($relationName, $otherObjectModelObjectOrID, $cache_id);
 		}
-                if( $otherObject instanceof EE_Base_Class ) {
+                if ($otherObject instanceof EE_Base_Class) {
                     //fix the reciprocal relation too
-                    if( $otherObject->ID() ) {
+                    if ($otherObject->ID()) {
                             //its saved so assumed relations exist in the DB, so we can just
                             //clear the cache so future queries use the updated info in the DB
-                            $otherObject->clear_cache( $this->get_model()->get_this_model_name(), null, true );
+                            $otherObject->clear_cache($this->get_model()->get_this_model_name(), null, true);
                     } else {
 
                             //it's not saved, so it caches relations like this
-                            $otherObject->cache( $this->get_model()->get_this_model_name(), $this );
+                            $otherObject->cache($this->get_model()->get_this_model_name(), $this);
                     }
                 }
 		return $otherObject;
@@ -1885,17 +1885,17 @@ 
 	 * @return EE_Base_Class the relation was removed from
 	 * @throws \EE_Error
 	 */
-	public function _remove_relation_to($otherObjectModelObjectOrID,$relationName, $where_query = array() ){
-		if ( $this->ID() ) {
+	public function _remove_relation_to($otherObjectModelObjectOrID, $relationName, $where_query = array()) {
+		if ($this->ID()) {
 			//if this exists in the DB, save the relation change to the DB too
-			$otherObject = $this->get_model()->remove_relationship_to( $this, $otherObjectModelObjectOrID, $relationName, $where_query );
-			$this->clear_cache( $relationName, $otherObject );
+			$otherObject = $this->get_model()->remove_relationship_to($this, $otherObjectModelObjectOrID, $relationName, $where_query);
+			$this->clear_cache($relationName, $otherObject);
 		} else {
 			//this doesn't exist in the DB, just remove it from the cache
-			$otherObject = $this->clear_cache( $relationName, $otherObjectModelObjectOrID );
+			$otherObject = $this->clear_cache($relationName, $otherObjectModelObjectOrID);
 		}
-                if( $otherObject instanceof EE_Base_Class ) {
-                    $otherObject->clear_cache( $this->get_model()->get_this_model_name(), $this );
+                if ($otherObject instanceof EE_Base_Class) {
+                    $otherObject->clear_cache($this->get_model()->get_this_model_name(), $this);
                 }
 		return $otherObject;
 	}
@@ -1910,18 +1910,18 @@ 
 	 * @return EE_Base_Class
 	 * @throws \EE_Error
 	 */
-	public function _remove_relations($relationName,$where_query_params = array()){
-		if ( $this->ID() ) {
+	public function _remove_relations($relationName, $where_query_params = array()) {
+		if ($this->ID()) {
 			//if this exists in the DB, save the relation change to the DB too
-			$otherObjects = $this->get_model()->remove_relations( $this, $relationName, $where_query_params );
-			$this->clear_cache( $relationName, null, true );
+			$otherObjects = $this->get_model()->remove_relations($this, $relationName, $where_query_params);
+			$this->clear_cache($relationName, null, true);
 		} else {
 			//this doesn't exist in the DB, just remove it from the cache
-			$otherObjects = $this->clear_cache( $relationName, null, true );
+			$otherObjects = $this->clear_cache($relationName, null, true);
 		}
-                if( is_array( $otherObjects ) ) {
-                    foreach ( $otherObjects as $otherObject ) {
-                            $otherObject->clear_cache( $this->get_model()->get_this_model_name(), $this );
+                if (is_array($otherObjects)) {
+                    foreach ($otherObjects as $otherObject) {
+                            $otherObject->clear_cache($this->get_model()->get_this_model_name(), $this);
                     }
                 }
 		return $otherObjects;
@@ -1941,27 +1941,27 @@ 
 	 * @throws \EE_Error
 	 *                             or might not be saved yet. Consider using EEM_Base::get_IDs() on these results if you want IDs
 	 */
-	public function get_many_related($relationName,$query_params = array()){
-		if($this->ID()){
+	public function get_many_related($relationName, $query_params = array()) {
+		if ($this->ID()) {
 			//this exists in the DB, so get the related things from either the cache or the DB
 			//if there are query parameters, forget about caching the related model objects.
-			if( $query_params ){
+			if ($query_params) {
 				$related_model_objects = $this->get_model()->get_all_related($this, $relationName, $query_params);
-			}else{
+			} else {
 				//did we already cache the result of this query?
 				$cached_results = $this->get_all_from_cache($relationName);
-				if ( ! $cached_results ){
+				if ( ! $cached_results) {
 					$related_model_objects = $this->get_model()->get_all_related($this, $relationName, $query_params);
 					//if no query parameters were passed, then we got all the related model objects
 					//for that relation. We can cache them then.
-					foreach($related_model_objects as $related_model_object){
+					foreach ($related_model_objects as $related_model_object) {
 						$this->cache($relationName, $related_model_object);
 					}
-				}else{
+				} else {
 					$related_model_objects = $cached_results;
 				}
 			}
-		}else{
+		} else {
 			//this doesn't exist in the DB, so just get the related things from the cache
 			$related_model_objects = $this->get_all_from_cache($relationName);
 		}
@@ -1979,8 +1979,8 @@ 
 	 * @param bool   	$distinct       if we want to only count the distinct values for the column then you can trigger that by the setting $distinct to TRUE;
 	 * @return int
 	 */
-	public function count_related($relation_name, $query_params =array(),$field_to_count = NULL, $distinct = FALSE){
-		return $this->get_model()->count_related($this,$relation_name,$query_params,$field_to_count,$distinct);
+	public function count_related($relation_name, $query_params = array(), $field_to_count = NULL, $distinct = FALSE) {
+		return $this->get_model()->count_related($this, $relation_name, $query_params, $field_to_count, $distinct);
 	}
 
 
@@ -1994,7 +1994,7 @@ 
 	 * 						By default, uses primary key (which doesn't make much sense, so you should probably change it)
 	 * @return int
 	 */
-	public function sum_related($relation_name, $query_params = array(), $field_to_sum = null){
+	public function sum_related($relation_name, $query_params = array(), $field_to_sum = null) {
 		return $this->get_model()->sum_related($this, $relation_name, $query_params, $field_to_sum);
 	}
 
@@ -2008,33 +2008,33 @@ 
 	 * @return EE_Base_Class (not an array, a single object)
 	 * @throws \EE_Error
 	 */
-	public function get_first_related($relationName,$query_params = array()){
-		if($this->ID()){//this exists in the DB, get from the cache OR the DB
+	public function get_first_related($relationName, $query_params = array()) {
+		if ($this->ID()) {//this exists in the DB, get from the cache OR the DB
 
 			//if they've provided some query parameters, don't bother trying to cache the result
 			//also make sure we're not caching the result of get_first_related
 			//on a relation which should have an array of objects (because the cache might have an array of objects)
-			if ($query_params || ! $this->get_model()->related_settings_for($relationName) instanceof EE_Belongs_To_Relation){
-				$related_model_object =  $this->get_model()->get_first_related($this, $relationName, $query_params);
-			}else{
+			if ($query_params || ! $this->get_model()->related_settings_for($relationName) instanceof EE_Belongs_To_Relation) {
+				$related_model_object = $this->get_model()->get_first_related($this, $relationName, $query_params);
+			} else {
 				//first, check if we've already cached the result of this query
 				$cached_result = $this->get_one_from_cache($relationName);
-				if ( ! $cached_result ){
+				if ( ! $cached_result) {
 
 					$related_model_object = $this->get_model()->get_first_related($this, $relationName, $query_params);
-					$this->cache($relationName,$related_model_object);
-				}else{
+					$this->cache($relationName, $related_model_object);
+				} else {
 					$related_model_object = $cached_result;
 				}
 			}
-		}else{
+		} else {
 			$related_model_object = null;
 			//this doesn't exist in the Db, but maybe the relation is of type belongs to, and so the related thing might
-			if( $this->get_model()->related_settings_for($relationName) instanceof EE_Belongs_To_Relation){
-				$related_model_object =  $this->get_model()->get_first_related($this, $relationName, $query_params);
+			if ($this->get_model()->related_settings_for($relationName) instanceof EE_Belongs_To_Relation) {
+				$related_model_object = $this->get_model()->get_first_related($this, $relationName, $query_params);
 			}
 			//this doesn't exist in the DB and apparently the thing it belongs to doesn't either, just get what's cached on this object
-			if( ! $related_model_object){
+			if ( ! $related_model_object) {
 				$related_model_object = $this->get_one_from_cache($relationName);
 			}
 
@@ -2056,12 +2056,12 @@ 
 	 * @return int how many deleted
 	 * @throws \EE_Error
 	 */
-	public function delete_related($relationName,$query_params = array()){
-		if($this->ID()){
-			$count =  $this->get_model()->delete_related($this, $relationName, $query_params);
-		}else{
+	public function delete_related($relationName, $query_params = array()) {
+		if ($this->ID()) {
+			$count = $this->get_model()->delete_related($this, $relationName, $query_params);
+		} else {
 			$count = count($this->get_all_from_cache($relationName));
-			$this->clear_cache($relationName,NULL,TRUE);
+			$this->clear_cache($relationName, NULL, TRUE);
 		}
 		return $count;
 	}
@@ -2080,13 +2080,13 @@ 
 	 * @return int how many deleted (including those soft deleted)
 	 * @throws \EE_Error
 	 */
-	public function delete_related_permanently($relationName,$query_params = array()){
-		if($this->ID()){
-			$count =  $this->get_model()->delete_related_permanently($this, $relationName, $query_params);
-		}else{
+	public function delete_related_permanently($relationName, $query_params = array()) {
+		if ($this->ID()) {
+			$count = $this->get_model()->delete_related_permanently($this, $relationName, $query_params);
+		} else {
 			$count = count($this->get_all_from_cache($relationName));
 		}
-		$this->clear_cache($relationName,NULL,TRUE);
+		$this->clear_cache($relationName, NULL, TRUE);
 		return $count;
 	}
 
@@ -2102,7 +2102,7 @@ 
 	 * @param  string $field_name property to check
 	 * @return bool            				  TRUE if existing,FALSE if not.
 	 */
-	public function is_set( $field_name ) {
+	public function is_set($field_name) {
 		return isset($this->_fields[$field_name]);
 	}
 
@@ -2114,11 +2114,11 @@ 
 	 * @throws EE_Error
 	 * @return bool                              TRUE if existing, throw EE_Error if not.
 	 */
-	protected function _property_exists( $properties ) {
+	protected function _property_exists($properties) {
 
-		foreach ( (array) $properties as $property_name ) {
+		foreach ((array) $properties as $property_name) {
 			//first make sure this property exists
-			if ( ! $this->_fields[ $property_name ] ) {
+			if ( ! $this->_fields[$property_name]) {
 				throw new EE_Error(
 					sprintf(
 						__(
@@ -2146,7 +2146,7 @@ 
 		$fields = $this->get_model()->field_settings(FALSE);
 		$properties = array();
 		//remove prepended underscore
-		foreach ( $fields as $field_name => $settings ) {
+		foreach ($fields as $field_name => $settings) {
 			$properties[$field_name] = $this->get($field_name);
 		}
 		return $properties;
@@ -2176,10 +2176,10 @@ 
 	 * @throws EE_Error
 	 * @return mixed whatever the plugin which calls add_filter decides
 	 */
-	public function __call($methodName,$args){
-		$className=get_class($this);
-		$tagName="FHEE__{$className}__{$methodName}";
-		if ( ! has_filter( $tagName ) ) {
+	public function __call($methodName, $args) {
+		$className = get_class($this);
+		$tagName = "FHEE__{$className}__{$methodName}";
+		if ( ! has_filter($tagName)) {
 			throw new EE_Error(
 				sprintf(
 					__(
@@ -2192,7 +2192,7 @@ 
 				)
 			);
 		}
-		return apply_filters($tagName,null,$this,$args);
+		return apply_filters($tagName, null, $this, $args);
 	}
 
 
@@ -2208,7 +2208,7 @@ 
 	 * @throws \EE_Error
 	 * NOTE: if the values haven't changed, returns 0
 	 */
-	public function update_extra_meta($meta_key,$meta_value,$previous_value = NULL){
+	public function update_extra_meta($meta_key, $meta_value, $previous_value = NULL) {
 		$query_params = array(
 			array(
 				'EXM_key'  => $meta_key,
@@ -2216,17 +2216,17 @@ 
 				'EXM_type' => $this->get_model()->get_this_model_name()
 			)
 		);
-		if ( $previous_value !== null ) {
+		if ($previous_value !== null) {
 			$query_params[0]['EXM_value'] = $meta_value;
 		}
-		$existing_rows_like_that = EEM_Extra_Meta::instance()->get_all( $query_params );
-		if ( ! $existing_rows_like_that ) {
-			return $this->add_extra_meta( $meta_key, $meta_value );
+		$existing_rows_like_that = EEM_Extra_Meta::instance()->get_all($query_params);
+		if ( ! $existing_rows_like_that) {
+			return $this->add_extra_meta($meta_key, $meta_value);
 		} else {
-			foreach ( $existing_rows_like_that as $existing_row ) {
-				$existing_row->save( array( 'EXM_value' => $meta_value ) );
+			foreach ($existing_rows_like_that as $existing_row) {
+				$existing_row->save(array('EXM_value' => $meta_value));
 			}
-			return count( $existing_rows_like_that );
+			return count($existing_rows_like_that);
 		}
 	}
 
@@ -2243,8 +2243,8 @@ 
 	 * @return boolean
 	 * @throws \EE_Error
 	 */
-	public function add_extra_meta($meta_key,$meta_value,$unique = false){
-		if ( $unique ) {
+	public function add_extra_meta($meta_key, $meta_value, $unique = false) {
+		if ($unique) {
 			$existing_extra_meta = EEM_Extra_Meta::instance()->get_one(
 				array(
 					array(
@@ -2254,7 +2254,7 @@ 
 					)
 				)
 			);
-			if ( $existing_extra_meta ) {
+			if ($existing_extra_meta) {
 				return false;
 			}
 		}
@@ -2281,7 +2281,7 @@ 
 	 * @return int number of extra meta rows deleted
 	 * @throws \EE_Error
 	 */
-	public function delete_extra_meta($meta_key,$meta_value = NULL){
+	public function delete_extra_meta($meta_key, $meta_value = NULL) {
 		$query_params = array(
 			array(
 				'EXM_key'  => $meta_key,
@@ -2289,10 +2289,10 @@ 
 				'EXM_type' => $this->get_model()->get_this_model_name()
 			)
 		);
-		if ( $meta_value !== null ) {
+		if ($meta_value !== null) {
 			$query_params[0]['EXM_value'] = $meta_value;
 		}
-		return EEM_Extra_Meta::instance()->delete( $query_params );
+		return EEM_Extra_Meta::instance()->delete($query_params);
 	}
 
 
@@ -2308,25 +2308,25 @@ 
 	 * @return mixed single value if $single; array if ! $single
 	 * @throws \EE_Error
 	 */
-	public function get_extra_meta($meta_key,$single = FALSE,$default = NULL){
-		if($single){
-			$result = $this->get_first_related('Extra_Meta',array(array('EXM_key'=>$meta_key)));
-			if ( $result instanceof EE_Extra_Meta ){
+	public function get_extra_meta($meta_key, $single = FALSE, $default = NULL) {
+		if ($single) {
+			$result = $this->get_first_related('Extra_Meta', array(array('EXM_key'=>$meta_key)));
+			if ($result instanceof EE_Extra_Meta) {
 				return $result->value();
-			}else{
+			} else {
 				return $default;
 			}
-		}else{
-			$results =  $this->get_many_related('Extra_Meta',array(array('EXM_key'=>$meta_key)));
-			if($results){
+		} else {
+			$results = $this->get_many_related('Extra_Meta', array(array('EXM_key'=>$meta_key)));
+			if ($results) {
 				$values = array();
-				foreach($results as $result){
-					if ( $result instanceof EE_Extra_Meta ){
+				foreach ($results as $result) {
+					if ($result instanceof EE_Extra_Meta) {
 						$values[$result->ID()] = $result->value();
 					}
 				}
 				return $values;
-			}else{
+			} else {
 				return $default;
 			}
 		}
@@ -2348,20 +2348,20 @@ 
 	 * @return array
 	 * @throws \EE_Error
 	 */
-	public function all_extra_meta_array($one_of_each_key = true){
+	public function all_extra_meta_array($one_of_each_key = true) {
 		$return_array = array();
-		if($one_of_each_key){
+		if ($one_of_each_key) {
 			$extra_meta_objs = $this->get_many_related('Extra_Meta', array('group_by'=>'EXM_key'));
-			foreach($extra_meta_objs as $extra_meta_obj){
-				if ( $extra_meta_obj instanceof EE_Extra_Meta ) {
+			foreach ($extra_meta_objs as $extra_meta_obj) {
+				if ($extra_meta_obj instanceof EE_Extra_Meta) {
 					$return_array[$extra_meta_obj->key()] = $extra_meta_obj->value();
 				}
 			}
-		}else{
+		} else {
 			$extra_meta_objs = $this->get_many_related('Extra_Meta');
-			foreach($extra_meta_objs as $extra_meta_obj){
-				if ( $extra_meta_obj instanceof EE_Extra_Meta ) {
-					if( ! isset($return_array[$extra_meta_obj->key()])){
+			foreach ($extra_meta_objs as $extra_meta_obj) {
+				if ($extra_meta_obj instanceof EE_Extra_Meta) {
+					if ( ! isset($return_array[$extra_meta_obj->key()])) {
 						$return_array[$extra_meta_obj->key()] = array();
 					}
 					$return_array[$extra_meta_obj->key()][$extra_meta_obj->ID()] = $extra_meta_obj->value();
@@ -2379,19 +2379,19 @@ 
 	 * @return string
 	 * @throws \EE_Error
 	 */
-	public function name(){
+	public function name() {
 		//find a field that's not a text field
 		$field_we_can_use = $this->get_model()->get_a_field_of_type('EE_Text_Field_Base');
-		if($field_we_can_use){
+		if ($field_we_can_use) {
 			return $this->get($field_we_can_use->get_name());
-		}else{
+		} else {
 			$first_few_properties = $this->model_field_array();
-			$first_few_properties = array_slice($first_few_properties,0,3);
+			$first_few_properties = array_slice($first_few_properties, 0, 3);
 			$name_parts = array();
-			foreach( $first_few_properties as $name=> $value ){
+			foreach ($first_few_properties as $name=> $value) {
 				$name_parts[] = "$name:$value";
 			}
-			return implode(",",$name_parts);
+			return implode(",", $name_parts);
 		}
 	}
 
@@ -2404,11 +2404,11 @@ 
 	 * @return boolean
 	 * @throws \EE_Error
 	 */
-	public function in_entity_map(){
-		if( $this->ID() && $this->get_model()->get_from_entity_map( $this->ID() ) === $this ) {
+	public function in_entity_map() {
+		if ($this->ID() && $this->get_model()->get_from_entity_map($this->ID()) === $this) {
 			//well, if we looked, did we find it in the entity map?
 			return TRUE;
-		}else{
+		} else {
 			return FALSE;
 		}
 	}
@@ -2419,21 +2419,21 @@ 
 	 * @throws EE_Error if this model object isn't in the entity mapper (because then you should
 	 * just use what's in the entity mapper and refresh it) and WP_DEBUG is TRUE
 	 */
-	public function refresh_from_db(){
-		if( $this->ID() && $this->in_entity_map() ){
-			$this->get_model()->refresh_entity_map_from_db( $this->ID() );
-		}else{
+	public function refresh_from_db() {
+		if ($this->ID() && $this->in_entity_map()) {
+			$this->get_model()->refresh_entity_map_from_db($this->ID());
+		} else {
 			//if it doesn't have ID, you shouldn't be asking to refresh it from teh database (because its not in the database)
 			//if it has an ID but it's not in the map, and you're asking me to refresh it
 			//that's kinda dangerous. You should just use what's in the entity map, or add this to the entity map if there's
 			//absolutely nothing in it for this ID
-			if( WP_DEBUG ) {
+			if (WP_DEBUG) {
 				throw new EE_Error(
 					sprintf(
-						__( 'Trying to refresh a model object with ID "%1$s" that\'s not in the entity map? First off: you should put it in the entity map by calling %2$s. Second off, if you want what\'s in the database right now, you should just call %3$s yourself and discard this model object.', 'event_espresso' ),
+						__('Trying to refresh a model object with ID "%1$s" that\'s not in the entity map? First off: you should put it in the entity map by calling %2$s. Second off, if you want what\'s in the database right now, you should just call %3$s yourself and discard this model object.', 'event_espresso'),
 						$this->ID(),
-						get_class( $this->get_model() ) . '::instance()->add_to_entity_map()',
-						get_class( $this->get_model() ) . '::instance()->refresh_entity_map()'
+						get_class($this->get_model()).'::instance()->add_to_entity_map()',
+						get_class($this->get_model()).'::instance()->refresh_entity_map()'
 					)
 				);
 			}
@@ -2447,11 +2447,11 @@ 
 	 * (probably a bad assumption they have made, oh well)
 	 * @return string
 	 */
-	public function __toString(){
+	public function __toString() {
 		try {
-			return sprintf( '%s (%s)', $this->name(), $this->ID() );
-		} catch ( Exception $e ) {
-			EE_Error::add_error( $e->getMessage(), __FILE__, __FUNCTION__, __LINE__ );
+			return sprintf('%s (%s)', $this->name(), $this->ID());
+		} catch (Exception $e) {
+			EE_Error::add_error($e->getMessage(), __FILE__, __FUNCTION__, __LINE__);
 			return '';
 		}
 	}
@@ -2487,16 +2487,16 @@ 
 	 * @throws \EE_Error
 	 */
 	public function __sleep() {
-		foreach( $this->get_model()->relation_settings() as $relation_name => $relation_obj ) {
-			if( $relation_obj instanceof EE_Belongs_To_Relation ) {
-				$classname = 'EE_' . $this->get_model()->get_this_model_name();
-				if( $this->get_one_from_cache( $relation_name ) instanceof $classname &&
-						$this->get_one_from_cache( $relation_name )->ID() ) {
-					$this->clear_cache( $relation_name, $this->get_one_from_cache( $relation_name )->ID() );
+		foreach ($this->get_model()->relation_settings() as $relation_name => $relation_obj) {
+			if ($relation_obj instanceof EE_Belongs_To_Relation) {
+				$classname = 'EE_'.$this->get_model()->get_this_model_name();
+				if ($this->get_one_from_cache($relation_name) instanceof $classname &&
+						$this->get_one_from_cache($relation_name)->ID()) {
+					$this->clear_cache($relation_name, $this->get_one_from_cache($relation_name)->ID());
 				}
 			}
 		}
-		return array_keys( get_object_vars( $this ) );
+		return array_keys(get_object_vars($this));
 	}