eventespresso / event-espresso-core

core/db_models/fields/EE_DB_Only_Field_Base.php

Spacing +1 added lines, -1 removed lines

@@ -7,7 +7,7 @@
  * special default values for them, or some other column-specific functionality. So we can add them as fields,
  * but db-only ones
  */
-abstract class EE_DB_Only_Field_Base extends EE_Model_Field_Base{
+abstract class EE_DB_Only_Field_Base extends EE_Model_Field_Base {
 	/**
 	 * All these children classes are for the db-only (meaning, we should select them
 	 * on get_all queries, update, delete, and will still want to set their default value

core/db_models/fields/EE_DB_Only_Float_Field.php

Spacing +3 added lines, -3 removed lines

@@ -1,7 +1,7 @@
 <?php
-require_once( EE_MODELS . 'fields/EE_DB_Only_Field_Base.php');
-class EE_DB_Only_Float_Field extends EE_DB_Only_Field_Base{
-	function get_wpdb_data_type(){
+require_once(EE_MODELS.'fields/EE_DB_Only_Field_Base.php');
+class EE_DB_Only_Float_Field extends EE_DB_Only_Field_Base {
+	function get_wpdb_data_type() {
 		return '%f';
 	}
 }

core/db_models/fields/EE_DB_Only_Int_Field.php

Spacing +3 added lines, -3 removed lines

@@ -1,8 +1,8 @@
 <?php
 
-require_once( EE_MODELS . 'fields/EE_DB_Only_Field_Base.php');
-class EE_DB_Only_Int_Field extends EE_DB_Only_Field_Base{
-	function get_wpdb_data_type(){
+require_once(EE_MODELS.'fields/EE_DB_Only_Field_Base.php');
+class EE_DB_Only_Int_Field extends EE_DB_Only_Field_Base {
+	function get_wpdb_data_type() {
 		return '%d';
 	}
 }
\ No newline at end of file

core/db_models/fields/EE_DB_Only_Text_Field.php

Spacing +3 added lines, -3 removed lines

@@ -1,7 +1,7 @@
 <?php
-require_once( EE_MODELS . 'fields/EE_DB_Only_Field_Base.php');
-class EE_DB_Only_Text_Field extends EE_DB_Only_Field_Base{
-	function get_wpdb_data_type(){
+require_once(EE_MODELS.'fields/EE_DB_Only_Field_Base.php');
+class EE_DB_Only_Text_Field extends EE_DB_Only_Field_Base {
+	function get_wpdb_data_type() {
 		return '%s';
 	}
 }
\ No newline at end of file

core/db_models/fields/EE_Datetime_Field.php

Braces +1 added lines, -1 removed lines

@@ -459,7 +459,7 @@
 				//must be explicit because schema could equal true.
 				if( $schema === 'no_html' ){
 					$timezone_string = ' (' . $DateTime->format( 'T' )  . ')';
-				}else{
+				} else{
 					$timezone_string = ' <span class="ee_dtt_timezone_string">(' . $DateTime->format( 'T' ) . ')</span>';
 				}
 			} else {

Doc Comments +2 added lines, -2 removed lines

@@ -502,7 +502,7 @@ 
 	 * This prepares the datetime for internal usage as a PHP DateTime object OR null (if nullable is
 	 * allowed)
 	 * @param string $datetime_string mysql timestamp in UTC
-	 * @return  mixed null | DateTime
+	 * @return  null|DateTime null | DateTime
 	 */
 	public function prepare_for_set_from_db( $datetime_string ) {
 		//if $datetime_value is empty, and ! $this->_nullable, just use time()
@@ -619,7 +619,7 @@ 
 	 *
 	 * @param \DateTimeZone $DateTimeZone
 	 * @param null          $time
-	 * @return mixed
+	 * @return string
 	 */
 	public function get_timezone_offset( DateTimeZone $DateTimeZone, $time = null ) {
 		$time = preg_match( EE_Datetime_Field::unix_timestamp_regex, $time ) ? $time : time();

Spacing +104 added lines, -104 removed lines

@@ -1,5 +1,5 @@ 
-<?php if ( ! defined( 'EVENT_ESPRESSO_VERSION' ) ) {
-	exit( 'No direct script access allowed' );
+<?php if ( ! defined('EVENT_ESPRESSO_VERSION')) {
+	exit('No direct script access allowed');
 }
 /**
  * EE_Datetime_Field
@@ -118,15 +118,15 @@ 
 	 * @param string 	$pretty_date_format
 	 * @param string 	$pretty_time_format
 	 */
-	public function __construct( $table_column, $nice_name, $nullable, $default_value, $timezone_string = '', $date_format = '', $time_format = '', $pretty_date_format = '', $pretty_time_format = '' ){
+	public function __construct($table_column, $nice_name, $nullable, $default_value, $timezone_string = '', $date_format = '', $time_format = '', $pretty_date_format = '', $pretty_time_format = '') {
 
-		$this->_date_format = ! empty( $date_format ) ? $date_format : get_option('date_format');
-		$this->_time_format = ! empty( $time_format ) ? $time_format : get_option('time_format');
-		$this->_pretty_date_format = ! empty( $pretty_date_format ) ? $pretty_date_format : get_option('date_format');
-		$this->_pretty_time_format = ! empty( $pretty_time_format ) ? $pretty_time_format : get_option('time_format');
+		$this->_date_format = ! empty($date_format) ? $date_format : get_option('date_format');
+		$this->_time_format = ! empty($time_format) ? $time_format : get_option('time_format');
+		$this->_pretty_date_format = ! empty($pretty_date_format) ? $pretty_date_format : get_option('date_format');
+		$this->_pretty_time_format = ! empty($pretty_time_format) ? $pretty_time_format : get_option('time_format');
 
-		parent::__construct( $table_column, $nice_name, $nullable, $default_value );
-		$this->set_timezone( $timezone_string );
+		parent::__construct($table_column, $nice_name, $nullable, $default_value);
+		$this->set_timezone($timezone_string);
 
 	}
 
@@ -145,7 +145,7 @@ 
 	 * @return DateTimeZone
 	 */
 	public function get_UTC_DateTimeZone() {
-		return $this->_UTC_DateTimeZone instanceof DateTimeZone ? $this->_UTC_DateTimeZone : $this->_create_timezone_object_from_timezone_string( 'UTC' );
+		return $this->_UTC_DateTimeZone instanceof DateTimeZone ? $this->_UTC_DateTimeZone : $this->_create_timezone_object_from_timezone_string('UTC');
 	}
 
 
@@ -154,7 +154,7 @@ 
 	 * @return DateTimeZone
 	 */
 	public function get_blog_DateTimeZone() {
-		return $this->_blog_DateTimeZone instanceof DateTimeZone ? $this->_blog_DateTimeZone : $this->_create_timezone_object_from_timezone_string( '' );
+		return $this->_blog_DateTimeZone instanceof DateTimeZone ? $this->_blog_DateTimeZone : $this->_create_timezone_object_from_timezone_string('');
 	}
 
 
@@ -164,8 +164,8 @@ 
 	 * @param  string|int $value_inputted_for_field_on_model_object could be a string formatted date time or int unix timestamp
 	 * @return DateTime
 	 */
-	public function prepare_for_set( $value_inputted_for_field_on_model_object ) {
-		return $this->_get_date_object( $value_inputted_for_field_on_model_object );
+	public function prepare_for_set($value_inputted_for_field_on_model_object) {
+		return $this->_get_date_object($value_inputted_for_field_on_model_object);
 	}
 
 
@@ -181,9 +181,9 @@ 
 	 * @param bool $pretty If we're returning the pretty formats or standard format string.
 	 * @return string    The final assembled format string.
 	 */
-	protected function _get_date_time_output( $pretty = FALSE ) {
+	protected function _get_date_time_output($pretty = FALSE) {
 
-		switch ( $this->_date_time_output ) {
+		switch ($this->_date_time_output) {
 			case 'time' :
 				return $pretty ? $this->_pretty_time_format : $this->_time_format;
 				break;
@@ -193,7 +193,7 @@ 
 				break;
 
 			default :
-				return $pretty ? $this->_pretty_date_format . ' ' . $this->_pretty_time_format : $this->_date_format . ' ' . $this->_time_format;
+				return $pretty ? $this->_pretty_date_format.' '.$this->_pretty_time_format : $this->_date_format.' '.$this->_time_format;
 		}
 	}
 
@@ -207,7 +207,7 @@ 
 	 * @param string $what acceptable values are 'time' or 'date'.  Any other value will be set but will always result in both 'date' and 'time' being returned.
 	 * @return void
 	 */
-	public function set_date_time_output( $what = NULL ) {
+	public function set_date_time_output($what = NULL) {
 		$this->_date_time_output = $what;
 	}
 
@@ -223,15 +223,15 @@ 
 	 * @param string $timezone_string A valid timezone string as described by @link http://www.php.net/manual/en/timezones.php
 	 * @return void
 	 */
-	public function set_timezone( $timezone_string ) {
-		if( empty( $timezone_string ) && $this->_timezone_string != NULL ){
+	public function set_timezone($timezone_string) {
+		if (empty($timezone_string) && $this->_timezone_string != NULL) {
 			// leave the timezone AS-IS if we already have one and
 			// the function arg didn't provide one
 			return;
 		}
-		$timezone_string = EEH_DTT_Helper::get_valid_timezone_string( $timezone_string );
-		$this->_timezone_string = ! empty( $timezone_string ) ? $timezone_string : 'UTC';
-		$this->_DateTimeZone = $this->_create_timezone_object_from_timezone_string( $this->_timezone_string );
+		$timezone_string = EEH_DTT_Helper::get_valid_timezone_string($timezone_string);
+		$this->_timezone_string = ! empty($timezone_string) ? $timezone_string : 'UTC';
+		$this->_DateTimeZone = $this->_create_timezone_object_from_timezone_string($this->_timezone_string);
 	}
 
 
@@ -243,8 +243,8 @@ 
 	 * @param string $timezone_string
 	 * @return \DateTimeZone
 	 */
-	protected function _create_timezone_object_from_timezone_string( $timezone_string = '' ) {
-		return new DateTimeZone( EEH_DTT_Helper::get_valid_timezone_string( $timezone_string ) );
+	protected function _create_timezone_object_from_timezone_string($timezone_string = '') {
+		return new DateTimeZone(EEH_DTT_Helper::get_valid_timezone_string($timezone_string));
 	}
 
 
@@ -269,8 +269,8 @@ 
 	 * @param bool   $pretty Whether to set pretty format or not.
 	 * @return void
 	 */
-	public function set_date_format( $format, $pretty = false ) {
-		if ( $pretty ) {
+	public function set_date_format($format, $pretty = false) {
+		if ($pretty) {
 			$this->_pretty_date_format = $format;
 		} else {
 			$this->_date_format = $format;
@@ -285,7 +285,7 @@ 
 	 * @param bool   $pretty Whether to get pretty format or not.
 	 * @return string
 	 */
-	public function get_date_format( $pretty = false ) {
+	public function get_date_format($pretty = false) {
 		return $pretty ? $this->_pretty_date_format : $this->_date_format;
 	}
 
@@ -300,8 +300,8 @@ 
 	 * @param bool   $pretty Whether to set pretty format or not.
 	 * @return void
 	 */
-	public function set_time_format( $format, $pretty = false ) {
-		if ( $pretty ) {
+	public function set_time_format($format, $pretty = false) {
+		if ($pretty) {
 			$this->_pretty_time_format = $format;
 		} else {
 			$this->_time_format = $format;
@@ -316,7 +316,7 @@ 
 	 * @param bool   $pretty Whether to get pretty format or not.
 	 * @return string
 	 */
-	public function get_time_format( $pretty = false ) {
+	public function get_time_format($pretty = false) {
 		return $pretty ? $this->_pretty_time_format : $this->_time_format;
 	}
 
@@ -331,7 +331,7 @@ 
 	 * @param string $format a new pretty date format (corresponding to formats accepted by PHP date() function)
 	 * @return void
 	 */
-	public function set_pretty_date_format( $format ) {
+	public function set_pretty_date_format($format) {
 		$this->_pretty_date_format = $format;
 	}
 
@@ -348,7 +348,7 @@ 
 	 * @param string $format a new pretty time format (corresponding to formats accepted by PHP date() function)
 	 * @return void
 	 */
-	public function set_pretty_time_format( $format ) {
+	public function set_pretty_time_format($format) {
 		$this->_pretty_time_format = $format;
 	}
 
@@ -360,9 +360,9 @@ 
 	 * @param DateTime    $current current DateTime object for the datetime field
 	 * @return DateTime
 	 */
-	public function prepare_for_set_with_new_time( $time_to_set_string, DateTime $current ){
+	public function prepare_for_set_with_new_time($time_to_set_string, DateTime $current) {
 		//if $time_to_set_string is datetime object, then let's use it to set the parse array.  Otherwise parse the string.
-		if ( $time_to_set_string instanceof DateTime ) {
+		if ($time_to_set_string instanceof DateTime) {
 			$parsed = array(
 				'hour' => $time_to_set_string->format('H'),
 				'minute' => $time_to_set_string->format('i'),
@@ -370,12 +370,12 @@ 
 				);
 		} else {
 			//parse incoming string
-			$parsed = date_parse_from_format( $this->_time_format, $time_to_set_string );
+			$parsed = date_parse_from_format($this->_time_format, $time_to_set_string);
 		}
 
 		//make sure $current is in the correct timezone.
-		$current->setTimezone( $this->_DateTimeZone );
-		return $current->setTime( $parsed['hour'], $parsed['minute'], $parsed['second'] );
+		$current->setTimezone($this->_DateTimeZone);
+		return $current->setTime($parsed['hour'], $parsed['minute'], $parsed['second']);
 	}
 
 
@@ -386,9 +386,9 @@ 
 	 * @param DateTime    $current current DateTime object for the datetime field
 	 * @return DateTime
 	 */
-	public function prepare_for_set_with_new_date( $date_to_set_string, DateTime $current ){
+	public function prepare_for_set_with_new_date($date_to_set_string, DateTime $current) {
 		//if $time_to_set_string is datetime object, then let's use it to set the parse array.  Otherwise parse the string.
-		if ( $date_to_set_string instanceof DateTime ) {
+		if ($date_to_set_string instanceof DateTime) {
 			$parsed = array(
 				'year' => $date_to_set_string->format('Y'),
 				'month' => $date_to_set_string->format('m'),
@@ -396,12 +396,12 @@ 
 				);
 		} else {
 			//parse incoming string
-			$parsed = date_parse_from_format( $this->_date_format, $date_to_set_string );
+			$parsed = date_parse_from_format($this->_date_format, $date_to_set_string);
 		}
 
 		//make sure $current is in the correct timezone
-		$current->setTimezone( $this->_DateTimeZone );
-		return $current->setDate( $parsed['year'], $parsed['month'], $parsed['day'] );
+		$current->setTimezone($this->_DateTimeZone);
+		return $current->setDate($parsed['year'], $parsed['month'], $parsed['day']);
 	}
 
 
@@ -413,8 +413,8 @@ 
 	 * @param  DateTime $DateTime
 	 * @return string formatted date time for given timezone
 	 */
-	public function prepare_for_get( $DateTime ) {
-		return $this->_prepare_for_display( $DateTime  );
+	public function prepare_for_get($DateTime) {
+		return $this->_prepare_for_display($DateTime);
 	}
 
 
@@ -429,8 +429,8 @@ 
 	 * @param null     $schema
 	 * @return string
 	 */
-	public function prepare_for_pretty_echoing( $DateTime, $schema = null ) {
-		return $this->_prepare_for_display( $DateTime, $schema ? $schema : true );
+	public function prepare_for_pretty_echoing($DateTime, $schema = null) {
+		return $this->_prepare_for_display($DateTime, $schema ? $schema : true);
 	}
 
 
@@ -444,36 +444,36 @@ 
 	 * @return string
 	 * @throws \EE_Error
 	 */
-	protected function _prepare_for_display( $DateTime, $schema = false ) {
-		if ( ! $DateTime instanceof DateTime  ) {
-			if ( $this->_nullable ) {
+	protected function _prepare_for_display($DateTime, $schema = false) {
+		if ( ! $DateTime instanceof DateTime) {
+			if ($this->_nullable) {
 				return '';
 			} else {
-				if ( WP_DEBUG ) {
-					throw new EE_Error( sprintf( __('EE_Datetime_Field::_prepare_for_display requires a DateTime class to be the value for the $DateTime argument because the %s field is not nullable.', 'event_espresso' ), $this->_nicename ) );
+				if (WP_DEBUG) {
+					throw new EE_Error(sprintf(__('EE_Datetime_Field::_prepare_for_display requires a DateTime class to be the value for the $DateTime argument because the %s field is not nullable.', 'event_espresso'), $this->_nicename));
 				} else {
-					$DateTime = new DateTime( "now" );
-					EE_Error::add_error( sprintf( __('EE_Datetime_Field::_prepare_for_display requires a DateTime class to be the value for the $DateTime argument because the %s field is not nullable.  When WP_DEBUG is false, the value is set to "now" instead of throwing an exception.', 'event_espresso' ), $this->_nicename ) );
+					$DateTime = new DateTime("now");
+					EE_Error::add_error(sprintf(__('EE_Datetime_Field::_prepare_for_display requires a DateTime class to be the value for the $DateTime argument because the %s field is not nullable.  When WP_DEBUG is false, the value is set to "now" instead of throwing an exception.', 'event_espresso'), $this->_nicename));
 				}
 			}
 		}
-		$format_string = $this->_get_date_time_output( $schema );
+		$format_string = $this->_get_date_time_output($schema);
 		//make sure datetime_value is in the correct timezone (in case that's been updated).
-		$DateTime->setTimezone( $this->_DateTimeZone );
-		if ( $schema ) {
-			if( $this->_display_timezone() ) {
+		$DateTime->setTimezone($this->_DateTimeZone);
+		if ($schema) {
+			if ($this->_display_timezone()) {
 				//must be explicit because schema could equal true.
-				if( $schema === 'no_html' ){
-					$timezone_string = ' (' . $DateTime->format( 'T' )  . ')';
-				}else{
-					$timezone_string = ' <span class="ee_dtt_timezone_string">(' . $DateTime->format( 'T' ) . ')</span>';
+				if ($schema === 'no_html') {
+					$timezone_string = ' ('.$DateTime->format('T').')';
+				} else {
+					$timezone_string = ' <span class="ee_dtt_timezone_string">('.$DateTime->format('T').')</span>';
 				}
 			} else {
 				$timezone_string = '';
 			}
-			return $DateTime->format( $format_string ) . $timezone_string;
+			return $DateTime->format($format_string).$timezone_string;
 		} else {
-			return $DateTime->format( $format_string );
+			return $DateTime->format($format_string);
 		}
 	}
 
@@ -487,18 +487,18 @@ 
 	 * @return string mysql timestamp in UTC
 	 * @throws \EE_Error
 	 */
-	public function prepare_for_use_in_db( $datetime_value ) {
+	public function prepare_for_use_in_db($datetime_value) {
 		//we allow an empty value or DateTime object, but nothing else.
-		if ( ! empty( $datetime_value ) && ! $datetime_value instanceof DateTime ) {
-			throw new EE_Error( __('The incoming value being prepared for setting in the database must either be empty or a php DateTime object', 'event_espresso' ) );
+		if ( ! empty($datetime_value) && ! $datetime_value instanceof DateTime) {
+			throw new EE_Error(__('The incoming value being prepared for setting in the database must either be empty or a php DateTime object', 'event_espresso'));
 		}
 
-		if ( $datetime_value instanceof DateTime ) {
-			return $datetime_value->setTimezone( $this->get_UTC_DateTimeZone() )->format( EE_Datetime_Field::mysql_timestamp_format );
+		if ($datetime_value instanceof DateTime) {
+			return $datetime_value->setTimezone($this->get_UTC_DateTimeZone())->format(EE_Datetime_Field::mysql_timestamp_format);
 		}
 
 		// if $datetime_value is empty, and ! $this->_nullable, use current_time() but set the GMT flag to true
-		return ! $this->_nullable && empty( $datetime_value ) ? current_time( 'mysql', true ) : null;
+		return ! $this->_nullable && empty($datetime_value) ? current_time('mysql', true) : null;
 	}
 
 
@@ -511,20 +511,20 @@ 
 	 * @param string $datetime_string mysql timestamp in UTC
 	 * @return  mixed null | DateTime
 	 */
-	public function prepare_for_set_from_db( $datetime_string ) {
+	public function prepare_for_set_from_db($datetime_string) {
 		//if $datetime_value is empty, and ! $this->_nullable, just use time()
-		if ( empty( $datetime_string) && $this->_nullable ) {
+		if (empty($datetime_string) && $this->_nullable) {
 			return null;
 		}
 		// datetime strings from the db should ALWAYS be in UTC+0, so use UTC_DateTimeZone when creating
-		$DateTime = empty( $datetime_string ) ? new DateTime( 'now', $this->get_UTC_DateTimeZone() ) : DateTime::createFromFormat( EE_Datetime_Field::mysql_timestamp_format, $datetime_string, $this->get_UTC_DateTimeZone() );
+		$DateTime = empty($datetime_string) ? new DateTime('now', $this->get_UTC_DateTimeZone()) : DateTime::createFromFormat(EE_Datetime_Field::mysql_timestamp_format, $datetime_string, $this->get_UTC_DateTimeZone());
 
-		if ( ! $DateTime instanceof DateTime ) {
+		if ( ! $DateTime instanceof DateTime) {
 			//if still no datetime object, then let's just use now
-			$DateTime = new DateTime( 'now', $this->get_UTC_DateTimeZone() );
+			$DateTime = new DateTime('now', $this->get_UTC_DateTimeZone());
 		}
 		// THEN apply the field's set DateTimeZone
-		$DateTime->setTimezone( $this->_DateTimeZone );
+		$DateTime->setTimezone($this->_DateTimeZone);
 		return $DateTime;
 	}
 
@@ -541,15 +541,15 @@ 
 	protected function _display_timezone() {
 
 		// first let's do a comparison of timezone strings.  If they match then we can get out without any further calculations
-		$blog_string = get_option( 'timezone_string' );
-		if ( $blog_string == $this->_timezone_string ) {
+		$blog_string = get_option('timezone_string');
+		if ($blog_string == $this->_timezone_string) {
 			return FALSE;
 		}
 		// now we need to calc the offset for the timezone string so we can compare with the blog offset.
-		$this_offset = $this->get_timezone_offset( $this->_DateTimeZone );
-		$blog_offset = $this->get_timezone_offset( $this->get_blog_DateTimeZone() );
+		$this_offset = $this->get_timezone_offset($this->_DateTimeZone);
+		$blog_offset = $this->get_timezone_offset($this->get_blog_DateTimeZone());
 		// now compare
-		if ( $blog_offset === $this_offset ) {
+		if ($blog_offset === $this_offset) {
 			return FALSE;
 		}
 		return TRUE;
@@ -567,24 +567,24 @@ 
 	 *
 	 * @return DateTime
 	 */
-	protected function _get_date_object( $date_string ) {
+	protected function _get_date_object($date_string) {
 		//first if this is an empty date_string and nullable is allowed, just return null.
-		if ( $this->_nullable && empty( $date_string ) ) {
+		if ($this->_nullable && empty($date_string)) {
 			return null;
 		}
 
 		// if incoming date
-		if ( $date_string instanceof DateTime ) {
-			$date_string->setTimezone( $this->_DateTimeZone );
+		if ($date_string instanceof DateTime) {
+			$date_string->setTimezone($this->_DateTimeZone);
 			return $date_string;
 		}
 		// if empty date_string and made it here.
 		// Return a datetime object for now in the given timezone.
-		if ( empty( $date_string ) ) {
-			return new DateTime( "now", $this->_DateTimeZone );
+		if (empty($date_string)) {
+			return new DateTime("now", $this->_DateTimeZone);
 		}
 		// if $date_string is matches something that looks like a Unix timestamp let's just use it.
-		if ( preg_match( EE_Datetime_Field::unix_timestamp_regex, $date_string ) ) {
+		if (preg_match(EE_Datetime_Field::unix_timestamp_regex, $date_string)) {
 			try {
 				/**
 				 * This is operating under the assumption that the incoming Unix timestamp is
@@ -592,29 +592,29 @@ 
 				 * current_time('timestamp');
 				 *
 				 */
-				$DateTime = new DateTime( "now", $this->_DateTimeZone );
-				return $DateTime->setTimestamp( $date_string );
-			 } catch ( Exception $e )  {
+				$DateTime = new DateTime("now", $this->_DateTimeZone);
+				return $DateTime->setTimestamp($date_string);
+			 } catch (Exception $e) {
 			 	// should be rare, but if things got fooled then let's just continue
 			 }
 		}
 		//not a unix timestamp.  So we will use the set format on this object and set timezone to
 		//create the DateTime object.
-		$format = $this->_date_format . ' ' . $this->_time_format;
+		$format = $this->_date_format.' '.$this->_time_format;
 		try {
-			$DateTime = DateTime::createFromFormat( $format, $date_string, $this->_DateTimeZone );
-			if ( ! $DateTime instanceof DateTime ) {
+			$DateTime = DateTime::createFromFormat($format, $date_string, $this->_DateTimeZone);
+			if ( ! $DateTime instanceof DateTime) {
 				throw new EE_Error(
 					sprintf(
-						__( '"%1$s" does not represent a valid Date Time in the format "%2$s".', 'event_espresso' ),
+						__('"%1$s" does not represent a valid Date Time in the format "%2$s".', 'event_espresso'),
 						$date_string,
 						$format
 					)
 				);
 			}
-		} catch ( Exception $e ) {
+		} catch (Exception $e) {
 			// if we made it here then likely then something went really wrong.  Instead of throwing an exception, let's just return a DateTime object for now, in the set timezone.
-			$DateTime = new DateTime( "now", $this->_DateTimeZone );
+			$DateTime = new DateTime("now", $this->_DateTimeZone);
 		}
 		return $DateTime;
 	}
@@ -628,9 +628,9 @@ 
 	 * @param null          $time
 	 * @return mixed
 	 */
-	public function get_timezone_offset( DateTimeZone $DateTimeZone, $time = null ) {
-		$time = preg_match( EE_Datetime_Field::unix_timestamp_regex, $time ) ? $time : time();
-		$transitions = $DateTimeZone->getTransitions( $time );
+	public function get_timezone_offset(DateTimeZone $DateTimeZone, $time = null) {
+		$time = preg_match(EE_Datetime_Field::unix_timestamp_regex, $time) ? $time : time();
+		$transitions = $DateTimeZone->getTransitions($time);
 		return $transitions[0]['offset'];
 	}
 
@@ -642,10 +642,10 @@ 
 	 * @param  string $timezone_string
 	 * @return string           abbreviation
 	 */
-	public function get_timezone_abbrev( $timezone_string ) {
-		$timezone_string = EEH_DTT_Helper::get_valid_timezone_string( $timezone_string );
-		$dateTime = new DateTime( 'now', new DateTimeZone( $timezone_string ) );
-		return $dateTime->format( 'T' );
+	public function get_timezone_abbrev($timezone_string) {
+		$timezone_string = EEH_DTT_Helper::get_valid_timezone_string($timezone_string);
+		$dateTime = new DateTime('now', new DateTimeZone($timezone_string));
+		return $dateTime->format('T');
 	}
 
 	/**
@@ -653,7 +653,7 @@ 
 	 * @return 
 	 */
 	public function get_default_value() {
-		if( $this->_default_value === EE_Datetime_Field::now ) {
+		if ($this->_default_value === EE_Datetime_Field::now) {
 			return time();
 		} else {
 			return parent::get_default_value();

core/db_models/fields/EE_Enum_Integer_Field.php

Spacing +10 added lines, -10 removed lines

@@ -1,5 +1,5 @@ 
 <?php if ( ! defined('EVENT_ESPRESSO_VERSION')) exit('No direct script access allowed');
-require_once( EE_MODELS . 'fields/EE_Integer_Field.php' );
+require_once(EE_MODELS.'fields/EE_Integer_Field.php');
 /**
  * Class EE_Enum_Integer_Field
  *
@@ -8,7 +8,7 @@ 
  * @author				Mike Nelson
  *
  */
-class EE_Enum_Integer_Field extends EE_Integer_Field{
+class EE_Enum_Integer_Field extends EE_Integer_Field {
 
 	var $_allowed_enum_values;
 
@@ -20,7 +20,7 @@ 
 	 * @param int $default_value
 	 * @param array $allowed_enum_values  keys are values to be used in the DB, values are how they should be displayed
 	 */
-	function __construct($table_column, $nicename, $nullable, $default_value, $allowed_enum_values){
+	function __construct($table_column, $nicename, $nullable, $default_value, $allowed_enum_values) {
 		$this->_allowed_enum_values = $allowed_enum_values;
 		parent::__construct($table_column, $nicename, $nullable, $default_value);
 	}
@@ -32,20 +32,20 @@ 
 	 * @throws EE_Error
 	 */
 	function prepare_for_set($value_inputted_for_field_on_model_object) {
-		if( $value_inputted_for_field_on_model_object !== NULL && ! array_key_exists( $value_inputted_for_field_on_model_object, $this->_allowed_enum_values )){
-			if( defined( 'WP_DEBUG' ) && WP_DEBUG ){
+		if ($value_inputted_for_field_on_model_object !== NULL && ! array_key_exists($value_inputted_for_field_on_model_object, $this->_allowed_enum_values)) {
+			if (defined('WP_DEBUG') && WP_DEBUG) {
 				$msg = sprintf(
-					__('System is assigning incompatible value "%1$s" to field "%2$s"','event_espresso'),
+					__('System is assigning incompatible value "%1$s" to field "%2$s"', 'event_espresso'),
 					$value_inputted_for_field_on_model_object,
 					$this->_name
 				);
 				$msg2 = sprintf(
-					__('Allowed values for "%1$s" are "%2$s". You provided "%3$s"','event_espresso'),
+					__('Allowed values for "%1$s" are "%2$s". You provided "%3$s"', 'event_espresso'),
 					$this->_name,
-					implode( ', ', array_keys( $this->_allowed_enum_values )),
+					implode(', ', array_keys($this->_allowed_enum_values)),
 					$value_inputted_for_field_on_model_object
 				);
-				 EE_Error::add_error("$msg||$msg2", __FILE__, __FUNCTION__, __LINE__ );
+				 EE_Error::add_error("$msg||$msg2", __FILE__, __FUNCTION__, __LINE__);
 			}
 			return $this->get_default_value();
 
@@ -62,7 +62,7 @@ 
 	 * @param null         $schema
 	 * @return string
 	 */
-	function prepare_for_pretty_echoing( $value_on_field_to_be_outputted, $schema = NULL ) {
+	function prepare_for_pretty_echoing($value_on_field_to_be_outputted, $schema = NULL) {
 		return $this->_allowed_enum_values[$value_on_field_to_be_outputted];
 	}
 }

Braces +3 added lines, -1 removed lines

@@ -1,4 +1,6 @@
-<?php if ( ! defined('EVENT_ESPRESSO_VERSION')) exit('No direct script access allowed');
+<?php if ( ! defined('EVENT_ESPRESSO_VERSION')) {
+	exit('No direct script access allowed');
+}
 /**
  * Event Espresso
  *

core/db_models/fields/EE_Float_Field.php

Spacing +9 added lines, -9 removed lines

@@ -2,8 +2,8 @@ 
 /**
  * Text_Fields is a base class for any fields which are have float value. (Exception: foreign and private key fields. Wish PHP had multiple-inheritance for this...)
  */
-class EE_Float_Field extends EE_Model_Field_Base{
-	function get_wpdb_data_type(){
+class EE_Float_Field extends EE_Model_Field_Base {
+	function get_wpdb_data_type() {
 		return '%f';
 	}
 	/**
@@ -17,26 +17,26 @@ 
 	function prepare_for_set($value_inputted_for_field_on_model_object) {
 //		echo __LINE__."$value_inputted_for_field_on_model_object<br>";
 		//remove whitespaces and thousands separators
-		if(is_string($value_inputted_for_field_on_model_object)){
-			$value_inputted_for_field_on_model_object = str_replace(array(" ",EE_Config::instance()->currency->thsnds),"",$value_inputted_for_field_on_model_object);
+		if (is_string($value_inputted_for_field_on_model_object)) {
+			$value_inputted_for_field_on_model_object = str_replace(array(" ", EE_Config::instance()->currency->thsnds), "", $value_inputted_for_field_on_model_object);
 //echo __LINE__."$value_inputted_for_field_on_model_object<br>";
 //normalize it so periods are decimal marks (we don't care where you're from: we're talking PHP now)
-			$value_inputted_for_field_on_model_object = str_replace( EE_Config::instance()->currency->dec_mrk, ".", $value_inputted_for_field_on_model_object) ;
+			$value_inputted_for_field_on_model_object = str_replace(EE_Config::instance()->currency->dec_mrk, ".", $value_inputted_for_field_on_model_object);
 //echo __LINE__."$value_inputted_for_field_on_model_object<br>";
 //double-check there's absolutely nothing left on this string besides numbers
-			$value_inputted_for_field_on_model_object = preg_replace( "/[^0-9,.]/", "", $value_inputted_for_field_on_model_object);
+			$value_inputted_for_field_on_model_object = preg_replace("/[^0-9,.]/", "", $value_inputted_for_field_on_model_object);
 		}
 //		echo __LINE__."$value_inputted_for_field_on_model_object<br>";
-		return floatval( $value_inputted_for_field_on_model_object );
+		return floatval($value_inputted_for_field_on_model_object);
 	}
 	/**
 	 * Returns the number formatted according to local custom (set by the country of the blog).
 	 * @param float $value_on_field_to_be_outputted
 	 * @return string
 	 */
-	function prepare_for_pretty_echoing($value_on_field_to_be_outputted,$schema = null){
+	function prepare_for_pretty_echoing($value_on_field_to_be_outputted, $schema = null) {
 		$EE = EE_Registry::instance();
-		return number_format( $value_on_field_to_be_outputted, $EE->CFG->currency->dec_plc, $EE->CFG->currency->dec_mrk, $EE->CFG->currency->thsnds) ;
+		return number_format($value_on_field_to_be_outputted, $EE->CFG->currency->dec_plc, $EE->CFG->currency->dec_mrk, $EE->CFG->currency->thsnds);
 	}
 
 	function prepare_for_set_from_db($value_found_in_db_for_model_object) {

core/db_models/fields/EE_Foreign_Key_Field_Base.php

Spacing +1 added lines, -1 removed lines

@@ -4,6 +4,6 @@
  * needed functions from its parent, but because all foreign key fields inherit from
  * this one, its easy ot check if a field is a foreign key.
  */
-abstract class EE_Foreign_Key_Field_Base extends EE_Field_With_Model_Name{
+abstract class EE_Foreign_Key_Field_Base extends EE_Field_With_Model_Name {
 	//all needed functionality inherited from parent
 }

core/db_models/fields/EE_Foreign_Key_Int_Field.php

Spacing +4 added lines, -4 removed lines

@@ -1,7 +1,7 @@ 
 <?php
-require_once( EE_MODELS . 'fields/EE_Foreign_Key_Field_Base.php');
-class EE_Foreign_Key_Int_Field extends EE_Foreign_Key_Field_Base{
-	function get_wpdb_data_type(){
+require_once(EE_MODELS.'fields/EE_Foreign_Key_Field_Base.php');
+class EE_Foreign_Key_Int_Field extends EE_Foreign_Key_Field_Base {
+	function get_wpdb_data_type() {
 		return '%d';
 	}
 	/**
@@ -10,7 +10,7 @@ 
 	 * @return int
 	 */
 	function prepare_for_set($value_inputted_for_field_on_model_object) {
-		if($this->is_model_obj_of_type_pointed_to($value_inputted_for_field_on_model_object)){
+		if ($this->is_model_obj_of_type_pointed_to($value_inputted_for_field_on_model_object)) {
 			$value_inputted_for_field_on_model_object = $value_inputted_for_field_on_model_object->ID();
 		}
 		return absint($value_inputted_for_field_on_model_object);