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

Move packages for better organization

Browse Source 
Signed-off-by: Madhura Jayaratne <madhura.cj@gmail.com>
This commit is contained in:
Madhura Jayaratne 2015-11-18 12:29:00 +11:00
parent 6d02869fe5
commit 2fb291bbb0
3 changed files with 12 additions and 11 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
db_structure.php
View File

@ -8,7 +8,7 @@
namespace PMA;
use PMA\libraries\controllers\DatabaseStructureController;
use PMA\libraries\controllers\database\DatabaseStructureController;
use PMA\libraries\Response;
use PMA\libraries\Util;
@ -28,10 +28,10 @@ list(
) = Util::getDbInfo($GLOBALS['db'], isset($sub_part) ? $sub_part : '');
$container = libraries\di\Container::getDefaultContainer();
$container->factory('PMA\libraries\controllers\DatabaseStructureController');
$container->factory('PMA\libraries\controllers\database\DatabaseStructureController');
$container->alias(
'DatabaseStructureController',
'PMA\libraries\controllers\DatabaseStructureController'
'PMA\libraries\controllers\database\DatabaseStructureController'
);
$container->set('PMA\libraries\Response', Response::getInstance());
$container->alias('response', 'PMA\libraries\Response');

5
libraries/controllers/DatabaseStructureController.php → libraries/controllers/database/DatabaseStructureController.php
View File

@ -2,14 +2,15 @@
/* vim: set expandtab sw=4 ts=4 sts=4: */
/**
* Holds the PMA\DatabaseStructureController
* Holds the PMA\libraries\controllers\database\DatabaseStructureController
*
* @package PMA
*/
namespace PMA\libraries\controllers;
namespace PMA\libraries\controllers\database;
use PMA\libraries\config\PageSettings;
use PMA\libraries\controllers\DatabaseController;
use PMA\libraries\Message;
use PMA\libraries\RecentFavoriteTable;
use PMA\libraries\Template;

12
test/classes/controllers/DatabaseStructureControllerTest.php
View File

@ -11,7 +11,7 @@
/*
* Include to test.
*/
use PMA\libraries\controllers\DatabaseStructureController;
use PMA\libraries\controllers\database\DatabaseStructureController;
use PMA\libraries\di\Container;
use PMA\libraries\Table;
use PMA\libraries\Theme;
@ -105,7 +105,7 @@ class DatabaseStructureControllerTest extends PHPUnit_Framework_TestCase
$container->set('PMA\libraries\Response', $response);
$container->alias('response', 'PMA\libraries\Response');
$class = new ReflectionClass('PMA\libraries\controllers\DatabaseStructureController');
$class = new ReflectionClass('PMA\libraries\controllers\database\DatabaseStructureController');
$method = $class->getMethod('getValuesForInnodbTable');
$method->setAccessible(true);
// Showing statistics
@ -191,7 +191,7 @@ class DatabaseStructureControllerTest extends PHPUnit_Framework_TestCase
*/
public function testGetValuesForAriaTable()
{
$class = new ReflectionClass('PMA\libraries\controllers\DatabaseStructureController');
$class = new ReflectionClass('PMA\libraries\controllers\database\DatabaseStructureController');
$method = $class->getMethod('getValuesForAriaTable');
$method->setAccessible(true);
@ -254,7 +254,7 @@ class DatabaseStructureControllerTest extends PHPUnit_Framework_TestCase
*/
public function testHasTable()
{
$class = new ReflectionClass('PMA\libraries\controllers\DatabaseStructureController');
$class = new ReflectionClass('PMA\libraries\controllers\database\DatabaseStructureController');
$method = $class->getMethod('hasTable');
$method->setAccessible(true);
@ -301,7 +301,7 @@ class DatabaseStructureControllerTest extends PHPUnit_Framework_TestCase
*/
public function testCheckFavoriteTable()
{
$class = new ReflectionClass('PMA\libraries\controllers\DatabaseStructureController');
$class = new ReflectionClass('PMA\libraries\controllers\database\DatabaseStructureController');
$method = $class->getMethod('checkFavoriteTable');
$method->setAccessible(true);
@ -353,7 +353,7 @@ class DatabaseStructureControllerTest extends PHPUnit_Framework_TestCase
)
);
$class = new ReflectionClass('PMA\libraries\controllers\DatabaseStructureController');
$class = new ReflectionClass('PMA\libraries\controllers\database\DatabaseStructureController');
$method = $class->getMethod('synchronizeFavoriteTables');
$method->setAccessible(true);