eventespresso / event-espresso-core

core/EE_Session.core.php

Indentation +121 added lines, -121 removed lines

@@ -163,18 +163,18 @@ 
 				$this->{$var_name} = $session_setting;
 			}
 		}
-         // are we using encryption?
-         $this->_use_encryption = $encryption instanceof EE_Encryption && EE_Registry::instance()->CFG->admin->encode_session_data();
-         // \EEH_Debug_Tools::printr($this->_use_encryption, '$this->_use_encryption', __FILE__, __LINE__);
-        // encrypt data via: $this->encryption->encrypt();
-        $this->encryption = $encryption;
+		 // are we using encryption?
+		 $this->_use_encryption = $encryption instanceof EE_Encryption && EE_Registry::instance()->CFG->admin->encode_session_data();
+		 // \EEH_Debug_Tools::printr($this->_use_encryption, '$this->_use_encryption', __FILE__, __LINE__);
+		// encrypt data via: $this->encryption->encrypt();
+		$this->encryption = $encryption;
 		// filter hook allows outside functions/classes/plugins to change default empty cart
 		$extra_default_session_vars = apply_filters( 'FHEE__EE_Session__construct__extra_default_session_vars', array() );
 		array_merge( $this->_default_session_vars, $extra_default_session_vars );
 		// apply default session vars
 		$this->_set_defaults();
-         add_action('AHEE__EE_System__initialize', array($this, 'open_session'));
-         // check request for 'clear_session' param
+		 add_action('AHEE__EE_System__initialize', array($this, 'open_session'));
+		 // check request for 'clear_session' param
 		add_action( 'AHEE__EE_Request_Handler__construct__complete', array( $this, 'wp_loaded' ));
 		// once everything is all said and done,
 		add_action( 'shutdown', array( $this, 'update' ), 100 );
@@ -184,18 +184,18 @@ 
 
 
 
-     /**
-      * @return void
-      * @throws \EventEspresso\core\exceptions\InvalidSessionDataException
-      * @throws \EE_Error
-      */
+	 /**
+	  * @return void
+	  * @throws \EventEspresso\core\exceptions\InvalidSessionDataException
+	  * @throws \EE_Error
+	  */
 	 public function open_session() {
-         // check for existing session and retrieve it from db
-         if ( ! $this->_espresso_session()) {
-             // or just start a new one
-             $this->_create_espresso_session();
-         }
-     }
+		 // check for existing session and retrieve it from db
+		 if ( ! $this->_espresso_session()) {
+			 // or just start a new one
+			 $this->_create_espresso_session();
+		 }
+	 }
 
 
 	 /**
@@ -408,16 +408,16 @@ 
 		// set the "user agent"
 		$this->_user_agent = isset($_SERVER['HTTP_USER_AGENT']) ? esc_attr( $_SERVER['HTTP_USER_AGENT'] ) : FALSE;
 		// now let's retrieve what's in the db
-        $session_data = $this->_retrieve_session_data();
-        if (! empty($session_data)) {
-            // get the current time in UTC
+		$session_data = $this->_retrieve_session_data();
+		if (! empty($session_data)) {
+			// get the current time in UTC
 			$this->_time = isset( $this->_time ) ? $this->_time : time();
 			// and reset the session expiration
 			$this->_expiration = isset( $session_data['expiration'] )
 				? $session_data['expiration']
 				: $this->_time + $this->_lifespan;
 		} else {
-            // set initial site access time and the session expiration
+			// set initial site access time and the session expiration
 			$this->_set_init_access_and_expiration();
 			// set referer
 			$this->_session_data[ 'pages_visited' ][ $this->_session_data['init_access'] ] = isset( $_SERVER['HTTP_REFERER'] )
@@ -426,7 +426,7 @@ 
 			// no previous session = go back and create one (on top of the data above)
 			return FALSE;
 		}
-        // now the user agent
+		// now the user agent
 		if ( $session_data['user_agent'] !== $this->_user_agent ) {
 			return FALSE;
 		}
@@ -444,95 +444,95 @@ 
 
 
 
-     /**
-      * _get_session_data
-      * Retrieves the session data, and attempts to correct any encoding issues that can occur due to improperly setup databases
-      *
-      * @return array
-      * @throws \EventEspresso\core\exceptions\InvalidSessionDataException
-      */
-     protected function _retrieve_session_data()
-     {
-         $ssn_key = EE_Session::session_id_prefix . $this->_sid;
-         try {
-             // we're using WP's Transient API to store session data using the PHP session ID as the option name
-             $session_data = get_transient($ssn_key);
-	         if ($session_data === false) {
-		         return array();
-             }
-             if (apply_filters('FHEE__EE_Session___perform_session_id_hash_check', WP_DEBUG)) {
-                 $hash_check = get_transient(EE_Session::hash_check_prefix . $this->_sid);
-                 if ($hash_check && $hash_check !== md5($session_data)) {
-	                 EE_Error::add_error(
-                         sprintf(
-                             __('The stored data for session %1$s failed to pass a hash check and therefore appears to be invalid.', 'event_espresso'),
-                             EE_Session::session_id_prefix . $this->_sid
-                         ),
-                         __FILE__, __FUNCTION__, __LINE__
-                     );
-                 }
-             }
-         } catch (Exception $e) {
-             // let's just eat that error for now and attempt to correct any corrupted data
-             global $wpdb;
-             $row = $wpdb->get_row(
-                 $wpdb->prepare(
-                     "SELECT option_value FROM {$wpdb->options} WHERE option_name = %s LIMIT 1",
-                     '_transient_' . $ssn_key
-                 )
-             );
-             $session_data = is_object($row) ? $row->option_value : null;
-             if ($session_data) {
-                 $session_data = preg_replace_callback(
-                     '!s:(d+):"(.*?)";!',
-                     function ($match) {
-                         return $match[1] === strlen($match[2])
-                             ? $match[0]
-                             : 's:' . strlen($match[2]) . ':"' . $match[2] . '";';
-                     },
-                     $session_data
-                 );
-             }
-	         $session_data = maybe_unserialize($session_data);
-         }
-	     // in case the data is encoded... try to decode it
-         $session_data = $this->encryption instanceof EE_Encryption
-             ? $this->encryption->base64_string_decode($session_data)
-             : $session_data;
-
-         if ( ! is_array($session_data)) {
-             try {
-	             $session_data = maybe_unserialize($session_data);
-             } catch (Exception $e) {
-                 $msg = esc_html__(
-                     'An error occurred while attempting to unserialize the session data.',
-                     'event_espresso'
-                 );
-                 $msg .= WP_DEBUG
-                     ? '<br><pre>' . print_r($session_data, true) . '</pre><br>' . $this->find_serialize_error($session_data)
-                     : '';
-                 throw new InvalidSessionDataException($msg, 0, $e);
-             }
-         }
-         // just a check to make sure the session array is indeed an array
-         if ( ! is_array($session_data)) {
-             // no?!?! then something is wrong
-             $msg = esc_html__(
-                 'The session data is missing, invalid, or corrupted.',
-                 'event_espresso'
-             );
-             $msg .= WP_DEBUG
-                 ? '<br><pre>' . print_r($session_data, true) . '</pre><br>' . $this->find_serialize_error($session_data)
-                 : '';
-	         throw new InvalidSessionDataException($msg);
-         }
-	     if ( isset( $this->_session_data['transaction'] ) && absint( $this->_session_data['transaction'] ) !== 0 ) {
-		     $this->_session_data['transaction'] = EEM_Transaction::instance()->get_one_by_ID(
-			     $this->_session_data['transaction']
-	         );
-	     }
-	     return $session_data;
-     }
+	 /**
+	  * _get_session_data
+	  * Retrieves the session data, and attempts to correct any encoding issues that can occur due to improperly setup databases
+	  *
+	  * @return array
+	  * @throws \EventEspresso\core\exceptions\InvalidSessionDataException
+	  */
+	 protected function _retrieve_session_data()
+	 {
+		 $ssn_key = EE_Session::session_id_prefix . $this->_sid;
+		 try {
+			 // we're using WP's Transient API to store session data using the PHP session ID as the option name
+			 $session_data = get_transient($ssn_key);
+			 if ($session_data === false) {
+				 return array();
+			 }
+			 if (apply_filters('FHEE__EE_Session___perform_session_id_hash_check', WP_DEBUG)) {
+				 $hash_check = get_transient(EE_Session::hash_check_prefix . $this->_sid);
+				 if ($hash_check && $hash_check !== md5($session_data)) {
+					 EE_Error::add_error(
+						 sprintf(
+							 __('The stored data for session %1$s failed to pass a hash check and therefore appears to be invalid.', 'event_espresso'),
+							 EE_Session::session_id_prefix . $this->_sid
+						 ),
+						 __FILE__, __FUNCTION__, __LINE__
+					 );
+				 }
+			 }
+		 } catch (Exception $e) {
+			 // let's just eat that error for now and attempt to correct any corrupted data
+			 global $wpdb;
+			 $row = $wpdb->get_row(
+				 $wpdb->prepare(
+					 "SELECT option_value FROM {$wpdb->options} WHERE option_name = %s LIMIT 1",
+					 '_transient_' . $ssn_key
+				 )
+			 );
+			 $session_data = is_object($row) ? $row->option_value : null;
+			 if ($session_data) {
+				 $session_data = preg_replace_callback(
+					 '!s:(d+):"(.*?)";!',
+					 function ($match) {
+						 return $match[1] === strlen($match[2])
+							 ? $match[0]
+							 : 's:' . strlen($match[2]) . ':"' . $match[2] . '";';
+					 },
+					 $session_data
+				 );
+			 }
+			 $session_data = maybe_unserialize($session_data);
+		 }
+		 // in case the data is encoded... try to decode it
+		 $session_data = $this->encryption instanceof EE_Encryption
+			 ? $this->encryption->base64_string_decode($session_data)
+			 : $session_data;
+
+		 if ( ! is_array($session_data)) {
+			 try {
+				 $session_data = maybe_unserialize($session_data);
+			 } catch (Exception $e) {
+				 $msg = esc_html__(
+					 'An error occurred while attempting to unserialize the session data.',
+					 'event_espresso'
+				 );
+				 $msg .= WP_DEBUG
+					 ? '<br><pre>' . print_r($session_data, true) . '</pre><br>' . $this->find_serialize_error($session_data)
+					 : '';
+				 throw new InvalidSessionDataException($msg, 0, $e);
+			 }
+		 }
+		 // just a check to make sure the session array is indeed an array
+		 if ( ! is_array($session_data)) {
+			 // no?!?! then something is wrong
+			 $msg = esc_html__(
+				 'The session data is missing, invalid, or corrupted.',
+				 'event_espresso'
+			 );
+			 $msg .= WP_DEBUG
+				 ? '<br><pre>' . print_r($session_data, true) . '</pre><br>' . $this->find_serialize_error($session_data)
+				 : '';
+			 throw new InvalidSessionDataException($msg);
+		 }
+		 if ( isset( $this->_session_data['transaction'] ) && absint( $this->_session_data['transaction'] ) !== 0 ) {
+			 $this->_session_data['transaction'] = EEM_Transaction::instance()->get_one_by_ID(
+				 $this->_session_data['transaction']
+			 );
+		 }
+		 return $session_data;
+	 }
 
 
 
@@ -754,15 +754,15 @@ 
 		}
 		// then serialize all of our session data
 		$session_data = serialize($this->_session_data);
-        //use the "private" function _wp_json_convert_string to convert the string to UTF8
-        //which is what the DB is usually in. This way when the string gets inserted into the DB, it won't change
-        //encodings at that point, which change can cause the hash to be different if some of the session data was
-        //in a different encoding, like ANSI.
-        //we double-check the function exists first because it's labelled "private", so it's possible it will be removed
-        //from WP some day2
-        if( function_exists( '_wp_json_convert_string' ) ) {
-            $session_data = _wp_json_convert_string( $session_data );
-        }
+		//use the "private" function _wp_json_convert_string to convert the string to UTF8
+		//which is what the DB is usually in. This way when the string gets inserted into the DB, it won't change
+		//encodings at that point, which change can cause the hash to be different if some of the session data was
+		//in a different encoding, like ANSI.
+		//we double-check the function exists first because it's labelled "private", so it's possible it will be removed
+		//from WP some day2
+		if( function_exists( '_wp_json_convert_string' ) ) {
+			$session_data = _wp_json_convert_string( $session_data );
+		}
 		// do we need to also encode it to avoid corrupted data when saved to the db?
 		$session_data = $this->_use_encryption ? $this->encryption->base64_string_encode( $session_data ) : $session_data;
 		// maybe save hash check

Spacing +173 added lines, -173 removed lines

@@ -1,6 +1,6 @@ 
 <?php use EventEspresso\core\exceptions\InvalidSessionDataException;
 
-if (!defined( 'EVENT_ESPRESSO_VERSION')) {exit('No direct script access allowed');}
+if ( ! defined('EVENT_ESPRESSO_VERSION')) {exit('No direct script access allowed'); }
 /**
  *
  * EE_Session class
@@ -91,7 +91,7 @@ 
 	  * array for defining default session vars
 	  * @var array
 	  */
-	 private $_default_session_vars = array (
+	 private $_default_session_vars = array(
 		'id' => NULL,
 		'user_id' => NULL,
 		'ip_address' => NULL,
@@ -111,12 +111,12 @@ 
 	  * @throws InvalidSessionDataException
 	  * @throws \EE_Error
 	  */
-	public static function instance( EE_Encryption $encryption = null ) {
+	public static function instance(EE_Encryption $encryption = null) {
 		// check if class object is instantiated
 		// session loading is turned ON by default, but prior to the init hook, can be turned back OFF via:
 		// add_filter( 'FHEE_load_EE_Session', '__return_false' );
-		if ( ! self::$_instance instanceof EE_Session && apply_filters( 'FHEE_load_EE_Session', true ) ) {
-			self::$_instance = new self( $encryption );
+		if ( ! self::$_instance instanceof EE_Session && apply_filters('FHEE_load_EE_Session', true)) {
+			self::$_instance = new self($encryption);
 		}
 		return self::$_instance;
 	}
@@ -132,15 +132,15 @@ 
 	  * @throws \EE_Error
 	  * @throws \EventEspresso\core\exceptions\InvalidSessionDataException
 	  */
-	 protected function __construct( EE_Encryption $encryption = null ) {
+	 protected function __construct(EE_Encryption $encryption = null) {
 
 		// session loading is turned ON by default, but prior to the init hook, can be turned back OFF via: add_filter( 'FHEE_load_EE_Session', '__return_false' );
-		if ( ! apply_filters( 'FHEE_load_EE_Session', TRUE ) ) {
+		if ( ! apply_filters('FHEE_load_EE_Session', TRUE)) {
 			return;
 		}
-		do_action( 'AHEE_log', __FILE__, __FUNCTION__, '' );
-		if ( ! defined( 'ESPRESSO_SESSION' ) ) {
-			define( 'ESPRESSO_SESSION', true );
+		do_action('AHEE_log', __FILE__, __FUNCTION__, '');
+		if ( ! defined('ESPRESSO_SESSION')) {
+			define('ESPRESSO_SESSION', true);
 		}
 		// default session lifespan in seconds
 		$this->_lifespan = apply_filters(
@@ -154,12 +154,12 @@ 
 		 * 		}
 		 */
 		// retrieve session options from db
-		$session_settings = (array) get_option( 'ee_session_settings', array() );
-		if ( ! empty( $session_settings )) {
+		$session_settings = (array) get_option('ee_session_settings', array());
+		if ( ! empty($session_settings)) {
 			// cycle though existing session options
-			foreach ( $session_settings as $var_name => $session_setting ) {
+			foreach ($session_settings as $var_name => $session_setting) {
 				// set values for class properties
-				$var_name = '_' . $var_name;
+				$var_name = '_'.$var_name;
 				$this->{$var_name} = $session_setting;
 			}
 		}
@@ -169,17 +169,17 @@ 
         // encrypt data via: $this->encryption->encrypt();
         $this->encryption = $encryption;
 		// filter hook allows outside functions/classes/plugins to change default empty cart
-		$extra_default_session_vars = apply_filters( 'FHEE__EE_Session__construct__extra_default_session_vars', array() );
-		array_merge( $this->_default_session_vars, $extra_default_session_vars );
+		$extra_default_session_vars = apply_filters('FHEE__EE_Session__construct__extra_default_session_vars', array());
+		array_merge($this->_default_session_vars, $extra_default_session_vars);
 		// apply default session vars
 		$this->_set_defaults();
          add_action('AHEE__EE_System__initialize', array($this, 'open_session'));
          // check request for 'clear_session' param
-		add_action( 'AHEE__EE_Request_Handler__construct__complete', array( $this, 'wp_loaded' ));
+		add_action('AHEE__EE_Request_Handler__construct__complete', array($this, 'wp_loaded'));
 		// once everything is all said and done,
-		add_action( 'shutdown', array( $this, 'update' ), 100 );
-		add_action( 'shutdown', array( $this, 'garbage_collection' ), 999 );
-		add_filter( 'wp_redirect', array( $this, 'update_on_redirect' ), 100, 1 );
+		add_action('shutdown', array($this, 'update'), 100);
+		add_action('shutdown', array($this, 'garbage_collection'), 999);
+		add_filter('wp_redirect', array($this, 'update_on_redirect'), 100, 1);
 	}
 
 
@@ -224,11 +224,11 @@ 
 	 */
 	private function _set_defaults() {
 		// set some defaults
-		foreach ( $this->_default_session_vars as $key => $default_var ) {
-			if ( is_array( $default_var )) {
-				$this->_session_data[ $key ] = array();
+		foreach ($this->_default_session_vars as $key => $default_var) {
+			if (is_array($default_var)) {
+				$this->_session_data[$key] = array();
 			} else {
-				$this->_session_data[ $key ] = '';
+				$this->_session_data[$key] = '';
 			}
 		}
 	}
@@ -250,7 +250,7 @@ 
 	  * @param \EE_Cart $cart
 	  * @return bool
 	  */
-	 public function set_cart( EE_Cart $cart ) {
+	 public function set_cart(EE_Cart $cart) {
 		 $this->_session_data['cart'] = $cart;
 		 return TRUE;
 	 }
@@ -270,7 +270,7 @@ 
 	  * @return \EE_Cart
 	  */
 	 public function cart() {
-		 return isset( $this->_session_data['cart'] ) ? $this->_session_data['cart'] : NULL;
+		 return isset($this->_session_data['cart']) ? $this->_session_data['cart'] : NULL;
 	 }
 
 
@@ -279,7 +279,7 @@ 
 	  * @param \EE_Checkout $checkout
 	  * @return bool
 	  */
-	 public function set_checkout( EE_Checkout $checkout ) {
+	 public function set_checkout(EE_Checkout $checkout) {
 		 $this->_session_data['checkout'] = $checkout;
 		 return TRUE;
 	 }
@@ -299,7 +299,7 @@ 
 	  * @return \EE_Checkout
 	  */
 	 public function checkout() {
-		 return isset( $this->_session_data['checkout'] ) ? $this->_session_data['checkout'] : NULL;
+		 return isset($this->_session_data['checkout']) ? $this->_session_data['checkout'] : NULL;
 	 }
 
 
@@ -309,9 +309,9 @@ 
 	  * @return bool
 	  * @throws \EE_Error
 	  */
-	 public function set_transaction( EE_Transaction $transaction ) {
+	 public function set_transaction(EE_Transaction $transaction) {
 		 // first remove the session from the transaction before we save the transaction in the session
-		 $transaction->set_txn_session_data( NULL );
+		 $transaction->set_txn_session_data(NULL);
 		 $this->_session_data['transaction'] = $transaction;
 		 return TRUE;
 	 }
@@ -331,7 +331,7 @@ 
 	  * @return \EE_Transaction
 	  */
 	 public function transaction() {
-		 return isset( $this->_session_data['transaction'] ) ? $this->_session_data['transaction'] : NULL;
+		 return isset($this->_session_data['transaction']) ? $this->_session_data['transaction'] : NULL;
 	 }
 
 
@@ -343,15 +343,15 @@ 
 	  * @param bool $reset_cache
 	  * @return    array
 	  */
-	public function get_session_data( $key = NULL, $reset_cache = FALSE ) {
-		if ( $reset_cache ) {
+	public function get_session_data($key = NULL, $reset_cache = FALSE) {
+		if ($reset_cache) {
 			$this->reset_cart();
 			$this->reset_checkout();
 			$this->reset_transaction();
 		}
-		 if ( ! empty( $key ))  {
-			return  isset( $this->_session_data[ $key ] ) ? $this->_session_data[ $key ] : NULL;
-		}  else  {
+		 if ( ! empty($key)) {
+			return  isset($this->_session_data[$key]) ? $this->_session_data[$key] : NULL;
+		} else {
 			return $this->_session_data;
 		}
 	}
@@ -364,20 +364,20 @@ 
 	  * @param 	array $data
 	  * @return 	TRUE on success, FALSE on fail
 	  */
-	public function set_session_data( $data ) {
+	public function set_session_data($data) {
 
 		// nothing ??? bad data ??? go home!
-		if ( empty( $data ) || ! is_array( $data )) {
-			EE_Error::add_error( __( 'No session data or invalid session data was provided.', 'event_espresso' ), __FILE__, __FUNCTION__, __LINE__ );
+		if (empty($data) || ! is_array($data)) {
+			EE_Error::add_error(__('No session data or invalid session data was provided.', 'event_espresso'), __FILE__, __FUNCTION__, __LINE__);
 			return FALSE;
 		}
 
-		foreach ( $data as $key =>$value ) {
-			if ( isset( $this->_default_session_vars[ $key ] )) {
-				EE_Error::add_error( sprintf( __( 'Sorry! %s is a default session datum and can not be reset.', 'event_espresso' ), $key ), __FILE__, __FUNCTION__, __LINE__ );
+		foreach ($data as $key =>$value) {
+			if (isset($this->_default_session_vars[$key])) {
+				EE_Error::add_error(sprintf(__('Sorry! %s is a default session datum and can not be reset.', 'event_espresso'), $key), __FILE__, __FUNCTION__, __LINE__);
 				return FALSE;
 			} else {
-				$this->_session_data[ $key ] = $value;
+				$this->_session_data[$key] = $value;
 			}
 		}
 
@@ -395,9 +395,9 @@ 
 	  * @throws \EE_Error
 	  */
 	private function _espresso_session() {
-		do_action( 'AHEE_log', __FILE__, __FUNCTION__, '' );
+		do_action('AHEE_log', __FILE__, __FUNCTION__, '');
 		// check that session has started
-		if ( session_id() === '' ) {
+		if (session_id() === '') {
 			//starts a new session if one doesn't already exist, or re-initiates an existing one
 			session_start();
 		}
@@ -406,38 +406,38 @@ 
 		// and the visitors IP
 		$this->_ip_address = $this->_visitor_ip();
 		// set the "user agent"
-		$this->_user_agent = isset($_SERVER['HTTP_USER_AGENT']) ? esc_attr( $_SERVER['HTTP_USER_AGENT'] ) : FALSE;
+		$this->_user_agent = isset($_SERVER['HTTP_USER_AGENT']) ? esc_attr($_SERVER['HTTP_USER_AGENT']) : FALSE;
 		// now let's retrieve what's in the db
         $session_data = $this->_retrieve_session_data();
-        if (! empty($session_data)) {
+        if ( ! empty($session_data)) {
             // get the current time in UTC
-			$this->_time = isset( $this->_time ) ? $this->_time : time();
+			$this->_time = isset($this->_time) ? $this->_time : time();
 			// and reset the session expiration
-			$this->_expiration = isset( $session_data['expiration'] )
+			$this->_expiration = isset($session_data['expiration'])
 				? $session_data['expiration']
 				: $this->_time + $this->_lifespan;
 		} else {
             // set initial site access time and the session expiration
 			$this->_set_init_access_and_expiration();
 			// set referer
-			$this->_session_data[ 'pages_visited' ][ $this->_session_data['init_access'] ] = isset( $_SERVER['HTTP_REFERER'] )
-				? esc_attr( $_SERVER['HTTP_REFERER'] )
+			$this->_session_data['pages_visited'][$this->_session_data['init_access']] = isset($_SERVER['HTTP_REFERER'])
+				? esc_attr($_SERVER['HTTP_REFERER'])
 				: '';
 			// no previous session = go back and create one (on top of the data above)
 			return FALSE;
 		}
         // now the user agent
-		if ( $session_data['user_agent'] !== $this->_user_agent ) {
+		if ($session_data['user_agent'] !== $this->_user_agent) {
 			return FALSE;
 		}
 		// wait a minute... how old are you?
-		if ( $this->_time > $this->_expiration ) {
+		if ($this->_time > $this->_expiration) {
 			// yer too old fer me!
 			// wipe out everything that isn't a default session datum
-			$this->clear_session( __CLASS__, __FUNCTION__ );
+			$this->clear_session(__CLASS__, __FUNCTION__);
 		}
 		// make event espresso session data available to plugin
-		$this->_session_data = array_merge( $this->_session_data, $session_data );
+		$this->_session_data = array_merge($this->_session_data, $session_data);
 		return TRUE;
 
 	}
@@ -453,7 +453,7 @@ 
       */
      protected function _retrieve_session_data()
      {
-         $ssn_key = EE_Session::session_id_prefix . $this->_sid;
+         $ssn_key = EE_Session::session_id_prefix.$this->_sid;
          try {
              // we're using WP's Transient API to store session data using the PHP session ID as the option name
              $session_data = get_transient($ssn_key);
@@ -461,12 +461,12 @@ 
 		         return array();
              }
              if (apply_filters('FHEE__EE_Session___perform_session_id_hash_check', WP_DEBUG)) {
-                 $hash_check = get_transient(EE_Session::hash_check_prefix . $this->_sid);
+                 $hash_check = get_transient(EE_Session::hash_check_prefix.$this->_sid);
                  if ($hash_check && $hash_check !== md5($session_data)) {
 	                 EE_Error::add_error(
                          sprintf(
                              __('The stored data for session %1$s failed to pass a hash check and therefore appears to be invalid.', 'event_espresso'),
-                             EE_Session::session_id_prefix . $this->_sid
+                             EE_Session::session_id_prefix.$this->_sid
                          ),
                          __FILE__, __FUNCTION__, __LINE__
                      );
@@ -478,17 +478,17 @@ 
              $row = $wpdb->get_row(
                  $wpdb->prepare(
                      "SELECT option_value FROM {$wpdb->options} WHERE option_name = %s LIMIT 1",
-                     '_transient_' . $ssn_key
+                     '_transient_'.$ssn_key
                  )
              );
              $session_data = is_object($row) ? $row->option_value : null;
              if ($session_data) {
                  $session_data = preg_replace_callback(
                      '!s:(d+):"(.*?)";!',
-                     function ($match) {
+                     function($match) {
                          return $match[1] === strlen($match[2])
                              ? $match[0]
-                             : 's:' . strlen($match[2]) . ':"' . $match[2] . '";';
+                             : 's:'.strlen($match[2]).':"'.$match[2].'";';
                      },
                      $session_data
                  );
@@ -509,7 +509,7 @@ 
                      'event_espresso'
                  );
                  $msg .= WP_DEBUG
-                     ? '<br><pre>' . print_r($session_data, true) . '</pre><br>' . $this->find_serialize_error($session_data)
+                     ? '<br><pre>'.print_r($session_data, true).'</pre><br>'.$this->find_serialize_error($session_data)
                      : '';
                  throw new InvalidSessionDataException($msg, 0, $e);
              }
@@ -522,11 +522,11 @@ 
                  'event_espresso'
              );
              $msg .= WP_DEBUG
-                 ? '<br><pre>' . print_r($session_data, true) . '</pre><br>' . $this->find_serialize_error($session_data)
+                 ? '<br><pre>'.print_r($session_data, true).'</pre><br>'.$this->find_serialize_error($session_data)
                  : '';
 	         throw new InvalidSessionDataException($msg);
          }
-	     if ( isset( $this->_session_data['transaction'] ) && absint( $this->_session_data['transaction'] ) !== 0 ) {
+	     if (isset($this->_session_data['transaction']) && absint($this->_session_data['transaction']) !== 0) {
 		     $this->_session_data['transaction'] = EEM_Transaction::instance()->get_one_by_ID(
 			     $this->_session_data['transaction']
 	         );
@@ -547,12 +547,12 @@ 
 	  */
 	protected function _generate_session_id() {
 		// check if the SID was passed explicitly, otherwise get from session, then add salt and hash it to reduce length
-		if ( isset( $_REQUEST[ 'EESID' ] ) ) {
-			$session_id = sanitize_text_field( $_REQUEST[ 'EESID' ] );
+		if (isset($_REQUEST['EESID'])) {
+			$session_id = sanitize_text_field($_REQUEST['EESID']);
 		} else {
-			$session_id = md5( session_id() . get_current_blog_id() . $this->_get_sid_salt() );
+			$session_id = md5(session_id().get_current_blog_id().$this->_get_sid_salt());
 		}
-		return apply_filters( 'FHEE__EE_Session___generate_session_id__session_id', $session_id );
+		return apply_filters('FHEE__EE_Session___generate_session_id__session_id', $session_id);
 	}
 
 
@@ -564,20 +564,20 @@ 
 	  */
 	protected function _get_sid_salt() {
 		// was session id salt already saved to db ?
-		if ( empty( $this->_sid_salt ) ) {
+		if (empty($this->_sid_salt)) {
 			// no?  then maybe use WP defined constant
-			if ( defined( 'AUTH_SALT' ) ) {
+			if (defined('AUTH_SALT')) {
 				$this->_sid_salt = AUTH_SALT;
 			}
 			// if salt doesn't exist or is too short
-			if ( empty( $this->_sid_salt ) || strlen( $this->_sid_salt ) < 32 ) {
+			if (empty($this->_sid_salt) || strlen($this->_sid_salt) < 32) {
 				// create a new one
-				$this->_sid_salt = wp_generate_password( 64 );
+				$this->_sid_salt = wp_generate_password(64);
 			}
 			// and save it as a permanent session setting
-			$session_settings = get_option( 'ee_session_settings' );
-			$session_settings[ 'sid_salt' ] = $this->_sid_salt;
-			update_option( 'ee_session_settings', $session_settings );
+			$session_settings = get_option('ee_session_settings');
+			$session_settings['sid_salt'] = $this->_sid_salt;
+			update_option('ee_session_settings', $session_settings);
 		}
 		return $this->_sid_salt;
 	}
@@ -605,19 +605,19 @@ 
 	  * @param bool $new_session
 	  * @return TRUE on success, FALSE on fail
 	  */
-	public function update( $new_session = FALSE ) {
-		$this->_session_data = isset( $this->_session_data )
-			&& is_array( $this->_session_data )
-			&& isset( $this->_session_data['id'])
+	public function update($new_session = FALSE) {
+		$this->_session_data = isset($this->_session_data)
+			&& is_array($this->_session_data)
+			&& isset($this->_session_data['id'])
 			? $this->_session_data
 			: array();
-		if ( empty( $this->_session_data )) {
+		if (empty($this->_session_data)) {
 			$this->_set_defaults();
 		}
 		$session_data = array();
-		foreach ( $this->_session_data as $key => $value ) {
+		foreach ($this->_session_data as $key => $value) {
 
-			switch( $key ) {
+			switch ($key) {
 
 				case 'id' :
 					// session ID
@@ -635,7 +635,7 @@ 
 				break;
 
 				case 'init_access' :
-					$session_data['init_access'] = absint( $value );
+					$session_data['init_access'] = absint($value);
 				break;
 
 				case 'last_access' :
@@ -645,7 +645,7 @@ 
 
 				case 'expiration' :
 					// when the session expires
-					$session_data['expiration'] = ! empty( $this->_expiration )
+					$session_data['expiration'] = ! empty($this->_expiration)
 						? $this->_expiration
 						: $session_data['init_access'] + $this->_lifespan;
 				break;
@@ -657,11 +657,11 @@ 
 
 				case 'pages_visited' :
 					$page_visit = $this->_get_page_visit();
-					if ( $page_visit ) {
+					if ($page_visit) {
 						// set pages visited where the first will be the http referrer
-						$this->_session_data[ 'pages_visited' ][ $this->_time ] = $page_visit;
+						$this->_session_data['pages_visited'][$this->_time] = $page_visit;
 						// we'll only save the last 10 page visits.
-						$session_data[ 'pages_visited' ] = array_slice( $this->_session_data['pages_visited'], -10 );
+						$session_data['pages_visited'] = array_slice($this->_session_data['pages_visited'], -10);
 					}
 				break;
 
@@ -675,9 +675,9 @@ 
 
 		$this->_session_data = $session_data;
 		// creating a new session does not require saving to the db just yet
-		if ( ! $new_session ) {
+		if ( ! $new_session) {
 			// ready? let's save
-			if ( $this->_save_session_to_db() ) {
+			if ($this->_save_session_to_db()) {
 				return TRUE;
 			} else {
 				return FALSE;
@@ -699,7 +699,7 @@ 
 	  * @param string $location
 	  * @return mixed
 	  */
-	 public function update_on_redirect( $location ) {
+	 public function update_on_redirect($location) {
 		 $this->update();
 		 return $location;
 	}
@@ -711,9 +711,9 @@ 
 	 * 	@return bool
 	 */
 	private function _create_espresso_session( ) {
-		do_action( 'AHEE_log', __CLASS__, __FUNCTION__, '' );
+		do_action('AHEE_log', __CLASS__, __FUNCTION__, '');
 		// use the update function for now with $new_session arg set to TRUE
-		return  $this->update( TRUE ) ? TRUE : FALSE;
+		return  $this->update(TRUE) ? TRUE : FALSE;
 	}
 
 
@@ -739,15 +739,15 @@ 
 				// OR an admin request that is NOT AJAX
 				|| (
 					is_admin()
-					&& ! ( defined( 'DOING_AJAX' ) && DOING_AJAX )
+					&& ! (defined('DOING_AJAX') && DOING_AJAX)
 				)
 			)
 		) {
 			return false;
 		}
 		$transaction = $this->transaction();
-		if ( $transaction instanceof EE_Transaction ) {
-			if ( ! $transaction->ID() ) {
+		if ($transaction instanceof EE_Transaction) {
+			if ( ! $transaction->ID()) {
 				$transaction->save();
 			}
 			$this->_session_data['transaction'] = $transaction->ID();
@@ -760,17 +760,17 @@ 
         //in a different encoding, like ANSI.
         //we double-check the function exists first because it's labelled "private", so it's possible it will be removed
         //from WP some day2
-        if( function_exists( '_wp_json_convert_string' ) ) {
-            $session_data = _wp_json_convert_string( $session_data );
+        if (function_exists('_wp_json_convert_string')) {
+            $session_data = _wp_json_convert_string($session_data);
         }
 		// do we need to also encode it to avoid corrupted data when saved to the db?
-		$session_data = $this->_use_encryption ? $this->encryption->base64_string_encode( $session_data ) : $session_data;
+		$session_data = $this->_use_encryption ? $this->encryption->base64_string_encode($session_data) : $session_data;
 		// maybe save hash check
-		if ( apply_filters( 'FHEE__EE_Session___perform_session_id_hash_check', WP_DEBUG ) ) {
-			set_transient( EE_Session::hash_check_prefix . $this->_sid, md5( $session_data ), $this->_lifespan );
+		if (apply_filters('FHEE__EE_Session___perform_session_id_hash_check', WP_DEBUG)) {
+			set_transient(EE_Session::hash_check_prefix.$this->_sid, md5($session_data), $this->_lifespan);
 		}
 		// we're using the Transient API for storing session data, cuz it's so damn simple -> set_transient(  transient ID, data, expiry )
-		return set_transient( EE_Session::session_id_prefix . $this->_sid, $session_data, $this->_lifespan );
+		return set_transient(EE_Session::session_id_prefix.$this->_sid, $session_data, $this->_lifespan);
 	}
 
 
@@ -796,10 +796,10 @@ 
 			'HTTP_FORWARDED',
 			'REMOTE_ADDR'
 		);
-		foreach ( $server_keys as $key ){
-			if ( isset( $_SERVER[ $key ] )) {
-				foreach ( array_map( 'trim', explode( ',', $_SERVER[ $key ] )) as $ip ) {
-					if ( $ip === '127.0.0.1' || filter_var( $ip, FILTER_VALIDATE_IP ) !== FALSE ) {
+		foreach ($server_keys as $key) {
+			if (isset($_SERVER[$key])) {
+				foreach (array_map('trim', explode(',', $_SERVER[$key])) as $ip) {
+					if ($ip === '127.0.0.1' || filter_var($ip, FILTER_VALIDATE_IP) !== FALSE) {
 						$visitor_ip = $ip;
 					}
 				}
@@ -818,32 +818,32 @@ 
 	 *			@return string
 	 */
 	public function _get_page_visit() {
-		$page_visit = home_url('/') . 'wp-admin/admin-ajax.php';
+		$page_visit = home_url('/').'wp-admin/admin-ajax.php';
 		// check for request url
-		if ( isset( $_SERVER['REQUEST_URI'] )) {
+		if (isset($_SERVER['REQUEST_URI'])) {
 			$http_host = '';
 			$page_id = '?';
 			$e_reg = '';
-			$request_uri = esc_url( $_SERVER['REQUEST_URI'] );
-			$ru_bits = explode( '?', $request_uri );
+			$request_uri = esc_url($_SERVER['REQUEST_URI']);
+			$ru_bits = explode('?', $request_uri);
 			$request_uri = $ru_bits[0];
 			// check for and grab host as well
-			if ( isset( $_SERVER['HTTP_HOST'] )) {
-				$http_host = esc_url( $_SERVER['HTTP_HOST'] );
+			if (isset($_SERVER['HTTP_HOST'])) {
+				$http_host = esc_url($_SERVER['HTTP_HOST']);
 			}
 			// check for page_id in SERVER REQUEST
-			if ( isset( $_REQUEST['page_id'] )) {
+			if (isset($_REQUEST['page_id'])) {
 				// rebuild $e_reg without any of the extra parameters
-				$page_id = '?page_id=' . esc_attr( $_REQUEST['page_id'] ) . '&amp;';
+				$page_id = '?page_id='.esc_attr($_REQUEST['page_id']).'&amp;';
 			}
 			// check for $e_reg in SERVER REQUEST
-			if ( isset( $_REQUEST['ee'] )) {
+			if (isset($_REQUEST['ee'])) {
 				// rebuild $e_reg without any of the extra parameters
-				$e_reg = 'ee=' . esc_attr( $_REQUEST['ee'] );
+				$e_reg = 'ee='.esc_attr($_REQUEST['ee']);
 			}
-			$page_visit = rtrim( $http_host . $request_uri . $page_id . $e_reg, '?' );
+			$page_visit = rtrim($http_host.$request_uri.$page_id.$e_reg, '?');
 		}
-		return $page_visit !== home_url( '/wp-admin/admin-ajax.php' ) ? $page_visit : '';
+		return $page_visit !== home_url('/wp-admin/admin-ajax.php') ? $page_visit : '';
 
 	}
 
@@ -872,14 +872,14 @@ 
 	  * @param string $function
 	  * @return void
 	  */
-	public function clear_session( $class = '', $function = '' ) {
+	public function clear_session($class = '', $function = '') {
 		//echo '<h3 style="color:#999;line-height:.9em;"><span style="color:#2EA2CC">' . __CLASS__ . '</span>::<span style="color:#E76700">' . __FUNCTION__ . '( ' . $class . '::' . $function . '() )</span><br/><span style="font-size:9px;font-weight:normal;">' . __FILE__ . '</span>    <b style="font-size:10px;">  ' . __LINE__ . ' </b></h3>';
-		do_action( 'AHEE_log', __FILE__, __FUNCTION__, 'session cleared by : ' . $class . '::' .  $function . '()' );
+		do_action('AHEE_log', __FILE__, __FUNCTION__, 'session cleared by : '.$class.'::'.$function.'()');
 		$this->reset_cart();
 		$this->reset_checkout();
 		$this->reset_transaction();
 		// wipe out everything that isn't a default session datum
-		$this->reset_data( array_keys( $this->_session_data ));
+		$this->reset_data(array_keys($this->_session_data));
 		// reset initial site access time and the session expiration
 		$this->_set_init_access_and_expiration();
 		$this->_save_session_to_db();
@@ -894,42 +894,42 @@ 
 	  * @param bool  $show_all_notices
 	  * @return TRUE on success, FALSE on fail
 	  */
-	public function reset_data( $data_to_reset = array(), $show_all_notices = FALSE ) {
+	public function reset_data($data_to_reset = array(), $show_all_notices = FALSE) {
 		// if $data_to_reset is not in an array, then put it in one
-		if ( ! is_array( $data_to_reset ) ) {
-			$data_to_reset = array ( $data_to_reset );
+		if ( ! is_array($data_to_reset)) {
+			$data_to_reset = array($data_to_reset);
 		}
 		// nothing ??? go home!
-		if ( empty( $data_to_reset )) {
-			EE_Error::add_error( __( 'No session data could be reset, because no session var name was provided.', 'event_espresso' ), __FILE__, __FUNCTION__, __LINE__ );
+		if (empty($data_to_reset)) {
+			EE_Error::add_error(__('No session data could be reset, because no session var name was provided.', 'event_espresso'), __FILE__, __FUNCTION__, __LINE__);
 			return FALSE;
 		}
 		$return_value = TRUE;
 		// since $data_to_reset is an array, cycle through the values
-		foreach ( $data_to_reset as $reset ) {
+		foreach ($data_to_reset as $reset) {
 
 			// first check to make sure it is a valid session var
-			if ( isset( $this->_session_data[ $reset ] )) {
+			if (isset($this->_session_data[$reset])) {
 				// then check to make sure it is not a default var
-				if ( ! array_key_exists( $reset, $this->_default_session_vars )) {
+				if ( ! array_key_exists($reset, $this->_default_session_vars)) {
 					// remove session var
-					unset( $this->_session_data[ $reset ] );
-					if ( $show_all_notices ) {
-						EE_Error::add_success( sprintf( __( 'The session variable %s was removed.', 'event_espresso' ), $reset ), __FILE__, __FUNCTION__, __LINE__ );
+					unset($this->_session_data[$reset]);
+					if ($show_all_notices) {
+						EE_Error::add_success(sprintf(__('The session variable %s was removed.', 'event_espresso'), $reset), __FILE__, __FUNCTION__, __LINE__);
 					}
-					$return_value = !isset($return_value) ? TRUE : $return_value;
+					$return_value = ! isset($return_value) ? TRUE : $return_value;
 
 				} else {
 					// yeeeeeeeeerrrrrrrrrrr OUT !!!!
-					if ( $show_all_notices ) {
-						EE_Error::add_error( sprintf( __( 'Sorry! %s is a default session datum and can not be reset.', 'event_espresso' ), $reset ), __FILE__, __FUNCTION__, __LINE__ );
+					if ($show_all_notices) {
+						EE_Error::add_error(sprintf(__('Sorry! %s is a default session datum and can not be reset.', 'event_espresso'), $reset), __FILE__, __FUNCTION__, __LINE__);
 					}
 					$return_value = FALSE;
 				}
 
-			} else if ( $show_all_notices ) {
+			} else if ($show_all_notices) {
 				// oops! that session var does not exist!
-				EE_Error::add_error( sprintf( __( 'The session item provided, %s, is invalid or does not exist.', 'event_espresso' ), $reset ), __FILE__, __FUNCTION__, __LINE__ );
+				EE_Error::add_error(sprintf(__('The session item provided, %s, is invalid or does not exist.', 'event_espresso'), $reset), __FILE__, __FUNCTION__, __LINE__);
 				$return_value = FALSE;
 			}
 
@@ -949,8 +949,8 @@ 
 	 *   @access public
 	 */
 	public function wp_loaded() {
-		if ( isset(  EE_Registry::instance()->REQ ) && EE_Registry::instance()->REQ->is_set( 'clear_session' )) {
-			$this->clear_session( __CLASS__, __FUNCTION__ );
+		if (isset(EE_Registry::instance()->REQ) && EE_Registry::instance()->REQ->is_set('clear_session')) {
+			$this->clear_session(__CLASS__, __FUNCTION__);
 		}
 	}
 
@@ -975,24 +975,24 @@ 
 	  */
 	 public function garbage_collection() {
 		 // only perform during regular requests
-		 if ( ! defined( 'DOING_AJAX') || ! DOING_AJAX ) {
+		 if ( ! defined('DOING_AJAX') || ! DOING_AJAX) {
 			 /** @type WPDB $wpdb */
 			 global $wpdb;
 			 // since transient expiration timestamps are set in the future, we can compare against NOW
 			 $expiration = time();
-			 $too_far_in_the_the_future = $expiration + ( $this->_lifespan * 2 );
+			 $too_far_in_the_the_future = $expiration + ($this->_lifespan * 2);
 			 // filter the query limit. Set to 0 to turn off garbage collection
-			 $expired_session_transient_delete_query_limit = absint( apply_filters( 'FHEE__EE_Session__garbage_collection___expired_session_transient_delete_query_limit', 50 ));
+			 $expired_session_transient_delete_query_limit = absint(apply_filters('FHEE__EE_Session__garbage_collection___expired_session_transient_delete_query_limit', 50));
 			 // non-zero LIMIT means take out the trash
-			 if ( $expired_session_transient_delete_query_limit ) {
+			 if ($expired_session_transient_delete_query_limit) {
 				 //array of transient keys that require garbage collection
 				 $session_keys = array(
 					 EE_Session::session_id_prefix,
 					 EE_Session::hash_check_prefix,
 				 );
-				 foreach ( $session_keys as $session_key ) {
-					 $session_key = str_replace( '_', '\_', $session_key );
-					 $session_key = '\_transient\_timeout\_' . $session_key . '%';
+				 foreach ($session_keys as $session_key) {
+					 $session_key = str_replace('_', '\_', $session_key);
+					 $session_key = '\_transient\_timeout\_'.$session_key.'%';
 					 $SQL = "
 					SELECT option_name
 					FROM {$wpdb->options}
@@ -1002,25 +1002,25 @@ 
 					OR option_value > {$too_far_in_the_the_future} )
 					LIMIT {$expired_session_transient_delete_query_limit}
 				";
-					 $expired_sessions = $wpdb->get_col( $SQL );
+					 $expired_sessions = $wpdb->get_col($SQL);
 					 // valid results?
-					 if ( ! $expired_sessions instanceof WP_Error && ! empty( $expired_sessions ) ) {
+					 if ( ! $expired_sessions instanceof WP_Error && ! empty($expired_sessions)) {
 						 // format array of results into something usable within the actual DELETE query's IN clause
 						 $expired = array();
-						 foreach ( $expired_sessions as $expired_session ) {
-							 $expired[ ] = "'" . $expired_session . "'";
-							 $expired[ ] = "'" . str_replace( 'timeout_', '', $expired_session ) . "'";
+						 foreach ($expired_sessions as $expired_session) {
+							 $expired[] = "'".$expired_session."'";
+							 $expired[] = "'".str_replace('timeout_', '', $expired_session)."'";
 						 }
-						 $expired = implode( ', ', $expired );
+						 $expired = implode(', ', $expired);
 						 $SQL = "
 						DELETE FROM {$wpdb->options}
 						WHERE option_name
 						IN ( $expired );
 					 ";
-						 $results = $wpdb->query( $SQL );
+						 $results = $wpdb->query($SQL);
 						 // if something went wrong, then notify the admin
-						 if ( $results instanceof WP_Error && is_admin() ) {
-							 EE_Error::add_error( $results->get_error_message(), __FILE__, __FUNCTION__, __LINE__ );
+						 if ($results instanceof WP_Error && is_admin()) {
+							 EE_Error::add_error($results->get_error_message(), __FILE__, __FUNCTION__, __LINE__);
 						 }
 					 }
 				 }
@@ -1041,34 +1041,34 @@ 
 	  * @param $data1
 	  * @return string
 	  */
-	 private function find_serialize_error( $data1 ) {
+	 private function find_serialize_error($data1) {
 		$error = "<pre>";
 		 $data2 = preg_replace_callback(
 			 '!s:(\d+):"(.*?)";!',
-			 function ( $match ) {
-				 return ( $match[1] === strlen( $match[2] ) )
+			 function($match) {
+				 return ($match[1] === strlen($match[2]))
 					 ? $match[0]
 					 : 's:'
-					   . strlen( $match[2] )
+					   . strlen($match[2])
 					   . ':"'
 					   . $match[2]
 					   . '";';
 			 },
 			 $data1
 		 );
-		$max = ( strlen( $data1 ) > strlen( $data2 ) ) ? strlen( $data1 ) : strlen( $data2 );
-		$error .= $data1 . PHP_EOL;
-		$error .= $data2 . PHP_EOL;
-		for ( $i = 0; $i < $max; $i++ ) {
-			if ( @$data1[ $i ] !== @$data2[ $i ] ) {
-				$error .= "Difference " . @$data1[ $i ] . " != " . @$data2[ $i ] . PHP_EOL;
-				$error .= "\t-> ORD number " . ord( @$data1[ $i ] ) . " != " . ord( @$data2[ $i ] ) . PHP_EOL;
-				$error .= "\t-> Line Number = $i" . PHP_EOL;
-				$start = ( $i - 20 );
-				$start = ( $start < 0 ) ? 0 : $start;
+		$max = (strlen($data1) > strlen($data2)) ? strlen($data1) : strlen($data2);
+		$error .= $data1.PHP_EOL;
+		$error .= $data2.PHP_EOL;
+		for ($i = 0; $i < $max; $i++) {
+			if (@$data1[$i] !== @$data2[$i]) {
+				$error .= "Difference ".@$data1[$i]." != ".@$data2[$i].PHP_EOL;
+				$error .= "\t-> ORD number ".ord(@$data1[$i])." != ".ord(@$data2[$i]).PHP_EOL;
+				$error .= "\t-> Line Number = $i".PHP_EOL;
+				$start = ($i - 20);
+				$start = ($start < 0) ? 0 : $start;
 				$length = 40;
 				$point = $max - $i;
-				if ( $point < 20 ) {
+				if ($point < 20) {
 					$rlength = 1;
 					$rpoint = -$point;
 				} else {
@@ -1077,16 +1077,16 @@ 
 				}
 				$error .= "\t-> Section Data1  = ";
 				$error .= substr_replace(
-					substr( $data1, $start, $length ),
-					"<b style=\"color:green\">{$data1[ $i ]}</b>",
+					substr($data1, $start, $length),
+					"<b style=\"color:green\">{$data1[$i]}</b>",
 					$rpoint,
 					$rlength
 				);
 				$error .= PHP_EOL;
 				$error .= "\t-> Section Data2  = ";
 				$error .= substr_replace(
-					substr( $data2, $start, $length ),
-					"<b style=\"color:red\">{$data2[ $i ]}</b>",
+					substr($data2, $start, $length),
+					"<b style=\"color:red\">{$data2[$i]}</b>",
 					$rpoint,
 					$rlength
 				);

core/data_migration_scripts/4_6_0_stages/EE_DMS_4_6_0_state_system_question.dmsstage.php

Spacing +12 added lines, -12 removed lines

@@ -1,6 +1,6 @@ 
 <?php
 
-if (!defined('EVENT_ESPRESSO_VERSION')) {
+if ( ! defined('EVENT_ESPRESSO_VERSION')) {
 	exit('No direct script access allowed');
 }
 
@@ -13,7 +13,7 @@ 
  * @author				Brent Christensen
  *
  */
-class EE_DMS_4_6_0_state_system_question extends EE_Data_Migration_Script_Stage_Table{
+class EE_DMS_4_6_0_state_system_question extends EE_Data_Migration_Script_Stage_Table {
 
 
 
@@ -24,7 +24,7 @@ 
 	 */
 	public function __construct() {
 		global $wpdb;
-		$this->_pretty_name = __( 'State - System Question', 'event_espresso' );
+		$this->_pretty_name = __('State - System Question', 'event_espresso');
 		$this->_old_table = $wpdb->prefix.'esp_question';
 		$this->_extra_where_sql = "WHERE QST_system = 'state'";
 		parent::__construct();
@@ -37,21 +37,21 @@ 
 	 * @param array $question an associative array where keys are column names and values are their values.
 	 * @return null
 	 */
-	protected function _migrate_old_row( $question ) {
-		if ( $question['QST_ID'] && $question['QST_system'] == 'state' ) {
+	protected function _migrate_old_row($question) {
+		if ($question['QST_ID'] && $question['QST_system'] == 'state') {
 			global $wpdb;
 			$success = $wpdb->update(
 				$this->_old_table,
-				array( 'QST_type' => 'STATE' ),  // data
-				array( 'QST_ID' => $question['QST_ID'] ),  // where
-				array( '%s' ),   // data format
-				array( '%d' )  // where format
+				array('QST_type' => 'STATE'), // data
+				array('QST_ID' => $question['QST_ID']), // where
+				array('%s'), // data format
+				array('%d')  // where format
 			);
-			if ( ! $success ) {
+			if ( ! $success) {
 				$this->add_error(
 					sprintf(
-						__( 'Could not update question system name "%1$s" for question ID=%2$d because "%3$s"', 'event_espresso' ),
-						wp_json_encode( $question['QST_system'] ),
+						__('Could not update question system name "%1$s" for question ID=%2$d because "%3$s"', 'event_espresso'),
+						wp_json_encode($question['QST_system']),
 						$question['QST_ID'],
 						$wpdb->last_error
 					)

core/data_migration_scripts/4_6_0_stages/EE_DMS_4_6_0_question_types.dmsstage.php

Spacing +12 added lines, -12 removed lines

@@ -26,7 +26,7 @@ 
 	 */
 	public function __construct() {
 		global $wpdb;
-		$this->_pretty_name = __( 'Question Types', 'event_espresso' );
+		$this->_pretty_name = __('Question Types', 'event_espresso');
 		$this->_old_table = $wpdb->prefix.'esp_question';
 		$this->_question_type_conversions = array(
 			'MULTIPLE' 			=> 'CHECKBOX',
@@ -35,8 +35,8 @@ 
 		//when fetching rows, because we automatically use a limit and offset
 		//rows counted before migrating any rows, need to ALSO be counted after a bunch of rows were counted
 		//so we need to include both the migrated rows as well as the non-migrated rows
-		$QST_types_to_count = array_merge( array_keys( $this->_question_type_conversions ), $this->_question_type_conversions );
-		$this->_extra_where_sql = "WHERE QST_type IN ('" . implode( "', '", $QST_types_to_count ) . "')" ;
+		$QST_types_to_count = array_merge(array_keys($this->_question_type_conversions), $this->_question_type_conversions);
+		$this->_extra_where_sql = "WHERE QST_type IN ('".implode("', '", $QST_types_to_count)."')";
 		parent::__construct();
 	}
 
@@ -44,21 +44,21 @@ 
 	 * @param array $question an associative array where keys are column names and values are their values.
 	 * @return null
 	 */
-	protected function _migrate_old_row( $question ) {
+	protected function _migrate_old_row($question) {
 		global $wpdb;
-		if ( $question['QST_ID'] && isset( $this->_question_type_conversions[ $question['QST_type'] ] )) {
+		if ($question['QST_ID'] && isset($this->_question_type_conversions[$question['QST_type']])) {
 			$success = $wpdb->update(
 				$this->_old_table,
-				array( 'QST_type' => $this->_question_type_conversions[ $question['QST_type'] ] ), 	// data
-				array( 'QST_ID' => $question['QST_ID'] ),  // where
-				array( '%s' ),   // data format
-				array( '%d' )  // where format
+				array('QST_type' => $this->_question_type_conversions[$question['QST_type']]), // data
+				array('QST_ID' => $question['QST_ID']), // where
+				array('%s'), // data format
+				array('%d')  // where format
 			);
-			if ( ! $success ) {
+			if ( ! $success) {
 				$this->add_error(
 					sprintf(
-						__( 'Could not update question type %1$s for question ID=%2$d because "%3$s"', 'event_espresso' ),
-						wp_json_encode( $question['QST_type'] ),
+						__('Could not update question type %1$s for question ID=%2$d because "%3$s"', 'event_espresso'),
+						wp_json_encode($question['QST_type']),
 						$question['QST_ID'],
 						$wpdb->last_error
 					)

core/data_migration_scripts/4_6_0_stages/EE_DMS_4_6_0_country_system_question.dmsstage.php

Spacing +12 added lines, -12 removed lines

@@ -1,6 +1,6 @@ 
 <?php
 
-if (!defined('EVENT_ESPRESSO_VERSION')) {
+if ( ! defined('EVENT_ESPRESSO_VERSION')) {
 	exit('No direct script access allowed');
 }
 
@@ -13,7 +13,7 @@ 
  * @author				Brent Christensen
  *
  */
-class EE_DMS_4_6_0_country_system_question extends EE_Data_Migration_Script_Stage_Table{
+class EE_DMS_4_6_0_country_system_question extends EE_Data_Migration_Script_Stage_Table {
 
 
 
@@ -24,7 +24,7 @@ 
 	 */
 	public function __construct() {
 		global $wpdb;
-		$this->_pretty_name = __( 'Country - System Question', 'event_espresso' );
+		$this->_pretty_name = __('Country - System Question', 'event_espresso');
 		$this->_old_table = $wpdb->prefix.'esp_question';
 		$this->_extra_where_sql = "WHERE QST_system = 'country'";
 		parent::__construct();
@@ -37,21 +37,21 @@ 
 	 * @param array $question an associative array where keys are column names and values are their values.
 	 * @return null
 	 */
-	protected function _migrate_old_row( $question ) {
-		if ( $question['QST_ID'] && $question['QST_system'] == 'country' ) {
+	protected function _migrate_old_row($question) {
+		if ($question['QST_ID'] && $question['QST_system'] == 'country') {
 			global $wpdb;
 			$success = $wpdb->update(
 				$this->_old_table,
-				array( 'QST_type' => 'COUNTRY' ),  // data
-				array( 'QST_ID' => $question['QST_ID'] ),  // where
-				array( '%s' ),   // data format
-				array( '%d' )  // where format
+				array('QST_type' => 'COUNTRY'), // data
+				array('QST_ID' => $question['QST_ID']), // where
+				array('%s'), // data format
+				array('%d')  // where format
 			);
-			if ( ! $success ) {
+			if ( ! $success) {
 				$this->add_error(
 					sprintf(
-						__( 'Could not update question system name "%1$s" for question ID=%2$d because "%3$s"', 'event_espresso' ),
-						wp_json_encode( $question['QST_system'] ),
+						__('Could not update question system name "%1$s" for question ID=%2$d because "%3$s"', 'event_espresso'),
+						wp_json_encode($question['QST_system']),
 						$question['QST_ID'],
 						$wpdb->last_error
 					)

core/data_migration_scripts/4_6_0_stages/EE_DMS_4_6_0_gateways.dmsstage.php

Spacing +71 added lines, -71 removed lines

@@ -1,5 +1,5 @@ 
 <?php
-if (!defined('EVENT_ESPRESSO_VERSION')) {
+if ( ! defined('EVENT_ESPRESSO_VERSION')) {
 	exit('No direct script access allowed');
 }
 
@@ -14,7 +14,7 @@ 
  * Migrates 4.1-4.5-style gateway settings (which were stores in EE_Config)
  * to 4.6-style payment methods (which have their database table)
  */
-class EE_DMS_4_6_0_gateways extends EE_Data_Migration_Script_Stage{
+class EE_DMS_4_6_0_gateways extends EE_Data_Migration_Script_Stage {
 
 	protected $_new_table_name;
 	protected $_extra_meta_table_name;
@@ -73,11 +73,11 @@ 
 	 */
 	protected function _migration_step($num_items_to_migrate = 50) {
 		$items_actually_migrated = 0;
-		$gateways_to_deal_with = array_slice(EE_Config::instance()->gateway->payment_settings,$this->count_records_migrated(),$num_items_to_migrate);
-		foreach($gateways_to_deal_with as $old_gateway_slug => $old_gateway_settings){
+		$gateways_to_deal_with = array_slice(EE_Config::instance()->gateway->payment_settings, $this->count_records_migrated(), $num_items_to_migrate);
+		foreach ($gateways_to_deal_with as $old_gateway_slug => $old_gateway_settings) {
 
-			if( in_array( $old_gateway_slug, $this->_gateway_we_know_to_migrate ) ) {
-				if( ! $old_gateway_settings){
+			if (in_array($old_gateway_slug, $this->_gateway_we_know_to_migrate)) {
+				if ( ! $old_gateway_settings) {
 					//no settings existed for this gateway anyways... weird...
 					$items_actually_migrated++;
 					continue;
@@ -86,16 +86,16 @@ 
 				$success = $this->_convert_gateway_settings(
 						$old_gateway_slug,
 						$old_gateway_settings,
-						isset( EE_Config::instance()->gateway->active_gateways[ $old_gateway_slug ] ) );
-				if( $success ) {
-					EE_Config::instance()->gateway->payment_settings[ $old_gateway_slug ] = 'Deprecated';
+						isset(EE_Config::instance()->gateway->active_gateways[$old_gateway_slug]) );
+				if ($success) {
+					EE_Config::instance()->gateway->payment_settings[$old_gateway_slug] = 'Deprecated';
 				}
 			}
 			$items_actually_migrated++;
 		}
 
-		EE_Config::instance()->update_espresso_config(false,false);
-		if($this->count_records_migrated() + $items_actually_migrated >= $this->count_records_to_migrate()){
+		EE_Config::instance()->update_espresso_config(false, false);
+		if ($this->count_records_migrated() + $items_actually_migrated >= $this->count_records_to_migrate()) {
 			$this->set_completed();
 		}
 		return $items_actually_migrated;
@@ -108,22 +108,22 @@ 
 	 * @param boolean $active indicates the gateway is currently active
 	 * @return boolean success
 	 */
-	protected function _convert_gateway_settings($old_gateway_slug,$old_gateway_settings,$active){
-		switch($old_gateway_slug){
+	protected function _convert_gateway_settings($old_gateway_slug, $old_gateway_settings, $active) {
+		switch ($old_gateway_slug) {
 			case 'Aim':
 				$extra_meta_key_values = array(
 					'login_id'=>$old_gateway_settings['authnet_aim_login_id'],
 					'transaction_key'=>$old_gateway_settings['authnet_aim_transaction_key'],
 					'test_transactions'=>$old_gateway_settings['test_transactions']
 				);
-				$desc = __( 'Please provide the following billing information.', 'event_espresso' );
+				$desc = __('Please provide the following billing information.', 'event_espresso');
 				break;
 			case 'Bank':
 				$extra_meta_key_values = array(
 					'page_title'=>$old_gateway_settings['page_title'],
 					'payment_instructions'=>
-					sprintf( __('%1$s<br/>Name on Bank Account: %2$s<br/>Bank Account Number: %3$s<br/>Bank Name: %4$s<br/>Bank Address:%5$s', 'event_espresso'), $old_gateway_settings['bank_instructions'] , $old_gateway_settings['account_name'], $old_gateway_settings['account_number'], $old_gateway_settings['bank_name'], $old_gateway_settings['bank_address'] ) );
-				$desc = __( 'Make payment using an electronic funds transfer from your bank.', 'event_espresso' );
+					sprintf(__('%1$s<br/>Name on Bank Account: %2$s<br/>Bank Account Number: %3$s<br/>Bank Name: %4$s<br/>Bank Address:%5$s', 'event_espresso'), $old_gateway_settings['bank_instructions'], $old_gateway_settings['account_name'], $old_gateway_settings['account_number'], $old_gateway_settings['bank_name'], $old_gateway_settings['bank_address']) );
+				$desc = __('Make payment using an electronic funds transfer from your bank.', 'event_espresso');
 				break;
 			case 'Check':
 				$extra_meta_key_values = array(
@@ -131,7 +131,7 @@ 
 					'payment_instructions'=>$old_gateway_settings['check_instructions'],
 					'address_to_send_payment'=>$old_gateway_settings['payment_address']
 				);
-				$desc = __( 'On the next page you will be given instructions on how to make a payment by check.', 'event_espresso' );
+				$desc = __('On the next page you will be given instructions on how to make a payment by check.', 'event_espresso');
 				break;
 			case 'Invoice':
 				$extra_meta_key_values = array(
@@ -139,23 +139,23 @@ 
 					'pdf_payee_email' => $old_gateway_settings['template_invoice_email'],
 					'pdf_payee_tax_number' => $old_gateway_settings['template_invoice_tax_number'],
 					'pdf_payee_address' => $old_gateway_settings['template_invoice_address'],
-					'pdf_instructions' => $old_gateway_settings[ 'template_payment_instructions' ],
-					'pdf_logo_image' => $old_gateway_settings[ 'invoice_logo_url' ],
-					'page_confirmation_text' => isset( $old_gateway_settings[ 'page_instructions' ] ) ? $old_gateway_settings[ 'page_instructions' ] : '',
-					'page_extra_info' => isset( $old_gateway_settings[ 'payment_address' ] ) ? $old_gateway_settings[ 'payment_address' ] : '',
+					'pdf_instructions' => $old_gateway_settings['template_payment_instructions'],
+					'pdf_logo_image' => $old_gateway_settings['invoice_logo_url'],
+					'page_confirmation_text' => isset($old_gateway_settings['page_instructions']) ? $old_gateway_settings['page_instructions'] : '',
+					'page_extra_info' => isset($old_gateway_settings['payment_address']) ? $old_gateway_settings['payment_address'] : '',
 					'legacy_invoice_css' => $old_gateway_settings['invoice_css']
 				);
 				//if they didnt want the invoiec gateway to show, pretend it was inactive
-				if( ! $old_gateway_settings['show'] ){
+				if ( ! $old_gateway_settings['show']) {
 					$active = FALSE;
 				}
-				$desc = __( 'On the next page you will be able to access your invoice and instructions on how to pay it.', 'event_espresso' );
+				$desc = __('On the next page you will be able to access your invoice and instructions on how to pay it.', 'event_espresso');
 				break;
 			case 'Mijireh':
 				$extra_meta_key_values = array(
-					'access_key' => $old_gateway_settings[ 'access_key' ]
+					'access_key' => $old_gateway_settings['access_key']
 				);
-				$desc =  __( 'On the next page you will be able to enter your billing information to make the payment.', 'event_espresso' );
+				$desc = __('On the next page you will be able to enter your billing information to make the payment.', 'event_espresso');
 				break;
 			case 'Paypal_Pro':
 				$extra_meta_key_values = array(
@@ -164,31 +164,31 @@ 
 					'signature'=>$old_gateway_settings['signature'],
 					'credit_card_types'=>$old_gateway_settings['credit_cards'],
 				);
-				$desc = __( 'Please provide the following billing information.', 'event_espresso' );
+				$desc = __('Please provide the following billing information.', 'event_espresso');
 				break;
 			case 'Paypal_Standard':
 				$extra_meta_key_values = array(
-					'paypal_id' => $old_gateway_settings[ 'paypal_id' ],
-					'image_url' => $old_gateway_settings[ 'image_url' ],
-					'shipping_details' => isset( $old_gateway_settings[ 'no_shipping' ] ) ? $old_gateway_settings[ 'no_shipping' ] : false,
+					'paypal_id' => $old_gateway_settings['paypal_id'],
+					'image_url' => $old_gateway_settings['image_url'],
+					'shipping_details' => isset($old_gateway_settings['no_shipping']) ? $old_gateway_settings['no_shipping'] : false,
 
 				);
-				$desc = sprintf( __( 'After clicking \'Finalize Registration\', you will be forwarded to PayPal to make your payment. Make sure you return to this site in order to properly finalize your registration.', 'event_espresso' ), '<strong>','</strong>' );
+				$desc = sprintf(__('After clicking \'Finalize Registration\', you will be forwarded to PayPal to make your payment. Make sure you return to this site in order to properly finalize your registration.', 'event_espresso'), '<strong>', '</strong>');
 				break;
 			default:
 				//if we don't recognize the payment method, just put everything in it into extra meta. At least this way its preserved somewhere
 				$extra_meta_key_values = $old_gateway_settings;
 				$desc = '';
 		}
-		$pretty_name = isset( $old_gateway_settings[ 'display_name' ] ) ? $old_gateway_settings[ 'display_name' ] : $old_gateway_slug;
-		$offline_gateways = array( 'Bank', 'Check', 'Invoice' );
-		if( $active && in_array( $old_gateway_slug, $offline_gateways ) ) {
-			$scope = array( 'CART', 'ADMIN');
-		}elseif( $active && ! in_array( $old_gateway_slug, $offline_gateways ) ) {
-			$scope = array( 'CART' );
-		}elseif( ! $active && in_array($old_gateway_slug,$offline_gateways ) ) {
-			$scope = array( 'ADMIN' );
-		}else{
+		$pretty_name = isset($old_gateway_settings['display_name']) ? $old_gateway_settings['display_name'] : $old_gateway_slug;
+		$offline_gateways = array('Bank', 'Check', 'Invoice');
+		if ($active && in_array($old_gateway_slug, $offline_gateways)) {
+			$scope = array('CART', 'ADMIN');
+		}elseif ($active && ! in_array($old_gateway_slug, $offline_gateways)) {
+			$scope = array('CART');
+		}elseif ( ! $active && in_array($old_gateway_slug, $offline_gateways)) {
+			$scope = array('ADMIN');
+		} else {
 			$scope = array();
 		}
 		$payment_method_col_values = array(
@@ -196,25 +196,25 @@ 
 			'PMD_name' => $pretty_name,
 			'PMD_desc' => $desc,
 			'PMD_admin_name' => $pretty_name,
-			'PMD_slug' => sanitize_key( $old_gateway_slug ),
-			'PMD_debug_mode' => isset( $old_gateway_settings[ 'use_sandbox' ] ) ? $old_gateway_settings['use_sandbox'] : FALSE,
-			'PMD_button_url' => isset( $old_gateway_settings[ 'button_url' ] ) ? $old_gateway_settings[ 'button_url' ] : NULL,
-			'PMD_scope' =>  serialize( $scope )
+			'PMD_slug' => sanitize_key($old_gateway_slug),
+			'PMD_debug_mode' => isset($old_gateway_settings['use_sandbox']) ? $old_gateway_settings['use_sandbox'] : FALSE,
+			'PMD_button_url' => isset($old_gateway_settings['button_url']) ? $old_gateway_settings['button_url'] : NULL,
+			'PMD_scope' =>  serialize($scope)
 		);
 		$db_types = array(
-			'%s',//PMD_type
-			'%s',//PMD_name
-			'%s',//PMD_desc
-			'%s',//PMD_admin_name
-			'%s',//PMD_slug
-			'%d',//PMD_debug_mode
-			'%s',//PMD_button_url
-			'%s',//PMD_scope
+			'%s', //PMD_type
+			'%s', //PMD_name
+			'%s', //PMD_desc
+			'%s', //PMD_admin_name
+			'%s', //PMD_slug
+			'%d', //PMD_debug_mode
+			'%s', //PMD_button_url
+			'%s', //PMD_scope
 		);
 		global $wpdb;
 		//first: check if it already exists
-		$id = $wpdb->get_var( $wpdb->prepare( "SELECT PMD_ID FROM {$this->_new_table_name} WHERE PMD_slug=%s", $payment_method_col_values[ 'PMD_slug' ] ) );
-		if( $id ){
+		$id = $wpdb->get_var($wpdb->prepare("SELECT PMD_ID FROM {$this->_new_table_name} WHERE PMD_slug=%s", $payment_method_col_values['PMD_slug']));
+		if ($id) {
 			//just update that payment method instead of creating a new one
 			$success = $wpdb->update(
 					$this->_new_table_name,
@@ -224,27 +224,27 @@ 
 					),
 					$db_types,
 					array(
-						'%d',//PMD_ID
+						'%d', //PMD_ID
 					));
-			if( ! $success ){
-				$this->add_error(sprintf(__('Could not update payment method %d with properties %s because %s', "event_espresso"),$id,wp_json_encode($payment_method_col_values),$wpdb->last_error));
+			if ( ! $success) {
+				$this->add_error(sprintf(__('Could not update payment method %d with properties %s because %s', "event_espresso"), $id, wp_json_encode($payment_method_col_values), $wpdb->last_error));
 			}
-		}else{
+		} else {
 			$success = $wpdb->insert(
 					$this->_new_table_name,
 					$payment_method_col_values,
 					$db_types);
-			if ( ! $success ) {
+			if ( ! $success) {
 				$this->add_error($wpdb->last_error);
 				return false;
-			}else{
+			} else {
 				$id = $wpdb->insert_id;
 			}
 		}
 
-		if( $id ){
-			$this->_convert_extra_meta_values( $id, $extra_meta_key_values );
-			$this->get_migration_script()->set_mapping( 'EE_Gateway_Config', $old_gateway_slug, $this->_new_table_name, $id );
+		if ($id) {
+			$this->_convert_extra_meta_values($id, $extra_meta_key_values);
+			$this->get_migration_script()->set_mapping('EE_Gateway_Config', $old_gateway_slug, $this->_new_table_name, $id);
 			return true;
 		}
 		return false;
@@ -258,26 +258,26 @@ 
 	 * @param int $id
 	 * @param array $extra_meta_key_values
 	 */
-	private function _convert_extra_meta_values($id,$extra_meta_key_values){
+	private function _convert_extra_meta_values($id, $extra_meta_key_values) {
 		global $wpdb;
-		foreach( $extra_meta_key_values as $key => $value ){
+		foreach ($extra_meta_key_values as $key => $value) {
 			$exm_args = array(
 				'OBJ_ID'=>$id,
 				'EXM_type'=>'Payment_Method',
 				'EXM_key'=>$key,
-				'EXM_value'=> maybe_serialize($value )
+				'EXM_value'=> maybe_serialize($value)
 			);
 			$success = $wpdb->insert(
 					$this->_extra_meta_table_name,
 					$exm_args,
 					array(
-						'%d',//OBJ_ID
-						'%s',//EXM_type
-						'%s',//EXM_key
-						'%s',//EXM_value
+						'%d', //OBJ_ID
+						'%s', //EXM_type
+						'%s', //EXM_key
+						'%s', //EXM_value
 					));
-			if( ! $success ){
-				$this->add_error(sprintf(__('Could not insert extra meta key with values %s. %s', "event_espresso"),wp_json_encode($exm_args),$wpdb->last_error));
+			if ( ! $success) {
+				$this->add_error(sprintf(__('Could not insert extra meta key with values %s. %s', "event_espresso"), wp_json_encode($exm_args), $wpdb->last_error));
 			}
 		}
 	}

core/data_migration_scripts/4_6_0_stages/EE_DMS_4_6_0_payment_method_currencies.dmsstage.php

Spacing +24 added lines, -24 removed lines

@@ -1,6 +1,6 @@ 
 <?php
 
-if (!defined('EVENT_ESPRESSO_VERSION')) {
+if ( ! defined('EVENT_ESPRESSO_VERSION')) {
 	exit('No direct script access allowed');
 }
 
@@ -13,7 +13,7 @@ 
  * @author				Mike Nelson
  *
  */
-class EE_DMS_4_6_0_payment_method_currencies extends EE_Data_Migration_Script_Stage{
+class EE_DMS_4_6_0_payment_method_currencies extends EE_Data_Migration_Script_Stage {
 	protected $_currency_table_name;
 	protected $_currency_payment_method_table_name;
 	protected $_payment_method_table_name;
@@ -89,7 +89,7 @@ 
 	);
 	public function __construct() {
 		global $wpdb;
-		$this->_pretty_name = __( 'Payment Method Currencies', 'event_espresso' );
+		$this->_pretty_name = __('Payment Method Currencies', 'event_espresso');
 		$this->_payment_method_table_name = $wpdb->prefix.'esp_payment_method';
 		$this->_currency_payment_method_table_name = $wpdb->prefix.'esp_currency_payment_method';
 		$this->_currency_table_name = $wpdb->prefix.'esp_currency';
@@ -98,8 +98,8 @@ 
 
 	protected function _count_records_to_migrate() {
 		$count = 0;
-		foreach($this->_gateway_currencies as $currencies){
-			if( $currencies == 'all'){
+		foreach ($this->_gateway_currencies as $currencies) {
+			if ($currencies == 'all') {
 				$currencies = $this->_get_all_currencies();
 			}
 			$count += count($currencies);
@@ -109,20 +109,20 @@ 
 
 
 
-	protected function _migration_step( $num_items_to_migrate = 50 ) {
+	protected function _migration_step($num_items_to_migrate = 50) {
 		$items_actually_migrated = 0;
 		$relations_to_add_this_step = $this->_gather_relations_to_add($num_items_to_migrate);
-		foreach($relations_to_add_this_step as $pm_slug => $currencies){
+		foreach ($relations_to_add_this_step as $pm_slug => $currencies) {
 
-			$id = $this->get_migration_script()->get_mapping_new_pk( 'EE_Gateway_Config', $pm_slug, $this->_payment_method_table_name );
-			foreach( $currencies as $currency ){
-				if( $id ){
-					$this->_add_currency_relations( $id, $currency );
+			$id = $this->get_migration_script()->get_mapping_new_pk('EE_Gateway_Config', $pm_slug, $this->_payment_method_table_name);
+			foreach ($currencies as $currency) {
+				if ($id) {
+					$this->_add_currency_relations($id, $currency);
 				}
 				$items_actually_migrated++;
 			}
 		}
-		if($this->count_records_migrated() + $items_actually_migrated >= $this->count_records_to_migrate()){
+		if ($this->count_records_migrated() + $items_actually_migrated >= $this->count_records_to_migrate()) {
 			$this->set_completed();
 		}
 		return $items_actually_migrated;
@@ -132,14 +132,14 @@ 
 		$relations_to_add_this_step = array();
 		$migrate_up_to_count = $this->count_records_migrated() + $num_items_to_migrate;
 		$iterator = 0;
-		foreach($this->_gateway_currencies as $pm_slug => $currencies){
-			if( $currencies == 'all' ){
+		foreach ($this->_gateway_currencies as $pm_slug => $currencies) {
+			if ($currencies == 'all') {
 				$currencies = $this->_get_all_currencies();
 			}
-			foreach($currencies as $currency_code){
-				if( $this->count_records_migrated() <= $iterator &&
-						$iterator < $migrate_up_to_count ){
-					$relations_to_add_this_step[ $pm_slug ] [] = $currency_code;
+			foreach ($currencies as $currency_code) {
+				if ($this->count_records_migrated() <= $iterator &&
+						$iterator < $migrate_up_to_count) {
+					$relations_to_add_this_step[$pm_slug] [] = $currency_code;
 				}
 				$iterator++;
 			}
@@ -150,7 +150,7 @@ 
 	 * Gets all the currency codes in the database
 	 * @return array
 	 */
-	private function _get_all_currencies(){
+	private function _get_all_currencies() {
 		global $wpdb;
 		$currencies = $wpdb->get_col("SELECT CUR_code FROM {$this->_currency_table_name}");
 		return $currencies;
@@ -161,7 +161,7 @@ 
 	 * @param int $id
 	 * @param string $gateway_slug
 	 */
-	private function _add_currency_relations($pm_id,$currency_code){
+	private function _add_currency_relations($pm_id, $currency_code) {
 		global $wpdb;
 		$cur_pm_relation = array(
 					'CUR_code'=>$currency_code,
@@ -170,11 +170,11 @@ 
 		$success = $wpdb->insert($this->_currency_payment_method_table_name,
 				$cur_pm_relation,
 				array(
-					'%s',//CUR_code
-					'%d',//PMD_ID
+					'%s', //CUR_code
+					'%d', //PMD_ID
 				));
-		if( ! $success ){
-			$this->add_error( sprintf( __( 'Could not add currency relation %s because %s', "event_espresso" ), wp_json_encode( $cur_pm_relation ), $wpdb->last_error ) );
+		if ( ! $success) {
+			$this->add_error(sprintf(__('Could not add currency relation %s because %s', "event_espresso"), wp_json_encode($cur_pm_relation), $wpdb->last_error));
 		}
 	}
 }

core/data_migration_scripts/4_9_0_stages/EE_DMS_4_9_0_Email_System_Question.dmsstage.php

Spacing +12 added lines, -12 removed lines

@@ -1,6 +1,6 @@ 
 <?php
 
-if (!defined('EVENT_ESPRESSO_VERSION')) {
+if ( ! defined('EVENT_ESPRESSO_VERSION')) {
 	exit('No direct script access allowed');
 }
 
@@ -13,7 +13,7 @@ 
  * @author				Brent Christensen
  *
  */
-class EE_DMS_4_9_0_Email_System_Question extends EE_Data_Migration_Script_Stage_Table{
+class EE_DMS_4_9_0_Email_System_Question extends EE_Data_Migration_Script_Stage_Table {
 
 
 
@@ -24,7 +24,7 @@ 
 	 */
 	public function __construct() {
 		global $wpdb;
-		$this->_pretty_name = __( 'Email - System Question', 'event_espresso' );
+		$this->_pretty_name = __('Email - System Question', 'event_espresso');
 		$this->_old_table = $wpdb->prefix.'esp_question';
 		$this->_extra_where_sql = "WHERE QST_system = 'email'";
 		parent::__construct();
@@ -37,21 +37,21 @@ 
 	 * @param array $question an associative array where keys are column names and values are their values.
 	 * @return null
 	 */
-	protected function _migrate_old_row( $question ) {
-		if ( $question['QST_ID'] && $question['QST_system'] == 'email' ) {
+	protected function _migrate_old_row($question) {
+		if ($question['QST_ID'] && $question['QST_system'] == 'email') {
 			global $wpdb;
 			$success = $wpdb->update(
 				$this->_old_table,
-				array( 'QST_type' => 'EMAIL' ),  // data
-				array( 'QST_ID' => $question['QST_ID'] ),  // where
-				array( '%s' ),   // data format
-				array( '%d' )  // where format
+				array('QST_type' => 'EMAIL'), // data
+				array('QST_ID' => $question['QST_ID']), // where
+				array('%s'), // data format
+				array('%d')  // where format
 			);
-			if ( ! $success ) {
+			if ( ! $success) {
 				$this->add_error(
 					sprintf(
-						__( 'Could not update question system name "%1$s" for question ID=%2$d because "%3$s"', 'event_espresso' ),
-						wp_json_encode( $question['QST_system'] ),
+						__('Could not update question system name "%1$s" for question ID=%2$d because "%3$s"', 'event_espresso'),
+						wp_json_encode($question['QST_system']),
 						$question['QST_ID'],
 						$wpdb->last_error
 					)

core/libraries/rest_api/controllers/model/Read.php

Spacing +311 added lines, -311 removed lines

@@ -6,8 +6,8 @@ 
 use EventEspresso\core\libraries\rest_api\Rest_Exception;
 use EventEspresso\core\libraries\rest_api\Model_Data_Translator;
 
-if ( !defined( 'EVENT_ESPRESSO_VERSION' ) ) {
-	exit( 'No direct script access allowed' );
+if ( ! defined('EVENT_ESPRESSO_VERSION')) {
+	exit('No direct script access allowed');
 }
 
 /**
@@ -46,22 +46,22 @@ 
 	 * @param \WP_REST_Request $request
 	 * @return \WP_REST_Response|\WP_Error
 	 */
-	public static function handle_request_get_all( \WP_REST_Request $request) {
+	public static function handle_request_get_all(\WP_REST_Request $request) {
 		$controller = new Read();
-		try{
+		try {
 			$matches = $controller->parse_route(
 				$request->get_route(),
-				'~' . \EED_Core_Rest_Api::ee_api_namespace_for_regex . '(.*)~',
-				array( 'version', 'model' )
+				'~'.\EED_Core_Rest_Api::ee_api_namespace_for_regex.'(.*)~',
+				array('version', 'model')
 			);
-			$controller->set_requested_version( $matches[ 'version' ] );
-			$model_name_singular = \EEH_Inflector::singularize_and_upper( $matches[ 'model' ] );
-			if ( ! $controller->get_model_version_info()->is_model_name_in_this_version( $model_name_singular ) ) {
+			$controller->set_requested_version($matches['version']);
+			$model_name_singular = \EEH_Inflector::singularize_and_upper($matches['model']);
+			if ( ! $controller->get_model_version_info()->is_model_name_in_this_version($model_name_singular)) {
 				return $controller->send_response(
 					new \WP_Error(
 						'endpoint_parsing_error',
 						sprintf(
-							__( 'There is no model for endpoint %s. Please contact event espresso support', 'event_espresso' ),
+							__('There is no model for endpoint %s. Please contact event espresso support', 'event_espresso'),
 							$model_name_singular
 						)
 					)
@@ -69,12 +69,12 @@ 
 			}
 			return $controller->send_response(
 					$controller->get_entities_from_model(
-							$controller->get_model_version_info()->load_model( $model_name_singular ),
+							$controller->get_model_version_info()->load_model($model_name_singular),
 							$request
 					)
 			);
-		} catch( \Exception $e ) {
-			return $controller->send_response( $e );
+		} catch (\Exception $e) {
+			return $controller->send_response($e);
 		}
 	}
 
@@ -84,21 +84,21 @@ 
 	 * @param \WP_REST_Request $request
 	 * @return \WP_REST_Response|\WP_Error
 	 */
-	public static function handle_request_get_one( \WP_REST_Request $request ) {
+	public static function handle_request_get_one(\WP_REST_Request $request) {
 		$controller = new Read();
-		try{
+		try {
 			$matches = $controller->parse_route(
 				$request->get_route(),
-				'~' . \EED_Core_Rest_Api::ee_api_namespace_for_regex . '(.*)/(.*)~',
-				array( 'version', 'model', 'id' ) );
-			$controller->set_requested_version( $matches[ 'version' ] );
-			$model_name_singular = \EEH_Inflector::singularize_and_upper( $matches[ 'model' ] );
-			if ( ! $controller->get_model_version_info()->is_model_name_in_this_version( $model_name_singular ) ) {
+				'~'.\EED_Core_Rest_Api::ee_api_namespace_for_regex.'(.*)/(.*)~',
+				array('version', 'model', 'id') );
+			$controller->set_requested_version($matches['version']);
+			$model_name_singular = \EEH_Inflector::singularize_and_upper($matches['model']);
+			if ( ! $controller->get_model_version_info()->is_model_name_in_this_version($model_name_singular)) {
 				return $controller->send_response(
 					new \WP_Error(
 						'endpoint_parsing_error',
 						sprintf(
-							__( 'There is no model for endpoint %s. Please contact event espresso support', 'event_espresso' ),
+							__('There is no model for endpoint %s. Please contact event espresso support', 'event_espresso'),
 							$model_name_singular
 						)
 					)
@@ -106,12 +106,12 @@ 
 			}
 			return $controller->send_response(
 					$controller->get_entity_from_model(
-							$controller->get_model_version_info()->load_model( $model_name_singular ),
+							$controller->get_model_version_info()->load_model($model_name_singular),
 							$request
 						)
 				);
-		} catch( \Exception $e ) {
-			return $controller->send_response( $e );
+		} catch (\Exception $e) {
+			return $controller->send_response($e);
 		}
 	}
 
@@ -123,40 +123,40 @@ 
 	 * @param \WP_REST_Request $request
 	 * @return \WP_REST_Response|\WP_Error
 	 */
-	public static function handle_request_get_related( \WP_REST_Request $request ) {
+	public static function handle_request_get_related(\WP_REST_Request $request) {
 		$controller = new Read();
-		try{
+		try {
 			$matches = $controller->parse_route(
 				$request->get_route(),
-				'~' . \EED_Core_Rest_Api::ee_api_namespace_for_regex . '(.*)/(.*)/(.*)~',
-				array( 'version', 'model', 'id', 'related_model' )
+				'~'.\EED_Core_Rest_Api::ee_api_namespace_for_regex.'(.*)/(.*)/(.*)~',
+				array('version', 'model', 'id', 'related_model')
 			);
-			$controller->set_requested_version( $matches[ 'version' ] );
-			$main_model_name_singular = \EEH_Inflector::singularize_and_upper( $matches[ 'model' ] );
-			if ( ! $controller->get_model_version_info()->is_model_name_in_this_version( $main_model_name_singular ) ) {
+			$controller->set_requested_version($matches['version']);
+			$main_model_name_singular = \EEH_Inflector::singularize_and_upper($matches['model']);
+			if ( ! $controller->get_model_version_info()->is_model_name_in_this_version($main_model_name_singular)) {
 				return $controller->send_response(
 					new \WP_Error(
 						'endpoint_parsing_error',
 						sprintf(
-							__( 'There is no model for endpoint %s. Please contact event espresso support', 'event_espresso' ),
+							__('There is no model for endpoint %s. Please contact event espresso support', 'event_espresso'),
 							$main_model_name_singular
 						)
 					)
 				);
 			}
-			$main_model = $controller->get_model_version_info()->load_model( $main_model_name_singular );
+			$main_model = $controller->get_model_version_info()->load_model($main_model_name_singular);
 			//assume the related model name is plural and try to find the model's name
-			$related_model_name_singular = \EEH_Inflector::singularize_and_upper( $matches[ 'related_model' ] );
-			if ( ! $controller->get_model_version_info()->is_model_name_in_this_version( $related_model_name_singular ) ) {
+			$related_model_name_singular = \EEH_Inflector::singularize_and_upper($matches['related_model']);
+			if ( ! $controller->get_model_version_info()->is_model_name_in_this_version($related_model_name_singular)) {
 				//so the word didn't singularize well. Maybe that's just because it's a singular word?
-				$related_model_name_singular = \EEH_Inflector::humanize( $matches[ 'related_model' ] );
+				$related_model_name_singular = \EEH_Inflector::humanize($matches['related_model']);
 			}
-			if ( ! $controller->get_model_version_info()->is_model_name_in_this_version( $related_model_name_singular ) ) {
+			if ( ! $controller->get_model_version_info()->is_model_name_in_this_version($related_model_name_singular)) {
 				return $controller->send_response(
 					new \WP_Error(
 						'endpoint_parsing_error',
 						sprintf(
-							__( 'There is no model for endpoint %s. Please contact event espresso support', 'event_espresso' ),
+							__('There is no model for endpoint %s. Please contact event espresso support', 'event_espresso'),
 							$related_model_name_singular
 						)
 					)
@@ -165,13 +165,13 @@ 
 
 			return $controller->send_response(
 					$controller->get_entities_from_relation(
-						$request->get_param( 'id' ),
-						$main_model->related_settings_for( $related_model_name_singular ) ,
+						$request->get_param('id'),
+						$main_model->related_settings_for($related_model_name_singular),
 						$request
 					)
 				);
-		} catch( \Exception $e ) {
-			return $controller->send_response( $e );
+		} catch (\Exception $e) {
+			return $controller->send_response($e);
 		}
 	}
 
@@ -184,28 +184,28 @@ 
 	 * @param \WP_REST_Request $request
 	 * @return array|\WP_Error
 	 */
-	public function get_entities_from_model( $model, $request) {
-		$query_params = $this->create_model_query_params( $model, $request->get_params() );
-		if( ! Capabilities::current_user_has_partial_access_to( $model, $query_params[ 'caps' ] ) ) {
-			$model_name_plural = \EEH_Inflector::pluralize_and_lower( $model->get_this_model_name() );
+	public function get_entities_from_model($model, $request) {
+		$query_params = $this->create_model_query_params($model, $request->get_params());
+		if ( ! Capabilities::current_user_has_partial_access_to($model, $query_params['caps'])) {
+			$model_name_plural = \EEH_Inflector::pluralize_and_lower($model->get_this_model_name());
 			return new \WP_Error(
-				sprintf( 'rest_%s_cannot_list', $model_name_plural ),
+				sprintf('rest_%s_cannot_list', $model_name_plural),
 				sprintf(
-					__( 'Sorry, you are not allowed to list %1$s. Missing permissions: %2$s', 'event_espresso' ),
+					__('Sorry, you are not allowed to list %1$s. Missing permissions: %2$s', 'event_espresso'),
 					$model_name_plural,
-					Capabilities::get_missing_permissions_string( $model, $query_params[ 'caps' ] )
+					Capabilities::get_missing_permissions_string($model, $query_params['caps'])
 				),
-				array( 'status' => 403 )
+				array('status' => 403)
 			);
 		}
-		if( ! $request->get_header( 'no_rest_headers' ) ) {
-			$this->_set_headers_from_query_params( $model, $query_params );
+		if ( ! $request->get_header('no_rest_headers')) {
+			$this->_set_headers_from_query_params($model, $query_params);
 		}
 		/** @type array $results */
-		$results = $model->get_all_wpdb_results( $query_params );
+		$results = $model->get_all_wpdb_results($query_params);
 		$nice_results = array( );
-		foreach ( $results as $result ) {
-			$nice_results[ ] = $this->create_entity_from_wpdb_result(
+		foreach ($results as $result) {
+			$nice_results[] = $this->create_entity_from_wpdb_result(
 					$model,
 					$result,
 					$request
@@ -221,11 +221,11 @@ 
 	 * @param \WP_REST_Request $request
 	 * @return \WP_Error|array
 	 */
-	protected function _get_entities_from_relation( $primary_model_query_params, $relation, $request ) {
-		$context = $this->validate_context( $request->get_param( 'caps' ));
+	protected function _get_entities_from_relation($primary_model_query_params, $relation, $request) {
+		$context = $this->validate_context($request->get_param('caps'));
 		$model = $relation->get_this_model();
 		$related_model = $relation->get_other_model();
-		if( ! isset( $primary_model_query_params[0]) ) {
+		if ( ! isset($primary_model_query_params[0])) {
 			$primary_model_query_params[0] = array();
 		}
 		//check if they can access the 1st model object
@@ -233,60 +233,60 @@ 
 			0 => $primary_model_query_params[0],
 			'limit' => 1
 		);
-		if( $model instanceof \EEM_Soft_Delete_Base ){
-			$primary_model_query_params = $model->alter_query_params_so_deleted_and_undeleted_items_included( $primary_model_query_params );
+		if ($model instanceof \EEM_Soft_Delete_Base) {
+			$primary_model_query_params = $model->alter_query_params_so_deleted_and_undeleted_items_included($primary_model_query_params);
 		}
 		$restricted_query_params = $primary_model_query_params;
-		$restricted_query_params[ 'caps' ] = $context;
-		$this->_set_debug_info( 'main model query params', $restricted_query_params );
-		$this->_set_debug_info( 'missing caps', Capabilities::get_missing_permissions_string( $related_model, $context ) );
+		$restricted_query_params['caps'] = $context;
+		$this->_set_debug_info('main model query params', $restricted_query_params);
+		$this->_set_debug_info('missing caps', Capabilities::get_missing_permissions_string($related_model, $context));
 
-		if(
+		if (
 			! (
-				Capabilities::current_user_has_partial_access_to( $related_model, $context )
-				&& $model->exists( $restricted_query_params )
+				Capabilities::current_user_has_partial_access_to($related_model, $context)
+				&& $model->exists($restricted_query_params)
 			)
-		){
-			if( $relation instanceof \EE_Belongs_To_Relation ) {
-				$related_model_name_maybe_plural = strtolower( $related_model->get_this_model_name() );
-			}else{
-				$related_model_name_maybe_plural = \EEH_Inflector::pluralize_and_lower( $related_model->get_this_model_name() );
+		) {
+			if ($relation instanceof \EE_Belongs_To_Relation) {
+				$related_model_name_maybe_plural = strtolower($related_model->get_this_model_name());
+			} else {
+				$related_model_name_maybe_plural = \EEH_Inflector::pluralize_and_lower($related_model->get_this_model_name());
 			}
 			return new \WP_Error(
-				sprintf( 'rest_%s_cannot_list', $related_model_name_maybe_plural ),
+				sprintf('rest_%s_cannot_list', $related_model_name_maybe_plural),
 				sprintf(
-					__(	'Sorry, you are not allowed to list %1$s related to %2$s. Missing permissions: %3$s', 'event_espresso' ),
+					__('Sorry, you are not allowed to list %1$s related to %2$s. Missing permissions: %3$s', 'event_espresso'),
 					$related_model_name_maybe_plural,
 					$relation->get_this_model()->get_this_model_name(),
 					implode(
 						',',
 						array_keys(
-							Capabilities::get_missing_permissions( $related_model, $context )
+							Capabilities::get_missing_permissions($related_model, $context)
 						)
 					)
 				),
-				array( 'status' => 403 )
+				array('status' => 403)
 			);
 		}
-		$query_params = $this->create_model_query_params( $relation->get_other_model(), $request->get_params() );
-		foreach( $primary_model_query_params[0] as $where_condition_key => $where_condition_value ) {
-			 $query_params[0][ $relation->get_this_model()->get_this_model_name() . '.' . $where_condition_key ] = $where_condition_value;
+		$query_params = $this->create_model_query_params($relation->get_other_model(), $request->get_params());
+		foreach ($primary_model_query_params[0] as $where_condition_key => $where_condition_value) {
+			 $query_params[0][$relation->get_this_model()->get_this_model_name().'.'.$where_condition_key] = $where_condition_value;
 		}
-		$query_params[ 'default_where_conditions' ] = 'none';
-		$query_params[ 'caps' ] = $context;
-		if( ! $request->get_header( 'no_rest_headers' ) ) {
-			$this->_set_headers_from_query_params( $relation->get_other_model(), $query_params );
+		$query_params['default_where_conditions'] = 'none';
+		$query_params['caps'] = $context;
+		if ( ! $request->get_header('no_rest_headers')) {
+			$this->_set_headers_from_query_params($relation->get_other_model(), $query_params);
 		}
 		/** @type array $results */
-		$results = $relation->get_other_model()->get_all_wpdb_results( $query_params );
+		$results = $relation->get_other_model()->get_all_wpdb_results($query_params);
 		$nice_results = array();
-		foreach( $results as $result ) {
+		foreach ($results as $result) {
 			$nice_result = $this->create_entity_from_wpdb_result(
 				$relation->get_other_model(),
 				$result,
 				$request
 			);
-			if( $relation instanceof \EE_HABTM_Relation ) {
+			if ($relation instanceof \EE_HABTM_Relation) {
 				//put the unusual stuff (properties from the HABTM relation) first, and make sure
 				//if there are conflicts we prefer the properties from the main model
 				$join_model_result = $this->create_entity_from_wpdb_result(
@@ -294,18 +294,18 @@ 
 					$result,
 					$request
 				);
-				$joined_result = array_merge( $nice_result, $join_model_result );
+				$joined_result = array_merge($nice_result, $join_model_result);
 				//but keep the meta stuff from the main model
-				if( isset( $nice_result['meta'] ) ){
+				if (isset($nice_result['meta'])) {
 					$joined_result['meta'] = $nice_result['meta'];
 				}
 				$nice_result = $joined_result;
 			}
 			$nice_results[] = $nice_result;
 		}
-		if( $relation instanceof \EE_Belongs_To_Relation ){
-			return array_shift( $nice_results );
-		}else{
+		if ($relation instanceof \EE_Belongs_To_Relation) {
+			return array_shift($nice_results);
+		} else {
 			return $nice_results;
 		}
 	}
@@ -324,11 +324,11 @@ 
 	 * @return array|\WP_Error
 	 * @throws \EE_Error
 	 */
-	public function get_entities_from_relation( $id, $relation, $request ) {
-		if( ! $relation->get_this_model()->has_primary_key_field() ) {
+	public function get_entities_from_relation($id, $relation, $request) {
+		if ( ! $relation->get_this_model()->has_primary_key_field()) {
 			throw new \EE_Error(
 				sprintf(
-					__( 'Read::get_entities_from_relation should only be called from a model with a primary key, it was called from %1$s', 'event_espresso'),
+					__('Read::get_entities_from_relation should only be called from a model with a primary key, it was called from %1$s', 'event_espresso'),
 					$relation->get_this_model()->get_this_model_name()
 				)
 			);
@@ -352,30 +352,30 @@ 
 	 * @param array $query_params
 	 * @return void
 	 */
-	protected function _set_headers_from_query_params( $model, $query_params ) {
-		$this->_set_debug_info( 'model query params', $query_params );
-		$this->_set_debug_info( 'missing caps', Capabilities::get_missing_permissions_string( $model, $query_params[ 'caps' ] ) );
+	protected function _set_headers_from_query_params($model, $query_params) {
+		$this->_set_debug_info('model query params', $query_params);
+		$this->_set_debug_info('missing caps', Capabilities::get_missing_permissions_string($model, $query_params['caps']));
 		//normally the limit to a 2-part array, where the 2nd item is the limit
-		if( ! isset( $query_params[ 'limit' ] ) ) {
-			$query_params[ 'limit' ] = \EED_Core_Rest_Api::get_default_query_limit();
+		if ( ! isset($query_params['limit'])) {
+			$query_params['limit'] = \EED_Core_Rest_Api::get_default_query_limit();
 		}
-		if( is_array( $query_params[ 'limit' ] )  ) {
-			$limit_parts = $query_params[ 'limit' ];
+		if (is_array($query_params['limit'])) {
+			$limit_parts = $query_params['limit'];
 		} else {
-			$limit_parts = explode(',', $query_params[ 'limit' ] );
-			if( count( $limit_parts ) == 1 ){
-				$limit_parts = array(0, $limit_parts[ 0 ] );
+			$limit_parts = explode(',', $query_params['limit']);
+			if (count($limit_parts) == 1) {
+				$limit_parts = array(0, $limit_parts[0]);
 			}
 		}
 		//remove the group by and having parts of the query, as those will
 		//make the sql query return an array of values, instead of just a single value
-		unset( $query_params[ 'group_by' ], $query_params[ 'having' ], $query_params[ 'limit' ] );
-		$count = $model->count( $query_params, null, true );
+		unset($query_params['group_by'], $query_params['having'], $query_params['limit']);
+		$count = $model->count($query_params, null, true);
 
-		$pages = $count / $limit_parts[ 1 ];
-		$this->_set_response_header( 'Total', $count, false );
-		$this->_set_response_header( 'PageSize', $limit_parts[ 1 ], false );
-		$this->_set_response_header( 'TotalPages', ceil( $pages ), false );
+		$pages = $count / $limit_parts[1];
+		$this->_set_response_header('Total', $count, false);
+		$this->_set_response_header('PageSize', $limit_parts[1], false);
+		$this->_set_response_header('TotalPages', ceil($pages), false);
 	}
 
 
@@ -388,50 +388,50 @@ 
 	 * @param string $deprecated no longer used
 	 * @return array ready for being converted into json for sending to client
 	 */
-	public function create_entity_from_wpdb_result( $model, $db_row, $rest_request, $deprecated = null ) {
-		if( ! $rest_request instanceof \WP_REST_Request ) {
+	public function create_entity_from_wpdb_result($model, $db_row, $rest_request, $deprecated = null) {
+		if ( ! $rest_request instanceof \WP_REST_Request) {
 			//ok so this was called in the old style, where the 3rd arg was
 			//$include, and the 4th arg was $context
 			//now setup the request just to avoid fatal errors, although we won't be able
 			//to truly make use of it because it's kinda devoid of info
 			$rest_request = new \WP_REST_Request();
-			$rest_request->set_param( 'include', $rest_request );
-			$rest_request->set_param( 'caps', $deprecated );
+			$rest_request->set_param('include', $rest_request);
+			$rest_request->set_param('caps', $deprecated);
 		}
-		if( $rest_request->get_param( 'caps' ) == null ) {
-			$rest_request->set_param( 'caps', \EEM_Base::caps_read );
+		if ($rest_request->get_param('caps') == null) {
+			$rest_request->set_param('caps', \EEM_Base::caps_read);
 		}
-		$entity_array = $this->_create_bare_entity_from_wpdb_results( $model, $db_row );
-		$entity_array = $this->_add_extra_fields( $model, $db_row, $entity_array );
-		$entity_array[ '_links' ] = $this->_get_entity_links( $model, $db_row, $entity_array );
-		$entity_array[ '_calculated_fields'] = $this->_get_entity_calculations( $model, $db_row, $rest_request );
-		$entity_array = $this->_include_requested_models( $model, $rest_request, $entity_array, $db_row );
+		$entity_array = $this->_create_bare_entity_from_wpdb_results($model, $db_row);
+		$entity_array = $this->_add_extra_fields($model, $db_row, $entity_array);
+		$entity_array['_links'] = $this->_get_entity_links($model, $db_row, $entity_array);
+		$entity_array['_calculated_fields'] = $this->_get_entity_calculations($model, $db_row, $rest_request);
+		$entity_array = $this->_include_requested_models($model, $rest_request, $entity_array, $db_row);
 		$entity_array = apply_filters(
 			'FHEE__Read__create_entity_from_wpdb_results__entity_before_inaccessible_field_removal',
 			$entity_array,
 			$model,
-			$rest_request->get_param( 'caps' ),
+			$rest_request->get_param('caps'),
 			$rest_request,
 			$this
 		);
 		$result_without_inaccessible_fields = Capabilities::filter_out_inaccessible_entity_fields(
 			$entity_array,
 			$model,
-			$rest_request->get_param( 'caps' ),
+			$rest_request->get_param('caps'),
 			$this->get_model_version_info(),
 			$model->get_index_primary_key_string(
-				$model->deduce_fields_n_values_from_cols_n_values($db_row )
+				$model->deduce_fields_n_values_from_cols_n_values($db_row)
 			)
 		);
 		$this->_set_debug_info(
 			'inaccessible fields',
-			array_keys( array_diff_key( $entity_array, $result_without_inaccessible_fields ) )
+			array_keys(array_diff_key($entity_array, $result_without_inaccessible_fields))
 		);
 		return apply_filters(
 			'FHEE__Read__create_entity_from_wpdb_results__entity_return',
 			$result_without_inaccessible_fields,
 			$model,
-			$rest_request->get_param( 'caps' )
+			$rest_request->get_param('caps')
 		);
 	}
 
@@ -443,39 +443,39 @@ 
 	 * @param array $db_row
 	 * @return array entity mostly ready for converting to JSON and sending in the response
 	 */
-	protected function _create_bare_entity_from_wpdb_results( \EEM_Base $model, $db_row ) {
-		$result = $model->deduce_fields_n_values_from_cols_n_values( $db_row );
-		$result = array_intersect_key( $result, $this->get_model_version_info()->fields_on_model_in_this_version( $model ) );
-		foreach( $result as $field_name => $raw_field_value ) {
+	protected function _create_bare_entity_from_wpdb_results(\EEM_Base $model, $db_row) {
+		$result = $model->deduce_fields_n_values_from_cols_n_values($db_row);
+		$result = array_intersect_key($result, $this->get_model_version_info()->fields_on_model_in_this_version($model));
+		foreach ($result as $field_name => $raw_field_value) {
 			$field_obj = $model->field_settings_for($field_name);
-			$field_value = $field_obj->prepare_for_set_from_db( $raw_field_value );
-			if( $this->is_subclass_of_one(  $field_obj, $this->get_model_version_info()->fields_ignored() ) ){
-				unset( $result[ $field_name ] );
-			}elseif(
-				$this->is_subclass_of_one( $field_obj, $this->get_model_version_info()->fields_that_have_rendered_format() )
-			){
-				$result[ $field_name ] = array(
-					'raw' => $field_obj->prepare_for_get( $field_value ),
-					'rendered' => $field_obj->prepare_for_pretty_echoing( $field_value )
+			$field_value = $field_obj->prepare_for_set_from_db($raw_field_value);
+			if ($this->is_subclass_of_one($field_obj, $this->get_model_version_info()->fields_ignored())) {
+				unset($result[$field_name]);
+			}elseif (
+				$this->is_subclass_of_one($field_obj, $this->get_model_version_info()->fields_that_have_rendered_format())
+			) {
+				$result[$field_name] = array(
+					'raw' => $field_obj->prepare_for_get($field_value),
+					'rendered' => $field_obj->prepare_for_pretty_echoing($field_value)
 				);
-			}elseif(
-				$this->is_subclass_of_one( $field_obj, $this->get_model_version_info()->fields_that_have_pretty_format() )
-			){
-				$result[ $field_name ] = array(
-					'raw' => $field_obj->prepare_for_get( $field_value ),
-					'pretty' => $field_obj->prepare_for_pretty_echoing( $field_value )
+			}elseif (
+				$this->is_subclass_of_one($field_obj, $this->get_model_version_info()->fields_that_have_pretty_format())
+			) {
+				$result[$field_name] = array(
+					'raw' => $field_obj->prepare_for_get($field_value),
+					'pretty' => $field_obj->prepare_for_pretty_echoing($field_value)
 				);
-			} elseif ( $field_obj instanceof \EE_Datetime_Field ) {
-				if( $field_value instanceof \DateTime ) {
+			} elseif ($field_obj instanceof \EE_Datetime_Field) {
+				if ($field_value instanceof \DateTime) {
 					$timezone = $field_value->getTimezone();
-					$field_value->setTimezone( new \DateTimeZone( 'UTC' ) );
-					$result[ $field_name . '_gmt' ] = Model_Data_Translator::prepare_field_value_for_json(
+					$field_value->setTimezone(new \DateTimeZone('UTC'));
+					$result[$field_name.'_gmt'] = Model_Data_Translator::prepare_field_value_for_json(
 						$field_obj,
 						$field_value,
 						$this->get_model_version_info()->requested_version()
 					);
-					$field_value->setTimezone( $timezone );
-					$result[ $field_name ] = Model_Data_Translator::prepare_field_value_for_json(
+					$field_value->setTimezone($timezone);
+					$result[$field_name] = Model_Data_Translator::prepare_field_value_for_json(
 						$field_obj,
 						$field_value,
 						$this->get_model_version_info()->requested_version()
@@ -483,9 +483,9 @@ 
 				}
 
 			} else {
-				$result[ $field_name ] = Model_Data_Translator::prepare_field_value_for_json(
+				$result[$field_name] = Model_Data_Translator::prepare_field_value_for_json(
 					$field_obj,
-					$field_obj->prepare_for_get( $field_value ),
+					$field_obj->prepare_for_get($field_value),
 					$this->get_model_version_info()->requested_version()
 				);
 			}
@@ -500,9 +500,9 @@ 
 	 * @param array $entity_array
 	 * @return array modified entity
 	 */
-	protected function _add_extra_fields( \EEM_Base $model, $db_row, $entity_array ) {
-		if( $model instanceof \EEM_CPT_Base ) {
-			$entity_array[ 'link' ] = get_permalink( $db_row[ $model->get_primary_key_field()->get_qualified_column() ] );
+	protected function _add_extra_fields(\EEM_Base $model, $db_row, $entity_array) {
+		if ($model instanceof \EEM_CPT_Base) {
+			$entity_array['link'] = get_permalink($db_row[$model->get_primary_key_field()->get_qualified_column()]);
 		}
 		return $entity_array;
 	}
@@ -516,14 +516,14 @@ 
 	 * @param array $entity_array
 	 * @return array the _links item in the entity
 	 */
-	protected function _get_entity_links( $model, $db_row, $entity_array ) {
+	protected function _get_entity_links($model, $db_row, $entity_array) {
 		//add basic links
 		$links = array();
-		if( $model->has_primary_key_field() ) {
+		if ($model->has_primary_key_field()) {
 			$links['self'] = array(
 				array(
 					'href' => $this->get_versioned_link_to(
-						\EEH_Inflector::pluralize_and_lower( $model->get_this_model_name() ) . '/' . $entity_array[ $model->primary_key_name() ]
+						\EEH_Inflector::pluralize_and_lower($model->get_this_model_name()).'/'.$entity_array[$model->primary_key_name()]
 					)
 				)
 			);
@@ -531,33 +531,33 @@ 
 		$links['collection'] = array(
 			array(
 				'href' => $this->get_versioned_link_to(
-					\EEH_Inflector::pluralize_and_lower( $model->get_this_model_name() )
+					\EEH_Inflector::pluralize_and_lower($model->get_this_model_name())
 				)
 			)
 		);
 
 		//add link to the wp core endpoint, if wp api is active
 		global $wp_rest_server;
-		if( $model instanceof \EEM_CPT_Base &&
+		if ($model instanceof \EEM_CPT_Base &&
 			$wp_rest_server instanceof \WP_REST_Server &&
-			$wp_rest_server->get_route_options( '/wp/v2/posts' ) &&
-			$model->has_primary_key_field() ) {
-			$links[ \EED_Core_Rest_Api::ee_api_link_namespace . 'self_wp_post' ] = array(
+			$wp_rest_server->get_route_options('/wp/v2/posts') &&
+			$model->has_primary_key_field()) {
+			$links[\EED_Core_Rest_Api::ee_api_link_namespace.'self_wp_post'] = array(
 				array(
-					'href' => rest_url( '/wp/v2/posts/' . $db_row[ $model->get_primary_key_field()->get_qualified_column() ] ),
+					'href' => rest_url('/wp/v2/posts/'.$db_row[$model->get_primary_key_field()->get_qualified_column()]),
 					'single' => true
 				)
 			);
 		}
 
 		//add links to related models
-		if( $model->has_primary_key_field() ) {
-			foreach( $this->get_model_version_info()->relation_settings( $model ) as $relation_name => $relation_obj ) {
-				$related_model_part = Read::get_related_entity_name( $relation_name, $relation_obj );
-				$links[ \EED_Core_Rest_Api::ee_api_link_namespace . $related_model_part ] = array(
+		if ($model->has_primary_key_field()) {
+			foreach ($this->get_model_version_info()->relation_settings($model) as $relation_name => $relation_obj) {
+				$related_model_part = Read::get_related_entity_name($relation_name, $relation_obj);
+				$links[\EED_Core_Rest_Api::ee_api_link_namespace.$related_model_part] = array(
 					array(
 						'href' => $this->get_versioned_link_to(
-							\EEH_Inflector::pluralize_and_lower( $model->get_this_model_name() ) . '/' . $entity_array[ $model->primary_key_name() ] . '/' . $related_model_part
+							\EEH_Inflector::pluralize_and_lower($model->get_this_model_name()).'/'.$entity_array[$model->primary_key_name()].'/'.$related_model_part
 						),
 						'single' => $relation_obj instanceof \EE_Belongs_To_Relation ? true : false
 					)
@@ -575,52 +575,52 @@ 
 	 * @param array $db_row
 	 * @return array the modified entity
 	 */
-	protected function _include_requested_models( \EEM_Base $model, \WP_REST_Request $rest_request, $entity_array, $db_row = array() ) {
+	protected function _include_requested_models(\EEM_Base $model, \WP_REST_Request $rest_request, $entity_array, $db_row = array()) {
 		//if $db_row not included, hope the entity array has what we need
-		if( ! $db_row ) {
+		if ( ! $db_row) {
 			$db_row = $entity_array;
 		}
-		$includes_for_this_model = $this->explode_and_get_items_prefixed_with( $rest_request->get_param( 'include' ), '' );
-		$includes_for_this_model = $this->_remove_model_names_from_array( $includes_for_this_model );
+		$includes_for_this_model = $this->explode_and_get_items_prefixed_with($rest_request->get_param('include'), '');
+		$includes_for_this_model = $this->_remove_model_names_from_array($includes_for_this_model);
 		//if they passed in * or didn't specify any includes, return everything
-		if( ! in_array( '*', $includes_for_this_model )
-			&& ! empty( $includes_for_this_model ) ) {
-			if( $model->has_primary_key_field() ) {
+		if ( ! in_array('*', $includes_for_this_model)
+			&& ! empty($includes_for_this_model)) {
+			if ($model->has_primary_key_field()) {
 				//always include the primary key. ya just gotta know that at least
 				$includes_for_this_model[] = $model->primary_key_name();
 			}
-			if( $this->explode_and_get_items_prefixed_with( $rest_request->get_param( 'calculate' ), '' ) ) {
+			if ($this->explode_and_get_items_prefixed_with($rest_request->get_param('calculate'), '')) {
 				$includes_for_this_model[] = '_calculated_fields';
 			}
-			$entity_array = array_intersect_key( $entity_array, array_flip( $includes_for_this_model ) );
+			$entity_array = array_intersect_key($entity_array, array_flip($includes_for_this_model));
 		}
-		$relation_settings = $this->get_model_version_info()->relation_settings( $model );
-		foreach( $relation_settings as $relation_name => $relation_obj ) {
+		$relation_settings = $this->get_model_version_info()->relation_settings($model);
+		foreach ($relation_settings as $relation_name => $relation_obj) {
 			$related_fields_to_include = $this->explode_and_get_items_prefixed_with(
-				$rest_request->get_param( 'include' ),
+				$rest_request->get_param('include'),
 				$relation_name
 			);
 			$related_fields_to_calculate = $this->explode_and_get_items_prefixed_with(
-				$rest_request->get_param( 'calculate' ),
+				$rest_request->get_param('calculate'),
 				$relation_name
 			);
 			//did they specify they wanted to include a related model, or
 			//specific fields from a related model?
 			//or did they specify to calculate a field from a related model?
-			if( $related_fields_to_include || $related_fields_to_calculate ) {
+			if ($related_fields_to_include || $related_fields_to_calculate) {
 				//if so, we should include at least some part of the related model
 				$pretend_related_request = new \WP_REST_Request();
 				$pretend_related_request->set_query_params(
 					array(
-						'caps' => $rest_request->get_param( 'caps' ),
+						'caps' => $rest_request->get_param('caps'),
 						'include' => $related_fields_to_include,
 						'calculate' => $related_fields_to_calculate,
 					)
 				);
-				$pretend_related_request->add_header( 'no_rest_headers', true );
+				$pretend_related_request->add_header('no_rest_headers', true);
 				$primary_model_query_params = $model->alter_query_params_to_restrict_by_ID(
 					$model->get_index_primary_key_string(
-						$model->deduce_fields_n_values_from_cols_n_values( $db_row )
+						$model->deduce_fields_n_values_from_cols_n_values($db_row)
 					)
 				);
 				$related_results = $this->_get_entities_from_relation(
@@ -628,7 +628,7 @@ 
 					$relation_obj,
 					$pretend_related_request
 				);
-				$entity_array[ Read::get_related_entity_name( $relation_name, $relation_obj ) ] = $related_results instanceof \WP_Error
+				$entity_array[Read::get_related_entity_name($relation_name, $relation_obj)] = $related_results instanceof \WP_Error
 					? null
 					: $related_results;
 			}
@@ -642,8 +642,8 @@ 
 	 * @param array $arr
 	 * @return array
 	 */
-	private function _remove_model_names_from_array( $arr ) {
-		return array_diff( $arr, array_keys( \EE_Registry::instance()->non_abstract_db_models ) );
+	private function _remove_model_names_from_array($arr) {
+		return array_diff($arr, array_keys(\EE_Registry::instance()->non_abstract_db_models));
 	}
 	/**
 	 * Gets the calculated fields for the response
@@ -653,15 +653,15 @@ 
 	 * @param \WP_REST_Request $rest_request
 	 * @return \stdClass the _calculations item in the entity
 	 */
-	protected function _get_entity_calculations( $model, $wpdb_row, $rest_request ) {
+	protected function _get_entity_calculations($model, $wpdb_row, $rest_request) {
 		$calculated_fields = $this->explode_and_get_items_prefixed_with(
-			$rest_request->get_param( 'calculate' ),
+			$rest_request->get_param('calculate'),
 			''
 		);
 		//note: setting calculate=* doesn't do anything
 		$calculated_fields_to_return = new \stdClass();
-		foreach( $calculated_fields as $field_to_calculate ) {
-			try{
+		foreach ($calculated_fields as $field_to_calculate) {
+			try {
 				$calculated_fields_to_return->$field_to_calculate = Model_Data_Translator::prepare_field_value_for_json(
 					null,
 					$this->_fields_calculator->retrieve_calculated_field_value(
@@ -673,10 +673,10 @@ 
 					),
 					$this->get_model_version_info()->requested_version()
 				);
-			} catch( Rest_Exception $e ) {
+			} catch (Rest_Exception $e) {
 				//if we don't have permission to read it, just leave it out. but let devs know about the problem
 				$this->_set_response_header(
-					'Notices-Field-Calculation-Errors[' . $e->get_string_code() . '][' . $model->get_this_model_name() . '][' . $field_to_calculate . ']',
+					'Notices-Field-Calculation-Errors['.$e->get_string_code().']['.$model->get_this_model_name().']['.$field_to_calculate.']',
 					$e->getMessage(),
 					true
 				);
@@ -690,7 +690,7 @@ 
 	 * @param string $link_part_after_version_and_slash eg "events/10/datetimes"
 	 * @return string url eg "http://mysite.com/wp-json/ee/v4.6/events/10/datetimes"
 	 */
-	public function get_versioned_link_to( $link_part_after_version_and_slash ) {
+	public function get_versioned_link_to($link_part_after_version_and_slash) {
 		return rest_url(
 			\EED_Core_Rest_Api::ee_api_namespace
 			. $this->get_model_version_info()->requested_version()
@@ -706,11 +706,11 @@ 
 	 * @param \EE_Model_Relation_Base $relation_obj
 	 * @return string
 	 */
-	public static function get_related_entity_name( $relation_name, $relation_obj ){
-		if( $relation_obj instanceof \EE_Belongs_To_Relation ) {
-			return strtolower( $relation_name );
-		}else{
-			return \EEH_Inflector::pluralize_and_lower( $relation_name );
+	public static function get_related_entity_name($relation_name, $relation_obj) {
+		if ($relation_obj instanceof \EE_Belongs_To_Relation) {
+			return strtolower($relation_name);
+		} else {
+			return \EEH_Inflector::pluralize_and_lower($relation_name);
 		}
 	}
 
@@ -723,43 +723,43 @@ 
 	 * @param \WP_REST_Request $request
 	 * @return array|\WP_Error
 	 */
-	public function get_entity_from_model( $model, $request ) {
-		$query_params = array( array( $model->primary_key_name() => $request->get_param( 'id' ) ),'limit' => 1);
-		if( $model instanceof \EEM_Soft_Delete_Base ){
+	public function get_entity_from_model($model, $request) {
+		$query_params = array(array($model->primary_key_name() => $request->get_param('id')), 'limit' => 1);
+		if ($model instanceof \EEM_Soft_Delete_Base) {
 			$query_params = $model->alter_query_params_so_deleted_and_undeleted_items_included($query_params);
 		}
 		$restricted_query_params = $query_params;
-		$restricted_query_params[ 'caps' ] =  $this->validate_context(  $request->get_param( 'caps' ) );
-		$this->_set_debug_info( 'model query params', $restricted_query_params );
-		$model_rows = $model->get_all_wpdb_results( $restricted_query_params );
-		if ( ! empty ( $model_rows ) ) {
+		$restricted_query_params['caps'] = $this->validate_context($request->get_param('caps'));
+		$this->_set_debug_info('model query params', $restricted_query_params);
+		$model_rows = $model->get_all_wpdb_results($restricted_query_params);
+		if ( ! empty ($model_rows)) {
 			return $this->create_entity_from_wpdb_result(
 				$model,
-				array_shift( $model_rows ),
+				array_shift($model_rows),
 				$request );
 		} else {
 			//ok let's test to see if we WOULD have found it, had we not had restrictions from missing capabilities
-			$lowercase_model_name = strtolower( $model->get_this_model_name() );
-			$model_rows_found_sans_restrictions = $model->get_all_wpdb_results( $query_params );
-			if( ! empty( $model_rows_found_sans_restrictions ) ) {
+			$lowercase_model_name = strtolower($model->get_this_model_name());
+			$model_rows_found_sans_restrictions = $model->get_all_wpdb_results($query_params);
+			if ( ! empty($model_rows_found_sans_restrictions)) {
 				//you got shafted- it existed but we didn't want to tell you!
 				return new \WP_Error(
 					'rest_user_cannot_read',
 					sprintf(
-						__( 'Sorry, you cannot read this %1$s. Missing permissions are: %2$s', 'event_espresso' ),
-						strtolower( $model->get_this_model_name() ),
+						__('Sorry, you cannot read this %1$s. Missing permissions are: %2$s', 'event_espresso'),
+						strtolower($model->get_this_model_name()),
 						Capabilities::get_missing_permissions_string(
 							$model,
-							$this->validate_context( $request->get_param( 'caps' ) ) )
+							$this->validate_context($request->get_param('caps')) )
 					),
-					array( 'status' => 403 )
+					array('status' => 403)
 				);
 			} else {
 				//it's not you. It just doesn't exist
 				return new \WP_Error(
-					sprintf( 'rest_%s_invalid_id', $lowercase_model_name ),
-					sprintf( __( 'Invalid %s ID.', 'event_espresso' ), $lowercase_model_name ),
-					array( 'status' => 404 )
+					sprintf('rest_%s_invalid_id', $lowercase_model_name),
+					sprintf(__('Invalid %s ID.', 'event_espresso'), $lowercase_model_name),
+					array('status' => 404)
 				);
 			}
 		}
@@ -772,14 +772,14 @@ 
 	 * @param string $context
 	 * @return string array key of EEM_Base::cap_contexts_to_cap_action_map()
 	 */
-	public function validate_context( $context ) {
-		if( ! $context ) {
+	public function validate_context($context) {
+		if ( ! $context) {
 			$context = \EEM_Base::caps_read;
 		}
 		$valid_contexts = \EEM_Base::valid_cap_contexts();
-		if( in_array( $context, $valid_contexts )  ){
+		if (in_array($context, $valid_contexts)) {
 			return $context;
-		}else{
+		} else {
 			return \EEM_Base::caps_read;
 		}
 	}
@@ -798,87 +798,87 @@ 
 	 *                          that absolutely no results should be returned
 	 * @throws \EE_Error
 	 */
-	public function create_model_query_params( $model, $query_parameters ) {
+	public function create_model_query_params($model, $query_parameters) {
 		$model_query_params = array( );
-		if ( isset( $query_parameters[ 'where' ] ) ) {
-			$model_query_params[ 0 ] = Model_Data_Translator::prepare_conditions_query_params_for_models(
-				$query_parameters[ 'where' ],
+		if (isset($query_parameters['where'])) {
+			$model_query_params[0] = Model_Data_Translator::prepare_conditions_query_params_for_models(
+				$query_parameters['where'],
 				$model,
 				$this->get_model_version_info()->requested_version()
 			);
 		}
-		if ( isset( $query_parameters[ 'order_by' ] ) ) {
-			$order_by = $query_parameters[ 'order_by' ];
-		} elseif ( isset( $query_parameters[ 'orderby' ] ) ) {
-			$order_by = $query_parameters[ 'orderby' ];
-		}else{
+		if (isset($query_parameters['order_by'])) {
+			$order_by = $query_parameters['order_by'];
+		} elseif (isset($query_parameters['orderby'])) {
+			$order_by = $query_parameters['orderby'];
+		} else {
 			$order_by = null;
 		}
-		if( $order_by !== null ){
-			if( is_array( $order_by ) ) {
-				$order_by = Model_Data_Translator::prepare_field_names_in_array_keys_from_json( $order_by );
+		if ($order_by !== null) {
+			if (is_array($order_by)) {
+				$order_by = Model_Data_Translator::prepare_field_names_in_array_keys_from_json($order_by);
 			} else {
 				//it's a single item
-				$order_by = Model_Data_Translator::prepare_field_name_from_json( $order_by );
+				$order_by = Model_Data_Translator::prepare_field_name_from_json($order_by);
 			}
-			$model_query_params[ 'order_by' ] =  $order_by;
+			$model_query_params['order_by'] = $order_by;
 		}
-		if ( isset( $query_parameters[ 'group_by' ] ) ) {
-			$group_by = $query_parameters[ 'group_by' ];
-		} elseif ( isset( $query_parameters[ 'groupby' ] ) ) {
-			$group_by = $query_parameters[ 'groupby' ];
-		}else{
-			$group_by = array_keys( $model->get_combined_primary_key_fields() );
+		if (isset($query_parameters['group_by'])) {
+			$group_by = $query_parameters['group_by'];
+		} elseif (isset($query_parameters['groupby'])) {
+			$group_by = $query_parameters['groupby'];
+		} else {
+			$group_by = array_keys($model->get_combined_primary_key_fields());
 		}
 		//make sure they're all real names
-		if( is_array( $group_by ) ) {
-			$group_by = Model_Data_Translator::prepare_field_names_from_json( $group_by );
+		if (is_array($group_by)) {
+			$group_by = Model_Data_Translator::prepare_field_names_from_json($group_by);
 		}
-		if( $group_by !== null ){
-			$model_query_params[ 'group_by' ] = $group_by;
+		if ($group_by !== null) {
+			$model_query_params['group_by'] = $group_by;
 		}
-		if ( isset( $query_parameters[ 'having' ] ) ) {
-			$model_query_params[ 'having' ] = Model_Data_Translator::prepare_conditions_query_params_for_models(
-				$query_parameters[ 'having' ],
+		if (isset($query_parameters['having'])) {
+			$model_query_params['having'] = Model_Data_Translator::prepare_conditions_query_params_for_models(
+				$query_parameters['having'],
 				$model,
 				$this->get_model_version_info()->requested_version()
 			);
 		}
-		if ( isset( $query_parameters[ 'order' ] ) ) {
-			$model_query_params[ 'order' ] = $query_parameters[ 'order' ];
+		if (isset($query_parameters['order'])) {
+			$model_query_params['order'] = $query_parameters['order'];
 		}
-		if ( isset( $query_parameters[ 'mine' ] ) ){
-			$model_query_params = $model->alter_query_params_to_only_include_mine( $model_query_params );
+		if (isset($query_parameters['mine'])) {
+			$model_query_params = $model->alter_query_params_to_only_include_mine($model_query_params);
 		}
-		if( isset( $query_parameters[ 'limit' ] ) ) {
+		if (isset($query_parameters['limit'])) {
 			//limit should be either a string like '23' or '23,43', or an array with two items in it
-			if( ! is_array( $query_parameters[ 'limit' ] ) ) {
-				$limit_array = explode(',', (string)$query_parameters['limit']);
-			}else {
-				$limit_array = $query_parameters[ 'limit' ];
+			if ( ! is_array($query_parameters['limit'])) {
+				$limit_array = explode(',', (string) $query_parameters['limit']);
+			} else {
+				$limit_array = $query_parameters['limit'];
 			}
 			$sanitized_limit = array();
-			foreach( $limit_array as $key => $limit_part ) {
-				if( $this->_debug_mode && ( ! is_numeric( $limit_part ) || count( $sanitized_limit ) > 2 ) ) {
+			foreach ($limit_array as $key => $limit_part) {
+				if ($this->_debug_mode && ( ! is_numeric($limit_part) || count($sanitized_limit) > 2)) {
 					throw new \EE_Error(
 						sprintf(
-							__( 'An invalid limit filter was provided. It was: %s. If the EE4 JSON REST API weren\'t in debug mode, this message would not appear.', 'event_espresso' ),
-							wp_json_encode( $query_parameters[ 'limit' ] )
+							__('An invalid limit filter was provided. It was: %s. If the EE4 JSON REST API weren\'t in debug mode, this message would not appear.', 'event_espresso'),
+							wp_json_encode($query_parameters['limit'])
 						)
 					);
 				}
-				$sanitized_limit[] = (int)$limit_part;
+				$sanitized_limit[] = (int) $limit_part;
 			}
-			$model_query_params[ 'limit' ] = implode( ',', $sanitized_limit );
-		}else{
-			$model_query_params[ 'limit' ] = \EED_Core_Rest_Api::get_default_query_limit();
+			$model_query_params['limit'] = implode(',', $sanitized_limit);
+		} else {
+			$model_query_params['limit'] = \EED_Core_Rest_Api::get_default_query_limit();
 		}
-		if( isset( $query_parameters[ 'caps' ] ) ) {
-			$model_query_params[ 'caps' ] = $this->validate_context( $query_parameters[ 'caps' ] );
-		}else{
-			$model_query_params[ 'caps' ] = \EEM_Base::caps_read;
+		if (isset($query_parameters['caps'])) {
+			$model_query_params['caps'] = $this->validate_context($query_parameters['caps']);
+		} else {
+			$model_query_params['caps'] = \EEM_Base::caps_read;
 		}
-		return apply_filters( 'FHEE__Read__create_model_query_params', $model_query_params, $query_parameters, $model );
+		return apply_filters('FHEE__Read__create_model_query_params', $model_query_params, $query_parameters, $model);
 	}
 
 
@@ -890,13 +890,13 @@ 
 	 * @param array     $query_params sub-array from @see EEM_Base::get_all()
 	 * @return array
 	 */
-	public function prepare_rest_query_params_key_for_models( $model,  $query_params ) {
+	public function prepare_rest_query_params_key_for_models($model, $query_params) {
 		$model_ready_query_params = array();
-		foreach( $query_params as $key => $value ) {
-			if( is_array( $value ) ) {
-				$model_ready_query_params[ $key ] = $this->prepare_rest_query_params_key_for_models( $model, $value );
-			}else{
-				$model_ready_query_params[ $key ] = $value;
+		foreach ($query_params as $key => $value) {
+			if (is_array($value)) {
+				$model_ready_query_params[$key] = $this->prepare_rest_query_params_key_for_models($model, $value);
+			} else {
+				$model_ready_query_params[$key] = $value;
 			}
 		}
 		return $model_ready_query_params;
@@ -910,13 +910,13 @@ 
 	 * @param $query_params
 	 * @return array
 	 */
-	public function prepare_rest_query_params_values_for_models( $model, $query_params ) {
+	public function prepare_rest_query_params_values_for_models($model, $query_params) {
 		$model_ready_query_params = array();
-		foreach( $query_params as $key => $value ) {
-			if( is_array( $value ) ) {
-				$model_ready_query_params[ $key ] = $this->prepare_rest_query_params_values_for_models( $model, $value );
+		foreach ($query_params as $key => $value) {
+			if (is_array($value)) {
+				$model_ready_query_params[$key] = $this->prepare_rest_query_params_values_for_models($model, $value);
 			} else {
-				$model_ready_query_params[ $key ] = $value;
+				$model_ready_query_params[$key] = $value;
 			}
 		}
 		return $model_ready_query_params;
@@ -931,33 +931,33 @@ 
 	 * we only return strings starting with that and a period; if no prefix was specified
 	 * we return all items containing NO periods
 	 */
-	public function explode_and_get_items_prefixed_with( $string_to_explode, $prefix ) {
-		if( is_string( $string_to_explode ) ) {
-			$exploded_contents = explode( ',', $string_to_explode );
-		} else if( is_array( $string_to_explode ) ) {
+	public function explode_and_get_items_prefixed_with($string_to_explode, $prefix) {
+		if (is_string($string_to_explode)) {
+			$exploded_contents = explode(',', $string_to_explode);
+		} else if (is_array($string_to_explode)) {
 			$exploded_contents = $string_to_explode;
 		} else {
 			$exploded_contents = array();
 		}
 		//if the string was empty, we want an empty array
-		$exploded_contents = array_filter( $exploded_contents );
+		$exploded_contents = array_filter($exploded_contents);
 		$contents_with_prefix = array();
-		foreach( $exploded_contents as $item ) {
-			$item = trim( $item );
+		foreach ($exploded_contents as $item) {
+			$item = trim($item);
 			//if no prefix was provided, so we look for items with no "." in them
-			if( ! $prefix ) {
+			if ( ! $prefix) {
 				//does this item have a period?
-				if( strpos( $item, '.' ) === false ) {
+				if (strpos($item, '.') === false) {
 					//if not, then its what we're looking for
 					$contents_with_prefix[] = $item;
 				}
-			} else if( strpos( $item, $prefix . '.' ) === 0 ) {
+			} else if (strpos($item, $prefix.'.') === 0) {
 				//this item has the prefix and a period, grab it
 				$contents_with_prefix[] = substr(
 					$item,
-					strpos( $item, $prefix . '.' ) + strlen( $prefix . '.' )
+					strpos($item, $prefix.'.') + strlen($prefix.'.')
 					);
-			} else if( $item === $prefix ) {
+			} else if ($item === $prefix) {
 				//this item is JUST the prefix
 				//so let's grab everything after, which is a blank string
 				$contents_with_prefix[] = '';
@@ -980,33 +980,33 @@ 
 	 * the fields for that model, with the model's name removed from each.
 	 * If $include_string was blank or '*' returns an empty array
 	 */
-	public function extract_includes_for_this_model( $include_string, $model_name = null ) {
-		if( is_array( $include_string ) ) {
-			$include_string = implode( ',', $include_string );
+	public function extract_includes_for_this_model($include_string, $model_name = null) {
+		if (is_array($include_string)) {
+			$include_string = implode(',', $include_string);
 		}
-		if( $include_string === '*' || $include_string === '' ) {
+		if ($include_string === '*' || $include_string === '') {
 			return array();
 		}
-		$includes = explode( ',', $include_string );
+		$includes = explode(',', $include_string);
 		$extracted_fields_to_include = array();
-		if( $model_name ){
-			foreach( $includes as $field_to_include ) {
-				$field_to_include = trim( $field_to_include );
-				if( strpos( $field_to_include, $model_name . '.' ) === 0 ) {
+		if ($model_name) {
+			foreach ($includes as $field_to_include) {
+				$field_to_include = trim($field_to_include);
+				if (strpos($field_to_include, $model_name.'.') === 0) {
 					//found the model name at the exact start
-					$field_sans_model_name = str_replace( $model_name . '.', '', $field_to_include );
+					$field_sans_model_name = str_replace($model_name.'.', '', $field_to_include);
 					$extracted_fields_to_include[] = $field_sans_model_name;
-				}elseif( $field_to_include == $model_name ){
+				}elseif ($field_to_include == $model_name) {
 					$extracted_fields_to_include[] = '*';
 				}
 			}
-		}else{
+		} else {
 			//look for ones with no period
-			foreach( $includes as $field_to_include ) {
-				$field_to_include = trim( $field_to_include );
+			foreach ($includes as $field_to_include) {
+				$field_to_include = trim($field_to_include);
 				if (
-					strpos( $field_to_include, '.' ) === false
-					&& ! $this->get_model_version_info()->is_model_name_in_this_version( $field_to_include )
+					strpos($field_to_include, '.') === false
+					&& ! $this->get_model_version_info()->is_model_name_in_this_version($field_to_include)
 				) {
 					$extracted_fields_to_include[] = $field_to_include;
 				}

core/libraries/rest_api/controllers/Base.php

Spacing +60 added lines, -60 removed lines

@@ -1,8 +1,8 @@ 
 <?php
 namespace EventEspresso\core\libraries\rest_api\controllers;
 use EventEspresso\core\libraries\rest_api\Rest_Exception;
-if ( !defined( 'EVENT_ESPRESSO_VERSION' ) ) {
-	exit( 'No direct script access allowed' );
+if ( ! defined('EVENT_ESPRESSO_VERSION')) {
+	exit('No direct script access allowed');
 }
 
 /**
@@ -49,7 +49,7 @@ 
 
 
 	public function __construct() {
-		$this->_debug_mode = defined( 'EE_REST_API_DEBUG_MODE' ) ? EE_REST_API_DEBUG_MODE : false;
+		$this->_debug_mode = defined('EE_REST_API_DEBUG_MODE') ? EE_REST_API_DEBUG_MODE : false;
 	}
 
 
@@ -57,7 +57,7 @@ 
 	 * Sets the version the user requested
 	 * @param string $version eg '4.8'
 	 */
-	public function set_requested_version( $version ) {
+	public function set_requested_version($version) {
 		$this->_requested_version = $version;
 	}
 
@@ -66,8 +66,8 @@ 
 	 * @param string $key
 	 * @param string|array $info
 	 */
-	protected function _set_debug_info( $key, $info ){
-		$this->_debug_info[ $key ] = $info;
+	protected function _set_debug_info($key, $info) {
+		$this->_debug_info[$key] = $info;
 	}
 
 	/**
@@ -79,14 +79,14 @@ 
 	 * @param boolean      $use_ee_prefix whether to use the EE prefix on the header, or fallback to
 	 *                                    the standard WP one
 	 */
-	protected function _set_response_header( $header_key, $value, $use_ee_prefix = true ) {
-		if( is_array( $value ) ) {
-			foreach( $value as $value_key => $value_value ) {
-				$this->_set_response_header(  $header_key . '[' . $value_key . ']', $value_value );
+	protected function _set_response_header($header_key, $value, $use_ee_prefix = true) {
+		if (is_array($value)) {
+			foreach ($value as $value_key => $value_value) {
+				$this->_set_response_header($header_key.'['.$value_key.']', $value_value);
 			}
 		} else {
 			$prefix = $use_ee_prefix ? Base::header_prefix_for_ee : Base::header_prefix_for_wp;
-			$this->_response_headers[ $prefix . $header_key  ] = $value;
+			$this->_response_headers[$prefix.$header_key] = $value;
 		}
 	}
 
@@ -95,7 +95,7 @@ 
 	 * @return array
 	 */
 	protected function _get_response_headers() {
-		return apply_filters( 'FHEE__EventEspresso\core\libraries\rest_api\controllers\Base___get_response_headers',
+		return apply_filters('FHEE__EventEspresso\core\libraries\rest_api\controllers\Base___get_response_headers',
 			$this->_response_headers,
 			$this,
 			$this->_requested_version
@@ -107,13 +107,13 @@ 
 	 * @param \WP_Error $wp_error_response
 	 * @return \WP_Error
 	 */
-	protected function _add_ee_errors_to_response( \WP_Error $wp_error_response ) {
+	protected function _add_ee_errors_to_response(\WP_Error $wp_error_response) {
 		$notices_during_checkin = \EE_Error::get_raw_notices();
-		if( ! empty( $notices_during_checkin[ 'errors' ] ) ) {
-			foreach( $notices_during_checkin[ 'errors' ] as $error_code => $error_message ) {
+		if ( ! empty($notices_during_checkin['errors'])) {
+			foreach ($notices_during_checkin['errors'] as $error_code => $error_message) {
 				$wp_error_response->add(
-					sanitize_key( $error_code ),
-					strip_tags( $error_message ) );
+					sanitize_key($error_code),
+					strip_tags($error_message) );
 			}
 		}
 		return $wp_error_response;
@@ -131,27 +131,27 @@ 
 	 * @param array|\WP_Error|\Exception $response
 	 * @return \WP_REST_Response
 	 */
-	public function send_response( $response ) {
-		if( $response instanceof Rest_Exception ) {
-			$response = new \WP_Error( $response->get_string_code(), $response->getMessage(), $response->get_data() );
+	public function send_response($response) {
+		if ($response instanceof Rest_Exception) {
+			$response = new \WP_Error($response->get_string_code(), $response->getMessage(), $response->get_data());
 		}
-		if( $response instanceof \Exception ) {
+		if ($response instanceof \Exception) {
 			$code = $response->getCode() ? $response->getCode() : 'error_occurred';
-			$response = new \WP_Error( $code, $response->getMessage() );
+			$response = new \WP_Error($code, $response->getMessage());
 		}
-		if( $response instanceof \WP_Error ) {
-			$response = $this->_add_ee_errors_to_response( $response );
-			$rest_response = $this->_create_rest_response_from_wp_error( $response );
-		}else{
-			$rest_response = new \WP_REST_Response( $response, 200 );
+		if ($response instanceof \WP_Error) {
+			$response = $this->_add_ee_errors_to_response($response);
+			$rest_response = $this->_create_rest_response_from_wp_error($response);
+		} else {
+			$rest_response = new \WP_REST_Response($response, 200);
 		}
 		$headers = array();
-		if( $this->_debug_mode && is_array( $this->_debug_info ) ) {
-			foreach( $this->_debug_info  as $debug_key => $debug_info ) {
-				if( is_array( $debug_info ) ) {
-					$debug_info = wp_json_encode( $debug_info );
+		if ($this->_debug_mode && is_array($this->_debug_info)) {
+			foreach ($this->_debug_info  as $debug_key => $debug_info) {
+				if (is_array($debug_info)) {
+					$debug_info = wp_json_encode($debug_info);
 				}
-				$headers[ 'X-EE4-Debug-' . ucwords( $debug_key ) ] = $debug_info;
+				$headers['X-EE4-Debug-'.ucwords($debug_key)] = $debug_info;
 			}
 		}
 		$headers = array_merge(
@@ -160,7 +160,7 @@ 
 			$this->_get_headers_from_ee_notices()
 		);
 
-		$rest_response->set_headers( $headers );
+		$rest_response->set_headers($headers);
 		return $rest_response;
 	}
 
@@ -171,31 +171,31 @@ 
 	 * @param \WP_Error $wp_error
 	 * @return \WP_REST_Response
 	 */
-	protected function _create_rest_response_from_wp_error( \WP_Error $wp_error ) {
+	protected function _create_rest_response_from_wp_error(\WP_Error $wp_error) {
 		$error_data = $wp_error->get_error_data();
-		if ( is_array( $error_data ) && isset( $error_data['status'] ) ) {
+		if (is_array($error_data) && isset($error_data['status'])) {
 			$status = $error_data['status'];
 		} else {
 			$status = 500;
 		}
 
 		$errors = array();
-		foreach ( (array) $wp_error->errors as $code => $messages ) {
-			foreach ( (array) $messages as $message ) {
+		foreach ((array) $wp_error->errors as $code => $messages) {
+			foreach ((array) $messages as $message) {
 				$errors[] = array(
 					'code'    => $code,
 					'message' => $message,
-					'data'    => $wp_error->get_error_data( $code )
+					'data'    => $wp_error->get_error_data($code)
 				);
 			}
 		}
-		$data = isset( $errors[0] ) ? $errors[0] : array();
-		if ( count( $errors ) > 1 ) {
+		$data = isset($errors[0]) ? $errors[0] : array();
+		if (count($errors) > 1) {
 			// Remove the primary error.
-			array_shift( $errors );
+			array_shift($errors);
 			$data['additional_errors'] = $errors;
 		}
-		return new \WP_REST_Response( $data, $status );
+		return new \WP_REST_Response($data, $status);
 	}
 
 	/**
@@ -205,12 +205,12 @@ 
 	protected function _get_headers_from_ee_notices() {
 		$headers = array();
 		$notices = \EE_Error::get_raw_notices();
-		foreach( $notices as $notice_type => $sub_notices ) {
-			if( ! is_array( $sub_notices ) ) {
+		foreach ($notices as $notice_type => $sub_notices) {
+			if ( ! is_array($sub_notices)) {
 				continue;
 			}
-			foreach( $sub_notices as $notice_code => $sub_notice ) {
-				$headers[ 'X-EE4-Notices-' . \EEH_Inflector::humanize( $notice_type ) . '[' . $notice_code . ']' ] = strip_tags( $sub_notice );
+			foreach ($sub_notices as $notice_code => $sub_notice) {
+				$headers['X-EE4-Notices-'.\EEH_Inflector::humanize($notice_type).'['.$notice_code.']'] = strip_tags($sub_notice);
 			}
 		}
 		return apply_filters(
@@ -228,14 +228,14 @@ 
 	 * @param string $route
 	 * @return string
 	 */
-	public function get_requested_version( $route = null ) {
+	public function get_requested_version($route = null) {
 		$matches = $this->parse_route(
 			$route,
-			'~' . \EED_Core_Rest_Api::ee_api_namespace_for_regex . '~',
-			array( 'version' )
+			'~'.\EED_Core_Rest_Api::ee_api_namespace_for_regex.'~',
+			array('version')
 			);
-		if( isset( $matches[ 'version' ] ) ) {
-			return $matches[ 'version' ];
+		if (isset($matches['version'])) {
+			return $matches['version'];
 		} else {
 			return \EED_Core_Rest_Api::latest_rest_api_version();
 		}
@@ -260,23 +260,23 @@ 
 	 * array( 'model' => 'foo', 'id' => 'bar' )
 	 * @throws \EE_Error if it couldn't be parsed
 	 */
-	public function parse_route( $route, $regex, $match_keys ) {
+	public function parse_route($route, $regex, $match_keys) {
 		$indexed_matches = array();
-		$success = preg_match( $regex, $route, $matches );
-		if(
-			is_array( $matches ) ) {
+		$success = preg_match($regex, $route, $matches);
+		if (
+			is_array($matches) ) {
 			//skip the overall regex match. Who cares
-			for( $i = 1; $i <= count( $match_keys ); $i++ ) {
-				if( ! isset( $matches[ $i ] ) ) {
+			for ($i = 1; $i <= count($match_keys); $i++) {
+				if ( ! isset($matches[$i])) {
 					$success = false;
 				} else {
-					$indexed_matches[ $match_keys[ $i - 1 ] ] = $matches[ $i ];
+					$indexed_matches[$match_keys[$i - 1]] = $matches[$i];
 				}
 			}
 		}
-		if( ! $success ) {
+		if ( ! $success) {
 			throw new \EE_Error(
-				__( 'We could not parse the URL. Please contact Event Espresso Support', 'event_espresso' ),
+				__('We could not parse the URL. Please contact Event Espresso Support', 'event_espresso'),
 				'endpoint_parsing_error'
 			);
 		}