Fix PMA_Table to Table rename.
Signed-off-by: Hugues Peccatte <hugues.peccatte@gmail.com>
This commit is contained in:
parent
d7ab11e378
commit
fea67a7233
@ -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
|
||||
*/
|
||||
|
||||
@ -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
|
||||
|
||||
@ -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')
|
||||
|
||||
@ -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();
|
||||
|
||||
|
||||
@ -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();
|
||||
|
||||
|
||||
@ -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())
|
||||
|
||||
Loading…
Reference in New Issue
Block a user