eventespresso / event-espresso-core

core/libraries/messages/data_class/EE_Messages_Preview_incoming_data.class.php

Spacing +84 added lines, -84 removed lines

@@ -1,6 +1,6 @@ 
 <?php
 
-if (!defined('EVENT_ESPRESSO_VERSION') )
+if ( ! defined('EVENT_ESPRESSO_VERSION'))
 	exit('NO direct script access allowed');
 
 /**
@@ -29,8 +29,8 @@ 
 	 * For the constructor of this special preview class.  We're either looking for an event id or empty data.  If we have an event id (or ids) then we'll use that as the source for the "dummy" data.  If the data is empty then we'll get the first three published events from the users database and use that as a source.
 	 * @param array $data
 	 */
-	public function __construct( $data = array() ) {
-		$this->_data = isset( $data['event_ids'] ) ? $data['event_ids'] : array();
+	public function __construct($data = array()) {
+		$this->_data = isset($data['event_ids']) ? $data['event_ids'] : array();
 		$this->_setup_attendees_events();
 		parent::__construct($data);
 	}
@@ -46,7 +46,7 @@ 
 	 *
 	 * @return array   The prepped data for db
 	 */
-	static public function convert_data_for_persistent_storage( $data ) {
+	static public function convert_data_for_persistent_storage($data) {
 		return $data;
 	}
 
@@ -61,7 +61,7 @@ 
 	 *
 	 * @return array
 	 */
-	static public function convert_data_from_persistent_storage( $data ) {
+	static public function convert_data_from_persistent_storage($data) {
 		return $data;
 	}
 
@@ -78,12 +78,12 @@ 
 		$attendees = $this->_get_some_attendees();
 
 		//if empty $data we'll do a query to get some events from the server. otherwise we'll retrieve the event data for the given ids.
-		$events = $this->_get_some_events( $this->_data );
+		$events = $this->_get_some_events($this->_data);
 
 		$answers_n_questions = $this->_get_some_q_and_as();
 
-		if ( count( $events ) < 1 ) {
-			throw new EE_Error( __('We can\'t generate a preview for you because there are no active events in your database', 'event_espresso' ) );
+		if (count($events) < 1) {
+			throw new EE_Error(__('We can\'t generate a preview for you because there are no active events in your database', 'event_espresso'));
 		}
 
 
@@ -93,14 +93,14 @@ 
 
 		//we'll actually use the generated line_item identifiers for our loop
 		$dtts = $tkts = array();
-		foreach( $events as $id => $event ) {
-			if ( ! $event instanceof EE_Event ) {
+		foreach ($events as $id => $event) {
+			if ( ! $event instanceof EE_Event) {
 				continue;
 			}
 			$this->_events[$id]['ID'] = $id;
 			$this->_events[$id]['name'] = $event->get('EVT_name');
 			$datetime = $event->get_first_related('Datetime');
-			$tickets = $datetime instanceof EE_Datetime ? $datetime->get_many_related('Ticket', array('default_where_conditions' => 'none') ) : array();
+			$tickets = $datetime instanceof EE_Datetime ? $datetime->get_many_related('Ticket', array('default_where_conditions' => 'none')) : array();
 			$this->_events[$id]['event'] = $event;
 			$this->_events[$id]['reg_objs'] = array();
 			$this->_events[$id]['tkt_objs'] = $tickets;
@@ -108,51 +108,51 @@ 
 
 			$dttcache = array();
 			$tkts = array();
-			foreach ( $tickets as $ticket ) {
-				if ( ! $ticket instanceof EE_Ticket ) {
+			foreach ($tickets as $ticket) {
+				if ( ! $ticket instanceof EE_Ticket) {
 					continue;
 				}
 				$reldatetime = $ticket->datetimes();
-				$tkts[ $ticket->ID() ] = array();
-				$tkts[ $ticket->ID() ][ 'ticket' ] = $ticket;
-				$tkts[ $ticket->ID() ][ 'dtt_objs' ] = $reldatetime;
-				$tkts[ $ticket->ID() ][ 'att_objs' ] = $attendees;
-				$tkts[ $ticket->ID() ][ 'count' ] = count( $attendees );
-				$tkts[ $ticket->ID() ][ 'EE_Event' ] = $event;
-				foreach ( $reldatetime as $datetime ) {
-					if ( $datetime instanceof EE_Datetime && ! isset( $dtts[ $datetime->ID() ] ) ) {
-						$this->_events[ $id ][ 'dtt_objs' ][ $datetime->ID() ] = $datetime;
-						$dtts[ $datetime->ID() ][ 'datetime' ] = $datetime;
-						$dtts[ $datetime->ID() ][ 'tkt_objs' ][] = $ticket;
-						$dtts[ $datetime->ID() ][ 'evt_objs' ][] = $event;
-						$dttcache[ $datetime->ID() ] = $datetime;
+				$tkts[$ticket->ID()] = array();
+				$tkts[$ticket->ID()]['ticket'] = $ticket;
+				$tkts[$ticket->ID()]['dtt_objs'] = $reldatetime;
+				$tkts[$ticket->ID()]['att_objs'] = $attendees;
+				$tkts[$ticket->ID()]['count'] = count($attendees);
+				$tkts[$ticket->ID()]['EE_Event'] = $event;
+				foreach ($reldatetime as $datetime) {
+					if ($datetime instanceof EE_Datetime && ! isset($dtts[$datetime->ID()])) {
+						$this->_events[$id]['dtt_objs'][$datetime->ID()] = $datetime;
+						$dtts[$datetime->ID()]['datetime'] = $datetime;
+						$dtts[$datetime->ID()]['tkt_objs'][] = $ticket;
+						$dtts[$datetime->ID()]['evt_objs'][] = $event;
+						$dttcache[$datetime->ID()] = $datetime;
 					}
 				}
 			}
 
-			$this->_events[$id]['total_attendees'] = count( $attendees );
+			$this->_events[$id]['total_attendees'] = count($attendees);
 			$this->_events[$id]['att_objs'] = $attendees;
 
 			//let's also setup the dummy attendees property!
-			foreach ( $attendees as $att_key => $attendee ) {
-				if ( ! $attendee instanceof EE_Attendee ) {
+			foreach ($attendees as $att_key => $attendee) {
+				if ( ! $attendee instanceof EE_Attendee) {
 					continue;
 				}
-				$this->_attendees[$att_key]['line_ref'][] = $id;  //so later it can be determined what events this attendee registered for!
+				$this->_attendees[$att_key]['line_ref'][] = $id; //so later it can be determined what events this attendee registered for!
 				$this->_attendees[$att_key]['evt_objs'][] = $event;
 				$this->_attendees[$att_key]['att_obj'] = $attendee;
 				//$this->_attendees[$att_key]['registration_id'] = 0;
 				$this->_attendees[$att_key]['attendee_email'] = $attendee->email();
 				$this->_attendees[$att_key]['tkt_objs'] = $tickets;
-				if ( $att_key == 999999991 ) {
+				if ($att_key == 999999991) {
 					$this->_attendees[$att_key]['ans_objs'][999] = $answers_n_questions['answers'][999];
 					$this->_attendees[$att_key]['ans_objs'][1002] = $answers_n_questions['answers'][1002];
 					$this->_attendees[$att_key]['ans_objs'][1005] = $answers_n_questions['answers'][1005];
-				} elseif ( $att_key == 999999992 ) {
+				} elseif ($att_key == 999999992) {
 					$this->_attendees[$att_key]['ans_objs'][1000] = $answers_n_questions['answers'][1000];
 					$this->_attendees[$att_key]['ans_objs'][1003] = $answers_n_questions['answers'][1003];
 					$this->_attendees[$att_key]['ans_objs'][1006] = $answers_n_questions['answers'][1006];
-				} elseif ( $att_key == 999999993 ) {
+				} elseif ($att_key == 999999993) {
 					$this->_attendees[$att_key]['ans_objs'][1001] = $answers_n_questions['answers'][1001];
 					$this->_attendees[$att_key]['ans_objs'][1004] = $answers_n_questions['answers'][1004];
 					$this->_attendees[$att_key]['ans_objs'][1007] = $answers_n_questions['answers'][1007];
@@ -225,11 +225,11 @@ 
 
 		//let's generate the attendee objects
 		$attendees = array();
-		$var_array = array('fname','lname','email','address','address2','city','staid','cntry','zip','phone','deleted','attid');
+		$var_array = array('fname', 'lname', 'email', 'address', 'address2', 'city', 'staid', 'cntry', 'zip', 'phone', 'deleted', 'attid');
 
 		//EE_Registry::instance()->load_class( 'Attendee', array(), FALSE, false, TRUE );
-		foreach ( $dummy_attendees as $dummy ) {
-			$att = array_combine( $var_array, $dummy );
+		foreach ($dummy_attendees as $dummy) {
+			$att = array_combine($var_array, $dummy);
 			extract($att);
 			/** @var $fname string */
 			/** @var $lname string */
@@ -346,15 +346,15 @@ 
 
 		$qsts = array();
 		//first the questions
-		foreach ( $quests_array as $qst ) {
-			$qstobj = array_combine( $qst_columns, $qst );
+		foreach ($quests_array as $qst) {
+			$qstobj = array_combine($qst_columns, $qst);
 			$qsts[$qstobj['QST_ID']] = EE_Question::new_instance($qstobj);
 		}
 
 		//now the answers (and we'll setup our arrays)
 		$q_n_as = array();
-		foreach ( $ans_array as $ans ) {
-			$ansobj = array_combine( $ans_columns, $ans );
+		foreach ($ans_array as $ans) {
+			$ansobj = array_combine($ans_columns, $ans);
 			$ansobj = EE_Answer::new_instance($ansobj);
 			$q_n_as['answers'][$ansobj->ID()] = $ansobj;
 			$q_n_as['questions'][$ansobj->ID()] = $qsts[$ansobj->get('QST_ID')];
@@ -376,25 +376,25 @@ 
 	 * @param  array  $event_ids if set, this will be an array of event ids to obtain events for.
 	 * @return array    An array of event objects from the db.
 	 */
-	private function _get_some_events( $event_ids = array() ) {
+	private function _get_some_events($event_ids = array()) {
 
 		//HEY, if we have an evt_id then we want to make sure we use that for the preview (because a specific event template is being viewed);
-		$event_ids = isset( $_REQUEST['evt_id'] ) && !empty( $_REQUEST['evt_id'] )
-			? array( $_REQUEST['evt_id'] )
+		$event_ids = isset($_REQUEST['evt_id']) && ! empty($_REQUEST['evt_id'])
+			? array($_REQUEST['evt_id'])
 			: $event_ids;
 
-		$limit = !empty( $event_ids )
+		$limit = ! empty($event_ids)
 			? NULL
-			: apply_filters( 'FHEE__EE_Messages_Preview_incoming_data___get_some_events__limit', '0,1' );
+			: apply_filters('FHEE__EE_Messages_Preview_incoming_data___get_some_events__limit', '0,1');
 
-		$where = ! empty( $event_ids )
+		$where = ! empty($event_ids)
 			? array(
-				'EVT_ID' => array( 'IN', $event_ids ),
-				'Datetime.Ticket.TKT_ID' => array( '>', 1 )
+				'EVT_ID' => array('IN', $event_ids),
+				'Datetime.Ticket.TKT_ID' => array('>', 1)
 			)
-			: array( 'Datetime.Ticket.TKT_ID' => array( '>', 1 ) );
+			: array('Datetime.Ticket.TKT_ID' => array('>', 1));
 
-		$events = EE_Registry::instance()->load_model('Event')->get_all(array($where, 'limit' => $limit ) );
+		$events = EE_Registry::instance()->load_model('Event')->get_all(array($where, 'limit' => $limit));
 
 		return $events;
 	}
@@ -407,17 +407,17 @@ 
 	protected function _setup_data() {
 
 		//need to figure out the running total for test purposes so... we're going to create a temp cart and add the tickets to it!
-		if ( EE_Registry::instance()->SSN instanceof EE_Session ) {
-			EE_Registry::instance()->SSN->clear_session( __CLASS__, __FUNCTION__ );
+		if (EE_Registry::instance()->SSN instanceof EE_Session) {
+			EE_Registry::instance()->SSN->clear_session(__CLASS__, __FUNCTION__);
 			$session = EE_Registry::instance()->SSN;
 		} else {
-			$session = EE_Registry::instance()->load_core( 'Session' );
+			$session = EE_Registry::instance()->load_core('Session');
 		}
-		$cart = EE_Cart::instance( null, $session );
+		$cart = EE_Cart::instance(null, $session);
 
 
 		//add tickets to cart
-		foreach ( $this->tickets as $ticket ) {
+		foreach ($this->tickets as $ticket) {
 			$cart->add_ticket_to_cart($ticket['ticket']);
 		}
 
@@ -441,14 +441,14 @@ 
 		//note we're setting up a reg object for each attendee in each event but ALSO adding to the reg_object array.
 		$this->reg_objs = array();
 		$regid = 9999990;
-		foreach ( $this->_attendees as $key => $attendee ) {
+		foreach ($this->_attendees as $key => $attendee) {
 			//note we need to setup reg_objects for each event this attendee belongs to
 			$regatt = $attendee['att_obj'] instanceof EE_Attendee ? $attendee['att_obj']->ID() : null;
 			$regtxn = $this->txn->ID();
 			$regcnt = 1;
-			foreach ( $attendee['line_ref'] as $evtid ) {
-				foreach ( $this->_events[$evtid]['tkt_objs'] as $ticket ) {
-					if ( ! $ticket instanceof EE_Ticket ) {
+			foreach ($attendee['line_ref'] as $evtid) {
+				foreach ($this->_events[$evtid]['tkt_objs'] as $ticket) {
+					if ( ! $ticket instanceof EE_Ticket) {
 						continue;
 					}
 					$reg_array = array(
@@ -460,14 +460,14 @@ 
 						'REG_date' => time(),
 						'REG_final_price' => $ticket->get('TKT_price'),
 						'REG_session' => 'dummy_session_id',
-						'REG_code' => $regid . '-dummy-generated-code',
-						'REG_url_link' => $regcnt . '-daafpapasdlfakasdfpqasdfasdf',
+						'REG_code' => $regid.'-dummy-generated-code',
+						'REG_url_link' => $regcnt.'-daafpapasdlfakasdfpqasdfasdf',
 						'REG_count' => $regcnt,
 						'REG_group_size' => $this->_events[$evtid]['total_attendees'],
 						'REG_att_is_going' => TRUE,
 						'REG_ID' => $regid
 					);
-					$REG_OBJ =  EE_Registration::new_instance( $reg_array );
+					$REG_OBJ = EE_Registration::new_instance($reg_array);
 					$this->_attendees[$key]['reg_objs'][$regid] = $REG_OBJ;
 					$this->_events[$evtid]['reg_objs'][] = $REG_OBJ;
 					$this->reg_objs[] = $REG_OBJ;
@@ -483,40 +483,40 @@ 
 
 		//setup line items!
 		EE_Registry::instance()->load_helper('Line_Item');
-		$line_item_total = EEH_Line_Item::create_total_line_item( $this->txn );
+		$line_item_total = EEH_Line_Item::create_total_line_item($this->txn);
 
 		//add tickets
-		foreach ( $this->tickets as $tktid => $item ) {
+		foreach ($this->tickets as $tktid => $item) {
 			$qty = $item['count'];
 			$ticket = $item['ticket'];
-			EEH_Line_Item::add_ticket_purchase( $line_item_total, $ticket, $qty );
+			EEH_Line_Item::add_ticket_purchase($line_item_total, $ticket, $qty);
 		}
 
-		$shipping_line_item = EE_Line_Item::new_instance( array(
-			'LIN_name' => __( 'Shipping Surcharge', 'event_espresso' ),
-			'LIN_desc' => __( 'Sent via Millenium Falcon', 'event_espresso' ),
+		$shipping_line_item = EE_Line_Item::new_instance(array(
+			'LIN_name' => __('Shipping Surcharge', 'event_espresso'),
+			'LIN_desc' => __('Sent via Millenium Falcon', 'event_espresso'),
 			'LIN_unit_price' => 20,
 			'LIN_quantity' => 1,
 			'LIN_is_taxable' => TRUE,
 			'LIN_total' => 20,
 			'LIN_type' => EEM_Line_Item::type_line_item
 		));
-		EEH_Line_Item::add_item($line_item_total, $shipping_line_item );
-		$this->additional_line_items = array( $shipping_line_item );
+		EEH_Line_Item::add_item($line_item_total, $shipping_line_item);
+		$this->additional_line_items = array($shipping_line_item);
 
 		//now let's add taxes
-		EEH_Line_Item::apply_taxes( $line_item_total );
+		EEH_Line_Item::apply_taxes($line_item_total);
 
 		//now we should be able to get the items we need from this object
-		$event_line_items = EEH_Line_Item::get_pre_tax_subtotal( $line_item_total )->children();
+		$event_line_items = EEH_Line_Item::get_pre_tax_subtotal($line_item_total)->children();
 		$line_items = array();
-		foreach ( $event_line_items as $line_id => $line_item ) {
-			if ( ! $line_item instanceof EE_Line_Item || $line_item->OBJ_type() !== 'Event' ) {
+		foreach ($event_line_items as $line_id => $line_item) {
+			if ( ! $line_item instanceof EE_Line_Item || $line_item->OBJ_type() !== 'Event') {
 				continue;
 			}
-			$ticket_line_items = EEH_Line_Item::get_ticket_line_items( $line_item );
-			foreach ( $ticket_line_items as $ticket_line_id => $ticket_line_item ) {
-				if ( ! $ticket_line_item instanceof EE_Line_Item ) {
+			$ticket_line_items = EEH_Line_Item::get_ticket_line_items($line_item);
+			foreach ($ticket_line_items as $ticket_line_id => $ticket_line_item) {
+				if ( ! $ticket_line_item instanceof EE_Line_Item) {
 					continue;
 				}
 				$this->tickets[$ticket_line_item->OBJ_ID()]['line_item'] = $ticket_line_item;
@@ -532,12 +532,12 @@ 
 		//add proper total to transaction object.
 		$grand_total = $line_item_total->recalculate_total_including_taxes();
 		$this->grand_total_line_item = $line_item_total;
-		$this->txn->set_total( $grand_total );
+		$this->txn->set_total($grand_total);
 
 
 		//add additional details for each registration
-		foreach ( $this->reg_objs as $reg ) {
-			if ( ! $reg instanceof EE_Registration ) {
+		foreach ($this->reg_objs as $reg) {
+			if ( ! $reg instanceof EE_Registration) {
 				continue;
 			}
 			$this->_registrations[$reg->ID()]['tkt_obj'] = $this->tickets[$reg->get('TKT_ID')]['ticket'];
@@ -562,17 +562,17 @@ 
 				? $this->_attendees[999999991]['att_obj']->fname()
 				: '',
 
-			'lname' => $this->_attendees[ 999999991 ][ 'att_obj' ] instanceof EE_Attendee
+			'lname' => $this->_attendees[999999991]['att_obj'] instanceof EE_Attendee
 				? $this->_attendees[999999991]['att_obj']->lname()
 				: '',
 
-			'email' => $this->_attendees[ 999999991 ][ 'att_obj' ] instanceof EE_Attendee
+			'email' => $this->_attendees[999999991]['att_obj'] instanceof EE_Attendee
 				? $this->_attendees[999999991]['att_obj']->email()
 				: '',
 
 			'att_obj' => $this->_attendees[999999991]['att_obj'],
 
-			'reg_obj' => array_shift( $attendees_to_shift[999999991]['reg_objs'] )
+			'reg_obj' => array_shift($attendees_to_shift[999999991]['reg_objs'])
 		);
 
 		//reg_info property
@@ -580,7 +580,7 @@ 
 		$this->reg_info = array();
 
 		//let's set a reg_obj for messengers expecting one.
-		$this->reg_obj = array_pop( $this->_attendees[999999991]['reg_objs'] );
+		$this->reg_obj = array_pop($this->_attendees[999999991]['reg_objs']);
 
 
 		//the below are just dummy items.

core/libraries/messages/data_class/EE_Messages_REG_incoming_data.class.php

Spacing +23 added lines, -23 removed lines

@@ -1,6 +1,6 @@ 
 <?php
 
-if (!defined('EVENT_ESPRESSO_VERSION') )
+if ( ! defined('EVENT_ESPRESSO_VERSION'))
 	exit('NO direct script access allowed');
 
 /**
@@ -29,20 +29,20 @@ 
 	 * @param EE_Registration|array $data
 	 * @throws \EE_Error
 	 */
-	public function __construct( $data ) {
+	public function __construct($data) {
 		$filtered_reg_status = null;
 
-		if ( ! is_array( $data ) && $data instanceof EE_Registration ) {
+		if ( ! is_array($data) && $data instanceof EE_Registration) {
 			$this->reg_obj = $data;
 		} else {
-			$this->reg_obj = is_array( $data ) && isset( $data[0] ) && $data[0] instanceof EE_Registration ? $data[0] : null;
-			$filtered_reg_status = is_array( $data ) && ! empty( $data[1] ) ? $data[1] : null;
+			$this->reg_obj = is_array($data) && isset($data[0]) && $data[0] instanceof EE_Registration ? $data[0] : null;
+			$filtered_reg_status = is_array($data) && ! empty($data[1]) ? $data[1] : null;
 		}
 
-		if ( ! $this->reg_obj instanceof EE_Registration ) {
+		if ( ! $this->reg_obj instanceof EE_Registration) {
 			throw new EE_Error(
 				sprintf(
-					__( '%1$s requires the incoming data argument to be an instance of %2$s or an array where the first value is an instance of %2$s', 'event_espresso'),
+					__('%1$s requires the incoming data argument to be an instance of %2$s or an array where the first value is an instance of %2$s', 'event_espresso'),
 					'EE_Messages_REG_incoming_data',
 					'EE_Registration'
 				)
@@ -64,18 +64,18 @@ 
 	 *
 	 * @return array   The prepped data for db
 	 */
-	static public function convert_data_for_persistent_storage( $data ) {
+	static public function convert_data_for_persistent_storage($data) {
 		$prepped_data = array();
-		if ( ! is_array( $data ) && $data instanceof EE_Registration ) {
+		if ( ! is_array($data) && $data instanceof EE_Registration) {
 			$prepped_data['Registration'] = $data->ID();
 			return $prepped_data;
-		} elseif ( ! is_array( $data ) ) {
+		} elseif ( ! is_array($data)) {
 			return array();
 		} else {
-			if ( $data[0] instanceof EE_Registration ) {
+			if ($data[0] instanceof EE_Registration) {
 				$prepped_data['Registration'] = $data[0];
 			}
-			if ( ! empty( $data[1] ) ) {
+			if ( ! empty($data[1])) {
 				$prepped_data['filter'] = $data[1];
 			}
 		}
@@ -91,17 +91,17 @@ 
 	 *
 	 * @return mixed
 	 */
-	static public function convert_data_from_persistent_storage( $data ) {
+	static public function convert_data_from_persistent_storage($data) {
 		$registration = null;
 		//$data['Registration'] could be either an ID (back compat) or a registration object (prepped using old system).
-		if ( isset( $data[ 'Registration' ] ) ) {
-			$registration = $data[ 'Registration' ] instanceof EE_Registration
-				? $data[ 'Registration' ]
-				: EEM_Registration::instance()->get_one_by_ID( $data[ 'Registration' ] );
+		if (isset($data['Registration'])) {
+			$registration = $data['Registration'] instanceof EE_Registration
+				? $data['Registration']
+				: EEM_Registration::instance()->get_one_by_ID($data['Registration']);
 		}
 		$prepped_data = array(
 			0 => $registration,
-			1 => isset( $data['filter'] ) ? $data['filter'] : null
+			1 => isset($data['filter']) ? $data['filter'] : null
 		);
 		return $prepped_data;
 	}
@@ -119,18 +119,18 @@ 
 		$this->txn = $this->reg_obj->transaction();
 		//possible session stuff?
 		$session = $this->txn->session_data();
-		$session_data =  $session instanceof EE_Session ? $session->get_session_data() : array();
+		$session_data = $session instanceof EE_Session ? $session->get_session_data() : array();
 
 		//other data from the session (if possible)
-		$this->user_id = isset( $session_data['user_id'] ) ? $session_data['user_id'] : '';
-		$this->ip_address = isset( $session_data['ip_address'] ) ? $session_data['ip_address'] : '';
-		$this->user_agent = isset( $session_data['user_agent'] ) ? $session_data['user_agent'] : '';
+		$this->user_id = isset($session_data['user_id']) ? $session_data['user_id'] : '';
+		$this->ip_address = isset($session_data['ip_address']) ? $session_data['ip_address'] : '';
+		$this->user_agent = isset($session_data['user_agent']) ? $session_data['user_agent'] : '';
 		$this->init_access = $this->last_access = '';
 
 		$this->payment = $this->txn->get_first_related('Payment');
 		// if there is no payments associated with the transaction
 		// then we just create a default payment object for potential parsing.
-		$this->payment = empty( $this->payment )
+		$this->payment = empty($this->payment)
 			? EE_Payment::new_instance(
 				array(
 					'STS_ID'               => EEM_Payment::status_id_pending,

core/libraries/messages/defaults/EE_Messages_Template_Defaults.lib.php

Spacing +23 added lines, -23 removed lines

@@ -1,6 +1,6 @@ 
 <?php
-if ( ! defined( 'EVENT_ESPRESSO_VERSION' ) ) {
-	exit( 'NO direct script access allowed' );
+if ( ! defined('EVENT_ESPRESSO_VERSION')) {
+	exit('NO direct script access allowed');
 }
 
 /**
@@ -109,14 +109,14 @@ 
 	 *                              about where to obtain the templates.
 	 *
 	 */
-	final private function _set_templates( $template_pack ) {
+	final private function _set_templates($template_pack) {
 
 		//get the corresponding template pack object (if present.  If not then we just load the default and add a
 		//notice).  The class name should be something like 'EE_Messages_Template_Pack_Default' where "default' would be
 		//the incoming template pack reference.
-		$class_name = 'EE_Messages_Template_Pack_' . str_replace( ' ', '_', ucwords( str_replace( '_', ' ', $template_pack ) ) );
+		$class_name = 'EE_Messages_Template_Pack_'.str_replace(' ', '_', ucwords(str_replace('_', ' ', $template_pack)));
 
-		if ( ! class_exists( $class_name ) ) {
+		if ( ! class_exists($class_name)) {
 			EE_Error::add_error(
 				sprintf(
 					__(
@@ -135,7 +135,7 @@ 
 		$template_pack = new $class_name;
 
 		//get all the templates from the template pack.
-		$this->_templates = $template_pack->get_templates( $this->_messenger, $this->_message_type );
+		$this->_templates = $template_pack->get_templates($this->_messenger, $this->_message_type);
 	}
 
 
@@ -159,15 +159,15 @@ 
 	public function create_new_templates() {
 		$template_pack = 'default';
 		//if we have the GRP_ID then let's use that to see if there is a set template pack and use that for the new templates.
-		if ( ! empty( $this->_GRP_ID ) ) {
-			$message_template_group = $this->_message_template_group_model->get_one_by_ID( $this->_GRP_ID );
+		if ( ! empty($this->_GRP_ID)) {
+			$message_template_group = $this->_message_template_group_model->get_one_by_ID($this->_GRP_ID);
 			$template_pack = $message_template_group instanceof EE_Message_Template_Group
 				? $message_template_group->get_template_pack_name()
 				: 'default';
 			//we also need to reset the template variation to default
-			$message_template_group->set_template_pack_variation( 'default' );
+			$message_template_group->set_template_pack_variation('default');
 		}
-		return $this->_create_new_templates( $template_pack );
+		return $this->_create_new_templates($template_pack);
 	}
 
 
@@ -181,12 +181,12 @@ 
 	 *                              which will contain information about where to obtain the templates.
 	 * @return mixed (array|bool) 	success array or false.
 	 */
-	protected function _create_new_templates( $template_pack ) {
+	protected function _create_new_templates($template_pack) {
 
-		$this->_set_templates( $template_pack );
+		$this->_set_templates($template_pack);
 
 		//necessary properties are set, let's save the default templates
-		if ( empty( $this->_GRP_ID ) ) {
+		if (empty($this->_GRP_ID)) {
 			$main_template_data = array(
 				'MTP_messenger'    => $this->_messenger->name,
 				'MTP_message_type' => $this->_message_type->name,
@@ -197,24 +197,24 @@ 
 				'MTP_is_active'    => 1,
 			);
 			//let's insert the above and get our GRP_ID, then reset the template data array to just include the GRP_ID
-			$grp_id = $this->_message_template_group_model->insert( $main_template_data );
-			if ( empty( $grp_id ) ) {
+			$grp_id = $this->_message_template_group_model->insert($main_template_data);
+			if (empty($grp_id)) {
 				return $grp_id;
 			}
 			$this->_GRP_ID = $grp_id;
 		}
 
-		$template_data = array( 'GRP_ID' => $this->_GRP_ID );
+		$template_data = array('GRP_ID' => $this->_GRP_ID);
 
-		foreach ( $this->_contexts as $context => $details ) {
-			foreach ( $this->_fields as $field => $field_type ) {
-				if ( $field != 'extra' ) {
+		foreach ($this->_contexts as $context => $details) {
+			foreach ($this->_fields as $field => $field_type) {
+				if ($field != 'extra') {
 					$template_data['MTP_context'] = $context;
 					$template_data['MTP_template_field'] = $field;
-					$template_data['MTP_content'] = $this->_templates[ $context ][ $field ];
+					$template_data['MTP_content'] = $this->_templates[$context][$field];
 
-					$MTP = $this->_message_template_model->insert( $template_data );
-					if ( ! $MTP ) {
+					$MTP = $this->_message_template_model->insert($template_data);
+					if ( ! $MTP) {
 						EE_Error::add_error(
 							sprintf(
 								__(
@@ -238,7 +238,7 @@ 
 
 		return array(
 			'GRP_ID'      => $this->_GRP_ID,
-			'MTP_context' => key( $this->_contexts )
+			'MTP_context' => key($this->_contexts)
 		);
 	}
 

core/libraries/messages/messenger/EE_Email_messenger.class.php

Spacing +52 added lines, -52 removed lines

@@ -1,6 +1,6 @@ 
 <?php
 
-if (!defined('EVENT_ESPRESSO_VERSION') )
+if ( ! defined('EVENT_ESPRESSO_VERSION'))
 	exit('NO direct script access allowed');
 
 /**
@@ -29,7 +29,7 @@ 
 /**
  * This sets up the email messenger for the EE_messages (notifications) subsystem in EE.
  */
-class EE_Email_messenger extends EE_messenger  {
+class EE_Email_messenger extends EE_messenger {
 
 	/**
 	 * The following are the properties that email requires for the message going out.
@@ -77,7 +77,7 @@ 
 	protected function _set_valid_shortcodes() {
 		//remember by leaving the other fields not set, those fields will inherit the valid shortcodes from the message type.
 		$this->_valid_shortcodes = array(
-			'to' => array('email','event_author', 'primary_registration_details', 'recipient_details'),
+			'to' => array('email', 'event_author', 'primary_registration_details', 'recipient_details'),
 			'from' => array('email', 'event_author', 'primary_registration_details', 'recipient_details')
 			);
 	}
@@ -111,7 +111,7 @@ 
 				'shortcodes' => array('organization', 'primary_registration_details', 'event_author', 'primary_registration_details', 'recipient_details')
 				),
 			'content' => array(
-				'shortcodes' => array('event_list','attendee_list', 'ticket_list', 'organization', 'primary_registration_details', 'primary_registration_list', 'event_author', 'recipient_details', 'recipient_list', 'transaction', 'messenger')
+				'shortcodes' => array('event_list', 'attendee_list', 'ticket_list', 'organization', 'primary_registration_details', 'primary_registration_list', 'event_author', 'recipient_details', 'recipient_list', 'transaction', 'messenger')
 				),
 			'attendee_list' => array(
 				'shortcodes' => array('attendee', 'event_list', 'ticket_list'),
@@ -122,7 +122,7 @@ 
 				'required' => array('[EVENT_LIST]')
 				),
 			'ticket_list' => array(
-				'shortcodes' => array('event_list', 'attendee_list', 'ticket', 'datetime_list','primary_registration_details', 'recipient_details'),
+				'shortcodes' => array('event_list', 'attendee_list', 'ticket', 'datetime_list', 'primary_registration_details', 'recipient_details'),
 				'required' => array('[TICKET_LIST]')
 				),
 			'datetime_list' => array(
@@ -141,21 +141,21 @@ 
 	 *
 	 * @since 4.5.0
 	 */
-	public function do_secondary_messenger_hooks( $sending_messenger_name ) {
-		if ( $sending_messenger_name = 'html' ) {
-			add_filter( 'FHEE__EE_Messages_Template_Pack__get_variation', array( $this, 'add_email_css' ), 10, 8 );
+	public function do_secondary_messenger_hooks($sending_messenger_name) {
+		if ($sending_messenger_name = 'html') {
+			add_filter('FHEE__EE_Messages_Template_Pack__get_variation', array($this, 'add_email_css'), 10, 8);
 		}
 	}
 
 
 
 
-	public function add_email_css( $variation_path, $messenger, $message_type, $type, $variation, $file_extension, $url, EE_Messages_Template_Pack $template_pack ) {
+	public function add_email_css($variation_path, $messenger, $message_type, $type, $variation, $file_extension, $url, EE_Messages_Template_Pack $template_pack) {
 		//prevent recursion on this callback.
-		remove_filter( 'FHEE__EE_Messages_Template_Pack__get_variation', array( $this, 'add_email_css' ), 10 );
-		$variation = $this->get_variation( $template_pack, $message_type, $url, 'main', $variation, FALSE  );
+		remove_filter('FHEE__EE_Messages_Template_Pack__get_variation', array($this, 'add_email_css'), 10);
+		$variation = $this->get_variation($template_pack, $message_type, $url, 'main', $variation, FALSE);
 
-		add_filter( 'FHEE__EE_Messages_Template_Pack__get_variation', array( $this, 'add_email_css' ), 10, 8 );
+		add_filter('FHEE__EE_Messages_Template_Pack__get_variation', array($this, 'add_email_css'), 10, 8);
 		return $variation;
 	}
 
@@ -187,7 +187,7 @@ 
 				'required' => FALSE,
 				'validation' => FALSE,
 				'format' => '%s',
-				'value' => sprintf( __('Test email sent from %s', 'event_espresso'), get_bloginfo('name') ),
+				'value' => sprintf(__('Test email sent from %s', 'event_espresso'), get_bloginfo('name')),
 				'default'=> '',
 				'css_class' => ''
 				)
@@ -349,16 +349,16 @@ 
 	 * @return bool | WP_Error  true if message delivered, false if it didn't deliver OR bubble up any error object if present.
 	 */
 	protected function _send_message() {
-		$success =  wp_mail(
-			html_entity_decode( $this->_to, ENT_QUOTES, "UTF-8" ),
-			stripslashes( html_entity_decode( $this->_subject, ENT_QUOTES, "UTF-8" )),
+		$success = wp_mail(
+			html_entity_decode($this->_to, ENT_QUOTES, "UTF-8"),
+			stripslashes(html_entity_decode($this->_subject, ENT_QUOTES, "UTF-8")),
 			$this->_body(),
 			$this->_headers()
 		);
-		if ( ! $success ) {
+		if ( ! $success) {
 			EE_Error::add_error(
 				sprintf(
-					__( 'The email did not send successfully.%3$sThe WordPress wp_mail function is used for sending mails but does not give any useful information when an email fails to send.%3$sIt is possible the "to" address (%1$s) or "from" address (%2$s) is invalid.%3$s', 'event_espresso'),
+					__('The email did not send successfully.%3$sThe WordPress wp_mail function is used for sending mails but does not give any useful information when an email fails to send.%3$sIt is possible the "to" address (%1$s) or "from" address (%2$s) is invalid.%3$s', 'event_espresso'),
 					$this->_to,
 					$this->_from,
 					'<br />'
@@ -377,7 +377,7 @@ 
 	 * @return string html body of the message content and the related css.
 	 */
 	protected function _preview() {
-		return $this->_body( true );
+		return $this->_body(true);
 	}
 
 
@@ -391,18 +391,18 @@ 
 	 * @return string formatted header for email
 	 */
 	protected function _headers() {
-		$from = stripslashes_deep( html_entity_decode($this->_from,  ENT_QUOTES,"UTF-8" ) );
+		$from = stripslashes_deep(html_entity_decode($this->_from, ENT_QUOTES, "UTF-8"));
 		$headers = array(
 			'MIME-Version: 1.0',
-			'From:' . $from,
-			'Reply-To:' . $from,
+			'From:'.$from,
+			'Reply-To:'.$from,
 			'Content-Type:text/html; charset=utf-8'
 			);
 
 		//but wait!  Header's for the from is NOT reliable because some plugins don't respect From: as set in the header.
-		add_filter( 'wp_mail_from',  array( $this, 'set_from_address' ), 100 );
-		add_filter( 'wp_mail_from_name', array( $this, 'set_from_name' ), 100 );
-		return apply_filters( 'FHEE__EE_Email_messenger___headers', $headers, $this->_incoming_message_type, $this );
+		add_filter('wp_mail_from', array($this, 'set_from_address'), 100);
+		add_filter('wp_mail_from_name', array($this, 'set_from_name'), 100);
+		return apply_filters('FHEE__EE_Email_messenger___headers', $headers, $this->_incoming_message_type, $this);
 	}
 
 
@@ -418,19 +418,19 @@ 
 	 * @return array
 	 */
 	private function _parse_from() {
-		if ( strpos( $this->_from, '<' ) !== false ) {
-			$from_name = substr( $this->_from, 0, strpos( $this->_from, '<' ) - 1 );
-			$from_name = str_replace( '"', '', $from_name );
-			$from_name = trim( $from_name );
-
-			$from_email = substr( $this->_from, strpos( $this->_from, '<' ) + 1 );
-			$from_email = str_replace( '>', '', $from_email );
-			$from_email = trim( $from_email );
+		if (strpos($this->_from, '<') !== false) {
+			$from_name = substr($this->_from, 0, strpos($this->_from, '<') - 1);
+			$from_name = str_replace('"', '', $from_name);
+			$from_name = trim($from_name);
+
+			$from_email = substr($this->_from, strpos($this->_from, '<') + 1);
+			$from_email = str_replace('>', '', $from_email);
+			$from_email = trim($from_email);
 		} else {
 			$from_name = '';
-			$from_email = trim( $this->_from );
+			$from_email = trim($this->_from);
 		}
-		return array( $from_name, $from_email );
+		return array($from_name, $from_email);
 	}
 
 
@@ -443,7 +443,7 @@ 
 	 *
 	 * @param string $from_email What the original from_email is.
 	 */
-	public function set_from_address( $from_email ) {
+	public function set_from_address($from_email) {
 		$parsed_from = $this->_parse_from();
 		return $parsed_from[1];
 	}
@@ -458,13 +458,13 @@ 
 	 *
 	 * @param string $from_name The original from_name.
 	 */
-	public function set_from_name( $from_name ) {
+	public function set_from_name($from_name) {
 		$parsed_from = $this->_parse_from();
-		if ( is_array( $parsed_from) && ! empty( $parsed_from[0] ) ) {
-			$from_name =  $parsed_from[0];
+		if (is_array($parsed_from) && ! empty($parsed_from[0])) {
+			$from_name = $parsed_from[0];
 		}
 
-		return stripslashes_deep( html_entity_decode($from_name,  ENT_QUOTES,"UTF-8" ) );
+		return stripslashes_deep(html_entity_decode($from_name, ENT_QUOTES, "UTF-8"));
 	}
 
 
@@ -475,14 +475,14 @@ 
 	 * @param bool $preview will determine whether this is preview template or not.
 	 * @return string formatted body for email.
 	 */
-	protected function _body( $preview = false ) {
+	protected function _body($preview = false) {
 		//setup template args!
 		$this->_template_args = array(
 			'subject' => $this->_subject,
 			'from' => $this->_from,
-			'main_body' => wpautop(stripslashes_deep( html_entity_decode($this->_content,  ENT_QUOTES,"UTF-8" ) ))
+			'main_body' => wpautop(stripslashes_deep(html_entity_decode($this->_content, ENT_QUOTES, "UTF-8")))
 			);
-		$body =  $this->_get_main_template( $preview );
+		$body = $this->_get_main_template($preview);
 
 		/**
 		 * This filter allows one to bypass the CSSToInlineStyles tool and leave the body untouched.
@@ -490,17 +490,17 @@ 
 		 * @type    bool    $preview    Indicates whether a preview is being generated or not.
 		 * @return  bool    true  indicates to use the inliner, false bypasses it.
 		 */
-		if ( apply_filters( 'FHEE__EE_Email_messenger__apply_CSSInliner ', true, $preview ) ) {
+		if (apply_filters('FHEE__EE_Email_messenger__apply_CSSInliner ', true, $preview)) {
 
 			//require CssToInlineStyles library and its dependencies via composer autoloader
-			require_once EE_THIRD_PARTY . 'cssinliner/vendor/autoload.php';
+			require_once EE_THIRD_PARTY.'cssinliner/vendor/autoload.php';
 
 			//now if this isn't a preview, let's setup the body so it has inline styles
-			if ( ! $preview || ( $preview && defined( 'DOING_AJAX' ) ) ) {
-				$style = file_get_contents( $this->get_variation( $this->_tmp_pack, $this->_incoming_message_type->name, FALSE, 'main', $this->_variation ), TRUE );
-				$CSS = new TijsVerkoyen\CssToInlineStyles\CssToInlineStyles( $body, $style );
-				$body = ltrim( $CSS->convert( true ), ">\n" ); //for some reason the library has a bracket and new line at the beginning.  This takes care of that.
-				$body = ltrim( $body, "<?" ); //see https://events.codebasehq.com/projects/event-espresso/tickets/8609
+			if ( ! $preview || ($preview && defined('DOING_AJAX'))) {
+				$style = file_get_contents($this->get_variation($this->_tmp_pack, $this->_incoming_message_type->name, FALSE, 'main', $this->_variation), TRUE);
+				$CSS = new TijsVerkoyen\CssToInlineStyles\CssToInlineStyles($body, $style);
+				$body = ltrim($CSS->convert(true), ">\n"); //for some reason the library has a bracket and new line at the beginning.  This takes care of that.
+				$body = ltrim($body, "<?"); //see https://events.codebasehq.com/projects/event-espresso/tickets/8609
 			}
 
 		}
@@ -519,8 +519,8 @@ 
 	public function get_existing_test_settings() {
 		$settings = parent::get_existing_test_settings();
 		//override subject if present because we always want it to be fresh.
-		if ( is_array( $settings ) && ! empty( $settings['subject'] ) ) {
-			$settings['subject'] = sprintf( __('Test email sent from %s', 'event_espresso'), get_bloginfo('name') );
+		if (is_array($settings) && ! empty($settings['subject'])) {
+			$settings['subject'] = sprintf(__('Test email sent from %s', 'event_espresso'), get_bloginfo('name'));
 		}
 		return $settings;
 	}

core/libraries/shortcodes/EE_Shortcodes.lib.php

Braces +9 added lines, -5 removed lines

@@ -1,7 +1,8 @@ 
 <?php
 
-if (!defined('EVENT_ESPRESSO_VERSION') )
+if (!defined('EVENT_ESPRESSO_VERSION') ) {
 	exit('NO direct script access allowed');
+}
 
 /**
  * Event Espresso
@@ -197,8 +198,10 @@ 
 		$sc_to_verify = !empty($matches[0] ) ? $matches[0][0] . ']' : $shortcode;
 
 		//first we want to make sure this is a valid shortcode
-		if ( !array_key_exists($sc_to_verify, $this->_shortcodes ) )
-			return false; //get out, this parser doesn't handle the incoming shortcode.
+		if ( !array_key_exists($sc_to_verify, $this->_shortcodes ) ) {
+					return false;
+		}
+		//get out, this parser doesn't handle the incoming shortcode.
 		$this->_data = $data;
 		$this->_extra_data = $extra_data;
 		$this->_set_messages_properties();
@@ -276,8 +279,9 @@ 
 		}
 
 		//next test to make sure we've got got a data index in the incoming data array
-		if ( !isset( $this->_data['data'] ) )
-			throw new EE_Error( __('The incoming data does not have the required data index in its array', 'event_espresso') );
+		if ( !isset( $this->_data['data'] ) ) {
+					throw new EE_Error( __('The incoming data does not have the required data index in its array', 'event_espresso') );
+		}
 
 		//all is well let's make sure _extra_data always has the values needed.
 		//let's make sure that extra_data includes all templates (for later parsing if necessary)

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');
 
 /**
@@ -171,7 +171,7 @@ 
 
 
 	public function get_shortcode_helper() {
-		if ( ! $this->_shortcode_helper instanceof EEH_Parse_Shortcodes ) {
+		if ( ! $this->_shortcode_helper instanceof EEH_Parse_Shortcodes) {
 			$this->_set_shortcode_helper();
 		}
 		return $this->_shortcode_helper;
@@ -185,25 +185,25 @@ 
 	 * @param  mixed (object|array) $extra_data extra incoming data (usually EE_Messages_Addressee)
 	 * @return string            parsed shortcode.
 	 */
-	public function parser($shortcode, $data, $extra_data = array() ) {
+	public function parser($shortcode, $data, $extra_data = array()) {
 
 		//filter setup shortcodes
 		$this->_shortcodes = $this->get_shortcodes();
 
 		//we need to setup any dynamic shortcodes so that they work with the array_key_exists
-		$sc = preg_match_all( '/(\[[A-Za-z0-9\_]+_\*)/', $shortcode, $matches );
-		$sc_to_verify = !empty($matches[0] ) ? $matches[0][0] . ']' : $shortcode;
+		$sc = preg_match_all('/(\[[A-Za-z0-9\_]+_\*)/', $shortcode, $matches);
+		$sc_to_verify = ! empty($matches[0]) ? $matches[0][0].']' : $shortcode;
 
 		//first we want to make sure this is a valid shortcode
-		if ( !array_key_exists($sc_to_verify, $this->_shortcodes ) )
+		if ( ! array_key_exists($sc_to_verify, $this->_shortcodes))
 			return false; //get out, this parser doesn't handle the incoming shortcode.
 		$this->_data = $data;
 		$this->_extra_data = $extra_data;
 		$this->_set_messages_properties();
-		$parsed = apply_filters( 'FHEE__' . get_class($this) . '__parser_after', $this->_parser($shortcode), $shortcode, $data, $extra_data, $this );
+		$parsed = apply_filters('FHEE__'.get_class($this).'__parser_after', $this->_parser($shortcode), $shortcode, $data, $extra_data, $this);
 
 		//note the below filter applies to ALL shortcode parsers... be careful!
-		$parsed = apply_filters( 'FHEE__EE_Shortcodes__parser_after', $parsed, $shortcode, $data, $extra_data, $this );
+		$parsed = apply_filters('FHEE__EE_Shortcodes__parser_after', $parsed, $shortcode, $data, $extra_data, $this);
 		return $parsed;
 	}
 
@@ -219,10 +219,10 @@ 
 	 * @return array array of shortcodes => description pairs
 	 */
 	public function get_shortcodes() {
-		$this->_shortcodes = apply_filters( 'FHEE__' . get_class($this) . '__shortcodes', $this->_shortcodes, $this );
+		$this->_shortcodes = apply_filters('FHEE__'.get_class($this).'__shortcodes', $this->_shortcodes, $this);
 
 		//note the below filter applies to ALL shortcode parsers... be careful!
-		$this->_shortcodes = apply_filters( 'FHEE__EE_Shortcodes__shortcodes', $this->_shortcodes, $this );
+		$this->_shortcodes = apply_filters('FHEE__EE_Shortcodes__shortcodes', $this->_shortcodes, $this);
 
 		return $this->_shortcodes;
 	}
@@ -252,7 +252,7 @@ 
 	 * @param mixed (object|array) $data incoming data for the parser.  The data could be either an object or array because there are some shortcodes that might be replaced by prepared data that has multiple items in a list (i.e. list of attendees in an event and we're showing fname/lname for each attendee).  In this case data will be in an array.  Otherwise the data shoudl be in a properly formatted object.  The EEH_Parse_Shortcodes.helper.php describes the data object we're expecting.
 	 * @return string parsed shortcode
 	 */
-	abstract protected function _parser( $shortcode );
+	abstract protected function _parser($shortcode);
 
 
 
@@ -264,22 +264,22 @@ 
 	protected function _validate_list_requirements() {
 
 		//first test to make sure we've got an array!
-		if ( !is_array($this->_data) ) {
-			throw new EE_Error( sprintf( __('Expecting an array for the data sent to %s. Instead it was %s', 'event_espresso'), get_class($this), gettype( $this->_data ) ) );
+		if ( ! is_array($this->_data)) {
+			throw new EE_Error(sprintf(__('Expecting an array for the data sent to %s. Instead it was %s', 'event_espresso'), get_class($this), gettype($this->_data)));
 		}
 
 		//next test to make sure we've got the required template in the index!
-		if ( !isset( $this->_data['template'] ) ) {
-			throw new EE_Error( sprintf( __('The incoming data does not have the required template index in its array', 'event_espresso') ) );
+		if ( ! isset($this->_data['template'])) {
+			throw new EE_Error(sprintf(__('The incoming data does not have the required template index in its array', 'event_espresso')));
 		}
 
 		//next test to make sure we've got got a data index in the incoming data array
-		if ( !isset( $this->_data['data'] ) )
-			throw new EE_Error( __('The incoming data does not have the required data index in its array', 'event_espresso') );
+		if ( ! isset($this->_data['data']))
+			throw new EE_Error(__('The incoming data does not have the required data index in its array', 'event_espresso'));
 
 		//all is well let's make sure _extra_data always has the values needed.
 		//let's make sure that extra_data includes all templates (for later parsing if necessary)
-		if ( empty( $this->_extra_data ) || ( empty( $this->_extra_data['data'] ) && empty( $this->_extra_data['template'] ) ) ) {
+		if (empty($this->_extra_data) || (empty($this->_extra_data['data']) && empty($this->_extra_data['template']))) {
 			$this->_extra_data['data'] = $this->_data['data'];
 			$this->_extra_data['template'] = $this->_data['template'];
 		}
@@ -296,16 +296,16 @@ 
 	 *
 	 * @return array An array with the attributes
 	 */
-	protected function _get_shortcode_attrs( $shortcode ) {
+	protected function _get_shortcode_attrs($shortcode) {
 		//make sure the required wp helper function is present
 		//require the shortcode file if necessary
-		if ( ! function_exists( 'shortcode_parse_atts' ) ) {
-			require_once( ABSPATH . WPINC . '/shortcodes.php');
+		if ( ! function_exists('shortcode_parse_atts')) {
+			require_once(ABSPATH.WPINC.'/shortcodes.php');
 		}
 
 		//let's get any attributes that may be present and set the defaults.
-		$shortcode_to_parse = str_replace( '[', '', str_replace( ']', '', $shortcode ) );
-		return shortcode_parse_atts( $shortcode_to_parse );
+		$shortcode_to_parse = str_replace('[', '', str_replace(']', '', $shortcode));
+		return shortcode_parse_atts($shortcode_to_parse);
 	}
 
 
@@ -320,7 +320,7 @@ 
 	 */
 	protected function _set_messages_properties() {
 		//should be in _extra_data
-		if ( isset( $this->_extra_data['messenger'] ) ) {
+		if (isset($this->_extra_data['messenger'])) {
 			$this->_messenger = $this->_extra_data['messenger'];
 			$this->_message_type = $this->_extra_data['message_type'];
 			$this->_context = $this->_extra_data['message'] instanceof EE_Message ? $this->_extra_data['message']->context() : '';

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

Spacing +7 added lines, -7 removed lines

@@ -1,6 +1,6 @@ 
 <?php
-if ( !defined( 'EVENT_ESPRESSO_VERSION' ) ) {
-	exit( 'No direct script access allowed' );
+if ( ! defined('EVENT_ESPRESSO_VERSION')) {
+	exit('No direct script access allowed');
 }
 
 /**
@@ -15,15 +15,15 @@ 
  * @author				Mike Nelson
  *
  */
-class EE_Phone_Input extends EE_Text_Input{
+class EE_Phone_Input extends EE_Text_Input {
 	/**
 	 * @param array $options
 	 */
-	function __construct($options = array()){
-		$this->_add_validation_strategy( new EE_Text_Validation_Strategy( 
-			__( 'Please enter a valid phone number. Eg 123-456-7890 or 1234567890', 'event_espresso' ), 
+	function __construct($options = array()) {
+		$this->_add_validation_strategy(new EE_Text_Validation_Strategy( 
+			__('Please enter a valid phone number. Eg 123-456-7890 or 1234567890', 'event_espresso'), 
 			'~^(([\d]{10})|([\d]{3}-[\d]{3}-[\d]{4}))$~'));
-		parent::__construct( $options );
+		parent::__construct($options);
 	}
 }
 

core/db_classes/EE_Question.class.php

Spacing +112 added lines, -112 removed lines

@@ -1,5 +1,5 @@ 
-<?php if ( !defined( 'EVENT_ESPRESSO_VERSION' ) ) {
-	exit( 'No direct script access allowed' );
+<?php if ( ! defined('EVENT_ESPRESSO_VERSION')) {
+	exit('No direct script access allowed');
 }
 /**
  * Event Espresso
@@ -37,9 +37,9 @@ 
 	 *                             		    date_format and the second value is the time format
 	 * @return EE_Question
 	 */
-	public static function new_instance( $props_n_values = array(), $timezone = null, $date_formats = array() ) {
-		$has_object = parent::_check_for_object( $props_n_values, __CLASS__, $timezone, $date_formats );
-		return $has_object ? $has_object : new self( $props_n_values, false, $timezone, $date_formats );
+	public static function new_instance($props_n_values = array(), $timezone = null, $date_formats = array()) {
+		$has_object = parent::_check_for_object($props_n_values, __CLASS__, $timezone, $date_formats);
+		return $has_object ? $has_object : new self($props_n_values, false, $timezone, $date_formats);
 	}
 
 
@@ -50,8 +50,8 @@ 
 	 *                          		the website will be used.
 	 * @return EE_Question
 	 */
-	public static function new_instance_from_db( $props_n_values = array(), $timezone = null ) {
-		return new self( $props_n_values, TRUE, $timezone );
+	public static function new_instance_from_db($props_n_values = array(), $timezone = null) {
+		return new self($props_n_values, TRUE, $timezone);
 	}
 
 
@@ -62,8 +62,8 @@ 
 	 * @access        public
 	 * @param string $QST_display_text
 	 */
-	public function set_display_text( $QST_display_text = '' ) {
-		$this->set( 'QST_display_text', $QST_display_text );
+	public function set_display_text($QST_display_text = '') {
+		$this->set('QST_display_text', $QST_display_text);
 	}
 
 
@@ -74,8 +74,8 @@ 
 	 * @access        public
 	 * @param        string $QST_admin_label
 	 */
-	public function set_admin_label( $QST_admin_label = '' ) {
-		$this->set( 'QST_admin_label', $QST_admin_label );
+	public function set_admin_label($QST_admin_label = '') {
+		$this->set('QST_admin_label', $QST_admin_label);
 	}
 
 
@@ -86,8 +86,8 @@ 
 	 * @access        public
 	 * @param        mixed $QST_system
 	 */
-	public function set_system_ID( $QST_system = '' ) {
-		$this->set( 'QST_system', $QST_system );
+	public function set_system_ID($QST_system = '') {
+		$this->set('QST_system', $QST_system);
 	}
 
 
@@ -98,8 +98,8 @@ 
 	 * @access        public
 	 * @param        string $QST_type
 	 */
-	public function set_question_type( $QST_type = '' ) {
-		$this->set( 'QST_type', $QST_type );
+	public function set_question_type($QST_type = '') {
+		$this->set('QST_type', $QST_type);
 	}
 
 
@@ -110,8 +110,8 @@ 
 	 * @access        public
 	 * @param        bool $QST_required
 	 */
-	public function set_required( $QST_required = FALSE ) {
-		$this->set( 'QST_required', $QST_required );
+	public function set_required($QST_required = FALSE) {
+		$this->set('QST_required', $QST_required);
 	}
 
 
@@ -122,8 +122,8 @@ 
 	 * @access        public
 	 * @param        string $QST_required_text
 	 */
-	public function set_required_text( $QST_required_text = '' ) {
-		$this->set( 'QST_required_text', $QST_required_text );
+	public function set_required_text($QST_required_text = '') {
+		$this->set('QST_required_text', $QST_required_text);
 	}
 
 
@@ -134,8 +134,8 @@ 
 	 * @access        public
 	 * @param        int $QST_order
 	 */
-	public function set_order( $QST_order = 0 ) {
-		$this->set( 'QST_order', $QST_order );
+	public function set_order($QST_order = 0) {
+		$this->set('QST_order', $QST_order);
 	}
 
 
@@ -146,8 +146,8 @@ 
 	 * @access        public
 	 * @param        bool $QST_admin_only
 	 */
-	public function set_admin_only( $QST_admin_only = FALSE ) {
-		$this->set( 'QST_admin_only', $QST_admin_only );
+	public function set_admin_only($QST_admin_only = FALSE) {
+		$this->set('QST_admin_only', $QST_admin_only);
 	}
 
 
@@ -158,8 +158,8 @@ 
 	 * @access        public
 	 * @param        int $QST_wp_user
 	 */
-	public function set_wp_user( $QST_wp_user = 1 ) {
-		$this->set( 'QST_wp_user', $QST_wp_user );
+	public function set_wp_user($QST_wp_user = 1) {
+		$this->set('QST_wp_user', $QST_wp_user);
 	}
 
 
@@ -175,8 +175,8 @@ 
 	 * @access        public
 	 * @param 	bool $QST_deleted
 	 */
-	public function set_deleted( $QST_deleted = FALSE ) {
-		$this->set( 'QST_deleted', $QST_deleted );
+	public function set_deleted($QST_deleted = FALSE) {
+		$this->set('QST_deleted', $QST_deleted);
 	}
 
 
@@ -187,7 +187,7 @@ 
 	 * @return string
 	 */
 	public function display_text() {
-		return $this->get( 'QST_display_text' );
+		return $this->get('QST_display_text');
 	}
 
 
@@ -198,7 +198,7 @@ 
 	 * @return string
 	 */
 	public function admin_label() {
-		return $this->get( 'QST_admin_label' );
+		return $this->get('QST_admin_label');
 	}
 
 
@@ -209,7 +209,7 @@ 
 	 * @return string
 	 */
 	public function system_ID() {
-		return $this->get( 'QST_system' );
+		return $this->get('QST_system');
 	}
 
 
@@ -220,7 +220,7 @@ 
 	 * @return boolean
 	 */
 	public function required() {
-		return $this->get( 'QST_required' );
+		return $this->get('QST_required');
 	}
 
 
@@ -232,7 +232,7 @@ 
 	 * @return string
 	 */
 	public function required_text() {
-		return $this->get( 'QST_required_text' );
+		return $this->get('QST_required_text');
 	}
 
 
@@ -243,7 +243,7 @@ 
 	 * @return string
 	 */
 	public function type() {
-		return $this->get( 'QST_type' );
+		return $this->get('QST_type');
 	}
 
 
@@ -255,7 +255,7 @@ 
 	 * @return int
 	 */
 	public function order() {
-		return $this->get( 'QST_order' );
+		return $this->get('QST_order');
 	}
 
 
@@ -267,7 +267,7 @@ 
 	 * @return boolean
 	 */
 	public function admin_only() {
-		return $this->get( 'QST_admin_only' );
+		return $this->get('QST_admin_only');
 	}
 
 
@@ -278,7 +278,7 @@ 
 	 * @return int
 	 */
 	public function wp_user() {
-		return $this->get( 'QST_wp_user' );
+		return $this->get('QST_wp_user');
 	}
 
 
@@ -289,7 +289,7 @@ 
 	 * @return boolean
 	 */
 	public function deleted() {
-		return $this->get( 'QST_deleted' );
+		return $this->get('QST_deleted');
 	}
 
 
@@ -299,7 +299,7 @@ 
 	 * @return EE_Answer[]
 	 */
 	public function answers() {
-		return $this->get_many_related( 'Answer' );
+		return $this->get_many_related('Answer');
 	}
 
 
@@ -309,7 +309,7 @@ 
 	 * @return boolean true = has answers, false = no answers.
 	 */
 	public function has_answers() {
-		return $this->count_related( 'Answer' ) > 0 ? TRUE : FALSE;
+		return $this->count_related('Answer') > 0 ? TRUE : FALSE;
 	}
 
 
@@ -319,7 +319,7 @@ 
 	 * @return EE_Question_Group[]
 	 */
 	public function question_groups() {
-		return $this->get_many_related( 'Question_Group' );
+		return $this->get_many_related('Question_Group');
 	}
 
 
@@ -333,24 +333,24 @@ 
 	 *                                                       whether it was trashed or not.
 	 * @return EE_Question_Option[]
 	 */
-	public function options( $notDeletedOptionsOnly = TRUE, $selected_value_to_always_include = NULL ) {
-		if ( ! $this->ID() ) {
+	public function options($notDeletedOptionsOnly = TRUE, $selected_value_to_always_include = NULL) {
+		if ( ! $this->ID()) {
 			return array();
 		}
 		$query_params = array();
-		if ( $selected_value_to_always_include ) {
-			if ( is_array( $selected_value_to_always_include ) ) {
-				$query_params[ 0 ][ 'OR*options-query' ][ 'QSO_value' ] = array( 'IN', $selected_value_to_always_include );
+		if ($selected_value_to_always_include) {
+			if (is_array($selected_value_to_always_include)) {
+				$query_params[0]['OR*options-query']['QSO_value'] = array('IN', $selected_value_to_always_include);
 			} else {
-				$query_params[ 0 ][ 'OR*options-query' ][ 'QSO_value' ] = $selected_value_to_always_include;
+				$query_params[0]['OR*options-query']['QSO_value'] = $selected_value_to_always_include;
 			}
 		}
-		if ( $notDeletedOptionsOnly ) {
-			$query_params[ 0 ][ 'OR*options-query' ][ 'QSO_deleted' ] = FALSE;
+		if ($notDeletedOptionsOnly) {
+			$query_params[0]['OR*options-query']['QSO_deleted'] = FALSE;
 		}
 		//order by QSO_order
-		$query_params[ 'order_by' ] = array( 'QSO_order' => 'ASC' );
-		return $this->get_many_related( 'Question_Option', $query_params );
+		$query_params['order_by'] = array('QSO_order' => 'ASC');
+		return $this->get_many_related('Question_Option', $query_params);
 	}
 
 
@@ -360,7 +360,7 @@ 
 	 * @return \EE_Question_Option[]
 	 */
 	public function temp_options() {
-		return $this->_model_relations[ 'Question_Option' ];
+		return $this->_model_relations['Question_Option'];
 	}
 
 
@@ -371,8 +371,8 @@ 
 	 * @param EE_Question_Option $option
 	 * @return boolean success
 	 */
-	public function add_option( EE_Question_Option $option ) {
-		return $this->_add_relation_to( $option, 'Question_Option' );
+	public function add_option(EE_Question_Option $option) {
+		return $this->_add_relation_to($option, 'Question_Option');
 	}
 
 
@@ -382,8 +382,8 @@ 
 	 * @param EE_Question_Option $option
 	 * @return boolean success
 	 */
-	public function add_temp_option( EE_Question_Option $option ) {
-		$this->_model_relations[ 'Question_Option' ][ ] = $option;
+	public function add_temp_option(EE_Question_Option $option) {
+		$this->_model_relations['Question_Option'][] = $option;
 		return TRUE;
 	}
 
@@ -394,8 +394,8 @@ 
 	 * @param EE_Question_Option $option
 	 * @return boolean success
 	 */
-	public function remove_option( EE_Question_Option $option ) {
-		return $this->_remove_relation_to( $option, 'Question_Option' );
+	public function remove_option(EE_Question_Option $option) {
+		return $this->_remove_relation_to($option, 'Question_Option');
 	}
 
 
@@ -404,8 +404,8 @@ 
 	 * @return bool
 	 */
 	public function is_system_question() {
-		$system_ID = $this->get( 'QST_system' );
-		return ! empty( $system_ID ) ? TRUE : FALSE;
+		$system_ID = $this->get('QST_system');
+		return ! empty($system_ID) ? TRUE : FALSE;
 	}
 
 
@@ -418,8 +418,8 @@ 
 	 */
 	public function set_order_to_latest() {
 		$latest_order = $this->get_model()->get_latest_question_order();
-		$latest_order ++;
-		$this->set( 'QST_order', $latest_order );
+		$latest_order++;
+		$this->set('QST_order', $latest_order);
 	}
 
 
@@ -438,20 +438,20 @@ 
 	 * Duplicates this question and its question options
 	 * @return \EE_Question
 	 */
-	public function duplicate( $options = array() ) {
+	public function duplicate($options = array()) {
 		$new_question = clone $this;
-		$new_question->set( 'QST_ID', null );
-		$new_question->set_display_text( sprintf( __( '%s **Duplicate**', 'event_espresso' ), $this->display_text() ) );
-		$new_question->set_admin_label( sprintf( __( '%s **Duplicate**', 'event_espresso' ), $this->admin_label() ) );
-		$new_question->set_system_ID( null );
-		$new_question->set_wp_user( get_current_user_id() );
+		$new_question->set('QST_ID', null);
+		$new_question->set_display_text(sprintf(__('%s **Duplicate**', 'event_espresso'), $this->display_text()));
+		$new_question->set_admin_label(sprintf(__('%s **Duplicate**', 'event_espresso'), $this->admin_label()));
+		$new_question->set_system_ID(null);
+		$new_question->set_wp_user(get_current_user_id());
                 //if we're duplicating a trashed question, assume we don't want the new one to be trashed
-                $new_question->set_deleted( false );
+                $new_question->set_deleted(false);
 		$success = $new_question->save();
-		if( $success ) {
+		if ($success) {
 			//we don't totally want to duplicate the question options, because we want them to be for the NEW question
-			foreach( $this->options() as $question_option ) {
-				$question_option->duplicate( array( 'QST_ID' => $new_question->ID() ) );
+			foreach ($this->options() as $question_option) {
+				$question_option->duplicate(array('QST_ID' => $new_question->ID()));
 			}
 			return $new_question;
 		} else {
@@ -464,7 +464,7 @@ 
 	 * @return int|float
 	 */
 	public function max() {
-		return $this->get( 'QST_max' );
+		return $this->get('QST_max');
 	}
 
 	/**
@@ -472,8 +472,8 @@ 
 	 * @param int|float $new_max
 	 * @return void
 	 */
-	public function set_max( $new_max ) {
-		$this->set( 'QST_max', $new_max );
+	public function set_max($new_max) {
+		$this->set('QST_max', $new_max);
 	}
 
 
@@ -485,7 +485,7 @@ 
 	 * @param array $input_constructor_args
 	 * @return EE_Form_Input_Base
 	 */
-	public function generate_form_input( $registration = null, $answer = null, $input_constructor_args = array() ) {
+	public function generate_form_input($registration = null, $answer = null, $input_constructor_args = array()) {
 		$identifier = $this->is_system_question() ? $this->system_ID() : $this->ID();
 
 		$input_constructor_args = array_merge( 
@@ -496,27 +496,27 @@ 
 				),
 				$input_constructor_args
 			);
-		if( ! $answer instanceof EE_Answer && $registration instanceof EE_Registration ) {
-			$answer = EEM_Answer::instance()->get_registration_question_answer_object( $registration, $this->ID() );
+		if ( ! $answer instanceof EE_Answer && $registration instanceof EE_Registration) {
+			$answer = EEM_Answer::instance()->get_registration_question_answer_object($registration, $this->ID());
 		}
 		// has this question been answered ?
-		if ( $answer instanceof EE_Answer ) {
+		if ($answer instanceof EE_Answer) {
 			//answer gets htmlspecialchars called on it, undo that please
 			//beceause the form input's display strategy may call esc_attr too
 			//which also does html special characters
 			$values_with_html_special_chars = $answer->value();
-			if( is_array( $values_with_html_special_chars ) ) {
-				$default_value = array_map( 'htmlspecialchars_decode', $values_with_html_special_chars );
+			if (is_array($values_with_html_special_chars)) {
+				$default_value = array_map('htmlspecialchars_decode', $values_with_html_special_chars);
 			} else {
-				$default_value = htmlspecialchars_decode( $values_with_html_special_chars );
+				$default_value = htmlspecialchars_decode($values_with_html_special_chars);
 			}
 			$input_constructor_args['default'] = $default_value;
 		}
-		$max_max_for_question = EEM_Question::instance()->absolute_max_for_system_question( $this->system_ID() );
-		if( EEM_Question::instance()->question_type_is_in_category(  $this->type(), 'text' ) ) {
-			$input_constructor_args[ 'validation_strategies' ][] = new EE_Max_Length_Validation_Strategy(
+		$max_max_for_question = EEM_Question::instance()->absolute_max_for_system_question($this->system_ID());
+		if (EEM_Question::instance()->question_type_is_in_category($this->type(), 'text')) {
+			$input_constructor_args['validation_strategies'][] = new EE_Max_Length_Validation_Strategy(
 				null,
-				min( $max_max_for_question, $this->max() )
+				min($max_max_for_question, $this->max())
 			);
 		}
 		$input_constructor_args = apply_filters(
@@ -528,22 +528,22 @@ 
 		);
 
 		$result = null;
-		switch ( $this->type() ) {
+		switch ($this->type()) {
 			// Text
 			case EEM_Question::QST_type_text :
-				$result = new EE_Text_Input( $input_constructor_args );
+				$result = new EE_Text_Input($input_constructor_args);
 				break;
 			// Textarea
 			case EEM_Question::QST_type_textarea :
-				$result = new EE_Text_Area_Input( $input_constructor_args );
+				$result = new EE_Text_Area_Input($input_constructor_args);
 				break;
 			// Radio Buttons
 			case EEM_Question::QST_type_radio :
-				$result = new EE_Radio_Button_Input( $this->options(), $input_constructor_args );
+				$result = new EE_Radio_Button_Input($this->options(), $input_constructor_args);
 				break;
 			// Dropdown
 			case EEM_Question::QST_type_dropdown :
-				$result = new EE_Select_Input( $this->options(), $input_constructor_args );
+				$result = new EE_Select_Input($this->options(), $input_constructor_args);
 				break;
 			// State Dropdown
 			case EEM_Question::QST_type_state :
@@ -554,7 +554,7 @@ 
 					$registration,
 					$answer
 				);				
-				$result = new EE_State_Select_Input( $state_options, $input_constructor_args );
+				$result = new EE_State_Select_Input($state_options, $input_constructor_args);
 				break;
 			// Country Dropdown
 			case EEM_Question::QST_type_country :
@@ -565,49 +565,49 @@ 
 					$registration,
 					$answer
 				);
-				$result = new EE_Country_Select_Input( $country_options, $input_constructor_args );
+				$result = new EE_Country_Select_Input($country_options, $input_constructor_args);
 				break;
 			// Checkboxes
 			case EEM_Question::QST_type_checkbox :
-				$result = new EE_Checkbox_Multi_Input( $this->options(), $input_constructor_args );
+				$result = new EE_Checkbox_Multi_Input($this->options(), $input_constructor_args);
 				break;
 			// Date
 			case EEM_Question::QST_type_date :
-				$result = new EE_Datepicker_Input( $input_constructor_args );
+				$result = new EE_Datepicker_Input($input_constructor_args);
 				break;
 			case EEM_Question::QST_type_html_textarea :
-				$input_constructor_args[ 'validation_strategies' ][] = new EE_Simple_HTML_Validation_Strategy();
-				$result =  new EE_Text_Area_Input( $input_constructor_args );
-				$result->remove_validation_strategy( 'EE_Plaintext_Validation_Strategy' );
+				$input_constructor_args['validation_strategies'][] = new EE_Simple_HTML_Validation_Strategy();
+				$result = new EE_Text_Area_Input($input_constructor_args);
+				$result->remove_validation_strategy('EE_Plaintext_Validation_Strategy');
 				break;
 			case EEM_Question::QST_type_email :
-				$result = new EE_Email_Input( $input_constructor_args );
+				$result = new EE_Email_Input($input_constructor_args);
 				break;
 			case EEM_Question::QST_type_us_phone :
-				$result = new EE_Phone_Input( $input_constructor_args );
+				$result = new EE_Phone_Input($input_constructor_args);
 				break;
 			case EEM_Question::QST_type_int :
-				$input_constructor_args[ 'validation_strategies' ][] = new EE_Int_Validation_Strategy();
-				$result = new EE_Text_Input( $input_constructor_args );
+				$input_constructor_args['validation_strategies'][] = new EE_Int_Validation_Strategy();
+				$result = new EE_Text_Input($input_constructor_args);
 				break;
 			case EEM_Question::QST_type_decimal :
-				$input_constructor_args[ 'validation_strategies' ][] = new EE_Float_Validation_Strategy();
-				$result = new EE_Text_Input( $input_constructor_args );
+				$input_constructor_args['validation_strategies'][] = new EE_Float_Validation_Strategy();
+				$result = new EE_Text_Input($input_constructor_args);
 				break;
 			case EEM_Question::QST_type_url :
-				$input_constructor_args[ 'validation_strategies' ][] = new EE_URL_Validation_Strategy();
-				$result = new EE_Text_Input( $input_constructor_args );
+				$input_constructor_args['validation_strategies'][] = new EE_URL_Validation_Strategy();
+				$result = new EE_Text_Input($input_constructor_args);
 				break;
 			case EEM_Question::QST_type_year :
 				$result = new EE_Year_Input(
 						$input_constructor_args,
-						apply_filters( 'FHEE__EE_SPCO_Reg_Step_Attendee_Information___generate_question_input__year_question__four_digit', true, $this ),
-						apply_filters( 'FHEE__EE_SPCO_Reg_Step_Attendee_Information___generate_question_input__year_question__early_range', 100, $this ),
-						apply_filters( 'FHEE__EE_SPCO_Reg_Step_Attendee_Information___generate_question_input__year_question__end_range', 100, $this )
+						apply_filters('FHEE__EE_SPCO_Reg_Step_Attendee_Information___generate_question_input__year_question__four_digit', true, $this),
+						apply_filters('FHEE__EE_SPCO_Reg_Step_Attendee_Information___generate_question_input__year_question__early_range', 100, $this),
+						apply_filters('FHEE__EE_SPCO_Reg_Step_Attendee_Information___generate_question_input__year_question__end_range', 100, $this)
 						);
 				break;
 			case EEM_Question::QST_type_multi_select :
-				$result = new EE_Select_Multiple_Input( $this->options(), $input_constructor_args );
+				$result = new EE_Select_Multiple_Input($this->options(), $input_constructor_args);
 				break;
 			// fallback
 			default :
@@ -618,12 +618,12 @@ 
 					$this,
 					$input_constructor_args
 				);
-				if( ! $default_input ){
-					$default_input = new EE_Text_Input( $input_constructor_args );
+				if ( ! $default_input) {
+					$default_input = new EE_Text_Input($input_constructor_args);
 				}
 				$result = $default_input;
 		}
-		return apply_filters( 'FHEE__EE_Question__generate_form_input__return', $result, $registration, $this, $answer );
+		return apply_filters('FHEE__EE_Question__generate_form_input__return', $result, $registration, $this, $answer);
 	}
 
 

Doc Comments +2 added lines, -2 removed lines

@@ -369,7 +369,7 @@ 
 	 * Adds an option for this question. Note: if the option were previously associated with a different
 	 * Question, that relationship will be overwritten.
 	 * @param EE_Question_Option $option
-	 * @return boolean success
+	 * @return EE_Base_Class success
 	 */
 	public function add_option( EE_Question_Option $option ) {
 		return $this->_add_relation_to( $option, 'Question_Option' );
@@ -392,7 +392,7 @@ 
 	/**
 	 * Marks the option as deleted.
 	 * @param EE_Question_Option $option
-	 * @return boolean success
+	 * @return EE_Base_Class success
 	 */
 	public function remove_option( EE_Question_Option $option ) {
 		return $this->_remove_relation_to( $option, 'Question_Option' );

core/libraries/messages/EE_Message_Resource_Manager.lib.php

Spacing +162 added lines, -162 removed lines

@@ -1,7 +1,7 @@ 
 <?php
 
-if ( ! defined( 'EVENT_ESPRESSO_VERSION' ) ) {
-	exit( 'No direct script access allowed' );
+if ( ! defined('EVENT_ESPRESSO_VERSION')) {
+	exit('No direct script access allowed');
 }
 
 
@@ -134,14 +134,14 @@ 
 	 * @return EE_Messenger_Collection
 	 */
 	protected function _initialize_collections() {
-		if ( $this->_initialized ) {
+		if ($this->_initialized) {
 			return;
 		}
 		$this->_initialized = true;
 		$this->_messenger_collection_loader->load_messengers_from_folder();
 		$this->_message_type_collection_loader->load_message_types_from_folder();
 		$this->_set_active_messengers_and_message_types();
-		$this->get_has_activated_messengers_option( true );
+		$this->get_has_activated_messengers_option(true);
 	}
 
 
@@ -170,8 +170,8 @@ 
 	 * @param string $messenger_name
 	 * @return \EE_messenger
 	 */
-	public function get_messenger( $messenger_name ) {
-		return $this->messenger_collection()->get_by_info( $messenger_name );
+	public function get_messenger($messenger_name) {
+		return $this->messenger_collection()->get_by_info($messenger_name);
 	}
 
 
@@ -182,9 +182,9 @@ 
 	 * @param string $messenger
 	 * @return EE_messenger | null
 	 */
-	public function get_active_messenger( $messenger ) {
+	public function get_active_messenger($messenger) {
 		$this->_initialize_collections();
-		return ! empty( $this->_active_messengers[ $messenger ] ) ? $this->_active_messengers[ $messenger ] : null;
+		return ! empty($this->_active_messengers[$messenger]) ? $this->_active_messengers[$messenger] : null;
 	}
 
 
@@ -193,11 +193,11 @@ 
 	 * @return \EE_messenger[]
 	 */
 	public function installed_messengers() {
-		if ( empty( $this->_installed_messengers ) ) {
+		if (empty($this->_installed_messengers)) {
 			$this->_installed_messengers = array();
 			$this->messenger_collection()->rewind();
-			while ( $this->messenger_collection()->valid() ) {
-				$this->_installed_messengers[ $this->messenger_collection()->current()->name ] = $this->messenger_collection()->current();
+			while ($this->messenger_collection()->valid()) {
+				$this->_installed_messengers[$this->messenger_collection()->current()->name] = $this->messenger_collection()->current();
 				$this->messenger_collection()->next();
 			}
 		}
@@ -211,14 +211,14 @@ 
 	 * @return \EE_messenger
 	 * @throws \EE_Error
 	 */
-	public function valid_messenger( $messenger_name ) {
-		$messenger = $this->get_messenger( $messenger_name );
-		if ( $messenger instanceof EE_messenger ) {
+	public function valid_messenger($messenger_name) {
+		$messenger = $this->get_messenger($messenger_name);
+		if ($messenger instanceof EE_messenger) {
 			return $messenger;
 		}
 		throw new EE_Error(
 			sprintf(
-				__( 'The "%1$s" messenger is either invalid or not installed', 'event_espresso' ),
+				__('The "%1$s" messenger is either invalid or not installed', 'event_espresso'),
 				$messenger_name
 			)
 		);
@@ -250,8 +250,8 @@ 
 	 * @param string $message_type_name
 	 * @return \EE_message_type
 	 */
-	public function get_message_type( $message_type_name ) {
-		return $this->message_type_collection()->get_by_info( $message_type_name );
+	public function get_message_type($message_type_name) {
+		return $this->message_type_collection()->get_by_info($message_type_name);
 	}
 
 
@@ -263,9 +263,9 @@ 
 	 * @param string $message_type_name
 	 * @return \EE_message_type|null
 	 */
-	public function get_active_message_type_for_messenger( $messenger_name, $message_type_name ) {
-		return $this->is_message_type_active_for_messenger( $messenger_name, $message_type_name )
-			? $this->get_message_type( $message_type_name )
+	public function get_active_message_type_for_messenger($messenger_name, $message_type_name) {
+		return $this->is_message_type_active_for_messenger($messenger_name, $message_type_name)
+			? $this->get_message_type($message_type_name)
 			: null;
 	}
 
@@ -279,9 +279,9 @@ 
 	 *
 	 * @return bool
 	 */
-	public function is_message_type_active_for_messenger( $messenger_name, $message_type_name ) {
+	public function is_message_type_active_for_messenger($messenger_name, $message_type_name) {
 		$this->_initialize_collections();
-		return ! empty( $this->_active_message_types[ $messenger_name ]['settings'][ $messenger_name . '-message_types' ][ $message_type_name ] );
+		return ! empty($this->_active_message_types[$messenger_name]['settings'][$messenger_name.'-message_types'][$message_type_name]);
 	}
 
 
@@ -292,9 +292,9 @@ 
 	 * @param string $messenger_name  the name of the messenger to check if active.
 	 * @return bool
 	 */
-	public function is_messenger_active( $messenger_name ) {
+	public function is_messenger_active($messenger_name) {
 		$this->_initialize_collections();
-		return ! empty( $this->_active_message_types[ $messenger_name ] );
+		return ! empty($this->_active_message_types[$messenger_name]);
 	}
 
 
@@ -305,11 +305,11 @@ 
 	 * @param string $message_type_name  The slug of the message type getting the settings for.
 	 * @return array
 	 */
-	public function get_message_type_settings_for_messenger( $messenger_name, $message_type_name ) {
+	public function get_message_type_settings_for_messenger($messenger_name, $message_type_name) {
 		$settings = array();
-		if ( $this->is_message_type_active_for_messenger( $messenger_name, $message_type_name ) ) {
-			$settings =  isset( $this->_active_message_types[ $messenger_name ]['settings'][ $messenger_name . '-message_types' ][ $message_type_name ]['settings'] )
-				? $this->_active_message_types[ $messenger_name ]['settings'][ $messenger_name . '-message_types' ][ $message_type_name ]['settings']
+		if ($this->is_message_type_active_for_messenger($messenger_name, $message_type_name)) {
+			$settings = isset($this->_active_message_types[$messenger_name]['settings'][$messenger_name.'-message_types'][$message_type_name]['settings'])
+				? $this->_active_message_types[$messenger_name]['settings'][$messenger_name.'-message_types'][$message_type_name]['settings']
 				: array();
 		}
 		return $settings;
@@ -324,11 +324,11 @@ 
 	 * @param string $messenger_name
 	 * @return bool
 	 */
-	public function messenger_has_active_message_types( $messenger_name ) {
+	public function messenger_has_active_message_types($messenger_name) {
 		$this->_initialize_collections();
 		return
-			! empty( $this->_active_message_types[ $messenger_name ] )
-			&& ! empty( $this->_active_message_types[ $messenger_name ]['settings'][ $messenger_name . '-message_types' ] );
+			! empty($this->_active_message_types[$messenger_name])
+			&& ! empty($this->_active_message_types[$messenger_name]['settings'][$messenger_name.'-message_types']);
 	}
 
 
@@ -341,15 +341,15 @@ 
 	 * @param string $messenger_name The messenger being checked
 	 * @return EE_message_type[]    (or empty array if none present)
 	 */
-	public function get_active_message_types_for_messenger( $messenger_name ) {
+	public function get_active_message_types_for_messenger($messenger_name) {
 		$message_types = array();
-		if ( ! $this->messenger_has_active_message_types( $messenger_name ) ) {
+		if ( ! $this->messenger_has_active_message_types($messenger_name)) {
 			return $message_types;
 		}
 		$installed_message_types = $this->installed_message_types();
-		foreach ( $installed_message_types as $message_type_name => $message_type ) {
-			if ( $this->is_message_type_active_for_messenger( $messenger_name, $message_type_name ) ) {
-				$message_types[ $message_type_name ] = $message_type;
+		foreach ($installed_message_types as $message_type_name => $message_type) {
+			if ($this->is_message_type_active_for_messenger($messenger_name, $message_type_name)) {
+				$message_types[$message_type_name] = $message_type;
 			}
 		}
 		return $message_types;
@@ -367,12 +367,12 @@ 
 	public function list_of_active_message_types() {
 		$active_message_type_names = array();
 		$this->_initialize_collections();
-		foreach ( $this->_active_message_types as $messenger => $messenger_settings ) {
-			if ( ! isset( $messenger_settings['settings'][ $messenger . '-message_types' ] ) ) {
+		foreach ($this->_active_message_types as $messenger => $messenger_settings) {
+			if ( ! isset($messenger_settings['settings'][$messenger.'-message_types'])) {
 				continue;
 			}
-			foreach ( $messenger_settings['settings'][ $messenger . '-message_types' ] as $message_type_name => $message_type_config ) {
-				if ( ! in_array( $message_type_name, $active_message_type_names ) ) {
+			foreach ($messenger_settings['settings'][$messenger.'-message_types'] as $message_type_name => $message_type_config) {
+				if ( ! in_array($message_type_name, $active_message_type_names)) {
 					$active_message_type_names[] = $message_type_name;
 				}
 			}
@@ -392,9 +392,9 @@ 
 		$active_message_types = array();
 		$installed_message_types = $this->installed_message_types();
 		$active_message_type_names = $this->list_of_active_message_types();
-		foreach ( $active_message_type_names as $active_message_type_name ) {
-			if ( isset( $installed_message_types[ $active_message_type_name ] ) ) {
-				$active_message_types[ $active_message_type_name ] = $installed_message_types[ $active_message_type_name ];
+		foreach ($active_message_type_names as $active_message_type_name) {
+			if (isset($installed_message_types[$active_message_type_name])) {
+				$active_message_types[$active_message_type_name] = $installed_message_types[$active_message_type_name];
 			}
 		}
 		return $active_message_types;
@@ -406,10 +406,10 @@ 
 	 * @return \EE_message_type[]
 	 */
 	public function installed_message_types() {
-		if ( empty( $this->_installed_message_types ) ) {
+		if (empty($this->_installed_message_types)) {
 			$this->message_type_collection()->rewind();
-			while ( $this->message_type_collection()->valid() ) {
-				$this->_installed_message_types[ $this->message_type_collection()->current()->name ] = $this->message_type_collection()->current();
+			while ($this->message_type_collection()->valid()) {
+				$this->_installed_message_types[$this->message_type_collection()->current()->name] = $this->message_type_collection()->current();
 				$this->message_type_collection()->next();
 			}
 		}
@@ -422,14 +422,14 @@ 
 	 * @return \EE_message_type
 	 * @throws \EE_Error
 	 */
-	public function valid_message_type( $message_type_name ) {
-		$message_type = $this->get_message_type( $message_type_name );
-		if ( $message_type instanceof EE_message_type ) {
+	public function valid_message_type($message_type_name) {
+		$message_type = $this->get_message_type($message_type_name);
+		if ($message_type instanceof EE_message_type) {
 			return $message_type;
 		}
 		throw new EE_Error(
 			sprintf(
-				__( 'The "%1$s" message type is either invalid or not installed', 'event_espresso' ),
+				__('The "%1$s" message type is either invalid or not installed', 'event_espresso'),
 				$message_type_name
 			)
 		);
@@ -445,9 +445,9 @@ 
 	 * @return boolean
 	 * @throws \EE_Error
 	 */
-	public function valid_message_type_for_messenger( EE_messenger $messenger, $message_type_name ) {
+	public function valid_message_type_for_messenger(EE_messenger $messenger, $message_type_name) {
 		$valid_message_types = $messenger->get_valid_message_types();
-		if ( ! in_array( $message_type_name, $valid_message_types ) ) {
+		if ( ! in_array($message_type_name, $valid_message_types)) {
 			throw new EE_Error(
 				sprintf(
 					__(
@@ -474,9 +474,9 @@ 
 	 *
 	 * @return array
 	 */
-	public function get_active_messengers_option( $reset = false) {
-		if ( $reset ) {
-			$this->_active_message_types = get_option( 'ee_active_messengers', array() );
+	public function get_active_messengers_option($reset = false) {
+		if ($reset) {
+			$this->_active_message_types = get_option('ee_active_messengers', array());
 		}
 		return $this->_active_message_types;
 	}
@@ -490,11 +490,11 @@ 
 	 *                                 representing this data is used.
 	 * @return bool FALSE if not updated, TRUE if updated.
 	 */
-	public function update_active_messengers_option( $active_messenger_settings = array() ) {
-		$active_messenger_settings = empty( $active_messenger_settings ) ? $this->_active_message_types : $active_messenger_settings;
+	public function update_active_messengers_option($active_messenger_settings = array()) {
+		$active_messenger_settings = empty($active_messenger_settings) ? $this->_active_message_types : $active_messenger_settings;
 		//make sure _active_message_types is updated (this is the internal cache for the settings).
 		$this->_active_message_types = $active_messenger_settings;
-		return update_option( 'ee_active_messengers', $active_messenger_settings );
+		return update_option('ee_active_messengers', $active_messenger_settings);
 	}
 
 
@@ -509,9 +509,9 @@ 
 	 *
 	 * @return array
 	 */
-	public function get_has_activated_messengers_option( $reset = false ) {
-		if ( $reset ) {
-			$this->_has_activated_messengers_and_message_types = get_option( 'ee_has_activated_messenger', array() );
+	public function get_has_activated_messengers_option($reset = false) {
+		if ($reset) {
+			$this->_has_activated_messengers_and_message_types = get_option('ee_has_activated_messenger', array());
 		}
 		return $this->_has_activated_messengers_and_message_types;
 	}
@@ -526,11 +526,11 @@ 
 	 *
 	 * @return bool FALSE if not updated, TRUE if updated.
 	 */
-	public function update_has_activated_messengers_option( $has_activated_messengers = array() ) {
-		$has_activated_messengers = empty( $has_activated_messengers )
+	public function update_has_activated_messengers_option($has_activated_messengers = array()) {
+		$has_activated_messengers = empty($has_activated_messengers)
 			? $this->_has_activated_messengers_and_message_types
 			: $has_activated_messengers;
-		return update_option( 'ee_has_activated_messenger', $has_activated_messengers );
+		return update_option('ee_has_activated_messenger', $has_activated_messengers);
 	}
 
 
@@ -552,8 +552,8 @@ 
 		//echo "\n\n " . __LINE__ . ") " . __METHOD__ . "() \n";
 		// list of activated messengers as set via the admin
 		// note calling `get_active_messengers_options` also initializes the _active_message_types property.
-		$this->get_active_messengers_option( true );
-		$this->ensure_messengers_are_active( array(), false, true );
+		$this->get_active_messengers_option(true);
+		$this->ensure_messengers_are_active(array(), false, true);
 		$this->update_active_messengers_option();
 		$this->update_has_activated_messengers_option();
 	}
@@ -571,11 +571,11 @@ 
 	 * @param bool   $update_option  Whether to update the option in the db or not.
 	 * @return boolean true if either already active or successfully activated.
 	 */
-	public function ensure_messenger_is_active( $messenger_name, $update_option = true ) {
-		if ( ! isset( $this->_active_messengers[ $messenger_name ] ) ) {
+	public function ensure_messenger_is_active($messenger_name, $update_option = true) {
+		if ( ! isset($this->_active_messengers[$messenger_name])) {
 			try {
-				$this->activate_messenger( $messenger_name, array(), $update_option );
-			} catch( EE_Error $e ) {
+				$this->activate_messenger($messenger_name, array(), $update_option);
+			} catch (EE_Error $e) {
 				EE_Error::add_error(
 					$e->getMessage(),
 					__FILE__,
@@ -602,25 +602,25 @@ 
 	 *                                and a messenger is indicated as active, but is NOT installed, then it will automatically be
 	 *                                deactivated.
 	 */
-	public function ensure_messengers_are_active( $messenger_names = array(), $update_option = true, $verify = false ) {
-		$messenger_names = empty( $messenger_names ) ? array_keys( $this->_active_message_types ) : $messenger_names;
+	public function ensure_messengers_are_active($messenger_names = array(), $update_option = true, $verify = false) {
+		$messenger_names = empty($messenger_names) ? array_keys($this->_active_message_types) : $messenger_names;
 
 		$not_installed = array();
-		foreach( $messenger_names as $messenger_name ) {
-			if ( $verify && ! $this->messenger_collection()->has_by_name( $messenger_name ) ) {
+		foreach ($messenger_names as $messenger_name) {
+			if ($verify && ! $this->messenger_collection()->has_by_name($messenger_name)) {
 				$not_installed[] = $messenger_name;
-				$this->deactivate_messenger( $messenger_name );
+				$this->deactivate_messenger($messenger_name);
 				continue;
 			}
-			$this->ensure_messenger_is_active( $messenger_name, $update_option );
+			$this->ensure_messenger_is_active($messenger_name, $update_option);
 		}
 
-		if ( ! empty( $not_installed_messenger ) ) {
+		if ( ! empty($not_installed_messenger)) {
 			EE_Error::add_error(
 				sprintf(
-					__( 'The following messengers are either not installed or are invalid:%1$s %2$s', 'event_espresso' ),
+					__('The following messengers are either not installed or are invalid:%1$s %2$s', 'event_espresso'),
 					'<br />',
-					implode( ', ', $not_installed_messenger )
+					implode(', ', $not_installed_messenger)
 				),
 				__FILE__, __FUNCTION__, __LINE__
 			);
@@ -639,18 +639,18 @@ 
 	 * @return bool  Returns true if already is active or if was activated successfully.
 	 * @throws \EE_Error
 	 */
-	public function ensure_message_type_is_active( $message_type_name, $messenger_name, $update_option = true ) {
+	public function ensure_message_type_is_active($message_type_name, $messenger_name, $update_option = true) {
 		// grab the messenger to work with.
-		$messenger = $this->valid_messenger( $messenger_name );
-		if ( $this->valid_message_type_for_messenger( $messenger, $message_type_name ) ) {
+		$messenger = $this->valid_messenger($messenger_name);
+		if ($this->valid_message_type_for_messenger($messenger, $message_type_name)) {
 			//ensure messenger is active (that's an inherent coupling between active message types and the
 			//messenger they are being activated for.
 			try {
-				if ( ! $this->is_message_type_active_for_messenger( $messenger_name, $message_type_name ) ) {
+				if ( ! $this->is_message_type_active_for_messenger($messenger_name, $message_type_name)) {
 					//all is good so let's just get it active
-					$this->activate_messenger( $messenger_name, array( $message_type_name ), $update_option );
+					$this->activate_messenger($messenger_name, array($message_type_name), $update_option);
 				}
-			} catch( EE_Error $e ) {
+			} catch (EE_Error $e) {
 				EE_Error::add_error(
 					$e->getMessage(),
 					__FILE__,
@@ -674,14 +674,14 @@ 
 	 * @param string $messenger_name      The name of the messenger that the message types are to be activated on.
 	 * @param bool   $update_option       Whether to persist the activation to the database or not (default true).
 	 */
-	public function ensure_message_types_are_active( $message_type_names, $messenger_name, $update_option = true ) {
+	public function ensure_message_types_are_active($message_type_names, $messenger_name, $update_option = true) {
 		$message_type_names = (array) $message_type_names;
-		foreach ( $message_type_names as $message_type_name ) {
+		foreach ($message_type_names as $message_type_name) {
 			// note, intentionally not updating option here because we're in a loop.
 			// We'll follow the instructions of the incoming $update_option argument after the loop.
-			$this->ensure_message_type_is_active( $message_type_name, $messenger_name, false );
+			$this->ensure_message_type_is_active($message_type_name, $messenger_name, false);
 		}
-		if ( $update_option ) {
+		if ($update_option) {
 			$this->update_active_messengers_option();
 			$this->update_has_activated_messengers_option();
 		}
@@ -708,24 +708,24 @@ 
 	) {
 		$templates = array();
 		// grab the messenger to work with.
-		$messenger = $this->messenger_collection()->get_by_info( $messenger_name );
+		$messenger = $this->messenger_collection()->get_by_info($messenger_name);
 		// it's inactive. Activate it.
-		if ( $messenger instanceof EE_messenger ) {
-			$this->_active_messengers[ $messenger->name ] = $messenger;
+		if ($messenger instanceof EE_messenger) {
+			$this->_active_messengers[$messenger->name] = $messenger;
 			//activate incoming message types set to be activated with messenger.
-			$message_type_names = $this->_activate_message_types( $messenger, $message_type_names );
+			$message_type_names = $this->_activate_message_types($messenger, $message_type_names);
 			// setup any initial settings for the messenger if necessary.
-			$this->add_settings_for_messenger( $messenger->name );
-			if ( $update_active_messengers_option ) {
+			$this->add_settings_for_messenger($messenger->name);
+			if ($update_active_messengers_option) {
 				$this->update_active_messengers_option();
 				$this->update_has_activated_messengers_option();
 			}
 			//generate new templates if necessary and ensure all related templates that are already in the database are
 			//marked active.  Note, this will also deactivate a message type for a messenger if the template
 			//cannot be successfully created during its attempt (only happens for global template attempts).
-			if ( ! empty( $message_type_names ) ) {
-				$templates = EEH_MSG_Template::generate_new_templates( $messenger->name, $message_type_names, 0, true );
-				EEH_MSG_Template::update_to_active( array( $messenger->name ), $message_type_names );
+			if ( ! empty($message_type_names)) {
+				$templates = EEH_MSG_Template::generate_new_templates($messenger->name, $message_type_names, 0, true);
+				EEH_MSG_Template::update_to_active(array($messenger->name), $message_type_names);
 			}
 		}
 		return $templates;
@@ -744,29 +744,29 @@ 
 	 *
 	 * @return array
 	 */
-	protected function _activate_message_types( EE_messenger $messenger, $message_type_names = array() ) {
+	protected function _activate_message_types(EE_messenger $messenger, $message_type_names = array()) {
 		//If $message_type_names is empty, AND $this->_active_message_types is empty, then that means
 		//things have never been initialized (which should happen on EEH_Activation::generate_message_templates).
 		//So ONLY then do we need to actually grab defaults and cycle through them.  Otherwise we
 		//only override _active_message_types when an explicit array of $message_type_names has been provided.
-		$message_type_names = empty( $message_type_names ) && ! isset( $this->_active_message_types[ $messenger->name ] )
+		$message_type_names = empty($message_type_names) && ! isset($this->_active_message_types[$messenger->name])
 			? $messenger->get_default_message_types()
 			: (array) $message_type_names;
 
 		//now we ALWAYS need to make sure that the messenger is active for the message types we're activating!
-		if ( ! isset( $this->_active_message_types[ $messenger->name ] ) ) {
-			$this->_active_message_types[ $messenger->name ]['settings'] = array();
+		if ( ! isset($this->_active_message_types[$messenger->name])) {
+			$this->_active_message_types[$messenger->name]['settings'] = array();
 		}
 
-		if ( $message_type_names ) {
+		if ($message_type_names) {
 			// cycle thru message types
-			foreach ( $message_type_names as $message_type_name ) {
+			foreach ($message_type_names as $message_type_name) {
 				//only register the message type as active IF it isn't already active!
 				//and if its actually installed.
 				if (
-					! $this->is_message_type_active_for_messenger( $messenger->name, $message_type_name )
+					! $this->is_message_type_active_for_messenger($messenger->name, $message_type_name)
 				) {
-					$this->add_settings_for_message_type( $messenger->name, $message_type_name );
+					$this->add_settings_for_message_type($messenger->name, $message_type_name);
 					$this->_set_messenger_has_activated_message_type(
 						$messenger,
 						$message_type_name
@@ -789,24 +789,24 @@ 
 	 * @param  string       $message_type_name The name of the message type adding the settings for
 	 * @param  array        $new_settings     Any new settings being set for the message type and messenger
 	 */
-	public function add_settings_for_message_type( $messenger_name, $message_type_name, $new_settings = array() ) {
+	public function add_settings_for_message_type($messenger_name, $message_type_name, $new_settings = array()) {
 		// get installed message type from collection
-		$message_type = $this->message_type_collection()->get_by_info( $message_type_name );
-		$existing_settings = $this->get_message_type_settings_for_messenger( $messenger_name, $message_type_name );
+		$message_type = $this->message_type_collection()->get_by_info($message_type_name);
+		$existing_settings = $this->get_message_type_settings_for_messenger($messenger_name, $message_type_name);
 		//we need to setup any initial settings for message types
-		if ( $message_type instanceof EE_message_type ) {
+		if ($message_type instanceof EE_message_type) {
 			$default_settings = $message_type->get_admin_settings_fields();
-			foreach ( $default_settings as $field => $values ) {
-				if ( isset( $new_settings[ $field ] ) ) {
-					$existing_settings[ $field ] = $new_settings[ $field ];
+			foreach ($default_settings as $field => $values) {
+				if (isset($new_settings[$field])) {
+					$existing_settings[$field] = $new_settings[$field];
 					continue;
 				}
-				if ( ! isset( $existing_settings[ $field ] ) ) {
-					$existing_settings[ $field ] = $values['default'];
+				if ( ! isset($existing_settings[$field])) {
+					$existing_settings[$field] = $values['default'];
 				}
 			}
 		}
-		$this->_active_message_types[ $messenger_name ]['settings'][ $messenger_name . '-message_types' ][ $message_type_name ]['settings'] = $existing_settings;
+		$this->_active_message_types[$messenger_name]['settings'][$messenger_name.'-message_types'][$message_type_name]['settings'] = $existing_settings;
 	}
 
 
@@ -819,14 +819,14 @@ 
 	 * @param \EE_messenger $messenger
 	 * @param string        $message_type_name
 	 */
-	protected function _set_messenger_has_activated_message_type( EE_messenger $messenger, $message_type_name ) {
+	protected function _set_messenger_has_activated_message_type(EE_messenger $messenger, $message_type_name) {
 		// make sure this messenger has a record in the has_activated array
-		if ( ! isset( $this->_has_activated_messengers_and_message_types[ $messenger->name ] ) ) {
-			$this->_has_activated_messengers_and_message_types[ $messenger->name ] = array();
+		if ( ! isset($this->_has_activated_messengers_and_message_types[$messenger->name])) {
+			$this->_has_activated_messengers_and_message_types[$messenger->name] = array();
 		}
 		// check if message type has already been added
-		if ( ! in_array( $message_type_name, $this->_has_activated_messengers_and_message_types[ $messenger->name ] ) ) {
-			$this->_has_activated_messengers_and_message_types[ $messenger->name ][] = $message_type_name;
+		if ( ! in_array($message_type_name, $this->_has_activated_messengers_and_message_types[$messenger->name])) {
+			$this->_has_activated_messengers_and_message_types[$messenger->name][] = $message_type_name;
 		}
 	}
 
@@ -841,20 +841,20 @@ 
 	 * @param string        $messenger_name The name of the messenger the settings is being added for.
 	 * @param array         $new_settings   An array of settings to update the existing settings.
 	 */
-	public function add_settings_for_messenger( $messenger_name, $new_settings = array() ) {
-		$messenger = $this->get_messenger( $messenger_name );
-		if ( $messenger instanceof EE_messenger ) {
+	public function add_settings_for_messenger($messenger_name, $new_settings = array()) {
+		$messenger = $this->get_messenger($messenger_name);
+		if ($messenger instanceof EE_messenger) {
 			$msgr_settings = $messenger->get_admin_settings_fields();
-			if ( ! empty( $msgr_settings ) ) {
-				foreach ( $msgr_settings as $field => $value ) {
+			if ( ! empty($msgr_settings)) {
+				foreach ($msgr_settings as $field => $value) {
 					//is there a new setting for this?
-					if ( isset( $new_settings[ $field ] ) ) {
-						$this->_active_message_types[ $messenger->name ]['settings'][ $field ] = $new_settings[ $field ];
+					if (isset($new_settings[$field])) {
+						$this->_active_message_types[$messenger->name]['settings'][$field] = $new_settings[$field];
 						continue;
 					}
 					//only set the default if it isn't already set.
-					if ( ! isset( $this->_active_message_types[ $messenger->name ]['settings'][ $field ] ) ) {
-						$this->_active_message_types[ $messenger->name ]['settings'][ $field ] = $value;
+					if ( ! isset($this->_active_message_types[$messenger->name]['settings'][$field])) {
+						$this->_active_message_types[$messenger->name]['settings'][$field] = $value;
 					}
 				}
 			}
@@ -869,13 +869,13 @@ 
 	 * @param  string|EE_messenger $messenger_name name of messenger
 	 * @return void
 	 */
-	public function deactivate_messenger( $messenger_name ) {
-		if ( $messenger_name instanceof EE_messenger ) {
+	public function deactivate_messenger($messenger_name) {
+		if ($messenger_name instanceof EE_messenger) {
 			$messenger_name = $messenger_name->name;
 		}
-		unset( $this->_active_messengers[ $messenger_name ] );
-		unset( $this->_active_message_types[ $messenger_name ] );
-		$this->_message_template_group_model->deactivate_message_template_groups_for( $messenger_name );
+		unset($this->_active_messengers[$messenger_name]);
+		unset($this->_active_message_types[$messenger_name]);
+		$this->_message_template_group_model->deactivate_message_template_groups_for($messenger_name);
 		$this->update_active_messengers_option();
 	}
 
@@ -885,16 +885,16 @@ 
 	 *
 	 * @param  string $message_type_name name of message type being deactivated
 	 */
-	public function deactivate_message_type( $message_type_name ) {
-		if ( $message_type_name instanceof EE_message_type ) {
+	public function deactivate_message_type($message_type_name) {
+		if ($message_type_name instanceof EE_message_type) {
 			$message_type_name = $message_type_name->name;
 		}
-		foreach ( $this->_active_message_types as $messenger => $settings ) {
+		foreach ($this->_active_message_types as $messenger => $settings) {
 			unset(
-				$this->_active_message_types[ $messenger ]['settings'][ $messenger . '-message_types' ][ $message_type_name ]
+				$this->_active_message_types[$messenger]['settings'][$messenger.'-message_types'][$message_type_name]
 			);
 		}
-		$this->_message_template_group_model->deactivate_message_template_groups_for( '', $message_type_name );
+		$this->_message_template_group_model->deactivate_message_template_groups_for('', $message_type_name);
 		$this->update_active_messengers_option();
 	}
 
@@ -908,11 +908,11 @@ 
 	 * @param string $message_type_name  Name of message type being deactivated.
 	 * @param string $messenger_name     Name of messenger the message type is being deactivated for.
 	 */
-	public function deactivate_message_type_for_messenger( $message_type_name, $messenger_name ) {
-		if ( $this->is_message_type_active_for_messenger( $messenger_name, $message_type_name ) ) {
-			unset( $this->_active_message_types[ $messenger_name ]['settings'][ $messenger_name . '-message_types' ][ $message_type_name ] );
+	public function deactivate_message_type_for_messenger($message_type_name, $messenger_name) {
+		if ($this->is_message_type_active_for_messenger($messenger_name, $message_type_name)) {
+			unset($this->_active_message_types[$messenger_name]['settings'][$messenger_name.'-message_types'][$message_type_name]);
 		}
-		$this->_message_template_group_model->deactivate_message_template_groups_for( array( $messenger_name ), array( $message_type_name ) );
+		$this->_message_template_group_model->deactivate_message_template_groups_for(array($messenger_name), array($message_type_name));
 		$this->update_active_messengers_option();
 	}
 
@@ -929,12 +929,12 @@ 
 	 *
 	 * @return bool true is a generating messenger and can be sent OR FALSE meaning cannot send.
 	 */
-	public function is_generating_messenger_and_active( EE_messenger $messenger, EE_message_type $message_type ) {
+	public function is_generating_messenger_and_active(EE_messenger $messenger, EE_message_type $message_type) {
 		//get the $messengers the message type says it can be used with.
-		foreach ( $message_type->with_messengers() as $generating_messenger => $secondary_messengers ) {
+		foreach ($message_type->with_messengers() as $generating_messenger => $secondary_messengers) {
 			if (
 				$messenger->name === $generating_messenger
-				&& $this->is_message_type_active_for_messenger( $messenger->name, $message_type->name )
+				&& $this->is_message_type_active_for_messenger($messenger->name, $message_type->name)
 			) {
 				return true;
 			}
@@ -971,25 +971,25 @@ 
 	 *                           or all contexts indexed by message type.
 	 * @return array
 	 */
-	public function get_all_contexts( $slugs_only = true ) {
+	public function get_all_contexts($slugs_only = true) {
 		$key = $slugs_only ? 'slugs' : 'all';
 		// check if contexts has been setup yet.
-		if ( empty( $this->_contexts[ $key ] ) ) {
+		if (empty($this->_contexts[$key])) {
 			// So let's get all active message type objects and loop through to get all unique contexts
-			foreach ( $this->get_active_message_type_objects() as $message_type ) {
-				if ( $message_type instanceof EE_message_type ) {
+			foreach ($this->get_active_message_type_objects() as $message_type) {
+				if ($message_type instanceof EE_message_type) {
 					$message_type_contexts = $message_type->get_contexts();
-					if ( $slugs_only ) {
-						foreach ( $message_type_contexts as $context => $context_details ) {
-							$this->_contexts[ $key ][ $context ] = $context_details[ 'label' ];
+					if ($slugs_only) {
+						foreach ($message_type_contexts as $context => $context_details) {
+							$this->_contexts[$key][$context] = $context_details['label'];
 						}
 					} else {
-						$this->_contexts[ $key ][ $message_type->name ] = $message_type_contexts;
+						$this->_contexts[$key][$message_type->name] = $message_type_contexts;
 					}
 				}
 			}
 		}
-		return ! empty( $this->_contexts[ $key ] ) ? $this->_contexts[ $key ] : array();
+		return ! empty($this->_contexts[$key]) ? $this->_contexts[$key] : array();
 	}
 
 
@@ -1008,9 +1008,9 @@ 
 		$installed_message_types = $this->installed_message_types();
 		$all_message_types_valid = true;
 		//loop through list of active message types and verify they are installed.
-		foreach( $list_of_active_message_type_names as $message_type_name ) {
-			if ( ! isset( $installed_message_types[$message_type_name] ) ) {
-				$this->deactivate_message_type( $message_type_name );
+		foreach ($list_of_active_message_type_names as $message_type_name) {
+			if ( ! isset($installed_message_types[$message_type_name])) {
+				$this->deactivate_message_type($message_type_name);
 				$all_message_types_valid = false;
 			}
 		}
@@ -1029,10 +1029,10 @@ 
 	 * @param $messenger_name
 	 * @return bool
 	 */
-	public function has_message_type_been_activated_for_messenger( $message_type_name, $messenger_name ) {
+	public function has_message_type_been_activated_for_messenger($message_type_name, $messenger_name) {
 		$has_activated = $this->get_has_activated_messengers_option();
-		return isset( $has_activated[ $messenger_name ] )
-			&& in_array( $message_type_name, $has_activated[ $messenger_name ] );
+		return isset($has_activated[$messenger_name])
+			&& in_array($message_type_name, $has_activated[$messenger_name]);
 	}
 }
 // End of file EE_Message_Resource_Manager.lib.php

core/libraries/plugin_api/EE_Register_Message_Type.lib.php

Spacing +51 added lines, -51 removed lines

@@ -50,79 +50,79 @@ 
 	 * @throws \EE_Error
 	 * }
 	 */
-	public static function register( $mt_name = NULL, $setup_args = array() ) {
+	public static function register($mt_name = NULL, $setup_args = array()) {
 		//required fields MUST be present, so let's make sure they are.
 		if (
-			! isset( $mt_name )
-			|| ! is_array( $setup_args )
-			|| empty( $setup_args['mtfilename'] ) || empty( $setup_args['autoloadpaths'] )
-		){
+			! isset($mt_name)
+			|| ! is_array($setup_args)
+			|| empty($setup_args['mtfilename']) || empty($setup_args['autoloadpaths'])
+		) {
 			throw new EE_Error(
-				__( 'In order to register a message type with EE_Register_Message_Type::register, you must include a unique name for the message type, plus an array containing the following keys: "mtfilename", "autoloadpaths"', 'event_espresso' )
+				__('In order to register a message type with EE_Register_Message_Type::register, you must include a unique name for the message type, plus an array containing the following keys: "mtfilename", "autoloadpaths"', 'event_espresso')
 			);
 		}
 
 		//make sure we don't register twice
-		if( isset( self::$_ee_message_type_registry[ $mt_name ] ) ){
+		if (isset(self::$_ee_message_type_registry[$mt_name])) {
 			return;
 		}
 
 		//make sure this was called in the right place!
 		if (
-			! did_action( 'EE_Brewing_Regular___messages_caf' )
-			|| did_action( 'AHEE__EE_System__perform_activations_upgrades_and_migrations' )
+			! did_action('EE_Brewing_Regular___messages_caf')
+			|| did_action('AHEE__EE_System__perform_activations_upgrades_and_migrations')
 		) {
 			EE_Error::doing_it_wrong(
 				__METHOD__,
 				sprintf(
-					__('A message type named "%s" has been attempted to be registered with the EE Messages System.  It may or may not work because it should be only called on the "EE_Brewing_Regular___messages_caf" hook.','event_espresso'),
+					__('A message type named "%s" has been attempted to be registered with the EE Messages System.  It may or may not work because it should be only called on the "EE_Brewing_Regular___messages_caf" hook.', 'event_espresso'),
 					$mt_name
 				),
 				'4.3.0'
 			);
 		}
 		//setup $__ee_message_type_registry array from incoming values.
-		self::$_ee_message_type_registry[ $mt_name ] = array(
+		self::$_ee_message_type_registry[$mt_name] = array(
 			'mtfilename' => (string) $setup_args['mtfilename'],
 			'autoloadpaths' => (array) $setup_args['autoloadpaths'],
-			'messengers_to_activate_with' => ! empty( $setup_args['messengers_to_activate_with'] )
+			'messengers_to_activate_with' => ! empty($setup_args['messengers_to_activate_with'])
 				? (array) $setup_args['messengers_to_activate_with']
 				: array(),
-			'messengers_to_validate_with' => ! empty( $setup_args['messengers_to_validate_with'] )
+			'messengers_to_validate_with' => ! empty($setup_args['messengers_to_validate_with'])
 				? (array) $setup_args['messengers_to_validate_with']
 				: array(),
-			'force_activation' => ! empty( $setup_args['force_activation'] )
+			'force_activation' => ! empty($setup_args['force_activation'])
 				? (bool) $setup_args['force_activation']
 				: array()
 		);
 		//add filters
 		add_filter(
 			'FHEE__EED_Messages___set_messages_paths___MSG_PATHS',
-			array( 'EE_Register_Message_Type', 'register_msgs_autoload_paths' ),
+			array('EE_Register_Message_Type', 'register_msgs_autoload_paths'),
 			10
 		);
 		add_filter(
 			'FHEE__EE_messages__get_installed__messagetype_files',
-			array( 'EE_Register_Message_Type', 'register_messagetype_files' ),
+			array('EE_Register_Message_Type', 'register_messagetype_files'),
 			10,
 			1
 		);
 		add_filter(
 			'FHEE__EE_messenger__get_default_message_types__default_types',
-			array( 'EE_Register_Message_Type', 'register_messengers_to_activate_mt_with' ),
+			array('EE_Register_Message_Type', 'register_messengers_to_activate_mt_with'),
 			10,
 			2
 		);
 		add_filter(
 			'FHEE__EE_messenger__get_valid_message_types__valid_types',
-			array( 'EE_Register_Message_Type', 'register_messengers_to_validate_mt_with' ),
+			array('EE_Register_Message_Type', 'register_messengers_to_validate_mt_with'),
 			10,
 			2
 		);
 		//actions
 		add_action(
 			'AHEE__EE_Addon__initialize_default_data__begin',
-			array( 'EE_Register_Message_Type', 'set_defaults' )
+			array('EE_Register_Message_Type', 'set_defaults')
 		);
 	}
 
@@ -133,15 +133,15 @@ 
 	 */
 	public static function set_defaults() {
 		/** @type EE_Message_Resource_Manager $message_resource_manager */
-		$message_resource_manager = EE_Registry::instance()->load_lib( 'Message_Resource_Manager' );
+		$message_resource_manager = EE_Registry::instance()->load_lib('Message_Resource_Manager');
 
 		//for any message types with force activation, let's ensure they are activated
-		foreach ( self::$_ee_message_type_registry as $message_type_name => $settings ) {
-			if ( $settings['force_activation'] ) {
-				foreach ( $settings['messengers_to_activate_with'] as $messenger ) {
+		foreach (self::$_ee_message_type_registry as $message_type_name => $settings) {
+			if ($settings['force_activation']) {
+				foreach ($settings['messengers_to_activate_with'] as $messenger) {
 					//DO not force activation if this message type has already been activated in the system
-					if ( ! $message_resource_manager->has_message_type_been_activated_for_messenger( $message_type_name, $messenger ) ) {
-						$message_resource_manager->ensure_message_type_is_active( $message_type_name, $messenger );
+					if ( ! $message_resource_manager->has_message_type_been_activated_for_messenger($message_type_name, $messenger)) {
+						$message_resource_manager->ensure_message_type_is_active($message_type_name, $messenger);
 					}
 				}
 			}
@@ -158,13 +158,13 @@ 
 	 * @param string  $message_type_name the name for the message type that was previously registered
 	 * @return void
 	 */
-	public static function deregister( $message_type_name = null ) {
-		if ( ! empty( self::$_ee_message_type_registry[ $message_type_name ] ) ) {
+	public static function deregister($message_type_name = null) {
+		if ( ! empty(self::$_ee_message_type_registry[$message_type_name])) {
 			//let's make sure that we remove any place this message type was made active
 			/** @var EE_Message_Resource_Manager $Message_Resource_Manager */
-			$Message_Resource_Manager = EE_Registry::instance()->load_lib( 'Message_Resource_Manager' );
-			$Message_Resource_Manager->deactivate_message_type( $message_type_name );
-			unset( self::$_ee_message_type_registry[ $message_type_name ] );
+			$Message_Resource_Manager = EE_Registry::instance()->load_lib('Message_Resource_Manager');
+			$Message_Resource_Manager->deactivate_message_type($message_type_name);
+			unset(self::$_ee_message_type_registry[$message_type_name]);
 		}
 	}
 
@@ -178,12 +178,12 @@ 
 	 * @param  array  $messagetype_files The current array of message type file names
 	 * @return  array                                 Array of message type file names
 	 */
-	public static function register_messagetype_files( $messagetype_files ) {
-		if ( empty( self::$_ee_message_type_registry ) ) {
+	public static function register_messagetype_files($messagetype_files) {
+		if (empty(self::$_ee_message_type_registry)) {
 			return $messagetype_files;
 		}
-		foreach ( self::$_ee_message_type_registry as $mt_reg ) {
-			if ( empty( $mt_reg['mtfilename' ] ) ) {
+		foreach (self::$_ee_message_type_registry as $mt_reg) {
+			if (empty($mt_reg['mtfilename'])) {
 				continue;
 			}
 			$messagetype_files[] = $mt_reg['mtfilename'];
@@ -203,13 +203,13 @@ 
 	 * @param array $paths array of paths to be checked by EE_messages autoloader.
 	 * @return array
 	 */
-	public static function register_msgs_autoload_paths( $paths  ) {
-		if ( ! empty( self::$_ee_message_type_registry ) ) {
-			foreach ( self::$_ee_message_type_registry as $mt_reg ) {
-				if ( empty( $mt_reg['autoloadpaths'] ) ) {
+	public static function register_msgs_autoload_paths($paths) {
+		if ( ! empty(self::$_ee_message_type_registry)) {
+			foreach (self::$_ee_message_type_registry as $mt_reg) {
+				if (empty($mt_reg['autoloadpaths'])) {
 					continue;
 				}
-				$paths = array_merge( $paths, $mt_reg['autoloadpaths'] );
+				$paths = array_merge($paths, $mt_reg['autoloadpaths']);
 			}
 		}
 		return $paths;
@@ -228,18 +228,18 @@ 
 	 * @param  EE_messenger $messenger      The EE_messenger the filter is called from.
 	 * @return array
 	 */
-	public static function register_messengers_to_activate_mt_with( $default_types, EE_messenger $messenger ) {
-		if ( empty( self::$_ee_message_type_registry ) ) {
+	public static function register_messengers_to_activate_mt_with($default_types, EE_messenger $messenger) {
+		if (empty(self::$_ee_message_type_registry)) {
 			return $default_types;
 		}
-		foreach ( self::$_ee_message_type_registry as $message_type_name => $mt_reg ) {
-			if ( empty( $mt_reg['messengers_to_activate_with'] ) || empty( $mt_reg['mtfilename'] ) ) {
+		foreach (self::$_ee_message_type_registry as $message_type_name => $mt_reg) {
+			if (empty($mt_reg['messengers_to_activate_with']) || empty($mt_reg['mtfilename'])) {
 				continue;
 			}
 			// loop through each of the messengers and if it matches the loaded class
 			// then we add this message type to the
-			foreach ( $mt_reg['messengers_to_activate_with'] as $msgr ) {
-				if ( $messenger->name == $msgr ) {
+			foreach ($mt_reg['messengers_to_activate_with'] as $msgr) {
+				if ($messenger->name == $msgr) {
 					$default_types[] = $message_type_name;
 				}
 			}
@@ -259,18 +259,18 @@ 
 	 * @param  EE_messenger $messenger      The EE_messenger the filter is called from.
 	 * @return  array
 	 */
-	public static function register_messengers_to_validate_mt_with( $valid_types, EE_messenger $messenger ) {
-		if ( empty( self::$_ee_message_type_registry ) ) {
+	public static function register_messengers_to_validate_mt_with($valid_types, EE_messenger $messenger) {
+		if (empty(self::$_ee_message_type_registry)) {
 			return $valid_types;
 		}
-		foreach ( self::$_ee_message_type_registry as $message_type_name => $mt_reg ) {
-			if ( empty( $mt_reg['messengers_to_validate_with'] ) || empty( $mt_reg['mtfilename'] ) ) {
+		foreach (self::$_ee_message_type_registry as $message_type_name => $mt_reg) {
+			if (empty($mt_reg['messengers_to_validate_with']) || empty($mt_reg['mtfilename'])) {
 				continue;
 			}
 			// loop through each of the messengers and if it matches the loaded class
 			// then we add this message type to the
-			foreach ( $mt_reg['messengers_to_validate_with'] as $msgr ) {
-				if ( $messenger->name == $msgr ) {
+			foreach ($mt_reg['messengers_to_validate_with'] as $msgr) {
+				if ($messenger->name == $msgr) {
 					$valid_types[] = $message_type_name;
 				}
 			}

Indentation +8 added lines, -8 removed lines

@@ -251,14 +251,14 @@
 
 
 	 /**
-	 * callback for FHEE__EE_messenger__get_valid_message_types__default_types filter.
-	 *
-	 * @since   4.3.0
-	 * @param  array        $valid_types 	array of message types valid with messenger (
-	 *                                      corresponds to the $name property of message type)
-	 * @param  EE_messenger $messenger      The EE_messenger the filter is called from.
-	 * @return  array
-	 */
+	  * callback for FHEE__EE_messenger__get_valid_message_types__default_types filter.
+	  *
+	  * @since   4.3.0
+	  * @param  array        $valid_types 	array of message types valid with messenger (
+	  *                                      corresponds to the $name property of message type)
+	  * @param  EE_messenger $messenger      The EE_messenger the filter is called from.
+	  * @return  array
+	  */
 	public static function register_messengers_to_validate_mt_with( $valid_types, EE_messenger $messenger ) {
 		if ( empty( self::$_ee_message_type_registry ) ) {
 			return $valid_types;