Merge branch 'QA_5_2'

MauricioFauth · MauricioFauth · commit 0b2ab57ea22b · 2022-08-19T00:31:22.000-03:00
Signed-off-by: Maurício Meneghini Fauth &lt;mauricio@fauth.dev&gt;
diff --git a/libraries/classes/InsertEdit.php b/libraries/classes/InsertEdit.php
@@ -1663,6 +1663,7 @@ public function getQueryValuesForInsertAndUpdateInMultipleEdit(
                 . ' = ' . $currentValueAsAnArray;
         } elseif (
             ! (empty($multiEditFuncs[$key])
+                && empty($multiEditColumnsNull[$key])
                 && isset($multiEditColumnsPrev[$key])
                 && $currentValue === $multiEditColumnsPrev[$key])
             && $currentValueAsAnArray !== ''
diff --git a/psalm-baseline.xml b/psalm-baseline.xml
@@ -3283,9 +3283,7 @@
       <code>$_POST['field_transformation'][$fieldindex]</code>
       <code>$_POST['field_transformation_options'][$fieldindex]</code>
     </MixedArrayAccess>
-    <MixedAssignment occurrences="3">
-      <code>$GLOBALS['num_fields']</code>
-      <code>$GLOBALS['result']</code>
+    <MixedAssignment occurrences="1">
       <code>$mimetype</code>
     </MixedAssignment>
   </file>
diff --git a/test/classes/InsertEditTest.php b/test/classes/InsertEditTest.php
@@ -2217,6 +2217,30 @@ public function testGetQueryValuesForInsertAndUpdateInMultipleEdit(): void
             ],
             $result
         );
+
+        // Test to see if a field can be set to NULL
+        $result = $this->insertEdit->getQueryValuesForInsertAndUpdateInMultipleEdit(
+            $multi_edit_columns_name,
+            ['on'],
+            '',
+            [''],
+            [],
+            false,
+            [],
+            [],
+            'NULL',
+            [],
+            '0',
+            []
+        );
+
+        $this->assertEquals(
+            [
+                ['`fld` = NULL'],
+                [],
+            ],
+            $result
+        );
     }
 
     /**
