eventespresso / event-espresso-core

core/data_migration_scripts/EE_DMS_Core_4_7_0.dms.php

Spacing +51 added lines, -51 removed lines

@@ -14,13 +14,13 @@ 
 // (all other times it gets resurrected from a wordpress option)
 $stages = glob(EE_CORE.'data_migration_scripts/4_7_0_stages/*');
 $class_to_filepath = array();
-foreach($stages as $filepath){
+foreach ($stages as $filepath) {
 	$matches = array();
-	preg_match('~4_7_0_stages/(.*).dmsstage.php~',$filepath,$matches);
+	preg_match('~4_7_0_stages/(.*).dmsstage.php~', $filepath, $matches);
 	$class_to_filepath[$matches[1]] = $filepath;
 }
 //give addons a chance to autoload their stages too
-$class_to_filepath = apply_filters('FHEE__EE_DMS_4_7_0__autoloaded_stages',$class_to_filepath);
+$class_to_filepath = apply_filters('FHEE__EE_DMS_4_7_0__autoloaded_stages', $class_to_filepath);
 EEH_Autoloader::register_autoloader($class_to_filepath);
 
 
@@ -36,7 +36,7 @@ 
  * @since                4.7.0
  *
  */
-class EE_DMS_Core_4_7_0 extends EE_Data_Migration_Script_Base{
+class EE_DMS_Core_4_7_0 extends EE_Data_Migration_Script_Base {
 
 	/**
 	 * return EE_DMS_Core_4_7_0
@@ -58,18 +58,18 @@ 
 	 * @return bool
 	 */
 	public function can_migrate_from_version($version_array) {
-		EE_Registry::instance()->load_helper( 'Activation' );
+		EE_Registry::instance()->load_helper('Activation');
 		$version_string = $version_array['Core'];
 		if (
-			( $version_string <= '4.7.0' && $version_string >= '4.6.0' )
+			($version_string <= '4.7.0' && $version_string >= '4.6.0')
 			||
-			( $version_string >= '4.7.0' &&
-					! EEH_Activation::table_exists( 'esp_registration_payment' ) &&
-					EEH_Activation::table_exists( 'esp_registration' ) ) ) {
+			($version_string >= '4.7.0' &&
+					! EEH_Activation::table_exists('esp_registration_payment') &&
+					EEH_Activation::table_exists('esp_registration')) ) {
 			return true;
-		} elseif ( ! $version_string ) {
+		} elseif ( ! $version_string) {
 			//no version string provided... this must be pre 4.3
-			return false;//changed mind. dont want people thinking they should migrate yet because they cant
+			return false; //changed mind. dont want people thinking they should migrate yet because they cant
 		} else {
 			return false;
 		}
@@ -91,14 +91,14 @@ 
 	 */
 	public function schema_changes_before_migration() {
 		//relies on 4.1's EEH_Activation::create_table
-		require_once( EE_HELPERS . 'EEH_Activation.helper.php' );
-		$table_name='esp_answer';
-		$sql=" ANS_ID INT UNSIGNED NOT NULL AUTO_INCREMENT,
+		require_once(EE_HELPERS.'EEH_Activation.helper.php');
+		$table_name = 'esp_answer';
+		$sql = " ANS_ID INT UNSIGNED NOT NULL AUTO_INCREMENT,
 					REG_ID INT UNSIGNED NOT NULL,
 					QST_ID INT UNSIGNED NOT NULL,
 					ANS_value TEXT NOT NULL,
 					PRIMARY KEY  (ANS_ID)";
-		$this->_table_has_not_changed_since_previous($table_name,$sql, 'ENGINE=InnoDB');
+		$this->_table_has_not_changed_since_previous($table_name, $sql, 'ENGINE=InnoDB');
 
 		$table_name = 'esp_attendee_meta';
 		$sql = "ATTM_ID INT(10) UNSIGNED NOT	NULL AUTO_INCREMENT,
@@ -137,7 +137,7 @@ 
 					  CNT_is_EU TINYINT(1) DEFAULT '0',
 					  CNT_active TINYINT(1) DEFAULT '0',
 					  PRIMARY KEY  (CNT_ISO)";
-		$this->_table_has_not_changed_since_previous($table_name, $sql, 'ENGINE=InnoDB' );
+		$this->_table_has_not_changed_since_previous($table_name, $sql, 'ENGINE=InnoDB');
 
 		$table_name = 'esp_currency';
 		$sql = "CUR_code VARCHAR(6) COLLATE utf8_bin NOT NULL,
@@ -147,7 +147,7 @@ 
 				CUR_dec_plc VARCHAR(1) COLLATE utf8_bin NOT NULL DEFAULT '2',
 				CUR_active TINYINT(1) DEFAULT '0',
 				PRIMARY KEY  (CUR_code)";
-		$this->_table_has_not_changed_since_previous($table_name, $sql, 'ENGINE=InnoDB' );
+		$this->_table_has_not_changed_since_previous($table_name, $sql, 'ENGINE=InnoDB');
 
 
 		$table_name = 'esp_currency_payment_method';
@@ -177,7 +177,7 @@ 
 
 
 
-		$this->_table_has_not_changed_since_previous($table_name, $sql, 'ENGINE=InnoDB' );
+		$this->_table_has_not_changed_since_previous($table_name, $sql, 'ENGINE=InnoDB');
 		$table_name = 'esp_event_meta';
 		$sql = "
 			EVTM_ID INT NOT NULL AUTO_INCREMENT,
@@ -194,41 +194,41 @@ 
 			EVT_external_URL VARCHAR(200) NULL,
 			EVT_donations TINYINT(1) NULL,
 			PRIMARY KEY  (EVTM_ID)";
-		$this->_table_has_not_changed_since_previous($table_name,$sql, 'ENGINE=InnoDB');
+		$this->_table_has_not_changed_since_previous($table_name, $sql, 'ENGINE=InnoDB');
 
 
 
-		$table_name='esp_event_question_group';
-		$sql="EQG_ID INT UNSIGNED NOT NULL AUTO_INCREMENT,
+		$table_name = 'esp_event_question_group';
+		$sql = "EQG_ID INT UNSIGNED NOT NULL AUTO_INCREMENT,
 					EVT_ID BIGINT(20) UNSIGNED NOT NULL,
 					QSG_ID INT UNSIGNED NOT NULL,
 					EQG_primary TINYINT(1) UNSIGNED NOT NULL DEFAULT 0,
 					PRIMARY KEY  (EQG_ID)";
-		$this->_table_has_not_changed_since_previous($table_name,$sql, 'ENGINE=InnoDB');
+		$this->_table_has_not_changed_since_previous($table_name, $sql, 'ENGINE=InnoDB');
 
 
 
-		$table_name='esp_event_venue';
-		$sql="EVV_ID INT(11) NOT NULL AUTO_INCREMENT,
+		$table_name = 'esp_event_venue';
+		$sql = "EVV_ID INT(11) NOT NULL AUTO_INCREMENT,
 				EVT_ID BIGINT(20) UNSIGNED NOT NULL,
 				VNU_ID BIGINT(20) UNSIGNED NOT NULL,
 				EVV_primary TINYINT(1) UNSIGNED NOT NULL DEFAULT 0,
 				PRIMARY KEY  (EVV_ID)";
-		$this->_table_has_not_changed_since_previous($table_name,$sql, 'ENGINE=InnoDB');
+		$this->_table_has_not_changed_since_previous($table_name, $sql, 'ENGINE=InnoDB');
 
 
 
-		$table_name='esp_extra_meta';
-		$sql="EXM_ID INT(11) NOT NULL AUTO_INCREMENT,
+		$table_name = 'esp_extra_meta';
+		$sql = "EXM_ID INT(11) NOT NULL AUTO_INCREMENT,
 				OBJ_ID INT(11) DEFAULT NULL,
 				EXM_type VARCHAR(45) DEFAULT NULL,
 				EXM_key VARCHAR(45) DEFAULT NULL,
 				EXM_value TEXT,
 				PRIMARY KEY  (EXM_ID)";
-		$this->_table_has_not_changed_since_previous($table_name,$sql, 'ENGINE=InnoDB');
+		$this->_table_has_not_changed_since_previous($table_name, $sql, 'ENGINE=InnoDB');
 
-		$table_name='esp_line_item';
-		$sql="LIN_ID INT(11) NOT NULL AUTO_INCREMENT,
+		$table_name = 'esp_line_item';
+		$sql = "LIN_ID INT(11) NOT NULL AUTO_INCREMENT,
 				LIN_code VARCHAR(245) NOT NULL DEFAULT '',
 				TXN_ID INT(11) DEFAULT NULL,
 				LIN_name VARCHAR(245) NOT NULL DEFAULT '',
@@ -244,7 +244,7 @@ 
 				OBJ_ID INT(11) DEFAULT NULL,
 				OBJ_type VARCHAR(45)DEFAULT NULL,
 				PRIMARY KEY  (LIN_ID)";
-		$this->_table_has_not_changed_since_previous($table_name,$sql, 'ENGINE=InnoDB' );
+		$this->_table_has_not_changed_since_previous($table_name, $sql, 'ENGINE=InnoDB');
 
 		$table_name = 'esp_log';
 		$sql = "LOG_ID INT(11) NOT NULL AUTO_INCREMENT,
@@ -267,7 +267,7 @@ 
 					KEY GRP_ID (GRP_ID)";
 		$this->_table_has_not_changed_since_previous($table_name, $sql, 'ENGINE=InnoDB');
 
-		EEH_Activation::drop_index( 'esp_message_template_group', 'EVT_ID' );
+		EEH_Activation::drop_index('esp_message_template_group', 'EVT_ID');
 
 		$table_name = 'esp_message_template_group';
 		$sql = "GRP_ID INT(10) UNSIGNED NOT NULL AUTO_INCREMENT,
@@ -282,7 +282,7 @@ 
 					MTP_is_active TINYINT(1) NOT NULL DEFAULT '1',
 					PRIMARY KEY  (GRP_ID),
 					KEY MTP_user_id (MTP_user_id)";
-		$this->_table_has_not_changed_since_previous( $table_name, $sql, 'ENGINE=InnoDB');
+		$this->_table_has_not_changed_since_previous($table_name, $sql, 'ENGINE=InnoDB');
 
 		$table_name = 'esp_event_message_template';
 		$sql = "EMT_ID BIGINT(20) UNSIGNED NOT NULL AUTO_INCREMENT,
@@ -291,7 +291,7 @@ 
 					PRIMARY KEY  (EMT_ID),
 					KEY EVT_ID (EVT_ID),
 					KEY GRP_ID (GRP_ID)";
-		$this->_table_has_not_changed_since_previous( $table_name, $sql, 'ENGINE=InnoDB');
+		$this->_table_has_not_changed_since_previous($table_name, $sql, 'ENGINE=InnoDB');
 
 
 		$table_name = 'esp_payment';
@@ -359,8 +359,8 @@ 
 					  PRIMARY KEY  (TTM_ID)";
 		$this->_table_has_not_changed_since_previous($table_name, $sql, 'ENGINE=InnoDB');
 
-		$table_name='esp_question';
-		$sql='QST_ID INT UNSIGNED NOT NULL AUTO_INCREMENT,
+		$table_name = 'esp_question';
+		$sql = 'QST_ID INT UNSIGNED NOT NULL AUTO_INCREMENT,
 					QST_display_text TEXT NOT NULL,
 					QST_admin_label VARCHAR(255) NOT NULL,
 					QST_system VARCHAR(25) DEFAULT NULL,
@@ -372,27 +372,27 @@ 
 					QST_wp_user BIGINT UNSIGNED NULL,
 					QST_deleted TINYINT UNSIGNED NOT NULL DEFAULT 0,
 					PRIMARY KEY  (QST_ID)';
-		$this->_table_has_not_changed_since_previous($table_name,$sql, 'ENGINE=InnoDB');
+		$this->_table_has_not_changed_since_previous($table_name, $sql, 'ENGINE=InnoDB');
 
-		$table_name='esp_question_group_question';
-		$sql="QGQ_ID INT UNSIGNED NOT NULL AUTO_INCREMENT,
+		$table_name = 'esp_question_group_question';
+		$sql = "QGQ_ID INT UNSIGNED NOT NULL AUTO_INCREMENT,
 					QSG_ID INT UNSIGNED NOT NULL,
 					QST_ID INT UNSIGNED NOT NULL,
 					QGQ_order INT UNSIGNED NOT NULL DEFAULT 0,
 					PRIMARY KEY  (QGQ_ID) ";
-		$this->_table_has_not_changed_since_previous($table_name,$sql, 'ENGINE=InnoDB');
+		$this->_table_has_not_changed_since_previous($table_name, $sql, 'ENGINE=InnoDB');
 
 
 
-		$table_name='esp_question_option';
-		$sql="QSO_ID INT UNSIGNED NOT NULL AUTO_INCREMENT,
+		$table_name = 'esp_question_option';
+		$sql = "QSO_ID INT UNSIGNED NOT NULL AUTO_INCREMENT,
 					QSO_value VARCHAR(255) NOT NULL,
 					QSO_desc TEXT NOT NULL,
 					QST_ID INT UNSIGNED NOT NULL,
 					QSO_order INT UNSIGNED NOT NULL DEFAULT 0,
 					QSO_deleted TINYINT(1) UNSIGNED NOT NULL DEFAULT 0,
 					PRIMARY KEY  (QSO_ID)";
-		$this->_table_has_not_changed_since_previous($table_name,$sql, 'ENGINE=InnoDB');
+		$this->_table_has_not_changed_since_previous($table_name, $sql, 'ENGINE=InnoDB');
 
 
 
@@ -438,8 +438,8 @@ 
 
 
 
-		$table_name='esp_checkin';
-		$sql="CHK_ID INT(10) UNSIGNED NOT NULL AUTO_INCREMENT,
+		$table_name = 'esp_checkin';
+		$sql = "CHK_ID INT(10) UNSIGNED NOT NULL AUTO_INCREMENT,
 					REG_ID INT(10) UNSIGNED NOT NULL,
 					DTT_ID INT(10) UNSIGNED NOT NULL,
 					CHK_in TINYINT(1) UNSIGNED NOT NULL DEFAULT 1,
@@ -528,7 +528,7 @@ 
 					  PRC_wp_user BIGINT UNSIGNED NULL,
 					  PRC_parent INT(10) UNSIGNED DEFAULT 0,
 					  PRIMARY KEY  (PRC_ID)";
-		$this->_table_has_not_changed_since_previous($table_name,$sql, 'ENGINE=InnoDB');
+		$this->_table_has_not_changed_since_previous($table_name, $sql, 'ENGINE=InnoDB');
 
 		$table_name = "esp_price_type";
 		$sql = "PRT_ID TINYINT(3) UNSIGNED NOT NULL AUTO_INCREMENT,
@@ -565,12 +565,12 @@ 
 					  TKT_parent INT(10) UNSIGNED DEFAULT '0',
 					  TKT_deleted TINYINT(1) NOT NULL DEFAULT '0',
 					  PRIMARY KEY  (TKT_ID)";
-		$this->_table_has_not_changed_since_previous($table_name, $sql, 'ENGINE=InnoDB' );
+		$this->_table_has_not_changed_since_previous($table_name, $sql, 'ENGINE=InnoDB');
 
-		EEH_Activation::drop_index( 'esp_question_group', 'QSG_identifier_UNIQUE' );
+		EEH_Activation::drop_index('esp_question_group', 'QSG_identifier_UNIQUE');
 
 		$table_name = 'esp_question_group';
-		$sql='QSG_ID INT UNSIGNED NOT NULL AUTO_INCREMENT,
+		$sql = 'QSG_ID INT UNSIGNED NOT NULL AUTO_INCREMENT,
 					QSG_name VARCHAR(255) NOT NULL,
 					QSG_identifier VARCHAR(100) NOT NULL,
 					QSG_desc TEXT NULL,
@@ -582,7 +582,7 @@ 
 					QSG_wp_user BIGINT UNSIGNED NULL,
 					PRIMARY KEY  (QSG_ID),
 					UNIQUE KEY QSG_identifier_UNIQUE (QSG_identifier ASC)';
-		$this->_table_has_not_changed_since_previous($table_name, $sql, 'ENGINE=InnoDB' );
+		$this->_table_has_not_changed_since_previous($table_name, $sql, 'ENGINE=InnoDB');
 
 		/** @var EE_DMS_Core_4_1_0 $script_4_1_defaults */
 		$script_4_1_defaults = EE_Registry::instance()->load_dms('Core_4_1_0');
@@ -614,7 +614,7 @@ 
 		return true;
 	}
 
-	public function migration_page_hooks(){
+	public function migration_page_hooks() {
 
 	}
 

core/data_migration_scripts/EE_DMS_Unknown_1_0_0.core.php

Spacing +1 added lines, -1 removed lines

@@ -17,7 +17,7 @@
  */
 /**
  */
-class EE_DMS_Unknown_1_0_0 extends EE_Data_Migration_Script_Base{
+class EE_DMS_Unknown_1_0_0 extends EE_Data_Migration_Script_Base {
 
 	/**
 	 * Returns whether or not this data migration script can operate on the given version of the database.

core/data_migration_scripts/EE_Data_Migration_Script_Base.core.php

Braces +11 added lines, -11 removed lines

@@ -306,7 +306,7 @@ 
 					$records_migrated_during_stage = $stage->migration_step($num_records_to_migrate_limit - $num_records_actually_migrated);
 					$num_records_actually_migrated += $records_migrated_during_stage;
 					$records_migrated_per_stage[$stage->pretty_name()] = $records_migrated_during_stage;
-				}catch(Exception $e){
+				} catch(Exception $e){
 					//yes if we catch an exception here, we consider that migration stage borked.
 					$stage->set_status(EE_Data_Migration_Manager::status_fatal_error);
 					$this->set_status(EE_Data_Migration_Manager::status_fatal_error);
@@ -332,14 +332,14 @@ 
 			//this migration script apparently has NO stages... which is super weird, but whatever
 			$this->set_completed();
 			$this->_maybe_do_schema_changes(false);
-		}else if( $num_records_actually_migrated < $num_records_to_migrate_limit && ! $stage->has_more_to_do()){
+		} else if( $num_records_actually_migrated < $num_records_to_migrate_limit && ! $stage->has_more_to_do()){
 			//apparently we're done, because we couldn't migrate the number we intended to
 			$this->set_completed();
 			$this->_update_feedback_message(array_reverse($records_migrated_per_stage));
 			//do schema changes for after the migration now
 			//first double-check we haven't already done this
 			$this->_maybe_do_schema_changes(false);
-		}else{
+		} else{
 			//update feedback message, keeping in mind that we show them with the most recent at the top
 			$this->_update_feedback_message(array_reverse($records_migrated_per_stage));
 		}
@@ -378,12 +378,12 @@ 
 				ob_start();
 				if($before){
 					$this->schema_changes_before_migration();
-				}else{
+				} else{
 					$this->schema_changes_after_migration();
 				}
 				$output = ob_get_contents();
 				ob_end_clean();
-			}catch(Exception $e){
+			} catch(Exception $e){
 				$this->set_status(EE_Data_Migration_Manager::status_fatal_error);
 				throw $e;
 			}
@@ -511,13 +511,13 @@ 
 		if( $table_is_new ) {
 			if( $this->_get_req_type_for_plugin_corresponding_to_this_dms() == EE_System::req_type_new_activation  || $this->_currently_migrating() ){
 				return true;
-			}else{
+			} else{
 				return false;
 			}
-		}else{
+		} else{
 			if(in_array($this->_get_req_type_for_plugin_corresponding_to_this_dms(),array(EE_System::req_type_new_activation))){
 				return true;
-			}else{
+			} else{
 				return false;
 			}
 		}
@@ -534,7 +534,7 @@ 
 		EE_Registry::instance()->load_helper('Activation');
 		try{
 			EEH_Activation::create_table($table_name,$table_definition_sql, $engine_string, $drop_pre_existing_tables);
-		}catch( EE_Error $e ) {
+		} catch( EE_Error $e ) {
 			$message = $e->getMessage() . '<br>Stack Trace:' . $e->getTraceAsString();
 			$this->add_error( $message  );
 			$this->_feedback_message .= $message;
@@ -551,11 +551,11 @@ 
 	private function _get_req_type_for_plugin_corresponding_to_this_dms(){
 		if($this->slug() == 'Core'){
 			return EE_System::instance()->detect_req_type();
-		}else{//it must be for an addon
+		} else{//it must be for an addon
 			$addon_name = $this->slug();
 			if( EE_Registry::instance()->get_addon_by_name($addon_name)){
 				return EE_Registry::instance()->get_addon_by_name($addon_name)->detect_req_type();
-			}else{
+			} else{
 				throw new EE_Error(sprintf(__("The DMS slug '%s' should correspond to the addon's name, which should also be '%s', but no such addon was registered. These are the registered addons' names: %s", "event_espresso"),$this->slug(),$addon_name,implode(",",array_keys( EE_Registry::instance()->get_addons_by_name() ) ) ) ) ;
 			}
 		}

Spacing +110 added lines, -110 removed lines

@@ -117,9 +117,9 @@ 
 	 * All children of this must call parent::__construct() at the end of their constructor or suffer the consequences!
 	 */
 	public function __construct() {
-		$this->_migration_stages = apply_filters('FHEE__'.get_class($this).'__construct__migration_stages',$this->_migration_stages);
-		foreach($this->_migration_stages as $migration_stage){
-			if ( $migration_stage instanceof EE_Data_Migration_Script_Stage ) {
+		$this->_migration_stages = apply_filters('FHEE__'.get_class($this).'__construct__migration_stages', $this->_migration_stages);
+		foreach ($this->_migration_stages as $migration_stage) {
+			if ($migration_stage instanceof EE_Data_Migration_Script_Stage) {
 				$migration_stage->_construct_finalize($this);
 			}
 		}
@@ -132,7 +132,7 @@ 
 	 * Place to add hooks and filters for tweaking the migrations page, in order
 	 * to customize it
 	 */
-	public function migration_page_hooks(){
+	public function migration_page_hooks() {
 		//by default none are added because we normally like the default look of the migration page
 	}
 
@@ -147,9 +147,9 @@ 
 	 * @param int|string $new_pk eg posts.ID
 	 * @return void
 	 */
-	public function set_mapping($old_table,$old_pk,$new_table,$new_pk){
+	public function set_mapping($old_table, $old_pk, $new_table, $new_pk) {
 		//make sure it has the needed keys
-		if( ! isset($this->_mappings[$old_table]) || ! isset($this->_mappings[$old_table][$new_table])){
+		if ( ! isset($this->_mappings[$old_table]) || ! isset($this->_mappings[$old_table][$new_table])) {
 			$this->_mappings[$old_table][$new_table] = $this->_get_mapping_option($old_table, $new_table);
 		}
 		$this->_mappings[$old_table][$new_table][$old_pk] = $new_pk;
@@ -165,9 +165,9 @@ 
 	 * @param string $new_table with wpdb prefix (wp_). Eg: wp_posts
 	 * @return mixed the primary key on the new table
 	 */
-	public function get_mapping_new_pk($old_table,$old_pk,$new_table){
-		if( ! isset($this->_mappings[$old_table]) ||
-			! isset($this->_mappings[$old_table][$new_table])){
+	public function get_mapping_new_pk($old_table, $old_pk, $new_table) {
+		if ( ! isset($this->_mappings[$old_table]) ||
+			! isset($this->_mappings[$old_table][$new_table])) {
 			//try fetching the option
 			$this->_mappings[$old_table][$new_table] = $this->_get_mapping_option($old_table, $new_table);
 		}
@@ -184,15 +184,15 @@ 
 	 * @param mixed $new_pk
 	 * @return mixed
 	 */
-	public function get_mapping_old_pk($old_table,$new_table,$new_pk){
-		if( ! isset($this->_mappings[$old_table]) ||
-			! isset($this->_mappings[$old_table][$new_table])){
+	public function get_mapping_old_pk($old_table, $new_table, $new_pk) {
+		if ( ! isset($this->_mappings[$old_table]) ||
+			! isset($this->_mappings[$old_table][$new_table])) {
 			//try fetching the option
 			$this->_mappings[$old_table][$new_table] = $this->_get_mapping_option($old_table, $new_table);
 		}
-		if(isset($this->_mappings[$old_table][$new_table])){
+		if (isset($this->_mappings[$old_table][$new_table])) {
 			$new_pk_to_old_pk = array_flip($this->_mappings[$old_table][$new_table]);
-			if(isset($new_pk_to_old_pk[$new_pk])){
+			if (isset($new_pk_to_old_pk[$new_pk])) {
 				return $new_pk_to_old_pk[$new_pk];
 			}
 		}
@@ -207,8 +207,8 @@ 
 	 * @param string $new_table_name
 	 * @return array
 	 */
-	protected function _get_mapping_option($old_table_name,$new_table_name){
-		$option =  get_option($this->_get_mapping_option_name($old_table_name, $new_table_name),array());
+	protected function _get_mapping_option($old_table_name, $new_table_name) {
+		$option = get_option($this->_get_mapping_option_name($old_table_name, $new_table_name), array());
 		return $option;
 	}
 
@@ -221,9 +221,9 @@ 
 	 * @param array $mapping_array
 	 * @return boolean success of updating option
 	 */
-	protected function _set_mapping_option($old_table_name,$new_table_name,$mapping_array){
+	protected function _set_mapping_option($old_table_name, $new_table_name, $mapping_array) {
 //		echo "set mapping for $old_table_name $new_table_name".count($mapping_array)."<br>";
-		$success =  update_option($this->_get_mapping_option_name($old_table_name, $new_table_name),$mapping_array);
+		$success = update_option($this->_get_mapping_option_name($old_table_name, $new_table_name), $mapping_array);
 		return $success;
 	}
 
@@ -235,12 +235,12 @@ 
 	 * @param string $new_table_name
 	 * @return string
 	 */
-	protected function _get_mapping_option_name($old_table_name,$new_table_name){
+	protected function _get_mapping_option_name($old_table_name, $new_table_name) {
 		global $wpdb;
-		$old_table_name_sans_wp = str_replace($wpdb->prefix,"",$old_table_name);
-		$new_table_name_sans_wp = str_replace($wpdb->prefix,"",$new_table_name);
+		$old_table_name_sans_wp = str_replace($wpdb->prefix, "", $old_table_name);
+		$new_table_name_sans_wp = str_replace($wpdb->prefix, "", $new_table_name);
 		$migrates_to = EE_Data_Migration_Manager::instance()->script_migrates_to_version(get_class($this));
-		return substr( EE_Data_Migration_Manager::data_migration_script_mapping_option_prefix . $migrates_to [ 'slug' ] . '_' . $migrates_to[ 'version' ] . '_' . $old_table_name_sans_wp . '_' . $new_table_name_sans_wp, 0, 64 );
+		return substr(EE_Data_Migration_Manager::data_migration_script_mapping_option_prefix.$migrates_to ['slug'].'_'.$migrates_to['version'].'_'.$old_table_name_sans_wp.'_'.$new_table_name_sans_wp, 0, 64);
 	}
 
 
@@ -257,10 +257,10 @@ 
 	 * 99% until the function "migration_step" returns EE_Data_Migration_Script_Base::status_complete.
 	 * @return int
 	 */
-	protected function _count_records_to_migrate(){
+	protected function _count_records_to_migrate() {
 		$count = 0;
-		foreach($this->stages() as $stage){
-			$count+= $stage->count_records_to_migrate();
+		foreach ($this->stages() as $stage) {
+			$count += $stage->count_records_to_migrate();
 		}
 		return $count;
 	}
@@ -272,10 +272,10 @@ 
 	 * by just setting a transient and updating it after each migration_step
 	 * @return int
 	 */
-	public function count_records_migrated(){
+	public function count_records_migrated() {
 		$count = 0;
-		foreach($this->stages() as $stage){
-			$count+= $stage->count_records_migrated();
+		foreach ($this->stages() as $stage) {
+			$count += $stage->count_records_migrated();
 		}
 		$this->_records_migrated = $count;
 		return $count;
@@ -289,24 +289,24 @@ 
 	 * @throws EE_Error
 	 * @throws Exception
 	 */
-	public function migration_step($num_records_to_migrate_limit){
+	public function migration_step($num_records_to_migrate_limit) {
 		//reset the feedback message
 		$this->_feedback_message = '';
 		//if we haven't yet done the 1st schema changes, do them now. buffer any output
 		$this->_maybe_do_schema_changes(true);
 
-		$num_records_actually_migrated =0;
+		$num_records_actually_migrated = 0;
 		$records_migrated_per_stage = array();
 		//setup the 'stage' variable, which should hold the last run stage of the migration  (or none at all if nothing runs)
 		$stage = null;
 		//get the next stage that isn't complete
-		foreach($this->stages() as $stage){
-			if( $stage->get_status() == EE_Data_Migration_Manager::status_continue){
-				try{
+		foreach ($this->stages() as $stage) {
+			if ($stage->get_status() == EE_Data_Migration_Manager::status_continue) {
+				try {
 					$records_migrated_during_stage = $stage->migration_step($num_records_to_migrate_limit - $num_records_actually_migrated);
 					$num_records_actually_migrated += $records_migrated_during_stage;
 					$records_migrated_per_stage[$stage->pretty_name()] = $records_migrated_during_stage;
-				}catch(Exception $e){
+				} catch (Exception $e) {
 					//yes if we catch an exception here, we consider that migration stage borked.
 					$stage->set_status(EE_Data_Migration_Manager::status_fatal_error);
 					$this->set_status(EE_Data_Migration_Manager::status_fatal_error);
@@ -314,7 +314,7 @@ 
 					throw $e;
 				}
 				//check that the migration stage didn't mark itself as having a fatal error
-				if($stage->is_broken()){
+				if ($stage->is_broken()) {
 					$this->set_broken();
 					throw new EE_Error($stage->get_last_error());
 				}
@@ -322,24 +322,24 @@ 
 			//once we've migrated all the number we intended to (possibly from different stages), stop migrating
 			//or if we had a fatal error
 			//or if the current script stopped early- its not done, but it's done all it thinks we should do on this step
-			if ($num_records_actually_migrated >= $num_records_to_migrate_limit || $stage->is_broken() || $stage->has_more_to_do()){
+			if ($num_records_actually_migrated >= $num_records_to_migrate_limit || $stage->is_broken() || $stage->has_more_to_do()) {
 				break;
 			}
 		}
 		//check if we're all done this data migration...
 		//which is indicated by being done early AND the last stage claims to be done
-		if($stage == NULL){
+		if ($stage == NULL) {
 			//this migration script apparently has NO stages... which is super weird, but whatever
 			$this->set_completed();
 			$this->_maybe_do_schema_changes(false);
-		}else if( $num_records_actually_migrated < $num_records_to_migrate_limit && ! $stage->has_more_to_do()){
+		} else if ($num_records_actually_migrated < $num_records_to_migrate_limit && ! $stage->has_more_to_do()) {
 			//apparently we're done, because we couldn't migrate the number we intended to
 			$this->set_completed();
 			$this->_update_feedback_message(array_reverse($records_migrated_per_stage));
 			//do schema changes for after the migration now
 			//first double-check we haven't already done this
 			$this->_maybe_do_schema_changes(false);
-		}else{
+		} else {
 			//update feedback message, keeping in mind that we show them with the most recent at the top
 			$this->_update_feedback_message(array_reverse($records_migrated_per_stage));
 		}
@@ -353,12 +353,12 @@ 
 	 * @param array $records_migrated_per_stage KEYS are pretty names for each stage; values are the count of records migrated from that stage
 	 * @return void
 	 */
-	private function _update_feedback_message($records_migrated_per_stage){
+	private function _update_feedback_message($records_migrated_per_stage) {
 		$feedback_message_array = array();
-		foreach($records_migrated_per_stage as $migration_stage_name => $num_records_migrated){
-			$feedback_message_array[] = sprintf(__("Migrated %d records successfully during %s", "event_espresso"),$num_records_migrated,$migration_stage_name) ;
+		foreach ($records_migrated_per_stage as $migration_stage_name => $num_records_migrated) {
+			$feedback_message_array[] = sprintf(__("Migrated %d records successfully during %s", "event_espresso"), $num_records_migrated, $migration_stage_name);
 		}
-		$this->_feedback_message .= implode("<br>",$feedback_message_array);
+		$this->_feedback_message .= implode("<br>", $feedback_message_array);
 	}
 
 
@@ -370,27 +370,27 @@ 
 	 * @throws Exception
 	 * @return void
 	 */
-	private function _maybe_do_schema_changes($before = true){
+	private function _maybe_do_schema_changes($before = true) {
 		//so this property will be either _schema_changes_after_migration_ran or _schema_changes_before_migration_ran
-		$property_name = '_schema_changes_'. ($before ? 'before' : 'after').'_migration_ran';
-		if ( ! $this->$property_name ){
-			try{
+		$property_name = '_schema_changes_'.($before ? 'before' : 'after').'_migration_ran';
+		if ( ! $this->$property_name) {
+			try {
 				ob_start();
-				if($before){
+				if ($before) {
 					$this->schema_changes_before_migration();
-				}else{
+				} else {
 					$this->schema_changes_after_migration();
 				}
 				$output = ob_get_contents();
 				ob_end_clean();
-			}catch(Exception $e){
+			} catch (Exception $e) {
 				$this->set_status(EE_Data_Migration_Manager::status_fatal_error);
 				throw $e;
 			}
 			//record that we've done these schema changes
 			$this->$property_name = true;
 			//if there were any warnings etc, record them as non-fatal errors
-			if( $output ){
+			if ($output) {
 				//there were some warnings
 				$this->_errors[] = $output;
 			}
@@ -417,9 +417,9 @@ 
 	 * @param string $table_definition_sql
 	 * @param string $engine_string
 	 */
-	protected function _table_is_new_in_this_version($table_name,$table_definition_sql,$engine_string='ENGINE=InnoDB '){
+	protected function _table_is_new_in_this_version($table_name, $table_definition_sql, $engine_string = 'ENGINE=InnoDB ') {
 //		EEH_Debug_Tools::instance()->start_timer( '_table_is_new_in_this_version_' . $table_name );
-		$this->_create_table_and_catch_errors($table_name, $table_definition_sql, $engine_string, $this->_pre_existing_table_should_be_dropped(  true ) );
+		$this->_create_table_and_catch_errors($table_name, $table_definition_sql, $engine_string, $this->_pre_existing_table_should_be_dropped(true));
 //		EEH_Debug_Tools::instance()->stop_timer( '_table_is_new_in_this_version_' . $table_name  );
 	}
 
@@ -432,9 +432,9 @@ 
 	 * @param string $table_definition_sql
 	 * @param string $engine_string
 	 */
-	protected function _table_is_changed_in_this_version($table_name,$table_definition_sql,$engine_string = 'ENGINE=MyISAM'){
+	protected function _table_is_changed_in_this_version($table_name, $table_definition_sql, $engine_string = 'ENGINE=MyISAM') {
 //		EEH_Debug_Tools::instance()->start_timer( '_table_is_changed_in_this_version' . $table_name );
-		$this->_create_table_and_catch_errors($table_name, $table_definition_sql, $engine_string, $this->_pre_existing_table_should_be_dropped(  false ) );
+		$this->_create_table_and_catch_errors($table_name, $table_definition_sql, $engine_string, $this->_pre_existing_table_should_be_dropped(false));
 //		EEH_Debug_Tools::instance()->stop_timer( '_table_is_changed_in_this_version' . $table_name  );
 	}
 
@@ -452,9 +452,9 @@ 
 	 * @param string $table_definition_sql
 	 * @param string $engine_string
 	 */
-	protected function _table_should_exist_previously($table_name,$table_definition_sql,$engine_string = 'ENGINE=MyISAM'){
+	protected function _table_should_exist_previously($table_name, $table_definition_sql, $engine_string = 'ENGINE=MyISAM') {
 //		EEH_Debug_Tools::instance()->start_timer( '_table_should_exist_previously' . $table_name );
-		$this->_create_table_and_catch_errors($table_name, $table_definition_sql, $engine_string, $this->_pre_existing_table_should_be_dropped(  false ) );
+		$this->_create_table_and_catch_errors($table_name, $table_definition_sql, $engine_string, $this->_pre_existing_table_should_be_dropped(false));
 //		EEH_Debug_Tools::instance()->stop_timer( '_table_should_exist_previously' . $table_name );
 	}
 
@@ -468,13 +468,13 @@ 
 	 * @param string $table_definition_sql
 	 * @param string $engine_string
 	 */
-	protected function _table_has_not_changed_since_previous( $table_name,$table_definition_sql,$engine_string = 'ENGINE=MyISAM'){
-		if( $this->_currently_migrating() ) {
+	protected function _table_has_not_changed_since_previous($table_name, $table_definition_sql, $engine_string = 'ENGINE=MyISAM') {
+		if ($this->_currently_migrating()) {
 			//if we're doing a migration, and this table apparently already exists, then we don't need do anything right?
 //			EEH_Debug_Tools::instance()->stop_timer( '_table_should_exist_previously' . $table_name );
 			return;
 		}
-		$this->_create_table_and_catch_errors($table_name, $table_definition_sql, $engine_string, $this->_pre_existing_table_should_be_dropped(  false ) );
+		$this->_create_table_and_catch_errors($table_name, $table_definition_sql, $engine_string, $this->_pre_existing_table_should_be_dropped(false));
 	}
 
 	/**
@@ -484,7 +484,7 @@ 
 	protected function _currently_migrating() {
 		//we want to know if we are currently performing a migration. We could just believe what was set on the _migrating property, but let's double-check (ie the script should apply and we should be in MM)
 		return $this->_migrating &&
-					$this->can_migrate_from_version( EE_Data_Migration_Manager::instance()->ensure_current_database_state_is_set() ) &&
+					$this->can_migrate_from_version(EE_Data_Migration_Manager::instance()->ensure_current_database_state_is_set()) &&
 					EE_Maintenance_Mode::instance()->real_level() == EE_Maintenance_Mode::level_2_complete_maintenance;
 	}
 
@@ -494,17 +494,17 @@ 
 	 * @param boolean $table_is_new
 	 * @return boolean
 	 */
-	protected function _pre_existing_table_should_be_dropped( $table_is_new ) {
-		if( $table_is_new ) {
-			if( $this->_get_req_type_for_plugin_corresponding_to_this_dms() == EE_System::req_type_new_activation  || $this->_currently_migrating() ){
+	protected function _pre_existing_table_should_be_dropped($table_is_new) {
+		if ($table_is_new) {
+			if ($this->_get_req_type_for_plugin_corresponding_to_this_dms() == EE_System::req_type_new_activation || $this->_currently_migrating()) {
 				return true;
-			}else{
+			} else {
 				return false;
 			}
-		}else{
-			if(in_array($this->_get_req_type_for_plugin_corresponding_to_this_dms(),array(EE_System::req_type_new_activation))){
+		} else {
+			if (in_array($this->_get_req_type_for_plugin_corresponding_to_this_dms(), array(EE_System::req_type_new_activation))) {
 				return true;
-			}else{
+			} else {
 				return false;
 			}
 		}
@@ -517,13 +517,13 @@ 
 	 * @param string $engine_string
 	 * @param boolean $drop_pre_existing_tables
 	 */
-	private function _create_table_and_catch_errors( $table_name, $table_definition_sql, $engine_string = 'ENGINE=MyISAM', $drop_pre_existing_tables = FALSE ){
+	private function _create_table_and_catch_errors($table_name, $table_definition_sql, $engine_string = 'ENGINE=MyISAM', $drop_pre_existing_tables = FALSE) {
 		EE_Registry::instance()->load_helper('Activation');
-		try{
-			EEH_Activation::create_table($table_name,$table_definition_sql, $engine_string, $drop_pre_existing_tables);
-		}catch( EE_Error $e ) {
-			$message = $e->getMessage() . '<br>Stack Trace:' . $e->getTraceAsString();
-			$this->add_error( $message  );
+		try {
+			EEH_Activation::create_table($table_name, $table_definition_sql, $engine_string, $drop_pre_existing_tables);
+		} catch (EE_Error $e) {
+			$message = $e->getMessage().'<br>Stack Trace:'.$e->getTraceAsString();
+			$this->add_error($message);
 			$this->_feedback_message .= $message;
 		}
 	}
@@ -535,15 +535,15 @@ 
 	 * @return int one of EE_System::_req_type_* constants
 	 * @throws EE_Error
 	 */
-	private function _get_req_type_for_plugin_corresponding_to_this_dms(){
-		if($this->slug() == 'Core'){
+	private function _get_req_type_for_plugin_corresponding_to_this_dms() {
+		if ($this->slug() == 'Core') {
 			return EE_System::instance()->detect_req_type();
-		}else{//it must be for an addon
+		} else {//it must be for an addon
 			$addon_name = $this->slug();
-			if( EE_Registry::instance()->get_addon_by_name($addon_name)){
+			if (EE_Registry::instance()->get_addon_by_name($addon_name)) {
 				return EE_Registry::instance()->get_addon_by_name($addon_name)->detect_req_type();
-			}else{
-				throw new EE_Error(sprintf(__("The DMS slug '%s' should correspond to the addon's name, which should also be '%s', but no such addon was registered. These are the registered addons' names: %s", "event_espresso"),$this->slug(),$addon_name,implode(",",array_keys( EE_Registry::instance()->get_addons_by_name() ) ) ) ) ;
+			} else {
+				throw new EE_Error(sprintf(__("The DMS slug '%s' should correspond to the addon's name, which should also be '%s', but no such addon was registered. These are the registered addons' names: %s", "event_espresso"), $this->slug(), $addon_name, implode(",", array_keys(EE_Registry::instance()->get_addons_by_name()))));
 			}
 		}
 	}
@@ -554,13 +554,13 @@ 
 	 * returns an array of strings describing errors by all the script's stages
 	 * @return array
 	 */
-	public function get_errors(){
+	public function get_errors() {
 		$all_errors = $this->_errors;
-		if( ! is_array($all_errors)){
+		if ( ! is_array($all_errors)) {
 			$all_errors = array();
 		}
-		foreach($this->stages() as $stage){
-			$all_errors = array_merge($stage->get_errors(),$all_errors);
+		foreach ($this->stages() as $stage) {
+			$all_errors = array_merge($stage->get_errors(), $all_errors);
 		}
 		return $all_errors;
 	}
@@ -571,8 +571,8 @@ 
 	 * Indicates whether or not this migration script should continue
 	 * @return boolean
 	 */
-	public function can_continue(){
-		return in_array($this->get_status(),  EE_Data_Migration_Manager::instance()->stati_that_indicate_to_continue_single_migration_script);
+	public function can_continue() {
+		return in_array($this->get_status(), EE_Data_Migration_Manager::instance()->stati_that_indicate_to_continue_single_migration_script);
 	}
 
 
@@ -584,8 +584,8 @@ 
 	 * get ordered by the indexes
 	 * @return EE_Data_Migration_Script_Stage[]
 	 */
-	protected function stages(){
-		$stages = apply_filters( 'FHEE__'.get_class($this).'__stages',$this->_migration_stages );
+	protected function stages() {
+		$stages = apply_filters('FHEE__'.get_class($this).'__stages', $this->_migration_stages);
 		ksort($stages);
 		return $stages;
 	}
@@ -597,7 +597,7 @@ 
 	 * can be displayed to the user
 	 * @return string
 	 */
-	public function get_feedback_message(){
+	public function get_feedback_message() {
 		return $this->_feedback_message;
 	}
 
@@ -609,16 +609,16 @@ 
 	 * possible that this class is defined when it goes to sleep, but NOT available when it
 	 * awakes (eg, this class is part of an addon that is deactivated at some point).
 	 */
-	public function properties_as_array(){
+	public function properties_as_array() {
 		$properties = parent::properties_as_array();
 		$properties['_migration_stages'] = array();
-		foreach($this->_migration_stages as $migration_stage_priority => $migration_stage_class){
+		foreach ($this->_migration_stages as $migration_stage_priority => $migration_stage_class) {
 			$properties['_migration_stages'][$migration_stage_priority] = $migration_stage_class->properties_as_array();
 		}
 		unset($properties['_mappings']);
 
-		foreach($this->_mappings as $old_table_name => $mapping_to_new_table){
-			foreach($mapping_to_new_table as $new_table_name => $mapping){
+		foreach ($this->_mappings as $old_table_name => $mapping_to_new_table) {
+			foreach ($mapping_to_new_table as $new_table_name => $mapping) {
 				$this->_set_mapping_option($old_table_name, $new_table_name, $mapping);
 			}
 		}
@@ -633,19 +633,19 @@ 
 	 * @param array $array_of_properties like what's produced from properties_as_array() method
 	 * @return void
 	 */
-	public function instantiate_from_array_of_properties($array_of_properties){
+	public function instantiate_from_array_of_properties($array_of_properties) {
 		$stages_properties_arrays = $array_of_properties['_migration_stages'];
 		unset($array_of_properties['_migration_stages']);
 		unset($array_of_properties['class']);
-		foreach($array_of_properties as $property_name => $property_value){
+		foreach ($array_of_properties as $property_name => $property_value) {
 			$this->$property_name = $property_value;
 		}
 		//_migration_stages are already instantiated, but have only default data
-		foreach($this->_migration_stages as $stage){
-			$stage_data = $this->_find_migration_stage_data_with_classname(get_class($stage),$stages_properties_arrays);
+		foreach ($this->_migration_stages as $stage) {
+			$stage_data = $this->_find_migration_stage_data_with_classname(get_class($stage), $stages_properties_arrays);
 			//SO, if we found the stage data that was saved, use it. Otherwise, I guess the stage is new? (maybe added by
 			//an addon? Unlikely... not sure why it wouldn't exist, but if it doesn't just treat it like it was never started yet)
-			if($stage_data){
+			if ($stage_data) {
 				$stage->instantiate_from_array_of_properties($stage_data);
 			}
 		}
@@ -661,9 +661,9 @@ 
 	 * @param array $migration_stage_data_arrays
 	 * @return null
 	 */
-	private function _find_migration_stage_data_with_classname($classname,$migration_stage_data_arrays){
-		foreach($migration_stage_data_arrays as $migration_stage_data_array){
-			if(isset($migration_stage_data_array['class']) && $migration_stage_data_array['class'] == $classname){
+	private function _find_migration_stage_data_with_classname($classname, $migration_stage_data_arrays) {
+		foreach ($migration_stage_data_arrays as $migration_stage_data_array) {
+			if (isset($migration_stage_data_array['class']) && $migration_stage_data_array['class'] == $classname) {
 				return $migration_stage_data_array;
 			}
 		}
@@ -679,8 +679,8 @@ 
 	 * @return array where the first key is the plugin's slug, the 2nd is the version of that plugin
 	 * that will be updated to. Eg array('Core','4.1.0')
 	 */
-	public final function migrates_to_version(){
-		return EE_Data_Migration_Manager::instance()->script_migrates_to_version( get_class( $this ) );
+	public final function migrates_to_version() {
+		return EE_Data_Migration_Manager::instance()->script_migrates_to_version(get_class($this));
 	}
 
 
@@ -692,10 +692,10 @@ 
 	 * Or 'Core' for core (non-addon).
 	 * @return string
 	 */
-	public function slug(){
+	public function slug() {
 		$migrates_to_version_info = $this->migrates_to_version();
 		//the slug is the first part of the array
-		return $migrates_to_version_info[ 'slug' ];
+		return $migrates_to_version_info['slug'];
 	}
 
 
@@ -709,7 +709,7 @@ 
 	 * the database up so it can run), then you can set "A" to priority 3 or something.
 	 * @return int
 	 */
-	public function priority(){
+	public function priority() {
 		return $this->_priority;
 	}
 
@@ -722,18 +722,18 @@ 
 	 * @param boolean $migrating
 	 * @return void
 	 */
-	public function set_migrating( $migrating = TRUE ){
+	public function set_migrating($migrating = TRUE) {
 		$this->_migrating = $migrating;
 	}
 
 	/**
 	 * Marks that we think this migration class can continue to migrate
 	 */
-	public function reattempt(){
+	public function reattempt() {
 		parent::reattempt();
 		//also, we want to reattempt any stages that were marked as borked
-		foreach( $this->stages() as $stage ) {
-			if( $stage->is_broken() ) {
+		foreach ($this->stages() as $stage) {
+			if ($stage->is_broken()) {
 				$stage->reattempt();
 			}
 		}

core/data_migration_scripts/EE_Data_Migration_Script_Stage.core.php

Spacing +9 added lines, -9 removed lines

@@ -34,7 +34,7 @@ 
  * _migration_step() (ie, it its a count of rows in the old attendees table in _count_records_to_migrate(), it should also be OLD attendee rows migrated
  * on each call to _migration_step().
  */
-abstract class EE_Data_Migration_Script_Stage extends EE_Data_Migration_Class_Base{
+abstract class EE_Data_Migration_Script_Stage extends EE_Data_Migration_Class_Base {
 	/**
 	 * The migration script this is a stage of
 	 * @var EE_Data_Migration_Script_Base
@@ -47,7 +47,7 @@ 
 	 * called by EE_Data_Migration_Script_Base's __construct() method so children don't have to
 	 * @param EE_Data_Migration_Script_Base $migration_script
 	 */
-	public function _construct_finalize($migration_script){
+	public function _construct_finalize($migration_script) {
 		$this->_migration_script = $migration_script;
 	}
 
@@ -58,13 +58,13 @@ 
 	 * @param int $num_items_to_migrate
 	 * @return int
 	 */
-	public function migration_step($num_items_to_migrate=50){
+	public function migration_step($num_items_to_migrate = 50) {
 		//before we run the migration step, we want ot take note of warnings that get outputted
 		ob_start();
 		$items_migrated = $this->_migration_step($num_items_to_migrate);
 		$output = ob_get_contents();
 		ob_end_clean();
-		if( $output ){
+		if ($output) {
 			$this->add_error($output);
 		}
 		$this->_records_migrated += $items_migrated;
@@ -82,7 +82,7 @@ 
 	 * @param int $num_items_to_migrate
 	 * @return int number of items ACTUALLY migrated
 	 */
-	abstract protected function _migration_step($num_items_to_migrate=50);
+	abstract protected function _migration_step($num_items_to_migrate = 50);
 
 	/**
 	 * Counts the records that have been migrated so far
@@ -96,7 +96,7 @@ 
 	 * returns an array of strings describing errors
 	 * @return array
 	 */
-	public function get_errors(){
+	public function get_errors() {
 		return $this->_errors;
 	}
 
@@ -106,9 +106,9 @@ 
 	 * to have been made from the properties_as_array() function.
 	 * @param array $array_of_properties like what's produced from properties_as_array() method
 	 */
-	public function instantiate_from_array_of_properties($array_of_properties){
+	public function instantiate_from_array_of_properties($array_of_properties) {
 		unset($array_of_properties['class']);
-		foreach($array_of_properties as $property_name => $property_value){
+		foreach ($array_of_properties as $property_name => $property_value) {
 			$this->$property_name = $property_value;
 		}
 	}
@@ -117,7 +117,7 @@ 
 	 * Gets the script this is a stage of
 	 * @return EE_Data_Migration_Script_Base
 	 */
-	protected function get_migration_script(){
+	protected function get_migration_script() {
 		return $this->_migration_script;
 	}
 }

core/data_migration_scripts/EE_Data_Migration_Script_Stage_Table.core.php

Indentation +6 added lines, -6 removed lines

@@ -21,12 +21,12 @@
 	protected $_old_table;
 
 /**
-	 * Set in the constructor to add this sql to both the counting query in
-	 * EE_Data_Migration_Script_Stage_Table::_count_records_to_migrate() and
-	 * EE_Data_Migration_Script_Stage_Table::_get_rows().
-	 * Eg "where column_name like '%some_value%'"
-	 * @var string
-	 */
+ * Set in the constructor to add this sql to both the counting query in
+ * EE_Data_Migration_Script_Stage_Table::_count_records_to_migrate() and
+ * EE_Data_Migration_Script_Stage_Table::_get_rows().
+ * Eg "where column_name like '%some_value%'"
+ * @var string
+ */
 	protected $_extra_where_sql;
 
 

Spacing +9 added lines, -9 removed lines

@@ -41,14 +41,14 @@ 
 	 * @param int $num_items
 	 * @return int number of items ACTUALLY migrated
 	 */
-	function _migration_step($num_items=50){
-		$rows = $this->_get_rows( $num_items );
+	function _migration_step($num_items = 50) {
+		$rows = $this->_get_rows($num_items);
 		$items_actually_migrated = 0;
-		foreach($rows as $old_row){
+		foreach ($rows as $old_row) {
 			$this->_migrate_old_row($old_row);
 			$items_actually_migrated++;
 		}
-		if($this->count_records_migrated() + $items_actually_migrated >= $this->count_records_to_migrate()){
+		if ($this->count_records_migrated() + $items_actually_migrated >= $this->count_records_to_migrate()) {
 			$this->set_completed();
 		}
 		return $items_actually_migrated;
@@ -60,11 +60,11 @@ 
 	 * @param int $limit
 	 * @return array of arrays like $wpdb->get_results($sql, ARRAY_A)
 	 */
-	protected function _get_rows( $limit ){
+	protected function _get_rows($limit) {
 		global $wpdb;
 		$start_at_record = $this->count_records_migrated();
-		$query = "SELECT * FROM {$this->_old_table} {$this->_extra_where_sql} " . $wpdb->prepare("LIMIT %d, %d",$start_at_record,$limit);
-		return $wpdb->get_results($query,ARRAY_A);
+		$query = "SELECT * FROM {$this->_old_table} {$this->_extra_where_sql} ".$wpdb->prepare("LIMIT %d, %d", $start_at_record, $limit);
+		return $wpdb->get_results($query, ARRAY_A);
 	}
 
 
@@ -75,8 +75,8 @@ 
 	 */
 	function _count_records_to_migrate() {
 		global $wpdb;
-		$query =  "SELECT COUNT(*) FROM {$this->_old_table} {$this->_extra_where_sql}";
-		$count = $wpdb->get_var( $query );
+		$query = "SELECT COUNT(*) FROM {$this->_old_table} {$this->_extra_where_sql}";
+		$count = $wpdb->get_var($query);
 		return $count;
 	}
 

core/db_classes/EE_CPT_Base.class.php

Spacing +56 added lines, -56 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');
 }
 /**
  * Event Espresso
@@ -47,8 +47,8 @@ 
 	 * @param int    $parent_term_taxonomy_id optional
 	 * @return EE_Term_Taxonomy
 	 */
-	function add_event_category( $category_name, $category_description = NULL, $parent_term_taxonomy_id = NULL ) {
-		return $this->get_model()->add_event_category( $this, $category_name, $category_description, $parent_term_taxonomy_id );
+	function add_event_category($category_name, $category_description = NULL, $parent_term_taxonomy_id = NULL) {
+		return $this->get_model()->add_event_category($this, $category_name, $category_description, $parent_term_taxonomy_id);
 	}
 
 
@@ -58,8 +58,8 @@ 
 	 * @param string $category_name
 	 * @return bool
 	 */
-	function remove_event_category( $category_name ) {
-		return $this->get_model()->remove_event_category( $this, $category_name );
+	function remove_event_category($category_name) {
+		return $this->get_model()->remove_event_category($this, $category_name);
 	}
 
 
@@ -70,14 +70,14 @@ 
 	 * @param EE_Term_Taxonomy $term_taxonomy
 	 * @return EE_Base_Class the relation was removed from
 	 */
-	function remove_relation_to_term_taxonomy( $term_taxonomy ) {
-		if ( !$term_taxonomy ) {
-			EE_Error::add_error( sprintf( __( "No Term_Taxonomy provided which to remove from model object of type %s and id %d", "event_espresso" ), get_class( $this ), $this->ID() ), __FILE__, __FUNCTION__, __LINE__ );
+	function remove_relation_to_term_taxonomy($term_taxonomy) {
+		if ( ! $term_taxonomy) {
+			EE_Error::add_error(sprintf(__("No Term_Taxonomy provided which to remove from model object of type %s and id %d", "event_espresso"), get_class($this), $this->ID()), __FILE__, __FUNCTION__, __LINE__);
 			return NULL;
 		}
-		$term_taxonomy->set_count( $term_taxonomy->count() - 1 );
+		$term_taxonomy->set_count($term_taxonomy->count() - 1);
 		$term_taxonomy->save();
-		return $this->_remove_relation_to( $term_taxonomy, 'Term_Taxonomy' );
+		return $this->_remove_relation_to($term_taxonomy, 'Term_Taxonomy');
 	}
 
 
@@ -101,7 +101,7 @@ 
 	 * @return int
 	 */
 	public function parent() {
-		return $this->get( 'parent' );
+		return $this->get('parent');
 	}
 
 
@@ -111,7 +111,7 @@ 
 	 * @return string
 	 */
 	public function status() {
-		return $this->get( 'status' );
+		return $this->get('status');
 	}
 
 
@@ -119,8 +119,8 @@ 
 	/**
 	 * @param string $status
 	 */
-	public function set_status( $status ) {
-		$this->set( 'status', $status );
+	public function set_status($status) {
+		$this->set('status', $status);
 	}
 
 
@@ -134,12 +134,12 @@ 
 	 * @param string|array $attr Optional. Query string or array of attributes.
 	 * @return string HTML image element
 	 */
-	protected function _get_feature_image( $size, $attr ) {
+	protected function _get_feature_image($size, $attr) {
 		//first let's see if we already have the _feature_image property set AND if it has a cached element on it FOR the given size
-		$attr_key = is_array( $attr ) ? implode( '_', $attr ) : $attr;
-		$cache_key = is_array( $size ) ? implode( '_', $size ) . $attr_key : $size . $attr_key;
-		$this->_feature_image[ $cache_key ] = isset( $this->_feature_image[ $cache_key ] ) ? $this->_feature_image[ $cache_key ] : $this->get_model()->get_feature_image( $this->ID(), $size, $attr );
-		return $this->_feature_image[ $cache_key ];
+		$attr_key = is_array($attr) ? implode('_', $attr) : $attr;
+		$cache_key = is_array($size) ? implode('_', $size).$attr_key : $size.$attr_key;
+		$this->_feature_image[$cache_key] = isset($this->_feature_image[$cache_key]) ? $this->_feature_image[$cache_key] : $this->get_model()->get_feature_image($this->ID(), $size, $attr);
+		return $this->_feature_image[$cache_key];
 	}
 
 
@@ -150,8 +150,8 @@ 
 	 * @param string|array $attr
 	 * @return string of html
 	 */
-	public function feature_image( $size = 'thumbnail', $attr = '' ) {
-		return $this->_get_feature_image( $size, $attr );
+	public function feature_image($size = 'thumbnail', $attr = '') {
+		return $this->_get_feature_image($size, $attr);
 	}
 
 
@@ -161,9 +161,9 @@ 
 	 * @param  string|array $size can either be a string: 'thumbnail', 'medium', 'large', 'full' OR 2-item array representing width and height in pixels eg. array(32,32).
 	 * @return string|boolean          the url of the image or false if not found
 	 */
-	public function feature_image_url( $size = 'thumbnail' ) {
-		$attachment = wp_get_attachment_image_src( get_post_thumbnail_id( $this->ID() ), $size );
-		return !empty( $attachment ) ? $attachment[ 0 ] : FALSE;
+	public function feature_image_url($size = 'thumbnail') {
+		$attachment = wp_get_attachment_image_src(get_post_thumbnail_id($this->ID()), $size);
+		return ! empty($attachment) ? $attachment[0] : FALSE;
 	}
 
 
@@ -176,37 +176,37 @@ 
 	 * @internal param array|string $related_obj_names if included this will be used to restore for related obj if not included then we just do restore on the meta.  We will accept an array of related_obj_names for restoration here.
 	 * @return void
 	 */
-	public function restore_revision( $revision_id, $related_obj_names = array(), $where_query = array() ) {
+	public function restore_revision($revision_id, $related_obj_names = array(), $where_query = array()) {
 		//get revision object
-		$revision_obj = $this->get_model()->get_one_by_ID( $revision_id );
-		if ( $revision_obj instanceof EE_CPT_Base ) {
+		$revision_obj = $this->get_model()->get_one_by_ID($revision_id);
+		if ($revision_obj instanceof EE_CPT_Base) {
 			//no related_obj_name so we assume we're saving a revision on this object.
-			if ( empty( $related_obj_names ) ) {
+			if (empty($related_obj_names)) {
 				$fields = $this->get_model()->get_meta_table_fields();
-				foreach ( $fields as $field ) {
-					$this->set( $field, $revision_obj->get( $field ) );
+				foreach ($fields as $field) {
+					$this->set($field, $revision_obj->get($field));
 				}
 				$this->save();
 			}
-			$related_obj_names = (array)$related_obj_names;
-			foreach ( $related_obj_names as $related_name ) {
+			$related_obj_names = (array) $related_obj_names;
+			foreach ($related_obj_names as $related_name) {
 				//related_obj_name so we're saving a revision on an object related to this object
 				//do we have $where_query params for this related object?  If we do then we include that.
-				$cols_n_values = isset( $where_query[ $related_name ] ) ? $where_query[ $related_name ] : array();
-				$where_params = !empty( $cols_n_values ) ? array( $cols_n_values ) : array();
-				$related_objs = $this->get_many_related( $related_name, $where_params );
-				$revision_related_objs = $revision_obj->get_many_related( $related_name, $where_params );
+				$cols_n_values = isset($where_query[$related_name]) ? $where_query[$related_name] : array();
+				$where_params = ! empty($cols_n_values) ? array($cols_n_values) : array();
+				$related_objs = $this->get_many_related($related_name, $where_params);
+				$revision_related_objs = $revision_obj->get_many_related($related_name, $where_params);
 				//load helper
-				EE_Registry::instance()->load_helper( 'Array' );
+				EE_Registry::instance()->load_helper('Array');
 				//remove related objs from this object that are not in revision
 				//array_diff *should* work cause I think objects are indexed by ID?
-				$related_to_remove = EEH_Array::object_array_diff( $related_objs, $revision_related_objs );
-				foreach ( $related_to_remove as $rr ) {
-					$this->_remove_relation_to( $rr, $related_name, $cols_n_values );
+				$related_to_remove = EEH_Array::object_array_diff($related_objs, $revision_related_objs);
+				foreach ($related_to_remove as $rr) {
+					$this->_remove_relation_to($rr, $related_name, $cols_n_values);
 				}
 				//add all related objs attached to revision to this object
-				foreach ( $revision_related_objs as $r_obj ) {
-					$this->_add_relation_to( $r_obj, $related_name, $cols_n_values );
+				foreach ($revision_related_objs as $r_obj) {
+					$this->_add_relation_to($r_obj, $related_name, $cols_n_values);
 				}
 			}
 		}
@@ -222,8 +222,8 @@ 
 	 * <li>If $single is set to false, or left blank, the function returns an array containing all values of the specified key.</li>
 	 * <li>If $single is set to true, the function returns the first value of the specified key (not in an array</li></ul>
 	 */
-	public function get_post_meta( $meta_key = NULL, $single = FALSE ) {
-		return get_post_meta( $this->ID(), $meta_key, $single );
+	public function get_post_meta($meta_key = NULL, $single = FALSE) {
+		return get_post_meta($this->ID(), $meta_key, $single);
 	}
 
 
@@ -236,11 +236,11 @@ 
 	 * @throws EE_Error
 	 * @return mixed Returns meta_id if the meta doesn't exist, otherwise returns true on success and false on failure. NOTE: If the meta_value passed to this function is the same as the value that is already in the database, this function returns false.
 	 */
-	public function update_post_meta( $meta_key, $meta_value, $prev_value = NULL ) {
-		if ( !$this->ID() ) {
-			throw new EE_Error( sprintf( __( "You must save this custom post type before adding or updating a post meta field", "event_espresso" ) ) );
+	public function update_post_meta($meta_key, $meta_value, $prev_value = NULL) {
+		if ( ! $this->ID()) {
+			throw new EE_Error(sprintf(__("You must save this custom post type before adding or updating a post meta field", "event_espresso")));
 		}
-		return update_post_meta( $this->ID(), $meta_key, $meta_value, $prev_value );
+		return update_post_meta($this->ID(), $meta_key, $meta_value, $prev_value);
 	}
 
 
@@ -253,11 +253,11 @@ 
 	 * @throws EE_Error
 	 * @return boolean Boolean true, except if the $unique argument was set to true and a custom field with the given key already exists, in which case false is returned.
 	 */
-	public function add_post_meta( $meta_key, $meta_value, $unique = FALSE ) {
-		if ( !$this->ID() ) {
-			throw new EE_Error( sprintf( __( "You must save this custom post type before adding or updating a post meta field", "event_espresso" ) ) );
+	public function add_post_meta($meta_key, $meta_value, $unique = FALSE) {
+		if ( ! $this->ID()) {
+			throw new EE_Error(sprintf(__("You must save this custom post type before adding or updating a post meta field", "event_espresso")));
 		}
-		return add_post_meta( $this->ID(), $meta_key, $meta_value, $unique );
+		return add_post_meta($this->ID(), $meta_key, $meta_value, $unique);
 	}
 
 
@@ -267,7 +267,7 @@ 
 	 * @return string
 	 */
 	public function get_permalink() {
-		return get_permalink( $this->ID() );
+		return get_permalink($this->ID());
 	}
 
 
@@ -277,8 +277,8 @@ 
 	 * @param array $query_params
 	 * @return EE_Term_Taxonomy
 	 */
-	public function term_taxonomies( $query_params = array() ) {
-		return $this->get_many_related( 'Term_Taxonomy', $query_params );
+	public function term_taxonomies($query_params = array()) {
+		return $this->get_many_related('Term_Taxonomy', $query_params);
 	}
 
 

Doc Comments +5 added lines, -5 removed lines

@@ -98,7 +98,7 @@ 
 	 * The main purpose of this method is to return the parent for the model object
 	 *
 	 * @access public
-	 * @return int
+	 * @return boolean
 	 */
 	public function parent() {
 		return $this->get( 'parent' );
@@ -108,7 +108,7 @@ 
 
 	/**
 	 * return the _status property
-	 * @return string
+	 * @return boolean
 	 */
 	public function status() {
 		return $this->get( 'status' );
@@ -130,7 +130,7 @@ 
 	 *
 	 * @link   http://codex.wordpress.org/Function_Reference/get_the_post_thumbnail
 	 * @access protected
-	 * @param string|array $size (optional) Image size. Defaults to 'post-thumbnail' but can also be a 2-item array representing width and height in pixels (i.e. array(32,32) ).
+	 * @param string $size (optional) Image size. Defaults to 'post-thumbnail' but can also be a 2-item array representing width and height in pixels (i.e. array(32,32) ).
 	 * @param string|array $attr Optional. Query string or array of attributes.
 	 * @return string HTML image element
 	 */
@@ -158,7 +158,7 @@ 
 
 	/**
 	 * This uses the wp "wp_get_attachment_image_src()" function to return the feature image for the current class using the given size params.
-	 * @param  string|array $size can either be a string: 'thumbnail', 'medium', 'large', 'full' OR 2-item array representing width and height in pixels eg. array(32,32).
+	 * @param  integer[] $size can either be a string: 'thumbnail', 'medium', 'large', 'full' OR 2-item array representing width and height in pixels eg. array(32,32).
 	 * @return string|boolean          the url of the image or false if not found
 	 */
 	public function feature_image_url( $size = 'thumbnail' ) {
@@ -275,7 +275,7 @@ 
 	/**
 	 * Gets all the term-taxonomies for this CPT
 	 * @param array $query_params
-	 * @return EE_Term_Taxonomy
+	 * @return EE_Base_Class[]
 	 */
 	public function term_taxonomies( $query_params = array() ) {
 		return $this->get_many_related( 'Term_Taxonomy', $query_params );

core/db_classes/EE_Change_Log.class.php

Braces +5 added lines, -4 removed lines

@@ -1,7 +1,8 @@ 
 <?php
 
-if (!defined('EVENT_ESPRESSO_VERSION'))
+if (!defined('EVENT_ESPRESSO_VERSION')) {
 	exit('No direct script access allowed');
+}
 
 /**
  * Event Espresso
@@ -152,7 +153,7 @@ 
 		$is_model_name = EE_Registry::instance()->is_model_name($model_name_of_related_obj);
 		if( ! $is_model_name ){
 			return null;
-		}else{
+		} else{
 			return $this->get_first_related($model_name_of_related_obj);
 		}
 	}
@@ -169,13 +170,13 @@ 
 		if($object instanceof EE_Base_Class){
 			$this->set_OBJ_type($object->get_model()->get_this_model_name());
 			$this->set_OBJ_ID($object->ID());
-		}else{
+		} else{
 			$this->set_OBJ_type(NULL);
 			$this->set_OBJ_ID(NULL);
 		}
 		if($save){
 			return $this->save();
-		}else{
+		} else{
 			return NULL;
 		}
 	}

Doc Comments +6 added lines, -6 removed lines

@@ -51,7 +51,7 @@ 
 	}
 	/**
 	 * Gets message
-	 * @return mixed
+	 * @return boolean
 	 */
 	function message() {
 		return $this->get('LOG_message');
@@ -66,7 +66,7 @@ 
 	}
 	/**
 	 * Gets time
-	 * @return string
+	 * @return boolean
 	 */
 	function time() {
 		return $this->get('LOG_time');
@@ -81,7 +81,7 @@ 
 	}
 	/**
 	 * Gets log_type
-	 * @return string
+	 * @return boolean
 	 */
 	function log_type() {
 		return $this->get('LOG_log_type');
@@ -96,7 +96,7 @@ 
 	}
 	/**
 	 * Gets type of the model object related to this log
-	 * @return string
+	 * @return boolean
 	 */
 	function OBJ_type() {
 		return $this->get('OBJ_type');
@@ -111,7 +111,7 @@ 
 	}
 	/**
 	 * Gets OBJ_ID (the ID of the item related to this log)
-	 * @return mixed
+	 * @return boolean
 	 */
 	function OBJ_ID() {
 		return $this->get('OBJ_ID');
@@ -126,7 +126,7 @@ 
 	}
 	/**
 	 * Gets wp_user
-	 * @return int
+	 * @return boolean
 	 */
 	function wp_user() {
 		return $this->get('LOG_wp_user');

Spacing +15 added lines, -15 removed lines

@@ -1,6 +1,6 @@ 
 <?php
 
-if (!defined('EVENT_ESPRESSO_VERSION'))
+if ( ! defined('EVENT_ESPRESSO_VERSION'))
 	exit('No direct script access allowed');
 
 /**
@@ -25,17 +25,17 @@ 
  *
  * ------------------------------------------------------------------------
  */
-class EE_Change_Log extends EE_Base_Class{
+class EE_Change_Log extends EE_Base_Class {
 
 	/**
 	 *
 	 * @param array $props_n_values
 	 * @return EE_Change_Log
 	 */
-	public static function new_instance( $props_n_values = array() ) {
-		$has_object = parent::_check_for_object( $props_n_values, __CLASS__ );
+	public static function new_instance($props_n_values = array()) {
+		$has_object = parent::_check_for_object($props_n_values, __CLASS__);
 //		d( $has_object );
-		return $has_object ? $has_object : new self( $props_n_values);
+		return $has_object ? $has_object : new self($props_n_values);
 	}
 
 	/**
@@ -43,11 +43,11 @@ 
 	 * @param array $props_n_values
 	 * @return EE_Change_Log
 	 */
-	public static function new_instance_from_db ( $props_n_values = array() ) {
+	public static function new_instance_from_db($props_n_values = array()) {
 //		$mapped_object = parent::_get_object_from_entity_mapper($props_n_values, $classname);
 //		d( $mapped_object );
 //		return $mapped_object ? $mapped_object : new self( $props_n_values, TRUE );
-		return new self( $props_n_values, TRUE );
+		return new self($props_n_values, TRUE);
 	}
 	/**
 	 * Gets message
@@ -144,12 +144,12 @@ 
 	 * Gets the model object attached to this log
 	 * @return EE_Base_Class
 	 */
-	function object(){
+	function object() {
 		$model_name_of_related_obj = $this->OBJ_type();
 		$is_model_name = EE_Registry::instance()->is_model_name($model_name_of_related_obj);
-		if( ! $is_model_name ){
+		if ( ! $is_model_name) {
 			return null;
-		}else{
+		} else {
 			return $this->get_first_related($model_name_of_related_obj);
 		}
 	}
@@ -162,17 +162,17 @@ 
 	 * @param boolean $save
 	 * @return boolean if $save=true, NULL is $save=false
 	 */
-	function set_object($object, $save = TRUE ) {
-		if($object instanceof EE_Base_Class){
+	function set_object($object, $save = TRUE) {
+		if ($object instanceof EE_Base_Class) {
 			$this->set_OBJ_type($object->get_model()->get_this_model_name());
 			$this->set_OBJ_ID($object->ID());
-		}else{
+		} else {
 			$this->set_OBJ_type(NULL);
 			$this->set_OBJ_ID(NULL);
 		}
-		if($save){
+		if ($save) {
 			return $this->save();
-		}else{
+		} else {
 			return NULL;
 		}
 	}

core/db_classes/EE_Datetime.class.php

Braces +2 added lines, -4 removed lines

@@ -708,12 +708,10 @@
 		if ( date( 'm', $this->get_raw( 'DTT_EVT_start' ) ) != date( 'm', $this->get_raw( 'DTT_EVT_end' ) ) ) {
 			$display_date = $this->start_date( 'M j\, Y g:i a' ) . ' - ' . $this->end_date( 'M j\, Y g:i a' );
 			//next condition is if its the same month but different day
-		}
-		else {
+		} else {
 			if ( date( 'm', $this->get_raw( 'DTT_EVT_start' ) ) == date( 'm', $this->get_raw( 'DTT_EVT_end' ) ) && date( 'd', $this->get_raw( 'DTT_EVT_start' ) ) != date( 'd', $this->get_raw( 'DTT_EVT_end' ) ) ) {
 				$display_date = $this->start_date( 'M j\, g:i a' ) . ' - ' . $this->end_date( 'M j\, g:i a Y' );
-			}
-			else {
+			} else {
 				$display_date = $this->start_date( 'F j\, Y' ) . ' @ ' . $this->start_date( 'g:i a' ) . ' - ' . $this->end_date( 'g:i a' );
 			}
 		}

Doc Comments +9 added lines, -9 removed lines

@@ -215,7 +215,7 @@ 
 
 	/**
 	 * returns the datetime name
-	 * @return string
+	 * @return boolean
 	 */
 	public function name() {
 		return $this->get( 'DTT_name' );
@@ -225,7 +225,7 @@ 
 
 	/**
 	 * returns the datetime description
-	 * @return string
+	 * @return boolean
 	 */
 	public function description() {
 		return $this->get( 'DTT_description' );
@@ -245,7 +245,7 @@ 
 
 	/**
 	 * This helper simply returns the order for the datetime
-	 * @return int         The order of the datetime for this event.
+	 * @return boolean         The order of the datetime for this event.
 	 */
 	public function order() {
 		return $this->get( 'DTT_order' );
@@ -255,7 +255,7 @@ 
 
 	/**
 	 * This helper simply returns the parent id for the datetime
-	 * @return int
+	 * @return boolean
 	 */
 	public function parent() {
 		return $this->get( 'DTT_parent' );
@@ -272,7 +272,7 @@ 
 	 * @param    string $dt_frmt
 	 * @param    string $tm_frmt
 	 * @param    bool   $echo         - whether we echo or return (note echoing uses "pretty" formats, otherwise we use the standard formats)
-	 * @return    string|bool|void  string on success, FALSE on fail
+	 * @return    string  string on success, FALSE on fail
 	 */
 	private function _show_datetime( $date_or_time = NULL, $start_or_end = 'start', $dt_frmt = '', $tm_frmt = '', $echo = FALSE ) {
 		$field_name = "DTT_EVT_{$start_or_end}";
@@ -289,9 +289,9 @@ 
 	 * last-used format, or '' to use the default date format
 	 *
 	 * @access        public
-	 * @param null $dt_frmt
+	 * @param string $dt_frmt
 	 * @internal      param string $dt_format - string representation of date format defaults to 'F j, Y'
-	 * @return        mixed        string on success, FALSE on fail
+	 * @return        string        string on success, FALSE on fail
 	 */
 	public function start_date( $dt_frmt = NULL ) {
 		return $this->_show_datetime( 'D', 'start', $dt_frmt );
@@ -314,7 +314,7 @@ 
 	 * last-used format, or '' to use the default date format
 	 *
 	 * @access        public
-	 * @param null $dt_frmt
+	 * @param string $dt_frmt
 	 * @internal      param string $dt_format - string representation of date format defaults to 'F j, Y'
 	 * @return        mixed        string on success, FALSE on fail
 	 */
@@ -437,7 +437,7 @@ 
 	 *        get start date and start time
 	 *
 	 * @access        public
-	 * @param null          $dt_frmt
+	 * @param string          $dt_frmt
 	 * @param        string $tm_format - string representation of time format defaults to 'g:i a'
 	 * @internal      param string $dt_format - string representation of date format defaults to 'F j, Y'
 	 * @return        mixed        string on success, FALSE on fail

Spacing +122 added lines, -122 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');
 }
 /**
  * Event Espresso
@@ -71,9 +71,9 @@ 
 	 * @param string $timezone
 	 * @return EE_Datetime
 	 */
-	public static function new_instance( $props_n_values = array(), $timezone = NULL ) {
-		$has_object = parent::_check_for_object( $props_n_values, __CLASS__, $timezone );
-		return $has_object ? $has_object : new self( $props_n_values, FALSE, $timezone );
+	public static function new_instance($props_n_values = array(), $timezone = NULL) {
+		$has_object = parent::_check_for_object($props_n_values, __CLASS__, $timezone);
+		return $has_object ? $has_object : new self($props_n_values, FALSE, $timezone);
 	}
 
 
@@ -83,8 +83,8 @@ 
 	 * @param null  $timezone
 	 * @return EE_Datetime
 	 */
-	public static function new_instance_from_db( $props_n_values = array(), $timezone = NULL ) {
-		return new self( $props_n_values, TRUE, $timezone );
+	public static function new_instance_from_db($props_n_values = array(), $timezone = NULL) {
+		return new self($props_n_values, TRUE, $timezone);
 	}
 
 
@@ -92,8 +92,8 @@ 
 	/**
 	 * @param $name
 	 */
-	public function set_name( $name ) {
-		$this->set( 'DTT_name', $name );
+	public function set_name($name) {
+		$this->set('DTT_name', $name);
 	}
 
 
@@ -101,8 +101,8 @@ 
 	/**
 	 * @param $description
 	 */
-	public function set_description( $description ) {
-		$this->set( 'DTT_description', $description );
+	public function set_description($description) {
+		$this->set('DTT_description', $description);
 	}
 
 
@@ -115,8 +115,8 @@ 
 	 * @access        public
 	 * @param        string $date a string representation of the event's date ex:  Dec. 25, 2025 or 12-25-2025
 	 */
-	public function set_start_date( $date ) {
-		$this->_set_date_for( $date, 'DTT_EVT_start' );
+	public function set_start_date($date) {
+		$this->_set_date_for($date, 'DTT_EVT_start');
 	}
 
 
@@ -129,8 +129,8 @@ 
 	 * @access        public
 	 * @param        string $time a string representation of the event time ex:  9am  or  7:30 PM
 	 */
-	public function set_start_time( $time ) {
-		$this->_set_time_for( $time, 'DTT_EVT_start' );
+	public function set_start_time($time) {
+		$this->_set_time_for($time, 'DTT_EVT_start');
 	}
 
 
@@ -143,8 +143,8 @@ 
 	 * @access        public
 	 * @param        string $date a string representation of the event's date ex:  Dec. 25, 2025 or 12-25-2025
 	 */
-	public function set_end_date( $date ) {
-		$this->_set_date_for( $date, 'DTT_EVT_end' );
+	public function set_end_date($date) {
+		$this->_set_date_for($date, 'DTT_EVT_end');
 	}
 
 
@@ -157,8 +157,8 @@ 
 	 * @access        public
 	 * @param        string $time a string representation of the event time ex:  9am  or  7:30 PM
 	 */
-	public function set_end_time( $time ) {
-		$this->_set_time_for( $time, 'DTT_EVT_end' );
+	public function set_end_time($time) {
+		$this->_set_time_for($time, 'DTT_EVT_end');
 	}
 
 
@@ -171,8 +171,8 @@ 
 	 * @access        public
 	 * @param        int $reg_limit
 	 */
-	public function set_reg_limit( $reg_limit ) {
-		$this->set( 'DTT_reg_limit', $reg_limit );
+	public function set_reg_limit($reg_limit) {
+		$this->set('DTT_reg_limit', $reg_limit);
 	}
 
 
@@ -183,8 +183,8 @@ 
 	 * @access        public
 	 * @param        int $sold
 	 */
-	public function set_sold( $sold ) {
-		$this->set( 'DTT_sold', $sold );
+	public function set_sold($sold) {
+		$this->set('DTT_sold', $sold);
 	}
 
 
@@ -193,9 +193,9 @@ 
 	 * increments sold by amount passed by $qty
 	 * @param int $qty
 	 */
-	function increase_sold( $qty = 1 ) {
-		$sold = $this->get_raw( 'DTT_sold' ) + $qty;
-		$this->set_sold( $sold );
+	function increase_sold($qty = 1) {
+		$sold = $this->get_raw('DTT_sold') + $qty;
+		$this->set_sold($sold);
 	}
 
 
@@ -204,11 +204,11 @@ 
 	 * decrements (subtracts) sold amount passed by $qty
 	 * @param int $qty
 	 */
-	function decrease_sold( $qty = 1 ) {
-		$sold = $this->get_raw( 'DTT_sold' ) - $qty;
+	function decrease_sold($qty = 1) {
+		$sold = $this->get_raw('DTT_sold') - $qty;
 		// sold can not go below zero
-		$sold = max( 0, $sold );
-		$this->set_sold( $sold );
+		$sold = max(0, $sold);
+		$this->set_sold($sold);
 	}
 
 
@@ -218,7 +218,7 @@ 
 	 * @return string
 	 */
 	public function name() {
-		return $this->get( 'DTT_name' );
+		return $this->get('DTT_name');
 	}
 
 
@@ -228,7 +228,7 @@ 
 	 * @return string
 	 */
 	public function description() {
-		return $this->get( 'DTT_description' );
+		return $this->get('DTT_description');
 	}
 
 
@@ -238,7 +238,7 @@ 
 	 * @return boolean          TRUE if is primary, FALSE if not.
 	 */
 	public function is_primary() {
-		return $this->get( 'DTT_is_primary' );
+		return $this->get('DTT_is_primary');
 	}
 
 
@@ -248,7 +248,7 @@ 
 	 * @return int         The order of the datetime for this event.
 	 */
 	public function order() {
-		return $this->get( 'DTT_order' );
+		return $this->get('DTT_order');
 	}
 
 
@@ -258,7 +258,7 @@ 
 	 * @return int
 	 */
 	public function parent() {
-		return $this->get( 'DTT_parent' );
+		return $this->get('DTT_parent');
 	}
 
 
@@ -274,10 +274,10 @@ 
 	 * @param    bool   $echo         - whether we echo or return (note echoing uses "pretty" formats, otherwise we use the standard formats)
 	 * @return    string|bool|void  string on success, FALSE on fail
 	 */
-	private function _show_datetime( $date_or_time = NULL, $start_or_end = 'start', $dt_frmt = '', $tm_frmt = '', $echo = FALSE ) {
+	private function _show_datetime($date_or_time = NULL, $start_or_end = 'start', $dt_frmt = '', $tm_frmt = '', $echo = FALSE) {
 		$field_name = "DTT_EVT_{$start_or_end}";
-		$dtt = $this->_get_datetime( $field_name, $dt_frmt, $tm_frmt, $date_or_time, $echo );
-		if ( !$echo ) {
+		$dtt = $this->_get_datetime($field_name, $dt_frmt, $tm_frmt, $date_or_time, $echo);
+		if ( ! $echo) {
 			return $dtt;
 		}
 	}
@@ -293,8 +293,8 @@ 
 	 * @internal      param string $dt_format - string representation of date format defaults to 'F j, Y'
 	 * @return        mixed        string on success, FALSE on fail
 	 */
-	public function start_date( $dt_frmt = NULL ) {
-		return $this->_show_datetime( 'D', 'start', $dt_frmt );
+	public function start_date($dt_frmt = NULL) {
+		return $this->_show_datetime('D', 'start', $dt_frmt);
 	}
 
 
@@ -303,8 +303,8 @@ 
 	 * Echoes start_date()
 	 * @param string $dt_frmt
 	 */
-	public function e_start_date( $dt_frmt = NULL ) {
-		$this->_show_datetime( 'D', 'start', $dt_frmt, NULL, TRUE );
+	public function e_start_date($dt_frmt = NULL) {
+		$this->_show_datetime('D', 'start', $dt_frmt, NULL, TRUE);
 	}
 
 
@@ -318,8 +318,8 @@ 
 	 * @internal      param string $dt_format - string representation of date format defaults to 'F j, Y'
 	 * @return        mixed        string on success, FALSE on fail
 	 */
-	public function end_date( $dt_frmt = NULL ) {
-		return $this->_show_datetime( 'D', 'end', $dt_frmt );
+	public function end_date($dt_frmt = NULL) {
+		return $this->_show_datetime('D', 'end', $dt_frmt);
 	}
 
 
@@ -328,8 +328,8 @@ 
 	 * Echoes the end date. See end_date()
 	 * @param string $dt_frmt
 	 */
-	public function e_end_date( $dt_frmt = NULL ) {
-		$this->_show_datetime( 'D', 'end', $dt_frmt, NULL, TRUE );
+	public function e_end_date($dt_frmt = NULL) {
+		$this->_show_datetime('D', 'end', $dt_frmt, NULL, TRUE);
 	}
 
 
@@ -343,11 +343,11 @@ 
 	 * @internal      param string $dt_format - string representation of date format defaults to WP settings
 	 * @return        mixed        string on success, FALSE on fail
 	 */
-	public function date_range( $dt_frmt = NULL, $conjunction = ' - ' ) {
-		$dt_frmt = !empty( $dt_frmt ) ? $dt_frmt : $this->_dt_frmt;
-		$start = str_replace( ' ', '&nbsp;', date_i18n( $dt_frmt, strtotime( $this->_show_datetime( 'D', 'start', NULL, NULL ) ) ) );
-		$end = str_replace( ' ', '&nbsp;', date_i18n( $dt_frmt, strtotime( $this->_show_datetime( 'D', 'end', NULL, NULL ) ) ) );
-		return $start != $end ? $start . $conjunction . $end : $start;
+	public function date_range($dt_frmt = NULL, $conjunction = ' - ') {
+		$dt_frmt = ! empty($dt_frmt) ? $dt_frmt : $this->_dt_frmt;
+		$start = str_replace(' ', '&nbsp;', date_i18n($dt_frmt, strtotime($this->_show_datetime('D', 'start', NULL, NULL))));
+		$end = str_replace(' ', '&nbsp;', date_i18n($dt_frmt, strtotime($this->_show_datetime('D', 'end', NULL, NULL))));
+		return $start != $end ? $start.$conjunction.$end : $start;
 	}
 
 
@@ -356,8 +356,8 @@ 
 	 * @param null   $dt_frmt
 	 * @param string $conjunction
 	 */
-	public function e_date_range( $dt_frmt = NULL, $conjunction = ' - ' ) {
-		echo $this->date_range( $dt_frmt, $conjunction );
+	public function e_date_range($dt_frmt = NULL, $conjunction = ' - ') {
+		echo $this->date_range($dt_frmt, $conjunction);
 	}
 
 
@@ -369,8 +369,8 @@ 
 	 * @param        string $tm_format - string representation of time format defaults to 'g:i a'
 	 * @return        mixed        string on success, FALSE on fail
 	 */
-	public function start_time( $tm_format = NULL ) {
-		return $this->_show_datetime( 'T', 'start', NULL, $tm_format );
+	public function start_time($tm_format = NULL) {
+		return $this->_show_datetime('T', 'start', NULL, $tm_format);
 	}
 
 
@@ -378,8 +378,8 @@ 
 	/**
 	 * @param null $tm_format
 	 */
-	public function e_start_time( $tm_format = NULL ) {
-		$this->_show_datetime( 'T', 'start', NULL, $tm_format, TRUE );
+	public function e_start_time($tm_format = NULL) {
+		$this->_show_datetime('T', 'start', NULL, $tm_format, TRUE);
 	}
 
 
@@ -391,8 +391,8 @@ 
 	 * @param        string $tm_format - string representation of time format defaults to 'g:i a'
 	 * @return        mixed        string on success, FALSE on fail
 	 */
-	public function end_time( $tm_format = NULL ) {
-		return $this->_show_datetime( 'T', 'end', NULL, $tm_format );
+	public function end_time($tm_format = NULL) {
+		return $this->_show_datetime('T', 'end', NULL, $tm_format);
 	}
 
 
@@ -400,8 +400,8 @@ 
 	/**
 	 * @param null $tm_format
 	 */
-	public function e_end_time( $tm_format = NULL ) {
-		$this->_show_datetime( 'T', 'end', NULL, $tm_format, TRUE );
+	public function e_end_time($tm_format = NULL) {
+		$this->_show_datetime('T', 'end', NULL, $tm_format, TRUE);
 	}
 
 
@@ -414,11 +414,11 @@ 
 	 * @param        string $conjunction - conjunction junction what's your function ? this string joins the start date with the end date ie: Jan 01 "to" Dec 31
 	 * @return        mixed        string on success, FALSE on fail
 	 */
-	public function time_range( $tm_format = NULL, $conjunction = ' - ' ) {
-		$tm_format = !empty( $tm_format ) ? $tm_format : $this->_tm_frmt;
-		$start = str_replace( ' ', '&nbsp;', date_i18n( $tm_format, strtotime( $this->_show_datetime( 'T', 'start', NULL, NULL ) ) ) );
-		$end = str_replace( ' ', '&nbsp;', date_i18n( $tm_format, strtotime( $this->_show_datetime( 'T', 'end', NULL, NULL ) ) ) );
-		return $start != $end ? $start . $conjunction . $end : $start;
+	public function time_range($tm_format = NULL, $conjunction = ' - ') {
+		$tm_format = ! empty($tm_format) ? $tm_format : $this->_tm_frmt;
+		$start = str_replace(' ', '&nbsp;', date_i18n($tm_format, strtotime($this->_show_datetime('T', 'start', NULL, NULL))));
+		$end = str_replace(' ', '&nbsp;', date_i18n($tm_format, strtotime($this->_show_datetime('T', 'end', NULL, NULL))));
+		return $start != $end ? $start.$conjunction.$end : $start;
 	}
 
 
@@ -427,8 +427,8 @@ 
 	 * @param null   $tm_format
 	 * @param string $conjunction
 	 */
-	public function e_time_range( $tm_format = NULL, $conjunction = ' - ' ) {
-		echo $this->time_range( $tm_format, $conjunction );
+	public function e_time_range($tm_format = NULL, $conjunction = ' - ') {
+		echo $this->time_range($tm_format, $conjunction);
 	}
 
 
@@ -442,8 +442,8 @@ 
 	 * @internal      param string $dt_format - string representation of date format defaults to 'F j, Y'
 	 * @return        mixed        string on success, FALSE on fail
 	 */
-	public function start_date_and_time( $dt_frmt = NULL, $tm_format = NULL ) {
-		return $this->_show_datetime( '', 'start', $dt_frmt, $tm_format );
+	public function start_date_and_time($dt_frmt = NULL, $tm_format = NULL) {
+		return $this->_show_datetime('', 'start', $dt_frmt, $tm_format);
 	}
 
 
@@ -452,8 +452,8 @@ 
 	 * @param null $dt_frmt
 	 * @param null $tm_format
 	 */
-	public function e_start_date_and_time( $dt_frmt = NULL, $tm_format = NULL ) {
-		$this->_show_datetime( '', 'start', $dt_frmt, $tm_format, TRUE );
+	public function e_start_date_and_time($dt_frmt = NULL, $tm_format = NULL) {
+		$this->_show_datetime('', 'start', $dt_frmt, $tm_format, TRUE);
 	}
 
 
@@ -467,11 +467,11 @@ 
 	 * @param bool   $round_up
 	 * @return float|int|mixed
 	 */
-	public function length( $units = 'seconds', $round_up = FALSE ) {
-		$start = $this->get_raw( 'DTT_EVT_start' );
-		$end = $this->get_raw( 'DTT_EVT_end' );
+	public function length($units = 'seconds', $round_up = FALSE) {
+		$start = $this->get_raw('DTT_EVT_start');
+		$end = $this->get_raw('DTT_EVT_end');
 		$length_in_units = $end - $start;
-		switch ( $units ) {
+		switch ($units) {
 			//NOTE: We purposefully don't use "break;"
 			//in order to chain the divisions
 			case 'days':
@@ -482,10 +482,10 @@ 
 				$length_in_units /= 60;
 			case 'seconds':
 			default:
-				$length_in_units = ceil( $length_in_units );
+				$length_in_units = ceil($length_in_units);
 		}
-		if ( $round_up ) {
-			$length_in_units = max( $length_in_units, 1 );
+		if ($round_up) {
+			$length_in_units = max($length_in_units, 1);
 		}
 		return $length_in_units;
 	}
@@ -501,8 +501,8 @@ 
 	 * @internal      param string $dt_format - string representation of date format defaults to 'F j, Y'
 	 * @return        mixed        string on success, FALSE on fail
 	 */
-	public function end_date_and_time( $dt_frmt = FALSE, $tm_format = FALSE ) {
-		return $this->_show_datetime( '', 'end', $dt_frmt, $tm_format );
+	public function end_date_and_time($dt_frmt = FALSE, $tm_format = FALSE) {
+		return $this->_show_datetime('', 'end', $dt_frmt, $tm_format);
 	}
 
 
@@ -511,8 +511,8 @@ 
 	 * @param bool $dt_frmt
 	 * @param bool $tm_format
 	 */
-	public function e_end_date_and_time( $dt_frmt = FALSE, $tm_format = FALSE ) {
-		$this->_show_datetime( '', 'end', $dt_frmt, $tm_format, TRUE );
+	public function e_end_date_and_time($dt_frmt = FALSE, $tm_format = FALSE) {
+		$this->_show_datetime('', 'end', $dt_frmt, $tm_format, TRUE);
 	}
 
 
@@ -524,7 +524,7 @@ 
 	 * @return        int
 	 */
 	public function start() {
-		return $this->get_raw( 'DTT_EVT_start' );
+		return $this->get_raw('DTT_EVT_start');
 	}
 
 
@@ -536,7 +536,7 @@ 
 	 * @return        int
 	 */
 	public function end() {
-		return $this->get_raw( 'DTT_EVT_end' );
+		return $this->get_raw('DTT_EVT_end');
 	}
 
 
@@ -548,7 +548,7 @@ 
 	 * @return        mixed        int on success, FALSE on fail
 	 */
 	public function reg_limit() {
-		return $this->get_raw( 'DTT_reg_limit' );
+		return $this->get_raw('DTT_reg_limit');
 	}
 
 
@@ -560,7 +560,7 @@ 
 	 * @return        mixed        int on success, FALSE on fail
 	 */
 	public function sold() {
-		return $this->get_raw( 'DTT_sold' );
+		return $this->get_raw('DTT_sold');
 	}
 
 
@@ -572,7 +572,7 @@ 
 	 * @return        boolean
 	 */
 	public function sold_out() {
-		return $this->get( 'DTT_reg_limit' ) > 0 && $this->get( 'DTT_sold' ) >= $this->get( 'DTT_reg_limit' ) ? TRUE : FALSE;
+		return $this->get('DTT_reg_limit') > 0 && $this->get('DTT_sold') >= $this->get('DTT_reg_limit') ? TRUE : FALSE;
 	}
 
 
@@ -585,15 +585,15 @@ 
 	 * @param      bool $consider_tickets Whether to consider tickets remaining when determining if there are any spaces left (because if all tickets attached to this datetime have no spaces left, then this datetime IS effectively sold out)  However, there are cases where we just want to know the spaces remaining for this particular datetime hence the flag.
 	 * @return        int
 	 */
-	public function spaces_remaining( $consider_tickets = FALSE ) {
+	public function spaces_remaining($consider_tickets = FALSE) {
 		// tickets remaining availalbe for purchase
 		//no need for special checks for infinite, because if DTT_reg_limit == INF, then INF - x = INF
-		$dtt_remaining = $this->get( 'DTT_reg_limit' ) - $this->get( 'DTT_sold' );
-		if ( !$consider_tickets ) {
+		$dtt_remaining = $this->get('DTT_reg_limit') - $this->get('DTT_sold');
+		if ( ! $consider_tickets) {
 			return $dtt_remaining;
 		}
 		$tickets_remaining = $this->tickets_remaining();
-		return min( $dtt_remaining, $tickets_remaining );
+		return min($dtt_remaining, $tickets_remaining);
 	}
 
 
@@ -604,8 +604,8 @@ 
 	 * @param array $query_params like EEM_Base::get_all's
 	 * @return int
 	 */
-	public function tickets_remaining( $query_params = array() ) {
-		return EEM_Ticket::instance()->sum_tickets_currently_available_at_datetime( $this->ID(), $query_params );
+	public function tickets_remaining($query_params = array()) {
+		return EEM_Ticket::instance()->sum_tickets_currently_available_at_datetime($this->ID(), $query_params);
 	}
 
 
@@ -616,8 +616,8 @@ 
 	 * @param array $query_params like EEM_Base::get_all's
 	 * @return int
 	 */
-	public function sum_tickets_initially_available( $query_params = array() ) {
-		return $this->sum_related( 'Ticket', $query_params, 'TKT_qty' );
+	public function sum_tickets_initially_available($query_params = array()) {
+		return $this->sum_related('Ticket', $query_params, 'TKT_qty');
 	}
 
 
@@ -629,7 +629,7 @@ 
 	 * @return int
 	 */
 	public function total_tickets_available_at_this_datetime() {
-		return min( array( $this->tickets_remaining(), $this->spaces_remaining() ) );
+		return min(array($this->tickets_remaining(), $this->spaces_remaining()));
 	}
 
 
@@ -640,7 +640,7 @@ 
 	 * @return boolean
 	 */
 	public function is_upcoming() {
-		return ( $this->get_raw( 'DTT_EVT_start' ) > time() );
+		return ($this->get_raw('DTT_EVT_start') > time());
 	}
 
 
@@ -650,7 +650,7 @@ 
 	 * @return boolean
 	 */
 	public function is_active() {
-		return ( $this->get_raw( 'DTT_EVT_start' ) < time() && $this->get_raw( 'DTT_EVT_end' ) > time() );
+		return ($this->get_raw('DTT_EVT_start') < time() && $this->get_raw('DTT_EVT_end') > time());
 	}
 
 
@@ -660,7 +660,7 @@ 
 	 * @return boolean
 	 */
 	public function is_expired() {
-		return ( $this->get_raw( 'DTT_EVT_end' ) < time() );
+		return ($this->get_raw('DTT_EVT_end') < time());
 	}
 
 
@@ -671,16 +671,16 @@ 
 	 */
 	public function get_active_status() {
 		$total_tickets_for_this_dtt = $this->total_tickets_available_at_this_datetime();
-		if ( $total_tickets_for_this_dtt !== FALSE && $total_tickets_for_this_dtt < 1 ) {
+		if ($total_tickets_for_this_dtt !== FALSE && $total_tickets_for_this_dtt < 1) {
 			return EE_Datetime::sold_out;
 		}
-		if ( $this->is_expired() ) {
+		if ($this->is_expired()) {
 			return EE_Datetime::expired;
 		}
-		if ( $this->is_upcoming() ) {
+		if ($this->is_upcoming()) {
 			return EE_Datetime::upcoming;
 		}
-		if ( $this->is_active() ) {
+		if ($this->is_active()) {
 			return EE_Datetime::active;
 		}
 	}
@@ -693,24 +693,24 @@ 
 	 * @param  boolean $use_dtt_name if TRUE then we'll use DTT->name() if its not empty.
 	 * @return string
 	 */
-	public function get_dtt_display_name( $use_dtt_name = FALSE ) {
-		if ( $use_dtt_name ) {
+	public function get_dtt_display_name($use_dtt_name = FALSE) {
+		if ($use_dtt_name) {
 			$dttname = $this->name();
-			if ( !empty( $dttname ) ) {
+			if ( ! empty($dttname)) {
 				return $dttname;
 			}
 		}
 		//first condition is to see if the months are different
-		if ( date( 'm', $this->get_raw( 'DTT_EVT_start' ) ) != date( 'm', $this->get_raw( 'DTT_EVT_end' ) ) ) {
-			$displaydate = $this->start_date( 'M j\, Y g:i a' ) . ' - ' . $this->end_date( 'M j\, Y g:i a' );
+		if (date('m', $this->get_raw('DTT_EVT_start')) != date('m', $this->get_raw('DTT_EVT_end'))) {
+			$displaydate = $this->start_date('M j\, Y g:i a').' - '.$this->end_date('M j\, Y g:i a');
 			//next condition is if its the same month but different day
 		}
 		else {
-			if ( date( 'm', $this->get_raw( 'DTT_EVT_start' ) ) == date( 'm', $this->get_raw( 'DTT_EVT_end' ) ) && date( 'd', $this->get_raw( 'DTT_EVT_start' ) ) != date( 'd', $this->get_raw( 'DTT_EVT_end' ) ) ) {
-				$displaydate = $this->start_date( 'M j\, g:i a' ) . ' - ' . $this->end_date( 'M j\, g:i a Y' );
+			if (date('m', $this->get_raw('DTT_EVT_start')) == date('m', $this->get_raw('DTT_EVT_end')) && date('d', $this->get_raw('DTT_EVT_start')) != date('d', $this->get_raw('DTT_EVT_end'))) {
+				$displaydate = $this->start_date('M j\, g:i a').' - '.$this->end_date('M j\, g:i a Y');
 			}
 			else {
-				$displaydate = $this->start_date( 'F j\, Y' ) . ' @ ' . $this->start_date( 'g:i a' ) . ' - ' . $this->end_date( 'g:i a' );
+				$displaydate = $this->start_date('F j\, Y').' @ '.$this->start_date('g:i a').' - '.$this->end_date('g:i a');
 			}
 		}
 		return $displaydate;
@@ -724,8 +724,8 @@ 
 *@param array $query_params see EEM_Base::get_all()
 	 * @return EE_Ticket[]
 	 */
-	public function tickets( $query_params = array() ) {
-		return $this->get_many_related( 'Ticket', $query_params );
+	public function tickets($query_params = array()) {
+		return $this->get_many_related('Ticket', $query_params);
 	}
 
 
@@ -735,17 +735,17 @@ 
 	 * @param array $query_params like EEM_Base::get_all's
 	 * @return EE_Ticket[]
 	 */
-	public function ticket_types_available_for_purchase( $query_params = array() ) {
+	public function ticket_types_available_for_purchase($query_params = array()) {
 		// first check if datetime is valid
-		if ( !( $this->is_upcoming() || $this->is_active() ) || $this->sold_out() ) {
+		if ( ! ($this->is_upcoming() || $this->is_active()) || $this->sold_out()) {
 			return array();
 		}
-		if ( empty( $query_params ) ) {
-			$query_params = array( array( 'TKT_start_date' => array( '<=', current_time( 'mysql' ) ), 'TKT_end_date' => array( '>=', current_time( 'mysql' ) ), 'TKT_deleted' => FALSE ) );
+		if (empty($query_params)) {
+			$query_params = array(array('TKT_start_date' => array('<=', current_time('mysql')), 'TKT_end_date' => array('>=', current_time('mysql')), 'TKT_deleted' => FALSE));
 		}
 		//		$query_params[0]['TKT_start_date'] = array('<=',current_time('mysql'));
 		//		$query_params[0]['TKT_end_date'] = array('>=',current_time('mysql'));
-		return $this->tickets( $query_params );
+		return $this->tickets($query_params);
 	}
 
 
@@ -755,7 +755,7 @@ 
 	 * @return EE_Event
 	 */
 	public function event() {
-		return $this->get_first_related( 'Event' );
+		return $this->get_first_related('Event');
 	}
 
 
@@ -766,8 +766,8 @@ 
 	 * @return int
 	 */
 	public function update_sold() {
-		$count_regs_for_this_datetime = EEM_Registration::instance()->count( array( array( 'STS_ID' => EEM_Registration::status_id_approved, 'Ticket.Datetime.DTT_ID' => $this->ID(), 'REG_deleted' => 0 ) ) );
-		$this->set( 'DTT_sold', $count_regs_for_this_datetime );
+		$count_regs_for_this_datetime = EEM_Registration::instance()->count(array(array('STS_ID' => EEM_Registration::status_id_approved, 'Ticket.Datetime.DTT_ID' => $this->ID(), 'REG_deleted' => 0)));
+		$this->set('DTT_sold', $count_regs_for_this_datetime);
 		$this->save();
 		return $count_regs_for_this_datetime;
 	}

core/db_classes/EE_Event.class.php

Braces +5 added lines, -10 removed lines

@@ -281,8 +281,7 @@ 
 		$short_desc = $this->get( 'EVT_short_desc' );
 		if ( !empty( $short_desc ) || $not_full_desc ) {
 			return $short_desc;
-		}
-		else {
+		} else {
 			$full_desc = $this->get( 'EVT_desc' );
 			return wp_trim_words( $full_desc, $num_words, $more );
 		}
@@ -665,8 +664,7 @@ 
 				// if datetime has unlimited reg limit then the event can never be sold out
 				if ( $dtt_spaces_remaining === INF ) {
 					return FALSE;
-				}
-				else {
+				} else {
 					$spaces_remaining = max( $dtt_spaces_remaining, $spaces_remaining );
 				}
 			}
@@ -677,8 +675,7 @@ 
 				$this->save();
 			}
 			$sold_out = TRUE;
-		}
-		else {
+		} else {
 			$sold_out = FALSE;
 		}
 		//note: I considered changing the EEM_Event status away from sold_out if this status check reveals that it's no longer sold out (yet the status is still set as sold out) but the problem is... what do we change the status BACK to?  We can't always assume that the previous event status was 'published' because this status check is always done in the admin and its entirely possible the event admin manually changes to sold_out status from some other status.  We also don't want a draft event to become a "publish event" because the sold out check reveals its NOT sold out.
@@ -876,8 +873,7 @@ 
 	public function is_sold_out( $actual = FALSE ) {
 		if ( !$actual ) {
 			return $this->status() == EEM_Event::sold_out;
-		}
-		else {
+		} else {
 			return $this->perform_sold_out_status_check();
 		}
 	}
@@ -1067,8 +1063,7 @@ 
 	public function get_permalink() {
 		if ( $this->external_url() ) {
 			return $this->external_url();
-		}
-		else {
+		} else {
 			return parent::get_permalink();
 		}
 	}

Doc Comments +1 added lines, -1 removed lines

@@ -975,7 +975,7 @@
 	 *
 	 * @access public
 	 * @param boolean $echo     whether to return (FALSE), or echo out the result (TRUE)
-	 * @return mixed void|string
+	 * @return null|string void|string
 	 */
 	public function pretty_active_status( $echo = TRUE ) {
 		$active_status = $this->get_active_status();

Spacing +193 added lines, -193 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');
 }
 /**
  * Event Espresso
@@ -46,11 +46,11 @@ 
 	 * @param array $props_n_values
 	 * @return EE_Event
 	 */
-	public static function new_instance( $props_n_values = array() ) {
-		$has_object = parent::_check_for_object( $props_n_values, __CLASS__ );
-		$obj = $has_object ? $has_object : new self( $props_n_values );
+	public static function new_instance($props_n_values = array()) {
+		$has_object = parent::_check_for_object($props_n_values, __CLASS__);
+		$obj = $has_object ? $has_object : new self($props_n_values);
 		//we need to set the _timezone property to whatever is set in the db for the event initially.
-		$obj->set_timezone( $obj->timezone_string() );
+		$obj->set_timezone($obj->timezone_string());
 		return $obj;
 	}
 
@@ -61,10 +61,10 @@ 
 	 * @param array $props_n_values
 	 * @return EE_Event
 	 */
-	public static function new_instance_from_db( $props_n_values = array() ) {
-		$obj = new self( $props_n_values, TRUE );
+	public static function new_instance_from_db($props_n_values = array()) {
+		$obj = new self($props_n_values, TRUE);
 		//we need to set the _timezone property to whatever is set in the db for the event initially.
-		$obj->set_timezone( $obj->timezone_string() );
+		$obj->set_timezone($obj->timezone_string());
 		return $obj;
 	}
 
@@ -79,8 +79,8 @@ 
 	 * @param boolean $show_deleted whether or not to include deleted events
 	 * @return EE_Datetime[]
 	 */
-	public function datetimes_ordered( $show_expired = TRUE, $show_deleted = FALSE, $limit = NULL ) {
-		return EEM_Datetime::instance( $this->_timezone )->get_datetimes_for_event_ordered_by_DTT_order( $this->ID(), $show_expired, $show_deleted, $limit );
+	public function datetimes_ordered($show_expired = TRUE, $show_deleted = FALSE, $limit = NULL) {
+		return EEM_Datetime::instance($this->_timezone)->get_datetimes_for_event_ordered_by_DTT_order($this->ID(), $show_expired, $show_deleted, $limit);
 	}
 
 
@@ -90,7 +90,7 @@ 
 	 * @return EE_Datetime
 	 */
 	public function first_datetime() {
-		return $this->get_first_related( 'Datetime' );
+		return $this->get_first_related('Datetime');
 	}
 
 
@@ -101,11 +101,11 @@ 
 	 * @param bool $try_to_exclude_deleted
 	 * @return EE_Datetime
 	 */
-	public function primary_datetime( $try_to_exclude_expired = TRUE, $try_to_exclude_deleted = TRUE ) {
-		if ( !empty ( $this->_Primary_Datetime ) ) {
+	public function primary_datetime($try_to_exclude_expired = TRUE, $try_to_exclude_deleted = TRUE) {
+		if ( ! empty ($this->_Primary_Datetime)) {
 			return $this->_Primary_Datetime;
 		}
-		$this->_Primary_Datetime = EEM_Datetime::instance( $this->_timezone )->get_primary_datetime_for_event( $this->ID(), $try_to_exclude_expired, $try_to_exclude_deleted );
+		$this->_Primary_Datetime = EEM_Datetime::instance($this->_timezone)->get_primary_datetime_for_event($this->ID(), $try_to_exclude_expired, $try_to_exclude_deleted);
 		return $this->_Primary_Datetime;
 	}
 
@@ -116,30 +116,30 @@ 
 	 * @param array $query_params like EEM_Base::get_all
 	 * @return EE_Ticket[]
 	 */
-	public function tickets( $query_params = array() ) {
+	public function tickets($query_params = array()) {
 		//first get all datetimes
 		$datetimes = $this->datetimes_ordered();
-		if ( ! $datetimes ) {
+		if ( ! $datetimes) {
 			return array();
 		}
 
 		$datetime_ids = array();
-		foreach ( $datetimes as $datetime ) {
+		foreach ($datetimes as $datetime) {
 			$datetime_ids[] = $datetime->ID();
 		}
 
-		$where_params = array( 'Datetime.DTT_ID' => array( 'IN', $datetime_ids ) );
+		$where_params = array('Datetime.DTT_ID' => array('IN', $datetime_ids));
 
 		//if incoming $query_params has where conditions let's merge but not override existing.
-		if ( is_array( $query_params ) && isset( $query_params[0]) ) {
-			$where_params = array_merge( $query_params[0], $where_params );
-			unset( $query_params[0] );
+		if (is_array($query_params) && isset($query_params[0])) {
+			$where_params = array_merge($query_params[0], $where_params);
+			unset($query_params[0]);
 		}
 
 		//now add $where_params to $query_params
 		$query_params[0] = $where_params;
 
-		return EEM_Ticket::instance()->get_all( $query_params );
+		return EEM_Ticket::instance()->get_all($query_params);
 	}
 
 
@@ -148,7 +148,7 @@ 
 	 * @return bool
 	 */
 	function additional_limit() {
-		return $this->get( 'EVT_additional_limit' );
+		return $this->get('EVT_additional_limit');
 	}
 
 
@@ -157,7 +157,7 @@ 
 	 * @return bool
 	 */
 	function allow_overflow() {
-		return $this->get( 'EVT_allow_overflow' );
+		return $this->get('EVT_allow_overflow');
 	}
 
 
@@ -166,7 +166,7 @@ 
 	 * @return bool
 	 */
 	function created() {
-		return $this->get( 'EVT_created' );
+		return $this->get('EVT_created');
 	}
 
 
@@ -175,7 +175,7 @@ 
 	 * @return bool
 	 */
 	function description() {
-		return $this->get( 'EVT_desc' );
+		return $this->get('EVT_desc');
 	}
 
 
@@ -185,7 +185,7 @@ 
 	 * @return string of html
 	 */
 	function description_filtered() {
-		return $this->get_pretty( 'EVT_desc' );
+		return $this->get_pretty('EVT_desc');
 	}
 
 
@@ -194,7 +194,7 @@ 
 	 * @return bool
 	 */
 	function display_description() {
-		return $this->get( 'EVT_display_desc' );
+		return $this->get('EVT_display_desc');
 	}
 
 
@@ -203,7 +203,7 @@ 
 	 * @return bool
 	 */
 	function display_ticket_selector() {
-		return (bool)$this->get( 'EVT_display_ticket_selector' );
+		return (bool) $this->get('EVT_display_ticket_selector');
 	}
 
 
@@ -212,7 +212,7 @@ 
 	 * @return bool
 	 */
 	function external_url() {
-		return $this->get( 'EVT_external_URL' );
+		return $this->get('EVT_external_URL');
 	}
 
 
@@ -221,7 +221,7 @@ 
 	 * @return bool
 	 */
 	function member_only() {
-		return $this->get( 'EVT_member_only' );
+		return $this->get('EVT_member_only');
 	}
 
 
@@ -230,7 +230,7 @@ 
 	 * @return bool
 	 */
 	function phone() {
-		return $this->get( 'EVT_phone' );
+		return $this->get('EVT_phone');
 	}
 
 
@@ -239,7 +239,7 @@ 
 	 * @return bool
 	 */
 	function modified() {
-		return $this->get( 'EVT_modified' );
+		return $this->get('EVT_modified');
 	}
 
 
@@ -248,7 +248,7 @@ 
 	 * @return bool
 	 */
 	function name() {
-		return $this->get( 'EVT_name' );
+		return $this->get('EVT_name');
 	}
 
 
@@ -257,7 +257,7 @@ 
 	 * @return bool
 	 */
 	function order() {
-		return $this->get( 'EVT_order' );
+		return $this->get('EVT_order');
 	}
 
 
@@ -266,8 +266,8 @@ 
 	 * @return bool|string
 	 */
 	function default_registration_status() {
-		$event_default_registration_status = $this->get( 'EVT_default_registration_status' );
-		return !empty( $event_default_registration_status ) ? $event_default_registration_status : EE_Registry::instance()->CFG->registration->default_STS_ID;
+		$event_default_registration_status = $this->get('EVT_default_registration_status');
+		return ! empty($event_default_registration_status) ? $event_default_registration_status : EE_Registry::instance()->CFG->registration->default_STS_ID;
 	}
 
 
@@ -278,14 +278,14 @@ 
 	 * @param bool $not_full_desc
 	 * @return bool|string
 	 */
-	function short_description( $num_words = 55, $more = NULL, $not_full_desc = FALSE ) {
-		$short_desc = $this->get( 'EVT_short_desc' );
-		if ( !empty( $short_desc ) || $not_full_desc ) {
+	function short_description($num_words = 55, $more = NULL, $not_full_desc = FALSE) {
+		$short_desc = $this->get('EVT_short_desc');
+		if ( ! empty($short_desc) || $not_full_desc) {
 			return $short_desc;
 		}
 		else {
-			$full_desc = $this->get( 'EVT_desc' );
-			return wp_trim_words( $full_desc, $num_words, $more );
+			$full_desc = $this->get('EVT_desc');
+			return wp_trim_words($full_desc, $num_words, $more);
 		}
 	}
 
@@ -295,7 +295,7 @@ 
 	 * @return bool
 	 */
 	function slug() {
-		return $this->get( 'EVT_slug' );
+		return $this->get('EVT_slug');
 	}
 
 
@@ -304,7 +304,7 @@ 
 	 * @return bool
 	 */
 	function timezone_string() {
-		return $this->get( 'EVT_timezone_string' );
+		return $this->get('EVT_timezone_string');
 	}
 
 
@@ -313,7 +313,7 @@ 
 	 * @return bool
 	 */
 	function visible_on() {
-		return $this->get( 'EVT_visible_on' );
+		return $this->get('EVT_visible_on');
 	}
 
 
@@ -322,7 +322,7 @@ 
 	 * @return bool
 	 */
 	function wp_user() {
-		return $this->get( 'EVT_wp_user' );
+		return $this->get('EVT_wp_user');
 	}
 
 
@@ -331,7 +331,7 @@ 
 	 * @return bool
 	 */
 	function donations() {
-		return $this->get( 'EVT_donations' );
+		return $this->get('EVT_donations');
 	}
 
 
@@ -339,8 +339,8 @@ 
 	/**
 	 * @param $limit
 	 */
-	function set_additional_limit( $limit ) {
-		$this->set( 'EVT_additional_limit', $limit );
+	function set_additional_limit($limit) {
+		$this->set('EVT_additional_limit', $limit);
 	}
 
 
@@ -348,8 +348,8 @@ 
 	/**
 	 * @param $created
 	 */
-	function set_created( $created ) {
-		$this->set( 'EVT_created', $created );
+	function set_created($created) {
+		$this->set('EVT_created', $created);
 	}
 
 
@@ -357,8 +357,8 @@ 
 	/**
 	 * @param $desc
 	 */
-	function set_description( $desc ) {
-		$this->set( 'EVT_desc', $desc );
+	function set_description($desc) {
+		$this->set('EVT_desc', $desc);
 	}
 
 
@@ -366,8 +366,8 @@ 
 	/**
 	 * @param $display_desc
 	 */
-	function set_display_description( $display_desc ) {
-		$this->set( 'EVT_display_desc', $display_desc );
+	function set_display_description($display_desc) {
+		$this->set('EVT_display_desc', $display_desc);
 	}
 
 
@@ -375,8 +375,8 @@ 
 	/**
 	 * @param $display_ticket_selector
 	 */
-	function set_display_ticket_selector( $display_ticket_selector ) {
-		$this->set( 'EVT_display_ticket_selector', $display_ticket_selector );
+	function set_display_ticket_selector($display_ticket_selector) {
+		$this->set('EVT_display_ticket_selector', $display_ticket_selector);
 	}
 
 
@@ -384,8 +384,8 @@ 
 	/**
 	 * @param $external_url
 	 */
-	function set_external_url( $external_url ) {
-		$this->set( 'EVT_external_URL', $external_url );
+	function set_external_url($external_url) {
+		$this->set('EVT_external_URL', $external_url);
 	}
 
 
@@ -393,8 +393,8 @@ 
 	/**
 	 * @param $member_only
 	 */
-	function set_member_only( $member_only ) {
-		$this->set( 'EVT_member_only', $member_only );
+	function set_member_only($member_only) {
+		$this->set('EVT_member_only', $member_only);
 	}
 
 
@@ -402,8 +402,8 @@ 
 	/**
 	 * @param $event_phone
 	 */
-	function set_event_phone( $event_phone ) {
-		$this->set( 'EVT_phone', $event_phone );
+	function set_event_phone($event_phone) {
+		$this->set('EVT_phone', $event_phone);
 	}
 
 
@@ -411,8 +411,8 @@ 
 	/**
 	 * @param $modified
 	 */
-	function set_modified( $modified ) {
-		$this->set( 'EVT_modified', $modified );
+	function set_modified($modified) {
+		$this->set('EVT_modified', $modified);
 	}
 
 
@@ -420,8 +420,8 @@ 
 	/**
 	 * @param $name
 	 */
-	function set_name( $name ) {
-		$this->set( 'EVT_name', $name );
+	function set_name($name) {
+		$this->set('EVT_name', $name);
 	}
 
 
@@ -429,8 +429,8 @@ 
 	/**
 	 * @param $order
 	 */
-	function set_order( $order ) {
-		$this->set( 'EVT_order', $order );
+	function set_order($order) {
+		$this->set('EVT_order', $order);
 	}
 
 
@@ -438,8 +438,8 @@ 
 	/**
 	 * @param $short_desc
 	 */
-	function set_short_description( $short_desc ) {
-		$this->set( 'EVT_short_desc', $short_desc );
+	function set_short_description($short_desc) {
+		$this->set('EVT_short_desc', $short_desc);
 	}
 
 
@@ -447,8 +447,8 @@ 
 	/**
 	 * @param $slug
 	 */
-	function set_slug( $slug ) {
-		$this->set( 'EVT_slug', $slug );
+	function set_slug($slug) {
+		$this->set('EVT_slug', $slug);
 	}
 
 
@@ -456,8 +456,8 @@ 
 	/**
 	 * @param $timezone_string
 	 */
-	function set_timezone_string( $timezone_string ) {
-		$this->set( 'EVT_timezone_string', $timezone_string );
+	function set_timezone_string($timezone_string) {
+		$this->set('EVT_timezone_string', $timezone_string);
 	}
 
 
@@ -465,8 +465,8 @@ 
 	/**
 	 * @param $visible_on
 	 */
-	function set_visible_on( $visible_on ) {
-		$this->set( 'EVT_visible_on', $visible_on );
+	function set_visible_on($visible_on) {
+		$this->set('EVT_visible_on', $visible_on);
 	}
 
 
@@ -474,8 +474,8 @@ 
 	/**
 	 * @param $wp_user
 	 */
-	function set_wp_user( $wp_user ) {
-		$this->set( 'EVT_wp_user', $wp_user );
+	function set_wp_user($wp_user) {
+		$this->set('EVT_wp_user', $wp_user);
 	}
 
 
@@ -483,8 +483,8 @@ 
 	/**
 	 * @param $default_registration_status
 	 */
-	function set_default_registration_status( $default_registration_status ) {
-		$this->set( 'EVT_default_registration_status', $default_registration_status );
+	function set_default_registration_status($default_registration_status) {
+		$this->set('EVT_default_registration_status', $default_registration_status);
 	}
 
 
@@ -492,8 +492,8 @@ 
 	/**
 	 * @param $donations
 	 */
-	function set_donations( $donations ) {
-		$this->set( 'EVT_donations', $donations );
+	function set_donations($donations) {
+		$this->set('EVT_donations', $donations);
 	}
 
 
@@ -503,8 +503,8 @@ 
 	 * @param EE_Venue /int $venue_id_or_obj
 	 * @return EE_Venue
 	 */
-	function add_venue( $venue_id_or_obj ) {
-		return $this->_add_relation_to( $venue_id_or_obj, 'Venue' );
+	function add_venue($venue_id_or_obj) {
+		return $this->_add_relation_to($venue_id_or_obj, 'Venue');
 	}
 
 
@@ -514,8 +514,8 @@ 
 	 * @param EE_Venue /int $venue_id_or_obj
 	 * @return EE_Venue
 	 */
-	function remove_venue( $venue_id_or_obj ) {
-		return $this->_remove_relation_to( $venue_id_or_obj, 'Venue' );
+	function remove_venue($venue_id_or_obj) {
+		return $this->_remove_relation_to($venue_id_or_obj, 'Venue');
 	}
 
 
@@ -525,8 +525,8 @@ 
 	 * @param array $query_params like EEM_Base::get_all's $query_params
 	 * @return EE_Venue[]
 	 */
-	function venues( $query_params = array() ) {
-		return $this->get_many_related( 'Venue', $query_params );
+	function venues($query_params = array()) {
+		return $this->get_many_related('Venue', $query_params);
 	}
 
 
@@ -538,7 +538,7 @@ 
 	 */
 	private function _has_ID_and_is_published() {
 		// first check if event id is present and not NULL, then check if this event is published (or any of the equivalent "published" statuses)
-		return ( $this->ID() && $this->ID() !== NULL && ( $this->status() == 'publish' || $this->status() == EEM_Event::sold_out || $this->status() == EEM_Event::postponed || $this->status() == EEM_Event::cancelled ) ) ? TRUE : FALSE;
+		return ($this->ID() && $this->ID() !== NULL && ($this->status() == 'publish' || $this->status() == EEM_Event::sold_out || $this->status() == EEM_Event::postponed || $this->status() == EEM_Event::cancelled)) ? TRUE : FALSE;
 	}
 
 
@@ -550,21 +550,21 @@ 
 	 */
 	public function is_upcoming() {
 		// check if event id is present and if this event is published
-		if ( $this->is_inactive() ) {
+		if ($this->is_inactive()) {
 			return FALSE;
 		}
 		// set initial value
 		$upcoming = FALSE;
 		//next let's get all datetimes and loop through them
-		$datetimes = $this->get_many_related( 'Datetime', array( 'order_by' => array( 'DTT_EVT_start' => 'ASC' ) ) );
-		foreach ( $datetimes as $datetime ) {
-			if ( $datetime instanceof EE_Datetime ) {
+		$datetimes = $this->get_many_related('Datetime', array('order_by' => array('DTT_EVT_start' => 'ASC')));
+		foreach ($datetimes as $datetime) {
+			if ($datetime instanceof EE_Datetime) {
 				//if this dtt is expired then we continue cause one of the other datetimes might be upcoming.
-				if ( $datetime->is_expired() ) {
+				if ($datetime->is_expired()) {
 					continue;
 				}
 				//if this dtt is active then we return false.
-				if ( $datetime->is_active() ) {
+				if ($datetime->is_active()) {
 					return FALSE;
 				}
 				//otherwise let's check upcoming status
@@ -581,21 +581,21 @@ 
 	 */
 	public function is_active() {
 		// check if event id is present and if this event is published
-		if ( $this->is_inactive() ) {
+		if ($this->is_inactive()) {
 			return FALSE;
 		}
 		// set initial value
 		$active = FALSE;
 		//next let's get all datetimes and loop through them
-		$datetimes = $this->get_many_related( 'Datetime', array( 'order_by' => array( 'DTT_EVT_start' => 'ASC' ) ) );
-		foreach ( $datetimes as $datetime ) {
-			if ( $datetime instanceof EE_Datetime ) {
+		$datetimes = $this->get_many_related('Datetime', array('order_by' => array('DTT_EVT_start' => 'ASC')));
+		foreach ($datetimes as $datetime) {
+			if ($datetime instanceof EE_Datetime) {
 				//if this dtt is expired then we continue cause one of the other datetimes might be active.
-				if ( $datetime->is_expired() ) {
+				if ($datetime->is_expired()) {
 					continue;
 				}
 				//if this dtt is upcoming then we return false.
-				if ( $datetime->is_upcoming() ) {
+				if ($datetime->is_upcoming()) {
 					return FALSE;
 				}
 				//otherwise let's check active status
@@ -612,17 +612,17 @@ 
 	 */
 	public function is_expired() {
 		// check if event id is present and if this event is published
-		if ( $this->is_inactive() ) {
+		if ($this->is_inactive()) {
 			return FALSE;
 		}
 		// set initial value
 		$expired = FALSE;
 		//first let's get all datetimes and loop through them
-		$datetimes = $this->get_many_related( 'Datetime', array( 'order_by' => array( 'DTT_EVT_start' => 'ASC' ) ) );
-		foreach ( $datetimes as $datetime ) {
-			if ( $datetime instanceof EE_Datetime ) {
+		$datetimes = $this->get_many_related('Datetime', array('order_by' => array('DTT_EVT_start' => 'ASC')));
+		foreach ($datetimes as $datetime) {
+			if ($datetime instanceof EE_Datetime) {
 				//if this dtt is upcoming or active then we return false.
-				if ( $datetime->is_upcoming() || $datetime->is_active() ) {
+				if ($datetime->is_upcoming() || $datetime->is_active()) {
 					return FALSE;
 				}
 				//otherwise let's check active status
@@ -639,7 +639,7 @@ 
 	 */
 	public function is_inactive() {
 		// check if event id is present and if this event is published
-		if ( $this->_has_ID_and_is_published() ) {
+		if ($this->_has_ID_and_is_published()) {
 			return FALSE;
 		}
 		return TRUE;
@@ -659,22 +659,22 @@ 
 		// set initial value
 		$spaces_remaining = 0;
 		//next let's get all datetimes and loop through them
-		$datetimes = $this->get_many_related( 'Datetime', array( 'order_by' => array( 'DTT_EVT_start' => 'ASC' ) ) );
-		foreach ( $datetimes as $datetime ) {
-			if ( $datetime instanceof EE_Datetime ) {
-				$dtt_spaces_remaining = $datetime->spaces_remaining( TRUE );
+		$datetimes = $this->get_many_related('Datetime', array('order_by' => array('DTT_EVT_start' => 'ASC')));
+		foreach ($datetimes as $datetime) {
+			if ($datetime instanceof EE_Datetime) {
+				$dtt_spaces_remaining = $datetime->spaces_remaining(TRUE);
 				// if datetime has unlimited reg limit then the event can never be sold out
-				if ( $dtt_spaces_remaining === INF ) {
+				if ($dtt_spaces_remaining === INF) {
 					return FALSE;
 				}
 				else {
-					$spaces_remaining = max( $dtt_spaces_remaining, $spaces_remaining );
+					$spaces_remaining = max($dtt_spaces_remaining, $spaces_remaining);
 				}
 			}
 		}
-		if ( $spaces_remaining === 0 ) {
-			$this->set_status( EEM_Event::sold_out );
-			if ( !is_admin() || ( is_admin() && defined( 'DOING_AJAX' ) ) ) {
+		if ($spaces_remaining === 0) {
+			$this->set_status(EEM_Event::sold_out);
+			if ( ! is_admin() || (is_admin() && defined('DOING_AJAX'))) {
 				$this->save();
 			}
 			$sold_out = TRUE;
@@ -702,15 +702,15 @@ 
 	 */
 	public function spaces_remaining_for_sale() {
 		//first get total available spaces including consideration for tickets that have already sold.
-		$spaces_available = $this->total_available_spaces( true );
+		$spaces_available = $this->total_available_spaces(true);
 
 		//if total available = 0, then exit right away because that means everything is expired.
-		if ( $spaces_available === 0 ) {
+		if ($spaces_available === 0) {
 			return 0;
 		}
 
 		//subtract total approved registrations from spaces available to get how many are remaining.
-		$spots_taken = EEM_Registration::instance()->count( array( array( 'EVT_ID' => $this->ID(), 'STS_ID' => EEM_Registration::status_id_approved ) ), 'REG_ID', true );
+		$spots_taken = EEM_Registration::instance()->count(array(array('EVT_ID' => $this->ID(), 'STS_ID' => EEM_Registration::status_id_approved)), 'REG_ID', true);
 		$spaces_remaining = $spaces_available - $spots_taken;
 
 		return $spaces_remaining > 0 ? $spaces_remaining : 0;
@@ -743,53 +743,53 @@ 
 	 *
 	 * @return  int|float  (Note: if INF is returned its considered a float by PHP)
 	 */
-	public function total_available_spaces( $current_total_available = false ) {
+	public function total_available_spaces($current_total_available = false) {
 		$spaces_available = 0;
 
 		//first get all tickets on the event and include expired tickets
-		$tickets = $this->tickets( array( 'default_where_conditions' => 'none' ) );
+		$tickets = $this->tickets(array('default_where_conditions' => 'none'));
 		$ticket_sums = array();
 		$datetime_limits = array();
 
 		//loop through tickets and normalize them
-		foreach ( $tickets as $ticket ) {
-			$datetimes = $ticket->datetimes( array( 'order_by' => array( 'DTT_reg_limit' => 'ASC' ) ) );
+		foreach ($tickets as $ticket) {
+			$datetimes = $ticket->datetimes(array('order_by' => array('DTT_reg_limit' => 'ASC')));
 
-			if ( empty( $datetimes ) ) {
+			if (empty($datetimes)) {
 				continue;
 			}
 
 			//first datetime should be the lowest datetime
-			$least_datetime = reset( $datetimes );
+			$least_datetime = reset($datetimes);
 
 			//lets reset the ticket quantity to be the lower of either the lowest datetime reg limit or the ticket quantity
 			//IF datetimes sold (and we're not doing current live total available, then use spaces remaining for datetime, not reg_limit.
-			if ( $current_total_available ) {
-				if ( $ticket->is_remaining() ) {
+			if ($current_total_available) {
+				if ($ticket->is_remaining()) {
 					$remaining = $ticket->remaining();
 				} else {
-					$spaces_available += $ticket->get( 'TKT_sold' );
+					$spaces_available += $ticket->get('TKT_sold');
 					//and we don't cache this ticket to our list because its sold out.
 					continue;
 				}
 			} else {
-				$remaining = min( $ticket->qty(), $least_datetime->reg_limit() );
+				$remaining = min($ticket->qty(), $least_datetime->reg_limit());
 			}
 
 			//if $ticket_limit == infinity then let's drop out right away and just return that because any infinity amount trumps all other "available" amounts.
-			if ( $remaining == INF ) {
+			if ($remaining == INF) {
 				return INF;
 			}
 
 			//multiply normalized $tkt quantity by the number of datetimes on the ticket as the "sum"
 			//also include the sum of all the datetime reg limits on the ticket for breaking ties.
-			$ticket_sums[$ticket->ID()]['sum'] = $remaining * count( $datetimes );
+			$ticket_sums[$ticket->ID()]['sum'] = $remaining * count($datetimes);
 			$ticket_sums[$ticket->ID()]['datetime_sums'] = 0;
-			foreach ( $datetimes as $datetime ) {
-				if ( $datetime->reg_limit() === INF ) {
+			foreach ($datetimes as $datetime) {
+				if ($datetime->reg_limit() === INF) {
 					$ticket_sums[$ticket->ID()]['datetime_sums'] = INF;
 				} else {
-					$ticket_sums[ $ticket->ID() ]['datetime_sums'] += $current_total_available ? $datetime->spaces_remaining() : $datetime->reg_limit();
+					$ticket_sums[$ticket->ID()]['datetime_sums'] += $current_total_available ? $datetime->spaces_remaining() : $datetime->reg_limit();
 				}
 				$datetime_limits[$datetime->ID()] = $current_total_available ? $datetime->spaces_remaining() : $datetime->reg_limit();
 			}
@@ -800,66 +800,66 @@ 
 		//ticket quantity by the number of datetimes on the ticket).  For tie-breakers, then the next sort is based on the
 		//ticket with the greatest sum of all remaining datetime->spaces_remaining() ( or $datetime->reg_limit() if not
 		//$current_total_available ) for the datetimes on the ticket.
-		usort( $ticket_sums, function( $a, $b ) {
-			if ( $a['sum'] == $b['sum'] ) {
-				if ( $a['datetime_sums'] == $b['datetime_sums'] ) {
+		usort($ticket_sums, function($a, $b) {
+			if ($a['sum'] == $b['sum']) {
+				if ($a['datetime_sums'] == $b['datetime_sums']) {
 					return 0;
 				}
 
 				return $a['datetime_sums'] < $b['datetime_sums'] ? 1 : -1;
 			}
-			return ( $a['sum'] < $b['sum'] ) ? -1 : 1;
+			return ($a['sum'] < $b['sum']) ? -1 : 1;
 		});
 
 		//now let's loop through the sorted tickets and simulate sellouts
-		foreach ( $ticket_sums as $ticket_info ) {
-			$datetimes = $ticket_info['ticket']->datetimes( array( 'order_by' => array( 'DTT_reg_limit' => 'ASC' ) ) );
+		foreach ($ticket_sums as $ticket_info) {
+			$datetimes = $ticket_info['ticket']->datetimes(array('order_by' => array('DTT_reg_limit' => 'ASC')));
 			//need to sort these $datetimes by remaining (only if $current_total_available)
 			//setup datetimes for simulation
 			$ticket_datetimes_remaining = array();
-			foreach( $datetimes as $datetime ) {
+			foreach ($datetimes as $datetime) {
 				$ticket_datetimes_remaining[$datetime->ID()]['rem'] = $datetime_limits[$datetime->ID()];
 				$ticket_datetimes_remaining[$datetime->ID()]['datetime'] = $datetime;
 			}
-			usort( $ticket_datetimes_remaining, function( $a, $b ) {
-				if ( $a['rem'] == $b['rem'] ) {
+			usort($ticket_datetimes_remaining, function($a, $b) {
+				if ($a['rem'] == $b['rem']) {
 					return 0;
 				}
-				return ( $a['rem'] < $b['rem'] ) ? -1 : 1;
+				return ($a['rem'] < $b['rem']) ? -1 : 1;
 			});
 
 
 			//get the remaining on the first datetime (which should be the one with the least remaining) and that is
 			//what we add to the spaces_available running total.  Then we need to decrease the remaining on our datetime tracker.
-			$lowest_datetime = reset( $ticket_datetimes_remaining );
+			$lowest_datetime = reset($ticket_datetimes_remaining);
 
 			//need to get the lower of; what the remaining is on the lowest datetime, and the remaining on the ticket.
 			// If this ends up being 0 (because of previous tickets in our simulation selling out), then it has already
 			// been tracked on $spaces available and this ticket is now sold out for the simulation, so we can continue
 			// to the next ticket.
-			$remaining = min( $lowest_datetime['rem'], $ticket_info['ticket']->remaining() );
+			$remaining = min($lowest_datetime['rem'], $ticket_info['ticket']->remaining());
 
 			//if $remaining is infinite that means that all datetimes on this ticket are infinite but we've made it here because all
 			//tickets have a quantity.  So we don't have to track datetimes, we can just use ticket quantities for total
 			//available.
-			if ( $remaining === INF ) {
+			if ($remaining === INF) {
 				$spaces_available += $ticket_info['ticket']->qty();
 				continue;
 			}
 
 			//if ticket has sold amounts then we also need to add that (but only if doing live counts)
-			if ( $current_total_available ) {
+			if ($current_total_available) {
 				$spaces_available += $ticket_info['ticket']->sold();
 			}
 
-			if ( $remaining <= 0 ) {
+			if ($remaining <= 0) {
 				continue;
 			} else {
 				$spaces_available += $remaining;
 			}
 
 			//loop through the datetimes and sell them out!
-			foreach ( $ticket_datetimes_remaining as $datetime_info ) {
+			foreach ($ticket_datetimes_remaining as $datetime_info) {
 				$datetime_limits[$datetime_info['datetime']->ID()] += - $remaining;
 			}
 		}
@@ -874,8 +874,8 @@ 
 	 * @param  bool $actual whether or not to perform calculations to not only figure the actual status but also to flip the status if necessary to sold out If false, we just check the existing status of the event
 	 * @return boolean
 	 */
-	public function is_sold_out( $actual = FALSE ) {
-		if ( !$actual ) {
+	public function is_sold_out($actual = FALSE) {
+		if ( ! $actual) {
 			return $this->status() == EEM_Event::sold_out;
 		}
 		else {
@@ -913,36 +913,36 @@ 
 	 * @param bool $reset
 	 * @return bool | string - based on EE_Datetime active constants or FALSE if error.
 	 */
-	public function get_active_status( $reset = FALSE ) {
+	public function get_active_status($reset = FALSE) {
 		// if the active status has already been set, then just use that value (unless we are resetting it)
-		if ( ! empty( $this->_active_status ) && ! $reset ) {
+		if ( ! empty($this->_active_status) && ! $reset) {
 			return $this->_active_status;
 		}
 		//first check if event id is present on this object
-		if ( ! $this->ID() ) {
+		if ( ! $this->ID()) {
 			return FALSE;
 		}
 		//first get all datetimes ordered by date
-		$datetimes = $this->get_many_related( 'Datetime', array( 'order_by' => array( 'DTT_EVT_start' => 'ASC' ) ) );
+		$datetimes = $this->get_many_related('Datetime', array('order_by' => array('DTT_EVT_start' => 'ASC')));
 		//next loop through $datetimes and setup status array
 		$status_array = array();
-		foreach ( $datetimes as $datetime ) {
-			if ( $datetime instanceof EE_Datetime ) {
+		foreach ($datetimes as $datetime) {
+			if ($datetime instanceof EE_Datetime) {
 				$status_array[] = $datetime->get_active_status();
 			}
 		}
 		//now we can conditionally determine status
-		if ( $this->status() == 'publish' ) {
-			if ( in_array( EE_Datetime::active, $status_array ) ) {
+		if ($this->status() == 'publish') {
+			if (in_array(EE_Datetime::active, $status_array)) {
 				$this->_active_status = EE_Datetime::active;
 			} else {
-				if ( in_array( EE_Datetime::upcoming, $status_array ) ) {
+				if (in_array(EE_Datetime::upcoming, $status_array)) {
 					$this->_active_status = EE_Datetime::upcoming;
 				} else {
-					if ( in_array( EE_Datetime::expired, $status_array ) ) {
+					if (in_array(EE_Datetime::expired, $status_array)) {
 						$this->_active_status = EE_Datetime::expired;
 					} else {
-						if ( in_array( EE_Datetime::sold_out, $status_array ) ) {
+						if (in_array(EE_Datetime::sold_out, $status_array)) {
 							$this->_active_status = EE_Datetime::sold_out;
 						} else {
 							$this->_active_status = EE_Datetime::expired; //catchall
@@ -951,7 +951,7 @@ 
 				}
 			}
 		} else {
-			switch ( $this->status() ) {
+			switch ($this->status()) {
 				case EEM_Event::sold_out :
 					$this->_active_status = EE_Datetime::sold_out;
 					break;
@@ -977,10 +977,10 @@ 
 	 * @param boolean $echo     whether to return (FALSE), or echo out the result (TRUE)
 	 * @return mixed void|string
 	 */
-	public function pretty_active_status( $echo = TRUE ) {
+	public function pretty_active_status($echo = TRUE) {
 		$active_status = $this->get_active_status();
-		$status = '<span class="ee-status event-active-status-' . $active_status . '">' . EEH_Template::pretty_status( $active_status, FALSE, 'sentence' ) . '</span>';
-		if ( $echo ) {
+		$status = '<span class="ee-status event-active-status-'.$active_status.'">'.EEH_Template::pretty_status($active_status, FALSE, 'sentence').'</span>';
+		if ($echo) {
 			echo $status;
 		} else {
 			return $status;
@@ -994,12 +994,12 @@ 
 	 */
 	public function get_number_of_tickets_sold() {
 		$tkt_sold = 0;
-		if ( !$this->ID() ) {
+		if ( ! $this->ID()) {
 			return 0;
 		}
-		$datetimes = $this->get_many_related( 'Datetime' );
-		foreach ( $datetimes as $datetime ) {
-			$tkt_sold += $datetime->get( 'DTT_sold' );
+		$datetimes = $this->get_many_related('Datetime');
+		foreach ($datetimes as $datetime) {
+			$tkt_sold += $datetime->get('DTT_sold');
 		}
 		return $tkt_sold;
 	}
@@ -1012,7 +1012,7 @@ 
 	 * @return int
 	 */
 	public function get_count_of_all_registrations() {
-		return EEM_Event::instance()->count_related( $this, 'Registration' );
+		return EEM_Event::instance()->count_related($this, 'Registration');
 	}
 
 
@@ -1022,9 +1022,9 @@ 
 	 * @return EE_Ticket
 	 */
 	public function get_ticket_with_earliest_start_time() {
-		$where[ 'Datetime.EVT_ID' ] = $this->ID();
-		$query_params = array( $where, 'order_by' => array( 'TKT_start_date' => 'ASC' ) );
-		return EE_Registry::instance()->load_model( 'Ticket' )->get_one( $query_params );
+		$where['Datetime.EVT_ID'] = $this->ID();
+		$query_params = array($where, 'order_by' => array('TKT_start_date' => 'ASC'));
+		return EE_Registry::instance()->load_model('Ticket')->get_one($query_params);
 	}
 
 
@@ -1034,9 +1034,9 @@ 
 	 * @return EE_Ticket
 	 */
 	public function get_ticket_with_latest_end_time() {
-		$where[ 'Datetime.EVT_ID' ] = $this->ID();
-		$query_params = array( $where, 'order_by' => array( 'TKT_end_date' => 'DESC' ) );
-		return EE_Registry::instance()->load_model( 'Ticket' )->get_one( $query_params );
+		$where['Datetime.EVT_ID'] = $this->ID();
+		$query_params = array($where, 'order_by' => array('TKT_end_date' => 'DESC'));
+		return EE_Registry::instance()->load_model('Ticket')->get_one($query_params);
 	}
 
 
@@ -1048,11 +1048,11 @@ 
 	public function tickets_on_sale() {
 		$earliest_ticket = $this->get_ticket_with_earliest_start_time();
 		$latest_ticket = $this->get_ticket_with_latest_end_time();
-		if ( !$latest_ticket instanceof EE_Ticket && !$earliest_ticket instanceof EE_Ticket ) {
+		if ( ! $latest_ticket instanceof EE_Ticket && ! $earliest_ticket instanceof EE_Ticket) {
 			return FALSE;
 		}
 		//check on sale for these two tickets.
-		if ( $latest_ticket->is_on_sale() || $earliest_ticket->is_on_sale() ) {
+		if ($latest_ticket->is_on_sale() || $earliest_ticket->is_on_sale()) {
 			return TRUE;
 		}
 		return FALSE;
@@ -1066,7 +1066,7 @@ 
 	 * @return string
 	 */
 	public function get_permalink() {
-		if ( $this->external_url() ) {
+		if ($this->external_url()) {
 			return $this->external_url();
 		}
 		else {
@@ -1081,10 +1081,10 @@ 
 	 * @param array $query_params like EEM_Base::get_all
 	 * @return EE_Term
 	 */
-	public function first_event_category( $query_params = array() ) {
-		$query_params[ 0 ][ 'Term_Taxonomy.taxonomy' ] = 'espresso_event_categories';
-		$query_params[ 0 ][ 'Term_Taxonomy.Event.EVT_ID' ] = $this->ID();
-		return EEM_Term::instance()->get_one( $query_params );
+	public function first_event_category($query_params = array()) {
+		$query_params[0]['Term_Taxonomy.taxonomy'] = 'espresso_event_categories';
+		$query_params[0]['Term_Taxonomy.Event.EVT_ID'] = $this->ID();
+		return EEM_Term::instance()->get_one($query_params);
 	}
 
 
@@ -1094,10 +1094,10 @@ 
 	 * @param array $query_params
 	 * @return EE_Term[]
 	 */
-	public function get_all_event_categories( $query_params = array() ) {
-		$query_params[ 0 ][ 'Term_Taxonomy.taxonomy' ] = 'espresso_event_categories';
-		$query_params[ 0 ][ 'Term_Taxonomy.Event.EVT_ID' ] = $this->ID();
-		return EEM_Term::instance()->get_all( $query_params );
+	public function get_all_event_categories($query_params = array()) {
+		$query_params[0]['Term_Taxonomy.taxonomy'] = 'espresso_event_categories';
+		$query_params[0]['Term_Taxonomy.Event.EVT_ID'] = $this->ID();
+		return EEM_Term::instance()->get_all($query_params);
 	}
 
 	/**
@@ -1105,8 +1105,8 @@ 
 	 * @param array $query_params @see EEM_Base::get_all
 	 * @return EE_Question_Group[]
 	 */
-	public function question_groups($query_params = array()){
-		$query_params = ! empty( $query_params ) ? $query_params : array( 'order_by' => array( 'QSG_order' => 'ASC' ));
+	public function question_groups($query_params = array()) {
+		$query_params = ! empty($query_params) ? $query_params : array('order_by' => array('QSG_order' => 'ASC'));
 		return $this->get_many_related('Question_Group', $query_params);
 	}