From 3ac8b6d87bcf3fe6283bcd68db048d1bc38be913 Mon Sep 17 00:00:00 2001 From: Kamil Tekiela Date: Thu, 11 May 2023 23:48:06 +0100 Subject: [PATCH] Use short lambdas Signed-off-by: Kamil Tekiela --- test/classes/Database/SearchTest.php | 4 +--- test/classes/Plugins/Export/ExportSqlTest.php | 16 ++++--------- test/classes/Plugins/Import/ImportLdiTest.php | 8 ++----- test/classes/Server/PrivilegesTest.php | 24 +++++-------------- test/classes/SystemDatabaseTest.php | 4 +--- test/classes/TableTest.php | 4 +--- test/classes/Tracking/TrackerTest.php | 4 +--- test/classes/UserPreferencesTest.php | 12 +++------- 8 files changed, 19 insertions(+), 57 deletions(-) diff --git a/test/classes/Database/SearchTest.php b/test/classes/Database/SearchTest.php index 280cb83008..f71d467be6 100644 --- a/test/classes/Database/SearchTest.php +++ b/test/classes/Database/SearchTest.php @@ -38,9 +38,7 @@ class SearchTest extends AbstractTestCase $dbi->expects($this->any()) ->method('quoteString') - ->will($this->returnCallback(static function (string $string) { - return "'" . $string . "'"; - })); + ->will($this->returnCallback(static fn (string $string): string => "'" . $string . "'")); $GLOBALS['dbi'] = $dbi; $this->object = new Search($dbi, 'pma_test', new Template()); diff --git a/test/classes/Plugins/Export/ExportSqlTest.php b/test/classes/Plugins/Export/ExportSqlTest.php index a4218a6c88..450abcb1b8 100644 --- a/test/classes/Plugins/Export/ExportSqlTest.php +++ b/test/classes/Plugins/Export/ExportSqlTest.php @@ -597,9 +597,7 @@ class ExportSqlTest extends AbstractTestCase ['SHOW CREATE EVENT `db`.`f2`', 'Create Event', Connection::TYPE_USER, 'f2event'], ])); $dbi->expects($this->any())->method('quoteString') - ->will($this->returnCallback(static function (string $string) { - return "'" . $string . "'"; - })); + ->will($this->returnCallback(static fn (string $string): string => "'" . $string . "'")); $GLOBALS['dbi'] = $dbi; @@ -684,9 +682,7 @@ class ExportSqlTest extends AbstractTestCase ->disableOriginalConstructor() ->getMock(); $dbi->expects($this->any())->method('quoteString') - ->will($this->returnCallback(static function (string $string) { - return "'" . $string . "'"; - })); + ->will($this->returnCallback(static fn (string $string): string => "'" . $string . "'")); $dbi->expects($this->any()) ->method('getColumns') @@ -726,9 +722,7 @@ class ExportSqlTest extends AbstractTestCase ->disableOriginalConstructor() ->getMock(); $dbi->expects($this->any())->method('quoteString') - ->will($this->returnCallback(static function (string $string) { - return "'" . $string . "'"; - })); + ->will($this->returnCallback(static fn (string $string): string => "'" . $string . "'")); $dbi->expects($this->any()) ->method('getColumns') @@ -1103,9 +1097,7 @@ SQL; [], ); $dbi->expects($this->any())->method('quoteString') - ->will($this->returnCallback(static function (string $string) { - return "'" . $string . "'"; - })); + ->will($this->returnCallback(static fn (string $string): string => "'" . $string . "'")); $tableObj = $this->getMockBuilder(Table::class) ->disableOriginalConstructor() diff --git a/test/classes/Plugins/Import/ImportLdiTest.php b/test/classes/Plugins/Import/ImportLdiTest.php index 012197469c..21c27b969d 100644 --- a/test/classes/Plugins/Import/ImportLdiTest.php +++ b/test/classes/Plugins/Import/ImportLdiTest.php @@ -125,9 +125,7 @@ class ImportLdiTest extends AbstractTestCase $GLOBALS['sql_query_disabled'] = false; $dbi = $this->createMock(DatabaseInterface::class); $dbi->expects($this->any())->method('quoteString') - ->will($this->returnCallback(static function (string $string) { - return "'" . $string . "'"; - })); + ->will($this->returnCallback(static fn (string $string): string => "'" . $string . "'")); $GLOBALS['dbi'] = $dbi; $importHandle = new File($GLOBALS['import_file']); @@ -178,9 +176,7 @@ class ImportLdiTest extends AbstractTestCase $GLOBALS['sql_query_disabled'] = false; $dbi = $this->createMock(DatabaseInterface::class); $dbi->expects($this->any())->method('quoteString') - ->will($this->returnCallback(static function (string $string) { - return "'" . $string . "'"; - })); + ->will($this->returnCallback(static fn (string $string): string => "'" . $string . "'")); $GLOBALS['dbi'] = $dbi; $GLOBALS['ldi_local_option'] = true; diff --git a/test/classes/Server/PrivilegesTest.php b/test/classes/Server/PrivilegesTest.php index 96581f9998..636277c618 100644 --- a/test/classes/Server/PrivilegesTest.php +++ b/test/classes/Server/PrivilegesTest.php @@ -490,9 +490,7 @@ class PrivilegesTest extends AbstractTestCase ->will($this->returnValue(8003)); $dbi->expects($this->any()) ->method('quoteString') - ->will($this->returnCallback(static function (string $string) { - return "'" . $string . "'"; - })); + ->will($this->returnCallback(static fn (string $string): string => "'" . $string . "'")); $serverPrivileges->dbi = $dbi; @@ -536,9 +534,7 @@ class PrivilegesTest extends AbstractTestCase ->will($this->returnValue(80011)); $dbi->expects($this->any()) ->method('quoteString') - ->will($this->returnCallback(static function (string $string) { - return "'" . $string . "'"; - })); + ->will($this->returnCallback(static fn (string $string): string => "'" . $string . "'")); $serverPrivileges->dbi = $dbi; @@ -839,9 +835,7 @@ class PrivilegesTest extends AbstractTestCase ->will($this->returnValue($fieldsInfo)); $dbi->expects($this->any()) ->method('quoteString') - ->will($this->returnCallback(static function (string $string) { - return "'" . $string . "'"; - })); + ->will($this->returnCallback(static fn (string $string): string => "'" . $string . "'")); $serverPrivileges->dbi = $dbi; @@ -907,9 +901,7 @@ class PrivilegesTest extends AbstractTestCase ->will($this->returnValue($fieldsInfo)); $dbi->expects($this->any()) ->method('quoteString') - ->will($this->returnCallback(static function (string $string) { - return "'" . $string . "'"; - })); + ->will($this->returnCallback(static fn (string $string): string => "'" . $string . "'")); $dbi->expects($this->any())->method('isGrantUser') ->will($this->returnValue(true)); @@ -1691,9 +1683,7 @@ class PrivilegesTest extends AbstractTestCase ); $dbi->expects($this->any()) ->method('quoteString') - ->will($this->returnCallback(static function (string $string) { - return "'" . $string . "'"; - })); + ->will($this->returnCallback(static fn (string $string): string => "'" . $string . "'")); $serverPrivileges->dbi = $dbi; @@ -1731,9 +1721,7 @@ class PrivilegesTest extends AbstractTestCase ->will($this->returnValue('Some error occurred!')); $dbi->expects($this->any()) ->method('quoteString') - ->will($this->returnCallback(static function (string $string) { - return "'" . $string . "'"; - })); + ->will($this->returnCallback(static fn (string $string): string => "'" . $string . "'")); $serverPrivileges->dbi = $dbi; diff --git a/test/classes/SystemDatabaseTest.php b/test/classes/SystemDatabaseTest.php index 5ed23dd3ec..a78f0b18f2 100644 --- a/test/classes/SystemDatabaseTest.php +++ b/test/classes/SystemDatabaseTest.php @@ -47,9 +47,7 @@ class SystemDatabaseTest extends AbstractTestCase $dbi->expects($this->any()) ->method('quoteString') - ->will($this->returnCallback(static function (string $string) { - return "'" . $string . "'"; - })); + ->will($this->returnCallback(static fn (string $string): string => "'" . $string . "'")); $relationParameters = RelationParameters::fromArray([ 'table_coords' => 'table_name', diff --git a/test/classes/TableTest.php b/test/classes/TableTest.php index 6a1975e3ce..895fa7aaed 100644 --- a/test/classes/TableTest.php +++ b/test/classes/TableTest.php @@ -262,9 +262,7 @@ class TableTest extends AbstractTestCase ->will($this->returnArgument(0)); $dbi->expects($this->any())->method('quoteString') - ->will($this->returnCallback(static function (string $string) { - return "'" . $string . "'"; - })); + ->will($this->returnCallback(static fn (string $string): string => "'" . $string . "'")); $GLOBALS['dbi'] = $dbi; } diff --git a/test/classes/Tracking/TrackerTest.php b/test/classes/Tracking/TrackerTest.php index aa1d8a270d..39001dea2d 100644 --- a/test/classes/Tracking/TrackerTest.php +++ b/test/classes/Tracking/TrackerTest.php @@ -216,9 +216,7 @@ class TrackerTest extends AbstractTestCase $dbi->expects($this->any())->method('getCompatibilities') ->will($this->returnValue([])); $dbi->expects($this->any())->method('quoteString') - ->will($this->returnCallback(static function (string $string) { - return "'" . $string . "'"; - })); + ->will($this->returnCallback(static fn (string $string): string => "'" . $string . "'")); $GLOBALS['dbi'] = $dbi; $this->assertTrue(Tracker::createVersion('pma_test', 'pma_tbl', '1', '11', true)); diff --git a/test/classes/UserPreferencesTest.php b/test/classes/UserPreferencesTest.php index 7b24600007..210628030c 100644 --- a/test/classes/UserPreferencesTest.php +++ b/test/classes/UserPreferencesTest.php @@ -107,9 +107,7 @@ class UserPreferencesTest extends AbstractNetworkTestCase ); $dbi->expects($this->any()) ->method('quoteString') - ->will($this->returnCallback(static function (string $string) { - return "'" . $string . "'"; - })); + ->will($this->returnCallback(static fn (string $string): string => "'" . $string . "'")); $userPreferences = new UserPreferences($dbi); $result = $userPreferences->load(); @@ -190,9 +188,7 @@ class UserPreferencesTest extends AbstractNetworkTestCase $dbi->expects($this->any()) ->method('quoteString') - ->will($this->returnCallback(static function (string $string) { - return "'" . $string . "'"; - })); + ->will($this->returnCallback(static fn (string $string): string => "'" . $string . "'")); $userPreferences = new UserPreferences($dbi); $result = $userPreferences->save([1]); @@ -226,9 +222,7 @@ class UserPreferencesTest extends AbstractNetworkTestCase ->will($this->returnValue('err1')); $dbi->expects($this->any()) ->method('quoteString') - ->will($this->returnCallback(static function (string $string) { - return "'" . $string . "'"; - })); + ->will($this->returnCallback(static fn (string $string): string => "'" . $string . "'")); $userPreferences = new UserPreferences($dbi); $result = $userPreferences->save([1]);