eventespresso / event-espresso-core

core/db_classes/EE_Registration_Payment.class.php

Doc Comments +3 added lines, -3 removed lines

@@ -40,7 +40,7 @@ 
 	/**
 	 * registration_ID
 	 * @access 	public
-	 * @return 	int
+	 * @return 	boolean
 	 */
 	public function registration_ID() {
 		return $this->get( 'REG_ID' );
@@ -51,7 +51,7 @@ 
 	/**
 	 * payment_ID
 	 * @access 	public
-	 * @return    int
+	 * @return    boolean
 	 */
 	public function payment_ID() {
 		return $this->get( 'PAY_ID' );
@@ -62,7 +62,7 @@ 
 	/**
 	 * amount
 	 * @access 	public
-	 * @return 	float
+	 * @return 	boolean
 	 */
 	public function amount() {
 		return $this->get( 'RPY_amount' );

Spacing +12 added lines, -12 removed lines

@@ -19,9 +19,9 @@ 
 	 * @param string $timezone
 	 * @return EE_Registration_Payment
 	 */
-	public static function new_instance( $props_n_values = array(), $timezone = '' ) {
-		$has_object = parent::_check_for_object( $props_n_values, __CLASS__ );
-		return $has_object ? $has_object : new self( $props_n_values, false, $timezone );
+	public static function new_instance($props_n_values = array(), $timezone = '') {
+		$has_object = parent::_check_for_object($props_n_values, __CLASS__);
+		return $has_object ? $has_object : new self($props_n_values, false, $timezone);
 	}
 
 
@@ -31,8 +31,8 @@ 
 	 * @param string $timezone
 	 * @return EE_Registration_Payment
 	 */
-	public static function new_instance_from_db( $props_n_values = array(), $timezone = '' ) {
-		return new self( $props_n_values, true, $timezone );
+	public static function new_instance_from_db($props_n_values = array(), $timezone = '') {
+		return new self($props_n_values, true, $timezone);
 	}
 
 
@@ -43,7 +43,7 @@ 
 	 * @return 	int
 	 */
 	public function registration_ID() {
-		return $this->get( 'REG_ID' );
+		return $this->get('REG_ID');
 	}
 
 
@@ -54,7 +54,7 @@ 
 	 * @return    int
 	 */
 	public function payment_ID() {
-		return $this->get( 'PAY_ID' );
+		return $this->get('PAY_ID');
 	}
 
 
@@ -65,7 +65,7 @@ 
 	 * @return 	float
 	 */
 	public function amount() {
-		return $this->get( 'RPY_amount' );
+		return $this->get('RPY_amount');
 	}
 
 
@@ -75,8 +75,8 @@ 
 	 * @access    public
 	 * @param float $amount
 	 */
-	public function set_amount( $amount = 0.000 ) {
-		$this->set( 'RPY_amount', $amount );
+	public function set_amount($amount = 0.000) {
+		$this->set('RPY_amount', $amount);
 	}
 
 
@@ -87,7 +87,7 @@ 
 	 * @return \EE_Registration
 	 */
 	public function registration() {
-		return $this->get_first_related( 'Registration' );
+		return $this->get_first_related('Registration');
 	}
 
 
@@ -98,7 +98,7 @@ 
 	 * @return \EE_Payment
 	 */
 	public function payment() {
-		return $this->get_first_related( 'Payment' );
+		return $this->get_first_related('Payment');
 	}
 
 

core/db_classes/EE_State.class.php

Doc Comments +3 added lines, -3 removed lines

@@ -50,7 +50,7 @@ 
 
 
 	/**
-	 * @return string
+	 * @return boolean
 	 */
 	public function country_iso() {
 		return $this->get( 'CNT_ISO' );
@@ -59,7 +59,7 @@ 
 
 
 	/**
-	 * @return string
+	 * @return boolean
 	 */
 	public function abbrev() {
 		return $this->get( 'STA_abbrev' );
@@ -77,7 +77,7 @@ 
 
 
 	/**
-	 * @return string
+	 * @return boolean
 	 */
 	public function name() {
 		return $this->get( 'STA_name' );

Spacing +20 added lines, -20 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
@@ -32,9 +32,9 @@ 
 	 * @param array $props_n_values
 	 * @return EE_State|mixed
 	 */
-	public static function new_instance( $props_n_values = array() ) {
-		$has_object = parent::_check_for_object( $props_n_values, __CLASS__ );
-		return $has_object ? $has_object : new self( $props_n_values );
+	public static function new_instance($props_n_values = array()) {
+		$has_object = parent::_check_for_object($props_n_values, __CLASS__);
+		return $has_object ? $has_object : new self($props_n_values);
 	}
 
 
@@ -43,8 +43,8 @@ 
 	 * @param array $props_n_values
 	 * @return EE_State
 	 */
-	public static function new_instance_from_db( $props_n_values = array() ) {
-		return new self( $props_n_values, TRUE );
+	public static function new_instance_from_db($props_n_values = array()) {
+		return new self($props_n_values, TRUE);
 	}
 
 
@@ -53,7 +53,7 @@ 
 	 * @return string
 	 */
 	public function country_iso() {
-		return $this->get( 'CNT_ISO' );
+		return $this->get('CNT_ISO');
 	}
 
 
@@ -62,7 +62,7 @@ 
 	 * @return string
 	 */
 	public function abbrev() {
-		return $this->get( 'STA_abbrev' );
+		return $this->get('STA_abbrev');
 	}
 
 
@@ -71,7 +71,7 @@ 
 	 * @return bool
 	 */
 	public function active() {
-		return $this->get( 'STA_active' );
+		return $this->get('STA_active');
 	}
 
 
@@ -80,7 +80,7 @@ 
 	 * @return string
 	 */
 	public function name() {
-		return $this->get( 'STA_name' );
+		return $this->get('STA_name');
 	}
 
 
@@ -89,7 +89,7 @@ 
 	 * @return EE_Country
 	 */
 	public function country() {
-		return $this->get_first_related( 'Country' );
+		return $this->get_first_related('Country');
 	}
 
 
@@ -97,8 +97,8 @@ 
 	/**
 	 * @param $iso
 	 */
-	public function set_country_iso( $iso ) {
-		$this->set( 'CNT_ISO', $iso );
+	public function set_country_iso($iso) {
+		$this->set('CNT_ISO', $iso);
 	}
 
 
@@ -106,8 +106,8 @@ 
 	/**
 	 * @param $abbrev
 	 */
-	public function set_abbrev( $abbrev ) {
-		$this->set( 'STA_abbrev', $abbrev );
+	public function set_abbrev($abbrev) {
+		$this->set('STA_abbrev', $abbrev);
 	}
 
 
@@ -115,8 +115,8 @@ 
 	/**
 	 * @param $active
 	 */
-	public function set_active( $active ) {
-		$this->set( 'STA_active', $active );
+	public function set_active($active) {
+		$this->set('STA_active', $active);
 	}
 
 
@@ -124,8 +124,8 @@ 
 	/**
 	 * @param $name
 	 */
-	public function set_name( $name ) {
-		$this->set( 'STA_name', $name );
+	public function set_name($name) {
+		$this->set('STA_name', $name);
 	}
 }
 

core/db_classes/EE_Status.class.php

Doc Comments +7 added lines, -7 removed lines

@@ -66,7 +66,7 @@ 
 	/**
 	 * Sets code
 	 * @param string $code
-	 * @return boolean
+	 * @return boolean|null
 	 */
 	function set_code( $code ) {
 		$this->set( 'STS_code', $code );
@@ -76,7 +76,7 @@ 
 
 	/**
 	 * Gets desc
-	 * @return string
+	 * @return boolean
 	 */
 	function desc() {
 		return $this->get( 'STS_desc' );
@@ -87,7 +87,7 @@ 
 	/**
 	 * Sets desc
 	 * @param string $desc
-	 * @return boolean
+	 * @return boolean|null
 	 */
 	function set_desc( $desc ) {
 		$this->set( 'STS_desc', $desc );
@@ -97,7 +97,7 @@ 
 
 	/**
 	 * Gets type
-	 * @return string
+	 * @return boolean
 	 */
 	function type() {
 		return $this->get( 'STS_type' );
@@ -108,7 +108,7 @@ 
 	/**
 	 * Sets type
 	 * @param string $type
-	 * @return boolean
+	 * @return boolean|null
 	 */
 	function set_type( $type ) {
 		$this->set( 'STS_type', $type );
@@ -129,7 +129,7 @@ 
 	/**
 	 * Sets can_edit
 	 * @param boolean $can_edit
-	 * @return boolean
+	 * @return boolean|null
 	 */
 	function set_can_edit( $can_edit ) {
 		$this->set( 'STS_can_edit', $can_edit );
@@ -150,7 +150,7 @@ 
 	/**
 	 * Sets open
 	 * @param boolean $open
-	 * @return boolean
+	 * @return boolean|null
 	 */
 	function set_open( $open ) {
 		$this->set( 'STS_open', $open );

Spacing +25 added lines, -25 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
@@ -32,9 +32,9 @@ 
 	 * @param array $props_n_values
 	 * @return EE_Status
 	 */
-	public static function new_instance( $props_n_values = array() ) {
-		$has_object = parent::_check_for_object( $props_n_values, __CLASS__ );
-		return $has_object ? $has_object : new self( $props_n_values );
+	public static function new_instance($props_n_values = array()) {
+		$has_object = parent::_check_for_object($props_n_values, __CLASS__);
+		return $has_object ? $has_object : new self($props_n_values);
 	}
 
 
@@ -43,8 +43,8 @@ 
 	 * @param array $props_n_values
 	 * @return EE_Status
 	 */
-	public static function new_instance_from_db( $props_n_values = array() ) {
-		return new self( $props_n_values, TRUE );
+	public static function new_instance_from_db($props_n_values = array()) {
+		return new self($props_n_values, TRUE);
 	}
 
 
@@ -55,10 +55,10 @@ 
 	 * @param string $schema
 	 * @return string
 	 */
-	function code( $plural = FALSE, $schema = 'upper' ) {
-		$id = $this->get( 'STS_ID' );
-		$code = EEM_Status::instance()->localized_status( array( $id => $this->get( 'STS_code' ) ), $plural, $schema );
-		return $code[ $id ];
+	function code($plural = FALSE, $schema = 'upper') {
+		$id = $this->get('STS_ID');
+		$code = EEM_Status::instance()->localized_status(array($id => $this->get('STS_code')), $plural, $schema);
+		return $code[$id];
 	}
 
 
@@ -68,8 +68,8 @@ 
 	 * @param string $code
 	 * @return boolean
 	 */
-	function set_code( $code ) {
-		$this->set( 'STS_code', $code );
+	function set_code($code) {
+		$this->set('STS_code', $code);
 	}
 
 
@@ -79,7 +79,7 @@ 
 	 * @return string
 	 */
 	function desc() {
-		return $this->get( 'STS_desc' );
+		return $this->get('STS_desc');
 	}
 
 
@@ -89,8 +89,8 @@ 
 	 * @param string $desc
 	 * @return boolean
 	 */
-	function set_desc( $desc ) {
-		$this->set( 'STS_desc', $desc );
+	function set_desc($desc) {
+		$this->set('STS_desc', $desc);
 	}
 
 
@@ -100,7 +100,7 @@ 
 	 * @return string
 	 */
 	function type() {
-		return $this->get( 'STS_type' );
+		return $this->get('STS_type');
 	}
 
 
@@ -110,8 +110,8 @@ 
 	 * @param string $type
 	 * @return boolean
 	 */
-	function set_type( $type ) {
-		$this->set( 'STS_type', $type );
+	function set_type($type) {
+		$this->set('STS_type', $type);
 	}
 
 
@@ -121,7 +121,7 @@ 
 	 * @return boolean
 	 */
 	function can_edit() {
-		return $this->get( 'STS_can_edit' );
+		return $this->get('STS_can_edit');
 	}
 
 
@@ -131,8 +131,8 @@ 
 	 * @param boolean $can_edit
 	 * @return boolean
 	 */
-	function set_can_edit( $can_edit ) {
-		$this->set( 'STS_can_edit', $can_edit );
+	function set_can_edit($can_edit) {
+		$this->set('STS_can_edit', $can_edit);
 	}
 
 
@@ -142,7 +142,7 @@ 
 	 * @return boolean
 	 */
 	function open() {
-		return $this->get( 'STS_open' );
+		return $this->get('STS_open');
 	}
 
 
@@ -152,8 +152,8 @@ 
 	 * @param boolean $open
 	 * @return boolean
 	 */
-	function set_open( $open ) {
-		$this->set( 'STS_open', $open );
+	function set_open($open) {
+		$this->set('STS_open', $open);
 	}
 }
 

core/db_classes/EE_Term.class.php

Doc Comments +4 added lines, -4 removed lines

@@ -66,7 +66,7 @@ 
 
 	/**
 	 * Gets name
-	 * @return string
+	 * @return boolean
 	 */
 	function name() {
 		return $this->get( 'name' );
@@ -77,7 +77,7 @@ 
 	/**
 	 * Sets name
 	 * @param string $name
-	 * @return boolean
+	 * @return boolean|null
 	 */
 	function set_name( $name ) {
 		$this->set( 'name', $name );
@@ -87,7 +87,7 @@ 
 
 	/**
 	 * Gets slug
-	 * @return string
+	 * @return boolean
 	 */
 	function slug() {
 		return $this->get( 'slug' );
@@ -98,7 +98,7 @@ 
 	/**
 	 * Sets slug
 	 * @param string $slug
-	 * @return boolean
+	 * @return boolean|null
 	 */
 	function set_slug( $slug ) {
 		$this->set( 'slug', $slug );

Spacing +17 added lines, -17 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
@@ -34,11 +34,11 @@ 
 	 * @param bool $bydb
 	 * @param string $timezone
 	 */
-	protected function __construct( $fieldValues = array(), $bydb = FALSE, $timezone = '' ) {
-		if ( ! isset( $fieldValues[ 'slug' ] ) ) {
-			$fieldValues[ 'slug' ] = $fieldValues[ 'name' ];
+	protected function __construct($fieldValues = array(), $bydb = FALSE, $timezone = '') {
+		if ( ! isset($fieldValues['slug'])) {
+			$fieldValues['slug'] = $fieldValues['name'];
 		}
-		parent::__construct( $fieldValues, $bydb, $timezone );
+		parent::__construct($fieldValues, $bydb, $timezone);
 	}
 
 
@@ -47,9 +47,9 @@ 
 	 * @param array $props_n_values
 	 * @return EE_Term|mixed
 	 */
-	public static function new_instance( $props_n_values = array() ) {
-		$has_object = parent::_check_for_object( $props_n_values, __CLASS__ );
-		return $has_object ? $has_object : new self( $props_n_values );
+	public static function new_instance($props_n_values = array()) {
+		$has_object = parent::_check_for_object($props_n_values, __CLASS__);
+		return $has_object ? $has_object : new self($props_n_values);
 	}
 
 
@@ -58,8 +58,8 @@ 
 	 * @param array $props_n_values
 	 * @return EE_Term
 	 */
-	public static function new_instance_from_db( $props_n_values = array() ) {
-		return new self( $props_n_values, TRUE );
+	public static function new_instance_from_db($props_n_values = array()) {
+		return new self($props_n_values, TRUE);
 	}
 
 
@@ -69,7 +69,7 @@ 
 	 * @return string
 	 */
 	function name() {
-		return $this->get( 'name' );
+		return $this->get('name');
 	}
 
 
@@ -79,8 +79,8 @@ 
 	 * @param string $name
 	 * @return boolean
 	 */
-	function set_name( $name ) {
-		$this->set( 'name', $name );
+	function set_name($name) {
+		$this->set('name', $name);
 	}
 
 
@@ -90,7 +90,7 @@ 
 	 * @return string
 	 */
 	function slug() {
-		return $this->get( 'slug' );
+		return $this->get('slug');
 	}
 
 
@@ -100,8 +100,8 @@ 
 	 * @param string $slug
 	 * @return boolean
 	 */
-	function set_slug( $slug ) {
-		$this->set( 'slug', $slug );
+	function set_slug($slug) {
+		$this->set('slug', $slug);
 	}
 }
 

core/db_classes/EE_Term_Taxonomy.class.php

Doc Comments +4 added lines, -4 removed lines

@@ -51,7 +51,7 @@ 
 
 	/**
 	 * Gets taxonomy
-	 * @return string
+	 * @return boolean
 	 */
 	function taxonomy() {
 		return $this->get( 'taxonomy' );
@@ -62,7 +62,7 @@ 
 	/**
 	 * Sets taxonomy
 	 * @param string $taxonomy
-	 * @return boolean
+	 * @return boolean|null
 	 */
 	function set_taxonomy( $taxonomy ) {
 		$this->set( 'taxonomy', $taxonomy );
@@ -72,7 +72,7 @@ 
 
 	/**
 	 * Gets term_count
-	 * @return int
+	 * @return boolean
 	 */
 	function count() {
 		return $this->get( 'term_count' );
@@ -83,7 +83,7 @@ 
 	/**
 	 * Sets term_count
 	 * @param int $term_count
-	 * @return boolean
+	 * @return boolean|null
 	 */
 	function set_count( $term_count ) {
 		$this->set( 'term_count', $term_count );

Spacing +14 added lines, -14 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
@@ -32,9 +32,9 @@ 
 	 * @param array $props_n_values
 	 * @return EE_Term_Taxonomy
 	 */
-	public static function new_instance( $props_n_values = array() ) {
-		$has_object = parent::_check_for_object( $props_n_values, __CLASS__ );
-		return $has_object ? $has_object : new self( $props_n_values );
+	public static function new_instance($props_n_values = array()) {
+		$has_object = parent::_check_for_object($props_n_values, __CLASS__);
+		return $has_object ? $has_object : new self($props_n_values);
 	}
 
 
@@ -43,8 +43,8 @@ 
 	 * @param array $props_n_values
 	 * @return EE_Term_Taxonomy
 	 */
-	public static function new_instance_from_db( $props_n_values = array() ) {
-		return new self( $props_n_values, TRUE );
+	public static function new_instance_from_db($props_n_values = array()) {
+		return new self($props_n_values, TRUE);
 	}
 
 
@@ -54,7 +54,7 @@ 
 	 * @return string
 	 */
 	function taxonomy() {
-		return $this->get( 'taxonomy' );
+		return $this->get('taxonomy');
 	}
 
 
@@ -64,8 +64,8 @@ 
 	 * @param string $taxonomy
 	 * @return boolean
 	 */
-	function set_taxonomy( $taxonomy ) {
-		$this->set( 'taxonomy', $taxonomy );
+	function set_taxonomy($taxonomy) {
+		$this->set('taxonomy', $taxonomy);
 	}
 
 
@@ -75,7 +75,7 @@ 
 	 * @return int
 	 */
 	function count() {
-		return $this->get( 'term_count' );
+		return $this->get('term_count');
 	}
 
 
@@ -85,8 +85,8 @@ 
 	 * @param int $term_count
 	 * @return boolean
 	 */
-	function set_count( $term_count ) {
-		$this->set( 'term_count', $term_count );
+	function set_count($term_count) {
+		$this->set('term_count', $term_count);
 	}
 
 
@@ -96,7 +96,7 @@ 
 	 * @return EE_Term
 	 */
 	function term() {
-		return $this->get_first_related( 'Term' );
+		return $this->get_first_related('Term');
 	}
 
 

core/db_classes/EE_Transaction.class.php

Doc Comments +7 added lines, -7 removed lines

@@ -49,7 +49,7 @@ 
 	 * @param array $props_n_values  incoming values from the database
 	 * @param string $timezone  incoming timezone as set by the model.  If not set the timezone for
 	 *                          		the website will be used.
-	 * @return EE_Attendee
+	 * @return EE_Transaction
 	 */
 	public static function new_instance_from_db( $props_n_values = array(), $timezone = null ) {
 		return new self( $props_n_values, TRUE, $timezone );
@@ -212,7 +212,7 @@ 
 	/**
 	 *        get Transaction Total
 	 * @access        public
-	 * @return float
+	 * @return boolean
 	 */
 	public function total() {
 		return $this->get( 'TXN_total' );
@@ -223,7 +223,7 @@ 
 	/**
 	 *        get Total Amount Paid to Date
 	 * @access        public
-	 * @return float
+	 * @return boolean
 	 */
 	public function paid() {
 		return $this->get( 'TXN_paid' );
@@ -326,7 +326,7 @@ 
 	/**
 	 * Gets all the attendees for this transaction (handy for use with EE_Attendee's get_registrations_for_event function
 	 * for getting attendees and how many registrations they each have for an event)
-	 * @return mixed EE_Attendee[] by default, int if $output is set to 'COUNT'
+	 * @return EE_Base_Class[] EE_Attendee[] by default, int if $output is set to 'COUNT'
 	 */
 	public function attendees() {
 		return $this->get_many_related( 'Attendee', array( array( 'Registration.Transaction.TXN_ID' => $this->ID() ) ) );
@@ -571,7 +571,7 @@ 
 	/**
 	 * Gets all the extra meta info on this payment
 	 * @param array $query_params like EEM_Base::get_all
-	 * @return EE_Extra_Meta
+	 * @return EE_Base_Class[]
 	 */
 	public function extra_meta( $query_params = array() ) {
 		return $this->get_many_related( 'Extra_Meta', $query_params );
@@ -713,7 +713,7 @@ 
 
 	/**
 	 * Gets PMD_ID
-	 * @return int
+	 * @return boolean
 	 */
 	function payment_method_ID() {
 		return $this->get('PMD_ID');
@@ -724,7 +724,7 @@ 
 	/**
 	 * Sets PMD_ID
 	 * @param int $PMD_ID
-	 * @return boolean
+	 * @return boolean|null
 	 */
 	function set_payment_method_ID($PMD_ID) {
 		$this->set('PMD_ID', $PMD_ID);

Braces +2 added lines, -2 removed lines

@@ -742,11 +742,11 @@
 		$pm = $this->get_first_related('Payment_Method');
 		if( $pm instanceof EE_Payment_Method ){
 			return $pm;
-		}else{
+		} else{
 			$last_payment = $this->last_payment();
 			if( $last_payment instanceof EE_Payment && $last_payment->payment_method() ){
 				return $last_payment->payment_method();
-			}else{
+			} else{
 				return NULL;
 			}
 		}

Spacing +111 added lines, -111 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
@@ -26,7 +26,7 @@ 
  * @subpackage 	includes/classes/EE_Transaction.class.php
  * @author 				Brent Christensen
  */
-class EE_Transaction extends EE_Base_Class implements EEI_Transaction{
+class EE_Transaction extends EE_Base_Class implements EEI_Transaction {
 
 
 	/**
@@ -38,9 +38,9 @@ 
 	 *                             		    date_format and the second value is the time format
 	 * @return EE_Transaction
 	 */
-	public static function new_instance( $props_n_values = array(), $timezone = null, $date_formats = array() ) {
-		$has_object = parent::_check_for_object( $props_n_values, __CLASS__ );
-		return $has_object ? $has_object : new self( $props_n_values, false, $timezone, $date_formats );
+	public static function new_instance($props_n_values = array(), $timezone = null, $date_formats = array()) {
+		$has_object = parent::_check_for_object($props_n_values, __CLASS__);
+		return $has_object ? $has_object : new self($props_n_values, false, $timezone, $date_formats);
 	}
 
 
@@ -51,8 +51,8 @@ 
 	 *                          		the website will be used.
 	 * @return EE_Attendee
 	 */
-	public static function new_instance_from_db( $props_n_values = array(), $timezone = null ) {
-		return new self( $props_n_values, TRUE, $timezone );
+	public static function new_instance_from_db($props_n_values = array(), $timezone = null) {
+		return new self($props_n_values, TRUE, $timezone);
 	}
 
 
@@ -67,9 +67,9 @@ 
 	 * @return 	void
 	 */
 	public function lock() {
-		$locked_transactions = get_option( 'ee_locked_transactions', array() );
-		$locked_transactions[ $this->ID() ] = true;
-		update_option( 'ee_locked_transactions', $locked_transactions );
+		$locked_transactions = get_option('ee_locked_transactions', array());
+		$locked_transactions[$this->ID()] = true;
+		update_option('ee_locked_transactions', $locked_transactions);
 	}
 
 
@@ -83,9 +83,9 @@ 
 	 * @return 	void
 	 */
 	public function unlock() {
-		$locked_transactions = get_option( 'ee_locked_transactions', array() );
-		unset( $locked_transactions[ $this->ID() ] );
-		update_option( 'ee_locked_transactions', $locked_transactions );
+		$locked_transactions = get_option('ee_locked_transactions', array());
+		unset($locked_transactions[$this->ID()]);
+		update_option('ee_locked_transactions', $locked_transactions);
 	}
 
 	/**
@@ -102,8 +102,8 @@ 
 	 * @return boolean
 	 */
 	public function is_locked() {
-		$locked_transactions = get_option( 'ee_locked_transactions', array() );
-		return isset( $locked_transactions[ $this->ID() ] ) ? true : false;
+		$locked_transactions = get_option('ee_locked_transactions', array());
+		return isset($locked_transactions[$this->ID()]) ? true : false;
 	}
 
 
@@ -114,8 +114,8 @@ 
 	 * @access        public
 	 * @param        float $total total value of transaction
 	 */
-	public function set_total( $total = 0.00 ) {
-		$this->set( 'TXN_total', $total );
+	public function set_total($total = 0.00) {
+		$this->set('TXN_total', $total);
 	}
 
 
@@ -126,8 +126,8 @@ 
 	 * @access        public
 	 * @param        float $total_paid total amount paid to date (sum of all payments)
 	 */
-	public function set_paid( $total_paid = 0.00 ) {
-		$this->set( 'TXN_paid', $total_paid );
+	public function set_paid($total_paid = 0.00) {
+		$this->set('TXN_paid', $total_paid);
 	}
 
 
@@ -138,8 +138,8 @@ 
 	 * @access        public
 	 * @param        string $status whether the transaction is open, declined, accepted, or any number of custom values that can be set
 	 */
-	public function set_status( $status = '' ) {
-		$this->set( 'STS_ID', $status );
+	public function set_status($status = '') {
+		$this->set('STS_ID', $status);
 	}
 
 
@@ -150,8 +150,8 @@ 
 	 * @access        public
 	 * @param        string $hash_salt required for some payment gateways
 	 */
-	public function set_hash_salt( $hash_salt = '' ) {
-		$this->set( 'TXN_hash_salt', $hash_salt );
+	public function set_hash_salt($hash_salt = '') {
+		$this->set('TXN_hash_salt', $hash_salt);
 	}
 
 
@@ -160,8 +160,8 @@ 
 	 * Sets TXN_reg_steps array
 	 * @param array $txn_reg_steps
 	 */
-	function set_reg_steps( $txn_reg_steps ) {
-		$this->set( 'TXN_reg_steps', $txn_reg_steps );
+	function set_reg_steps($txn_reg_steps) {
+		$this->set('TXN_reg_steps', $txn_reg_steps);
 	}
 
 
@@ -171,8 +171,8 @@ 
 	 * @return array
 	 */
 	function reg_steps() {
-		$TXN_reg_steps = $this->get( 'TXN_reg_steps' );
-		return is_array( $TXN_reg_steps ) ? $TXN_reg_steps : array();
+		$TXN_reg_steps = $this->get('TXN_reg_steps');
+		return is_array($TXN_reg_steps) ? $TXN_reg_steps : array();
 	}
 
 
@@ -182,7 +182,7 @@ 
 	 * @return string of transaction's total cost, with currency symbol and decimal
 	 */
 	public function pretty_total() {
-		return $this->get_pretty( 'TXN_total' );
+		return $this->get_pretty('TXN_total');
 	}
 
 
@@ -192,7 +192,7 @@ 
 	 * @return string
 	 */
 	public function pretty_paid() {
-		return $this->get_pretty( 'TXN_paid' );
+		return $this->get_pretty('TXN_paid');
 	}
 
 
@@ -204,7 +204,7 @@ 
 	 * @return float amount remaining
 	 */
 	public function remaining() {
-		return (float)( $this->total() - $this->paid() );
+		return (float) ($this->total() - $this->paid());
 	}
 
 
@@ -215,7 +215,7 @@ 
 	 * @return float
 	 */
 	public function total() {
-		return $this->get( 'TXN_total' );
+		return $this->get('TXN_total');
 	}
 
 
@@ -226,7 +226,7 @@ 
 	 * @return float
 	 */
 	public function paid() {
-		return $this->get( 'TXN_paid' );
+		return $this->get('TXN_paid');
 	}
 
 
@@ -236,8 +236,8 @@ 
 	 * @access        public
 	 */
 	public function get_cart_session() {
-		$session_data = $this->get( 'TXN_session_data' );
-		return isset( $session_data[ 'cart' ] ) && $session_data[ 'cart' ] instanceof EE_Cart ? $session_data[ 'cart' ] : NULL;
+		$session_data = $this->get('TXN_session_data');
+		return isset($session_data['cart']) && $session_data['cart'] instanceof EE_Cart ? $session_data['cart'] : NULL;
 	}
 
 
@@ -247,9 +247,9 @@ 
 	 * @access        public
 	 */
 	public function session_data() {
-		$session_data = $this->get( 'TXN_session_data' );
-		if ( empty( $session_data ) ) {
-			$session_data = array( 'id' => NULL, 'user_id' => NULL, 'ip_address' => NULL, 'user_agent' => NULL, 'init_access' => NULL, 'last_access' => NULL, 'pages_visited' => array() );
+		$session_data = $this->get('TXN_session_data');
+		if (empty($session_data)) {
+			$session_data = array('id' => NULL, 'user_id' => NULL, 'ip_address' => NULL, 'user_agent' => NULL, 'init_access' => NULL, 'last_access' => NULL, 'pages_visited' => array());
 		}
 		return $session_data;
 	}
@@ -262,11 +262,11 @@ 
 	 * @access        public
 	 * @param        EE_Session|array $session_data
 	 */
-	public function set_txn_session_data( $session_data ) {
-		if ( $session_data instanceof EE_Session ) {
-			$this->set( 'TXN_session_data', $session_data->get_session_data( NULL, TRUE ));
+	public function set_txn_session_data($session_data) {
+		if ($session_data instanceof EE_Session) {
+			$this->set('TXN_session_data', $session_data->get_session_data(NULL, TRUE));
 		} else {
-			$this->set( 'TXN_session_data', $session_data );
+			$this->set('TXN_session_data', $session_data);
 		}
 	}
 
@@ -277,7 +277,7 @@ 
 	 * @access        public
 	 */
 	public function hash_salt_() {
-		return $this->get( 'TXN_hash_salt' );
+		return $this->get('TXN_hash_salt');
 	}
 
 
@@ -297,13 +297,13 @@ 
 	 * @param 	boolean 	$gmt - whether to return a unix timestamp with UTC offset applied (default) or no UTC offset applied
 	 * @return 	string | int
 	 */
-	public function datetime( $format = FALSE, $gmt = FALSE ) {
-		if ( $format ) {
-			return $this->get_pretty( 'TXN_timestamp' );
-		} else if ( $gmt ) {
-			return $this->get_raw( 'TXN_timestamp' );
+	public function datetime($format = FALSE, $gmt = FALSE) {
+		if ($format) {
+			return $this->get_pretty('TXN_timestamp');
+		} else if ($gmt) {
+			return $this->get_raw('TXN_timestamp');
 		} else {
-			return $this->get( 'TXN_timestamp' );
+			return $this->get('TXN_timestamp');
 		}
 	}
 
@@ -315,10 +315,10 @@ 
 	 * @param        boolean $get_cached   TRUE to retrieve cached registrations or FALSE to pull from the db
 	 * @return EE_Registration[]
 	 */
-	public function registrations( $query_params = array(), $get_cached = FALSE ) {
-		$query_params = ( empty( $query_params ) || ! is_array( $query_params ) ) ? array( 'order_by' => array( 'Event.EVT_name' => 'ASC', 'Attendee.ATT_lname' => 'ASC', 'Attendee.ATT_fname' => 'ASC' ) ) : $query_params;
+	public function registrations($query_params = array(), $get_cached = FALSE) {
+		$query_params = (empty($query_params) || ! is_array($query_params)) ? array('order_by' => array('Event.EVT_name' => 'ASC', 'Attendee.ATT_lname' => 'ASC', 'Attendee.ATT_fname' => 'ASC')) : $query_params;
 		$query_params = $get_cached ? array() : $query_params;
-		return $this->get_many_related( 'Registration', $query_params );
+		return $this->get_many_related('Registration', $query_params);
 	}
 
 
@@ -329,7 +329,7 @@ 
 	 * @return mixed EE_Attendee[] by default, int if $output is set to 'COUNT'
 	 */
 	public function attendees() {
-		return $this->get_many_related( 'Attendee', array( array( 'Registration.Transaction.TXN_ID' => $this->ID() ) ) );
+		return $this->get_many_related('Attendee', array(array('Registration.Transaction.TXN_ID' => $this->ID())));
 	}
 
 
@@ -339,8 +339,8 @@ 
 	 * @param array $query_params like EEM_Base::get_all
 	 * @return EE_Payment[]
 	 */
-	public function payments( $query_params = array() ) {
-		return $this->get_many_related( 'Payment', $query_params );
+	public function payments($query_params = array()) {
+		return $this->get_many_related('Payment', $query_params);
 	}
 
 
@@ -350,8 +350,8 @@ 
 	 * @return EE_Payment[]
 	 */
 	public function approved_payments() {
-		EE_Registry::instance()->load_model( 'Payment' );
-		return $this->get_many_related( 'Payment', array( array( 'STS_ID' => EEM_Payment::status_id_approved ), 'order_by' => array( 'PAY_timestamp' => 'DESC' ) ) );
+		EE_Registry::instance()->load_model('Payment');
+		return $this->get_many_related('Payment', array(array('STS_ID' => EEM_Payment::status_id_approved), 'order_by' => array('PAY_timestamp' => 'DESC')));
 	}
 
 
@@ -361,8 +361,8 @@ 
 	 * @param bool $show_icons
 	 * @return string
 	 */
-	public function e_pretty_status( $show_icons = FALSE ) {
-		echo $this->pretty_status( $show_icons );
+	public function e_pretty_status($show_icons = FALSE) {
+		echo $this->pretty_status($show_icons);
 	}
 
 
@@ -372,10 +372,10 @@ 
 	 * @param bool $show_icons
 	 * @return string
 	 */
-	public function pretty_status( $show_icons = FALSE ) {
-		$status = EEM_Status::instance()->localized_status( array( $this->status_ID() => __( 'unknown', 'event_espresso' ) ), FALSE, 'sentence' );
+	public function pretty_status($show_icons = FALSE) {
+		$status = EEM_Status::instance()->localized_status(array($this->status_ID() => __('unknown', 'event_espresso')), FALSE, 'sentence');
 		$icon = '';
-		switch ( $this->status_ID() ) {
+		switch ($this->status_ID()) {
 			case EEM_Transaction::complete_status_code:
 				$icon = $show_icons ? '<span class="dashicons dashicons-yes ee-icon-size-24 green-text"></span>' : '';
 				break;
@@ -392,7 +392,7 @@ 
 				$icon = $show_icons ? '<span class="dashicons dashicons-plus ee-icon-size-16 orange-text"></span>' : '';
 				break;
 		}
-		return $icon . $status[ $this->status_ID() ];
+		return $icon.$status[$this->status_ID()];
 	}
 
 
@@ -402,7 +402,7 @@ 
 	 * @access        public
 	 */
 	public function status_ID() {
-		return $this->get( 'STS_ID' );
+		return $this->get('STS_ID');
 	}
 
 
@@ -412,7 +412,7 @@ 
 	 * @return boolean
 	 */
 	public function is_free() {
-		return (float)$this->get( 'TXN_total' ) == 0 ? TRUE : FALSE;
+		return (float) $this->get('TXN_total') == 0 ? TRUE : FALSE;
 	}
 
 
@@ -480,12 +480,12 @@ 
 	 * @access public
 	 * @return string
 	 */
-	public function invoice_url( $type = 'html' ) {
+	public function invoice_url($type = 'html') {
 		$REG = $this->primary_registration();
-		if ( ! $REG instanceof EE_Registration ) {
+		if ( ! $REG instanceof EE_Registration) {
 			return '';
 		}
-		return $REG->invoice_url( $type );
+		return $REG->invoice_url($type);
 	}
 
 
@@ -495,7 +495,7 @@ 
 	 * @return EE_Registration
 	 */
 	public function primary_registration() {
-		return $this->get_first_related( 'Registration', array( array( 'REG_count' => EEM_Registration::PRIMARY_REGISTRANT_COUNT ) ) );
+		return $this->get_first_related('Registration', array(array('REG_count' => EEM_Registration::PRIMARY_REGISTRANT_COUNT)));
 	}
 
 
@@ -505,12 +505,12 @@ 
 	 * @param string $type 'pdf' or 'html' (default is 'html')
 	 * @return string
 	 */
-	public function receipt_url( $type = 'html' ) {
+	public function receipt_url($type = 'html') {
 		$REG = $this->primary_registration();
-		if ( ! $REG instanceof EE_Registration ) {
+		if ( ! $REG instanceof EE_Registration) {
 			return '';
 		}
-		return $REG->receipt_url( $type );
+		return $REG->receipt_url($type);
 	}
 
 
@@ -535,15 +535,15 @@ 
 	 * @deprecated
 	 * @return boolean
 	 */
-	public function update_based_on_payments(){
+	public function update_based_on_payments() {
 		EE_Error::doing_it_wrong(
-			__CLASS__ . '::' . __FUNCTION__,
-			sprintf( __( 'This method is deprecated. Please use "%s" instead', 'event_espresso' ), 'EE_Transaction_Processor::update_transaction_and_registrations_after_checkout_or_payment()' ),
+			__CLASS__.'::'.__FUNCTION__,
+			sprintf(__('This method is deprecated. Please use "%s" instead', 'event_espresso'), 'EE_Transaction_Processor::update_transaction_and_registrations_after_checkout_or_payment()'),
 			'4.6.0'
 		);
 		/** @type EE_Transaction_Processor $transaction_processor */
-		$transaction_processor = EE_Registry::instance()->load_class( 'Transaction_Processor' );
-		return  $transaction_processor->update_transaction_and_registrations_after_checkout_or_payment( $this );
+		$transaction_processor = EE_Registry::instance()->load_class('Transaction_Processor');
+		return  $transaction_processor->update_transaction_and_registrations_after_checkout_or_payment($this);
 	}
 
 
@@ -552,7 +552,7 @@ 
 	 * @return string
 	 */
 	public function gateway_response_on_transaction() {
-		$payment = $this->get_first_related( 'Payment' );
+		$payment = $this->get_first_related('Payment');
 		return $payment instanceof EE_Payment ? $payment->gateway_response() : '';
 	}
 
@@ -563,7 +563,7 @@ 
 	 * @return EE_Status
 	 */
 	public function status_obj() {
-		return $this->get_first_related( 'Status' );
+		return $this->get_first_related('Status');
 	}
 
 
@@ -573,8 +573,8 @@ 
 	 * @param array $query_params like EEM_Base::get_all
 	 * @return EE_Extra_Meta
 	 */
-	public function extra_meta( $query_params = array() ) {
-		return $this->get_many_related( 'Extra_Meta', $query_params );
+	public function extra_meta($query_params = array()) {
+		return $this->get_many_related('Extra_Meta', $query_params);
 	}
 
 
@@ -584,8 +584,8 @@ 
 	 * @param EE_Registration $registration
 	 * @return EE_Base_Class the relation was added to
 	 */
-	public function add_registration( EE_Registration $registration ) {
-		return $this->_add_relation_to( $registration, 'Registration' );
+	public function add_registration(EE_Registration $registration) {
+		return $this->_add_relation_to($registration, 'Registration');
 	}
 
 
@@ -596,8 +596,8 @@ 
 	 * @param int $registration_or_id
 	 * @return EE_Base_Class that was removed from being related
 	 */
-	public function remove_registration_with_id( $registration_or_id ) {
-		return $this->_remove_relation_to( $registration_or_id, 'Registration' );
+	public function remove_registration_with_id($registration_or_id) {
+		return $this->_remove_relation_to($registration_or_id, 'Registration');
 	}
 
 
@@ -607,7 +607,7 @@ 
 	 * @return EE_Line_Item[]
 	 */
 	public function items_purchased() {
-		return $this->line_items( array( array( 'LIN_type' => EEM_Line_Item::type_line_item ) ) );
+		return $this->line_items(array(array('LIN_type' => EEM_Line_Item::type_line_item)));
 	}
 
 
@@ -617,8 +617,8 @@ 
 	 * @param EE_Line_Item $line_item
 	 * @return EE_Base_Class the relation was added to
 	 */
-	public function add_line_item( EE_Line_Item $line_item ) {
-		return $this->_add_relation_to( $line_item, 'Line_Item' );
+	public function add_line_item(EE_Line_Item $line_item) {
+		return $this->_add_relation_to($line_item, 'Line_Item');
 	}
 
 
@@ -628,8 +628,8 @@ 
 	 * @param array $query_params
 	 * @return EE_Line_Item[]
 	 */
-	public function line_items( $query_params = array() ) {
-		return $this->get_many_related( 'Line_Item', $query_params );
+	public function line_items($query_params = array()) {
+		return $this->get_many_related('Line_Item', $query_params);
 	}
 
 
@@ -639,7 +639,7 @@ 
 	 * @return EE_Line_Item[]
 	 */
 	public function tax_items() {
-		return $this->line_items( array( array( 'LIN_type' => EEM_Line_Item::type_tax ) ) );
+		return $this->line_items(array(array('LIN_type' => EEM_Line_Item::type_tax)));
 	}
 
 
@@ -650,10 +650,10 @@ 
 	 * @return EE_Line_Item
 	 */
 	public function total_line_item() {
-		$item =  $this->get_first_related( 'Line_Item', array( array( 'LIN_type' => EEM_Line_Item::type_total ) ) );
-		if( ! $item ){
-			EE_Registry::instance()->load_helper( 'Line_Item' );
-			$item = EEH_Line_Item::create_total_line_item( $this );
+		$item = $this->get_first_related('Line_Item', array(array('LIN_type' => EEM_Line_Item::type_total)));
+		if ( ! $item) {
+			EE_Registry::instance()->load_helper('Line_Item');
+			$item = EEH_Line_Item::create_total_line_item($this);
 		}
 		return $item;
 	}
@@ -667,7 +667,7 @@ 
 	 */
 	public function tax_total() {
 		$tax_line_item = $this->tax_total_line_item();
-		if ( $tax_line_item ) {
+		if ($tax_line_item) {
 			return $tax_line_item->total();
 		} else {
 			return 0;
@@ -681,7 +681,7 @@ 
 	 * @return EE_Line_Item
 	 */
 	public function tax_total_line_item() {
-		return $this->get_first_related( 'Line_Item', array( array( 'LIN_type' => EEM_Line_Item::type_tax_sub_total ) ) );
+		return $this->get_first_related('Line_Item', array(array('LIN_type' => EEM_Line_Item::type_tax_sub_total)));
 	}
 
 
@@ -690,20 +690,20 @@ 
 	 *  Gets the array of billing info for the gateway and for this transaction's primary registration's attendee.
 	 * @return EE_Form_Section_Proper
 	 */
-	public function billing_info(){
+	public function billing_info() {
 		$payment_method = $this->payment_method();
-		if ( !$payment_method){
+		if ( ! $payment_method) {
 			EE_Error::add_error(__("Could not find billing info for transaction because no gateway has been used for it yet", "event_espresso"), __FILE__, __FUNCTION__, __LINE__);
 			return false;
 		}
 		$primary_reg = $this->primary_registration();
-		if ( ! $primary_reg ) {
-			EE_Error::add_error( __( "Cannot get billing info for gateway %s on transaction because no primary registration exists", "event_espresso" ), __FILE__, __FUNCTION__, __LINE__ );
+		if ( ! $primary_reg) {
+			EE_Error::add_error(__("Cannot get billing info for gateway %s on transaction because no primary registration exists", "event_espresso"), __FILE__, __FUNCTION__, __LINE__);
 			return FALSE;
 		}
 		$attendee = $primary_reg->attendee();
-		if ( ! $attendee ) {
-			EE_Error::add_error( __( "Cannot get billing info for gateway %s on transaction because the primary registration has no attendee exists", "event_espresso" ), __FILE__, __FUNCTION__, __LINE__ );
+		if ( ! $attendee) {
+			EE_Error::add_error(__("Cannot get billing info for gateway %s on transaction because the primary registration has no attendee exists", "event_espresso"), __FILE__, __FUNCTION__, __LINE__);
 			return FALSE;
 		}
 		return $attendee->billing_info_for_payment_method($payment_method);
@@ -738,15 +738,15 @@ 
 	 * offline ones, dont' create payments)
 	 * @return EE_Payment_Method
 	 */
-	function payment_method(){
+	function payment_method() {
 		$pm = $this->get_first_related('Payment_Method');
-		if( $pm instanceof EE_Payment_Method ){
+		if ($pm instanceof EE_Payment_Method) {
 			return $pm;
-		}else{
+		} else {
 			$last_payment = $this->last_payment();
-			if( $last_payment instanceof EE_Payment && $last_payment->payment_method() ){
+			if ($last_payment instanceof EE_Payment && $last_payment->payment_method()) {
 				return $last_payment->payment_method();
-			}else{
+			} else {
 				return NULL;
 			}
 		}
@@ -757,15 +757,15 @@ 
 	 * @return EE_Payment
 	 */
 	public function last_payment() {
-		return $this->get_first_related( 'Payment', array( 'order_by' => array( 'PAY_ID' => 'desc' ) ) );
+		return $this->get_first_related('Payment', array('order_by' => array('PAY_ID' => 'desc')));
 	}
 
 	/**
 	 * Gets all the line items which are unrelated to tickets on this transaction
 	 * @return EE_Line_Item[]
 	 */
-	public function non_ticket_line_items(){
-		return EEM_Line_Item::instance()->get_all_non_ticket_line_items_for_transaction( $this->ID() );
+	public function non_ticket_line_items() {
+		return EEM_Line_Item::instance()->get_all_non_ticket_line_items_for_transaction($this->ID());
 	}
 
 

core/db_classes/EE_Venue.class.php

Doc Comments +20 added lines, -20 removed lines

@@ -48,7 +48,7 @@ 
 	 * @param array $props_n_values  incoming values from the database
 	 * @param string $timezone  incoming timezone as set by the model.  If not set the timezone for
 	 *                          		the website will be used.
-	 * @return EE_Attendee
+	 * @return EE_Venue
 	 */
 	public static function new_instance_from_db( $props_n_values = array(), $timezone = null ) {
 		return new self( $props_n_values, TRUE, $timezone );
@@ -58,7 +58,7 @@ 
 
 	/**
 	 * Gets name
-	 * @return string
+	 * @return boolean
 	 */
 	function name() {
 		return $this->get( 'VNU_name' );
@@ -67,7 +67,7 @@ 
 
 	/**
 	 * Gets phone
-	 * @return string
+	 * @return boolean
 	 */
 	function phone() {
 		return $this->get( 'VNU_phone' );
@@ -77,7 +77,7 @@ 
 
 	/**
 	 * venue_url
-	 * @return string
+	 * @return boolean
 	 */
 	function venue_url() {
 		return $this->get( 'VNU_url' );
@@ -86,7 +86,7 @@ 
 
 	/**
 	 * Gets desc
-	 * @return string
+	 * @return boolean
 	 */
 	function description() {
 		return $this->get( 'VNU_desc' );
@@ -96,7 +96,7 @@ 
 
 	/**
 	 * Gets short description (AKA: the excerpt)
-	 * @return string
+	 * @return boolean
 	 */
 	function excerpt() {
 		return $this->get( 'VNU_short_desc' );
@@ -106,7 +106,7 @@ 
 
 	/**
 	 * Gets identifier
-	 * @return string
+	 * @return boolean
 	 */
 	function identifier() {
 		return $this->get( 'VNU_identifier' );
@@ -116,7 +116,7 @@ 
 
 	/**
 	 * Gets address
-	 * @return string
+	 * @return boolean
 	 */
 	function address() {
 		return $this->get( 'VNU_address' );
@@ -126,7 +126,7 @@ 
 
 	/**
 	 * Gets address2
-	 * @return string
+	 * @return boolean
 	 */
 	function address2() {
 		return $this->get( 'VNU_address2' );
@@ -137,7 +137,7 @@ 
 
 	/**
 	 * Gets city
-	 * @return string
+	 * @return boolean
 	 */
 	function city() {
 		return $this->get( 'VNU_city' );
@@ -145,7 +145,7 @@ 
 
 	/**
 	 * Gets state
-	 * @return int
+	 * @return boolean
 	 */
 	function state_ID() {
 		return $this->get( 'STA_ID' );
@@ -199,7 +199,7 @@ 
 
 	/**
 	 * country_ID
-	 * @return string
+	 * @return boolean
 	 */
 	function country_ID() {
 		return $this->get( 'CNT_ISO' );
@@ -244,7 +244,7 @@ 
 
 	/**
 	 * Gets zip
-	 * @return string
+	 * @return boolean
 	 */
 	function zip() {
 		return $this->get( 'VNU_zip' );
@@ -264,7 +264,7 @@ 
 
 	/**
 	 * Gets created
-	 * @return string
+	 * @return boolean
 	 */
 	function created() {
 		return $this->get( 'VNU_created' );
@@ -274,7 +274,7 @@ 
 
 	/**
 	 * Gets modified
-	 * @return string
+	 * @return boolean
 	 */
 	function modified() {
 		return $this->get( 'VNU_modified' );
@@ -284,7 +284,7 @@ 
 
 	/**
 	 * Gets order
-	 * @return int
+	 * @return boolean
 	 */
 	function order() {
 		return $this->get( 'VNU_order' );
@@ -294,7 +294,7 @@ 
 
 	/**
 	 * Gets wp_user
-	 * @return int
+	 * @return boolean
 	 */
 	function wp_user() {
 		return $this->get( 'VNU_wp_user' );
@@ -303,7 +303,7 @@ 
 
 
 	/**
-	 * @return string
+	 * @return boolean
 	 */
 	function virtual_phone() {
 		return $this->get( 'VNU_virtual_phone' );
@@ -312,7 +312,7 @@ 
 
 
 	/**
-	 * @return string
+	 * @return boolean
 	 */
 	function virtual_url() {
 		return $this->get( 'VNU_virtual_url' );
@@ -330,7 +330,7 @@ 
 
 
 	/**
-	 * @return string
+	 * @return boolean
 	 */
 	function google_map_link() {
 		return $this->get( 'VNU_google_map_link' );

Spacing +82 added lines, -82 removed lines

@@ -1,5 +1,5 @@ 
-<?php if ( ! defined( 'EVENT_ESPRESSO_VERSION' ) ) {
-	exit( 'No direct script access allowed' );
+<?php if ( ! defined('EVENT_ESPRESSO_VERSION')) {
+	exit('No direct script access allowed');
 }
 /**
  * Event Espresso
@@ -37,9 +37,9 @@ 
 	 *                             		    date_format and the second value is the time format
 	 * @return EE_Attendee
 	 */
-	public static function new_instance( $props_n_values = array(), $timezone = null, $date_formats = array() ) {
-		$has_object = parent::_check_for_object( $props_n_values, __CLASS__ );
-		return $has_object ? $has_object : new self( $props_n_values, false, $timezone, $date_formats );
+	public static function new_instance($props_n_values = array(), $timezone = null, $date_formats = array()) {
+		$has_object = parent::_check_for_object($props_n_values, __CLASS__);
+		return $has_object ? $has_object : new self($props_n_values, false, $timezone, $date_formats);
 	}
 
 
@@ -50,8 +50,8 @@ 
 	 *                          		the website will be used.
 	 * @return EE_Attendee
 	 */
-	public static function new_instance_from_db( $props_n_values = array(), $timezone = null ) {
-		return new self( $props_n_values, TRUE, $timezone );
+	public static function new_instance_from_db($props_n_values = array(), $timezone = null) {
+		return new self($props_n_values, TRUE, $timezone);
 	}
 
 
@@ -61,7 +61,7 @@ 
 	 * @return string
 	 */
 	function name() {
-		return $this->get( 'VNU_name' );
+		return $this->get('VNU_name');
 	}
 
 
@@ -70,7 +70,7 @@ 
 	 * @return string
 	 */
 	function phone() {
-		return $this->get( 'VNU_phone' );
+		return $this->get('VNU_phone');
 	}
 
 
@@ -80,7 +80,7 @@ 
 	 * @return string
 	 */
 	function venue_url() {
-		return $this->get( 'VNU_url' );
+		return $this->get('VNU_url');
 	}
 
 
@@ -89,7 +89,7 @@ 
 	 * @return string
 	 */
 	function description() {
-		return $this->get( 'VNU_desc' );
+		return $this->get('VNU_desc');
 	}
 
 
@@ -99,7 +99,7 @@ 
 	 * @return string
 	 */
 	function excerpt() {
-		return $this->get( 'VNU_short_desc' );
+		return $this->get('VNU_short_desc');
 	}
 
 
@@ -109,7 +109,7 @@ 
 	 * @return string
 	 */
 	function identifier() {
-		return $this->get( 'VNU_identifier' );
+		return $this->get('VNU_identifier');
 	}
 
 
@@ -119,7 +119,7 @@ 
 	 * @return string
 	 */
 	function address() {
-		return $this->get( 'VNU_address' );
+		return $this->get('VNU_address');
 	}
 
 
@@ -129,7 +129,7 @@ 
 	 * @return string
 	 */
 	function address2() {
-		return $this->get( 'VNU_address2' );
+		return $this->get('VNU_address2');
 	}
 
 
@@ -140,7 +140,7 @@ 
 	 * @return string
 	 */
 	function city() {
-		return $this->get( 'VNU_city' );
+		return $this->get('VNU_city');
 	}
 
 	/**
@@ -148,7 +148,7 @@ 
 	 * @return int
 	 */
 	function state_ID() {
-		return $this->get( 'STA_ID' );
+		return $this->get('STA_ID');
 	}
 
 
@@ -157,7 +157,7 @@ 
 	 * @return string
 	 */
 	public function state_abbrev() {
-		return $this->state_obj() instanceof EE_State ? $this->state_obj()->abbrev() : __( 'Unknown', 'event_espresso' );
+		return $this->state_obj() instanceof EE_State ? $this->state_obj()->abbrev() : __('Unknown', 'event_espresso');
 	}
 
 
@@ -166,7 +166,7 @@ 
 	 * @return string
 	 */
 	public function state_name() {
-		return $this->state_obj() instanceof EE_State ? $this->state_obj()->name() :  __( 'Unknown', 'event_espresso' );
+		return $this->state_obj() instanceof EE_State ? $this->state_obj()->name() : __('Unknown', 'event_espresso');
 	}
 
 
@@ -176,7 +176,7 @@ 
 	 * @return EE_State
 	 */
 	function state_obj() {
-		return $this->get_first_related( 'State' );
+		return $this->get_first_related('State');
 	}
 
 
@@ -188,7 +188,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_abbrev();
 		} else {
 			return $this->state_name();
@@ -202,7 +202,7 @@ 
 	 * @return string
 	 */
 	function country_ID() {
-		return $this->get( 'CNT_ISO' );
+		return $this->get('CNT_ISO');
 	}
 
 
@@ -211,7 +211,7 @@ 
 	 * @return string
 	 */
 	public function country_name() {
-		return $this->country_obj() instanceof EE_Country ? $this->country_obj()->name() :  __( 'Unknown', 'event_espresso' );
+		return $this->country_obj() instanceof EE_Country ? $this->country_obj()->name() : __('Unknown', 'event_espresso');
 	}
 
 
@@ -221,7 +221,7 @@ 
 	 * @return EE_Country
 	 */
 	function country_obj() {
-		return $this->get_first_related( 'Country' );
+		return $this->get_first_related('Country');
 	}
 
 
@@ -233,7 +233,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();
@@ -247,7 +247,7 @@ 
 	 * @return string
 	 */
 	function zip() {
-		return $this->get( 'VNU_zip' );
+		return $this->get('VNU_zip');
 	}
 
 
@@ -257,7 +257,7 @@ 
 	 * @return int
 	 */
 	function capacity() {
-		return $this->get_pretty( 'VNU_capacity', 'symbol' );
+		return $this->get_pretty('VNU_capacity', 'symbol');
 	}
 
 
@@ -267,7 +267,7 @@ 
 	 * @return string
 	 */
 	function created() {
-		return $this->get( 'VNU_created' );
+		return $this->get('VNU_created');
 	}
 
 
@@ -277,7 +277,7 @@ 
 	 * @return string
 	 */
 	function modified() {
-		return $this->get( 'VNU_modified' );
+		return $this->get('VNU_modified');
 	}
 
 
@@ -287,7 +287,7 @@ 
 	 * @return int
 	 */
 	function order() {
-		return $this->get( 'VNU_order' );
+		return $this->get('VNU_order');
 	}
 
 
@@ -297,7 +297,7 @@ 
 	 * @return int
 	 */
 	function wp_user() {
-		return $this->get( 'VNU_wp_user' );
+		return $this->get('VNU_wp_user');
 	}
 
 
@@ -306,7 +306,7 @@ 
 	 * @return string
 	 */
 	function virtual_phone() {
-		return $this->get( 'VNU_virtual_phone' );
+		return $this->get('VNU_virtual_phone');
 	}
 
 
@@ -315,7 +315,7 @@ 
 	 * @return string
 	 */
 	function virtual_url() {
-		return $this->get( 'VNU_virtual_url' );
+		return $this->get('VNU_virtual_url');
 	}
 
 
@@ -324,7 +324,7 @@ 
 	 * @return bool
 	 */
 	function enable_for_gmap() {
-		return $this->get( 'VNU_enable_for_gmap' );
+		return $this->get('VNU_enable_for_gmap');
 	}
 
 
@@ -333,7 +333,7 @@ 
 	 * @return string
 	 */
 	function google_map_link() {
-		return $this->get( 'VNU_google_map_link' );
+		return $this->get('VNU_google_map_link');
 	}
 
 
@@ -345,16 +345,16 @@ 
 	 * @param bool  $upcoming
 	 * @return EE_Event[]
 	 */
-	function events( $query_params = array(), $upcoming = FALSE ) {
-		if ( $upcoming ) {
+	function events($query_params = array(), $upcoming = FALSE) {
+		if ($upcoming) {
 			$query_params = array(
 				array(
 					'status' => 'publish',
-					'Datetime.DTT_EVT_start' => array( '>',  EEM_Datetime::instance()->current_time_for_query( 'DTT_EVT_start' ) )
+					'Datetime.DTT_EVT_start' => array('>', EEM_Datetime::instance()->current_time_for_query('DTT_EVT_start'))
 				)
 			);
 		}
-		return $this->get_many_related( 'Event', $query_params );
+		return $this->get_many_related('Event', $query_params);
 	}
 
 
@@ -372,8 +372,8 @@ 
 	/**
 	 * Sets address
 	 */
-	function set_address( $address = '' ) {
-		$this->set( 'VNU_address', $address );
+	function set_address($address = '') {
+		$this->set('VNU_address', $address);
 	}
 
 
@@ -381,8 +381,8 @@ 
 	/**
 	 * @param string $address2
 	 */
-	function set_address2( $address2 = '' ) {
-		$this->set( 'VNU_address2', $address2 );
+	function set_address2($address2 = '') {
+		$this->set('VNU_address2', $address2);
 	}
 
 
@@ -390,8 +390,8 @@ 
 	/**
 	 * @param string $city
 	 */
-	function set_city( $city = '' ) {
-		$this->set( 'VNU_city', $city );
+	function set_city($city = '') {
+		$this->set('VNU_city', $city);
 	}
 
 
@@ -399,8 +399,8 @@ 
 	/**
 	 * @param int $state
 	 */
-	function set_state_ID( $state = 0 ) {
-		$this->set( 'STA_ID', $state );
+	function set_state_ID($state = 0) {
+		$this->set('STA_ID', $state);
 	}
 
 
@@ -411,8 +411,8 @@ 
 	 * @param EE_State /int $state_id_or_obj
 	 * @return EE_State
 	 */
-	function set_state_obj( $state_id_or_obj ) {
-		return $this->_add_relation_to( $state_id_or_obj, 'State' );
+	function set_state_obj($state_id_or_obj) {
+		return $this->_add_relation_to($state_id_or_obj, 'State');
 	}
 
 
@@ -420,8 +420,8 @@ 
 	/**
 	 * @param int $country_ID
 	 */
-	function set_country_ID( $country_ID = 0 ) {
-		$this->set( 'CNT_ISO', $country_ID );
+	function set_country_ID($country_ID = 0) {
+		$this->set('CNT_ISO', $country_ID);
 	}
 
 
@@ -430,7 +430,7 @@ 
 	 * @param EE_Country /string $country_id_or_obj
 	 * @return EE_Country
 	 */
-	function set_country_obj( $country_id_or_obj ) {
+	function set_country_obj($country_id_or_obj) {
 		return $this->_add_relation_to($country_id_or_obj, 'Country');
 	}
 
@@ -439,8 +439,8 @@ 
 	/**
 	 * @param string $zip
 	 */
-	function set_zip( $zip = '' ) {
-		$this->set( 'VNU_zip', $zip );
+	function set_zip($zip = '') {
+		$this->set('VNU_zip', $zip);
 	}
 
 
@@ -448,8 +448,8 @@ 
 	/**
 	 * @param int $capacity
 	 */
-	function set_capacity( $capacity = 0 ) {
-		$this->set( 'VNU_capacity', $capacity );
+	function set_capacity($capacity = 0) {
+		$this->set('VNU_capacity', $capacity);
 	}
 
 
@@ -457,8 +457,8 @@ 
 	/**
 	 * @param string $created
 	 */
-	function set_created( $created = '' ) {
-		$this->set( 'VNU_created', $created );
+	function set_created($created = '') {
+		$this->set('VNU_created', $created);
 	}
 
 
@@ -466,8 +466,8 @@ 
 	/**
 	 * @param string $desc
 	 */
-	function set_description( $desc = '' ) {
-		$this->set( 'VNU_desc', $desc );
+	function set_description($desc = '') {
+		$this->set('VNU_desc', $desc);
 	}
 
 
@@ -475,8 +475,8 @@ 
 	/**
 	 * @param string $identifier
 	 */
-	function set_identifier( $identifier = '' ) {
-		$this->set( 'VNU_identifier', $identifier );
+	function set_identifier($identifier = '') {
+		$this->set('VNU_identifier', $identifier);
 	}
 
 
@@ -484,8 +484,8 @@ 
 	/**
 	 * @param string $modified
 	 */
-	function set_modified( $modified = '' ) {
-		$this->set( 'VNU_modified', $modified );
+	function set_modified($modified = '') {
+		$this->set('VNU_modified', $modified);
 	}
 
 
@@ -493,8 +493,8 @@ 
 	/**
 	 * @param string $name
 	 */
-	function set_name( $name = '' ) {
-		$this->set( 'VNU_name', $name );
+	function set_name($name = '') {
+		$this->set('VNU_name', $name);
 	}
 
 
@@ -502,8 +502,8 @@ 
 	/**
 	 * @param int $order
 	 */
-	function set_order( $order = 0 ) {
-		$this->set( 'VNU_order', $order );
+	function set_order($order = 0) {
+		$this->set('VNU_order', $order);
 	}
 
 
@@ -511,8 +511,8 @@ 
 	/**
 	 * @param string $phone
 	 */
-	function set_phone( $phone = '' ) {
-		$this->set( 'VNU_phone', $phone );
+	function set_phone($phone = '') {
+		$this->set('VNU_phone', $phone);
 	}
 
 
@@ -520,8 +520,8 @@ 
 	/**
 	 * @param int $wp_user
 	 */
-	function set_wp_user( $wp_user = 1 ) {
-		$this->set( 'VNU_wp_user', $wp_user );
+	function set_wp_user($wp_user = 1) {
+		$this->set('VNU_wp_user', $wp_user);
 	}
 
 
@@ -529,8 +529,8 @@ 
 	/**
 	 * @param string $url
 	 */
-	function set_venue_url( $url = '' ) {
-		$this->set( 'VNU_url', $url );
+	function set_venue_url($url = '') {
+		$this->set('VNU_url', $url);
 	}
 
 
@@ -538,8 +538,8 @@ 
 	/**
 	 * @param string $phone
 	 */
-	function set_virtual_phone( $phone = '' ) {
-		$this->set( 'VNU_virtual_phone', $phone );
+	function set_virtual_phone($phone = '') {
+		$this->set('VNU_virtual_phone', $phone);
 	}
 
 
@@ -547,8 +547,8 @@ 
 	/**
 	 * @param string $url
 	 */
-	function set_virtual_url( $url = '' ) {
-		$this->set( 'VNU_virtual_url', $url );
+	function set_virtual_url($url = '') {
+		$this->set('VNU_virtual_url', $url);
 	}
 
 
@@ -556,8 +556,8 @@ 
 	/**
 	 * @param string $enable
 	 */
-	function set_enable_for_gmap( $enable = '' ) {
-		$this->set( 'VNU_enable_for_gmap', $enable );
+	function set_enable_for_gmap($enable = '') {
+		$this->set('VNU_enable_for_gmap', $enable);
 	}
 
 
@@ -565,8 +565,8 @@ 
 	/**
 	 * @param string $google_map_link
 	 */
-	function set_google_map_link( $google_map_link = '' ) {
-		$this->set( 'VNU_google_map_link', $google_map_link );
+	function set_google_map_link($google_map_link = '') {
+		$this->set('VNU_google_map_link', $google_map_link);
 	}
 
 

core/db_models/EEM_Attendee.model.php

Doc Comments +1 added lines, -1 removed lines

@@ -109,7 +109,7 @@
 	*
 	* 		@access		public
 	* 		@param		$ATT_ID
-	*		@return 		mixed		array on success, FALSE on fail
+	*		@return 		EE_Soft_Delete_Base_Class|null		array on success, FALSE on fail
 	 * 		@deprecated
 	*/
 	public function get_attendee_by_ID( $ATT_ID = FALSE ) {

Indentation +26 added lines, -26 removed lines

@@ -105,13 +105,13 @@ 
 
 
 	/**
-	*		retrieve  a single attendee from db via their ID
-	*
-	* 		@access		public
-	* 		@param		$ATT_ID
-	*		@return 		mixed		array on success, FALSE on fail
+	 *		retrieve  a single attendee from db via their ID
+	 *
+	 * 		@access		public
+	 * 		@param		$ATT_ID
+	 *		@return 		mixed		array on success, FALSE on fail
 	 * 		@deprecated
-	*/
+	 */
 	public function get_attendee_by_ID( $ATT_ID = FALSE ) {
 		// retrieve a particular EE_Attendee
 		return $this->get_one_by_ID( $ATT_ID );
@@ -121,12 +121,12 @@ 
 
 
 	/**
-	*		retrieve  a single attendee from db via their ID
-	*
-	* 		@access		public
-	* 		@param		array $where_cols_n_values
-	*		@return 		mixed		array on success, FALSE on fail
-	*/
+	 *		retrieve  a single attendee from db via their ID
+	 *
+	 * 		@access		public
+	 * 		@param		array $where_cols_n_values
+	 *		@return 		mixed		array on success, FALSE on fail
+	 */
 	public function get_attendee( $where_cols_n_values = array() ) {
 
 		if ( empty( $where_cols_n_values )) {
@@ -174,20 +174,20 @@ 
 
 
 	/**
-             * Takes an incoming array of EE_Registration ids and sends back a list of corresponding non duplicate
-             * EE_Attendee objects.
-             *
-             * @since    4.3.0
-             * @param  array $ids array of EE_Registration ids
-             * @return  EE_Attendee[]
-             */
-            public function get_array_of_contacts_from_reg_ids( $ids ) {
-                $ids = (array) $ids;
-                $_where = array(
-                    'Registration.REG_ID' => array( 'in', $ids )
-                    );
-                return $this->get_all( array( $_where ) );
-            }
+	 * Takes an incoming array of EE_Registration ids and sends back a list of corresponding non duplicate
+	 * EE_Attendee objects.
+	 *
+	 * @since    4.3.0
+	 * @param  array $ids array of EE_Registration ids
+	 * @return  EE_Attendee[]
+	 */
+			public function get_array_of_contacts_from_reg_ids( $ids ) {
+				$ids = (array) $ids;
+				$_where = array(
+					'Registration.REG_ID' => array( 'in', $ids )
+					);
+				return $this->get_all( array( $_where ) );
+			}
 
 
 }

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');
+}
 require_once ( EE_MODELS . 'EEM_Base.model.php' );
 
 /**

Spacing +52 added lines, -52 removed lines

@@ -1,5 +1,5 @@ 
 <?php if ( ! defined('EVENT_ESPRESSO_VERSION')) exit('No direct script access allowed');
-require_once ( EE_MODELS . 'EEM_Base.model.php' );
+require_once (EE_MODELS.'EEM_Base.model.php');
 
 /**
  *
@@ -21,60 +21,60 @@ 
 	 * Please instead use the EEM_Attendee::system_question_* constants
 	 * @deprecated
 	 */
-	const fname_question_id=1;
+	const fname_question_id = 1;
 
 	/**
 	 * @deprecated
 	 */
-	const lname_question_id=2;
+	const lname_question_id = 2;
 
 
 	/**
 	 * @deprecated
 	 */
-	const email_question_id=3;
+	const email_question_id = 3;
 
 
 	/**
 	 * @deprecated
 	 */
-	const address_question_id=4;
+	const address_question_id = 4;
 
 
 	/**
 	 * @deprecated
 	 */
-	const address2_question_id=5;
+	const address2_question_id = 5;
 
 
 	/**
 	 * @deprecated
 	 */
-	const city_question_id=6;
+	const city_question_id = 6;
 
 
 	/**
 	 * @deprecated
 	 */
-	const state_question_id=7;
+	const state_question_id = 7;
 
 
 	/**
 	 * @deprecated
 	 */
-	const country_question_id=8;
+	const country_question_id = 8;
 
 
 	/**
 	 * @deprecated
 	 */
-	const zip_question_id=9;
+	const zip_question_id = 9;
 
 
 	/**
 	 * @deprecated
 	 */
-	const phone_question_id=10;
+	const phone_question_id = 10;
 
 	/**
 	 * When looking for questions that correspond to attendee fields,
@@ -119,9 +119,9 @@ 
 	 * @access protected
 	 * @param null $timezone
 	 */
-	protected function __construct( $timezone = NULL ) {
-		$this->singular_item = __('Attendee','event_espresso');
-		$this->plural_item = __('Attendees','event_espresso');
+	protected function __construct($timezone = NULL) {
+		$this->singular_item = __('Attendee', 'event_espresso');
+		$this->plural_item = __('Attendees', 'event_espresso');
 		$this->_tables = array(
 			'Attendee_CPT'=> new EE_Primary_Table('posts', 'ID'),
 			'Attendee_Meta'=>new EE_Secondary_Table('esp_attendee_meta', 'ATTM_ID', 'ATT_ID')
@@ -135,36 +135,36 @@ 
 				'ATT_created'=>new EE_Datetime_Field('post_date', __("Time Attendee Created", "event_espresso"), false, time()),
 				'ATT_short_bio'=>new EE_Simple_HTML_Field('post_excerpt', __("Attendee Short Biography", "event_espresso"), true, __("No Biography Provided", "event_espresso")),
 				'ATT_modified'=>new EE_Datetime_Field('post_modified', __("Time Attendee Last Modified", "event_espresso"), FALSE, time()),
-				'ATT_author'=>new EE_WP_User_Field('post_author', __("Creator ID of the first Event attended", "event_espresso"), false ),
+				'ATT_author'=>new EE_WP_User_Field('post_author', __("Creator ID of the first Event attended", "event_espresso"), false),
 				'ATT_parent'=>new EE_DB_Only_Int_Field('post_parent', __("Parent Attendee (unused)", "event_espresso"), false, 0),
-				'post_type'=>new EE_WP_Post_Type_Field('espresso_attendees'),// EE_DB_Only_Text_Field('post_type', __("Post Type of Attendee", "event_espresso"), false,'espresso_attendees'),
+				'post_type'=>new EE_WP_Post_Type_Field('espresso_attendees'), // EE_DB_Only_Text_Field('post_type', __("Post Type of Attendee", "event_espresso"), false,'espresso_attendees'),
 				'status' => new EE_WP_Post_Status_Field('post_status', __('Attendee Status', 'event_espresso'), false, 'publish')
 			),
 			'Attendee_Meta'=>array(
-				'ATTM_ID'=> new EE_DB_Only_Int_Field('ATTM_ID', __('Attendee Meta Row ID','event_espresso'), false),
+				'ATTM_ID'=> new EE_DB_Only_Int_Field('ATTM_ID', __('Attendee Meta Row ID', 'event_espresso'), false),
 				'ATT_ID_fk'=>new EE_DB_Only_Int_Field('ATT_ID', __("Foreign Key to Attendee in Post Table", "event_espresso"), false),
-				'ATT_fname'=>new EE_Plain_Text_Field('ATT_fname', __('First Name','event_espresso'), true, ''),
-				'ATT_lname'=>new EE_Plain_Text_Field('ATT_lname', __('Last Name','event_espresso'), true, ''),
-				'ATT_address'=>new EE_Plain_Text_Field('ATT_address', __('Address Part 1','event_espresso'), true, ''),
-				'ATT_address2'=>new EE_Plain_Text_Field('ATT_address2', __('Address Part 2','event_espresso'), true, ''),
-				'ATT_city'=>new EE_Plain_Text_Field('ATT_city', __('City','event_espresso'), true, ''),
-				'STA_ID'=>new EE_Foreign_Key_Int_Field('STA_ID', __('State','event_espresso'), true,0,'State'),
-				'CNT_ISO'=>new EE_Foreign_Key_String_Field('CNT_ISO', __('Country','event_espresso'), true,'','Country'),
-				'ATT_zip'=>new EE_Plain_Text_Field('ATT_zip', __('ZIP/Postal Code','event_espresso'), true, ''),
-				'ATT_email'=>new EE_Email_Field('ATT_email', __('Email Address','event_espresso'), true, ''),
-				'ATT_phone'=>new EE_Plain_Text_Field('ATT_phone', __('Phone','event_espresso'), true, '')
+				'ATT_fname'=>new EE_Plain_Text_Field('ATT_fname', __('First Name', 'event_espresso'), true, ''),
+				'ATT_lname'=>new EE_Plain_Text_Field('ATT_lname', __('Last Name', 'event_espresso'), true, ''),
+				'ATT_address'=>new EE_Plain_Text_Field('ATT_address', __('Address Part 1', 'event_espresso'), true, ''),
+				'ATT_address2'=>new EE_Plain_Text_Field('ATT_address2', __('Address Part 2', 'event_espresso'), true, ''),
+				'ATT_city'=>new EE_Plain_Text_Field('ATT_city', __('City', 'event_espresso'), true, ''),
+				'STA_ID'=>new EE_Foreign_Key_Int_Field('STA_ID', __('State', 'event_espresso'), true, 0, 'State'),
+				'CNT_ISO'=>new EE_Foreign_Key_String_Field('CNT_ISO', __('Country', 'event_espresso'), true, '', 'Country'),
+				'ATT_zip'=>new EE_Plain_Text_Field('ATT_zip', __('ZIP/Postal Code', 'event_espresso'), true, ''),
+				'ATT_email'=>new EE_Email_Field('ATT_email', __('Email Address', 'event_espresso'), true, ''),
+				'ATT_phone'=>new EE_Plain_Text_Field('ATT_phone', __('Phone', 'event_espresso'), true, '')
 			));
 		$this->_model_relations = array(
 			'Registration'=>new EE_Has_Many_Relation(),
 			'State'=>new EE_Belongs_To_Relation(),
 			'Country'=>new EE_Belongs_To_Relation(),
-			'Event'=>new EE_HABTM_Relation('Registration', FALSE ),
+			'Event'=>new EE_HABTM_Relation('Registration', FALSE),
 			'WP_User' => new EE_Belongs_To_Relation(),
 		);
 		require_once('strategies/EE_CPT_Where_Conditions.strategy.php');
 		$this->_default_where_conditions_strategy = new EE_CPT_Where_Conditions('espresso_attendees', 'ATTM_ID');
 		$this->_caps_slug = 'contacts';
-		parent::__construct( $timezone );
+		parent::__construct($timezone);
 
 	}
 
@@ -174,8 +174,8 @@ 
 	 * @param string $system_question_string
 	 * @return string|null if not found
 	 */
-	public function get_attendee_field_for_system_question( $system_question_string ) {
-		return isset( $this->_system_question_to_attendee_field_name[ $system_question_string ] ) ? $this->_system_question_to_attendee_field_name[ $system_question_string ] : null;
+	public function get_attendee_field_for_system_question($system_question_string) {
+		return isset($this->_system_question_to_attendee_field_name[$system_question_string]) ? $this->_system_question_to_attendee_field_name[$system_question_string] : null;
 	}
 
 
@@ -186,8 +186,8 @@ 
 	 * @param EE_Transaction/int $transaction_id_or_obj EE_Transaction or its ID
 	 * @return EE_Attendee[]
 	 */
-	public function get_attendees_for_transaction( $transaction_id_or_obj ){
-		return $this->get_all( array( array(
+	public function get_attendees_for_transaction($transaction_id_or_obj) {
+		return $this->get_all(array(array(
 			  'Registration.Transaction.TXN_ID' => $transaction_id_or_obj instanceof EE_Transaction ? $transaction_id_or_obj->ID() : $transaction_id_or_obj
 		  )));
 	}
@@ -202,9 +202,9 @@ 
 	*		@return 		mixed		array on success, FALSE on fail
 	 * 		@deprecated
 	*/
-	public function get_attendee_by_ID( $ATT_ID = FALSE ) {
+	public function get_attendee_by_ID($ATT_ID = FALSE) {
 		// retrieve a particular EE_Attendee
-		return $this->get_one_by_ID( $ATT_ID );
+		return $this->get_one_by_ID($ATT_ID);
 	}
 
 
@@ -217,14 +217,14 @@ 
 	* 		@param		array $where_cols_n_values
 	*		@return 		mixed		array on success, FALSE on fail
 	*/
-	public function get_attendee( $where_cols_n_values = array() ) {
+	public function get_attendee($where_cols_n_values = array()) {
 
-		if ( empty( $where_cols_n_values )) {
+		if (empty($where_cols_n_values)) {
 			return FALSE;
 		}
-		$attendee = $this->get_all( array($where_cols_n_values ));
-		if ( ! empty( $attendee )) {
-			return array_shift( $attendee );
+		$attendee = $this->get_all(array($where_cols_n_values));
+		if ( ! empty($attendee)) {
+			return array_shift($attendee);
 		} else {
 			return FALSE;
 		}
@@ -240,20 +240,20 @@ 
 	 * @param array $where_cols_n_values
 	 * @return bool|mixed
 	 */
-	public function find_existing_attendee( $where_cols_n_values = NULL ) {
+	public function find_existing_attendee($where_cols_n_values = NULL) {
 		// search by combo of first and last names plus the email address
-		$attendee_data_keys = array( 'ATT_fname' => $this->_ATT_fname, 'ATT_lname' => $this->_ATT_lname, 'ATT_email' => $this->_ATT_email );
+		$attendee_data_keys = array('ATT_fname' => $this->_ATT_fname, 'ATT_lname' => $this->_ATT_lname, 'ATT_email' => $this->_ATT_email);
 		// no search params means attendee object already exists.
-		$where_cols_n_values = is_array( $where_cols_n_values ) && ! empty( $where_cols_n_values ) ? $where_cols_n_values : $attendee_data_keys;
+		$where_cols_n_values = is_array($where_cols_n_values) && ! empty($where_cols_n_values) ? $where_cols_n_values : $attendee_data_keys;
 		$valid_data = TRUE;
 		// check for required values
-		$valid_data = isset( $where_cols_n_values['ATT_fname'] ) && ! empty( $where_cols_n_values['ATT_fname'] ) ? $valid_data : FALSE;
-		$valid_data = isset( $where_cols_n_values['ATT_lname'] ) && ! empty( $where_cols_n_values['ATT_lname'] ) ? $valid_data : FALSE;
-		$valid_data = isset( $where_cols_n_values['ATT_email'] ) && ! empty( $where_cols_n_values['ATT_email'] ) ? $valid_data : FALSE;
+		$valid_data = isset($where_cols_n_values['ATT_fname']) && ! empty($where_cols_n_values['ATT_fname']) ? $valid_data : FALSE;
+		$valid_data = isset($where_cols_n_values['ATT_lname']) && ! empty($where_cols_n_values['ATT_lname']) ? $valid_data : FALSE;
+		$valid_data = isset($where_cols_n_values['ATT_email']) && ! empty($where_cols_n_values['ATT_email']) ? $valid_data : FALSE;
 
-		if ( $valid_data ) {
-			$attendee = $this->get_attendee( $where_cols_n_values );
-			if ( $attendee instanceof EE_Attendee ) {
+		if ($valid_data) {
+			$attendee = $this->get_attendee($where_cols_n_values);
+			if ($attendee instanceof EE_Attendee) {
 				return $attendee;
 			}
 		}
@@ -271,12 +271,12 @@ 
              * @param  array $ids array of EE_Registration ids
              * @return  EE_Attendee[]
              */
-            public function get_array_of_contacts_from_reg_ids( $ids ) {
+            public function get_array_of_contacts_from_reg_ids($ids) {
                 $ids = (array) $ids;
                 $_where = array(
-                    'Registration.REG_ID' => array( 'in', $ids )
+                    'Registration.REG_ID' => array('in', $ids)
                     );
-                return $this->get_all( array( $_where ) );
+                return $this->get_all(array($_where));
             }
 
 

core/db_models/EEM_Change_Log.model.php

Doc Comments +2 added lines, -2 removed lines

@@ -117,7 +117,7 @@ 
 	 * @param string $log_type !see the acceptable values of LOG_type in EEM__Change_Log::__construct
 	 * @param mixed $message array|string of the message you want to record
 	 * @param EE_Base_Class $related_model_obj
-	 * @return EE_Change_Log
+	 * @return EE_Attendee
 	 */
 	public function log($log_type,$message,$related_model_obj){
 		if($related_model_obj instanceof EE_Base_Class){
@@ -145,7 +145,7 @@ 
 	 * @param mixed $related_obj_id
 	 * @param string $related_obj_type
 	 * @throws EE_Error
-	 * @return EE_Change_Log
+	 * @return EE_Attendee
 	 */
 	public function gateway_log( $message, $related_obj_id, $related_obj_type ){
 		if( ! EE_Registry::instance()->is_model_name($related_obj_type)){

Spacing +22 added lines, -22 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 EEM_Change_Log extends EEM_Base{
+class EEM_Change_Log extends EEM_Base {
 
 	/**
 	 * the related object was created log type
@@ -68,19 +68,19 @@ 
 	 *	@access protected
 	 *	@return EEM_Change_Log
 	 */
-	protected function __construct( $timezone = null ){
+	protected function __construct($timezone = null) {
 		global $current_user;
-		$this->singular_item = __('Log','event_espresso');
-		$this->plural_item = __('Logs','event_espresso');
+		$this->singular_item = __('Log', 'event_espresso');
+		$this->plural_item = __('Logs', 'event_espresso');
 		$this->_tables = array(
 			'Log'=> new EE_Primary_Table('esp_log', 'LOG_ID')
 		);
 		$models_this_can_attach_to = array_keys(EE_Registry::instance()->non_abstract_db_models);
 		$this->_fields = array(
 			'Log'=>array(
-				'LOG_ID'=> new EE_Primary_Key_Int_Field('LOG_ID', __('Log ID','event_espresso')),
+				'LOG_ID'=> new EE_Primary_Key_Int_Field('LOG_ID', __('Log ID', 'event_espresso')),
 				'LOG_time'=>new EE_Datetime_Field('LOG_time', __("Log Time", 'event_espresso'), false, time()),
-				'OBJ_ID'=>new EE_Foreign_Key_String_Field('OBJ_ID', __("Object ID (int or string)", 'event_espresso'), true, NULL,$models_this_can_attach_to),
+				'OBJ_ID'=>new EE_Foreign_Key_String_Field('OBJ_ID', __("Object ID (int or string)", 'event_espresso'), true, NULL, $models_this_can_attach_to),
 				'OBJ_type'=>new EE_Any_Foreign_Model_Name_Field('OBJ_type', __("Object Type", 'event_espresso'), true, NULL, $models_this_can_attach_to),
 				'LOG_type'=>new EE_Enum_Text_Field('LOG_type', __("Type of log entry", "event_espresso"), false, self::type_debug,
 						array(
@@ -92,24 +92,24 @@ 
 							self::type_gateway=> __("Gateway Interaction (IPN or Direct Payment)", 'event_espresso'),
 							)),
 				'LOG_message'=>new EE_Maybe_Serialized_Text_Field('LOG_message', __("Log Message (body)", 'event_espresso'), true),
-				'LOG_wp_user' => new EE_WP_User_Field('LOG_wp_user', __("User who was logged in while this occurred", 'event_espresso'), true ),
+				'LOG_wp_user' => new EE_WP_User_Field('LOG_wp_user', __("User who was logged in while this occurred", 'event_espresso'), true),
 
 			));
 		$this->_model_relations = array();
-		foreach($models_this_can_attach_to as $model){
-			if( $model == 'WP_User' ){
-				$this->_model_relations[ $model ] = new EE_Belongs_To_Relation();
-			}elseif( $model != 'Change_Log' ) {
+		foreach ($models_this_can_attach_to as $model) {
+			if ($model == 'WP_User') {
+				$this->_model_relations[$model] = new EE_Belongs_To_Relation();
+			}elseif ($model != 'Change_Log') {
 				$this->_model_relations[$model] = new EE_Belongs_To_Any_Relation();
 			}
 		}
 		//use completely custom caps for this
 		$this->_cap_restriction_generators = false;
 		//caps-wise this is all-or-nothing: if you have the default role you can access anything, otherwise nothing
-		foreach( $this->_cap_contexts_to_cap_action_map as $cap_context => $action ) {
-			$this->_cap_restrictions[ $cap_context ][ EE_Restriction_Generator_Base::get_default_restrictions_cap() ] = new EE_Return_None_Where_Conditions();
+		foreach ($this->_cap_contexts_to_cap_action_map as $cap_context => $action) {
+			$this->_cap_restrictions[$cap_context][EE_Restriction_Generator_Base::get_default_restrictions_cap()] = new EE_Return_None_Where_Conditions();
 		}
-		parent::__construct( $timezone );
+		parent::__construct($timezone);
 	}
 
 	/**
@@ -119,11 +119,11 @@ 
 	 * @param EE_Base_Class $related_model_obj
 	 * @return EE_Change_Log
 	 */
-	public function log($log_type,$message,$related_model_obj){
-		if($related_model_obj instanceof EE_Base_Class){
+	public function log($log_type, $message, $related_model_obj) {
+		if ($related_model_obj instanceof EE_Base_Class) {
 			$obj_id = $related_model_obj->ID();
 			$obj_type = $related_model_obj->get_model()->get_this_model_name();
-		}else{
+		} else {
 			$obj_id = NULL;
 			$obj_type = NULL;
 		}
@@ -147,9 +147,9 @@ 
 	 * @throws EE_Error
 	 * @return EE_Change_Log
 	 */
-	public function gateway_log( $message, $related_obj_id, $related_obj_type ){
-		if( ! EE_Registry::instance()->is_model_name($related_obj_type)){
-			throw new EE_Error(sprintf(__("'%s' is not a model name. A model name must be provided when making a gateway log. Eg, 'Payment', 'Payment_Method', etc", "event_espresso"),$related_obj_type));
+	public function gateway_log($message, $related_obj_id, $related_obj_type) {
+		if ( ! EE_Registry::instance()->is_model_name($related_obj_type)) {
+			throw new EE_Error(sprintf(__("'%s' is not a model name. A model name must be provided when making a gateway log. Eg, 'Payment', 'Payment_Method', etc", "event_espresso"), $related_obj_type));
 		}
 		$log = EE_Change_Log::new_instance(array(
 				'LOG_type'=>EEM_Change_Log::type_gateway,
@@ -168,7 +168,7 @@ 
 	 * @param array $query_params @see EEM_Base::get_all
 	 * @return array of arrays
 	 */
-	public function get_all_efficiently($query_params){
+	public function get_all_efficiently($query_params) {
 		return $this->_get_all_wpdb_results($query_params);
 	}
 

Braces +4 added lines, -3 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
@@ -99,7 +100,7 @@ 
 		foreach($models_this_can_attach_to as $model){
 			if( $model == 'WP_User' ){
 				$this->_model_relations[ $model ] = new EE_Belongs_To_Relation();
-			}elseif( $model != 'Change_Log' ) {
+			} elseif( $model != 'Change_Log' ) {
 				$this->_model_relations[$model] = new EE_Belongs_To_Any_Relation();
 			}
 		}
@@ -123,7 +124,7 @@ 
 		if($related_model_obj instanceof EE_Base_Class){
 			$obj_id = $related_model_obj->ID();
 			$obj_type = $related_model_obj->get_model()->get_this_model_name();
-		}else{
+		} else{
 			$obj_id = NULL;
 			$obj_type = NULL;
 		}