From fd9816c17787bd9e5df477a506592f44b8a8af8b Mon Sep 17 00:00:00 2001
From: Matias Griese <matias@kunena.org>
Date: Fri, 10 Oct 2014 12:27:41 +0300
Subject: [PATCH] Bluprints: Move validation parameter inside the form

---
 system/blueprints/config/media.yaml       | 2 +-
 system/blueprints/config/site.yaml        | 1 +
 system/blueprints/config/streams.yaml     | 2 +-
 system/blueprints/config/system.yaml      | 1 +
 system/blueprints/pages/modular_new.yaml  | 1 +
 system/blueprints/pages/modular_raw.yaml  | 1 +
 system/blueprints/pages/new.yaml          | 1 +
 system/blueprints/pages/page.yaml         | 1 +
 system/blueprints/pages/raw.yaml          | 1 +
 system/src/Grav/Common/Data/Blueprint.php | 4 ++--
 10 files changed, 11 insertions(+), 4 deletions(-)

diff --git a/system/blueprints/config/media.yaml b/system/blueprints/config/media.yaml
index a97cffc93..2550b912c 100644
--- 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
index 28f352bac..9ec49f43d 100644
--- 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
index e6a199320..a1e95a6c9 100644
--- 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
index bf30fc261..2a3f0119f 100644
--- 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
index d2ac29409..c5e8ee245 100644
--- 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
index fc400d40d..8e008ac60 100644
--- 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
index 29f36b729..8d35ebf42 100644
--- 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
index 7ead3cd9d..81948231b 100644
--- 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
index adfd0bd91..311cf77e3 100644
--- 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
index 3394dbf1c..9059337cd 100644
--- a/system/src/Grav/Common/Data/Blueprint.php
+++ b/system/src/Grav/Common/Data/Blueprint.php
@@ -268,7 +268,7 @@ class Blueprint
             } 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 @@ class Blueprint
             } 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;
             }