Merge pull request #58 from ray-di/fix-57

Reorder conversion methods in ParamConverter and binary check for logging

composer.json

@@ -11,6 +11,7 @@
     "require": {
         "php": "^8.1",
         "ext-pdo": "*",
+        "ext-mbstring": "*",
         "aura/sql": "^4.0 || ^5.0",
         "doctrine/annotations": "^1.12 || ^2.0",
         "guzzlehttp/guzzle": "^6.3 || ^7.2",

src/MediaQueryLogger.php

@@ -6,8 +6,11 @@
 
 use Stringable;
 
+use function base64_encode;
 use function implode;
+use function is_string;
 use function json_encode;
+use function mb_check_encoding;
 use function sprintf;
 
 use const JSON_THROW_ON_ERROR;
@@ -27,6 +30,15 @@ public function start(): void
      */
     public function log(string $queryId, array $values): void
     {
+        /** @psalm-suppress MixedAssignment */
+        foreach ($values as &$value) {
+            if (! is_string($value) || mb_check_encoding($value, 'UTF-8')) {
+                continue;
+            }
+
+            $value = base64_encode($value); // Encode non-UTF-8 strings in base64 to handle binary data.
+        }
+
         $this->logs[] = sprintf('query: %s(%s)', $queryId, json_encode($values, JSON_THROW_ON_ERROR));
     }
 

src/ParamConverter.php

@@ -35,13 +35,13 @@ public function __invoke(array &$values): void
                 continue;
             }
 
-            if (method_exists($value, '__toString')) {
-                $value = (string) $value;
+            if ($value instanceof ToScalarInterface) {
+                $value = $value->toScalar();
                 continue;
             }
 
-            if ($value instanceof ToScalarInterface) {
-                $value = $value->toScalar();
+            if (method_exists($value, '__toString')) {
+                $value = (string) $value;
                 continue;
             }