Completed
Branch old/BUG-7514-7935-7936-price-o... (518ae6)
by
unknown
13:33 queued 11:14
created
core/db_models/fields/EE_Any_Foreign_Model_Name_Field.php 1 patch
Spacing   +3 added lines, -3 removed lines patch added patch discarded remove patch
@@ -1,5 +1,5 @@  discard block
 block discarded – undo
1 1
 <?php
2
-require_once( EE_MODELS . 'fields/EE_DB_Only_Field_Base.php');
2
+require_once(EE_MODELS.'fields/EE_DB_Only_Field_Base.php');
3 3
 /**
4 4
  * Used by EE_Belongs_To_Any_Relations and EE_Has_Many_Any_Relations to identify the model the foreign key points to.
5 5
  * Note: the array of model names on this field should match the array of model names on the
@@ -8,8 +8,8 @@  discard block
 block discarded – undo
8 8
  * 'obj_id'=>new EE_Foreign_Key_Int_Field('obj_id_column',__('Related Object ID'),false,0,array('Registration','Transaction')),
9 9
  * 'obj_type'=>new EE_Any_Foreign_Model_Name_Field('obj_type_column',__('Related Object type'),false,null,array('Registration','Transaction')));
10 10
  */
11
-class EE_Any_Foreign_Model_Name_Field extends EE_Field_With_Model_Name{
12
-	function get_wpdb_data_type(){
11
+class EE_Any_Foreign_Model_Name_Field extends EE_Field_With_Model_Name {
12
+	function get_wpdb_data_type() {
13 13
 		return '%s';
14 14
 	}
15 15
 }
16 16
\ No newline at end of file
Please login to merge, or discard this patch.
core/db_models/fields/EE_Boolean_Field.php 2 patches
Spacing   +5 added lines, -5 removed lines patch added patch discarded remove patch
@@ -1,10 +1,10 @@  discard block
 block discarded – undo
1 1
 <?php
2
-require_once( EE_MODELS . 'fields/EE_Integer_Field.php');
3
-class EE_Boolean_Field extends EE_Integer_Field{
2
+require_once(EE_MODELS.'fields/EE_Integer_Field.php');
3
+class EE_Boolean_Field extends EE_Integer_Field {
4 4
 	function prepare_for_set($value_inputted_for_field_on_model_object) {
5
-		if ($value_inputted_for_field_on_model_object){
5
+		if ($value_inputted_for_field_on_model_object) {
6 6
 			return true;
7
-		}else{
7
+		} else {
8 8
 			return false;
9 9
 		}
10 10
 	}
@@ -14,6 +14,6 @@  discard block
 block discarded – undo
14 14
 	 * @return boolean
15 15
 	 */
16 16
 	function prepare_for_set_from_db($value_inputted_for_field_on_model_object) {
17
-		return intval( $value_inputted_for_field_on_model_object ) ? true : false;
17
+		return intval($value_inputted_for_field_on_model_object) ? true : false;
18 18
 	}
19 19
 }
Please login to merge, or discard this patch.
Braces   +1 added lines, -1 removed lines patch added patch discarded remove patch
@@ -4,7 +4,7 @@
 block discarded – undo
4 4
 	function prepare_for_set($value_inputted_for_field_on_model_object) {
5 5
 		if ($value_inputted_for_field_on_model_object){
6 6
 			return true;
7
-		}else{
7
+		} else{
8 8
 			return false;
9 9
 		}
10 10
 	}
Please login to merge, or discard this patch.
core/db_models/fields/EE_DB_Only_Field_Base.php 1 patch
Spacing   +1 added lines, -1 removed lines patch added patch discarded remove patch
@@ -7,7 +7,7 @@
 block discarded – undo
7 7
  * special default values for them, or some other column-specific functionality. So we can add them as fields,
8 8
  * but db-only ones
9 9
  */
10
-abstract class EE_DB_Only_Field_Base extends EE_Model_Field_Base{
10
+abstract class EE_DB_Only_Field_Base extends EE_Model_Field_Base {
11 11
 	/**
12 12
 	 * All these children classes are for the db-only (meaning, we should select them
13 13
 	 * on get_all queries, update, delete, and will still want to set their default value
Please login to merge, or discard this patch.
core/db_models/fields/EE_DB_Only_Float_Field.php 1 patch
Spacing   +3 added lines, -3 removed lines patch added patch discarded remove patch
@@ -1,7 +1,7 @@
 block discarded – undo
1 1
 <?php
2
-require_once( EE_MODELS . 'fields/EE_DB_Only_Field_Base.php');
3
-class EE_DB_Only_Float_Field extends EE_DB_Only_Field_Base{
4
-	function get_wpdb_data_type(){
2
+require_once(EE_MODELS.'fields/EE_DB_Only_Field_Base.php');
3
+class EE_DB_Only_Float_Field extends EE_DB_Only_Field_Base {
4
+	function get_wpdb_data_type() {
5 5
 		return '%f';
6 6
 	}
7 7
 }
Please login to merge, or discard this patch.
core/db_models/fields/EE_DB_Only_Int_Field.php 1 patch
Spacing   +3 added lines, -3 removed lines patch added patch discarded remove patch
@@ -1,8 +1,8 @@
 block discarded – undo
1 1
 <?php
2 2
 
3
-require_once( EE_MODELS . 'fields/EE_DB_Only_Field_Base.php');
4
-class EE_DB_Only_Int_Field extends EE_DB_Only_Field_Base{
5
-	function get_wpdb_data_type(){
3
+require_once(EE_MODELS.'fields/EE_DB_Only_Field_Base.php');
4
+class EE_DB_Only_Int_Field extends EE_DB_Only_Field_Base {
5
+	function get_wpdb_data_type() {
6 6
 		return '%d';
7 7
 	}
8 8
 }
9 9
\ No newline at end of file
Please login to merge, or discard this patch.
core/db_models/fields/EE_DB_Only_Text_Field.php 1 patch
Spacing   +3 added lines, -3 removed lines patch added patch discarded remove patch
@@ -1,7 +1,7 @@
 block discarded – undo
1 1
 <?php
2
-require_once( EE_MODELS . 'fields/EE_DB_Only_Field_Base.php');
3
-class EE_DB_Only_Text_Field extends EE_DB_Only_Field_Base{
4
-	function get_wpdb_data_type(){
2
+require_once(EE_MODELS.'fields/EE_DB_Only_Field_Base.php');
3
+class EE_DB_Only_Text_Field extends EE_DB_Only_Field_Base {
4
+	function get_wpdb_data_type() {
5 5
 		return '%s';
6 6
 	}
7 7
 }
8 8
\ No newline at end of file
Please login to merge, or discard this patch.
core/db_models/fields/EE_Email_Field.php 1 patch
Spacing   +1 added lines, -1 removed lines patch added patch discarded remove patch
@@ -1,5 +1,5 @@
 block discarded – undo
1 1
 <?php
2
-class EE_Email_Field extends EE_Text_Field_Base{
2
+class EE_Email_Field extends EE_Text_Field_Base {
3 3
 	function prepare_for_set($value_inputted_for_field_on_model_object) {
4 4
 		return sanitize_email($value_inputted_for_field_on_model_object);
5 5
 	}
Please login to merge, or discard this patch.
core/db_models/fields/EE_Field_With_Model_Name.php 2 patches
Spacing   +14 added lines, -14 removed lines patch added patch discarded remove patch
@@ -5,7 +5,7 @@  discard block
 block discarded – undo
5 5
  * with the EE_Foreign_Key_Field to create a relation between any two models)
6 6
  * also required basically the exact same functionality, except NOT be a foreign key.
7 7
  */
8
-abstract class EE_Field_With_Model_Name extends EE_Model_Field_Base{
8
+abstract class EE_Field_With_Model_Name extends EE_Model_Field_Base {
9 9
 	/**
10 10
 	 * Usually the name of a single model. However, as in the case for custom post types,
11 11
 	 * it can actually be an array of models
@@ -20,7 +20,7 @@  discard block
 block discarded – undo
20 20
 	 * @param mixed $default_value if this is a integer field, it shoudl be an int. if it's a string field, it shoul dbe a string
21 21
 	 * @param string $model_name eg 'Event','Answer','Term', etc. Basically its the model class's name without the "EEM_"
22 22
 	 */
23
-	function __construct($table_column, $nicename, $nullable, $default_value,$model_name){
23
+	function __construct($table_column, $nicename, $nullable, $default_value, $model_name) {
24 24
 		$this->_model_name_pointed_to = $model_name;
25 25
 		parent::__construct($table_column, $nicename, $nullable, $default_value);
26 26
 	}
@@ -29,8 +29,8 @@  discard block
 block discarded – undo
29 29
 	 * @deprecated since version 4.6.7
30 30
 	 * @return mixed string or array of strings
31 31
 	 */
32
-	function get_model_name_pointed_to(){
33
-		EE_Error::doing_it_wrong( 'get_model_name_pointed_to', __( 'This method has been deprecated in favour of instead using get_model_names_pointed_to, which consistently returns an array', 'event_espresso' ), '4.6.7' );
32
+	function get_model_name_pointed_to() {
33
+		EE_Error::doing_it_wrong('get_model_name_pointed_to', __('This method has been deprecated in favour of instead using get_model_names_pointed_to, which consistently returns an array', 'event_espresso'), '4.6.7');
34 34
 		return $this->_model_name_pointed_to;
35 35
 	}
36 36
 	/**
@@ -39,31 +39,31 @@  discard block
 block discarded – undo
39 39
 	 * @return array of model names pointed to by this field
40 40
 	 */
41 41
 	function get_model_names_pointed_to() {
42
-		if( is_array( $this->_model_name_pointed_to ) ) {
42
+		if (is_array($this->_model_name_pointed_to)) {
43 43
 			return $this->_model_name_pointed_to;
44
-		}else{
45
-			return array( $this->_model_name_pointed_to );
44
+		} else {
45
+			return array($this->_model_name_pointed_to);
46 46
 		}
47 47
 	}
48 48
 	/**
49 49
 	 * Returns the model's classname (eg EE_Event instead of just Event)
50 50
 	 * @return array
51 51
 	 */
52
-	function get_model_class_names_pointed_to(){
52
+	function get_model_class_names_pointed_to() {
53 53
 		$model_names = array();
54
-		if(is_array($this->_model_name_pointed_to)){
55
-			foreach($this->_model_name_pointed_to as $model_name){
54
+		if (is_array($this->_model_name_pointed_to)) {
55
+			foreach ($this->_model_name_pointed_to as $model_name) {
56 56
 				$model_names[] = "EE_".$model_name;
57 57
 			}
58
-		}else{
58
+		} else {
59 59
 			$model_names = array("EE_".$this->_model_name_pointed_to);
60 60
 		}
61 61
 		return $model_names;
62 62
 	}
63 63
 
64
-	function is_model_obj_of_type_pointed_to($model_obj_or_ID){
65
-		foreach($this->get_model_class_names_pointed_to() as $model_obj_classname){
66
-			if($model_obj_or_ID instanceof $model_obj_classname){
64
+	function is_model_obj_of_type_pointed_to($model_obj_or_ID) {
65
+		foreach ($this->get_model_class_names_pointed_to() as $model_obj_classname) {
66
+			if ($model_obj_or_ID instanceof $model_obj_classname) {
67 67
 				return true;
68 68
 			}
69 69
 		}
Please login to merge, or discard this patch.
Braces   +2 added lines, -2 removed lines patch added patch discarded remove patch
@@ -41,7 +41,7 @@  discard block
 block discarded – undo
41 41
 	function get_model_names_pointed_to() {
42 42
 		if( is_array( $this->_model_name_pointed_to ) ) {
43 43
 			return $this->_model_name_pointed_to;
44
-		}else{
44
+		} else{
45 45
 			return array( $this->_model_name_pointed_to );
46 46
 		}
47 47
 	}
@@ -55,7 +55,7 @@  discard block
 block discarded – undo
55 55
 			foreach($this->_model_name_pointed_to as $model_name){
56 56
 				$model_names[] = "EE_".$model_name;
57 57
 			}
58
-		}else{
58
+		} else{
59 59
 			$model_names = array("EE_".$this->_model_name_pointed_to);
60 60
 		}
61 61
 		return $model_names;
Please login to merge, or discard this patch.
core/db_models/fields/EE_Float_Field.php 1 patch
Spacing   +9 added lines, -9 removed lines patch added patch discarded remove patch
@@ -2,8 +2,8 @@  discard block
 block discarded – undo
2 2
 /**
3 3
  * Text_Fields is a base class for any fields which are have float value. (Exception: foreign and private key fields. Wish PHP had multiple-inheritance for this...)
4 4
  */
5
-class EE_Float_Field extends EE_Model_Field_Base{
6
-	function get_wpdb_data_type(){
5
+class EE_Float_Field extends EE_Model_Field_Base {
6
+	function get_wpdb_data_type() {
7 7
 		return '%f';
8 8
 	}
9 9
 	/**
@@ -17,26 +17,26 @@  discard block
 block discarded – undo
17 17
 	function prepare_for_set($value_inputted_for_field_on_model_object) {
18 18
 //		echo __LINE__."$value_inputted_for_field_on_model_object<br>";
19 19
 		//remove whitespaces and thousands separators
20
-		if(is_string($value_inputted_for_field_on_model_object)){
21
-			$value_inputted_for_field_on_model_object = str_replace(array(" ",EE_Config::instance()->currency->thsnds),"",$value_inputted_for_field_on_model_object);
20
+		if (is_string($value_inputted_for_field_on_model_object)) {
21
+			$value_inputted_for_field_on_model_object = str_replace(array(" ", EE_Config::instance()->currency->thsnds), "", $value_inputted_for_field_on_model_object);
22 22
 //echo __LINE__."$value_inputted_for_field_on_model_object<br>";
23 23
 //normalize it so periods are decimal marks (we don't care where you're from: we're talking PHP now)
24
-			$value_inputted_for_field_on_model_object = str_replace( EE_Config::instance()->currency->dec_mrk, ".", $value_inputted_for_field_on_model_object) ;
24
+			$value_inputted_for_field_on_model_object = str_replace(EE_Config::instance()->currency->dec_mrk, ".", $value_inputted_for_field_on_model_object);
25 25
 //echo __LINE__."$value_inputted_for_field_on_model_object<br>";
26 26
 //double-check there's absolutely nothing left on this string besides numbers
27
-			$value_inputted_for_field_on_model_object = preg_replace( "/[^0-9,.]/", "", $value_inputted_for_field_on_model_object);
27
+			$value_inputted_for_field_on_model_object = preg_replace("/[^0-9,.]/", "", $value_inputted_for_field_on_model_object);
28 28
 		}
29 29
 //		echo __LINE__."$value_inputted_for_field_on_model_object<br>";
30
-		return floatval( $value_inputted_for_field_on_model_object );
30
+		return floatval($value_inputted_for_field_on_model_object);
31 31
 	}
32 32
 	/**
33 33
 	 * Returns the number formatted according to local custom (set by the country of the blog).
34 34
 	 * @param float $value_on_field_to_be_outputted
35 35
 	 * @return string
36 36
 	 */
37
-	function prepare_for_pretty_echoing($value_on_field_to_be_outputted,$schema = null){
37
+	function prepare_for_pretty_echoing($value_on_field_to_be_outputted, $schema = null) {
38 38
 		$EE = EE_Registry::instance();
39
-		return number_format( $value_on_field_to_be_outputted, $EE->CFG->currency->dec_plc, $EE->CFG->currency->dec_mrk, $EE->CFG->currency->thsnds) ;
39
+		return number_format($value_on_field_to_be_outputted, $EE->CFG->currency->dec_plc, $EE->CFG->currency->dec_mrk, $EE->CFG->currency->thsnds);
40 40
 	}
41 41
 
42 42
 	function prepare_for_set_from_db($value_found_in_db_for_model_object) {
Please login to merge, or discard this patch.