eventespresso / event-espresso-core

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

Spacing +93 added lines, -93 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');
 	}
 
@@ -544,12 +544,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'),
@@ -561,10 +561,10 @@ 
 				);
 			}
 			$method = $this->redirect_args() ? 'POST' : 'GET';
-			$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;
@@ -578,12 +578,12 @@ 
 	 * Changes all the name-value pairs of
 	 * @return string
 	 */
-	function redirect_args_as_inputs(){
+	function redirect_args_as_inputs() {
 		$html = '';
-		if( $this->redirect_args() !== NULL && is_array( $this->redirect_args() )) {
+		if ($this->redirect_args() !== NULL && is_array($this->redirect_args())) {
 			EE_Registry::instance()->load_helper('HTML');
-			foreach($this->redirect_args() as $name => $value){
-				$html .= EEH_HTML::nl(0) . '<input type="hidden" name="' . $name . '" value="' . esc_attr( $value ) . '"/>';
+			foreach ($this->redirect_args() as $name => $value) {
+				$html .= EEH_HTML::nl(0).'<input type="hidden" name="'.$name.'" value="'.esc_attr($value).'"/>';
 			}
 		}
 		return $html;
@@ -598,7 +598,7 @@ 
 	 * object itself)
 	 * @return string for the currency code
 	 */
-	public function currency_code(){
+	public function currency_code() {
 		return EE_Config::instance()->currency->code;
 	}
 
@@ -612,14 +612,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);
 		}
 	}
 
@@ -628,13 +628,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;
 		}
 	}
@@ -646,11 +646,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);
 	}
 }
 

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

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

Doc Comments +11 added lines, -11 removed lines

@@ -112,7 +112,7 @@ 
 
 	/**
 	 * Gets button_url
-	 * @return string
+	 * @return boolean
 	 */
 	function button_url() {
 		return $this->get('PMD_button_url');
@@ -152,7 +152,7 @@ 
 
 	/**
 	 * Gets description
-	 * @return string
+	 * @return boolean
 	 */
 	function description() {
 		return $this->get('PMD_desc');
@@ -172,7 +172,7 @@ 
 
 	/**
 	 * Gets name
-	 * @return string
+	 * @return boolean
 	 */
 	function name() {
 		return $this->get('PMD_name');
@@ -212,7 +212,7 @@ 
 
 	/**
 	 * Gets order
-	 * @return int
+	 * @return boolean
 	 */
 	function order() {
 		return $this->get('PMD_order');
@@ -232,7 +232,7 @@ 
 
 	/**
 	 * Gets slug
-	 * @return string
+	 * @return boolean
 	 */
 	function slug() {
 		return $this->get('PMD_slug');
@@ -252,7 +252,7 @@ 
 
 	/**
 	 * Gets type
-	 * @return string
+	 * @return boolean
 	 */
 	function type() {
 		return $this->get('PMD_type');
@@ -272,7 +272,7 @@ 
 
 	/**
 	 * Gets wp_user
-	 * @return int
+	 * @return boolean
 	 */
 	function wp_user() {
 		return $this->get('PMD_wp_user');
@@ -291,7 +291,7 @@ 
 
 	/**
 	 * Overrides parent so when PMD_type is changed we refresh the _type_obj
-	 * @param type $field_name
+	 * @param string $field_name
 	 * @param type $field_value
 	 * @param type $use_default
 	 */
@@ -307,7 +307,7 @@ 
 
 	/**
 	 * Gets admin_name
-	 * @return string
+	 * @return boolean
 	 */
 	function admin_name() {
 		return $this->get('PMD_admin_name');
@@ -327,7 +327,7 @@ 
 
 	/**
 	 * Gets admin_desc
-	 * @return string
+	 * @return boolean
 	 */
 	function admin_desc() {
 		return $this->get('PMD_admin_desc');
@@ -347,7 +347,7 @@ 
 
 	/**
 	 * Gets scope
-	 * @return array
+	 * @return boolean
 	 */
 	function scope() {
 		return $this->get('PMD_scope');

Spacing +45 added lines, -45 removed lines

@@ -1,5 +1,5 @@ 
-<?php if (!defined('EVENT_ESPRESSO_VERSION')) exit('No direct script access allowed');
-do_action( 'AHEE_log', __FILE__, __FUNCTION__, '' );
+<?php if ( ! defined('EVENT_ESPRESSO_VERSION')) exit('No direct script access allowed');
+do_action('AHEE_log', __FILE__, __FUNCTION__, '');
 /**
  * Event Espresso
  *
@@ -23,7 +23,7 @@ 
  *
  * ------------------------------------------------------------------------
  */
-class EE_Payment_Method extends EE_Base_Class{
+class EE_Payment_Method extends EE_Base_Class {
 
 	/**
 	 * Payment Method type object, which has all the info about this type of payment method,
@@ -39,9 +39,9 @@ 
 	 * @param array $props_n_values
 	 * @return EE_Payment_Method
 	 */
-	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, FALSE );
+	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, FALSE);
 	}
 
 
@@ -51,8 +51,8 @@ 
 	 * @param array $props_n_values
 	 * @return EE_Payment_Method
 	 */
-	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);
 	}
 
 
@@ -81,7 +81,7 @@ 
 	 * @return boolean
 	 */
 	function active() {
-		return array_intersect(array_keys(EEM_Payment_Method::instance()->scopes()),$this->scope());
+		return array_intersect(array_keys(EEM_Payment_Method::instance()->scopes()), $this->scope());
 	}
 
 
@@ -90,10 +90,10 @@ 
 	 * Sets this PM as active by making it usable within the CART scope. Offline gateways
 	 * are also usable from the admin-scope as well. DOES NOT SAVE it
 	 */
-	function set_active(){
+	function set_active() {
 		$default_scopes = array(EEM_Payment_Method::scope_cart);
-		if($this->type_obj() &&
-			$this->type_obj()->payment_occurs() == EE_PMT_Base::offline){
+		if ($this->type_obj() &&
+			$this->type_obj()->payment_occurs() == EE_PMT_Base::offline) {
 			$default_scopes[] = EEM_Payment_Method::scope_admin;
 		}
 		$this->set_scope($default_scopes);
@@ -104,7 +104,7 @@ 
 	/**
 	 * Makes this payment method apply to NO scopes at all. DOES NOT SAVE it.
 	 */
-	function deactivate(){
+	function deactivate() {
 		$this->set_scope(array());
 	}
 
@@ -295,8 +295,8 @@ 
 	 * @param type $field_value
 	 * @param type $use_default
 	 */
-	function set( $field_name, $field_value, $use_default = FALSE ){
-		if( $field_name == 'PMD_type' ){
+	function set($field_name, $field_value, $use_default = FALSE) {
+		if ($field_name == 'PMD_type') {
 			//the type has probably changed, so forget about its old type object
 			$this->_type_obj = NULL;
 		}
@@ -370,26 +370,26 @@ 
 	 * @return EE_PMT_Base
 	 * @throws EE_Error
 	 */
-	public function type_obj(){
-		if( ! $this->_type_obj ) {
-			EE_Registry::instance()->load_lib( 'Payment_Method_Manager' );
-			if ( EE_Payment_Method_Manager::instance()->payment_method_type_exists( $this->type() )) {
-				$class_name = EE_Payment_Method_Manager::instance()->payment_method_class_from_type( $this->type() );
-				if ( ! class_exists( $class_name )) {
+	public function type_obj() {
+		if ( ! $this->_type_obj) {
+			EE_Registry::instance()->load_lib('Payment_Method_Manager');
+			if (EE_Payment_Method_Manager::instance()->payment_method_type_exists($this->type())) {
+				$class_name = EE_Payment_Method_Manager::instance()->payment_method_class_from_type($this->type());
+				if ( ! class_exists($class_name)) {
 					throw new EE_Error(
 						sprintf(
-							__( 'An attempt to use the "%1$s" payment method failed, so it was deactivated.%2$sWas the "%1$s" Plugin recently deactivated? It can be reactivated on the %3$sPlugins Admin Page%4$s', 'event_espresso' ),
+							__('An attempt to use the "%1$s" payment method failed, so it was deactivated.%2$sWas the "%1$s" Plugin recently deactivated? It can be reactivated on the %3$sPlugins Admin Page%4$s', 'event_espresso'),
 							$class_name,
 							'<br />',
-							'<a href="' . admin_url('plugins.php') . '">',
+							'<a href="'.admin_url('plugins.php').'">',
 							'</a>'
 						)
 					);
 				}
-				$r = new ReflectionClass( $class_name );
-					$this->_type_obj = $r->newInstanceArgs( array( $this ));
+				$r = new ReflectionClass($class_name);
+					$this->_type_obj = $r->newInstanceArgs(array($this));
 			} else {
-				throw new EE_Error( sprintf( __( 'A payment method of type "%1$s" does not exist. Only ones existing are: %2$s', 'event_espresso' ), $this->type(), implode(',', EE_Payment_Method_Manager::instance()->payment_method_type_names() ) ) );
+				throw new EE_Error(sprintf(__('A payment method of type "%1$s" does not exist. Only ones existing are: %2$s', 'event_espresso'), $this->type(), implode(',', EE_Payment_Method_Manager::instance()->payment_method_type_names())));
 			}
 		}
 		return $this->_type_obj;
@@ -402,18 +402,18 @@ 
 	 * and the extra meta. Mostly used for passing off ot gateways.	 *
 	 * @return array
 	 */
-	public function settings_array(){
+	public function settings_array() {
 		$fields = $this->model_field_array();
 		$extra_meta = $this->all_extra_meta_array();
 		//remove the model's prefix from the fields
 		$combined_settings_array = array();
-		foreach($fields as $key => $value){
-			if(strpos($key, 'PMD_')===0){
+		foreach ($fields as $key => $value) {
+			if (strpos($key, 'PMD_') === 0) {
 				$key_sans_model_prefix = str_replace('PMD_', '', $key);
 				$combined_settings_array [$key_sans_model_prefix] = $value;
 			}
 		}
-		$combined_settings_array = array_merge( $extra_meta,$combined_settings_array );
+		$combined_settings_array = array_merge($extra_meta, $combined_settings_array);
 		return $combined_settings_array;
 	}
 
@@ -425,12 +425,12 @@ 
 	 * @param string $css_class
 	 * @return string of HTML for displaying the button
 	 */
-	public function button_html( $url = '', $css_class = '' ){
+	public function button_html($url = '', $css_class = '') {
 		$payment_occurs = $this->type_obj()->payment_occurs();
 		return '
-		 <div id="' . $this->slug() . '-payment-option-dv" class="'. $payment_occurs .'-payment-gateway reg-page-payment-option-dv' . $css_class . '">
-			<a id="payment-gateway-button-' . $this->slug() . '" class="reg-page-payment-option-lnk" rel="' . $this->slug() . '" href="' . $url . '" >
-				<img src="' . $this->button_url() . '" alt="' . sprintf( esc_attr__( 'Pay using %s', 'event_espresso' ), $this->get_pretty('PMD_name','form_input') ) . '" />
+		 <div id="' . $this->slug().'-payment-option-dv" class="'.$payment_occurs.'-payment-gateway reg-page-payment-option-dv'.$css_class.'">
+			<a id="payment-gateway-button-' . $this->slug().'" class="reg-page-payment-option-lnk" rel="'.$this->slug().'" href="'.$url.'" >
+				<img src="' . $this->button_url().'" alt="'.sprintf(esc_attr__('Pay using %s', 'event_espresso'), $this->get_pretty('PMD_name', 'form_input')).'" />
 			</a>
 		</div>
 ';
@@ -443,7 +443,7 @@ 
 	 * (as defined by the gateway and the currently active currencies)
 	 * @return EE_Currency[]
 	 */
-	public function get_all_usable_currencies(){
+	public function get_all_usable_currencies() {
 		return EEM_Currency::instance()->get_all_currencies_usable_by($this->type_obj());
 	}
 
@@ -452,9 +452,9 @@ 
 	 * @param string $currency_code currency ID (code)
 	 * @return boolean
 	 */
-	public function usable_for_currency( $currency_code ) {
-		foreach( $this->get_all_usable_currencies() as $currency_obj ) {
-			if( $currency_obj->ID() == $currency_code ){
+	public function usable_for_currency($currency_code) {
+		foreach ($this->get_all_usable_currencies() as $currency_obj) {
+			if ($currency_obj->ID() == $currency_code) {
 				return TRUE;
 			}
 		}
@@ -467,7 +467,7 @@ 
 	 * Returns TRUE if this payment method's gateway is an instance of EE_Onsite_Gateway
 	 * @return bool
 	 */
-	public function is_on_site(){
+	public function is_on_site() {
 		return $this->type_obj()->payment_occurs() == EE_PMT_Base::onsite;
 	}
 
@@ -477,7 +477,7 @@ 
 	 * Returns TRUE if this payment method's gateway is an instance of EE_Offsite_Gateway
 	 * @return bool
 	 */
-	public function is_off_site(){
+	public function is_off_site() {
 		return $this->type_obj()->payment_occurs() == EE_PMT_Base::offsite;
 	}
 
@@ -487,7 +487,7 @@ 
 	 * Returns TRUE if this payment method does not utilize a gateway
 	 * @return bool
 	 */
-	public function is_off_line(){
+	public function is_off_line() {
 		return $this->type_obj()->payment_occurs() == EE_PMT_Base::offline;
 	}
 
@@ -497,10 +497,10 @@ 
 	 * to load the required classes, and don't need them at the time of unserialization
 	 * @return array
 	 */
-	public function __sleep(){
-		$properties =  get_object_vars( $this );
-		unset( $properties[ '_type_obj' ] );
-		return array_keys( $properties );
+	public function __sleep() {
+		$properties = get_object_vars($this);
+		unset($properties['_type_obj']);
+		return array_keys($properties);
 	}
 
 

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');
+}
 do_action( 'AHEE_log', __FILE__, __FUNCTION__, '' );
 /**
  * Event Espresso

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

Doc Comments +10 added lines, -10 removed lines

@@ -48,7 +48,7 @@ 
 	 * @param array $props_n_values  incoming values from the database
 	 * @param string $timezone  incoming timezone as set by the model.  If not set the timezone for
 	 *                          		the website will be used.
-	 * @return EE_Attendee
+	 * @return EE_Question
 	 */
 	public static function new_instance_from_db( $props_n_values = array(), $timezone = null ) {
 		return new self( $props_n_values, TRUE, $timezone );
@@ -184,7 +184,7 @@ 
 	/**
 	 * returns the text for displaying the question to users
 	 * @access public
-	 * @return string
+	 * @return boolean
 	 */
 	public function display_text() {
 		return $this->get( 'QST_display_text' );
@@ -195,7 +195,7 @@ 
 	/**
 	 * returns the text for the administrative label
 	 * @access public
-	 * @return string
+	 * @return boolean
 	 */
 	public function admin_label() {
 		return $this->get( 'QST_admin_label' );
@@ -206,7 +206,7 @@ 
 	/**
 	 * returns the attendee column name for this question
 	 * @access public
-	 * @return string
+	 * @return boolean
 	 */
 	public function system_ID() {
 		return $this->get( 'QST_system' );
@@ -229,7 +229,7 @@ 
 	 * returns the text which should be displayed when a user
 	 * doesn't answer this question in a form
 	 * @access public
-	 * @return string
+	 * @return boolean
 	 */
 	public function required_text() {
 		return $this->get( 'QST_required_text' );
@@ -240,7 +240,7 @@ 
 	/**
 	 * returns the type of this question
 	 * @access public
-	 * @return string
+	 * @return boolean
 	 */
 	public function type() {
 		return $this->get( 'QST_type' );
@@ -252,7 +252,7 @@ 
 	 * returns an integer showing where this question should
 	 * be placed in a sequence of questions
 	 * @access public
-	 * @return int
+	 * @return boolean
 	 */
 	public function order() {
 		return $this->get( 'QST_order' );
@@ -275,7 +275,7 @@ 
 	/**
 	 * returns the id the wordpress user who created this question
 	 * @access public
-	 * @return int
+	 * @return boolean
 	 */
 	public function wp_user() {
 		return $this->get( 'QST_wp_user' );
@@ -369,7 +369,7 @@ 
 	 * Adds an option for this question. Note: if the option were previously associated with a different
 	 * Question, that relationship will be overwritten.
 	 * @param EE_Question_Option $option
-	 * @return boolean success
+	 * @return EE_Base_Class success
 	 */
 	public function add_option( EE_Question_Option $option ) {
 		return $this->_add_relation_to( $option, 'Question_Option' );
@@ -392,7 +392,7 @@ 
 	/**
 	 * Marks the option as deleted.
 	 * @param EE_Question_Option $option
-	 * @return boolean success
+	 * @return EE_Base_Class success
 	 */
 	public function remove_option( EE_Question_Option $option ) {
 		return $this->_remove_relation_to( $option, 'Question_Option' );

Spacing +61 added lines, -61 removed lines

@@ -1,5 +1,5 @@ 
-<?php if ( !defined( 'EVENT_ESPRESSO_VERSION' ) ) {
-	exit( 'No direct script access allowed' );
+<?php if ( ! defined('EVENT_ESPRESSO_VERSION')) {
+	exit('No direct script access allowed');
 }
 /**
  * Event Espresso
@@ -37,9 +37,9 @@ 
 	 *                             		    date_format and the second value is the time format
 	 * @return EE_Attendee
 	 */
-	public static function new_instance( $props_n_values = array(), $timezone = null, $date_formats = array() ) {
-		$has_object = parent::_check_for_object( $props_n_values, __CLASS__ );
-		return $has_object ? $has_object : new self( $props_n_values, false, $timezone, $date_formats );
+	public static function new_instance($props_n_values = array(), $timezone = null, $date_formats = array()) {
+		$has_object = parent::_check_for_object($props_n_values, __CLASS__);
+		return $has_object ? $has_object : new self($props_n_values, false, $timezone, $date_formats);
 	}
 
 
@@ -50,8 +50,8 @@ 
 	 *                          		the website will be used.
 	 * @return EE_Attendee
 	 */
-	public static function new_instance_from_db( $props_n_values = array(), $timezone = null ) {
-		return new self( $props_n_values, TRUE, $timezone );
+	public static function new_instance_from_db($props_n_values = array(), $timezone = null) {
+		return new self($props_n_values, TRUE, $timezone);
 	}
 
 
@@ -62,8 +62,8 @@ 
 	 * @access        public
 	 * @param string $QST_display_text
 	 */
-	public function set_display_text( $QST_display_text = '' ) {
-		$this->set( 'QST_display_text', $QST_display_text );
+	public function set_display_text($QST_display_text = '') {
+		$this->set('QST_display_text', $QST_display_text);
 	}
 
 
@@ -74,8 +74,8 @@ 
 	 * @access        public
 	 * @param        string $QST_admin_label
 	 */
-	public function set_admin_label( $QST_admin_label = '' ) {
-		$this->set( 'QST_admin_label', $QST_admin_label );
+	public function set_admin_label($QST_admin_label = '') {
+		$this->set('QST_admin_label', $QST_admin_label);
 	}
 
 
@@ -86,8 +86,8 @@ 
 	 * @access        public
 	 * @param        mixed $QST_system
 	 */
-	public function set_system_ID( $QST_system = '' ) {
-		$this->set( 'QST_system', $QST_system );
+	public function set_system_ID($QST_system = '') {
+		$this->set('QST_system', $QST_system);
 	}
 
 
@@ -98,8 +98,8 @@ 
 	 * @access        public
 	 * @param        string $QST_type
 	 */
-	public function set_question_type( $QST_type = '' ) {
-		$this->set( 'QST_type', $QST_type );
+	public function set_question_type($QST_type = '') {
+		$this->set('QST_type', $QST_type);
 	}
 
 
@@ -110,8 +110,8 @@ 
 	 * @access        public
 	 * @param        bool $QST_required
 	 */
-	public function set_required( $QST_required = FALSE ) {
-		$this->set( 'QST_required', $QST_required );
+	public function set_required($QST_required = FALSE) {
+		$this->set('QST_required', $QST_required);
 	}
 
 
@@ -122,8 +122,8 @@ 
 	 * @access        public
 	 * @param        string $QST_required_text
 	 */
-	public function set_required_text( $QST_required_text = '' ) {
-		$this->set( 'QST_required_text', $QST_required_text );
+	public function set_required_text($QST_required_text = '') {
+		$this->set('QST_required_text', $QST_required_text);
 	}
 
 
@@ -134,8 +134,8 @@ 
 	 * @access        public
 	 * @param        int $QST_order
 	 */
-	public function set_order( $QST_order = 0 ) {
-		$this->set( 'QST_order', $QST_order );
+	public function set_order($QST_order = 0) {
+		$this->set('QST_order', $QST_order);
 	}
 
 
@@ -146,8 +146,8 @@ 
 	 * @access        public
 	 * @param        bool $QST_admin_only
 	 */
-	public function set_admin_only( $QST_admin_only = FALSE ) {
-		$this->set( 'QST_admin_only', $QST_admin_only );
+	public function set_admin_only($QST_admin_only = FALSE) {
+		$this->set('QST_admin_only', $QST_admin_only);
 	}
 
 
@@ -158,8 +158,8 @@ 
 	 * @access        public
 	 * @param        int $QST_wp_user
 	 */
-	public function set_wp_user( $QST_wp_user = 1 ) {
-		$this->set( 'QST_wp_user', $QST_wp_user );
+	public function set_wp_user($QST_wp_user = 1) {
+		$this->set('QST_wp_user', $QST_wp_user);
 	}
 
 
@@ -175,8 +175,8 @@ 
 	 * @access        public
 	 * @param 	bool $QST_deleted
 	 */
-	public function set_deleted( $QST_deleted = FALSE ) {
-		$this->set( 'QST_deleted', $QST_deleted );
+	public function set_deleted($QST_deleted = FALSE) {
+		$this->set('QST_deleted', $QST_deleted);
 	}
 
 
@@ -187,7 +187,7 @@ 
 	 * @return string
 	 */
 	public function display_text() {
-		return $this->get( 'QST_display_text' );
+		return $this->get('QST_display_text');
 	}
 
 
@@ -198,7 +198,7 @@ 
 	 * @return string
 	 */
 	public function admin_label() {
-		return $this->get( 'QST_admin_label' );
+		return $this->get('QST_admin_label');
 	}
 
 
@@ -209,7 +209,7 @@ 
 	 * @return string
 	 */
 	public function system_ID() {
-		return $this->get( 'QST_system' );
+		return $this->get('QST_system');
 	}
 
 
@@ -220,7 +220,7 @@ 
 	 * @return boolean
 	 */
 	public function required() {
-		return $this->get( 'QST_required' );
+		return $this->get('QST_required');
 	}
 
 
@@ -232,7 +232,7 @@ 
 	 * @return string
 	 */
 	public function required_text() {
-		return $this->get( 'QST_required_text' );
+		return $this->get('QST_required_text');
 	}
 
 
@@ -243,7 +243,7 @@ 
 	 * @return string
 	 */
 	public function type() {
-		return $this->get( 'QST_type' );
+		return $this->get('QST_type');
 	}
 
 
@@ -255,7 +255,7 @@ 
 	 * @return int
 	 */
 	public function order() {
-		return $this->get( 'QST_order' );
+		return $this->get('QST_order');
 	}
 
 
@@ -267,7 +267,7 @@ 
 	 * @return boolean
 	 */
 	public function admin_only() {
-		return $this->get( 'QST_admin_only' );
+		return $this->get('QST_admin_only');
 	}
 
 
@@ -278,7 +278,7 @@ 
 	 * @return int
 	 */
 	public function wp_user() {
-		return $this->get( 'QST_wp_user' );
+		return $this->get('QST_wp_user');
 	}
 
 
@@ -289,7 +289,7 @@ 
 	 * @return boolean
 	 */
 	public function deleted() {
-		return $this->get( 'QST_deleted' );
+		return $this->get('QST_deleted');
 	}
 
 
@@ -299,7 +299,7 @@ 
 	 * @return EE_Answer[]
 	 */
 	public function answers() {
-		return $this->get_many_related( 'Answer' );
+		return $this->get_many_related('Answer');
 	}
 
 
@@ -309,7 +309,7 @@ 
 	 * @return boolean true = has answers, false = no answers.
 	 */
 	public function has_answers() {
-		return $this->count_related( 'Answer' ) > 0 ? TRUE : FALSE;
+		return $this->count_related('Answer') > 0 ? TRUE : FALSE;
 	}
 
 
@@ -319,7 +319,7 @@ 
 	 * @return EE_Question_Group[]
 	 */
 	public function question_groups() {
-		return $this->get_many_related( 'Question_Group' );
+		return $this->get_many_related('Question_Group');
 	}
 
 
@@ -333,24 +333,24 @@ 
 	 *                                                       whether it was trashed or not.
 	 * @return EE_Question_Option[]
 	 */
-	public function options( $notDeletedOptionsOnly = TRUE, $selected_value_to_always_include = NULL ) {
-		if ( ! $this->ID() ) {
+	public function options($notDeletedOptionsOnly = TRUE, $selected_value_to_always_include = NULL) {
+		if ( ! $this->ID()) {
 			return array();
 		}
 		$query_params = array();
-		if ( $selected_value_to_always_include ) {
-			if ( is_array( $selected_value_to_always_include ) ) {
-				$query_params[ 0 ][ 'OR*options-query' ][ 'QSO_value' ] = array( 'IN', $selected_value_to_always_include );
+		if ($selected_value_to_always_include) {
+			if (is_array($selected_value_to_always_include)) {
+				$query_params[0]['OR*options-query']['QSO_value'] = array('IN', $selected_value_to_always_include);
 			} else {
-				$query_params[ 0 ][ 'OR*options-query' ][ 'QSO_value' ] = $selected_value_to_always_include;
+				$query_params[0]['OR*options-query']['QSO_value'] = $selected_value_to_always_include;
 			}
 		}
-		if ( $notDeletedOptionsOnly ) {
-			$query_params[ 0 ][ 'OR*options-query' ][ 'QSO_deleted' ] = FALSE;
+		if ($notDeletedOptionsOnly) {
+			$query_params[0]['OR*options-query']['QSO_deleted'] = FALSE;
 		}
 		//order by QSO_order
-		$query_params[ 'order_by' ] = array( 'QSO_order' => 'ASC' );
-		return $this->get_many_related( 'Question_Option', $query_params );
+		$query_params['order_by'] = array('QSO_order' => 'ASC');
+		return $this->get_many_related('Question_Option', $query_params);
 	}
 
 
@@ -360,7 +360,7 @@ 
 	 * @return \EE_Question_Option[]
 	 */
 	public function temp_options() {
-		return $this->_model_relations[ 'Question_Option' ];
+		return $this->_model_relations['Question_Option'];
 	}
 
 
@@ -371,8 +371,8 @@ 
 	 * @param EE_Question_Option $option
 	 * @return boolean success
 	 */
-	public function add_option( EE_Question_Option $option ) {
-		return $this->_add_relation_to( $option, 'Question_Option' );
+	public function add_option(EE_Question_Option $option) {
+		return $this->_add_relation_to($option, 'Question_Option');
 	}
 
 
@@ -382,8 +382,8 @@ 
 	 * @param EE_Question_Option $option
 	 * @return boolean success
 	 */
-	public function add_temp_option( EE_Question_Option $option ) {
-		$this->_model_relations[ 'Question_Option' ][ ] = $option;
+	public function add_temp_option(EE_Question_Option $option) {
+		$this->_model_relations['Question_Option'][] = $option;
 		return TRUE;
 	}
 
@@ -394,8 +394,8 @@ 
 	 * @param EE_Question_Option $option
 	 * @return boolean success
 	 */
-	public function remove_option( EE_Question_Option $option ) {
-		return $this->_remove_relation_to( $option, 'Question_Option' );
+	public function remove_option(EE_Question_Option $option) {
+		return $this->_remove_relation_to($option, 'Question_Option');
 	}
 
 
@@ -404,8 +404,8 @@ 
 	 * @return bool
 	 */
 	public function is_system_question() {
-		$system_ID = $this->get( 'QST_system' );
-		return ! empty( $system_ID ) ? TRUE : FALSE;
+		$system_ID = $this->get('QST_system');
+		return ! empty($system_ID) ? TRUE : FALSE;
 	}
 
 
@@ -418,8 +418,8 @@ 
 	 */
 	public function set_order_to_latest() {
 		$latest_order = $this->get_model()->get_latest_question_order();
-		$latest_order ++;
-		$this->set( 'QST_order', $latest_order );
+		$latest_order++;
+		$this->set('QST_order', $latest_order);
 	}
 
 

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

Doc Comments +10 added lines, -10 removed lines

@@ -56,7 +56,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_Question_Option
 	 */
 	public static function new_instance_from_db( $props_n_values = array(), $timezone = null ) {
 		return new self( $props_n_values, TRUE, $timezone );
@@ -67,7 +67,7 @@ 
 	/**
 	 * Sets the option's key value
 	 * @param string $value
-	 * @return bool success
+	 * @return boolean|null success
 	 */
 	public function set_value( $value ) {
 		$this->set( 'QSO_value', $value );
@@ -78,7 +78,7 @@ 
 	/**
 	 * Sets the option's Display Text
 	 * @param string $text
-	 * @return bool success
+	 * @return boolean|null success
 	 */
 	public function set_desc( $text ) {
 		$this->set( 'QSO_desc', $text );
@@ -91,7 +91,7 @@ 
 	 *
 	 * @access public
 	 * @param integer $order
-	 * @return bool      $success
+	 * @return boolean|null      $success
 	 */
 	public function set_order( $order ) {
 		$this->set( 'QSO_order', $order );
@@ -102,7 +102,7 @@ 
 	/**
 	 * Sets the ID of the related question
 	 * @param int $question_ID
-	 * @return bool success
+	 * @return boolean|null success
 	 */
 	public function set_question_ID( $question_ID ) {
 		$this->set( 'QST_ID', $question_ID );
@@ -113,7 +113,7 @@ 
 	/**
 	 * Sets the option's opt_group
 	 * @param string $text
-	 * @return bool success
+	 * @return string success
 	 */
 	public function set_opt_group( $text ) {
 		return $this->_QSO_opt_group = $text;
@@ -123,7 +123,7 @@ 
 
 	/**
 	 * Gets the option's key value
-	 * @return string
+	 * @return boolean
 	 */
 	public function value() {
 		return $this->get( 'QSO_value' );
@@ -133,7 +133,7 @@ 
 
 	/**
 	 * Gets the option's display text
-	 * @return string
+	 * @return boolean
 	 */
 	public function desc() {
 		return $this->get( 'QSO_desc' );
@@ -155,7 +155,7 @@ 
 	 * Returns the order or the Question Option
 	 *
 	 * @access public
-	 * @return integer
+	 * @return boolean
 	 */
 	public function order() {
 		return $this->get( 'QSO_option' );
@@ -165,7 +165,7 @@ 
 
 	/**
 	 * Gets the related question's ID
-	 * @return int
+	 * @return boolean
 	 */
 	public function question_ID() {
 		return $this->get( 'QST_ID' );

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
@@ -45,9 +45,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);
 	}
 
 
@@ -58,8 +58,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);
 	}
 
 
@@ -69,8 +69,8 @@ 
 	 * @param string $value
 	 * @return bool success
 	 */
-	public function set_value( $value ) {
-		$this->set( 'QSO_value', $value );
+	public function set_value($value) {
+		$this->set('QSO_value', $value);
 	}
 
 
@@ -80,8 +80,8 @@ 
 	 * @param string $text
 	 * @return bool success
 	 */
-	public function set_desc( $text ) {
-		$this->set( 'QSO_desc', $text );
+	public function set_desc($text) {
+		$this->set('QSO_desc', $text);
 	}
 
 
@@ -93,8 +93,8 @@ 
 	 * @param integer $order
 	 * @return bool      $success
 	 */
-	public function set_order( $order ) {
-		$this->set( 'QSO_order', $order );
+	public function set_order($order) {
+		$this->set('QSO_order', $order);
 	}
 
 
@@ -104,8 +104,8 @@ 
 	 * @param int $question_ID
 	 * @return bool success
 	 */
-	public function set_question_ID( $question_ID ) {
-		$this->set( 'QST_ID', $question_ID );
+	public function set_question_ID($question_ID) {
+		$this->set('QST_ID', $question_ID);
 	}
 
 
@@ -115,7 +115,7 @@ 
 	 * @param string $text
 	 * @return bool success
 	 */
-	public function set_opt_group( $text ) {
+	public function set_opt_group($text) {
 		return $this->_QSO_opt_group = $text;
 	}
 
@@ -126,7 +126,7 @@ 
 	 * @return string
 	 */
 	public function value() {
-		return $this->get( 'QSO_value' );
+		return $this->get('QSO_value');
 	}
 
 
@@ -136,7 +136,7 @@ 
 	 * @return string
 	 */
 	public function desc() {
-		return $this->get( 'QSO_desc' );
+		return $this->get('QSO_desc');
 	}
 
 
@@ -146,7 +146,7 @@ 
 	 * @return boolean
 	 */
 	public function deleted() {
-		return $this->get( 'QSO_deleted' );
+		return $this->get('QSO_deleted');
 	}
 
 
@@ -158,7 +158,7 @@ 
 	 * @return integer
 	 */
 	public function order() {
-		return $this->get( 'QSO_option' );
+		return $this->get('QSO_option');
 	}
 
 
@@ -168,7 +168,7 @@ 
 	 * @return int
 	 */
 	public function question_ID() {
-		return $this->get( 'QST_ID' );
+		return $this->get('QST_ID');
 	}
 
 
@@ -178,7 +178,7 @@ 
 	 * @return EE_Question
 	 */
 	public function question() {
-		return $this->get_first_related( 'Question' );
+		return $this->get_first_related('Question');
 	}
 
 

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 +10 added lines, -10 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);
 	}