eventespresso / event-espresso-core

core/services/commands/CommandBusInterface.php

Spacing +3 added lines, -3 removed lines

@@ -1,8 +1,8 @@ 
 <?php
 namespace EventEspresso\core\services\commands;
 
-if ( ! defined( 'EVENT_ESPRESSO_VERSION' ) ) {
-	exit( 'No direct script access allowed' );
+if ( ! defined('EVENT_ESPRESSO_VERSION')) {
+	exit('No direct script access allowed');
 }
 
 
@@ -23,7 +23,7 @@ 
 	 * @param \EventEspresso\core\services\commands\CommandInterface $command
 	 * @return mixed
 	 */
-	public function execute( $command );
+	public function execute($command);
 
 }
 // End of file CommandBusInterface.php

core/exceptions/InvalidDataTypeException.php

Spacing +11 added lines, -11 removed lines

@@ -1,8 +1,8 @@ 
 <?php
 namespace EventEspresso\core\exceptions;
 
-if ( ! defined( 'EVENT_ESPRESSO_VERSION' ) ) {
-	exit( 'No direct script access allowed' );
+if ( ! defined('EVENT_ESPRESSO_VERSION')) {
+	exit('No direct script access allowed');
 }
 
 
@@ -28,10 +28,10 @@ 
 	 * @param int        $code
 	 * @param \Exception $previous
 	 */
-	public function __construct( $var_name, $variable, $expected, $message = '', $code = 0, \Exception $previous = null ) {
-		if ( empty( $message ) ) {
-			$expected = strpos( ' was expected.', $expected ) === false
-				? $this->addIndefiniteArticle( $expected ) . ' was expected.'
+	public function __construct($var_name, $variable, $expected, $message = '', $code = 0, \Exception $previous = null) {
+		if (empty($message)) {
+			$expected = strpos(' was expected.', $expected) === false
+				? $this->addIndefiniteArticle($expected).' was expected.'
 				: $expected;
 			$message = sprintf(
 				__(
@@ -39,11 +39,11 @@ 
 					'event_espresso'
 				),
 				$var_name,
-				$this->addIndefiniteArticle( gettype( $variable ) ),
+				$this->addIndefiniteArticle(gettype($variable)),
 				$expected
 			);
 		}
-		parent::__construct( $message, $code, $previous );
+		parent::__construct($message, $code, $previous);
 	}
 
 
@@ -52,11 +52,11 @@ 
 	 * @param $string
 	 * @return string
 	 */
-	protected function addIndefiniteArticle( $string ) {
-		if ( strtolower( $string ) === 'null' ) {
+	protected function addIndefiniteArticle($string) {
+		if (strtolower($string) === 'null') {
 			return $string;
 		}
-		return ( stripos( 'aeiou', $string[0] ) !== false ? 'an ' : 'a ' ) . $string;
+		return (stripos('aeiou', $string[0]) !== false ? 'an ' : 'a ').$string;
 	}
 }
 // End of file InvalidDataTypeException.php

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

Spacing +26 added lines, -26 removed lines

@@ -11,7 +11,7 @@ 
  * @subpackage
  * @author				Mike Nelson
  */
-class EE_Select_Ajax_Model_Rest_Input extends EE_Form_Input_With_Options_Base{
+class EE_Select_Ajax_Model_Rest_Input extends EE_Form_Input_With_Options_Base {
 
 	/**
 	 * @var string $_model_name
@@ -45,7 +45,7 @@ 
 	 *                                  And the arguments accepted by EE_Form_Input_With_Options_Base
 	 * @throws \EE_Error
 	 */
-	public function __construct( $input_settings = array() ) {
+	public function __construct($input_settings = array()) {
 		//needed input settings:
 		//select2_args
 		$this->_model_name = EEH_Array::is_set(
@@ -57,7 +57,7 @@ 
 		$query_params = EEH_Array::is_set(
 			$input_settings,
 			'query_params',
-			array( 'limit' => 10, 'caps' => EEM_Base::caps_read_admin )
+			array('limit' => 10, 'caps' => EEM_Base::caps_read_admin)
 		);
 		$this->_value_field_name = EEH_Array::is_set(
 			$input_settings,
@@ -67,7 +67,7 @@ 
 		$this->_display_field_name = EEH_Array::is_set(
 			$input_settings,
 			'display_field_name',
-			$model->get_a_field_of_type( 'EE_Text_Field_Base' )->get_name()
+			$model->get_a_field_of_type('EE_Text_Field_Base')->get_name()
 		);
 		$this->_add_validation_strategy(
 			new EE_Model_Matching_Query_Validation_Strategy(
@@ -79,8 +79,8 @@ 
 		);
 		//get resource endpoint
 		$rest_controller = new EventEspresso\core\libraries\rest_api\controllers\model\Read();
-		$rest_controller->set_requested_version( EED_Core_Rest_Api::latest_rest_api_version() );
-		$url = $rest_controller->get_versioned_link_to( EEH_Inflector::pluralize_and_lower( $this->_model_name ) );
+		$rest_controller->set_requested_version(EED_Core_Rest_Api::latest_rest_api_version());
+		$url = $rest_controller->get_versioned_link_to(EEH_Inflector::pluralize_and_lower($this->_model_name));
 		$default_select2_args = array(
 			'ajax' => array(
 				'url' => $url,
@@ -88,13 +88,13 @@ 
 				'delay' => '250',
 				'data_interface' => 'EE_Select2_REST_API_Interface',
 				'data_interface_args' => array(
-					'default_query_params' => (object)Model_Data_Translator::prepare_query_params_for_rest_api(
+					'default_query_params' => (object) Model_Data_Translator::prepare_query_params_for_rest_api(
 						$query_params,
 						$model
 					),
 					'display_field' => $this->_display_field_name,
 					'value_field' => $this->_value_field_name,
-					'nonce' => wp_create_nonce( 'wp_rest' )
+					'nonce' => wp_create_nonce('wp_rest')
 				),
 			),
 			'cache' => true,
@@ -102,10 +102,10 @@ 
 		);
 		$select2_args = array_replace_recursive(
 			$default_select2_args,
-			(array)EEH_Array::is_set( $input_settings, 'select2_args', array() )
+			(array) EEH_Array::is_set($input_settings, 'select2_args', array())
 		);
-		$this->set_display_strategy( new EE_Select2_Display_Strategy( $select2_args ) );
-		parent::__construct( array(), $input_settings );
+		$this->set_display_strategy(new EE_Select2_Display_Strategy($select2_args));
+		parent::__construct(array(), $input_settings);
 	}
 
 
@@ -123,35 +123,35 @@ 
 	 * @return void
 	 * @throws \EE_Error
 	 */
-	protected function _set_raw_value( $value ) {
+	protected function _set_raw_value($value) {
 
-		$values_for_options = (array)$value;
-		$value_field = $this->_get_model()->field_settings_for( $this->_value_field_name );
-		$display_field = $this->_get_model()->field_settings_for( $this->_display_field_name );
+		$values_for_options = (array) $value;
+		$value_field = $this->_get_model()->field_settings_for($this->_value_field_name);
+		$display_field = $this->_get_model()->field_settings_for($this->_display_field_name);
 		$display_values = $this->_get_model()->get_all_wpdb_results(
 			array(
 				array(
-					$this->_value_field_name => array( 'IN', $values_for_options )
+					$this->_value_field_name => array('IN', $values_for_options)
 				)
 			),
 			ARRAY_A,
 			implode(
 				',',
 				array(
-					$value_field->get_qualified_column() . ' AS ' . $this->_value_field_name,
-					$display_field->get_qualified_column() . ' AS ' . $this->_display_field_name
+					$value_field->get_qualified_column().' AS '.$this->_value_field_name,
+					$display_field->get_qualified_column().' AS '.$this->_display_field_name
 				)
 			)
 		);
 		$select_options = array();
-		if( is_array( $select_options ) ) {
-			foreach( $display_values as $db_rows ) {
-				$db_rows = (array)$db_rows;
-				$select_options[ $db_rows[ $this->_value_field_name ] ] = $db_rows[ $this->_display_field_name ];
+		if (is_array($select_options)) {
+			foreach ($display_values as $db_rows) {
+				$db_rows = (array) $db_rows;
+				$select_options[$db_rows[$this->_value_field_name]] = $db_rows[$this->_display_field_name];
 			}
 		}
-		$this->set_select_options( $select_options );
-		parent::_set_raw_value( $value );
+		$this->set_select_options($select_options);
+		parent::_set_raw_value($value);
 	}
 
 	/**
@@ -160,7 +160,7 @@ 
 	 * @throws EE_Error
 	 */
 	protected function _get_model() {
-		if( ! EE_Registry::instance()->is_model_name(  $this->_model_name ) ) {
+		if ( ! EE_Registry::instance()->is_model_name($this->_model_name)) {
 			throw new EE_Error(
 				sprintf(
 					__(
@@ -171,7 +171,7 @@ 
 				)
 			);
 		} else {
-			return EE_Registry::instance()->load_model( $this->_model_name );
+			return EE_Registry::instance()->load_model($this->_model_name);
 		}
 	}
 

core/db_models/EEM_Registration.model.php

Spacing +108 added lines, -108 removed lines

@@ -1,6 +1,6 @@ 
 <?php if ( ! defined('EVENT_ESPRESSO_VERSION')) exit('No direct script access allowed');
-require_once ( EE_MODELS . 'EEM_Soft_Delete_Base.model.php' );
-require_once ( EE_CLASSES . 'EE_Registration.class.php' );
+require_once (EE_MODELS.'EEM_Soft_Delete_Base.model.php');
+require_once (EE_CLASSES.'EE_Registration.class.php');
 /**
  *
  * Registration Model
@@ -92,31 +92,31 @@ 
 	 *    Note this just sends the timezone info to the date time model field objects.  Default is NULL (and will be assumed using the set timezone in the 'timezone_string' wp option)
 	 * @return \EEM_Registration
 	 */
-	protected function __construct( $timezone = null ) {
-		$this->singular_item = __('Registration','event_espresso');
-		$this->plural_item = __('Registrations','event_espresso');
+	protected function __construct($timezone = null) {
+		$this->singular_item = __('Registration', 'event_espresso');
+		$this->plural_item = __('Registrations', 'event_espresso');
 
 		$this->_tables = array(
-			'Registration'=>new EE_Primary_Table('esp_registration','REG_ID')
+			'Registration'=>new EE_Primary_Table('esp_registration', 'REG_ID')
 		);
 		$this->_fields = array(
 			'Registration'=>array(
-				'REG_ID'=>new EE_Primary_Key_Int_Field('REG_ID', __('Registration ID','event_espresso')),
-				'EVT_ID'=>new EE_Foreign_Key_Int_Field('EVT_ID', __('Event ID','event_espresso'), false, 0, 'Event'),
-				'ATT_ID'=>new EE_Foreign_Key_Int_Field('ATT_ID', __('Attendee ID','event_espresso'), false, 0, 'Attendee'),
-				'TXN_ID'=>new EE_Foreign_Key_Int_Field('TXN_ID', __('Transaction ID','event_espresso'), false, 0, 'Transaction'),
-				'TKT_ID'=>new EE_Foreign_Key_Int_Field('TKT_ID', __('Ticket ID','event_espresso'), false, 0, 'Ticket'),
-				'STS_ID'=>new EE_Foreign_Key_String_Field('STS_ID', __('Status ID','event_espresso'), false, EEM_Registration::status_id_incomplete, 'Status'),
-				'REG_date'=>new EE_Datetime_Field('REG_date', __('Time registration occurred','event_espresso'), false, time(), $timezone ),
-				'REG_final_price'=>new EE_Money_Field('REG_final_price', __('Registration\'s share of the transaction total','event_espresso'), false, 0),
-				'REG_paid'=>new EE_Money_Field('REG_paid', __('Amount paid to date towards registration','event_espresso'), false, 0),
-				'REG_session'=>new EE_Plain_Text_Field('REG_session', __('Session ID of registration','event_espresso'), false, ''),
-				'REG_code'=>new EE_Plain_Text_Field('REG_code', __('Unique Code for this registration','event_espresso'), false, ''),
-				'REG_url_link'=>new EE_Plain_Text_Field('REG_url_link', __('String to be used in URL for identifying registration','event_espresso'), false, ''),
-				'REG_count'=>new EE_Integer_Field('REG_count', __('Count of this registration in the group registration ','event_espresso'), true, 1),
-				'REG_group_size'=>new EE_Integer_Field('REG_group_size', __('Number of registrations on this group','event_espresso'), false, 1),
-				'REG_att_is_going'=>new EE_Boolean_Field('REG_att_is_going', __('Flag indicating the registrant plans on attending','event_espresso'), false, false),
-				'REG_deleted' => new EE_Trashed_Flag_Field('REG_deleted', __('Flag indicating if registration has been archived or not.', 'event_espresso'), false, false )
+				'REG_ID'=>new EE_Primary_Key_Int_Field('REG_ID', __('Registration ID', 'event_espresso')),
+				'EVT_ID'=>new EE_Foreign_Key_Int_Field('EVT_ID', __('Event ID', 'event_espresso'), false, 0, 'Event'),
+				'ATT_ID'=>new EE_Foreign_Key_Int_Field('ATT_ID', __('Attendee ID', 'event_espresso'), false, 0, 'Attendee'),
+				'TXN_ID'=>new EE_Foreign_Key_Int_Field('TXN_ID', __('Transaction ID', 'event_espresso'), false, 0, 'Transaction'),
+				'TKT_ID'=>new EE_Foreign_Key_Int_Field('TKT_ID', __('Ticket ID', 'event_espresso'), false, 0, 'Ticket'),
+				'STS_ID'=>new EE_Foreign_Key_String_Field('STS_ID', __('Status ID', 'event_espresso'), false, EEM_Registration::status_id_incomplete, 'Status'),
+				'REG_date'=>new EE_Datetime_Field('REG_date', __('Time registration occurred', 'event_espresso'), false, time(), $timezone),
+				'REG_final_price'=>new EE_Money_Field('REG_final_price', __('Registration\'s share of the transaction total', 'event_espresso'), false, 0),
+				'REG_paid'=>new EE_Money_Field('REG_paid', __('Amount paid to date towards registration', 'event_espresso'), false, 0),
+				'REG_session'=>new EE_Plain_Text_Field('REG_session', __('Session ID of registration', 'event_espresso'), false, ''),
+				'REG_code'=>new EE_Plain_Text_Field('REG_code', __('Unique Code for this registration', 'event_espresso'), false, ''),
+				'REG_url_link'=>new EE_Plain_Text_Field('REG_url_link', __('String to be used in URL for identifying registration', 'event_espresso'), false, ''),
+				'REG_count'=>new EE_Integer_Field('REG_count', __('Count of this registration in the group registration ', 'event_espresso'), true, 1),
+				'REG_group_size'=>new EE_Integer_Field('REG_group_size', __('Number of registrations on this group', 'event_espresso'), false, 1),
+				'REG_att_is_going'=>new EE_Boolean_Field('REG_att_is_going', __('Flag indicating the registrant plans on attending', 'event_espresso'), false, false),
+				'REG_deleted' => new EE_Trashed_Flag_Field('REG_deleted', __('Flag indicating if registration has been archived or not.', 'event_espresso'), false, false)
 			)
 		);
 		$this->_model_relations = array(
@@ -128,12 +128,12 @@ 
 			'Answer'=>new EE_Has_Many_Relation(),
 			'Checkin'=>new EE_Has_Many_Relation(),
 			'Registration_Payment' => new EE_Has_Many_Relation(),
-			'Payment'=>new EE_HABTM_Relation( 'Registration_Payment' ),
-			'Message' => new EE_Has_Many_Any_Relation( false ) //allow deletes even if there are messages in the queue related
+			'Payment'=>new EE_HABTM_Relation('Registration_Payment'),
+			'Message' => new EE_Has_Many_Any_Relation(false) //allow deletes even if there are messages in the queue related
 		);
 		$this->_model_chain_to_wp_user = 'Event';
 
-		parent::__construct( $timezone );
+		parent::__construct($timezone);
 	}
 
 
@@ -166,9 +166,9 @@ 
 	 *		@param bool  $translated If true will return the values as singular localized strings
 	 *		@return array
 	 */
-	public static function reg_status_array( $exclude = array(), $translated = FALSE ) {
-		EEM_Registration::instance()->_get_registration_status_array( $exclude );
-		return $translated ? EEM_Status::instance()->localized_status( self::$_reg_status, FALSE, 'sentence') : self::$_reg_status;
+	public static function reg_status_array($exclude = array(), $translated = FALSE) {
+		EEM_Registration::instance()->_get_registration_status_array($exclude);
+		return $translated ? EEM_Status::instance()->localized_status(self::$_reg_status, FALSE, 'sentence') : self::$_reg_status;
 	}
 
 
@@ -179,18 +179,18 @@ 
 	 * @param array $exclude
 	 * @return array
 	 */
-	private function _get_registration_status_array( $exclude = array() ) {
+	private function _get_registration_status_array($exclude = array()) {
 		//in the very rare circumstance that we are deleting a model's table's data
 		//and the table hasn't actually been created, this could have an error
 		/** @type WPDB $wpdb */
 		global $wpdb;
-		if( EEH_Activation::table_exists( $wpdb->prefix . 'esp_status' ) ){
-			$SQL = 'SELECT STS_ID, STS_code FROM '. $wpdb->prefix . 'esp_status WHERE STS_type = "registration"';
-			$results = $wpdb->get_results( $SQL );
+		if (EEH_Activation::table_exists($wpdb->prefix.'esp_status')) {
+			$SQL = 'SELECT STS_ID, STS_code FROM '.$wpdb->prefix.'esp_status WHERE STS_type = "registration"';
+			$results = $wpdb->get_results($SQL);
 			self::$_reg_status = array();
-			foreach ( $results as $status ) {
-				if ( ! in_array( $status->STS_ID, $exclude )) {
-					self::$_reg_status[ $status->STS_ID ] = $status->STS_code;
+			foreach ($results as $status) {
+				if ( ! in_array($status->STS_ID, $exclude)) {
+					self::$_reg_status[$status->STS_ID] = $status->STS_code;
 				}
 			}
 		}
@@ -205,15 +205,15 @@ 
 	 * @param  array  $where_params Array of query_params as described in the comments for EEM_Base::get_all()
 	 * @return wpdb results array
 	 */
-	public function get_reg_months_and_years( $where_params ) {
+	public function get_reg_months_and_years($where_params) {
 		$query_params[0] = $where_params;
 		$query_params['group_by'] = array('reg_year', 'reg_month');
-		$query_params['order_by'] = array( 'REG_date' => 'DESC' );
+		$query_params['order_by'] = array('REG_date' => 'DESC');
 		$columns_to_select = array(
 			'reg_year' => array('YEAR(REG_date)', '%s'),
 			'reg_month' => array('MONTHNAME(REG_date)', '%s')
 			);
-		return $this->_get_all_wpdb_results( $query_params, OBJECT, $columns_to_select );
+		return $this->_get_all_wpdb_results($query_params, OBJECT, $columns_to_select);
 	}
 
 
@@ -225,11 +225,11 @@ 
 	* 		@param		int		$ATT_ID
 	*		@return 	EE_Registration[]
 	*/
-	public function get_all_registrations_for_attendee( $ATT_ID = 0 ) {
-		if ( ! $ATT_ID ) {
+	public function get_all_registrations_for_attendee($ATT_ID = 0) {
+		if ( ! $ATT_ID) {
 			return FALSE;
 		}
-		return $this->get_all( array( array( 'ATT_ID' => $ATT_ID )));
+		return $this->get_all(array(array('ATT_ID' => $ATT_ID)));
 	}
 
 
@@ -240,8 +240,8 @@ 
 	 * @param string $REG_url_link
 	 * @return EE_Registration
 	 */
-	public function get_registration_for_reg_url_link($REG_url_link){
-		if(!$REG_url_link){
+	public function get_registration_for_reg_url_link($REG_url_link) {
+		if ( ! $REG_url_link) {
 			return false;
 		}
 		return $this->get_one(array(array('REG_url_link'=>$REG_url_link)));
@@ -259,13 +259,13 @@ 
 	* 		@param    int		$att_nmbr 	in case the ATT_ID is the same for multiple registrations (same details used) then the attendee number is required
 	*		@return 		mixed		array on success, FALSE on fail
 	*/
-	public function get_registration_for_transaction_attendee( $TXN_ID = 0, $ATT_ID = 0, $att_nmbr = 0 ) {
+	public function get_registration_for_transaction_attendee($TXN_ID = 0, $ATT_ID = 0, $att_nmbr = 0) {
 		return $this->get_one(array(
 			array(
 				'TXN_ID'=>$TXN_ID,
 				'ATT_ID'=>$ATT_ID
 			),
-			'limit'=>array( min( ( $att_nmbr-1 ), 0 ), 1 )
+			'limit'=>array(min(($att_nmbr - 1), 0), 1)
 		));
 	}
 
@@ -277,16 +277,16 @@ 
 	 *		@param $period string which can be passed to php's strtotime function (eg "-1 month")
 	 *		@return stdClass[] with properties regDate and total
 	*/
-	public function get_registrations_per_day_report( $period = '-1 month' ) {
+	public function get_registrations_per_day_report($period = '-1 month') {
 
-		$sql_date = $this->convert_datetime_for_query( 'REG_date', date("Y-m-d H:i:s", strtotime($period) ), 'Y-m-d H:i:s', 'UTC' );
-		$where = array( 'REG_date' => array( '>=', $sql_date ), 'STS_ID' => array( '!=', EEM_Registration::status_id_incomplete ) );
+		$sql_date = $this->convert_datetime_for_query('REG_date', date("Y-m-d H:i:s", strtotime($period)), 'Y-m-d H:i:s', 'UTC');
+		$where = array('REG_date' => array('>=', $sql_date), 'STS_ID' => array('!=', EEM_Registration::status_id_incomplete));
 
-		if ( ! EE_Registry::instance()->CAP->current_user_can( 'ee_read_others_registrations', 'reg_per_day_report' ) ) {
+		if ( ! EE_Registry::instance()->CAP->current_user_can('ee_read_others_registrations', 'reg_per_day_report')) {
 			$where['Event.EVT_wp_user'] = get_current_user_id();
 		}
 
-		$query_interval = EEH_DTT_Helper::get_sql_query_interval_for_offset( $this->get_timezone(), 'REG_date' );
+		$query_interval = EEH_DTT_Helper::get_sql_query_interval_for_offset($this->get_timezone(), 'REG_date');
 
 		$results = $this->_get_all_wpdb_results(
 				array(
@@ -296,8 +296,8 @@ 
 				),
 				OBJECT,
 				array(
-					'regDate'=>array( 'DATE(' . $query_interval . ')','%s'),
-					'total'=>array('count(REG_ID)','%d')
+					'regDate'=>array('DATE('.$query_interval.')', '%s'),
+					'total'=>array('count(REG_ID)', '%d')
 				));
 		return $results;
 	}
@@ -312,22 +312,22 @@ 
 	 * @return stdClass[] with properties Registration_REG_date and a column for each registration status as the STS_ID
 	 *                    (i.e. RAP)
 	 */
-	public function get_registrations_per_day_and_per_status_report( $period = '-1 month' ) {
+	public function get_registrations_per_day_and_per_status_report($period = '-1 month') {
 		global $wpdb;
-		$registration_table = $wpdb->prefix . 'esp_registration';
+		$registration_table = $wpdb->prefix.'esp_registration';
 		$event_table = $wpdb->posts;
-		$sql_date = date("Y-m-d H:i:s", strtotime($period) );
+		$sql_date = date("Y-m-d H:i:s", strtotime($period));
 
 		//prepare the query interval for displaying offset
-		$query_interval = EEH_DTT_Helper::get_sql_query_interval_for_offset( $this->get_timezone(), 'dates.REG_date' );
+		$query_interval = EEH_DTT_Helper::get_sql_query_interval_for_offset($this->get_timezone(), 'dates.REG_date');
 
 		//inner date query
 		$inner_date_query = "SELECT DISTINCT REG_date from $registration_table ";
 		$inner_where = " WHERE";
 		//exclude events not authored by user if permissions in effect
-		if ( ! EE_Registry::instance()->CAP->current_user_can( 'ee_read_others_registrations', 'reg_per_event_report' ) ) {
+		if ( ! EE_Registry::instance()->CAP->current_user_can('ee_read_others_registrations', 'reg_per_event_report')) {
 			$inner_date_query .= "LEFT JOIN $event_table ON ID = EVT_ID";
-			$inner_where .= " post_author = " . get_current_user_id() . " AND";
+			$inner_where .= " post_author = ".get_current_user_id()." AND";
 		}
 		$inner_where .= " REG_date >= '$sql_date'";
 		$inner_date_query .= $inner_where;
@@ -339,8 +339,8 @@ 
 		$select_parts = array();
 
 		//loop through registration stati to do parts for each status.
-		foreach ( EEM_Registration::reg_status_array() as $STS_ID => $STS_code ) {
-			if ( $STS_ID === EEM_Registration::status_id_incomplete ) {
+		foreach (EEM_Registration::reg_status_array() as $STS_ID => $STS_code) {
+			if ($STS_ID === EEM_Registration::status_id_incomplete) {
 				continue;
 			}
 			$select_parts[] = "COUNT($STS_code.REG_ID) as $STS_ID";
@@ -348,14 +348,14 @@ 
 		}
 
 		//setup the selects
-		$select .= implode(', ', $select_parts );
+		$select .= implode(', ', $select_parts);
 		$select .= " FROM ($inner_date_query) AS dates LEFT JOIN ";
 
 		//setup the joins
-		$join .= implode( " LEFT JOIN ", $join_parts );
+		$join .= implode(" LEFT JOIN ", $join_parts);
 
 		//now let's put it all together
-		$query = $select . $join . ' GROUP BY Registration_REG_date';
+		$query = $select.$join.' GROUP BY Registration_REG_date';
 
 		//and execute it
 		$results = $wpdb->get_results(
@@ -376,23 +376,23 @@ 
 	 * @param $period string which can be passed to php's strtotime function (eg "-1 month")
 	 *		@return stdClass[] each with properties event_name, reg_limit, and total
 	*/
-	public function get_registrations_per_event_report( $period = '-1 month' ) {
+	public function get_registrations_per_event_report($period = '-1 month') {
 
-		$date_sql = $this->convert_datetime_for_query( 'REG_date', date( "Y-m-d H:i:s", strtotime( $period )), 'Y-m-d H:i:s', 'UTC' );
-		$where = array( 'REG_date' => array( '>=', $date_sql ), 'STS_ID' => array( '!=', EEM_Registration::status_id_incomplete ) );
+		$date_sql = $this->convert_datetime_for_query('REG_date', date("Y-m-d H:i:s", strtotime($period)), 'Y-m-d H:i:s', 'UTC');
+		$where = array('REG_date' => array('>=', $date_sql), 'STS_ID' => array('!=', EEM_Registration::status_id_incomplete));
 
-		if ( ! EE_Registry::instance()->CAP->current_user_can( 'ee_read_others_registrations', 'reg_per_event_report' ) ) {
+		if ( ! EE_Registry::instance()->CAP->current_user_can('ee_read_others_registrations', 'reg_per_event_report')) {
 			$where['Event.EVT_wp_user'] = get_current_user_id();
 		}
 		$results = $this->_get_all_wpdb_results(array(
 			$where,
 			'group_by'=>'Event.EVT_name',
 			'order_by'=>'Event.EVT_name',
-			'limit'=>array(0,24)),
+			'limit'=>array(0, 24)),
 			OBJECT,
 			array(
-				'event_name'=>array('Event_CPT.post_title','%s'),
-				'total'=>array('COUNT(REG_ID)','%s')
+				'event_name'=>array('Event_CPT.post_title', '%s'),
+				'total'=>array('COUNT(REG_ID)', '%s')
 			)
 		);
 
@@ -410,19 +410,19 @@ 
 	 * @return stdClass[] with properties `Registration_Event` and a column for each registration status as the STS_ID
 	 *                    (i.e. RAP)
 	 */
-	public function get_registrations_per_event_and_per_status_report( $period = '-1 month' ) {
+	public function get_registrations_per_event_and_per_status_report($period = '-1 month') {
 		global $wpdb;
-		$registration_table = $wpdb->prefix . 'esp_registration';
+		$registration_table = $wpdb->prefix.'esp_registration';
 		$event_table = $wpdb->posts;
-		$sql_date = date("Y-m-d H:i:s", strtotime($period) );
+		$sql_date = date("Y-m-d H:i:s", strtotime($period));
 
 		//inner date query
 		$inner_date_query = "SELECT DISTINCT EVT_ID, REG_date from $registration_table ";
 		$inner_where = " WHERE";
 		//exclude events not authored by user if permissions in effect
-		if ( ! EE_Registry::instance()->CAP->current_user_can( 'ee_read_others_registrations', 'reg_per_event_report' ) ) {
+		if ( ! EE_Registry::instance()->CAP->current_user_can('ee_read_others_registrations', 'reg_per_event_report')) {
 			$inner_date_query .= "LEFT JOIN $event_table ON ID = EVT_ID";
-			$inner_where .= " post_author = " . get_current_user_id() . " AND";
+			$inner_where .= " post_author = ".get_current_user_id()." AND";
 		}
 		$inner_where .= " REG_date >= '$sql_date'";
 		$inner_date_query .= $inner_where;
@@ -434,8 +434,8 @@ 
 		$select_parts = array();
 
 		//loop through registration stati to do parts for each status.
-		foreach ( EEM_Registration::reg_status_array() as $STS_ID => $STS_code ) {
-			if ( $STS_ID === EEM_Registration::status_id_incomplete ) {
+		foreach (EEM_Registration::reg_status_array() as $STS_ID => $STS_code) {
+			if ($STS_ID === EEM_Registration::status_id_incomplete) {
 				continue;
 			}
 			$select_parts[] = "COUNT($STS_code.REG_ID) as $STS_ID";
@@ -443,14 +443,14 @@ 
 		}
 
 		//setup the selects
-		$select .= implode( ', ', $select_parts );
+		$select .= implode(', ', $select_parts);
 		$select .= " FROM ($inner_date_query) AS dates LEFT JOIN $event_table as Event ON Event.ID = dates.EVT_ID LEFT JOIN ";
 
 		//setup remaining joins
-		$join .= implode( " LEFT JOIN ", $join_parts );
+		$join .= implode(" LEFT JOIN ", $join_parts);
 
 		//now put it all together
-		$query = $select . $join . ' GROUP BY Registration_Event';
+		$query = $select.$join.' GROUP BY Registration_Event';
 
 		//and execute
 		$results = $wpdb->get_results(
@@ -466,11 +466,11 @@ 
 	 * @param int $TXN_ID
 	 * @return EE_Registration
 	 */
-	public function get_primary_registration_for_transaction_ID( $TXN_ID = 0){
-		if( ! $TXN_ID ){
+	public function get_primary_registration_for_transaction_ID($TXN_ID = 0) {
+		if ( ! $TXN_ID) {
 			return false;
 		}
-		return $this->get_one(array(array('TXN_ID'=>$TXN_ID,'REG_count'=>  EEM_Registration::PRIMARY_REGISTRANT_COUNT)));
+		return $this->get_one(array(array('TXN_ID'=>$TXN_ID, 'REG_count'=>  EEM_Registration::PRIMARY_REGISTRANT_COUNT)));
 	}
 
 
@@ -482,11 +482,11 @@ 
 	 *		@param boolean $for_incomplete_payments
 	 *		@return int
 	 */
-	public function get_event_registration_count ( $EVT_ID, $for_incomplete_payments = FALSE ) {
+	public function get_event_registration_count($EVT_ID, $for_incomplete_payments = FALSE) {
 		// we only count approved registrations towards registration limits
-		$query_params = array( array( 'EVT_ID' => $EVT_ID, 'STS_ID' => self::status_id_approved ) );
-		if( $for_incomplete_payments ){
-			$query_params[0]['Transaction.STS_ID']=array('!=',  EEM_Transaction::complete_status_code);
+		$query_params = array(array('EVT_ID' => $EVT_ID, 'STS_ID' => self::status_id_approved));
+		if ($for_incomplete_payments) {
+			$query_params[0]['Transaction.STS_ID'] = array('!=', EEM_Transaction::complete_status_code);
 		}
 
 		return $this->count($query_params);
@@ -502,7 +502,7 @@ 
 		/** @type WPDB $wpdb */
 		global $wpdb;
 		return $wpdb->query(
-				'DELETE r FROM ' . $this->table() . ' r LEFT JOIN ' . EEM_Transaction::instance()->table() . ' t ON r.TXN_ID = t.TXN_ID WHERE t.TXN_ID IS NULL' );
+				'DELETE r FROM '.$this->table().' r LEFT JOIN '.EEM_Transaction::instance()->table().' t ON r.TXN_ID = t.TXN_ID WHERE t.TXN_ID IS NULL' );
 	}
 
 	/**
@@ -512,17 +512,17 @@ 
 	 * @param boolean $checked_in whether to count registrations checked IN or OUT
 	 * @return int
 	 */
-	public function count_registrations_checked_into_datetime( $DTT_ID, $checked_in = true) {
+	public function count_registrations_checked_into_datetime($DTT_ID, $checked_in = true) {
 		global $wpdb;
 		//subquery to get latest checkin
 		$query = $wpdb->prepare(
 			'SELECT '
 				. 'COUNT( DISTINCT checkins.REG_ID ) '
-			. 'FROM ' . EEM_Checkin::instance()->table() . ' AS checkins INNER JOIN'
+			. 'FROM '.EEM_Checkin::instance()->table().' AS checkins INNER JOIN'
 				. '( SELECT '
 					. 'max( CHK_timestamp ) AS latest_checkin, '
 					. 'REG_ID AS REG_ID '
-				. 'FROM ' . EEM_Checkin::instance()->table() . ' '
+				. 'FROM '.EEM_Checkin::instance()->table().' '
 				. 'WHERE DTT_ID=%d '
 				. 'GROUP BY REG_ID'
 			. ') AS most_recent_checkin_per_reg '
@@ -533,7 +533,7 @@ 
 			$DTT_ID,
 			$checked_in
 		);
-		return (int)$wpdb->get_var( $query );
+		return (int) $wpdb->get_var($query);
 	}
 
 	/**
@@ -543,18 +543,18 @@ 
 	 * @param boolean $checked_in whether to count registrations checked IN or OUT
 	 * @return int
 	 */
-	public function count_registrations_checked_into_event( $EVT_ID, $checked_in = true ) {
+	public function count_registrations_checked_into_event($EVT_ID, $checked_in = true) {
 		global $wpdb;
 		//subquery to get latest checkin
 		$query = $wpdb->prepare(
 			'SELECT '
 				. 'COUNT( DISTINCT checkins.REG_ID ) '
-			. 'FROM ' . EEM_Checkin::instance()->table() . ' AS checkins INNER JOIN'
+			. 'FROM '.EEM_Checkin::instance()->table().' AS checkins INNER JOIN'
 				. '( SELECT '
 					. 'max( CHK_timestamp ) AS latest_checkin, '
 					. 'REG_ID AS REG_ID '
-				. 'FROM ' . EEM_Checkin::instance()->table() . ' AS c '
-				. 'INNER JOIN ' . EEM_Datetime::instance()->table() . ' AS d '
+				. 'FROM '.EEM_Checkin::instance()->table().' AS c '
+				. 'INNER JOIN '.EEM_Datetime::instance()->table().' AS d '
 				. 'ON c.DTT_ID=d.DTT_ID '
 				. 'WHERE d.EVT_ID=%d '
 				. 'GROUP BY REG_ID'
@@ -566,7 +566,7 @@ 
 			$EVT_ID,
 			$checked_in
 		);
-		return (int)$wpdb->get_var( $query );
+		return (int) $wpdb->get_var($query);
 	}
 
 
@@ -581,15 +581,15 @@ 
 	 * @param array $attendee_ids
 	 * @return EE_Registration[]
 	 */
-	public function get_latest_registration_for_each_of_given_contacts( $attendee_ids = array() ) {
+	public function get_latest_registration_for_each_of_given_contacts($attendee_ids = array()) {
 		//first do a native wp_query to get the latest REG_ID's matching these attendees.
 		global $wpdb;
-		$registration_table = $wpdb->prefix . 'esp_registration';
+		$registration_table = $wpdb->prefix.'esp_registration';
 		$attendee_table = $wpdb->posts;
-		$attendee_ids = is_array( $attendee_ids )
-			? array_map( 'absint', $attendee_ids )
-			: array( (int) $attendee_ids );
-		$attendee_ids = implode( ',', $attendee_ids );
+		$attendee_ids = is_array($attendee_ids)
+			? array_map('absint', $attendee_ids)
+			: array((int) $attendee_ids);
+		$attendee_ids = implode(',', $attendee_ids);
 
 
 		//first we do a query to get the registration ids
@@ -614,24 +614,24 @@ 
 			ARRAY_A
 		);
 
-		if ( empty( $registration_ids ) ) {
+		if (empty($registration_ids)) {
 			return array();
 		}
 
 		$ids_for_model_query = array();
 		//let's flatten the ids so they can be used in the model query.
-		foreach ( $registration_ids as $registration_id ) {
-			if ( isset( $registration_id['registration_id'] ) ) {
+		foreach ($registration_ids as $registration_id) {
+			if (isset($registration_id['registration_id'])) {
 				$ids_for_model_query[] = $registration_id['registration_id'];
 			}
 		}
 
 		//construct query
 		$_where = array(
-			'REG_ID' => array( 'IN', $ids_for_model_query )
+			'REG_ID' => array('IN', $ids_for_model_query)
 		);
 
-		return $this->get_all( array( $_where ) );
+		return $this->get_all(array($_where));
 	}
 
 

core/services/container/CoffeeMaker.php

Doc Comments +2 added lines, -2 removed lines

@@ -69,7 +69,7 @@ 
 
 
     /**
-     * @param $type
+     * @param string $type
      */
     public static function validateType($type)
     {
@@ -126,7 +126,7 @@ 
      * Examines the constructor to determine which method should be used for instantiation
      *
      * @param \ReflectionClass $reflector
-     * @return mixed
+     * @return string
      */
     protected function resolveInstantiationMethod(\ReflectionClass $reflector)
     {

Spacing +1 added lines, -1 removed lines

@@ -56,7 +56,7 @@
      */
     public static function getTypes()
     {
-        return (array)apply_filters(
+        return (array) apply_filters(
             'FHEE__EventEspresso\core\services\container\CoffeeMaker__getTypes',
             array(
                 CoffeeMaker::BREW_NEW,

Indentation +153 added lines, -153 removed lines

@@ -6,7 +6,7 @@ 
 use EventEspresso\core\services\container\exceptions\InstantiationException;
 
 if ( ! defined('EVENT_ESPRESSO_VERSION')) {
-    exit('No direct script access allowed');
+	exit('No direct script access allowed');
 }
 
 
@@ -23,158 +23,158 @@ 
 abstract class CoffeeMaker implements CoffeeMakerInterface
 {
 
-    /**
-     * Indicates that CoffeeMaker should construct a NEW entity instance from the provided arguments (if given)
-     */
-    const BREW_NEW = 'new';
-
-    /**
-     * Indicates that CoffeeMaker should always return a SHARED instance
-     */
-    const BREW_SHARED = 'shared';
-
-    /**
-     * Indicates that CoffeeMaker should only load the file/class/interface but NOT instantiate
-     */
-    const BREW_LOAD_ONLY = 'load_only';
-
-
-    /**
-     * @var CoffeePotInterface $coffee_pot
-     */
-    private $coffee_pot;
-
-    /**
-     * @var DependencyInjector $injector
-     */
-    private $injector;
-
-
-
-    /**
-     * @return array
-     */
-    public static function getTypes()
-    {
-        return (array)apply_filters(
-            'FHEE__EventEspresso\core\services\container\CoffeeMaker__getTypes',
-            array(
-                CoffeeMaker::BREW_NEW,
-                CoffeeMaker::BREW_SHARED,
-                CoffeeMaker::BREW_LOAD_ONLY,
-            )
-        );
-    }
-
-
-
-    /**
-     * @param $type
-     */
-    public static function validateType($type)
-    {
-        $types = CoffeeMaker::getTypes();
-        if ( ! in_array($type, $types)) {
-            throw new InvalidIdentifierException(
-                is_object($type) ? get_class($type) : gettype($type),
-                __(
-                    'recipe type (one of the class constants on \EventEspresso\core\services\container\CoffeeMaker)',
-                    'event_espresso'
-                )
-            );
-        }
-        return $type;
-    }
-
-
-
-    /**
-     * CoffeeMaker constructor.
-     *
-     * @param CoffeePotInterface $coffee_pot
-     * @param InjectorInterface  $injector
-     */
-    public function __construct(CoffeePotInterface $coffee_pot, InjectorInterface $injector)
-    {
-        $this->coffee_pot = $coffee_pot;
-        $this->injector = $injector;
-    }
-
-
-
-    /**
-     * @return \EventEspresso\core\services\container\CoffeePotInterface
-     */
-    protected function coffeePot()
-    {
-        return $this->coffee_pot;
-    }
-
-
-
-    /**
-     * @return \EventEspresso\core\services\container\DependencyInjector
-     */
-    protected function injector()
-    {
-        return $this->injector;
-    }
-
-
-
-    /**
-     * Examines the constructor to determine which method should be used for instantiation
-     *
-     * @param \ReflectionClass $reflector
-     * @return mixed
-     */
-    protected function resolveInstantiationMethod(\ReflectionClass $reflector)
-    {
-        if ($reflector->getConstructor() === null) {
-            return 'NewInstance';
-        } else if ($reflector->isInstantiable()) {
-            return 'NewInstanceArgs';
-        } else if (method_exists($reflector->getName(), 'instance')) {
-            return 'instance';
-        } else if (method_exists($reflector->getName(), 'new_instance')) {
-            return 'new_instance';
-        } else if (method_exists($reflector->getName(), 'new_instance_from_db')) {
-            return 'new_instance_from_db';
-        } else {
-            throw new InstantiationException($reflector->getName());
-        }
-    }
-
-
-
-    /**
-     * Ensures files for classes that are not PSR-4 compatible are loaded
-     * and then verifies that classes exist where applicable
-     *
-     * @param RecipeInterface $recipe
-     * @throws InvalidClassException
-     */
-    protected function resolveClassAndFilepath(RecipeInterface $recipe)
-    {
-        $paths = $recipe->paths();
-        if ( ! empty($paths)) {
-            foreach ($paths as $path) {
-                if (strpos($path, '*') === false && is_readable($path)) {
-                    require_once($path);
-                }
-            }
-        }
-        // re: using "false" for class_exists() second param:
-        // if a class name is not already known to PHP, then class_exists() will run through
-        // all of the registered spl_autoload functions until it either finds the class,
-        // or gets to the end of the registered spl_autoload functions.
-        // When the second parameter is true, it will also attempt to load the class file,
-        // but it will also trigger an error if the class can not be loaded.
-        // We don't want that extra error in the mix, so we have set the second param to "false"
-        if ($recipe->type() !== CoffeeMaker::BREW_LOAD_ONLY && ! class_exists($recipe->fqcn(), false)) {
-            throw new InvalidClassException($recipe->identifier());
-        }
-    }
+	/**
+	 * Indicates that CoffeeMaker should construct a NEW entity instance from the provided arguments (if given)
+	 */
+	const BREW_NEW = 'new';
+
+	/**
+	 * Indicates that CoffeeMaker should always return a SHARED instance
+	 */
+	const BREW_SHARED = 'shared';
+
+	/**
+	 * Indicates that CoffeeMaker should only load the file/class/interface but NOT instantiate
+	 */
+	const BREW_LOAD_ONLY = 'load_only';
+
+
+	/**
+	 * @var CoffeePotInterface $coffee_pot
+	 */
+	private $coffee_pot;
+
+	/**
+	 * @var DependencyInjector $injector
+	 */
+	private $injector;
+
+
+
+	/**
+	 * @return array
+	 */
+	public static function getTypes()
+	{
+		return (array)apply_filters(
+			'FHEE__EventEspresso\core\services\container\CoffeeMaker__getTypes',
+			array(
+				CoffeeMaker::BREW_NEW,
+				CoffeeMaker::BREW_SHARED,
+				CoffeeMaker::BREW_LOAD_ONLY,
+			)
+		);
+	}
+
+
+
+	/**
+	 * @param $type
+	 */
+	public static function validateType($type)
+	{
+		$types = CoffeeMaker::getTypes();
+		if ( ! in_array($type, $types)) {
+			throw new InvalidIdentifierException(
+				is_object($type) ? get_class($type) : gettype($type),
+				__(
+					'recipe type (one of the class constants on \EventEspresso\core\services\container\CoffeeMaker)',
+					'event_espresso'
+				)
+			);
+		}
+		return $type;
+	}
+
+
+
+	/**
+	 * CoffeeMaker constructor.
+	 *
+	 * @param CoffeePotInterface $coffee_pot
+	 * @param InjectorInterface  $injector
+	 */
+	public function __construct(CoffeePotInterface $coffee_pot, InjectorInterface $injector)
+	{
+		$this->coffee_pot = $coffee_pot;
+		$this->injector = $injector;
+	}
+
+
+
+	/**
+	 * @return \EventEspresso\core\services\container\CoffeePotInterface
+	 */
+	protected function coffeePot()
+	{
+		return $this->coffee_pot;
+	}
+
+
+
+	/**
+	 * @return \EventEspresso\core\services\container\DependencyInjector
+	 */
+	protected function injector()
+	{
+		return $this->injector;
+	}
+
+
+
+	/**
+	 * Examines the constructor to determine which method should be used for instantiation
+	 *
+	 * @param \ReflectionClass $reflector
+	 * @return mixed
+	 */
+	protected function resolveInstantiationMethod(\ReflectionClass $reflector)
+	{
+		if ($reflector->getConstructor() === null) {
+			return 'NewInstance';
+		} else if ($reflector->isInstantiable()) {
+			return 'NewInstanceArgs';
+		} else if (method_exists($reflector->getName(), 'instance')) {
+			return 'instance';
+		} else if (method_exists($reflector->getName(), 'new_instance')) {
+			return 'new_instance';
+		} else if (method_exists($reflector->getName(), 'new_instance_from_db')) {
+			return 'new_instance_from_db';
+		} else {
+			throw new InstantiationException($reflector->getName());
+		}
+	}
+
+
+
+	/**
+	 * Ensures files for classes that are not PSR-4 compatible are loaded
+	 * and then verifies that classes exist where applicable
+	 *
+	 * @param RecipeInterface $recipe
+	 * @throws InvalidClassException
+	 */
+	protected function resolveClassAndFilepath(RecipeInterface $recipe)
+	{
+		$paths = $recipe->paths();
+		if ( ! empty($paths)) {
+			foreach ($paths as $path) {
+				if (strpos($path, '*') === false && is_readable($path)) {
+					require_once($path);
+				}
+			}
+		}
+		// re: using "false" for class_exists() second param:
+		// if a class name is not already known to PHP, then class_exists() will run through
+		// all of the registered spl_autoload functions until it either finds the class,
+		// or gets to the end of the registered spl_autoload functions.
+		// When the second parameter is true, it will also attempt to load the class file,
+		// but it will also trigger an error if the class can not be loaded.
+		// We don't want that extra error in the mix, so we have set the second param to "false"
+		if ($recipe->type() !== CoffeeMaker::BREW_LOAD_ONLY && ! class_exists($recipe->fqcn(), false)) {
+			throw new InvalidClassException($recipe->identifier());
+		}
+	}
 
 
 

core/services/collections/LooseCollection.php

Indentation +33 added lines, -33 removed lines

@@ -2,7 +2,7 @@ 
 namespace EventEspresso\core\services\collections;
 
 if ( ! defined('EVENT_ESPRESSO_VERSION')) {
-    exit('No direct script access allowed');
+	exit('No direct script access allowed');
 }
 
 
@@ -20,38 +20,38 @@ 
 
 
 
-    /**
-     * setCollectionInterface
-     *
-     * @access protected
-     * @param  string $collection_interface
-     * @throws \EventEspresso\core\exceptions\InvalidInterfaceException
-     */
-    protected function setCollectionInterface($collection_interface )
-    {
-        $this->collection_interface = '';
-    }
-
-
-
-    /**
-     * add
-     * attaches an object to the Collection
-     * and sets any supplied data associated with the current iterator entry
-     * by calling EE_Object_Collection::set_identifier()
-     *
-     * @access public
-     * @param  mixed $object
-     * @param  mixed $identifier
-     * @return bool
-     * @throws \EventEspresso\core\exceptions\InvalidEntityException
-     */
-    public function add($object, $identifier = null)
-    {
-        $this->attach($object);
-        $this->setIdentifier($object, $identifier);
-        return $this->contains($object);
-    }
+	/**
+	 * setCollectionInterface
+	 *
+	 * @access protected
+	 * @param  string $collection_interface
+	 * @throws \EventEspresso\core\exceptions\InvalidInterfaceException
+	 */
+	protected function setCollectionInterface($collection_interface )
+	{
+		$this->collection_interface = '';
+	}
+
+
+
+	/**
+	 * add
+	 * attaches an object to the Collection
+	 * and sets any supplied data associated with the current iterator entry
+	 * by calling EE_Object_Collection::set_identifier()
+	 *
+	 * @access public
+	 * @param  mixed $object
+	 * @param  mixed $identifier
+	 * @return bool
+	 * @throws \EventEspresso\core\exceptions\InvalidEntityException
+	 */
+	public function add($object, $identifier = null)
+	{
+		$this->attach($object);
+		$this->setIdentifier($object, $identifier);
+		return $this->contains($object);
+	}
 
 
 

Spacing +1 added lines, -1 removed lines

@@ -27,7 +27,7 @@
      * @param  string $collection_interface
      * @throws \EventEspresso\core\exceptions\InvalidInterfaceException
      */
-    protected function setCollectionInterface($collection_interface )
+    protected function setCollectionInterface($collection_interface)
     {
         $this->collection_interface = '';
     }

core/services/container/ContainerInterface.php

Indentation +21 added lines, -21 removed lines

@@ -2,7 +2,7 @@ 
 namespace EventEspresso\core\services\container;
 
 if ( ! defined('EVENT_ESPRESSO_VERSION')) {
-    exit('No direct script access allowed');
+	exit('No direct script access allowed');
 }
 
 
@@ -18,26 +18,26 @@ 
 interface ContainerInterface
 {
 
-    /**
-     * Finds an entry of the container by its identifier and returns it.
-     *
-     * @param string $id Identifier of the entry to look for.
-     * @return mixed Entry.
-     */
-    public function get($id);
-
-
-
-    /**
-     * Returns true if the container can return an entry for the given identifier.
-     * Returns false otherwise.
-     * `has($id)` returning true does not mean that `get($id)` will not throw an exception.
-     * It does however mean that `get($id)` will not throw a `NotFoundException`.
-     *
-     * @param string $id Identifier of the entry to look for.
-     * @return boolean
-     */
-    public function has($id);
+	/**
+	 * Finds an entry of the container by its identifier and returns it.
+	 *
+	 * @param string $id Identifier of the entry to look for.
+	 * @return mixed Entry.
+	 */
+	public function get($id);
+
+
+
+	/**
+	 * Returns true if the container can return an entry for the given identifier.
+	 * Returns false otherwise.
+	 * `has($id)` returning true does not mean that `get($id)` will not throw an exception.
+	 * It does however mean that `get($id)` will not throw a `NotFoundException`.
+	 *
+	 * @param string $id Identifier of the entry to look for.
+	 * @return boolean
+	 */
+	public function has($id);
 
 
 }

core/services/container/CoffeeMakerInterface.php

Indentation +19 added lines, -19 removed lines

@@ -2,7 +2,7 @@ 
 namespace EventEspresso\core\services\container;
 
 if ( ! defined('EVENT_ESPRESSO_VERSION')) {
-    exit('No direct script access allowed');
+	exit('No direct script access allowed');
 }
 
 
@@ -17,33 +17,33 @@ 
 interface CoffeeMakerInterface
 {
 
-    /**
-     * @return array
-     */
-    public static function getTypes();
+	/**
+	 * @return array
+	 */
+	public static function getTypes();
 
 
 
-    /**
-     * @param $type
-     */
-    public static function validateType($type);
+	/**
+	 * @param $type
+	 */
+	public static function validateType($type);
 
 
 
-    /**
-     * @param RecipeInterface $recipe
-     * @param array           $arguments
-     * @return mixed
-     */
-    public function brew(RecipeInterface $recipe, $arguments = array());
+	/**
+	 * @param RecipeInterface $recipe
+	 * @param array           $arguments
+	 * @return mixed
+	 */
+	public function brew(RecipeInterface $recipe, $arguments = array());
 
 
 
-    /**
-     * @return string
-     */
-    public function type();
+	/**
+	 * @return string
+	 */
+	public function type();
 
 }
 // End of file CoffeeMakerInterface.php

core/services/container/LoadOnlyCoffeeMaker.php

Indentation +21 added lines, -21 removed lines

@@ -2,7 +2,7 @@ 
 namespace EventEspresso\core\services\container;
 
 if ( ! defined('EVENT_ESPRESSO_VERSION')) {
-    exit('No direct script access allowed');
+	exit('No direct script access allowed');
 }
 
 
@@ -24,26 +24,26 @@ 
 class LoadOnlyCoffeeMaker extends CoffeeMaker
 {
 
-    /**
-     * @return string
-     */
-    public function type()
-    {
-        return CoffeeMaker::BREW_LOAD_ONLY;
-    }
-
-
-
-    /**
-     * @param RecipeInterface $recipe
-     * @param array           $arguments
-     * @return mixed
-     */
-    public function brew(RecipeInterface $recipe, $arguments = array())
-    {
-        $this->resolveClassAndFilepath($recipe);
-        return null;
-    }
+	/**
+	 * @return string
+	 */
+	public function type()
+	{
+		return CoffeeMaker::BREW_LOAD_ONLY;
+	}
+
+
+
+	/**
+	 * @param RecipeInterface $recipe
+	 * @param array           $arguments
+	 * @return mixed
+	 */
+	public function brew(RecipeInterface $recipe, $arguments = array())
+	{
+		$this->resolveClassAndFilepath($recipe);
+		return null;
+	}