eventespresso / event-espresso-core

core/db_models/helpers/EE_Table_Base.php

Spacing +15 added lines, -15 removed lines

@@ -4,7 +4,7 @@ 
  * Base class for defining the tables that comprise models. This is used to store information
  * about the table\s alias, private key, etc.
  */
-abstract class EE_Table_Base{
+abstract class EE_Table_Base {
 	var $_table_name;
 	var $_table_alias;
 	/**
@@ -21,30 +21,30 @@ 
 	 * @param boolean $global whether the table is "global" as in there is only 1 table on an entire multisite install,
 	 *					or whether each site on a multisite install has a copy of this table
 	 */
-	function __construct($table_name, $pk_column, $global = false ){
+	function __construct($table_name, $pk_column, $global = false) {
 		global $wpdb;
-		if( $global ) {
+		if ($global) {
 			$prefix = $wpdb->base_prefix;
 		} else {
 			$prefix = $wpdb->prefix;
 		}
 		//if they didn't add the prefix, let's add it
-		if( strpos( $table_name, $prefix ) !== 0 ) {
-			$table_name = $prefix . $table_name;
+		if (strpos($table_name, $prefix) !== 0) {
+			$table_name = $prefix.$table_name;
 		}
 		$this->_table_name = $table_name;
 		$this->_pk_column = $pk_column;
 	}
 
-	function _construct_finalize_with_alias($table_alias){
+	function _construct_finalize_with_alias($table_alias) {
 		$this->_table_alias = $table_alias;
 	}
 
-	function get_table_name(){
+	function get_table_name() {
 		return $this->_table_name;
 	}
-	function get_table_alias(){
-		if( ! $this->_table_alias){
+	function get_table_alias() {
+		if ( ! $this->_table_alias) {
 			throw new EE_Error("You must call _construct_finalize_with_alias before using the EE_Table_Base. Did you forget to call parent::__construct at the end of your EEMerimental_Base child's __construct?");
 		}
 		return $this->_table_alias;
@@ -54,7 +54,7 @@ 
 	 *
 	 * @return string name of column of PK
 	 */
-	function get_pk_column(){
+	function get_pk_column() {
 		return $this->_pk_column;
 	}
 
@@ -64,8 +64,8 @@ 
 	 * returns a string with the table alias, a period, and the private key's column.
 	 * @return string
 	 */
-	function get_fully_qualified_pk_column(){
-		$sql =  $this->get_table_alias().".".$this->get_pk_column();
+	function get_fully_qualified_pk_column() {
+		$sql = $this->get_table_alias().".".$this->get_pk_column();
 		return $sql;
 	}
 
@@ -74,9 +74,9 @@ 
 	 * returns the special sql for a inner select with a limit.
 	 * @return string    SQL select
 	 */
-	public function get_select_join_limit( $limit ) {
-		$limit = is_array( $limit ) ? 'LIMIT ' . implode(',', array_map( 'intval', $limit ) ) : 'LIMIT ' . (int) $limit;
-		$SQL = SP . '(SELECT * FROM ' . $this->_table_name . SP . $limit . ') AS ' . $this->_table_alias;
+	public function get_select_join_limit($limit) {
+		$limit = is_array($limit) ? 'LIMIT '.implode(',', array_map('intval', $limit)) : 'LIMIT '.(int) $limit;
+		$SQL = SP.'(SELECT * FROM '.$this->_table_name.SP.$limit.') AS '.$this->_table_alias;
 		return $SQL;
 	}
 }

core/db_models/helpers/EE_Unique_Index.php

Spacing +1 added lines, -1 removed lines

@@ -4,7 +4,7 @@
  * Used to indicate  a UNIQUE key index - ie, a set of fields which must be unique
  * for ALL the model objects of this type
  */
-class EE_Unique_Index extends EE_Index{
+class EE_Unique_Index extends EE_Index {
 	//yep, actually the same as index right now
 	
 }

core/db_models/relations/EE_Belongs_To_Any_Relation.php

Spacing +5 added lines, -5 removed lines

@@ -6,7 +6,7 @@ 
  * in order to specify which model the foreign key points to (eg, the foreign key may have a value of 34, but is that Transaction with
  * ID 34 or Registration with ID 34? The EE_Any_Foreign_Model_name_Field specifies which of the two). 
  */
-require_once( EE_MODELS . 'relations/EE_Belongs_To_Relation.php');
+require_once(EE_MODELS.'relations/EE_Belongs_To_Relation.php');
 
 class EE_Belongs_To_Any_Relation extends EE_Belongs_To_Relation {
 
@@ -19,8 +19,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, 
@@ -58,12 +58,12 @@ 
 	 */
 	function remove_relation_to($this_obj_or_id, $other_obj_or_id) {
 		$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 th eother 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_Belongs_To_Relation.php

Braces +1 added lines, -1 removed lines

@@ -94,7 +94,7 @@
 		//get its value
 		if( $model_obj_or_id instanceof EE_Base_Class){
 			$model_obj = $model_obj_or_id;
-		}else{
+		} else{
 			$model_obj = $this->get_this_model()->ensure_is_obj($model_obj_or_id);
 		}
 		$ID_value_on_other_model = $model_obj->get($fk_field_obj->get_name());

Spacing +8 added lines, -8 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');
 /**
  * Class EE_Belongs_To_Relation
  *
@@ -36,10 +36,10 @@ 
 		//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());
 		$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, $other_table_pk_field->get_table_column(), $this_table_alias, $this_table_fk_field->get_table_column()) . $this->get_other_model()->_construct_internal_join_to_table_with_alias($other_table_alias);
+		return $this->_left_join($other_table, $other_table_alias, $other_table_pk_field->get_table_column(), $this_table_alias, $this_table_fk_field->get_table_column()).$this->get_other_model()->_construct_internal_join_to_table_with_alias($other_table_alias);
 	}
 
 	/**
@@ -53,7 +53,7 @@ 
 		$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_on_this_model = $this->get_this_model()->get_foreign_key_to($this->get_other_model()->get_this_model_name());
-		if ( $this_model_obj->get($fk_on_this_model->get_name()) != $other_model_obj->ID()){
+		if ($this_model_obj->get($fk_on_this_model->get_name()) != $other_model_obj->ID()) {
 			//set that field on the other model to this model's ID
 			$this_model_obj->set($fk_on_this_model->get_name(), $other_model_obj->ID());
 			$this_model_obj->save();
@@ -69,7 +69,7 @@ 
 	 */
 	function remove_relation_to($this_obj_or_id, $other_obj_or_id) {
 		$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
@@ -89,9 +89,9 @@ 
 		//get column on this model object which is a foreign key to the other model
 		$fk_field_obj = $this->get_this_model()->get_foreign_key_to($this->get_other_model()->get_this_model_name());
 		//get its value
-		if( $model_obj_or_id instanceof EE_Base_Class){
+		if ($model_obj_or_id instanceof EE_Base_Class) {
 			$model_obj = $model_obj_or_id;
-		}else{
+		} else {
 			$model_obj = $this->get_this_model()->ensure_is_obj($model_obj_or_id);
 		}
 		$ID_value_on_other_model = $model_obj->get($fk_field_obj->get_name());

core/db_models/relations/EE_Has_Many_Relation.php

Spacing +10 added lines, -10 removed lines

@@ -4,8 +4,8 @@ 
 /**
  * In this relation, the OTHER model ahs the foreign key pointing to this model
  */
-require_once( EE_MODELS . 'relations/EE_Model_Relation_Base.php');
-class EE_Has_Many_Relation extends EE_Model_Relation_Base{	
+require_once(EE_MODELS.'relations/EE_Model_Relation_Base.php');
+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
@@ -15,16 +15,16 @@ 
 	 * @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 type $blocking_delete_error_message a customized error message on blocking deletes instead of the default
 	 */
-	function __construct($block_deletes = true, $blocking_delete_error_message = null){
+	function __construct($block_deletes = true, $blocking_delete_error_message = null) {
 		parent::__construct($block_deletes, $blocking_delete_error_message);
 	}
-	function get_join_statement($model_relation_chain){
+	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);
@@ -35,13 +35,13 @@ 
 	 * @param EE_Base_Class/int $other_obj_or_id
 	 * @return EE_Base_Class
 	 */
-	 function add_relation_to($this_obj_or_id, $other_obj_or_id ){
+	 function add_relation_to($this_obj_or_id, $other_obj_or_id) {
 		 $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 th eother 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();
@@ -55,12 +55,12 @@ 
 	 * @param EE_Base_Class/int $other_obj_or_id
 	 * @return EE_Base_Class
 	 */
-	 function remove_relation_to($this_obj_or_id, $other_obj_or_id){
+	 function remove_relation_to($this_obj_or_id, $other_obj_or_id) {
 		 $other_model_obj = $this->get_other_model()->ensure_is_obj($other_obj_or_id, true);
 		 //find the field on th eother 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

Braces +6 added lines, -4 removed lines

@@ -60,8 +60,9 @@ 
 		 $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 ) )
-			return $other_model_obj[0];
+		if ( is_array( $other_model_obj ) ) {
+					return $other_model_obj[0];
+		}
 
 		 //find the field on th eother 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());
@@ -88,8 +89,9 @@ 
 
 
 		//if is array, then we've already done the add_relation so let's get out
-		if ( is_array( $other_model_obj ) )
-			return $other_model_obj[0];
+		if ( is_array( $other_model_obj ) ) {
+					return $other_model_obj[0];
+		}
 
 
 		 //find the field on th eother model which is a foreign key to this model

Indentation +7 added lines, -7 removed lines

@@ -185,13 +185,13 @@
 
 
 	 /**
-	 * Basically this method gets called to verify if the incoming object needs to be manipulated somewhat because it is a revision save.  If so, then we change things before sending back.  We also do verifications when this IS NOT an revision because we always need to make sure that the autosave/revision has parent recorded (which is sometime delayed if the object is created/saved first by the autosave)
-	 *
-	 * @param  EE_Base_Class $this_model_obj
-	 * @param  EE_Base_Class $other_obj
-	 * @param  boolean       $remove_relation Indicates whether we're doing a remove_relation or add_relation.
-	 * @return EE_Base_Class. ($other_obj); 
-	 */
+	  * Basically this method gets called to verify if the incoming object needs to be manipulated somewhat because it is a revision save.  If so, then we change things before sending back.  We also do verifications when this IS NOT an revision because we always need to make sure that the autosave/revision has parent recorded (which is sometime delayed if the object is created/saved first by the autosave)
+	  *
+	  * @param  EE_Base_Class $this_model_obj
+	  * @param  EE_Base_Class $other_obj
+	  * @param  boolean       $remove_relation Indicates whether we're doing a remove_relation or add_relation.
+	  * @return EE_Base_Class. ($other_obj); 
+	  */
 	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

Spacing +44 added lines, -44 removed lines

@@ -4,8 +4,8 @@ 
 /**
  * In this relation, the OTHER model ahs the foreign key pointing to this model
  */
-require_once( EE_MODELS . 'relations/EE_Has_Many_Relation.php');
-class EE_Has_Many_Revision_Relation extends EE_Has_Many_Relation{	
+require_once(EE_MODELS.'relations/EE_Has_Many_Relation.php');
+class EE_Has_Many_Revision_Relation extends EE_Has_Many_Relation {	
 
 
 	/**
@@ -37,7 +37,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 type $blocking_delete_error_message a customized error message on blocking deletes instead of the default
 	 */
-	function __construct($primary_cpt_field, $parent_pk_relation_field, $block_deletes = true, $blocking_delete_error_message = null){
+	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);
@@ -52,7 +52,7 @@ 
 	 * @param EE_Base_Class/int $other_obj_or_id
 	 * @return EE_Base_Class
 	 */
-	 function add_relation_to($this_obj_or_id, $other_obj_or_id ){
+	 function add_relation_to($this_obj_or_id, $other_obj_or_id) {
 		 $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);
 		 
@@ -60,7 +60,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 th eother model which is a foreign key to this model
@@ -80,15 +80,15 @@ 
 	 * @param EE_Base_Class/int $other_obj_or_id
 	 * @return EE_Base_Class
 	 */
-	 function remove_relation_to($this_obj_or_id, $other_obj_or_id){
+	 function remove_relation_to($this_obj_or_id, $other_obj_or_id) {
 	 	$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];
 
 
@@ -97,12 +97,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;
@@ -118,14 +118,14 @@ 
 	  * @param  boolean $values_already_prepared_by_model_object 
 	  * @return EE_Base_Class[]                                         
 	  */
-	 public function get_all_related( $model_object_or_id, $query_params = array(), $values_already_prepared_by_model_object = false ) {
+	 public function get_all_related($model_object_or_id, $query_params = array(), $values_already_prepared_by_model_object = false) {
 	 	
 	 	//if this is an autosave then we're going to get things differently
-	 	if ( defined('DOING_AUTOSAVE') && DOING_AUTOSAVE ) {
+	 	if (defined('DOING_AUTOSAVE') && DOING_AUTOSAVE) {
 	 		return $this->_do_autosave_get_all($model_object_or_id, $query_params, $values_already_prepared_by_model_object = false);
 	 	}
 
-	 	return parent::get_all_related( $model_object_or_id, $query_params, $values_already_prepared_by_model_object );
+	 	return parent::get_all_related($model_object_or_id, $query_params, $values_already_prepared_by_model_object);
 	 }
 
 
@@ -138,22 +138,22 @@ 
 	  * @access protected
 	  * @return EE_Base_Class[]        
 	  */
-	 protected function _do_autosave_get_all( $model_object_or_id, $query_params, $values_already_prepared_by_model_object = false ) {
+	 protected function _do_autosave_get_all($model_object_or_id, $query_params, $values_already_prepared_by_model_object = 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, $values_already_prepared_by_model_object );
+	 	$autosave_relations = parent::get_all_related($id_to_use, $query_params, $values_already_prepared_by_model_object);
 	 	$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;
@@ -164,14 +164,14 @@ 
 		$originals = parent::get_all_related($model_object_or_id, $query_params, $values_already_prepared_by_model_object);
 
 		//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_param);
 		}
 
@@ -179,7 +179,7 @@ 
 
 
 		//now merge parents with our current $return_objs and send back
-		return array_merge( $parents, $return_objs );
+		return array_merge($parents, $return_objs);
 	 }
 
 
@@ -192,42 +192,42 @@ 
 	 * @param  boolean       $remove_relation Indicates whether we're doing a remove_relation or add_relation.
 	 * @return EE_Base_Class. ($other_obj); 
 	 */
-	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);
 				}
 			}
 
@@ -240,24 +240,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);
 				}
 
 			}

Doc Comments +3 added lines, -3 removed lines

@@ -32,8 +32,8 @@ 
 	 * this model. IE, there can be many other model objects related to one of this model's objects (but NOT through a JOIN table,
 	 * which is the case for EE_HABTM_Relations). This knows how to join the models,
 	 * get related models across the relation, and add-and-remove the relationships.
-	 * @param string $primary_pk_field See property description for details
-	 * @param string $parent_cpt_field This is the field that is "connected" to the $primary_cpt_field.  See property desc for details.
+	 * @param string $primary_cpt_field See property description for details
+	 * @param string $primary_cpt_field This is the field that is "connected" to the $primary_cpt_field.  See property desc for details.
 	 * @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 type $blocking_delete_error_message a customized error message on blocking deletes instead of the default
 	 */
@@ -187,7 +187,7 @@ 
 	 /**
 	 * Basically this method gets called to verify if the incoming object needs to be manipulated somewhat because it is a revision save.  If so, then we change things before sending back.  We also do verifications when this IS NOT an revision because we always need to make sure that the autosave/revision has parent recorded (which is sometime delayed if the object is created/saved first by the autosave)
 	 *
-	 * @param  EE_Base_Class $this_model_obj
+	 * @param  EE_Base_Class $this_obj
 	 * @param  EE_Base_Class $other_obj
 	 * @param  boolean       $remove_relation Indicates whether we're doing a remove_relation or add_relation.
 	 * @return EE_Base_Class. ($other_obj); 

core/db_models/strategies/EE_Soft_Delete_Where_Conditions.strategy.php

Braces +1 added lines, -1 removed lines

@@ -33,7 +33,7 @@
 		$field = $this->_model->get_a_field_of_type('EE_Trashed_Flag_Field');
 		if($field){
 			return $field->get_name();
-		}else{
+		} else{
 			throw new EE_Error(sprintf(__('We are trying to find the deleted flag field on %s, but none was found. Are you sure there is a field of type EE_Trashed_Flag_Field in %s constructor?','event_espresso'),get_class($this),get_class($this)));
 		}
 	}

Spacing +9 added lines, -9 removed lines

@@ -3,7 +3,7 @@ 
 /*
  * Strategy specifically for adding where conditions specific to CPT models.
  */
-class EE_Soft_Delete_Where_Conditions extends EE_Default_Where_Conditions{
+class EE_Soft_Delete_Where_Conditions extends EE_Default_Where_Conditions {
 	/**
 	 * Strategy for setting default soft delete where conditions. This strategy will find
 	 * the field of type 'EE_Trashed_Flag_Field', and add a condition that it be FALSE on all queries involving
@@ -12,16 +12,16 @@ 
 	 * Eg,
 	 *
 	 */
-	function __construct(){}
+	function __construct() {}
 	/**
 	 * Gets the where default where conditions for a custom post type model
 	 * @param string $model_relation_path. Eg, from Event to Payment, this should be "Registration.Transaction.Payment"
 	 * @return array like EEM_Base::get_all's $query_params's index [0] (where conditions)
 	 */
-	function get_default_where_conditions($model_relation_chain = null){
+	function get_default_where_conditions($model_relation_chain = null) {
 		//make sure there's a period at the end of $model_relation_chain
-		if($model_relation_chain != '' && $model_relation_chain[strlen($model_relation_chain)-1] !='.'){
-			$model_relation_chain=$model_relation_chain.".";
+		if ($model_relation_chain != '' && $model_relation_chain[strlen($model_relation_chain) - 1] != '.') {
+			$model_relation_chain = $model_relation_chain.".";
 		}
 
 		$trashed_field_name = $this->deleted_field_name();
@@ -35,12 +35,12 @@ 
 	 * @return string
 	 * @throws EE_Error
 	 */
-	private function deleted_field_name(){
+	private function deleted_field_name() {
 		$field = $this->_model->get_a_field_of_type('EE_Trashed_Flag_Field');
-		if($field){
+		if ($field) {
 			return $field->get_name();
-		}else{
-			throw new EE_Error(sprintf(__('We are trying to find the deleted flag field on %s, but none was found. Are you sure there is a field of type EE_Trashed_Flag_Field in %s constructor?','event_espresso'),get_class($this),get_class($this)));
+		} else {
+			throw new EE_Error(sprintf(__('We are trying to find the deleted flag field on %s, but none was found. Are you sure there is a field of type EE_Trashed_Flag_Field in %s constructor?', 'event_espresso'), get_class($this), get_class($this)));
 		}
 	}
 }
\ No newline at end of file

core/helpers/EEH_Array.helper.php

Braces +2 added lines, -2 removed lines

@@ -61,10 +61,10 @@
 			$first_item = reset($arr);
 			if(is_array($first_item)){
 				return true;//yep, there's at least 2 levels to this array
-			}else{
+			} else{
 				return false;//nope, only 1 level
 			}
-		}else{
+		} else{
 			return false;//its not an array at all!
 		}
 	}

Spacing +15 added lines, -15 removed lines

@@ -1,7 +1,7 @@ 
 <?php
 if ( ! defined('EVENT_ESPRESSO_VERSION')) { exit('NO direct script access allowed'); }
 
-require_once( EE_HELPERS . 'EEH_Base.helper.php' );
+require_once(EE_HELPERS.'EEH_Base.helper.php');
 
 /**
  * EE_Array
@@ -26,8 +26,8 @@ 
 	 * @param  array $array2 an array of objects
 	 * @return array         an array of objects found in array 1 that aren't found in array 2.
 	 */
-	public static function object_array_diff( $array1, $array2 ) {
-		return array_udiff( $array1, $array2, array('self', '_compare_objects' ));
+	public static function object_array_diff($array1, $array2) {
+		return array_udiff($array1, $array2, array('self', '_compare_objects'));
 	}
 
 	/**
@@ -35,7 +35,7 @@ 
 	 * @param array $arr
 	 * @return boolean
 	 */
-	public static function is_associative_array($arr){
+	public static function is_associative_array($arr) {
 		return  array_keys($arr) !== range(0, count($arr) - 1);
 	}
 
@@ -45,7 +45,7 @@ 
 	 * @param array $arr
 	 * @return mixed what ever is in the array
 	 */
-	public static function get_one_item_from_array($arr){
+	public static function get_one_item_from_array($arr) {
 		$item = end($arr);
 		reset($arr);
 		return $item;
@@ -56,16 +56,16 @@ 
 	 * @param mixed $arr
 	 * @return boolean
 	 */
-	public static function is_multi_dimensional_array($arr){
-		if(is_array($arr)){
+	public static function is_multi_dimensional_array($arr) {
+		if (is_array($arr)) {
 			$first_item = reset($arr);
-			if(is_array($first_item)){
-				return true;//yep, there's at least 2 levels to this array
-			}else{
-				return false;//nope, only 1 level
+			if (is_array($first_item)) {
+				return true; //yep, there's at least 2 levels to this array
+			} else {
+				return false; //nope, only 1 level
 			}
-		}else{
-			return false;//its not an array at all!
+		} else {
+			return false; //its not an array at all!
 		}
 	}
 
@@ -76,8 +76,8 @@ 
 	 * @param mixed $default
 	 * @return mixed
 	 */
-	public static function is_set( $arr, $index, $default ) {
-		return isset( $arr[ $index ] ) ? $arr[ $index ] : $default;
+	public static function is_set($arr, $index, $default) {
+		return isset($arr[$index]) ? $arr[$index] : $default;
 	}
 
 } //end EEH_Template class
\ No newline at end of file

core/helpers/EEH_Autoloader.helper.php

Indentation +4 added lines, -4 removed lines

@@ -23,10 +23,10 @@
 	private static $_instance = NULL;
 
 	/**
-	* 	$_autoloaders
-	* 	@var array $_autoloaders
-	* 	@access 	private
-	*/
+	 * 	$_autoloaders
+	 * 	@var array $_autoloaders
+	 * 	@access 	private
+	 */
 	private static $_autoloaders;
 
 

Braces +2 added lines, -1 removed lines

@@ -1,6 +1,7 @@
 <?php
-if (!defined('EVENT_ESPRESSO_VERSION') )
+if (!defined('EVENT_ESPRESSO_VERSION') ) {
 	exit('NO direct script access allowed');
+}
 
 /**
  * EEH_Autoloader

Spacing +34 added lines, -34 removed lines

@@ -1,5 +1,5 @@ 
 <?php
-if (!defined('EVENT_ESPRESSO_VERSION') )
+if ( ! defined('EVENT_ESPRESSO_VERSION'))
 	exit('NO direct script access allowed');
 
 /**
@@ -38,7 +38,7 @@ 
 	 */
 	public static function instance() {
 		// check if class object is instantiated, and instantiated properly
-		if ( ! self::$_instance instanceof  EEH_Autoloader ) {
+		if ( ! self::$_instance instanceof  EEH_Autoloader) {
 			self::$_instance = new self();
 		}
 		return self::$_instance;
@@ -55,7 +55,7 @@ 
 	private function __construct() {
 		self::$_autoloaders = array();
 		$this->_register_custom_autoloaders();
-		spl_autoload_register( array( $this, 'espresso_autoloader' ));
+		spl_autoload_register(array($this, 'espresso_autoloader'));
 	}
 
 
@@ -69,9 +69,9 @@ 
 	 * @internal  param string $class_name - simple class name ie: session
 	 * @return 	void
 	 */
-	public static function espresso_autoloader( $class_name ) {
-		if ( isset( self::$_autoloaders[ $class_name ] ) ) {
-			require_once( self::$_autoloaders[ $class_name ] );
+	public static function espresso_autoloader($class_name) {
+		if (isset(self::$_autoloaders[$class_name])) {
+			require_once(self::$_autoloaders[$class_name]);
 		}
 	}
 
@@ -86,23 +86,23 @@ 
 	 * @throws \EE_Error
 	 * @return        void
 	 */
-	public static function register_autoloader( $class_paths, $read_check = true ) {
-		$class_paths = is_array( $class_paths ) ? $class_paths : array( $class_paths );
-		foreach ( $class_paths as $class => $path ) {
+	public static function register_autoloader($class_paths, $read_check = true) {
+		$class_paths = is_array($class_paths) ? $class_paths : array($class_paths);
+		foreach ($class_paths as $class => $path) {
 			// don't give up! you gotta...
 			// get some class
-			if ( empty( $class )) {
-				throw new EE_Error ( sprintf( __( 'No Class name was specified while registering an autoloader for the following path: %s.','event_espresso' ), $path ));
+			if (empty($class)) {
+				throw new EE_Error(sprintf(__('No Class name was specified while registering an autoloader for the following path: %s.', 'event_espresso'), $path));
 			}
 			// one day you will find the path young grasshopper
-			if ( empty( $path )) {
-				throw new EE_Error ( sprintf( __( 'No path was specified while registering an autoloader for the %s class.','event_espresso' ), $class ));
+			if (empty($path)) {
+				throw new EE_Error(sprintf(__('No path was specified while registering an autoloader for the %s class.', 'event_espresso'), $class));
 			}
 			// is file readable ?
-			if ( $read_check && ! is_readable( $path )) {
-				throw new EE_Error ( sprintf( __( 'The file for the %s class could not be found or is not readable due to file permissions. Please ensure the following path is correct: %s','event_espresso' ), $class, $path ));
+			if ($read_check && ! is_readable($path)) {
+				throw new EE_Error(sprintf(__('The file for the %s class could not be found or is not readable due to file permissions. Please ensure the following path is correct: %s', 'event_espresso'), $class, $path));
 			}
-			self::$_autoloaders[ $class ] = str_replace( array( '\/', '/' ), DS, $path );
+			self::$_autoloaders[$class] = str_replace(array('\/', '/'), DS, $path);
 		}
 	}
 
@@ -129,9 +129,9 @@ 
 	 * 	@return void
 	 */
 	private function _register_custom_autoloaders() {
-		EEH_Autoloader::register_autoloaders_for_each_file_in_folder( EE_CORE );
-		EEH_Autoloader::register_autoloaders_for_each_file_in_folder( EE_MODELS, TRUE );
-		EEH_Autoloader::register_autoloaders_for_each_file_in_folder( EE_CLASSES );
+		EEH_Autoloader::register_autoloaders_for_each_file_in_folder(EE_CORE);
+		EEH_Autoloader::register_autoloaders_for_each_file_in_folder(EE_MODELS, TRUE);
+		EEH_Autoloader::register_autoloaders_for_each_file_in_folder(EE_CLASSES);
 		EEH_Autoloader::register_form_sections_autoloaders();
 	}
 
@@ -145,7 +145,7 @@ 
 	 * 	@return void
 	 */
 	public static function register_form_sections_autoloaders() {
-		EEH_Autoloader::register_autoloaders_for_each_file_in_folder( EE_FORM_SECTIONS, TRUE );
+		EEH_Autoloader::register_autoloaders_for_each_file_in_folder(EE_FORM_SECTIONS, TRUE);
 	}
 
 
@@ -158,7 +158,7 @@ 
 	 * 	@return void
 	 */
 	public static function register_line_item_display_autoloaders() {
-		EEH_Autoloader::register_autoloaders_for_each_file_in_folder(  EE_LIBRARIES . 'line_item_display' , TRUE );
+		EEH_Autoloader::register_autoloaders_for_each_file_in_folder(EE_LIBRARIES.'line_item_display', TRUE);
 	}
 
 
@@ -173,31 +173,31 @@ 
 	 * @param bool   $recursive
 	 * @return array
 	 */
-	public static function register_autoloaders_for_each_file_in_folder( $folder, $recursive = FALSE ){
+	public static function register_autoloaders_for_each_file_in_folder($folder, $recursive = FALSE) {
 		// make sure last char is a /
-		$folder .= $folder[strlen($folder)-1] != DS ? DS : '';
+		$folder .= $folder[strlen($folder) - 1] != DS ? DS : '';
 		$class_to_filepath_map = array();
-		$exclude = array( 'index' );
+		$exclude = array('index');
 		//get all the files in that folder that end in php
-		$filepaths = glob( $folder.'*');
+		$filepaths = glob($folder.'*');
 
-		if ( empty( $filepaths ) ) {
+		if (empty($filepaths)) {
 			return;
 		}
 
-		foreach( $filepaths as $filepath ) {
-			if ( substr( $filepath, -4, 4 ) == '.php' ) {
-				$class_name = EEH_File::get_classname_from_filepath_with_standard_filename( $filepath );
-				if ( ! in_array( $class_name, $exclude )) {
-					$class_to_filepath_map [ $class_name ] = str_replace( array( '\/', '/' ), DS, $filepath );
+		foreach ($filepaths as $filepath) {
+			if (substr($filepath, -4, 4) == '.php') {
+				$class_name = EEH_File::get_classname_from_filepath_with_standard_filename($filepath);
+				if ( ! in_array($class_name, $exclude)) {
+					$class_to_filepath_map [$class_name] = str_replace(array('\/', '/'), DS, $filepath);
 				}
-			} else if ( $recursive ) {
-				EEH_Autoloader::register_autoloaders_for_each_file_in_folder( $filepath, $recursive );
+			} else if ($recursive) {
+				EEH_Autoloader::register_autoloaders_for_each_file_in_folder($filepath, $recursive);
 			}
 		}
 
 		//we remove the necessity to do a is_readable() check via the $read_check flag because glob by nature will not return non_readable files/directories.
-		self::register_autoloader($class_to_filepath_map, FALSE );
+		self::register_autoloader($class_to_filepath_map, FALSE);
 	}