[Bridge] Move code into functions
This commit is contained in:
parent
cd9435b936
commit
7c36b51aa2
1 changed files with 90 additions and 60 deletions
150
lib/Bridge.php
150
lib/Bridge.php
|
@ -143,68 +143,98 @@ abstract class BridgeAbstract implements BridgeInterface {
|
|||
return $this->items;
|
||||
}
|
||||
|
||||
protected function validateData(&$data){
|
||||
$validated=true;
|
||||
foreach($data as $name=>$value){
|
||||
$registered=false;
|
||||
foreach($this->parameters as $context=>$set){
|
||||
if(array_key_exists($name,$set)){
|
||||
$registered=true;
|
||||
if(!isset($set[$name]['type'])){
|
||||
$set[$name]['type']='text';
|
||||
}
|
||||
switch($set[$name]['type']){
|
||||
case 'number':
|
||||
$data[$name]=filter_var($value,FILTER_VALIDATE_INT);
|
||||
if($data[$name]===false && !empty($value)){
|
||||
$validated=false;
|
||||
}
|
||||
break;
|
||||
case 'checkbox':
|
||||
$data[$name]=filter_var($value,FILTER_VALIDATE_BOOLEAN,
|
||||
FILTER_NULL_ON_FAILURE);
|
||||
if(is_null($data[$name])){
|
||||
$validated=false;
|
||||
}
|
||||
break;
|
||||
case 'list':
|
||||
$data[$name]=filter_var($value);
|
||||
if(!in_array($value,$set[$name]['values'])){
|
||||
foreach($set[$name]['values'] as $subName=>$subValue){
|
||||
if(is_array($subValue) &&
|
||||
in_array($value,$subValue)){
|
||||
$data[$name]=filter_var($value);
|
||||
break 2;
|
||||
}
|
||||
}
|
||||
$validated=false;
|
||||
$data[$name]=null;
|
||||
}
|
||||
break;
|
||||
default:
|
||||
case 'text':
|
||||
if(isset($set[$name]['pattern'])){
|
||||
$data[$name]=filter_var($value,FILTER_VALIDATE_REGEXP,
|
||||
array('options'=>array(
|
||||
'regexp'=>'/^'.$set[$name]['pattern'].'$/'
|
||||
))
|
||||
);
|
||||
}else{
|
||||
$data[$name]=filter_var($value);
|
||||
}
|
||||
if($data[$name]===false && !empty($value)){
|
||||
$validated=false;
|
||||
}
|
||||
break;
|
||||
}
|
||||
}
|
||||
}
|
||||
if(!$registered){
|
||||
$validated=false;
|
||||
}
|
||||
protected function isValidTextValue($value, $pattern){
|
||||
if(isset($pattern)){
|
||||
$filteredValue = filter_var($value, FILTER_VALIDATE_REGEXP,
|
||||
array('options' => array(
|
||||
'regexp' => '/^' . $pattern . '$/'
|
||||
))
|
||||
);
|
||||
} else {
|
||||
$filteredValue = filter_var($value);
|
||||
}
|
||||
|
||||
return $validated;
|
||||
if($filteredValue === false)
|
||||
return null;
|
||||
|
||||
return $filteredValue;
|
||||
}
|
||||
|
||||
protected function isValidNumberValue($value){
|
||||
$filteredValue = filter_var($value, FILTER_VALIDATE_INT);
|
||||
|
||||
if($filteredValue === false && !empty($value))
|
||||
return null;
|
||||
|
||||
return $filteredValue;
|
||||
}
|
||||
|
||||
protected function isValidCheckboxValue($value){
|
||||
$filteredValue = filter_var($value, FILTER_VALIDATE_BOOLEAN, FILTER_NULL_ON_FAILURE);
|
||||
|
||||
if(is_null($filteredValue))
|
||||
return null;
|
||||
|
||||
return $filteredValue;
|
||||
}
|
||||
|
||||
protected function isValidListValue($value, $expectedValues){
|
||||
$filteredValue = filter_var($value);
|
||||
|
||||
if($filteredValue === false)
|
||||
return null;
|
||||
|
||||
if(!in_array($filteredValue, $expectedValues)){ // Check sub-values?
|
||||
foreach($expectedValues as $subName => $subValue){
|
||||
if(is_array($subValue) && in_array($filteredValue, $subValue))
|
||||
return $filteredValue;
|
||||
}
|
||||
return null;
|
||||
}
|
||||
|
||||
return $filteredValue;
|
||||
}
|
||||
|
||||
protected function validateData(&$data){
|
||||
if(!is_array($data))
|
||||
return false;
|
||||
|
||||
foreach($data as $name => $value){
|
||||
$registered = false;
|
||||
foreach($this->parameters as $context => $set){
|
||||
if(array_key_exists($name, $set)){
|
||||
$registered = true;
|
||||
|
||||
if(!isset($set[$name]['type'])){ // Default to 'text'
|
||||
$set[$name]['type'] = 'text';
|
||||
}
|
||||
|
||||
switch($set[$name]['type']){
|
||||
case 'number':
|
||||
$data[$name] = $this->isValidNumberValue($value);
|
||||
break;
|
||||
case 'checkbox':
|
||||
$data[$name] = $this->isValidCheckboxValue($value);
|
||||
break;
|
||||
case 'list':
|
||||
$data[$name] = $this->isValidListValue($value, $set[$name]['values']);
|
||||
break;
|
||||
default:
|
||||
case 'text':
|
||||
$data[$name] = $this->isValidTextValue($value, $set[$name]['pattern']);
|
||||
break;
|
||||
}
|
||||
|
||||
if(is_null($data[$name]))
|
||||
return false;
|
||||
}
|
||||
}
|
||||
|
||||
if(!$registered)
|
||||
return false;
|
||||
}
|
||||
|
||||
return true;
|
||||
}
|
||||
|
||||
protected function getQueriedContext(){
|
||||
|
|
Loading…
Reference in a new issue