[go: nahoru, domu]
Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Jump to bottom

Fix coding standard errors using vendor/bin/phpcbf #13116

Merged
merged 1 commit into from
Mar 22, 2017
Merged

Fix coding standard errors using vendor/bin/phpcbf #13116

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
12 changes: 5 additions & 7 deletions libraries/central_columns.lib.php
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -825,10 +825,9 @@ function PMA_getHTMLforAddCentralColumn($total_rows, $pos, $db)
/**
* build html for a row in central columns table
*
* @param array $row array contains complete information of
* a particular row of central list table
* @param int $row_num position the row in the table
* @param string $db current database
* @param array $row array contains complete information of a particular row of central list table
* @param int $row_num position the row in the table
* @param string $db current database
*
* @return string html of a particular row in the central columns table.
*/
Expand Down Expand Up @@ -996,9 +995,8 @@ function PMA_getHTMLforCentralColumnsTableRow($row, $row_num, $db)
/**
* build html for editing a row in central columns table
*
* @param array $row array contains complete information of
* a particular row of central list table
* @param int $row_num position the row in the table
* @param array $row array contains complete information of a particular row of central list table
* @param int $row_num position the row in the table
*
* @return string html of a particular row in the central columns table.
*/
Expand Down
4 changes: 2 additions & 2 deletions libraries/config/PageSettings.php
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -102,8 +102,8 @@ public function __construct($formGroupName, $elemId = null)
* @param FormDisplay &$form_display Form
* @param ConfigFile &$cf Configuration file
* @param Message|null &$error Error message
* @param FormDisplay $form_display
* @param ConfigFile $cf
* @param FormDisplay $form_display
* @param ConfigFile $cf
*
* @return void
*/
Expand Down
12 changes: 6 additions & 6 deletions libraries/config/Validator.php
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -162,12 +162,12 @@ public static function validate(
/**
* Test database connection
*
* @param string $host host name
* @param string $port tcp port to use
* @param string $socket socket to use
* @param string $user username to use
* @param string $pass password to use
* @param string $error_key key to use in return array
* @param string $host host name
* @param string $port tcp port to use
* @param string $socket socket to use
* @param string $user username to use
* @param string $pass password to use
* @param string $error_key key to use in return array
*
* @return bool|array
*/
Expand Down
4 changes: 2 additions & 2 deletions libraries/core.lib.php
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -208,8 +208,8 @@ function PMA_securePath($path)
*
* loads language file if not loaded already
*
* @param string $error_message the error message or named error message
* @param string|array $message_args arguments applied to $error_message
* @param string $error_message the error message or named error message
* @param string|array $message_args arguments applied to $error_message
*
* @return void
*/
Expand Down
4 changes: 2 additions & 2 deletions libraries/insert_edit.lib.php
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -887,7 +887,7 @@ function PMA_getColumnEnumValues($column, $extracted_columnspec)
* @param integer $idindex id index
* @param string $data data to edit
* @param array $column_enum_values $column['values']
* @param boolean $readOnly is column read only or not
* @param boolean $readOnly is column read only or not
*
* @return string an html snippet
*/
Expand Down Expand Up @@ -939,7 +939,7 @@ function PMA_getDropDownDependingOnLength(
* @param integer $idindex id index
* @param string $data data to edit
* @param array $column_enum_values $column['values']
* @param boolean $readOnly is column read only or not
* @param boolean $readOnly is column read only or not
*
* @return string an html snippet
*/
Expand Down
67 changes: 33 additions & 34 deletions libraries/operations.lib.php
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -872,16 +872,16 @@ function PMA_getHtmlForMoveTable()
/**
* Get the HTML div for Table option
*
* @param Table $pma_table Table object
* @param string $comment Comment
* @param array $tbl_collation table collation
* @param string $tbl_storage_engine table storage engine
* @param string $pack_keys pack keys
* @param string $auto_increment value of auto increment
* @param string $delay_key_write delay key write
* @param string $transactional value of transactional
* @param string $page_checksum value of page checksum
* @param string $checksum the checksum
* @param Table $pma_table Table object
* @param string $comment Comment
* @param array $tbl_collation table collation
* @param string $tbl_storage_engine table storage engine
* @param string $pack_keys pack keys
* @param string $auto_increment value of auto increment
* @param string $delay_key_write delay key write
* @param string $transactional value of transactional
* @param string $page_checksum value of page checksum
* @param string $checksum the checksum
*
* @return string $html_output
*/
Expand Down Expand Up @@ -1011,16 +1011,16 @@ function PMA_getHtmlForPackKeys($current_value)
/**
* Get HTML fieldset for Table option, it contains HTML table for options
*
* @param Table $pma_table Table object
* @param string $comment Comment
* @param array $tbl_collation table collation
* @param string $tbl_storage_engine table storage engine
* @param string $pack_keys pack keys
* @param string $delay_key_write delay key write
* @param string $auto_increment value of auto increment
* @param string $transactional value of transactional
* @param string $page_checksum value of page checksum
* @param string $checksum the checksum
* @param Table $pma_table Table object
* @param string $comment Comment
* @param array $tbl_collation table collation
* @param string $tbl_storage_engine table storage engine
* @param string $pack_keys pack keys
* @param string $delay_key_write delay key write
* @param string $auto_increment value of auto increment
* @param string $transactional value of transactional
* @param string $page_checksum value of page checksum
* @param string $checksum the checksum
*
* @return string $html_output
*/
Expand Down Expand Up @@ -1323,8 +1323,8 @@ function PMA_getHtmlForCopytable()
/**
* Get HTML snippet for table maintenance
*
* @param Table $pma_table Table object
* @param array $url_params array of URL parameters
* @param Table $pma_table Table object
* @param array $url_params array of URL parameters
*
* @return string $html_output
*/
Expand All @@ -1348,8 +1348,8 @@ function PMA_getHtmlForTableMaintenance($pma_table, $url_params)
/**
* Get HTML 'li' having a link of maintain action
*
* @param Table $pma_table Table object
* @param array $url_params Array of URL parameters
* @param Table $pma_table Table object
* @param array $url_params Array of URL parameters
*
* @return string $html_output
*/
Expand Down Expand Up @@ -1726,15 +1726,15 @@ function PMA_getQueryAndResultForReorderingTable()
/**
* Get table alters array
*
* @param Table $pma_table The Table object
* @param string $pack_keys pack keys
* @param string $checksum value of checksum
* @param string $page_checksum value of page checksum
* @param string $delay_key_write delay key write
* @param string $row_format row format
* @param string $newTblStorageEngine table storage engine
* @param string $transactional value of transactional
* @param string $tbl_collation collation of the table
* @param Table $pma_table The Table object
* @param string $pack_keys pack keys
* @param string $checksum value of checksum
* @param string $page_checksum value of page checksum
* @param string $delay_key_write delay key write
* @param string $row_format row format
* @param string $newTblStorageEngine table storage engine
* @param string $transactional value of transactional
* @param string $tbl_collation collation of the table
*
* @return array $table_alters
*/
Expand Down Expand Up @@ -2086,7 +2086,6 @@ function PMA_moveOrCopyTable($db, $table)
. Util::backquote($table);
$message->addParam($old);


$new_name = $_REQUEST['new_name'];
if ($GLOBALS['dbi']->getLowerCaseNames() === '1') {
$new_name = strtolower($new_name);
Expand Down
8 changes: 3 additions & 5 deletions libraries/rte/rte_routines.lib.php
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -564,10 +564,9 @@ function PMA_RTN_getDataFromRequest()
* This function will generate the values that are required to complete
* the "Edit routine" form given the name of a routine.
*
* @param string $name The name of the routine.
* @param string $type Type of routine (ROUTINE|PROCEDURE)
* @param bool $all Whether to return all data or just
* the info about parameters.
* @param string $name The name of the routine.
* @param string $type Type of routine (ROUTINE|PROCEDURE)
* @param bool $all Whether to return all data or just the info about parameters.
*
* @return array Data necessary to create the routine editor.
*/
Expand Down Expand Up @@ -1700,4 +1699,3 @@ function PMA_RTN_getExecuteForm($routine)

return $retval;
} // end PMA_RTN_getExecuteForm()

8 changes: 4 additions & 4 deletions libraries/server_privileges.lib.php
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -2625,10 +2625,10 @@ function PMA_getHtmlTableBodyForSpecificDbOrTablePrivs($privMap, $db)
/**
* Get HTML to display privileges
*
* @param string $db Database name
* @param array $current_privileges List of privileges
* @param string $current_user Current user
* @param string $current_host Current host
* @param string $db Database name
* @param array $current_privileges List of privileges
* @param string $current_user Current user
* @param string $current_host Current host
*
* @return string HTML to display privileges
*/
Expand Down
6 changes: 3 additions & 3 deletions libraries/tracking.lib.php
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -910,8 +910,8 @@ function PMA_getHtmlForColumns($columns)
/**
* Function to get html for field
*
* @param int $index index
* @param array $field field
* @param int $index index
* @param array $field field
*
* @return string
*/
Expand Down Expand Up @@ -996,7 +996,7 @@ function PMA_getHtmlForIndexes($indexes)
/**
* Function to get html for an index in schema snapshot
*
* @param array $index index
* @param array $index index
*
* @return string
*/
Expand Down
1 change: 0 additions & 1 deletion test/classes/ConfigTest.php
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -834,7 +834,6 @@ public function testGetUserValue()
public function testGetThemeUniqueValue()
{


$partial_sum = (
PHPUnit_Framework_Assert::readAttribute($this->object, 'source_mtime') +
PHPUnit_Framework_Assert::readAttribute(
Expand Down
1 change: 0 additions & 1 deletion test/classes/plugin/export/ExportXmlTest.php
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -345,7 +345,6 @@ public function testExportHeader()
't2' => array(null, '"tbl"')
);


$dbi->expects($this->exactly(5))
->method('fetchResult')
->willReturnOnConsecutiveCalls(
Expand Down
3 changes: 0 additions & 3 deletions test/libraries/PMA_server_privileges_test.php
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -876,7 +876,6 @@ public function testPMAAddUser()
runkit_constant_redefine('PMA_MYSQL_INT_VERSION', $restoreMySQLVersion);
}


// Case 2 : Test with older versions
$restoreMySQLVersion = "PMANORESTORE";
if (! PMA_HAS_RUNKIT) {
Expand Down Expand Up @@ -1320,7 +1319,6 @@ public function testPMAGetHtmlForLoginInformationFields()
->method('escapeString')
->will($this->returnArgument(0));


$GLOBALS['dbi'] = $dbi;

$html = PMA_getHtmlForLoginInformationFields();
Expand Down Expand Up @@ -2571,7 +2569,6 @@ function testPMAGetHtmlForAuthPluginsDropdown()
$actualHtml
);


/* Assertion 4 */
$actualHtml = PMA_getHtmlForAuthPluginsDropdown(
'mysql_native_password',
Expand Down