Skip to content

Commit 0d90f84

Browse files
authored
Merge pull request #6424 from kenjis/remove-mixed-in-db
docs: replace mixed in Database doc comments
2 parents f160747 + 2f244e3 commit 0d90f84

13 files changed

Lines changed: 18 additions & 17 deletions

File tree

system/Database/BaseConnection.php

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -562,7 +562,7 @@ public function addTableAlias(string $table)
562562
/**
563563
* Executes the query against the database.
564564
*
565-
* @return mixed
565+
* @return bool|object|resource
566566
*/
567567
abstract protected function execute(string $sql);
568568

system/Database/Forge.php

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -776,7 +776,7 @@ public function modifyColumn(string $table, $field): bool
776776
}
777777

778778
/**
779-
* @param mixed $fields
779+
* @param array|string $fields
780780
*
781781
* @return false|string|string[]
782782
*/

system/Database/MySQLi/Connection.php

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -277,7 +277,7 @@ public function getVersion(): string
277277
/**
278278
* Executes the query against the database.
279279
*
280-
* @return mixed
280+
* @return bool|object
281281
*/
282282
protected function execute(string $sql)
283283
{

system/Database/MySQLi/Forge.php

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -128,9 +128,9 @@ protected function _createTableAttributes(array $attributes): string
128128
/**
129129
* ALTER TABLE
130130
*
131-
* @param string $alterType ALTER type
132-
* @param string $table Table name
133-
* @param mixed $field Column definition
131+
* @param string $alterType ALTER type
132+
* @param string $table Table name
133+
* @param array|string $field Column definition
134134
*
135135
* @return string|string[]
136136
*/

system/Database/OCI8/Connection.php

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -184,7 +184,7 @@ public function getVersion(): string
184184
/**
185185
* Executes the query against the database.
186186
*
187-
* @return false|resource
187+
* @return bool
188188
*/
189189
protected function execute(string $sql)
190190
{

system/Database/OCI8/Forge.php

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -86,9 +86,9 @@ class Forge extends BaseForge
8686
/**
8787
* ALTER TABLE
8888
*
89-
* @param string $alterType ALTER type
90-
* @param string $table Table name
91-
* @param mixed $field Column definition
89+
* @param string $alterType ALTER type
90+
* @param string $table Table name
91+
* @param array|string $field Column definition
9292
*
9393
* @return string|string[]
9494
*/

system/Database/Postgre/Connection.php

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -132,7 +132,7 @@ public function getVersion(): string
132132
/**
133133
* Executes the query against the database.
134134
*
135-
* @return mixed
135+
* @return false|resource
136136
*/
137137
protected function execute(string $sql)
138138
{

system/Database/Postgre/Forge.php

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -76,7 +76,7 @@ protected function _createTableAttributes(array $attributes): string
7676
}
7777

7878
/**
79-
* @param mixed $field
79+
* @param array|string $field
8080
*
8181
* @return array|bool|string
8282
*/

system/Database/SQLSRV/Connection.php

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -451,7 +451,7 @@ public function setDatabase(?string $databaseName = null)
451451
/**
452452
* Executes the query against the database.
453453
*
454-
* @return mixed
454+
* @return false|resource
455455
*/
456456
protected function execute(string $sql)
457457
{

system/Database/SQLSRV/Forge.php

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -119,7 +119,7 @@ protected function _createTableAttributes(array $attributes): string
119119
}
120120

121121
/**
122-
* @param mixed $field
122+
* @param array|string $field
123123
*
124124
* @return false|string|string[]
125125
*/

0 commit comments

Comments
 (0)