Fix #296: Prevent posible issues with array default values ('{one,two}'::text[])::varchar[], remove ArrayParser::parseString()

Tigrov · web-flow · commit 0dd905b183dd · 2023-07-24T09:26:25.000+03:00
diff --git a/CHANGELOG.md b/CHANGELOG.md
@@ -9,6 +9,7 @@
 - Chg #288: Typecast refactoring (@Tigrov)
 - Chg #291: Update phpTypecast for bool type (@Tigrov)
 - Enh #294: Refactoring of `Schema::normalizeDefaultValue()` method (@Tigrov)
+- Bug #296: Prevent posible issues with array default values `('{one,two}'::text[])::varchar[]`, remove `ArrayParser::parseString()` (@Tigrov)
 
 ## 1.0.0 April 12, 2023
 
diff --git a/src/ArrayParser.php b/src/ArrayParser.php
@@ -18,7 +18,7 @@ final class ArrayParser
      */
     public function parse(string|null $value): array|null
     {
-        return $value !== null
+        return $value !== null && $value[0] === '{'
             ? $this->parseArray($value)
             : null;
     }
@@ -40,7 +40,8 @@ private function parseArray(string $value, int &$i = 0): array
             $result[] = match ($value[$i]) {
                 '{' => $this->parseArray($value, $i),
                 ',', '}' => null,
-                default => $this->parseString($value, $i),
+                '"' => $this->parseQuotedString($value, $i),
+                default => $this->parseUnquotedString($value, $i),
             };
 
             if ($value[$i] === '}') {
@@ -50,19 +51,6 @@ private function parseArray(string $value, int &$i = 0): array
         }
     }
 
-    /**
-     * Parses PostgreSQL encoded string.
-     *
-     * @param string $value String to parse.
-     * @param int $i Parse starting position.
-     */
-    private function parseString(string $value, int &$i): string|null
-    {
-        return $value[$i] === '"'
-            ? $this->parseQuotedString($value, $i)
-            : $this->parseUnquotedString($value, $i);
-    }
-
     /**
      * Parses quoted string.
      */
diff --git a/tests/ArrayParserTest.php b/tests/ArrayParserTest.php
@@ -30,5 +30,8 @@ public function testParser(): void
             [0 => '[",","null",true,"false","f"]'],
             $arrayParse->parse('{"[\",\",\"null\",true,\"false\",\"f\"]"}')
         );
+
+        // Similar cases can be in default values
+        $this->assertSame(null, $arrayParse->parse("'{one,two}'::text[]"));
     }
 }

Original file line number	Diff line number	Diff line change
`@@ -30,5 +30,8 @@ public function testParser(): void`
`30`	`30`	`[0 => '[",","null",true,"false","f"]'],`
`31`	`31`	`$arrayParse->parse('{"[\",\",\"null\",true,\"false\",\"f\"]"}')`
`32`	`32`	`);`
	`33`	`+`
	`34`	`+ // Similar cases can be in default values`
	`35`	`+ $this->assertSame(null, $arrayParse->parse("'{one,two}'::text[]"));`
`33`	`36`	`}`
`34`	`37`	`}`