Skip to content

Commit

Permalink
Merge branch 'QA_5_1'
Browse files Browse the repository at this point in the history 
Signed-off-by: William Desportes <williamdes@wdes.fr>
  • Loading branch information
@williamdes
williamdes committed Mar 31, 2021
2 parents 676a9ce + 86232c3 commit c705526
Show file tree
Hide file tree
Showing 6 changed files with 10 additions and 39 deletions.
2 changes: 2 additions & 0 deletions ChangeLog
View file
Expand Up @@ -57,6 +57,8 @@ phpMyAdmin - ChangeLog
- issue Fixed reported PHP notice on export save template
- issue Fixed reported PHP warnings on server status page
- issue #15629 Fixed datetime decimals displayed (.00000) after edit
- issue #16780 Fixed new event shows an empty row
- isseu #16765 Fixed new lines in text fields are doubled

5.1.0 (2021-02-24)
- issue #15350 Change Media (MIME) type references to Media type
Expand Down
6 changes: 3 additions & 3 deletions js/src/database/routines.js
View file
Expand Up @@ -266,7 +266,7 @@ const DatabaseRoutines = {
var rowclass = '';
$(tableId + '.data').find('tr').has('td').each(function () {
rowclass = (ct % 2 === 0) ? 'odd' : 'even';
$(this).removeClass().addClass(rowclass);
$(this).removeClass('odd even').addClass(rowclass);
ct++;
});
// If this is the first item being added, remove
Expand Down Expand Up @@ -398,7 +398,7 @@ const DatabaseRoutines = {
var rowclass = '';
$table.find('tr').has('td').each(function () {
rowclass = (ct % 2 === 1) ? 'odd' : 'even';
$(this).removeClass().addClass(rowclass);
$(this).removeClass('odd even').addClass(rowclass);
ct++;
});
});
Expand Down Expand Up @@ -472,7 +472,7 @@ const DatabaseRoutines = {
var rowclass = '';
$table.find('tr').has('td').each(function () {
rowclass = (ct % 2 === 1) ? 'odd' : 'even';
$(this).removeClass().addClass(rowclass);
$(this).removeClass('odd even').addClass(rowclass);
ct++;
});
});
Expand Down
6 changes: 1 addition & 5 deletions js/src/makegrid.js
View file
Expand Up @@ -1244,11 +1244,7 @@ var makeGrid = function (t, enableResize, enableReorder, enableVisib, enableGrid
fieldsType.push('hex');
}
fieldsNull.push('');
// Convert \n to \r\n to be consistent with form submitted value.
// The internal browser representation has to be just \n
// while form submitted value \r\n, see specification:
// https://www.w3.org/TR/html5/forms.html#the-textarea-element
fields.push($thisField.data('value').replace(/\n/g, '\r\n'));
fields.push($thisField.data('value'));

var cellIndex = $thisField.index('.to_be_saved');
if ($thisField.is(':not(.relation, .enum, .set, .bit)')) {
Expand Down
6 changes: 3 additions & 3 deletions libraries/classes/Display/Results.php
View file
Expand Up @@ -3608,7 +3608,7 @@ private function getDataCellForNumericColumns(
* function
* @param string $defaultFunction the default transformation
* function
* @param string $transformOptions the transformation parameters
* @param array $transformOptions the transformation parameters
* @param array $analyzedSqlResults the analyzed query
*
* @return string the prepared data cell, html content
Expand Down Expand Up @@ -3749,7 +3749,7 @@ private function getDataCellForGeometryColumns(
* function
* @param string $defaultFunction the default transformation
* function
* @param string $transformOptions the transformation parameters
* @param array $transformOptions the transformation parameters
* @param bool $isFieldTruncated is data truncated due to
* LimitChars
* @param array $analyzedSqlResults the analyzed query
Expand Down Expand Up @@ -4803,7 +4803,7 @@ private function getResultsOperations(
* Can also be the
* default function:
* Core::mimeDefaultFunction
* @param string $transformOptions transformation parameters
* @param array $transformOptions transformation parameters
* @param string $defaultFunction default transformation function
* @param FieldMetadata $meta the meta-information about the field
* @param array $urlParams parameters that should go to the
Expand Down
20 changes: 0 additions & 20 deletions phpstan-baseline.neon
View file
Expand Up @@ -400,36 +400,16 @@ parameters:
count: 1
path: libraries/classes/Display/Results.php

-
message: "#^Parameter \\#9 \\$transformOptions of method PhpMyAdmin\\\\Display\\\\Results\\:\\:getDataCellForGeometryColumns\\(\\) expects string, array given\\.$#"
count: 1
path: libraries/classes/Display/Results.php

-
message: "#^Parameter \\#8 \\$defaultFunction of method PhpMyAdmin\\\\Display\\\\Results\\:\\:getDataCellForNonNumericColumns\\(\\) expects string, array\\<int, string\\> given\\.$#"
count: 1
path: libraries/classes/Display/Results.php

-
message: "#^Parameter \\#9 \\$transformOptions of method PhpMyAdmin\\\\Display\\\\Results\\:\\:getDataCellForNonNumericColumns\\(\\) expects string, array given\\.$#"
count: 1
path: libraries/classes/Display/Results.php

-
message: "#^Strict comparison using \\=\\=\\= between string and null will always evaluate to false\\.$#"
count: 3
path: libraries/classes/Display/Results.php

-
message: "#^Parameter \\#12 \\$transformOptions of method PhpMyAdmin\\\\Display\\\\Results\\:\\:getRowData\\(\\) expects array, string given\\.$#"
count: 3
path: libraries/classes/Display/Results.php

-
message: "#^Parameter \\#4 \\$transformOptions of method PhpMyAdmin\\\\Display\\\\Results\\:\\:handleNonPrintableContents\\(\\) expects string, array given\\.$#"
count: 2
path: libraries/classes/Display/Results.php

-
message: "#^Parameter \\#5 \\$defaultFunction of method PhpMyAdmin\\\\Display\\\\Results\\:\\:handleNonPrintableContents\\(\\) expects string, array\\<int, string\\> given\\.$#"
count: 2
Expand Down
9 changes: 1 addition & 8 deletions psalm-baseline.xml
View file
Expand Up @@ -721,20 +721,13 @@
</TypeDoesNotContainNull>
</file>
<file src="libraries/classes/Display/Results.php">
<InvalidArgument occurrences="16">
<InvalidArgument occurrences="9">
<code>$added[$orgFullTableName]</code>
<code>$defaultFunction</code>
<code>$defaultFunction</code>
<code>$defaultFunction</code>
<code>$defaultFunction</code>
<code>$defaultFunction</code>
<code>$transformOptions</code>
<code>$transformOptions</code>
<code>$transformOptions</code>
<code>$transformOptions</code>
<code>$transformOptions</code>
<code>$transformOptions</code>
<code>$transformOptions</code>
<code>$transformationPlugin</code>
<code>$transformationPlugin</code>
<code>$transformationPlugin</code>
Expand Down

0 comments on commit c705526

Please sign in to comment.