Skip to content

Commit c174fdb

Browse files
committed
refactor: remove inappropriate default values
These are the values for MySQLi.
1 parent aea4197 commit c174fdb

3 files changed

Lines changed: 5 additions & 5 deletions

File tree

phpstan-baseline.php

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -3168,7 +3168,7 @@
31683168
];
31693169
$ignoreErrors[] = [
31703170
'message' => '#^Construct empty\\(\\) is not allowed\\. Use more strict comparison\\.$#',
3171-
'count' => 6,
3171+
'count' => 4,
31723172
'path' => __DIR__ . '/system/Database/MySQLi/Forge.php',
31733173
];
31743174
$ignoreErrors[] = [

system/Database/BaseConnection.php

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -144,7 +144,7 @@ abstract class BaseConnection implements ConnectionInterface
144144
*
145145
* @var string
146146
*/
147-
protected $charset = 'utf8mb4';
147+
protected $charset = '';
148148

149149
/**
150150
* Collation
@@ -153,7 +153,7 @@ abstract class BaseConnection implements ConnectionInterface
153153
*
154154
* @var string
155155
*/
156-
protected $DBCollat = 'utf8mb4_general_ci';
156+
protected $DBCollat = '';
157157

158158
/**
159159
* Swap Prefix

system/Database/MySQLi/Forge.php

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -116,11 +116,11 @@ protected function _createTableAttributes(array $attributes): string
116116
}
117117
}
118118

119-
if (! empty($this->db->charset) && ! strpos($sql, 'CHARACTER SET') && ! strpos($sql, 'CHARSET')) {
119+
if ($this->db->charset !== '' && ! strpos($sql, 'CHARACTER SET') && ! strpos($sql, 'CHARSET')) {
120120
$sql .= ' DEFAULT CHARACTER SET = ' . $this->db->escapeString($this->db->charset);
121121
}
122122

123-
if (! empty($this->db->DBCollat) && ! strpos($sql, 'COLLATE')) {
123+
if ($this->db->DBCollat !== '' && ! strpos($sql, 'COLLATE')) {
124124
$sql .= ' COLLATE = ' . $this->db->escapeString($this->db->DBCollat);
125125
}
126126

0 commit comments

Comments
 (0)