Merge branch 'fix-ppd-validation'

kduma · kduma · commit d51b7393af2b · 2022-12-27T05:35:34.000+01:00
# Conflicts:
#	app/Rules/ValidPpdJson.php
diff --git a/app/Rules/ValidPpdJson.php b/app/Rules/ValidPpdJson.php
@@ -81,8 +81,9 @@ public function __invoke($attribute, $value, $fail)
             }
 
             foreach ($option['values'] as $value_key => $o) {
-                $fail('validation.json_ppd')->translate(['opt' => 'VALUE_KEY']);
                 if (! is_string($value_key) && ! is_int($value_key)) {
+                    $fail('validation.json_ppd')->translate(['opt' => 'VALUE_KEY - '.$value_key]);
+
                     return;
                 }
 

Original file line number	Diff line number	Diff line change
`@@ -81,8 +81,9 @@ public function __invoke($attribute, $value, $fail)`
`81`	`81`	`}`
`82`	`82`
`83`	`83`	`foreach ($option['values'] as $value_key => $o) {`
`84`		`- $fail('validation.json_ppd')->translate(['opt' => 'VALUE_KEY']);`
`85`	`84`	`if (! is_string($value_key) && ! is_int($value_key)) {`
	`85`	`+ $fail('validation.json_ppd')->translate(['opt' => 'VALUE_KEY - '.$value_key]);`
	`86`	`+`
`86`	`87`	`return;`
`87`	`88`	`}`
`88`	`89`