eventespresso / event-espresso-core

core/db_classes/EE_Line_Item.class.php

Doc Comments +26 added lines, -26 removed lines

@@ -86,7 +86,7 @@ 
 
 	/**
 	 * Gets ID
-	 * @return int
+	 * @return boolean
 	 */
 	function ID() {
 		return $this->get( 'LIN_ID' );
@@ -96,7 +96,7 @@ 
 
 	/**
 	 * Gets TXN_ID
-	 * @return int
+	 * @return boolean
 	 */
 	function TXN_ID() {
 		return $this->get( 'TXN_ID' );
@@ -107,7 +107,7 @@ 
 	/**
 	 * Sets TXN_ID
 	 * @param int $TXN_ID
-	 * @return boolean
+	 * @return boolean|null
 	 */
 	function set_TXN_ID( $TXN_ID ) {
 		$this->set( 'TXN_ID', $TXN_ID );
@@ -132,7 +132,7 @@ 
 	/**
 	 * Sets name
 	 * @param string $name
-	 * @return boolean
+	 * @return boolean|null
 	 */
 	function set_name( $name ) {
 		$this->set( 'LIN_name', $name );
@@ -142,7 +142,7 @@ 
 
 	/**
 	 * Gets desc
-	 * @return string
+	 * @return boolean
 	 */
 	function desc() {
 		return $this->get( 'LIN_desc' );
@@ -153,7 +153,7 @@ 
 	/**
 	 * Sets desc
 	 * @param string $desc
-	 * @return boolean
+	 * @return boolean|null
 	 */
 	function set_desc( $desc ) {
 		$this->set( 'LIN_desc', $desc );
@@ -163,7 +163,7 @@ 
 
 	/**
 	 * Gets quantity
-	 * @return int
+	 * @return boolean
 	 */
 	function quantity() {
 		return $this->get( 'LIN_quantity' );
@@ -174,7 +174,7 @@ 
 	/**
 	 * Sets quantity
 	 * @param int $quantity
-	 * @return boolean
+	 * @return boolean|null
 	 */
 	function set_quantity( $quantity ) {
 		$this->set( 'LIN_quantity', $quantity );
@@ -184,7 +184,7 @@ 
 
 	/**
 	 * Gets item_id
-	 * @return string
+	 * @return boolean
 	 */
 	function OBJ_ID() {
 		return $this->get( 'OBJ_ID' );
@@ -195,7 +195,7 @@ 
 	/**
 	 * Sets item_id
 	 * @param string $item_id
-	 * @return boolean
+	 * @return boolean|null
 	 */
 	function set_OBJ_ID( $item_id ) {
 		$this->set( 'OBJ_ID', $item_id );
@@ -205,7 +205,7 @@ 
 
 	/**
 	 * Gets item_type
-	 * @return string
+	 * @return boolean
 	 */
 	function OBJ_type() {
 		return $this->get( 'OBJ_type' );
@@ -216,7 +216,7 @@ 
 	/**
 	 * Sets item_type
 	 * @param string $OBJ_type
-	 * @return boolean
+	 * @return boolean|null
 	 */
 	function set_OBJ_type( $OBJ_type ) {
 		$this->set( 'OBJ_type', $OBJ_type );
@@ -226,7 +226,7 @@ 
 
 	/**
 	 * Gets unit_price
-	 * @return float
+	 * @return boolean
 	 */
 	function unit_price() {
 		return $this->get( 'LIN_unit_price' );
@@ -237,7 +237,7 @@ 
 	/**
 	 * Sets unit_price
 	 * @param float $unit_price
-	 * @return boolean
+	 * @return boolean|null
 	 */
 	function set_unit_price( $unit_price ) {
 		$this->set( 'LIN_unit_price', $unit_price );
@@ -274,7 +274,7 @@ 
 
 	/**
 	 * Gets percent (between 100-.001)
-	 * @return float
+	 * @return boolean
 	 */
 	function percent() {
 		return $this->get( 'LIN_percent' );
@@ -285,7 +285,7 @@ 
 	/**
 	 * Sets percent (between 100-0.01)
 	 * @param float $percent
-	 * @return boolean
+	 * @return boolean|null
 	 */
 	function set_percent( $percent ) {
 		$this->set( 'LIN_percent', $percent );
@@ -295,7 +295,7 @@ 
 
 	/**
 	 * Gets total
-	 * @return float
+	 * @return boolean
 	 */
 	function total() {
 		return $this->get( 'LIN_total' );
@@ -306,7 +306,7 @@ 
 	/**
 	 * Sets total
 	 * @param float $total
-	 * @return boolean
+	 * @return boolean|null
 	 */
 	function set_total( $total ) {
 		$this->set( 'LIN_total', $total );
@@ -316,7 +316,7 @@ 
 
 	/**
 	 * Gets order
-	 * @return int
+	 * @return boolean
 	 */
 	function order() {
 		return $this->get( 'LIN_order' );
@@ -336,7 +336,7 @@ 
 
 	/**
 	 * Gets parent
-	 * @return int
+	 * @return boolean
 	 */
 	function parent_ID() {
 		return $this->get( 'LIN_parent' );
@@ -347,7 +347,7 @@ 
 	/**
 	 * Sets parent
 	 * @param int $parent
-	 * @return boolean
+	 * @return boolean|null
 	 */
 	function set_parent_ID( $parent ) {
 		$this->set( 'LIN_parent', $parent );
@@ -357,7 +357,7 @@ 
 
 	/**
 	 * Gets type
-	 * @return string
+	 * @return boolean
 	 */
 	function type() {
 		return $this->get( 'LIN_type' );
@@ -368,7 +368,7 @@ 
 	/**
 	 * Sets type
 	 * @param string $type
-	 * @return boolean
+	 * @return boolean|null
 	 */
 	function set_type( $type ) {
 		$this->set( 'LIN_type', $type );
@@ -415,7 +415,7 @@ 
 
 	/**
 	 * Gets code
-	 * @return string
+	 * @return boolean
 	 */
 	function code() {
 		return $this->get( 'LIN_code' );
@@ -426,7 +426,7 @@ 
 	/**
 	 * Sets code
 	 * @param string $code
-	 * @return boolean
+	 * @return boolean|null
 	 */
 	function set_code( $code ) {
 		$this->set( 'LIN_code', $code );
@@ -447,7 +447,7 @@ 
 	/**
 	 * Sets is_taxable
 	 * @param boolean $is_taxable
-	 * @return boolean
+	 * @return boolean|null
 	 */
 	function set_is_taxable( $is_taxable ) {
 		$this->set( 'LIN_is_taxable', $is_taxable );

Braces +3 added lines, -3 removed lines

@@ -670,7 +670,7 @@ 
 			if( isset( $this->_children[ $code ] ) ) {
 				unset( $this->_children[ $code ] );
 				return 1;
-			}else{
+			} else{
 				return 0;
 			}
 		}
@@ -1007,10 +1007,10 @@ 
 					//that's taxable too (the taxable total so far)
 					if( $child_line_item->is_percent() ) {
 						$total = $total + ( $total * $child_line_item->percent() / 100 );
-					}else{
+					} else{
 						$total += $child_line_item->total();
 					}
-				}elseif( $child_line_item->type() == EEM_Line_Item::type_sub_total ){
+				} elseif( $child_line_item->type() == EEM_Line_Item::type_sub_total ){
 					$total += $child_line_item->taxable_total();
 				}
 			}

Spacing +212 added lines, -212 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
@@ -50,9 +50,9 @@ 
 	 *                             		    date_format and the second value is the time format
 	 * @return EE_Line_Item
 	 */
-	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);
 	}
 
 
@@ -63,8 +63,8 @@ 
 	 *                          		the website will be used.
 	 * @return EE_Line_Item
 	 */
-	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);
 	}
 
 
@@ -75,10 +75,10 @@ 
 	 * @param bool   $bydb
 	 * @param string $timezone
 	 */
-	protected function __construct( $fieldValues = array(), $bydb = FALSE, $timezone = '' ) {
-		parent::__construct( $fieldValues, $bydb, $timezone );
-		if ( ! $this->get( 'LIN_code' ) ) {
-			$this->set_code( $this->generate_code() );
+	protected function __construct($fieldValues = array(), $bydb = FALSE, $timezone = '') {
+		parent::__construct($fieldValues, $bydb, $timezone);
+		if ( ! $this->get('LIN_code')) {
+			$this->set_code($this->generate_code());
 		}
 	}
 
@@ -89,7 +89,7 @@ 
 	 * @return int
 	 */
 	function ID() {
-		return $this->get( 'LIN_ID' );
+		return $this->get('LIN_ID');
 	}
 
 
@@ -99,7 +99,7 @@ 
 	 * @return int
 	 */
 	function TXN_ID() {
-		return $this->get( 'TXN_ID' );
+		return $this->get('TXN_ID');
 	}
 
 
@@ -109,8 +109,8 @@ 
 	 * @param int $TXN_ID
 	 * @return boolean
 	 */
-	function set_TXN_ID( $TXN_ID ) {
-		$this->set( 'TXN_ID', $TXN_ID );
+	function set_TXN_ID($TXN_ID) {
+		$this->set('TXN_ID', $TXN_ID);
 	}
 
 
@@ -120,9 +120,9 @@ 
 	 * @return string
 	 */
 	function name() {
-		$name =  $this->get( 'LIN_name' );
-		if( ! $name ){
-			$name = ucwords( str_replace( '-', ' ', $this->type() ) );
+		$name = $this->get('LIN_name');
+		if ( ! $name) {
+			$name = ucwords(str_replace('-', ' ', $this->type()));
 		}
 		return $name;
 	}
@@ -134,8 +134,8 @@ 
 	 * @param string $name
 	 * @return boolean
 	 */
-	function set_name( $name ) {
-		$this->set( 'LIN_name', $name );
+	function set_name($name) {
+		$this->set('LIN_name', $name);
 	}
 
 
@@ -145,7 +145,7 @@ 
 	 * @return string
 	 */
 	function desc() {
-		return $this->get( 'LIN_desc' );
+		return $this->get('LIN_desc');
 	}
 
 
@@ -155,8 +155,8 @@ 
 	 * @param string $desc
 	 * @return boolean
 	 */
-	function set_desc( $desc ) {
-		$this->set( 'LIN_desc', $desc );
+	function set_desc($desc) {
+		$this->set('LIN_desc', $desc);
 	}
 
 
@@ -166,7 +166,7 @@ 
 	 * @return int
 	 */
 	function quantity() {
-		return $this->get( 'LIN_quantity' );
+		return $this->get('LIN_quantity');
 	}
 
 
@@ -176,8 +176,8 @@ 
 	 * @param int $quantity
 	 * @return boolean
 	 */
-	function set_quantity( $quantity ) {
-		$this->set( 'LIN_quantity', $quantity );
+	function set_quantity($quantity) {
+		$this->set('LIN_quantity', $quantity);
 	}
 
 
@@ -187,7 +187,7 @@ 
 	 * @return string
 	 */
 	function OBJ_ID() {
-		return $this->get( 'OBJ_ID' );
+		return $this->get('OBJ_ID');
 	}
 
 
@@ -197,8 +197,8 @@ 
 	 * @param string $item_id
 	 * @return boolean
 	 */
-	function set_OBJ_ID( $item_id ) {
-		$this->set( 'OBJ_ID', $item_id );
+	function set_OBJ_ID($item_id) {
+		$this->set('OBJ_ID', $item_id);
 	}
 
 
@@ -208,7 +208,7 @@ 
 	 * @return string
 	 */
 	function OBJ_type() {
-		return $this->get( 'OBJ_type' );
+		return $this->get('OBJ_type');
 	}
 
 
@@ -218,8 +218,8 @@ 
 	 * @param string $OBJ_type
 	 * @return boolean
 	 */
-	function set_OBJ_type( $OBJ_type ) {
-		$this->set( 'OBJ_type', $OBJ_type );
+	function set_OBJ_type($OBJ_type) {
+		$this->set('OBJ_type', $OBJ_type);
 	}
 
 
@@ -229,7 +229,7 @@ 
 	 * @return float
 	 */
 	function unit_price() {
-		return $this->get( 'LIN_unit_price' );
+		return $this->get('LIN_unit_price');
 	}
 
 
@@ -239,8 +239,8 @@ 
 	 * @param float $unit_price
 	 * @return boolean
 	 */
-	function set_unit_price( $unit_price ) {
-		$this->set( 'LIN_unit_price', $unit_price );
+	function set_unit_price($unit_price) {
+		$this->set('LIN_unit_price', $unit_price);
 	}
 
 
@@ -251,19 +251,19 @@ 
 	 * @return boolean
 	 */
 	function is_percent() {
-		if( $this->is_tax_sub_total() ) {
+		if ($this->is_tax_sub_total()) {
 			//tax subtotals HAVE a percent on them, that percentage only applies
 			//to taxable items, so its' an exception. Treat it like a flat line item
 			return false;
 		}
-		$unit_price = abs( $this->get( 'LIN_unit_price' ) );
-		$percent = abs( $this->get( 'LIN_percent' ) );
-		if ( $unit_price < .001 && $percent ) {
+		$unit_price = abs($this->get('LIN_unit_price'));
+		$percent = abs($this->get('LIN_percent'));
+		if ($unit_price < .001 && $percent) {
 			return TRUE;
-		} elseif ( $unit_price >= .001 && !$percent ) {
+		} elseif ($unit_price >= .001 && ! $percent) {
 			return FALSE;
-		} elseif ( $unit_price >= .001 && $percent ) {
-			throw new EE_Error( sprintf( __( "A Line Item can not have a unit price of (%s) AND a percent (%s)!", "event_espresso" ), $unit_price, $percent ) );
+		} elseif ($unit_price >= .001 && $percent) {
+			throw new EE_Error(sprintf(__("A Line Item can not have a unit price of (%s) AND a percent (%s)!", "event_espresso"), $unit_price, $percent));
 		} else {
 			// if they're both 0, assume its not a percent item
 			return FALSE;
@@ -277,7 +277,7 @@ 
 	 * @return float
 	 */
 	function percent() {
-		return $this->get( 'LIN_percent' );
+		return $this->get('LIN_percent');
 	}
 
 
@@ -287,8 +287,8 @@ 
 	 * @param float $percent
 	 * @return boolean
 	 */
-	function set_percent( $percent ) {
-		$this->set( 'LIN_percent', $percent );
+	function set_percent($percent) {
+		$this->set('LIN_percent', $percent);
 	}
 
 
@@ -298,7 +298,7 @@ 
 	 * @return float
 	 */
 	function total() {
-		return $this->get( 'LIN_total' );
+		return $this->get('LIN_total');
 	}
 
 
@@ -308,8 +308,8 @@ 
 	 * @param float $total
 	 * @return boolean
 	 */
-	function set_total( $total ) {
-		$this->set( 'LIN_total', $total );
+	function set_total($total) {
+		$this->set('LIN_total', $total);
 	}
 
 
@@ -319,7 +319,7 @@ 
 	 * @return int
 	 */
 	function order() {
-		return $this->get( 'LIN_order' );
+		return $this->get('LIN_order');
 	}
 
 
@@ -328,8 +328,8 @@ 
 	 * Sets order
 	 * @param int $order
 	 */
-	function set_order( $order ) {
-		$this->set( 'LIN_order', $order );
+	function set_order($order) {
+		$this->set('LIN_order', $order);
 	}
 
 
@@ -339,7 +339,7 @@ 
 	 * @return int
 	 */
 	function parent_ID() {
-		return $this->get( 'LIN_parent' );
+		return $this->get('LIN_parent');
 	}
 
 
@@ -349,8 +349,8 @@ 
 	 * @param int $parent
 	 * @return boolean
 	 */
-	function set_parent_ID( $parent ) {
-		$this->set( 'LIN_parent', $parent );
+	function set_parent_ID($parent) {
+		$this->set('LIN_parent', $parent);
 	}
 
 
@@ -360,7 +360,7 @@ 
 	 * @return string
 	 */
 	function type() {
-		return $this->get( 'LIN_type' );
+		return $this->get('LIN_type');
 	}
 
 
@@ -370,8 +370,8 @@ 
 	 * @param string $type
 	 * @return boolean
 	 */
-	function set_type( $type ) {
-		$this->set( 'LIN_type', $type );
+	function set_type($type) {
+		$this->set('LIN_type', $type);
 	}
 
 
@@ -384,8 +384,8 @@ 
 	 * @return EE_Line_Item
 	 */
 	public function parent() {
-		if( $this->ID() ) {
-			return $this->get_model()->get_one_by_ID( $this->parent_ID() );
+		if ($this->ID()) {
+			return $this->get_model()->get_one_by_ID($this->parent_ID());
 		} else {
 			return $this->_parent;
 		}
@@ -398,13 +398,13 @@ 
 	 * @return EE_Line_Item[]
 	 */
 	public function children() {
-		if ( $this->ID() ) {
+		if ($this->ID()) {
 			return $this->get_model()->get_all(
 					array(
-						array( 'LIN_parent' => $this->ID() ),
-						'order_by' => array( 'LIN_order' => 'ASC' ) ) );
+						array('LIN_parent' => $this->ID()),
+						'order_by' => array('LIN_order' => 'ASC') ) );
 		} else {
-			if ( ! is_array( $this->_children ) ) {
+			if ( ! is_array($this->_children)) {
 				$this->_children = array();
 			}
 			return $this->_children;
@@ -418,7 +418,7 @@ 
 	 * @return string
 	 */
 	function code() {
-		return $this->get( 'LIN_code' );
+		return $this->get('LIN_code');
 	}
 
 
@@ -428,8 +428,8 @@ 
 	 * @param string $code
 	 * @return boolean
 	 */
-	function set_code( $code ) {
-		$this->set( 'LIN_code', $code );
+	function set_code($code) {
+		$this->set('LIN_code', $code);
 	}
 
 
@@ -439,7 +439,7 @@ 
 	 * @return boolean
 	 */
 	function is_taxable() {
-		return $this->get( 'LIN_is_taxable' );
+		return $this->get('LIN_is_taxable');
 	}
 
 
@@ -449,8 +449,8 @@ 
 	 * @param boolean $is_taxable
 	 * @return boolean
 	 */
-	function set_is_taxable( $is_taxable ) {
-		$this->set( 'LIN_is_taxable', $is_taxable );
+	function set_is_taxable($is_taxable) {
+		$this->set('LIN_is_taxable', $is_taxable);
 	}
 
 
@@ -465,7 +465,7 @@ 
 	 */
 	function get_object() {
 		$model_name_of_related_obj = $this->OBJ_type();
-		return $this->get_model()->has_relation(  $model_name_of_related_obj ) ? $this->get_first_related( $model_name_of_related_obj ) : NULL;
+		return $this->get_model()->has_relation($model_name_of_related_obj) ? $this->get_first_related($model_name_of_related_obj) : NULL;
 	}
 
 
@@ -476,11 +476,11 @@ 
 	 * @param array $query_params
 	 * @return EE_Ticket
 	 */
-	function ticket( $query_params = array() ) {
+	function ticket($query_params = array()) {
 		//we're going to assume that when this method is called we always want to receive the attached ticket EVEN if that ticket is archived.  This can be overridden via the incoming $query_params argument
-		$remove_defaults = array( 'default_where_conditions' => 'none' );
-		$query_params = array_merge( $remove_defaults, $query_params );
-		return $this->get_first_related( 'Ticket', $query_params );
+		$remove_defaults = array('default_where_conditions' => 'none');
+		$query_params = array_merge($remove_defaults, $query_params);
+		return $this->get_first_related('Ticket', $query_params);
 	}
 
 
@@ -490,11 +490,11 @@ 
 	 * @return EE_Datetime | NULL
 	 */
 	function get_ticket_datetime() {
-		if ( $this->OBJ_type() === 'Ticket' ) {
+		if ($this->OBJ_type() === 'Ticket') {
 			$ticket = $this->ticket();
-			if ( $ticket instanceof EE_Ticket ) {
+			if ($ticket instanceof EE_Ticket) {
 				$datetime = $ticket->first_datetime();
-				if ( $datetime instanceof EE_Datetime ) {
+				if ($datetime instanceof EE_Datetime) {
 					return $datetime;
 				}
 			}
@@ -510,9 +510,9 @@ 
 	 * @return string
 	 */
 	function ticket_event_name() {
-		$event_name = __( "Unknown", "event_espresso" );
+		$event_name = __("Unknown", "event_espresso");
 		$event = $this->ticket_event();
-		if ( $event instanceof EE_Event ) {
+		if ($event instanceof EE_Event) {
 			$event_name = $event->name();
 		}
 		return $event_name;
@@ -526,9 +526,9 @@ 
 	function ticket_event() {
 		$event = null;
 		$ticket = $this->ticket();
-		if ( $ticket instanceof EE_Ticket ) {
+		if ($ticket instanceof EE_Ticket) {
 			$datetime = $ticket->first_datetime();
-			if ( $datetime instanceof EE_Datetime ) {
+			if ($datetime instanceof EE_Datetime) {
 				$event = $datetime->event();
 			}
 		}
@@ -543,11 +543,11 @@ 
 	 * @param string $time_format
 	 * @return string
 	 */
-	function ticket_datetime_start( $date_format = '', $time_format = '' ) {
-		$first_datetime_string = __( "Unknown", "event_espresso" );
+	function ticket_datetime_start($date_format = '', $time_format = '') {
+		$first_datetime_string = __("Unknown", "event_espresso");
 		$datetime = $this->get_ticket_datetime();
-		if ( $datetime ) {
-			$first_datetime_string = $datetime->start_date_and_time( $date_format, $time_format );
+		if ($datetime) {
+			$first_datetime_string = $datetime->start_date_and_time($date_format, $time_format);
 		}
 		return $first_datetime_string;
 	}
@@ -562,26 +562,26 @@ 
 	 * @return bool success
 	 * @throws \EE_Error
 	 */
-	function add_child_line_item( EEI_Line_Item $line_item, $set_order = true ) {
+	function add_child_line_item(EEI_Line_Item $line_item, $set_order = true) {
 		// should we calculate the LIN_order for this line item ?
-		if ( $set_order || $line_item->order() === null ) {
-			$line_item->set_order( count( $this->children() ) );
+		if ($set_order || $line_item->order() === null) {
+			$line_item->set_order(count($this->children()));
 		}
-		if ( $this->ID() ) {
+		if ($this->ID()) {
 			//check for any duplicate line items (with the same code), if so, this replaces it
-			$line_item_with_same_code = $this->get_child_line_item(  $line_item->code() );
-			if( $line_item_with_same_code instanceof EE_Line_Item && $line_item_with_same_code !== $line_item ) {
-				$this->delete_child_line_item( $line_item_with_same_code->code() );
+			$line_item_with_same_code = $this->get_child_line_item($line_item->code());
+			if ($line_item_with_same_code instanceof EE_Line_Item && $line_item_with_same_code !== $line_item) {
+				$this->delete_child_line_item($line_item_with_same_code->code());
 			}
-			$line_item->set_parent_ID( $this->ID() );
-			if( $this->TXN_ID() ){
-				$line_item->set_TXN_ID( $this->TXN_ID() );
+			$line_item->set_parent_ID($this->ID());
+			if ($this->TXN_ID()) {
+				$line_item->set_TXN_ID($this->TXN_ID());
 			}
 			return $line_item->save();
 		} else {
-			$this->_children[ $line_item->code() ] = $line_item;
-			if( $line_item->parent() != $this ) {
-				$line_item->set_parent( $this );
+			$this->_children[$line_item->code()] = $line_item;
+			if ($line_item->parent() != $this) {
+				$line_item->set_parent($this);
 			}
 			return TRUE;
 		}
@@ -595,16 +595,16 @@ 
 	 * @param EE_Line_Item $line_item
 	 *
 	 */
-	public function set_parent( $line_item ) {
-		if ( $this->ID() ) {
-			if( ! $line_item->ID() ) {
+	public function set_parent($line_item) {
+		if ($this->ID()) {
+			if ( ! $line_item->ID()) {
 				$line_item->save();
 			}
-			$this->set_parent_ID( $line_item->ID() );
+			$this->set_parent_ID($line_item->ID());
 			$this->save();
 		} else {
 			$this->_parent = $line_item;
-			$this->set_parent_ID( $line_item->ID() );
+			$this->set_parent_ID($line_item->ID());
 		}
 	}
 
@@ -617,11 +617,11 @@ 
 	 * @param string $code
 	 * @return EE_Line_Item
 	 */
-	function get_child_line_item( $code ) {
-		if ( $this->ID() ) {
-			return $this->get_model()->get_one( array( array( 'LIN_parent' => $this->ID(), 'LIN_code' => $code ) ) );
+	function get_child_line_item($code) {
+		if ($this->ID()) {
+			return $this->get_model()->get_one(array(array('LIN_parent' => $this->ID(), 'LIN_code' => $code)));
 		} else {
-			return isset( $this->_children[ $code ] ) ? $this->_children[ $code ] : null;
+			return isset($this->_children[$code]) ? $this->_children[$code] : null;
 		}
 	}
 
@@ -632,10 +632,10 @@ 
 	 * @return int
 	 */
 	function delete_children_line_items() {
-		if ( $this->ID() ) {
-			return $this->get_model()->delete( array( array( 'LIN_parent' => $this->ID() ) ) );
+		if ($this->ID()) {
+			return $this->get_model()->delete(array(array('LIN_parent' => $this->ID())));
 		} else {
-			$count = count( $this->_children );
+			$count = count($this->_children);
 			$this->_children = array();
 			return $count;
 		}
@@ -652,25 +652,25 @@ 
 	 * @param bool $stop_search_once_found
 	 * @return int count of items deleted (or simply removed from the line item's cache, if not has not been saved to the DB yet)
 	 */
-	function delete_child_line_item( $code, $stop_search_once_found = true ) {
-		if ( $this->ID() ) {
+	function delete_child_line_item($code, $stop_search_once_found = true) {
+		if ($this->ID()) {
 			$items_deleted = 0;
-			if( $this->code() == $code ) {
-				$items_deleted += EEH_Line_Item::delete_all_child_items( $this );
-				$items_deleted += intval( $this->delete() );
-				if( $stop_search_once_found ){
+			if ($this->code() == $code) {
+				$items_deleted += EEH_Line_Item::delete_all_child_items($this);
+				$items_deleted += intval($this->delete());
+				if ($stop_search_once_found) {
 					return $items_deleted;
 				}
 			}
-			foreach( $this->children() as $child_line_item ) {
-				$items_deleted += $child_line_item->delete_child_line_item( $code, $stop_search_once_found );
+			foreach ($this->children() as $child_line_item) {
+				$items_deleted += $child_line_item->delete_child_line_item($code, $stop_search_once_found);
 			}
 			return $items_deleted;
 		} else {
-			if( isset( $this->_children[ $code ] ) ) {
-				unset( $this->_children[ $code ] );
+			if (isset($this->_children[$code])) {
+				unset($this->_children[$code]);
 				return 1;
-			}else{
+			} else {
 				return 0;
 			}
 		}
@@ -683,9 +683,9 @@ 
 	 * @return boolean
 	 */
 	public function delete_if_childless_subtotal() {
-		if( $this->ID() &&
+		if ($this->ID() &&
 				$this->type() == EEM_Line_Item::type_sub_total &&
-				! $this->children() ) {
+				! $this->children()) {
 			return $this->delete();
 		} else {
 			return false;
@@ -700,7 +700,7 @@ 
 	 */
 	function generate_code() {
 		// each line item in the cart requires a unique identifier
-		return md5( $this->get( 'OBJ_type' ) . $this->get( 'OBJ_ID' ) . microtime() );
+		return md5($this->get('OBJ_type').$this->get('OBJ_ID').microtime());
 	}
 
 
@@ -764,7 +764,7 @@ 
 	 * @return string like '2, 004.00', formatted according to the localized currency
 	 */
 	function unit_price_no_code() {
-		return $this->get_pretty( 'LIN_unit_price', 'no_currency_code' );
+		return $this->get_pretty('LIN_unit_price', 'no_currency_code');
 	}
 
 
@@ -774,7 +774,7 @@ 
 	 * @return string like '2, 004.00', formatted according to the localized currency
 	 */
 	function total_no_code() {
-		return $this->get_pretty( 'LIN_total', 'no_currency_code' );
+		return $this->get_pretty('LIN_total', 'no_currency_code');
 	}
 
 
@@ -793,17 +793,17 @@ 
 
 		$total = $pre_tax_total + $tax_total;
 		// no negative totals plz
-		$total = max( $total, 0 );
-		$this->set_total( $total );
+		$total = max($total, 0);
+		$this->set_total($total);
 		//only update the related transaction's total
 		//if we intend to save this line item and its a grand total
-		if(
+		if (
 			$this->allow_persist() &&
 			$this->type() == EEM_Line_Item::type_total &&
 			$this->transaction() instanceof EE_Transaction
-		){
-			$this->transaction()->set_total( $total );
-			if ( $this->transaction()->ID() ) {
+		) {
+			$this->transaction()->set_total($total);
+			if ($this->transaction()->ID()) {
 				$this->transaction()->save();
 			}
 		}
@@ -824,42 +824,42 @@ 
 		$total = 0;
 		$my_children = $this->children();
 		//completely ignore tax and tax sub-totals when calculating the pre-tax-total
-		if ( $this->is_tax_sub_total() || $this->is_tax() ) {
+		if ($this->is_tax_sub_total() || $this->is_tax()) {
 			return 0;
 		} elseif (
-			( $this->is_sub_line_item() || $this->is_line_item() )
-			&& empty( $my_children )
+			($this->is_sub_line_item() || $this->is_line_item())
+			&& empty($my_children)
 		) {
 			$total = $this->unit_price() * $this->quantity();
-		} elseif( $this->is_sub_total() || $this->is_total() ) {
-			$total = $this->_recalculate_pretax_total_for_subtotal( $total, $my_children );
-		} elseif (  $this->is_line_item() && ! empty( $my_children ) ) {
-			$total = $this->_recalculate_pretax_total_for_line_item( $total, $my_children );
+		} elseif ($this->is_sub_total() || $this->is_total()) {
+			$total = $this->_recalculate_pretax_total_for_subtotal($total, $my_children);
+		} elseif ($this->is_line_item() && ! empty($my_children)) {
+			$total = $this->_recalculate_pretax_total_for_line_item($total, $my_children);
 		}
 		//ensure all non-line items and non-sub-line-items have a quantity of 1
-		if( ! $this->is_line_item() && ! $this->is_sub_line_item() ) {
-			$this->set_quantity( 1 );
-			if( ! $this->is_percent() ) {
-				$this->set_unit_price( $this->total() );
+		if ( ! $this->is_line_item() && ! $this->is_sub_line_item()) {
+			$this->set_quantity(1);
+			if ( ! $this->is_percent()) {
+				$this->set_unit_price($this->total());
 			}
 		}
 
 		//we don't want to bother saving grand totals, because that needs to factor in taxes anyways
 		//so it ought to be
-		if( ! $this->is_total() ) {
-			$this->set_total( $total );
+		if ( ! $this->is_total()) {
+			$this->set_total($total);
 			//if not a percent line item, make sure we keep the unit price in sync
-			if(
+			if (
 				$this->is_line_item() &&
-				! empty( $my_children ) &&
+				! empty($my_children) &&
 				! $this->is_percent()
 			) {
-				if( $this->quantity() === 0 ){
+				if ($this->quantity() === 0) {
 					$new_unit_price = 0;
 				} else {
 					$new_unit_price = $this->total() / $this->quantity();
 				}
-				$this->set_unit_price( $new_unit_price );
+				$this->set_unit_price($new_unit_price);
 			}
 			$this->maybe_save();
 		}
@@ -875,34 +875,34 @@ 
 	 * @param EE_Line_Item[] $my_children
 	 * @return float
 	 */
-	protected function _recalculate_pretax_total_for_subtotal( $calculated_total_so_far, $my_children = null ) {
-		if( $my_children === null ) {
+	protected function _recalculate_pretax_total_for_subtotal($calculated_total_so_far, $my_children = null) {
+		if ($my_children === null) {
 			$my_children = $this->children();
 		}
 		//get the total of all its children
-		foreach ( $my_children as $child_line_item ) {
-			if ( $child_line_item instanceof EE_Line_Item ) {
-				if ( $child_line_item->is_percent() ) {
+		foreach ($my_children as $child_line_item) {
+			if ($child_line_item instanceof EE_Line_Item) {
+				if ($child_line_item->is_percent()) {
 					$percent_total = $calculated_total_so_far * $child_line_item->percent() / 100;
-					$child_line_item->set_total( $percent_total );
+					$child_line_item->set_total($percent_total);
 					//so far all percent line items should have a quantity of 1
 					//(ie, no double percent discounts. Although that might be requested someday)
-					$child_line_item->set_quantity( 1 );
+					$child_line_item->set_quantity(1);
 					$child_line_item->maybe_save();
 					$calculated_total_so_far += $percent_total;
 				} else {
 					//verify flat sub-line-item quantities match their parent
-					if( $child_line_item->is_sub_line_item() ) {
-						$child_line_item->set_quantity( $this->quantity() );
+					if ($child_line_item->is_sub_line_item()) {
+						$child_line_item->set_quantity($this->quantity());
 					}
 					$calculated_total_so_far += $child_line_item->recalculate_pre_tax_total();
 				}
 			}
 		}
 
-		if( $this->is_sub_total() ){
+		if ($this->is_sub_total()) {
 			// no negative totals plz
-			$calculated_total_so_far = max( $calculated_total_so_far, 0 );
+			$calculated_total_so_far = max($calculated_total_so_far, 0);
 		}
 		return $calculated_total_so_far;
 	}
@@ -916,8 +916,8 @@ 
 	 * @param EE_Line_Item[] $my_children
 	 * @return float
 	 */
-	protected function _recalculate_pretax_total_for_line_item( $calculated_total_so_far, $my_children = null ) {
-		if( $my_children === null ) {
+	protected function _recalculate_pretax_total_for_line_item($calculated_total_so_far, $my_children = null) {
+		if ($my_children === null) {
 			$my_children = $this->children();
 		}
 		//we need to keep track of the running total for a single item,
@@ -925,9 +925,9 @@ 
 		$unit_price_for_total = 0;
 		$quantity_for_total = 1;
 		//get the total of all its children
-		foreach ( $my_children as $child_line_item ) {
-			if ( $child_line_item instanceof EE_Line_Item ) {
-				if ( $child_line_item->is_percent() ) {
+		foreach ($my_children as $child_line_item) {
+			if ($child_line_item instanceof EE_Line_Item) {
+				if ($child_line_item->is_percent()) {
 					//it should be the unit-price-so-far multiplied by teh percent multiplied by the quantity
 					//not total multiplied by percent, because that ignores rounding along-the-way
 					$percent_unit_price = round(
@@ -935,17 +935,17 @@ 
 						EE_Registry::instance()->CFG->currency->dec_plc
 					);
 					$percent_total = $percent_unit_price * $quantity_for_total;
-					$child_line_item->set_total( $percent_total );
+					$child_line_item->set_total($percent_total);
 					//so far all percent line items should have a quantity of 1
 					//(ie, no double percent discounts. Although that might be requested someday)
-					$child_line_item->set_quantity( 1 );
+					$child_line_item->set_quantity(1);
 					$child_line_item->maybe_save();
 					$calculated_total_so_far += $percent_total;
 					$unit_price_for_total += $percent_unit_price;
 				} else {
 					//verify flat sub-line-item quantities match their parent
-					if( $child_line_item->is_sub_line_item() ) {
-						$child_line_item->set_quantity( $this->quantity() );
+					if ($child_line_item->is_sub_line_item()) {
+						$child_line_item->set_quantity($this->quantity());
 					}
 					$quantity_for_total = $child_line_item->quantity();
 					$calculated_total_so_far += $child_line_item->recalculate_pre_tax_total();
@@ -969,10 +969,10 @@ 
 		//calculate the pretax total
 		$taxable_total = $this->taxable_total();
 		$tax_total = 0;
-		foreach ( $taxes as $tax ) {
+		foreach ($taxes as $tax) {
 			$total_on_this_tax = $taxable_total * $tax->percent() / 100;
 			//remember the total on this line item
-			$tax->set_total( $total_on_this_tax );
+			$tax->set_total($total_on_this_tax);
 			$tax_total += $tax->total();
 		}
 		$this->_recalculate_tax_sub_total();
@@ -986,21 +986,21 @@ 
 	 * @return void
 	 */
 	private function _recalculate_tax_sub_total() {
-		if ( $this->is_tax_sub_total() ) {
+		if ($this->is_tax_sub_total()) {
 			$total = 0;
 			$total_percent = 0;
 			//simply loop through all its children (which should be taxes) and sum their total
-			foreach ( $this->children() as $child_tax ) {
-				if ( $child_tax instanceof EE_Line_Item ) {
+			foreach ($this->children() as $child_tax) {
+				if ($child_tax instanceof EE_Line_Item) {
 					$total += $child_tax->total();
 					$total_percent += $child_tax->percent();
 				}
 			}
-			$this->set_total( $total );
-			$this->set_percent( $total_percent );
-		} elseif ( $this->is_total() ) {
-			foreach ( $this->children() as $maybe_tax_subtotal ) {
-				if ( $maybe_tax_subtotal instanceof EE_Line_Item ) {
+			$this->set_total($total);
+			$this->set_percent($total_percent);
+		} elseif ($this->is_total()) {
+			foreach ($this->children() as $maybe_tax_subtotal) {
+				if ($maybe_tax_subtotal instanceof EE_Line_Item) {
 					$maybe_tax_subtotal->_recalculate_tax_sub_total();
 				}
 			}
@@ -1016,8 +1016,8 @@ 
 	public function get_total_tax() {
 		$this->_recalculate_tax_sub_total();
 		$total = 0;
-		foreach ( $this->tax_descendants() as $tax_line_item ) {
-			if ( $tax_line_item instanceof EE_Line_Item ) {
+		foreach ($this->tax_descendants() as $tax_line_item) {
+			if ($tax_line_item instanceof EE_Line_Item) {
 				$total += $tax_line_item->total();
 			}
 		}
@@ -1031,8 +1031,8 @@ 
 	 */
 	public function get_items_total() {
 		$total = 0;
-		foreach ( $this->get_items() as $item ) {
-			if ( $item instanceof EE_Line_Item ) {
+		foreach ($this->get_items() as $item) {
+			if ($item instanceof EE_Line_Item) {
 				$total += $item->total();
 			}
 		}
@@ -1047,8 +1047,8 @@ 
 	 * @return EE_Line_Item[]
 	 */
 	function tax_descendants() {
-		EE_Registry::instance()->load_helper( 'Line_Item' );
-		return EEH_Line_Item::get_tax_descendants( $this );
+		EE_Registry::instance()->load_helper('Line_Item');
+		return EEH_Line_Item::get_tax_descendants($this);
 	}
 
 
@@ -1058,8 +1058,8 @@ 
 	 * @return EE_Line_Item[]
 	 */
 	function get_items() {
-		EE_Registry::instance()->load_helper( 'Line_Item' );
-		return EEH_Line_Item::get_line_item_descendants( $this );
+		EE_Registry::instance()->load_helper('Line_Item');
+		return EEH_Line_Item::get_line_item_descendants($this);
 	}
 
 
@@ -1073,22 +1073,22 @@ 
 	 */
 	function taxable_total() {
 		$total = 0;
-		if ( $this->children() ) {
-			foreach ( $this->children() as $child_line_item ) {
-				if ( $child_line_item->type() == EEM_Line_Item::type_line_item && $child_line_item->is_taxable()) {
+		if ($this->children()) {
+			foreach ($this->children() as $child_line_item) {
+				if ($child_line_item->type() == EEM_Line_Item::type_line_item && $child_line_item->is_taxable()) {
 					//if it's a percent item, only take into account the percent
 					//that's taxable too (the taxable total so far)
-					if( $child_line_item->is_percent() ) {
-						$total = $total + ( $total * $child_line_item->percent() / 100 );
-					}else{
+					if ($child_line_item->is_percent()) {
+						$total = $total + ($total * $child_line_item->percent() / 100);
+					} else {
 						$total += $child_line_item->total();
 					}
-				}elseif( $child_line_item->type() == EEM_Line_Item::type_sub_total ){
+				}elseif ($child_line_item->type() == EEM_Line_Item::type_sub_total) {
 					$total += $child_line_item->taxable_total();
 				}
 			}
 		}
-		return max( $total, 0 );
+		return max($total, 0);
 	}
 
 
@@ -1098,7 +1098,7 @@ 
 	 * @return EE_Transaction
 	 */
 	public function transaction() {
-		return $this->get_first_related( 'Transaction' );
+		return $this->get_first_related('Transaction');
 	}
 
 
@@ -1111,17 +1111,17 @@ 
 	 * @param int $txn_id if none is provided, assumes $this->TXN_ID()
 	 * @return int count of items saved
 	 */
-	public function save_this_and_descendants_to_txn( $txn_id = NULL ) {
-		if ( ! $txn_id ) {
+	public function save_this_and_descendants_to_txn($txn_id = NULL) {
+		if ( ! $txn_id) {
 			$txn_id = $this->TXN_ID();
 		}
-		$this->set_TXN_ID( $txn_id );
+		$this->set_TXN_ID($txn_id);
 		$children = $this->children();
 		$this->save();
-		foreach ( $children as $child_line_item ) {
-			if ( $child_line_item instanceof EE_Line_Item ) {
-				$child_line_item->set_parent_ID( $this->ID() );
-				$child_line_item->save_this_and_descendants_to_txn( $txn_id );
+		foreach ($children as $child_line_item) {
+			if ($child_line_item instanceof EE_Line_Item) {
+				$child_line_item->set_parent_ID($this->ID());
+				$child_line_item->save_this_and_descendants_to_txn($txn_id);
 			}
 		}
 	}
@@ -1133,10 +1133,10 @@ 
 	 * @param string $type one of the constants on EEM_Line_Item
 	 * @return EE_Line_Item[]
 	 */
-	protected function _get_descendants_of_type( $type ) {
-		EE_Error::doing_it_wrong( 'EE_Line_Item::_get_descendants_of_type()', __('Method replaced with EEH_Line_Item::get_descendants_of_type()', 'event_espresso'), '4.6.0' );
-		EE_Registry::instance()->load_helper( 'Line_Item' );
-		return EEH_Line_Item::get_descendants_of_type( $this, $type );
+	protected function _get_descendants_of_type($type) {
+		EE_Error::doing_it_wrong('EE_Line_Item::_get_descendants_of_type()', __('Method replaced with EEH_Line_Item::get_descendants_of_type()', 'event_espresso'), '4.6.0');
+		EE_Registry::instance()->load_helper('Line_Item');
+		return EEH_Line_Item::get_descendants_of_type($this, $type);
 	}
 
 
@@ -1146,10 +1146,10 @@ 
 	 * @param string $type like one of the EEM_Line_Item::type_*
 	 * @return EE_Line_Item
 	 */
-	public function get_nearest_descendant_of_type( $type ) {
-		EE_Error::doing_it_wrong( 'EE_Line_Item::get_nearest_descendant_of_type()', __('Method replaced with EEH_Line_Item::get_nearest_descendant_of_type()', 'event_espresso'), '4.6.0' );
-		EE_Registry::instance()->load_helper( 'Line_Item' );
-		return EEH_Line_Item::get_nearest_descendant_of_type( $this, $type );
+	public function get_nearest_descendant_of_type($type) {
+		EE_Error::doing_it_wrong('EE_Line_Item::get_nearest_descendant_of_type()', __('Method replaced with EEH_Line_Item::get_nearest_descendant_of_type()', 'event_espresso'), '4.6.0');
+		EE_Registry::instance()->load_helper('Line_Item');
+		return EEH_Line_Item::get_nearest_descendant_of_type($this, $type);
 	}
 
 
@@ -1160,7 +1160,7 @@ 
 	 * @return int count of items saved
 	 */
 	public function maybe_save() {
-		if ( $this->ID() ) {
+		if ($this->ID()) {
 			return $this->save();
 		}
 		return false;

core/db_classes/EE_Message_Template.class.php

Doc Comments +2 added lines, -2 removed lines

@@ -68,7 +68,7 @@ 
 	/**
 	 * get Group ID
 	 * @access public
-	 * @return int
+	 * @return boolean
 	 */
 	public function GRP_ID() {
 		return $this->get( 'GRP_ID' );
@@ -79,7 +79,7 @@ 
 	/**
 	 * get User ID
 	 * @access public
-	 * @return int
+	 * @return boolean
 	 */
 	public function user() {
 		return $this->get_first_related( 'Message_Template_Group' )->get( 'MTP_user_id' );

Spacing +23 added lines, -23 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,9 +34,9 @@ 
 	 * @param string $timezone
 	 * @return EE_Message_Template|mixed
 	 */
-	public static function new_instance( $props_n_values = array(), $timezone = '' ) {
-		$has_object = parent::_check_for_object( $props_n_values, __CLASS__, $timezone );
-		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__, $timezone);
+		return $has_object ? $has_object : new self($props_n_values, FALSE, $timezone);
 	}
 
 
@@ -46,8 +46,8 @@ 
 	 * @param string $timezone
 	 * @return EE_Message_Template
 	 */
-	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);
 	}
 
 
@@ -56,11 +56,11 @@ 
 	 * @param bool $GRP_ID
 	 * @throws EE_Error
 	 */
-	public function set_group_template_id( $GRP_ID = FALSE ) {
-		if ( ! $GRP_ID ) {
-			throw new EE_Error( __( 'Missing required value for the message template group id', 'event_espresso' ) );
+	public function set_group_template_id($GRP_ID = FALSE) {
+		if ( ! $GRP_ID) {
+			throw new EE_Error(__('Missing required value for the message template group id', 'event_espresso'));
 		}
-		$this->set( 'GRP_ID', $GRP_ID );
+		$this->set('GRP_ID', $GRP_ID);
 	}
 
 
@@ -71,7 +71,7 @@ 
 	 * @return int
 	 */
 	public function GRP_ID() {
-		return $this->get( 'GRP_ID' );
+		return $this->get('GRP_ID');
 	}
 
 
@@ -82,7 +82,7 @@ 
 	 * @return int
 	 */
 	public function user() {
-		return $this->get_first_related( 'Message_Template_Group' )->get( 'MTP_user_id' );
+		return $this->get_first_related('Message_Template_Group')->get('MTP_user_id');
 	}
 
 
@@ -93,7 +93,7 @@ 
 	 * @return string
 	 */
 	public function messenger() {
-		return $this->get_first_related( 'Message_Template_Group' )->messenger();
+		return $this->get_first_related('Message_Template_Group')->messenger();
 	}
 
 
@@ -105,7 +105,7 @@ 
 	 * @return object Messenger Object for the given messenger
 	 */
 	public function messenger_obj() {
-		return $this->get_first_related( 'Message_Template_Group' )->messenger_obj();
+		return $this->get_first_related('Message_Template_Group')->messenger_obj();
 	}
 
 
@@ -117,7 +117,7 @@ 
 	 * @return string
 	 */
 	public function message_type() {
-		return $this->get_first_related( 'Message_Template_Group' )->message_type();
+		return $this->get_first_related('Message_Template_Group')->message_type();
 	}
 
 
@@ -129,7 +129,7 @@ 
 	 * @return object  Message Type object for the given message type
 	 */
 	public function message_type_obj() {
-		return $this->get_first_related( 'Message_Template_Group' )->message_type_obj();
+		return $this->get_first_related('Message_Template_Group')->message_type_obj();
 	}
 
 
@@ -141,7 +141,7 @@ 
 	 * @return array array of contexts and their configuration.
 	 */
 	public function contexts_config() {
-		return $this->get_first_related( 'Message_Template_Group' )->contexts_config();
+		return $this->get_first_related('Message_Template_Group')->contexts_config();
 	}
 
 
@@ -153,7 +153,7 @@ 
 	 * @return string label for "context"
 	 */
 	public function context_label() {
-		return $this->get_first_related( 'Message_Template_Group' )->context_label();
+		return $this->get_first_related('Message_Template_Group')->context_label();
 	}
 
 
@@ -163,7 +163,7 @@ 
 	 * @return boolean true if it is, false if it isn't
 	 */
 	public function is_global() {
-		return $this->get_first_related( 'Message_Template_Group' )->is_global();
+		return $this->get_first_related('Message_Template_Group')->is_global();
 	}
 
 
@@ -173,7 +173,7 @@ 
 	 * @return boolean true if it is, false if it isn't
 	 */
 	public function is_active() {
-		return $this->get_first_related( 'Message_Template_Group' )->is_active();
+		return $this->get_first_related('Message_Template_Group')->is_active();
 	}
 
 
@@ -186,7 +186,7 @@ 
 	 * @param array  $fields  what fields we're returning valid shortcodes for.  If empty then we assume all fields are to be merged and returned.
 	 * @return mixed (array|bool) an array of shortcodes in the format array( '[shortcode] => 'label') OR FALSE if no shortcodes found.
 	 */
-	public function get_shortcodes( $context, $fields = array() ) {
-		return $this->get_first_related( 'Message_Template_Group' )->get_shortcodes( $context, $fields );
+	public function get_shortcodes($context, $fields = array()) {
+		return $this->get_first_related('Message_Template_Group')->get_shortcodes($context, $fields);
 	}
 }

core/db_classes/EE_Message_Template_Group.class.php

Doc Comments +6 added lines, -6 removed lines

@@ -94,7 +94,7 @@ 
 	/**
 	 * get Group ID
 	 * @access public
-	 * @return int
+	 * @return boolean
 	 */
 	public function GRP_ID() {
 		return $this->get( 'GRP_ID' );
@@ -139,7 +139,7 @@ 
 
 	/**
 	 * returns the name saved in the db for this template
-	 * @return string
+	 * @return boolean
 	 */
 	public function name() {
 		return $this->get( 'MTP_name' );
@@ -149,7 +149,7 @@ 
 
 	/**
 	 * Returns the description saved in the db for this template group
-	 * @return string
+	 * @return boolean
 	 */
 	public function description() {
 		return $this->get( 'MTP_description' );
@@ -171,7 +171,7 @@ 
 	/**
 	 * get Message Messenger
 	 * @access public
-	 * @return string
+	 * @return boolean
 	 */
 	public function messenger() {
 		return $this->get( 'MTP_messenger' );
@@ -208,7 +208,7 @@ 
 	 * get Message Type
 	 *
 	 * @access public
-	 * @return string
+	 * @return boolean
 	 */
 	public function message_type() {
 		return $this->get( 'MTP_message_type' );
@@ -224,7 +224,7 @@ 
 	 * appropriately.
 	 *
 	 * @throws EE_Error
-	 * @return EE_message_type|false if exception thrown.
+	 * @return null|EE_message_type if exception thrown.
 	 */
 	public function message_type_obj() {
 		$message_type = $this->message_type();

Spacing +64 added lines, -64 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,9 +34,9 @@ 
 	 * @param string $timezone
 	 * @return EE_Message_Template_Group|mixed
 	 */
-	public static function new_instance( $props_n_values = array(), $timezone = '' ) {
-		$has_object = parent::_check_for_object( $props_n_values, __CLASS__, $timezone );
-		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__, $timezone);
+		return $has_object ? $has_object : new self($props_n_values, FALSE, $timezone);
 	}
 
 
@@ -46,8 +46,8 @@ 
 	 * @param string $timezone
 	 * @return EE_Message_Template_Group
 	 */
-	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);
 	}
 
 
@@ -56,11 +56,11 @@ 
 	 * @param bool $message_type
 	 * @throws EE_Error
 	 */
-	public function set_message_type( $message_type = FALSE ) {
-		if ( ! $message_type ) {
-			throw new EE_Error( __( 'Missing required value for the message_type parameter', 'event_espresso' ) );
+	public function set_message_type($message_type = FALSE) {
+		if ( ! $message_type) {
+			throw new EE_Error(__('Missing required value for the message_type parameter', 'event_espresso'));
 		}
-		$this->set( 'MTP_message_type', $message_type );
+		$this->set('MTP_message_type', $message_type);
 	}
 
 
@@ -69,11 +69,11 @@ 
 	 * @param bool $messenger
 	 * @throws EE_Error
 	 */
-	public function set_messenger( $messenger = FALSE ) {
-		if ( ! $messenger ) {
-			throw new EE_Error( __( 'Missing required value for the messenger parameter', 'event_espresso' ) );
+	public function set_messenger($messenger = FALSE) {
+		if ( ! $messenger) {
+			throw new EE_Error(__('Missing required value for the messenger parameter', 'event_espresso'));
 		}
-		$this->set( 'MTP_messenger', $messenger );
+		$this->set('MTP_messenger', $messenger);
 	}
 
 
@@ -82,11 +82,11 @@ 
 	 * @param bool $GRP_ID
 	 * @throws EE_Error
 	 */
-	public function set_group_template_id( $GRP_ID = FALSE ) {
-		if ( ! $GRP_ID ) {
-			throw new EE_Error( __( 'Missing required value for the message template group id', 'event_espresso' ) );
+	public function set_group_template_id($GRP_ID = FALSE) {
+		if ( ! $GRP_ID) {
+			throw new EE_Error(__('Missing required value for the message template group id', 'event_espresso'));
 		}
-		$this->set( 'GRP_ID', $GRP_ID );
+		$this->set('GRP_ID', $GRP_ID);
 	}
 
 
@@ -97,7 +97,7 @@ 
 	 * @return int
 	 */
 	public function GRP_ID() {
-		return $this->get( 'GRP_ID' );
+		return $this->get('GRP_ID');
 	}
 
 
@@ -108,8 +108,8 @@ 
 	 * @return int
 	 */
 	public function user() {
-		$user_id = $this->get( 'MTP_user_id' );
-		return empty( $user_id ) ? get_current_user_id() : $user_id;
+		$user_id = $this->get('MTP_user_id');
+		return empty($user_id) ? get_current_user_id() : $user_id;
 	}
 
 
@@ -132,7 +132,7 @@ 
 	 * @return int
 	 */
 	public function count_events() {
-		return $this->count_related( 'Event' );
+		return $this->count_related('Event');
 	}
 
 
@@ -142,7 +142,7 @@ 
 	 * @return string
 	 */
 	public function name() {
-		return $this->get( 'MTP_name' );
+		return $this->get('MTP_name');
 	}
 
 
@@ -152,7 +152,7 @@ 
 	 * @return string
 	 */
 	public function description() {
-		return $this->get( 'MTP_description' );
+		return $this->get('MTP_description');
 	}
 
 
@@ -162,8 +162,8 @@ 
 	 * @param  array $query_params like EEM_Base::get_all()
 	 * @return EE_Message_Template[]
 	 */
-	public function message_templates( $query_params = array() ) {
-		return $this->get_many_related( 'Message_Template', $query_params );
+	public function message_templates($query_params = array()) {
+		return $this->get_many_related('Message_Template', $query_params);
 	}
 
 
@@ -174,7 +174,7 @@ 
 	 * @return string
 	 */
 	public function messenger() {
-		return $this->get( 'MTP_messenger' );
+		return $this->get('MTP_messenger');
 	}
 
 
@@ -190,12 +190,12 @@ 
 	 */
 	public function messenger_obj() {
 		$messenger = $this->messenger();
-		EE_Registry::instance()->load_helper( 'MSG_Template' );
+		EE_Registry::instance()->load_helper('MSG_Template');
 		try {
-			$messenger = EEH_MSG_Template::messenger_obj( $messenger );
-		} catch( EE_Error $e ) {
+			$messenger = EEH_MSG_Template::messenger_obj($messenger);
+		} catch (EE_Error $e) {
 			//if an exception was thrown then let's deactivate this message template group because it means there is no class for this messenger in this group.
-			$this->set( 'MTP_is_active', false );
+			$this->set('MTP_is_active', false);
 			$this->save();
 			return null;
 		}
@@ -211,7 +211,7 @@ 
 	 * @return string
 	 */
 	public function message_type() {
-		return $this->get( 'MTP_message_type' );
+		return $this->get('MTP_message_type');
 	}
 
 
@@ -228,12 +228,12 @@ 
 	 */
 	public function message_type_obj() {
 		$message_type = $this->message_type();
-		EE_Registry::instance()->load_helper( 'MSG_Template' );
+		EE_Registry::instance()->load_helper('MSG_Template');
 		try {
-			$message_type = EEH_MSG_Template::message_type_obj( $message_type );
-		} catch(EE_Error $e) {
+			$message_type = EEH_MSG_Template::message_type_obj($message_type);
+		} catch (EE_Error $e) {
 			//if an exception was thrown then let's deactivate this message template group because it means there is no class for the message type in this group.
-			$this->set( 'MTP_is_active', false );
+			$this->set('MTP_is_active', false);
 			$this->save();
 			return null;
 		}
@@ -270,13 +270,13 @@ 
 	 */
 	public function context_templates() {
 		$mtps_arr = array();
-		$mtps = $this->get_many_related( 'Message_Template' );
-		if ( empty( $mtps ) ) {
+		$mtps = $this->get_many_related('Message_Template');
+		if (empty($mtps)) {
 			return array();
 		}
 		//note contexts could have CHECKBOX fields per context. So we return the objects indexed by context AND field.
-		foreach ( $mtps as $mtp ) {
-			$mtps_arr[ $mtp->get( 'MTP_context' ) ][ $mtp->get( 'MTP_template_field' ) ] = $mtp;
+		foreach ($mtps as $mtp) {
+			$mtps_arr[$mtp->get('MTP_context')][$mtp->get('MTP_template_field')] = $mtp;
 		}
 		return $mtps_arr;
 	}
@@ -288,7 +288,7 @@ 
 	 * @return boolean true if it is, false if it isn't
 	 */
 	public function is_global() {
-		return $this->get( 'MTP_is_global' );
+		return $this->get('MTP_is_global');
 	}
 
 
@@ -298,7 +298,7 @@ 
 	 * @return boolean true if it is, false if it isn't
 	 */
 	public function is_active() {
-		return $this->get( 'MTP_is_active' );
+		return $this->get('MTP_is_active');
 	}
 
 
@@ -314,11 +314,11 @@ 
 	 * @param bool   $merged  If TRUE then we don't return shortcodes indexed by field but instead an array of the unique shortcodes for all the given (or all) fields.
 	 * @return mixed (array|bool) an array of shortcodes in the format array( '[shortcode] => 'label') OR FALSE if no shortcodes found.
 	 */
-	public function get_shortcodes( $context, $fields = array(), $merged = FALSE ) {
+	public function get_shortcodes($context, $fields = array(), $merged = FALSE) {
 		$messenger = $this->messenger();
 		$message_type = $this->message_type();
-		EE_Registry::instance()->load_helper( 'MSG_Template' );
-		return EEH_MSG_Template::get_shortcodes( $message_type, $messenger, $fields, $context, $merged );
+		EE_Registry::instance()->load_helper('MSG_Template');
+		return EEH_MSG_Template::get_shortcodes($message_type, $messenger, $fields, $context, $merged);
 	}
 
 
@@ -331,20 +331,20 @@ 
 	 * @throws EE_Error
 	 * @return array    an array of EE_Shortcode objects
 	 */
-	private function _get_shortcode_objects( $sc_refs ) {
+	private function _get_shortcode_objects($sc_refs) {
 		$sc_objs = array();
 		EED_Messages::set_autoloaders();
-		foreach ( $sc_refs as $shortcode_ref ) {
-			$ref = ucwords( str_replace( '_', ' ', $shortcode_ref ) );
-			$ref = str_replace( ' ', '_', $ref );
-			$classname = 'EE_' . $ref . '_Shortcodes';
-			if ( ! class_exists( $classname ) ) {
-				$msg[ ] = __( 'Shortcode library loading fail.', 'event_espresso' );
-				$msg[ ] = sprintf( __( 'The class name checked was "%s". Please check the spelling and case of this reference and make sure it matches the appropriate shortcode library file name (minus the extension) in the "/library/shortcodes/" directory', 'event_espresso' ), $classname );
-				throw new EE_Error( implode( '||', $msg ) );
+		foreach ($sc_refs as $shortcode_ref) {
+			$ref = ucwords(str_replace('_', ' ', $shortcode_ref));
+			$ref = str_replace(' ', '_', $ref);
+			$classname = 'EE_'.$ref.'_Shortcodes';
+			if ( ! class_exists($classname)) {
+				$msg[] = __('Shortcode library loading fail.', 'event_espresso');
+				$msg[] = sprintf(__('The class name checked was "%s". Please check the spelling and case of this reference and make sure it matches the appropriate shortcode library file name (minus the extension) in the "/library/shortcodes/" directory', 'event_espresso'), $classname);
+				throw new EE_Error(implode('||', $msg));
 			}
-			$a = new ReflectionClass( $classname );
-			$sc_objs[ ] = $a->newInstance();
+			$a = new ReflectionClass($classname);
+			$sc_objs[] = $a->newInstance();
 		}
 		return $sc_objs;
 	}
@@ -359,7 +359,7 @@ 
 	 * @return string
 	 */
 	public function get_template_pack_name() {
-		return $this->get_extra_meta( 'MTP_template_pack', TRUE, 'default' );
+		return $this->get_extra_meta('MTP_template_pack', TRUE, 'default');
 	}
 
 
@@ -375,7 +375,7 @@ 
 	public function get_template_pack() {
 		$pack_name = $this->get_template_pack_name();
 
-		return EED_Messages::get_template_pack( $pack_name );
+		return EED_Messages::get_template_pack($pack_name);
 	}
 
 
@@ -388,7 +388,7 @@ 
 	 * @return string
 	 */
 	public function get_template_pack_variation() {
-		return $this->get_extra_meta( 'MTP_variation', TRUE, 'default' );
+		return $this->get_extra_meta('MTP_variation', TRUE, 'default');
 	}
 
 
@@ -401,8 +401,8 @@ 
 	 *
 	 * @param string $template_pack_name What message template pack is assigned.
 	 */
-	public function set_template_pack_name( $template_pack_name ) {
-		return $this->update_extra_meta( 'MTP_template_pack', $template_pack_name );
+	public function set_template_pack_name($template_pack_name) {
+		return $this->update_extra_meta('MTP_template_pack', $template_pack_name);
 	}
 
 
@@ -415,8 +415,8 @@ 
 	 *
 	 * @param string $variation What variation is being set on the message template group.
 	 */
-	public function set_template_pack_variation( $variation ) {
-		return $this->update_extra_meta( 'MTP_variation', $variation );
+	public function set_template_pack_variation($variation) {
+		return $this->update_extra_meta('MTP_variation', $variation);
 	}
 }
 //end EE_Message_Template_Group class

core/db_classes/EE_Payment.class.php

Doc Comments +6 added lines, -6 removed lines

@@ -29,7 +29,7 @@ 
 	 * @param array $props_n_values  incoming values
 	 * @param string $timezone  incoming timezone (if not set the timezone set for the website will be
 	 *                          		used.)
-	 * @param array $date_formats  incoming date_formats in an array where the first value is the
+	 * @param string[] $date_formats  incoming date_formats in an array where the first value is the
 	 *                             		    date_format and the second value is the time format
 	 * @return EE_Attendee
 	 */
@@ -44,7 +44,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_Payment
 	 */
 	public static function new_instance_from_db( $props_n_values = array(), $timezone = null ) {
 		return new self( $props_n_values, TRUE, $timezone );
@@ -290,7 +290,7 @@ 
 	/**
 	 *        get Payment Amount
 	 * @access        public
-	 * @return float
+	 * @return boolean
 	 */
 	public function amount() {
 		return $this->get( 'PAY_amount' );
@@ -368,7 +368,7 @@ 
 
 	/**
 	 * Gets redirect_url
-	 * @return string
+	 * @return boolean
 	 */
 	function redirect_url() {
 		return $this->get('PAY_redirect_url');
@@ -378,7 +378,7 @@ 
 
 	/**
 	 * Gets redirect_args
-	 * @return array
+	 * @return boolean
 	 */
 	function redirect_args() {
 		return $this->get('PAY_redirect_args');
@@ -515,7 +515,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 );

Braces +4 added lines, -4 removed lines

@@ -142,7 +142,7 @@ 
 		EE_Error::doing_it_wrong('EE_Payment::gateway', __( 'The method EE_Payment::gateway() has been deprecated. Consider instead using EE_Payment::payment_method()->name()', 'event_espresso' ), '4.6.0' );
 		if( $this->payment_method() ){
 			return $this->payment_method()->name();
-		}else{
+		} else{
 			return __( 'Unknown', 'event_espresso' );
 		}
 	}
@@ -194,7 +194,7 @@ 
 	public function set_payment_made_via_admin( $via_admin = FALSE ) {
 		if($via_admin){
 			$this->set('PAY_source',  EEM_Payment_Method::scope_admin);
-		}else{
+		} else{
 			$this->set('PAY_source', EEM_Payment_Method::scope_cart);
 		}
 
@@ -618,7 +618,7 @@ 
 		}
 		if( is_array( $item ) ){
 			array_walk_recursive( $item, array( $this, '_strip_all_tags_within_array' ) );
-		}else{
+		} else{
 			$item = wp_strip_all_tags( $item );
 		}
 	}
@@ -634,7 +634,7 @@ 
 		$current_status = $this->status();
 		if( $original_status !== EEM_Payment::status_id_approved && $current_status === EEM_Payment::status_id_approved ){
 			return TRUE;
-		}else{
+		} else{
 			return FALSE;
 		}
 	}

Spacing +102 added lines, -102 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
@@ -22,7 +22,7 @@ 
  * @subpackage            includes/classes/EE_Payment.class.php
  * @author                Brent Christensen
  */
-class EE_Payment extends EE_Base_Class implements EEI_Payment{
+class EE_Payment extends EE_Base_Class implements EEI_Payment {
 
 	/**
 	 *
@@ -33,9 +33,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);
 	}
 
 
@@ -46,8 +46,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);
 	}
 
 
@@ -58,8 +58,8 @@ 
 	 * @access        public
 	 * @param int $TXN_ID
 	 */
-	public function set_transaction_id( $TXN_ID = 0 ) {
-		$this->set( 'TXN_ID', $TXN_ID );
+	public function set_transaction_id($TXN_ID = 0) {
+		$this->set('TXN_ID', $TXN_ID);
 	}
 
 
@@ -69,7 +69,7 @@ 
 	 * @return EE_Transaction
 	 */
 	public function transaction() {
-		return $this->get_first_related( 'Transaction' );
+		return $this->get_first_related('Transaction');
 	}
 
 
@@ -80,8 +80,8 @@ 
 	 * @access        public
 	 * @param        string $STS_ID
 	 */
-	public function set_status( $STS_ID = '' ) {
-		$this->set( 'STS_ID', $STS_ID );
+	public function set_status($STS_ID = '') {
+		$this->set('STS_ID', $STS_ID);
 	}
 
 
@@ -92,8 +92,8 @@ 
 	 * @access        public
 	 * @param        int $timestamp
 	 */
-	public function set_timestamp( $timestamp = 0 ) {
-		$this->set( 'PAY_timestamp', $timestamp );
+	public function set_timestamp($timestamp = 0) {
+		$this->set('PAY_timestamp', $timestamp);
 	}
 
 
@@ -104,8 +104,8 @@ 
 	* 		@access		public
 	*		@param		string		$PAY_source
 	*/
-	public function set_source( $PAY_source = '' ) {
-		$this->set('PAY_source',$PAY_source);
+	public function set_source($PAY_source = '') {
+		$this->set('PAY_source', $PAY_source);
 	}
 
 
@@ -116,8 +116,8 @@ 
 	 * @access        public
 	 * @param float $amount
 	 */
-	public function set_amount( $amount = 0.00 ) {
-		$this->set( 'PAY_amount', $amount );
+	public function set_amount($amount = 0.00) {
+		$this->set('PAY_amount', $amount);
 	}
 
 
@@ -128,8 +128,8 @@ 
 	 * @access        public
 	 * @param        string $gateway_response
 	 */
-	public function set_gateway_response( $gateway_response = '' ) {
-		$this->set( 'PAY_gateway_response', $gateway_response );
+	public function set_gateway_response($gateway_response = '') {
+		$this->set('PAY_gateway_response', $gateway_response);
 	}
 	/**
 	 * Returns the name of the paymetn method used on this payment (previously known merely as 'gateway')
@@ -138,12 +138,12 @@ 
 	 * @deprecated
 	 * @return string
 	 */
-	public function gateway(){
-		EE_Error::doing_it_wrong('EE_Payment::gateway', __( 'The method EE_Payment::gateway() has been deprecated. Consider instead using EE_Payment::payment_method()->name()', 'event_espresso' ), '4.6.0' );
-		if( $this->payment_method() ){
+	public function gateway() {
+		EE_Error::doing_it_wrong('EE_Payment::gateway', __('The method EE_Payment::gateway() has been deprecated. Consider instead using EE_Payment::payment_method()->name()', 'event_espresso'), '4.6.0');
+		if ($this->payment_method()) {
 			return $this->payment_method()->name();
-		}else{
-			return __( 'Unknown', 'event_espresso' );
+		} else {
+			return __('Unknown', 'event_espresso');
 		}
 	}
 
@@ -155,8 +155,8 @@ 
 	 * @access        public
 	 * @param        string $txn_id_chq_nmbr
 	 */
-	public function set_txn_id_chq_nmbr( $txn_id_chq_nmbr = '' ) {
-		$this->set( 'PAY_txn_id_chq_nmbr', $txn_id_chq_nmbr );
+	public function set_txn_id_chq_nmbr($txn_id_chq_nmbr = '') {
+		$this->set('PAY_txn_id_chq_nmbr', $txn_id_chq_nmbr);
 	}
 
 
@@ -167,8 +167,8 @@ 
 	 * @access        public
 	 * @param        string $po_number
 	 */
-	public function set_po_number( $po_number = '' ) {
-		$this->set( 'PAY_po_number', $po_number );
+	public function set_po_number($po_number = '') {
+		$this->set('PAY_po_number', $po_number);
 	}
 
 
@@ -179,8 +179,8 @@ 
 	 * @access        public
 	 * @param        string $extra_accntng
 	 */
-	public function set_extra_accntng( $extra_accntng = '' ) {
-		$this->set( 'PAY_extra_accntng', $extra_accntng );
+	public function set_extra_accntng($extra_accntng = '') {
+		$this->set('PAY_extra_accntng', $extra_accntng);
 	}
 
 
@@ -191,10 +191,10 @@ 
 	 * @access        public
 	 * @param        bool $via_admin
 	 */
-	public function set_payment_made_via_admin( $via_admin = FALSE ) {
-		if($via_admin){
-			$this->set('PAY_source',  EEM_Payment_Method::scope_admin);
-		}else{
+	public function set_payment_made_via_admin($via_admin = FALSE) {
+		if ($via_admin) {
+			$this->set('PAY_source', EEM_Payment_Method::scope_admin);
+		} else {
 			$this->set('PAY_source', EEM_Payment_Method::scope_cart);
 		}
 
@@ -208,13 +208,13 @@ 
 	 * @access        public
 	 * @param        string $details
 	 */
-	public function set_details( $details = '' ) {
-		if ( is_array( $details ) ) {
-			array_walk_recursive( $details, array( $this, '_strip_all_tags_within_array' ));
+	public function set_details($details = '') {
+		if (is_array($details)) {
+			array_walk_recursive($details, array($this, '_strip_all_tags_within_array'));
 		} else {
-			$details = wp_strip_all_tags( $details );
+			$details = wp_strip_all_tags($details);
 		}
-		$this->set( 'PAY_details', $details );
+		$this->set('PAY_details', $details);
 	}
 
 	/**
@@ -240,7 +240,7 @@ 
 	 * @access        public
 	 */
 	public function TXN_ID() {
-		return $this->get( 'TXN_ID' );
+		return $this->get('TXN_ID');
 	}
 
 
@@ -271,8 +271,8 @@ 
 	 * @param null $date_or_time
 	 * @return string
 	 */
-	public function timestamp( $dt_frmt = '', $tm_frmt = '', $date_or_time = NULL ) {
-		return $this->get_datetime('PAY_timestamp', $dt_frmt, $tm_frmt, $date_or_time );
+	public function timestamp($dt_frmt = '', $tm_frmt = '', $date_or_time = NULL) {
+		return $this->get_datetime('PAY_timestamp', $dt_frmt, $tm_frmt, $date_or_time);
 	}
 
 
@@ -293,7 +293,7 @@ 
 	 * @return float
 	 */
 	public function amount() {
-		return $this->get( 'PAY_amount' );
+		return $this->get('PAY_amount');
 	}
 
 
@@ -302,7 +302,7 @@ 
 	 * @return mixed
 	 */
 	public function amount_no_code() {
-		return $this->get_pretty( 'PAY_amount', 'no_currency_code' );
+		return $this->get_pretty('PAY_amount', 'no_currency_code');
 	}
 
 
@@ -312,7 +312,7 @@ 
 	 * @access        public
 	 */
 	public function gateway_response() {
-		return $this->get( 'PAY_gateway_response' );
+		return $this->get('PAY_gateway_response');
 	}
 
 
@@ -322,7 +322,7 @@ 
 	 * @access        public
 	 */
 	public function txn_id_chq_nmbr() {
-		return $this->get( 'PAY_txn_id_chq_nmbr' );
+		return $this->get('PAY_txn_id_chq_nmbr');
 	}
 
 
@@ -332,7 +332,7 @@ 
 	 * @access        public
 	 */
 	public function po_number() {
-		return $this->get( 'PAY_po_number' );
+		return $this->get('PAY_po_number');
 	}
 
 
@@ -342,7 +342,7 @@ 
 	 * @access        public
 	 */
 	public function extra_accntng() {
-		return $this->get( 'PAY_extra_accntng' );
+		return $this->get('PAY_extra_accntng');
 	}
 
 
@@ -362,7 +362,7 @@ 
 	 * @access        public
 	 */
 	public function details() {
-		return $this->get( 'PAY_details' );
+		return $this->get('PAY_details');
 	}
 
 
@@ -391,8 +391,8 @@ 
 	 * @param bool $show_icons
 	 * @return void
 	 */
-	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);
 	}
 
 
@@ -402,10 +402,10 @@ 
 	 * @param bool $show_icons
 	 * @return string
 	 */
-	public function pretty_status( $show_icons = FALSE ) {
-		$status = EEM_Status::instance()->localized_status( array( $this->STS_ID() => __( 'unknown', 'event_espresso' ) ), FALSE, 'sentence' );
+	public function pretty_status($show_icons = FALSE) {
+		$status = EEM_Status::instance()->localized_status(array($this->STS_ID() => __('unknown', 'event_espresso')), FALSE, 'sentence');
 		$icon = '';
-		switch ( $this->STS_ID() ) {
+		switch ($this->STS_ID()) {
 			case EEM_Payment::status_id_approved:
 				$icon = $show_icons ? '<span class="dashicons dashicons-yes ee-icon-size-24 green-text"></span>' : '';
 				break;
@@ -419,7 +419,7 @@ 
 				$icon = $show_icons ? '<span class="dashicons dashicons-no ee-icon-size-16 red-text"></span>' : '';
 				break;
 		}
-		return $icon . $status[ $this->STS_ID() ];
+		return $icon.$status[$this->STS_ID()];
 	}
 
 
@@ -430,7 +430,7 @@ 
 	 * @return boolean whether the payment is approved or not
 	 */
 	public function is_approved() {
-		return $this->status_is( EEM_Payment::status_id_approved );
+		return $this->status_is(EEM_Payment::status_id_approved);
 	}
 
 
@@ -442,8 +442,8 @@ 
 	 *                       one of the status_id_* on the EEM_Payment model
 	 * @return boolean whether the status of this payment equals the status id
 	 */
-	protected function status_is( $STS_ID ) {
-		if ( $STS_ID == $this->STS_ID() ) {
+	protected function status_is($STS_ID) {
+		if ($STS_ID == $this->STS_ID()) {
 			return TRUE;
 		} else {
 			return FALSE;
@@ -457,7 +457,7 @@ 
 	 * @return boolean whether the payment is pending or not
 	 */
 	public function is_pending() {
-		return $this->status_is( EEM_Payment::status_id_pending );
+		return $this->status_is(EEM_Payment::status_id_pending);
 	}
 
 
@@ -467,7 +467,7 @@ 
 	 * @return boolean
 	 */
 	public function is_cancelled() {
-		return $this->status_is( EEM_Payment::status_id_cancelled );
+		return $this->status_is(EEM_Payment::status_id_cancelled);
 	}
 
 
@@ -477,7 +477,7 @@ 
 	 * @return boolean
 	 */
 	public function is_declined() {
-		return $this->status_is( EEM_Payment::status_id_declined );
+		return $this->status_is(EEM_Payment::status_id_declined);
 	}
 
 
@@ -487,7 +487,7 @@ 
 	 * @return boolean
 	 */
 	public function is_failed() {
-		return $this->status_is( EEM_Payment::status_id_failed );
+		return $this->status_is(EEM_Payment::status_id_failed);
 	}
 
 
@@ -507,7 +507,7 @@ 
 	 * @return EE_Status
 	 */
 	public function status_obj() {
-		return $this->get_first_related( 'Status' );
+		return $this->get_first_related('Status');
 	}
 
 
@@ -517,8 +517,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);
 	}
 
 
@@ -529,7 +529,7 @@ 
 	 * offline ones, dont' create payments)
 	 * @return EE_Payment_Method
 	 */
-	function payment_method(){
+	function payment_method() {
 		return $this->get_first_related('Payment_Method');
 	}
 
@@ -546,12 +546,12 @@ 
 	 * @param string $inside_form_html
 	 * @return string html
 	 */
-	function redirect_form( $inside_form_html = NULL ) {
+	function redirect_form($inside_form_html = NULL) {
 		$redirect_url = $this->redirect_url();
-		if ( ! empty( $redirect_url )) {
+		if ( ! empty($redirect_url)) {
 			EE_Registry::instance()->load_helper('HTML');
 			// what ? no inner form content?
-			if( $inside_form_html === NULL ) {
+			if ($inside_form_html === NULL) {
 				$inside_form_html = EEH_HTML::p(
 					sprintf(
 						__('If you are not automatically redirected to the payment website within 10 seconds... %1$s %2$s Click Here %3$s', 'event_espresso'),
@@ -569,17 +569,17 @@ 
 			);
 			//if it's a GET request, we need to remove all the GET params in the querystring
 			//and put them into the form instead
-			if( $method == 'GET' ) {
-				$querystring = parse_url( $redirect_url, PHP_URL_QUERY );
+			if ($method == 'GET') {
+				$querystring = parse_url($redirect_url, PHP_URL_QUERY);
 				$get_params = null;
-				parse_str( $querystring, $get_params );
-				$inside_form_html .= $this->_args_as_inputs( $get_params );
-				$redirect_url = str_replace( '?' . $querystring, '', $redirect_url );
+				parse_str($querystring, $get_params);
+				$inside_form_html .= $this->_args_as_inputs($get_params);
+				$redirect_url = str_replace('?'.$querystring, '', $redirect_url);
 			}
-			$form = EEH_HTML::nl(1) . '<form method="' . $method . '" name="gateway_form" action="' . $redirect_url . '">';
-			$form .= EEH_HTML::nl(1) . $this->redirect_args_as_inputs();
+			$form = EEH_HTML::nl(1).'<form method="'.$method.'" name="gateway_form" action="'.$redirect_url.'">';
+			$form .= EEH_HTML::nl(1).$this->redirect_args_as_inputs();
 			$form .= $inside_form_html;
-			$form .= EEH_HTML::nl(-1) . '</form>' . EEH_HTML::nl(-1);
+			$form .= EEH_HTML::nl(-1).'</form>'.EEH_HTML::nl(-1);
 			return $form;
 		} else {
 			return NULL;
@@ -594,8 +594,8 @@ 
 	 * and returns the html as a string
 	 * @return string
 	 */
-	function redirect_args_as_inputs(){
-		return $this->_args_as_inputs( $this->redirect_args() );
+	function redirect_args_as_inputs() {
+		return $this->_args_as_inputs($this->redirect_args());
 	}
 	
 	/**
@@ -604,12 +604,12 @@ 
 	 * @param array $args key-value pairs
 	 * @return string
 	 */
-	protected function _args_as_inputs( $args ) {
+	protected function _args_as_inputs($args) {
 		$html = '';
-		if( $args !== NULL && is_array( $args )) {
+		if ($args !== NULL && is_array($args)) {
 			EE_Registry::instance()->load_helper('HTML');
-			foreach( $args as $name => $value){
-				$html .= EEH_HTML::nl(0) . '<input type="hidden" name="' . $name . '" value="' . esc_attr( $value ) . '"/>';
+			foreach ($args as $name => $value) {
+				$html .= EEH_HTML::nl(0).'<input type="hidden" name="'.$name.'" value="'.esc_attr($value).'"/>';
 			}
 		}
 		return $html;
@@ -624,7 +624,7 @@ 
 	 * object itself)
 	 * @return string for the currency code
 	 */
-	public function currency_code(){
+	public function currency_code() {
 		return EE_Config::instance()->currency->code;
 	}
 
@@ -638,14 +638,14 @@ 
 	 * @access        private
 	 * @param        mixed $item
 	 */
-	private function _strip_all_tags_within_array( &$item ) {
-		if( is_object( $item ) ) {
+	private function _strip_all_tags_within_array(&$item) {
+		if (is_object($item)) {
 			$item = (array) $item;
 		}
-		if( is_array( $item ) ){
-			array_walk_recursive( $item, array( $this, '_strip_all_tags_within_array' ) );
-		}else{
-			$item = wp_strip_all_tags( $item );
+		if (is_array($item)) {
+			array_walk_recursive($item, array($this, '_strip_all_tags_within_array'));
+		} else {
+			$item = wp_strip_all_tags($item);
 		}
 	}
 
@@ -654,13 +654,13 @@ 
 	 * is approved and was created during this request). False otherwise.
 	 * @return boolean
 	 */
-	public function just_approved(){
-		EE_Registry::instance()->load_helper( 'Array' );
-		$original_status =EEH_Array::is_set( $this->_props_n_values_provided_in_constructor, 'STS_ID', $this->get_model()->field_settings_for( 'STS_ID' )->get_default_value() );
+	public function just_approved() {
+		EE_Registry::instance()->load_helper('Array');
+		$original_status = EEH_Array::is_set($this->_props_n_values_provided_in_constructor, 'STS_ID', $this->get_model()->field_settings_for('STS_ID')->get_default_value());
 		$current_status = $this->status();
-		if( $original_status !== EEM_Payment::status_id_approved && $current_status === EEM_Payment::status_id_approved ){
+		if ($original_status !== EEM_Payment::status_id_approved && $current_status === EEM_Payment::status_id_approved) {
 			return TRUE;
-		}else{
+		} else {
 			return FALSE;
 		}
 	}
@@ -672,11 +672,11 @@ 
 	 * @param string         $extra_cache_ref This allows the user to specify an extra cache ref for the given property (in cases where the same property may be used for different outputs - i.e. datetime, money etc.)
 	 * @return mixed
 	 */
-	public function get_pretty($field_name, $extra_cache_ref = NULL){
-		if( $field_name == 'PAY_gateway' ){
+	public function get_pretty($field_name, $extra_cache_ref = NULL) {
+		if ($field_name == 'PAY_gateway') {
 			return $this->gateway();
 		}
-		return  $this->_get_cached_property( $field_name, TRUE, $extra_cache_ref );
+		return  $this->_get_cached_property($field_name, TRUE, $extra_cache_ref);
 	}
 
 
@@ -686,8 +686,8 @@ 
 	 * @param array $query_params like EEM_Base::get_all
 	 * @return EE_Registration_Payment[]
 	 */
-	public function registration_payments( $query_params = array() ) {
-		return $this->get_many_related( 'Registration_Payment', $query_params );
+	public function registration_payments($query_params = array()) {
+		return $this->get_many_related('Registration_Payment', $query_params);
 	}
 
 

Indentation +17 added lines, -17 removed lines

@@ -99,11 +99,11 @@ 
 
 
 	/**
-	*		Set Payment Method
-	*
-	* 		@access		public
-	*		@param		string		$PAY_source
-	*/
+	 *		Set Payment Method
+	 *
+	 * 		@access		public
+	 *		@param		string		$PAY_source
+	 */
 	public function set_source( $PAY_source = '' ) {
 		$this->set('PAY_source',$PAY_source);
 	}
@@ -246,16 +246,16 @@ 
 
 
 	/**
-	*		get Payment Status
-	* 		@access		public
-	*/
+	 *		get Payment Status
+	 * 		@access		public
+	 */
 	public function status() {
 		return $this->get('STS_ID');
 	}
 	/**
-	*		get Payment Status
-	* 		@access		public
-	*/
+	 *		get Payment Status
+	 * 		@access		public
+	 */
 	public function STS_ID() {
 		return $this->get('STS_ID');
 	}
@@ -278,9 +278,9 @@ 
 
 
 	/**
-	*		get Payment Source
-	* 		@access		public
-	*/
+	 *		get Payment Source
+	 * 		@access		public
+	 */
 	public function source() {
 		return $this->get('PAY_source');
 	}
@@ -348,9 +348,9 @@ 
 
 
 	/**
-	*		get Payment made via admin source
-	* 		@access		public
-	*/
+	 *		get Payment made via admin source
+	 * 		@access		public
+	 */
 	public function payment_made_via_admin() {
 		return ($this->get('PAY_source') == EEM_Payment_Method::scope_admin);
 	}

core/db_classes/EE_Price.class.php

Doc Comments +8 added lines, -8 removed lines

@@ -46,7 +46,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_Price
 	 */
 	public static function new_instance_from_db( $props_n_values = array(), $timezone = null ) {
 		return new self( $props_n_values, TRUE, $timezone );
@@ -129,7 +129,7 @@ 
 	/**
 	 *    get Price type
 	 * @access        public
-	 * @return        int
+	 * @return        boolean
 	 */
 	public function type() {
 		return $this->get( 'PRT_ID' );
@@ -140,7 +140,7 @@ 
 	/**
 	 *    get Price Amount
 	 * @access        public
-	 * @return        float
+	 * @return        boolean
 	 */
 	public function amount() {
 		return $this->get( 'PRC_amount' );
@@ -151,7 +151,7 @@ 
 	/**
 	 *    get Price Name
 	 * @access        public
-	 * @return        string
+	 * @return        boolean
 	 */
 	public function name() {
 		return $this->get( 'PRC_name' );
@@ -162,7 +162,7 @@ 
 	/**
 	 *    get Price description
 	 * @access        public
-	 * @return        string
+	 * @return        boolean
 	 */
 	public function desc() {
 		return $this->get( 'PRC_desc' );
@@ -173,7 +173,7 @@ 
 	/**
 	 *    get overrides
 	 * @access        public
-	 * @return        int
+	 * @return        boolean
 	 */
 	public function overrides() {
 		return $this->get( 'PRC_overrides' );
@@ -184,7 +184,7 @@ 
 	/**
 	 *    get order
 	 * @access        public
-	 * @return        int
+	 * @return        boolean
 	 */
 	public function order() {
 		return $this->get( 'PRC_order' );
@@ -197,7 +197,7 @@ 
 	 *
 	 * @since 4.5.0
 	 *
-	 * @return int
+	 * @return boolean
 	 */
 	public function wp_user() {
 		return $this->get('PRC_wp_user');

Spacing +32 added lines, -32 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
@@ -35,9 +35,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);
 	}
 
 
@@ -48,8 +48,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);
 	}
 
 
@@ -60,8 +60,8 @@ 
 	 * @access        public
 	 * @param        int $PRT_ID
 	 */
-	public function set_type( $PRT_ID = 0 ) {
-		$this->set( 'PRT_ID', $PRT_ID );
+	public function set_type($PRT_ID = 0) {
+		$this->set('PRT_ID', $PRT_ID);
 	}
 
 
@@ -72,8 +72,8 @@ 
 	 * @access        public
 	 * @param        float $PRC_amount
 	 */
-	public function set_amount( $PRC_amount = 0.00 ) {
-		$this->set( 'PRC_amount', $PRC_amount );
+	public function set_amount($PRC_amount = 0.00) {
+		$this->set('PRC_amount', $PRC_amount);
 	}
 
 
@@ -84,8 +84,8 @@ 
 	 * @access        public
 	 * @param        string $PRC_name
 	 */
-	public function set_name( $PRC_name = '' ) {
-		$this->set( 'PRC_name', $PRC_name );
+	public function set_name($PRC_name = '') {
+		$this->set('PRC_name', $PRC_name);
 	}
 
 
@@ -96,8 +96,8 @@ 
 	 * @access        public
 	 * @param        string $PRC_desc
 	 */
-	public function set_description( $PRC_desc = '' ) {
-		$this->Set( 'PRC_desc', $PRC_desc );
+	public function set_description($PRC_desc = '') {
+		$this->Set('PRC_desc', $PRC_desc);
 	}
 
 
@@ -108,8 +108,8 @@ 
 	* 		@access		public
 	*		@param		bool		$PRC_is_default
 	*/
-	public function set_is_default( $PRC_is_default = FALSE ) {
-		$this->set( 'PRC_is_default', $PRC_is_default );
+	public function set_is_default($PRC_is_default = FALSE) {
+		$this->set('PRC_is_default', $PRC_is_default);
 	}
 
 
@@ -120,8 +120,8 @@ 
 	* 		@access		public
 	*		@param		bool		$PRC_deleted
 	*/
-	public function set_deleted( $PRC_deleted = NULL ) {
-		$this->set( 'PRC_deleted', $PRC_deleted );
+	public function set_deleted($PRC_deleted = NULL) {
+		$this->set('PRC_deleted', $PRC_deleted);
 	}
 
 
@@ -132,7 +132,7 @@ 
 	 * @return        int
 	 */
 	public function type() {
-		return $this->get( 'PRT_ID' );
+		return $this->get('PRT_ID');
 	}
 
 
@@ -143,7 +143,7 @@ 
 	 * @return        float
 	 */
 	public function amount() {
-		return $this->get( 'PRC_amount' );
+		return $this->get('PRC_amount');
 	}
 
 
@@ -154,7 +154,7 @@ 
 	 * @return        string
 	 */
 	public function name() {
-		return $this->get( 'PRC_name' );
+		return $this->get('PRC_name');
 	}
 
 
@@ -165,7 +165,7 @@ 
 	 * @return        string
 	 */
 	public function desc() {
-		return $this->get( 'PRC_desc' );
+		return $this->get('PRC_desc');
 	}
 
 
@@ -176,7 +176,7 @@ 
 	 * @return        int
 	 */
 	public function overrides() {
-		return $this->get( 'PRC_overrides' );
+		return $this->get('PRC_overrides');
 	}
 
 
@@ -187,7 +187,7 @@ 
 	 * @return        int
 	 */
 	public function order() {
-		return $this->get( 'PRC_order' );
+		return $this->get('PRC_order');
 	}
 
 
@@ -211,7 +211,7 @@ 
 	 * @return        bool
 	 */
 	public function is_default() {
-		return $this->get( 'PRC_is_default' );
+		return $this->get('PRC_is_default');
 	}
 
 
@@ -222,7 +222,7 @@ 
 	 * @return        bool
 	 */
 	public function deleted() {
-		return $this->get( 'PRC_deleted' );
+		return $this->get('PRC_deleted');
 	}
 
 
@@ -231,7 +231,7 @@ 
 	 * @return bool
 	 */
 	public function parent() {
-		return $this->get( 'PRC_parent' );
+		return $this->get('PRC_parent');
 	}
 
 
@@ -253,7 +253,7 @@ 
 	 * @return EE_Price_Type
 	 */
 	public function type_obj() {
-		return $this->get_first_related( 'Price_Type' );
+		return $this->get_first_related('Price_Type');
 	}
 
 
@@ -275,7 +275,7 @@ 
 	 */
 	public function is_percent() {
 		$price_type = $this->type_obj();
-		return $price_type->get( 'PRT_is_percent' );
+		return $price_type->get('PRT_is_percent');
 	}
 
 
@@ -287,7 +287,7 @@ 
 	 * @return string
 	 */
 	public function pretty_price() {
-		return ! $this->is_percent() ? $this->get_pretty('PRC_amount') : $this->get('PRC_amount') . '%';
+		return ! $this->is_percent() ? $this->get_pretty('PRC_amount') : $this->get('PRC_amount').'%';
 	}
 
 
@@ -296,7 +296,7 @@ 
 	 * @return mixed
 	 */
 	public function get_price_without_currency_symbol() {
-		return str_replace( EE_Registry::instance()->CFG->currency->sign, '', $this->get_pretty( 'PRC_amount' ) );
+		return str_replace(EE_Registry::instance()->CFG->currency->sign, '', $this->get_pretty('PRC_amount'));
 	}
 }
 

Indentation +10 added lines, -10 removed lines

@@ -103,11 +103,11 @@ 
 
 
 	/**
-	*		set is_default
-	*
-	* 		@access		public
-	*		@param		bool		$PRC_is_default
-	*/
+	 *		set is_default
+	 *
+	 * 		@access		public
+	 *		@param		bool		$PRC_is_default
+	 */
 	public function set_is_default( $PRC_is_default = FALSE ) {
 		$this->set( 'PRC_is_default', $PRC_is_default );
 	}
@@ -115,11 +115,11 @@ 
 
 
 	/**
-	*		set deleted
-	*
-	* 		@access		public
-	*		@param		bool		$PRC_deleted
-	*/
+	 *		set deleted
+	 *
+	 * 		@access		public
+	 *		@param		bool		$PRC_deleted
+	 */
 	public function set_deleted( $PRC_deleted = NULL ) {
 		$this->set( 'PRC_deleted', $PRC_deleted );
 	}

core/db_classes/EE_Price_Type.class.php

Doc Comments +1 added lines, -1 removed lines

@@ -156,7 +156,7 @@
 	 *
 	 * @since 4.5.0
 	 *
-	 * @return int
+	 * @return boolean
 	 */
 	public function wp_user() {
 		return $this->get('PRT_wp_user');

Spacing +22 added lines, -22 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_Price_Type
 	 */
-	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_Price_Type
 	 */
-	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,8 +55,8 @@ 
 	 * @access        public
 	 * @param        string $PRT_name
 	 */
-	public function set_name( $PRT_name = '' ) {
-		$this->set( 'PRT_name', $PRT_name );
+	public function set_name($PRT_name = '') {
+		$this->set('PRT_name', $PRT_name);
 	}
 
 
@@ -67,8 +67,8 @@ 
 	 * @access        public
 	 * @param        bool $PRT_is_percent
 	 */
-	public function set_is_percent( $PRT_is_percent = FALSE ) {
-		$this->set( 'PRT_is_percent', $PRT_is_percent );
+	public function set_is_percent($PRT_is_percent = FALSE) {
+		$this->set('PRT_is_percent', $PRT_is_percent);
 	}
 
 
@@ -79,8 +79,8 @@ 
 	 * @access        public
 	 * @param        int $PRT_order
 	 */
-	public function set_order( $PRT_order = 0 ) {
-		$this->set( 'PRT_order', $PRT_order );
+	public function set_order($PRT_order = 0) {
+		$this->set('PRT_order', $PRT_order);
 	}
 
 
@@ -89,7 +89,7 @@ 
 	 *
 	 */
 	public function move_to_trash() {
-		$this->set( 'PRT_deleted', TRUE );
+		$this->set('PRT_deleted', TRUE);
 	}
 
 
@@ -98,7 +98,7 @@ 
 	 *
 	 */
 	public function restore_from_trash() {
-		$this->set( 'PRT_deleted', FALSE );
+		$this->set('PRT_deleted', FALSE);
 	}
 
 
@@ -108,7 +108,7 @@ 
 	 * @access        public
 	 */
 	public function name() {
-		return $this->get( 'PRT_name' );
+		return $this->get('PRT_name');
 	}
 
 
@@ -118,7 +118,7 @@ 
 	 * @access        public
 	 */
 	public function base_type() {
-		return $this->get( 'PBT_ID' );
+		return $this->get('PBT_ID');
 	}
 
 
@@ -127,7 +127,7 @@ 
 	 * @return mixed
 	 */
 	public function base_type_name() {
-		return $this->get_pretty( 'PBT_ID' );
+		return $this->get_pretty('PBT_ID');
 	}
 
 
@@ -137,7 +137,7 @@ 
 	 * @access        public
 	 */
 	public function is_percent() {
-		return $this->get( 'PRT_is_percent' );
+		return $this->get('PRT_is_percent');
 	}
 
 
@@ -146,7 +146,7 @@ 
 	 * @return bool
 	 */
 	public function is_discount() {
-		return $this->get( 'PBT_ID' ) == 2 ? TRUE : FALSE;
+		return $this->get('PBT_ID') == 2 ? TRUE : FALSE;
 	}
 
 
@@ -169,7 +169,7 @@ 
 	 * @access        public
 	 */
 	public function order() {
-		return $this->get( 'PRT_order' );
+		return $this->get('PRT_order');
 	}
 
 
@@ -179,7 +179,7 @@ 
 	 * @access        public
 	 */
 	public function deleted() {
-		return $this->get( 'PRT_deleted' );
+		return $this->get('PRT_deleted');
 	}
 }
 

core/db_classes/EE_Question_Form_Input.class.php

Doc Comments +5 added lines, -5 removed lines

@@ -226,7 +226,7 @@ 
 	 *        generate_question_form_inputs_for_object
 	 *
 	 * @access    protected
-	 * @param bool|object $object $object
+	 * @param EE_Base_Class|null $object $object
 	 * @param    array    $input_types
 	 * @return        array
 	 */
@@ -324,7 +324,7 @@ 
 	 *    add_temp_option
 	 * @access public
 	 * @param \EE_Question_Option $QSO EE_Question_Option
-	 * @return boolean
+	 * @return boolean|null
 	 */
 	public function add_temp_option( EE_Question_Option $QSO ) {
 		$this->_QST->add_temp_option( $QSO );
@@ -336,8 +336,8 @@ 
 	 * set property values for question form input
 	 * @access public
 	 * @param    string $property
-	 * @param    mixed  $value
-	 * @return mixed
+	 * @param    boolean  $value
+	 * @return boolean|null
 	 */
 	public function set( $property = NULL, $value = NULL ) {
 		if ( ! empty( $property ) ) {
@@ -376,7 +376,7 @@ 
 	/**
 	 *    get_meta
 	 * @access public
-	 * @param mixed $key
+	 * @param string $key
 	 * @return mixed
 	 */
 	public function get_meta( $key = FALSE ) {

Spacing +76 added lines, -76 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
@@ -82,14 +82,14 @@ 
 	 * @access public
 	 * @return \EE_Question_Form_Input
 	 */
-	public function __construct( EE_Question $QST = NULL, EE_Answer $ANS = NULL, $q_meta = array() ) {
-		if ( empty( $QST ) || empty( $ANS ) ) {
-			EE_Error::add_error( __( 'An error occurred. A valid EE_Question or EE_Answer object was not received.', 'event_espresso' ), __FILE__, __FUNCTION__, __LINE__ );
+	public function __construct(EE_Question $QST = NULL, EE_Answer $ANS = NULL, $q_meta = array()) {
+		if (empty($QST) || empty($ANS)) {
+			EE_Error::add_error(__('An error occurred. A valid EE_Question or EE_Answer object was not received.', 'event_espresso'), __FILE__, __FUNCTION__, __LINE__);
 			return NULL;
 		}
 		$this->_QST = $QST;
 		$this->_ANS = $ANS;
-		$this->set_question_form_input_meta( $q_meta );
+		$this->set_question_form_input_meta($q_meta);
 		$this->set_question_form_input_init();
 	}
 
@@ -101,9 +101,9 @@ 
 	 * @param array $q_meta
 	 * @return void
 	 */
-	public function set_question_form_input_meta( $q_meta = array() ) {
-		$default_q_meta = array( 'att_nmbr' => 1, 'ticket_id' => '', 'date' => '', 'time' => '', 'input_name' => '', 'input_id' => '', 'input_class' => '', 'input_prefix' => 'qstn', 'append_qstn_id' => TRUE, 'htmlentities' => TRUE, 'allow_null' => FALSE );
-		$this->_QST_meta = array_merge( $default_q_meta, $q_meta );
+	public function set_question_form_input_meta($q_meta = array()) {
+		$default_q_meta = array('att_nmbr' => 1, 'ticket_id' => '', 'date' => '', 'time' => '', 'input_name' => '', 'input_id' => '', 'input_class' => '', 'input_prefix' => 'qstn', 'append_qstn_id' => TRUE, 'htmlentities' => TRUE, 'allow_null' => FALSE);
+		$this->_QST_meta = array_merge($default_q_meta, $q_meta);
 	}
 
 
@@ -115,10 +115,10 @@ 
 	 */
 	public function set_question_form_input_init() {
 		$qstn_id = $this->_QST->system_ID() ? $this->_QST->system_ID() : $this->_QST->ID();
-		$this->_set_input_name( $qstn_id );
-		$this->_set_input_id( $qstn_id );
-		$this->_set_input_class( $qstn_id );
-		$this->set_question_form_input_answer( $qstn_id );
+		$this->_set_input_name($qstn_id);
+		$this->_set_input_id($qstn_id);
+		$this->_set_input_class($qstn_id);
+		$this->set_question_form_input_answer($qstn_id);
 	}
 
 
@@ -129,12 +129,12 @@ 
 	 * @param $qstn_id
 	 * @return void
 	 */
-	private function _set_input_name( $qstn_id ) {
-		if ( ! empty( $qstn_id ) ) {
-			$ANS_ID = $this->get( 'ANS_ID' );
-			$qstn_id = ! empty( $ANS_ID ) ? '[' . $qstn_id . '][' . $ANS_ID . ']' : '[' . $qstn_id . ']';
+	private function _set_input_name($qstn_id) {
+		if ( ! empty($qstn_id)) {
+			$ANS_ID = $this->get('ANS_ID');
+			$qstn_id = ! empty($ANS_ID) ? '['.$qstn_id.']['.$ANS_ID.']' : '['.$qstn_id.']';
 		}
-		$this->QST_input_name = $this->_QST_meta[ 'append_qstn_id' ] && ! empty( $qstn_id ) ? $this->_QST_meta[ 'input_prefix' ] . $this->_QST_meta[ 'input_name' ] . $qstn_id : $this->_QST_meta[ 'input_prefix' ] . $this->_QST_meta[ 'input_name' ];
+		$this->QST_input_name = $this->_QST_meta['append_qstn_id'] && ! empty($qstn_id) ? $this->_QST_meta['input_prefix'].$this->_QST_meta['input_name'].$qstn_id : $this->_QST_meta['input_prefix'].$this->_QST_meta['input_name'];
 	}
 
 
@@ -145,13 +145,13 @@ 
 	 * @param    string $property
 	 * @return mixed
 	 */
-	public function get( $property = NULL ) {
-		if ( ! empty( $property ) ) {
-			if ( EEM_Question::instance()->has_field( $property ) ) {
-				return $this->_QST->get( $property );
-			} else if ( EEM_Answer::instance()->has_field( $property ) ) {
-				return $this->_ANS->get( $property );
-			} else if ( $this->_question_form_input_property_exists( __CLASS__, $property ) ) {
+	public function get($property = NULL) {
+		if ( ! empty($property)) {
+			if (EEM_Question::instance()->has_field($property)) {
+				return $this->_QST->get($property);
+			} else if (EEM_Answer::instance()->has_field($property)) {
+				return $this->_ANS->get($property);
+			} else if ($this->_question_form_input_property_exists(__CLASS__, $property)) {
 				return $this->{$property};
 			}
 		}
@@ -167,13 +167,13 @@ 
 	 * @param    string $property
 	 * @return boolean
 	 */
-	private function _question_form_input_property_exists( $classname, $property ) {
+	private function _question_form_input_property_exists($classname, $property) {
 		// first try regular property exists method which works as expected in PHP 5.3+
-		$prop = EEH_Class_Tools::has_property( $classname, $property );
-		if ( ! $prop ) {
+		$prop = EEH_Class_Tools::has_property($classname, $property);
+		if ( ! $prop) {
 			// use reflection for < PHP 5.3 as a double check when property is not found, possible due to access restriction
-			$reflector = new ReflectionClass( $classname );
-			$prop = $reflector->hasProperty( $property );
+			$reflector = new ReflectionClass($classname);
+			$prop = $reflector->hasProperty($property);
 		}
 		return $prop;
 	}
@@ -186,9 +186,9 @@ 
 	 * @param $qstn_id
 	 * @return void
 	 */
-	private function _set_input_id( $qstn_id ) {
-		$input_id = isset( $this->_QST_meta[ 'input_id' ] ) && ! empty( $this->_QST_meta[ 'input_id' ] ) ? $this->_QST_meta[ 'input_id' ] : sanitize_key( strip_tags( $this->_QST->get( 'QST_display_text' ) ) );
-		$this->QST_input_id = $this->_QST_meta[ 'append_qstn_id' ] && ! empty( $qstn_id ) ? $input_id . '-' . $qstn_id : $input_id;
+	private function _set_input_id($qstn_id) {
+		$input_id = isset($this->_QST_meta['input_id']) && ! empty($this->_QST_meta['input_id']) ? $this->_QST_meta['input_id'] : sanitize_key(strip_tags($this->_QST->get('QST_display_text')));
+		$this->QST_input_id = $this->_QST_meta['append_qstn_id'] && ! empty($qstn_id) ? $input_id.'-'.$qstn_id : $input_id;
 	}
 
 
@@ -199,7 +199,7 @@ 
 	 * @return void
 	 */
 	private function _set_input_class() {
-		$this->QST_input_class = isset( $this->_QST_meta[ 'input_class' ] ) ? $this->_QST_meta[ 'input_class' ] : '';
+		$this->QST_input_class = isset($this->_QST_meta['input_class']) ? $this->_QST_meta['input_class'] : '';
 	}
 
 
@@ -210,12 +210,12 @@ 
 	 * @param mixed    int | string    $qstn_id
 	 * @return void
 	 */
-	public function set_question_form_input_answer( $qstn_id ) {
+	public function set_question_form_input_answer($qstn_id) {
 		// check for answer in $_REQUEST in case we are reprocessing a form after an error
-		if ( isset( $this->_QST_meta[ 'EVT_ID' ] ) && isset( $this->_QST_meta[ 'att_nmbr' ] ) && isset( $this->_QST_meta[ 'date' ] ) && isset( $this->_QST_meta[ 'time' ] ) && isset( $this->_QST_meta[ 'price_id' ] ) ) {
-			if ( isset( $_REQUEST[ 'qstn' ][ $this->_QST_meta[ 'EVT_ID' ] ][ $this->_QST_meta[ 'att_nmbr' ] ][ $this->_QST_meta[ 'date' ] ][ $this->_QST_meta[ 'time' ] ][ $this->_QST_meta[ 'price_id' ] ][ $qstn_id ] ) ) {
-				$answer = $_REQUEST[ 'qstn' ][ $this->_QST_meta[ 'EVT_ID' ] ][ $this->_QST_meta[ 'att_nmbr' ] ][ $this->_QST_meta[ 'date' ] ][ $this->_QST_meta[ 'time' ] ][ $this->_QST_meta[ 'price_id' ] ][ $qstn_id ];
-				$this->_ANS->set( 'ANS_value', $answer );
+		if (isset($this->_QST_meta['EVT_ID']) && isset($this->_QST_meta['att_nmbr']) && isset($this->_QST_meta['date']) && isset($this->_QST_meta['time']) && isset($this->_QST_meta['price_id'])) {
+			if (isset($_REQUEST['qstn'][$this->_QST_meta['EVT_ID']][$this->_QST_meta['att_nmbr']][$this->_QST_meta['date']][$this->_QST_meta['time']][$this->_QST_meta['price_id']][$qstn_id])) {
+				$answer = $_REQUEST['qstn'][$this->_QST_meta['EVT_ID']][$this->_QST_meta['att_nmbr']][$this->_QST_meta['date']][$this->_QST_meta['time']][$this->_QST_meta['price_id']][$qstn_id];
+				$this->_ANS->set('ANS_value', $answer);
 			}
 		}
 	}
@@ -230,40 +230,40 @@ 
 	 * @param    array    $input_types
 	 * @return        array
 	 */
-	static function generate_question_form_inputs_for_object( $object = FALSE, $input_types = array() ) {
-		if ( ! is_object( $object ) ) {
+	static function generate_question_form_inputs_for_object($object = FALSE, $input_types = array()) {
+		if ( ! is_object($object)) {
 			return FALSE;
 		}
 		$inputs = array();
-		$fields = $object->get_model()->field_settings( FALSE );
+		$fields = $object->get_model()->field_settings(FALSE);
 		//		$pk = $object->ID(); <<< NO!
 		//		EEH_Debug_Tools::printr( $object, get_class( $object ) . '<br /><span style="font-size:10px;font-weight:normal;">' . __FILE__ . '<br />line no: ' . __LINE__ . '</span>', 'auto' );
 		//		EEH_Debug_Tools::printr( $fields, '$fields  <br /><span style="font-size:10px;font-weight:normal;">' . __FILE__ . '<br />line no: ' . __LINE__ . '</span>', 'auto' );
 		//		EEH_Debug_Tools::printr( $input_types, '$input_types  <br /><span style="font-size:10px;font-weight:normal;">' . __FILE__ . '<br />line no: ' . __LINE__ . '</span>', 'auto' );
-		foreach ( $fields as $field_ID => $field ) {
-			if ( $field instanceof EE_Model_Field_Base ) {
+		foreach ($fields as $field_ID => $field) {
+			if ($field instanceof EE_Model_Field_Base) {
 				//			echo '<h4>$field_ID : ' . $field_ID . '  <br /><span style="font-size:10px;font-weight:normal;">' . __FILE__ . '<br />line no: ' . __LINE__ . '</span></h4>';
 				//			EEH_Debug_Tools::printr( $field, '$field  <br /><span style="font-size:10px;font-weight:normal;">' . __FILE__ . '<br />line no: ' . __LINE__ . '</span>', 'auto' );
-				if ( isset( $input_types[ $field_ID ] ) ) {
+				if (isset($input_types[$field_ID])) {
 					// get saved value for field
-					$value = $object->get( $field_ID );
+					$value = $object->get($field_ID);
 					//				echo '<h4>$value : ' . $value . '  <br /><span style="font-size:10px;font-weight:normal;">' . __FILE__ . '<br />line no: ' . __LINE__ . '</span></h4>';
 					// if no saved value, then use default
 					$value = $value !== NULL ? $value : $field->get_default_value();
 					//			if ( $field_ID == 'CNT_active' )
 					//				echo '<h4>$value : ' . $value . '  <br /><span style="font-size:10px;font-weight:normal;">' . __FILE__ . '<br />line no: ' . __LINE__ . '</span></h4>';
 					// determine question type
-					$type = isset( $input_types[ $field_ID ] ) ? $input_types[ $field_ID ][ 'type' ] : 'TEXT';
+					$type = isset($input_types[$field_ID]) ? $input_types[$field_ID]['type'] : 'TEXT';
 					// input name
-					$input_name = isset( $input_types[ $field_ID ] ) && isset( $input_types[ $field_ID ][ 'input_name' ] ) ? $input_types[ $field_ID ][ 'input_name' ] . '[' . $field_ID . ']' : $field_ID;
+					$input_name = isset($input_types[$field_ID]) && isset($input_types[$field_ID]['input_name']) ? $input_types[$field_ID]['input_name'].'['.$field_ID.']' : $field_ID;
 					// css class for input
-					$class = isset( $input_types[ $field_ID ][ 'class' ] ) && ! empty( $input_types[ $field_ID ][ 'class' ] ) ? ' ' . $input_types[ $field_ID ][ 'class' ] : '';
+					$class = isset($input_types[$field_ID]['class']) && ! empty($input_types[$field_ID]['class']) ? ' '.$input_types[$field_ID]['class'] : '';
 					// whether to apply htmlentities to answer
-					$htmlentities = isset( $input_types[ $field_ID ][ 'htmlentities' ] ) ? $input_types[ $field_ID ][ 'htmlentities' ] : TRUE;
+					$htmlentities = isset($input_types[$field_ID]['htmlentities']) ? $input_types[$field_ID]['htmlentities'] : TRUE;
 					// whether to apply htmlentities to answer
-					$label_b4 = isset( $input_types[ $field_ID ][ 'label_b4' ] ) ? $input_types[ $field_ID ][ 'label_b4' ] : FALSE;
+					$label_b4 = isset($input_types[$field_ID]['label_b4']) ? $input_types[$field_ID]['label_b4'] : FALSE;
 					// whether to apply htmlentities to answer
-					$use_desc_4_label = isset( $input_types[ $field_ID ][ 'use_desc_4_label' ] ) ? $input_types[ $field_ID ][ 'use_desc_4_label' ] : FALSE;
+					$use_desc_4_label = isset($input_types[$field_ID]['use_desc_4_label']) ? $input_types[$field_ID]['use_desc_4_label'] : FALSE;
 
 					// create EE_Question_Form_Input object
 					$QFI = new EE_Question_Form_Input(
@@ -283,9 +283,9 @@ 
 							)
 						),
 						array(
-							'input_id' => $field_ID . '-' . $object->ID(),
+							'input_id' => $field_ID.'-'.$object->ID(),
 							'input_name' => $input_name,
-							'input_class' => $field_ID . $class,
+							'input_class' => $field_ID.$class,
 							'input_prefix' => '',
 							'append_qstn_id' => FALSE,
 							'htmlentities' => $htmlentities,
@@ -294,21 +294,21 @@ 
 						)
 					);
 					// does question type have options ?
-					if ( in_array( $type, array( 'DROPDOWN', 'RADIO_BTN', 'CHECKBOX' ) ) && isset ( $input_types[ $field_ID ] ) && isset ( $input_types[ $field_ID ][ 'options' ] ) ) {
-						foreach ( $input_types[ $field_ID ][ 'options' ] as $option ) {
-							$option = stripslashes_deep( $option );
-							$option_id = ! empty( $option[ 'id' ] ) ? $option[ 'id' ] : 0;
-							$QSO = EE_Question_Option::new_instance( array( 'QSO_value' => (string)$option_id, 'QSO_desc' => $option[ 'text' ], 'QSO_deleted' => FALSE ) );
+					if (in_array($type, array('DROPDOWN', 'RADIO_BTN', 'CHECKBOX')) && isset ($input_types[$field_ID]) && isset ($input_types[$field_ID]['options'])) {
+						foreach ($input_types[$field_ID]['options'] as $option) {
+							$option = stripslashes_deep($option);
+							$option_id = ! empty($option['id']) ? $option['id'] : 0;
+							$QSO = EE_Question_Option::new_instance(array('QSO_value' => (string) $option_id, 'QSO_desc' => $option['text'], 'QSO_deleted' => FALSE));
 							// all QST (and ANS) properties can be accessed indirectly thru QFI
-							$QFI->add_temp_option( $QSO );
+							$QFI->add_temp_option($QSO);
 						}
 					}
 					// we don't want ppl manually changing primary keys cuz that would just lead to total craziness man
-					if ( $field_ID == $object->get_model()->primary_key_name() ) {
-						$QFI->set( 'QST_disabled', TRUE );
+					if ($field_ID == $object->get_model()->primary_key_name()) {
+						$QFI->set('QST_disabled', TRUE);
 					}
 					//EEH_Debug_Tools::printr( $QFI, '$QFI  <br /><span style="font-size:10px;font-weight:normal;">' . __FILE__ . '<br />line no: ' . __LINE__ . '</span>', 'auto' );
-					$inputs[ $field_ID ] = $QFI;
+					$inputs[$field_ID] = $QFI;
 					//			if ( $field_ID == 'CNT_active' ) {
 					//				EEH_Debug_Tools::printr( $QFI, '$QFI  <br /><span style="font-size:10px;font-weight:normal;">' . __FILE__ . '<br />line no: ' . __LINE__ . '</span>', 'auto' );
 					//			}
@@ -326,8 +326,8 @@ 
 	 * @param \EE_Question_Option $QSO EE_Question_Option
 	 * @return boolean
 	 */
-	public function add_temp_option( EE_Question_Option $QSO ) {
-		$this->_QST->add_temp_option( $QSO );
+	public function add_temp_option(EE_Question_Option $QSO) {
+		$this->_QST->add_temp_option($QSO);
 	}
 
 
@@ -339,13 +339,13 @@ 
 	 * @param    mixed  $value
 	 * @return mixed
 	 */
-	public function set( $property = NULL, $value = NULL ) {
-		if ( ! empty( $property ) ) {
-			if ( EEM_Question::instance()->has_field( $property ) ) {
-				$this->_QST->set( $property, $value );
-			} else if ( EEM_Answer::instance()->has_field( $property ) ) {
-				$this->_ANS->set( $property, $value );
-			} else if ( $this->_question_form_input_property_exists( __CLASS__, $property ) ) {
+	public function set($property = NULL, $value = NULL) {
+		if ( ! empty($property)) {
+			if (EEM_Question::instance()->has_field($property)) {
+				$this->_QST->set($property, $value);
+			} else if (EEM_Answer::instance()->has_field($property)) {
+				$this->_ANS->set($property, $value);
+			} else if ($this->_question_form_input_property_exists(__CLASS__, $property)) {
 				echo "<hr>$property is a prop of QFI";
 				$this->{$property} = $value;
 				return TRUE;
@@ -366,9 +366,9 @@ 
 	 *                                                       whether it was trashed or not.
 	 * @return EE_Question_Option
 	 */
-	public function options( $notDeletedOptionsOnly = TRUE, $selected_value_to_always_include = NULL ) {
+	public function options($notDeletedOptionsOnly = TRUE, $selected_value_to_always_include = NULL) {
 		$temp_options = $this->_QST->temp_options();
-		return ! empty( $temp_options ) ? $temp_options : $this->_QST->options( $notDeletedOptionsOnly, $selected_value_to_always_include );
+		return ! empty($temp_options) ? $temp_options : $this->_QST->options($notDeletedOptionsOnly, $selected_value_to_always_include);
 	}
 
 
@@ -379,8 +379,8 @@ 
 	 * @param mixed $key
 	 * @return mixed
 	 */
-	public function get_meta( $key = FALSE ) {
-		return $key && isset( $this->_QST_meta[ $key ] ) ? $this->_QST_meta[ $key ] : FALSE;
+	public function get_meta($key = FALSE) {
+		return $key && isset($this->_QST_meta[$key]) ? $this->_QST_meta[$key] : FALSE;
 	}
 
 

core/db_classes/EE_Question_Group.class.php

Doc Comments +5 added lines, -5 removed lines

@@ -65,7 +65,7 @@ 
 	/**
 	 * Gets the question group's internal name
 	 * @access public
-	 * @return string
+	 * @return boolean
 	 */
 	public function identifier() {
 		return $this->get( 'QSG_identifier' );
@@ -89,7 +89,7 @@ 
 	 * Gets the question group's order number in a sequence
 	 * of other question groups
 	 * @access public
-	 * @return int
+	 * @return boolean
 	 */
 	public function order() {
 		return $this->get( 'QSG_order' );
@@ -138,7 +138,7 @@ 
 	 *
 	 * @since 4.5.0
 	 *
-	 * @return int
+	 * @return boolean
 	 */
 	public function wp_user() {
 		return $this->get('QSG_wp_user');
@@ -213,7 +213,7 @@ 
 	/**
 	 * Adds the question to this question group
 	 * @param EE_Question || int $question object or ID
-	 * @return boolean if successful
+	 * @return EE_Base_Class if successful
 	 */
 	public function add_question( $questionObjectOrID ) {
 		return $this->_add_relation_to( $questionObjectOrID, 'Question' );
@@ -224,7 +224,7 @@ 
 	/**
 	 * Removes the question from this question group
 	 * @param EE_Question || int $question object or ID
-	 * @return boolean of success
+	 * @return EE_Base_Class of success
 	 */
 	public function remove_question( $questionObjectOrID ) {
 		return $this->_remove_relation_to( $questionObjectOrID, 'Question' );

Spacing +40 added lines, -40 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_Question_Group|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_Question_Group
 	 */
-	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,8 +55,8 @@ 
 	 * @param bool $pretty
 	 * @return string
 	 */
-	public function name( $pretty = FALSE ) {
-		return $pretty ? $this->get_pretty( 'QSG_name' ) : $this->get( 'QSG_name' );
+	public function name($pretty = FALSE) {
+		return $pretty ? $this->get_pretty('QSG_name') : $this->get('QSG_name');
 	}
 
 
@@ -68,7 +68,7 @@ 
 	 * @return string
 	 */
 	public function identifier() {
-		return $this->get( 'QSG_identifier' );
+		return $this->get('QSG_identifier');
 	}
 
 
@@ -79,8 +79,8 @@ 
 	 * @param bool $pretty
 	 * @return string
 	 */
-	public function desc( $pretty = FALSE ) {
-		return $pretty ? $this->get_pretty( 'QSG_desc' ) : $this->get( 'QSG_desc' );
+	public function desc($pretty = FALSE) {
+		return $pretty ? $this->get_pretty('QSG_desc') : $this->get('QSG_desc');
 	}
 
 
@@ -92,7 +92,7 @@ 
 	 * @return int
 	 */
 	public function order() {
-		return $this->get( 'QSG_order' );
+		return $this->get('QSG_order');
 	}
 
 
@@ -103,7 +103,7 @@ 
 	 * @return boolean
 	 */
 	public function show_group_name() {
-		return $this->get( 'QSG_show_group_name' );
+		return $this->get('QSG_show_group_name');
 	}
 
 
@@ -115,7 +115,7 @@ 
 	 * @return boolean
 	 */
 	public function show_group_desc() {
-		return $this->get( 'QSG_show_group_desc' );
+		return $this->get('QSG_show_group_desc');
 	}
 
 
@@ -128,7 +128,7 @@ 
 	 * @return boolean
 	 */
 	public function system_group() {
-		return $this->get( 'QSG_system' );
+		return $this->get('QSG_system');
 	}
 
 
@@ -153,7 +153,7 @@ 
 	 * @return boolean
 	 */
 	public function deleted() {
-		return $this->get( 'QST_deleted' );
+		return $this->get('QST_deleted');
 	}
 
 
@@ -164,8 +164,8 @@ 
 	 */
 	public function questions_in_and_not_in_group() {
 		$questions_in_group = $this->questions();
-		$exclude_question_ids = ! empty( $questions_in_group ) ? array_keys( $questions_in_group ) : array();
-		$questions_not_in_group = $this->questions_not_in_group( $exclude_question_ids );
+		$exclude_question_ids = ! empty($questions_in_group) ? array_keys($questions_in_group) : array();
+		$questions_not_in_group = $this->questions_not_in_group($exclude_question_ids);
 		return $questions_in_group + $questions_not_in_group;
 	}
 
@@ -176,9 +176,9 @@ 
 	 * @param array $query_params
 	 * @return EE_Question[]
 	 */
-	public function questions( $query_params = array() ) {
-		$query_params = ! empty( $query_params ) ? $query_params : array( 'order_by' => array( 'Question_Group_Question.QGQ_order' => 'ASC' ) );
-		return $this->ID() ? $this->get_many_related( 'Question', $query_params ) : array();
+	public function questions($query_params = array()) {
+		$query_params = ! empty($query_params) ? $query_params : array('order_by' => array('Question_Group_Question.QGQ_order' => 'ASC'));
+		return $this->ID() ? $this->get_many_related('Question', $query_params) : array();
 	}
 
 
@@ -188,14 +188,14 @@ 
 	 * @param  mixed $question_IDS_in_group if empty array then all questions returned.  if FALSE then we first get questions in this group and exclude them from questions get all. IF empty array then we just return all questions.
 	 * @return EE_Question[]
 	 */
-	public function questions_not_in_group( $question_IDS_in_group = FALSE ) {
-		if ( $question_IDS_in_group === FALSE ) {
+	public function questions_not_in_group($question_IDS_in_group = FALSE) {
+		if ($question_IDS_in_group === FALSE) {
 			$questions = $this->questions();
-			$question_IDS_in_group = ! empty( $questions ) ? array_keys( $questions ) : array();
+			$question_IDS_in_group = ! empty($questions) ? array_keys($questions) : array();
 		}
-		$_where = ! empty( $question_IDS_in_group ) ? array( 'QST_ID' => array( 'not_in', $question_IDS_in_group ) ) : array();
+		$_where = ! empty($question_IDS_in_group) ? array('QST_ID' => array('not_in', $question_IDS_in_group)) : array();
 
-		return EEM_Question::instance()->get_all( array( $_where, 'order_by' => array( 'QST_ID' => 'ASC' ) ) );
+		return EEM_Question::instance()->get_all(array($_where, 'order_by' => array('QST_ID' => 'ASC')));
 	}
 
 
@@ -205,7 +205,7 @@ 
 	 * @return EE_Event[]
 	 */
 	public function events() {
-		return $this->get_many_related( 'Event' );
+		return $this->get_many_related('Event');
 	}
 
 
@@ -215,8 +215,8 @@ 
 	 * @param EE_Question || int $question object or ID
 	 * @return boolean if successful
 	 */
-	public function add_question( $questionObjectOrID ) {
-		return $this->_add_relation_to( $questionObjectOrID, 'Question' );
+	public function add_question($questionObjectOrID) {
+		return $this->_add_relation_to($questionObjectOrID, 'Question');
 	}
 
 
@@ -226,8 +226,8 @@ 
 	 * @param EE_Question || int $question object or ID
 	 * @return boolean of success
 	 */
-	public function remove_question( $questionObjectOrID ) {
-		return $this->_remove_relation_to( $questionObjectOrID, 'Question' );
+	public function remove_question($questionObjectOrID) {
+		return $this->_remove_relation_to($questionObjectOrID, 'Question');
 	}
 
 
@@ -237,9 +237,9 @@ 
 	 * @param $qst_order
 	 * @return int
 	 */
-	public function update_question_order( $questionObjectOrID, $qst_order ) {
-		$qst_ID = $questionObjectOrID instanceof EE_Question ? $questionObjectOrID->ID() : (int)$questionObjectOrID;
-		return EEM_Question_Group_Question::instance()->update( array( 'QGQ_order' => $qst_order ), array( array( 'QST_ID' => $qst_ID, 'QSG_ID' => $this->ID() ) ) );
+	public function update_question_order($questionObjectOrID, $qst_order) {
+		$qst_ID = $questionObjectOrID instanceof EE_Question ? $questionObjectOrID->ID() : (int) $questionObjectOrID;
+		return EEM_Question_Group_Question::instance()->update(array('QGQ_order' => $qst_order), array(array('QST_ID' => $qst_ID, 'QSG_ID' => $this->ID())));
 	}
 
 
@@ -250,9 +250,9 @@ 
 	 */
 	public function has_questions_with_answers() {
 		$has_answers = FALSE;
-		$questions = $this->get_many_related( 'Question' );
-		foreach ( $questions as $question ) {
-			if ( $question->count_related( 'Answer' ) > 0 )
+		$questions = $this->get_many_related('Question');
+		foreach ($questions as $question) {
+			if ($question->count_related('Answer') > 0)
 				$has_answers = TRUE;
 		}
 		return $has_answers;
@@ -268,7 +268,7 @@ 
 	 */
 	public function set_order_to_latest() {
 		$latest_order = $this->get_model()->get_latest_question_group_order();
-		$latest_order ++;
-		$this->set( 'QSG_order', $latest_order );
+		$latest_order++;
+		$this->set('QSG_order', $latest_order);
 	}
 }

Braces +3 added lines, -2 removed lines

@@ -252,8 +252,9 @@
 		$has_answers = FALSE;
 		$questions = $this->get_many_related( 'Question' );
 		foreach ( $questions as $question ) {
-			if ( $question->count_related( 'Answer' ) > 0 )
-				$has_answers = TRUE;
+			if ( $question->count_related( 'Answer' ) > 0 ) {
+							$has_answers = TRUE;
+			}
 		}
 		return $has_answers;
 	}

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');
 	}