Completed
Branch BUG-9492-refactor-activation-l... (db7e0e)
by
unknown
40:08 queued 27:31
created
core/db_models/fields/EE_Model_Field_Base.php 3 patches
Spacing   +23 added lines, -23 removed lines patch added patch discarded remove patch
@@ -1,5 +1,5 @@  discard block
 block discarded – undo
1
-<?php if ( ! defined( 'EVENT_ESPRESSO_VERSION' ) ) {
2
-	exit( 'No direct script access allowed' );
1
+<?php if ( ! defined('EVENT_ESPRESSO_VERSION')) {
2
+	exit('No direct script access allowed');
3 3
 }
4 4
 /**
5 5
  *
@@ -18,7 +18,7 @@  discard block
 block discarded – undo
18 18
  * @subpackage    /core/db_models/fields/EE_Model_Field_Base.php
19 19
  * @author 				Michael Nelson
20 20
  */
21
-abstract class EE_Model_Field_Base{
21
+abstract class EE_Model_Field_Base {
22 22
 	var $_table_alias;
23 23
 	var $_table_column;
24 24
 	var $_name;
@@ -34,7 +34,7 @@  discard block
 block discarded – undo
34 34
 	 * @param      $nullable
35 35
 	 * @param null $default_value
36 36
 	 */
37
-	function __construct($table_column, $nicename, $nullable, $default_value = null){
37
+	function __construct($table_column, $nicename, $nullable, $default_value = null) {
38 38
 		$this->_table_column = $table_column;
39 39
 		$this->_nicename = $nicename;
40 40
 		$this->_nullable = $nullable;
@@ -48,22 +48,22 @@  discard block
 block discarded – undo
48 48
 	 * @param $name
49 49
 	 * @param $model_name
50 50
 	 */
51
-	function _construct_finalize($table_alias, $name, $model_name){
51
+	function _construct_finalize($table_alias, $name, $model_name) {
52 52
 		$this->_table_alias = $table_alias;
53 53
 		$this->_name = $name;
54 54
 		$this->_model_name = $model_name;
55 55
 	}
56
-	function get_table_alias(){
56
+	function get_table_alias() {
57 57
 		return $this->_table_alias;
58 58
 	}
59
-	function get_table_column(){
59
+	function get_table_column() {
60 60
 		return $this->_table_column;
61 61
 	}
62 62
 	/**
63 63
 	 * Returns the name of the model this field is on. Eg 'Event' or 'Ticket_Datetime'
64 64
 	 * @return string
65 65
 	 */
66
-	function get_model_name(){
66
+	function get_model_name() {
67 67
 		return $this->_model_name;
68 68
 	}
69 69
 
@@ -71,17 +71,17 @@  discard block
 block discarded – undo
71 71
 	 * @throws \EE_Error
72 72
 	 * @return string
73 73
 	 */
74
-	function get_name(){
75
-		if($this->_name){
74
+	function get_name() {
75
+		if ($this->_name) {
76 76
 			return $this->_name;
77
-		}else{
78
-			throw new EE_Error(sprintf(__("Model field '%s' has no name set. Did you make a model and forget to call the parent model constructor?", "event_espresso"),get_class($this)));
77
+		} else {
78
+			throw new EE_Error(sprintf(__("Model field '%s' has no name set. Did you make a model and forget to call the parent model constructor?", "event_espresso"), get_class($this)));
79 79
 		}
80 80
 	}
81
-	function get_nicename(){
81
+	function get_nicename() {
82 82
 		return $this->_nicename;
83 83
 	}
84
-	function is_nullable(){
84
+	function is_nullable() {
85 85
 		return $this->_nullable;
86 86
 	}
87 87
 	/**
@@ -89,7 +89,7 @@  discard block
 block discarded – undo
89 89
 	 * on insertion it can be null. However, on updates it must be present.
90 90
 	 * @return boolean
91 91
 	 */
92
-	function is_auto_increment(){
92
+	function is_auto_increment() {
93 93
 		return false;
94 94
 	}
95 95
 	/**
@@ -97,7 +97,7 @@  discard block
 block discarded – undo
97 97
 	 * value domains at the top of EEM_Base
98 98
 	 * @return mixed
99 99
 	 */
100
-	function get_default_value(){
100
+	function get_default_value() {
101 101
 		return $this->_default_value;
102 102
 	}
103 103
 
@@ -108,7 +108,7 @@  discard block
 block discarded – undo
108 108
 	 * in the current query
109 109
 	 * @return string
110 110
 	 */
111
-	function get_qualified_column(){
111
+	function get_qualified_column() {
112 112
 		return $this->get_table_alias().".".$this->get_table_column();
113 113
 	}
114 114
 	/**
@@ -119,7 +119,7 @@  discard block
 block discarded – undo
119 119
 	 * @param mixed $value_of_field_on_model_object
120 120
 	 * @return mixed
121 121
 	 */
122
-	function prepare_for_get($value_of_field_on_model_object){
122
+	function prepare_for_get($value_of_field_on_model_object) {
123 123
 		return $value_of_field_on_model_object;
124 124
 	}
125 125
 	/**
@@ -129,7 +129,7 @@  discard block
 block discarded – undo
129 129
 	 * @param mixed $value_of_field_on_model_object
130 130
 	 * @return mixed
131 131
 	 */
132
-	function prepare_for_use_in_db($value_of_field_on_model_object){
132
+	function prepare_for_use_in_db($value_of_field_on_model_object) {
133 133
 		return $value_of_field_on_model_object;
134 134
 	}
135 135
 
@@ -140,7 +140,7 @@  discard block
 block discarded – undo
140 140
 	 * @param mixed $value_inputted_for_field_on_model_object
141 141
 	 * @return mixed
142 142
 	 */
143
-	function prepare_for_set($value_inputted_for_field_on_model_object){
143
+	function prepare_for_set($value_inputted_for_field_on_model_object) {
144 144
 		return $value_inputted_for_field_on_model_object;
145 145
 	}
146 146
 
@@ -151,7 +151,7 @@  discard block
 block discarded – undo
151 151
 	 * @param mixed $value_found_in_db_for_model_object
152 152
 	 * @return mixed
153 153
 	 */
154
-	function prepare_for_set_from_db($value_found_in_db_for_model_object){
154
+	function prepare_for_set_from_db($value_found_in_db_for_model_object) {
155 155
 		return $this->prepare_for_set($value_found_in_db_for_model_object);
156 156
 	}
157 157
 
@@ -162,7 +162,7 @@  discard block
 block discarded – undo
162 162
 	 * @param mixed $value_on_field_to_be_outputted
163 163
 	 * @return mixed
164 164
 	 */
165
-	function prepare_for_pretty_echoing( $value_on_field_to_be_outputted ){
165
+	function prepare_for_pretty_echoing($value_on_field_to_be_outputted) {
166 166
 		return $value_on_field_to_be_outputted;
167 167
 	}
168 168
 
@@ -177,7 +177,7 @@  discard block
 block discarded – undo
177 177
 	 * By default, all fields aren't db-only.
178 178
 	 * @return boolean
179 179
 	 */
180
-	function is_db_only_field(){
180
+	function is_db_only_field() {
181 181
 		return false;
182 182
 	}
183 183
 }
184 184
\ No newline at end of file
Please login to merge, or discard this patch.
Braces   +1 added lines, -1 removed lines patch added patch discarded remove patch
@@ -74,7 +74,7 @@
 block discarded – undo
74 74
 	function get_name(){
75 75
 		if($this->_name){
76 76
 			return $this->_name;
77
-		}else{
77
+		} else{
78 78
 			throw new EE_Error(sprintf(__("Model field '%s' has no name set. Did you make a model and forget to call the parent model constructor?", "event_espresso"),get_class($this)));
79 79
 		}
80 80
 	}
Please login to merge, or discard this patch.
Doc Comments   +2 added lines, -2 removed lines patch added patch discarded remove patch
@@ -29,9 +29,9 @@
 block discarded – undo
29 29
 	protected $_model_name;
30 30
 
31 31
 	/**
32
-	 * @param      $table_column
32
+	 * @param      string $table_column
33 33
 	 * @param      $nicename
34
-	 * @param      $nullable
34
+	 * @param      boolean $nullable
35 35
 	 * @param null $default_value
36 36
 	 */
37 37
 	function __construct($table_column, $nicename, $nullable, $default_value = null){
Please login to merge, or discard this patch.
core/db_models/fields/EE_Money_Field.php 2 patches
Braces   +1 added lines, -1 removed lines patch added patch discarded remove patch
@@ -25,7 +25,7 @@
 block discarded – undo
25 25
 		if($schema == 'no_currency_code'){
26 26
 //			echo "schema no currency!";
27 27
 			$display_code = false;
28
-		}else{
28
+		} else{
29 29
 			$display_code = true;
30 30
 		}
31 31
 		//we don't use the $pretty_float because format_currency will take care of it.
Please login to merge, or discard this patch.
Spacing   +8 added lines, -8 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_Money_Field extends EE_Float_Field{
6
-	function get_wpdb_data_type(){
5
+class EE_Money_Field extends EE_Float_Field {
6
+	function get_wpdb_data_type() {
7 7
 		return '%f';
8 8
 	}
9 9
 	/**
@@ -15,20 +15,20 @@  discard block
 block discarded – undo
15 15
 	 * @param type $schema
16 16
 	 * @return string
17 17
 	 */
18
-	function prepare_for_pretty_echoing($value_on_field_to_be_outputted,$schema = null){
18
+	function prepare_for_pretty_echoing($value_on_field_to_be_outputted, $schema = null) {
19 19
 		$pretty_float = parent::prepare_for_pretty_echoing($value_on_field_to_be_outputted);
20 20
 
21
-		if($schema == 'localized_float'){
21
+		if ($schema == 'localized_float') {
22 22
 			return $pretty_float;
23 23
 		}
24
-		if($schema == 'no_currency_code'){
24
+		if ($schema == 'no_currency_code') {
25 25
 //			echo "schema no currency!";
26 26
 			$display_code = false;
27
-		}else{
27
+		} else {
28 28
 			$display_code = true;
29 29
 		}
30 30
 		//we don't use the $pretty_float because format_currency will take care of it.
31
-		return EEH_Template::format_currency( $value_on_field_to_be_outputted, false, $display_code );
31
+		return EEH_Template::format_currency($value_on_field_to_be_outputted, false, $display_code);
32 32
 	}
33 33
 
34 34
 	/**
@@ -47,7 +47,7 @@  discard block
 block discarded – undo
47 47
 		//now it's a float-style string or number
48 48
 		$float_val = parent::prepare_for_set($value_inputted_for_field_on_model_object);
49 49
 		//round to the correctly number of decimal places for this  currency
50
-		$rounded_value = round($float_val,  EE_Registry::instance()->CFG->currency->dec_plc);
50
+		$rounded_value = round($float_val, EE_Registry::instance()->CFG->currency->dec_plc);
51 51
 		return $rounded_value;
52 52
 	}
53 53
 
Please login to merge, or discard this patch.
core/db_models/fields/EE_Plain_Text_Field.php 1 patch
Spacing   +2 added lines, -2 removed lines patch added patch discarded remove patch
@@ -1,6 +1,6 @@
 block discarded – undo
1 1
 <?php
2
-require_once( EE_MODELS . 'fields/EE_Text_Field_Base.php' );
3
-class EE_Plain_Text_Field extends EE_Text_Field_Base{
2
+require_once(EE_MODELS.'fields/EE_Text_Field_Base.php');
3
+class EE_Plain_Text_Field extends EE_Text_Field_Base {
4 4
 	/**
5 5
 	 * removes all tags when setting
6 6
 	 * @param string $value_inputted_for_field_on_model_object
Please login to merge, or discard this patch.
core/db_models/fields/EE_Slug_Field.php 1 patch
Spacing   +2 added lines, -2 removed lines patch added patch discarded remove patch
@@ -1,6 +1,6 @@
 block discarded – undo
1 1
 <?php
2
-require_once( EE_MODELS . 'fields/EE_Text_Field_Base.php' );
3
-class EE_Slug_Field extends EE_Text_Field_Base{
2
+require_once(EE_MODELS.'fields/EE_Text_Field_Base.php');
3
+class EE_Slug_Field extends EE_Text_Field_Base {
4 4
 	/**
5 5
 	 * ensures string is usable in URLs
6 6
 	 * @param string $value_inputted_for_field_on_model_object
Please login to merge, or discard this patch.
core/db_models/fields/EE_Text_Field_Base.php 1 patch
Spacing   +6 added lines, -6 removed lines patch added patch discarded remove patch
@@ -2,13 +2,13 @@  discard block
 block discarded – undo
2 2
 /**
3 3
  * Text_Fields is a base class for any fields which are have text value. (Exception: foreign and private key fields. Wish PHP had multiple-inheritance for this...)
4 4
  */
5
-abstract class EE_Text_Field_Base extends EE_Model_Field_Base{
6
-	function get_wpdb_data_type(){
5
+abstract class EE_Text_Field_Base extends EE_Model_Field_Base {
6
+	function get_wpdb_data_type() {
7 7
 		return '%s';
8 8
 	}
9 9
 
10
-	function prepare_for_get( $value_of_field_on_model_object ) {
11
-		return is_string($value_of_field_on_model_object) ? stripslashes( $value_of_field_on_model_object ) : $value_of_field_on_model_object;
10
+	function prepare_for_get($value_of_field_on_model_object) {
11
+		return is_string($value_of_field_on_model_object) ? stripslashes($value_of_field_on_model_object) : $value_of_field_on_model_object;
12 12
 	}
13 13
 	
14 14
 	/**
@@ -18,7 +18,7 @@  discard block
 block discarded – undo
18 18
 	 * @return string
19 19
 	 */
20 20
 	function prepare_for_pretty_echoing($value_on_field_to_be_outputted, $schema = null) {
21
-		if($schema=='form_input'){
21
+		if ($schema == 'form_input') {
22 22
 			$value_on_field_to_be_outputted = htmlentities($value_on_field_to_be_outputted, ENT_QUOTES, 'UTF-8');
23 23
 		}
24 24
 		return parent::prepare_for_pretty_echoing($value_on_field_to_be_outputted, $schema);
@@ -30,6 +30,6 @@  discard block
 block discarded – undo
30 30
 	 * @return string
31 31
 	 */
32 32
 	function prepare_for_set($value_inputted_for_field_on_model_object) {
33
-		return stripslashes(html_entity_decode(parent::prepare_for_set($value_inputted_for_field_on_model_object),ENT_QUOTES,'UTF-8'));
33
+		return stripslashes(html_entity_decode(parent::prepare_for_set($value_inputted_for_field_on_model_object), ENT_QUOTES, 'UTF-8'));
34 34
 	}
35 35
 }
36 36
\ No newline at end of file
Please login to merge, or discard this patch.
core/db_models/fields/EE_Trashed_Flag_Field.php 1 patch
Spacing   +2 added lines, -2 removed lines patch added patch discarded remove patch
@@ -1,6 +1,6 @@
 block discarded – undo
1 1
 <?php
2
-require_once( EE_MODELS . 'fields/EE_Boolean_Field.php');
3
-class EE_Trashed_Flag_Field extends EE_Boolean_Field{
2
+require_once(EE_MODELS.'fields/EE_Boolean_Field.php');
3
+class EE_Trashed_Flag_Field extends EE_Boolean_Field {
4 4
 	//note: some client code simply checks if a field IS an EE_Trashed_Flag_Field
5 5
 	//...otherwise, these fields are mostly the same as boolean fields
6 6
 }
Please login to merge, or discard this patch.
core/db_models/fields/EE_WP_Post_Type_Field.php.php 1 patch
Spacing   +2 added lines, -2 removed lines patch added patch discarded remove patch
@@ -2,13 +2,13 @@
 block discarded – undo
2 2
 /**
3 3
  * For CPT models who have a post type field
4 4
  */
5
-class EE_WP_Post_Type_Field extends EE_DB_Only_Text_Field{
5
+class EE_WP_Post_Type_Field extends EE_DB_Only_Text_Field {
6 6
 	/**
7 7
 	 * 
8 8
 	 * @param string $post_type the exact string to be used for the post type
9 9
 	 * of all these post type model objects/rows
10 10
 	 */
11
-	function __construct($post_type){
11
+	function __construct($post_type) {
12 12
 		parent::__construct('post_type', __("Post Type", 'event_espresso'), false, $post_type);
13 13
 	}
14 14
 }
15 15
\ No newline at end of file
Please login to merge, or discard this patch.
core/db_models/fields/EE_WP_User_Field.php 2 patches
Spacing   +7 added lines, -7 removed lines patch added patch discarded remove patch
@@ -25,7 +25,7 @@  discard block
 block discarded – undo
25 25
  *
26 26
  * ------------------------------------------------------------------------
27 27
  */
28
-class EE_WP_User_Field extends EE_Foreign_Key_Int_Field{
28
+class EE_WP_User_Field extends EE_Foreign_Key_Int_Field {
29 29
 	/**
30 30
 	 * No need to provide a default or the model pointed to- the default is
31 31
 	 * always get_current_user_id() and the model pointed to is always WP_User
@@ -33,8 +33,8 @@  discard block
 block discarded – undo
33 33
 	 * @param string $nicename should eb internationalized with __('blah','event_espresso')
34 34
 	 * @param boolean $nullable
35 35
 	 */
36
-	function __construct($table_column, $nicename, $nullable){
37
-		parent::__construct($table_column, $nicename, $nullable, null, 'WP_User' );
36
+	function __construct($table_column, $nicename, $nullable) {
37
+		parent::__construct($table_column, $nicename, $nullable, null, 'WP_User');
38 38
 	}
39 39
 
40 40
 	/**
@@ -42,11 +42,11 @@  discard block
 block discarded – undo
42 42
 	 * constructing the model field because that's done before $current_user is set
43 43
 	 * @return mixed
44 44
 	 */
45
-	function get_default_value(){
46
-		if( did_action( 'init' ) ) {
45
+	function get_default_value() {
46
+		if (did_action('init')) {
47 47
 			return get_current_user_id();
48
-		}else{
49
-			EE_Error::doing_it_wrong('EE_WP_User_Field::get_default_value', __( 'You cant get a default value for a wp_User_Field because the "init" action is called, because current_user global hasnt yet been setup. Consider doing your business logic on the "init" hook or later.', 'event_espresso' ), '4.6.20' );
48
+		} else {
49
+			EE_Error::doing_it_wrong('EE_WP_User_Field::get_default_value', __('You cant get a default value for a wp_User_Field because the "init" action is called, because current_user global hasnt yet been setup. Consider doing your business logic on the "init" hook or later.', 'event_espresso'), '4.6.20');
50 50
 			return 1;
51 51
 		}
52 52
 	}
Please login to merge, or discard this patch.
Braces   +4 added lines, -2 removed lines patch added patch discarded remove patch
@@ -1,4 +1,6 @@  discard block
 block discarded – undo
1
-<?php if ( ! defined('EVENT_ESPRESSO_VERSION')) exit('No direct script access allowed');
1
+<?php if ( ! defined('EVENT_ESPRESSO_VERSION')) {
2
+	exit('No direct script access allowed');
3
+}
2 4
 /**
3 5
  * Event Espresso
4 6
  *
@@ -45,7 +47,7 @@  discard block
 block discarded – undo
45 47
 	function get_default_value(){
46 48
 		if( did_action( 'init' ) ) {
47 49
 			return get_current_user_id();
48
-		}else{
50
+		} else{
49 51
 			EE_Error::doing_it_wrong('EE_WP_User_Field::get_default_value', __( 'You cant get a default value for a wp_User_Field because the "init" action is called, because current_user global hasnt yet been setup. Consider doing your business logic on the "init" hook or later.', 'event_espresso' ), '4.6.20' );
50 52
 			return 1;
51 53
 		}
Please login to merge, or discard this patch.
core/db_models/helpers/EE_Index.php 1 patch
Spacing   +9 added lines, -9 removed lines patch added patch discarded remove patch
@@ -4,18 +4,18 @@  discard block
 block discarded – undo
4 4
  * Parent class for indicating indexes on models. As of writing this, it is only used
5 5
  * when deleting model objects that have no primary key, but clearly this can be expanded
6 6
  */
7
-class EE_Index{
7
+class EE_Index {
8 8
 	protected $_name;
9 9
 	protected $_field_names;
10 10
 	protected $_model_name;
11
-	public function __construct($fields){
11
+	public function __construct($fields) {
12 12
 		$this->_field_names = $fields;
13 13
 	}
14
-	public function _construct_finalize($name,$model_name){
14
+	public function _construct_finalize($name, $model_name) {
15 15
 		$this->_name = $name;
16 16
 		$this->_model_name = $model_name;
17 17
 	}
18
-	public function field_names(){
18
+	public function field_names() {
19 19
 		return $this->_field_names;
20 20
 	}
21 21
 	/**
@@ -23,19 +23,19 @@  discard block
 block discarded – undo
23 23
 	 * @param string $model_name like Event, Question_Group, etc. omit the EEM_
24 24
 	 * @return EEM_Base
25 25
 	 */
26
-	protected function _get_model($model_name){
27
-		$modelInstance=call_user_func("EEM_".$model_name."::instance");
26
+	protected function _get_model($model_name) {
27
+		$modelInstance = call_user_func("EEM_".$model_name."::instance");
28 28
 		return $modelInstance;
29 29
 	}
30 30
 	/**
31 31
 	 * Gets all the fields for this index
32 32
 	 * @return EE_Model_Field_Base[]
33 33
 	 */
34
-	public function fields(){
34
+	public function fields() {
35 35
 		$fields = array();
36 36
 		$model = $this->_get_model($this->_model_name);
37
-		foreach($model->field_settings() as $field_name => $field_obj){
38
-			if(in_array($field_name,$this->field_names())){
37
+		foreach ($model->field_settings() as $field_name => $field_obj) {
38
+			if (in_array($field_name, $this->field_names())) {
39 39
 				$fields[$field_name] = $field_obj;
40 40
 			}
41 41
 		}
Please login to merge, or discard this patch.