Bluprints: Move validation parameter inside the form

mcdruid · Oct 10, 2014 · fd9816c · fd9816c
1 parent 5a6e32f
commit fd9816c
Show file tree

Hide file tree

Showing 10 changed files with 11 additions and 4 deletions.
diff --git a/system/blueprints/config/media.yaml b/system/blueprints/config/media.yaml
@@ -1,5 +1,5 @@
 title: Media
-validation: loose
 
 form:
+  validation: loose
   fields:
diff --git a/system/blueprints/config/site.yaml b/system/blueprints/config/site.yaml
@@ -1,5 +1,6 @@
 title: Site
 form:
+    validation: loose
     fields:
 
         content:

diff --git a/system/blueprints/config/streams.yaml b/system/blueprints/config/streams.yaml
@@ -1,7 +1,7 @@
 title: File Streams
-validation: loose
 
 form:
+  validation: loose
   fields:
     schemes.xxx:
       type: array
diff --git a/system/blueprints/config/system.yaml b/system/blueprints/config/system.yaml
@@ -1,6 +1,7 @@
 title: System
 
 form:
+    validation: loose
     fields:
 
         content:

diff --git a/system/blueprints/pages/modular_new.yaml b/system/blueprints/pages/modular_new.yaml
@@ -5,6 +5,7 @@ rules:
     max: 80
 
 form:
+  validation: loose
   fields:
 
     title:

diff --git a/system/blueprints/pages/modular_raw.yaml b/system/blueprints/pages/modular_raw.yaml
@@ -5,6 +5,7 @@ rules:
     max: 80
 
 form:
+  validation: loose
   fields:
 
     tabs:

diff --git a/system/blueprints/pages/new.yaml b/system/blueprints/pages/new.yaml
@@ -5,6 +5,7 @@ rules:
     max: 80
 
 form:
+  validation: loose
   fields:
 
     title:

diff --git a/system/blueprints/pages/page.yaml b/system/blueprints/pages/page.yaml
@@ -5,6 +5,7 @@ rules:
     max: 80
 
 form:
+  validation: loose
   fields:
 
     title:

diff --git a/system/blueprints/pages/raw.yaml b/system/blueprints/pages/raw.yaml
@@ -5,6 +5,7 @@ rules:
     max: 80
 
 form:
+  validation: loose
   fields:
 
     tabs:

diff --git a/system/src/Grav/Common/Data/Blueprint.php b/system/src/Grav/Common/Data/Blueprint.php
@@ -268,7 +268,7 @@ protected function validateArray(array $data, array $rules)
             } elseif (is_array($field) && is_array($val)) {
                 // Array has been defined in blueprints.
                 $this->validateArray($field, $val);
-            } elseif (isset($this->items['validation']) && $this->items['validation'] == 'strict') {
+            } elseif (isset($this->items['form']['validation']) && $this->items['form']['validation'] == 'strict') {
                  // Undefined/extra item.
                  throw new \RuntimeException(sprintf('%s is not defined in blueprints', $key));
             }
@@ -294,7 +294,7 @@ protected function filterArray(array $data, array $rules)
             } elseif (is_array($field) && is_array($val)) {
                 // Array has been defined in blueprints.
                 $field = $this->filterArray($field, $val);
-            } elseif (isset($this->items['validation']) && $this->items['validation'] == 'strict') {
+            } elseif (isset($this->items['form']['validation']) && $this->items['form']['validation'] == 'strict') {
                 $field = null;
             }
-Original file line number
+Diff line change
@@ Expand Up / @@ -5,6 +5,7 @@ rules: @@
         max: 80
     form:
+      validation: loose
       fields:
         title:
@@ Expand Down @@