gian/phpmyadmin
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Merge branch 'QA_5_2'

Browse Source
This commit is contained in:
Maurício Meneghini Fauth 2022-02-11 15:22:51 -03:00
commit 86eea3a730
No known key found for this signature in database
GPG Key ID: 6A16FD38AFC89CC8
4 changed files with 6 additions and 16 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
libraries/classes/Tracker.php
View File

@ -950,7 +950,7 @@ class Tracker
" AND `db_name` = '" . $dbi->escapeString($dbname ?? '') . "' " .
" AND `table_name` = '"
. $dbi->escapeString($result['tablename']) . "' " .
" AND `version` = '" . $dbi->escapeString($version ?? '') . "' ";
" AND `version` = '" . $dbi->escapeString((string) $version) . "' ";
$dbi->queryAsControlUser($sqlQuery);
}

5
phpstan-baseline.neon
View File

@ -8370,11 +8370,6 @@ parameters:
count: 1
path: libraries/classes/Tracker.php
-
message: "#^Variable \\$version on left side of \\?\\? always exists and is not nullable\\.$#"
count: 1
path: libraries/classes/Tracker.php
-
message: "#^Cannot access offset 'COLUMNS' on mixed\\.$#"
count: 1

9
psalm-baseline.xml
View File

@ -13412,8 +13412,7 @@
</UnevaluatedCode>
</file>
<file src="libraries/classes/Tracker.php">
<DocblockTypeContradiction occurrences="4">
<code>''</code>
<DocblockTypeContradiction occurrences="3">
<code>null</code>
<code>null</code>
<code>null</code>
@ -13463,9 +13462,6 @@
<code>mb_strpos($logEntry, "\n")</code>
<code>mb_strpos($logEntry, "\n")</code>
</PossiblyFalseOperand>
<PossiblyInvalidArgument occurrences="1">
<code>$version ?? ''</code>
</PossiblyInvalidArgument>
<PossiblyInvalidPropertyFetch occurrences="4">
<code>$statement-&gt;body[2]-&gt;value</code>
<code>$statement-&gt;body[3]-&gt;value</code>
@ -13481,10 +13477,9 @@
<RedundantCondition occurrences="1">
<code>$dbname</code>
</RedundantCondition>
<RedundantConditionGivenDocblockType occurrences="4">
<RedundantConditionGivenDocblockType occurrences="3">
<code>$statement-&gt;name !== null</code>
<code>$statement-&gt;name !== null</code>
<code>$version</code>
<code>isset($statement-&gt;options)</code>
</RedundantConditionGivenDocblockType>
<TypeDoesNotContainNull occurrences="1">

6
test/selenium/Table/CreateTest.php
View File

@ -65,7 +65,7 @@ class CreateTest extends TestBase
$column_dropdown_details = [
'field_0_6' => 'UNSIGNED',
'field_1_2' => 'VARCHAR',
'field_1_5' => 'utf8_general_ci',
'field_1_5' => 'utf8mb4_general_ci',
'field_1_4' => 'As defined:',
];
@ -83,7 +83,7 @@ class CreateTest extends TestBase
$this->moveto($ele);
// post
$ele->click();
$this->waitForElement('cssSelector', 'li.last.table');
$this->waitForElement('cssSelector', 'li.last.nav_node_table');
$this->waitAjax();
@ -162,7 +162,7 @@ class CreateTest extends TestBase
);
$this->assertEquals(
'utf8_general_ci',
'utf8mb4_general_ci',
$this->getCellByTableId('tablestructure', 2, 5)
);