eventespresso / event-espresso-core

payment_methods/Paypal_Standard/EE_PMT_Paypal_Standard.pm.php

Spacing +14 added lines, -14 removed lines

@@ -10,7 +10,7 @@ 
  * @since 				$VID:$
  *
  */
-class EE_PMT_Paypal_Standard extends EE_PMT_Base{
+class EE_PMT_Paypal_Standard extends EE_PMT_Base {
 
 	const shipping_info_none = 1;
 	const shipping_info_optional = 0;
@@ -46,7 +46,7 @@ 
 	 * @param \EE_Transaction $transaction
 	 * @return NULL
 	 */
-	public function generate_new_billing_form( EE_Transaction $transaction = NULL ) {
+	public function generate_new_billing_form(EE_Transaction $transaction = NULL) {
 		return NULL;
 	}
 
@@ -59,13 +59,13 @@ 
 	 * @throws \EE_Error
 	 */
 	public function generate_new_settings_form() {
-		require_once( $this->file_folder() . 'EE_Paypal_Standard_Form.form.php' );
-		$form =  new EE_Paypal_Standard_Form( $this );
-		$form->get_input( 'PMD_debug_mode' )->set_html_label_text(
-			sprintf( __( "Use PayPal Sandbox %s", 'event_espresso' ), $this->get_help_tab_link() )
+		require_once($this->file_folder().'EE_Paypal_Standard_Form.form.php');
+		$form = new EE_Paypal_Standard_Form($this);
+		$form->get_input('PMD_debug_mode')->set_html_label_text(
+			sprintf(__("Use PayPal Sandbox %s", 'event_espresso'), $this->get_help_tab_link())
 		);
-		$form->get_input( 'shipping_details' )->set_html_label_text(
-			sprintf( __( "Shipping Address Options %s", "event_espresso" ), $this->get_help_tab_link() )
+		$form->get_input('shipping_details')->set_html_label_text(
+			sprintf(__("Shipping Address Options %s", "event_espresso"), $this->get_help_tab_link())
 		);
 		return $form;
 	}
@@ -77,7 +77,7 @@ 
 	 * @see EE_PMT_Base::help_tabs_config()
 	 * @return array
 	 */
-	public function help_tabs_config(){
+	public function help_tabs_config() {
 		return array(
 			$this->get_help_tab_name() => array(
 				'title'=>  __("PayPal Standard Settings", 'event_espresso'),
@@ -99,13 +99,13 @@ 
 	 * @return EE_Payment
 	 * @throws \EE_Error
 	 */
-	public function finalize_payment_for($transaction){
+	public function finalize_payment_for($transaction) {
 		// PayPal standard actually sends the IPN info along with the user when they return to our site
 		// so in case the IPN is arriving later, let's try to process an IPN!
-		if( $_SERVER['REQUEST_METHOD'] === 'POST' ){
-			return $this->handle_ipn($_POST, $transaction );
-		}else{
-			return parent::finalize_payment_for( $transaction );
+		if ($_SERVER['REQUEST_METHOD'] === 'POST') {
+			return $this->handle_ipn($_POST, $transaction);
+		} else {
+			return parent::finalize_payment_for($transaction);
 		}
 	}
 

shortcodes/espresso_txn_page/EES_Espresso_Txn_Page.shortcode.php

Spacing +14 added lines, -14 removed lines

@@ -1,4 +1,4 @@ 
-<?php if ( ! defined('EVENT_ESPRESSO_VERSION')) {exit('No direct script access allowed');}
+<?php if ( ! defined('EVENT_ESPRESSO_VERSION')) {exit('No direct script access allowed'); }
 /**
  * EES_Espresso_Txn_Page
  *
@@ -27,7 +27,7 @@ 
 	 *  @return 	void
 	 */
 	public static function set_hooks() {
-		add_action( 'wp_loaded', array( 'EES_Espresso_Txn_Page', 'set_definitions' ), 2 );
+		add_action('wp_loaded', array('EES_Espresso_Txn_Page', 'set_definitions'), 2);
 	}
 
 	/**
@@ -48,8 +48,8 @@ 
 	 *  @return 	void
 	 */
 	public static function set_definitions() {
-		define( 'TXN_PAGE_ASSETS_URL', plugin_dir_url( __FILE__ ) . 'assets' . DS );
-		define( 'TXN_PAGE_TEMPLATES_PATH', str_replace( '\\', DS, plugin_dir_path( __FILE__ )) . 'templates' . DS );
+		define('TXN_PAGE_ASSETS_URL', plugin_dir_url(__FILE__).'assets'.DS);
+		define('TXN_PAGE_TEMPLATES_PATH', str_replace('\\', DS, plugin_dir_path(__FILE__)).'templates'.DS);
 	}
 
 
@@ -66,18 +66,18 @@ 
 	 * @throws \Exception
 	 * @throws \EE_Error
 	 */
-	public function run( WP $WP ) {
+	public function run(WP $WP) {
 		$this->_current_txn = null;
-		if ( EE_Registry::instance()->REQ->is_set('e_reg_url_link' )){
+		if (EE_Registry::instance()->REQ->is_set('e_reg_url_link')) {
 			/** @var EEM_Transaction $EEM_Transaction */
-			$EEM_Transaction = EE_Registry::instance()->load_model( 'Transaction' );
+			$EEM_Transaction = EE_Registry::instance()->load_model('Transaction');
 			$this->_current_txn = $EEM_Transaction->get_transaction_from_reg_url_link();
 		}
-		if ( $this->_current_txn instanceof EE_Transaction ) {
+		if ($this->_current_txn instanceof EE_Transaction) {
 			$payment_method = null;
-			$payment_method_slug = EE_Registry::instance()->REQ->get( 'ee_payment_method', NULL );
-			if( $payment_method_slug ) {
-				$payment_method = EEM_Payment_Method::instance()->get_one_by_slug( $payment_method_slug );
+			$payment_method_slug = EE_Registry::instance()->REQ->get('ee_payment_method', NULL);
+			if ($payment_method_slug) {
+				$payment_method = EEM_Payment_Method::instance()->get_one_by_slug($payment_method_slug);
 			}
 			/** @type EE_Payment_Processor $payment_processor */
 			$payment_processor = EE_Registry::instance()->load_core('Payment_Processor');
@@ -87,7 +87,7 @@ 
 				$payment_method
 			);
 			//allow gateways to add a filter to stop rendering the page
-			if( apply_filters( 'FHEE__EES_Espresso_Txn_Page__run__exit', FALSE ) ){
+			if (apply_filters('FHEE__EES_Espresso_Txn_Page__run__exit', FALSE)) {
 				exit;
 			}
 		}
@@ -104,8 +104,8 @@ 
 	 *  @param		array 	$attributes
 	 *  @return 	string
 	 */
-	public function process_shortcode( $attributes = array() ) {
-		return __( 'This is the Event Espresso Transactions page. This page receives instant payment notification (IPN) requests and should have a status of published, but should not be easily accessible by site visitors. Do not add it to your website\'s navigation menu or link to it from another page. Also, do not delete it or change its status to private.', 'event_espresso' );
+	public function process_shortcode($attributes = array()) {
+		return __('This is the Event Espresso Transactions page. This page receives instant payment notification (IPN) requests and should have a status of published, but should not be easily accessible by site visitors. Do not add it to your website\'s navigation menu or link to it from another page. Also, do not delete it or change its status to private.', 'event_espresso');
 	}
 
 

core/db_models/relations/EE_Model_Relation_Base.php

Indentation +2 added lines, -2 removed lines

@@ -151,8 +151,8 @@
 		}
 		$query_params = $this->_disable_default_where_conditions_on_query_param($query_params);
 		$query_param_where_this_model_pk = $this->get_this_model()->get_this_model_name()
-		                                   . "."
-		                                   . $this->get_this_model()->get_primary_key_field()->get_name();
+										   . "."
+										   . $this->get_this_model()->get_primary_key_field()->get_name();
 		$model_object_id = $this->_get_model_object_id( $model_object_or_id );
 		$query_params[0][$query_param_where_this_model_pk] = $model_object_id;
 		return $this->get_other_model()->get_all($query_params);

Spacing +45 added lines, -45 removed lines

@@ -13,7 +13,7 @@ 
  * @subpackage    core
  * @author        Michael Nelson
  */
-abstract class EE_Model_Relation_Base{
+abstract class EE_Model_Relation_Base {
 	/**
 	 * The model name of which this relation is a component (ie, the model that called new EE_Model_Relation_Base)
 	 * @var string eg Event, Question_Group, Registration
@@ -48,9 +48,9 @@ 
 	 * @param boolean $block_deletes if there are related models across this relation, block (prevent and add an error) the deletion of this model
 	 * @param string $blocking_delete_error_message a customized error message on blocking deletes instead of the default
 	 */
-	public function __construct($block_deletes, $blocking_delete_error_message){
+	public function __construct($block_deletes, $blocking_delete_error_message) {
 		$this->_blocking_delete = $block_deletes;
-		$this->_blocking_delete_error_message=$blocking_delete_error_message;
+		$this->_blocking_delete_error_message = $blocking_delete_error_message;
 	}
 
 
@@ -60,12 +60,12 @@ 
 	 * @param $other_model_name
 	 * @throws EE_Error
 	 */
-	public function _construct_finalize_set_models($this_model_name, $other_model_name){
+	public function _construct_finalize_set_models($this_model_name, $other_model_name) {
 		$this->_this_model_name = $this_model_name;
 		$this->_other_model_name = $other_model_name;
-		if(is_string($this->_blocking_delete)){
+		if (is_string($this->_blocking_delete)) {
 			throw new EE_Error(sprintf(__("When instantiating the relation of type %s from %s to %s, the \$block_deletes argument should be a boolean, not a string (%s)", "event_espresso"),
-						get_class($this),$this_model_name,$other_model_name,$this->_blocking_delete));
+						get_class($this), $this_model_name, $other_model_name, $this->_blocking_delete));
 		}
 	}
 
@@ -75,7 +75,7 @@ 
 	 * Gets the model where this relation is defined.
 	 * @return EEM_Base
 	 */
-	public function get_this_model(){
+	public function get_this_model() {
 		return $this->_get_model($this->_this_model_name);
 	}
 
@@ -86,7 +86,7 @@ 
 	 * this relation object was defined on get_this_model(), get_other_model() is the other one)
 	 * @return EEM_Base
 	 */
-	public function get_other_model(){
+	public function get_other_model() {
 		return $this->_get_model($this->_other_model_name);
 	}
 
@@ -97,9 +97,9 @@ 
 	 * @param string $model_name like Event, Question_Group, etc. omit the EEM_
 	 * @return EEM_Base
 	 */
-	protected function _get_model($model_name){
-		$modelInstance = EE_Registry::instance()->load_model( $model_name );
-		$modelInstance->set_timezone( $this->_timezone );
+	protected function _get_model($model_name) {
+		$modelInstance = EE_Registry::instance()->load_model($model_name);
+		$modelInstance->set_timezone($this->_timezone);
 		return $modelInstance;
 	}
 
@@ -109,8 +109,8 @@ 
 	 * entirely possible that relations may be called from a model and we need to make sure those relations have their timezone set correctly.
 	 * @param string $timezone timezone to set.
 	 */
-	public function set_timezone( $timezone ) {
-		if($timezone !== NULL){
+	public function set_timezone($timezone) {
+		if ($timezone !== NULL) {
 			$this->_timezone = $timezone;
 		}
 	}
@@ -126,8 +126,8 @@ 
 	 * @param string $extra_join_sql
 	 * @return string
 	 */
-	protected function _left_join($other_table,$other_table_alias,$other_table_column,$this_table_alias,$this_table_join_column, $extra_join_sql = ''){
-		return " LEFT JOIN ".$other_table." AS ".$other_table_alias. " ON ".$other_table_alias.".".$other_table_column."=".$this_table_alias.".".$this_table_join_column. ($extra_join_sql ? " AND $extra_join_sql" : '');
+	protected function _left_join($other_table, $other_table_alias, $other_table_column, $this_table_alias, $this_table_join_column, $extra_join_sql = '') {
+		return " LEFT JOIN ".$other_table." AS ".$other_table_alias." ON ".$other_table_alias.".".$other_table_column."=".$this_table_alias.".".$this_table_join_column.($extra_join_sql ? " AND $extra_join_sql" : '');
 	}
 
 
@@ -145,15 +145,15 @@ 
 	 * @return EE_Base_Class[]
 	 * @throws \EE_Error
 	 */
-	public function get_all_related($model_object_or_id, $query_params = array(), $values_already_prepared_by_model_object = false ){
-		if( $values_already_prepared_by_model_object !== false ) {
-			EE_Error::doing_it_wrong( 'EE_Model_Relation_Base::get_all_related', __( 'The argument $values_already_prepared_by_model_object is no longer used.', 'event_espresso' ), '4.8.1' );
+	public function get_all_related($model_object_or_id, $query_params = array(), $values_already_prepared_by_model_object = false) {
+		if ($values_already_prepared_by_model_object !== false) {
+			EE_Error::doing_it_wrong('EE_Model_Relation_Base::get_all_related', __('The argument $values_already_prepared_by_model_object is no longer used.', 'event_espresso'), '4.8.1');
 		}
 		$query_params = $this->_disable_default_where_conditions_on_query_param($query_params);
 		$query_param_where_this_model_pk = $this->get_this_model()->get_this_model_name()
 		                                   . "."
 		                                   . $this->get_this_model()->get_primary_key_field()->get_name();
-		$model_object_id = $this->_get_model_object_id( $model_object_or_id );
+		$model_object_id = $this->_get_model_object_id($model_object_or_id);
 		$query_params[0][$query_param_where_this_model_pk] = $model_object_id;
 		return $this->get_other_model()->get_all($query_params);
 	}
@@ -165,9 +165,9 @@ 
 	 * @param string $query_params
 	 * @return array
 	 */
-	protected function _disable_default_where_conditions_on_query_param($query_params){
-		if( ! isset($query_params['default_where_conditions'])){
-			$query_params['default_where_conditions']='none';
+	protected function _disable_default_where_conditions_on_query_param($query_params) {
+		if ( ! isset($query_params['default_where_conditions'])) {
+			$query_params['default_where_conditions'] = 'none';
 		}
 		return $query_params;
 	}
@@ -185,15 +185,15 @@ 
 	 * @return int of how many related models got deleted
 	 * @throws \EE_Error
 	 */
-	public function delete_all_related($model_object_or_id,$query_params = array()){
+	public function delete_all_related($model_object_or_id, $query_params = array()) {
 		//for each thing we would delete,
-		$related_model_objects = $this->get_all_related($model_object_or_id,$query_params);
+		$related_model_objects = $this->get_all_related($model_object_or_id, $query_params);
 		//determine if it's blocked by anything else before it can be deleted
 		$deleted_count = 0;
-		foreach($related_model_objects as $related_model_object){
+		foreach ($related_model_objects as $related_model_object) {
 			$delete_is_blocked = $this->get_other_model()->delete_is_blocked_by_related_models($related_model_object, $model_object_or_id);
 			/* @var $model_object_or_id EE_Base_Class */
-			if( ! $delete_is_blocked ){
+			if ( ! $delete_is_blocked) {
 				$this->remove_relation_to($model_object_or_id, $related_model_object);
 				$related_model_object->delete();
 				$deleted_count++;
@@ -215,27 +215,27 @@ 
 	 * @return int of how many related models got deleted
 	 * @throws \EE_Error
 	 */
-	public function delete_related_permanently($model_object_or_id,$query_params = array()){
+	public function delete_related_permanently($model_object_or_id, $query_params = array()) {
 		//for each thing we would delete,
-		$related_model_objects = $this->get_all_related($model_object_or_id,$query_params);
+		$related_model_objects = $this->get_all_related($model_object_or_id, $query_params);
 		//determine if it's blocked by anything else before it can be deleted
 		$deleted_count = 0;
-		foreach($related_model_objects as $related_model_object){
+		foreach ($related_model_objects as $related_model_object) {
 			$delete_is_blocked = $this->get_other_model()->delete_is_blocked_by_related_models($related_model_object, $model_object_or_id);
 			/* @var $model_object_or_id EE_Base_Class */
-			if( $related_model_object instanceof EE_Soft_Delete_Base_Class ){
+			if ($related_model_object instanceof EE_Soft_Delete_Base_Class) {
 				$this->remove_relation_to($model_object_or_id, $related_model_object);
 				$deleted_count++;
-				if( ! $delete_is_blocked ){
+				if ( ! $delete_is_blocked) {
 					$related_model_object->delete_permanently();
-				}else{
+				} else {
 					//delete is blocked
 					//brent and darren, in this case, wanted to just soft delete it then
 					$related_model_object->delete();
 				}
-			}else{
+			} else {
 				//its not a soft-deletable thing anyways. do the normal logic.
-				if( ! $delete_is_blocked ){
+				if ( ! $delete_is_blocked) {
 					$this->remove_relation_to($model_object_or_id, $related_model_object);
 					$related_model_object->delete();
 					$deleted_count++;
@@ -255,11 +255,11 @@ 
 	 */
 	protected function _get_model_object_id($model_object_or_id) {
 		$model_object_id = $model_object_or_id;
-		if($model_object_or_id instanceof EE_Base_Class){
+		if ($model_object_or_id instanceof EE_Base_Class) {
 			$model_object_id = $model_object_or_id->ID();
 		}
-		if( ! $model_object_id){
-			throw new EE_Error(sprintf(__("Sorry, we cant get the related %s model objects to %s model object before it has an ID. You can solve that by just saving it before trying to get its related model objects", "event_espresso"),$this->get_other_model()->get_this_model_name(),$this->get_this_model()->get_this_model_name()));
+		if ( ! $model_object_id) {
+			throw new EE_Error(sprintf(__("Sorry, we cant get the related %s model objects to %s model object before it has an ID. You can solve that by just saving it before trying to get its related model objects", "event_espresso"), $this->get_other_model()->get_this_model_name(), $this->get_this_model()->get_this_model_name()));
 		}
 		return $model_object_id;
 	}
@@ -313,10 +313,10 @@ 
 	 * @return EE_Base_Class[]
 	 * @throws \EE_Error
 	 */
-	public function remove_relations($this_obj_or_id,$where_query_param = array()){
-		$related_things = $this->get_all_related($this_obj_or_id,array($where_query_param));
+	public function remove_relations($this_obj_or_id, $where_query_param = array()) {
+		$related_things = $this->get_all_related($this_obj_or_id, array($where_query_param));
 		$objs_removed = array();
-		foreach($related_things as $related_thing){
+		foreach ($related_things as $related_thing) {
 			$objs_removed[] = $this->remove_relation_to($this_obj_or_id, $related_thing);
 		}
 		return $objs_removed;
@@ -329,7 +329,7 @@ 
 	 * related objects exist, returns false.
 	 * @return boolean
 	 */
-	public function block_delete_if_related_models_exist(){
+	public function block_delete_if_related_models_exist() {
 		return $this->_blocking_delete;
 	}
 
@@ -338,13 +338,13 @@ 
 	 * Gets the error message to show
 	 * @return string
 	 */
-	public function get_deletion_error_message(){
-		if($this->_blocking_delete_error_message){
+	public function get_deletion_error_message() {
+		if ($this->_blocking_delete_error_message) {
 			return $this->_blocking_delete_error_message;
-		}else{
+		} else {
 //			return sprintf(__('Cannot delete %1$s when there are related %2$s', "event_espresso"),$this->get_this_model()->item_name(2),$this->get_other_model()->item_name(2));
 			return sprintf(
-				__( 'This %1$s is currently linked to one or more %2$s records. If this %1$s is incorrect, then please remove it from all %3$s before attempting to delete it.', "event_espresso"),
+				__('This %1$s is currently linked to one or more %2$s records. If this %1$s is incorrect, then please remove it from all %3$s before attempting to delete it.', "event_espresso"),
 				$this->get_this_model()->item_name(1),
 				$this->get_other_model()->item_name(1),
 				$this->get_other_model()->item_name(2)

Braces +3 added lines, -3 removed lines

@@ -228,12 +228,12 @@ 
 				$deleted_count++;
 				if( ! $delete_is_blocked ){
 					$related_model_object->delete_permanently();
-				}else{
+				} else{
 					//delete is blocked
 					//brent and darren, in this case, wanted to just soft delete it then
 					$related_model_object->delete();
 				}
-			}else{
+			} else{
 				//its not a soft-deletable thing anyways. do the normal logic.
 				if( ! $delete_is_blocked ){
 					$this->remove_relation_to($model_object_or_id, $related_model_object);
@@ -341,7 +341,7 @@ 
 	public function get_deletion_error_message(){
 		if($this->_blocking_delete_error_message){
 			return $this->_blocking_delete_error_message;
-		}else{
+		} else{
 //			return sprintf(__('Cannot delete %1$s when there are related %2$s', "event_espresso"),$this->get_this_model()->item_name(2),$this->get_other_model()->item_name(2));
 			return sprintf(
 				__( 'This %1$s is currently linked to one or more %2$s records. If this %1$s is incorrect, then please remove it from all %3$s before attempting to delete it.', "event_espresso"),

Doc Comments +5 added lines, -5 removed lines

@@ -119,9 +119,9 @@ 
 
 	/**
 	 * @param        $other_table
-	 * @param        $other_table_alias
+	 * @param        string $other_table_alias
 	 * @param        $other_table_column
-	 * @param        $this_table_alias
+	 * @param        string $this_table_alias
 	 * @param        $this_table_join_column
 	 * @param string $extra_join_sql
 	 * @return string
@@ -163,7 +163,7 @@ 
 	/**
 	 * Alters the $query_params to disable default where conditions, unless otherwise specified
 	 * @param string $query_params
-	 * @return array
+	 * @return string
 	 */
 	protected function _disable_default_where_conditions_on_query_param($query_params){
 		if( ! isset($query_params['default_where_conditions'])){
@@ -180,7 +180,7 @@ 
 	 * Note: If the related model is extends EEM_Soft_Delete_Base, then the related
 	 * model objects will only be soft-deleted.
 	 *
-	 * @param EE_Base_Class|int|string $model_object_or_id
+	 * @param EE_Base_Class|null $model_object_or_id
 	 * @param array                    $query_params
 	 * @return int of how many related models got deleted
 	 * @throws \EE_Error
@@ -210,7 +210,7 @@ 
 	 * Note: If the related model is extends EEM_Soft_Delete_Base, then the related
 	 * model objects will only be soft-deleted.
 	 *
-	 * @param EE_Base_Class|int|string $model_object_or_id
+	 * @param EE_Base_Class|null $model_object_or_id
 	 * @param array                    $query_params
 	 * @return int of how many related models got deleted
 	 * @throws \EE_Error

core/db_models/relations/EE_HABTM_Relation.php

Spacing +30 added lines, -30 removed lines

@@ -1,6 +1,6 @@ 
 <?php
 
-require_once( EE_MODELS . 'relations/EE_Model_Relation_Base.php');
+require_once(EE_MODELS.'relations/EE_Model_Relation_Base.php');
 
 
 
@@ -11,7 +11,7 @@ 
  * @subpackage    core
  * @author        Michael Nelson
  */
-class EE_HABTM_Relation extends EE_Model_Relation_Base{
+class EE_HABTM_Relation extends EE_Model_Relation_Base {
 	/**
 	 * Model which defines the relation between two other models. Eg, the EE_Event_Question_Group model,
 	 * which joins EE_Event and EE_Question_Group
@@ -32,7 +32,7 @@ 
 	 * @param boolean $block_deletes                 for this type of relation, we block by default for now. if there are related models across this relation, block (prevent and add an error) the deletion of this model
 	 * @param string  $blocking_delete_error_message a customized error message on blocking deletes instead of the default
 	 */
-	public function __construct($joining_model_name,$block_deletes = true, $blocking_delete_error_message =''){
+	public function __construct($joining_model_name, $block_deletes = true, $blocking_delete_error_message = '') {
 		$this->_joining_model_name = $joining_model_name;
 		parent::__construct($block_deletes, $blocking_delete_error_message);
 	}
@@ -40,7 +40,7 @@ 
 	 * Gets the joining model's object
 	 * @return EEM_Base
 	 */
-	public function get_join_model(){
+	public function get_join_model() {
 		return $this->_get_model($this->_joining_model_name);
 	}
 
@@ -53,21 +53,21 @@ 
 	 * @return string of SQL
 	 * @throws \EE_Error
 	 */
-	public function get_join_to_intermediate_model_statement($model_relation_chain){
+	public function get_join_to_intermediate_model_statement($model_relation_chain) {
 		//create sql like
 		//LEFT JOIN join_table AS join_table_alias ON this_table_alias.this_table_pk = join_table_alias.join_table_fk_to_this
 		//LEFT JOIN other_table AS other_table_alias ON join_table_alias.join_table_fk_to_other = other_table_alias.other_table_pk
 		//remember the model relation chain to the JOIN model, because we'll
 		//need it for get_join_statement()
 		$this->_model_relation_chain_to_join_model = $model_relation_chain;
-		$this_table_pk_field = $this->get_this_model()->get_primary_key_field();//get_foreign_key_to($this->get_other_model()->get_this_model_name());
+		$this_table_pk_field = $this->get_this_model()->get_primary_key_field(); //get_foreign_key_to($this->get_other_model()->get_this_model_name());
 		$join_table_fk_field_to_this_table = $this->get_join_model()->get_foreign_key_to($this->get_this_model()->get_this_model_name());
-		$this_table_alias = EE_Model_Parser::extract_table_alias_model_relation_chain_prefix($model_relation_chain, $this->get_this_model()->get_this_model_name()) . $this_table_pk_field->get_table_alias();
+		$this_table_alias = EE_Model_Parser::extract_table_alias_model_relation_chain_prefix($model_relation_chain, $this->get_this_model()->get_this_model_name()).$this_table_pk_field->get_table_alias();
 
-		$join_table_alias = EE_Model_Parser::extract_table_alias_model_relation_chain_prefix($model_relation_chain, $this->get_join_model()->get_this_model_name()) . $join_table_fk_field_to_this_table->get_table_alias();
+		$join_table_alias = EE_Model_Parser::extract_table_alias_model_relation_chain_prefix($model_relation_chain, $this->get_join_model()->get_this_model_name()).$join_table_fk_field_to_this_table->get_table_alias();
 		$join_table = $this->get_join_model()->get_table_for_alias($join_table_alias);
 		//phew! ok, we have all the info we need, now we can create the SQL join string
-		$SQL = $this->_left_join($join_table, $join_table_alias, $join_table_fk_field_to_this_table->get_table_column(), $this_table_alias, $this_table_pk_field->get_table_column()) . $this->get_join_model()->_construct_internal_join_to_table_with_alias($join_table_alias);
+		$SQL = $this->_left_join($join_table, $join_table_alias, $join_table_fk_field_to_this_table->get_table_column(), $this_table_alias, $this_table_pk_field->get_table_column()).$this->get_join_model()->_construct_internal_join_to_table_with_alias($join_table_alias);
 
 		return $SQL;
 	}
@@ -84,18 +84,18 @@ 
 	 * @return string of SQL
 	 * @throws \EE_Error
 	 */
-	public function get_join_statement($model_relation_chain){
-		if( $this->_model_relation_chain_to_join_model === NULL ){
-			throw new EE_Error( sprintf( __( 'When using EE_HABTM_Relation to create a join, you must call get_join_to_intermediate_model_statement BEFORE get_join_statement', 'event_espresso' )));
+	public function get_join_statement($model_relation_chain) {
+		if ($this->_model_relation_chain_to_join_model === NULL) {
+			throw new EE_Error(sprintf(__('When using EE_HABTM_Relation to create a join, you must call get_join_to_intermediate_model_statement BEFORE get_join_statement', 'event_espresso')));
 		}
 		$join_table_fk_field_to_this_table = $this->get_join_model()->get_foreign_key_to($this->get_this_model()->get_this_model_name());
-		$join_table_alias = EE_Model_Parser::extract_table_alias_model_relation_chain_prefix($this->_model_relation_chain_to_join_model, $this->get_join_model()->get_this_model_name()) . $join_table_fk_field_to_this_table->get_table_alias();
+		$join_table_alias = EE_Model_Parser::extract_table_alias_model_relation_chain_prefix($this->_model_relation_chain_to_join_model, $this->get_join_model()->get_this_model_name()).$join_table_fk_field_to_this_table->get_table_alias();
 		$other_table_pk_field = $this->get_other_model()->get_primary_key_field();
 		$join_table_fk_field_to_other_table = $this->get_join_model()->get_foreign_key_to($this->get_other_model()->get_this_model_name());
-		$other_table_alias = EE_Model_Parser::extract_table_alias_model_relation_chain_prefix($model_relation_chain, $this->get_other_model()->get_this_model_name()) . $other_table_pk_field->get_table_alias();
+		$other_table_alias = EE_Model_Parser::extract_table_alias_model_relation_chain_prefix($model_relation_chain, $this->get_other_model()->get_this_model_name()).$other_table_pk_field->get_table_alias();
 		$other_table = $this->get_other_model()->get_table_for_alias($other_table_alias);
 
-		$SQL = $this->_left_join($other_table, $other_table_alias, $other_table_pk_field->get_table_column(), $join_table_alias, $join_table_fk_field_to_other_table->get_table_column()) . $this->get_other_model()->_construct_internal_join_to_table_with_alias($other_table_alias);
+		$SQL = $this->_left_join($other_table, $other_table_alias, $other_table_pk_field->get_table_column(), $join_table_alias, $join_table_fk_field_to_other_table->get_table_column()).$this->get_other_model()->_construct_internal_join_to_table_with_alias($other_table_alias);
 		return $SQL;
 	}
 
@@ -112,37 +112,37 @@ 
 	 * @return EE_Base_Class
 	 * @throws \EE_Error
 	 */
-	public function add_relation_to($this_obj_or_id, $other_obj_or_id, $extra_join_model_fields_n_values = array() ){
+	public function add_relation_to($this_obj_or_id, $other_obj_or_id, $extra_join_model_fields_n_values = array()) {
 		 $this_model_obj = $this->get_this_model()->ensure_is_obj($this_obj_or_id, true);
 		 $other_model_obj = $this->get_other_model()->ensure_is_obj($other_obj_or_id, true);
 		//check if such a relationship already exists
 		 $join_model_fk_to_this_model = $this->get_join_model()->get_foreign_key_to($this->get_this_model()->get_this_model_name());
 		 $join_model_fk_to_other_model = $this->get_join_model()->get_foreign_key_to($this->get_other_model()->get_this_model_name());
 
-		 $cols_n_values =  array(
+		 $cols_n_values = array(
 				 $join_model_fk_to_this_model->get_name() => $this_model_obj->ID(),
 				 $join_model_fk_to_other_model->get_name() => $other_model_obj->ID());
 
 		 //if $where_query exists lets add them to the query_params.
-		 if ( !empty( $extra_join_model_fields_n_values ) ) {
+		 if ( ! empty($extra_join_model_fields_n_values)) {
 		 	//make sure we strip any of the join model names from the $where_query cause we don't need that in here (why? because client code may have used the same conditionals for get_all_related which DOES need the join model name)
 		 	//make sure we strip THIS models name from the query param
 			 $parsed_query = array();
-		 	foreach ( $extra_join_model_fields_n_values as $query_param => $val ) {
-				$query_param = str_replace($this->get_join_model()->get_this_model_name().".","", $query_param);
+		 	foreach ($extra_join_model_fields_n_values as $query_param => $val) {
+				$query_param = str_replace($this->get_join_model()->get_this_model_name().".", "", $query_param);
 				$parsed_query[$query_param] = $val;
 			}
-		 	$cols_n_values = array_merge( $cols_n_values, $parsed_query );
+		 	$cols_n_values = array_merge($cols_n_values, $parsed_query);
 		 }
 
-		 $query_params = array( $cols_n_values );
+		 $query_params = array($cols_n_values);
 
 
 		 $existing_entry_in_join_table = $this->get_join_model()->get_one($query_params);
 		//if there is already an entry in the join table, indicating a relationship, we're done
 		 //again, if you want more sophisticated logic or insertions (handling more columns than just 2 foreign keys to
 		 //the other tables, use the joining model directly!
-		 if( ! $existing_entry_in_join_table ){
+		 if ( ! $existing_entry_in_join_table) {
 			$this->get_join_model()->insert($cols_n_values);
 		}
 		return $other_model_obj;
@@ -160,30 +160,30 @@ 
 	 * @return EE_Base_Class
 	 * @throws \EE_Error
 	 */
-	public function remove_relation_to($this_obj_or_id, $other_obj_or_id, $where_query = array() ){
+	public function remove_relation_to($this_obj_or_id, $other_obj_or_id, $where_query = array()) {
 		  $this_model_obj = $this->get_this_model()->ensure_is_obj($this_obj_or_id, true);
 		 $other_model_obj = $this->get_other_model()->ensure_is_obj($other_obj_or_id, true);
 		//check if such a relationship already exists
 		 $join_model_fk_to_this_model = $this->get_join_model()->get_foreign_key_to($this->get_this_model()->get_this_model_name());
 		 $join_model_fk_to_other_model = $this->get_join_model()->get_foreign_key_to($this->get_other_model()->get_this_model_name());
 
-		 $cols_n_values =  array(
+		 $cols_n_values = array(
 				 $join_model_fk_to_this_model->get_name() => $this_model_obj->ID(),
 				 $join_model_fk_to_other_model->get_name() => $other_model_obj->ID());
 
 		//if $where_query exists lets add them to the query_params.
-		 if ( !empty( $where_query ) ) {
+		 if ( ! empty($where_query)) {
 		 	//make sure we strip any of the join model names from the $where_query cause we don't need that in here (why? because client code may have used the same conditionals for get_all_related which DOES need the join model name)
 		 	//make sure we strip THIS models name from the query param
 			 $parsed_query = array();
-		 	foreach ( $where_query as $query_param => $val ) {
-				$query_param = str_replace($this->get_join_model()->get_this_model_name().".","", $query_param);
+		 	foreach ($where_query as $query_param => $val) {
+				$query_param = str_replace($this->get_join_model()->get_this_model_name().".", "", $query_param);
 				$parsed_query[$query_param] = $val;
 			}
-		 	$cols_n_values = array_merge( $cols_n_values, $parsed_query );
+		 	$cols_n_values = array_merge($cols_n_values, $parsed_query);
 		 }
 
-		 $this->get_join_model()->delete( array($cols_n_values) );
+		 $this->get_join_model()->delete(array($cols_n_values));
 		return $other_model_obj;
 	 }
 }

core/db_models/relations/EE_HABTM_Any_Relation.php

Spacing +35 added lines, -35 removed lines

@@ -8,7 +8,7 @@ 
  * @subpackage    core
  * @author        Michael Nelson
  */
-class EE_HABTM_Any_Relation extends EE_HABTM_Relation{
+class EE_HABTM_Any_Relation extends EE_HABTM_Relation {
 	/**
 	 *
 	 * @var string
@@ -22,8 +22,8 @@ 
 	 * @param boolean $block_deletes for this type of relation, we block by default for now. if there are related models across this relation, block (prevent and add an error) the deletion of this model
 	 * @param string $blocking_delete_error_message a customized error message on blocking deletes instead of the default
 	 */
-	public function __construct( $block_deletes = true, $blocking_delete_error_message =''){
-		parent::__construct( 'Extra_Join', $block_deletes, $blocking_delete_error_message);
+	public function __construct($block_deletes = true, $blocking_delete_error_message = '') {
+		parent::__construct('Extra_Join', $block_deletes, $blocking_delete_error_message);
 	}
 
 
@@ -33,13 +33,13 @@ 
 	 * @param $other_model_name
 	 * @throws EE_Error
 	 */
-	public function _construct_finalize_set_models( $this_model_name, $other_model_name){
-		if( $this_model_name < $other_model_name ) {
+	public function _construct_finalize_set_models($this_model_name, $other_model_name) {
+		if ($this_model_name < $other_model_name) {
 			$this->_alphabetically_first_model_name = $this_model_name;
-		} else{
+		} else {
 			$this->_alphabetically_first_model_name = $other_model_name;
 		}
-		parent::_construct_finalize_set_models( $this_model_name, $other_model_name );
+		parent::_construct_finalize_set_models($this_model_name, $other_model_name);
 	}
 
 
@@ -50,14 +50,14 @@ 
 	 * @return EE_Model_Field_Base
 	 * @throws \EE_Error
 	 */
-	public function get_join_table_fk_field_to( $model_name, $id_or_name_field ) {
+	public function get_join_table_fk_field_to($model_name, $id_or_name_field) {
 		$order = null;
-		if( $model_name === $this->_alphabetically_first_model_name ) {
+		if ($model_name === $this->_alphabetically_first_model_name) {
 			$order = 'first';
 		} else {
 			$order = 'second';
 		}
-		return $this->get_join_model()->field_settings_for( 'EXJ_' . $order . '_model_' . $id_or_name_field );
+		return $this->get_join_model()->field_settings_for('EXJ_'.$order.'_model_'.$id_or_name_field);
 	}
 
 
@@ -69,7 +69,7 @@ 
 	 * @return string of SQL
 	 * @throws \EE_Error
 	 */
-	public function get_join_to_intermediate_model_statement($model_relation_chain){
+	public function get_join_to_intermediate_model_statement($model_relation_chain) {
 		//create sql like
 		//LEFT JOIN join_table AS join_table_alias ON this_table_alias.this_table_pk = join_table_alias.join_table_fk_to_this
 		//LEFT JOIN other_table AS other_table_alias ON join_table_alias.join_table_fk_to_other = other_table_alias.other_table_pk
@@ -83,8 +83,8 @@ 
 		$field_with_model_name = $this->get_join_table_fk_field_to(
 				$this->get_this_model()->get_this_model_name(),
 				'name' );
-		$this_table_alias = EE_Model_Parser::extract_table_alias_model_relation_chain_prefix($model_relation_chain, $this->get_this_model()->get_this_model_name()) . $this_table_pk_field->get_table_alias();
-		$join_table_alias = EE_Model_Parser::extract_table_alias_model_relation_chain_prefix($model_relation_chain, $this->get_join_model()->get_this_model_name()) . $join_table_fk_field_to_this_table->get_table_alias();
+		$this_table_alias = EE_Model_Parser::extract_table_alias_model_relation_chain_prefix($model_relation_chain, $this->get_this_model()->get_this_model_name()).$this_table_pk_field->get_table_alias();
+		$join_table_alias = EE_Model_Parser::extract_table_alias_model_relation_chain_prefix($model_relation_chain, $this->get_join_model()->get_this_model_name()).$join_table_fk_field_to_this_table->get_table_alias();
 		$join_table = $this->get_join_model()->get_table_for_alias($join_table_alias);
 		//phew! ok, we have all the info we need, now we can create the SQL join string
 		$SQL = $this->_left_join(
@@ -93,7 +93,7 @@ 
 					$join_table_fk_field_to_this_table->get_table_column(),
 					$this_table_alias,
 					$this_table_pk_field->get_table_column(),
-					$field_with_model_name->get_qualified_column()."='".$this->get_this_model()->get_this_model_name()."'" ) .
+					$field_with_model_name->get_qualified_column()."='".$this->get_this_model()->get_this_model_name()."'" ).
 				$this->get_join_model()->_construct_internal_join_to_table_with_alias($join_table_alias);
 
 		return $SQL;
@@ -111,9 +111,9 @@ 
 	 * @return string of SQL
 	 * @throws \EE_Error
 	 */
-	public function get_join_statement($model_relation_chain){
-		if( $this->_model_relation_chain_to_join_model === NULL ){
-			throw new EE_Error( sprintf( __( 'When using EE_HABTM_Relation to create a join, you must call get_join_to_intermediate_model_statement BEFORE get_join_statement', 'event_espresso' )));
+	public function get_join_statement($model_relation_chain) {
+		if ($this->_model_relation_chain_to_join_model === NULL) {
+			throw new EE_Error(sprintf(__('When using EE_HABTM_Relation to create a join, you must call get_join_to_intermediate_model_statement BEFORE get_join_statement', 'event_espresso')));
 		}
 		$join_table_fk_field_to_this_table = $this->get_join_table_fk_field_to(
 				$this->get_this_model()->get_this_model_name(),
@@ -125,10 +125,10 @@ 
 				$this->get_other_model()->get_this_model_name(),
 				'name' );
 
-		$join_table_alias = EE_Model_Parser::extract_table_alias_model_relation_chain_prefix($this->_model_relation_chain_to_join_model, $this->get_join_model()->get_this_model_name()) . $join_table_fk_field_to_this_table->get_table_alias();
+		$join_table_alias = EE_Model_Parser::extract_table_alias_model_relation_chain_prefix($this->_model_relation_chain_to_join_model, $this->get_join_model()->get_this_model_name()).$join_table_fk_field_to_this_table->get_table_alias();
 
 		$other_table_pk_field = $this->get_other_model()->get_primary_key_field();
-		$other_table_alias = EE_Model_Parser::extract_table_alias_model_relation_chain_prefix($model_relation_chain, $this->get_other_model()->get_this_model_name()) . $other_table_pk_field->get_table_alias();
+		$other_table_alias = EE_Model_Parser::extract_table_alias_model_relation_chain_prefix($model_relation_chain, $this->get_other_model()->get_this_model_name()).$other_table_pk_field->get_table_alias();
 		$other_table = $this->get_other_model()->get_table_for_alias($other_table_alias);
 
 		$SQL = $this->_left_join(
@@ -138,7 +138,7 @@ 
 					$join_table_alias,
 					$join_table_fk_field_to_other_table->get_table_column(),
 					$field_with_other_model_name->get_qualified_column()."='".$this->get_other_model()->get_this_model_name()."'"
-				) .
+				).
 				$this->get_other_model()->_construct_internal_join_to_table_with_alias($other_table_alias);
 		return $SQL;
 	}
@@ -154,7 +154,7 @@ 
 	 * @return EE_Base_Class
 	 * @throws \EE_Error
 	 */
-	public function add_relation_to($this_obj_or_id, $other_obj_or_id, $extra_join_model_fields_n_values = array() ){
+	public function add_relation_to($this_obj_or_id, $other_obj_or_id, $extra_join_model_fields_n_values = array()) {
 		 $this_model_obj = $this->get_this_model()->ensure_is_obj($this_obj_or_id, true);
 		 $other_model_obj = $this->get_other_model()->ensure_is_obj($other_obj_or_id, true);
 		//check if such a relationship already exists
@@ -171,32 +171,32 @@ 
 				$this->get_other_model()->get_this_model_name(),
 				'name' );
 
-		$cols_n_values =  array(
+		$cols_n_values = array(
 				$join_model_fk_to_this_model->get_name() => $this_model_obj->ID(),
 				$join_model_name_field_to_this_model->get_name() => $this_model_obj->get_model()->get_this_model_name(),
 				$join_model_fk_to_other_model->get_name() => $other_model_obj->ID(),
 				$join_model_name_field_to_other_model->get_name() => $other_model_obj->get_model()->get_this_model_name() );
 
 		//if $where_query exists lets add them to the query_params.
-		if ( !empty( $extra_join_model_fields_n_values ) ) {
+		if ( ! empty($extra_join_model_fields_n_values)) {
 		   //make sure we strip any of the join model names from the $where_query cause we don't need that in here (why? because client code may have used the same conditionals for get_all_related which DOES need the join model name)
 		   //make sure we strip THIS models name from the query param
 			$parsed_query = array();
-		   foreach ( $extra_join_model_fields_n_values as $query_param => $val ) {
-			   $query_param = str_replace($this->get_join_model()->get_this_model_name().".","", $query_param);
+		   foreach ($extra_join_model_fields_n_values as $query_param => $val) {
+			   $query_param = str_replace($this->get_join_model()->get_this_model_name().".", "", $query_param);
 			   $parsed_query[$query_param] = $val;
 		   }
-		   $cols_n_values = array_merge( $cols_n_values, $parsed_query );
+		   $cols_n_values = array_merge($cols_n_values, $parsed_query);
 		}
 
-		$query_params = array( $cols_n_values );
+		$query_params = array($cols_n_values);
 
 
 		$existing_entry_in_join_table = $this->get_join_model()->get_one($query_params);
 		//if there is already an entry in the join table, indicating a relationship, we're done
 		 //again, if you want more sophisticated logic or insertions (handling more columns than just 2 foreign keys to
 		 //the other tables, use the joining model directly!
-		if( ! $existing_entry_in_join_table ){
+		if ( ! $existing_entry_in_join_table) {
 			$this->get_join_model()->insert($cols_n_values);
 		}
 		return $other_model_obj;
@@ -214,7 +214,7 @@ 
 	 * @return EE_Base_Class
 	 * @throws \EE_Error
 	 */
-	public function remove_relation_to($this_obj_or_id, $other_obj_or_id, $where_query = array() ){
+	public function remove_relation_to($this_obj_or_id, $other_obj_or_id, $where_query = array()) {
 		 $this_model_obj = $this->get_this_model()->ensure_is_obj($this_obj_or_id, true);
 		 $other_model_obj = $this->get_other_model()->ensure_is_obj($other_obj_or_id, true);
 		//check if such a relationship already exists
@@ -231,25 +231,25 @@ 
 				$this->get_other_model()->get_this_model_name(),
 				'name' );
 
-		$cols_n_values =  array(
+		$cols_n_values = array(
 				$join_model_fk_to_this_model->get_name() => $this_model_obj->ID(),
 				$join_model_name_field_to_this_model->get_name() => $this_model_obj->get_model()->get_this_model_name(),
 				$join_model_fk_to_other_model->get_name() => $other_model_obj->ID(),
 				$join_model_name_field_to_other_model->get_name() => $other_model_obj->get_model()->get_this_model_name() );
 
 		//if $where_query exists lets add them to the query_params.
-		if ( !empty( $where_query ) ) {
+		if ( ! empty($where_query)) {
 		 	//make sure we strip any of the join model names from the $where_query cause we don't need that in here (why? because client code may have used the same conditionals for get_all_related which DOES need the join model name)
 		 	//make sure we strip THIS models name from the query param
 			$parsed_query = array();
-			foreach ( $where_query as $query_param => $val ) {
-				$query_param = str_replace($this->get_join_model()->get_this_model_name().".","", $query_param);
+			foreach ($where_query as $query_param => $val) {
+				$query_param = str_replace($this->get_join_model()->get_this_model_name().".", "", $query_param);
 				$parsed_query[$query_param] = $val;
 			}
-		 	$cols_n_values = array_merge( $cols_n_values, $parsed_query );
+		 	$cols_n_values = array_merge($cols_n_values, $parsed_query);
 		}
 
-		$this->get_join_model()->delete( array($cols_n_values) );
+		$this->get_join_model()->delete(array($cols_n_values));
 		return $other_model_obj;
 	 }
 }

core/db_models/relations/EE_Has_Many_Relation.php

Spacing +10 added lines, -10 removed lines

@@ -1,5 +1,5 @@ 
 <?php
-require_once( EE_MODELS . 'relations/EE_Model_Relation_Base.php');
+require_once(EE_MODELS.'relations/EE_Model_Relation_Base.php');
 
 
 
@@ -11,7 +11,7 @@ 
  * @subpackage    core
  * @author        Michael Nelson
  */
-class EE_Has_Many_Relation extends EE_Model_Relation_Base{
+class EE_Has_Many_Relation extends EE_Model_Relation_Base {
 
 	/**
 	 * Object representing the relationship between two models. Has_Many_Relations are where the OTHER model has the foreign key
@@ -21,7 +21,7 @@ 
 	 * @param boolean $block_deletes For this type of relation, we block by default. If there are related models across this relation, block (prevent and add an error) the deletion of this model
 	 * @param string $blocking_delete_error_message a customized error message on blocking deletes instead of the default
 	 */
-	public function __construct($block_deletes = true, $blocking_delete_error_message = null){
+	public function __construct($block_deletes = true, $blocking_delete_error_message = null) {
 		parent::__construct($block_deletes, $blocking_delete_error_message);
 	}
 
@@ -34,13 +34,13 @@ 
 	 * @return string of SQL, eg "LEFT JOIN table_name AS table_alias ON this_model_primary_table.pk = other_model_primary_table.fk" etc
 	 * @throws \EE_Error
 	 */
-	public function get_join_statement( $model_relation_chain){
+	public function get_join_statement($model_relation_chain) {
 		//create the sql string like
 		// LEFT JOIN other_table AS table_alias ON this_table_alias.pk = other_table_alias.fk extra_join_conditions
 		$this_table_pk_field = $this->get_this_model()->get_primary_key_field();
 		$other_table_fk_field = $this->get_other_model()->get_foreign_key_to($this->get_this_model()->get_this_model_name());
-		$pk_table_alias = EE_Model_Parser::extract_table_alias_model_relation_chain_prefix($model_relation_chain, $this->get_this_model()->get_this_model_name()) . $this_table_pk_field->get_table_alias();
-		$fk_table_alias = EE_Model_Parser::extract_table_alias_model_relation_chain_prefix($model_relation_chain, $this->get_other_model()->get_this_model_name()) . $other_table_fk_field->get_table_alias();
+		$pk_table_alias = EE_Model_Parser::extract_table_alias_model_relation_chain_prefix($model_relation_chain, $this->get_this_model()->get_this_model_name()).$this_table_pk_field->get_table_alias();
+		$fk_table_alias = EE_Model_Parser::extract_table_alias_model_relation_chain_prefix($model_relation_chain, $this->get_other_model()->get_this_model_name()).$other_table_fk_field->get_table_alias();
 		$fk_table = $this->get_other_model()->get_table_for_alias($fk_table_alias);
 
 		return $this->_left_join($fk_table, $fk_table_alias, $other_table_fk_field->get_table_column(), $pk_table_alias, $this_table_pk_field->get_table_column()).$this->get_other_model()->_construct_internal_join_to_table_with_alias($fk_table_alias);
@@ -57,13 +57,13 @@ 
 	 * @return \EE_Base_Class
 	 * @throws \EE_Error
 	 */
-	public function add_relation_to($this_obj_or_id, $other_obj_or_id, $extra_join_model_fields_n_values = array() ){
+	public function add_relation_to($this_obj_or_id, $other_obj_or_id, $extra_join_model_fields_n_values = array()) {
 		 $this_model_obj = $this->get_this_model()->ensure_is_obj($this_obj_or_id, true);
 		 $other_model_obj = $this->get_other_model()->ensure_is_obj($other_obj_or_id, true);
 
 		 //find the field on the other model which is a foreign key to this model
 		 $fk_field_on_other_model = $this->get_other_model()->get_foreign_key_to($this->get_this_model()->get_this_model_name());
-		 if($other_model_obj->get($fk_field_on_other_model->get_name()) != $this_model_obj->ID()){
+		 if ($other_model_obj->get($fk_field_on_other_model->get_name()) != $this_model_obj->ID()) {
 			//set that field on the other model to this model's ID
 			$other_model_obj->set($fk_field_on_other_model->get_name(), $this_model_obj->ID());
 			$other_model_obj->save();
@@ -83,12 +83,12 @@ 
 	 * @return \EE_Base_Class
 	 * @throws \EE_Error
 	 */
-	public function remove_relation_to($this_obj_or_id, $other_obj_or_id, $where_query = array()){
+	public function remove_relation_to($this_obj_or_id, $other_obj_or_id, $where_query = array()) {
 		 $other_model_obj = $this->get_other_model()->ensure_is_obj($other_obj_or_id, true);
 		 //find the field on the other model which is a foreign key to this model
 		 $fk_field_on_other_model = $this->get_other_model()->get_foreign_key_to($this->get_this_model()->get_this_model_name());
 		 //set that field on the other model to this model's ID
-		 $other_model_obj->set($fk_field_on_other_model->get_name(),null, true);
+		 $other_model_obj->set($fk_field_on_other_model->get_name(), null, true);
 		 $other_model_obj->save();
 		 return $other_model_obj;
 	 }

core/db_models/relations/EE_Has_Many_Revision_Relation.php

Spacing +48 added lines, -48 removed lines

@@ -1,5 +1,5 @@ 
 <?php
-require_once( EE_MODELS . 'relations/EE_Has_Many_Relation.php');
+require_once(EE_MODELS.'relations/EE_Has_Many_Relation.php');
 
 
 
@@ -11,7 +11,7 @@ 
  * @subpackage    core
  * @author        Michael Nelson
  */
-class EE_Has_Many_Revision_Relation extends EE_Has_Many_Relation{
+class EE_Has_Many_Revision_Relation extends EE_Has_Many_Relation {
 
 
 	/**
@@ -44,7 +44,7 @@ 
 	 * @param boolean $block_deletes For this type of relation, we block by default. If there are related models across this relation, block (prevent and add an error) the deletion of this model
 	 * @param string $blocking_delete_error_message a customized error message on blocking deletes instead of the default
 	 */
-	public function __construct($primary_cpt_field, $parent_pk_relation_field, $block_deletes = true, $blocking_delete_error_message = null){
+	public function __construct($primary_cpt_field, $parent_pk_relation_field, $block_deletes = true, $blocking_delete_error_message = null) {
 		$this->_primary_cpt_field = $primary_cpt_field;
 		$this->_parent_pk_relation_field = $parent_pk_relation_field;
 		parent::__construct($block_deletes, $blocking_delete_error_message);
@@ -61,7 +61,7 @@ 
 	 * @return \EE_Base_Class
 	 * @throws \EE_Error
 	 */
-	public function add_relation_to($this_obj_or_id, $other_obj_or_id, $extra_join_model_fields_n_values = array() ){
+	public function add_relation_to($this_obj_or_id, $other_obj_or_id, $extra_join_model_fields_n_values = array()) {
 		 $this_model_obj = $this->get_this_model()->ensure_is_obj($this_obj_or_id, true);
 		 $other_model_obj = $this->get_other_model()->ensure_is_obj($other_obj_or_id);
 
@@ -69,7 +69,7 @@ 
 		 $other_model_obj = $this->_check_for_revision($this_model_obj, $other_model_obj);
 
 		 //if is array, then we've already done the add_relation so let's get out
-		if ( is_array( $other_model_obj ) ){
+		if (is_array($other_model_obj)) {
 			return $other_model_obj[0];
 		}
 		 //find the field on the other model which is a foreign key to this model
@@ -91,15 +91,15 @@ 
 	 * @return \EE_Base_Class
 	 * @throws \EE_Error
 	 */
-	public function remove_relation_to($this_obj_or_id, $other_obj_or_id, $where_query = array()){
+	public function remove_relation_to($this_obj_or_id, $other_obj_or_id, $where_query = array()) {
 	 	$this_model_obj = $this->get_this_model()->ensure_is_obj($this_obj_or_id);
 		$other_model_obj = $this->get_other_model()->ensure_is_obj($other_obj_or_id);
 		//handle possible revisions
-		$other_model_obj = $this->_check_for_revision( $this_model_obj, $other_model_obj, TRUE );
+		$other_model_obj = $this->_check_for_revision($this_model_obj, $other_model_obj, TRUE);
 
 
 		//if is array, then we've already done the add_relation so let's get out
-		if ( is_array( $other_model_obj ) ){
+		if (is_array($other_model_obj)) {
 			return $other_model_obj[0];
 		}
 
@@ -108,12 +108,12 @@ 
 
 
 		 //set that field on the other model to this model's ID
-		 if ( $this->_blocking_delete ) {
-		 	$other_model_obj->set($fk_field_on_other_model->get_name(),null,true);
+		 if ($this->_blocking_delete) {
+		 	$other_model_obj->set($fk_field_on_other_model->get_name(), null, true);
 		 	$other_model_obj->save();
 		 } else {
 		 	$other_model_obj->delete();
-		 	$other_model_obj->set($fk_field_on_other_model->get_name(),null,true);
+		 	$other_model_obj->set($fk_field_on_other_model->get_name(), null, true);
 		 	return $other_model_obj;
 		 }
 		 return $other_model_obj;
@@ -130,17 +130,17 @@ 
 	 * @return EE_Base_Class[]
 	 * @throws \EE_Error
 	 */
-	 public function get_all_related( $model_object_or_id, $query_params = array(), $values_already_prepared_by_model_object = false ) {
-		if( $values_already_prepared_by_model_object !== false ) {
-			EE_Error::doing_it_wrong( 'EE_Model_Relation_Base::get_all_related', __( 'The argument $values_already_prepared_by_model_object is no longer used.', 'event_espresso' ), '4.8.1' );
+	 public function get_all_related($model_object_or_id, $query_params = array(), $values_already_prepared_by_model_object = false) {
+		if ($values_already_prepared_by_model_object !== false) {
+			EE_Error::doing_it_wrong('EE_Model_Relation_Base::get_all_related', __('The argument $values_already_prepared_by_model_object is no longer used.', 'event_espresso'), '4.8.1');
 		}
 
 	 	//if this is an autosave then we're going to get things differently
-	 	if ( defined('DOING_AUTOSAVE') && DOING_AUTOSAVE ) {
-	 		return $this->_do_autosave_get_all($model_object_or_id, $query_params );
+	 	if (defined('DOING_AUTOSAVE') && DOING_AUTOSAVE) {
+	 		return $this->_do_autosave_get_all($model_object_or_id, $query_params);
 	 	}
 
-	 	return parent::get_all_related( $model_object_or_id, $query_params );
+	 	return parent::get_all_related($model_object_or_id, $query_params);
 	 }
 
 
@@ -156,22 +156,22 @@ 
 	 * @return \EE_Base_Class[]
 	 * @throws \EE_Error
 	 */
-	 protected function _do_autosave_get_all( $model_object_or_id, $query_params, $deprecated = false ) {
+	 protected function _do_autosave_get_all($model_object_or_id, $query_params, $deprecated = false) {
 
 	 	//first we check if the post_id for the incoming query is for an autosave.  If it isn't that's what we want!
-	 	$model_object_id = $this->_get_model_object_id( $model_object_or_id );
+	 	$model_object_id = $this->_get_model_object_id($model_object_or_id);
 
-	 	$autosave = wp_get_post_autosave( $model_object_id );
+	 	$autosave = wp_get_post_autosave($model_object_id);
 	 	$id_to_use = $autosave ? $autosave->ID : $model_object_id;
 
-	 	$autosave_relations =  parent::get_all_related( $id_to_use, $query_params );
+	 	$autosave_relations = parent::get_all_related($id_to_use, $query_params);
 	 	$parent_ids = $parents = array();
 	 	$return_objs = array();
 
 		//k this is where things differ because NOW what we're going to do is get the PARENTS for the get all related (and we'll also start setting up the return_objs array containing related that DON'T have parent ids, for those that DON'T have parents to merge with our returned objects);
-		foreach ( $autosave_relations as $a_r ) {
+		foreach ($autosave_relations as $a_r) {
 			$pid = $a_r->parent();
-			if ( !empty( $pid ) ) {
+			if ( ! empty($pid)) {
 				$parent_ids[] = $pid;
 			} else {
 				$return_objs[] = $a_r;
@@ -179,17 +179,17 @@ 
 		}
 
 		//we have to make sure we also include the ORIGINAL values
-		$originals = parent::get_all_related($model_object_or_id, $query_params );
+		$originals = parent::get_all_related($model_object_or_id, $query_params);
 
 		//merge $originals with $return_objs
-		if ( $originals ) {
+		if ($originals) {
 			$return_objs = array_merge($originals, $return_objs);
 		}
 
 		//now we setup the query to get all the parents
-		if ( !empty( $parent_ids ) ) {
+		if ( ! empty($parent_ids)) {
 			$query_param_where_this_model_pk = $this->get_this_model()->get_this_model_name().".".$this->get_this_model()->get_primary_key_field()->get_name();
-			$query_param[0][$query_param_where_this_model_pk] = array('IN', $parent_ids );
+			$query_param[0][$query_param_where_this_model_pk] = array('IN', $parent_ids);
 			$parents = $this->get_other_model()->get_all($query_params);
 		}
 
@@ -197,7 +197,7 @@ 
 
 
 		//now merge parents with our current $return_objs and send back
-		return array_merge( $parents, $return_objs );
+		return array_merge($parents, $return_objs);
 	 }
 
 
@@ -211,42 +211,42 @@ 
 	 * @return EE_Base_Class. ($other_obj);
 	 * @throws \EE_Error
 	 */
-	protected function _check_for_revision( $this_obj, $other_obj, $remove_relation = FALSE ) {
+	protected function _check_for_revision($this_obj, $other_obj, $remove_relation = FALSE) {
 		$pk_on_related_model = $this->get_other_model()->get_primary_key_field()->get_name();
 		//now we need to determine if we're in a WP revision save cause if we are we need to do some special handling
-		if (  $this_obj->post_type() === 'revision' ) {
+		if ($this_obj->post_type() === 'revision') {
 			//first if $other_obj fk = this_obj pk then we know that this is a pk object, let's make sure there is a matching set for the autosave if there is then we save over it, if there isn't then we need to create a new one.
 			$parent_evt_id = $this_obj->parent();
 			/*var_dump($parent_evt_id);
 			var_dump($this_obj);
 			var_dump($other_obj);/**/
 
-			if ( !empty($parent_evt_id) && $parent_evt_id == $other_obj->get($this->_primary_cpt_field) ) {
+			if ( ! empty($parent_evt_id) && $parent_evt_id == $other_obj->get($this->_primary_cpt_field)) {
 				//let's do query on this objects model to see if the incoming pk value on the obj matches any parents in this objects table.
-				$has_parent_obj = $this->get_other_model()->get_one( array( array( $this->_parent_pk_relation_field => $other_obj->ID(), $this->_primary_cpt_field => $this_obj->ID() ) ) );
+				$has_parent_obj = $this->get_other_model()->get_one(array(array($this->_parent_pk_relation_field => $other_obj->ID(), $this->_primary_cpt_field => $this_obj->ID())));
 
-				if ( $has_parent_obj ) {
+				if ($has_parent_obj) {
 					//this makes sure the update on the current obj happens to the revision's row NOT the parent row.
 
-					$other_obj->set( $this->_parent_pk_relation_field, $other_obj->ID());
-					$other_obj->set($pk_on_related_model, $has_parent_obj->ID() );
+					$other_obj->set($this->_parent_pk_relation_field, $other_obj->ID());
+					$other_obj->set($pk_on_related_model, $has_parent_obj->ID());
 					$other_obj->set($this->_primary_cpt_field, $this_obj->ID());
 
-					if ( !$remove_relation ) {
+					if ( ! $remove_relation) {
 						$other_obj->save();
-						return array( $other_obj );
-					} elseif ( $remove_relation && !$this->_blocking_delete) {
+						return array($other_obj);
+					} elseif ($remove_relation && ! $this->_blocking_delete) {
 						$other_obj->delete();
 						$other_obj->set($this->_parent_pk_relation_field, NULL, true);
 						return array($other_obj);
 					}
 
 				} else {
-					$other_obj->set( $this->_parent_pk_relation_field, $other_obj->ID() );
-					$other_obj->set( $this->_primary_cpt_field, $this_obj->ID() );
+					$other_obj->set($this->_parent_pk_relation_field, $other_obj->ID());
+					$other_obj->set($this->_primary_cpt_field, $this_obj->ID());
 					$other_obj->set($pk_on_related_model, NULL, true); //ensure we create a new row for the autosave with parent id the same as the incoming ID.
 					$other_obj->save(); //make sure we insert.
-					return array( $other_obj );
+					return array($other_obj);
 				}
 			}
 
@@ -259,24 +259,24 @@ 
 		} else {
 
 			//we only need to do the below IF this is not a remove relation
-			if ( !$remove_relation ) {
+			if ( ! $remove_relation) {
 				//okay this is is a normal update/save/remove so, let's make sure the other object is not a revision of the current object.
 				//the other object will likely NOT have the correct fk on it (which is the primary_cpt_field_mame) so we must retrieve from the db to get that first.
 				$existing_other_obj = $this->get_other_model()->get_one_by_ID($other_obj->ID());
 				$potential_revision_id = is_object($existing_other_obj) ? $existing_other_obj->get($this->_primary_cpt_field) : NULL;
 
-				if ( $parent_this_obj_id = wp_is_post_revision($potential_revision_id) ) {
+				if ($parent_this_obj_id = wp_is_post_revision($potential_revision_id)) {
 					//yes the OTHER object is linked to the revision of the parent, not the parent itself. That means we need to make the other_object an attachment of this_obj and then duplicate other_obj for the revision.
-					$other_obj->set($this->_primary_cpt_field, $this_obj->ID() );
+					$other_obj->set($this->_primary_cpt_field, $this_obj->ID());
 					$other_obj->save();
 
 					//now create a new other_obj and fill with details from existing object
 					$new_obj = $other_obj;
-					$new_obj->set( $this->_primary_cpt_field, $potential_revision_id );
-					$new_obj->set( $this->_parent_pk_relation_field, $other_obj->ID() );
-					$new_obj->set( $pk_on_related_model, NULL );
+					$new_obj->set($this->_primary_cpt_field, $potential_revision_id);
+					$new_obj->set($this->_parent_pk_relation_field, $other_obj->ID());
+					$new_obj->set($pk_on_related_model, NULL);
 					$new_obj->save();
-					return array( $new_obj );
+					return array($new_obj);
 				}
 
 			}

core/db_models/relations/EE_Belongs_To_Any_Relation.php

Spacing +6 added lines, -6 removed lines

@@ -1,5 +1,5 @@ 
 <?php
-require_once( EE_MODELS . 'relations/EE_Belongs_To_Relation.php');
+require_once(EE_MODELS.'relations/EE_Belongs_To_Relation.php');
 
 
 
@@ -23,7 +23,7 @@ 
 	 * @return string
 	 * @throws \EE_Error
 	 */
-	public function get_join_statement( $model_relation_chain) {
+	public function get_join_statement($model_relation_chain) {
 		//create the sql string like
 		$this_table_fk_field = $this->get_this_model()->get_foreign_key_to($this->get_other_model()->get_this_model_name());
 		//ALSO, need to get the field with the model name
@@ -31,8 +31,8 @@ 
 
 
 		$other_table_pk_field = $this->get_other_model()->get_primary_key_field();
-		$this_table_alias = EE_Model_Parser::extract_table_alias_model_relation_chain_prefix($model_relation_chain,$this->get_this_model()->get_this_model_name()) . $this_table_fk_field->get_table_alias();
-		$other_table_alias = EE_Model_Parser::extract_table_alias_model_relation_chain_prefix($model_relation_chain, $this->get_other_model()->get_this_model_name()) . $other_table_pk_field->get_table_alias();
+		$this_table_alias = EE_Model_Parser::extract_table_alias_model_relation_chain_prefix($model_relation_chain, $this->get_this_model()->get_this_model_name()).$this_table_fk_field->get_table_alias();
+		$other_table_alias = EE_Model_Parser::extract_table_alias_model_relation_chain_prefix($model_relation_chain, $this->get_other_model()->get_this_model_name()).$other_table_pk_field->get_table_alias();
 		$other_table = $this->get_other_model()->get_table_for_alias($other_table_alias);
 		return $this->_left_join($other_table,
 				$other_table_alias,
@@ -80,12 +80,12 @@ 
 	 */
 	public function remove_relation_to($this_obj_or_id, $other_obj_or_id, $where_query = array()) {
 		$this_model_obj = $this->get_this_model()->ensure_is_obj($this_obj_or_id, true);
-		$other_model_obj = $this->get_other_model()->ensure_is_obj( $other_obj_or_id );
+		$other_model_obj = $this->get_other_model()->ensure_is_obj($other_obj_or_id);
 		//find the field on the other model which is a foreign key to this model
 		$fk_on_this_model = $this->get_this_model()->get_foreign_key_to($this->get_other_model()->get_this_model_name());
 		//set that field on the other model to this model's ID
 		$this_model_obj->set($fk_on_this_model->get_name(), null, true);
-		$this_model_obj->set($this->get_this_model()->get_field_containing_related_model_name()->get_name(),null,true);
+		$this_model_obj->set($this->get_this_model()->get_field_containing_related_model_name()->get_name(), null, true);
 		$this_model_obj->save();
 		return $other_model_obj;
 	}

core/db_models/relations/EE_Has_Many_Any_Relation.php

Spacing +9 added lines, -9 removed lines

@@ -4,7 +4,7 @@ 
 /*
  *
  */
-require_once( EE_MODELS . 'relations/EE_Model_Relation_Base.php');
+require_once(EE_MODELS.'relations/EE_Model_Relation_Base.php');
 
 
 
@@ -19,7 +19,7 @@ 
  * @subpackage    core
  * @author        Michael Nelson
  */
-class EE_Has_Many_Any_Relation extends EE_Has_Many_Relation{
+class EE_Has_Many_Any_Relation extends EE_Has_Many_Relation {
 
 	/**
 	 * Gets the SQL string for performing the join between this model and the other model.
@@ -28,13 +28,13 @@ 
 	 * @return string of SQL, eg "LEFT JOIN table_name AS table_alias ON this_model_primary_table.pk = other_model_primary_table.fk" etc
 	 * @throws \EE_Error
 	 */
-	public function get_join_statement( $model_relation_chain){
+	public function get_join_statement($model_relation_chain) {
 		//create the sql string like
 		// LEFT JOIN other_table AS table_alias ON this_table_alias.pk = other_table_alias.fk extra_join_conditions
 		$this_table_pk_field = $this->get_this_model()->get_primary_key_field();
 		$other_table_fk_field = $this->get_other_model()->get_foreign_key_to($this->get_this_model()->get_this_model_name());
-		$pk_table_alias = EE_Model_Parser::extract_table_alias_model_relation_chain_prefix($model_relation_chain, $this->get_this_model()->get_this_model_name()) . $this_table_pk_field->get_table_alias();
-		$fk_table_alias = EE_Model_Parser::extract_table_alias_model_relation_chain_prefix($model_relation_chain, $this->get_other_model()->get_this_model_name()) . $other_table_fk_field->get_table_alias();
+		$pk_table_alias = EE_Model_Parser::extract_table_alias_model_relation_chain_prefix($model_relation_chain, $this->get_this_model()->get_this_model_name()).$this_table_pk_field->get_table_alias();
+		$fk_table_alias = EE_Model_Parser::extract_table_alias_model_relation_chain_prefix($model_relation_chain, $this->get_other_model()->get_this_model_name()).$other_table_fk_field->get_table_alias();
 		$fk_table = $this->get_other_model()->get_table_for_alias($fk_table_alias);
 		$field_with_model_name = $this->get_other_model()->get_field_containing_related_model_name();
 
@@ -43,7 +43,7 @@ 
 				$other_table_fk_field->get_table_column(),
 				$pk_table_alias,
 				$this_table_pk_field->get_table_column(),
-				$fk_table_alias . '.' . $field_with_model_name->get_table_column() . "='" . $this->get_this_model()->get_this_model_name() . "'" )
+				$fk_table_alias.'.'.$field_with_model_name->get_table_column()."='".$this->get_this_model()->get_this_model_name()."'")
 				.$this->get_other_model()->_construct_internal_join_to_table_with_alias($fk_table_alias);
 	}
 
@@ -58,7 +58,7 @@ 
 	 * @return \EE_Base_Class
 	 * @throws \EE_Error
 	 */
-	public function add_relation_to($this_obj_or_id, $other_obj_or_id, $extra_join_model_fields_n_values = array() ){
+	public function add_relation_to($this_obj_or_id, $other_obj_or_id, $extra_join_model_fields_n_values = array()) {
 		 $this_model_obj = $this->get_this_model()->ensure_is_obj($this_obj_or_id, true);
 		 $other_model_obj = $this->get_other_model()->ensure_is_obj($other_obj_or_id, true);
 
@@ -83,12 +83,12 @@ 
 	 * @return \EE_Base_Class
 	 * @throws \EE_Error
 	 */
-	public function remove_relation_to($this_obj_or_id, $other_obj_or_id, $where_query = array()){
+	public function remove_relation_to($this_obj_or_id, $other_obj_or_id, $where_query = array()) {
 		 $other_model_obj = $this->get_other_model()->ensure_is_obj($other_obj_or_id, true);
 		 //find the field on the other model which is a foreign key to this model
 		 $fk_field_on_other_model = $this->get_other_model()->get_foreign_key_to($this->get_this_model()->get_this_model_name());
 		 //set that field on the other model to this model's ID
-		 $other_model_obj->set($fk_field_on_other_model->get_name(),null, true);
+		 $other_model_obj->set($fk_field_on_other_model->get_name(), null, true);
 		 $other_model_obj->set($this->get_other_model()->get_field_containing_related_model_name()->get_name(), null, true);
 		 $other_model_obj->save();
 		 return $other_model_obj;