Skip to content

Commit 9fe4966

Browse files
committed
Remove null return type from msgfmt_parse_message()
This doesn't seem to possible. Only false is returned on failure.
1 parent d3083a4 commit 9fe4966

File tree

4 files changed

+6
-6
lines changed

4 files changed

+6
-6
lines changed

ext/intl/msgformat/msgformat.stub.php

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -34,7 +34,7 @@ public function parse(string $string): array|false {}
3434
* @tentative-return-type
3535
* @alias msgfmt_parse_message
3636
*/
37-
public static function parseMessage(string $locale, string $pattern, string $message): array|false|null {}
37+
public static function parseMessage(string $locale, string $pattern, string $message): array|false {}
3838

3939
/**
4040
* @tentative-return-type

ext/intl/msgformat/msgformat_arginfo.h

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,5 @@
11
/* This is a generated file, edit the .stub.php file instead.
2-
* Stub hash: c55f45648d120c74b84018da9786d49d9c203639 */
2+
* Stub hash: 3fc29ffe87caf85a84e97470d0b59a26c801457c */
33

44
ZEND_BEGIN_ARG_INFO_EX(arginfo_class_MessageFormatter___construct, 0, 0, 2)
55
ZEND_ARG_TYPE_INFO(0, locale, IS_STRING, 0)
@@ -25,7 +25,7 @@ ZEND_BEGIN_ARG_WITH_TENTATIVE_RETURN_TYPE_MASK_EX(arginfo_class_MessageFormatter
2525
ZEND_ARG_TYPE_INFO(0, string, IS_STRING, 0)
2626
ZEND_END_ARG_INFO()
2727

28-
ZEND_BEGIN_ARG_WITH_TENTATIVE_RETURN_TYPE_MASK_EX(arginfo_class_MessageFormatter_parseMessage, 0, 3, MAY_BE_ARRAY|MAY_BE_FALSE|MAY_BE_NULL)
28+
ZEND_BEGIN_ARG_WITH_TENTATIVE_RETURN_TYPE_MASK_EX(arginfo_class_MessageFormatter_parseMessage, 0, 3, MAY_BE_ARRAY|MAY_BE_FALSE)
2929
ZEND_ARG_TYPE_INFO(0, locale, IS_STRING, 0)
3030
ZEND_ARG_TYPE_INFO(0, pattern, IS_STRING, 0)
3131
ZEND_ARG_TYPE_INFO(0, message, IS_STRING, 0)

ext/intl/php_intl.stub.php

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -330,7 +330,7 @@ function msgfmt_format_message(string $locale, string $pattern, array $values):
330330

331331
function msgfmt_parse(MessageFormatter $formatter, string $string): array|false {}
332332

333-
function msgfmt_parse_message(string $locale, string $pattern, string $message): array|false|null {}
333+
function msgfmt_parse_message(string $locale, string $pattern, string $message): array|false {}
334334

335335
function msgfmt_set_pattern(MessageFormatter $formatter, string $pattern): bool {}
336336

ext/intl/php_intl_arginfo.h

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,5 @@
11
/* This is a generated file, edit the .stub.php file instead.
2-
* Stub hash: 131ce191e92704737b4f20d19ddf53c181e590a6 */
2+
* Stub hash: 65c3b7070a1cf1a23e07e35afa5cc367b36eaa57 */
33

44
ZEND_BEGIN_ARG_WITH_RETURN_OBJ_INFO_EX(arginfo_intlcal_create_instance, 0, 0, IntlCalendar, 1)
55
ZEND_ARG_INFO_WITH_DEFAULT_VALUE(0, timezone, "null")
@@ -582,7 +582,7 @@ ZEND_BEGIN_ARG_WITH_RETURN_TYPE_MASK_EX(arginfo_msgfmt_parse, 0, 2, MAY_BE_ARRAY
582582
ZEND_ARG_TYPE_INFO(0, string, IS_STRING, 0)
583583
ZEND_END_ARG_INFO()
584584

585-
ZEND_BEGIN_ARG_WITH_RETURN_TYPE_MASK_EX(arginfo_msgfmt_parse_message, 0, 3, MAY_BE_ARRAY|MAY_BE_FALSE|MAY_BE_NULL)
585+
ZEND_BEGIN_ARG_WITH_RETURN_TYPE_MASK_EX(arginfo_msgfmt_parse_message, 0, 3, MAY_BE_ARRAY|MAY_BE_FALSE)
586586
ZEND_ARG_TYPE_INFO(0, locale, IS_STRING, 0)
587587
ZEND_ARG_TYPE_INFO(0, pattern, IS_STRING, 0)
588588
ZEND_ARG_TYPE_INFO(0, message, IS_STRING, 0)

0 commit comments

Comments
 (0)