Skip to content

Commit 1bf1481

Browse files
authored
Specify a few array func info entries (#7425)
1 parent d5b583a commit 1bf1481

File tree

7 files changed

+11
-11
lines changed

7 files changed

+11
-11
lines changed

Zend/Optimizer/zend_func_infos.h

+3-3
Original file line numberDiff line numberDiff line change
@@ -62,7 +62,7 @@ static const func_info_t func_infos[] = {
6262
F1("timezone_open", MAY_BE_OBJECT|MAY_BE_FALSE),
6363
F1("timezone_name_get", MAY_BE_STRING),
6464
F1("timezone_name_from_abbr", MAY_BE_STRING|MAY_BE_FALSE),
65-
F1("timezone_transitions_get", MAY_BE_ARRAY|MAY_BE_ARRAY_KEY_LONG|MAY_BE_ARRAY_KEY_STRING|MAY_BE_ARRAY_OF_ANY|MAY_BE_FALSE),
65+
F1("timezone_transitions_get", MAY_BE_ARRAY|MAY_BE_ARRAY_KEY_LONG|MAY_BE_ARRAY_OF_ARRAY|MAY_BE_FALSE),
6666
F1("timezone_location_get", MAY_BE_ARRAY|MAY_BE_ARRAY_KEY_STRING|MAY_BE_ARRAY_OF_DOUBLE|MAY_BE_ARRAY_OF_STRING|MAY_BE_FALSE),
6767
F1("timezone_identifiers_list", MAY_BE_ARRAY|MAY_BE_ARRAY_KEY_LONG|MAY_BE_ARRAY_OF_STRING),
6868
F1("timezone_abbreviations_list", MAY_BE_ARRAY|MAY_BE_ARRAY_KEY_STRING|MAY_BE_ARRAY_OF_ARRAY),
@@ -255,7 +255,7 @@ static const func_info_t func_infos[] = {
255255
F1("mysqli_fetch_object", MAY_BE_OBJECT|MAY_BE_NULL|MAY_BE_FALSE),
256256
F1("mysqli_fetch_row", MAY_BE_ARRAY|MAY_BE_ARRAY_KEY_LONG|MAY_BE_ARRAY_OF_ANY|MAY_BE_NULL|MAY_BE_FALSE),
257257
#if defined(MYSQLI_USE_MYSQLND)
258-
F1("mysqli_get_connection_stats", MAY_BE_ARRAY|MAY_BE_ARRAY_KEY_LONG|MAY_BE_ARRAY_KEY_STRING|MAY_BE_ARRAY_OF_ANY),
258+
F1("mysqli_get_connection_stats", MAY_BE_ARRAY|MAY_BE_ARRAY_KEY_STRING|MAY_BE_ARRAY_OF_ANY),
259259
#endif
260260
#if defined(MYSQLI_USE_MYSQLND)
261261
F1("mysqli_get_client_stats", MAY_BE_ARRAY|MAY_BE_ARRAY_KEY_STRING|MAY_BE_ARRAY_OF_STRING),
@@ -367,7 +367,7 @@ static const func_info_t func_infos[] = {
367367
F1("pg_result_error_field", MAY_BE_STRING|MAY_BE_FALSE|MAY_BE_NULL),
368368
F1("pg_get_result", MAY_BE_OBJECT|MAY_BE_FALSE),
369369
F1("pg_result_status", MAY_BE_STRING|MAY_BE_LONG),
370-
F1("pg_get_notify", MAY_BE_ARRAY|MAY_BE_ARRAY_KEY_LONG|MAY_BE_ARRAY_KEY_STRING|MAY_BE_ARRAY_OF_ANY),
370+
F1("pg_get_notify", MAY_BE_ARRAY|MAY_BE_ARRAY_KEY_LONG|MAY_BE_ARRAY_KEY_STRING|MAY_BE_ARRAY_OF_LONG|MAY_BE_ARRAY_OF_STRING),
371371
F1("pg_socket", MAY_BE_RESOURCE|MAY_BE_FALSE),
372372
F1("pg_meta_data", MAY_BE_ARRAY|MAY_BE_ARRAY_KEY_STRING|MAY_BE_ARRAY_OF_ARRAY|MAY_BE_FALSE),
373373
F1("pg_convert", MAY_BE_ARRAY|MAY_BE_ARRAY_KEY_STRING|MAY_BE_ARRAY_OF_ANY|MAY_BE_FALSE),

ext/date/php_date.stub.php

+2-2
Original file line numberDiff line numberDiff line change
@@ -124,7 +124,7 @@ function timezone_name_from_abbr(string $abbr, int $utcOffset = -1, int $isDST =
124124
function timezone_offset_get(DateTimeZone $object, DateTimeInterface $datetime): int {}
125125

126126
/**
127-
* @return array<int|string, mixed>|false
127+
* @return array<int, array>|false
128128
* @refcount 1
129129
*/
130130
function timezone_transitions_get(
@@ -414,7 +414,7 @@ public function getName(): string {}
414414
public function getOffset(DateTimeInterface $datetime): int {}
415415

416416
/**
417-
* @return array<int|string, mixed>|false
417+
* @return array<int, array>|false
418418
* @tentative-return-type
419419
* @alias timezone_transitions_get
420420
*/

ext/date/php_date_arginfo.h

+1-1
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: e4821eb3a38823fe1aee397d8e949fdcaa570a4f */
2+
* Stub hash: e4585948a8767182f38b553b603e06555e92c372 */
33

44
ZEND_BEGIN_ARG_WITH_RETURN_TYPE_MASK_EX(arginfo_strtotime, 0, 1, MAY_BE_LONG|MAY_BE_FALSE)
55
ZEND_ARG_TYPE_INFO(0, datetime, IS_STRING, 0)

ext/mysqli/mysqli.stub.php

+2-2
Original file line numberDiff line numberDiff line change
@@ -141,7 +141,7 @@ public function get_client_info(): string {}
141141

142142
#if defined(MYSQLI_USE_MYSQLND)
143143
/**
144-
* @return array<int|string, mixed>
144+
* @return array<string, mixed>
145145
* @tentative-return-type
146146
* @alias mysqli_get_connection_stats
147147
*/
@@ -727,7 +727,7 @@ function mysqli_free_result(mysqli_result $result): void {}
727727

728728
#if defined(MYSQLI_USE_MYSQLND)
729729
/**
730-
* @return array<int|string, mixed>
730+
* @return array<string, mixed>
731731
* @refcount 1
732732
*/
733733
function mysqli_get_connection_stats(mysqli $mysql): array {}

ext/mysqli/mysqli_arginfo.h

+1-1
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: be02e12b8984705bcaae9ce16a1e90cb64af5784 */
2+
* Stub hash: e9f4dd04e7d01864c38033bcaf5e03b63e191deb */
33

44
ZEND_BEGIN_ARG_WITH_RETURN_TYPE_MASK_EX(arginfo_mysqli_affected_rows, 0, 1, MAY_BE_LONG|MAY_BE_STRING)
55
ZEND_ARG_OBJ_INFO(0, mysql, mysqli, 0)

ext/pgsql/pgsql.stub.php

+1-1
Original file line numberDiff line numberDiff line change
@@ -470,7 +470,7 @@ function pg_get_result(PgSql\Connection $connection): PgSql\Result|false {}
470470
function pg_result_status(PgSql\Result $result, int $mode = PGSQL_STATUS_LONG): string|int {}
471471

472472
/**
473-
* @return array<int|string, mixed>
473+
* @return array<int|string, int|string>
474474
* @refcount 1
475475
*/
476476
function pg_get_notify(PgSql\Connection $connection, int $mode = PGSQL_ASSOC): array|false {}

ext/pgsql/pgsql_arginfo.h

+1-1
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: 23cb6cbb27e6ecf00c5ad4d18e6e8869a33a86bf */
2+
* Stub hash: b64120fb9848f9c2784b5b88608fdc532f8f0c15 */
33

44
ZEND_BEGIN_ARG_WITH_RETURN_OBJ_TYPE_MASK_EX(arginfo_pg_connect, 0, 1, PgSql\\Connection, MAY_BE_FALSE)
55
ZEND_ARG_TYPE_INFO(0, connection_string, IS_STRING, 0)

0 commit comments

Comments
 (0)