fix(#351): remove invalid or non-PostgreSQL-compliant test cases; ensure edge cases for backslashes, quotes, special characters, and NULL handling are covered (#385)

Author: martin-georgiev

src/MartinGeorgiev/Utils/PostgresArrayToPHPArrayTransformer.php

@@ -218,44 +218,32 @@ private static function unescapeString(string $value): string
         $result = '';
         $len = \strlen($value);
         $i = 0;
-        $backslashCount = 0;
-
         while ($i < $len) {
             if ($value[$i] === '\\') {
-                $backslashCount++;
-                $i++;
-
-                continue;
-            }
+                $start = $i;
+                while ($i < $len && $value[$i] === '\\') {
+                    $i++;
+                }
 
-            if ($backslashCount > 0) {
-                if ($value[$i] === '"') {
-                    // This is an escaped quote
-                    $result .= \str_repeat('\\', (int) ($backslashCount / 2));
-                    if ($backslashCount % 2 === 1) {
-                        $result .= '"';
-                    } else {
-                        $result .= '\"';
+                $slashCount = $i - $start;
+                $nextChar = $i < $len ? $value[$i] : '';
+                if ($nextChar === '"' || $nextChar === '\\') {
+                    $result .= \str_repeat('\\', \intdiv($slashCount, 2));
+                    if ($slashCount % 2 === 1) {
+                        $result .= $nextChar;
+                        $i++;
                     }
                 } else {
-                    // These are literal backslashes
-                    $result .= \str_repeat('\\', $backslashCount);
-                    $result .= $value[$i];
+                    $result .= \str_repeat('\\', $slashCount);
                 }
 
-                $backslashCount = 0;
-            } else {
-                $result .= $value[$i];
+                continue;
             }
 
+            $result .= $value[$i];
             $i++;
         }
 
-        // Handle any trailing backslashes
-        if ($backslashCount > 0) {
-            $result .= \str_repeat('\\', $backslashCount);
-        }
-
         return $result;
     }
 }

tests/Unit/MartinGeorgiev/Utils/PostgresArrayToPHPArrayTransformerTest.php

@@ -142,6 +142,26 @@ public static function provideValidTransformations(): array
                 'phpValue' => ['', ''],
                 'postgresValue' => '{"",""}',
             ],
+            'github #351 regression: string with special characters and backslash' => [
+                'phpValue' => ["!@#\\$%^&*()_+=-}{[]|\":;'\\?><,./"],
+                'postgresValue' => '{"!@#\$%^&*()_+=-}{[]|\":;\'\?><,./"}',
+            ],
+            'backslash before backslash' => [
+                'phpValue' => ['a\b'],
+                'postgresValue' => '{"a\\\b"}', // a\\b
+            ],
+            'single backslash before non-escape char' => [
+                'phpValue' => ['a\$b'],
+                'postgresValue' => '{"a\$b"}', // a\$b
+            ],
+            'element with curly braces and comma' => [
+                'phpValue' => ['{foo,bar}'],
+                'postgresValue' => '{"{foo,bar}"}',
+            ],
+            'element with whitespace' => [
+                'phpValue' => ['  foo  '],
+                'postgresValue' => '{"  foo  "}',
+            ],
         ];
     }
 
@@ -198,7 +218,7 @@ public static function provideManualParsingArrays(): array
     public function can_transform_escaped_quotes_with_backslashes(): void
     {
         $postgresArray = '{"\\\"quoted\\\""}';
-        self::assertSame(['\\\"quoted\\\"'], PostgresArrayToPHPArrayTransformer::transformPostgresArrayToPHPArray($postgresArray));
+        self::assertSame(['\"quoted\"'], PostgresArrayToPHPArrayTransformer::transformPostgresArrayToPHPArray($postgresArray));
     }
 
     #[Test]