From fd7f02f929a53e4897714bef2b995bee8e96059f Mon Sep 17 00:00:00 2001 From: Hugues Peccatte Date: Sun, 2 Nov 2014 14:33:41 +0100 Subject: [PATCH] Fix typos. Signed-off-by: Hugues Peccatte --- db_import.php | 2 +- error_report.php | 2 +- libraries/Font.class.php | 2 +- libraries/Index.class.php | 2 +- libraries/StorageEngine.class.php | 2 +- libraries/TableSearch.class.php | 2 +- libraries/Theme.class.php | 4 ++-- libraries/Tracker.class.php | 6 +++--- libraries/Util.class.php | 14 ++++++++------ libraries/config/FormDisplay.class.php | 2 +- libraries/config/Validator.class.php | 4 ++-- libraries/config/setup.forms.php | 2 +- libraries/config/user_preferences.forms.php | 4 ++-- libraries/display_import_ajax.lib.php | 2 +- libraries/engines/ndbcluster.lib.php | 2 +- libraries/error_report.lib.php | 10 +++++----- libraries/navigation/Navigation.class.php | 6 +++--- .../navigation/NavigationHeader.class.php | 2 +- libraries/navigation/NodeFactory.class.php | 6 +++--- libraries/navigation/Nodes/Node.class.php | 2 +- .../navigation/Nodes/Node_Database.class.php | 10 ++++++---- .../Nodes/Node_DatabaseChild.class.php | 2 +- libraries/plugins/ExportPlugin.class.php | 2 +- libraries/plugins/SchemaPlugin.class.php | 10 +++++----- .../auth/AuthenticationCookie.class.php | 4 ++-- .../plugins/import/ImportMediawiki.class.php | 2 +- libraries/plugins/import/ImportSql.class.php | 2 +- libraries/plugins/import/ShapeFile.class.php | 2 +- .../schema/Export_Relation_Schema.class.php | 4 ++-- libraries/plugins/schema/SchemaDia.class.php | 2 +- libraries/plugins/schema/SchemaEps.class.php | 2 +- libraries/plugins/schema/SchemaPdf.class.php | 2 +- libraries/plugins/schema/SchemaSvg.class.php | 2 +- .../schema/dia/Dia_Relation_Schema.class.php | 2 +- .../schema/dia/RelationStatsDia.class.php | 4 ++-- .../schema/eps/Eps_Relation_Schema.class.php | 2 +- .../schema/eps/TableStatsEps.class.php | 2 +- .../schema/pdf/Pdf_Relation_Schema.class.php | 6 +++--- .../schema/pdf/TableStatsPdf.class.php | 4 ++-- libraries/select_server.lib.php | 8 ++++---- libraries/server_privileges.lib.php | 10 +++++----- libraries/tbl_columns_definition_form.inc.php | 2 +- libraries/tbl_gis_visualization.lib.php | 6 +++--- libraries/tbl_info.inc.php | 2 +- libraries/tbl_views.lib.php | 2 +- libraries/tracking.lib.php | 12 ++++++------ libraries/transformations.lib.php | 2 +- .../php-gettext/PMA_gettext_test.php | 19 +++++++++++++++++-- test/libraries/php-gettext/Parsing_test.php | 19 ++++++++++++++++++- 49 files changed, 131 insertions(+), 95 deletions(-) diff --git a/db_import.php b/db_import.php index 70425b2183..668be6773f 100644 --- a/db_import.php +++ b/db_import.php @@ -14,7 +14,7 @@ $scripts = $header->getScripts(); $scripts->addFile('import.js'); /** - * Gets tables informations and displays top links + * Gets tables information and displays top links */ require 'libraries/db_common.inc.php'; require 'libraries/db_info.inc.php'; diff --git a/error_report.php b/error_report.php index 756fa2f4a0..d86add56cc 100644 --- a/error_report.php +++ b/error_report.php @@ -23,7 +23,7 @@ if (isset($_REQUEST['send_error_report']) ) { if ($_REQUEST['exception_type'] == 'php') { /** - * Prevent inifnite error submission. + * Prevent infinite error submission. * Happens in case error submissions fails. * If reporting is done in some time interval, * just clear them & clear json data too. diff --git a/libraries/Font.class.php b/libraries/Font.class.php index d7c1ee60cd..78d561f142 100644 --- a/libraries/Font.class.php +++ b/libraries/Font.class.php @@ -123,7 +123,7 @@ class PMA_Font case 'sans-serif': break; /* - * .92 modifer for time, serif, brushscriptstd, and californian fb + * .92 modifier for time, serif, brushscriptstd, and californian fb */ case 'times': case 'serif': diff --git a/libraries/Index.class.php b/libraries/Index.class.php index 0393bf8c1b..9917473750 100644 --- a/libraries/Index.class.php +++ b/libraries/Index.class.php @@ -428,7 +428,7 @@ class PMA_Index * * @param boolean $as_text whether to output should be in text * - * @return mixed how index is paked + * @return mixed how index is packed */ public function isPacked($as_text = false) { diff --git a/libraries/StorageEngine.class.php b/libraries/StorageEngine.class.php index 669cce2428..c633b3b9f7 100644 --- a/libraries/StorageEngine.class.php +++ b/libraries/StorageEngine.class.php @@ -360,7 +360,7 @@ class PMA_StorageEngine } /** - * Information message on whether this storge engine is supported + * Information message on whether this storage engine is supported * * @return string The localized message. */ diff --git a/libraries/TableSearch.class.php b/libraries/TableSearch.class.php index 53dee2a9c8..3447803bc7 100644 --- a/libraries/TableSearch.class.php +++ b/libraries/TableSearch.class.php @@ -126,7 +126,7 @@ class PMA_TableSearch $columns = $GLOBALS['dbi']->getColumns( $this->_db, $this->_table, null, true ); - // Get details about the geometry fucntions + // Get details about the geometry functions $geom_types = PMA_Util::getGISDatatypes(); foreach ($columns as $row) { diff --git a/libraries/Theme.class.php b/libraries/Theme.class.php index 5457647d95..a47b3b9e21 100644 --- a/libraries/Theme.class.php +++ b/libraries/Theme.class.php @@ -142,7 +142,7 @@ class PMA_Theme } /** - * checks image path for existance - if not found use img from fallback theme + * checks image path for existence - if not found use img from fallback theme * * @access public * @return bool @@ -235,7 +235,7 @@ class PMA_Theme } /** - * checks theme version agaisnt $version + * checks theme version against $version * returns true if theme version is equal or higher to $version * * @param string $version version to compare to diff --git a/libraries/Tracker.class.php b/libraries/Tracker.class.php index 9aee25085f..0504400d77 100644 --- a/libraries/Tracker.class.php +++ b/libraries/Tracker.class.php @@ -32,7 +32,7 @@ class PMA_Tracker static protected $pma_table; /** - * Defines the usage of DROP TABLE statment in SQL dumps. + * Defines the usage of DROP TABLE statement in SQL dumps. * * @access protected * @var boolean @@ -40,7 +40,7 @@ class PMA_Tracker static protected $add_drop_table; /** - * Defines the usage of DROP VIEW statment in SQL dumps. + * Defines the usage of DROP VIEW statement in SQL dumps. * * @access protected * @var boolean @@ -48,7 +48,7 @@ class PMA_Tracker static protected $add_drop_view; /** - * Defines the usage of DROP DATABASE statment in SQL dumps. + * Defines the usage of DROP DATABASE statement in SQL dumps. * * @access protected * @var boolean diff --git a/libraries/Util.class.php b/libraries/Util.class.php index 30a00e0688..8a6384f287 100644 --- a/libraries/Util.class.php +++ b/libraries/Util.class.php @@ -2052,12 +2052,14 @@ class PMA_Util /** * Function to generate unique condition for specified row. * - * @param resource $handle current query result - * @param integer $fields_cnt number of fields - * @param array $fields_meta meta information about fields - * @param array $row current row - * @param boolean $force_unique generate condition only on pk or unique - * @param string $restrict_to_table restrict the unique condition to this table + * @param resource $handle current query result + * @param integer $fields_cnt number of fields + * @param array $fields_meta meta information about fields + * @param array $row current row + * @param boolean $force_unique generate condition only on pk or + * unique + * @param string|boolean $restrict_to_table restrict the unique condition to + * this table or false if none * * @access public * diff --git a/libraries/config/FormDisplay.class.php b/libraries/config/FormDisplay.class.php index dc57060610..360fd7790b 100644 --- a/libraries/config/FormDisplay.class.php +++ b/libraries/config/FormDisplay.class.php @@ -295,7 +295,7 @@ class FormDisplay } PMA_displayFormBottom(); - // if not already done, send strings used for valdiation to JavaScript + // if not already done, send strings used for validation to JavaScript if (! $js_lang_sent) { $js_lang_sent = true; $js_lang = array(); diff --git a/libraries/config/Validator.class.php b/libraries/config/Validator.class.php index 86d7e7855e..045d4f87f4 100644 --- a/libraries/config/Validator.class.php +++ b/libraries/config/Validator.class.php @@ -21,7 +21,7 @@ require_once './libraries/DatabaseInterface.class.php'; * assigned to a form element (formset name or field path). Even if there are * no errors, key must be set with an empty value. * - * Valdiation functions are assigned in $cfg_db['_validators'] (config.values.php). + * Validation functions are assigned in $cfg_db['_validators'] (config.values.php). * * @package PhpMyAdmin */ @@ -80,7 +80,7 @@ class PMA_Validator * Return values: * o array, keys - field path or formset id, values - array of errors * when $isPostSource is true values is an empty array to allow for error list - * cleanup in HTML documen + * cleanup in HTML document * o false - when no validators match name(s) given by $validator_id * * @param ConfigFile $cf Config file instance diff --git a/libraries/config/setup.forms.php b/libraries/config/setup.forms.php index 3e7d857c8a..fee61314f8 100644 --- a/libraries/config/setup.forms.php +++ b/libraries/config/setup.forms.php @@ -1,7 +1,7 @@ setName('show_color'); $leaf->setText(__('Show color')); - $properyGroup->addProperty($leaf); + $propertyGroup->addProperty($leaf); $leaf = new BoolPropertyItem(); $leaf->setName('show_keys'); $leaf->setText(__('Only show keys')); - $properyGroup->addProperty($leaf); + $propertyGroup->addProperty($leaf); } } ?> \ No newline at end of file diff --git a/libraries/plugins/auth/AuthenticationCookie.class.php b/libraries/plugins/auth/AuthenticationCookie.class.php index b03759669e..2e0940bb9f 100644 --- a/libraries/plugins/auth/AuthenticationCookie.class.php +++ b/libraries/plugins/auth/AuthenticationCookie.class.php @@ -314,7 +314,7 @@ class AuthenticationCookie extends AuthenticationPlugin * * it returns true if all seems ok which usually leads to auth_set_user() * - * it directly switches to authFails() if user inactivity timout is reached + * it directly switches to authFails() if user inactivity timeout is reached * * @return boolean whether we get authentication settings or not */ @@ -677,7 +677,7 @@ class AuthenticationCookie extends AuthenticationPlugin * and the login form * * this function MUST exit/quit the application, - * currently doen by call to auth() + * currently done by call to auth() * * @return void */ diff --git a/libraries/plugins/import/ImportMediawiki.class.php b/libraries/plugins/import/ImportMediawiki.class.php index d5abd5c162..d8267747d5 100644 --- a/libraries/plugins/import/ImportMediawiki.class.php +++ b/libraries/plugins/import/ImportMediawiki.class.php @@ -435,7 +435,7 @@ class ImportMediawiki extends ImportPlugin $start_attribute_character = false; // The full separator is "||"; - // This rembembers if the previous character was '|' + // This remembers if the previous character was '|' $partial_separator = false; // Parse text char by char diff --git a/libraries/plugins/import/ImportSql.class.php b/libraries/plugins/import/ImportSql.class.php index 1a4d2a6c05..07db8d575a 100644 --- a/libraries/plugins/import/ImportSql.class.php +++ b/libraries/plugins/import/ImportSql.class.php @@ -225,7 +225,7 @@ class ImportSql extends ImportPlugin // Odd count means it was escaped $quoteEscaped = (((($posClosingString - 1) - $posEscape) % 2) === 1); - //Move after the escaped guote. + //Move after the escaped quote. $this->_delimiterPosition = $posClosingString + 1; if ($quoteEscaped) { diff --git a/libraries/plugins/import/ShapeFile.class.php b/libraries/plugins/import/ShapeFile.class.php index bad2751579..f807d02775 100644 --- a/libraries/plugins/import/ShapeFile.class.php +++ b/libraries/plugins/import/ShapeFile.class.php @@ -36,7 +36,7 @@ class PMA_ShapeFile extends ShapeFile * Loads ESRI shape data from the imported file * * @param string $FileName not used, it's here only to match the method - * signature of the method being overidden + * signature of the method being overridden * * @return void * @see ShapeFile::loadFromFile() diff --git a/libraries/plugins/schema/Export_Relation_Schema.class.php b/libraries/plugins/schema/Export_Relation_Schema.class.php index d6ff8c2251..729339563f 100644 --- a/libraries/plugins/schema/Export_Relation_Schema.class.php +++ b/libraries/plugins/schema/Export_Relation_Schema.class.php @@ -241,7 +241,7 @@ class PMA_Export_Relation_Schema { $tables = array(); foreach ($_REQUEST['t_h'] as $key => $value) { - list($db, $table) = explode(".", $key); + list(, $table) = explode(".", $key); $tables[] = $table; } return $tables; @@ -252,7 +252,7 @@ class PMA_Export_Relation_Schema * * @param integer $pageNumber ID of the chosen page * @param string $type Schema Type - * @param string $error_message The error mesage + * @param string $error_message The error message * * @access public * diff --git a/libraries/plugins/schema/SchemaDia.class.php b/libraries/plugins/schema/SchemaDia.class.php index 5dcf548204..b09119e4ad 100644 --- a/libraries/plugins/schema/SchemaDia.class.php +++ b/libraries/plugins/schema/SchemaDia.class.php @@ -102,7 +102,7 @@ class SchemaDia extends SchemaPlugin /** - * Exports the shcema into DIA format. + * Exports the schema into DIA format. * * @param string $db database name * diff --git a/libraries/plugins/schema/SchemaEps.class.php b/libraries/plugins/schema/SchemaEps.class.php index f2281b9c89..1d8cca8b61 100644 --- a/libraries/plugins/schema/SchemaEps.class.php +++ b/libraries/plugins/schema/SchemaEps.class.php @@ -87,7 +87,7 @@ class SchemaEps extends SchemaPlugin } /** - * Exports the shcema into EPS format. + * Exports the schema into EPS format. * * @param string $db database name * diff --git a/libraries/plugins/schema/SchemaPdf.class.php b/libraries/plugins/schema/SchemaPdf.class.php index b41dda67ab..92a9846b61 100644 --- a/libraries/plugins/schema/SchemaPdf.class.php +++ b/libraries/plugins/schema/SchemaPdf.class.php @@ -117,7 +117,7 @@ class SchemaPdf extends SchemaPlugin } /** - * Exports the shcema into PDF format. + * Exports the schema into PDF format. * * @param string $db database name * diff --git a/libraries/plugins/schema/SchemaSvg.class.php b/libraries/plugins/schema/SchemaSvg.class.php index c7a33d364c..e020db06cc 100644 --- a/libraries/plugins/schema/SchemaSvg.class.php +++ b/libraries/plugins/schema/SchemaSvg.class.php @@ -75,7 +75,7 @@ class SchemaSvg extends SchemaPlugin } /** - * Exports the shcema into SVG format. + * Exports the schema into SVG format. * * @param string $db database name * diff --git a/libraries/plugins/schema/dia/Dia_Relation_Schema.class.php b/libraries/plugins/schema/dia/Dia_Relation_Schema.class.php index becce4f4f0..3f6abfa13d 100644 --- a/libraries/plugins/schema/dia/Dia_Relation_Schema.class.php +++ b/libraries/plugins/schema/dia/Dia_Relation_Schema.class.php @@ -346,7 +346,7 @@ class PMA_Dia_Relation_Schema extends PMA_Export_Relation_Schema * Draws relation references * * connects master table's master field to - * foreign table's forein field using Dia object + * foreign table's foreign field using Dia object * type Database - Reference * * @return void diff --git a/libraries/plugins/schema/dia/RelationStatsDia.class.php b/libraries/plugins/schema/dia/RelationStatsDia.class.php index 04438d55e8..09138056b2 100644 --- a/libraries/plugins/schema/dia/RelationStatsDia.class.php +++ b/libraries/plugins/schema/dia/RelationStatsDia.class.php @@ -90,10 +90,10 @@ class Relation_Stats_Dia * Draws relation references * * connects master table's master field to foreign table's - * forein field using Dia object type Database - Reference + * foreign field using Dia object type Database - Reference * Dia object is used to generate the XML of Dia Document. * Database reference Object and their attributes are involved - * in the combination of displaing Database - reference on Dia Document. + * in the combination of displaying Database - reference on Dia Document. * * @param boolean $showColor Whether to use one color per relation or not * if showColor is true then an array of $listOfColors will be used to choose diff --git a/libraries/plugins/schema/eps/Eps_Relation_Schema.class.php b/libraries/plugins/schema/eps/Eps_Relation_Schema.class.php index 5f5509ba43..205c0024b7 100644 --- a/libraries/plugins/schema/eps/Eps_Relation_Schema.class.php +++ b/libraries/plugins/schema/eps/Eps_Relation_Schema.class.php @@ -480,7 +480,7 @@ class PMA_Eps_Relation_Schema extends PMA_Export_Relation_Schema /** * Draws relation arrows and lines connects master table's master field to - * foreign table's forein field + * foreign table's foreign field * * @return void * diff --git a/libraries/plugins/schema/eps/TableStatsEps.class.php b/libraries/plugins/schema/eps/TableStatsEps.class.php index 58864d8073..3e40627f9f 100644 --- a/libraries/plugins/schema/eps/TableStatsEps.class.php +++ b/libraries/plugins/schema/eps/TableStatsEps.class.php @@ -121,7 +121,7 @@ class Table_Stats_Eps extends TableStats $this->width += PMA_Font::getStringWidth(' ', $font, $fontSize); /* * it is unknown what value must be added, because - * table title is affected by the tabe width value + * table title is affected by the table width value */ while ($this->width < PMA_Font::getStringWidth($this->getTitle(), $font, $fontSize)) { diff --git a/libraries/plugins/schema/pdf/Pdf_Relation_Schema.class.php b/libraries/plugins/schema/pdf/Pdf_Relation_Schema.class.php index d033769533..6605afb275 100644 --- a/libraries/plugins/schema/pdf/Pdf_Relation_Schema.class.php +++ b/libraries/plugins/schema/pdf/Pdf_Relation_Schema.class.php @@ -824,7 +824,7 @@ class PMA_Pdf_Relation_Schema extends PMA_Export_Relation_Schema } /** - * Ouputs the PDF document to a file + * Outputs the PDF document to a file * or sends the output to browser * * @param integer $pageNumber page number @@ -940,7 +940,7 @@ class PMA_Pdf_Relation_Schema extends PMA_Export_Relation_Schema } /** - * Gets table informations + * Gets table information */ $showtable = PMA_Table::sGetStatusInfo($GLOBALS['db'], $table); $show_comment = isset($showtable['Comment']) @@ -981,7 +981,7 @@ class PMA_Pdf_Relation_Schema extends PMA_Export_Relation_Schema $primary .= $row['Column_name'] . ', '; $pk_array[$row['Column_name']] = 1; } - // Retains keys informations + // Retains keys information if ($row['Key_name'] != $lastIndex) { $indexes[] = $row['Key_name']; $lastIndex = $row['Key_name']; diff --git a/libraries/plugins/schema/pdf/TableStatsPdf.class.php b/libraries/plugins/schema/pdf/TableStatsPdf.class.php index b53ea70ce1..a20829ccc8 100644 --- a/libraries/plugins/schema/pdf/TableStatsPdf.class.php +++ b/libraries/plugins/schema/pdf/TableStatsPdf.class.php @@ -139,8 +139,8 @@ class Table_Stats_Pdf extends TableStats $pdf->SetFont($this->_ff, 'B', $fontSize); /* * it is unknown what value must be added, because - * table title is affected by the tabe width value - */ + * table title is affected by the table width value + */ while ($this->width < $pdf->GetStringWidth($this->getTitle())) { $this->width += 5; } diff --git a/libraries/select_server.lib.php b/libraries/select_server.lib.php index ca443fc345..7202dc5c12 100644 --- a/libraries/select_server.lib.php +++ b/libraries/select_server.lib.php @@ -13,11 +13,11 @@ if (! defined('PHPMYADMIN')) { * Renders the server selection in list or selectbox form, or option tags only * * @param boolean $not_only_options whether to include form tags or not - * @param boolean $ommit_fieldset whether to omit fieldset tag or not + * @param boolean $omit_fieldset whether to omit fieldset tag or not * * @return string */ -function PMA_selectServer($not_only_options, $ommit_fieldset) +function PMA_selectServer($not_only_options, $omit_fieldset) { $retval = ''; @@ -34,7 +34,7 @@ function PMA_selectServer($not_only_options, $ommit_fieldset) . $GLOBALS['cfg']['DefaultTabServer'] . '" class="disableAjax">'; $retval .= PMA_URL_getHiddenInputs(); - if (! $ommit_fieldset) { + if (! $omit_fieldset) { $retval .= '
'; } $retval .= '
'; } $retval .= ''; diff --git a/libraries/server_privileges.lib.php b/libraries/server_privileges.lib.php index b38421bd3b..afc2cb5b8a 100644 --- a/libraries/server_privileges.lib.php +++ b/libraries/server_privileges.lib.php @@ -109,7 +109,7 @@ function PMA_formatPrivilege($privilege, $html) } /** - * Parses priliveges into an array, it modifies the array + * Parses privileges into an array, it modifies the array * * @param array &$row Results row from * @@ -268,7 +268,7 @@ function PMA_getTableGrantsArray() /** * Get the grants array which contains all the privilege types - * and relevent grant messages + * and relevant grant messages * * @return array */ @@ -612,8 +612,8 @@ function PMA_setUserGroup($username, $userGroup) * @param string $table the table * @param boolean $submit whether to display the submit button or not * - * @global array $cfg the phpMyAdmin configuration - * @global ressource $user_link the database connection + * @global array $cfg the phpMyAdmin configuration + * @global resource $user_link the database connection * * @return string html snippet */ @@ -1282,7 +1282,7 @@ function PMA_getHtmlForGlobalPrivTableWithCheckboxes( * changing one? (allowed values: 'new', 'change') * * @global array $cfg the phpMyAdmin configuration - * @global ressource $user_link the database connection + * @global resource $user_link the database connection * * @return string $html_output a HTML snippet */ diff --git a/libraries/tbl_columns_definition_form.inc.php b/libraries/tbl_columns_definition_form.inc.php index 5eaecdfd9d..a2bb6caefb 100644 --- a/libraries/tbl_columns_definition_form.inc.php +++ b/libraries/tbl_columns_definition_form.inc.php @@ -79,7 +79,7 @@ $header_cells = PMA_getHeaderCells( ); // workaround for field_fulltext, because its submitted indices contain -// the index as a value, not a key. Inserted here for easier maintaineance +// the index as a value, not a key. Inserted here for easier maintenance // and less code to change in existing files. if (isset($field_fulltext) && is_array($field_fulltext)) { foreach ($field_fulltext as $fulltext_nr => $fulltext_indexkey) { diff --git a/libraries/tbl_gis_visualization.lib.php b/libraries/tbl_gis_visualization.lib.php index 04931e1f17..033619bb8c 100644 --- a/libraries/tbl_gis_visualization.lib.php +++ b/libraries/tbl_gis_visualization.lib.php @@ -51,7 +51,7 @@ function PMA_GIS_modifyQuery($sql_query, $visualizationSettings) * * @param array $data Data for the status chart * @param array &$visualizationSettings Settings used to generate the chart - * @param string $format Format of the visulaization + * @param string $format Format of the visualization * * @return string|void HTML and JS code for the GIS visualization */ @@ -88,7 +88,7 @@ function PMA_GIS_visualizationResults($data, &$visualizationSettings, $format) * * @param array $data data for the status chart * @param array $visualizationSettings settings used to generate the chart - * @param string $format format of the visulaization + * @param string $format format of the visualization * @param string $fileName file name * * @return file File containing the visualization @@ -112,7 +112,7 @@ function PMA_GIS_saveToFile($data, $visualizationSettings, $format, $fileName) } /** - * Function to get html for the lebel column and spatial column + * Function to get html for the label column and spatial column * * @param string $column the column type. i.e either "labelColumn" * or "spatialColumn" diff --git a/libraries/tbl_info.inc.php b/libraries/tbl_info.inc.php index 9000ae0523..23551cc1b8 100644 --- a/libraries/tbl_info.inc.php +++ b/libraries/tbl_info.inc.php @@ -22,7 +22,7 @@ global $showtable, $tbl_is_view, $tbl_storage_engine, $show_comment, $tbl_collat $table_info_num_rows, $auto_increment; /** - * Gets table informations + * Gets table information */ // Seems we need to do this in MySQL 5.0.2, // otherwise error #1046, no database selected diff --git a/libraries/tbl_views.lib.php b/libraries/tbl_views.lib.php index 9454454016..9c74b57357 100644 --- a/libraries/tbl_views.lib.php +++ b/libraries/tbl_views.lib.php @@ -60,7 +60,7 @@ function PMA_getColumnMap($sql_query, $view_columns) /** - * Get existing data on tranformations applyed for + * Get existing data on tranformations applied for * columns in a particular table * * @param string $db Database name looking for diff --git a/libraries/tracking.lib.php b/libraries/tracking.lib.php index a099f0ffd1..ab9fc6b2ab 100644 --- a/libraries/tracking.lib.php +++ b/libraries/tracking.lib.php @@ -144,7 +144,7 @@ function PMA_getHtmlForDataDefinitionAndManipulationStatements($url_query, /** * Function to get html for activate/deactivate tracking * - * @param string $action activate|deactivate + * @param string $action activate|deactivate * @param string $url_query url query * @param int $last_version last version * @@ -913,7 +913,7 @@ function PMA_getHtmlForField($field, $style) } /** - * Fuunction to get html for the indexes in schema snapshot + * Function to get html for the indexes in schema snapshot * * @param array $indexes indexes * @@ -952,7 +952,7 @@ function PMA_getHtmlForIndexes($indexes) } /** - * Funtion to get html for an index in schema snapshot + * Function to get html for an index in schema snapshot * * @param array $index index * @param string $style style @@ -1329,11 +1329,11 @@ function PMA_getEntries($data, $filter_ts_from, $filter_ts_to, $filter_users) } /** - * Function to get version status + * Function to get version status * - * @param array $version version info + * @param array $version version info * - * @return string $version_status The status message + * @return string $version_status The status message */ function PMA_getVersionStatus($version) { diff --git a/libraries/transformations.lib.php b/libraries/transformations.lib.php index 7e33e91411..47cb6cab53 100644 --- a/libraries/transformations.lib.php +++ b/libraries/transformations.lib.php @@ -3,7 +3,7 @@ /** * Set of functions used with the relation and pdf feature * - * This file also provides basic functions to use in other plungins! + * This file also provides basic functions to use in other plugins! * These are declared in the 'GLOBAL Plugin functions' section * * Please use short and expressive names. diff --git a/test/libraries/php-gettext/PMA_gettext_test.php b/test/libraries/php-gettext/PMA_gettext_test.php index c5400cc539..5406a0c1a3 100644 --- a/test/libraries/php-gettext/PMA_gettext_test.php +++ b/test/libraries/php-gettext/PMA_gettext_test.php @@ -108,6 +108,11 @@ class PMA_Gettext_Test extends PHPUnit_Framework_TestCase ); } + /** + * Data provider for testFind_string + * + * @return array + */ public function providerForTestFind_string() { return array( @@ -139,8 +144,11 @@ class PMA_Gettext_Test extends PHPUnit_Framework_TestCase /** * Test for sanitize_plural_expression - * @param $expr string - * @param $output + * + * @param string $expr Expression to sanitize + * @param string $output Expected output + * + * @return void * * @dataProvider providerForTestSanitize_plural_expression */ @@ -152,6 +160,11 @@ class PMA_Gettext_Test extends PHPUnit_Framework_TestCase ); } + /** + * Data provider for testSanitize_plural_expression + * + * @return array + */ public function providerForTestSanitize_plural_expression() { return array( @@ -168,6 +181,8 @@ class PMA_Gettext_Test extends PHPUnit_Framework_TestCase /** * Test for extract_plural_forms_header_from_po_header + * + * @return void */ public function testExtract_plural_forms_header_from_po_header() { diff --git a/test/libraries/php-gettext/Parsing_test.php b/test/libraries/php-gettext/Parsing_test.php index 55fb55dc7d..8841ad04be 100644 --- a/test/libraries/php-gettext/Parsing_test.php +++ b/test/libraries/php-gettext/Parsing_test.php @@ -9,6 +9,11 @@ require_once 'libraries/php-gettext/gettext.php'; class ParsingTest extends PHPUnit_Framework_TestCase { + /** + * Test for extract_plural_forms_header_from_po_header + * + * @return void + */ public function test_extract_plural_forms_header_from_po_header() { $parser = new gettext_reader(null); @@ -48,11 +53,18 @@ class ParsingTest extends PHPUnit_Framework_TestCase } /** + * Test for npgettext + * + * @param int $number Number + * @param string $expected Expected output + * + * @return void + * * @dataProvider data_provider_test_npgettext */ public function test_npgettext($number, $expected) { - $parser = new gettext_reader(NULL); + $parser = new gettext_reader(null); $result = $parser->npgettext( "context", "%d pig went to the market\n", @@ -62,6 +74,11 @@ class ParsingTest extends PHPUnit_Framework_TestCase $this->assertSame($expected, $result); } + /** + * Data provider for test_npgettext + * + * @return array + */ public static function data_provider_test_npgettext() { return array(