From: William Desportes Date: Sat, 19 Apr 2025 20:43:26 +0200 Subject: Fix tests for phpunit 12 And PHPUnit 13 for testGetCollationsMariaDB Origin: vendor Forwarded: not-needed --- test/classes/AbstractNetworkTestCase.php | 2 +- test/classes/CharsetsTest.php | 2 +- test/classes/Config/FormDisplayTest.php | 2 +- test/classes/ConfigStorage/RelationTest.php | 9 +- test/classes/ConfigStorage/UserGroupsTest.php | 14 +- .../Structure/FavoriteTableControllerTest.php | 3 +- .../Database/StructureControllerTest.php | 6 +- .../Controllers/Server/PluginsControllerTest.php | 5 +- .../Controllers/Server/VariablesControllerTest.php | 2 +- .../Table/FindReplaceControllerTest.php | 6 +- .../Controllers/Table/IndexesControllerTest.php | 10 +- .../Controllers/Table/RelationControllerTest.php | 22 +-- .../Controllers/Table/SearchControllerTest.php | 8 +- test/classes/Database/CentralColumnsTest.php | 80 +++++---- test/classes/Database/Designer/CommonTest.php | 22 +-- test/classes/Database/DesignerTest.php | 4 +- test/classes/Database/EventsTest.php | 2 +- test/classes/Database/QbeTest.php | 4 +- test/classes/Database/RoutinesTest.php | 36 ++-- test/classes/Database/SearchTest.php | 6 +- test/classes/DatabaseInterfaceTest.php | 6 +- test/classes/Export/OptionsTest.php | 6 +- test/classes/Gis/GisGeometryTest.php | 2 +- test/classes/InsertEditTest.php | 62 +++---- test/classes/Navigation/NavigationTest.php | 4 +- .../Navigation/Nodes/NodeDatabaseChildTest.php | 11 +- test/classes/Navigation/Nodes/NodeTest.php | 16 +- test/classes/NormalizationTest.php | 24 ++- .../Plugins/Auth/AuthenticationCookieTest.php | 32 ++-- .../Plugins/Auth/AuthenticationHttpTest.php | 7 +- .../Plugins/Auth/AuthenticationSignonTest.php | 4 +- test/classes/Plugins/Export/ExportHtmlwordTest.php | 40 ++--- test/classes/Plugins/Export/ExportLatexTest.php | 24 +-- .../classes/Plugins/Export/ExportMediawikiTest.php | 2 +- test/classes/Plugins/Export/ExportOdsTest.php | 22 +-- test/classes/Plugins/Export/ExportOdtTest.php | 42 ++--- test/classes/Plugins/Export/ExportSqlTest.php | 188 ++++++++++----------- test/classes/Plugins/Export/ExportTexytextTest.php | 14 +- test/classes/Plugins/Export/ExportXmlTest.php | 20 +-- test/classes/Plugins/Import/ImportLdiTest.php | 10 +- .../Options/OptionsPropertyGroupTest.php | 2 +- .../Properties/Options/OptionsPropertyItemTest.php | 2 +- .../Options/OptionsPropertyOneItemTest.php | 2 +- .../Properties/Plugins/PluginPropertyItemTest.php | 2 +- test/classes/Properties/PropertyItemTest.php | 2 +- test/classes/Server/PrivilegesTest.php | 88 +++++----- test/classes/Setup/FormProcessingTest.php | 10 +- test/classes/StorageEngineTest.php | 20 +-- test/classes/SystemDatabaseTest.php | 22 ++- test/classes/Table/IndexesTest.php | 6 +- test/classes/TableTest.php | 46 +++-- test/classes/ThemeManagerTest.php | 2 +- test/classes/TrackerTest.php | 82 +++++---- test/classes/TransformationsTest.php | 2 +- test/classes/UserPreferencesTest.php | 28 ++- test/classes/UtilTest.php | 22 +-- test/classes/Utils/ForeignKeyTest.php | 10 +- test/classes/Utils/GisTest.php | 6 +- test/classes/VersionInformationTest.php | 2 +- 59 files changed, 543 insertions(+), 594 deletions(-) diff --git a/test/classes/AbstractNetworkTestCase.php b/test/classes/AbstractNetworkTestCase.php index 84dabd6..97e4928 100644 --- a/test/classes/AbstractNetworkTestCase.php +++ b/test/classes/AbstractNetworkTestCase.php @@ -62,7 +62,7 @@ abstract class AbstractNetworkTestCase extends AbstractTestCase $mockResponse->expects($this->any()) ->method('headersSent') ->with() - ->will($this->returnValue(false)); + ->willReturn(false); if (count($param) > 0) { if (is_array($param[0])) { diff --git a/test/classes/CharsetsTest.php b/test/classes/CharsetsTest.php index 9071ffb..98ef135 100644 --- a/test/classes/CharsetsTest.php +++ b/test/classes/CharsetsTest.php @@ -94,7 +94,7 @@ class CharsetsTest extends AbstractTestCase $this->dbi->setVersion(['@@version' => '10.10.0-MariaDB']); $collations = Charsets::getCollations($this->dbi, false); self::assertCount(4, $collations); - self::assertContainsOnly('array', $collations); + self::assertContainsOnlyArray($collations); foreach ($collations as $collation) { self::assertContainsOnlyInstancesOf(Charsets\Collation::class, $collation); } diff --git a/test/classes/Config/FormDisplayTest.php b/test/classes/Config/FormDisplayTest.php index 0ae773b..c63deac 100644 --- a/test/classes/Config/FormDisplayTest.php +++ b/test/classes/Config/FormDisplayTest.php @@ -111,7 +111,7 @@ class FormDisplayTest extends AbstractTestCase $this->object->expects($this->once()) ->method('save') ->with([0, 1, 2], false) - ->will($this->returnValue(true)); + ->willReturn(true); self::assertTrue($this->object->process(false, false)); diff --git a/test/classes/ConfigStorage/RelationTest.php b/test/classes/ConfigStorage/RelationTest.php index a21b6e2..ef7e2b5 100644 --- a/test/classes/ConfigStorage/RelationTest.php +++ b/test/classes/ConfigStorage/RelationTest.php @@ -89,7 +89,7 @@ class RelationTest extends AbstractTestCase ], ]; $dbi->expects($this->any())->method('getColumns') - ->will($this->returnValue($getColumnsResult)); + ->willReturn($getColumnsResult); $GLOBALS['dbi'] = $dbi; $this->relation->dbi = $GLOBALS['dbi']; @@ -117,13 +117,12 @@ class RelationTest extends AbstractTestCase ->getMock(); $dbi->expects($this->any()) ->method('tryQueryAsControlUser') - ->will($this->returnValue($resultStub)); + ->willReturn($resultStub); $resultStub->expects($this->any()) ->method('numRows') - ->will($this->returnValue(0)); + ->willReturn(0); $dbi->expects($this->any()) - ->method('getError') - ->will($this->onConsecutiveCalls('Error', '')); + ->method('getError')->willReturnOnConsecutiveCalls('Error', ''); $GLOBALS['dbi'] = $dbi; $this->relation->dbi = $GLOBALS['dbi']; diff --git a/test/classes/ConfigStorage/UserGroupsTest.php b/test/classes/ConfigStorage/UserGroupsTest.php index 8cbd8c4..9a55c95 100644 --- a/test/classes/ConfigStorage/UserGroupsTest.php +++ b/test/classes/ConfigStorage/UserGroupsTest.php @@ -58,10 +58,10 @@ class UserGroupsTest extends AbstractTestCase $dbi->expects($this->once()) ->method('tryQueryAsControlUser') ->with($expectedQuery) - ->will($this->returnValue($resultStub)); + ->willReturn($resultStub); $resultStub->expects($this->once()) ->method('numRows') - ->will($this->returnValue(0)); + ->willReturn(0); $GLOBALS['dbi'] = $dbi; $html = UserGroups::getHtmlForUserGroupsTable($this->configurableMenusFeature); @@ -105,7 +105,7 @@ class UserGroupsTest extends AbstractTestCase ->method('queryAsControlUser'); $dbi->expects($this->any()) ->method('escapeString') - ->will($this->returnArgument(0)); + ->willReturnArgument(0); $GLOBALS['dbi'] = $dbi; @@ -131,10 +131,10 @@ class UserGroupsTest extends AbstractTestCase $dbi->expects($this->once()) ->method('tryQueryAsControlUser') ->with($expectedQuery) - ->will($this->returnValue($resultStub)); + ->willReturn($resultStub); $resultStub->expects($this->exactly(1)) ->method('getIterator') - ->will($this->returnCallback(static function (): Generator { + ->willReturnCallback(static function (): Generator { yield from [ [ 'usergroup' => 'user
group', @@ -142,10 +142,10 @@ class UserGroupsTest extends AbstractTestCase 'allowed' => 'Y', ], ]; - })); + }); $dbi->expects($this->any()) ->method('escapeString') - ->will($this->returnArgument(0)); + ->willReturnArgument(0); $GLOBALS['dbi'] = $dbi; diff --git a/test/classes/Controllers/Database/Structure/FavoriteTableControllerTest.php b/test/classes/Controllers/Database/Structure/FavoriteTableControllerTest.php index 8737ac8..75db9e9 100644 --- a/test/classes/Controllers/Database/Structure/FavoriteTableControllerTest.php +++ b/test/classes/Controllers/Database/Structure/FavoriteTableControllerTest.php @@ -30,8 +30,7 @@ class FavoriteTableControllerTest extends AbstractTestCase ->disableOriginalConstructor() ->getMock(); $favoriteInstance->expects($this->exactly(2)) - ->method('getTables') - ->will($this->onConsecutiveCalls([[]], [['db' => 'db', 'table' => 'table']])); + ->method('getTables')->willReturnOnConsecutiveCalls([[]], [['db' => 'db', 'table' => 'table']]); $class = new ReflectionClass(FavoriteTableController::class); $method = $class->getMethod('synchronizeFavoriteTables'); diff --git a/test/classes/Controllers/Database/StructureControllerTest.php b/test/classes/Controllers/Database/StructureControllerTest.php index a75eb29..2fb989d 100644 --- a/test/classes/Controllers/Database/StructureControllerTest.php +++ b/test/classes/Controllers/Database/StructureControllerTest.php @@ -65,15 +65,15 @@ class StructureControllerTest extends AbstractTestCase ->getMock(); // Expect the table will have 6 rows $table->expects($this->any())->method('getRealRowCountTable') - ->will($this->returnValue(6)); + ->willReturn(6); $table->expects($this->any())->method('countRecords') - ->will($this->returnValue(6)); + ->willReturn(6); $dbi = $this->getMockBuilder(DatabaseInterface::class) ->disableOriginalConstructor() ->getMock(); $dbi->expects($this->any())->method('getTable') - ->will($this->returnValue($table)); + ->willReturn($table); $GLOBALS['dbi'] = $dbi; diff --git a/test/classes/Controllers/Server/PluginsControllerTest.php b/test/classes/Controllers/Server/PluginsControllerTest.php index d7277fd..c96f8b1 100644 --- a/test/classes/Controllers/Server/PluginsControllerTest.php +++ b/test/classes/Controllers/Server/PluginsControllerTest.php @@ -60,10 +60,9 @@ class PluginsControllerTest extends AbstractTestCase ->getMock(); $dbi->expects($this->once()) ->method('query') - ->will($this->returnValue($resultStub)); + ->willReturn($resultStub); $resultStub->expects($this->exactly(2)) - ->method('fetchAssoc') - ->will($this->onConsecutiveCalls($row, [])); + ->method('fetchAssoc')->willReturnOnConsecutiveCalls($row, []); $response = new ResponseRenderer(); diff --git a/test/classes/Controllers/Server/VariablesControllerTest.php b/test/classes/Controllers/Server/VariablesControllerTest.php index f995866..8436731 100644 --- a/test/classes/Controllers/Server/VariablesControllerTest.php +++ b/test/classes/Controllers/Server/VariablesControllerTest.php @@ -77,7 +77,7 @@ class VariablesControllerTest extends AbstractTestCase ]; $dbi->expects($this->any())->method('fetchResult') - ->will($this->returnValueMap($fetchResult)); + ->willReturnMap($fetchResult); $GLOBALS['dbi'] = $dbi; } diff --git a/test/classes/Controllers/Table/FindReplaceControllerTest.php b/test/classes/Controllers/Table/FindReplaceControllerTest.php index 075b2c0..a952100 100644 --- a/test/classes/Controllers/Table/FindReplaceControllerTest.php +++ b/test/classes/Controllers/Table/FindReplaceControllerTest.php @@ -50,7 +50,7 @@ class FindReplaceControllerTest extends AbstractTestCase ], ]; $dbi->expects($this->any())->method('getColumns') - ->will($this->returnValue($columns)); + ->willReturn($columns); $show_create_table = "CREATE TABLE `table` ( `id` int(11) NOT NULL AUTO_INCREMENT, @@ -64,9 +64,9 @@ class FindReplaceControllerTest extends AbstractTestCase . "COMMENT='table'"; $dbi->expects($this->any())->method('fetchValue') - ->will($this->returnValue($show_create_table)); + ->willReturn($show_create_table); $dbi->expects($this->any())->method('escapeString') - ->will($this->returnArgument(0)); + ->willReturnArgument(0); $GLOBALS['dbi'] = $dbi; } diff --git a/test/classes/Controllers/Table/IndexesControllerTest.php b/test/classes/Controllers/Table/IndexesControllerTest.php index 20dcc97..884ae87 100644 --- a/test/classes/Controllers/Table/IndexesControllerTest.php +++ b/test/classes/Controllers/Table/IndexesControllerTest.php @@ -73,7 +73,7 @@ class IndexesControllerTest extends AbstractTestCase ]; $dbi->expects($this->any())->method('getTableIndexes') - ->will($this->returnValue($indexs)); + ->willReturn($indexs); $GLOBALS['dbi'] = $dbi; @@ -89,14 +89,14 @@ class IndexesControllerTest extends AbstractTestCase ->disableOriginalConstructor() ->getMock(); $table->expects($this->any())->method('getStatusInfo') - ->will($this->returnValue('')); + ->willReturn(''); $table->expects($this->any())->method('isView') - ->will($this->returnValue(false)); + ->willReturn(false); $table->expects($this->any())->method('getNameAndTypeOfTheColumns') - ->will($this->returnValue(['field_name' => 'field_type'])); + ->willReturn(['field_name' => 'field_type']); $GLOBALS['dbi']->expects($this->any())->method('getTable') - ->will($this->returnValue($table)); + ->willReturn($table); $response = new ResponseStub(); $index = new Index(); diff --git a/test/classes/Controllers/Table/RelationControllerTest.php b/test/classes/Controllers/Table/RelationControllerTest.php index 727c2fc..c951710 100644 --- a/test/classes/Controllers/Table/RelationControllerTest.php +++ b/test/classes/Controllers/Table/RelationControllerTest.php @@ -86,12 +86,12 @@ class RelationControllerTest extends AbstractTestCase ->getMock(); // Test the situation when the table is a view $tableMock->expects($this->any())->method('isView') - ->will($this->returnValue(true)); + ->willReturn(true); $tableMock->expects($this->any())->method('getColumns') - ->will($this->returnValue($viewColumns)); + ->willReturn($viewColumns); $GLOBALS['dbi']->expects($this->any())->method('getTable') - ->will($this->returnValue($tableMock)); + ->willReturn($tableMock); $ctrl = new RelationController( $this->response, @@ -121,12 +121,12 @@ class RelationControllerTest extends AbstractTestCase ->getMock(); // Test the situation when the table is a view $tableMock->expects($this->any())->method('isView') - ->will($this->returnValue(false)); + ->willReturn(false); $tableMock->expects($this->any())->method('getIndexedColumns') - ->will($this->returnValue($indexedColumns)); + ->willReturn($indexedColumns); $GLOBALS['dbi']->expects($this->any())->method('getTable') - ->will($this->returnValue($tableMock)); + ->willReturn($tableMock); $ctrl = new RelationController( $this->response, @@ -153,18 +153,18 @@ class RelationControllerTest extends AbstractTestCase $GLOBALS['dbi']->expects($this->exactly(1)) ->method('query') - ->will($this->returnValue($resultStub)); + ->willReturn($resultStub); $resultStub->expects($this->any()) ->method('getIterator') - ->will($this->returnCallback(static function (): Generator { + ->willReturnCallback(static function (): Generator { yield from [ [ 'Engine' => 'InnoDB', 'Name' => 'table', ], ]; - })); + }); $ctrl = new RelationController( $this->response, @@ -192,11 +192,11 @@ class RelationControllerTest extends AbstractTestCase $GLOBALS['dbi']->expects($this->exactly(1)) ->method('query') - ->will($this->returnValue($resultStub)); + ->willReturn($resultStub); $resultStub->expects($this->any()) ->method('fetchAllColumn') - ->will($this->returnValue(['table'])); + ->willReturn(['table']); $ctrl = new RelationController( $this->response, diff --git a/test/classes/Controllers/Table/SearchControllerTest.php b/test/classes/Controllers/Table/SearchControllerTest.php index d806c1e..3e93bac 100644 --- a/test/classes/Controllers/Table/SearchControllerTest.php +++ b/test/classes/Controllers/Table/SearchControllerTest.php @@ -72,7 +72,7 @@ class SearchControllerTest extends AbstractTestCase ], ]; $dbi->expects($this->any())->method('getColumns') - ->will($this->returnValue($columns)); + ->willReturn($columns); $show_create_table = "CREATE TABLE `pma_bookmark` ( `id` int(11) NOT NULL AUTO_INCREMENT, @@ -86,9 +86,9 @@ class SearchControllerTest extends AbstractTestCase . "COMMENT='Bookmarks'"; $dbi->expects($this->any())->method('fetchValue') - ->will($this->returnValue($show_create_table)); + ->willReturn($show_create_table); $dbi->expects($this->any())->method('escapeString') - ->will($this->returnArgument(0)); + ->willReturnArgument(0); $GLOBALS['dbi'] = $dbi; $relation->dbi = $dbi; @@ -107,7 +107,7 @@ class SearchControllerTest extends AbstractTestCase $GLOBALS['dbi']->expects($this->any()) ->method('fetchSingleRow') ->with($expected) - ->will($this->returnValue([$expected])); + ->willReturn([$expected]); $ctrl = new SearchController( $this->response, diff --git a/test/classes/Database/CentralColumnsTest.php b/test/classes/Database/CentralColumnsTest.php index 7c55232..ea0e68a 100644 --- a/test/classes/Database/CentralColumnsTest.php +++ b/test/classes/Database/CentralColumnsTest.php @@ -123,40 +123,38 @@ class CentralColumnsTest extends AbstractTestCase // set some common expectations $dbi->expects($this->any()) ->method('selectDb') - ->will($this->returnValue(true)); + ->willReturn(true); $dbi->expects($this->any()) ->method('getColumns') - ->will( - $this->returnValue( - [ - 'id' => [ - 'Type' => 'integer', - 'Null' => 'NO', - ], - 'col1' => [ - 'Type' => 'varchar(100)', - 'Null' => 'YES', - ], - 'col2' => [ - 'Type' => 'DATETIME', - 'Null' => 'NO', - ], - ] - ) + ->willReturn( + [ + 'id' => [ + 'Type' => 'integer', + 'Null' => 'NO', + ], + 'col1' => [ + 'Type' => 'varchar(100)', + 'Null' => 'YES', + ], + 'col2' => [ + 'Type' => 'DATETIME', + 'Null' => 'NO', + ], + ] ); $dbi->expects($this->any()) ->method('getColumnNames') - ->will($this->returnValue(['id', 'col1', 'col2'])); + ->willReturn(['id', 'col1', 'col2']); $dbi->expects($this->any()) ->method('tryQuery') - ->will($this->returnValue(true)); + ->willReturn(true); $dbi->expects($this->any()) ->method('getTables') - ->will( - $this->returnValue(['PMA_table', 'PMA_table1', 'PMA_table2']) + ->willReturn( + ['PMA_table', 'PMA_table1', 'PMA_table2'] ); $dbi->expects($this->any())->method('escapeString') - ->will($this->returnArgument(0)); + ->willReturnArgument(0); $this->centralColumns = new CentralColumns($dbi); } @@ -205,8 +203,8 @@ class CentralColumnsTest extends AbstractTestCase null, DatabaseInterface::CONNECT_CONTROL ) - ->will( - $this->returnValue([3]) + ->willReturn( + [3] ); self::assertSame(3, $this->centralColumns->getCount('phpmyadmin')); @@ -232,13 +230,13 @@ class CentralColumnsTest extends AbstractTestCase { $GLOBALS['dbi']->expects($this->any()) ->method('fetchResult') - ->will( - $this->returnValue($this->columnData) + ->willReturn( + $this->columnData ); $GLOBALS['dbi']->expects($this->any()) ->method('fetchValue') - ->will( - $this->returnValue('PMA_table=CREATE table `PMA_table` (id integer)') + ->willReturn( + 'PMA_table=CREATE table `PMA_table` (id integer)' ); self::assertTrue($this->centralColumns->makeConsistentWithList( 'phpmyadmin', @@ -263,8 +261,8 @@ class CentralColumnsTest extends AbstractTestCase null, DatabaseInterface::CONNECT_CONTROL ) - ->will( - $this->returnValue(['id', 'col1']) + ->willReturn( + ['id', 'col1'] ); self::assertSame([ 'id', @@ -292,8 +290,8 @@ class CentralColumnsTest extends AbstractTestCase null, DatabaseInterface::CONNECT_CONTROL ) - ->will( - $this->returnValue(array_slice($this->columnData, 0, 2)) + ->willReturn( + array_slice($this->columnData, 0, 2) ); self::assertSame(array_slice($this->modifiedColumnData, 0, 2), $this->centralColumns->getFromTable( $db, @@ -389,8 +387,8 @@ class CentralColumnsTest extends AbstractTestCase null, DatabaseInterface::CONNECT_CONTROL ) - ->will( - $this->returnValue($this->columnData) + ->willReturn( + $this->columnData ); $result = $this->centralColumns->getHtmlForEditingPage( [ @@ -433,8 +431,8 @@ class CentralColumnsTest extends AbstractTestCase null, DatabaseInterface::CONNECT_CONTROL ) - ->will( - $this->returnValue($this->columnData) + ->willReturn( + $this->columnData ); self::assertSame($this->modifiedColumnData, $this->centralColumns->getListRaw( 'phpmyadmin', @@ -457,8 +455,8 @@ class CentralColumnsTest extends AbstractTestCase null, DatabaseInterface::CONNECT_CONTROL ) - ->will( - $this->returnValue($this->columnData) + ->willReturn( + $this->columnData ); self::assertSame($this->modifiedColumnData, $this->centralColumns->getListRaw( 'phpmyadmin', @@ -479,8 +477,8 @@ class CentralColumnsTest extends AbstractTestCase null, DatabaseInterface::CONNECT_CONTROL ) - ->will( - $this->returnValue(array_slice($this->columnData, 1, 1)) + ->willReturn( + array_slice($this->columnData, 1, 1) ); self::assertSame(array_slice($this->modifiedColumnData, 1, 1), $this->callFunction( $this->centralColumns, diff --git a/test/classes/Database/Designer/CommonTest.php b/test/classes/Database/Designer/CommonTest.php index fc7864c..2efcc91 100644 --- a/test/classes/Database/Designer/CommonTest.php +++ b/test/classes/Database/Designer/CommonTest.php @@ -54,7 +54,7 @@ class CommonTest extends AbstractTestCase ->disableOriginalConstructor() ->getMock(); $dbi->expects($this->any())->method('escapeString') - ->will($this->returnArgument(0)); + ->willReturnArgument(0); $dbi->expects($this->once()) ->method('fetchResult') @@ -91,7 +91,7 @@ class CommonTest extends AbstractTestCase ->disableOriginalConstructor() ->getMock(); $dbi->expects($this->any())->method('escapeString') - ->will($this->returnArgument(0)); + ->willReturnArgument(0); $dbi->expects($this->once()) ->method('fetchResult') @@ -102,7 +102,7 @@ class CommonTest extends AbstractTestCase null, DatabaseInterface::CONNECT_CONTROL ) - ->will($this->returnValue([$pageName])); + ->willReturn([$pageName]); $GLOBALS['dbi'] = $dbi; $this->designerCommon = new Common($GLOBALS['dbi'], new Relation($dbi)); @@ -129,7 +129,7 @@ class CommonTest extends AbstractTestCase ->method('queryAsControlUser') ->willReturnOnConsecutiveCalls($resultStub, $resultStub); $dbi->expects($this->any())->method('escapeString') - ->will($this->returnArgument(0)); + ->willReturnArgument(0); $GLOBALS['dbi'] = $dbi; $this->designerCommon = new Common($GLOBALS['dbi'], new Relation($dbi)); @@ -161,9 +161,9 @@ class CommonTest extends AbstractTestCase null, DatabaseInterface::CONNECT_CONTROL ) - ->will($this->returnValue([$default_pg])); + ->willReturn([$default_pg]); $dbi->expects($this->any())->method('escapeString') - ->will($this->returnArgument(0)); + ->willReturnArgument(0); $GLOBALS['dbi'] = $dbi; $this->designerCommon = new Common($GLOBALS['dbi'], new Relation($dbi)); @@ -193,9 +193,9 @@ class CommonTest extends AbstractTestCase null, DatabaseInterface::CONNECT_CONTROL ) - ->will($this->returnValue([])); + ->willReturn([]); $dbi->expects($this->any())->method('escapeString') - ->will($this->returnArgument(0)); + ->willReturnArgument(0); $GLOBALS['dbi'] = $dbi; $this->designerCommon = new Common($GLOBALS['dbi'], new Relation($dbi)); @@ -226,9 +226,9 @@ class CommonTest extends AbstractTestCase null, DatabaseInterface::CONNECT_CONTROL ) - ->will($this->returnValue([$default_pg])); + ->willReturn([$default_pg]); $dbi->expects($this->any())->method('escapeString') - ->will($this->returnArgument(0)); + ->willReturnArgument(0); $GLOBALS['dbi'] = $dbi; $this->designerCommon = new Common($GLOBALS['dbi'], new Relation($dbi)); @@ -256,7 +256,7 @@ class CommonTest extends AbstractTestCase [[$first_pg]] ); $dbi->expects($this->any())->method('escapeString') - ->will($this->returnArgument(0)); + ->willReturnArgument(0); $GLOBALS['dbi'] = $dbi; $this->designerCommon = new Common($GLOBALS['dbi'], new Relation($dbi)); diff --git a/test/classes/Database/DesignerTest.php b/test/classes/Database/DesignerTest.php index 1586598..47d38a6 100644 --- a/test/classes/Database/DesignerTest.php +++ b/test/classes/Database/DesignerTest.php @@ -72,7 +72,7 @@ class DesignerTest extends AbstractTestCase 'SELECT `page_nr`, `page_descr` FROM `pmadb`.`pdf_pages`' . " WHERE db_name = '" . $db . "' ORDER BY `page_descr`" ) - ->will($this->returnValue($resultStub)); + ->willReturn($resultStub); $resultStub->expects($this->exactly(3)) ->method('fetchAssoc') @@ -90,7 +90,7 @@ class DesignerTest extends AbstractTestCase $dbi->expects($this->any()) ->method('escapeString') - ->will($this->returnArgument(0)); + ->willReturnArgument(0); $GLOBALS['dbi'] = $dbi; } diff --git a/test/classes/Database/EventsTest.php b/test/classes/Database/EventsTest.php index 0780042..277aa4f 100644 --- a/test/classes/Database/EventsTest.php +++ b/test/classes/Database/EventsTest.php @@ -319,7 +319,7 @@ class EventsTest extends AbstractTestCase ->getMock(); $dbi->expects($this->any()) ->method('escapeString') - ->will($this->returnArgument(0)); + ->willReturnArgument(0); $GLOBALS['dbi'] = $dbi; self::assertSame($query, $this->events->getQueryFromRequest()); diff --git a/test/classes/Database/QbeTest.php b/test/classes/Database/QbeTest.php index ff394c0..9e508b4 100644 --- a/test/classes/Database/QbeTest.php +++ b/test/classes/Database/QbeTest.php @@ -44,11 +44,11 @@ class QbeTest extends AbstractTestCase $dbi->expects($this->any()) ->method('fetchValue') ->with('SHOW CREATE TABLE `pma_test`.`table1`', 1) - ->will($this->returnValue($create_table)); + ->willReturn($create_table); $dbi->expects($this->any()) ->method('getTableIndexes') - ->will($this->returnValue([])); + ->willReturn([]); $GLOBALS['dbi'] = $dbi; $this->object->dbi = $dbi; diff --git a/test/classes/Database/RoutinesTest.php b/test/classes/Database/RoutinesTest.php index 1fa18a6..d82be74 100644 --- a/test/classes/Database/RoutinesTest.php +++ b/test/classes/Database/RoutinesTest.php @@ -1145,26 +1145,24 @@ class RoutinesTest extends AbstractTestCase $dbi->types = new Types($dbi); $dbi->expects($this->any()) ->method('escapeString') - ->will( - $this->returnValueMap( + ->willReturnMap( + [ + [ + 'foo', + DatabaseInterface::CONNECT_USER, + 'foo', + ], + [ + "foo's bar", + DatabaseInterface::CONNECT_USER, + "foo\'s bar", + ], [ - [ - 'foo', - DatabaseInterface::CONNECT_USER, - 'foo', - ], - [ - "foo's bar", - DatabaseInterface::CONNECT_USER, - "foo\'s bar", - ], - [ - '', - DatabaseInterface::CONNECT_USER, - '', - ], - ] - ) + '', + DatabaseInterface::CONNECT_USER, + '', + ], + ] ); $GLOBALS['dbi'] = $dbi; diff --git a/test/classes/Database/SearchTest.php b/test/classes/Database/SearchTest.php index 6235d01..ec5a2b5 100644 --- a/test/classes/Database/SearchTest.php +++ b/test/classes/Database/SearchTest.php @@ -38,14 +38,14 @@ class SearchTest extends AbstractTestCase $dbi->expects($this->any()) ->method('getColumns') ->with('pma', 'table1') - ->will($this->returnValue([ + ->willReturn([ ['Field' => 'column1'], ['Field' => 'column2'], - ])); + ]); $dbi->expects($this->any()) ->method('escapeString') - ->will($this->returnArgument(0)); + ->willReturnArgument(0); $GLOBALS['dbi'] = $dbi; $this->object = new Search($dbi, 'pma_test', new Template()); diff --git a/test/classes/DatabaseInterfaceTest.php b/test/classes/DatabaseInterfaceTest.php index d049c62..ebc8267 100644 --- a/test/classes/DatabaseInterfaceTest.php +++ b/test/classes/DatabaseInterfaceTest.php @@ -262,7 +262,7 @@ class DatabaseInterfaceTest extends AbstractTestCase $mock->expects($this->once()) ->method('fetchSingleRow') - ->will($this->returnValue(null)); + ->willReturn(null); $mock->expects($this->never())->method('setVersion'); @@ -289,7 +289,7 @@ class DatabaseInterfaceTest extends AbstractTestCase $mock->expects($this->once()) ->method('fetchSingleRow') - ->will($this->returnValue($versionQueryResult)); + ->willReturn($versionQueryResult); $mock->expects($this->once())->method('setVersion')->with($versionQueryResult); @@ -325,7 +325,7 @@ class DatabaseInterfaceTest extends AbstractTestCase $mock->expects($this->once()) ->method('fetchSingleRow') - ->will($this->returnValue($version)); + ->willReturn($version); $mock->postConnect(); diff --git a/test/classes/Export/OptionsTest.php b/test/classes/Export/OptionsTest.php index b29100e..a6939d5 100644 --- a/test/classes/Export/OptionsTest.php +++ b/test/classes/Export/OptionsTest.php @@ -41,7 +41,7 @@ class OptionsTest extends AbstractTestCase $pmaconfig->expects($this->any()) ->method('getUserValue') - ->will($this->returnValue('user value for test')); + ->willReturn('user value for test'); $GLOBALS['config'] = $pmaconfig; @@ -77,9 +77,9 @@ class OptionsTest extends AbstractTestCase ->getMock(); $dbi->expects($this->any())->method('getColumnsFull') - ->will($this->returnValue($columns_info)); + ->willReturn($columns_info); $dbi->expects($this->any())->method('getCompatibilities') - ->will($this->returnValue([])); + ->willReturn([]); $GLOBALS['dbi'] = $dbi; diff --git a/test/classes/Gis/GisGeometryTest.php b/test/classes/Gis/GisGeometryTest.php index bee183f..fc08557 100644 --- a/test/classes/Gis/GisGeometryTest.php +++ b/test/classes/Gis/GisGeometryTest.php @@ -24,7 +24,7 @@ class GisGeometryTest extends AbstractTestCase protected function setUp(): void { parent::setUp(); - $this->object = $this->getMockForAbstractClass(GisGeometry::class); + $this->object = $this->getMockBuilder(GisGeometry::class)->getMock(); } /** diff --git a/test/classes/InsertEditTest.php b/test/classes/InsertEditTest.php index 19acf89..bdac0b8 100644 --- a/test/classes/InsertEditTest.php +++ b/test/classes/InsertEditTest.php @@ -222,11 +222,11 @@ class InsertEditTest extends AbstractTestCase $resultStub1->expects($this->once()) ->method('fetchAssoc') - ->will($this->returnValue(['assoc1'])); + ->willReturn(['assoc1']); $resultStub2->expects($this->once()) ->method('fetchAssoc') - ->will($this->returnValue(['assoc2'])); + ->willReturn(['assoc2']); $dbi->expects($this->exactly(2)) ->method('getFieldsMeta') @@ -284,7 +284,7 @@ class InsertEditTest extends AbstractTestCase $dbi->expects($this->once()) ->method('getFieldsMeta') ->with($resultStub) - ->will($this->returnValue($meta_arr)); + ->willReturn($meta_arr); $GLOBALS['dbi'] = $dbi; $this->insertEdit = new InsertEdit($GLOBALS['dbi']); @@ -394,7 +394,7 @@ class InsertEditTest extends AbstractTestCase ->with( 'SELECT * FROM `db`.`table` LIMIT 1;' ) - ->will($this->returnValue($resultStub)); + ->willReturn($resultStub); $GLOBALS['dbi'] = $dbi; $this->insertEdit = new InsertEdit($GLOBALS['dbi']); @@ -1727,16 +1727,16 @@ class InsertEditTest extends AbstractTestCase $dbi->expects($this->once()) ->method('query') ->with('SELECT * FROM `db`.`table` WHERE `a` > 2 LIMIT 1;') - ->will($this->returnValue($resultStub)); + ->willReturn($resultStub); $resultStub->expects($this->once()) ->method('fetchRow') - ->will($this->returnValue($row)); + ->willReturn($row); $dbi->expects($this->once()) ->method('getFieldsMeta') ->with($resultStub) - ->will($this->returnValue($meta_arr)); + ->willReturn($meta_arr); $GLOBALS['dbi'] = $dbi; $GLOBALS['db'] = 'db'; @@ -1871,7 +1871,7 @@ class InsertEditTest extends AbstractTestCase $dbi->expects($this->once()) ->method('getWarnings') - ->will($this->returnValue($warnings)); + ->willReturn($warnings); $GLOBALS['dbi'] = $dbi; $this->insertEdit = new InsertEdit($GLOBALS['dbi']); @@ -1907,16 +1907,16 @@ class InsertEditTest extends AbstractTestCase ->with( 'SELECT `TABLE_COMMENT` FROM `information_schema`.`TABLES` WHERE `f`=1' ) - ->will($this->returnValue($resultStub)); + ->willReturn($resultStub); $resultStub->expects($this->once()) ->method('numRows') - ->will($this->returnValue('2')); + ->willReturn('2'); $resultStub->expects($this->once()) ->method('fetchValue') ->with(0) - ->will($this->returnValue('2')); + ->willReturn('2'); $GLOBALS['dbi'] = $dbi; $this->insertEdit = new InsertEdit($GLOBALS['dbi']); @@ -2608,12 +2608,10 @@ class InsertEditTest extends AbstractTestCase $meta2 = new FieldMetadata(MYSQLI_TYPE_TINY, 0, (object) []); $meta3 = new FieldMetadata(MYSQLI_TYPE_TIMESTAMP, 0, (object) []); $dbi->expects($this->exactly(3)) - ->method('getFieldsMeta') - ->will($this->onConsecutiveCalls([$meta1], [$meta2], [$meta3])); + ->method('getFieldsMeta')->willReturnOnConsecutiveCalls([$meta1], [$meta2], [$meta3]); $resultStub->expects($this->exactly(3)) - ->method('fetchValue') - ->will($this->onConsecutiveCalls(false, '123', '2013-08-28 06:34:14')); + ->method('fetchValue')->willReturnOnConsecutiveCalls(false, '123', '2013-08-28 06:34:14'); $GLOBALS['dbi'] = $dbi; $this->insertEdit = new InsertEdit($GLOBALS['dbi']); @@ -2649,10 +2647,10 @@ class InsertEditTest extends AbstractTestCase $dbi->expects($this->once()) ->method('getColumns') ->with('db', 'table') - ->will($this->returnValue([ + ->willReturn([ ['a' => 'b', 'c' => 'd'], ['e' => 'f', 'g' => 'h'], - ])); + ]); $GLOBALS['dbi'] = $dbi; $this->insertEdit = new InsertEdit($GLOBALS['dbi']); @@ -2678,7 +2676,7 @@ class InsertEditTest extends AbstractTestCase $dbi->expects($this->exactly(2)) ->method('query') - ->will($this->returnValue($resultStub)); + ->willReturn($resultStub); $GLOBALS['dbi'] = $dbi; $_POST['where_clause'] = '1'; @@ -2753,23 +2751,19 @@ class InsertEditTest extends AbstractTestCase $dbi->expects($this->once()) ->method('getColumns') ->with('db', 'table', true) - ->will( - $this->returnValue( + ->willReturn( + [ [ - [ - 'Comment' => 'b', - 'Field' => 'd', - ], - ] - ) + 'Comment' => 'b', + 'Field' => 'd', + ], + ] ); $dbi->expects($this->any()) ->method('getTable') - ->will( - $this->returnValue( - new Table('table', 'db') - ) + ->willReturn( + new Table('table', 'db') ); $GLOBALS['dbi'] = $dbi; @@ -2821,7 +2815,7 @@ class InsertEditTest extends AbstractTestCase $resultStub = $this->createMock(DummyResult::class); $resultStub->expects($this->any()) ->method('getFieldsMeta') - ->will($this->returnValue([new FieldMetadata(0, 0, (object) ['length' => -1])])); + ->willReturn([new FieldMetadata(0, 0, (object) ['length' => -1])]); // Test w/ input transformation $actual = $this->callFunction( @@ -2978,7 +2972,7 @@ class InsertEditTest extends AbstractTestCase $resultStub = $this->createMock(DummyResult::class); $resultStub->expects($this->any()) ->method('getFieldsMeta') - ->will($this->returnValue([new FieldMetadata(0, 0, (object) ['length' => -1])])); + ->willReturn([new FieldMetadata(0, 0, (object) ['length' => -1])]); $actual = $this->insertEdit->getHtmlForInsertEditRow( [], @@ -3054,11 +3048,11 @@ class InsertEditTest extends AbstractTestCase $resultStub = $this->createMock(DummyResult::class); $resultStub->expects($this->any()) ->method('getFieldsMeta') - ->will($this->returnValue([ + ->willReturn([ new FieldMetadata(0, 0, (object) ['length' => -1]), new FieldMetadata(0, 0, (object) ['length' => -1]), new FieldMetadata(0, 0, (object) ['length' => -1]), - ])); + ]); $actual = $this->insertEdit->getHtmlForInsertEditRow( [], diff --git a/test/classes/Navigation/NavigationTest.php b/test/classes/Navigation/NavigationTest.php index 94be0b7..aa659be 100644 --- a/test/classes/Navigation/NavigationTest.php +++ b/test/classes/Navigation/NavigationTest.php @@ -73,7 +73,7 @@ class NavigationTest extends AbstractTestCase ->method('tryQueryAsControlUser') ->with($expectedQuery); $dbi->expects($this->any())->method('escapeString') - ->will($this->returnArgument(0)); + ->willReturnArgument(0); $GLOBALS['dbi'] = $dbi; $this->object = new Navigation(new Template(), new Relation($dbi), $dbi); @@ -96,7 +96,7 @@ class NavigationTest extends AbstractTestCase ->with($expectedQuery); $dbi->expects($this->any())->method('escapeString') - ->will($this->returnArgument(0)); + ->willReturnArgument(0); $GLOBALS['dbi'] = $dbi; $this->object = new Navigation(new Template(), new Relation($dbi), $dbi); $this->object->unhideNavigationItem('itemName', 'itemType', 'db'); diff --git a/test/classes/Navigation/Nodes/NodeDatabaseChildTest.php b/test/classes/Navigation/Nodes/NodeDatabaseChildTest.php index e68e349..eaa65c9 100644 --- a/test/classes/Navigation/Nodes/NodeDatabaseChildTest.php +++ b/test/classes/Navigation/Nodes/NodeDatabaseChildTest.php @@ -41,10 +41,11 @@ class NodeDatabaseChildTest extends AbstractTestCase 'navwork' => true, 'navigationhiding' => 'navigationhiding', ])->toArray(); - $this->object = $this->getMockForAbstractClass( - NodeDatabaseChild::class, - ['child'] - ); + + $this->object = $this->getMockBuilder(NodeDatabaseChild::class) + ->setConstructorArgs(['child']) + ->onlyMethods(['getItemType']) + ->getMock(); } /** @@ -65,7 +66,7 @@ class NodeDatabaseChildTest extends AbstractTestCase $parent->addChild($this->object); $this->object->expects($this->once()) ->method('getItemType') - ->will($this->returnValue('itemType')); + ->willReturn('itemType'); $html = $this->object->getHtmlForControlButtons(); self::assertStringStartsWith('', $html); diff --git a/test/classes/Navigation/Nodes/NodeTest.php b/test/classes/Navigation/Nodes/NodeTest.php index 2ec7de6..521cb3f 100644 --- a/test/classes/Navigation/Nodes/NodeTest.php +++ b/test/classes/Navigation/Nodes/NodeTest.php @@ -308,7 +308,7 @@ class NodeTest extends AbstractTestCase ->method('fetchResult') ->with($expectedSql); $dbi->expects($this->any())->method('escapeString') - ->will($this->returnArgument(0)); + ->willReturnArgument(0); $GLOBALS['dbi'] = $dbi; $node->getData('', $pos); } @@ -342,7 +342,7 @@ class NodeTest extends AbstractTestCase ->method('fetchResult') ->with($expectedSql); $dbi->expects($this->any())->method('escapeString') - ->will($this->returnArgument(0)); + ->willReturnArgument(0); $GLOBALS['dbi'] = $dbi; $node->getData('', $pos); @@ -372,7 +372,7 @@ class NodeTest extends AbstractTestCase $dbi->expects($this->once()) ->method('tryQuery') ->with("SHOW DATABASES WHERE TRUE AND `Database` LIKE '%db%' ") - ->will($this->returnValue($resultStub)); + ->willReturn($resultStub); $resultStub->expects($this->exactly(3)) ->method('fetchRow') ->willReturnOnConsecutiveCalls( @@ -389,7 +389,7 @@ class NodeTest extends AbstractTestCase . " OR LOCATE('aa_', CONCAT(`Database`, '_')) = 1 )" ); $dbi->expects($this->any())->method('escapeString') - ->will($this->returnArgument(0)); + ->willReturnArgument(0); $GLOBALS['dbi'] = $dbi; $node->getData('', $pos, 'db'); @@ -471,9 +471,9 @@ class NodeTest extends AbstractTestCase $dbi->expects($this->once()) ->method('tryQuery') ->with('SHOW DATABASES WHERE TRUE ') - ->will($this->returnValue($resultStub)); + ->willReturn($resultStub); $dbi->expects($this->any())->method('escapeString') - ->will($this->returnArgument(0)); + ->willReturnArgument(0); $GLOBALS['dbi'] = $dbi; $node->getPresence(); @@ -485,9 +485,9 @@ class NodeTest extends AbstractTestCase $dbi->expects($this->once()) ->method('tryQuery') ->with("SHOW DATABASES WHERE TRUE AND `Database` LIKE '%dbname%' ") - ->will($this->returnValue($resultStub)); + ->willReturn($resultStub); $dbi->expects($this->any())->method('escapeString') - ->will($this->returnArgument(0)); + ->willReturnArgument(0); $GLOBALS['dbi'] = $dbi; $node->getPresence('', 'dbname'); diff --git a/test/classes/NormalizationTest.php b/test/classes/NormalizationTest.php index a974ae8..5df9057 100644 --- a/test/classes/NormalizationTest.php +++ b/test/classes/NormalizationTest.php @@ -55,21 +55,19 @@ class NormalizationTest extends AbstractTestCase // set expectations $dbi->expects($this->any()) ->method('selectDb') - ->will($this->returnValue(true)); + ->willReturn(true); $dbi->expects($this->any()) ->method('getColumns') - ->will( - $this->returnValue( - [ - 'id' => ['Type' => 'integer'], - 'col1' => ['Type' => 'varchar(100)'], - 'col2' => ['Type' => 'DATETIME'], - ] - ) + ->willReturn( + [ + 'id' => ['Type' => 'integer'], + 'col1' => ['Type' => 'varchar(100)'], + 'col2' => ['Type' => 'DATETIME'], + ] ); $dbi->expects($this->any()) ->method('getColumnNames') - ->will($this->returnValue(['id', 'col1', 'col2'])); + ->willReturn(['id', 'col1', 'col2']); $map = [ [ 'PMA_db', @@ -106,13 +104,13 @@ class NormalizationTest extends AbstractTestCase ]; $dbi->expects($this->any()) ->method('getTableIndexes') - ->will($this->returnValueMap($map)); + ->willReturnMap($map); $dbi->expects($this->any()) ->method('tryQuery') - ->will($this->returnValue(true)); + ->willReturn(true); $dbi->expects($this->any()) ->method('fetchResult') - ->will($this->returnValue([0])); + ->willReturn([0]); $this->normalization = new Normalization($dbi, new Relation($dbi), new Transformations(), new Template()); } diff --git a/test/classes/Plugins/Auth/AuthenticationCookieTest.php b/test/classes/Plugins/Auth/AuthenticationCookieTest.php index d1d9b44..58bd7a9 100644 --- a/test/classes/Plugins/Auth/AuthenticationCookieTest.php +++ b/test/classes/Plugins/Auth/AuthenticationCookieTest.php @@ -76,7 +76,7 @@ class AuthenticationCookieTest extends AbstractNetworkTestCase $mockResponse->expects($this->once()) ->method('isAjax') ->with() - ->will($this->returnValue(true)); + ->willReturn(true); $mockResponse->expects($this->once()) ->method('setRequestStatus') @@ -97,7 +97,7 @@ class AuthenticationCookieTest extends AbstractNetworkTestCase $mockResponse->expects($this->once()) ->method('isAjax') ->with() - ->will($this->returnValue(false)); + ->willReturn(false); // mock footer $mockFooter = $this->getMockBuilder(Footer::class) @@ -144,12 +144,12 @@ class AuthenticationCookieTest extends AbstractNetworkTestCase $mockResponse->expects($this->once()) ->method('getFooter') ->with() - ->will($this->returnValue($mockFooter)); + ->willReturn($mockFooter); $mockResponse->expects($this->once()) ->method('getHeader') ->with() - ->will($this->returnValue($mockHeader)); + ->willReturn($mockHeader); $GLOBALS['cfg']['Servers'] = [ 1, @@ -166,7 +166,7 @@ class AuthenticationCookieTest extends AbstractNetworkTestCase $mockErrorHandler->expects($this->once()) ->method('hasDisplayErrors') ->with() - ->will($this->returnValue(true)); + ->willReturn(true); $GLOBALS['errorHandler'] = $mockErrorHandler; } @@ -246,17 +246,17 @@ class AuthenticationCookieTest extends AbstractNetworkTestCase $mockResponse->expects($this->once()) ->method('isAjax') ->with() - ->will($this->returnValue(false)); + ->willReturn(false); $mockResponse->expects($this->once()) ->method('getFooter') ->with() - ->will($this->returnValue(new Footer())); + ->willReturn(new Footer()); $mockResponse->expects($this->once()) ->method('getHeader') ->with() - ->will($this->returnValue(new Header())); + ->willReturn(new Header()); $_REQUEST['old_usr'] = ''; $GLOBALS['cfg']['LoginCookieRecall'] = false; @@ -316,17 +316,17 @@ class AuthenticationCookieTest extends AbstractNetworkTestCase $mockResponse->expects($this->once()) ->method('isAjax') ->with() - ->will($this->returnValue(false)); + ->willReturn(false); $mockResponse->expects($this->once()) ->method('getFooter') ->with() - ->will($this->returnValue(new Footer())); + ->willReturn(new Footer()); $mockResponse->expects($this->once()) ->method('getHeader') ->with() - ->will($this->returnValue(new Header())); + ->willReturn(new Header()); $_REQUEST['old_usr'] = ''; $GLOBALS['cfg']['LoginCookieRecall'] = false; @@ -550,7 +550,7 @@ class AuthenticationCookieTest extends AbstractNetworkTestCase $this->object->expects($this->once()) ->method('cookieDecrypt') - ->will($this->returnValue('testBF')); + ->willReturn('testBF'); self::assertFalse($this->object->readCredentials()); @@ -584,7 +584,7 @@ class AuthenticationCookieTest extends AbstractNetworkTestCase $this->object->expects($this->exactly(2)) ->method('cookieDecrypt') - ->will($this->returnValue('{"password":""}')); + ->willReturn('{"password":""}'); self::assertTrue($this->object->readCredentials()); @@ -620,7 +620,7 @@ class AuthenticationCookieTest extends AbstractNetworkTestCase $this->object->expects($this->once()) ->method('cookieDecrypt') - ->will($this->returnValue('testBF')); + ->willReturn('testBF'); $this->object->expects($this->once()) ->method('showFailure'); @@ -838,7 +838,7 @@ class AuthenticationCookieTest extends AbstractNetworkTestCase $dbi->expects($this->once()) ->method('getError') - ->will($this->returnValue('')); + ->willReturn(''); $GLOBALS['dbi'] = $dbi; $GLOBALS['errno'] = 42; @@ -869,7 +869,7 @@ class AuthenticationCookieTest extends AbstractNetworkTestCase $dbi->expects($this->once()) ->method('getError') - ->will($this->returnValue('')); + ->willReturn(''); $GLOBALS['dbi'] = $dbi; $GLOBALS['server'] = 2; diff --git a/test/classes/Plugins/Auth/AuthenticationHttpTest.php b/test/classes/Plugins/Auth/AuthenticationHttpTest.php index 807fa31..bb8c281 100644 --- a/test/classes/Plugins/Auth/AuthenticationHttpTest.php +++ b/test/classes/Plugins/Auth/AuthenticationHttpTest.php @@ -102,12 +102,12 @@ class AuthenticationHttpTest extends AbstractNetworkTestCase $mockResponse->expects($this->exactly($set_title)) ->method('getFooter') ->with() - ->will($this->returnValue($mockFooter)); + ->willReturn($mockFooter); $mockResponse->expects($this->exactly($set_title)) ->method('getHeader') ->with() - ->will($this->returnValue($mockHeader)); + ->willReturn($mockHeader); if (! empty($_REQUEST['old_usr'])) { $this->object->logOut(); @@ -368,8 +368,7 @@ class AuthenticationHttpTest extends AbstractNetworkTestCase ->getMock(); $dbi->expects($this->exactly(3)) - ->method('getError') - ->will($this->onConsecutiveCalls('error 123', 'error 321', '')); + ->method('getError')->willReturnOnConsecutiveCalls('error 123', 'error 321', ''); $GLOBALS['dbi'] = $dbi; $GLOBALS['errno'] = 31; diff --git a/test/classes/Plugins/Auth/AuthenticationSignonTest.php b/test/classes/Plugins/Auth/AuthenticationSignonTest.php index 6ac103e..0f6a5ec 100644 --- a/test/classes/Plugins/Auth/AuthenticationSignonTest.php +++ b/test/classes/Plugins/Auth/AuthenticationSignonTest.php @@ -273,7 +273,7 @@ class AuthenticationSignonTest extends AbstractNetworkTestCase $dbi->expects($this->once()) ->method('getError') - ->will($this->returnValue('error<123>')); + ->willReturn('error<123>'); $GLOBALS['dbi'] = $dbi; @@ -302,7 +302,7 @@ class AuthenticationSignonTest extends AbstractNetworkTestCase $dbi->expects($this->once()) ->method('getError') - ->will($this->returnValue('')); + ->willReturn(''); $GLOBALS['dbi'] = $dbi; diff --git a/test/classes/Plugins/Export/ExportHtmlwordTest.php b/test/classes/Plugins/Export/ExportHtmlwordTest.php index 3b9d6be..b87f640 100644 --- a/test/classes/Plugins/Export/ExportHtmlwordTest.php +++ b/test/classes/Plugins/Export/ExportHtmlwordTest.php @@ -279,19 +279,19 @@ class ExportHtmlwordTest extends AbstractTestCase $dbi->expects($this->once()) ->method('getTableIndexes') ->with('database', 'view') - ->will($this->returnValue($keys)); + ->willReturn($keys); $dbi->expects($this->once()) ->method('getColumns') ->with('database', 'view') - ->will($this->returnValue([['Field' => 'column']])); + ->willReturn([['Field' => 'column']]); $GLOBALS['dbi'] = $dbi; $this->object->expects($this->once()) ->method('formatOneColumnDefinition') ->with(['Field' => 'column'], ['name1'], 'column') - ->will($this->returnValue(1)); + ->willReturn(1); self::assertSame('' . '' . @@ -342,28 +342,28 @@ class ExportHtmlwordTest extends AbstractTestCase $dbi->expects($this->once()) ->method('getTableIndexes') ->with('database', '') - ->will($this->returnValue($keys)); + ->willReturn($keys); $columns = ['Field' => 'fieldname']; $dbi->expects($this->once()) ->method('getColumns') ->with('database', '') - ->will($this->returnValue([$columns])); + ->willReturn([$columns]); $dbi->expects($this->once()) ->method('tryQueryAsControlUser') - ->will($this->returnValue($resultStub)); + ->willReturn($resultStub); $resultStub->expects($this->once()) ->method('numRows') - ->will($this->returnValue(1)); + ->willReturn(1); $resultStub->expects($this->once()) ->method('fetchAssoc') - ->will($this->returnValue(['comment' => 'testComment'])); + ->willReturn(['comment' => 'testComment']); $dbi->expects($this->any())->method('escapeString') - ->will($this->returnArgument(0)); + ->willReturnArgument(0); $GLOBALS['dbi'] = $dbi; $this->object->relation = new Relation($dbi); @@ -371,7 +371,7 @@ class ExportHtmlwordTest extends AbstractTestCase $this->object->expects($this->exactly(3)) ->method('formatOneColumnDefinition') ->with($columns, ['name1']) - ->will($this->returnValue(1)); + ->willReturn(1); $_SESSION['relation'] = []; $_SESSION['relation'][$GLOBALS['server']] = RelationParameters::fromArray([ @@ -423,29 +423,29 @@ class ExportHtmlwordTest extends AbstractTestCase $dbi->expects($this->once()) ->method('getTableIndexes') ->with('database', '') - ->will($this->returnValue($keys)); + ->willReturn($keys); $columns = ['Field' => 'fieldname']; $dbi->expects($this->once()) ->method('getColumns') ->with('database', '') - ->will($this->returnValue([$columns])); + ->willReturn([$columns]); $dbi->expects($this->once()) ->method('tryQueryAsControlUser') - ->will($this->returnValue($resultStub)); + ->willReturn($resultStub); $resultStub->expects($this->once()) ->method('numRows') - ->will($this->returnValue(1)); + ->willReturn(1); $resultStub->expects($this->once()) ->method('fetchAssoc') - ->will($this->returnValue(['comment' => 'testComment'])); + ->willReturn(['comment' => 'testComment']); $dbi->expects($this->any())->method('escapeString') - ->will($this->returnArgument(0)); + ->willReturnArgument(0); $GLOBALS['dbi'] = $dbi; $this->object->relation = new Relation($dbi); @@ -475,20 +475,20 @@ class ExportHtmlwordTest extends AbstractTestCase $dbi->expects($this->once()) ->method('getTableIndexes') ->with('database', '') - ->will($this->returnValue($keys)); + ->willReturn($keys); $columns = ['Field' => 'fieldname']; $dbi->expects($this->once()) ->method('getColumns') ->with('database', '') - ->will($this->returnValue([$columns])); + ->willReturn([$columns]); $dbi->expects($this->never()) ->method('tryQuery'); $dbi->expects($this->any())->method('escapeString') - ->will($this->returnArgument(0)); + ->willReturnArgument(0); $GLOBALS['dbi'] = $dbi; @@ -526,7 +526,7 @@ class ExportHtmlwordTest extends AbstractTestCase $dbi->expects($this->once()) ->method('getTriggers') ->with('database', 'table') - ->will($this->returnValue($triggers)); + ->willReturn($triggers); $GLOBALS['dbi'] = $dbi; diff --git a/test/classes/Plugins/Export/ExportLatexTest.php b/test/classes/Plugins/Export/ExportLatexTest.php index 31b5b3c..22800d9 100644 --- a/test/classes/Plugins/Export/ExportLatexTest.php +++ b/test/classes/Plugins/Export/ExportLatexTest.php @@ -400,7 +400,7 @@ class ExportLatexTest extends AbstractTestCase $dbi->expects($this->once()) ->method('getTableIndexes') ->with('database', '') - ->will($this->returnValue($keys)); + ->willReturn($keys); $dbi->expects($this->exactly(2)) ->method('fetchResult') @@ -433,19 +433,19 @@ class ExportLatexTest extends AbstractTestCase $dbi->expects($this->once()) ->method('getColumns') ->with('database', '') - ->will($this->returnValue($columns)); + ->willReturn($columns); $dbi->expects($this->once()) ->method('tryQueryAsControlUser') - ->will($this->returnValue($resultStub)); + ->willReturn($resultStub); $resultStub->expects($this->once()) ->method('numRows') - ->will($this->returnValue(1)); + ->willReturn(1); $resultStub->expects($this->once()) ->method('fetchAssoc') - ->will($this->returnValue(['comment' => 'testComment'])); + ->willReturn(['comment' => 'testComment']); $GLOBALS['dbi'] = $dbi; $this->object->relation = new Relation($dbi); @@ -528,24 +528,24 @@ class ExportLatexTest extends AbstractTestCase $dbi->expects($this->once()) ->method('getTableIndexes') ->with('database', '') - ->will($this->returnValue($keys)); + ->willReturn($keys); $dbi->expects($this->once()) ->method('getColumns') ->with('database', '') - ->will($this->returnValue($columns)); + ->willReturn($columns); $dbi->expects($this->once()) ->method('tryQueryAsControlUser') - ->will($this->returnValue($resultStub)); + ->willReturn($resultStub); $resultStub->expects($this->once()) ->method('numRows') - ->will($this->returnValue(1)); + ->willReturn(1); $resultStub->expects($this->once()) ->method('fetchAssoc') - ->will($this->returnValue(['comment' => 'testComment'])); + ->willReturn(['comment' => 'testComment']); $GLOBALS['dbi'] = $dbi; $this->object->relation = new Relation($dbi); @@ -588,12 +588,12 @@ class ExportLatexTest extends AbstractTestCase $dbi->expects($this->once()) ->method('getTableIndexes') ->with('database', '') - ->will($this->returnValue($keys)); + ->willReturn($keys); $dbi->expects($this->once()) ->method('getColumns') ->with('database', '') - ->will($this->returnValue($columns)); + ->willReturn($columns); $dbi->expects($this->never()) ->method('tryQuery'); diff --git a/test/classes/Plugins/Export/ExportMediawikiTest.php b/test/classes/Plugins/Export/ExportMediawikiTest.php index e932953..55018e3 100644 --- a/test/classes/Plugins/Export/ExportMediawikiTest.php +++ b/test/classes/Plugins/Export/ExportMediawikiTest.php @@ -191,7 +191,7 @@ class ExportMediawikiTest extends AbstractTestCase $dbi->expects($this->once()) ->method('getColumns') ->with('db', 'table') - ->will($this->returnValue($columns)); + ->willReturn($columns); $GLOBALS['dbi'] = $dbi; $GLOBALS['mediawiki_caption'] = true; diff --git a/test/classes/Plugins/Export/ExportOdsTest.php b/test/classes/Plugins/Export/ExportOdsTest.php index 7fc8ec5..8968c8e 100644 --- a/test/classes/Plugins/Export/ExportOdsTest.php +++ b/test/classes/Plugins/Export/ExportOdsTest.php @@ -205,16 +205,16 @@ class ExportOdsTest extends AbstractTestCase $dbi->expects($this->once()) ->method('getFieldsMeta') ->with($resultStub) - ->will($this->returnValue($flags)); + ->willReturn($flags); $dbi->expects($this->once()) ->method('query') ->with('SELECT', DatabaseInterface::CONNECT_USER, DatabaseInterface::QUERY_UNBUFFERED) - ->will($this->returnValue($resultStub)); + ->willReturn($resultStub); $resultStub->expects($this->once()) ->method('numFields') - ->will($this->returnValue(8)); + ->willReturn(8); $resultStub->expects($this->exactly(2)) ->method('fetchRow') @@ -285,20 +285,20 @@ class ExportOdsTest extends AbstractTestCase $dbi->expects($this->once()) ->method('getFieldsMeta') ->with($resultStub) - ->will($this->returnValue($flags)); + ->willReturn($flags); $dbi->expects($this->once()) ->method('query') ->with('SELECT', DatabaseInterface::CONNECT_USER, DatabaseInterface::QUERY_UNBUFFERED) - ->will($this->returnValue($resultStub)); + ->willReturn($resultStub); $resultStub->expects($this->once()) ->method('numFields') - ->will($this->returnValue(2)); + ->willReturn(2); $resultStub->expects($this->exactly(1)) ->method('fetchRow') - ->will($this->returnValue([])); + ->willReturn([]); $GLOBALS['dbi'] = $dbi; $GLOBALS['mediawiki_caption'] = true; @@ -333,20 +333,20 @@ class ExportOdsTest extends AbstractTestCase $dbi->expects($this->once()) ->method('getFieldsMeta') ->with($resultStub) - ->will($this->returnValue($flags)); + ->willReturn($flags); $dbi->expects($this->once()) ->method('query') ->with('SELECT', DatabaseInterface::CONNECT_USER, DatabaseInterface::QUERY_UNBUFFERED) - ->will($this->returnValue($resultStub)); + ->willReturn($resultStub); $resultStub->expects($this->once()) ->method('numFields') - ->will($this->returnValue(0)); + ->willReturn(0); $resultStub->expects($this->once()) ->method('fetchRow') - ->will($this->returnValue([])); + ->willReturn([]); $GLOBALS['dbi'] = $dbi; $GLOBALS['mediawiki_caption'] = true; diff --git a/test/classes/Plugins/Export/ExportOdtTest.php b/test/classes/Plugins/Export/ExportOdtTest.php index a4d9d38..569527d 100644 --- a/test/classes/Plugins/Export/ExportOdtTest.php +++ b/test/classes/Plugins/Export/ExportOdtTest.php @@ -284,16 +284,16 @@ class ExportOdtTest extends AbstractTestCase $dbi->expects($this->once()) ->method('getFieldsMeta') ->with($resultStub) - ->will($this->returnValue($flags)); + ->willReturn($flags); $dbi->expects($this->once()) ->method('query') ->with('SELECT', DatabaseInterface::CONNECT_USER, DatabaseInterface::QUERY_UNBUFFERED) - ->will($this->returnValue($resultStub)); + ->willReturn($resultStub); $resultStub->expects($this->once()) ->method('numFields') - ->will($this->returnValue(4)); + ->willReturn(4); $resultStub->expects($this->exactly(2)) ->method('fetchRow') @@ -354,20 +354,20 @@ class ExportOdtTest extends AbstractTestCase $dbi->expects($this->once()) ->method('getFieldsMeta') ->with($resultStub) - ->will($this->returnValue($flags)); + ->willReturn($flags); $dbi->expects($this->once()) ->method('query') ->with('SELECT', DatabaseInterface::CONNECT_USER, DatabaseInterface::QUERY_UNBUFFERED) - ->will($this->returnValue($resultStub)); + ->willReturn($resultStub); $resultStub->expects($this->once()) ->method('numFields') - ->will($this->returnValue(2)); + ->willReturn(2); $resultStub->expects($this->exactly(1)) ->method('fetchRow') - ->will($this->returnValue([])); + ->willReturn([]); $GLOBALS['dbi'] = $dbi; $GLOBALS['what'] = 'foo'; @@ -402,20 +402,20 @@ class ExportOdtTest extends AbstractTestCase $dbi->expects($this->once()) ->method('getFieldsMeta') ->with($resultStub) - ->will($this->returnValue($flags)); + ->willReturn($flags); $dbi->expects($this->once()) ->method('query') ->with('SELECT', DatabaseInterface::CONNECT_USER, DatabaseInterface::QUERY_UNBUFFERED) - ->will($this->returnValue($resultStub)); + ->willReturn($resultStub); $resultStub->expects($this->once()) ->method('numFields') - ->will($this->returnValue(0)); + ->willReturn(0); $resultStub->expects($this->once()) ->method('fetchRow') - ->will($this->returnValue([])); + ->willReturn([]); $GLOBALS['dbi'] = $dbi; $GLOBALS['mediawiki_caption'] = true; @@ -500,19 +500,19 @@ class ExportOdtTest extends AbstractTestCase $dbi->expects($this->once()) ->method('getColumns') ->with('database', '') - ->will($this->returnValue([$columns])); + ->willReturn([$columns]); $dbi->expects($this->once()) ->method('tryQueryAsControlUser') - ->will($this->returnValue($resultStub)); + ->willReturn($resultStub); $resultStub->expects($this->once()) ->method('numRows') - ->will($this->returnValue(1)); + ->willReturn(1); $resultStub->expects($this->once()) ->method('fetchAssoc') - ->will($this->returnValue(['comment' => 'testComment'])); + ->willReturn(['comment' => 'testComment']); $GLOBALS['dbi'] = $dbi; $this->object->relation = new Relation($dbi); @@ -520,7 +520,7 @@ class ExportOdtTest extends AbstractTestCase $this->object->expects($this->exactly(2)) ->method('formatOneColumnDefinition') ->with(['Field' => 'fieldname']) - ->will($this->returnValue(1)); + ->willReturn(1); $_SESSION['relation'] = []; $_SESSION['relation'][$GLOBALS['server']] = RelationParameters::fromArray([ @@ -593,19 +593,19 @@ class ExportOdtTest extends AbstractTestCase $dbi->expects($this->once()) ->method('getColumns') ->with('database', '') - ->will($this->returnValue([$columns])); + ->willReturn([$columns]); $dbi->expects($this->once()) ->method('tryQueryAsControlUser') - ->will($this->returnValue($resultStub)); + ->willReturn($resultStub); $resultStub->expects($this->once()) ->method('numRows') - ->will($this->returnValue(1)); + ->willReturn(1); $resultStub->expects($this->once()) ->method('fetchAssoc') - ->will($this->returnValue(['comment' => 'testComment'])); + ->willReturn(['comment' => 'testComment']); $GLOBALS['dbi'] = $dbi; $this->object->relation = new Relation($dbi); @@ -651,7 +651,7 @@ class ExportOdtTest extends AbstractTestCase $dbi->expects($this->once()) ->method('getTriggers') ->with('database', 'tawill($this->returnValue($triggers)); + ->willReturn($triggers); $GLOBALS['dbi'] = $dbi; diff --git a/test/classes/Plugins/Export/ExportSqlTest.php b/test/classes/Plugins/Export/ExportSqlTest.php index e355085..97d750c 100644 --- a/test/classes/Plugins/Export/ExportSqlTest.php +++ b/test/classes/Plugins/Export/ExportSqlTest.php @@ -112,10 +112,10 @@ class ExportSqlTest extends AbstractTestCase $dbi->expects($this->once()) ->method('getCompatibilities') - ->will($this->returnValue(['v1', 'v2'])); + ->willReturn(['v1', 'v2']); $dbi->expects($this->any())->method('escapeString') - ->will($this->returnArgument(0)); + ->willReturnArgument(0); $GLOBALS['dbi'] = $dbi; $GLOBALS['plugin_param']['export_type'] = 'server'; @@ -364,7 +364,7 @@ class ExportSqlTest extends AbstractTestCase $dbi->expects($this->once()) ->method('fetchValue') ->with('SELECT @@session.time_zone') - ->will($this->returnValue('old_tz')); + ->willReturn('old_tz'); $dbi->expects($this->once()) ->method('query') @@ -406,12 +406,12 @@ class ExportSqlTest extends AbstractTestCase ->disableOriginalConstructor() ->getMock(); $dbi->expects($this->any())->method('escapeString') - ->will($this->returnArgument(0)); + ->willReturnArgument(0); $dbi->expects($this->once()) ->method('getDbCollation') ->with('db') - ->will($this->returnValue('utf8_general_ci')); + ->willReturn('utf8_general_ci'); $GLOBALS['dbi'] = $dbi; @@ -439,12 +439,12 @@ class ExportSqlTest extends AbstractTestCase ->disableOriginalConstructor() ->getMock(); $dbi->expects($this->any())->method('escapeString') - ->will($this->returnArgument(0)); + ->willReturnArgument(0); $dbi->expects($this->once()) ->method('getDbCollation') ->with('db') - ->will($this->returnValue('testcollation')); + ->willReturn('testcollation'); $GLOBALS['dbi'] = $dbi; @@ -505,32 +505,30 @@ class ExportSqlTest extends AbstractTestCase $dbi->expects($this->once()) ->method('fetchResult') ->with('SELECT EVENT_NAME FROM information_schema.EVENTS WHERE EVENT_SCHEMA= \'db\';') - ->will($this->returnValue(['f1', 'f2'])); + ->willReturn(['f1', 'f2']); $dbi->expects($this->exactly(2)) ->method('getDefinition') - ->will( - $this->returnValueMap( + ->willReturnMap( + [ [ - [ - 'db', - 'EVENT', - 'f1', - DatabaseInterface::CONNECT_USER, - 'f1event', - ], - [ - 'db', - 'EVENT', - 'f2', - DatabaseInterface::CONNECT_USER, - 'f2event', - ], - ] - ) + 'db', + 'EVENT', + 'f1', + DatabaseInterface::CONNECT_USER, + 'f1event', + ], + [ + 'db', + 'EVENT', + 'f2', + DatabaseInterface::CONNECT_USER, + 'f2event', + ], + ] ); $dbi->expects($this->any())->method('escapeString') - ->will($this->returnArgument(0)); + ->willReturnArgument(0); $GLOBALS['dbi'] = $dbi; @@ -560,7 +558,7 @@ class ExportSqlTest extends AbstractTestCase ->disableOriginalConstructor() ->getMock(); $dbi->expects($this->any())->method('escapeString') - ->will($this->returnArgument(0)); + ->willReturnArgument(0); $GLOBALS['dbi'] = $dbi; @@ -580,15 +578,13 @@ class ExportSqlTest extends AbstractTestCase ->disableOriginalConstructor() ->getMock(); $dbi->expects($this->any())->method('escapeString') - ->will($this->returnArgument(0)); + ->willReturnArgument(0); $dbi->expects($this->once()) ->method('getColumnsFull') ->with('db', 'view') - ->will( - $this->returnValue( - ['cname' => ['Type' => 'int']] - ) + ->willReturn( + ['cname' => ['Type' => 'int']] ); $GLOBALS['dbi'] = $dbi; @@ -609,24 +605,22 @@ class ExportSqlTest extends AbstractTestCase ->disableOriginalConstructor() ->getMock(); $dbi->expects($this->any())->method('escapeString') - ->will($this->returnArgument(0)); + ->willReturnArgument(0); $dbi->expects($this->any()) ->method('getColumns') ->with('db', 'view') - ->will( - $this->returnValue( - [ - 'cname' => [ - 'Type' => 'char', - 'Collation' => 'utf-8', - 'Null' => 'NO', - 'Default' => 'a', - 'Comment' => 'cmt', - 'Field' => 'fname', - ], - ] - ) + ->willReturn( + [ + 'cname' => [ + 'Type' => 'char', + 'Collation' => 'utf-8', + 'Null' => 'NO', + 'Default' => 'a', + 'Comment' => 'cmt', + 'Field' => 'fname', + ], + ] ); $GLOBALS['dbi'] = $dbi; @@ -647,23 +641,21 @@ class ExportSqlTest extends AbstractTestCase ->disableOriginalConstructor() ->getMock(); $dbi->expects($this->any())->method('escapeString') - ->will($this->returnArgument(0)); + ->willReturnArgument(0); $dbi->expects($this->any()) ->method('getColumns') ->with('db', 'view') - ->will( - $this->returnValue( - [ - 'cname' => [ - 'Type' => 'char', - 'Collation' => 'utf-8', - 'Null' => 'YES', - 'Comment' => 'cmt', - 'Field' => 'fname', - ], - ] - ) + ->willReturn( + [ + 'cname' => [ + 'Type' => 'char', + 'Collation' => 'utf-8', + 'Null' => 'YES', + 'Comment' => 'cmt', + 'Field' => 'fname', + ], + ] ); $GLOBALS['dbi'] = $dbi; @@ -704,18 +696,18 @@ class ExportSqlTest extends AbstractTestCase $dbi->expects($this->any()) ->method('query') - ->will($this->returnValue($resultStub)); + ->willReturn($resultStub); $dbi->expects($this->never()) ->method('fetchSingleRow'); $resultStub->expects($this->once()) ->method('numRows') - ->will($this->returnValue(1)); + ->willReturn(1); $dbi->expects($this->any()) ->method('fetchValue') - ->will($this->returnValue(false)); + ->willReturn(false); $tmpres = [ 'Auto_increment' => 1, @@ -726,7 +718,7 @@ class ExportSqlTest extends AbstractTestCase $resultStub->expects($this->once()) ->method('fetchAssoc') - ->will($this->returnValue($tmpres)); + ->willReturn($tmpres); $dbi->expects($this->exactly(3)) ->method('tryQuery') @@ -757,13 +749,13 @@ class ExportSqlTest extends AbstractTestCase $resultStub->expects($this->exactly(1)) ->method('fetchRow') - ->will($this->returnValue($row)); + ->willReturn($row); $dbi->expects($this->exactly(2)) ->method('getTable') - ->will($this->returnValue(new Table('table', 'db', $dbi))); + ->willReturn(new Table('table', 'db', $dbi)); $dbi->expects($this->any())->method('escapeString') - ->will($this->returnArgument(0)); + ->willReturnArgument(0); $GLOBALS['dbi'] = $dbi; $GLOBALS['cfg']['Server']['DisableIS'] = false; @@ -827,18 +819,18 @@ class ExportSqlTest extends AbstractTestCase $dbi->expects($this->any()) ->method('query') - ->will($this->returnValue($resultStub)); + ->willReturn($resultStub); $dbi->expects($this->never()) ->method('fetchSingleRow'); $resultStub->expects($this->once()) ->method('numRows') - ->will($this->returnValue(2)); + ->willReturn(2); $dbi->expects($this->any()) ->method('fetchValue') - ->will($this->returnValue(false)); + ->willReturn(false); $tmpres = [ 'Auto_increment' => 1, @@ -849,7 +841,7 @@ class ExportSqlTest extends AbstractTestCase $resultStub->expects($this->once()) ->method('fetchAssoc') - ->will($this->returnValue($tmpres)); + ->willReturn($tmpres); $dbi->expects($this->exactly(3)) ->method('tryQuery') @@ -857,14 +849,14 @@ class ExportSqlTest extends AbstractTestCase $dbi->expects($this->once()) ->method('getError') - ->will($this->returnValue('error occurred')); + ->willReturn('error occurred'); $dbi->expects($this->exactly(2)) ->method('getTable') - ->will($this->returnValue(new Table('table', 'db', $dbi))); + ->willReturn(new Table('table', 'db', $dbi)); $dbi->expects($this->any()) ->method('escapeString') - ->will($this->returnArgument(0)); + ->willReturnArgument(0); $GLOBALS['dbi'] = $dbi; $GLOBALS['cfg']['Server']['DisableIS'] = false; @@ -893,7 +885,7 @@ class ExportSqlTest extends AbstractTestCase ->getMock(); $dbi->expects($this->any())->method('escapeString') - ->will($this->returnArgument(0)); + ->willReturnArgument(0); $dbi->expects($this->exactly(2)) ->method('fetchResult') @@ -1088,16 +1080,16 @@ class ExportSqlTest extends AbstractTestCase $dbi->expects($this->once()) ->method('getFieldsMeta') ->with($resultStub) - ->will($this->returnValue($flags)); + ->willReturn($flags); $dbi->expects($this->once()) ->method('tryQuery') ->with('SELECT a FROM b WHERE 1', DatabaseInterface::CONNECT_USER, DatabaseInterface::QUERY_UNBUFFERED) - ->will($this->returnValue($resultStub)); + ->willReturn($resultStub); $resultStub->expects($this->once()) ->method('numFields') - ->will($this->returnValue(5)); + ->willReturn(5); $resultStub->expects($this->exactly(2)) ->method('fetchRow') @@ -1112,21 +1104,21 @@ class ExportSqlTest extends AbstractTestCase [] ); $dbi->expects($this->any())->method('escapeString') - ->will($this->returnArgument(0)); + ->willReturnArgument(0); $_table = $this->getMockBuilder(Table::class) ->disableOriginalConstructor() ->getMock(); $_table->expects($this->once()) ->method('isMerge') - ->will($this->returnValue(false)); + ->willReturn(false); $_table->expects($this->once()) ->method('isView') - ->will($this->returnValue(false)); + ->willReturn(false); $dbi->expects($this->any()) ->method('getTable') - ->will($this->returnValue($_table)); + ->willReturn($_table); $GLOBALS['dbi'] = $dbi; $GLOBALS['sql_compatibility'] = 'MSSQL'; @@ -1192,16 +1184,16 @@ class ExportSqlTest extends AbstractTestCase $dbi->expects($this->once()) ->method('getFieldsMeta') ->with($resultStub) - ->will($this->returnValue($flags)); + ->willReturn($flags); $dbi->expects($this->once()) ->method('tryQuery') ->with('SELECT a FROM b WHERE 1', DatabaseInterface::CONNECT_USER, DatabaseInterface::QUERY_UNBUFFERED) - ->will($this->returnValue($resultStub)); + ->willReturn($resultStub); $resultStub->expects($this->once()) ->method('numFields') - ->will($this->returnValue(2)); + ->willReturn(2); $resultStub->expects($this->exactly(2)) ->method('fetchRow') @@ -1218,16 +1210,16 @@ class ExportSqlTest extends AbstractTestCase ->getMock(); $_table->expects($this->once()) ->method('isMerge') - ->will($this->returnValue(false)); + ->willReturn(false); $_table->expects($this->once()) ->method('isView') - ->will($this->returnValue(false)); + ->willReturn(false); $dbi->expects($this->any()) ->method('getTable') - ->will($this->returnValue($_table)); + ->willReturn($_table); $dbi->expects($this->any())->method('escapeString') - ->will($this->returnArgument(0)); + ->willReturnArgument(0); $GLOBALS['dbi'] = $dbi; $GLOBALS['sql_compatibility'] = 'MSSQL'; @@ -1262,16 +1254,16 @@ class ExportSqlTest extends AbstractTestCase ->getMock(); $_table->expects($this->once()) ->method('isMerge') - ->will($this->returnValue(false)); + ->willReturn(false); $_table->expects($this->once()) ->method('isView') - ->will($this->returnValue(true)); + ->willReturn(true); $dbi->expects($this->any()) ->method('getTable') - ->will($this->returnValue($_table)); + ->willReturn($_table); $dbi->expects($this->any())->method('escapeString') - ->will($this->returnArgument(0)); + ->willReturnArgument(0); $GLOBALS['dbi'] = $dbi; $GLOBALS['cfg']['Server']['DisableIS'] = false; @@ -1304,23 +1296,23 @@ class ExportSqlTest extends AbstractTestCase $dbi->expects($this->once()) ->method('getError') - ->will($this->returnValue('err')); + ->willReturn('err'); $_table = $this->getMockBuilder(Table::class) ->disableOriginalConstructor() ->getMock(); $_table->expects($this->once()) ->method('isMerge') - ->will($this->returnValue(false)); + ->willReturn(false); $_table->expects($this->once()) ->method('isView') - ->will($this->returnValue(false)); + ->willReturn(false); $dbi->expects($this->any()) ->method('getTable') - ->will($this->returnValue($_table)); + ->willReturn($_table); $dbi->expects($this->any())->method('escapeString') - ->will($this->returnArgument(0)); + ->willReturnArgument(0); $GLOBALS['dbi'] = $dbi; $GLOBALS['cfg']['Server']['DisableIS'] = false; diff --git a/test/classes/Plugins/Export/ExportTexytextTest.php b/test/classes/Plugins/Export/ExportTexytextTest.php index 972f901..381977d 100644 --- a/test/classes/Plugins/Export/ExportTexytextTest.php +++ b/test/classes/Plugins/Export/ExportTexytextTest.php @@ -218,7 +218,7 @@ class ExportTexytextTest extends AbstractTestCase $dbi->expects($this->once()) ->method('getTableIndexes') ->with('db', 'table') - ->will($this->returnValue($keys)); + ->willReturn($keys); $dbi->expects($this->exactly(2)) ->method('fetchResult') @@ -240,10 +240,8 @@ class ExportTexytextTest extends AbstractTestCase $dbi->expects($this->once()) ->method('fetchValue') - ->will( - $this->returnValue( - 'SELECT a FROM b' - ) + ->willReturn( + 'SELECT a FROM b' ); $columns = [ @@ -254,7 +252,7 @@ class ExportTexytextTest extends AbstractTestCase $dbi->expects($this->exactly(2)) ->method('getColumns') ->with('db', 'table') - ->will($this->returnValue([$columns])); + ->willReturn([$columns]); $GLOBALS['dbi'] = $dbi; $this->object->relation = new Relation($dbi); @@ -262,7 +260,7 @@ class ExportTexytextTest extends AbstractTestCase $this->object->expects($this->exactly(1)) ->method('formatOneColumnDefinition') ->with(['Field' => 'fname', 'Comment' => 'comm'], ['cname']) - ->will($this->returnValue(1)); + ->willReturn(1); $_SESSION['relation'] = []; $_SESSION['relation'][$GLOBALS['server']] = RelationParameters::fromArray([ @@ -297,7 +295,7 @@ class ExportTexytextTest extends AbstractTestCase $dbi->expects($this->once()) ->method('getTriggers') ->with('database', 'tawill($this->returnValue($triggers)); + ->willReturn($triggers); $GLOBALS['dbi'] = $dbi; diff --git a/test/classes/Plugins/Export/ExportXmlTest.php b/test/classes/Plugins/Export/ExportXmlTest.php index f2e4505..806b484 100644 --- a/test/classes/Plugins/Export/ExportXmlTest.php +++ b/test/classes/Plugins/Export/ExportXmlTest.php @@ -184,15 +184,13 @@ class ExportXmlTest extends AbstractTestCase $dbi->expects($this->once()) ->method('getTriggers') ->with('d<"b', 'table') - ->will( - $this->returnValue( + ->willReturn( + [ [ - [ - 'create' => 'crt', - 'name' => 'trname', - ], - ] - ) + 'create' => 'crt', + 'name' => 'trname', + ], + ] ); $dbi->expects($this->exactly(2)) @@ -208,9 +206,9 @@ class ExportXmlTest extends AbstractTestCase $dbi->expects($this->once()) ->method('getTable') - ->will($this->returnValue(new Table('table', 'd<"b', $dbi))); + ->willReturn(new Table('table', 'd<"b', $dbi)); $dbi->expects($this->any())->method('escapeString') - ->will($this->returnArgument(0)); + ->willReturnArgument(0); $GLOBALS['dbi'] = $dbi; @@ -284,7 +282,7 @@ class ExportXmlTest extends AbstractTestCase $dbi->expects($this->any()) ->method('getTable') - ->will($this->returnValue(new Table('table', 'd<"b', $dbi))); + ->willReturn(new Table('table', 'd<"b', $dbi)); $GLOBALS['dbi'] = $dbi; diff --git a/test/classes/Plugins/Import/ImportLdiTest.php b/test/classes/Plugins/Import/ImportLdiTest.php index 6c3d326..1ff04ca 100644 --- a/test/classes/Plugins/Import/ImportLdiTest.php +++ b/test/classes/Plugins/Import/ImportLdiTest.php @@ -106,13 +106,13 @@ class ImportLdiTest extends AbstractTestCase $resultStub = $this->createMock(DummyResult::class); $dbi->expects($this->any())->method('tryQuery') - ->will($this->returnValue($resultStub)); + ->willReturn($resultStub); $resultStub->expects($this->any())->method('numRows') - ->will($this->returnValue(10)); + ->willReturn(10); $resultStub->expects($this->any())->method('fetchValue') - ->will($this->returnValue('ON')); + ->willReturn('ON'); $GLOBALS['cfg']['Import']['ldi_local_option'] = 'auto'; $this->object = new ImportLdi(); @@ -140,7 +140,7 @@ class ImportLdiTest extends AbstractTestCase */ $dbi = $this->dbi; $dbi->expects($this->any())->method('escapeString') - ->will($this->returnArgument(0)); + ->willReturnArgument(0); $GLOBALS['dbi'] = $dbi; $importHandle = new File($GLOBALS['import_file']); @@ -202,7 +202,7 @@ class ImportLdiTest extends AbstractTestCase */ $dbi = $this->dbi; $dbi->expects($this->any())->method('escapeString') - ->will($this->returnArgument(0)); + ->willReturnArgument(0); $GLOBALS['dbi'] = $dbi; $ldi_local_option = true; diff --git a/test/classes/Properties/Options/OptionsPropertyGroupTest.php b/test/classes/Properties/Options/OptionsPropertyGroupTest.php index efac431..fe22789 100644 --- a/test/classes/Properties/Options/OptionsPropertyGroupTest.php +++ b/test/classes/Properties/Options/OptionsPropertyGroupTest.php @@ -24,7 +24,7 @@ class OptionsPropertyGroupTest extends AbstractTestCase protected function setUp(): void { parent::setUp(); - $this->stub = $this->getMockForAbstractClass(OptionsPropertyGroup::class); + $this->stub = $this->getMockBuilder(OptionsPropertyGroup::class)->onlyMethods(['getItemType'])->getMock(); } /** diff --git a/test/classes/Properties/Options/OptionsPropertyItemTest.php b/test/classes/Properties/Options/OptionsPropertyItemTest.php index 5c4c355..8f1de13 100644 --- a/test/classes/Properties/Options/OptionsPropertyItemTest.php +++ b/test/classes/Properties/Options/OptionsPropertyItemTest.php @@ -23,7 +23,7 @@ class OptionsPropertyItemTest extends AbstractTestCase protected function setUp(): void { parent::setUp(); - $this->stub = $this->getMockForAbstractClass(OptionsPropertyItem::class); + $this->stub = $this->getMockBuilder(OptionsPropertyItem::class)->onlyMethods(['getItemType'])->getMock(); } /** diff --git a/test/classes/Properties/Options/OptionsPropertyOneItemTest.php b/test/classes/Properties/Options/OptionsPropertyOneItemTest.php index c6fa7db..41abd6a 100644 --- a/test/classes/Properties/Options/OptionsPropertyOneItemTest.php +++ b/test/classes/Properties/Options/OptionsPropertyOneItemTest.php @@ -23,7 +23,7 @@ class OptionsPropertyOneItemTest extends AbstractTestCase protected function setUp(): void { parent::setUp(); - $this->stub = $this->getMockForAbstractClass(OptionsPropertyOneItem::class); + $this->stub = $this->getMockBuilder(OptionsPropertyOneItem::class)->onlyMethods(['getItemType'])->getMock(); } /** diff --git a/test/classes/Properties/Plugins/PluginPropertyItemTest.php b/test/classes/Properties/Plugins/PluginPropertyItemTest.php index 746bb7c..b9da68c 100644 --- a/test/classes/Properties/Plugins/PluginPropertyItemTest.php +++ b/test/classes/Properties/Plugins/PluginPropertyItemTest.php @@ -22,7 +22,7 @@ class PluginPropertyItemTest extends AbstractTestCase protected function setUp(): void { parent::setUp(); - $this->stub = $this->getMockForAbstractClass(PluginPropertyItem::class); + $this->stub = $this->getMockBuilder(PluginPropertyItem::class)->onlyMethods(['getItemType'])->getMock(); } /** diff --git a/test/classes/Properties/PropertyItemTest.php b/test/classes/Properties/PropertyItemTest.php index 6ace3d8..b524232 100644 --- a/test/classes/Properties/PropertyItemTest.php +++ b/test/classes/Properties/PropertyItemTest.php @@ -23,7 +23,7 @@ class PropertyItemTest extends AbstractTestCase protected function setUp(): void { parent::setUp(); - $this->stub = $this->getMockForAbstractClass(PropertyItem::class); + $this->stub = $this->getMockBuilder(PropertyItem::class)->getMock(); } /** diff --git a/test/classes/Server/PrivilegesTest.php b/test/classes/Server/PrivilegesTest.php index 0c72573..2f3fe0e 100644 --- a/test/classes/Server/PrivilegesTest.php +++ b/test/classes/Server/PrivilegesTest.php @@ -89,13 +89,11 @@ class PrivilegesTest extends AbstractTestCase $dbi->expects($this->any()) ->method('fetchResult') - ->will( - $this->returnValue( - [ - 'grant user1 select', - 'grant user2 delete', - ] - ) + ->willReturn( + [ + 'grant user1 select', + 'grant user2 delete', + ] ); $fetchSingleRow = [ @@ -105,24 +103,24 @@ class PrivilegesTest extends AbstractTestCase '@@old_passwords' => 0, ]; $dbi->expects($this->any())->method('fetchSingleRow') - ->will($this->returnValue($fetchSingleRow)); + ->willReturn($fetchSingleRow); $fetchValue = ['key1' => 'value1']; $dbi->expects($this->any())->method('fetchValue') - ->will($this->returnValue($fetchValue)); + ->willReturn($fetchValue); $resultStub = $this->createMock(DummyResult::class); $dbi->expects($this->any())->method('tryQuery') - ->will($this->returnValue($resultStub)); + ->willReturn($resultStub); $dbi->expects($this->any())->method('escapeString') - ->will($this->returnArgument(0)); + ->willReturnArgument(0); $dbi->expects($this->any())->method('isCreateUser') - ->will($this->returnValue(true)); + ->willReturn(true); $dbi->expects($this->any())->method('isGrantUser') - ->will($this->returnValue(true)); + ->willReturn(true); $GLOBALS['dbi'] = $dbi; $this->serverPrivileges->dbi = $dbi; @@ -387,7 +385,7 @@ class PrivilegesTest extends AbstractTestCase { // Case 1 : Test with Newer version $GLOBALS['dbi']->expects($this->any())->method('getVersion') - ->will($this->returnValue(50706)); + ->willReturn(50706); $this->serverPrivileges->dbi = $GLOBALS['dbi']; $dbname = 'pma_dbname'; @@ -419,7 +417,7 @@ class PrivilegesTest extends AbstractTestCase public function testAddUserOld(): void { $GLOBALS['dbi']->expects($this->any())->method('getVersion') - ->will($this->returnValue(50506)); + ->willReturn(50506); $this->serverPrivileges->dbi = $GLOBALS['dbi']; $dbname = 'pma_dbname'; @@ -556,10 +554,10 @@ class PrivilegesTest extends AbstractTestCase ->getMock(); $dbi->expects($this->any())->method('getVersion') - ->will($this->returnValue(8003)); + ->willReturn(8003); $dbi->expects($this->any()) ->method('escapeString') - ->will($this->returnArgument(0)); + ->willReturnArgument(0); $this->serverPrivileges->dbi = $dbi; @@ -604,10 +602,10 @@ class PrivilegesTest extends AbstractTestCase ->getMock(); $dbi->expects($this->any())->method('getVersion') - ->will($this->returnValue(80011)); + ->willReturn(80011); $dbi->expects($this->any()) ->method('escapeString') - ->will($this->returnArgument(0)); + ->willReturnArgument(0); $this->serverPrivileges->dbi = $dbi; @@ -705,7 +703,7 @@ class PrivilegesTest extends AbstractTestCase public function testGetSqlQueriesForDisplayAndAddUserMySql8011(): void { $GLOBALS['dbi']->expects($this->any())->method('getVersion') - ->will($this->returnValue(80011)); + ->willReturn(80011); $this->serverPrivileges->dbi = $GLOBALS['dbi']; $username = 'PMA_username'; @@ -738,7 +736,7 @@ class PrivilegesTest extends AbstractTestCase public function testGetSqlQueriesForDisplayAndAddUserMySql8016(): void { $GLOBALS['dbi']->expects($this->any())->method('getVersion') - ->will($this->returnValue(80016)); + ->willReturn(80016); $this->serverPrivileges->dbi = $GLOBALS['dbi']; $username = 'PMA_username'; @@ -767,7 +765,7 @@ class PrivilegesTest extends AbstractTestCase public function testGetSqlQueriesForDisplayAndAddUser(): void { $GLOBALS['dbi']->expects($this->any())->method('getVersion') - ->will($this->returnValue(50706)); + ->willReturn(50706); $this->serverPrivileges->dbi = $GLOBALS['dbi']; $username = 'PMA_username'; @@ -886,10 +884,10 @@ class PrivilegesTest extends AbstractTestCase ], ]; $dbi->expects($this->any())->method('fetchResult') - ->will($this->returnValue($fields_info)); + ->willReturn($fields_info); $dbi->expects($this->any()) ->method('escapeString') - ->will($this->returnArgument(0)); + ->willReturnArgument(0); $GLOBALS['dbi'] = $dbi; $this->serverPrivileges->dbi = $dbi; @@ -954,12 +952,12 @@ class PrivilegesTest extends AbstractTestCase ], ]; $dbi->expects($this->any())->method('fetchResult') - ->will($this->returnValue($fields_info)); + ->willReturn($fields_info); $dbi->expects($this->any()) ->method('escapeString') - ->will($this->returnArgument(0)); + ->willReturnArgument(0); $dbi->expects($this->any())->method('isGrantUser') - ->will($this->returnValue(true)); + ->willReturn(true); $GLOBALS['dbi'] = $dbi; $this->serverPrivileges->dbi = $dbi; @@ -1158,10 +1156,10 @@ class PrivilegesTest extends AbstractTestCase $expected_userGroup = 'pma_usergroup'; $dbi->expects($this->any())->method('fetchValue') - ->will($this->returnValue($expected_userGroup)); + ->willReturn($expected_userGroup); $dbi->expects($this->any()) ->method('escapeString') - ->will($this->returnArgument(0)); + ->willReturnArgument(0); $GLOBALS['dbi'] = $dbi; $this->serverPrivileges->dbi = $dbi; @@ -1466,10 +1464,9 @@ class PrivilegesTest extends AbstractTestCase $dbi->expects($this->once()) ->method('tryQuery') - ->will($this->returnValue($resultStub)); + ->willReturn($resultStub); $resultStub->expects($this->atLeastOnce()) - ->method('fetchRow') - ->will($this->onConsecutiveCalls(['-'], ['"'], ['%'], ['\\'], [''], [])); + ->method('fetchRow')->willReturnOnConsecutiveCalls(['-'], ['"'], ['%'], ['\\'], [''], []); $this->serverPrivileges->dbi = $dbi; $actual = $this->serverPrivileges->getHtmlForInitials(); @@ -1519,24 +1516,18 @@ class PrivilegesTest extends AbstractTestCase ->getMock(); $dbi->expects($this->any()) ->method('query') - ->will($this->returnValue($resultStub)); + ->willReturn($resultStub); $dbi->expects($this->any()) ->method('fetchResult') - ->will($this->returnValue(['db', 'columns_priv'])); + ->willReturn(['db', 'columns_priv']); $resultStub->expects($this->any()) - ->method('fetchAssoc') - ->will( - $this->onConsecutiveCalls( - [ - 'User' => 'pmauser', - 'Host' => 'local', - ], - [] - ) - ); + ->method('fetchAssoc')->willReturnOnConsecutiveCalls([ + 'User' => 'pmauser', + 'Host' => 'local', + ], []); $dbi->expects($this->any()) ->method('escapeString') - ->will($this->returnArgument(0)); + ->willReturnArgument(0); $_GET['initial'] = 'A'; $GLOBALS['dbi'] = $dbi; @@ -1569,14 +1560,13 @@ class PrivilegesTest extends AbstractTestCase ->disableOriginalConstructor() ->getMock(); $dbi->expects($this->any()) - ->method('tryQuery') - ->will($this->onConsecutiveCalls($resultStub, $resultStub, false)); + ->method('tryQuery')->willReturnOnConsecutiveCalls($resultStub, $resultStub, false); $dbi->expects($this->any()) ->method('getError') - ->will($this->returnValue('Some error occurred!')); + ->willReturn('Some error occurred!'); $dbi->expects($this->any()) ->method('escapeString') - ->will($this->returnArgument(0)); + ->willReturnArgument(0); $GLOBALS['dbi'] = $dbi; $this->serverPrivileges->dbi = $dbi; diff --git a/test/classes/Setup/FormProcessingTest.php b/test/classes/Setup/FormProcessingTest.php index bc70544..cf0f126 100644 --- a/test/classes/Setup/FormProcessingTest.php +++ b/test/classes/Setup/FormProcessingTest.php @@ -56,7 +56,7 @@ class FormProcessingTest extends AbstractNetworkTestCase $formDisplay->expects($this->once()) ->method('process') ->with(false) - ->will($this->returnValue(false)); + ->willReturn(false); $formDisplay->expects($this->once()) ->method('getDisplay'); @@ -72,12 +72,12 @@ class FormProcessingTest extends AbstractNetworkTestCase $formDisplay->expects($this->once()) ->method('process') ->with(false) - ->will($this->returnValue(true)); + ->willReturn(true); $formDisplay->expects($this->once()) ->method('hasErrors') ->with() - ->will($this->returnValue(true)); + ->willReturn(true); ob_start(); FormProcessing::process($formDisplay); @@ -102,12 +102,12 @@ class FormProcessingTest extends AbstractNetworkTestCase $formDisplay->expects($this->once()) ->method('process') ->with(false) - ->will($this->returnValue(true)); + ->willReturn(true); $formDisplay->expects($this->once()) ->method('hasErrors') ->with() - ->will($this->returnValue(false)); + ->willReturn(false); FormProcessing::process($formDisplay); } diff --git a/test/classes/StorageEngineTest.php b/test/classes/StorageEngineTest.php index ba12f08..b5b8a09 100644 --- a/test/classes/StorageEngineTest.php +++ b/test/classes/StorageEngineTest.php @@ -18,7 +18,6 @@ use PhpMyAdmin\Engines\Ndbcluster; use PhpMyAdmin\Engines\Pbxt; use PhpMyAdmin\Engines\PerformanceSchema; use PhpMyAdmin\StorageEngine; -use PHPUnit\Framework\MockObject\MockObject; use function json_encode; @@ -28,7 +27,7 @@ use function json_encode; #[\PHPUnit\Framework\Attributes\CoversClass(\PhpMyAdmin\StorageEngine::class)] class StorageEngineTest extends AbstractTestCase { - /** @var StorageEngine|MockObject */ + /** @var StorageEngine */ protected $object; /** @@ -39,10 +38,7 @@ class StorageEngineTest extends AbstractTestCase { parent::setUp(); $GLOBALS['server'] = 1; - $this->object = $this->getMockForAbstractClass( - StorageEngine::class, - ['dummy'] - ); + $this->object = new StorageEngine('dummy'); } /** @@ -81,12 +77,12 @@ class StorageEngineTest extends AbstractTestCase 'Support' => 'NO', 'Comment' => 'Pbxt storage engine', ], - ], $this->object->getStorageEngines()); + ], StorageEngine::getStorageEngines()); } public function testGetArray(): void { - $actual = $this->object->getArray(); + $actual = StorageEngine::getArray(); self::assertSame([ 'dummy' => [ @@ -181,10 +177,10 @@ class StorageEngineTest extends AbstractTestCase */ public function testIsValid(): void { - self::assertTrue($this->object->isValid('PBMS')); - self::assertTrue($this->object->isValid('dummy')); - self::assertTrue($this->object->isValid('dummy2')); - self::assertFalse($this->object->isValid('invalid')); + self::assertTrue(StorageEngine::isValid('PBMS')); + self::assertTrue(StorageEngine::isValid('dummy')); + self::assertTrue(StorageEngine::isValid('dummy2')); + self::assertFalse(StorageEngine::isValid('invalid')); } /** diff --git a/test/classes/SystemDatabaseTest.php b/test/classes/SystemDatabaseTest.php index 2f2e51c..ddfbe11 100644 --- a/test/classes/SystemDatabaseTest.php +++ b/test/classes/SystemDatabaseTest.php @@ -42,7 +42,7 @@ class SystemDatabaseTest extends AbstractTestCase $dbi->expects($this->any()) ->method('tryQuery') - ->will($this->returnValue($resultStub)); + ->willReturn($resultStub); $_SESSION['relation'] = []; $_SESSION['relation'][$GLOBALS['server']] = RelationParameters::fromArray([ @@ -82,17 +82,15 @@ class SystemDatabaseTest extends AbstractTestCase $resultStub->expects($this->any()) ->method('fetchAssoc') - ->will( - $this->returnValue( - [ - 'table_name' => 'table_name', - 'column_name' => 'column_name', - 'comment' => 'comment', - 'mimetype' => 'mimetype', - 'transformation' => 'transformation', - 'transformation_options' => 'transformation_options', - ] - ) + ->willReturn( + [ + 'table_name' => 'table_name', + 'column_name' => 'column_name', + 'comment' => 'comment', + 'mimetype' => 'mimetype', + 'transformation' => 'transformation', + 'transformation_options' => 'transformation_options', + ] ); $db = 'PMA_db'; diff --git a/test/classes/Table/IndexesTest.php b/test/classes/Table/IndexesTest.php index b823e1e..a399b31 100644 --- a/test/classes/Table/IndexesTest.php +++ b/test/classes/Table/IndexesTest.php @@ -62,7 +62,7 @@ class IndexesTest extends AbstractTestCase ]; $dbi->expects($this->any())->method('getTableIndexes') - ->will($this->returnValue($indexs)); + ->willReturn($indexs); $GLOBALS['dbi'] = $dbi; @@ -77,10 +77,10 @@ class IndexesTest extends AbstractTestCase ->disableOriginalConstructor() ->getMock(); $table->expects($this->any())->method('getSqlQueryForIndexCreateOrEdit') - ->will($this->returnValue($sql_query)); + ->willReturn($sql_query); $GLOBALS['dbi']->expects($this->any())->method('getTable') - ->will($this->returnValue($table)); + ->willReturn($table); $response = new ResponseStub(); $index = new Index(); diff --git a/test/classes/TableTest.php b/test/classes/TableTest.php index 0ff4019..6c1893a 100644 --- a/test/classes/TableTest.php +++ b/test/classes/TableTest.php @@ -223,21 +223,19 @@ class TableTest extends AbstractTestCase ->getMock(); $dbi->expects($this->any())->method('fetchResult') - ->will($this->returnValueMap($fetchResult)); + ->willReturnMap($fetchResult); $dbi->expects($this->any())->method('fetchValue') - ->will( - $this->returnValue( - 'CREATE TABLE `PMA`.`PMA_BookMark_2` ( + ->willReturn( + 'CREATE TABLE `PMA`.`PMA_BookMark_2` ( `id` int(11) NOT NULL AUTO_INCREMENT, `username` text NOT NULL )' - ) ); $cache = new Cache(); $dbi->expects($this->any())->method('getCache') - ->will($this->returnValue($cache)); + ->willReturn($cache); $databases = []; $database_name = 'PMA'; @@ -249,7 +247,7 @@ class TableTest extends AbstractTestCase $databases[$database_name]['SCHEMA_LENGTH'] = 10; $dbi->expects($this->any())->method('getTablesFull') - ->will($this->returnValue($databases)); + ->willReturn($databases); $triggers = [ [ @@ -267,26 +265,26 @@ class TableTest extends AbstractTestCase ]; $dbi->expects($this->any())->method('getTriggers') - ->will($this->returnValue($triggers)); + ->willReturn($triggers); $dbi->expects($this->any())->method('query') - ->will($this->returnValue($resultStub)); + ->willReturn($resultStub); $dbi->expects($this->any())->method('insertId') - ->will($this->returnValue(10)); + ->willReturn(10); $resultStub->expects($this->any())->method('fetchAssoc') - ->will($this->returnValue([])); + ->willReturn([]); $value = ['Auto_increment' => 'Auto_increment']; $dbi->expects($this->any())->method('fetchSingleRow') - ->will($this->returnValue($value)); + ->willReturn($value); $resultStub->expects($this->any())->method('fetchRow') - ->will($this->returnValue([])); + ->willReturn([]); $dbi->expects($this->any())->method('escapeString') - ->will($this->returnArgument(0)); + ->willReturnArgument(0); $GLOBALS['dbi'] = $dbi; } @@ -1108,12 +1106,12 @@ class TableTest extends AbstractTestCase $dbi->expects($this->once()) ->method('tryQuery') ->with('SELECT * FROM `db`.`table` LIMIT 1') - ->will($this->returnValue($resultStub)); + ->willReturn($resultStub); $dbi->expects($this->once()) ->method('getFieldsMeta') ->with($resultStub) - ->will($this->returnValue(['aNonValidExampleToRefactor'])); + ->willReturn(['aNonValidExampleToRefactor']); $GLOBALS['dbi'] = $dbi; @@ -1256,7 +1254,7 @@ class TableTest extends AbstractTestCase ->getMock(); $dbi->expects($this->any()) ->method('tryQuery') - ->will($this->returnValue($resultStub)); + ->willReturn($resultStub); $resultStub->expects($this->any()) ->method('numRows') ->willReturnOnConsecutiveCalls(0, 10, 200); @@ -1305,11 +1303,11 @@ class TableTest extends AbstractTestCase $resultStub = $this->createMock(DummyResult::class); $resultStub->expects($this->any()) ->method('numRows') - ->will($this->returnValue(20)); + ->willReturn(20); $dbi = clone $GLOBALS['dbi']; $dbi->expects($this->any())->method('tryQuery') - ->will($this->returnValue($resultStub)); + ->willReturn($resultStub); $table = 'PMA_BookMark'; $db = 'PMA'; @@ -1375,7 +1373,7 @@ class TableTest extends AbstractTestCase ]; $GLOBALS['dbi']->expects($this->any())->method('getTable') - ->will($this->returnValueMap($getTableMap)); + ->willReturnMap($getTableMap); $return = Table::moveCopy($source_db, $source_table, $target_db, $target_table, $what, $move, $mode, true); @@ -1404,7 +1402,7 @@ class TableTest extends AbstractTestCase // Renaming DB with a view bug $resultStub = $this->createMock(DummyResult::class); $GLOBALS['dbi']->expects($this->any())->method('tryQuery') - ->will($this->returnValueMap([ + ->willReturnMap([ [ 'SHOW CREATE TABLE `aa`.`ad`', 256, @@ -1412,16 +1410,16 @@ class TableTest extends AbstractTestCase true, $resultStub, ], - ])); + ]); $resultStub->expects($this->any()) ->method('fetchRow') - ->will($this->returnValue([ + ->willReturn([ 'ad', 'CREATE ALGORITHM=UNDEFINED DEFINER=`root`@`localhost`' . ' SQL SECURITY DEFINER VIEW `ad` AS select `aa`.`bb`.`ac` AS `ac` from `bb`', 'utf8mb4', 'utf8mb4_unicode_ci', - ])); + ]); $GLOBALS['sql_query'] = ''; $return = Table::moveCopy( diff --git a/test/classes/ThemeManagerTest.php b/test/classes/ThemeManagerTest.php index 0949aaf..99cc2fe 100644 --- a/test/classes/ThemeManagerTest.php +++ b/test/classes/ThemeManagerTest.php @@ -29,7 +29,7 @@ class ThemeManagerTest extends AbstractTestCase ->disableOriginalConstructor() ->getMock(); $dbi->expects($this->any())->method('escapeString') - ->will($this->returnArgument(0)); + ->willReturnArgument(0); } /** diff --git a/test/classes/TrackerTest.php b/test/classes/TrackerTest.php index 41df6ea..d752365 100644 --- a/test/classes/TrackerTest.php +++ b/test/classes/TrackerTest.php @@ -46,7 +46,7 @@ class TrackerTest extends AbstractTestCase ->disableOriginalConstructor() ->getMock(); $dbi->expects($this->any())->method('escapeString') - ->will($this->returnArgument(0)); + ->willReturnArgument(0); } /** @@ -199,7 +199,7 @@ class TrackerTest extends AbstractTestCase ]; $dbi->expects($this->once())->method('getColumns') ->with('pma_test', 'pma_tbl') - ->will($this->returnValue($getColumnsResult)); + ->willReturn($getColumnsResult); $getIndexesResult = [ [ @@ -210,19 +210,19 @@ class TrackerTest extends AbstractTestCase ]; $dbi->expects($this->once())->method('getTableIndexes') ->with('pma_test', 'pma_tbl') - ->will($this->returnValue($getIndexesResult)); + ->willReturn($getIndexesResult); $dbi->expects($this->exactly(3)) ->method('tryQuery') ->willReturnOnConsecutiveCalls($resultStub, $resultStub, $resultStub); $dbi->expects($this->any())->method('query') - ->will($this->returnValue($resultStub)); + ->willReturn($resultStub); $dbi->expects($this->any())->method('escapeString') - ->will($this->returnArgument(0)); + ->willReturnArgument(0); $dbi->expects($this->any())->method('getCompatibilities') - ->will($this->returnValue([])); + ->willReturn([]); $GLOBALS['dbi'] = $dbi; self::assertTrue(Tracker::createVersion('pma_test', 'pma_tbl', '1', '11', true)); @@ -247,9 +247,9 @@ class TrackerTest extends AbstractTestCase $dbi->expects($this->exactly(1)) ->method('queryAsControlUser') ->with($sql_query) - ->will($this->returnValue($resultStub)); + ->willReturn($resultStub); $dbi->expects($this->any())->method('escapeString') - ->will($this->returnArgument(0)); + ->willReturnArgument(0); $GLOBALS['dbi'] = $dbi; self::assertTrue(Tracker::deleteTracking('testdb', 'testtable')); @@ -279,10 +279,10 @@ class TrackerTest extends AbstractTestCase $dbi->expects($this->exactly(1)) ->method('queryAsControlUser') ->with($this->matches($expectedMainQuery)) - ->will($this->returnValue($resultStub)); + ->willReturn($resultStub); $dbi->expects($this->any())->method('escapeString') - ->will($this->returnArgument(0)); + ->willReturnArgument(0); $GLOBALS['dbi'] = $dbi; self::assertTrue(Tracker::createDatabaseVersion('pma_test', '1', 'SHOW DATABASES')); @@ -320,10 +320,10 @@ class TrackerTest extends AbstractTestCase $dbi->expects($this->exactly(1)) ->method('queryAsControlUser') ->with($sql_query) - ->will($this->returnValue($resultStub)); + ->willReturn($resultStub); $dbi->expects($this->any())->method('escapeString') - ->will($this->returnArgument(0)); + ->willReturnArgument(0); $GLOBALS['dbi'] = $dbi; @@ -381,23 +381,21 @@ class TrackerTest extends AbstractTestCase $resultStub2 = $this->createMock(DummyResult::class); $dbi->method('queryAsControlUser') - ->will( - $this->returnValueMap( + ->willReturnMap( + [ + [ + $sql_query_1, + $resultStub1, + ], [ - [ - $sql_query_1, - $resultStub1, - ], - [ - $sql_query_2, - $resultStub2, - ], - ] - ) + $sql_query_2, + $resultStub2, + ], + ] ); $dbi->expects($this->any())->method('escapeString') - ->will($this->returnArgument(0)); + ->willReturnArgument(0); $GLOBALS['dbi'] = $dbi; @@ -453,31 +451,29 @@ class TrackerTest extends AbstractTestCase $dbi->expects($this->once()) ->method('queryAsControlUser') - ->will($this->returnValue($resultStub)); + ->willReturn($resultStub); $resultStub->expects($this->once()) ->method('fetchAssoc') - ->will($this->returnValue($fetchArrayReturn)); + ->willReturn($fetchArrayReturn); $dbi->expects($this->any()) ->method('escapeString') - ->will( - $this->returnValueMap( + ->willReturnMap( + [ [ - [ - "pma'db", - "pma\'db", - ], - [ - "pma'table", - "pma\'table", - ], - [ - '1.0', - '1.0', - ], - ] - ) + "pma'db", + "pma\'db", + ], + [ + "pma'table", + "pma\'table", + ], + [ + '1.0', + '1.0', + ], + ] ); $GLOBALS['dbi'] = $dbi; diff --git a/test/classes/TransformationsTest.php b/test/classes/TransformationsTest.php index dbaa6c2..571b0d4 100644 --- a/test/classes/TransformationsTest.php +++ b/test/classes/TransformationsTest.php @@ -227,7 +227,7 @@ class TransformationsTest extends AbstractTestCase ->getMock(); $dbi->expects($this->any()) ->method('tryQuery') - ->will($this->returnValue(true)); + ->willReturn(true); $GLOBALS['dbi'] = $dbi; // Case 1 : no configuration storage diff --git a/test/classes/UserPreferencesTest.php b/test/classes/UserPreferencesTest.php index 6fcf008..c677433 100644 --- a/test/classes/UserPreferencesTest.php +++ b/test/classes/UserPreferencesTest.php @@ -96,17 +96,15 @@ class UserPreferencesTest extends AbstractNetworkTestCase $dbi->expects($this->once()) ->method('fetchSingleRow') ->with($query, DatabaseInterface::FETCH_ASSOC, DatabaseInterface::CONNECT_CONTROL) - ->will( - $this->returnValue( - [ - 'ts' => '123', - 'config_data' => json_encode([1, 2]), - ] - ) + ->willReturn( + [ + 'ts' => '123', + 'config_data' => json_encode([1, 2]), + ] ); $dbi->expects($this->any()) ->method('escapeString') - ->will($this->returnArgument(0)); + ->willReturnArgument(0); $GLOBALS['dbi'] = $dbi; @@ -174,16 +172,16 @@ class UserPreferencesTest extends AbstractNetworkTestCase $dbi->expects($this->once()) ->method('fetchValue') ->with($query1, 0, DatabaseInterface::CONNECT_CONTROL) - ->will($this->returnValue(true)); + ->willReturn(true); $dbi->expects($this->once()) ->method('tryQuery') ->with($query2, DatabaseInterface::CONNECT_CONTROL) - ->will($this->returnValue(true)); + ->willReturn(true); $dbi->expects($this->any()) ->method('escapeString') - ->will($this->returnArgument(0)); + ->willReturnArgument(0); $GLOBALS['dbi'] = $dbi; @@ -205,20 +203,20 @@ class UserPreferencesTest extends AbstractNetworkTestCase $dbi->expects($this->once()) ->method('fetchValue') ->with($query1, 0, DatabaseInterface::CONNECT_CONTROL) - ->will($this->returnValue(false)); + ->willReturn(false); $dbi->expects($this->once()) ->method('tryQuery') ->with($query2, DatabaseInterface::CONNECT_CONTROL) - ->will($this->returnValue(false)); + ->willReturn(false); $dbi->expects($this->once()) ->method('getError') ->with(DatabaseInterface::CONNECT_CONTROL) - ->will($this->returnValue('err1')); + ->willReturn('err1'); $dbi->expects($this->any()) ->method('escapeString') - ->will($this->returnArgument(0)); + ->willReturnArgument(0); $GLOBALS['dbi'] = $dbi; diff --git a/test/classes/UtilTest.php b/test/classes/UtilTest.php index 2fa25c4..1c474fb 100644 --- a/test/classes/UtilTest.php +++ b/test/classes/UtilTest.php @@ -2160,7 +2160,7 @@ class UtilTest extends AbstractTestCase ->getMock(); $dbi->expects($this->once()) ->method('getCurrentUserAndHost') - ->will($this->returnValue(['', ''])); + ->willReturn(['', '']); $oldDbi = $GLOBALS['dbi']; $GLOBALS['dbi'] = $dbi; @@ -2175,14 +2175,14 @@ class UtilTest extends AbstractTestCase ->getMock(); $dbi->expects($this->once()) ->method('getCurrentUserAndHost') - ->will($this->returnValue(['groot_%', '%'])); + ->willReturn(['groot_%', '%']); $dbi->expects($this->once()) ->method('fetchValue') ->with( 'SELECT `PRIVILEGE_TYPE` FROM `INFORMATION_SCHEMA`.`USER_PRIVILEGES`' . " WHERE GRANTEE='''groot_%''@''%''' AND PRIVILEGE_TYPE='EVENT'" ) - ->will($this->returnValue('EVENT')); + ->willReturn('EVENT'); $oldDbi = $GLOBALS['dbi']; $GLOBALS['dbi'] = $dbi; @@ -2197,14 +2197,14 @@ class UtilTest extends AbstractTestCase ->getMock(); $dbi->expects($this->once()) ->method('getCurrentUserAndHost') - ->will($this->returnValue(['groot_%', '%'])); + ->willReturn(['groot_%', '%']); $dbi->expects($this->once()) ->method('fetchValue') ->with( 'SELECT `PRIVILEGE_TYPE` FROM `INFORMATION_SCHEMA`.`USER_PRIVILEGES`' . " WHERE GRANTEE='''groot_%''@''%''' AND PRIVILEGE_TYPE='EVENT'" ) - ->will($this->returnValue(false)); + ->willReturn(false); $oldDbi = $GLOBALS['dbi']; $GLOBALS['dbi'] = $dbi; @@ -2225,7 +2225,7 @@ class UtilTest extends AbstractTestCase $dbi->expects($this->once()) ->method('getCurrentUserAndHost') - ->will($this->returnValue(['groot_%', '%'])); + ->willReturn(['groot_%', '%']); $dbi->expects($this->exactly(2)) ->method('fetchValue') ->willReturnOnConsecutiveCalls(false, 'EVENT'); @@ -2249,7 +2249,7 @@ class UtilTest extends AbstractTestCase $dbi->expects($this->once()) ->method('getCurrentUserAndHost') - ->will($this->returnValue(['groot_%', '%'])); + ->willReturn(['groot_%', '%']); $dbi->expects($this->exactly(2)) ->method('fetchValue') ->willReturnOnConsecutiveCalls(false, false); @@ -2273,7 +2273,7 @@ class UtilTest extends AbstractTestCase $dbi->expects($this->once()) ->method('getCurrentUserAndHost') - ->will($this->returnValue(['groot_%', '%'])); + ->willReturn(['groot_%', '%']); $dbi->expects($this->exactly(3)) ->method('fetchValue') ->willReturnOnConsecutiveCalls(false, false, 'EVENT'); @@ -2297,7 +2297,7 @@ class UtilTest extends AbstractTestCase $dbi->expects($this->once()) ->method('getCurrentUserAndHost') - ->will($this->returnValue(['groot_%', '%'])); + ->willReturn(['groot_%', '%']); $dbi->expects($this->exactly(3)) ->method('fetchValue') ->willReturnOnConsecutiveCalls(false, false, false); @@ -2497,11 +2497,11 @@ class UtilTest extends AbstractTestCase $dbi->expects($this->any()) ->method('isMariaDB') - ->will($this->returnValue($isMariaDB)); + ->willReturn($isMariaDB); $dbi->expects($this->any()) ->method('getVersion') - ->will($this->returnValue($version)); + ->willReturn($version); $oldDbi = $GLOBALS['dbi']; $GLOBALS['dbi'] = $dbi; diff --git a/test/classes/Utils/ForeignKeyTest.php b/test/classes/Utils/ForeignKeyTest.php index ed9352a..4aaa816 100644 --- a/test/classes/Utils/ForeignKeyTest.php +++ b/test/classes/Utils/ForeignKeyTest.php @@ -86,12 +86,12 @@ class ForeignKeyTest extends AbstractTestCase $dbi->expects($this->once()) ->method('getVariable') - ->will($this->returnValue('ON')); + ->willReturn('ON'); $dbi->expects($this->once()) ->method('setVariable') ->with('FOREIGN_KEY_CHECKS', $setVariableParam) - ->will($this->returnValue(true)); + ->willReturn(true); self::assertTrue(ForeignKey::handleDisableCheckInit()); } @@ -111,12 +111,12 @@ class ForeignKeyTest extends AbstractTestCase $dbi->expects($this->once()) ->method('getVariable') - ->will($this->returnValue('OFF')); + ->willReturn('OFF'); $dbi->expects($this->once()) ->method('setVariable') ->with('FOREIGN_KEY_CHECKS', $setVariableParam) - ->will($this->returnValue(true)); + ->willReturn(true); self::assertFalse(ForeignKey::handleDisableCheckInit()); } @@ -146,7 +146,7 @@ class ForeignKeyTest extends AbstractTestCase $dbi->expects($this->once()) ->method('setVariable') ->with('FOREIGN_KEY_CHECKS', $setVariableParam) - ->will($this->returnValue(true)); + ->willReturn(true); ForeignKey::handleDisableCheckCleanup($checkValue); } diff --git a/test/classes/Utils/GisTest.php b/test/classes/Utils/GisTest.php index 9d73695..0ddb175 100644 --- a/test/classes/Utils/GisTest.php +++ b/test/classes/Utils/GisTest.php @@ -41,16 +41,16 @@ class GisTest extends AbstractTestCase $dbi->expects($SRIDOption ? $this->once() : $this->exactly(2)) ->method('getVersion') - ->will($this->returnValue($mysqlVersion)); + ->willReturn($mysqlVersion); $dbi->expects($SRIDOption ? $this->once() : $this->exactly(2)) ->method('tryQuery') ->with($expectedQuery) - ->will($this->returnValue($resultStub));// Omit the real object + ->willReturn($resultStub);// Omit the real object $resultStub->expects($SRIDOption ? $this->once() : $this->exactly(2)) ->method('fetchRow') - ->will($this->returnValue($returnData)); + ->willReturn($returnData); $GLOBALS['dbi'] = $dbi; diff --git a/test/classes/VersionInformationTest.php b/test/classes/VersionInformationTest.php index 784174b..0f034f7 100644 --- a/test/classes/VersionInformationTest.php +++ b/test/classes/VersionInformationTest.php @@ -541,7 +541,7 @@ class VersionInformationTest extends AbstractTestCase $mockVersionInfo->expects($this->any()) ->method('getPHPVersion') - ->will($this->returnValue('5.2.4')); + ->willReturn('5.2.4'); self::assertTrue($mockVersionInfo->evaluateVersionCondition('PHP', '<=5.3')); self::assertTrue($mockVersionInfo->evaluateVersionCondition('PHP', '<5.3'));
Column