No psalm errors in Lexer

Had to suppress vimeo/psalm#5231 though
sad-spirit · Feb 16, 2021 · cea7cbe · cea7cbe
1 parent c70dccd
commit cea7cbe
Showing 1 changed file with 10 additions and 8 deletions.
diff --git a/src/sad_spirit/pg_builder/Lexer.php b/src/sad_spirit/pg_builder/Lexer.php
@@ -443,12 +443,12 @@ private function unescapeCStyle(string $escaped, int $position): string
         $unescaped  = '';
 
         foreach (
-            (array)preg_split(
+            preg_split(
                 "!(\\\\(?:x[0-9a-fA-F]{1,2}|[0-7]{1,3}|u[0-9a-fA-F]{0,4}|U[0-9a-fA-F]{0,8}|[^0-7]))!",
                 $escaped,
                 -1,
                 PREG_SPLIT_NO_EMPTY | PREG_SPLIT_DELIM_CAPTURE | PREG_SPLIT_OFFSET_CAPTURE
-            ) as [$part, $partPosition]
+            ) ?: [] as [$part, $partPosition]
         ) {
             if ('\\' !== $part[0]) {
                 if (null !== $this->pairFirst) {
@@ -465,10 +465,10 @@ private function unescapeCStyle(string $escaped, int $position): string
                     $unescaped .= self::$replacements[$part[1]];
 
                 } elseif ('x' === $part[1]) {
-                    $unescaped .= chr(hexdec(substr($part, 2)));
+                    $unescaped .= chr((int)hexdec(substr($part, 2)));
 
                 } elseif (strspn($part, '01234567', 1)) {
-                    $unescaped .= chr(octdec(substr($part, 1)));
+                    $unescaped .= chr((int)octdec(substr($part, 1)));
 
                 } else {
                     // Just strip the escape and return the following char, as Postgres does
@@ -486,7 +486,7 @@ private function unescapeCStyle(string $escaped, int $position): string
                 }
 
                 $unescaped .= $this->handlePossibleSurrogatePairs(
-                    hexdec(substr($part, 2)),
+                    (int)hexdec(substr($part, 2)),
                     $partPosition,
                     $position
                 );
@@ -657,6 +657,8 @@ private function unescapeUnicodeTokens(): void
      * @param Token  $token      The whole Token is needed to be able to use its position in exception messages
      * @param string $escapeChar Value of escape character provided by UESCAPE 'X' clause, if present
      * @return string value of Token with Unicode escapes replaced by their UTF-8 equivalents
+     *
+     * @psalm-suppress TypeDoesNotContainType
      */
     private function unescapeUnicode(Token $token, string $escapeChar = '\\'): string
     {
@@ -667,16 +669,16 @@ private function unescapeUnicode(Token $token, string $escapeChar = '\\'): strin
         $quoted    = preg_quote($escapeChar);
 
         foreach (
-            (array)preg_split(
+            preg_split(
                 "/({$quoted}(?:{$quoted}|[0-9a-fA-F]{4}|\\+[0-9a-fA-F]{6}))/",
                 $token->getValue(),
                 -1,
                 PREG_SPLIT_NO_EMPTY | PREG_SPLIT_OFFSET_CAPTURE | PREG_SPLIT_DELIM_CAPTURE
-            ) as [$part, $position]
+            ) ?: [] as [$part, $position]
         ) {
             if ($escapeChar === $part[0] && $escapeChar !== $part[1]) {
                 $unescaped .= $this->handlePossibleSurrogatePairs(
-                    hexdec(ltrim($part, $escapeChar . '+')),
+                    (int)hexdec(ltrim($part, $escapeChar . '+')),
                     $position,
                     $token->getPosition() + 3
                 );