Completed
Branch EDTR/master (af42c6)
by
unknown
50:36 queued 42:13
created
core/db_models/fields/EE_WP_Post_Type_Field.php.php 1 patch
Indentation   +8 added lines, -8 removed lines patch added patch discarded remove patch
@@ -5,12 +5,12 @@
 block discarded – undo
5 5
  */
6 6
 class EE_WP_Post_Type_Field extends EE_DB_Only_Text_Field
7 7
 {
8
-    /**
9
-     * @param string $post_type the exact string to be used for the post type
10
-     *                          of all these post type model objects/rows
11
-     */
12
-    public function __construct($post_type)
13
-    {
14
-        parent::__construct('post_type', __("Post Type", 'event_espresso'), false, $post_type);
15
-    }
8
+	/**
9
+	 * @param string $post_type the exact string to be used for the post type
10
+	 *                          of all these post type model objects/rows
11
+	 */
12
+	public function __construct($post_type)
13
+	{
14
+		parent::__construct('post_type', __("Post Type", 'event_espresso'), false, $post_type);
15
+	}
16 16
 }
Please login to merge, or discard this patch.
core/db_models/fields/EE_Plain_Text_Field.php 1 patch
Indentation   +10 added lines, -10 removed lines patch added patch discarded remove patch
@@ -2,14 +2,14 @@
 block discarded – undo
2 2
 
3 3
 class EE_Plain_Text_Field extends EE_Text_Field_Base
4 4
 {
5
-    /**
6
-     * removes all tags when setting
7
-     *
8
-     * @param string $value_inputted_for_field_on_model_object
9
-     * @return string
10
-     */
11
-    public function prepare_for_set($value_inputted_for_field_on_model_object)
12
-    {
13
-        return wp_strip_all_tags(parent::prepare_for_set($value_inputted_for_field_on_model_object));
14
-    }
5
+	/**
6
+	 * removes all tags when setting
7
+	 *
8
+	 * @param string $value_inputted_for_field_on_model_object
9
+	 * @return string
10
+	 */
11
+	public function prepare_for_set($value_inputted_for_field_on_model_object)
12
+	{
13
+		return wp_strip_all_tags(parent::prepare_for_set($value_inputted_for_field_on_model_object));
14
+	}
15 15
 }
Please login to merge, or discard this patch.
core/db_models/fields/EE_Trashed_Flag_Field.php 1 patch
Indentation   +2 added lines, -2 removed lines patch added patch discarded remove patch
@@ -2,6 +2,6 @@
 block discarded – undo
2 2
 
3 3
 class EE_Trashed_Flag_Field extends EE_Boolean_Field
4 4
 {
5
-    // note: some client code simply checks if a field IS an EE_Trashed_Flag_Field
6
-    // ...otherwise, these fields are mostly the same as boolean fields
5
+	// note: some client code simply checks if a field IS an EE_Trashed_Flag_Field
6
+	// ...otherwise, these fields are mostly the same as boolean fields
7 7
 }
Please login to merge, or discard this patch.
core/db_models/fields/EE_Integer_Field.php 1 patch
Indentation   +19 added lines, -19 removed lines patch added patch discarded remove patch
@@ -6,26 +6,26 @@
 block discarded – undo
6 6
  */
7 7
 class EE_Integer_Field extends EE_Model_Field_Base
8 8
 {
9
-    /**
10
-     * @param string $table_column
11
-     * @param string $nicename
12
-     * @param bool   $nullable
13
-     * @param null   $default_value
14
-     */
15
-    public function __construct($table_column, $nicename, $nullable, $default_value = null)
16
-    {
17
-        parent::__construct($table_column, $nicename, $nullable, $default_value);
18
-        $this->setSchemaType('integer');
19
-    }
9
+	/**
10
+	 * @param string $table_column
11
+	 * @param string $nicename
12
+	 * @param bool   $nullable
13
+	 * @param null   $default_value
14
+	 */
15
+	public function __construct($table_column, $nicename, $nullable, $default_value = null)
16
+	{
17
+		parent::__construct($table_column, $nicename, $nullable, $default_value);
18
+		$this->setSchemaType('integer');
19
+	}
20 20
 
21 21
 
22
-    public function prepare_for_set($value_inputted_for_field_on_model_object)
23
-    {
24
-        return intval($value_inputted_for_field_on_model_object);
25
-    }
22
+	public function prepare_for_set($value_inputted_for_field_on_model_object)
23
+	{
24
+		return intval($value_inputted_for_field_on_model_object);
25
+	}
26 26
 
27
-    public function prepare_for_set_from_db($value_inputted_for_field_on_model_object)
28
-    {
29
-        return intval($value_inputted_for_field_on_model_object);
30
-    }
27
+	public function prepare_for_set_from_db($value_inputted_for_field_on_model_object)
28
+	{
29
+		return intval($value_inputted_for_field_on_model_object);
30
+	}
31 31
 }
Please login to merge, or discard this patch.
core/db_models/fields/EE_Primary_Key_Field_Base.php 1 patch
Indentation   +19 added lines, -19 removed lines patch added patch discarded remove patch
@@ -2,24 +2,24 @@
 block discarded – undo
2 2
 
3 3
 abstract class EE_Primary_Key_Field_Base extends EE_Field_With_Model_Name
4 4
 {
5
-    /**
6
-     * Overrides parent so it doesn't need to provide so many non-applicable fields
7
-     *
8
-     * @param string $table_column
9
-     * @param string $nicename
10
-     */
11
-    public function __construct($table_column, $nicename, $default)
12
-    {
13
-        parent::__construct($table_column, $nicename, false, $default, null);
14
-    }
5
+	/**
6
+	 * Overrides parent so it doesn't need to provide so many non-applicable fields
7
+	 *
8
+	 * @param string $table_column
9
+	 * @param string $nicename
10
+	 */
11
+	public function __construct($table_column, $nicename, $default)
12
+	{
13
+		parent::__construct($table_column, $nicename, false, $default, null);
14
+	}
15 15
 
16
-    /**
17
-     * @param $table_alias
18
-     * @param $name
19
-     */
20
-    public function _construct_finalize($table_alias, $name, $model_name)
21
-    {
22
-        $this->_model_name_pointed_to = $model_name;
23
-        parent::_construct_finalize($table_alias, $name, $model_name);
24
-    }
16
+	/**
17
+	 * @param $table_alias
18
+	 * @param $name
19
+	 */
20
+	public function _construct_finalize($table_alias, $name, $model_name)
21
+	{
22
+		$this->_model_name_pointed_to = $model_name;
23
+		parent::_construct_finalize($table_alias, $name, $model_name);
24
+	}
25 25
 }
Please login to merge, or discard this patch.
core/db_models/fields/EE_Full_HTML_Field.php 1 patch
Indentation   +48 added lines, -48 removed lines patch added patch discarded remove patch
@@ -14,57 +14,57 @@
 block discarded – undo
14 14
 class EE_Full_HTML_Field extends EE_Text_Field_Base
15 15
 {
16 16
 
17
-    /**
18
-     * @param string $table_column
19
-     * @param string $nicename
20
-     * @param bool   $nullable
21
-     * @param null   $default_value
22
-     */
23
-    public function __construct($table_column, $nicename, $nullable, $default_value = null)
24
-    {
25
-        parent::__construct($table_column, $nicename, $nullable, $default_value);
26
-        $this->setSchemaType('object');
27
-    }
17
+	/**
18
+	 * @param string $table_column
19
+	 * @param string $nicename
20
+	 * @param bool   $nullable
21
+	 * @param null   $default_value
22
+	 */
23
+	public function __construct($table_column, $nicename, $nullable, $default_value = null)
24
+	{
25
+		parent::__construct($table_column, $nicename, $nullable, $default_value);
26
+		$this->setSchemaType('object');
27
+	}
28 28
 
29 29
 
30
-    /**
31
-     * Does shortcodes and auto-paragraphs the content (unless schema is 'no_wpautop')
32
-     *
33
-     * @param type $value_on_field_to_be_outputted
34
-     * @param type $schema
35
-     * @return string
36
-     */
37
-    public function prepare_for_pretty_echoing($value_on_field_to_be_outputted, $schema = null)
38
-    {
39
-        if ($schema == 'form_input') {
40
-            return parent::prepare_for_pretty_echoing($value_on_field_to_be_outputted, $schema);
41
-        } elseif ($schema == 'no_wpautop') {
42
-            return do_shortcode(parent::prepare_for_pretty_echoing($value_on_field_to_be_outputted, $schema));
43
-        } else {
44
-            return wpautop(do_shortcode(parent::prepare_for_pretty_echoing($value_on_field_to_be_outputted, $schema)));
45
-        }
46
-    }
30
+	/**
31
+	 * Does shortcodes and auto-paragraphs the content (unless schema is 'no_wpautop')
32
+	 *
33
+	 * @param type $value_on_field_to_be_outputted
34
+	 * @param type $schema
35
+	 * @return string
36
+	 */
37
+	public function prepare_for_pretty_echoing($value_on_field_to_be_outputted, $schema = null)
38
+	{
39
+		if ($schema == 'form_input') {
40
+			return parent::prepare_for_pretty_echoing($value_on_field_to_be_outputted, $schema);
41
+		} elseif ($schema == 'no_wpautop') {
42
+			return do_shortcode(parent::prepare_for_pretty_echoing($value_on_field_to_be_outputted, $schema));
43
+		} else {
44
+			return wpautop(do_shortcode(parent::prepare_for_pretty_echoing($value_on_field_to_be_outputted, $schema)));
45
+		}
46
+	}
47 47
 
48 48
 
49 49
 
50
-    public function getSchemaProperties()
51
-    {
52
-        return array(
53
-            'raw' => array(
54
-                'description' =>  sprintf(
55
-                    __('%s - the value in the database.', 'event_espresso'),
56
-                    $this->get_nicename()
57
-                ),
58
-                'type' => 'string'
59
-            ),
60
-            'rendered' => array(
61
-                'description' =>  sprintf(
62
-                    __('%s - transformed for display.', 'event_espresso'),
63
-                    $this->get_nicename()
64
-                ),
65
-                'type' => 'string',
66
-                'readonly' => true
67
-            )
68
-        );
69
-    }
50
+	public function getSchemaProperties()
51
+	{
52
+		return array(
53
+			'raw' => array(
54
+				'description' =>  sprintf(
55
+					__('%s - the value in the database.', 'event_espresso'),
56
+					$this->get_nicename()
57
+				),
58
+				'type' => 'string'
59
+			),
60
+			'rendered' => array(
61
+				'description' =>  sprintf(
62
+					__('%s - transformed for display.', 'event_espresso'),
63
+					$this->get_nicename()
64
+				),
65
+				'type' => 'string',
66
+				'readonly' => true
67
+			)
68
+		);
69
+	}
70 70
 }
Please login to merge, or discard this patch.
core/db_models/fields/EE_DB_Only_Int_Field.php 1 patch
Indentation   +11 added lines, -11 removed lines patch added patch discarded remove patch
@@ -2,15 +2,15 @@
 block discarded – undo
2 2
 
3 3
 class EE_DB_Only_Int_Field extends EE_DB_Only_Field_Base
4 4
 {
5
-    /**
6
-     * @param string $table_column
7
-     * @param string $nicename
8
-     * @param bool   $nullable
9
-     * @param null   $default_value
10
-     */
11
-    public function __construct($table_column, $nicename, $nullable, $default_value = null)
12
-    {
13
-        parent::__construct($table_column, $nicename, $nullable, $default_value);
14
-        $this->setSchemaType('integer');
15
-    }
5
+	/**
6
+	 * @param string $table_column
7
+	 * @param string $nicename
8
+	 * @param bool   $nullable
9
+	 * @param null   $default_value
10
+	 */
11
+	public function __construct($table_column, $nicename, $nullable, $default_value = null)
12
+	{
13
+		parent::__construct($table_column, $nicename, $nullable, $default_value);
14
+		$this->setSchemaType('integer');
15
+	}
16 16
 }
Please login to merge, or discard this patch.
core/db_models/fields/EE_Enum_Integer_Field.php 2 patches
Indentation   +101 added lines, -101 removed lines patch added patch discarded remove patch
@@ -9,114 +9,114 @@
 block discarded – undo
9 9
  */
10 10
 class EE_Enum_Integer_Field extends EE_Integer_Field
11 11
 {
12
-    /**
13
-     * @var array $_allowed_enum_values
14
-     */
15
-    public $_allowed_enum_values;
12
+	/**
13
+	 * @var array $_allowed_enum_values
14
+	 */
15
+	public $_allowed_enum_values;
16 16
 
17 17
 
18
-    /**
19
-     * @param string  $table_column
20
-     * @param string  $nicename
21
-     * @param boolean $nullable
22
-     * @param int     $default_value
23
-     * @param array   $allowed_enum_values keys are values to be used in the DB, values are how they should be displayed
24
-     */
25
-    public function __construct($table_column, $nicename, $nullable, $default_value, $allowed_enum_values)
26
-    {
27
-        $this->_allowed_enum_values = $allowed_enum_values;
28
-        parent::__construct($table_column, $nicename, $nullable, $default_value);
29
-        $this->setSchemaType('object');
30
-    }
18
+	/**
19
+	 * @param string  $table_column
20
+	 * @param string  $nicename
21
+	 * @param boolean $nullable
22
+	 * @param int     $default_value
23
+	 * @param array   $allowed_enum_values keys are values to be used in the DB, values are how they should be displayed
24
+	 */
25
+	public function __construct($table_column, $nicename, $nullable, $default_value, $allowed_enum_values)
26
+	{
27
+		$this->_allowed_enum_values = $allowed_enum_values;
28
+		parent::__construct($table_column, $nicename, $nullable, $default_value);
29
+		$this->setSchemaType('object');
30
+	}
31 31
 
32
-    /**
33
-     * Returns the list of allowed enum options, but filterable.
34
-     * This is used internally
35
-     *
36
-     * @return array
37
-     */
38
-    protected function _allowed_enum_values()
39
-    {
40
-        return (array) apply_filters(
41
-            'FHEE__EE_Enum_Integer_Field___allowed_enum_options',
42
-            $this->_allowed_enum_values,
43
-            $this
44
-        );
45
-    }
32
+	/**
33
+	 * Returns the list of allowed enum options, but filterable.
34
+	 * This is used internally
35
+	 *
36
+	 * @return array
37
+	 */
38
+	protected function _allowed_enum_values()
39
+	{
40
+		return (array) apply_filters(
41
+			'FHEE__EE_Enum_Integer_Field___allowed_enum_options',
42
+			$this->_allowed_enum_values,
43
+			$this
44
+		);
45
+	}
46 46
 
47
-    /**
48
-     * When setting, just verify that the value being used matches what we've defined as allowable enum values.
49
-     * If not, throw an error (but if WP_DEBUG is false, just set the value to default)
50
-     *
51
-     * @param int $value_inputted_for_field_on_model_object
52
-     * @return int
53
-     * @throws EE_Error
54
-     */
55
-    public function prepare_for_set($value_inputted_for_field_on_model_object)
56
-    {
57
-        $allowed_enum_values = $this->_allowed_enum_values();
58
-        if ($value_inputted_for_field_on_model_object !== null
59
-            && ! array_key_exists($value_inputted_for_field_on_model_object, $allowed_enum_values)
60
-        ) {
61
-            if (defined('WP_DEBUG') && WP_DEBUG) {
62
-                $msg = sprintf(
63
-                    __('System is assigning incompatible value "%1$s" to field "%2$s"', 'event_espresso'),
64
-                    $value_inputted_for_field_on_model_object,
65
-                    $this->_name
66
-                );
67
-                $msg2 = sprintf(
68
-                    __('Allowed values for "%1$s" are "%2$s". You provided "%3$s"', 'event_espresso'),
69
-                    $this->_name,
70
-                    implode(', ', array_keys($allowed_enum_values)),
71
-                    $value_inputted_for_field_on_model_object
72
-                );
73
-                EE_Error::add_error("{$msg}||{$msg2}", __FILE__, __FUNCTION__, __LINE__);
74
-            }
75
-            return $this->get_default_value();
76
-        }
77
-        return (int) $value_inputted_for_field_on_model_object;
78
-    }
47
+	/**
48
+	 * When setting, just verify that the value being used matches what we've defined as allowable enum values.
49
+	 * If not, throw an error (but if WP_DEBUG is false, just set the value to default)
50
+	 *
51
+	 * @param int $value_inputted_for_field_on_model_object
52
+	 * @return int
53
+	 * @throws EE_Error
54
+	 */
55
+	public function prepare_for_set($value_inputted_for_field_on_model_object)
56
+	{
57
+		$allowed_enum_values = $this->_allowed_enum_values();
58
+		if ($value_inputted_for_field_on_model_object !== null
59
+			&& ! array_key_exists($value_inputted_for_field_on_model_object, $allowed_enum_values)
60
+		) {
61
+			if (defined('WP_DEBUG') && WP_DEBUG) {
62
+				$msg = sprintf(
63
+					__('System is assigning incompatible value "%1$s" to field "%2$s"', 'event_espresso'),
64
+					$value_inputted_for_field_on_model_object,
65
+					$this->_name
66
+				);
67
+				$msg2 = sprintf(
68
+					__('Allowed values for "%1$s" are "%2$s". You provided "%3$s"', 'event_espresso'),
69
+					$this->_name,
70
+					implode(', ', array_keys($allowed_enum_values)),
71
+					$value_inputted_for_field_on_model_object
72
+				);
73
+				EE_Error::add_error("{$msg}||{$msg2}", __FILE__, __FUNCTION__, __LINE__);
74
+			}
75
+			return $this->get_default_value();
76
+		}
77
+		return (int) $value_inputted_for_field_on_model_object;
78
+	}
79 79
 
80 80
 
81 81
 
82
-    /**
83
-     * Gets the pretty version of the enum's value.
84
-     *
85
-     * @param int | string $value_on_field_to_be_outputted
86
-     * @param null         $schema
87
-     * @return string
88
-     */
89
-    public function prepare_for_pretty_echoing($value_on_field_to_be_outputted, $schema = null)
90
-    {
91
-        $options = $this->_allowed_enum_values();
92
-        if (isset($options[ $value_on_field_to_be_outputted ])) {
93
-            return $options[ $value_on_field_to_be_outputted ];
94
-        } else {
95
-            return $value_on_field_to_be_outputted;
96
-        }
97
-    }
82
+	/**
83
+	 * Gets the pretty version of the enum's value.
84
+	 *
85
+	 * @param int | string $value_on_field_to_be_outputted
86
+	 * @param null         $schema
87
+	 * @return string
88
+	 */
89
+	public function prepare_for_pretty_echoing($value_on_field_to_be_outputted, $schema = null)
90
+	{
91
+		$options = $this->_allowed_enum_values();
92
+		if (isset($options[ $value_on_field_to_be_outputted ])) {
93
+			return $options[ $value_on_field_to_be_outputted ];
94
+		} else {
95
+			return $value_on_field_to_be_outputted;
96
+		}
97
+	}
98 98
 
99 99
 
100
-    public function getSchemaProperties()
101
-    {
102
-        return array(
103
-            'raw' => array(
104
-                'description' =>  sprintf(
105
-                    __('%s - the value in the database.', 'event_espresso'),
106
-                    $this->get_nicename()
107
-                ),
108
-                'enum' => array_keys($this->_allowed_enum_values()),
109
-                'type' => 'integer'
110
-            ),
111
-            'pretty' => array(
112
-                'description' =>  sprintf(
113
-                    __('%s - the value for display.', 'event_espresso'),
114
-                    $this->get_nicename()
115
-                ),
116
-                'enum' => array_values($this->_allowed_enum_values()),
117
-                'type' => 'string',
118
-                'read_only' => true
119
-            )
120
-        );
121
-    }
100
+	public function getSchemaProperties()
101
+	{
102
+		return array(
103
+			'raw' => array(
104
+				'description' =>  sprintf(
105
+					__('%s - the value in the database.', 'event_espresso'),
106
+					$this->get_nicename()
107
+				),
108
+				'enum' => array_keys($this->_allowed_enum_values()),
109
+				'type' => 'integer'
110
+			),
111
+			'pretty' => array(
112
+				'description' =>  sprintf(
113
+					__('%s - the value for display.', 'event_espresso'),
114
+					$this->get_nicename()
115
+				),
116
+				'enum' => array_values($this->_allowed_enum_values()),
117
+				'type' => 'string',
118
+				'read_only' => true
119
+			)
120
+		);
121
+	}
122 122
 }
Please login to merge, or discard this patch.
Spacing   +2 added lines, -2 removed lines patch added patch discarded remove patch
@@ -89,8 +89,8 @@
 block discarded – undo
89 89
     public function prepare_for_pretty_echoing($value_on_field_to_be_outputted, $schema = null)
90 90
     {
91 91
         $options = $this->_allowed_enum_values();
92
-        if (isset($options[ $value_on_field_to_be_outputted ])) {
93
-            return $options[ $value_on_field_to_be_outputted ];
92
+        if (isset($options[$value_on_field_to_be_outputted])) {
93
+            return $options[$value_on_field_to_be_outputted];
94 94
         } else {
95 95
             return $value_on_field_to_be_outputted;
96 96
         }
Please login to merge, or discard this patch.
core/db_models/fields/EE_Maybe_Serialized_Text_Field.php 1 patch
Indentation   +31 added lines, -31 removed lines patch added patch discarded remove patch
@@ -2,36 +2,36 @@
 block discarded – undo
2 2
 
3 3
 class EE_Maybe_Serialized_Text_Field extends EE_Serialized_Text_Field
4 4
 {
5
-    /**
6
-     * Value could be an array or a string. If its an array, serialize it. Otherwise, leave it as a string
7
-     *
8
-     * @param array|string $value_of_field_on_model_object
9
-     * @return string (possibly serialized)
10
-     */
11
-    public function prepare_for_use_in_db($value_of_field_on_model_object)
12
-    {
13
-        if (is_array($value_of_field_on_model_object)) {
14
-            return parent::prepare_for_use_in_db($value_of_field_on_model_object);
15
-        } else {
16
-            return $value_of_field_on_model_object;
17
-        }
18
-    }
5
+	/**
6
+	 * Value could be an array or a string. If its an array, serialize it. Otherwise, leave it as a string
7
+	 *
8
+	 * @param array|string $value_of_field_on_model_object
9
+	 * @return string (possibly serialized)
10
+	 */
11
+	public function prepare_for_use_in_db($value_of_field_on_model_object)
12
+	{
13
+		if (is_array($value_of_field_on_model_object)) {
14
+			return parent::prepare_for_use_in_db($value_of_field_on_model_object);
15
+		} else {
16
+			return $value_of_field_on_model_object;
17
+		}
18
+	}
19 19
 
20
-    /**
21
-     * Formats the array (or string) according to $schema. Right now, just implode with commas
22
-     *
23
-     * @param type $value_on_field_to_be_outputted
24
-     * @param type $schema
25
-     * @return strubg
26
-     */
27
-    public function prepare_for_pretty_echoing($value_on_field_to_be_outputted, $schema = null)
28
-    {
29
-        $pretty_value = null;
30
-        if (is_array($value_on_field_to_be_outputted)) {
31
-            $pretty_value = parent::prepare_for_pretty_echoing($value_on_field_to_be_outputted, $schema);
32
-        } else {
33
-            $pretty_value = $value_on_field_to_be_outputted;
34
-        }
35
-        return $pretty_value;
36
-    }
20
+	/**
21
+	 * Formats the array (or string) according to $schema. Right now, just implode with commas
22
+	 *
23
+	 * @param type $value_on_field_to_be_outputted
24
+	 * @param type $schema
25
+	 * @return strubg
26
+	 */
27
+	public function prepare_for_pretty_echoing($value_on_field_to_be_outputted, $schema = null)
28
+	{
29
+		$pretty_value = null;
30
+		if (is_array($value_on_field_to_be_outputted)) {
31
+			$pretty_value = parent::prepare_for_pretty_echoing($value_on_field_to_be_outputted, $schema);
32
+		} else {
33
+			$pretty_value = $value_on_field_to_be_outputted;
34
+		}
35
+		return $pretty_value;
36
+	}
37 37
 }
Please login to merge, or discard this patch.