@@ -6,5 +6,5 @@ |
||
6 | 6 | */ |
7 | 7 | class EE_Unique_Index extends EE_Index |
8 | 8 | { |
9 | - // yep, actually the same as index right now |
|
9 | + // yep, actually the same as index right now |
|
10 | 10 | } |
@@ -7,24 +7,24 @@ |
||
7 | 7 | class EE_Primary_Table extends EE_Table_Base |
8 | 8 | { |
9 | 9 | |
10 | - /** |
|
11 | - * |
|
12 | - * @global type $wpdb |
|
13 | - * @param string $table_name with or without wpdb prefix |
|
14 | - * @param string $pk_column name of primary key column |
|
15 | - * @param boolean $global whether the table is "global" as in there is only 1 table on an entire multisite install, |
|
16 | - * or whether each site on a multisite install has a copy of this table |
|
17 | - */ |
|
18 | - public function __construct($table_name, $pk_column = null, $global = false) |
|
19 | - { |
|
20 | - parent::__construct($table_name, $pk_column, $global); |
|
21 | - } |
|
22 | - /** |
|
23 | - * Gets SQL for this table and assigning it an alias. Eg " wp_esp_attendee AS Attendee " |
|
24 | - * @return string |
|
25 | - */ |
|
26 | - public function get_table_sql() |
|
27 | - { |
|
28 | - return " ".$this->get_table_name()." AS ".$this->get_table_alias()." "; |
|
29 | - } |
|
10 | + /** |
|
11 | + * |
|
12 | + * @global type $wpdb |
|
13 | + * @param string $table_name with or without wpdb prefix |
|
14 | + * @param string $pk_column name of primary key column |
|
15 | + * @param boolean $global whether the table is "global" as in there is only 1 table on an entire multisite install, |
|
16 | + * or whether each site on a multisite install has a copy of this table |
|
17 | + */ |
|
18 | + public function __construct($table_name, $pk_column = null, $global = false) |
|
19 | + { |
|
20 | + parent::__construct($table_name, $pk_column, $global); |
|
21 | + } |
|
22 | + /** |
|
23 | + * Gets SQL for this table and assigning it an alias. Eg " wp_esp_attendee AS Attendee " |
|
24 | + * @return string |
|
25 | + */ |
|
26 | + public function get_table_sql() |
|
27 | + { |
|
28 | + return " ".$this->get_table_name()." AS ".$this->get_table_alias()." "; |
|
29 | + } |
|
30 | 30 | } |
@@ -8,153 +8,153 @@ |
||
8 | 8 | */ |
9 | 9 | class EE_Model_Parser |
10 | 10 | { |
11 | - const table_alias_model_relation_chain_separator = '__'; |
|
12 | - const table_alias_model_relation_chain_prefix_end = '___'; |
|
13 | - /** |
|
14 | - * Adds a period onto the front and end of the string. This often helps in searching. |
|
15 | - * For example, if we want to find the model name "Event", it can be tricky when the following are possible |
|
16 | - * "","Event.EVT_ID","Event","Event_Venue.Venue.VNU_ID",etc. It's easier to look for ".Event." in |
|
17 | - * "..",".Event.EVT_ID.", ".Event.", and ".Event_Venue.Venue.VNU_ID", especially when the last example should NOT |
|
18 | - * be found because the "Event" model isn't mentioned- it's just a string that has a model name that coincidentally |
|
19 | - * has it as a substring |
|
20 | - * @param string $string_to_pad |
|
21 | - * @return string |
|
22 | - */ |
|
23 | - public static function pad_with_periods($string_to_pad) |
|
24 | - { |
|
25 | - return ".".$string_to_pad."."; |
|
26 | - } |
|
27 | - /** |
|
28 | - * Basically undoes _pad_with_periods |
|
29 | - * @param string $string_to_trim |
|
30 | - * @return string |
|
31 | - */ |
|
32 | - public static function trim_periods($string_to_trim) |
|
33 | - { |
|
34 | - return trim($string_to_trim, '.'); |
|
35 | - } |
|
11 | + const table_alias_model_relation_chain_separator = '__'; |
|
12 | + const table_alias_model_relation_chain_prefix_end = '___'; |
|
13 | + /** |
|
14 | + * Adds a period onto the front and end of the string. This often helps in searching. |
|
15 | + * For example, if we want to find the model name "Event", it can be tricky when the following are possible |
|
16 | + * "","Event.EVT_ID","Event","Event_Venue.Venue.VNU_ID",etc. It's easier to look for ".Event." in |
|
17 | + * "..",".Event.EVT_ID.", ".Event.", and ".Event_Venue.Venue.VNU_ID", especially when the last example should NOT |
|
18 | + * be found because the "Event" model isn't mentioned- it's just a string that has a model name that coincidentally |
|
19 | + * has it as a substring |
|
20 | + * @param string $string_to_pad |
|
21 | + * @return string |
|
22 | + */ |
|
23 | + public static function pad_with_periods($string_to_pad) |
|
24 | + { |
|
25 | + return ".".$string_to_pad."."; |
|
26 | + } |
|
27 | + /** |
|
28 | + * Basically undoes _pad_with_periods |
|
29 | + * @param string $string_to_trim |
|
30 | + * @return string |
|
31 | + */ |
|
32 | + public static function trim_periods($string_to_trim) |
|
33 | + { |
|
34 | + return trim($string_to_trim, '.'); |
|
35 | + } |
|
36 | 36 | |
37 | 37 | |
38 | 38 | |
39 | - /** |
|
40 | - * Gets the calculated table's alias |
|
41 | - * @param string $model_relation_chain or query param |
|
42 | - * @param $this_model_name |
|
43 | - * @return string which can be added onto table aliases to make them unique |
|
44 | - */ |
|
45 | - public static function extract_table_alias_model_relation_chain_prefix($model_relation_chain, $this_model_name) |
|
46 | - { |
|
47 | - // eg $model_relation_chain = 'Venue.Event_Venue.Event.Registration", and $this_model_name = 'Event' |
|
48 | - $model_relation_chain = self::pad_with_periods($model_relation_chain); |
|
49 | - $this_model_name = self::pad_with_periods($this_model_name); |
|
50 | - // eg '.Venue.Event_Venue.Event.Registration." and '.Event.' |
|
51 | - // remove this model name and everything afterwards |
|
52 | - $pos_of_model_name = strpos($model_relation_chain, $this_model_name); |
|
53 | - $model_relation_chain = substr($model_relation_chain, 0, $pos_of_model_name); |
|
54 | - // eg '.Venue.Event_Venue.' |
|
55 | - // trim periods |
|
56 | - $model_relation_chain = self::trim_periods($model_relation_chain); |
|
57 | - // eg 'Venue.Event_Venue' |
|
58 | - // replace periods with double-underscores |
|
59 | - $model_relation_chain = str_replace(".", self::table_alias_model_relation_chain_separator, $model_relation_chain); |
|
60 | - // eg 'Venue__Event_Venue' |
|
61 | - if ($model_relation_chain !='') { |
|
62 | - $model_relation_chain = $model_relation_chain.self::table_alias_model_relation_chain_prefix_end; |
|
63 | - } |
|
64 | - // eg 'Venue_Event_Venue___' |
|
65 | - return $model_relation_chain; |
|
66 | - } |
|
67 | - /** |
|
68 | - * Gets the table's alias (without prefix or anything) |
|
69 | - * @param string $table_alias_with_model_relation_chain_prefix which CAN have a table alias model relation chain prefix (or not) |
|
70 | - * @return string |
|
71 | - */ |
|
72 | - public static function remove_table_alias_model_relation_chain_prefix($table_alias_with_model_relation_chain_prefix) |
|
73 | - { |
|
74 | - // does this actually have a table alias model relation chain prefix? |
|
75 | - $pos = strpos($table_alias_with_model_relation_chain_prefix, self::table_alias_model_relation_chain_prefix_end); |
|
76 | - if ($pos !== false) { |
|
77 | - // yes |
|
78 | - // find that triple underscore and remove it and everything before it |
|
79 | - $table_alias = substr($table_alias_with_model_relation_chain_prefix, $pos + strlen(self::table_alias_model_relation_chain_prefix_end)); |
|
80 | - } else { |
|
81 | - $table_alias = $table_alias_with_model_relation_chain_prefix; |
|
82 | - } |
|
83 | - return $table_alias; |
|
84 | - } |
|
85 | - /** |
|
86 | - * Gets the table alias model relation chain prefix from the table alias already containing it |
|
87 | - * @param string $table_alias_with_model_relation_chain_prefix |
|
88 | - * @return string |
|
89 | - */ |
|
90 | - public static function get_prefix_from_table_alias_with_model_relation_chain_prefix($table_alias_with_model_relation_chain_prefix) |
|
91 | - { |
|
92 | - // does this actually have a table alias model relation chain prefix? |
|
93 | - $pos = strpos($table_alias_with_model_relation_chain_prefix, self::table_alias_model_relation_chain_prefix_end); |
|
94 | - if ($pos !== false) { |
|
95 | - // yes |
|
96 | - // find that triple underscore and remove it and everything before it |
|
97 | - $prefix = substr($table_alias_with_model_relation_chain_prefix, 0, $pos + strlen(self::table_alias_model_relation_chain_prefix_end)); |
|
98 | - } else { |
|
99 | - $prefix = ''; |
|
100 | - } |
|
101 | - return $prefix; |
|
102 | - } |
|
39 | + /** |
|
40 | + * Gets the calculated table's alias |
|
41 | + * @param string $model_relation_chain or query param |
|
42 | + * @param $this_model_name |
|
43 | + * @return string which can be added onto table aliases to make them unique |
|
44 | + */ |
|
45 | + public static function extract_table_alias_model_relation_chain_prefix($model_relation_chain, $this_model_name) |
|
46 | + { |
|
47 | + // eg $model_relation_chain = 'Venue.Event_Venue.Event.Registration", and $this_model_name = 'Event' |
|
48 | + $model_relation_chain = self::pad_with_periods($model_relation_chain); |
|
49 | + $this_model_name = self::pad_with_periods($this_model_name); |
|
50 | + // eg '.Venue.Event_Venue.Event.Registration." and '.Event.' |
|
51 | + // remove this model name and everything afterwards |
|
52 | + $pos_of_model_name = strpos($model_relation_chain, $this_model_name); |
|
53 | + $model_relation_chain = substr($model_relation_chain, 0, $pos_of_model_name); |
|
54 | + // eg '.Venue.Event_Venue.' |
|
55 | + // trim periods |
|
56 | + $model_relation_chain = self::trim_periods($model_relation_chain); |
|
57 | + // eg 'Venue.Event_Venue' |
|
58 | + // replace periods with double-underscores |
|
59 | + $model_relation_chain = str_replace(".", self::table_alias_model_relation_chain_separator, $model_relation_chain); |
|
60 | + // eg 'Venue__Event_Venue' |
|
61 | + if ($model_relation_chain !='') { |
|
62 | + $model_relation_chain = $model_relation_chain.self::table_alias_model_relation_chain_prefix_end; |
|
63 | + } |
|
64 | + // eg 'Venue_Event_Venue___' |
|
65 | + return $model_relation_chain; |
|
66 | + } |
|
67 | + /** |
|
68 | + * Gets the table's alias (without prefix or anything) |
|
69 | + * @param string $table_alias_with_model_relation_chain_prefix which CAN have a table alias model relation chain prefix (or not) |
|
70 | + * @return string |
|
71 | + */ |
|
72 | + public static function remove_table_alias_model_relation_chain_prefix($table_alias_with_model_relation_chain_prefix) |
|
73 | + { |
|
74 | + // does this actually have a table alias model relation chain prefix? |
|
75 | + $pos = strpos($table_alias_with_model_relation_chain_prefix, self::table_alias_model_relation_chain_prefix_end); |
|
76 | + if ($pos !== false) { |
|
77 | + // yes |
|
78 | + // find that triple underscore and remove it and everything before it |
|
79 | + $table_alias = substr($table_alias_with_model_relation_chain_prefix, $pos + strlen(self::table_alias_model_relation_chain_prefix_end)); |
|
80 | + } else { |
|
81 | + $table_alias = $table_alias_with_model_relation_chain_prefix; |
|
82 | + } |
|
83 | + return $table_alias; |
|
84 | + } |
|
85 | + /** |
|
86 | + * Gets the table alias model relation chain prefix from the table alias already containing it |
|
87 | + * @param string $table_alias_with_model_relation_chain_prefix |
|
88 | + * @return string |
|
89 | + */ |
|
90 | + public static function get_prefix_from_table_alias_with_model_relation_chain_prefix($table_alias_with_model_relation_chain_prefix) |
|
91 | + { |
|
92 | + // does this actually have a table alias model relation chain prefix? |
|
93 | + $pos = strpos($table_alias_with_model_relation_chain_prefix, self::table_alias_model_relation_chain_prefix_end); |
|
94 | + if ($pos !== false) { |
|
95 | + // yes |
|
96 | + // find that triple underscore and remove it and everything before it |
|
97 | + $prefix = substr($table_alias_with_model_relation_chain_prefix, 0, $pos + strlen(self::table_alias_model_relation_chain_prefix_end)); |
|
98 | + } else { |
|
99 | + $prefix = ''; |
|
100 | + } |
|
101 | + return $prefix; |
|
102 | + } |
|
103 | 103 | |
104 | - /** |
|
105 | - * Gets the table alias model relation chain prefix (ie, what can be prepended onto |
|
106 | - * EE_Model_Field::get_qualified_column() to get the proper column name for that field |
|
107 | - * in a specific query) from teh query param (eg 'Registration.Event.EVT_ID'). |
|
108 | - * |
|
109 | - * @param string $model_name of the model on which the related query param was found to be belong |
|
110 | - * @param string $original_query_param |
|
111 | - * @return string |
|
112 | - */ |
|
113 | - public static function extract_table_alias_model_relation_chain_from_query_param($model_name, $original_query_param) |
|
114 | - { |
|
115 | - $relation_chain = self::extract_model_relation_chain($model_name, $original_query_param); |
|
116 | - $table_alias_with_model_relation_chain_prefix = EE_Model_Parser::extract_table_alias_model_relation_chain_prefix($relation_chain, $model_name); |
|
117 | - return $table_alias_with_model_relation_chain_prefix; |
|
118 | - } |
|
119 | - /** |
|
120 | - * Gets the model relation chain to $model_name from the $original_query_param. |
|
121 | - * Eg, if $model_name were 'Payment', and $original_query_param were 'Registration.Transaction.Payment.PAY_ID', |
|
122 | - * this would return 'Registration.Transaction.Payment'. Also if the query param were 'Registration.Transaction.Payment' |
|
123 | - * and $model_name were 'Payment', it should return 'Registration.Transaction.Payment' |
|
124 | - * @param string $model_name |
|
125 | - * @param string $original_query_param |
|
126 | - * @return string |
|
127 | - */ |
|
128 | - public static function extract_model_relation_chain($model_name, $original_query_param) |
|
129 | - { |
|
130 | - // prefix and postfix both with a period, as this facilitates searching |
|
131 | - $model_name = EE_Model_Parser::pad_with_periods($model_name); |
|
132 | - $original_query_param = EE_Model_Parser::pad_with_periods($original_query_param); |
|
133 | - $pos_of_model_string = strpos($original_query_param, $model_name); |
|
134 | - // eg, if we're looking for the model relation chain from Event to Payment, the original query param is probably something like |
|
135 | - // "Registration.Transaction.Payment.PAY_ID", $pos_of_model_string points to the 'P' or Payment. We want the string |
|
136 | - // "Registration.Transaction.Payment" |
|
137 | - $model_relation_chain = substr($original_query_param, 0, $pos_of_model_string+strlen($model_name)); |
|
138 | - return EE_Model_Parser::trim_periods($model_relation_chain); |
|
139 | - } |
|
104 | + /** |
|
105 | + * Gets the table alias model relation chain prefix (ie, what can be prepended onto |
|
106 | + * EE_Model_Field::get_qualified_column() to get the proper column name for that field |
|
107 | + * in a specific query) from teh query param (eg 'Registration.Event.EVT_ID'). |
|
108 | + * |
|
109 | + * @param string $model_name of the model on which the related query param was found to be belong |
|
110 | + * @param string $original_query_param |
|
111 | + * @return string |
|
112 | + */ |
|
113 | + public static function extract_table_alias_model_relation_chain_from_query_param($model_name, $original_query_param) |
|
114 | + { |
|
115 | + $relation_chain = self::extract_model_relation_chain($model_name, $original_query_param); |
|
116 | + $table_alias_with_model_relation_chain_prefix = EE_Model_Parser::extract_table_alias_model_relation_chain_prefix($relation_chain, $model_name); |
|
117 | + return $table_alias_with_model_relation_chain_prefix; |
|
118 | + } |
|
119 | + /** |
|
120 | + * Gets the model relation chain to $model_name from the $original_query_param. |
|
121 | + * Eg, if $model_name were 'Payment', and $original_query_param were 'Registration.Transaction.Payment.PAY_ID', |
|
122 | + * this would return 'Registration.Transaction.Payment'. Also if the query param were 'Registration.Transaction.Payment' |
|
123 | + * and $model_name were 'Payment', it should return 'Registration.Transaction.Payment' |
|
124 | + * @param string $model_name |
|
125 | + * @param string $original_query_param |
|
126 | + * @return string |
|
127 | + */ |
|
128 | + public static function extract_model_relation_chain($model_name, $original_query_param) |
|
129 | + { |
|
130 | + // prefix and postfix both with a period, as this facilitates searching |
|
131 | + $model_name = EE_Model_Parser::pad_with_periods($model_name); |
|
132 | + $original_query_param = EE_Model_Parser::pad_with_periods($original_query_param); |
|
133 | + $pos_of_model_string = strpos($original_query_param, $model_name); |
|
134 | + // eg, if we're looking for the model relation chain from Event to Payment, the original query param is probably something like |
|
135 | + // "Registration.Transaction.Payment.PAY_ID", $pos_of_model_string points to the 'P' or Payment. We want the string |
|
136 | + // "Registration.Transaction.Payment" |
|
137 | + $model_relation_chain = substr($original_query_param, 0, $pos_of_model_string+strlen($model_name)); |
|
138 | + return EE_Model_Parser::trim_periods($model_relation_chain); |
|
139 | + } |
|
140 | 140 | |
141 | - /** |
|
142 | - * Replaces the specified model in teh model relation chain with teh join model. |
|
143 | - * Eg EE_Model_Parser::replace_model_name_with_join_model_name_in_model_relation_chain( |
|
144 | - * "Ticket", "Datetime_Ticket", "Datetime.Ticket" ) will return |
|
145 | - * "Datetime.Datetime_Ticket" which can be used to find the table alias model relation chain prefix |
|
146 | - * using EE_Model_Parser::extract_table_alias_model_relation_chain_prefix |
|
147 | - * @param string $model_name |
|
148 | - * @param string $join_model_name |
|
149 | - * @param string $model_relation_chain |
|
150 | - * @return string |
|
151 | - */ |
|
152 | - public static function replace_model_name_with_join_model_name_in_model_relation_chain($model_name, $join_model_name, $model_relation_chain) |
|
153 | - { |
|
154 | - $model_name = EE_Model_Parser::pad_with_periods($model_name); |
|
155 | - $join_model_name = EE_Model_Parser::pad_with_periods($join_model_name); |
|
156 | - $model_relation_chain = EE_Model_Parser::pad_with_periods($model_relation_chain); |
|
157 | - $replaced_with_periods = str_replace($model_name, $join_model_name, $model_relation_chain); |
|
158 | - return EE_Model_Parser::trim_periods($replaced_with_periods); |
|
159 | - } |
|
141 | + /** |
|
142 | + * Replaces the specified model in teh model relation chain with teh join model. |
|
143 | + * Eg EE_Model_Parser::replace_model_name_with_join_model_name_in_model_relation_chain( |
|
144 | + * "Ticket", "Datetime_Ticket", "Datetime.Ticket" ) will return |
|
145 | + * "Datetime.Datetime_Ticket" which can be used to find the table alias model relation chain prefix |
|
146 | + * using EE_Model_Parser::extract_table_alias_model_relation_chain_prefix |
|
147 | + * @param string $model_name |
|
148 | + * @param string $join_model_name |
|
149 | + * @param string $model_relation_chain |
|
150 | + * @return string |
|
151 | + */ |
|
152 | + public static function replace_model_name_with_join_model_name_in_model_relation_chain($model_name, $join_model_name, $model_relation_chain) |
|
153 | + { |
|
154 | + $model_name = EE_Model_Parser::pad_with_periods($model_name); |
|
155 | + $join_model_name = EE_Model_Parser::pad_with_periods($join_model_name); |
|
156 | + $model_relation_chain = EE_Model_Parser::pad_with_periods($model_relation_chain); |
|
157 | + $replaced_with_periods = str_replace($model_name, $join_model_name, $model_relation_chain); |
|
158 | + return EE_Model_Parser::trim_periods($replaced_with_periods); |
|
159 | + } |
|
160 | 160 | } |
@@ -58,7 +58,7 @@ discard block |
||
58 | 58 | // replace periods with double-underscores |
59 | 59 | $model_relation_chain = str_replace(".", self::table_alias_model_relation_chain_separator, $model_relation_chain); |
60 | 60 | // eg 'Venue__Event_Venue' |
61 | - if ($model_relation_chain !='') { |
|
61 | + if ($model_relation_chain != '') { |
|
62 | 62 | $model_relation_chain = $model_relation_chain.self::table_alias_model_relation_chain_prefix_end; |
63 | 63 | } |
64 | 64 | // eg 'Venue_Event_Venue___' |
@@ -134,7 +134,7 @@ discard block |
||
134 | 134 | // eg, if we're looking for the model relation chain from Event to Payment, the original query param is probably something like |
135 | 135 | // "Registration.Transaction.Payment.PAY_ID", $pos_of_model_string points to the 'P' or Payment. We want the string |
136 | 136 | // "Registration.Transaction.Payment" |
137 | - $model_relation_chain = substr($original_query_param, 0, $pos_of_model_string+strlen($model_name)); |
|
137 | + $model_relation_chain = substr($original_query_param, 0, $pos_of_model_string + strlen($model_name)); |
|
138 | 138 | return EE_Model_Parser::trim_periods($model_relation_chain); |
139 | 139 | } |
140 | 140 |
@@ -6,5 +6,5 @@ |
||
6 | 6 | */ |
7 | 7 | class EE_Primary_Key_Index extends EE_Unique_Index |
8 | 8 | { |
9 | - // yep, actually the same as unique index right now |
|
9 | + // yep, actually the same as unique index right now |
|
10 | 10 | } |
@@ -13,27 +13,27 @@ |
||
13 | 13 | { |
14 | 14 | |
15 | 15 | |
16 | - /** |
|
17 | - * @deprecated |
|
18 | - * @param EE_Request $request |
|
19 | - * @param EE_Response $response |
|
20 | - * @return EE_Response |
|
21 | - */ |
|
22 | - public function handle_request(EE_Request $request, EE_Response $response) |
|
23 | - { |
|
24 | - EE_Error::doing_it_wrong( |
|
25 | - __METHOD__, |
|
26 | - sprintf( |
|
27 | - esc_html__( |
|
28 | - 'This class is deprecated. Please use %1$s instead. All Event Espresso request stack classes have been moved to %2$s and are now under the %3$s namespace', |
|
29 | - 'event_espresso' |
|
30 | - ), |
|
31 | - 'EventEspresso\core\services\request\middleware\DetectLogin', |
|
32 | - '\core\services\request', |
|
33 | - 'EventEspresso\core\services\request' |
|
34 | - ), |
|
35 | - '4.9.52' |
|
36 | - ); |
|
37 | - return $response; |
|
38 | - } |
|
16 | + /** |
|
17 | + * @deprecated |
|
18 | + * @param EE_Request $request |
|
19 | + * @param EE_Response $response |
|
20 | + * @return EE_Response |
|
21 | + */ |
|
22 | + public function handle_request(EE_Request $request, EE_Response $response) |
|
23 | + { |
|
24 | + EE_Error::doing_it_wrong( |
|
25 | + __METHOD__, |
|
26 | + sprintf( |
|
27 | + esc_html__( |
|
28 | + 'This class is deprecated. Please use %1$s instead. All Event Espresso request stack classes have been moved to %2$s and are now under the %3$s namespace', |
|
29 | + 'event_espresso' |
|
30 | + ), |
|
31 | + 'EventEspresso\core\services\request\middleware\DetectLogin', |
|
32 | + '\core\services\request', |
|
33 | + 'EventEspresso\core\services\request' |
|
34 | + ), |
|
35 | + '4.9.52' |
|
36 | + ); |
|
37 | + return $response; |
|
38 | + } |
|
39 | 39 | } |
@@ -17,75 +17,75 @@ |
||
17 | 17 | { |
18 | 18 | |
19 | 19 | |
20 | - /** |
|
21 | - * @deprecated |
|
22 | - * @param EE_Request $request |
|
23 | - * @param EE_Response $response |
|
24 | - * @return EE_Response |
|
25 | - */ |
|
26 | - public function handle_request(EE_Request $request, EE_Response $response) |
|
27 | - { |
|
28 | - EE_Error::doing_it_wrong( |
|
29 | - __METHOD__, |
|
30 | - sprintf( |
|
31 | - esc_html__( |
|
32 | - 'This class is deprecated. Please use %1$s instead. All Event Espresso request stack classes have been moved to %2$s and are now under the %3$s namespace', |
|
33 | - 'event_espresso' |
|
34 | - ), |
|
35 | - 'EventEspresso\core\services\request\middleware\RecommendedVersions', |
|
36 | - '\core\services\request', |
|
37 | - 'EventEspresso\core\services\request' |
|
38 | - ), |
|
39 | - '4.9.52' |
|
40 | - ); |
|
41 | - return $response; |
|
42 | - } |
|
20 | + /** |
|
21 | + * @deprecated |
|
22 | + * @param EE_Request $request |
|
23 | + * @param EE_Response $response |
|
24 | + * @return EE_Response |
|
25 | + */ |
|
26 | + public function handle_request(EE_Request $request, EE_Response $response) |
|
27 | + { |
|
28 | + EE_Error::doing_it_wrong( |
|
29 | + __METHOD__, |
|
30 | + sprintf( |
|
31 | + esc_html__( |
|
32 | + 'This class is deprecated. Please use %1$s instead. All Event Espresso request stack classes have been moved to %2$s and are now under the %3$s namespace', |
|
33 | + 'event_espresso' |
|
34 | + ), |
|
35 | + 'EventEspresso\core\services\request\middleware\RecommendedVersions', |
|
36 | + '\core\services\request', |
|
37 | + 'EventEspresso\core\services\request' |
|
38 | + ), |
|
39 | + '4.9.52' |
|
40 | + ); |
|
41 | + return $response; |
|
42 | + } |
|
43 | 43 | |
44 | 44 | |
45 | - /** |
|
46 | - * @deprecated |
|
47 | - * @param string $version_to_check |
|
48 | - * @param string $operator |
|
49 | - * @return bool |
|
50 | - */ |
|
51 | - public static function check_wp_version($version_to_check = EE_MIN_WP_VER_REQUIRED, $operator = '>=') |
|
52 | - { |
|
53 | - EE_Error::doing_it_wrong( |
|
54 | - __METHOD__, |
|
55 | - sprintf( |
|
56 | - esc_html__( |
|
57 | - 'This method is deprecated. Please use %1$s instead. All Event Espresso request stack classes have been moved to %2$s and are now under the %3$s namespace', |
|
58 | - 'event_espresso' |
|
59 | - ), |
|
60 | - 'EventEspresso\core\services\request\middleware\RecommendedVersions::compareWordPressVersion()', |
|
61 | - '\core\services\request', |
|
62 | - 'EventEspresso\core\services\request' |
|
63 | - ), |
|
64 | - '4.9.52', |
|
65 | - '5.0.0' |
|
66 | - ); |
|
67 | - return RecommendedVersions::compareWordPressVersion($version_to_check, $operator); |
|
68 | - } |
|
45 | + /** |
|
46 | + * @deprecated |
|
47 | + * @param string $version_to_check |
|
48 | + * @param string $operator |
|
49 | + * @return bool |
|
50 | + */ |
|
51 | + public static function check_wp_version($version_to_check = EE_MIN_WP_VER_REQUIRED, $operator = '>=') |
|
52 | + { |
|
53 | + EE_Error::doing_it_wrong( |
|
54 | + __METHOD__, |
|
55 | + sprintf( |
|
56 | + esc_html__( |
|
57 | + 'This method is deprecated. Please use %1$s instead. All Event Espresso request stack classes have been moved to %2$s and are now under the %3$s namespace', |
|
58 | + 'event_espresso' |
|
59 | + ), |
|
60 | + 'EventEspresso\core\services\request\middleware\RecommendedVersions::compareWordPressVersion()', |
|
61 | + '\core\services\request', |
|
62 | + 'EventEspresso\core\services\request' |
|
63 | + ), |
|
64 | + '4.9.52', |
|
65 | + '5.0.0' |
|
66 | + ); |
|
67 | + return RecommendedVersions::compareWordPressVersion($version_to_check, $operator); |
|
68 | + } |
|
69 | 69 | |
70 | 70 | |
71 | - /** |
|
72 | - * @deprecated |
|
73 | - * @return void |
|
74 | - */ |
|
75 | - public function minimum_wp_version_error() |
|
76 | - { |
|
77 | - EE_Error::doing_it_wrong( |
|
78 | - __METHOD__, |
|
79 | - sprintf( |
|
80 | - esc_html__( |
|
81 | - 'This method is deprecated. Please use %1$s instead. All Event Espresso request stack classes have been moved to %2$s and are now under the %3$s namespace', |
|
82 | - 'event_espresso' |
|
83 | - ), |
|
84 | - 'EventEspresso\core\services\request\middleware\RecommendedVersions::minimumWpVersionError()', |
|
85 | - '\core\services\request', |
|
86 | - 'EventEspresso\core\services\request' |
|
87 | - ), |
|
88 | - '4.9.52' |
|
89 | - ); |
|
90 | - } |
|
71 | + /** |
|
72 | + * @deprecated |
|
73 | + * @return void |
|
74 | + */ |
|
75 | + public function minimum_wp_version_error() |
|
76 | + { |
|
77 | + EE_Error::doing_it_wrong( |
|
78 | + __METHOD__, |
|
79 | + sprintf( |
|
80 | + esc_html__( |
|
81 | + 'This method is deprecated. Please use %1$s instead. All Event Espresso request stack classes have been moved to %2$s and are now under the %3$s namespace', |
|
82 | + 'event_espresso' |
|
83 | + ), |
|
84 | + 'EventEspresso\core\services\request\middleware\RecommendedVersions::minimumWpVersionError()', |
|
85 | + '\core\services\request', |
|
86 | + 'EventEspresso\core\services\request' |
|
87 | + ), |
|
88 | + '4.9.52' |
|
89 | + ); |
|
90 | + } |
|
91 | 91 | } |
@@ -20,27 +20,27 @@ |
||
20 | 20 | abstract class EE_Middleware implements EEI_Request_Decorator |
21 | 21 | { |
22 | 22 | |
23 | - /** |
|
24 | - * @deprecated |
|
25 | - * @param EE_Request $request |
|
26 | - * @param EE_Response $response |
|
27 | - * @return EE_Response |
|
28 | - */ |
|
29 | - protected function process_request_stack(EE_Request $request, EE_Response $response) |
|
30 | - { |
|
31 | - EE_Error::doing_it_wrong( |
|
32 | - __METHOD__, |
|
33 | - sprintf( |
|
34 | - esc_html__( |
|
35 | - 'This class is deprecated. Please use %1$s instead. All Event Espresso request stack classes have been moved to %2$s and are now under the %3$s namespace', |
|
36 | - 'event_espresso' |
|
37 | - ), |
|
38 | - 'EventEspresso\core\services\request\middleware\Middleware', |
|
39 | - '\core\services\request', |
|
40 | - 'EventEspresso\core\services\request' |
|
41 | - ), |
|
42 | - '4.9.52' |
|
43 | - ); |
|
44 | - return $response; |
|
45 | - } |
|
23 | + /** |
|
24 | + * @deprecated |
|
25 | + * @param EE_Request $request |
|
26 | + * @param EE_Response $response |
|
27 | + * @return EE_Response |
|
28 | + */ |
|
29 | + protected function process_request_stack(EE_Request $request, EE_Response $response) |
|
30 | + { |
|
31 | + EE_Error::doing_it_wrong( |
|
32 | + __METHOD__, |
|
33 | + sprintf( |
|
34 | + esc_html__( |
|
35 | + 'This class is deprecated. Please use %1$s instead. All Event Espresso request stack classes have been moved to %2$s and are now under the %3$s namespace', |
|
36 | + 'event_espresso' |
|
37 | + ), |
|
38 | + 'EventEspresso\core\services\request\middleware\Middleware', |
|
39 | + '\core\services\request', |
|
40 | + 'EventEspresso\core\services\request' |
|
41 | + ), |
|
42 | + '4.9.52' |
|
43 | + ); |
|
44 | + return $response; |
|
45 | + } |
|
46 | 46 | } |
@@ -14,87 +14,87 @@ |
||
14 | 14 | { |
15 | 15 | |
16 | 16 | |
17 | - /** |
|
18 | - * @deprecated 4.9.53 |
|
19 | - * @param EE_Request $request |
|
20 | - * @param EE_Response $response |
|
21 | - * @return EE_Response |
|
22 | - */ |
|
23 | - public function handle_request(EE_Request $request, EE_Response $response) |
|
24 | - { |
|
25 | - $this->_request = $request; |
|
26 | - $this->_response = $response; |
|
27 | - $this->display_alpha_banner_warning(); |
|
28 | - $this->_response = $this->process_request_stack($this->_request, $this->_response); |
|
29 | - return $this->_response; |
|
30 | - } |
|
17 | + /** |
|
18 | + * @deprecated 4.9.53 |
|
19 | + * @param EE_Request $request |
|
20 | + * @param EE_Response $response |
|
21 | + * @return EE_Response |
|
22 | + */ |
|
23 | + public function handle_request(EE_Request $request, EE_Response $response) |
|
24 | + { |
|
25 | + $this->_request = $request; |
|
26 | + $this->_response = $response; |
|
27 | + $this->display_alpha_banner_warning(); |
|
28 | + $this->_response = $this->process_request_stack($this->_request, $this->_response); |
|
29 | + return $this->_response; |
|
30 | + } |
|
31 | 31 | |
32 | 32 | |
33 | - /** |
|
34 | - * @deprecated |
|
35 | - * @return string |
|
36 | - */ |
|
37 | - public function display_alpha_banner_warning() |
|
38 | - { |
|
39 | - EE_Error::doing_it_wrong( |
|
40 | - __METHOD__, |
|
41 | - sprintf( |
|
42 | - esc_html__( |
|
43 | - 'This method is deprecated. Please use %1$s instead. All Event Espresso request stack classes have been moved to %2$s and are now under the %3$s namespace', |
|
44 | - 'event_espresso' |
|
45 | - ), |
|
46 | - 'EventEspresso\core\services\request\middleware\PreProductionVersionWarning::displayPreProductionVersionWarning()', |
|
47 | - '\core\services\request', |
|
48 | - 'EventEspresso\core\services\request' |
|
49 | - ), |
|
50 | - '4.9.52', |
|
51 | - '4.10.0' |
|
52 | - ); |
|
53 | - } |
|
33 | + /** |
|
34 | + * @deprecated |
|
35 | + * @return string |
|
36 | + */ |
|
37 | + public function display_alpha_banner_warning() |
|
38 | + { |
|
39 | + EE_Error::doing_it_wrong( |
|
40 | + __METHOD__, |
|
41 | + sprintf( |
|
42 | + esc_html__( |
|
43 | + 'This method is deprecated. Please use %1$s instead. All Event Espresso request stack classes have been moved to %2$s and are now under the %3$s namespace', |
|
44 | + 'event_espresso' |
|
45 | + ), |
|
46 | + 'EventEspresso\core\services\request\middleware\PreProductionVersionWarning::displayPreProductionVersionWarning()', |
|
47 | + '\core\services\request', |
|
48 | + 'EventEspresso\core\services\request' |
|
49 | + ), |
|
50 | + '4.9.52', |
|
51 | + '4.10.0' |
|
52 | + ); |
|
53 | + } |
|
54 | 54 | |
55 | 55 | |
56 | - /** |
|
57 | - * @deprecated |
|
58 | - * @return void |
|
59 | - */ |
|
60 | - public function alpha_banner_admin_notice() |
|
61 | - { |
|
62 | - EE_Error::doing_it_wrong( |
|
63 | - __METHOD__, |
|
64 | - sprintf( |
|
65 | - esc_html__( |
|
66 | - 'This method is deprecated. Please use %1$s instead. All Event Espresso request stack classes have been moved to %2$s and are now under the %3$s namespace', |
|
67 | - 'event_espresso' |
|
68 | - ), |
|
69 | - 'EventEspresso\core\services\request\middleware\PreProductionVersionWarning::preProductionVersionAdminNotice()', |
|
70 | - '\core\services\request', |
|
71 | - 'EventEspresso\core\services\request' |
|
72 | - ), |
|
73 | - '4.9.52', |
|
74 | - '4.10.0' |
|
75 | - ); |
|
76 | - } |
|
56 | + /** |
|
57 | + * @deprecated |
|
58 | + * @return void |
|
59 | + */ |
|
60 | + public function alpha_banner_admin_notice() |
|
61 | + { |
|
62 | + EE_Error::doing_it_wrong( |
|
63 | + __METHOD__, |
|
64 | + sprintf( |
|
65 | + esc_html__( |
|
66 | + 'This method is deprecated. Please use %1$s instead. All Event Espresso request stack classes have been moved to %2$s and are now under the %3$s namespace', |
|
67 | + 'event_espresso' |
|
68 | + ), |
|
69 | + 'EventEspresso\core\services\request\middleware\PreProductionVersionWarning::preProductionVersionAdminNotice()', |
|
70 | + '\core\services\request', |
|
71 | + 'EventEspresso\core\services\request' |
|
72 | + ), |
|
73 | + '4.9.52', |
|
74 | + '4.10.0' |
|
75 | + ); |
|
76 | + } |
|
77 | 77 | |
78 | 78 | |
79 | - /** |
|
80 | - * @deprecated |
|
81 | - * @return void |
|
82 | - */ |
|
83 | - public function alpha_banner_warning_notice() |
|
84 | - { |
|
85 | - EE_Error::doing_it_wrong( |
|
86 | - __METHOD__, |
|
87 | - sprintf( |
|
88 | - esc_html__( |
|
89 | - 'This method is deprecated. Please use %1$s instead. All Event Espresso request stack classes have been moved to %2$s and are now under the %3$s namespace', |
|
90 | - 'event_espresso' |
|
91 | - ), |
|
92 | - 'EventEspresso\core\services\request\middleware\PreProductionVersionWarning::preProductionVersionWarningNotice()', |
|
93 | - '\core\services\request', |
|
94 | - 'EventEspresso\core\services\request' |
|
95 | - ), |
|
96 | - '4.9.52', |
|
97 | - '4.10.0' |
|
98 | - ); |
|
99 | - } |
|
79 | + /** |
|
80 | + * @deprecated |
|
81 | + * @return void |
|
82 | + */ |
|
83 | + public function alpha_banner_warning_notice() |
|
84 | + { |
|
85 | + EE_Error::doing_it_wrong( |
|
86 | + __METHOD__, |
|
87 | + sprintf( |
|
88 | + esc_html__( |
|
89 | + 'This method is deprecated. Please use %1$s instead. All Event Espresso request stack classes have been moved to %2$s and are now under the %3$s namespace', |
|
90 | + 'event_espresso' |
|
91 | + ), |
|
92 | + 'EventEspresso\core\services\request\middleware\PreProductionVersionWarning::preProductionVersionWarningNotice()', |
|
93 | + '\core\services\request', |
|
94 | + 'EventEspresso\core\services\request' |
|
95 | + ), |
|
96 | + '4.9.52', |
|
97 | + '4.10.0' |
|
98 | + ); |
|
99 | + } |
|
100 | 100 | } |
@@ -15,98 +15,98 @@ |
||
15 | 15 | { |
16 | 16 | |
17 | 17 | |
18 | - /** |
|
19 | - * instance of the EE_Data_Mapper Object |
|
20 | - * |
|
21 | - * @private _instance |
|
22 | - */ |
|
23 | - private static $_instance = null; |
|
24 | - |
|
25 | - |
|
26 | - public $data = array(); |
|
27 | - |
|
28 | - |
|
29 | - /** |
|
30 | - *private constructor to prevent direct creation |
|
31 | - * |
|
32 | - * @Constructor |
|
33 | - * @access private |
|
34 | - * @return void |
|
35 | - */ |
|
36 | - private function __construct() |
|
37 | - { |
|
38 | - } |
|
39 | - |
|
40 | - |
|
41 | - /** |
|
42 | - *@ singleton method used to instantiate class object |
|
43 | - *@ access public |
|
44 | - *@ return class instance |
|
45 | - */ |
|
46 | - public function &instance() |
|
47 | - { |
|
48 | - // check if class object is instantiated |
|
49 | - if (self::$_instance === null |
|
50 | - || ! is_object(self::$_instance) |
|
51 | - || ! self::$_instance instanceof EE_Data_Mapper |
|
52 | - ) { |
|
53 | - self::$_instance = new self(); |
|
54 | - } |
|
55 | - return self::$_instance; |
|
56 | - } |
|
57 | - |
|
58 | - |
|
59 | - /** |
|
60 | - * @ override magic methods |
|
61 | - * @ return void |
|
62 | - */ |
|
63 | - final public function __destruct() |
|
64 | - { |
|
65 | - } |
|
66 | - |
|
67 | - final public function __call($a, $b) |
|
68 | - { |
|
69 | - } |
|
70 | - |
|
71 | - public static function __callStatic($a, $b) |
|
72 | - { |
|
73 | - } |
|
74 | - |
|
75 | - final public function __get($a) |
|
76 | - { |
|
77 | - } |
|
78 | - |
|
79 | - final public function __set($a, $b) |
|
80 | - { |
|
81 | - } |
|
82 | - |
|
83 | - final public function __isset($a) |
|
84 | - { |
|
85 | - } |
|
86 | - |
|
87 | - final public function __unset($a) |
|
88 | - { |
|
89 | - } |
|
90 | - |
|
91 | - final public function __sleep() |
|
92 | - { |
|
93 | - return array(); |
|
94 | - } |
|
95 | - |
|
96 | - final public function __wakeup() |
|
97 | - { |
|
98 | - } |
|
99 | - |
|
100 | - final public function __toString() |
|
101 | - { |
|
102 | - return ''; |
|
103 | - } |
|
104 | - |
|
105 | - final public function __invoke() |
|
106 | - { |
|
107 | - } |
|
108 | - |
|
109 | - final public function __clone() |
|
110 | - { |
|
111 | - } |
|
18 | + /** |
|
19 | + * instance of the EE_Data_Mapper Object |
|
20 | + * |
|
21 | + * @private _instance |
|
22 | + */ |
|
23 | + private static $_instance = null; |
|
24 | + |
|
25 | + |
|
26 | + public $data = array(); |
|
27 | + |
|
28 | + |
|
29 | + /** |
|
30 | + *private constructor to prevent direct creation |
|
31 | + * |
|
32 | + * @Constructor |
|
33 | + * @access private |
|
34 | + * @return void |
|
35 | + */ |
|
36 | + private function __construct() |
|
37 | + { |
|
38 | + } |
|
39 | + |
|
40 | + |
|
41 | + /** |
|
42 | + *@ singleton method used to instantiate class object |
|
43 | + *@ access public |
|
44 | + *@ return class instance |
|
45 | + */ |
|
46 | + public function &instance() |
|
47 | + { |
|
48 | + // check if class object is instantiated |
|
49 | + if (self::$_instance === null |
|
50 | + || ! is_object(self::$_instance) |
|
51 | + || ! self::$_instance instanceof EE_Data_Mapper |
|
52 | + ) { |
|
53 | + self::$_instance = new self(); |
|
54 | + } |
|
55 | + return self::$_instance; |
|
56 | + } |
|
57 | + |
|
58 | + |
|
59 | + /** |
|
60 | + * @ override magic methods |
|
61 | + * @ return void |
|
62 | + */ |
|
63 | + final public function __destruct() |
|
64 | + { |
|
65 | + } |
|
66 | + |
|
67 | + final public function __call($a, $b) |
|
68 | + { |
|
69 | + } |
|
70 | + |
|
71 | + public static function __callStatic($a, $b) |
|
72 | + { |
|
73 | + } |
|
74 | + |
|
75 | + final public function __get($a) |
|
76 | + { |
|
77 | + } |
|
78 | + |
|
79 | + final public function __set($a, $b) |
|
80 | + { |
|
81 | + } |
|
82 | + |
|
83 | + final public function __isset($a) |
|
84 | + { |
|
85 | + } |
|
86 | + |
|
87 | + final public function __unset($a) |
|
88 | + { |
|
89 | + } |
|
90 | + |
|
91 | + final public function __sleep() |
|
92 | + { |
|
93 | + return array(); |
|
94 | + } |
|
95 | + |
|
96 | + final public function __wakeup() |
|
97 | + { |
|
98 | + } |
|
99 | + |
|
100 | + final public function __toString() |
|
101 | + { |
|
102 | + return ''; |
|
103 | + } |
|
104 | + |
|
105 | + final public function __invoke() |
|
106 | + { |
|
107 | + } |
|
108 | + |
|
109 | + final public function __clone() |
|
110 | + { |
|
111 | + } |
|
112 | 112 | } |