From fea67a7233c4404ad2da43e3275824887c15259e Mon Sep 17 00:00:00 2001 From: Hugues Peccatte Date: Sun, 30 Aug 2015 00:19:23 +0200 Subject: [PATCH] Fix PMA_Table to Table rename. Signed-off-by: Hugues Peccatte --- libraries/Table.php | 4 ++-- .../controllers/DatabaseStructureController_test.php | 6 +----- test/classes/controllers/TableIndexesController_test.php | 4 ++-- test/classes/controllers/TableRelationController_test.php | 6 +++--- test/classes/controllers/TableStructureController_test.php | 2 +- test/classes/plugin/export/PMA_ExportSql_test.php | 2 +- 6 files changed, 10 insertions(+), 14 deletions(-) diff --git a/libraries/Table.php b/libraries/Table.php index faa8c0f412..d88736a519 100644 --- a/libraries/Table.php +++ b/libraries/Table.php @@ -89,7 +89,7 @@ class Table /** * returns table name * - * @see PMA_Table::getName() + * @see Table::getName() * @return string table name */ function __toString() @@ -598,7 +598,7 @@ class Table * @param string $expression expression for the virtual column * @param string $move_to new position for column * - * @see PMA_Table::generateFieldSpec() + * @see Table::generateFieldSpec() * * @return string field specification */ diff --git a/test/classes/controllers/DatabaseStructureController_test.php b/test/classes/controllers/DatabaseStructureController_test.php index 34d7797768..d5092cda11 100644 --- a/test/classes/controllers/DatabaseStructureController_test.php +++ b/test/classes/controllers/DatabaseStructureController_test.php @@ -16,11 +16,7 @@ use PMA\DI\Container; use PMA\libraries\Table; use PMA\libraries\Theme; - - require_once 'libraries/database_interface.inc.php'; - - require_once 'libraries/di/Container.class.php'; require_once 'test/libraries/stubs/ResponseStub.php'; require_once 'libraries/controllers/DatabaseStructureController.class.php'; @@ -69,7 +65,7 @@ class DatabaseStructureController_Test extends PHPUnit_Framework_TestCase $_SESSION['PMA_Theme'] = Theme::load('./themes/pmahomme'); $_SESSION['PMA_Theme'] = new Theme(); - $table = $this->getMockBuilder('PMA\libraries\PMA_Table') + $table = $this->getMockBuilder('PMA\libraries\Table') ->disableOriginalConstructor() ->getMock(); // Expect the table will have 6 rows diff --git a/test/classes/controllers/TableIndexesController_test.php b/test/classes/controllers/TableIndexesController_test.php index 8a4b3ceda0..88bf2b1892 100644 --- a/test/classes/controllers/TableIndexesController_test.php +++ b/test/classes/controllers/TableIndexesController_test.php @@ -98,7 +98,7 @@ class PMA_TableIndexesControllerTest extends PHPUnit_Framework_TestCase { $sql_query = 'ALTER TABLE `db`.`table` DROP PRIMARY KEY, ADD UNIQUE ;'; - $table = $this->getMockBuilder('PMA\libraries\PMA_Table') + $table = $this->getMockBuilder('PMA\libraries\Table') ->disableOriginalConstructor() ->getMock(); $table->expects($this->any())->method('getSqlQueryForIndexCreateOrEdit') @@ -145,7 +145,7 @@ class PMA_TableIndexesControllerTest extends PHPUnit_Framework_TestCase */ public function testDisplayFormAction() { - $table = $this->getMockBuilder('PMA\libraries\PMA_Table') + $table = $this->getMockBuilder('PMA\libraries\Table') ->disableOriginalConstructor() ->getMock(); $table->expects($this->any())->method('getStatusInfo') diff --git a/test/classes/controllers/TableRelationController_test.php b/test/classes/controllers/TableRelationController_test.php index 4d80f5b12f..2f0a0225ac 100644 --- a/test/classes/controllers/TableRelationController_test.php +++ b/test/classes/controllers/TableRelationController_test.php @@ -83,7 +83,7 @@ class TableRelationController_Test extends PHPUnit_Framework_TestCase $viewColumns = array( 'viewCol', 'viewCol2', 'viewCol3' ); - $tableMock = $this->getMockBuilder('PMA\libraries\PMA_Table') + $tableMock = $this->getMockBuilder('PMA\libraries\Table') ->disableOriginalConstructor() ->getMock(); // Test the situation when the table is a view @@ -129,7 +129,7 @@ class TableRelationController_Test extends PHPUnit_Framework_TestCase $indexedColumns = array( 'primaryTableCol' ); - $tableMock = $this->getMockBuilder('PMA\libraries\PMA_Table') + $tableMock = $this->getMockBuilder('PMA\libraries\Table') ->disableOriginalConstructor() ->getMock(); // Test the situation when the table is a view @@ -265,7 +265,7 @@ class TableRelationController_Test extends PHPUnit_Framework_TestCase } runkit_constant_redefine('PMA_DRIZZLE', true); - $tableMock = $this->getMockBuilder('PMA\libraries\PMA_Table') + $tableMock = $this->getMockBuilder('PMA\libraries\Table') ->disableOriginalConstructor() ->getMock(); diff --git a/test/classes/controllers/TableStructureController_test.php b/test/classes/controllers/TableStructureController_test.php index 12d734f46b..90e9e317b7 100644 --- a/test/classes/controllers/TableStructureController_test.php +++ b/test/classes/controllers/TableStructureController_test.php @@ -67,7 +67,7 @@ class TableStructureController_Test extends PHPUnit_Framework_TestCase $_SESSION['PMA_Theme'] = Theme::load('./themes/pmahomme'); $_SESSION['PMA_Theme'] = new Theme(); - $table = $this->getMockBuilder('PMA\libraries\PMA_Table') + $table = $this->getMockBuilder('PMA\libraries\Table') ->disableOriginalConstructor() ->getMock(); diff --git a/test/classes/plugin/export/PMA_ExportSql_test.php b/test/classes/plugin/export/PMA_ExportSql_test.php index 275dfc7833..4cced7c57d 100644 --- a/test/classes/plugin/export/PMA_ExportSql_test.php +++ b/test/classes/plugin/export/PMA_ExportSql_test.php @@ -2031,7 +2031,7 @@ class PMA_ExportSql_Test extends PHPUnit_Framework_TestCase ->disableOriginalConstructor() ->getMock(); - $_table = $this->getMockBuilder('PMA\libraries\PMA_Table') + $_table = $this->getMockBuilder('PMA\libraries\Table') ->disableOriginalConstructor() ->getMock(); $_table->expects($this->once())