From baf0985e5ff107aeed05b56e3b99315b2faa03e2 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Maur=C3=ADcio=20Meneghini=20Fauth?= Date: Fri, 18 May 2018 01:59:38 -0300 Subject: [PATCH] Fix phpcs errors MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit Signed-off-by: Maurício Meneghini Fauth --- libraries/classes/Bookmark.php | 36 +++++++++---- libraries/classes/Config/Forms/BaseForm.php | 2 + .../classes/Config/Forms/BaseFormList.php | 21 ++++++++ .../classes/Config/Forms/Page/BrowseForm.php | 7 +++ .../Config/Forms/Page/DbStructureForm.php | 7 +++ .../classes/Config/Forms/Page/EditForm.php | 7 +++ .../classes/Config/Forms/Page/ExportForm.php | 4 ++ .../classes/Config/Forms/Page/ImportForm.php | 4 ++ .../classes/Config/Forms/Page/NaviForm.php | 4 ++ .../Config/Forms/Page/PageFormList.php | 10 ++++ .../classes/Config/Forms/Page/SqlForm.php | 4 ++ .../Config/Forms/Page/TableStructureForm.php | 7 +++ .../classes/Config/Forms/Setup/ConfigForm.php | 7 +++ .../classes/Config/Forms/Setup/ExportForm.php | 4 ++ .../Config/Forms/Setup/FeaturesForm.php | 7 +++ .../classes/Config/Forms/Setup/ImportForm.php | 4 ++ .../classes/Config/Forms/Setup/MainForm.php | 7 +++ .../classes/Config/Forms/Setup/NaviForm.php | 4 ++ .../Config/Forms/Setup/ServersForm.php | 7 +++ .../Config/Forms/Setup/SetupFormList.php | 10 ++++ .../classes/Config/Forms/Setup/SqlForm.php | 7 +++ .../classes/Config/Forms/User/ExportForm.php | 10 ++++ .../Config/Forms/User/FeaturesForm.php | 10 ++++ .../classes/Config/Forms/User/ImportForm.php | 10 ++++ .../classes/Config/Forms/User/MainForm.php | 10 ++++ .../classes/Config/Forms/User/NaviForm.php | 10 ++++ .../classes/Config/Forms/User/SqlForm.php | 10 ++++ .../Config/Forms/User/UserFormList.php | 10 ++++ libraries/classes/Controllers/Controller.php | 3 ++ .../Database/DatabaseStructureController.php | 5 ++ .../Controllers/DatabaseController.php | 4 ++ .../Server/ServerBinlogController.php | 3 ++ .../Server/ServerPluginsController.php | 3 ++ .../Server/ServerVariablesController.php | 3 ++ .../Table/TableChartController.php | 10 ++-- .../Table/TableGisVisualizationController.php | 21 ++++---- .../Table/TableIndexesController.php | 6 ++- .../Table/TableRelationController.php | 16 +++--- .../Table/TableSearchController.php | 8 ++- .../Table/TableStructureController.php | 30 ++++++----- .../classes/Controllers/TableController.php | 5 ++ libraries/classes/Import.php | 2 +- libraries/classes/ListAbstract.php | 2 +- libraries/classes/Message.php | 2 +- libraries/classes/Plugins.php | 4 +- .../classes/Plugins/TwoFactor/Application.php | 2 + .../classes/Plugins/TwoFactor/Invalid.php | 2 + libraries/classes/Plugins/TwoFactor/Key.php | 2 + .../classes/Plugins/TwoFactor/Simple.php | 2 + libraries/classes/Plugins/TwoFactorPlugin.php | 2 + libraries/classes/TwoFactor.php | 2 + phpunit.xml.dist | 11 ++-- phpunit.xml.nocoverage | 11 ++-- ...vironment_test.php => EnvironmentTest.php} | 8 +-- test/classes/AdvisorTest.php | 6 +++ test/classes/CharsetsTest.php | 3 ++ test/classes/Config/DescriptionTest.php | 15 +++++- test/classes/Config/Forms/FormListTest.php | 8 +++ .../classes/Config/ServerConfigChecksTest.php | 18 ++++++- test/classes/ConfigTest.php | 17 ++++++ .../Table/TableRelationControllerTest.php | 44 +++++----------- test/classes/Database/SearchTest.php | 7 ++- test/classes/DatabaseInterfaceTest.php | 33 +++++++----- test/classes/EncodingTest.php | 24 +++++++-- test/classes/ErrorTest.php | 4 ++ test/classes/FontTest.php | 2 + test/classes/IpAllowDenyTest.php | 5 ++ test/classes/LanguageTest.php | 6 +++ .../Plugins/Auth/AuthenticationCookieTest.php | 41 ++++++++++++++- .../Plugins/Auth/AuthenticationHttpTest.php | 17 ++++++ test/classes/PmaTestCase.php | 8 +++ test/classes/SanitizeTest.php | 12 ++--- test/classes/TableTest.php | 52 ++++++------------- test/classes/TransformationsTest.php | 8 +++ test/classes/TwoFactorTest.php | 27 ++++++++++ test/classes/UtilTest.php | 6 +++ test/classes/Utils/HttpRequestTest.php | 41 +++++++++++++++ test/classes/ZipExtensionTest.php | 8 +++ ...se_interface_test.php => DummyDbiTest.php} | 6 ++- .../{Files_test.php => FilesTest.php} | 17 ++---- ..._checkbox_test.php => GetCheckboxTest.php} | 4 +- test/selenium/CreateDropDatabaseTest.php | 3 ++ test/selenium/CreateRemoveUserTest.php | 3 ++ test/selenium/DbOperationsTest.php | 3 ++ test/selenium/LoginTest.php | 3 ++ test/selenium/SqlQueryTest.php | 4 +- test/selenium/TableCreateTest.php | 4 +- test/selenium/TestBase.php | 7 +-- test/selenium/XssTest.php | 3 ++ themes/metro/css/codemirror.css.php | 6 +++ themes/metro/css/common.css.php | 6 +++ themes/metro/css/designer.css.php | 6 +++ themes/metro/css/enum_editor.css.php | 6 +++ themes/metro/css/gis.css.php | 6 +++ themes/metro/css/jqplot.css.php | 6 +++ themes/metro/css/navigation.css.php | 6 +++ themes/metro/css/resizable-menu.css.php | 8 +++ themes/metro/css/rte.css.php | 7 +++ themes/metro/layout.inc.php | 7 +++ 99 files changed, 754 insertions(+), 188 deletions(-) rename test/{Environment_test.php => EnvironmentTest.php} (95%) rename test/libraries/{database_interface_test.php => DummyDbiTest.php} (96%) rename test/libraries/{Files_test.php => FilesTest.php} (79%) rename test/libraries/common/{PMA_checkbox_test.php => GetCheckboxTest.php} (98%) diff --git a/libraries/classes/Bookmark.php b/libraries/classes/Bookmark.php index bd472fb564..17539379fa 100644 --- a/libraries/classes/Bookmark.php +++ b/libraries/classes/Bookmark.php @@ -63,6 +63,12 @@ class Bookmark */ private $user; + /** + * Bookmark constructor. + * + * @param DatabaseInterface $dbi DatabaseInterface object + * @param string $user Current user + */ public function __construct(DatabaseInterface $dbi, string $user) { $this->dbi = $dbi; @@ -209,6 +215,8 @@ class Bookmark /** * Defines the bookmark parameters for the current user * + * @param string $user Current user + * * @return array|bool the bookmark parameters for the current user * @access public */ @@ -238,10 +246,12 @@ class Bookmark /** * Creates a Bookmark object from the parameters * - * @param array $bkm_fields the properties of the bookmark to add; here, - * $bkm_fields['bkm_sql_query'] is urlencoded - * @param boolean $all_users whether to make the bookmark available - * for all users + * @param DatabaseInterface $dbi DatabaseInterface object + * @param string $user Current user + * @param array $bkm_fields the properties of the bookmark to add; here, + * $bkm_fields['bkm_sql_query'] is urlencoded + * @param boolean $all_users whether to make the bookmark + * available for all users * * @return Bookmark|false */ @@ -271,7 +281,9 @@ class Bookmark /** * Gets the list of bookmarks defined for the current database * - * @param string|bool $db the current database name or false + * @param DatabaseInterface $dbi DatabaseInterface object + * @param string $user Current user + * @param string|bool $db the current database name or false * * @return Bookmark[] the bookmarks list * @@ -325,12 +337,14 @@ class Bookmark /** * Retrieve a specific bookmark * - * @param string $db the current database name - * @param mixed $id an identifier of the bookmark to get - * @param string $id_field which field to look up the identifier - * @param boolean $action_bookmark_all true: get all bookmarks regardless - * of the owning user - * @param boolean $exact_user_match whether to ignore bookmarks with no user + * @param DatabaseInterface $dbi DatabaseInterface object + * @param string $user Current user + * @param string $db the current database name + * @param mixed $id an identifier of the bookmark to get + * @param string $id_field which field to look up the identifier + * @param boolean $action_bookmark_all true: get all bookmarks regardless + * of the owning user + * @param boolean $exact_user_match whether to ignore bookmarks with no user * * @return Bookmark the bookmark * diff --git a/libraries/classes/Config/Forms/BaseForm.php b/libraries/classes/Config/Forms/BaseForm.php index 7ba613fa91..4f0e7328af 100644 --- a/libraries/classes/Config/Forms/BaseForm.php +++ b/libraries/classes/Config/Forms/BaseForm.php @@ -14,6 +14,8 @@ use PhpMyAdmin\Config\FormDisplay; /** * Base form for user preferences + * + * @package PhpMyAdmin */ abstract class BaseForm extends FormDisplay { diff --git a/libraries/classes/Config/Forms/BaseFormList.php b/libraries/classes/Config/Forms/BaseFormList.php index a7d5652ef4..3bf6c0c6eb 100644 --- a/libraries/classes/Config/Forms/BaseFormList.php +++ b/libraries/classes/Config/Forms/BaseFormList.php @@ -11,6 +11,10 @@ namespace PhpMyAdmin\Config\Forms; use PhpMyAdmin\Config\ConfigFile; +/** + * Class BaseFormList + * @package PhpMyAdmin\Config\Forms + */ class BaseFormList { /** @@ -18,20 +22,37 @@ class BaseFormList */ protected static $all = array(); + /** + * @var string + */ protected static $ns = 'PhpMyAdmin\\Config\\Forms\\'; + /** + * @var array + */ private $_forms; + /** + * @return array + */ public static function getAll() { return static::$all; } + /** + * @param string $name Name + * @return bool + */ public static function isValid($name) { return in_array($name, static::$all); } + /** + * @param string $name Name + * @return null|string + */ public static function get($name) { if (static::isValid($name)) { diff --git a/libraries/classes/Config/Forms/Page/BrowseForm.php b/libraries/classes/Config/Forms/Page/BrowseForm.php index 18853daffd..b4c41da030 100644 --- a/libraries/classes/Config/Forms/Page/BrowseForm.php +++ b/libraries/classes/Config/Forms/Page/BrowseForm.php @@ -12,8 +12,15 @@ namespace PhpMyAdmin\Config\Forms\Page; use PhpMyAdmin\Config\Forms\BaseForm; use PhpMyAdmin\Config\Forms\User\MainForm; +/** + * Class BrowseForm + * @package PhpMyAdmin\Config\Forms\Page + */ class BrowseForm extends BaseForm { + /** + * @return array + */ public static function getForms() { return [ diff --git a/libraries/classes/Config/Forms/Page/DbStructureForm.php b/libraries/classes/Config/Forms/Page/DbStructureForm.php index 33f4efe4e8..16a2c32ea1 100644 --- a/libraries/classes/Config/Forms/Page/DbStructureForm.php +++ b/libraries/classes/Config/Forms/Page/DbStructureForm.php @@ -12,8 +12,15 @@ namespace PhpMyAdmin\Config\Forms\Page; use PhpMyAdmin\Config\Forms\BaseForm; use PhpMyAdmin\Config\Forms\User\MainForm; +/** + * Class DbStructureForm + * @package PhpMyAdmin\Config\Forms\Page + */ class DbStructureForm extends BaseForm { + /** + * @return array + */ public static function getForms() { return [ diff --git a/libraries/classes/Config/Forms/Page/EditForm.php b/libraries/classes/Config/Forms/Page/EditForm.php index 15daef5529..6de231da82 100644 --- a/libraries/classes/Config/Forms/Page/EditForm.php +++ b/libraries/classes/Config/Forms/Page/EditForm.php @@ -13,8 +13,15 @@ use PhpMyAdmin\Config\Forms\BaseForm; use PhpMyAdmin\Config\Forms\User\MainForm; use PhpMyAdmin\Config\Forms\User\FeaturesForm; +/** + * Class EditForm + * @package PhpMyAdmin\Config\Forms\Page + */ class EditForm extends BaseForm { + /** + * @return array + */ public static function getForms() { return [ diff --git a/libraries/classes/Config/Forms/Page/ExportForm.php b/libraries/classes/Config/Forms/Page/ExportForm.php index c6fb0f5306..584b2fd195 100644 --- a/libraries/classes/Config/Forms/Page/ExportForm.php +++ b/libraries/classes/Config/Forms/Page/ExportForm.php @@ -9,6 +9,10 @@ declare(strict_types=1); namespace PhpMyAdmin\Config\Forms\Page; +/** + * Class ExportForm + * @package PhpMyAdmin\Config\Forms\Page + */ class ExportForm extends \PhpMyAdmin\Config\Forms\User\ExportForm { } diff --git a/libraries/classes/Config/Forms/Page/ImportForm.php b/libraries/classes/Config/Forms/Page/ImportForm.php index b411300b39..78e429a127 100644 --- a/libraries/classes/Config/Forms/Page/ImportForm.php +++ b/libraries/classes/Config/Forms/Page/ImportForm.php @@ -9,6 +9,10 @@ declare(strict_types=1); namespace PhpMyAdmin\Config\Forms\Page; +/** + * Class ImportForm + * @package PhpMyAdmin\Config\Forms\Page + */ class ImportForm extends \PhpMyAdmin\Config\Forms\User\ImportForm { } diff --git a/libraries/classes/Config/Forms/Page/NaviForm.php b/libraries/classes/Config/Forms/Page/NaviForm.php index ea0b60cf98..02350ebcc8 100644 --- a/libraries/classes/Config/Forms/Page/NaviForm.php +++ b/libraries/classes/Config/Forms/Page/NaviForm.php @@ -9,6 +9,10 @@ declare(strict_types=1); namespace PhpMyAdmin\Config\Forms\Page; +/** + * Class NaviForm + * @package PhpMyAdmin\Config\Forms\Page + */ class NaviForm extends \PhpMyAdmin\Config\Forms\User\NaviForm { } diff --git a/libraries/classes/Config/Forms/Page/PageFormList.php b/libraries/classes/Config/Forms/Page/PageFormList.php index d24c26519a..d27da7832a 100644 --- a/libraries/classes/Config/Forms/Page/PageFormList.php +++ b/libraries/classes/Config/Forms/Page/PageFormList.php @@ -11,8 +11,15 @@ namespace PhpMyAdmin\Config\Forms\Page; use PhpMyAdmin\Config\Forms\BaseFormList; +/** + * Class PageFormList + * @package PhpMyAdmin\Config\Forms\Page + */ class PageFormList extends BaseFormList { + /** + * @var array + */ protected static $all = array( 'Browse', 'DbStructure', @@ -23,5 +30,8 @@ class PageFormList extends BaseFormList 'Sql', 'TableStructure', ); + /** + * @var string + */ protected static $ns = '\\PhpMyAdmin\\Config\\Forms\\Page\\'; } diff --git a/libraries/classes/Config/Forms/Page/SqlForm.php b/libraries/classes/Config/Forms/Page/SqlForm.php index 6b6573147d..4ed85ff6ce 100644 --- a/libraries/classes/Config/Forms/Page/SqlForm.php +++ b/libraries/classes/Config/Forms/Page/SqlForm.php @@ -9,6 +9,10 @@ declare(strict_types=1); namespace PhpMyAdmin\Config\Forms\Page; +/** + * Class SqlForm + * @package PhpMyAdmin\Config\Forms\Page + */ class SqlForm extends \PhpMyAdmin\Config\Forms\User\SqlForm { } diff --git a/libraries/classes/Config/Forms/Page/TableStructureForm.php b/libraries/classes/Config/Forms/Page/TableStructureForm.php index 4ae08eedf2..7259e9e4a9 100644 --- a/libraries/classes/Config/Forms/Page/TableStructureForm.php +++ b/libraries/classes/Config/Forms/Page/TableStructureForm.php @@ -12,8 +12,15 @@ namespace PhpMyAdmin\Config\Forms\Page; use PhpMyAdmin\Config\Forms\BaseForm; use PhpMyAdmin\Config\Forms\User\MainForm; +/** + * Class TableStructureForm + * @package PhpMyAdmin\Config\Forms\Page + */ class TableStructureForm extends BaseForm { + /** + * @return array + */ public static function getForms() { return [ diff --git a/libraries/classes/Config/Forms/Setup/ConfigForm.php b/libraries/classes/Config/Forms/Setup/ConfigForm.php index 8a3bb14c94..9cd4ab82ef 100644 --- a/libraries/classes/Config/Forms/Setup/ConfigForm.php +++ b/libraries/classes/Config/Forms/Setup/ConfigForm.php @@ -11,8 +11,15 @@ namespace PhpMyAdmin\Config\Forms\Setup; use PhpMyAdmin\Config\Forms\BaseForm; +/** + * Class ConfigForm + * @package PhpMyAdmin\Config\Forms\Setup + */ class ConfigForm extends BaseForm { + /** + * @return array + */ public static function getForms() { return array( diff --git a/libraries/classes/Config/Forms/Setup/ExportForm.php b/libraries/classes/Config/Forms/Setup/ExportForm.php index 0c7c315da5..adf7ce4627 100644 --- a/libraries/classes/Config/Forms/Setup/ExportForm.php +++ b/libraries/classes/Config/Forms/Setup/ExportForm.php @@ -9,6 +9,10 @@ declare(strict_types=1); namespace PhpMyAdmin\Config\Forms\Setup; +/** + * Class ExportForm + * @package PhpMyAdmin\Config\Forms\Setup + */ class ExportForm extends \PhpMyAdmin\Config\Forms\User\ExportForm { } diff --git a/libraries/classes/Config/Forms/Setup/FeaturesForm.php b/libraries/classes/Config/Forms/Setup/FeaturesForm.php index 876d31b9e0..840273c0f0 100644 --- a/libraries/classes/Config/Forms/Setup/FeaturesForm.php +++ b/libraries/classes/Config/Forms/Setup/FeaturesForm.php @@ -9,8 +9,15 @@ declare(strict_types=1); namespace PhpMyAdmin\Config\Forms\Setup; +/** + * Class FeaturesForm + * @package PhpMyAdmin\Config\Forms\Setup + */ class FeaturesForm extends \PhpMyAdmin\Config\Forms\User\FeaturesForm { + /** + * @return array + */ public static function getForms() { $result = parent::getForms(); diff --git a/libraries/classes/Config/Forms/Setup/ImportForm.php b/libraries/classes/Config/Forms/Setup/ImportForm.php index 13f55ddfbf..06adf35750 100644 --- a/libraries/classes/Config/Forms/Setup/ImportForm.php +++ b/libraries/classes/Config/Forms/Setup/ImportForm.php @@ -9,6 +9,10 @@ declare(strict_types=1); namespace PhpMyAdmin\Config\Forms\Setup; +/** + * Class ImportForm + * @package PhpMyAdmin\Config\Forms\Setup + */ class ImportForm extends \PhpMyAdmin\Config\Forms\User\ImportForm { } diff --git a/libraries/classes/Config/Forms/Setup/MainForm.php b/libraries/classes/Config/Forms/Setup/MainForm.php index a316d19c1d..ebdc1cd161 100644 --- a/libraries/classes/Config/Forms/Setup/MainForm.php +++ b/libraries/classes/Config/Forms/Setup/MainForm.php @@ -9,8 +9,15 @@ declare(strict_types=1); namespace PhpMyAdmin\Config\Forms\Setup; +/** + * Class MainForm + * @package PhpMyAdmin\Config\Forms\Setup + */ class MainForm extends \PhpMyAdmin\Config\Forms\User\MainForm { + /** + * @return array + */ public static function getForms() { $result = parent::getForms(); diff --git a/libraries/classes/Config/Forms/Setup/NaviForm.php b/libraries/classes/Config/Forms/Setup/NaviForm.php index 1eadc50bb2..da1e9ed049 100644 --- a/libraries/classes/Config/Forms/Setup/NaviForm.php +++ b/libraries/classes/Config/Forms/Setup/NaviForm.php @@ -9,6 +9,10 @@ declare(strict_types=1); namespace PhpMyAdmin\Config\Forms\Setup; +/** + * Class NaviForm + * @package PhpMyAdmin\Config\Forms\Setup + */ class NaviForm extends \PhpMyAdmin\Config\Forms\User\NaviForm { } diff --git a/libraries/classes/Config/Forms/Setup/ServersForm.php b/libraries/classes/Config/Forms/Setup/ServersForm.php index 4530e3de0f..53d1bce5d0 100644 --- a/libraries/classes/Config/Forms/Setup/ServersForm.php +++ b/libraries/classes/Config/Forms/Setup/ServersForm.php @@ -11,8 +11,15 @@ namespace PhpMyAdmin\Config\Forms\Setup; use PhpMyAdmin\Config\Forms\BaseForm; +/** + * Class ServersForm + * @package PhpMyAdmin\Config\Forms\Setup + */ class ServersForm extends BaseForm { + /** + * @return array + */ public static function getForms() { return array( diff --git a/libraries/classes/Config/Forms/Setup/SetupFormList.php b/libraries/classes/Config/Forms/Setup/SetupFormList.php index 523ff22842..54f246dd91 100644 --- a/libraries/classes/Config/Forms/Setup/SetupFormList.php +++ b/libraries/classes/Config/Forms/Setup/SetupFormList.php @@ -11,8 +11,15 @@ namespace PhpMyAdmin\Config\Forms\Setup; use PhpMyAdmin\Config\Forms\BaseFormList; +/** + * Class SetupFormList + * @package PhpMyAdmin\Config\Forms\Setup + */ class SetupFormList extends BaseFormList { + /** + * @var array + */ protected static $all = array( 'Config', 'Export', @@ -23,5 +30,8 @@ class SetupFormList extends BaseFormList 'Servers', 'Sql', ); + /** + * @var string + */ protected static $ns = '\\PhpMyAdmin\\Config\\Forms\\Setup\\'; } diff --git a/libraries/classes/Config/Forms/Setup/SqlForm.php b/libraries/classes/Config/Forms/Setup/SqlForm.php index 38bac28335..0cc3a1c687 100644 --- a/libraries/classes/Config/Forms/Setup/SqlForm.php +++ b/libraries/classes/Config/Forms/Setup/SqlForm.php @@ -9,8 +9,15 @@ declare(strict_types=1); namespace PhpMyAdmin\Config\Forms\Setup; +/** + * Class SqlForm + * @package PhpMyAdmin\Config\Forms\Setup + */ class SqlForm extends \PhpMyAdmin\Config\Forms\User\SqlForm { + /** + * @return array + */ public static function getForms() { $result = parent::getForms(); diff --git a/libraries/classes/Config/Forms/User/ExportForm.php b/libraries/classes/Config/Forms/User/ExportForm.php index 4ab0748b15..275d3c95d9 100644 --- a/libraries/classes/Config/Forms/User/ExportForm.php +++ b/libraries/classes/Config/Forms/User/ExportForm.php @@ -11,8 +11,15 @@ namespace PhpMyAdmin\Config\Forms\User; use PhpMyAdmin\Config\Forms\BaseForm; +/** + * Class ExportForm + * @package PhpMyAdmin\Config\Forms\User + */ class ExportForm extends BaseForm { + /** + * @return array + */ public static function getForms() { return array( @@ -137,6 +144,9 @@ class ExportForm extends BaseForm ); } + /** + * @return string + */ public static function getName() { return __('Export'); diff --git a/libraries/classes/Config/Forms/User/FeaturesForm.php b/libraries/classes/Config/Forms/User/FeaturesForm.php index 01e9aa6f58..f3d252a50d 100644 --- a/libraries/classes/Config/Forms/User/FeaturesForm.php +++ b/libraries/classes/Config/Forms/User/FeaturesForm.php @@ -11,8 +11,15 @@ namespace PhpMyAdmin\Config\Forms\User; use PhpMyAdmin\Config\Forms\BaseForm; +/** + * Class FeaturesForm + * @package PhpMyAdmin\Config\Forms\User + */ class FeaturesForm extends BaseForm { + /** + * @return array + */ public static function getForms() { $result = array( @@ -78,6 +85,9 @@ class FeaturesForm extends BaseForm return $result; } + /** + * @return string + */ public static function getName() { return __('Features'); diff --git a/libraries/classes/Config/Forms/User/ImportForm.php b/libraries/classes/Config/Forms/User/ImportForm.php index e75c0ba95b..489e0f5ce3 100644 --- a/libraries/classes/Config/Forms/User/ImportForm.php +++ b/libraries/classes/Config/Forms/User/ImportForm.php @@ -11,8 +11,15 @@ namespace PhpMyAdmin\Config\Forms\User; use PhpMyAdmin\Config\Forms\BaseForm; +/** + * Class ImportForm + * @package PhpMyAdmin\Config\Forms\User + */ class ImportForm extends BaseForm { + /** + * @return array + */ public static function getForms() { return array( @@ -55,6 +62,9 @@ class ImportForm extends BaseForm ); } + /** + * @return string + */ public static function getName() { return __('Import'); diff --git a/libraries/classes/Config/Forms/User/MainForm.php b/libraries/classes/Config/Forms/User/MainForm.php index 4e6f0a37ee..3ea8c090f7 100644 --- a/libraries/classes/Config/Forms/User/MainForm.php +++ b/libraries/classes/Config/Forms/User/MainForm.php @@ -11,8 +11,15 @@ namespace PhpMyAdmin\Config\Forms\User; use PhpMyAdmin\Config\Forms\BaseForm; +/** + * Class MainForm + * @package PhpMyAdmin\Config\Forms\User + */ class MainForm extends BaseForm { + /** + * @return array + */ public static function getForms() { return array( @@ -81,6 +88,9 @@ class MainForm extends BaseForm ); } + /** + * @return string + */ public static function getName() { return __('Main panel'); diff --git a/libraries/classes/Config/Forms/User/NaviForm.php b/libraries/classes/Config/Forms/User/NaviForm.php index c979157497..602f9fd452 100644 --- a/libraries/classes/Config/Forms/User/NaviForm.php +++ b/libraries/classes/Config/Forms/User/NaviForm.php @@ -11,8 +11,15 @@ namespace PhpMyAdmin\Config\Forms\User; use PhpMyAdmin\Config\Forms\BaseForm; +/** + * Class NaviForm + * @package PhpMyAdmin\Config\Forms\User + */ class NaviForm extends BaseForm { + /** + * @return array + */ public static function getForms() { return array( @@ -56,6 +63,9 @@ class NaviForm extends BaseForm ); } + /** + * @return string + */ public static function getName() { return __('Navigation panel'); diff --git a/libraries/classes/Config/Forms/User/SqlForm.php b/libraries/classes/Config/Forms/User/SqlForm.php index 4e27ad9b53..072c15212a 100644 --- a/libraries/classes/Config/Forms/User/SqlForm.php +++ b/libraries/classes/Config/Forms/User/SqlForm.php @@ -11,8 +11,15 @@ namespace PhpMyAdmin\Config\Forms\User; use PhpMyAdmin\Config\Forms\BaseForm; +/** + * Class SqlForm + * @package PhpMyAdmin\Config\Forms\User + */ class SqlForm extends BaseForm { + /** + * @return array + */ public static function getForms() { return array( @@ -37,6 +44,9 @@ class SqlForm extends BaseForm ); } + /** + * @return string + */ public static function getName() { return __('SQL queries'); diff --git a/libraries/classes/Config/Forms/User/UserFormList.php b/libraries/classes/Config/Forms/User/UserFormList.php index 8777b93080..8ed14f4c3d 100644 --- a/libraries/classes/Config/Forms/User/UserFormList.php +++ b/libraries/classes/Config/Forms/User/UserFormList.php @@ -11,8 +11,15 @@ namespace PhpMyAdmin\Config\Forms\User; use PhpMyAdmin\Config\Forms\BaseFormList; +/** + * Class UserFormList + * @package PhpMyAdmin\Config\Forms\User + */ class UserFormList extends BaseFormList { + /** + * @var array + */ protected static $all = array( 'Features', 'Sql', @@ -21,5 +28,8 @@ class UserFormList extends BaseFormList 'Import', 'Export', ); + /** + * @var string + */ protected static $ns = '\\PhpMyAdmin\\Config\\Forms\\User\\'; } diff --git a/libraries/classes/Controllers/Controller.php b/libraries/classes/Controllers/Controller.php index 3dd212d2b1..f110a2e95c 100644 --- a/libraries/classes/Controllers/Controller.php +++ b/libraries/classes/Controllers/Controller.php @@ -32,6 +32,9 @@ abstract class Controller /** * Constructor + * + * @param Response $response Response object + * @param DatabaseInterface $dbi DatabaseInterface object */ public function __construct($response, $dbi) { diff --git a/libraries/classes/Controllers/Database/DatabaseStructureController.php b/libraries/classes/Controllers/Database/DatabaseStructureController.php index f3fb5877d6..a7be69c2d4 100644 --- a/libraries/classes/Controllers/Database/DatabaseStructureController.php +++ b/libraries/classes/Controllers/Database/DatabaseStructureController.php @@ -13,6 +13,7 @@ use PhpMyAdmin\Charsets; use PhpMyAdmin\Config\PageSettings; use PhpMyAdmin\Controllers\DatabaseController; use PhpMyAdmin\Core; +use PhpMyAdmin\DatabaseInterface; use PhpMyAdmin\Display\CreateTable; use PhpMyAdmin\Message; use PhpMyAdmin\RecentFavoriteTable; @@ -69,6 +70,10 @@ class DatabaseStructureController extends DatabaseController /** * Constructor + * + * @param Response $response Response object + * @param DatabaseInterface $dbi DatabaseInterface object + * @param string $db Database name */ public function __construct($response, $dbi, $db) { diff --git a/libraries/classes/Controllers/DatabaseController.php b/libraries/classes/Controllers/DatabaseController.php index c7220e9f0c..f43ddb76c0 100644 --- a/libraries/classes/Controllers/DatabaseController.php +++ b/libraries/classes/Controllers/DatabaseController.php @@ -23,6 +23,10 @@ abstract class DatabaseController extends Controller /** * Constructor + * + * @param \PhpMyAdmin\Response $response Response object + * @param \PhpMyAdmin\DatabaseInterface $dbi DatabaseInterface object + * @param string $db Database name */ public function __construct($response, $dbi, $db) { diff --git a/libraries/classes/Controllers/Server/ServerBinlogController.php b/libraries/classes/Controllers/Server/ServerBinlogController.php index 22dcbe199e..6ee128f612 100644 --- a/libraries/classes/Controllers/Server/ServerBinlogController.php +++ b/libraries/classes/Controllers/Server/ServerBinlogController.php @@ -31,6 +31,9 @@ class ServerBinlogController extends Controller /** * Constructs ServerBinlogController + * + * @param \PhpMyAdmin\Response $response Response object + * @param \PhpMyAdmin\DatabaseInterface $dbi DatabaseInterface object */ public function __construct($response, $dbi) { diff --git a/libraries/classes/Controllers/Server/ServerPluginsController.php b/libraries/classes/Controllers/Server/ServerPluginsController.php index 0fcb83e94b..4a3d3d2f68 100644 --- a/libraries/classes/Controllers/Server/ServerPluginsController.php +++ b/libraries/classes/Controllers/Server/ServerPluginsController.php @@ -28,6 +28,9 @@ class ServerPluginsController extends Controller /** * Constructs ServerPluginsController + * + * @param \PhpMyAdmin\Response $response Response object + * @param \PhpMyAdmin\DatabaseInterface $dbi DatabaseInterface object */ public function __construct($response, $dbi) { diff --git a/libraries/classes/Controllers/Server/ServerVariablesController.php b/libraries/classes/Controllers/Server/ServerVariablesController.php index da3c8278da..6be5ff9803 100644 --- a/libraries/classes/Controllers/Server/ServerVariablesController.php +++ b/libraries/classes/Controllers/Server/ServerVariablesController.php @@ -32,6 +32,9 @@ class ServerVariablesController extends Controller /** * Constructs ServerVariablesController + * + * @param \PhpMyAdmin\Response $response Response object + * @param \PhpMyAdmin\DatabaseInterface $dbi DatabaseInterface object */ public function __construct($response, $dbi) { diff --git a/libraries/classes/Controllers/Table/TableChartController.php b/libraries/classes/Controllers/Table/TableChartController.php index 51d84a73e1..69d79d36e3 100644 --- a/libraries/classes/Controllers/Table/TableChartController.php +++ b/libraries/classes/Controllers/Table/TableChartController.php @@ -43,9 +43,13 @@ class TableChartController extends TableController /** * Constructor * - * @param string $sql_query Query - * @param string $url_query Query URL - * @param array $cfg Configuration + * @param Response $response Response object + * @param \PhpMyAdmin\DatabaseInterface $dbi DatabaseInterface object + * @param string $db Database name + * @param string $table Table name + * @param string $sql_query Query + * @param string $url_query Query URL + * @param array $cfg Configuration */ public function __construct( $response, diff --git a/libraries/classes/Controllers/Table/TableGisVisualizationController.php b/libraries/classes/Controllers/Table/TableGisVisualizationController.php index 4e612d3794..802b639a0f 100644 --- a/libraries/classes/Controllers/Table/TableGisVisualizationController.php +++ b/libraries/classes/Controllers/Table/TableGisVisualizationController.php @@ -16,9 +16,6 @@ use PhpMyAdmin\Message; use PhpMyAdmin\Template; use PhpMyAdmin\Url; -require_once 'libraries/common.inc.php'; -require_once 'libraries/db_common.inc.php'; - /** * Class TableGisVisualizationController * @@ -26,7 +23,6 @@ require_once 'libraries/db_common.inc.php'; */ class TableGisVisualizationController extends TableController { - /** * @var array $url_params */ @@ -50,11 +46,15 @@ class TableGisVisualizationController extends TableController /** * Constructor * - * @param string $sql_query SQL query for retrieving GIS data - * @param array $url_params array of URL parameters - * @param string $goto goto script - * @param string $back back script - * @param array $visualizationSettings visualization settings + * @param \PhpMyAdmin\Response $response Response object + * @param \PhpMyAdmin\DatabaseInterface $dbi DatabaseInterface object + * @param string $db Database name + * @param string $table Table name + * @param string $sql_query SQL query for retrieving GIS data + * @param array $url_params array of URL parameters + * @param string $goto goto script + * @param string $back back script + * @param array $visualizationSettings visualization settings */ public function __construct( $response, @@ -69,6 +69,9 @@ class TableGisVisualizationController extends TableController ) { parent::__construct($response, $dbi, $db, $table); + require_once 'libraries/common.inc.php'; + require_once 'libraries/db_common.inc.php'; + $this->sql_query = $sql_query; $this->url_params = $url_params; $this->url_params['goto'] = $goto; diff --git a/libraries/classes/Controllers/Table/TableIndexesController.php b/libraries/classes/Controllers/Table/TableIndexesController.php index afde49c9ae..ef996c5598 100644 --- a/libraries/classes/Controllers/Table/TableIndexesController.php +++ b/libraries/classes/Controllers/Table/TableIndexesController.php @@ -31,7 +31,11 @@ class TableIndexesController extends TableController /** * Constructor * - * @param Index $index Index + * @param Response $response Response object + * @param \PhpMyAdmin\DatabaseInterface $dbi DatabaseInterface object + * @param string $db Database name + * @param string $table Table name + * @param Index $index Index object */ public function __construct( $response, diff --git a/libraries/classes/Controllers/Table/TableRelationController.php b/libraries/classes/Controllers/Table/TableRelationController.php index 0a4f3c801a..3c668b24a0 100644 --- a/libraries/classes/Controllers/Table/TableRelationController.php +++ b/libraries/classes/Controllers/Table/TableRelationController.php @@ -63,12 +63,16 @@ class TableRelationController extends TableController /** * Constructor * - * @param array|null $options_array Options - * @param array|null $cfgRelation Config relation - * @param string $tbl_storage_engine Table storage engine - * @param array|null $existrel Relations - * @param array|null $existrel_foreign External relations - * @param string $upd_query Update query + * @param \PhpMyAdmin\Response $response Response object + * @param DatabaseInterface $dbi DatabaseInterface object + * @param string $db Database name + * @param string $table Table name + * @param array|null $options_array Options + * @param array|null $cfgRelation Config relation + * @param string $tbl_storage_engine Table storage engine + * @param array|null $existrel Relations + * @param array|null $existrel_foreign External relations + * @param string $upd_query Update query */ public function __construct( $response, diff --git a/libraries/classes/Controllers/Table/TableSearchController.php b/libraries/classes/Controllers/Table/TableSearchController.php index 337e6b6b74..c0036cb5f0 100644 --- a/libraries/classes/Controllers/Table/TableSearchController.php +++ b/libraries/classes/Controllers/Table/TableSearchController.php @@ -90,8 +90,12 @@ class TableSearchController extends TableController /** * Constructor * - * @param string $searchType Search type - * @param string $url_query URL query + * @param \PhpMyAdmin\Response $response Response object + * @param DatabaseInterface $dbi DatabaseInterface object + * @param string $db Database name + * @param string $table Table name + * @param string $searchType Search type + * @param string $url_query URL query */ public function __construct( $response, diff --git a/libraries/classes/Controllers/Table/TableStructureController.php b/libraries/classes/Controllers/Table/TableStructureController.php index c3a7414643..59374cc9fe 100644 --- a/libraries/classes/Controllers/Table/TableStructureController.php +++ b/libraries/classes/Controllers/Table/TableStructureController.php @@ -88,20 +88,22 @@ class TableStructureController extends TableController /** * TableStructureController constructor * - * @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 - * @param int $total_num_tables Number of tables - * @param array $tables Tables in the DB - * @param bool $is_show_stats Whether stats show or not - * @param bool $tbl_is_view Table is a view - * @param string $tbl_storage_engine Table storage engine - * @param int $table_info_num_rows Number of rows - * @param string $tbl_collation Table collation - * @param array $showtable Show table info + * @param \PhpMyAdmin\Response $response Response object + * @param \PhpMyAdmin\DatabaseInterface $dbi DatabaseInterface object + * @param string $db Database 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 + * @param int $total_num_tables Number of tables + * @param array $tables Tables in the DB + * @param bool $is_show_stats Whether stats show or not + * @param bool $tbl_is_view Table is a view + * @param string $tbl_storage_engine Table storage engine + * @param int $table_info_num_rows Number of rows + * @param string $tbl_collation Table collation + * @param array $showtable Show table info */ public function __construct( $response, diff --git a/libraries/classes/Controllers/TableController.php b/libraries/classes/Controllers/TableController.php index 0aa6cf566e..624e660a8d 100644 --- a/libraries/classes/Controllers/TableController.php +++ b/libraries/classes/Controllers/TableController.php @@ -28,6 +28,11 @@ abstract class TableController extends Controller /** * Constructor + * + * @param \PhpMyAdmin\Response $response Response object + * @param \PhpMyAdmin\DatabaseInterface $dbi DatabaseInterface object + * @param string $db Database name + * @param string $table Table name */ public function __construct( $response, diff --git a/libraries/classes/Import.php b/libraries/classes/Import.php index 0b02f08ec0..f94738e846 100644 --- a/libraries/classes/Import.php +++ b/libraries/classes/Import.php @@ -589,7 +589,7 @@ class Import * (NONE or VARCHAR or DECIMAL or INT or BIGINT) * @param int $curr_type Type of the current cell * (NONE or VARCHAR or DECIMAL or INT or BIGINT) - * @param string $cell The current cell + * @param string $cell The current cell * * @return string|int Size of the given cell in the type-appropriate format * @access public diff --git a/libraries/classes/ListAbstract.php b/libraries/classes/ListAbstract.php index 3002d2053a..bd2b76cb92 100644 --- a/libraries/classes/ListAbstract.php +++ b/libraries/classes/ListAbstract.php @@ -57,7 +57,7 @@ abstract class ListAbstract extends ArrayObject * checks if the given db names exists in the current list, if there is * missing at least one item it returns false otherwise true * - * @param mixed ... $params + * @param mixed ... $params params * @return bool true if all items exists, otherwise false */ public function exists(...$params) diff --git a/libraries/classes/Message.php b/libraries/classes/Message.php index d0946c61d5..3f9012ead6 100644 --- a/libraries/classes/Message.php +++ b/libraries/classes/Message.php @@ -644,7 +644,7 @@ class Message /** * wrapper for sprintf() * - * @param mixed ... $params + * @param mixed ... $params Params * @return string formatted */ public static function format(...$params): string diff --git a/libraries/classes/Plugins.php b/libraries/classes/Plugins.php index d16335ca12..87e2b79b95 100644 --- a/libraries/classes/Plugins.php +++ b/libraries/classes/Plugins.php @@ -203,7 +203,7 @@ class Plugins * @param string $section name of config section in * $GLOBALS['cfg'][$section] for plugin * @param string $name name of select element - * @param array &$list array with plugin instances + * @param array $list array with plugin instances * @param string $cfgname name of config value, if none same as $name * * @return string html select tag @@ -525,7 +525,7 @@ class Plugins * Returns html div with editable options for plugin * * @param string $section name of config section in $GLOBALS['cfg'][$section] - * @param array &$list array with plugin instances + * @param array $list array with plugin instances * * @return string html fieldset with plugin options */ diff --git a/libraries/classes/Plugins/TwoFactor/Application.php b/libraries/classes/Plugins/TwoFactor/Application.php index 18a7b1bb5e..90ebfc7a32 100644 --- a/libraries/classes/Plugins/TwoFactor/Application.php +++ b/libraries/classes/Plugins/TwoFactor/Application.php @@ -18,6 +18,8 @@ use PragmaRX\Google2FA\Google2FA; * HOTP and TOTP based two-factor authentication * * Also known as Google, Authy, or OTP + * + * @package PhpMyAdmin */ class Application extends TwoFactorPlugin { diff --git a/libraries/classes/Plugins/TwoFactor/Invalid.php b/libraries/classes/Plugins/TwoFactor/Invalid.php index 8c3d96ca4f..ca57dc5a7a 100644 --- a/libraries/classes/Plugins/TwoFactor/Invalid.php +++ b/libraries/classes/Plugins/TwoFactor/Invalid.php @@ -14,6 +14,8 @@ use PhpMyAdmin\Template; /** * Invalid two-factor authentication showing that configured choice is not available. + * + * @package PhpMyAdmin */ class Invalid extends TwoFactorPlugin { diff --git a/libraries/classes/Plugins/TwoFactor/Key.php b/libraries/classes/Plugins/TwoFactor/Key.php index ef07728b05..629c55d755 100644 --- a/libraries/classes/Plugins/TwoFactor/Key.php +++ b/libraries/classes/Plugins/TwoFactor/Key.php @@ -20,6 +20,8 @@ use Samyoul\U2F\U2FServer\U2FException; * Hardware key based two-factor authentication * * Supports FIDO U2F tokens + * + * @package PhpMyAdmin */ class Key extends TwoFactorPlugin { diff --git a/libraries/classes/Plugins/TwoFactor/Simple.php b/libraries/classes/Plugins/TwoFactor/Simple.php index a6d73a98cb..90bca5d957 100644 --- a/libraries/classes/Plugins/TwoFactor/Simple.php +++ b/libraries/classes/Plugins/TwoFactor/Simple.php @@ -16,6 +16,8 @@ use PhpMyAdmin\Template; * Simple two-factor authentication auth asking just for confirmation. * * This has no practical use, but can be used for testing. + * + * @package PhpMyAdmin */ class Simple extends TwoFactorPlugin { diff --git a/libraries/classes/Plugins/TwoFactorPlugin.php b/libraries/classes/Plugins/TwoFactorPlugin.php index 20087917b1..366855dc5d 100644 --- a/libraries/classes/Plugins/TwoFactorPlugin.php +++ b/libraries/classes/Plugins/TwoFactorPlugin.php @@ -19,6 +19,8 @@ use PhpMyAdmin\TwoFactor; * This is basic implementation which does no * additional authentication, subclasses are expected * to implement this. + * + * @package PhpMyAdmin */ class TwoFactorPlugin { diff --git a/libraries/classes/TwoFactor.php b/libraries/classes/TwoFactor.php index e76bf0082c..fd20a43690 100644 --- a/libraries/classes/TwoFactor.php +++ b/libraries/classes/TwoFactor.php @@ -13,6 +13,8 @@ use PhpMyAdmin\UserPreferences; /** * Two factor authentication wrapper class + * + * @package PhpMyAdmin */ class TwoFactor { diff --git a/phpunit.xml.dist b/phpunit.xml.dist index 7c3e5ba0ce..3dee7473ac 100644 --- a/phpunit.xml.dist +++ b/phpunit.xml.dist @@ -17,15 +17,10 @@ test/classes - - test/engines - - test/Environment_test.php - test/libraries/core - test/libraries/common - test/libraries/rte - test/libraries + test/EnvironmentTest.php + test/libraries/common + test/libraries test/selenium diff --git a/phpunit.xml.nocoverage b/phpunit.xml.nocoverage index cbec556ed1..d1ae39d3c9 100644 --- a/phpunit.xml.nocoverage +++ b/phpunit.xml.nocoverage @@ -19,15 +19,10 @@ test/classes - - test/engines - - test/Environment_test.php - test/libraries/core - test/libraries/common - test/libraries/rte - test/libraries + test/EnvironmentTest.php + test/libraries/common + test/libraries test/selenium diff --git a/test/Environment_test.php b/test/EnvironmentTest.php similarity index 95% rename from test/Environment_test.php rename to test/EnvironmentTest.php index f36b0f9813..6e0916398c 100644 --- a/test/Environment_test.php +++ b/test/EnvironmentTest.php @@ -7,19 +7,21 @@ */ declare(strict_types=1); +namespace PhpMyAdmin\Tests; + +use PHPUnit\Framework\TestCase; + /** * */ require_once 'config.sample.inc.php'; -use PHPUnit\Framework\TestCase; - /** * Environment tests * * @package PhpMyAdmin-test */ -class Environment_Test extends TestCase +class EnvironmentTest extends TestCase { /** * Tests PHP version diff --git a/test/classes/AdvisorTest.php b/test/classes/AdvisorTest.php index 3ef931d840..fae6e2dd35 100644 --- a/test/classes/AdvisorTest.php +++ b/test/classes/AdvisorTest.php @@ -79,6 +79,9 @@ class AdvisorTest extends PmaTestCase /** * test for Advisor::byTime * + * @param float $time time + * @param string $expected expected result + * * @return void * * @dataProvider advisorTimes @@ -89,6 +92,9 @@ class AdvisorTest extends PmaTestCase $this->assertEquals($expected, $result); } + /** + * @return array + */ public function advisorTimes() { return array( diff --git a/test/classes/CharsetsTest.php b/test/classes/CharsetsTest.php index 823e4e4353..4e19be3d2d 100644 --- a/test/classes/CharsetsTest.php +++ b/test/classes/CharsetsTest.php @@ -19,6 +19,9 @@ use PHPUnit\Framework\TestCase; */ class CharsetsTest extends TestCase { + /** + * @return void + */ public function setUp() { $GLOBALS['cfg']['DBG']['sql'] = false; diff --git a/test/classes/Config/DescriptionTest.php b/test/classes/Config/DescriptionTest.php index e25205f394..9f85886ce6 100644 --- a/test/classes/Config/DescriptionTest.php +++ b/test/classes/Config/DescriptionTest.php @@ -31,6 +31,12 @@ class DescriptionTest extends PmaTestCase } /** + * @param string $item item + * @param string $type type + * @param string $expected expected result + * + * @return void + * * @dataProvider getValues */ public function testGet($item, $type, $expected) @@ -38,6 +44,9 @@ class DescriptionTest extends PmaTestCase $this->assertEquals($expected, Descriptions::get($item, $type)); } + /** + * @return array + */ public function getValues() { return array( @@ -62,6 +71,8 @@ class DescriptionTest extends PmaTestCase /** * Assertion for getting description key * + * @param string $key key + * * @return void */ public function assertGet($key) @@ -72,7 +83,9 @@ class DescriptionTest extends PmaTestCase } /** - * Test getting all names for configuratons + * Test getting all names for configurations + * + * @return void */ public function testAll() { diff --git a/test/classes/Config/Forms/FormListTest.php b/test/classes/Config/Forms/FormListTest.php index 855a2ed44d..8eb9b546f9 100644 --- a/test/classes/Config/Forms/FormListTest.php +++ b/test/classes/Config/Forms/FormListTest.php @@ -23,6 +23,9 @@ use PhpMyAdmin\Tests\PmaTestCase; */ class FormListTest extends PmaTestCase { + /** + * @return void + */ public function setUp() { $GLOBALS['PMA_Config'] = new Config(); @@ -35,6 +38,8 @@ class FormListTest extends PmaTestCase * @param string $class Class to test * @param string $prefix Reuturned class prefix * + * @return void + * * @dataProvider formObjects */ public function testForms($class, $prefix) @@ -65,6 +70,9 @@ class FormListTest extends PmaTestCase $this->assertEquals('', $forms->displayErrors()); } + /** + * @return array + */ public function formObjects() { return array( diff --git a/test/classes/Config/ServerConfigChecksTest.php b/test/classes/Config/ServerConfigChecksTest.php index f32d3a39af..833e61b5c4 100644 --- a/test/classes/Config/ServerConfigChecksTest.php +++ b/test/classes/Config/ServerConfigChecksTest.php @@ -22,8 +22,16 @@ use ReflectionProperty; */ class ServeConfigChecksTest extends PmaTestCase { + /** + * @var string + */ private $sessionID; + /** + * @throws \ReflectionException + * + * @return void + */ public function setUp() { $GLOBALS['PMA_Config'] = new Config(); @@ -42,6 +50,9 @@ class ServeConfigChecksTest extends PmaTestCase unset($_SESSION[$this->sessionID]); } + /** + * @return void + */ public function testManyErrors() { $_SESSION[$this->sessionID]['Servers'] = array( @@ -100,6 +111,9 @@ class ServeConfigChecksTest extends PmaTestCase ); } + /** + * @return void + */ public function testBlowfishCreate() { $_SESSION[$this->sessionID]['Servers'] = array( @@ -134,9 +148,11 @@ class ServeConfigChecksTest extends PmaTestCase ); } + /** + * @return void + */ public function testBlowfish() { - $_SESSION[$this->sessionID]['blowfish_secret'] = 'sec'; $_SESSION[$this->sessionID]['Servers'] = array( diff --git a/test/classes/ConfigTest.php b/test/classes/ConfigTest.php index 681ed5f65a..d2649fbf6c 100644 --- a/test/classes/ConfigTest.php +++ b/test/classes/ConfigTest.php @@ -486,6 +486,15 @@ class ConfigTest extends PmaTestCase /** * test for IsHttp * + * @param string $scheme http scheme + * @param string $https https + * @param string $uri request uri + * @param string $lb http https from lb + * @param string $front http front end https + * @param string $proto http x forwarded proto + * @param int $port server port + * @param bool $expected expected result + * * @return void * * @dataProvider httpsParams @@ -1024,6 +1033,10 @@ class ConfigTest extends PmaTestCase /** * Test for checkServers * + * @param array $settings settings array + * @param array $expected expected result + * @param bool $error error + * * @return void * * @dataProvider serverSettingsProvider @@ -1075,6 +1088,10 @@ class ConfigTest extends PmaTestCase /** * Test for selectServer * + * @param array $settings settings array + * @param string $request request + * @param int $expected expected result + * * @return void * * @dataProvider selectServerProvider diff --git a/test/classes/Controllers/Table/TableRelationControllerTest.php b/test/classes/Controllers/Table/TableRelationControllerTest.php index 368690ba1c..fea73928c2 100644 --- a/test/classes/Controllers/Table/TableRelationControllerTest.php +++ b/test/classes/Controllers/Table/TableRelationControllerTest.php @@ -41,8 +41,18 @@ class TableRelationControllerTest extends PmaTestCase $_REQUEST['foreignDb'] = 'db'; $_REQUEST['foreignTable'] = 'table'; - $GLOBALS['dblist'] = new DataBasePMAMockForTblRelation(); - $GLOBALS['dblist']->databases = new DataBaseMockForTblRelation(); + $GLOBALS['dblist'] = new \stdClass(); + $GLOBALS['dblist']->databases = new class + { + /** + * @param mixed $name name + * @return bool + */ + public function exists($name) + { + return true; + } + }; $indexes = array( array( @@ -259,33 +269,3 @@ class TableRelationControllerTest extends PmaTestCase ); } } - -/** - * Mock class for DataBasePMAMock - * - * @package PhpMyAdmin-test - */ -Class DataBasePMAMockForTblRelation -{ - var $databases; -} - -/** - * Mock class for DataBaseMock - * - * @package PhpMyAdmin-test - */ -Class DataBaseMockForTblRelation -{ - /** - * mock function to return table is existed - * - * @param string $name table name - * - * @return bool - */ - function exists($name) - { - return true; - } -} diff --git a/test/classes/Database/SearchTest.php b/test/classes/Database/SearchTest.php index 202399d82f..1b67fd73ba 100644 --- a/test/classes/Database/SearchTest.php +++ b/test/classes/Database/SearchTest.php @@ -76,7 +76,7 @@ class SearchTest extends PmaTestCase * @param string $name method name * @param array $params parameters for the invocation * - * @return the output from the protected method. + * @return mixed the output from the protected method. */ private function callProtectedFunction($name, $params) { @@ -89,6 +89,11 @@ class SearchTest extends PmaTestCase /** * Test for generating where clause for different search types * + * @param string $type type + * @param string $expected expected result + * + * @return void + * * @dataProvider searchTypes */ public function testGetWhereClause($type, $expected) diff --git a/test/classes/DatabaseInterfaceTest.php b/test/classes/DatabaseInterfaceTest.php index cf5615dcb3..e9fadc73f5 100644 --- a/test/classes/DatabaseInterfaceTest.php +++ b/test/classes/DatabaseInterfaceTest.php @@ -21,6 +21,9 @@ use PhpMyAdmin\Util; */ class DatabaseInterfaceTest extends PmaTestCase { + /** + * @var DatabaseInterface + */ private $_dbi; /** @@ -38,6 +41,10 @@ class DatabaseInterfaceTest extends PmaTestCase /** * Tests for DBI::getCurrentUser() method. * + * @param array $value value + * @param string $string string + * @param array $expected expected result + * * @return void * @test * @dataProvider currentUserData @@ -92,11 +99,11 @@ class DatabaseInterfaceTest extends PmaTestCase ->method('realQuery') ->will($this->returnValue(true)); - $meta1 = new FieldMeta(); + $meta1 = new \stdClass(); $meta1->table = "meta1_table"; $meta1->name = "meta1_name"; - $meta2 = new FieldMeta(); + $meta2 = new \stdClass(); $meta2->table = "meta2_table"; $meta2->name = "meta2_name"; @@ -371,6 +378,8 @@ class DatabaseInterfaceTest extends PmaTestCase * @param string $error_message Error message as returned by server * @param string $match Expected text * + * @return void + * * @dataProvider errorData */ public function testFormatError($error_number, $error_message, $match) @@ -381,6 +390,9 @@ class DatabaseInterfaceTest extends PmaTestCase ); } + /** + * @return array + */ public function errorData() { return array( @@ -396,6 +408,9 @@ class DatabaseInterfaceTest extends PmaTestCase /** * Tests for DBI::isAmazonRds() method. * + * @param mixed $value value + * @param mixed $expected expected result + * * @return void * @test * @dataProvider isAmazonRdsData @@ -450,6 +465,9 @@ class DatabaseInterfaceTest extends PmaTestCase $this->assertEquals($upgrade, $ver_int < $GLOBALS['cfg']['MysqlMinVersion']['internal']); } + /** + * @return array + */ public function versionData() { return array( @@ -499,14 +517,3 @@ class DatabaseInterfaceTest extends PmaTestCase $dbi->setCollation('utf8mb4_bin_ci'); } } - -/** - * class for Table Field Meta - * - * @package PhpMyAdmin-test - */ -class FieldMeta -{ - public $table; - public $name; -} diff --git a/test/classes/EncodingTest.php b/test/classes/EncodingTest.php index 418b69d4aa..2e4be43d10 100644 --- a/test/classes/EncodingTest.php +++ b/test/classes/EncodingTest.php @@ -19,11 +19,17 @@ use PHPUnit\Framework\TestCase; */ class EncodingTest extends TestCase { + /** + * @return void + */ public function setUp() { Encoding::initEngine(); } + /** + * @return void + */ public function tearDown() { Encoding::initEngine(); @@ -45,6 +51,9 @@ class EncodingTest extends TestCase ); } + /** + * @return void + */ public function testInvalidConversion() { // Invalid value to use default case @@ -55,6 +64,9 @@ class EncodingTest extends TestCase ); } + /** + * @return void + */ public function testRecode() { if (! function_exists('recode_string')) { @@ -70,6 +82,9 @@ class EncodingTest extends TestCase ); } + /** + * @return void + */ public function testIconv() { if (! function_exists('iconv')) { @@ -86,6 +101,9 @@ class EncodingTest extends TestCase ); } + /** + * @return void + */ public function testMbstring() { Encoding::setEngine(Encoding::ENGINE_MB); @@ -100,9 +118,6 @@ class EncodingTest extends TestCase /** * Test for kanjiChangeOrder * - * @param string $kanji_test_list current list - * @param string $expected expected list - * * @return void * @test */ @@ -204,6 +219,9 @@ class EncodingTest extends TestCase ); } + /** + * @return void + */ public function testListEncodings() { $GLOBALS['cfg']['AvailableCharsets'] = ['utf-8']; diff --git a/test/classes/ErrorTest.php b/test/classes/ErrorTest.php index cefb8fbea1..6ea6c31e90 100644 --- a/test/classes/ErrorTest.php +++ b/test/classes/ErrorTest.php @@ -21,6 +21,7 @@ use PhpMyAdmin\Theme; class ErrorTest extends PmaTestCase { /** + * @var Error * @access protected */ protected $object; @@ -76,6 +77,9 @@ class ErrorTest extends PmaTestCase /** * Test for setFile * + * @param string $file actual + * @param string $expected expected + * * @return void * * @dataProvider filePathProvider diff --git a/test/classes/FontTest.php b/test/classes/FontTest.php index 13d27971ed..69fa2eeb8d 100644 --- a/test/classes/FontTest.php +++ b/test/classes/FontTest.php @@ -25,6 +25,8 @@ class FontTest extends PmaTestCase /** * Sets up the fixture + * + * @return void */ protected function setUp() { diff --git a/test/classes/IpAllowDenyTest.php b/test/classes/IpAllowDenyTest.php index f7c89b66cd..fe3574c2e2 100644 --- a/test/classes/IpAllowDenyTest.php +++ b/test/classes/IpAllowDenyTest.php @@ -55,6 +55,11 @@ class IpAllowDenyTest extends TestCase /** * Test for Core::getIp * + * @param string $remote remote + * @param string $header header + * @param string $expected expected result + * @param string $proxyip proxyip + * * @return void * * @dataProvider proxyIPs diff --git a/test/classes/LanguageTest.php b/test/classes/LanguageTest.php index efe73e378c..cd7c1e3b49 100644 --- a/test/classes/LanguageTest.php +++ b/test/classes/LanguageTest.php @@ -19,6 +19,9 @@ use PhpMyAdmin\Tests\PmaTestCase; */ class LanguageTest extends PmaTestCase { + /** + * @var LanguageManager + */ private $manager; /** @@ -35,6 +38,9 @@ class LanguageTest extends PmaTestCase $this->manager = new LanguageManager(); } + /** + * @return void + */ public function tearDown() { // Ensure we have English locale after tests diff --git a/test/classes/Plugins/Auth/AuthenticationCookieTest.php b/test/classes/Plugins/Auth/AuthenticationCookieTest.php index 2a60dbca19..ba2c09011f 100644 --- a/test/classes/Plugins/Auth/AuthenticationCookieTest.php +++ b/test/classes/Plugins/Auth/AuthenticationCookieTest.php @@ -36,7 +36,7 @@ class AuthenticationCookieTest extends PmaTestCase * * @return void */ - function setup() + protected function setUp() { $GLOBALS['PMA_Config'] = new Config(); $GLOBALS['PMA_Config']->enableBc(); @@ -92,6 +92,9 @@ class AuthenticationCookieTest extends PmaTestCase ); } + /** + * @return void + */ private function getAuthErrorMockResponse() { $mockResponse = $this->mockResponse(); @@ -769,6 +772,9 @@ class AuthenticationCookieTest extends PmaTestCase } + /** + * @return void + */ public function testAuthFailsDeny() { $this->object = $this->getMockBuilder('PhpMyAdmin\Plugins\Auth\AuthenticationCookie') @@ -791,6 +797,9 @@ class AuthenticationCookieTest extends PmaTestCase ); } + /** + * @return void + */ public function testAuthFailsActivity() { $this->object = $this->getMockBuilder('PhpMyAdmin\Plugins\Auth\AuthenticationCookie') @@ -816,6 +825,9 @@ class AuthenticationCookieTest extends PmaTestCase ); } + /** + * @return void + */ public function testAuthFailsDBI() { $this->object = $this->getMockBuilder('PhpMyAdmin\Plugins\Auth\AuthenticationCookie') @@ -849,6 +861,9 @@ class AuthenticationCookieTest extends PmaTestCase ); } + /** + * @return void + */ public function testAuthFailsErrno() { $this->object = $this->getMockBuilder('PhpMyAdmin\Plugins\Auth\AuthenticationCookie') @@ -1036,6 +1051,10 @@ class AuthenticationCookieTest extends PmaTestCase /** * Test for secret splitting using getAESSecret * + * @param string $secret secret + * @param string $mac mac + * @param string $aes aes + * * @return void * * @dataProvider secretsProvider @@ -1051,6 +1070,10 @@ class AuthenticationCookieTest extends PmaTestCase /** * Test for secret splitting using getMACSecret and getAESSecret * + * @param string $secret secret + * @param string $mac mac + * @param string $aes aes + * * @return void * * @dataProvider secretsProvider @@ -1063,6 +1086,11 @@ class AuthenticationCookieTest extends PmaTestCase ); } + /** + * @throws \ReflectionException + * + * @return void + */ public function testPasswordChange() { $newPassword = 'PMAPASSWD2'; @@ -1167,6 +1195,14 @@ class AuthenticationCookieTest extends PmaTestCase /** * Test for PhpMyAdmin\Plugins\Auth\AuthenticationCookie::checkRules * + * @param string $user user + * @param string $pass pass + * @param string $ip ip + * @param bool $root root + * @param bool $nopass nopass + * @param array $rules rules + * @param string $expected expected result + * * @return void * * @dataProvider checkRulesProvider @@ -1198,6 +1234,9 @@ class AuthenticationCookieTest extends PmaTestCase } } + /** + * @return array + */ public function checkRulesProvider() { return array( diff --git a/test/classes/Plugins/Auth/AuthenticationHttpTest.php b/test/classes/Plugins/Auth/AuthenticationHttpTest.php index aaa1d5f499..fe98e14fc6 100644 --- a/test/classes/Plugins/Auth/AuthenticationHttpTest.php +++ b/test/classes/Plugins/Auth/AuthenticationHttpTest.php @@ -57,6 +57,14 @@ class AuthenticationHttpTest extends PmaTestCase unset($this->object); } + /** + * @param mixed $set_minimal set minimal + * @param mixed $body_id body id + * @param mixed $set_title set title + * @param mixed ... $headers headers + * + * @return void + */ public function doMockResponse($set_minimal, $body_id, $set_title, ...$headers) { // mock footer @@ -133,6 +141,9 @@ class AuthenticationHttpTest extends PmaTestCase ); } + /** + * @return void + */ public function testAuthVerbose() { $_REQUEST['old_usr'] = ''; @@ -146,6 +157,9 @@ class AuthenticationHttpTest extends PmaTestCase ); } + /** + * @return void + */ public function testAuthHost() { $GLOBALS['cfg']['Server']['verbose'] = ''; @@ -159,6 +173,9 @@ class AuthenticationHttpTest extends PmaTestCase ); } + /** + * @return void + */ public function testAuthRealm() { $GLOBALS['cfg']['Server']['host'] = ''; diff --git a/test/classes/PmaTestCase.php b/test/classes/PmaTestCase.php index d226027a2a..a146274649 100644 --- a/test/classes/PmaTestCase.php +++ b/test/classes/PmaTestCase.php @@ -20,11 +20,19 @@ use ReflectionProperty; */ class PmaTestCase extends TestCase { + /** + * @var Response + */ protected $restoreInstance = null; + /** + * @var Response + */ protected $attrInstance = null; /** * This method is called before the first test of this test class is run. + * + * @return void */ public static function setUpBeforeClass() { diff --git a/test/classes/SanitizeTest.php b/test/classes/SanitizeTest.php index acd53a5c7a..b263df53b1 100644 --- a/test/classes/SanitizeTest.php +++ b/test/classes/SanitizeTest.php @@ -19,15 +19,6 @@ use PHPUnit\Framework\TestCase; */ class SanitizeTest extends TestCase { - /** - * Setup various pre conditions - * - * @return void - */ - function setUp() - { - } - /** * Tests for proper escaping of XSS. * @@ -63,6 +54,9 @@ class SanitizeTest extends TestCase /** * Tests links to documentation. * + * @param string $link link + * @param string $expected expected result + * * @return void * * @dataProvider docLinks diff --git a/test/classes/TableTest.php b/test/classes/TableTest.php index 729e1f9df8..58de980559 100644 --- a/test/classes/TableTest.php +++ b/test/classes/TableTest.php @@ -46,8 +46,18 @@ class TableTest extends PmaTestCase $relation = new Relation(); $GLOBALS['cfgRelation'] = $relation->getRelationsParam(); - $GLOBALS['dblist'] = new DataBasePMAMock(); - $GLOBALS['dblist']->databases = new DataBaseMock(); + $GLOBALS['dblist'] = new \stdClass(); + $GLOBALS['dblist']->databases = new class + { + /** + * @param mixed $name name + * @return bool + */ + public function exists($name) + { + return true; + } + }; $sql_isView_true = "SELECT TABLE_NAME FROM information_schema.VIEWS @@ -377,14 +387,15 @@ class TableTest extends PmaTestCase /** * Test name validation * - * @param string $name name to test - * @param boolean $result expected result + * @param string $name name to test + * @param boolean $result expected result + * @param boolean $is_backquoted is backquoted * * @return void * * @dataProvider dataValidateName */ - public function testValidateName($name, $result, $is_backquoted=false) + public function testValidateName($name, $result, $is_backquoted = false) { $this->assertEquals( $result, @@ -1353,35 +1364,4 @@ class TableTest extends PmaTestCase $create_options ); } - -} - -/** - * Mock class for DataBasePMAMock - * - * @package PhpMyAdmin-test - */ -Class DataBasePMAMock -{ - var $databases; -} - -/** - * Mock class for DataBaseMock - * - * @package PhpMyAdmin-test - */ -Class DataBaseMock -{ - /** - * mock function to return table is existed - * - * @param string $name table name - * - * @return bool - */ - function exists($name) - { - return true; - } } diff --git a/test/classes/TransformationsTest.php b/test/classes/TransformationsTest.php index 3981c9d853..d37f926a2b 100644 --- a/test/classes/TransformationsTest.php +++ b/test/classes/TransformationsTest.php @@ -261,6 +261,11 @@ class TransformationsTest extends TestCase } /** + * @param string $value value + * @param string $expected expected result + * + * @return void + * * @dataProvider fixupData */ public function testFixup($value, $expected) @@ -271,6 +276,9 @@ class TransformationsTest extends TestCase ); } + /** + * @return array + */ public function fixupData() { return array( diff --git a/test/classes/TwoFactorTest.php b/test/classes/TwoFactorTest.php index 260ab5513b..01c1623f54 100644 --- a/test/classes/TwoFactorTest.php +++ b/test/classes/TwoFactorTest.php @@ -20,6 +20,9 @@ use Samyoul\U2F\U2FServer\SignRequest; */ class TwoFactorTest extends PmaTestCase { + /** + * @return void + */ public function setUp() { $GLOBALS['server'] = 1; @@ -53,6 +56,9 @@ class TwoFactorTest extends PmaTestCase return $result; } + /** + * @return void + */ public function testNone() { $object = $this->getTwoFactorMock('user', ['type' => 'db']); @@ -68,6 +74,9 @@ class TwoFactorTest extends PmaTestCase $this->assertEquals('', $object->setup()); } + /** + * @return void + */ public function testSimple() { $GLOBALS['cfg']['DBG']['simple2fa'] = true; @@ -88,6 +97,9 @@ class TwoFactorTest extends PmaTestCase $this->assertEquals('', $object->setup()); } + /** + * @return void + */ public function testLoad() { $object = new TwoFactor('user'); @@ -95,6 +107,9 @@ class TwoFactorTest extends PmaTestCase $this->assertEquals('', $backend::$id); } + /** + * @return void + */ public function testConfigureSimple() { $GLOBALS['cfg']['DBG']['simple2fa'] = true; @@ -110,6 +125,9 @@ class TwoFactorTest extends PmaTestCase $this->assertFalse($object->configure('simple')); } + /** + * @return void + */ public function testApplication() { $object = new TwoFactor('user'); @@ -150,6 +168,9 @@ class TwoFactorTest extends PmaTestCase $this->assertNotEquals('', $object->setup()); } + /** + * @return void + */ public function testKey() { $object = new TwoFactor('user'); @@ -188,6 +209,8 @@ class TwoFactorTest extends PmaTestCase /** * Test getting AppId + * + * @return void */ public function testKeyAppId() { @@ -211,6 +234,8 @@ class TwoFactorTest extends PmaTestCase /** * Test based on upstream test data: * https://github.com/Yubico/php-u2flib-server + * + * @return void */ public function testKeyAuthentication() { @@ -246,6 +271,8 @@ class TwoFactorTest extends PmaTestCase /** * Test listing of available backends. + * + * @return void */ public function testBackends() { diff --git a/test/classes/UtilTest.php b/test/classes/UtilTest.php index 939eb2f2c6..4f91c5ea99 100644 --- a/test/classes/UtilTest.php +++ b/test/classes/UtilTest.php @@ -138,6 +138,8 @@ class UtilTest extends PmaTestCase /** * Test for random generation + * + * @return void */ public function testGenerateRandom() { @@ -2049,6 +2051,10 @@ class UtilTest extends PmaTestCase /** * Test for Util::linkOrButton * + * @param array $params params + * @param int $limit limit + * @param string $match match + * * @return void * * @dataProvider linksOrButtons diff --git a/test/classes/Utils/HttpRequestTest.php b/test/classes/Utils/HttpRequestTest.php index 3f2870ce1c..1623d8e8b7 100644 --- a/test/classes/Utils/HttpRequestTest.php +++ b/test/classes/Utils/HttpRequestTest.php @@ -1,4 +1,10 @@ httpRequest = new HttpRequest(); @@ -66,6 +82,11 @@ class HttpRequestTest extends PmaTestCase /** * Test for http request using Curl * + * @param string $url url + * @param string $method method + * @param bool $return_only_status return only status + * @param bool $expected expected result + * * @group medium * * @return void @@ -84,6 +105,11 @@ class HttpRequestTest extends PmaTestCase /** * Test for http request using Curl with CURLOPT_CAPATH * + * @param string $url url + * @param string $method method + * @param bool $return_only_status return only status + * @param bool $expected expected result + * * @group medium * * @return void @@ -109,6 +135,11 @@ class HttpRequestTest extends PmaTestCase /** * Test for http request using Curl with CURLOPT_CAINFO * + * @param string $url url + * @param string $method method + * @param bool $return_only_status return only status + * @param bool $expected expected result + * * @group medium * * @return void @@ -134,6 +165,11 @@ class HttpRequestTest extends PmaTestCase /** * Test for http request using fopen * + * @param string $url url + * @param string $method method + * @param bool $return_only_status return only status + * @param bool $expected expected result + * * @group medium * * @return void @@ -155,6 +191,11 @@ class HttpRequestTest extends PmaTestCase /** * Test for http request using generic interface * + * @param string $url url + * @param string $method method + * @param bool $return_only_status return only status + * @param bool $expected expected result + * * @group medium * * @return void diff --git a/test/classes/ZipExtensionTest.php b/test/classes/ZipExtensionTest.php index 6a8bfb8b5c..afc6d47c8d 100644 --- a/test/classes/ZipExtensionTest.php +++ b/test/classes/ZipExtensionTest.php @@ -19,8 +19,14 @@ use ZipArchive; */ class ZipExtensionTest extends PmaTestCase { + /** + * @var ZipExtension + */ private $zipExtension; + /** + * @return void + */ protected function setUp() { $this->zipExtension = new ZipExtension(); @@ -142,6 +148,8 @@ class ZipExtensionTest extends PmaTestCase /** * Helper function to get ZipArchive for content. * + * @param mixed $file file + * * @return ZipArchive */ private function getZip($file) diff --git a/test/libraries/database_interface_test.php b/test/libraries/DummyDbiTest.php similarity index 96% rename from test/libraries/database_interface_test.php rename to test/libraries/DummyDbiTest.php index 5d46688a04..1e54cb2674 100644 --- a/test/libraries/database_interface_test.php +++ b/test/libraries/DummyDbiTest.php @@ -7,6 +7,8 @@ */ declare(strict_types=1); +namespace PhpMyAdmin\Tests; + use PHPUnit\Framework\TestCase; /** @@ -14,14 +16,14 @@ use PHPUnit\Framework\TestCase; * * @package PhpMyAdmin-test */ -class PMA_DBI_Test extends TestCase +class DummyDbiTest extends TestCase { /** * Configures test parameters. * * @return void */ - function setup() + protected function setUp() { $GLOBALS['cfg']['DBG']['sql'] = false; $GLOBALS['cfg']['IconvExtraParams'] = ''; diff --git a/test/libraries/Files_test.php b/test/libraries/FilesTest.php similarity index 79% rename from test/libraries/Files_test.php rename to test/libraries/FilesTest.php index b938478ce0..bf08ef21da 100644 --- a/test/libraries/Files_test.php +++ b/test/libraries/FilesTest.php @@ -7,6 +7,8 @@ */ declare(strict_types=1); +namespace PhpMyAdmin\Tests; + use PHPUnit\Framework\TestCase; /** @@ -16,22 +18,11 @@ use PHPUnit\Framework\TestCase; */ class FilesTest extends TestCase { - /** - * Sets up the fixture, for example, opens a network connection. - * This method is called before a test is executed. - * - * @access protected - * @return void - */ - public function setUp() - { - } - /** * Test for dynamic javascript files * - * @param $name string Filename to test - * @param $expected string Expected output + * @param string $name Filename to test + * @param string $expected Expected output * * @return void * diff --git a/test/libraries/common/PMA_checkbox_test.php b/test/libraries/common/GetCheckboxTest.php similarity index 98% rename from test/libraries/common/PMA_checkbox_test.php rename to test/libraries/common/GetCheckboxTest.php index 3c19422157..f0badf5f7b 100644 --- a/test/libraries/common/PMA_checkbox_test.php +++ b/test/libraries/common/GetCheckboxTest.php @@ -8,6 +8,8 @@ */ declare(strict_types=1); +namespace PhpMyAdmin\Tests; + use PHPUnit\Framework\TestCase; /** @@ -16,7 +18,7 @@ use PHPUnit\Framework\TestCase; * @package PhpMyAdmin-test * @group common.lib-tests */ -class PMA_GetCheckboxTest extends TestCase +class GetCheckboxTest extends TestCase { /** * Test for checkbox.phtml diff --git a/test/selenium/CreateDropDatabaseTest.php b/test/selenium/CreateDropDatabaseTest.php index 65c492cc22..83a433c2df 100644 --- a/test/selenium/CreateDropDatabaseTest.php +++ b/test/selenium/CreateDropDatabaseTest.php @@ -31,6 +31,9 @@ class CreateDropDatabaseTest extends TestBase $this->skipIfNotSuperUser(); } + /** + * @return void + */ public function setUpPage() { parent::setUpPage(); diff --git a/test/selenium/CreateRemoveUserTest.php b/test/selenium/CreateRemoveUserTest.php index 698a2b703e..d882188e6c 100644 --- a/test/selenium/CreateRemoveUserTest.php +++ b/test/selenium/CreateRemoveUserTest.php @@ -48,6 +48,9 @@ class CreateRemoveUserTest extends TestBase $this->_txtPassword = 'abc_123'; } + /** + * @return void + */ public function setUpPage() { parent::setUpPage(); diff --git a/test/selenium/DbOperationsTest.php b/test/selenium/DbOperationsTest.php index b7d4369400..521f91b0cb 100644 --- a/test/selenium/DbOperationsTest.php +++ b/test/selenium/DbOperationsTest.php @@ -30,6 +30,9 @@ class DbOperationsTest extends TestBase $this->login(); } + /** + * @return void + */ private function _getToDBOperations() { $this->gotoHomepage(); diff --git a/test/selenium/LoginTest.php b/test/selenium/LoginTest.php index bb2bdff3f8..2282ecae88 100644 --- a/test/selenium/LoginTest.php +++ b/test/selenium/LoginTest.php @@ -19,6 +19,9 @@ namespace PhpMyAdmin\Tests\Selenium; */ class LoginTest extends TestBase { + /** + * @return void + */ public function setUpPage() { parent::setUpPage(); diff --git a/test/selenium/SqlQueryTest.php b/test/selenium/SqlQueryTest.php index e9379b6a8f..b615906484 100644 --- a/test/selenium/SqlQueryTest.php +++ b/test/selenium/SqlQueryTest.php @@ -19,7 +19,6 @@ namespace PhpMyAdmin\Tests\Selenium; */ class SqlQueryTest extends TestBase { - /** * Setup the browser environment to run the selenium test case * @@ -168,6 +167,9 @@ class SqlQueryTest extends TestBase $this->_testInlineEdit(); } + /** + * @return void + */ private function _testInlineEdit() { $this->waitForElement('byCssSelector', 'a.inline_edit_sql')->click(); diff --git a/test/selenium/TableCreateTest.php b/test/selenium/TableCreateTest.php index becde358b8..33587bbed5 100644 --- a/test/selenium/TableCreateTest.php +++ b/test/selenium/TableCreateTest.php @@ -19,7 +19,9 @@ namespace PhpMyAdmin\Tests\Selenium; */ class TableCreateTest extends TestBase { - + /** + * @return void + */ public function setUpPage() { parent::setUpPage(); diff --git a/test/selenium/TestBase.php b/test/selenium/TestBase.php index 024e078742..9fc95db956 100644 --- a/test/selenium/TestBase.php +++ b/test/selenium/TestBase.php @@ -28,7 +28,7 @@ abstract class TestBase extends Selenium2TestCase * mysqli object * * @access private - * @var mysqli + * @var \mysqli */ protected $_mysqli; @@ -620,7 +620,8 @@ abstract class TestBase extends Selenium2TestCase /** * Navigates browser to a database page. * - * @param string $database Name of database + * @param string $database Name of database + * @param bool $gotoHomepageRequired Go to homepage required * * @return void */ @@ -721,7 +722,7 @@ abstract class TestBase extends Selenium2TestCase /** * Mark unsuccessful tests as 'Failures' on Browerstack * - * @param \Throwable $e + * @param \Throwable $e Throwable * * @return void */ diff --git a/test/selenium/XssTest.php b/test/selenium/XssTest.php index 016ba7ccb2..d2c6d726b6 100644 --- a/test/selenium/XssTest.php +++ b/test/selenium/XssTest.php @@ -19,6 +19,9 @@ namespace PhpMyAdmin\Tests\Selenium; */ class XSSTest extends TestBase { + /** + * @return void + */ public function setUpPage() { parent::setUpPage(); diff --git a/themes/metro/css/codemirror.css.php b/themes/metro/css/codemirror.css.php index 0d17c71b29..0cac0f0552 100644 --- a/themes/metro/css/codemirror.css.php +++ b/themes/metro/css/codemirror.css.php @@ -1,4 +1,10 @@