From bbf84bccf7f43859cb668ddbcaa0f9ca2c5f71de Mon Sep 17 00:00:00 2001
From: Sergey Biryukov <sergeybiryukov.ru@gmail.com>
Date: Mon, 5 Aug 2019 07:56:56 +0000
Subject: [PATCH] Docs: Correct `@type` annotation for
 `WP_HTTP_Cookie::$expires`.

Props diddledan.
Fixes #46859.
Built from https://develop.svn.wordpress.org/trunk@45748


git-svn-id: http://core.svn.wordpress.org/trunk@45559 1a063a9b-81f0-0310-95a4-ce76da25c4cd
---
 wp-includes/class-wp-http-cookie.php | 24 ++++++++++++------------
 wp-includes/version.php              |  2 +-
 2 files changed, 13 insertions(+), 13 deletions(-)

diff --git a/wp-includes/class-wp-http-cookie.php b/wp-includes/class-wp-http-cookie.php
index a062a0e0ab..24bfbbaf94 100644
--- a/wp-includes/class-wp-http-cookie.php
+++ b/wp-includes/class-wp-http-cookie.php
@@ -37,10 +37,10 @@ class WP_Http_Cookie {
 	public $value;
 
 	/**
-	 * When the cookie expires.
+	 * When the cookie expires. Unix timestamp or formatted date.
 	 *
 	 * @since 2.8.0
-	 * @var string
+	 * @var string|int|null
 	 */
 	public $expires;
 
@@ -80,13 +80,13 @@ class WP_Http_Cookie {
 	 * @param string|array $data {
 	 *     Raw cookie data as header string or data array.
 	 *
-	 *     @type string     $name      Cookie name.
-	 *     @type mixed      $value     Value. Should NOT already be urlencoded.
-	 *     @type string|int $expires   Optional. Unix timestamp or formatted date. Default null.
-	 *     @type string     $path      Optional. Path. Default '/'.
-	 *     @type string     $domain    Optional. Domain. Default host of parsed $requested_url.
-	 *     @type int        $port      Optional. Port. Default null.
-	 *     @type bool       $host_only Optional. host-only storage flag. Default true.
+	 *     @type string          $name      Cookie name.
+	 *     @type mixed           $value     Value. Should NOT already be urlencoded.
+	 *     @type string|int|null $expires   Optional. Unix timestamp or formatted date. Default null.
+	 *     @type string          $path      Optional. Path. Default '/'.
+	 *     @type string          $domain    Optional. Domain. Default host of parsed $requested_url.
+	 *     @type int             $port      Optional. Port. Default null.
+	 *     @type bool            $host_only Optional. host-only storage flag. Default true.
 	 * }
 	 * @param string       $requested_url The URL which the cookie was set on, used for default $domain
 	 *                                    and $port values.
@@ -246,9 +246,9 @@ class WP_Http_Cookie {
 	 * @return array {
 	 *    List of attributes.
 	 *
-	 *    @type string $expires When the cookie expires.
-	 *    @type string $path    Cookie URL path.
-	 *    @type string $domain  Cookie domain.
+	 *    @type string|int|null $expires When the cookie expires. Unix timestamp or formatted date.
+	 *    @type string          $path    Cookie URL path.
+	 *    @type string          $domain  Cookie domain.
 	 * }
 	 */
 	public function get_attributes() {
diff --git a/wp-includes/version.php b/wp-includes/version.php
index 296fdd4479..14e3518cf4 100644
--- a/wp-includes/version.php
+++ b/wp-includes/version.php
@@ -13,7 +13,7 @@
  *
  * @global string $wp_version
  */
-$wp_version = '5.3-alpha-45747';
+$wp_version = '5.3-alpha-45748';
 
 /**
  * Holds the WordPress DB revision, increments when changes are made to the WordPress DB schema.