Skip to content

Commit dae493a

Browse files
natanfellesnatanfelles
committed
Rename ssl keys
1 parent 4d87121 commit dae493a

2 files changed

Lines changed: 28 additions & 28 deletions

File tree

‎guide/index.rst‎

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -92,10 +92,10 @@ Below is the default class configuration. Normally, only the ``username``, the
9292
'enabled' => false,
9393
'verify' => true,
9494
'key' => null,
95-
'cert' => null,
96-
'ca' => null,
97-
'capath' => null,
98-
'cipher' => null,
95+
'certificate' => null,
96+
'ca_certificate' => null,
97+
'ca_path' => null,
98+
'cipher_algos' => null,
9999
],
100100
'failover' => [],
101101
'options' => [

‎src/Database.php‎

Lines changed: 24 additions & 24 deletions
Original file line numberDiff line numberDiff line change
@@ -61,10 +61,10 @@ class Database
6161
'enabled' => false,
6262
'verify' => true,
6363
'key' => null,
64-
'cert' => null,
65-
'ca' => null,
66-
'capath' => null,
67-
'cipher' => null,
64+
'certificate' => null,
65+
'ca_certificate' => null,
66+
'ca_path' => null,
67+
'cipher_algos' => null,
6868
],
6969
'failover' => [],
7070
'options' => [
@@ -99,10 +99,10 @@ class Database
9999
* enabled: bool,
100100
* verify: bool,
101101
* key: string|null,
102-
* cert: string|null,
103-
* ca: string|null,
104-
* capath: string|null,
105-
* cipher: string|null,
102+
* certificate: string|null,
103+
* ca_certificate: string|null,
104+
* ca_path: string|null,
105+
* cipher_algos: string|null,
106106
* },
107107
* failover: array<array<string,mixed>>,
108108
* options: array<int,int|string>,
@@ -146,10 +146,10 @@ class Database
146146
* enabled?: bool,
147147
* verify?: bool,
148148
* key?: string|null,
149-
* cert?: string|null,
150-
* ca?: string|null,
151-
* capath?: string|null,
152-
* cipher?: string|null,
149+
* certificate?: string|null,
150+
* ca_certificate?: string|null,
151+
* ca_path?: string|null,
152+
* cipher_algos?: string|null,
153153
* },
154154
* failover?: array<array<string,mixed>>,
155155
* options?: array<int,int|string>,
@@ -215,10 +215,10 @@ protected function log(string $message, LogLevel $level = LogLevel::ERROR) : voi
215215
* enabled: bool,
216216
* verify: bool,
217217
* key: string|null,
218-
* cert: string|null,
219-
* ca: string|null,
220-
* capath: string|null,
221-
* cipher: string|null,
218+
* certificate: string|null,
219+
* ca_certificate: string|null,
220+
* ca_path: string|null,
221+
* cipher_algos: string|null,
222222
* },
223223
* failover: array<array<string,mixed>>,
224224
* options: array<int,int|string>,
@@ -276,10 +276,10 @@ protected function connect(
276276
if ($config['ssl']['enabled'] === true) {
277277
$this->mysqli->ssl_set(
278278
$config['ssl']['key'],
279-
$config['ssl']['cert'],
280-
$config['ssl']['ca'],
281-
$config['ssl']['capath'],
282-
$config['ssl']['cipher']
279+
$config['ssl']['certificate'],
280+
$config['ssl']['ca_certificate'],
281+
$config['ssl']['ca_path'],
282+
$config['ssl']['cipher_algos']
283283
);
284284
$flags += \MYSQLI_CLIENT_SSL;
285285
if ($config['ssl']['verify'] === false) {
@@ -406,10 +406,10 @@ public function reconnect() : static
406406
* enabled: bool,
407407
* verify: bool,
408408
* key: string|null,
409-
* cert: string|null,
410-
* ca: string|null,
411-
* capath: string|null,
412-
* cipher: string|null,
409+
* certificate: string|null,
410+
* ca_certificate: string|null,
411+
* ca_path: string|null,
412+
* cipher_algos: string|null,
413413
* },
414414
* failover: array<array<string,mixed>>,
415415
* options: array<int,int|string>,

0 commit comments

Comments
 (0)