@@ -43,15 +43,16 @@ |
||
| 43 | 43 | } |
| 44 | 44 | |
| 45 | 45 | public function addRule($type,$prompt=NULL,$value=NULL){ |
| 46 | - if($type instanceof Rule) |
|
| 47 | - $this->rules[]=$type; |
|
| 48 | - else if(\is_array($type)){ |
|
| 46 | + if($type instanceof Rule) { |
|
| 47 | + $this->rules[]=$type; |
|
| 48 | + } else if(\is_array($type)){ |
|
| 49 | 49 | $value=JArray::getValue($type, "value", 2); |
| 50 | 50 | $prompt=JArray::getValue($type, "prompt", 1); |
| 51 | 51 | $type=JArray::getValue($type, "type", 0); |
| 52 | 52 | $this->rules[]=new Rule($type,$prompt,$value); |
| 53 | - }else |
|
| 54 | - $this->rules[]=new Rule($type,$prompt,$value); |
|
| 53 | + } else { |
|
| 54 | + $this->rules[]=new Rule($type,$prompt,$value); |
|
| 55 | + } |
|
| 55 | 56 | } |
| 56 | 57 | |
| 57 | 58 | public function jsonSerialize(){ |
@@ -55,10 +55,12 @@ discard block |
||
| 55 | 55 | |
| 56 | 56 | public function jsonSerialize() { |
| 57 | 57 | $result= ["type"=>$this->type]; |
| 58 | - if(isset($this->prompt)) |
|
| 59 | - $result["prompt"]=$this->prompt; |
|
| 60 | - if(isset($this->value)) |
|
| 61 | - $result["value"]=$this->value; |
|
| 58 | + if(isset($this->prompt)) { |
|
| 59 | + $result["prompt"]=$this->prompt; |
|
| 60 | + } |
|
| 61 | + if(isset($this->value)) { |
|
| 62 | + $result["value"]=$this->value; |
|
| 63 | + } |
|
| 62 | 64 | return $result; |
| 63 | 65 | } |
| 64 | 66 | |
@@ -90,8 +92,9 @@ discard block |
||
| 90 | 92 | * @return \Ajax\semantic\components\validation\Rule |
| 91 | 93 | */ |
| 92 | 94 | public static function integer($min=NULL,$max=NULL,$prompt=NULL){ |
| 93 | - if(\is_int($min) && \is_int($max)) |
|
| 94 | - return new Rule("integer[{$min}..{$max}]",$prompt); |
|
| 95 | + if(\is_int($min) && \is_int($max)) { |
|
| 96 | + return new Rule("integer[{$min}..{$max}]",$prompt); |
|
| 97 | + } |
|
| 95 | 98 | return new Rule("integer",$prompt); |
| 96 | 99 | } |
| 97 | 100 | |