Completed
Branch BUG-9647-cpt-queries (308763)
by
unknown
761:16 queued 742:07
created
core/db_models/fields/EE_Maybe_Serialized_Text_Field.php 2 patches
Spacing   +6 added lines, -6 removed lines patch added patch discarded remove patch
@@ -4,17 +4,17 @@  discard block
 block discarded – undo
4 4
 /**
5 5
  * For a db text column, which can either be an array in PHP code or a string.
6 6
  */
7
-require_once( EE_MODELS . 'fields/EE_Text_Field_Base.php' );
8
-class EE_Maybe_Serialized_Text_Field extends EE_Serialized_Text_Field{
7
+require_once(EE_MODELS.'fields/EE_Text_Field_Base.php');
8
+class EE_Maybe_Serialized_Text_Field extends EE_Serialized_Text_Field {
9 9
 	/**
10 10
 	 * Value could be an array or a string. If its an array, serialize it. Otherwise, leave it as a string
11 11
 	 * @param array|string $value_of_field_on_model_object
12 12
 	 * @return string (possibly serialized)
13 13
 	 */
14 14
 	function prepare_for_use_in_db($value_of_field_on_model_object) {
15
-		if(is_array($value_of_field_on_model_object)){
15
+		if (is_array($value_of_field_on_model_object)) {
16 16
 			return parent::prepare_for_use_in_db($value_of_field_on_model_object);
17
-		}else{
17
+		} else {
18 18
 			return $value_of_field_on_model_object;
19 19
 		}
20 20
 	}
@@ -26,9 +26,9 @@  discard block
 block discarded – undo
26 26
 	 */
27 27
 	function prepare_for_pretty_echoing($value_on_field_to_be_outputted, $schema = null) {
28 28
 		$pretty_value = null;
29
-		if(is_array($value_on_field_to_be_outputted)){
29
+		if (is_array($value_on_field_to_be_outputted)) {
30 30
 			$pretty_value = parent::prepare_for_pretty_echoing($value_on_field_to_be_outputted, $schema);
31
-		}else{
31
+		} else {
32 32
 			$pretty_value = $value_on_field_to_be_outputted;
33 33
 		}
34 34
 		return $pretty_value;
Please login to merge, or discard this patch.
Braces   +2 added lines, -2 removed lines patch added patch discarded remove patch
@@ -42,7 +42,7 @@  discard block
 block discarded – undo
42 42
 				$validation_error_message = $default_validation_strategy->get_validation_error_message();
43 43
 			}
44 44
 			throw new EE_Validation_Error( $validation_error_message, 'float_only' );
45
-		}else{
45
+		} else{
46 46
 			return floatval($normalized_value);
47 47
 		}
48 48
 	}
@@ -55,7 +55,7 @@  discard block
 block discarded – undo
55 55
 	public function unnormalize($normalized_value) {
56 56
 		if( empty( $normalized_value ) ){
57 57
 			return '0.00';
58
-		}else{
58
+		} else{
59 59
 			return "$normalized_value";
60 60
 		}
61 61
 	}
Please login to merge, or discard this patch.
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
@@ -90,7 +90,7 @@
 block discarded – undo
90 90
 		//so in case teh IPN is arriving later, let's try to process an IPN!
91 91
 		if($_SERVER['REQUEST_METHOD'] == 'POST'){
92 92
 			return $this->handle_ipn($_POST, $transaction );
93
-		}else{
93
+		} else{
94 94
 			return parent::finalize_payment_for( $transaction );
95 95
 		}
96 96
 	}
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_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_Primary_Key_Int_Field.php 2 patches
Spacing   +4 added lines, -4 removed lines patch added patch discarded remove patch
@@ -1,14 +1,14 @@
 block discarded – undo
1 1
 <?php
2
-require_once( EE_MODELS . 'fields/EE_Primary_Key_Field_Base.php');
3
-class EE_Primary_Key_Int_Field extends EE_Primary_Key_Field_Base{
4
-	function get_wpdb_data_type(){
2
+require_once(EE_MODELS.'fields/EE_Primary_Key_Field_Base.php');
3
+class EE_Primary_Key_Int_Field extends EE_Primary_Key_Field_Base {
4
+	function get_wpdb_data_type() {
5 5
 		return '%d';
6 6
 	}
7 7
 	public function __construct($table_column, $nicename) {
8 8
 		parent::__construct($table_column, $nicename, 0);
9 9
 	}
10 10
 	function prepare_for_set($value_inputted_for_field_on_model_object) {
11
-		if($this->is_model_obj_of_type_pointed_to($value_inputted_for_field_on_model_object)){
11
+		if ($this->is_model_obj_of_type_pointed_to($value_inputted_for_field_on_model_object)) {
12 12
 			$value_inputted_for_field_on_model_object = $value_inputted_for_field_on_model_object->ID();
13 13
 		}
14 14
 		return absint($value_inputted_for_field_on_model_object);
Please login to merge, or discard this patch.
Doc Comments   +4 added lines patch added patch discarded remove patch
@@ -4,6 +4,10 @@
 block discarded – undo
4 4
 	function get_wpdb_data_type(){
5 5
 		return '%s';
6 6
 	}
7
+
8
+	/**
9
+	 * @param string $table_column
10
+	 */
7 11
 	public function __construct($table_column, $nicename) {
8 12
 		parent::__construct($table_column, $nicename, NULL);
9 13
 	}
Please login to merge, or discard this patch.
core/db_models/fields/EE_Serialized_Text_Field.php 2 patches
Braces   +2 added lines, -2 removed lines patch added patch discarded remove patch
@@ -20,9 +20,9 @@
 block discarded – undo
20 20
 	function prepare_for_set($value_inputted_for_field_on_model_object) {
21 21
 		if(is_string($value_inputted_for_field_on_model_object)){
22 22
 			return parent::prepare_for_set($value_inputted_for_field_on_model_object);
23
-		}elseif(is_array($value_inputted_for_field_on_model_object)){
23
+		} elseif(is_array($value_inputted_for_field_on_model_object)){
24 24
 			return array_map(array($this,'prepare_for_set'), $value_inputted_for_field_on_model_object);
25
-		}else{//so they passed NULL or an INT or something wack
25
+		} else{//so they passed NULL or an INT or something wack
26 26
 			return $value_inputted_for_field_on_model_object;
27 27
 		}
28 28
 	}
Please login to merge, or discard this patch.
Spacing   +11 added lines, -11 removed lines patch added patch discarded remove patch
@@ -7,8 +7,8 @@  discard block
 block discarded – undo
7 7
  * However, when inserting into the DB, it should be serialized.
8 8
  * Upon retrieval from the DB, it should be unserialized back into an array.
9 9
  */
10
-require_once( EE_MODELS . 'fields/EE_Text_Field_Base.php' );
11
-class EE_Serialized_Text_Field extends EE_Text_Field_Base{
10
+require_once(EE_MODELS.'fields/EE_Text_Field_Base.php');
11
+class EE_Serialized_Text_Field extends EE_Text_Field_Base {
12 12
 	/**
13 13
 	 * Value SHOULD be an array, and we want to now convert it to a serialized string
14 14
 	 * @param array $value_of_field_on_model_object
@@ -18,12 +18,12 @@  discard block
 block discarded – undo
18 18
 		return maybe_serialize($value_of_field_on_model_object);
19 19
 	}
20 20
 	function prepare_for_set($value_inputted_for_field_on_model_object) {
21
-		$value_inputted_for_field_on_model_object = EEH_Array::maybe_unserialize( $value_inputted_for_field_on_model_object );
22
-		if(is_string($value_inputted_for_field_on_model_object)){
21
+		$value_inputted_for_field_on_model_object = EEH_Array::maybe_unserialize($value_inputted_for_field_on_model_object);
22
+		if (is_string($value_inputted_for_field_on_model_object)) {
23 23
 			return parent::prepare_for_set($value_inputted_for_field_on_model_object);
24
-		}elseif(is_array($value_inputted_for_field_on_model_object)){
25
-			return array_map(array($this,'prepare_for_set'), $value_inputted_for_field_on_model_object);
26
-		}else{//so they passed NULL or an INT or something wack
24
+		}elseif (is_array($value_inputted_for_field_on_model_object)) {
25
+			return array_map(array($this, 'prepare_for_set'), $value_inputted_for_field_on_model_object);
26
+		} else {//so they passed NULL or an INT or something wack
27 27
 			return $value_inputted_for_field_on_model_object;
28 28
 		}
29 29
 	}
@@ -33,7 +33,7 @@  discard block
 block discarded – undo
33 33
 	 * @return array
34 34
 	 */
35 35
 	function prepare_for_set_from_db($value_found_in_db_for_model_object) {
36
-		return EEH_Array::maybe_unserialize( $value_found_in_db_for_model_object );
36
+		return EEH_Array::maybe_unserialize($value_found_in_db_for_model_object);
37 37
 	}
38 38
 
39 39
 	/**
@@ -43,15 +43,15 @@  discard block
 block discarded – undo
43 43
 	 * @return string
44 44
 	 */
45 45
 	function prepare_for_pretty_echoing($value_on_field_to_be_outputted, $schema = null) {
46
-		switch($schema){
46
+		switch ($schema) {
47 47
 			case 'print_r':
48
-				$pretty_value = print_r($value_on_field_to_be_outputted,true);
48
+				$pretty_value = print_r($value_on_field_to_be_outputted, true);
49 49
 				break;
50 50
 			case 'as_table':
51 51
 				$pretty_value = EEH_Template::layout_array_as_table($value_on_field_to_be_outputted);
52 52
 				break;
53 53
 			default:
54
-				$pretty_value = implode(", ",$value_on_field_to_be_outputted);
54
+				$pretty_value = implode(", ", $value_on_field_to_be_outputted);
55 55
 		}
56 56
 		return $pretty_value;
57 57
 	}
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.