fixes input "content" validation

aocneanu · aocneanu · commit c2ba968f40e5 · 2021-03-17T09:35:07.000+02:00
diff --git a/src/Exceptions/Template.php b/src/Exceptions/Template.php
@@ -162,10 +162,10 @@ public static function invalidFieldType($type)
         ));
     }
 
-    public static function missingInputAttribute($field)
+    public static function missingInputContent($field)
     {
         return new static(__(
-            'Mandatory "type" meta parameter is missing for the :field input field',
+            'Mandatory "content" meta parameter is missing for the :field input field',
             ['field' => $field]
         ));
     }
diff --git a/src/Services/Validators/Meta.php b/src/Services/Validators/Meta.php
@@ -38,7 +38,8 @@ private function mandatoryAttributes(): self
 
         if ($diff->isNotEmpty()) {
             throw Template::missingMetaAttributes(
-                $this->field->get('name'), $diff->implode('", "')
+                $this->field->get('name'),
+                $diff->implode('", "')
             );
         }
 
@@ -55,7 +56,8 @@ private function optionalAttributes(): self
 
         if ($diff->isNotEmpty()) {
             throw Template::unknownMetaAttributes(
-                $this->field->get('name'), $diff->implode('", "')
+                $this->field->get('name'),
+                $diff->implode('", "')
             );
         }
 
@@ -65,8 +67,8 @@ private function optionalAttributes(): self
     private function format(): self
     {
         if ($this->meta->get('type') === 'input') {
-            if ($this->inputMetaParameterMissing($this->field)) {
-                throw Template::missingInputAttribute($this->field->geT('name'));
+            if (! $this->meta->has('content')) {
+                throw Template::missingInputContent($this->field->get('name'));
             }
 
             return $this;
@@ -92,11 +94,6 @@ private function type(): void
         }
     }
 
-    private function inputMetaParameterMissing(): bool
-    {
-        return $this->meta === null || ! $this->meta->has('content');
-    }
-
     private function selectMetaParameterMissing(): bool
     {
         return $this->meta === null

Original file line number	Diff line number	Diff line change
`@@ -162,10 +162,10 @@ public static function invalidFieldType($type)`
`162`	`162`	`));`
`163`	`163`	`}`
`164`	`164`
`165`		`- public static function missingInputAttribute($field)`
	`165`	`+ public static function missingInputContent($field)`
`166`	`166`	`{`
`167`	`167`	`return new static(__(`
`168`		`- 'Mandatory "type" meta parameter is missing for the :field input field',`
	`168`	`+ 'Mandatory "content" meta parameter is missing for the :field input field',`
`169`	`169`	`['field' => $field]`
`170`	`170`	`));`
`171`	`171`	`}`
Original file line number	Diff line number	Diff line change
`@@ -38,7 +38,8 @@ private function mandatoryAttributes(): self`
`38`	`38`
`39`	`39`	`if ($diff->isNotEmpty()) {`
`40`	`40`	`throw Template::missingMetaAttributes(`
`41`		`- $this->field->get('name'), $diff->implode('", "')`
	`41`	`+ $this->field->get('name'),`
	`42`	`+ $diff->implode('", "')`
`42`	`43`	`);`
`43`	`44`	`}`
`44`	`45`
`@@ -55,7 +56,8 @@ private function optionalAttributes(): self`
`55`	`56`
`56`	`57`	`if ($diff->isNotEmpty()) {`
`57`	`58`	`throw Template::unknownMetaAttributes(`
`58`		`- $this->field->get('name'), $diff->implode('", "')`
	`59`	`+ $this->field->get('name'),`
	`60`	`+ $diff->implode('", "')`
`59`	`61`	`);`
`60`	`62`	`}`
`61`	`63`
`@@ -65,8 +67,8 @@ private function optionalAttributes(): self`
`65`	`67`	`private function format(): self`
`66`	`68`	`{`
`67`	`69`	`if ($this->meta->get('type') === 'input') {`
`68`		`- if ($this->inputMetaParameterMissing($this->field)) {`
`69`		`- throw Template::missingInputAttribute($this->field->geT('name'));`
	`70`	`+ if (! $this->meta->has('content')) {`
	`71`	`+ throw Template::missingInputContent($this->field->get('name'));`
`70`	`72`	`}`
`71`	`73`
`72`	`74`	`return $this;`
`@@ -92,11 +94,6 @@ private function type(): void`
`92`	`94`	`}`
`93`	`95`	`}`
`94`	`96`
`95`		`- private function inputMetaParameterMissing(): bool`
`96`		`- {`
`97`		`- return $this->meta === null \|\| ! $this->meta->has('content');`
`98`		`- }`
`99`		`-`
`100`	`97`	`private function selectMetaParameterMissing(): bool`
`101`	`98`	`{`
`102`	`99`	`return $this->meta === null`