部分场景 JSON 操作出错抛出异常、不转义“/”和 Unicode (#196)

imiphp · Oct 30, 2021 · bea815f · bea815f
1 parent e3b3332
commit bea815f
Show file tree

Hide file tree

Showing 2 changed files with 3 additions and 3 deletions.
diff --git a/src/Db/Query/Builder/UpdateBuilder.php b/src/Db/Query/Builder/UpdateBuilder.php
@@ -71,7 +71,7 @@ public function build(...$args): string
                     {
                         $jsonSets[$field][] = [
                             'jsonKeywords' => $matches['jsonKeywords'],
-                            'raw'          => 'jsonb(\'' . json_encode($v) . '\'::TEXT)',
+                            'raw'          => 'jsonb(\'' . json_encode($v, \JSON_THROW_ON_ERROR | \JSON_UNESCAPED_SLASHES | \JSON_UNESCAPED_UNICODE) . '\'::TEXT)',
                         ];
                     }
                 }

diff --git a/src/Model/Cli/Model/ModelGenerate.php b/src/Model/Cli/Model/ModelGenerate.php
@@ -55,11 +55,11 @@ public function generate(string $namespace, string $baseClass, ?string $database
             case 'model':
                 break;
             default:
-                $override = (bool) json_decode($override);
+                $override = (bool) json_decode($override, false);
         }
         if (\in_array($config, ['true', 'false'], true))
         {
-            $config = (bool) json_decode($config);
+            $config = (bool) json_decode($config, false);
         }
         if (true === $config)
         {