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

Fix some failing tests

Browse Source 
Signed-off-by: Maurício Meneghini Fauth <mauricio@fauth.dev>
This commit is contained in:
Maurício Meneghini Fauth 2021-11-26 15:02:28 -03:00
parent 22a6fc9045
commit 8b2286bdc9
No known key found for this signature in database
GPG Key ID: 6A16FD38AFC89CC8
4 changed files with 13 additions and 11 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
libraries/classes/InsertEdit.php
View File

@ -1211,9 +1211,11 @@ class InsertEdit
$row,
true
);
if ($uniqueCondition) {
$_SESSION['edit_next'] = $uniqueCondition;
if (! $uniqueCondition) {
return;
}
$_SESSION['edit_next'] = $uniqueCondition;
}
/**

8
psalm-baseline.xml
View File

@ -1,5 +1,5 @@
<?xml version="1.0" encoding="UTF-8"?>
<files psalm-version="4.13.0@cd489407a0219b93cadd04d5aff9845a942f7e5d">
<files psalm-version="4.13.1@5cf660f63b548ccd4a56f62d916ee4d6028e01a3">
<file src="index.php">
<InvalidGlobal occurrences="1">
<code>global $route, $containerBuilder, $request;</code>
@ -2998,6 +2998,9 @@
<code>$biggest_max_file_size</code>
<code>$jsvkey</code>
</MixedOperand>
<PossiblyInvalidArgument occurrences="1">
<code>$current_result</code>
</PossiblyInvalidArgument>
<PossiblyNullArgument occurrences="1">
<code>$isUpload</code>
</PossiblyNullArgument>
@ -7396,9 +7399,6 @@
<RedundantPropertyInitializationCheck occurrences="1">
<code>isset(self::$instance)</code>
</RedundantPropertyInitializationCheck>
<UnusedVariable occurrences="1">
<code>$points_arr</code>
</UnusedVariable>
</file>
<file src="libraries/classes/Gis/GisPoint.php">
<MixedArgument occurrences="10">

6
templates/home/index.twig
View File

@ -49,7 +49,7 @@
{% endif %}
<li id="li_select_mysql_collation" class="list-group-item">
<form method="post" action="{{ url('/collation-connection') }}" class="row row-cols-lg-auto g-3 align-items-center disableAjax">
<form method="post" action="{{ url('/collation-connection') }}" class="row row-cols-lg-auto align-items-center disableAjax">
{{ get_hidden_inputs(null, null, 4, 'collation_connection') }}
<div class="col-12">
<label for="collationConnectionSelect" class="col-form-label">
@ -95,7 +95,7 @@
<ul class="list-group list-group-flush">
{% if available_languages is not empty %}
<li id="li_select_lang" class="list-group-item">
<form method="get" action="{{ url('/') }}" class="row row-cols-lg-auto g-3 align-items-center disableAjax">
<form method="get" action="{{ url('/') }}" class="row row-cols-lg-auto align-items-center disableAjax">
{{ get_hidden_inputs({'db': db, 'table': table}) }}
<div class="col-12">
<label for="languageSelect" class="col-form-label text-nowrap">
@ -124,7 +124,7 @@
{% if has_theme_manager %}
<li id="li_select_theme" class="list-group-item">
<form method="post" action="{{ url('/themes/set') }}" class="row row-cols-lg-auto g-3 align-items-center disableAjax">
<form method="post" action="{{ url('/themes/set') }}" class="row row-cols-lg-auto align-items-center disableAjax">
{{ get_hidden_inputs() }}
<div class="col-12">
<label for="themeSelect" class="col-form-label">

4
test/selenium/ImportTest.php
View File

@ -116,12 +116,12 @@ class ImportTest extends TestBase
. ')'
);
$this->webDriver->wait(5);
$this->scrollToBottom();
$this->waitUntilElementIsVisible('id', 'buttonGo', 30);
$this->scrollToBottom();
$this->waitUntilElementIsVisible('id', 'sql_options', 30);
sleep(1);
$this->scrollToBottom();
$this->waitUntilElementIsVisible('id', 'buttonGo', 30);
$this->byId('buttonGo')->click();
sleep(2);
$this->waitUntilElementIsVisible(