Changeset 61767

Timestamp:

02/27/2026 11:17:12 PM (5 days ago)

Author:

westonruter

Message:

Code Quality: Replace void with null in union return types in Customizer classes.

Developed in ​https://github.com/WordPress/wordpress-develop/pull/11006

Follow-up to r61766, r61719, r61716.

Props apermo, xate, mukesh27.
See #64238.
Fixes #64701.

Location:

trunk/src/wp-includes

Files:

• class-wp-customize-manager.php (modified) (4 diffs)
• class-wp-customize-setting.php (modified) (4 diffs)
• class-wp-customize-widgets.php (modified) (3 diffs)
• customize/class-wp-customize-header-image-control.php (modified) (1 diff)

trunk/src/wp-includes/class-wp-customize-manager.php

@@ -3864 +3864 @@
      *
      * @param string $id Customize Setting ID.
-     * @return WP_Customize_Setting|void The setting, if set.
+     * @return WP_Customize_Setting| The setting, if set.
      */
     public function get_setting( $id ) {
@@ -3916 +3916 @@
      *
      * @param string $id Panel ID to get.
-     * @return WP_Customize_Panel|void Requested panel instance, if set.
+     * @return WP_Customize_Panel| Requested panel instance, if set.
      */
     public function get_panel( $id ) {
@@ -4012 +4012 @@
      *
      * @param string $id Section ID.
-     * @return WP_Customize_Section|void The section, if set.
+     * @return WP_Customize_Section| The section, if set.
      */
     public function get_section( $id ) {
@@ -4091 +4091 @@
      *
      * @param string $id ID of the control.
-     * @return WP_Customize_Control|void The control object, if set.
+     * @return WP_Customize_Control| The control object, if set.
      */
     public function get_control( $id ) {

trunk/src/wp-includes/class-wp-customize-setting.php

@@ -857 +857 @@
      * @param array $keys
      * @param bool  $create Default false.
-     * @return array|void Keys are 'root', 'node', and 'key'.
+     * @return array| Keys are 'root', 'node', and 'key'.
      */
     final protected function multidimensional( &$root, $keys, $create = false ) {
@@ -865 +865 @@
 
         if ( ! isset( $root ) || empty( $keys ) ) {
-            return;
+            return;
         }
 
@@ -877 +877 @@
 
             if ( ! is_array( $node ) || ! isset( $node[ $key ] ) ) {
-                return;
+                return;
             }
 
@@ -894 +894 @@
 
         if ( ! isset( $node[ $last ] ) ) {
-            return;
+            return;
         }
 

trunk/src/wp-includes/class-wp-customize-widgets.php

@@ -177 +177 @@
      *
      * @param string $setting_id Setting ID.
-     * @return string|void Setting type.
+     * @return string| Setting type.
      */
     protected function get_setting_type( $setting_id ) {
@@ -1455 +1455 @@
      * @param array  $value   Widget instance to sanitize.
      * @param string $id_base Optional. Base of the ID of the widget being sanitized. Default null.
-     * @return array|void Sanitized widget instance.
+     * @return array| Sanitized widget instance.
      */
     public function sanitize_widget_instance( $value, $id_base = null ) {
@@ -1484 +1484 @@
             empty( $value['encoded_serialized_instance'] )
         ) {
-            return;
+            return;
         }
 
         $decoded = base64_decode( $value['encoded_serialized_instance'], true );
         if ( false === $decoded ) {
-            return;
+            return;
         }
 
         if ( ! hash_equals( $this->get_instance_hash_key( $decoded ), $value['instance_hash_key'] ) ) {
-            return;
+            return;
         }
 
         $instance = unserialize( $decoded );
         if ( false === $instance ) {
-            return;
+            return;
         }
 

trunk/src/wp-includes/customize/class-wp-customize-header-image-control.php

@@ -194 +194 @@
      * @since 3.9.0
      *
-     * @return string|void
+     * @return string|
      */
     public function get_current_image_src() {