diff --git a/wp-admin/includes/class-wp-list-table.php b/wp-admin/includes/class-wp-list-table.php index ffd504f2be..33f72ee74e 100644 --- a/wp-admin/includes/class-wp-list-table.php +++ b/wp-admin/includes/class-wp-list-table.php @@ -73,6 +73,13 @@ class WP_List_Table { */ protected $modes = array(); + /** + * Stores the value returned by ->get_column_info() + * + * @var array + */ + protected $_column_headers; + /** * Constructor. * diff --git a/wp-includes/capabilities.php b/wp-includes/capabilities.php index d19026eaa3..94ba9dcbc2 100644 --- a/wp-includes/capabilities.php +++ b/wp-includes/capabilities.php @@ -415,6 +415,17 @@ class WP_Role { * @since 2.0.0 * @package WordPress * @subpackage User + * + * @property string $display_name + * @property string $nickname + * @property string $user_description + * @property string $user_email + * @property string $user_firstname + * @property string $user_lastname + * @property string $user_nicename + * @property string $user_pass + * @property string $user_registered + * @property string $user_url */ class WP_User { /** @@ -492,7 +503,6 @@ class WP_User { * @param int|string|stdClass|WP_User $id User's ID, a WP_User object, or a user object from the DB. * @param string $name Optional. User's username * @param int $blog_id Optional Blog ID, defaults to current blog. - * @return WP_User */ public function __construct( $id = 0, $name = '', $blog_id = '' ) { if ( ! isset( self::$back_compat_keys ) ) { diff --git a/wp-includes/class-wp-image-editor-imagick.php b/wp-includes/class-wp-image-editor-imagick.php index d51ea8e334..5dc326f021 100644 --- a/wp-includes/class-wp-image-editor-imagick.php +++ b/wp-includes/class-wp-image-editor-imagick.php @@ -329,7 +329,6 @@ class WP_Image_Editor_Imagick extends WP_Image_Editor { * @since 3.5.0 * @access public * - * @param string|int $src The source file or Attachment ID. * @param int $src_x The start x position to crop from. * @param int $src_y The start y position to crop from. * @param int $src_w The width to crop. diff --git a/wp-includes/class-wp-image-editor.php b/wp-includes/class-wp-image-editor.php index 0eb14aebb8..58643d42e4 100644 --- a/wp-includes/class-wp-image-editor.php +++ b/wp-includes/class-wp-image-editor.php @@ -125,7 +125,6 @@ abstract class WP_Image_Editor { * @access public * @abstract * - * @param string|int $src The source file or Attachment ID. * @param int $src_x The start x position to crop from. * @param int $src_y The start y position to crop from. * @param int $src_w The width to crop. diff --git a/wp-includes/formatting.php b/wp-includes/formatting.php index ddeff9a1e0..c4f7614457 100644 --- a/wp-includes/formatting.php +++ b/wp-includes/formatting.php @@ -3522,7 +3522,7 @@ function wp_pre_kses_less_than_callback( $matches ) { * @link http://www.php.net/sprintf * * @param string $pattern The string which formatted args are inserted. - * @param mixed $args,... Arguments to be formatted into the $pattern string. + * @param mixed $args ,... Arguments to be formatted into the $pattern string. * @return string The formatted string. */ function wp_sprintf( $pattern ) { diff --git a/wp-includes/post.php b/wp-includes/post.php index 20da79a7cd..692f5d3f63 100644 --- a/wp-includes/post.php +++ b/wp-includes/post.php @@ -455,6 +455,11 @@ function get_post( $post = null, $output = OBJECT, $filter = 'raw' ) { * * @since 3.5.0 * + * @property-read array $ancestors + * @property-read string $page_template + * @property-read int $post_category + * @property-read string $tag_input + * */ final class WP_Post { diff --git a/wp-includes/version.php b/wp-includes/version.php index 9f6b61cc21..30bb468996 100644 --- a/wp-includes/version.php +++ b/wp-includes/version.php @@ -4,7 +4,7 @@ * * @global string $wp_version */ -$wp_version = '4.2-alpha-31126'; +$wp_version = '4.2-alpha-31127'; /** * Holds the WordPress DB revision, increments when changes are made to the WordPress DB schema.