Skip to content

Commit 133fdbb

Browse files
westonruterwestonruter
committed
Code Modernization: Widgets: Use null coalescing operator instead of isset() ternaries.
Developed as a subset of #10654 Initially developed in #4886 Follow-up to [61431], [61430], [61429], [61424], [61404], [61403]. Props costdev, westonruter. See #58874, #63430. git-svn-id: https://develop.svn.wordpress.org/trunk@61432 602fd350-edb4-49c9-b593-d223f7449a82
1 parent 5ed1e08 commit 133fdbb

File tree

9 files changed

+35
-35
lines changed

9 files changed

+35
-35
lines changed

‎src/wp-admin/includes/widgets.php‎

Lines changed: 14 additions & 14 deletions
Original file line numberDiff line numberDiff line change
@@ -137,7 +137,7 @@ function wp_list_widget_controls_dynamic_sidebar( $params ) {
137137
++$i;
138138

139139
$widget_id = $params[0]['widget_id'];
140-
$id = isset( $params[0]['_temp_id'] ) ? $params[0]['_temp_id'] : $widget_id;
140+
$id = $params[0]['_temp_id'] ?? $widget_id;
141141
$hidden = isset( $params[0]['_hide'] ) ? ' style="display:none;"' : '';
142142

143143
$params[0]['before_widget'] = "<div id='widget-{$i}_{$id}' class='widget'$hidden>";
@@ -191,23 +191,23 @@ function wp_widget_control( $sidebar_args ) {
191191
global $wp_registered_widgets, $wp_registered_widget_controls, $sidebars_widgets;
192192

193193
$widget_id = $sidebar_args['widget_id'];
194-
$sidebar_id = isset( $sidebar_args['id'] ) ? $sidebar_args['id'] : false;
194+
$sidebar_id = $sidebar_args['id'] ?? false;
195195
$key = $sidebar_id ? array_search( $widget_id, $sidebars_widgets[ $sidebar_id ], true ) : '-1'; // Position of widget in sidebar.
196-
$control = isset( $wp_registered_widget_controls[ $widget_id ] ) ? $wp_registered_widget_controls[ $widget_id ] : array();
196+
$control = $wp_registered_widget_controls[ $widget_id ] ?? array();
197197
$widget = $wp_registered_widgets[ $widget_id ];
198198

199199
$id_format = $widget['id'];
200-
$widget_number = isset( $control['params'][0]['number'] ) ? $control['params'][0]['number'] : '';
201-
$id_base = isset( $control['id_base'] ) ? $control['id_base'] : $widget_id;
202-
$width = isset( $control['width'] ) ? $control['width'] : '';
203-
$height = isset( $control['height'] ) ? $control['height'] : '';
204-
$multi_number = isset( $sidebar_args['_multi_num'] ) ? $sidebar_args['_multi_num'] : '';
205-
$add_new = isset( $sidebar_args['_add'] ) ? $sidebar_args['_add'] : '';
206-
207-
$before_form = isset( $sidebar_args['before_form'] ) ? $sidebar_args['before_form'] : '<form method="post">';
208-
$after_form = isset( $sidebar_args['after_form'] ) ? $sidebar_args['after_form'] : '</form>';
209-
$before_widget_content = isset( $sidebar_args['before_widget_content'] ) ? $sidebar_args['before_widget_content'] : '<div class="widget-content">';
210-
$after_widget_content = isset( $sidebar_args['after_widget_content'] ) ? $sidebar_args['after_widget_content'] : '</div>';
200+
$widget_number = $control['params'][0]['number'] ?? '';
201+
$id_base = $control['id_base'] ?? $widget_id;
202+
$width = $control['width'] ?? '';
203+
$height = $control['height'] ?? '';
204+
$multi_number = $sidebar_args['_multi_num'] ?? '';
205+
$add_new = $sidebar_args['_add'] ?? '';
206+
207+
$before_form = $sidebar_args['before_form'] ?? '<form method="post">';
208+
$after_form = $sidebar_args['after_form'] ?? '</form>';
209+
$before_widget_content = $sidebar_args['before_widget_content'] ?? '<div class="widget-content">';
210+
$after_widget_content = $sidebar_args['after_widget_content'] ?? '</div>';
211211

212212
$query_arg = array( 'editwidget' => $widget['id'] );
213213
if ( $add_new ) {

‎src/wp-admin/widgets-form.php‎

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -139,7 +139,7 @@
139139
$position = isset( $_POST[ $sidebar_id . '_position' ] ) ? (int) $_POST[ $sidebar_id . '_position' ] - 1 : 0;
140140

141141
$id_base = $_POST['id_base'];
142-
$sidebar = isset( $sidebars_widgets[ $sidebar_id ] ) ? $sidebars_widgets[ $sidebar_id ] : array();
142+
$sidebar = $sidebars_widgets[ $sidebar_id ] ?? array();
143143

144144
// Delete.
145145
if ( isset( $_POST['removewidget'] ) && $_POST['removewidget'] ) {
@@ -261,14 +261,14 @@
261261
}
262262

263263
if ( ! isset( $sidebar ) ) {
264-
$sidebar = isset( $_GET['sidebar'] ) ? $_GET['sidebar'] : 'wp_inactive_widgets';
264+
$sidebar = $_GET['sidebar'] ?? 'wp_inactive_widgets';
265265
}
266266

267267
if ( ! isset( $multi_number ) ) {
268-
$multi_number = isset( $control['params'][0]['number'] ) ? $control['params'][0]['number'] : '';
268+
$multi_number = $control['params'][0]['number'] ?? '';
269269
}
270270

271-
$id_base = isset( $control['id_base'] ) ? $control['id_base'] : $control['id'];
271+
$id_base = $control['id_base'] ?? $control['id'];
272272

273273
// Show the widget form.
274274
$width = ' style="width:' . max( $control['width'], 350 ) . 'px"';

‎src/wp-includes/class-wp-widget.php‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -447,7 +447,7 @@ public function update_callback( $deprecated = 1 ) {
447447
$new_instance = stripslashes_deep( $new_instance );
448448
$this->_set( $number );
449449

450-
$old_instance = isset( $all_instances[ $number ] ) ? $all_instances[ $number ] : array();
450+
$old_instance = $all_instances[ $number ] ?? array();
451451

452452
$was_cache_addition_suspended = wp_suspend_cache_addition();
453453
if ( $this->is_preview() && ! $was_cache_addition_suspended ) {

‎src/wp-includes/widgets.php‎

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -190,7 +190,7 @@ function register_sidebars( $number = 1, $args = array() ) {
190190
$_args['name'] = sprintf( __( 'Sidebar %d' ), $i );
191191
}
192192
} else {
193-
$_args['name'] = isset( $args['name'] ) ? $args['name'] : __( 'Sidebar' );
193+
$_args['name'] = $args['name'] ?? __( 'Sidebar' );
194194
}
195195

196196
/*
@@ -1495,7 +1495,7 @@ function wp_map_sidebars_widgets( $existing_sidebars_widgets ) {
14951495

14961496
// Sidebars_widgets settings from when this theme was previously active.
14971497
$old_sidebars_widgets = get_theme_mod( 'sidebars_widgets' );
1498-
$old_sidebars_widgets = isset( $old_sidebars_widgets['data'] ) ? $old_sidebars_widgets['data'] : false;
1498+
$old_sidebars_widgets = $old_sidebars_widgets['data'] ?? false;
14991499

15001500
if ( is_array( $old_sidebars_widgets ) ) {
15011501

@@ -1718,8 +1718,8 @@ function wp_widget_rss_form( $args, $inputs = null ) {
17181718
);
17191719
$inputs = wp_parse_args( $inputs, $default_inputs );
17201720

1721-
$args['title'] = isset( $args['title'] ) ? $args['title'] : '';
1722-
$args['url'] = isset( $args['url'] ) ? $args['url'] : '';
1721+
$args['title'] = $args['title'] ?? '';
1722+
$args['url'] = $args['url'] ?? '';
17231723
$args['items'] = isset( $args['items'] ) ? (int) $args['items'] : 0;
17241724

17251725
if ( $args['items'] < 1 || 20 < $args['items'] ) {

‎src/wp-includes/widgets/class-wp-nav-menu-widget.php‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -143,8 +143,8 @@ public function update( $new_instance, $old_instance ) {
143143
*/
144144
public function form( $instance ) {
145145
global $wp_customize;
146-
$title = isset( $instance['title'] ) ? $instance['title'] : '';
147-
$nav_menu = isset( $instance['nav_menu'] ) ? $instance['nav_menu'] : '';
146+
$title = $instance['title'] ?? '';
147+
$nav_menu = $instance['nav_menu'] ?? '';
148148

149149
// Get menus.
150150
$menus = wp_get_nav_menus();

‎src/wp-includes/widgets/class-wp-widget-custom-html.php‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -139,7 +139,7 @@ public function widget( $args, $instance ) {
139139
$simulated_text_widget_instance = array_merge(
140140
$instance,
141141
array(
142-
'text' => isset( $instance['content'] ) ? $instance['content'] : '',
142+
'text' => $instance['content'] ?? '',
143143
'filter' => false, // Because wpautop is not applied.
144144
'visual' => false, // Because it wasn't created in TinyMCE.
145145
)

‎src/wp-includes/widgets/class-wp-widget-links.php‎

Lines changed: 7 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -39,14 +39,14 @@ public function __construct() {
3939
* @param array $instance Settings for the current Links widget instance.
4040
*/
4141
public function widget( $args, $instance ) {
42-
$show_description = isset( $instance['description'] ) ? $instance['description'] : false;
43-
$show_name = isset( $instance['name'] ) ? $instance['name'] : false;
44-
$show_rating = isset( $instance['rating'] ) ? $instance['rating'] : false;
45-
$show_images = isset( $instance['images'] ) ? $instance['images'] : true;
46-
$category = isset( $instance['category'] ) ? $instance['category'] : false;
47-
$orderby = isset( $instance['orderby'] ) ? $instance['orderby'] : 'name';
42+
$show_description = $instance['description'] ?? false;
43+
$show_name = $instance['name'] ?? false;
44+
$show_rating = $instance['rating'] ?? false;
45+
$show_images = $instance['images'] ?? true;
46+
$category = $instance['category'] ?? false;
47+
$orderby = $instance['orderby'] ?? 'name';
4848
$order = 'rating' === $orderby ? 'DESC' : 'ASC';
49-
$limit = isset( $instance['limit'] ) ? $instance['limit'] : -1;
49+
$limit = $instance['limit'] ?? -1;
5050

5151
$before_widget = preg_replace( '/ id="[^"]*"/', ' id="%id"', $args['before_widget'] );
5252

‎src/wp-includes/widgets/class-wp-widget-recent-comments.php‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -185,7 +185,7 @@ public function update( $new_instance, $old_instance ) {
185185
* @param array $instance Current settings.
186186
*/
187187
public function form( $instance ) {
188-
$title = isset( $instance['title'] ) ? $instance['title'] : '';
188+
$title = $instance['title'] ?? '';
189189
$number = isset( $instance['number'] ) ? absint( $instance['number'] ) : 5;
190190
?>
191191
<p>

‎src/wp-includes/widgets/class-wp-widget-recent-posts.php‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -56,7 +56,7 @@ public function widget( $args, $instance ) {
5656
if ( ! $number ) {
5757
$number = 5;
5858
}
59-
$show_date = isset( $instance['show_date'] ) ? $instance['show_date'] : false;
59+
$show_date = $instance['show_date'] ?? false;
6060

6161
$r = new WP_Query(
6262
/**

0 commit comments

Comments
 (0)