@@ -22,8 +22,8 @@ discard block |
||
22 | 22 | * @param DateTime $after |
23 | 23 | * @return DateTime |
24 | 24 | */ |
25 | - protected function calculate_next( DateTime $after ) { |
|
26 | - $after->modify( '+' . (int) $this->get_recurrence() . ' seconds' ); |
|
25 | + protected function calculate_next(DateTime $after) { |
|
26 | + $after->modify('+' . (int) $this->get_recurrence() . ' seconds'); |
|
27 | 27 | return $after; |
28 | 28 | } |
29 | 29 | |
@@ -31,7 +31,7 @@ discard block |
||
31 | 31 | * @return int |
32 | 32 | */ |
33 | 33 | public function interval_in_seconds() { |
34 | - _deprecated_function( __METHOD__, '3.0.0', '(int)ActionScheduler_Abstract_RecurringSchedule::get_recurrence()' ); |
|
34 | + _deprecated_function(__METHOD__, '3.0.0', '(int)ActionScheduler_Abstract_RecurringSchedule::get_recurrence()'); |
|
35 | 35 | return (int) $this->get_recurrence(); |
36 | 36 | } |
37 | 37 | |
@@ -55,10 +55,10 @@ discard block |
||
55 | 55 | $this->start_timestamp = $this->scheduled_timestamp; |
56 | 56 | $this->interval_in_seconds = $this->recurrence; |
57 | 57 | |
58 | - return array_merge( $sleep_params, array( |
|
58 | + return array_merge($sleep_params, array( |
|
59 | 59 | 'start_timestamp', |
60 | 60 | 'interval_in_seconds' |
61 | - ) ); |
|
61 | + )); |
|
62 | 62 | } |
63 | 63 | |
64 | 64 | /** |
@@ -67,14 +67,14 @@ discard block |
||
67 | 67 | * For more background, @see ActionScheduler_Abstract_RecurringSchedule::__wakeup(). |
68 | 68 | */ |
69 | 69 | public function __wakeup() { |
70 | - if ( is_null( $this->scheduled_timestamp ) && ! is_null( $this->start_timestamp ) ) { |
|
70 | + if (is_null($this->scheduled_timestamp) && !is_null($this->start_timestamp)) { |
|
71 | 71 | $this->scheduled_timestamp = $this->start_timestamp; |
72 | - unset( $this->start_timestamp ); |
|
72 | + unset($this->start_timestamp); |
|
73 | 73 | } |
74 | 74 | |
75 | - if ( is_null( $this->recurrence ) && ! is_null( $this->interval_in_seconds ) ) { |
|
75 | + if (is_null($this->recurrence) && !is_null($this->interval_in_seconds)) { |
|
76 | 76 | $this->recurrence = $this->interval_in_seconds; |
77 | - unset( $this->interval_in_seconds ); |
|
77 | + unset($this->interval_in_seconds); |
|
78 | 78 | } |
79 | 79 | parent::__wakeup(); |
80 | 80 | } |
@@ -15,7 +15,7 @@ discard block |
||
15 | 15 | * |
16 | 16 | * @return DateTime|null |
17 | 17 | */ |
18 | - public function calculate_next( DateTime $after ) { |
|
18 | + public function calculate_next(DateTime $after) { |
|
19 | 19 | return null; |
20 | 20 | } |
21 | 21 | |
@@ -45,9 +45,9 @@ discard block |
||
45 | 45 | |
46 | 46 | $this->timestamp = $this->scheduled_timestamp; |
47 | 47 | |
48 | - return array_merge( $sleep_params, array( |
|
48 | + return array_merge($sleep_params, array( |
|
49 | 49 | 'timestamp', |
50 | - ) ); |
|
50 | + )); |
|
51 | 51 | } |
52 | 52 | |
53 | 53 | /** |
@@ -62,9 +62,9 @@ discard block |
||
62 | 62 | */ |
63 | 63 | public function __wakeup() { |
64 | 64 | |
65 | - if ( is_null( $this->scheduled_timestamp ) && ! is_null( $this->timestamp ) ) { |
|
65 | + if (is_null($this->scheduled_timestamp) && !is_null($this->timestamp)) { |
|
66 | 66 | $this->scheduled_timestamp = $this->timestamp; |
67 | - unset( $this->timestamp ); |
|
67 | + unset($this->timestamp); |
|
68 | 68 | } |
69 | 69 | parent::__wakeup(); |
70 | 70 | } |
@@ -8,7 +8,7 @@ |
||
8 | 8 | * @param DateTime $after |
9 | 9 | * @return DateTime|null |
10 | 10 | */ |
11 | - public function next( DateTime $after = NULL ); |
|
11 | + public function next(DateTime $after = NULL); |
|
12 | 12 | |
13 | 13 | /** |
14 | 14 | * @return bool |
@@ -10,7 +10,7 @@ |
||
10 | 10 | * |
11 | 11 | * @param null $date The date & time to run the action. |
12 | 12 | */ |
13 | - public function __construct( DateTime $date = null ) { |
|
13 | + public function __construct(DateTime $date = null) { |
|
14 | 14 | $this->scheduled_date = null; |
15 | 15 | } |
16 | 16 |
@@ -15,7 +15,7 @@ discard block |
||
15 | 15 | * |
16 | 16 | * @return DateTime|null |
17 | 17 | */ |
18 | - public function calculate_next( DateTime $after ) { |
|
18 | + public function calculate_next(DateTime $after) { |
|
19 | 19 | return null; |
20 | 20 | } |
21 | 21 | |
@@ -26,7 +26,7 @@ discard block |
||
26 | 26 | * @param DateTime $after |
27 | 27 | * @return DateTime|null |
28 | 28 | */ |
29 | - public function get_next( DateTime $after ) { |
|
29 | + public function get_next(DateTime $after) { |
|
30 | 30 | return null; |
31 | 31 | } |
32 | 32 | |
@@ -48,9 +48,9 @@ discard block |
||
48 | 48 | * map the old property names with matching visibility. |
49 | 49 | */ |
50 | 50 | public function __wakeup() { |
51 | - if ( ! is_null( $this->timestamp ) ) { |
|
51 | + if (!is_null($this->timestamp)) { |
|
52 | 52 | $this->scheduled_timestamp = $this->timestamp; |
53 | - unset( $this->timestamp ); |
|
53 | + unset($this->timestamp); |
|
54 | 54 | } |
55 | 55 | parent::__wakeup(); |
56 | 56 | } |
@@ -23,18 +23,18 @@ discard block |
||
23 | 23 | * @param CronExpression|string $recurrence The CronExpression used to calculate the schedule's next instance. |
24 | 24 | * @param DateTime|null $first (Optional) The date & time the first instance of this interval schedule ran. Default null, meaning this is the first instance. |
25 | 25 | */ |
26 | - public function __construct( DateTime $start, $recurrence, DateTime $first = null ) { |
|
27 | - if ( ! is_a( $recurrence, 'CronExpression' ) ) { |
|
28 | - $recurrence = CronExpression::factory( $recurrence ); |
|
26 | + public function __construct(DateTime $start, $recurrence, DateTime $first = null) { |
|
27 | + if (!is_a($recurrence, 'CronExpression')) { |
|
28 | + $recurrence = CronExpression::factory($recurrence); |
|
29 | 29 | } |
30 | 30 | |
31 | 31 | // For backward compatibility, we need to make sure the date is set to the first matching cron date, not whatever date is passed in. Importantly, by passing true as the 3rd param, if $start matches the cron expression, then it will be used. This was previously handled in the now deprecated next() method. |
32 | - $date = $recurrence->getNextRunDate( $start, 0, true ); |
|
32 | + $date = $recurrence->getNextRunDate($start, 0, true); |
|
33 | 33 | |
34 | 34 | // parent::__construct() will set this to $date by default, but that may be different to $start now. |
35 | - $first = empty( $first ) ? $start : $first; |
|
35 | + $first = empty($first) ? $start : $first; |
|
36 | 36 | |
37 | - parent::__construct( $date, $recurrence, $first ); |
|
37 | + parent::__construct($date, $recurrence, $first); |
|
38 | 38 | } |
39 | 39 | |
40 | 40 | /** |
@@ -44,15 +44,15 @@ discard block |
||
44 | 44 | * @param DateTime $after |
45 | 45 | * @return DateTime |
46 | 46 | */ |
47 | - protected function calculate_next( DateTime $after ) { |
|
48 | - return $this->recurrence->getNextRunDate( $after, 0, false ); |
|
47 | + protected function calculate_next(DateTime $after) { |
|
48 | + return $this->recurrence->getNextRunDate($after, 0, false); |
|
49 | 49 | } |
50 | 50 | |
51 | 51 | /** |
52 | 52 | * @return string |
53 | 53 | */ |
54 | 54 | public function get_recurrence() { |
55 | - return strval( $this->recurrence ); |
|
55 | + return strval($this->recurrence); |
|
56 | 56 | } |
57 | 57 | |
58 | 58 | /** |
@@ -75,10 +75,10 @@ discard block |
||
75 | 75 | $this->start_timestamp = $this->scheduled_timestamp; |
76 | 76 | $this->cron = $this->recurrence; |
77 | 77 | |
78 | - return array_merge( $sleep_params, array( |
|
78 | + return array_merge($sleep_params, array( |
|
79 | 79 | 'start_timestamp', |
80 | 80 | 'cron' |
81 | - ) ); |
|
81 | + )); |
|
82 | 82 | } |
83 | 83 | |
84 | 84 | /** |
@@ -87,14 +87,14 @@ discard block |
||
87 | 87 | * For more background, @see ActionScheduler_Abstract_RecurringSchedule::__wakeup(). |
88 | 88 | */ |
89 | 89 | public function __wakeup() { |
90 | - if ( is_null( $this->scheduled_timestamp ) && ! is_null( $this->start_timestamp ) ) { |
|
90 | + if (is_null($this->scheduled_timestamp) && !is_null($this->start_timestamp)) { |
|
91 | 91 | $this->scheduled_timestamp = $this->start_timestamp; |
92 | - unset( $this->start_timestamp ); |
|
92 | + unset($this->start_timestamp); |
|
93 | 93 | } |
94 | 94 | |
95 | - if ( is_null( $this->recurrence ) && ! is_null( $this->cron ) ) { |
|
95 | + if (is_null($this->recurrence) && !is_null($this->cron)) { |
|
96 | 96 | $this->recurrence = $this->cron; |
97 | - unset( $this->cron ); |
|
97 | + unset($this->cron); |
|
98 | 98 | } |
99 | 99 | parent::__wakeup(); |
100 | 100 | } |
@@ -80,26 +80,26 @@ discard block |
||
80 | 80 | * @param ActionScheduler_Logger $logger |
81 | 81 | * @param ActionScheduler_QueueRunner $runner |
82 | 82 | */ |
83 | - public function __construct( ActionScheduler_Store $store, ActionScheduler_Logger $logger, ActionScheduler_QueueRunner $runner ) { |
|
83 | + public function __construct(ActionScheduler_Store $store, ActionScheduler_Logger $logger, ActionScheduler_QueueRunner $runner) { |
|
84 | 84 | |
85 | 85 | $this->store = $store; |
86 | 86 | $this->logger = $logger; |
87 | 87 | $this->runner = $runner; |
88 | 88 | |
89 | - $this->table_header = __( 'Scheduled Actions', 'action-scheduler' ); |
|
89 | + $this->table_header = __('Scheduled Actions', 'action-scheduler'); |
|
90 | 90 | |
91 | 91 | $this->bulk_actions = array( |
92 | - 'delete' => __( 'Delete', 'action-scheduler' ), |
|
92 | + 'delete' => __('Delete', 'action-scheduler'), |
|
93 | 93 | ); |
94 | 94 | |
95 | 95 | $this->columns = array( |
96 | - 'hook' => __( 'Hook', 'action-scheduler' ), |
|
97 | - 'status' => __( 'Status', 'action-scheduler' ), |
|
98 | - 'args' => __( 'Arguments', 'action-scheduler' ), |
|
99 | - 'group' => __( 'Group', 'action-scheduler' ), |
|
100 | - 'recurrence' => __( 'Recurrence', 'action-scheduler' ), |
|
101 | - 'schedule' => __( 'Scheduled Date', 'action-scheduler' ), |
|
102 | - 'log_entries' => __( 'Log', 'action-scheduler' ), |
|
96 | + 'hook' => __('Hook', 'action-scheduler'), |
|
97 | + 'status' => __('Status', 'action-scheduler'), |
|
98 | + 'args' => __('Arguments', 'action-scheduler'), |
|
99 | + 'group' => __('Group', 'action-scheduler'), |
|
100 | + 'recurrence' => __('Recurrence', 'action-scheduler'), |
|
101 | + 'schedule' => __('Scheduled Date', 'action-scheduler'), |
|
102 | + 'log_entries' => __('Log', 'action-scheduler'), |
|
103 | 103 | ); |
104 | 104 | |
105 | 105 | $this->sort_by = array( |
@@ -116,22 +116,22 @@ discard block |
||
116 | 116 | |
117 | 117 | $request_status = $this->get_request_status(); |
118 | 118 | |
119 | - if ( empty( $request_status ) ) { |
|
119 | + if (empty($request_status)) { |
|
120 | 120 | $this->sort_by[] = 'status'; |
121 | - } elseif ( in_array( $request_status, array( 'in-progress', 'failed' ) ) ) { |
|
122 | - $this->columns += array( 'claim_id' => __( 'Claim ID', 'action-scheduler' ) ); |
|
121 | + } elseif (in_array($request_status, array('in-progress', 'failed'))) { |
|
122 | + $this->columns += array('claim_id' => __('Claim ID', 'action-scheduler')); |
|
123 | 123 | $this->sort_by[] = 'claim_id'; |
124 | 124 | } |
125 | 125 | |
126 | 126 | $this->row_actions = array( |
127 | 127 | 'hook' => array( |
128 | 128 | 'run' => array( |
129 | - 'name' => __( 'Run', 'action-scheduler' ), |
|
130 | - 'desc' => __( 'Process the action now as if it were run as part of a queue', 'action-scheduler' ), |
|
129 | + 'name' => __('Run', 'action-scheduler'), |
|
130 | + 'desc' => __('Process the action now as if it were run as part of a queue', 'action-scheduler'), |
|
131 | 131 | ), |
132 | 132 | 'cancel' => array( |
133 | - 'name' => __( 'Cancel', 'action-scheduler' ), |
|
134 | - 'desc' => __( 'Cancel the action now to avoid it being run in future', 'action-scheduler' ), |
|
133 | + 'name' => __('Cancel', 'action-scheduler'), |
|
134 | + 'desc' => __('Cancel the action now to avoid it being run in future', 'action-scheduler'), |
|
135 | 135 | 'class' => 'cancel trash', |
136 | 136 | ), |
137 | 137 | ), |
@@ -141,45 +141,45 @@ discard block |
||
141 | 141 | array( |
142 | 142 | 'seconds' => YEAR_IN_SECONDS, |
143 | 143 | /* translators: %s: amount of time */ |
144 | - 'names' => _n_noop( '%s year', '%s years', 'action-scheduler' ), |
|
144 | + 'names' => _n_noop('%s year', '%s years', 'action-scheduler'), |
|
145 | 145 | ), |
146 | 146 | array( |
147 | 147 | 'seconds' => MONTH_IN_SECONDS, |
148 | 148 | /* translators: %s: amount of time */ |
149 | - 'names' => _n_noop( '%s month', '%s months', 'action-scheduler' ), |
|
149 | + 'names' => _n_noop('%s month', '%s months', 'action-scheduler'), |
|
150 | 150 | ), |
151 | 151 | array( |
152 | 152 | 'seconds' => WEEK_IN_SECONDS, |
153 | 153 | /* translators: %s: amount of time */ |
154 | - 'names' => _n_noop( '%s week', '%s weeks', 'action-scheduler' ), |
|
154 | + 'names' => _n_noop('%s week', '%s weeks', 'action-scheduler'), |
|
155 | 155 | ), |
156 | 156 | array( |
157 | 157 | 'seconds' => DAY_IN_SECONDS, |
158 | 158 | /* translators: %s: amount of time */ |
159 | - 'names' => _n_noop( '%s day', '%s days', 'action-scheduler' ), |
|
159 | + 'names' => _n_noop('%s day', '%s days', 'action-scheduler'), |
|
160 | 160 | ), |
161 | 161 | array( |
162 | 162 | 'seconds' => HOUR_IN_SECONDS, |
163 | 163 | /* translators: %s: amount of time */ |
164 | - 'names' => _n_noop( '%s hour', '%s hours', 'action-scheduler' ), |
|
164 | + 'names' => _n_noop('%s hour', '%s hours', 'action-scheduler'), |
|
165 | 165 | ), |
166 | 166 | array( |
167 | 167 | 'seconds' => MINUTE_IN_SECONDS, |
168 | 168 | /* translators: %s: amount of time */ |
169 | - 'names' => _n_noop( '%s minute', '%s minutes', 'action-scheduler' ), |
|
169 | + 'names' => _n_noop('%s minute', '%s minutes', 'action-scheduler'), |
|
170 | 170 | ), |
171 | 171 | array( |
172 | 172 | 'seconds' => 1, |
173 | 173 | /* translators: %s: amount of time */ |
174 | - 'names' => _n_noop( '%s second', '%s seconds', 'action-scheduler' ), |
|
174 | + 'names' => _n_noop('%s second', '%s seconds', 'action-scheduler'), |
|
175 | 175 | ), |
176 | 176 | ); |
177 | 177 | |
178 | - parent::__construct( array( |
|
178 | + parent::__construct(array( |
|
179 | 179 | 'singular' => 'action-scheduler', |
180 | 180 | 'plural' => 'action-scheduler', |
181 | 181 | 'ajax' => false, |
182 | - ) ); |
|
182 | + )); |
|
183 | 183 | } |
184 | 184 | |
185 | 185 | /** |
@@ -195,24 +195,24 @@ discard block |
||
195 | 195 | * @param int $periods_to_include Depth of time periods to include, e.g. for an interval of 70, and $periods_to_include of 2, both minutes and seconds would be included. With a value of 1, only minutes would be included. |
196 | 196 | * @return string A human friendly string representation of the interval. |
197 | 197 | */ |
198 | - private static function human_interval( $interval, $periods_to_include = 2 ) { |
|
198 | + private static function human_interval($interval, $periods_to_include = 2) { |
|
199 | 199 | |
200 | - if ( $interval <= 0 ) { |
|
201 | - return __( 'Now!', 'action-scheduler' ); |
|
200 | + if ($interval <= 0) { |
|
201 | + return __('Now!', 'action-scheduler'); |
|
202 | 202 | } |
203 | 203 | |
204 | 204 | $output = ''; |
205 | 205 | |
206 | - for ( $time_period_index = 0, $periods_included = 0, $seconds_remaining = $interval; $time_period_index < count( self::$time_periods ) && $seconds_remaining > 0 && $periods_included < $periods_to_include; $time_period_index++ ) { |
|
206 | + for ($time_period_index = 0, $periods_included = 0, $seconds_remaining = $interval; $time_period_index < count(self::$time_periods) && $seconds_remaining > 0 && $periods_included < $periods_to_include; $time_period_index++) { |
|
207 | 207 | |
208 | - $periods_in_interval = floor( $seconds_remaining / self::$time_periods[ $time_period_index ]['seconds'] ); |
|
208 | + $periods_in_interval = floor($seconds_remaining / self::$time_periods[$time_period_index]['seconds']); |
|
209 | 209 | |
210 | - if ( $periods_in_interval > 0 ) { |
|
211 | - if ( ! empty( $output ) ) { |
|
210 | + if ($periods_in_interval > 0) { |
|
211 | + if (!empty($output)) { |
|
212 | 212 | $output .= ' '; |
213 | 213 | } |
214 | - $output .= sprintf( _n( self::$time_periods[ $time_period_index ]['names'][0], self::$time_periods[ $time_period_index ]['names'][1], $periods_in_interval, 'action-scheduler' ), $periods_in_interval ); |
|
215 | - $seconds_remaining -= $periods_in_interval * self::$time_periods[ $time_period_index ]['seconds']; |
|
214 | + $output .= sprintf(_n(self::$time_periods[$time_period_index]['names'][0], self::$time_periods[$time_period_index]['names'][1], $periods_in_interval, 'action-scheduler'), $periods_in_interval); |
|
215 | + $seconds_remaining -= $periods_in_interval * self::$time_periods[$time_period_index]['seconds']; |
|
216 | 216 | $periods_included++; |
217 | 217 | } |
218 | 218 | } |
@@ -227,20 +227,20 @@ discard block |
||
227 | 227 | * |
228 | 228 | * @return string |
229 | 229 | */ |
230 | - protected function get_recurrence( $action ) { |
|
230 | + protected function get_recurrence($action) { |
|
231 | 231 | $schedule = $action->get_schedule(); |
232 | - if ( $schedule->is_recurring() ) { |
|
232 | + if ($schedule->is_recurring()) { |
|
233 | 233 | $recurrence = $schedule->get_recurrence(); |
234 | 234 | |
235 | - if ( is_numeric( $recurrence ) ) { |
|
235 | + if (is_numeric($recurrence)) { |
|
236 | 236 | /* translators: %s: time interval */ |
237 | - return sprintf( __( 'Every %s', 'action-scheduler' ), self::human_interval( $recurrence ) ); |
|
237 | + return sprintf(__('Every %s', 'action-scheduler'), self::human_interval($recurrence)); |
|
238 | 238 | } else { |
239 | 239 | return $recurrence; |
240 | 240 | } |
241 | 241 | } |
242 | 242 | |
243 | - return __( 'Non-repeating', 'action-scheduler' ); |
|
243 | + return __('Non-repeating', 'action-scheduler'); |
|
244 | 244 | } |
245 | 245 | |
246 | 246 | /** |
@@ -250,18 +250,18 @@ discard block |
||
250 | 250 | * |
251 | 251 | * @return string |
252 | 252 | */ |
253 | - public function column_args( array $row ) { |
|
254 | - if ( empty( $row['args'] ) ) { |
|
255 | - return apply_filters( 'action_scheduler_list_table_column_args', '', $row ); |
|
253 | + public function column_args(array $row) { |
|
254 | + if (empty($row['args'])) { |
|
255 | + return apply_filters('action_scheduler_list_table_column_args', '', $row); |
|
256 | 256 | } |
257 | 257 | |
258 | 258 | $row_html = '<ul>'; |
259 | - foreach ( $row['args'] as $key => $value ) { |
|
260 | - $row_html .= sprintf( '<li><code>%s => %s</code></li>', esc_html( var_export( $key, true ) ), esc_html( var_export( $value, true ) ) ); |
|
259 | + foreach ($row['args'] as $key => $value) { |
|
260 | + $row_html .= sprintf('<li><code>%s => %s</code></li>', esc_html(var_export($key, true)), esc_html(var_export($value, true))); |
|
261 | 261 | } |
262 | 262 | $row_html .= '</ul>'; |
263 | 263 | |
264 | - return apply_filters( 'action_scheduler_list_table_column_args', $row_html, $row ); |
|
264 | + return apply_filters('action_scheduler_list_table_column_args', $row_html, $row); |
|
265 | 265 | } |
266 | 266 | |
267 | 267 | /** |
@@ -270,14 +270,14 @@ discard block |
||
270 | 270 | * @param array $row Action array. |
271 | 271 | * @return string |
272 | 272 | */ |
273 | - public function column_log_entries( array $row ) { |
|
273 | + public function column_log_entries(array $row) { |
|
274 | 274 | |
275 | 275 | $log_entries_html = '<ol>'; |
276 | 276 | |
277 | - $timezone = new DateTimezone( 'UTC' ); |
|
277 | + $timezone = new DateTimezone('UTC'); |
|
278 | 278 | |
279 | - foreach ( $row['log_entries'] as $log_entry ) { |
|
280 | - $log_entries_html .= $this->get_log_entry_html( $log_entry, $timezone ); |
|
279 | + foreach ($row['log_entries'] as $log_entry) { |
|
280 | + $log_entries_html .= $this->get_log_entry_html($log_entry, $timezone); |
|
281 | 281 | } |
282 | 282 | |
283 | 283 | $log_entries_html .= '</ol>'; |
@@ -292,10 +292,10 @@ discard block |
||
292 | 292 | * @param DateTimezone $timezone |
293 | 293 | * @return string |
294 | 294 | */ |
295 | - protected function get_log_entry_html( ActionScheduler_LogEntry $log_entry, DateTimezone $timezone ) { |
|
295 | + protected function get_log_entry_html(ActionScheduler_LogEntry $log_entry, DateTimezone $timezone) { |
|
296 | 296 | $date = $log_entry->get_date(); |
297 | - $date->setTimezone( $timezone ); |
|
298 | - return sprintf( '<li><strong>%s</strong><br/>%s</li>', esc_html( $date->format( 'Y-m-d H:i:s O' ) ), esc_html( $log_entry->get_message() ) ); |
|
297 | + $date->setTimezone($timezone); |
|
298 | + return sprintf('<li><strong>%s</strong><br/>%s</li>', esc_html($date->format('Y-m-d H:i:s O')), esc_html($log_entry->get_message())); |
|
299 | 299 | } |
300 | 300 | |
301 | 301 | /** |
@@ -306,9 +306,9 @@ discard block |
||
306 | 306 | * |
307 | 307 | * @return string |
308 | 308 | */ |
309 | - protected function maybe_render_actions( $row, $column_name ) { |
|
310 | - if ( 'pending' === strtolower( $row['status'] ) ) { |
|
311 | - return parent::maybe_render_actions( $row, $column_name ); |
|
309 | + protected function maybe_render_actions($row, $column_name) { |
|
310 | + if ('pending' === strtolower($row['status'])) { |
|
311 | + return parent::maybe_render_actions($row, $column_name); |
|
312 | 312 | } |
313 | 313 | |
314 | 314 | return ''; |
@@ -325,7 +325,7 @@ discard block |
||
325 | 325 | public function display_admin_notices() { |
326 | 326 | global $wpdb; |
327 | 327 | |
328 | - if ( ( is_a( $this->store, 'ActionScheduler_HybridStore' ) || is_a( $this->store, 'ActionScheduler_DBStore' ) ) && apply_filters( 'action_scheduler_enable_recreate_data_store', true ) ) { |
|
328 | + if ((is_a($this->store, 'ActionScheduler_HybridStore') || is_a($this->store, 'ActionScheduler_DBStore')) && apply_filters('action_scheduler_enable_recreate_data_store', true)) { |
|
329 | 329 | $table_list = array( |
330 | 330 | 'actionscheduler_actions', |
331 | 331 | 'actionscheduler_logs', |
@@ -333,12 +333,12 @@ discard block |
||
333 | 333 | 'actionscheduler_claims', |
334 | 334 | ); |
335 | 335 | |
336 | - $found_tables = $wpdb->get_col( "SHOW TABLES LIKE '{$wpdb->prefix}actionscheduler%'" ); // phpcs:ignore WordPress.DB.PreparedSQL.InterpolatedNotPrepared |
|
337 | - foreach ( $table_list as $table_name ) { |
|
338 | - if ( ! in_array( $wpdb->prefix . $table_name, $found_tables ) ) { |
|
336 | + $found_tables = $wpdb->get_col("SHOW TABLES LIKE '{$wpdb->prefix}actionscheduler%'"); // phpcs:ignore WordPress.DB.PreparedSQL.InterpolatedNotPrepared |
|
337 | + foreach ($table_list as $table_name) { |
|
338 | + if (!in_array($wpdb->prefix . $table_name, $found_tables)) { |
|
339 | 339 | $this->admin_notices[] = array( |
340 | 340 | 'class' => 'error', |
341 | - 'message' => __( 'It appears one or more database tables were missing. Attempting to re-create the missing table(s).' , 'action-scheduler' ), |
|
341 | + 'message' => __('It appears one or more database tables were missing. Attempting to re-create the missing table(s).', 'action-scheduler'), |
|
342 | 342 | ); |
343 | 343 | $this->recreate_tables(); |
344 | 344 | parent::display_admin_notices(); |
@@ -348,7 +348,7 @@ discard block |
||
348 | 348 | } |
349 | 349 | } |
350 | 350 | |
351 | - if ( $this->runner->has_maximum_concurrent_batches() ) { |
|
351 | + if ($this->runner->has_maximum_concurrent_batches()) { |
|
352 | 352 | $claim_count = $this->store->get_claim_count(); |
353 | 353 | $this->admin_notices[] = array( |
354 | 354 | 'class' => 'updated', |
@@ -363,18 +363,18 @@ discard block |
||
363 | 363 | $claim_count |
364 | 364 | ), |
365 | 365 | ); |
366 | - } elseif ( $this->store->has_pending_actions_due() ) { |
|
366 | + } elseif ($this->store->has_pending_actions_due()) { |
|
367 | 367 | |
368 | - $async_request_lock_expiration = ActionScheduler::lock()->get_expiration( 'async-request-runner' ); |
|
368 | + $async_request_lock_expiration = ActionScheduler::lock()->get_expiration('async-request-runner'); |
|
369 | 369 | |
370 | 370 | // No lock set or lock expired |
371 | - if ( false === $async_request_lock_expiration || $async_request_lock_expiration < time() ) { |
|
372 | - $in_progress_url = add_query_arg( 'status', 'in-progress', remove_query_arg( 'status' ) ); |
|
371 | + if (false === $async_request_lock_expiration || $async_request_lock_expiration < time()) { |
|
372 | + $in_progress_url = add_query_arg('status', 'in-progress', remove_query_arg('status')); |
|
373 | 373 | /* translators: %s: process URL */ |
374 | - $async_request_message = sprintf( __( 'A new queue has begun processing. <a href="%s">View actions in-progress »</a>', 'action-scheduler' ), esc_url( $in_progress_url ) ); |
|
374 | + $async_request_message = sprintf(__('A new queue has begun processing. <a href="%s">View actions in-progress »</a>', 'action-scheduler'), esc_url($in_progress_url)); |
|
375 | 375 | } else { |
376 | 376 | /* translators: %d: seconds */ |
377 | - $async_request_message = sprintf( __( 'The next queue will begin processing in approximately %d seconds.', 'action-scheduler' ), $async_request_lock_expiration - time() ); |
|
377 | + $async_request_message = sprintf(__('The next queue will begin processing in approximately %d seconds.', 'action-scheduler'), $async_request_lock_expiration - time()); |
|
378 | 378 | } |
379 | 379 | |
380 | 380 | $this->admin_notices[] = array( |
@@ -383,36 +383,36 @@ discard block |
||
383 | 383 | ); |
384 | 384 | } |
385 | 385 | |
386 | - $notification = get_transient( 'action_scheduler_admin_notice' ); |
|
386 | + $notification = get_transient('action_scheduler_admin_notice'); |
|
387 | 387 | |
388 | - if ( is_array( $notification ) ) { |
|
389 | - delete_transient( 'action_scheduler_admin_notice' ); |
|
388 | + if (is_array($notification)) { |
|
389 | + delete_transient('action_scheduler_admin_notice'); |
|
390 | 390 | |
391 | - $action = $this->store->fetch_action( $notification['action_id'] ); |
|
391 | + $action = $this->store->fetch_action($notification['action_id']); |
|
392 | 392 | $action_hook_html = '<strong><code>' . $action->get_hook() . '</code></strong>'; |
393 | - if ( 1 == $notification['success'] ) { |
|
393 | + if (1 == $notification['success']) { |
|
394 | 394 | $class = 'updated'; |
395 | - switch ( $notification['row_action_type'] ) { |
|
395 | + switch ($notification['row_action_type']) { |
|
396 | 396 | case 'run' : |
397 | 397 | /* translators: %s: action HTML */ |
398 | - $action_message_html = sprintf( __( 'Successfully executed action: %s', 'action-scheduler' ), $action_hook_html ); |
|
398 | + $action_message_html = sprintf(__('Successfully executed action: %s', 'action-scheduler'), $action_hook_html); |
|
399 | 399 | break; |
400 | 400 | case 'cancel' : |
401 | 401 | /* translators: %s: action HTML */ |
402 | - $action_message_html = sprintf( __( 'Successfully canceled action: %s', 'action-scheduler' ), $action_hook_html ); |
|
402 | + $action_message_html = sprintf(__('Successfully canceled action: %s', 'action-scheduler'), $action_hook_html); |
|
403 | 403 | break; |
404 | 404 | default : |
405 | 405 | /* translators: %s: action HTML */ |
406 | - $action_message_html = sprintf( __( 'Successfully processed change for action: %s', 'action-scheduler' ), $action_hook_html ); |
|
406 | + $action_message_html = sprintf(__('Successfully processed change for action: %s', 'action-scheduler'), $action_hook_html); |
|
407 | 407 | break; |
408 | 408 | } |
409 | 409 | } else { |
410 | 410 | $class = 'error'; |
411 | 411 | /* translators: 1: action HTML 2: action ID 3: error message */ |
412 | - $action_message_html = sprintf( __( 'Could not process change for action: "%1$s" (ID: %2$d). Error: %3$s', 'action-scheduler' ), $action_hook_html, esc_html( $notification['action_id'] ), esc_html( $notification['error_message'] ) ); |
|
412 | + $action_message_html = sprintf(__('Could not process change for action: "%1$s" (ID: %2$d). Error: %3$s', 'action-scheduler'), $action_hook_html, esc_html($notification['action_id']), esc_html($notification['error_message'])); |
|
413 | 413 | } |
414 | 414 | |
415 | - $action_message_html = apply_filters( 'action_scheduler_admin_notice_html', $action_message_html, $action, $notification ); |
|
415 | + $action_message_html = apply_filters('action_scheduler_admin_notice_html', $action_message_html, $action, $notification); |
|
416 | 416 | |
417 | 417 | $this->admin_notices[] = array( |
418 | 418 | 'class' => $class, |
@@ -430,8 +430,8 @@ discard block |
||
430 | 430 | * |
431 | 431 | * @return string |
432 | 432 | */ |
433 | - public function column_schedule( $row ) { |
|
434 | - return $this->get_schedule_display_string( $row['schedule'] ); |
|
433 | + public function column_schedule($row) { |
|
434 | + return $this->get_schedule_display_string($row['schedule']); |
|
435 | 435 | } |
436 | 436 | |
437 | 437 | /** |
@@ -440,25 +440,25 @@ discard block |
||
440 | 440 | * @param ActionScheduler_Schedule $schedule |
441 | 441 | * @return string |
442 | 442 | */ |
443 | - protected function get_schedule_display_string( ActionScheduler_Schedule $schedule ) { |
|
443 | + protected function get_schedule_display_string(ActionScheduler_Schedule $schedule) { |
|
444 | 444 | |
445 | 445 | $schedule_display_string = ''; |
446 | 446 | |
447 | - if ( ! $schedule->get_date() ) { |
|
447 | + if (!$schedule->get_date()) { |
|
448 | 448 | return '0000-00-00 00:00:00'; |
449 | 449 | } |
450 | 450 | |
451 | 451 | $next_timestamp = $schedule->get_date()->getTimestamp(); |
452 | 452 | |
453 | - $schedule_display_string .= $schedule->get_date()->format( 'Y-m-d H:i:s O' ); |
|
453 | + $schedule_display_string .= $schedule->get_date()->format('Y-m-d H:i:s O'); |
|
454 | 454 | $schedule_display_string .= '<br/>'; |
455 | 455 | |
456 | - if ( gmdate( 'U' ) > $next_timestamp ) { |
|
456 | + if (gmdate('U') > $next_timestamp) { |
|
457 | 457 | /* translators: %s: date interval */ |
458 | - $schedule_display_string .= sprintf( __( ' (%s ago)', 'action-scheduler' ), self::human_interval( gmdate( 'U' ) - $next_timestamp ) ); |
|
458 | + $schedule_display_string .= sprintf(__(' (%s ago)', 'action-scheduler'), self::human_interval(gmdate('U') - $next_timestamp)); |
|
459 | 459 | } else { |
460 | 460 | /* translators: %s: date interval */ |
461 | - $schedule_display_string .= sprintf( __( ' (%s)', 'action-scheduler' ), self::human_interval( $next_timestamp - gmdate( 'U' ) ) ); |
|
461 | + $schedule_display_string .= sprintf(__(' (%s)', 'action-scheduler'), self::human_interval($next_timestamp - gmdate('U'))); |
|
462 | 462 | } |
463 | 463 | |
464 | 464 | return $schedule_display_string; |
@@ -473,9 +473,9 @@ discard block |
||
473 | 473 | * @param array $ids |
474 | 474 | * @param string $ids_sql Inherited and unused |
475 | 475 | */ |
476 | - protected function bulk_delete( array $ids, $ids_sql ) { |
|
477 | - foreach ( $ids as $id ) { |
|
478 | - $this->store->delete_action( $id ); |
|
476 | + protected function bulk_delete(array $ids, $ids_sql) { |
|
477 | + foreach ($ids as $id) { |
|
478 | + $this->store->delete_action($id); |
|
479 | 479 | } |
480 | 480 | } |
481 | 481 | |
@@ -485,8 +485,8 @@ discard block |
||
485 | 485 | * |
486 | 486 | * @param int $action_id |
487 | 487 | */ |
488 | - protected function row_action_cancel( $action_id ) { |
|
489 | - $this->process_row_action( $action_id, 'cancel' ); |
|
488 | + protected function row_action_cancel($action_id) { |
|
489 | + $this->process_row_action($action_id, 'cancel'); |
|
490 | 490 | } |
491 | 491 | |
492 | 492 | /** |
@@ -495,27 +495,27 @@ discard block |
||
495 | 495 | * |
496 | 496 | * @param int $action_id |
497 | 497 | */ |
498 | - protected function row_action_run( $action_id ) { |
|
499 | - $this->process_row_action( $action_id, 'run' ); |
|
498 | + protected function row_action_run($action_id) { |
|
499 | + $this->process_row_action($action_id, 'run'); |
|
500 | 500 | } |
501 | 501 | |
502 | 502 | /** |
503 | 503 | * Force the data store schema updates. |
504 | 504 | */ |
505 | 505 | protected function recreate_tables() { |
506 | - if ( is_a( $this->store, 'ActionScheduler_HybridStore' ) ) { |
|
506 | + if (is_a($this->store, 'ActionScheduler_HybridStore')) { |
|
507 | 507 | $store = $this->store; |
508 | 508 | } else { |
509 | 509 | $store = new ActionScheduler_HybridStore(); |
510 | 510 | } |
511 | - add_action( 'action_scheduler/created_table', array( $store, 'set_autoincrement' ), 10, 2 ); |
|
511 | + add_action('action_scheduler/created_table', array($store, 'set_autoincrement'), 10, 2); |
|
512 | 512 | |
513 | 513 | $store_schema = new ActionScheduler_StoreSchema(); |
514 | 514 | $logger_schema = new ActionScheduler_LoggerSchema(); |
515 | - $store_schema->register_tables( true ); |
|
516 | - $logger_schema->register_tables( true ); |
|
515 | + $store_schema->register_tables(true); |
|
516 | + $logger_schema->register_tables(true); |
|
517 | 517 | |
518 | - remove_action( 'action_scheduler/created_table', array( $store, 'set_autoincrement' ), 10 ); |
|
518 | + remove_action('action_scheduler/created_table', array($store, 'set_autoincrement'), 10); |
|
519 | 519 | } |
520 | 520 | /** |
521 | 521 | * Implements the logic behind processing an action once an action link is clicked on the list table. |
@@ -523,24 +523,24 @@ discard block |
||
523 | 523 | * @param int $action_id |
524 | 524 | * @param string $row_action_type The type of action to perform on the action. |
525 | 525 | */ |
526 | - protected function process_row_action( $action_id, $row_action_type ) { |
|
526 | + protected function process_row_action($action_id, $row_action_type) { |
|
527 | 527 | try { |
528 | - switch ( $row_action_type ) { |
|
528 | + switch ($row_action_type) { |
|
529 | 529 | case 'run' : |
530 | - $this->runner->process_action( $action_id, 'Admin List Table' ); |
|
530 | + $this->runner->process_action($action_id, 'Admin List Table'); |
|
531 | 531 | break; |
532 | 532 | case 'cancel' : |
533 | - $this->store->cancel_action( $action_id ); |
|
533 | + $this->store->cancel_action($action_id); |
|
534 | 534 | break; |
535 | 535 | } |
536 | 536 | $success = 1; |
537 | 537 | $error_message = ''; |
538 | - } catch ( Exception $e ) { |
|
538 | + } catch (Exception $e) { |
|
539 | 539 | $success = 0; |
540 | 540 | $error_message = $e->getMessage(); |
541 | 541 | } |
542 | 542 | |
543 | - set_transient( 'action_scheduler_admin_notice', compact( 'action_id', 'success', 'error_message', 'row_action_type' ), 30 ); |
|
543 | + set_transient('action_scheduler_admin_notice', compact('action_id', 'success', 'error_message', 'row_action_type'), 30); |
|
544 | 544 | } |
545 | 545 | |
546 | 546 | /** |
@@ -549,7 +549,7 @@ discard block |
||
549 | 549 | public function prepare_items() { |
550 | 550 | $this->prepare_column_headers(); |
551 | 551 | |
552 | - $per_page = $this->get_items_per_page( $this->package . '_items_per_page', $this->items_per_page ); |
|
552 | + $per_page = $this->get_items_per_page($this->package . '_items_per_page', $this->items_per_page); |
|
553 | 553 | $query = array( |
554 | 554 | 'per_page' => $per_page, |
555 | 555 | 'offset' => $this->get_items_offset(), |
@@ -561,37 +561,37 @@ discard block |
||
561 | 561 | |
562 | 562 | $this->items = array(); |
563 | 563 | |
564 | - $total_items = $this->store->query_actions( $query, 'count' ); |
|
564 | + $total_items = $this->store->query_actions($query, 'count'); |
|
565 | 565 | |
566 | 566 | $status_labels = $this->store->get_status_labels(); |
567 | 567 | |
568 | - foreach ( $this->store->query_actions( $query ) as $action_id ) { |
|
568 | + foreach ($this->store->query_actions($query) as $action_id) { |
|
569 | 569 | try { |
570 | - $action = $this->store->fetch_action( $action_id ); |
|
571 | - } catch ( Exception $e ) { |
|
570 | + $action = $this->store->fetch_action($action_id); |
|
571 | + } catch (Exception $e) { |
|
572 | 572 | continue; |
573 | 573 | } |
574 | - if ( is_a( $action, 'ActionScheduler_NullAction' ) ) { |
|
574 | + if (is_a($action, 'ActionScheduler_NullAction')) { |
|
575 | 575 | continue; |
576 | 576 | } |
577 | - $this->items[ $action_id ] = array( |
|
577 | + $this->items[$action_id] = array( |
|
578 | 578 | 'ID' => $action_id, |
579 | 579 | 'hook' => $action->get_hook(), |
580 | - 'status' => $status_labels[ $this->store->get_status( $action_id ) ], |
|
580 | + 'status' => $status_labels[$this->store->get_status($action_id)], |
|
581 | 581 | 'args' => $action->get_args(), |
582 | 582 | 'group' => $action->get_group(), |
583 | - 'log_entries' => $this->logger->get_logs( $action_id ), |
|
584 | - 'claim_id' => $this->store->get_claim_id( $action_id ), |
|
585 | - 'recurrence' => $this->get_recurrence( $action ), |
|
583 | + 'log_entries' => $this->logger->get_logs($action_id), |
|
584 | + 'claim_id' => $this->store->get_claim_id($action_id), |
|
585 | + 'recurrence' => $this->get_recurrence($action), |
|
586 | 586 | 'schedule' => $action->get_schedule(), |
587 | 587 | ); |
588 | 588 | } |
589 | 589 | |
590 | - $this->set_pagination_args( array( |
|
590 | + $this->set_pagination_args(array( |
|
591 | 591 | 'total_items' => $total_items, |
592 | 592 | 'per_page' => $per_page, |
593 | - 'total_pages' => ceil( $total_items / $per_page ), |
|
594 | - ) ); |
|
593 | + 'total_pages' => ceil($total_items / $per_page), |
|
594 | + )); |
|
595 | 595 | } |
596 | 596 | |
597 | 597 | /** |
@@ -606,6 +606,6 @@ discard block |
||
606 | 606 | * Get the text to display in the search box on the list table. |
607 | 607 | */ |
608 | 608 | protected function get_search_box_button_text() { |
609 | - return __( 'Search hook, args and claim ID', 'action-scheduler' ); |
|
609 | + return __('Search hook, args and claim ID', 'action-scheduler'); |
|
610 | 610 | } |
611 | 611 | } |
@@ -41,10 +41,10 @@ discard block |
||
41 | 41 | * |
42 | 42 | * @throws Exception When this is not run within WP CLI |
43 | 43 | */ |
44 | - public function __construct( $message, $count, $interval = 100 ) { |
|
45 | - if ( ! ( defined( 'WP_CLI' ) && WP_CLI ) ) { |
|
44 | + public function __construct($message, $count, $interval = 100) { |
|
45 | + if (!(defined('WP_CLI') && WP_CLI)) { |
|
46 | 46 | /* translators: %s php class name */ |
47 | - throw new \Exception( sprintf( __( 'The %s class can only be run within WP CLI.', 'action-scheduler' ), __CLASS__ ) ); |
|
47 | + throw new \Exception(sprintf(__('The %s class can only be run within WP CLI.', 'action-scheduler'), __CLASS__)); |
|
48 | 48 | } |
49 | 49 | |
50 | 50 | $this->total_ticks = 0; |
@@ -57,14 +57,14 @@ discard block |
||
57 | 57 | * Increment the progress bar ticks. |
58 | 58 | */ |
59 | 59 | public function tick() { |
60 | - if ( null === $this->progress_bar ) { |
|
60 | + if (null === $this->progress_bar) { |
|
61 | 61 | $this->setup_progress_bar(); |
62 | 62 | } |
63 | 63 | |
64 | 64 | $this->progress_bar->tick(); |
65 | 65 | $this->total_ticks++; |
66 | 66 | |
67 | - do_action( 'action_scheduler/progress_tick', $this->total_ticks ); |
|
67 | + do_action('action_scheduler/progress_tick', $this->total_ticks); |
|
68 | 68 | } |
69 | 69 | |
70 | 70 | /** |
@@ -80,7 +80,7 @@ discard block |
||
80 | 80 | * Finish the current progress bar. |
81 | 81 | */ |
82 | 82 | public function finish() { |
83 | - if ( null !== $this->progress_bar ) { |
|
83 | + if (null !== $this->progress_bar) { |
|
84 | 84 | $this->progress_bar->finish(); |
85 | 85 | } |
86 | 86 | |
@@ -92,7 +92,7 @@ discard block |
||
92 | 92 | * |
93 | 93 | * @param string $message The message to be used when the next progress bar is created. |
94 | 94 | */ |
95 | - public function set_message( $message ) { |
|
95 | + public function set_message($message) { |
|
96 | 96 | $this->message = $message; |
97 | 97 | } |
98 | 98 | |
@@ -101,7 +101,7 @@ discard block |
||
101 | 101 | * |
102 | 102 | * @param integer $count The total number of ticks expected to complete. |
103 | 103 | */ |
104 | - public function set_count( $count ) { |
|
104 | + public function set_count($count) { |
|
105 | 105 | $this->count = $count; |
106 | 106 | $this->finish(); |
107 | 107 | } |
@@ -27,13 +27,13 @@ discard block |
||
27 | 27 | * |
28 | 28 | * @throws Exception When this is not run within WP CLI |
29 | 29 | */ |
30 | - public function __construct( ActionScheduler_Store $store = null, ActionScheduler_FatalErrorMonitor $monitor = null, ActionScheduler_QueueCleaner $cleaner = null ) { |
|
31 | - if ( ! ( defined( 'WP_CLI' ) && WP_CLI ) ) { |
|
30 | + public function __construct(ActionScheduler_Store $store = null, ActionScheduler_FatalErrorMonitor $monitor = null, ActionScheduler_QueueCleaner $cleaner = null) { |
|
31 | + if (!(defined('WP_CLI') && WP_CLI)) { |
|
32 | 32 | /* translators: %s php class name */ |
33 | - throw new Exception( sprintf( __( 'The %s class can only be run within WP CLI.', 'action-scheduler' ), __CLASS__ ) ); |
|
33 | + throw new Exception(sprintf(__('The %s class can only be run within WP CLI.', 'action-scheduler'), __CLASS__)); |
|
34 | 34 | } |
35 | 35 | |
36 | - parent::__construct( $store, $monitor, $cleaner ); |
|
36 | + parent::__construct($store, $monitor, $cleaner); |
|
37 | 37 | } |
38 | 38 | |
39 | 39 | /** |
@@ -49,25 +49,25 @@ discard block |
||
49 | 49 | * @return int The number of actions that will be run. |
50 | 50 | * @throws \WP_CLI\ExitException When there are too many concurrent batches. |
51 | 51 | */ |
52 | - public function setup( $batch_size, $hooks = array(), $group = '', $force = false ) { |
|
52 | + public function setup($batch_size, $hooks = array(), $group = '', $force = false) { |
|
53 | 53 | $this->run_cleanup(); |
54 | 54 | $this->add_hooks(); |
55 | 55 | |
56 | 56 | // Check to make sure there aren't too many concurrent processes running. |
57 | - if ( $this->has_maximum_concurrent_batches() ) { |
|
58 | - if ( $force ) { |
|
59 | - WP_CLI::warning( __( 'There are too many concurrent batches, but the run is forced to continue.', 'action-scheduler' ) ); |
|
57 | + if ($this->has_maximum_concurrent_batches()) { |
|
58 | + if ($force) { |
|
59 | + WP_CLI::warning(__('There are too many concurrent batches, but the run is forced to continue.', 'action-scheduler')); |
|
60 | 60 | } else { |
61 | - WP_CLI::error( __( 'There are too many concurrent batches.', 'action-scheduler' ) ); |
|
61 | + WP_CLI::error(__('There are too many concurrent batches.', 'action-scheduler')); |
|
62 | 62 | } |
63 | 63 | } |
64 | 64 | |
65 | 65 | // Stake a claim and store it. |
66 | - $this->claim = $this->store->stake_claim( $batch_size, null, $hooks, $group ); |
|
67 | - $this->monitor->attach( $this->claim ); |
|
66 | + $this->claim = $this->store->stake_claim($batch_size, null, $hooks, $group); |
|
67 | + $this->monitor->attach($this->claim); |
|
68 | 68 | $this->actions = $this->claim->get_actions(); |
69 | 69 | |
70 | - return count( $this->actions ); |
|
70 | + return count($this->actions); |
|
71 | 71 | } |
72 | 72 | |
73 | 73 | /** |
@@ -76,9 +76,9 @@ discard block |
||
76 | 76 | * @author Jeremy Pry |
77 | 77 | */ |
78 | 78 | protected function add_hooks() { |
79 | - add_action( 'action_scheduler_before_execute', array( $this, 'before_execute' ) ); |
|
80 | - add_action( 'action_scheduler_after_execute', array( $this, 'after_execute' ), 10, 2 ); |
|
81 | - add_action( 'action_scheduler_failed_execution', array( $this, 'action_failed' ), 10, 2 ); |
|
79 | + add_action('action_scheduler_before_execute', array($this, 'before_execute')); |
|
80 | + add_action('action_scheduler_after_execute', array($this, 'after_execute'), 10, 2); |
|
81 | + add_action('action_scheduler_failed_execution', array($this, 'action_failed'), 10, 2); |
|
82 | 82 | } |
83 | 83 | |
84 | 84 | /** |
@@ -87,10 +87,10 @@ discard block |
||
87 | 87 | * @author Jeremy Pry |
88 | 88 | */ |
89 | 89 | protected function setup_progress_bar() { |
90 | - $count = count( $this->actions ); |
|
90 | + $count = count($this->actions); |
|
91 | 91 | $this->progress_bar = new ProgressBar( |
92 | 92 | /* translators: %d: amount of actions */ |
93 | - sprintf( _n( 'Running %d action', 'Running %d actions', $count, 'action-scheduler' ), number_format_i18n( $count ) ), |
|
93 | + sprintf(_n('Running %d action', 'Running %d actions', $count, 'action-scheduler'), number_format_i18n($count)), |
|
94 | 94 | $count |
95 | 95 | ); |
96 | 96 | } |
@@ -104,24 +104,24 @@ discard block |
||
104 | 104 | * |
105 | 105 | * @return int The number of actions processed. |
106 | 106 | */ |
107 | - public function run( $context = 'WP CLI' ) { |
|
108 | - do_action( 'action_scheduler_before_process_queue' ); |
|
107 | + public function run($context = 'WP CLI') { |
|
108 | + do_action('action_scheduler_before_process_queue'); |
|
109 | 109 | $this->setup_progress_bar(); |
110 | - foreach ( $this->actions as $action_id ) { |
|
110 | + foreach ($this->actions as $action_id) { |
|
111 | 111 | // Error if we lost the claim. |
112 | - if ( ! in_array( $action_id, $this->store->find_actions_by_claim_id( $this->claim->get_id() ) ) ) { |
|
113 | - WP_CLI::warning( __( 'The claim has been lost. Aborting current batch.', 'action-scheduler' ) ); |
|
112 | + if (!in_array($action_id, $this->store->find_actions_by_claim_id($this->claim->get_id()))) { |
|
113 | + WP_CLI::warning(__('The claim has been lost. Aborting current batch.', 'action-scheduler')); |
|
114 | 114 | break; |
115 | 115 | } |
116 | 116 | |
117 | - $this->process_action( $action_id, $context ); |
|
117 | + $this->process_action($action_id, $context); |
|
118 | 118 | $this->progress_bar->tick(); |
119 | 119 | } |
120 | 120 | |
121 | 121 | $completed = $this->progress_bar->current(); |
122 | 122 | $this->progress_bar->finish(); |
123 | - $this->store->release_claim( $this->claim ); |
|
124 | - do_action( 'action_scheduler_after_process_queue' ); |
|
123 | + $this->store->release_claim($this->claim); |
|
124 | + do_action('action_scheduler_after_process_queue'); |
|
125 | 125 | |
126 | 126 | return $completed; |
127 | 127 | } |
@@ -133,9 +133,9 @@ discard block |
||
133 | 133 | * |
134 | 134 | * @param $action_id |
135 | 135 | */ |
136 | - public function before_execute( $action_id ) { |
|
136 | + public function before_execute($action_id) { |
|
137 | 137 | /* translators: %s refers to the action ID */ |
138 | - WP_CLI::log( sprintf( __( 'Started processing action %s', 'action-scheduler' ), $action_id ) ); |
|
138 | + WP_CLI::log(sprintf(__('Started processing action %s', 'action-scheduler'), $action_id)); |
|
139 | 139 | } |
140 | 140 | |
141 | 141 | /** |
@@ -146,13 +146,13 @@ discard block |
||
146 | 146 | * @param int $action_id |
147 | 147 | * @param null|ActionScheduler_Action $action The instance of the action. Default to null for backward compatibility. |
148 | 148 | */ |
149 | - public function after_execute( $action_id, $action = null ) { |
|
149 | + public function after_execute($action_id, $action = null) { |
|
150 | 150 | // backward compatibility |
151 | - if ( null === $action ) { |
|
152 | - $action = $this->store->fetch_action( $action_id ); |
|
151 | + if (null === $action) { |
|
152 | + $action = $this->store->fetch_action($action_id); |
|
153 | 153 | } |
154 | 154 | /* translators: 1: action ID 2: hook name */ |
155 | - WP_CLI::log( sprintf( __( 'Completed processing action %1$s with hook: %2$s', 'action-scheduler' ), $action_id, $action->get_hook() ) ); |
|
155 | + WP_CLI::log(sprintf(__('Completed processing action %1$s with hook: %2$s', 'action-scheduler'), $action_id, $action->get_hook())); |
|
156 | 156 | } |
157 | 157 | |
158 | 158 | /** |
@@ -164,10 +164,10 @@ discard block |
||
164 | 164 | * @param Exception $exception |
165 | 165 | * @throws \WP_CLI\ExitException With failure message. |
166 | 166 | */ |
167 | - public function action_failed( $action_id, $exception ) { |
|
167 | + public function action_failed($action_id, $exception) { |
|
168 | 168 | WP_CLI::error( |
169 | 169 | /* translators: 1: action ID 2: exception message */ |
170 | - sprintf( __( 'Error processing action %1$s: %2$s', 'action-scheduler' ), $action_id, $exception->getMessage() ), |
|
170 | + sprintf(__('Error processing action %1$s: %2$s', 'action-scheduler'), $action_id, $exception->getMessage()), |
|
171 | 171 | false |
172 | 172 | ); |
173 | 173 | } |
@@ -178,8 +178,8 @@ discard block |
||
178 | 178 | * @param int $sleep_time Amount of seconds to sleep |
179 | 179 | * @deprecated 3.0.0 |
180 | 180 | */ |
181 | - protected function stop_the_insanity( $sleep_time = 0 ) { |
|
182 | - _deprecated_function( 'ActionScheduler_WPCLI_QueueRunner::stop_the_insanity', '3.0.0', 'ActionScheduler_DataController::free_memory' ); |
|
181 | + protected function stop_the_insanity($sleep_time = 0) { |
|
182 | + _deprecated_function('ActionScheduler_WPCLI_QueueRunner::stop_the_insanity', '3.0.0', 'ActionScheduler_DataController::free_memory'); |
|
183 | 183 | |
184 | 184 | ActionScheduler_DataController::free_memory(); |
185 | 185 | } |
@@ -189,8 +189,8 @@ discard block |
||
189 | 189 | */ |
190 | 190 | protected function maybe_stop_the_insanity() { |
191 | 191 | // The value returned by progress_bar->current() might be padded. Remove padding, and convert to int. |
192 | - $current_iteration = intval( trim( $this->progress_bar->current() ) ); |
|
193 | - if ( 0 === $current_iteration % 50 ) { |
|
192 | + $current_iteration = intval(trim($this->progress_bar->current())); |
|
193 | + if (0 === $current_iteration % 50) { |
|
194 | 194 | $this->stop_the_insanity(); |
195 | 195 | } |
196 | 196 | } |