Skip to content

Commit 65763e9

Browse files
authoredApr 7, 2024
Merge branch refs/heads/1.10.x into 1.11.x
2 parents 9cbc619 + 28c5729 commit 65763e9

File tree

2 files changed

+12
-7
lines changed

2 files changed

+12
-7
lines changed
 

‎resources/functionMap.php

+6-6
Original file line numberDiff line numberDiff line change
@@ -7478,9 +7478,9 @@
74787478
'mysqli_fetch_all' => ['array|false', 'result'=>'mysqli_result', 'resulttype='=>'int'],
74797479
'mysqli_fetch_array' => ['array|null|false', 'result'=>'mysqli_result', 'resulttype='=>'int'],
74807480
'mysqli_fetch_assoc' => ['array<string,string>|null', 'result'=>'mysqli_result'],
7481-
'mysqli_fetch_field' => ['object|false', 'result'=>'mysqli_result'],
7482-
'mysqli_fetch_field_direct' => ['object|false', 'result'=>'mysqli_result', 'fieldnr'=>'int'],
7483-
'mysqli_fetch_fields' => ['array', 'result'=>'mysqli_result'],
7481+
'mysqli_fetch_field' => ['(stdClass&object{name: string, orgname: string, table: string, orgtable: string, def: string, db: string, catalog: "def", max_length: int, length: int, charsetnr: string, flags: int, type: int, decimals: int})|false', 'result'=>'mysqli_result'],
7482+
'mysqli_fetch_field_direct' => ['(stdClass&object{name: string, orgname: string, table: string, orgtable: string, def: string, db: string, catalog: "def", max_length: int, length: int, charsetnr: string, flags: int, type: int, decimals: int})|false', 'result'=>'mysqli_result', 'fieldnr'=>'int'],
7483+
'mysqli_fetch_fields' => ['list<stdClass&object{name: string, orgname: string, table: string, orgtable: string, def: string, db: string, catalog: "def", max_length: int, length: int, charsetnr: string, flags: int, type: int, decimals: int}>', 'result'=>'mysqli_result'],
74847484
'mysqli_fetch_lengths' => ['array|false', 'result'=>'mysqli_result'],
74857485
'mysqli_fetch_object' => ['object|null', 'result'=>'mysqli_result', 'class_name='=>'string', 'params='=>'?array'],
74867486
'mysqli_fetch_row' => ['array|null', 'result'=>'mysqli_result'],
@@ -7529,9 +7529,9 @@
75297529
'mysqli_result::fetch_all' => ['array', 'resulttype='=>'int'],
75307530
'mysqli_result::fetch_array' => ['array|null', 'resulttype='=>'int'],
75317531
'mysqli_result::fetch_assoc' => ['array<string,string>|null'],
7532-
'mysqli_result::fetch_field' => ['object|false'],
7533-
'mysqli_result::fetch_field_direct' => ['object|false', 'fieldnr'=>'int'],
7534-
'mysqli_result::fetch_fields' => ['array'],
7532+
'mysqli_result::fetch_field' => ['(stdClass&object{name: string, orgname: string, table: string, orgtable: string, def: string, db: string, catalog: "def", max_length: int, length: int, charsetnr: string, flags: int, type: int, decimals: int})|false'],
7533+
'mysqli_result::fetch_field_direct' => ['(stdClass&object{name: string, orgname: string, table: string, orgtable: string, def: string, db: string, catalog: "def", max_length: int, length: int, charsetnr: string, flags: int, type: int, decimals: int})|false', 'fieldnr'=>'int'],
7534+
'mysqli_result::fetch_fields' => ['list<stdClass&object{name: string, orgname: string, table: string, orgtable: string, def: string, db: string, catalog: "def", max_length: int, length: int, charsetnr: string, flags: int, type: int, decimals: int}>'],
75357535
'mysqli_result::fetch_object' => ['object|null', 'class_name='=>'string', 'params='=>'array'],
75367536
'mysqli_result::fetch_row' => ['array|null'],
75377537
'mysqli_result::field_seek' => ['bool', 'fieldnr'=>'int'],

‎resources/functionMap_php81delta.php

+6-1
Original file line numberDiff line numberDiff line change
@@ -21,7 +21,12 @@
2121
*/
2222
return [
2323
'new' => [
24-
24+
'mysqli_fetch_field' => ['(stdClass&object{name: string, orgname: string, table: string, orgtable: string, def: string, db: string, catalog: "def", max_length: 0, length: int, charsetnr: string, flags: int, type: int, decimals: int})|false', 'result'=>'mysqli_result'],
25+
'mysqli_fetch_field_direct' => ['(stdClass&object{name: string, orgname: string, table: string, orgtable: string, def: string, db: string, catalog: "def", max_length: 0, length: int, charsetnr: string, flags: int, type: int, decimals: int})|false', 'result'=>'mysqli_result', 'fieldnr'=>'int'],
26+
'mysqli_fetch_fields' => ['list<stdClass&object{name: string, orgname: string, table: string, orgtable: string, def: string, db: string, catalog: "def", max_length: 0, length: int, charsetnr: string, flags: int, type: int, decimals: int}>', 'result'=>'mysqli_result'],
27+
'mysqli_result::fetch_field' => ['(stdClass&object{name: string, orgname: string, table: string, orgtable: string, def: string, db: string, catalog: "def", max_length: 0, length: int, charsetnr: string, flags: int, type: int, decimals: int})|false'],
28+
'mysqli_result::fetch_field_direct' => ['(stdClass&object{name: string, orgname: string, table: string, orgtable: string, def: string, db: string, catalog: "def", max_length: 0, length: int, charsetnr: string, flags: int, type: int, decimals: int})|false', 'fieldnr'=>'int'],
29+
'mysqli_result::fetch_fields' => ['list<stdClass&object{name: string, orgname: string, table: string, orgtable: string, def: string, db: string, catalog: "def", max_length: 0, length: int, charsetnr: string, flags: int, type: int, decimals: int}>'],
2530
],
2631
'old' => [
2732
'pg_escape_bytea' => ['string', 'connection'=>'resource', 'data'=>'string'],

0 commit comments

Comments
 (0)
Please sign in to comment.