eventespresso / event-espresso-core

core/libraries/form_sections/inputs/EE_Select_Ajax_Model_Rest_Input.input.php

Spacing +29 added lines, -29 removed lines

@@ -11,7 +11,7 @@ 
  * @subpackage
  * @author				Mike Nelson
  */
-class EE_Select_Ajax_Model_Rest_Input extends EE_Form_Input_With_Options_Base{
+class EE_Select_Ajax_Model_Rest_Input extends EE_Form_Input_With_Options_Base {
 
 	/**
 	 * @var string $_model_name
@@ -50,7 +50,7 @@ 
 	 *                                  And the arguments accepted by EE_Form_Input_With_Options_Base
 	 * @throws \EE_Error
 	 */
-	public function __construct( $input_settings = array() ) {
+	public function __construct($input_settings = array()) {
 		//needed input settings:
 		//select2_args
 		$this->_model_name = EEH_Array::is_set(
@@ -66,7 +66,7 @@ 
 		);
 		// make sure limit and caps are always set
 		$query_params = array_merge(
-			array( 'limit' => 10, 'caps' => EEM_Base::caps_read_admin ),
+			array('limit' => 10, 'caps' => EEM_Base::caps_read_admin),
 			$query_params
 		);
 		$this->_value_field_name = EEH_Array::is_set(
@@ -77,7 +77,7 @@ 
 		$this->_display_field_name = EEH_Array::is_set(
 			$input_settings,
 			'display_field_name',
-			$model->get_a_field_of_type( 'EE_Text_Field_Base' )->get_name()
+			$model->get_a_field_of_type('EE_Text_Field_Base')->get_name()
 		);
 		$this->_extra_select_columns = EEH_Array::is_set(
 			$input_settings,
@@ -94,24 +94,24 @@ 
 		);
 		//get resource endpoint
 		$rest_controller = new EventEspresso\core\libraries\rest_api\controllers\model\Read();
-		$rest_controller->set_requested_version( EED_Core_Rest_Api::latest_rest_api_version() );
+		$rest_controller->set_requested_version(EED_Core_Rest_Api::latest_rest_api_version());
 		$default_select2_args = array(
 			'ajax' => array(
 				'url' => $rest_controller->get_versioned_link_to(
-					EEH_Inflector::pluralize_and_lower( $this->_model_name )
+					EEH_Inflector::pluralize_and_lower($this->_model_name)
 				),
 				'dataType' => 'json',
 				'delay' => '250',
 				'data_interface' => 'EE_Select2_REST_API_Interface',
 				'data_interface_args' => array(
-					'default_query_params' => (object)Model_Data_Translator::prepare_query_params_for_rest_api(
+					'default_query_params' => (object) Model_Data_Translator::prepare_query_params_for_rest_api(
 						$query_params,
 						$model
 					),
 					'display_field' => $this->_display_field_name,
 					'value_field' => $this->_value_field_name,
-					'nonce' => wp_create_nonce( 'wp_rest' ),
-					'locale' => str_replace( '_', '-', strtolower( get_locale() ) )
+					'nonce' => wp_create_nonce('wp_rest'),
+					'locale' => str_replace('_', '-', strtolower(get_locale()))
 				),
 			),
 			'cache' => true,
@@ -119,10 +119,10 @@ 
 		);
 		$select2_args = array_replace_recursive(
 			$default_select2_args,
-			(array)EEH_Array::is_set( $input_settings, 'select2_args', array() )
+			(array) EEH_Array::is_set($input_settings, 'select2_args', array())
 		);
-		$this->set_display_strategy( new EE_Select2_Display_Strategy( $select2_args ) );
-		parent::__construct( array(), $input_settings );
+		$this->set_display_strategy(new EE_Select2_Display_Strategy($select2_args));
+		parent::__construct(array(), $input_settings);
 	}
 
 
@@ -140,34 +140,34 @@ 
 	 * @return void
 	 * @throws \EE_Error
 	 */
-	public function _set_raw_value( $value ) {
-		$values_for_options = (array)$value;
-		$value_field = $this->_get_model()->field_settings_for( $this->_value_field_name );
-		$display_field = $this->_get_model()->field_settings_for( $this->_display_field_name );
-		$this->_extra_select_columns[] = $value_field->get_qualified_column() . ' AS ' . $this->_value_field_name;
-		$this->_extra_select_columns[] = $display_field->get_qualified_column() . ' AS ' . $this->_display_field_name;
+	public function _set_raw_value($value) {
+		$values_for_options = (array) $value;
+		$value_field = $this->_get_model()->field_settings_for($this->_value_field_name);
+		$display_field = $this->_get_model()->field_settings_for($this->_display_field_name);
+		$this->_extra_select_columns[] = $value_field->get_qualified_column().' AS '.$this->_value_field_name;
+		$this->_extra_select_columns[] = $display_field->get_qualified_column().' AS '.$this->_display_field_name;
 		$display_values = $this->_get_model()->get_all_wpdb_results(
 			array(
 				array(
-					$this->_value_field_name => array( 'IN', $values_for_options )
+					$this->_value_field_name => array('IN', $values_for_options)
 				)
 			),
 			ARRAY_A,
-			implode( ',', $this->_extra_select_columns )
+			implode(',', $this->_extra_select_columns)
 		);
 		$select_options = array();
-		if( is_array( $select_options ) ) {
-			foreach( $display_values as $db_rows ) {
-				$db_rows = (array)$db_rows;
-				$select_options[ $db_rows[ $this->_value_field_name ] ] = apply_filters(
+		if (is_array($select_options)) {
+			foreach ($display_values as $db_rows) {
+				$db_rows = (array) $db_rows;
+				$select_options[$db_rows[$this->_value_field_name]] = apply_filters(
 					'FHEE__EE_Select_Ajax_Model_Rest_Input___set_raw_value__select_option_value',
-					$db_rows[ $this->_display_field_name ],
+					$db_rows[$this->_display_field_name],
 					$db_rows
 				);
 			}
 		}
-		$this->set_select_options( $select_options );
-		parent::_set_raw_value( $value );
+		$this->set_select_options($select_options);
+		parent::_set_raw_value($value);
 	}
 
 	/**
@@ -176,7 +176,7 @@ 
 	 * @throws EE_Error
 	 */
 	protected function _get_model() {
-		if( ! EE_Registry::instance()->is_model_name(  $this->_model_name ) ) {
+		if ( ! EE_Registry::instance()->is_model_name($this->_model_name)) {
 			throw new EE_Error(
 				sprintf(
 					__(
@@ -187,7 +187,7 @@ 
 				)
 			);
 		} else {
-			return EE_Registry::instance()->load_model( $this->_model_name );
+			return EE_Registry::instance()->load_model($this->_model_name);
 		}
 	}
 

core/libraries/plugin_api/EE_Register_Addon.lib.php

Spacing +172 added lines, -172 removed lines

@@ -66,23 +66,23 @@ 
 	 * @param string $min_core_version
 	 * @return string always like '4.3.0.rc.000'
 	 */
-	protected static function _effective_version( $min_core_version ) {
+	protected static function _effective_version($min_core_version) {
 		// versions: 4 . 3 . 1 . p . 123
 		// offsets:    0 . 1 . 2 . 3 . 4
-		$version_parts = explode( '.', $min_core_version );
+		$version_parts = explode('.', $min_core_version);
 		//check they specified the micro version (after 2nd period)
-		if( ! isset( $version_parts[ 2 ] ) ) {
-			$version_parts[ 2] = '0';
+		if ( ! isset($version_parts[2])) {
+			$version_parts[2] = '0';
 		}
 		//if they didn't specify the 'p', or 'rc' part. Just assume the lowest possible
 		//soon we can assume that's 'rc', but this current version is 'alpha'
-		if( ! isset( $version_parts[ 3 ] ) ) {
-			$version_parts[ 3 ] = 'dev';
+		if ( ! isset($version_parts[3])) {
+			$version_parts[3] = 'dev';
 		}
-		if( ! isset( $version_parts[ 4 ] ) ) {
-			$version_parts[ 4 ] = '000';
+		if ( ! isset($version_parts[4])) {
+			$version_parts[4] = '000';
 		}
-		return implode( '.', $version_parts );
+		return implode('.', $version_parts);
 
 	}
 
@@ -92,8 +92,8 @@ 
 	 * @param string $actual_core_version the actual core version, optional
 	 * @return boolean
 	 */
-	public static  function _meets_min_core_version_requirement( $min_core_version, $actual_core_version = EVENT_ESPRESSO_VERSION ) {
-		return version_compare( self::_effective_version( $actual_core_version ), self::_effective_version( $min_core_version ), '>=' );
+	public static  function _meets_min_core_version_requirement($min_core_version, $actual_core_version = EVENT_ESPRESSO_VERSION) {
+		return version_compare(self::_effective_version($actual_core_version), self::_effective_version($min_core_version), '>=');
 	}
 
 
@@ -155,112 +155,112 @@ 
 	 * @throws EE_Error
 	 * @return void
 	 */
-	public static function register( $addon_name = '', $setup_args = array()  ) {
+	public static function register($addon_name = '', $setup_args = array()) {
 		// required fields MUST be present, so let's make sure they are.
-		if ( empty( $addon_name ) || ! is_array( $setup_args )) {
-			throw new EE_Error( __( 'In order to register an EE_Addon with EE_Register_Addon::register(), you must include the "addon_name" (the name of the addon), and an array of arguments.', 'event_espresso' ));
+		if (empty($addon_name) || ! is_array($setup_args)) {
+			throw new EE_Error(__('In order to register an EE_Addon with EE_Register_Addon::register(), you must include the "addon_name" (the name of the addon), and an array of arguments.', 'event_espresso'));
 		}
-		if ( ! isset($setup_args[ 'main_file_path' ]) || empty( $setup_args[ 'main_file_path' ] ) ){
-			throw new EE_Error( sprintf( __( 'When registering an addon, you didn\'t provide the "main_file_path", which is the full path to the main file loaded directly by Wordpress. You only provided %s', 'event_espresso' ), implode(",", array_keys( $setup_args ) ) ) );
+		if ( ! isset($setup_args['main_file_path']) || empty($setup_args['main_file_path'])) {
+			throw new EE_Error(sprintf(__('When registering an addon, you didn\'t provide the "main_file_path", which is the full path to the main file loaded directly by Wordpress. You only provided %s', 'event_espresso'), implode(",", array_keys($setup_args))));
 		}
 		// check that addon has not already been registered with that name
-		if ( isset( self::$_settings[ $addon_name ] ) && ! did_action( 'activate_plugin' ) ) {
-			throw new EE_Error( sprintf( __( 'An EE_Addon with the name "%s" has already been registered and each EE_Addon requires a unique name.', 'event_espresso' ), $addon_name ));
+		if (isset(self::$_settings[$addon_name]) && ! did_action('activate_plugin')) {
+			throw new EE_Error(sprintf(__('An EE_Addon with the name "%s" has already been registered and each EE_Addon requires a unique name.', 'event_espresso'), $addon_name));
 		}
 
 
 		// no class name for addon?
-		if ( empty( $setup_args['class_name'] )) {
+		if (empty($setup_args['class_name'])) {
 			// generate one by first separating name with spaces
-			$class_name = str_replace( array( '-', '_' ), ' ', trim( $addon_name ));
+			$class_name = str_replace(array('-', '_'), ' ', trim($addon_name));
 			//capitalize, then replace spaces with underscores
-			$class_name = str_replace( ' ', '_', ucwords( $class_name ));
+			$class_name = str_replace(' ', '_', ucwords($class_name));
 		} else {
 			$class_name = $setup_args['class_name'];
 		}
-		$class_name = strpos( $class_name, 'EE_' ) === 0 ? $class_name : 'EE_' . $class_name;
+		$class_name = strpos($class_name, 'EE_') === 0 ? $class_name : 'EE_'.$class_name;
 		//setup $_settings array from incoming values.
 		$addon_settings = array(
 			// generated from the addon name, changes something like "calendar" to "EE_Calendar"
 			'class_name' 						=> $class_name,
 			// the addon slug for use in URLs, etc
-			'plugin_slug' 						=> isset( $setup_args['plugin_slug'] ) ? (string)$setup_args['plugin_slug'] : '',
+			'plugin_slug' 						=> isset($setup_args['plugin_slug']) ? (string) $setup_args['plugin_slug'] : '',
 			// page slug to be used when generating the "Settings" link on the WP plugin page
-			'plugin_action_slug' 			=> isset( $setup_args[ 'plugin_action_slug' ] ) ? (string)$setup_args[ 'plugin_action_slug' ] : '',
+			'plugin_action_slug' 			=> isset($setup_args['plugin_action_slug']) ? (string) $setup_args['plugin_action_slug'] : '',
 			// the "software" version for the addon
-			'version' 								=> isset( $setup_args['version'] ) ? (string)$setup_args['version'] : '',
+			'version' 								=> isset($setup_args['version']) ? (string) $setup_args['version'] : '',
 			// the minimum version of EE Core that the addon will work with
-			'min_core_version' 			=> isset( $setup_args['min_core_version'] ) ? (string)$setup_args['min_core_version'] : '',
+			'min_core_version' 			=> isset($setup_args['min_core_version']) ? (string) $setup_args['min_core_version'] : '',
 			// the minimum version of WordPress that the addon will work with
-			'min_wp_version' 			=> isset( $setup_args['min_wp_version'] ) ? (string)$setup_args['min_wp_version'] : EE_MIN_WP_VER_REQUIRED,
+			'min_wp_version' 			=> isset($setup_args['min_wp_version']) ? (string) $setup_args['min_wp_version'] : EE_MIN_WP_VER_REQUIRED,
 			// full server path to main file (file loaded directly by WP)
-			'main_file_path' 					=> isset( $setup_args['main_file_path'] ) ? (string)$setup_args['main_file_path'] : '',
+			'main_file_path' 					=> isset($setup_args['main_file_path']) ? (string) $setup_args['main_file_path'] : '',
 			// path to folder containing files for integrating with the EE core admin and/or setting up EE admin pages
-			'admin_path' 						=> isset( $setup_args['admin_path'] ) ? (string)$setup_args['admin_path'] : '',
+			'admin_path' 						=> isset($setup_args['admin_path']) ? (string) $setup_args['admin_path'] : '',
 			// a method to be called when the EE Admin is first invoked, can be used for hooking into any admin page
-			'admin_callback' 				=> isset( $setup_args['admin_callback'] ) ? (string)$setup_args['admin_callback'] : '',
+			'admin_callback' 				=> isset($setup_args['admin_callback']) ? (string) $setup_args['admin_callback'] : '',
 			// the section name for this addon's configuration settings section (defaults to "addons")
-			'config_section' 					=> isset( $setup_args['config_section'] ) ? (string)$setup_args['config_section'] : 'addons',
+			'config_section' 					=> isset($setup_args['config_section']) ? (string) $setup_args['config_section'] : 'addons',
 			// the class name for this addon's configuration settings object
-			'config_class' 						=> isset( $setup_args['config_class'] ) ? (string)$setup_args['config_class'] : '',
+			'config_class' 						=> isset($setup_args['config_class']) ? (string) $setup_args['config_class'] : '',
 			//the name given to the config for this addons' configuration settings object (optional)
-			'config_name' 					=> isset( $setup_args['config_name'] ) ? (string) $setup_args['config_name']: '',
+			'config_name' 					=> isset($setup_args['config_name']) ? (string) $setup_args['config_name'] : '',
 			// an array of "class names" => "full server paths" for any classes that might be invoked by the addon
-			'autoloader_paths' 			=> isset( $setup_args['autoloader_paths'] ) ? (array)$setup_args['autoloader_paths'] : array(),
+			'autoloader_paths' 			=> isset($setup_args['autoloader_paths']) ? (array) $setup_args['autoloader_paths'] : array(),
 			// an array of  "full server paths" for any folders containing classes that might be invoked by the addon
-			'autoloader_folders' 			=> isset( $setup_args['autoloader_folders'] ) ? (array)$setup_args['autoloader_folders'] : array(),
+			'autoloader_folders' 			=> isset($setup_args['autoloader_folders']) ? (array) $setup_args['autoloader_folders'] : array(),
 			// array of full server paths to any EE_DMS data migration scripts used by the addon
-			'dms_paths' 						=> isset( $setup_args['dms_paths'] ) ? (array)$setup_args['dms_paths'] : array(),
+			'dms_paths' 						=> isset($setup_args['dms_paths']) ? (array) $setup_args['dms_paths'] : array(),
 			// array of full server paths to any EED_Modules used by the addon
-			'module_paths' 					=> isset( $setup_args['module_paths'] ) ? (array)$setup_args['module_paths'] : array(),
+			'module_paths' 					=> isset($setup_args['module_paths']) ? (array) $setup_args['module_paths'] : array(),
 			// array of full server paths to any EES_Shortcodes used by the addon
-			'shortcode_paths'			 	=> isset( $setup_args['shortcode_paths'] ) ? (array)$setup_args['shortcode_paths'] : array(),
+			'shortcode_paths'			 	=> isset($setup_args['shortcode_paths']) ? (array) $setup_args['shortcode_paths'] : array(),
 			// array of full server paths to any WP_Widgets used by the addon
-			'widget_paths' 					=> isset( $setup_args['widget_paths'] ) ? (array)$setup_args['widget_paths'] : array(),
+			'widget_paths' 					=> isset($setup_args['widget_paths']) ? (array) $setup_args['widget_paths'] : array(),
 			// array of PUE options used by the addon
-			'pue_options' 						=> isset( $setup_args['pue_options'] ) ? (array)$setup_args['pue_options'] : array(),
-			'message_types' 				=> isset( $setup_args['message_types'] ) ? (array) $setup_args['message_types'] : array(),
-			'capabilities' 						=> isset( $setup_args['capabilities'] ) ? (array) $setup_args['capabilities'] : array(),
-			'capability_maps' 				=> isset( $setup_args['capability_maps'] ) ? (array) $setup_args['capability_maps'] : array(),
-			'model_paths' 					=> isset( $setup_args['model_paths'] ) ? (array) $setup_args['model_paths'] : array(),
-			'class_paths' 						=> isset( $setup_args['class_paths'] ) ? (array) $setup_args['class_paths'] : array(),
-			'model_extension_paths' 	=> isset( $setup_args['model_extension_paths'] ) ? (array) $setup_args['model_extension_paths'] : array(),
-			'class_extension_paths' 		=> isset( $setup_args['class_extension_paths'] ) ? (array) $setup_args['class_extension_paths'] : array(),
-			'custom_post_types' 			=> isset( $setup_args['custom_post_types'] ) ? (array) $setup_args['custom_post_types'] : array(),
-			'custom_taxonomies' 		=> isset( $setup_args['custom_taxonomies'] ) ? (array) $setup_args['custom_taxonomies'] : array(),
-			'payment_method_paths'	=> isset( $setup_args[ 'payment_method_paths' ] ) ? (array) $setup_args[ 'payment_method_paths' ] : array(),
-			'default_terms' 					=> isset( $setup_args['default_terms'] ) ? (array) $setup_args['default_terms'] : array(),
+			'pue_options' 						=> isset($setup_args['pue_options']) ? (array) $setup_args['pue_options'] : array(),
+			'message_types' 				=> isset($setup_args['message_types']) ? (array) $setup_args['message_types'] : array(),
+			'capabilities' 						=> isset($setup_args['capabilities']) ? (array) $setup_args['capabilities'] : array(),
+			'capability_maps' 				=> isset($setup_args['capability_maps']) ? (array) $setup_args['capability_maps'] : array(),
+			'model_paths' 					=> isset($setup_args['model_paths']) ? (array) $setup_args['model_paths'] : array(),
+			'class_paths' 						=> isset($setup_args['class_paths']) ? (array) $setup_args['class_paths'] : array(),
+			'model_extension_paths' 	=> isset($setup_args['model_extension_paths']) ? (array) $setup_args['model_extension_paths'] : array(),
+			'class_extension_paths' 		=> isset($setup_args['class_extension_paths']) ? (array) $setup_args['class_extension_paths'] : array(),
+			'custom_post_types' 			=> isset($setup_args['custom_post_types']) ? (array) $setup_args['custom_post_types'] : array(),
+			'custom_taxonomies' 		=> isset($setup_args['custom_taxonomies']) ? (array) $setup_args['custom_taxonomies'] : array(),
+			'payment_method_paths'	=> isset($setup_args['payment_method_paths']) ? (array) $setup_args['payment_method_paths'] : array(),
+			'default_terms' 					=> isset($setup_args['default_terms']) ? (array) $setup_args['default_terms'] : array(),
 			// if not empty, inserts a new table row after this plugin's row on the WP Plugins page that can be used for adding upgrading/marketing info
-			'plugins_page_row' 			=> isset( $setup_args['plugins_page_row'] ) ? $setup_args['plugins_page_row'] : '',
+			'plugins_page_row' 			=> isset($setup_args['plugins_page_row']) ? $setup_args['plugins_page_row'] : '',
 		);
 
 		// if plugin_action_slug is NOT set, but an admin page path IS set, then let's just use the plugin_slug since that will be used for linking to the admin page
-		$addon_settings[ 'plugin_action_slug' ] = empty( $addon_settings[ 'plugin_action_slug' ] ) && ! empty( $addon_settings[ 'admin_path' ] ) ? $addon_settings[ 'plugin_slug' ] : $addon_settings[ 'plugin_action_slug' ];
+		$addon_settings['plugin_action_slug'] = empty($addon_settings['plugin_action_slug']) && ! empty($addon_settings['admin_path']) ? $addon_settings['plugin_slug'] : $addon_settings['plugin_action_slug'];
 		// full server path to main file (file loaded directly by WP)
-		$addon_settings['plugin_basename'] = plugin_basename( $addon_settings[ 'main_file_path' ] );
+		$addon_settings['plugin_basename'] = plugin_basename($addon_settings['main_file_path']);
 
 		global $wp_version;
 		//check whether this addon version is compatible with EE core
-		if ( isset( EE_Register_Addon::$_incompatible_addons[ $addon_name ] ) &&
-				! self::_meets_min_core_version_requirement( EE_Register_Addon::$_incompatible_addons[ $addon_name ], $addon_settings[ 'version' ] ) ) {
+		if (isset(EE_Register_Addon::$_incompatible_addons[$addon_name]) &&
+				! self::_meets_min_core_version_requirement(EE_Register_Addon::$_incompatible_addons[$addon_name], $addon_settings['version'])) {
 			$incompatibility_message = sprintf(
-				__( 'The Event Espresso "%1$s" addon was deactivated because it is incompatible with this version of core.%2$s Only version %3$s or higher of "%1$s" can run with this version of core. This can happen when attempting to run beta versions or release candidates with older versions of core, or running old versions of addons with a newer version of core.%2$sPlease upgrade Event Espresso Core and the "%1$s" addon, then re-attempt activating it.', 'event_espresso' ),
+				__('The Event Espresso "%1$s" addon was deactivated because it is incompatible with this version of core.%2$s Only version %3$s or higher of "%1$s" can run with this version of core. This can happen when attempting to run beta versions or release candidates with older versions of core, or running old versions of addons with a newer version of core.%2$sPlease upgrade Event Espresso Core and the "%1$s" addon, then re-attempt activating it.', 'event_espresso'),
 				$addon_name,
 				'<br />',
-				EE_Register_Addon::$_incompatible_addons[ $addon_name ]
+				EE_Register_Addon::$_incompatible_addons[$addon_name]
 			);
-		} else if ( ! self::_meets_min_core_version_requirement( $addon_settings[ 'min_core_version' ], espresso_version() ) ) {
+		} else if ( ! self::_meets_min_core_version_requirement($addon_settings['min_core_version'], espresso_version())) {
 			$incompatibility_message = sprintf(
 				__(
 					'The Event Espresso "%1$s" addon could not be activated because it requires Event Espresso Core version "%2$s" or higher in order to run.%4$sYour version of Event Espresso Core is currently at "%3$s". Please upgrade Event Espresso Core first and then re-attempt activating "%1$s".',
 					'event_espresso'
 				),
 				$addon_name,
-				self::_effective_version( $addon_settings[ 'min_core_version' ] ),
-				self::_effective_version( espresso_version() ),
+				self::_effective_version($addon_settings['min_core_version']),
+				self::_effective_version(espresso_version()),
 				'<br />'
 			);
-		} else if (version_compare( $wp_version, $addon_settings['min_wp_version'], '<' )) {
+		} else if (version_compare($wp_version, $addon_settings['min_wp_version'], '<')) {
 			$incompatibility_message = sprintf(
 				__(
 					'The Event Espresso "%1$s" addon could not be activated because it requires WordPress version "%2$s" or greater.%3$sPlease update your version of WordPress to use the "%1$s" addon and to keep your site secure.',
@@ -269,137 +269,137 @@ 
 				$addon_name,
 				$addon_settings['min_wp_version'],
 				'<br />'
-			);;
+			); ;
 		} else {
 			$incompatibility_message = '';
 		}
-		if ( ! empty( $incompatibility_message ) ) {
+		if ( ! empty($incompatibility_message)) {
 			//remove 'activate' from the REQUEST so WP doesn't erroneously tell the user the
 			//plugin activated fine when it didn't
-			if( isset( $_GET[ 'activate' ]) ) {
-				unset( $_GET[ 'activate' ] );
+			if (isset($_GET['activate'])) {
+				unset($_GET['activate']);
 			}
-			if( isset( $_REQUEST[ 'activate' ] ) ){
-				unset( $_REQUEST[ 'activate' ] );
+			if (isset($_REQUEST['activate'])) {
+				unset($_REQUEST['activate']);
 			}
 			//and show an error message indicating the plugin didn't activate properly
-			EE_Error::add_error( $incompatibility_message, __FILE__, __FUNCTION__, __LINE__ );
-			if ( current_user_can( 'activate_plugins' )) {
-				require_once( ABSPATH.'wp-admin/includes/plugin.php' );
-				deactivate_plugins( plugin_basename( $addon_settings[ 'main_file_path' ] ), TRUE );
+			EE_Error::add_error($incompatibility_message, __FILE__, __FUNCTION__, __LINE__);
+			if (current_user_can('activate_plugins')) {
+				require_once(ABSPATH.'wp-admin/includes/plugin.php');
+				deactivate_plugins(plugin_basename($addon_settings['main_file_path']), TRUE);
 			}
 			return;
 		}
 		//this is an activation request
-		if( did_action( 'activate_plugin' ) ){
+		if (did_action('activate_plugin')) {
 			//to find if THIS is the addon that was activated,
 			//just check if we have already registered it or not
 			//(as the newly-activated addon wasn't around the first time addons were registered)
-			if( ! isset( self::$_settings[ $addon_name ] ) ){
-				self::$_settings[ $addon_name ] = $addon_settings;
+			if ( ! isset(self::$_settings[$addon_name])) {
+				self::$_settings[$addon_name] = $addon_settings;
 				$addon = self::_load_and_init_addon_class($addon_name);
 				$addon->set_activation_indicator_option();
 				//dont bother setting up the rest of the addon.
 				//we know it was just activated and the request will end soon
 			}
 			return;
-		}else{
+		} else {
 			// make sure this was called in the right place!
-			if ( ! did_action( 'AHEE__EE_System__load_espresso_addons' ) || did_action( 'AHEE__EE_System___detect_if_activation_or_upgrade__begin' )) {
+			if ( ! did_action('AHEE__EE_System__load_espresso_addons') || did_action('AHEE__EE_System___detect_if_activation_or_upgrade__begin')) {
 				EE_Error::doing_it_wrong(
 					__METHOD__,
 					sprintf(
-						__( 'An attempt to register an EE_Addon named "%s" has failed because it was not registered at the correct time.  Please use the "AHEE__EE_System__load_espresso_addons" hook to register addons.','event_espresso'),
+						__('An attempt to register an EE_Addon named "%s" has failed because it was not registered at the correct time.  Please use the "AHEE__EE_System__load_espresso_addons" hook to register addons.', 'event_espresso'),
 						$addon_name
 					),
 					'4.3.0'
 				);
 			}
-			self::$_settings[ $addon_name ] = $addon_settings;
+			self::$_settings[$addon_name] = $addon_settings;
 		}
 		// we need cars
-		if ( ! empty( self::$_settings[ $addon_name ]['autoloader_paths'] )) {
+		if ( ! empty(self::$_settings[$addon_name]['autoloader_paths'])) {
 			// setup autoloader for single file
-			EEH_Autoloader::instance()->register_autoloader( self::$_settings[ $addon_name ]['autoloader_paths'] );
+			EEH_Autoloader::instance()->register_autoloader(self::$_settings[$addon_name]['autoloader_paths']);
 		}
 		// setup autoloaders for folders
-		if ( ! empty( self::$_settings[ $addon_name ]['autoloader_folders'] )) {
-			foreach ( self::$_settings[ $addon_name ]['autoloader_folders'] as $autoloader_folder ) {
-				EEH_Autoloader::register_autoloaders_for_each_file_in_folder( $autoloader_folder );
+		if ( ! empty(self::$_settings[$addon_name]['autoloader_folders'])) {
+			foreach (self::$_settings[$addon_name]['autoloader_folders'] as $autoloader_folder) {
+				EEH_Autoloader::register_autoloaders_for_each_file_in_folder($autoloader_folder);
 			}
 		}
 		// register new models
-		if ( ! empty( self::$_settings[ $addon_name ]['model_paths'] ) || ! empty( self::$_settings[ $addon_name ]['class_paths'] )) {
-			EE_Register_Model::register( $addon_name, array( 'model_paths' => self::$_settings[ $addon_name ]['model_paths'] , 'class_paths' => self::$_settings[ $addon_name ]['class_paths']));
+		if ( ! empty(self::$_settings[$addon_name]['model_paths']) || ! empty(self::$_settings[$addon_name]['class_paths'])) {
+			EE_Register_Model::register($addon_name, array('model_paths' => self::$_settings[$addon_name]['model_paths'], 'class_paths' => self::$_settings[$addon_name]['class_paths']));
 		}
 		// register model extensions
-		if ( ! empty( self::$_settings[ $addon_name ]['model_extension_paths'] ) || ! empty( self::$_settings[ $addon_name ]['class_extension_paths'] )) {
-			EE_Register_Model_Extensions::register( $addon_name, array( 'model_extension_paths' => self::$_settings[ $addon_name ]['model_extension_paths'] , 'class_extension_paths' => self::$_settings[ $addon_name ]['class_extension_paths']));
+		if ( ! empty(self::$_settings[$addon_name]['model_extension_paths']) || ! empty(self::$_settings[$addon_name]['class_extension_paths'])) {
+			EE_Register_Model_Extensions::register($addon_name, array('model_extension_paths' => self::$_settings[$addon_name]['model_extension_paths'], 'class_extension_paths' => self::$_settings[$addon_name]['class_extension_paths']));
 		}
 		// setup DMS
-		if ( ! empty( self::$_settings[ $addon_name ]['dms_paths'] )) {
-			EE_Register_Data_Migration_Scripts::register( $addon_name, array( 'dms_paths' => self::$_settings[ $addon_name ]['dms_paths'] ));
+		if ( ! empty(self::$_settings[$addon_name]['dms_paths'])) {
+			EE_Register_Data_Migration_Scripts::register($addon_name, array('dms_paths' => self::$_settings[$addon_name]['dms_paths']));
 		}
 		// if config_class is present let's register config.
-		if ( ! empty( self::$_settings[ $addon_name ]['config_class'] )) {
+		if ( ! empty(self::$_settings[$addon_name]['config_class'])) {
 			EE_Register_Config::register(
-				self::$_settings[ $addon_name ]['config_class'],
+				self::$_settings[$addon_name]['config_class'],
 				array(
-					'config_section' => self::$_settings[ $addon_name ]['config_section'],
-					'config_name' => self::$_settings[ $addon_name ]['config_name']
+					'config_section' => self::$_settings[$addon_name]['config_section'],
+					'config_name' => self::$_settings[$addon_name]['config_name']
 				)
 			);
 		}
 		// register admin page
-		if ( ! empty( self::$_settings[ $addon_name ]['admin_path'] )) {
-			EE_Register_Admin_Page::register( $addon_name, array( 'page_path' => self::$_settings[ $addon_name ]['admin_path'] ));
+		if ( ! empty(self::$_settings[$addon_name]['admin_path'])) {
+			EE_Register_Admin_Page::register($addon_name, array('page_path' => self::$_settings[$addon_name]['admin_path']));
 
 		}
 		// add to list of modules to be registered
-		if ( ! empty( self::$_settings[ $addon_name ]['module_paths'] )) {
-			EE_Register_Module::register( $addon_name, array( 'module_paths' => self::$_settings[ $addon_name ]['module_paths'] ));
+		if ( ! empty(self::$_settings[$addon_name]['module_paths'])) {
+			EE_Register_Module::register($addon_name, array('module_paths' => self::$_settings[$addon_name]['module_paths']));
 		}
 		// add to list of shortcodes to be registered
-		if ( ! empty( self::$_settings[ $addon_name ]['shortcode_paths'] )) {
-			EE_Register_Shortcode::register( $addon_name, array( 'shortcode_paths' => self::$_settings[ $addon_name ]['shortcode_paths'] ));
+		if ( ! empty(self::$_settings[$addon_name]['shortcode_paths'])) {
+			EE_Register_Shortcode::register($addon_name, array('shortcode_paths' => self::$_settings[$addon_name]['shortcode_paths']));
 		}
 		// add to list of widgets to be registered
-		if ( ! empty( self::$_settings[ $addon_name ]['widget_paths'] )) {
-			EE_Register_Widget::register( $addon_name, array( 'widget_paths' => self::$_settings[ $addon_name ]['widget_paths'] ));
+		if ( ! empty(self::$_settings[$addon_name]['widget_paths'])) {
+			EE_Register_Widget::register($addon_name, array('widget_paths' => self::$_settings[$addon_name]['widget_paths']));
 		}
 
 		//register capability related stuff.
-		if ( ! empty( self::$_settings[ $addon_name ]['capabilities'] ) ) {
-			EE_Register_Capabilities::register( $addon_name , array( 'capabilities' => self::$_settings[$addon_name]['capabilities'], 'capability_maps' => self::$_settings[$addon_name]['capability_maps'] ) );
+		if ( ! empty(self::$_settings[$addon_name]['capabilities'])) {
+			EE_Register_Capabilities::register($addon_name, array('capabilities' => self::$_settings[$addon_name]['capabilities'], 'capability_maps' => self::$_settings[$addon_name]['capability_maps']));
 		}
 		//any message type to register?
-		if (  !empty( self::$_settings[$addon_name]['message_types'] ) ) {
-				add_action( 'EE_Brewing_Regular___messages_caf', array( 'EE_Register_Addon', 'register_message_types' ) );
+		if ( ! empty(self::$_settings[$addon_name]['message_types'])) {
+				add_action('EE_Brewing_Regular___messages_caf', array('EE_Register_Addon', 'register_message_types'));
 		}
 
 		// if plugin update engine is being used for auto-updates (not needed if PUE is not being used)
-		if ( ! empty( $setup_args['pue_options'] )) {
-			self::$_settings[ $addon_name ]['pue_options'] = array(
-				'pue_plugin_slug' 	=> isset( $setup_args['pue_options']['pue_plugin_slug'] ) ? (string)$setup_args['pue_options']['pue_plugin_slug'] : 'espresso_' . strtolower( $class_name ),
-				'plugin_basename' => isset( $setup_args['pue_options']['plugin_basename'] ) ? (string)$setup_args['pue_options']['plugin_basename'] : plugin_basename( self::$_settings[ $addon_name ]['main_file_path'] ),
-				'checkPeriod' 			=> isset( $setup_args['pue_options']['checkPeriod'] ) ? (string)$setup_args['pue_options']['checkPeriod'] : '24',
-				'use_wp_update'		=> isset( $setup_args['pue_options']['use_wp_update'] ) ? (string)$setup_args['pue_options']['use_wp_update'] : FALSE
+		if ( ! empty($setup_args['pue_options'])) {
+			self::$_settings[$addon_name]['pue_options'] = array(
+				'pue_plugin_slug' 	=> isset($setup_args['pue_options']['pue_plugin_slug']) ? (string) $setup_args['pue_options']['pue_plugin_slug'] : 'espresso_'.strtolower($class_name),
+				'plugin_basename' => isset($setup_args['pue_options']['plugin_basename']) ? (string) $setup_args['pue_options']['plugin_basename'] : plugin_basename(self::$_settings[$addon_name]['main_file_path']),
+				'checkPeriod' 			=> isset($setup_args['pue_options']['checkPeriod']) ? (string) $setup_args['pue_options']['checkPeriod'] : '24',
+				'use_wp_update'		=> isset($setup_args['pue_options']['use_wp_update']) ? (string) $setup_args['pue_options']['use_wp_update'] : FALSE
 			);
-			add_action( 'AHEE__EE_System__brew_espresso__after_pue_init', array( 'EE_Register_Addon', 'load_pue_update' ));
+			add_action('AHEE__EE_System__brew_espresso__after_pue_init', array('EE_Register_Addon', 'load_pue_update'));
 		}
 
 		//any custom post type/ custom capabilities or default terms to register
-		if ( !empty( self::$_settings[$addon_name]['custom_post_types'] ) || !empty( self::$_settings[$addon_name]['custom_taxonomies'] ) ) {
-			EE_Register_CPT::register( $addon_name, array( 'cpts' => self::$_settings[$addon_name]['custom_post_types'] , 'cts' => self::$_settings[$addon_name]['custom_taxonomies'], 'default_terms' => self::$_settings[$addon_name]['default_terms'] ) );
+		if ( ! empty(self::$_settings[$addon_name]['custom_post_types']) || ! empty(self::$_settings[$addon_name]['custom_taxonomies'])) {
+			EE_Register_CPT::register($addon_name, array('cpts' => self::$_settings[$addon_name]['custom_post_types'], 'cts' => self::$_settings[$addon_name]['custom_taxonomies'], 'default_terms' => self::$_settings[$addon_name]['default_terms']));
 		}
-		if( ! empty( self::$_settings[ $addon_name ][ 'payment_method_paths' ] ) ){
-			EE_Register_Payment_Method::register($addon_name, array( 'payment_method_paths' => self::$_settings[ $addon_name ][ 'payment_method_paths' ] ) );
+		if ( ! empty(self::$_settings[$addon_name]['payment_method_paths'])) {
+			EE_Register_Payment_Method::register($addon_name, array('payment_method_paths' => self::$_settings[$addon_name]['payment_method_paths']));
 		}
 		// load and instantiate main addon class
 		$addon = self::_load_and_init_addon_class($addon_name);
 		// call any additional admin_callback functions during load_admin_controller hook
-		if ( ! empty( self::$_settings[ $addon_name ]['admin_callback'] )) {
-			add_action( 'AHEE__EE_System__load_controllers__load_admin_controllers', array( $addon, self::$_settings[ $addon_name ]['admin_callback'] ));
+		if ( ! empty(self::$_settings[$addon_name]['admin_callback'])) {
+			add_action('AHEE__EE_System__load_controllers__load_admin_controllers', array($addon, self::$_settings[$addon_name]['admin_callback']));
 		}
 	}
 
@@ -410,22 +410,22 @@ 
 	 * @param string $addon_name
 	 * @return EE_Addon
 	 */
-	private static function _load_and_init_addon_class($addon_name){
-		$addon = EE_Registry::instance()->load_addon( dirname( self::$_settings[ $addon_name ]['main_file_path'] ), self::$_settings[ $addon_name ]['class_name'] );
-		$addon->set_name( $addon_name );
-		$addon->set_plugin_slug( self::$_settings[ $addon_name ][ 'plugin_slug' ] );
-		$addon->set_plugin_basename( self::$_settings[ $addon_name ][ 'plugin_basename' ] );
-		$addon->set_main_plugin_file( self::$_settings[ $addon_name ]['main_file_path'] );
-		$addon->set_plugin_action_slug( self::$_settings[ $addon_name ][ 'plugin_action_slug' ] );
-		$addon->set_plugins_page_row( self::$_settings[ $addon_name ][ 'plugins_page_row' ] );
-		$addon->set_version( self::$_settings[ $addon_name ]['version'] );
-		$addon->set_min_core_version( self::_effective_version( self::$_settings[ $addon_name ]['min_core_version'] ) );
-		$addon->set_config_section( self::$_settings[ $addon_name ]['config_section'] );
-		$addon->set_config_class( self::$_settings[ $addon_name ]['config_class'] );
-		$addon->set_config_name( self::$_settings[ $addon_name ]['config_name'] );
+	private static function _load_and_init_addon_class($addon_name) {
+		$addon = EE_Registry::instance()->load_addon(dirname(self::$_settings[$addon_name]['main_file_path']), self::$_settings[$addon_name]['class_name']);
+		$addon->set_name($addon_name);
+		$addon->set_plugin_slug(self::$_settings[$addon_name]['plugin_slug']);
+		$addon->set_plugin_basename(self::$_settings[$addon_name]['plugin_basename']);
+		$addon->set_main_plugin_file(self::$_settings[$addon_name]['main_file_path']);
+		$addon->set_plugin_action_slug(self::$_settings[$addon_name]['plugin_action_slug']);
+		$addon->set_plugins_page_row(self::$_settings[$addon_name]['plugins_page_row']);
+		$addon->set_version(self::$_settings[$addon_name]['version']);
+		$addon->set_min_core_version(self::_effective_version(self::$_settings[$addon_name]['min_core_version']));
+		$addon->set_config_section(self::$_settings[$addon_name]['config_section']);
+		$addon->set_config_class(self::$_settings[$addon_name]['config_class']);
+		$addon->set_config_name(self::$_settings[$addon_name]['config_name']);
 		//unfortunately this can't be hooked in upon construction, because we don't have
 		//the plugin mainfile's path upon construction.
-		register_deactivation_hook($addon->get_main_plugin_file(), array($addon,'deactivation'));
+		register_deactivation_hook($addon->get_main_plugin_file(), array($addon, 'deactivation'));
 		return $addon;
 	}
 
@@ -438,18 +438,18 @@ 
 	 */
 	public static function load_pue_update() {
 		// load PUE client
-		require_once  EE_THIRD_PARTY . 'pue' . DS . 'pue-client.php';
+		require_once  EE_THIRD_PARTY.'pue'.DS.'pue-client.php';
 		// cycle thru settings
-		foreach ( self::$_settings as $settings ) {
-			if ( ! empty( $settings['pue_options'] )) {
+		foreach (self::$_settings as $settings) {
+			if ( ! empty($settings['pue_options'])) {
 				// initiate the class and start the plugin update engine!
 				new PluginUpdateEngineChecker(
 				// host file URL
 					'https://eventespresso.com',
 					// plugin slug(s)
 					array(
-						'premium' => array( 'p' => $settings['pue_options']['pue_plugin_slug'] ),
-						'prerelease' => array( 'beta' => $settings['pue_options']['pue_plugin_slug'] . '-pr' )
+						'premium' => array('p' => $settings['pue_options']['pue_plugin_slug']),
+						'prerelease' => array('beta' => $settings['pue_options']['pue_plugin_slug'].'-pr')
 					),
 					// options
 					array(
@@ -477,9 +477,9 @@ 
 	 * @return void
 	 */
 	public static function register_message_types() {
-		foreach ( self::$_settings as $settings ) {
-			foreach( $settings['message_types'] as $message_type => $message_type_settings ) {
-				EE_Register_Message_Type::register( $message_type, $message_type_settings );
+		foreach (self::$_settings as $settings) {
+			foreach ($settings['message_types'] as $message_type => $message_type_settings) {
+				EE_Register_Message_Type::register($message_type, $message_type_settings);
 			}
 		}
 	}
@@ -495,60 +495,60 @@ 
 	 * @throws EE_Error
 	 * @return void
 	 */
-	public static function deregister( $addon_name = NULL ) {
-		if ( isset( self::$_settings[ $addon_name ] )) {
-			$class_name = self::$_settings[ $addon_name ]['class_name'];
-			if ( ! empty( self::$_settings[ $addon_name ]['dms_paths'] )) {
+	public static function deregister($addon_name = NULL) {
+		if (isset(self::$_settings[$addon_name])) {
+			$class_name = self::$_settings[$addon_name]['class_name'];
+			if ( ! empty(self::$_settings[$addon_name]['dms_paths'])) {
 				// setup DMS
-				EE_Register_Data_Migration_Scripts::deregister( $addon_name );
+				EE_Register_Data_Migration_Scripts::deregister($addon_name);
 			}
-			if ( ! empty( self::$_settings[ $addon_name ]['admin_path'] )) {
+			if ( ! empty(self::$_settings[$addon_name]['admin_path'])) {
 				// register admin page
-				EE_Register_Admin_Page::deregister( $addon_name );
+				EE_Register_Admin_Page::deregister($addon_name);
 			}
-			if ( ! empty( self::$_settings[ $addon_name ]['module_paths'] )) {
+			if ( ! empty(self::$_settings[$addon_name]['module_paths'])) {
 				// add to list of modules to be registered
-				EE_Register_Module::deregister( $addon_name );
+				EE_Register_Module::deregister($addon_name);
 			}
-			if ( ! empty( self::$_settings[ $addon_name ]['shortcode_paths'] )) {
+			if ( ! empty(self::$_settings[$addon_name]['shortcode_paths'])) {
 				// add to list of shortcodes to be registered
-				EE_Register_Shortcode::deregister( $addon_name );
+				EE_Register_Shortcode::deregister($addon_name);
 			}
-			if ( ! empty( self::$_settings[ $addon_name ]['config_class'] )) {
+			if ( ! empty(self::$_settings[$addon_name]['config_class'])) {
 				// if config_class present let's register config.
-				EE_Register_Config::deregister( self::$_settings[ $addon_name ]['config_class']);
+				EE_Register_Config::deregister(self::$_settings[$addon_name]['config_class']);
 			}
-			if ( ! empty( self::$_settings[ $addon_name ]['widget_paths'] )) {
+			if ( ! empty(self::$_settings[$addon_name]['widget_paths'])) {
 				// add to list of widgets to be registered
-				EE_Register_Widget::deregister( $addon_name );
+				EE_Register_Widget::deregister($addon_name);
 			}
-			if ( ! empty( self::$_settings[ $addon_name ]['model_paths'] ) ||
-					! empty( self::$_settings[ $addon_name ]['class_paths'] )) {
+			if ( ! empty(self::$_settings[$addon_name]['model_paths']) ||
+					! empty(self::$_settings[$addon_name]['class_paths'])) {
 				// add to list of shortcodes to be registered
-				EE_Register_Model::deregister( $addon_name );
+				EE_Register_Model::deregister($addon_name);
 			}
-			if ( ! empty( self::$_settings[ $addon_name ]['model_extension_paths'] ) ||
-					! empty( self::$_settings[ $addon_name ]['class_extension_paths'] )) {
+			if ( ! empty(self::$_settings[$addon_name]['model_extension_paths']) ||
+					! empty(self::$_settings[$addon_name]['class_extension_paths'])) {
 				// add to list of shortcodes to be registered
-				EE_Register_Model_Extensions::deregister( $addon_name );
+				EE_Register_Model_Extensions::deregister($addon_name);
 				}
-			if (  !empty( self::$_settings[$addon_name]['message_types'] ) ) {
-				foreach( self::$_settings[$addon_name]['message_types'] as $message_type => $message_type_settings ) {
-					EE_Register_Message_Type::deregister( $message_type );
+			if ( ! empty(self::$_settings[$addon_name]['message_types'])) {
+				foreach (self::$_settings[$addon_name]['message_types'] as $message_type => $message_type_settings) {
+					EE_Register_Message_Type::deregister($message_type);
 				}
 			}
 			//deregister capabilities for addon
-			if ( ! empty( self::$_settings[$addon_name]['capabilities'] ) || ! empty( self::$_settings[$addon_name]['capability_maps']) ) {
-				EE_Register_Capabilities::deregister( $addon_name );
+			if ( ! empty(self::$_settings[$addon_name]['capabilities']) || ! empty(self::$_settings[$addon_name]['capability_maps'])) {
+				EE_Register_Capabilities::deregister($addon_name);
 			}
 			//deregister custom_post_types for addon
-			if ( ! empty( self::$_settings[$addon_name]['custom_post_types'] ) ) {
-				EE_Register_CPT::deregister( $addon_name );
+			if ( ! empty(self::$_settings[$addon_name]['custom_post_types'])) {
+				EE_Register_CPT::deregister($addon_name);
 			}
-			remove_action('deactivate_'.EE_Registry::instance()->addons->{$class_name}->get_main_plugin_file_basename(),  array( EE_Registry::instance()->addons->{$class_name}, 'deactivation' ) );
-			remove_action( 'AHEE__EE_System__perform_activations_upgrades_and_migrations', array( EE_Registry::instance()->addons->{$class_name}, 'initialize_db_if_no_migrations_required' ) );
+			remove_action('deactivate_'.EE_Registry::instance()->addons->{$class_name}->get_main_plugin_file_basename(), array(EE_Registry::instance()->addons->{$class_name}, 'deactivation'));
+			remove_action('AHEE__EE_System__perform_activations_upgrades_and_migrations', array(EE_Registry::instance()->addons->{$class_name}, 'initialize_db_if_no_migrations_required'));
 			unset(EE_Registry::instance()->addons->{$class_name});
-			unset( self::$_settings[ $addon_name ] );
+			unset(self::$_settings[$addon_name]);
 		}
 	}
 

admin_pages/transactions/EE_Admin_Transactions_List_Table.class.php

Spacing +85 added lines, -85 removed lines

@@ -31,8 +31,8 @@ 
 	/**
 	 * @param \Transactions_Admin_Page $admin_page
 	 */
-	public function __construct( \Transactions_Admin_Page $admin_page ){
-		parent::__construct( $admin_page );
+	public function __construct(\Transactions_Admin_Page $admin_page) {
+		parent::__construct($admin_page);
 		$this->_status = $this->_admin_page->get_transaction_status_array();
 	}
 
@@ -42,9 +42,9 @@ 
 	 *_setup_data
 	 */
 	protected function _setup_data() {
-		$this->_data = $this->_admin_page->get_transactions( $this->_per_page );
-		$status = ! empty( $this->_req_data['status'] )? $this->_req_data['status'] : 'all';
-		$this->_all_data_count = $this->_admin_page->get_transactions( $this->_per_page, TRUE, $status );
+		$this->_data = $this->_admin_page->get_transactions($this->_per_page);
+		$status = ! empty($this->_req_data['status']) ? $this->_req_data['status'] : 'all';
+		$this->_all_data_count = $this->_admin_page->get_transactions($this->_per_page, TRUE, $status);
 	}
 
 
@@ -59,25 +59,25 @@ 
 			'ajax' => TRUE,
 			'screen' => $this->_admin_page->get_current_screen()->id
 			);
-		$ID_column_name = __( 'ID', 'event_espresso' );
+		$ID_column_name = __('ID', 'event_espresso');
 		$ID_column_name .= ' : <span class="show-on-mobile-view-only" style="float:none">';
-		$ID_column_name .= __( 'Transaction Date', 'event_espresso' );
+		$ID_column_name .= __('Transaction Date', 'event_espresso');
 		$ID_column_name .= '</span> ';
 		$this->_columns = array(
 			'TXN_ID' => $ID_column_name,
-			'TXN_timestamp'	=> __( 'Transaction Date', 'event_espresso' ),
-			'TXN_total' => __( 'Total', 'event_espresso' ),
-			'TXN_paid' => __( 'Paid', 'event_espresso' ),
-			'ATT_fname' => __( 'Primary Registrant', 'event_espresso' ),
-			'event_name' => __( 'Event', 'event_espresso' ),
-			'actions' => __( 'Actions', 'event_espresso' )
+			'TXN_timestamp'	=> __('Transaction Date', 'event_espresso'),
+			'TXN_total' => __('Total', 'event_espresso'),
+			'TXN_paid' => __('Paid', 'event_espresso'),
+			'ATT_fname' => __('Primary Registrant', 'event_espresso'),
+			'event_name' => __('Event', 'event_espresso'),
+			'actions' => __('Actions', 'event_espresso')
 		);
 
 		$this->_sortable_columns = array(
-			'TXN_ID' => array( 'TXN_ID' => FALSE ),
-			'event_name' => array( 'event_name'=> FALSE ),
-			'ATT_fname'	=> array( 'ATT_fname'=> FALSE ),
-			'TXN_timestamp'	=> array( 'TXN_timestamp'=> TRUE ) //true means its already sorted
+			'TXN_ID' => array('TXN_ID' => FALSE),
+			'event_name' => array('event_name'=> FALSE),
+			'ATT_fname'	=> array('ATT_fname'=> FALSE),
+			'TXN_timestamp'	=> array('TXN_timestamp'=> TRUE) //true means its already sorted
 		);
 
 		$this->_primary_column = 'TXN_ID';
@@ -95,11 +95,11 @@ 
 	 * @return string
 	 * @throws \EE_Error
 	 */
-	protected function _get_row_class( $item ) {
-		$class = parent::_get_row_class( $item );
+	protected function _get_row_class($item) {
+		$class = parent::_get_row_class($item);
 		//add status class
-		$class .= ' ee-status-strip txn-status-' . $item->status_ID();
-		if ( $this->_has_checkbox_column ) {
+		$class .= ' ee-status-strip txn-status-'.$item->status_ID();
+		if ($this->_has_checkbox_column) {
 			$class .= ' has-checkbox-column';
 		}
 		return $class;
@@ -116,8 +116,8 @@ 
 	 */
 	protected function _get_table_filters() {
 		$filters = array();
-		$start_date = isset( $this->_req_data['txn-filter-start-date'] ) ? wp_strip_all_tags( $this->_req_data['txn-filter-start-date'] ) : date( 'm/d/Y', strtotime( '-10 year' ));
-		$end_date = isset( $this->_req_data['txn-filter-end-date'] ) ? wp_strip_all_tags( $this->_req_data['txn-filter-end-date'] ) : date( 'm/d/Y', current_time('timestamp') );
+		$start_date = isset($this->_req_data['txn-filter-start-date']) ? wp_strip_all_tags($this->_req_data['txn-filter-start-date']) : date('m/d/Y', strtotime('-10 year'));
+		$end_date = isset($this->_req_data['txn-filter-end-date']) ? wp_strip_all_tags($this->_req_data['txn-filter-end-date']) : date('m/d/Y', current_time('timestamp'));
 		ob_start();
 		?>
 		<label for="txn-filter-start-date">Display Transactions from </label>
@@ -136,9 +136,9 @@ 
 	 *_add_view_counts
 	 */
 	protected function _add_view_counts() {
-		$this->_views['all']['count'] = $this->_admin_page->get_transactions( $this->_per_page, TRUE, 'all' );
-		$this->_views['abandoned']['count'] = $this->_admin_page->get_transactions( $this->_per_page, TRUE, 'abandoned' );
-		$this->_views['failed']['count'] = $this->_admin_page->get_transactions( $this->_per_page, TRUE, 'failed' );
+		$this->_views['all']['count'] = $this->_admin_page->get_transactions($this->_per_page, TRUE, 'all');
+		$this->_views['abandoned']['count'] = $this->_admin_page->get_transactions($this->_per_page, TRUE, 'abandoned');
+		$this->_views['failed']['count'] = $this->_admin_page->get_transactions($this->_per_page, TRUE, 'failed');
 	}
 
 
@@ -150,12 +150,12 @@ 
 	 * @return string
 	 * @throws \EE_Error
 	 */
-	public function column_TXN_ID( EE_Transaction $item ){
-    	$view_lnk_url = EE_Admin_Page::add_query_args_and_nonce( array( 'action'=>'view_transaction', 'TXN_ID'=>$item->ID() ), TXN_ADMIN_URL );
-	   $content = '<a href="' . $view_lnk_url . '" title="' . esc_attr__( 'Go to Transaction Details', 'event_espresso' ) . '">' . $item->ID() . '</a>';
+	public function column_TXN_ID(EE_Transaction $item) {
+    	$view_lnk_url = EE_Admin_Page::add_query_args_and_nonce(array('action'=>'view_transaction', 'TXN_ID'=>$item->ID()), TXN_ADMIN_URL);
+	   $content = '<a href="'.$view_lnk_url.'" title="'.esc_attr__('Go to Transaction Details', 'event_espresso').'">'.$item->ID().'</a>';
 
 	   //txn timestamp
-	   $content .= '  <span class="show-on-mobile-view-only">' . $this->_get_txn_timestamp( $item ) . '</span>';
+	   $content .= '  <span class="show-on-mobile-view-only">'.$this->_get_txn_timestamp($item).'</span>';
 	   return $content;
 	}
 
@@ -166,18 +166,18 @@ 
 	 * @return mixed|string|void
 	 * @throws \EE_Error
 	 */
-	protected function _get_txn_timestamp( EE_Transaction $item ) {
+	protected function _get_txn_timestamp(EE_Transaction $item) {
 		//txn timestamp
 		// is TXN less than 2 hours old ?
 		if (
-			( $item->failed() || $item->is_abandoned() )
+			($item->failed() || $item->is_abandoned())
 			&& (
-				( time() - EE_Registry::instance()->SSN->lifespan() ) < $item->datetime( false, true )
+				(time() - EE_Registry::instance()->SSN->lifespan()) < $item->datetime(false, true)
 			)
 		) {
-			$timestamp = __( 'TXN in progress...', 'event_espresso' );
+			$timestamp = __('TXN in progress...', 'event_espresso');
 	   } else {
-			$timestamp = $item->get_i18n_datetime( 'TXN_timestamp' );
+			$timestamp = $item->get_i18n_datetime('TXN_timestamp');
 		}
 		return $timestamp;
 	}
@@ -191,8 +191,8 @@ 
 	 * @return string
 	 * @throws \EE_Error
 	 */
-	public function column_cb($item ){
-		return sprintf( '<input type="checkbox" name="%1$s[]" value="%2$s" />', $this->_wp_list_args['singular'],  $item->ID());
+	public function column_cb($item) {
+		return sprintf('<input type="checkbox" name="%1$s[]" value="%2$s" />', $this->_wp_list_args['singular'], $item->ID());
 	}
 
 
@@ -204,11 +204,11 @@ 
 	 * @return string
 	 * @throws \EE_Error
 	 */
-	public function column_TXN_timestamp( EE_Transaction $item ){
-		$view_lnk_url = EE_Admin_Page::add_query_args_and_nonce( array( 'action'=>'view_transaction', 'TXN_ID'=>$item->ID() ), TXN_ADMIN_URL );
-		$txn_date = '<a href="'.$view_lnk_url.'" title="' . esc_attr__( 'View Transaction Details for TXN #', 'event_espresso' ) . $item->ID() . '">' . $this->_get_txn_timestamp( $item ) . '</a>';
+	public function column_TXN_timestamp(EE_Transaction $item) {
+		$view_lnk_url = EE_Admin_Page::add_query_args_and_nonce(array('action'=>'view_transaction', 'TXN_ID'=>$item->ID()), TXN_ADMIN_URL);
+		$txn_date = '<a href="'.$view_lnk_url.'" title="'.esc_attr__('View Transaction Details for TXN #', 'event_espresso').$item->ID().'">'.$this->_get_txn_timestamp($item).'</a>';
 		//status
-		$txn_date .= '<br><span class="ee-status-text-small">' . EEH_Template::pretty_status( $item->status_ID(), false, 'sentence' ) . '</span>';
+		$txn_date .= '<br><span class="ee-status-text-small">'.EEH_Template::pretty_status($item->status_ID(), false, 'sentence').'</span>';
 		return $txn_date;
 	}
 
@@ -221,11 +221,11 @@ 
 	 * @return string
 	 * @throws \EE_Error
 	 */
-	public function column_TXN_total( EE_Transaction $item ){
-		if ( $item->get('TXN_total') > 0 ) {
-			return '<span class="txn-pad-rght">' . apply_filters( 'FHEE__EE_Admin_Transactions_List_Table__column_TXN_total__TXN_total', $item->get_pretty('TXN_total'), $item ) . '</span>';
+	public function column_TXN_total(EE_Transaction $item) {
+		if ($item->get('TXN_total') > 0) {
+			return '<span class="txn-pad-rght">'.apply_filters('FHEE__EE_Admin_Transactions_List_Table__column_TXN_total__TXN_total', $item->get_pretty('TXN_total'), $item).'</span>';
 		} else {
-			return '<span class="txn-overview-free-event-spn">' . __( 'free', 'event_espresso' ) . '</span>';
+			return '<span class="txn-overview-free-event-spn">'.__('free', 'event_espresso').'</span>';
 		}
 	}
 
@@ -238,17 +238,17 @@ 
 	 * @return mixed|string
 	 * @throws \EE_Error
 	 */
-	public function column_TXN_paid( EE_Transaction $item ){
+	public function column_TXN_paid(EE_Transaction $item) {
 		$transaction_total = $item->get('TXN_total');
 		$transaction_paid = $item->get('TXN_paid');
 
-		if ( \EEH_Money::compare_floats( $transaction_total, 0,'>' ) ) {
+		if (\EEH_Money::compare_floats($transaction_total, 0, '>')) {
 			// monies owing
 			$span_class = 'txn-overview-part-payment-spn';
-			if ( \EEH_Money::compare_floats( $transaction_paid, $transaction_total, '>=' ) ) {
+			if (\EEH_Money::compare_floats($transaction_paid, $transaction_total, '>=')) {
 				// paid in full
 				$span_class = 'txn-overview-full-payment-spn';
-			} elseif ( \EEH_Money::compare_floats( $transaction_paid, 0, '==' ) ) {
+			} elseif (\EEH_Money::compare_floats($transaction_paid, 0, '==')) {
 				// no payments made
 				$span_class = 'txn-overview-no-payment-spn';
 			}
@@ -258,11 +258,11 @@ 
 		}
 
 		$payment_method = $item->payment_method();
-		$payment_method_name = $payment_method instanceof EE_Payment_Method ? $payment_method->admin_name() : __( 'Unknown', 'event_espresso' );
+		$payment_method_name = $payment_method instanceof EE_Payment_Method ? $payment_method->admin_name() : __('Unknown', 'event_espresso');
 
-		$content = '<span class="' . $span_class . ' txn-pad-rght">' . $transaction_paid !== 0 ? $item->get_pretty('TXN_paid') : $transaction_paid . '</span>';
-		if ( $transaction_paid > 0 ) {
-			$content .= '<br><span class="ee-status-text-small">' . sprintf( __( '...via %s', 'event_espresso' ), $payment_method_name ) . '</span>';
+		$content = '<span class="'.$span_class.' txn-pad-rght">'.$transaction_paid !== 0 ? $item->get_pretty('TXN_paid') : $transaction_paid.'</span>';
+		if ($transaction_paid > 0) {
+			$content .= '<br><span class="ee-status-text-small">'.sprintf(__('...via %s', 'event_espresso'), $payment_method_name).'</span>';
 		}
 		return $content;
 	}
@@ -276,13 +276,13 @@ 
 	 * @return string|void
 	 * @throws \EE_Error
 	 */
-	public function column_ATT_fname( EE_Transaction $item ){
+	public function column_ATT_fname(EE_Transaction $item) {
 		$primary_reg = $item->primary_registration();
 		$attendee = $primary_reg->get_first_related('Attendee');
-		if ( $attendee instanceof EE_Attendee ) {
-			$edit_lnk_url = EE_Admin_Page::add_query_args_and_nonce( array( 'action'=>'view_registration', '_REG_ID'=>$primary_reg->ID() ), REG_ADMIN_URL );
-			$content = EE_Registry::instance()->CAP->current_user_can( 'ee_read_registration', 'espresso_registrations_view_registration', $primary_reg->ID() ) ? '<a href="'.$edit_lnk_url.'" title="' . esc_attr__( 'View Registration Details', 'event_espresso' ) . '">' . $attendee->full_name() . '</a>' : $attendee->full_name();
-			$content .= '<br>' . $attendee->email();
+		if ($attendee instanceof EE_Attendee) {
+			$edit_lnk_url = EE_Admin_Page::add_query_args_and_nonce(array('action'=>'view_registration', '_REG_ID'=>$primary_reg->ID()), REG_ADMIN_URL);
+			$content = EE_Registry::instance()->CAP->current_user_can('ee_read_registration', 'espresso_registrations_view_registration', $primary_reg->ID()) ? '<a href="'.$edit_lnk_url.'" title="'.esc_attr__('View Registration Details', 'event_espresso').'">'.$attendee->full_name().'</a>' : $attendee->full_name();
+			$content .= '<br>'.$attendee->email();
 			return $content;
 		}
 		return $item->failed() || $item->is_abandoned() ? __('no contact record.', 'event_espresso') : __('No contact record, because the transaction was abandoned or the registration process failed.', 'event_espresso');
@@ -297,13 +297,13 @@ 
 	 * @return string|void
 	 * @throws \EE_Error
 	 */
-	public function column_ATT_email( EE_Transaction $item ){
+	public function column_ATT_email(EE_Transaction $item) {
 		$attendee = $item->primary_registration()->get_first_related('Attendee');
-		if ( ! empty( $attendee ) ) {
-			return '<a href="mailto:' . $attendee->get( 'ATT_email' ) . '">' . $attendee->get( 'ATT_email' ) . '</a>';
+		if ( ! empty($attendee)) {
+			return '<a href="mailto:'.$attendee->get('ATT_email').'">'.$attendee->get('ATT_email').'</a>';
 		} else {
 			return $item->failed() || $item->is_abandoned()
-				? __( 'no contact record.', 'event_espresso' )
+				? __('no contact record.', 'event_espresso')
 				: __(
 					'No contact record, because the transaction was abandoned or the registration process failed.',
 					'event_espresso'
@@ -320,20 +320,20 @@ 
 	 * @return string|void
 	 * @throws \EE_Error
 	 */
- 	public function column_event_name( EE_Transaction $item ){
+ 	public function column_event_name(EE_Transaction $item) {
     	$actions = array();
 		$event = $item->primary_registration()->get_first_related('Event');
-		if ( !empty( $event ) ) {
-			$edit_event_url = EE_Admin_Page::add_query_args_and_nonce( array( 'action'=>'edit', 'post'=>$event->ID() ), EVENTS_ADMIN_URL );
+		if ( ! empty($event)) {
+			$edit_event_url = EE_Admin_Page::add_query_args_and_nonce(array('action'=>'edit', 'post'=>$event->ID()), EVENTS_ADMIN_URL);
 			$event_name = $event->get('EVT_name');
 
 			//filter this view by transactions for this event
-			$txn_by_event_lnk = EE_Admin_Page::add_query_args_and_nonce( array( 'action' => 'default', 'EVT_ID' => $event->ID() ) );
-			if ( EE_Registry::instance()->CAP->current_user_can( 'ee_edit_event', 'espresso_events_edit', $event->ID() ) ) {
-				$actions['filter_by_event'] = '<a href="' . $txn_by_event_lnk . '" title="' . esc_attr__('Filter transactions by this event', 'event_espresso') . '">' . __('View Transactions for this event', 'event_espresso') . '</a>';
+			$txn_by_event_lnk = EE_Admin_Page::add_query_args_and_nonce(array('action' => 'default', 'EVT_ID' => $event->ID()));
+			if (EE_Registry::instance()->CAP->current_user_can('ee_edit_event', 'espresso_events_edit', $event->ID())) {
+				$actions['filter_by_event'] = '<a href="'.$txn_by_event_lnk.'" title="'.esc_attr__('Filter transactions by this event', 'event_espresso').'">'.__('View Transactions for this event', 'event_espresso').'</a>';
 			}
 
-			return sprintf('%1$s %2$s', EE_Registry::instance()->CAP->current_user_can( 'ee_edit_event', 'espresso_events_edit', $event->ID() ) ? '<a href="' . $edit_event_url . '" title="' . sprintf( esc_attr__( 'Edit Event: %s', 'event_espresso' ), $event->get('EVT_name') ) .'">' .  wp_trim_words( $event_name, 30, '...' ) . '</a>' : wp_trim_words( $event_name, 30, '...' ), $this->row_actions($actions) );
+			return sprintf('%1$s %2$s', EE_Registry::instance()->CAP->current_user_can('ee_edit_event', 'espresso_events_edit', $event->ID()) ? '<a href="'.$edit_event_url.'" title="'.sprintf(esc_attr__('Edit Event: %s', 'event_espresso'), $event->get('EVT_name')).'">'.wp_trim_words($event_name, 30, '...').'</a>' : wp_trim_words($event_name, 30, '...'), $this->row_actions($actions));
 		} else {
 			return __('The event associated with this transaction via the primary registration cannot be retrieved.', 'event_espresso');
 		}
@@ -348,35 +348,35 @@ 
 	 * @return string
 	 * @throws \EE_Error
 	 */
- 	public function column_actions( EE_Transaction $item ){
+ 	public function column_actions(EE_Transaction $item) {
 
     	$registration = $item->primary_registration();
     	$attendee = $registration->attendee();
 
         //Build row actions
-		$view_lnk_url = EE_Admin_Page::add_query_args_and_nonce( array( 'action'=>'view_transaction', 'TXN_ID'=>$item->ID() ), TXN_ADMIN_URL );
+		$view_lnk_url = EE_Admin_Page::add_query_args_and_nonce(array('action'=>'view_transaction', 'TXN_ID'=>$item->ID()), TXN_ADMIN_URL);
 		$dl_invoice_lnk_url = $registration->invoice_url();
 		$dl_receipt_lnk_url = $registration->receipt_url();
-		$view_reg_lnk_url = EE_Admin_Page::add_query_args_and_nonce( array( 'action'=>'view_registration', '_REG_ID'=>$registration->ID() ), REG_ADMIN_URL );
-		$send_pay_lnk_url = EE_Admin_Page::add_query_args_and_nonce( array( 'action'=>'send_payment_reminder', 'TXN_ID'=>$item->ID() ), TXN_ADMIN_URL );
-	    $related_messages_link = EEH_MSG_Template::get_message_action_link( 'see_notifications_for', null, array(
+		$view_reg_lnk_url = EE_Admin_Page::add_query_args_and_nonce(array('action'=>'view_registration', '_REG_ID'=>$registration->ID()), REG_ADMIN_URL);
+		$send_pay_lnk_url = EE_Admin_Page::add_query_args_and_nonce(array('action'=>'send_payment_reminder', 'TXN_ID'=>$item->ID()), TXN_ADMIN_URL);
+	    $related_messages_link = EEH_MSG_Template::get_message_action_link('see_notifications_for', null, array(
 		    'TXN_ID' => $item->ID()
 	    ));
 
 		//Build row actions
 		$view_lnk = '
 			<li>
-				<a href="'.$view_lnk_url.'" title="' . esc_attr__( 'View Transaction Details', 'event_espresso' ) . '" class="tiny-text">
+				<a href="'.$view_lnk_url.'" title="'.esc_attr__('View Transaction Details', 'event_espresso').'" class="tiny-text">
 					<span class="dashicons dashicons-cart"></span>
 				</a>
 			</li>';
 
 		$dl_invoice_lnk = '';
 		//only show invoice link if message type is active.
-		if ( $attendee instanceof EE_Attendee && EEH_MSG_Template::is_mt_active( 'invoice' ) ) {
+		if ($attendee instanceof EE_Attendee && EEH_MSG_Template::is_mt_active('invoice')) {
 			$dl_invoice_lnk = '
 			<li>
-				<a title="' . esc_attr__( 'View Transaction Invoice', 'event_espresso' ) . '" target="_blank" href="'.$dl_invoice_lnk_url.'" class="tiny-text">
+				<a title="' . esc_attr__('View Transaction Invoice', 'event_espresso').'" target="_blank" href="'.$dl_invoice_lnk_url.'" class="tiny-text">
 					<span class="dashicons dashicons-media-spreadsheet ee-icon-size-18"></span>
 				</a>
 			</li>';
@@ -384,17 +384,17 @@ 
 
 		$dl_receipt_lnk = '';
 		//only show receipt link if message type is active.
-		if ( $attendee instanceof EE_Attendee && EEH_MSG_Template::is_mt_active( 'receipt' ) ) {
+		if ($attendee instanceof EE_Attendee && EEH_MSG_Template::is_mt_active('receipt')) {
 			$dl_receipt_lnk = '
 			<li>
-				<a title="' . esc_attr__( 'View Transaction Receipt', 'event_espresso' ) . '" target="_blank" href="'.$dl_receipt_lnk_url.'" class="tiny-text">
+				<a title="' . esc_attr__('View Transaction Receipt', 'event_espresso').'" target="_blank" href="'.$dl_receipt_lnk_url.'" class="tiny-text">
 					<span class="dashicons dashicons-media-default ee-icon-size-18"></span>
 				</a>
 			</li>';
 		}
 
 		//only show payment reminder link if the message type is active.
-		if ( EEH_MSG_Template::is_mt_active( 'payment_reminder' ) ) {
+		if (EEH_MSG_Template::is_mt_active('payment_reminder')) {
 			$send_pay_lnk = $attendee instanceof EE_Attendee
 							&& EE_Registry::instance()->CAP->current_user_can(
 								'ee_send_message',
@@ -402,7 +402,7 @@ 
 							)
 				? '
 				<li>
-					<a href="'.$send_pay_lnk_url.'" title="' . esc_attr__( 'Send Payment Reminder', 'event_espresso' ) . '" class="tiny-text">
+					<a href="'.$send_pay_lnk_url.'" title="'.esc_attr__('Send Payment Reminder', 'event_espresso').'" class="tiny-text">
 						<span class="dashicons dashicons-email-alt"></span>
 					</a>
 				</li>'
@@ -422,18 +422,18 @@ 
 		)
 			? '
 				<li>
-					<a href="'.$view_reg_lnk_url.'" title="' . esc_attr__( 'View Registration Details', 'event_espresso' ) . '" class="tiny-text">
+					<a href="'.$view_reg_lnk_url.'" title="'.esc_attr__('View Registration Details', 'event_espresso').'" class="tiny-text">
 						<span class="dashicons dashicons-clipboard"></span>
 					</a>
 				</li>'
 			: '';
 
 		$view_related_messages_lnk = '';
-		if ( EE_Registry::instance()->CAP->current_user_can( 'ee_read_global_messages', 'view_filtered_messages' ) ) {
-			$view_related_messages_lnk = '<li>' . $related_messages_link . '</li>';
+		if (EE_Registry::instance()->CAP->current_user_can('ee_read_global_messages', 'view_filtered_messages')) {
+			$view_related_messages_lnk = '<li>'.$related_messages_link.'</li>';
 		}
 
-		return $this->_action_string( $view_lnk . $dl_invoice_lnk . $dl_receipt_lnk . $view_reg_lnk . $send_pay_lnk . $view_related_messages_lnk, $item, 'ul', 'txn-overview-actions-ul' );
+		return $this->_action_string($view_lnk.$dl_invoice_lnk.$dl_receipt_lnk.$view_reg_lnk.$send_pay_lnk.$view_related_messages_lnk, $item, 'ul', 'txn-overview-actions-ul');
     }
 
 

core/libraries/messages/defaults/default/email_payment_reminder_content.template.php

Spacing +16 added lines, -16 removed lines

@@ -31,29 +31,29 @@ 
 						<tbody>
 							<tr>
 								<td>
-									<h2><?php printf( esc_html__( 'Hello, %s:', 'event_espresso' ), '[PRIMARY_REGISTRANT_FNAME] [PRIMARY_REGISTRANT_LNAME]' ); ?></h2>
-									<p class="lead"><?php esc_html_e( "We'd like to remind you that you still owe money for the following transaction:", 'event_espresso' ); ?></p>
-									<h3><?php esc_html_e( 'Payment Details:', 'event_espresso' ); ?></h3>
+									<h2><?php printf(esc_html__('Hello, %s:', 'event_espresso'), '[PRIMARY_REGISTRANT_FNAME] [PRIMARY_REGISTRANT_LNAME]'); ?></h2>
+									<p class="lead"><?php esc_html_e("We'd like to remind you that you still owe money for the following transaction:", 'event_espresso'); ?></p>
+									<h3><?php esc_html_e('Payment Details:', 'event_espresso'); ?></h3>
 									<ul>
 										<li>
-											<strong><?php esc_html_e( 'Payment Status:', 'event_espresso' ); ?></strong> [PAYMENT_STATUS]
+											<strong><?php esc_html_e('Payment Status:', 'event_espresso'); ?></strong> [PAYMENT_STATUS]
 										</li>
 										<li>
-											<strong><?php esc_html_e( 'Transaction ID:', 'event_espresso' ); ?></strong> [TXN_ID]
+											<strong><?php esc_html_e('Transaction ID:', 'event_espresso'); ?></strong> [TXN_ID]
 										</li>
 										<li>
-											<strong><?php esc_html_e( 'Total Cost:', 'event_espresso' ); ?></strong> [TOTAL_COST]
+											<strong><?php esc_html_e('Total Cost:', 'event_espresso'); ?></strong> [TOTAL_COST]
 										</li>
 										<li>
-											<strong><?php esc_html_e( 'Amount Due:', 'event_espresso' ); ?></strong> [TOTAL_OWING]
+											<strong><?php esc_html_e('Amount Due:', 'event_espresso'); ?></strong> [TOTAL_OWING]
 										</li>
 									</ul>
 									<p class="callout">
-										<?php printf( esc_html__( 'Please %sretry your payment%s, or choose an alternate payment method to reserve your space.', 'event_espresso' ), '<a href="[PAYMENT_URL]">', '</a>' ); ?>
+										<?php printf(esc_html__('Please %sretry your payment%s, or choose an alternate payment method to reserve your space.', 'event_espresso'), '<a href="[PAYMENT_URL]">', '</a>'); ?>
 									</p>
 									[EVENT_LIST]
 									<p class="callout">
-										<?php printf( esc_html__( 'Please %sretry your payment%s, or choose an alternate payment method to reserve your space.', 'event_espresso' ), '<a href="[PAYMENT_URL]">', '</a>' ); ?>
+										<?php printf(esc_html__('Please %sretry your payment%s, or choose an alternate payment method to reserve your space.', 'event_espresso'), '<a href="[PAYMENT_URL]">', '</a>'); ?>
 									</p>
 								</td>
 							</tr>
@@ -78,10 +78,10 @@ 
 									<tbody>
 										<tr>
 											<td>
-												<h3><?php esc_html_e( 'Connect with Us:', 'event_espresso' ); ?></h3>
-												<a class="soc-btn fb" href="[CO_FACEBOOK_URL]"><?php esc_html_e( 'Facebook', 'event_espresso' ); ?></a>
-												<a class="soc-btn tw" href="[CO_TWITTER_URL]"><?php esc_html_e( 'Twitter', 'event_espresso' ); ?></a>
-												<a class="soc-btn gp" href="[CO_GOOGLE_URL]"><?php esc_html_e( 'Google+', 'event_espresso' ); ?></a>
+												<h3><?php esc_html_e('Connect with Us:', 'event_espresso'); ?></h3>
+												<a class="soc-btn fb" href="[CO_FACEBOOK_URL]"><?php esc_html_e('Facebook', 'event_espresso'); ?></a>
+												<a class="soc-btn tw" href="[CO_TWITTER_URL]"><?php esc_html_e('Twitter', 'event_espresso'); ?></a>
+												<a class="soc-btn gp" href="[CO_GOOGLE_URL]"><?php esc_html_e('Google+', 'event_espresso'); ?></a>
 											</td>
 										</tr>
 									</tbody>
@@ -91,9 +91,9 @@ 
 									<tbody>
 										<tr>
 											<td>
-												<h3><?php esc_html_e( 'Contact Info:', 'event_espresso' ); ?></h3>
-												<?php esc_html_e( 'Phone:', 'event_espresso' ); ?> <strong>[CO_PHONE]</strong>
-												<?php esc_html_e( 'Email:', 'event_espresso' ); ?>
+												<h3><?php esc_html_e('Contact Info:', 'event_espresso'); ?></h3>
+												<?php esc_html_e('Phone:', 'event_espresso'); ?> <strong>[CO_PHONE]</strong>
+												<?php esc_html_e('Email:', 'event_espresso'); ?>
 												<strong><a href="mailto:[CO_EMAIL]" target="_blank">[CO_EMAIL]</a></strong>
 											</td>
 										</tr>

core/libraries/messages/defaults/default/email_payment_reminder_content_admin.template.php

Spacing +9 added lines, -9 removed lines

@@ -31,23 +31,23 @@ 
 						<tbody>
 							<tr>
 								<td>
-									<h1><?php esc_html_e( 'Payment Reminder Notification', 'event_espresso' ); ?></h1>
-									<?php esc_html_e( 'The following message was sent to the Primary Registrant of this transaction:', 'event_espresso' ); ?>
-									<h3><?php esc_html_e( 'Payment Details:', 'event_espresso' ); ?></h3>
+									<h1><?php esc_html_e('Payment Reminder Notification', 'event_espresso'); ?></h1>
+									<?php esc_html_e('The following message was sent to the Primary Registrant of this transaction:', 'event_espresso'); ?>
+									<h3><?php esc_html_e('Payment Details:', 'event_espresso'); ?></h3>
 									<ul>
 										<li>
-											<strong><?php esc_html_e( 'Payment Status:', 'event_espresso' ); ?></strong> [PAYMENT_STATUS]
+											<strong><?php esc_html_e('Payment Status:', 'event_espresso'); ?></strong> [PAYMENT_STATUS]
 										</li>
-										<li><strong><?php esc_html_e( 'Transaction ID:', 'event_espresso' ); ?></strong>
+										<li><strong><?php esc_html_e('Transaction ID:', 'event_espresso'); ?></strong>
 											<a href="[TRANSACTION_ADMIN_URL]">[TXN_ID]</a></li>
 										<li>
-											<strong><?php esc_html_e( 'Payment Gateway:', 'event_espresso' ); ?></strong> [PAYMENT_GATEWAY]
+											<strong><?php esc_html_e('Payment Gateway:', 'event_espresso'); ?></strong> [PAYMENT_GATEWAY]
 										</li>
 										<li>
-											<strong><?php esc_html_e( 'Total Cost:', 'event_espresso' ); ?></strong> [TOTAL_COST]
+											<strong><?php esc_html_e('Total Cost:', 'event_espresso'); ?></strong> [TOTAL_COST]
 										</li>
 										<li>
-											<strong><?php esc_html_e( 'Amount Due:', 'event_espresso' ); ?></strong> [TOTAL_OWING]
+											<strong><?php esc_html_e('Amount Due:', 'event_espresso'); ?></strong> [TOTAL_OWING]
 										</li>
 									</ul>
 								</td>
@@ -56,7 +56,7 @@ 
 					</table>
 				</div>
 				<div class="content">
-					<h2><?php esc_html_e( 'Registrant Details:', 'event_espresso' ); ?></h2>
+					<h2><?php esc_html_e('Registrant Details:', 'event_espresso'); ?></h2>
 					<p class="callout"><strong>[PRIMARY_REGISTRANT_FNAME] [PRIMARY_REGISTRANT_LNAME]:</strong>
 						<a href="mailto:[PRIMARY_REGISTRANT_EMAIL]">[PRIMARY_REGISTRANT_EMAIL]</a></p>
 				</div>

core/libraries/shortcodes/EE_Recipient_Details_Shortcodes.lib.php

Indentation +5 added lines, -5 removed lines

@@ -64,14 +64,14 @@
 		//make sure we end up with a copy of the EE_Messages_Addressee object
 		$this->_recipient = $this->_data instanceof EE_Messages_Addressee ? $this->_data : null;
 		$this->_recipient = ! $this->_recipient instanceof EE_Messages_Addressee
-		                    && is_array( $this->_data )
-		                    && isset( $this->_data['data'] )
-		                    && $this->_data['data'] instanceof EE_Messages_Addressee
+							&& is_array( $this->_data )
+							&& isset( $this->_data['data'] )
+							&& $this->_data['data'] instanceof EE_Messages_Addressee
 			? $this->_data['data'] :
 			$this->_recipient;
 		$this->_recipient = ! $this->_recipient instanceof EE_Messages_Addressee
-		                    && ! empty( $this->_extra_data['data'] )
-		                    && $this->_extra_data['data'] instanceof EE_Messages_Addressee
+							&& ! empty( $this->_extra_data['data'] )
+							&& $this->_extra_data['data'] instanceof EE_Messages_Addressee
 			? $this->_extra_data['data']
 			: $this->_recipient;
 

Spacing +65 added lines, -66 removed lines

@@ -1,6 +1,6 @@ 
 <?php
 
-if (!defined('EVENT_ESPRESSO_VERSION') )
+if ( ! defined('EVENT_ESPRESSO_VERSION'))
 	exit('NO direct script access allowed');
 
 /**
@@ -37,24 +37,24 @@ 
 
 
 	protected function _init_props() {
-		$this->label = esc_html__( 'Recipient Details Shortcodes', 'event_espresso' );
-		$this->description = esc_html__( 'All shortcodes specific to recipient registration data', 'event_espresso' );
+		$this->label = esc_html__('Recipient Details Shortcodes', 'event_espresso');
+		$this->description = esc_html__('All shortcodes specific to recipient registration data', 'event_espresso');
 		$this->_shortcodes = array(
-			'[RECIPIENT_FNAME]' => esc_html__( 'Parses to the first name of the recipient for the message.', 'event_espresso' ),
-			'[RECIPIENT_LNAME]' => esc_html__( 'Parses to the last name of the recipient for the message.', 'event_espresso' ),
-			'[RECIPIENT_EMAIL]' => esc_html__( 'Parses to the email address of the recipient for the message.', 'event_espresso' ),
-			'[RECIPIENT_REGISTRATION_ID]' => esc_html__( 'Parses to the registration ID of the recipient for the message.', 'event_espresso' ),
-			'[RECIPIENT_REGISTRATION_CODE]' => esc_html__( 'Parses to the registration code of the recipient for the message.', 'event_espresso' ),
-			'[RECIPIENT_EDIT_REGISTRATION_LINK]' => esc_html__( 'Parses to a link for frontend editing of the registration for the recipient.', 'event_espresso' ),
-			'[RECIPIENT_PHONE_NUMBER]' => esc_html__( 'The Phone Number for the recipient of the message.', 'event_espresso' ),
-			'[RECIPIENT_ADDRESS]' => esc_html__( 'The Address for the recipient of the message.', 'event_espresso' ),
-			'[RECIPIENT_ADDRESS2]' => esc_html__( 'Whatever was in the address 2 field for the recipient of the message.', 'event_espresso' ),
-			'[RECIPIENT_CITY]' => esc_html__( 'The city for the recipient of the message.', 'event_espresso' ),
-			'[RECIPIENT_ZIP_PC]' => esc_html__( 'The ZIP (or Postal) Code for the recipient of the message.', 'event_espresso' ),
-			'[RECIPIENT_ADDRESS_STATE]' => esc_html__( 'The state/province for the recipient of the message.', 'event_espresso' ),
-			'[RECIPIENT_COUNTRY]' => esc_html__( 'The country for the recipient of the message.', 'event_espresso' ),
-			'[RECIPIENT_ANSWER_*]' => esc_html__( 'This is a special dynamic shortcode.  After the "*", add the exact text of an existing question, and if there is an answer for that question for this recipient, then it will be output in place of this shortcode.', 'event_espresso' ),
-			'[RECIPIENT_TOTAL_AMOUNT_PAID]' => esc_html__( 'If a single registration related to the recipient is available, that is used to retrieve the total amount that has been paid for this recipient.  Otherwise the value of 0 is printed.', 'event_espresso' )
+			'[RECIPIENT_FNAME]' => esc_html__('Parses to the first name of the recipient for the message.', 'event_espresso'),
+			'[RECIPIENT_LNAME]' => esc_html__('Parses to the last name of the recipient for the message.', 'event_espresso'),
+			'[RECIPIENT_EMAIL]' => esc_html__('Parses to the email address of the recipient for the message.', 'event_espresso'),
+			'[RECIPIENT_REGISTRATION_ID]' => esc_html__('Parses to the registration ID of the recipient for the message.', 'event_espresso'),
+			'[RECIPIENT_REGISTRATION_CODE]' => esc_html__('Parses to the registration code of the recipient for the message.', 'event_espresso'),
+			'[RECIPIENT_EDIT_REGISTRATION_LINK]' => esc_html__('Parses to a link for frontend editing of the registration for the recipient.', 'event_espresso'),
+			'[RECIPIENT_PHONE_NUMBER]' => esc_html__('The Phone Number for the recipient of the message.', 'event_espresso'),
+			'[RECIPIENT_ADDRESS]' => esc_html__('The Address for the recipient of the message.', 'event_espresso'),
+			'[RECIPIENT_ADDRESS2]' => esc_html__('Whatever was in the address 2 field for the recipient of the message.', 'event_espresso'),
+			'[RECIPIENT_CITY]' => esc_html__('The city for the recipient of the message.', 'event_espresso'),
+			'[RECIPIENT_ZIP_PC]' => esc_html__('The ZIP (or Postal) Code for the recipient of the message.', 'event_espresso'),
+			'[RECIPIENT_ADDRESS_STATE]' => esc_html__('The state/province for the recipient of the message.', 'event_espresso'),
+			'[RECIPIENT_COUNTRY]' => esc_html__('The country for the recipient of the message.', 'event_espresso'),
+			'[RECIPIENT_ANSWER_*]' => esc_html__('This is a special dynamic shortcode.  After the "*", add the exact text of an existing question, and if there is an answer for that question for this recipient, then it will be output in place of this shortcode.', 'event_espresso'),
+			'[RECIPIENT_TOTAL_AMOUNT_PAID]' => esc_html__('If a single registration related to the recipient is available, that is used to retrieve the total amount that has been paid for this recipient.  Otherwise the value of 0 is printed.', 'event_espresso')
 			);
 	}
 
@@ -65,36 +65,35 @@ 
 	 * @param  string $shortcode the shortcode to be parsed.
 	 * @return string parsed shortcode
 	 */
-	protected function _parser( $shortcode ) {
+	protected function _parser($shortcode) {
 
 		//make sure we end up with a copy of the EE_Messages_Addressee object
 		$this->_recipient = $this->_data instanceof EE_Messages_Addressee ? $this->_data : null;
 		$this->_recipient = ! $this->_recipient instanceof EE_Messages_Addressee
-		                    && is_array( $this->_data )
-		                    && isset( $this->_data['data'] )
+		                    && is_array($this->_data)
+		                    && isset($this->_data['data'])
 		                    && $this->_data['data'] instanceof EE_Messages_Addressee
-			? $this->_data['data'] :
-			$this->_recipient;
+			? $this->_data['data'] : $this->_recipient;
 		$this->_recipient = ! $this->_recipient instanceof EE_Messages_Addressee
-		                    && ! empty( $this->_extra_data['data'] )
+		                    && ! empty($this->_extra_data['data'])
 		                    && $this->_extra_data['data'] instanceof EE_Messages_Addressee
 			? $this->_extra_data['data']
 			: $this->_recipient;
 
-		if ( ! $this->_recipient instanceof EE_Messages_Addressee ) {
+		if ( ! $this->_recipient instanceof EE_Messages_Addressee) {
 			return '';
 		}
 
 		$attendee = $this->_recipient->att_obj;
-		if ( ! $attendee instanceof EE_Attendee ) {
+		if ( ! $attendee instanceof EE_Attendee) {
 			return '';
 		}
 
-		$this->_registrations_for_recipient = isset( $this->_recipient->attendees[ $attendee->ID() ]['reg_objs'] )
-			? $this->_recipient->attendees[ $attendee->ID() ]['reg_objs']
+		$this->_registrations_for_recipient = isset($this->_recipient->attendees[$attendee->ID()]['reg_objs'])
+			? $this->_recipient->attendees[$attendee->ID()]['reg_objs']
 			: array();
 
-		switch ( $shortcode ) {
+		switch ($shortcode) {
 			case '[RECIPIENT_FNAME]' :
 				return $attendee->fname();
 				break;
@@ -108,21 +107,21 @@ 
 				break;
 
 			case '[RECIPIENT_REGISTRATION_ID]' :
-				if ( ! $this->_recipient->reg_obj instanceof EE_Registration ) {
+				if ( ! $this->_recipient->reg_obj instanceof EE_Registration) {
 					return '';
 				}
 				return $this->_get_reg_id();
 				break;
 
 			case '[RECIPIENT_REGISTRATION_CODE]' :
-				if ( ! $this->_recipient->reg_obj instanceof EE_Registration ) {
+				if ( ! $this->_recipient->reg_obj instanceof EE_Registration) {
 					return '';
 				}
 				return $this->_get_reg_code();
 				break;
 
 			case '[RECIPIENT_EDIT_REGISTRATION_LINK]' :
-				if ( ! $this->_recipient->reg_obj instanceof EE_Registration ) {
+				if ( ! $this->_recipient->reg_obj instanceof EE_Registration) {
 					return '';
 				}
 				return $this->_recipient->reg_obj->edit_attendee_information_url();
@@ -164,23 +163,23 @@ 
 				break;
 		}
 
-		if ( strpos( $shortcode, '[RECIPIENT_ANSWER_*' ) !== false ) {
-			$shortcode = str_replace( '[RECIPIENT_ANSWER_*', '', $shortcode );
-			$shortcode = trim( str_replace( ']', '', $shortcode ) );
+		if (strpos($shortcode, '[RECIPIENT_ANSWER_*') !== false) {
+			$shortcode = str_replace('[RECIPIENT_ANSWER_*', '', $shortcode);
+			$shortcode = trim(str_replace(']', '', $shortcode));
 
 
 			//now let's figure out what question has this text
-			if ( empty( $this->_recipient->questions ) || ! $this->_recipient->reg_obj instanceof EE_Registration ) {
+			if (empty($this->_recipient->questions) || ! $this->_recipient->reg_obj instanceof EE_Registration) {
 				return '';
 			}
 
-			foreach ( $this->_recipient->questions as $ansid => $question ) {
+			foreach ($this->_recipient->questions as $ansid => $question) {
 				if (
 					$question instanceof EE_Question
 					&& $question->display_text() == $shortcode
-					&& isset( $this->_recipient->registrations[ $this->_recipient->reg_obj->ID() ]['ans_objs'][ $ansid ] )
+					&& isset($this->_recipient->registrations[$this->_recipient->reg_obj->ID()]['ans_objs'][$ansid])
 				) {
-					return $this->_recipient->registrations[ $this->_recipient->reg_obj->ID() ]['ans_objs'][ $ansid ]->get_pretty( 'ANS_value', 'no_wpautop' );
+					return $this->_recipient->registrations[$this->_recipient->reg_obj->ID()]['ans_objs'][$ansid]->get_pretty('ANS_value', 'no_wpautop');
 				}
 			}
 		}
@@ -211,53 +210,53 @@ 
 	protected function _get_reg_code() {
 
 		//if only one related registration for the recipient then just return that reg code.
-		if ( count( $this->_registrations_for_recipient ) <= 1 )  {
+		if (count($this->_registrations_for_recipient) <= 1) {
 			return $this->_recipient->reg_obj->reg_code();
 		}
 
 		//k more than one registration so let's see if we can get specific to context
 		//are we parsing event_list?
-		if ( $this->_data instanceof EE_Event ) {
+		if ($this->_data instanceof EE_Event) {
 			$reg_code = array();
 			//loop through registrations for recipient and see if there is a match for this event
-			foreach ( $this->_registrations_for_recipient as $reg ) {
-				if ( $reg instanceof EE_Registration && $reg->event_ID() == $this->_data->ID() ) {
+			foreach ($this->_registrations_for_recipient as $reg) {
+				if ($reg instanceof EE_Registration && $reg->event_ID() == $this->_data->ID()) {
 					$reg_code[] = $reg->reg_code();
 				}
 			}
-			return implode( ', ', $reg_code );
+			return implode(', ', $reg_code);
 		}
 
 		//are we parsing ticket list?
-		if ( $this->_data instanceof EE_Ticket ) {
+		if ($this->_data instanceof EE_Ticket) {
 			$reg_code = array();
 			//loop through each registration for recipient and see if there is a match for this ticket
-			foreach ( $this->_registrations_for_recipient as $reg ) {
-				if ( $reg instanceof EE_Registration && $reg->ticket_ID() == $this->_data->ID() ) {
+			foreach ($this->_registrations_for_recipient as $reg) {
+				if ($reg instanceof EE_Registration && $reg->ticket_ID() == $this->_data->ID()) {
 					$reg_code = $reg->reg_code();
 				}
 			}
-			return implode( ', ', $reg_code );
+			return implode(', ', $reg_code);
 		}
 
 		//do we have a specific reg_obj?  Let's use it
-		if ( $this->_data instanceof EE_Messages_Addressee && $this->_data->reg_obj instanceof EE_Registration ) {
+		if ($this->_data instanceof EE_Messages_Addressee && $this->_data->reg_obj instanceof EE_Registration) {
 			return $this->_data->reg_obj->reg_code();
 		}
 
 		//do we have a specific reg_obj?  Let's use it
-		if ( $this->_data instanceof EE_Messages_Addressee && $this->_data->reg_obj instanceof EE_Registration ) {
+		if ($this->_data instanceof EE_Messages_Addressee && $this->_data->reg_obj instanceof EE_Registration) {
 			return $this->_data->reg_obj->reg_code();
 		}
 
 		//not able to determine the single reg code so let's return a comma delimited list of reg codes.
 		$reg_code = array();
-		foreach ( $this->_registrations_for_recipient as $reg ) {
-			if ( $reg instanceof EE_Registration ) {
+		foreach ($this->_registrations_for_recipient as $reg) {
+			if ($reg instanceof EE_Registration) {
 				$reg_code[] = $reg->reg_code();
 			}
 		}
-		return implode( ', ', $reg_code );
+		return implode(', ', $reg_code);
 	}
 
 
@@ -270,48 +269,48 @@ 
 	protected function _get_reg_id() {
 
 		//if only one related registration for the recipient then just return that reg code.
-		if ( count( $this->_registrations_for_recipient ) <= 1 )  {
+		if (count($this->_registrations_for_recipient) <= 1) {
 			return $this->_recipient->reg_obj->ID();
 		}
 
 		//k more than one registration so let's see if we can get specific to context
 		//are we parsing event_list?
-		if ( $this->_data instanceof EE_Event ) {
+		if ($this->_data instanceof EE_Event) {
 			$registration_ids = array();
 			//loop through registrations for recipient and see if there is a match for this event
-			foreach ( $this->_registrations_for_recipient as $reg ) {
-				if ( $reg instanceof EE_Registration && $reg->event_ID() == $this->_data->ID() ) {
+			foreach ($this->_registrations_for_recipient as $reg) {
+				if ($reg instanceof EE_Registration && $reg->event_ID() == $this->_data->ID()) {
 					$registration_ids[] = $reg->ID();
 				}
 			}
-			return implode( ', ', $registration_ids );
+			return implode(', ', $registration_ids);
 		}
 
 		//are we parsing ticket list?
-		if ( $this->_data instanceof EE_Ticket ) {
+		if ($this->_data instanceof EE_Ticket) {
 			$registration_ids = array();
 			//loop through each registration for recipient and see if there is a match for this ticket
-			foreach ( $this->_registrations_for_recipient as $reg ) {
-				if ( $reg instanceof EE_Registration && $reg->ticket_ID() == $this->_data->ID() ) {
+			foreach ($this->_registrations_for_recipient as $reg) {
+				if ($reg instanceof EE_Registration && $reg->ticket_ID() == $this->_data->ID()) {
 					$registration_ids = $reg->ID();
 				}
 			}
-			return implode( ', ', $registration_ids );
+			return implode(', ', $registration_ids);
 		}
 
 		//do we have a specific reg_obj?  Let's use it
-		if ( $this->_data instanceof EE_Messages_Addressee && $this->_data->reg_obj instanceof EE_Registration ) {
+		if ($this->_data instanceof EE_Messages_Addressee && $this->_data->reg_obj instanceof EE_Registration) {
 			return $this->_data->reg_obj->ID();
 		}
 
 		//not able to determine the single reg code so let's return a comma delimited list of reg codes.
 		$registration_ids = array();
-		foreach ( $this->_registrations_for_recipient as $reg ) {
-			if ( $reg instanceof EE_Registration ) {
+		foreach ($this->_registrations_for_recipient as $reg) {
+			if ($reg instanceof EE_Registration) {
 				$registration_ids[] = $reg->ID();
 			}
 		}
-		return implode( ', ', $registration_ids );
+		return implode(', ', $registration_ids);
 	}
 
 

core/libraries/shortcodes/EE_Attendee_Shortcodes.lib.php

Indentation +1 added lines, -1 removed lines

@@ -41,7 +41,7 @@
 
 	/**
 	 * EE_Attendee_Shortcodes constructor.
-	*/
+	 */
 	public function __construct() {
 		parent::__construct();
 	}

Spacing +36 added lines, -36 removed lines

@@ -1,6 +1,6 @@ 
 <?php
 
-if (!defined('EVENT_ESPRESSO_VERSION') )
+if ( ! defined('EVENT_ESPRESSO_VERSION'))
 	exit('NO direct script access allowed');
 
 /**
@@ -49,26 +49,26 @@ 
 
 
 	protected function _init_props() {
-		$this->label = esc_html__( 'Attendee Shortcodes', 'event_espresso' );
-		$this->description = esc_html__( 'All shortcodes specific to attendee related data', 'event_espresso' );
+		$this->label = esc_html__('Attendee Shortcodes', 'event_espresso');
+		$this->description = esc_html__('All shortcodes specific to attendee related data', 'event_espresso');
 		$this->_shortcodes = array(
-			'[FNAME]' => esc_html__( 'First Name of an attendee.', 'event_espresso' ),
-			'[LNAME]' => esc_html__( 'Last Name of an attendee.', 'event_espresso' ),
-			'[ATTENDEE_EMAIL]' => esc_html__( 'Email address for the attendee.', 'event_espresso' ),
-			'[EDIT_ATTENDEE_LINK]' => esc_html__( 'Edit Registration Link (typically you\'d only use this for messages going to event administrators)', 'event_espresso' ),
-			'[REGISTRATION_ID]' => esc_html__( 'Unique Registration ID for the registration', 'event_espresso' ),
-			'[REGISTRATION_CODE]' => esc_html__( 'Unique Registration Code for the registration', 'event_espresso' ),
-			'[REGISTRATION_STATUS_ID]' => esc_html__( 'Parses to the registration status for the attendee', 'event_espresso' ),
-			'[REGISTRATION_STATUS_LABEL]' => esc_html__( 'Parses to the status label for the registrant', 'event_espresso' ),
-			'[REGISTRATION_TOTAL_AMOUNT_PAID]' => esc_html__( 'Parses to the total amount paid for this registration.', 'event_espresso' ),
-			'[FRONTEND_EDIT_REG_LINK]' => esc_html__( 'Generates a link for the given registration to edit this registration details on the frontend.', 'event_espresso' ),
-			'[PHONE_NUMBER]' => esc_html__( 'The Phone Number for the Registration.', 'event_espresso' ),
-			'[ADDRESS]' => esc_html__( 'The Address for the Registration', 'event_espresso' ),
-			'[ADDRESS2]' => esc_html__( 'Whatever was in the address 2 field for the registration.', 'event_espresso' ),
-			'[CITY]' => esc_html__( 'The city for the registration.', 'event_espresso' ),
-			'[ZIP_PC]' => esc_html__( 'The ZIP (or Postal) Code for the Registration.', 'event_espresso' ),
-			'[ADDRESS_STATE]' => esc_html__( 'The state/province for the registration.', 'event_espresso' ),
-			'[COUNTRY]' => esc_html__( 'The country for the registration.', 'event_espresso' )
+			'[FNAME]' => esc_html__('First Name of an attendee.', 'event_espresso'),
+			'[LNAME]' => esc_html__('Last Name of an attendee.', 'event_espresso'),
+			'[ATTENDEE_EMAIL]' => esc_html__('Email address for the attendee.', 'event_espresso'),
+			'[EDIT_ATTENDEE_LINK]' => esc_html__('Edit Registration Link (typically you\'d only use this for messages going to event administrators)', 'event_espresso'),
+			'[REGISTRATION_ID]' => esc_html__('Unique Registration ID for the registration', 'event_espresso'),
+			'[REGISTRATION_CODE]' => esc_html__('Unique Registration Code for the registration', 'event_espresso'),
+			'[REGISTRATION_STATUS_ID]' => esc_html__('Parses to the registration status for the attendee', 'event_espresso'),
+			'[REGISTRATION_STATUS_LABEL]' => esc_html__('Parses to the status label for the registrant', 'event_espresso'),
+			'[REGISTRATION_TOTAL_AMOUNT_PAID]' => esc_html__('Parses to the total amount paid for this registration.', 'event_espresso'),
+			'[FRONTEND_EDIT_REG_LINK]' => esc_html__('Generates a link for the given registration to edit this registration details on the frontend.', 'event_espresso'),
+			'[PHONE_NUMBER]' => esc_html__('The Phone Number for the Registration.', 'event_espresso'),
+			'[ADDRESS]' => esc_html__('The Address for the Registration', 'event_espresso'),
+			'[ADDRESS2]' => esc_html__('Whatever was in the address 2 field for the registration.', 'event_espresso'),
+			'[CITY]' => esc_html__('The city for the registration.', 'event_espresso'),
+			'[ZIP_PC]' => esc_html__('The ZIP (or Postal) Code for the Registration.', 'event_espresso'),
+			'[ADDRESS_STATE]' => esc_html__('The state/province for the registration.', 'event_espresso'),
+			'[COUNTRY]' => esc_html__('The country for the registration.', 'event_espresso')
 			);
 	}
 
@@ -82,10 +82,10 @@ 
 	 * @return string
 	 * @throws \EE_Error
 	 */
-	protected function _parser( $shortcode ) {
+	protected function _parser($shortcode) {
 
 
-		$this->_xtra = ! empty( $this->_extra_data ) && $this->_extra_data['data'] instanceof EE_Messages_Addressee
+		$this->_xtra = ! empty($this->_extra_data) && $this->_extra_data['data'] instanceof EE_Messages_Addressee
 			? $this->_extra_data['data']
 			: null;
 
@@ -94,34 +94,34 @@ 
 			? null
 			: $this->_data;
 
-		if ( ! $registration instanceof EE_Registration ) {
+		if ( ! $registration instanceof EE_Registration) {
 			//let's attempt to get the txn_id for the error message.
-			$txn_id = isset( $this->_xtra->txn ) && $this->_xtra->txn instanceof EE_Transaction
+			$txn_id = isset($this->_xtra->txn) && $this->_xtra->txn instanceof EE_Transaction
 				? $this->_xtra->txn->ID()
-				: esc_html__( 'Unknown', 'event_espresso' );
-			$msg = esc_html__( 'There is no EE_Registration object in the data sent to the EE_Attendee Shortcode Parser for the messages system.', 'event_espresso' );
+				: esc_html__('Unknown', 'event_espresso');
+			$msg = esc_html__('There is no EE_Registration object in the data sent to the EE_Attendee Shortcode Parser for the messages system.', 'event_espresso');
 			$dev_msg = sprintf(
-				esc_html__( 'The transaction ID for this request is: %s', 'event_espresso' ),
+				esc_html__('The transaction ID for this request is: %s', 'event_espresso'),
 				$txn_id
 			);
-			throw new EE_Error( "{$msg}||{$msg} {$dev_msg}" );
+			throw new EE_Error("{$msg}||{$msg} {$dev_msg}");
 		}
 
 		//attendee obj for this registration
-		$attendee = isset( $this->_xtra->registrations[ $registration->ID() ]['att_obj'] )
-			?  $this->_xtra->registrations[ $registration->ID() ]['att_obj']
-			: null ;
+		$attendee = isset($this->_xtra->registrations[$registration->ID()]['att_obj'])
+			? $this->_xtra->registrations[$registration->ID()]['att_obj']
+			: null;
 
-		if ( ! $attendee instanceof EE_Attendee ) {
-			$msg = esc_html__( 'There is no EE_Attendee object in the data sent to the EE_Attendee_Shortcode parser for the messages system.', 'event_espresso' );
+		if ( ! $attendee instanceof EE_Attendee) {
+			$msg = esc_html__('There is no EE_Attendee object in the data sent to the EE_Attendee_Shortcode parser for the messages system.', 'event_espresso');
 			$dev_msg = sprintf(
-				esc_html__( 'The registration ID for this request is: %s', 'event_espresso' ),
+				esc_html__('The registration ID for this request is: %s', 'event_espresso'),
 				$registration->ID()
 			);
-			throw new EE_Error( "{$msg}||{$msg} {$dev_msg}" );
+			throw new EE_Error("{$msg}||{$msg} {$dev_msg}");
 		}
 
-		switch ( $shortcode ) {
+		switch ($shortcode) {
 
 			case '[FNAME]' :
 				return $attendee->fname();

core/libraries/rest_api/Model_Data_Translator.php

Indentation +2 added lines, -2 removed lines

@@ -114,7 +114,7 @@ 
 	) {
 		$new_value = null;
 		if ( $field_obj instanceof \EE_Infinite_Integer_Field
-		     && in_array( $original_value, array( null, '' ), true )
+			 && in_array( $original_value, array( null, '' ), true )
 		) {
 			$new_value = EE_INF;
 		} elseif ( $field_obj instanceof \EE_Datetime_Field ) {
@@ -174,7 +174,7 @@ 
 			$original_value,
 			$requested_version
 		);
-    }
+	}
 
 
 

Spacing +95 added lines, -95 removed lines

@@ -1,8 +1,8 @@ 
 <?php
 namespace EventEspresso\core\libraries\rest_api;
 
-if ( ! defined( 'EVENT_ESPRESSO_VERSION' ) ) {
-	exit( 'No direct script access allowed' );
+if ( ! defined('EVENT_ESPRESSO_VERSION')) {
+	exit('No direct script access allowed');
 }
 
 
@@ -48,10 +48,10 @@ 
 		$requested_version,
 		$timezone_string = 'UTC'
 	) {
-		if ( is_array( $original_value_maybe_array ) ) {
+		if (is_array($original_value_maybe_array)) {
 			$new_value_maybe_array = array();
-			foreach ( $original_value_maybe_array as $array_key => $array_item ) {
-				$new_value_maybe_array[ $array_key ] = Model_Data_Translator::prepare_field_value_from_json(
+			foreach ($original_value_maybe_array as $array_key => $array_item) {
+				$new_value_maybe_array[$array_key] = Model_Data_Translator::prepare_field_value_from_json(
 					$field_obj,
 					$array_item,
 					$requested_version,
@@ -77,11 +77,11 @@ 
 	 * @param string $request_version (eg 4.8.36)
 	 * @return array
 	 */
-	public static function prepare_field_values_for_json( $field_obj, $original_value_maybe_array, $request_version ) {
-		if ( is_array( $original_value_maybe_array ) ) {
+	public static function prepare_field_values_for_json($field_obj, $original_value_maybe_array, $request_version) {
+		if (is_array($original_value_maybe_array)) {
 			$new_value_maybe_array = array();
-			foreach ( $original_value_maybe_array as $array_key => $array_item ) {
-				$new_value_maybe_array[ $array_key ] = Model_Data_Translator::prepare_field_value_for_json(
+			foreach ($original_value_maybe_array as $array_key => $array_item) {
+				$new_value_maybe_array[$array_key] = Model_Data_Translator::prepare_field_value_for_json(
 					$field_obj,
 					$array_item,
 					$request_version
@@ -113,30 +113,30 @@ 
 		$timezone_string = 'UTC'
 	) {
 		$new_value = null;
-		if ( $field_obj instanceof \EE_Infinite_Integer_Field
-		     && in_array( $original_value, array( null, '' ), true )
+		if ($field_obj instanceof \EE_Infinite_Integer_Field
+		     && in_array($original_value, array(null, ''), true)
 		) {
 			$new_value = EE_INF;
-		} elseif ( $field_obj instanceof \EE_Datetime_Field ) {
+		} elseif ($field_obj instanceof \EE_Datetime_Field) {
 			//treat the provided value as being in this timezone
-			$offset_secs_string = $field_obj->get_timezone_offset( new \DateTimeZone( $timezone_string ) );
-			$offset_secs = (int) substr( $offset_secs_string, 1 );
-			$offset_sign = substr( $offset_secs_string, 0, 1 ) ? substr( $offset_secs_string, 0, 1 ) : '+';
+			$offset_secs_string = $field_obj->get_timezone_offset(new \DateTimeZone($timezone_string));
+			$offset_secs = (int) substr($offset_secs_string, 1);
+			$offset_sign = substr($offset_secs_string, 0, 1) ? substr($offset_secs_string, 0, 1) : '+';
 			$offset_string =
 				str_pad(
-					floor( $offset_secs / HOUR_IN_SECONDS ),
+					floor($offset_secs / HOUR_IN_SECONDS),
 					2,
 					'0',
 					STR_PAD_LEFT
 				)
 				. ':'
 				. str_pad(
-					( $offset_secs % HOUR_IN_SECONDS ) / MINUTE_IN_SECONDS,
+					($offset_secs % HOUR_IN_SECONDS) / MINUTE_IN_SECONDS,
 					2,
 					'0',
 					STR_PAD_LEFT
 				);
-			$new_value = rest_parse_date( $original_value . $offset_sign . $offset_string );
+			$new_value = rest_parse_date($original_value.$offset_sign.$offset_string);
 		} else {
 			$new_value = $original_value;
 		}
@@ -157,22 +157,22 @@ 
 >>>>>>> master
 	 * @return mixed
 	 */
-   public static function prepare_field_value_for_json( $field_obj, $original_value, $requested_version ) {
-		if( $original_value === EE_INF ) {
+   public static function prepare_field_value_for_json($field_obj, $original_value, $requested_version) {
+		if ($original_value === EE_INF) {
 			$new_value = Model_Data_Translator::ee_inf_in_rest;
-		} elseif( $field_obj instanceof \EE_Datetime_Field ) {
-			if( $original_value instanceof \DateTime ) {
-				$new_value = $original_value->format( 'Y-m-d H:i:s' );
-			} elseif( is_int( $original_value ) ) {
-				$new_value = date( 'Y-m-d H:i:s', $original_value );
+		} elseif ($field_obj instanceof \EE_Datetime_Field) {
+			if ($original_value instanceof \DateTime) {
+				$new_value = $original_value->format('Y-m-d H:i:s');
+			} elseif (is_int($original_value)) {
+				$new_value = date('Y-m-d H:i:s', $original_value);
 			} else {
 				$new_value = $original_value;
 			}
-			$new_value = mysql_to_rfc3339( $new_value );
+			$new_value = mysql_to_rfc3339($new_value);
 		} else {
 			$new_value = $original_value;
 		}
-		return apply_filters( 'FHEE__EventEspresso\core\libraries\rest_api\Model_Data_Translator__prepare_field_for_rest_api',
+		return apply_filters('FHEE__EventEspresso\core\libraries\rest_api\Model_Data_Translator__prepare_field_for_rest_api',
 			$new_value,
 			$field_obj,
 			$original_value,
@@ -192,19 +192,19 @@ 
 	 * @return array
 	 * @throws \EE_Error
 	 */
-	public static function prepare_conditions_query_params_for_models( $inputted_query_params_of_this_type, \EEM_Base $model, $requested_version ) {
+	public static function prepare_conditions_query_params_for_models($inputted_query_params_of_this_type, \EEM_Base $model, $requested_version) {
 		$query_param_for_models = array();
-		foreach( $inputted_query_params_of_this_type as $query_param_key => $query_param_value ) {
-			$query_param_sans_stars = Model_Data_Translator::remove_stars_and_anything_after_from_condition_query_param_key( $query_param_key );
+		foreach ($inputted_query_params_of_this_type as $query_param_key => $query_param_value) {
+			$query_param_sans_stars = Model_Data_Translator::remove_stars_and_anything_after_from_condition_query_param_key($query_param_key);
 			$field = Model_Data_Translator::deduce_field_from_query_param(
 				$query_param_sans_stars,
 				$model
 			);
 			//double-check is it a *_gmt field?
-			if( ! $field instanceof \EE_Model_Field_Base
-				&& Model_Data_Translator::is_gmt_date_field_name(  $query_param_sans_stars ) ) {
+			if ( ! $field instanceof \EE_Model_Field_Base
+				&& Model_Data_Translator::is_gmt_date_field_name($query_param_sans_stars)) {
 				//yep, take off '_gmt', and find the field
-				$query_param_key = Model_Data_Translator::remove_gmt_from_field_name( $query_param_sans_stars );
+				$query_param_key = Model_Data_Translator::remove_gmt_from_field_name($query_param_sans_stars);
 				$field = Model_Data_Translator::deduce_field_from_query_param(
 					$query_param_key,
 					$model
@@ -214,22 +214,22 @@ 
 				//so it's not a GMT field. Set the timezone on the model to the default
 				$timezone = \EEH_DTT_Helper::get_valid_timezone_string();
 			}
-			if( $field instanceof \EE_Model_Field_Base ) {
+			if ($field instanceof \EE_Model_Field_Base) {
 				//did they specify an operator?
-				if( is_array( $query_param_value ) ) {
-					$op = $query_param_value[ 0 ];
-					$translated_value = array( $op );
-					if( isset( $query_param_value[ 1 ] ) ) {
-						$value = $query_param_value[ 1 ];
-						$translated_value[1] = Model_Data_Translator::prepare_field_values_from_json( $field, $value, $requested_version, $timezone );
+				if (is_array($query_param_value)) {
+					$op = $query_param_value[0];
+					$translated_value = array($op);
+					if (isset($query_param_value[1])) {
+						$value = $query_param_value[1];
+						$translated_value[1] = Model_Data_Translator::prepare_field_values_from_json($field, $value, $requested_version, $timezone);
 					}
 				} else {
-					$translated_value  = Model_Data_Translator::prepare_field_value_from_json( $field, $query_param_value, $requested_version, $timezone );
+					$translated_value = Model_Data_Translator::prepare_field_value_from_json($field, $query_param_value, $requested_version, $timezone);
 				}
-				$query_param_for_models[ $query_param_key ] = $translated_value;
+				$query_param_for_models[$query_param_key] = $translated_value;
 			} else {
 				//so it's not for a field, assume it's a logic query param key
-				$query_param_for_models[ $query_param_key ] = Model_Data_Translator::prepare_conditions_query_params_for_models( $query_param_value, $model, $requested_version );
+				$query_param_for_models[$query_param_key] = Model_Data_Translator::prepare_conditions_query_params_for_models($query_param_value, $model, $requested_version);
 			}
 		}
 		return $query_param_for_models;
@@ -241,9 +241,9 @@ 
 	 * @param string $field_name
 	 * @return boolean
 	 */
-	public static function is_gmt_date_field_name( $field_name ) {
+	public static function is_gmt_date_field_name($field_name) {
 		return substr( 
-			Model_Data_Translator::remove_stars_and_anything_after_from_condition_query_param_key( $field_name ), 
+			Model_Data_Translator::remove_stars_and_anything_after_from_condition_query_param_key($field_name), 
 			-4, 
 			4 
 		) === '_gmt';
@@ -254,11 +254,11 @@ 
 	 * @param string $field_name
 	 * @return string
 	 */
-	public static function remove_gmt_from_field_name( $field_name ) {
-		if( ! Model_Data_Translator::is_gmt_date_field_name(  $field_name ) ) {
+	public static function remove_gmt_from_field_name($field_name) {
+		if ( ! Model_Data_Translator::is_gmt_date_field_name($field_name)) {
 			return $field_name;
 		}
-		$query_param_sans_stars = Model_Data_Translator::remove_stars_and_anything_after_from_condition_query_param_key( $field_name );
+		$query_param_sans_stars = Model_Data_Translator::remove_stars_and_anything_after_from_condition_query_param_key($field_name);
 		$query_param_sans_gmt_and_sans_stars = substr( 
 			$query_param_sans_stars, 
 			0, 
@@ -267,7 +267,7 @@ 
 				'_gmt' 
 			) 
 		);
-		return str_replace( $query_param_sans_stars, $query_param_sans_gmt_and_sans_stars, $field_name );
+		return str_replace($query_param_sans_stars, $query_param_sans_gmt_and_sans_stars, $field_name);
 	}
 	
 	/**
@@ -275,9 +275,9 @@ 
 	 * @param string $field_name
 	 * @return string
 	 */
-	public static function prepare_field_name_from_json( $field_name ) {
-		if( Model_Data_Translator::is_gmt_date_field_name( $field_name ) ) {
-			return Model_Data_Translator::remove_gmt_from_field_name( $field_name );
+	public static function prepare_field_name_from_json($field_name) {
+		if (Model_Data_Translator::is_gmt_date_field_name($field_name)) {
+			return Model_Data_Translator::remove_gmt_from_field_name($field_name);
 		}
 		return $field_name;
 	}
@@ -287,10 +287,10 @@ 
 	 * @param array $field_names
 	 * @return array of field names (possibly include model prefixes)
 	 */
-	public static function prepare_field_names_from_json( array $field_names ) {
+	public static function prepare_field_names_from_json(array $field_names) {
 		$new_array = array();
-		foreach( $field_names as $key => $field_name ) {
-			$new_array[ $key ] = Model_Data_Translator::prepare_field_name_from_json( $field_name );
+		foreach ($field_names as $key => $field_name) {
+			$new_array[$key] = Model_Data_Translator::prepare_field_name_from_json($field_name);
 		}
 		return $new_array;
 	}
@@ -301,10 +301,10 @@ 
 	 * @param array $field_names_as_keys
 	 * @return array
 	 */
-	public static function prepare_field_names_in_array_keys_from_json( array $field_names_as_keys ) {
+	public static function prepare_field_names_in_array_keys_from_json(array $field_names_as_keys) {
 		$new_array = array();
-		foreach( $field_names_as_keys as $field_name => $value ) {
-			$new_array[ Model_Data_Translator::prepare_field_name_from_json( $field_name ) ] = $value;
+		foreach ($field_names_as_keys as $field_name => $value) {
+			$new_array[Model_Data_Translator::prepare_field_name_from_json($field_name)] = $value;
 		}
 		return $new_array;
 	}
@@ -317,27 +317,27 @@ 
 	 * @param string    $requested_version eg "4.8.36". If null is provided, defaults to the latest release of the EE4 REST API
 	 * @return array which can be passed into the EE4 REST API when querying a model resource
 	 */
-	public static function prepare_query_params_for_rest_api( array $model_query_params, \EEM_Base $model,  $requested_version = null ) {
-		if( $requested_version === null ) {
-			$requested_version = \EED_Core_Rest_Api::latest_rest_api_version() ;
+	public static function prepare_query_params_for_rest_api(array $model_query_params, \EEM_Base $model, $requested_version = null) {
+		if ($requested_version === null) {
+			$requested_version = \EED_Core_Rest_Api::latest_rest_api_version();
 		}
 		$rest_query_params = $model_query_params;
-		if ( isset( $model_query_params[0] ) ) {
-			$rest_query_params[ 'where' ] = Model_Data_Translator::prepare_conditions_query_params_for_rest_api(
-				$model_query_params[ 0 ],
+		if (isset($model_query_params[0])) {
+			$rest_query_params['where'] = Model_Data_Translator::prepare_conditions_query_params_for_rest_api(
+				$model_query_params[0],
 				$model,
 				$requested_version
 			);
-			unset( $rest_query_params[0] );
+			unset($rest_query_params[0]);
 		}
-		if ( isset( $model_query_params[ 'having' ] ) ) {
-			$rest_query_params[ 'having' ] = Model_Data_Translator::prepare_conditions_query_params_for_rest_api(
-				$model_query_params[ 'having' ],
+		if (isset($model_query_params['having'])) {
+			$rest_query_params['having'] = Model_Data_Translator::prepare_conditions_query_params_for_rest_api(
+				$model_query_params['having'],
 				$model,
 				$requested_version
 			);
 		}
-		return apply_filters( 'FHEE__EventEspresso\core\libraries\rest_api\Model_Data_Translator__prepare_query_params_for_rest_api', $rest_query_params, $model_query_params, $model, $requested_version );
+		return apply_filters('FHEE__EventEspresso\core\libraries\rest_api\Model_Data_Translator__prepare_query_params_for_rest_api', $rest_query_params, $model_query_params, $model, $requested_version);
 	}
 
 	/**
@@ -347,29 +347,29 @@ 
 	 * @param string $requested_version eg "4.8.36"
 	 * @return array ready for use in the rest api query params
 	 */
-	public static function prepare_conditions_query_params_for_rest_api( $inputted_query_params_of_this_type, \EEM_Base $model, $requested_version ) {
+	public static function prepare_conditions_query_params_for_rest_api($inputted_query_params_of_this_type, \EEM_Base $model, $requested_version) {
 		$query_param_for_models = array();
-		foreach( $inputted_query_params_of_this_type as $query_param_key => $query_param_value ) {
+		foreach ($inputted_query_params_of_this_type as $query_param_key => $query_param_value) {
 			$field = Model_Data_Translator::deduce_field_from_query_param(
-				Model_Data_Translator::remove_stars_and_anything_after_from_condition_query_param_key( $query_param_key ),
+				Model_Data_Translator::remove_stars_and_anything_after_from_condition_query_param_key($query_param_key),
 				$model
 			);
-			if( $field instanceof \EE_Model_Field_Base ) {
+			if ($field instanceof \EE_Model_Field_Base) {
 				//did they specify an operator?
-				if( is_array( $query_param_value ) ) {
-					$op = $query_param_value[ 0 ];
-					$translated_value = array( $op );
-					if( isset( $query_param_value[ 1 ] ) ) {
-						$value = $query_param_value[ 1 ];
-						$translated_value[1] = Model_Data_Translator::prepare_field_values_for_json( $field, $value, $requested_version );
+				if (is_array($query_param_value)) {
+					$op = $query_param_value[0];
+					$translated_value = array($op);
+					if (isset($query_param_value[1])) {
+						$value = $query_param_value[1];
+						$translated_value[1] = Model_Data_Translator::prepare_field_values_for_json($field, $value, $requested_version);
 					}
 				} else {
-					$translated_value  = Model_Data_Translator::prepare_field_value_for_json( $field, $query_param_value, $requested_version );
+					$translated_value = Model_Data_Translator::prepare_field_value_for_json($field, $query_param_value, $requested_version);
 				}
-				$query_param_for_models[ $query_param_key ] = $translated_value;
+				$query_param_for_models[$query_param_key] = $translated_value;
 			} else {
 				//so it's not for a field, assume it's a logic query param key
-				$query_param_for_models[ $query_param_key ] = Model_Data_Translator::prepare_conditions_query_params_for_rest_api( $query_param_value, $model, $requested_version );
+				$query_param_for_models[$query_param_key] = Model_Data_Translator::prepare_conditions_query_params_for_rest_api($query_param_value, $model, $requested_version);
 			}
 		}
 		return $query_param_for_models;
@@ -381,11 +381,11 @@ 
 	 * @param $condition_query_param_key
 	 * @return string
 	 */
-	public static function remove_stars_and_anything_after_from_condition_query_param_key( $condition_query_param_key ) {
+	public static function remove_stars_and_anything_after_from_condition_query_param_key($condition_query_param_key) {
 		$pos_of_star = strpos($condition_query_param_key, '*');
-		if($pos_of_star === FALSE){
+		if ($pos_of_star === FALSE) {
 			return $condition_query_param_key;
-		}else{
+		} else {
 			$condition_query_param_sans_star = substr($condition_query_param_key, 0, $pos_of_star);
 			return $condition_query_param_sans_star;
 		}
@@ -401,26 +401,26 @@ 
 	 * @return \EE_Model_Field_Base
 	 * @throws \EE_Error
 	 */
-	public static function deduce_field_from_query_param($query_param_name, \EEM_Base $model){
+	public static function deduce_field_from_query_param($query_param_name, \EEM_Base $model) {
 		//ok, now proceed with deducing which part is the model's name, and which is the field's name
 		//which will help us find the database table and column
 
-		$query_param_parts = explode(".",$query_param_name);
-		if(empty($query_param_parts)){
-			throw new \EE_Error(sprintf(__("_extract_column_name is empty when trying to extract column and table name from %s",'event_espresso'),$query_param_name));
+		$query_param_parts = explode(".", $query_param_name);
+		if (empty($query_param_parts)) {
+			throw new \EE_Error(sprintf(__("_extract_column_name is empty when trying to extract column and table name from %s", 'event_espresso'), $query_param_name));
 		}
 		$number_of_parts = count($query_param_parts);
-		$last_query_param_part = $query_param_parts[ count($query_param_parts) - 1 ];
-		if($number_of_parts == 1){
+		$last_query_param_part = $query_param_parts[count($query_param_parts) - 1];
+		if ($number_of_parts == 1) {
 			$field_name = $last_query_param_part;
-		}else{// $number_of_parts >= 2
+		} else {// $number_of_parts >= 2
 			//the last part is the column name, and there are only 2parts. therefore...
 			$field_name = $last_query_param_part;
-			$model = \EE_Registry::instance()->load_model( $query_param_parts[ $number_of_parts - 2 ]);
+			$model = \EE_Registry::instance()->load_model($query_param_parts[$number_of_parts - 2]);
 		}
-		try{
+		try {
 			return $model->field_settings_for($field_name);
-		}catch(\EE_Error $e){
+		} catch (\EE_Error $e) {
 			return null;
 		}
 	}

modules/core_rest_api/EED_Core_Rest_Api.module.php

Spacing +106 added lines, -106 removed lines

@@ -1,8 +1,8 @@ 
 <?php
 use EventEspresso\core\libraries\rest_api\Calculated_Model_Fields;
 
-if ( !defined( 'EVENT_ESPRESSO_VERSION' ) ) {
-	exit( 'No direct script access allowed' );
+if ( ! defined('EVENT_ESPRESSO_VERSION')) {
+	exit('No direct script access allowed');
 }
 
 /**
@@ -35,7 +35,7 @@ 
 	 */
 	public static function instance() {
 		self::$_field_calculator = new Calculated_Model_Fields();
-		return parent::get_instance( __CLASS__ );
+		return parent::get_instance(__CLASS__);
 	}
 
 
@@ -65,10 +65,10 @@ 
 
 
 	public static function set_hooks_both() {
-		add_action( 'rest_api_init', array( 'EED_Core_Rest_Api', 'register_routes' ), 10 );
-		add_action( 'rest_api_init', array( 'EED_Core_Rest_Api', 'set_hooks_rest_api' ), 5 );
-		add_filter( 'rest_route_data', array( 'EED_Core_Rest_Api', 'hide_old_endpoints' ), 10, 2 );
-		add_filter( 'rest_index', array( 'EventEspresso\core\libraries\rest_api\controllers\model\Meta', 'filter_ee_metadata_into_index' ) );
+		add_action('rest_api_init', array('EED_Core_Rest_Api', 'register_routes'), 10);
+		add_action('rest_api_init', array('EED_Core_Rest_Api', 'set_hooks_rest_api'), 5);
+		add_filter('rest_route_data', array('EED_Core_Rest_Api', 'hide_old_endpoints'), 10, 2);
+		add_filter('rest_index', array('EventEspresso\core\libraries\rest_api\controllers\model\Meta', 'filter_ee_metadata_into_index'));
 		EED_Core_Rest_Api::invalidate_cached_route_data_on_version_change();
 	}
 
@@ -87,7 +87,7 @@ 
 	 * Loads all the hooks which make requests to old versions of the API
 	 * appear the same as they always did
 	 */
-	public static function set_hooks_for_changes(){
+	public static function set_hooks_for_changes() {
 		self::_set_hooks_for_changes();
 	}
 
@@ -97,11 +97,11 @@ 
 	 * replace it with application passwords.
 	 */
 	public static function maybe_notify_of_basic_auth_removal() {
-		if( 
+		if ( 
 			apply_filters( 
 				'FHEE__EED_Core_Rest_Api__maybe_notify_of_basic_auth_removal__override',
-				! isset( $_SERVER['PHP_AUTH_USER'] )
-			&& ! isset( $_SERVER['HTTP_AUTHORIZATION'] ) 
+				! isset($_SERVER['PHP_AUTH_USER'])
+			&& ! isset($_SERVER['HTTP_AUTHORIZATION']) 
 			) 
 		) {
 			//sure it's a WP API request, but they aren't using basic auth, so don't bother them
@@ -109,20 +109,20 @@ 
 		}
 		//ok they're using the WP API with Basic Auth
 		$message = sprintf(
-			__( 'We noticed you\'re using the WP API, which is used by the Event Espresso 4 mobile apps. Because of security and compatibility concerns, we will soon be removing our default authentication mechanism, WP API Basic Auth, from Event Espresso. It is recommended you instead install the %1$sWP Application Passwords plugin%2$s and use it with the EE4 Mobile apps. See %3$sour mobile app documentation%2$s for more information. %4$sIf you have installed the WP API Basic Auth plugin separately, or are not using the Event Espresso 4 mobile apps, you can disregard this message.%4$sThe Event Espresso Team', 'event_espresso' ),
+			__('We noticed you\'re using the WP API, which is used by the Event Espresso 4 mobile apps. Because of security and compatibility concerns, we will soon be removing our default authentication mechanism, WP API Basic Auth, from Event Espresso. It is recommended you instead install the %1$sWP Application Passwords plugin%2$s and use it with the EE4 Mobile apps. See %3$sour mobile app documentation%2$s for more information. %4$sIf you have installed the WP API Basic Auth plugin separately, or are not using the Event Espresso 4 mobile apps, you can disregard this message.%4$sThe Event Espresso Team', 'event_espresso'),
 			'<a href="https://wordpress.org/plugins/application-passwords/">',
 			'</a>',
 			'<a href="https://eventespresso.com/wiki/ee4-event-apps/#authentication">',
 			'<br/>'
 		);
-		EE_Error::add_persistent_admin_notice( 'using_basic_auth', $message );
-		if( ! get_option( 'ee_notified_admin_on_basic_auth_removal', false ) ) {
-			add_option( 'ee_notified_admin_on_basic_auth_removal', true );
+		EE_Error::add_persistent_admin_notice('using_basic_auth', $message);
+		if ( ! get_option('ee_notified_admin_on_basic_auth_removal', false)) {
+			add_option('ee_notified_admin_on_basic_auth_removal', true);
 			//piggy back off EE_Error::set_content_type, which sets the content type to HTML
-			add_filter( 'wp_mail_content_type', array( 'EE_Error', 'set_content_type' ));
+			add_filter('wp_mail_content_type', array('EE_Error', 'set_content_type'));
 			//and send the message to the site admin too
-			wp_mail( get_option( 'admin_email' ), __( 'Notice of Removal of WP API Basic Auth From Event Espresso 4', 'event_espresso' ), $message );
-			remove_filter( 'wp_mail_content_type', array( 'EE_Error', 'set_content_type' ));
+			wp_mail(get_option('admin_email'), __('Notice of Removal of WP API Basic Auth From Event Espresso 4', 'event_espresso'), $message);
+			remove_filter('wp_mail_content_type', array('EE_Error', 'set_content_type'));
 		}
 	}
 	/**
@@ -130,16 +130,16 @@ 
 	 * appear the same as they always did
 	 */
 	protected static function _set_hooks_for_changes() {
-		$folder_contents = EEH_File::get_contents_of_folders( array( EE_LIBRARIES . 'rest_api' . DS . 'changes' ), false );
-		foreach( $folder_contents as $classname_in_namespace => $filepath ) {
+		$folder_contents = EEH_File::get_contents_of_folders(array(EE_LIBRARIES.'rest_api'.DS.'changes'), false);
+		foreach ($folder_contents as $classname_in_namespace => $filepath) {
 			//ignore the base parent class
-			if( $classname_in_namespace === 'Changes_In_Base' ) {
+			if ($classname_in_namespace === 'Changes_In_Base') {
 				continue;
 			}
-			$full_classname = 'EventEspresso\core\libraries\rest_api\changes\\' . $classname_in_namespace;
-			if ( class_exists( $full_classname )) {
+			$full_classname = 'EventEspresso\core\libraries\rest_api\changes\\'.$classname_in_namespace;
+			if (class_exists($full_classname)) {
 				$instance_of_class = new $full_classname;
-				if ( $instance_of_class instanceof EventEspresso\core\libraries\rest_api\changes\Changes_In_Base ) {
+				if ($instance_of_class instanceof EventEspresso\core\libraries\rest_api\changes\Changes_In_Base) {
 					$instance_of_class->set_hooks();
 				}
 			}
@@ -152,16 +152,16 @@ 
 	 * so we actually prefer to only do it when an EE plugin is activated or upgraded
 	 */
 	public static function register_routes() {
-		foreach( EED_Core_Rest_Api::get_ee_route_data() as $namespace => $relative_urls ) {
-			foreach( $relative_urls as $endpoint => $routes ) {
-				foreach( $routes as $route ) {
+		foreach (EED_Core_Rest_Api::get_ee_route_data() as $namespace => $relative_urls) {
+			foreach ($relative_urls as $endpoint => $routes) {
+				foreach ($routes as $route) {
 					register_rest_route(
 						$namespace,
 						$endpoint,
 						array(
-							'callback' => $route[ 'callback' ],
-							'methods' => $route[ 'methods' ],
-							'args' => isset( $route[ 'args' ] ) ? $route[ 'args' ] : array(),
+							'callback' => $route['callback'],
+							'methods' => $route['methods'],
+							'args' => isset($route['args']) ? $route['args'] : array(),
 						)
 					);
 				}
@@ -175,11 +175,11 @@ 
 	 * next time the WP API is used
 	 */
 	public static function invalidate_cached_route_data_on_version_change() {
-		if( EE_System::instance()->detect_req_type() != EE_System::req_type_normal ) {
+		if (EE_System::instance()->detect_req_type() != EE_System::req_type_normal) {
 			EED_Core_Rest_Api::invalidate_cached_route_data();
 		}
-		foreach( EE_Registry::instance()->addons as $addon ){
-			if( $addon instanceof EE_Addon && $addon->detect_req_type() != EE_System::req_type_normal ) {
+		foreach (EE_Registry::instance()->addons as $addon) {
+			if ($addon instanceof EE_Addon && $addon->detect_req_type() != EE_System::req_type_normal) {
 				EED_Core_Rest_Api::invalidate_cached_route_data();
 			}
 		}
@@ -190,8 +190,8 @@ 
 	 */
 	public static function invalidate_cached_route_data() {
 		//delete the saved EE REST API routes
-		foreach( EED_Core_Rest_Api::versions_served() as $version => $hidden ){
-			delete_option( EED_Core_Rest_Api::saved_routes_option_names . $version );
+		foreach (EED_Core_Rest_Api::versions_served() as $version => $hidden) {
+			delete_option(EED_Core_Rest_Api::saved_routes_option_names.$version);
 		}
 	}
 
@@ -205,8 +205,8 @@ 
 	 */
 	public static function get_ee_route_data() {
 		$ee_routes = array();
-		foreach( self::versions_served() as $version => $hidden_endpoints ) {
-			$ee_routes[  self::ee_api_namespace . $version ] = self::_get_ee_route_data_for_version( $version, $hidden_endpoints );
+		foreach (self::versions_served() as $version => $hidden_endpoints) {
+			$ee_routes[self::ee_api_namespace.$version] = self::_get_ee_route_data_for_version($version, $hidden_endpoints);
 		}
 		return $ee_routes;
 	}
@@ -218,10 +218,10 @@ 
 	 * @param boolean $hidden_endpoints
 	 * @return array
 	 */
-	protected static function _get_ee_route_data_for_version( $version, $hidden_endpoints = false ) {
-		$ee_routes = get_option( self::saved_routes_option_names . $version , null );
-		if( ! $ee_routes || ( defined('EE_REST_API_DEBUG_MODE') && EE_REST_API_DEBUG_MODE )){
-			$ee_routes = self::_save_ee_route_data_for_version( $version, $hidden_endpoints );
+	protected static function _get_ee_route_data_for_version($version, $hidden_endpoints = false) {
+		$ee_routes = get_option(self::saved_routes_option_names.$version, null);
+		if ( ! $ee_routes || (defined('EE_REST_API_DEBUG_MODE') && EE_REST_API_DEBUG_MODE)) {
+			$ee_routes = self::_save_ee_route_data_for_version($version, $hidden_endpoints);
 		}
 		return $ee_routes;
 	}
@@ -235,18 +235,18 @@ 
 	 * @param boolean $hidden_endpoints
 	 * @return mixed|null|void
 	 */
-	protected static function _save_ee_route_data_for_version( $version, $hidden_endpoints = false ) {
+	protected static function _save_ee_route_data_for_version($version, $hidden_endpoints = false) {
 		$instance = self::instance();
 		$routes = apply_filters(
 			'EED_Core_Rest_Api__save_ee_route_data_for_version__routes',
 			array_replace_recursive(
-				$instance->_get_config_route_data_for_version( $version, $hidden_endpoints ),
-				$instance->_get_meta_route_data_for_version( $version, $hidden_endpoints ),
-				$instance->_get_model_route_data_for_version( $version, $hidden_endpoints ),
-				$instance->_get_rpc_route_data_for_version( $version, $hidden_endpoints )
+				$instance->_get_config_route_data_for_version($version, $hidden_endpoints),
+				$instance->_get_meta_route_data_for_version($version, $hidden_endpoints),
+				$instance->_get_model_route_data_for_version($version, $hidden_endpoints),
+				$instance->_get_rpc_route_data_for_version($version, $hidden_endpoints)
 			)
 		);
-		update_option( self::saved_routes_option_names . $version, $routes, true );
+		update_option(self::saved_routes_option_names.$version, $routes, true);
 		return $routes;
 	}
 
@@ -257,7 +257,7 @@ 
 	 * @return void
 	 */
 	public static function save_ee_routes() {
-		if( EE_Maintenance_Mode::instance()->models_can_query() ){
+		if (EE_Maintenance_Mode::instance()->models_can_query()) {
 			$instance = self::instance();
 			$routes = apply_filters(
 				'EED_Core_Rest_Api__save_ee_routes__routes',
@@ -268,7 +268,7 @@ 
 					$instance->_register_rpc_routes()
 				)
 			);
-			update_option( self::saved_routes_option_names, $routes, true );
+			update_option(self::saved_routes_option_names, $routes, true);
 		}
 	}
 
@@ -279,8 +279,8 @@ 
 	 */
 	protected function _register_model_routes() {
 		$model_routes = array( );
-		foreach( self::versions_served() as $version => $hidden_endpoint ) {
-			$model_routes[ EED_Core_Rest_Api::ee_api_namespace . $version ] = $this->_get_config_route_data_for_version( $version, $hidden_endpoint );
+		foreach (self::versions_served() as $version => $hidden_endpoint) {
+			$model_routes[EED_Core_Rest_Api::ee_api_namespace.$version] = $this->_get_config_route_data_for_version($version, $hidden_endpoint);
 		}
 		return $model_routes;
 	}
@@ -291,8 +291,8 @@ 
 	 * @param boolean $hidden_endpoint
 	 * @return array
 	 */
-	protected function _get_model_route_data_for_version( $version, $hidden_endpoint = false ) {
-		$model_version_info = new \EventEspresso\core\libraries\rest_api\Model_Version_Info( $version );
+	protected function _get_model_route_data_for_version($version, $hidden_endpoint = false) {
+		$model_version_info = new \EventEspresso\core\libraries\rest_api\Model_Version_Info($version);
 		$models_to_register = apply_filters(
 			'FHEE__EED_Core_REST_API___register_model_routes',
 			$model_version_info->models_for_requested_version()
@@ -301,21 +301,21 @@ 
 		unset($models_to_register['Extra_Meta']);
 		unset($models_to_register['Extra_Join']);
 		$model_routes = array();
-		foreach ( $models_to_register as $model_name => $model_classname ) {
-			$model = \EE_Registry::instance()->load_model( $model_name );
+		foreach ($models_to_register as $model_name => $model_classname) {
+			$model = \EE_Registry::instance()->load_model($model_name);
 			//yes we could just register one route for ALL models, but then they wouldn't show up in the index
-			$plural_model_route = EEH_Inflector::pluralize_and_lower( $model_name );
-			$singular_model_route = $plural_model_route . '/(?P<id>\d+)' ;
-			$model_routes[ $plural_model_route ] = array(
+			$plural_model_route = EEH_Inflector::pluralize_and_lower($model_name);
+			$singular_model_route = $plural_model_route.'/(?P<id>\d+)';
+			$model_routes[$plural_model_route] = array(
 					array(
 						'callback' => array(
 							'EventEspresso\core\libraries\rest_api\controllers\model\Read',
 							'handle_request_get_all' ),
 						'methods' => WP_REST_Server::READABLE,
 						'hidden_endpoint' => $hidden_endpoint,
-						'args' => $this->_get_read_query_params( $model, $version ),
+						'args' => $this->_get_read_query_params($model, $version),
 						'_links' => array(
-							'self' => rest_url( EED_Core_Rest_Api::ee_api_namespace . $version . $singular_model_route ),
+							'self' => rest_url(EED_Core_Rest_Api::ee_api_namespace.$version.$singular_model_route),
 						)
 					),
 //						array(
@@ -326,14 +326,14 @@ 
 //							'hidden_endpoint' => $hidden_endpoint
 //						)
 				);
-			$model_routes[ $singular_model_route ] = array(
+			$model_routes[$singular_model_route] = array(
 					array(
 						'callback' => array(
 							'EventEspresso\core\libraries\rest_api\controllers\model\Read',
 							'handle_request_get_one' ),
 						'methods' => WP_REST_Server::READABLE,
 						'hidden_endpoint' => $hidden_endpoint,
-						'args' => $this->_get_response_selection_query_params( $model, $version)
+						'args' => $this->_get_response_selection_query_params($model, $version)
 					),
 //						array(
 //							'callback' => array(
@@ -344,19 +344,19 @@ 
 //							),
 			);
 			//@todo: also handle  DELETE for a single item
-			foreach ( $model_version_info->relation_settings( $model ) as $relation_name => $relation_obj ) {
+			foreach ($model_version_info->relation_settings($model) as $relation_name => $relation_obj) {
 				$related_model_name_endpoint_part = EventEspresso\core\libraries\rest_api\controllers\model\Read::get_related_entity_name(
 					$relation_name,
 					$relation_obj
 				);
-				$model_routes[ $singular_model_route . '/' . $related_model_name_endpoint_part ] = array(
+				$model_routes[$singular_model_route.'/'.$related_model_name_endpoint_part] = array(
 						array(
 							'callback' => array(
 								'EventEspresso\core\libraries\rest_api\controllers\model\Read',
 								'handle_request_get_related' ),
 							'methods' => WP_REST_Server::READABLE,
 							'hidden_endpoint' => $hidden_endpoint,
-							'args' => $this->_get_read_query_params( $relation_obj->get_other_model(), $version ),
+							'args' => $this->_get_read_query_params($relation_obj->get_other_model(), $version),
 						),
 //							array(
 //								'callback' => array(
@@ -379,8 +379,8 @@ 
 	 */
 	protected function _register_rpc_routes() {
 		$routes = array();
-		foreach( self::versions_served() as $version => $hidden_endpoint ) {
-			$routes[ self::ee_api_namespace . $version ] = $this->_get_rpc_route_data_for_version( $version, $hidden_endpoint );
+		foreach (self::versions_served() as $version => $hidden_endpoint) {
+			$routes[self::ee_api_namespace.$version] = $this->_get_rpc_route_data_for_version($version, $hidden_endpoint);
 		}
 		return $routes;
 	}
@@ -391,10 +391,10 @@ 
 	 * @param boolean $hidden_endpoint
 	 * @return array
 	 */
-	protected function _get_rpc_route_data_for_version( $version, $hidden_endpoint = false ) {
+	protected function _get_rpc_route_data_for_version($version, $hidden_endpoint = false) {
 		$this_versions_routes = array();
 			//checkin endpoint
-			$this_versions_routes[ 'registrations/(?P<REG_ID>\d+)/toggle_checkin_for_datetime/(?P<DTT_ID>\d+)' ] = array(
+			$this_versions_routes['registrations/(?P<REG_ID>\d+)/toggle_checkin_for_datetime/(?P<DTT_ID>\d+)'] = array(
 				array(
 					'callback' => array(
 						'EventEspresso\core\libraries\rest_api\controllers\rpc\Checkin',
@@ -405,7 +405,7 @@ 
 						'force' => array(
 							'required' => false,
 							'default' => false,
-							'description' => __( 'Whether to force toggle checkin, or to verify the registration status and allowed ticket uses', 'event_espresso' )
+							'description' => __('Whether to force toggle checkin, or to verify the registration status and allowed ticket uses', 'event_espresso')
 						)
 					)
 				)
@@ -424,7 +424,7 @@ 
 	 * @param string $version
 	 * @return array
 	 */
-	protected function _get_response_selection_query_params( \EEM_Base $model, $version ) {
+	protected function _get_response_selection_query_params(\EEM_Base $model, $version) {
 		return apply_filters(
 			'FHEE__EED_Core_Rest_Api___get_response_selection_query_params',
 			array(
@@ -435,7 +435,7 @@ 
 				'calculate' => array(
 					'required' => false,
 					'default' => '',
-					'enum' => self::$_field_calculator->retrieve_calculated_fields_for_model( $model )
+					'enum' => self::$_field_calculator->retrieve_calculated_fields_for_model($model)
 				)
 			),
 			$model,
@@ -453,13 +453,13 @@ 
 	 * @return array    describing the args acceptable when querying this model
 	 * @throws \EE_Error
 	 */
-	protected function _get_read_query_params( \EEM_Base $model, $version ) {
+	protected function _get_read_query_params(\EEM_Base $model, $version) {
 		$default_orderby = array();
-		foreach( $model->get_combined_primary_key_fields() as $key_field ) {
-			$default_orderby[ $key_field->get_name() ] = 'ASC';
+		foreach ($model->get_combined_primary_key_fields() as $key_field) {
+			$default_orderby[$key_field->get_name()] = 'ASC';
 		}
 		return array_merge(
-			$this->_get_response_selection_query_params( $model, $version ),
+			$this->_get_response_selection_query_params($model, $version),
 			array(
 				'where' => array(
 					'required' => false,
@@ -496,8 +496,8 @@ 
 	 */
 	protected function _register_config_routes() {
 		$config_routes = array();
-		foreach( self::versions_served() as $version => $hidden_endpoint ) {
-			$config_routes[ self::ee_api_namespace . $version ] = $this->_get_config_route_data_for_version( $version,	$hidden_endpoint );
+		foreach (self::versions_served() as $version => $hidden_endpoint) {
+			$config_routes[self::ee_api_namespace.$version] = $this->_get_config_route_data_for_version($version, $hidden_endpoint);
 		}
 		return $config_routes;
 	}
@@ -508,7 +508,7 @@ 
 	 * @param boolean $hidden_endpoint
 	 * @return array
 	 */
-	protected function _get_config_route_data_for_version( $version, $hidden_endpoint ) {
+	protected function _get_config_route_data_for_version($version, $hidden_endpoint) {
 		return array(
 			'config' => array(
 				array(
@@ -538,8 +538,8 @@ 
 	 */
 	protected function _register_meta_routes() {
 		$meta_routes = array();
-		foreach( self::versions_served() as $version => $hidden_endpoint ) {
-			$meta_routes[ self::ee_api_namespace . $version ] = $this->_get_meta_route_data_for_version( $version, $hidden_endpoint );
+		foreach (self::versions_served() as $version => $hidden_endpoint) {
+			$meta_routes[self::ee_api_namespace.$version] = $this->_get_meta_route_data_for_version($version, $hidden_endpoint);
 		}
 		return $meta_routes;
 	}
@@ -550,7 +550,7 @@ 
 	 * @param boolean $hidden_endpoint
 	 * @return array
 	 */
-	protected function _get_meta_route_data_for_version( $version, $hidden_endpoint = false ) {
+	protected function _get_meta_route_data_for_version($version, $hidden_endpoint = false) {
 		return array(
 			'resources'  => array(
 				array(
@@ -572,13 +572,13 @@ 
 	 * @param array $route_data
 	 * @return array
 	 */
-	public static function hide_old_endpoints( $route_data ) {
-		foreach( EED_Core_Rest_Api::get_ee_route_data() as $namespace => $relative_urls ) {
-			foreach( $relative_urls as $endpoint => $routes ) {
-				foreach( $routes as $route ) {
-					if( $route[ 'hidden_endpoint' ] ) {
-						$full_route = '/' . ltrim( $namespace, '/' ) . '/' . ltrim( $endpoint, '/' );
-						unset( $route_data[ $full_route ] );
+	public static function hide_old_endpoints($route_data) {
+		foreach (EED_Core_Rest_Api::get_ee_route_data() as $namespace => $relative_urls) {
+			foreach ($relative_urls as $endpoint => $routes) {
+				foreach ($routes as $route) {
+					if ($route['hidden_endpoint']) {
+						$full_route = '/'.ltrim($namespace, '/').'/'.ltrim($endpoint, '/');
+						unset($route_data[$full_route]);
 					}
 				}
 			}
@@ -617,8 +617,8 @@ 
 	 */
 	public static function latest_rest_api_version() {
 		$versions_served = \EED_Core_Rest_Api::versions_served();
-		$versions_served_keys = array_keys( $versions_served );
-		return end( $versions_served_keys );
+		$versions_served_keys = array_keys($versions_served);
+		return end($versions_served_keys);
 	}
 
 	/**
@@ -632,32 +632,32 @@ 
 	public static function versions_served() {
 		$versions_served = array();
 		$possibly_served_versions = EED_Core_Rest_Api::version_compatibilities();
-		$lowest_compatible_version = end( $possibly_served_versions);
-		reset( $possibly_served_versions );
-		$versions_served_historically = array_keys( $possibly_served_versions );
-		$latest_version = end( $versions_served_historically );
-		reset( $versions_served_historically );
+		$lowest_compatible_version = end($possibly_served_versions);
+		reset($possibly_served_versions);
+		$versions_served_historically = array_keys($possibly_served_versions);
+		$latest_version = end($versions_served_historically);
+		reset($versions_served_historically);
 		//for each version of core we have ever served:
-		foreach ( $versions_served_historically as $key_versioned_endpoint ) {
+		foreach ($versions_served_historically as $key_versioned_endpoint) {
 			//if it's not above the current core version, and it's compatible with the current version of core
-			if( $key_versioned_endpoint == $latest_version ) {
+			if ($key_versioned_endpoint == $latest_version) {
 				//don't hide the latest version in the index
-				$versions_served[ $key_versioned_endpoint ] = false;
-			} else if(
+				$versions_served[$key_versioned_endpoint] = false;
+			} else if (
 				$key_versioned_endpoint < EED_Core_Rest_Api::core_version()
 				&& $key_versioned_endpoint >= $lowest_compatible_version
 			) {
 				//include, but hide, previous versions which are still supported
-				$versions_served[ $key_versioned_endpoint ] = true;
-			} elseif(
+				$versions_served[$key_versioned_endpoint] = true;
+			} elseif (
 				apply_filters(
 					'FHEE__EED_Core_Rest_Api__versions_served__include_incompatible_versions',
 					false,
 					$possibly_served_versions
 				)
-			){
+			) {
 				//if a version is no longer supported, don't include it in index or list of versions served
-				$versions_served[ $key_versioned_endpoint ] = true;
+				$versions_served[$key_versioned_endpoint] = true;
 			}
 		}
 		return $versions_served;
@@ -670,7 +670,7 @@ 
 	 * @return string
 	 */
 	public static function core_version() {
-		return apply_filters( 'FHEE__EED_Core_REST_API__core_version', implode('.', array_slice( explode( '.', espresso_version() ), 0, 3 ) ) );
+		return apply_filters('FHEE__EED_Core_REST_API__core_version', implode('.', array_slice(explode('.', espresso_version()), 0, 3)));
 	}
 
 	/**
@@ -695,7 +695,7 @@ 
 	 * @param  WP $WP
 	 * @return    void
 	 */
-	public function run( $WP ) {
+	public function run($WP) {
 
 	}