eventespresso / event-espresso-core

core/data_migration_scripts/4_6_0_stages/EE_DMS_4_6_0_billing_info.dmsstage.php

Spacing +16 added lines, -16 removed lines

@@ -1,6 +1,6 @@ 
 <?php
-if ( !defined( 'EVENT_ESPRESSO_VERSION' ) ) {
-	exit( 'No direct script access allowed' );
+if ( ! defined('EVENT_ESPRESSO_VERSION')) {
+	exit('No direct script access allowed');
 }
 
 /**
@@ -12,24 +12,24 @@ 
  * @author				Mike Nelson
  *
  */
-class EE_DMS_4_6_0_billing_info extends EE_Data_Migration_Script_Stage_Table{
-	function __construct(){
+class EE_DMS_4_6_0_billing_info extends EE_Data_Migration_Script_Stage_Table {
+	function __construct() {
 		global $wpdb;
 		$this->_old_table = $wpdb->postmeta;
 		$this->_pretty_name = __('Billing Info', 'event_espresso');
 		$this->_extra_where_sql = "WHERE meta_key LIKE 'billing_info_%'";
 		parent::__construct();
 	}
-	protected function _migrate_old_row( $old_row ) {
+	protected function _migrate_old_row($old_row) {
 		$new_billing_info = array();
-		$old_billing_info = maybe_unserialize( $old_row[ 'meta_value' ] );
-		$gateway_name = str_replace( "billing_info_",'',$old_row[ 'meta_key' ] );
+		$old_billing_info = maybe_unserialize($old_row['meta_value']);
+		$gateway_name = str_replace("billing_info_", '', $old_row['meta_key']);
 		$repetitive_prefix = '_reg-page-billing-';
-		$repetitive_suffix = "-" . $gateway_name;
-		foreach( $old_billing_info as $old_input_name => $input_value ){
-			$old_input_name_important_part = str_replace( array( $repetitive_prefix, $repetitive_suffix ), array( '', ''), $old_input_name );
+		$repetitive_suffix = "-".$gateway_name;
+		foreach ($old_billing_info as $old_input_name => $input_value) {
+			$old_input_name_important_part = str_replace(array($repetitive_prefix, $repetitive_suffix), array('', ''), $old_input_name);
 
-			switch( $old_input_name_important_part ){
+			switch ($old_input_name_important_part) {
 				case 'fname':
 					$new_input_name = 'first_name';
 					break;
@@ -39,7 +39,7 @@ 
 				case 'state':
 					//we used to store the state's id ,but now we just store the name
 					$new_input_name = $old_input_name_important_part;
-					$input_value = $this->_get_state_name_by_ID( $input_value );
+					$input_value = $this->_get_state_name_by_ID($input_value);
 					break;
 				case 'card-nmbr':
 					$new_input_name = 'credit_card';
@@ -62,9 +62,9 @@ 
 					$new_input_name = $old_input_name_important_part;
 
 			}
-			$new_billing_info[ $new_input_name ] = $input_value;
+			$new_billing_info[$new_input_name] = $input_value;
 		}
-		update_post_meta( $old_row[ 'post_id' ], $old_row[ 'meta_key' ], $new_billing_info );
+		update_post_meta($old_row['post_id'], $old_row['meta_key'], $new_billing_info);
 	}
 	/**
 	 *
@@ -72,9 +72,9 @@ 
 	 * @param int $id
 	 * @return string
 	 */
-	protected function _get_state_name_by_ID( $id ){
+	protected function _get_state_name_by_ID($id) {
 		global $wpdb;
-		return $wpdb->get_var( $wpdb->prepare( "SELECT STA_name FROM " . $wpdb->prefix . "esp_state WHERE STA_ID = %d", $id ) );
+		return $wpdb->get_var($wpdb->prepare("SELECT STA_name FROM ".$wpdb->prefix."esp_state WHERE STA_ID = %d", $id));
 	}
 
 

core/data_migration_scripts/4_7_0_stages/EE_DMS_4_7_0_Add_Taxes_To_REG_Final_Price.dmsstage.php

Spacing +39 added lines, -39 removed lines

@@ -1,6 +1,6 @@ 
 <?php
-if ( !defined( 'EVENT_ESPRESSO_VERSION' ) ) {
-	exit( 'No direct script access allowed' );
+if ( ! defined('EVENT_ESPRESSO_VERSION')) {
+	exit('No direct script access allowed');
 }
 
 /**
@@ -12,20 +12,20 @@ 
  * @author				Brent Christensen
  *
  */
-class EE_DMS_4_7_0_Add_Taxes_To_REG_Final_Price extends EE_Data_Migration_Script_Stage_Table{
+class EE_DMS_4_7_0_Add_Taxes_To_REG_Final_Price extends EE_Data_Migration_Script_Stage_Table {
 
 	protected $_ticket_table;
 
 	protected $_line_item_table;
 
-	function __construct(){
+	function __construct() {
 		/** @type WPDB $wpdb */
 		global $wpdb;
-		$this->_pretty_name = __( 'Registration Final Price Tax Calculations', 'event_espresso' );
+		$this->_pretty_name = __('Registration Final Price Tax Calculations', 'event_espresso');
 		// define tables
-		$this->_old_table 				= $wpdb->prefix . 'esp_registration';
-		$this->_ticket_table 			= $wpdb->prefix . 'esp_ticket';
-		$this->_line_item_table 	= $wpdb->prefix . 'esp_line_item';
+		$this->_old_table = $wpdb->prefix.'esp_registration';
+		$this->_ticket_table = $wpdb->prefix.'esp_ticket';
+		$this->_line_item_table = $wpdb->prefix.'esp_line_item';
 		parent::__construct();
 	}
 
@@ -55,7 +55,7 @@ 
 		global $wpdb;
 		$SQL = "SELECT count( reg.REG_ID ) ";
 		$SQL .= $this->_get_rest_of_sql_for_query();
-		$count = $wpdb->get_var( $SQL );
+		$count = $wpdb->get_var($SQL);
 		return $count;
 	}
 
@@ -67,13 +67,13 @@ 
 	 * @param int $limit
 	 * @return array of arrays like $wpdb->get_results($sql, ARRAY_A)
 	 */
-	protected function _get_rows( $limit ) {
+	protected function _get_rows($limit) {
 		/** @type WPDB $wpdb */
 		global $wpdb;
 		$start_at_record = $this->count_records_migrated();
 		$SQL = "SELECT reg.REG_ID,  reg.REG_final_price, line.LIN_ID ";
 		$SQL .= $this->_get_rest_of_sql_for_query();
-		$SQL .= $wpdb->prepare( "LIMIT %d, %d", $start_at_record, $limit );
+		$SQL .= $wpdb->prepare("LIMIT %d, %d", $start_at_record, $limit);
 
 		// produces something like:
 		/*
@@ -93,7 +93,7 @@ 
 			LIMIT 1, 50
 		 */
 
-		return $wpdb->get_results( $SQL, ARRAY_A );
+		return $wpdb->get_results($SQL, ARRAY_A);
 	}
 
 
@@ -102,38 +102,38 @@ 
 	 * @param array $row
 	 * @return void
 	 */
-	protected function _migrate_old_row( $row ) {
+	protected function _migrate_old_row($row) {
 		/** @type WPDB $wpdb */
 		global $wpdb;
 		// ensure all required values are present
-		if ( ! isset( $row[ 'REG_ID' ], $row[ 'REG_final_price' ], $row[ 'LIN_ID' ] )) {
+		if ( ! isset($row['REG_ID'], $row['REG_final_price'], $row['LIN_ID'])) {
 			$this->add_error(
 				sprintf(
-					__( 'Invalid query results returned with the following data:%1$s REG_ID=%2$d, REG_final_price=%3$d, LIN_ID=%4$f. Error: "%5$s"', 'event_espresso' ),
+					__('Invalid query results returned with the following data:%1$s REG_ID=%2$d, REG_final_price=%3$d, LIN_ID=%4$f. Error: "%5$s"', 'event_espresso'),
 					'<br />',
-					isset( $row[ 'REG_ID' ] ) ? $row[ 'REG_ID' ] : '',
-					isset( $row[ 'REG_final_price' ] ) ? $row[ 'REG_final_price' ] : '',
-					isset( $row[ 'LIN_ID' ] ) ? $row[ 'LIN_ID' ] : '',
+					isset($row['REG_ID']) ? $row['REG_ID'] : '',
+					isset($row['REG_final_price']) ? $row['REG_final_price'] : '',
+					isset($row['LIN_ID']) ? $row['LIN_ID'] : '',
 					$wpdb->last_error
 				)
 			);
 			return;
 		}
 		// get tax subtotal
-		$tax_subtotal_line_item_ID = $this->_get_line_item_ID_for_tax_subtotal( $row['LIN_ID'] );
-		if ( ! $tax_subtotal_line_item_ID ) {
+		$tax_subtotal_line_item_ID = $this->_get_line_item_ID_for_tax_subtotal($row['LIN_ID']);
+		if ( ! $tax_subtotal_line_item_ID) {
 			$this->add_error(
 				sprintf(
-					__( 'Invalid line item ID returned. Error: "%1$s"', 'event_espresso' ),
+					__('Invalid line item ID returned. Error: "%1$s"', 'event_espresso'),
 					$wpdb->last_error
 				)
 			);
 			return;
 		}
 		// now get taxes
-		$taxes = $this->_get_tax_amounts( $tax_subtotal_line_item_ID );
+		$taxes = $this->_get_tax_amounts($tax_subtotal_line_item_ID);
 		// apply taxes to registration final price
-		$this->_apply_taxes( $row[ 'REG_ID' ], $row[ 'REG_final_price' ], $taxes );
+		$this->_apply_taxes($row['REG_ID'], $row['REG_final_price'], $taxes);
 
 	}
 
@@ -145,14 +145,14 @@ 
 	 * @param int $LIN_ID
 	 * @return int
 	 */
-	protected function _get_line_item_ID_for_tax_subtotal( $LIN_ID ) {
+	protected function _get_line_item_ID_for_tax_subtotal($LIN_ID) {
 		/** @type WPDB $wpdb */
 		global $wpdb;
 		$SQL = "SELECT LIN_ID ";
 		$SQL .= "FROM {$this->_line_item_table} ";
 		$SQL .= "WHERE LIN_parent = %d ";
 		$SQL .= "AND LIN_code = 'taxes'";
-		return $wpdb->get_var( $wpdb->prepare( $SQL, $LIN_ID ) );
+		return $wpdb->get_var($wpdb->prepare($SQL, $LIN_ID));
 	}
 
 
@@ -163,13 +163,13 @@ 
 	 * @param int $LIN_ID
 	 * @return array
 	 */
-	protected function _get_tax_amounts( $LIN_ID ) {
+	protected function _get_tax_amounts($LIN_ID) {
 		/** @type WPDB $wpdb */
 		global $wpdb;
 		$SQL = "SELECT LIN_percent ";
 		$SQL .= "FROM {$this->_line_item_table} ";
 		$SQL .= "WHERE LIN_parent = %d";
-		return $wpdb->get_results( $wpdb->prepare( $SQL, $LIN_ID ), OBJECT_K );
+		return $wpdb->get_results($wpdb->prepare($SQL, $LIN_ID), OBJECT_K);
 	}
 
 
@@ -182,14 +182,14 @@ 
 	 * @param array $taxes
 	 * @return void
 	 */
-	protected function _apply_taxes( $REG_ID = 0, $final_price = 0.00, $taxes = array() ) {
-		if ( is_array( $taxes ) && ! empty( $taxes ) ) {
+	protected function _apply_taxes($REG_ID = 0, $final_price = 0.00, $taxes = array()) {
+		if (is_array($taxes) && ! empty($taxes)) {
 			$total_taxes = 0;
-			foreach ( $taxes as $tax ) {
-				$total_taxes += $final_price * ( $tax->LIN_percent / 100 );
+			foreach ($taxes as $tax) {
+				$total_taxes += $final_price * ($tax->LIN_percent / 100);
 			}
 			$final_price += $total_taxes;
-			$this->_update_registration_final_price( $REG_ID, $final_price );
+			$this->_update_registration_final_price($REG_ID, $final_price);
 		}
 	}
 
@@ -202,20 +202,20 @@ 
 	 * @param float $REG_final_price
 	 * @return void
 	 */
-	protected function _update_registration_final_price( $REG_ID = 0, $REG_final_price = 0.00 ) {
+	protected function _update_registration_final_price($REG_ID = 0, $REG_final_price = 0.00) {
 		/** @type WPDB $wpdb */
 		global $wpdb;
 		$success = $wpdb->update(
 			$this->_old_table,
-			array( 'REG_final_price' => $REG_final_price ),  // data
-			array( 'REG_ID' => $REG_ID ),  // where
-			array( '%f' ),   // data format
-			array( '%d' )  // where format
+			array('REG_final_price' => $REG_final_price), // data
+			array('REG_ID' => $REG_ID), // where
+			array('%f'), // data format
+			array('%d')  // where format
 		);
-		if ( $success === false ) {
+		if ($success === false) {
 			$this->add_error(
 				sprintf(
-					__( 'Could not update registration final price value for registration ID=%1$d because "%2$s"', 'event_espresso' ),
+					__('Could not update registration final price value for registration ID=%1$d because "%2$s"', 'event_espresso'),
 					$REG_ID,
 					$wpdb->last_error
 				)

core/data_migration_scripts/4_8_0_stages/EE_DMS_4_8_0_pretax_totals.dmsstage.php

Spacing +6 added lines, -6 removed lines

@@ -1,5 +1,5 @@ 
 <?php
-if (!defined('EVENT_ESPRESSO_VERSION')) {
+if ( ! defined('EVENT_ESPRESSO_VERSION')) {
 	exit('No direct script access allowed');
 }
 
@@ -13,7 +13,7 @@ 
  *
  * Migrates line items that used to have LIN_code="tickets" to "pre-tax-total"
  */
-class EE_DMS_4_8_0_pretax_totals extends EE_Data_Migration_Script_Stage{
+class EE_DMS_4_8_0_pretax_totals extends EE_Data_Migration_Script_Stage {
 
 	protected $_line_item_table_name;
 
@@ -53,10 +53,10 @@ 
 		global $wpdb;
 		$rows_updated = $wpdb->update(
 				$this->_line_item_table_name,
-				array( 'LIN_code' => 'pre-tax-subtotal' ),
-				array( 'LIN_code' => 'tickets' ),
-				array( '%s' ),
-				array( '%s' ) );
+				array('LIN_code' => 'pre-tax-subtotal'),
+				array('LIN_code' => 'tickets'),
+				array('%s'),
+				array('%s') );
 		$this->set_completed();
 		return 1;
 	}

core/data_migration_scripts/EE_Data_Migration_Script_Stage_Table.core.php

Indentation +6 added lines, -6 removed lines

@@ -21,12 +21,12 @@
 	protected $_old_table;
 
 /**
-	 * Set in the constructor to add this sql to both the counting query in
-	 * EE_Data_Migration_Script_Stage_Table::_count_records_to_migrate() and
-	 * EE_Data_Migration_Script_Stage_Table::_get_rows().
-	 * Eg "where column_name like '%some_value%'"
-	 * @var string
-	 */
+ * Set in the constructor to add this sql to both the counting query in
+ * EE_Data_Migration_Script_Stage_Table::_count_records_to_migrate() and
+ * EE_Data_Migration_Script_Stage_Table::_get_rows().
+ * Eg "where column_name like '%some_value%'"
+ * @var string
+ */
 	protected $_extra_where_sql;
 
 

Spacing +9 added lines, -9 removed lines

@@ -41,14 +41,14 @@ 
 	 * @param int $num_items
 	 * @return int number of items ACTUALLY migrated
 	 */
-	function _migration_step($num_items=50){
-		$rows = $this->_get_rows( $num_items );
+	function _migration_step($num_items = 50) {
+		$rows = $this->_get_rows($num_items);
 		$items_actually_migrated = 0;
-		foreach($rows as $old_row){
+		foreach ($rows as $old_row) {
 			$this->_migrate_old_row($old_row);
 			$items_actually_migrated++;
 		}
-		if($this->count_records_migrated() + $items_actually_migrated >= $this->count_records_to_migrate()){
+		if ($this->count_records_migrated() + $items_actually_migrated >= $this->count_records_to_migrate()) {
 			$this->set_completed();
 		}
 		return $items_actually_migrated;
@@ -60,11 +60,11 @@ 
 	 * @param int $limit
 	 * @return array of arrays like $wpdb->get_results($sql, ARRAY_A)
 	 */
-	protected function _get_rows( $limit ){
+	protected function _get_rows($limit) {
 		global $wpdb;
 		$start_at_record = $this->count_records_migrated();
-		$query = "SELECT * FROM {$this->_old_table} {$this->_extra_where_sql} " . $wpdb->prepare("LIMIT %d, %d",$start_at_record,$limit);
-		return $wpdb->get_results($query,ARRAY_A);
+		$query = "SELECT * FROM {$this->_old_table} {$this->_extra_where_sql} ".$wpdb->prepare("LIMIT %d, %d", $start_at_record, $limit);
+		return $wpdb->get_results($query, ARRAY_A);
 	}
 
 
@@ -75,8 +75,8 @@ 
 	 */
 	function _count_records_to_migrate() {
 		global $wpdb;
-		$query =  "SELECT COUNT(*) FROM {$this->_old_table} {$this->_extra_where_sql}";
-		$count = $wpdb->get_var( $query );
+		$query = "SELECT COUNT(*) FROM {$this->_old_table} {$this->_extra_where_sql}";
+		$count = $wpdb->get_var($query);
 		return $count;
 	}
 

core/db_classes/EE_Answer.class.php

Spacing +22 added lines, -22 removed lines

@@ -1,5 +1,5 @@ 
-<?php if ( !defined( 'EVENT_ESPRESSO_VERSION' ) ) {
-	exit( 'No direct script access allowed' );
+<?php if ( ! defined('EVENT_ESPRESSO_VERSION')) {
+	exit('No direct script access allowed');
 }
 /**
  * Event Espresso
@@ -31,9 +31,9 @@ 
 	 * @param array $props_n_values
 	 * @return EE_Answer
 	 */
-	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_Answer
 	 */
-	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 int $QST_ID
 	 */
-	public function set_question( $QST_ID = 0 ) {
-		$this->set( 'QST_ID', $QST_ID );
+	public function set_question($QST_ID = 0) {
+		$this->set('QST_ID', $QST_ID);
 	}
 
 
@@ -67,8 +67,8 @@ 
 	 * @access        public
 	 * @param int $REG_ID
 	 */
-	public function set_registration( $REG_ID = 0 ) {
-		$this->set( 'REG_ID', $REG_ID );
+	public function set_registration($REG_ID = 0) {
+		$this->set('REG_ID', $REG_ID);
 	}
 
 
@@ -79,8 +79,8 @@ 
 	 * @access        public
 	 * @param mixed $ANS_value
 	 */
-	public function set_value( $ANS_value = '' ) {
-		$this->set( 'ANS_value', $ANS_value );
+	public function set_value($ANS_value = '') {
+		$this->set('ANS_value', $ANS_value);
 	}
 
 
@@ -92,7 +92,7 @@ 
 	 * @return        int
 	 */
 	public function registration_ID() {
-		return $this->get( 'REG_ID' );
+		return $this->get('REG_ID');
 	}
 
 
@@ -104,7 +104,7 @@ 
 	 * @return        int
 	 */
 	public function question_ID() {
-		return $this->get( 'QST_ID' );
+		return $this->get('QST_ID');
 	}
 
 
@@ -116,7 +116,7 @@ 
 	 * @return        string
 	 */
 	public function value() {
-		return $this->get( 'ANS_value' );
+		return $this->get('ANS_value');
 	}
 
 
@@ -126,8 +126,8 @@ 
 	 * @param null $schema
 	 * @return string
 	 */
-	public function pretty_value( $schema = NULL ) {
-		return $this->get_pretty( 'ANS_value', $schema );
+	public function pretty_value($schema = NULL) {
+		return $this->get_pretty('ANS_value', $schema);
 	}
 
 
@@ -136,8 +136,8 @@ 
 	 * Echoes out a pretty value (even for multi-choice options)
 	 * @param string $schema
 	 */
-	public function e_value( $schema = NULL ) {
-		$this->e( 'ANS_value', $schema );
+	public function e_value($schema = NULL) {
+		$this->e('ANS_value', $schema);
 	}
 
 
@@ -147,7 +147,7 @@ 
 	 * @return EE_Question
 	 */
 	public function question() {
-		return $this->get_first_related( 'Question' );
+		return $this->get_first_related('Question');
 	}
 
 
@@ -157,7 +157,7 @@ 
 	 * @return EE_Registration
 	 */
 	public function registration() {
-		return $this->get_first_related( 'Registration' );
+		return $this->get_first_related('Registration');
 	}
 }
 

Doc Comments +1 added lines, -1 removed lines

@@ -77,7 +77,7 @@
 	 *    Set Answer value
 	 *
 	 * @access        public
-	 * @param mixed $ANS_value
+	 * @param string $ANS_value
 	 */
 	public function set_value( $ANS_value = '' ) {
 		$this->set( 'ANS_value', $ANS_value );

core/db_classes/EE_Event_Message_Template.class.php

Spacing +5 added lines, -5 removed lines

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

Braces +3 added lines, -1 removed lines

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

core/db_classes/EE_Event_Question_Group.class.php

Spacing +8 added lines, -8 removed lines

@@ -1,18 +1,18 @@ 
-<?php if ( !defined( 'EVENT_ESPRESSO_VERSION' ) ) {
-	exit( 'No direct script access allowed' );
+<?php if ( ! defined('EVENT_ESPRESSO_VERSION')) {
+	exit('No direct script access allowed');
 }
 /**
  * Required  by EEM_Event_Question_Group in case someone queries for all its model objects
  */
-class EE_Event_Question_Group extends EE_Base_Class{
+class EE_Event_Question_Group extends EE_Base_Class {
 
 	/**
 	 * @param array $props_n_values
 	 * @return EE_Event_Question_Group|mixed
 	 */
-	public static function new_instance( $props_n_values = array() ) {
-		$has_object = parent::_check_for_object( $props_n_values, __CLASS__ );
-		return $has_object ? $has_object : new self( $props_n_values);
+	public static function new_instance($props_n_values = array()) {
+		$has_object = parent::_check_for_object($props_n_values, __CLASS__);
+		return $has_object ? $has_object : new self($props_n_values);
 	}
 
 
@@ -21,7 +21,7 @@ 
 	 * @param array $props_n_values
 	 * @return EE_Event_Question_Group
 	 */
-	public static function new_instance_from_db ( $props_n_values = array() ) {
-		return new self( $props_n_values, TRUE );
+	public static function new_instance_from_db($props_n_values = array()) {
+		return new self($props_n_values, TRUE);
 	}
 }
\ No newline at end of file

core/db_classes/EE_Event_Venue.class.php

Spacing +6 added lines, -6 removed lines

@@ -2,15 +2,15 @@ 
 /**
  * Required  by EEM_Event_Question_Group in case someone queries for all its model objects
  */
-class EE_Event_Venue extends EE_Base_Class{
+class EE_Event_Venue extends EE_Base_Class {
 
 	/**
 	 * @param array $props_n_values
 	 * @return EE_Event_Venue|mixed
 	 */
-	public static function new_instance( $props_n_values = array() ) {
-		$has_object = parent::_check_for_object( $props_n_values, __CLASS__ );
-		return $has_object ? $has_object : new self( $props_n_values);
+	public static function new_instance($props_n_values = array()) {
+		$has_object = parent::_check_for_object($props_n_values, __CLASS__);
+		return $has_object ? $has_object : new self($props_n_values);
 	}
 
 
@@ -19,8 +19,8 @@ 
 	 * @param array $props_n_values
 	 * @return EE_Event_Venue
 	 */
-	public static function new_instance_from_db ( $props_n_values = array() ) {
-		return new self( $props_n_values, TRUE );
+	public static function new_instance_from_db($props_n_values = array()) {
+		return new self($props_n_values, TRUE);
 	}
 
 }
\ No newline at end of file

core/db_classes/EE_Extra_Meta.class.php

Spacing +19 added lines, -19 removed lines

@@ -1,5 +1,5 @@ 
-<?php if ( !defined( 'EVENT_ESPRESSO_VERSION' ) ) {
-	exit( 'No direct script access allowed' );
+<?php if ( ! defined('EVENT_ESPRESSO_VERSION')) {
+	exit('No direct script access allowed');
 }
 /**
  * Event Espresso
@@ -30,9 +30,9 @@ 
 	 * @param array $props_n_values
 	 * @return EE_Extra_Meta|mixed
 	 */
-	public static function new_instance( $props_n_values = array() ) {
-		$has_object = parent::_check_for_object( $props_n_values, __CLASS__ );
-		return $has_object ? $has_object : new self( $props_n_values );
+	public static function new_instance($props_n_values = array()) {
+		$has_object = parent::_check_for_object($props_n_values, __CLASS__);
+		return $has_object ? $has_object : new self($props_n_values);
 	}
 
 
@@ -41,8 +41,8 @@ 
 	 * @param array $props_n_values
 	 * @return EE_Extra_Meta
 	 */
-	public static function new_instance_from_db( $props_n_values = array() ) {
-		return new self( $props_n_values, TRUE );
+	public static function new_instance_from_db($props_n_values = array()) {
+		return new self($props_n_values, TRUE);
 	}
 
 
@@ -52,7 +52,7 @@ 
 	 * @return int
 	 */
 	function FK_ID() {
-		return $this->get( 'FK_ID' );
+		return $this->get('FK_ID');
 	}
 
 
@@ -62,8 +62,8 @@ 
 	 * @param int $FK_ID
 	 * @return boolean
 	 */
-	function set_FK_ID( $FK_ID ) {
-		$this->set( 'FK_ID', $FK_ID );
+	function set_FK_ID($FK_ID) {
+		$this->set('FK_ID', $FK_ID);
 	}
 
 
@@ -73,7 +73,7 @@ 
 	 * @return string
 	 */
 	function model() {
-		return $this->get( 'EXM_model' );
+		return $this->get('EXM_model');
 	}
 
 
@@ -83,8 +83,8 @@ 
 	 * @param string $model
 	 * @return boolean
 	 */
-	function set_model( $model ) {
-		$this->set( 'EXM_model', $model );
+	function set_model($model) {
+		$this->set('EXM_model', $model);
 	}
 
 
@@ -94,7 +94,7 @@ 
 	 * @return string
 	 */
 	function key() {
-		return $this->get( 'EXM_key' );
+		return $this->get('EXM_key');
 	}
 
 
@@ -104,8 +104,8 @@ 
 	 * @param string $key
 	 * @return boolean
 	 */
-	function set_key( $key ) {
-		$this->set( 'EXM_key', $key );
+	function set_key($key) {
+		$this->set('EXM_key', $key);
 	}
 
 
@@ -115,7 +115,7 @@ 
 	 * @return string
 	 */
 	function value() {
-		return $this->get( 'EXM_value' );
+		return $this->get('EXM_value');
 	}
 
 
@@ -125,8 +125,8 @@ 
 	 * @param string $value
 	 * @return boolean
 	 */
-	function set_value( $value ) {
-		$this->set( 'EXM_value', $value );
+	function set_value($value) {
+		$this->set('EXM_value', $value);
 	}
 
 

Doc Comments +4 added lines, -4 removed lines

@@ -60,7 +60,7 @@ 
 	/**
 	 * Sets FK_ID
 	 * @param int $FK_ID
-	 * @return boolean
+	 * @return boolean|null
 	 */
 	function set_FK_ID( $FK_ID ) {
 		$this->set( 'FK_ID', $FK_ID );
@@ -81,7 +81,7 @@ 
 	/**
 	 * Sets model
 	 * @param string $model
-	 * @return boolean
+	 * @return boolean|null
 	 */
 	function set_model( $model ) {
 		$this->set( 'EXM_model', $model );
@@ -102,7 +102,7 @@ 
 	/**
 	 * Sets key
 	 * @param string $key
-	 * @return boolean
+	 * @return boolean|null
 	 */
 	function set_key( $key ) {
 		$this->set( 'EXM_key', $key );
@@ -123,7 +123,7 @@ 
 	/**
 	 * Sets value
 	 * @param string $value
-	 * @return boolean
+	 * @return boolean|null
 	 */
 	function set_value( $value ) {
 		$this->set( 'EXM_value', $value );