From 8b2286bdc9ea73353d731cab3c888df942dbb642 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Maur=C3=ADcio=20Meneghini=20Fauth?= <mauricio@fauth.dev>
Date: Fri, 26 Nov 2021 15:02:28 -0300
Subject: [PATCH] Fix some failing tests
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

Signed-off-by: Maurício Meneghini Fauth <mauricio@fauth.dev>
---
 libraries/classes/InsertEdit.php | 6 ++++--
 psalm-baseline.xml               | 8 ++++----
 templates/home/index.twig        | 6 +++---
 test/selenium/ImportTest.php     | 4 ++--
 4 files changed, 13 insertions(+), 11 deletions(-)

diff --git a/libraries/classes/InsertEdit.php b/libraries/classes/InsertEdit.php
index 19bb4b4fa9..d6f746fe89 100644
--- a/libraries/classes/InsertEdit.php
+++ b/libraries/classes/InsertEdit.php
@@ -1211,9 +1211,11 @@ class InsertEdit
             $row,
             true
         );
-        if ($uniqueCondition) {
-            $_SESSION['edit_next'] = $uniqueCondition;
+        if (! $uniqueCondition) {
+            return;
         }
+
+        $_SESSION['edit_next'] = $uniqueCondition;
     }
 
     /**
diff --git a/psalm-baseline.xml b/psalm-baseline.xml
index ca23dd41a1..867f82bf0f 100644
--- a/psalm-baseline.xml
+++ b/psalm-baseline.xml
@@ -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">
diff --git a/templates/home/index.twig b/templates/home/index.twig
index 60f9d5d924..72b70a242b 100644
--- a/templates/home/index.twig
+++ b/templates/home/index.twig
@@ -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">
diff --git a/test/selenium/ImportTest.php b/test/selenium/ImportTest.php
index c521b24a44..74d70df602 100644
--- a/test/selenium/ImportTest.php
+++ b/test/selenium/ImportTest.php
@@ -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(