Merge pull request #7791 from ohader/issue-7771-4x

Avoid json_encode when serializing non-UTF8 literals
vimeo · Mar 16, 2022 · 80f972c · 80f972c
2 parents ebffd52 + 9e4e468
commit 80f972c
Show file tree

Hide file tree

Showing 2 changed files with 11 additions and 2 deletions.
diff --git a/src/Psalm/Internal/Clause.php b/src/Psalm/Internal/Clause.php
@@ -11,10 +11,10 @@
 use function array_values;
 use function count;
 use function implode;
-use function json_encode;
 use function ksort;
 use function md5;
 use function reset;
+use function serialize;
 use function sort;
 use function strpos;
 use function substr;
@@ -110,7 +110,7 @@ public function __construct(
                 sort($possibilities[$i]);
             }
 
-            $this->hash = md5((string) json_encode($possibilities));
+            $this->hash = md5(serialize($possibilities));
         }
     }
 

diff --git a/tests/TypeReconciliation/ConditionalTest.php b/tests/TypeReconciliation/ConditionalTest.php
@@ -2839,6 +2839,15 @@ function b(B $_b): void {
                         echo "false";
                     }',
             ],
+            '#7771: non-UTF8 binary data is passed' => [
+                '<?php
+                    function matches(string $value): bool {
+                        if ("\xD0\xCF\x11\xE0\xA1\xB1\x1A\xE1" !== $value) {
+                            return false;
+                        }
+                        return true;
+                    }'
+            ],
         ];
     }