Changeset 61995

Timestamp:

03/12/2026 08:18:18 PM (2 weeks ago)

Author:

johnjamesjacoby

Message:

Docs: Correct lone @param null usages around some $deprecated vars.

Update incorrect uses of null as a single parameter type to be mixed instead, largely targeting $deprecated variable names.

Pipe | a few nulls with other valid types where appropriate.

Add a missing empty new-line between the _deprecated_file() and _deprecated_argument() functions.

See #64224.

Location:

trunk/src/wp-includes

Files:

• category-template.php (modified) (1 diff)
• class-wp-block-parser.php (modified) (1 diff)
• class-wp-widget.php (modified) (1 diff)
• functions.php (modified) (2 diffs)
• ms-blogs.php (modified) (1 diff)
• ms-deprecated.php (modified) (2 diffs)
• pluggable.php (modified) (1 diff)

trunk/src/wp-includes/category-template.php

@@ -1259 +1259 @@
  * @since 4.9.2 The `$taxonomy` parameter was deprecated.
  *
- * @param int  $term       Optional. Term ID. Defaults to the current term ID.
- * @param null $deprecated Deprecated. Not used.
+ * @param int   $term       Optional. Term ID. Defaults to the current term ID.
+ * @param mixed $deprecated Not used.
  * @return string Term description, if available.
  */

trunk/src/wp-includes/class-wp-block-parser.php

@@ -319 +319 @@
      * @internal
      * @since 5.0.0
-     * @param null $length how many bytes of document text to output.
+     * @param null|int $length How many bytes of document text to output.
      */
     public function add_freeform( $length = null ) {

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

@@ -547 +547 @@
              * @since 2.8.0
              *
-             * @param WP_Widget $widget   The widget instance (passed by reference).
-             * @param null      $return   Return null if new fields are added.
-             * @param array     $instance An array of the widget's settings.
+             * @param WP_Widget   $widget   The widget instance (passed by reference).
+             * @param null|string $return   Default 'noform'. Return null if new fields are added.
+             * @param array       $instance An array of the widget's settings.
              */
             do_action_ref_array( 'in_widget_form', array( &$this, &$return, $instance ) );

trunk/src/wp-includes/functions.php

@@ -2887 +2887 @@
  *
  * @param string      $name       Filename.
- * @param null|string $deprecated Never used. Set to null.
+ * @param null|string $deprecated Not used. Set to null.
  * @param string      $bits       File content
  * @param string|null $time       Optional. Time formatted in 'yyyy/mm'. Default null.
@@ -5854 +5854 @@
     }
 }
+
 /**
  * Marks a function argument as deprecated and inform when it has been used.

trunk/src/wp-includes/ms-blogs.php

@@ -756 +756 @@
  * @param string $pref       Field name.
  * @param string $value      Field value.
- * @param null   $deprecated Not used.
+ * @param mixed  $deprecated Not used.
  * @return string|false $value
  */

trunk/src/wp-includes/ms-deprecated.php

@@ -695 +695 @@
  *
  * @since 3.0.0
+ * @since 3.0.2 Deprecated fourth argument.
  * @deprecated 5.3.0 Use wp_update_user()
  * @see wp_update_user()
@@ -704 +705 @@
  *                           in (presumably user_status, spam, or deleted).
  * @param int    $value      The new status for the user.
- * @param null   $deprecated Deprecated as of 3.0.2 and should not be used.
+ * @param mixed  $deprecated Not used.
  * @return int   The initially passed $value.
  */

trunk/src/wp-includes/pluggable.php

@@ -2264 +2264 @@
      *
      * @param int    $user_id    User ID.
-     * @param null   $deprecated Not used (argument deprecated).
+     * @param mixed  $deprecated Not used.
      * @param string $notify     Optional. Type of notification that should happen. Accepts 'admin' or an empty
      *                           string (admin only), 'user', or 'both' (admin and user). Default empty.