Move the controller to appropriate package

Signed-off-by: Madhura Jayaratne <madhura.cj@gmail.com>
phpmyadmin · Nov 3, 2015 · a701078 · a701078
1 parent fbef26e
commit a701078
Show file tree

Hide file tree

Showing 3 changed files with 8 additions and 8 deletions.
diff --git a/.../controllers/TableStructureController.php → ...ollers/table/TableStructureController.php b/.../controllers/TableStructureController.php → ...ollers/table/TableStructureController.php
@@ -7,7 +7,7 @@
  * @package PMA
  */
 
-namespace PMA\libraries\controllers;
+namespace PMA\libraries\controllers\table;
 
 use PMA\libraries\config\PageSettings;
 use PMA\libraries\Index;

diff --git a/tbl_structure.php b/tbl_structure.php
@@ -9,7 +9,7 @@
 
 namespace PMA;
 
-use PMA\libraries\controllers\TableStructureController;
+use PMA\libraries\controllers\table\TableStructureController;
 use PMA\libraries\Response;
 
 require_once 'libraries/common.inc.php';
@@ -21,9 +21,9 @@
 require_once 'libraries/config/page_settings.forms.php';
 
 $container = libraries\di\Container::getDefaultContainer();
-$container->factory('PMA\libraries\controllers\TableStructureController');
+$container->factory('PMA\libraries\controllers\table\TableStructureController');
 $container->alias(
-    'TableStructureController', 'PMA\libraries\controllers\TableStructureController'
+    'TableStructureController', 'PMA\libraries\controllers\table\TableStructureController'
 );
 $container->set('PMA\libraries\Response', Response::getInstance());
 $container->alias('response', 'PMA\libraries\Response');

diff --git a/test/classes/controllers/TableStructureControllerTest.php b/test/classes/controllers/TableStructureControllerTest.php
@@ -95,7 +95,7 @@ public function testGetKeyForTablePrimaryOne()
         $GLOBALS['dbi']->expects($this->any())->method('fetchAssoc')
             ->will($this->returnValue(null));
 
-        $class = new ReflectionClass('\PMA\libraries\controllers\TableStructureController');
+        $class = new ReflectionClass('\PMA\libraries\controllers\table\TableStructureController');
         $method = $class->getMethod('getKeyForTablePrimary');
         $method->setAccessible(true);
 
@@ -143,7 +143,7 @@ function () {
                 )
             );
 
-        $class = new ReflectionClass('\PMA\libraries\controllers\TableStructureController');
+        $class = new ReflectionClass('\PMA\libraries\controllers\table\TableStructureController');
         $method = $class->getMethod('getKeyForTablePrimary');
         $method->setAccessible(true);
 
@@ -169,7 +169,7 @@ function () {
      */
     public function testAdjustColumnPrivileges()
     {
-        $class = new ReflectionClass('\PMA\libraries\controllers\TableStructureController');
+        $class = new ReflectionClass('\PMA\libraries\controllers\table\TableStructureController');
         $method = $class->getMethod('adjustColumnPrivileges');
         $method->setAccessible(true);
 
@@ -195,7 +195,7 @@ public function testAdjustColumnPrivileges()
      */
     public function testGetMultipleFieldCommandType()
     {
-        $class = new ReflectionClass('\PMA\libraries\controllers\TableStructureController');
+        $class = new ReflectionClass('\PMA\libraries\controllers\table\TableStructureController');
         $method = $class->getMethod('getMultipleFieldCommandType');
         $method->setAccessible(true);