Merge branch '5.4' into 6.3

* 5.4:
  Fix bad merge
  CS fix
  [ErrorHandler] Don't format binary strings
  [Validator] Consistently use "This value is not" instead of "This is not" in error messages
  [Messenger] Improve Redis integration tests
  [Validator] added missing Estonian and Romanian translations

Author: xabbuh

ErrorRenderer/HtmlErrorRenderer.php

@@ -171,6 +171,8 @@ private function formatArgs(array $args): string
                 $formattedValue = '<em>'.strtolower(var_export($item[1], true)).'</em>';
             } elseif ('resource' === $item[0]) {
                 $formattedValue = '<em>resource</em>';
+            } elseif (preg_match('/[^\x07-\x0D\x1B\x20-\xFF]/', $item[1])) {
+                $formattedValue = '<em>binary string</em>';
             } else {
                 $formattedValue = str_replace("\n", '', $this->escape(var_export($item[1], true)));
             }

Tests/ErrorRenderer/HtmlErrorRendererTest.php

@@ -54,4 +54,45 @@ public static function getRenderData(): iterable
             $expectedNonDebug,
         ];
     }
+
+    public function testRendersStackWithoutBinaryStrings()
+    {
+        if (\PHP_VERSION_ID >= 70400) {
+            // make sure method arguments are available in stack traces (see https://www.php.net/manual/en/ini.core.php)
+            ini_set('zend.exception_ignore_args', false);
+        }
+
+        $binaryData = file_get_contents(__DIR__.'/../Fixtures/pixel.png');
+        $exception = $this->getRuntimeException($binaryData);
+
+        $rendered = (new HtmlErrorRenderer(true))->render($exception)->getAsString();
+
+        $this->assertStringContainsString(
+            "buildRuntimeException('FooException')",
+            $rendered,
+            '->render() contains the method call with "FooException"'
+        );
+
+        $this->assertStringContainsString(
+            'getRuntimeException(binary string)',
+            $rendered,
+            '->render() contains the method call with "binary string" replacement'
+        );
+
+        $this->assertStringContainsString(
+            '<em>binary string</em>',
+            $rendered,
+            '->render() returns the HTML content with "binary string" replacement'
+        );
+    }
+
+    private function getRuntimeException(string $unusedArgument): \RuntimeException
+    {
+        return $this->buildRuntimeException('FooException');
+    }
+
+    private function buildRuntimeException(string $message): \RuntimeException
+    {
+        return new \RuntimeException($message);
+    }
 }