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

Update controllers' namespace.

Browse Source 
Move table controllers into 'table' folder.

Signed-off-by: Hugues Peccatte <hugues.peccatte@gmail.com>
This commit is contained in:
Hugues Peccatte 2015-09-01 21:56:14 +02:00
commit 5207ba43a7
24 changed files with 90 additions and 126 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

8
db_structure.php
View File

@ -8,6 +8,7 @@
namespace PMA;
use PMA\libraries\controllers\DatabaseStructureController;
use PMA\libraries\Response;
use PMA\libraries\Util;
@ -27,12 +28,11 @@ list(
) = Util::getDbInfo($GLOBALS['db'], isset($sub_part) ? $sub_part : '');
require_once 'libraries/di/Container.class.php';
require_once 'libraries/controllers/DatabaseStructureController.class.php';
$container = DI\Container::getDefaultContainer();
$container->factory('PMA\Controllers\DatabaseStructureController');
$container->factory('PMA\libraries\controllers\DatabaseStructureController');
$container->alias(
'DatabaseStructureController', 'PMA\Controllers\DatabaseStructureController'
'DatabaseStructureController', 'PMA\libraries\controllers\DatabaseStructureController'
);
$container->set('PMA\libraries\Response', Response::getInstance());
$container->alias('response', 'PMA\libraries\Response');
@ -49,6 +49,6 @@ $dependency_definitions = array(
'tables' => $tables,
);
/** @var Controllers\DatabaseStructureController $controller */
/** @var DatabaseStructureController $controller */
$controller = $container->get('DatabaseStructureController', $dependency_definitions);
$controller->indexAction();

2
libraries/controllers/Controller.class.php → libraries/controllers/Controller.php
View File

@ -5,7 +5,7 @@
*
* @package PMA
*/
namespace PMA\Controllers;
namespace PMA\libraries\controllers;
use PMA\DI\Container;
use PMA\libraries\DatabaseInterface;

11
libraries/controllers/DatabaseController.class.php → libraries/controllers/DatabaseController.php
View File

@ -5,16 +5,7 @@
*
* @package PMA
*/
namespace PMA\Controllers;
use PMA\DI\Container;
if (!defined('PHPMYADMIN')) {
exit;
}
require_once 'libraries/controllers/Controller.class.php';
namespace PMA\libraries\controllers;
/**
* Handles database related logic

3
libraries/controllers/DatabaseStructureController.class.php → libraries/controllers/DatabaseStructureController.php
View File

@ -7,7 +7,7 @@
* @package PMA
*/
namespace PMA\Controllers;
namespace PMA\libraries\controllers;
use PMA\libraries\config\PageSettings;
use PMA\libraries\Message;
@ -18,7 +18,6 @@ use PMA\libraries\Util;
require_once 'libraries/mysql_charsets.inc.php';
require_once 'libraries/display_create_table.lib.php';
require_once 'libraries/controllers/DatabaseController.class.php';
require_once 'libraries/config/messages.inc.php';
require_once 'libraries/config/user_preferences.forms.php';
require_once 'libraries/config/page_settings.forms.php';

11
libraries/controllers/TableController.class.php → libraries/controllers/TableController.php
View File

@ -5,16 +5,7 @@
*
* @package PMA
*/
namespace PMA\Controllers;
use PMA\DI\Container;
if (!defined('PHPMYADMIN')) {
exit;
}
require_once 'libraries/controllers/Controller.class.php';
namespace PMA\libraries\controllers;
/**
* Handles table related logic

3
libraries/controllers/TableStructureController.class.php → libraries/controllers/TableStructureController.php
View File

@ -7,7 +7,7 @@
* @package PMA
*/
namespace PMA\Controllers;
namespace PMA\libraries\controllers;
use PMA\libraries\config\PageSettings;
use PMA\libraries\Index;
@ -22,7 +22,6 @@ use SqlParser\Utils\Table;
require_once 'libraries/mysql_charsets.inc.php';
require_once 'libraries/transformations.lib.php';
require_once 'libraries/util.lib.php';
require_once 'libraries/controllers/TableController.class.php';
require_once 'libraries/config/messages.inc.php';
require_once 'libraries/config/user_preferences.forms.php';
require_once 'libraries/config/page_settings.forms.php';

5
libraries/controllers/TableChartController.class.php → libraries/controllers/table/TableChartController.php
View File

@ -7,14 +7,13 @@
* @package PMA
*/
namespace PMA\Controllers\Table;
namespace PMA\libraries\controllers\table;
use PMA\Controllers\TableController;
use PMA\libraries\controllers\tableController;
use PMA\libraries\Message;
use PMA\libraries\Template;
use PMA\libraries\Util;
require_once 'libraries/controllers/TableController.class.php';
/**
* Handles table related logic

7
libraries/controllers/TableGisVisualizationController.class.php → libraries/controllers/table/TableGisVisualizationController.php
View File

@ -7,23 +7,22 @@
* @package PMA
*/
namespace PMA\Controllers\Table;
namespace PMA\libraries\controllers\table;
use PMA\Controllers\TableController;
use PMA\libraries\controllers\tableController;
use PMA\libraries\Message;
use PMA\libraries\Template;
use PMA_GIS_Visualization;
require_once 'libraries/common.inc.php';
require_once 'libraries/db_common.inc.php';
require_once 'libraries/controllers/TableController.class.php';
require_once 'libraries/gis/GIS_Visualization.class.php';
require_once 'libraries/gis/GIS_Factory.class.php';
/**
* Class TableGisVisualizationController
*
* @package PMA\Controllers\Table
* @package PMA\libraries\controllers\table
*/
class TableGisVisualizationController extends TableController
{

7
libraries/controllers/TableIndexesController.class.php → libraries/controllers/table/TableIndexesController.php
View File

@ -7,20 +7,19 @@
* @package PMA
*/
namespace PMA\Controllers\Table;
namespace PMA\libraries\controllers\table;
use PMA\Controllers\TableController;
use PMA\libraries\controllers\tableController;
use PMA\libraries\Index;
use PMA\libraries\Message;
use PMA\libraries\Template;
use PMA\libraries\Util;
require_once 'libraries/controllers/TableController.class.php';
/**
* Class TableIndexesController
*
* @package PMA\Controllers\Table
* @package PMA\libraries\controllers\table
*/
class TableIndexesController extends TableController
{

5
libraries/controllers/TableRelationController.class.php → libraries/controllers/table/TableRelationController.php
View File

@ -6,12 +6,11 @@
* @package PMA
*/
namespace PMA\Controllers\Table;
namespace PMA\libraries\controllers\table;
require_once 'libraries/controllers/TableController.class.php';
require_once 'libraries/index.lib.php';
use PMA\Controllers\TableController;
use PMA\libraries\controllers\tableController;
use PMA\libraries\DatabaseInterface;
use PMA\libraries\Index;
use PMA\libraries\Table;

9
libraries/controllers/TableSearchController.class.php → libraries/controllers/table/TableSearchController.php
View File

@ -1,22 +1,21 @@
<?php
/* vim: set expandtab sw=4 ts=4 sts=4: */
/**
* Holds the PMA\Controllers\Table\TableSearchController
* Holds the PMA\libraries\controllers\table\TableSearchController
*
* @package PMA\Controllers\Table
* @package PMA\libraries\controllers\table
*/
namespace PMA\Controllers\Table;
namespace PMA\libraries\controllers\table;
use PMA\libraries\Util;
use PMA\libraries\Template;
use PMA\Controllers\TableController;
use PMA\libraries\controllers\tableController;
use PMA\libraries\DatabaseInterface;
require_once 'libraries/mysql_charsets.inc.php';
require_once 'libraries/sql.lib.php';
require_once 'libraries/bookmark.lib.php';
require_once 'libraries/controllers/TableController.class.php';
/**
* Class TableSearchController

8
tbl_chart.php
View File

@ -12,12 +12,12 @@ use PMA\libraries\Response;
require_once 'libraries/common.inc.php';
require_once 'libraries/di/Container.class.php';
require_once 'libraries/controllers/TableChartController.class.php';
require_once 'libraries/controllers/TableChartController.php';
$container = DI\Container::getDefaultContainer();
$container->factory('PMA\Controllers\Table\TableChartController');
$container->factory('PMA\libraries\controllers\table\TableChartController');
$container->alias(
'TableChartController', 'PMA\Controllers\Table\TableChartController'
'TableChartController', 'PMA\libraries\controllers\table\TableChartController'
);
$container->set('PMA\libraries\Response', Response::getInstance());
$container->alias('response', 'PMA\libraries\Response');
@ -29,6 +29,6 @@ $dependency_definitions = array(
"cfg" => &$GLOBALS['cfg']
);
/** @var Controllers\Table\TableChartController $controller */
/** @var PMA\libraries\controllers\table\TableChartController $controller */
$controller = $container->get('TableChartController', $dependency_definitions);
$controller->indexAction();

7
tbl_find_replace.php
View File

@ -15,14 +15,13 @@ require_once 'libraries/common.inc.php';
require_once 'libraries/tbl_common.inc.php';
require_once 'libraries/tbl_info.inc.php';
require_once 'libraries/di/Container.class.php';
require_once 'libraries/controllers/TableSearchController.class.php';
use PMA\DI;
$container = DI\Container::getDefaultContainer();
$container->factory('PMA\Controllers\Table\TableSearchController');
$container->factory('PMA\libraries\controllers\table\TableSearchController');
$container->alias(
'TableSearchController', 'PMA\Controllers\Table\TableSearchController'
'TableSearchController', 'PMA\libraries\controllers\table\TableSearchController'
);
$container->set('PMA\libraries\Response', PMA\libraries\Response::getInstance());
$container->alias('response', 'PMA\libraries\Response');
@ -32,6 +31,6 @@ $dependency_definitions = array(
'url_query' => &$url_query
);
/** @var PMA\Controllers\Table\TableSearchController $controller */
/** @var PMA\libraries\controllers\table\TableSearchController $controller */
$controller = $container->get('TableSearchController', $dependency_definitions);
$controller->indexAction();

8
tbl_gis_visualization.php
View File

@ -12,13 +12,13 @@ use PMA\libraries\Response;
use PMA\libraries\Util;
require_once 'libraries/di/Container.class.php';
require_once 'libraries/controllers/TableGisVisualizationController.class.php';
require_once 'libraries/controllers/TableGisVisualizationController.php';
$container = DI\Container::getDefaultContainer();
$container->factory('PMA\Controllers\Table\TableGisVisualizationController');
$container->factory('PMA\libraries\controllers\table\TableGisVisualizationController');
$container->alias(
'TableGisVisualizationController',
'PMA\Controllers\Table\TableGisVisualizationController'
'PMA\libraries\controllers\table\TableGisVisualizationController'
);
$container->set('PMA\libraries\Response', Response::getInstance());
$container->alias('response', 'PMA\libraries\Response');
@ -34,7 +34,7 @@ $dependency_definitions = array(
"visualizationSettings" => array()
);
/** @var Controllers\Table\TableGisVisualizationController $controller */
/** @var PMA\libraries\controllers\table\TableGisVisualizationController $controller */
$controller = $container->get(
'TableGisVisualizationController', $dependency_definitions
);

7
tbl_indexes.php
View File

@ -13,12 +13,11 @@ use PMA\libraries\Response;
require_once 'libraries/common.inc.php';
require_once 'libraries/di/Container.class.php';
require_once 'libraries/controllers/TableIndexesController.class.php';
$container = DI\Container::getDefaultContainer();
$container->factory('PMA\Controllers\Table\TableIndexesController');
$container->factory('PMA\libraries\controllers\table\TableIndexesController');
$container->alias(
'TableIndexesController', 'PMA\Controllers\Table\TableIndexesController'
'TableIndexesController', 'PMA\libraries\controllers\table\TableIndexesController'
);
$container->set('PMA\libraries\Response', Response::getInstance());
$container->alias('response', 'PMA\libraries\Response');
@ -46,6 +45,6 @@ $dependency_definitions = array(
"index" => $index
);
/** @var Controllers\Table\TableIndexesController $controller */
/** @var PMA\libraries\controllers\table\TableIndexesController $controller */
$controller = $container->get('TableIndexesController', $dependency_definitions);
$controller->indexAction();

7
tbl_relation.php
View File

@ -25,12 +25,11 @@ use PMA\libraries\Util;
require_once 'libraries/common.inc.php';
require_once 'libraries/di/Container.class.php';
require_once 'libraries/controllers/TableRelationController.class.php';
$container = DI\Container::getDefaultContainer();
$container->factory('PMA\Controllers\Table\TableRelationController');
$container->factory('PMA\libraries\controllers\table\TableRelationController');
$container->alias(
'TableRelationController', 'PMA\Controllers\Table\TableRelationController'
'TableRelationController', 'PMA\libraries\controllers\table\TableRelationController'
);
$container->set('PMA\libraries\Response', Response::getInstance());
$container->alias('response', 'PMA\libraries\Response');
@ -74,6 +73,6 @@ if ($cfgRelation['displaywork']) {
$dependency_definitions['disp'] = 'asas';
}
/** @var Controllers\Table\TableRelationController $controller */
/** @var PMA\libraries\controllers\table\TableRelationController $controller */
$controller = $container->get('TableRelationController', $dependency_definitions);
$controller->indexAction();

7
tbl_select.php
View File

@ -16,15 +16,14 @@ require_once 'libraries/common.inc.php';
require_once 'libraries/tbl_common.inc.php';
require_once 'libraries/tbl_info.inc.php';
require_once 'libraries/di/Container.class.php';
require_once 'libraries/controllers/TableSearchController.class.php';
use PMA\Controllers\Table\TableSearchController;
use PMA\libraries\controllers\table\TableSearchController;
use PMA\DI;
$container = DI\Container::getDefaultContainer();
$container->factory('PMA\Controllers\Table\TableSearchController');
$container->factory('PMA\libraries\controllers\table\TableSearchController');
$container->alias(
'TableSearchController', 'PMA\Controllers\Table\TableSearchController'
'TableSearchController', 'PMA\libraries\controllers\table\TableSearchController'
);
$container->set('PMA\libraries\Response', PMA\libraries\Response::getInstance());
$container->alias('response', 'PMA\libraries\Response');

7
tbl_structure.php
View File

@ -16,15 +16,14 @@ require_once 'libraries/tbl_info.inc.php';
require_once 'libraries/mysql_charsets.inc.php';
require_once 'libraries/bookmark.lib.php';
require_once 'libraries/di/Container.class.php';
require_once 'libraries/controllers/TableStructureController.class.php';
require_once 'libraries/config/messages.inc.php';
require_once 'libraries/config/user_preferences.forms.php';
require_once 'libraries/config/page_settings.forms.php';
$container = DI\Container::getDefaultContainer();
$container->factory('PMA\Controllers\TableStructureController');
$container->factory('PMA\libraries\controllers\tableStructureController');
$container->alias(
'TableStructureController', 'PMA\Controllers\TableStructureController'
'TableStructureController', 'PMA\libraries\controllers\tableStructureController'
);
$container->set('PMA\libraries\Response', Response::getInstance());
$container->alias('response', 'PMA\libraries\Response');
@ -44,6 +43,6 @@ $dependency_definitions = array(
'showtable' => $showtable
);
/** @var Controllers\TableStructureController $controller */
/** @var PMA\libraries\controllers\tableStructureController $controller */
$controller = $container->get('TableStructureController', $dependency_definitions);
$controller->indexAction();

7
tbl_zoom_select.php
View File

@ -15,14 +15,13 @@ require_once './libraries/common.inc.php';
require_once 'libraries/tbl_common.inc.php';
require_once 'libraries/tbl_info.inc.php';
require_once './libraries/di/Container.class.php';
require_once './libraries/controllers/TableSearchController.class.php';
use PMA\DI;
$container = DI\Container::getDefaultContainer();
$container->factory('PMA\Controllers\Table\TableSearchController');
$container->factory('PMA\libraries\controllers\table\TableSearchController');
$container->alias(
'TableSearchController', 'PMA\Controllers\Table\TableSearchController'
'TableSearchController', 'PMA\libraries\controllers\table\TableSearchController'
);
$container->set('PMA\libraries\Response', PMA\libraries\Response::getInstance());
$container->alias('response', 'PMA\libraries\Response');
@ -33,6 +32,6 @@ $dependency_definitions = array(
'url_query' => &$url_query
);
/** @var PMA\Controllers\Table\TableSearchController $controller */
/** @var PMA\libraries\controllers\table\TableSearchController $controller */
$controller = $container->get('TableSearchController', $dependency_definitions);
$controller->indexAction();

13
test/classes/controllers/DatabaseStructureController_test.php
View File

@ -11,7 +11,7 @@
/*
* Include to test.
*/
use PMA\Controllers\DatabaseStructureController;
use PMA\libraries\controllers\DatabaseStructureController;
use PMA\DI\Container;
use PMA\libraries\Table;
use PMA\libraries\Theme;
@ -19,7 +19,6 @@ 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';
/**
* DatabaseStructureController_Test class
@ -107,7 +106,7 @@ class DatabaseStructureController_Test extends PHPUnit_Framework_TestCase
$container->set('PMA\libraries\Response', $response);
$container->alias('response', 'PMA\libraries\Response');
$class = new ReflectionClass('PMA\Controllers\DatabaseStructureController');
$class = new ReflectionClass('PMA\libraries\controllers\DatabaseStructureController');
$method = $class->getMethod('getValuesForInnodbTable');
$method->setAccessible(true);
// Showing statistics
@ -193,7 +192,7 @@ class DatabaseStructureController_Test extends PHPUnit_Framework_TestCase
*/
public function testGetValuesForAriaTable()
{
$class = new ReflectionClass('PMA\Controllers\DatabaseStructureController');
$class = new ReflectionClass('PMA\libraries\controllers\DatabaseStructureController');
$method = $class->getMethod('getValuesForAriaTable');
$method->setAccessible(true);
@ -256,7 +255,7 @@ class DatabaseStructureController_Test extends PHPUnit_Framework_TestCase
*/
public function testHasTable()
{
$class = new ReflectionClass('PMA\Controllers\DatabaseStructureController');
$class = new ReflectionClass('PMA\libraries\controllers\DatabaseStructureController');
$method = $class->getMethod('hasTable');
$method->setAccessible(true);
@ -303,7 +302,7 @@ class DatabaseStructureController_Test extends PHPUnit_Framework_TestCase
*/
public function testCheckFavoriteTable()
{
$class = new ReflectionClass('PMA\Controllers\DatabaseStructureController');
$class = new ReflectionClass('PMA\libraries\controllers\DatabaseStructureController');
$method = $class->getMethod('checkFavoriteTable');
$method->setAccessible(true);
@ -355,7 +354,7 @@ class DatabaseStructureController_Test extends PHPUnit_Framework_TestCase
)
);
$class = new ReflectionClass('PMA\Controllers\DatabaseStructureController');
$class = new ReflectionClass('PMA\libraries\controllers\DatabaseStructureController');
$method = $class->getMethod('synchronizeFavoriteTables');
$method->setAccessible(true);

7
test/classes/controllers/TableIndexesController_test.php
View File

@ -1,12 +1,12 @@
<?php
/* vim: set expandtab sw=4 ts=4 sts=4: */
/**
* Tests for libraries/controllers/TableIndexesController.class.php
* Tests for libraries/controllers/TableIndexesController.php
*
* @package PhpMyAdmin-test
*/
use PMA\Controllers\Table\TableIndexesController;
use PMA\libraries\controllers\table\TableIndexesController;
use PMA\DI\Container;
use PMA\libraries\Theme;
@ -25,11 +25,10 @@ require_once 'libraries/url_generating.lib.php';
require_once 'libraries/sanitizing.lib.php';
require_once 'libraries/di/Container.class.php';
require_once 'libraries/controllers/TableIndexesController.class.php';
require_once 'test/libraries/stubs/ResponseStub.php';
/**
* Tests for libraries/controllers/TableIndexesController.class.php
* Tests for libraries/controllers/TableIndexesController.php
*
* @package PhpMyAdmin-test
*/

27
test/classes/controllers/TableRelationController_test.php
View File

@ -1,7 +1,7 @@
<?php
/* vim: set expandtab sw=4 ts=4 sts=4: */
/**
* Tests for libraries/controllers/TableRelationController.class.php
* Tests for libraries/controllers/TableRelationController.php
*
* @package PhpMyAdmin-test
*/
@ -20,10 +20,9 @@ require_once 'libraries/relation.lib.php';
require_once 'libraries/di/Container.class.php';
require_once 'test/libraries/stubs/ResponseStub.php';
require_once 'libraries/controllers/TableRelationController.class.php';
/**
* Tests for libraries/controllers/TableRelationController.class.php
* Tests for libraries/controllers/TableRelationController.php
*
* @package PhpMyAdmin-test
*/
@ -97,13 +96,13 @@ class TableRelationController_Test extends PHPUnit_Framework_TestCase
$container = Container::getDefaultContainer();
$container->set('dbi', $GLOBALS['dbi']);
$container->factory('PMA\Controllers\Table\TableRelationController');
$container->factory('PMA\libraries\controllers\table\TableRelationController');
$container->alias(
'TableRelationController',
'PMA\Controllers\Table\TableRelationController'
'PMA\libraries\controllers\table\TableRelationController'
);
/**
* @var PMA\Controllers\Table\TableRelationController
* @var PMA\libraries\controllers\table\TableRelationController
*/
$ctrl = $container->get('TableRelationController');
@ -143,10 +142,10 @@ class TableRelationController_Test extends PHPUnit_Framework_TestCase
$container = Container::getDefaultContainer();
$container->set('dbi', $GLOBALS['dbi']);
$container->factory('PMA\Controllers\Table\TableRelationController');
$container->factory('PMA\libraries\controllers\table\TableRelationController');
$container->alias(
'TableRelationController',
'PMA\Controllers\Table\TableRelationController'
'PMA\libraries\controllers\table\TableRelationController'
);
$ctrl = $container->get('TableRelationController');
@ -185,10 +184,10 @@ class TableRelationController_Test extends PHPUnit_Framework_TestCase
$container = Container::getDefaultContainer();
$container->set('dbi', $GLOBALS['dbi']);
$container->factory('PMA\Controllers\Table\TableRelationController');
$container->factory('PMA\libraries\controllers\table\TableRelationController');
$container->alias(
'TableRelationController',
'PMA\Controllers\Table\TableRelationController'
'PMA\libraries\controllers\table\TableRelationController'
);
$ctrl = $container->get(
'TableRelationController',
@ -231,10 +230,10 @@ class TableRelationController_Test extends PHPUnit_Framework_TestCase
$container = Container::getDefaultContainer();
$container->set('dbi', $GLOBALS['dbi']);
$container->factory('PMA\Controllers\Table\TableRelationController');
$container->factory('PMA\libraries\controllers\table\TableRelationController');
$container->alias(
'TableRelationController',
'PMA\Controllers\Table\TableRelationController'
'PMA\libraries\controllers\table\TableRelationController'
);
$ctrl = $container->get(
'TableRelationController',
@ -291,10 +290,10 @@ class TableRelationController_Test extends PHPUnit_Framework_TestCase
$container = Container::getDefaultContainer();
$container->set('dbi', $GLOBALS['dbi']);
$container->factory('PMA\Controllers\Table\TableRelationController');
$container->factory('PMA\libraries\controllers\table\TableRelationController');
$container->alias(
'TableRelationController',
'PMA\Controllers\Table\TableRelationController'
'PMA\libraries\controllers\table\TableRelationController'
);
$ctrl = $container->get(
'TableRelationController',

13
test/classes/controllers/TableSearchController_test.php
View File

@ -9,14 +9,13 @@
/*
* Include to test.
*/
use PMA\Controllers\Table\TableSearchController;
use PMA\libraries\controllers\table\TableSearchController;
use PMA\DI\Container;
use PMA\libraries\Theme;
use PMA\libraries\TypesMySQL;
require_once 'test/libraries/stubs/ResponseStub.php';
require_once 'libraries/di/Container.class.php';
require_once 'libraries/controllers/TableSearchController.class.php';
/**
* Tests for PMA_TableSearch
@ -160,7 +159,7 @@ class PMA_TableSearchController_Test extends PHPUnit_Framework_TestCase
$_POST['order'] = "asc";
$_POST['customWhereClause'] = "name='pma'";
$class = new ReflectionClass('PMA\Controllers\Table\TableSearchController');
$class = new ReflectionClass('PMA\libraries\controllers\table\TableSearchController');
$method = $class->getMethod('_buildSqlQuery');
$method->setAccessible(true);
$tableSearch = new TableSearchController("zoom", null);
@ -252,9 +251,9 @@ class PMA_TableSearchController_Test extends PHPUnit_Framework_TestCase
$container = Container::getDefaultContainer();
$container->set('dbi', $GLOBALS['dbi']);
$container->factory('PMA\Controllers\Table\TableSearchController');
$container->factory('PMA\libraries\controllers\table\TableSearchController');
$container->alias(
'TableSearchController', 'PMA\Controllers\Table\TableSearchController'
'TableSearchController', 'PMA\libraries\controllers\table\TableSearchController'
);
$ctrl = $container->get('TableSearchController');
@ -290,7 +289,7 @@ class PMA_TableSearchController_Test extends PHPUnit_Framework_TestCase
$container = Container::getDefaultContainer();
$container->factory('\PMA\Controllers\Table\TableSearchController');
$container->alias(
'TableSearchController', 'PMA\Controllers\Table\TableSearchController'
'TableSearchController', 'PMA\libraries\controllers\table\TableSearchController'
);
$ctrl = $container->get('TableSearchController');
@ -369,7 +368,7 @@ class PMA_TableSearchController_Test extends PHPUnit_Framework_TestCase
$container->set('dbi', $GLOBALS['dbi']);
$container->factory('\PMA\Controllers\Table\TableSearchController');
$container->alias(
'TableSearchController', 'PMA\Controllers\Table\TableSearchController'
'TableSearchController', 'PMA\libraries\controllers\table\TableSearchController'
);
$ctrl = $container->get('TableSearchController');

27
test/classes/controllers/TableStructureController_test.php
View File

@ -21,7 +21,6 @@ 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/TableStructureController.class.php';
/**
* TableStructureController_Test class
@ -107,9 +106,9 @@ class TableStructureController_Test extends PHPUnit_Framework_TestCase
$container = Container::getDefaultContainer();
$container->set('dbi', $GLOBALS['dbi']);
$container->factory('PMA\Controllers\TableStructureController');
$container->factory('PMA\libraries\controllers\tableStructureController');
$container->alias(
'TableStructureController', 'PMA\Controllers\TableStructureController'
'TableStructureController', 'PMA\libraries\controllers\tableStructureController'
);
$ctrl = $container->get('TableStructureController');
// No primary key in db.table2
@ -155,9 +154,9 @@ class TableStructureController_Test extends PHPUnit_Framework_TestCase
$container = Container::getDefaultContainer();
$container->set('dbi', $GLOBALS['dbi']);
$container->factory('PMA\Controllers\TableStructureController');
$container->factory('PMA\libraries\controllers\tableStructureController');
$container->alias(
'TableStructureController', 'PMA\Controllers\TableStructureController'
'TableStructureController', 'PMA\libraries\controllers\tableStructureController'
);
$ctrl = $container->get('TableStructureController');
// With db.table, it has a primary key `column`
@ -181,9 +180,9 @@ class TableStructureController_Test extends PHPUnit_Framework_TestCase
$container = Container::getDefaultContainer();
$container->set('dbi', $GLOBALS['dbi']);
$container->factory('PMA\Controllers\TableStructureController');
$container->factory('PMA\libraries\controllers\tableStructureController');
$container->alias(
'TableStructureController', 'PMA\Controllers\TableStructureController'
'TableStructureController', 'PMA\libraries\controllers\tableStructureController'
);
$ctrl = $container->get('TableStructureController');
@ -212,9 +211,9 @@ class TableStructureController_Test extends PHPUnit_Framework_TestCase
$container = Container::getDefaultContainer();
$container->set('dbi', $GLOBALS['dbi']);
$container->factory('PMA\Controllers\TableStructureController');
$container->factory('PMA\libraries\controllers\tableStructureController');
$container->alias(
'TableStructureController', 'PMA\Controllers\TableStructureController'
'TableStructureController', 'PMA\libraries\controllers\tableStructureController'
);
$ctrl = $container->get('TableStructureController');
@ -249,9 +248,9 @@ class TableStructureController_Test extends PHPUnit_Framework_TestCase
$container = Container::getDefaultContainer();
$container->set('dbi', $GLOBALS['dbi']);
$container->factory('PMA\Controllers\TableStructureController');
$container->factory('PMA\libraries\controllers\tableStructureController');
$container->alias(
'TableStructureController', 'PMA\Controllers\TableStructureController'
'TableStructureController', 'PMA\libraries\controllers\tableStructureController'
);
$ctrl = $container->get('TableStructureController');
@ -303,15 +302,15 @@ class TableStructureController_Test extends PHPUnit_Framework_TestCase
->method('query')
->will($this->returnValue(true));
$class = new ReflectionClass('PMA\Controllers\TableStructureController');
$class = new ReflectionClass('PMA\libraries\controllers\tableStructureController');
$method = $class->getMethod('getDataForSubmitMult');
$method->setAccessible(true);
$container = Container::getDefaultContainer();
$container->set('dbi', $dbi);
$container->factory('PMA\Controllers\TableStructureController');
$container->factory('PMA\libraries\controllers\tableStructureController');
$container->alias(
'TableStructureController', 'PMA\Controllers\TableStructureController'
'TableStructureController', 'PMA\libraries\controllers\tableStructureController'
);
$ctrl = $container->get('TableStructureController');