From: Tyson Andre <tysonandre775@hotmail.com>
Date: Sun, 9 Jun 2019 20:55:56 +0000 (-0400)
Subject: Fix php 8.0's opcache flags for pathinfo()
X-Git-Url: https://granicus.if.org/sourcecode?a=commitdiff_plain;h=cdc82f19d8b6dc72f74abb819eab24589e3aa489;p=php

Fix php 8.0's opcache flags for pathinfo()

See https://php.net/pathinfo

This fixes a bug introduced in the cleanup for commit
0d79c70cf3c10f60a2e8fbfd68903d8716b7b43c

`pathinfo($str, PATHINFO_EXTENSION)` will always return a string
(if there is no extension, the function returns the empty string)
---

diff --git a/ext/opcache/Optimizer/zend_func_info.c b/ext/opcache/Optimizer/zend_func_info.c
index 55a6aa1727..1485c0a73b 100644
--- a/ext/opcache/Optimizer/zend_func_info.c
+++ b/ext/opcache/Optimizer/zend_func_info.c
@@ -194,7 +194,7 @@ static const func_info_t func_infos[] = {
 	FN("nl2br",                        MAY_BE_STRING),
 	F1("basename",                     MAY_BE_STRING),
 	F1("dirname",                      MAY_BE_NULL | MAY_BE_STRING),
-	F1("pathinfo",                     MAY_BE_ARRAY | MAY_BE_ARRAY_KEY_STRING | MAY_BE_ARRAY_OF_STRING),
+	F1("pathinfo",                     MAY_BE_STRING | MAY_BE_ARRAY | MAY_BE_ARRAY_KEY_STRING | MAY_BE_ARRAY_OF_STRING),
 	F1("stripslashes",                 MAY_BE_STRING),
 	F1("stripcslashes",                MAY_BE_STRING),
 	F1("strstr",                       MAY_BE_FALSE | MAY_BE_STRING),
diff --git a/ext/standard/string.c b/ext/standard/string.c
index 8fb256970d..5c56bb4f62 100644
--- a/ext/standard/string.c
+++ b/ext/standard/string.c
@@ -1666,7 +1666,7 @@ PHP_FUNCTION(dirname)
 }
 /* }}} */
 
-/* {{{ proto array pathinfo(string path[, int options])
+/* {{{ proto array|string pathinfo(string path[, int options])
    Returns information about a certain string */
 PHP_FUNCTION(pathinfo)
 {