diff options
| author | Tomas Votruba <tomas.vot@gmail.com> | 2018-11-24 23:31:40 +0300 |
|---|---|---|
| committer | Tomas Votruba <tomas.vot@gmail.com> | 2018-11-24 23:47:26 +0300 |
| commit | bf720bad29bc965b26b5b0447eec66b0e4c47657 (patch) | |
| tree | 60d5ca431e1da109f7dc2b65f3492e500bd4c21e /libraries | |
| parent | e6f9812b99dfaeda7ea61371ee2a5a01143d88ea (diff) | |
remove unused and fix @param, @var and @return annotation values
Signed-off-by: Tomas Votruba <tomas.vot@gmail.com>
Diffstat (limited to 'libraries')
55 files changed, 218 insertions, 218 deletions
diff --git a/libraries/classes/BrowseForeigners.php b/libraries/classes/BrowseForeigners.php index e8360b23e3..c2ffd444bd 100644 --- a/libraries/classes/BrowseForeigners.php +++ b/libraries/classes/BrowseForeigners.php @@ -66,7 +66,7 @@ class BrowseForeigners * @param integer $indexByDescription index by description * @param string $current_value current value on the edit form * - * @return array $html the generated html + * @return array the generated html */ private function getHtmlForOneKey( int $horizontal_count, diff --git a/libraries/classes/CentralColumns.php b/libraries/classes/CentralColumns.php index 4204ff37e7..6b24a24cf5 100644 --- a/libraries/classes/CentralColumns.php +++ b/libraries/classes/CentralColumns.php @@ -928,7 +928,7 @@ class CentralColumns * @param string $pmaThemeImage pma theme image url * @param string $text_dir url for text directory * - * @return string $html_output + * @return string */ public function getTableFooter(string $pmaThemeImage, string $text_dir): string { diff --git a/libraries/classes/Config/FormDisplay.php b/libraries/classes/Config/FormDisplay.php index 4623895b08..1161ba2586 100644 --- a/libraries/classes/Config/FormDisplay.php +++ b/libraries/classes/Config/FormDisplay.php @@ -231,7 +231,7 @@ class FormDisplay * @param array &$js will be updated with javascript code * @param bool $showButtons whether show submit and reset button * - * @return string $htmlOutput + * @return string */ private function _displayForms( $showRestoreDefault, diff --git a/libraries/classes/Controllers/Database/DatabaseStructureController.php b/libraries/classes/Controllers/Database/DatabaseStructureController.php index ed0638f50f..6c2bcba050 100644 --- a/libraries/classes/Controllers/Database/DatabaseStructureController.php +++ b/libraries/classes/Controllers/Database/DatabaseStructureController.php @@ -59,7 +59,7 @@ class DatabaseStructureController extends DatabaseController protected $_is_show_stats; /** - * @var Relation $relation + * @var Relation */ private $relation; diff --git a/libraries/classes/Controllers/DatabaseController.php b/libraries/classes/Controllers/DatabaseController.php index f43ddb76c0..fde55121e0 100644 --- a/libraries/classes/Controllers/DatabaseController.php +++ b/libraries/classes/Controllers/DatabaseController.php @@ -17,7 +17,7 @@ namespace PhpMyAdmin\Controllers; abstract class DatabaseController extends Controller { /** - * @var string $db + * @var string */ protected $db; diff --git a/libraries/classes/Controllers/Server/ServerDatabasesController.php b/libraries/classes/Controllers/Server/ServerDatabasesController.php index 065b1415ae..f5c22bcc31 100644 --- a/libraries/classes/Controllers/Server/ServerDatabasesController.php +++ b/libraries/classes/Controllers/Server/ServerDatabasesController.php @@ -442,7 +442,7 @@ class ServerDatabasesController extends Controller * @param array $replication_info replication info * @param string $tr_class HTMl class for the row * - * @return string $column_order, $out + * @return string */ public function _buildHtmlForDb( array $current, diff --git a/libraries/classes/Controllers/Table/TableChartController.php b/libraries/classes/Controllers/Table/TableChartController.php index e0fc1a7c9a..4abceb090b 100644 --- a/libraries/classes/Controllers/Table/TableChartController.php +++ b/libraries/classes/Controllers/Table/TableChartController.php @@ -26,17 +26,17 @@ use PhpMyAdmin\Util; class TableChartController extends TableController { /** - * @var string $sql_query + * @var string */ protected $sql_query; /** - * @var string $url_query + * @var string */ protected $url_query; /** - * @var array $cfg + * @var array */ protected $cfg; diff --git a/libraries/classes/Controllers/Table/TableGisVisualizationController.php b/libraries/classes/Controllers/Table/TableGisVisualizationController.php index 4c9822a323..5110ccdf69 100644 --- a/libraries/classes/Controllers/Table/TableGisVisualizationController.php +++ b/libraries/classes/Controllers/Table/TableGisVisualizationController.php @@ -24,22 +24,22 @@ use PhpMyAdmin\Url; class TableGisVisualizationController extends TableController { /** - * @var array $url_params + * @var array */ protected $url_params; /** - * @var string $sql_query + * @var string */ protected $sql_query; /** - * @var array $visualizationSettings + * @var array */ protected $visualizationSettings; /** - * @var \PhpMyAdmin\Gis\GisVisualization $visualization + * @var \PhpMyAdmin\Gis\GisVisualization */ protected $visualization; diff --git a/libraries/classes/Controllers/Table/TableIndexesController.php b/libraries/classes/Controllers/Table/TableIndexesController.php index b9572b8ad1..e20932826b 100644 --- a/libraries/classes/Controllers/Table/TableIndexesController.php +++ b/libraries/classes/Controllers/Table/TableIndexesController.php @@ -24,7 +24,7 @@ use PhpMyAdmin\Util; class TableIndexesController extends TableController { /** - * @var Index $index + * @var Index */ protected $index; diff --git a/libraries/classes/Controllers/Table/TableRelationController.php b/libraries/classes/Controllers/Table/TableRelationController.php index 09c028e109..facd2a22bf 100644 --- a/libraries/classes/Controllers/Table/TableRelationController.php +++ b/libraries/classes/Controllers/Table/TableRelationController.php @@ -26,37 +26,37 @@ use PhpMyAdmin\Util; class TableRelationController extends TableController { /** - * @var array $options_array + * @var array */ protected $options_array; /** - * @var array $cfgRelation + * @var array */ protected $cfgRelation; /** - * @var array $existrel + * @var array */ protected $existrel; /** - * @var string $tbl_storage_engine + * @var string */ protected $tbl_storage_engine; /** - * @var array $existrel_foreign + * @var array */ protected $existrel_foreign; /** - * @var Table $udp_query + * @var Table */ protected $upd_query; /** - * @var Relation $relation + * @var Relation */ private $relation; diff --git a/libraries/classes/Controllers/Table/TableSearchController.php b/libraries/classes/Controllers/Table/TableSearchController.php index fbe5f0c0e9..2f6eae6767 100644 --- a/libraries/classes/Controllers/Table/TableSearchController.php +++ b/libraries/classes/Controllers/Table/TableSearchController.php @@ -83,7 +83,7 @@ class TableSearchController extends TableController protected $url_query; /** - * @var Relation $relation + * @var Relation */ private $relation; diff --git a/libraries/classes/Controllers/Table/TableStructureController.php b/libraries/classes/Controllers/Table/TableStructureController.php index 10e935707b..f1ccfaef24 100644 --- a/libraries/classes/Controllers/Table/TableStructureController.php +++ b/libraries/classes/Controllers/Table/TableStructureController.php @@ -76,7 +76,7 @@ class TableStructureController extends TableController private $createAddField; /** - * @var Relation $relation + * @var Relation */ private $relation; @@ -511,7 +511,7 @@ class TableStructureController extends TableController * @param array $selected the selected columns * @param string $action target script to call * - * @return boolean $regenerate true if error occurred + * @return boolean true if error occurred * */ protected function displayHtmlForColumnChange($selected, $action) @@ -866,7 +866,7 @@ class TableStructureController extends TableController /** * Update the table's structure based on $_REQUEST * - * @return boolean $regenerate true if error occurred + * @return boolean true if error occurred * */ protected function updateColumns() @@ -1110,7 +1110,7 @@ class TableStructureController extends TableController * @param array $adjust_privileges assoc array of old col names mapped to new * cols * - * @return boolean $changed boolean whether at least one column privileges + * @return boolean boolean whether at least one column privileges * adjusted */ protected function adjustColumnPrivileges(array $adjust_privileges) @@ -1156,7 +1156,7 @@ class TableStructureController extends TableController * * @param integer $i column index in the request * - * @return boolean $alterTableNeeded true if we need to generate ALTER TABLE + * @return boolean true if we need to generate ALTER TABLE * */ protected function columnNeedsAlterTable($i) @@ -1400,7 +1400,7 @@ class TableStructureController extends TableController /** * Get HTML snippet for display table statistics * - * @return string $html_output + * @return string */ protected function getTableStats() { diff --git a/libraries/classes/Controllers/TableController.php b/libraries/classes/Controllers/TableController.php index 624e660a8d..68b8af42e5 100644 --- a/libraries/classes/Controllers/TableController.php +++ b/libraries/classes/Controllers/TableController.php @@ -17,12 +17,12 @@ namespace PhpMyAdmin\Controllers; abstract class TableController extends Controller { /** - * @var string $db + * @var string */ protected $db; /** - * @var string $table + * @var string */ protected $table; diff --git a/libraries/classes/Core.php b/libraries/classes/Core.php index 045fddd579..6fac03c3bd 100644 --- a/libraries/classes/Core.php +++ b/libraries/classes/Core.php @@ -107,7 +107,7 @@ class Core * @param mixed $default default value * @param mixed $type var type or array of values to check against $var * - * @return mixed $var or $default + * @return mixed $var or $default * * @see self::isValid() */ @@ -412,7 +412,7 @@ class Core * * @param string|int $size size (Default = 0) * - * @return integer $size + * @return integer */ public static function getRealSize($size = 0): int { diff --git a/libraries/classes/CreateAddField.php b/libraries/classes/CreateAddField.php index 883bfb7558..1ec0b31977 100644 --- a/libraries/classes/CreateAddField.php +++ b/libraries/classes/CreateAddField.php @@ -69,7 +69,7 @@ class CreateAddField * @param boolean $isCreateTable true if requirement is to get the statement * for table creation * - * @return array $definitions An array of initial sql statements + * @return array An array of initial sql statements * according to the request */ private function buildColumnCreationStatement( @@ -130,7 +130,7 @@ class CreateAddField * @param bool $isCreateTable true if requirement is to get the statement * for table creation * - * @return string $sqlSuffix suffix + * @return string suffix */ private function setColumnCreationStatementSuffix( int $previousField, @@ -241,7 +241,7 @@ class CreateAddField * @param boolean $isCreateTable true if requirement is to get the statement * for table creation * - * @return string $sqlPrefix prefix + * @return string prefix */ private function getStatementPrefix(bool $isCreateTable = true): string { @@ -261,7 +261,7 @@ class CreateAddField * @param array $indexedColumns the columns for one type of index * @param string $indexKeyword the index keyword to use in the definition * - * @return array $index_definitions + * @return array */ private function mergeIndexStatements( array $definitions, diff --git a/libraries/classes/Database/Designer.php b/libraries/classes/Database/Designer.php index c5fde12d23..18b3438f74 100644 --- a/libraries/classes/Database/Designer.php +++ b/libraries/classes/Database/Designer.php @@ -30,7 +30,7 @@ class Designer private $dbi; /** - * @var Relation $relation + * @var Relation */ private $relation; diff --git a/libraries/classes/Database/Designer/Common.php b/libraries/classes/Database/Designer/Common.php index 7d63dd025c..326b4ed03d 100644 --- a/libraries/classes/Database/Designer/Common.php +++ b/libraries/classes/Database/Designer/Common.php @@ -23,7 +23,7 @@ use PhpMyAdmin\Util; class Common { /** - * @var Relation $relation + * @var Relation */ private $relation; diff --git a/libraries/classes/Database/Qbe.php b/libraries/classes/Database/Qbe.php index 5c24fc3655..36d36f076c 100644 --- a/libraries/classes/Database/Qbe.php +++ b/libraries/classes/Database/Qbe.php @@ -217,7 +217,7 @@ class Qbe private $_currentSearch = null; /** - * @var Relation $relation + * @var Relation */ private $relation; diff --git a/libraries/classes/DatabaseInterface.php b/libraries/classes/DatabaseInterface.php index dd2d5ac870..91400158e5 100644 --- a/libraries/classes/DatabaseInterface.php +++ b/libraries/classes/DatabaseInterface.php @@ -119,7 +119,7 @@ class DatabaseInterface public $types; /** - * @var Relation $relation + * @var Relation */ private $relation; @@ -808,7 +808,7 @@ class DatabaseInterface * * @param string $db Database name to look in * - * @return array $views Set of VIEWs inside the database + * @return array Set of VIEWs inside the database */ public function getVirtualTables(string $db): array { @@ -840,7 +840,7 @@ class DatabaseInterface * * @todo move into ListDatabase? * - * @return array $databases + * @return array */ public function getDatabasesFull( ?string $database = null, @@ -1376,7 +1376,7 @@ class DatabaseInterface * @param string $table name of the table whose indexes are to be retrieved * @param mixed $link mysql link resource * - * @return array $indexes + * @return array */ public function getTableIndexes( string $database, @@ -2758,7 +2758,7 @@ class DatabaseInterface * * @param integer $link link type * - * @return string|bool $error or false + * @return string|bool error or false */ public function getError($link = DatabaseInterface::CONNECT_USER) { @@ -3013,7 +3013,7 @@ class DatabaseInterface /** * returns default server collation from show variables * - * @return string $server_collation + * @return string */ public function getServerCollation(): string { diff --git a/libraries/classes/Dbi/DbiDummy.php b/libraries/classes/Dbi/DbiDummy.php index b0d01e17f8..8f2cf319fa 100644 --- a/libraries/classes/Dbi/DbiDummy.php +++ b/libraries/classes/Dbi/DbiDummy.php @@ -316,7 +316,7 @@ class DbiDummy implements DbiExtension * * @param resource $link connection link * - * @return string|bool $error or false + * @return string|bool error or false */ public function getError($link) { diff --git a/libraries/classes/Dbi/DbiExtension.php b/libraries/classes/Dbi/DbiExtension.php index e92be9939a..887e7e6a51 100644 --- a/libraries/classes/Dbi/DbiExtension.php +++ b/libraries/classes/Dbi/DbiExtension.php @@ -164,7 +164,7 @@ interface DbiExtension * * @param resource $link connection link * - * @return string|bool $error or false + * @return string|bool error or false */ public function getError($link); diff --git a/libraries/classes/Dbi/DbiMysqli.php b/libraries/classes/Dbi/DbiMysqli.php index 61eefc6557..1ec1a9187c 100644 --- a/libraries/classes/Dbi/DbiMysqli.php +++ b/libraries/classes/Dbi/DbiMysqli.php @@ -340,7 +340,7 @@ class DbiMysqli implements DbiExtension * * @param \mysqli $mysqli mysql link * - * @return string|bool $error or false + * @return string|bool error or false */ public function getError($mysqli) { diff --git a/libraries/classes/Display/Export.php b/libraries/classes/Display/Export.php index 37d9fa1362..5b02a0a657 100644 --- a/libraries/classes/Display/Export.php +++ b/libraries/classes/Display/Export.php @@ -30,7 +30,7 @@ use PhpMyAdmin\Util; class Export { /** - * @var Relation $relation + * @var Relation */ private $relation; @@ -653,7 +653,7 @@ class Export * @param int $unlimNumRows unlimited number of rows * @param string $multiValues selector options * - * @return string $html + * @return string */ public function getDisplay( $exportType, diff --git a/libraries/classes/Display/Results.php b/libraries/classes/Display/Results.php index 259b6c2e28..a05b834be9 100644 --- a/libraries/classes/Display/Results.php +++ b/libraries/classes/Display/Results.php @@ -188,7 +188,7 @@ class Results public $transformation_info; /** - * @var Relation $relation + * @var Relation */ private $relation; @@ -464,7 +464,7 @@ class Results * * @param array $displayParts the parts to display * - * @return array $displayParts the modified display parts + * @return array the modified display parts * * @access private * @@ -488,7 +488,7 @@ class Results * * @param array $displayParts the parts to display * - * @return array $displayParts the modified display parts + * @return array the modified display parts * * @access private * @@ -537,7 +537,7 @@ class Results * * @param array $displayParts the parts to display * - * @return array $displayParts the modified display parts + * @return array the modified display parts * * @access private * @@ -568,7 +568,7 @@ class Results * * @param array $displayParts the parts to display * - * @return array $displayParts the modified display parts + * @return array the modified display parts * * @access private * @@ -1078,7 +1078,7 @@ class Results * @param integer $pos_next the offset for the "next" page * @param boolean $is_innodb whether it's InnoDB or not * - * @return string $buttons_html html content + * @return string html content * * @access private * @@ -1457,7 +1457,7 @@ class Results * @param string|null $sort_expression the sort expression * @param string $unsorted_sql_query the unsorted sql query * - * @return string $drop_down_html html content + * @return string html content * * @access private * @@ -1622,7 +1622,7 @@ class Results * * @param array $analyzed_sql_results analyzed sql results * - * @return array $comments_map table comments + * @return array table comments * * @access private * @@ -1683,7 +1683,7 @@ class Results * * @param array $analyzed_sql_results analyzed sql results * - * @return string $data_html html content + * @return string html content * * @access private * @@ -1806,7 +1806,7 @@ class Results * * @param string $deleteLink the delete link of current row * - * @return string $form_html html content + * @return string html content * * @access private * @@ -2114,7 +2114,7 @@ class Results * @param string $sort_tbl the table name * @param string $name_to_use_in_sort the sorting column name * - * @return boolean $is_in_sort the column sorted or not + * @return boolean the column sorted or not * * @access private * @@ -2297,7 +2297,7 @@ class Results * @param string $order_link the order link * @param string $comments the comment for the column * - * @return string $draggable_html html content + * @return string html content * * @access private * @@ -2347,7 +2347,7 @@ class Results * @param array $fields_meta set of field properties * @param string $comments the comment for the column * - * @return string $draggable_html html content + * @return string html content * * @access private * @@ -2610,7 +2610,7 @@ class Results * @param array $analyzed_sql_results analyzed sql results * @param boolean $is_limited_display with limited operations or not * - * @return string $table_body_html html content + * @return string html content * * @global array $row current row data * @@ -2945,7 +2945,7 @@ class Results * @param string $url_sql_query the analyzed sql query * @param array $analyzed_sql_results analyzed sql results * - * @return string $row_values_html html content + * @return string html content * * @access private * @@ -3289,7 +3289,7 @@ class Results * @param array $row current row data * @param array|boolean $col_order the column order * - * @return array $row_info associative array with column nama -> value + * @return array associative array with column nama -> value */ private function _getRowInfoForSpecialLinks(array $row, $col_order) { @@ -3311,7 +3311,7 @@ class Results * * @param array $analyzed_sql_results analyzed sql results * - * @return string $url_sql analyzed sql query + * @return string analyzed sql query * * @access private * @@ -3386,7 +3386,7 @@ class Results * * @param array $display_params holds various display info * - * @return string $header_html html content + * @return string html content * * @access private * @@ -3681,7 +3681,7 @@ class Results * @param string $hide_class the class for visibility of a column * @param string $field_type_class the class related to type of the field * - * @return string $class the combined classes + * @return string the combined classes * * @access private * @@ -3706,7 +3706,7 @@ class Results * * @param string $type the type of the column field * - * @return string $field_type_class the class for the column + * @return string the class for the column * * @access private * @@ -3749,7 +3749,7 @@ class Results * function * @param array $transform_options the transformation parameters * - * @return string $cell the prepared cell, html content + * @return string the prepared cell, html content * * @access private * @@ -3825,7 +3825,7 @@ class Results * @param string $transform_options the transformation parameters * @param array $analyzed_sql_results the analyzed query * - * @return string $cell the prepared data cell, html content + * @return string the prepared data cell, html content * * @access private * @@ -3978,7 +3978,7 @@ class Results * have to be displayed * @param integer $col_index the column index * - * @return string $cell the prepared data cell, html content + * @return string the prepared data cell, html content * * @access private * @@ -4305,7 +4305,7 @@ class Results * @param array $analyzed_sql_results analyzed sql results * @param boolean $is_limited_display With limited operations or not * - * @return string $table_html Generated HTML content for resulted table + * @return string Generated HTML content for resulted table * * @access public * @@ -4730,7 +4730,7 @@ class Results * @param string $pre_count the string renders before row count * @param string $after_count the string renders after row count * - * @return Message $message an object of Message + * @return Message an object of Message * * @access private * @@ -4899,7 +4899,7 @@ class Results * @param array $analyzed_sql_results analyzed sql results * @param string $del_link the display element - 'del_link' * - * @return string $links_html html content + * @return string html content * * @access private * @@ -5102,7 +5102,7 @@ class Results /** * Get copy to clipboard links for results operations * - * @return string $html + * @return string * * @access private */ @@ -5124,7 +5124,7 @@ class Results /** * Get printview links for results operations * - * @return string $html + * @return string * * @access private */ @@ -5151,7 +5151,7 @@ class Results * @param array $analyzed_sql_results analyzed sql results * @param boolean $only_view Whether to show only view * - * @return string $results_operations_html html content + * @return string html content * * @access private * diff --git a/libraries/classes/ErrorReport.php b/libraries/classes/ErrorReport.php index ec10c5b333..20a8b80b45 100644 --- a/libraries/classes/ErrorReport.php +++ b/libraries/classes/ErrorReport.php @@ -34,7 +34,7 @@ class ErrorReport private $httpRequest; /** - * @var Relation $relation + * @var Relation */ private $relation; @@ -234,7 +234,7 @@ class ErrorReport * * @param array $stack the stack trace * - * @return array $stack the modified stack trace + * @return array the modified stack trace */ private function translateStacktrace(array $stack): array { diff --git a/libraries/classes/Export.php b/libraries/classes/Export.php index f695a8a9b4..305bb8f94d 100644 --- a/libraries/classes/Export.php +++ b/libraries/classes/Export.php @@ -196,7 +196,7 @@ class Export * @param string $back_button the link for going Back * @param string $refreshButton the link for refreshing page * - * @return string $html the HTML output + * @return string the HTML output */ public function getHtmlForDisplayedExportFooter( string $back_button, @@ -226,7 +226,7 @@ class Export /** * Computes the memory limit for export * - * @return int $memory_limit the memory limit + * @return int the memory limit */ public function getMemoryLimit(): int { @@ -390,7 +390,7 @@ class Export * @param string $dump_buffer the current dump buffer * @param string $save_filename the export filename * - * @return Message $message a message object (or empty string) + * @return Message a message object (or empty string) */ public function closeFile( $file_handle, @@ -426,7 +426,7 @@ class Export * @param string $compression the compression mode * @param string $filename the filename * - * @return object $message a message object (or empty string) + * @return object a message object (or empty string) */ public function compress($dump_buffer, string $compression, string $filename) { diff --git a/libraries/classes/Footer.php b/libraries/classes/Footer.php index 8c00cc44b8..358a05e625 100644 --- a/libraries/classes/Footer.php +++ b/libraries/classes/Footer.php @@ -58,7 +58,7 @@ class Footer private $_isEnabled; /** - * @var Relation $relation + * @var Relation */ private $relation; diff --git a/libraries/classes/Header.php b/libraries/classes/Header.php index 26c3481a44..13260a44c8 100644 --- a/libraries/classes/Header.php +++ b/libraries/classes/Header.php @@ -121,7 +121,7 @@ class Header private $userPreferences; /** - * @var Template $template + * @var Template */ private $template; diff --git a/libraries/classes/Index.php b/libraries/classes/Index.php index 00c95ded0b..39b82b21e9 100644 --- a/libraries/classes/Index.php +++ b/libraries/classes/Index.php @@ -644,7 +644,7 @@ class Index /** * Get HTML for display indexes * - * @return string $html_output + * @return string */ public static function getHtmlForDisplayIndexes() { diff --git a/libraries/classes/InsertEdit.php b/libraries/classes/InsertEdit.php index 6e60f3cc6a..5105241c2c 100644 --- a/libraries/classes/InsertEdit.php +++ b/libraries/classes/InsertEdit.php @@ -36,7 +36,7 @@ class InsertEdit private $dbi; /** - * @var Relation $relation + * @var Relation */ private $relation; @@ -78,7 +78,7 @@ class InsertEdit * @param array $where_clause_array array of where clauses * @param string $err_url error url * - * @return array $form_params array of insert/edit form parameters + * @return array array of insert/edit form parameters */ public function getFormParametersForInsertForm( $db, @@ -132,7 +132,7 @@ class InsertEdit * @param string $table name of the table * @param string $db name of the database * - * @return array $where_clauses, $result, $rows + * @return array $where_clauses, $result, $rows, $found_unique_key */ private function analyzeWhereClauses( array $where_clause_array, @@ -179,7 +179,7 @@ class InsertEdit * @param string $local_query query performed * @param array $result MySQL result handle * - * @return boolean $has_unique_condition + * @return boolean */ private function showEmptyResultMessageOrSetUniqueCondition( array $rows, @@ -586,7 +586,7 @@ class InsertEdit * @param array $foreigners keys into foreign fields * @param array $foreignData data about the foreign keys * - * @return integer $nullify_code + * @return integer */ private function getNullifyCodeForNullColumn( array $column, @@ -2123,7 +2123,7 @@ class InsertEdit /** * Prepares the update/insert of a row * - * @return array $loop_array, $using_key, $is_insert, $is_insertignore + * @return array $loop_array, $using_key, $is_insert, $is_insertignore */ public function getParamsForUpdateOrInsert() { @@ -2220,7 +2220,7 @@ class InsertEdit * @param string $goto_include store some script for include, otherwise it is * boolean false * - * @return string $goto_include + * @return string */ public function getGotoInclude($goto_include) { @@ -2299,8 +2299,8 @@ class InsertEdit * @param array $url_params url parameters array * @param array $query built query from buildSqlQuery() * - * @return array $url_params, $total_affected_rows, $last_messages - * $warning_messages, $error_messages, $return_to_sql_query + * @return array $url_params, $total_affected_rows, $last_messages + * $warning_messages, $error_messages, $return_to_sql_query */ public function executeSqlQuery(array $url_params, array $query) { @@ -2367,7 +2367,7 @@ class InsertEdit /** * get the warning messages array * - * @return array $warning_essages + * @return array */ private function getWarningMessages() { @@ -2388,7 +2388,7 @@ class InsertEdit * table or optionally a given column in a table * @param string $relation_field relation field * - * @return string $dispval display value from the foreign table + * @return string display value from the foreign table */ public function getDisplayValueForForeignTableColumn( $where_comparison, @@ -2435,7 +2435,7 @@ class InsertEdit * @param string $dispval display value from the foreign table * @param string $relation_field_value relation field value * - * @return string $output HTML <a> tag + * @return string HTML <a> tag */ public function getLinkForRelationalDisplayField( array $map, @@ -2492,7 +2492,7 @@ class InsertEdit * @param array $extra_data extra data array * @param string $type the type of transformation * - * @return array $extra_data + * @return array */ public function transformEditedValues( $db, @@ -2550,7 +2550,7 @@ class InsertEdit * @param array $func_no_param array of set of string * @param string $key an md5 of the column name * - * @return array $cur_value + * @return array */ public function getCurrentValueAsAnArrayForMultipleEdit( $multi_edit_funcs, @@ -2694,7 +2694,7 @@ class InsertEdit * @param string $table table name * @param array $multi_edit_funcs multiple edit functions array * - * @return string $current_value current column value in the form + * @return string current column value in the form */ public function getCurrentValueForDifferentTypes( $possibly_uploaded_val, @@ -2937,7 +2937,7 @@ class InsertEdit * @param string $db current database * @param string $table current table * - * @return array $comments_map comments for columns + * @return array comments for columns */ public function getCommentsMap($db, $table) { @@ -2956,7 +2956,7 @@ class InsertEdit * @param string $db current database * @param string $table current table * - * @return array $url_params url parameters + * @return array url parameters */ public function getUrlParameters($db, $table) { diff --git a/libraries/classes/Menu.php b/libraries/classes/Menu.php index 6466a853be..41b21d7d1f 100644 --- a/libraries/classes/Menu.php +++ b/libraries/classes/Menu.php @@ -45,7 +45,7 @@ class Menu private $_table; /** - * @var Relation $relation + * @var Relation */ private $relation; diff --git a/libraries/classes/MultSubmits.php b/libraries/classes/MultSubmits.php index c49328a616..4529e44ff0 100644 --- a/libraries/classes/MultSubmits.php +++ b/libraries/classes/MultSubmits.php @@ -37,7 +37,7 @@ class MultSubmits private $relationCleanup; /** - * @var Operations $operations + * @var Operations */ private $operations; diff --git a/libraries/classes/Navigation/Navigation.php b/libraries/classes/Navigation/Navigation.php index 8156ec497f..b355ddf922 100644 --- a/libraries/classes/Navigation/Navigation.php +++ b/libraries/classes/Navigation/Navigation.php @@ -25,7 +25,7 @@ use PhpMyAdmin\Util; class Navigation { /** - * @var Relation $relation + * @var Relation */ public $relation; diff --git a/libraries/classes/Navigation/Nodes/Node.php b/libraries/classes/Navigation/Nodes/Node.php index fadb7c50eb..73fb10b513 100644 --- a/libraries/classes/Navigation/Nodes/Node.php +++ b/libraries/classes/Navigation/Nodes/Node.php @@ -105,7 +105,7 @@ class Node public $pos3 = 0; /** - * @var Relation $relation + * @var Relation */ protected $relation; diff --git a/libraries/classes/Normalization.php b/libraries/classes/Normalization.php index 488c9ae7e5..16f35f8186 100644 --- a/libraries/classes/Normalization.php +++ b/libraries/classes/Normalization.php @@ -32,7 +32,7 @@ class Normalization private $dbi; /** - * @var Relation $relation + * @var Relation */ private $relation; diff --git a/libraries/classes/Operations.php b/libraries/classes/Operations.php index 333050a23f..65951c8390 100644 --- a/libraries/classes/Operations.php +++ b/libraries/classes/Operations.php @@ -30,12 +30,12 @@ use PhpMyAdmin\Util; class Operations { /** - * @var Relation $relation + * @var Relation */ private $relation; /** - * @var DatabaseInterface $dbi + * @var DatabaseInterface */ private $dbi; @@ -56,7 +56,7 @@ class Operations * * @param string $db database name * - * @return string $html_output + * @return string */ public function getHtmlForDatabaseComment($db) { @@ -88,7 +88,7 @@ class Operations * * @param string $db database name * - * @return string $html_output + * @return string */ public function getHtmlForRenameDatabase($db) { @@ -153,7 +153,7 @@ class Operations * * @param string $db database name * - * @return string $html_output + * @return string */ public function getHtmlForDropDatabaseLink($db) { @@ -197,7 +197,7 @@ class Operations * * @param string $db database name * - * @return string $html_output + * @return string */ public function getHtmlForCopyDatabase($db) { @@ -298,7 +298,7 @@ class Operations * @param string $db database name * @param string $table table name * - * @return string $html_output + * @return string */ public function getHtmlForChangeDatabaseCharset($db, $table) { @@ -437,7 +437,7 @@ class Operations * @param ExportSql $export_sql_plugin export plugin instance * @param string $db database name * - * @return array $views + * @return array */ public function getViewsAndCreateSqlViewStandIn( array $tables_full, @@ -821,7 +821,7 @@ class Operations * * @param array $columns columns array * - * @return string $html_out + * @return string */ public function getHtmlForOrderTheTable(array $columns) { @@ -863,7 +863,7 @@ class Operations /** * Get the HTML snippet for move table * - * @return string $html_output + * @return string */ public function getHtmlForMoveTable() { @@ -944,7 +944,7 @@ class Operations * @param string $page_checksum value of page checksum * @param string $checksum the checksum * - * @return string $html_output + * @return string */ public function getTableOptionDiv( $pma_table, @@ -993,7 +993,7 @@ class Operations /** * Get HTML for the rename table part of table options * - * @return string $html_output + * @return string */ private function getHtmlForRenameTable() { @@ -1032,7 +1032,7 @@ class Operations * * @param string $current_value of the table comments * - * @return string $html_output + * @return string */ private function getHtmlForTableComments($current_value) { @@ -1054,7 +1054,7 @@ class Operations * * @param string $current_value of the pack keys option * - * @return string $html_output + * @return string */ private function getHtmlForPackKeys($current_value) { @@ -1098,7 +1098,7 @@ class Operations * @param string $page_checksum value of page checksum * @param string $checksum the checksum * - * @return string $html_output + * @return string */ private function getTableOptionFieldset( $pma_table, @@ -1234,7 +1234,7 @@ class Operations * @param string $label label value * @param string $val checksum, delay_key_write, transactional, page_checksum * - * @return string $html_output + * @return string */ private function getHtmlForTableRow($attribute, $label, $val) { @@ -1253,7 +1253,7 @@ class Operations /** * Get array of possible row formats * - * @return array $possible_row_formats + * @return array */ private function getPossibleRowFormat() { @@ -1309,7 +1309,7 @@ class Operations /** * Get HTML div for copy table * - * @return string $html_output + * @return string */ public function getHtmlForCopytable() { @@ -1415,7 +1415,7 @@ class Operations * @param Table $pma_table Table object * @param array $url_params array of URL parameters * - * @return string $html_output + * @return string */ public function getHtmlForTableMaintenance($pma_table, array $url_params) { @@ -1440,7 +1440,7 @@ class Operations * @param Table $pma_table Table object * @param array $url_params Array of URL parameters * - * @return string $html_output + * @return string */ private function getListofMaintainActionLink($pma_table, array $url_params) { @@ -1562,7 +1562,7 @@ class Operations * @param array $url_params additional url parameters * @param string $link contains name of page/anchor that is being linked * - * @return string $html_output + * @return string */ private function getMaintainActionlink($action_message, array $params, array $url_params, $link) { @@ -1582,7 +1582,7 @@ class Operations * @param array $truncate_table_url_params url parameter array for truncate table * @param array $dropTableUrlParams url parameter array for drop table * - * @return string $html_output + * @return string */ public function getHtmlForDeleteDataOrTable( array $truncate_table_url_params, @@ -1642,7 +1642,7 @@ class Operations * @param array $partition_names array of partition names for a specific db/table * @param array $url_params url parameters * - * @return string $html_output + * @return string */ public function getHtmlForPartitionMaintenance(array $partition_names, array $url_params) { @@ -1736,7 +1736,7 @@ class Operations * or optionally a given column in a table * @param array $url_params array of url parameters * - * @return string $html_output + * @return string */ public function getHtmlForReferentialIntegrityCheck(array $foreign, array $url_params) { @@ -1832,7 +1832,7 @@ class Operations * @param string $transactional value of transactional * @param string $tbl_collation collation of the table * - * @return array $table_alters + * @return array */ public function getTableAltersArray( $pma_table, @@ -1933,7 +1933,7 @@ class Operations /** * Get warning messages array * - * @return array $warning_messages + * @return array */ public function getWarningMessagesArray() { diff --git a/libraries/classes/Plugins/Export/ExportSql.php b/libraries/classes/Plugins/Export/ExportSql.php index 68d0046da0..5f673e1230 100644 --- a/libraries/classes/Plugins/Export/ExportSql.php +++ b/libraries/classes/Plugins/Export/ExportSql.php @@ -642,7 +642,7 @@ class ExportSql extends ExportPlugin /** * Possibly outputs CRLF * - * @return string $crlf or nothing + * @return string crlf or nothing */ private function _possibleCRLF() { diff --git a/libraries/classes/Plugins/Export/Helpers/Pdf.php b/libraries/classes/Plugins/Export/Helpers/Pdf.php index fac48e0c86..385910635b 100644 --- a/libraries/classes/Plugins/Export/Helpers/Pdf.php +++ b/libraries/classes/Plugins/Export/Helpers/Pdf.php @@ -49,7 +49,7 @@ class Pdf extends PdfLib private $aliases; /** - * @var Relation $relation + * @var Relation */ private $relation; diff --git a/libraries/classes/Plugins/ExportPlugin.php b/libraries/classes/Plugins/ExportPlugin.php index 71eee3820d..03f0da4d93 100644 --- a/libraries/classes/Plugins/ExportPlugin.php +++ b/libraries/classes/Plugins/ExportPlugin.php @@ -33,12 +33,12 @@ abstract class ExportPlugin protected $properties; /** - * @var Relation $relation + * @var Relation */ public $relation; /** - * @var Export $export + * @var Export */ protected $export; diff --git a/libraries/classes/Plugins/Schema/ExportRelationSchema.php b/libraries/classes/Plugins/Schema/ExportRelationSchema.php index 4b6962c59f..a73ebca20f 100644 --- a/libraries/classes/Plugins/Schema/ExportRelationSchema.php +++ b/libraries/classes/Plugins/Schema/ExportRelationSchema.php @@ -35,7 +35,7 @@ class ExportRelationSchema protected $offline; /** - * @var Relation $relation + * @var Relation */ protected $relation; diff --git a/libraries/classes/Plugins/Schema/Pdf/Pdf.php b/libraries/classes/Plugins/Schema/Pdf/Pdf.php index 12de3a5216..7041964323 100644 --- a/libraries/classes/Plugins/Schema/Pdf/Pdf.php +++ b/libraries/classes/Plugins/Schema/Pdf/Pdf.php @@ -58,7 +58,7 @@ class Pdf extends PdfLib private $_db; /** - * @var Relation $relation + * @var Relation */ private $relation; diff --git a/libraries/classes/Plugins/Schema/TableStats.php b/libraries/classes/Plugins/Schema/TableStats.php index 2ddbd8ada2..c0a15f3724 100644 --- a/libraries/classes/Plugins/Schema/TableStats.php +++ b/libraries/classes/Plugins/Schema/TableStats.php @@ -42,7 +42,7 @@ abstract class TableStats protected $offline; /** - * @var Relation $relation + * @var Relation */ protected $relation; diff --git a/libraries/classes/RecentFavoriteTable.php b/libraries/classes/RecentFavoriteTable.php index a16aafa4c7..7579269071 100644 --- a/libraries/classes/RecentFavoriteTable.php +++ b/libraries/classes/RecentFavoriteTable.php @@ -50,7 +50,7 @@ class RecentFavoriteTable private static $_instances = []; /** - * @var Relation $relation + * @var Relation */ private $relation; diff --git a/libraries/classes/Relation.php b/libraries/classes/Relation.php index 7815929852..00b2ffc9f8 100644 --- a/libraries/classes/Relation.php +++ b/libraries/classes/Relation.php @@ -94,7 +94,7 @@ class Relation /** * Returns current relation parameters * - * @return array $cfgRelation + * @return array */ public function getRelationsParam() { @@ -1793,7 +1793,7 @@ class Relation * @param array $cfgRelation Relation configuration * @param string $db database name * - * @return int $pdf_page_number + * @return int */ public function createPage(?string $newpage, array $cfgRelation, $db) { @@ -1820,7 +1820,7 @@ class Relation * @param string $table name of master table. * @param string $column name of master table column. * - * @return array $child_references + * @return array */ public function getChildReferences($db, $table, $column = '') { @@ -1855,7 +1855,7 @@ class Relation * @param array|null $foreigners_full foreiners array for the whole table. * @param array|null $child_references_full child references for the whole table. * - * @return array $column_status telling about references if foreign key. + * @return array telling about references if foreign key. */ public function checkChildForeignReferences( $db, diff --git a/libraries/classes/Replication.php b/libraries/classes/Replication.php index d62dcae782..10ed4fbf3f 100644 --- a/libraries/classes/Replication.php +++ b/libraries/classes/Replication.php @@ -147,7 +147,7 @@ class Replication * @param int $port mysql remote port * @param string $socket path to unix socket * - * @return mixed $link mysql link on success + * @return mixed mysql link on success */ public function connectToMaster( $user, diff --git a/libraries/classes/SavedSearches.php b/libraries/classes/SavedSearches.php index f06e1659d2..3c9ea0ae5f 100644 --- a/libraries/classes/SavedSearches.php +++ b/libraries/classes/SavedSearches.php @@ -58,7 +58,7 @@ class SavedSearches private $_criterias = null; /** - * @var Relation $relation + * @var Relation */ private $relation; diff --git a/libraries/classes/Server/Privileges.php b/libraries/classes/Server/Privileges.php index df786675e4..48c5594694 100644 --- a/libraries/classes/Server/Privileges.php +++ b/libraries/classes/Server/Privileges.php @@ -38,12 +38,12 @@ class Privileges private $relationCleanup; /** - * @var DatabaseInterface $dbi + * @var DatabaseInterface */ public $dbi; /** - * @var Relation $relation + * @var Relation */ public $relation; @@ -506,7 +506,7 @@ class Privileges * @param string $name_for_dfn name for dfn * @param string $name_for_current name for current * - * @return string $html_output html snippet + * @return string html snippet */ public function getHtmlForColumnPrivileges( array $columns, @@ -939,7 +939,7 @@ class Privileges * @param string $routine the routine * @param string $url_dbname url encoded db name * - * @return string $html_output + * @return string */ public function getHtmlForRoutineSpecificPrivileges( $username, @@ -1028,7 +1028,7 @@ class Privileges * @param array $columns columns array * @param array $row current privileges row * - * @return string $html_output + * @return string */ public function getHtmlForTableSpecificPrivileges( $username, @@ -1096,7 +1096,7 @@ class Privileges * @param array $columns columns array * @param array $row first row from result or boolean false * - * @return string $html_output + * @return string */ public function getHtmlForAttachedPrivilegesToTableSpecificColumn(array $columns, array $row) { @@ -1147,7 +1147,7 @@ class Privileges * * @param array $row first row from result or boolean false * - * @return string $html_output + * @return string */ public function getHtmlForNotAttachedPrivilegesToTableSpecificColumn(array $row) { @@ -1225,7 +1225,7 @@ class Privileges * @param string $table the table * @param array $row first row from result or boolean false * - * @return string $html_output + * @return string */ public function getHtmlForGlobalOrDbSpecificPrivs($db, $table, array $row) { @@ -1472,7 +1472,7 @@ class Privileges * (Data, Structure, Administration) * @param array $row first row from result or boolean false * - * @return string $html_output + * @return string */ public function getHtmlForGlobalPrivTableWithCheckboxes( array $privTable, @@ -1495,7 +1495,7 @@ class Privileges * (allowed values: 'new', 'edit', 'change_pw') * @param string $versions Is MySQL version newer or older than 5.5.7 * - * @return string $html_output + * @return string */ public function getHtmlForAuthPluginsDropdown( $orig_auth_plugin, @@ -1530,7 +1530,7 @@ class Privileges /** * Gets the currently active authentication plugins * - * @return array $result array of plugin names and descriptions + * @return array array of plugin names and descriptions */ public function getActiveAuthPlugins() { @@ -1567,7 +1567,7 @@ class Privileges * @global array $cfg the phpMyAdmin configuration * @global resource $user_link the database connection * - * @return string $html_output a HTML snippet + * @return string a HTML snippet */ public function getHtmlForLoginInformationFields( $mode = 'new', @@ -1950,7 +1950,7 @@ class Privileges * @param string $username username * @param string $hostname hostname * - * @return string $message success or error message after updating password + * @return string success or error message after updating password */ public function updatePassword($err_url, $username, $hostname) { @@ -2201,7 +2201,7 @@ class Privileges /** * Get a WITH clause for 'update privileges' and 'add user' * - * @return string $sql_query + * @return string */ public function getWithClauseForAddUserAndUpdatePrivs() { @@ -2368,7 +2368,7 @@ class Privileges * @param string $db database name * @param string $index_checkbox starting index for rows to be added * - * @return string $html_output + * @return string */ public function getHtmlTableBodyForSpecificDbRoutinePrivs($db, $index_checkbox) { @@ -2439,7 +2439,7 @@ class Privileges * * @param string $db database name * - * @return string $html_output + * @return string */ public function getHtmlForSpecificDbPrivileges($db) { @@ -2517,7 +2517,7 @@ class Privileges * @param string $db database name * @param string $table table name * - * @return string $html_output + * @return string */ public function getHtmlForSpecificTablePrivileges($db, $table) { @@ -2591,7 +2591,7 @@ class Privileges * * @param string $db the database * - * @return array $privMap the privilege map + * @return array the privilege map */ public function getPrivMap($db) { @@ -2643,7 +2643,7 @@ class Privileges /** * Get HTML snippet for privileges table head * - * @return string $html_output + * @return string */ public function getHtmlForPrivsTableHead() { @@ -2664,7 +2664,7 @@ class Privileges * Get HTML error for View Users form * For non superusers such as grant/create users * - * @return string $html_output + * @return string */ public function getHtmlForViewUsersError() { @@ -2679,7 +2679,7 @@ class Privileges * @param array $privMap privilege map * @param string $db database * - * @return string $html_output + * @return string */ public function getHtmlTableBodyForSpecificDbOrTablePrivs($privMap, $db) { @@ -2963,7 +2963,7 @@ class Privileges /** * Returns number of defined user groups * - * @return integer $user_group_count + * @return integer */ public function getUserGroupCount() { @@ -3026,7 +3026,7 @@ class Privileges * @param string $hostname hostname * @param string $username username * - * @return array $extra_data + * @return array */ public function getExtraDataForAjaxBehavior( $password, @@ -3297,7 +3297,7 @@ class Privileges * @param string $type database or table * @param string $dbname database name * - * @return array $db_rights database rights + * @return array database rights */ public function getUserSpecificRights($username, $hostname, $type, $dbname = '') { @@ -3435,7 +3435,7 @@ class Privileges * @param string $type database, table or routine * @param string $dbname database name * - * @return string $html_output + * @return string */ public function getHtmlForAllTableSpecificRights( $username, @@ -3883,7 +3883,7 @@ class Privileges /** * Get the database rights array for Display user overview * - * @return array $db_rights database rights array + * @return array database rights array */ public function getDbRightsForUserOverview() { @@ -4611,7 +4611,7 @@ class Privileges * @param string $entity_name entity (table or routine) name * @param string $entity_type optional, type of entity ('table' or 'routine') * - * @return string $html_output + * @return string */ public function getHtmlHeaderForUserProperties( $dbname_is_wildcard, @@ -4711,7 +4711,7 @@ class Privileges * @param string $pmaThemeImage a image source link * @param string $text_dir text directory * - * @return string $html_output + * @return string */ public function getHtmlForUserOverview($pmaThemeImage, $text_dir) { @@ -4888,7 +4888,7 @@ class Privileges * @param string $dbname database name * @param string $tablename table name * - * @return string $html_output + * @return string */ public function getHtmlForUserProperties( $dbname_is_wildcard, @@ -5004,7 +5004,7 @@ class Privileges * @param string $username username * @param string $hostname host name * - * @return array $queries + * @return array */ public function getTablePrivsQueriesForChangeOrCopyUser( $user_host_condition, @@ -5093,7 +5093,7 @@ class Privileges * @param string $username username * @param string $hostname host name * - * @return array $queries + * @return array */ public function getDbSpecificPrivsQueriesForChangeOrCopyUser( array $queries, @@ -5139,7 +5139,7 @@ class Privileges * @param string $hostname host name * @param string $dbname database name * - * @return array $sql_query, $message + * @return array, $message */ public function addUserAndCreateDatabase( $_error, @@ -5227,7 +5227,7 @@ class Privileges * * @param string $password password * - * @return string $hashedPassword + * @return string */ public function getHashedPassword($password) { diff --git a/libraries/classes/Server/Status/Data.php b/libraries/classes/Server/Status/Data.php index 107bd2df29..39b20bc97f 100644 --- a/libraries/classes/Server/Status/Data.php +++ b/libraries/classes/Server/Status/Data.php @@ -213,7 +213,7 @@ class Data * @param array $server_status contains results of SHOW GLOBAL STATUS * @param array $server_variables contains results of SHOW GLOBAL VARIABLES * - * @return array $server_status + * @return array */ private function _calculateValues(array $server_status, array $server_variables) { diff --git a/libraries/classes/Sql.php b/libraries/classes/Sql.php index 773c70ff7c..435183da97 100644 --- a/libraries/classes/Sql.php +++ b/libraries/classes/Sql.php @@ -37,7 +37,7 @@ use PhpMyAdmin\Util; class Sql { /** - * @var Relation $relation + * @var Relation */ private $relation; @@ -52,7 +52,7 @@ class Sql private $transformations; /** - * @var Operations $operations + * @var Operations */ private $operations; @@ -223,7 +223,7 @@ class Sql * @param string $column current column * @param string $curr_value current selected value * - * @return string $dropdown html for the dropdown + * @return string html for the dropdown */ private function getHtmlForRelationalColumnDropdown($db, $table, $column, $curr_value) { @@ -270,7 +270,7 @@ class Sql * @param string $db current database * @param array $profiling_results array containing the profiling info * - * @return string $profiling_table html for the profiling table and chart + * @return string html for the profiling table and chart */ private function getHtmlForProfilingChart($url_query, $db, $profiling_results) { @@ -404,7 +404,7 @@ EOT; * * @param array $profiling_stats profiling stats * - * @return string $table html for the table + * @return string html for the table */ private function getTableHtmlForProfilingSummaryByState(array $profiling_stats) { @@ -449,7 +449,7 @@ EOT; * @param string $column current column * @param string $curr_value currently selected value * - * @return string $dropdown html for the dropdown + * @return string html for the dropdown */ private function getHtmlForEnumColumnDropdown($db, $table, $column, $curr_value) { @@ -489,7 +489,7 @@ EOT; * @param string $column current column * @param string $curr_value currently selected value * - * @return string $dropdown html for the set column + * @return string html for the set column */ private function getHtmlForSetColumn($db, $table, $column, $curr_value) { @@ -536,7 +536,7 @@ EOT; * @param string $table current table * @param string $column current column * - * @return array $values array containing the value list for the column + * @return array array containing the value list for the column */ private function getValuesForColumn($db, $table, $column) { @@ -561,7 +561,7 @@ EOT; * @param array $values set of values * @param array $selected_values currently selected values * - * @return string $options HTML for options list + * @return string HTML for options list */ private function getHtmlForOptionsList(array $values, array $selected_values) { @@ -588,7 +588,7 @@ EOT; * @param string|null $complete_query complete query * @param string $bkm_user bookmarking user * - * @return string $html + * @return string */ public function getHtmlForBookmark( array $displayParts, @@ -779,7 +779,7 @@ EOT; * @param Table $pmatable Table instance * @param string $request_index col_order|col_visib * - * @return boolean $retval + * @return boolean */ private function setColumnProperty($pmatable, $request_index) { @@ -965,7 +965,7 @@ EOT; * @param string $db the current database * @param string $table the current table * - * @return string $sql_query the default $sql_query for browse page + * @return string the default $sql_query for browse page */ public function getDefaultSqlQueryForBrowse($db, $table) { @@ -1125,7 +1125,7 @@ EOT; * @param boolean $is_affected whether the query affected a table * @param mixed $result results of executing the query * - * @return int $num_rows number of rows affected or changed + * @return int number of rows affected or changed */ private function getNumberOfRowsAffectedOrChanged($is_affected, $result) { @@ -1144,7 +1144,7 @@ EOT; * * @param string $db the database in the query * - * @return int $reload whether to reload the navigation(1) or not(0) + * @return int whether to reload the navigation(1) or not(0) */ private function hasCurrentDbChanged($db) { @@ -1165,7 +1165,7 @@ EOT; * @param string|null $column current column * @param bool $purge whether purge set or not * - * @return array $extra_data + * @return array */ private function cleanupRelations($db, $table, ?string $column, $purge) { @@ -1193,7 +1193,7 @@ EOT; * @param array $analyzed_sql_results the analyzed query and other variables set * after analyzing the query * - * @return int $unlim_num_rows unlimited number of rows + * @return int unlimited number of rows */ private function countQueryResults( $num_rows, @@ -1433,7 +1433,7 @@ EOT; * @param array $analyzed_sql_results analyzed sql results * @param int $num_rows number of rows * - * @return string $message + * @return string */ private function getMessageForNoRowsReturned( $message_to_show, @@ -1661,7 +1661,7 @@ EOT; * @param string|null $indexes_problems_html html for displaying errors in indexes * @param string|null $bookmark_support_html html for displaying bookmark form * - * @return string $html_output + * @return string */ private function getHtmlForSqlQueryResults( ?string $previous_update_query_html, @@ -1693,7 +1693,7 @@ EOT; * Returns a message for successful creation of a bookmark or null if a bookmark * was not created * - * @return Message $bookmark_created_msg + * @return Message */ private function getBookmarkCreatedMessage() { @@ -1853,7 +1853,7 @@ EOT; * @param array $sql_data sql data * @param Message|string $disp_message display message * - * @return string $previous_update_query_html + * @return string */ private function getHtmlForPreviousUpdateQuery( ?string $disp_query, @@ -1883,7 +1883,7 @@ EOT; * @param boolean $editable whether the results table can be editable or not * @param boolean $has_unique whether there is a unique key * - * @return Message $message + * @return Message */ private function getMessageIfMissingColumnIndex($table, $db, $editable, $has_unique) { diff --git a/libraries/classes/SystemDatabase.php b/libraries/classes/SystemDatabase.php index 7fd9195149..cc27d34b26 100644 --- a/libraries/classes/SystemDatabase.php +++ b/libraries/classes/SystemDatabase.php @@ -26,7 +26,7 @@ class SystemDatabase protected $dbi; /** - * @var Relation $relation + * @var Relation */ private $relation; @@ -74,7 +74,7 @@ class SystemDatabase * @param string $view_name Name of the VIEW * @param string $db Database name of the VIEW * - * @return string $new_transformations_sql SQL query for new transformations + * @return string SQL query for new transformations */ public function getNewTransformationDataSql( $pma_transformation_data, diff --git a/libraries/classes/Table.php b/libraries/classes/Table.php index cc40ca1aaf..d9837eeeab 100644 --- a/libraries/classes/Table.php +++ b/libraries/classes/Table.php @@ -79,7 +79,7 @@ class Table protected $_dbi; /** - * @var Relation $relation + * @var Relation */ private $relation; diff --git a/libraries/classes/Tracking.php b/libraries/classes/Tracking.php index b7d7d85dcf..912240d3d4 100644 --- a/libraries/classes/Tracking.php +++ b/libraries/classes/Tracking.php @@ -1155,7 +1155,7 @@ class Tracking * * @param array $version version info * - * @return string $version_status The status message + * @return string The status message */ public function getVersionStatus(array $version) { @@ -1246,7 +1246,7 @@ class Tracking * @param string $db Current database * @param boolean $testing Testing * - * @return array $untracked_tables + * @return array */ public function extractTableNames(array $table_list, $db, $testing = false) { @@ -1273,7 +1273,7 @@ class Tracking * * @param string $db current database * - * @return array $untracked_tables + * @return array */ public function getUntrackedTables($db) { diff --git a/libraries/classes/UserPassword.php b/libraries/classes/UserPassword.php index f52049fca9..0ab3f23a12 100644 --- a/libraries/classes/UserPassword.php +++ b/libraries/classes/UserPassword.php @@ -24,7 +24,7 @@ use PhpMyAdmin\Util; class UserPassword { /** - * @var Privileges $serverPrivileges + * @var Privileges */ private $serverPrivileges; @@ -170,7 +170,7 @@ class UserPassword /** * Generate the hashing function * - * @return string $hashing_function + * @return string */ private function changePassHashingFunction() { diff --git a/libraries/classes/UserPreferences.php b/libraries/classes/UserPreferences.php index d7611a7257..2a85573f3e 100644 --- a/libraries/classes/UserPreferences.php +++ b/libraries/classes/UserPreferences.php @@ -26,7 +26,7 @@ use PhpMyAdmin\Util; class UserPreferences { /** - * @var Relation $relation + * @var Relation */ private $relation; diff --git a/libraries/classes/Util.php b/libraries/classes/Util.php index 7762832992..d985a14604 100644 --- a/libraries/classes/Util.php +++ b/libraries/classes/Util.php @@ -735,7 +735,7 @@ class Util * @param string $db the db name * @param array $table the table infos * - * @return int $rowCount the possibly modified row count + * @return int the possibly modified row count * */ private static function _checkRowCount($db, array $table) @@ -2336,7 +2336,7 @@ class Util * @param string $name the name for the request parameter * @param string[] $classes additional classes for the container * - * @return string $list_navigator_html the html content + * @return string the html content * * @access public * @@ -4335,7 +4335,7 @@ class Util * * @param string $type the column type * - * @return string $class_clause the HTML class clause + * @return string the HTML class clause */ public static function getClassForType($type) { @@ -4540,7 +4540,7 @@ class Util * @param string $db database name * @param object $db_info_result result set * - * @return array $tables list of tables + * @return array list of tables * */ public static function getTablesWhenOpen($db, $db_info_result) |