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

Move to a sub package for better organization

Browse Source 
Signed-off-by: Madhura Jayaratne <madhura.cj@gmail.com>
This commit is contained in:
Madhura Jayaratne 2015-11-18 10:49:32 +11:00
parent 21b6ca3756
commit 8c1ed92460
3 changed files with 20 additions and 19 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

9
libraries/controllers/ServerVariablesController.php → libraries/controllers/server/ServerVariablesController.php
View File

@ -2,13 +2,14 @@
/* vim: set expandtab sw=4 ts=4 sts=4: */
/**
* Holds the PMA\libraries\controllers\ServerVariablesController
* Holds the PMA\libraries\controllers\server\ServerVariablesController
*
* @package PMA\libraries\controllers
* @package PMA\libraries\controllers\server
*/
namespace PMA\libraries\controllers;
namespace PMA\libraries\controllers\server;
use PMA\libraries\controllers\Controller;
use PMA\libraries\Message;
use PMA\libraries\Template;
use PMA\libraries\Util;
@ -16,7 +17,7 @@ use PMA\libraries\Util;
/**
* Handles viewing and editing server variables
*
* @package PMA\libraries\controllers
* @package PMA\libraries\controllers\server
*/
class ServerVariablesController extends Controller
{

6
server_variables.php
View File

@ -9,18 +9,18 @@
namespace PMA;
use PMA\libraries\controllers\ServerVariablesController;
use PMA\libraries\controllers\server\ServerVariablesController;
use PMA\libraries\Response;
require_once 'libraries/common.inc.php';
$container = libraries\di\Container::getDefaultContainer();
$container->factory(
'PMA\libraries\controllers\ServerVariablesController'
'PMA\libraries\controllers\server\ServerVariablesController'
);
$container->alias(
'ServerVariablesController',
'PMA\libraries\controllers\ServerVariablesController'
'PMA\libraries\controllers\server\ServerVariablesController'
);
$container->set('PMA\libraries\Response', Response::getInstance());
$container->alias('response', 'PMA\libraries\Response');

24
test/classes/controllers/ServerVariablesControllerTest.php
View File

@ -119,14 +119,14 @@ class ServerVariablesControllerTest extends PHPUnit_Framework_TestCase
*/
public function testFormatVariable()
{
$class = new ReflectionClass('\PMA\libraries\controllers\ServerVariablesController');
$class = new ReflectionClass('\PMA\libraries\controllers\server\ServerVariablesController');
$method = $class->getMethod('_formatVariable');
$method->setAccessible(true);
$container = Container::getDefaultContainer();
$container->factory('PMA\libraries\controllers\ServerVariablesController');
$container->factory('PMA\libraries\controllers\server\ServerVariablesController');
$container->alias(
'ServerVariablesController', 'PMA\libraries\controllers\ServerVariablesController'
'ServerVariablesController', 'PMA\libraries\controllers\server\ServerVariablesController'
);
$ctrl = $container->get('ServerVariablesController');
@ -161,14 +161,14 @@ class ServerVariablesControllerTest extends PHPUnit_Framework_TestCase
*/
public function testGetHtmlForLinkTemplates()
{
$class = new ReflectionClass('\PMA\libraries\controllers\ServerVariablesController');
$class = new ReflectionClass('\PMA\libraries\controllers\server\ServerVariablesController');
$method = $class->getMethod('_getHtmlForLinkTemplates');
$method->setAccessible(true);
$container = Container::getDefaultContainer();
$container->factory('PMA\libraries\controllers\ServerVariablesController');
$container->factory('PMA\libraries\controllers\server\ServerVariablesController');
$container->alias(
'ServerVariablesController', 'PMA\libraries\controllers\ServerVariablesController'
'ServerVariablesController', 'PMA\libraries\controllers\server\ServerVariablesController'
);
$ctrl = $container->get('ServerVariablesController');
@ -200,14 +200,14 @@ class ServerVariablesControllerTest extends PHPUnit_Framework_TestCase
public function testPMAGetHtmlForServerVariables()
{
$class = new ReflectionClass('\PMA\libraries\controllers\ServerVariablesController');
$class = new ReflectionClass('\PMA\libraries\controllers\server\ServerVariablesController');
$method = $class->getMethod('_getHtmlForLinkTemplates');
$method->setAccessible(true);
$container = Container::getDefaultContainer();
$container->factory('PMA\libraries\controllers\ServerVariablesController');
$container->factory('PMA\libraries\controllers\server\ServerVariablesController');
$container->alias(
'ServerVariablesController', 'PMA\libraries\controllers\ServerVariablesController'
'ServerVariablesController', 'PMA\libraries\controllers\server\ServerVariablesController'
);
$ctrl = $container->get('ServerVariablesController');
@ -254,14 +254,14 @@ class ServerVariablesControllerTest extends PHPUnit_Framework_TestCase
*/
public function testGetHtmlForServerVariablesItems()
{
$class = new ReflectionClass('\PMA\libraries\controllers\ServerVariablesController');
$class = new ReflectionClass('\PMA\libraries\controllers\server\ServerVariablesController');
$method = $class->getMethod('_getHtmlForServerVariablesItems');
$method->setAccessible(true);
$container = Container::getDefaultContainer();
$container->factory('PMA\libraries\controllers\ServerVariablesController');
$container->factory('PMA\libraries\controllers\server\ServerVariablesController');
$container->alias(
'ServerVariablesController', 'PMA\libraries\controllers\ServerVariablesController'
'ServerVariablesController', 'PMA\libraries\controllers\server\ServerVariablesController'
);
$ctrl = $container->get('ServerVariablesController');