fix: validateJson should return false when value is null

Xint0-elab · Xint0-elab · commit fbe882df5d5f · 2023-12-22T15:55:34.000-07:00
Return false when $value is null. Avoid TypeError: json_validate(): Argument laravel#1 ($json) must be of type string, null given, when using symfony/polyfill-php83 in PHP < 8.3. Avoid deprecation warning: json_validate(): Passing null to parameter laravel#1 ($json) of type string is deprecated, when using PHP 8.3.
diff --git a/src/Illuminate/Validation/Concerns/ValidatesAttributes.php b/src/Illuminate/Validation/Concerns/ValidatesAttributes.php
@@ -1430,11 +1430,11 @@ public function validateMacAddress($attribute, $value)
      */
     public function validateJson($attribute, $value)
     {
-        if (is_array($value)) {
+        if (is_array($value) || is_null($value)) {
             return false;
         }
 
-        if (! is_scalar($value) && ! is_null($value) && ! method_exists($value, '__toString')) {
+        if (! is_scalar($value) && ! method_exists($value, '__toString')) {
             return false;
         }
 

Original file line number	Diff line number	Diff line change
`@@ -1430,11 +1430,11 @@ public function validateMacAddress($attribute, $value)`
`1430`	`1430`	`*/`
`1431`	`1431`	`public function validateJson($attribute, $value)`
`1432`	`1432`	`{`
`1433`		`- if (is_array($value)) {`
	`1433`	`+ if (is_array($value) \|\| is_null($value)) {`
`1434`	`1434`	`return false;`
`1435`	`1435`	`}`
`1436`	`1436`
`1437`		`- if (! is_scalar($value) && ! is_null($value) && ! method_exists($value, '__toString')) {`
	`1437`	`+ if (! is_scalar($value) && ! method_exists($value, '__toString')) {`
`1438`	`1438`	`return false;`
`1439`	`1439`	`}`
`1440`	`1440`