From: Christoph M. Becker <cmbecker69@gmx.de>
Date: Mon, 11 Nov 2019 14:39:52 +0000 (+0100)
Subject: iconv_strlen() cannot return a string
X-Git-Url: https://granicus.if.org/sourcecode?a=commitdiff_plain;h=dccd137e1a77d9ea04c2a0bb67eb1e14cd992b37;p=php

iconv_strlen() cannot return a string
---

diff --git a/ext/iconv/iconv.stub.php b/ext/iconv/iconv.stub.php
index 9fbbcd67a0..cd9bab3ad0 100644
--- a/ext/iconv/iconv.stub.php
+++ b/ext/iconv/iconv.stub.php
@@ -1,6 +1,6 @@
 <?php
 
-function iconv_strlen(string $str, string $charset = UNKNOWN): string|int|false {}
+function iconv_strlen(string $str, string $charset = UNKNOWN): int|false {}
 
 function iconv_substr(string $str, int $offset, ?int $length = null, string $charset = UNKNOWN): string|false {}
 
diff --git a/ext/iconv/iconv_arginfo.h b/ext/iconv/iconv_arginfo.h
index fcd6a5c348..51f11cf794 100644
--- a/ext/iconv/iconv_arginfo.h
+++ b/ext/iconv/iconv_arginfo.h
@@ -1,6 +1,6 @@
 /* This is a generated file, edit the .stub.php file instead. */
 
-ZEND_BEGIN_ARG_WITH_RETURN_TYPE_MASK_EX(arginfo_iconv_strlen, 0, 1, MAY_BE_STRING|MAY_BE_LONG|MAY_BE_FALSE)
+ZEND_BEGIN_ARG_WITH_RETURN_TYPE_MASK_EX(arginfo_iconv_strlen, 0, 1, MAY_BE_LONG|MAY_BE_FALSE)
 	ZEND_ARG_TYPE_INFO(0, str, IS_STRING, 0)
 	ZEND_ARG_TYPE_INFO(0, charset, IS_STRING, 0)
 ZEND_END_ARG_INFO()