Merge branch 'QA_5_2'

Signed-off-by: Maurício Meneghini Fauth <mauricio@fauth.dev>

4 files changed, 49 insertions, 45 deletions

diff --git a/libraries/classes/Controllers/Table/Structure/SaveController.php b/libraries/classes/Controllers/Table/Structure/SaveController.php
index 56d8e2209f..63f266eaa9 100644
--- a/libraries/classes/Controllers/Table/Structure/SaveController.php
+++ b/libraries/classes/Controllers/Table/Structure/SaveController.php
@@ -98,20 +98,20 @@ final class SaveController extends AbstractController
             }
 
             $changes[] = 'CHANGE ' . Table::generateAlter(
-                Util::getValueByKey($_POST, "field_orig.${i}", ''),
+                Util::getValueByKey($_POST, 'field_orig.' . $i, ''),
                 $_POST['field_name'][$i],
                 $_POST['field_type'][$i],
                 $_POST['field_length'][$i],
                 $_POST['field_attribute'][$i],
-                Util::getValueByKey($_POST, "field_collation.${i}", ''),
-                Util::getValueByKey($_POST, "field_null.${i}", 'NO'),
+                Util::getValueByKey($_POST, 'field_collation.' . $i, ''),
+                Util::getValueByKey($_POST, 'field_null.' . $i, 'NO'),
                 $_POST['field_default_type'][$i],
                 $_POST['field_default_value'][$i],
-                Util::getValueByKey($_POST, "field_extra.${i}", false),
-                Util::getValueByKey($_POST, "field_comments.${i}", ''),
-                Util::getValueByKey($_POST, "field_virtuality.${i}", ''),
-                Util::getValueByKey($_POST, "field_expression.${i}", ''),
-                Util::getValueByKey($_POST, "field_move_to.${i}", ''),
+                Util::getValueByKey($_POST, 'field_extra.' . $i, false),
+                Util::getValueByKey($_POST, 'field_comments.' . $i, ''),
+                Util::getValueByKey($_POST, 'field_virtuality.' . $i, ''),
+                Util::getValueByKey($_POST, 'field_expression.' . $i, ''),
+                Util::getValueByKey($_POST, 'field_move_to.' . $i, ''),
                 $columns_with_index
             );
 
@@ -242,20 +242,20 @@ final class SaveController extends AbstractController
                     }
 
                     $changes_revert[] = 'CHANGE ' . Table::generateAlter(
-                        Util::getValueByKey($_POST, "field_orig.${i}", ''),
+                        Util::getValueByKey($_POST, 'field_orig.' . $i, ''),
                         $_POST['field_name'][$i],
                         $_POST['field_type_orig'][$i],
                         $_POST['field_length_orig'][$i],
                         $_POST['field_attribute_orig'][$i],
-                        Util::getValueByKey($_POST, "field_collation_orig.${i}", ''),
-                        Util::getValueByKey($_POST, "field_null_orig.${i}", 'NO'),
+                        Util::getValueByKey($_POST, 'field_collation_orig.' . $i, ''),
+                        Util::getValueByKey($_POST, 'field_null_orig.' . $i, 'NO'),
                         $_POST['field_default_type_orig'][$i],
                         $_POST['field_default_value_orig'][$i],
-                        Util::getValueByKey($_POST, "field_extra_orig.${i}", false),
-                        Util::getValueByKey($_POST, "field_comments_orig.${i}", ''),
-                        Util::getValueByKey($_POST, "field_virtuality_orig.${i}", ''),
-                        Util::getValueByKey($_POST, "field_expression_orig.${i}", ''),
-                        Util::getValueByKey($_POST, "field_move_to_orig.${i}", '')
+                        Util::getValueByKey($_POST, 'field_extra_orig.' . $i, false),
+                        Util::getValueByKey($_POST, 'field_comments_orig.' . $i, ''),
+                        Util::getValueByKey($_POST, 'field_virtuality_orig.' . $i, ''),
+                        Util::getValueByKey($_POST, 'field_expression_orig.' . $i, ''),
+                        Util::getValueByKey($_POST, 'field_move_to_orig.' . $i, '')
                     );
                 }
 
diff --git a/libraries/classes/Git.php b/libraries/classes/Git.php
index 3641cf1a0d..f30c500080 100644
--- a/libraries/classes/Git.php
+++ b/libraries/classes/Git.php
@@ -394,7 +394,11 @@ class Git
                 $user2['date'] .= $user[4];
             }
 
-            ${$linetype} = $user2;
+            if ($linetype === 'author') {
+                $author = $user2;
+            } elseif ($linetype === 'committer') {
+                $committer = $user2;
+            }
         } while ($dataline != '');
 
         $message = trim(implode(' ', $commit));
diff --git a/libraries/classes/LanguageManager.php b/libraries/classes/LanguageManager.php
index 105988b235..c568eb5fb7 100644
--- a/libraries/classes/LanguageManager.php
+++ b/libraries/classes/LanguageManager.php
@@ -57,7 +57,7 @@ class LanguageManager
             'ar',
             'Arabic',
             'العربية',
-            'ar|arabic',
+            'ar(?![-_]ly)([-_][[:alpha:]]{2,3})?|arabic',
             'ar_AE',
         ],
         'ar_ly' => [
@@ -183,7 +183,7 @@ class LanguageManager
             'en',
             'English',
             '',
-            'en|english',
+            'en(?![-_]gb)([-_][[:alpha:]]{2,3})?|english',
             'en_US',
         ],
         'en_gb' => [
@@ -512,7 +512,7 @@ class LanguageManager
             'pt',
             'Portuguese',
             'Português',
-            'pt|portuguese',
+            'pt(?![-_]br)([-_][[:alpha:]]{2,3})?|portuguese',
             'pt_PT',
         ],
         'pt_br' => [
diff --git a/libraries/classes/Table/ColumnsDefinition.php b/libraries/classes/Table/ColumnsDefinition.php
index 030c423322..d8281639cf 100644
--- a/libraries/classes/Table/ColumnsDefinition.php
+++ b/libraries/classes/Table/ColumnsDefinition.php
@@ -165,47 +165,47 @@ final class ColumnsDefinition
                     [
                         'Field' => Util::getValueByKey(
                             $_POST,
-                            "field_name.${columnNumber}",
+                            'field_name.' . $columnNumber,
                             null
                         ),
                         'Type' => Util::getValueByKey(
                             $_POST,
-                            "field_type.${columnNumber}",
+                            'field_type.' . $columnNumber,
                             null
                         ),
                         'Collation' => Util::getValueByKey(
                             $_POST,
-                            "field_collation.${columnNumber}",
+                            'field_collation.' . $columnNumber,
                             ''
                         ),
                         'Null' => Util::getValueByKey(
                             $_POST,
-                            "field_null.${columnNumber}",
+                            'field_null.' . $columnNumber,
                             ''
                         ),
                         'DefaultType' => Util::getValueByKey(
                             $_POST,
-                            "field_default_type.${columnNumber}",
+                            'field_default_type.' . $columnNumber,
                             'NONE'
                         ),
                         'DefaultValue' => Util::getValueByKey(
                             $_POST,
-                            "field_default_value.${columnNumber}",
+                            'field_default_value.' . $columnNumber,
                             ''
                         ),
                         'Extra' => Util::getValueByKey(
                             $_POST,
-                            "field_extra.${columnNumber}",
+                            'field_extra.' . $columnNumber,
                             null
                         ),
                         'Virtuality' => Util::getValueByKey(
                             $_POST,
-                            "field_virtuality.${columnNumber}",
+                            'field_virtuality.' . $columnNumber,
                             ''
                         ),
                         'Expression' => Util::getValueByKey(
                             $_POST,
-                            "field_expression.${columnNumber}",
+                            'field_expression.' . $columnNumber,
                             ''
                         ),
                     ]
@@ -214,7 +214,7 @@ final class ColumnsDefinition
                 $columnMeta['Key'] = '';
                 $parts = explode(
                     '_',
-                    Util::getValueByKey($_POST, "field_key.${columnNumber}", ''),
+                    Util::getValueByKey($_POST, 'field_key.' . $columnNumber, ''),
                     2
                 );
                 if (count($parts) === 2 && $parts[1] == $columnNumber) {
@@ -247,21 +247,21 @@ final class ColumnsDefinition
                         break;
                 }
 
-                $length = Util::getValueByKey($_POST, "field_length.${columnNumber}", $length);
-                $submit_attribute = Util::getValueByKey($_POST, "field_attribute.${columnNumber}", false);
-                $comments_map[$columnMeta['Field']] = Util::getValueByKey($_POST, "field_comments.${columnNumber}");
+                $length = Util::getValueByKey($_POST, 'field_length.' . $columnNumber, $length);
+                $submit_attribute = Util::getValueByKey($_POST, 'field_attribute.' . $columnNumber, false);
+                $comments_map[$columnMeta['Field']] = Util::getValueByKey($_POST, 'field_comments.' . $columnNumber);
 
                 $GLOBALS['mime_map'][$columnMeta['Field']] = array_merge(
                     $GLOBALS['mime_map'][$columnMeta['Field']] ?? [],
                     [
-                        'mimetype' => Util::getValueByKey($_POST, "field_mimetype.${columnNumber}"),
+                        'mimetype' => Util::getValueByKey($_POST, 'field_mimetype.' . $columnNumber),
                         'transformation' => Util::getValueByKey(
                             $_POST,
-                            "field_transformation.${columnNumber}"
+                            'field_transformation.' . $columnNumber
                         ),
                         'transformation_options' => Util::getValueByKey(
                             $_POST,
-                            "field_transformation_options.${columnNumber}"
+                            'field_transformation_options.' . $columnNumber
                         ),
                     ]
                 );
@@ -380,15 +380,15 @@ final class ColumnsDefinition
                 $form_params = array_merge(
                     $form_params,
                     [
-                        "field_default_value_orig[${columnNumber}]" => $columnMeta['Default'] ?? '',
-                        "field_default_type_orig[${columnNumber}]" => $columnMeta['DefaultType'] ?? '',
-                        "field_collation_orig[${columnNumber}]" => $columnMeta['Collation'] ?? '',
-                        "field_attribute_orig[${columnNumber}]" => trim($extracted_columnspec['attribute'] ?? ''),
-                        "field_null_orig[${columnNumber}]" => $columnMeta['Null'] ?? '',
-                        "field_extra_orig[${columnNumber}]" => $columnMeta['Extra'] ?? '',
-                        "field_comments_orig[${columnNumber}]" => $columnMeta['Comment'] ?? '',
-                        "field_virtuality_orig[${columnNumber}]" => $columnMeta['Virtuality'] ?? '',
-                        "field_expression_orig[${columnNumber}]" => $columnMeta['Expression'] ?? '',
+                        'field_default_value_orig[' . $columnNumber . ']' => $columnMeta['Default'] ?? '',
+                        'field_default_type_orig[' . $columnNumber . ']' => $columnMeta['DefaultType'] ?? '',
+                        'field_collation_orig[' . $columnNumber . ']' => $columnMeta['Collation'] ?? '',
+                        'field_attribute_orig[' . $columnNumber . ']' => trim($extracted_columnspec['attribute'] ?? ''),
+                        'field_null_orig[' . $columnNumber . ']' => $columnMeta['Null'] ?? '',
+                        'field_extra_orig[' . $columnNumber . ']' => $columnMeta['Extra'] ?? '',
+                        'field_comments_orig[' . $columnNumber . ']' => $columnMeta['Comment'] ?? '',
+                        'field_virtuality_orig[' . $columnNumber . ']' => $columnMeta['Virtuality'] ?? '',
+                        'field_expression_orig[' . $columnNumber . ']' => $columnMeta['Expression'] ?? '',
                     ]
                 );
             }