Fix some coding standard issues

Signed-off-by: Maurício Meneghini Fauth <mauricio@fauth.dev>

config.sample.inc.php

@@ -6,6 +6,7 @@
  * All directives are explained in documentation in the doc/ folder
  * or at <https://docs.phpmyadmin.net/>.
  */
+
 declare(strict_types=1);
 
 /**

examples/config.manyhosts.inc.php

@@ -5,6 +5,7 @@
  * a new host, just drop it into $hosts below. Contributed by
  * Matthew Hawkins.
  */
+
 declare(strict_types=1);
 
 $i = 0;

examples/openid.php

@@ -11,6 +11,7 @@
  * User first authenticates using OpenID and based on content of $AUTH_MAP
  * the login information is passed to phpMyAdmin in session data.
  */
+
 declare(strict_types=1);
 
 if (false === @include_once 'OpenID/RelyingParty.php') {

examples/signon-script.php

@@ -6,6 +6,7 @@
  * phpMyAdmin, it is not intended to be perfect code and look, only
  * shows how you can integrate this functionality in your application.
  */
+
 declare(strict_types=1);
 
 /**

examples/signon.php

@@ -6,6 +6,7 @@
  * phpMyAdmin, it is not intended to be perfect code and look, only
  * shows how you can integrate this functionality in your application.
  */
+
 declare(strict_types=1);
 
 /* Use cookies for session */

index.php

@@ -2,6 +2,7 @@
 /**
  * Main loader script
  */
+
 declare(strict_types=1);
 
 use PhpMyAdmin\Routing;

js/messages.php

@@ -2,6 +2,7 @@
 /**
  * Exporting of translated messages from PHP to Javascript
  */
+
 declare(strict_types=1);
 
 use PhpMyAdmin\OutputBuffering;

libraries/classes/Advisor.php

@@ -3,6 +3,7 @@
  * A simple rules engine, that parses and executes the rules in advisory_rules.txt.
  * Adjusted to phpMyAdmin.
  */
+
 declare(strict_types=1);
 
 namespace PhpMyAdmin;

libraries/classes/Bookmark.php

@@ -2,6 +2,7 @@
 /**
  * Handles bookmarking SQL queries
  */
+
 declare(strict_types=1);
 
 namespace PhpMyAdmin;

libraries/classes/BrowseForeigners.php

@@ -2,6 +2,7 @@
 /**
  * Contains functions used by browse foreigners
  */
+
 declare(strict_types=1);
 
 namespace PhpMyAdmin;

libraries/classes/CentralColumns.php

@@ -2,6 +2,7 @@
 /**
  * Functions for displaying user preferences pages
  */
+
 declare(strict_types=1);
 
 namespace PhpMyAdmin;

libraries/classes/Charsets.php

@@ -2,6 +2,7 @@
 /**
  * MySQL charset metadata and manipulations
  */
+
 declare(strict_types=1);
 
 namespace PhpMyAdmin;

libraries/classes/Charsets/Charset.php

@@ -2,6 +2,7 @@
 /**
  * Value object class for a character set
  */
+
 declare(strict_types=1);
 
 namespace PhpMyAdmin\Charsets;

libraries/classes/Charsets/Collation.php

@@ -2,6 +2,7 @@
 /**
  * Value object class for a collation
  */
+
 declare(strict_types=1);
 
 namespace PhpMyAdmin\Charsets;

libraries/classes/CheckUserPrivileges.php

@@ -2,6 +2,7 @@
 /**
  * Get user's global privileges and some db-specific privileges
  */
+
 declare(strict_types=1);
 
 namespace PhpMyAdmin;

libraries/classes/Command/AdvisoryRulesCommand.php

@@ -2,6 +2,7 @@
 /**
  * Translates advisory rules to Gettext format
  */
+
 declare(strict_types=1);
 
 namespace PhpMyAdmin\Command;

libraries/classes/Common.php

@@ -1,4 +1,5 @@
 <?php
+
 declare(strict_types=1);
 
 namespace PhpMyAdmin;

libraries/classes/Config.php

@@ -2,6 +2,7 @@
 /**
  * Configuration handling.
  */
+
 declare(strict_types=1);
 
 namespace PhpMyAdmin;

libraries/classes/Config/ConfigFile.php

@@ -2,6 +2,7 @@
 /**
  * Config file management
  */
+
 declare(strict_types=1);
 
 namespace PhpMyAdmin\Config;

libraries/classes/Config/Descriptions.php

@@ -2,6 +2,7 @@
 /**
  * Verbose descriptions for settings.
  */
+
 declare(strict_types=1);
 
 namespace PhpMyAdmin\Config;

libraries/classes/Config/Form.php

@@ -2,6 +2,7 @@
 /**
  * Form handling code.
  */
+
 declare(strict_types=1);
 
 namespace PhpMyAdmin\Config;

libraries/classes/Config/FormDisplay.php

@@ -9,6 +9,7 @@
  * o translated_path - work_path modified for HTML field name, a path with
  *                     slashes changed to hyphens, eg. Servers-4-verbose
  */
+
 declare(strict_types=1);
 
 namespace PhpMyAdmin\Config;

libraries/classes/Config/FormDisplayTemplate.php

@@ -2,6 +2,7 @@
 /**
  * Form templates
  */
+
 declare(strict_types=1);
 
 namespace PhpMyAdmin\Config;

libraries/classes/Config/Forms/BaseForm.php

@@ -2,6 +2,7 @@
 /**
  * Base class for preferences.
  */
+
 declare(strict_types=1);
 
 namespace PhpMyAdmin\Config\Forms;

libraries/classes/Config/Forms/BaseFormList.php

@@ -2,6 +2,7 @@
 /**
  * User preferences form
  */
+
 declare(strict_types=1);
 
 namespace PhpMyAdmin\Config\Forms;
@@ -44,7 +45,7 @@ class BaseFormList
     /**
      * @param string $name Name
      *
-     * @return null|string
+     * @return string|null
      */
     public static function get($name)
     {

libraries/classes/Config/Forms/Page/BrowseForm.php

@@ -2,6 +2,7 @@
 /**
  * User preferences form
  */
+
 declare(strict_types=1);
 
 namespace PhpMyAdmin\Config\Forms\Page;

libraries/classes/Config/Forms/Page/DbStructureForm.php

@@ -2,6 +2,7 @@
 /**
  * User preferences form
  */
+
 declare(strict_types=1);
 
 namespace PhpMyAdmin\Config\Forms\Page;

libraries/classes/Config/Forms/Page/EditForm.php

@@ -2,6 +2,7 @@
 /**
  * User preferences form
  */
+
 declare(strict_types=1);
 
 namespace PhpMyAdmin\Config\Forms\Page;

libraries/classes/Config/Forms/Page/ExportForm.php

@@ -2,6 +2,7 @@
 /**
  * User preferences form
  */
+
 declare(strict_types=1);
 
 namespace PhpMyAdmin\Config\Forms\Page;

libraries/classes/Config/Forms/Page/ImportForm.php

@@ -2,6 +2,7 @@
 /**
  * User preferences form
  */
+
 declare(strict_types=1);
 
 namespace PhpMyAdmin\Config\Forms\Page;

libraries/classes/Config/Forms/Page/NaviForm.php

@@ -2,6 +2,7 @@
 /**
  * User preferences form
  */
+
 declare(strict_types=1);
 
 namespace PhpMyAdmin\Config\Forms\Page;

libraries/classes/Config/Forms/Page/PageFormList.php

@@ -2,6 +2,7 @@
 /**
  * Page preferences form
  */
+
 declare(strict_types=1);
 
 namespace PhpMyAdmin\Config\Forms\Page;

libraries/classes/Config/Forms/Page/SqlForm.php

@@ -2,6 +2,7 @@
 /**
  * User preferences form
  */
+
 declare(strict_types=1);
 
 namespace PhpMyAdmin\Config\Forms\Page;

libraries/classes/Config/Forms/Page/TableStructureForm.php

@@ -2,6 +2,7 @@
 /**
  * User preferences form
  */
+
 declare(strict_types=1);
 
 namespace PhpMyAdmin\Config\Forms\Page;

libraries/classes/Config/Forms/Setup/ConfigForm.php

@@ -2,6 +2,7 @@
 /**
  * User preferences form
  */
+
 declare(strict_types=1);
 
 namespace PhpMyAdmin\Config\Forms\Setup;

libraries/classes/Config/Forms/Setup/ExportForm.php

@@ -2,6 +2,7 @@
 /**
  * User preferences form
  */
+
 declare(strict_types=1);
 
 namespace PhpMyAdmin\Config\Forms\Setup;

libraries/classes/Config/Forms/Setup/FeaturesForm.php

@@ -2,6 +2,7 @@
 /**
  * User preferences form
  */
+
 declare(strict_types=1);
 
 namespace PhpMyAdmin\Config\Forms\Setup;

libraries/classes/Config/Forms/Setup/ImportForm.php

@@ -2,6 +2,7 @@
 /**
  * User preferences form
  */
+
 declare(strict_types=1);
 
 namespace PhpMyAdmin\Config\Forms\Setup;

libraries/classes/Config/Forms/Setup/MainForm.php

@@ -2,6 +2,7 @@
 /**
  * User preferences form
  */
+
 declare(strict_types=1);
 
 namespace PhpMyAdmin\Config\Forms\Setup;

libraries/classes/Config/Forms/Setup/NaviForm.php

@@ -2,6 +2,7 @@
 /**
  * User preferences form
  */
+
 declare(strict_types=1);
 
 namespace PhpMyAdmin\Config\Forms\Setup;

libraries/classes/Config/Forms/Setup/ServersForm.php

@@ -2,6 +2,7 @@
 /**
  * User preferences form
  */
+
 declare(strict_types=1);
 
 namespace PhpMyAdmin\Config\Forms\Setup;

libraries/classes/Config/Forms/Setup/SetupFormList.php

@@ -2,6 +2,7 @@
 /**
  * Setup preferences form
  */
+
 declare(strict_types=1);
 
 namespace PhpMyAdmin\Config\Forms\Setup;

libraries/classes/Config/Forms/Setup/SqlForm.php

@@ -2,6 +2,7 @@
 /**
  * User preferences form
  */
+
 declare(strict_types=1);
 
 namespace PhpMyAdmin\Config\Forms\Setup;

libraries/classes/Config/Forms/User/ExportForm.php

@@ -2,6 +2,7 @@
 /**
  * User preferences form
  */
+
 declare(strict_types=1);
 
 namespace PhpMyAdmin\Config\Forms\User;

libraries/classes/Config/Forms/User/FeaturesForm.php

@@ -2,6 +2,7 @@
 /**
  * User preferences form
  */
+
 declare(strict_types=1);
 
 namespace PhpMyAdmin\Config\Forms\User;

libraries/classes/Config/Forms/User/ImportForm.php

@@ -2,6 +2,7 @@
 /**
  * User preferences form
  */
+
 declare(strict_types=1);
 
 namespace PhpMyAdmin\Config\Forms\User;

libraries/classes/Config/Forms/User/MainForm.php

@@ -2,6 +2,7 @@
 /**
  * User preferences form
  */
+
 declare(strict_types=1);
 
 namespace PhpMyAdmin\Config\Forms\User;

libraries/classes/Config/Forms/User/NaviForm.php

@@ -2,6 +2,7 @@
 /**
  * User preferences form
  */
+
 declare(strict_types=1);
 
 namespace PhpMyAdmin\Config\Forms\User;

libraries/classes/Config/Forms/User/SqlForm.php

@@ -2,6 +2,7 @@
 /**
  * User preferences form
  */
+
 declare(strict_types=1);
 
 namespace PhpMyAdmin\Config\Forms\User;

libraries/classes/Config/Forms/User/UserFormList.php

@@ -2,6 +2,7 @@
 /**
  * User preferences form
  */
+
 declare(strict_types=1);
 
 namespace PhpMyAdmin\Config\Forms\User;

libraries/classes/Config/PageSettings.php

@@ -2,6 +2,7 @@
 /**
  * Page-related settings
  */
+
 declare(strict_types=1);
 
 namespace PhpMyAdmin\Config;

libraries/classes/Config/ServerConfigChecks.php

@@ -2,6 +2,7 @@
 /**
  * Server config checks management
  */
+
 declare(strict_types=1);
 
 namespace PhpMyAdmin\Config;

libraries/classes/Config/SpecialSchemaLinks.php

@@ -2,6 +2,7 @@
 /**
  * Links configuration for MySQL system tables
  */
+
 declare(strict_types=1);
 
 namespace PhpMyAdmin\Config;

libraries/classes/Config/Validator.php

@@ -2,6 +2,7 @@
 /**
  * Form validation for configuration editor
  */
+
 declare(strict_types=1);
 
 namespace PhpMyAdmin\Config;

libraries/classes/Console.php

@@ -2,6 +2,7 @@
 /**
  * Used to render the console of PMA's pages
  */
+
 declare(strict_types=1);
 
 namespace PhpMyAdmin;

libraries/classes/Controllers/AbstractController.php

@@ -2,6 +2,7 @@
 /**
  * Holds the PhpMyAdmin\Controllers\AbstractController
  */
+
 declare(strict_types=1);
 
 namespace PhpMyAdmin\Controllers;

libraries/classes/Controllers/AjaxController.php

@@ -2,6 +2,7 @@
 /**
  * Generic AJAX endpoint for getting information about database
  */
+
 declare(strict_types=1);
 
 namespace PhpMyAdmin\Controllers;

libraries/classes/Controllers/BrowseForeignersController.php

@@ -2,6 +2,7 @@
 /**
  * Holds the PhpMyAdmin\Controllers\BrowseForeignersController
  */
+
 declare(strict_types=1);
 
 namespace PhpMyAdmin\Controllers;

libraries/classes/Controllers/ChangeLogController.php

@@ -2,6 +2,7 @@
 /**
  * Simple script to set correct charset for changelog
  */
+
 declare(strict_types=1);
 
 namespace PhpMyAdmin\Controllers;

libraries/classes/Controllers/CheckRelationsController.php

@@ -2,6 +2,7 @@
 /**
  * Displays status of phpMyAdmin configuration storage
  */
+
 declare(strict_types=1);
 
 namespace PhpMyAdmin\Controllers;

libraries/classes/Controllers/Database/AbstractController.php

@@ -2,6 +2,7 @@
 /**
  * Holds the PhpMyAdmin\Controllers\Database\AbstractController
  */
+
 declare(strict_types=1);
 
 namespace PhpMyAdmin\Controllers\Database;

libraries/classes/Controllers/Database/CentralColumnsController.php

@@ -2,6 +2,7 @@
 /**
  * Central Columns view/edit
  */
+
 declare(strict_types=1);
 
 namespace PhpMyAdmin\Controllers\Database;

libraries/classes/Controllers/Database/DataDictionaryController.php

@@ -2,6 +2,7 @@
 /**
  * Holds the PhpMyAdmin\Controllers\Database\DataDictionaryController
  */
+
 declare(strict_types=1);
 
 namespace PhpMyAdmin\Controllers\Database;

libraries/classes/Controllers/Database/DesignerController.php

@@ -1,4 +1,5 @@
 <?php
+
 declare(strict_types=1);
 
 namespace PhpMyAdmin\Controllers\Database;

libraries/classes/Controllers/Database/ExportController.php

@@ -1,4 +1,5 @@
 <?php
+
 declare(strict_types=1);
 
 namespace PhpMyAdmin\Controllers\Database;

libraries/classes/Controllers/Database/ImportController.php

@@ -1,4 +1,5 @@
 <?php
+
 declare(strict_types=1);
 
 namespace PhpMyAdmin\Controllers\Database;

libraries/classes/Controllers/Database/MultiTableQueryController.php

@@ -2,6 +2,7 @@
 /**
  * Holds the PhpMyAdmin\Controllers\Database\MultiTableQueryController
  */
+
 declare(strict_types=1);
 
 namespace PhpMyAdmin\Controllers\Database;

libraries/classes/Controllers/Database/OperationsController.php

@@ -1,4 +1,5 @@
 <?php
+
 declare(strict_types=1);
 
 namespace PhpMyAdmin\Controllers\Database;

libraries/classes/Controllers/Database/PrivilegesController.php

@@ -2,6 +2,7 @@
 /**
  * Controller for database privileges
  */
+
 declare(strict_types=1);
 
 namespace PhpMyAdmin\Controllers\Database;

libraries/classes/Controllers/Database/RoutinesController.php

@@ -2,6 +2,7 @@
 /**
  * Holds the PhpMyAdmin\Controllers\Database\RoutinesController
  */
+
 declare(strict_types=1);
 
 namespace PhpMyAdmin\Controllers\Database;

libraries/classes/Controllers/Database/SearchController.php

@@ -1,4 +1,5 @@
 <?php
+
 declare(strict_types=1);
 
 namespace PhpMyAdmin\Controllers\Database;

libraries/classes/Controllers/Database/SqlAutoCompleteController.php

@@ -1,4 +1,5 @@
 <?php
+
 declare(strict_types=1);
 
 namespace PhpMyAdmin\Controllers\Database;

libraries/classes/Controllers/Database/SqlController.php

@@ -1,4 +1,5 @@
 <?php
+
 declare(strict_types=1);
 
 namespace PhpMyAdmin\Controllers\Database;

libraries/classes/Controllers/Database/SqlFormatController.php

@@ -1,4 +1,5 @@
 <?php
+
 declare(strict_types=1);
 
 namespace PhpMyAdmin\Controllers\Database;

libraries/classes/Controllers/Database/StructureController.php

@@ -1123,8 +1123,7 @@ class StructureController extends AbstractController
             $databaseCharset = $collation->getCharset();
         }
 
-        // table form
-        $html .= $this->template->render('database/structure/table_header', [
+        return $html . $this->template->render('database/structure/table_header', [
             'db' => $this->db,
             'db_is_system_schema' => $this->dbIsSystemSchema,
             'replication' => $GLOBALS['replication_info']['slave']['status'],
@@ -1171,8 +1170,6 @@ class StructureController extends AbstractController
                 'central_columns_work' => $GLOBALS['cfgRelation']['centralcolumnswork'] ?? null,
             ],
         ]);
-
-        return $html;
     }
 
     /**

libraries/classes/Controllers/Database/TrackingController.php

@@ -1,4 +1,5 @@
 <?php
+
 declare(strict_types=1);
 
 namespace PhpMyAdmin\Controllers\Database;

libraries/classes/Controllers/Database/TriggersController.php

@@ -2,6 +2,7 @@
 /**
  * Holds the PhpMyAdmin\Controllers\Database\TriggersController
  */
+
 declare(strict_types=1);
 
 namespace PhpMyAdmin\Controllers\Database;

libraries/classes/Controllers/ErrorReportController.php

@@ -2,6 +2,7 @@
 /**
  * Handle error report submission
  */
+
 declare(strict_types=1);
 
 namespace PhpMyAdmin\Controllers;

libraries/classes/Controllers/ExportController.php

@@ -1,4 +1,5 @@
 <?php
+
 declare(strict_types=1);
 
 namespace PhpMyAdmin\Controllers;

libraries/classes/Controllers/GisDataEditorController.php

@@ -2,6 +2,7 @@
 /**
  * Editor for Geometry data types.
  */
+
 declare(strict_types=1);
 
 namespace PhpMyAdmin\Controllers;

libraries/classes/Controllers/HomeController.php

@@ -2,6 +2,7 @@
 /**
  * Holds the PhpMyAdmin\Controllers\HomeController
  */
+
 declare(strict_types=1);
 
 namespace PhpMyAdmin\Controllers;

libraries/classes/Controllers/ImportController.php

@@ -1,4 +1,5 @@
 <?php
+
 declare(strict_types=1);
 
 namespace PhpMyAdmin\Controllers;

libraries/classes/Controllers/ImportStatusController.php

@@ -1,4 +1,5 @@
 <?php
+
 declare(strict_types=1);
 
 namespace PhpMyAdmin\Controllers;

libraries/classes/Controllers/LicenseController.php

@@ -2,6 +2,7 @@
 /**
  * Simple script to set correct charset for the license
  */
+
 declare(strict_types=1);
 
 namespace PhpMyAdmin\Controllers;

libraries/classes/Controllers/LintController.php

@@ -2,6 +2,7 @@
 /**
  * Represents the interface between the linter and the query editor.
  */
+
 declare(strict_types=1);
 
 namespace PhpMyAdmin\Controllers;

libraries/classes/Controllers/LogoutController.php

@@ -1,4 +1,5 @@
 <?php
+
 declare(strict_types=1);
 
 namespace PhpMyAdmin\Controllers;

libraries/classes/Controllers/NavigationController.php

@@ -1,4 +1,5 @@
 <?php
+
 declare(strict_types=1);
 
 namespace PhpMyAdmin\Controllers;

libraries/classes/Controllers/NormalizationController.php

@@ -1,4 +1,5 @@
 <?php
+
 declare(strict_types=1);
 
 namespace PhpMyAdmin\Controllers;

libraries/classes/Controllers/PhpInfoController.php

@@ -2,6 +2,7 @@
 /**
  * phpinfo() wrapper to allow displaying only when configured to do so.
  */
+
 declare(strict_types=1);
 
 namespace PhpMyAdmin\Controllers;

libraries/classes/Controllers/Preferences/ManageController.php

@@ -1,4 +1,5 @@
 <?php
+
 declare(strict_types=1);
 
 namespace PhpMyAdmin\Controllers\Preferences;

libraries/classes/Controllers/Preferences/TwoFactorController.php

@@ -1,4 +1,5 @@
 <?php
+
 declare(strict_types=1);
 
 namespace PhpMyAdmin\Controllers\Preferences;

libraries/classes/Controllers/SchemaExportController.php

@@ -1,4 +1,5 @@
 <?php
+
 declare(strict_types=1);
 
 namespace PhpMyAdmin\Controllers;

libraries/classes/Controllers/Server/BinlogController.php

@@ -2,6 +2,7 @@
 /**
  * Holds the PhpMyAdmin\Controllers\Server\BinlogController
  */
+
 declare(strict_types=1);
 
 namespace PhpMyAdmin\Controllers\Server;

libraries/classes/Controllers/Server/CollationsController.php

@@ -2,6 +2,7 @@
 /**
  * Holds the PhpMyAdmin\Controllers\Server\CollationsController
  */
+
 declare(strict_types=1);
 
 namespace PhpMyAdmin\Controllers\Server;

libraries/classes/Controllers/Server/DatabasesController.php

@@ -2,6 +2,7 @@
 /**
  * Holds the PhpMyAdmin\Controllers\Server\DatabasesController
  */
+
 declare(strict_types=1);
 
 namespace PhpMyAdmin\Controllers\Server;

libraries/classes/Controllers/Server/EnginesController.php

@@ -2,6 +2,7 @@
 /**
  * Holds the PhpMyAdmin\Controllers\Server\EnginesController
  */
+
 declare(strict_types=1);
 
 namespace PhpMyAdmin\Controllers\Server;

libraries/classes/Controllers/Server/ExportController.php

@@ -1,4 +1,5 @@
 <?php
+
 declare(strict_types=1);
 
 namespace PhpMyAdmin\Controllers\Server;

libraries/classes/Controllers/Server/ImportController.php

@@ -1,4 +1,5 @@
 <?php
+
 declare(strict_types=1);
 
 namespace PhpMyAdmin\Controllers\Server;

libraries/classes/Controllers/Server/PluginsController.php

@@ -3,6 +3,7 @@
 /**
  * Holds the PhpMyAdmin\Controllers\Server\PluginsController
  */
+
 declare(strict_types=1);
 
 namespace PhpMyAdmin\Controllers\Server;

libraries/classes/Controllers/Server/PrivilegesController.php

@@ -1,4 +1,5 @@
 <?php
+
 declare(strict_types=1);
 
 namespace PhpMyAdmin\Controllers\Server;