eventespresso / event-espresso-core

admin_pages/registration_form/templates/questions_main_meta_box.template.php

Spacing +54 added lines, -54 removed lines

@@ -21,7 +21,7 @@ 
 		<tbody>
 			<tr>
 				<th>
-					<label for="QST_display_text"><?php echo $fields['QST_display_text']->get_nicename();?></label> <?php echo EEH_Template::get_help_tab_link('question_text_info');?>
+					<label for="QST_display_text"><?php echo $fields['QST_display_text']->get_nicename(); ?></label> <?php echo EEH_Template::get_help_tab_link('question_text_info'); ?>
 				</th>
 				<td>
 					<input type="text" class="regular-text" id="QST_display_text" name="QST_display_text" value="<?php $question->f('QST_display_text')?>"/>
@@ -31,23 +31,23 @@ 
 
 			<tr>
 				<th>
-					<label for="QST_admin_label"><?php echo $fields['QST_admin_label']->get_nicename();?></label> <?php echo EEH_Template::get_help_tab_link('question_label_info');?>
+					<label for="QST_admin_label"><?php echo $fields['QST_admin_label']->get_nicename(); ?></label> <?php echo EEH_Template::get_help_tab_link('question_label_info'); ?>
 				</th>
 				<td>
 					<?php
-						$disabled = ! empty( $QST_system ) ? ' disabled="disabled"' : '';
-						$id =  ! empty( $QST_system ) ? '_disabled' : '';
+						$disabled = ! empty($QST_system) ? ' disabled="disabled"' : '';
+						$id = ! empty($QST_system) ? '_disabled' : '';
 					?>
 					<input type="text" class="regular-text" id="QST_admin_label<?php echo $id?>" name="QST_admin_label<?php echo $id?>" value="<?php $question->f('QST_admin_label')?>"<?php echo $disabled?>/>
 					<input class="QST_order" type="hidden" id="QST_order<?php echo $id; ?>" name = "QST_order<?php echo $id; ?>" value="<?php echo $question->get('QST_order'); ?>" />
-					<?php if ( ! empty( $QST_system )) { ?>
+					<?php if ( ! empty($QST_system)) { ?>
 						<input type="hidden"  id="QST_admin_label" name="QST_admin_label" value="<?php echo $question->admin_label()?>"/>
 					<?php } ?>
 					<br/>
 					<p class="description">
-					<?php if ( ! empty( $QST_system )) { ?>
+					<?php if ( ! empty($QST_system)) { ?>
 					<span class="description" style="color:#D54E21;">
-						<?php _e('System question! This field cannot be changed.','event_espresso')?>
+						<?php _e('System question! This field cannot be changed.', 'event_espresso')?>
 					</span>
 					<?php } ?>
 
@@ -57,21 +57,21 @@ 
 
 			<tr>
 				<th>
-					<label for="QST_admin_only"><?php echo $fields['QST_admin_only']->get_nicename();?></label> <?php echo EEH_Template::get_help_tab_link('question_admin_only_info');?>
+					<label for="QST_admin_only"><?php echo $fields['QST_admin_only']->get_nicename(); ?></label> <?php echo EEH_Template::get_help_tab_link('question_admin_only_info'); ?>
 				</th>
 				<td>
 					<?php
-						$disabled = ! empty( $QST_system ) ? ' disabled="disabled"' : '';
-						$id =  ! empty( $QST_system ) ? '_disabled' : '';
+						$disabled = ! empty($QST_system) ? ' disabled="disabled"' : '';
+						$id = ! empty($QST_system) ? '_disabled' : '';
 						$admin_only = $question->get('QST_admin_only');
-						$checked = !empty( $admin_only ) ? ' checked="checked"' : '';
+						$checked = ! empty($admin_only) ? ' checked="checked"' : '';
 					?>
 					<input class="QST_admin_only" type="checkbox" id="QST_admin_only<?php echo $id; ?>" name = "QST_admin_only<?php echo $id; ?>" value="1"<?php echo $disabled; echo $checked; ?>/>
 					<br/>
 					<p class="description">
-					<?php if ( ! empty( $QST_system )) { ?>
+					<?php if ( ! empty($QST_system)) { ?>
 					<span class="description" style="color:#D54E21;">
-						<?php _e('System question! This field cannot be changed.','event_espresso')?>
+						<?php _e('System question! This field cannot be changed.', 'event_espresso')?>
 					</span>
 					<?php } ?>
 
@@ -81,21 +81,21 @@ 
 
 			<tr>
 				<th>
-					<label for="QST_type"><?php echo $fields['QST_type']->get_nicename();?></label> <?php echo EEH_Template::get_help_tab_link('question_type_info');?>
+					<label for="QST_type"><?php echo $fields['QST_type']->get_nicename(); ?></label> <?php echo EEH_Template::get_help_tab_link('question_type_info'); ?>
 				</th>
 				<td>
 					<?php
-						$disabled = ! empty( $QST_system ) ? ' disabled="disabled"' : '';
-						$id =  ! empty( $QST_system ) ? '_disabled' : '';
-						echo EEH_Form_Fields::select_input( 'QST_type' . $id, $question_types, $question->type(), 'id="QST_type' . $id . '"' . $disabled );
-						if( ! empty( $QST_system ) ) { ?>
+						$disabled = ! empty($QST_system) ? ' disabled="disabled"' : '';
+						$id = ! empty($QST_system) ? '_disabled' : '';
+						echo EEH_Form_Fields::select_input('QST_type'.$id, $question_types, $question->type(), 'id="QST_type'.$id.'"'.$disabled);
+						if ( ! empty($QST_system)) { ?>
 							<input type="hidden"  id="QST_type" name="QST_type" value="<?php echo $question->type()?>"/>
 						<?php
-							$explanatory_text = __('System question! This field cannot be changed.','event_espresso');
-						}else{
-							$explanatory_text = __('Because there are currently answers for this question in the database, your options to change the question type have been limited to similar question-types.','event_espresso');
+							$explanatory_text = __('System question! This field cannot be changed.', 'event_espresso');
+						} else {
+							$explanatory_text = __('Because there are currently answers for this question in the database, your options to change the question type have been limited to similar question-types.', 'event_espresso');
 						}
-						if ( ! empty( $QST_system ) || $has_answers ) { ?>
+						if ( ! empty($QST_system) || $has_answers) { ?>
 							<p><span class="description" style="color:#D54E21;">
 								<?php echo $explanatory_text; ?>
 							</span></p>
@@ -108,22 +108,22 @@ 
 			<tr id="text_input_question_options">
 				<th>
 					<label>
-						<?php _e( 'Maximum Allowed Response Size', 'event_espresso' );?>
+						<?php _e('Maximum Allowed Response Size', 'event_espresso'); ?>
 					</label>
 				</th>
 				<td>
-					<input id="QST_max" name="QST_max" type="number" <?php echo $max_max === EE_INF ? '' : "max='$max_max'";?> value="<?php $question->f( 'QST_max' );?>" min="1">
+					<input id="QST_max" name="QST_max" type="number" <?php echo $max_max === EE_INF ? '' : "max='$max_max'"; ?> value="<?php $question->f('QST_max'); ?>" min="1">
 					<p>
 						<span class="description">
-							<?php _e( 'Maximum number of characters allowed when answering this question', 'event_espresso' );?>
+							<?php _e('Maximum number of characters allowed when answering this question', 'event_espresso'); ?>
 						</span>
 					</p>
-					<?php if ( $QST_system ) { ?>
+					<?php if ($QST_system) { ?>
 					<p>
 						<span class="description" style="color:#D54E21;">
 							<?php printf(
-									__( 'System question! The maximum number of characters that can be used for this question is %1$s', 'event_espresso' ),
-									$max_max );?>
+									__('System question! The maximum number of characters that can be used for this question is %1$s', 'event_espresso'),
+									$max_max ); ?>
 						</span>
 					</p>
 					<?php } ?>
@@ -132,7 +132,7 @@ 
 			<tr id="question_options">
 				<th>
 					<label>
-						<?php _e('Answer Options','event_espresso')?>
+						<?php _e('Answer Options', 'event_espresso')?>
 					</label>
 				</th>
 				<td>
@@ -141,10 +141,10 @@ 
 						<thead>
 							<tr>
 								<th class="option-value-header">
-									<?php _e('Value','event_espresso')?>
+									<?php _e('Value', 'event_espresso')?>
 								</th>
 								<th class="option-desc-header">
-									<?php _e('Description (optional, only shown on registration form)','event_espresso')?>
+									<?php _e('Description (optional, only shown on registration form)', 'event_espresso')?>
 								</th>
 								<th>
 								</th>
@@ -167,17 +167,17 @@ 
 							</tr>
 
 							<?php
-							$count=0;
+							$count = 0;
 							$question_options = $question->options();
-							if ( ! empty( $question_options )) {
-								foreach( $question_options as $option_id => $option ) {
-									$disabled =  $has_answers || $option->get('QSO_system') ? ' disabled="disabled"'  : '';
+							if ( ! empty($question_options)) {
+								foreach ($question_options as $option_id => $option) {
+									$disabled = $has_answers || $option->get('QSO_system') ? ' disabled="disabled"' : '';
 							?>
 								<tr class="question-option ee-options-sortable">
 									<td class="option-value-cell">
 										<input type="hidden" class="QSO_order" name="question_options[<?php echo $count; ?>][QSO_order]" value="<?php echo $count; ?>">
 										<input type="text" class="option-value regular-text" name="question_options[<?php echo $count?>][QSO_value]" value="<?php  $option->f('QSO_value')?>"<?php echo $disabled; ?>>
-										<?php if ( $has_answers ) : ?>
+										<?php if ($has_answers) : ?>
 											<input type="hidden" name="question_options[<?php echo $count; ?>][QSO_value]" value="<?php echo $option->f('QSO_value'); ?>" >
 										<?php endif; ?>
 									</td>
@@ -185,7 +185,7 @@ 
 										<input type="text" class="option-desc regular-text" name="question_options[<?php echo $count?>][QSO_desc]" value="<?php $option->f('QSO_desc')?>">
 									</td>
 									<td>
-										<?php if ( ! $option->system() ) { ?>
+										<?php if ( ! $option->system()) { ?>
 											<span class="dashicons clickable dashicons-post-trash ee-icon-size-18 remove-option remove-item"></span>
 										<?php } ?>
 										<span class="dashicons dashicons-image-flip-vertical sortable-drag-handle ee-icon-size-18"></span>
@@ -224,13 +224,13 @@ 
 					</table>
 
 					<a id="new-question-option" class="button" style="margin:0 0 1em 3px;">
-						<?php _e('Add Another Answer Option','event_espresso')?>
+						<?php _e('Add Another Answer Option', 'event_espresso')?>
 					</a><br/>
 
 					<p class="description">
-						<?php _e('Answer Options are the choices that you give people to select from for RADIO_BTN, CHECKBOX or DROPDOWN questions. The Value is a simple key that will be saved to the database and the description is optional. Note that values CANNOT contain any HTML, but descriptions can.','event_espresso')?>
+						<?php _e('Answer Options are the choices that you give people to select from for RADIO_BTN, CHECKBOX or DROPDOWN questions. The Value is a simple key that will be saved to the database and the description is optional. Note that values CANNOT contain any HTML, but descriptions can.', 'event_espresso')?>
 					</p>
-					<?php if ( $has_answers ) : ?>
+					<?php if ($has_answers) : ?>
 					<p class="description" style="color:#D54E21;">
 							<?php _e('Answer values that are uneditable are this way because there are registrations in the database that have answers for this question.  If you need to correct a mistake, or edit an existing option value, then trash the existing one and create a new option with the changes.  This will ensure that the existing registrations that chose the original answer will preserve that answer.', 'event_espresso'); ?>
 					</p>
@@ -241,32 +241,32 @@ 
 
 			<tr>
 				<th>
-					<label for="QST_required"><?php echo $fields['QST_required']->get_nicename();?></label> <?php echo EEH_Template::get_help_tab_link('required_question_info');?>
+					<label for="QST_required"><?php echo $fields['QST_required']->get_nicename(); ?></label> <?php echo EEH_Template::get_help_tab_link('required_question_info'); ?>
 				</th>
 				<td>
 					<?php
-					$system_required = array( 'fname', 'email' );
-					$disabled = in_array( $QST_system, $system_required ) ? ' disabled="disabled"' : '';
+					$system_required = array('fname', 'email');
+					$disabled = in_array($QST_system, $system_required) ? ' disabled="disabled"' : '';
 					$required_on = $question->get('QST_admin_only');
 					$show_required_msg = $required_on ? '' : ' display:none;';
-					$disabled = $required_on || ! empty( $disabled ) ? ' disabled="disabled"' : '';
-					$id =  ! empty( $disabled ) && in_array( $QST_system, $system_required) ? '_disabled' : '';
-					$requiredOptions=array(
-						array('text'=>'Optional','id'=>0),
-						array('text'=>'Required','id'=>1)
+					$disabled = $required_on || ! empty($disabled) ? ' disabled="disabled"' : '';
+					$id = ! empty($disabled) && in_array($QST_system, $system_required) ? '_disabled' : '';
+					$requiredOptions = array(
+						array('text'=>'Optional', 'id'=>0),
+						array('text'=>'Required', 'id'=>1)
 					);
-					echo EEH_Form_Fields::select_input('QST_required' . $id, $requiredOptions, $question->required(), 'id="QST_required' . $id . '"' . $disabled );
+					echo EEH_Form_Fields::select_input('QST_required'.$id, $requiredOptions, $question->required(), 'id="QST_required'.$id.'"'.$disabled);
 					?>
 						<p><span id="required_toggled_on" class="description" style="color:#D54E21;<?php echo $show_required_msg; ?>">
-						<?php _e('Required is set to optional, and this field is disabled, because the question is Admin-Only.','event_espresso')?>
+						<?php _e('Required is set to optional, and this field is disabled, because the question is Admin-Only.', 'event_espresso')?>
 						</span></p>
 						<p><span id="required_toggled_off" class="description" style="color:#D54E21; display: none;">
-							<?php _e('Required option field is no longer disabled because the question is not Admin-Only','event_espresso')?>
+							<?php _e('Required option field is no longer disabled because the question is not Admin-Only', 'event_espresso')?>
 						</span></p>
-					<?php if ( ! empty( $disabled ) && in_array( $QST_system, $system_required ) ) { ?>
+					<?php if ( ! empty($disabled) && in_array($QST_system, $system_required)) { ?>
 						<input type="hidden"  id="QST_required" name="QST_required" value="1"/>
 						<p><span class="description" style="color:#D54E21;">
-						<?php _e('System question! This field cannot be changed.','event_espresso')?>
+						<?php _e('System question! This field cannot be changed.', 'event_espresso')?>
 					</span></p>
 					<?php } ?>
 
@@ -275,7 +275,7 @@ 
 
 			<tr>
 				<th>
-					<label for="QST_required_text"><?php _e('Required Text', 'event_espresso'); ?></label> <?php echo EEH_Template::get_help_tab_link('required_text_info');?>
+					<label for="QST_required_text"><?php _e('Required Text', 'event_espresso'); ?></label> <?php echo EEH_Template::get_help_tab_link('required_text_info'); ?>
 				</th>
 				<td>
 					<input type="text" maxlength="100" class="regular-text" id="QST_required_text" name="QST_required_text" value="<?php  $question->f('QST_required_text')?>"/>

core/EE_Registry.core.php

Doc Comments +2 added lines, -1 removed lines

@@ -344,6 +344,7 @@ 
 
 	/**
 	 * @param mixed string | EED_Module $module
+	 * @param string $module
 	 * @throws \EE_Error
 	 */
 	public function add_module( $module ) {
@@ -901,7 +902,7 @@ 
 	 *
 	 * @access protected
 	 * @param string $class_name
-	 * @param        $class_prefix
+	 * @param        string $class_prefix
 	 * @param array  $arguments
 	 * @param string $type
 	 * @param bool   $from_db

Indentation +4 added lines, -4 removed lines

@@ -60,10 +60,10 @@
 	public $REQ;
 
 	/**
-	* 	EE_Session Object
-	* 	@access 	public
-	* 	@var 	EE_Session	 $SSN
-	*/
+	 * 	EE_Session Object
+	 * 	@access 	public
+	 * 	@var 	EE_Session	 $SSN
+	 */
 	public $SSN;
 
 	/**

Spacing +209 added lines, -209 removed lines

@@ -186,8 +186,8 @@ 
 	 */
 	public static function instance() {
 		// check if class object is instantiated
-		if ( ! \EE_Load_Espresso_Core::getRegistryForBlog() instanceof EE_Registry ) {
-			\EE_Load_Espresso_Core::setRegistryForBlog( new self() );
+		if ( ! \EE_Load_Espresso_Core::getRegistryForBlog() instanceof EE_Registry) {
+			\EE_Load_Espresso_Core::setRegistryForBlog(new self());
 		}
 		return \EE_Load_Espresso_Core::getRegistryForBlog();
 	}
@@ -213,19 +213,19 @@ 
 	 * @throws \RuntimeException
 	 */
 	public function initialize() {
-		if ( ! $this->dependency_map() instanceof \EE_Dependency_Map ) {
+		if ( ! $this->dependency_map() instanceof \EE_Dependency_Map) {
 			throw new RuntimeException(
-				__( 'The EE_Dependency_Map object needs to be setter injected before initializing the Registry', 'event_espresso' )
+				__('The EE_Dependency_Map object needs to be setter injected before initializing the Registry', 'event_espresso')
 			);
 		}
-		if ( ! $this->request() instanceof \EE_Request ) {
+		if ( ! $this->request() instanceof \EE_Request) {
 			throw new RuntimeException(
-					__( 'The EE_Request object needs to be setter injected before initializing the Registry', 'event_espresso' )
+					__('The EE_Request object needs to be setter injected before initializing the Registry', 'event_espresso')
 			);
 		}
-		if ( ! $this->response() instanceof \EE_Response ) {
+		if ( ! $this->response() instanceof \EE_Response) {
 			throw new RuntimeException(
-					__( 'The EE_Response object needs to be setter injected before initializing the Registry', 'event_espresso' )
+					__('The EE_Response object needs to be setter injected before initializing the Registry', 'event_espresso')
 			);
 		}
 		$this->_class_abbreviations = apply_filters(
@@ -246,10 +246,10 @@ 
 		$this->modules = new stdClass();
 		$this->shortcodes = new stdClass();
 		$this->widgets = new stdClass();
-		$this->_set_cached_class( $this->request(), 'EE_Request' );
-		$this->_set_cached_class( $this->response(), 'EE_Response' );
-		$this->load_core( 'Base', array(), true );
-		add_action( 'AHEE__EE_System__set_hooks_for_core', array( $this, 'init' ) );
+		$this->_set_cached_class($this->request(), 'EE_Request');
+		$this->_set_cached_class($this->response(), 'EE_Response');
+		$this->load_core('Base', array(), true);
+		add_action('AHEE__EE_System__set_hooks_for_core', array($this, 'init'));
 	}
 
 
@@ -266,7 +266,7 @@ 
 	/**
 	 * @param \EE_Request $request
 	 */
-	public function set_request( \EE_Request $request ) {
+	public function set_request(\EE_Request $request) {
 		$this->request = $request;
 	}
 
@@ -284,7 +284,7 @@ 
 	/**
 	 * @param \EE_Response $response
 	 */
-	public function set_response( \EE_Response $response ) {
+	public function set_response(\EE_Response $response) {
 		$this->response = $response;
 	}
 
@@ -302,7 +302,7 @@ 
 	/**
 	 * @param \EE_Dependency_Map $dependency_map
 	 */
-	public function set_dependency_map( \EE_Dependency_Map $dependency_map ) {
+	public function set_dependency_map(\EE_Dependency_Map $dependency_map) {
 		$this->_dependency_map = $dependency_map;
 	}
 
@@ -316,10 +316,10 @@ 
 	 */
 	public function init() {
 		// Get current page protocol
-		$protocol = isset( $_SERVER[ 'HTTPS' ] ) ? 'https://' : 'http://';
+		$protocol = isset($_SERVER['HTTPS']) ? 'https://' : 'http://';
 		// Output admin-ajax.php URL with same protocol as current page
-		self::$i18n_js_strings[ 'ajax_url' ] = admin_url( 'admin-ajax.php', $protocol );
-		self::$i18n_js_strings[ 'wp_debug' ] = defined( 'WP_DEBUG' ) ? WP_DEBUG : false;
+		self::$i18n_js_strings['ajax_url'] = admin_url('admin-ajax.php', $protocol);
+		self::$i18n_js_strings['wp_debug'] = defined('WP_DEBUG') ? WP_DEBUG : false;
 	}
 
 
@@ -330,14 +330,14 @@ 
 	 * @return string
 	 */
 	public static function localize_i18n_js_strings() {
-		$i18n_js_strings = (array)EE_Registry::$i18n_js_strings;
-		foreach ( $i18n_js_strings as $key => $value ) {
-			if ( is_scalar( $value ) ) {
-				$i18n_js_strings[ $key ] = html_entity_decode( (string)$value, ENT_QUOTES, 'UTF-8' );
+		$i18n_js_strings = (array) EE_Registry::$i18n_js_strings;
+		foreach ($i18n_js_strings as $key => $value) {
+			if (is_scalar($value)) {
+				$i18n_js_strings[$key] = html_entity_decode((string) $value, ENT_QUOTES, 'UTF-8');
 			}
 		}
 
-		return "/* <![CDATA[ */ var eei18n = " . wp_json_encode( $i18n_js_strings ) . '; /* ]]> */';
+		return "/* <![CDATA[ */ var eei18n = ".wp_json_encode($i18n_js_strings).'; /* ]]> */';
 	}
 
 
@@ -346,13 +346,13 @@ 
 	 * @param mixed string | EED_Module $module
 	 * @throws \EE_Error
 	 */
-	public function add_module( $module ) {
-		if ( $module instanceof EED_Module ) {
-			$module_class = get_class( $module );
+	public function add_module($module) {
+		if ($module instanceof EED_Module) {
+			$module_class = get_class($module);
 			$this->modules->{$module_class} = $module;
 		} else {
-			if ( ! class_exists( 'EE_Module_Request_Router' ) ) {
-				$this->load_core( 'Module_Request_Router' );
+			if ( ! class_exists('EE_Module_Request_Router')) {
+				$this->load_core('Module_Request_Router');
 			}
 			$this->modules->{$module} = EE_Module_Request_Router::module_factory(
 				$module,
@@ -368,8 +368,8 @@ 
 	 * @param string $module_name
 	 * @return mixed EED_Module | NULL
 	 */
-	public function get_module( $module_name = '' ) {
-		return isset( $this->modules->{$module_name} ) ? $this->modules->{$module_name} : null;
+	public function get_module($module_name = '') {
+		return isset($this->modules->{$module_name} ) ? $this->modules->{$module_name} : null;
 	}
 
 
@@ -384,20 +384,20 @@ 
 	 * @return mixed
 	 * @throws \EE_Error
 	 */
-	public function load_core( $class_name, $arguments = array(), $load_only = false ) {
+	public function load_core($class_name, $arguments = array(), $load_only = false) {
 		$core_paths = apply_filters(
 			'FHEE__EE_Registry__load_core__core_paths',
 			array(
 				EE_CORE,
 				EE_ADMIN,
 				EE_CPTS,
-				EE_CORE . 'data_migration_scripts' . DS,
-				EE_CORE . 'request_stack' . DS,
-				EE_CORE . 'middleware' . DS,
+				EE_CORE.'data_migration_scripts'.DS,
+				EE_CORE.'request_stack'.DS,
+				EE_CORE.'middleware'.DS,
 			)
 		);
 		// retrieve instantiated class
-		return $this->_load( $core_paths, 'EE_', $class_name, 'core', $arguments, false, true, $load_only );
+		return $this->_load($core_paths, 'EE_', $class_name, 'core', $arguments, false, true, $load_only);
 	}
 
 
@@ -412,15 +412,15 @@ 
 	 * @return mixed
 	 * @throws \EE_Error
 	 */
-	public function load_service( $class_name, $arguments = array(), $load_only = false ) {
+	public function load_service($class_name, $arguments = array(), $load_only = false) {
 		$service_paths = apply_filters(
 			'FHEE__EE_Registry__load_service__service_paths',
 			array(
-				EE_CORE . 'services' . DS,
+				EE_CORE.'services'.DS,
 			)
 		);
 		// retrieve instantiated class
-		return $this->_load( $service_paths, 'EE_', $class_name, 'class', $arguments, false, true, $load_only );
+		return $this->_load($service_paths, 'EE_', $class_name, 'class', $arguments, false, true, $load_only);
 	}
 
 
@@ -434,9 +434,9 @@ 
 	 * @return EE_Data_Migration_Script_Base
 	 * @throws \EE_Error
 	 */
-	public function load_dms( $class_name, $arguments = array() ) {
+	public function load_dms($class_name, $arguments = array()) {
 		// retrieve instantiated class
-		return $this->_load( EE_Data_Migration_Manager::instance()->get_data_migration_script_folders(), 'EE_DMS_', $class_name, 'dms', $arguments, false, false, false );
+		return $this->_load(EE_Data_Migration_Manager::instance()->get_data_migration_script_folders(), 'EE_DMS_', $class_name, 'dms', $arguments, false, false, false);
 	}
 
 
@@ -453,14 +453,14 @@ 
 	 * @return EE_Base_Class
 	 * @throws \EE_Error
 	 */
-	public function load_class( $class_name, $arguments = array(), $from_db = false, $cache = true, $load_only = false ) {
-		$paths = apply_filters( 'FHEE__EE_Registry__load_class__paths', array(
+	public function load_class($class_name, $arguments = array(), $from_db = false, $cache = true, $load_only = false) {
+		$paths = apply_filters('FHEE__EE_Registry__load_class__paths', array(
 			EE_CORE,
 			EE_CLASSES,
 			EE_BUSINESS
-		) );
+		));
 		// retrieve instantiated class
-		return $this->_load( $paths, 'EE_', $class_name, 'class', $arguments, $from_db, $cache, $load_only );
+		return $this->_load($paths, 'EE_', $class_name, 'class', $arguments, $from_db, $cache, $load_only);
 	}
 
 
@@ -474,11 +474,11 @@ 
 	 * @return EEH_Base
 	 * @throws \EE_Error
 	 */
-	public function load_helper( $class_name, $arguments = array(), $load_only = true ) {
+	public function load_helper($class_name, $arguments = array(), $load_only = true) {
 		// todo: add doing_it_wrong() in a few versions after all addons have had calls to this method removed
-		$helper_paths = apply_filters( 'FHEE__EE_Registry__load_helper__helper_paths', array( EE_HELPERS ) );
+		$helper_paths = apply_filters('FHEE__EE_Registry__load_helper__helper_paths', array(EE_HELPERS));
 		// retrieve instantiated class
-		return $this->_load( $helper_paths, 'EEH_', $class_name, 'helper', $arguments, false, true, $load_only );
+		return $this->_load($helper_paths, 'EEH_', $class_name, 'helper', $arguments, false, true, $load_only);
 	}
 
 
@@ -494,16 +494,16 @@ 
 	 * @return mixed
 	 * @throws \EE_Error
 	 */
-	public function load_lib( $class_name, $arguments = array(), $load_only = false, $cache = true ) {
+	public function load_lib($class_name, $arguments = array(), $load_only = false, $cache = true) {
 		$paths = array(
 			EE_LIBRARIES,
-			EE_LIBRARIES . 'messages' . DS,
-			EE_LIBRARIES . 'shortcodes' . DS,
-			EE_LIBRARIES . 'qtips' . DS,
-			EE_LIBRARIES . 'payment_methods' . DS,
+			EE_LIBRARIES.'messages'.DS,
+			EE_LIBRARIES.'shortcodes'.DS,
+			EE_LIBRARIES.'qtips'.DS,
+			EE_LIBRARIES.'payment_methods'.DS,
 		);
 		// retrieve instantiated class
-		return $this->_load( $paths, 'EE_', $class_name, 'lib', $arguments, false, $cache, $load_only );
+		return $this->_load($paths, 'EE_', $class_name, 'lib', $arguments, false, $cache, $load_only);
 	}
 
 
@@ -517,13 +517,13 @@ 
 	 * @return EEM_Base
 	 * @throws \EE_Error
 	 */
-	public function load_model( $class_name, $arguments = array(), $load_only = false ) {
-		$paths = apply_filters( 'FHEE__EE_Registry__load_model__paths', array(
+	public function load_model($class_name, $arguments = array(), $load_only = false) {
+		$paths = apply_filters('FHEE__EE_Registry__load_model__paths', array(
 			EE_MODELS,
 			EE_CORE
-		) );
+		));
 		// retrieve instantiated class
-		return $this->_load( $paths, 'EEM_', $class_name, 'model', $arguments, false, true, $load_only );
+		return $this->_load($paths, 'EEM_', $class_name, 'model', $arguments, false, true, $load_only);
 	}
 
 
@@ -537,15 +537,15 @@ 
 	 * @return mixed
 	 * @throws \EE_Error
 	 */
-	public function load_model_class( $class_name, $arguments = array(), $load_only = true ) {
+	public function load_model_class($class_name, $arguments = array(), $load_only = true) {
 		$paths = array(
-			EE_MODELS . 'fields' . DS,
-			EE_MODELS . 'helpers' . DS,
-			EE_MODELS . 'relations' . DS,
-			EE_MODELS . 'strategies' . DS
+			EE_MODELS.'fields'.DS,
+			EE_MODELS.'helpers'.DS,
+			EE_MODELS.'relations'.DS,
+			EE_MODELS.'strategies'.DS
 		);
 		// retrieve instantiated class
-		return $this->_load( $paths, 'EE_', $class_name, '', $arguments, false, true, $load_only );
+		return $this->_load($paths, 'EE_', $class_name, '', $arguments, false, true, $load_only);
 	}
 
 
@@ -555,8 +555,8 @@ 
 	 * @param string $model_name like Event, Attendee, Question_Group_Question, etc.
 	 * @return boolean
 	 */
-	public function is_model_name( $model_name ) {
-		return isset( $this->models[ $model_name ] ) ? true : false;
+	public function is_model_name($model_name) {
+		return isset($this->models[$model_name]) ? true : false;
 	}
 
 
@@ -572,9 +572,9 @@ 
 	 * @return mixed
 	 * @throws \EE_Error
 	 */
-	public function load_file( $path_to_file, $file_name, $type = '', $arguments = array(), $load_only = true ) {
+	public function load_file($path_to_file, $file_name, $type = '', $arguments = array(), $load_only = true) {
 		// retrieve instantiated class
-		return $this->_load( $path_to_file, '', $file_name, $type, $arguments, false, true, $load_only );
+		return $this->_load($path_to_file, '', $file_name, $type, $arguments, false, true, $load_only);
 	}
 
 
@@ -590,9 +590,9 @@ 
 	 * @return EE_Addon
 	 * @throws \EE_Error
 	 */
-	public function load_addon( $path_to_file, $class_name, $type = 'class', $arguments = array(), $load_only = false ) {
+	public function load_addon($path_to_file, $class_name, $type = 'class', $arguments = array(), $load_only = false) {
 		// retrieve instantiated class
-		return $this->_load( $path_to_file, 'addon', $class_name, $type, $arguments, false, true, $load_only );
+		return $this->_load($path_to_file, 'addon', $class_name, $type, $arguments, false, true, $load_only);
 	}
 
 
@@ -617,21 +617,21 @@ 
 		$load_only = false,
 		$addon = false
 	) {
-		if ( ! class_exists( $class_name ) ) {
+		if ( ! class_exists($class_name)) {
 			return null;
 		}
 		// if we're only loading the class and it already exists, then let's just return true immediately
-		if ( $load_only ) {
+		if ($load_only) {
 			return true;
 		}
 		$addon = $addon ? 'addon' : '';
-		$class_obj = $this->_check_cache_for_class( $class_name, $addon, $cache, $load_only );
-		if ( $class_obj !== null ) {
+		$class_obj = $this->_check_cache_for_class($class_name, $addon, $cache, $load_only);
+		if ($class_obj !== null) {
 			// return object if it's already cached
 			return $class_obj;
 		}
 		// instantiate the requested object
-		return $this->_create_object_and_cache( $class_name, $addon, $arguments, 'FQCN', $from_db, $cache );
+		return $this->_create_object_and_cache($class_name, $addon, $arguments, 'FQCN', $from_db, $cache);
 	}
 
 
@@ -661,23 +661,23 @@ 
 		$cache = true,
 		$load_only = false
 	) {
-		$class_name = $this->_process_classname( $class_prefix, $class_name );
-		$class_exists = class_exists( $class_name );
+		$class_name = $this->_process_classname($class_prefix, $class_name);
+		$class_exists = class_exists($class_name);
 		// if we're only loading the class and it already exists, then let's just return true immediately
-		if ( $load_only && $class_exists ) {
+		if ($load_only && $class_exists) {
 			return true;
 		}
-		$class_obj = $this->_check_cache_for_class( $class_name, $class_prefix, $cache, $load_only );
-		if ( $class_obj !== null ) {
+		$class_obj = $this->_check_cache_for_class($class_name, $class_prefix, $cache, $load_only);
+		if ($class_obj !== null) {
 			// return object if it's already cached
 			return $class_obj;
 		}
 		// if the class doesn't exist and can't be found, then just return nothing
-		if ( ! $this->_resolve_path_and_require_file( $class_exists, $class_name, $type, $file_paths, $load_only ) ) {
+		if ( ! $this->_resolve_path_and_require_file($class_exists, $class_name, $type, $file_paths, $load_only)) {
 			return null;
 		}
 		// instantiate the requested object
-		return $this->_create_object_and_cache( $class_name, $class_prefix, $arguments, $type, $from_db, $cache );
+		return $this->_create_object_and_cache($class_name, $class_prefix, $arguments, $type, $from_db, $cache);
 	}
 
 
@@ -695,13 +695,13 @@ 
 		$class_name = ''
 	) {
 		// strip php file extension
-		$class_name = str_replace( '.php', '', trim( $class_name ) );
+		$class_name = str_replace('.php', '', trim($class_name));
 		// does the class have a prefix ?
-		if ( ! empty( $class_prefix ) && $class_prefix !== 'addon' ) {
+		if ( ! empty($class_prefix) && $class_prefix !== 'addon') {
 			// make sure $class_prefix is uppercase
-			$class_prefix = strtoupper( trim( $class_prefix ) );
+			$class_prefix = strtoupper(trim($class_prefix));
 			// add class prefix ONCE!!!
-			$class_name = $class_prefix . str_replace( $class_prefix, '', $class_name );
+			$class_name = $class_prefix.str_replace($class_prefix, '', $class_name);
 		}
 		return $class_name;
 	}
@@ -718,14 +718,14 @@ 
 	 * @return mixed  	                null = failure to load or instantiate class object.
 	 *                                  object = class loaded and instantiated successfully.
 	 */
-	private function _check_cache_for_class( $class_name, $class_prefix, $cache, $load_only ) {
+	private function _check_cache_for_class($class_name, $class_prefix, $cache, $load_only) {
 		// $this->_cache_on is toggled during the recursive loading that can occur with dependency injection
 		// $cache is controlled by individual calls to separate Registry loader methods like load_class()
 		// $load_only is also controlled by individual calls to separate Registry loader methods like load_file()
-		if ( $this->_cache_on && $cache && ! $load_only ) {
+		if ($this->_cache_on && $cache && ! $load_only) {
 			// return object if it's already cached
-			$cached_class = $this->_get_cached_class( $class_name, $class_prefix );
-			if ( $cached_class !== null ) {
+			$cached_class = $this->_get_cached_class($class_name, $class_prefix);
+			if ($cached_class !== null) {
 				return $cached_class;
 			}
 		}
@@ -750,20 +750,20 @@ 
 	 * @param string $class_prefix
 	 * @return mixed
 	 */
-	protected function _get_cached_class( $class_name, $class_prefix = '' ) {
+	protected function _get_cached_class($class_name, $class_prefix = '') {
 		// have to specify something, but not anything that will conflict
 		$class_abbreviation = 'FANCY_BATMAN_PANTS';
-		if ( isset( $this->_class_abbreviations[ $class_name ] ) ) {
-			$class_abbreviation = $this->_class_abbreviations[ $class_name ];
+		if (isset($this->_class_abbreviations[$class_name])) {
+			$class_abbreviation = $this->_class_abbreviations[$class_name];
 		}
 		// check if class has already been loaded, and return it if it has been
-		if ( isset( $this->{$class_abbreviation} ) && $this->{$class_abbreviation} !== null ) {
+		if (isset($this->{$class_abbreviation} ) && $this->{$class_abbreviation} !== null) {
 			return $this->{$class_abbreviation};
-		} else if ( isset ( $this->{$class_name} ) ) {
+		} else if (isset ($this->{$class_name} )) {
 			return $this->{$class_name};
-		} else if ( isset ( $this->LIB->{$class_name} ) ) {
+		} else if (isset ($this->LIB->{$class_name} )) {
 			return $this->LIB->{$class_name};
-		} else if ( $class_prefix === 'addon' && isset ( $this->addons->{$class_name} ) ) {
+		} else if ($class_prefix === 'addon' && isset ($this->addons->{$class_name} )) {
 			return $this->addons->{$class_name};
 		}
 		return null;
@@ -792,13 +792,13 @@ 
 		$load_only = false
 	) {
 		// if the class doesn't already exist.. then we need to try and find the file and load it
-		if ( ! $class_exists ) {
+		if ( ! $class_exists) {
 			// get full path to file
-			$path = $this->_resolve_path( $class_name, $type, $file_paths );
+			$path = $this->_resolve_path($class_name, $type, $file_paths);
 			// load the file
-			$loaded = $this->_require_file( $path, $class_name, $type, $file_paths );
+			$loaded = $this->_require_file($path, $class_name, $type, $file_paths);
 			// if loading failed, or we are only loading a file but NOT instantiating an object
-			if ( ! $loaded || $load_only ) {
+			if ( ! $loaded || $load_only) {
 				// return boolean if only loading, or null if an object was expected
 				return $load_only ? $loaded : false;
 			}
@@ -821,20 +821,20 @@ 
 	 * @param array $file_paths
 	 * @return string | bool
 	 */
-	protected function _resolve_path( $class_name, $type = '', $file_paths = array() ) {
+	protected function _resolve_path($class_name, $type = '', $file_paths = array()) {
 		// make sure $file_paths is an array
-		$file_paths = (array)$file_paths;
+		$file_paths = (array) $file_paths;
 		// cycle thru paths
-		foreach ( $file_paths as $key => $file_path ) {
+		foreach ($file_paths as $key => $file_path) {
 			// convert all separators to proper DS, if no filepath, then use EE_CLASSES
-			$file_path = $file_path ? str_replace( array( '/', '\\' ), DS, $file_path ) : EE_CLASSES;
+			$file_path = $file_path ? str_replace(array('/', '\\'), DS, $file_path) : EE_CLASSES;
 			// prep file type
-			$type = ! empty( $type ) ? trim( $type, '.' ) . '.' : '';
+			$type = ! empty($type) ? trim($type, '.').'.' : '';
 			// build full file path
-			$file_paths[ $key ] = rtrim( $file_path, DS ) . DS . $class_name . '.' . $type . 'php';
+			$file_paths[$key] = rtrim($file_path, DS).DS.$class_name.'.'.$type.'php';
 			//does the file exist and can be read ?
-			if ( is_readable( $file_paths[ $key ] ) ) {
-				return $file_paths[ $key ];
+			if (is_readable($file_paths[$key])) {
+				return $file_paths[$key];
 			}
 		}
 		return false;
@@ -856,29 +856,29 @@ 
 	 * @return boolean
 	 * @throws \EE_Error
 	 */
-	protected function _require_file( $path, $class_name, $type = '', $file_paths = array() ) {
+	protected function _require_file($path, $class_name, $type = '', $file_paths = array()) {
 		// don't give up! you gotta...
 		try {
 			//does the file exist and can it be read ?
-			if ( ! $path ) {
+			if ( ! $path) {
 				// so sorry, can't find the file
-				throw new EE_Error (
+				throw new EE_Error(
 					sprintf(
-						__( 'The %1$s file %2$s could not be located or is not readable due to file permissions. Please ensure that the following filepath(s) are correct: %3$s', 'event_espresso' ),
-						trim( $type, '.' ),
+						__('The %1$s file %2$s could not be located or is not readable due to file permissions. Please ensure that the following filepath(s) are correct: %3$s', 'event_espresso'),
+						trim($type, '.'),
 						$class_name,
-						'<br />' . implode( ',<br />', $file_paths )
+						'<br />'.implode(',<br />', $file_paths)
 					)
 				);
 			}
 			// get the file
-			require_once( $path );
+			require_once($path);
 			// if the class isn't already declared somewhere
-			if ( class_exists( $class_name, false ) === false ) {
+			if (class_exists($class_name, false) === false) {
 				// so sorry, not a class
 				throw new EE_Error(
 					sprintf(
-						__( 'The %s file %s does not appear to contain the %s Class.', 'event_espresso' ),
+						__('The %s file %s does not appear to contain the %s Class.', 'event_espresso'),
 						$type,
 						$path,
 						$class_name
@@ -886,7 +886,7 @@ 
 				);
 			}
 
-		} catch ( EE_Error $e ) {
+		} catch (EE_Error $e) {
 			$e->get_error();
 			return false;
 		}
@@ -918,10 +918,10 @@ 
 		$cache = true
 	) {
 		// instantiate the requested object
-		$class_obj = $this->_create_object( $class_name, $arguments, $type, $from_db );
-		if ( $this->_cache_on && $cache ) {
+		$class_obj = $this->_create_object($class_name, $arguments, $type, $from_db);
+		if ($this->_cache_on && $cache) {
 			// save it for later... kinda like gum  { : $
-			$this->_set_cached_class( $class_obj, $class_name, $class_prefix, $from_db );
+			$this->_set_cached_class($class_obj, $class_name, $class_prefix, $from_db);
 		}
 		$this->_cache_on = true;
 		return $class_obj;
@@ -952,55 +952,55 @@ 
 	 * @return mixed
 	 * @throws \EE_Error
 	 */
-	protected function _create_object( $class_name, $arguments = array(), $type = '', $from_db = false ) {
+	protected function _create_object($class_name, $arguments = array(), $type = '', $from_db = false) {
 		$class_obj = null;
 		// don't give up! you gotta...
 		try {
 			// create reflection
-			$reflector = $this->get_ReflectionClass( $class_name );
+			$reflector = $this->get_ReflectionClass($class_name);
 			// make sure arguments are an array
-			$arguments = is_array( $arguments ) ? $arguments : array( $arguments );
+			$arguments = is_array($arguments) ? $arguments : array($arguments);
 			// and if arguments array is numerically and sequentially indexed, then we want it to remain as is,
 			// else wrap it in an additional array so that it doesn't get split into multiple parameters
-			$arguments = $this->_array_is_numerically_and_sequentially_indexed( $arguments )
+			$arguments = $this->_array_is_numerically_and_sequentially_indexed($arguments)
 				? $arguments
-				: array( $arguments );
+				: array($arguments);
 			// attempt to inject dependencies ?
-			if ( $this->_dependency_map->has( $class_name ) ) {
-				$arguments = $this->_resolve_dependencies( $reflector, $class_name, $arguments );
+			if ($this->_dependency_map->has($class_name)) {
+				$arguments = $this->_resolve_dependencies($reflector, $class_name, $arguments);
 			}
 			// instantiate the class and add to the LIB array for tracking
 			// EE_Base_Classes are instantiated via new_instance by default (models call them via new_instance_from_db)
-			if ( $reflector->getConstructor() === null || $reflector->isAbstract() ) {
+			if ($reflector->getConstructor() === null || $reflector->isAbstract()) {
 				// no constructor = static methods only... nothing to instantiate, loading file was enough
 				//$instantiation_mode = "no constructor";
 				$class_obj = true;
-			} else if ( $from_db && method_exists( $class_name, 'new_instance_from_db' ) ) {
+			} else if ($from_db && method_exists($class_name, 'new_instance_from_db')) {
 				//$instantiation_mode = "new_instance_from_db";
-				$class_obj = call_user_func_array( array( $class_name, 'new_instance_from_db' ), $arguments );
-			} else if ( method_exists( $class_name, 'new_instance' ) ) {
+				$class_obj = call_user_func_array(array($class_name, 'new_instance_from_db'), $arguments);
+			} else if (method_exists($class_name, 'new_instance')) {
 				//$instantiation_mode = "new_instance";
-				$class_obj = call_user_func_array( array( $class_name, 'new_instance' ), $arguments );
-			} else if ( method_exists( $class_name, 'instance' ) ) {
+				$class_obj = call_user_func_array(array($class_name, 'new_instance'), $arguments);
+			} else if (method_exists($class_name, 'instance')) {
 				//$instantiation_mode = "instance";
-				$class_obj = call_user_func_array( array( $class_name, 'instance' ), $arguments );
-			} else if ( $reflector->isInstantiable() ) {
+				$class_obj = call_user_func_array(array($class_name, 'instance'), $arguments);
+			} else if ($reflector->isInstantiable()) {
 				//$instantiation_mode = "isInstantiable";
-				$class_obj = $reflector->newInstanceArgs( $arguments );
+				$class_obj = $reflector->newInstanceArgs($arguments);
 			} else {
 				// heh ? something's not right !
 				//$instantiation_mode = 'none';
 				throw new EE_Error(
 					sprintf(
-						__( 'The %s file %s could not be instantiated.', 'event_espresso' ),
+						__('The %s file %s could not be instantiated.', 'event_espresso'),
 						$type,
 						$class_name
 					)
 				);
 			}
-		} catch ( Exception $e ) {
-			if ( ! $e instanceof EE_Error ) {
-				$e = new EE_Error( $e->getMessage() );
+		} catch (Exception $e) {
+			if ( ! $e instanceof EE_Error) {
+				$e = new EE_Error($e->getMessage());
 			}
 			$e->get_error();
 		}
@@ -1014,8 +1014,8 @@ 
 	 * @param array $array
 	 * @return bool
 	 */
-	protected function _array_is_numerically_and_sequentially_indexed( array $array ) {
-		return ! empty( $array ) ? array_keys( $array ) === range( 0, count( $array ) - 1 ) : true;
+	protected function _array_is_numerically_and_sequentially_indexed(array $array) {
+		return ! empty($array) ? array_keys($array) === range(0, count($array) - 1) : true;
 	}
 
 
@@ -1030,14 +1030,14 @@ 
 	 * @param string $class_name
 	 * @return ReflectionClass
 	 */
-	public function get_ReflectionClass( $class_name ) {
+	public function get_ReflectionClass($class_name) {
 		if (
-			! isset( $this->_reflectors[ $class_name ] )
-			|| ! $this->_reflectors[ $class_name ] instanceof ReflectionClass
+			! isset($this->_reflectors[$class_name])
+			|| ! $this->_reflectors[$class_name] instanceof ReflectionClass
 		) {
-			$this->_reflectors[ $class_name ] = new ReflectionClass( $class_name );
+			$this->_reflectors[$class_name] = new ReflectionClass($class_name);
 		}
-		return $this->_reflectors[ $class_name ];
+		return $this->_reflectors[$class_name];
 	}
 
 
@@ -1062,45 +1062,45 @@ 
 	 * @param array $arguments
 	 * @return array
 	 */
-	protected function _resolve_dependencies( ReflectionClass $reflector, $class_name, $arguments = array() ) {
+	protected function _resolve_dependencies(ReflectionClass $reflector, $class_name, $arguments = array()) {
 		// let's examine the constructor
 		$constructor = $reflector->getConstructor();
 		// whu? huh? nothing?
-		if ( ! $constructor ) {
+		if ( ! $constructor) {
 			return $arguments;
 		}
 		// get constructor parameters
 		$params = $constructor->getParameters();
 		// and the keys for the incoming arguments array so that we can compare existing arguments with what is expected
-		$argument_keys = array_keys( $arguments );
+		$argument_keys = array_keys($arguments);
 		// now loop thru all of the constructors expected parameters
-		foreach ( $params as $index => $param ) {
+		foreach ($params as $index => $param) {
 			// is this a dependency for a specific class ?
 			$param_class = $param->getClass() ? $param->getClass()->name : null;
 			if (
 				// param is not even a class
-				empty( $param_class )
+				empty($param_class)
 				// and something already exists in the incoming arguments for this param
-				&& isset( $argument_keys[ $index ], $arguments[ $argument_keys[ $index ] ] )
+				&& isset($argument_keys[$index], $arguments[$argument_keys[$index]])
 			) {
 				// so let's skip this argument and move on to the next
 				continue;
 			} else if (
 				// parameter is type hinted as a class, exists as an incoming argument, AND it's the correct class
-				! empty( $param_class )
-				&& isset( $argument_keys[ $index ], $arguments[ $argument_keys[ $index ] ] )
-				&& $arguments[ $argument_keys[ $index ] ] instanceof $param_class
+				! empty($param_class)
+				&& isset($argument_keys[$index], $arguments[$argument_keys[$index]])
+				&& $arguments[$argument_keys[$index]] instanceof $param_class
 			) {
 				// skip this argument and move on to the next
 				continue;
 			} else if (
 				// parameter is type hinted as a class, and should be injected
-				! empty( $param_class )
-				&& $this->_dependency_map->has_dependency_for_class( $class_name, $param_class )
+				! empty($param_class)
+				&& $this->_dependency_map->has_dependency_for_class($class_name, $param_class)
 			) {
-				$arguments = $this->_resolve_dependency( $class_name, $param_class, $arguments, $index );
+				$arguments = $this->_resolve_dependency($class_name, $param_class, $arguments, $index);
 			} else {
-				$arguments[ $index ] = $param->getDefaultValue();
+				$arguments[$index] = $param->getDefaultValue();
 			}
 
 		}
@@ -1117,7 +1117,7 @@ 
 	 * @param mixed $index
 	 * @return array
 	 */
-	protected function _resolve_dependency( $class_name, $param_class , $arguments, $index ) {
+	protected function _resolve_dependency($class_name, $param_class, $arguments, $index) {
 		$dependency = null;
 		// should dependency be loaded from cache ?
 		$cache_on = $this->_dependency_map->loading_strategy_for_class_dependency(
@@ -1127,30 +1127,30 @@ 
 			: false;
 		// we might have a dependency...
 		// let's MAYBE try and find it in our cache if that's what's been requested
-		$cached_class = $cache_on ? $this->_get_cached_class( $param_class ) : null;
+		$cached_class = $cache_on ? $this->_get_cached_class($param_class) : null;
 		// and grab it if it exists
-		if ( $cached_class instanceof $param_class ) {
+		if ($cached_class instanceof $param_class) {
 			$dependency = $cached_class;
-		} else if ( $param_class !== $class_name ) {
+		} else if ($param_class !== $class_name) {
 			// obtain the loader method from the dependency map
-			$loader = $this->_dependency_map->class_loader( $param_class );
+			$loader = $this->_dependency_map->class_loader($param_class);
 			// is loader a custom closure ?
-			if ( $loader instanceof Closure ) {
+			if ($loader instanceof Closure) {
 				$dependency = $loader();
 			} else {
 				// set the cache on property for the recursive loading call
 				$this->_cache_on = $cache_on;
 				// if not, then let's try and load it via the registry
-				$dependency = $this->{$loader}( $param_class );
+				$dependency = $this->{$loader}($param_class);
 			}
 		}
 		// did we successfully find the correct dependency ?
-		if ( $dependency instanceof $param_class ) {
+		if ($dependency instanceof $param_class) {
 			// then let's inject it into the incoming array of arguments at the correct location
-			if ( isset( $argument_keys[ $index ] ) ) {
-				$arguments[ $argument_keys[ $index ] ] = $dependency;
+			if (isset($argument_keys[$index])) {
+				$arguments[$argument_keys[$index]] = $dependency;
 			} else {
-				$arguments[ $index ] = $dependency;
+				$arguments[$index] = $dependency;
 			}
 		}
 		return $arguments;
@@ -1175,16 +1175,16 @@ 
 	 * @param bool $from_db
 	 * @return void
 	 */
-	protected function _set_cached_class( $class_obj, $class_name, $class_prefix = '', $from_db = false ) {
+	protected function _set_cached_class($class_obj, $class_name, $class_prefix = '', $from_db = false) {
 		// return newly instantiated class
-		if ( isset( $this->_class_abbreviations[ $class_name ] ) ) {
-			$class_abbreviation = $this->_class_abbreviations[ $class_name ];
+		if (isset($this->_class_abbreviations[$class_name])) {
+			$class_abbreviation = $this->_class_abbreviations[$class_name];
 			$this->{$class_abbreviation} = $class_obj;
-		} else if ( property_exists( $this, $class_name ) ) {
+		} else if (property_exists($this, $class_name)) {
 			$this->{$class_name} = $class_obj;
-		} else if ( $class_prefix === 'addon' ) {
+		} else if ($class_prefix === 'addon') {
 			$this->addons->{$class_name} = $class_obj;
-		} else if ( ! $from_db ) {
+		} else if ( ! $from_db) {
 			$this->LIB->{$class_name} = $class_obj;
 		}
 	}
@@ -1201,12 +1201,12 @@ 
 	 * @return mixed
 	 * @throws \EE_Error
 	 */
-	public static function factory( $classname, $arguments = array() ) {
-		$loader = self::instance()->_dependency_map->class_loader( $classname );
-		if ( $loader instanceof Closure ) {
-			return $loader( $arguments );
-		} else if ( method_exists( EE_Registry::instance(), $loader ) ) {
-			return EE_Registry::instance()->{$loader}( $classname, $arguments );
+	public static function factory($classname, $arguments = array()) {
+		$loader = self::instance()->_dependency_map->class_loader($classname);
+		if ($loader instanceof Closure) {
+			return $loader($arguments);
+		} else if (method_exists(EE_Registry::instance(), $loader)) {
+			return EE_Registry::instance()->{$loader}($classname, $arguments);
 		}
 		return null;
 	}
@@ -1218,9 +1218,9 @@ 
 	 * @param string $name
 	 * @return EE_Addon
 	 */
-	public function get_addon_by_name( $name ) {
-		foreach ( $this->addons as $addon ) {
-			if ( $addon->name() === $name ) {
+	public function get_addon_by_name($name) {
+		foreach ($this->addons as $addon) {
+			if ($addon->name() === $name) {
 				return $addon;
 			}
 		}
@@ -1236,8 +1236,8 @@ 
 	 */
 	public function get_addons_by_name() {
 		$addons = array();
-		foreach ( $this->addons as $addon ) {
-			$addons[ $addon->name() ] = $addon;
+		foreach ($this->addons as $addon) {
+			$addons[$addon->name()] = $addon;
 		}
 		return $addons;
 	}
@@ -1252,14 +1252,14 @@ 
 	 * @return \EEM_Base
 	 * @throws \EE_Error
 	 */
-	public function reset_model( $model_name ) {
-		$model = $this->load_model( $model_name );
-		$model_class_name = get_class( $model );
+	public function reset_model($model_name) {
+		$model = $this->load_model($model_name);
+		$model_class_name = get_class($model);
 		//get that model reset it and make sure we nuke the old reference to it
-		if ( $model instanceof $model_class_name && is_callable( array( $model_class_name, 'reset' ))) {
+		if ($model instanceof $model_class_name && is_callable(array($model_class_name, 'reset'))) {
 			$this->LIB->{$model_class_name} = $model::reset();
 		} else {
-			throw new EE_Error( sprintf( __( 'Model %s does not have a method "reset"', 'event_espresso' ), $model_name ) );
+			throw new EE_Error(sprintf(__('Model %s does not have a method "reset"', 'event_espresso'), $model_name));
 		}
 		return $this->LIB->{$model_class_name};
 	}
@@ -1282,16 +1282,16 @@ 
 	 * @return \EE_Registry
 	 * @throws \EE_Error
 	 */
-	public static function reset( $hard = false, $reinstantiate = true, $reset_models = true ) {
+	public static function reset($hard = false, $reinstantiate = true, $reset_models = true) {
 		$instance = self::instance();
 		EEH_Activation::reset();
 		$instance->_cache_on = true;
-		$instance->CFG = EE_Config::reset( $hard, $reinstantiate );
-		unset( $instance->LIB->EE_Data_Migration_Manager );
+		$instance->CFG = EE_Config::reset($hard, $reinstantiate);
+		unset($instance->LIB->EE_Data_Migration_Manager);
 		$instance->LIB = new stdClass();
-		if ( $reset_models ) {
-			foreach ( array_keys( $instance->non_abstract_db_models ) as $model_name ) {
-				$instance->reset_model( $model_name );
+		if ($reset_models) {
+			foreach (array_keys($instance->non_abstract_db_models) as $model_name) {
+				$instance->reset_model($model_name);
 			}
 		}
 		return $instance;
@@ -1312,7 +1312,7 @@ 
 	 * @param $a
 	 * @param $b
 	 */
-	final public function __call( $a, $b ) {
+	final public function __call($a, $b) {
 	}
 
 
@@ -1320,7 +1320,7 @@ 
 	/**
 	 * @param $a
 	 */
-	final public function __get( $a ) {
+	final public function __get($a) {
 	}
 
 
@@ -1329,7 +1329,7 @@ 
 	 * @param $a
 	 * @param $b
 	 */
-	final public function __set( $a, $b ) {
+	final public function __set($a, $b) {
 	}
 
 
@@ -1337,7 +1337,7 @@ 
 	/**
 	 * @param $a
 	 */
-	final public function __isset( $a ) {
+	final public function __isset($a) {
 	}
 
 
@@ -1345,7 +1345,7 @@ 
 	/**
 	 * @param $a
 	 */
-	final public function __unset( $a ) {
+	final public function __unset($a) {
 	}
 
 
@@ -1392,7 +1392,7 @@ 
 	 * @param $a
 	 * @param $b
 	 */
-	final public static function __callStatic( $a, $b ) {
+	final public static function __callStatic($a, $b) {
 	}
 
 	/**
@@ -1401,9 +1401,9 @@ 
 	 */
 	public function cpt_models() {
 		$cpt_models = array();
-		foreach( $this->non_abstract_db_models as $short_name => $classname ) {
-			if( is_subclass_of( $classname, 'EEM_CPT_Base' ) ) {
-				$cpt_models[ $short_name ] = $classname;
+		foreach ($this->non_abstract_db_models as $short_name => $classname) {
+			if (is_subclass_of($classname, 'EEM_CPT_Base')) {
+				$cpt_models[$short_name] = $classname;
 			}
 		}
 		return $cpt_models;

espresso.php

Spacing +92 added lines, -92 removed lines

@@ -1,5 +1,5 @@ 
-<?php if ( ! defined( 'ABSPATH' ) ) {
-	exit( 'No direct script access allowed' );
+<?php if ( ! defined('ABSPATH')) {
+	exit('No direct script access allowed');
 }
 /*
   Plugin Name:		Event Espresso
@@ -41,7 +41,7 @@ 
  *
  */
 
-if ( function_exists( 'espresso_version' ) ) {
+if (function_exists('espresso_version')) {
 
 	/**
 	 *    espresso_duplicate_plugin_error
@@ -50,12 +50,12 @@ 
 	function espresso_duplicate_plugin_error() {
 		?>
 		<div class="error">
-			<p><?php _e( 'Can not run multiple versions of Event Espresso! One version has been automatically deactivated. Please verify that you have the correct version you want still active.', 'event_espresso' ); ?></p>
+			<p><?php _e('Can not run multiple versions of Event Espresso! One version has been automatically deactivated. Please verify that you have the correct version you want still active.', 'event_espresso'); ?></p>
 		</div>
 		<?php
-		espresso_deactivate_plugin( plugin_basename( __FILE__ ) );
+		espresso_deactivate_plugin(plugin_basename(__FILE__));
 	}
-	add_action( 'admin_notices', 'espresso_duplicate_plugin_error', 1 );
+	add_action('admin_notices', 'espresso_duplicate_plugin_error', 1);
 
 } else {
 
@@ -66,103 +66,103 @@ 
 	 * @return string
 	 */
 	function espresso_version() {
-		return apply_filters( 'FHEE__espresso__espresso_version', '4.9.0.rc.036' );
+		return apply_filters('FHEE__espresso__espresso_version', '4.9.0.rc.036');
 	}
 
 	// define versions
-	define( 'EVENT_ESPRESSO_VERSION', espresso_version() );
-	define( 'EE_MIN_WP_VER_REQUIRED', '4.1' );
-	define( 'EE_MIN_WP_VER_RECOMMENDED', '4.4.2' );
-	define( 'EE_MIN_PHP_VER_REQUIRED', '5.3.0' );
-	define( 'EE_MIN_PHP_VER_RECOMMENDED', '5.4.44' );
-	define( 'EVENT_ESPRESSO_POWERED_BY', 'Event Espresso - ' . EVENT_ESPRESSO_VERSION );
-	define( 'EVENT_ESPRESSO_MAIN_FILE', __FILE__ );
+	define('EVENT_ESPRESSO_VERSION', espresso_version());
+	define('EE_MIN_WP_VER_REQUIRED', '4.1');
+	define('EE_MIN_WP_VER_RECOMMENDED', '4.4.2');
+	define('EE_MIN_PHP_VER_REQUIRED', '5.3.0');
+	define('EE_MIN_PHP_VER_RECOMMENDED', '5.4.44');
+	define('EVENT_ESPRESSO_POWERED_BY', 'Event Espresso - '.EVENT_ESPRESSO_VERSION);
+	define('EVENT_ESPRESSO_MAIN_FILE', __FILE__);
 	//used to be DIRECTORY_SEPARATOR, but that caused issues on windows
-	if ( ! defined( 'DS' ) ) {
-		define( 'DS', '/' );
+	if ( ! defined('DS')) {
+		define('DS', '/');
 	}
-	if ( ! defined( 'PS' ) ) {
-		define( 'PS', PATH_SEPARATOR );
+	if ( ! defined('PS')) {
+		define('PS', PATH_SEPARATOR);
 	}
-	if ( ! defined( 'SP' ) ) {
-		define( 'SP', ' ' );
+	if ( ! defined('SP')) {
+		define('SP', ' ');
 	}
-	if ( ! defined( 'EENL' ) ) {
-		define( 'EENL', "\n" );
+	if ( ! defined('EENL')) {
+		define('EENL', "\n");
 	}
-	define( 'EE_SUPPORT_EMAIL', 'support@eventespresso.com' );
+	define('EE_SUPPORT_EMAIL', 'support@eventespresso.com');
 	// define the plugin directory and URL
-	define( 'EE_PLUGIN_BASENAME', plugin_basename( EVENT_ESPRESSO_MAIN_FILE ) );
-	define( 'EE_PLUGIN_DIR_PATH', plugin_dir_path( EVENT_ESPRESSO_MAIN_FILE ) );
-	define( 'EE_PLUGIN_DIR_URL', plugin_dir_url( EVENT_ESPRESSO_MAIN_FILE ) );
+	define('EE_PLUGIN_BASENAME', plugin_basename(EVENT_ESPRESSO_MAIN_FILE));
+	define('EE_PLUGIN_DIR_PATH', plugin_dir_path(EVENT_ESPRESSO_MAIN_FILE));
+	define('EE_PLUGIN_DIR_URL', plugin_dir_url(EVENT_ESPRESSO_MAIN_FILE));
 	// main root folder paths
-	define( 'EE_ADMIN_PAGES', EE_PLUGIN_DIR_PATH . 'admin_pages' . DS );
-	define( 'EE_CORE', EE_PLUGIN_DIR_PATH . 'core' . DS );
-	define( 'EE_MODULES', EE_PLUGIN_DIR_PATH . 'modules' . DS );
-	define( 'EE_PUBLIC', EE_PLUGIN_DIR_PATH . 'public' . DS );
-	define( 'EE_SHORTCODES', EE_PLUGIN_DIR_PATH . 'shortcodes' . DS );
-	define( 'EE_WIDGETS', EE_PLUGIN_DIR_PATH . 'widgets' . DS );
-	define( 'EE_PAYMENT_METHODS', EE_PLUGIN_DIR_PATH . 'payment_methods' . DS );
-	define( 'EE_CAFF_PATH', EE_PLUGIN_DIR_PATH . 'caffeinated' . DS );
+	define('EE_ADMIN_PAGES', EE_PLUGIN_DIR_PATH.'admin_pages'.DS);
+	define('EE_CORE', EE_PLUGIN_DIR_PATH.'core'.DS);
+	define('EE_MODULES', EE_PLUGIN_DIR_PATH.'modules'.DS);
+	define('EE_PUBLIC', EE_PLUGIN_DIR_PATH.'public'.DS);
+	define('EE_SHORTCODES', EE_PLUGIN_DIR_PATH.'shortcodes'.DS);
+	define('EE_WIDGETS', EE_PLUGIN_DIR_PATH.'widgets'.DS);
+	define('EE_PAYMENT_METHODS', EE_PLUGIN_DIR_PATH.'payment_methods'.DS);
+	define('EE_CAFF_PATH', EE_PLUGIN_DIR_PATH.'caffeinated'.DS);
 	// core system paths
-	define( 'EE_ADMIN', EE_CORE . 'admin' . DS );
-	define( 'EE_CPTS', EE_CORE . 'CPTs' . DS );
-	define( 'EE_CLASSES', EE_CORE . 'db_classes' . DS );
-	define( 'EE_INTERFACES', EE_CORE . 'interfaces' . DS );
-	define( 'EE_BUSINESS', EE_CORE . 'business' . DS );
-	define( 'EE_MODELS', EE_CORE . 'db_models' . DS );
-	define( 'EE_HELPERS', EE_CORE . 'helpers' . DS );
-	define( 'EE_LIBRARIES', EE_CORE . 'libraries' . DS );
-	define( 'EE_TEMPLATES', EE_CORE . 'templates' . DS );
-	define( 'EE_THIRD_PARTY', EE_CORE . 'third_party_libs' . DS );
-	define( 'EE_GLOBAL_ASSETS', EE_TEMPLATES . 'global_assets' . DS );
-	define( 'EE_FORM_SECTIONS', EE_LIBRARIES . 'form_sections' . DS );
+	define('EE_ADMIN', EE_CORE.'admin'.DS);
+	define('EE_CPTS', EE_CORE.'CPTs'.DS);
+	define('EE_CLASSES', EE_CORE.'db_classes'.DS);
+	define('EE_INTERFACES', EE_CORE.'interfaces'.DS);
+	define('EE_BUSINESS', EE_CORE.'business'.DS);
+	define('EE_MODELS', EE_CORE.'db_models'.DS);
+	define('EE_HELPERS', EE_CORE.'helpers'.DS);
+	define('EE_LIBRARIES', EE_CORE.'libraries'.DS);
+	define('EE_TEMPLATES', EE_CORE.'templates'.DS);
+	define('EE_THIRD_PARTY', EE_CORE.'third_party_libs'.DS);
+	define('EE_GLOBAL_ASSETS', EE_TEMPLATES.'global_assets'.DS);
+	define('EE_FORM_SECTIONS', EE_LIBRARIES.'form_sections'.DS);
 	// gateways
-	define( 'EE_GATEWAYS', EE_MODULES . 'gateways' . DS );
-	define( 'EE_GATEWAYS_URL', EE_PLUGIN_DIR_URL . 'modules' . DS . 'gateways' . DS );
+	define('EE_GATEWAYS', EE_MODULES.'gateways'.DS);
+	define('EE_GATEWAYS_URL', EE_PLUGIN_DIR_URL.'modules'.DS.'gateways'.DS);
 	// asset URL paths
-	define( 'EE_TEMPLATES_URL', EE_PLUGIN_DIR_URL . 'core' . DS . 'templates' . DS );
-	define( 'EE_GLOBAL_ASSETS_URL', EE_TEMPLATES_URL . 'global_assets' . DS );
-	define( 'EE_IMAGES_URL', EE_GLOBAL_ASSETS_URL . 'images' . DS );
-	define( 'EE_THIRD_PARTY_URL', EE_PLUGIN_DIR_URL . 'core' . DS . 'third_party_libs' . DS );
-	define( 'EE_HELPERS_ASSETS', EE_PLUGIN_DIR_URL . 'core/helpers/assets/' );
-	define( 'EE_LIBRARIES_URL', EE_PLUGIN_DIR_URL . 'core/libraries/' );
+	define('EE_TEMPLATES_URL', EE_PLUGIN_DIR_URL.'core'.DS.'templates'.DS);
+	define('EE_GLOBAL_ASSETS_URL', EE_TEMPLATES_URL.'global_assets'.DS);
+	define('EE_IMAGES_URL', EE_GLOBAL_ASSETS_URL.'images'.DS);
+	define('EE_THIRD_PARTY_URL', EE_PLUGIN_DIR_URL.'core'.DS.'third_party_libs'.DS);
+	define('EE_HELPERS_ASSETS', EE_PLUGIN_DIR_URL.'core/helpers/assets/');
+	define('EE_LIBRARIES_URL', EE_PLUGIN_DIR_URL.'core/libraries/');
 	// define upload paths
 	$uploads = wp_upload_dir();
 	// define the uploads directory and URL
-	define( 'EVENT_ESPRESSO_UPLOAD_DIR', $uploads[ 'basedir' ] . DS . 'espresso' . DS );
-	define( 'EVENT_ESPRESSO_UPLOAD_URL', $uploads[ 'baseurl' ] . DS . 'espresso' . DS );
+	define('EVENT_ESPRESSO_UPLOAD_DIR', $uploads['basedir'].DS.'espresso'.DS);
+	define('EVENT_ESPRESSO_UPLOAD_URL', $uploads['baseurl'].DS.'espresso'.DS);
 	// define the templates directory and URL
-	define( 'EVENT_ESPRESSO_TEMPLATE_DIR', $uploads[ 'basedir' ] . DS . 'espresso' . DS . 'templates' . DS );
-	define( 'EVENT_ESPRESSO_TEMPLATE_URL', $uploads[ 'baseurl' ] . DS . 'espresso' . DS . 'templates' . DS );
+	define('EVENT_ESPRESSO_TEMPLATE_DIR', $uploads['basedir'].DS.'espresso'.DS.'templates'.DS);
+	define('EVENT_ESPRESSO_TEMPLATE_URL', $uploads['baseurl'].DS.'espresso'.DS.'templates'.DS);
 	// define the gateway directory and URL
-	define( 'EVENT_ESPRESSO_GATEWAY_DIR', $uploads[ 'basedir' ] . DS . 'espresso' . DS . 'gateways' . DS );
-	define( 'EVENT_ESPRESSO_GATEWAY_URL', $uploads[ 'baseurl' ] . DS . 'espresso' . DS . 'gateways' . DS );
+	define('EVENT_ESPRESSO_GATEWAY_DIR', $uploads['basedir'].DS.'espresso'.DS.'gateways'.DS);
+	define('EVENT_ESPRESSO_GATEWAY_URL', $uploads['baseurl'].DS.'espresso'.DS.'gateways'.DS);
 	// languages folder/path
-	define( 'EE_LANGUAGES_SAFE_LOC', '..' . DS . 'uploads' . DS . 'espresso' . DS . 'languages' . DS );
-	define( 'EE_LANGUAGES_SAFE_DIR', EVENT_ESPRESSO_UPLOAD_DIR . 'languages' . DS );
+	define('EE_LANGUAGES_SAFE_LOC', '..'.DS.'uploads'.DS.'espresso'.DS.'languages'.DS);
+	define('EE_LANGUAGES_SAFE_DIR', EVENT_ESPRESSO_UPLOAD_DIR.'languages'.DS);
 	//check for dompdf fonts in uploads
-	if ( file_exists( EVENT_ESPRESSO_UPLOAD_DIR . 'fonts' . DS ) ) {
-		define( 'DOMPDF_FONT_DIR', EVENT_ESPRESSO_UPLOAD_DIR . 'fonts' . DS );
+	if (file_exists(EVENT_ESPRESSO_UPLOAD_DIR.'fonts'.DS)) {
+		define('DOMPDF_FONT_DIR', EVENT_ESPRESSO_UPLOAD_DIR.'fonts'.DS);
 	}
 	//ajax constants
-	define( 'EE_FRONT_AJAX', isset( $_REQUEST[ 'ee_front_ajax' ] ) || isset( $_REQUEST[ 'data' ][ 'ee_front_ajax' ] ) ? true : false );
-	define( 'EE_ADMIN_AJAX', isset( $_REQUEST[ 'ee_admin_ajax' ] ) || isset( $_REQUEST[ 'data' ][ 'ee_admin_ajax' ] ) ? true : false );
+	define('EE_FRONT_AJAX', isset($_REQUEST['ee_front_ajax']) || isset($_REQUEST['data']['ee_front_ajax']) ? true : false);
+	define('EE_ADMIN_AJAX', isset($_REQUEST['ee_admin_ajax']) || isset($_REQUEST['data']['ee_admin_ajax']) ? true : false);
 	//just a handy constant occasionally needed for finding values representing infinity in the DB
 	//you're better to use this than its straight value (currently -1) in case you ever
 	//want to change its default value! or find when -1 means infinity
-	define( 'EE_INF_IN_DB', -1 );
-	define( 'EE_INF', INF > (float)PHP_INT_MAX ? INF : PHP_INT_MAX );
-	define( 'EE_DEBUG', false );
+	define('EE_INF_IN_DB', -1);
+	define('EE_INF', INF > (float) PHP_INT_MAX ? INF : PHP_INT_MAX);
+	define('EE_DEBUG', false);
 
 	/**
 	 *    espresso_plugin_activation
 	 *    adds a wp-option to indicate that EE has been activated via the WP admin plugins page
 	 */
 	function espresso_plugin_activation() {
-		update_option( 'ee_espresso_activation', true );
+		update_option('ee_espresso_activation', true);
 	}
-	register_activation_hook( EVENT_ESPRESSO_MAIN_FILE, 'espresso_plugin_activation' );
+	register_activation_hook(EVENT_ESPRESSO_MAIN_FILE, 'espresso_plugin_activation');
 
 
 
@@ -176,7 +176,7 @@ 
 		//	}
 		//
 	}
-	register_deactivation_hook( EVENT_ESPRESSO_MAIN_FILE, 'espresso_plugin_deactivation' );
+	register_deactivation_hook(EVENT_ESPRESSO_MAIN_FILE, 'espresso_plugin_deactivation');
 
 
 
@@ -186,15 +186,15 @@ 
 	 */
 	function espresso_load_error_handling() {
 		// load debugging tools
-		if ( WP_DEBUG === true && is_readable( EE_HELPERS . 'EEH_Debug_Tools.helper.php' ) ) {
-			require_once( EE_HELPERS . 'EEH_Debug_Tools.helper.php' );
+		if (WP_DEBUG === true && is_readable(EE_HELPERS.'EEH_Debug_Tools.helper.php')) {
+			require_once(EE_HELPERS.'EEH_Debug_Tools.helper.php');
 			EEH_Debug_Tools::instance();
 		}
 		// load error handling
-		if ( is_readable( EE_CORE . 'EE_Error.core.php' ) ) {
-			require_once( EE_CORE . 'EE_Error.core.php' );
+		if (is_readable(EE_CORE.'EE_Error.core.php')) {
+			require_once(EE_CORE.'EE_Error.core.php');
 		} else {
-			wp_die( __( 'The EE_Error core class could not be loaded.', 'event_espresso' ) );
+			wp_die(__('The EE_Error core class could not be loaded.', 'event_espresso'));
 		}
 	}
 
@@ -208,16 +208,16 @@ 
 	 * @param    string $full_path_to_file
 	 * @throws    EE_Error
 	 */
-	function espresso_load_required( $classname, $full_path_to_file ) {
+	function espresso_load_required($classname, $full_path_to_file) {
 		static $error_handling_loaded = false;
-		if ( ! $error_handling_loaded ) {
+		if ( ! $error_handling_loaded) {
 			espresso_load_error_handling();
 			$error_handling_loaded = true;
 		}
-		if ( is_readable( $full_path_to_file ) ) {
-			require_once( $full_path_to_file );
+		if (is_readable($full_path_to_file)) {
+			require_once($full_path_to_file);
 		} else {
-			throw new EE_Error (
+			throw new EE_Error(
 				sprintf(
 					__(
 						'The %s class file could not be located or is not readable due to file permissions.',
@@ -229,10 +229,10 @@ 
 		}
 	}
 
-	espresso_load_required( 'EE_Base', EE_CORE . 'EE_Base.core.php' );
-	espresso_load_required( 'EEH_Base', EE_CORE . 'helpers' . DS . 'EEH_Base.helper.php' );
-	espresso_load_required( 'EEH_File', EE_CORE . 'helpers' . DS . 'EEH_File.helper.php' );
-	espresso_load_required( 'EE_Bootstrap', EE_CORE . 'EE_Bootstrap.core.php' );
+	espresso_load_required('EE_Base', EE_CORE.'EE_Base.core.php');
+	espresso_load_required('EEH_Base', EE_CORE.'helpers'.DS.'EEH_Base.helper.php');
+	espresso_load_required('EEH_File', EE_CORE.'helpers'.DS.'EEH_File.helper.php');
+	espresso_load_required('EE_Bootstrap', EE_CORE.'EE_Bootstrap.core.php');
 	new EE_Bootstrap();
 
 
@@ -241,7 +241,7 @@ 
 
 
 
-if ( ! function_exists( 'espresso_deactivate_plugin' ) ) {
+if ( ! function_exists('espresso_deactivate_plugin')) {
 	/**
 	*    deactivate_plugin
 	* usage:  espresso_deactivate_plugin( plugin_basename( __FILE__ ));
@@ -250,11 +250,11 @@ 
 	* @param string $plugin_basename - the results of plugin_basename( __FILE__ ) for the plugin's main file
 	* @return    void
 	*/
-	function espresso_deactivate_plugin( $plugin_basename = '' ) {
-		if ( ! function_exists( 'deactivate_plugins' ) ) {
-			require_once( ABSPATH . 'wp-admin/includes/plugin.php' );
+	function espresso_deactivate_plugin($plugin_basename = '') {
+		if ( ! function_exists('deactivate_plugins')) {
+			require_once(ABSPATH.'wp-admin/includes/plugin.php');
 		}
-		unset( $_GET[ 'activate' ], $_REQUEST[ 'activate' ] );
-		deactivate_plugins( $plugin_basename );
+		unset($_GET['activate'], $_REQUEST['activate']);
+		deactivate_plugins($plugin_basename);
 	}
 }

core/EE_System.core.php

Spacing +116 added lines, -116 removed lines

@@ -54,10 +54,10 @@ 
 	 * @param  \EE_Registry        $Registry
 	 * @return \EE_System
 	 */
-	public static function instance( EE_Registry $Registry = null ) {
+	public static function instance(EE_Registry $Registry = null) {
 		// check if class object is instantiated
-		if ( ! self::$_instance instanceof EE_System ) {
-			self::$_instance = new self( $Registry );
+		if ( ! self::$_instance instanceof EE_System) {
+			self::$_instance = new self($Registry);
 		}
 		return self::$_instance;
 	}
@@ -75,7 +75,7 @@ 
 		//we need to reset the migration manager in order for it to detect DMSs properly
 		\EE_Data_Migration_Manager::reset();
 		//make sure none of the old hooks are left hanging around
-		remove_all_actions( 'AHEE__EE_System__perform_activations_upgrades_and_migrations' );
+		remove_all_actions('AHEE__EE_System__perform_activations_upgrades_and_migrations');
 		\EE_Activation_Manager::instance()->detect_activations_or_upgrades();
 		\EE_Activation_Manager::instance()->perform_activations_upgrades_and_migrations();
 		return self::instance();
@@ -91,28 +91,28 @@ 
 	 * @access private
 	 * @param  \EE_Registry        $Registry
 	 */
-	private function __construct( EE_Registry $Registry ) {
+	private function __construct(EE_Registry $Registry) {
 		$this->registry = $Registry;
-		do_action( 'AHEE__EE_System__construct__begin', $this );
+		do_action('AHEE__EE_System__construct__begin', $this);
 		// load EE_Config, EE_Textdomain, etc
-		add_action( 'AHEE__EE_Bootstrap__load_core_configuration', array( $this, 'load_core_configuration' ), 10 );
+		add_action('AHEE__EE_Bootstrap__load_core_configuration', array($this, 'load_core_configuration'), 10);
 		// load EE_Config, EE_Textdomain, etc
 		add_action(
 			'AHEE__EE_Bootstrap__register_shortcodes_modules_and_widgets',
-			array( $this, 'register_shortcodes_modules_and_widgets' ),
+			array($this, 'register_shortcodes_modules_and_widgets'),
 			10
 		);
 		// you wanna get going? I wanna get going... let's get going!
-		add_action( 'AHEE__EE_Bootstrap__brew_espresso', array( $this, 'brew_espresso' ), 10 );
+		add_action('AHEE__EE_Bootstrap__brew_espresso', array($this, 'brew_espresso'), 10);
 		// for doing stuff AFTER any plugins have completed loading
-		add_action( 'AHEE__EE_Bootstrap__after_brew_espresso', array( $this, 'after_brew_espresso' ), 10 );
+		add_action('AHEE__EE_Bootstrap__after_brew_espresso', array($this, 'after_brew_espresso'), 10);
 		//other housekeeping
 		//exclude EE critical pages from wp_list_pages
-		add_filter( 'wp_list_pages_excludes', array( $this, 'remove_pages_from_wp_list_pages' ), 10 );
+		add_filter('wp_list_pages_excludes', array($this, 'remove_pages_from_wp_list_pages'), 10);
 		// ALL EE Addons should use the following hook point to attach their initial setup too
 		// it's extremely important for EE Addons to register any class autoloaders
 		// so that they can be available when the EE_Config loads
-		do_action( 'AHEE__EE_System__construct__complete', $this );
+		do_action('AHEE__EE_System__construct__complete', $this);
 	}
 
 
@@ -120,7 +120,7 @@ 
 	/**
 	 * @param \EE_Request $request
 	 */
-	public function set_request( \EE_Request $request ) {
+	public function set_request(\EE_Request $request) {
 		$this->request = $request;
 	}
 
@@ -129,7 +129,7 @@ 
 	/**
 	 * @param \EE_Response $response
 	 */
-	public function set_response( \EE_Response $response ) {
+	public function set_response(\EE_Response $response) {
 		$this->response = $response;
 	}
 
@@ -138,7 +138,7 @@ 
 	/**
 	 * @param EE_Registry $registry
 	 */
-	public function set_registry( $registry ) {
+	public function set_registry($registry) {
 		$this->registry = $registry;
 	}
 
@@ -152,27 +152,27 @@ 
 	 *
 	 * @return void
 	 */
-	public function load_core_configuration(){
-		do_action( 'AHEE__EE_System__load_core_configuration__begin', $this );
+	public function load_core_configuration() {
+		do_action('AHEE__EE_System__load_core_configuration__begin', $this);
 		// load and setup EE_Config and EE_Network_Config
-		$this->registry->load_core( 'Config' );
-		$this->registry->load_core( 'Network_Config' );
+		$this->registry->load_core('Config');
+		$this->registry->load_core('Network_Config');
 		// setup autoloaders
 		// enable logging?
-		if ( $this->registry->CFG->admin->use_full_logging ) {
-			$this->registry->load_core( 'Log' );
+		if ($this->registry->CFG->admin->use_full_logging) {
+			$this->registry->load_core('Log');
 		}
 		// check for activation errors
-		$activation_errors = get_option( 'ee_plugin_activation_errors', FALSE );
-		if ( $activation_errors ) {
-			EE_Error::add_error( $activation_errors, __FILE__, __FUNCTION__, __LINE__ );
-			update_option( 'ee_plugin_activation_errors', FALSE );
+		$activation_errors = get_option('ee_plugin_activation_errors', FALSE);
+		if ($activation_errors) {
+			EE_Error::add_error($activation_errors, __FILE__, __FUNCTION__, __LINE__);
+			update_option('ee_plugin_activation_errors', FALSE);
 		}
 		// get model names
 		$this->_parse_model_names();
 		//load caf stuff a chance to play during the activation process too.
 		$this->_maybe_brew_regular();
-		do_action( 'AHEE__EE_System__load_core_configuration__complete', $this );
+		do_action('AHEE__EE_System__load_core_configuration__complete', $this);
 	}
 
 
@@ -181,22 +181,22 @@ 
 	 *
 	 * @return void
 	 */
-	private function _parse_model_names(){
+	private function _parse_model_names() {
 		//get all the files in the EE_MODELS folder that end in .model.php
-		$models = glob( EE_MODELS.'*.model.php');
+		$models = glob(EE_MODELS.'*.model.php');
 		$model_names = array();
 		$non_abstract_db_models = array();
-		foreach( $models as $model ){
+		foreach ($models as $model) {
 			// get model classname
-			$classname = EEH_File::get_classname_from_filepath_with_standard_filename( $model );
-			$short_name = str_replace( 'EEM_', '', $classname );
+			$classname = EEH_File::get_classname_from_filepath_with_standard_filename($model);
+			$short_name = str_replace('EEM_', '', $classname);
 			$reflectionClass = new ReflectionClass($classname);
-			if( $reflectionClass->isSubclassOf('EEM_Base') && ! $reflectionClass->isAbstract()){
-				$non_abstract_db_models[ $short_name ] = $classname;
+			if ($reflectionClass->isSubclassOf('EEM_Base') && ! $reflectionClass->isAbstract()) {
+				$non_abstract_db_models[$short_name] = $classname;
 			}
-			$model_names[ $short_name ] = $classname;
+			$model_names[$short_name] = $classname;
 		}
-		$this->registry->models = apply_filters( 'FHEE__EE_System__parse_model_names', $model_names );
+		$this->registry->models = apply_filters('FHEE__EE_System__parse_model_names', $model_names);
 		$this->registry->non_abstract_db_models = apply_filters(
 			'FHEE__EE_System__parse_implemented_model_names',
 			$non_abstract_db_models
@@ -213,10 +213,10 @@ 
 	 */
 	private function _maybe_brew_regular() {
 		if (
-			( ! defined( 'EE_DECAF' ) ||  EE_DECAF !== true )
-			&& is_readable( EE_CAFF_PATH . 'brewing_regular.php' )
+			( ! defined('EE_DECAF') || EE_DECAF !== true)
+			&& is_readable(EE_CAFF_PATH.'brewing_regular.php')
 		) {
-			require_once EE_CAFF_PATH . 'brewing_regular.php';
+			require_once EE_CAFF_PATH.'brewing_regular.php';
 			new EE_Brewing_Regular();
 		}
 	}
@@ -234,9 +234,9 @@ 
 	 * @return void
 	 */
 	public function register_shortcodes_modules_and_widgets() {
-		do_action( 'AHEE__EE_System__register_shortcodes_modules_and_widgets' );
+		do_action('AHEE__EE_System__register_shortcodes_modules_and_widgets');
 		// check for addons using old hookpoint
-		if ( has_action( 'AHEE__EE_System__register_shortcodes_modules_and_addons' )) {
+		if (has_action('AHEE__EE_System__register_shortcodes_modules_and_addons')) {
 			$this->_incompatible_addon_error();
 		}
 	}
@@ -253,18 +253,18 @@ 
 		$class_names = EEH_Class_Tools::get_class_names_for_all_callbacks_on_hook(
 			'AHEE__EE_System__register_shortcodes_modules_and_addons'
 		);
-		if ( ! empty( $class_names ) ) {
+		if ( ! empty($class_names)) {
 			$msg = __(
 				'The following plugins, addons, or modules appear to be incompatible with this version of Event Espresso and were automatically deactivated to avoid fatal errors:',
 				'event_espresso'
 			);
 			$msg .= '<ul>';
-			foreach ( $class_names as $class_name ) {
-				$msg .= '<li><b>Event Espresso - ' . str_replace(
-						array( 'EE_', 'EEM_', 'EED_', 'EES_', 'EEW_' ),
+			foreach ($class_names as $class_name) {
+				$msg .= '<li><b>Event Espresso - '.str_replace(
+						array('EE_', 'EEM_', 'EED_', 'EES_', 'EEW_'),
 						'',
 						$class_name
-					) . '</b></li>';
+					).'</b></li>';
 			}
 			$msg .= '</ul>';
 			$msg .= __(
@@ -272,9 +272,9 @@ 
 				'event_espresso'
 			);
 			// save list of incompatible addons to wp-options for later use
-			add_option( 'ee_incompatible_addons', $class_names, '', 'no' );
-			if ( is_admin() ) {
-				EE_Error::add_error( $msg, __FILE__, __FUNCTION__, __LINE__ );
+			add_option('ee_incompatible_addons', $class_names, '', 'no');
+			if (is_admin()) {
+				EE_Error::add_error($msg, __FILE__, __FUNCTION__, __LINE__);
 			}
 		}
 	}
@@ -291,29 +291,29 @@ 
 	 *
 	 * @return void
 	 */
-	public function brew_espresso(){
+	public function brew_espresso() {
 		// filter switch for halting any further execution
-		if ( apply_filters( 'FHEE__EE_System__brew_espresso', true, $this ) ) {
-			do_action( 'AHEE__EE_System__brew_espresso__begin', $this );
+		if (apply_filters('FHEE__EE_System__brew_espresso', true, $this)) {
+			do_action('AHEE__EE_System__brew_espresso__begin', $this);
 			// load some final core systems
-			add_action( 'init', array( $this, 'set_hooks_for_core' ), 1 );
-			add_action( 'init', array( $this, 'load_CPTs_and_session' ), 5 );
-			add_action( 'init', array( $this, 'load_controllers' ), 7 );
-			add_action( 'init', array( $this, 'core_loaded_and_ready' ), 9 );
-			add_action( 'init', array( $this, 'initialize' ), 10 );
-			add_action( 'init', array( $this, 'initialize_last' ), 100 );
-			add_action( 'wp_enqueue_scripts', array( $this, 'wp_enqueue_scripts' ), 25 );
-			add_action( 'admin_enqueue_scripts', array( $this, 'wp_enqueue_scripts' ), 25 );
-			if ( is_admin() && apply_filters( 'FHEE__EE_System__brew_espresso__load_pue', true ) ) {
+			add_action('init', array($this, 'set_hooks_for_core'), 1);
+			add_action('init', array($this, 'load_CPTs_and_session'), 5);
+			add_action('init', array($this, 'load_controllers'), 7);
+			add_action('init', array($this, 'core_loaded_and_ready'), 9);
+			add_action('init', array($this, 'initialize'), 10);
+			add_action('init', array($this, 'initialize_last'), 100);
+			add_action('wp_enqueue_scripts', array($this, 'wp_enqueue_scripts'), 25);
+			add_action('admin_enqueue_scripts', array($this, 'wp_enqueue_scripts'), 25);
+			if (is_admin() && apply_filters('FHEE__EE_System__brew_espresso__load_pue', true)) {
 				// pew pew pew
-				$this->registry->load_core( 'PUE' );
-				do_action( 'AHEE__EE_System__brew_espresso__after_pue_init' );
+				$this->registry->load_core('PUE');
+				do_action('AHEE__EE_System__brew_espresso__after_pue_init');
 			}
-			do_action( 'AHEE__EE_System__brew_espresso__complete', $this );
+			do_action('AHEE__EE_System__brew_espresso__complete', $this);
 		} else {
-			add_action( 'init', array( $this, 'load_controllers' ), 7 );
-			add_action( 'init', array( $this, 'initialize_last' ), 100 );
-			do_action( 'AHEE__EE_System__brew_espresso__halted', $this );
+			add_action('init', array($this, 'load_controllers'), 7);
+			add_action('init', array($this, 'initialize_last'), 100);
+			do_action('AHEE__EE_System__brew_espresso__halted', $this);
 		}
 	}
 
@@ -327,7 +327,7 @@ 
 	 * @return 	void
 	 */
 	public function after_brew_espresso() {
-		do_action( 'AHEE__EE_System__after_brew_espresso' );
+		do_action('AHEE__EE_System__after_brew_espresso');
 	}
 
 
@@ -341,7 +341,7 @@ 
 	 */
 	public function set_hooks_for_core() {
 		$this->_deactivate_incompatible_addons();
-		do_action( 'AHEE__EE_System__set_hooks_for_core' );
+		do_action('AHEE__EE_System__set_hooks_for_core');
 	}
 
 
@@ -350,15 +350,15 @@ 
 	 * Using the information gathered in EE_System::_incompatible_addon_error,
 	 * deactivates any addons considered incompatible with the current version of EE
 	 */
-	private function _deactivate_incompatible_addons(){
-		$incompatible_addons = get_option( 'ee_incompatible_addons', array() );
-		if ( ! empty( $incompatible_addons )) {
-			$active_plugins = get_option( 'active_plugins', array() );
-			foreach ( $active_plugins as $active_plugin ) {
-				foreach ( $incompatible_addons as $incompatible_addon ) {
-					if ( strpos( $active_plugin,  $incompatible_addon ) !== false ) {
-						unset( $_GET['activate'] );
-						espresso_deactivate_plugin( $active_plugin );
+	private function _deactivate_incompatible_addons() {
+		$incompatible_addons = get_option('ee_incompatible_addons', array());
+		if ( ! empty($incompatible_addons)) {
+			$active_plugins = get_option('active_plugins', array());
+			foreach ($active_plugins as $active_plugin) {
+				foreach ($incompatible_addons as $incompatible_addon) {
+					if (strpos($active_plugin, $incompatible_addon) !== false) {
+						unset($_GET['activate']);
+						espresso_deactivate_plugin($active_plugin);
 					}
 				}
 			}
@@ -374,10 +374,10 @@ 
 	 *  	@return 	void
 	 */
 	public function load_CPTs_and_session() {
-		do_action( 'AHEE__EE_System__load_CPTs_and_session__start' );
+		do_action('AHEE__EE_System__load_CPTs_and_session__start');
 		// register Custom Post Types
-		$this->registry->load_core( 'Register_CPTs' );
-		do_action( 'AHEE__EE_System__load_CPTs_and_session__complete' );
+		$this->registry->load_core('Register_CPTs');
+		do_action('AHEE__EE_System__load_CPTs_and_session__complete');
 	}
 
 
@@ -393,16 +393,16 @@ 
 	 * @throws \EE_Error
 	*/
 	public function load_controllers() {
-		do_action( 'AHEE__EE_System__load_controllers__start' );
+		do_action('AHEE__EE_System__load_controllers__start');
 		// let's get it started
-		if ( ! is_admin() && ! EE_Maintenance_Mode::instance()->level() ) {
-			do_action( 'AHEE__EE_System__load_controllers__load_front_controllers' );
-			$this->registry->load_core( 'Front_Controller' );
-		} else if ( ! EE_FRONT_AJAX ) {
-			do_action( 'AHEE__EE_System__load_controllers__load_admin_controllers' );
-			$this->registry->load_core( 'Admin' );
+		if ( ! is_admin() && ! EE_Maintenance_Mode::instance()->level()) {
+			do_action('AHEE__EE_System__load_controllers__load_front_controllers');
+			$this->registry->load_core('Front_Controller');
+		} else if ( ! EE_FRONT_AJAX) {
+			do_action('AHEE__EE_System__load_controllers__load_admin_controllers');
+			$this->registry->load_core('Admin');
 		}
-		do_action( 'AHEE__EE_System__load_controllers__complete' );
+		do_action('AHEE__EE_System__load_controllers__complete');
 	}
 
 
@@ -416,11 +416,11 @@ 
 	* @return void
 	*/
 	public function core_loaded_and_ready() {
-		do_action( 'AHEE__EE_System__core_loaded_and_ready' );
-		do_action( 'AHEE__EE_System__set_hooks_for_shortcodes_modules_and_addons' );
+		do_action('AHEE__EE_System__core_loaded_and_ready');
+		do_action('AHEE__EE_System__set_hooks_for_shortcodes_modules_and_addons');
 //		add_action( 'wp_loaded', array( $this, 'set_hooks_for_shortcodes_modules_and_addons' ), 1 );
-		$this->registry->load_core( 'Session' );
-		new EventEspresso\Core\Services\AdminToolbarItems( $this->registry, \EE_Maintenance_Mode::instance() );
+		$this->registry->load_core('Session');
+		new EventEspresso\Core\Services\AdminToolbarItems($this->registry, \EE_Maintenance_Mode::instance());
 	}
 
 
@@ -434,7 +434,7 @@ 
 	* @return void
 	*/
 	public function initialize() {
-		do_action( 'AHEE__EE_System__initialize' );
+		do_action('AHEE__EE_System__initialize');
 	}
 
 
@@ -448,7 +448,7 @@ 
 	* @return void
 	*/
 	public function initialize_last() {
-		do_action( 'AHEE__EE_System__initialize_last' );
+		do_action('AHEE__EE_System__initialize_last');
 	}
 
 
@@ -480,22 +480,22 @@ 
 	*/
 	public static function do_not_cache() {
 		// set no cache constants
-		if ( ! defined( 'DONOTCACHEPAGE' ) ) {
-			define( 'DONOTCACHEPAGE', true );
+		if ( ! defined('DONOTCACHEPAGE')) {
+			define('DONOTCACHEPAGE', true);
 		}
-		if ( ! defined( 'DONOTCACHCEOBJECT' ) ) {
-			define( 'DONOTCACHCEOBJECT', true );
+		if ( ! defined('DONOTCACHCEOBJECT')) {
+			define('DONOTCACHCEOBJECT', true);
 		}
-		if ( ! defined( 'DONOTCACHEDB' ) ) {
-			define( 'DONOTCACHEDB', true );
+		if ( ! defined('DONOTCACHEDB')) {
+			define('DONOTCACHEDB', true);
 		}
 		// add no cache headers
-		add_action( 'send_headers' , array( 'EE_System', 'nocache_headers' ), 10 );
+		add_action('send_headers', array('EE_System', 'nocache_headers'), 10);
 		// plus a little extra for nginx and Google Chrome
-		add_filter( 'nocache_headers', array( 'EE_System', 'extra_nocache_headers' ), 10, 1 );
+		add_filter('nocache_headers', array('EE_System', 'extra_nocache_headers'), 10, 1);
 		// prevent browsers from prefetching of the rel='next' link,
 		// because it may contain content that interferes with the registration process
-		remove_action( 'wp_head', 'adjacent_posts_rel_link_wp_head' );
+		remove_action('wp_head', 'adjacent_posts_rel_link_wp_head');
 	}
 
 
@@ -507,7 +507,7 @@ 
 	 * @param $headers
 	 * @return    array
 	 */
-	public static function extra_nocache_headers ( $headers ) {
+	public static function extra_nocache_headers($headers) {
 		// for NGINX
 		$headers['X-Accel-Expires'] = 0;
 		// plus extra for Google Chrome since it doesn't seem to respect "no-cache", but WILL respect "no-store"
@@ -538,8 +538,8 @@ 
 	 * @param  array  $exclude_array any existing pages being excluded are in this array.
 	 * @return array
 	 */
-	public function remove_pages_from_wp_list_pages( $exclude_array ) {
-		return  array_merge( $exclude_array, $this->registry->CFG->core->get_critical_pages_array() );
+	public function remove_pages_from_wp_list_pages($exclude_array) {
+		return  array_merge($exclude_array, $this->registry->CFG->core->get_critical_pages_array());
 	}
 
 
@@ -558,37 +558,37 @@ 
 		// unlike other systems, EE_System_scripts loading is turned ON by default,
 		// but prior to the init hook, can be turned off via:
 		// add_filter( 'FHEE_load_EE_System_scripts', '__return_false' );
-		if ( apply_filters( 'FHEE_load_EE_System_scripts', TRUE ) ) {
+		if (apply_filters('FHEE_load_EE_System_scripts', TRUE)) {
 			// similarly, jquery_validate loading is turned OFF by default,
 			// but prior to the wp_enqueue_scripts hook, can be turned back on again via:
 			// add_filter( 'FHEE_load_jquery_validate', '__return_true' );
 			// register jQuery Validate
-			if ( apply_filters( 'FHEE_load_jquery_validate', FALSE ) ) {
+			if (apply_filters('FHEE_load_jquery_validate', FALSE)) {
 				wp_register_script(
 					'jquery-validate',
-					EE_GLOBAL_ASSETS_URL . 'scripts/jquery.validate.min.js',
-					array( 'jquery' ),
+					EE_GLOBAL_ASSETS_URL.'scripts/jquery.validate.min.js',
+					array('jquery'),
 					'1.15.0',
 					true
 				);
 				wp_register_script(
 					'jquery-validate-extra-methods',
-					EE_GLOBAL_ASSETS_URL . 'scripts/jquery.validate.additional-methods.min.js',
-					array( 'jquery-validate' ),
+					EE_GLOBAL_ASSETS_URL.'scripts/jquery.validate.additional-methods.min.js',
+					array('jquery-validate'),
 					'1.15.0',
 					true
 				);
 			}
 			wp_register_script(
 				'select2',
-				EE_GLOBAL_ASSETS_URL . 'scripts/select2.min.js',
+				EE_GLOBAL_ASSETS_URL.'scripts/select2.min.js',
 				array(),
 				'4.0.2',
 				true
 			);
 			wp_register_style(
 				'select2',
-				EE_GLOBAL_ASSETS_URL . 'css/select2.min.css',
+				EE_GLOBAL_ASSETS_URL.'css/select2.min.css',
 				array(),
 				'4.0.2',
 				'all'
@@ -695,9 +695,9 @@ 
 	 * @param $admin_bar
 	 * @return    void
 	 */
-	public function espresso_toolbar_items( $admin_bar ) {
+	public function espresso_toolbar_items($admin_bar) {
 		EE_Error::doing_it_wrong(
-			__METHOD__ . "()",
+			__METHOD__."()",
 			__(
 				'Event Espresso admin toolbar items have already been added. But if it\'s really necessary, you can find the new method here: \EventEspresso\Core\Services\AdminToolbarItems::addToolbarItems().',
 				'event_espresso'

core/EE_Data_Migration_Manager.core.php

Spacing +213 added lines, -213 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 {
 
 	/**
 	 *
@@ -133,7 +133,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;
@@ -146,7 +146,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();
 	}
@@ -156,7 +156,7 @@ 
 	/**
 	 * constructor
 	 */
-	private function __construct(){
+	private function __construct() {
 		$this->stati_that_indicate_to_continue_migrations = array(
 			self::status_continue,
 			self::status_completed
@@ -184,14 +184,14 @@ 
 	 */
 	protected function _load_dms_classes() {
 		static $loaded = false;
-		if ( ! $loaded ) {
+		if ( ! $loaded) {
 			//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( $this ), 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($this), 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);
 			$loaded = true;
 		}
 	}
@@ -206,21 +206,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){
-		$plugin_slug_and_version_string = str_replace( EE_Data_Migration_Manager::data_migration_script_option_prefix, '', $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
-			$version_string = $parts[1] . '.' . $parts[2] . '.' . $parts[3]; //eg 4.1.0
-		}else{
+			$plugin_slug = $parts[0]; //eg Core
+			$version_string = $parts[1].'.'.$parts[2].'.'.$parts[3]; //eg 4.1.0
+		} 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);
 	}
 
 	/**
@@ -231,22 +231,22 @@ 
 	 * @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) {
 		$this->_load_dms_classes();
 		$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));
 		}
 	}
 	/**
@@ -258,35 +258,35 @@ 
 	 *                  (but also has a few legacy arrays in there - which should probably be ignored)
 	 * @throws \EE_Error
 	 */
-	public function get_data_migrations_ran(){
-		if( ! $this->_data_migrations_ran ){
+	public function get_data_migrations_ran() {
+		if ( ! $this->_data_migrations_ran) {
 			$this->_load_dms_classes();
 			//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();
 			}
 		}
@@ -304,7 +304,7 @@ 
 	 * @return mixed string or int
 	 * @throws \EE_Error
 	 */
-	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);
 		return $script->get_mapping_new_pk($old_table, $old_pk, $new_table);
 	}
@@ -314,9 +314,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);
 	}
 
 	/**
@@ -324,8 +324,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'));
 	}
 
 	/**
@@ -337,11 +337,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'] );
 	}
 
 	/**
@@ -350,10 +350,10 @@ 
 	 * @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_(.*)_(\d*)_(\d*)_(\d*)~', $classname, $matches );
-		if ( ! $matches || ! isset( $matches[1], $matches[2], $matches[3] ) ) {
+		preg_match('~EE_DMS_(.*)_(\d*)_(\d*)_(\d*)~', $classname, $matches);
+		if ( ! $matches || ! isset($matches[1], $matches[2], $matches[3])) {
 			throw new EE_Error(
 				sprintf(
 					__(
@@ -366,9 +366,9 @@ 
 		}
 		return array(
 			'slug' => $matches[1],
-			'major_version' => (int)$matches[2],
-			'minor_version' => (int)$matches[3],
-			'micro_version' => (int)$matches[4]
+			'major_version' => (int) $matches[2],
+			'minor_version' => (int) $matches[3],
+			'micro_version' => (int) $matches[4]
 		);
 	}
 
@@ -381,33 +381,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) {
 			// set default
 			//echo "4.1.0 is SMALLER than $previous_version_installed";
-			$db_state = array( 'Core' => EVENT_ESPRESSO_VERSION );
+			$db_state = array('Core' => EVENT_ESPRESSO_VERSION);
 			//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);
 			}
-			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;
 	}
@@ -420,7 +420,7 @@ 
 	 * @return EE_Data_Migration_Script_Base[]
 	 * @throws EE_Error
 	 */
-	public function check_for_applicable_data_migration_scripts(){
+	public function check_for_applicable_data_migration_scripts() {
 		$this->_load_dms_classes();
 		//get the option describing what options have already run
 		$scripts_ran = $this->get_data_migrations_ran();
@@ -434,37 +434,37 @@ 
 		$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(
+				if (
 					! $scripts_ran
 					|| ! isset(
 						$scripts_ran[$script_converts_plugin_slug],
 						$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(
+				} 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 (
@@ -472,11 +472,11 @@ 
 						&& $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;
+							$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'];
-							unset( $script_class_and_filepaths_available[ $classname ] );
+							$next_database_state_to_consider[$migrates_to_version['slug']] = $migrates_to_version['version'];
+							unset($script_class_and_filepaths_available[$classname]);
 					}/*else {
 							//it must have a status that indicates it has finished, so we don't want to try and run it again
 						}*/
@@ -488,19 +488,19 @@ 
 				}*/
 			}
 			$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;
 	}
 
@@ -516,14 +516,14 @@ 
 	 * @return EE_Data_Migration_Script_Base
 	 * @throws \EE_Error
 	 */
-	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;
 		}
 	}
@@ -546,23 +546,23 @@ 
 	 * 		@type string $message string describing what was done during this step
 	 * }
 	 */
-	public function migration_step( $step_size = 0 ){
+	public function migration_step($step_size = 0) {
 
 		//bandaid fix for issue https://events.codebasehq.com/projects/event-espresso/tickets/7535
-		if ( class_exists( 'EE_CPT_Strategy' ) ) {
-			remove_action( 'pre_get_posts', array( EE_CPT_Strategy::instance(), 'pre_get_posts' ), 5 );
+		if (class_exists('EE_CPT_Strategy')) {
+			remove_action('pre_get_posts', array(EE_CPT_Strategy::instance(), 'pre_get_posts'), 5);
 		}
 
-		try{
+		try {
 			$currently_executing_script = $this->get_last_ran_script();
-			if( ! $currently_executing_script){
+			if ( ! $currently_executing_script) {
 				//Find the next script that needs to execute
 				$scripts = $this->check_for_applicable_data_migration_scripts();
-				if( ! $scripts ){
+				if ( ! $scripts) {
 					//huh, no more scripts to run... apparently we're done!
 					//but dont forget to make sure initial data is there
 					//we should be good to allow them to exit maintenance mode now
-					EE_Maintenance_Mode::instance()->set_maintenance_level( EE_Maintenance_Mode::level_0_not_in_maintenance );
+					EE_Maintenance_Mode::instance()->set_maintenance_level(EE_Maintenance_Mode::level_0_not_in_maintenance);
 					//saving migrations ran should actually be unnecessary, but leaving in place just in case
 					//remember this migration was finished (even if we timeout initializing db for core and plugins)
 					$this->_save_migrations_ran();
@@ -579,18 +579,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,
@@ -601,15 +601,15 @@ 
 		}
 		$init_dbs = false;
 		//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?
-			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(),
@@ -621,18 +621,18 @@ 
 				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( EE_Maintenance_Mode::level_0_not_in_maintenance );
+						EE_Maintenance_Mode::instance()->set_maintenance_level(EE_Maintenance_Mode::level_0_not_in_maintenance);
 						////huh, no more scripts to run... apparently we're done!
 						//but dont forget to make sure initial data is there
 						$init_dbs = true;
@@ -644,39 +644,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;
@@ -696,23 +696,23 @@ 
 	 * 'script'=>a pretty name of the script currently running
 	 * @throws \EE_Error
 	 */
-	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;
 	}
 
@@ -725,14 +725,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 = (array)get_option( self::current_database_state, array() );
-		$current_database_state[ $slug_and_version[ 'slug' ] ] = $slug_and_version[ 'version' ];
-		update_option(self::current_database_state,$current_database_state);
+		$current_database_state = (array) get_option(self::current_database_state, array());
+		$current_database_state[$slug_and_version['slug']] = $slug_and_version['version'];
+		update_option(self::current_database_state, $current_database_state);
 	}
 
 	/**
@@ -743,20 +743,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' ];
-		$current_database_state = (array)get_option( self::current_database_state, array() );
-		if( ! isset( $current_database_state[ $slug ] ) ) {
+		$slug = $slug_and_version['slug'];
+		$version = $slug_and_version['version'];
+		$current_database_state = (array) get_option(self::current_database_state, array());
+		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;
 				}
@@ -772,28 +772,28 @@ 
 	 * @return array keys are expected classnames, values are their filepaths
 	 * @throws \EE_Error
 	 */
-	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->_load_dms_classes();
 			$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' && ! EE_Registry::instance()->get_addon_by_name( $slug ) ) {
+					if ($slug !== 'Core' && ! EE_Registry::instance()->get_addon_by_name($slug)) {
 						EE_Error::doing_it_wrong(
 							__FUNCTION__,
 							sprintf(
@@ -830,7 +830,7 @@ 
 	 * from each addon, and check if they need updating,
 	 * @return boolean
 	 */
-	public function addons_need_updating(){
+	public function addons_need_updating() {
 		return false;
 	}
 	/**
@@ -839,21 +839,21 @@ 
 	 * @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 = (array)$wpdb->get_row(
+		$last_migration_script_option = (array) $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'] )
+		$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'] )
+		$versions_migrated_to = isset($last_migration_script_option['option_name'])
 			? str_replace(
 				EE_Data_Migration_Manager::data_migration_script_option_prefix,
 				'',
@@ -863,14 +863,14 @@ 
 
 		//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(
+		if (
 			$last_ran_migration_script_properties['_status'] !== self::status_completed
-			&& isset( $last_ran_migration_script_properties['class'], $last_ran_migration_script_properties['_status'] )
-		){
+			&& isset($last_ran_migration_script_properties['class'], $last_ran_migration_script_properties['_status'])
+		) {
 			//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();
@@ -880,9 +880,9 @@ 
 			$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);
 
 	}
 	/**
@@ -891,29 +891,29 @@ 
 	 * @return mixed TRUE if successfully saved migrations ran, string if an error occurred
 	 * @throws \EE_Error
 	 */
-	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>";
 				$option_name = self::data_migration_script_option_prefix.$plugin_slug.'.'.$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;
 				}
@@ -937,27 +937,27 @@ 
 	 * @return EE_Data_Migration_Script_Base
 	 * @throws EE_Error
 	 */
-	public function _instantiate_script_from_properties_array($properties_array){
-		if ( ! isset( $properties_array['class'] ) ) {
+	public 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 )
+					implode(',', $properties_array)
 				)
 			);
 		}
 		$this->_load_dms_classes();
 		$class_name = $properties_array['class'];
-		if ( ! class_exists( $class_name ) ) {
+		if ( ! class_exists($class_name)) {
 			throw new EE_Error(
-				sprintf( __( 'There is no migration script named %s', 'event_espresso' ), $class_name )
+				sprintf(__('There is no migration script named %s', 'event_espresso'), $class_name)
 			);
 		}
 		$class = new $class_name;
-		if ( ! $class instanceof EE_Data_Migration_Script_Base ) {
+		if ( ! $class instanceof EE_Data_Migration_Script_Base) {
 			throw new EE_Error(
 				sprintf(
 					__(
@@ -965,11 +965,11 @@ 
 						'event_espresso'
 					),
 					$class_name,
-					get_class( $class )
+					get_class($class)
 				)
 			);
 		}
-		$class->instantiate_from_array_of_properties( $properties_array );
+		$class->instantiate_from_array_of_properties($properties_array);
 		return $class;
 	}
 
@@ -980,28 +980,28 @@ 
 	 * @return string
 	 * @throws \EE_Error
 	 */
-	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;
 				}
@@ -1023,11 +1023,11 @@ 
 	 * @return EE_Data_Migration_Script_Base
 	 * @throws \EE_Error
 	 */
-	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 ], $migrations_ran[ $plugin_slug ][ $version ] ) ){
-			return $migrations_ran[ $plugin_slug ][ $version ];
-		}else{
+		if (isset($migrations_ran[$plugin_slug], $migrations_ran[$plugin_slug][$version])) {
+			return $migrations_ran[$plugin_slug][$version];
+		} else {
 			return NULL;
 		}
 	}
@@ -1039,26 +1039,26 @@ 
 	 * @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{
+		} else {
 			throw new EE_Error(
 				sprintf(
 					__(
 						'Unable to reattempt the last ran migration script because it was not a valid migration script. || It was %s',
 						'event_espresso'
 					),
-					print_r( $last_ran_script, true )
+					print_r($last_ran_script, true)
 				)
 			);
 		}
@@ -1072,19 +1072,19 @@ 
 	 * @return boolean
 	 * @throws \EE_Error
 	 */
-	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);
 	}
 
 
@@ -1099,25 +1099,25 @@ 
 	public function initialize_db_for_enqueued_ee_plugins() {
 //		EEH_Debug_Tools::instance()->start_timer( 'initialize_db_for_enqueued_ee_plugins' );
 		$queue = $this->get_db_initialization_queue();
-		foreach( $queue as $plugin_slug ) {
-			$most_up_to_date_dms = $this->get_most_up_to_date_dms( $plugin_slug );
-			if( ! $most_up_to_date_dms ) {
+		foreach ($queue as $plugin_slug) {
+			$most_up_to_date_dms = $this->get_most_up_to_date_dms($plugin_slug);
+			if ( ! $most_up_to_date_dms) {
 				//if there is NO DMS for this plugin, obviously there's no schema to verify anyways
 				$verify_db = false;
-			}else{
-				$most_up_to_date_dms_migrates_to = $this->script_migrates_to_version( $most_up_to_date_dms );
-				$verify_db = $this->database_needs_updating_to( $most_up_to_date_dms_migrates_to );
+			} else {
+				$most_up_to_date_dms_migrates_to = $this->script_migrates_to_version($most_up_to_date_dms);
+				$verify_db = $this->database_needs_updating_to($most_up_to_date_dms_migrates_to);
 			}
-			if( $plugin_slug === 'Core' ){
+			if ($plugin_slug === 'Core') {
 				EE_Activation_Manager::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 ) {
-						$addon->initialize_db_if_no_migrations_required( $verify_db );
+				foreach (EE_Registry::instance()->addons as $addon) {
+					if ($addon->name() === $plugin_slug) {
+						$addon->initialize_db_if_no_migrations_required($verify_db);
 						break;
 					}
 				}
@@ -1127,7 +1127,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);
 	}
 
 	/**
@@ -1136,7 +1136,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());
 	}
 }

core/EE_Load_Espresso_Core.core.php

Spacing +68 added lines, -68 removed lines

@@ -1,6 +1,6 @@ 
 <?php
-if ( ! defined( 'EVENT_ESPRESSO_VERSION' ) ) {
-	exit( 'No direct script access allowed' );
+if ( ! defined('EVENT_ESPRESSO_VERSION')) {
+	exit('No direct script access allowed');
 }
 
 /**
@@ -71,7 +71,7 @@ 
 	 */
 	public static function instance() {
 		// check if class object is instantiated
-		if ( ! self::$_instance instanceof EE_Load_Espresso_Core ) {
+		if ( ! self::$_instance instanceof EE_Load_Espresso_Core) {
 			self::$_instance = new self();
 		}
 		return self::$_instance;
@@ -85,7 +85,7 @@ 
 	 */
 	private function __construct() {
 		// PSR4 Autoloaders
-		espresso_load_required( 'EE_Psr4AutoloaderInit', EE_CORE . 'EE_Psr4AutoloaderInit.core.php' );
+		espresso_load_required('EE_Psr4AutoloaderInit', EE_CORE.'EE_Psr4AutoloaderInit.core.php');
 		new EE_Psr4AutoloaderInit();
 	}
 
@@ -96,40 +96,40 @@ 
 	 * @param    EE_Response $response
 	 * @throws \EE_Error
 	 */
-	private function init( EE_Request $request, EE_Response $response ) {
+	private function init(EE_Request $request, EE_Response $response) {
 		static $initialized = false;
-		if ( ! $initialized ) {
+		if ( ! $initialized) {
 			// load text domain right away so that any error messages can be translated asap
-			espresso_load_required( 'EE_Load_Textdomain', EE_CORE . 'EE_Load_Textdomain.core.php' );
-			espresso_load_required( 'EEH_Sideloader', EE_CORE . 'helpers' . DS . 'EEH_Sideloader.helper.php' );
-			EE_Load_Textdomain::set_sideloader( new EEH_Sideloader() );
+			espresso_load_required('EE_Load_Textdomain', EE_CORE.'EE_Load_Textdomain.core.php');
+			espresso_load_required('EEH_Sideloader', EE_CORE.'helpers'.DS.'EEH_Sideloader.helper.php');
+			EE_Load_Textdomain::set_sideloader(new EEH_Sideloader());
 			EE_Load_Textdomain::load_textdomain();
 			// deprecated functions
-			espresso_load_required( 'EE_Deprecated', EE_CORE . 'EE_Deprecated.core.php' );
+			espresso_load_required('EE_Deprecated', EE_CORE.'EE_Deprecated.core.php');
 			// load interfaces
 			espresso_load_required(
 				'EEI_Payment_Method_Interfaces',
-				EE_LIBRARIES . 'payment_methods' . DS . 'EEI_Payment_Method_Interfaces.php'
+				EE_LIBRARIES.'payment_methods'.DS.'EEI_Payment_Method_Interfaces.php'
 			);
 			// workarounds for PHP < 5.3
-			espresso_load_required( 'EEH_Class_Tools', EE_HELPERS . 'EEH_Class_Tools.helper.php' );
+			espresso_load_required('EEH_Class_Tools', EE_HELPERS.'EEH_Class_Tools.helper.php');
 			// manages activations, upgrades, and migrations
-			espresso_load_required( 'EE_Activation_Manager', EE_CORE . 'EE_Activation_Manager.core.php' );
+			espresso_load_required('EE_Activation_Manager', EE_CORE.'EE_Activation_Manager.core.php');
 			$this->activationManager = EE_Activation_Manager::instance(
 				EE_Maintenance_Mode::instance()
 			);
 			// info about how to load classes required by other classes
-			$this->dependency_map = $this->_load_dependency_map( $request, $response );
+			$this->dependency_map = $this->_load_dependency_map($request, $response);
 			// now setup the first core
 			$this->getEspressoCore();
 			//$this->activationManager->setEspressoCore( $this->espressoCore );
 			// central repository for classes
-			espresso_load_required( 'EE_Registry', EE_CORE . 'EE_Registry.core.php' );
+			espresso_load_required('EE_Registry', EE_CORE.'EE_Registry.core.php');
 			// allow addons to load first so that they can register autoloaders, set hooks for running DMS's, etc
-			add_action( 'AHEE__EE_Bootstrap__load_espresso_addons', array( $this, 'loadAddonsAndSetCaps' ) );
+			add_action('AHEE__EE_Bootstrap__load_espresso_addons', array($this, 'loadAddonsAndSetCaps'));
 			// when an ee addon is activated, we want to call the core hook(s) again
 			// because the newly-activated addon didn't get a chance to run at all
-			add_action( 'activate_plugin', array( $this, 'loadAddonsAndSetCaps' ), 10 );
+			add_action('activate_plugin', array($this, 'loadAddonsAndSetCaps'), 10);
 			$initialized = true;
 		}
 	}
@@ -149,9 +149,9 @@ 
 	 * @throws \RuntimeException
 	 * @throws \EE_Error
 	 */
-	public function handle_request( EE_Request $request, EE_Response $response ) {
-		$this->init( $request, $response );
-		$this->initializeEspressoCore( $request, $response );
+	public function handle_request(EE_Request $request, EE_Response $response) {
+		$this->init($request, $response);
+		$this->initializeEspressoCore($request, $response);
 		return $this->espressoCore->response();
 	}
 
@@ -164,27 +164,27 @@ 
 	 * @throws \RuntimeException
 	 * @throws \EE_Error
 	 */
-	protected function initializeEspressoCore( EE_Request $request, EE_Response $response ) {
-		$this->espressoCore->set_request( $request );
-		$this->espressoCore->set_response( $response );
+	protected function initializeEspressoCore(EE_Request $request, EE_Response $response) {
+		$this->espressoCore->set_request($request);
+		$this->espressoCore->set_response($response);
 		// EE_Registry
-		$this->espressoCore->set_registry( EE_Registry::instance() );
-		$this->espressoCore->registry()->set_dependency_map( $this->dependency_map() );
-		$this->espressoCore->registry()->set_request( $this->espressoCore->request() );
-		$this->espressoCore->registry()->set_response( $this->espressoCore->response() );
+		$this->espressoCore->set_registry(EE_Registry::instance());
+		$this->espressoCore->registry()->set_dependency_map($this->dependency_map());
+		$this->espressoCore->registry()->set_request($this->espressoCore->request());
+		$this->espressoCore->registry()->set_response($this->espressoCore->response());
 		$this->espressoCore->registry()->initialize();
 		// WP cron jobs
-		$this->espressoCore->registry()->load_core( 'Cron_Tasks' );
-		$this->espressoCore->registry()->load_core( 'Request_Handler' );
+		$this->espressoCore->registry()->load_core('Cron_Tasks');
+		$this->espressoCore->registry()->load_core('Request_Handler');
 		// load EE_System
 		$this->espressoCore->set_system(
-			$this->espressoCore->registry()->load_core( 'EE_System' )
+			$this->espressoCore->registry()->load_core('EE_System')
 		);
-		$this->espressoCore->system()->set_registry( $this->espressoCore->registry() );
-		$this->espressoCore->system()->set_request( $this->espressoCore->request() );
-		$this->espressoCore->system()->set_response( $this->espressoCore->response() );
+		$this->espressoCore->system()->set_registry($this->espressoCore->registry());
+		$this->espressoCore->system()->set_request($this->espressoCore->request());
+		$this->espressoCore->system()->set_response($this->espressoCore->response());
 		// pass core to Activation Manager
-		$this->activationManager->setEspressoCore( $this->espressoCore );
+		$this->activationManager->setEspressoCore($this->espressoCore);
 	}
 
 
@@ -193,15 +193,15 @@ 
 	 * @param  int $blog_id
 	 * @return \EspressoCore
 	 */
-	protected function getEspressoCore( $blog_id = 0 ) {
-		$blog_id = ! empty( $blog_id ) ? $blog_id : get_current_blog_id();
+	protected function getEspressoCore($blog_id = 0) {
+		$blog_id = ! empty($blog_id) ? $blog_id : get_current_blog_id();
 		if (
-			! isset( $this->espressoCoreCache[ $blog_id ] )
-			|| ! $this->espressoCoreCache[ $blog_id ] instanceof \EspressoCore
+			! isset($this->espressoCoreCache[$blog_id])
+			|| ! $this->espressoCoreCache[$blog_id] instanceof \EspressoCore
 		) {
-			$this->espressoCoreCache[ $blog_id ] = new \EspressoCore();
+			$this->espressoCoreCache[$blog_id] = new \EspressoCore();
 		}
-		$this->espressoCore = $this->espressoCoreCache[ $blog_id ];
+		$this->espressoCore = $this->espressoCoreCache[$blog_id];
 		return $this->espressoCore;
 	}
 
@@ -212,11 +212,11 @@ 
 	 * @throws \EE_Error
 	 */
 	public function dependency_map() {
-		if ( ! $this->dependency_map instanceof EE_Dependency_Map ) {
+		if ( ! $this->dependency_map instanceof EE_Dependency_Map) {
 			throw new EE_Error(
 				sprintf(
-					__( 'Invalid EE_Dependency_Map: "%1$s"', 'event_espresso' ),
-					print_r( $this->dependency_map, true )
+					__('Invalid EE_Dependency_Map: "%1$s"', 'event_espresso'),
+					print_r($this->dependency_map, true)
 				)
 			);
 		}
@@ -233,16 +233,16 @@ 
 	 * @param    EE_Response $response
 	 * 	@return EE_Dependency_Map
 	 */
-	private function _load_dependency_map( EE_Request $request, EE_Response $response ) {
-		if ( ! is_readable( EE_CORE . 'EE_Dependency_Map.core.php' ) ) {
+	private function _load_dependency_map(EE_Request $request, EE_Response $response) {
+		if ( ! is_readable(EE_CORE.'EE_Dependency_Map.core.php')) {
 			EE_Error::add_error(
-				__( 'The EE_Dependency_Map core class could not be loaded.', 'event_espresso' ),
+				__('The EE_Dependency_Map core class could not be loaded.', 'event_espresso'),
 				__FILE__, __FUNCTION__, __LINE__
 			);
-			wp_die( EE_Error::get_notices() );
+			wp_die(EE_Error::get_notices());
 		}
-		require_once( EE_CORE . 'EE_Dependency_Map.core.php' );
-		return EE_Dependency_Map::instance( $request, $response );
+		require_once(EE_CORE.'EE_Dependency_Map.core.php');
+		return EE_Dependency_Map::instance($request, $response);
 	}
 
 
@@ -254,12 +254,12 @@ 
 	 * @param  int $blog_id
 	 * @return bool
 	 */
-	protected function unsetEspressoCore( $blog_id = 0 ) {
-		$blog_id = ! empty( $blog_id ) ? $blog_id : 0;
-		if ( ! $blog_id ) {
+	protected function unsetEspressoCore($blog_id = 0) {
+		$blog_id = ! empty($blog_id) ? $blog_id : 0;
+		if ( ! $blog_id) {
 			return false;
 		}
-		unset( $this->espressoCoreCache[ $blog_id ] );
+		unset($this->espressoCoreCache[$blog_id]);
 		return true;
 	}
 
@@ -281,16 +281,16 @@ 
 		try {
 			// set autoloaders for all of the classes implementing EEI_Plugin_API
 			// which provide helpers for EE plugin authors to more easily register certain components with EE.
-			EEH_Autoloader::instance()->register_autoloaders_for_each_file_in_folder( EE_LIBRARIES . 'plugin_api' );
-		} catch ( Exception $e ) {
-			EE_Error::add_error( $e->getMessage(), __FILE__, __FUNCTION__, __LINE__ );
+			EEH_Autoloader::instance()->register_autoloaders_for_each_file_in_folder(EE_LIBRARIES.'plugin_api');
+		} catch (Exception $e) {
+			EE_Error::add_error($e->getMessage(), __FILE__, __FUNCTION__, __LINE__);
 		}
 		//load and setup EE_Capabilities
-		$this->espressoCore->registry()->load_core( 'Capabilities' );
+		$this->espressoCore->registry()->load_core('Capabilities');
 		//caps need to be initialized on every request so that capability maps are set.
 		//@see https://events.codebasehq.com/projects/event-espresso/tickets/8674
 		$this->espressoCore->registry()->CAP->init_caps();
-		do_action( 'AHEE__EE_System__load_espresso_addons' );
+		do_action('AHEE__EE_System__load_espresso_addons');
 	}
 
 
@@ -304,13 +304,13 @@ 
 	 * @param \EE_Request $request
 	 * @param \EE_Response $response
 	 */
-	public function handle_response( EE_Request $request, EE_Response $response ) {
+	public function handle_response(EE_Request $request, EE_Response $response) {
 		//\EEH_Debug_Tools::printr( __FUNCTION__, __CLASS__, __FILE__, __LINE__, 2 );
 		//EEH_Debug_Tools::printr( $request, '$request', __FILE__, __LINE__ );
 		//EEH_Debug_Tools::printr( $response, '$response', __FILE__, __LINE__ );
 		//die();
-		if ( $response->plugin_deactivated() ) {
-			espresso_deactivate_plugin( EE_PLUGIN_BASENAME );
+		if ($response->plugin_deactivated()) {
+			espresso_deactivate_plugin(EE_PLUGIN_BASENAME);
 		}
 	}
 
@@ -325,8 +325,8 @@ 
 	 * @throws \EE_Error
 	 * @throws \RuntimeException
 	 */
-	public static function switchToBlog( $blog_id = 0 ) {
-		\EE_Load_Espresso_Core::instance()->getEspressoCore( $blog_id );
+	public static function switchToBlog($blog_id = 0) {
+		\EE_Load_Espresso_Core::instance()->getEspressoCore($blog_id);
 		\EE_Load_Espresso_Core::instance()->initializeEspressoCore(
 			EE_Bootstrap::get_request(),
 			EE_Bootstrap::get_response()
@@ -340,8 +340,8 @@ 
 	 * @return \EE_Registry
 	 * @throws \EE_Error
 	 */
-	public static function getRegistryForBlog( $blog_id = 0 ) {
-		\EE_Load_Espresso_Core::instance()->getEspressoCore( $blog_id );
+	public static function getRegistryForBlog($blog_id = 0) {
+		\EE_Load_Espresso_Core::instance()->getEspressoCore($blog_id);
 		return \EE_Load_Espresso_Core::instance()->espressoCore->registry();
 	}
 
@@ -352,9 +352,9 @@ 
 	 * @param \EE_Registry $registry
 	 * @throws \EE_Error
 	 */
-	public static function setRegistryForBlog( \EE_Registry $registry, $blog_id = 0 ) {
-		\EE_Load_Espresso_Core::instance()->getEspressoCore( $blog_id );
-		\EE_Load_Espresso_Core::instance()->espressoCore->set_registry( $registry );
+	public static function setRegistryForBlog(\EE_Registry $registry, $blog_id = 0) {
+		\EE_Load_Espresso_Core::instance()->getEspressoCore($blog_id);
+		\EE_Load_Espresso_Core::instance()->espressoCore->set_registry($registry);
 	}
 
 

core/EE_Dependency_Map.core.php

Spacing +28 added lines, -28 removed lines

@@ -1,6 +1,6 @@ 
 <?php
-if ( ! defined( 'EVENT_ESPRESSO_VERSION' ) ) {
-	exit( 'No direct script access allowed' );
+if ( ! defined('EVENT_ESPRESSO_VERSION')) {
+	exit('No direct script access allowed');
 }
 
 
@@ -70,11 +70,11 @@ 
 	 * @param  \EE_Request  $request
 	 * @param  \EE_Response $response
 	 */
-	protected function __construct( EE_Request $request, EE_Response $response ) {
+	protected function __construct(EE_Request $request, EE_Response $response) {
 		$this->_request = $request;
 		$this->_response = $response;
 		$this->initialize();
-		do_action( 'EE_Dependency_Map____construct' );
+		do_action('EE_Dependency_Map____construct');
 	}
 
 
@@ -95,10 +95,10 @@ 
 	 * @param  \EE_Response $response
 	 * @return \EE_Dependency_Map instance
 	 */
-	public static function instance( EE_Request $request = null, EE_Response $response = null ) {
+	public static function instance(EE_Request $request = null, EE_Response $response = null) {
 		// check if class object is instantiated, and instantiated properly
-		if ( ! self::$_instance instanceof EE_Dependency_Map ) {
-			self::$_instance = new EE_Dependency_Map( $request, $response );
+		if ( ! self::$_instance instanceof EE_Dependency_Map) {
+			self::$_instance = new EE_Dependency_Map($request, $response);
 		}
 		return self::$_instance;
 	}
@@ -110,9 +110,9 @@ 
 	 * @param array  $dependencies
 	 * @return boolean
 	 */
-	public static function register_dependencies( $class, $dependencies ) {
-		if ( ! isset( self::$_instance->_dependency_map[ $class ] ) ) {
-			self::$_instance->_dependency_map[ $class ] = (array)$dependencies;
+	public static function register_dependencies($class, $dependencies) {
+		if ( ! isset(self::$_instance->_dependency_map[$class])) {
+			self::$_instance->_dependency_map[$class] = (array) $dependencies;
 			return true;
 		}
 		return false;
@@ -126,18 +126,18 @@ 
 	 * @return bool
 	 * @throws \EE_Error
 	 */
-	public static function register_class_loader( $class_name, $loader = 'load_core' ) {
+	public static function register_class_loader($class_name, $loader = 'load_core') {
 		// check that loader method starts with "load_" and exists in EE_Registry
-		if ( strpos( $loader, 'load_' ) !== 0 || ! method_exists( 'EE_Registry', $loader ) ) {
+		if (strpos($loader, 'load_') !== 0 || ! method_exists('EE_Registry', $loader)) {
 			throw new EE_Error(
 				sprintf(
-					__( '"%1$s" is not a valid loader method on EE_Registry.', 'event_espresso' ),
+					__('"%1$s" is not a valid loader method on EE_Registry.', 'event_espresso'),
 					$loader
 				)
 			);
 		}
-		if ( ! isset( self::$_instance->_class_loaders[ $class_name ] ) ) {
-			self::$_instance->_class_loaders[ $class_name ] = $loader;
+		if ( ! isset(self::$_instance->_class_loaders[$class_name])) {
+			self::$_instance->_class_loaders[$class_name] = $loader;
 			return true;
 		}
 		return false;
@@ -178,8 +178,8 @@ 
 	 * @param string $class_name
 	 * @return boolean
 	 */
-	public function has( $class_name = '' ) {
-		return isset( $this->_dependency_map[ $class_name ] ) ? true : false;
+	public function has($class_name = '') {
+		return isset($this->_dependency_map[$class_name]) ? true : false;
 	}
 
 
@@ -191,8 +191,8 @@ 
 	 * @param string $dependency
 	 * @return bool
 	 */
-	public function has_dependency_for_class( $class_name = '', $dependency = '' ) {
-		return isset( $this->_dependency_map[ $class_name ], $this->_dependency_map[ $class_name ][ $dependency ] )
+	public function has_dependency_for_class($class_name = '', $dependency = '') {
+		return isset($this->_dependency_map[$class_name], $this->_dependency_map[$class_name][$dependency])
 			? true
 			: false;
 	}
@@ -206,9 +206,9 @@ 
 	 * @param string $dependency
 	 * @return int
 	 */
-	public function loading_strategy_for_class_dependency( $class_name = '', $dependency = '' ) {
-		return $this->has_dependency_for_class( $class_name, $dependency )
-			? $this->_dependency_map[ $class_name ][ $dependency ]
+	public function loading_strategy_for_class_dependency($class_name = '', $dependency = '') {
+		return $this->has_dependency_for_class($class_name, $dependency)
+			? $this->_dependency_map[$class_name][$dependency]
 			: EE_Dependency_Map::not_registered;
 	}
 
@@ -218,8 +218,8 @@ 
 	 * @param string $class_name
 	 * @return string | Closure
 	 */
-	public function class_loader( $class_name ) {
-		return isset( $this->_class_loaders[ $class_name ] ) ? $this->_class_loaders[ $class_name ] : '';
+	public function class_loader($class_name) {
+		return isset($this->_class_loaders[$class_name]) ? $this->_class_loaders[$class_name] : '';
 	}
 
 
@@ -361,17 +361,17 @@ 
 			'EE_Messages_Data_Handler_Collection'  => 'load_lib',
 			'EE_Message_Template_Group_Collection' => 'load_lib',
 			'EE_Messages_Generator' => function() {
-				return EE_Registry::instance()->load_lib( 'Messages_Generator', array(), false, false );
+				return EE_Registry::instance()->load_lib('Messages_Generator', array(), false, false);
 			},
-			'EE_Messages_Template_Defaults' => function( $arguments = array() ) {
-				return EE_Registry::instance()->load_lib( 'Messages_Template_Defaults', $arguments, false, false );
+			'EE_Messages_Template_Defaults' => function($arguments = array()) {
+				return EE_Registry::instance()->load_lib('Messages_Template_Defaults', $arguments, false, false);
 			},
 			//load_model
 			'EEM_Message_Template_Group'           => 'load_model',
 			'EEM_Message_Template'                 => 'load_model',
 			//load_helper
 			'EEH_Parse_Shortcodes'                 => function() {
-				if ( EE_Registry::instance()->load_helper( 'Parse_Shortcodes' ) ) {
+				if (EE_Registry::instance()->load_helper('Parse_Shortcodes')) {
 					return new EEH_Parse_Shortcodes();
 				}
 				return null;

core/middleware/EE_Recommended_Versions.core.php

Spacing +20 added lines, -20 removed lines

@@ -22,32 +22,32 @@ 
 	 * @param 	EE_Response $response
 	 * @return 	EE_Response
 	 */
-	public function handle_request( EE_Request $request, EE_Response $response ) {
+	public function handle_request(EE_Request $request, EE_Response $response) {
 		$this->request = $request;
 		$this->response = $response;
 		//$this->response->add_output( "\n\t IN >>  " . __CLASS__ );
 		//$this->response->set_notice( 1, 'hey look at this' );
 		// check required WP version
-		if ( ! $this->_minimum_wp_version_required() ) {
-			$this->request->un_set( 'activate', true );
-			add_action( 'admin_notices', array( $this, 'minimum_wp_version_error' ), 1 );
+		if ( ! $this->_minimum_wp_version_required()) {
+			$this->request->un_set('activate', true);
+			add_action('admin_notices', array($this, 'minimum_wp_version_error'), 1);
 			//$this->response->add_output( "\n<br />" . 'minimum_wp_version_error' );
 			$this->response->terminate_request();
 			$this->response->deactivate_plugin();
 		}
 		// check required PHP version
-		if ( ! $this->_minimum_php_version_required() ) {
-			$this->request->un_set( 'activate', true );
-			add_action( 'admin_notices', array( $this, 'minimum_php_version_error' ), 1 );
+		if ( ! $this->_minimum_php_version_required()) {
+			$this->request->un_set('activate', true);
+			add_action('admin_notices', array($this, 'minimum_php_version_error'), 1);
 			//$this->response->add_output( "\n<br />" . 'minimum_php_version_error' );
 			$this->response->terminate_request();
 			$this->response->deactivate_plugin();
 		}
 		// check recommended PHP version
-		if ( ! $this->_minimum_php_version_recommended() ) {
+		if ( ! $this->_minimum_php_version_recommended()) {
 			$this->_display_minimum_recommended_php_version_notice();
 		}
-		$this->response = $this->process_request_stack( $this->request, $this->response );
+		$this->response = $this->process_request_stack($this->request, $this->response);
 		return $this->response;
 	}
 
@@ -60,9 +60,9 @@ 
 	 * @param string $min_version
 	 * @return boolean
 	 */
-	private function _check_wp_version( $min_version = EE_MIN_WP_VER_REQUIRED ) {
+	private function _check_wp_version($min_version = EE_MIN_WP_VER_REQUIRED) {
 		global $wp_version;
-		return version_compare( $wp_version, $min_version, '>=' ) ? true : false;
+		return version_compare($wp_version, $min_version, '>=') ? true : false;
 	}
 
 
@@ -74,7 +74,7 @@ 
 	 * @return boolean
 	 */
 	private function _minimum_wp_version_required() {
-		return $this->_check_wp_version( EE_MIN_WP_VER_REQUIRED );
+		return $this->_check_wp_version(EE_MIN_WP_VER_REQUIRED);
 	}
 
 
@@ -86,8 +86,8 @@ 
 	 * @param string $min_version
 	 * @return boolean
 	 */
-	private function _check_php_version( $min_version = EE_MIN_PHP_VER_RECOMMENDED ) {
-		return version_compare( PHP_VERSION, $min_version, '>=' ) ? true : false;
+	private function _check_php_version($min_version = EE_MIN_PHP_VER_RECOMMENDED) {
+		return version_compare(PHP_VERSION, $min_version, '>=') ? true : false;
 	}
 
 
@@ -99,7 +99,7 @@ 
 	 * @return boolean
 	 */
 	private function _minimum_php_version_required() {
-		return $this->_check_php_version( EE_MIN_PHP_VER_REQUIRED );
+		return $this->_check_php_version(EE_MIN_PHP_VER_REQUIRED);
 	}
 
 
@@ -111,7 +111,7 @@ 
 	 * @return boolean
 	 */
 	private function _minimum_php_version_recommended() {
-		return $this->_check_php_version( EE_MIN_PHP_VER_RECOMMENDED );
+		return $this->_check_php_version(EE_MIN_PHP_VER_RECOMMENDED);
 	}
 
 
@@ -128,7 +128,7 @@ 
 			<p>
 				<?php
 				printf(
-					__( 'We\'re sorry, but Event Espresso requires WordPress version %1$s or greater in order to operate. You are currently running version %2$s.%3$sFor information on how to update your version of WordPress, please go to %4$s.', 'event_espresso' ),
+					__('We\'re sorry, but Event Espresso requires WordPress version %1$s or greater in order to operate. You are currently running version %2$s.%3$sFor information on how to update your version of WordPress, please go to %4$s.', 'event_espresso'),
 					EE_MIN_WP_VER_REQUIRED,
 					$wp_version,
 					'<br/>',
@@ -153,7 +153,7 @@ 
 			<p>
 				<?php
 				printf(
-					__( 'We\'re sorry, but Event Espresso requires PHP version %1$s or greater in order to operate. You are currently running version %2$s.%3$sIn order to update your version of PHP, you will need to contact your current hosting provider.%3$sFor information on stable PHP versions, please go to %4$s.', 'event_espresso' ),
+					__('We\'re sorry, but Event Espresso requires PHP version %1$s or greater in order to operate. You are currently running version %2$s.%3$sIn order to update your version of PHP, you will need to contact your current hosting provider.%3$sFor information on stable PHP versions, please go to %4$s.', 'event_espresso'),
 					EE_MIN_PHP_VER_REQUIRED,
 					PHP_VERSION,
 					'<br/>',
@@ -175,9 +175,9 @@ 
 	 */
 	private function _display_minimum_recommended_php_version_notice() {
 		EE_Error::add_persistent_admin_notice(
-			'php_version_' . str_replace( '.', '-', EE_MIN_PHP_VER_RECOMMENDED ) . '_recommended',
+			'php_version_'.str_replace('.', '-', EE_MIN_PHP_VER_RECOMMENDED).'_recommended',
 			sprintf(
-				__( 'Event Espresso recommends PHP version %1$s or greater for optimal performance. You are currently running version %2$s.%3$sIn order to update your version of PHP, you will need to contact your current hosting provider.%3$sFor information on stable PHP versions, please go to %4$s.', 'event_espresso' ),
+				__('Event Espresso recommends PHP version %1$s or greater for optimal performance. You are currently running version %2$s.%3$sIn order to update your version of PHP, you will need to contact your current hosting provider.%3$sFor information on stable PHP versions, please go to %4$s.', 'event_espresso'),
 				EE_MIN_PHP_VER_RECOMMENDED,
 				PHP_VERSION,
 				'<br/>',

core/EE_Module_Request_Router.core.php

Spacing +50 added lines, -50 removed lines

@@ -58,7 +58,7 @@ 
 	 * @param \EE_Request  $request
 	 * @param \EE_Response $response
 	 */
-	public function __construct( \EE_Request $request, \EE_Response $response ) {
+	public function __construct(\EE_Request $request, \EE_Response $response) {
 		$this->request = $request;
 		$this->response = $response;
 	}
@@ -76,31 +76,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;
 			}
@@ -110,13 +110,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;
 					}
@@ -124,7 +124,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
@@ -144,46 +144,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);
 	}
 
 
@@ -199,18 +199,18 @@ 
 	 * @param    \EE_Response $response
 	 * @return    EED_Module | NULL
 	 */
-	public static function module_factory( $module_name, \EE_Request $request, \EE_Response $response  ) {
-		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, \EE_Request $request, \EE_Response $response) {
+		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;
 		}
 		// ensure that class is actually a module
-		if ( ! is_subclass_of( $module_name, '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 ( ! is_subclass_of($module_name, '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
-		return new $module_name( $request, $response );
+		return new $module_name($request, $response);
 	}
 
 
@@ -224,14 +224,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, $this->request, $this->response );
-		if ( $module instanceof EED_Module ) {
+		$module = EE_Module_Request_Router::module_factory($module_name, $this->request, $this->response);
+		if ($module instanceof EED_Module) {
 			// and call whatever action the route was for
 			try {
-				$module->{$method}( $this->WP_Query );
-			} catch ( EE_Error $e ) {
+				$module->{$method}($this->WP_Query);
+			} catch (EE_Error $e) {
 				$e->get_error();
 				return NULL;
 			}
@@ -248,8 +248,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);
 	}
 
 
@@ -261,8 +261,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);
 	}
 
 
@@ -272,7 +272,7 @@ 
 	 * @param $b
 	 * @return bool
 	 */
-	public function __set($a,$b) { return FALSE; }
+	public function __set($a, $b) { return FALSE; }