Merge pull request #18711 from kamil-tekiela/buildDescription

MauricioFauth · web-flow · commit bd0972a4af94 · 2023-09-25T21:20:44.000-03:00
Small refactoring of Collation
diff --git a/src/Charsets/Collation.php b/src/Charsets/Collation.php
@@ -163,15 +163,9 @@ private function buildDescription(): string
                 /* Next will be suffix */
                 $level = 5;
                 /* Variant */
-                $found = true;
                 $variantFound = $this->getVariant($part);
-                if ($variantFound === null) {
-                    $found = false;
-                } else {
+                if ($variantFound !== null) {
                     $variant = $variantFound;
-                }
-
-                if ($found) {
                     continue;
                 }
                 // Not parsed token, fall to next level
@@ -182,7 +176,12 @@ private function buildDescription(): string
             }
 
             /* Suffixes */
-            $suffixes = $this->addSuffixes($suffixes, $part);
+            $suffix = $this->addSuffixes($part);
+            if ($suffix === null) {
+                continue;
+            }
+
+            $suffixes[] = $suffix;
         }
 
         return $this->buildName($name, $variant, $suffixes);
@@ -213,42 +212,19 @@ private function getVariant(string $part): string|null
         };
     }
 
-    /**
-     * @param string[] $suffixes
-     *
-     * @return string[]
-     */
-    private function addSuffixes(array $suffixes, string $part): array
+    private function addSuffixes(string $part): string|null
     {
-        switch ($part) {
-            case 'ci':
-                $suffixes[] = _pgettext('Collation variant', 'case-insensitive');
-                break;
-            case 'cs':
-                $suffixes[] = _pgettext('Collation variant', 'case-sensitive');
-                break;
-            case 'ai':
-                $suffixes[] = _pgettext('Collation variant', 'accent-insensitive');
-                break;
-            case 'as':
-                $suffixes[] = _pgettext('Collation variant', 'accent-sensitive');
-                break;
-            case 'ks':
-                $suffixes[] = _pgettext('Collation variant', 'kana-sensitive');
-                break;
-            case 'w2':
-            case 'l2':
-                $suffixes[] = _pgettext('Collation variant', 'multi-level');
-                break;
-            case 'bin':
-                $suffixes[] = _pgettext('Collation variant', 'binary');
-                break;
-            case 'nopad':
-                $suffixes[] = _pgettext('Collation variant', 'no-pad');
-                break;
-        }
-
-        return $suffixes;
+        return match ($part) {
+            'ci' => _pgettext('Collation variant', 'case-insensitive'),
+            'cs' => _pgettext('Collation variant', 'case-sensitive'),
+            'ai' => _pgettext('Collation variant', 'accent-insensitive'),
+            'as' => _pgettext('Collation variant', 'accent-sensitive'),
+            'ks' => _pgettext('Collation variant', 'kana-sensitive'),
+            'w2','l2' => _pgettext('Collation variant', 'multi-level'),
+            'bin' => _pgettext('Collation variant', 'binary'),
+            'nopad' => _pgettext('Collation variant', 'no-pad'),
+            default => null,
+        };
     }
 
     /**
