Leverage the match expression

Author: fancyweb

Command/LintCommand.php

@@ -154,16 +154,12 @@ private function validate(string $content, int $flags, string $file = null)
 
     private function display(SymfonyStyle $io, array $files): int
     {
-        switch ($this->format) {
-            case 'txt':
-                return $this->displayTxt($io, $files);
-            case 'json':
-                return $this->displayJson($io, $files);
-            case 'github':
-                return $this->displayTxt($io, $files, true);
-            default:
-                throw new InvalidArgumentException(sprintf('The format "%s" is not supported.', $this->format));
-        }
+        return match ($this->format) {
+            'txt' => $this->displayTxt($io, $files),
+            'json' => $this->displayJson($io, $files),
+            'github' => $this->displayTxt($io, $files, true),
+            default => throw new InvalidArgumentException(sprintf('The format "%s" is not supported.', $this->format)),
+        };
     }
 
     private function displayTxt(SymfonyStyle $io, array $filesInfo, bool $errorAsGithubAnnotations = false): int

Parser.php

@@ -1043,25 +1043,14 @@ private function isStringUnIndentedCollectionItem(): bool
     public static function preg_match(string $pattern, string $subject, array &$matches = null, int $flags = 0, int $offset = 0): int
     {
         if (false === $ret = preg_match($pattern, $subject, $matches, $flags, $offset)) {
-            switch (preg_last_error()) {
-                case \PREG_INTERNAL_ERROR:
-                    $error = 'Internal PCRE error.';
-                    break;
-                case \PREG_BACKTRACK_LIMIT_ERROR:
-                    $error = 'pcre.backtrack_limit reached.';
-                    break;
-                case \PREG_RECURSION_LIMIT_ERROR:
-                    $error = 'pcre.recursion_limit reached.';
-                    break;
-                case \PREG_BAD_UTF8_ERROR:
-                    $error = 'Malformed UTF-8 data.';
-                    break;
-                case \PREG_BAD_UTF8_OFFSET_ERROR:
-                    $error = 'Offset doesn\'t correspond to the begin of a valid UTF-8 code point.';
-                    break;
-                default:
-                    $error = 'Error.';
-            }
+            $error = match (preg_last_error()) {
+                \PREG_INTERNAL_ERROR => 'Internal PCRE error.',
+                \PREG_BACKTRACK_LIMIT_ERROR => 'pcre.backtrack_limit reached.',
+                \PREG_RECURSION_LIMIT_ERROR => 'pcre.recursion_limit reached.',
+                \PREG_BAD_UTF8_ERROR => 'Malformed UTF-8 data.',
+                \PREG_BAD_UTF8_OFFSET_ERROR => 'Offset doesn\'t correspond to the begin of a valid UTF-8 code point.',
+                default => 'Error.',
+            };
 
             throw new ParseException($error);
         }

Unescaper.php

@@ -60,56 +60,34 @@ public function unescapeDoubleQuotedString(string $value): string
      */
     private function unescapeCharacter(string $value): string
     {
-        switch ($value[1]) {
-            case '0':
-                return "\x0";
-            case 'a':
-                return "\x7";
-            case 'b':
-                return "\x8";
-            case 't':
-                return "\t";
-            case "\t":
-                return "\t";
-            case 'n':
-                return "\n";
-            case 'v':
-                return "\xB";
-            case 'f':
-                return "\xC";
-            case 'r':
-                return "\r";
-            case 'e':
-                return "\x1B";
-            case ' ':
-                return ' ';
-            case '"':
-                return '"';
-            case '/':
-                return '/';
-            case '\\':
-                return '\\';
-            case 'N':
-                // U+0085 NEXT LINE
-                return "\xC2\x85";
-            case '_':
-                // U+00A0 NO-BREAK SPACE
-                return "\xC2\xA0";
-            case 'L':
-                // U+2028 LINE SEPARATOR
-                return "\xE2\x80\xA8";
-            case 'P':
-                // U+2029 PARAGRAPH SEPARATOR
-                return "\xE2\x80\xA9";
-            case 'x':
-                return self::utf8chr(hexdec(substr($value, 2, 2)));
-            case 'u':
-                return self::utf8chr(hexdec(substr($value, 2, 4)));
-            case 'U':
-                return self::utf8chr(hexdec(substr($value, 2, 8)));
-            default:
-                throw new ParseException(sprintf('Found unknown escape character "%s".', $value));
-        }
+        return match ($value[1]) {
+            '0' => "\x0",
+            'a' => "\x7",
+            'b' => "\x8",
+            't' => "\t",
+            "\t" => "\t",
+            'n' => "\n",
+            'v' => "\xB",
+            'f' => "\xC",
+            'r' => "\r",
+            'e' => "\x1B",
+            ' ' => ' ',
+            '"' => '"',
+            '/' => '/',
+            '\\' => '\\',
+            // U+0085 NEXT LINE
+            'N' => "\xC2\x85",
+            // U+00A0 NO-BREAK SPACE
+            '_' => "\xC2\xA0",
+            // U+2028 LINE SEPARATOR
+            'L' => "\xE2\x80\xA8",
+            // U+2029 PARAGRAPH SEPARATOR
+            'P' => "\xE2\x80\xA9",
+            'x' => self::utf8chr(hexdec(substr($value, 2, 2))),
+            'u' => self::utf8chr(hexdec(substr($value, 2, 4))),
+            'U' => self::utf8chr(hexdec(substr($value, 2, 8))),
+            default => throw new ParseException(sprintf('Found unknown escape character "%s".', $value)),
+        };
     }
 
     /**