Changeset 47550 for trunk/src/wp-content/themes/twentyfourteen/inc/widgets.php

Timestamp:

04/05/2020 03:00:44 AM (5 years ago)

Author:

SergeyBiryukov

Message:

Coding Standards: Use strict type check for in_array() and array_search() where strings are involved.

This reduces the number of WordPress.PHP.StrictInArray.MissingTrueStrict issues from 486 to 50.

Includes minor code layout fixes for better readability.

See #49542.

File:

• trunk/src/wp-content/themes/twentyfourteen/inc/widgets.php (modified) (4 diffs)

trunk/src/wp-content/themes/twentyfourteen/inc/widgets.php

@@ -72 +72 @@
      */
     public function widget( $args, $instance ) {
-        $format = isset( $instance['format'] ) && in_array( $instance['format'], $this->formats ) ? $instance['format'] : 'aside';
+        $format = isset( $instance['format'] ) ? $instance['format'] : '';
+
+        if ( ! $format || ! in_array( $format, $this->formats, true ) ) {
+            $format = 'aside';
+        }
 
         switch ( $format ) {
@@ -106 +110 @@
         }
 
-        $number = empty( $instance['number'] ) ? 2 : absint( $instance['number'] );
-        $title  = apply_filters( 'widget_title', empty( $instance['title'] ) ? $format_string : $instance['title'], $instance, $this->id_base );
+        $number = ! empty( $instance['number'] ) ? absint( $instance['number'] ) : 2;
+        $title  = ! empty( $instance['title'] ) ? $instance['title'] : $format_string;
+        $title  = apply_filters( 'widget_title', $title, $instance, $this->id_base );
 
         $ephemera = new WP_Query(
@@ -266 +271 @@
         $instance['title']  = strip_tags( $new_instance['title'] );
         $instance['number'] = empty( $new_instance['number'] ) ? 2 : absint( $new_instance['number'] );
-        if ( in_array( $new_instance['format'], $this->formats ) ) {
+
+        if ( in_array( $new_instance['format'], $this->formats, true ) ) {
             $instance['format'] = $new_instance['format'];
         }
@@ -281 +287 @@
      */
     function form( $instance ) {
-        $title  = empty( $instance['title'] ) ? '' : esc_attr( $instance['title'] );
-        $number = empty( $instance['number'] ) ? 2 : absint( $instance['number'] );
-        $format = isset( $instance['format'] ) && in_array( $instance['format'], $this->formats ) ? $instance['format'] : 'aside';
+        $title  = ! empty( $instance['title'] ) ? esc_attr( $instance['title'] ) : '';
+        $number = ! empty( $instance['number'] ) ? absint( $instance['number'] ) : 2;
+        $format = isset( $instance['format'] ) ? $instance['format'] : '';
+
+        if ( ! $format || ! in_array( $format, $this->formats, true ) ) {
+            $format = 'aside';
+        }
         ?>
             <p><label for="<?php echo esc_attr( $this->get_field_id( 'title' ) ); ?>"><?php _e( 'Title:', 'twentyfourteen' ); ?></label>