From a249ad713760a33165f6bc6aececca2e4d6895d4 Mon Sep 17 00:00:00 2001 From: Ayesh Karunaratne Date: Mon, 14 Aug 2023 22:00:35 +0800 Subject: [PATCH] Fix DateTime exception hierarchy for DateInvalidTimeZoneException `DateInvalidTimeZoneException` is supposed to inherit from `DateException`, but the current stub has `Exception`. --- ext/date/php_date.stub.php | 2 +- ext/date/php_date_arginfo.h | 6 +++--- 2 files changed, 4 insertions(+), 4 deletions(-) diff --git a/ext/date/php_date.stub.php b/ext/date/php_date.stub.php index d987e80b96b84..e0717fa7f4c85 100644 --- a/ext/date/php_date.stub.php +++ b/ext/date/php_date.stub.php @@ -780,7 +780,7 @@ class DateException extends Exception /** * @strict-properties */ -class DateInvalidTimeZoneException extends Exception +class DateInvalidTimeZoneException extends DateException { } diff --git a/ext/date/php_date_arginfo.h b/ext/date/php_date_arginfo.h index eb298575296f7..bbede1f39596e 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: b967c9bbe6c73f56432473020a84919d7e953d4c */ + * Stub hash: 0f204ac6646be79b515189a384fce9bcea9a4f42 */ 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) @@ -1183,12 +1183,12 @@ static zend_class_entry *register_class_DateException(zend_class_entry *class_en return class_entry; } -static zend_class_entry *register_class_DateInvalidTimeZoneException(zend_class_entry *class_entry_Exception) +static zend_class_entry *register_class_DateInvalidTimeZoneException(zend_class_entry *class_entry_DateException) { zend_class_entry ce, *class_entry; INIT_CLASS_ENTRY(ce, "DateInvalidTimeZoneException", class_DateInvalidTimeZoneException_methods); - class_entry = zend_register_internal_class_ex(&ce, class_entry_Exception); + class_entry = zend_register_internal_class_ex(&ce, class_entry_DateException); class_entry->ce_flags |= ZEND_ACC_NO_DYNAMIC_PROPERTIES; return class_entry;