gian/phpmyadmin
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Remove $options parameter from fetchResult

Browse Source 
Signed-off-by: Kamil Tekiela <tekiela246@gmail.com>
This commit is contained in:
Kamil Tekiela 2021-12-30 00:12:24 +00:00
parent 83b4dda1a3
commit f38d3baa31
4 changed files with 19 additions and 35 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

20
libraries/classes/DatabaseInterface.php
View File

@ -1305,14 +1305,13 @@ class DatabaseInterface implements DbalInterface
* // $users['admin']['John Doe'] = '123'
* </code>
*
* @param string $query query to execute
* @param string|int|array|null $key field-name or offset
* used as key for array
* or array of those
* @param string|int|null $value value-name or offset
* used as value for array
* @param int $link link type
* @param int $options query options
* @param string $query query to execute
* @param string|int|array|null $key field-name or offset
* used as key for array
* or array of those
* @param string|int|null $value value-name or offset
* used as value for array
* @param int $link link type
*
* @return array resultrows or values indexed by $key
*/
@ -1320,12 +1319,11 @@ class DatabaseInterface implements DbalInterface
string $query,
$key = null,
$value = null,
$link = self::CONNECT_USER,
int $options = self::QUERY_BUFFERED
$link = self::CONNECT_USER
): array {
$resultrows = [];
$result = $this->tryQuery($query, $link, $options, false);
$result = $this->tryQuery($query, $link, self::QUERY_BUFFERED, false);
// return empty array if result is empty or false
if ($result === false) {

22
libraries/classes/Dbal/DbalInterface.php
View File

@ -378,16 +378,15 @@ interface DbalInterface
* // $users['admin']['John Doe'] = '123'
* </code>
*
* @param string $query query to execute
* @param string|int|array $key field-name or offset
* used as key for
* array or array of
* those
* @param string|int $value value-name or offset
* used as value for
* array
* @param int $link link type
* @param int $options query options
* @param string $query query to execute
* @param string|int|array $key field-name or offset
* used as key for
* array or array of
* those
* @param string|int $value value-name or offset
* used as value for
* array
* @param int $link link type
*
* @return array resultrows or values indexed by $key
*/
@ -395,8 +394,7 @@ interface DbalInterface
string $query,
$key = null,
$value = null,
$link = DatabaseInterface::CONNECT_USER,
int $options = 0
$link = DatabaseInterface::CONNECT_USER
): array;
/**

2
test/classes/Controllers/Server/VariablesControllerTest.php
View File

@ -64,7 +64,6 @@ class VariablesControllerTest extends AbstractTestCase
0,
1,
DatabaseInterface::CONNECT_USER,
0,
$serverSessionVariables,
],
[
@ -72,7 +71,6 @@ class VariablesControllerTest extends AbstractTestCase
0,
1,
DatabaseInterface::CONNECT_USER,
0,
$serverGlobalVariables,
],
];

10
test/classes/TableTest.php
View File

@ -89,7 +89,6 @@ class TableTest extends AbstractTestCase
null,
null,
DatabaseInterface::CONNECT_USER,
0,
['PMA_BookMark'],
],
[
@ -97,7 +96,6 @@ class TableTest extends AbstractTestCase
null,
null,
DatabaseInterface::CONNECT_USER,
0,
[],
],
[
@ -105,7 +103,6 @@ class TableTest extends AbstractTestCase
null,
null,
DatabaseInterface::CONNECT_USER,
0,
[],
],
[
@ -113,7 +110,6 @@ class TableTest extends AbstractTestCase
null,
null,
DatabaseInterface::CONNECT_USER,
0,
['PMA_BookMark'],
],
[
@ -121,7 +117,6 @@ class TableTest extends AbstractTestCase
null,
null,
DatabaseInterface::CONNECT_USER,
0,
[],
],
[
@ -129,7 +124,6 @@ class TableTest extends AbstractTestCase
null,
null,
DatabaseInterface::CONNECT_USER,
0,
[
[
'COLUMN_NAME' => 'COLUMN_NAME',
@ -145,7 +139,6 @@ class TableTest extends AbstractTestCase
],
'Column_name',
DatabaseInterface::CONNECT_USER,
0,
[
['index1'],
['index3'],
@ -157,7 +150,6 @@ class TableTest extends AbstractTestCase
'Column_name',
'Column_name',
DatabaseInterface::CONNECT_USER,
0,
[
'column1',
'column3',
@ -172,7 +164,6 @@ class TableTest extends AbstractTestCase
'Field',
'Field',
DatabaseInterface::CONNECT_USER,
0,
[
'column1',
'column3',
@ -187,7 +178,6 @@ class TableTest extends AbstractTestCase
null,
null,
DatabaseInterface::CONNECT_USER,
0,
[
[
'Field' => 'COLUMN_NAME1',