eventespresso / event-espresso-core

core/libraries/form_sections/payment_methods/EE_Billing_Info_Form.form.php

Spacing +10 added lines, -10 removed lines

@@ -1,4 +1,4 @@ 
-<?php if (!defined('EVENT_ESPRESSO_VERSION')) { exit('No direct script access allowed'); }
+<?php if ( ! defined('EVENT_ESPRESSO_VERSION')) { exit('No direct script access allowed'); }
 /**
  *
  * EE_Billing_Info_Form
@@ -11,7 +11,7 @@ 
  * @author				Mike Nelson
  *
  */
-class EE_Billing_Info_Form extends EE_Form_Section_Proper{
+class EE_Billing_Info_Form extends EE_Form_Section_Proper {
 
 	/**
 	 * The payment method this billing form is for
@@ -26,10 +26,10 @@ 
 	 * @param EE_Payment_Method $payment_method
 	 * @param array $options_array @see EE_Form_Section_Proper::__construct()
 	 */
-	public function __construct( EE_Payment_Method $payment_method, $options_array= array()){
+	public function __construct(EE_Payment_Method $payment_method, $options_array = array()) {
 		$this->_pm_instance = $payment_method;
 		$this->_layout_strategy = new EE_Div_Per_Section_Layout();
-		parent::__construct( $options_array );
+		parent::__construct($options_array);
 
 	}
 
@@ -40,7 +40,7 @@ 
 	 * @param EE_Payment_Method $payment_method
 	 * @return void
 	 */
-	public function set_payment_method( EE_Payment_Method $payment_method ){
+	public function set_payment_method(EE_Payment_Method $payment_method) {
 		$this->_pm_instance = $payment_method;
 	}
 
@@ -50,7 +50,7 @@ 
 	 * Returns the instance of the payment method this billing form is for
 	 * @return EE_Payment_Method
 	 */
-	public function payment_method(){
+	public function payment_method() {
 		return $this->_pm_instance;
 	}
 
@@ -60,10 +60,10 @@ 
 	 * payment_fields_autofilled_notice_html
 	 * @return string
 	 */
-	public function payment_fields_autofilled_notice_html(){
+	public function payment_fields_autofilled_notice_html() {
 		return  new EE_Form_Section_HTML(
 			EEH_HTML::p(
-				apply_filters( 'FHEE__EE_Billing_Info_Form__payment_fields_autofilled_notice_html_text', __( 'Payment fields have been autofilled because you are in debug mode', 'event_espresso' )),
+				apply_filters('FHEE__EE_Billing_Info_Form__payment_fields_autofilled_notice_html_text', __('Payment fields have been autofilled because you are in debug mode', 'event_espresso')),
 				'',
 				'important-notice'
 			)
@@ -75,8 +75,8 @@ 
 	/**
 	 * @return string
 	 */
-	public function html_class(){
-		return ! empty( $this->_html_class ) ? $this->_html_class . ' ee-billing-form' : 'ee-billing-form';
+	public function html_class() {
+		return ! empty($this->_html_class) ? $this->_html_class.' ee-billing-form' : 'ee-billing-form';
 	}
 
 

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

Spacing +25 added lines, -25 removed lines

@@ -6,7 +6,7 @@ 
  * @package Event Espresso
  * @subpackage messages
  */
-if (!defined('EVENT_ESPRESSO_VERSION') )
+if ( ! defined('EVENT_ESPRESSO_VERSION'))
 	exit('NO direct script access allowed');
 
 /**
@@ -20,7 +20,7 @@ 
  * @subpackage		messages
  * @author			Darren Ethier
  */
-class EE_Pdf_messenger extends EE_messenger  {
+class EE_Pdf_messenger extends EE_messenger {
 
 
 	/**
@@ -65,7 +65,7 @@ 
 	 * @see abstract declaration in EE_messenger for details.
 	 */
 	protected function _set_admin_pages() {
-		$this->admin_registered_pages = array( 'events_edit' => false );
+		$this->admin_registered_pages = array('events_edit' => false);
 	}
 
 
@@ -85,10 +85,10 @@ 
 	protected function _set_validator_config() {
 		$this->_validator_config = array(
 			'subject' => array(
-				'shortcodes' => array('recipient_details', 'organization', 'event', 'ticket', 'venue', 'primary_registration_details', 'event_author', 'email','event_meta', 'recipient_list', 'transaction', 'datetime_list', 'datetime')
+				'shortcodes' => array('recipient_details', 'organization', 'event', 'ticket', 'venue', 'primary_registration_details', 'event_author', 'email', 'event_meta', 'recipient_list', 'transaction', 'datetime_list', 'datetime')
 				),
 			'content' => array(
-				'shortcodes' => array( 'recipient_details', 'organization', 'event', 'ticket', 'venue', 'primary_registration_details', 'event_author', 'email','event_meta', 'recipient_list', 'transaction', 'datetime_list', 'datetime')
+				'shortcodes' => array('recipient_details', 'organization', 'event', 'ticket', 'venue', 'primary_registration_details', 'event_author', 'email', 'event_meta', 'recipient_list', 'transaction', 'datetime_list', 'datetime')
 				),
 			'attendee_list' => array(
 				'shortcodes' => array('attendee', 'event_list', 'ticket_list'),
@@ -99,7 +99,7 @@ 
 				'required' => array('[EVENT_LIST]')
 				),
 			'ticket_list' => array(
-				'shortcodes' => array('event_list', 'attendee_list', 'ticket', 'datetime_list','primary_registration_details', 'recipient_details'),
+				'shortcodes' => array('event_list', 'attendee_list', 'ticket', 'datetime_list', 'primary_registration_details', 'recipient_details'),
 				'required' => array('[TICKET_LIST]')
 				),
 			'datetime_list' => array(
@@ -119,7 +119,7 @@ 
 	 */
 	public  function enqueue_scripts_styles() {
 		parent::enqueue_scripts_styles();
-		do_action( 'AHEE__EE_Pdf_messenger__enqueue_scripts_styles');
+		do_action('AHEE__EE_Pdf_messenger__enqueue_scripts_styles');
 	}
 
 
@@ -245,18 +245,18 @@ 
 	 */
 	protected function _send_message() {
 		$this->_template_args = array(
-			'page_title' => html_entity_decode( stripslashes( $this->_subject ), ENT_QUOTES, "UTF-8"),
-			'base_css' => $this->get_variation( $this->_tmp_pack, $this->_incoming_message_type->name, TRUE, 'base', $this->_variation ),
-			'print_css' => $this->get_variation( $this->_tmp_pack, $this->_incoming_message_type->name, TRUE, 'print', $this->_variation ),
-			'main_css' => $this->get_variation( $this->_tmp_pack, $this->_incoming_message_type->name, TRUE, 'main', $this->_variation ),
-			'extra_css' => EE_LIBRARIES_URL . 'messages/defaults/default/variations/pdf_base_default.css',
-			'main_body' => apply_filters( 'FHEE__EE_Pdf_messenger___send_message__main_body', wpautop(stripslashes_deep( html_entity_decode($this->_content,  ENT_QUOTES,"UTF-8" ) )), $this->_content )
+			'page_title' => html_entity_decode(stripslashes($this->_subject), ENT_QUOTES, "UTF-8"),
+			'base_css' => $this->get_variation($this->_tmp_pack, $this->_incoming_message_type->name, TRUE, 'base', $this->_variation),
+			'print_css' => $this->get_variation($this->_tmp_pack, $this->_incoming_message_type->name, TRUE, 'print', $this->_variation),
+			'main_css' => $this->get_variation($this->_tmp_pack, $this->_incoming_message_type->name, TRUE, 'main', $this->_variation),
+			'extra_css' => EE_LIBRARIES_URL.'messages/defaults/default/variations/pdf_base_default.css',
+			'main_body' => apply_filters('FHEE__EE_Pdf_messenger___send_message__main_body', wpautop(stripslashes_deep(html_entity_decode($this->_content, ENT_QUOTES, "UTF-8"))), $this->_content)
 			);
 		$this->_deregister_wp_hooks();
-		add_action( 'wp_enqueue_scripts', array( $this, 'enqueue_scripts_styles' ) );
+		add_action('wp_enqueue_scripts', array($this, 'enqueue_scripts_styles'));
 		$content = $this->_get_main_template();
 //		die( $content );
-		$this->_do_pdf( $content );
+		$this->_do_pdf($content);
 		exit(0);
 	}
 
@@ -280,8 +280,8 @@ 
 
 		//just add back in wp_enqueue_scripts and wp_print_footer_scripts cause that's all we want to load.
 		add_action('wp_head', 'wp_enqueue_scripts');
-		add_action( 'wp_footer', 'wp_print_footer_scripts' );
-		add_action( 'wp_print_footer_scripts', '_wp_footer_scripts' );
+		add_action('wp_footer', 'wp_print_footer_scripts');
+		add_action('wp_print_footer_scripts', '_wp_footer_scripts');
 	}
 
 
@@ -294,11 +294,11 @@ 
 	 * @param bool $preview
 	 * @return string
 	 */
-	protected function _get_main_template( $preview = FALSE ) {
-		$wrapper_template = $this->_tmp_pack->get_wrapper( 'html', 'main' );
+	protected function _get_main_template($preview = FALSE) {
+		$wrapper_template = $this->_tmp_pack->get_wrapper('html', 'main');
 		//add message type to template_args
 		$this->_template_args['message_type'] = $this->_incoming_message_type;
-		return EEH_Template::display_template( $wrapper_template, $this->_template_args, TRUE );
+		return EEH_Template::display_template($wrapper_template, $this->_template_args, TRUE);
 	}
 
 
@@ -311,21 +311,21 @@ 
 	 *
 	 * @return void
 	 */
-	protected function _do_pdf( $content = '' ) {
-		$invoice_name = html_entity_decode( $this->_subject, ENT_QUOTES, "UTF-8");
+	protected function _do_pdf($content = '') {
+		$invoice_name = html_entity_decode($this->_subject, ENT_QUOTES, "UTF-8");
 
 		//only load dompdf if nobody else has yet...
-		if( ! defined('DOMPDF_DIR')){
+		if ( ! defined('DOMPDF_DIR')) {
 			define('DOMPDF_ENABLE_REMOTE', TRUE);
 			define('DOMPDF_ENABLE_JAVASCRIPT', FALSE);
 			define('DOMPDF_ENABLE_CSS_FLOAT', TRUE);
-			require_once(EE_THIRD_PARTY . 'dompdf/dompdf_config.inc.php');
+			require_once(EE_THIRD_PARTY.'dompdf/dompdf_config.inc.php');
 		}
 		$dompdf = new DOMPDF();
 		$dompdf->load_html($content);
 		$dompdf->render();
 		//forcing the browser to open a download dialog.
-		$dompdf->stream($invoice_name . ".pdf", array( 'Attachment' => TRUE ));
+		$dompdf->stream($invoice_name.".pdf", array('Attachment' => TRUE));
 	}
 
 

Braces +2 added lines, -1 removed lines

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

core/libraries/template_parts/EE_Template_Part_Manager.class.php

Spacing +25 added lines, -25 removed lines

@@ -1,7 +1,7 @@ 
 <?php
 //namespace EventEspresso\core\libraries\templates;
-if ( ! defined( 'EVENT_ESPRESSO_VERSION' ) ) {
-	exit( 'No direct script access allowed' );
+if ( ! defined('EVENT_ESPRESSO_VERSION')) {
+	exit('No direct script access allowed');
 }
 
 
@@ -70,23 +70,23 @@ 
 	 * @param string $template - name or path of template to be used by EEH_Template::locate_template()
 	 * @param int $priority    - order in which template parts should be applied
 	 */
-	public function add_template_part( $name, $label, $template, $priority ) {
+	public function add_template_part($name, $label, $template, $priority) {
 		// SplPriorityQueue doesn't play nice with multiple items having the same priority
 		// so if the incoming priority is already occupied, then let's increment it by one,
 		// and then pass everything back into this method and try again with the new priority
-		if ( isset( $this->priorities[ $priority ] ) ) {
+		if (isset($this->priorities[$priority])) {
 			$priority++;
-			$this->add_template_part( $name, $label, $template, $priority );
+			$this->add_template_part($name, $label, $template, $priority);
 			return;
 		}
 		// kk now we can mark this priority as being occupied
-		$this->priorities[ $priority ] = true;
+		$this->priorities[$priority] = true;
 		// create the template part and add to the queue
 		$this->template_parts->insert(
-			new EE_Template_Part( $name, $label, $template, $priority ),
+			new EE_Template_Part($name, $label, $template, $priority),
 			$priority
 		);
-		if ( $name == 'event' ) {
+		if ($name == 'event') {
 			$this->event_desc_priority = $priority;
 		}
 	}
@@ -103,10 +103,10 @@ 
 	 * @param string $content
 	 * @return string
 	 */
-	public function apply_template_part_filters( $content = '' ) {
+	public function apply_template_part_filters($content = '') {
 		$this->template_parts->rewind();
 		// loop through template parts and position content
-		while ( $this->template_parts->valid() ) {
+		while ($this->template_parts->valid()) {
 			$this->_position_template_part(
 				$content,
 				$this->template_parts->current()->template(),
@@ -115,7 +115,7 @@ 
 			$this->template_parts->next();
 		}
 		// now simply add our three strings of content together
-		return $this->before_event_content . $this->event_content . $this->after_event_content;
+		return $this->before_event_content.$this->event_content.$this->after_event_content;
 	}
 
 
@@ -136,16 +136,16 @@ 
 	 * @param int $priority
 	 * @return string
 	 */
-	protected function _position_template_part( $content, $template, $priority ) {
+	protected function _position_template_part($content, $template, $priority) {
 		// Event Description content is the actual incoming content itself
-		if ( $priority === $this->event_desc_priority ) {
+		if ($priority === $this->event_desc_priority) {
 			$this->event_content = $content;
-		} else if ( $priority < $this->event_desc_priority ) {
+		} else if ($priority < $this->event_desc_priority) {
 			// everything BEFORE the Event Description
-			$this->before_event_content .= EEH_Template::locate_template( $template );
-		} else if ( $priority > $this->event_desc_priority ) {
+			$this->before_event_content .= EEH_Template::locate_template($template);
+		} else if ($priority > $this->event_desc_priority) {
 			// everything AFTER the Event Description
-			$this->after_event_content .= EEH_Template::locate_template( $template );
+			$this->after_event_content .= EEH_Template::locate_template($template);
 		}
 	}
 
@@ -170,15 +170,15 @@ 
 		$list_item_css_class = '',
 		$list_item_css_id_prefix = ''
 	) {
-		$event_archive_display_order = EEH_HTML::ul( $list_css_id, $list_css_class );
+		$event_archive_display_order = EEH_HTML::ul($list_css_id, $list_css_class);
 		$this->template_parts->rewind();
 		// loop through template parts and add template content
-		while ( $this->template_parts->valid() ) {
+		while ($this->template_parts->valid()) {
 			$event_archive_display_order .= EEH_HTML::li(
-				EEH_HTML::span( '', '', 'dashicons dashicons-arrow-up-alt2' ) .
-				EEH_HTML::span( '', '', 'dashicons dashicons-arrow-down-alt2' ) .
+				EEH_HTML::span('', '', 'dashicons dashicons-arrow-up-alt2').
+				EEH_HTML::span('', '', 'dashicons dashicons-arrow-down-alt2').
 				$this->template_parts->current()->label(),
-				$list_item_css_id_prefix . $this->template_parts->current()->name(),
+				$list_item_css_id_prefix.$this->template_parts->current()->name(),
 				$list_item_css_class
 			);
 			$this->template_parts->next();
@@ -198,10 +198,10 @@ 
 	 * @return string
 	 */
 	public function display_template_parts() {
-		if ( WP_DEBUG ) {
+		if (WP_DEBUG) {
 			$this->template_parts->rewind();
-			while ( $this->template_parts->valid() ) {
-				EEH_Debug_Tools::printr( $this->template_parts->current(), 'template_part', __FILE__, __LINE__ );
+			while ($this->template_parts->valid()) {
+				EEH_Debug_Tools::printr($this->template_parts->current(), 'template_part', __FILE__, __LINE__);
 				$this->template_parts->next();
 			}
 		}

core/helpers/EEH_Address.helper.php

Spacing +18 added lines, -18 removed lines

@@ -1,7 +1,7 @@ 
 <?php
 
-if ( ! defined( 'EVENT_ESPRESSO_VERSION' ) ) {
-	exit( 'No direct script access allowed' );
+if ( ! defined('EVENT_ESPRESSO_VERSION')) {
+	exit('No direct script access allowed');
 }
 
 
@@ -35,24 +35,24 @@ 
 		$add_wrapper = true
 	) {
 		// check that incoming object implements the EEI_Address interface
-		if ( ! $obj_with_address instanceof EEI_Address ) {
-			$msg = __( 'The address could not be formatted.', 'event_espresso' );
+		if ( ! $obj_with_address instanceof EEI_Address) {
+			$msg = __('The address could not be formatted.', 'event_espresso');
 			$dev_msg = __(
 				'The Address Formatter requires passed objects to implement the EEI_Address interface.',
 				'event_espresso'
 			);
-			EE_Error::add_error( $msg . '||' . $dev_msg, __FILE__, __FUNCTION__, __LINE__ );
+			EE_Error::add_error($msg.'||'.$dev_msg, __FILE__, __FUNCTION__, __LINE__);
 			return null;
 		}
 		// obtain an address formatter
-		$formatter = EEH_Address::_get_formatter( $type );
+		$formatter = EEH_Address::_get_formatter($type);
 		// apply schema.org formatting ?
 		$use_schema = ! is_admin() ? $use_schema : false;
 		$formatted_address = $use_schema
-			? EEH_Address::_schema_formatting( $formatter, $obj_with_address )
-			: EEH_Address::_regular_formatting( $formatter, $obj_with_address, $add_wrapper );
+			? EEH_Address::_schema_formatting($formatter, $obj_with_address)
+			: EEH_Address::_regular_formatting($formatter, $obj_with_address, $add_wrapper);
 		$formatted_address = $add_wrapper && ! $use_schema
-			? '<div class="espresso-address-dv">' . $formatted_address . '</div>'
+			? '<div class="espresso-address-dv">'.$formatted_address.'</div>'
 			: $formatted_address;
 		// return the formatted address
 		return $formatted_address;
@@ -67,8 +67,8 @@ 
 	 * @param string $type how the address is formatted. for example: 'multiline' or 'inline'
 	 * @return EEI_Address_Formatter
 	 */
-	private static function _get_formatter( $type ) {
-		switch ( $type ) {
+	private static function _get_formatter($type) {
+		switch ($type) {
 			case 'multiline' :
 				return new EventEspresso\core\services\address\formatters\MultiLineAddressFormatter();
 			case 'inline' :
@@ -121,15 +121,15 @@ 
 	 * @param object EEI_Address $obj_with_address
 	 * @return string
 	 */
-	private static function _schema_formatting( EEI_Address_Formatter $formatter, EEI_Address $obj_with_address ) {
+	private static function _schema_formatting(EEI_Address_Formatter $formatter, EEI_Address $obj_with_address) {
 		$formatted_address = '<div itemprop="address" itemscope itemtype="http://schema.org/PostalAddress">';
 		$formatted_address .= $formatter->format(
-			EEH_Schema::streetAddress( $obj_with_address ),
-			EEH_Schema::postOfficeBoxNumber( $obj_with_address ),
-			EEH_Schema::addressLocality( $obj_with_address ),
-			EEH_Schema::addressRegion( $obj_with_address ),
-			EEH_Schema::postalCode( $obj_with_address ),
-			EEH_Schema::addressCountry( $obj_with_address ),
+			EEH_Schema::streetAddress($obj_with_address),
+			EEH_Schema::postOfficeBoxNumber($obj_with_address),
+			EEH_Schema::addressLocality($obj_with_address),
+			EEH_Schema::addressRegion($obj_with_address),
+			EEH_Schema::postalCode($obj_with_address),
+			EEH_Schema::addressCountry($obj_with_address),
 			$obj_with_address->country_ID()
 		);
 		$formatted_address .= '</div>';

core/db_classes/EE_CPT_Base.class.php

Spacing +56 added lines, -56 removed lines

@@ -1,5 +1,5 @@ 
-<?php if ( !defined( 'EVENT_ESPRESSO_VERSION' ) ) {
-	exit( 'No direct script access allowed' );
+<?php if ( ! defined('EVENT_ESPRESSO_VERSION')) {
+	exit('No direct script access allowed');
 }
 /**
  * Event Espresso
@@ -47,8 +47,8 @@ 
 	 * @param int    $parent_term_taxonomy_id optional
 	 * @return EE_Term_Taxonomy
 	 */
-	function add_event_category( $category_name, $category_description = NULL, $parent_term_taxonomy_id = NULL ) {
-		return $this->get_model()->add_event_category( $this, $category_name, $category_description, $parent_term_taxonomy_id );
+	function add_event_category($category_name, $category_description = NULL, $parent_term_taxonomy_id = NULL) {
+		return $this->get_model()->add_event_category($this, $category_name, $category_description, $parent_term_taxonomy_id);
 	}
 
 
@@ -58,8 +58,8 @@ 
 	 * @param string $category_name
 	 * @return bool
 	 */
-	function remove_event_category( $category_name ) {
-		return $this->get_model()->remove_event_category( $this, $category_name );
+	function remove_event_category($category_name) {
+		return $this->get_model()->remove_event_category($this, $category_name);
 	}
 
 
@@ -70,14 +70,14 @@ 
 	 * @param EE_Term_Taxonomy $term_taxonomy
 	 * @return EE_Base_Class the relation was removed from
 	 */
-	function remove_relation_to_term_taxonomy( $term_taxonomy ) {
-		if ( !$term_taxonomy ) {
-			EE_Error::add_error( sprintf( __( "No Term_Taxonomy provided which to remove from model object of type %s and id %d", "event_espresso" ), get_class( $this ), $this->ID() ), __FILE__, __FUNCTION__, __LINE__ );
+	function remove_relation_to_term_taxonomy($term_taxonomy) {
+		if ( ! $term_taxonomy) {
+			EE_Error::add_error(sprintf(__("No Term_Taxonomy provided which to remove from model object of type %s and id %d", "event_espresso"), get_class($this), $this->ID()), __FILE__, __FUNCTION__, __LINE__);
 			return NULL;
 		}
-		$term_taxonomy->set_count( $term_taxonomy->count() - 1 );
+		$term_taxonomy->set_count($term_taxonomy->count() - 1);
 		$term_taxonomy->save();
-		return $this->_remove_relation_to( $term_taxonomy, 'Term_Taxonomy' );
+		return $this->_remove_relation_to($term_taxonomy, 'Term_Taxonomy');
 	}
 
 
@@ -101,7 +101,7 @@ 
 	 * @return int
 	 */
 	public function parent() {
-		return $this->get( 'parent' );
+		return $this->get('parent');
 	}
 
 
@@ -111,7 +111,7 @@ 
 	 * @return string
 	 */
 	public function status() {
-		return $this->get( 'status' );
+		return $this->get('status');
 	}
 
 
@@ -119,8 +119,8 @@ 
 	/**
 	 * @param string $status
 	 */
-	public function set_status( $status ) {
-		$this->set( 'status', $status );
+	public function set_status($status) {
+		$this->set('status', $status);
 	}
 
 
@@ -134,12 +134,12 @@ 
 	 * @param string|array $attr Optional. Query string or array of attributes.
 	 * @return string HTML image element
 	 */
-	protected function _get_feature_image( $size, $attr ) {
+	protected function _get_feature_image($size, $attr) {
 		//first let's see if we already have the _feature_image property set AND if it has a cached element on it FOR the given size
-		$attr_key = is_array( $attr ) ? implode( '_', $attr ) : $attr;
-		$cache_key = is_array( $size ) ? implode( '_', $size ) . $attr_key : $size . $attr_key;
-		$this->_feature_image[ $cache_key ] = isset( $this->_feature_image[ $cache_key ] ) ? $this->_feature_image[ $cache_key ] : $this->get_model()->get_feature_image( $this->ID(), $size, $attr );
-		return $this->_feature_image[ $cache_key ];
+		$attr_key = is_array($attr) ? implode('_', $attr) : $attr;
+		$cache_key = is_array($size) ? implode('_', $size).$attr_key : $size.$attr_key;
+		$this->_feature_image[$cache_key] = isset($this->_feature_image[$cache_key]) ? $this->_feature_image[$cache_key] : $this->get_model()->get_feature_image($this->ID(), $size, $attr);
+		return $this->_feature_image[$cache_key];
 	}
 
 
@@ -150,8 +150,8 @@ 
 	 * @param string|array $attr
 	 * @return string of html
 	 */
-	public function feature_image( $size = 'thumbnail', $attr = '' ) {
-		return $this->_get_feature_image( $size, $attr );
+	public function feature_image($size = 'thumbnail', $attr = '') {
+		return $this->_get_feature_image($size, $attr);
 	}
 
 
@@ -161,9 +161,9 @@ 
 	 * @param  string|array $size can either be a string: 'thumbnail', 'medium', 'large', 'full' OR 2-item array representing width and height in pixels eg. array(32,32).
 	 * @return string|boolean          the url of the image or false if not found
 	 */
-	public function feature_image_url( $size = 'thumbnail' ) {
-		$attachment = wp_get_attachment_image_src( get_post_thumbnail_id( $this->ID() ), $size );
-		return !empty( $attachment ) ? $attachment[ 0 ] : FALSE;
+	public function feature_image_url($size = 'thumbnail') {
+		$attachment = wp_get_attachment_image_src(get_post_thumbnail_id($this->ID()), $size);
+		return ! empty($attachment) ? $attachment[0] : FALSE;
 	}
 
 
@@ -185,36 +185,36 @@ 
 	 *                                 This array is INDEXED by RELATED OBJ NAME (so it corresponds with the obj_names sent);
 	 * @return void
 	 */
-	public function restore_revision( $revision_id, $related_obj_names = array(), $where_query = array() ) {
+	public function restore_revision($revision_id, $related_obj_names = array(), $where_query = array()) {
 		//get revision object
-		$revision_obj = $this->get_model()->get_one_by_ID( $revision_id );
-		if ( $revision_obj instanceof EE_CPT_Base ) {
+		$revision_obj = $this->get_model()->get_one_by_ID($revision_id);
+		if ($revision_obj instanceof EE_CPT_Base) {
 			//no related_obj_name so we assume we're saving a revision on this object.
-			if ( empty( $related_obj_names ) ) {
+			if (empty($related_obj_names)) {
 				$fields = $this->get_model()->get_meta_table_fields();
-				foreach ( $fields as $field ) {
-					$this->set( $field, $revision_obj->get( $field ) );
+				foreach ($fields as $field) {
+					$this->set($field, $revision_obj->get($field));
 				}
 				$this->save();
 			}
-			$related_obj_names = (array)$related_obj_names;
-			foreach ( $related_obj_names as $related_name ) {
+			$related_obj_names = (array) $related_obj_names;
+			foreach ($related_obj_names as $related_name) {
 				//related_obj_name so we're saving a revision on an object related to this object
 				//do we have $where_query params for this related object?  If we do then we include that.
-				$cols_n_values = isset( $where_query[ $related_name ] ) ? $where_query[ $related_name ] : array();
-				$where_params = !empty( $cols_n_values ) ? array( $cols_n_values ) : array();
-				$related_objs = $this->get_many_related( $related_name, $where_params );
-				$revision_related_objs = $revision_obj->get_many_related( $related_name, $where_params );
+				$cols_n_values = isset($where_query[$related_name]) ? $where_query[$related_name] : array();
+				$where_params = ! empty($cols_n_values) ? array($cols_n_values) : array();
+				$related_objs = $this->get_many_related($related_name, $where_params);
+				$revision_related_objs = $revision_obj->get_many_related($related_name, $where_params);
 				//load helper
 				//remove related objs from this object that are not in revision
 				//array_diff *should* work cause I think objects are indexed by ID?
-				$related_to_remove = EEH_Array::object_array_diff( $related_objs, $revision_related_objs );
-				foreach ( $related_to_remove as $rr ) {
-					$this->_remove_relation_to( $rr, $related_name, $cols_n_values );
+				$related_to_remove = EEH_Array::object_array_diff($related_objs, $revision_related_objs);
+				foreach ($related_to_remove as $rr) {
+					$this->_remove_relation_to($rr, $related_name, $cols_n_values);
 				}
 				//add all related objs attached to revision to this object
-				foreach ( $revision_related_objs as $r_obj ) {
-					$this->_add_relation_to( $r_obj, $related_name, $cols_n_values );
+				foreach ($revision_related_objs as $r_obj) {
+					$this->_add_relation_to($r_obj, $related_name, $cols_n_values);
 				}
 			}
 		}
@@ -230,8 +230,8 @@ 
 	 * <li>If $single is set to false, or left blank, the function returns an array containing all values of the specified key.</li>
 	 * <li>If $single is set to true, the function returns the first value of the specified key (not in an array</li></ul>
 	 */
-	public function get_post_meta( $meta_key = NULL, $single = FALSE ) {
-		return get_post_meta( $this->ID(), $meta_key, $single );
+	public function get_post_meta($meta_key = NULL, $single = FALSE) {
+		return get_post_meta($this->ID(), $meta_key, $single);
 	}
 
 
@@ -243,11 +243,11 @@ 
 	 * @param mixed  $prev_value
 	 * @return mixed Returns meta_id if the meta doesn't exist, otherwise returns true on success and false on failure. NOTE: If the meta_value passed to this function is the same as the value that is already in the database, this function returns false.
 	 */
-	public function update_post_meta( $meta_key, $meta_value, $prev_value = NULL ) {
-		if ( ! $this->ID() ) {
+	public function update_post_meta($meta_key, $meta_value, $prev_value = NULL) {
+		if ( ! $this->ID()) {
 			$this->save();
 		}
-		return update_post_meta( $this->ID(), $meta_key, $meta_value, $prev_value );
+		return update_post_meta($this->ID(), $meta_key, $meta_value, $prev_value);
 	}
 
 
@@ -259,11 +259,11 @@ 
 	 * @param bool  $unique . If postmeta for this $meta_key already exists, whether to add an additional item or not
 	 * @return boolean Boolean true, except if the $unique argument was set to true and a custom field with the given key already exists, in which case false is returned.
 	 */
-	public function add_post_meta( $meta_key, $meta_value, $unique = FALSE ) {
-		if ( $this->ID() ) {
+	public function add_post_meta($meta_key, $meta_value, $unique = FALSE) {
+		if ($this->ID()) {
 			$this->save();
 		}
-		return add_post_meta( $this->ID(), $meta_key, $meta_value, $unique );
+		return add_post_meta($this->ID(), $meta_key, $meta_value, $unique);
 	}
 
 
@@ -275,13 +275,13 @@ 
 	 * @param mixed $meta_value
 	 * @return boolean False for failure. True for success.
 	 */
-	public function delete_post_meta( $meta_key, $meta_value = '' ) {
-		if ( ! $this->ID() ) {
+	public function delete_post_meta($meta_key, $meta_value = '') {
+		if ( ! $this->ID()) {
 			//there are obviously no postmetas for this if it's not saved
 			//so let's just report this as a success
 			return true;
 		}
-		return delete_post_meta( $this->ID(), $meta_key, $meta_value );
+		return delete_post_meta($this->ID(), $meta_key, $meta_value);
 	}
 
 
@@ -291,7 +291,7 @@ 
 	 * @return string
 	 */
 	public function get_permalink() {
-		return get_permalink( $this->ID() );
+		return get_permalink($this->ID());
 	}
 
 
@@ -301,8 +301,8 @@ 
 	 * @param array $query_params
 	 * @return EE_Term_Taxonomy
 	 */
-	public function term_taxonomies( $query_params = array() ) {
-		return $this->get_many_related( 'Term_Taxonomy', $query_params );
+	public function term_taxonomies($query_params = array()) {
+		return $this->get_many_related('Term_Taxonomy', $query_params);
 	}
 
 

Doc Comments +7 added lines, -7 removed lines

@@ -130,7 +130,7 @@ 
 	 *
 	 * @link   http://codex.wordpress.org/Function_Reference/get_the_post_thumbnail
 	 * @access protected
-	 * @param string|array $size (optional) Image size. Defaults to 'post-thumbnail' but can also be a 2-item array representing width and height in pixels (i.e. array(32,32) ).
+	 * @param string $size (optional) Image size. Defaults to 'post-thumbnail' but can also be a 2-item array representing width and height in pixels (i.e. array(32,32) ).
 	 * @param string|array $attr Optional. Query string or array of attributes.
 	 * @return string HTML image element
 	 */
@@ -172,7 +172,7 @@ 
 	 * This is a method for restoring this_obj using details from the given $revision_id
 	 *
 	 * @param int $revision_id 		ID of the revision we're getting data from
-	 * @param array $related_obj_names if included this will be used to restore for related obj
+	 * @param string[] $related_obj_names if included this will be used to restore for related obj
 	 *                                 if not included then we just do restore on the meta.
 	 *                                 We will accept an array of related_obj_names for restoration here.
 	 * @param array $where_query       You can optionally include an array of key=>value pairs
@@ -226,7 +226,7 @@ 
 	 * Wrapper for get_post_meta, http://codex.wordpress.org/Function_Reference/get_post_meta
 	 * @param string  $meta_key
 	 * @param boolean $single
-	 * @return mixed <ul><li>If only $id is set it will return all meta values in an associative array.</li>
+	 * @return string|null <ul><li>If only $id is set it will return all meta values in an associative array.</li>
 	 * <li>If $single is set to false, or left blank, the function returns an array containing all values of the specified key.</li>
 	 * <li>If $single is set to true, the function returns the first value of the specified key (not in an array</li></ul>
 	 */
@@ -254,8 +254,8 @@ 
 
 	/**
 	 * Wrapper for add_post_meta, http://codex.wordpress.org/Function_Reference/add_post_meta
-	 * @param mixed $meta_key
-	 * @param mixed $meta_value
+	 * @param string $meta_key
+	 * @param string $meta_value
 	 * @param bool  $unique . If postmeta for this $meta_key already exists, whether to add an additional item or not
 	 * @return boolean Boolean true, except if the $unique argument was set to true and a custom field with the given key already exists, in which case false is returned.
 	 */
@@ -271,7 +271,7 @@ 
 	/**
 	 * Wrapper for delete_post_meta, http://codex.wordpress.org/Function_Reference/delete_post_meta
 	 *
-	 * @param mixed $meta_key
+	 * @param string $meta_key
 	 * @param mixed $meta_value
 	 * @return boolean False for failure. True for success.
 	 */
@@ -299,7 +299,7 @@ 
 	/**
 	 * Gets all the term-taxonomies for this CPT
 	 * @param array $query_params
-	 * @return EE_Term_Taxonomy
+	 * @return EE_Base_Class[]
 	 */
 	public function term_taxonomies( $query_params = array() ) {
 		return $this->get_many_related( 'Term_Taxonomy', $query_params );

core/CPTs/EE_CPT_Venue_Strategy.core.php

Spacing +10 added lines, -10 removed lines

@@ -39,15 +39,15 @@ 
 	 * @param 	array 	$arguments
 	 * @return \EE_CPT_Venue_Strategy
 	 */
-	public function __construct( $arguments = array() ) {
-		$this->CPT = isset( $arguments['CPT'] ) ? $arguments['CPT'] : NULL;
-		$WP_Query = isset( $arguments['WP_Query'] ) ? $arguments['WP_Query'] : NULL;
-		if ( $WP_Query instanceof WP_Query && ! $WP_Query->is_tag ) {
-			$WP_Query->is_espresso_venue_single = is_singular() && isset( $WP_Query->query->post_type ) && $WP_Query->query->post_type == 'espresso_venues' ? TRUE : FALSE;
+	public function __construct($arguments = array()) {
+		$this->CPT = isset($arguments['CPT']) ? $arguments['CPT'] : NULL;
+		$WP_Query = isset($arguments['WP_Query']) ? $arguments['WP_Query'] : NULL;
+		if ($WP_Query instanceof WP_Query && ! $WP_Query->is_tag) {
+			$WP_Query->is_espresso_venue_single = is_singular() && isset($WP_Query->query->post_type) && $WP_Query->query->post_type == 'espresso_venues' ? TRUE : FALSE;
 			$WP_Query->is_espresso_venue_archive = is_post_type_archive('espresso_venues') ? TRUE : FALSE;
-			$WP_Query->is_espresso_venue_taxonomy = is_tax( 'espresso_venue_categories' ) ? TRUE : FALSE;
+			$WP_Query->is_espresso_venue_taxonomy = is_tax('espresso_venue_categories') ? TRUE : FALSE;
 		}
-		add_filter( 'the_posts', array( $this, 'the_posts' ), 1, 2 );
+		add_filter('the_posts', array($this, 'the_posts'), 1, 2);
 	}
 
 
@@ -60,12 +60,12 @@ 
 	 * @param WP_Query $wp_query
 	 * @return    void
 	 */
-	public function the_posts( $posts, WP_Query $wp_query) {
+	public function the_posts($posts, WP_Query $wp_query) {
 		// automagically load the EEH_Venue_View helper so that it's functions are available
-		if ( isset( EE_Registry::instance()->CFG->map_settings->use_google_maps ) && EE_Registry::instance()->CFG->map_settings->use_google_maps ) {
+		if (isset(EE_Registry::instance()->CFG->map_settings->use_google_maps) && EE_Registry::instance()->CFG->map_settings->use_google_maps) {
 			EEH_Maps::espresso_google_map_js();
 		}
-		remove_filter( 'the_posts', array( $this, 'the_posts' ), 1, 2 );
+		remove_filter('the_posts', array($this, 'the_posts'), 1, 2);
 		return $posts;
 	}
 

Braces +3 added lines, -1 removed lines

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

core/services/address/formatters/NullAddressFormatter.php

Spacing +3 added lines, -3 removed lines

@@ -1,8 +1,8 @@ 
 <?php
 namespace EventEspresso\core\services\address\formatters;
 
-if ( ! defined( 'EVENT_ESPRESSO_VERSION' ) ) {
-	exit( 'No direct script access allowed' );
+if ( ! defined('EVENT_ESPRESSO_VERSION')) {
+	exit('No direct script access allowed');
 }
 
 
@@ -28,7 +28,7 @@ 
 	 * @param string $CNT_ISO
 	 * @return string
 	 */
-	public function format( $address, $address2, $city, $state, $zip, $country, $CNT_ISO ) {
+	public function format($address, $address2, $city, $state, $zip, $country, $CNT_ISO) {
 		return null;
 	}
 

core/services/address/formatters/AddressFormatter.php

Spacing +5 added lines, -5 removed lines

@@ -1,8 +1,8 @@ 
 <?php
 namespace EventEspresso\core\services\address\formatters;
 
-if ( ! defined( 'EVENT_ESPRESSO_VERSION' ) ) {
-	exit( 'No direct script access allowed' );
+if ( ! defined('EVENT_ESPRESSO_VERSION')) {
+	exit('No direct script access allowed');
 }
 
 
@@ -41,14 +41,14 @@ 
 		// swap address part placeholders for the real text
 		$formatted_address = str_replace(
 		// find
-			array( '{address}', '{address2}', '{city}', '{state}', '{zip}', '{country}' ),
+			array('{address}', '{address2}', '{city}', '{state}', '{zip}', '{country}'),
 			// replace
-			array( $address, $address2, $city, $state, $zip, $country ),
+			array($address, $address2, $city, $state, $zip, $country),
 			// string
 			$formatted_address
 		);
 		// remove placeholder from start and end, reduce repeating placeholders to singles, then replace with HTML line breaks
-		return preg_replace( '/%+/', $sub, trim( $formatted_address, '%' ) );
+		return preg_replace('/%+/', $sub, trim($formatted_address, '%'));
 	}
 
 

core/services/address/formatters/MultiLineAddressFormatter.php

Spacing +4 added lines, -4 removed lines

@@ -1,8 +1,8 @@ 
 <?php
 namespace EventEspresso\core\services\address\formatters;
 
-if ( ! defined( 'EVENT_ESPRESSO_VERSION' ) ) {
-	exit( 'No direct script access allowed' );
+if ( ! defined('EVENT_ESPRESSO_VERSION')) {
+	exit('No direct script access allowed');
 }
 
 
@@ -29,7 +29,7 @@ 
 	 * @param string $CNT_ISO
 	 * @return string
 	 */
-	public function format( $address, $address2, $city, $state, $zip, $country, $CNT_ISO ) {
+	public function format($address, $address2, $city, $state, $zip, $country, $CNT_ISO) {
 		$address_formats = apply_filters(
 			'FHEE__EE_MultiLine_Address_Formatter__address_formats',
 			array(
@@ -40,7 +40,7 @@ 
 			)
 		);
 		// if the incoming country has a set format, use that, else use the default
-		$formatted_address = isset( $address_formats[ $CNT_ISO ] ) ? $address_formats[ $CNT_ISO ]
+		$formatted_address = isset($address_formats[$CNT_ISO]) ? $address_formats[$CNT_ISO]
 			: $address_formats['ZZ'];
 		return $this->parse_formatted_address(
 			$address,