@@ -15,8 +15,9 @@ discard block |
||
15 | 15 | |
16 | 16 | public function __construct($identifier, $elements=array(), $asIcons=false) { |
17 | 17 | parent::__construct($identifier, "div", "ui buttons"); |
18 | - if ($asIcons === true) |
|
19 | - $this->asIcons(); |
|
18 | + if ($asIcons === true) { |
|
19 | + $this->asIcons(); |
|
20 | + } |
|
20 | 21 | $this->addElements($elements, $asIcons); |
21 | 22 | } |
22 | 23 | protected function createItem($value){ |
@@ -26,8 +27,9 @@ discard block |
||
26 | 27 | |
27 | 28 | public function addElement($element, $asIcon=false) { |
28 | 29 | $item=$this->addItem($element); |
29 | - if($asIcon) |
|
30 | - $item->asIcon($element); |
|
30 | + if($asIcon) { |
|
31 | + $item->asIcon($element); |
|
32 | + } |
|
31 | 33 | return $item; |
32 | 34 | } |
33 | 35 | |
@@ -55,8 +57,9 @@ discard block |
||
55 | 57 | |
56 | 58 | public function asIcons() { |
57 | 59 | foreach ( $this->content as $item ) { |
58 | - if($item instanceof HtmlButton) |
|
59 | - $item->asIcon($item->getContent()); |
|
60 | + if($item instanceof HtmlButton) { |
|
61 | + $item->asIcon($item->getContent()); |
|
62 | + } |
|
60 | 63 | } |
61 | 64 | return $this->addToProperty("class", "icons"); |
62 | 65 | } |
@@ -13,6 +13,9 @@ |
||
13 | 13 | */ |
14 | 14 | class HtmlButtonGroups extends HtmlSemCollection { |
15 | 15 | |
16 | + /** |
|
17 | + * @param string $identifier |
|
18 | + */ |
|
16 | 19 | public function __construct($identifier, $elements=array(), $asIcons=false) { |
17 | 20 | parent::__construct($identifier, "div", "ui buttons"); |
18 | 21 | if ($asIcons === true) |
@@ -17,18 +17,18 @@ discard block |
||
17 | 17 | |
18 | 18 | public function __construct($identifier, $elements=array(), $asIcons=false) { |
19 | 19 | parent::__construct($identifier, "div", "ui buttons"); |
20 | - if ($asIcons === true) |
|
20 | + if ($asIcons===true) |
|
21 | 21 | $this->asIcons(); |
22 | 22 | $this->addElements($elements, $asIcons); |
23 | 23 | } |
24 | - protected function createItem($value){ |
|
24 | + protected function createItem($value) { |
|
25 | 25 | return new HtmlButton("", $value); |
26 | 26 | } |
27 | 27 | |
28 | - public function addDropdown($items,$asCombo=false){ |
|
29 | - $dd= new HtmlDropdown("dd-".$this->identifier,null,$items); |
|
28 | + public function addDropdown($items, $asCombo=false) { |
|
29 | + $dd=new HtmlDropdown("dd-".$this->identifier, null, $items); |
|
30 | 30 | $dd->asButton(); |
31 | - if($asCombo){ |
|
31 | + if ($asCombo) { |
|
32 | 32 | $dd->setAction("combo"); |
33 | 33 | $dd->addToProperty("class", "combo"); |
34 | 34 | } |
@@ -38,13 +38,13 @@ discard block |
||
38 | 38 | |
39 | 39 | public function addElement($element, $asIcon=false) { |
40 | 40 | $item=$this->addItem($element); |
41 | - if($asIcon) |
|
41 | + if ($asIcon) |
|
42 | 42 | $item->asIcon($element); |
43 | 43 | return $item; |
44 | 44 | } |
45 | 45 | |
46 | 46 | public function addElements($elements, $asIcons=false) { |
47 | - foreach ( $elements as $element ) { |
|
47 | + foreach ($elements as $element) { |
|
48 | 48 | $this->addElement($element, $asIcons); |
49 | 49 | } |
50 | 50 | return $this; |
@@ -53,7 +53,7 @@ discard block |
||
53 | 53 | public function insertOr($aferIndex=0, $or="or") { |
54 | 54 | $orElement=new HtmlSemDoubleElement("", "div", "or"); |
55 | 55 | $orElement->setProperty("data-text", $or); |
56 | - array_splice($this->content, $aferIndex + 1, 0, array ($orElement )); |
|
56 | + array_splice($this->content, $aferIndex+1, 0, array($orElement)); |
|
57 | 57 | return $this; |
58 | 58 | } |
59 | 59 | |
@@ -66,8 +66,8 @@ discard block |
||
66 | 66 | } |
67 | 67 | |
68 | 68 | public function asIcons() { |
69 | - foreach ( $this->content as $item ) { |
|
70 | - if($item instanceof HtmlButton) |
|
69 | + foreach ($this->content as $item) { |
|
70 | + if ($item instanceof HtmlButton) |
|
71 | 71 | $item->asIcon($item->getContent()); |
72 | 72 | } |
73 | 73 | return $this->addToProperty("class", "icons"); |
@@ -100,7 +100,7 @@ discard block |
||
100 | 100 | * @see \Ajax\bootstrap\html\base\BaseHtml::on() |
101 | 101 | */ |
102 | 102 | public function on($event, $jsCode, $stopPropagation=false, $preventDefault=false) { |
103 | - foreach ( $this->content as $element ) { |
|
103 | + foreach ($this->content as $element) { |
|
104 | 104 | $element->on($event, $jsCode, $stopPropagation, $preventDefault); |
105 | 105 | } |
106 | 106 | return $this; |
@@ -112,10 +112,10 @@ discard block |
||
112 | 112 | |
113 | 113 | public function addClasses($classes=array()) { |
114 | 114 | $i=0; |
115 | - if(!\is_array($classes)){ |
|
116 | - $classes=array_fill (0,$this->count(),$classes); |
|
115 | + if (!\is_array($classes)) { |
|
116 | + $classes=array_fill(0, $this->count(), $classes); |
|
117 | 117 | } |
118 | - foreach ( $this->content as $button ) { |
|
118 | + foreach ($this->content as $button) { |
|
119 | 119 | $button->addToProperty("class", $classes[$i++]); |
120 | 120 | } |
121 | 121 | return $this; |
@@ -129,8 +129,8 @@ discard block |
||
129 | 129 | $this->addElement($function($object)); |
130 | 130 | } |
131 | 131 | |
132 | - public function run(JsUtils $js){ |
|
133 | - $result= parent::run($js); |
|
132 | + public function run(JsUtils $js) { |
|
133 | + $result=parent::run($js); |
|
134 | 134 | return $result->setItemSelector(".ui.button"); |
135 | 135 | } |
136 | 136 | } |
137 | 137 | \ No newline at end of file |
@@ -22,7 +22,7 @@ discard block |
||
22 | 22 | * @return \Ajax\semantic\html\elements\HtmlDivider |
23 | 23 | */ |
24 | 24 | public function setVertical() { |
25 | - return $this->addToPropertyCtrl("class", "vertical", array ("vertical","horizontal" )); |
|
25 | + return $this->addToPropertyCtrl("class", "vertical", array("vertical", "horizontal")); |
|
26 | 26 | } |
27 | 27 | |
28 | 28 | /** |
@@ -30,7 +30,7 @@ discard block |
||
30 | 30 | * @return \Ajax\semantic\html\elements\HtmlDivider |
31 | 31 | */ |
32 | 32 | public function setHorizontal() { |
33 | - return $this->addToPropertyCtrl("class", "horizontal", array ("vertical","horizontal" )); |
|
33 | + return $this->addToPropertyCtrl("class", "horizontal", array("vertical", "horizontal")); |
|
34 | 34 | } |
35 | 35 | |
36 | 36 | /** |
@@ -65,7 +65,7 @@ discard block |
||
65 | 65 | return $this->addToProperty("class", "inverted"); |
66 | 66 | } |
67 | 67 | |
68 | - public function setIgnored(){ |
|
68 | + public function setIgnored() { |
|
69 | 69 | return $this->addToProperty("class", "ignored"); |
70 | 70 | } |
71 | 71 | } |
72 | 72 | \ No newline at end of file |
@@ -5,13 +5,13 @@ |
||
5 | 5 | |
6 | 6 | class HtmlShapeItem extends HtmlSemDoubleElement { |
7 | 7 | public function __construct($identifier, $content) { |
8 | - parent::__construct($identifier,"div","side",$content); |
|
8 | + parent::__construct($identifier, "div", "side", $content); |
|
9 | 9 | } |
10 | 10 | |
11 | - public function setActive($value=true){ |
|
12 | - if($value){ |
|
11 | + public function setActive($value=true) { |
|
12 | + if ($value) { |
|
13 | 13 | $this->addToPropertyCtrl("class", "active", ["active"]); |
14 | - }else{ |
|
14 | + } else { |
|
15 | 15 | $this->removePropertyValue("class", "active"); |
16 | 16 | } |
17 | 17 | return $this; |
@@ -4,6 +4,10 @@ |
||
4 | 4 | use Ajax\semantic\html\base\HtmlSemDoubleElement; |
5 | 5 | |
6 | 6 | class HtmlShapeItem extends HtmlSemDoubleElement { |
7 | + |
|
8 | + /** |
|
9 | + * @param string $identifier |
|
10 | + */ |
|
7 | 11 | public function __construct($identifier, $content) { |
8 | 12 | parent::__construct($identifier,"div","side",$content); |
9 | 13 | } |
@@ -11,7 +11,7 @@ |
||
11 | 11 | public function setActive($value=true){ |
12 | 12 | if($value){ |
13 | 13 | $this->addToPropertyCtrl("class", "active", ["active"]); |
14 | - }else{ |
|
14 | + } else{ |
|
15 | 15 | $this->removePropertyValue("class", "active"); |
16 | 16 | } |
17 | 17 | return $this; |
@@ -18,7 +18,7 @@ discard block |
||
18 | 18 | * @param int $colCount |
19 | 19 | * @return HtmlTable |
20 | 20 | */ |
21 | - public function htmlTable($identifier, $rowCount, $colCount){ |
|
21 | + public function htmlTable($identifier, $rowCount, $colCount) { |
|
22 | 22 | return $this->addHtmlComponent(new HtmlTable($identifier, $rowCount, $colCount)); |
23 | 23 | } |
24 | 24 | |
@@ -29,9 +29,9 @@ discard block |
||
29 | 29 | * @param $styles string|array|NULL |
30 | 30 | * @return HtmlMessage |
31 | 31 | */ |
32 | - public function htmlMessage($identifier, $content="",$styles=NULL) { |
|
33 | - $msg= $this->addHtmlComponent(new HtmlMessage($identifier, $content)); |
|
34 | - if(isset($msg)) |
|
32 | + public function htmlMessage($identifier, $content="", $styles=NULL) { |
|
33 | + $msg=$this->addHtmlComponent(new HtmlMessage($identifier, $content)); |
|
34 | + if (isset($msg)) |
|
35 | 35 | $msg->setStyle($styles); |
36 | 36 | return $msg; |
37 | 37 | } |
@@ -31,8 +31,9 @@ |
||
31 | 31 | */ |
32 | 32 | public function htmlMessage($identifier, $content="",$styles=NULL) { |
33 | 33 | $msg= $this->addHtmlComponent(new HtmlMessage($identifier, $content)); |
34 | - if(isset($msg)) |
|
35 | - $msg->setStyle($styles); |
|
34 | + if(isset($msg)) { |
|
35 | + $msg->setStyle($styles); |
|
36 | + } |
|
36 | 37 | return $msg; |
37 | 38 | } |
38 | 39 |
@@ -127,8 +127,8 @@ discard block |
||
127 | 127 | * @param string|array $params |
128 | 128 | * @return Modal |
129 | 129 | */ |
130 | - public function modal($attachTo=NULL, $params=NULL,$paramsParts=NULL) { |
|
131 | - $result= $this->addComponent(new Modal($this->js), $attachTo, $params); |
|
130 | + public function modal($attachTo=NULL, $params=NULL, $paramsParts=NULL) { |
|
131 | + $result=$this->addComponent(new Modal($this->js), $attachTo, $params); |
|
132 | 132 | $result->setParamParts($paramsParts); |
133 | 133 | return $result; |
134 | 134 | } |
@@ -139,7 +139,7 @@ discard block |
||
139 | 139 | * @return Tab |
140 | 140 | */ |
141 | 141 | public function tab($attachTo=NULL, $params=NULL) { |
142 | - $result= $this->addComponent(new Tab($this->js), $attachTo, $params); |
|
142 | + $result=$this->addComponent(new Tab($this->js), $attachTo, $params); |
|
143 | 143 | return $result; |
144 | 144 | } |
145 | 145 | |
@@ -149,7 +149,7 @@ discard block |
||
149 | 149 | * @return Shape |
150 | 150 | */ |
151 | 151 | public function shape($attachTo=NULL, $params=NULL) { |
152 | - $result= $this->addComponent(new Shape($this->js), $attachTo, $params); |
|
152 | + $result=$this->addComponent(new Shape($this->js), $attachTo, $params); |
|
153 | 153 | return $result; |
154 | 154 | } |
155 | 155 | |
@@ -159,7 +159,7 @@ discard block |
||
159 | 159 | * @return Form |
160 | 160 | */ |
161 | 161 | public function form($attachTo=NULL, $params=NULL) { |
162 | - $result= $this->addComponent(new Form($this->js), $attachTo, $params); |
|
162 | + $result=$this->addComponent(new Form($this->js), $attachTo, $params); |
|
163 | 163 | return $result; |
164 | 164 | } |
165 | 165 |
@@ -20,15 +20,15 @@ discard block |
||
20 | 20 | $this->params["fields"]=[]; |
21 | 21 | } |
22 | 22 | |
23 | - public function addField($identifier){ |
|
23 | + public function addField($identifier) { |
|
24 | 24 | $this->params["fields"][$identifier]=new FieldValidation($identifier); |
25 | 25 | } |
26 | 26 | |
27 | - public function setInline($value){ |
|
27 | + public function setInline($value) { |
|
28 | 28 | return $this->setParam("inline", true); |
29 | 29 | } |
30 | 30 | |
31 | - public function setOn($value){ |
|
31 | + public function setOn($value) { |
|
32 | 32 | return $this->setParam("on", $value); |
33 | 33 | } |
34 | 34 | |
@@ -40,33 +40,33 @@ discard block |
||
40 | 40 | * @param mixed $value |
41 | 41 | * @param string|NULL $prompt |
42 | 42 | */ |
43 | - public function addFieldRule($identifier,$type,$prompt=NULL,$value=NULL){ |
|
44 | - if(isset($this->params["fields"][$identifier])===false){ |
|
43 | + public function addFieldRule($identifier, $type, $prompt=NULL, $value=NULL) { |
|
44 | + if (isset($this->params["fields"][$identifier])===false) { |
|
45 | 45 | $this->addField($identifier); |
46 | 46 | } |
47 | - $this->params["fields"][$identifier]->addRule($type,$prompt,$value); |
|
47 | + $this->params["fields"][$identifier]->addRule($type, $prompt, $value); |
|
48 | 48 | } |
49 | 49 | |
50 | 50 | /** |
51 | 51 | * @param FieldValidation $fieldValidation |
52 | 52 | */ |
53 | - public function addFieldValidation($fieldValidation){ |
|
53 | + public function addFieldValidation($fieldValidation) { |
|
54 | 54 | $this->params["fields"][$fieldValidation->getIdentifier()]=$fieldValidation; |
55 | 55 | } |
56 | 56 | |
57 | - public function setJs(JsUtils $js){ |
|
57 | + public function setJs(JsUtils $js) { |
|
58 | 58 | $this->js=$js; |
59 | 59 | } |
60 | 60 | |
61 | 61 | public function getScript() { |
62 | 62 | $allParams=$this->params; |
63 | - $this->jquery_code_for_compile=array (); |
|
63 | + $this->jquery_code_for_compile=array(); |
|
64 | 64 | $this->jquery_code_for_compile []="$( \"".$this->attachTo."\" ).{$this->uiName}(".$this->getParamsAsJSON($allParams).");"; |
65 | 65 | $this->compileEvents(); |
66 | 66 | return $this->compileJQueryCode(); |
67 | 67 | } |
68 | 68 | |
69 | - public function onValid($jsCode){ |
|
69 | + public function onValid($jsCode) { |
|
70 | 70 | $this->addComponentEvent("onValid", $jsCode); |
71 | 71 | } |
72 | 72 | } |
73 | 73 | \ No newline at end of file |
@@ -20,6 +20,9 @@ |
||
20 | 20 | $this->params["fields"]=[]; |
21 | 21 | } |
22 | 22 | |
23 | + /** |
|
24 | + * @param string $identifier |
|
25 | + */ |
|
23 | 26 | public function addField($identifier){ |
24 | 27 | $this->params["fields"][$identifier]=new FieldValidation($identifier); |
25 | 28 | } |
@@ -12,9 +12,9 @@ discard block |
||
12 | 12 | $this->paramParts=array(); |
13 | 13 | } |
14 | 14 | |
15 | - protected function generateParamParts(){ |
|
15 | + protected function generateParamParts() { |
|
16 | 16 | $results=[]; |
17 | - foreach ($this->paramParts as $paramPart){ |
|
17 | + foreach ($this->paramParts as $paramPart) { |
|
18 | 18 | $results[]="{$this->uiName}(".\implode(",", $paramPart).")"; |
19 | 19 | } |
20 | 20 | return \implode(".", $results); |
@@ -22,9 +22,9 @@ discard block |
||
22 | 22 | |
23 | 23 | public function getScript() { |
24 | 24 | $allParams=$this->params; |
25 | - $this->jquery_code_for_compile=array (); |
|
25 | + $this->jquery_code_for_compile=array(); |
|
26 | 26 | $paramParts=""; |
27 | - if(\sizeof($this->paramParts)>0){ |
|
27 | + if (\sizeof($this->paramParts)>0) { |
|
28 | 28 | $paramParts=".".$this->generateParamParts(); |
29 | 29 | } |
30 | 30 | $this->jquery_code_for_compile []="$( \"".$this->attachTo."\" ).{$this->uiName}(".$this->getParamsAsJSON($allParams).")".$paramParts.";"; |
@@ -37,8 +37,8 @@ discard block |
||
37 | 37 | return $this; |
38 | 38 | } |
39 | 39 | |
40 | - public function addComponentEvent($event,$jsCode){ |
|
41 | - $jsCode=str_ireplace("\"","%quote%", $jsCode); |
|
40 | + public function addComponentEvent($event, $jsCode) { |
|
41 | + $jsCode=str_ireplace("\"", "%quote%", $jsCode); |
|
42 | 42 | return $this->setParam($event, "%function(){".$jsCode."}%"); |
43 | 43 | } |
44 | 44 |
@@ -7,7 +7,7 @@ discard block |
||
7 | 7 | * @version 1.001 |
8 | 8 | * Generates a JSON field validator |
9 | 9 | */ |
10 | -class FieldValidation implements \JsonSerializable{ |
|
10 | +class FieldValidation implements \JsonSerializable { |
|
11 | 11 | /** |
12 | 12 | * @var string |
13 | 13 | */ |
@@ -24,7 +24,7 @@ discard block |
||
24 | 24 | |
25 | 25 | protected $optional; |
26 | 26 | |
27 | - public function __construct($identifier){ |
|
27 | + public function __construct($identifier) { |
|
28 | 28 | $this->identifier=$identifier; |
29 | 29 | $this->rules=[]; |
30 | 30 | } |
@@ -42,20 +42,20 @@ discard block |
||
42 | 42 | return $this->rules; |
43 | 43 | } |
44 | 44 | |
45 | - public function addRule($type,$prompt=NULL,$value=NULL){ |
|
46 | - if($type instanceof Rule) |
|
45 | + public function addRule($type, $prompt=NULL, $value=NULL) { |
|
46 | + if ($type instanceof Rule) |
|
47 | 47 | $this->rules[]=$type; |
48 | - else if(\is_array($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 | - $this->rules[]=new Rule($type,$prompt,$value); |
|
53 | - }else |
|
54 | - $this->rules[]=new Rule($type,$prompt,$value); |
|
52 | + $this->rules[]=new Rule($type, $prompt, $value); |
|
53 | + } else |
|
54 | + $this->rules[]=new Rule($type, $prompt, $value); |
|
55 | 55 | } |
56 | 56 | |
57 | - public function jsonSerialize(){ |
|
58 | - return ["identifier"=>$this->identifier,"rules"=>$this->rules]; |
|
57 | + public function jsonSerialize() { |
|
58 | + return ["identifier"=>$this->identifier, "rules"=>$this->rules]; |
|
59 | 59 | } |
60 | 60 | |
61 | 61 | public function setDepends($depends) { |
@@ -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(){ |
@@ -5,7 +5,7 @@ discard block |
||
5 | 5 | * @version 1.001 |
6 | 6 | * Generates a JSON Rule for the validation of a field |
7 | 7 | */ |
8 | -class Rule implements \JsonSerializable{ |
|
8 | +class Rule implements \JsonSerializable { |
|
9 | 9 | /** |
10 | 10 | * @var string |
11 | 11 | */ |
@@ -20,7 +20,7 @@ discard block |
||
20 | 20 | */ |
21 | 21 | private $value; |
22 | 22 | |
23 | - public function __construct($type,$prompt=NULL,$value=NULL){ |
|
23 | + public function __construct($type, $prompt=NULL, $value=NULL) { |
|
24 | 24 | $this->type=$type; |
25 | 25 | $this->prompt=$prompt; |
26 | 26 | $this->value=$value; |
@@ -54,10 +54,10 @@ discard block |
||
54 | 54 | } |
55 | 55 | |
56 | 56 | public function jsonSerialize() { |
57 | - $result= ["type"=>$this->type]; |
|
58 | - if(isset($this->prompt)) |
|
57 | + $result=["type"=>$this->type]; |
|
58 | + if (isset($this->prompt)) |
|
59 | 59 | $result["prompt"]=$this->prompt; |
60 | - if(isset($this->value)) |
|
60 | + if (isset($this->value)) |
|
61 | 61 | $result["value"]=$this->value; |
62 | 62 | return $result; |
63 | 63 | } |
@@ -68,8 +68,8 @@ discard block |
||
68 | 68 | * @param string $prompt |
69 | 69 | * @return \Ajax\semantic\components\validation\Rule |
70 | 70 | */ |
71 | - public static function match($name,$prompt=NULL){ |
|
72 | - return new Rule("match[".$name."]",$prompt); |
|
71 | + public static function match($name, $prompt=NULL) { |
|
72 | + return new Rule("match[".$name."]", $prompt); |
|
73 | 73 | } |
74 | 74 | |
75 | 75 | /** |
@@ -78,8 +78,8 @@ discard block |
||
78 | 78 | * @param string $prompt |
79 | 79 | * @return \Ajax\semantic\components\validation\Rule |
80 | 80 | */ |
81 | - public static function different($name,$prompt=NULL){ |
|
82 | - return new Rule("different[".$name."]",$prompt); |
|
81 | + public static function different($name, $prompt=NULL) { |
|
82 | + return new Rule("different[".$name."]", $prompt); |
|
83 | 83 | } |
84 | 84 | |
85 | 85 | /** |
@@ -89,78 +89,78 @@ discard block |
||
89 | 89 | * @param string $prompt |
90 | 90 | * @return \Ajax\semantic\components\validation\Rule |
91 | 91 | */ |
92 | - 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 | - return new Rule("integer",$prompt); |
|
92 | + 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 | + return new Rule("integer", $prompt); |
|
96 | 96 | } |
97 | 97 | |
98 | - public static function decimal($prompt=NULL){ |
|
99 | - return new Rule("decimal",$prompt); |
|
98 | + public static function decimal($prompt=NULL) { |
|
99 | + return new Rule("decimal", $prompt); |
|
100 | 100 | } |
101 | 101 | |
102 | - public static function number($prompt=NULL){ |
|
103 | - return new Rule("number",$prompt); |
|
102 | + public static function number($prompt=NULL) { |
|
103 | + return new Rule("number", $prompt); |
|
104 | 104 | } |
105 | 105 | |
106 | - public static function is($value,$prompt=NULL){ |
|
107 | - return new Rule("is[".$value."]",$prompt); |
|
106 | + public static function is($value, $prompt=NULL) { |
|
107 | + return new Rule("is[".$value."]", $prompt); |
|
108 | 108 | } |
109 | 109 | |
110 | - public static function isExactly($value,$prompt=NULL){ |
|
111 | - return new Rule("isExactly[".$value."]",$prompt); |
|
110 | + public static function isExactly($value, $prompt=NULL) { |
|
111 | + return new Rule("isExactly[".$value."]", $prompt); |
|
112 | 112 | } |
113 | 113 | |
114 | - public static function not($value,$prompt=NULL){ |
|
115 | - return new Rule("not[".$value."]",$prompt); |
|
114 | + public static function not($value, $prompt=NULL) { |
|
115 | + return new Rule("not[".$value."]", $prompt); |
|
116 | 116 | } |
117 | 117 | |
118 | - public static function notExactly($value,$prompt=NULL){ |
|
119 | - return new Rule("notExactly[".$value."]",$prompt); |
|
118 | + public static function notExactly($value, $prompt=NULL) { |
|
119 | + return new Rule("notExactly[".$value."]", $prompt); |
|
120 | 120 | } |
121 | 121 | |
122 | - public static function contains($value,$prompt=NULL){ |
|
123 | - return new Rule("contains[".$value."]",$prompt); |
|
122 | + public static function contains($value, $prompt=NULL) { |
|
123 | + return new Rule("contains[".$value."]", $prompt); |
|
124 | 124 | } |
125 | 125 | |
126 | - public static function containsExactly($value,$prompt=NULL){ |
|
127 | - return new Rule("containsExactly[".$value."]",$prompt); |
|
126 | + public static function containsExactly($value, $prompt=NULL) { |
|
127 | + return new Rule("containsExactly[".$value."]", $prompt); |
|
128 | 128 | } |
129 | 129 | |
130 | - public static function doesntContain($value,$prompt=NULL){ |
|
131 | - return new Rule("doesntContain[".$value."]",$prompt); |
|
130 | + public static function doesntContain($value, $prompt=NULL) { |
|
131 | + return new Rule("doesntContain[".$value."]", $prompt); |
|
132 | 132 | } |
133 | 133 | |
134 | - public static function doesntContainExactly($value,$prompt=NULL){ |
|
135 | - return new Rule("doesntContainExactly[".$value."]",$prompt); |
|
134 | + public static function doesntContainExactly($value, $prompt=NULL) { |
|
135 | + return new Rule("doesntContainExactly[".$value."]", $prompt); |
|
136 | 136 | } |
137 | 137 | |
138 | - public static function minCount($value,$prompt=NULL){ |
|
139 | - return new Rule("minCount[".$value."]",$prompt); |
|
138 | + public static function minCount($value, $prompt=NULL) { |
|
139 | + return new Rule("minCount[".$value."]", $prompt); |
|
140 | 140 | } |
141 | 141 | |
142 | - public static function maxCount($value,$prompt=NULL){ |
|
143 | - return new Rule("maxCount[".$value."]",$prompt); |
|
142 | + public static function maxCount($value, $prompt=NULL) { |
|
143 | + return new Rule("maxCount[".$value."]", $prompt); |
|
144 | 144 | } |
145 | 145 | |
146 | - public static function exactCount($value,$prompt=NULL){ |
|
147 | - return new Rule("exactCount[".$value."]",$prompt); |
|
146 | + public static function exactCount($value, $prompt=NULL) { |
|
147 | + return new Rule("exactCount[".$value."]", $prompt); |
|
148 | 148 | } |
149 | 149 | |
150 | - public static function email($prompt=NULL){ |
|
151 | - return new Rule("email",$prompt); |
|
150 | + public static function email($prompt=NULL) { |
|
151 | + return new Rule("email", $prompt); |
|
152 | 152 | } |
153 | 153 | |
154 | - public static function url($prompt=NULL){ |
|
155 | - return new Rule("url",$prompt); |
|
154 | + public static function url($prompt=NULL) { |
|
155 | + return new Rule("url", $prompt); |
|
156 | 156 | } |
157 | 157 | |
158 | - public static function regExp($value,$prompt=NULL){ |
|
159 | - return new Rule("regExp",$prompt,$value); |
|
158 | + public static function regExp($value, $prompt=NULL) { |
|
159 | + return new Rule("regExp", $prompt, $value); |
|
160 | 160 | } |
161 | 161 | |
162 | - public static function custom($name,$jsFunction){ |
|
163 | - return "$.fn.form.settings.rules.".$name." =".$jsFunction ; |
|
162 | + public static function custom($name, $jsFunction) { |
|
163 | + return "$.fn.form.settings.rules.".$name." =".$jsFunction; |
|
164 | 164 | } |
165 | 165 | |
166 | 166 | } |
167 | 167 | \ No newline at end of file |
@@ -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 |