eventespresso / event-espresso-core

core/db_classes/EE_Event_Message_Template.class.php

Spacing +5 added lines, -5 removed lines

@@ -22,9 +22,9 @@ 
 	 * @param null  $timezone
 	 * @return EE_Event_Message_Template|mixed
 	 */
-	public static function new_instance( $props_n_values = array(), $timezone = NULL ) {
-		$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 = NULL) {
+		$has_object = parent::_check_for_object($props_n_values, __CLASS__, $timezone);
+		return $has_object ? $has_object : new self($props_n_values, FALSE, $timezone);
 	}
 
 
@@ -34,8 +34,8 @@ 
 	 * @param null  $timezone
 	 * @return EE_Event_Message_Template
 	 */
-	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);
 	}
 
 }

Braces +3 added lines, -1 removed lines

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

core/db_classes/EE_Event_Question_Group.class.php

Spacing +8 added lines, -8 removed lines

@@ -1,18 +1,18 @@ 
-<?php if ( !defined( 'EVENT_ESPRESSO_VERSION' ) ) {
-	exit( 'No direct script access allowed' );
+<?php if ( ! defined('EVENT_ESPRESSO_VERSION')) {
+	exit('No direct script access allowed');
 }
 /**
  * Required  by EEM_Event_Question_Group in case someone queries for all its model objects
  */
-class EE_Event_Question_Group extends EE_Base_Class{
+class EE_Event_Question_Group extends EE_Base_Class {
 
 	/**
 	 * @param array $props_n_values
 	 * @return EE_Event_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);
 	}
 
 
@@ -21,7 +21,7 @@ 
 	 * @param array $props_n_values
 	 * @return EE_Event_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);
 	}
 }
\ No newline at end of file

core/db_classes/EE_Event_Venue.class.php

Spacing +6 added lines, -6 removed lines

@@ -2,15 +2,15 @@ 
 /**
  * Required  by EEM_Event_Question_Group in case someone queries for all its model objects
  */
-class EE_Event_Venue extends EE_Base_Class{
+class EE_Event_Venue extends EE_Base_Class {
 
 	/**
 	 * @param array $props_n_values
 	 * @return EE_Event_Venue|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);
 	}
 
 
@@ -19,8 +19,8 @@ 
 	 * @param array $props_n_values
 	 * @return EE_Event_Venue
 	 */
-	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);
 	}
 
 }
\ No newline at end of file

core/db_classes/EE_Extra_Meta.class.php

Spacing +19 added lines, -19 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
@@ -30,9 +30,9 @@ 
 	 * @param array $props_n_values
 	 * @return EE_Extra_Meta|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);
 	}
 
 
@@ -41,8 +41,8 @@ 
 	 * @param array $props_n_values
 	 * @return EE_Extra_Meta
 	 */
-	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);
 	}
 
 
@@ -52,7 +52,7 @@ 
 	 * @return int
 	 */
 	function FK_ID() {
-		return $this->get( 'FK_ID' );
+		return $this->get('FK_ID');
 	}
 
 
@@ -62,8 +62,8 @@ 
 	 * @param int $FK_ID
 	 * @return boolean
 	 */
-	function set_FK_ID( $FK_ID ) {
-		$this->set( 'FK_ID', $FK_ID );
+	function set_FK_ID($FK_ID) {
+		$this->set('FK_ID', $FK_ID);
 	}
 
 
@@ -73,7 +73,7 @@ 
 	 * @return string
 	 */
 	function model() {
-		return $this->get( 'EXM_model' );
+		return $this->get('EXM_model');
 	}
 
 
@@ -83,8 +83,8 @@ 
 	 * @param string $model
 	 * @return boolean
 	 */
-	function set_model( $model ) {
-		$this->set( 'EXM_model', $model );
+	function set_model($model) {
+		$this->set('EXM_model', $model);
 	}
 
 
@@ -94,7 +94,7 @@ 
 	 * @return string
 	 */
 	function key() {
-		return $this->get( 'EXM_key' );
+		return $this->get('EXM_key');
 	}
 
 
@@ -104,8 +104,8 @@ 
 	 * @param string $key
 	 * @return boolean
 	 */
-	function set_key( $key ) {
-		$this->set( 'EXM_key', $key );
+	function set_key($key) {
+		$this->set('EXM_key', $key);
 	}
 
 
@@ -115,7 +115,7 @@ 
 	 * @return string
 	 */
 	function value() {
-		return $this->get( 'EXM_value' );
+		return $this->get('EXM_value');
 	}
 
 
@@ -125,8 +125,8 @@ 
 	 * @param string $value
 	 * @return boolean
 	 */
-	function set_value( $value ) {
-		$this->set( 'EXM_value', $value );
+	function set_value($value) {
+		$this->set('EXM_value', $value);
 	}
 
 

Doc Comments +4 added lines, -4 removed lines

@@ -60,7 +60,7 @@ 
 	/**
 	 * Sets meta_id
 	 * @param int $meta_id
-	 * @return boolean
+	 * @return boolean|null
 	 */
 	function set_meta_id( $meta_id) {
 		return $this->set( 'meta_id', $meta_id);
@@ -78,7 +78,7 @@ 
 	/**
 	 * Sets post_id
 	 * @param int $post_id
-	 * @return boolean
+	 * @return boolean|null
 	 */
 	function set_post_id( $post_id) {
 		return $this->set( 'post_id', $post_id);
@@ -96,7 +96,7 @@ 
 	/**
 	 * Sets meta_key
 	 * @param string $meta_key
-	 * @return boolean
+	 * @return boolean|null
 	 */
 	function set_meta_key( $meta_key) {
 		return $this->set( 'meta_key', $meta_key);
@@ -114,7 +114,7 @@ 
 	/**
 	 * Sets meta_value
 	 * @param mixed $meta_value
-	 * @return boolean
+	 * @return boolean|null
 	 */
 	function set_meta_value( $meta_value) {
 		return $this->set( 'meta_value', $meta_value);

core/db_classes/EE_Line_Item.class.php

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

Doc Comments +13 added lines, -13 removed lines

@@ -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 );
@@ -153,7 +153,7 @@ 
 	/**
 	 * Sets desc
 	 * @param string $desc
-	 * @return boolean
+	 * @return boolean|null
 	 */
 	function set_desc( $desc ) {
 		$this->set( 'LIN_desc', $desc );
@@ -174,7 +174,7 @@ 
 	/**
 	 * Sets quantity
 	 * @param int $quantity
-	 * @return boolean
+	 * @return boolean|null
 	 */
 	function set_quantity( $quantity ) {
 		$this->set( 'LIN_quantity', $quantity );
@@ -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 );
@@ -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 );
@@ -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 );
@@ -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 );
@@ -306,7 +306,7 @@ 
 	/**
 	 * Sets total
 	 * @param float $total
-	 * @return boolean
+	 * @return boolean|null
 	 */
 	function set_total( $total ) {
 		$this->set( 'LIN_total', $total );
@@ -347,7 +347,7 @@ 
 	/**
 	 * Sets parent
 	 * @param int $parent
-	 * @return boolean
+	 * @return boolean|null
 	 */
 	function set_parent_ID( $parent ) {
 		$this->set( 'LIN_parent', $parent );
@@ -368,7 +368,7 @@ 
 	/**
 	 * Sets type
 	 * @param string $type
-	 * @return boolean
+	 * @return boolean|null
 	 */
 	function set_type( $type ) {
 		$this->set( 'LIN_type', $type );
@@ -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 );

Spacing +211 added lines, -211 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__, $timezone, $date_formats );
-		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__, $timezone, $date_formats);
+		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,14 +875,14 @@ 
 	 * @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()) {
 					
 					//round as we go so that the line items add up ok
 					$percent_total = round(
@@ -890,25 +890,25 @@ 
 						EE_Registry::instance()->CFG->currency->dec_plc
 					);
 					
-					$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;
 	}
@@ -922,8 +922,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,
@@ -931,9 +931,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(
@@ -941,17 +941,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();
@@ -975,10 +975,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();
@@ -992,21 +992,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();
 				}
 			}
@@ -1022,8 +1022,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();
 			}
 		}
@@ -1037,15 +1037,15 @@ 
 	 */
 	public function get_items_total() {
 		//by default, let's make sure we're consistent with the existing line item
-		if( $this->is_total() ) {
-			$pretax_subtotal_li = EEH_Line_Item::get_pre_tax_subtotal( $this );
-			if( $pretax_subtotal_li instanceof EE_Line_Item ) {
+		if ($this->is_total()) {
+			$pretax_subtotal_li = EEH_Line_Item::get_pre_tax_subtotal($this);
+			if ($pretax_subtotal_li instanceof EE_Line_Item) {
 				return $pretax_subtotal_li->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();
 			}
 		}
@@ -1060,7 +1060,7 @@ 
 	 * @return EE_Line_Item[]
 	 */
 	function tax_descendants() {
-		return EEH_Line_Item::get_tax_descendants( $this );
+		return EEH_Line_Item::get_tax_descendants($this);
 	}
 
 
@@ -1070,7 +1070,7 @@ 
 	 * @return EE_Line_Item[]
 	 */
 	function get_items() {
-		return EEH_Line_Item::get_line_item_descendants( $this );
+		return EEH_Line_Item::get_line_item_descendants($this);
 	}
 
 
@@ -1084,22 +1084,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);
 	}
 
 
@@ -1109,7 +1109,7 @@ 
 	 * @return EE_Transaction
 	 */
 	public function transaction() {
-		return $this->get_first_related( 'Transaction' );
+		return $this->get_first_related('Transaction');
 	}
 
 
@@ -1122,17 +1122,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);
 			}
 		}
 	}
@@ -1144,9 +1144,9 @@ 
 	 * @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' );
-		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');
+		return EEH_Line_Item::get_descendants_of_type($this, $type);
 	}
 
 
@@ -1156,9 +1156,9 @@ 
 	 * @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' );
-		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');
+		return EEH_Line_Item::get_nearest_descendant_of_type($this, $type);
 	}
 
 
@@ -1169,7 +1169,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

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_Price_Type.class.php

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_Group.class.php

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

Doc Comments +2 added lines, -2 removed lines

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

core/db_classes/EE_Question_Group_Question.class.php

Spacing +6 added lines, -6 removed lines

@@ -2,15 +2,15 @@ 
 /**
  * Required  by EEM_Question_Group_Question in case someone queries for all its model objects
  */
-class EE_Question_Group_Question extends EE_Base_Class{
+class EE_Question_Group_Question extends EE_Base_Class {
 
 	/**
 	 * @param array $props_n_values
 	 * @return EE_Question_Group_Question|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);
 	}
 
 
@@ -19,7 +19,7 @@ 
 	 * @param array $props_n_values
 	 * @return EE_Question_Group_Question
 	 */
-	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);
 	}
 }
\ No newline at end of file