eventespresso / event-espresso-core

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;
+	}
 
 
 

core/services/container/exceptions/InstantiationException.php

Indentation +22 added lines, -22 removed lines

@@ -4,7 +4,7 @@ 
 use BadMethodCallException;
 
 if ( ! defined('EVENT_ESPRESSO_VERSION')) {
-    exit('No direct script access allowed');
+	exit('No direct script access allowed');
 }
 
 
@@ -20,27 +20,27 @@ 
 class InstantiationException extends BadMethodCallException
 {
 
-    /**
-     * InstantiationException constructor.
-     *
-     * @param string $identifier the name of the requested entity or service
-     * @param string     $message
-     * @param int        $code
-     * @param \Exception $previous
-     */
-    public function __construct($identifier, $message = '', $code = 0, \Exception $previous = null)
-    {
-        if (empty($message)) {
-            $message = sprintf(
-                __(
-                    'The "%1$s" class could not be constructed.',
-                    'event_espresso'
-                ),
-                $identifier
-            );
-        }
-        parent::__construct($message, $code, $previous);
-    }
+	/**
+	 * InstantiationException constructor.
+	 *
+	 * @param string $identifier the name of the requested entity or service
+	 * @param string     $message
+	 * @param int        $code
+	 * @param \Exception $previous
+	 */
+	public function __construct($identifier, $message = '', $code = 0, \Exception $previous = null)
+	{
+		if (empty($message)) {
+			$message = sprintf(
+				__(
+					'The "%1$s" class could not be constructed.',
+					'event_espresso'
+				),
+				$identifier
+			);
+		}
+		parent::__construct($message, $code, $previous);
+	}
 
 }
 // End of file InstantiationException.php

core/services/container/CoffeePotInterface.php

Indentation +50 added lines, -50 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,70 +18,70 @@ 
 
 
 
-    /**
-     * returns an instance of the requested entity type using the supplied arguments.
-     * If a shared service is requested and an instance is already in the carafe, then it will be returned.
-     * If it is not already in the carafe, then the service will be constructed, added to the carafe, and returned
-     * If the request is for a new entity and a closure exists in the reservoir for creating it,
-     * then a new entity will be instantiated from the closure and returned.
-     * If a closure does not exist, then one will be built and added to the reservoir
-     * before instantiating the requested entity.
-     *
-     * @param  string $identifier Identifier for the entity class to be constructed.
-     *                            Typically a Fully Qualified Class Name
-     * @param array   $arguments  an array of arguments to be passed to the entity constructor
-     * @param string  $type
-     * @return mixed
-     */
-    public function brew($identifier, $arguments = array(), $type = '');
+	/**
+	 * returns an instance of the requested entity type using the supplied arguments.
+	 * If a shared service is requested and an instance is already in the carafe, then it will be returned.
+	 * If it is not already in the carafe, then the service will be constructed, added to the carafe, and returned
+	 * If the request is for a new entity and a closure exists in the reservoir for creating it,
+	 * then a new entity will be instantiated from the closure and returned.
+	 * If a closure does not exist, then one will be built and added to the reservoir
+	 * before instantiating the requested entity.
+	 *
+	 * @param  string $identifier Identifier for the entity class to be constructed.
+	 *                            Typically a Fully Qualified Class Name
+	 * @param array   $arguments  an array of arguments to be passed to the entity constructor
+	 * @param string  $type
+	 * @return mixed
+	 */
+	public function brew($identifier, $arguments = array(), $type = '');
 
 
 
-    /**
-     * @param string   $identifier
-     * @param callable $closure
-     */
-    public function addClosure($identifier, $closure);
+	/**
+	 * @param string   $identifier
+	 * @param callable $closure
+	 */
+	public function addClosure($identifier, $closure);
 
 
 
-    /**
-     * @param string $identifier
-     * @param mixed  $service
-     * @return boolean
-     */
-    public function addService($identifier, $service);
+	/**
+	 * @param string $identifier
+	 * @param mixed  $service
+	 * @return boolean
+	 */
+	public function addService($identifier, $service);
 
 
 
-    /**
-     * Adds instructions on how to brew objects
-     *
-     * @param RecipeInterface $recipe
-     * @return mixed
-     */
-    public function addRecipe(RecipeInterface $recipe);
+	/**
+	 * Adds instructions on how to brew objects
+	 *
+	 * @param RecipeInterface $recipe
+	 * @return mixed
+	 */
+	public function addRecipe(RecipeInterface $recipe);
 
 
 
-    /**
-     * Get instructions on how to brew objects
-     *
-     * @param string $identifier
-     * @return Recipe
-     */
-    public function getRecipe($identifier);
+	/**
+	 * Get instructions on how to brew objects
+	 *
+	 * @param string $identifier
+	 * @return Recipe
+	 */
+	public function getRecipe($identifier);
 
 
 
-    /**
-     * adds class name aliases to list of filters
-     *
-     * @param  string $identifier
-     * @param  array  $aliases
-     * @return string
-     */
-    public function addAliases($identifier, $aliases);
+	/**
+	 * adds class name aliases to list of filters
+	 *
+	 * @param  string $identifier
+	 * @param  array  $aliases
+	 * @return string
+	 */
+	public function addAliases($identifier, $aliases);
 
 
 

core/libraries/form_sections/strategies/display/EE_Checkbox_Display_Strategy.strategy.php

Spacing +21 added lines, -21 removed lines

@@ -18,43 +18,43 @@
 	 * @throws EE_Error
 	 * @return string of html to display the field
 	 */
-	public function display(){
+	public function display() {
 		$input = $this->get_input();
 		//d( $input );
-		$multi = count( $input->options() ) > 1 ? TRUE : FALSE;
+		$multi = count($input->options()) > 1 ? TRUE : FALSE;
 		$input->set_label_sizes();
 		$label_size_class = $input->get_label_size_class();
 		$html = '';
-		if ( ! is_array( $input->raw_value() ) && $input->raw_value() !== NULL ) {
+		if ( ! is_array($input->raw_value()) && $input->raw_value() !== NULL) {
 			EE_Error::doing_it_wrong(
 				'EE_Checkbox_Display_Strategy::display()',
 				sprintf(
-					__( 'Input values for checkboxes should be an array of values, but the value for input "%1$s" is "%2$s". Please verify that the input name is exactly "%3$s"', 'event_espresso'),
+					__('Input values for checkboxes should be an array of values, but the value for input "%1$s" is "%2$s". Please verify that the input name is exactly "%3$s"', 'event_espresso'),
 					$input->html_id(),
-					var_export( $input->raw_value(), true),
-					$input->html_name() . '[]'
+					var_export($input->raw_value(), true),
+					$input->html_name().'[]'
 				),
 				'4.8.1'
 			);
 		}
-		$input_raw_value = (array)$input->raw_value();
-		foreach( $input->options() as $value => $display_text ){
-			$value = $input->get_normalization_strategy()->unnormalize_one( $value );
-			$html_id = $this->get_sub_input_id( $value );
-			$html .= EEH_HTML::nl( 0, 'checkbox' );
-			$html .= '<label for="' . $html_id . '" id="' . $html_id . '-lbl" class="ee-checkbox-label-after' . $label_size_class . '">';
-			$html .= EEH_HTML::nl( 1, 'checkbox' );
+		$input_raw_value = (array) $input->raw_value();
+		foreach ($input->options() as $value => $display_text) {
+			$value = $input->get_normalization_strategy()->unnormalize_one($value);
+			$html_id = $this->get_sub_input_id($value);
+			$html .= EEH_HTML::nl(0, 'checkbox');
+			$html .= '<label for="'.$html_id.'" id="'.$html_id.'-lbl" class="ee-checkbox-label-after'.$label_size_class.'">';
+			$html .= EEH_HTML::nl(1, 'checkbox');
 			$html .= '<input type="checkbox"';
-			$html .= ' name="' . $input->html_name() . '[]"';
-			$html .= ' id="' . $html_id . '"';
-			$html .= ' class="' . $input->html_class() . '"';
-			$html .= ' style="' . $input->html_style() . '"';
-			$html .= ' value="' . esc_attr( $value ) . '"';
-			$html .= ! empty( $input_raw_value ) && in_array( $value, $input_raw_value ) ? ' checked="checked"' : '';
-			$html .= ' ' . $this->_input->other_html_attributes();
+			$html .= ' name="'.$input->html_name().'[]"';
+			$html .= ' id="'.$html_id.'"';
+			$html .= ' class="'.$input->html_class().'"';
+			$html .= ' style="'.$input->html_style().'"';
+			$html .= ' value="'.esc_attr($value).'"';
+			$html .= ! empty($input_raw_value) && in_array($value, $input_raw_value) ? ' checked="checked"' : '';
+			$html .= ' '.$this->_input->other_html_attributes();
 			$html .= '>&nbsp;';
 			$html .= $display_text;
-			$html .= EEH_HTML::nl( -1, 'checkbox' ) . '</label>';
+			$html .= EEH_HTML::nl( -1, 'checkbox' ).'</label>';
 		}
 		return $html;
 	}

core/helpers/EEH_Maps.helper.php

Spacing +31 added lines, -31 removed lines

@@ -21,18 +21,18 @@ 
 	 * @param  array $ee_gmaps_opts array of attributes required for the map link generation
 	 * @return string (link to map!)
 	 */
-	public static function google_map( $ee_gmaps_opts ){
-
-		$ee_map_width = isset( $ee_gmaps_opts['ee_map_width'] ) && ! empty( $ee_gmaps_opts['ee_map_width'] ) ? $ee_gmaps_opts['ee_map_width'] : '300';
-		$ee_map_height = isset( $ee_gmaps_opts['ee_map_height'] ) && ! empty( $ee_gmaps_opts['ee_map_height'] ) ? $ee_gmaps_opts['ee_map_height'] : '185';
-		$ee_map_zoom = isset( $ee_gmaps_opts['ee_map_zoom'] ) && ! empty( $ee_gmaps_opts['ee_map_zoom'] ) ? $ee_gmaps_opts['ee_map_zoom'] : '12';
-		$ee_map_nav_display = isset( $ee_gmaps_opts['ee_map_nav_display'] ) && ! empty( $ee_gmaps_opts['ee_map_nav_display'] ) ? 'true' : 'false';
-		$ee_map_nav_size =  isset( $ee_gmaps_opts['ee_map_nav_size'] ) && ! empty( $ee_gmaps_opts['ee_map_nav_size'] )? $ee_gmaps_opts['ee_map_nav_size'] : 'default';
-		$ee_map_type_control =  isset( $ee_gmaps_opts['ee_map_type_control'] ) && ! empty( $ee_gmaps_opts['ee_map_type_control'] )? $ee_gmaps_opts['ee_map_type_control'] : 'default';
-		$static_url =  isset( $ee_gmaps_opts['ee_static_url'] ) && ! empty( $ee_gmaps_opts['ee_static_url'] )? $ee_gmaps_opts['ee_static_url'] : FALSE;
-
-		if( isset( $ee_gmaps_opts['ee_map_align'] ) && ! empty( $ee_gmaps_opts['ee_map_align'] )){
-			switch( $ee_gmaps_opts['ee_map_align'] ){
+	public static function google_map($ee_gmaps_opts) {
+
+		$ee_map_width = isset($ee_gmaps_opts['ee_map_width']) && ! empty($ee_gmaps_opts['ee_map_width']) ? $ee_gmaps_opts['ee_map_width'] : '300';
+		$ee_map_height = isset($ee_gmaps_opts['ee_map_height']) && ! empty($ee_gmaps_opts['ee_map_height']) ? $ee_gmaps_opts['ee_map_height'] : '185';
+		$ee_map_zoom = isset($ee_gmaps_opts['ee_map_zoom']) && ! empty($ee_gmaps_opts['ee_map_zoom']) ? $ee_gmaps_opts['ee_map_zoom'] : '12';
+		$ee_map_nav_display = isset($ee_gmaps_opts['ee_map_nav_display']) && ! empty($ee_gmaps_opts['ee_map_nav_display']) ? 'true' : 'false';
+		$ee_map_nav_size = isset($ee_gmaps_opts['ee_map_nav_size']) && ! empty($ee_gmaps_opts['ee_map_nav_size']) ? $ee_gmaps_opts['ee_map_nav_size'] : 'default';
+		$ee_map_type_control = isset($ee_gmaps_opts['ee_map_type_control']) && ! empty($ee_gmaps_opts['ee_map_type_control']) ? $ee_gmaps_opts['ee_map_type_control'] : 'default';
+		$static_url = isset($ee_gmaps_opts['ee_static_url']) && ! empty($ee_gmaps_opts['ee_static_url']) ? $ee_gmaps_opts['ee_static_url'] : FALSE;
+
+		if (isset($ee_gmaps_opts['ee_map_align']) && ! empty($ee_gmaps_opts['ee_map_align'])) {
+			switch ($ee_gmaps_opts['ee_map_align']) {
 				case "left":
 					$map_align = 'ee-gmap-align-left left';
 					break;
@@ -53,18 +53,18 @@ 
 
 		// Determine whether user has set a hardoded url to use and
 		// if so display a Google static iframe map else run V3 api
-		if( $static_url ) {
+		if ($static_url) {
 
-			$html = '<div class="ee-gmap-iframewrap ee-gmap-wrapper ' . $map_align . '">';
-			$html .= '<iframe src="' . $static_url . '&output=embed" style="width: ' . $ee_map_width  .'px; height: ' . $ee_map_height . 'px;" frameborder="0" scrolling="no">';
+			$html = '<div class="ee-gmap-iframewrap ee-gmap-wrapper '.$map_align.'">';
+			$html .= '<iframe src="'.$static_url.'&output=embed" style="width: '.$ee_map_width.'px; height: '.$ee_map_height.'px;" frameborder="0" scrolling="no">';
 			$html .= '</iframe>';
-			$html .= '<a href="' . $static_url . '">View Large map</a>';
+			$html .= '<a href="'.$static_url.'">View Large map</a>';
 			$html .= '</div>';
 			return $html;
 
 		 } else {
 
-			EEH_Maps::$gmap_vars[ $ee_gmaps_opts['map_ID'] ] = array(
+			EEH_Maps::$gmap_vars[$ee_gmaps_opts['map_ID']] = array(
 				'map_ID' => $ee_gmaps_opts['map_ID'],
 				'ee_map_zoom' => $ee_map_zoom,
 				'ee_map_nav_display' => $ee_map_nav_display,
@@ -74,12 +74,12 @@ 
 			);
 
 			$html = '<div class="ee-gmap-wrapper '.$map_align.';">';
-			$html .= '<div class="ee-gmap" id="map_canvas_' . $ee_gmaps_opts['map_ID'] .'" style="width: '.$ee_map_width.'px; height: '.$ee_map_height.'px;"></div>';  //
+			$html .= '<div class="ee-gmap" id="map_canvas_'.$ee_gmaps_opts['map_ID'].'" style="width: '.$ee_map_width.'px; height: '.$ee_map_height.'px;"></div>'; //
 			$html .= '</div>';
 
-			wp_enqueue_script( 'gmap_api' );
-			wp_enqueue_script( 'ee_gmap' );
-			add_action( 'wp_footer', array( 'EEH_Maps', 'footer_enqueue_script' ));
+			wp_enqueue_script('gmap_api');
+			wp_enqueue_script('ee_gmap');
+			add_action('wp_footer', array('EEH_Maps', 'footer_enqueue_script'));
 
 			return $html;
 
@@ -94,7 +94,7 @@ 
 	 * @return void
 	 */
 	public static function footer_enqueue_script() {
-		wp_localize_script( 'ee_gmap', 'ee_gmap_vars', EEH_Maps::$gmap_vars );
+		wp_localize_script('ee_gmap', 'ee_gmap_vars', EEH_Maps::$gmap_vars);
 	}
 
 
@@ -105,10 +105,10 @@ 
 	public static function espresso_google_map_js() {
 		$api_url = sprintf(
 			"https://maps.googleapis.com/maps/api/js?key=%s",
-			apply_filters( 'FHEE__EEH_Maps__espresso_google_maps_js__api_key', EE_Registry::instance()->CFG->map_settings->google_map_api_key )
+			apply_filters('FHEE__EEH_Maps__espresso_google_maps_js__api_key', EE_Registry::instance()->CFG->map_settings->google_map_api_key)
 		);
-		wp_register_script( 'gmap_api', $api_url, array('jquery'), NULL, TRUE );
-		wp_register_script( 'ee_gmap', plugin_dir_url(__FILE__) . 'assets/ee_gmap.js', array('gmap_api'), '1.0', TRUE );
+		wp_register_script('gmap_api', $api_url, array('jquery'), NULL, TRUE);
+		wp_register_script('ee_gmap', plugin_dir_url(__FILE__).'assets/ee_gmap.js', array('gmap_api'), '1.0', TRUE);
 	}
 
 	/**
@@ -117,7 +117,7 @@ 
 	 * @return string (link to map!)
 	 */
 	public static function google_map_link($atts) {
-		do_action( 'AHEE_log', __FILE__, __FUNCTION__, '' );
+		do_action('AHEE_log', __FILE__, __FUNCTION__, '');
 		extract($atts);
 		/** @var string $address */
 		/** @var string $city */
@@ -136,9 +136,9 @@ 
 		$id = isset($id) ? $id : 'not_set';
 		$map_image_class = isset($map_image_class) ? $map_image_class : 'ee_google_map_view';
 
-		$address_string = ($address != '' ? $address : '') . ($city != '' ? ',' . $city : '') . ($state != '' ? ',' . $state : '') . ($zip != '' ? ',' . $zip : '') . ($country != '' ? ',' . $country : '');
+		$address_string = ($address != '' ? $address : '').($city != '' ? ','.$city : '').($state != '' ? ','.$state : '').($zip != '' ? ','.$zip : '').($country != '' ? ','.$country : '');
 
-		$google_map = htmlentities2('http://maps.google.com/maps?q=' . urlencode( $address_string ));
+		$google_map = htmlentities2('http://maps.google.com/maps?q='.urlencode($address_string));
 
 		switch ($type) {
 			case 'text':
@@ -153,12 +153,12 @@ 
 			case 'map':
 				$scheme = is_ssl() ? 'https://' : 'http://';
 
-				$api_key = apply_filters( 'FHEE__EEH_Maps__espresso_google_maps_link__api_key', EE_Registry::instance()->CFG->map_settings->google_map_api_key );
+				$api_key = apply_filters('FHEE__EEH_Maps__espresso_google_maps_link__api_key', EE_Registry::instance()->CFG->map_settings->google_map_api_key);
 
-				return '<a class="a_map_image_link" href="' . $google_map . '" target="_blank">' . '<img class="map_image_link" id="venue_map_' . $id . '" ' . $map_image_class . ' src="' . htmlentities2( $scheme . 'maps.googleapis.com/maps/api/staticmap?center=' . urlencode( $address_string ) . '&amp;zoom=14&amp;size=' . $map_w . 'x' . $map_h . '&amp;markers=color:green|label:|' . urlencode( $address_string ) . '&amp;sensor=false&amp;key=' . $api_key ) . '" /></a>';
+				return '<a class="a_map_image_link" href="'.$google_map.'" target="_blank">'.'<img class="map_image_link" id="venue_map_'.$id.'" '.$map_image_class.' src="'.htmlentities2($scheme.'maps.googleapis.com/maps/api/staticmap?center='.urlencode($address_string).'&amp;zoom=14&amp;size='.$map_w.'x'.$map_h.'&amp;markers=color:green|label:|'.urlencode($address_string).'&amp;sensor=false&amp;key='.$api_key).'" /></a>';
 		}
 
-		return '<a href="' . $google_map . '" target="_blank">' . $text . '</a>';
+		return '<a href="'.$google_map.'" target="_blank">'.$text.'</a>';
 	}
 
 

admin_pages/venues/templates/google_map.template.php

Indentation +6 added lines, -6 removed lines

@@ -26,12 +26,12 @@
                     <input type="text" id="ee-google-map-api-key" class="regular-text" name="google_map_api_key" value="<?php echo $map_settings->google_map_api_key; ?>" />
                     <p class="description">
                         <?php
-                            printf(
-                                __('An API key is now required to use the Google Maps API: %1$sclick here to get an API key%2$s', 'event_espresso'),
-                                '<a href="https://console.developers.google.com/flows/enableapi?apiid=maps_backend,geocoding_backend,directions_backend,distance_matrix_backend,elevation_backend,static_maps_backend&keyType=CLIENT_SIDE&reusekey=true" target="_blank">',
-                                '</a>'
-                            );
-                        ?>
+							printf(
+								__('An API key is now required to use the Google Maps API: %1$sclick here to get an API key%2$s', 'event_espresso'),
+								'<a href="https://console.developers.google.com/flows/enableapi?apiid=maps_backend,geocoding_backend,directions_backend,distance_matrix_backend,elevation_backend,static_maps_backend&keyType=CLIENT_SIDE&reusekey=true" target="_blank">',
+								'</a>'
+							);
+						?>
                     </p>
                 </td>
             </tr>

Spacing +15 added lines, -15 removed lines

@@ -15,7 +15,7 @@ 
 				</td>
 			</tr>
 			<?php
-			if( apply_filters( 'FHEE__google_map__show_api_key_input', true ) ) { ?>
+			if (apply_filters('FHEE__google_map__show_api_key_input', true)) { ?>
             <tr>
                 <th>
                     <label for="ee-google-map-api-key">
@@ -110,19 +110,19 @@ 
 				<td>
 					<label for="event_details_control_type-default" class="ee-admin-radio-lbl">
 						<?php $checked = $map_settings->event_details_control_type == 'default' ? 'checked="checked"' : ''; ?>
-						<input id="event_details_control_type-default" type="radio" name="event_details_control_type" value="default"<?php echo $checked;?>/>
+						<input id="event_details_control_type-default" type="radio" name="event_details_control_type" value="default"<?php echo $checked; ?>/>
 						<?php _e(' Default', 'event_espresso') ?>
 					</label>
 
 					<label for="event_details_control_type-horizontal" class="ee-admin-radio-lbl">
 						<?php $checked = $map_settings->event_details_control_type == 'horizontal' ? 'checked="checked"' : ''; ?>
-						<input id="event_details_control_type-horizontal" type="radio" name="event_details_control_type" value="horizontal"<?php echo $checked;?>/>
+						<input id="event_details_control_type-horizontal" type="radio" name="event_details_control_type" value="horizontal"<?php echo $checked; ?>/>
 						<?php _e(' Horizontal', 'event_espresso') ?>
 					</label>
 
 					<label for="event_details_control_type-dropdown" class="ee-admin-radio-lbl">
 						<?php $checked = $map_settings->event_details_control_type == 'dropdown' ? 'checked="checked"' : ''; ?>
-						<input id="event_details_control_type-dropdown" type="radio" name="event_details_control_type" value="dropdown"<?php echo $checked;?>/>
+						<input id="event_details_control_type-dropdown" type="radio" name="event_details_control_type" value="dropdown"<?php echo $checked; ?>/>
 						<?php _e(' Dropdown', 'event_espresso') ?>
 					</label>
 				</td>
@@ -135,25 +135,25 @@ 
 				<td>
 					<label for="event_details_map_align-none" class="ee-admin-radio-lbl">
 						<?php $checked = $map_settings->event_details_map_align == 'none' ? 'checked="checked"' : ''; ?>
-						<input id="event_details_map_align-none" type="radio" name="event_details_map_align" value="none"<?php echo $checked;?>/>
+						<input id="event_details_map_align-none" type="radio" name="event_details_map_align" value="none"<?php echo $checked; ?>/>
 						<?php _e(' None', 'event_espresso') ?>
 					</label>
 
 					<label for="event_details_map_align-left" class="ee-admin-radio-lbl">
 						<?php $checked = $map_settings->event_details_map_align == 'left' ? 'checked="checked"' : ''; ?>
-						<input id="event_details_map_align-left" type="radio" name="event_details_map_align" value="left"<?php echo $checked;?>/>
+						<input id="event_details_map_align-left" type="radio" name="event_details_map_align" value="left"<?php echo $checked; ?>/>
 						<?php _e(' Align Left', 'event_espresso') ?>
 					</label>
 
 					<label for="event_details_map_align-center" class="ee-admin-radio-lbl">
 						<?php $checked = $map_settings->event_details_map_align == 'center' ? 'checked="checked"' : ''; ?>
-						<input id="event_details_map_align-center" type="radio" name="event_details_map_align" value="center"<?php echo $checked;?>/>
+						<input id="event_details_map_align-center" type="radio" name="event_details_map_align" value="center"<?php echo $checked; ?>/>
 						<?php _e(' Align Center', 'event_espresso') ?>
 					</label>
 
 					<label for="event_details_map_align-right" class="ee-admin-radio-lbl">
 						<?php $checked = $map_settings->event_details_map_align == 'right' ? 'checked="checked"' : ''; ?>
-						<input id="event_details_map_align-right" type="radio" name="event_details_map_align" value="right"<?php echo $checked;?>/>
+						<input id="event_details_map_align-right" type="radio" name="event_details_map_align" value="right"<?php echo $checked; ?>/>
 						<?php _e(' Align Right', 'event_espresso') ?>
 					</label>
 				</td>
@@ -228,19 +228,19 @@ 
 				<td>
 					<label for="event_list_control_type-default" class="ee-admin-radio-lbl">
 						<?php $checked = $map_settings->event_list_control_type == 'default' ? 'checked="checked"' : ''; ?>
-						<input id="event_list_control_type-default" type="radio" name="event_list_control_type" value="default"<?php echo $checked;?>/>
+						<input id="event_list_control_type-default" type="radio" name="event_list_control_type" value="default"<?php echo $checked; ?>/>
 						<?php _e(' Default', 'event_espresso') ?>
 					</label>
 
 					<label for="event_list_control_type-horizontal" class="ee-admin-radio-lbl">
 						<?php $checked = $map_settings->event_list_control_type == 'horizontal' ? 'checked="checked"' : ''; ?>
-						<input id="event_list_control_type-horizontal" type="radio" name="event_list_control_type" value="horizontal"<?php echo $checked;?>/>
+						<input id="event_list_control_type-horizontal" type="radio" name="event_list_control_type" value="horizontal"<?php echo $checked; ?>/>
 						<?php _e(' Horizontal', 'event_espresso') ?>
 					</label>
 
 					<label for="event_list_control_type-dropdown" class="ee-admin-radio-lbl">
 						<?php $checked = $map_settings->event_list_control_type == 'dropdown' ? 'checked="checked"' : ''; ?>
-						<input id="event_list_control_type-dropdown" type="radio" name="event_list_control_type" value="dropdown"<?php echo $checked;?>/>
+						<input id="event_list_control_type-dropdown" type="radio" name="event_list_control_type" value="dropdown"<?php echo $checked; ?>/>
 						<?php _e(' Dropdown', 'event_espresso') ?>
 					</label>
 
@@ -254,25 +254,25 @@ 
 				<td>
 					<label for="event_list_map_align-none" class="ee-admin-radio-lbl">
 						<?php $checked = $map_settings->event_list_map_align == 'none' ? 'checked="checked"' : ''; ?>
-						<input id="event_list_map_align-none" type="radio" name="event_list_map_align" value="none"<?php echo $checked;?>/>
+						<input id="event_list_map_align-none" type="radio" name="event_list_map_align" value="none"<?php echo $checked; ?>/>
 						<?php _e(' None', 'event_espresso') ?>
 					</label>
 
 					<label for="event_list_map_align-left" class="ee-admin-radio-lbl">
 						<?php $checked = $map_settings->event_list_map_align == 'left' ? 'checked="checked"' : ''; ?>
-						<input id="event_list_map_align-left" type="radio" name="event_list_map_align" value="left"<?php echo $checked;?>/>
+						<input id="event_list_map_align-left" type="radio" name="event_list_map_align" value="left"<?php echo $checked; ?>/>
 						<?php _e(' Align Left', 'event_espresso') ?>
 					</label>
 
 					<label for="event_list_map_align-center" class="ee-admin-radio-lbl">
 						<?php $checked = $map_settings->event_list_map_align == 'center' ? 'checked="checked"' : ''; ?>
-						<input id="event_list_map_align-center" type="radio" name="event_list_map_align" value="center"<?php echo $checked;?>/>
+						<input id="event_list_map_align-center" type="radio" name="event_list_map_align" value="center"<?php echo $checked; ?>/>
 						<?php _e(' Align Center', 'event_espresso') ?>
 					</label>
 
 					<label for="event_list_map_align-right" class="ee-admin-radio-lbl">
 						<?php $checked = $map_settings->event_list_map_align == 'right' ? 'checked="checked"' : ''; ?>
-						<input id="event_list_map_align-right" type="radio" name="event_list_map_align" value="right"<?php echo $checked;?>/>
+						<input id="event_list_map_align-right" type="radio" name="event_list_map_align" value="right"<?php echo $checked; ?>/>
 						<?php _e(' Align Right', 'event_espresso') ?>
 					</label>
 

caffeinated/payment_methods/Paypal_Pro/EE_PMT_Paypal_Pro.pm.php

Spacing +30 added lines, -30 removed lines

@@ -1,6 +1,6 @@ 
 <?php
 
-if (!defined('EVENT_ESPRESSO_VERSION'))
+if ( ! defined('EVENT_ESPRESSO_VERSION'))
 	exit('No direct script access allowed');
 
 /**
@@ -25,7 +25,7 @@ 
  *
  * ------------------------------------------------------------------------
  */
-class EE_PMT_Paypal_Pro extends EE_PMT_Base{
+class EE_PMT_Paypal_Pro extends EE_PMT_Base {
 
 	/**
 	 * @param EE_Payment_Method $pm_instance
@@ -35,7 +35,7 @@ 
 		require_once($this->file_folder().'EEG_Paypal_Pro.gateway.php');
 		$this->_gateway = new EEG_Paypal_Pro();
 		$this->_pretty_name = __("Paypal Pro", 'event_espresso');
-		$this->_default_description = __( 'Please provide the following billing information.', 'event_espresso' );
+		$this->_default_description = __('Please provide the following billing information.', 'event_espresso');
 		$this->_requires_https = true;
 		parent::__construct($pm_instance);
 	}
@@ -51,21 +51,21 @@ 
 			'extra_meta_inputs'=>array(
 //				'paypal_email'=>new EE_Email_Input(), not actually used
 				'username'=>new EE_Text_Input(array(
-					'html_label_text'=>  sprintf(__("Paypal API Username %s", "event_espresso"),$this->get_help_tab_link()),
+					'html_label_text'=>  sprintf(__("Paypal API Username %s", "event_espresso"), $this->get_help_tab_link()),
 					'required' => true
 				)),
 				'password'=>new EE_Text_Input(array(
-					'html_label_text'=>  sprintf(__("Paypal API Password %s", "event_espresso"),$this->get_help_tab_link()),
+					'html_label_text'=>  sprintf(__("Paypal API Password %s", "event_espresso"), $this->get_help_tab_link()),
 					'required' => true
 				)),
 				'signature'=>new EE_Text_Input(array(
-					'html_label_text'=>  sprintf(__("Paypal API Signature %s", "event_espresso"),$this->get_help_tab_link()),
+					'html_label_text'=>  sprintf(__("Paypal API Signature %s", "event_espresso"), $this->get_help_tab_link()),
 					'required' => true
 				)),
 				'credit_card_types'=>new EE_Checkbox_Multi_Input(
 						$this->card_types_supported(),
 						array(
-							'html_label_text' => __( 'Card Types Supported', 'event_espresso' ),
+							'html_label_text' => __('Card Types Supported', 'event_espresso'),
 							'required' => true )),
 				)
 			)
@@ -79,10 +79,10 @@ 
 	 * @throws \EE_Error
 	 * @return EE_Billing_Info_Form
 	 */
-	public function generate_new_billing_form( EE_Transaction $transaction = NULL ) {
-		$allowed_types = $this->_pm_instance->get_extra_meta( 'credit_card_types', TRUE );
+	public function generate_new_billing_form(EE_Transaction $transaction = NULL) {
+		$allowed_types = $this->_pm_instance->get_extra_meta('credit_card_types', TRUE);
 		//if allowed types is a string or empty array or null...
-		if( empty( $allowed_types )) {
+		if (empty($allowed_types)) {
 			$allowed_types = array();
 		}
 
@@ -93,26 +93,26 @@ 
 //				'html_id'=> 'ee-Paypal_Pro-billing-form',
 				'subsections'=>array(
 					'credit_card'=>new EE_Credit_Card_Input(
-						array( 'required'=>TRUE, 'html_class' => 'ee-billing-qstn', 'html_label_text' => __( 'Card Number', 'event_espresso' ))
+						array('required'=>TRUE, 'html_class' => 'ee-billing-qstn', 'html_label_text' => __('Card Number', 'event_espresso'))
 					),
 					'credit_card_type'=>new EE_Select_Input(
 						//the options are set dynamically
-						array_intersect_key( EE_PMT_Paypal_Pro::card_types_supported(), array_flip( $allowed_types )),
-						array( 'required'=>TRUE, 'html_class' => 'ee-billing-qstn', 'html_label_text' => __( 'Card Type', 'event_espresso' ))
+						array_intersect_key(EE_PMT_Paypal_Pro::card_types_supported(), array_flip($allowed_types)),
+						array('required'=>TRUE, 'html_class' => 'ee-billing-qstn', 'html_label_text' => __('Card Type', 'event_espresso'))
 					),
 					'exp_month'=>new EE_Credit_Card_Month_Input(
-						TRUE, array( 'required'=>TRUE, 'html_class' => 'ee-billing-qstn', 'html_label_text' =>  __( 'Expiry Month', 'event_espresso' )  )
+						TRUE, array('required'=>TRUE, 'html_class' => 'ee-billing-qstn', 'html_label_text' =>  __('Expiry Month', 'event_espresso'))
 					),
 					'exp_year'=>new EE_Credit_Card_Year_Input(
-						array( 'required'=>TRUE, 'html_class' => 'ee-billing-qstn', 'html_label_text' => __( 'Expiry Year', 'event_espresso' )  )
+						array('required'=>TRUE, 'html_class' => 'ee-billing-qstn', 'html_label_text' => __('Expiry Year', 'event_espresso'))
 					),
 					'cvv'=>new EE_CVV_Input(
-						array( 'required'=>TRUE, 'html_class' => 'ee-billing-qstn', 'html_label_text' => __( 'CVV', 'event_espresso' ) )
+						array('required'=>TRUE, 'html_class' => 'ee-billing-qstn', 'html_label_text' => __('CVV', 'event_espresso'))
 					),
 				)
 			)
 		);
-		return $this->apply_billing_form_debug_settings( $billing_form );
+		return $this->apply_billing_form_debug_settings($billing_form);
 	}
 
 
@@ -124,19 +124,19 @@ 
 	 * @param \EE_Billing_Info_Form $billing_form
 	 * @return \EE_Billing_Info_Form
 	 */
-	public function apply_billing_form_debug_settings( EE_Billing_Info_Form $billing_form ) {
-		if ( $this->_pm_instance->debug_mode() ) {
+	public function apply_billing_form_debug_settings(EE_Billing_Info_Form $billing_form) {
+		if ($this->_pm_instance->debug_mode()) {
 			$billing_form->add_subsections(
-				array( 'fyi_about_autofill' => $billing_form->payment_fields_autofilled_notice_html() ),
+				array('fyi_about_autofill' => $billing_form->payment_fields_autofilled_notice_html()),
 				'credit_card'
 			);
 			$billing_form->add_subsections(
-				array( 'debug_content' => new EE_Form_Section_HTML_From_Template( dirname(__FILE__).DS.'templates'.DS.'paypal_pro_debug_info.template.php' )),
+				array('debug_content' => new EE_Form_Section_HTML_From_Template(dirname(__FILE__).DS.'templates'.DS.'paypal_pro_debug_info.template.php')),
 				'first_name'
 			);
-			$billing_form->get_input( 'credit_card_type' )->set_default( 'Visa' );
-			$billing_form->get_input( 'exp_year' )->set_default( 2018);
-			$billing_form->get_input( 'cvv' )->set_default( '115' );
+			$billing_form->get_input('credit_card_type')->set_default('Visa');
+			$billing_form->get_input('exp_year')->set_default(2018);
+			$billing_form->get_input('cvv')->set_default('115');
 		}
 		return $billing_form;
 	}
@@ -148,7 +148,7 @@ 
 	 * Keys are their values, values are their pretty names.
 	 * @return array
 	 */
-	public static function card_types_supported(){
+	public static function card_types_supported() {
 		return array(
 			'Visa'=>  __("Visa", 'event_espresso'),
 			'MasterCard'=>  __("MasterCard", 'event_espresso'),
@@ -164,7 +164,7 @@ 
 	 * @see EE_PMT_Base::help_tabs_config()
 	 * @return array
 	 */
-	public function help_tabs_config(){
+	public function help_tabs_config() {
 		return array(
 			$this->get_help_tab_name() => array(
 						'title' => __('PayPal Pro Settings', 'event_espresso'),
@@ -179,10 +179,10 @@ 
 	 * @param EE_Billing_Info_Form $billing_form
 	 * @return array
 	 */
-	protected function _get_billing_values_from_form( $billing_form ){
-		$billing_values = parent::_get_billing_values_from_form( $billing_form );
-		$billing_values[ 'country' ] = $billing_form->get_input_value( 'country' );
-		$billing_values[ 'credit_card_type' ] = $billing_form->get_input_value( 'credit_card_type' );
+	protected function _get_billing_values_from_form($billing_form) {
+		$billing_values = parent::_get_billing_values_from_form($billing_form);
+		$billing_values['country'] = $billing_form->get_input_value('country');
+		$billing_values['credit_card_type'] = $billing_form->get_input_value('credit_card_type');
 		return $billing_values;
 	}
 

Braces +2 added lines, -1 removed lines

@@ -1,7 +1,8 @@
 <?php
 
-if (!defined('EVENT_ESPRESSO_VERSION'))
+if (!defined('EVENT_ESPRESSO_VERSION')) {
 	exit('No direct script access allowed');
+}
 
 /**
  * Event Espresso

core/business/EE_Registration_Processor.class.php

Doc Comments +1 added lines, -1 removed lines

@@ -565,7 +565,7 @@
 	 * @since 4.9.1
 	 * @param int                   $att_nmbr
 	 * @param EE_Line_Item | string $item
-	 * @return string
+	 * @return RegUrlLink
 	 */
 	public function generate_reg_url_link($att_nmbr, $item)
 	{

Indentation +21 added lines, -21 removed lines

@@ -215,7 +215,7 @@ 
 			}
 			// don't trigger notifications during IPNs because they will get triggered by EE_Payment_Processor
 			if ( ! EE_Processor_Base::$IPN ) {
-                // otherwise, send out notifications
+				// otherwise, send out notifications
 				add_filter( 'FHEE__EED_Messages___maybe_registration__deliver_notifications', '__return_true', 10 );
 			}
 			// DEBUG LOG
@@ -262,7 +262,7 @@ 
 			}
 			// don't trigger notifications during IPNs because they will get triggered by EE_Payment_Processor
 			if ( ! EE_Processor_Base::$IPN ) {
-                // otherwise, send out notifications
+				// otherwise, send out notifications
 				add_filter( 'FHEE__EED_Messages___maybe_registration__deliver_notifications', '__return_true', 10 );
 			}
 			// DEBUG LOG
@@ -349,7 +349,7 @@ 
 			}
 			// don't trigger notifications during IPNs because they will get triggered by EE_Payment_Processor
 			if ( ! EE_Processor_Base::$IPN ) {
-                // otherwise, send out notifications
+				// otherwise, send out notifications
 				add_filter( 'FHEE__EED_Messages___maybe_registration__deliver_notifications', '__return_true', 10 );
 			}
 			// DEBUG LOG
@@ -390,10 +390,10 @@ 
 			// 	false,
 			// 	'EE_Transaction: ' . $registration->transaction()->ID()
 			// );
-            if ( ! $registration->is_primary_registrant()) {
-                return;
-            }
-            do_action(
+			if ( ! $registration->is_primary_registrant()) {
+				return;
+			}
+			do_action(
 				'AHEE__EE_Registration_Processor__trigger_registration_update_notifications',
 				$registration,
 				$additional_details
@@ -428,7 +428,7 @@ 
 		// set new  REG_Status
 		$this->set_new_reg_status( $registration->ID(), $registration->status_ID() );
 		return $this->reg_status_updated( $registration->ID() )
-		       && $this->new_reg_status( $registration->ID() ) === EEM_Registration::status_id_approved
+			   && $this->new_reg_status( $registration->ID() ) === EEM_Registration::status_id_approved
 			? true
 			: false;
 	}
@@ -508,15 +508,15 @@ 
 
 
 
-    /**
-     * update_registration_after_being_canceled_or_declined
-     *
-     * @param \EE_Registration $registration
-     * @param array            $closed_reg_statuses
-     * @param bool             $update_reg
-     * @return bool
-     * @throws \EE_Error
-     */
+	/**
+	 * update_registration_after_being_canceled_or_declined
+	 *
+	 * @param \EE_Registration $registration
+	 * @param array            $closed_reg_statuses
+	 * @param bool             $update_reg
+	 * @return bool
+	 * @throws \EE_Error
+	 */
 	public function update_registration_after_being_canceled_or_declined(
 		EE_Registration $registration,
 		$closed_reg_statuses = array(),
@@ -524,14 +524,14 @@ 
 	) {
 		// these reg statuses should not be considered in any calculations involving monies owing
 		$closed_reg_statuses = ! empty( $closed_reg_statuses )
-            ? $closed_reg_statuses
+			? $closed_reg_statuses
 			: EEM_Registration::closed_reg_statuses();
 		if ( ! in_array( $registration->status_ID(), $closed_reg_statuses, true ) ) {
 			return false;
 		}
-        // release a reserved ticket by decrementing ticket and datetime reserved values
-        $registration->release_reserved_ticket(true);
-        $registration->set_final_price(0);
+		// release a reserved ticket by decrementing ticket and datetime reserved values
+		$registration->release_reserved_ticket(true);
+		$registration->set_final_price(0);
 		if ( $update_reg ) {
 			$registration->save();
 		}

Spacing +96 added lines, -96 removed lines

@@ -3,8 +3,8 @@ 
 use EventEspresso\core\domain\entities\RegUrlLink;
 use EventEspresso\core\domain\services\registration\CreateRegistrationService;
 
-if ( ! defined( 'EVENT_ESPRESSO_VERSION')) { exit('No direct script access allowed'); }
-EE_Registry::instance()->load_class( 'Processor_Base' );
+if ( ! defined('EVENT_ESPRESSO_VERSION')) { exit('No direct script access allowed'); }
+EE_Registry::instance()->load_class('Processor_Base');
 
 /**
  * Class EE_Registration_Processor
@@ -66,7 +66,7 @@ 
 	 */
 	public static function instance() {
 		// check if class object is instantiated
-		if ( ! self::$_instance instanceof EE_Registration_Processor ) {
+		if ( ! self::$_instance instanceof EE_Registration_Processor) {
 			self::$_instance = new self();
 		}
 		return self::$_instance;
@@ -86,8 +86,8 @@ 
 	 * @param int $REG_ID
 	 * @return string
 	 */
-	public function old_reg_status( $REG_ID ) {
-		return isset( $this->_old_reg_status[ $REG_ID ] ) ? $this->_old_reg_status[ $REG_ID ] : null;
+	public function old_reg_status($REG_ID) {
+		return isset($this->_old_reg_status[$REG_ID]) ? $this->_old_reg_status[$REG_ID] : null;
 	}
 
 
@@ -96,10 +96,10 @@ 
 	 * @param int $REG_ID
 	 * @param string $old_reg_status
 	 */
-	public function set_old_reg_status( $REG_ID, $old_reg_status ) {
+	public function set_old_reg_status($REG_ID, $old_reg_status) {
 		// only set the first time
-		if ( ! isset( $this->_old_reg_status[ $REG_ID ] ) ) {
-			$this->_old_reg_status[ $REG_ID ] = $old_reg_status;
+		if ( ! isset($this->_old_reg_status[$REG_ID])) {
+			$this->_old_reg_status[$REG_ID] = $old_reg_status;
 		}
 	}
 
@@ -109,8 +109,8 @@ 
 	 * @param int $REG_ID
 	 * @return string
 	 */
-	public function new_reg_status( $REG_ID ) {
-		return isset( $this->_new_reg_status[ $REG_ID ] ) ? $this->_new_reg_status[ $REG_ID ] : null;
+	public function new_reg_status($REG_ID) {
+		return isset($this->_new_reg_status[$REG_ID]) ? $this->_new_reg_status[$REG_ID] : null;
 	}
 
 
@@ -119,8 +119,8 @@ 
 	 * @param int $REG_ID
 	 * @param string $new_reg_status
 	 */
-	public function set_new_reg_status( $REG_ID, $new_reg_status ) {
-		$this->_new_reg_status[ $REG_ID ] = $new_reg_status;
+	public function set_new_reg_status($REG_ID, $new_reg_status) {
+		$this->_new_reg_status[$REG_ID] = $new_reg_status;
 	}
 
 
@@ -131,8 +131,8 @@ 
 	 * @param int $REG_ID
 	 * @return bool
 	 */
-	public function reg_status_updated( $REG_ID ) {
-		return $this->new_reg_status( $REG_ID ) !== $this->old_reg_status( $REG_ID ) ? true : false;
+	public function reg_status_updated($REG_ID) {
+		return $this->new_reg_status($REG_ID) !== $this->old_reg_status($REG_ID) ? true : false;
 	}
 
 
@@ -141,13 +141,13 @@ 
 	 * @param \EE_Registration $registration
 	 * @throws \EE_Error
 	 */
-	public function update_registration_status_and_trigger_notifications( \EE_Registration $registration ) {
-		$this->toggle_incomplete_registration_status_to_default( $registration, false );
-		$this->toggle_registration_status_for_default_approved_events( $registration, false );
-		$this->toggle_registration_status_if_no_monies_owing( $registration, false );
+	public function update_registration_status_and_trigger_notifications(\EE_Registration $registration) {
+		$this->toggle_incomplete_registration_status_to_default($registration, false);
+		$this->toggle_registration_status_for_default_approved_events($registration, false);
+		$this->toggle_registration_status_if_no_monies_owing($registration, false);
 		$registration->save();
 		// trigger notifications
-		$this->trigger_registration_update_notifications( $registration );
+		$this->trigger_registration_update_notifications($registration);
 	}
 
 
@@ -162,18 +162,18 @@ 
 	 * @return boolean
 	 * @throws \EE_Error
 	 */
-	public function manually_update_registration_status( EE_Registration $registration, $new_reg_status = '', $save = true ) {
+	public function manually_update_registration_status(EE_Registration $registration, $new_reg_status = '', $save = true) {
 		// set initial REG_Status
-		$this->set_old_reg_status( $registration->ID(), $registration->status_ID() );
+		$this->set_old_reg_status($registration->ID(), $registration->status_ID());
 		// set incoming REG_Status
-		$this->set_new_reg_status( $registration->ID(), $new_reg_status );
+		$this->set_new_reg_status($registration->ID(), $new_reg_status);
 		// toggle reg status but only if it has changed and the user can do so
 		if (
-			$this->reg_status_updated( $registration->ID() ) &&
-			EE_Registry::instance()->CAP->current_user_can( 'ee_edit_registration', 'toggle_registration_status', $registration->ID() )
+			$this->reg_status_updated($registration->ID()) &&
+			EE_Registry::instance()->CAP->current_user_can('ee_edit_registration', 'toggle_registration_status', $registration->ID())
 		) {
 			// change status to new value
-			if ( $registration->set_status( $this->new_reg_status( $registration->ID() ) ) && $save ) {
+			if ($registration->set_status($this->new_reg_status($registration->ID())) && $save) {
 				$registration->save();
 			}
 			return TRUE;
@@ -193,30 +193,30 @@ 
 	 * @return void
 	 * @throws \EE_Error
 	 */
-	public function toggle_incomplete_registration_status_to_default( EE_Registration $registration, $save = TRUE ) {
+	public function toggle_incomplete_registration_status_to_default(EE_Registration $registration, $save = TRUE) {
 		$existing_reg_status = $registration->status_ID();
 		// set initial REG_Status
-		$this->set_old_reg_status( $registration->ID(), $existing_reg_status );
+		$this->set_old_reg_status($registration->ID(), $existing_reg_status);
 		// is the registration currently incomplete ?
-		if ( $registration->status_ID() === EEM_Registration::status_id_incomplete ) {
+		if ($registration->status_ID() === EEM_Registration::status_id_incomplete) {
 			// grab default reg status for the event, if set
 			$event_default_registration_status = $registration->event()->default_registration_status();
 			// if no default reg status is set for the event, then use the global value
-			$STS_ID = ! empty( $event_default_registration_status )
+			$STS_ID = ! empty($event_default_registration_status)
 				? $event_default_registration_status
 				: EE_Registry::instance()->CFG->registration->default_STS_ID;
 			// if the event default reg status is approved, then downgrade temporarily to payment pending to ensure that payments are triggered
 			$STS_ID = $STS_ID === EEM_Registration::status_id_approved ? EEM_Registration::status_id_pending_payment : $STS_ID;
 			// set incoming REG_Status
-			$this->set_new_reg_status( $registration->ID(), $STS_ID );
-			$registration->set_status( $STS_ID );
-			if ( $save ) {
+			$this->set_new_reg_status($registration->ID(), $STS_ID);
+			$registration->set_status($STS_ID);
+			if ($save) {
 				$registration->save();
 			}
 			// don't trigger notifications during IPNs because they will get triggered by EE_Payment_Processor
-			if ( ! EE_Processor_Base::$IPN ) {
+			if ( ! EE_Processor_Base::$IPN) {
                 // otherwise, send out notifications
-				add_filter( 'FHEE__EED_Messages___maybe_registration__deliver_notifications', '__return_true', 10 );
+				add_filter('FHEE__EED_Messages___maybe_registration__deliver_notifications', '__return_true', 10);
 			}
 			// DEBUG LOG
 			//$this->log(
@@ -241,10 +241,10 @@ 
 	 * @return boolean
 	 * @throws \EE_Error
 	 */
-	public function toggle_registration_status_for_default_approved_events( EE_Registration $registration, $save = TRUE ) {
+	public function toggle_registration_status_for_default_approved_events(EE_Registration $registration, $save = TRUE) {
 		$reg_status = $registration->status_ID();
 		// set initial REG_Status
-		$this->set_old_reg_status( $registration->ID(), $reg_status );
+		$this->set_old_reg_status($registration->ID(), $reg_status);
 		// if not already, toggle reg status to approved IF the event default reg status is approved
 		// ( as long as the registration wasn't cancelled or declined at some point )
 		if (
@@ -254,16 +254,16 @@ 
 			$registration->event()->default_registration_status() === EEM_Registration::status_id_approved
 		) {
 			// set incoming REG_Status
-			$this->set_new_reg_status( $registration->ID(), EEM_Registration::status_id_approved );
+			$this->set_new_reg_status($registration->ID(), EEM_Registration::status_id_approved);
 			// toggle status to approved
-			$registration->set_status( EEM_Registration::status_id_approved );
-			if ( $save ) {
+			$registration->set_status(EEM_Registration::status_id_approved);
+			if ($save) {
 				$registration->save();
 			}
 			// don't trigger notifications during IPNs because they will get triggered by EE_Payment_Processor
-			if ( ! EE_Processor_Base::$IPN ) {
+			if ( ! EE_Processor_Base::$IPN) {
                 // otherwise, send out notifications
-				add_filter( 'FHEE__EED_Messages___maybe_registration__deliver_notifications', '__return_true', 10 );
+				add_filter('FHEE__EED_Messages___maybe_registration__deliver_notifications', '__return_true', 10);
 			}
 			// DEBUG LOG
 			//$this->log(
@@ -291,19 +291,19 @@ 
 	 * @return bool
 	 * @throws \EE_Error
 	 */
-	public function toggle_registration_status_if_no_monies_owing( EE_Registration $registration, $save = TRUE, $additional_details = array() ) {
+	public function toggle_registration_status_if_no_monies_owing(EE_Registration $registration, $save = TRUE, $additional_details = array()) {
 		// set initial REG_Status
-		$this->set_old_reg_status( $registration->ID(), $registration->status_ID() );
+		$this->set_old_reg_status($registration->ID(), $registration->status_ID());
 		//EEH_Debug_Tools::printr( $additional_details, '$additional_details', __FILE__, __LINE__ );
 		// was a payment just made ?
 		if (
-			isset( $additional_details[ 'payment_updates' ], $additional_details[ 'last_payment' ] ) &&
-			$additional_details[ 'payment_updates' ] &&
-			$additional_details[ 'last_payment' ] instanceof EE_Payment
+			isset($additional_details['payment_updates'], $additional_details['last_payment']) &&
+			$additional_details['payment_updates'] &&
+			$additional_details['last_payment'] instanceof EE_Payment
 		) {
-			$payment = $additional_details[ 'last_payment' ];
+			$payment = $additional_details['last_payment'];
 			$total_paid = 0;
-			foreach ( self::$_amount_paid as $reg => $amount_paid ) {
+			foreach (self::$_amount_paid as $reg => $amount_paid) {
 				$total_paid += $amount_paid;
 			}
 		} else {
@@ -327,30 +327,30 @@ 
 					$registration->transaction()->is_completed() ||
 					$registration->transaction()->is_overpaid() ||
 					$registration->transaction()->is_free() ||
-					apply_filters( 'FHEE__EE_Registration_Processor__toggle_registration_status_if_no_monies_owing', false, $registration )
+					apply_filters('FHEE__EE_Registration_Processor__toggle_registration_status_if_no_monies_owing', false, $registration)
 				) || (
 					$payment instanceof EE_Payment &&
 					$payment->is_approved() &&
 					// this specific registration has not yet been paid for
-					! isset( self::$_amount_paid[ $registration->ID() ] ) &&
+					! isset(self::$_amount_paid[$registration->ID()]) &&
 					// payment amount, less what we have already attributed to other registrations, is greater than this reg's final price
 					$payment->amount() - $total_paid >= $registration->final_price()
 				)
 			)
 		) {
 			// mark as paid
-			self::$_amount_paid[ $registration->ID() ] = $registration->final_price();
+			self::$_amount_paid[$registration->ID()] = $registration->final_price();
 			// track new REG_Status
-			$this->set_new_reg_status( $registration->ID(), EEM_Registration::status_id_approved );
+			$this->set_new_reg_status($registration->ID(), EEM_Registration::status_id_approved);
 			// toggle status to approved
-			$registration->set_status( EEM_Registration::status_id_approved );
-			if ( $save ) {
+			$registration->set_status(EEM_Registration::status_id_approved);
+			if ($save) {
 				$registration->save();
 			}
 			// don't trigger notifications during IPNs because they will get triggered by EE_Payment_Processor
-			if ( ! EE_Processor_Base::$IPN ) {
+			if ( ! EE_Processor_Base::$IPN) {
                 // otherwise, send out notifications
-				add_filter( 'FHEE__EED_Messages___maybe_registration__deliver_notifications', '__return_true', 10 );
+				add_filter('FHEE__EED_Messages___maybe_registration__deliver_notifications', '__return_true', 10);
 			}
 			// DEBUG LOG
 			//$this->log(
@@ -376,10 +376,10 @@ 
 	 * @param array 	$additional_details
 	 * @return void
 	 */
-	public function trigger_registration_update_notifications( $registration, $additional_details = array() ) {
+	public function trigger_registration_update_notifications($registration, $additional_details = array()) {
 		try {
-			if ( ! $registration instanceof EE_Registration ) {
-				throw new EE_Error( __( 'An invalid registration was received.', 'event_espresso' ) );
+			if ( ! $registration instanceof EE_Registration) {
+				throw new EE_Error(__('An invalid registration was received.', 'event_espresso'));
 			}
 			// EE_Registry::instance()->load_helper( 'Debug_Tools' );
 			// EEH_Debug_Tools::log(
@@ -398,8 +398,8 @@ 
 				$registration,
 				$additional_details
 			);
-		} catch( Exception $e ) {
-			EE_Error::add_error( $e->getMessage(), $e->getFile(), 'unknown_function_from_exception', $e->getLine() );
+		} catch (Exception $e) {
+			EE_Error::add_error($e->getMessage(), $e->getFile(), 'unknown_function_from_exception', $e->getLine());
 		}
 	}
 
@@ -413,22 +413,22 @@ 
 	 * @return bool
 	 * @throws \EE_Error
 	 */
-	public function update_registration_after_checkout_or_payment(  EE_Registration $registration, $additional_details = array() ) {
+	public function update_registration_after_checkout_or_payment(EE_Registration $registration, $additional_details = array()) {
 		// set initial REG_Status
-		$this->set_old_reg_status( $registration->ID(), $registration->status_ID() );
+		$this->set_old_reg_status($registration->ID(), $registration->status_ID());
 
 		// if the registration status gets updated, then save the registration
 		if (
-			$this->toggle_registration_status_for_default_approved_events( $registration, false )
-			|| $this->toggle_registration_status_if_no_monies_owing( $registration, false, $additional_details )
+			$this->toggle_registration_status_for_default_approved_events($registration, false)
+			|| $this->toggle_registration_status_if_no_monies_owing($registration, false, $additional_details)
 		) {
 			$registration->save();
 		}
 
 		// set new  REG_Status
-		$this->set_new_reg_status( $registration->ID(), $registration->status_ID() );
-		return $this->reg_status_updated( $registration->ID() )
-		       && $this->new_reg_status( $registration->ID() ) === EEM_Registration::status_id_approved
+		$this->set_new_reg_status($registration->ID(), $registration->status_ID());
+		return $this->reg_status_updated($registration->ID())
+		       && $this->new_reg_status($registration->ID()) === EEM_Registration::status_id_approved
 			? true
 			: false;
 	}
@@ -444,20 +444,20 @@ 
 	 * @return void
 	 * @throws \EE_Error
 	 */
-	public function update_registration_final_prices( $transaction, $save_regs = true ) {
-		$reg_final_price_per_ticket_line_item = EEH_Line_Item::calculate_reg_final_prices_per_line_item( $transaction->total_line_item() );
-		foreach( $transaction->registrations() as $registration ) {
+	public function update_registration_final_prices($transaction, $save_regs = true) {
+		$reg_final_price_per_ticket_line_item = EEH_Line_Item::calculate_reg_final_prices_per_line_item($transaction->total_line_item());
+		foreach ($transaction->registrations() as $registration) {
 			/** @var EE_Line_Item $line_item */
-			$line_item = EEM_Line_Item::instance()->get_line_item_for_registration( $registration );
-			if( isset( $reg_final_price_per_ticket_line_item[ $line_item->ID() ] ) ) {
-				$registration->set_final_price( $reg_final_price_per_ticket_line_item[ $line_item->ID() ] );
-				if( $save_regs ) {
+			$line_item = EEM_Line_Item::instance()->get_line_item_for_registration($registration);
+			if (isset($reg_final_price_per_ticket_line_item[$line_item->ID()])) {
+				$registration->set_final_price($reg_final_price_per_ticket_line_item[$line_item->ID()]);
+				if ($save_regs) {
 					$registration->save();
 				}
 			}
 		}
 		//and make sure there's no rounding problem
-		$this->fix_reg_final_price_rounding_issue( $transaction );
+		$this->fix_reg_final_price_rounding_issue($transaction);
 	}
 
 
@@ -477,7 +477,7 @@ 
 	 * @return boolean success verifying that there is NO difference after this method is done
 	 * @throws \EE_Error
 	 */
-	public function fix_reg_final_price_rounding_issue( $transaction ) {
+	public function fix_reg_final_price_rounding_issue($transaction) {
 		$reg_final_price_sum = EEM_Registration::instance()->sum(
 			array(
 				array(
@@ -486,9 +486,9 @@ 
 			),
 			'REG_final_price'
 		);
-		$diff =  $transaction->total() - (float) $reg_final_price_sum;
+		$diff = $transaction->total() - (float) $reg_final_price_sum;
 		//ok then, just grab one of the registrations
-		if( $diff !== 0 ) {
+		if ($diff !== 0) {
 			$a_reg = EEM_Registration::instance()->get_one(
 					array(
 						array(
@@ -497,7 +497,7 @@ 
 					));
 			$success = $a_reg instanceof EE_Registration
 				? $a_reg->save(
-					array( 'REG_final_price' => $a_reg->final_price() + $diff )
+					array('REG_final_price' => $a_reg->final_price() + $diff)
 				)
 				: false;
 			return $success ? true : false;
@@ -523,16 +523,16 @@ 
 		$update_reg = true
 	) {
 		// these reg statuses should not be considered in any calculations involving monies owing
-		$closed_reg_statuses = ! empty( $closed_reg_statuses )
+		$closed_reg_statuses = ! empty($closed_reg_statuses)
             ? $closed_reg_statuses
 			: EEM_Registration::closed_reg_statuses();
-		if ( ! in_array( $registration->status_ID(), $closed_reg_statuses, true ) ) {
+		if ( ! in_array($registration->status_ID(), $closed_reg_statuses, true)) {
 			return false;
 		}
         // release a reserved ticket by decrementing ticket and datetime reserved values
         $registration->release_reserved_ticket(true);
         $registration->set_final_price(0);
-		if ( $update_reg ) {
+		if ($update_reg) {
 			$registration->save();
 		}
 		return true;
@@ -555,23 +555,23 @@ 
 		$update_reg = true
 	) {
 		// these reg statuses should not be considered in any calculations involving monies owing
-		$closed_reg_statuses = ! empty( $closed_reg_statuses ) ? $closed_reg_statuses
+		$closed_reg_statuses = ! empty($closed_reg_statuses) ? $closed_reg_statuses
 			: EEM_Registration::closed_reg_statuses();
-		if ( in_array( $registration->status_ID(), $closed_reg_statuses ) ) {
+		if (in_array($registration->status_ID(), $closed_reg_statuses)) {
 			return false;
 		}
 		$ticket = $registration->ticket();
-		if ( ! $ticket instanceof EE_Ticket ) {
+		if ( ! $ticket instanceof EE_Ticket) {
 			throw new EE_Error(
 				sprintf(
-					__( 'The Ticket for Registration %1$d was not found or is invalid.',
-						'event_espresso' ),
+					__('The Ticket for Registration %1$d was not found or is invalid.',
+						'event_espresso'),
 					$registration->ticket_ID()
 				)
 			);
 		}
-		$registration->set_final_price( $ticket->price() );
-		if ( $update_reg ) {
+		$registration->set_final_price($ticket->price());
+		if ($update_reg) {
 			$registration->save();
 		}
 		return true;
@@ -609,7 +609,7 @@ 
 		$total_ticket_count = 1
 	) {
 		EE_Error::doing_it_wrong(
-			__CLASS__ . '::' . __FUNCTION__,
+			__CLASS__.'::'.__FUNCTION__,
 			sprintf(__('This method is deprecated. Please use "%s" instead', 'event_espresso'),
 				'\EventEspresso\core\domain\services\registration\CreateRegistrationService::create()'),
 			'4.9.1',
@@ -652,7 +652,7 @@ 
 	public function generate_reg_url_link($att_nmbr, $item)
 	{
 		EE_Error::doing_it_wrong(
-			__CLASS__ . '::' . __FUNCTION__,
+			__CLASS__.'::'.__FUNCTION__,
 			sprintf(__('This method is deprecated. Please use "%s" instead', 'event_espresso'),
 				'EventEspresso\core\domain\entities\RegUrlLink'),
 			'4.9.1',
@@ -672,11 +672,11 @@ 
 	 * @return string
 	 * @throws \EE_Error
 	 */
-	public function generate_reg_code( EE_Registration $registration ) {
+	public function generate_reg_code(EE_Registration $registration) {
 		EE_Error::doing_it_wrong(
-			__CLASS__ . '::' . __FUNCTION__,
+			__CLASS__.'::'.__FUNCTION__,
 			sprintf(
-				__( 'This method is deprecated. Please use "%s" instead', 'event_espresso' ),
+				__('This method is deprecated. Please use "%s" instead', 'event_espresso'),
 				'EventEspresso\core\domain\entities\RegCode'
 			),
 			'4.9.1',
@@ -685,7 +685,7 @@ 
 		return apply_filters(
 			'FHEE__EE_Registration_Processor___generate_reg_code__new_reg_code',
 			new RegCode(
-				RegUrlLink::fromRegistration( $registration ),
+				RegUrlLink::fromRegistration($registration),
 				$registration->transaction(),
 				$registration->ticket()
 			),

core/domain/entities/GenericAddress.php

Doc Comments +4 added lines, -2 removed lines

@@ -42,6 +42,8 @@ 
 	 * @param \EE_State | string   $state
 	 * @param string              $zip
 	 * @param \EE_Country | string $country
+	 * @param integer $state
+	 * @param string $country
 	 * @return GenericAddress
 	 */
 	public function __construct( $address, $address2, $city, $state, $zip, $country ) {
@@ -135,7 +137,7 @@ 
 
 
 	/**
-	 * @return \EE_State
+	 * @return string
 	 */
 	public function state_obj() {
 		return $this->_state_obj;
@@ -188,7 +190,7 @@ 
 
 
 	/**
-	 * @return \EE_Country
+	 * @return string
 	 */
 	public function country_obj() {
 		return $this->_country_obj;

Spacing +9 added lines, -9 removed lines

@@ -1,8 +1,8 @@ 
 <?php
 namespace EventEspresso\core\domain\entities;
 
-if ( ! defined( 'EVENT_ESPRESSO_VERSION' ) ) {
-	exit( 'No direct script access allowed' );
+if ( ! defined('EVENT_ESPRESSO_VERSION')) {
+	exit('No direct script access allowed');
 }
 
 
@@ -44,18 +44,18 @@ 
 	 * @param \EE_Country | string $country
 	 * @return GenericAddress
 	 */
-	public function __construct( $address, $address2, $city, $state, $zip, $country ) {
+	public function __construct($address, $address2, $city, $state, $zip, $country) {
 		$this->_address = $address;
 		$this->_address2 = $address2;
 		$this->_city = $city;
-		if ( $state instanceof \EE_State ) {
+		if ($state instanceof \EE_State) {
 			$this->_state_obj = $state;
 		} else {
 			$this->_state_ID = $state;
 			$this->_state_obj = $this->_get_state_obj();
 		}
 		$this->_zip = $zip;
-		if ( $country instanceof \EE_Country ) {
+		if ($country instanceof \EE_Country) {
 			$this->_country_obj = $country;
 		} else {
 			$this->_country_ID = $country;
@@ -98,7 +98,7 @@ 
 	private function _get_state_obj() {
 		return $this->_state_obj instanceof \EE_State
 			? $this->_state_obj
-			: \EE_Registry::instance()->load_model( 'State' )->get_one_by_ID( $this->_state_ID );
+			: \EE_Registry::instance()->load_model('State')->get_one_by_ID($this->_state_ID);
 	}
 
 
@@ -147,7 +147,7 @@ 
 	 * @return string
 	 */
 	public function state() {
-		if ( apply_filters( 'FHEE__EEI_Address__state__use_abbreviation', true, $this->state_obj() ) ) {
+		if (apply_filters('FHEE__EEI_Address__state__use_abbreviation', true, $this->state_obj())) {
 			return $this->state_obj()->abbrev();
 		} else {
 			return $this->state_name();
@@ -162,7 +162,7 @@ 
 	private function _get_country_obj() {
 		return $this->_country_obj instanceof \EE_Country
 			? $this->_country_obj
-			: \EE_Registry::instance()->load_model( 'Country' )->get_one_by_ID( $this->_country_ID );
+			: \EE_Registry::instance()->load_model('Country')->get_one_by_ID($this->_country_ID);
 	}
 
 
@@ -200,7 +200,7 @@ 
 	 * @return string
 	 */
 	public function country() {
-		if ( apply_filters( 'FHEE__EEI_Address__country__use_abbreviation', true, $this->country_obj() ) ) {
+		if (apply_filters('FHEE__EEI_Address__country__use_abbreviation', true, $this->country_obj())) {
 			return $this->country_ID();
 		} else {
 			return $this->country_name();