[Bridge] Pass 'queriedContext' as parameter to 'setInputs'
This makes clear that 'setInputs' depends on the 'queriedContext'
This commit is contained in:
parent
d1ff23c7ba
commit
a8883523f4
1 changed files with 15 additions and 15 deletions
|
@ -243,7 +243,8 @@ abstract class BridgeAbstract implements BridgeInterface {
|
|||
return true;
|
||||
}
|
||||
|
||||
protected function setInputs(array $inputs){
|
||||
protected function setInputs(array $inputs, $queriedContext){
|
||||
// Import and assign all inputs to their context
|
||||
foreach($inputs as $name => $value){
|
||||
foreach(static::PARAMETERS as $context => $set){
|
||||
if(array_key_exists($name, static::PARAMETERS[$context])){
|
||||
|
@ -253,21 +254,19 @@ abstract class BridgeAbstract implements BridgeInterface {
|
|||
}
|
||||
|
||||
// Apply default values to missing data
|
||||
$contexts = array($this->queriedContext);
|
||||
$contexts = array($queriedContext);
|
||||
if(array_key_exists('global', static::PARAMETERS)){
|
||||
$contexts[] = 'global';
|
||||
}
|
||||
|
||||
foreach($contexts as $context){
|
||||
foreach(static::PARAMETERS[$context] as $name => $properties){
|
||||
if(!isset($properties['type'])){
|
||||
$type = 'text';
|
||||
} else {
|
||||
$type = $properties['type'];
|
||||
}
|
||||
if(isset($this->inputs[$context][$name]['value'])){
|
||||
continue;
|
||||
}
|
||||
|
||||
$type = isset($properties['type']) ? $properties['type'] : 'text';
|
||||
|
||||
switch($type){
|
||||
case 'checkbox':
|
||||
if(!isset($properties['defaultValue'])){
|
||||
|
@ -306,15 +305,16 @@ abstract class BridgeAbstract implements BridgeInterface {
|
|||
} else {
|
||||
continue;
|
||||
}
|
||||
$this->inputs[$this->queriedContext][$name]['value'] = $value;
|
||||
$this->inputs[$queriedContext][$name]['value'] = $value;
|
||||
}
|
||||
}
|
||||
|
||||
// Only keep guessed context parameters values
|
||||
if(!isset($this->inputs[$this->queriedContext])){
|
||||
$this->inputs[$this->queriedContext] = array();
|
||||
if(isset($this->inputs[$queriedContext])){
|
||||
$this->inputs = array($queriedContext => $this->inputs[$queriedContext]);
|
||||
} else {
|
||||
$this->inputs = array();
|
||||
}
|
||||
$this->inputs = array($this->queriedContext=>$this->inputs[$this->queriedContext]);
|
||||
}
|
||||
|
||||
protected function getQueriedContext(array $inputs){
|
||||
|
@ -390,7 +390,7 @@ abstract class BridgeAbstract implements BridgeInterface {
|
|||
$this->returnClientError('Mixed context parameters');
|
||||
}
|
||||
|
||||
$this->setInputs($inputs);
|
||||
$this->setInputs($inputs, $this->queriedContext);
|
||||
|
||||
$this->collectData();
|
||||
|
||||
|
|
Loading…
Reference in a new issue