From 3f25ad7c4fd2840133ce404f3c38dedf34a5dc3f Mon Sep 17 00:00:00 2001 From: Matias Griese Date: Tue, 15 Mar 2016 14:37:22 +0200 Subject: [PATCH] Add collections validation --- composer.lock | 8 ++++---- system/src/Grav/Common/Data/BlueprintSchema.php | 3 ++- 2 files changed, 6 insertions(+), 5 deletions(-) diff --git a/composer.lock b/composer.lock index 161f8d22a..bcf3ef2c9 100644 --- a/composer.lock +++ b/composer.lock @@ -638,12 +638,12 @@ "source": { "type": "git", "url": "https://github.com/rockettheme/toolbox.git", - "reference": "e3468ec2dfb8c832f7d9ae508af445ea3fbaf54b" + "reference": "bb8902cf4ec25ece14d89efc743f3732244e18a8" }, "dist": { "type": "zip", - "url": "https://api.github.com/repos/rockettheme/toolbox/zipball/e3468ec2dfb8c832f7d9ae508af445ea3fbaf54b", - "reference": "e3468ec2dfb8c832f7d9ae508af445ea3fbaf54b", + "url": "https://api.github.com/repos/rockettheme/toolbox/zipball/bb8902cf4ec25ece14d89efc743f3732244e18a8", + "reference": "bb8902cf4ec25ece14d89efc743f3732244e18a8", "shasum": "" }, "require": { @@ -678,7 +678,7 @@ "php", "rockettheme" ], - "time": "2016-03-10 13:16:52" + "time": "2016-03-15 12:06:40" }, { "name": "symfony/console", diff --git a/system/src/Grav/Common/Data/BlueprintSchema.php b/system/src/Grav/Common/Data/BlueprintSchema.php index 5e8efeb1c..8182931bd 100644 --- a/system/src/Grav/Common/Data/BlueprintSchema.php +++ b/system/src/Grav/Common/Data/BlueprintSchema.php @@ -69,7 +69,8 @@ class BlueprintSchema extends BlueprintSchemaBase implements ExportInterface $messages = $this->checkRequired($data, $rules); foreach ($data as $key => $field) { - $val = isset($rules[$key]) ? $rules[$key] : null; + $val = isset($rules[$key]) ? $rules[$key] : (isset($rules['*']) ? $rules['*'] : null); + $rule = is_string($val) ? $this->items[$val] : null; if ($rule) {