eventespresso / event-espresso-core

core/EE_Cron_Tasks.core.php

Spacing +47 added lines, -47 removed lines

@@ -22,7 +22,7 @@ 
 	 * @return EE_Cron_Tasks
 	 */
 	public static function instance() {
-		if ( ! self::$_instance instanceof EE_Cron_Tasks ) {
+		if ( ! self::$_instance instanceof EE_Cron_Tasks) {
 			self::$_instance = new self();
 		}
 		return self::$_instance;
@@ -38,19 +38,19 @@ 
 		// UPDATE TRANSACTION WITH PAYMENT
 		add_action(
 			'AHEE__EE_Cron_Tasks__update_transaction_with_payment',
-			array( 'EE_Cron_Tasks', 'setup_update_for_transaction_with_payment' ),
+			array('EE_Cron_Tasks', 'setup_update_for_transaction_with_payment'),
 			10, 2
 		);
 		// FINALIZE ABANDONED TRANSACTIONS
 		add_action(
 			'AHEE__EE_Cron_Tasks__finalize_abandoned_transactions',
-			array( 'EE_Cron_Tasks', 'check_for_abandoned_transactions' ),
+			array('EE_Cron_Tasks', 'check_for_abandoned_transactions'),
 			10, 1
 		);
 		// CLEAN OUT JUNK TRANSACTIONS AND RELATED DATA
 		add_action(
 				'AHEE__EE_Cron_Tasks__clean_up_junk_transactions',
-				array( 'EE_Cron_Tasks', 'clean_out_junk_transactions' )
+				array('EE_Cron_Tasks', 'clean_out_junk_transactions')
 		);
 	}
 
@@ -84,13 +84,13 @@ 
 		$payment
 	) {
 		// validate $TXN_ID and $timestamp
-		$TXN_ID = absint( $TXN_ID );
-		$timestamp = absint( $timestamp );
-		if ( $TXN_ID && $timestamp ) {
+		$TXN_ID = absint($TXN_ID);
+		$timestamp = absint($timestamp);
+		if ($TXN_ID && $timestamp) {
 			wp_schedule_single_event(
 				$timestamp,
 				'AHEE__EE_Cron_Tasks__update_transaction_with_payment',
-				array( $TXN_ID, $payment )
+				array($TXN_ID, $payment)
 			);
 		}
 	}
@@ -112,12 +112,12 @@ 
 	 * @param int  $TXN_ID
 	 * @param null $payment
 	 */
-	public static function setup_update_for_transaction_with_payment( $TXN_ID = 0, $payment = null ) {
-		if ( absint( $TXN_ID )) {
-			self::$_update_transactions_with_payment[ $TXN_ID ] = $payment;
+	public static function setup_update_for_transaction_with_payment($TXN_ID = 0, $payment = null) {
+		if (absint($TXN_ID)) {
+			self::$_update_transactions_with_payment[$TXN_ID] = $payment;
 			add_action(
 				'shutdown',
-				array( 'EE_Cron_Tasks', 'update_transaction_with_payment' ),
+				array('EE_Cron_Tasks', 'update_transaction_with_payment'),
 				5
 			);
 		}
@@ -135,31 +135,31 @@ 
 	 */
 	public static function update_transaction_with_payment() {
 		// are there any TXNs that need cleaning up ?
-		if ( ! empty( self::$_update_transactions_with_payment ) ) {
+		if ( ! empty(self::$_update_transactions_with_payment)) {
 			/** @type EE_Payment_Processor $payment_processor */
-			$payment_processor = EE_Registry::instance()->load_core( 'Payment_Processor' );
+			$payment_processor = EE_Registry::instance()->load_core('Payment_Processor');
 			// set revisit flag for payment processor
-			$payment_processor->set_revisit( false );
+			$payment_processor->set_revisit(false);
 			// load EEM_Transaction
-			EE_Registry::instance()->load_model( 'Transaction' );
-			foreach ( self::$_update_transactions_with_payment as $TXN_ID => $payment ) {
+			EE_Registry::instance()->load_model('Transaction');
+			foreach (self::$_update_transactions_with_payment as $TXN_ID => $payment) {
 				// reschedule the cron if we can't hit the db right now
-				if ( ! EE_Maintenance_Mode::instance()->models_can_query() ) {
+				if ( ! EE_Maintenance_Mode::instance()->models_can_query()) {
 					// reset cron job for updating the TXN
 					EE_Cron_Tasks::schedule_update_transaction_with_payment(
-						time() + ( 10 * MINUTE_IN_SECONDS ) + 1,
+						time() + (10 * MINUTE_IN_SECONDS) + 1,
 						$TXN_ID,
 						$payment
 					);
 					continue;
 				}
-				$transaction = EEM_Transaction::instance()->get_one_by_ID( $TXN_ID );
+				$transaction = EEM_Transaction::instance()->get_one_by_ID($TXN_ID);
 				// verify transaction
-				if ( $transaction instanceof EE_Transaction ) {
+				if ($transaction instanceof EE_Transaction) {
 					// now try to update the TXN with any payments
-					$payment_processor->update_txn_based_on_payment( $transaction, $payment, true, true );
+					$payment_processor->update_txn_based_on_payment($transaction, $payment, true, true);
 				}
-				unset( self::$_update_transactions_with_payment[ $TXN_ID ] );
+				unset(self::$_update_transactions_with_payment[$TXN_ID]);
 			}
 		}
 	}
@@ -196,13 +196,13 @@ 
 		$TXN_ID
 	) {
 		// validate $TXN_ID and $timestamp
-		$TXN_ID = absint( $TXN_ID );
-		$timestamp = absint( $timestamp );
-		if ( $TXN_ID && $timestamp ) {
+		$TXN_ID = absint($TXN_ID);
+		$timestamp = absint($timestamp);
+		if ($TXN_ID && $timestamp) {
 			wp_schedule_single_event(
 				$timestamp,
 				'AHEE__EE_Cron_Tasks__finalize_abandoned_transactions',
-				array( $TXN_ID )
+				array($TXN_ID)
 			);
 		}
 	}
@@ -224,12 +224,12 @@ 
 	 *
 	 * @param int $TXN_ID
 	 */
-	public static function check_for_abandoned_transactions(	$TXN_ID = 0 ) {
-		if ( absint( $TXN_ID )) {
-			self::$_abandoned_transactions[]  = $TXN_ID;
+	public static function check_for_abandoned_transactions($TXN_ID = 0) {
+		if (absint($TXN_ID)) {
+			self::$_abandoned_transactions[] = $TXN_ID;
 			add_action(
 				'shutdown',
-				array( 'EE_Cron_Tasks', 'finalize_abandoned_transactions' ),
+				array('EE_Cron_Tasks', 'finalize_abandoned_transactions'),
 				5
 			);
 		}
@@ -247,38 +247,38 @@ 
 	 */
 	public static function finalize_abandoned_transactions() {
 		// are there any TXNs that need cleaning up ?
-		if ( ! empty( self::$_abandoned_transactions ) ) {
+		if ( ! empty(self::$_abandoned_transactions)) {
 			/** @type EE_Transaction_Processor $transaction_processor */
-			$transaction_processor = EE_Registry::instance()->load_class( 'Transaction_Processor' );
+			$transaction_processor = EE_Registry::instance()->load_class('Transaction_Processor');
 			// set revisit flag for txn processor
-			$transaction_processor->set_revisit( false );
+			$transaction_processor->set_revisit(false);
 			/** @type EE_Transaction_Payments $transaction_payments */
-			$transaction_payments = EE_Registry::instance()->load_class( 'Transaction_Payments' );
+			$transaction_payments = EE_Registry::instance()->load_class('Transaction_Payments');
 			// load EEM_Transaction
-			EE_Registry::instance()->load_model( 'Transaction' );
-			foreach ( self::$_abandoned_transactions as $TXN_ID ) {
+			EE_Registry::instance()->load_model('Transaction');
+			foreach (self::$_abandoned_transactions as $TXN_ID) {
 				// reschedule the cron if we can't hit the db right now
-				if ( ! EE_Maintenance_Mode::instance()->models_can_query() ) {
+				if ( ! EE_Maintenance_Mode::instance()->models_can_query()) {
 					// reset cron job for finalizing the TXN
 					EE_Cron_Tasks::schedule_finalize_abandoned_transactions_check(
-						time() + ( 10 * MINUTE_IN_SECONDS ) + 1,
+						time() + (10 * MINUTE_IN_SECONDS) + 1,
 						$TXN_ID
 					);
 					continue;
 				}
-				$transaction = EEM_Transaction::instance()->get_one_by_ID( $TXN_ID );
+				$transaction = EEM_Transaction::instance()->get_one_by_ID($TXN_ID);
 				// verify transaction
-				if ( $transaction instanceof EE_Transaction ) {
+				if ($transaction instanceof EE_Transaction) {
 					// or have had all of their reg steps completed
-					if ( $transaction_processor->all_reg_steps_completed(	$transaction ) === true ) {
+					if ($transaction_processor->all_reg_steps_completed($transaction) === true) {
 						continue;
 					}
 					// maybe update status, but don't save transaction just yet
-					$transaction_payments	->update_transaction_status_based_on_total_paid( $transaction, false );
+					$transaction_payments	->update_transaction_status_based_on_total_paid($transaction, false);
 					// check if enough Reg Steps have been completed to warrant finalizing the TXN
-					if ( $transaction_processor->all_reg_steps_completed_except_final_step( $transaction ) ) {
+					if ($transaction_processor->all_reg_steps_completed_except_final_step($transaction)) {
 						// and if it hasn't already been set as being started...
-						$transaction_processor->set_reg_step_initiated( $transaction, 'finalize_registration' );
+						$transaction_processor->set_reg_step_initiated($transaction, 'finalize_registration');
 					}
 					// now update the TXN and trigger notifications
 					$transaction_processor->update_transaction_and_registrations_after_checkout_or_payment(
@@ -286,7 +286,7 @@ 
 						$transaction->last_payment()
 					);
 				}
-				unset( self::$_abandoned_transactions[ $TXN_ID ] );
+				unset(self::$_abandoned_transactions[$TXN_ID]);
 			}
 		}
 	}
@@ -300,7 +300,7 @@ 
 	//when a transaction is initially made, schedule this check.
 	//if it has NO REG data by the time it has expired, forget about it
 	public static function clean_out_junk_transactions() {
-		if( EE_Maintenance_Mode::instance()->models_can_query() ) {
+		if (EE_Maintenance_Mode::instance()->models_can_query()) {
 			EEM_Transaction::instance('')->delete_junk_transactions();
 			EEM_Registration::instance('')->delete_registrations_with_no_transaction();
 			EEM_Line_Item::instance('')->delete_line_items_with_no_transaction();

core/EE_Data_Mapper.core.php

Indentation +3 added lines, -3 removed lines

@@ -28,9 +28,9 @@
 
 
    /**
-     * instance of the EE_Data_Mapper Object
-     * @private _instance
-     */
+    * instance of the EE_Data_Mapper Object
+    * @private _instance
+    */
 	private static $_instance = NULL;
 
 

Spacing +4 added lines, -4 removed lines

@@ -54,7 +54,7 @@ 
 	 */	
 	public  function &instance() {
 		// check if class object is instantiated
-		if ( self::$_instance === NULL  or ! is_object( self::$_instance ) or ! ( self::$_instance instanceof EE_Data_Mapper )) {
+		if (self::$_instance === NULL or ! is_object(self::$_instance) or ! (self::$_instance instanceof EE_Data_Mapper)) {
 			self::$_instance = new self();
 		}
 		return self::$_instance;
@@ -71,10 +71,10 @@ 
 	 *		@ return void
 	 */
 	final function __destruct() {}
-	final function __call($a,$b) {}
-	public static function __callStatic($a,$b) {}
+	final function __call($a, $b) {}
+	public static function __callStatic($a, $b) {}
 	final function __get($a) {}
-	final function __set($a,$b) {}
+	final function __set($a, $b) {}
 	final function __isset($a) {}
 	final function __unset($a) {}
 	final function __sleep() {

core/EE_Data_Migration_Manager.core.php

Indentation +8 added lines, -8 removed lines

@@ -110,9 +110,9 @@ 
 	var $stati_that_indicate_to_stop_single_migration_script = array();
 
 	/**
-     * 	@var EE_Data_Migration_Manager $_instance
+	 * 	@var EE_Data_Migration_Manager $_instance
 	 * 	@access 	private
-     */
+	 */
 	private static $_instance = NULL;
 
 	/**
@@ -905,12 +905,12 @@ 
 	}
 
 /**
-	 * Resets the borked data migration scripts so they're no longer borked
-	 * so we can again attempt to migrate
-	 *
-	 * @return bool
-	 * @throws \EE_Error
-	 */
+ * Resets the borked data migration scripts so they're no longer borked
+ * so we can again attempt to migrate
+ *
+ * @return bool
+ * @throws \EE_Error
+ */
 	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)

Spacing +198 added lines, -198 removed lines

@@ -21,7 +21,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 {
 
 	/**
 	 *
@@ -78,7 +78,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
@@ -122,7 +122,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;
@@ -132,7 +132,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();
 	}
@@ -142,7 +142,7 @@ 
 	/**
 	 * constructor
 	 */
-	private function __construct(){
+	private function __construct() {
 		$this->stati_that_indicate_to_continue_migrations = array(
 			self::status_continue,
 			self::status_completed
@@ -161,11 +161,11 @@ 
 		);
 		//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 );
+		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);
 	}
 
 
@@ -178,21 +178,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);
 	}
 
 	/**
@@ -203,21 +203,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));
 		}
 	}
 	/**
@@ -225,34 +225,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();
 			}
 		}
@@ -269,7 +269,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;
@@ -280,9 +280,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);
 	}
 
 	/**
@@ -290,8 +290,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'));
 	}
 
 	/**
@@ -303,11 +303,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'] );
 	}
 
 	/**
@@ -316,13 +316,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
@@ -331,33 +331,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;
 	}
@@ -368,7 +368,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));
@@ -381,62 +381,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;
 					/* @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;
 	}
 
@@ -450,14 +450,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;
 		}
 	}
@@ -480,17 +480,17 @@ 
 	 * 		@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
-		remove_action( 'pre_get_posts', array( EE_CPT_Strategy::instance(), 'pre_get_posts' ), 5 );
+		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
@@ -511,18 +511,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,
@@ -532,16 +532,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(),
@@ -553,16 +553,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!
@@ -576,39 +576,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;
@@ -626,23 +626,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;
 	}
 
@@ -655,14 +655,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);
 	}
 
 	/**
@@ -673,20 +673,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;
 				}
@@ -700,29 +700,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;
@@ -742,7 +742,7 @@ 
 	 * from each addon, and check if they need updating,
 	 * @return boolean
 	 */
-	public function addons_need_updating(){
+	public function addons_need_updating() {
 		return false;
 	}
 	/**
@@ -751,25 +751,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();
@@ -779,39 +779,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;
 				}
@@ -835,17 +835,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;
@@ -857,25 +857,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;
 				}
@@ -895,11 +895,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;
 		}
 	}
@@ -911,20 +911,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 ) ) );
+		} 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)));
 		}
 		return $this->_save_migrations_ran();
 	}
@@ -934,19 +934,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
@@ -957,26 +957,26 @@ 
 //		EE_Registry::instance()->load_helper( 'Debug_Tools' );
 //		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;
 					}
 				}
@@ -986,7 +986,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);
 	}
 
 	/**
@@ -995,7 +995,7 @@ 
 	 * '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());
 	}
 }

Braces +21 added lines, -21 removed lines

@@ -187,7 +187,7 @@ 
 			//it's 4.2-style.eg Core.4.1.0
 			$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
@@ -210,12 +210,12 @@ 
 			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']));
 			}
-		}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));
 		}
@@ -245,7 +245,7 @@ 
 						//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']);
 				}
@@ -346,7 +346,7 @@ 
 				//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);
 			}
@@ -414,10 +414,10 @@ 
 						$migrates_to_version = $script->migrates_to_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!
@@ -457,7 +457,7 @@ 
 		}
 		if($include_completed_scripts){
 			return $this->_last_ran_script;
-		}else{
+		} else{
 			return $this->_last_ran_incomplete_script;
 		}
 	}
@@ -516,7 +516,7 @@ 
 				$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() );
@@ -581,14 +581,14 @@ 
 					);
 					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){
 				$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(
@@ -631,7 +631,7 @@ 
 		ob_start();
 		try{
 			$response = $this->migration_step();
-		}catch(Exception $e){
+		} catch(Exception $e){
 			$response = array(
 				'records_to_migrate'=>0,
 				'records_migrated'=>0,
@@ -680,7 +680,7 @@ 
 		$current_database_state = get_option(self::current_database_state);
 		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 );
@@ -769,7 +769,7 @@ 
 			//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();
@@ -805,7 +805,7 @@ 
 					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);
@@ -872,7 +872,7 @@ 
 				}
 				//if it wasn't for core, we must keep searching for one that is!
 				continue;
-			}else{
+			} 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' ], '<')){
@@ -899,7 +899,7 @@ 
 		$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{
+		} else{
 			return NULL;
 		}
 	}
@@ -921,9 +921,9 @@ 
 		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{
+		} 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 ) ) );
 		}
 		return $this->_save_migrations_ran();
@@ -962,7 +962,7 @@ 
 			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{
+			} 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 );
 			}
@@ -971,7 +971,7 @@ 
 						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 ) {

core/EE_Deprecated.core.php

Braces +3 added lines, -1 removed lines

@@ -5,7 +5,9 @@
  * @subpackage helpers
  * @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');
+}
 /**
  * ee_deprecated__registration_checkout__button_text
  *

Spacing +104 added lines, -104 removed lines

@@ -13,7 +13,7 @@ 
  * @param \EE_Checkout $checkout
  * @return string
  */
-function ee_deprecated__registration_checkout__button_text( $submit_button_text, EE_Checkout $checkout ) {
+function ee_deprecated__registration_checkout__button_text($submit_button_text, EE_Checkout $checkout) {
 	// list of old filters
 	$deprecated_filters = array(
 		'update_registration_details' => true,
@@ -23,16 +23,16 @@ 
 		'proceed_to' => true,
 	);
 	// loop thru and call doing_it_wrong() or remove any that aren't being used
-	foreach ( $deprecated_filters as $deprecated_filter => $on ) {
+	foreach ($deprecated_filters as $deprecated_filter => $on) {
 		// was this filter called ?
-		if ( has_action( 'FHEE__EED_Single_Page_Checkout__registration_checkout__button_text__' . $deprecated_filter )) {
+		if (has_action('FHEE__EED_Single_Page_Checkout__registration_checkout__button_text__'.$deprecated_filter)) {
 			// only display doing_it_wrong() notice to Event Admins during non-AJAX requests
-			if ( EE_Registry::instance()->CAP->current_user_can( 'ee_read_ee', 'hide_doing_it_wrong_for_deprecated_SPCO_filter' ) && ! defined( 'DOING_AJAX' ) ) {
+			if (EE_Registry::instance()->CAP->current_user_can('ee_read_ee', 'hide_doing_it_wrong_for_deprecated_SPCO_filter') && ! defined('DOING_AJAX')) {
 				EE_Error::doing_it_wrong(
-					'FHEE__EED_Single_Page_Checkout__registration_checkout__button_text__' . $deprecated_filter,
+					'FHEE__EED_Single_Page_Checkout__registration_checkout__button_text__'.$deprecated_filter,
 					sprintf(
-						__( 'The %1$s filter is deprecated.  It *may* work as an attempt to build in backwards compatibility.  However, it is recommended to use the following new filter: %2$s"%3$s" found in "%4$s"', 'event_espresso' ),
-						'FHEE__EED_Single_Page_Checkout__registration_checkout__button_text__' . $deprecated_filter,
+						__('The %1$s filter is deprecated.  It *may* work as an attempt to build in backwards compatibility.  However, it is recommended to use the following new filter: %2$s"%3$s" found in "%4$s"', 'event_espresso'),
+						'FHEE__EED_Single_Page_Checkout__registration_checkout__button_text__'.$deprecated_filter,
 						'<br />',
 						'FHEE__EE_SPCO_Reg_Step__set_submit_button_text___submit_button_text',
 						'/modules/single_page_checkout/inc/EE_SPCO_Reg_Step.class.php'
@@ -41,24 +41,24 @@ 
 				);
 			}
 		} else {
-			unset( $deprecated_filters[ $deprecated_filter ] );
+			unset($deprecated_filters[$deprecated_filter]);
 		}
 	}
-	if ( ! empty( $deprecated_filters )) {
-
-		if ( $checkout->current_step->slug() == 'attendee_information' && $checkout->revisit && isset( $deprecated_filters[ 'update_registration_details' ] )) {
-			$submit_button_text = apply_filters( 'FHEE__EED_Single_Page_Checkout__registration_checkout__button_text__update_registration_details', $submit_button_text );
-		} else if ( $checkout->current_step->slug() == 'payment_options' && $checkout->revisit && isset( $deprecated_filters[ 'process_payment' ] ) ) {
-			$submit_button_text = apply_filters( 'FHEE__EED_Single_Page_Checkout__registration_checkout__button_text__process_payment', $submit_button_text );
-		} else if ( $checkout->next_step instanceof EE_SPCO_Reg_Step && $checkout->next_step->slug() == 'finalize_registration' && isset( $deprecated_filters[ 'finalize_registration' ] ) ) {
-			$submit_button_text = apply_filters( 'FHEE__EED_Single_Page_Checkout__registration_checkout__button_text__finalize_registration', $submit_button_text );
+	if ( ! empty($deprecated_filters)) {
+
+		if ($checkout->current_step->slug() == 'attendee_information' && $checkout->revisit && isset($deprecated_filters['update_registration_details'])) {
+			$submit_button_text = apply_filters('FHEE__EED_Single_Page_Checkout__registration_checkout__button_text__update_registration_details', $submit_button_text);
+		} else if ($checkout->current_step->slug() == 'payment_options' && $checkout->revisit && isset($deprecated_filters['process_payment'])) {
+			$submit_button_text = apply_filters('FHEE__EED_Single_Page_Checkout__registration_checkout__button_text__process_payment', $submit_button_text);
+		} else if ($checkout->next_step instanceof EE_SPCO_Reg_Step && $checkout->next_step->slug() == 'finalize_registration' && isset($deprecated_filters['finalize_registration'])) {
+			$submit_button_text = apply_filters('FHEE__EED_Single_Page_Checkout__registration_checkout__button_text__finalize_registration', $submit_button_text);
 		}
-		if ( $checkout->next_step instanceof EE_SPCO_Reg_Step ) {
-			if ( $checkout->payment_required() && $checkout->next_step->slug() == 'payment_options' && isset( $deprecated_filters[ 'and_proceed_to_payment' ] ) ) {
-				$submit_button_text .= apply_filters( 'FHEE__EED_Single_Page_Checkout__registration_checkout__button_text__and_proceed_to_payment', $submit_button_text );
+		if ($checkout->next_step instanceof EE_SPCO_Reg_Step) {
+			if ($checkout->payment_required() && $checkout->next_step->slug() == 'payment_options' && isset($deprecated_filters['and_proceed_to_payment'])) {
+				$submit_button_text .= apply_filters('FHEE__EED_Single_Page_Checkout__registration_checkout__button_text__and_proceed_to_payment', $submit_button_text);
 			}
-			if ( $checkout->next_step->slug() != 'finalize_registration' && ! $checkout->revisit && isset( $deprecated_filters[ 'proceed_to' ] ) ) {
-				$submit_button_text = apply_filters( 'FHEE__EED_Single_Page_Checkout__registration_checkout__button_text__proceed_to', $submit_button_text ) . $checkout->next_step->name();
+			if ($checkout->next_step->slug() != 'finalize_registration' && ! $checkout->revisit && isset($deprecated_filters['proceed_to'])) {
+				$submit_button_text = apply_filters('FHEE__EED_Single_Page_Checkout__registration_checkout__button_text__proceed_to', $submit_button_text).$checkout->next_step->name();
 			}
 		}
 
@@ -66,7 +66,7 @@ 
 	return $submit_button_text;
 
 }
-add_filter( 'FHEE__EE_SPCO_Reg_Step__set_submit_button_text___submit_button_text', 'ee_deprecated__registration_checkout__button_text', 10, 2 );
+add_filter('FHEE__EE_SPCO_Reg_Step__set_submit_button_text___submit_button_text', 'ee_deprecated__registration_checkout__button_text', 10, 2);
 
 
 
@@ -77,16 +77,16 @@ 
  * @param \EE_Checkout $checkout
  * @param boolean $status_updates
  */
-function ee_deprecated_finalize_transaction( EE_Checkout $checkout, $status_updates ) {
+function ee_deprecated_finalize_transaction(EE_Checkout $checkout, $status_updates) {
 	$action_ref = NULL;
-	$action_ref = has_action( 'AHEE__EE_Transaction__finalize__new_transaction' ) ? 'AHEE__EE_Transaction__finalize__new_transaction' : $action_ref;
-	$action_ref = has_action( 'AHEE__EE_Transaction__finalize__all_transaction' ) ? 'AHEE__EE_Transaction__finalize__all_transaction' : $action_ref;
-	if ( $action_ref ) {
+	$action_ref = has_action('AHEE__EE_Transaction__finalize__new_transaction') ? 'AHEE__EE_Transaction__finalize__new_transaction' : $action_ref;
+	$action_ref = has_action('AHEE__EE_Transaction__finalize__all_transaction') ? 'AHEE__EE_Transaction__finalize__all_transaction' : $action_ref;
+	if ($action_ref) {
 
 		EE_Error::doing_it_wrong(
 			$action_ref,
 			sprintf(
-				__( 'This action is deprecated.  It *may* work as an attempt to build in backwards compatibility.  However, it is recommended to use one of the following new actions: %1$s"%3$s" found in "%2$s" %1$s"%4$s" found in "%2$s" %1$s"%5$s" found in "%2$s" %1$s"%6$s" found in "%2$s"', 'event_espresso' ),
+				__('This action is deprecated.  It *may* work as an attempt to build in backwards compatibility.  However, it is recommended to use one of the following new actions: %1$s"%3$s" found in "%2$s" %1$s"%4$s" found in "%2$s" %1$s"%5$s" found in "%2$s" %1$s"%6$s" found in "%2$s"', 'event_espresso'),
 				'<br />',
 				'/core/business/EE_Transaction_Processor.class.php',
 				'AHEE__EE_Transaction_Processor__finalize',
@@ -96,39 +96,39 @@ 
 			),
 			'4.6.0'
 		);
-		switch ( $action_ref ) {
+		switch ($action_ref) {
 			case 'AHEE__EE_Transaction__finalize__new_transaction' :
-				do_action( 'AHEE__EE_Transaction__finalize__new_transaction', $checkout->transaction, $checkout->admin_request );
+				do_action('AHEE__EE_Transaction__finalize__new_transaction', $checkout->transaction, $checkout->admin_request);
 				break;
 			case 'AHEE__EE_Transaction__finalize__all_transaction' :
-				do_action( 'AHEE__EE_Transaction__finalize__new_transaction', $checkout->transaction, array( 'new_reg' => ! $checkout->revisit, 'to_approved' => $status_updates ), $checkout->admin_request );
+				do_action('AHEE__EE_Transaction__finalize__new_transaction', $checkout->transaction, array('new_reg' => ! $checkout->revisit, 'to_approved' => $status_updates), $checkout->admin_request);
 				break;
 		}
 	}
 }
-add_action( 'AHEE__EE_SPCO_Reg_Step_Finalize_Registration__process_reg_step__completed', 'ee_deprecated_finalize_transaction', 10, 2 );
+add_action('AHEE__EE_SPCO_Reg_Step_Finalize_Registration__process_reg_step__completed', 'ee_deprecated_finalize_transaction', 10, 2);
 /**
  * ee_deprecated_finalize_registration
  *
  * @param EE_Registration $registration
  */
-function ee_deprecated_finalize_registration( EE_Registration $registration ) {
-	$action_ref = has_action( 'AHEE__EE_Registration__finalize__update_and_new_reg' ) ? 'AHEE__EE_Registration__finalize__update_and_new_reg' : NULL;
-	if ( $action_ref ) {
+function ee_deprecated_finalize_registration(EE_Registration $registration) {
+	$action_ref = has_action('AHEE__EE_Registration__finalize__update_and_new_reg') ? 'AHEE__EE_Registration__finalize__update_and_new_reg' : NULL;
+	if ($action_ref) {
 		EE_Error::doing_it_wrong(
 			$action_ref,
 			sprintf(
-				__( 'This action is deprecated.  It *may* work as an attempt to build in backwards compatibility.  However, it is recommended to use the following new action: %1$s"%3$s" found in "%2$s"', 'event_espresso' ),
+				__('This action is deprecated.  It *may* work as an attempt to build in backwards compatibility.  However, it is recommended to use the following new action: %1$s"%3$s" found in "%2$s"', 'event_espresso'),
 				'<br />',
 				'/core/business/EE_Registration_Processor.class.php',
 				'AHEE__EE_Registration_Processor__trigger_registration_status_changed_hook'
 			),
 			'4.6.0'
 		);
-		do_action( 'AHEE__EE_Registration__finalize__update_and_new_reg', $registration, ( is_admin() && ! ( defined( 'DOING_AJAX' ) && DOING_AJAX )));
+		do_action('AHEE__EE_Registration__finalize__update_and_new_reg', $registration, (is_admin() && ! (defined('DOING_AJAX') && DOING_AJAX)));
 	}
 }
-add_action( 'AHEE__EE_Registration_Processor__trigger_registration_update_notifications', 'ee_deprecated_finalize_registration', 10, 1 );
+add_action('AHEE__EE_Registration_Processor__trigger_registration_update_notifications', 'ee_deprecated_finalize_registration', 10, 1);
 
 
 
@@ -149,7 +149,7 @@ 
  *
  * @return array
  */
-function ee_deprecated_get_templates( $templates, EE_messenger $messenger, EE_message_type $message_type, EE_Messages_Template_Pack $template_pack ) {
+function ee_deprecated_get_templates($templates, EE_messenger $messenger, EE_message_type $message_type, EE_Messages_Template_Pack $template_pack) {
 	$old_default_classnames = array(
 		'EE_Messages_Email_Cancelled_Registration_Defaults',
 		'EE_Messages_Email_Declined_Registration_Defaults',
@@ -165,23 +165,23 @@ 
 
 	$old_class_instance = new stdClass();
 
-	foreach ( $old_default_classnames as $classname ) {
-		$filter_ref = 'FHEE__' . $classname . '___create_new_templates___templates';
-		if ( has_filter( $filter_ref ) ) {
-			EE_Error::doing_it_wrong( $filter_ref, __('This filter is deprecated.  It *may* work as an attempt to build in backwards compatibility.  However, it is recommended to use the new filter provided which is "FHEE__EE_Template_Pack___get_templates__templates" found in the EE_Messages_Template_Pack class.', 'event_espresso'), '4.5.0' );
+	foreach ($old_default_classnames as $classname) {
+		$filter_ref = 'FHEE__'.$classname.'___create_new_templates___templates';
+		if (has_filter($filter_ref)) {
+			EE_Error::doing_it_wrong($filter_ref, __('This filter is deprecated.  It *may* work as an attempt to build in backwards compatibility.  However, it is recommended to use the new filter provided which is "FHEE__EE_Template_Pack___get_templates__templates" found in the EE_Messages_Template_Pack class.', 'event_espresso'), '4.5.0');
 		}
-		$templates = apply_filters( $filter_ref, $templates, $old_class_instance );
+		$templates = apply_filters($filter_ref, $templates, $old_class_instance);
 	}
 
 	return $templates;
 }
-add_filter( 'FHEE__EE_Template_Pack___get_templates__templates', 'ee_deprecated_get_templates', 10, 4 );
+add_filter('FHEE__EE_Template_Pack___get_templates__templates', 'ee_deprecated_get_templates', 10, 4);
 
 /**
  * Called after EED_Module::set_hooks() and EED_Module::set_admin_hooks() was called.
  * Checks if any deprecated hooks were hooked-into and provide doing_it_wrong messages appropriately.
  */
-function ee_deprecated_hooks(){
+function ee_deprecated_hooks() {
 	/**
 	 * @var $hooks array where keys are hook names, and their values are array{
 	 *			@type string $version  when deprecated
@@ -192,25 +192,25 @@ 
 	$hooks = array(
 		'AHEE__EE_System___do_setup_validations' => array(
 			'version' => '4.6.0',
-			'alternative' => __( 'Instead use "AHEE__EEH_Activation__validate_messages_system" which is called after validating messages (done on every new install, upgrade, reactivation, and downgrade)', 'event_espresso' ),
+			'alternative' => __('Instead use "AHEE__EEH_Activation__validate_messages_system" which is called after validating messages (done on every new install, upgrade, reactivation, and downgrade)', 'event_espresso'),
 			'still_works' => FALSE
 		)
 	);
-	foreach( $hooks as $name => $deprecation_info ){
-		if( has_action( $name ) ){
+	foreach ($hooks as $name => $deprecation_info) {
+		if (has_action($name)) {
 			EE_Error::doing_it_wrong(
 				$name,
 				sprintf(
-					__('This filter is deprecated. %1$s%2$s','event_espresso'),
-					$deprecation_info[ 'still_works' ] ?  __('It *may* work as an attempt to build in backwards compatibility.', 'event_espresso') : __( 'It has been completely removed.', 'event_espresso' ),
-					isset( $deprecation_info[ 'alternative' ] ) ? $deprecation_info[ 'alternative' ] : __( 'Please read the current EE4 documentation further or contact Support.', 'event_espresso' )
+					__('This filter is deprecated. %1$s%2$s', 'event_espresso'),
+					$deprecation_info['still_works'] ? __('It *may* work as an attempt to build in backwards compatibility.', 'event_espresso') : __('It has been completely removed.', 'event_espresso'),
+					isset($deprecation_info['alternative']) ? $deprecation_info['alternative'] : __('Please read the current EE4 documentation further or contact Support.', 'event_espresso')
 				),
-				isset( $deprecation_info[ 'version' ] ) ? $deprecation_info[ 'version' ] : __( 'recently', 'event_espresso' )
+				isset($deprecation_info['version']) ? $deprecation_info['version'] : __('recently', 'event_espresso')
 			);
 		}
 	}
 }
-add_action( 'AHEE__EE_System__set_hooks_for_shortcodes_modules_and_addons', 'ee_deprecated_hooks' );
+add_action('AHEE__EE_System__set_hooks_for_shortcodes_modules_and_addons', 'ee_deprecated_hooks');
 
 
 
@@ -233,25 +233,25 @@ 
  *
  * @return string                    The default contents for the messenger, message type, context and field.
  */
-function ee_deprecated_get_default_field_content( $contents, $actual_path, EE_messenger $messenger, EE_message_type $message_type, $field, $context, EE_Messages_Template_Pack $template_pack ) {
+function ee_deprecated_get_default_field_content($contents, $actual_path, EE_messenger $messenger, EE_message_type $message_type, $field, $context, EE_Messages_Template_Pack $template_pack) {
 
 	$classnames_to_try = array(
-		get_class( $messenger ) => $messenger,
-		get_class( $message_type ) => $message_type,
+		get_class($messenger) => $messenger,
+		get_class($message_type) => $message_type,
 		'EE_Messages_Base' => $message_type
 		);
 
-	foreach ( $classnames_to_try as $classname => $obj ) {
-		$filter_ref = 'FHEE__' . $classname . '__get_default_field_content';
-		if ( has_filter( $filter_ref ) ) {
-			EE_Error::doing_it_wrong( $filter_ref, __('This filter is deprecated.  It *may* work as an attempt to build in backwards compatibility.  However, it is recommended to use the new filter provided which is "FHEE__EE_Messages_Template_Pack__get_specific_template__contents" found in the EE_Messages_Template_Pack class.', 'event_espresso'), '4.5.0' );
+	foreach ($classnames_to_try as $classname => $obj) {
+		$filter_ref = 'FHEE__'.$classname.'__get_default_field_content';
+		if (has_filter($filter_ref)) {
+			EE_Error::doing_it_wrong($filter_ref, __('This filter is deprecated.  It *may* work as an attempt to build in backwards compatibility.  However, it is recommended to use the new filter provided which is "FHEE__EE_Messages_Template_Pack__get_specific_template__contents" found in the EE_Messages_Template_Pack class.', 'event_espresso'), '4.5.0');
 		}
-		$contents = apply_filters( $filter_ref, $contents, $obj );
+		$contents = apply_filters($filter_ref, $contents, $obj);
 	}
 
 	return $contents;
 }
-add_filter( 'FHEE__EE_Messages_Template_Pack__get_specific_template__contents', 'ee_deprecated_get_default_field_content', 10, 7 );
+add_filter('FHEE__EE_Messages_Template_Pack__get_specific_template__contents', 'ee_deprecated_get_default_field_content', 10, 7);
 
 
 
@@ -279,23 +279,23 @@ 
  *
  * @return string                    The path to the file being used.
  */
-function ee_deprecated_get_inline_css_template_filters( $variation_path, $messenger, $message_type, $type, $variation, $file_extension, $url,  EE_Messages_Template_Pack $template_pack ) {
+function ee_deprecated_get_inline_css_template_filters($variation_path, $messenger, $message_type, $type, $variation, $file_extension, $url, EE_Messages_Template_Pack $template_pack) {
 
-	if ( $messenger == 'email' ) {
+	if ($messenger == 'email') {
 		$filter_ref = $url ? 'FHEE__EE_Email_Messenger__get_inline_css_template__css_url' : 'FHEE__EE_Email_Messenger__get_inline_css_template__css_path';
-	} elseif ( $messenger == 'html' ) {
+	} elseif ($messenger == 'html') {
 		$filter_ref = $url ? 'FHEE__EE_Html_messenger__get_inline_css_template__css_url' : 'FHEE__EE_Html_messenger__get_inline_css_template__css_path';
 	} else {
 		return $variation_path;
 	}
 
-	if ( has_filter( $filter_ref ) ) {
-		EE_Error::doing_it_wrong( $filter_ref, __('This filter is deprecated.  It is recommended to use the new filter provided which is "FHEE__EE_Messages_Template_Pack__get_variation" found in the EE_Messages_Template_Pack class.', 'event_espresso'), '4.5.0' );
+	if (has_filter($filter_ref)) {
+		EE_Error::doing_it_wrong($filter_ref, __('This filter is deprecated.  It is recommended to use the new filter provided which is "FHEE__EE_Messages_Template_Pack__get_variation" found in the EE_Messages_Template_Pack class.', 'event_espresso'), '4.5.0');
 	}
 
-	return apply_filters( $filter_ref, $variation_path, $url, $type );
+	return apply_filters($filter_ref, $variation_path, $url, $type);
 }
-add_filter( 'FHEE__EE_Messages_Template_Pack__get_variation', 'ee_deprecated_get_inline_css_template_filters', 10, 8 );
+add_filter('FHEE__EE_Messages_Template_Pack__get_variation', 'ee_deprecated_get_inline_css_template_filters', 10, 8);
 
 
 
@@ -311,78 +311,78 @@ 
 class EE_Messages_Init extends EE_Base {
 
 	public function __construct() {
-		self::doing_it_wrong_call( __METHOD__ );
+		self::doing_it_wrong_call(__METHOD__);
 	}
 
 	/**
 	 * @param $method_name
 	 */
-	public static function doing_it_wrong_call( $method_name ) {
-		EE_Error::doing_it_wrong( __CLASS__, sprintf( __('The %s in this class is deprecated as of EE4.5.0.  All functionality formerly in this class is now in the EED_Messages module.', 'event_espresso'), $method_name ), '4.5.0' );
+	public static function doing_it_wrong_call($method_name) {
+		EE_Error::doing_it_wrong(__CLASS__, sprintf(__('The %s in this class is deprecated as of EE4.5.0.  All functionality formerly in this class is now in the EED_Messages module.', 'event_espresso'), $method_name), '4.5.0');
 	}
 
 	/**
 	 * @deprecated 4.5.0
 	 */
 	public static function set_autoloaders() {
-		self::doing_it_wrong_call( __METHOD__ );
+		self::doing_it_wrong_call(__METHOD__);
 		EED_Messages::set_autoloaders();
 	}
 
 	/**
 	 * @deprecated 4.5.0
 	 */
-	public function payment_reminder( $transaction ) {
-		self::doing_it_wrong_call( __METHOD__ );
-		EED_Messages::payment_reminder( $transaction );
+	public function payment_reminder($transaction) {
+		self::doing_it_wrong_call(__METHOD__);
+		EED_Messages::payment_reminder($transaction);
 	}
 
 	/**
 	 * @deprecated 4.5.0
 	 */
-	public function payment( $transaction, $payment ) {
-		self::doing_it_wrong_call( __METHOD__ );
-		EED_Messages::payment( $transaction, $payment );
+	public function payment($transaction, $payment) {
+		self::doing_it_wrong_call(__METHOD__);
+		EED_Messages::payment($transaction, $payment);
 	}
 
 	/**
 	 * @deprecated 4.5.0
 	 */
-	public function cancelled_registration( $transaction ) {
-		self::doing_it_wrong_call( __METHOD__ );
-		EED_Messages::cancelled_registration( $transaction );
+	public function cancelled_registration($transaction) {
+		self::doing_it_wrong_call(__METHOD__);
+		EED_Messages::cancelled_registration($transaction);
 	}
 
 	/**
 	 * @deprecated 4.5.0
 	 */
-	public function maybe_registration( $transaction, $reg_msg, $from_admin ) {
-		self::doing_it_wrong_call( __METHOD__ );
-		EED_Messages::maybe_registration( $transaction, $reg_msg, $from_admin );
+	public function maybe_registration($transaction, $reg_msg, $from_admin) {
+		self::doing_it_wrong_call(__METHOD__);
+		EED_Messages::maybe_registration($transaction, $reg_msg, $from_admin);
 	}
 
 	/**
 	 * @deprecated 4.5.0
 	 */
-	public function process_resend( $success, $req_data ) {
-		self::doing_it_wrong_call( __METHOD__ );
-		EED_Messages::process_resend( $req_data );
+	public function process_resend($success, $req_data) {
+		self::doing_it_wrong_call(__METHOD__);
+		EED_Messages::process_resend($req_data);
 	}
 
 	/**
 	 * @deprecated 4.5.0
 	 */
-	public function process_admin_payment( $success, $payment ) {
-		self::doing_it_wrong_call( __METHOD__ );
-		EED_Messages::process_admin_payment( $success, $payment );
+	public function process_admin_payment($success, $payment) {
+		self::doing_it_wrong_call(__METHOD__);
+		EED_Messages::process_admin_payment($success, $payment);
 	}
 
 	/**
 	 * @deprecated 4.5.0
 	 */
-	public function send_newsletter_message( $contacts, $grp_id ) {
-		self::doing_it_wrong_call( __METHOD__ );
-		EED_Messages::send_newsletter_message( $contacts, $grp_id );
+	public function send_newsletter_message($contacts, $grp_id) {
+		self::doing_it_wrong_call(__METHOD__);
+		EED_Messages::send_newsletter_message($contacts, $grp_id);
 	}
 
 
@@ -403,13 +403,13 @@ 
  *
  * @return array additional cpts.
  */
-function ee_deprecated_get_cpts( $cpts ) {
-	if ( has_filter( 'FHEE__EE_Register_CPTs__construct__CPTs' ) ) {
-		EE_Error::doing_it_wrong( 'FHEE__EE_Register_CPTs__construct__CPTs', __('This filter is deprecated. It will still work for the time being.  However, it is recommended to use the new filter provided which is "FHEE__EE_Register_CPTs__get_CPTs__cpts" found in EE_Register_CPTs::get_CPTs()', 'event_espresso'), '4.5.0' );
+function ee_deprecated_get_cpts($cpts) {
+	if (has_filter('FHEE__EE_Register_CPTs__construct__CPTs')) {
+		EE_Error::doing_it_wrong('FHEE__EE_Register_CPTs__construct__CPTs', __('This filter is deprecated. It will still work for the time being.  However, it is recommended to use the new filter provided which is "FHEE__EE_Register_CPTs__get_CPTs__cpts" found in EE_Register_CPTs::get_CPTs()', 'event_espresso'), '4.5.0');
 	}
-	return apply_filters( 'FHEE__EE_Register_CPTs__construct__CPTs', $cpts );
+	return apply_filters('FHEE__EE_Register_CPTs__construct__CPTs', $cpts);
 }
-add_filter( 'FHEE__EE_Register_CPTs__get_CPTs__cpts', 'ee_deprecated_get_cpts', 10 );
+add_filter('FHEE__EE_Register_CPTs__get_CPTs__cpts', 'ee_deprecated_get_cpts', 10);
 
 
 
@@ -423,10 +423,10 @@ 
  *
  * @return array additional custom taxonomies.
  */
-function ee_deprecated_get_taxonomies( $cts ) {
-	if ( has_filter( 'FHEE__EE_Register_CPTs__construct__taxonomies' ) ) {
-		EE_Error::doing_it_wrong( 'FHEE__EE_Register_CPTs__construct__taxonomies', __('This filter is deprecated. It will still work for the time being.  However, it is recommended to use the new filter provided which is "FHEE__EE_Register_CPTs__get_taxonomies__taxonomies" found in EE_Register_CPTs::get_taxonomies()', 'event_espresso'), '4.5.0' );
+function ee_deprecated_get_taxonomies($cts) {
+	if (has_filter('FHEE__EE_Register_CPTs__construct__taxonomies')) {
+		EE_Error::doing_it_wrong('FHEE__EE_Register_CPTs__construct__taxonomies', __('This filter is deprecated. It will still work for the time being.  However, it is recommended to use the new filter provided which is "FHEE__EE_Register_CPTs__get_taxonomies__taxonomies" found in EE_Register_CPTs::get_taxonomies()', 'event_espresso'), '4.5.0');
 	}
-	return apply_filters( 'FHEE__EE_Register_CPTs__construct__taxonomies', $cts );
+	return apply_filters('FHEE__EE_Register_CPTs__construct__taxonomies', $cts);
 }
-add_filter( 'FHEE__EE_Register_CPTs__get_taxonomies__taxonomies', 'ee_deprecated_get_taxonomies', 10 );
+add_filter('FHEE__EE_Register_CPTs__get_taxonomies__taxonomies', 'ee_deprecated_get_taxonomies', 10);

Doc Comments +1 added lines, -1 removed lines

@@ -315,7 +315,7 @@
 	}
 
 	/**
-	 * @param $method_name
+	 * @param string $method_name
 	 */
 	public static function doing_it_wrong_call( $method_name ) {
 		EE_Error::doing_it_wrong( __CLASS__, sprintf( __('The %s in this class is deprecated as of EE4.5.0.  All functionality formerly in this class is now in the EED_Messages module.', 'event_espresso'), $method_name ), '4.5.0' );

core/EE_Encryption.core.php

Spacing +63 added lines, -63 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');
 /**
  * EE_Encryption class
  *
@@ -27,9 +27,9 @@ 
 	 */
   private function __construct() {
 
-		define( 'ESPRESSO_ENCRYPT', TRUE );
+		define('ESPRESSO_ENCRYPT', TRUE);
 
-		if ( ! function_exists( 'mcrypt_encrypt' ) ) {
+		if ( ! function_exists('mcrypt_encrypt')) {
 			self::$_use_mcrypt = FALSE;
 		}
 
@@ -42,9 +42,9 @@ 
 	 *	@access public
 	 * @return \EE_Encryption
 	 */
-	public static function instance ( ) {
+	public static function instance( ) {
 		// check if class object is instantiated
-		if ( ! self::$_instance instanceof EE_Encryption ) {
+		if ( ! self::$_instance instanceof EE_Encryption) {
 			self::$_instance = new self();
 		}
 		return self::$_instance;
@@ -60,17 +60,17 @@ 
 	public  function get_encryption_key() {
 
 		// if encryption key has not been set
-		if ( empty( self::$_encryption_key )) {
+		if (empty(self::$_encryption_key)) {
 
 			// retrieve encryption_key from db
-			self::$_encryption_key = get_option( 'ee_encryption_key' );
+			self::$_encryption_key = get_option('ee_encryption_key');
 
 			// WHAT?? No encryption_key in the db ??
-			if ( self::$_encryption_key == FALSE ) {
+			if (self::$_encryption_key == FALSE) {
 				// let's make one. And md5 it to make it just the right size for a key
-				$new_key =  md5( self::generate_random_string() );
+				$new_key = md5(self::generate_random_string());
 				// now save it to the db for later
-				add_option( 'ee_encryption_key', $new_key );
+				add_option('ee_encryption_key', $new_key);
 				// here's the key - FINALLY !
 				self::$_encryption_key = $new_key;
 			}
@@ -87,17 +87,17 @@ 
 	 * @param string $text_string  - the text to be encrypted
 	 * @return string
 	 */
-	public function encrypt ( $text_string = '' ) {
+	public function encrypt($text_string = '') {
 
 		// you give me nothing??? GET OUT !
-		if  ( empty( $text_string ))  {
+		if (empty($text_string)) {
 			return FALSE;
 		}
 
-		if ( self::$_use_mcrypt ) {
-			$encrypted_text = $this->m_encrypt( $text_string );
+		if (self::$_use_mcrypt) {
+			$encrypted_text = $this->m_encrypt($text_string);
 		} else {
-			$encrypted_text = $this->acme_encrypt( $text_string );
+			$encrypted_text = $this->acme_encrypt($text_string);
 		}
 
 		return $encrypted_text;
@@ -112,18 +112,18 @@ 
 	 * @param string $encrypted_text - the text to be decrypted
 	 * @return string
 	 */
-	public function decrypt  ( $encrypted_text = '' )  {
+	public function decrypt($encrypted_text = '') {
 
 		// you give me nothing??? GET OUT !
-		if  ( empty( $encrypted_text ))  {
+		if (empty($encrypted_text)) {
 			return FALSE;
 		}
 
 		// if PHP's mcrypt functions are installed then we'll use them
-		if ( self::$_use_mcrypt ) {
-			$decrypted_text = $this->m_decrypt( $encrypted_text );
+		if (self::$_use_mcrypt) {
+			$decrypted_text = $this->m_decrypt($encrypted_text);
 		} else {
-			$decrypted_text = $this->acme_decrypt( $encrypted_text );
+			$decrypted_text = $this->acme_decrypt($encrypted_text);
 		}
 
 		return $decrypted_text;
@@ -140,17 +140,17 @@ 
 	 * @internal param $string - the text to be encoded
 	 * @return string
 	 */
-	public function base64_url_encode ( $text_string = FALSE ) {
+	public function base64_url_encode($text_string = FALSE) {
 
 		// you give me nothing??? GET OUT !
-		if  ( ! $text_string )  {
+		if ( ! $text_string) {
 			return FALSE;
 		}
 
 		// encode
-		$encoded_string = base64_encode ( $text_string );
+		$encoded_string = base64_encode($text_string);
 		// remove chars to make encoding more URL friendly
-		$encoded_string = strtr ( $encoded_string, '+/=', '-_,' );
+		$encoded_string = strtr($encoded_string, '+/=', '-_,');
 
 		return $encoded_string;
 
@@ -166,17 +166,17 @@ 
 	 * @internal param $string - the text to be decoded
 	 * @return string
 	 */
-	public function base64_url_decode ( $encoded_string = FALSE ) {
+	public function base64_url_decode($encoded_string = FALSE) {
 
 		// you give me nothing??? GET OUT !
-		if  ( ! $encoded_string )  {
+		if ( ! $encoded_string) {
 			return FALSE;
 		}
 
 		// replace previously removed characters
-		$encoded_string = strtr ( $encoded_string, '-_,', '+/=' );
+		$encoded_string = strtr($encoded_string, '-_,', '+/=');
 		// decode
-		$decoded_string = base64_decode ( $encoded_string );
+		$decoded_string = base64_decode($encoded_string);
 
 		return $decoded_string;
 
@@ -191,22 +191,22 @@ 
 	 * @internal param $string - the text to be encrypted
 	 * @return string
 	 */
-	private function m_encrypt  ( $text_string = FALSE ) {
+	private function m_encrypt($text_string = FALSE) {
 
 		// you give me nothing??? GET OUT !
-		if  ( ! $text_string )  {
+		if ( ! $text_string) {
 			return FALSE;
 		}
 
 		// get the initialization vector size
-		$iv_size = mcrypt_get_iv_size ( MCRYPT_RIJNDAEL_256, MCRYPT_MODE_ECB );
+		$iv_size = mcrypt_get_iv_size(MCRYPT_RIJNDAEL_256, MCRYPT_MODE_ECB);
 		// initialization vector
-		$iv = mcrypt_create_iv ( $iv_size, MCRYPT_RAND );
+		$iv = mcrypt_create_iv($iv_size, MCRYPT_RAND);
 
 		// encrypt it
-		$encrypted_text = mcrypt_encrypt ( MCRYPT_RIJNDAEL_256, self::$_encryption_key, $text_string, MCRYPT_MODE_ECB, $iv );
+		$encrypted_text = mcrypt_encrypt(MCRYPT_RIJNDAEL_256, self::$_encryption_key, $text_string, MCRYPT_MODE_ECB, $iv);
 		// trim and encode
-		$encrypted_text = trim ( base64_encode( $encrypted_text ) );
+		$encrypted_text = trim(base64_encode($encrypted_text));
 
 		return $encrypted_text;
 
@@ -221,23 +221,23 @@ 
 	 * @internal param $string - the text to be decrypted
 	 * @return string
 	 */
-	private function m_decrypt  ( $encrypted_text = FALSE )  {
+	private function m_decrypt($encrypted_text = FALSE) {
 
 		// you give me nothing??? GET OUT !
-		if  ( ! $encrypted_text )  {
+		if ( ! $encrypted_text) {
 			return FALSE;
 		}
 
 		// decode
-		$encrypted_text = base64_decode ( $encrypted_text );
+		$encrypted_text = base64_decode($encrypted_text);
 
 		// get the initialization vector size
-		$iv_size = mcrypt_get_iv_size ( MCRYPT_RIJNDAEL_256, MCRYPT_MODE_ECB );
-		$iv = mcrypt_create_iv ( $iv_size, MCRYPT_RAND );
+		$iv_size = mcrypt_get_iv_size(MCRYPT_RIJNDAEL_256, MCRYPT_MODE_ECB);
+		$iv = mcrypt_create_iv($iv_size, MCRYPT_RAND);
 
 		// decrypt it
-		$decrypted_text = mcrypt_decrypt ( MCRYPT_RIJNDAEL_256, self::$_encryption_key, $encrypted_text, MCRYPT_MODE_ECB, $iv );
-		$decrypted_text = trim ( $decrypted_text );
+		$decrypted_text = mcrypt_decrypt(MCRYPT_RIJNDAEL_256, self::$_encryption_key, $encrypted_text, MCRYPT_MODE_ECB, $iv);
+		$decrypted_text = trim($decrypted_text);
 
 		return $decrypted_text;
 
@@ -253,22 +253,22 @@ 
 	 * @internal param $string - the text to be decrypted
 	 * @return string
 	 */
-	private function acme_encrypt ( $text_string = FALSE ) {
+	private function acme_encrypt($text_string = FALSE) {
 
 		// you give me nothing??? GET OUT !
-		if  ( ! $text_string )  {
+		if ( ! $text_string) {
 			return FALSE;
 		}
 
-		$key_bits = str_split ( str_pad ( '', strlen( $text_string ), $this->get_encryption_key(), STR_PAD_RIGHT ));
-		$string_bits = str_split( $text_string );
+		$key_bits = str_split(str_pad('', strlen($text_string), $this->get_encryption_key(), STR_PAD_RIGHT));
+		$string_bits = str_split($text_string);
 
-		foreach ( $string_bits as $k =>$v ) {
-			$temp = ord( $v ) + ord ( $key_bits[$k] );
-			$string_bits[$k] = chr ( $temp > 255 ? ( $temp - 256 ) : $temp );
+		foreach ($string_bits as $k =>$v) {
+			$temp = ord($v) + ord($key_bits[$k]);
+			$string_bits[$k] = chr($temp > 255 ? ($temp - 256) : $temp);
 		}
 
-		$encrypted = base64_encode( join( '', $string_bits ) );
+		$encrypted = base64_encode(join('', $string_bits));
 
 		return $encrypted;
 
@@ -284,24 +284,24 @@ 
 	 * @internal param $string - the text to be decrypted
 	 * @return string
 	 */
-	private function acme_decrypt ( $encrypted_text = FALSE ) {
+	private function acme_decrypt($encrypted_text = FALSE) {
 
 		// you give me nothing??? GET OUT !
-		if  ( ! $encrypted_text )  {
+		if ( ! $encrypted_text) {
 			return FALSE;
 		}
 
-		$encrypted_text = base64_decode ( $encrypted_text );
+		$encrypted_text = base64_decode($encrypted_text);
 
-		$key_bits = str_split ( str_pad ( '', strlen ( $encrypted_text ), $this->get_encryption_key(), STR_PAD_RIGHT ));
-		$string_bits = str_split ( $encrypted_text );
+		$key_bits = str_split(str_pad('', strlen($encrypted_text), $this->get_encryption_key(), STR_PAD_RIGHT));
+		$string_bits = str_split($encrypted_text);
 
-		foreach ( $string_bits as $k => $v ) {
-			$temp = ord ( $v ) - ord ( $key_bits[$k] );
-			$string_bits[$k] = chr ( $temp < 0 ? ( $temp + 256 ) : $temp );
+		foreach ($string_bits as $k => $v) {
+			$temp = ord($v) - ord($key_bits[$k]);
+			$string_bits[$k] = chr($temp < 0 ? ($temp + 256) : $temp);
 		}
 
-		$decrypted = join( '', $string_bits );
+		$decrypted = join('', $string_bits);
 
 		return $decrypted;
 
@@ -317,16 +317,16 @@ 
 	 * @internal param $string - number of characters for random string
 	 * @return string
 	 */
-	public function generate_random_string ( $length = 40 ) {
+	public function generate_random_string($length = 40) {
 
-		$iterations = ceil ( $length / 40 );
+		$iterations = ceil($length / 40);
 
 		$random_string = '';
 
-		for ($i = 0; $i < $iterations; $i ++) {
-			$random_string .= sha1( microtime(TRUE) . mt_rand( 10000, 90000 ));
+		for ($i = 0; $i < $iterations; $i++) {
+			$random_string .= sha1(microtime(TRUE).mt_rand(10000, 90000));
 		}
-		$random_string =  substr( $random_string, 0, $length );
+		$random_string = substr($random_string, 0, $length);
 
 		return $random_string;
 

Braces +3 added lines, -1 removed lines

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

core/EE_Load_Textdomain.core.php

Spacing +12 added lines, -12 removed lines

@@ -39,13 +39,13 @@ 
 	public static function load_textdomain() {
 		self::_maybe_get_langfile();
 		//now load the textdomain
-		EE_Registry::instance()->load_helper( 'File' );
-		if ( ! empty( self::$_lang ) && is_readable( EE_LANGUAGES_SAFE_DIR . 'event_espresso-' . self::$_lang . '.mo' ) ) {
+		EE_Registry::instance()->load_helper('File');
+		if ( ! empty(self::$_lang) && is_readable(EE_LANGUAGES_SAFE_DIR.'event_espresso-'.self::$_lang.'.mo')) {
 			load_plugin_textdomain('event_espresso', FALSE, EE_LANGUAGES_SAFE_LOC);
-		} else if ( ! empty( self::$_lang ) && is_readable( EE_LANGUAGES_SAFE_DIR . 'event-espresso-4-' . self::$_lang . '.mo' ) ) {
-			load_textdomain( 'event_espresso', EE_LANGUAGES_SAFE_DIR . 'event-espresso-4-' . self::$_lang . '.mo'  );
+		} else if ( ! empty(self::$_lang) && is_readable(EE_LANGUAGES_SAFE_DIR.'event-espresso-4-'.self::$_lang.'.mo')) {
+			load_textdomain('event_espresso', EE_LANGUAGES_SAFE_DIR.'event-espresso-4-'.self::$_lang.'.mo');
 		} else {
-			load_plugin_textdomain( 'event_espresso', FALSE, dirname( EE_PLUGIN_BASENAME ) . '/languages/');
+			load_plugin_textdomain('event_espresso', FALSE, dirname(EE_PLUGIN_BASENAME).'/languages/');
 		}
 	}
 
@@ -60,24 +60,24 @@ 
 	 */
 	private static function _maybe_get_langfile() {
 		self::$_lang = get_locale();
-		if ( $has_check = get_option( 'ee_lang_check_' . self::$_lang . '_' . EVENT_ESPRESSO_VERSION ) || empty( self::$_lang ) )
+		if ($has_check = get_option('ee_lang_check_'.self::$_lang.'_'.EVENT_ESPRESSO_VERSION) || empty(self::$_lang))
 			return;
 
 		//if lang is en_US or empty then lets just get out.  (Event Espresso core is en_US)
-		if ( empty( self::$_lang ) || self::$_lang == 'en_US' )
+		if (empty(self::$_lang) || self::$_lang == 'en_US')
 			return;
 
 		//made it here so let's get the file from the github repo
 		$sideloader_args = array(
-			'_upload_to' => EE_PLUGIN_DIR_PATH . 'languages/',
-			'_upload_from' => 'https://github.com/eventespresso/languages-ee4/blob/master/event_espresso-' . self::$_lang . '.mo?raw=true',
-			'_new_file_name' => 'event_espresso-' . self::$_lang . '.mo'
+			'_upload_to' => EE_PLUGIN_DIR_PATH.'languages/',
+			'_upload_from' => 'https://github.com/eventespresso/languages-ee4/blob/master/event_espresso-'.self::$_lang.'.mo?raw=true',
+			'_new_file_name' => 'event_espresso-'.self::$_lang.'.mo'
 			);
 
 
-		$sideloader = EE_Registry::instance()->load_helper('Sideloader', $sideloader_args, FALSE );
+		$sideloader = EE_Registry::instance()->load_helper('Sideloader', $sideloader_args, FALSE);
 
 		$sideloader->sideload();
-		update_option( 'ee_lang_check_' . self::$_lang . '_' . EVENT_ESPRESSO_VERSION, 1 );
+		update_option('ee_lang_check_'.self::$_lang.'_'.EVENT_ESPRESSO_VERSION, 1);
 	}
 } //end EE_Load_Textdomain

Braces +9 added lines, -5 removed lines

@@ -1,4 +1,6 @@ 
-<?php if ( ! defined('EVENT_ESPRESSO_VERSION')) exit('No direct script access allowed');
+<?php if ( ! defined('EVENT_ESPRESSO_VERSION')) {
+	exit('No direct script access allowed');
+}
 /**
  * Event Espresso
  *
@@ -60,12 +62,14 @@ 
 	 */
 	private static function _maybe_get_langfile() {
 		self::$_lang = get_locale();
-		if ( $has_check = get_option( 'ee_lang_check_' . self::$_lang . '_' . EVENT_ESPRESSO_VERSION ) || empty( self::$_lang ) )
-			return;
+		if ( $has_check = get_option( 'ee_lang_check_' . self::$_lang . '_' . EVENT_ESPRESSO_VERSION ) || empty( self::$_lang ) ) {
+					return;
+		}
 
 		//if lang is en_US or empty then lets just get out.  (Event Espresso core is en_US)
-		if ( empty( self::$_lang ) || self::$_lang == 'en_US' )
-			return;
+		if ( empty( self::$_lang ) || self::$_lang == 'en_US' ) {
+					return;
+		}
 
 		//made it here so let's get the file from the github repo
 		$sideloader_args = array(

core/EE_Log.core.php

Spacing +59 added lines, -59 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');
 /**
  *
  * Class EE_Log
@@ -62,7 +62,7 @@ 
 	 * @return EE_Log
 	 */
 	public static function instance() {
-		if ( ! self::$_instance instanceof EE_Log ) {
+		if ( ! self::$_instance instanceof EE_Log) {
 			self::$_instance = new self();
 		}
 		return self::$_instance;
@@ -74,11 +74,11 @@ 
 	 */
 	private function __construct() {
 
-		if ( ! EE_Registry::instance()->CFG->admin->use_full_logging && ! EE_Registry::instance()->CFG->admin->use_remote_logging ) {
+		if ( ! EE_Registry::instance()->CFG->admin->use_full_logging && ! EE_Registry::instance()->CFG->admin->use_remote_logging) {
 			return;
 		}
 
-		$this->_logs_folder = EVENT_ESPRESSO_UPLOAD_DIR . 'logs' . DS;
+		$this->_logs_folder = EVENT_ESPRESSO_UPLOAD_DIR.'logs'.DS;
 		$this->_log_file = EE_Registry::instance()->CFG->admin->log_file_name();
 		$this->_log = '';
 		$this->_debug_file = EE_Registry::instance()->CFG->admin->debug_file_name();
@@ -86,15 +86,15 @@ 
 		$this->_remote_logging_url = EE_Registry::instance()->CFG->admin->remote_logging_url;
 		$this->_remote_log = '';
 
-		add_action( 'admin_init', array( $this, 'verify_filesystem' ), -10 );
-		add_action( 'AHEE_log', array( $this, 'log' ), 10, 4 );
-		if ( EE_Registry::instance()->CFG->admin->use_full_logging ) {
-			add_action( 'shutdown', array( $this, 'write_log' ), 9999 );
+		add_action('admin_init', array($this, 'verify_filesystem'), -10);
+		add_action('AHEE_log', array($this, 'log'), 10, 4);
+		if (EE_Registry::instance()->CFG->admin->use_full_logging) {
+			add_action('shutdown', array($this, 'write_log'), 9999);
 			// if WP_DEBUG
-			add_action( 'shutdown', array( $this, 'write_debug' ), 9999 );
+			add_action('shutdown', array($this, 'write_debug'), 9999);
 		}
-		if ( EE_Registry::instance()->CFG->admin->use_remote_logging ) {
-			add_action( 'shutdown', array( $this, 'send_log' ), 9999 );
+		if (EE_Registry::instance()->CFG->admin->use_remote_logging) {
+			add_action('shutdown', array($this, 'send_log'), 9999);
 		}
 
 	}
@@ -108,14 +108,14 @@ 
 	 */
 	public function verify_filesystem() {
 		try {
-			EE_Registry::instance()->load_helper( 'File' );
-			EEH_File::ensure_folder_exists_and_is_writable( EVENT_ESPRESSO_UPLOAD_DIR );
-			EEH_File::ensure_folder_exists_and_is_writable( $this->_logs_folder );
-			EEH_File::add_htaccess_deny_from_all( $this->_logs_folder );
-			EEH_File::ensure_file_exists_and_is_writable( $this->_logs_folder . $this->_log_file );
-			EEH_File::ensure_file_exists_and_is_writable( $this->_logs_folder . $this->_debug_file );
-		} catch( EE_Error $e ){
-			EE_Error::add_error( sprintf( __(  'Event Espresso logging could not be setup because: %s', 'event_espresso' ), ' &nbsp; &nbsp; ' . $e->getMessage() ), __FILE__, __FUNCTION__, __LINE__ );
+			EE_Registry::instance()->load_helper('File');
+			EEH_File::ensure_folder_exists_and_is_writable(EVENT_ESPRESSO_UPLOAD_DIR);
+			EEH_File::ensure_folder_exists_and_is_writable($this->_logs_folder);
+			EEH_File::add_htaccess_deny_from_all($this->_logs_folder);
+			EEH_File::ensure_file_exists_and_is_writable($this->_logs_folder.$this->_log_file);
+			EEH_File::ensure_file_exists_and_is_writable($this->_logs_folder.$this->_debug_file);
+		} catch (EE_Error $e) {
+			EE_Error::add_error(sprintf(__('Event Espresso logging could not be setup because: %s', 'event_espresso'), ' &nbsp; &nbsp; '.$e->getMessage()), __FILE__, __FUNCTION__, __LINE__);
 			return;
 		}
 	}
@@ -132,15 +132,15 @@ 
 	 * @param string $type
 	 * @return string
 	 */
-	private function _format_message( $file = '', $function = '', $message = '', $type = '' ) {
-		$msg = '----------------------------------------------------------------------------------------' . PHP_EOL;
-		$msg .= '[' . current_time( 'mysql' ) . '] ';
-		$msg .= ! empty( $file ) ? basename( $file ) : '';
-		$msg .= ! empty( $file ) && ! empty( $function ) ? ' -> ' : '';
-		$msg .= ! empty( $function ) ? $function . '()' : '';
+	private function _format_message($file = '', $function = '', $message = '', $type = '') {
+		$msg = '----------------------------------------------------------------------------------------'.PHP_EOL;
+		$msg .= '['.current_time('mysql').'] ';
+		$msg .= ! empty($file) ? basename($file) : '';
+		$msg .= ! empty($file) && ! empty($function) ? ' -> ' : '';
+		$msg .= ! empty($function) ? $function.'()' : '';
 		$msg .= PHP_EOL;
-		$type = ! empty( $type ) ? $type : 'log message';
-		$msg .= ! empty( $message ) ? "\t" . '[' . $type . '] ' . $message . PHP_EOL : '';
+		$type = ! empty($type) ? $type : 'log message';
+		$msg .= ! empty($message) ? "\t".'['.$type.'] '.$message.PHP_EOL : '';
 		return $msg;
 	}
 
@@ -155,8 +155,8 @@ 
 	 * @param string $message
 	 * @param string $type
 	 */
-	public function log( $file = '', $function = '', $message = '', $type = '' ) {
-		$this->_log .= $this->_format_message( $file, $function, $message, $type );
+	public function log($file = '', $function = '', $message = '', $type = '') {
+		$this->_log .= $this->_format_message($file, $function, $message, $type);
 	}
 
 
@@ -168,10 +168,10 @@ 
 	public function write_log() {
 		try {
 			//get existing log file and append new log info
-			$this->_log = EEH_File::get_file_contents( $this->_logs_folder . $this->_log_file ) . $this->_log;
-			EEH_File::write_to_file( $this->_logs_folder . $this->_log_file, $this->_log, 'Event Espresso Log' );
-		} catch( EE_Error $e ){
-			EE_Error::add_error( sprintf( __(  'Could not write to the Event Espresso log file because: %s', 'event_espresso' ), ' &nbsp; &nbsp; ' . $e->getMessage() ), __FILE__, __FUNCTION__, __LINE__ );
+			$this->_log = EEH_File::get_file_contents($this->_logs_folder.$this->_log_file).$this->_log;
+			EEH_File::write_to_file($this->_logs_folder.$this->_log_file, $this->_log, 'Event Espresso Log');
+		} catch (EE_Error $e) {
+			EE_Error::add_error(sprintf(__('Could not write to the Event Espresso log file because: %s', 'event_espresso'), ' &nbsp; &nbsp; '.$e->getMessage()), __FILE__, __FUNCTION__, __LINE__);
 			return;
 		}
 	}
@@ -184,31 +184,31 @@ 
 	 */
 	public function send_log() {
 
-		if ( empty( $this->_remote_logging_url )) {
+		if (empty($this->_remote_logging_url)) {
 			return;
 		}
 
-		$data = 'domain=' . $_SERVER['HTTP_HOST'];
-		$data .= '&ip=' . $_SERVER['SERVER_ADDR'];
-		$data .= '&server_type=' . $_SERVER['SERVER_SOFTWARE'];
-		$data .= '&time=' . time();
-		$data .= '&remote_log=' . $this->_log;
-		$data .= '&request_array=' . json_encode( $_REQUEST );
+		$data = 'domain='.$_SERVER['HTTP_HOST'];
+		$data .= '&ip='.$_SERVER['SERVER_ADDR'];
+		$data .= '&server_type='.$_SERVER['SERVER_SOFTWARE'];
+		$data .= '&time='.time();
+		$data .= '&remote_log='.$this->_log;
+		$data .= '&request_array='.json_encode($_REQUEST);
 		$data .= '&action=save';
 
-		if ( defined( 'EELOGGING_PASS' )) {
-			$data .= '&pass=' . EELOGGING_PASS;
+		if (defined('EELOGGING_PASS')) {
+			$data .= '&pass='.EELOGGING_PASS;
 		}
-		if ( defined( 'EELOGGING_KEY' )) {
-			$data .= '&key=' . EELOGGING_KEY;
+		if (defined('EELOGGING_KEY')) {
+			$data .= '&key='.EELOGGING_KEY;
 		}
 
-		$c = curl_init( $this->_remote_logging_url );
-		curl_setopt( $c, CURLOPT_POST, TRUE );
-		curl_setopt( $c, CURLOPT_POSTFIELDS, $data );
-		curl_setopt( $c, CURLOPT_RETURNTRANSFER, TRUE );
-		curl_exec( $c );
-		curl_close( $c );
+		$c = curl_init($this->_remote_logging_url);
+		curl_setopt($c, CURLOPT_POST, TRUE);
+		curl_setopt($c, CURLOPT_POSTFIELDS, $data);
+		curl_setopt($c, CURLOPT_RETURNTRANSFER, TRUE);
+		curl_exec($c);
+		curl_close($c);
 	}
 
 
@@ -219,18 +219,18 @@ 
 	 * previous entries are overwritten
 	 */
 	public function write_debug() {
-		if ( defined( 'WP_DEBUG' ) && WP_DEBUG ) {
+		if (defined('WP_DEBUG') && WP_DEBUG) {
 			$this->_debug_log = '';
-			foreach ( $_GET as $key => $value ) {
-				$this->_debug_log .= '$_GET["' . $key . '"] = "' . serialize($value) . '"' . PHP_EOL;
+			foreach ($_GET as $key => $value) {
+				$this->_debug_log .= '$_GET["'.$key.'"] = "'.serialize($value).'"'.PHP_EOL;
 			}
-			foreach ( $_POST as $key => $value ) {
-				$this->_debug_log .= '$_POST["' . $key . '"] = "' . serialize($value) . '"' . PHP_EOL;
+			foreach ($_POST as $key => $value) {
+				$this->_debug_log .= '$_POST["'.$key.'"] = "'.serialize($value).'"'.PHP_EOL;
 			}
 			try {
-				EEH_File::write_to_file( $this->_logs_folder . $this->_debug_file, $this->_debug_log, 'Event Espresso Debug Log' );
-			} catch( EE_Error $e ){
-				EE_Error::add_error( sprintf( __(  'Could not write to the Event Espresso debug log file because: %s', 'event_espresso' ), ' &nbsp; &nbsp; ' . $e->getMessage() ), __FILE__, __FUNCTION__, __LINE__ );
+				EEH_File::write_to_file($this->_logs_folder.$this->_debug_file, $this->_debug_log, 'Event Espresso Debug Log');
+			} catch (EE_Error $e) {
+				EE_Error::add_error(sprintf(__('Could not write to the Event Espresso debug log file because: %s', 'event_espresso'), ' &nbsp; &nbsp; '.$e->getMessage()), __FILE__, __FUNCTION__, __LINE__);
 				return;
 			}
 		}
@@ -242,7 +242,7 @@ 
 	 * __clone
 	 */
 	public function __clone() {
-		trigger_error( __( 'Clone is not allowed.', 'event_espresso' ), E_USER_ERROR );
+		trigger_error(__('Clone is not allowed.', 'event_espresso'), E_USER_ERROR);
 	}
 
 

Braces +3 added lines, -1 removed lines

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

core/EE_Module_Request_Router.core.php

Indentation +1 added lines, -1 removed lines

@@ -121,7 +121,7 @@
 
 	/**
 	 * 	resolve_route
-	*
+	 *
 	 * 	this method simply takes a valid route, and resolves what module class method the route points to
 	 *
 	 *  @access 	public

Spacing +49 added lines, -49 removed lines

@@ -61,31 +61,31 @@ 
 	 * @param WP_Query $WP_Query
 	 * @return    string | NULL
 	 */
-	public function get_route( WP_Query $WP_Query ) {
+	public function get_route(WP_Query $WP_Query) {
 		$this->WP_Query = $WP_Query;
 		// assume this if first route being called
 		$previous_route = FALSE;
 		// but is it really ???
-		if ( ! empty( self::$_previous_routes )) {
+		if ( ! empty(self::$_previous_routes)) {
 			// get last run route
-			$previous_routes = array_values( self::$_previous_routes );
-			$previous_route = array_pop( $previous_routes );
+			$previous_routes = array_values(self::$_previous_routes);
+			$previous_route = array_pop($previous_routes);
 		}
 		//  has another route already been run ?
-		if ( $previous_route ) {
+		if ($previous_route) {
 			// check if  forwarding has been set
-			$current_route = $this->get_forward( $previous_route );
+			$current_route = $this->get_forward($previous_route);
 			try {
 				//check for recursive forwarding
-				if ( isset( self::$_previous_routes[ $current_route ] )) {
+				if (isset(self::$_previous_routes[$current_route])) {
 					throw new EE_Error(
 						sprintf(
-							__('An error occurred. The %s route has already been called, and therefore can not be forwarded to, because an infinite loop would be created and break the interweb.','event_espresso'),
+							__('An error occurred. The %s route has already been called, and therefore can not be forwarded to, because an infinite loop would be created and break the interweb.', 'event_espresso'),
 							$current_route
 						)
 					);
 				}
-			} catch ( EE_Error $e ) {
+			} catch (EE_Error $e) {
 				$e->get_error();
 				return NULL;
 			}
@@ -95,13 +95,13 @@ 
 			// grab all routes
 			$routes = EE_Registry::instance()->CFG->get_routes();
 			//d( $routes );
-			foreach( $routes as $key => $route ) {
+			foreach ($routes as $key => $route) {
 				// check request for module route
-				if ( EE_Registry::instance()->REQ->is_set( $key )) {
+				if (EE_Registry::instance()->REQ->is_set($key)) {
 					//echo '<b style="color:#2EA2CC;">key : <span style="color:#E76700">' . $key . '</span></b><br />';
-					$current_route = sanitize_text_field( EE_Registry::instance()->REQ->get( $key ));
-					if ( $current_route ) {
-						$current_route = array( $key, $current_route );
+					$current_route = sanitize_text_field(EE_Registry::instance()->REQ->get($key));
+					if ($current_route) {
+						$current_route = array($key, $current_route);
 						//echo '<b style="color:#2EA2CC;">current_route : <span style="color:#E76700">' . $current_route . '</span></b><br />';
 						break;
 					}
@@ -109,7 +109,7 @@ 
 			}
 		}
 		// sorry, but I can't read what you route !
-		if ( empty( $current_route )) {
+		if (empty($current_route)) {
 			return NULL;
 		}
 		//add route to previous routes array
@@ -129,46 +129,46 @@ 
 	 *  @param 	string		$current_route
 	 *  @return 	mixed		EED_Module | boolean
 	 */
-	public function resolve_route( $key, $current_route ) {
+	public function resolve_route($key, $current_route) {
 		// get module method that route has been mapped to
-		$module_method = EE_Config::get_route( $current_route, $key );
+		$module_method = EE_Config::get_route($current_route, $key);
 		//EEH_Debug_Tools::printr( $module_method, '$module_method  <br /><span style="font-size:10px;font-weight:normal;">' . __FILE__ . '<br />line no: ' . __LINE__ . '</span>', 'auto' );
 		// verify result was returned
-		if ( empty( $module_method )) {
-			$msg = sprintf( __( 'The requested route %s could not be mapped to any registered modules.', 'event_espresso' ), $current_route );
-			EE_Error::add_error( $msg, __FILE__, __FUNCTION__, __LINE__ );
+		if (empty($module_method)) {
+			$msg = sprintf(__('The requested route %s could not be mapped to any registered modules.', 'event_espresso'), $current_route);
+			EE_Error::add_error($msg, __FILE__, __FUNCTION__, __LINE__);
 			return FALSE;
 		}
 		// verify that result is an array
-		if ( ! is_array( $module_method )) {
-			$msg = sprintf( __( 'The %s  route has not been properly registered.', 'event_espresso' ), $current_route );
-			EE_Error::add_error( $msg . '||' . $msg, __FILE__, __FUNCTION__, __LINE__ );
+		if ( ! is_array($module_method)) {
+			$msg = sprintf(__('The %s  route has not been properly registered.', 'event_espresso'), $current_route);
+			EE_Error::add_error($msg.'||'.$msg, __FILE__, __FUNCTION__, __LINE__);
 			return FALSE;
 		}
 		// grab module name
 		$module_name = $module_method[0];
 		// verify that a class method was registered properly
-		if ( ! isset( $module_method[1] )) {
-			$msg = sprintf( __( 'A class method for the %s  route has not been properly registered.', 'event_espresso' ), $current_route );
-			EE_Error::add_error( $msg . '||' . $msg, __FILE__, __FUNCTION__, __LINE__ );
+		if ( ! isset($module_method[1])) {
+			$msg = sprintf(__('A class method for the %s  route has not been properly registered.', 'event_espresso'), $current_route);
+			EE_Error::add_error($msg.'||'.$msg, __FILE__, __FUNCTION__, __LINE__);
 			return FALSE;
 		}
 		// grab method
 		$method = $module_method[1];
 		// verify that class exists
-		if ( ! class_exists( $module_name )) {
-			$msg = sprintf( __( 'The requested %s class could not be found.', 'event_espresso' ), $module_name );
-			EE_Error::add_error( $msg, __FILE__, __FUNCTION__, __LINE__ );
+		if ( ! class_exists($module_name)) {
+			$msg = sprintf(__('The requested %s class could not be found.', 'event_espresso'), $module_name);
+			EE_Error::add_error($msg, __FILE__, __FUNCTION__, __LINE__);
 			return FALSE;
 		}
 		// verify that method exists
-		if ( ! method_exists( $module_name, $method )) {
-			$msg = sprintf( __( 'The class method %s for the %s route is in invalid.', 'event_espresso' ), $method, $current_route );
-			EE_Error::add_error( $msg . '||' . $msg, __FILE__, __FUNCTION__, __LINE__ );
+		if ( ! method_exists($module_name, $method)) {
+			$msg = sprintf(__('The class method %s for the %s route is in invalid.', 'event_espresso'), $method, $current_route);
+			EE_Error::add_error($msg.'||'.$msg, __FILE__, __FUNCTION__, __LINE__);
 			return FALSE;
 		}
 		// instantiate module and call route method
-		return $this->_module_router( $module_name, $method );
+		return $this->_module_router($module_name, $method);
 	}
 
 
@@ -182,16 +182,16 @@ 
 	 * @param   string  $module_name
 	 * @return    EED_Module | NULL
 	 */
-	public static function module_factory( $module_name ) {
-		if ( $module_name == 'EED_Module' ) {
-			EE_Error::add_error( sprintf( __( 'EED_Module is an abstract parent class an can not be instantiated. Please provide a proper module name.', 'event_espresso' ), $module_name ), __FILE__, __FUNCTION__, __LINE__ );
+	public static function module_factory($module_name) {
+		if ($module_name == 'EED_Module') {
+			EE_Error::add_error(sprintf(__('EED_Module is an abstract parent class an can not be instantiated. Please provide a proper module name.', 'event_espresso'), $module_name), __FILE__, __FUNCTION__, __LINE__);
 			return NULL;
 		}
 		// let's pause to reflect on this...
-		$mod_reflector = new ReflectionClass( $module_name );
+		$mod_reflector = new ReflectionClass($module_name);
 		// ensure that class is actually a module
-		if ( ! $mod_reflector->isSubclassOf( 'EED_Module' )) {
-			EE_Error::add_error( sprintf( __( 'The requested %s module is not of the class EED_Module.', 'event_espresso' ), $module_name ), __FILE__, __FUNCTION__, __LINE__ );
+		if ( ! $mod_reflector->isSubclassOf('EED_Module')) {
+			EE_Error::add_error(sprintf(__('The requested %s module is not of the class EED_Module.', 'event_espresso'), $module_name), __FILE__, __FUNCTION__, __LINE__);
 			return NULL;
 		}
 		// instantiate and return module class
@@ -209,14 +209,14 @@ 
 	 * @param   string  $method
 	 * @return    EED_Module | NULL
 	 */
-	private function _module_router( $module_name, $method ) {
+	private function _module_router($module_name, $method) {
 		// instantiate module class
-		$module = EE_Module_Request_Router::module_factory( $module_name );
-		if ( $module instanceof EED_Module ) {
+		$module = EE_Module_Request_Router::module_factory($module_name);
+		if ($module instanceof EED_Module) {
 			// and call whatever action the route was for
 			try {
-				call_user_func( array( $module, $method ), $this->WP_Query );
-			} catch ( EE_Error $e ) {
+				call_user_func(array($module, $method), $this->WP_Query);
+			} catch (EE_Error $e) {
 				$e->get_error();
 				return NULL;
 			}
@@ -233,8 +233,8 @@ 
 	 * @param $current_route
 	 * @return    string
 	 */
-	public function get_forward( $current_route ) {
-		return EE_Config::get_forward( $current_route );
+	public function get_forward($current_route) {
+		return EE_Config::get_forward($current_route);
 	}
 
 
@@ -246,8 +246,8 @@ 
 	 * @param $current_route
 	 * @return    string
 	 */
-	public function get_view( $current_route ) {
-		return EE_Config::get_view( $current_route );
+	public function get_view($current_route) {
+		return EE_Config::get_view($current_route);
 	}
 
 
@@ -257,7 +257,7 @@ 
 	 * @param $b
 	 * @return bool
 	 */
-	public function __set($a,$b) { return FALSE; }
+	public function __set($a, $b) { return FALSE; }
 
 
 

Braces +3 added lines, -1 removed lines

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

core/EE_Network_Config.core.php

Spacing +22 added lines, -22 removed lines

@@ -58,7 +58,7 @@ 
 	 */
 	public static function instance() {
 		// check if class object is instantiated, and instantiated properly
-		if ( self::$_instance === NULL  or ! is_object( self::$_instance ) or ! ( self::$_instance instanceof EE_Network_Config )) {
+		if (self::$_instance === NULL or ! is_object(self::$_instance) or ! (self::$_instance instanceof EE_Network_Config)) {
 			self::$_instance = new self();
 		}
 		return self::$_instance;
@@ -74,15 +74,15 @@ 
 	 *  @return 	void
 	 */
 	private function __construct() {
-		do_action( 'AHEE__EE_Network_Config__construct__begin',$this );
+		do_action('AHEE__EE_Network_Config__construct__begin', $this);
 		//set defaults
-		$this->core = apply_filters( 'FHEE__EE_Network_Config___construct__core', new EE_Network_Core_Config() );
+		$this->core = apply_filters('FHEE__EE_Network_Config___construct__core', new EE_Network_Core_Config());
 		$this->addons = array();
 
 		$this->_load_config();
 
 		// construct__end hook
-		do_action( 'AHEE__EE_Network_Config__construct__end',$this );
+		do_action('AHEE__EE_Network_Config__construct__end', $this);
 	}
 
 
@@ -95,9 +95,9 @@ 
 	 */
 	private function _load_config() {
 		$config = $this->get_config();
-		foreach ( $config as $prop => $settings ) {
-			$prop_class = is_object( $settings ) ? get_class( $this->$prop ) : FALSE;
-			if ( ! empty( $settings ) && ( ! $prop_class || ( $settings instanceof $prop_class ))) {
+		foreach ($config as $prop => $settings) {
+			$prop_class = is_object($settings) ? get_class($this->$prop) : FALSE;
+			if ( ! empty($settings) && ( ! $prop_class || ($settings instanceof $prop_class))) {
 				$this->$prop = $settings;
 			}
 		}
@@ -114,8 +114,8 @@ 
 	 */
 	public function get_config() {
 		// grab network configuration
-		$CFG = get_site_option( 'ee_network_config', array() );
-		$CFG = apply_filters( 'FHEE__EE_Network_Config__get_config__CFG', $CFG );
+		$CFG = get_site_option('ee_network_config', array());
+		$CFG = apply_filters('FHEE__EE_Network_Config__get_config__CFG', $CFG);
 		return $CFG;
 	}
 
@@ -127,24 +127,24 @@ 
 	 *  @access 	public
 	 *  @return 	boolean success
 	 */
-	public function update_config( $add_success = FALSE, $add_error = TRUE ) {
-		do_action( 'AHEE__EE_Network_Config__update_config__begin',$this );
+	public function update_config($add_success = FALSE, $add_error = TRUE) {
+		do_action('AHEE__EE_Network_Config__update_config__begin', $this);
 		// compare existing settings with what's already saved'
 		$saved_config = $this->get_config();
 		// update
-		$saved = $saved_config == $this ? TRUE : update_site_option( 'ee_network_config', $this );
-		do_action( 'AHEE__EE_Network_Config__update_config__end', $this, $saved );
+		$saved = $saved_config == $this ? TRUE : update_site_option('ee_network_config', $this);
+		do_action('AHEE__EE_Network_Config__update_config__end', $this, $saved);
 		// if config remains the same or was updated successfully
-		if ( $saved ) {
-			if ( $add_success ) {
-				$msg = is_multisite() ? __( 'The Event Espresso Network Configuration Settings have been successfully updated.', 'event_espresso' ) : __( 'Extra Event Espresso Configuration settings were successfully updated.', 'event_espresso' );
-				EE_Error::add_success( $msg );
+		if ($saved) {
+			if ($add_success) {
+				$msg = is_multisite() ? __('The Event Espresso Network Configuration Settings have been successfully updated.', 'event_espresso') : __('Extra Event Espresso Configuration settings were successfully updated.', 'event_espresso');
+				EE_Error::add_success($msg);
 			}
 			return TRUE;
 		} else {
-			if ( $add_error ) {
-				$msg = is_multisite() ? __( 'The Event Espresso Network Configuration Settings were not updated.', 'event_espresso' ) : __( 'Extra Event Espresso Network Configuration settings were not updated.', 'event_espresso' );
-				EE_Error::add_error( $msg , __FILE__, __FUNCTION__, __LINE__ );
+			if ($add_error) {
+				$msg = is_multisite() ? __('The Event Espresso Network Configuration Settings were not updated.', 'event_espresso') : __('Extra Event Espresso Network Configuration settings were not updated.', 'event_espresso');
+				EE_Error::add_error($msg, __FILE__, __FUNCTION__, __LINE__);
 			}
 			return FALSE;
 		}
@@ -158,9 +158,9 @@ 
 	 *  @return 	array
 	 */
 	public function __sleep() {
-		return apply_filters( 'FHEE__EE_Network_Config__sleep',array(
+		return apply_filters('FHEE__EE_Network_Config__sleep', array(
 			'core',
-		) );
+		));
 	}
 
 } //end EE_Network_Config.

Braces +3 added lines, -1 removed lines

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