Skip to content

Commit 4833309

Browse files
committed
Use typed properties in ext/mysqli
Closes GH-6739
1 parent f7751f2 commit 4833309

8 files changed

+201
-290
lines changed

ext/mysqli/mysqli.stub.php

Lines changed: 43 additions & 82 deletions
Original file line numberDiff line numberDiff line change
@@ -4,77 +4,56 @@
44

55
final class mysqli_driver
66
{
7-
/** @var string|null */
8-
public $client_info;
7+
public string $client_info;
98

10-
/** @var int|null */
11-
public $client_version;
9+
public int $client_version;
1210

13-
/** @var int|null */
14-
public $driver_version;
11+
public int $driver_version;
1512

16-
/** @var bool|null */
17-
public $reconnect;
13+
/** @var bool */
14+
public $reconnect = false;
1815

19-
/** @var int|null */
20-
public $report_mode;
16+
/** @var int */
17+
public $report_mode = 0;
2118
}
2219

2320
class mysqli
2421
{
25-
/** @var int|string|null */
26-
public $affected_rows;
22+
public int|string $affected_rows;
2723

28-
/** @var string|null */
29-
public $client_info;
24+
public string $client_info;
3025

31-
/** @var string|null */
32-
public $client_version;
26+
public int $client_version;
3327

34-
/** @var int|null */
35-
public $connect_errno;
28+
public int $connect_errno;
3629

37-
/** @var string|null */
38-
public $connect_error;
30+
public ?string $connect_error;
3931

40-
/** @var int|string|null */
41-
public $errno;
32+
public int $errno;
4233

43-
/** @var string|null */
44-
public $error;
34+
public string $error;
4535

46-
/** @var array|null */
47-
public $error_list;
36+
public array $error_list;
4837

49-
/** @var int|null */
50-
public $field_count;
38+
public int $field_count;
5139

52-
/** @var string|null */
53-
public $host_info;
40+
public string $host_info;
5441

55-
/** @var string|null */
56-
public $info;
42+
public ?string $info;
5743

58-
/** @var int|string|null */
59-
public $insert_id;
44+
public int|string $insert_id;
6045

61-
/** @var string|null */
62-
public $server_info;
46+
public string $server_info;
6347

64-
/** @var int|string|null */
65-
public $server_version;
48+
public int $server_version;
6649

67-
/** @var string|null */
68-
public $sqlstate;
50+
public string $sqlstate;
6951

70-
/** @var int|string|null */
71-
public $protocol_version;
52+
public int $protocol_version;
7253

73-
/** @var int|string|null */
74-
public $thread_id;
54+
public int $thread_id;
7555

76-
/** @var int|string|null */
77-
public $warning_count;
56+
public int $warning_count;
7857

7958
public function __construct(
8059
?string $hostname = null,
@@ -370,20 +349,15 @@ public function refresh(int $flags) {}
370349

371350
class mysqli_result implements IteratorAggregate
372351
{
373-
/** @var int|string|null */
374-
public $current_field;
352+
public int $current_field;
375353

376-
/** @var int|string|null */
377-
public $field_count;
354+
public int $field_count;
378355

379-
/** @var array|null */
380-
public $lengths;
356+
public ?array $lengths;
381357

382-
/** @var int|string|null */
383-
public $num_rows;
358+
public int|string $num_rows;
384359

385-
/** @var int|null */
386-
public $type;
360+
public int $type;
387361

388362
public function __construct(mysqli $mysql, int $result_mode = MYSQLI_STORE_RESULT) {}
389363

@@ -470,35 +444,25 @@ public function getIterator(): Iterator;
470444

471445
class mysqli_stmt
472446
{
473-
/** @var int|string|null */
474-
public $affected_rows;
447+
public int|string $affected_rows;
475448

476-
/** @var int|string|null */
477-
public $insert_id;
449+
public int|string $insert_id;
478450

479-
/** @var int|string|null */
480-
public $num_rows;
451+
public int|string $num_rows;
481452

482-
/** @var int|string|null */
483-
public $param_count;
453+
public int $param_count;
484454

485-
/** @var int|string|null */
486-
public $field_count;
455+
public int $field_count;
487456

488-
/** @var int|string|null */
489-
public $errno;
457+
public int $errno;
490458

491-
/** @var string|null */
492-
public $error;
459+
public string $error;
493460

494-
/** @var array|null */
495-
public $error_list;
461+
public array $error_list;
496462

497-
/** @var string|null */
498-
public $sqlstate;
463+
public string $sqlstate;
499464

500-
/** @var int|null */
501-
public $id;
465+
public int $id;
502466

503467
public function __construct(mysqli $mysql, ?string $query = null) {}
504468

@@ -623,14 +587,11 @@ public function get_result() {}
623587

624588
final class mysqli_warning
625589
{
626-
/** @var string|null */
627-
public $message;
590+
public string $message;
628591

629-
/** @var string|null */
630-
public $sqlstate;
592+
public string $sqlstate;
631593

632-
/** @var int|null */
633-
public $errno;
594+
public int $errno;
634595

635596
private function __construct() {}
636597

0 commit comments

Comments
 (0)