diff --git a/ext/date/php_date.stub.php b/ext/date/php_date.stub.php
index 7ba05b8b6e062..35f7c81ec0e81 100644
--- a/ext/date/php_date.stub.php
+++ b/ext/date/php_date.stub.php
@@ -53,6 +53,7 @@
/**
* @var string
* @cvalue DATE_FORMAT_RFC7231
+ * @deprecated
*/
const DATE_RFC7231 = "D, d M Y H:i:s \\G\\M\\T";
@@ -300,7 +301,10 @@ interface DateTimeInterface
public const RFC1036 = DATE_RFC1036;
/** @var string */
public const RFC1123 = DATE_RFC1123;
- /** @var string */
+ /**
+ * @var string
+ * @deprecated
+ */
public const RFC7231 = DATE_RFC7231;
/** @var string */
public const RFC2822 = DATE_RFC2822;
diff --git a/ext/date/php_date_arginfo.h b/ext/date/php_date_arginfo.h
index 027bec67cb08d..33864c2610840 100644
--- a/ext/date/php_date_arginfo.h
+++ b/ext/date/php_date_arginfo.h
@@ -1,5 +1,5 @@
/* This is a generated file, edit the .stub.php file instead.
- * Stub hash: 1445f6053da5ca9dc7bb618f2eadc4a8ea56a15f */
+ * Stub hash: f8812b1d47b209147f74b027fb2e845613c1e156 */
ZEND_BEGIN_ARG_WITH_RETURN_TYPE_MASK_EX(arginfo_strtotime, 0, 1, MAY_BE_LONG|MAY_BE_FALSE)
ZEND_ARG_TYPE_INFO(0, datetime, IS_STRING, 0)
@@ -831,7 +831,7 @@ static void register_php_date_symbols(int module_number)
ZEND_ASSERT(strcmp(DATE_FORMAT_RFC1036, "D, d M y H:i:s O") == 0);
REGISTER_STRING_CONSTANT("DATE_RFC1123", DATE_FORMAT_RFC1123, CONST_PERSISTENT);
ZEND_ASSERT(strcmp(DATE_FORMAT_RFC1123, "D, d M Y H:i:s O") == 0);
- REGISTER_STRING_CONSTANT("DATE_RFC7231", DATE_FORMAT_RFC7231, CONST_PERSISTENT);
+ REGISTER_STRING_CONSTANT("DATE_RFC7231", DATE_FORMAT_RFC7231, CONST_PERSISTENT | CONST_DEPRECATED);
ZEND_ASSERT(strcmp(DATE_FORMAT_RFC7231, "D, d M Y H:i:s \\G\\M\\T") == 0);
REGISTER_STRING_CONSTANT("DATE_RFC2822", DATE_FORMAT_RFC2822, CONST_PERSISTENT);
ZEND_ASSERT(strcmp(DATE_FORMAT_RFC2822, "D, d M Y H:i:s O") == 0);
@@ -913,7 +913,7 @@ static zend_class_entry *register_class_DateTimeInterface(void)
zend_string *const_RFC7231_value_str = zend_string_init(DATE_FORMAT_RFC7231, strlen(DATE_FORMAT_RFC7231), 1);
ZVAL_STR(&const_RFC7231_value, const_RFC7231_value_str);
zend_string *const_RFC7231_name = zend_string_init_interned("RFC7231", sizeof("RFC7231") - 1, 1);
- zend_declare_class_constant_ex(class_entry, const_RFC7231_name, &const_RFC7231_value, ZEND_ACC_PUBLIC, NULL);
+ zend_declare_class_constant_ex(class_entry, const_RFC7231_name, &const_RFC7231_value, ZEND_ACC_PUBLIC|ZEND_ACC_DEPRECATED, NULL);
zend_string_release(const_RFC7231_name);
zval const_RFC2822_value;
diff --git a/ext/date/tests/DateTimeImmutable_constants.phpt b/ext/date/tests/DateTimeImmutable_constants.phpt
index 16de66e89f1e4..2a88323b5f9d9 100644
--- a/ext/date/tests/DateTimeImmutable_constants.phpt
+++ b/ext/date/tests/DateTimeImmutable_constants.phpt
@@ -21,7 +21,10 @@ var_dump(
);
?>
---EXPECT--
+--EXPECTF--
+Deprecated: Constant DATE_RFC7231 is deprecated in %s on line %d
+
+Deprecated: Constant DateTimeImmutable::RFC7231 is deprecated in %s on line %d
bool(true)
bool(true)
bool(true)
diff --git a/ext/date/tests/DateTimeInterface_constants.phpt b/ext/date/tests/DateTimeInterface_constants.phpt
index c740ea4d951b1..8f2eb180f6650 100644
--- a/ext/date/tests/DateTimeInterface_constants.phpt
+++ b/ext/date/tests/DateTimeInterface_constants.phpt
@@ -21,7 +21,10 @@ var_dump(
);
?>
---EXPECT--
+--EXPECTF--
+Deprecated: Constant DATE_RFC7231 is deprecated in %s on line %d
+
+Deprecated: Constant DateTimeInterface::RFC7231 is deprecated in %s on line %d
bool(true)
bool(true)
bool(true)
diff --git a/ext/date/tests/DateTime_constants.phpt b/ext/date/tests/DateTime_constants.phpt
index bca573d8f72aa..b48a60a42f747 100644
--- a/ext/date/tests/DateTime_constants.phpt
+++ b/ext/date/tests/DateTime_constants.phpt
@@ -21,7 +21,10 @@ var_dump(
);
?>
---EXPECT--
+--EXPECTF--
+Deprecated: Constant DATE_RFC7231 is deprecated in %s on line %d
+
+Deprecated: Constant DateTime::RFC7231 is deprecated in %s on line %d
bool(true)
bool(true)
bool(true)
diff --git a/ext/date/tests/DateTime_format_basic2.phpt b/ext/date/tests/DateTime_format_basic2.phpt
index 2946cf2c681f4..0556f9c2bd4d3 100644
--- a/ext/date/tests/DateTime_format_basic2.phpt
+++ b/ext/date/tests/DateTime_format_basic2.phpt
@@ -24,7 +24,7 @@ var_dump($date->format(DateTime::RSS));
var_dump($date->format(DateTime::W3C));
?>
---EXPECT--
+--EXPECTF--
*** Testing date_format() : basic functionality - formatting constants ***
string(25) "2005-07-14T22:30:41+01:00"
string(34) "Thursday, 14-Jul-2005 22:30:41 BST"
@@ -34,6 +34,8 @@ string(29) "Thu, 14 Jul 05 22:30:41 +0100"
string(32) "Thursday, 14-Jul-05 22:30:41 BST"
string(29) "Thu, 14 Jul 05 22:30:41 +0100"
string(31) "Thu, 14 Jul 2005 22:30:41 +0100"
+
+Deprecated: Constant DateTime::RFC7231 is deprecated in %s on line %d
string(29) "Thu, 14 Jul 2005 22:30:41 GMT"
string(31) "Thu, 14 Jul 2005 22:30:41 +0100"
string(25) "2005-07-14T22:30:41+01:00"
diff --git a/ext/date/tests/bug74080.phpt b/ext/date/tests/bug74080.phpt
deleted file mode 100644
index a86c78144e66e..0000000000000
--- a/ext/date/tests/bug74080.phpt
+++ /dev/null
@@ -1,11 +0,0 @@
---TEST--
-Bug #74080 Provide an RFC7231 date time format
---FILE--
-<?php
-
-$date = mktime(17, 52, 13, 4, 30, 2016);
-var_dump(date(\DateTime::RFC7231, $date));
-
-?>
---EXPECT--
-string(29) "Sat, 30 Apr 2016 17:52:13 GMT"
diff --git a/ext/date/tests/date_constants.phpt b/ext/date/tests/date_constants.phpt
index 27d933166555d..9b78bc5c391e7 100644
--- a/ext/date/tests/date_constants.phpt
+++ b/ext/date/tests/date_constants.phpt
@@ -44,7 +44,8 @@ Date constants
DATE_W3C == DateTime::W3C
);
?>
---EXPECT--
+--EXPECTF--
+Deprecated: Constant DATE_RFC7231 is deprecated in %s on line %d
string(25) "2006-07-01T14:27:30+02:00"
string(25) "2006-05-30T14:32:13+02:00"
string(35) "Saturday, 01-Jul-2006 14:27:30 CEST"
@@ -74,6 +75,10 @@ string(31) "Tue, 30 May 2006 14:32:13 +0200"
string(25) "2006-07-01T14:27:30+02:00"
string(25) "2006-05-30T14:32:13+02:00"
+
+Deprecated: Constant DATE_RFC7231 is deprecated in %s on line %d
+
+Deprecated: Constant DateTime::RFC7231 is deprecated in %s on line %d
bool(true)
bool(true)
bool(true)