Skip to content

Commit 3dd3a7b

Browse files
williamdeswilliamdes
committed
Merge #20006 - Fix tests after merge
Pull-request: #20006 Signed-off-by: William Desportes <williamdes@wdes.fr>
2 parents 8f06a37 + d42a1a5 commit 3dd3a7b

3 files changed

Lines changed: 4 additions & 6 deletions

File tree

‎psalm-baseline.xml‎

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -11355,6 +11355,8 @@
1135511355
<MixedArrayAccess>
1135611356
<code><![CDATA[$_SESSION['userconfig']['db']]]></code>
1135711357
<code><![CDATA[$_SESSION['userconfig']['ts']]]></code>
11358+
<code><![CDATA[$resultConfig['2fa']['settings']]]></code>
11359+
<code><![CDATA[$resultConfig['2fa']['settings']['secret']]]></code>
1135811360
</MixedArrayAccess>
1135911361
</file>
1136011362
<file src="tests/unit/UtilTest.php">

‎tests/unit/Table/TableTest.php‎

Lines changed: 0 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -939,8 +939,6 @@ public function testGenerateFieldSpecForRename(): void
939939
$virtuality = '';
940940
$expression = '';
941941
$moveTo = '';
942-
$columnsWithIndex = ['id'];
943-
$oldColumnName = 'created_at';
944942

945943
$query = Table::generateFieldSpec(
946944
$name,
@@ -975,8 +973,6 @@ public function testGenerateFieldSpecForRename(): void
975973
$virtuality = '';
976974
$expression = '';
977975
$moveTo = '';
978-
$columnsWithIndex = ['id'];
979-
$oldColumnName = 'created_at';
980976

981977
$query = Table::generateFieldSpec(
982978
$name,
@@ -1009,8 +1005,6 @@ public function testGenerateFieldSpecForRename(): void
10091005
$virtuality = '';
10101006
$expression = '';
10111007
$moveTo = '';
1012-
$columnsWithIndex = ['id'];
1013-
$oldColumnName = 'created_at';
10141008

10151009
$query = Table::generateFieldSpec(
10161010
$name,

‎tests/unit/UserPreferencesTest.php‎

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -298,6 +298,8 @@ public function testSaveAndKeep2FA(): void
298298

299299
$result = $userPreferences->save([1]);
300300

301+
self::assertTrue($result);
302+
301303
$dummyDbi->addResult(
302304
<<<'SQL'
303305
SELECT `username` FROM `pma-db`.`pma__userconfig` WHERE `username` = 'root'

0 commit comments

Comments
 (0)