Declare $containerBuilder global when necessary

Signed-off-by: Maurício Meneghini Fauth <mauricio@fauth.dev>
phpmyadmin · Jul 31, 2019 · daf7666 · daf7666
1 parent 1a06ab1
commit daf7666
Show file tree

Hide file tree

Showing 51 changed files with 91 additions and 20 deletions.
diff --git a/ajax.php b/ajax.php
@@ -17,6 +17,8 @@
     define('ROOT_PATH', __DIR__ . DIRECTORY_SEPARATOR);
 }
 
+global $containerBuilder;
+
 $_GET['ajax_request'] = 'true';
 
 require_once ROOT_PATH . 'libraries/common.inc.php';

diff --git a/browse_foreigners.php b/browse_foreigners.php
@@ -18,6 +18,8 @@
     define('ROOT_PATH', __DIR__ . DIRECTORY_SEPARATOR);
 }
 
+global $containerBuilder;
+
 require_once ROOT_PATH . 'libraries/common.inc.php';
 
 Util::checkParameters(['db', 'table', 'field'], true);

diff --git a/changelog.php b/changelog.php
@@ -14,6 +14,8 @@
     define('ROOT_PATH', __DIR__ . DIRECTORY_SEPARATOR);
 }
 
+global $containerBuilder;
+
 /**
  * Gets core libraries and defines some variables
  */

diff --git a/chk_rel.php b/chk_rel.php
@@ -15,6 +15,8 @@
     define('ROOT_PATH', __DIR__ . DIRECTORY_SEPARATOR);
 }
 
+global $containerBuilder;
+
 require_once ROOT_PATH . 'libraries/common.inc.php';
 
 /** @var Response $response */

diff --git a/db_central_columns.php b/db_central_columns.php
@@ -7,16 +7,18 @@
  */
 declare(strict_types=1);
 
-if (! defined('ROOT_PATH')) {
-    define('ROOT_PATH', __DIR__ . DIRECTORY_SEPARATOR);
-}
-
 use PhpMyAdmin\CentralColumns;
 use PhpMyAdmin\Controllers\Database\CentralColumnsController;
 use PhpMyAdmin\Core;
 use PhpMyAdmin\Message;
 use PhpMyAdmin\Response;
 
+if (! defined('ROOT_PATH')) {
+    define('ROOT_PATH', __DIR__ . DIRECTORY_SEPARATOR);
+}
+
+global $containerBuilder;
+
 require_once ROOT_PATH . 'libraries/common.inc.php';
 
 /** @var Response $response */

diff --git a/db_datadict.php b/db_datadict.php
@@ -15,6 +15,8 @@
     define('ROOT_PATH', __DIR__ . DIRECTORY_SEPARATOR);
 }
 
+global $containerBuilder;
+
 require_once ROOT_PATH . 'libraries/common.inc.php';
 
 Util::checkParameters(['db']);

diff --git a/db_designer.php b/db_designer.php
@@ -16,7 +16,7 @@
     define('ROOT_PATH', __DIR__ . DIRECTORY_SEPARATOR);
 }
 
-global $db;
+global $containerBuilder, $db;
 
 require_once ROOT_PATH . 'libraries/common.inc.php';
 

diff --git a/db_events.php b/db_events.php
@@ -17,6 +17,8 @@
     define('ROOT_PATH', __DIR__ . DIRECTORY_SEPARATOR);
 }
 
+global $containerBuilder;
+
 require_once ROOT_PATH . 'libraries/common.inc.php';
 
 /** @var Response $response */

diff --git a/db_export.php b/db_export.php
@@ -19,7 +19,7 @@
     define('ROOT_PATH', __DIR__ . DIRECTORY_SEPARATOR);
 }
 
-global $db, $table, $url_query;
+global $containerBuilder, $db, $table, $url_query;
 
 require_once ROOT_PATH . 'libraries/common.inc.php';
 

diff --git a/db_multi_table_query.php b/db_multi_table_query.php
@@ -16,6 +16,8 @@
     define('ROOT_PATH', __DIR__ . DIRECTORY_SEPARATOR);
 }
 
+global $containerBuilder;
+
 require_once ROOT_PATH . 'libraries/common.inc.php';
 
 /** @var Response $response */

diff --git a/db_qbe.php b/db_qbe.php
@@ -22,7 +22,7 @@
     define('ROOT_PATH', __DIR__ . DIRECTORY_SEPARATOR);
 }
 
-global $db, $pmaThemeImage, $url_query;
+global $containerBuilder, $db, $pmaThemeImage, $url_query;
 
 require_once ROOT_PATH . 'libraries/common.inc.php';
 

diff --git a/db_routines.php b/db_routines.php
@@ -18,6 +18,8 @@
     define('ROOT_PATH', __DIR__ . DIRECTORY_SEPARATOR);
 }
 
+global $containerBuilder;
+
 require_once ROOT_PATH . 'libraries/common.inc.php';
 
 /** @var Response $response */

diff --git a/db_sql_autocomplete.php b/db_sql_autocomplete.php
@@ -14,6 +14,8 @@
     define('ROOT_PATH', __DIR__ . DIRECTORY_SEPARATOR);
 }
 
+global $containerBuilder;
+
 require_once ROOT_PATH . 'libraries/common.inc.php';
 
 /** @var Response $response */

diff --git a/db_triggers.php b/db_triggers.php
@@ -17,6 +17,8 @@
     define('ROOT_PATH', __DIR__ . DIRECTORY_SEPARATOR);
 }
 
+global $containerBuilder;
+
 require_once ROOT_PATH . 'libraries/common.inc.php';
 
 /** @var Response $response */

diff --git a/error_report.php b/error_report.php
@@ -17,6 +17,8 @@
     define('ROOT_PATH', __DIR__ . DIRECTORY_SEPARATOR);
 }
 
+global $containerBuilder;
+
 require_once ROOT_PATH . 'libraries/common.inc.php';
 
 if (! isset($_POST['exception_type'])

diff --git a/export.php b/export.php
@@ -26,7 +26,7 @@
     define('ROOT_PATH', __DIR__ . DIRECTORY_SEPARATOR);
 }
 
-global $db, $sql_query;
+global $containerBuilder, $db, $sql_query;
 
 include_once ROOT_PATH . 'libraries/common.inc.php';
 

diff --git a/gis_data_editor.php b/gis_data_editor.php
@@ -18,6 +18,8 @@
     define('ROOT_PATH', __DIR__ . DIRECTORY_SEPARATOR);
 }
 
+global $containerBuilder;
+
 require_once ROOT_PATH . 'libraries/common.inc.php';
 
 /** @var Template $template */

diff --git a/import.php b/import.php
@@ -30,7 +30,7 @@
     define('PMA_ENABLE_LDI', 1);
 }
 
-global $db, $pmaThemeImage, $table;
+global $containerBuilder, $db, $pmaThemeImage, $table;
 
 require_once ROOT_PATH . 'libraries/common.inc.php';
 

diff --git a/libraries/tbl_columns_definition_form.inc.php b/libraries/tbl_columns_definition_form.inc.php
@@ -38,7 +38,7 @@
     ]
 );
 
-global $db, $table;
+global $containerBuilder, $db, $table;
 
 /** @var Relation $relation */
 $relation = $containerBuilder->get('relation');

diff --git a/navigation.php b/navigation.php
@@ -19,6 +19,8 @@
     define('ROOT_PATH', __DIR__ . DIRECTORY_SEPARATOR);
 }
 
+global $containerBuilder;
+
 require_once ROOT_PATH . 'libraries/common.inc.php';
 
 /** @var Response $response */

diff --git a/normalization.php b/normalization.php
@@ -17,7 +17,7 @@
     define('ROOT_PATH', __DIR__ . DIRECTORY_SEPARATOR);
 }
 
-global $db, $table;
+global $containerBuilder, $db, $table;
 
 require_once ROOT_PATH . 'libraries/common.inc.php';
 

diff --git a/phpstan.neon.dist b/phpstan.neon.dist
@@ -16,7 +16,6 @@ parameters:
         - '#Undefined variable: \$(export_type|err_url|collation_connection|filename_template|transform_key|cn|goto|token_mismatch|auth_plugin|username|hostname|display_query)#'#Others
         - '#Undefined variable: \$max_upload_size#'#tbl_import.php
         - '#Undefined variable: \$(repobase|fullrevision|revision|repobranchbase|branch)#'#Footer.php
-        - '#Undefined variable: \$(containerBuilder)#'
         - '#Variable \$_(REQUEST|GET|POST|COOKIE|SESSION) in isset\(\) always exists and is not nullable#'#Sanitize.php
         - '#Variable \$msg1 might not be defined#'#Twig/I18n/NodeTrans.php
         - '#Variable \$(foreign_db|foreign_table) might not be defined#'#Relation.php, do while(false) + break

diff --git a/prefs_forms.php b/prefs_forms.php
@@ -22,6 +22,8 @@
     define('ROOT_PATH', __DIR__ . DIRECTORY_SEPARATOR);
 }
 
+global $containerBuilder;
+
 /**
  * Gets some core libraries and displays a top message if required
  */

diff --git a/prefs_manage.php b/prefs_manage.php
@@ -23,6 +23,8 @@
     define('ROOT_PATH', __DIR__ . DIRECTORY_SEPARATOR);
 }
 
+global $containerBuilder;
+
 /**
  * Gets some core libraries and displays a top message if required
  */

diff --git a/prefs_twofactor.php b/prefs_twofactor.php
@@ -17,6 +17,8 @@
     define('ROOT_PATH', __DIR__ . DIRECTORY_SEPARATOR);
 }
 
+global $containerBuilder;
+
 /**
  * Gets some core libraries and displays a top message if required
  */

diff --git a/schema_export.php b/schema_export.php
@@ -15,6 +15,8 @@
     define('ROOT_PATH', __DIR__ . DIRECTORY_SEPARATOR);
 }
 
+global $containerBuilder;
+
 require_once ROOT_PATH . 'libraries/common.inc.php';
 
 /**

diff --git a/server_binlog.php b/server_binlog.php
@@ -14,6 +14,8 @@
     define('ROOT_PATH', __DIR__ . DIRECTORY_SEPARATOR);
 }
 
+global $containerBuilder;
+
 require_once ROOT_PATH . 'libraries/common.inc.php';
 
 /** @var BinlogController $controller */

diff --git a/server_replication.php b/server_replication.php
@@ -16,6 +16,8 @@
     define('ROOT_PATH', __DIR__ . DIRECTORY_SEPARATOR);
 }
 
+global $containerBuilder;
+
 require_once ROOT_PATH . 'libraries/common.inc.php';
 require_once ROOT_PATH . 'libraries/server_common.inc.php';
 require_once ROOT_PATH . 'libraries/replication.inc.php';

diff --git a/server_sql.php b/server_sql.php
@@ -16,6 +16,8 @@
     define('ROOT_PATH', __DIR__ . DIRECTORY_SEPARATOR);
 }
 
+global $containerBuilder;
+
 require_once ROOT_PATH . 'libraries/common.inc.php';
 
 /** @var Response $response */

diff --git a/server_status_advisor.php b/server_status_advisor.php
@@ -15,6 +15,8 @@
     define('ROOT_PATH', __DIR__ . DIRECTORY_SEPARATOR);
 }
 
+global $containerBuilder;
+
 require_once ROOT_PATH . 'libraries/common.inc.php';
 require_once ROOT_PATH . 'libraries/replication.inc.php';
 

diff --git a/server_status_monitor.php b/server_status_monitor.php
@@ -15,6 +15,8 @@
     define('ROOT_PATH', __DIR__ . DIRECTORY_SEPARATOR);
 }
 
+global $containerBuilder;
+
 require_once ROOT_PATH . 'libraries/common.inc.php';
 require_once ROOT_PATH . 'libraries/server_common.inc.php';
 require_once ROOT_PATH . 'libraries/replication.inc.php';

diff --git a/server_status_processes.php b/server_status_processes.php
@@ -15,6 +15,8 @@
     define('ROOT_PATH', __DIR__ . DIRECTORY_SEPARATOR);
 }
 
+global $containerBuilder;
+
 require_once ROOT_PATH . 'libraries/common.inc.php';
 require_once ROOT_PATH . 'libraries/server_common.inc.php';
 require_once ROOT_PATH . 'libraries/replication.inc.php';

diff --git a/server_status_variables.php b/server_status_variables.php
@@ -15,6 +15,8 @@
     define('ROOT_PATH', __DIR__ . DIRECTORY_SEPARATOR);
 }
 
+global $containerBuilder;
+
 require_once ROOT_PATH . 'libraries/common.inc.php';
 require_once ROOT_PATH . 'libraries/server_common.inc.php';
 require_once ROOT_PATH . 'libraries/replication.inc.php';

diff --git a/server_user_groups.php b/server_user_groups.php
@@ -17,6 +17,8 @@
     define('ROOT_PATH', __DIR__ . DIRECTORY_SEPARATOR);
 }
 
+global $containerBuilder;
+
 require_once ROOT_PATH . 'libraries/common.inc.php';
 
 /** @var Response $response */

diff --git a/tbl_addfield.php b/tbl_addfield.php
@@ -20,6 +20,8 @@
     define('ROOT_PATH', __DIR__ . DIRECTORY_SEPARATOR);
 }
 
+global $containerBuilder;
+
 require_once ROOT_PATH . 'libraries/common.inc.php';
 
 /** @var Response $response */

diff --git a/tbl_chart.php b/tbl_chart.php
@@ -14,6 +14,8 @@
     define('ROOT_PATH', __DIR__ . DIRECTORY_SEPARATOR);
 }
 
+global $containerBuilder;
+
 require_once ROOT_PATH . 'libraries/common.inc.php';
 
 /* Define dependencies for the concerned controller */

diff --git a/tbl_create.php b/tbl_create.php
@@ -20,6 +20,8 @@
     define('ROOT_PATH', __DIR__ . DIRECTORY_SEPARATOR);
 }
 
+global $containerBuilder;
+
 require_once ROOT_PATH . 'libraries/common.inc.php';
 
 /** @var Response $response */

diff --git a/tbl_find_replace.php b/tbl_find_replace.php
@@ -16,6 +16,8 @@
     define('ROOT_PATH', __DIR__ . DIRECTORY_SEPARATOR);
 }
 
+global $containerBuilder;
+
 /** @var string $url_query Overwritten in tbl_common.inc.php */
 $url_query = null;
 

diff --git a/tbl_get_field.php b/tbl_get_field.php
@@ -16,6 +16,8 @@
     define('ROOT_PATH', __DIR__ . DIRECTORY_SEPARATOR);
 }
 
+global $containerBuilder;
+
 require_once ROOT_PATH . 'libraries/common.inc.php';
 
 /** @var Response $response */

diff --git a/tbl_gis_visualization.php b/tbl_gis_visualization.php
@@ -16,6 +16,8 @@
     define('ROOT_PATH', __DIR__ . DIRECTORY_SEPARATOR);
 }
 
+global $containerBuilder;
+
 require_once ROOT_PATH . 'libraries/common.inc.php';
 
 $sqlQuery = null;

diff --git a/tbl_indexes.php b/tbl_indexes.php
@@ -15,6 +15,8 @@
     define('ROOT_PATH', __DIR__ . DIRECTORY_SEPARATOR);
 }
 
+global $containerBuilder;
+
 require_once ROOT_PATH . 'libraries/common.inc.php';
 
 /** @var DatabaseInterface $dbi */

diff --git a/tbl_operations.php b/tbl_operations.php
@@ -23,7 +23,7 @@
     define('ROOT_PATH', __DIR__ . DIRECTORY_SEPARATOR);
 }
 
-global $url_query;
+global $containerBuilder, $url_query;
 
 require_once ROOT_PATH . 'libraries/common.inc.php';
 

diff --git a/tbl_relation.php b/tbl_relation.php
@@ -26,6 +26,8 @@
     define('ROOT_PATH', __DIR__ . DIRECTORY_SEPARATOR);
 }
 
+global $containerBuilder;
+
 require_once ROOT_PATH . 'libraries/common.inc.php';
 
 /* Define dependencies for the concerned controller */