From 4c78721f03e0cc7f6901a758e55f4b13025a8baa Mon Sep 17 00:00:00 2001
From: Roliga <roliga.here@gmail.com>
Date: Mon, 28 Oct 2019 17:50:55 +0100
Subject: [PATCH] [ParameterValidator] Ensure context has all user provided
 parameters (#1211)

* [ParameterValidator] Ensure context has all fields

Previously if a bridge had a set of parameters like:

const PARAMETERS = array(
    'ContextA' => array(
        'Param1' => array(
            'name' => 'Param1',
            'required' => true
        )
    ),
    'ContextB' => array(
        'Param1' => array(
            'name' => 'Param1',
            'required' => true
        ),
        'Param2' => array(
            'name' => 'Param2',
            'required' => true
        )
    )
)

and a query specifying both Param1 and Param2 was provided a 'Mixed
context parameters' error would be returned. This change ensures
ContextA in the above example would not be considered a relevant context.
---
 lib/ParameterValidator.php | 7 +++++++
 1 file changed, 7 insertions(+)

diff --git a/lib/ParameterValidator.php b/lib/ParameterValidator.php
index f740888a..149e8a40 100644
--- a/lib/ParameterValidator.php
+++ b/lib/ParameterValidator.php
@@ -191,6 +191,13 @@ class ParameterValidator {
 		foreach($parameters as $context => $set) {
 			$queriedContexts[$context] = null;
 
+			// Ensure all user data exist in the current context
+			$notInContext = array_diff_key($data, $set);
+			if(array_key_exists('global', $parameters))
+				$notInContext = array_diff_key($notInContext, $parameters['global']);
+			if(sizeof($notInContext) > 0)
+				continue;
+
 			// Check if all parameters of the context are satisfied
 			foreach($set as $id => $properties) {
 				if(isset($data[$id]) && !empty($data[$id])) {