eventespresso / event-espresso-core

caffeinated/modules/recaptcha/ReCaptcha/RequestMethod/Socket.php

Indentation +63 added lines, -63 removed lines

@@ -32,73 +32,73 @@
  */
 class Socket
 {
-    private $handle = null;
+	private $handle = null;
 
-    /**
-     * fsockopen
-     * 
-     * @see http://php.net/fsockopen
-     * @param string $hostname
-     * @param int $port
-     * @param int $errno
-     * @param string $errstr
-     * @param float $timeout
-     * @return resource
-     */
-    public function fsockopen($hostname, $port = -1, &$errno = 0, &$errstr = '', $timeout = null)
-    {
-        $this->handle = fsockopen($hostname, $port, $errno, $errstr, (is_null($timeout) ? ini_get("default_socket_timeout") : $timeout));
+	/**
+	 * fsockopen
+	 * 
+	 * @see http://php.net/fsockopen
+	 * @param string $hostname
+	 * @param int $port
+	 * @param int $errno
+	 * @param string $errstr
+	 * @param float $timeout
+	 * @return resource
+	 */
+	public function fsockopen($hostname, $port = -1, &$errno = 0, &$errstr = '', $timeout = null)
+	{
+		$this->handle = fsockopen($hostname, $port, $errno, $errstr, (is_null($timeout) ? ini_get("default_socket_timeout") : $timeout));
 
-        if ($this->handle != false && $errno === 0 && $errstr === '') {
-            return $this->handle;
-        } else {
-            return false;
-        }
-    }
+		if ($this->handle != false && $errno === 0 && $errstr === '') {
+			return $this->handle;
+		} else {
+			return false;
+		}
+	}
 
-    /**
-     * fwrite
-     * 
-     * @see http://php.net/fwrite
-     * @param string $string
-     * @param int $length
-     * @return int | bool
-     */
-    public function fwrite($string, $length = null)
-    {
-        return fwrite($this->handle, $string, (is_null($length) ? strlen($string) : $length));
-    }
+	/**
+	 * fwrite
+	 * 
+	 * @see http://php.net/fwrite
+	 * @param string $string
+	 * @param int $length
+	 * @return int | bool
+	 */
+	public function fwrite($string, $length = null)
+	{
+		return fwrite($this->handle, $string, (is_null($length) ? strlen($string) : $length));
+	}
 
-    /**
-     * fgets
-     * 
-     * @see http://php.net/fgets
-     * @param int $length
-     */
-    public function fgets($length = null)
-    {
-        return fgets($this->handle, $length);
-    }
+	/**
+	 * fgets
+	 * 
+	 * @see http://php.net/fgets
+	 * @param int $length
+	 */
+	public function fgets($length = null)
+	{
+		return fgets($this->handle, $length);
+	}
 
-    /**
-     * feof
-     * 
-     * @see http://php.net/feof
-     * @return bool
-     */
-    public function feof()
-    {
-        return feof($this->handle);
-    }
+	/**
+	 * feof
+	 * 
+	 * @see http://php.net/feof
+	 * @return bool
+	 */
+	public function feof()
+	{
+		return feof($this->handle);
+	}
 
-    /**
-     * fclose
-     * 
-     * @see http://php.net/fclose
-     * @return bool
-     */
-    public function fclose()
-    {
-        return fclose($this->handle);
-    }
+	/**
+	 * fclose
+	 * 
+	 * @see http://php.net/fclose
+	 * @return bool
+	 */
+	public function fclose()
+	{
+		return fclose($this->handle);
+	}
 }

caffeinated/core/libraries/messages/message_type/newsletter/EE_Newsletter_message_type.class.php

Braces +3 added lines, -1 removed lines

@@ -5,7 +5,9 @@
  * @subpackage plugin api, messages
  * @since           4.5.0
  */
-if ( ! defined('EVENT_ESPRESSO_VERSION')) exit('No direct script access allowed');
+if ( ! defined('EVENT_ESPRESSO_VERSION')) {
+	exit('No direct script access allowed');
+}
 
 /**
  * Use this to register or deregister a new message template pack variation for the EE messages system.

Spacing +28 added lines, -28 removed lines

@@ -22,10 +22,10 @@ 
 
 	public function __construct() {
 		$this->name = 'newsletter';
-		$this->description = __( 'Batch message type messages are triggered manually by the admin for sending notifications to a selected group of recipients. This should only be used for more general notification type messages that contain information specific for the recipients. For "newsletter" type messages we recommend using an email list service like MailChimp, because sending non-related mail-outs to contacts increases the risk of your site domain getting added to spam lists, which will prevent messages getting to users.', 'event_espresso' );
+		$this->description = __('Batch message type messages are triggered manually by the admin for sending notifications to a selected group of recipients. This should only be used for more general notification type messages that contain information specific for the recipients. For "newsletter" type messages we recommend using an email list service like MailChimp, because sending non-related mail-outs to contacts increases the risk of your site domain getting added to spam lists, which will prevent messages getting to users.', 'event_espresso');
 		$this->label = array(
-			'singular' => __( 'batch', 'event_espresso' ),
-			'plural' => __( 'batches', 'event_espresso' )
+			'singular' => __('batch', 'event_espresso'),
+			'plural' => __('batches', 'event_espresso')
 			);
 		$this->_master_templates = array(
 			'email' => 'registration',
@@ -49,9 +49,9 @@ 
 
 
 
-	protected function _get_data_for_context( $context, EE_Registration $registration, $id ) {
+	protected function _get_data_for_context($context, EE_Registration $registration, $id) {
 		//newsletter message type data handler is 'Registrations' and it expects an array of EE_Registration objects.
-		return array( $registration );
+		return array($registration);
 	}
 
 
@@ -64,15 +64,15 @@ 
 
 	protected function _set_contexts() {
 		$this->_context_label = array(
-			'label' => __( 'recipient', 'event_espresso' ),
-			'plural' => __( 'recipients', 'event_espresso' ),
-			'description' => __( 'Recipient\'s are who will receive the message.', 'event_espresso' )
+			'label' => __('recipient', 'event_espresso'),
+			'plural' => __('recipients', 'event_espresso'),
+			'description' => __('Recipient\'s are who will receive the message.', 'event_espresso')
 			);
 
 		$this->_contexts = array(
 			'attendee' => array(
-				'label' => __( 'Registrant', 'event_espresso' ),
-				'description' => __( 'This template goes to selected registrants.', 'event_espresso' )
+				'label' => __('Registrant', 'event_espresso'),
+				'description' => __('This template goes to selected registrants.', 'event_espresso')
 				)
 			);
 	}
@@ -98,13 +98,13 @@ 
 			'newsletter',
 			);
 
-		foreach ( $this->_valid_shortcodes as $context => $shortcodes ) {
-			foreach ( $shortcodes as $key => $shortcode ) {
-				if ( ! in_array( $shortcode, $included_shortcodes ) ) {
-					unset( $this->_valid_shortcodes[ $context ][ $key ] );
+		foreach ($this->_valid_shortcodes as $context => $shortcodes) {
+			foreach ($shortcodes as $key => $shortcode) {
+				if ( ! in_array($shortcode, $included_shortcodes)) {
+					unset($this->_valid_shortcodes[$context][$key]);
 				}
 			}
-			$this->_valid_shortcodes[ $context ][] = 'newsletter';
+			$this->_valid_shortcodes[$context][] = 'newsletter';
 		}
 
 	}
@@ -118,44 +118,44 @@ 
 		$addressee = array();
 
 		//looping through registrations
-		foreach ( $this->_data->registrations as $reg_id => $details ) {
+		foreach ($this->_data->registrations as $reg_id => $details) {
 			//set $attendee array to blank on each loop
 			$aee = array();
 
 			//need to get the attendee from this registration.
-			$attendee = isset( $details['att_obj'] ) && $details['att_obj'] instanceof EE_Attendee
+			$attendee = isset($details['att_obj']) && $details['att_obj'] instanceof EE_Attendee
 				? $details['att_obj']
 				: null;
 
-			if ( ! $attendee instanceof EE_Attendee ) {
+			if ( ! $attendee instanceof EE_Attendee) {
 				continue;
 			}
 
 			//set $aee from attendee object
 			$aee['att_obj'] = $attendee;
-			$aee['reg_objs'] = isset( $this->_data->attendees[ $attendee->ID() ]['reg_objs'] )
-				? $this->_data->attendees[ $attendee->ID() ]['reg_objs']
+			$aee['reg_objs'] = isset($this->_data->attendees[$attendee->ID()]['reg_objs'])
+				? $this->_data->attendees[$attendee->ID()]['reg_objs']
 				: array();
 			$aee['attendee_email'] = $attendee->email();
-			$aee['tkt_objs'] = isset( $this->_data->attendees[ $attendee->ID() ]['tkt_objs'] )
-				? $this->_data->attendees[ $attendee->ID() ]['tkt_objs']
+			$aee['tkt_objs'] = isset($this->_data->attendees[$attendee->ID()]['tkt_objs'])
+				? $this->_data->attendees[$attendee->ID()]['tkt_objs']
 				: array();
 
-			if ( isset( $this->_data->attendees[ $attendee->ID() ]['evt_objs'] ) ) {
-				$aee['evt_objs'] = $this->_data->attendees[ $attendee->ID() ]['evt_objs'];
-				$aee['events'] = $this->_data->attendees[ $attendee->ID() ]['evt_objs'];
+			if (isset($this->_data->attendees[$attendee->ID()]['evt_objs'])) {
+				$aee['evt_objs'] = $this->_data->attendees[$attendee->ID()]['evt_objs'];
+				$aee['events'] = $this->_data->attendees[$attendee->ID()]['evt_objs'];
 			} else {
 				$aee['evt_objs'] = $aee['events'] = array();
 			}
 
-			$aee['reg_obj'] = isset( $details['reg_obj'] )
+			$aee['reg_obj'] = isset($details['reg_obj'])
 				? $details['reg_obj']
 				: null;
 			$aee['attendees'] = $this->_data->attendees;
 
 			//merge in the primary attendee data
-			$aee = array_merge( $this->_default_addressee_data, $aee );
-			$addressee[] = new EE_Messages_Addressee( $aee );
+			$aee = array_merge($this->_default_addressee_data, $aee);
+			$addressee[] = new EE_Messages_Addressee($aee);
 		}
 		return $addressee;
 	}

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

Braces +3 added lines, -1 removed lines

@@ -1,5 +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' );
+}
 
 /**
  * This prepares data for message types that send messages for multiple registrations (that could span multiple transactions)

Spacing +14 added lines, -14 removed lines

@@ -1,5 +1,5 @@ 
 <?php
-if ( ! defined( 'EVENT_ESPRESSO_VERSION' ) ) exit( 'No direct script access allowed' );
+if ( ! defined('EVENT_ESPRESSO_VERSION')) exit('No direct script access allowed');
 
 /**
  * This prepares data for message types that send messages for multiple registrations (that could span multiple
@@ -20,13 +20,13 @@ 
 	 * @throws EE_Error
 	 * @access protected
 	 */
-	public function __construct( $data = array() ) {
+	public function __construct($data = array()) {
 
 		//validate that the first element in the array is an EE_Registration object.
-		if ( ! reset( $data ) instanceof EE_Registration ) {
-			throw new EE_Error( __( 'The EE_Message_Registrations_incoming_data class expects an array of EE_Registration objects.', 'event_espresso' ) );
+		if ( ! reset($data) instanceof EE_Registration) {
+			throw new EE_Error(__('The EE_Message_Registrations_incoming_data class expects an array of EE_Registration objects.', 'event_espresso'));
 		}
-		parent::__construct( $data );
+		parent::__construct($data);
 	}
 
 
@@ -58,10 +58,10 @@ 
 	 *
 	 * @return EE_Registration[]   The data being prepared for the db
 	 */
-	static public function convert_data_for_persistent_storage( $registrations ) {
+	static public function convert_data_for_persistent_storage($registrations) {
 		if (
-			! is_array( $registrations )
-			|| ! reset( $registrations ) instanceof EE_Registration
+			! is_array($registrations)
+			|| ! reset($registrations) instanceof EE_Registration
 		) {
 			return array();
 		}
@@ -70,8 +70,8 @@ 
 
 		$registration_ids = array_filter(
 			array_map(
-				function( $registration ) {
-					if ( $registration instanceof EE_Registration ) {
+				function($registration) {
+					if ($registration instanceof EE_Registration) {
 						return $registration->ID();
 					}
 				},
@@ -95,16 +95,16 @@ 
 	 *
 	 * @return EE_Registration[]
 	 */
-	static public function convert_data_from_persistent_storage( $data ) {
+	static public function convert_data_from_persistent_storage($data) {
 		//since this was added later, we need to account of possible back compat issues where data already queued for generation
 		//is in the old format, which is an array of EE_Registration objects.  So if that's the case, then let's just return them
 		//@see https://events.codebasehq.com/projects/event-espresso/tickets/10127
-		if ( is_array( $data ) && reset( $data ) instanceof EE_Registration ) {
+		if (is_array($data) && reset($data) instanceof EE_Registration) {
 			return $data;
 		}
 
-		$registrations = is_array( $data )
-				? EEM_Registration::instance()->get_all( array( array( 'REG_ID' => array( 'IN', $data ) ) ) )
+		$registrations = is_array($data)
+				? EEM_Registration::instance()->get_all(array(array('REG_ID' => array('IN', $data))))
 				: array();
 		return $registrations;
 	}

core/libraries/messages/data_class/EE_Messages_incoming_data.core.php

Indentation +1 added lines, -1 removed lines

@@ -347,7 +347,7 @@
 				$total_ticket_count++;
 				$tickets[ $ticket->ID() ]['ticket'] = $ticket;
 				$tickets[ $ticket->ID() ]['count'] = is_array( $tickets[ $ticket->ID() ] )
-				                                     && isset( $tickets[ $ticket->ID() ]['count'] )
+													 && isset( $tickets[ $ticket->ID() ]['count'] )
 					? $tickets[ $ticket->ID() ]['count'] + 1
 					: 1;
 				$tickets[ $ticket->ID() ]['att_objs'][ $reg->attendee_ID() ] = $reg->attendee();

Braces +2 added lines, -1 removed lines

@@ -6,8 +6,9 @@
  * @package Event Espresso
  * @subpackage messages
  */
-if (!defined('EVENT_ESPRESSO_VERSION') )
+if (!defined('EVENT_ESPRESSO_VERSION') ) {
 	exit('NO direct script access allowed');
+}
 
 /**
  *

Spacing +67 added lines, -67 removed lines

@@ -1,6 +1,6 @@ 
 <?php
 
-if (!defined('EVENT_ESPRESSO_VERSION') )
+if ( ! defined('EVENT_ESPRESSO_VERSION'))
 	exit('NO direct script access allowed');
 
 /**
@@ -266,7 +266,7 @@ 
 	 * @param mixed $data incoming data object|array.  Suggested that child classes use type hinting for expected
 	 * data object.  But here parent will be generic because we don't know what's coming in.
 	 */
-	public function __construct( $data ) {
+	public function __construct($data) {
 		$this->_data = $data;
 		$this->_setup_data();
 	}
@@ -288,7 +288,7 @@ 
 	 *
 	 * @return mixed   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;
 	}
 
@@ -304,7 +304,7 @@ 
 	 *
 	 * @return mixed
 	 */
-	static public function convert_data_from_persistent_storage( $data ) {
+	static public function convert_data_from_persistent_storage($data) {
 		return $data;
 	}
 
@@ -331,8 +331,8 @@ 
 	protected function _assemble_data() {
 		//verify that reg_objs is set
 		if (
-			! is_array( $this->reg_objs )
-			&& ! reset( $this->reg_objs ) instanceof EE_Registration
+			! is_array($this->reg_objs)
+			&& ! reset($this->reg_objs) instanceof EE_Registration
 		) {
 			throw new EE_Error(
 				__(
@@ -347,84 +347,84 @@ 
 		$answers = $questions = $attendees = $line_items = $registrations = array();
 		$total_ticket_count = 0;
 
-		if ( ! empty( $this->reg_objs ) ) {
+		if ( ! empty($this->reg_objs)) {
 			$event_attendee_count = array();
-			foreach ( $this->reg_objs as $reg ) {
+			foreach ($this->reg_objs as $reg) {
 
 				if (
-					$this->_skip_registration_for_processing( $reg )
+					$this->_skip_registration_for_processing($reg)
 				) {
 					continue;
 				}
 
 				$evt_id = $reg->event_ID();
 				/** @type EE_Ticket $ticket */
-				$ticket = $reg->get_first_related( 'Ticket' );
+				$ticket = $reg->get_first_related('Ticket');
 				$relateddatetime = $ticket->datetimes();
 				$total_ticket_count++;
-				$tickets[ $ticket->ID() ]['ticket'] = $ticket;
-				$tickets[ $ticket->ID() ]['count'] = is_array( $tickets[ $ticket->ID() ] )
-				                                     && isset( $tickets[ $ticket->ID() ]['count'] )
-					? $tickets[ $ticket->ID() ]['count'] + 1
+				$tickets[$ticket->ID()]['ticket'] = $ticket;
+				$tickets[$ticket->ID()]['count'] = is_array($tickets[$ticket->ID()])
+				                                     && isset($tickets[$ticket->ID()]['count'])
+					? $tickets[$ticket->ID()]['count'] + 1
 					: 1;
-				$tickets[ $ticket->ID() ]['att_objs'][ $reg->attendee_ID() ] = $reg->attendee();
-				$tickets[ $ticket->ID() ]['dtt_objs'] = $relateddatetime;
-				$tickets[ $ticket->ID() ]['reg_objs'][ $reg->ID() ] = $reg;
+				$tickets[$ticket->ID()]['att_objs'][$reg->attendee_ID()] = $reg->attendee();
+				$tickets[$ticket->ID()]['dtt_objs'] = $relateddatetime;
+				$tickets[$ticket->ID()]['reg_objs'][$reg->ID()] = $reg;
 				$event = $reg->event();
-				$tickets[ $ticket->ID() ]['EE_Event'] = $event;
-				$evtcache[ $evt_id ] = $event;
-				$eventsetup[ $evt_id ]['reg_objs'][ $reg->ID() ] = $reg;
-				$eventsetup[ $evt_id ]['tkt_objs'][ $ticket->ID() ] = $ticket;
-				$eventsetup[ $evt_id ]['att_objs'][ $reg->attendee_ID() ] = $reg->attendee();
-				$event_attendee_count[ $evt_id ] = isset( $event_attendee_count[ $evt_id ] )
-					? $event_attendee_count[ $evt_id ] + 1
+				$tickets[$ticket->ID()]['EE_Event'] = $event;
+				$evtcache[$evt_id] = $event;
+				$eventsetup[$evt_id]['reg_objs'][$reg->ID()] = $reg;
+				$eventsetup[$evt_id]['tkt_objs'][$ticket->ID()] = $ticket;
+				$eventsetup[$evt_id]['att_objs'][$reg->attendee_ID()] = $reg->attendee();
+				$event_attendee_count[$evt_id] = isset($event_attendee_count[$evt_id])
+					? $event_attendee_count[$evt_id] + 1
 					: 0;
-				$attendees[ $reg->attendee_ID() ]['line_ref'][] = $evt_id;
-				$attendees[ $reg->attendee_ID() ]['att_obj'] = $reg->attendee();
-				$attendees[ $reg->attendee_ID() ]['reg_objs'][ $reg->ID() ] = $reg;
+				$attendees[$reg->attendee_ID()]['line_ref'][] = $evt_id;
+				$attendees[$reg->attendee_ID()]['att_obj'] = $reg->attendee();
+				$attendees[$reg->attendee_ID()]['reg_objs'][$reg->ID()] = $reg;
 				//$attendees[ $reg->attendee_ID() ]['registration_id'] = $reg->ID();
-				$attendees[ $reg->attendee_ID() ]['attendee_email'] = $reg->attendee() instanceof EE_Attendee
+				$attendees[$reg->attendee_ID()]['attendee_email'] = $reg->attendee() instanceof EE_Attendee
 					? $reg->attendee()->email()
 					: '';
-				$attendees[ $reg->attendee_ID() ]['tkt_objs'][ $ticket->ID() ] = $ticket;
-				$attendees[ $reg->attendee_ID() ]['evt_objs'][ $evt_id ] = $event;
+				$attendees[$reg->attendee_ID()]['tkt_objs'][$ticket->ID()] = $ticket;
+				$attendees[$reg->attendee_ID()]['evt_objs'][$evt_id] = $event;
 
 				//registrations
-				$registrations[ $reg->ID() ]['tkt_obj'] = $ticket;
-				$registrations[ $reg->ID() ]['evt_obj'] = $event;
-				$registrations[ $reg->ID() ]['reg_obj'] = $reg;
-				$registrations[ $reg->ID() ]['att_obj'] = $reg->attendee();
+				$registrations[$reg->ID()]['tkt_obj'] = $ticket;
+				$registrations[$reg->ID()]['evt_obj'] = $event;
+				$registrations[$reg->ID()]['reg_obj'] = $reg;
+				$registrations[$reg->ID()]['att_obj'] = $reg->attendee();
 
 				//set up answer objects
-				$rel_ans = $reg->get_many_related( 'Answer' );
-				foreach ( $rel_ans as $ansid => $answer ) {
-					if ( ! isset( $questions[ $ansid ] ) ) {
-						$questions[ $ansid ] = $answer->get_first_related( 'Question' );
+				$rel_ans = $reg->get_many_related('Answer');
+				foreach ($rel_ans as $ansid => $answer) {
+					if ( ! isset($questions[$ansid])) {
+						$questions[$ansid] = $answer->get_first_related('Question');
 					}
-					$answers[ $ansid ] = $answer;
-					$registrations[ $reg->ID() ]['ans_objs'][ $ansid ] = $answer;
+					$answers[$ansid] = $answer;
+					$registrations[$reg->ID()]['ans_objs'][$ansid] = $answer;
 				}
 
-				foreach ( $relateddatetime as $dtt_id => $datetime ) {
-					$eventsetup[ $evt_id ]['dtt_objs'][ $dtt_id ] = $datetime;
-					$registrations[ $reg->ID() ]['dtt_objs'][ $dtt_id ] = $datetime;
+				foreach ($relateddatetime as $dtt_id => $datetime) {
+					$eventsetup[$evt_id]['dtt_objs'][$dtt_id] = $datetime;
+					$registrations[$reg->ID()]['dtt_objs'][$dtt_id] = $datetime;
 
-					if ( isset( $datetimes[ $dtt_id ] ) ) {
+					if (isset($datetimes[$dtt_id])) {
 						continue; //already have this info in the datetimes array.
 					}
 
-					$datetimes[ $dtt_id ]['tkt_objs'][] = $ticket;
-					$datetimes[ $dtt_id ]['datetime'] = $datetime;
-					$datetimes[ $dtt_id ]['evt_objs'][ $evt_id ] = $event;
-					$datetimes[ $dtt_id ]['reg_objs'][ $reg->ID() ] = $reg;
+					$datetimes[$dtt_id]['tkt_objs'][] = $ticket;
+					$datetimes[$dtt_id]['datetime'] = $datetime;
+					$datetimes[$dtt_id]['evt_objs'][$evt_id] = $event;
+					$datetimes[$dtt_id]['reg_objs'][$reg->ID()] = $reg;
 				}
 			}
 
 			//let's loop through the unique event=>reg items and setup data on them
 
-			if ( ! empty( $eventsetup ) ) {
-				foreach ( $eventsetup as $evt_id => $items ) {
-					if ( $this->txn instanceof EE_Transaction ) {
+			if ( ! empty($eventsetup)) {
+				foreach ($eventsetup as $evt_id => $items) {
+					if ($this->txn instanceof EE_Transaction) {
 						$ticket_line_items_for_event = EEM_Line_Item::instance()->get_all(
 							array(
 								array(
@@ -437,25 +437,25 @@ 
 					} else {
 						$ticket_line_items_for_event = array();
 					}
-					$events[ $evt_id ] = array(
+					$events[$evt_id] = array(
 						'ID' => $evt_id,
-						'event' => $evtcache[ $evt_id ],
-						'name' => $evtcache[ $evt_id ] instanceof EE_Event ? $evtcache[ $evt_id ]->name() : '',
-						'total_attendees' => $event_attendee_count[ $evt_id ],
+						'event' => $evtcache[$evt_id],
+						'name' => $evtcache[$evt_id] instanceof EE_Event ? $evtcache[$evt_id]->name() : '',
+						'total_attendees' => $event_attendee_count[$evt_id],
 						'reg_objs' => $items['reg_objs'],
 						'tkt_objs' => $items['tkt_objs'],
 						'att_objs' => $items['att_objs'],
-						'dtt_objs' => isset( $items['dtt_objs'] ) ? $items['dtt_objs'] : array(),
+						'dtt_objs' => isset($items['dtt_objs']) ? $items['dtt_objs'] : array(),
 						'line_items' => $ticket_line_items_for_event,
 					);
 
 					//make sure the tickets have the line items setup for them.
-					foreach ( $ticket_line_items_for_event as $line_id => $line_item ) {
-						if ( $line_item instanceof EE_Line_Item ) {
-							$tickets[ $line_item->ticket()->ID() ]['line_item'] = $line_item;
-							$tickets[ $line_item->ticket()->ID() ]['sub_line_items'] = $line_item->children();
-							$line_items[ $line_item->ID() ]['children'] = $line_item->children();
-							$line_items[ $line_item->ID() ]['EE_Ticket'] = $line_item->ticket();
+					foreach ($ticket_line_items_for_event as $line_id => $line_item) {
+						if ($line_item instanceof EE_Line_Item) {
+							$tickets[$line_item->ticket()->ID()]['line_item'] = $line_item;
+							$tickets[$line_item->ticket()->ID()]['sub_line_items'] = $line_item->children();
+							$line_items[$line_item->ID()]['children'] = $line_item->children();
+							$line_items[$line_item->ID()]['EE_Ticket'] = $line_item->ticket();
 						}
 					}
 				}
@@ -477,7 +477,7 @@ 
 		$this->total_ticket_count = $total_ticket_count;
 		$this->registrations = $registrations;
 
-		if ( $this->txn instanceof EE_Transaction ) {
+		if ($this->txn instanceof EE_Transaction) {
 			$this->tax_line_items        = $this->txn->tax_items();
 			$this->additional_line_items = $this->txn->non_ticket_line_items();
 			$this->payments              = $this->txn->payments();
@@ -487,10 +487,10 @@ 
 			//let's get just the primary_attendee_data!  First we get the primary registration object.
 			$primary_reg = $this->txn->primary_registration();
 			// verify
-			if ( $primary_reg instanceof EE_Registration ) {
+			if ($primary_reg instanceof EE_Registration) {
 
 				// get attendee object
-				if ( $primary_reg->attendee() instanceof EE_Attendee ) {
+				if ($primary_reg->attendee() instanceof EE_Attendee) {
 
 					//now we can setup the primary_attendee_data array
 					$this->primary_attendee_data = array(
@@ -534,8 +534,8 @@ 
 	 * @return bool  returning true means we DO want to skip processing.  returning false means we DON'T want to skip
 	 *               processing
 	 */
-	protected function _skip_registration_for_processing( EE_Registration $registration ) {
-		if ( empty( $this->filtered_reg_status ) ) {
+	protected function _skip_registration_for_processing(EE_Registration $registration) {
+		if (empty($this->filtered_reg_status)) {
 			return false;
 		}
 

core/libraries/rest_api/Model_Data_Translator.php

Braces +3 added lines, -3 removed lines

@@ -135,7 +135,7 @@ 
 		$pos_of_star = strpos($condition_query_param_key, '*');
 		if($pos_of_star === FALSE){
 			return $condition_query_param_key;
-		}else{
+		} else{
 			$condition_query_param_sans_star = substr($condition_query_param_key, 0, $pos_of_star);
 			return $condition_query_param_sans_star;
 		}
@@ -159,14 +159,14 @@ 
 		$last_query_param_part = $query_param_parts[ count($query_param_parts) - 1 ];
 		if($number_of_parts == 1){
 			$field_name = $last_query_param_part;
-		}else{// $number_of_parts >= 2
+		} else{// $number_of_parts >= 2
 			//the last part is the column name, and there are only 2parts. therefore...
 			$field_name = $last_query_param_part;
 			$model = \EE_Registry::instance()->load_model( $query_param_parts[ $number_of_parts - 2 ]);
 		}
 		try{
 			return $model->field_settings_for($field_name);
-		}catch(\EE_Error $e){
+		} catch(\EE_Error $e){
 			return null;
 		}
 	}

Indentation +2 added lines, -2 removed lines

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

Spacing +95 added lines, -95 removed lines

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

core/libraries/rest_api/calculations/Base.php

Spacing +7 added lines, -7 removed lines

@@ -13,19 +13,19 @@ 
  * @since		 	   $VID:$
  *
  */
-if( !defined( 'EVENT_ESPRESSO_VERSION' ) ) {
-	exit( 'No direct script access allowed' );
+if ( ! defined('EVENT_ESPRESSO_VERSION')) {
+	exit('No direct script access allowed');
 }
 
 class Base {
-	protected static function _verify_current_user_can( $required_permission, $attempted_calculation ) {
-		if( ! current_user_can( $required_permission ) ) {
+	protected static function _verify_current_user_can($required_permission, $attempted_calculation) {
+		if ( ! current_user_can($required_permission)) {
 			throw new Rest_Exception(
 				'permission_denied',
 				sprintf( 
-					__( 'Permission denied, you cannot calculate %1$s on %2$s because you do not have the capability "%3$s"', 'event_espresso' ),
+					__('Permission denied, you cannot calculate %1$s on %2$s because you do not have the capability "%3$s"', 'event_espresso'),
 					$attempted_calculation,
-					\EEH_Inflector::pluralize_and_lower( self::get_resource_name() ),
+					\EEH_Inflector::pluralize_and_lower(self::get_resource_name()),
 					$required_permission
 				)
 			);
@@ -38,6 +38,6 @@ 
 	 */
 	public static function get_resource_name() {
 		$classname = get_called_class();
-		return substr( $classname, strrpos( $classname, '\\' ) + 1 );
+		return substr($classname, strrpos($classname, '\\') + 1);
 	}
 }

core/libraries/rest_api/Rest_Exception.php

Spacing +3 added lines, -3 removed lines

@@ -13,8 +13,8 @@ 
  * @since		 	   $VID:$
  *
  */
-if( !defined( 'EVENT_ESPRESSO_VERSION' ) ) {
-	exit( 'No direct script access allowed' );
+if ( ! defined('EVENT_ESPRESSO_VERSION')) {
+	exit('No direct script access allowed');
 }
 
 class Rest_Exception extends \EE_Error {
@@ -24,7 +24,7 @@ 
 	 */
 	protected $_wp_error_data = array();
 	protected $_wp_error_code = '';
-	public function __construct( $string_code, $message, $wp_error_data = array(), $previous = null ) {
+	public function __construct($string_code, $message, $wp_error_data = array(), $previous = null) {
 		parent::__construct( 
 			$message,
 			500,

core/EE_Bootstrap.core.php

Spacing +19 added lines, -19 removed lines

@@ -42,13 +42,13 @@ 
 
 	public function __construct() {
 		// construct request stack and run middleware apps as soon as all WP plugins are loaded
-		add_action( 'plugins_loaded', array( $this, 'run_request_stack' ), 0 );
+		add_action('plugins_loaded', array($this, 'run_request_stack'), 0);
 		// set framework for the rest of EE to hook into when loading
-		add_action( 'plugins_loaded', array( 'EE_Bootstrap', 'load_espresso_addons' ), 1 );
-		add_action( 'plugins_loaded', array( 'EE_Bootstrap', 'detect_activations_or_upgrades' ), 3 );
-		add_action( 'plugins_loaded', array( 'EE_Bootstrap', 'load_core_configuration' ), 5 );
-		add_action( 'plugins_loaded', array( 'EE_Bootstrap', 'register_shortcodes_modules_and_widgets' ), 7 );
-		add_action( 'plugins_loaded', array( 'EE_Bootstrap', 'brew_espresso' ), 9 );
+		add_action('plugins_loaded', array('EE_Bootstrap', 'load_espresso_addons'), 1);
+		add_action('plugins_loaded', array('EE_Bootstrap', 'detect_activations_or_upgrades'), 3);
+		add_action('plugins_loaded', array('EE_Bootstrap', 'load_core_configuration'), 5);
+		add_action('plugins_loaded', array('EE_Bootstrap', 'register_shortcodes_modules_and_widgets'), 7);
+		add_action('plugins_loaded', array('EE_Bootstrap', 'brew_espresso'), 9);
 	}
 
 
@@ -65,7 +65,7 @@ 
 			new EE_Load_Espresso_Core()
 		);
 		$this->_request_stack->handle_request(
-			new EE_Request( $_GET, $_POST, $_COOKIE ),
+			new EE_Request($_GET, $_POST, $_COOKIE),
 			new EE_Response()
 		);
 		$this->_request_stack->handle_response();
@@ -78,7 +78,7 @@ 
 	 */
 	protected function load_autoloader() {
 		// load interfaces
-		espresso_load_required( 'EEH_Autoloader', EE_CORE . 'helpers' . DS . 'EEH_Autoloader.helper.php' );
+		espresso_load_required('EEH_Autoloader', EE_CORE.'helpers'.DS.'EEH_Autoloader.helper.php');
 		EEH_Autoloader::instance();
 	}
 
@@ -89,13 +89,13 @@ 
 	 */
 	protected function set_autoloaders_for_required_files() {
 		// load interfaces
-		espresso_load_required( 'EEI_Interfaces', EE_CORE . 'interfaces' . DS . 'EEI_Interfaces.php' );
+		espresso_load_required('EEI_Interfaces', EE_CORE.'interfaces'.DS.'EEI_Interfaces.php');
 		// load helpers
-		EEH_Autoloader::register_autoloaders_for_each_file_in_folder( EE_HELPERS );
+		EEH_Autoloader::register_autoloaders_for_each_file_in_folder(EE_HELPERS);
 		// load request stack
-		EEH_Autoloader::register_autoloaders_for_each_file_in_folder( EE_CORE . 'request_stack' . DS );
+		EEH_Autoloader::register_autoloaders_for_each_file_in_folder(EE_CORE.'request_stack'.DS);
 		// load middleware
-		EEH_Autoloader::register_autoloaders_for_each_file_in_folder( EE_CORE . 'middleware' . DS );
+		EEH_Autoloader::register_autoloaders_for_each_file_in_folder(EE_CORE.'middleware'.DS);
 	}
 
 
@@ -118,9 +118,9 @@ 
 			)
 		);
 		// load middleware onto stack : FILO (First In Last Out)
-		foreach ( (array)$stack_apps as $stack_app ) {
+		foreach ((array) $stack_apps as $stack_app) {
 			//$request_stack_builder->push( $stack_app );
-			$request_stack_builder->unshift( $stack_app );
+			$request_stack_builder->unshift($stack_app);
 		}
 		return apply_filters(
 			'FHEE__EE_Bootstrap__build_request_stack__request_stack_builder',
@@ -137,7 +137,7 @@ 
 	 * no other logic should be performed at this point
 	 */
 	public static function load_espresso_addons() {
-		do_action( 'AHEE__EE_Bootstrap__load_espresso_addons' );
+		do_action('AHEE__EE_Bootstrap__load_espresso_addons');
 	}
 
 
@@ -149,7 +149,7 @@ 
 	 * we can determine if anything needs activating or upgrading
 	 */
 	public static function detect_activations_or_upgrades() {
-		do_action( 'AHEE__EE_Bootstrap__detect_activations_or_upgrades' );
+		do_action('AHEE__EE_Bootstrap__detect_activations_or_upgrades');
 	}
 
 
@@ -161,7 +161,7 @@ 
 	 * we can load and set all of the system configurations
 	 */
 	public static function load_core_configuration() {
-		do_action( 'AHEE__EE_Bootstrap__load_core_configuration' );
+		do_action('AHEE__EE_Bootstrap__load_core_configuration');
 	}
 
 
@@ -173,7 +173,7 @@ 
 	 * so that they are ready to be used throughout the system
 	 */
 	public static function register_shortcodes_modules_and_widgets() {
-		do_action( 'AHEE__EE_Bootstrap__register_shortcodes_modules_and_widgets' );
+		do_action('AHEE__EE_Bootstrap__register_shortcodes_modules_and_widgets');
 	}
 
 
@@ -185,7 +185,7 @@ 
 	 * so let the fun begin...
 	 */
 	public static function brew_espresso() {
-		do_action( 'AHEE__EE_Bootstrap__brew_espresso' );
+		do_action('AHEE__EE_Bootstrap__brew_espresso');
 	}
 
 

core/db_models/EEM_Payment_Method.model.php

Braces +2 added lines, -4 removed lines

@@ -217,8 +217,7 @@ 
 		//ok so it wasn't a slug we were passed. try the usual then (ie, it's an object or an ID)
 		try {
 			return parent::ensure_is_obj( $base_class_obj_or_id, $ensure_is_in_db );
-		}
-		catch ( EE_Error $e ) {
+		} catch ( EE_Error $e ) {
 			//handle it outside the catch
 		}
 		throw new EE_Error( sprintf( __( "'%s' is neither a Payment Method ID, slug, nor object.", "event_espresso" ), $base_class_obj_or_id ) );
@@ -283,8 +282,7 @@ 
 						break;
 					}
 				}
-			}
-			catch ( EE_Error $e ) {
+			} catch ( EE_Error $e ) {
 				$payment_method->set_active( FALSE );
 			}
 		}

Spacing +93 added lines, -93 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');
 }
 /**
  *
@@ -37,33 +37,33 @@ 
 	 * @access   protected
 	 * @return EEM_Payment_Method
 	 */
-	protected function __construct( $timezone = NULL ) {
-		$this->singlular_item = __( 'Payment Method', 'event_espresso' );
-		$this->plural_item = __( 'Payment Methods', 'event_espresso' );
-		$this->_tables = array( 'Payment_Method' => new EE_Primary_Table( 'esp_payment_method', 'PMD_ID' ) );
+	protected function __construct($timezone = NULL) {
+		$this->singlular_item = __('Payment Method', 'event_espresso');
+		$this->plural_item = __('Payment Methods', 'event_espresso');
+		$this->_tables = array('Payment_Method' => new EE_Primary_Table('esp_payment_method', 'PMD_ID'));
 		$this->_fields = array(
 			'Payment_Method' => array(
-				'PMD_ID' => new EE_Primary_Key_Int_Field( 'PMD_ID', __( "ID", 'event_espresso' ) ),
-				'PMD_type' => new EE_Plain_Text_Field( 'PMD_type', __( "Payment Method Type", 'event_espresso' ), FALSE, 'Admin_Only' ),
-				'PMD_name' => new EE_Plain_Text_Field( 'PMD_name', __( "Name", 'event_espresso' ), FALSE ),
-				'PMD_desc' => new EE_Post_Content_Field( 'PMD_desc', __( "Description", 'event_espresso' ), FALSE, '' ),
-				'PMD_admin_name' => new EE_Plain_Text_Field( 'PMD_admin_name', __( "Admin-Only Name", 'event_espresso' ), TRUE ),
-				'PMD_admin_desc' => new EE_Post_Content_Field( 'PMD_admin_desc', __( "Admin-Only Description", 'event_espresso' ), TRUE ),
-				'PMD_slug' => new EE_Slug_Field( 'PMD_slug', __( "Slug", 'event_espresso' ), FALSE ),
-				'PMD_order' => new EE_Integer_Field( 'PMD_order', __( "Order", 'event_espresso' ), FALSE, 0 ),
-				'PMD_debug_mode' => new EE_Boolean_Field( 'PMD_debug_mode', __( "Debug Mode On?", 'event_espresso' ), FALSE, FALSE ),
-				'PMD_wp_user' => new EE_WP_User_Field( 'PMD_wp_user', __( "Payment Method Creator ID", 'event_espresso' ), FALSE ),
-				'PMD_open_by_default' => new EE_Boolean_Field( 'PMD_open_by_default', __( "Open by Default?", 'event_espresso' ), FALSE, FALSE ), 'PMD_button_url' => new EE_Plain_Text_Field( 'PMD_button_url', __( "Button URL", 'event_espresso' ), TRUE, '' ),
-				'PMD_scope' => new EE_Serialized_Text_Field( 'PMD_scope', __( "Usable From?", 'event_espresso' ), FALSE, array() ), //possible values currently are 'CART','ADMIN','API'
+				'PMD_ID' => new EE_Primary_Key_Int_Field('PMD_ID', __("ID", 'event_espresso')),
+				'PMD_type' => new EE_Plain_Text_Field('PMD_type', __("Payment Method Type", 'event_espresso'), FALSE, 'Admin_Only'),
+				'PMD_name' => new EE_Plain_Text_Field('PMD_name', __("Name", 'event_espresso'), FALSE),
+				'PMD_desc' => new EE_Post_Content_Field('PMD_desc', __("Description", 'event_espresso'), FALSE, ''),
+				'PMD_admin_name' => new EE_Plain_Text_Field('PMD_admin_name', __("Admin-Only Name", 'event_espresso'), TRUE),
+				'PMD_admin_desc' => new EE_Post_Content_Field('PMD_admin_desc', __("Admin-Only Description", 'event_espresso'), TRUE),
+				'PMD_slug' => new EE_Slug_Field('PMD_slug', __("Slug", 'event_espresso'), FALSE),
+				'PMD_order' => new EE_Integer_Field('PMD_order', __("Order", 'event_espresso'), FALSE, 0),
+				'PMD_debug_mode' => new EE_Boolean_Field('PMD_debug_mode', __("Debug Mode On?", 'event_espresso'), FALSE, FALSE),
+				'PMD_wp_user' => new EE_WP_User_Field('PMD_wp_user', __("Payment Method Creator ID", 'event_espresso'), FALSE),
+				'PMD_open_by_default' => new EE_Boolean_Field('PMD_open_by_default', __("Open by Default?", 'event_espresso'), FALSE, FALSE), 'PMD_button_url' => new EE_Plain_Text_Field('PMD_button_url', __("Button URL", 'event_espresso'), TRUE, ''),
+				'PMD_scope' => new EE_Serialized_Text_Field('PMD_scope', __("Usable From?", 'event_espresso'), FALSE, array()), //possible values currently are 'CART','ADMIN','API'
 		) );
 		$this->_model_relations = array(
  //			'Event'=>new EE_HABTM_Relation('Event_Payment_Method'),
 			'Payment' => new EE_Has_Many_Relation(),
-			'Currency' => new EE_HABTM_Relation( 'Currency_Payment_Method' ),
+			'Currency' => new EE_HABTM_Relation('Currency_Payment_Method'),
 			'Transaction' => new EE_Has_Many_Relation(),
 			'WP_User' => new EE_Belongs_To_Relation(),
 		);
-		parent::__construct( $timezone );
+		parent::__construct($timezone);
 	}
 
 
@@ -73,8 +73,8 @@ 
 	 * @param string $slug
 	 * @return EE_Payment_Method
 	 */
-	public function get_one_by_slug( $slug ) {
-		return $this->get_one( array( array( 'PMD_slug' => $slug ) ) );
+	public function get_one_by_slug($slug) {
+		return $this->get_one(array(array('PMD_slug' => $slug)));
 	}
 
 
@@ -88,8 +88,8 @@ 
 		return apply_filters(
 			'FHEE__EEM_Payment_Method__scopes',
 			array(
-				self::scope_cart 		=> __( "Front-end Registration Page", 'event_espresso' ),
-				self::scope_admin 	=> __( "Admin Registration Page (no online processing)", 'event_espresso' )
+				self::scope_cart 		=> __("Front-end Registration Page", 'event_espresso'),
+				self::scope_admin 	=> __("Admin Registration Page (no online processing)", 'event_espresso')
 			)
 		);
 	}
@@ -101,9 +101,9 @@ 
 	 * @param string $scope like one of EEM_Payment_Method::instance()->scopes()
 	 * @return boolean
 	 */
-	public function is_valid_scope( $scope ) {
+	public function is_valid_scope($scope) {
 		$scopes = $this->scopes();
-		if ( isset( $scopes[ $scope ] ) ) {
+		if (isset($scopes[$scope])) {
 			return TRUE;
 		} else {
 			return FALSE;
@@ -119,11 +119,11 @@ 
 	 * @throws EE_Error
 	 * @return EE_Payment_Method[]
 	 */
-	public function get_all_active( $scope = NULL, $query_params = array() ) {
-		if( ! isset( $query_params[ 'order_by' ] ) && ! isset( $query_params[ 'order' ] ) ) {
-			$query_params = array( 'order_by' => array( 'PMD_order' => 'ASC', 'PMD_ID' => 'ASC' ) );
+	public function get_all_active($scope = NULL, $query_params = array()) {
+		if ( ! isset($query_params['order_by']) && ! isset($query_params['order'])) {
+			$query_params = array('order_by' => array('PMD_order' => 'ASC', 'PMD_ID' => 'ASC'));
 		}
-		return $this->get_all( $this->_get_query_params_for_all_active( $scope, $query_params ) );
+		return $this->get_all($this->_get_query_params_for_all_active($scope, $query_params));
 	}
 
 	/**
@@ -132,8 +132,8 @@ 
 	 * @param array $query_params
 	 * @return int
 	 */
-	public function count_active( $scope = NULL, $query_params = array() ){
-		return $this->count( $this->_get_query_params_for_all_active( $scope, $query_params ) );
+	public function count_active($scope = NULL, $query_params = array()) {
+		return $this->count($this->_get_query_params_for_all_active($scope, $query_params));
 	}
 
 	/**
@@ -144,21 +144,21 @@ 
 	 * @return array like param of EEM_Base::get_all()
 	 * @throws EE_Error
 	 */
-	protected function _get_query_params_for_all_active( $scope = NULL, $query_params = array() ){
-		if ( $scope ) {
-			if ( $this->is_valid_scope( $scope ) ) {
-				return array_replace_recursive( array( array( 'PMD_scope' => array( 'LIKE', "%$scope%" ) ) ), $query_params );
+	protected function _get_query_params_for_all_active($scope = NULL, $query_params = array()) {
+		if ($scope) {
+			if ($this->is_valid_scope($scope)) {
+				return array_replace_recursive(array(array('PMD_scope' => array('LIKE', "%$scope%"))), $query_params);
 			} else {
-				throw new EE_Error( sprintf( __( "'%s' is not a valid scope for a payment method", "event_espresso" ), $scope ) );
+				throw new EE_Error(sprintf(__("'%s' is not a valid scope for a payment method", "event_espresso"), $scope));
 			}
 		} else {
 			$acceptable_scopes = array();
 			$count = 0;
-			foreach ( $this->scopes() as $scope_name => $desc ) {
+			foreach ($this->scopes() as $scope_name => $desc) {
 				$count++;
-				$acceptable_scopes[ 'PMD_scope*' . $count ] = array( 'LIKE', '%' . $scope_name . '%' );
+				$acceptable_scopes['PMD_scope*'.$count] = array('LIKE', '%'.$scope_name.'%');
 			}
-			return array_replace_recursive( array( array( 'OR*active_scope' => $acceptable_scopes ) ), $query_params );
+			return array_replace_recursive(array(array('OR*active_scope' => $acceptable_scopes)), $query_params);
 		}
 	}
 
@@ -170,8 +170,8 @@ 
 	 * @return array like param of EEM_Base::get_all()
 	 * @throws EE_Error
 	 */
-	public function get_query_params_for_all_active( $scope = NULL, $query_params = array() ) {
-		return $this->_get_query_params_for_all_active( $scope, $query_params );
+	public function get_query_params_for_all_active($scope = NULL, $query_params = array()) {
+		return $this->_get_query_params_for_all_active($scope, $query_params);
 	}
 
 
@@ -181,8 +181,8 @@ 
 	 * @param array  $query_params
 	 * @return EE_Payment_Method
 	 */
-	public function get_one_active( $scope = NULL, $query_params = array() ) {
-		return $this->get_one( $this->_get_query_params_for_all_active( $scope, $query_params ) );
+	public function get_one_active($scope = NULL, $query_params = array()) {
+		return $this->get_one($this->_get_query_params_for_all_active($scope, $query_params));
 	}
 
 
@@ -192,8 +192,8 @@ 
 	 * @param string $type
 	 * @return EE_Payment_Method
 	 */
-	public function get_one_of_type( $type ) {
-		return $this->get_one( array( array( 'PMD_type' => $type ) ) );
+	public function get_one_of_type($type) {
+		return $this->get_one(array(array('PMD_type' => $type)));
 	}
 
 
@@ -206,22 +206,22 @@ 
 	 * @return EE_Payment_Method
 	 * @throws EE_Error
 	 */
-	public function ensure_is_obj( $base_class_obj_or_id, $ensure_is_in_db = FALSE ) {
+	public function ensure_is_obj($base_class_obj_or_id, $ensure_is_in_db = FALSE) {
 		//first: check if it's a slug
-		if( is_string( $base_class_obj_or_id ) ) {
-			$obj = $this->get_one_by_slug( $base_class_obj_or_id );
-			if( $obj ) {
+		if (is_string($base_class_obj_or_id)) {
+			$obj = $this->get_one_by_slug($base_class_obj_or_id);
+			if ($obj) {
 				return $obj;
 			}
 		}
 		//ok so it wasn't a slug we were passed. try the usual then (ie, it's an object or an ID)
 		try {
-			return parent::ensure_is_obj( $base_class_obj_or_id, $ensure_is_in_db );
+			return parent::ensure_is_obj($base_class_obj_or_id, $ensure_is_in_db);
 		}
-		catch ( EE_Error $e ) {
+		catch (EE_Error $e) {
 			//handle it outside the catch
 		}
-		throw new EE_Error( sprintf( __( "'%s' is neither a Payment Method ID, slug, nor object.", "event_espresso" ), $base_class_obj_or_id ) );
+		throw new EE_Error(sprintf(__("'%s' is neither a Payment Method ID, slug, nor object.", "event_espresso"), $base_class_obj_or_id));
 	}
 
 
@@ -232,12 +232,12 @@ 
 	 * @param mixed $base_obj_or_id_or_slug
 	 * @return int
 	 */
-	function ensure_is_ID( $base_obj_or_id_or_slug ) {
-		if ( is_string( $base_obj_or_id_or_slug ) ) {
+	function ensure_is_ID($base_obj_or_id_or_slug) {
+		if (is_string($base_obj_or_id_or_slug)) {
 			//assume it's a slug
-			$base_obj_or_id_or_slug = $this->get_one_by_slug( $base_obj_or_id_or_slug );
+			$base_obj_or_id_or_slug = $this->get_one_by_slug($base_obj_or_id_or_slug);
 		}
-		return parent::ensure_is_ID( $base_obj_or_id_or_slug );
+		return parent::ensure_is_ID($base_obj_or_id_or_slug);
 	}
 
 
@@ -246,36 +246,36 @@ 
 	 * Verifies the button urls on all the passed payment methods have a valid button url. If not, resets them to their default.
 	 * @param EE_Payment_Method[] $payment_methods. If NULL is provided defaults to all payment methods active in the cart
 	 */
-	function verify_button_urls( $payment_methods = NULL ) {
-		$payment_methods = is_array( $payment_methods ) ? $payment_methods : $this->get_all_active(EEM_Payment_Method::scope_cart);
-		foreach ( $payment_methods as $payment_method ) {
+	function verify_button_urls($payment_methods = NULL) {
+		$payment_methods = is_array($payment_methods) ? $payment_methods : $this->get_all_active(EEM_Payment_Method::scope_cart);
+		foreach ($payment_methods as $payment_method) {
 			try {
 				$current_button_url = $payment_method->button_url();
-				$buttons_urls_to_try = apply_filters( 'FHEE__EEM_Payment_Method__verify_button_urls__button_urls_to_try', array(
-					'current_ssl' => str_replace( "http://", "https://", $current_button_url ),
-					'current' => str_replace( "https://", "http://", $current_button_url ),
-					'default_ssl' => str_replace( "http://", "https://", $payment_method->type_obj()->default_button_url() ),
-					'default' => str_replace( "https://", "http://", $payment_method->type_obj()->default_button_url() ),
-				) );
-				foreach( $buttons_urls_to_try as $button_url_to_try ) {
-					if(
+				$buttons_urls_to_try = apply_filters('FHEE__EEM_Payment_Method__verify_button_urls__button_urls_to_try', array(
+					'current_ssl' => str_replace("http://", "https://", $current_button_url),
+					'current' => str_replace("https://", "http://", $current_button_url),
+					'default_ssl' => str_replace("http://", "https://", $payment_method->type_obj()->default_button_url()),
+					'default' => str_replace("https://", "http://", $payment_method->type_obj()->default_button_url()),
+				));
+				foreach ($buttons_urls_to_try as $button_url_to_try) {
+					if (
 							(//this is the current url and it exists, regardless of SSL issues
 								$button_url_to_try == $current_button_url &&
 								EEH_URL::remote_file_exists(
 										$button_url_to_try,
 										array(
 											'sslverify' => false,
-											'limit_response_size' => 4095,//we don't really care for a full response, but we do want headers at least. Lets just ask for a one block
+											'limit_response_size' => 4095, //we don't really care for a full response, but we do want headers at least. Lets just ask for a one block
 											) )
 							)
 							||
 							(//this is NOT the current url and it exists with a working SSL cert
 								$button_url_to_try != $current_button_url &&
-								EEH_URL::remote_file_exists( $button_url_to_try )
+								EEH_URL::remote_file_exists($button_url_to_try)
 							) ) {
-						if( $current_button_url != $button_url_to_try ){
-							$payment_method->save( array( 'PMD_button_url' => $button_url_to_try ) );
-							EE_Error::add_attention( sprintf( __( "Payment Method %s's button url was set to %s, because the old image either didnt exist or SSL was recently enabled.", "event_espresso" ), $payment_method->name(), $button_url_to_try ) );
+						if ($current_button_url != $button_url_to_try) {
+							$payment_method->save(array('PMD_button_url' => $button_url_to_try));
+							EE_Error::add_attention(sprintf(__("Payment Method %s's button url was set to %s, because the old image either didnt exist or SSL was recently enabled.", "event_espresso"), $payment_method->name(), $button_url_to_try));
 						}
 						//this image exists. So if wasn't set before, now it is;
 						//or if it was already set, we have nothing to do
@@ -283,8 +283,8 @@ 
 					}
 				}
 			}
-			catch ( EE_Error $e ) {
-				$payment_method->set_active( FALSE );
+			catch (EE_Error $e) {
+				$payment_method->set_active(FALSE);
 			}
 		}
 	}
@@ -298,29 +298,29 @@ 
 	 * @param array $rows
 	 * @return EE_Payment_Method[]
 	 */
-	protected function _create_objects( $rows = array() ) {
-		EE_Registry::instance()->load_lib( 'Payment_Method_Manager' );
-		$payment_methods = parent::_create_objects( $rows );
+	protected function _create_objects($rows = array()) {
+		EE_Registry::instance()->load_lib('Payment_Method_Manager');
+		$payment_methods = parent::_create_objects($rows);
 		/* @var $payment_methods EE_Payment_Method[] */
 		$usable_payment_methods = array();
-		foreach ( $payment_methods as $key => $payment_method ) {
-			if ( EE_Payment_Method_Manager::instance()->payment_method_type_exists( $payment_method->type() ) ) {
-				$usable_payment_methods[ $key ] = $payment_method;
+		foreach ($payment_methods as $key => $payment_method) {
+			if (EE_Payment_Method_Manager::instance()->payment_method_type_exists($payment_method->type())) {
+				$usable_payment_methods[$key] = $payment_method;
 				//some payment methods enqueue their scripts in EE_PMT_*::__construct
 				//which is kinda a no-no (just because it's being constructed doesn't mean we need to enqueue
 				//its scripts). but for backwards-compat we should continue to do that
 				$payment_method->type_obj();
-			} elseif( $payment_method->active() ) {				
+			} elseif ($payment_method->active()) {				
 				//only deactivate and notify the admin if the payment is active somewhere
 				$payment_method->deactivate();
 				$payment_method->save();
 				EE_Error::add_persistent_admin_notice(
-					'auto-deactivated-' . $payment_method->type(),
+					'auto-deactivated-'.$payment_method->type(),
 					sprintf(
-						__( 'The payment method %1$s was automatically deactivated because it appears its associated Event Espresso Addon was recently deactivated.%2$sIt can be reactivated on the %3$sPlugins admin page%4$s, then you can reactivate the payment method.', 'event_espresso' ),
+						__('The payment method %1$s was automatically deactivated because it appears its associated Event Espresso Addon was recently deactivated.%2$sIt can be reactivated on the %3$sPlugins admin page%4$s, then you can reactivate the payment method.', 'event_espresso'),
 						$payment_method->admin_name(),
 						'<br />',
-						'<a href="' . admin_url('plugins.php') . '">',
+						'<a href="'.admin_url('plugins.php').'">',
 						'</a>'
 					),
 					true
@@ -340,16 +340,16 @@ 
 	 * @param string 	$scope @see EEM_Payment_Method::get_all_for_events
 	 * @return EE_Payment_Method[]
 	 */
-	public function get_all_for_transaction( $transaction, $scope ) {
+	public function get_all_for_transaction($transaction, $scope) {
 		//@todo take relations between events and payment methods into account, once that relation exists
-		if ( $transaction instanceof EE_Transaction ) {
+		if ($transaction instanceof EE_Transaction) {
 			//@todo take the relation between transaction and currencies into account
 		}
-		$currencies_for_events = array( EE_Config::instance()->currency->code );
+		$currencies_for_events = array(EE_Config::instance()->currency->code);
 		//give addons a chance to override what payment methods are chosen based on the transaction
 		return apply_filters(
 			'FHEE__EEM_Payment_Method__get_all_for_transaction__payment_methods',
-			$this->get_all_active( $scope, array( array( 'Currency.CUR_code' => array( 'IN', $currencies_for_events ) ) ) ),
+			$this->get_all_active($scope, array(array('Currency.CUR_code' => array('IN', $currencies_for_events)))),
 			$transaction,
 			$scope
 		);
@@ -365,16 +365,16 @@ 
 	 * @param EE_Registration|int $registration_or_reg_id  Either the EE_Registration object or the id for the registration.
 	 * @return EE_Payment|null
 	 */
-	public function get_last_used_for_registration( $registration_or_reg_id ) {
-		$registration_id = EEM_Registration::instance()->ensure_is_ID( $registration_or_reg_id );
+	public function get_last_used_for_registration($registration_or_reg_id) {
+		$registration_id = EEM_Registration::instance()->ensure_is_ID($registration_or_reg_id);
 
 		$query_params = array(
 			0 => array(
 				'Payment.Registration.REG_ID' => $registration_id,
 			),
-			'order_by' => array( 'Payment.PAY_ID' => 'DESC' )
+			'order_by' => array('Payment.PAY_ID' => 'DESC')
 		);
-		return $this->get_one( $query_params );
+		return $this->get_one($query_params);
 	}
 
 }

Doc Comments +3 added lines, -3 removed lines

@@ -201,7 +201,7 @@ 
 	/**
 	 * Overrides parent ot also check by the slug
 	 * @see EEM_Base::ensure_is_obj()
-	 * @param string|int|EE_Payment_Method $base_class_obj_or_id
+	 * @param EE_Payment_Method $base_class_obj_or_id
 	 * @param boolean                      $ensure_is_in_db
 	 * @return EE_Payment_Method
 	 * @throws EE_Error
@@ -362,8 +362,8 @@ 
 	 * Note: if an offline payment method was selected on the related transaction then this will have no payment methods returned.
 	 * It will ONLY return a payment method for a PAYMENT recorded against the registration.
 	 *
-	 * @param EE_Registration|int $registration_or_reg_id  Either the EE_Registration object or the id for the registration.
-	 * @return EE_Payment|null
+	 * @param EE_Registration $registration_or_reg_id  Either the EE_Registration object or the id for the registration.
+	 * @return null|EE_Base_Class
 	 */
 	public function get_last_used_for_registration( $registration_or_reg_id ) {
 		$registration_id = EEM_Registration::instance()->ensure_is_ID( $registration_or_reg_id );