Merge remote-tracking branch 'origin/master'

libraries/classes/Controllers/Controller.php

@@ -8,7 +8,6 @@
 namespace PhpMyAdmin\Controllers;
 
 use PhpMyAdmin\DatabaseInterface;
-use PhpMyAdmin\Di\Container;
 use PhpMyAdmin\Response;
 
 /**
@@ -29,19 +28,12 @@ abstract class Controller
      */
     protected $dbi;
 
-    /**
-     * @var \PhpMyAdmin\Di\Container
-     */
-    protected $container;
-
     /**
      * Constructor
      */
-    public function __construct()
+    public function __construct($response, $dbi)
     {
-        $container = Container::getDefaultContainer();
-        $this->container = $container;
-        $this->dbi = $this->container->get('dbi');
-        $this->response = $this->container->get('response');
+        $this->response = $response;
+        $this->dbi = $dbi;
     }
 }

libraries/classes/Controllers/DatabaseController.php

@@ -22,9 +22,9 @@ abstract class DatabaseController extends Controller
     /**
      * Constructor
      */
-    public function __construct()
+    public function __construct($response, $dbi, $db)
     {
-        parent::__construct();
-        $this->db = $this->container->get('db');
+        parent::__construct($response, $dbi);
+        $this->db = $db;
     }
 }

libraries/classes/Controllers/Server/ServerBinlogController.php

@@ -30,9 +30,9 @@ class ServerBinlogController extends Controller
     /**
      * Constructs ServerBinlogController
      */
-    public function __construct()
+    public function __construct($response, $dbi)
     {
-        parent::__construct();
+        parent::__construct($response, $dbi);
         $this->binary_logs = $this->dbi->fetchResult(
             'SHOW MASTER LOGS',
             'Log_name',

libraries/classes/Controllers/Server/ServerPluginsController.php

@@ -28,9 +28,9 @@ class ServerPluginsController extends Controller
     /**
      * Constructs ServerPluginsController
      */
-    public function __construct()
+    public function __construct($response, $dbi)
     {
-        parent::__construct();
+        parent::__construct($response, $dbi);
         $this->_setServerPlugins();
     }
 

libraries/classes/Controllers/Server/ServerVariablesController.php

@@ -32,9 +32,9 @@ class ServerVariablesController extends Controller
     /**
      * Constructs ServerVariablesController
      */
-    public function __construct()
+    public function __construct($response, $dbi)
     {
-        parent::__construct();
+        parent::__construct($response, $dbi);
 
         $this->variable_doc_links = $this->_getDocumentLinks();
     }

libraries/classes/Controllers/Table/TableChartController.php

@@ -43,9 +43,16 @@ class TableChartController extends TableController
      * @param string $url_query Query URL
      * @param array  $cfg       Configuration
      */
-    public function __construct($sql_query, $url_query, array $cfg)
-    {
-        parent::__construct();
+    public function __construct(
+        $response,
+        $dbi,
+        $db,
+        $table,
+        $sql_query,
+        $url_query,
+        array $cfg
+    ) {
+        parent::__construct($response, $dbi, $db, $table);
 
         $this->sql_query = $sql_query;
         $this->url_query = $url_query;

libraries/classes/Controllers/Table/TableGisVisualizationController.php

@@ -55,13 +55,17 @@ class TableGisVisualizationController extends TableController
      * @param array  $visualizationSettings visualization settings
      */
     public function __construct(
+        $response,
+        $dbi,
+        $db,
+        $table,
         $sql_query,
         array $url_params,
         $goto,
         $back,
         array $visualizationSettings
     ) {
-        parent::__construct();
+        parent::__construct($response, $dbi, $db, $table);
 
         $this->sql_query = $sql_query;
         $this->url_params = $url_params;

libraries/classes/Controllers/Table/TableIndexesController.php

@@ -31,9 +31,14 @@ class TableIndexesController extends TableController
      *
      * @param Index $index Index
      */
-    public function __construct($index)
-    {
-        parent::__construct();
+    public function __construct(
+        $response,
+        $dbi,
+        $db,
+        $table,
+        $index
+    ) {
+        parent::__construct($response, $dbi, $db, $table);
 
         $this->index = $index;
     }

libraries/classes/Controllers/Table/TableRelationController.php

@@ -63,10 +63,19 @@ class TableRelationController extends TableController
      * @param array|null $existrel_foreign   External relations
      * @param string     $upd_query          Update query
      */
-    public function __construct($options_array, $cfgRelation, $tbl_storage_engine,
-        $existrel, $existrel_foreign, $upd_query
+    public function __construct(
+        $response,
+        $dbi,
+        $db,
+        $table,
+        $options_array,
+        $cfgRelation,
+        $tbl_storage_engine,
+        $existrel,
+        $existrel_foreign,
+        $upd_query
     ) {
-        parent::__construct();
+        parent::__construct($response, $dbi, $db, $table);
 
         $this->options_array = $options_array;
         $this->cfgRelation = $cfgRelation;

libraries/classes/Controllers/Table/TableSearchController.php

@@ -86,9 +86,15 @@ class TableSearchController extends TableController
      * @param string $searchType Search type
      * @param string $url_query  URL query
      */
-    public function __construct($searchType, $url_query)
-    {
-        parent::__construct();
+    public function __construct(
+        $response,
+        $dbi,
+        $db,
+        $table,
+        $searchType,
+        $url_query
+    ) {
+        parent::__construct($response, $dbi, $db, $table);
 
         $this->url_query = $url_query;
         $this->_searchType = $searchType;

libraries/classes/Controllers/Table/TableStructureController.php

@@ -71,9 +71,9 @@ class TableStructureController extends TableController
     /**
      * TableStructureController constructor
      *
-     * @param string $type                Indicate the db_structure or tbl_structure
      * @param string $db                  DB name
      * @param string $table               Table name
+     * @param string $type                Indicate the db_structure or tbl_structure
      * @param int    $num_tables          Number of tables
      * @param int    $pos                 Current position in the list
      * @param bool   $db_is_system_schema DB is information_schema
@@ -87,11 +87,24 @@ class TableStructureController extends TableController
      * @param array  $showtable           Show table info
      */
     public function __construct(
-        $type, $db, $table, $num_tables, $pos, $db_is_system_schema,
-        $total_num_tables, $tables, $is_show_stats, $tbl_is_view,
-        $tbl_storage_engine, $table_info_num_rows, $tbl_collation, $showtable
+        $response,
+        $dbi,
+        $db,
+        $table,
+        $type,
+        $num_tables,
+        $pos,
+        $db_is_system_schema,
+        $total_num_tables,
+        $tables,
+        $is_show_stats,
+        $tbl_is_view,
+        $tbl_storage_engine,
+        $table_info_num_rows,
+        $tbl_collation,
+        $showtable
     ) {
-        parent::__construct();
+        parent::__construct($response, $dbi, $db, $table);
 
         $this->_db_is_system_schema = $db_is_system_schema;
         $this->_url_query = Url::getCommonRaw(array('db' => $db, 'table' => $table));

libraries/classes/Controllers/TableController.php

@@ -27,10 +27,14 @@ abstract class TableController extends Controller
     /**
      * Constructor
      */
-    public function __construct()
-    {
-        parent::__construct();
-        $this->db = $this->container->get('db');
-        $this->table = $this->container->get('table');
+    public function __construct(
+        $response,
+        $dbi,
+        $db,
+        $table
+    ) {
+        parent::__construct($response, $dbi);
+        $this->db = $db;
+        $this->table = $table;
     }
 }

test/classes/Controllers/Database/DatabaseStructureControllerTest.php

@@ -99,7 +99,9 @@ public function testGetValuesForInnodbTable()
         $method = $class->getMethod('getValuesForInnodbTable');
         $method->setAccessible(true);
         $ctrl = new DatabaseStructureController(
-            $GLOBALS['db'], null
+            $container->get('response'),
+            $container->get('dbi'),
+            $container->get('db')
         );
         // Showing statistics
         $property = $class->getProperty('_is_show_stats');
@@ -145,7 +147,9 @@ public function testGetValuesForInnodbTable()
         // Not showing statistics
         $is_show_stats = false;
         $ctrl = new DatabaseStructureController(
-            $GLOBALS['db'], null
+            $container->get('response'),
+            $container->get('dbi'),
+            $container->get('db')
         );
 
         $current_table['ENGINE'] = 'InnoDB';
@@ -181,12 +185,15 @@ public function testGetValuesForInnodbTable()
      */
     public function testGetValuesForAriaTable()
     {
+        $container = Container::getDefaultContainer();
         $class = new ReflectionClass('PhpMyAdmin\Controllers\Database\DatabaseStructureController');
         $method = $class->getMethod('getValuesForAriaTable');
         $method->setAccessible(true);
 
         $ctrl = new DatabaseStructureController(
-            $GLOBALS['db'], null
+            $container->get('response'),
+            $container->get('dbi'),
+            $container->get('db')
         );
         // Showing statistics
         $property = $class->getProperty('_is_show_stats');
@@ -224,15 +231,19 @@ public function testGetValuesForAriaTable()
 
         $is_show_stats = false;
         $ctrl = new DatabaseStructureController(
-            $GLOBALS['db'], null
+            $container->get('response'),
+            $container->get('dbi'),
+            $container->get('db')
         );
         list($current_table,,,,,, $sum_size)
             = $method->invokeArgs($ctrl, array($current_table, 0, 0, 0, 0, 0, 0));
         $this->assertEquals(0, $sum_size);
 
         $db_is_system_schema = false;
         $ctrl = new DatabaseStructureController(
-            $GLOBALS['db'], null
+            $container->get('response'),
+            $container->get('dbi'),
+            $container->get('db')
         );
         list($current_table,,,,,,)
             = $method->invokeArgs($ctrl, array($current_table, 0, 0, 0, 0, 0, 0,));
@@ -247,12 +258,15 @@ public function testGetValuesForAriaTable()
      */
     public function testHasTable()
     {
+        $container = Container::getDefaultContainer();
         $class = new ReflectionClass('PhpMyAdmin\Controllers\Database\DatabaseStructureController');
         $method = $class->getMethod('hasTable');
         $method->setAccessible(true);
 
         $ctrl = new DatabaseStructureController(
-            $GLOBALS['db'], null
+            $container->get('response'),
+            $container->get('dbi'),
+            $container->get('db')
         );
 
         // When parameter $db is empty
@@ -288,12 +302,15 @@ public function testHasTable()
      */
     public function testCheckFavoriteTable()
     {
+        $container = Container::getDefaultContainer();
         $class = new ReflectionClass('PhpMyAdmin\Controllers\Database\DatabaseStructureController');
         $method = $class->getMethod('checkFavoriteTable');
         $method->setAccessible(true);
 
         $ctrl = new DatabaseStructureController(
-            $GLOBALS['db'], null
+            $container->get('response'),
+            $container->get('dbi'),
+            $container->get('db')
         );
 
         $_SESSION['tmpval']['favorite_tables'][$GLOBALS['server']] = array(
@@ -319,6 +336,7 @@ public function testCheckFavoriteTable()
      */
     public function testSynchronizeFavoriteTables()
     {
+        $container = Container::getDefaultContainer();
         $fav_instance = $this->getMockBuilder('PhpMyAdmin\RecentFavoriteTable')
             ->disableOriginalConstructor()
             ->getMock();
@@ -339,7 +357,9 @@ public function testSynchronizeFavoriteTables()
         $method->setAccessible(true);
 
         $ctrl = new DatabaseStructureController(
-            $GLOBALS['db'], null
+            $container->get('response'),
+            $container->get('dbi'),
+            $container->get('db')
         );
 
         // The user hash for test
@@ -365,10 +385,13 @@ public function testSynchronizeFavoriteTables()
      */
     public function testHandleRealRowCountRequestAction()
     {
+        $container = Container::getDefaultContainer();
         $_REQUEST['table'] = 'table';
 
         $ctrl = new DatabaseStructureController(
-            $GLOBALS['db'], null
+            $container->get('response'),
+            $container->get('dbi'),
+            $container->get('db')
         );
         // Showing statistics
         $class = new ReflectionClass('PhpMyAdmin\Controllers\Database\DatabaseStructureController');