eventespresso / event-espresso-core

core/EE_Data_Migration_Manager.core.php

Spacing +208 added lines, -208 removed lines

@@ -24,7 +24,7 @@ 
  * to indicate it successfully migrate some data, and has nothing left to do; or EE_Data_Migration_Manager::status_fatal_error to indicate
  * an error occurred which means the ajax script should probably stop executing.
  */
-class EE_Data_Migration_Manager{
+class EE_Data_Migration_Manager {
 
 	/**
 	 *
@@ -81,7 +81,7 @@ 
 	 * of this EE installation. Keys should be the name of the version the script upgraded to
 	 * @var EE_Data_Migration_Script_Base[]
 	 */
-	private $_data_migrations_ran =null;
+	private $_data_migrations_ran = null;
 	/**
 	 * The last ran script. It's nice to store this somewhere accessible, as its easiest
 	 * to know which was the last run by which is the newest wp option; but in most of the code
@@ -141,7 +141,7 @@ 
 	 */
 	public static function instance() {
 		// check if class object is instantiated
-		if ( ! self::$_instance instanceof EE_Data_Migration_Manager ) {
+		if ( ! self::$_instance instanceof EE_Data_Migration_Manager) {
 			self::$_instance = new self();
 		}
 		return self::$_instance;
@@ -151,7 +151,7 @@ 
 	 * all new usages of the singleton should be made with Classname::instance()) and returns it
 	 * @return EE_Data_Migration_Manager
 	 */
-	public static function reset(){
+	public static function reset() {
 		self::$_instance = NULL;
 		return self::instance();
 	}
@@ -161,7 +161,7 @@ 
 	/**
 	 * constructor
 	 */
-	private function __construct(){
+	private function __construct() {
 		$this->stati_that_indicate_to_continue_migrations = array(
 			self::status_continue,
 			self::status_completed
@@ -180,13 +180,13 @@ 
 		);
 		//make sure we've included the base migration script, because we may need the EE_DMS_Unknown_1_0_0 class
 		//to be defined, because right now it doesn't get autoloaded on its own
-		EE_Registry::instance()->load_core( 'Data_Migration_Class_Base', array(), TRUE );
-		EE_Registry::instance()->load_core( 'Data_Migration_Script_Base', array(), TRUE );
-		EE_Registry::instance()->load_core( 'DMS_Unknown_1_0_0', array(), TRUE );
-		EE_Registry::instance()->load_core( 'Data_Migration_Script_Stage', array(), TRUE );
-		EE_Registry::instance()->load_core( 'Data_Migration_Script_Stage_Table', array(), TRUE );
-		$this->_table_manager = EE_Registry::instance()->create( 'TableManager', array(), true );
-		$this->_table_analysis = EE_Registry::instance()->create( 'TableAnalysis', array(), true );
+		EE_Registry::instance()->load_core('Data_Migration_Class_Base', array(), TRUE);
+		EE_Registry::instance()->load_core('Data_Migration_Script_Base', array(), TRUE);
+		EE_Registry::instance()->load_core('DMS_Unknown_1_0_0', array(), TRUE);
+		EE_Registry::instance()->load_core('Data_Migration_Script_Stage', array(), TRUE);
+		EE_Registry::instance()->load_core('Data_Migration_Script_Stage_Table', array(), TRUE);
+		$this->_table_manager = EE_Registry::instance()->create('TableManager', array(), true);
+		$this->_table_analysis = EE_Registry::instance()->create('TableAnalysis', array(), true);
 	}
 
 
@@ -199,21 +199,21 @@ 
 	 * @param string $option_name (see EE_Data_Migration_Manage::_save_migrations_ran() where the option name is set)
 	 * @return array where the first item is the plugin slug (eg 'Core','Calendar',etc) and the 2nd is the version of that plugin (eg '4.1.0')
 	 */
-	private function _get_plugin_slug_and_version_string_from_dms_option_name($option_name){
+	private function _get_plugin_slug_and_version_string_from_dms_option_name($option_name) {
 		$plugin_slug_and_version_string = str_replace(EE_Data_Migration_Manager::data_migration_script_option_prefix, "", $option_name);
 		//check if $plugin_slug_and_version_string is like '4.1.0' (4.1-style) or 'Core.4.1.0' (4.2-style)
-		$parts = explode(".",$plugin_slug_and_version_string);
+		$parts = explode(".", $plugin_slug_and_version_string);
 
-		if(count($parts) == 4){
+		if (count($parts) == 4) {
 			//it's 4.2-style.eg Core.4.1.0
-			$plugin_slug = $parts[0];//eg Core
+			$plugin_slug = $parts[0]; //eg Core
 			$version_string = $parts[1].".".$parts[2].".".$parts[3]; //eg 4.1.0
-		}else{
+		} else {
 			//it's 4.1-style: eg 4.1.0
 			$plugin_slug = 'Core';
-			$version_string = $plugin_slug_and_version_string;//eg 4.1.0
+			$version_string = $plugin_slug_and_version_string; //eg 4.1.0
 		}
-		return array($plugin_slug,$version_string);
+		return array($plugin_slug, $version_string);
 	}
 
 	/**
@@ -224,21 +224,21 @@ 
 	 * @return EE_Data_Migration_Script_Base
 	 * @throws EE_Error
 	 */
-	private function _get_dms_class_from_wp_option($dms_option_name,$dms_option_value){
+	private function _get_dms_class_from_wp_option($dms_option_name, $dms_option_value) {
 		$data_migration_data = maybe_unserialize($dms_option_value);
-		if(isset($data_migration_data['class']) && class_exists($data_migration_data['class'])){
+		if (isset($data_migration_data['class']) && class_exists($data_migration_data['class'])) {
 			$class = new $data_migration_data['class'];
-			if($class instanceof EE_Data_Migration_Script_Base){
+			if ($class instanceof EE_Data_Migration_Script_Base) {
 				$class->instantiate_from_array_of_properties($data_migration_data);
 				return $class;
-			}else{
+			} else {
 				//huh, so its an object but not a data migration script?? that shouldn't happen
 				//just leave it as an array (which will probably just get ignored)
-				throw new EE_Error(sprintf(__("Trying to retrieve DMS class from wp option. No DMS by the name '%s' exists", 'event_espresso'),$data_migration_data['class']));
+				throw new EE_Error(sprintf(__("Trying to retrieve DMS class from wp option. No DMS by the name '%s' exists", 'event_espresso'), $data_migration_data['class']));
 			}
-		}else{
+		} else {
 			//so the data doesn't specify a class. So it must either be a legacy array of info or some array (which we'll probably just ignore), or a class that no longer exists
-			throw new EE_Error(sprintf(__("The wp option  with key '%s' does not represent a DMS", 'event_espresso'),$dms_option_name));
+			throw new EE_Error(sprintf(__("The wp option  with key '%s' does not represent a DMS", 'event_espresso'), $dms_option_name));
 		}
 	}
 	/**
@@ -246,34 +246,34 @@ 
 	 * the last ran which hasn't finished yet
 	 * @return array where each element should be an array of EE_Data_Migration_Script_Base (but also has a few legacy arrays in there - which should probably be ignored)
 	 */
-	public function get_data_migrations_ran(){
-		if( ! $this->_data_migrations_ran ){
+	public function get_data_migrations_ran() {
+		if ( ! $this->_data_migrations_ran) {
 			//setup autoloaders for each of the scripts in there
 			$this->get_all_data_migration_scripts_available();
-			$data_migrations_options = $this->get_all_migration_script_options();//get_option(EE_Data_Migration_Manager::data_migrations_option_name,get_option('espresso_data_migrations',array()));
+			$data_migrations_options = $this->get_all_migration_script_options(); //get_option(EE_Data_Migration_Manager::data_migrations_option_name,get_option('espresso_data_migrations',array()));
 
 			$data_migrations_ran = array();
 			//convert into data migration script classes where possible
-			foreach($data_migrations_options as $data_migration_option){
-				list($plugin_slug,$version_string) = $this->_get_plugin_slug_and_version_string_from_dms_option_name($data_migration_option['option_name']);
+			foreach ($data_migrations_options as $data_migration_option) {
+				list($plugin_slug, $version_string) = $this->_get_plugin_slug_and_version_string_from_dms_option_name($data_migration_option['option_name']);
 
-				try{
-					$class = $this->_get_dms_class_from_wp_option($data_migration_option['option_name'],$data_migration_option['option_value']);
+				try {
+					$class = $this->_get_dms_class_from_wp_option($data_migration_option['option_name'], $data_migration_option['option_value']);
 					$data_migrations_ran[$plugin_slug][$version_string] = $class;
 					//ok so far THIS is the 'last-ran-script'... unless we find another on next iteration
 					$this->_last_ran_script = $class;
-					if( ! $class->is_completed()){
+					if ( ! $class->is_completed()) {
 						//sometimes we also like to know which was the last incomplete script (or if there are any at all)
 						$this->_last_ran_incomplete_script = $class;
 					}
-				}catch(EE_Error $e){
+				} catch (EE_Error $e) {
 					//ok so its not a DMS. We'll just keep it, although other code will need to expect non-DMSs
 					$data_migrations_ran[$plugin_slug][$version_string] = maybe_unserialize($data_migration_option['option_value']);
 				}
 			}
 			//so here the array of $data_migrations_ran is actually a mix of classes and a few legacy arrays
 			$this->_data_migrations_ran = $data_migrations_ran;
-			 if ( ! $this->_data_migrations_ran || ! is_array($this->_data_migrations_ran) ){
+			 if ( ! $this->_data_migrations_ran || ! is_array($this->_data_migrations_ran)) {
 				$this->_data_migrations_ran = array();
 			}
 		}
@@ -290,7 +290,7 @@ 
 	 * @param        $new_table
 	 * @return mixed string or int
 	 */
-	public function get_mapping_new_pk( $script_name, $old_table, $old_pk, $new_table){
+	public function get_mapping_new_pk($script_name, $old_table, $old_pk, $new_table) {
 		$script = EE_Registry::instance()->load_dms($script_name);
 		$mapping = $script->get_mapping_new_pk($old_table, $old_pk, $new_table);
 		return $mapping;
@@ -301,9 +301,9 @@ 
 	 * option returned in this array is the most-recently ran DMS option
 	 * @return array
 	 */
-	 public function get_all_migration_script_options(){
+	 public function get_all_migration_script_options() {
 		global $wpdb;
-		return $wpdb->get_results("SELECT * FROM {$wpdb->options} WHERE option_name like '".EE_Data_Migration_Manager::data_migration_script_option_prefix."%' ORDER BY option_id ASC",ARRAY_A);
+		return $wpdb->get_results("SELECT * FROM {$wpdb->options} WHERE option_name like '".EE_Data_Migration_Manager::data_migration_script_option_prefix."%' ORDER BY option_id ASC", ARRAY_A);
 	}
 
 	/**
@@ -311,8 +311,8 @@ 
 	 * @return array where each value is the full folder path of a folder containing data migration scripts, WITH slashes at the end of the
 	 * folder name.
 	 */
-	public function get_data_migration_script_folders(){
-		return  apply_filters( 'FHEE__EE_Data_Migration_Manager__get_data_migration_script_folders',array(EE_CORE.'data_migration_scripts') );
+	public function get_data_migration_script_folders() {
+		return  apply_filters('FHEE__EE_Data_Migration_Manager__get_data_migration_script_folders', array(EE_CORE.'data_migration_scripts'));
 	}
 
 	/**
@@ -324,11 +324,11 @@ 
 	 * }
 	 * @throws EE_Error
 	 */
-	public function script_migrates_to_version($migration_script_name){
+	public function script_migrates_to_version($migration_script_name) {
 		$dms_info = $this->parse_dms_classname($migration_script_name);
 		return array(
-			'slug'=> $dms_info[ 'slug' ],
-			'version'=> $dms_info[ 'major_version' ] . "." . $dms_info[ 'minor_version' ] . "." . $dms_info[ 'micro_version' ] );
+			'slug'=> $dms_info['slug'],
+			'version'=> $dms_info['major_version'].".".$dms_info['minor_version'].".".$dms_info['micro_version'] );
 	}
 
 	/**
@@ -337,13 +337,13 @@ 
 	 * @return array with keys 'slug','major_version','minor_version', and 'micro_version' (the last 3 are ints)
 	 * @throws EE_Error
 	 */
-	public function parse_dms_classname($classname){
+	public function parse_dms_classname($classname) {
 		$matches = array();
-		preg_match('~EE_DMS_(.*)_([0-9]*)_([0-9]*)_([0-9]*)~',$classname,$matches);
-		if( ! $matches || ! (isset($matches[1]) && isset($matches[2]) && isset($matches[3]))){
-				throw new EE_Error(sprintf(__("%s is not a valid Data Migration Script. The classname should be like EE_DMS_w_x_y_z, where w is either 'Core' or the slug of an addon and x, y and z are numbers, ", "event_espresso"),$classname));
+		preg_match('~EE_DMS_(.*)_([0-9]*)_([0-9]*)_([0-9]*)~', $classname, $matches);
+		if ( ! $matches || ! (isset($matches[1]) && isset($matches[2]) && isset($matches[3]))) {
+				throw new EE_Error(sprintf(__("%s is not a valid Data Migration Script. The classname should be like EE_DMS_w_x_y_z, where w is either 'Core' or the slug of an addon and x, y and z are numbers, ", "event_espresso"), $classname));
 		}
-		return array('slug'=>$matches[1],'major_version'=>intval($matches[2]),'minor_version'=>intval($matches[3]),'micro_version'=>intval($matches[4]));
+		return array('slug'=>$matches[1], 'major_version'=>intval($matches[2]), 'minor_version'=>intval($matches[3]), 'micro_version'=>intval($matches[4]));
 	}
 	/**
 	 * Ensures that the option indicating the current DB version is set. This should only be
@@ -352,33 +352,33 @@ 
 	 * to 4.1.x.
 	 * @return string of current db state
 	 */
-	public function ensure_current_database_state_is_set(){
-		$espresso_db_core_updates = get_option( 'espresso_db_update', array() );
+	public function ensure_current_database_state_is_set() {
+		$espresso_db_core_updates = get_option('espresso_db_update', array());
 		$db_state = get_option(EE_Data_Migration_Manager::current_database_state);
-		if( ! $db_state ){
+		if ( ! $db_state) {
 			//mark the DB as being in the state as the last version in there.
 			//this is done to trigger maintenance mode and do data migration scripts
 			//if the admin installed this version of EE over 3.1.x or 4.0.x
 			//otherwise, the normal maintenance mode code is fine
 			$previous_versions_installed = array_keys($espresso_db_core_updates);
 			$previous_version_installed = end($previous_versions_installed);
-			if(version_compare('4.1.0', $previous_version_installed)){
+			if (version_compare('4.1.0', $previous_version_installed)) {
 				//last installed version was less than 4.1
 				//so we want the data migrations to happen. SO, we're going to say the DB is at that state
 //				echo "4.1.0 is greater than $previous_version_installed! update the option";
 				$db_state = array('Core'=>$previous_version_installed);
-			}else{
+			} else {
 //					echo "4.1.0 is SMALLER than $previous_version_installed";
 					$db_state = array('Core'=>EVENT_ESPRESSO_VERSION);
 			}
-			update_option(EE_Data_Migration_Manager::current_database_state,$db_state);
+			update_option(EE_Data_Migration_Manager::current_database_state, $db_state);
 		}
 		//in 4.1, $db_state would have only been a simple string like '4.1.0',
 		//but in 4.2+ it should be an array with at least key 'Core' and the value of that plugin's
 		//db, and possibly other keys for other addons like 'Calendar','Permissions',etc
-		if( ! is_array($db_state)){
+		if ( ! is_array($db_state)) {
 			$db_state = array('Core'=>$db_state);
-			update_option(EE_Data_Migration_Manager::current_database_state,$db_state);
+			update_option(EE_Data_Migration_Manager::current_database_state, $db_state);
 		}
 		return $db_state;
 	}
@@ -389,7 +389,7 @@ 
 	 * or they don't apply), returns an empty array
 	 * @return EE_Data_Migration_Script_Base[]
 	 */
-	public function check_for_applicable_data_migration_scripts(){
+	public function check_for_applicable_data_migration_scripts() {
 		//get the option describing what options have already run
 		$scripts_ran = $this->get_data_migrations_ran();
 		//$scripts_ran = array('4.1.0.core'=>array('monkey'=>null));
@@ -402,62 +402,62 @@ 
 		$iteration = 0;
 		$next_database_state_to_consider = $current_database_state;
 		$theoretical_database_state = NULL;
-		do{
+		do {
 			//the next state after the currently-considered one will start off looking the same as the current, but we may make additions...
 			$theoretical_database_state = $next_database_state_to_consider;
 			//the next db state to consider is "what would the DB be like had we run all the scripts we found that applied last time?)
-			foreach($script_class_and_filepaths_available as $classname => $filepath){
+			foreach ($script_class_and_filepaths_available as $classname => $filepath) {
 
 				$migrates_to_version = $this->script_migrates_to_version($classname);
-				$script_converts_plugin_slug = $migrates_to_version[ 'slug' ];
-				$script_converts_to_version = $migrates_to_version[ 'version' ];
+				$script_converts_plugin_slug = $migrates_to_version['slug'];
+				$script_converts_to_version = $migrates_to_version['version'];
 				//check if this version script is DONE or not; or if it's never been ran
-				if(		! $scripts_ran ||
+				if ( ! $scripts_ran ||
 						! isset($scripts_ran[$script_converts_plugin_slug]) ||
-						! isset($scripts_ran[$script_converts_plugin_slug][$script_converts_to_version])){
+						! isset($scripts_ran[$script_converts_plugin_slug][$script_converts_to_version])) {
 					//we haven't ran this conversion script before
 					//now check if it applies... note that we've added an autoloader for it on get_all_data_migration_scripts_available
-					$script = new $classname( $this->_get_table_manager(), $this->_get_table_analysis() );
+					$script = new $classname($this->_get_table_manager(), $this->_get_table_analysis());
 					/* @var $script EE_Data_Migration_Script_Base */
 					$can_migrate = $script->can_migrate_from_version($theoretical_database_state);
-					if($can_migrate){
+					if ($can_migrate) {
 						$script_classes_that_should_run_per_iteration[$iteration][$script->priority()][] = $script;
 						$migrates_to_version = $script->migrates_to_version();
-						$next_database_state_to_consider[ $migrates_to_version[ 'slug' ] ] = $migrates_to_version[ 'version' ];
+						$next_database_state_to_consider[$migrates_to_version['slug']] = $migrates_to_version['version'];
 						unset($script_class_and_filepaths_available[$classname]);
 					}
-				} elseif($scripts_ran[$script_converts_plugin_slug][$script_converts_to_version] instanceof EE_Data_Migration_Script_Base){
+				} elseif ($scripts_ran[$script_converts_plugin_slug][$script_converts_to_version] instanceof EE_Data_Migration_Script_Base) {
 					//this script has been ran, or at least started
 					$script = $scripts_ran[$script_converts_plugin_slug][$script_converts_to_version];
-					if( $script->get_status() != self::status_completed){
+					if ($script->get_status() != self::status_completed) {
 						//this script is already underway... keep going with it
 						$script_classes_that_should_run_per_iteration[$iteration][$script->priority()][] = $script;
 						$migrates_to_version = $script->migrates_to_version();
-						$next_database_state_to_consider[ $migrates_to_version[ 'slug' ] ] = $migrates_to_version[ 'version' ];
+						$next_database_state_to_consider[$migrates_to_version['slug']] = $migrates_to_version['version'];
 						unset($script_class_and_filepaths_available[$classname]);
-					}else{
+					} else {
 						//it must have a status that indicates it has finished, so we don't want to try and run it again
 					}
-				}else{
+				} else {
 					//it exists but it's not  a proper data migration script
 					//maybe the script got renamed? or was simply removed from EE?
 					//either way, its certainly not runnable!
 				}
 			}
 			$iteration++;
-		}while( $next_database_state_to_consider != $theoretical_database_state && $iteration<6);
+		}while ($next_database_state_to_consider != $theoretical_database_state && $iteration < 6);
 		//ok we have all the scripts that should run, now let's make them into flat array
 		$scripts_that_should_run = array();
-		foreach($script_classes_that_should_run_per_iteration as $scripts_at_priority){
+		foreach ($script_classes_that_should_run_per_iteration as $scripts_at_priority) {
 			ksort($scripts_at_priority);
-			foreach($scripts_at_priority as $scripts){
-				foreach($scripts as $script){
+			foreach ($scripts_at_priority as $scripts) {
+				foreach ($scripts as $script) {
 					$scripts_that_should_run[get_class($script)] = $script;
 				}
 			}
 		}
 
-		do_action( 'AHEE__EE_Data_Migration_Manager__check_for_applicable_data_migration_scripts__scripts_that_should_run', $scripts_that_should_run );
+		do_action('AHEE__EE_Data_Migration_Manager__check_for_applicable_data_migration_scripts__scripts_that_should_run', $scripts_that_should_run);
 		return $scripts_that_should_run;
 	}
 
@@ -471,14 +471,14 @@ 
 	 * @param bool $include_completed_scripts
 	 * @return EE_Data_Migration_Script_Base
 	 */
-	public function get_last_ran_script($include_completed_scripts = false){
+	public function get_last_ran_script($include_completed_scripts = false) {
 		//make sure we've setup the class properties _last_ran_script and _last_ran_incomplete_script
-		if( ! $this->_data_migrations_ran){
+		if ( ! $this->_data_migrations_ran) {
 			$this->get_data_migrations_ran();
 		}
-		if($include_completed_scripts){
+		if ($include_completed_scripts) {
 			return $this->_last_ran_script;
-		}else{
+		} else {
 			return $this->_last_ran_incomplete_script;
 		}
 	}
@@ -501,19 +501,19 @@ 
 	 * 		@type string $message string describing what was done during this step
 	 * }
 	 */
-	public function migration_step( $step_size = 0 ){
+	public function migration_step($step_size = 0) {
 
 		//bandaid fix for issue https://events.codebasehq.com/projects/event-espresso/tickets/7535
-		if ( class_exists( 'EE_CPT_Strategy' ) ) {
-			remove_action( 'pre_get_posts', array( EE_CPT_Strategy::instance(), 'pre_get_posts' ), 5 );
+		if (class_exists('EE_CPT_Strategy')) {
+			remove_action('pre_get_posts', array(EE_CPT_Strategy::instance(), 'pre_get_posts'), 5);
 		}
 
-		try{
+		try {
 			$currently_executing_script = $this->get_last_ran_script();
-			if( ! $currently_executing_script){
+			if ( ! $currently_executing_script) {
 				//Find the next script that needs to execute
 				$scripts = $this->check_for_applicable_data_migration_scripts();
-				if( ! $scripts ){
+				if ( ! $scripts) {
 					//huh, no more scripts to run... apparently we're done!
 					//but dont forget to make sure initial data is there
 					//we should be good to allow them to exit maintenance mode now
@@ -534,18 +534,18 @@ 
 				//and add to the array/wp option showing the scripts ran
 //				$this->_data_migrations_ran[$this->script_migrates_to_version(get_class($currently_executing_script))] = $currently_executing_script;
 				$migrates_to = $this->script_migrates_to_version(get_class($currently_executing_script));
-				$plugin_slug = $migrates_to[ 'slug' ];
-				$version = $migrates_to[ 'version' ];
+				$plugin_slug = $migrates_to['slug'];
+				$version = $migrates_to['version'];
 				$this->_data_migrations_ran[$plugin_slug][$version] = $currently_executing_script;
 			}
 			$current_script_name = get_class($currently_executing_script);
-		}catch(Exception $e){
+		} catch (Exception $e) {
 			//an exception occurred while trying to get migration scripts
 
-			$message =  sprintf( __("Error Message: %sStack Trace:%s", "event_espresso"), $e->getMessage() . '<br>', $e->getTraceAsString() );
+			$message = sprintf(__("Error Message: %sStack Trace:%s", "event_espresso"), $e->getMessage().'<br>', $e->getTraceAsString());
 			//record it on the array of data migration scripts ran. This will be overwritten next time we try and try to run data migrations
 			//but that's ok-- it's just an FYI to support that we couldn't even run any data migrations
-			$this->add_error_to_migrations_ran(sprintf(__("Could not run data migrations because: %s", "event_espresso"),$message));
+			$this->add_error_to_migrations_ran(sprintf(__("Could not run data migrations because: %s", "event_espresso"), $message));
 			return array(
 				'records_to_migrate'=>1,
 				'records_migrated'=>0,
@@ -555,16 +555,16 @@ 
 			);
 		}
 		//ok so we definitely have a data migration script
-		try{
+		try {
 			//how big of a bite do we want to take? Allow users to easily override via their wp-config
-			if( ! absint( $step_size ) > 0 ){
-				$step_size = defined( 'EE_MIGRATION_STEP_SIZE' ) && absint( EE_MIGRATION_STEP_SIZE ) ? EE_MIGRATION_STEP_SIZE : EE_Data_Migration_Manager::step_size;
+			if ( ! absint($step_size) > 0) {
+				$step_size = defined('EE_MIGRATION_STEP_SIZE') && absint(EE_MIGRATION_STEP_SIZE) ? EE_MIGRATION_STEP_SIZE : EE_Data_Migration_Manager::step_size;
 			}
 			//do what we came to do!
 			$currently_executing_script->migration_step($step_size);
 			//can we wrap it up and verify default data?
 			$init_dbs = false;
-			switch($currently_executing_script->get_status()){
+			switch ($currently_executing_script->get_status()) {
 				case EE_Data_Migration_Manager::status_continue:
 					$response_array = array(
 						'records_to_migrate'=>$currently_executing_script->count_records_to_migrate(),
@@ -576,16 +576,16 @@ 
 				case EE_Data_Migration_Manager::status_completed:
 					//ok so THAT script has completed
 					$this->update_current_database_state_to($this->script_migrates_to_version($current_script_name));
-					$response_array =  array(
+					$response_array = array(
 							'records_to_migrate'=>$currently_executing_script->count_records_to_migrate(),
 							'records_migrated'=>$currently_executing_script->count_records_migrated(),
 							'status'=> EE_Data_Migration_Manager::status_completed,
 							'message'=>$currently_executing_script->get_feedback_message(),
-							'script'=> sprintf(__("%s Completed",'event_espresso'),$currently_executing_script->pretty_name())
+							'script'=> sprintf(__("%s Completed", 'event_espresso'), $currently_executing_script->pretty_name())
 						);
 					//check if there are any more after this one.
 					$scripts_remaining = $this->check_for_applicable_data_migration_scripts();
-					if( ! $scripts_remaining ){
+					if ( ! $scripts_remaining) {
 						//we should be good to allow them to exit maintenance mode now
 						EE_Maintenance_Mode::instance()->set_maintenance_level(intval(EE_Maintenance_Mode::level_0_not_in_maintenance));
 						////huh, no more scripts to run... apparently we're done!
@@ -599,39 +599,39 @@ 
 						'records_to_migrate'=>$currently_executing_script->count_records_to_migrate(),
 						'records_migrated'=>$currently_executing_script->count_records_migrated(),
 						'status'=> $currently_executing_script->get_status(),
-						'message'=>  sprintf(__("Minor errors occurred during %s: %s", "event_espresso"), $currently_executing_script->pretty_name(), implode(", ",$currently_executing_script->get_errors())),
+						'message'=>  sprintf(__("Minor errors occurred during %s: %s", "event_espresso"), $currently_executing_script->pretty_name(), implode(", ", $currently_executing_script->get_errors())),
 						'script'=>$currently_executing_script->pretty_name()
 					);
 					break;
 			}
-		}catch(Exception $e){
+		} catch (Exception $e) {
 			//ok so some exception was thrown which killed the data migration script
 			//double-check we have a real script
-			if($currently_executing_script instanceof EE_Data_Migration_Script_Base){
+			if ($currently_executing_script instanceof EE_Data_Migration_Script_Base) {
 				$script_name = $currently_executing_script->pretty_name();
 				$currently_executing_script->set_broken();
 				$currently_executing_script->add_error($e->getMessage());
-			}else{
+			} else {
 				$script_name = __("Error getting Migration Script", "event_espresso");
 			}
 			$response_array = array(
 				'records_to_migrate'=>1,
 				'records_migrated'=>0,
 				'status'=>self::status_fatal_error,
-				'message'=>  sprintf(__("A fatal error occurred during the migration: %s", "event_espresso"),$e->getMessage()),
+				'message'=>  sprintf(__("A fatal error occurred during the migration: %s", "event_espresso"), $e->getMessage()),
 				'script'=>$script_name
 			);
 		}
 		$successful_save = $this->_save_migrations_ran();
-		if($successful_save !== TRUE){
+		if ($successful_save !== TRUE) {
 			//ok so the current wp option didn't save. that's tricky, because we'd like to update it
 			//and mark it as having a fatal error, but remember- WE CAN'T SAVE THIS WP OPTION!
 			//however, if we throw an exception, and return that, then the next request
 			//won't have as much info in it, and it may be able to save
-			throw new EE_Error(sprintf(__("The error '%s' occurred updating the status of the migration. This is a FATAL ERROR, but the error is preventing the system from remembering that. Please contact event espresso support.", "event_espresso"),$successful_save));
+			throw new EE_Error(sprintf(__("The error '%s' occurred updating the status of the migration. This is a FATAL ERROR, but the error is preventing the system from remembering that. Please contact event espresso support.", "event_espresso"), $successful_save));
 		}
 		//if we're all done, initialize EE plugins' default data etc.
-		if( $init_dbs ) {
+		if ($init_dbs) {
 			$this->initialize_db_for_enqueued_ee_plugins();
 		}
 		return $response_array;
@@ -649,23 +649,23 @@ 
 	 * 'message'=>a string, containing any message you want to show to the user. We may decide to split this up into errors, notifications, and successes
 	 * 'script'=>a pretty name of the script currently running
 	 */
-	public function response_to_migration_ajax_request(){
+	public function response_to_migration_ajax_request() {
 //		//start output buffer just to make sure we don't mess up the json
 		ob_start();
-		try{
+		try {
 			$response = $this->migration_step();
-		}catch(Exception $e){
+		} catch (Exception $e) {
 			$response = array(
 				'records_to_migrate'=>0,
 				'records_migrated'=>0,
 				'status'=> EE_Data_Migration_Manager::status_fatal_error,
-				'message'=> sprintf(__("Unknown fatal error occurred: %s", "event_espresso"),$e->getMessage()),
+				'message'=> sprintf(__("Unknown fatal error occurred: %s", "event_espresso"), $e->getMessage()),
 				'script'=>'Unknown');
 			$this->add_error_to_migrations_ran($e->getMessage()."; Stack trace:".$e->getTraceAsString());
 		}
 		$warnings_etc = @ob_get_contents();
 		ob_end_clean();
-		$response['message'] .=$warnings_etc;
+		$response['message'] .= $warnings_etc;
 		return $response;
 	}
 
@@ -678,14 +678,14 @@ 
 	 * }
 	 * @return void
 	 */
-	public function update_current_database_state_to($slug_and_version = null){
-		if( ! $slug_and_version ){
+	public function update_current_database_state_to($slug_and_version = null) {
+		if ( ! $slug_and_version) {
 			//no version was provided, assume it should be at the current code version
 			$slug_and_version = array('slug' => 'Core', 'version' => espresso_version());
 		}
 		$current_database_state = get_option(self::current_database_state);
-		$current_database_state[ $slug_and_version[ 'slug' ] ]=$slug_and_version[ 'version' ];
-		update_option(self::current_database_state,$current_database_state);
+		$current_database_state[$slug_and_version['slug']] = $slug_and_version['version'];
+		update_option(self::current_database_state, $current_database_state);
 	}
 
 	/**
@@ -696,20 +696,20 @@ 
 	 * }
 	 * @return boolean
 	 */
-	public function database_needs_updating_to( $slug_and_version ) {
+	public function database_needs_updating_to($slug_and_version) {
 
-		$slug = $slug_and_version[ 'slug' ];
-		$version = $slug_and_version[ 'version' ];
+		$slug = $slug_and_version['slug'];
+		$version = $slug_and_version['version'];
 		$current_database_state = get_option(self::current_database_state);
-		if( ! isset( $current_database_state[ $slug ] ) ) {
+		if ( ! isset($current_database_state[$slug])) {
 			return true;
-		}else{
+		} else {
 			//just compare the first 3 parts of version string, eg "4.7.1", not "4.7.1.dev.032" because DBs shouldn't change on nano version changes
-			$version_parts_current_db_state = array_slice( explode('.', $current_database_state[ $slug ] ), 0, 3);
-			$version_parts_of_provided_db_state = array_slice( explode( '.', $version ), 0, 3 );
+			$version_parts_current_db_state = array_slice(explode('.', $current_database_state[$slug]), 0, 3);
+			$version_parts_of_provided_db_state = array_slice(explode('.', $version), 0, 3);
 			$needs_updating = false;
-			foreach($version_parts_current_db_state as $offset => $version_part_in_current_db_state ) {
-				if( $version_part_in_current_db_state < $version_parts_of_provided_db_state[ $offset ] ) {
+			foreach ($version_parts_current_db_state as $offset => $version_part_in_current_db_state) {
+				if ($version_part_in_current_db_state < $version_parts_of_provided_db_state[$offset]) {
 					$needs_updating = true;
 					break;
 				}
@@ -723,29 +723,29 @@ 
 	 * in addons. Has the side effect of adding them for autoloading
 	 * @return array keys are expected classnames, values are their filepaths
 	 */
-	public function get_all_data_migration_scripts_available(){
-		if( ! $this->_data_migration_class_to_filepath_map){
+	public function get_all_data_migration_scripts_available() {
+		if ( ! $this->_data_migration_class_to_filepath_map) {
 			$this->_data_migration_class_to_filepath_map = array();
-			foreach($this->get_data_migration_script_folders() as $folder_path){
-				if($folder_path[count($folder_path-1)] != DS ){
-					$folder_path.= DS;
+			foreach ($this->get_data_migration_script_folders() as $folder_path) {
+				if ($folder_path[count($folder_path - 1)] != DS) {
+					$folder_path .= DS;
 				}
-				$files = glob( $folder_path. '*.dms.php' );
+				$files = glob($folder_path.'*.dms.php');
 
-				if ( empty( $files ) ) {
+				if (empty($files)) {
 					continue;
 				}
 
-				foreach($files as $file){
-					$pos_of_last_slash = strrpos($file,DS);
-					$classname = str_replace(".dms.php","", substr($file, $pos_of_last_slash+1));
-					$migrates_to = $this->script_migrates_to_version( $classname );
-					$slug = $migrates_to[ 'slug' ];
+				foreach ($files as $file) {
+					$pos_of_last_slash = strrpos($file, DS);
+					$classname = str_replace(".dms.php", "", substr($file, $pos_of_last_slash + 1));
+					$migrates_to = $this->script_migrates_to_version($classname);
+					$slug = $migrates_to['slug'];
 					//check that the slug as contained in the DMS is associated with
 					//the slug of an addon or core
-					if( $slug != 'Core' ){
-						if( ! EE_Registry::instance()->get_addon_by_name( $slug ) ) {
-							EE_Error::doing_it_wrong(__FUNCTION__, sprintf( __( 'The data migration script "%s" migrates the "%s" data, but there is no EE addon with that name. There is only: %s. ', 'event_espresso' ),$classname,$slug,implode(",", array_keys( EE_Registry::instance()->get_addons_by_name() ) ) ), '4.3.0.alpha.019' );
+					if ($slug != 'Core') {
+						if ( ! EE_Registry::instance()->get_addon_by_name($slug)) {
+							EE_Error::doing_it_wrong(__FUNCTION__, sprintf(__('The data migration script "%s" migrates the "%s" data, but there is no EE addon with that name. There is only: %s. ', 'event_espresso'), $classname, $slug, implode(",", array_keys(EE_Registry::instance()->get_addons_by_name()))), '4.3.0.alpha.019');
 						}
 					}
 					$this->_data_migration_class_to_filepath_map[$classname] = $file;
@@ -765,7 +765,7 @@ 
 	 * from each addon, and check if they need updating,
 	 * @return boolean
 	 */
-	public function addons_need_updating(){
+	public function addons_need_updating() {
 		return false;
 	}
 	/**
@@ -774,25 +774,25 @@ 
 	 * @param string $error_message
 	 * @throws EE_Error
 	 */
-	public function add_error_to_migrations_ran($error_message){
+	public function add_error_to_migrations_ran($error_message) {
 		//get last-ran migration script
 		global $wpdb;
-		$last_migration_script_option = $wpdb->get_row("SELECT * FROM $wpdb->options WHERE option_name like '".EE_Data_Migration_Manager::data_migration_script_option_prefix."%' ORDER BY option_id DESC LIMIT 1",ARRAY_A);
+		$last_migration_script_option = $wpdb->get_row("SELECT * FROM $wpdb->options WHERE option_name like '".EE_Data_Migration_Manager::data_migration_script_option_prefix."%' ORDER BY option_id DESC LIMIT 1", ARRAY_A);
 
 		$last_ran_migration_script_properties = isset($last_migration_script_option['option_value']) ? maybe_unserialize($last_migration_script_option['option_value']) : null;
 		//now, tread lightly because we're here because a FATAL non-catchable error
 		//was thrown last time when we were trying to run a data migration script
 		//so the fatal error could have happened while getting the migration script
 		//or doing running it...
-		$versions_migrated_to = isset($last_migration_script_option['option_name']) ? str_replace(EE_Data_Migration_Manager::data_migration_script_option_prefix,"",$last_migration_script_option['option_name']) : null;
+		$versions_migrated_to = isset($last_migration_script_option['option_name']) ? str_replace(EE_Data_Migration_Manager::data_migration_script_option_prefix, "", $last_migration_script_option['option_name']) : null;
 
 		//check if it THINKS its a data migration script and especially if it's one that HASN'T finished yet
 		//because if it has finished, then it obviously couldn't be the cause of this error, right? (because its all done)
-		if(isset($last_ran_migration_script_properties['class']) && isset($last_ran_migration_script_properties['_status']) && $last_ran_migration_script_properties['_status'] != self::status_completed){
+		if (isset($last_ran_migration_script_properties['class']) && isset($last_ran_migration_script_properties['_status']) && $last_ran_migration_script_properties['_status'] != self::status_completed) {
 			//ok then just add this error to its list of errors
 			$last_ran_migration_script_properties['_errors'][] = $error_message;
 			$last_ran_migration_script_properties['_status'] = self::status_fatal_error;
-		}else{
+		} else {
 			//so we don't even know which script was last running
 			//use the data migration error stub, which is designed specifically for this type of thing
 			$general_migration_error = new EE_DMS_Unknown_1_0_0();
@@ -802,39 +802,39 @@ 
 			$versions_migrated_to = 'Unknown.1.0.0';
 			//now just to make sure appears as last (in case the were previously a fatal error like this)
 			//delete the old one
-			delete_option( self::data_migration_script_option_prefix . $versions_migrated_to );
+			delete_option(self::data_migration_script_option_prefix.$versions_migrated_to);
 		}
-		update_option(self::data_migration_script_option_prefix.$versions_migrated_to,$last_ran_migration_script_properties);
+		update_option(self::data_migration_script_option_prefix.$versions_migrated_to, $last_ran_migration_script_properties);
 
 	}
 	/**
 	 * saves what data migrations have ran to the database
 	 * @return mixed TRUE if successfully saved migrations ran, string if an error occurred
 	 */
-	protected function _save_migrations_ran(){
-		if($this->_data_migrations_ran == null){
+	protected function _save_migrations_ran() {
+		if ($this->_data_migrations_ran == null) {
 			$this->get_data_migrations_ran();
 		}
 		//now, we don't want to save actual classes to the DB because that's messy
 		$successful_updates = true;
-		foreach($this->_data_migrations_ran as $plugin_slug => $migrations_ran_for_plugin){
-			foreach($migrations_ran_for_plugin as $version_string => $array_or_migration_obj){
+		foreach ($this->_data_migrations_ran as $plugin_slug => $migrations_ran_for_plugin) {
+			foreach ($migrations_ran_for_plugin as $version_string => $array_or_migration_obj) {
 	//			echo "saving migration script to $version_string<br>";
 				$plugin_slug_for_use_in_option_name = $plugin_slug.".";
 				$option_name = self::data_migration_script_option_prefix.$plugin_slug_for_use_in_option_name.$version_string;
 				$old_option_value = get_option($option_name);
-				if($array_or_migration_obj instanceof EE_Data_Migration_Script_Base){
+				if ($array_or_migration_obj instanceof EE_Data_Migration_Script_Base) {
 					$script_array_for_saving = $array_or_migration_obj->properties_as_array();
-					if( $old_option_value != $script_array_for_saving){
-						$successful_updates = update_option($option_name,$script_array_for_saving);
+					if ($old_option_value != $script_array_for_saving) {
+						$successful_updates = update_option($option_name, $script_array_for_saving);
 					}
-				}else{//we don't know what this array-thing is. So just save it as-is
+				} else {//we don't know what this array-thing is. So just save it as-is
 	//				$array_of_migrations[$version_string] = $array_or_migration_obj;
-					if($old_option_value != $array_or_migration_obj){
-						$successful_updates = update_option($option_name,$array_or_migration_obj);
+					if ($old_option_value != $array_or_migration_obj) {
+						$successful_updates = update_option($option_name, $array_or_migration_obj);
 					}
 				}
-				if( ! $successful_updates ){
+				if ( ! $successful_updates) {
 					global $wpdb;
 					return $wpdb->last_error;
 				}
@@ -858,17 +858,17 @@ 
 	 * @return EE_Data_Migration_Script_Base
 	 * @throws EE_Error
 	 */
-	function _instantiate_script_from_properties_array($properties_array){
-		if( ! isset($properties_array['class'])){
-			throw new EE_Error(sprintf(__("Properties array  has no 'class' properties. Here's what it has: %s", "event_espresso"),implode(",",$properties_array)));
+	function _instantiate_script_from_properties_array($properties_array) {
+		if ( ! isset($properties_array['class'])) {
+			throw new EE_Error(sprintf(__("Properties array  has no 'class' properties. Here's what it has: %s", "event_espresso"), implode(",", $properties_array)));
 		}
 		$class_name = $properties_array['class'];
-		if( ! class_exists($class_name)){
-			throw new EE_Error(sprintf(__("There is no migration script named %s", "event_espresso"),$class_name));
+		if ( ! class_exists($class_name)) {
+			throw new EE_Error(sprintf(__("There is no migration script named %s", "event_espresso"), $class_name));
 		}
 		$class = new $class_name;
-		if( ! $class instanceof EE_Data_Migration_Script_Base){
-			throw new EE_Error(sprintf(__("Class '%s' is supposed to be a migration script. Its not, its a '%s'", "event_espresso"),$class_name,get_class($class)));
+		if ( ! $class instanceof EE_Data_Migration_Script_Base) {
+			throw new EE_Error(sprintf(__("Class '%s' is supposed to be a migration script. Its not, its a '%s'", "event_espresso"), $class_name, get_class($class)));
 		}
 		$class->instantiate_from_array_of_properties($properties_array);
 		return $class;
@@ -880,25 +880,25 @@ 
 	 * @param string $plugin_slug the slug for the ee plugin we are searching for. Default is 'Core'
 	 * @return string
 	 */
-	public function get_most_up_to_date_dms($plugin_slug = 'Core'){
+	public function get_most_up_to_date_dms($plugin_slug = 'Core') {
 		$class_to_filepath_map = $this->get_all_data_migration_scripts_available();
 		$most_up_to_date_dms_classname = NULL;
-		foreach($class_to_filepath_map as $classname => $filepath){
-			if($most_up_to_date_dms_classname === NULL){
+		foreach ($class_to_filepath_map as $classname => $filepath) {
+			if ($most_up_to_date_dms_classname === NULL) {
 				$migrates_to = $this->script_migrates_to_version($classname);
-				$this_plugin_slug = $migrates_to[ 'slug' ];
+				$this_plugin_slug = $migrates_to['slug'];
 //				$version_string = $migrates_to[ 'version' ];
 //				$details = $this->parse_dms_classname($classname);
-				if($this_plugin_slug == $plugin_slug){
+				if ($this_plugin_slug == $plugin_slug) {
 					//if it's for core, it wins
 					$most_up_to_date_dms_classname = $classname;
 				}
 				//if it wasn't for core, we must keep searching for one that is!
 				continue;
-			}else{
-				$champion_migrates_to= $this->script_migrates_to_version($most_up_to_date_dms_classname);
+			} else {
+				$champion_migrates_to = $this->script_migrates_to_version($most_up_to_date_dms_classname);
 				$contender_migrates_to = $this->script_migrates_to_version($classname);
-				if($contender_migrates_to[ 'slug' ] == $plugin_slug && version_compare($champion_migrates_to[ 'version' ], $contender_migrates_to[ 'version' ], '<')){
+				if ($contender_migrates_to['slug'] == $plugin_slug && version_compare($champion_migrates_to['version'], $contender_migrates_to['version'], '<')) {
 					//so the contenders version is higher and its for Core
 					$most_up_to_date_dms_classname = $classname;
 				}
@@ -918,11 +918,11 @@ 
 	 * @param string $plugin_slug like 'Core', 'Mailchimp', 'Calendar', etc
 	 * @return EE_Data_Migration_Script_Base
 	 */
-	public function get_migration_ran( $version, $plugin_slug = 'Core' ) {
+	public function get_migration_ran($version, $plugin_slug = 'Core') {
 		$migrations_ran = $this->get_data_migrations_ran();
-		if( isset( $migrations_ran[ $plugin_slug ] ) && isset( $migrations_ran[ $plugin_slug ][ $version ] ) ){
-			return $migrations_ran[ $plugin_slug ][ $version ];
-		}else{
+		if (isset($migrations_ran[$plugin_slug]) && isset($migrations_ran[$plugin_slug][$version])) {
+			return $migrations_ran[$plugin_slug][$version];
+		} else {
 			return NULL;
 		}
 	}
@@ -934,20 +934,20 @@ 
 	 * @return bool
 	 * @throws \EE_Error
 	 */
-	public function reattempt(){
+	public function reattempt() {
 		//find if the last-ran script was borked
 		//set it as being non-borked (we shouldn't ever get DMSs that we don't recognize)
 		//add an 'error' saying that we attempted to reset
 		//does it have a stage that was borked too? if so make it no longer borked
 		//add an 'error' saying we attempted to reset
 		$last_ran_script = $this->get_last_ran_script();
-		if( $last_ran_script instanceof EE_DMS_Unknown_1_0_0 ){
+		if ($last_ran_script instanceof EE_DMS_Unknown_1_0_0) {
 			//if it was an error DMS, just mark it as complete (if another error occurs it will overwrite it)
 			$last_ran_script->set_completed();
-		}elseif( $last_ran_script instanceof EE_Data_Migration_Script_Base ) {
+		}elseif ($last_ran_script instanceof EE_Data_Migration_Script_Base) {
 			$last_ran_script->reattempt();
-		}else{
-			throw new EE_Error( sprintf( __( 'Unable to reattempt the last ran migration script because it was not a valid migration script. || It was %s', 'event_espresso' ), print_r( $last_ran_script, true ) ) );
+		} else {
+			throw new EE_Error(sprintf(__('Unable to reattempt the last ran migration script because it was not a valid migration script. || It was %s', 'event_espresso'), print_r($last_ran_script, true)));
 		}
 		return $this->_save_migrations_ran();
 	}
@@ -957,19 +957,19 @@ 
 	 * @param string $plugin_slug like 'Core', 'Mailchimp', 'Calendar', etc
 	 * @return boolean
 	 */
-	public function migration_has_ran( $version, $plugin_slug = 'Core' ) {
-		return $this->get_migration_ran( $version, $plugin_slug ) !== NULL;
+	public function migration_has_ran($version, $plugin_slug = 'Core') {
+		return $this->get_migration_ran($version, $plugin_slug) !== NULL;
 	}
 	/**
 	 * Enqueues this ee plugin to have its data initialized
 	 * @param string $plugin_slug either 'Core' or EE_Addon::name()'s return value
 	 */
-	public function enqueue_db_initialization_for( $plugin_slug ) {
+	public function enqueue_db_initialization_for($plugin_slug) {
 		$queue = $this->get_db_initialization_queue();
-		if( ! in_array( $plugin_slug, $queue ) ) {
+		if ( ! in_array($plugin_slug, $queue)) {
 			$queue[] = $plugin_slug;
 		}
-		update_option( self::db_init_queue_option_name, $queue );
+		update_option(self::db_init_queue_option_name, $queue);
 	}
 	/**
 	 * Calls EE_Addon::initialize_db_if_no_migrations_required() on each addon
@@ -979,26 +979,26 @@ 
 	public function initialize_db_for_enqueued_ee_plugins() {
 //		EEH_Debug_Tools::instance()->start_timer( 'initialize_db_for_enqueued_ee_plugins' );
 		$queue = $this->get_db_initialization_queue();
-		foreach( $queue as $plugin_slug ) {
-			$most_up_to_date_dms = $this->get_most_up_to_date_dms( $plugin_slug );
-			if( ! $most_up_to_date_dms ) {
+		foreach ($queue as $plugin_slug) {
+			$most_up_to_date_dms = $this->get_most_up_to_date_dms($plugin_slug);
+			if ( ! $most_up_to_date_dms) {
 				//if there is NO DMS for this plugin, obviously there's no schema to verify anyways
 				$verify_db = false;
-			}else{
-				$most_up_to_date_dms_migrates_to = $this->script_migrates_to_version( $most_up_to_date_dms );
-				$verify_db = $this->database_needs_updating_to( $most_up_to_date_dms_migrates_to );
+			} else {
+				$most_up_to_date_dms_migrates_to = $this->script_migrates_to_version($most_up_to_date_dms);
+				$verify_db = $this->database_needs_updating_to($most_up_to_date_dms_migrates_to);
 			}
-			if( $plugin_slug == 'Core' ){
+			if ($plugin_slug == 'Core') {
 				EE_System::instance()->initialize_db_if_no_migrations_required(
 						false,
 						$verify_db
 					);
-			}else{
+			} else {
 				//just loop through the addons to make sure their database is setup
-				foreach( EE_Registry::instance()->addons as $addon ) {
-					if( $addon->name() == $plugin_slug ) {
+				foreach (EE_Registry::instance()->addons as $addon) {
+					if ($addon->name() == $plugin_slug) {
 
-						$addon->initialize_db_if_no_migrations_required( $verify_db );
+						$addon->initialize_db_if_no_migrations_required($verify_db);
 						break;
 					}
 				}
@@ -1008,7 +1008,7 @@ 
 //		EEH_Debug_Tools::instance()->show_times();
 		//because we just initialized the DBs for the enqueued ee plugins
 		//we don't need to keep remembering which ones needed to be initialized
-		delete_option( self::db_init_queue_option_name );
+		delete_option(self::db_init_queue_option_name);
 	}
 
 	/**
@@ -1017,8 +1017,8 @@ 
 	 * 'Core', or the return value of EE_Addon::name() for an addon
 	 * @return array
 	 */
-	public function get_db_initialization_queue(){
-		return get_option ( self::db_init_queue_option_name, array() );
+	public function get_db_initialization_queue() {
+		return get_option(self::db_init_queue_option_name, array());
 	}
 	
 	/**
@@ -1027,13 +1027,13 @@ 
 	 * @throws \EE_Error
 	 */
 	protected function _get_table_analysis() {
-		if( $this->_table_analysis instanceof TableAnalysis ) {
+		if ($this->_table_analysis instanceof TableAnalysis) {
 			return $this->_table_analysis;
 		} else {
 			throw new \EE_Error( 
 				sprintf( 
-					__( 'Table analysis class on class %1$s is not set properly.', 'event_espresso'), 
-					get_class( $this ) 
+					__('Table analysis class on class %1$s is not set properly.', 'event_espresso'), 
+					get_class($this) 
 				) 
 			);
 		}
@@ -1045,13 +1045,13 @@ 
 	 * @throws \EE_Error
 	 */
 	protected function _get_table_manager() {
-		if( $this->_table_manager instanceof TableManager ) {
+		if ($this->_table_manager instanceof TableManager) {
 			return $this->_table_manager;
 		} else {
 			throw new \EE_Error( 
 				sprintf( 
-					__( 'Table manager class on class %1$s is not set properly.', 'event_espresso'), 
-					get_class( $this ) 
+					__('Table manager class on class %1$s is not set properly.', 'event_espresso'), 
+					get_class($this) 
 				) 
 			);
 		}

core/data_migration_scripts/EE_Data_Migration_Class_Base.core.php

Spacing +52 added lines, -52 removed lines

@@ -20,7 +20,7 @@ 
 
 
 
-abstract class EE_Data_Migration_Class_Base{
+abstract class EE_Data_Migration_Class_Base {
 
 	/**
 	 * @var $records_to_migrate int count of all that have been migrated
@@ -72,7 +72,7 @@ 
 	 * @param TableManager  $table_manager
 	 * @param TableAnalysis $table_analysis
 	 */
-	public function __construct( TableManager $table_manager = null, TableAnalysis $table_analysis = null ){
+	public function __construct(TableManager $table_manager = null, TableAnalysis $table_analysis = null) {
 		$this->_table_manager = $table_manager;
 		$this->_table_analysis = $table_analysis;
 		$this->set_status(EE_Data_Migration_Manager::status_continue);
@@ -85,9 +85,9 @@ 
 	 * @throws EE_Error
 	 * @return string
 	 */
-	public function pretty_name(){
-		if($this->_pretty_name === null){
-			throw new EE_Error(sprintf(__("Please give a pretty name to the migration script stage %s by assigning the property _pretty_name in the constructor", "event_espresso"),get_class($this)));
+	public function pretty_name() {
+		if ($this->_pretty_name === null) {
+			throw new EE_Error(sprintf(__("Please give a pretty name to the migration script stage %s by assigning the property _pretty_name in the constructor", "event_espresso"), get_class($this)));
 		}
 		return $this->_pretty_name;
 	}
@@ -95,8 +95,8 @@ 
 	 *
 	 * @return int
 	 */
-	public function count_records_to_migrate(){
-		if( $this->_records_to_migrate == null){
+	public function count_records_to_migrate() {
+		if ($this->_records_to_migrate == null) {
 			$this->_records_to_migrate = $this->_count_records_to_migrate();
 		}
 		return $this->_records_to_migrate;
@@ -116,9 +116,9 @@ 
 	 * @return string one of EE_Data_Migration_Manager::status_* constants
 	 * @throws EE_Error
 	 */
-	public function get_status(){
-		if($this->_status === null){
-			throw new EE_Error(sprintf(__("Trying to get status of Migration class %s, but it has not been initialized yet. It should be set in the constructor.", "event_espresso"),get_class($this)));
+	public function get_status() {
+		if ($this->_status === null) {
+			throw new EE_Error(sprintf(__("Trying to get status of Migration class %s, but it has not been initialized yet. It should be set in the constructor.", "event_espresso"), get_class($this)));
 		}
 		return $this->_status;
 	}
@@ -127,7 +127,7 @@ 
 	 * @param string $status
 	 * @return void
 	 */
-	protected function set_status($status){
+	protected function set_status($status) {
 		$this->_status = $status;
 	}
 	/**
@@ -139,11 +139,11 @@ 
 	 * Returns the last error that occurred. If none occurred, returns null
 	 * @return string
 	 */
-	public function get_last_error(){
+	public function get_last_error() {
 		$errors = $this->get_errors();
-		if($errors){
+		if ($errors) {
 			return end($errors);
-		}else{
+		} else {
 			return null;
 		}
 	}
@@ -152,26 +152,26 @@ 
 	 * @param string $error a string describing the error that will be useful for debugging. Consider including all the data that led to the error, and a stack trace etc.
 	 * @param boolean $force force the error to be added (because otherwise we have a limit). If forcing and errors are already at their limit, we will purposefully forget the first half
 	 */
-	public function add_error($error, $force = FALSE ){
-		if( ! defined( 'EE_DMS_ERROR_LIMIT' ) ){
+	public function add_error($error, $force = FALSE) {
+		if ( ! defined('EE_DMS_ERROR_LIMIT')) {
 			$limit = 50;
-		}else{
+		} else {
 			$limit = EE_DMS_ERROR_LIMIT;
 		}
 		//make sure errors is an array, see ticket #8261
-		if( is_string( $this->_errors ) ){
-			$this->_errors = array( $this->_errors );
+		if (is_string($this->_errors)) {
+			$this->_errors = array($this->_errors);
 		}
-		if(count($this->_errors) >= $limit ){
-			if( $force ){
+		if (count($this->_errors) >= $limit) {
+			if ($force) {
 				//get rid of the first half of the errors and any above the limit
-				$this->_errors = array_slice( $this->_errors, $limit / 2, $limit / 2 );
+				$this->_errors = array_slice($this->_errors, $limit / 2, $limit / 2);
 				$this->_errors[] = "Limit reached; removed first half of errors to save space";
 				$this->_errors[] = $error;
-			}else{
-				$this->_errors[ $limit ] = 'More, but limit reached...';
+			} else {
+				$this->_errors[$limit] = 'More, but limit reached...';
 			}
-		}else{
+		} else {
 			$this->_errors[] = $error;
 		}
 	}
@@ -180,57 +180,57 @@ 
 	 * Indicates there was a fatal error and the migration cannot possibly continue
 	 * @return boolean
 	 */
-	public function is_broken(){
+	public function is_broken() {
 		return $this->get_status() == EE_Data_Migration_Manager::status_fatal_error;
 	}
 	/**
 	 * @deprecated since 4.6.12
 	 */
-	public function is_borked(){
-		EE_Error::doing_it_wrong('is_borked', __( 'The cheeky "is_borked" method had been replaced with the more proper "is_broken"', 'event_espresso' ), '4.6.12');
+	public function is_borked() {
+		EE_Error::doing_it_wrong('is_borked', __('The cheeky "is_borked" method had been replaced with the more proper "is_broken"', 'event_espresso'), '4.6.12');
 		return $this->is_broken();
 	}
 	/**
 	 * Sets the status to as having a fatal error
 	 */
-	public function set_broken(){
+	public function set_broken() {
 		$this->_status = EE_Data_Migration_Manager::status_fatal_error;
 	}
 	/**
 	 *
 	 * @deprecated since 4.6.12
 	 */
-	public function set_borked(){
-		EE_Error::doing_it_wrong('is_borked', __( 'The cheeky "is_borked" method had been replaced with the more proper "is_broken"', 'event_espresso' ), '4.6.12');
+	public function set_borked() {
+		EE_Error::doing_it_wrong('is_borked', __('The cheeky "is_borked" method had been replaced with the more proper "is_broken"', 'event_espresso'), '4.6.12');
 		return $this->set_broken();
 	}
 	/**
 	 * Checks if this thing believes it is completed
 	 * @return boolean
 	 */
-	public function is_completed(){
+	public function is_completed() {
 		return $this->get_status() == EE_Data_Migration_Manager::status_completed;
 	}
 	/**
 	 * Checks if the current script has more to do or not (ie, if it's status is CONTINUE)
 	 * @return boolean
 	 */
-	public function has_more_to_do(){
+	public function has_more_to_do() {
 		return $this->get_status() == EE_Data_Migration_Manager::status_continue;
 	}
 	/**
 	 * Marks that we believe this migration thing is completed
 	 */
-	public function set_completed(){
+	public function set_completed() {
 		$this->_status = EE_Data_Migration_Manager::status_completed;
 	}
 
 	/**
 	 * Marks that we think this migration class can continue to migrate
 	 */
-	public function reattempt(){
+	public function reattempt() {
 		$this->_status = EE_Data_Migration_Manager::status_continue;
-		$this->add_error( __( 'Reattempt migration', 'event_espresso' ), TRUE );
+		$this->add_error(__('Reattempt migration', 'event_espresso'), TRUE);
 	}
 
 	/**
@@ -239,8 +239,8 @@ 
 	 * 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(){
-		$properties =  get_object_vars($this);
+	public function properties_as_array() {
+		$properties = get_object_vars($this);
 		$properties['class'] = get_class($this);
 		unset($properties['_migration_script']);
 		return $properties;
@@ -261,22 +261,22 @@ 
 	 * @param array $data_types numerically indexed
 	 * @return string
 	 */
-	protected function _create_error_message_for_db_insertion($old_table, $old_row_as_array, $new_table, $new_row_as_array, $data_types){
+	protected function _create_error_message_for_db_insertion($old_table, $old_row_as_array, $new_table, $new_row_as_array, $data_types) {
 		global $wpdb;
 		$old_columns_and_values_for_string = array();
-		foreach($old_row_as_array as $column => $value){
+		foreach ($old_row_as_array as $column => $value) {
 			$old_columns_and_values_for_string[] = "$column => $value";
 		}
 		$new_columns_and_values_for_string = array();
 		$count = 0;
-		foreach($new_row_as_array as $column => $value){
+		foreach ($new_row_as_array as $column => $value) {
 			$new_columns_and_values_for_string[] = " $column => $value (".$data_types[$count++].")";
 		}
 		return sprintf(
 			__('Received error "%6$s" inserting row %5$s %1$s %5$s into table %2$s.%5$s Data used was %5$s %3$s %5$s from table %4%s.', "event_espresso"),
-			implode(", ",$new_columns_and_values_for_string),
+			implode(", ", $new_columns_and_values_for_string),
 			$new_table,
-			implode(", ",$old_columns_and_values_for_string),
+			implode(", ", $old_columns_and_values_for_string),
 			$old_table,
 			'<br/>',
 			$wpdb->last_error
@@ -291,12 +291,12 @@ 
 	* @param array $array_of_data
 	* @return string
 	*/
-	protected function _json_encode($array_of_data){
+	protected function _json_encode($array_of_data) {
 		//we'd rather NOT serialize the transaction details
 		$fields_to_include = array();
-		foreach($array_of_data as $name => $value){
+		foreach ($array_of_data as $name => $value) {
 			$unserialized_data = @unserialize($value);
-			if($unserialized_data === FALSE){
+			if ($unserialized_data === FALSE) {
 				$fields_to_include[$name] = $value;
 			}
 		}
@@ -309,13 +309,13 @@ 
 	 * @throws EE_Error
 	 */
 	protected function _get_table_manager() {
-		if( $this->_table_manager instanceof TableManager ) {
+		if ($this->_table_manager instanceof TableManager) {
 			return $this->_table_manager;
 		} else {
 			throw new EE_Error( 
 				sprintf( 
-					__( 'Table manager on migration class %1$s is not set properly.', 'event_espresso'), 
-					get_class( $this ) 
+					__('Table manager on migration class %1$s is not set properly.', 'event_espresso'), 
+					get_class($this) 
 				) 	
 			);
 		}
@@ -327,13 +327,13 @@ 
 	 * @throws EE_Error
 	 */
 	protected function _get_table_analysis() {
-		if( $this->_table_analysis instanceof TableAnalysis ) {
+		if ($this->_table_analysis instanceof TableAnalysis) {
 			return $this->_table_analysis;
 		} else {
 			throw new EE_Error( 
 				sprintf( 
-					__( 'Table analysis class on migration class %1$s is not set properly.', 'event_espresso'), 
-					get_class( $this ) 
+					__('Table analysis class on migration class %1$s is not set properly.', 'event_espresso'), 
+					get_class($this) 
 				) 
 			);
 		}

core/data_migration_scripts/EE_Data_Migration_Script_Base.core.php

Spacing +117 added lines, -117 removed lines

@@ -2,7 +2,7 @@ 
 use EventEspresso\core\services\database\TableAnalysis;
 use EventEspresso\core\services\database\TableManager;
 
-if ( ! defined( 'EVENT_ESPRESSO_VERSION')) {
+if ( ! defined('EVENT_ESPRESSO_VERSION')) {
 	exit('No direct script access allowed');
 }
 
@@ -124,14 +124,14 @@ 
 	 * @param TableManager  $table_manager
 	 * @param TableAnalysis $table_analysis
 	 */
-	public function __construct( TableManager $table_manager = null, TableAnalysis $table_analysis = null ) {
-		$this->_migration_stages = (array) 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 ) {
+	public function __construct(TableManager $table_manager = null, TableAnalysis $table_analysis = null) {
+		$this->_migration_stages = (array) 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);
 			}
 		}
-		parent::__construct( $table_manager, $table_analysis );
+		parent::__construct($table_manager, $table_analysis);
 	}
 
 
@@ -140,7 +140,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
 	}
 
@@ -155,9 +155,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;
@@ -173,9 +173,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);
 		}
@@ -192,15 +192,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];
 			}
 		}
@@ -215,8 +215,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;
 	}
 
@@ -229,9 +229,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;
 	}
 
@@ -243,12 +243,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);
 	}
 
 
@@ -265,10 +265,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;
 	}
@@ -280,10 +280,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;
@@ -297,24 +297,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);
@@ -322,7 +322,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());
 				}
@@ -330,24 +330,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));
 		}
@@ -361,12 +361,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);
 	}
 
 
@@ -378,27 +378,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;
 			}
@@ -425,9 +425,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  );
 	}
 
@@ -441,9 +441,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  );
 	}
 
@@ -454,8 +454,8 @@ 
 	 * @param string $table_name
 	 * @return boolean
 	 */
-	protected function _old_table_exists( $table_name ) {
-		return $this->_get_table_analysis()->tableExists( $table_name );
+	protected function _old_table_exists($table_name) {
+		return $this->_get_table_analysis()->tableExists($table_name);
 	}
 
 
@@ -465,8 +465,8 @@ 
 	 * @param string $table_name
 	 * @return boolean
 	 */
-	protected function _delete_table_if_empty( $table_name ) {
-		return EEH_Activation::delete_db_table_if_empty( $table_name );
+	protected function _delete_table_if_empty($table_name) {
+		return EEH_Activation::delete_db_table_if_empty($table_name);
 	}
 
 
@@ -485,9 +485,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 );
 	}
 
@@ -502,13 +502,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));
 	}
 
 	/**
@@ -518,7 +518,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;
 	}
 
@@ -529,17 +529,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;
 			}
 		}
@@ -552,12 +552,12 @@ 
 	 * @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 ){
-		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  );
+	private function _create_table_and_catch_errors($table_name, $table_definition_sql, $engine_string = 'ENGINE=MyISAM', $drop_pre_existing_tables = FALSE) {
+		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;
 		}
 	}
@@ -569,15 +569,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()))));
 			}
 		}
 	}
@@ -588,13 +588,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;
 	}
@@ -605,8 +605,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);
 	}
 
 
@@ -618,8 +618,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;
 	}
@@ -631,7 +631,7 @@ 
 	 * can be displayed to the user
 	 * @return string
 	 */
-	public function get_feedback_message(){
+	public function get_feedback_message() {
 		return $this->_feedback_message;
 	}
 
@@ -643,16 +643,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);
 			}
 		}
@@ -667,19 +667,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);
 			}
 		}
@@ -695,9 +695,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;
 			}
 		}
@@ -713,8 +713,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));
 	}
 
 
@@ -726,10 +726,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'];
 	}
 
 
@@ -743,7 +743,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;
 	}
 
@@ -756,18 +756,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/db_models/EEM_Registration.model.php

Spacing +110 added lines, -110 removed lines

@@ -106,32 +106,32 @@ 
 	 * @param string $timezone string representing the timezone we want to set for returned Date Time Strings (and any incoming timezone data that gets saved).
 	 *    Note this just sends the timezone info to the date time model field objects.  Default is NULL (and will be assumed using the set timezone in the 'timezone_string' wp option)
 	 */
-	protected function __construct( $timezone = null ) {
-		$this->_table_analysis = EE_Registry::instance()->create( 'TableAnalysis', array(), true );
-		$this->singular_item = __('Registration','event_espresso');
-		$this->plural_item = __('Registrations','event_espresso');
+	protected function __construct($timezone = null) {
+		$this->_table_analysis = EE_Registry::instance()->create('TableAnalysis', array(), true);
+		$this->singular_item = __('Registration', 'event_espresso');
+		$this->plural_item = __('Registrations', 'event_espresso');
 
 		$this->_tables = array(
-			'Registration'=>new EE_Primary_Table('esp_registration','REG_ID')
+			'Registration'=>new EE_Primary_Table('esp_registration', 'REG_ID')
 		);
 		$this->_fields = array(
 			'Registration'=>array(
-				'REG_ID'=>new EE_Primary_Key_Int_Field('REG_ID', __('Registration ID','event_espresso')),
-				'EVT_ID'=>new EE_Foreign_Key_Int_Field('EVT_ID', __('Event ID','event_espresso'), false, 0, 'Event'),
-				'ATT_ID'=>new EE_Foreign_Key_Int_Field('ATT_ID', __('Attendee ID','event_espresso'), false, 0, 'Attendee'),
-				'TXN_ID'=>new EE_Foreign_Key_Int_Field('TXN_ID', __('Transaction ID','event_espresso'), false, 0, 'Transaction'),
-				'TKT_ID'=>new EE_Foreign_Key_Int_Field('TKT_ID', __('Ticket ID','event_espresso'), false, 0, 'Ticket'),
-				'STS_ID'=>new EE_Foreign_Key_String_Field('STS_ID', __('Status ID','event_espresso'), false, EEM_Registration::status_id_incomplete, 'Status'),
-				'REG_date'=>new EE_Datetime_Field('REG_date', __('Time registration occurred','event_espresso'), false, EE_Datetime_Field::now, $timezone ),
-				'REG_final_price'=>new EE_Money_Field('REG_final_price', __('Registration\'s share of the transaction total','event_espresso'), false, 0),
-				'REG_paid'=>new EE_Money_Field('REG_paid', __('Amount paid to date towards registration','event_espresso'), false, 0),
-				'REG_session'=>new EE_Plain_Text_Field('REG_session', __('Session ID of registration','event_espresso'), false, ''),
-				'REG_code'=>new EE_Plain_Text_Field('REG_code', __('Unique Code for this registration','event_espresso'), false, ''),
-				'REG_url_link'=>new EE_Plain_Text_Field('REG_url_link', __('String to be used in URL for identifying registration','event_espresso'), false, ''),
-				'REG_count'=>new EE_Integer_Field('REG_count', __('Count of this registration in the group registration ','event_espresso'), true, 1),
-				'REG_group_size'=>new EE_Integer_Field('REG_group_size', __('Number of registrations on this group','event_espresso'), false, 1),
-				'REG_att_is_going'=>new EE_Boolean_Field('REG_att_is_going', __('Flag indicating the registrant plans on attending','event_espresso'), false, false),
-				'REG_deleted' => new EE_Trashed_Flag_Field('REG_deleted', __('Flag indicating if registration has been archived or not.', 'event_espresso'), false, false )
+				'REG_ID'=>new EE_Primary_Key_Int_Field('REG_ID', __('Registration ID', 'event_espresso')),
+				'EVT_ID'=>new EE_Foreign_Key_Int_Field('EVT_ID', __('Event ID', 'event_espresso'), false, 0, 'Event'),
+				'ATT_ID'=>new EE_Foreign_Key_Int_Field('ATT_ID', __('Attendee ID', 'event_espresso'), false, 0, 'Attendee'),
+				'TXN_ID'=>new EE_Foreign_Key_Int_Field('TXN_ID', __('Transaction ID', 'event_espresso'), false, 0, 'Transaction'),
+				'TKT_ID'=>new EE_Foreign_Key_Int_Field('TKT_ID', __('Ticket ID', 'event_espresso'), false, 0, 'Ticket'),
+				'STS_ID'=>new EE_Foreign_Key_String_Field('STS_ID', __('Status ID', 'event_espresso'), false, EEM_Registration::status_id_incomplete, 'Status'),
+				'REG_date'=>new EE_Datetime_Field('REG_date', __('Time registration occurred', 'event_espresso'), false, EE_Datetime_Field::now, $timezone),
+				'REG_final_price'=>new EE_Money_Field('REG_final_price', __('Registration\'s share of the transaction total', 'event_espresso'), false, 0),
+				'REG_paid'=>new EE_Money_Field('REG_paid', __('Amount paid to date towards registration', 'event_espresso'), false, 0),
+				'REG_session'=>new EE_Plain_Text_Field('REG_session', __('Session ID of registration', 'event_espresso'), false, ''),
+				'REG_code'=>new EE_Plain_Text_Field('REG_code', __('Unique Code for this registration', 'event_espresso'), false, ''),
+				'REG_url_link'=>new EE_Plain_Text_Field('REG_url_link', __('String to be used in URL for identifying registration', 'event_espresso'), false, ''),
+				'REG_count'=>new EE_Integer_Field('REG_count', __('Count of this registration in the group registration ', 'event_espresso'), true, 1),
+				'REG_group_size'=>new EE_Integer_Field('REG_group_size', __('Number of registrations on this group', 'event_espresso'), false, 1),
+				'REG_att_is_going'=>new EE_Boolean_Field('REG_att_is_going', __('Flag indicating the registrant plans on attending', 'event_espresso'), false, false),
+				'REG_deleted' => new EE_Trashed_Flag_Field('REG_deleted', __('Flag indicating if registration has been archived or not.', 'event_espresso'), false, false)
 			)
 		);
 		$this->_model_relations = array(
@@ -143,12 +143,12 @@ 
 			'Answer'=>new EE_Has_Many_Relation(),
 			'Checkin'=>new EE_Has_Many_Relation(),
 			'Registration_Payment' => new EE_Has_Many_Relation(),
-			'Payment'=>new EE_HABTM_Relation( 'Registration_Payment' ),
-			'Message' => new EE_Has_Many_Any_Relation( false ) //allow deletes even if there are messages in the queue related
+			'Payment'=>new EE_HABTM_Relation('Registration_Payment'),
+			'Message' => new EE_Has_Many_Any_Relation(false) //allow deletes even if there are messages in the queue related
 		);
 		$this->_model_chain_to_wp_user = 'Event';
 
-		parent::__construct( $timezone );
+		parent::__construct($timezone);
 	}
 
 
@@ -243,9 +243,9 @@ 
 	 *		@param bool  $translated If true will return the values as singular localized strings
 	 *		@return array
 	 */
-	public static function reg_status_array( $exclude = array(), $translated = FALSE ) {
-		EEM_Registration::instance()->_get_registration_status_array( $exclude );
-		return $translated ? EEM_Status::instance()->localized_status( self::$_reg_status, FALSE, 'sentence') : self::$_reg_status;
+	public static function reg_status_array($exclude = array(), $translated = FALSE) {
+		EEM_Registration::instance()->_get_registration_status_array($exclude);
+		return $translated ? EEM_Status::instance()->localized_status(self::$_reg_status, FALSE, 'sentence') : self::$_reg_status;
 	}
 
 
@@ -256,18 +256,18 @@ 
 	 * @param array $exclude
 	 * @return array
 	 */
-	private function _get_registration_status_array( $exclude = array() ) {
+	private function _get_registration_status_array($exclude = array()) {
 		//in the very rare circumstance that we are deleting a model's table's data
 		//and the table hasn't actually been created, this could have an error
 		/** @type WPDB $wpdb */
 		global $wpdb;
-		if( $this->_get_table_analysis()->tableExists( $wpdb->prefix . 'esp_status' ) ){
-			$SQL = 'SELECT STS_ID, STS_code FROM '. $wpdb->prefix . 'esp_status WHERE STS_type = "registration"';
-			$results = $wpdb->get_results( $SQL );
+		if ($this->_get_table_analysis()->tableExists($wpdb->prefix.'esp_status')) {
+			$SQL = 'SELECT STS_ID, STS_code FROM '.$wpdb->prefix.'esp_status WHERE STS_type = "registration"';
+			$results = $wpdb->get_results($SQL);
 			self::$_reg_status = array();
-			foreach ( $results as $status ) {
-				if ( ! in_array( $status->STS_ID, $exclude )) {
-					self::$_reg_status[ $status->STS_ID ] = $status->STS_code;
+			foreach ($results as $status) {
+				if ( ! in_array($status->STS_ID, $exclude)) {
+					self::$_reg_status[$status->STS_ID] = $status->STS_code;
 				}
 			}
 		}
@@ -280,13 +280,13 @@ 
 	 * @throws \EE_Error
 	 */
 	protected function _get_table_analysis() {
-		if( $this->_table_analysis instanceof TableAnalysis ) {
+		if ($this->_table_analysis instanceof TableAnalysis) {
 			return $this->_table_analysis;
 		} else {
 			throw new \EE_Error( 
 				sprintf( 
-					__( 'Table analysis class on class %1$s is not set properly.', 'event_espresso'), 
-					get_class( $this ) 
+					__('Table analysis class on class %1$s is not set properly.', 'event_espresso'), 
+					get_class($this) 
 				) 
 			);
 		}
@@ -301,15 +301,15 @@ 
 	 * @return array
 	 * @throws \EE_Error
 	 */
-	public function get_reg_months_and_years( $where_params ) {
+	public function get_reg_months_and_years($where_params) {
 		$query_params[0] = $where_params;
 		$query_params['group_by'] = array('reg_year', 'reg_month');
-		$query_params['order_by'] = array( 'REG_date' => 'DESC' );
+		$query_params['order_by'] = array('REG_date' => 'DESC');
 		$columns_to_select = array(
 			'reg_year' => array('YEAR(REG_date)', '%s'),
 			'reg_month' => array('MONTHNAME(REG_date)', '%s')
 			);
-		return $this->_get_all_wpdb_results( $query_params, OBJECT, $columns_to_select );
+		return $this->_get_all_wpdb_results($query_params, OBJECT, $columns_to_select);
 	}
 
 
@@ -321,11 +321,11 @@ 
 	* 		@param		int		$ATT_ID
 	*		@return 	EE_Registration[]
 	*/
-	public function get_all_registrations_for_attendee( $ATT_ID = 0 ) {
-		if ( ! $ATT_ID ) {
+	public function get_all_registrations_for_attendee($ATT_ID = 0) {
+		if ( ! $ATT_ID) {
 			return FALSE;
 		}
-		return $this->get_all( array( array( 'ATT_ID' => $ATT_ID )));
+		return $this->get_all(array(array('ATT_ID' => $ATT_ID)));
 	}
 
 
@@ -336,8 +336,8 @@ 
 	 * @param string $REG_url_link
 	 * @return EE_Registration
 	 */
-	public function get_registration_for_reg_url_link($REG_url_link){
-		if(!$REG_url_link){
+	public function get_registration_for_reg_url_link($REG_url_link) {
+		if ( ! $REG_url_link) {
 			return false;
 		}
 		return $this->get_one(array(array('REG_url_link'=>$REG_url_link)));
@@ -355,13 +355,13 @@ 
 	* 		@param    int		$att_nmbr 	in case the ATT_ID is the same for multiple registrations (same details used) then the attendee number is required
 	*		@return 		mixed		array on success, FALSE on fail
 	*/
-	public function get_registration_for_transaction_attendee( $TXN_ID = 0, $ATT_ID = 0, $att_nmbr = 0 ) {
+	public function get_registration_for_transaction_attendee($TXN_ID = 0, $ATT_ID = 0, $att_nmbr = 0) {
 		return $this->get_one(array(
 			array(
 				'TXN_ID'=>$TXN_ID,
 				'ATT_ID'=>$ATT_ID
 			),
-			'limit'=>array( min( ( $att_nmbr-1 ), 0 ), 1 )
+			'limit'=>array(min(($att_nmbr - 1), 0), 1)
 		));
 	}
 
@@ -373,16 +373,16 @@ 
 	 *		@param $period string which can be passed to php's strtotime function (eg "-1 month")
 	 *		@return stdClass[] with properties regDate and total
 	*/
-	public function get_registrations_per_day_report( $period = '-1 month' ) {
+	public function get_registrations_per_day_report($period = '-1 month') {
 
-		$sql_date = $this->convert_datetime_for_query( 'REG_date', date("Y-m-d H:i:s", strtotime($period) ), 'Y-m-d H:i:s', 'UTC' );
-		$where = array( 'REG_date' => array( '>=', $sql_date ), 'STS_ID' => array( '!=', EEM_Registration::status_id_incomplete ) );
+		$sql_date = $this->convert_datetime_for_query('REG_date', date("Y-m-d H:i:s", strtotime($period)), 'Y-m-d H:i:s', 'UTC');
+		$where = array('REG_date' => array('>=', $sql_date), 'STS_ID' => array('!=', EEM_Registration::status_id_incomplete));
 
-		if ( ! EE_Registry::instance()->CAP->current_user_can( 'ee_read_others_registrations', 'reg_per_day_report' ) ) {
+		if ( ! EE_Registry::instance()->CAP->current_user_can('ee_read_others_registrations', 'reg_per_day_report')) {
 			$where['Event.EVT_wp_user'] = get_current_user_id();
 		}
 
-		$query_interval = EEH_DTT_Helper::get_sql_query_interval_for_offset( $this->get_timezone(), 'REG_date' );
+		$query_interval = EEH_DTT_Helper::get_sql_query_interval_for_offset($this->get_timezone(), 'REG_date');
 
 		$results = $this->_get_all_wpdb_results(
 				array(
@@ -392,8 +392,8 @@ 
 				),
 				OBJECT,
 				array(
-					'regDate'=>array( 'DATE(' . $query_interval . ')','%s'),
-					'total'=>array('count(REG_ID)','%d')
+					'regDate'=>array('DATE('.$query_interval.')', '%s'),
+					'total'=>array('count(REG_ID)', '%d')
 				));
 		return $results;
 	}
@@ -408,22 +408,22 @@ 
 	 * @return stdClass[] with properties Registration_REG_date and a column for each registration status as the STS_ID
 	 *                    (i.e. RAP)
 	 */
-	public function get_registrations_per_day_and_per_status_report( $period = '-1 month' ) {
+	public function get_registrations_per_day_and_per_status_report($period = '-1 month') {
 		global $wpdb;
-		$registration_table = $wpdb->prefix . 'esp_registration';
+		$registration_table = $wpdb->prefix.'esp_registration';
 		$event_table = $wpdb->posts;
-		$sql_date = date("Y-m-d H:i:s", strtotime($period) );
+		$sql_date = date("Y-m-d H:i:s", strtotime($period));
 
 		//prepare the query interval for displaying offset
-		$query_interval = EEH_DTT_Helper::get_sql_query_interval_for_offset( $this->get_timezone(), 'dates.REG_date' );
+		$query_interval = EEH_DTT_Helper::get_sql_query_interval_for_offset($this->get_timezone(), 'dates.REG_date');
 
 		//inner date query
 		$inner_date_query = "SELECT DISTINCT REG_date from $registration_table ";
 		$inner_where = " WHERE";
 		//exclude events not authored by user if permissions in effect
-		if ( ! EE_Registry::instance()->CAP->current_user_can( 'ee_read_others_registrations', 'reg_per_event_report' ) ) {
+		if ( ! EE_Registry::instance()->CAP->current_user_can('ee_read_others_registrations', 'reg_per_event_report')) {
 			$inner_date_query .= "LEFT JOIN $event_table ON ID = EVT_ID";
-			$inner_where .= " post_author = " . get_current_user_id() . " AND";
+			$inner_where .= " post_author = ".get_current_user_id()." AND";
 		}
 		$inner_where .= " REG_date >= '$sql_date'";
 		$inner_date_query .= $inner_where;
@@ -435,8 +435,8 @@ 
 		$select_parts = array();
 
 		//loop through registration stati to do parts for each status.
-		foreach ( EEM_Registration::reg_status_array() as $STS_ID => $STS_code ) {
-			if ( $STS_ID === EEM_Registration::status_id_incomplete ) {
+		foreach (EEM_Registration::reg_status_array() as $STS_ID => $STS_code) {
+			if ($STS_ID === EEM_Registration::status_id_incomplete) {
 				continue;
 			}
 			$select_parts[] = "COUNT($STS_code.REG_ID) as $STS_ID";
@@ -444,14 +444,14 @@ 
 		}
 
 		//setup the selects
-		$select .= implode(', ', $select_parts );
+		$select .= implode(', ', $select_parts);
 		$select .= " FROM ($inner_date_query) AS dates LEFT JOIN ";
 
 		//setup the joins
-		$join .= implode( " LEFT JOIN ", $join_parts );
+		$join .= implode(" LEFT JOIN ", $join_parts);
 
 		//now let's put it all together
-		$query = $select . $join . ' GROUP BY Registration_REG_date';
+		$query = $select.$join.' GROUP BY Registration_REG_date';
 
 		//and execute it
 		$results = $wpdb->get_results(
@@ -472,23 +472,23 @@ 
 	 * @param $period string which can be passed to php's strtotime function (eg "-1 month")
 	 *		@return stdClass[] each with properties event_name, reg_limit, and total
 	*/
-	public function get_registrations_per_event_report( $period = '-1 month' ) {
+	public function get_registrations_per_event_report($period = '-1 month') {
 
-		$date_sql = $this->convert_datetime_for_query( 'REG_date', date( "Y-m-d H:i:s", strtotime( $period )), 'Y-m-d H:i:s', 'UTC' );
-		$where = array( 'REG_date' => array( '>=', $date_sql ), 'STS_ID' => array( '!=', EEM_Registration::status_id_incomplete ) );
+		$date_sql = $this->convert_datetime_for_query('REG_date', date("Y-m-d H:i:s", strtotime($period)), 'Y-m-d H:i:s', 'UTC');
+		$where = array('REG_date' => array('>=', $date_sql), 'STS_ID' => array('!=', EEM_Registration::status_id_incomplete));
 
-		if ( ! EE_Registry::instance()->CAP->current_user_can( 'ee_read_others_registrations', 'reg_per_event_report' ) ) {
+		if ( ! EE_Registry::instance()->CAP->current_user_can('ee_read_others_registrations', 'reg_per_event_report')) {
 			$where['Event.EVT_wp_user'] = get_current_user_id();
 		}
 		$results = $this->_get_all_wpdb_results(array(
 			$where,
 			'group_by'=>'Event.EVT_name',
 			'order_by'=>'Event.EVT_name',
-			'limit'=>array(0,24)),
+			'limit'=>array(0, 24)),
 			OBJECT,
 			array(
-				'event_name'=>array('Event_CPT.post_title','%s'),
-				'total'=>array('COUNT(REG_ID)','%s')
+				'event_name'=>array('Event_CPT.post_title', '%s'),
+				'total'=>array('COUNT(REG_ID)', '%s')
 			)
 		);
 
@@ -506,19 +506,19 @@ 
 	 * @return stdClass[] with properties `Registration_Event` and a column for each registration status as the STS_ID
 	 *                    (i.e. RAP)
 	 */
-	public function get_registrations_per_event_and_per_status_report( $period = '-1 month' ) {
+	public function get_registrations_per_event_and_per_status_report($period = '-1 month') {
 		global $wpdb;
-		$registration_table = $wpdb->prefix . 'esp_registration';
+		$registration_table = $wpdb->prefix.'esp_registration';
 		$event_table = $wpdb->posts;
-		$sql_date = date("Y-m-d H:i:s", strtotime($period) );
+		$sql_date = date("Y-m-d H:i:s", strtotime($period));
 
 		//inner date query
 		$inner_date_query = "SELECT DISTINCT EVT_ID, REG_date from $registration_table ";
 		$inner_where = " WHERE";
 		//exclude events not authored by user if permissions in effect
-		if ( ! EE_Registry::instance()->CAP->current_user_can( 'ee_read_others_registrations', 'reg_per_event_report' ) ) {
+		if ( ! EE_Registry::instance()->CAP->current_user_can('ee_read_others_registrations', 'reg_per_event_report')) {
 			$inner_date_query .= "LEFT JOIN $event_table ON ID = EVT_ID";
-			$inner_where .= " post_author = " . get_current_user_id() . " AND";
+			$inner_where .= " post_author = ".get_current_user_id()." AND";
 		}
 		$inner_where .= " REG_date >= '$sql_date'";
 		$inner_date_query .= $inner_where;
@@ -530,8 +530,8 @@ 
 		$select_parts = array();
 
 		//loop through registration stati to do parts for each status.
-		foreach ( EEM_Registration::reg_status_array() as $STS_ID => $STS_code ) {
-			if ( $STS_ID === EEM_Registration::status_id_incomplete ) {
+		foreach (EEM_Registration::reg_status_array() as $STS_ID => $STS_code) {
+			if ($STS_ID === EEM_Registration::status_id_incomplete) {
 				continue;
 			}
 			$select_parts[] = "COUNT($STS_code.REG_ID) as $STS_ID";
@@ -539,14 +539,14 @@ 
 		}
 
 		//setup the selects
-		$select .= implode( ', ', $select_parts );
+		$select .= implode(', ', $select_parts);
 		$select .= " FROM ($inner_date_query) AS dates LEFT JOIN $event_table as Event ON Event.ID = dates.EVT_ID LEFT JOIN ";
 
 		//setup remaining joins
-		$join .= implode( " LEFT JOIN ", $join_parts );
+		$join .= implode(" LEFT JOIN ", $join_parts);
 
 		//now put it all together
-		$query = $select . $join . ' GROUP BY Registration_Event';
+		$query = $select.$join.' GROUP BY Registration_Event';
 
 		//and execute
 		$results = $wpdb->get_results(
@@ -562,11 +562,11 @@ 
 	 * @param int $TXN_ID
 	 * @return EE_Registration
 	 */
-	public function get_primary_registration_for_transaction_ID( $TXN_ID = 0){
-		if( ! $TXN_ID ){
+	public function get_primary_registration_for_transaction_ID($TXN_ID = 0) {
+		if ( ! $TXN_ID) {
 			return false;
 		}
-		return $this->get_one(array(array('TXN_ID'=>$TXN_ID,'REG_count'=>  EEM_Registration::PRIMARY_REGISTRANT_COUNT)));
+		return $this->get_one(array(array('TXN_ID'=>$TXN_ID, 'REG_count'=>  EEM_Registration::PRIMARY_REGISTRANT_COUNT)));
 	}
 
 
@@ -578,11 +578,11 @@ 
 	 *		@param boolean $for_incomplete_payments
 	 *		@return int
 	 */
-	public function get_event_registration_count ( $EVT_ID, $for_incomplete_payments = FALSE ) {
+	public function get_event_registration_count($EVT_ID, $for_incomplete_payments = FALSE) {
 		// we only count approved registrations towards registration limits
-		$query_params = array( array( 'EVT_ID' => $EVT_ID, 'STS_ID' => self::status_id_approved ) );
-		if( $for_incomplete_payments ){
-			$query_params[0]['Transaction.STS_ID']=array('!=',  EEM_Transaction::complete_status_code);
+		$query_params = array(array('EVT_ID' => $EVT_ID, 'STS_ID' => self::status_id_approved));
+		if ($for_incomplete_payments) {
+			$query_params[0]['Transaction.STS_ID'] = array('!=', EEM_Transaction::complete_status_code);
 		}
 
 		return $this->count($query_params);
@@ -598,7 +598,7 @@ 
 		/** @type WPDB $wpdb */
 		global $wpdb;
 		return $wpdb->query(
-				'DELETE r FROM ' . $this->table() . ' r LEFT JOIN ' . EEM_Transaction::instance()->table() . ' t ON r.TXN_ID = t.TXN_ID WHERE t.TXN_ID IS NULL' );
+				'DELETE r FROM '.$this->table().' r LEFT JOIN '.EEM_Transaction::instance()->table().' t ON r.TXN_ID = t.TXN_ID WHERE t.TXN_ID IS NULL' );
 	}
 
 	/**
@@ -608,17 +608,17 @@ 
 	 * @param boolean $checked_in whether to count registrations checked IN or OUT
 	 * @return int
 	 */
-	public function count_registrations_checked_into_datetime( $DTT_ID, $checked_in = true) {
+	public function count_registrations_checked_into_datetime($DTT_ID, $checked_in = true) {
 		global $wpdb;
 		//subquery to get latest checkin
 		$query = $wpdb->prepare(
 			'SELECT '
 				. 'COUNT( DISTINCT checkins.REG_ID ) '
-			. 'FROM ' . EEM_Checkin::instance()->table() . ' AS checkins INNER JOIN'
+			. 'FROM '.EEM_Checkin::instance()->table().' AS checkins INNER JOIN'
 				. '( SELECT '
 					. 'max( CHK_timestamp ) AS latest_checkin, '
 					. 'REG_ID AS REG_ID '
-				. 'FROM ' . EEM_Checkin::instance()->table() . ' '
+				. 'FROM '.EEM_Checkin::instance()->table().' '
 				. 'WHERE DTT_ID=%d '
 				. 'GROUP BY REG_ID'
 			. ') AS most_recent_checkin_per_reg '
@@ -629,7 +629,7 @@ 
 			$DTT_ID,
 			$checked_in
 		);
-		return (int)$wpdb->get_var( $query );
+		return (int) $wpdb->get_var($query);
 	}
 
 	/**
@@ -639,18 +639,18 @@ 
 	 * @param boolean $checked_in whether to count registrations checked IN or OUT
 	 * @return int
 	 */
-	public function count_registrations_checked_into_event( $EVT_ID, $checked_in = true ) {
+	public function count_registrations_checked_into_event($EVT_ID, $checked_in = true) {
 		global $wpdb;
 		//subquery to get latest checkin
 		$query = $wpdb->prepare(
 			'SELECT '
 				. 'COUNT( DISTINCT checkins.REG_ID ) '
-			. 'FROM ' . EEM_Checkin::instance()->table() . ' AS checkins INNER JOIN'
+			. 'FROM '.EEM_Checkin::instance()->table().' AS checkins INNER JOIN'
 				. '( SELECT '
 					. 'max( CHK_timestamp ) AS latest_checkin, '
 					. 'REG_ID AS REG_ID '
-				. 'FROM ' . EEM_Checkin::instance()->table() . ' AS c '
-				. 'INNER JOIN ' . EEM_Datetime::instance()->table() . ' AS d '
+				. 'FROM '.EEM_Checkin::instance()->table().' AS c '
+				. 'INNER JOIN '.EEM_Datetime::instance()->table().' AS d '
 				. 'ON c.DTT_ID=d.DTT_ID '
 				. 'WHERE d.EVT_ID=%d '
 				. 'GROUP BY REG_ID'
@@ -662,7 +662,7 @@ 
 			$EVT_ID,
 			$checked_in
 		);
-		return (int)$wpdb->get_var( $query );
+		return (int) $wpdb->get_var($query);
 	}
 
 
@@ -677,15 +677,15 @@ 
 	 * @param array $attendee_ids
 	 * @return EE_Registration[]
 	 */
-	public function get_latest_registration_for_each_of_given_contacts( $attendee_ids = array() ) {
+	public function get_latest_registration_for_each_of_given_contacts($attendee_ids = array()) {
 		//first do a native wp_query to get the latest REG_ID's matching these attendees.
 		global $wpdb;
-		$registration_table = $wpdb->prefix . 'esp_registration';
+		$registration_table = $wpdb->prefix.'esp_registration';
 		$attendee_table = $wpdb->posts;
-		$attendee_ids = is_array( $attendee_ids )
-			? array_map( 'absint', $attendee_ids )
-			: array( (int) $attendee_ids );
-		$attendee_ids = implode( ',', $attendee_ids );
+		$attendee_ids = is_array($attendee_ids)
+			? array_map('absint', $attendee_ids)
+			: array((int) $attendee_ids);
+		$attendee_ids = implode(',', $attendee_ids);
 
 
 		//first we do a query to get the registration ids
@@ -710,24 +710,24 @@ 
 			ARRAY_A
 		);
 
-		if ( empty( $registration_ids ) ) {
+		if (empty($registration_ids)) {
 			return array();
 		}
 
 		$ids_for_model_query = array();
 		//let's flatten the ids so they can be used in the model query.
-		foreach ( $registration_ids as $registration_id ) {
-			if ( isset( $registration_id['registration_id'] ) ) {
+		foreach ($registration_ids as $registration_id) {
+			if (isset($registration_id['registration_id'])) {
 				$ids_for_model_query[] = $registration_id['registration_id'];
 			}
 		}
 
 		//construct query
 		$_where = array(
-			'REG_ID' => array( 'IN', $ids_for_model_query )
+			'REG_ID' => array('IN', $ids_for_model_query)
 		);
 
-		return $this->get_all( array( $_where ) );
+		return $this->get_all(array($_where));
 	}
 
 

Braces +3 added lines, -1 removed lines

@@ -5,7 +5,9 @@
  * @subpackage plugin api, messages
  * @since           4.5.0
  */
-if ( ! defined('EVENT_ESPRESSO_VERSION')) exit('No direct script access allowed');
+if ( ! defined('EVENT_ESPRESSO_VERSION')) {
+	exit('No direct script access allowed');
+}
 
 /**
  * Use this to register or deregister a new message template pack variation for the EE messages system.

admin_pages/payments/Payments_Admin_Page_Init.core.php

Spacing +18 added lines, -18 removed lines

@@ -1,6 +1,6 @@ 
 <?php
 use EventEspresso\core\services\database\TableAnalysis;
-if (!defined('EVENT_ESPRESSO_VERSION') ){
+if ( ! defined('EVENT_ESPRESSO_VERSION')) {
 	exit('NO direct script access allowed');
 }
 /**
@@ -27,15 +27,15 @@ 
 	 */
 	public function __construct() {
 		//define some page related constants
-		define( 'EE_PAYMENTS_PG_SLUG', 'espresso_payment_settings' );
-		define( 'EE_PAYMENTS_ADMIN_URL', admin_url( 'admin.php?page=' . EE_PAYMENTS_PG_SLUG ));
-		define( 'EE_PAYMENTS_ADMIN', EE_ADMIN_PAGES . 'payments' . DS );
-		define( 'EE_PAYMENTS_TEMPLATE_PATH', EE_PAYMENTS_ADMIN . 'templates' . DS );
-		define( 'EE_PAYMENTS_ASSETS_URL', EE_ADMIN_PAGES_URL . 'payments/assets/' );
-		$this->_table_analysis = EE_Registry::instance()->create( 'TableAnalysis', array(), true );
+		define('EE_PAYMENTS_PG_SLUG', 'espresso_payment_settings');
+		define('EE_PAYMENTS_ADMIN_URL', admin_url('admin.php?page='.EE_PAYMENTS_PG_SLUG));
+		define('EE_PAYMENTS_ADMIN', EE_ADMIN_PAGES.'payments'.DS);
+		define('EE_PAYMENTS_TEMPLATE_PATH', EE_PAYMENTS_ADMIN.'templates'.DS);
+		define('EE_PAYMENTS_ASSETS_URL', EE_ADMIN_PAGES_URL.'payments/assets/');
+		$this->_table_analysis = EE_Registry::instance()->create('TableAnalysis', array(), true);
 		//check that there are active gateways on all admin page loads. but dont do it just yet
 //		echo "constructing payments admin page";die;
-		add_action('admin_notices',array($this,'check_payment_gateway_setup'));
+		add_action('admin_notices', array($this, 'check_payment_gateway_setup'));
 		parent::__construct();
 	}
 
@@ -58,7 +58,7 @@ 
 				'show_on_menu'    => EE_Admin_Page_Menu_Map::BLOG_ADMIN_ONLY,
 				'parent_slug'     => 'espresso_events',
 				'menu_slug'       => EE_PAYMENTS_PG_SLUG,
-				'menu_label'      => __( 'Payment Methods', 'event_espresso' ),
+				'menu_label'      => __('Payment Methods', 'event_espresso'),
 				'capability'      => 'ee_manage_gateways',
 				'admin_init_page' => $this,
 			)
@@ -72,25 +72,25 @@ 
 	 *
 	 * @throws \EE_Error
 	 */
-	public function check_payment_gateway_setup(){
+	public function check_payment_gateway_setup() {
 		//ONLY do this check if models can query
 		//and avoid a bug where when we nuke EE4's data that this causes a fatal error
 		//because the tables are deleted just before this request runs. see https://events.codebasehq.com/projects/event-espresso/tickets/7539
 		if (
 			! EE_Maintenance_Mode::instance()->models_can_query()
-			|| ! $this->_get_table_analysis()->tableExists( EEM_Payment_Method::instance()->table() )
+			|| ! $this->_get_table_analysis()->tableExists(EEM_Payment_Method::instance()->table())
 		) {
 			return;
 		}
 
 
 		// ensure Payment_Method model is loaded
-		EE_Registry::instance()->load_model( 'Payment_Method' );
-		$actives = EEM_Payment_Method::instance()->count_active( EEM_Payment_Method::scope_cart );
-		if( $actives  < 1 ){
+		EE_Registry::instance()->load_model('Payment_Method');
+		$actives = EEM_Payment_Method::instance()->count_active(EEM_Payment_Method::scope_cart);
+		if ($actives < 1) {
 			$url = EE_Admin_Page::add_query_args_and_nonce(array(), EE_PAYMENTS_ADMIN_URL);
 			echo '<div class="error">
-				 <p>'.  sprintf(__("There are no Active Payment Methods setup for Event Espresso. Please %s activate at least one.%s", "event_espresso"),"<a href='$url'>","</a>").'</p>
+				 <p>'.  sprintf(__("There are no Active Payment Methods setup for Event Espresso. Please %s activate at least one.%s", "event_espresso"), "<a href='$url'>", "</a>").'</p>
 			 </div>';
 		}
 	}
@@ -101,13 +101,13 @@ 
 	 * @throws \EE_Error
 	 */
 	protected function _get_table_analysis() {
-		if( $this->_table_analysis instanceof TableAnalysis ) {
+		if ($this->_table_analysis instanceof TableAnalysis) {
 			return $this->_table_analysis;
 		} else {
 			throw new \EE_Error( 
 				sprintf( 
-					__( 'Table analysis class on class %1$s is not set properly.', 'event_espresso'), 
-					get_class( $this ) 
+					__('Table analysis class on class %1$s is not set properly.', 'event_espresso'), 
+					get_class($this) 
 				) 
 			);
 		}

core/EE_Config.core.php

Spacing +392 added lines, -392 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');
 }
 
 
@@ -121,7 +121,7 @@ 
 	 */
 	public static function instance() {
 		// check if class object is instantiated, and instantiated properly
-		if ( ! self::$_instance instanceof EE_Config ) {
+		if ( ! self::$_instance instanceof EE_Config) {
 			self::$_instance = new self();
 		}
 		return self::$_instance;
@@ -141,20 +141,20 @@ 
 	 *                               site was put into maintenance mode)
 	 * @return EE_Config
 	 */
-	public static function reset( $hard_reset = false, $reinstantiate = true ) {
-		if ( $hard_reset ) {
+	public static function reset($hard_reset = false, $reinstantiate = true) {
+		if ($hard_reset) {
 			self::$_instance->_addon_option_names = array();
 			self::$_instance->_initialize_config();
 			self::$_instance->update_espresso_config();
 		}
-		if ( self::$_instance instanceof EE_Config ) {
+		if (self::$_instance instanceof EE_Config) {
 			self::$_instance->update_addon_option_names();
 		}
 		self::$_instance = null;
 		//we don't need to reset the static properties imo because those should
 		//only change when a module is added or removed. Currently we don't
 		//support removing a module during a request when it previously existed
-		if ( $reinstantiate ) {
+		if ($reinstantiate) {
 			return self::instance();
 		} else {
 			return null;
@@ -169,7 +169,7 @@ 
 	 * @access    private
 	 */
 	private function __construct() {
-		do_action( 'AHEE__EE_Config__construct__begin', $this );
+		do_action('AHEE__EE_Config__construct__begin', $this);
 		// setup empty config classes
 		$this->_initialize_config();
 		// load existing EE site settings
@@ -179,17 +179,17 @@ 
 		//  register shortcodes and modules
 		add_action(
 			'AHEE__EE_System__register_shortcodes_modules_and_widgets',
-			array( $this, 'register_shortcodes_and_modules' ),
+			array($this, 'register_shortcodes_and_modules'),
 			999
 		);
 		//  initialize shortcodes and modules
-		add_action( 'AHEE__EE_System__core_loaded_and_ready', array( $this, 'initialize_shortcodes_and_modules' ) );
+		add_action('AHEE__EE_System__core_loaded_and_ready', array($this, 'initialize_shortcodes_and_modules'));
 		// register widgets
-		add_action( 'widgets_init', array( $this, 'widgets_init' ), 10 );
+		add_action('widgets_init', array($this, 'widgets_init'), 10);
 		// shutdown
-		add_action( 'shutdown', array( $this, 'shutdown' ), 10 );
+		add_action('shutdown', array($this, 'shutdown'), 10);
 		// construct__end hook
-		do_action( 'AHEE__EE_Config__construct__end', $this );
+		do_action('AHEE__EE_Config__construct__end', $this);
 		// hardcoded hack
 		$this->template_settings->current_espresso_theme = 'Espresso_Arabica_2014';
 	}
@@ -202,7 +202,7 @@ 
 	 * @return string current theme set.
 	 */
 	public static function get_current_theme() {
-		return isset( self::$_instance->template_settings->current_espresso_theme )
+		return isset(self::$_instance->template_settings->current_espresso_theme)
 			? self::$_instance->template_settings->current_espresso_theme : 'Espresso_Arabica_2014';
 	}
 
@@ -217,7 +217,7 @@ 
 	private function _initialize_config() {
 		EE_Config::trim_log();
 		//set defaults
-		$this->_addon_option_names = get_option( EE_Config::ADDON_OPTION_NAMES, array() );
+		$this->_addon_option_names = get_option(EE_Config::ADDON_OPTION_NAMES, array());
 		$this->addons = new stdClass();
 		// set _module_route_map
 		EE_Config::$_module_route_map = array();
@@ -237,9 +237,9 @@ 
 	 */
 	private function _load_core_config() {
 		// load_core_config__start hook
-		do_action( 'AHEE__EE_Config___load_core_config__start', $this );
+		do_action('AHEE__EE_Config___load_core_config__start', $this);
 		$espresso_config = $this->get_espresso_config();
-		foreach ( $espresso_config as $config => $settings ) {
+		foreach ($espresso_config as $config => $settings) {
 			// load_core_config__start hook
 			$settings = apply_filters(
 				'FHEE__EE_Config___load_core_config__config_settings',
@@ -247,22 +247,22 @@ 
 				$config,
 				$this
 			);
-			if ( is_object( $settings ) && property_exists( $this, $config ) ) {
-				$this->{$config} = apply_filters( 'FHEE__EE_Config___load_core_config__' . $config, $settings );
+			if (is_object($settings) && property_exists($this, $config)) {
+				$this->{$config} = apply_filters('FHEE__EE_Config___load_core_config__'.$config, $settings);
 				//call configs populate method to ensure any defaults are set for empty values.
-				if ( method_exists( $settings, 'populate' ) ) {
+				if (method_exists($settings, 'populate')) {
 					$this->{$config}->populate();
 				}
-				if ( method_exists( $settings, 'do_hooks' ) ) {
+				if (method_exists($settings, 'do_hooks')) {
 					$this->{$config}->do_hooks();
 				}
 			}
 		}
-		if ( apply_filters( 'FHEE__EE_Config___load_core_config__update_espresso_config', false ) ) {
+		if (apply_filters('FHEE__EE_Config___load_core_config__update_espresso_config', false)) {
 			$this->update_espresso_config();
 		}
 		// load_core_config__end hook
-		do_action( 'AHEE__EE_Config___load_core_config__end', $this );
+		do_action('AHEE__EE_Config___load_core_config__end', $this);
 	}
 
 
@@ -277,23 +277,23 @@ 
 		$this->core = $this->core instanceof EE_Core_Config
 			? $this->core
 			: new EE_Core_Config();
-		$this->core = apply_filters( 'FHEE__EE_Config___initialize_config__core', $this->core );
+		$this->core = apply_filters('FHEE__EE_Config___initialize_config__core', $this->core);
 		$this->organization = $this->organization instanceof EE_Organization_Config
 			? $this->organization
 			: new EE_Organization_Config();
-		$this->organization = apply_filters( 'FHEE__EE_Config___initialize_config__organization', $this->organization );
+		$this->organization = apply_filters('FHEE__EE_Config___initialize_config__organization', $this->organization);
 		$this->currency = $this->currency instanceof EE_Currency_Config
 			? $this->currency
 			: new EE_Currency_Config();
-		$this->currency = apply_filters( 'FHEE__EE_Config___initialize_config__currency', $this->currency );
+		$this->currency = apply_filters('FHEE__EE_Config___initialize_config__currency', $this->currency);
 		$this->registration = $this->registration instanceof EE_Registration_Config
 			? $this->registration
 			: new EE_Registration_Config();
-		$this->registration = apply_filters( 'FHEE__EE_Config___initialize_config__registration', $this->registration );
+		$this->registration = apply_filters('FHEE__EE_Config___initialize_config__registration', $this->registration);
 		$this->admin = $this->admin instanceof EE_Admin_Config
 			? $this->admin
 			: new EE_Admin_Config();
-		$this->admin = apply_filters( 'FHEE__EE_Config___initialize_config__admin', $this->admin );
+		$this->admin = apply_filters('FHEE__EE_Config___initialize_config__admin', $this->admin);
 		$this->template_settings = $this->template_settings instanceof EE_Template_Config
 			? $this->template_settings
 			: new EE_Template_Config();
@@ -304,15 +304,15 @@ 
 		$this->map_settings = $this->map_settings instanceof EE_Map_Config
 			? $this->map_settings
 			: new EE_Map_Config();
-		$this->map_settings = apply_filters( 'FHEE__EE_Config___initialize_config__map_settings', $this->map_settings );
+		$this->map_settings = apply_filters('FHEE__EE_Config___initialize_config__map_settings', $this->map_settings);
 		$this->environment = $this->environment instanceof EE_Environment_Config
 			? $this->environment
 			: new EE_Environment_Config();
-		$this->environment = apply_filters( 'FHEE__EE_Config___initialize_config__environment', $this->environment );
+		$this->environment = apply_filters('FHEE__EE_Config___initialize_config__environment', $this->environment);
 		$this->gateway = $this->gateway instanceof EE_Gateway_Config
 			? $this->gateway
 			: new EE_Gateway_Config();
-		$this->gateway = apply_filters( 'FHEE__EE_Config___initialize_config__gateway', $this->gateway );
+		$this->gateway = apply_filters('FHEE__EE_Config___initialize_config__gateway', $this->gateway);
 	}
 
 
@@ -327,7 +327,7 @@ 
 		// grab espresso configuration
 		return apply_filters(
 			'FHEE__EE_Config__get_espresso_config__CFG',
-			get_option( EE_Config::OPTION_NAME, array() )
+			get_option(EE_Config::OPTION_NAME, array())
 		);
 	}
 
@@ -341,12 +341,12 @@ 
 	 * @param        $old_value
 	 * @param        $value
 	 */
-	public function double_check_config_comparison( $option = '', $old_value, $value ) {
+	public function double_check_config_comparison($option = '', $old_value, $value) {
 		// make sure we're checking the ee config
-		if ( $option === EE_Config::OPTION_NAME ) {
+		if ($option === EE_Config::OPTION_NAME) {
 			// run a loose comparison of the old value against the new value for type and properties,
 			// but NOT exact instance like WP update_option does (ie: NOT type safe comparison)
-			if ( $value != $old_value ) {
+			if ($value != $old_value) {
 				// if they are NOT the same, then remove the hook,
 				// which means the subsequent update results will be based solely on the update query results
 				// the reason we do this is because, as stated above,
@@ -361,7 +361,7 @@ 
 				// the string it sees in the db looks the same as the new one it has been passed!!!
 				// This results in the query returning an "affected rows" value of ZERO,
 				// which gets returned immediately by WP update_option and looks like an error.
-				remove_action( 'update_option', array( $this, 'check_config_updated' ) );
+				remove_action('update_option', array($this, 'check_config_updated'));
 			}
 		}
 	}
@@ -375,11 +375,11 @@ 
 	 */
 	protected function _reset_espresso_addon_config() {
 		$this->_addon_option_names = array();
-		foreach ( $this->addons as $addon_name => $addon_config_obj ) {
-			$addon_config_obj = maybe_unserialize( $addon_config_obj );
-			$config_class = get_class( $addon_config_obj );
-			if ( $addon_config_obj instanceof $config_class && ! $addon_config_obj instanceof __PHP_Incomplete_Class ) {
-				$this->update_config( 'addons', $addon_name, $addon_config_obj, false );
+		foreach ($this->addons as $addon_name => $addon_config_obj) {
+			$addon_config_obj = maybe_unserialize($addon_config_obj);
+			$config_class = get_class($addon_config_obj);
+			if ($addon_config_obj instanceof $config_class && ! $addon_config_obj instanceof __PHP_Incomplete_Class) {
+				$this->update_config('addons', $addon_name, $addon_config_obj, false);
 			}
 			$this->addons->{$addon_name} = null;
 		}
@@ -395,22 +395,22 @@ 
 	 * @param   bool $add_error
 	 * @return   bool
 	 */
-	public function update_espresso_config( $add_success = false, $add_error = true ) {
+	public function update_espresso_config($add_success = false, $add_error = true) {
 		// don't allow config updates during WP heartbeats
-		if ( \EE_Registry::instance()->REQ->get( 'action', '' ) === 'heartbeat' ) {
+		if (\EE_Registry::instance()->REQ->get('action', '') === 'heartbeat') {
 			return false;
 		}
 		// commented out the following re: https://events.codebasehq.com/projects/event-espresso/tickets/8197
 		//$clone = clone( self::$_instance );
 		//self::$_instance = NULL;
-		do_action( 'AHEE__EE_Config__update_espresso_config__begin', $this );
+		do_action('AHEE__EE_Config__update_espresso_config__begin', $this);
 		$this->_reset_espresso_addon_config();
 		// hook into update_option because that happens AFTER the ( $value === $old_value ) conditional
 		// but BEFORE the actual update occurs
-		add_action( 'update_option', array( $this, 'double_check_config_comparison' ), 1, 3 );
+		add_action('update_option', array($this, 'double_check_config_comparison'), 1, 3);
 		// now update "ee_config"
-		$saved = update_option( EE_Config::OPTION_NAME, $this );
-		EE_Config::log( EE_Config::OPTION_NAME );
+		$saved = update_option(EE_Config::OPTION_NAME, $this);
+		EE_Config::log(EE_Config::OPTION_NAME);
 		// if not saved... check if the hook we just added still exists;
 		// if it does, it means one of two things:
 		// 		that update_option bailed at the ( $value === $old_value ) conditional,
@@ -421,17 +421,17 @@ 
 		// but just means no update occurred, so don't display an error to the user.
 		// BUT... if update_option returns FALSE, AND the hook is missing,
 		// then it means that something truly went wrong
-		$saved = ! $saved ? has_action( 'update_option', array( $this, 'double_check_config_comparison' ) ) : $saved;
+		$saved = ! $saved ? has_action('update_option', array($this, 'double_check_config_comparison')) : $saved;
 		// remove our action since we don't want it in the system anymore
-		remove_action( 'update_option', array( $this, 'double_check_config_comparison' ), 1 );
-		do_action( 'AHEE__EE_Config__update_espresso_config__end', $this, $saved );
+		remove_action('update_option', array($this, 'double_check_config_comparison'), 1);
+		do_action('AHEE__EE_Config__update_espresso_config__end', $this, $saved);
 		//self::$_instance = $clone;
 		//unset( $clone );
 		// if config remains the same or was updated successfully
-		if ( $saved ) {
-			if ( $add_success ) {
+		if ($saved) {
+			if ($add_success) {
 				EE_Error::add_success(
-					__( 'The Event Espresso Configuration Settings have been successfully updated.', 'event_espresso' ),
+					__('The Event Espresso Configuration Settings have been successfully updated.', 'event_espresso'),
 					__FILE__,
 					__FUNCTION__,
 					__LINE__
@@ -439,9 +439,9 @@ 
 			}
 			return true;
 		} else {
-			if ( $add_error ) {
+			if ($add_error) {
 				EE_Error::add_error(
-					__( 'The Event Espresso Configuration Settings were not updated.', 'event_espresso' ),
+					__('The Event Espresso Configuration Settings were not updated.', 'event_espresso'),
 					__FILE__,
 					__FUNCTION__,
 					__LINE__
@@ -470,16 +470,16 @@ 
 		$name = '',
 		$config_class = '',
 		$config_obj = null,
-		$tests_to_run = array( 1, 2, 3, 4, 5, 6, 7, 8 ),
+		$tests_to_run = array(1, 2, 3, 4, 5, 6, 7, 8),
 		$display_errors = true
 	) {
 		try {
-			foreach ( $tests_to_run as $test ) {
-				switch ( $test ) {
+			foreach ($tests_to_run as $test) {
+				switch ($test) {
 					// TEST #1 : check that section was set
 					case 1 :
-						if ( empty( $section ) ) {
-							if ( $display_errors ) {
+						if (empty($section)) {
+							if ($display_errors) {
 								throw new EE_Error(
 									sprintf(
 										__(
@@ -495,11 +495,11 @@ 
 						break;
 					// TEST #2 : check that settings section exists
 					case 2 :
-						if ( ! isset( $this->{$section} ) ) {
-							if ( $display_errors ) {
+						if ( ! isset($this->{$section} )) {
+							if ($display_errors) {
 								throw new EE_Error(
 									sprintf(
-										__( 'The "%s" configuration section does not exist.', 'event_espresso' ),
+										__('The "%s" configuration section does not exist.', 'event_espresso'),
 										$section
 									)
 								);
@@ -510,9 +510,9 @@ 
 					// TEST #3 : check that section is the proper format
 					case 3 :
 						if (
-						! ( $this->{$section} instanceof EE_Config_Base || $this->{$section} instanceof stdClass )
+						! ($this->{$section} instanceof EE_Config_Base || $this->{$section} instanceof stdClass)
 						) {
-							if ( $display_errors ) {
+							if ($display_errors) {
 								throw new EE_Error(
 									sprintf(
 										__(
@@ -528,8 +528,8 @@ 
 						break;
 					// TEST #4 : check that config section name has been set
 					case 4 :
-						if ( empty( $name ) ) {
-							if ( $display_errors ) {
+						if (empty($name)) {
+							if ($display_errors) {
 								throw new EE_Error(
 									__(
 										'No name has been provided for the specific configuration section.',
@@ -542,8 +542,8 @@ 
 						break;
 					// TEST #5 : check that a config class name has been set
 					case 5 :
-						if ( empty( $config_class ) ) {
-							if ( $display_errors ) {
+						if (empty($config_class)) {
+							if ($display_errors) {
 								throw new EE_Error(
 									__(
 										'No class name has been provided for the specific configuration section.',
@@ -556,8 +556,8 @@ 
 						break;
 					// TEST #6 : verify config class is accessible
 					case 6 :
-						if ( ! class_exists( $config_class ) ) {
-							if ( $display_errors ) {
+						if ( ! class_exists($config_class)) {
+							if ($display_errors) {
 								throw new EE_Error(
 									sprintf(
 										__(
@@ -573,11 +573,11 @@ 
 						break;
 					// TEST #7 : check that config has even been set
 					case 7 :
-						if ( ! isset( $this->{$section}->{$name} ) ) {
-							if ( $display_errors ) {
+						if ( ! isset($this->{$section}->{$name} )) {
+							if ($display_errors) {
 								throw new EE_Error(
 									sprintf(
-										__( 'No configuration has been set for "%1$s->%2$s".', 'event_espresso' ),
+										__('No configuration has been set for "%1$s->%2$s".', 'event_espresso'),
 										$section,
 										$name
 									)
@@ -586,13 +586,13 @@ 
 							return false;
 						} else {
 							// and make sure it's not serialized
-							$this->{$section}->{$name} = maybe_unserialize( $this->{$section}->{$name} );
+							$this->{$section}->{$name} = maybe_unserialize($this->{$section}->{$name} );
 						}
 						break;
 					// TEST #8 : check that config is the requested type
 					case 8 :
-						if ( ! $this->{$section}->{$name} instanceof $config_class ) {
-							if ( $display_errors ) {
+						if ( ! $this->{$section}->{$name} instanceof $config_class) {
+							if ($display_errors) {
 								throw new EE_Error(
 									sprintf(
 										__(
@@ -610,12 +610,12 @@ 
 						break;
 					// TEST #9 : verify config object
 					case 9 :
-						if ( ! $config_obj instanceof EE_Config_Base ) {
-							if ( $display_errors ) {
+						if ( ! $config_obj instanceof EE_Config_Base) {
+							if ($display_errors) {
 								throw new EE_Error(
 									sprintf(
-										__( 'The "%s" class is not an instance of EE_Config_Base.', 'event_espresso' ),
-										print_r( $config_obj, true )
+										__('The "%s" class is not an instance of EE_Config_Base.', 'event_espresso'),
+										print_r($config_obj, true)
 									)
 								);
 							}
@@ -624,7 +624,7 @@ 
 						break;
 				}
 			}
-		} catch ( EE_Error $e ) {
+		} catch (EE_Error $e) {
 			$e->get_error();
 		}
 		// you have successfully run the gauntlet
@@ -641,8 +641,8 @@ 
 	 * @param        string $name
 	 * @return        string
 	 */
-	private function _generate_config_option_name( $section = '', $name = '' ) {
-		return 'ee_config-' . strtolower( $section . '-' . str_replace( array( 'EE_', 'EED_' ), '', $name ) );
+	private function _generate_config_option_name($section = '', $name = '') {
+		return 'ee_config-'.strtolower($section.'-'.str_replace(array('EE_', 'EED_'), '', $name));
 	}
 
 
@@ -656,10 +656,10 @@ 
 	 * @param    string $name
 	 * @return    string
 	 */
-	private function _set_config_class( $config_class = '', $name = '' ) {
-		return ! empty( $config_class )
+	private function _set_config_class($config_class = '', $name = '') {
+		return ! empty($config_class)
 			? $config_class
-			: str_replace( ' ', '_', ucwords( str_replace( '_', ' ', $name ) ) ) . '_Config';
+			: str_replace(' ', '_', ucwords(str_replace('_', ' ', $name))).'_Config';
 	}
 
 
@@ -674,36 +674,36 @@ 
 	 * @param    EE_Config_Base $config_obj
 	 * @return    EE_Config_Base
 	 */
-	public function set_config( $section = '', $name = '', $config_class = '', EE_Config_Base $config_obj = null ) {
+	public function set_config($section = '', $name = '', $config_class = '', EE_Config_Base $config_obj = null) {
 		// ensure config class is set to something
-		$config_class = $this->_set_config_class( $config_class, $name );
+		$config_class = $this->_set_config_class($config_class, $name);
 		// run tests 1-4, 6, and 7 to verify all config params are set and valid
-		if ( ! $this->_verify_config_params( $section, $name, $config_class, null, array( 1, 2, 3, 4, 5, 6 ) ) ) {
+		if ( ! $this->_verify_config_params($section, $name, $config_class, null, array(1, 2, 3, 4, 5, 6))) {
 			return null;
 		}
-		$config_option_name = $this->_generate_config_option_name( $section, $name );
+		$config_option_name = $this->_generate_config_option_name($section, $name);
 		// if the config option name hasn't been added yet to the list of option names we're tracking, then do so now
-		if ( ! isset( $this->_addon_option_names[ $config_option_name ] ) ) {
-			$this->_addon_option_names[ $config_option_name ] = $config_class;
+		if ( ! isset($this->_addon_option_names[$config_option_name])) {
+			$this->_addon_option_names[$config_option_name] = $config_class;
 			$this->update_addon_option_names();
 		}
 		// verify the incoming config object but suppress errors
-		if ( ! $this->_verify_config_params( $section, $name, $config_class, $config_obj, array( 9 ), false ) ) {
+		if ( ! $this->_verify_config_params($section, $name, $config_class, $config_obj, array(9), false)) {
 			$config_obj = new $config_class();
 		}
-		if ( get_option( $config_option_name ) ) {
-			EE_Config::log( $config_option_name );
-			update_option( $config_option_name, $config_obj );
+		if (get_option($config_option_name)) {
+			EE_Config::log($config_option_name);
+			update_option($config_option_name, $config_obj);
 			$this->{$section}->{$name} = $config_obj;
 			return $this->{$section}->{$name};
 		} else {
 			// create a wp-option for this config
-			if ( add_option( $config_option_name, $config_obj, '', 'no' ) ) {
-				$this->{$section}->{$name} = maybe_unserialize( $config_obj );
+			if (add_option($config_option_name, $config_obj, '', 'no')) {
+				$this->{$section}->{$name} = maybe_unserialize($config_obj);
 				return $this->{$section}->{$name};
 			} else {
 				EE_Error::add_error(
-					sprintf( __( 'The "%s" could not be saved to the database.', 'event_espresso' ), $config_class ),
+					sprintf(__('The "%s" could not be saved to the database.', 'event_espresso'), $config_class),
 					__FILE__,
 					__FUNCTION__,
 					__LINE__
@@ -726,46 +726,46 @@ 
 	 * @param    bool                  $throw_errors
 	 * @return    bool
 	 */
-	public function update_config( $section = '', $name = '', $config_obj = '', $throw_errors = true ) {
+	public function update_config($section = '', $name = '', $config_obj = '', $throw_errors = true) {
 		// don't allow config updates during WP heartbeats
-		if ( \EE_Registry::instance()->REQ->get( 'action', '' ) === 'heartbeat' ) {
+		if (\EE_Registry::instance()->REQ->get('action', '') === 'heartbeat') {
 			return false;
 		}
-		$config_obj = maybe_unserialize( $config_obj );
+		$config_obj = maybe_unserialize($config_obj);
 		// get class name of the incoming object
-		$config_class = get_class( $config_obj );
+		$config_class = get_class($config_obj);
 		// run tests 1-5 and 9 to verify config
 		if ( ! $this->_verify_config_params(
 			$section,
 			$name,
 			$config_class,
 			$config_obj,
-			array( 1, 2, 3, 4, 7, 9 )
+			array(1, 2, 3, 4, 7, 9)
 		)
 		) {
 			return false;
 		}
-		$config_option_name = $this->_generate_config_option_name( $section, $name );
+		$config_option_name = $this->_generate_config_option_name($section, $name);
 		// check if config object has been added to db by seeing if config option name is in $this->_addon_option_names array
-		if ( ! isset( $this->_addon_option_names[ $config_option_name ] ) ) {
+		if ( ! isset($this->_addon_option_names[$config_option_name])) {
 			// save new config to db
-			if( $this->set_config( $section, $name, $config_class, $config_obj ) ) {
+			if ($this->set_config($section, $name, $config_class, $config_obj)) {
 				return true;
 			}
 		} else {
 			// first check if the record already exists
-			$existing_config = get_option( $config_option_name );
-			$config_obj = serialize( $config_obj );
+			$existing_config = get_option($config_option_name);
+			$config_obj = serialize($config_obj);
 			// just return if db record is already up to date (NOT type safe comparison)
-			if ( $existing_config == $config_obj ) {
+			if ($existing_config == $config_obj) {
 				$this->{$section}->{$name} = $config_obj;
 				return true;
-			} else if ( update_option( $config_option_name, $config_obj ) ) {
-				EE_Config::log( $config_option_name );
+			} else if (update_option($config_option_name, $config_obj)) {
+				EE_Config::log($config_option_name);
 				// update wp-option for this config class
 				$this->{$section}->{$name} = $config_obj;
 				return true;
-			} elseif ( $throw_errors ) {
+			} elseif ($throw_errors) {
 				EE_Error::add_error(
 					sprintf(
 						__(
@@ -773,7 +773,7 @@ 
 							'event_espresso'
 						),
 						$config_class,
-						'EE_Config->' . $section . '->' . $name
+						'EE_Config->'.$section.'->'.$name
 					),
 					__FILE__,
 					__FUNCTION__,
@@ -795,34 +795,34 @@ 
 	 * @param    string $config_class
 	 * @return    mixed EE_Config_Base | NULL
 	 */
-	public function get_config( $section = '', $name = '', $config_class = '' ) {
+	public function get_config($section = '', $name = '', $config_class = '') {
 		// ensure config class is set to something
-		$config_class = $this->_set_config_class( $config_class, $name );
+		$config_class = $this->_set_config_class($config_class, $name);
 		// run tests 1-4, 6 and 7 to verify that all params have been set
-		if ( ! $this->_verify_config_params( $section, $name, $config_class, null, array( 1, 2, 3, 4, 5, 6 ) ) ) {
+		if ( ! $this->_verify_config_params($section, $name, $config_class, null, array(1, 2, 3, 4, 5, 6))) {
 			return null;
 		}
 		// now test if the requested config object exists, but suppress errors
-		if ( $this->_verify_config_params( $section, $name, $config_class, null, array( 7, 8 ), false ) ) {
+		if ($this->_verify_config_params($section, $name, $config_class, null, array(7, 8), false)) {
 			// config already exists, so pass it back
 			return $this->{$section}->{$name};
 		}
 		// load config option from db if it exists
-		$config_obj = $this->get_config_option( $this->_generate_config_option_name( $section, $name ) );
+		$config_obj = $this->get_config_option($this->_generate_config_option_name($section, $name));
 		// verify the newly retrieved config object, but suppress errors
-		if ( $this->_verify_config_params( $section, $name, $config_class, $config_obj, array( 9 ), false ) ) {
+		if ($this->_verify_config_params($section, $name, $config_class, $config_obj, array(9), false)) {
 			// config is good, so set it and pass it back
 			$this->{$section}->{$name} = $config_obj;
 			return $this->{$section}->{$name};
 		}
 		// oops! $config_obj is not already set and does not exist in the db, so create a new one
-		$config_obj = $this->set_config( $section, $name, $config_class );
+		$config_obj = $this->set_config($section, $name, $config_class);
 		// verify the newly created config object
-		if ( $this->_verify_config_params( $section, $name, $config_class, $config_obj, array( 9 ) ) ) {
+		if ($this->_verify_config_params($section, $name, $config_class, $config_obj, array(9))) {
 			return $this->{$section}->{$name};
 		} else {
 			EE_Error::add_error(
-				sprintf( __( 'The "%s" could not be retrieved from the database.', 'event_espresso' ), $config_class ),
+				sprintf(__('The "%s" could not be retrieved from the database.', 'event_espresso'), $config_class),
 				__FILE__,
 				__FUNCTION__,
 				__LINE__
@@ -840,11 +840,11 @@ 
 	 * @param    string $config_option_name
 	 * @return    mixed EE_Config_Base | FALSE
 	 */
-	public function get_config_option( $config_option_name = '' ) {
+	public function get_config_option($config_option_name = '') {
 		// retrieve the wp-option for this config class.
-		$config_option = maybe_unserialize( get_option( $config_option_name, array() ) );
-		if ( empty( $config_option ) ) {
-			EE_Config::log( $config_option_name . '-NOT-FOUND' );
+		$config_option = maybe_unserialize(get_option($config_option_name, array()));
+		if (empty($config_option)) {
+			EE_Config::log($config_option_name.'-NOT-FOUND');
 		}
 		return $config_option;
 	}
@@ -856,17 +856,17 @@ 
 	 *
 	 * @param string $config_option_name
 	 */
-	public static function log( $config_option_name = '' ) {
-		if ( ! empty( $config_option_name ) ) {
-			$config_log = get_option( EE_Config::LOG_NAME, array() );
+	public static function log($config_option_name = '') {
+		if ( ! empty($config_option_name)) {
+			$config_log = get_option(EE_Config::LOG_NAME, array());
 			//copy incoming $_REQUEST and sanitize it so we can save it
 			$_request = $_REQUEST;
-			array_walk_recursive( $_request, 'sanitize_text_field' );
-			$config_log[ (string) microtime( true ) ] = array(
+			array_walk_recursive($_request, 'sanitize_text_field');
+			$config_log[(string) microtime(true)] = array(
 				'config_name' => $config_option_name,
 				'request'     => $_request,
 			);
-			update_option( EE_Config::LOG_NAME, $config_log );
+			update_option(EE_Config::LOG_NAME, $config_log);
 		}
 	}
 
@@ -877,12 +877,12 @@ 
 	 * reduces the size of the config log to the length specified by EE_Config::LOG_LENGTH
 	 */
 	public static function trim_log() {
-		$config_log = get_option( EE_Config::LOG_NAME, array() );
-		$log_length = count( $config_log );
-		if ( $log_length > EE_Config::LOG_LENGTH ) {
-			ksort( $config_log );
-			$config_log = array_slice( $config_log, $log_length - EE_Config::LOG_LENGTH, null, true );
-			update_option( EE_Config::LOG_NAME, $config_log );
+		$config_log = get_option(EE_Config::LOG_NAME, array());
+		$log_length = count($config_log);
+		if ($log_length > EE_Config::LOG_LENGTH) {
+			ksort($config_log);
+			$config_log = array_slice($config_log, $log_length - EE_Config::LOG_LENGTH, null, true);
+			update_option(EE_Config::LOG_NAME, $config_log);
 		}
 	}
 
@@ -897,14 +897,14 @@ 
 	 * @return    string
 	 */
 	public static function get_page_for_posts() {
-		$page_for_posts = get_option( 'page_for_posts' );
-		if ( ! $page_for_posts ) {
+		$page_for_posts = get_option('page_for_posts');
+		if ( ! $page_for_posts) {
 			return 'posts';
 		}
 		/** @type WPDB $wpdb */
 		global $wpdb;
 		$SQL = "SELECT post_name from $wpdb->posts WHERE post_type='posts' OR post_type='page' AND post_status='publish' AND ID=%d";
-		return $wpdb->get_var( $wpdb->prepare( $SQL, $page_for_posts ) );
+		return $wpdb->get_var($wpdb->prepare($SQL, $page_for_posts));
 	}
 
 
@@ -960,17 +960,17 @@ 
 			)
 		) {
 			// grab list of installed widgets
-			$widgets_to_register = glob( EE_WIDGETS . '*', GLOB_ONLYDIR );
+			$widgets_to_register = glob(EE_WIDGETS.'*', GLOB_ONLYDIR);
 			// filter list of modules to register
 			$widgets_to_register = apply_filters(
 				'FHEE__EE_Config__register_widgets__widgets_to_register',
 				$widgets_to_register
 			);
-			if ( ! empty( $widgets_to_register ) ) {
+			if ( ! empty($widgets_to_register)) {
 				// cycle thru widget folders
-				foreach ( $widgets_to_register as $widget_path ) {
+				foreach ($widgets_to_register as $widget_path) {
 					// add to list of installed widget modules
-					EE_Config::register_ee_widget( $widget_path );
+					EE_Config::register_ee_widget($widget_path);
 				}
 			}
 			// filter list of installed modules
@@ -990,57 +990,57 @@ 
 	 * @param    string $widget_path - full path up to and including widget folder
 	 * @return    void
 	 */
-	public static function register_ee_widget( $widget_path = null ) {
-		do_action( 'AHEE__EE_Config__register_widget__begin', $widget_path );
+	public static function register_ee_widget($widget_path = null) {
+		do_action('AHEE__EE_Config__register_widget__begin', $widget_path);
 		$widget_ext = '.widget.php';
 		// make all separators match
-		$widget_path = rtrim( str_replace( '/\\', DS, $widget_path ), DS );
+		$widget_path = rtrim(str_replace('/\\', DS, $widget_path), DS);
 		// does the file path INCLUDE the actual file name as part of the path ?
-		if ( strpos( $widget_path, $widget_ext ) !== false ) {
+		if (strpos($widget_path, $widget_ext) !== false) {
 			// grab and shortcode file name from directory name and break apart at dots
-			$file_name = explode( '.', basename( $widget_path ) );
+			$file_name = explode('.', basename($widget_path));
 			// take first segment from file name pieces and remove class prefix if it exists
-			$widget = strpos( $file_name[0], 'EEW_' ) === 0 ? substr( $file_name[0], 4 ) : $file_name[0];
+			$widget = strpos($file_name[0], 'EEW_') === 0 ? substr($file_name[0], 4) : $file_name[0];
 			// sanitize shortcode directory name
-			$widget = sanitize_key( $widget );
+			$widget = sanitize_key($widget);
 			// now we need to rebuild the shortcode path
-			$widget_path = explode( DS, $widget_path );
+			$widget_path = explode(DS, $widget_path);
 			// remove last segment
-			array_pop( $widget_path );
+			array_pop($widget_path);
 			// glue it back together
-			$widget_path = implode( DS, $widget_path );
+			$widget_path = implode(DS, $widget_path);
 		} else {
 			// grab and sanitize widget directory name
-			$widget = sanitize_key( basename( $widget_path ) );
+			$widget = sanitize_key(basename($widget_path));
 		}
 		// create classname from widget directory name
-		$widget = str_replace( ' ', '_', ucwords( str_replace( '_', ' ', $widget ) ) );
+		$widget = str_replace(' ', '_', ucwords(str_replace('_', ' ', $widget)));
 		// add class prefix
-		$widget_class = 'EEW_' . $widget;
+		$widget_class = 'EEW_'.$widget;
 		// does the widget exist ?
-		if ( ! is_readable( $widget_path . DS . $widget_class . $widget_ext ) ) {
+		if ( ! is_readable($widget_path.DS.$widget_class.$widget_ext)) {
 			$msg = sprintf(
 				__(
 					'The requested %s widget file could not be found or is not readable due to file permissions. Please ensure the following path is correct: %s',
 					'event_espresso'
 				),
 				$widget_class,
-				$widget_path . DS . $widget_class . $widget_ext
+				$widget_path.DS.$widget_class.$widget_ext
 			);
-			EE_Error::add_error( $msg . '||' . $msg, __FILE__, __FUNCTION__, __LINE__ );
+			EE_Error::add_error($msg.'||'.$msg, __FILE__, __FUNCTION__, __LINE__);
 			return;
 		}
 		// load the widget class file
-		require_once( $widget_path . DS . $widget_class . $widget_ext );
+		require_once($widget_path.DS.$widget_class.$widget_ext);
 		// verify that class exists
-		if ( ! class_exists( $widget_class ) ) {
-			$msg = sprintf( __( 'The requested %s widget class does not exist.', 'event_espresso' ), $widget_class );
-			EE_Error::add_error( $msg . '||' . $msg, __FILE__, __FUNCTION__, __LINE__ );
+		if ( ! class_exists($widget_class)) {
+			$msg = sprintf(__('The requested %s widget class does not exist.', 'event_espresso'), $widget_class);
+			EE_Error::add_error($msg.'||'.$msg, __FILE__, __FUNCTION__, __LINE__);
 			return;
 		}
-		register_widget( $widget_class );
+		register_widget($widget_class);
 		// add to array of registered widgets
-		EE_Registry::instance()->widgets->{$widget_class} = $widget_path . DS . $widget_class . $widget_ext;
+		EE_Registry::instance()->widgets->{$widget_class} = $widget_path.DS.$widget_class.$widget_ext;
 	}
 
 
@@ -1053,17 +1053,17 @@ 
 	 */
 	private function _register_shortcodes() {
 		// grab list of installed shortcodes
-		$shortcodes_to_register = glob( EE_SHORTCODES . '*', GLOB_ONLYDIR );
+		$shortcodes_to_register = glob(EE_SHORTCODES.'*', GLOB_ONLYDIR);
 		// filter list of modules to register
 		$shortcodes_to_register = apply_filters(
 			'FHEE__EE_Config__register_shortcodes__shortcodes_to_register',
 			$shortcodes_to_register
 		);
-		if ( ! empty( $shortcodes_to_register ) ) {
+		if ( ! empty($shortcodes_to_register)) {
 			// cycle thru shortcode folders
-			foreach ( $shortcodes_to_register as $shortcode_path ) {
+			foreach ($shortcodes_to_register as $shortcode_path) {
 				// add to list of installed shortcode modules
-				EE_Config::register_shortcode( $shortcode_path );
+				EE_Config::register_shortcode($shortcode_path);
 			}
 		}
 		// filter list of installed modules
@@ -1082,64 +1082,64 @@ 
 	 * @param    string $shortcode_path - full path up to and including shortcode folder
 	 * @return    bool
 	 */
-	public static function register_shortcode( $shortcode_path = null ) {
-		do_action( 'AHEE__EE_Config__register_shortcode__begin', $shortcode_path );
+	public static function register_shortcode($shortcode_path = null) {
+		do_action('AHEE__EE_Config__register_shortcode__begin', $shortcode_path);
 		$shortcode_ext = '.shortcode.php';
 		// make all separators match
-		$shortcode_path = str_replace( array( '\\', '/' ), DS, $shortcode_path );
+		$shortcode_path = str_replace(array('\\', '/'), DS, $shortcode_path);
 		// does the file path INCLUDE the actual file name as part of the path ?
-		if ( strpos( $shortcode_path, $shortcode_ext ) !== false ) {
+		if (strpos($shortcode_path, $shortcode_ext) !== false) {
 			// grab shortcode file name from directory name and break apart at dots
-			$shortcode_file = explode( '.', basename( $shortcode_path ) );
+			$shortcode_file = explode('.', basename($shortcode_path));
 			// take first segment from file name pieces and remove class prefix if it exists
-			$shortcode = strpos( $shortcode_file[0], 'EES_' ) === 0
-				? substr( $shortcode_file[0], 4 )
+			$shortcode = strpos($shortcode_file[0], 'EES_') === 0
+				? substr($shortcode_file[0], 4)
 				: $shortcode_file[0];
 			// sanitize shortcode directory name
-			$shortcode = sanitize_key( $shortcode );
+			$shortcode = sanitize_key($shortcode);
 			// now we need to rebuild the shortcode path
-			$shortcode_path = explode( DS, $shortcode_path );
+			$shortcode_path = explode(DS, $shortcode_path);
 			// remove last segment
-			array_pop( $shortcode_path );
+			array_pop($shortcode_path);
 			// glue it back together
-			$shortcode_path = implode( DS, $shortcode_path ) . DS;
+			$shortcode_path = implode(DS, $shortcode_path).DS;
 		} else {
 			// we need to generate the filename based off of the folder name
 			// grab and sanitize shortcode directory name
-			$shortcode = sanitize_key( basename( $shortcode_path ) );
-			$shortcode_path = rtrim( $shortcode_path, DS ) . DS;
+			$shortcode = sanitize_key(basename($shortcode_path));
+			$shortcode_path = rtrim($shortcode_path, DS).DS;
 		}
 		// create classname from shortcode directory or file name
-		$shortcode = str_replace( ' ', '_', ucwords( str_replace( '_', ' ', $shortcode ) ) );
+		$shortcode = str_replace(' ', '_', ucwords(str_replace('_', ' ', $shortcode)));
 		// add class prefix
-		$shortcode_class = 'EES_' . $shortcode;
+		$shortcode_class = 'EES_'.$shortcode;
 		// does the shortcode exist ?
-		if ( ! is_readable( $shortcode_path . DS . $shortcode_class . $shortcode_ext ) ) {
+		if ( ! is_readable($shortcode_path.DS.$shortcode_class.$shortcode_ext)) {
 			$msg = sprintf(
 				__(
 					'The requested %s shortcode file could not be found or is not readable due to file permissions. It should be in %s',
 					'event_espresso'
 				),
 				$shortcode_class,
-				$shortcode_path . DS . $shortcode_class . $shortcode_ext
+				$shortcode_path.DS.$shortcode_class.$shortcode_ext
 			);
-			EE_Error::add_error( $msg . '||' . $msg, __FILE__, __FUNCTION__, __LINE__ );
+			EE_Error::add_error($msg.'||'.$msg, __FILE__, __FUNCTION__, __LINE__);
 			return false;
 		}
 		// load the shortcode class file
-		require_once( $shortcode_path . $shortcode_class . $shortcode_ext );
+		require_once($shortcode_path.$shortcode_class.$shortcode_ext);
 		// verify that class exists
-		if ( ! class_exists( $shortcode_class ) ) {
+		if ( ! class_exists($shortcode_class)) {
 			$msg = sprintf(
-				__( 'The requested %s shortcode class does not exist.', 'event_espresso' ),
+				__('The requested %s shortcode class does not exist.', 'event_espresso'),
 				$shortcode_class
 			);
-			EE_Error::add_error( $msg . '||' . $msg, __FILE__, __FUNCTION__, __LINE__ );
+			EE_Error::add_error($msg.'||'.$msg, __FILE__, __FUNCTION__, __LINE__);
 			return false;
 		}
-		$shortcode = strtoupper( $shortcode );
+		$shortcode = strtoupper($shortcode);
 		// add to array of registered shortcodes
-		EE_Registry::instance()->shortcodes->{$shortcode} = $shortcode_path . $shortcode_class . $shortcode_ext;
+		EE_Registry::instance()->shortcodes->{$shortcode} = $shortcode_path.$shortcode_class.$shortcode_ext;
 		return true;
 	}
 
@@ -1153,22 +1153,22 @@ 
 	 */
 	private function _register_modules() {
 		// grab list of installed modules
-		$modules_to_register = glob( EE_MODULES . '*', GLOB_ONLYDIR );
+		$modules_to_register = glob(EE_MODULES.'*', GLOB_ONLYDIR);
 		// filter list of modules to register
 		$modules_to_register = apply_filters(
 			'FHEE__EE_Config__register_modules__modules_to_register',
 			$modules_to_register
 		);
-		if ( ! empty( $modules_to_register ) ) {
+		if ( ! empty($modules_to_register)) {
 			// loop through folders
-			foreach ( $modules_to_register as $module_path ) {
+			foreach ($modules_to_register as $module_path) {
 				/**TEMPORARILY EXCLUDE gateways from modules for time being**/
 				if (
-					$module_path !== EE_MODULES . 'zzz-copy-this-module-template'
-					&& $module_path !== EE_MODULES . 'gateways'
+					$module_path !== EE_MODULES.'zzz-copy-this-module-template'
+					&& $module_path !== EE_MODULES.'gateways'
 				) {
 					// add to list of installed modules
-					EE_Config::register_module( $module_path );
+					EE_Config::register_module($module_path);
 				}
 			}
 		}
@@ -1188,39 +1188,39 @@ 
 	 * @param    string $module_path - full path up to and including module folder
 	 * @return    bool
 	 */
-	public static function register_module( $module_path = null ) {
-		do_action( 'AHEE__EE_Config__register_module__begin', $module_path );
+	public static function register_module($module_path = null) {
+		do_action('AHEE__EE_Config__register_module__begin', $module_path);
 		$module_ext = '.module.php';
 		// make all separators match
-		$module_path = str_replace( array( '\\', '/' ), DS, $module_path );
+		$module_path = str_replace(array('\\', '/'), DS, $module_path);
 		// does the file path INCLUDE the actual file name as part of the path ?
-		if ( strpos( $module_path, $module_ext ) !== false ) {
+		if (strpos($module_path, $module_ext) !== false) {
 			// grab and shortcode file name from directory name and break apart at dots
-			$module_file = explode( '.', basename( $module_path ) );
+			$module_file = explode('.', basename($module_path));
 			// now we need to rebuild the shortcode path
-			$module_path = explode( DS, $module_path );
+			$module_path = explode(DS, $module_path);
 			// remove last segment
-			array_pop( $module_path );
+			array_pop($module_path);
 			// glue it back together
-			$module_path = implode( DS, $module_path ) . DS;
+			$module_path = implode(DS, $module_path).DS;
 			// take first segment from file name pieces and sanitize it
-			$module = preg_replace( '/[^a-zA-Z0-9_\-]/', '', $module_file[0] );
+			$module = preg_replace('/[^a-zA-Z0-9_\-]/', '', $module_file[0]);
 			// ensure class prefix is added
-			$module_class = strpos( $module, 'EED_' ) !== 0 ? 'EED_' . $module : $module;
+			$module_class = strpos($module, 'EED_') !== 0 ? 'EED_'.$module : $module;
 		} else {
 			// we need to generate the filename based off of the folder name
 			// grab and sanitize module name
-			$module = strtolower( basename( $module_path ) );
-			$module = preg_replace( '/[^a-z0-9_\-]/', '', $module );
+			$module = strtolower(basename($module_path));
+			$module = preg_replace('/[^a-z0-9_\-]/', '', $module);
 			// like trailingslashit()
-			$module_path = rtrim( $module_path, DS ) . DS;
+			$module_path = rtrim($module_path, DS).DS;
 			// create classname from module directory name
-			$module = str_replace( ' ', '_', ucwords( str_replace( '_', ' ', $module ) ) );
+			$module = str_replace(' ', '_', ucwords(str_replace('_', ' ', $module)));
 			// add class prefix
-			$module_class = 'EED_' . $module;
+			$module_class = 'EED_'.$module;
 		}
 		// does the module exist ?
-		if ( ! is_readable( $module_path . DS . $module_class . $module_ext ) ) {
+		if ( ! is_readable($module_path.DS.$module_class.$module_ext)) {
 			$msg = sprintf(
 				__(
 					'The requested %s module file could not be found or is not readable due to file permissions.',
@@ -1228,19 +1228,19 @@ 
 				),
 				$module
 			);
-			EE_Error::add_error( $msg . '||' . $msg, __FILE__, __FUNCTION__, __LINE__ );
+			EE_Error::add_error($msg.'||'.$msg, __FILE__, __FUNCTION__, __LINE__);
 			return false;
 		}
 		// load the module class file
-		require_once( $module_path . $module_class . $module_ext );
+		require_once($module_path.$module_class.$module_ext);
 		// verify that class exists
-		if ( ! class_exists( $module_class ) ) {
-			$msg = sprintf( __( 'The requested %s module class does not exist.', 'event_espresso' ), $module_class );
-			EE_Error::add_error( $msg . '||' . $msg, __FILE__, __FUNCTION__, __LINE__ );
+		if ( ! class_exists($module_class)) {
+			$msg = sprintf(__('The requested %s module class does not exist.', 'event_espresso'), $module_class);
+			EE_Error::add_error($msg.'||'.$msg, __FILE__, __FUNCTION__, __LINE__);
 			return false;
 		}
 		// add to array of registered modules
-		EE_Registry::instance()->modules->{$module_class} = $module_path . $module_class . $module_ext;
+		EE_Registry::instance()->modules->{$module_class} = $module_path.$module_class.$module_ext;
 		do_action(
 			'AHEE__EE_Config__register_module__complete',
 			$module_class,
@@ -1260,26 +1260,26 @@ 
 	 */
 	private function _initialize_shortcodes() {
 		// cycle thru shortcode folders
-		foreach ( EE_Registry::instance()->shortcodes as $shortcode => $shortcode_path ) {
+		foreach (EE_Registry::instance()->shortcodes as $shortcode => $shortcode_path) {
 			// add class prefix
-			$shortcode_class = 'EES_' . $shortcode;
+			$shortcode_class = 'EES_'.$shortcode;
 			// fire the shortcode class's set_hooks methods in case it needs to hook into other parts of the system
 			// which set hooks ?
-			if ( is_admin() ) {
+			if (is_admin()) {
 				// fire immediately
-				call_user_func( array( $shortcode_class, 'set_hooks_admin' ) );
+				call_user_func(array($shortcode_class, 'set_hooks_admin'));
 			} else {
 				// delay until other systems are online
 				add_action(
 					'AHEE__EE_System__set_hooks_for_shortcodes_modules_and_addons',
-					array( $shortcode_class, 'set_hooks' )
+					array($shortcode_class, 'set_hooks')
 				);
 				// convert classname to UPPERCASE and create WP shortcode.
-				$shortcode_tag = strtoupper( $shortcode );
+				$shortcode_tag = strtoupper($shortcode);
 				// but first check if the shortcode has already been added before assigning 'fallback_shortcode_processor'
-				if ( ! shortcode_exists( $shortcode_tag ) ) {
+				if ( ! shortcode_exists($shortcode_tag)) {
 					// NOTE: this shortcode declaration will get overridden if the shortcode is successfully detected in the post content in EE_Front_Controller->_initialize_shortcodes()
-					add_shortcode( $shortcode_tag, array( $shortcode_class, 'fallback_shortcode_processor' ) );
+					add_shortcode($shortcode_tag, array($shortcode_class, 'fallback_shortcode_processor'));
 				}
 			}
 		}
@@ -1296,17 +1296,17 @@ 
 	 */
 	private function _initialize_modules() {
 		// cycle thru shortcode folders
-		foreach ( EE_Registry::instance()->modules as $module_class => $module_path ) {
+		foreach (EE_Registry::instance()->modules as $module_class => $module_path) {
 			// fire the shortcode class's set_hooks methods in case it needs to hook into other parts of the system
 			// which set hooks ?
-			if ( is_admin() ) {
+			if (is_admin()) {
 				// fire immediately
-				call_user_func( array( $module_class, 'set_hooks_admin' ) );
+				call_user_func(array($module_class, 'set_hooks_admin'));
 			} else {
 				// delay until other systems are online
 				add_action(
 					'AHEE__EE_System__set_hooks_for_shortcodes_modules_and_addons',
-					array( $module_class, 'set_hooks' )
+					array($module_class, 'set_hooks')
 				);
 			}
 		}
@@ -1324,29 +1324,29 @@ 
 	 * @param    string $key         - url param key indicating a route is being called
 	 * @return    bool
 	 */
-	public static function register_route( $route = null, $module = null, $method_name = null, $key = 'ee' ) {
-		do_action( 'AHEE__EE_Config__register_route__begin', $route, $module, $method_name );
-		$module = str_replace( 'EED_', '', $module );
-		$module_class = 'EED_' . $module;
-		if ( ! isset( EE_Registry::instance()->modules->{$module_class} ) ) {
-			$msg = sprintf( __( 'The module %s has not been registered.', 'event_espresso' ), $module );
-			EE_Error::add_error( $msg . '||' . $msg, __FILE__, __FUNCTION__, __LINE__ );
+	public static function register_route($route = null, $module = null, $method_name = null, $key = 'ee') {
+		do_action('AHEE__EE_Config__register_route__begin', $route, $module, $method_name);
+		$module = str_replace('EED_', '', $module);
+		$module_class = 'EED_'.$module;
+		if ( ! isset(EE_Registry::instance()->modules->{$module_class} )) {
+			$msg = sprintf(__('The module %s has not been registered.', 'event_espresso'), $module);
+			EE_Error::add_error($msg.'||'.$msg, __FILE__, __FUNCTION__, __LINE__);
 			return false;
 		}
-		if ( empty( $route ) ) {
-			$msg = sprintf( __( 'No route has been supplied.', 'event_espresso' ), $route );
-			EE_Error::add_error( $msg . '||' . $msg, __FILE__, __FUNCTION__, __LINE__ );
+		if (empty($route)) {
+			$msg = sprintf(__('No route has been supplied.', 'event_espresso'), $route);
+			EE_Error::add_error($msg.'||'.$msg, __FILE__, __FUNCTION__, __LINE__);
 			return false;
 		}
-		if ( ! method_exists( 'EED_' . $module, $method_name ) ) {
+		if ( ! method_exists('EED_'.$module, $method_name)) {
 			$msg = sprintf(
-				__( 'A valid class method for the %s route has not been supplied.', 'event_espresso' ),
+				__('A valid class method for the %s route has not been supplied.', 'event_espresso'),
 				$route
 			);
-			EE_Error::add_error( $msg . '||' . $msg, __FILE__, __FUNCTION__, __LINE__ );
+			EE_Error::add_error($msg.'||'.$msg, __FILE__, __FUNCTION__, __LINE__);
 			return false;
 		}
-		EE_Config::$_module_route_map[ $key ][ $route ] = array( 'EED_' . $module, $method_name );
+		EE_Config::$_module_route_map[$key][$route] = array('EED_'.$module, $method_name);
 		return true;
 	}
 
@@ -1360,11 +1360,11 @@ 
 	 * @param    string $key   - url param key indicating a route is being called
 	 * @return    string
 	 */
-	public static function get_route( $route = null, $key = 'ee' ) {
-		do_action( 'AHEE__EE_Config__get_route__begin', $route );
-		$route = (string) apply_filters( 'FHEE__EE_Config__get_route', $route );
-		if ( isset( EE_Config::$_module_route_map[ $key ][ $route ] ) ) {
-			return EE_Config::$_module_route_map[ $key ][ $route ];
+	public static function get_route($route = null, $key = 'ee') {
+		do_action('AHEE__EE_Config__get_route__begin', $route);
+		$route = (string) apply_filters('FHEE__EE_Config__get_route', $route);
+		if (isset(EE_Config::$_module_route_map[$key][$route])) {
+			return EE_Config::$_module_route_map[$key][$route];
 		}
 		return null;
 	}
@@ -1394,49 +1394,49 @@ 
 	 * @param    string       $key     - url param key indicating a route is being called
 	 * @return    bool
 	 */
-	public static function register_forward( $route = null, $status = 0, $forward = null, $key = 'ee' ) {
-		do_action( 'AHEE__EE_Config__register_forward', $route, $status, $forward );
-		if ( ! isset( EE_Config::$_module_route_map[ $key ][ $route ] ) || empty( $route ) ) {
+	public static function register_forward($route = null, $status = 0, $forward = null, $key = 'ee') {
+		do_action('AHEE__EE_Config__register_forward', $route, $status, $forward);
+		if ( ! isset(EE_Config::$_module_route_map[$key][$route]) || empty($route)) {
 			$msg = sprintf(
-				__( 'The module route %s for this forward has not been registered.', 'event_espresso' ),
+				__('The module route %s for this forward has not been registered.', 'event_espresso'),
 				$route
 			);
-			EE_Error::add_error( $msg . '||' . $msg, __FILE__, __FUNCTION__, __LINE__ );
+			EE_Error::add_error($msg.'||'.$msg, __FILE__, __FUNCTION__, __LINE__);
 			return false;
 		}
-		if ( empty( $forward ) ) {
-			$msg = sprintf( __( 'No forwarding route has been supplied.', 'event_espresso' ), $route );
-			EE_Error::add_error( $msg . '||' . $msg, __FILE__, __FUNCTION__, __LINE__ );
+		if (empty($forward)) {
+			$msg = sprintf(__('No forwarding route has been supplied.', 'event_espresso'), $route);
+			EE_Error::add_error($msg.'||'.$msg, __FILE__, __FUNCTION__, __LINE__);
 			return false;
 		}
-		if ( is_array( $forward ) ) {
-			if ( ! isset( $forward[1] ) ) {
+		if (is_array($forward)) {
+			if ( ! isset($forward[1])) {
 				$msg = sprintf(
-					__( 'A class method for the %s forwarding route has not been supplied.', 'event_espresso' ),
+					__('A class method for the %s forwarding route has not been supplied.', 'event_espresso'),
 					$route
 				);
-				EE_Error::add_error( $msg . '||' . $msg, __FILE__, __FUNCTION__, __LINE__ );
+				EE_Error::add_error($msg.'||'.$msg, __FILE__, __FUNCTION__, __LINE__);
 				return false;
 			}
-			if ( ! method_exists( $forward[0], $forward[1] ) ) {
+			if ( ! method_exists($forward[0], $forward[1])) {
 				$msg = sprintf(
-					__( 'The class method %s for the %s forwarding route is in invalid.', 'event_espresso' ),
+					__('The class method %s for the %s forwarding route is in invalid.', 'event_espresso'),
 					$forward[1],
 					$route
 				);
-				EE_Error::add_error( $msg . '||' . $msg, __FILE__, __FUNCTION__, __LINE__ );
+				EE_Error::add_error($msg.'||'.$msg, __FILE__, __FUNCTION__, __LINE__);
 				return false;
 			}
-		} else if ( ! function_exists( $forward ) ) {
+		} else if ( ! function_exists($forward)) {
 			$msg = sprintf(
-				__( 'The function %s for the %s forwarding route is in invalid.', 'event_espresso' ),
+				__('The function %s for the %s forwarding route is in invalid.', 'event_espresso'),
 				$forward,
 				$route
 			);
-			EE_Error::add_error( $msg . '||' . $msg, __FILE__, __FUNCTION__, __LINE__ );
+			EE_Error::add_error($msg.'||'.$msg, __FILE__, __FUNCTION__, __LINE__);
 			return false;
 		}
-		EE_Config::$_module_forward_map[ $key ][ $route ][ absint( $status ) ] = $forward;
+		EE_Config::$_module_forward_map[$key][$route][absint($status)] = $forward;
 		return true;
 	}
 
@@ -1452,12 +1452,12 @@ 
 	 * @param    string  $key    - url param key indicating a route is being called
 	 * @return    string
 	 */
-	public static function get_forward( $route = null, $status = 0, $key = 'ee' ) {
-		do_action( 'AHEE__EE_Config__get_forward__begin', $route, $status );
-		if ( isset( EE_Config::$_module_forward_map[ $key ][ $route ][ $status ] ) ) {
+	public static function get_forward($route = null, $status = 0, $key = 'ee') {
+		do_action('AHEE__EE_Config__get_forward__begin', $route, $status);
+		if (isset(EE_Config::$_module_forward_map[$key][$route][$status])) {
 			return apply_filters(
 				'FHEE__EE_Config__get_forward',
-				EE_Config::$_module_forward_map[ $key ][ $route ][ $status ],
+				EE_Config::$_module_forward_map[$key][$route][$status],
 				$route,
 				$status
 			);
@@ -1479,17 +1479,17 @@ 
 	 * @param    string  $key    - url param key indicating a route is being called
 	 * @return    bool
 	 */
-	public static function register_view( $route = null, $status = 0, $view = null, $key = 'ee' ) {
-		do_action( 'AHEE__EE_Config__register_view__begin', $route, $status, $view );
-		if ( ! isset( EE_Config::$_module_route_map[ $key ][ $route ] ) || empty( $route ) ) {
+	public static function register_view($route = null, $status = 0, $view = null, $key = 'ee') {
+		do_action('AHEE__EE_Config__register_view__begin', $route, $status, $view);
+		if ( ! isset(EE_Config::$_module_route_map[$key][$route]) || empty($route)) {
 			$msg = sprintf(
-				__( 'The module route %s for this view has not been registered.', 'event_espresso' ),
+				__('The module route %s for this view has not been registered.', 'event_espresso'),
 				$route
 			);
-			EE_Error::add_error( $msg . '||' . $msg, __FILE__, __FUNCTION__, __LINE__ );
+			EE_Error::add_error($msg.'||'.$msg, __FILE__, __FUNCTION__, __LINE__);
 			return false;
 		}
-		if ( ! is_readable( $view ) ) {
+		if ( ! is_readable($view)) {
 			$msg = sprintf(
 				__(
 					'The %s view file could not be found or is not readable due to file permissions.',
@@ -1497,10 +1497,10 @@ 
 				),
 				$view
 			);
-			EE_Error::add_error( $msg . '||' . $msg, __FILE__, __FUNCTION__, __LINE__ );
+			EE_Error::add_error($msg.'||'.$msg, __FILE__, __FUNCTION__, __LINE__);
 			return false;
 		}
-		EE_Config::$_module_view_map[ $key ][ $route ][ absint( $status ) ] = $view;
+		EE_Config::$_module_view_map[$key][$route][absint($status)] = $view;
 		return true;
 	}
 
@@ -1516,12 +1516,12 @@ 
 	 * @param    string  $key    - url param key indicating a route is being called
 	 * @return    string
 	 */
-	public static function get_view( $route = null, $status = 0, $key = 'ee' ) {
-		do_action( 'AHEE__EE_Config__get_view__begin', $route, $status );
-		if ( isset( EE_Config::$_module_view_map[ $key ][ $route ][ $status ] ) ) {
+	public static function get_view($route = null, $status = 0, $key = 'ee') {
+		do_action('AHEE__EE_Config__get_view__begin', $route, $status);
+		if (isset(EE_Config::$_module_view_map[$key][$route][$status])) {
 			return apply_filters(
 				'FHEE__EE_Config__get_view',
-				EE_Config::$_module_view_map[ $key ][ $route ][ $status ],
+				EE_Config::$_module_view_map[$key][$route][$status],
 				$route,
 				$status
 			);
@@ -1532,7 +1532,7 @@ 
 
 
 	public function update_addon_option_names() {
-		update_option( EE_Config::ADDON_OPTION_NAMES, $this->_addon_option_names );
+		update_option(EE_Config::ADDON_OPTION_NAMES, $this->_addon_option_names);
 	}
 
 
@@ -1560,22 +1560,22 @@ 
 	 * @return mixed if a detected type found return the escaped value, otherwise just the raw value is returned.
 	 * @throws \EE_Error
 	 */
-	public function get_pretty( $property ) {
-		if ( ! property_exists( $this, $property ) ) {
+	public function get_pretty($property) {
+		if ( ! property_exists($this, $property)) {
 			throw new EE_Error(
 				sprintf(
 					__(
 						'%1$s::get_pretty() has been called with the property %2$s which does not exist on the %1$s config class.',
 						'event_espresso'
 					),
-					get_class( $this ),
+					get_class($this),
 					$property
 				)
 			);
 		}
 		//just handling escaping of strings for now.
-		if ( is_string( $this->{$property} ) ) {
-			return stripslashes( $this->{$property} );
+		if (is_string($this->{$property} )) {
+			return stripslashes($this->{$property} );
 		}
 		return $this->{$property};
 	}
@@ -1584,17 +1584,17 @@ 
 
 	public function populate() {
 		//grab defaults via a new instance of this class.
-		$class_name = get_class( $this );
+		$class_name = get_class($this);
 		$defaults = new $class_name;
 		//loop through the properties for this class and see if they are set.  If they are NOT, then grab the
 		//default from our $defaults object.
-		foreach ( get_object_vars( $defaults ) as $property => $value ) {
-			if ( $this->{$property} === null ) {
+		foreach (get_object_vars($defaults) as $property => $value) {
+			if ($this->{$property} === null) {
 				$this->{$property} = $value;
 			}
 		}
 		//cleanup
-		unset( $defaults );
+		unset($defaults);
 	}
 
 
@@ -1610,7 +1610,7 @@ 
 	 * @param $a
 	 * @return bool
 	 */
-	public function __isset( $a ) {
+	public function __isset($a) {
 		return false;
 	}
 
@@ -1622,7 +1622,7 @@ 
 	 * @param $a
 	 * @return bool
 	 */
-	public function __unset( $a ) {
+	public function __unset($a) {
 		return false;
 	}
 
@@ -1732,7 +1732,7 @@ 
 		$this->current_blog_id = get_current_blog_id();
 		$this->current_blog_id = $this->current_blog_id === NULL ? 1 : $this->current_blog_id;
 		$this->ee_ueip_optin = $this->_get_main_ee_ueip_optin();
-		$this->ee_ueip_has_notified = is_main_site() ? get_option( 'ee_ueip_has_notified', false ) : true;
+		$this->ee_ueip_has_notified = is_main_site() ? get_option('ee_ueip_has_notified', false) : true;
 		$this->post_shortcodes = array();
 		$this->module_route_map = array();
 		$this->module_forward_map = array();
@@ -1748,9 +1748,9 @@ 
 		$this->thank_you_page_url = '';
 		$this->cancel_page_url = '';
 		//cpt slugs
-		$this->event_cpt_slug = __( 'events', 'event_espresso' );
+		$this->event_cpt_slug = __('events', 'event_espresso');
 		//ueip constant check
-		if ( defined( 'EE_DISABLE_UXIP' ) && EE_DISABLE_UXIP ) {
+		if (defined('EE_DISABLE_UXIP') && EE_DISABLE_UXIP) {
 			$this->ee_ueip_optin = false;
 			$this->ee_ueip_has_notified = true;
 		}
@@ -1793,11 +1793,11 @@ 
 	 * @return    string
 	 */
 	public function reg_page_url() {
-		if ( ! $this->reg_page_url ) {
+		if ( ! $this->reg_page_url) {
 			$this->reg_page_url = add_query_arg(
-				array( 'uts' => time() ),
-				get_permalink( $this->reg_page_id )
-			) . '#checkout';
+				array('uts' => time()),
+				get_permalink($this->reg_page_id)
+			).'#checkout';
 		}
 		return $this->reg_page_url;
 	}
@@ -1812,12 +1812,12 @@ 
 	 * @access    public
 	 * @return    string
 	 */
-	public function txn_page_url( $query_args = array() ) {
-		if ( ! $this->txn_page_url ) {
-			$this->txn_page_url = get_permalink( $this->txn_page_id );
+	public function txn_page_url($query_args = array()) {
+		if ( ! $this->txn_page_url) {
+			$this->txn_page_url = get_permalink($this->txn_page_id);
 		}
-		if ( $query_args ) {
-			return add_query_arg( $query_args, $this->txn_page_url );
+		if ($query_args) {
+			return add_query_arg($query_args, $this->txn_page_url);
 		} else {
 			return $this->txn_page_url;
 		}
@@ -1833,12 +1833,12 @@ 
 	 * @access    public
 	 * @return    string
 	 */
-	public function thank_you_page_url( $query_args = array() ) {
-		if ( ! $this->thank_you_page_url ) {
-			$this->thank_you_page_url = get_permalink( $this->thank_you_page_id );
+	public function thank_you_page_url($query_args = array()) {
+		if ( ! $this->thank_you_page_url) {
+			$this->thank_you_page_url = get_permalink($this->thank_you_page_id);
 		}
-		if ( $query_args ) {
-			return add_query_arg( $query_args, $this->thank_you_page_url );
+		if ($query_args) {
+			return add_query_arg($query_args, $this->thank_you_page_url);
 		} else {
 			return $this->thank_you_page_url;
 		}
@@ -1853,8 +1853,8 @@ 
 	 * @return    string
 	 */
 	public function cancel_page_url() {
-		if ( ! $this->cancel_page_url ) {
-			$this->cancel_page_url = get_permalink( $this->cancel_page_id );
+		if ( ! $this->cancel_page_url) {
+			$this->cancel_page_url = get_permalink($this->cancel_page_id);
 		}
 		return $this->cancel_page_url;
 	}
@@ -1883,22 +1883,22 @@ 
 	 */
 	protected function _get_main_ee_ueip_optin() {
 		//if this is the main site then we can just bypass our direct query.
-		if ( is_main_site() ) {
-			return get_option( 'ee_ueip_optin', false );
+		if (is_main_site()) {
+			return get_option('ee_ueip_optin', false);
 		}
 
 		//is this already cached for this request?  If so use it.
-		if ( ! empty( EE_Core_Config::$ee_ueip_option ) ) {
+		if ( ! empty(EE_Core_Config::$ee_ueip_option)) {
 			return EE_Core_Config::$ee_ueip_option;
 		}
 
 		global $wpdb;
 		$current_network_main_site = is_multisite() ? get_current_site() : null;
-		$current_main_site_id = ! empty( $current_network_main_site ) ? $current_network_main_site->blog_id : 1;
+		$current_main_site_id = ! empty($current_network_main_site) ? $current_network_main_site->blog_id : 1;
 		$option = 'ee_ueip_optin';
 
 		//set correct table for query
-		$table_name = $wpdb->get_blog_prefix( $current_main_site_id ) . 'options';
+		$table_name = $wpdb->get_blog_prefix($current_main_site_id).'options';
 
 
 		//rather than getting blog option for the $current_main_site_id, we do a direct $wpdb query because
@@ -1906,20 +1906,20 @@ 
 		//re-constructed on the blog switch.  Note, we are still executing any core wp filters on this option retrieval.
 		//this bit of code is basically a direct copy of get_option without any caching because we are NOT switched to the blog
 		//for the purpose of caching.
-		$pre = apply_filters( 'pre_option_' . $option, false, $option );
-		if ( false !== $pre ) {
+		$pre = apply_filters('pre_option_'.$option, false, $option);
+		if (false !== $pre) {
 			EE_Core_Config::$ee_ueip_option = $pre;
 			return EE_Core_Config::$ee_ueip_option;
 		}
 
-		$row = $wpdb->get_row( $wpdb->prepare( "SELECT option_value FROM $table_name WHERE option_name = %s LIMIT 1", $option ) );
-		if ( is_object( $row ) ) {
+		$row = $wpdb->get_row($wpdb->prepare("SELECT option_value FROM $table_name WHERE option_name = %s LIMIT 1", $option));
+		if (is_object($row)) {
 			$value = $row->option_value;
 		} else { //option does not exist so use default.
-			return apply_filters( 'default_option_' . $option, false, $option );
+			return apply_filters('default_option_'.$option, false, $option);
 		}
 
-		EE_Core_Config::$ee_ueip_option = apply_filters( 'option_' . $option, maybe_unserialize( $value ), $option );
+		EE_Core_Config::$ee_ueip_option = apply_filters('option_'.$option, maybe_unserialize($value), $option);
 		return EE_Core_Config::$ee_ueip_option;
 	}
 
@@ -1935,7 +1935,7 @@ 
 		//reset all url properties
 		$this->_reset_urls();
 		//return what to save to db
-		return array_keys( get_object_vars( $this ) );
+		return array_keys(get_object_vars($this));
 	}
 
 }
@@ -2082,14 +2082,14 @@ 
 	 */
 	public function __construct() {
 		// set default organization settings
-		$this->name = get_bloginfo( 'name' );
+		$this->name = get_bloginfo('name');
 		$this->address_1 = '123 Onna Road';
 		$this->address_2 = 'PO Box 123';
 		$this->city = 'Inna City';
 		$this->STA_ID = 4;
 		$this->CNT_ISO = 'US';
 		$this->zip = '12345';
-		$this->email = get_bloginfo( 'admin_email' );
+		$this->email = get_bloginfo('admin_email');
 		$this->phone = '';
 		$this->vat = '123456789';
 		$this->logo_url = '';
@@ -2177,46 +2177,46 @@ 
 	 * @param string $CNT_ISO
 	 * @throws \EE_Error
 	 */
-	public function __construct( $CNT_ISO = '' ) {
+	public function __construct($CNT_ISO = '') {
 		/** @var \EventEspresso\core\services\database\TableAnalysis $table_analysis */
-		$table_analysis = EE_Registry::instance()->create( 'TableAnalysis', array(), true );
+		$table_analysis = EE_Registry::instance()->create('TableAnalysis', array(), true);
 		// get country code from organization settings or use default
-		$ORG_CNT = isset( EE_Registry::instance()->CFG->organization )
+		$ORG_CNT = isset(EE_Registry::instance()->CFG->organization)
 		           && EE_Registry::instance()->CFG->organization instanceof EE_Organization_Config
 			? EE_Registry::instance()->CFG->organization->CNT_ISO
 			: '';
 		// but override if requested
-		$CNT_ISO = ! empty( $CNT_ISO ) ? $CNT_ISO : $ORG_CNT;
+		$CNT_ISO = ! empty($CNT_ISO) ? $CNT_ISO : $ORG_CNT;
 		// so if that all went well, and we are not in M-Mode (cuz you can't query the db in M-Mode) and double-check the countries table exists
 		if (
-			! empty( $CNT_ISO )
+			! empty($CNT_ISO)
 			&& EE_Maintenance_Mode::instance()->models_can_query()
-			&& $table_analysis->tableExists( EE_Registry::instance()->load_model( 'Country' )->table() )
+			&& $table_analysis->tableExists(EE_Registry::instance()->load_model('Country')->table())
 		) {
 			// retrieve the country settings from the db, just in case they have been customized
-			$country = EE_Registry::instance()->load_model( 'Country' )->get_one_by_ID( $CNT_ISO );
-			if ( $country instanceof EE_Country ) {
-				$this->code = $country->currency_code();    // currency code: USD, CAD, EUR
-				$this->name = $country->currency_name_single();    // Dollar
-				$this->plural = $country->currency_name_plural();    // Dollars
-				$this->sign = $country->currency_sign();            // currency sign: $
-				$this->sign_b4 = $country->currency_sign_before();        // currency sign before or after: $TRUE  or  FALSE$
-				$this->dec_plc = $country->currency_decimal_places();    // decimal places: 2 = 0.00  3 = 0.000
-				$this->dec_mrk = $country->currency_decimal_mark();    // decimal mark: (comma) ',' = 0,01   or (decimal) '.' = 0.01
-				$this->thsnds = $country->currency_thousands_separator();    // thousands separator: (comma) ',' = 1,000   or (decimal) '.' = 1.000
+			$country = EE_Registry::instance()->load_model('Country')->get_one_by_ID($CNT_ISO);
+			if ($country instanceof EE_Country) {
+				$this->code = $country->currency_code(); // currency code: USD, CAD, EUR
+				$this->name = $country->currency_name_single(); // Dollar
+				$this->plural = $country->currency_name_plural(); // Dollars
+				$this->sign = $country->currency_sign(); // currency sign: $
+				$this->sign_b4 = $country->currency_sign_before(); // currency sign before or after: $TRUE  or  FALSE$
+				$this->dec_plc = $country->currency_decimal_places(); // decimal places: 2 = 0.00  3 = 0.000
+				$this->dec_mrk = $country->currency_decimal_mark(); // decimal mark: (comma) ',' = 0,01   or (decimal) '.' = 0.01
+				$this->thsnds = $country->currency_thousands_separator(); // thousands separator: (comma) ',' = 1,000   or (decimal) '.' = 1.000
 			}
 		}
 		// fallback to hardcoded defaults, in case the above failed
-		if ( empty( $this->code ) ) {
+		if (empty($this->code)) {
 			// set default currency settings
-			$this->code = 'USD';    // currency code: USD, CAD, EUR
-			$this->name = __( 'Dollar', 'event_espresso' );    // Dollar
-			$this->plural = __( 'Dollars', 'event_espresso' );    // Dollars
-			$this->sign = '$';    // currency sign: $
-			$this->sign_b4 = true;    // currency sign before or after: $TRUE  or  FALSE$
-			$this->dec_plc = 2;    // decimal places: 2 = 0.00  3 = 0.000
-			$this->dec_mrk = '.';    // decimal mark: (comma) ',' = 0,01   or (decimal) '.' = 0.01
-			$this->thsnds = ',';    // thousands separator: (comma) ',' = 1,000   or (decimal) '.' = 1.000
+			$this->code = 'USD'; // currency code: USD, CAD, EUR
+			$this->name = __('Dollar', 'event_espresso'); // Dollar
+			$this->plural = __('Dollars', 'event_espresso'); // Dollars
+			$this->sign = '$'; // currency sign: $
+			$this->sign_b4 = true; // currency sign before or after: $TRUE  or  FALSE$
+			$this->dec_plc = 2; // decimal places: 2 = 0.00  3 = 0.000
+			$this->dec_mrk = '.'; // decimal mark: (comma) ',' = 0,01   or (decimal) '.' = 0.01
+			$this->thsnds = ','; // thousands separator: (comma) ',' = 1,000   or (decimal) '.' = 1.000
 		}
 	}
 }
@@ -2378,7 +2378,7 @@ 
 	 * @since 4.8.8.rc.019
 	 */
 	public function do_hooks() {
-		add_action( 'AHEE__EE_Config___load_core_config__end', array( $this, 'set_default_reg_status_on_EEM_Event' ) );
+		add_action('AHEE__EE_Config___load_core_config__end', array($this, 'set_default_reg_status_on_EEM_Event'));
 	}
 
 
@@ -2387,7 +2387,7 @@ 
 	 * @return void
 	 */
 	public function set_default_reg_status_on_EEM_Event() {
-		EEM_Event::set_default_reg_status( $this->default_STS_ID );
+		EEM_Event::set_default_reg_status($this->default_STS_ID);
 	}
 
 
@@ -2491,10 +2491,10 @@ 
 	 * @param bool $reset
 	 * @return string
 	 */
-	public function log_file_name( $reset = false ) {
-		if ( empty( $this->log_file_name ) || $reset ) {
-			$this->log_file_name = sanitize_key( 'espresso_log_' . md5( uniqid( '', true ) ) ) . '.txt';
-			EE_Config::instance()->update_espresso_config( false, false );
+	public function log_file_name($reset = false) {
+		if (empty($this->log_file_name) || $reset) {
+			$this->log_file_name = sanitize_key('espresso_log_'.md5(uniqid('', true))).'.txt';
+			EE_Config::instance()->update_espresso_config(false, false);
 		}
 		return $this->log_file_name;
 	}
@@ -2505,10 +2505,10 @@ 
 	 * @param bool $reset
 	 * @return string
 	 */
-	public function debug_file_name( $reset = false ) {
-		if ( empty( $this->debug_file_name ) || $reset ) {
-			$this->debug_file_name = sanitize_key( 'espresso_debug_' . md5( uniqid( '', true ) ) ) . '.txt';
-			EE_Config::instance()->update_espresso_config( false, false );
+	public function debug_file_name($reset = false) {
+		if (empty($this->debug_file_name) || $reset) {
+			$this->debug_file_name = sanitize_key('espresso_debug_'.md5(uniqid('', true))).'.txt';
+			EE_Config::instance()->update_espresso_config(false, false);
 		}
 		return $this->debug_file_name;
 	}
@@ -2519,7 +2519,7 @@ 
 	 * @return string
 	 */
 	public function affiliate_id() {
-		return ! empty( $this->affiliate_id ) ? $this->affiliate_id : 'default';
+		return ! empty($this->affiliate_id) ? $this->affiliate_id : 'default';
 	}
 
 
@@ -2699,21 +2699,21 @@ 
 		$this->use_google_maps = true;
 		$this->google_map_api_key = '';
 		// for event details pages (reg page)
-		$this->event_details_map_width = 585;            // ee_map_width_single
-		$this->event_details_map_height = 362;            // ee_map_height_single
-		$this->event_details_map_zoom = 14;            // ee_map_zoom_single
-		$this->event_details_display_nav = true;            // ee_map_nav_display_single
-		$this->event_details_nav_size = false;            // ee_map_nav_size_single
-		$this->event_details_control_type = 'default';        // ee_map_type_control_single
-		$this->event_details_map_align = 'center';            // ee_map_align_single
+		$this->event_details_map_width = 585; // ee_map_width_single
+		$this->event_details_map_height = 362; // ee_map_height_single
+		$this->event_details_map_zoom = 14; // ee_map_zoom_single
+		$this->event_details_display_nav = true; // ee_map_nav_display_single
+		$this->event_details_nav_size = false; // ee_map_nav_size_single
+		$this->event_details_control_type = 'default'; // ee_map_type_control_single
+		$this->event_details_map_align = 'center'; // ee_map_align_single
 		// for event list pages
-		$this->event_list_map_width = 300;            // ee_map_width
-		$this->event_list_map_height = 185;        // ee_map_height
-		$this->event_list_map_zoom = 12;            // ee_map_zoom
-		$this->event_list_display_nav = false;        // ee_map_nav_display
-		$this->event_list_nav_size = true;            // ee_map_nav_size
-		$this->event_list_control_type = 'dropdown';        // ee_map_type_control
-		$this->event_list_map_align = 'center';            // ee_map_align
+		$this->event_list_map_width = 300; // ee_map_width
+		$this->event_list_map_height = 185; // ee_map_height
+		$this->event_list_map_zoom = 12; // ee_map_zoom
+		$this->event_list_display_nav = false; // ee_map_nav_display
+		$this->event_list_nav_size = true; // ee_map_nav_size
+		$this->event_list_control_type = 'dropdown'; // ee_map_type_control
+		$this->event_list_map_align = 'center'; // ee_map_align
 	}
 
 }
@@ -2866,7 +2866,7 @@ 
 	 * @return void
 	 */
 	protected function _set_php_values() {
-		$this->php->max_input_vars = ini_get( 'max_input_vars' );
+		$this->php->max_input_vars = ini_get('max_input_vars');
 		$this->php->version = phpversion();
 	}
 
@@ -2885,10 +2885,10 @@ 
 	 * @type string $msg         Any message to be displayed.
 	 *                           }
 	 */
-	public function max_input_vars_limit_check( $input_count = 0 ) {
-		if ( ! empty( $this->php->max_input_vars )
-		     && ( $input_count >= $this->php->max_input_vars )
-		     && ( PHP_MAJOR_VERSION >= 5 && PHP_MINOR_VERSION >= 3 && PHP_RELEASE_VERSION >= 9 )
+	public function max_input_vars_limit_check($input_count = 0) {
+		if ( ! empty($this->php->max_input_vars)
+		     && ($input_count >= $this->php->max_input_vars)
+		     && (PHP_MAJOR_VERSION >= 5 && PHP_MINOR_VERSION >= 3 && PHP_RELEASE_VERSION >= 9)
 		) {
 			return sprintf(
 				__(
@@ -2954,7 +2954,7 @@ 
 	 */
 	public function __construct() {
 		$this->payment_settings = array();
-		$this->active_gateways = array( 'Invoice' => false );
+		$this->active_gateways = array('Invoice' => false);
 	}
 }
 

caffeinated/brewing_regular.php

Spacing +71 added lines, -71 removed lines

@@ -1,8 +1,8 @@ 
 <?php
 use EventEspresso\core\services\database\TableAnalysis;
 
-if ( ! defined( 'EVENT_ESPRESSO_VERSION' ) ) {
-	exit( 'No direct script access allowed' );
+if ( ! defined('EVENT_ESPRESSO_VERSION')) {
+	exit('No direct script access allowed');
 }
 /**
  * the purpose of this file is to simply contain any action/filter hook callbacks etc for specific aspects of EE
@@ -11,10 +11,10 @@ 
  */
 
 // defined some new constants related to caffeinated folder
-define( 'EE_CAF_URL', EE_PLUGIN_DIR_URL . 'caffeinated/' );
-define( 'EE_CAF_CORE', EE_CAFF_PATH . 'core' . DS );
-define( 'EE_CAF_LIBRARIES', EE_CAF_CORE . 'libraries' . DS );
-define( 'EE_CAF_PAYMENT_METHODS', EE_CAFF_PATH . 'payment_methods' . DS );
+define('EE_CAF_URL', EE_PLUGIN_DIR_URL.'caffeinated/');
+define('EE_CAF_CORE', EE_CAFF_PATH.'core'.DS);
+define('EE_CAF_LIBRARIES', EE_CAF_CORE.'libraries'.DS);
+define('EE_CAF_PAYMENT_METHODS', EE_CAFF_PATH.'payment_methods'.DS);
 
 
 
@@ -35,31 +35,31 @@ 
 	/**
 	 * EE_Brewing_Regular constructor.
 	 */
-	public function __construct( TableAnalysis $table_analysis ) {
+	public function __construct(TableAnalysis $table_analysis) {
 		$this->_table_analysis = $table_analysis;
-		if ( defined( 'EE_CAFF_PATH' ) ) {
+		if (defined('EE_CAFF_PATH')) {
 			// activation
-			add_action( 'AHEE__EEH_Activation__initialize_db_content', array( $this, 'initialize_caf_db_content' ) );
+			add_action('AHEE__EEH_Activation__initialize_db_content', array($this, 'initialize_caf_db_content'));
 			// load caff init
-			add_action( 'AHEE__EE_System__set_hooks_for_core', array( $this, 'caffeinated_init' ) );
+			add_action('AHEE__EE_System__set_hooks_for_core', array($this, 'caffeinated_init'));
 			// remove the "powered by" credit link from receipts and invoices
-			add_filter( 'FHEE_EE_Html_messenger__add_powered_by_credit_link_to_receipt_and_invoice', '__return_false' );
+			add_filter('FHEE_EE_Html_messenger__add_powered_by_credit_link_to_receipt_and_invoice', '__return_false');
 			// add caffeinated modules
 			add_filter(
 				'FHEE__EE_Config__register_modules__modules_to_register',
-				array( $this, 'caffeinated_modules_to_register' )
+				array($this, 'caffeinated_modules_to_register')
 			);
 			// load caff scripts
-			add_action( 'wp_enqueue_scripts', array( $this, 'enqueue_caffeinated_scripts' ), 10 );
-			add_filter( 'FHEE__EE_Registry__load_helper__helper_paths', array( $this, 'caf_helper_paths' ), 10 );
+			add_action('wp_enqueue_scripts', array($this, 'enqueue_caffeinated_scripts'), 10);
+			add_filter('FHEE__EE_Registry__load_helper__helper_paths', array($this, 'caf_helper_paths'), 10);
 			add_filter(
 				'FHEE__EE_Payment_Method_Manager__register_payment_methods__payment_methods_to_register',
-				array( $this, 'caf_payment_methods' )
+				array($this, 'caf_payment_methods')
 			);
 			// caffeinated constructed
-			do_action( 'AHEE__EE_Brewing_Regular__construct__complete' );
+			do_action('AHEE__EE_Brewing_Regular__construct__complete');
 			//seeing how this is caf, which isn't put on WordPress.org, we can have affiliate links without a disclaimer
-			add_filter( 'FHEE__ee_show_affiliate_links', '__return_false' );
+			add_filter('FHEE__ee_show_affiliate_links', '__return_false');
 		}
 	}
 
@@ -71,8 +71,8 @@ 
 	 * @param array $paths original helper paths array
 	 * @return array             new array of paths
 	 */
-	public function caf_helper_paths( $paths ) {
-		$paths[] = EE_CAF_CORE . 'helpers' . DS;
+	public function caf_helper_paths($paths) {
+		$paths[] = EE_CAF_CORE.'helpers'.DS;
 		return $paths;
 	}
 
@@ -89,21 +89,21 @@ 
 	 *
 	 * @global wpdb $wpdb
 	 */
-	public function initialize_caf_db_content(){
+	public function initialize_caf_db_content() {
 		global $wpdb;
 		//use same method of getting creator id as the version introducing the change
-		$default_creator_id = apply_filters('FHEE__EE_DMS_Core_4_5_0__get_default_creator_id',get_current_user_id());
+		$default_creator_id = apply_filters('FHEE__EE_DMS_Core_4_5_0__get_default_creator_id', get_current_user_id());
 		$price_type_table = $wpdb->prefix."esp_price_type";
 		$price_table = $wpdb->prefix."esp_price";
-		if ( $this->_get_table_analysis()->tableExists( $price_type_table ) ) {
+		if ($this->_get_table_analysis()->tableExists($price_type_table)) {
 
-			$SQL = 'SELECT COUNT(PRT_ID) FROM ' . $price_type_table . ' WHERE PBT_ID=4';//include trashed price types
-			$tax_price_type_count = $wpdb->get_var( $SQL );
-			if ( $tax_price_type_count <= 1 ) {
+			$SQL = 'SELECT COUNT(PRT_ID) FROM '.$price_type_table.' WHERE PBT_ID=4'; //include trashed price types
+			$tax_price_type_count = $wpdb->get_var($SQL);
+			if ($tax_price_type_count <= 1) {
 				$wpdb->insert(
 					$price_type_table,
 					array(
-						'PRT_name'       => __( "Regional Tax", "event_espresso" ),
+						'PRT_name'       => __("Regional Tax", "event_espresso"),
 						'PBT_ID'         => 4,
 						'PRT_is_percent' => true,
 						'PRT_order'      => 60,
@@ -111,11 +111,11 @@ 
 						'PRT_wp_user'    => $default_creator_id,
 					),
 					array(
-						'%s',//PRT_name
-						'%d',//PBT_id
-						'%d',//PRT_is_percent
-						'%d',//PRT_order
-						'%d',//PRT_deleted
+						'%s', //PRT_name
+						'%d', //PBT_id
+						'%d', //PRT_is_percent
+						'%d', //PRT_order
+						'%d', //PRT_deleted
 						'%d', //PRT_wp_user
 					)
 				);
@@ -123,7 +123,7 @@ 
 				$result = $wpdb->insert(
 					$price_type_table,
 					array(
-						'PRT_name'       => __( "Federal Tax", "event_espresso" ),
+						'PRT_name'       => __("Federal Tax", "event_espresso"),
 						'PBT_ID'         => 4,
 						'PRT_is_percent' => true,
 						'PRT_order'      => 70,
@@ -131,21 +131,21 @@ 
 						'PRT_wp_user'    => $default_creator_id,
 					),
 					array(
-						'%s',//PRT_name
-						'%d',//PBT_id
-						'%d',//PRT_is_percent
-						'%d',//PRT_order
-						'%d',//PRT_deleted
+						'%s', //PRT_name
+						'%d', //PBT_id
+						'%d', //PRT_is_percent
+						'%d', //PRT_order
+						'%d', //PRT_deleted
 						'%d' //PRT_wp_user
 					)
 				);
-				if ( $result ) {
+				if ($result) {
 					$wpdb->insert(
 						$price_table,
 						array(
 							'PRT_ID'         => $wpdb->insert_id,
 							'PRC_amount'     => 15.00,
-							'PRC_name'       => __( "Sales Tax", "event_espresso" ),
+							'PRC_name'       => __("Sales Tax", "event_espresso"),
 							'PRC_desc'       => '',
 							'PRC_is_default' => true,
 							'PRC_overrides'  => null,
@@ -155,15 +155,15 @@ 
 							'PRC_wp_user'    => $default_creator_id,
 						),
 						array(
-							'%d',//PRT_id
-							'%f',//PRC_amount
-							'%s',//PRC_name
-							'%s',//PRC_desc
-							'%d',//PRC_is_default
-							'%d',//PRC_overrides
-							'%d',//PRC_deleted
-							'%d',//PRC_order
-							'%d',//PRC_parent
+							'%d', //PRT_id
+							'%f', //PRC_amount
+							'%s', //PRC_name
+							'%s', //PRC_desc
+							'%d', //PRC_is_default
+							'%d', //PRC_overrides
+							'%d', //PRC_deleted
+							'%d', //PRC_order
+							'%d', //PRC_parent
 							'%d' //PRC_wp_user
 						)
 					);
@@ -181,11 +181,11 @@ 
 	 * @param array $modules_to_register
 	 * @return array
 	 */
-	public function caffeinated_modules_to_register( $modules_to_register = array() ) {
-		if ( is_readable( EE_CAFF_PATH . 'modules' ) ) {
-			$caffeinated_modules_to_register = glob( EE_CAFF_PATH . 'modules' . DS . '*', GLOB_ONLYDIR );
-			if ( is_array( $caffeinated_modules_to_register ) && ! empty( $caffeinated_modules_to_register ) ) {
-				$modules_to_register = array_merge( $modules_to_register, $caffeinated_modules_to_register );
+	public function caffeinated_modules_to_register($modules_to_register = array()) {
+		if (is_readable(EE_CAFF_PATH.'modules')) {
+			$caffeinated_modules_to_register = glob(EE_CAFF_PATH.'modules'.DS.'*', GLOB_ONLYDIR);
+			if (is_array($caffeinated_modules_to_register) && ! empty($caffeinated_modules_to_register)) {
+				$modules_to_register = array_merge($modules_to_register, $caffeinated_modules_to_register);
 			}
 		}
 		return $modules_to_register;
@@ -195,12 +195,12 @@ 
 
 	public function caffeinated_init() {
 		// EE_Register_CPTs hooks
-		add_filter( 'FHEE__EE_Register_CPTs__get_taxonomies__taxonomies', array( $this, 'filter_taxonomies' ), 10 );
-		add_filter( 'FHEE__EE_Register_CPTs__get_CPTs__cpts', array( $this, 'filter_cpts' ), 10 );
-		add_filter( 'FHEE__EE_Admin__get_extra_nav_menu_pages_items', array( $this, 'nav_metabox_items' ), 10 );
-		EE_Registry::instance()->load_file( EE_CAFF_PATH, 'EE_Caf_Messages', 'class', array(), false );
+		add_filter('FHEE__EE_Register_CPTs__get_taxonomies__taxonomies', array($this, 'filter_taxonomies'), 10);
+		add_filter('FHEE__EE_Register_CPTs__get_CPTs__cpts', array($this, 'filter_cpts'), 10);
+		add_filter('FHEE__EE_Admin__get_extra_nav_menu_pages_items', array($this, 'nav_metabox_items'), 10);
+		EE_Registry::instance()->load_file(EE_CAFF_PATH, 'EE_Caf_Messages', 'class', array(), false);
 		// caffeinated_init__complete hook
-		do_action( 'AHEE__EE_Brewing_Regular__caffeinated_init__complete' );
+		do_action('AHEE__EE_Brewing_Regular__caffeinated_init__complete');
 	}
 
 
@@ -217,7 +217,7 @@ 
 	 * @param array $taxonomy_array
 	 * @return array
 	 */
-	public function filter_taxonomies( array $taxonomy_array ) {
+	public function filter_taxonomies(array $taxonomy_array) {
 		$taxonomy_array['espresso_venue_categories']['args']['show_in_nav_menus'] = true;
 		return $taxonomy_array;
 	}
@@ -228,7 +228,7 @@ 
 	 * @param array $cpt_array
 	 * @return mixed
 	 */
-	public function filter_cpts( array $cpt_array ) {
+	public function filter_cpts(array $cpt_array) {
 		$cpt_array['espresso_venues']['args']['show_in_nav_menus'] = true;
 		return $cpt_array;
 	}
@@ -239,11 +239,11 @@ 
 	 * @param array $menuitems
 	 * @return array
 	 */
-	public function nav_metabox_items( array $menuitems ) {
+	public function nav_metabox_items(array $menuitems) {
 		$menuitems[] = array(
-			'title'       => __( 'Venue List', 'event_espresso' ),
-			'url'         => get_post_type_archive_link( 'espresso_venues' ),
-			'description' => __( 'Archive page for all venues.', 'event_espresso' ),
+			'title'       => __('Venue List', 'event_espresso'),
+			'url'         => get_post_type_archive_link('espresso_venues'),
+			'description' => __('Archive page for all venues.', 'event_espresso'),
 		);
 		return $menuitems;
 	}
@@ -256,9 +256,9 @@ 
 	 * @param array $payment_method_paths
 	 * @return array values are folder paths to payment method folders
 	 */
-	public function caf_payment_methods( $payment_method_paths ) {
-		$caf_payment_methods_paths = glob( EE_CAF_PAYMENT_METHODS . '*', GLOB_ONLYDIR );
-		$payment_method_paths = array_merge( $payment_method_paths, $caf_payment_methods_paths );
+	public function caf_payment_methods($payment_method_paths) {
+		$caf_payment_methods_paths = glob(EE_CAF_PAYMENT_METHODS.'*', GLOB_ONLYDIR);
+		$payment_method_paths = array_merge($payment_method_paths, $caf_payment_methods_paths);
 		return $payment_method_paths;
 	}
 	/**
@@ -267,18 +267,18 @@ 
 	 * @throws \EE_Error
 	 */
 	protected function _get_table_analysis() {
-		if( $this->_table_analysis instanceof TableAnalysis ) {
+		if ($this->_table_analysis instanceof TableAnalysis) {
 			return $this->_table_analysis;
 		} else {
 			throw new \EE_Error( 
 				sprintf( 
-					__( 'Table analysis class on class %1$s is not set properly.', 'event_espresso'), 
-					get_class( $this ) 
+					__('Table analysis class on class %1$s is not set properly.', 'event_espresso'), 
+					get_class($this) 
 				) 
 			);
 		}
 	}
 }
 $brewing = new EE_Brewing_Regular(
-	EE_Registry::instance()->create( 'TableAnalysis', array(), true )
+	EE_Registry::instance()->create('TableAnalysis', array(), true)
 );

core/libraries/messages/data_class/EE_Messages_incoming_data.core.php

Spacing +67 added lines, -67 removed lines

@@ -1,6 +1,6 @@ 
 <?php
 
-if (!defined('EVENT_ESPRESSO_VERSION') )
+if ( ! defined('EVENT_ESPRESSO_VERSION'))
 	exit('NO direct script access allowed');
 
 /**
@@ -266,7 +266,7 @@ 
 	 * @param mixed $data incoming data object|array.  Suggested that child classes use type hinting for expected
 	 * data object.  But here parent will be generic because we don't know what's coming in.
 	 */
-	public function __construct( $data ) {
+	public function __construct($data) {
 		$this->_data = $data;
 		$this->_setup_data();
 	}
@@ -288,7 +288,7 @@ 
 	 *
 	 * @return mixed   The prepped data for db
 	 */
-	static public function convert_data_for_persistent_storage( $data ) {
+	static public function convert_data_for_persistent_storage($data) {
 		return $data;
 	}
 
@@ -304,7 +304,7 @@ 
 	 *
 	 * @return mixed
 	 */
-	static public function convert_data_from_persistent_storage( $data ) {
+	static public function convert_data_from_persistent_storage($data) {
 		return $data;
 	}
 
@@ -331,8 +331,8 @@ 
 	protected function _assemble_data() {
 		//verify that reg_objs is set
 		if (
-			! is_array( $this->reg_objs )
-			&& ! reset( $this->reg_objs ) instanceof EE_Registration
+			! is_array($this->reg_objs)
+			&& ! reset($this->reg_objs) instanceof EE_Registration
 		) {
 			throw new EE_Error(
 				__(
@@ -347,84 +347,84 @@ 
 		$answers = $questions = $attendees = $line_items = $registrations = array();
 		$total_ticket_count = 0;
 
-		if ( ! empty( $this->reg_objs ) ) {
+		if ( ! empty($this->reg_objs)) {
 			$event_attendee_count = array();
-			foreach ( $this->reg_objs as $reg ) {
+			foreach ($this->reg_objs as $reg) {
 
 				if (
-					$this->_skip_registration_for_processing( $reg )
+					$this->_skip_registration_for_processing($reg)
 				) {
 					continue;
 				}
 
 				$evt_id = $reg->event_ID();
 				/** @type EE_Ticket $ticket */
-				$ticket = $reg->get_first_related( 'Ticket' );
+				$ticket = $reg->get_first_related('Ticket');
 				$relateddatetime = $ticket->datetimes();
 				$total_ticket_count++;
-				$tickets[ $ticket->ID() ]['ticket'] = $ticket;
-				$tickets[ $ticket->ID() ]['count'] = is_array( $tickets[ $ticket->ID() ] )
-				                                     && isset( $tickets[ $ticket->ID() ]['count'] )
-					? $tickets[ $ticket->ID() ]['count'] + 1
+				$tickets[$ticket->ID()]['ticket'] = $ticket;
+				$tickets[$ticket->ID()]['count'] = is_array($tickets[$ticket->ID()])
+				                                     && isset($tickets[$ticket->ID()]['count'])
+					? $tickets[$ticket->ID()]['count'] + 1
 					: 1;
-				$tickets[ $ticket->ID() ]['att_objs'][ $reg->attendee_ID() ] = $reg->attendee();
-				$tickets[ $ticket->ID() ]['dtt_objs'] = $relateddatetime;
-				$tickets[ $ticket->ID() ]['reg_objs'][ $reg->ID() ] = $reg;
+				$tickets[$ticket->ID()]['att_objs'][$reg->attendee_ID()] = $reg->attendee();
+				$tickets[$ticket->ID()]['dtt_objs'] = $relateddatetime;
+				$tickets[$ticket->ID()]['reg_objs'][$reg->ID()] = $reg;
 				$event = $reg->event();
-				$tickets[ $ticket->ID() ]['EE_Event'] = $event;
-				$evtcache[ $evt_id ] = $event;
-				$eventsetup[ $evt_id ]['reg_objs'][ $reg->ID() ] = $reg;
-				$eventsetup[ $evt_id ]['tkt_objs'][ $ticket->ID() ] = $ticket;
-				$eventsetup[ $evt_id ]['att_objs'][ $reg->attendee_ID() ] = $reg->attendee();
-				$event_attendee_count[ $evt_id ] = isset( $event_attendee_count[ $evt_id ] )
-					? $event_attendee_count[ $evt_id ] + 1
+				$tickets[$ticket->ID()]['EE_Event'] = $event;
+				$evtcache[$evt_id] = $event;
+				$eventsetup[$evt_id]['reg_objs'][$reg->ID()] = $reg;
+				$eventsetup[$evt_id]['tkt_objs'][$ticket->ID()] = $ticket;
+				$eventsetup[$evt_id]['att_objs'][$reg->attendee_ID()] = $reg->attendee();
+				$event_attendee_count[$evt_id] = isset($event_attendee_count[$evt_id])
+					? $event_attendee_count[$evt_id] + 1
 					: 0;
-				$attendees[ $reg->attendee_ID() ]['line_ref'][] = $evt_id;
-				$attendees[ $reg->attendee_ID() ]['att_obj'] = $reg->attendee();
-				$attendees[ $reg->attendee_ID() ]['reg_objs'][ $reg->ID() ] = $reg;
+				$attendees[$reg->attendee_ID()]['line_ref'][] = $evt_id;
+				$attendees[$reg->attendee_ID()]['att_obj'] = $reg->attendee();
+				$attendees[$reg->attendee_ID()]['reg_objs'][$reg->ID()] = $reg;
 				//$attendees[ $reg->attendee_ID() ]['registration_id'] = $reg->ID();
-				$attendees[ $reg->attendee_ID() ]['attendee_email'] = $reg->attendee() instanceof EE_Attendee
+				$attendees[$reg->attendee_ID()]['attendee_email'] = $reg->attendee() instanceof EE_Attendee
 					? $reg->attendee()->email()
 					: '';
-				$attendees[ $reg->attendee_ID() ]['tkt_objs'][ $ticket->ID() ] = $ticket;
-				$attendees[ $reg->attendee_ID() ]['evt_objs'][ $evt_id ] = $event;
+				$attendees[$reg->attendee_ID()]['tkt_objs'][$ticket->ID()] = $ticket;
+				$attendees[$reg->attendee_ID()]['evt_objs'][$evt_id] = $event;
 
 				//registrations
-				$registrations[ $reg->ID() ]['tkt_obj'] = $ticket;
-				$registrations[ $reg->ID() ]['evt_obj'] = $event;
-				$registrations[ $reg->ID() ]['reg_obj'] = $reg;
-				$registrations[ $reg->ID() ]['att_obj'] = $reg->attendee();
+				$registrations[$reg->ID()]['tkt_obj'] = $ticket;
+				$registrations[$reg->ID()]['evt_obj'] = $event;
+				$registrations[$reg->ID()]['reg_obj'] = $reg;
+				$registrations[$reg->ID()]['att_obj'] = $reg->attendee();
 
 				//set up answer objects
-				$rel_ans = $reg->get_many_related( 'Answer' );
-				foreach ( $rel_ans as $ansid => $answer ) {
-					if ( ! isset( $questions[ $ansid ] ) ) {
-						$questions[ $ansid ] = $answer->get_first_related( 'Question' );
+				$rel_ans = $reg->get_many_related('Answer');
+				foreach ($rel_ans as $ansid => $answer) {
+					if ( ! isset($questions[$ansid])) {
+						$questions[$ansid] = $answer->get_first_related('Question');
 					}
-					$answers[ $ansid ] = $answer;
-					$registrations[ $reg->ID() ]['ans_objs'][ $ansid ] = $answer;
+					$answers[$ansid] = $answer;
+					$registrations[$reg->ID()]['ans_objs'][$ansid] = $answer;
 				}
 
-				foreach ( $relateddatetime as $dtt_id => $datetime ) {
-					$eventsetup[ $evt_id ]['dtt_objs'][ $dtt_id ] = $datetime;
-					$registrations[ $reg->ID() ]['dtt_objs'][ $dtt_id ] = $datetime;
+				foreach ($relateddatetime as $dtt_id => $datetime) {
+					$eventsetup[$evt_id]['dtt_objs'][$dtt_id] = $datetime;
+					$registrations[$reg->ID()]['dtt_objs'][$dtt_id] = $datetime;
 
-					if ( isset( $datetimes[ $dtt_id ] ) ) {
+					if (isset($datetimes[$dtt_id])) {
 						continue; //already have this info in the datetimes array.
 					}
 
-					$datetimes[ $dtt_id ]['tkt_objs'][] = $ticket;
-					$datetimes[ $dtt_id ]['datetime'] = $datetime;
-					$datetimes[ $dtt_id ]['evt_objs'][ $evt_id ] = $event;
-					$datetimes[ $dtt_id ]['reg_objs'][ $reg->ID() ] = $reg;
+					$datetimes[$dtt_id]['tkt_objs'][] = $ticket;
+					$datetimes[$dtt_id]['datetime'] = $datetime;
+					$datetimes[$dtt_id]['evt_objs'][$evt_id] = $event;
+					$datetimes[$dtt_id]['reg_objs'][$reg->ID()] = $reg;
 				}
 			}
 
 			//let's loop through the unique event=>reg items and setup data on them
 
-			if ( ! empty( $eventsetup ) ) {
-				foreach ( $eventsetup as $evt_id => $items ) {
-					if ( $this->txn instanceof EE_Transaction ) {
+			if ( ! empty($eventsetup)) {
+				foreach ($eventsetup as $evt_id => $items) {
+					if ($this->txn instanceof EE_Transaction) {
 						$ticket_line_items_for_event = EEM_Line_Item::instance()->get_all(
 							array(
 								array(
@@ -437,25 +437,25 @@ 
 					} else {
 						$ticket_line_items_for_event = array();
 					}
-					$events[ $evt_id ] = array(
+					$events[$evt_id] = array(
 						'ID' => $evt_id,
-						'event' => $evtcache[ $evt_id ],
-						'name' => $evtcache[ $evt_id ] instanceof EE_Event ? $evtcache[ $evt_id ]->name() : '',
-						'total_attendees' => $event_attendee_count[ $evt_id ],
+						'event' => $evtcache[$evt_id],
+						'name' => $evtcache[$evt_id] instanceof EE_Event ? $evtcache[$evt_id]->name() : '',
+						'total_attendees' => $event_attendee_count[$evt_id],
 						'reg_objs' => $items['reg_objs'],
 						'tkt_objs' => $items['tkt_objs'],
 						'att_objs' => $items['att_objs'],
-						'dtt_objs' => isset( $items['dtt_objs'] ) ? $items['dtt_objs'] : array(),
+						'dtt_objs' => isset($items['dtt_objs']) ? $items['dtt_objs'] : array(),
 						'line_items' => $ticket_line_items_for_event,
 					);
 
 					//make sure the tickets have the line items setup for them.
-					foreach ( $ticket_line_items_for_event as $line_id => $line_item ) {
-						if ( $line_item instanceof EE_Line_Item ) {
-							$tickets[ $line_item->ticket()->ID() ]['line_item'] = $line_item;
-							$tickets[ $line_item->ticket()->ID() ]['sub_line_items'] = $line_item->children();
-							$line_items[ $line_item->ID() ]['children'] = $line_item->children();
-							$line_items[ $line_item->ID() ]['EE_Ticket'] = $line_item->ticket();
+					foreach ($ticket_line_items_for_event as $line_id => $line_item) {
+						if ($line_item instanceof EE_Line_Item) {
+							$tickets[$line_item->ticket()->ID()]['line_item'] = $line_item;
+							$tickets[$line_item->ticket()->ID()]['sub_line_items'] = $line_item->children();
+							$line_items[$line_item->ID()]['children'] = $line_item->children();
+							$line_items[$line_item->ID()]['EE_Ticket'] = $line_item->ticket();
 						}
 					}
 				}
@@ -477,7 +477,7 @@ 
 		$this->total_ticket_count = $total_ticket_count;
 		$this->registrations = $registrations;
 
-		if ( $this->txn instanceof EE_Transaction ) {
+		if ($this->txn instanceof EE_Transaction) {
 			$this->tax_line_items        = $this->txn->tax_items();
 			$this->additional_line_items = $this->txn->non_ticket_line_items();
 			$this->payments              = $this->txn->payments();
@@ -487,10 +487,10 @@ 
 			//let's get just the primary_attendee_data!  First we get the primary registration object.
 			$primary_reg = $this->txn->primary_registration();
 			// verify
-			if ( $primary_reg instanceof EE_Registration ) {
+			if ($primary_reg instanceof EE_Registration) {
 
 				// get attendee object
-				if ( $primary_reg->attendee() instanceof EE_Attendee ) {
+				if ($primary_reg->attendee() instanceof EE_Attendee) {
 
 					//now we can setup the primary_attendee_data array
 					$this->primary_attendee_data = array(
@@ -534,8 +534,8 @@ 
 	 * @return bool  returning true means we DO want to skip processing.  returning false means we DON'T want to skip
 	 *               processing
 	 */
-	protected function _skip_registration_for_processing( EE_Registration $registration ) {
-		if ( empty( $this->filtered_reg_status ) ) {
+	protected function _skip_registration_for_processing(EE_Registration $registration) {
+		if (empty($this->filtered_reg_status)) {
 			return false;
 		}
 

core/libraries/messages/EE_Messages_Generator.lib.php

Spacing +122 added lines, -122 removed lines

@@ -1,4 +1,4 @@ 
-<?php if ( ! defined( 'EVENT_ESPRESSO_VERSION' )) { exit( 'No direct script access allowed' ); }
+<?php if ( ! defined('EVENT_ESPRESSO_VERSION')) { exit('No direct script access allowed'); }
 
 /**
  * This class is used for generating EE_Message objects with given info.
@@ -116,10 +116,10 @@ 
 	 *
 	 * @return EE_Messages_Queue  The new queue for holding generated EE_Message objects.
 	 */
-	public function generate( $save = true ) {
+	public function generate($save = true) {
 		//iterate through the messages in the queue, generate, and add to new queue.
 		$this->_generation_queue->get_message_repository()->rewind();
-		while ( $this->_generation_queue->get_message_repository()->valid() ) {
+		while ($this->_generation_queue->get_message_repository()->valid()) {
 			//reset "current" properties
 			$this->_reset_current_properties();
 
@@ -133,18 +133,18 @@ 
 			$this->_generation_queue->get_message_repository()->next();
 			$next_msg = $this->_generation_queue->get_message_repository()->current();
 			//restore pointer to current item
-			$this->_generation_queue->get_message_repository()->set_current( $msg );
+			$this->_generation_queue->get_message_repository()->set_current($msg);
 
 			//skip and delete if the current $msg is NOT incomplete (queued for generation)
-			if ( $msg->STS_ID() !== EEM_Message::status_incomplete ) {
+			if ($msg->STS_ID() !== EEM_Message::status_incomplete) {
 				//we keep this item in the db just remove from the repo.
-				$this->_generation_queue->get_message_repository()->remove( $msg );
+				$this->_generation_queue->get_message_repository()->remove($msg);
 				//next item
-				$this->_generation_queue->get_message_repository()->set_current( $next_msg );
+				$this->_generation_queue->get_message_repository()->set_current($next_msg);
 				continue;
 			}
 
-			if ( $this->_verify() ) {
+			if ($this->_verify()) {
 				//let's get generating!
 				$this->_generate();
 			}
@@ -154,32 +154,32 @@ 
 				$msg->STS_ID() === EEM_Message::status_debug_only
 				&& ! EEM_Message::debug()
 			) {
-				do_action( 'AHEE__EE_Messages_Generator__generate__before_debug_delete', $msg, $this->_error_msg, $this->_current_messenger, $this->_current_message_type, $this->_current_data_handler );
+				do_action('AHEE__EE_Messages_Generator__generate__before_debug_delete', $msg, $this->_error_msg, $this->_current_messenger, $this->_current_message_type, $this->_current_data_handler);
 				$this->_generation_queue->get_message_repository()->delete();
-				$this->_generation_queue->get_message_repository()->set_current( $next_msg );
+				$this->_generation_queue->get_message_repository()->set_current($next_msg);
 				continue;
 			}
 
 			//if there are error messages then let's set the status and the error message.
-			if ( $this->_error_msg ) {
+			if ($this->_error_msg) {
 				//if the status is already debug only, then let's leave it at that.
-				if ( $msg->STS_ID() !== EEM_Message::status_debug_only ) {
-					$msg->set_STS_ID( EEM_Message::status_failed );
+				if ($msg->STS_ID() !== EEM_Message::status_debug_only) {
+					$msg->set_STS_ID(EEM_Message::status_failed);
 				}
-				do_action( 'AHEE__EE_Messages_Generator__generate__processing_failed_message', $msg, $this->_error_msg, $this->_current_messenger, $this->_current_message_type, $this->_current_data_handler );
+				do_action('AHEE__EE_Messages_Generator__generate__processing_failed_message', $msg, $this->_error_msg, $this->_current_messenger, $this->_current_message_type, $this->_current_data_handler);
 				$msg->set_error_message(
-					__( 'Message failed to generate for the following reasons: ' )
+					__('Message failed to generate for the following reasons: ')
 					. "\n"
-					. implode( "\n", $this->_error_msg )
+					. implode("\n", $this->_error_msg)
 				);
-				$msg->set_modified( time() );
+				$msg->set_modified(time());
 			} else {
-				do_action( 'AHEE__EE_Messages_Generator__generate__before_successful_generated_message_delete', $msg, $this->_error_msg, $this->_current_messenger, $this->_current_message_type, $this->_current_data_handler );
+				do_action('AHEE__EE_Messages_Generator__generate__before_successful_generated_message_delete', $msg, $this->_error_msg, $this->_current_messenger, $this->_current_message_type, $this->_current_data_handler);
 				//remove from db
 				$this->_generation_queue->get_message_repository()->delete();
 			}
 			//next item
-			$this->_generation_queue->get_message_repository()->set_current( $next_msg );
+			$this->_generation_queue->get_message_repository()->set_current($next_msg);
 		}
 
 		//generation queue is ALWAYS saved to record any errors in the generation process.
@@ -192,7 +192,7 @@ 
 		 * so a EE_Extra_Meta entry could be created and attached to the EE_Message.  In those cases the save flag is
 		 * irrelevant.
 		 */
-		if ( $save ) {
+		if ($save) {
 			$this->_ready_queue->save();
 		}
 
@@ -210,7 +210,7 @@ 
 	protected function _reset_current_properties() {
 		$this->_verified = false;
 		//make sure any _data value in the current message type is reset
-		if ( $this->_current_message_type instanceof EE_message_type ) {
+		if ($this->_current_message_type instanceof EE_message_type) {
 			$this->_current_message_type->reset_data();
 		}
 		$this->_current_messenger = $this->_current_message_type = $this->_current_data_handler = null;
@@ -229,7 +229,7 @@ 
 	 */
 	protected function _generate() {
 		//double check verification has run and that everything is ready to work with (saves us having to validate everything again).
-		if ( ! $this->_verified ) {
+		if ( ! $this->_verified) {
 			return false; //get out because we don't have a valid setup to work with.
 		}
 
@@ -239,35 +239,35 @@ 
 				$this->_current_data_handler,
 				$this->_generation_queue->get_message_repository()->current()->context()
 			);
-		} catch ( EE_Error $e ) {
+		} catch (EE_Error $e) {
 			$this->_error_msg[] = $e->getMessage();
 			return false;
 		}
 
 
 		//if no addressees then get out because there is nothing to generation (possible bad data).
-		if ( ! $this->_valid_addressees( $addressees ) ) {
-			do_action( 'AHEE__EE_Messages_Generator___generate__invalid_addressees', $this->_generation_queue->get_message_repository()->current(), $addressees, $this->_current_messenger, $this->_current_message_type, $this->_current_data_handler );
-			$this->_generation_queue->get_message_repository()->current()->set_STS_ID( EEM_Message::status_debug_only );
-			$this->_error_msg[] = __( 'This is not a critical error but an informational notice. Unable to generate messages EE_Messages_Addressee objects.  There were no attendees prepared by the data handler.
-			  Sometimes this is because messages only get generated for certain registration statuses. For example, the ticket notice message type only goes to approved registrations.', 'event_espresso' );
+		if ( ! $this->_valid_addressees($addressees)) {
+			do_action('AHEE__EE_Messages_Generator___generate__invalid_addressees', $this->_generation_queue->get_message_repository()->current(), $addressees, $this->_current_messenger, $this->_current_message_type, $this->_current_data_handler);
+			$this->_generation_queue->get_message_repository()->current()->set_STS_ID(EEM_Message::status_debug_only);
+			$this->_error_msg[] = __('This is not a critical error but an informational notice. Unable to generate messages EE_Messages_Addressee objects.  There were no attendees prepared by the data handler.
+			  Sometimes this is because messages only get generated for certain registration statuses. For example, the ticket notice message type only goes to approved registrations.', 'event_espresso');
 			return false;
 		}
 
 		$message_template_group = $this->_get_message_template_group();
 
 		//in the unlikely event there is no EE_Message_Template_Group available, get out!
-		if ( ! $message_template_group instanceof EE_Message_Template_Group ) {
-			$this->_error_msg[] = __( 'Unable to get the Message Templates for the Message being generated.  No message template group accessible.', 'event_espresso' );
+		if ( ! $message_template_group instanceof EE_Message_Template_Group) {
+			$this->_error_msg[] = __('Unable to get the Message Templates for the Message being generated.  No message template group accessible.', 'event_espresso');
 			return false;
 		}
 
 		//get formatted templates for using to parse and setup EE_Message objects.
-		$templates = $this->_get_templates( $message_template_group );
+		$templates = $this->_get_templates($message_template_group);
 
 
 		//setup new EE_Message objects (and add to _ready_queue)
-		return $this->_assemble_messages( $addressees, $templates, $message_template_group );
+		return $this->_assemble_messages($addressees, $templates, $message_template_group);
 	}
 
 
@@ -285,18 +285,18 @@ 
 		//so let's use that.
 		$GRP_ID = $this->_generation_queue->get_message_repository()->current()->GRP_ID();
 
-		if ( $GRP_ID ) {
+		if ($GRP_ID) {
 			//attempt to retrieve from repo first
-			$GRP = $this->_template_collection->get_by_ID( $GRP_ID );
-			if ( $GRP instanceof EE_Message_Template_Group ) {
-				return $GRP;  //got it!
+			$GRP = $this->_template_collection->get_by_ID($GRP_ID);
+			if ($GRP instanceof EE_Message_Template_Group) {
+				return $GRP; //got it!
 			}
 
 			//nope don't have it yet.  Get from DB then add to repo if its not here, then that means the current GRP_ID
 			//is not valid, so we'll continue on in the code assuming there's NO GRP_ID.
-			$GRP = EEM_Message_Template_Group::instance()->get_one_by_ID( $GRP_ID );
-			if ( $GRP instanceof EE_Message_Template_Group ) {
-				$this->_template_collection->add( $GRP );
+			$GRP = EEM_Message_Template_Group::instance()->get_one_by_ID($GRP_ID);
+			if ($GRP instanceof EE_Message_Template_Group) {
+				$this->_template_collection->add($GRP);
 				return $GRP;
 			}
 		}
@@ -315,41 +315,41 @@ 
 		//in vanilla EE we're assuming there's only one event.
 		//However, if there are multiple events then we'll just use the default templates instead of different
 		// templates per event (which could create problems).
-		if ( count( $this->_current_data_handler->events ) === 1 ) {
-			foreach ( $this->_current_data_handler->events as $event ) {
+		if (count($this->_current_data_handler->events) === 1) {
+			foreach ($this->_current_data_handler->events as $event) {
 				$EVT_ID = $event['ID'];
 			}
 		}
 
 		//before going any further, let's see if its in the queue
-		$GRP = $this->_template_collection->get_by_key( $this->_template_collection->get_key( $this->_current_messenger->name, $this->_current_message_type->name, $EVT_ID ) );
+		$GRP = $this->_template_collection->get_by_key($this->_template_collection->get_key($this->_current_messenger->name, $this->_current_message_type->name, $EVT_ID));
 
-		if ( $GRP instanceof EE_Message_Template_Group ) {
+		if ($GRP instanceof EE_Message_Template_Group) {
 			return $GRP;
 		}
 
 		//nope still no GRP?
 		//first we get the global template in case it has an override set.
-		$global_template_qa = array_merge( array( 'MTP_is_global' => true ), $template_qa );
-		$global_GRP = EEM_Message_Template_Group::instance()->get_one( array( $global_template_qa ) );
+		$global_template_qa = array_merge(array('MTP_is_global' => true), $template_qa);
+		$global_GRP = EEM_Message_Template_Group::instance()->get_one(array($global_template_qa));
 
 		//if this is an override, then we just return it.
-		if ( $global_GRP instanceof EE_Message_Template_Group && $global_GRP->get( 'MTP_is_override' ) ) {
-			$this->_template_collection->add( $global_GRP, $EVT_ID );
+		if ($global_GRP instanceof EE_Message_Template_Group && $global_GRP->get('MTP_is_override')) {
+			$this->_template_collection->add($global_GRP, $EVT_ID);
 			return $global_GRP;
 		}
 
 		//STILL here? Okay that means we want to see if there is event specific group and if there is we return it,
 		//otherwise we return the global group we retrieved.
-		if ( $EVT_ID ) {
+		if ($EVT_ID) {
 			$template_qa['Event.EVT_ID'] = $EVT_ID;
 		}
 
-		$GRP = EEM_Message_Template_Group::instance()->get_one( array( $template_qa ) );
+		$GRP = EEM_Message_Template_Group::instance()->get_one(array($template_qa));
 		$GRP = $GRP instanceof EE_Message_Template_Group ? $GRP : $global_GRP;
 
-		if ( $GRP instanceof EE_Message_Template_Group ) {
-			$this->_template_collection->add( $GRP, $EVT_ID );
+		if ($GRP instanceof EE_Message_Template_Group) {
+			$this->_template_collection->add($GRP, $EVT_ID);
 			return $GRP;
 		}
 
@@ -373,15 +373,15 @@ 
 	 *                      )
 	 *                  )
 	 */
-	protected function _get_templates( EE_Message_Template_Group $message_template_group ) {
+	protected function _get_templates(EE_Message_Template_Group $message_template_group) {
 		$templates = array();
 		$context_templates = $message_template_group->context_templates();
-		foreach ( $context_templates as $context => $template_fields ) {
-			foreach ( $template_fields as $template_field => $template_obj ) {
-				if ( ! $template_obj instanceof EE_Message_Template ) {
+		foreach ($context_templates as $context => $template_fields) {
+			foreach ($template_fields as $template_field => $template_obj) {
+				if ( ! $template_obj instanceof EE_Message_Template) {
 					continue;
 				}
-				$templates[ $template_field ][ $context ] = $template_obj->get( 'MTP_content' );
+				$templates[$template_field][$context] = $template_obj->get('MTP_content');
 			}
 		}
 		return $templates;
@@ -403,21 +403,21 @@ 
 	 *                get added to the queue with EEM_Message::status_idle, unsuccessfully generated messages will get added
 	 *                to the queue as EEM_Message::status_failed.  Very rarely should "false" be returned from this method.
 	 */
-	protected function _assemble_messages( $addressees, $templates, EE_Message_Template_Group $message_template_group ) {
+	protected function _assemble_messages($addressees, $templates, EE_Message_Template_Group $message_template_group) {
 
 		//if templates are empty then get out because we can't generate anything.
-		if ( ! $templates ) {
-			$this->_error_msg[] = __( 'Unable to assemble messages because there are no templates retrieved for generating the messages with', 'event_espresso' );
+		if ( ! $templates) {
+			$this->_error_msg[] = __('Unable to assemble messages because there are no templates retrieved for generating the messages with', 'event_espresso');
 			return false;
 		}
 
 		//We use this as the counter for generated messages because don't forget we may be executing this inside of a
 		//generation_queue.  So _ready_queue may have generated EE_Message objects already.
 		$generated_count = 0;
-		foreach ( $addressees as $context => $recipients ) {
-			foreach ( $recipients as $recipient ) {
-				$message = $this->_setup_message_object( $context, $recipient, $templates, $message_template_group );
-				if ( $message instanceof EE_Message ) {
+		foreach ($addressees as $context => $recipients) {
+			foreach ($recipients as $recipient) {
+				$message = $this->_setup_message_object($context, $recipient, $templates, $message_template_group);
+				if ($message instanceof EE_Message) {
 					$this->_ready_queue->add(
 						$message,
 						array(),
@@ -428,7 +428,7 @@ 
 				}
 
 				//if the current MSG being generated is for a test send then we'll only use ONE message in the generation.
-				if ( $this->_generation_queue->get_message_repository()->is_test_send() ) {
+				if ($this->_generation_queue->get_message_repository()->is_test_send()) {
 					break 2;
 				}
 			}
@@ -457,7 +457,7 @@ 
 	) {
 		//stuff we already know
 		$transaction_id = $recipient->txn instanceof EE_Transaction ? $recipient->txn->ID() : 0;
-		$transaction_id = empty( $transaction_id ) && $this->_current_data_handler->txn instanceof EE_Transaction
+		$transaction_id = empty($transaction_id) && $this->_current_data_handler->txn instanceof EE_Transaction
 			? $this->_current_data_handler->txn->ID()
 			: $transaction_id;
 		$message_fields = array(
@@ -470,7 +470,7 @@ 
 
 		//recipient id and type should be on the EE_Messages_Addressee object but if this is empty, let's try to grab the
 		//info from the att_obj found in the EE_Messages_Addressee object.
-		if ( empty( $recipient->recipient_id ) || empty( $recipient->recipient_type ) ) {
+		if (empty($recipient->recipient_id) || empty($recipient->recipient_type)) {
 			$message_fields['MSG_recipient_ID'] = $recipient->att_obj instanceof EE_Attendee
 				? $recipient->att_obj->ID()
 				: 0;
@@ -479,7 +479,7 @@ 
 			$message_fields['MSG_recipient_ID'] = $recipient->recipient_id;
 			$message_fields['MSG_recipient_type'] = $recipient->recipient_type;
 		}
-		$message = EE_Message_Factory::create( $message_fields );
+		$message = EE_Message_Factory::create($message_fields);
 
 		//grab valid shortcodes for shortcode parser
 		$mt_shortcodes = $this->_current_message_type->get_valid_shortcodes();
@@ -487,43 +487,43 @@ 
 
 		//if the 'to' field is empty (messages will ALWAYS have a "to" field, then we get out because that means this
 		//context is turned off) EXCEPT if we're previewing
-		if ( empty( $templates['to'][ $context ] )
+		if (empty($templates['to'][$context])
 		     && ! $this->_generation_queue->get_message_repository()->is_preview()
-		     && ! $this->_current_messenger->allow_empty_to_field() ) {
+		     && ! $this->_current_messenger->allow_empty_to_field()) {
 			//we silently exit here and do NOT record a fail because the message is "turned off" by having no "to" field.
 			return false;
 		}
 		$error_msg = array();
-		foreach ( $templates as $field => $field_context ) {
+		foreach ($templates as $field => $field_context) {
 			$error_msg = array();
 			//let's setup the valid shortcodes for the incoming context.
-			$valid_shortcodes = $mt_shortcodes[ $context ];
+			$valid_shortcodes = $mt_shortcodes[$context];
 			//merge in valid shortcodes for the field.
-			$shortcodes = isset($m_shortcodes[ $field ]) ? $m_shortcodes[ $field ] : $valid_shortcodes;
-			if ( isset( $templates[ $field ][ $context ] ) ) {
+			$shortcodes = isset($m_shortcodes[$field]) ? $m_shortcodes[$field] : $valid_shortcodes;
+			if (isset($templates[$field][$context])) {
 				//prefix field.
-				$column_name = 'MSG_' . $field;
+				$column_name = 'MSG_'.$field;
 				try {
 					$content = $this->_shortcode_parser->parse_message_template(
-						$templates[ $field ][ $context ],
+						$templates[$field][$context],
 						$recipient,
 						$shortcodes,
 						$this->_current_message_type,
 						$this->_current_messenger,
 						$message );
-					$message->set_field_or_extra_meta( $column_name, $content );
-				} catch ( EE_Error $e ) {
-					$error_msg[] = sprintf( __( 'There was a problem generating the content for the field %s: %s', 'event_espresso' ), $field, $e->getMessage() );
-					$message->set_STS_ID( EEM_Message::status_failed );
+					$message->set_field_or_extra_meta($column_name, $content);
+				} catch (EE_Error $e) {
+					$error_msg[] = sprintf(__('There was a problem generating the content for the field %s: %s', 'event_espresso'), $field, $e->getMessage());
+					$message->set_STS_ID(EEM_Message::status_failed);
 				}
 			}
 		}
 
-		if ( $message->STS_ID() === EEM_Message::status_failed ) {
-			$error_msg = __( 'There were problems generating this message:', 'event_espresso' ) . "\n" . implode( "\n", $error_msg );
-			$message->set_error_message( $error_msg );
+		if ($message->STS_ID() === EEM_Message::status_failed) {
+			$error_msg = __('There were problems generating this message:', 'event_espresso')."\n".implode("\n", $error_msg);
+			$message->set_error_message($error_msg);
 		} else {
-			$message->set_STS_ID( EEM_Message::status_idle );
+			$message->set_STS_ID(EEM_Message::status_idle);
 		}
 		return $message;
 	}
@@ -557,14 +557,14 @@ 
 	 * @param array $addressees  Keys correspond to contexts for the message type and values are EE_Messages_Addressee[]
 	 * @return bool
 	 */
-	protected function _valid_addressees( $addressees ) {
-		if ( ! $addressees || ! is_array( $addressees ) ) {
+	protected function _valid_addressees($addressees) {
+		if ( ! $addressees || ! is_array($addressees)) {
 			return false;
 		}
 
-		foreach ( $addressees as $addressee_array ) {
-			foreach ( $addressee_array as $addressee ) {
-				if ( ! $addressee instanceof EE_Messages_Addressee ) {
+		foreach ($addressees as $addressee_array) {
+			foreach ($addressee_array as $addressee) {
+				if ( ! $addressee instanceof EE_Messages_Addressee) {
 					return false;
 				}
 			}
@@ -585,19 +585,19 @@ 
 	protected function _validate_messenger_and_message_type() {
 
 		//first are there any existing error messages?  If so then return.
-		if ( $this->_error_msg ) {
+		if ($this->_error_msg) {
 			return false;
 		}
 		/** @type EE_Message $message */
 		$message = $this->_generation_queue->get_message_repository()->current();
 		try {
-			$this->_current_messenger = $message->valid_messenger( true ) ? $message->messenger_object() : null;
-		} catch ( Exception $e ) {
+			$this->_current_messenger = $message->valid_messenger(true) ? $message->messenger_object() : null;
+		} catch (Exception $e) {
 			$this->_error_msg[] = $e->getMessage();
 		}
 		try {
-			$this->_current_message_type = $message->valid_message_type( true ) ? $message->message_type_object() : null;
-		} catch ( Exception $e ) {
+			$this->_current_message_type = $message->valid_message_type(true) ? $message->message_type_object() : null;
+		} catch (Exception $e) {
 			$this->_error_msg[] = $e->getMessage();
 		}
 
@@ -609,10 +609,10 @@ 
 			     ! $this->_generation_queue->get_message_repository()->is_preview()
 			     && $this->_generation_queue->get_message_repository()->get_data_handler() !== 'EE_Messages_Preview_incoming_data' )
 		) {
-			$this->_error_msg[] = __( 'There is no generation data for this message. Unable to generate.' );
+			$this->_error_msg[] = __('There is no generation data for this message. Unable to generate.');
 		}
 
-		return empty( $this->_error_msg );
+		return empty($this->_error_msg);
 	}
 
 
@@ -629,7 +629,7 @@ 
 
 		//First, are there any existing error messages?  If so, return because if there were errors elsewhere this can't
 		//be used anyways.
-		if ( $this->_error_msg ) {
+		if ($this->_error_msg) {
 			return false;
 		}
 
@@ -638,29 +638,29 @@ 
 		/** @type EE_Messages_incoming_data $data_handler_class_name - well not really... just the class name actually */
 		$data_handler_class_name = $this->_generation_queue->get_message_repository()->get_data_handler()
 			? $this->_generation_queue->get_message_repository()->get_data_handler()
-			: 'EE_Messages_' .  $this->_current_message_type->get_data_handler( $generation_data ) . '_incoming_data';
+			: 'EE_Messages_'.$this->_current_message_type->get_data_handler($generation_data).'_incoming_data';
 
 		//If this EE_Message is for a preview, then let's switch out to the preview data handler.
-		if ( $this->_generation_queue->get_message_repository()->is_preview() ) {
-			$data_handler_class_name  = 'EE_Messages_Preview_incoming_data';
+		if ($this->_generation_queue->get_message_repository()->is_preview()) {
+			$data_handler_class_name = 'EE_Messages_Preview_incoming_data';
 		}
 
 		//First get the class name for the data handler (and also verifies it exists.
-		if ( ! class_exists( $data_handler_class_name ) ) {
+		if ( ! class_exists($data_handler_class_name)) {
 			$this->_error_msg[] = sprintf(
-				__( 'The included data handler class name does not match any valid, accessible, "EE_Messages_incoming_data" classes.  Looking for %s.', 'event_espresso' ),
+				__('The included data handler class name does not match any valid, accessible, "EE_Messages_incoming_data" classes.  Looking for %s.', 'event_espresso'),
 				$data_handler_class_name
 			);
 			return false;
 		}
 
 		//convert generation_data for data_handler_instantiation.
-		$generation_data = $data_handler_class_name::convert_data_from_persistent_storage( $generation_data );
+		$generation_data = $data_handler_class_name::convert_data_from_persistent_storage($generation_data);
 
 		//note, this may set error messages as well.
-		$this->_set_data_handler( $generation_data, $data_handler_class_name );
+		$this->_set_data_handler($generation_data, $data_handler_class_name);
 
-		return empty( $this->_error_msg );
+		return empty($this->_error_msg);
 	}
 
 
@@ -677,16 +677,16 @@ 
 	 *
 	 * @return void.
 	 */
-	protected function _set_data_handler( $generating_data, $data_handler_class_name ) {
+	protected function _set_data_handler($generating_data, $data_handler_class_name) {
 		//valid classname for the data handler.  Now let's setup the key for the data handler repository to see if there
 		//is already a ready data handler in the repository.
-		$this->_current_data_handler = $this->_data_handler_collection->get_by_key( $this->_data_handler_collection->get_key( $data_handler_class_name, $generating_data ) );
-		if ( ! $this->_current_data_handler instanceof EE_Messages_incoming_data ) {
+		$this->_current_data_handler = $this->_data_handler_collection->get_by_key($this->_data_handler_collection->get_key($data_handler_class_name, $generating_data));
+		if ( ! $this->_current_data_handler instanceof EE_Messages_incoming_data) {
 			//no saved data_handler in the repo so let's set one up and add it to the repo.
 			try {
-				$this->_current_data_handler = new $data_handler_class_name( $generating_data );
-				$this->_data_handler_collection->add( $this->_current_data_handler, $generating_data );
-			} catch( EE_Error $e ) {
+				$this->_current_data_handler = new $data_handler_class_name($generating_data);
+				$this->_data_handler_collection->add($this->_current_data_handler, $generating_data);
+			} catch (EE_Error $e) {
 				$this->_error_msg[] = $e->get_error();
 			}
 		}
@@ -706,13 +706,13 @@ 
 	 * @param bool                   $preview Indicate whether this is being used for a preview or not.
 	 * @return mixed Prepped data for persisting to the queue.  false is returned if unable to prep data.
 	 */
-	protected function _prepare_data_for_queue( EE_Message_To_Generate $message_to_generate, $preview ) {
+	protected function _prepare_data_for_queue(EE_Message_To_Generate $message_to_generate, $preview) {
 		/** @type EE_Messages_incoming_data $data_handler - well not really... just the class name actually */
-		$data_handler = $message_to_generate->get_data_handler_class_name( $preview );
-		if ( ! $message_to_generate->valid() ) {
+		$data_handler = $message_to_generate->get_data_handler_class_name($preview);
+		if ( ! $message_to_generate->valid()) {
 			return false; //unable to get the data because the info in the EE_Message_To_Generate class is invalid.
 		}
-		return $data_handler::convert_data_for_persistent_storage( $message_to_generate->data() );
+		return $data_handler::convert_data_for_persistent_storage($message_to_generate->data());
 	}
 
 
@@ -725,26 +725,26 @@ 
 	 * @param EE_Message_To_Generate $message_to_generate
 	 * @param bool                   $test_send Whether this is just a test send or not.  Typically used for previews.
 	 */
-	public function create_and_add_message_to_queue( EE_Message_To_Generate $message_to_generate, $test_send = false ) {
+	public function create_and_add_message_to_queue(EE_Message_To_Generate $message_to_generate, $test_send = false) {
 		//prep data
-		$data = $this->_prepare_data_for_queue( $message_to_generate, $message_to_generate->preview() );
+		$data = $this->_prepare_data_for_queue($message_to_generate, $message_to_generate->preview());
 
 		$message = $message_to_generate->get_EE_Message();
 
 		//is there a GRP_ID in the request?
-		if ( $GRP_ID = EE_Registry::instance()->REQ->get( 'GRP_ID' ) ) {
-			$message->set_GRP_ID( $GRP_ID );
+		if ($GRP_ID = EE_Registry::instance()->REQ->get('GRP_ID')) {
+			$message->set_GRP_ID($GRP_ID);
 		}
 
-		if ( $data === false ) {
-			$message->set_STS_ID( EEM_Message::status_failed );
-			$message->set_error_message( __( 'Unable to prepare data for persistence to the database.', 'event_espresso' ) );
+		if ($data === false) {
+			$message->set_STS_ID(EEM_Message::status_failed);
+			$message->set_error_message(__('Unable to prepare data for persistence to the database.', 'event_espresso'));
 		} else {
 			//make sure that the data handler is cached on the message as well
 			$data['data_handler_class_name'] = $message_to_generate->get_data_handler_class_name();
 		}
 
-		$this->_generation_queue->add( $message, $data, $message_to_generate->preview(), $test_send );
+		$this->_generation_queue->add($message, $data, $message_to_generate->preview(), $test_send);
 	}