diff --git a/libraries/classes/Advisor.php b/libraries/classes/Advisor.php index 2ff81632d4..82e250e96e 100644 --- a/libraries/classes/Advisor.php +++ b/libraries/classes/Advisor.php @@ -263,8 +263,6 @@ class Advisor * * @param string $description description of an error. * @param Throwable $exception exception raised - * - * @return void */ public function storeError(string $description, Throwable $exception): void { @@ -278,8 +276,6 @@ class Advisor /** * Executes advisor rules - * - * @return bool */ public function runRules(): bool { @@ -354,8 +350,6 @@ class Advisor * Escapes percent string to be used in format string. * * @param string $str string to escape - * - * @return string */ public static function escapePercent(string $str): string { @@ -368,8 +362,6 @@ class Advisor * @param string $str the string * @param string $param the parameters * - * @return string - * * @throws Exception */ public function translate(string $str, ?string $param = null): string @@ -408,8 +400,6 @@ class Advisor * @param string $type type of rule * @param array $rule rule itself * - * @return void - * * @throws Exception */ public function addRule(string $type, array $rule): void diff --git a/libraries/classes/Bookmark.php b/libraries/classes/Bookmark.php index b8a292ff3b..c4580e4a24 100644 --- a/libraries/classes/Bookmark.php +++ b/libraries/classes/Bookmark.php @@ -71,8 +71,6 @@ class Bookmark /** * Returns the ID of the bookmark - * - * @return int */ public function getId(): int { @@ -81,8 +79,6 @@ class Bookmark /** * Returns the database of the bookmark - * - * @return string */ public function getDatabase(): string { @@ -91,8 +87,6 @@ class Bookmark /** * Returns the user whom the bookmark belongs to - * - * @return string */ public function getUser(): string { @@ -101,8 +95,6 @@ class Bookmark /** * Returns the label of the bookmark - * - * @return string */ public function getLabel(): string { @@ -111,8 +103,6 @@ class Bookmark /** * Returns the query - * - * @return string */ public function getQuery(): string { @@ -276,8 +266,6 @@ class Bookmark * @param DatabaseInterface $dbi DatabaseInterface object * @param string $user Current user * @param array $row Resource used to build the bookmark - * - * @return Bookmark */ protected static function createFromRow( DatabaseInterface $dbi, diff --git a/libraries/classes/BrowseForeigners.php b/libraries/classes/BrowseForeigners.php index 61bec323fa..bb5589f9d3 100644 --- a/libraries/classes/BrowseForeigners.php +++ b/libraries/classes/BrowseForeigners.php @@ -160,8 +160,6 @@ class BrowseForeigners * @param array $foreignData foreign column data * @param string|null $fieldkey field key * @param string $current_value current columns's value - * - * @return string */ public function getHtmlForRelationalFieldSelection( string $db, @@ -307,8 +305,6 @@ class BrowseForeigners * Function to get html for the goto page option * * @param array|null $foreignData foreign data - * - * @return string */ private function getHtmlForGotoPage(?array $foreignData): string { @@ -343,8 +339,6 @@ class BrowseForeigners * Function to get foreign limit * * @param string|null $foreignShowAll foreign navigation - * - * @return string */ public function getForeignLimit(?string $foreignShowAll): ?string { diff --git a/libraries/classes/CentralColumns.php b/libraries/classes/CentralColumns.php index 3ab21e8597..23118c5f13 100644 --- a/libraries/classes/CentralColumns.php +++ b/libraries/classes/CentralColumns.php @@ -234,8 +234,6 @@ class CentralColumns /** * return error message to be displayed if central columns * configuration storage is not completely configured - * - * @return Message */ private function configErrorMessage(): Message { @@ -927,8 +925,6 @@ class CentralColumns * * @param string $pmaThemeImage pma theme image url * @param string $text_dir url for text directory - * - * @return string */ public function getTableFooter(string $pmaThemeImage, string $text_dir): string { @@ -973,8 +969,6 @@ class CentralColumns * This method separates them. * * @param array $columns_list columns list - * - * @return void */ private function handleColumnExtra(array &$columns_list): void { diff --git a/libraries/classes/Charsets.php b/libraries/classes/Charsets.php index 68f1b41326..49769a749b 100644 --- a/libraries/classes/Charsets.php +++ b/libraries/classes/Charsets.php @@ -69,8 +69,6 @@ class Charsets * * @param DatabaseInterface $dbi DatabaseInterface instance * @param bool $disableIs Disable use of INFORMATION_SCHEMA - * - * @return void */ private static function loadCharsets(DatabaseInterface $dbi, bool $disableIs): void { @@ -104,8 +102,6 @@ class Charsets * * @param DatabaseInterface $dbi DatabaseInterface instance * @param bool $disableIs Disable use of INFORMATION_SCHEMA - * - * @return void */ private static function loadCollations(DatabaseInterface $dbi, bool $disableIs): void { @@ -143,8 +139,6 @@ class Charsets * * @param DatabaseInterface $dbi DatabaseInterface instance * @param bool $disableIs Disable use of INFORMATION_SCHEMA - * - * @return Charset */ public static function getServerCharset(DatabaseInterface $dbi, bool $disableIs): Charset { @@ -192,8 +186,6 @@ class Charsets * @param DatabaseInterface $dbi DatabaseInterface instance * @param bool $disableIs Disable use of INFORMATION_SCHEMA * @param string|null $name Collation name - * - * @return Collation|null */ public static function findCollationByName(DatabaseInterface $dbi, bool $disableIs, ?string $name): ?Collation { diff --git a/libraries/classes/Charsets/Collation.php b/libraries/classes/Charsets/Collation.php index b733ccfa19..aef3ea4d58 100644 --- a/libraries/classes/Charsets/Collation.php +++ b/libraries/classes/Charsets/Collation.php @@ -101,8 +101,6 @@ final class Collation /** * @param array $state State obtained from the database server - * - * @return self */ public static function fromServer(array $state): self { diff --git a/libraries/classes/CheckUserPrivileges.php b/libraries/classes/CheckUserPrivileges.php index c5f5c26913..8ae1813755 100644 --- a/libraries/classes/CheckUserPrivileges.php +++ b/libraries/classes/CheckUserPrivileges.php @@ -87,8 +87,6 @@ class CheckUserPrivileges * @param string $show_grants_str string containing grants for user * @param string $show_grants_dbname name of db extracted from grant string * @param string $show_grants_tblname name of table extracted from grant string - * - * @return void */ public function checkRequiredPrivilegesForAdjust( string $show_grants_str, @@ -157,8 +155,6 @@ class CheckUserPrivileges * (no control user needed) and we don't have to try any other method for * detection * - * @return void - * * @todo fix to get really all privileges, not only explicitly defined for this user * from MySQL manual: (https://dev.mysql.com/doc/refman/5.0/en/show-grants.html) * SHOW GRANTS displays only the privileges granted explicitly to the named @@ -336,8 +332,6 @@ class CheckUserPrivileges /** * Get user's global privileges and some db-specific privileges - * - * @return void */ public function getPrivileges(): void { diff --git a/libraries/classes/Command/AdvisoryRulesCommand.php b/libraries/classes/Command/AdvisoryRulesCommand.php index 3871012aa0..d62fc24b3a 100644 --- a/libraries/classes/Command/AdvisoryRulesCommand.php +++ b/libraries/classes/Command/AdvisoryRulesCommand.php @@ -41,8 +41,6 @@ class AdvisoryRulesCommand extends Command /** * @param InputInterface $input input * @param OutputInterface $output output - * - * @return int */ protected function execute(InputInterface $input, OutputInterface $output): int { @@ -86,8 +84,6 @@ class AdvisoryRulesCommand extends Command * @param array $rules rules array * @param int $index rule index * @param string $type rule type - * - * @return void */ private function addMessage(string $file, array $rules, int $index, string $type): void { diff --git a/libraries/classes/Config.php b/libraries/classes/Config.php index 25e88933c4..0ee1c8141a 100644 --- a/libraries/classes/Config.php +++ b/libraries/classes/Config.php @@ -143,8 +143,6 @@ class Config /** * sets system and application settings - * - * @return void */ public function checkSystem(): void { @@ -166,8 +164,6 @@ class Config /** * whether to use gzip output compression or not - * - * @return void */ public function checkOutputCompression(): void { @@ -187,8 +183,6 @@ class Config * Sets the client platform based on user agent * * @param string $user_agent the user agent - * - * @return void */ private function _setClientPlatform(string $user_agent): void { @@ -212,8 +206,6 @@ class Config * Based on a phpBuilder article: * * @see http://www.phpbuilder.net/columns/tim20000821.php - * - * @return void */ public function checkClient(): void { @@ -319,8 +311,6 @@ class Config /** * Whether GD2 is present - * - * @return void */ public function checkGd2(): void { @@ -353,8 +343,6 @@ class Config /** * Whether the Web server php is running on is IIS - * - * @return void */ public function checkWebServer(): void { @@ -372,8 +360,6 @@ class Config /** * Whether the os php is running on is windows or not - * - * @return void */ public function checkWebServerOs(): void { @@ -395,8 +381,6 @@ class Config * detects if Git revision * * @param string $git_location (optional) verified git directory - * - * @return bool */ public function isGitRevision(&$git_location = null): bool { @@ -458,8 +442,6 @@ class Config /** * detects Git revision, if running inside repo - * - * @return void */ public function checkGitRevision(): void { @@ -858,8 +840,6 @@ class Config * should be called on object creation * * @param string $source config file - * - * @return bool */ public function load(?string $source = null): bool { @@ -934,8 +914,6 @@ class Config /** * Sets the connection collation - * - * @return void */ private function _setConnectionCollation(): void { @@ -950,8 +928,6 @@ class Config /** * Loads user preferences and merges them with current config * must be called after control connection has been established - * - * @return void */ public function loadUserPreferences(): void { @@ -1127,8 +1103,6 @@ class Config * set source * * @param string $source source - * - * @return void */ public function setSource(string $source): void { @@ -1182,8 +1156,6 @@ class Config /** * verifies the permissions on config file (if asked by configuration) * (must be called after config.inc.php has been merged) - * - * @return void */ public function checkPermissions(): void { @@ -1209,8 +1181,6 @@ class Config /** * Checks for errors * (must be called after config.inc.php has been merged) - * - * @return void */ public function checkErrors(): void { @@ -1256,8 +1226,6 @@ class Config * * @param string $setting configuration option * @param mixed $value new value for configuration option - * - * @return void */ public function set(string $setting, $value): void { @@ -1299,8 +1267,6 @@ class Config /** * checks if upload is enabled - * - * @return void */ public function checkUpload(): void { @@ -1322,8 +1288,6 @@ class Config * Used with permission from Moodle (https://moodle.org/) by Martin Dougiamas * * this section generates $max_upload_size in bytes - * - * @return void */ public function checkUploadSize(): void { @@ -1345,8 +1309,6 @@ class Config * Checks if protocol is https * * This function checks if the https protocol on the active connection. - * - * @return bool */ public function isHttps(): bool { @@ -1386,8 +1348,6 @@ class Config /** * Get phpMyAdmin root path - * - * @return string */ public function getRootPath(): string { @@ -1433,8 +1393,6 @@ class Config /** * enables backward compatibility - * - * @return void */ public function enableBc(): void { @@ -1578,8 +1536,6 @@ class Config * Get the real cookie name * * @param string $cookieName The name of the cookie - * - * @return string */ public function getCookieName(string $cookieName): string { @@ -1601,8 +1557,6 @@ class Config /** * Error handler to catch fatal errors when loading configuration * file - * - * @return void */ public static function fatalErrorHandler(): void { @@ -1632,8 +1586,6 @@ class Config * * @param string $filename File to check and render * @param string $id Div ID - * - * @return string */ private static function _renderCustom(string $filename, string $id): string { @@ -1650,8 +1602,6 @@ class Config /** * Renders user configured footer - * - * @return string */ public static function renderFooter(): string { @@ -1660,8 +1610,6 @@ class Config /** * Renders user configured footer - * - * @return string */ public static function renderHeader(): string { @@ -1672,8 +1620,6 @@ class Config * Returns temporary dir path * * @param string $name Directory name - * - * @return string|null */ public function getTempDir(string $name): ?string { @@ -1702,8 +1648,6 @@ class Config /** * Returns temporary directory - * - * @return string|null */ public function getUploadTempDir(): ?string { @@ -1726,8 +1670,6 @@ class Config /** * Selects server based on request parameters. - * - * @return int */ public function selectServer(): int { @@ -1782,8 +1724,6 @@ class Config /** * Checks whether Servers configuration is valid and possibly apply fixups. - * - * @return void */ public function checkServers(): void { diff --git a/libraries/classes/Config/FormDisplayTemplate.php b/libraries/classes/Config/FormDisplayTemplate.php index 8a37e322f6..502b9a1097 100644 --- a/libraries/classes/Config/FormDisplayTemplate.php +++ b/libraries/classes/Config/FormDisplayTemplate.php @@ -51,8 +51,6 @@ class FormDisplayTemplate * @param string $action default: $_SERVER['REQUEST_URI'] * @param string $method 'post' or 'get' * @param array|null $hiddenFields array of form hidden fields (key: field name) - * - * @return string */ public function displayFormTop( $action = null, @@ -89,8 +87,6 @@ class FormDisplayTemplate * ({@link self::displayFieldsetTop}), with values being tab titles. * * @param array $tabs tab names - * - * @return string */ public function displayTabsTop(array $tabs): string { @@ -119,8 +115,6 @@ class FormDisplayTemplate * @param string $description description shown on top of fieldset * @param array|null $errors error messages to display * @param array $attributes optional extra attributes of fieldset - * - * @return string */ public function displayFieldsetTop( $title = '', @@ -165,8 +159,6 @@ class FormDisplayTemplate * @param string $description verbose description * @param bool $valueIsDefault whether value is default * @param array|null $opts see above description - * - * @return string */ public function displayInput( $path, @@ -406,8 +398,6 @@ class FormDisplayTemplate * Display group header * * @param string $headerText Text of header - * - * @return string */ public function displayGroupHeader(string $headerText): string { @@ -426,8 +416,6 @@ class FormDisplayTemplate /** * Display group footer - * - * @return void */ public function displayGroupFooter(): void { @@ -438,8 +426,6 @@ class FormDisplayTemplate * Displays bottom part of a fieldset * * @param bool $showButtons Whether show submit and reset button - * - * @return string */ public function displayFieldsetBottom(bool $showButtons = true): string { @@ -451,8 +437,6 @@ class FormDisplayTemplate /** * Closes form tabs - * - * @return string */ public function displayTabsBottom(): string { @@ -461,8 +445,6 @@ class FormDisplayTemplate /** * Displays bottom part of the form - * - * @return string */ public function displayFormBottom(): string { @@ -475,8 +457,6 @@ class FormDisplayTemplate * @param string $fieldId ID of field to validate * @param string|array $validators validators callback * @param array $jsArray will be updated with javascript code - * - * @return void */ public function addJsValidate($fieldId, $validators, array &$jsArray): void { @@ -496,8 +476,6 @@ class FormDisplayTemplate * Displays JavaScript code * * @param array $jsArray lines of javascript code - * - * @return string */ public function displayJavascript(array $jsArray): string { diff --git a/libraries/classes/Console.php b/libraries/classes/Console.php index b8f1a34b3b..c903c38daf 100644 --- a/libraries/classes/Console.php +++ b/libraries/classes/Console.php @@ -51,8 +51,6 @@ class Console * we are servicing an ajax request * * @param bool $isAjax Whether we are servicing an ajax request - * - * @return void */ public function setAjax(bool $isAjax): void { @@ -61,8 +59,6 @@ class Console /** * Disables the rendering of the footer - * - * @return void */ public function disable(): void { @@ -72,8 +68,6 @@ class Console /** * Renders the bookmark content * - * @return string - * * @access public */ public static function getBookmarkContent(): string @@ -119,8 +113,6 @@ class Console /** * Renders the console * - * @return string - * * @access public */ public function getDisplay(): string diff --git a/libraries/classes/Controllers/CheckRelationsController.php b/libraries/classes/Controllers/CheckRelationsController.php index 56a3b0e8cb..85d1b2ed4e 100644 --- a/libraries/classes/Controllers/CheckRelationsController.php +++ b/libraries/classes/Controllers/CheckRelationsController.php @@ -30,8 +30,6 @@ class CheckRelationsController extends AbstractController /** * @param array $params Request parameters - * - * @return string */ public function index(array $params): string { diff --git a/libraries/classes/Controllers/Database/DataDictionaryController.php b/libraries/classes/Controllers/Database/DataDictionaryController.php index 0897ecd4c7..da9dbea9aa 100644 --- a/libraries/classes/Controllers/Database/DataDictionaryController.php +++ b/libraries/classes/Controllers/Database/DataDictionaryController.php @@ -41,8 +41,6 @@ class DataDictionaryController extends AbstractController /** * @param array $params Request parameters - * - * @return string */ public function index(array $params): string { diff --git a/libraries/classes/Controllers/Database/MultiTableQueryController.php b/libraries/classes/Controllers/Database/MultiTableQueryController.php index 2e90826dc9..c3062b73b7 100644 --- a/libraries/classes/Controllers/Database/MultiTableQueryController.php +++ b/libraries/classes/Controllers/Database/MultiTableQueryController.php @@ -28,8 +28,6 @@ class MultiTableQueryController extends AbstractController /** * @param array $params Request parameters - * - * @return void */ public function displayResults(array $params): void { diff --git a/libraries/classes/Controllers/Database/PrivilegesController.php b/libraries/classes/Controllers/Database/PrivilegesController.php index f859c3b9a7..a820f3ee7a 100644 --- a/libraries/classes/Controllers/Database/PrivilegesController.php +++ b/libraries/classes/Controllers/Database/PrivilegesController.php @@ -35,8 +35,6 @@ class PrivilegesController extends AbstractController /** * @param array $params Request parameters - * - * @return string */ public function index(array $params): string { diff --git a/libraries/classes/Controllers/Database/RoutinesController.php b/libraries/classes/Controllers/Database/RoutinesController.php index 99ea2cc853..73bace551a 100644 --- a/libraries/classes/Controllers/Database/RoutinesController.php +++ b/libraries/classes/Controllers/Database/RoutinesController.php @@ -40,8 +40,6 @@ class RoutinesController extends AbstractController /** * @param array $params Request parameters - * - * @return void */ public function index(array $params): void { diff --git a/libraries/classes/Controllers/Database/StructureController.php b/libraries/classes/Controllers/Database/StructureController.php index 5248e050a0..0aa6b3361d 100644 --- a/libraries/classes/Controllers/Database/StructureController.php +++ b/libraries/classes/Controllers/Database/StructureController.php @@ -93,8 +93,6 @@ class StructureController extends AbstractController * Retrieves database information for further use * * @param string $subPart Page part name - * - * @return void */ private function getDatabaseInfo(string $subPart): void { @@ -326,8 +324,6 @@ class StructureController extends AbstractController /** * Handles actions related to multiple tables - * - * @return void */ public function multiSubmitAction(): void { @@ -854,8 +850,6 @@ class StructureController extends AbstractController * Function to check if a table is already in favorite list. * * @param string $currentTable current table - * - * @return bool */ protected function checkFavoriteTable(string $currentTable): bool { diff --git a/libraries/classes/Controllers/HomeController.php b/libraries/classes/Controllers/HomeController.php index 0b3f0e8d7c..6161153ffe 100644 --- a/libraries/classes/Controllers/HomeController.php +++ b/libraries/classes/Controllers/HomeController.php @@ -292,8 +292,6 @@ class HomeController extends AbstractController /** * @param array $params Request parameters - * - * @return void */ public function setTheme(array $params): void { @@ -310,8 +308,6 @@ class HomeController extends AbstractController /** * @param array $params Request parameters - * - * @return void */ public function setCollationConnection(array $params): void { diff --git a/libraries/classes/Controllers/LintController.php b/libraries/classes/Controllers/LintController.php index 160737a192..f50de951d3 100644 --- a/libraries/classes/Controllers/LintController.php +++ b/libraries/classes/Controllers/LintController.php @@ -17,8 +17,6 @@ class LintController extends AbstractController { /** * @param array $params Request parameters - * - * @return void */ public function index(array $params): void { diff --git a/libraries/classes/Controllers/Server/BinlogController.php b/libraries/classes/Controllers/Server/BinlogController.php index d859b4413f..a6fd99d186 100644 --- a/libraries/classes/Controllers/Server/BinlogController.php +++ b/libraries/classes/Controllers/Server/BinlogController.php @@ -49,8 +49,6 @@ class BinlogController extends AbstractController * Index action * * @param array $params Request params - * - * @return string */ public function index(array $params): string { @@ -128,8 +126,6 @@ class BinlogController extends AbstractController * @param string $log Binary log file name * @param int $position Position to display * @param int $maxRows Maximum number of rows - * - * @return string */ private function getSqlQuery( string $log, diff --git a/libraries/classes/Controllers/Server/DatabasesController.php b/libraries/classes/Controllers/Server/DatabasesController.php index 352f9badf0..dc63d9fc04 100644 --- a/libraries/classes/Controllers/Server/DatabasesController.php +++ b/libraries/classes/Controllers/Server/DatabasesController.php @@ -296,8 +296,6 @@ class DatabasesController extends AbstractController * * @param string|null $sortBy sort by * @param string|null $sortOrder sort order - * - * @return void */ private function setSortDetails(?string $sortBy, ?string $sortOrder): void { diff --git a/libraries/classes/Controllers/Server/EnginesController.php b/libraries/classes/Controllers/Server/EnginesController.php index 32bd3f8cc9..6569a31baa 100644 --- a/libraries/classes/Controllers/Server/EnginesController.php +++ b/libraries/classes/Controllers/Server/EnginesController.php @@ -17,8 +17,6 @@ class EnginesController extends AbstractController { /** * Index action - * - * @return string */ public function index(): string { @@ -33,8 +31,6 @@ class EnginesController extends AbstractController * Displays details about a given Storage Engine * * @param array $params Request params - * - * @return string */ public function show(array $params): string { diff --git a/libraries/classes/Controllers/Server/PluginsController.php b/libraries/classes/Controllers/Server/PluginsController.php index f750a3f98d..e4fe407345 100644 --- a/libraries/classes/Controllers/Server/PluginsController.php +++ b/libraries/classes/Controllers/Server/PluginsController.php @@ -40,8 +40,6 @@ class PluginsController extends AbstractController /** * Index action - * - * @return string */ public function index(): string { diff --git a/libraries/classes/Controllers/Server/ReplicationController.php b/libraries/classes/Controllers/Server/ReplicationController.php index 4f0b89b506..a876ea976e 100644 --- a/libraries/classes/Controllers/Server/ReplicationController.php +++ b/libraries/classes/Controllers/Server/ReplicationController.php @@ -37,8 +37,6 @@ class ReplicationController extends AbstractController /** * @param array $params Request parameters - * - * @return string */ public function index(array $params): string { diff --git a/libraries/classes/Controllers/Server/Status/ProcessesController.php b/libraries/classes/Controllers/Server/Status/ProcessesController.php index 5053727653..0d25df01a4 100644 --- a/libraries/classes/Controllers/Server/Status/ProcessesController.php +++ b/libraries/classes/Controllers/Server/Status/ProcessesController.php @@ -20,8 +20,6 @@ class ProcessesController extends AbstractController { /** * @param array $params Request parameters - * - * @return string */ public function index(array $params): string { @@ -57,8 +55,6 @@ class ProcessesController extends AbstractController * Only sends the process list table * * @param array $params Request parameters - * - * @return string */ public function refresh(array $params): string { @@ -107,8 +103,6 @@ class ProcessesController extends AbstractController /** * @param array $params Request parameters - * - * @return string */ private function getList(array $params): string { diff --git a/libraries/classes/Controllers/Server/Status/VariablesController.php b/libraries/classes/Controllers/Server/Status/VariablesController.php index eb38a06092..1d19eba9de 100644 --- a/libraries/classes/Controllers/Server/Status/VariablesController.php +++ b/libraries/classes/Controllers/Server/Status/VariablesController.php @@ -117,8 +117,6 @@ class VariablesController extends AbstractController * Flush status variables if requested * * @param string $flush Variable name - * - * @return void */ private function flush(string $flush): void { diff --git a/libraries/classes/Controllers/Server/VariablesController.php b/libraries/classes/Controllers/Server/VariablesController.php index 9ff3a789c7..c987e03530 100644 --- a/libraries/classes/Controllers/Server/VariablesController.php +++ b/libraries/classes/Controllers/Server/VariablesController.php @@ -33,8 +33,6 @@ class VariablesController extends AbstractController * Index action * * @param array $params Request parameters - * - * @return string */ public function index(array $params): string { diff --git a/libraries/classes/Controllers/Setup/ServersController.php b/libraries/classes/Controllers/Setup/ServersController.php index d981f10663..1851dc7f18 100644 --- a/libraries/classes/Controllers/Setup/ServersController.php +++ b/libraries/classes/Controllers/Setup/ServersController.php @@ -47,8 +47,6 @@ class ServersController extends AbstractController /** * @param array $params Request parameters - * - * @return void */ public function destroy(array $params): void { diff --git a/libraries/classes/Controllers/SqlController.php b/libraries/classes/Controllers/SqlController.php index 08d4f35ff8..70c07b6aa8 100644 --- a/libraries/classes/Controllers/SqlController.php +++ b/libraries/classes/Controllers/SqlController.php @@ -218,8 +218,6 @@ class SqlController extends AbstractController * Get values for the relational columns * * During grid edit, if we have a relational field, show the dropdown for it. - * - * @return void */ public function getRelationalValues(): void { @@ -247,8 +245,6 @@ class SqlController extends AbstractController /** * Get possible values for enum fields during grid edit. - * - * @return void */ public function getEnumValues(): void { @@ -269,8 +265,6 @@ class SqlController extends AbstractController /** * Get possible values for SET fields during grid edit. - * - * @return void */ public function getSetValues(): void { diff --git a/libraries/classes/Controllers/Table/ChartController.php b/libraries/classes/Controllers/Table/ChartController.php index 85e94eba3d..3a77fa1e64 100644 --- a/libraries/classes/Controllers/Table/ChartController.php +++ b/libraries/classes/Controllers/Table/ChartController.php @@ -24,8 +24,6 @@ class ChartController extends AbstractController { /** * Execute the query and return the result - * - * @return void */ public function index(): void { @@ -143,8 +141,6 @@ class ChartController extends AbstractController /** * Handle ajax request - * - * @return void */ public function ajax(): void { diff --git a/libraries/classes/Controllers/Table/FindReplaceController.php b/libraries/classes/Controllers/Table/FindReplaceController.php index 83ac81f39f..c9bcb3647b 100644 --- a/libraries/classes/Controllers/Table/FindReplaceController.php +++ b/libraries/classes/Controllers/Table/FindReplaceController.php @@ -77,8 +77,6 @@ class FindReplaceController extends AbstractController /** * Gets all the columns of a table along with their types. - * - * @return void */ private function _loadTableInfo(): void { @@ -119,8 +117,6 @@ class FindReplaceController extends AbstractController /** * Display selection form action - * - * @return void */ public function displaySelectionFormAction(): void { diff --git a/libraries/classes/Controllers/Table/GisVisualizationController.php b/libraries/classes/Controllers/Table/GisVisualizationController.php index c1767fc9d6..623142a54a 100644 --- a/libraries/classes/Controllers/Table/GisVisualizationController.php +++ b/libraries/classes/Controllers/Table/GisVisualizationController.php @@ -164,8 +164,6 @@ final class GisVisualizationController extends AbstractController /** * @param string $filename File name * @param string $format Save format - * - * @return void */ private function saveToFile(string $filename, string $format): void { diff --git a/libraries/classes/Controllers/Table/IndexesController.php b/libraries/classes/Controllers/Table/IndexesController.php index 4619a9f2b1..a6a641936c 100644 --- a/libraries/classes/Controllers/Table/IndexesController.php +++ b/libraries/classes/Controllers/Table/IndexesController.php @@ -45,8 +45,6 @@ class IndexesController extends AbstractController * Display the form to edit/create an index * * @param Index $index An Index instance. - * - * @return void */ public function displayForm(Index $index): void { @@ -112,8 +110,6 @@ class IndexesController extends AbstractController * and moves back to /table/sql * * @param Index $index An Index instance. - * - * @return void */ public function doSaveData(Index $index): void { diff --git a/libraries/classes/Controllers/Table/PrivilegesController.php b/libraries/classes/Controllers/Table/PrivilegesController.php index 928610c423..17252a7a78 100644 --- a/libraries/classes/Controllers/Table/PrivilegesController.php +++ b/libraries/classes/Controllers/Table/PrivilegesController.php @@ -36,8 +36,6 @@ class PrivilegesController extends AbstractController /** * @param array $params Request parameters - * - * @return string */ public function index(array $params): string { diff --git a/libraries/classes/Controllers/Table/RelationController.php b/libraries/classes/Controllers/Table/RelationController.php index 6b3a7412c1..491fa1a486 100644 --- a/libraries/classes/Controllers/Table/RelationController.php +++ b/libraries/classes/Controllers/Table/RelationController.php @@ -54,8 +54,6 @@ final class RelationController extends AbstractController /** * Index - * - * @return void */ public function index(): void { @@ -207,8 +205,6 @@ final class RelationController extends AbstractController * * @param Table $table table * @param array $cfgRelation relation parameters - * - * @return void */ private function updateForDisplayField(Table $table, array $cfgRelation): void { @@ -232,8 +228,6 @@ final class RelationController extends AbstractController * @param Table $table Table * @param array $options Options * @param array $relationsForeign External relations - * - * @return void */ private function updateForForeignKeys(Table $table, array $options, array $relationsForeign): void { @@ -287,8 +281,6 @@ final class RelationController extends AbstractController * @param Table $table Table * @param array $cfgRelation Relation parameters * @param array $relations Relations - * - * @return void */ private function updateForInternalRelation(Table $table, array $cfgRelation, array $relations): void { @@ -314,8 +306,6 @@ final class RelationController extends AbstractController /** * Send table columns for foreign table dropdown - * - * @return void */ public function getDropdownValueForTable(): void { @@ -350,8 +340,6 @@ final class RelationController extends AbstractController * Send database selection values for dropdown * * @param string $storageEngine Storage engine. - * - * @return void */ public function getDropdownValueForDatabase(string $storageEngine): void { diff --git a/libraries/classes/Controllers/Table/SearchController.php b/libraries/classes/Controllers/Table/SearchController.php index e24a11ba3c..1b7b071180 100644 --- a/libraries/classes/Controllers/Table/SearchController.php +++ b/libraries/classes/Controllers/Table/SearchController.php @@ -168,8 +168,6 @@ class SearchController extends AbstractController /** * Index action - * - * @return void */ public function index(): void { @@ -276,8 +274,6 @@ class SearchController extends AbstractController /** * Display selection form action - * - * @return void */ public function displaySelectionFormAction(): void { diff --git a/libraries/classes/Controllers/Table/ZoomSearchController.php b/libraries/classes/Controllers/Table/ZoomSearchController.php index 2bbc3ca8c5..d0d6d46789 100644 --- a/libraries/classes/Controllers/Table/ZoomSearchController.php +++ b/libraries/classes/Controllers/Table/ZoomSearchController.php @@ -154,8 +154,6 @@ class ZoomSearchController extends AbstractController /** * Gets all the columns of a table along with their types, collations * and whether null or not. - * - * @return void */ private function _loadTableInfo(): void { diff --git a/libraries/classes/Core.php b/libraries/classes/Core.php index 83d1c0c846..3cea2dde9c 100644 --- a/libraries/classes/Core.php +++ b/libraries/classes/Core.php @@ -254,8 +254,6 @@ class Core * * @param string $error_message the error message or named error message * @param string|array $message_args arguments applied to $error_message - * - * @return void */ public static function fatalError( string $error_message, @@ -341,8 +339,6 @@ class Core * @param string $extension Extension name * @param bool $fatal Whether the error is fatal. * @param string $extra Extra string to append to message. - * - * @return void */ public static function warnMissingExtension( string $extension, @@ -411,8 +407,6 @@ class Core * in Moodle) * * @param string|int $size size (Default = 0) - * - * @return int */ public static function getRealSize($size = 0): int { @@ -521,8 +515,6 @@ class Core * * @param string $uri the header to send * @param bool $use_refresh whether to use Refresh: header when running on IIS - * - * @return void */ public static function sendHeaderLocation(string $uri, bool $use_refresh = false): void { @@ -564,8 +556,6 @@ class Core /** * Outputs application/json headers. This includes no caching. - * - * @return void */ public static function headerJSON(): void { @@ -584,8 +574,6 @@ class Core /** * Outputs headers to prevent caching in browser (and on the way). - * - * @return void */ public static function noCacheHeader(): void { @@ -615,8 +603,6 @@ class Core * @param string $mimetype MIME type to include in headers. * @param int $length Length of content (optional) * @param bool $no_cache Whether to include no-caching headers. - * - * @return void */ public static function downloadHeader( string $filename, @@ -677,8 +663,6 @@ class Core * @param string $path path in the array * @param array $array the array * @param mixed $value value to store - * - * @return void */ public static function arrayWrite(string $path, array &$array, $value): void { @@ -699,8 +683,6 @@ class Core * * @param string $path path in the array * @param array $array the array - * - * @return void */ public static function arrayRemove(string $path, array &$array): void { @@ -843,8 +825,6 @@ class Core * Displays SQL query before executing. * * @param array|string $query_data Array containing queries or query itself - * - * @return void */ public static function previewSQL($query_data): void { @@ -891,8 +871,6 @@ class Core * Creates some globals from $_POST variables matching a pattern * * @param array $post_patterns The patterns to search for - * - * @return void */ public static function setPostAsGlobal(array $post_patterns): void { @@ -909,8 +887,6 @@ class Core * Creates some globals from $_REQUEST * * @param string $param db|table - * - * @return void */ public static function setGlobalDbOrTable(string $param): void { @@ -925,8 +901,6 @@ class Core /** * PATH_INFO could be compromised if set, so remove it from PHP_SELF * and provide a clean PHP_SELF here - * - * @return void */ public static function cleanupPathInfo(): void { @@ -974,8 +948,6 @@ class Core /** * Checks that required PHP extensions are there. - * - * @return void */ public static function checkExtensions(): void { @@ -1064,8 +1036,6 @@ class Core * * strips p: prefix(es) * * @param string $name User given hostname - * - * @return string */ public static function sanitizeMySQLHost(string $name): string { @@ -1082,8 +1052,6 @@ class Core * * strips part behind null byte * * @param string $name User given username - * - * @return string */ public static function sanitizeMySQLUser(string $name): string { @@ -1183,8 +1151,6 @@ class Core /** * Applies changes to PHP configuration. - * - * @return void */ public static function configure(): void { @@ -1211,8 +1177,6 @@ class Core /** * Check whether PHP configuration matches our needs. - * - * @return void */ public static function checkConfiguration(): void { @@ -1249,8 +1213,6 @@ class Core /** * Checks request and fails with fatal error if something problematic is found - * - * @return void */ public static function checkRequest(): void { diff --git a/libraries/classes/CreateAddField.php b/libraries/classes/CreateAddField.php index 2caf31e40d..40071a74d1 100644 --- a/libraries/classes/CreateAddField.php +++ b/libraries/classes/CreateAddField.php @@ -442,8 +442,6 @@ class CreateAddField * * @param string $db database name * @param string $table table name - * - * @return string */ public function getTableCreationQuery(string $db, string $table): string { @@ -482,8 +480,6 @@ class CreateAddField /** * Function to get the number of fields for the table creation form - * - * @return int */ public function getNumberOfFieldsFromRequest(): int { diff --git a/libraries/classes/Database/DatabaseList.php b/libraries/classes/Database/DatabaseList.php index eb3055253f..ab19ef8449 100644 --- a/libraries/classes/Database/DatabaseList.php +++ b/libraries/classes/Database/DatabaseList.php @@ -41,8 +41,6 @@ class DatabaseList /** * Accessor to PMA::$databases - * - * @return ListDatabase */ public function getDatabaseList(): ListDatabase { diff --git a/libraries/classes/Database/Designer/DesignerTable.php b/libraries/classes/Database/Designer/DesignerTable.php index 32f4f9789f..278674b0cc 100644 --- a/libraries/classes/Database/Designer/DesignerTable.php +++ b/libraries/classes/Database/Designer/DesignerTable.php @@ -39,8 +39,6 @@ class DesignerTable /** * The table engine supports or not foreign keys - * - * @return bool */ public function supportsForeignkeys(): bool { @@ -49,8 +47,6 @@ class DesignerTable /** * Get the database name - * - * @return string */ public function getDatabaseName(): string { @@ -59,8 +55,6 @@ class DesignerTable /** * Get the table name - * - * @return string */ public function getTableName(): string { @@ -69,8 +63,6 @@ class DesignerTable /** * Get the table engine - * - * @return string */ public function getTableEngine(): string { @@ -89,8 +81,6 @@ class DesignerTable /** * Get the db and table separated with a dot - * - * @return string */ public function getDbTableString(): string { diff --git a/libraries/classes/DatabaseInterface.php b/libraries/classes/DatabaseInterface.php index 6aad3b2f80..82a477d5fa 100644 --- a/libraries/classes/DatabaseInterface.php +++ b/libraries/classes/DatabaseInterface.php @@ -156,8 +156,6 @@ class DatabaseInterface implements DbalInterface * Checks whether database extension is loaded * * @param string $extension mysql extension to check - * - * @return bool */ public static function checkDbExtension(string $extension = 'mysqli'): bool { @@ -204,8 +202,6 @@ class DatabaseInterface implements DbalInterface * * @param array|null $contentPath Array with the target path * @param mixed $value Target value - * - * @return void */ public function cacheTableContent(?array $contentPath, $value): void { @@ -234,8 +230,6 @@ class DatabaseInterface implements DbalInterface /** * Clear the table cache. - * - * @return void */ public function clearTableCache(): void { @@ -248,8 +242,6 @@ class DatabaseInterface implements DbalInterface * * @param array $tables information for tables of some databases * @param string|bool $table table name - * - * @return void */ private function _cacheTableData(array $tables, $table): void { @@ -284,8 +276,6 @@ class DatabaseInterface implements DbalInterface * @param mixed $link link type * @param object|bool $result Query result * @param int|float $time Time to execute query - * - * @return void */ private function _dbgQuery(string $query, $link, $result, $time): void { @@ -1311,8 +1301,6 @@ class DatabaseInterface implements DbalInterface * @param string $table name of table to retrieve columns from * @param string $column name of column, null to show all columns * @param bool $full whether to return full info or only column names - * - * @return string */ public function getColumnsSql( string $database, @@ -1511,8 +1499,6 @@ class DatabaseInterface implements DbalInterface * Convert version string to integer. * * @param string $version MySQL server version - * - * @return int */ public static function versionToInt(string $version): int { @@ -1524,8 +1510,6 @@ class DatabaseInterface implements DbalInterface * Function called just after a connection to the MySQL database server has * been established. It sets the connection collation, and determines the * version of MySQL which is running. - * - * @return void */ public function postConnect(): void { @@ -1612,8 +1596,6 @@ class DatabaseInterface implements DbalInterface * Sets collation connection for user link * * @param string $collation collation to set - * - * @return void */ public function setCollation(string $collation): void { @@ -1665,8 +1647,6 @@ class DatabaseInterface implements DbalInterface * Function called just after a connection to the MySQL database server has * been established. It sets the connection collation, and determines the * version of MySQL which is running. - * - * @return void */ public function postConnectControl(): void { @@ -2495,8 +2475,6 @@ class DatabaseInterface implements DbalInterface * @param string $schema_name Name of schema (database) to test * @param bool $testForMysqlSchema Whether 'mysql' schema should * be treated the same as IS and DD - * - * @return bool */ public function isSystemSchema( string $schema_name, @@ -2679,8 +2657,6 @@ class DatabaseInterface implements DbalInterface * * @param string $dbname database name to select * @param int $link link type - * - * @return bool */ public function selectDb(string $dbname, $link = self::CONNECT_USER): bool { @@ -2743,8 +2719,6 @@ class DatabaseInterface implements DbalInterface * Frees memory associated with the result * * @param object $result database result - * - * @return void */ public function freeResult($result): void { @@ -3012,8 +2986,6 @@ class DatabaseInterface implements DbalInterface /** * Checks if this database server is running on Amazon RDS. - * - * @return bool */ public function isAmazonRds(): bool { @@ -3032,8 +3004,6 @@ class DatabaseInterface implements DbalInterface * Gets SQL for killing a process. * * @param int $process Process ID - * - * @return string */ public function getKillQuery(int $process): string { @@ -3046,8 +3016,6 @@ class DatabaseInterface implements DbalInterface /** * Get the phpmyadmin database manager - * - * @return SystemDatabase */ public function getSystemDatabase(): SystemDatabase { @@ -3059,8 +3027,6 @@ class DatabaseInterface implements DbalInterface * * @param string $db_name DB name * @param string $table_name Table name - * - * @return Table */ public function getTable(string $db_name, string $table_name): Table { @@ -3100,8 +3066,6 @@ class DatabaseInterface implements DbalInterface /** * returns default server collation from show variables - * - * @return string */ public function getServerCollation(): string { @@ -3110,8 +3074,6 @@ class DatabaseInterface implements DbalInterface /** * Server version as number - * - * @return int */ public function getVersion(): int { @@ -3120,8 +3082,6 @@ class DatabaseInterface implements DbalInterface /** * Server version - * - * @return string */ public function getVersionString(): string { @@ -3130,8 +3090,6 @@ class DatabaseInterface implements DbalInterface /** * Server version comment - * - * @return string */ public function getVersionComment(): string { @@ -3140,8 +3098,6 @@ class DatabaseInterface implements DbalInterface /** * Whether connection is MariaDB - * - * @return bool */ public function isMariaDB(): bool { @@ -3150,8 +3106,6 @@ class DatabaseInterface implements DbalInterface /** * Whether connection is Percona - * - * @return bool */ public function isPercona(): bool { @@ -3162,8 +3116,6 @@ class DatabaseInterface implements DbalInterface * Load correct database driver * * @param DbiExtension|null $extension Force the use of an alternative extension - * - * @return self */ public static function load(?DbiExtension $extension = null): self { diff --git a/libraries/classes/Dbal/DbalInterface.php b/libraries/classes/Dbal/DbalInterface.php index 164b556b33..3f5f57fe06 100644 --- a/libraries/classes/Dbal/DbalInterface.php +++ b/libraries/classes/Dbal/DbalInterface.php @@ -45,15 +45,11 @@ interface DbalInterface * * @param array|null $contentPath Array with the target path * @param mixed $value Target value - * - * @return void */ public function cacheTableContent(?array $contentPath, $value): void; /** * Clear the table cache. - * - * @return void */ public function clearTableCache(): void; @@ -225,8 +221,6 @@ interface DbalInterface * @param string $table name of table to retrieve columns from * @param string $column name of column, null to show all columns * @param bool $full whether to return full info or only column names - * - * @return string */ public function getColumnsSql( string $database, @@ -327,8 +321,6 @@ interface DbalInterface * Function called just after a connection to the MySQL database server has * been established. It sets the connection collation, and determines the * version of MySQL which is running. - * - * @return void */ public function postConnect(): void; @@ -336,8 +328,6 @@ interface DbalInterface * Sets collation connection for user link * * @param string $collation collation to set - * - * @return void */ public function setCollation(string $collation): void; @@ -345,8 +335,6 @@ interface DbalInterface * Function called just after a connection to the MySQL database server has * been established. It sets the connection collation, and determines the * version of MySQL which is running. - * - * @return void */ public function postConnectControl(): void; @@ -603,8 +591,6 @@ interface DbalInterface * @param bool $testForMysqlSchema Whether 'mysql' schema should * be treated the same as IS and * DD - * - * @return bool */ public function isSystemSchema(string $schema_name, bool $testForMysqlSchema = false): bool; @@ -636,8 +622,6 @@ interface DbalInterface * * @param string $dbname database name to select * @param int $link link type - * - * @return bool */ public function selectDb(string $dbname, $link = DatabaseInterface::CONNECT_USER): bool; @@ -682,8 +666,6 @@ interface DbalInterface * Frees memory associated with the result * * @param object $result database result - * - * @return void */ public function freeResult($result): void; @@ -839,8 +821,6 @@ interface DbalInterface /** * Checks if this database server is running on Amazon RDS. - * - * @return bool */ public function isAmazonRds(): bool; @@ -848,15 +828,11 @@ interface DbalInterface * Gets SQL for killing a process. * * @param int $process Process ID - * - * @return string */ public function getKillQuery(int $process): string; /** * Get the phpmyadmin database manager - * - * @return SystemDatabase */ public function getSystemDatabase(): SystemDatabase; @@ -865,8 +841,6 @@ interface DbalInterface * * @param string $db_name DB name * @param string $table_name Table name - * - * @return Table */ public function getTable(string $db_name, string $table_name): Table; @@ -881,43 +855,31 @@ interface DbalInterface /** * returns default server collation from show variables - * - * @return string */ public function getServerCollation(): string; /** * Server version as number - * - * @return int */ public function getVersion(): int; /** * Server version - * - * @return string */ public function getVersionString(): string; /** * Server version comment - * - * @return string */ public function getVersionComment(): string; /** * Whether connection is MariaDB - * - * @return bool */ public function isMariaDB(): bool; /** * Whether connection is Percona - * - * @return bool */ public function isPercona(): bool; diff --git a/libraries/classes/Display/Error.php b/libraries/classes/Display/Error.php index d6567af1df..28b2296980 100644 --- a/libraries/classes/Display/Error.php +++ b/libraries/classes/Display/Error.php @@ -25,8 +25,6 @@ class Error * @param string $errorHeader Error header * @param string $errorMessage Error message * - * @return string - * * @throws Throwable * @throws Twig_Error_Loader * @throws Twig_Error_Runtime diff --git a/libraries/classes/Display/Results.php b/libraries/classes/Display/Results.php index c9a023ec74..bd48511757 100644 --- a/libraries/classes/Display/Results.php +++ b/libraries/classes/Display/Results.php @@ -4769,8 +4769,6 @@ class Results * @param array $analyzed_sql_results analyzed sql results * @param array $params Array with URL Parameters * - * @return string - * * @access private */ private function _getLinkForCreateView(array $analyzed_sql_results, array $params): string diff --git a/libraries/classes/Encoding.php b/libraries/classes/Encoding.php index 885135a2e1..797da08f29 100644 --- a/libraries/classes/Encoding.php +++ b/libraries/classes/Encoding.php @@ -117,8 +117,6 @@ class Encoding /** * Initializes encoding engine detecting available backends. - * - * @return void */ public static function initEngine(): void { @@ -153,8 +151,6 @@ class Encoding * Setter for engine. Use with caution, mostly useful for testing. * * @param int $engine Engine encoding - * - * @return void */ public static function setEngine(int $engine): void { @@ -163,8 +159,6 @@ class Encoding /** * Checks whether there is any charset conversion supported - * - * @return bool */ public static function isSupported(): bool { @@ -223,8 +217,6 @@ class Encoding /** * Detects whether Kanji encoding is available - * - * @return bool */ public static function canConvertKanji(): bool { @@ -233,8 +225,6 @@ class Encoding /** * Setter for Kanji encodings. Use with caution, mostly useful for testing. - * - * @return string */ public static function getKanjiEncodings(): string { @@ -245,8 +235,6 @@ class Encoding * Setter for Kanji encodings. Use with caution, mostly useful for testing. * * @param string $value Kanji encodings list - * - * @return void */ public static function setKanjiEncodings(string $value): void { @@ -255,8 +243,6 @@ class Encoding /** * Reverses SJIS & EUC-JP position in the encoding codes list - * - * @return void */ public static function kanjiChangeOrder(): void { diff --git a/libraries/classes/Error.php b/libraries/classes/Error.php index a1711f3a07..20b106c198 100644 --- a/libraries/classes/Error.php +++ b/libraries/classes/Error.php @@ -201,8 +201,6 @@ class Error extends Message * Toggles location hiding * * @param bool $hide Whether to hide - * - * @return void */ public function setHideLocation(bool $hide): void { @@ -215,8 +213,6 @@ class Error extends Message * We don't store full arguments to avoid wakeup or memory problems. * * @param array $backtrace backtrace - * - * @return void */ public function setBacktrace(array $backtrace): void { @@ -227,8 +223,6 @@ class Error extends Message * sets PhpMyAdmin\Error::$_line * * @param int $line the line - * - * @return void */ public function setLine(int $line): void { @@ -239,8 +233,6 @@ class Error extends Message * sets PhpMyAdmin\Error::$_file * * @param string $file the file - * - * @return void */ public function setFile(string $file): void { @@ -343,8 +335,6 @@ class Error extends Message /** * returns title for error - * - * @return string */ public function getTitle(): string { @@ -353,8 +343,6 @@ class Error extends Message /** * Get HTML backtrace - * - * @return string */ public function getBacktraceDisplay(): string { @@ -401,8 +389,6 @@ class Error extends Message * * @param array $step backtrace step * @param string $separator Arguments separator to use - * - * @return string */ public static function getFunctionCall(array $step, string $separator): string { @@ -433,8 +419,6 @@ class Error extends Message * * @param string $arg argument to process * @param string $function function name - * - * @return string */ public static function getArg($arg, string $function): string { @@ -474,8 +458,6 @@ class Error extends Message /** * Gets the error as string of HTML - * - * @return string */ public function getDisplay(): string { @@ -508,8 +490,6 @@ class Error extends Message /** * whether this error is a user error - * - * @return bool */ public function isUserError(): bool { diff --git a/libraries/classes/ErrorHandler.php b/libraries/classes/ErrorHandler.php index a9d6716eb6..a2afa6b23a 100644 --- a/libraries/classes/ErrorHandler.php +++ b/libraries/classes/ErrorHandler.php @@ -106,8 +106,6 @@ class ErrorHandler * Toggles location hiding * * @param bool $hide Whether to hide - * - * @return void */ public function setHideLocation(bool $hide): void { @@ -164,8 +162,6 @@ class ErrorHandler * @param string $errstr error string * @param string $errfile error file * @param int $errline error line - * - * @return void */ public function handleError( int $errno, @@ -209,8 +205,6 @@ class ErrorHandler * @param string $errfile error file * @param int $errline error line * @param bool $escape whether to escape the error string - * - * @return void */ public function addError( string $errstr, @@ -267,8 +261,6 @@ class ErrorHandler * * @param string $errorInfo error message * @param int $errorNumber error number - * - * @return void */ public function triggerError(string $errorInfo, ?int $errorNumber = null): void { @@ -281,8 +273,6 @@ class ErrorHandler * display fatal error and exit * * @param Error $error the error - * - * @return void */ protected function dispFatalError(Error $error): void { @@ -296,8 +286,6 @@ class ErrorHandler /** * Displays user errors not displayed - * - * @return void */ public function dispUserErrors(): void { @@ -306,8 +294,6 @@ class ErrorHandler /** * Renders user errors not displayed - * - * @return string */ public function getDispUserErrors(): string { @@ -324,8 +310,6 @@ class ErrorHandler * display HTML header * * @param Error $error the error - * - * @return void */ protected function dispPageStart(?Error $error = null): void { @@ -341,8 +325,6 @@ class ErrorHandler /** * display HTML footer - * - * @return void */ protected function dispPageEnd(): void { @@ -351,8 +333,6 @@ class ErrorHandler /** * renders errors not displayed - * - * @return string */ public function getDispErrors(): string { @@ -410,8 +390,6 @@ class ErrorHandler /** * look in session for saved errors - * - * @return void */ protected function checkSavedErrors(): void { @@ -462,8 +440,6 @@ class ErrorHandler /** * whether use errors occurred or not - * - * @return bool */ public function hasUserErrors(): bool { @@ -472,8 +448,6 @@ class ErrorHandler /** * whether errors occurred or not - * - * @return bool */ public function hasErrors(): bool { @@ -496,8 +470,6 @@ class ErrorHandler /** * whether there are errors to display or not - * - * @return bool */ public function hasDisplayErrors(): bool { @@ -508,8 +480,6 @@ class ErrorHandler * Deletes previously stored errors in SESSION. * Saves current errors in session as previous errors. * Required to save current errors in case 'ask' - * - * @return void */ public function savePreviousErrors(): void { @@ -536,8 +506,6 @@ class ErrorHandler * Function to report all the collected php errors. * Must be called at the end of each script * by the $GLOBALS['error_handler'] only. - * - * @return void */ public function reportErrors(): void { diff --git a/libraries/classes/ErrorReport.php b/libraries/classes/ErrorReport.php index 9c3f27989d..b6f790aba2 100644 --- a/libraries/classes/ErrorReport.php +++ b/libraries/classes/ErrorReport.php @@ -58,8 +58,6 @@ class ErrorReport * Set the URL where to submit reports to * * @param string $submissionUrl Submission URL - * - * @return void */ public function setSubmissionUrl(string $submissionUrl): void { diff --git a/libraries/classes/Export.php b/libraries/classes/Export.php index 38da0ebf39..de0862c483 100644 --- a/libraries/classes/Export.php +++ b/libraries/classes/Export.php @@ -62,8 +62,6 @@ class Export /** * Sets a session variable upon a possible fatal error during export - * - * @return void */ public function shutdown(): void { @@ -76,8 +74,6 @@ class Export /** * Detect ob_gzhandler - * - * @return bool */ public function isGzHandlerEnabled(): bool { @@ -484,8 +480,6 @@ class Export * * @param string $object_name the name of current object to be stored * @param bool $append optional boolean to append to an existing index or not - * - * @return void */ public function saveObjectInBuffer(string $object_name, bool $append = false): void { @@ -598,8 +592,6 @@ class Export * @param bool $do_dates whether to add dates * @param array $aliases alias information for db/table/column * @param string $separate_files whether it is a separate-files export - * - * @return void */ public function exportServer( $db_select, @@ -667,8 +659,6 @@ class Export * @param bool $do_dates whether to add dates * @param array $aliases Alias information for db/table/column * @param string $separate_files whether it is a separate-files export - * - * @return void */ public function exportDatabase( string $db, @@ -919,8 +909,6 @@ class Export * @param string $limit_from starting limit * @param string $sql_query query for which exporting is requested * @param array $aliases Alias information for db/table/column - * - * @return void */ public function exportTable( string $db, @@ -1071,8 +1059,6 @@ class Export * @param string $db the database name * @param string $table the table name * @param string $export_type Export type - * - * @return void */ public function showPage(string $db, string $table, string $export_type): void { @@ -1225,8 +1211,6 @@ class Export * call and include the appropriate Schema Class depending on $export_type * * @param string|null $export_type format of the export - * - * @return void */ public function processExportSchema(?string $export_type): void { diff --git a/libraries/classes/File.php b/libraries/classes/File.php index 14d613faf2..f35362732f 100644 --- a/libraries/classes/File.php +++ b/libraries/classes/File.php @@ -170,8 +170,6 @@ class File * * @param string|null $name file name * - * @return void - * * @access public */ public function setName(?string $name): void @@ -230,8 +228,6 @@ class File /** * Whether file is uploaded. * - * @return bool - * * @access public */ public function isUploaded(): bool @@ -596,8 +592,6 @@ class File * Sets whether the content should be decompressed before returned * * @param bool $decompress whether to decompress - * - * @return void */ public function setDecompressContent(bool $decompress): void { @@ -621,8 +615,6 @@ class File * Sets the file handle * * @param resource $handle file handle - * - * @return void */ public function setHandle($handle): void { @@ -631,8 +623,6 @@ class File /** * Sets error message for unsupported compression. - * - * @return void */ public function errorUnsupported(): void { @@ -648,8 +638,6 @@ class File /** * Attempts to open the file. - * - * @return bool */ public function open(): bool { @@ -698,8 +686,6 @@ class File * Opens file from zip * * @param string|null $specific_entry Entry to open - * - * @return bool */ public function openZip(?string $specific_entry = null): bool { @@ -715,8 +701,6 @@ class File /** * Checks whether we've reached end of file - * - * @return bool */ public function eof(): bool { @@ -728,8 +712,6 @@ class File /** * Closes the file - * - * @return void */ public function close(): void { @@ -747,8 +729,6 @@ class File * Reads data from file * * @param int $size Number of bytes to read - * - * @return string */ public function read(int $size): string { @@ -781,8 +761,6 @@ class File * Sets the character set of the file * * @param string $charset character set of the file - * - * @return void */ public function setCharset(string $charset): void { @@ -829,8 +807,6 @@ class File * Sets the chunk size * * @param int $chunk_size the chunk size - * - * @return void */ public function setChunkSize(int $chunk_size): void { diff --git a/libraries/classes/Footer.php b/libraries/classes/Footer.php index 75c50057c4..e03719fec7 100644 --- a/libraries/classes/Footer.php +++ b/libraries/classes/Footer.php @@ -73,8 +73,6 @@ class Footer /** * Returns the message for demo server to error messages - * - * @return string */ private function _getDemoMessage(): string { @@ -128,8 +126,6 @@ class Footer /** * Renders the debug messages - * - * @return string */ public function getDebugMessage(): string { @@ -151,8 +147,6 @@ class Footer /** * Returns the url of the current page - * - * @return string */ public function getSelfUrl(): string { @@ -206,8 +200,6 @@ class Footer * Renders the link to open a new page * * @param string $url The url of the page - * - * @return string */ private function _getSelfLink(string $url): string { @@ -230,8 +222,6 @@ class Footer /** * Renders the link to open a new page - * - * @return string */ public function getErrorMessages(): string { @@ -250,8 +240,6 @@ class Footer /** * Saves query in history - * - * @return void */ private function _setHistory(): void { @@ -272,8 +260,6 @@ class Footer /** * Disables the rendering of the footer - * - * @return void */ public function disable(): void { @@ -285,8 +271,6 @@ class Footer * we are servicing an ajax request * * @param bool $isAjax Whether we are servicing an ajax request - * - * @return void */ public function setAjax(bool $isAjax): void { @@ -295,8 +279,6 @@ class Footer /** * Turn on minimal display mode - * - * @return void */ public function setMinimal(): void { @@ -315,8 +297,6 @@ class Footer /** * Renders the footer - * - * @return string */ public function getDisplay(): string { diff --git a/libraries/classes/Header.php b/libraries/classes/Header.php index 09c17d9e4d..3096905b89 100644 --- a/libraries/classes/Header.php +++ b/libraries/classes/Header.php @@ -155,8 +155,6 @@ class Header /** * Loads common scripts - * - * @return void */ private function _addDefaultScripts(): void { @@ -267,8 +265,6 @@ class Header /** * Returns, as a string, a list of parameters * used on the client side - * - * @return string */ public function getJsParamsCode(): string { @@ -285,8 +281,6 @@ class Header /** * Disables the rendering of the header - * - * @return void */ public function disable(): void { @@ -298,8 +292,6 @@ class Header * we are servicing an ajax request * * @param bool $isAjax Whether we are servicing an ajax request - * - * @return void */ public function setAjax(bool $isAjax): void { @@ -331,8 +323,6 @@ class Header * Setter for the ID attribute in the BODY tag * * @param string $id Value for the ID attribute - * - * @return void */ public function setBodyId(string $id): void { @@ -343,8 +333,6 @@ class Header * Setter for the title of the page * * @param string $title New title - * - * @return void */ public function setTitle(string $title): void { @@ -353,8 +341,6 @@ class Header /** * Disables the display of the top menu - * - * @return void */ public function disableMenuAndConsole(): void { @@ -364,8 +350,6 @@ class Header /** * Disables the display of the top menu - * - * @return void */ public function disableWarnings(): void { @@ -374,8 +358,6 @@ class Header /** * Turns on 'print view' mode - * - * @return void */ public function enablePrintView(): void { @@ -485,8 +467,6 @@ class Header /** * Returns the message to be displayed at the top of * the page, including the executed SQL query, if any. - * - * @return string */ public function getMessage(): string { @@ -512,8 +492,6 @@ class Header /** * Sends out the HTTP headers - * - * @return void */ public function sendHttpHeaders(): void { @@ -630,8 +608,6 @@ class Header /** * If the page is missing the title, this function * will set it to something reasonable - * - * @return string */ public function getPageTitle(): string { @@ -661,8 +637,6 @@ class Header * * @param string $db Database name where the table is located. * @param string $table The table name - * - * @return string */ private function _addRecentTable(string $db, string $table): string { diff --git a/libraries/classes/Html/ActionLinksModes/ActionLinksModesInterface.php b/libraries/classes/Html/ActionLinksModes/ActionLinksModesInterface.php index 276519dfd7..2051f13c45 100644 --- a/libraries/classes/Html/ActionLinksModes/ActionLinksModesInterface.php +++ b/libraries/classes/Html/ActionLinksModes/ActionLinksModesInterface.php @@ -19,8 +19,6 @@ interface ActionLinksModesInterface * @param string $text Text of the generated element * @param string $image Image of the generated element, if image mode * @param string $value Value of the generated element - * - * @return string */ public static function generate( string $name, diff --git a/libraries/classes/Html/ActionLinksModes/Factory.php b/libraries/classes/Html/ActionLinksModes/Factory.php index 7c02b680a5..cb10775103 100644 --- a/libraries/classes/Html/ActionLinksModes/Factory.php +++ b/libraries/classes/Html/ActionLinksModes/Factory.php @@ -15,8 +15,6 @@ class Factory * Build an ActionLinksModesInterface to generate the HTML element * * @param string $mode Mode (text, image) - * - * @return ActionLinksModesInterface */ public static function build(string $mode): ActionLinksModesInterface { diff --git a/libraries/classes/Html/ActionLinksModes/Image.php b/libraries/classes/Html/ActionLinksModes/Image.php index 243e29ee0d..c1ddc6b08d 100644 --- a/libraries/classes/Html/ActionLinksModes/Image.php +++ b/libraries/classes/Html/ActionLinksModes/Image.php @@ -22,8 +22,6 @@ class Image implements ActionLinksModesInterface * @param string $text Text of the generated element * @param string $image Image of the generated element, if image mode * @param string $value Value of the generated element - * - * @return string */ public static function generate( string $name, diff --git a/libraries/classes/Html/ActionLinksModes/Text.php b/libraries/classes/Html/ActionLinksModes/Text.php index aab7434b1f..f13f2d3aea 100644 --- a/libraries/classes/Html/ActionLinksModes/Text.php +++ b/libraries/classes/Html/ActionLinksModes/Text.php @@ -21,8 +21,6 @@ class Text implements ActionLinksModesInterface * @param string $text Text of the generated element * @param string $image Image of the generated element, if image mode * @param string $value Value of the generated element - * - * @return string */ public static function generate( string $name, diff --git a/libraries/classes/Html/Forms/Fields/BrowseUploadFileBlock.php b/libraries/classes/Html/Forms/Fields/BrowseUploadFileBlock.php index 3f97c9fc20..33f258d786 100644 --- a/libraries/classes/Html/Forms/Fields/BrowseUploadFileBlock.php +++ b/libraries/classes/Html/Forms/Fields/BrowseUploadFileBlock.php @@ -19,8 +19,6 @@ class BrowseUploadFileBlock implements FieldGenerator * import * * @param string $max_upload_size maximum upload size - * - * @return string */ public static function generate(string $max_upload_size): string { diff --git a/libraries/classes/Html/Forms/Fields/DropDownUploadFileBlock.php b/libraries/classes/Html/Forms/Fields/DropDownUploadFileBlock.php index 841ebc1803..b7f06ed383 100644 --- a/libraries/classes/Html/Forms/Fields/DropDownUploadFileBlock.php +++ b/libraries/classes/Html/Forms/Fields/DropDownUploadFileBlock.php @@ -24,8 +24,6 @@ class DropDownUploadFileBlock implements FieldGenerator * * @param ImportPlugin[] $import_list array of import plugins * @param string $uploaddir upload directory - * - * @return string */ public static function generate($import_list, $uploaddir): string { diff --git a/libraries/classes/Html/Generator.php b/libraries/classes/Html/Generator.php index 8c66f328da..5b81f65cf7 100644 --- a/libraries/classes/Html/Generator.php +++ b/libraries/classes/Html/Generator.php @@ -113,8 +113,6 @@ class Generator * * @param string $message the message for the tooltip * - * @return string - * * @access public */ public static function showHint($message): string @@ -307,8 +305,6 @@ class Generator * @param string $component 'mysql' (eventually, 'php') * @param string $minimum_version of this component * @param string $bugref bug reference for this component - * - * @return string */ public static function getExternalBug( $functionality, @@ -457,8 +453,6 @@ class Generator /** * Returns information about SSL status for current connection - * - * @return string */ public static function getServerSSL(): string { @@ -750,8 +744,6 @@ class Generator * @param string $sql_query the query to display * @param string $type the type (level) of the message * - * @return string - * * @throws Throwable * @throws Twig_Error_Loader * @throws Twig_Error_Runtime @@ -1073,8 +1065,6 @@ class Generator * @param bool $exit Whether execution should be stopped or * the error message should be returned. * - * @return string - * * @global string $table The current table. * @global string $db The current database. * @@ -1565,8 +1555,6 @@ class Generator * creates a drop-down list. * * @param string $selected The value to mark as selected in HTML mode - * - * @return string */ public static function getSupportedDatatypes($selected): string { diff --git a/libraries/classes/Import.php b/libraries/classes/Import.php index 213489d852..2abba4934c 100644 --- a/libraries/classes/Import.php +++ b/libraries/classes/Import.php @@ -106,8 +106,6 @@ class Import * @param string $full query to display, this might be commented * @param array $sql_data SQL parse data storage * - * @return void - * * @access public */ public function executeQuery(string $sql, string $full, array &$sql_data): void @@ -194,8 +192,6 @@ class Import * @param string $full query to display, this might be commented * @param array $sql_data SQL parse data storage * - * @return void - * * @access public */ public function runQuery( @@ -982,8 +978,6 @@ class Import * @param array|null $options Associative array of options * @param array $sql_data 2-element array with sql data * - * @return void - * * @access public */ public function buildSql( @@ -1366,8 +1360,6 @@ class Import * * @param Message $error_message The error message * - * @return void - * * @access public */ public function stop(Message $error_message): void @@ -1395,8 +1387,6 @@ class Import /** * Handles request for Simulation of UPDATE/DELETE queries. - * - * @return void */ public function handleSimulateDmlRequest(): void { @@ -1620,8 +1610,6 @@ class Import * Handles request for ROLLBACK. * * @param string $sql_query SQL query(s) - * - * @return void */ public function handleRollbackRequest(string $sql_query): void { @@ -1665,8 +1653,6 @@ class Import * Checks if ROLLBACK is possible for a SQL query or not. * * @param string $sql_query SQL query - * - * @return bool */ public function checkIfRollbackPossible(string $sql_query): bool { @@ -1704,8 +1690,6 @@ class Import * Checks if a table is 'InnoDB' or not. * * @param string $table Table details - * - * @return bool */ public function isTableTransactional(string $table): bool { diff --git a/libraries/classes/InsertEdit.php b/libraries/classes/InsertEdit.php index 98de05f302..6ebedd5500 100644 --- a/libraries/classes/InsertEdit.php +++ b/libraries/classes/InsertEdit.php @@ -619,8 +619,6 @@ class InsertEdit * @param array $column description of column in given table * @param array $foreigners keys into foreign fields * @param array $foreignData data about the foreign keys - * - * @return string */ private function getNullifyCodeForNullColumn( array $column, @@ -3071,8 +3069,6 @@ class InsertEdit * * @param array $column column * @param string $column_name_appendix column name appendix - * - * @return string */ private function getHtmlForFunctionOption(array $column, $column_name_appendix): string { diff --git a/libraries/classes/Message.php b/libraries/classes/Message.php index df532b2688..2fca472a91 100644 --- a/libraries/classes/Message.php +++ b/libraries/classes/Message.php @@ -151,8 +151,6 @@ class Message /** * magic method: return string representation for this object - * - * @return string */ public function __toString(): string { @@ -403,8 +401,6 @@ class Message * Set whether we should use BB Code when rendering. * * @param bool $useBBCode Use BB Code? - * - * @return void */ public function setBBCode(bool $useBBCode): void { @@ -416,8 +412,6 @@ class Message * * @param string $message A localized string * @param bool $sanitize Whether to sanitize $message or not - * - * @return void */ public function setMessage(string $message, bool $sanitize = false): void { @@ -432,8 +426,6 @@ class Message * * @param string $string string to set * @param bool|int $sanitize whether to sanitize $string or not - * - * @return void */ public function setString(string $string, $sanitize = true): void { @@ -447,8 +439,6 @@ class Message * set message type number * * @param int $number message type number to set - * - * @return void */ public function setNumber(int $number): void { @@ -464,8 +454,6 @@ class Message * * * @param mixed $param parameter to add - * - * @return void */ public function addParam($param): void { @@ -485,8 +473,6 @@ class Message * * * @param string $param parameter to add - * - * @return void */ public function addParamHtml(string $param): void { @@ -498,8 +484,6 @@ class Message * * @param Message[] $messages to be added * @param string $separator to use between this and previous string/message - * - * @return void */ public function addMessages(array $messages, string $separator = ' '): void { @@ -513,8 +497,6 @@ class Message * * @param string[] $messages to be added * @param string $separator to use between this and previous string/message - * - * @return void */ public function addMessagesString(array $messages, string $separator = ' '): void { @@ -528,8 +510,6 @@ class Message * * @param Message $message to be added * @param string $separator to use between this and previous string/message - * - * @return void */ private function addMessageToList(self $message, string $separator): void { @@ -544,8 +524,6 @@ class Message * * @param self $message to be added * @param string $separator to use between this and previous string/message - * - * @return void */ public function addMessage(self $message, string $separator = ' '): void { @@ -557,8 +535,6 @@ class Message * * @param string $message to be added * @param string $separator to use between this and previous string/message - * - * @return void */ public function addText(string $message, string $separator = ' '): void { @@ -570,8 +546,6 @@ class Message * * @param string $message to be added * @param string $separator to use between this and previous string/message - * - * @return void */ public function addHtml(string $message, string $separator = ' '): void { @@ -583,8 +557,6 @@ class Message * * @param array|string $params parameters to set * @param bool|int $sanitize whether to sanitize params - * - * @return void */ public function setParams($params, $sanitize = false): void { @@ -726,8 +698,6 @@ class Message /** * Returns only message string without image & other HTML. - * - * @return string */ public function getOnlyMessage(): string { @@ -766,8 +736,6 @@ class Message /** * Displays the message in HTML - * - * @return void */ public function display(): void { diff --git a/libraries/classes/Navigation/NavigationTree.php b/libraries/classes/Navigation/NavigationTree.php index c230495f47..dfd379a732 100644 --- a/libraries/classes/Navigation/NavigationTree.php +++ b/libraries/classes/Navigation/NavigationTree.php @@ -699,8 +699,6 @@ class NavigationTree * to group the whole tree. If * passed as an argument, $node * must be of type CONTAINER - * - * @return void */ public function groupTree(?Node $node = null): void { diff --git a/libraries/classes/Navigation/NodeFactory.php b/libraries/classes/Navigation/NodeFactory.php index b17a72786a..e8fc8ed9a3 100644 --- a/libraries/classes/Navigation/NodeFactory.php +++ b/libraries/classes/Navigation/NodeFactory.php @@ -79,8 +79,6 @@ class NodeFactory * @param int $type Type of node, may be one of CONTAINER or OBJECT * @param bool $isGroup Whether this object has been created * while grouping nodes - * - * @return Node */ public static function getInstance( $class = 'Node', @@ -97,8 +95,6 @@ class NodeFactory * * @param string $name An identifier for the new node * @param string $classes Extra CSS classes for the node - * - * @return Node */ public static function getInstanceForNewNode( string $name, diff --git a/libraries/classes/Navigation/Nodes/Node.php b/libraries/classes/Navigation/Nodes/Node.php index 8e59c4bd1e..acb3ca207a 100644 --- a/libraries/classes/Navigation/Nodes/Node.php +++ b/libraries/classes/Navigation/Nodes/Node.php @@ -134,8 +134,6 @@ class Node * Adds a child node to this node * * @param Node $child A child node - * - * @return void */ public function addChild($child): void { @@ -176,8 +174,6 @@ class Node * Removes a child node from this node * * @param string $name The name of child to be removed - * - * @return void */ public function removeChild($name): void { @@ -271,8 +267,6 @@ class Node * the third level of the tree (columns and indexes), for which the function * always returns true. This is because we want to render the containers * for these nodes - * - * @return bool */ public function hasSiblings(): bool { diff --git a/libraries/classes/Plugins/Auth/AuthenticationSignon.php b/libraries/classes/Plugins/Auth/AuthenticationSignon.php index 541eb98535..7a5bef33e4 100644 --- a/libraries/classes/Plugins/Auth/AuthenticationSignon.php +++ b/libraries/classes/Plugins/Auth/AuthenticationSignon.php @@ -52,8 +52,6 @@ class AuthenticationSignon extends AuthenticationPlugin * Set cookie params * * @param array $sessionCookieParams The cookie params - * - * @return void */ public function setCookieParams(array $sessionCookieParams = null): void { diff --git a/libraries/classes/Response.php b/libraries/classes/Response.php index d60324a64f..1eb3b994e9 100644 --- a/libraries/classes/Response.php +++ b/libraries/classes/Response.php @@ -205,8 +205,6 @@ class Response * we are servicing an ajax request * * @param bool $isAjax Whether we are servicing an ajax request - * - * @return void */ public function setAjax(bool $isAjax): void { @@ -233,8 +231,6 @@ class Response * whether it is a success or an error * * @param bool $state Whether the request was successfully processed - * - * @return void */ public function setRequestStatus(bool $state): void { @@ -244,8 +240,6 @@ class Response /** * Returns true or false depending on whether * we are servicing an ajax request - * - * @return bool */ public function isAjax(): bool { @@ -569,8 +563,6 @@ class Response * Sets http response code. * * @param int $responseCode will set the response code. - * - * @return void */ public function setHttpResponseCode(int $responseCode): void { diff --git a/libraries/classes/Sanitize.php b/libraries/classes/Sanitize.php index 4a5205a2ca..2ac2f21b3d 100644 --- a/libraries/classes/Sanitize.php +++ b/libraries/classes/Sanitize.php @@ -354,8 +354,6 @@ class Sanitize * * @param string[] $whitelist list of variables to allow * - * @return void - * * @access public */ public static function removeRequestVars(&$whitelist): void diff --git a/libraries/classes/Server/Plugin.php b/libraries/classes/Server/Plugin.php index fe676d20bf..9caf75f5af 100644 --- a/libraries/classes/Server/Plugin.php +++ b/libraries/classes/Server/Plugin.php @@ -97,8 +97,6 @@ final class Plugin /** * @param array $state array with the properties - * - * @return self */ public static function fromState(array $state): self { diff --git a/libraries/classes/Server/Plugins.php b/libraries/classes/Server/Plugins.php index 4a05945777..ed28a85c46 100644 --- a/libraries/classes/Server/Plugins.php +++ b/libraries/classes/Server/Plugins.php @@ -41,8 +41,6 @@ class Plugins /** * @param array $row Row fetched from database - * - * @return Plugin */ private function mapRowToPlugin(array $row): Plugin { diff --git a/libraries/classes/Server/Privileges.php b/libraries/classes/Server/Privileges.php index 1e66b27553..ef73bd8007 100644 --- a/libraries/classes/Server/Privileges.php +++ b/libraries/classes/Server/Privileges.php @@ -2561,8 +2561,6 @@ class Privileges /** * update Message For Reload - * - * @return Message|null */ public function updateMessageForReload(): ?Message { diff --git a/libraries/classes/Server/UserGroups.php b/libraries/classes/Server/UserGroups.php index d671de5e0c..8850171f8a 100644 --- a/libraries/classes/Server/UserGroups.php +++ b/libraries/classes/Server/UserGroups.php @@ -175,8 +175,6 @@ class UserGroups * Deletes a user group * * @param string $userGroup user group name - * - * @return void */ public static function delete(string $userGroup): void { @@ -312,8 +310,6 @@ class UserGroups * * @param string $userGroup user group name * @param bool $new whether this is a new user group - * - * @return void */ public static function edit(string $userGroup, bool $new = false): void { diff --git a/libraries/classes/Sql.php b/libraries/classes/Sql.php index 1c88da303c..a53abf1a01 100644 --- a/libraries/classes/Sql.php +++ b/libraries/classes/Sql.php @@ -451,8 +451,6 @@ class Sql * @param string $table current table * @param string|null $complete_query complete query * @param string $bkm_user bookmarking user - * - * @return string */ public function getHtmlForBookmark( array $displayParts, @@ -535,8 +533,6 @@ class Sql * @param array $analyzed_sql_results the analyzed query and other variables set * after analyzing the query * @param bool|null $find_real_end whether the real end should be found - * - * @return bool */ public function isJustBrowsing(array $analyzed_sql_results, ?bool $find_real_end): bool { @@ -1395,8 +1391,6 @@ class Sql /** * Returns a message for successful creation of a bookmark or null if a bookmark * was not created - * - * @return string */ private function getBookmarkCreatedMessage(): string { @@ -1557,8 +1551,6 @@ class Sql * @param bool $showSql whether to show sql * @param array $sqlData sql data * @param Message|string $displayMessage display message - * - * @return string */ private function getHtmlForPreviousUpdateQuery( ?string $displayQuery, @@ -1585,8 +1577,6 @@ class Sql * @param string $database current database * @param bool $editable whether the results table can be editable or not * @param bool $hasUniqueKey whether there is a unique key - * - * @return string */ private function getMessageIfMissingColumnIndex($table, $database, $editable, $hasUniqueKey): string { @@ -1633,8 +1623,6 @@ class Sql * like check table, optimize table, * analyze table or repair table * @param string $database current database - * - * @return string */ private function getHtmlForIndexesProblems(?string $queryType, ?array $selectedTables, string $database): string { diff --git a/libraries/classes/TablePartitionDefinition.php b/libraries/classes/TablePartitionDefinition.php index fbf288090c..6d000a25f7 100644 --- a/libraries/classes/TablePartitionDefinition.php +++ b/libraries/classes/TablePartitionDefinition.php @@ -80,8 +80,6 @@ class TablePartitionDefinition /** * @param string $paramLabel Label searched in request - * - * @return int */ protected static function extractPartitionCount(string $paramLabel): int { diff --git a/libraries/classes/Template.php b/libraries/classes/Template.php index 7a7fc80442..de10a82485 100644 --- a/libraries/classes/Template.php +++ b/libraries/classes/Template.php @@ -93,8 +93,6 @@ class Template * * @param string $templateName Template path name * - * @return Twig_TemplateWrapper - * * @throws LoaderError * @throws RuntimeError * @throws SyntaxError @@ -128,8 +126,6 @@ class Template * @param string $template Template path name * @param array $data Associative array of template variables * - * @return string - * * @throws Throwable * @throws Twig_Error_Loader * @throws Twig_Error_Runtime diff --git a/libraries/classes/Tracking.php b/libraries/classes/Tracking.php index aacbe7b88a..71e67a2596 100644 --- a/libraries/classes/Tracking.php +++ b/libraries/classes/Tracking.php @@ -649,8 +649,6 @@ class Tracking * Function to get html for schema snapshot * * @param array $params url parameters - * - * @return string */ public function getHtmlForSchemaSnapshot(array $params): string { diff --git a/libraries/classes/Url.php b/libraries/classes/Url.php index 8996f5cb2d..765e048679 100644 --- a/libraries/classes/Url.php +++ b/libraries/classes/Url.php @@ -280,8 +280,6 @@ class Url /** * @param string $route Route to use * @param array $additionalParameters Additional URL parameters - * - * @return string */ public static function getFromRoute(string $route, array $additionalParameters = []): string { diff --git a/libraries/classes/UserPreferencesHeader.php b/libraries/classes/UserPreferencesHeader.php index 954a750ced..3bf28673b6 100644 --- a/libraries/classes/UserPreferencesHeader.php +++ b/libraries/classes/UserPreferencesHeader.php @@ -25,8 +25,6 @@ class UserPreferencesHeader * @param Template $template Template object used to render data * @param Relation $relation Relation object * - * @return string - * * @throws Throwable * @throws Twig_Error_Loader * @throws Twig_Error_Runtime @@ -42,8 +40,6 @@ class UserPreferencesHeader /** * @param Template $template Template object used to render data * - * @return string - * * @throws Throwable * @throws Twig_Error_Loader * @throws Twig_Error_Runtime @@ -122,8 +118,6 @@ class UserPreferencesHeader /** * @param Relation $relation Relation instance - * - * @return string|null */ protected static function sessionStorageWarning(Relation $relation): ?string { diff --git a/libraries/classes/Util.php b/libraries/classes/Util.php index 09dc95b99c..a285c1841c 100644 --- a/libraries/classes/Util.php +++ b/libraries/classes/Util.php @@ -2932,8 +2932,6 @@ class Util * * @param int $length Length of string * @param bool $asHex (optional) Send the result as hex - * - * @return string */ public static function generateRandom(int $length, bool $asHex = false): string { @@ -3108,8 +3106,6 @@ class Util * Check that input is an int or an int in a string * * @param mixed $input input to check - * - * @return bool */ public static function isInteger($input): bool { diff --git a/test/classes/AdvisorTest.php b/test/classes/AdvisorTest.php index bb746ea036..d98ee340a3 100644 --- a/test/classes/AdvisorTest.php +++ b/test/classes/AdvisorTest.php @@ -18,8 +18,6 @@ class AdvisorTest extends PmaTestCase /** * Sets up the fixture, for example, opens a network connection. * This method is called before a test is executed. - * - * @return void */ protected function setUp(): void { @@ -33,8 +31,6 @@ class AdvisorTest extends PmaTestCase * @param string $text Text to escape * @param string $expected Expected output * - * @return void - * * @dataProvider escapeStrings */ public function testEscape($text, $expected): void @@ -87,8 +83,6 @@ class AdvisorTest extends PmaTestCase * @param float $time time * @param string $expected expected result * - * @return void - * * @dataProvider advisorTimes */ public function testAdvisorBytime($time, $expected): void @@ -147,8 +141,6 @@ class AdvisorTest extends PmaTestCase * @param array $expected Expected rendered rule in fired/errors list * @param string $error Expected error string (null if none error expected) * - * @return void - * * @depends testParse * @dataProvider rulesProvider */ diff --git a/test/classes/BookmarkTest.php b/test/classes/BookmarkTest.php index 7f9ad299fc..56f805b9fb 100644 --- a/test/classes/BookmarkTest.php +++ b/test/classes/BookmarkTest.php @@ -18,8 +18,6 @@ class BookmarkTest extends TestCase * Sets up the fixture, for example, opens a network connection. * This method is called before a test is executed. * - * @return void - * * @access protected */ protected function setUp(): void diff --git a/test/classes/BrowseForeignersTest.php b/test/classes/BrowseForeignersTest.php index 054a436776..4fb125f06a 100644 --- a/test/classes/BrowseForeignersTest.php +++ b/test/classes/BrowseForeignersTest.php @@ -20,8 +20,6 @@ class BrowseForeignersTest extends TestCase /** * Setup for test cases - * - * @return void */ protected function setUp(): void { diff --git a/test/classes/CentralColumnsTest.php b/test/classes/CentralColumnsTest.php index 66ab95242a..74b71e76b6 100644 --- a/test/classes/CentralColumnsTest.php +++ b/test/classes/CentralColumnsTest.php @@ -90,8 +90,6 @@ class CentralColumnsTest extends TestCase /** * prepares environment for tests - * - * @return void */ protected function setUp(): void { diff --git a/test/classes/Charsets/CollationTest.php b/test/classes/Charsets/CollationTest.php index 13a0d3fb6c..49a34873ee 100644 --- a/test/classes/Charsets/CollationTest.php +++ b/test/classes/Charsets/CollationTest.php @@ -39,8 +39,6 @@ class CollationTest extends TestCase * @param string $collation Collation for which description is reqd * @param string $description Expected Description * - * @return void - * * @dataProvider providerTestBuildDescription */ public function testBuildDescription($collation, $description): void diff --git a/test/classes/CheckUserPrivilegesTest.php b/test/classes/CheckUserPrivilegesTest.php index 8b80b42c1b..d1a67db199 100644 --- a/test/classes/CheckUserPrivilegesTest.php +++ b/test/classes/CheckUserPrivilegesTest.php @@ -19,8 +19,6 @@ class CheckUserPrivilegesTest extends TestCase /** * prepares environment for tests - * - * @return void */ protected function setUp(): void { diff --git a/test/classes/Config/ConfigFileTest.php b/test/classes/Config/ConfigFileTest.php index f08a958101..cc35b352e1 100644 --- a/test/classes/Config/ConfigFileTest.php +++ b/test/classes/Config/ConfigFileTest.php @@ -34,8 +34,6 @@ class ConfigFileTest extends PmaTestCase /** * Setup function for test cases * - * @return void - * * @access protected */ protected function setUp(): void @@ -46,8 +44,6 @@ class ConfigFileTest extends PmaTestCase /** * TearDown function for test cases - * - * @return void */ protected function tearDown(): void { diff --git a/test/classes/Config/DescriptionTest.php b/test/classes/Config/DescriptionTest.php index f40ba59284..447237bea2 100644 --- a/test/classes/Config/DescriptionTest.php +++ b/test/classes/Config/DescriptionTest.php @@ -18,8 +18,6 @@ class DescriptionTest extends PmaTestCase { /** * Setup tests - * - * @return void */ protected function setUp(): void { @@ -31,8 +29,6 @@ class DescriptionTest extends PmaTestCase * @param string $type type * @param string $expected expected result * - * @return void - * * @dataProvider getValues */ public function testGet($item, $type, $expected): void diff --git a/test/classes/Config/FormDisplayTemplateTest.php b/test/classes/Config/FormDisplayTemplateTest.php index 4abeed73ce..e385792607 100644 --- a/test/classes/Config/FormDisplayTemplateTest.php +++ b/test/classes/Config/FormDisplayTemplateTest.php @@ -23,8 +23,6 @@ class FormDisplayTemplateTest extends TestCase /** * Setup tests - * - * @return void */ protected function setUp(): void { diff --git a/test/classes/Config/FormDisplayTest.php b/test/classes/Config/FormDisplayTest.php index 111f98d56d..c689f5ab46 100644 --- a/test/classes/Config/FormDisplayTest.php +++ b/test/classes/Config/FormDisplayTest.php @@ -26,8 +26,6 @@ class FormDisplayTest extends PmaTestCase /** * Configures global environment. - * - * @return void */ protected function setUp(): void { @@ -39,8 +37,6 @@ class FormDisplayTest extends PmaTestCase /** * tearDown for test cases - * - * @return void */ protected function tearDown(): void { diff --git a/test/classes/Config/FormTest.php b/test/classes/Config/FormTest.php index 4b5ba2174a..58625d74fe 100644 --- a/test/classes/Config/FormTest.php +++ b/test/classes/Config/FormTest.php @@ -25,8 +25,6 @@ class FormTest extends PmaTestCase /** * Configures global environment. - * - * @return void */ protected function setUp(): void { @@ -46,8 +44,6 @@ class FormTest extends PmaTestCase /** * tearDown for test cases - * - * @return void */ protected function tearDown(): void { diff --git a/test/classes/Config/Forms/FormListTest.php b/test/classes/Config/Forms/FormListTest.php index fd2dc2e987..63eb5bb15d 100644 --- a/test/classes/Config/Forms/FormListTest.php +++ b/test/classes/Config/Forms/FormListTest.php @@ -27,8 +27,6 @@ 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): void diff --git a/test/classes/Config/PageSettingsTest.php b/test/classes/Config/PageSettingsTest.php index 6387a43697..6e367f63fd 100644 --- a/test/classes/Config/PageSettingsTest.php +++ b/test/classes/Config/PageSettingsTest.php @@ -17,8 +17,6 @@ class PageSettingsTest extends PmaTestCase { /** * Setup tests - * - * @return void */ protected function setUp(): void { diff --git a/test/classes/Config/ServerConfigChecksTest.php b/test/classes/Config/ServerConfigChecksTest.php index 3363b73bee..f3dbc2f892 100644 --- a/test/classes/Config/ServerConfigChecksTest.php +++ b/test/classes/Config/ServerConfigChecksTest.php @@ -23,8 +23,6 @@ class ServerConfigChecksTest extends PmaTestCase private $sessionID; /** - * @return void - * * @throws ReflectionException */ protected function setUp(): void diff --git a/test/classes/ConfigTest.php b/test/classes/ConfigTest.php index 94b914b7e2..8d881a888b 100644 --- a/test/classes/ConfigTest.php +++ b/test/classes/ConfigTest.php @@ -59,8 +59,6 @@ class ConfigTest extends PmaTestCase /** * Sets up the fixture, for example, opens a network connection. * This method is called before a test is executed. - * - * @return void */ protected function setUp(): void { @@ -79,8 +77,6 @@ class ConfigTest extends PmaTestCase /** * Tears down the fixture, for example, closes a network connection. * This method is called after a test is executed. - * - * @return void */ protected function tearDown(): void { @@ -133,8 +129,6 @@ class ConfigTest extends PmaTestCase * @param string $browser Expected parsed browser (or null if none) * @param string $version Expected browser version (or null if none) * - * @return void - * * @dataProvider userAgentProvider */ public function testCheckClient($agent, $os, $browser = null, $version = null): void @@ -338,8 +332,6 @@ class ConfigTest extends PmaTestCase * @param string $server Server identification * @param bool $iis Whether server should be detected as IIS * - * @return void - * * @dataProvider serverNames */ public function testCheckWebServer($server, $iis): void @@ -514,8 +506,6 @@ class ConfigTest extends PmaTestCase * @param int $port server port * @param bool $expected expected result * - * @return void - * * @dataProvider httpsParams */ public function testIsHttps($scheme, $https, $uri, $lb, $front, $proto, $protoCloudFront, $pmaAbsoluteUri, $port, $expected): void @@ -763,8 +753,6 @@ class ConfigTest extends PmaTestCase * @param string $absolute The absolute URL used for phpMyAdmin * @param string $expected Expected root path * - * @return void - * * @dataProvider rootUris */ public function testGetRootPath($request, $absolute, $expected): void @@ -871,8 +859,6 @@ class ConfigTest extends PmaTestCase * @param string $source File name of config to load * @param bool $result Expected result of loading * - * @return void - * * @dataProvider configPaths */ public function testLoad($source, $result): void @@ -1029,8 +1015,6 @@ class ConfigTest extends PmaTestCase /** * Test for getTempDir * - * @return void - * * @group file-system */ public function testGetTempDir(): void @@ -1046,8 +1030,6 @@ class ConfigTest extends PmaTestCase /** * Test for getUploadTempDir * - * @return void - * * @group file-system */ public function testGetUploadTempDir(): void @@ -1501,8 +1483,6 @@ class ConfigTest extends PmaTestCase * @param array $expected expected result * @param bool $error error * - * @return void - * * @dataProvider serverSettingsProvider */ public function testCheckServers($settings, $expected, $error = false): void @@ -1559,8 +1539,6 @@ class ConfigTest extends PmaTestCase * @param string $request request * @param int $expected expected result * - * @return void - * * @dataProvider selectServerProvider * @depends testCheckServers */ diff --git a/test/classes/Controllers/Database/StructureControllerTest.php b/test/classes/Controllers/Database/StructureControllerTest.php index 2957fa500d..baca784bfc 100644 --- a/test/classes/Controllers/Database/StructureControllerTest.php +++ b/test/classes/Controllers/Database/StructureControllerTest.php @@ -45,8 +45,6 @@ class StructureControllerTest extends PmaTestCase /** * Prepares environment for the test. - * - * @return void */ protected function setUp(): void { diff --git a/test/classes/Controllers/Server/BinlogControllerTest.php b/test/classes/Controllers/Server/BinlogControllerTest.php index 88ea78019e..e58a239996 100644 --- a/test/classes/Controllers/Server/BinlogControllerTest.php +++ b/test/classes/Controllers/Server/BinlogControllerTest.php @@ -22,8 +22,6 @@ class BinlogControllerTest extends TestCase { /** * Prepares environment for the test. - * - * @return void */ protected function setUp(): void { diff --git a/test/classes/Controllers/Server/CollationsControllerTest.php b/test/classes/Controllers/Server/CollationsControllerTest.php index 0eacbf841a..659b5fde80 100644 --- a/test/classes/Controllers/Server/CollationsControllerTest.php +++ b/test/classes/Controllers/Server/CollationsControllerTest.php @@ -19,8 +19,6 @@ class CollationsControllerTest extends TestCase { /** * Prepares environment for the test. - * - * @return void */ protected function setUp(): void { diff --git a/test/classes/Controllers/Server/EnginesControllerTest.php b/test/classes/Controllers/Server/EnginesControllerTest.php index 245a521f46..89c9686358 100644 --- a/test/classes/Controllers/Server/EnginesControllerTest.php +++ b/test/classes/Controllers/Server/EnginesControllerTest.php @@ -22,8 +22,6 @@ class EnginesControllerTest extends TestCase { /** * Prepares environment for the test. - * - * @return void */ protected function setUp(): void { diff --git a/test/classes/Controllers/Server/PluginsControllerTest.php b/test/classes/Controllers/Server/PluginsControllerTest.php index 1e168d2c06..9b84b6baca 100644 --- a/test/classes/Controllers/Server/PluginsControllerTest.php +++ b/test/classes/Controllers/Server/PluginsControllerTest.php @@ -21,8 +21,6 @@ class PluginsControllerTest extends TestCase { /** * Prepares environment for the test. - * - * @return void */ protected function setUp(): void { diff --git a/test/classes/Controllers/Server/VariablesControllerTest.php b/test/classes/Controllers/Server/VariablesControllerTest.php index ec1b6896c2..0852856fca 100644 --- a/test/classes/Controllers/Server/VariablesControllerTest.php +++ b/test/classes/Controllers/Server/VariablesControllerTest.php @@ -129,8 +129,6 @@ class VariablesControllerTest extends TestCase /** * Test for formatVariable() - * - * @return void */ public function testFormatVariable(): void { diff --git a/test/classes/Controllers/Table/IndexesControllerTest.php b/test/classes/Controllers/Table/IndexesControllerTest.php index 4080a1027e..fae1d4ca38 100644 --- a/test/classes/Controllers/Table/IndexesControllerTest.php +++ b/test/classes/Controllers/Table/IndexesControllerTest.php @@ -26,8 +26,6 @@ class IndexesControllerTest extends PmaTestCase /** * Setup function for test cases * - * @return void - * * @access protected */ protected function setUp(): void diff --git a/test/classes/Controllers/Table/RelationControllerTest.php b/test/classes/Controllers/Table/RelationControllerTest.php index 539a66152a..4b32880a8d 100644 --- a/test/classes/Controllers/Table/RelationControllerTest.php +++ b/test/classes/Controllers/Table/RelationControllerTest.php @@ -26,8 +26,6 @@ class RelationControllerTest extends PmaTestCase /** * Configures environment - * - * @return void */ protected function setUp(): void { diff --git a/test/classes/Controllers/Table/SearchControllerTest.php b/test/classes/Controllers/Table/SearchControllerTest.php index 4d449aa54a..8eef6acbc0 100644 --- a/test/classes/Controllers/Table/SearchControllerTest.php +++ b/test/classes/Controllers/Table/SearchControllerTest.php @@ -29,8 +29,6 @@ class SearchControllerTest extends PmaTestCase /** * Setup function for test cases * - * @return void - * * @access protected */ protected function setUp(): void diff --git a/test/classes/Controllers/Table/StructureControllerTest.php b/test/classes/Controllers/Table/StructureControllerTest.php index 367e9c33cf..2211c8705b 100644 --- a/test/classes/Controllers/Table/StructureControllerTest.php +++ b/test/classes/Controllers/Table/StructureControllerTest.php @@ -32,8 +32,6 @@ class StructureControllerTest extends PmaTestCase /** * Prepares environment for the test. - * - * @return void */ protected function setUp(): void { diff --git a/test/classes/Controllers/TransformationOverviewControllerTest.php b/test/classes/Controllers/TransformationOverviewControllerTest.php index 9d6b7f6cfc..8d9b34dc5d 100644 --- a/test/classes/Controllers/TransformationOverviewControllerTest.php +++ b/test/classes/Controllers/TransformationOverviewControllerTest.php @@ -20,8 +20,6 @@ class TransformationOverviewControllerTest extends TestCase { /** * Prepares environment for the test. - * - * @return void */ protected function setUp(): void { diff --git a/test/classes/CoreTest.php b/test/classes/CoreTest.php index bb374584c8..5e061b2445 100644 --- a/test/classes/CoreTest.php +++ b/test/classes/CoreTest.php @@ -26,8 +26,6 @@ class CoreTest extends PmaTestCase { /** * Setup for test cases - * - * @return void */ protected function setUp(): void { @@ -294,8 +292,6 @@ class CoreTest extends PmaTestCase * @param bool $include whether the page is going to be included * @param int $expected Expected value * - * @return void - * * @dataProvider providerTestGotoNowhere */ public function testGotoNowhere($page, $whiteList, $include, $expected): void @@ -370,8 +366,6 @@ class CoreTest extends PmaTestCase * @param string $path_info The PATH_INFO value * @param string $expected Expected result * - * @return void - * * @dataProvider providerTestPathInfo */ public function testPathInfo($php_self, $request, $path_info, $expected): void @@ -485,8 +479,6 @@ class CoreTest extends PmaTestCase * @param string $size Size * @param int $expected Expected value * - * @return void - * * @dataProvider providerTestGetRealSize */ public function testGetRealSize($size, $expected): void @@ -550,8 +542,6 @@ class CoreTest extends PmaTestCase * @param string $link URL where to go * @param string $url Expected value * - * @return void - * * @dataProvider providerTestLinkURL */ public function testLinkURL($link, $url): void @@ -731,8 +721,6 @@ class CoreTest extends PmaTestCase * @param string $url URL to test * @param mixed $expected Expected result * - * @return void - * * @dataProvider provideTestIsAllowedDomain */ public function testIsAllowedDomain($url, $expected): void @@ -794,8 +782,6 @@ class CoreTest extends PmaTestCase * @param mixed $type Type * @param mixed $compare Compared value * - * @return void - * * @dataProvider providerTestNoVarType */ public function testNoVarType($var, $type, $compare): void @@ -1122,8 +1108,6 @@ class CoreTest extends PmaTestCase * @param mixed $var Variable * @param mixed $compare Compare * - * @return void - * * @dataProvider provideTestSimilarType */ public function testSimilarType($var, $compare): void @@ -1203,8 +1187,6 @@ class CoreTest extends PmaTestCase * @param string $data Serialized data * @param mixed $expected Expected result * - * @return void - * * @dataProvider provideTestSafeUnserialize */ public function testSafeUnserialize($data, $expected): void @@ -1276,8 +1258,6 @@ class CoreTest extends PmaTestCase * @param string $host Test host name * @param string $expected Expected result * - * @return void - * * @dataProvider provideTestSanitizeMySQLHost */ public function testSanitizeMySQLHost($host, $expected): void diff --git a/test/classes/CreateAddFieldTest.php b/test/classes/CreateAddFieldTest.php index 73c77d4d76..b6f193629c 100644 --- a/test/classes/CreateAddFieldTest.php +++ b/test/classes/CreateAddFieldTest.php @@ -19,8 +19,6 @@ class CreateAddFieldTest extends TestCase /** * Set up for test cases - * - * @return void */ protected function setUp(): void { @@ -33,8 +31,6 @@ class CreateAddFieldTest extends TestCase * @param string $expected Expected result * @param array $request $_REQUEST array * - * @return void - * * @dataProvider providerGetPartitionsDefinition */ public function testGetPartitionsDefinition($expected, $request): void @@ -75,8 +71,6 @@ class CreateAddFieldTest extends TestCase * @param string $table Table name * @param array $request $_REQUEST array * - * @return void - * * @dataProvider providerGetTableCreationQuery */ public function testGetTableCreationQuery($expected, $db, $table, $request): void @@ -116,8 +110,6 @@ class CreateAddFieldTest extends TestCase * @param string $expected Expected result * @param array $request $_REQUEST array * - * @return void - * * @dataProvider providerGetNumberOfFieldsFromRequest */ public function testGetNumberOfFieldsFromRequest($expected, $request): void diff --git a/test/classes/Database/Designer/CommonTest.php b/test/classes/Database/Designer/CommonTest.php index 106983c177..eee997054b 100644 --- a/test/classes/Database/Designer/CommonTest.php +++ b/test/classes/Database/Designer/CommonTest.php @@ -21,8 +21,6 @@ class CommonTest extends TestCase /** * Setup for test cases - * - * @return void */ protected function setUp(): void { diff --git a/test/classes/Database/DesignerTest.php b/test/classes/Database/DesignerTest.php index 0026c5418f..afbc343572 100644 --- a/test/classes/Database/DesignerTest.php +++ b/test/classes/Database/DesignerTest.php @@ -23,8 +23,6 @@ class DesignerTest extends TestCase /** * Setup for test cases - * - * @return void */ protected function setUp(): void { diff --git a/test/classes/Database/QbeTest.php b/test/classes/Database/QbeTest.php index 31ce7e0f45..8e6906929e 100644 --- a/test/classes/Database/QbeTest.php +++ b/test/classes/Database/QbeTest.php @@ -25,8 +25,6 @@ class QbeTest extends PmaTestCase * Sets up the fixture, for example, opens a network connection. * This method is called before a test is executed. * - * @return void - * * @access protected */ protected function setUp(): void @@ -63,8 +61,6 @@ class QbeTest extends PmaTestCase * Tears down the fixture, for example, closes a network connection. * This method is called after a test is executed. * - * @return void - * * @access protected */ protected function tearDown(): void diff --git a/test/classes/Database/SearchTest.php b/test/classes/Database/SearchTest.php index 14cdd1ac04..3408a016a1 100644 --- a/test/classes/Database/SearchTest.php +++ b/test/classes/Database/SearchTest.php @@ -23,8 +23,6 @@ class SearchTest extends PmaTestCase * Sets up the fixture, for example, opens a network connection. * This method is called before a test is executed. * - * @return void - * * @access protected */ protected function setUp(): void @@ -57,8 +55,6 @@ class SearchTest extends PmaTestCase * Tears down the fixture, for example, closes a network connection. * This method is called after a test is executed. * - * @return void - * * @access protected */ protected function tearDown(): void @@ -88,8 +84,6 @@ class SearchTest extends PmaTestCase * @param string $type type * @param string $expected expected result * - * @return void - * * @dataProvider searchTypes */ public function testGetWhereClause($type, $expected): void diff --git a/test/classes/DatabaseInterfaceTest.php b/test/classes/DatabaseInterfaceTest.php index c144f88196..c3b3e14e81 100644 --- a/test/classes/DatabaseInterfaceTest.php +++ b/test/classes/DatabaseInterfaceTest.php @@ -21,8 +21,6 @@ class DatabaseInterfaceTest extends PmaTestCase /** * Configures test parameters. - * - * @return void */ protected function setUp(): void { @@ -38,8 +36,6 @@ class DatabaseInterfaceTest extends PmaTestCase * @param string $string string * @param array $expected expected result * - * @return void - * * @test * @dataProvider currentUserData */ @@ -240,8 +236,6 @@ class DatabaseInterfaceTest extends PmaTestCase * @param array|null $server Server array to test * @param array $expected Expected result * - * @return void - * * @dataProvider connectionParams */ public function testGetConnectionParams($server_cfg, $mode, $server, $expected): void @@ -401,8 +395,6 @@ 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): void @@ -513,8 +505,6 @@ class DatabaseInterfaceTest extends PmaTestCase * @param int $major expected major version * @param bool $upgrade whether upgrade should ne needed * - * @return void - * * @dataProvider versionData */ public function testVersion($version, $expected, $major, $upgrade): void diff --git a/test/classes/Dbal/DbiDummyTest.php b/test/classes/Dbal/DbiDummyTest.php index 8467e41eab..f3e226b459 100644 --- a/test/classes/Dbal/DbiDummyTest.php +++ b/test/classes/Dbal/DbiDummyTest.php @@ -15,8 +15,6 @@ class DbiDummyTest extends TestCase { /** * Configures test parameters. - * - * @return void */ protected function setUp(): void { @@ -56,8 +54,6 @@ class DbiDummyTest extends TestCase * @param string $schema schema name * @param bool $expected expected result * - * @return void - * * @dataProvider schemaData */ public function testSystemSchema($schema, $expected): void @@ -91,8 +87,6 @@ class DbiDummyTest extends TestCase * @param string $message error message * @param string $expected expected result * - * @return void - * * @dataProvider errorData */ public function testFormatError($number, $message, $expected): void diff --git a/test/classes/Dbal/DbiMysqliTest.php b/test/classes/Dbal/DbiMysqliTest.php index 0e0ae763bc..b12a5f456f 100644 --- a/test/classes/Dbal/DbiMysqliTest.php +++ b/test/classes/Dbal/DbiMysqliTest.php @@ -26,8 +26,6 @@ class DbiMysqliTest extends TestCase * Sets up the fixture, for example, opens a network connection. * This method is called before a test is executed. * - * @return void - * * @access protected */ protected function setUp(): void @@ -37,8 +35,6 @@ class DbiMysqliTest extends TestCase /** * Test for selectDb - * - * @return void */ public function testSelectDb(): void { @@ -54,8 +50,6 @@ class DbiMysqliTest extends TestCase /** * Test for realMultiQuery - * - * @return void */ public function testRealMultiQuery(): void { @@ -71,8 +65,6 @@ class DbiMysqliTest extends TestCase /** * Test for fetchArray - * - * @return void */ public function testFetchArray(): void { @@ -88,8 +80,6 @@ class DbiMysqliTest extends TestCase /** * Test for fetchAssoc - * - * @return void */ public function testFetchAssoc(): void { @@ -105,8 +95,6 @@ class DbiMysqliTest extends TestCase /** * Test for fetchRow - * - * @return void */ public function testFetchRow(): void { @@ -122,8 +110,6 @@ class DbiMysqliTest extends TestCase /** * Test for dataSeek - * - * @return void */ public function testDataSeek(): void { @@ -139,8 +125,6 @@ class DbiMysqliTest extends TestCase /** * Test for freeResult - * - * @return void */ public function testFreeResult(): void { @@ -153,8 +137,6 @@ class DbiMysqliTest extends TestCase /** * Test for moreResults - * - * @return void */ public function testMoreResults(): void { @@ -168,8 +150,6 @@ class DbiMysqliTest extends TestCase /** * Test for nextResult - * - * @return void */ public function testNextResult(): void { @@ -183,8 +163,6 @@ class DbiMysqliTest extends TestCase /** * Test for storeResult - * - * @return void */ public function testStoreResult(): void { @@ -198,8 +176,6 @@ class DbiMysqliTest extends TestCase /** * Test for numRows - * - * @return void */ public function testNumRows(): void { @@ -208,8 +184,6 @@ class DbiMysqliTest extends TestCase /** * Test for escapeString - * - * @return void */ public function testEscapeString(): void { diff --git a/test/classes/Display/ChangePasswordTest.php b/test/classes/Display/ChangePasswordTest.php index 318a5569a9..0b7c52f9c1 100644 --- a/test/classes/Display/ChangePasswordTest.php +++ b/test/classes/Display/ChangePasswordTest.php @@ -21,8 +21,6 @@ class ChangePasswordTest extends TestCase { /** * Test for setUp - * - * @return void */ protected function setUp(): void { diff --git a/test/classes/Display/CreateTableTest.php b/test/classes/Display/CreateTableTest.php index 9e883a2e01..8ce9bd0e8f 100644 --- a/test/classes/Display/CreateTableTest.php +++ b/test/classes/Display/CreateTableTest.php @@ -20,8 +20,6 @@ class CreateTableTest extends TestCase { /** * Test for setUp - * - * @return void */ protected function setUp(): void { diff --git a/test/classes/Display/ErrorTest.php b/test/classes/Display/ErrorTest.php index 2d00cd62fa..57e3866c1f 100644 --- a/test/classes/Display/ErrorTest.php +++ b/test/classes/Display/ErrorTest.php @@ -24,8 +24,6 @@ class ErrorTest extends TestCase /** * Test for Error::display * - * @return void - * * @throws Throwable * @throws Twig_Error_Loader * @throws Twig_Error_Runtime @@ -53,8 +51,6 @@ class ErrorTest extends TestCase /** * Test for Error::display * - * @return void - * * @throws Throwable * @throws Twig_Error_Loader * @throws Twig_Error_Runtime diff --git a/test/classes/Display/ExportTest.php b/test/classes/Display/ExportTest.php index d0b011082a..5a74e77dfe 100644 --- a/test/classes/Display/ExportTest.php +++ b/test/classes/Display/ExportTest.php @@ -24,8 +24,6 @@ class ExportTest extends TestCase /** * Test for setUp - * - * @return void */ protected function setUp(): void { diff --git a/test/classes/Display/ResultsTest.php b/test/classes/Display/ResultsTest.php index e989f7be90..69f63517bc 100644 --- a/test/classes/Display/ResultsTest.php +++ b/test/classes/Display/ResultsTest.php @@ -31,8 +31,6 @@ class ResultsTest extends PmaTestCase * Sets up the fixture, for example, opens a network connection. * This method is called before a test is executed. * - * @return void - * * @access protected */ protected function setUp(): void @@ -61,8 +59,6 @@ class ResultsTest extends PmaTestCase * Tears down the fixture, for example, closes a network connection. * This method is called after a test is executed. * - * @return void - * * @access protected */ protected function tearDown(): void @@ -1255,8 +1251,6 @@ class ResultsTest extends PmaTestCase * @param array $analyzed_sql the analyzed query * @param array $output setting value of _setHighlightedColumnGlobalField * - * @return void - * * @dataProvider dataProviderForTestSetHighlightedColumnGlobalField */ public function testSetHighlightedColumnGlobalField($analyzed_sql, $output): void @@ -1331,8 +1325,6 @@ class ResultsTest extends PmaTestCase * @param string $str the string to be tested * @param bool $output return value of _getPartialText * - * @return void - * * @dataProvider dataProviderForTestGetPartialText */ public function testGetPartialText($pftext, $limitChars, $str, $output): void diff --git a/test/classes/Engines/BdbTest.php b/test/classes/Engines/BdbTest.php index b935c09d75..5d827f0c60 100644 --- a/test/classes/Engines/BdbTest.php +++ b/test/classes/Engines/BdbTest.php @@ -21,8 +21,6 @@ class BdbTest extends PmaTestCase * Sets up the fixture, for example, opens a network connection. * This method is called before a test is executed. * - * @return void - * * @access protected */ protected function setUp(): void @@ -35,8 +33,6 @@ class BdbTest extends PmaTestCase * Tears down the fixture, for example, closes a network connection. * This method is called after a test is executed. * - * @return void - * * @access protected */ protected function tearDown(): void diff --git a/test/classes/Engines/BinlogTest.php b/test/classes/Engines/BinlogTest.php index f3a7a9e925..53a8f9d73f 100644 --- a/test/classes/Engines/BinlogTest.php +++ b/test/classes/Engines/BinlogTest.php @@ -21,8 +21,6 @@ class BinlogTest extends PmaTestCase * Sets up the fixture, for example, opens a network connection. * This method is called before a test is executed. * - * @return void - * * @access protected */ protected function setUp(): void @@ -35,8 +33,6 @@ class BinlogTest extends PmaTestCase * Tears down the fixture, for example, closes a network connection. * This method is called after a test is executed. * - * @return void - * * @access protected */ protected function tearDown(): void diff --git a/test/classes/Engines/InnodbTest.php b/test/classes/Engines/InnodbTest.php index d5e83704a0..30136d69c2 100644 --- a/test/classes/Engines/InnodbTest.php +++ b/test/classes/Engines/InnodbTest.php @@ -21,8 +21,6 @@ class InnodbTest extends PmaTestCase * Sets up the fixture, for example, opens a network connection. * This method is called before a test is executed. * - * @return void - * * @access protected */ protected function setUp(): void @@ -35,8 +33,6 @@ class InnodbTest extends PmaTestCase * Tears down the fixture, for example, closes a network connection. * This method is called after a test is executed. * - * @return void - * * @access protected */ protected function tearDown(): void diff --git a/test/classes/Engines/MemoryTest.php b/test/classes/Engines/MemoryTest.php index a739f22718..e43afec3db 100644 --- a/test/classes/Engines/MemoryTest.php +++ b/test/classes/Engines/MemoryTest.php @@ -21,8 +21,6 @@ class MemoryTest extends PmaTestCase * Sets up the fixture, for example, opens a network connection. * This method is called before a test is executed. * - * @return void - * * @access protected */ protected function setUp(): void @@ -35,8 +33,6 @@ class MemoryTest extends PmaTestCase * Tears down the fixture, for example, closes a network connection. * This method is called after a test is executed. * - * @return void - * * @access protected */ protected function tearDown(): void diff --git a/test/classes/Engines/MrgMyisamTest.php b/test/classes/Engines/MrgMyisamTest.php index 746841b026..9e350dd6d9 100644 --- a/test/classes/Engines/MrgMyisamTest.php +++ b/test/classes/Engines/MrgMyisamTest.php @@ -21,8 +21,6 @@ class MrgMyisamTest extends PmaTestCase * Sets up the fixture, for example, opens a network connection. * This method is called before a test is executed. * - * @return void - * * @access protected */ protected function setUp(): void @@ -35,8 +33,6 @@ class MrgMyisamTest extends PmaTestCase * Tears down the fixture, for example, closes a network connection. * This method is called after a test is executed. * - * @return void - * * @access protected */ protected function tearDown(): void diff --git a/test/classes/Engines/MyisamTest.php b/test/classes/Engines/MyisamTest.php index f6235ace01..c171226257 100644 --- a/test/classes/Engines/MyisamTest.php +++ b/test/classes/Engines/MyisamTest.php @@ -21,8 +21,6 @@ class MyisamTest extends PmaTestCase * Sets up the fixture, for example, opens a network connection. * This method is called before a test is executed. * - * @return void - * * @access protected */ protected function setUp(): void @@ -35,8 +33,6 @@ class MyisamTest extends PmaTestCase * Tears down the fixture, for example, closes a network connection. * This method is called after a test is executed. * - * @return void - * * @access protected */ protected function tearDown(): void diff --git a/test/classes/Engines/NdbclusterTest.php b/test/classes/Engines/NdbclusterTest.php index 9400f829cc..ddb1c19f41 100644 --- a/test/classes/Engines/NdbclusterTest.php +++ b/test/classes/Engines/NdbclusterTest.php @@ -21,8 +21,6 @@ class NdbclusterTest extends PmaTestCase * Sets up the fixture, for example, opens a network connection. * This method is called before a test is executed. * - * @return void - * * @access protected */ protected function setUp(): void @@ -35,8 +33,6 @@ class NdbclusterTest extends PmaTestCase * Tears down the fixture, for example, closes a network connection. * This method is called after a test is executed. * - * @return void - * * @access protected */ protected function tearDown(): void diff --git a/test/classes/Engines/PbxtTest.php b/test/classes/Engines/PbxtTest.php index 856cbc20d4..41f18d85de 100644 --- a/test/classes/Engines/PbxtTest.php +++ b/test/classes/Engines/PbxtTest.php @@ -23,8 +23,6 @@ class PbxtTest extends PmaTestCase * Sets up the fixture, for example, opens a network connection. * This method is called before a test is executed. * - * @return void - * * @access protected */ protected function setUp(): void @@ -37,8 +35,6 @@ class PbxtTest extends PmaTestCase * Tears down the fixture, for example, closes a network connection. * This method is called after a test is executed. * - * @return void - * * @access protected */ protected function tearDown(): void @@ -171,8 +167,6 @@ class PbxtTest extends PmaTestCase * @param string $formatted_size the size expression (for example 8MB) * @param string $output Expected output * - * @return void - * * @dataProvider providerFortTestResolveTypeSize */ public function testResolveTypeSize($formatted_size, $output): void diff --git a/test/classes/ErrorHandlerTest.php b/test/classes/ErrorHandlerTest.php index 73710bb4ed..e2b125c0f6 100644 --- a/test/classes/ErrorHandlerTest.php +++ b/test/classes/ErrorHandlerTest.php @@ -25,8 +25,6 @@ class ErrorHandlerTest extends PmaTestCase * Sets up the fixture, for example, opens a network connection. * This method is called before a test is executed. * - * @return void - * * @access protected */ protected function setUp(): void @@ -38,8 +36,6 @@ class ErrorHandlerTest extends PmaTestCase * Tears down the fixture, for example, closes a network connection. * This method is called after a test is executed. * - * @return void - * * @access protected */ protected function tearDown(): void diff --git a/test/classes/ErrorReportTest.php b/test/classes/ErrorReportTest.php index 903ccd6caf..e7bf58c0a3 100644 --- a/test/classes/ErrorReportTest.php +++ b/test/classes/ErrorReportTest.php @@ -301,8 +301,6 @@ class ErrorReportTest extends TestCase * @param string $url The url to test * @param array $result The result * - * @return void - * * @dataProvider urlsToSanitize */ public function testSanitizeUrl(string $url, array $result): void diff --git a/test/classes/ErrorTest.php b/test/classes/ErrorTest.php index 30caf8c232..206ce1691c 100644 --- a/test/classes/ErrorTest.php +++ b/test/classes/ErrorTest.php @@ -25,8 +25,6 @@ class ErrorTest extends PmaTestCase * Sets up the fixture, for example, opens a network connection. * This method is called before a test is executed. * - * @return void - * * @access protected */ protected function setUp(): void @@ -38,8 +36,6 @@ class ErrorTest extends PmaTestCase * Tears down the fixture, for example, closes a network connection. * This method is called after a test is executed. * - * @return void - * * @access protected */ protected function tearDown(): void @@ -84,8 +80,6 @@ class ErrorTest extends PmaTestCase * @param string $file actual * @param string $expected expected * - * @return void - * * @dataProvider filePathProvider */ public function testSetFile($file, $expected): void diff --git a/test/classes/ExportTest.php b/test/classes/ExportTest.php index a9bbbb5d76..27f3b46b68 100644 --- a/test/classes/ExportTest.php +++ b/test/classes/ExportTest.php @@ -23,8 +23,6 @@ class ExportTest extends TestCase /** * Sets up the fixture - * - * @return void */ protected function setUp(): void { diff --git a/test/classes/FileListingTest.php b/test/classes/FileListingTest.php index 7842bdde08..2099c83052 100644 --- a/test/classes/FileListingTest.php +++ b/test/classes/FileListingTest.php @@ -93,8 +93,6 @@ HTML; } /** - * @return void - * * @requires extension bz2 1 */ public function testSupportedDecompressionsFull(): void diff --git a/test/classes/FileTest.php b/test/classes/FileTest.php index 9b4ed4fcf2..54cbbdb455 100644 --- a/test/classes/FileTest.php +++ b/test/classes/FileTest.php @@ -17,8 +17,6 @@ class FileTest extends PmaTestCase { /** * Setup function for test cases - * - * @return void */ protected function setUp(): void { @@ -31,8 +29,6 @@ class FileTest extends PmaTestCase * @param string $file file string * @param string $mime expected mime * - * @return void - * * @dataProvider compressedFiles */ public function testMIME($file, $mime): void @@ -46,8 +42,6 @@ class FileTest extends PmaTestCase * * @param string $file file string * - * @return void - * * @dataProvider compressedFiles */ public function testBinaryContent($file): void @@ -62,8 +56,6 @@ class FileTest extends PmaTestCase * * @param string $file file string * - * @return void - * * @dataProvider compressedFiles * @requires extension bz2 1 * @requires extension zip 1 diff --git a/test/classes/FilesTest.php b/test/classes/FilesTest.php index 106e2a9a92..a4aa8acd3c 100644 --- a/test/classes/FilesTest.php +++ b/test/classes/FilesTest.php @@ -20,8 +20,6 @@ class FilesTest extends TestCase * @param string $name Filename to test * @param string $expected Expected output * - * @return void - * * @dataProvider listScripts */ public function testDynamicJs($name, $expected): void diff --git a/test/classes/FontTest.php b/test/classes/FontTest.php index bf6fc29ed7..ea6eb1b814 100644 --- a/test/classes/FontTest.php +++ b/test/classes/FontTest.php @@ -18,8 +18,6 @@ class FontTest extends PmaTestCase /** * Sets up the fixture - * - * @return void */ protected function setUp(): void { diff --git a/test/classes/FooterTest.php b/test/classes/FooterTest.php index a130a6a015..3c53b17dee 100644 --- a/test/classes/FooterTest.php +++ b/test/classes/FooterTest.php @@ -27,8 +27,6 @@ class FooterTest extends PmaTestCase * Sets up the fixture, for example, opens a network connection. * This method is called before a test is executed. * - * @return void - * * @access protected */ protected function setUp(): void @@ -56,8 +54,6 @@ class FooterTest extends PmaTestCase * Tears down the fixture, for example, closes a network connection. * This method is called after a test is executed. * - * @return void - * * @access protected */ protected function tearDown(): void diff --git a/test/classes/GetCheckboxTest.php b/test/classes/GetCheckboxTest.php index cfaf095e38..c0237557f3 100644 --- a/test/classes/GetCheckboxTest.php +++ b/test/classes/GetCheckboxTest.php @@ -23,8 +23,6 @@ class GetCheckboxTest extends TestCase /** * Sets up the fixture - * - * @return void */ protected function setUp(): void { diff --git a/test/classes/Gis/GisFactoryTest.php b/test/classes/Gis/GisFactoryTest.php index 084e795f49..e25c17c583 100644 --- a/test/classes/Gis/GisFactoryTest.php +++ b/test/classes/Gis/GisFactoryTest.php @@ -20,8 +20,6 @@ class GisFactoryTest extends TestCase * @param string $type geometry type * @param string $geom geometry object * - * @return void - * * @dataProvider providerForTestFactory */ public function testFactory(string $type, string $geom): void diff --git a/test/classes/Gis/GisGeomTestCase.php b/test/classes/Gis/GisGeomTestCase.php index 22b670ade4..cf62a17ad5 100644 --- a/test/classes/Gis/GisGeomTestCase.php +++ b/test/classes/Gis/GisGeomTestCase.php @@ -23,8 +23,6 @@ abstract class GisGeomTestCase extends TestCase * @param int $index index * @param array $params expected output array * - * @return void - * * @dataProvider providerForTestGenerateParams */ public function testGenerateParams($wkt, $index, $params): void @@ -48,8 +46,6 @@ abstract class GisGeomTestCase extends TestCase * @param string $spatial spatial data of a row * @param array $min_max expected results * - * @return void - * * @dataProvider providerForTestScaleRow */ public function testScaleRow($spatial, $min_max): void diff --git a/test/classes/Gis/GisGeometryCollectionTest.php b/test/classes/Gis/GisGeometryCollectionTest.php index 66afb54bbc..139c9de4ae 100644 --- a/test/classes/Gis/GisGeometryCollectionTest.php +++ b/test/classes/Gis/GisGeometryCollectionTest.php @@ -27,8 +27,6 @@ class GisGeometryCollectionTest extends TestCase * Sets up the fixture, for example, opens a network connection. * This method is called before a test is executed. * - * @return void - * * @access protected */ protected function setUp(): void @@ -40,8 +38,6 @@ class GisGeometryCollectionTest extends TestCase * Tears down the fixture, for example, closes a network connection. * This method is called after a test is executed. * - * @return void - * * @access protected */ protected function tearDown(): void @@ -55,8 +51,6 @@ class GisGeometryCollectionTest extends TestCase * @param string $spatial string to parse * @param array $output expected parsed output * - * @return void - * * @dataProvider providerForScaleRow */ public function testScaleRow($spatial, $output): void @@ -93,8 +87,6 @@ class GisGeometryCollectionTest extends TestCase * @param string $empty empty parameter * @param string $output expected output * - * @return void - * * @dataProvider providerForGenerateWkt */ public function testGenerateWkt($gis_data, $index, $empty, $output): void @@ -145,8 +137,6 @@ class GisGeometryCollectionTest extends TestCase * @param string $value string to parse * @param array $output expected parsed output * - * @return void - * * @dataProvider providerForGenerateParams */ public function testGenerateParams($value, $output): void diff --git a/test/classes/Gis/GisGeometryTest.php b/test/classes/Gis/GisGeometryTest.php index d3c40aae05..96a887eca1 100644 --- a/test/classes/Gis/GisGeometryTest.php +++ b/test/classes/Gis/GisGeometryTest.php @@ -21,8 +21,6 @@ class GisGeometryTest extends TestCase * Sets up the fixture, for example, opens a network connection. * This method is called before a test is executed. * - * @return void - * * @access protected */ protected function setUp(): void @@ -34,8 +32,6 @@ class GisGeometryTest extends TestCase * Tears down the fixture, for example, closes a network connection. * This method is called after a test is executed. * - * @return void - * * @access protected */ protected function tearDown(): void @@ -66,8 +62,6 @@ class GisGeometryTest extends TestCase * @param array $min_max Existing min, max values * @param array $output Expected output array * - * @return void - * * @dataProvider providerForTestSetMinMax */ public function testSetMinMax($point_set, $min_max, $output): void @@ -126,8 +120,6 @@ class GisGeometryTest extends TestCase * @param string $value Geometry data * @param string $output Expected output * - * @return void - * * @dataProvider providerForTestGenerateParams */ public function testGenerateParams($value, $output): void @@ -181,8 +173,6 @@ class GisGeometryTest extends TestCase * @param bool $linear If true, as a 1D array, else as a 2D array * @param array $output Expected output * - * @return void - * * @dataProvider providerForTestExtractPoints */ public function testExtractPoints($point_set, $scale_data, $linear, $output): void @@ -297,8 +287,6 @@ class GisGeometryTest extends TestCase * @param array $scale_data data related to scaling * @param string $output expected output * - * @return void - * * @dataProvider providerForTestGetBoundsForOl */ public function testGetBoundsForOl($srid, $scale_data, $output): void @@ -350,8 +338,6 @@ class GisGeometryTest extends TestCase * @param string $srid spatial reference id * @param string $output expected output * - * @return void - * * @dataProvider providerForTestGetPolygonArrayForOpenLayers */ public function testGetPolygonArrayForOpenLayers($polygons, $srid, $output): void diff --git a/test/classes/Gis/GisLineStringTest.php b/test/classes/Gis/GisLineStringTest.php index dce5dbeff6..df96760b58 100644 --- a/test/classes/Gis/GisLineStringTest.php +++ b/test/classes/Gis/GisLineStringTest.php @@ -27,8 +27,6 @@ class GisLineStringTest extends GisGeomTestCase * Sets up the fixture, for example, opens a network connection. * This method is called before a test is executed. * - * @return void - * * @access protected */ protected function setUp(): void @@ -40,8 +38,6 @@ class GisLineStringTest extends GisGeomTestCase * Tears down the fixture, for example, closes a network connection. * This method is called after a test is executed. * - * @return void - * * @access protected */ protected function tearDown(): void diff --git a/test/classes/Gis/GisMultiLineStringTest.php b/test/classes/Gis/GisMultiLineStringTest.php index a381af2dfc..b1d7a57d42 100644 --- a/test/classes/Gis/GisMultiLineStringTest.php +++ b/test/classes/Gis/GisMultiLineStringTest.php @@ -27,8 +27,6 @@ class GisMultiLineStringTest extends GisGeomTestCase * Sets up the fixture, for example, opens a network connection. * This method is called before a test is executed. * - * @return void - * * @access protected */ protected function setUp(): void @@ -40,8 +38,6 @@ class GisMultiLineStringTest extends GisGeomTestCase * Tears down the fixture, for example, closes a network connection. * This method is called after a test is executed. * - * @return void - * * @access protected */ protected function tearDown(): void diff --git a/test/classes/Gis/GisMultiPointTest.php b/test/classes/Gis/GisMultiPointTest.php index 10826c9c80..8667b361d9 100644 --- a/test/classes/Gis/GisMultiPointTest.php +++ b/test/classes/Gis/GisMultiPointTest.php @@ -27,8 +27,6 @@ class GisMultiPointTest extends GisGeomTestCase * Sets up the fixture, for example, opens a network connection. * This method is called before a test is executed. * - * @return void - * * @access protected */ protected function setUp(): void @@ -40,8 +38,6 @@ class GisMultiPointTest extends GisGeomTestCase * Tears down the fixture, for example, closes a network connection. * This method is called after a test is executed. * - * @return void - * * @access protected */ protected function tearDown(): void diff --git a/test/classes/Gis/GisMultiPolygonTest.php b/test/classes/Gis/GisMultiPolygonTest.php index d8cdb065dd..1b4aef998c 100644 --- a/test/classes/Gis/GisMultiPolygonTest.php +++ b/test/classes/Gis/GisMultiPolygonTest.php @@ -27,8 +27,6 @@ class GisMultiPolygonTest extends GisGeomTestCase * Sets up the fixture, for example, opens a network connection. * This method is called before a test is executed. * - * @return void - * * @access protected */ protected function setUp(): void @@ -40,8 +38,6 @@ class GisMultiPolygonTest extends GisGeomTestCase * Tears down the fixture, for example, closes a network connection. * This method is called after a test is executed. * - * @return void - * * @access protected */ protected function tearDown(): void @@ -224,8 +220,6 @@ class GisMultiPolygonTest extends GisGeomTestCase * @param array $row_data array of GIS data * @param string $shape expected shape in WKT * - * @return void - * * @dataProvider providerForTestGetShape */ public function testGetShape($row_data, $shape): void diff --git a/test/classes/Gis/GisPointTest.php b/test/classes/Gis/GisPointTest.php index 24c9585701..bc3afa24ff 100644 --- a/test/classes/Gis/GisPointTest.php +++ b/test/classes/Gis/GisPointTest.php @@ -26,8 +26,6 @@ class GisPointTest extends GisGeomTestCase * Sets up the fixture, for example, opens a network connection. * This method is called before a test is executed. * - * @return void - * * @access protected */ protected function setUp(): void @@ -39,8 +37,6 @@ class GisPointTest extends GisGeomTestCase * Tears down the fixture, for example, closes a network connection. * This method is called after a test is executed. * - * @return void - * * @access protected */ protected function tearDown(): void @@ -109,8 +105,6 @@ class GisPointTest extends GisGeomTestCase * @param array $row_data array of GIS data * @param string $shape expected shape in WKT * - * @return void - * * @dataProvider providerForTestGetShape */ public function testGetShape($row_data, $shape): void diff --git a/test/classes/Gis/GisPolygonTest.php b/test/classes/Gis/GisPolygonTest.php index 0debff1f2a..2abbf897a8 100644 --- a/test/classes/Gis/GisPolygonTest.php +++ b/test/classes/Gis/GisPolygonTest.php @@ -27,8 +27,6 @@ class GisPolygonTest extends GisGeomTestCase * Sets up the fixture, for example, opens a network connection. * This method is called before a test is executed. * - * @return void - * * @access protected */ protected function setUp(): void @@ -40,8 +38,6 @@ class GisPolygonTest extends GisGeomTestCase * Tears down the fixture, for example, closes a network connection. * This method is called after a test is executed. * - * @return void - * * @access protected */ protected function tearDown(): void @@ -208,8 +204,6 @@ class GisPolygonTest extends GisGeomTestCase * @param array $ring array of points forming the ring * @param float $area area of the ring * - * @return void - * * @dataProvider providerForTestArea */ public function testArea($ring, $area): void @@ -292,8 +286,6 @@ class GisPolygonTest extends GisGeomTestCase * @param array $polygon array of points forming the ring * @param bool $isInside output * - * @return void - * * @dataProvider providerForTestIsPointInsidePolygon */ public function testIsPointInsidePolygon($point, $polygon, $isInside): void @@ -375,8 +367,6 @@ class GisPolygonTest extends GisGeomTestCase * * @param array $ring array of points forming the ring * - * @return void - * * @dataProvider providerForTestGetPointOnSurface */ public function testGetPointOnSurface($ring): void @@ -684,8 +674,6 @@ class GisPolygonTest extends GisGeomTestCase * * @param array $ring coordinates of the points in a ring * - * @return void - * * @dataProvider providerForIsOuterRing */ public function testIsOuterRing($ring): void diff --git a/test/classes/HeaderTest.php b/test/classes/HeaderTest.php index 524a584abc..2840173d3f 100644 --- a/test/classes/HeaderTest.php +++ b/test/classes/HeaderTest.php @@ -22,8 +22,6 @@ class HeaderTest extends PmaTestCase { /** * Configures global environment. - * - * @return void */ protected function setUp(): void { diff --git a/test/classes/Html/Forms/Fields/BrowseUploadFileBlockTest.php b/test/classes/Html/Forms/Fields/BrowseUploadFileBlockTest.php index 4c81b2dc84..7948a045c7 100644 --- a/test/classes/Html/Forms/Fields/BrowseUploadFileBlockTest.php +++ b/test/classes/Html/Forms/Fields/BrowseUploadFileBlockTest.php @@ -21,8 +21,6 @@ class BrowseUploadFileBlockTest extends PmaTestCase * @param string $unit Unit * @param string $res Result * - * @return void - * * @covers \PhpMyAdmin\Html\Forms\Fields\BrowseUploadFileBlock::generate * @dataProvider providerGetBrowseUploadFileBlock */ diff --git a/test/classes/Html/Forms/Fields/DropDownTest.php b/test/classes/Html/Forms/Fields/DropDownTest.php index 661995d8d4..6a374c2520 100644 --- a/test/classes/Html/Forms/Fields/DropDownTest.php +++ b/test/classes/Html/Forms/Fields/DropDownTest.php @@ -23,8 +23,6 @@ class DropDownTest extends PmaTestCase /** * Test for getDropdown * - * @return void - * * @throws Throwable * @throws Twig_Error_Loader * @throws Twig_Error_Runtime @@ -54,8 +52,6 @@ class DropDownTest extends PmaTestCase /** * Test for getDropdown * - * @return void - * * @throws Throwable * @throws Twig_Error_Loader * @throws Twig_Error_Runtime @@ -96,8 +92,6 @@ class DropDownTest extends PmaTestCase /** * Test for getDropdown * - * @return void - * * @throws Throwable * @throws Twig_Error_Loader * @throws Twig_Error_Runtime diff --git a/test/classes/Html/Forms/Fields/MaxFileSizeTest.php b/test/classes/Html/Forms/Fields/MaxFileSizeTest.php index 3d03ba295f..f1e133dd95 100644 --- a/test/classes/Html/Forms/Fields/MaxFileSizeTest.php +++ b/test/classes/Html/Forms/Fields/MaxFileSizeTest.php @@ -19,8 +19,6 @@ class MaxFileSizeTest extends PmaTestCase * * @param int $size Size * - * @return void - * * @dataProvider providerGenerate */ public function testGenerate($size): void diff --git a/test/classes/Html/Forms/Fields/RadioListTest.php b/test/classes/Html/Forms/Fields/RadioListTest.php index d3ed5095c9..f56c964114 100644 --- a/test/classes/Html/Forms/Fields/RadioListTest.php +++ b/test/classes/Html/Forms/Fields/RadioListTest.php @@ -22,8 +22,6 @@ class RadioListTest extends PmaTestCase /** * Test for getRadioFields * - * @return void - * * @throws Throwable * @throws Twig_Error_Loader * @throws Twig_Error_Runtime @@ -43,8 +41,6 @@ class RadioListTest extends PmaTestCase /** * Test for getRadioFields * - * @return void - * * @throws Throwable * @throws Twig_Error_Loader * @throws Twig_Error_Runtime @@ -80,8 +76,6 @@ class RadioListTest extends PmaTestCase /** * Test for getRadioFields * - * @return void - * * @throws Throwable * @throws Twig_Error_Loader * @throws Twig_Error_Runtime @@ -125,8 +119,6 @@ class RadioListTest extends PmaTestCase /** * Test for getRadioFields * - * @return void - * * @throws Throwable * @throws Twig_Error_Loader * @throws Twig_Error_Runtime @@ -178,8 +170,6 @@ class RadioListTest extends PmaTestCase /** * Test for getRadioFields * - * @return void - * * @throws Throwable * @throws Twig_Error_Loader * @throws Twig_Error_Runtime @@ -222,8 +212,6 @@ class RadioListTest extends PmaTestCase /** * Test for getRadioFields * - * @return void - * * @throws Throwable * @throws Twig_Error_Loader * @throws Twig_Error_Runtime @@ -269,8 +257,6 @@ class RadioListTest extends PmaTestCase /** * Test for getRadioFields * - * @return void - * * @throws Throwable * @throws Twig_Error_Loader * @throws Twig_Error_Runtime @@ -316,8 +302,6 @@ class RadioListTest extends PmaTestCase /** * Test for getRadioFields * - * @return void - * * @throws Throwable * @throws Twig_Error_Loader * @throws Twig_Error_Runtime diff --git a/test/classes/Html/GeneratorTest.php b/test/classes/Html/GeneratorTest.php index c7f478ab0c..e91971a5ad 100644 --- a/test/classes/Html/GeneratorTest.php +++ b/test/classes/Html/GeneratorTest.php @@ -25,8 +25,6 @@ class GeneratorTest extends PmaTestCase /** * Test for getDbLink * - * @return void - * * @group medium */ public function testGetDbLinkEmpty(): void @@ -38,8 +36,6 @@ class GeneratorTest extends PmaTestCase /** * Test for getDbLink * - * @return void - * * @group medium */ public function testGetDbLinkNull(): void @@ -65,8 +61,6 @@ class GeneratorTest extends PmaTestCase /** * Test for getDbLink - * - * @return void */ public function testGetDbLink(): void { @@ -88,8 +82,6 @@ class GeneratorTest extends PmaTestCase /** * Test for getDbLink - * - * @return void */ public function testGetDbLinkWithSpecialChars(): void { @@ -114,8 +106,6 @@ class GeneratorTest extends PmaTestCase /** * Test for getDivForSliderEffect * - * @return void - * * @throws Throwable * @throws Twig_Error_Loader * @throws Twig_Error_Runtime @@ -139,8 +129,6 @@ class GeneratorTest extends PmaTestCase /** * Test for getDivForSliderEffect * - * @return void - * * @throws Throwable * @throws Twig_Error_Loader * @throws Twig_Error_Runtime @@ -164,8 +152,6 @@ class GeneratorTest extends PmaTestCase /** * Test for getDivForSliderEffect * - * @return void - * * @throws Throwable * @throws Twig_Error_Loader * @throws Twig_Error_Runtime @@ -187,8 +173,6 @@ class GeneratorTest extends PmaTestCase /** * Test for Util::getIcon - * - * @return void */ public function testGetIconWithoutActionLinksMode(): void { @@ -202,8 +186,6 @@ class GeneratorTest extends PmaTestCase /** * Test for Util::getIcon - * - * @return void */ public function testGetIconWithActionLinksMode(): void { @@ -217,8 +199,6 @@ class GeneratorTest extends PmaTestCase /** * Test for Util::getIcon - * - * @return void */ public function testGetIconAlternate(): void { @@ -235,8 +215,6 @@ class GeneratorTest extends PmaTestCase /** * Test for Util::getIcon - * - * @return void */ public function testGetIconWithForceText(): void { @@ -255,8 +233,6 @@ class GeneratorTest extends PmaTestCase /** * Test for showPHPDocumentation - * - * @return void */ public function testShowPHPDocumentation(): void { @@ -283,8 +259,6 @@ class GeneratorTest extends PmaTestCase * @param int $limit limit * @param string $match match * - * @return void - * * @dataProvider linksOrButtons */ public function testLinkOrButton(array $params, $limit, $match): void @@ -355,8 +329,6 @@ class GeneratorTest extends PmaTestCase /** * Test for formatSql * - * @return void - * * @covers \PhpMyAdmin\Html\Generator::formatSql */ public function testFormatSql(): void diff --git a/test/classes/Html/MySQLDocumentationTest.php b/test/classes/Html/MySQLDocumentationTest.php index 1a888a0a5c..d75242e927 100644 --- a/test/classes/Html/MySQLDocumentationTest.php +++ b/test/classes/Html/MySQLDocumentationTest.php @@ -17,8 +17,6 @@ class MySQLDocumentationTest extends PmaTestCase /** * Test for \PhpMyAdmin\Html\MySQLDocumentation::showDocumentation * - * @return void - * * @covers \PhpMyAdmin\Html\MySQLDocumentation::showDocumentation */ public function testShowDocumentation(): void diff --git a/test/classes/ImportTest.php b/test/classes/ImportTest.php index 39859a9537..2e95beaab6 100644 --- a/test/classes/ImportTest.php +++ b/test/classes/ImportTest.php @@ -26,8 +26,6 @@ class ImportTest extends TestCase /** * Prepares environment for the test. - * - * @return void */ protected function setUp(): void { @@ -151,8 +149,6 @@ class ImportTest extends TestCase * @param string $expected Expected result of the function * @param int $num The column number * - * @return void - * * @dataProvider provGetColumnAlphaName */ public function testGetColumnAlphaName($expected, $num): void @@ -201,8 +197,6 @@ class ImportTest extends TestCase * @param int $expected Expected result of the function * @param string|null $name column name(i.e. "A", or "BC", etc.) * - * @return void - * * @dataProvider provGetColumnNumberFromName */ public function testGetColumnNumberFromName($expected, $name): void @@ -251,8 +245,6 @@ class ImportTest extends TestCase * @param int $expected Expected result of the function * @param string|null $size Size of field * - * @return void - * * @dataProvider provGetDecimalPrecision */ public function testGetDecimalPrecision($expected, $size): void @@ -293,8 +285,6 @@ class ImportTest extends TestCase * @param int $expected Expected result of the function * @param string|null $size Size of field * - * @return void - * * @dataProvider provGetDecimalScale */ public function testGetDecimalScale($expected, $size): void @@ -335,8 +325,6 @@ class ImportTest extends TestCase * @param array $expected Expected result of the function * @param string|null $cell Cell content * - * @return void - * * @dataProvider provGetDecimalSize */ public function testGetDecimalSize($expected, $cell): void @@ -392,8 +380,6 @@ class ImportTest extends TestCase * @param string|null $cell String representation of the cell for which a * best-fit type is to be determined * - * @return void - * * @dataProvider provDetectType */ public function testDetectType($expected, $type, $cell): void diff --git a/test/classes/IndexTest.php b/test/classes/IndexTest.php index 916716d41c..6945c34ed6 100644 --- a/test/classes/IndexTest.php +++ b/test/classes/IndexTest.php @@ -18,8 +18,6 @@ class IndexTest extends PmaTestCase /** * Configures parameters. - * - * @return void */ protected function setUp(): void { diff --git a/test/classes/InsertEditTest.php b/test/classes/InsertEditTest.php index 0f120d24a4..19df7d7529 100644 --- a/test/classes/InsertEditTest.php +++ b/test/classes/InsertEditTest.php @@ -30,8 +30,6 @@ class InsertEditTest extends TestCase /** * Setup for test cases - * - * @return void */ protected function setUp(): void { diff --git a/test/classes/IpAllowDenyTest.php b/test/classes/IpAllowDenyTest.php index 2c113dc31a..57ec7abc44 100644 --- a/test/classes/IpAllowDenyTest.php +++ b/test/classes/IpAllowDenyTest.php @@ -22,8 +22,6 @@ class IpAllowDenyTest extends TestCase /** * Prepares environment for the test. - * - * @return void */ protected function setUp(): void { @@ -53,8 +51,6 @@ class IpAllowDenyTest extends TestCase * @param string $expected expected result * @param string $proxyip proxyip * - * @return void - * * @dataProvider proxyIPs */ public function testGetIp($remote, $header, $expected, $proxyip = null): void diff --git a/test/classes/LanguageTest.php b/test/classes/LanguageTest.php index 68e21fc06c..4c9e23b7d7 100644 --- a/test/classes/LanguageTest.php +++ b/test/classes/LanguageTest.php @@ -21,8 +21,6 @@ class LanguageTest extends PmaTestCase /** * Setup for Language tests. - * - * @return void */ protected function setUp(): void { @@ -154,8 +152,6 @@ class LanguageTest extends PmaTestCase * @param string $default Value for default language * @param string $expect Expected language name * - * @return void - * * @dataProvider selectDataProvider */ public function testSelect($lang, $post, $get, $cookie, $accept, $agent, $default, $expect): void @@ -289,8 +285,6 @@ class LanguageTest extends PmaTestCase * * @param string $locale locale name * - * @return void - * * @group large * @dataProvider listLocales */ diff --git a/test/classes/LinterTest.php b/test/classes/LinterTest.php index 5527bc4d8d..ba2b07037b 100644 --- a/test/classes/LinterTest.php +++ b/test/classes/LinterTest.php @@ -80,8 +80,6 @@ class LinterTest extends PmaTestCase * @param array $expected The expected result. * @param string $query The query to be analyzed. * - * @return void - * * @dataProvider lintProvider */ public function testLint($expected, $query): void diff --git a/test/classes/ListDatabaseTest.php b/test/classes/ListDatabaseTest.php index febea6bb7c..b5af4ab2bc 100644 --- a/test/classes/ListDatabaseTest.php +++ b/test/classes/ListDatabaseTest.php @@ -23,8 +23,6 @@ class ListDatabaseTest extends PmaTestCase /** * SetUp for test cases - * - * @return void */ protected function setUp(): void { diff --git a/test/classes/MenuTest.php b/test/classes/MenuTest.php index a0f26daca6..51677f628a 100644 --- a/test/classes/MenuTest.php +++ b/test/classes/MenuTest.php @@ -18,8 +18,6 @@ class MenuTest extends PmaTestCase { /** * Configures global environment. - * - * @return void */ protected function setUp(): void { diff --git a/test/classes/MessageTest.php b/test/classes/MessageTest.php index 177e5df160..b673b1ee18 100644 --- a/test/classes/MessageTest.php +++ b/test/classes/MessageTest.php @@ -24,8 +24,6 @@ class MessageTest extends PmaTestCase * Sets up the fixture, for example, opens a network connection. * This method is called before a test is executed. * - * @return void - * * @access protected */ protected function setUp(): void @@ -37,8 +35,6 @@ class MessageTest extends PmaTestCase * Tears down the fixture, for example, closes a network connection. * This method is called after a test is executed. * - * @return void - * * @access protected */ protected function tearDown(): void @@ -433,8 +429,6 @@ class MessageTest extends PmaTestCase * @param string $actual BB code string * @param string $expected Expected decoded string * - * @return void - * * @dataProvider decodeBBDataProvider */ public function testDecodeBB($actual, $expected): void @@ -633,8 +627,6 @@ HTML * @param int $rows Number of rows * @param string $output Expected string * - * @return void - * * @dataProvider providerAffectedRows */ public function testAffectedRows($rows, $output): void @@ -681,8 +673,6 @@ HTML * @param int $rows Number of rows * @param string $output Expected string * - * @return void - * * @dataProvider providerInsertedRows */ public function testInsertedRows($rows, $output): void @@ -729,8 +719,6 @@ HTML * @param int $rows Number of rows * @param string $output Expected string * - * @return void - * * @dataProvider providerDeletedRows */ public function testDeletedRows($rows, $output): void diff --git a/test/classes/MimeTest.php b/test/classes/MimeTest.php index c0f4643fc0..82fbf73525 100644 --- a/test/classes/MimeTest.php +++ b/test/classes/MimeTest.php @@ -21,8 +21,6 @@ class MimeTest extends TestCase * @param string $test MIME to test * @param string $output Expected output * - * @return void - * * @dataProvider providerForTestDetect */ public function testDetect($test, $output): void diff --git a/test/classes/MultSubmitsTest.php b/test/classes/MultSubmitsTest.php index 9339c034b7..efd89f9da3 100644 --- a/test/classes/MultSubmitsTest.php +++ b/test/classes/MultSubmitsTest.php @@ -21,8 +21,6 @@ class MultSubmitsTest extends TestCase /** * Test for setUp - * - * @return void */ protected function setUp(): void { diff --git a/test/classes/Navigation/NavigationTest.php b/test/classes/Navigation/NavigationTest.php index 5c3482cf2e..0d8f7bb674 100644 --- a/test/classes/Navigation/NavigationTest.php +++ b/test/classes/Navigation/NavigationTest.php @@ -23,8 +23,6 @@ class NavigationTest extends PmaTestCase /** * Sets up the fixture. * - * @return void - * * @access protected */ protected function setUp(): void @@ -49,8 +47,6 @@ class NavigationTest extends PmaTestCase /** * Tears down the fixture. * - * @return void - * * @access protected */ protected function tearDown(): void diff --git a/test/classes/Navigation/NavigationTreeTest.php b/test/classes/Navigation/NavigationTreeTest.php index 1191b62f52..e61a77c124 100644 --- a/test/classes/Navigation/NavigationTreeTest.php +++ b/test/classes/Navigation/NavigationTreeTest.php @@ -22,8 +22,6 @@ class NavigationTreeTest extends PmaTestCase /** * Sets up the fixture. * - * @return void - * * @access protected */ protected function setUp(): void @@ -50,8 +48,6 @@ class NavigationTreeTest extends PmaTestCase /** * Tears down the fixture. * - * @return void - * * @access protected */ protected function tearDown(): void diff --git a/test/classes/Navigation/NodeFactoryTest.php b/test/classes/Navigation/NodeFactoryTest.php index 8084411251..f68486f7d6 100644 --- a/test/classes/Navigation/NodeFactoryTest.php +++ b/test/classes/Navigation/NodeFactoryTest.php @@ -18,8 +18,6 @@ class NodeFactoryTest extends PmaTestCase { /** * SetUp for test cases - * - * @return void */ protected function setUp(): void { diff --git a/test/classes/Navigation/Nodes/NodeColumnContainerTest.php b/test/classes/Navigation/Nodes/NodeColumnContainerTest.php index 3262205b7c..c22fabbeca 100644 --- a/test/classes/Navigation/Nodes/NodeColumnContainerTest.php +++ b/test/classes/Navigation/Nodes/NodeColumnContainerTest.php @@ -16,8 +16,6 @@ class NodeColumnContainerTest extends PmaTestCase { /** * SetUp for test cases - * - * @return void */ protected function setUp(): void { diff --git a/test/classes/Navigation/Nodes/NodeColumnTest.php b/test/classes/Navigation/Nodes/NodeColumnTest.php index 396ad2da13..ff67bafe0d 100644 --- a/test/classes/Navigation/Nodes/NodeColumnTest.php +++ b/test/classes/Navigation/Nodes/NodeColumnTest.php @@ -16,8 +16,6 @@ class NodeColumnTest extends PmaTestCase { /** * SetUp for test cases - * - * @return void */ protected function setUp(): void { diff --git a/test/classes/Navigation/Nodes/NodeDatabaseChildTest.php b/test/classes/Navigation/Nodes/NodeDatabaseChildTest.php index 8b7823f391..601db17b80 100644 --- a/test/classes/Navigation/Nodes/NodeDatabaseChildTest.php +++ b/test/classes/Navigation/Nodes/NodeDatabaseChildTest.php @@ -27,8 +27,6 @@ class NodeDatabaseChildTest extends PmaTestCase /** * Sets up the fixture. * - * @return void - * * @access protected */ protected function setUp(): void @@ -49,8 +47,6 @@ class NodeDatabaseChildTest extends PmaTestCase /** * Tears down the fixture. * - * @return void - * * @access protected */ protected function tearDown(): void diff --git a/test/classes/Navigation/Nodes/NodeDatabaseTest.php b/test/classes/Navigation/Nodes/NodeDatabaseTest.php index fd39c741eb..b682e15eab 100644 --- a/test/classes/Navigation/Nodes/NodeDatabaseTest.php +++ b/test/classes/Navigation/Nodes/NodeDatabaseTest.php @@ -17,8 +17,6 @@ class NodeDatabaseTest extends PmaTestCase { /** * SetUp for test cases - * - * @return void */ protected function setUp(): void { diff --git a/test/classes/Navigation/Nodes/NodeEventContainerTest.php b/test/classes/Navigation/Nodes/NodeEventContainerTest.php index fed168ec49..1417ed1621 100644 --- a/test/classes/Navigation/Nodes/NodeEventContainerTest.php +++ b/test/classes/Navigation/Nodes/NodeEventContainerTest.php @@ -17,8 +17,6 @@ class NodeEventContainerTest extends PmaTestCase { /** * SetUp for test cases - * - * @return void */ protected function setUp(): void { diff --git a/test/classes/Navigation/Nodes/NodeEventTest.php b/test/classes/Navigation/Nodes/NodeEventTest.php index 5611f920b5..f8f72a81ea 100644 --- a/test/classes/Navigation/Nodes/NodeEventTest.php +++ b/test/classes/Navigation/Nodes/NodeEventTest.php @@ -16,8 +16,6 @@ class NodeEventTest extends PmaTestCase { /** * SetUp for test cases - * - * @return void */ protected function setUp(): void { diff --git a/test/classes/Navigation/Nodes/NodeFunctionContainerTest.php b/test/classes/Navigation/Nodes/NodeFunctionContainerTest.php index 569675c7ec..77a3f16872 100644 --- a/test/classes/Navigation/Nodes/NodeFunctionContainerTest.php +++ b/test/classes/Navigation/Nodes/NodeFunctionContainerTest.php @@ -16,8 +16,6 @@ class NodeFunctionContainerTest extends PmaTestCase { /** * SetUp for test cases - * - * @return void */ protected function setUp(): void { diff --git a/test/classes/Navigation/Nodes/NodeFunctionTest.php b/test/classes/Navigation/Nodes/NodeFunctionTest.php index c5ae9a66c8..e9cc8bbd7e 100644 --- a/test/classes/Navigation/Nodes/NodeFunctionTest.php +++ b/test/classes/Navigation/Nodes/NodeFunctionTest.php @@ -16,8 +16,6 @@ class NodeFunctionTest extends PmaTestCase { /** * SetUp for test cases - * - * @return void */ protected function setUp(): void { diff --git a/test/classes/Navigation/Nodes/NodeIndexContainerTest.php b/test/classes/Navigation/Nodes/NodeIndexContainerTest.php index 4351dc35d3..844b7763d5 100644 --- a/test/classes/Navigation/Nodes/NodeIndexContainerTest.php +++ b/test/classes/Navigation/Nodes/NodeIndexContainerTest.php @@ -16,8 +16,6 @@ class NodeIndexContainerTest extends PmaTestCase { /** * SetUp for test cases - * - * @return void */ protected function setUp(): void { diff --git a/test/classes/Navigation/Nodes/NodeIndexTest.php b/test/classes/Navigation/Nodes/NodeIndexTest.php index 60b9a542fd..ce52d6d838 100644 --- a/test/classes/Navigation/Nodes/NodeIndexTest.php +++ b/test/classes/Navigation/Nodes/NodeIndexTest.php @@ -16,8 +16,6 @@ class NodeIndexTest extends PmaTestCase { /** * SetUp for test cases - * - * @return void */ protected function setUp(): void { diff --git a/test/classes/Navigation/Nodes/NodeProcedureContainerTest.php b/test/classes/Navigation/Nodes/NodeProcedureContainerTest.php index 53af6fbed5..3c9843097a 100644 --- a/test/classes/Navigation/Nodes/NodeProcedureContainerTest.php +++ b/test/classes/Navigation/Nodes/NodeProcedureContainerTest.php @@ -16,8 +16,6 @@ class NodeProcedureContainerTest extends PmaTestCase { /** * SetUp for test cases - * - * @return void */ protected function setUp(): void { diff --git a/test/classes/Navigation/Nodes/NodeProcedureTest.php b/test/classes/Navigation/Nodes/NodeProcedureTest.php index a3449ee473..f2203111a2 100644 --- a/test/classes/Navigation/Nodes/NodeProcedureTest.php +++ b/test/classes/Navigation/Nodes/NodeProcedureTest.php @@ -16,8 +16,6 @@ class NodeProcedureTest extends PmaTestCase { /** * SetUp for test cases - * - * @return void */ protected function setUp(): void { diff --git a/test/classes/Navigation/Nodes/NodeTableContainerTest.php b/test/classes/Navigation/Nodes/NodeTableContainerTest.php index 5d23beebba..6261a12599 100644 --- a/test/classes/Navigation/Nodes/NodeTableContainerTest.php +++ b/test/classes/Navigation/Nodes/NodeTableContainerTest.php @@ -16,8 +16,6 @@ class NodeTableContainerTest extends PmaTestCase { /** * SetUp for test cases - * - * @return void */ protected function setUp(): void { diff --git a/test/classes/Navigation/Nodes/NodeTableTest.php b/test/classes/Navigation/Nodes/NodeTableTest.php index 1489caaefb..c24ef56aed 100644 --- a/test/classes/Navigation/Nodes/NodeTableTest.php +++ b/test/classes/Navigation/Nodes/NodeTableTest.php @@ -16,8 +16,6 @@ class NodeTableTest extends PmaTestCase { /** * SetUp for test cases - * - * @return void */ protected function setUp(): void { @@ -57,8 +55,6 @@ class NodeTableTest extends PmaTestCase * @param string $target target of the icon * @param string $imageName name of the image that should be set * - * @return void - * * @dataProvider providerForTestIcon */ public function testIcon($target, $imageName): void diff --git a/test/classes/Navigation/Nodes/NodeTest.php b/test/classes/Navigation/Nodes/NodeTest.php index 082e157561..f84cd7900f 100644 --- a/test/classes/Navigation/Nodes/NodeTest.php +++ b/test/classes/Navigation/Nodes/NodeTest.php @@ -18,8 +18,6 @@ class NodeTest extends PmaTestCase { /** * SetUp for test cases - * - * @return void */ protected function setUp(): void { diff --git a/test/classes/Navigation/Nodes/NodeTriggerContainerTest.php b/test/classes/Navigation/Nodes/NodeTriggerContainerTest.php index e9a35150fb..9e23a338b8 100644 --- a/test/classes/Navigation/Nodes/NodeTriggerContainerTest.php +++ b/test/classes/Navigation/Nodes/NodeTriggerContainerTest.php @@ -16,8 +16,6 @@ class NodeTriggerContainerTest extends PmaTestCase { /** * SetUp for test cases - * - * @return void */ protected function setUp(): void { diff --git a/test/classes/Navigation/Nodes/NodeTriggerTest.php b/test/classes/Navigation/Nodes/NodeTriggerTest.php index 8f15c6dcdd..4acd4ff470 100644 --- a/test/classes/Navigation/Nodes/NodeTriggerTest.php +++ b/test/classes/Navigation/Nodes/NodeTriggerTest.php @@ -16,8 +16,6 @@ class NodeTriggerTest extends PmaTestCase { /** * SetUp for test cases - * - * @return void */ protected function setUp(): void { diff --git a/test/classes/Navigation/Nodes/NodeViewContainerTest.php b/test/classes/Navigation/Nodes/NodeViewContainerTest.php index 8b6a97df92..4307d36495 100644 --- a/test/classes/Navigation/Nodes/NodeViewContainerTest.php +++ b/test/classes/Navigation/Nodes/NodeViewContainerTest.php @@ -16,8 +16,6 @@ class NodeViewContainerTest extends PmaTestCase { /** * SetUp for test cases - * - * @return void */ protected function setUp(): void { diff --git a/test/classes/Navigation/Nodes/NodeViewTest.php b/test/classes/Navigation/Nodes/NodeViewTest.php index bd8cd4f506..2b263f0827 100644 --- a/test/classes/Navigation/Nodes/NodeViewTest.php +++ b/test/classes/Navigation/Nodes/NodeViewTest.php @@ -17,8 +17,6 @@ class NodeViewTest extends PmaTestCase { /** * SetUp for test cases - * - * @return void */ protected function setUp(): void { diff --git a/test/classes/NormalizationTest.php b/test/classes/NormalizationTest.php index 63c75ec0cb..4fac842fca 100644 --- a/test/classes/NormalizationTest.php +++ b/test/classes/NormalizationTest.php @@ -28,8 +28,6 @@ class NormalizationTest extends TestCase /** * prepares environment for tests - * - * @return void */ protected function setUp(): void { diff --git a/test/classes/OperationsTest.php b/test/classes/OperationsTest.php index e03a1534d5..d42275e11a 100644 --- a/test/classes/OperationsTest.php +++ b/test/classes/OperationsTest.php @@ -22,8 +22,6 @@ class OperationsTest extends TestCase /** * Set up global environment. - * - * @return void */ protected function setUp(): void { diff --git a/test/classes/PdfTest.php b/test/classes/PdfTest.php index 329e822008..c139e7de94 100644 --- a/test/classes/PdfTest.php +++ b/test/classes/PdfTest.php @@ -16,8 +16,6 @@ class PdfTest extends PmaTestCase { /** * SetUp for test cases - * - * @return void */ protected function setUp(): void { diff --git a/test/classes/Plugins/Auth/AuthenticationConfigTest.php b/test/classes/Plugins/Auth/AuthenticationConfigTest.php index bd6d1b2c6b..217f4c08ff 100644 --- a/test/classes/Plugins/Auth/AuthenticationConfigTest.php +++ b/test/classes/Plugins/Auth/AuthenticationConfigTest.php @@ -22,8 +22,6 @@ class AuthenticationConfigTest extends PmaTestCase /** * Configures global environment. - * - * @return void */ protected function setUp(): void { @@ -40,8 +38,6 @@ class AuthenticationConfigTest extends PmaTestCase /** * tearDown for test cases - * - * @return void */ protected function tearDown(): void { diff --git a/test/classes/Plugins/Auth/AuthenticationCookieTest.php b/test/classes/Plugins/Auth/AuthenticationCookieTest.php index e0114ba20b..09d53ddf09 100644 --- a/test/classes/Plugins/Auth/AuthenticationCookieTest.php +++ b/test/classes/Plugins/Auth/AuthenticationCookieTest.php @@ -33,8 +33,6 @@ class AuthenticationCookieTest extends PmaTestCase /** * Configures global environment. - * - * @return void */ protected function setUp(): void { @@ -52,8 +50,6 @@ class AuthenticationCookieTest extends PmaTestCase /** * tearDown for test cases - * - * @return void */ protected function tearDown(): void { @@ -1074,8 +1070,6 @@ class AuthenticationCookieTest extends PmaTestCase * @param string $mac mac * @param string $aes aes * - * @return void - * * @dataProvider secretsProvider */ public function testMACSecretSplit($secret, $mac, $aes): void @@ -1093,8 +1087,6 @@ class AuthenticationCookieTest extends PmaTestCase * @param string $mac mac * @param string $aes aes * - * @return void - * * @dataProvider secretsProvider */ public function testAESSecretSplit($secret, $mac, $aes): void @@ -1224,8 +1216,6 @@ class AuthenticationCookieTest extends PmaTestCase * @param array $rules rules * @param string $expected expected result * - * @return void - * * @dataProvider checkRulesProvider */ public function testCheckRules($user, $pass, $ip, $root, $nopass, $rules, $expected): void diff --git a/test/classes/Plugins/Auth/AuthenticationHttpTest.php b/test/classes/Plugins/Auth/AuthenticationHttpTest.php index 0c8895f091..228dba0025 100644 --- a/test/classes/Plugins/Auth/AuthenticationHttpTest.php +++ b/test/classes/Plugins/Auth/AuthenticationHttpTest.php @@ -23,8 +23,6 @@ class AuthenticationHttpTest extends PmaTestCase /** * Configures global environment. - * - * @return void */ protected function setUp(): void { @@ -44,8 +42,6 @@ class AuthenticationHttpTest extends PmaTestCase /** * tearDown for test cases - * - * @return void */ protected function tearDown(): void { diff --git a/test/classes/Plugins/Auth/AuthenticationSignonTest.php b/test/classes/Plugins/Auth/AuthenticationSignonTest.php index b139133da7..33b61b330a 100644 --- a/test/classes/Plugins/Auth/AuthenticationSignonTest.php +++ b/test/classes/Plugins/Auth/AuthenticationSignonTest.php @@ -26,8 +26,6 @@ class AuthenticationSignonTest extends PmaTestCase /** * Configures global environment. - * - * @return void */ protected function setUp(): void { @@ -42,8 +40,6 @@ class AuthenticationSignonTest extends PmaTestCase /** * tearDown for test cases - * - * @return void */ protected function tearDown(): void { diff --git a/test/classes/Plugins/Export/ExportCodegenTest.php b/test/classes/Plugins/Export/ExportCodegenTest.php index de4fa09645..e869384664 100644 --- a/test/classes/Plugins/Export/ExportCodegenTest.php +++ b/test/classes/Plugins/Export/ExportCodegenTest.php @@ -26,8 +26,6 @@ class ExportCodegenTest extends PmaTestCase /** * Configures global environment. - * - * @return void */ protected function setUp(): void { @@ -37,8 +35,6 @@ class ExportCodegenTest extends PmaTestCase /** * tearDown for test cases - * - * @return void */ protected function tearDown(): void { diff --git a/test/classes/Plugins/Export/ExportCsvTest.php b/test/classes/Plugins/Export/ExportCsvTest.php index 3b8b94ac60..dffe9f4af5 100644 --- a/test/classes/Plugins/Export/ExportCsvTest.php +++ b/test/classes/Plugins/Export/ExportCsvTest.php @@ -26,8 +26,6 @@ class ExportCsvTest extends PmaTestCase /** * Configures global environment. - * - * @return void */ protected function setUp(): void { @@ -37,8 +35,6 @@ class ExportCsvTest extends PmaTestCase /** * tearDown for test cases - * - * @return void */ protected function tearDown(): void { diff --git a/test/classes/Plugins/Export/ExportExcelTest.php b/test/classes/Plugins/Export/ExportExcelTest.php index 1ee2e51c3a..127af23dd3 100644 --- a/test/classes/Plugins/Export/ExportExcelTest.php +++ b/test/classes/Plugins/Export/ExportExcelTest.php @@ -23,8 +23,6 @@ class ExportExcelTest extends PmaTestCase /** * Configures global environment. - * - * @return void */ protected function setUp(): void { @@ -34,8 +32,6 @@ class ExportExcelTest extends PmaTestCase /** * tearDown for test cases - * - * @return void */ protected function tearDown(): void { diff --git a/test/classes/Plugins/Export/ExportHtmlwordTest.php b/test/classes/Plugins/Export/ExportHtmlwordTest.php index cac0a59466..6507fccbe4 100644 --- a/test/classes/Plugins/Export/ExportHtmlwordTest.php +++ b/test/classes/Plugins/Export/ExportHtmlwordTest.php @@ -28,8 +28,6 @@ class ExportHtmlwordTest extends PmaTestCase /** * Configures global environment. - * - * @return void */ protected function setUp(): void { @@ -44,8 +42,6 @@ class ExportHtmlwordTest extends PmaTestCase /** * tearDown for test cases - * - * @return void */ protected function tearDown(): void { diff --git a/test/classes/Plugins/Export/ExportJsonTest.php b/test/classes/Plugins/Export/ExportJsonTest.php index 47e2d1ba2d..71b3ea7fec 100644 --- a/test/classes/Plugins/Export/ExportJsonTest.php +++ b/test/classes/Plugins/Export/ExportJsonTest.php @@ -24,8 +24,6 @@ class ExportJsonTest extends PmaTestCase /** * Configures global environment. - * - * @return void */ protected function setUp(): void { @@ -40,8 +38,6 @@ class ExportJsonTest extends PmaTestCase /** * tearDown for test cases - * - * @return void */ protected function tearDown(): void { diff --git a/test/classes/Plugins/Export/ExportLatexTest.php b/test/classes/Plugins/Export/ExportLatexTest.php index 2598fe9e34..8dc9580ee6 100644 --- a/test/classes/Plugins/Export/ExportLatexTest.php +++ b/test/classes/Plugins/Export/ExportLatexTest.php @@ -26,8 +26,6 @@ class ExportLatexTest extends PmaTestCase /** * Configures global environment. - * - * @return void */ protected function setUp(): void { @@ -48,8 +46,6 @@ class ExportLatexTest extends PmaTestCase /** * tearDown for test cases - * - * @return void */ protected function tearDown(): void { diff --git a/test/classes/Plugins/Export/ExportMediawikiTest.php b/test/classes/Plugins/Export/ExportMediawikiTest.php index aa6b95e3f8..341848d2f4 100644 --- a/test/classes/Plugins/Export/ExportMediawikiTest.php +++ b/test/classes/Plugins/Export/ExportMediawikiTest.php @@ -26,8 +26,6 @@ class ExportMediawikiTest extends PmaTestCase /** * Configures global environment. - * - * @return void */ protected function setUp(): void { @@ -42,8 +40,6 @@ class ExportMediawikiTest extends PmaTestCase /** * tearDown for test cases - * - * @return void */ protected function tearDown(): void { diff --git a/test/classes/Plugins/Export/ExportOdsTest.php b/test/classes/Plugins/Export/ExportOdsTest.php index 1571fad1fb..174825e403 100644 --- a/test/classes/Plugins/Export/ExportOdsTest.php +++ b/test/classes/Plugins/Export/ExportOdsTest.php @@ -25,8 +25,6 @@ class ExportOdsTest extends PmaTestCase /** * Configures global environment. - * - * @return void */ protected function setUp(): void { @@ -41,8 +39,6 @@ class ExportOdsTest extends PmaTestCase /** * tearDown for test cases - * - * @return void */ protected function tearDown(): void { diff --git a/test/classes/Plugins/Export/ExportOdtTest.php b/test/classes/Plugins/Export/ExportOdtTest.php index 46efbfc48f..3f67e0b0b1 100644 --- a/test/classes/Plugins/Export/ExportOdtTest.php +++ b/test/classes/Plugins/Export/ExportOdtTest.php @@ -26,8 +26,6 @@ class ExportOdtTest extends PmaTestCase /** * Configures global environment. - * - * @return void */ protected function setUp(): void { @@ -46,8 +44,6 @@ class ExportOdtTest extends PmaTestCase /** * tearDown for test cases - * - * @return void */ protected function tearDown(): void { diff --git a/test/classes/Plugins/Export/ExportPdfTest.php b/test/classes/Plugins/Export/ExportPdfTest.php index 179e870999..8890f4110f 100644 --- a/test/classes/Plugins/Export/ExportPdfTest.php +++ b/test/classes/Plugins/Export/ExportPdfTest.php @@ -24,8 +24,6 @@ class ExportPdfTest extends PmaTestCase /** * Configures global environment. - * - * @return void */ protected function setUp(): void { @@ -40,8 +38,6 @@ class ExportPdfTest extends PmaTestCase /** * tearDown for test cases - * - * @return void */ protected function tearDown(): void { diff --git a/test/classes/Plugins/Export/ExportPhparrayTest.php b/test/classes/Plugins/Export/ExportPhparrayTest.php index b6cca8e525..532791e73b 100644 --- a/test/classes/Plugins/Export/ExportPhparrayTest.php +++ b/test/classes/Plugins/Export/ExportPhparrayTest.php @@ -26,8 +26,6 @@ class ExportPhparrayTest extends PmaTestCase /** * Configures global environment. - * - * @return void */ protected function setUp(): void { @@ -42,8 +40,6 @@ class ExportPhparrayTest extends PmaTestCase /** * tearDown for test cases - * - * @return void */ protected function tearDown(): void { diff --git a/test/classes/Plugins/Export/ExportSqlTest.php b/test/classes/Plugins/Export/ExportSqlTest.php index fd16b894ab..3b97bac9d5 100644 --- a/test/classes/Plugins/Export/ExportSqlTest.php +++ b/test/classes/Plugins/Export/ExportSqlTest.php @@ -29,8 +29,6 @@ class ExportSqlTest extends PmaTestCase /** * Configures global environment. - * - * @return void */ protected function setUp(): void { @@ -49,8 +47,6 @@ class ExportSqlTest extends PmaTestCase /** * tearDown for test cases - * - * @return void */ protected function tearDown(): void { diff --git a/test/classes/Plugins/Export/ExportTexytextTest.php b/test/classes/Plugins/Export/ExportTexytextTest.php index 54bd778f38..588d84f754 100644 --- a/test/classes/Plugins/Export/ExportTexytextTest.php +++ b/test/classes/Plugins/Export/ExportTexytextTest.php @@ -27,8 +27,6 @@ class ExportTexytextTest extends PmaTestCase /** * Configures global environment. - * - * @return void */ protected function setUp(): void { @@ -46,8 +44,6 @@ class ExportTexytextTest extends PmaTestCase /** * tearDown for test cases - * - * @return void */ protected function tearDown(): void { diff --git a/test/classes/Plugins/Export/ExportXmlTest.php b/test/classes/Plugins/Export/ExportXmlTest.php index 2a281a9b23..8dd0c87661 100644 --- a/test/classes/Plugins/Export/ExportXmlTest.php +++ b/test/classes/Plugins/Export/ExportXmlTest.php @@ -27,8 +27,6 @@ class ExportXmlTest extends PmaTestCase /** * Configures global environment. - * - * @return void */ protected function setUp(): void { @@ -47,8 +45,6 @@ class ExportXmlTest extends PmaTestCase /** * tearDown for test cases - * - * @return void */ protected function tearDown(): void { diff --git a/test/classes/Plugins/Export/ExportYamlTest.php b/test/classes/Plugins/Export/ExportYamlTest.php index 981393e9f9..b7bf22051c 100644 --- a/test/classes/Plugins/Export/ExportYamlTest.php +++ b/test/classes/Plugins/Export/ExportYamlTest.php @@ -26,8 +26,6 @@ class ExportYamlTest extends PmaTestCase /** * Configures global environment. - * - * @return void */ protected function setUp(): void { @@ -43,8 +41,6 @@ class ExportYamlTest extends PmaTestCase /** * tearDown for test cases - * - * @return void */ protected function tearDown(): void { diff --git a/test/classes/Plugins/Export/Helpers/TablePropertyTest.php b/test/classes/Plugins/Export/Helpers/TablePropertyTest.php index f06a05d974..19fee8461a 100644 --- a/test/classes/Plugins/Export/Helpers/TablePropertyTest.php +++ b/test/classes/Plugins/Export/Helpers/TablePropertyTest.php @@ -18,8 +18,6 @@ class TablePropertyTest extends PmaTestCase /** * Configures global environment. - * - * @return void */ protected function setUp(): void { @@ -37,8 +35,6 @@ class TablePropertyTest extends PmaTestCase /** * tearDown for test cases - * - * @return void */ protected function tearDown(): void { @@ -111,8 +107,6 @@ class TablePropertyTest extends PmaTestCase * @param string $nullable nullable value * @param string $expected expected output * - * @return void - * * @dataProvider isNotNullProvider */ public function testIsNotNull($nullable, $expected): void @@ -154,8 +148,6 @@ class TablePropertyTest extends PmaTestCase * @param string $key key value * @param string $expected expected output * - * @return void - * * @dataProvider isUniqueProvider */ public function testIsUnique($key, $expected): void @@ -205,8 +197,6 @@ class TablePropertyTest extends PmaTestCase * @param string $type type value * @param string $expected expected output * - * @return void - * * @dataProvider getDotNetPrimitiveTypeProvider */ public function testGetDotNetPrimitiveType($type, $expected): void @@ -280,8 +270,6 @@ class TablePropertyTest extends PmaTestCase * @param string $type type value * @param string $expected expected output * - * @return void - * * @dataProvider getDotNetObjectTypeProvider */ public function testGetDotNetObjectType($type, $expected): void diff --git a/test/classes/Plugins/Import/ImportCsvTest.php b/test/classes/Plugins/Import/ImportCsvTest.php index b43c14b192..81edd2f6d6 100644 --- a/test/classes/Plugins/Import/ImportCsvTest.php +++ b/test/classes/Plugins/Import/ImportCsvTest.php @@ -26,8 +26,6 @@ class ImportCsvTest extends PmaTestCase * Sets up the fixture, for example, opens a network connection. * This method is called before a test is executed. * - * @return void - * * @access protected */ protected function setUp(): void @@ -72,8 +70,6 @@ class ImportCsvTest extends PmaTestCase * Tears down the fixture, for example, closes a network connection. * This method is called after a test is executed. * - * @return void - * * @access protected */ protected function tearDown(): void diff --git a/test/classes/Plugins/Import/ImportLdiTest.php b/test/classes/Plugins/Import/ImportLdiTest.php index b08959944f..9dd58f0f27 100644 --- a/test/classes/Plugins/Import/ImportLdiTest.php +++ b/test/classes/Plugins/Import/ImportLdiTest.php @@ -30,8 +30,6 @@ class ImportLdiTest extends PmaTestCase * Sets up the fixture, for example, opens a network connection. * This method is called before a test is executed. * - * @return void - * * @access protected */ protected function setUp(): void @@ -75,8 +73,6 @@ class ImportLdiTest extends PmaTestCase * Tears down the fixture, for example, closes a network connection. * This method is called after a test is executed. * - * @return void - * * @access protected */ protected function tearDown(): void diff --git a/test/classes/Plugins/Import/ImportMediawikiTest.php b/test/classes/Plugins/Import/ImportMediawikiTest.php index 253c31e2f1..67e9302c6a 100644 --- a/test/classes/Plugins/Import/ImportMediawikiTest.php +++ b/test/classes/Plugins/Import/ImportMediawikiTest.php @@ -22,8 +22,6 @@ class ImportMediawikiTest extends PmaTestCase * Sets up the fixture, for example, opens a network connection. * This method is called before a test is executed. * - * @return void - * * @access protected */ protected function setUp(): void @@ -50,8 +48,6 @@ class ImportMediawikiTest extends PmaTestCase * Tears down the fixture, for example, closes a network connection. * This method is called after a test is executed. * - * @return void - * * @access protected */ protected function tearDown(): void diff --git a/test/classes/Plugins/Import/ImportOdsTest.php b/test/classes/Plugins/Import/ImportOdsTest.php index 96f8915cfb..ccb5b31cc7 100644 --- a/test/classes/Plugins/Import/ImportOdsTest.php +++ b/test/classes/Plugins/Import/ImportOdsTest.php @@ -22,8 +22,6 @@ class ImportOdsTest extends PmaTestCase * Sets up the fixture, for example, opens a network connection. * This method is called before a test is executed. * - * @return void - * * @access protected */ protected function setUp(): void @@ -59,8 +57,6 @@ class ImportOdsTest extends PmaTestCase * Tears down the fixture, for example, closes a network connection. * This method is called after a test is executed. * - * @return void - * * @access protected */ protected function tearDown(): void diff --git a/test/classes/Plugins/Import/ImportShpTest.php b/test/classes/Plugins/Import/ImportShpTest.php index 9fe99cd019..da9ca50786 100644 --- a/test/classes/Plugins/Import/ImportShpTest.php +++ b/test/classes/Plugins/Import/ImportShpTest.php @@ -28,8 +28,6 @@ class ImportShpTest extends PmaTestCase * Sets up the fixture, for example, opens a network connection. * This method is called before a test is executed. * - * @return void - * * @access protected */ protected function setUp(): void @@ -84,8 +82,6 @@ class ImportShpTest extends PmaTestCase * Tears down the fixture, for example, closes a network connection. * This method is called after a test is executed. * - * @return void - * * @access protected */ protected function tearDown(): void diff --git a/test/classes/Plugins/Import/ImportSqlTest.php b/test/classes/Plugins/Import/ImportSqlTest.php index a575697101..c91232906f 100644 --- a/test/classes/Plugins/Import/ImportSqlTest.php +++ b/test/classes/Plugins/Import/ImportSqlTest.php @@ -22,8 +22,6 @@ class ImportSqlTest extends PmaTestCase * Sets up the fixture, for example, opens a network connection. * This method is called before a test is executed. * - * @return void - * * @access protected */ protected function setUp(): void @@ -51,8 +49,6 @@ class ImportSqlTest extends PmaTestCase * Tears down the fixture, for example, closes a network connection. * This method is called after a test is executed. * - * @return void - * * @access protected */ protected function tearDown(): void diff --git a/test/classes/Plugins/Import/ImportXmlTest.php b/test/classes/Plugins/Import/ImportXmlTest.php index 68c3b445af..2c8ba32ca1 100644 --- a/test/classes/Plugins/Import/ImportXmlTest.php +++ b/test/classes/Plugins/Import/ImportXmlTest.php @@ -22,8 +22,6 @@ class ImportXmlTest extends PmaTestCase * Sets up the fixture, for example, opens a network connection. * This method is called before a test is executed. * - * @return void - * * @access protected */ protected function setUp(): void @@ -52,8 +50,6 @@ class ImportXmlTest extends PmaTestCase * Tears down the fixture, for example, closes a network connection. * This method is called after a test is executed. * - * @return void - * * @access protected */ protected function tearDown(): void diff --git a/test/classes/Plugins/Schema/DiaRelationSchemaTest.php b/test/classes/Plugins/Schema/DiaRelationSchemaTest.php index 413aa8be4e..ba3d1fb314 100644 --- a/test/classes/Plugins/Schema/DiaRelationSchemaTest.php +++ b/test/classes/Plugins/Schema/DiaRelationSchemaTest.php @@ -22,8 +22,6 @@ class DiaRelationSchemaTest extends PmaTestCase * Sets up the fixture, for example, opens a network connection. * This method is called before a test is executed. * - * @return void - * * @access protected */ protected function setUp(): void @@ -127,8 +125,6 @@ class DiaRelationSchemaTest extends PmaTestCase * Tears down the fixture, for example, closes a network connection. * This method is called after a test is executed. * - * @return void - * * @access protected */ protected function tearDown(): void diff --git a/test/classes/Plugins/Schema/EpsRelationSchemaTest.php b/test/classes/Plugins/Schema/EpsRelationSchemaTest.php index 2b6c3d9d3e..05d652e29c 100644 --- a/test/classes/Plugins/Schema/EpsRelationSchemaTest.php +++ b/test/classes/Plugins/Schema/EpsRelationSchemaTest.php @@ -22,8 +22,6 @@ class EpsRelationSchemaTest extends PmaTestCase * Sets up the fixture, for example, opens a network connection. * This method is called before a test is executed. * - * @return void - * * @access protected */ protected function setUp(): void @@ -128,8 +126,6 @@ class EpsRelationSchemaTest extends PmaTestCase * Tears down the fixture, for example, closes a network connection. * This method is called after a test is executed. * - * @return void - * * @access protected */ protected function tearDown(): void diff --git a/test/classes/Plugins/Schema/ExportRelationSchemaTest.php b/test/classes/Plugins/Schema/ExportRelationSchemaTest.php index 8e154cbf14..dedb404cc6 100644 --- a/test/classes/Plugins/Schema/ExportRelationSchemaTest.php +++ b/test/classes/Plugins/Schema/ExportRelationSchemaTest.php @@ -21,8 +21,6 @@ class ExportRelationSchemaTest extends PmaTestCase * Sets up the fixture, for example, opens a network connection. * This method is called before a test is executed. * - * @return void - * * @access protected */ protected function setUp(): void @@ -35,8 +33,6 @@ class ExportRelationSchemaTest extends PmaTestCase * Tears down the fixture, for example, closes a network connection. * This method is called after a test is executed. * - * @return void - * * @access protected */ protected function tearDown(): void diff --git a/test/classes/Plugins/Schema/PdfRelationSchemaTest.php b/test/classes/Plugins/Schema/PdfRelationSchemaTest.php index 5d1907299e..5bea63d5cf 100644 --- a/test/classes/Plugins/Schema/PdfRelationSchemaTest.php +++ b/test/classes/Plugins/Schema/PdfRelationSchemaTest.php @@ -22,8 +22,6 @@ class PdfRelationSchemaTest extends PmaTestCase * Sets up the fixture, for example, opens a network connection. * This method is called before a test is executed. * - * @return void - * * @access protected */ protected function setUp(): void @@ -180,8 +178,6 @@ class PdfRelationSchemaTest extends PmaTestCase * Tears down the fixture, for example, closes a network connection. * This method is called after a test is executed. * - * @return void - * * @access protected */ protected function tearDown(): void diff --git a/test/classes/Plugins/Schema/SvgRelationSchemaTest.php b/test/classes/Plugins/Schema/SvgRelationSchemaTest.php index 6c6c64a651..568af3240f 100644 --- a/test/classes/Plugins/Schema/SvgRelationSchemaTest.php +++ b/test/classes/Plugins/Schema/SvgRelationSchemaTest.php @@ -22,8 +22,6 @@ class SvgRelationSchemaTest extends PmaTestCase * Sets up the fixture, for example, opens a network connection. * This method is called before a test is executed. * - * @return void - * * @access protected */ protected function setUp(): void @@ -127,8 +125,6 @@ class SvgRelationSchemaTest extends PmaTestCase * Tears down the fixture, for example, closes a network connection. * This method is called after a test is executed. * - * @return void - * * @access protected */ protected function tearDown(): void diff --git a/test/classes/Plugins/Transformations/TransformationPluginsTest.php b/test/classes/Plugins/Transformations/TransformationPluginsTest.php index 767561a956..4254317a65 100644 --- a/test/classes/Plugins/Transformations/TransformationPluginsTest.php +++ b/test/classes/Plugins/Transformations/TransformationPluginsTest.php @@ -39,8 +39,6 @@ class TransformationPluginsTest extends PmaTestCase * Sets up the fixture, for example, opens a network connection. * This method is called before a test is executed. * - * @return void - * * @access protected */ protected function setUp(): void @@ -65,8 +63,6 @@ class TransformationPluginsTest extends PmaTestCase * Tears down the fixture, for example, closes a network connection. * This method is called after a test is executed. * - * @return void - * * @access protected */ protected function tearDown(): void @@ -717,8 +713,6 @@ class TransformationPluginsTest extends PmaTestCase * @param mixed $expected the expected output * @param array $args the array of arguments * - * @return void - * * @dataProvider multiDataProvider * @group medium */ diff --git a/test/classes/PmaTestCase.php b/test/classes/PmaTestCase.php index dbf9803dab..e720e56334 100644 --- a/test/classes/PmaTestCase.php +++ b/test/classes/PmaTestCase.php @@ -30,8 +30,6 @@ class PmaTestCase extends TestCase /** * This method is called before the first test of this test class is run. - * - * @return void */ public static function setUpBeforeClass(): void { @@ -105,8 +103,6 @@ class PmaTestCase extends TestCase /** * Tear down function for mockResponse method - * - * @return void */ protected function tearDown(): void { diff --git a/test/classes/Properties/Options/Groups/OptionsPropertyMainGroupTest.php b/test/classes/Properties/Options/Groups/OptionsPropertyMainGroupTest.php index 32d518f657..fc8ed8019b 100644 --- a/test/classes/Properties/Options/Groups/OptionsPropertyMainGroupTest.php +++ b/test/classes/Properties/Options/Groups/OptionsPropertyMainGroupTest.php @@ -18,8 +18,6 @@ class OptionsPropertyMainGroupTest extends TestCase /** * Configures global environment. - * - * @return void */ protected function setUp(): void { @@ -28,8 +26,6 @@ class OptionsPropertyMainGroupTest extends TestCase /** * tearDown for test cases - * - * @return void */ protected function tearDown(): void { diff --git a/test/classes/Properties/Options/Groups/OptionsPropertyRootGroupTest.php b/test/classes/Properties/Options/Groups/OptionsPropertyRootGroupTest.php index 11d57bae2d..d0c9a25e1d 100644 --- a/test/classes/Properties/Options/Groups/OptionsPropertyRootGroupTest.php +++ b/test/classes/Properties/Options/Groups/OptionsPropertyRootGroupTest.php @@ -18,8 +18,6 @@ class OptionsPropertyRootGroupTest extends TestCase /** * Configures global environment. - * - * @return void */ protected function setUp(): void { @@ -28,8 +26,6 @@ class OptionsPropertyRootGroupTest extends TestCase /** * tearDown for test cases - * - * @return void */ protected function tearDown(): void { diff --git a/test/classes/Properties/Options/Groups/OptionsPropertySubgroupTest.php b/test/classes/Properties/Options/Groups/OptionsPropertySubgroupTest.php index 42fa28f547..f879cea798 100644 --- a/test/classes/Properties/Options/Groups/OptionsPropertySubgroupTest.php +++ b/test/classes/Properties/Options/Groups/OptionsPropertySubgroupTest.php @@ -18,8 +18,6 @@ class OptionsPropertySubgroupTest extends TestCase /** * Configures global environment. - * - * @return void */ protected function setUp(): void { @@ -28,8 +26,6 @@ class OptionsPropertySubgroupTest extends TestCase /** * tearDown for test cases - * - * @return void */ protected function tearDown(): void { diff --git a/test/classes/Properties/Options/OptionsPropertyGroupTest.php b/test/classes/Properties/Options/OptionsPropertyGroupTest.php index ec7ffb0d16..b21f18b916 100644 --- a/test/classes/Properties/Options/OptionsPropertyGroupTest.php +++ b/test/classes/Properties/Options/OptionsPropertyGroupTest.php @@ -18,8 +18,6 @@ class OptionsPropertyGroupTest extends TestCase /** * Configures global environment. - * - * @return void */ protected function setUp(): void { @@ -28,8 +26,6 @@ class OptionsPropertyGroupTest extends TestCase /** * tearDown for test cases - * - * @return void */ protected function tearDown(): void { diff --git a/test/classes/Properties/Options/OptionsPropertyItemTest.php b/test/classes/Properties/Options/OptionsPropertyItemTest.php index 6b3477d589..6801e0e035 100644 --- a/test/classes/Properties/Options/OptionsPropertyItemTest.php +++ b/test/classes/Properties/Options/OptionsPropertyItemTest.php @@ -17,8 +17,6 @@ class OptionsPropertyItemTest extends TestCase /** * Configures global environment. - * - * @return void */ protected function setUp(): void { @@ -27,8 +25,6 @@ class OptionsPropertyItemTest extends TestCase /** * tearDown for test cases - * - * @return void */ protected function tearDown(): void { diff --git a/test/classes/Properties/Options/OptionsPropertyOneItemTest.php b/test/classes/Properties/Options/OptionsPropertyOneItemTest.php index baa58ce7da..819eea4205 100644 --- a/test/classes/Properties/Options/OptionsPropertyOneItemTest.php +++ b/test/classes/Properties/Options/OptionsPropertyOneItemTest.php @@ -17,8 +17,6 @@ class OptionsPropertyOneItemTest extends TestCase /** * Configures global environment. - * - * @return void */ protected function setUp(): void { @@ -27,8 +25,6 @@ class OptionsPropertyOneItemTest extends TestCase /** * tearDown for test cases - * - * @return void */ protected function tearDown(): void { diff --git a/test/classes/Properties/Plugins/ExportPluginPropertiesTest.php b/test/classes/Properties/Plugins/ExportPluginPropertiesTest.php index 681796fa5c..978da06256 100644 --- a/test/classes/Properties/Plugins/ExportPluginPropertiesTest.php +++ b/test/classes/Properties/Plugins/ExportPluginPropertiesTest.php @@ -18,8 +18,6 @@ class ExportPluginPropertiesTest extends ImportPluginPropertiesTest /** * Configures global environment. - * - * @return void */ protected function setUp(): void { @@ -28,8 +26,6 @@ class ExportPluginPropertiesTest extends ImportPluginPropertiesTest /** * tearDown for test cases - * - * @return void */ protected function tearDown(): void { diff --git a/test/classes/Properties/Plugins/ImportPluginPropertiesTest.php b/test/classes/Properties/Plugins/ImportPluginPropertiesTest.php index 60a206ef7e..440b0fe856 100644 --- a/test/classes/Properties/Plugins/ImportPluginPropertiesTest.php +++ b/test/classes/Properties/Plugins/ImportPluginPropertiesTest.php @@ -18,8 +18,6 @@ class ImportPluginPropertiesTest extends TestCase /** * Configures global environment. - * - * @return void */ protected function setUp(): void { @@ -28,8 +26,6 @@ class ImportPluginPropertiesTest extends TestCase /** * tearDown for test cases - * - * @return void */ protected function tearDown(): void { diff --git a/test/classes/Properties/Plugins/PluginPropertyItemTest.php b/test/classes/Properties/Plugins/PluginPropertyItemTest.php index 6e106f120e..3b01b401fe 100644 --- a/test/classes/Properties/Plugins/PluginPropertyItemTest.php +++ b/test/classes/Properties/Plugins/PluginPropertyItemTest.php @@ -17,8 +17,6 @@ class PluginPropertyItemTest extends TestCase /** * Configures global environment. - * - * @return void */ protected function setUp(): void { @@ -27,8 +25,6 @@ class PluginPropertyItemTest extends TestCase /** * tearDown for test cases - * - * @return void */ protected function tearDown(): void { diff --git a/test/classes/Properties/PropertyItemTest.php b/test/classes/Properties/PropertyItemTest.php index 0419da35ef..1e14add7d1 100644 --- a/test/classes/Properties/PropertyItemTest.php +++ b/test/classes/Properties/PropertyItemTest.php @@ -17,8 +17,6 @@ class PropertyItemTest extends TestCase /** * Configures global environment. - * - * @return void */ protected function setUp(): void { @@ -27,8 +25,6 @@ class PropertyItemTest extends TestCase /** * tearDown for test cases - * - * @return void */ protected function tearDown(): void { diff --git a/test/classes/RelationCleanupTest.php b/test/classes/RelationCleanupTest.php index 9c7d468a19..94c7f1b2c4 100644 --- a/test/classes/RelationCleanupTest.php +++ b/test/classes/RelationCleanupTest.php @@ -27,8 +27,6 @@ class RelationCleanupTest extends TestCase /** * Prepares environment for the test. - * - * @return void */ protected function setUp(): void { @@ -87,8 +85,6 @@ class RelationCleanupTest extends TestCase /** * Test for column method - * - * @return void */ public function testColumnWithoutRelations(): void { @@ -100,8 +96,6 @@ class RelationCleanupTest extends TestCase /** * Test for column method - * - * @return void */ public function testColumnWithRelations(): void { @@ -128,8 +122,6 @@ class RelationCleanupTest extends TestCase /** * Test for table method - * - * @return void */ public function testTableWithoutRelations(): void { @@ -141,8 +133,6 @@ class RelationCleanupTest extends TestCase /** * Test for table method - * - * @return void */ public function testTableWithRelations(): void { @@ -175,8 +165,6 @@ class RelationCleanupTest extends TestCase /** * Test for database method - * - * @return void */ public function testDatabaseWithoutRelations(): void { @@ -188,8 +176,6 @@ class RelationCleanupTest extends TestCase /** * Test for database method - * - * @return void */ public function testDatabaseWithRelations(): void { @@ -229,8 +215,6 @@ class RelationCleanupTest extends TestCase /** * Test for user method - * - * @return void */ public function testUserWithoutRelations(): void { @@ -242,8 +226,6 @@ class RelationCleanupTest extends TestCase /** * Test for user method - * - * @return void */ public function testUserWithRelations(): void { diff --git a/test/classes/RelationTest.php b/test/classes/RelationTest.php index 52769a34cb..402a04717a 100644 --- a/test/classes/RelationTest.php +++ b/test/classes/RelationTest.php @@ -23,8 +23,6 @@ class RelationTest extends TestCase * Sets up the fixture, for example, opens a network connection. * This method is called before a test is executed. * - * @return void - * * @access protected */ protected function setUp(): void diff --git a/test/classes/ReplicationGuiTest.php b/test/classes/ReplicationGuiTest.php index 186a21373d..b1ada927d2 100644 --- a/test/classes/ReplicationGuiTest.php +++ b/test/classes/ReplicationGuiTest.php @@ -29,8 +29,6 @@ class ReplicationGuiTest extends TestCase /** * Prepares environment for the test. - * - * @return void */ protected function setUp(): void { diff --git a/test/classes/Rte/EventsTest.php b/test/classes/Rte/EventsTest.php index 46ddbfe5f2..dad4a12381 100644 --- a/test/classes/Rte/EventsTest.php +++ b/test/classes/Rte/EventsTest.php @@ -21,8 +21,6 @@ class EventsTest extends TestCase /** * Set up - * - * @return void */ protected function setUp(): void { @@ -40,8 +38,6 @@ class EventsTest extends TestCase /** * Tear down - * - * @return void */ protected function tearDown(): void { @@ -57,8 +53,6 @@ class EventsTest extends TestCase * @param array $in Input * @param array $out Expected output * - * @return void - * * @dataProvider providerGetDataFromRequest */ public function testGetDataFromRequestEmpty($in, $out): void @@ -155,8 +149,6 @@ class EventsTest extends TestCase * @param array $data Data for routine * @param array $matcher Matcher * - * @return void - * * @dataProvider providerGetEditorFormAdd */ public function testGetEditorFormAdd($data, $matcher): void @@ -242,8 +234,6 @@ class EventsTest extends TestCase * @param array $data Data for routine * @param string $matcher Matcher * - * @return void - * * @dataProvider providerGetEditorFormEdit */ public function testGetEditorFormEdit($data, $matcher): void @@ -329,8 +319,6 @@ class EventsTest extends TestCase * @param array $data Data for routine * @param array $matcher Matcher * - * @return void - * * @dataProvider providerGetEditorFormAjax */ public function testGetEditorFormAjax($data, $matcher): void @@ -391,8 +379,6 @@ class EventsTest extends TestCase * @param string $query Query * @param array $num_err Error number * - * @return void - * * @dataProvider providerGetQueryFromRequest */ public function testGetQueryFromRequest($request, $query, $num_err): void diff --git a/test/classes/Rte/RoutinesTest.php b/test/classes/Rte/RoutinesTest.php index 9701b951f6..debbf23600 100644 --- a/test/classes/Rte/RoutinesTest.php +++ b/test/classes/Rte/RoutinesTest.php @@ -23,8 +23,6 @@ class RoutinesTest extends TestCase /** * Set up - * - * @return void */ protected function setUp(): void { @@ -46,8 +44,6 @@ class RoutinesTest extends TestCase * @param array $in Input * @param array $out Expected output * - * @return void - * * @dataProvider providerGetDataFromRequest */ public function testGetDataFromRequest($in, $out): void @@ -312,8 +308,6 @@ class RoutinesTest extends TestCase * @param mixed $index Index * @param array $matcher Matcher * - * @return void - * * @depends testGetParameterRowEmpty * @dataProvider providerGetParameterRow */ @@ -394,8 +388,6 @@ class RoutinesTest extends TestCase * @param array $data Data for routine * @param array $matcher Matcher * - * @return void - * * @depends testGetParameterRow * @dataProvider providerGetParameterRowAjax */ @@ -1162,8 +1154,6 @@ class RoutinesTest extends TestCase * @param string $query Query * @param int $num_err Error number * - * @return void - * * @dataProvider providerGetQueryFromRequest */ public function testGetQueryFromRequest($request, $query, $num_err): void diff --git a/test/classes/Rte/TriggersTest.php b/test/classes/Rte/TriggersTest.php index f6e823265f..47cbfb459a 100644 --- a/test/classes/Rte/TriggersTest.php +++ b/test/classes/Rte/TriggersTest.php @@ -21,8 +21,6 @@ class TriggersTest extends TestCase /** * Set up - * - * @return void */ protected function setUp(): void { @@ -42,8 +40,6 @@ class TriggersTest extends TestCase * @param array $in Input * @param array $out Expected output * - * @return void - * * @dataProvider providerGetDataFromRequestEmpty */ public function testGetDataFromRequestEmpty($in, $out): void @@ -114,8 +110,6 @@ class TriggersTest extends TestCase * @param array $data Data for trigger * @param array $matcher Matcher * - * @return void - * * @dataProvider providerGetEditorFormAdd * @group medium */ @@ -188,8 +182,6 @@ class TriggersTest extends TestCase * @param array $data Data for trigger * @param array $matcher Matcher * - * @return void - * * @dataProvider providerGetEditorFormEdit * @group medium */ @@ -262,8 +254,6 @@ class TriggersTest extends TestCase * @param array $data Data for trigger * @param array $matcher Matcher * - * @return void - * * @dataProvider providerGetEditorFormAjax */ public function testGetEditorFormAjax($data, $matcher): void diff --git a/test/classes/SanitizeTest.php b/test/classes/SanitizeTest.php index 1c56d0f91a..e89dce603c 100644 --- a/test/classes/SanitizeTest.php +++ b/test/classes/SanitizeTest.php @@ -52,8 +52,6 @@ class SanitizeTest extends TestCase * @param string $link link * @param string $expected expected result * - * @return void - * * @dataProvider docLinks */ public function testDoc($link, $expected): void @@ -189,8 +187,6 @@ class SanitizeTest extends TestCase * @param string $value Value * @param string $expected Expected output * - * @return void - * * @dataProvider variables */ public function testGetJsValue($key, $value, $expected): void @@ -274,8 +270,6 @@ class SanitizeTest extends TestCase * @param string $target expected output * @param string $source string to be escaped * - * @return void - * * @dataProvider escapeDataProvider */ public function testEscapeJsString($target, $source): void diff --git a/test/classes/ScriptsTest.php b/test/classes/ScriptsTest.php index e9761cc6ac..b7da9ef47c 100644 --- a/test/classes/ScriptsTest.php +++ b/test/classes/ScriptsTest.php @@ -23,8 +23,6 @@ class ScriptsTest extends PmaTestCase * Sets up the fixture, for example, opens a network connection. * This method is called before a test is executed. * - * @return void - * * @access protected */ protected function setUp(): void @@ -39,8 +37,6 @@ class ScriptsTest extends PmaTestCase * Tears down the fixture, for example, closes a network connection. * This method is called after a test is executed. * - * @return void - * * @access protected */ protected function tearDown(): void diff --git a/test/classes/Server/PluginTest.php b/test/classes/Server/PluginTest.php index 65523ae76f..4a625b53da 100644 --- a/test/classes/Server/PluginTest.php +++ b/test/classes/Server/PluginTest.php @@ -50,8 +50,6 @@ class PluginTest extends TestCase /** * @param Plugin $plugin Plugin object to be tested * - * @return void - * * @depends testFromState */ public function testToArray(Plugin $plugin): void diff --git a/test/classes/Server/PrivilegesTest.php b/test/classes/Server/PrivilegesTest.php index 83633cef9c..994080e39d 100644 --- a/test/classes/Server/PrivilegesTest.php +++ b/test/classes/Server/PrivilegesTest.php @@ -33,8 +33,6 @@ class PrivilegesTest extends TestCase /** * Prepares environment for the test. - * - * @return void */ protected function setUp(): void { @@ -1057,8 +1055,6 @@ class PrivilegesTest extends TestCase /** * Test for getHtmlForTableSpecificPrivileges - * - * @return void */ public function testGetHtmlToDisplayPrivilegesTableWithTableSpecific(): void { diff --git a/test/classes/Server/SelectTest.php b/test/classes/Server/SelectTest.php index 57b8ab7623..947cf6f8fc 100644 --- a/test/classes/Server/SelectTest.php +++ b/test/classes/Server/SelectTest.php @@ -19,8 +19,6 @@ class SelectTest extends TestCase { /** * Prepares environment for the test. - * - * @return void */ protected function setUp(): void { diff --git a/test/classes/Server/UserGroupsTest.php b/test/classes/Server/UserGroupsTest.php index e193114824..bfbe6d5fe3 100644 --- a/test/classes/Server/UserGroupsTest.php +++ b/test/classes/Server/UserGroupsTest.php @@ -18,8 +18,6 @@ class UserGroupsTest extends TestCase { /** * Prepares environment for the test. - * - * @return void */ protected function setUp(): void { diff --git a/test/classes/Setup/FormProcessingTest.php b/test/classes/Setup/FormProcessingTest.php index ca59b9a3f3..fbf0221e0a 100644 --- a/test/classes/Setup/FormProcessingTest.php +++ b/test/classes/Setup/FormProcessingTest.php @@ -18,8 +18,6 @@ class FormProcessingTest extends PmaTestCase { /** * Prepares environment for the test. - * - * @return void */ protected function setUp(): void { diff --git a/test/classes/Setup/IndexTest.php b/test/classes/Setup/IndexTest.php index 02d5fb5681..dc4b2d8f28 100644 --- a/test/classes/Setup/IndexTest.php +++ b/test/classes/Setup/IndexTest.php @@ -16,8 +16,6 @@ class IndexTest extends TestCase { /** * SetUp for test cases - * - * @return void */ protected function setUp(): void { diff --git a/test/classes/SqlQueryFormTest.php b/test/classes/SqlQueryFormTest.php index f3447d9a8e..a417c79a9d 100644 --- a/test/classes/SqlQueryFormTest.php +++ b/test/classes/SqlQueryFormTest.php @@ -27,8 +27,6 @@ class SqlQueryFormTest extends TestCase /** * Test for setUp - * - * @return void */ protected function setUp(): void { diff --git a/test/classes/SqlTest.php b/test/classes/SqlTest.php index e61ad92866..8bf41bba7a 100644 --- a/test/classes/SqlTest.php +++ b/test/classes/SqlTest.php @@ -21,8 +21,6 @@ class SqlTest extends TestCase /** * Setup for test cases - * - * @return void */ protected function setUp(): void { diff --git a/test/classes/StorageEngineTest.php b/test/classes/StorageEngineTest.php index cef628c76a..76f68e0d5b 100644 --- a/test/classes/StorageEngineTest.php +++ b/test/classes/StorageEngineTest.php @@ -20,8 +20,6 @@ class StorageEngineTest extends PmaTestCase * Sets up the fixture, for example, opens a network connection. * This method is called before a test is executed. * - * @return void - * * @access protected */ protected function setUp(): void @@ -37,8 +35,6 @@ class StorageEngineTest extends PmaTestCase * Tears down the fixture, for example, closes a network connection. * This method is called after a test is executed. * - * @return void - * * @access protected */ protected function tearDown(): void @@ -103,8 +99,6 @@ class StorageEngineTest extends PmaTestCase * @param string $expectedClass Class that should be selected * @param string $engineName Engine name * - * @return void - * * @dataProvider providerGetEngine */ public function testGetEngine($expectedClass, $engineName): void diff --git a/test/classes/SysInfoTest.php b/test/classes/SysInfoTest.php index 41651c98b7..a5e19b921b 100644 --- a/test/classes/SysInfoTest.php +++ b/test/classes/SysInfoTest.php @@ -20,8 +20,6 @@ class SysInfoTest extends TestCase * @param string $os OS name as returned by PHP_OS * @param string $expected Expected detected OS name * - * @return void - * * @dataProvider sysInfoOsProvider */ public function testGetSysInfoOs($os, $expected): void diff --git a/test/classes/SystemDatabaseTest.php b/test/classes/SystemDatabaseTest.php index 5aeb2ee6ed..763b1519e0 100644 --- a/test/classes/SystemDatabaseTest.php +++ b/test/classes/SystemDatabaseTest.php @@ -23,8 +23,6 @@ class SystemDatabaseTest extends PmaTestCase /** * Setup function for test cases * - * @return void - * * @access protected */ protected function setUp(): void diff --git a/test/classes/TableTest.php b/test/classes/TableTest.php index 9b67cbd509..e3ec29ce93 100644 --- a/test/classes/TableTest.php +++ b/test/classes/TableTest.php @@ -21,8 +21,6 @@ class TableTest extends PmaTestCase { /** * Configures environment - * - * @return void */ protected function setUp(): void { @@ -402,8 +400,6 @@ class TableTest extends PmaTestCase * @param bool $result expected result * @param bool $is_backquoted is backquoted * - * @return void - * * @dataProvider dataValidateName */ public function testValidateName($name, $result, $is_backquoted = false): void diff --git a/test/classes/TemplateTest.php b/test/classes/TemplateTest.php index c3dfb2e5d6..d33a9fd4a6 100644 --- a/test/classes/TemplateTest.php +++ b/test/classes/TemplateTest.php @@ -19,8 +19,6 @@ class TemplateTest extends PmaTestCase /** * Sets up the fixture. - * - * @return void */ protected function setUp(): void { @@ -32,8 +30,6 @@ class TemplateTest extends PmaTestCase * * @param string $data Template name * - * @return void - * * @dataProvider providerTestSet */ public function testSet($data): void @@ -65,8 +61,6 @@ class TemplateTest extends PmaTestCase * @param string $key Template variable array key * @param string $value Template variable array value * - * @return void - * * @dataProvider providerTestDynamicRender */ public function testDynamicRender($templateFile, $key, $value): void @@ -110,8 +104,6 @@ class TemplateTest extends PmaTestCase * @param string $templateFile Template name * @param string $expectedResult Expected result * - * @return void - * * @dataProvider providerTestRender */ public function testRender($templateFile, $expectedResult): void @@ -144,8 +136,6 @@ class TemplateTest extends PmaTestCase * @param array $renderParams Render params * @param string $expectedResult Expected result * - * @return void - * * @dataProvider providerTestRenderGettext */ public function testRenderGettext($templateFile, $renderParams, $expectedResult): void diff --git a/test/classes/ThemeManagerTest.php b/test/classes/ThemeManagerTest.php index 67daab40e3..d9d7833b30 100644 --- a/test/classes/ThemeManagerTest.php +++ b/test/classes/ThemeManagerTest.php @@ -16,8 +16,6 @@ class ThemeManagerTest extends PmaTestCase { /** * SetUp for test cases - * - * @return void */ protected function setUp(): void { diff --git a/test/classes/ThemeTest.php b/test/classes/ThemeTest.php index 22ca71e81f..660e98eea9 100644 --- a/test/classes/ThemeTest.php +++ b/test/classes/ThemeTest.php @@ -24,8 +24,6 @@ class ThemeTest extends PmaTestCase /** * Sets up the fixture, for example, opens a network connection. * This method is called before a test is executed. - * - * @return void */ protected function setUp(): void { @@ -41,8 +39,6 @@ class ThemeTest extends PmaTestCase /** * Tears down the fixture, for example, closes a network connection. * This method is called after a test is executed. - * - * @return void */ protected function tearDown(): void { @@ -259,8 +255,6 @@ class ThemeTest extends PmaTestCase * @param string $fallback fallback image * @param string $output expected output * - * @return void - * * @dataProvider providerForGetImgPath */ public function testGetImgPath($file, $fallback, $output): void diff --git a/test/classes/TrackerTest.php b/test/classes/TrackerTest.php index 98557d9187..b5e6edb135 100644 --- a/test/classes/TrackerTest.php +++ b/test/classes/TrackerTest.php @@ -21,8 +21,6 @@ class TrackerTest extends PmaTestCase /** * Setup function for test cases * - * @return void - * * @access protected */ protected function setUp(): void @@ -117,8 +115,6 @@ class TrackerTest extends PmaTestCase * @param string $string String to test against * @param string $expected Expected Table Name * - * @return void - * * @test * @dataProvider getTableNameData */ @@ -596,8 +592,6 @@ class TrackerTest extends PmaTestCase * @param array $fetchArrayReturn Value to be returned by mocked fetchArray * @param array $expectedArray Expected array * - * @return void - * * @test * @dataProvider getTrackedDataProvider */ diff --git a/test/classes/TrackingTest.php b/test/classes/TrackingTest.php index bdb6e6e40c..285534e823 100644 --- a/test/classes/TrackingTest.php +++ b/test/classes/TrackingTest.php @@ -27,8 +27,6 @@ class TrackingTest extends TestCase /** * Setup function for test cases * - * @return void - * * @access protected */ protected function setUp(): void diff --git a/test/classes/TransformationsTest.php b/test/classes/TransformationsTest.php index 47f96eafc5..4e5b676fc8 100644 --- a/test/classes/TransformationsTest.php +++ b/test/classes/TransformationsTest.php @@ -19,8 +19,6 @@ class TransformationsTest extends TestCase /** * Set up global environment. - * - * @return void */ protected function setUp(): void { @@ -51,8 +49,6 @@ class TransformationsTest extends TestCase * @param string $input String to parse * @param array $expected Expected result * - * @return void - * * @dataProvider getOptionsData */ public function testGetOptions($input, $expected): void @@ -284,8 +280,6 @@ class TransformationsTest extends TestCase * @param string $value value * @param string $expected expected result * - * @return void - * * @dataProvider fixupData */ public function testFixup($value, $expected): void @@ -331,8 +325,6 @@ class TransformationsTest extends TestCase * @param string $file transformation file * @param string $expectedDescription expected description * - * @return void - * * @dataProvider providerGetDescription */ public function testGetDescription($file, $expectedDescription): void @@ -370,8 +362,6 @@ class TransformationsTest extends TestCase * @param string $file transformation file * @param string $expectedName expected name * - * @return void - * * @dataProvider providerGetName */ public function testGetName($file, $expectedName): void diff --git a/test/classes/TypesTest.php b/test/classes/TypesTest.php index d140a6db6f..1ec9c02b46 100644 --- a/test/classes/TypesTest.php +++ b/test/classes/TypesTest.php @@ -19,8 +19,6 @@ class TypesTest extends PmaTestCase /** * Sets up the fixture, for example, opens a network connection. * This method is called before a test is executed. - * - * @return void */ protected function setUp(): void { @@ -150,8 +148,6 @@ class TypesTest extends PmaTestCase * @param bool $null Whether field can be NULL * @param string $output Expected output * - * @return void - * * @dataProvider providerForGetTypeOperators */ public function testGetTypeOperators($type, $null, $output): void @@ -258,8 +254,6 @@ class TypesTest extends PmaTestCase * * @param string $type The data type to get a description. * - * @return void - * * @dataProvider providerForTestGetTypeDescription */ public function testGetTypeDescription($type): void @@ -339,8 +333,6 @@ class TypesTest extends PmaTestCase * @param string $class The class to get function list. * @param array $output Expected function list * - * @return void - * * @dataProvider providerFortTestGetFunctionsClass */ public function testGetFunctionsClass($class, $output): void @@ -767,8 +759,6 @@ class TypesTest extends PmaTestCase * @param string $type Type to check * @param string $output Expected result * - * @return void - * * @dataProvider providerFortTestGetTypeClass */ public function testGetTypeClass($type, $output): void diff --git a/test/classes/UrlTest.php b/test/classes/UrlTest.php index 4b983c2d96..372a592aea 100644 --- a/test/classes/UrlTest.php +++ b/test/classes/UrlTest.php @@ -19,8 +19,6 @@ class UrlTest extends TestCase * Sets up the fixture, for example, opens a network connection. * This method is called before a test is executed. * - * @return void - * * @access protected */ protected function setUp(): void diff --git a/test/classes/UserPreferencesHeaderTest.php b/test/classes/UserPreferencesHeaderTest.php index 2223bb3ac1..3e498165af 100644 --- a/test/classes/UserPreferencesHeaderTest.php +++ b/test/classes/UserPreferencesHeaderTest.php @@ -22,8 +22,6 @@ class UserPreferencesHeaderTest extends PmaTestCase { /** * Setup various pre conditions - * - * @return void */ protected function setUp(): void { @@ -34,8 +32,6 @@ class UserPreferencesHeaderTest extends PmaTestCase /** * Test for getContent with selected tab * - * @return void - * * @throws Throwable * @throws Twig_Error_Loader * @throws Twig_Error_Runtime @@ -71,8 +67,6 @@ class UserPreferencesHeaderTest extends PmaTestCase /** * Test for getContent with "saved" get parameter * - * @return void - * * @throws Throwable * @throws Twig_Error_Loader * @throws Twig_Error_Runtime @@ -97,8 +91,6 @@ class UserPreferencesHeaderTest extends PmaTestCase /** * Test for getContent with session storage * - * @return void - * * @throws Throwable * @throws Twig_Error_Loader * @throws Twig_Error_Runtime diff --git a/test/classes/UserPreferencesTest.php b/test/classes/UserPreferencesTest.php index 4b184ed58f..0f022768f7 100644 --- a/test/classes/UserPreferencesTest.php +++ b/test/classes/UserPreferencesTest.php @@ -24,8 +24,6 @@ class UserPreferencesTest extends PmaTestCase /** * Setup various pre conditions - * - * @return void */ protected function setUp(): void { diff --git a/test/classes/UtilTest.php b/test/classes/UtilTest.php index 07c62203db..57f5c4786d 100644 --- a/test/classes/UtilTest.php +++ b/test/classes/UtilTest.php @@ -30,8 +30,6 @@ class UtilTest extends PmaTestCase { /** * Test for createGISData - * - * @return void */ public function testCreateGISDataOldMysql(): void { @@ -47,8 +45,6 @@ class UtilTest extends PmaTestCase /** * Test for createGISData - * - * @return void */ public function testCreateGISDataNewMysql(): void { @@ -64,8 +60,6 @@ class UtilTest extends PmaTestCase /** * Test for getGISFunctions - * - * @return void */ public function testGetGISFunctions(): void { @@ -131,8 +125,6 @@ class UtilTest extends PmaTestCase * @param string $collation Collation * @param string $expected Expected Charset Query * - * @return void - * * @test * @dataProvider charsetQueryData */ @@ -346,8 +338,6 @@ class UtilTest extends PmaTestCase * @param string $bit Value * @param string $val Expected value * - * @return void - * * @covers \PhpMyAdmin\Util::convertBitDefaultValue * @dataProvider providerConvertBitDefaultValue */ @@ -431,8 +421,6 @@ class UtilTest extends PmaTestCase * @param string $a Expected value * @param string $b String to escape * - * @return void - * * @covers \PhpMyAdmin\Util::escapeMysqlWildcards * @dataProvider providerUnEscapeMysqlWildcards */ @@ -450,8 +438,6 @@ class UtilTest extends PmaTestCase * @param string $a String to unescape * @param string $b Expected value * - * @return void - * * @covers \PhpMyAdmin\Util::unescapeMysqlWildcards * @dataProvider providerUnEscapeMysqlWildcards */ @@ -469,8 +455,6 @@ class UtilTest extends PmaTestCase * @param string $in string to evaluate * @param string $out expected output * - * @return void - * * @covers \PhpMyAdmin\Util::expandUserString * @dataProvider providerExpandUserString */ @@ -544,8 +528,6 @@ class UtilTest extends PmaTestCase * @param string $in Column specification * @param array $out Expected value * - * @return void - * * @covers \PhpMyAdmin\Util::extractColumnSpec * @dataProvider providerExtractColumnSpec */ @@ -694,8 +676,6 @@ class UtilTest extends PmaTestCase * @param int|string $size Size * @param int $expected Expected value * - * @return void - * * @covers \PhpMyAdmin\Util::extractValueFromFormattedSize * @dataProvider providerExtractValueFromFormattedSize */ @@ -740,8 +720,6 @@ class UtilTest extends PmaTestCase * @param string $a Engine * @param bool $e Expected Value * - * @return void - * * @covers \PhpMyAdmin\Util::isForeignKeySupported * @dataProvider providerIsForeignKeySupported */ @@ -790,8 +768,6 @@ class UtilTest extends PmaTestCase * @param int $c Number of decimals to retain * @param array $e Expected value * - * @return void - * * @covers \PhpMyAdmin\Util::formatByteDown * @dataProvider providerFormatByteDown */ @@ -925,8 +901,6 @@ class UtilTest extends PmaTestCase * @param int $c Number of decimals to retain * @param array $d Expected value * - * @return void - * * @covers \PhpMyAdmin\Util::formatNumber * @dataProvider providerFormatNumber */ @@ -1081,8 +1055,6 @@ class UtilTest extends PmaTestCase * @param string $unit Unit * @param string $res Result * - * @return void - * * @covers \PhpMyAdmin\Util::getFormattedMaximumUploadSize * @dataProvider providerGetFormattedMaximumUploadSize */ @@ -1146,8 +1118,6 @@ class UtilTest extends PmaTestCase * @param string $target Target * @param array $result Expected value * - * @return void - * * @covers \PhpMyAdmin\Util::getTitleForTarget * @dataProvider providerGetTitleForTarget */ @@ -1201,8 +1171,6 @@ class UtilTest extends PmaTestCase * @param string $b Format * @param string $e Expected output * - * @return void - * * @covers \PhpMyAdmin\Util::localisedDate * @dataProvider providerLocalisedDate */ @@ -1246,8 +1214,6 @@ class UtilTest extends PmaTestCase * @param int $a Timespan in seconds * @param string $e Expected output * - * @return void - * * @covers \PhpMyAdmin\Util::timespanFormat * @dataProvider providerTimespanFormat */ @@ -1291,8 +1257,6 @@ class UtilTest extends PmaTestCase * @param int $b Length * @param string $e Expected output * - * @return void - * * @covers \PhpMyAdmin\Util::printableBitValue * @dataProvider providerPrintableBitValue */ @@ -1331,8 +1295,6 @@ class UtilTest extends PmaTestCase * @param string $param String * @param string $expected Expected output * - * @return void - * * @covers \PhpMyAdmin\Util::unQuote * @dataProvider providerUnQuote */ @@ -1377,8 +1339,6 @@ class UtilTest extends PmaTestCase * @param string $param String * @param string $expected Expected output * - * @return void - * * @covers \PhpMyAdmin\Util::unQuote * @dataProvider providerUnQuoteSelectedChar */ @@ -1423,8 +1383,6 @@ class UtilTest extends PmaTestCase * @param string $a String * @param string $b Expected output * - * @return void - * * @covers \PhpMyAdmin\Util::backquote * @dataProvider providerBackquote */ @@ -1481,8 +1439,6 @@ class UtilTest extends PmaTestCase * @param string $expectedNoneOutput Expected none output * @param string $expectedMssqlOutput Expected MSSQL output * - * @return void - * * @covers \PhpMyAdmin\Util::backquoteCompat * @dataProvider providerBackquoteCompat */ @@ -1578,8 +1534,6 @@ class UtilTest extends PmaTestCase * @param string $a String * @param string $e Expected output * - * @return void - * * @covers \PhpMyAdmin\Util::userDir * @dataProvider providerUserDir */ @@ -1615,8 +1569,6 @@ class UtilTest extends PmaTestCase * @param string $a String * @param string $e Expected output * - * @return void - * * @covers \PhpMyAdmin\Util::duplicateFirstNewline * @dataProvider providerDuplicateFirstNewline */ @@ -1688,8 +1640,6 @@ class UtilTest extends PmaTestCase /** * Test for PhpMyAdmin\Util::buildActionTitles - * - * @return void */ public function testBuildActionTitles(): void { @@ -1725,8 +1675,6 @@ class UtilTest extends PmaTestCase * @param bool $expected Expected result for a given input * @param mixed $input Input data to check * - * @return void - * * @dataProvider providerIsInteger */ public function testIsInteger(bool $expected, $input): void diff --git a/test/classes/Utils/HttpRequestTest.php b/test/classes/Utils/HttpRequestTest.php index 41daff323c..78bc16e516 100644 --- a/test/classes/Utils/HttpRequestTest.php +++ b/test/classes/Utils/HttpRequestTest.php @@ -81,8 +81,6 @@ class HttpRequestTest extends PmaTestCase * @param bool $return_only_status return only status * @param bool $expected expected result * - * @return void - * * @group medium * @dataProvider httpRequests * @group network @@ -102,8 +100,6 @@ class HttpRequestTest extends PmaTestCase * @param bool $return_only_status return only status * @param bool $expected expected result * - * @return void - * * @group medium * @dataProvider httpRequests * @group network @@ -130,8 +126,6 @@ class HttpRequestTest extends PmaTestCase * @param bool $return_only_status return only status * @param bool $expected expected result * - * @return void - * * @group medium * @dataProvider httpRequests * @group network @@ -158,8 +152,6 @@ class HttpRequestTest extends PmaTestCase * @param bool $return_only_status return only status * @param bool $expected expected result * - * @return void - * * @group medium * @dataProvider httpRequests * @group network @@ -181,8 +173,6 @@ class HttpRequestTest extends PmaTestCase * @param bool $return_only_status return only status * @param bool $expected expected result * - * @return void - * * @group medium * @dataProvider httpRequests * @group network diff --git a/test/classes/VersionInformationTest.php b/test/classes/VersionInformationTest.php index 27cb0eeac0..dd7521f8ed 100644 --- a/test/classes/VersionInformationTest.php +++ b/test/classes/VersionInformationTest.php @@ -19,8 +19,6 @@ class VersionInformationTest extends PmaTestCase /** * Sets up the fixture, for example, opens a network connection. * This method is called before a test is executed. - * - * @return void */ protected function setUp(): void { @@ -74,8 +72,6 @@ class VersionInformationTest extends PmaTestCase * @param string $version Version string * @param int $numeric Integer matching version * - * @return void - * * @dataProvider dataVersions */ public function testVersionToInt($version, $numeric): void diff --git a/test/classes/ZipExtensionTest.php b/test/classes/ZipExtensionTest.php index b8152001a8..7d64a7e61e 100644 --- a/test/classes/ZipExtensionTest.php +++ b/test/classes/ZipExtensionTest.php @@ -34,8 +34,6 @@ class ZipExtensionTest extends PmaTestCase * @param string $specific_entry regular expression to match a file * @param mixed $output expected output * - * @return void - * * @dataProvider provideTestGetContents */ public function testGetContents($file, $specific_entry, $output): void @@ -80,8 +78,6 @@ class ZipExtensionTest extends PmaTestCase * @param string $file_regexp regular expression for the file name to match * @param mixed $output expected output * - * @return void - * * @dataProvider provideTestFindFile */ public function testFindFile($file, $file_regexp, $output): void diff --git a/test/selenium/CreateDropDatabaseTest.php b/test/selenium/CreateDropDatabaseTest.php index 10c3b02930..33c2382dd6 100644 --- a/test/selenium/CreateDropDatabaseTest.php +++ b/test/selenium/CreateDropDatabaseTest.php @@ -15,8 +15,6 @@ class CreateDropDatabaseTest extends TestBase { /** * Setup the browser environment to run the selenium test case - * - * @return void */ protected function setUp(): void { diff --git a/test/selenium/CreateRemoveUserTest.php b/test/selenium/CreateRemoveUserTest.php index 33aa4ac6ff..80d70cd133 100644 --- a/test/selenium/CreateRemoveUserTest.php +++ b/test/selenium/CreateRemoveUserTest.php @@ -31,8 +31,6 @@ class CreateRemoveUserTest extends TestBase /** * Setup the browser environment to run the selenium test case - * - * @return void */ protected function setUp(): void { diff --git a/test/selenium/Database/EventsTest.php b/test/selenium/Database/EventsTest.php index ec77b3f7f7..864bc0570a 100644 --- a/test/selenium/Database/EventsTest.php +++ b/test/selenium/Database/EventsTest.php @@ -20,8 +20,6 @@ class EventsTest extends TestBase { /** * Setup the browser environment to run the selenium test case - * - * @return void */ protected function setUp(): void { @@ -49,8 +47,6 @@ class EventsTest extends TestBase /** * Tear Down function for test cases - * - * @return void */ protected function tearDown(): void { diff --git a/test/selenium/Database/OperationsTest.php b/test/selenium/Database/OperationsTest.php index 07532d9510..62f985f140 100644 --- a/test/selenium/Database/OperationsTest.php +++ b/test/selenium/Database/OperationsTest.php @@ -17,8 +17,6 @@ class OperationsTest extends TestBase { /** * setUp function - * - * @return void */ protected function setUp(): void { diff --git a/test/selenium/Database/ProceduresTest.php b/test/selenium/Database/ProceduresTest.php index 9439f5779d..f8741a07ad 100644 --- a/test/selenium/Database/ProceduresTest.php +++ b/test/selenium/Database/ProceduresTest.php @@ -26,8 +26,6 @@ class ProceduresTest extends TestBase /** * Setup the browser environment to run the selenium test case - * - * @return void */ protected function setUp(): void { @@ -61,8 +59,6 @@ class ProceduresTest extends TestBase /** * Restore initial state - * - * @return void */ protected function tearDown(): void { diff --git a/test/selenium/Database/QueryByExampleTest.php b/test/selenium/Database/QueryByExampleTest.php index b2e2d92fbf..fb091358f6 100644 --- a/test/selenium/Database/QueryByExampleTest.php +++ b/test/selenium/Database/QueryByExampleTest.php @@ -18,8 +18,6 @@ class QueryByExampleTest extends TestBase { /** * Setup the browser environment to run the selenium test case - * - * @return void */ protected function setUp(): void { diff --git a/test/selenium/Database/StructureTest.php b/test/selenium/Database/StructureTest.php index b8bb751656..4b47c28ce4 100644 --- a/test/selenium/Database/StructureTest.php +++ b/test/selenium/Database/StructureTest.php @@ -17,8 +17,6 @@ class StructureTest extends TestBase { /** * Setup the browser environment to run the selenium test case - * - * @return void */ protected function setUp(): void { diff --git a/test/selenium/Database/TriggersTest.php b/test/selenium/Database/TriggersTest.php index 443d94087e..c773b537ae 100644 --- a/test/selenium/Database/TriggersTest.php +++ b/test/selenium/Database/TriggersTest.php @@ -17,8 +17,6 @@ class TriggersTest extends TestBase { /** * Setup the browser environment to run the selenium test case - * - * @return void */ protected function setUp(): void { diff --git a/test/selenium/ExportTest.php b/test/selenium/ExportTest.php index 618791916a..4fc9215869 100644 --- a/test/selenium/ExportTest.php +++ b/test/selenium/ExportTest.php @@ -15,8 +15,6 @@ class ExportTest extends TestBase { /** * Setup the browser environment to run the selenium test case - * - * @return void */ protected function setUp(): void { @@ -41,8 +39,6 @@ class ExportTest extends TestBase * @param string $plugin Export format * @param array $expected Array of expected strings * - * @return void - * * @dataProvider exportDataProvider * @group large */ @@ -61,8 +57,6 @@ class ExportTest extends TestBase * @param string $plugin Export format * @param array $expected Array of expected strings * - * @return void - * * @dataProvider exportDataProvider * @group large */ @@ -83,8 +77,6 @@ class ExportTest extends TestBase * @param string $plugin Export format * @param array $expected Array of expected strings * - * @return void - * * @dataProvider exportDataProvider * @group large */ diff --git a/test/selenium/ImportTest.php b/test/selenium/ImportTest.php index 442d993207..88e7ceb6a6 100644 --- a/test/selenium/ImportTest.php +++ b/test/selenium/ImportTest.php @@ -15,8 +15,6 @@ class ImportTest extends TestBase { /** * setUp function - * - * @return void */ protected function setUp(): void { diff --git a/test/selenium/NormalizationTest.php b/test/selenium/NormalizationTest.php index 1d5a051ad3..04da8c672f 100644 --- a/test/selenium/NormalizationTest.php +++ b/test/selenium/NormalizationTest.php @@ -15,8 +15,6 @@ class NormalizationTest extends TestBase { /** * Setup the browser environment to run the selenium test case - * - * @return void */ protected function setUp(): void { diff --git a/test/selenium/ServerSettingsTest.php b/test/selenium/ServerSettingsTest.php index b15126e3a0..29416ad89d 100644 --- a/test/selenium/ServerSettingsTest.php +++ b/test/selenium/ServerSettingsTest.php @@ -15,8 +15,6 @@ class ServerSettingsTest extends TestBase { /** * setUp function - * - * @return void */ protected function setUp(): void { diff --git a/test/selenium/SqlQueryTest.php b/test/selenium/SqlQueryTest.php index d1e648f797..74cffeac9b 100644 --- a/test/selenium/SqlQueryTest.php +++ b/test/selenium/SqlQueryTest.php @@ -15,8 +15,6 @@ class SqlQueryTest extends TestBase { /** * Setup the browser environment to run the selenium test case - * - * @return void */ protected function setUp(): void { diff --git a/test/selenium/Table/BrowseTest.php b/test/selenium/Table/BrowseTest.php index 53278da619..cb48081a9e 100644 --- a/test/selenium/Table/BrowseTest.php +++ b/test/selenium/Table/BrowseTest.php @@ -18,8 +18,6 @@ class BrowseTest extends TestBase { /** * Setup the browser environment to run the selenium test case - * - * @return void */ protected function setUp(): void { diff --git a/test/selenium/Table/InsertTest.php b/test/selenium/Table/InsertTest.php index 914f42209a..29c36a6b4c 100644 --- a/test/selenium/Table/InsertTest.php +++ b/test/selenium/Table/InsertTest.php @@ -18,8 +18,6 @@ class InsertTest extends TestBase /** * Setup the browser environment to run the selenium t * est case - * - * @return void */ protected function setUp(): void { diff --git a/test/selenium/Table/OperationsTest.php b/test/selenium/Table/OperationsTest.php index 957bc70033..e742138011 100644 --- a/test/selenium/Table/OperationsTest.php +++ b/test/selenium/Table/OperationsTest.php @@ -17,8 +17,6 @@ class OperationsTest extends TestBase { /** * Setup the browser environment to run the selenium test case - * - * @return void */ protected function setUp(): void { diff --git a/test/selenium/Table/StructureTest.php b/test/selenium/Table/StructureTest.php index dae5b2d2c1..4e7b1189af 100644 --- a/test/selenium/Table/StructureTest.php +++ b/test/selenium/Table/StructureTest.php @@ -17,8 +17,6 @@ class StructureTest extends TestBase { /** * Setup the browser environment to run the selenium test case - * - * @return void */ protected function setUp(): void { diff --git a/test/selenium/TestBase.php b/test/selenium/TestBase.php index 9e30ff992b..5cad81679e 100644 --- a/test/selenium/TestBase.php +++ b/test/selenium/TestBase.php @@ -87,8 +87,6 @@ abstract class TestBase extends TestCase /** * Configures the selenium and database link. * - * @return void - * * @throws Exception */ protected function setUp(): void @@ -150,8 +148,6 @@ abstract class TestBase extends TestCase /** * Has CI config ( CI_MODE == selenium ) - * - * @return bool */ public function hasCIConfig(): bool { @@ -163,8 +159,6 @@ abstract class TestBase extends TestCase /** * Has ENV variables set for Browserstack - * - * @return bool */ public function hasBrowserstackConfig(): bool { @@ -174,8 +168,6 @@ abstract class TestBase extends TestCase /** * Has ENV variables set for local Selenium server - * - * @return bool */ public function hasSeleniumConfig(): bool { @@ -185,8 +177,6 @@ abstract class TestBase extends TestCase /** * Get hub url - * - * @return string|null */ public function getHubUrl(): ?string { @@ -206,8 +196,6 @@ abstract class TestBase extends TestCase /** * Has TESTSUITE_SERVER, TESTSUITE_USER and TESTSUITE_DATABASE variables set - * - * @return bool */ public function hasTestSuiteDatabaseServer(): bool { @@ -220,8 +208,6 @@ abstract class TestBase extends TestCase * Navigate to URL * * @param string $url The URL - * - * @return void */ private function navigateTo(string $url): void { @@ -238,8 +224,6 @@ abstract class TestBase extends TestCase * Add specific capabilities * * @param DesiredCapabilities $capabilities The capabilities object - * - * @return void */ public function addCapabilities(DesiredCapabilities $capabilities): void { @@ -300,8 +284,6 @@ abstract class TestBase extends TestCase /** * Get basic capabilities - * - * @return DesiredCapabilities */ public function getCapabilities(): DesiredCapabilities { @@ -456,8 +438,6 @@ abstract class TestBase extends TestCase * Get element by Id * * @param string $id The element ID - * - * @return WebDriverElement */ public function byId(string $id): WebDriverElement { @@ -468,8 +448,6 @@ abstract class TestBase extends TestCase * Get element by css selector * * @param string $selector The element css selector - * - * @return WebDriverElement */ public function byCssSelector(string $selector): WebDriverElement { @@ -480,8 +458,6 @@ abstract class TestBase extends TestCase * Get element by xpath * * @param string $xpath The xpath - * - * @return WebDriverElement */ public function byXPath(string $xpath): WebDriverElement { @@ -492,8 +468,6 @@ abstract class TestBase extends TestCase * Get element by linkText * * @param string $linkText The link text - * - * @return WebDriverElement */ public function byLinkText(string $linkText): WebDriverElement { @@ -502,8 +476,6 @@ abstract class TestBase extends TestCase /** * Double click - * - * @return void */ public function doubleclick(): void { @@ -512,8 +484,6 @@ abstract class TestBase extends TestCase /** * Simple click - * - * @return void */ public function click(): void { @@ -524,8 +494,6 @@ abstract class TestBase extends TestCase * Get element by byPartialLinkText * * @param string $partialLinkText The partial link text - * - * @return WebDriverElement */ public function byPartialLinkText(string $partialLinkText): WebDriverElement { @@ -534,8 +502,6 @@ abstract class TestBase extends TestCase /** * Returns true if the browser is safari - * - * @return bool */ public function isSafari(): bool { @@ -546,8 +512,6 @@ abstract class TestBase extends TestCase * Get element by name * * @param string $name The name - * - * @return WebDriverElement */ public function byName(string $name): WebDriverElement { @@ -646,8 +610,6 @@ abstract class TestBase extends TestCase * @param string $func Locate using - cssSelector, xpath, tagName, partialLinkText, linkText, name, id, className * @param string $arg Selector * @param int $timeout Timeout in seconds - * - * @return WebDriverElement */ public function waitUntilElementIsPresent(string $func, $arg, int $timeout): WebDriverElement { @@ -662,8 +624,6 @@ abstract class TestBase extends TestCase * @param string $func Locate using - cssSelector, xpath, tagName, partialLinkText, linkText, name, id, className * @param string $arg Selector * @param int $timeout Timeout in seconds - * - * @return WebDriverElement */ public function waitUntilElementIsVisible(string $func, $arg, int $timeout): WebDriverElement { @@ -771,8 +731,6 @@ abstract class TestBase extends TestCase * browsers. * * @param string $text Keys to send - * - * @return void */ public function keys(string $text): void { @@ -792,8 +750,6 @@ abstract class TestBase extends TestCase * browsers. * * @param RemoteWebElement $element element - * - * @return void */ public function moveto(RemoteWebElement $element): void { @@ -845,8 +801,6 @@ abstract class TestBase extends TestCase /** * Accept alert - * - * @return void */ public function acceptAlert(): void { @@ -937,8 +891,6 @@ abstract class TestBase extends TestCase * * @param WebDriverElement $element The element * @param string $value The value of the option - * - * @return void */ public function selectByValue(WebDriverElement $element, string $value): void { @@ -951,8 +903,6 @@ abstract class TestBase extends TestCase * * @param WebDriverElement $element The element * @param string $text The text - * - * @return void */ public function selectByLabel(WebDriverElement $element, string $text): void { @@ -1025,8 +975,6 @@ abstract class TestBase extends TestCase /** * Tear Down function for test cases - * - * @return void */ protected function tearDown(): void { @@ -1043,8 +991,6 @@ abstract class TestBase extends TestCase * Mark unsuccessful tests as 'Failures' on Browerstack * * @param Throwable $t Throwable - * - * @return void */ public function onNotSuccessfulTest(Throwable $t): void { diff --git a/test/selenium/TrackingTest.php b/test/selenium/TrackingTest.php index f901d23d6f..33ca87aa91 100644 --- a/test/selenium/TrackingTest.php +++ b/test/selenium/TrackingTest.php @@ -15,8 +15,6 @@ class TrackingTest extends TestBase { /** * Setup the browser environment to run the selenium test case - * - * @return void */ protected function setUp(): void {