Move DI classes to PhpMyAdmin namespace

Signed-off-by: Maurício Meneghini Fauth <mauriciofauth@gmail.com>

db_structure.php

@@ -6,16 +6,15 @@
  * @package PhpMyAdmin
  */
 
-namespace PMA;
-
 use PhpMyAdmin\Controllers\Database\DatabaseStructureController;
+use PhpMyAdmin\Di\Container;
 use PhpMyAdmin\Response;
 use PhpMyAdmin\Util;
 
 require_once 'libraries/common.inc.php';
 require_once 'libraries/db_common.inc.php';
 
-$container = libraries\di\Container::getDefaultContainer();
+$container = Container::getDefaultContainer();
 $container->factory(
     'PhpMyAdmin\Controllers\Database\DatabaseStructureController'
 );

libraries/classes/Controllers/Controller.php

@@ -8,7 +8,7 @@
 namespace PhpMyAdmin\Controllers;
 
 use PhpMyAdmin\DatabaseInterface;
-use PMA\libraries\di\Container;
+use PhpMyAdmin\Di\Container;
 use PhpMyAdmin\Response;
 
 require_once 'libraries/database_interface.inc.php';
@@ -32,7 +32,7 @@ abstract class Controller
     protected $dbi;
 
     /**
-     * @var \PMA\libraries\di\Container
+     * @var \PhpMyAdmin\Di\Container
      */
     protected $container;
 

libraries/classes/Di/AliasItem.php

@@ -1,16 +1,16 @@
 <?php
 /* vim: set expandtab sw=4 ts=4 sts=4: */
 /**
- * Holds the PMA\libraries\di\AliasItem class
+ * Holds the PhpMyAdmin\Di\AliasItem class
  *
- * @package PMA
+ * @package PhpMyAdmin\Di
  */
-namespace PMA\libraries\di;
+namespace PhpMyAdmin\Di;
 
 /**
  * Class AliasItem
  *
- * @package PMA\libraries\di
+ * @package PhpMyAdmin\Di
  */
 class AliasItem implements Item
 {

libraries/classes/Di/Container.php

@@ -1,18 +1,18 @@
 <?php
 /* vim: set expandtab sw=4 ts=4 sts=4: */
 /**
- * Holds the PMA\libraries\di\Container class
+ * Holds the PhpMyAdmin\Di\Container class
  *
- * @package PMA
+ * @package PhpMyAdmin\Di
  */
-namespace PMA\libraries\di;
+namespace PhpMyAdmin\Di;
 
 use Psr\Container\ContainerInterface;
 
 /**
  * Class Container
  *
- * @package PMA\libraries\di
+ * @package PhpMyAdmin\Di
  */
 class Container implements ContainerInterface
 {

libraries/classes/Di/ContainerException.php

@@ -1,11 +1,11 @@
 <?php
 /* vim: set expandtab sw=4 ts=4 sts=4: */
 /**
- * Holds the PMA\libraries\di\ContainerException class
+ * Holds the PhpMyAdmin\Di\ContainerException class
  *
- * @package PMA
+ * @package PhpMyAdmin\Di
  */
-namespace PMA\libraries\di;
+namespace PhpMyAdmin\Di;
 
 use Exception;
 use Psr\Container\ContainerExceptionInterface;
@@ -13,7 +13,7 @@ use Psr\Container\ContainerExceptionInterface;
 /**
  * Class ContainerException
  *
- * @package PMA\libraries\di
+ * @package PhpMyAdmin\Di
  */
 class ContainerException extends Exception implements ContainerExceptionInterface
 {

libraries/classes/Di/FactoryItem.php

@@ -1,16 +1,16 @@
 <?php
 /* vim: set expandtab sw=4 ts=4 sts=4: */
 /**
- * Holds the PMA\libraries\di\FactoryItem class
+ * Holds the PhpMyAdmin\Di\FactoryItem class
  *
- * @package PMA
+ * @package PhpMyAdmin\Di
  */
-namespace PMA\libraries\di;
+namespace PhpMyAdmin\Di;
 
 /**
  * Factory manager
  *
- * @package PMA\libraries\di
+ * @package PhpMyAdmin\Di
  */
 class FactoryItem extends ReflectorItem
 {

libraries/classes/Di/Item.php

@@ -1,16 +1,16 @@
 <?php
 /* vim: set expandtab sw=4 ts=4 sts=4: */
 /**
- * Holds the PMA\libraries\di\Item class
+ * Holds the PhpMyAdmin\Di\Item class
  *
- * @package PMA
+ * @package PhpMyAdmin\Di
  */
-namespace PMA\libraries\di;
+namespace PhpMyAdmin\Di;
 
 /**
  * Interface Item
  *
- * @package PMA\libraries\di
+ * @package PhpMyAdmin\Di
  */
 interface Item
 {

libraries/classes/Di/NotFoundException.php

@@ -1,18 +1,18 @@
 <?php
 /* vim: set expandtab sw=4 ts=4 sts=4: */
 /**
- * Holds the PMA\libraries\di\NotFoundException class
+ * Holds the PhpMyAdmin\Di\NotFoundException class
  *
- * @package PMA
+ * @package PhpMyAdmin\Di
  */
-namespace PMA\libraries\di;
+namespace PhpMyAdmin\Di;
 
 use Psr\Container\NotFoundExceptionInterface;
 
 /**
  * Class NotFoundException
  *
- * @package PMA\libraries\di
+ * @package PhpMyAdmin\Di
  */
 class NotFoundException extends ContainerException implements NotFoundExceptionInterface
 {

libraries/classes/Di/ReflectorItem.php

@@ -1,16 +1,16 @@
 <?php
 /* vim: set expandtab sw=4 ts=4 sts=4: */
 /**
- * Holds the PMA\libraries\di\ReflectorItem class
+ * Holds the PhpMyAdmin\Di\ReflectorItem class
  *
- * @package PMA
+ * @package PhpMyAdmin\Di
  */
-namespace PMA\libraries\di;
+namespace PhpMyAdmin\Di;
 
 /**
  * Reflector manager
  *
- * @package PMA\libraries\di
+ * @package PhpMyAdmin\Di
  */
 abstract class ReflectorItem implements Item
 {

libraries/classes/Di/ServiceItem.php

@@ -1,16 +1,16 @@
 <?php
 /* vim: set expandtab sw=4 ts=4 sts=4: */
 /**
- * Holds the PMA\libraries\di\ServiceItem class
+ * Holds the PhpMyAdmin\Di\ServiceItem class
  *
- * @package PMA
+ * @package PhpMyAdmin\Di
  */
-namespace PMA\libraries\di;
+namespace PhpMyAdmin\Di;
 
 /**
  * Service manager
  *
- * @package PMA\libraries\di
+ * @package PhpMyAdmin\Di
  */
 class ServiceItem extends ReflectorItem
 {

libraries/classes/Di/ValueItem.php

@@ -1,16 +1,16 @@
 <?php
 /* vim: set expandtab sw=4 ts=4 sts=4: */
 /**
- * Holds the PMA\libraries\di\ValueItem class
+ * Holds the PhpMyAdmin\Di\ValueItem class
  *
- * @package PMA
+ * @package PhpMyAdmin\Di
  */
-namespace PMA\libraries\di;
+namespace PhpMyAdmin\Di;
 
 /**
  * Value manager
  *
- * @package PMA\libraries\di
+ * @package PhpMyAdmin\Di
  */
 class ValueItem implements Item
 {

libraries/database_interface.inc.php

@@ -9,7 +9,7 @@
 
 use PhpMyAdmin\Core;
 use PhpMyAdmin\Dbi\DbiDummy;
-use PMA\libraries\di\Container;
+use PhpMyAdmin\Di\Container;
 use PhpMyAdmin\DatabaseInterface;
 use PhpMyAdmin\Dbi\DbiMysql;
 use PhpMyAdmin\Dbi\DbiMysqli;

libraries/gis/GISFactory.php

@@ -5,11 +5,8 @@
  *
  * @package PhpMyAdmin-GIS
  */
-
 namespace PMA\libraries\gis;
 
-use PMA;
-
 /**
  * Factory class that handles the creation of geometric objects.
  *

libraries/tbl_columns_definition_form.inc.php

@@ -6,6 +6,8 @@
  *
  * @package PhpMyAdmin
  */
+
+use PhpMyAdmin\Di\Container;
 use PhpMyAdmin\Response;
 use PhpMyAdmin\Table;
 use PhpMyAdmin\Transformations;
@@ -91,7 +93,7 @@ $comments_map = PMA_getComments($db, $table);
 $move_columns = array();
 if (isset($fields_meta)) {
     /** @var PhpMyAdmin\DatabaseInterface $dbi */
-    $dbi = \PMA\libraries\di\Container::getDefaultContainer()->get('dbi');
+    $dbi = Container::getDefaultContainer()->get('dbi');
     $move_columns = $dbi->getTable($db, $table)->getColumnsMeta();
 }
 

server_binlog.php

@@ -1,20 +1,18 @@
 <?php
 /* vim: set expandtab sw=4 ts=4 sts=4: */
-
 /**
  * Handles server binary log page.
  *
  * @package PhpMyAdmin
  */
 
-namespace PMA;
-
 use PhpMyAdmin\Controllers\Server\ServerCollationsController;
+use PhpMyAdmin\Di\Container;
 use PhpMyAdmin\Response;
 
 require_once 'libraries/common.inc.php';
 
-$container = libraries\di\Container::getDefaultContainer();
+$container = Container::getDefaultContainer();
 $container->factory(
     'PhpMyAdmin\Controllers\Server\ServerBinlogController'
 );

server_collations.php

@@ -1,20 +1,18 @@
 <?php
 /* vim: set expandtab sw=4 ts=4 sts=4: */
-
 /**
  * Handles server charsets and collations page.
  *
  * @package PhpMyAdmin
  */
 
-namespace PMA;
-
 use PhpMyAdmin\Controllers\Server\ServerCollationsController;
+use PhpMyAdmin\Di\Container;
 use PhpMyAdmin\Response;
 
 require_once 'libraries/common.inc.php';
 
-$container = libraries\di\Container::getDefaultContainer();
+$container = Container::getDefaultContainer();
 $container->factory(
     'PhpMyAdmin\Controllers\Server\ServerCollationsController'
 );

server_databases.php

@@ -1,20 +1,18 @@
 <?php
 /* vim: set expandtab sw=4 ts=4 sts=4: */
-
 /**
  * Handles server databases page.
  *
  * @package PhpMyAdmin
  */
 
-namespace PMA;
-
 use PhpMyAdmin\Controllers\Server\ServerDatabasesController;
+use PhpMyAdmin\Di\Container;
 use PhpMyAdmin\Response;
 
 require_once 'libraries/common.inc.php';
 
-$container = libraries\di\Container::getDefaultContainer();
+$container = Container::getDefaultContainer();
 $container->factory(
     'PhpMyAdmin\Controllers\Server\ServerDatabasesController'
 );

server_engines.php

@@ -1,20 +1,18 @@
 <?php
 /* vim: set expandtab sw=4 ts=4 sts=4: */
-
 /**
  * Handles server engines page.
  *
  * @package PhpMyAdmin
  */
 
-namespace PMA;
-
 use PhpMyAdmin\Controllers\Server\ServerEnginesController;
+use PhpMyAdmin\Di\Container;
 use PhpMyAdmin\Response;
 
 require_once 'libraries/common.inc.php';
 
-$container = libraries\di\Container::getDefaultContainer();
+$container = Container::getDefaultContainer();
 $container->factory(
     'PhpMyAdmin\Controllers\Server\ServerEnginesController'
 );

server_plugins.php

@@ -1,20 +1,18 @@
 <?php
 /* vim: set expandtab sw=4 ts=4 sts=4: */
-
 /**
  * Handles server plugins page.
  *
  * @package PhpMyAdmin
  */
 
-namespace PMA;
-
 use PhpMyAdmin\Controllers\Server\ServerPluginsController;
+use PhpMyAdmin\Di\Container;
 use PhpMyAdmin\Response;
 
 require_once 'libraries/common.inc.php';
 
-$container = \PMA\libraries\di\Container::getDefaultContainer();
+$container = Container::getDefaultContainer();
 $container->factory(
     'PhpMyAdmin\Controllers\Server\ServerPluginsController'
 );

server_variables.php

@@ -1,20 +1,18 @@
 <?php
 /* vim: set expandtab sw=4 ts=4 sts=4: */
-
 /**
  * Handles server variables page.
  *
  * @package PhpMyAdmin
  */
 
-namespace PMA;
-
 use PhpMyAdmin\Controllers\Server\ServerVariablesController;
+use PhpMyAdmin\Di\Container;
 use PhpMyAdmin\Response;
 
 require_once 'libraries/common.inc.php';
 
-$container = libraries\di\Container::getDefaultContainer();
+$container = Container::getDefaultContainer();
 $container->factory(
     'PhpMyAdmin\Controllers\Server\ServerVariablesController'
 );

tbl_chart.php

@@ -6,14 +6,13 @@
  * @package PhpMyAdmin
  */
 
-namespace PMA;
-
 use PhpMyAdmin\Controllers\Table\TableChartController;
+use PhpMyAdmin\Di\Container;
 use PhpMyAdmin\Response;
 
 require_once 'libraries/common.inc.php';
 
-$container = libraries\di\Container::getDefaultContainer();
+$container = Container::getDefaultContainer();
 $container->factory('PhpMyAdmin\Controllers\Table\TableChartController');
 $container->alias(
     'TableChartController', 'PhpMyAdmin\Controllers\Table\TableChartController'

tbl_find_replace.php

@@ -7,6 +7,8 @@
  *
  * @package PhpMyAdmin
  */
+
+use PhpMyAdmin\Di\Container;
 use PhpMyAdmin\Response;
 
 /**
@@ -15,7 +17,7 @@ use PhpMyAdmin\Response;
 require_once 'libraries/common.inc.php';
 require_once 'libraries/tbl_common.inc.php';
 
-$container = \PMA\libraries\di\Container::getDefaultContainer();
+$container = Container::getDefaultContainer();
 $container->factory('PhpMyAdmin\Controllers\Table\TableSearchController');
 $container->alias(
     'TableSearchController', 'PhpMyAdmin\Controllers\Table\TableSearchController'

tbl_gis_visualization.php

@@ -6,15 +6,14 @@
  * @package PhpMyAdmin
  */
 
-namespace PMA;
-
 use PhpMyAdmin\Controllers\Table\TableGisVisualizationController;
+use PhpMyAdmin\Di\Container;
 use PhpMyAdmin\Response;
 use PhpMyAdmin\Util;
 
 require_once 'libraries/common.inc.php';
 
-$container = libraries\di\Container::getDefaultContainer();
+$container = Container::getDefaultContainer();
 $container->factory(
     'PhpMyAdmin\Controllers\Table\TableGisVisualizationController'
 );

tbl_indexes.php

@@ -6,15 +6,14 @@
  * @package PhpMyAdmin
  */
 
-namespace PMA;
-
 use PhpMyAdmin\Controllers\Table\TableIndexesController;
+use PhpMyAdmin\Di\Container;
 use PhpMyAdmin\Index;
 use PhpMyAdmin\Response;
 
 require_once 'libraries/common.inc.php';
 
-$container = libraries\di\Container::getDefaultContainer();
+$container = Container::getDefaultContainer();
 $container->factory('PhpMyAdmin\Controllers\Table\TableIndexesController');
 $container->alias(
     'TableIndexesController',

tbl_relation.php

@@ -14,19 +14,15 @@
  * @package PhpMyAdmin
  */
 
-/**
- * Get the TableRelationController
- */
-namespace PMA;
-
 use PhpMyAdmin\Controllers\Table\TableRelationController;
+use PhpMyAdmin\Di\Container;
 use PhpMyAdmin\Response;
 use PhpMyAdmin\Table;
 use PhpMyAdmin\Util;
 
 require_once 'libraries/common.inc.php';
 
-$container = libraries\di\Container::getDefaultContainer();
+$container = Container::getDefaultContainer();
 $container->factory('PhpMyAdmin\Controllers\Table\TableRelationController');
 $container->alias(
     'TableRelationController',

tbl_select.php

@@ -8,6 +8,9 @@
  *
  * @package PhpMyAdmin
  */
+
+use PhpMyAdmin\Controllers\Table\TableSearchController;
+use PhpMyAdmin\Di\Container;
 use PhpMyAdmin\Response;
 
 /**
@@ -16,9 +19,7 @@ use PhpMyAdmin\Response;
 require_once 'libraries/common.inc.php';
 require_once 'libraries/tbl_common.inc.php';
 
-use PhpMyAdmin\Controllers\Table\TableSearchController;
-
-$container = \PMA\libraries\di\Container::getDefaultContainer();
+$container = Container::getDefaultContainer();
 $container->factory('PhpMyAdmin\Controllers\Table\TableSearchController');
 $container->alias(
     'TableSearchController', 'PhpMyAdmin\Controllers\Table\TableSearchController'

tbl_structure.php

@@ -7,10 +7,8 @@
  * @package PhpMyAdmin
  */
 
-namespace PMA;
-
 use PhpMyAdmin\Controllers\Table\TableStructureController;
-use PMA\libraries\controllers\Table;
+use PhpMyAdmin\Di\Container;
 use PhpMyAdmin\Response;
 
 require_once 'libraries/common.inc.php';
@@ -18,7 +16,7 @@ require_once 'libraries/config/messages.inc.php';
 require_once 'libraries/config/user_preferences.forms.php';
 require_once 'libraries/config/page_settings.forms.php';
 
-$container = libraries\di\Container::getDefaultContainer();
+$container = Container::getDefaultContainer();
 $container->factory('PhpMyAdmin\Controllers\Table\TableStructureController');
 $container->alias(
     'TableStructureController',

tbl_zoom_select.php

@@ -7,6 +7,8 @@
  *
  * @package PhpMyAdmin
  */
+
+use PhpMyAdmin\Di\Container;
 use PhpMyAdmin\Response;
 
 /**
@@ -15,7 +17,7 @@ use PhpMyAdmin\Response;
 require_once './libraries/common.inc.php';
 require_once 'libraries/tbl_common.inc.php';
 
-$container = \PMA\libraries\di\Container::getDefaultContainer();
+$container = Container::getDefaultContainer();
 $container->factory('PhpMyAdmin\Controllers\Table\TableSearchController');
 $container->alias(
     'TableSearchController', 'PhpMyAdmin\Controllers\Table\TableSearchController'

test/classes/controllers/DatabaseStructureControllerTest.php

@@ -12,7 +12,7 @@
  * Include to test.
  */
 use PhpMyAdmin\Controllers\Database\DatabaseStructureController;
-use PMA\libraries\di\Container;
+use PhpMyAdmin\Di\Container;
 use PhpMyAdmin\Table;
 use PhpMyAdmin\Theme;
 

test/classes/controllers/ServerBinlogControllerTest.php

@@ -8,7 +8,7 @@
 
 use PhpMyAdmin\Theme;
 use PhpMyAdmin\Controllers\Server\ServerBinlogController;
-use PMA\libraries\di\Container;
+use PhpMyAdmin\Di\Container;
 use PhpMyAdmin\Util;
 
 require_once 'test/PMATestCase.php';

test/classes/controllers/ServerDatabasesControllerTest.php

@@ -6,7 +6,7 @@
  * @package PhpMyAdmin-test
  */
 
-use PMA\libraries\di\Container;
+use PhpMyAdmin\Di\Container;
 use PhpMyAdmin\Theme;
 use PhpMyAdmin\Charsets;
 

test/classes/controllers/ServerPluginsControllerTest.php

@@ -11,7 +11,7 @@
  */
 use PhpMyAdmin\Theme;
 use PhpMyAdmin\Controllers\Server\ServerPluginsController;
-use PMA\libraries\di\Container;
+use PhpMyAdmin\Di\Container;
 
 require_once 'libraries/database_interface.inc.php';
 require_once 'test/PMATestCase.php';

test/classes/controllers/ServerVariablesControllerTest.php

@@ -7,7 +7,7 @@
  */
 
 use PhpMyAdmin\Core;
-use PMA\libraries\di\Container;
+use PhpMyAdmin\Di\Container;
 use PhpMyAdmin\Theme;
 use PhpMyAdmin\Url;
 

test/classes/controllers/TableIndexesControllerTest.php

@@ -7,7 +7,7 @@
  */
 
 use PhpMyAdmin\Controllers\Table\TableIndexesController;
-use PMA\libraries\di\Container;
+use PhpMyAdmin\Di\Container;
 use PhpMyAdmin\Theme;
 use PhpMyAdmin\Url;
 use PhpMyAdmin\Response;

test/classes/controllers/TableRelationControllerTest.php

@@ -9,7 +9,7 @@
 /*
  * Include to test.
  */
-use PMA\libraries\di\Container;
+use PhpMyAdmin\Di\Container;
 use PhpMyAdmin\Theme;
 
 require_once 'libraries/database_interface.inc.php';

test/classes/controllers/TableSearchControllerTest.php

@@ -10,7 +10,7 @@
  * Include to test.
  */
 use PhpMyAdmin\Controllers\Table\TableSearchController;
-use PMA\libraries\di\Container;
+use PhpMyAdmin\Di\Container;
 use PhpMyAdmin\Theme;
 use PhpMyAdmin\TypesMySQL;
 

test/classes/controllers/TableStructureControllerTest.php

@@ -11,7 +11,7 @@
 /*
  * Include to test.
  */
-use PMA\libraries\di\Container;
+use PhpMyAdmin\Di\Container;
 use PhpMyAdmin\Theme;
 
 require_once 'libraries/database_interface.inc.php';

test/classes/di/ContainerExceptionTest.php

@@ -1,7 +1,7 @@
 <?php
 /* vim: set expandtab sw=4 ts=4 sts=4: */
 /**
- * Tests for PMA\libraries\di\ContainerException class
+ * Tests for PhpMyAdmin\Di\ContainerException class
  *
  * @package PhpMyAdmin-test
  */
@@ -11,10 +11,10 @@
  */
 require_once 'test/PMATestCase.php';
 
-use PMA\libraries\di\ContainerException;
+use PhpMyAdmin\Di\ContainerException;
 
 /**
- * Tests for PMA\libraries\di\ContainerException class
+ * Tests for PhpMyAdmin\Di\ContainerException class
  *
  * @package PhpMyAdmin-test
  */

test/classes/di/ContainerTest.php

@@ -1,7 +1,7 @@
 <?php
 /* vim: set expandtab sw=4 ts=4 sts=4: */
 /**
- * Tests for PMA\libraries\di\Container class
+ * Tests for PhpMyAdmin\Di\Container class
  *
  * @package PhpMyAdmin-test
  */
@@ -11,10 +11,10 @@
  */
 require_once 'test/PMATestCase.php';
 
-use PMA\libraries\di\Container;
+use PhpMyAdmin\Di\Container;
 
 /**
- * Tests for PMA\libraries\di\Container class
+ * Tests for PhpMyAdmin\Di\Container class
  *
  * @package PhpMyAdmin-test
  */

test/classes/di/NotFoundExceptionTest.php

@@ -1,7 +1,7 @@
 <?php
 /* vim: set expandtab sw=4 ts=4 sts=4: */
 /**
- * Tests for PMA\libraries\di\NotFoundException class
+ * Tests for PhpMyAdmin\Di\NotFoundException class
  *
  * @package PhpMyAdmin-test
  */
@@ -11,10 +11,10 @@
  */
 require_once 'test/PMATestCase.php';
 
-use PMA\libraries\di\NotFoundException;
+use PhpMyAdmin\Di\NotFoundException;
 
 /**
- * Tests for PMA\libraries\di\NotFoundException class
+ * Tests for PhpMyAdmin\Di\NotFoundException class
  *
  * @package PhpMyAdmin-test
  */