@@ -8,16 +8,16 @@ |
||
8 | 8 | class HtmlFormInput extends HtmlFormField { |
9 | 9 | use TextFieldsTrait; |
10 | 10 | |
11 | - public function __construct($identifier, $label=NULL,$type="text",$value=NULL,$placeholder=NULL) { |
|
12 | - if(!isset($placeholder) && $type==="text") |
|
11 | + public function __construct($identifier, $label=NULL, $type="text", $value=NULL, $placeholder=NULL) { |
|
12 | + if (!isset($placeholder) && $type==="text") |
|
13 | 13 | $placeholder=$label; |
14 | - parent::__construct("field-".$identifier, new HtmlInput($identifier,$type,$value,$placeholder), $label); |
|
14 | + parent::__construct("field-".$identifier, new HtmlInput($identifier, $type, $value, $placeholder), $label); |
|
15 | 15 | } |
16 | 16 | |
17 | - public function getDataField(){ |
|
18 | - $field= $this->getField(); |
|
17 | + public function getDataField() { |
|
18 | + $field=$this->getField(); |
|
19 | 19 | //TODO check getField |
20 | - if($field instanceof HtmlInput) |
|
20 | + if ($field instanceof HtmlInput) |
|
21 | 21 | $field=$field->getDataField(); |
22 | 22 | return $field; |
23 | 23 | } |
@@ -9,16 +9,18 @@ |
||
9 | 9 | use TextFieldsTrait; |
10 | 10 | |
11 | 11 | public function __construct($identifier, $label=NULL,$type="text",$value=NULL,$placeholder=NULL) { |
12 | - if(!isset($placeholder) && $type==="text") |
|
13 | - $placeholder=$label; |
|
12 | + if(!isset($placeholder) && $type==="text") { |
|
13 | + $placeholder=$label; |
|
14 | + } |
|
14 | 15 | parent::__construct("field-".$identifier, new HtmlInput($identifier,$type,$value,$placeholder), $label); |
15 | 16 | } |
16 | 17 | |
17 | 18 | public function getDataField(){ |
18 | 19 | $field= $this->getField(); |
19 | 20 | //TODO check getField |
20 | - if($field instanceof HtmlInput) |
|
21 | - $field=$field->getDataField(); |
|
21 | + if($field instanceof HtmlInput) { |
|
22 | + $field=$field->getDataField(); |
|
23 | + } |
|
22 | 24 | return $field; |
23 | 25 | } |
24 | 26 | } |
25 | 27 | \ No newline at end of file |
@@ -6,19 +6,19 @@ |
||
6 | 6 | |
7 | 7 | abstract public function getDataField(); |
8 | 8 | abstract public function addToProperty($name, $value, $separator=" "); |
9 | - public function setPlaceholder($value){ |
|
9 | + public function setPlaceholder($value) { |
|
10 | 10 | $this->getDataField()->setPlaceholder($value); |
11 | 11 | return $this; |
12 | 12 | } |
13 | 13 | |
14 | - public function setValue($value){ |
|
14 | + public function setValue($value) { |
|
15 | 15 | $this->getDataField()->setValue($value); |
16 | 16 | return $this; |
17 | 17 | } |
18 | 18 | |
19 | - public function setInputType($type){ |
|
20 | - if($type==="hidden") |
|
21 | - $this->addToProperty("style","display:none;"); |
|
19 | + public function setInputType($type) { |
|
20 | + if ($type==="hidden") |
|
21 | + $this->addToProperty("style", "display:none;"); |
|
22 | 22 | $this->getDataField()->setInputType($type); |
23 | 23 | return $this; |
24 | 24 | } |
@@ -17,8 +17,9 @@ |
||
17 | 17 | } |
18 | 18 | |
19 | 19 | public function setInputType($type){ |
20 | - if($type==="hidden") |
|
21 | - $this->addToProperty("style","display:none;"); |
|
20 | + if($type==="hidden") { |
|
21 | + $this->addToProperty("style","display:none;"); |
|
22 | + } |
|
22 | 23 | $this->getDataField()->setInputType($type); |
23 | 24 | return $this; |
24 | 25 | } |
@@ -31,38 +31,38 @@ discard block |
||
31 | 31 | * @param string|HtmlSemDoubleElement $header |
32 | 32 | * @return \Ajax\semantic\html\collections\HtmlMessage |
33 | 33 | */ |
34 | - public function addHeader($header){ |
|
34 | + public function addHeader($header) { |
|
35 | 35 | $headerO=$header; |
36 | - if(\is_string($header)){ |
|
37 | - $headerO=new HtmlSemDoubleElement("header-".$this->identifier,"div"); |
|
36 | + if (\is_string($header)) { |
|
37 | + $headerO=new HtmlSemDoubleElement("header-".$this->identifier, "div"); |
|
38 | 38 | $headerO->setClass("header"); |
39 | 39 | $headerO->setContent($header); |
40 | 40 | } |
41 | - return $this->addContent($headerO,true); |
|
41 | + return $this->addContent($headerO, true); |
|
42 | 42 | } |
43 | 43 | |
44 | - public function addList($elements,$ordered=false){ |
|
45 | - $list=new HtmlList("list-".$this->identifier,$elements); |
|
44 | + public function addList($elements, $ordered=false) { |
|
45 | + $list=new HtmlList("list-".$this->identifier, $elements); |
|
46 | 46 | $list->setOrdered($ordered); |
47 | 47 | $list->setClass("ui list"); |
48 | 48 | $this->addContent($list); |
49 | 49 | } |
50 | 50 | |
51 | - public function setIcon($icon){ |
|
51 | + public function setIcon($icon) { |
|
52 | 52 | $this->addToProperty("class", "icon"); |
53 | - $this->wrapContent("<div class='content'>","</div>"); |
|
53 | + $this->wrapContent("<div class='content'>", "</div>"); |
|
54 | 54 | $this->icon=new HtmlIcon("icon-".$this->identifier, $icon); |
55 | 55 | return $this; |
56 | 56 | } |
57 | 57 | |
58 | - public function addLoader($loaderIcon="notched circle"){ |
|
58 | + public function addLoader($loaderIcon="notched circle") { |
|
59 | 59 | $this->setIcon($loaderIcon); |
60 | 60 | $this->icon->addToIcon("loading"); |
61 | 61 | return $this; |
62 | 62 | } |
63 | 63 | |
64 | - public function setDismissable($dismiss=true){ |
|
65 | - if($dismiss===true) |
|
64 | + public function setDismissable($dismiss=true) { |
|
65 | + if ($dismiss===true) |
|
66 | 66 | $this->close=new HtmlIcon("close-".$this->identifier, "close"); |
67 | 67 | else |
68 | 68 | $this->close=NULL; |
@@ -73,34 +73,34 @@ discard block |
||
73 | 73 | * {@inheritDoc} |
74 | 74 | * @see \Ajax\semantic\html\base\HtmlSemDoubleElement::run() |
75 | 75 | */ |
76 | - public function run(JsUtils $js){ |
|
76 | + public function run(JsUtils $js) { |
|
77 | 77 | parent::run($js); |
78 | - if(isset($this->close)){ |
|
78 | + if (isset($this->close)) { |
|
79 | 79 | $js->execOn("click", "#".$this->identifier." .close", "$(this).closest('.message').transition('fade')"); |
80 | 80 | } |
81 | 81 | } |
82 | 82 | |
83 | - public function setState($visible=true){ |
|
84 | - $visible=($visible===true)?"visible":"hidden"; |
|
85 | - return $this->addToPropertyCtrl("class", $visible, array("visible","hidden")); |
|
83 | + public function setState($visible=true) { |
|
84 | + $visible=($visible===true) ? "visible" : "hidden"; |
|
85 | + return $this->addToPropertyCtrl("class", $visible, array("visible", "hidden")); |
|
86 | 86 | } |
87 | 87 | |
88 | - public function setVariation($value="floating"){ |
|
89 | - return $this->addToPropertyCtrl("class", $value, array("floating","compact")); |
|
88 | + public function setVariation($value="floating") { |
|
89 | + return $this->addToPropertyCtrl("class", $value, array("floating", "compact")); |
|
90 | 90 | } |
91 | 91 | |
92 | - public function setStyle($style){ |
|
92 | + public function setStyle($style) { |
|
93 | 93 | return $this->addToPropertyCtrl("class", $style, Style::getConstants()); |
94 | 94 | } |
95 | 95 | |
96 | - public function setError(){ |
|
96 | + public function setError() { |
|
97 | 97 | return $this->setStyle("error"); |
98 | 98 | } |
99 | 99 | |
100 | - public function setMessage($message){ |
|
101 | - if(\is_array($this->content)){ |
|
100 | + public function setMessage($message) { |
|
101 | + if (\is_array($this->content)) { |
|
102 | 102 | $this->content[\sizeof($this->content)-1]=$message; |
103 | - }else |
|
103 | + } else |
|
104 | 104 | $this->setContent($message); |
105 | 105 | } |
106 | 106 | } |
107 | 107 | \ No newline at end of file |
@@ -62,10 +62,11 @@ discard block |
||
62 | 62 | } |
63 | 63 | |
64 | 64 | public function setDismissable($dismiss=true){ |
65 | - if($dismiss===true) |
|
66 | - $this->close=new HtmlIcon("close-".$this->identifier, "close"); |
|
67 | - else |
|
68 | - $this->close=NULL; |
|
65 | + if($dismiss===true) { |
|
66 | + $this->close=new HtmlIcon("close-".$this->identifier, "close"); |
|
67 | + } else { |
|
68 | + $this->close=NULL; |
|
69 | + } |
|
69 | 70 | return $this; |
70 | 71 | } |
71 | 72 | |
@@ -100,7 +101,8 @@ discard block |
||
100 | 101 | public function setMessage($message){ |
101 | 102 | if(\is_array($this->content)){ |
102 | 103 | $this->content[\sizeof($this->content)-1]=$message; |
103 | - }else |
|
104 | - $this->setContent($message); |
|
104 | + } else { |
|
105 | + $this->setContent($message); |
|
106 | + } |
|
105 | 107 | } |
106 | 108 | } |
107 | 109 | \ No newline at end of file |
@@ -52,8 +52,9 @@ discard block |
||
52 | 52 | */ |
53 | 53 | public function addHeader($title, $niveau=1, $dividing=true) { |
54 | 54 | $header=new HtmlHeader("", $niveau, $title); |
55 | - if ($dividing) |
|
56 | - $header->setDividing(); |
|
55 | + if ($dividing) { |
|
56 | + $header->setDividing(); |
|
57 | + } |
|
57 | 58 | return $this->addItem($header); |
58 | 59 | } |
59 | 60 | |
@@ -74,14 +75,16 @@ discard block |
||
74 | 75 | if (\is_string($end)) { |
75 | 76 | $label=$end; |
76 | 77 | \array_pop($fields); |
77 | - } else |
|
78 | - $label=NULL; |
|
78 | + } else { |
|
79 | + $label=NULL; |
|
80 | + } |
|
79 | 81 | } |
80 | 82 | $this->_fields=\array_merge($this->_fields, $fields); |
81 | 83 | $fields=new HtmlFormFields("fields-" . $this->identifier . "-" . $this->count(), $fields); |
82 | 84 | } |
83 | - if (isset($label)) |
|
84 | - $fields=new HtmlFormField("", $fields, $label); |
|
85 | + if (isset($label)) { |
|
86 | + $fields=new HtmlFormField("", $fields, $label); |
|
87 | + } |
|
85 | 88 | } else { |
86 | 89 | $fields=new HtmlFormFields("fields-" . $this->identifier . "-" . $this->count()); |
87 | 90 | } |
@@ -134,12 +137,15 @@ discard block |
||
134 | 137 | */ |
135 | 138 | public function addMessage($identifier, $content, $header=NULL, $icon=NULL, $type=NULL) { |
136 | 139 | $message=new HtmlMessage($identifier, $content); |
137 | - if (isset($header)) |
|
138 | - $message->addHeader($header); |
|
139 | - if (isset($icon)) |
|
140 | - $message->setIcon($icon); |
|
141 | - if (isset($type)) |
|
142 | - $message->setStyle($type); |
|
140 | + if (isset($header)) { |
|
141 | + $message->addHeader($header); |
|
142 | + } |
|
143 | + if (isset($icon)) { |
|
144 | + $message->setIcon($icon); |
|
145 | + } |
|
146 | + if (isset($type)) { |
|
147 | + $message->setStyle($type); |
|
148 | + } |
|
143 | 149 | return $this->addItem($message); |
144 | 150 | } |
145 | 151 | |
@@ -156,23 +162,26 @@ discard block |
||
156 | 162 | } |
157 | 163 | |
158 | 164 | public function compile(JsUtils $js=NULL,&$view=NULL){ |
159 | - if(\sizeof($this->_validationParams)>0) |
|
160 | - $this->setProperty("novalidate", ""); |
|
165 | + if(\sizeof($this->_validationParams)>0) { |
|
166 | + $this->setProperty("novalidate", ""); |
|
167 | + } |
|
161 | 168 | return parent::compile($js,$view); |
162 | 169 | } |
163 | 170 | |
164 | 171 | public function run(JsUtils $js) { |
165 | 172 | $compo=NULL; |
166 | 173 | foreach ($this->_fields as $field){ |
167 | - if($field instanceof HtmlFormField) |
|
168 | - $compo=$this->addCompoValidation($js, $compo, $field); |
|
174 | + if($field instanceof HtmlFormField) { |
|
175 | + $compo=$this->addCompoValidation($js, $compo, $field); |
|
176 | + } |
|
169 | 177 | } |
170 | 178 | foreach ($this->content as $field){ |
171 | 179 | if($field instanceof HtmlFormFields){ |
172 | 180 | $items=$field->getItems(); |
173 | 181 | foreach ($items as $_field){ |
174 | - if($_field instanceof HtmlFormField) |
|
175 | - $compo=$this->addCompoValidation($js, $compo, $_field); |
|
182 | + if($_field instanceof HtmlFormField) { |
|
183 | + $compo=$this->addCompoValidation($js, $compo, $_field); |
|
184 | + } |
|
176 | 185 | } |
177 | 186 | } |
178 | 187 | } |
@@ -20,7 +20,7 @@ discard block |
||
20 | 20 | */ |
21 | 21 | class HtmlForm extends HtmlSemCollection { |
22 | 22 | |
23 | - use FieldsTrait,FormTrait; |
|
23 | + use FieldsTrait, FormTrait; |
|
24 | 24 | /** |
25 | 25 | * @var array |
26 | 26 | */ |
@@ -33,14 +33,14 @@ discard block |
||
33 | 33 | |
34 | 34 | public function __construct($identifier, $elements=array()) { |
35 | 35 | parent::__construct($identifier, "form", "ui form"); |
36 | - $this->_states=[ State::ERROR,State::SUCCESS,State::WARNING,State::DISABLED ]; |
|
36 | + $this->_states=[State::ERROR, State::SUCCESS, State::WARNING, State::DISABLED]; |
|
37 | 37 | $this->setProperty("name", $this->identifier); |
38 | - $this->_fields=array (); |
|
38 | + $this->_fields=array(); |
|
39 | 39 | $this->_validationParams=[]; |
40 | 40 | $this->addItems($elements); |
41 | 41 | } |
42 | 42 | |
43 | - protected function getForm(){ |
|
43 | + protected function getForm() { |
|
44 | 44 | return $this; |
45 | 45 | } |
46 | 46 | |
@@ -61,8 +61,8 @@ discard block |
||
61 | 61 | * @param string $caption |
62 | 62 | * @return \Ajax\semantic\html\collections\form\HtmlForm |
63 | 63 | */ |
64 | - public function addDivider($caption=NULL){ |
|
65 | - return $this->addContent(new HtmlDivider("",$caption)); |
|
64 | + public function addDivider($caption=NULL) { |
|
65 | + return $this->addContent(new HtmlDivider("", $caption)); |
|
66 | 66 | } |
67 | 67 | |
68 | 68 | public function addFields($fields=NULL, $label=NULL) { |
@@ -78,12 +78,12 @@ discard block |
||
78 | 78 | $label=NULL; |
79 | 79 | } |
80 | 80 | $this->_fields=\array_merge($this->_fields, $fields); |
81 | - $fields=new HtmlFormFields("fields-" . $this->identifier . "-" . $this->count(), $fields); |
|
81 | + $fields=new HtmlFormFields("fields-".$this->identifier."-".$this->count(), $fields); |
|
82 | 82 | } |
83 | 83 | if (isset($label)) |
84 | 84 | $fields=new HtmlFormField("", $fields, $label); |
85 | 85 | } else { |
86 | - $fields=new HtmlFormFields("fields-" . $this->identifier . "-" . $this->count()); |
|
86 | + $fields=new HtmlFormFields("fields-".$this->identifier."-".$this->count()); |
|
87 | 87 | } |
88 | 88 | $this->addItem($fields); |
89 | 89 | return $fields; |
@@ -91,7 +91,7 @@ discard block |
||
91 | 91 | |
92 | 92 | public function addItem($item) { |
93 | 93 | $item=parent::addItem($item); |
94 | - if (\is_subclass_of($item, HtmlFormField::class) === true) { |
|
94 | + if (\is_subclass_of($item, HtmlFormField::class)===true) { |
|
95 | 95 | $this->_fields[]=$item; |
96 | 96 | } |
97 | 97 | return $item; |
@@ -143,10 +143,10 @@ discard block |
||
143 | 143 | return $this->addItem($message); |
144 | 144 | } |
145 | 145 | |
146 | - private function addCompoValidation($js,$compo,$field){ |
|
146 | + private function addCompoValidation($js, $compo, $field) { |
|
147 | 147 | $validation=$field->getValidation(); |
148 | - if(isset($validation)){ |
|
149 | - if(isset($compo)===false){ |
|
148 | + if (isset($validation)) { |
|
149 | + if (isset($compo)===false) { |
|
150 | 150 | $compo=$js->semantic()->form("#".$this->identifier); |
151 | 151 | } |
152 | 152 | $validation->setIdentifier($field->getDataField()->getIdentifier()); |
@@ -155,38 +155,38 @@ discard block |
||
155 | 155 | return $compo; |
156 | 156 | } |
157 | 157 | |
158 | - public function compile(JsUtils $js=NULL,&$view=NULL){ |
|
159 | - if(\sizeof($this->_validationParams)>0) |
|
158 | + public function compile(JsUtils $js=NULL, &$view=NULL) { |
|
159 | + if (\sizeof($this->_validationParams)>0) |
|
160 | 160 | $this->setProperty("novalidate", ""); |
161 | - return parent::compile($js,$view); |
|
161 | + return parent::compile($js, $view); |
|
162 | 162 | } |
163 | 163 | |
164 | 164 | public function run(JsUtils $js) { |
165 | 165 | $compo=NULL; |
166 | - foreach ($this->_fields as $field){ |
|
167 | - if($field instanceof HtmlFormField) |
|
166 | + foreach ($this->_fields as $field) { |
|
167 | + if ($field instanceof HtmlFormField) |
|
168 | 168 | $compo=$this->addCompoValidation($js, $compo, $field); |
169 | 169 | } |
170 | - foreach ($this->content as $field){ |
|
171 | - if($field instanceof HtmlFormFields){ |
|
170 | + foreach ($this->content as $field) { |
|
171 | + if ($field instanceof HtmlFormFields) { |
|
172 | 172 | $items=$field->getItems(); |
173 | - foreach ($items as $_field){ |
|
174 | - if($_field instanceof HtmlFormField) |
|
173 | + foreach ($items as $_field) { |
|
174 | + if ($_field instanceof HtmlFormField) |
|
175 | 175 | $compo=$this->addCompoValidation($js, $compo, $_field); |
176 | 176 | } |
177 | 177 | } |
178 | 178 | } |
179 | - if(isset($compo)===false){ |
|
179 | + if (isset($compo)===false) { |
|
180 | 180 | return parent::run($js); |
181 | 181 | } |
182 | - $this->_runValidationParams($compo,$js); |
|
182 | + $this->_runValidationParams($compo, $js); |
|
183 | 183 | return $this->_bsComponent; |
184 | 184 | } |
185 | 185 | |
186 | - private function _runValidationParams(&$compo,JsUtils $js=NULL){ |
|
187 | - if(isset($this->_validationParams["_ajaxSubmit"]) && $this->_validationParams["_ajaxSubmit"] instanceof AjaxCall){ |
|
186 | + private function _runValidationParams(&$compo, JsUtils $js=NULL) { |
|
187 | + if (isset($this->_validationParams["_ajaxSubmit"]) && $this->_validationParams["_ajaxSubmit"] instanceof AjaxCall) { |
|
188 | 188 | $compilation=$this->_validationParams["_ajaxSubmit"]->compile($js); |
189 | - $compilation=str_ireplace("\"","%quote%", $compilation); |
|
189 | + $compilation=str_ireplace("\"", "%quote%", $compilation); |
|
190 | 190 | $this->onSuccess($compilation); |
191 | 191 | unset($this->_validationParams["_ajaxSubmit"]); |
192 | 192 | } |
@@ -195,7 +195,7 @@ discard block |
||
195 | 195 | $this->addEventsOnRun($js); |
196 | 196 | } |
197 | 197 | |
198 | - public function addValidationParam($paramName,$paramValue){ |
|
198 | + public function addValidationParam($paramName, $paramValue) { |
|
199 | 199 | $this->_validationParams[$paramName]=$paramValue; |
200 | 200 | return $this; |
201 | 201 | } |
@@ -47,9 +47,9 @@ |
||
47 | 47 | $rules=$attributes["rules"]; |
48 | 48 | if(\is_array($rules)){ |
49 | 49 | $element->addRules($rules); |
50 | + } else { |
|
51 | + $element->addRule($rules); |
|
50 | 52 | } |
51 | - else |
|
52 | - $element->addRule($rules); |
|
53 | 53 | unset($attributes["rules"]); |
54 | 54 | } |
55 | 55 | } |
@@ -17,7 +17,14 @@ discard block |
||
17 | 17 | |
18 | 18 | trait FormFieldAsTrait{ |
19 | 19 | |
20 | + /** |
|
21 | + * @param string $prefix |
|
22 | + */ |
|
20 | 23 | abstract protected function _getFieldIdentifier($prefix); |
24 | + |
|
25 | + /** |
|
26 | + * @param \Closure $callback |
|
27 | + */ |
|
21 | 28 | abstract public function setValueFunction($index,$callback); |
22 | 29 | abstract protected function _applyAttributes($element,&$attributes,$index); |
23 | 30 | abstract public function getIdentifier(); |
@@ -39,6 +46,10 @@ discard block |
||
39 | 46 | } |
40 | 47 | } |
41 | 48 | |
49 | + /** |
|
50 | + * @param \Closure $elementCallback |
|
51 | + * @param string $identifier |
|
52 | + */ |
|
42 | 53 | protected function _fieldAs($elementCallback,$index,$attributes=NULL,$identifier=null){ |
43 | 54 | $this->setValueFunction($index,function($value) use ($index,&$attributes,$elementCallback){ |
44 | 55 | $caption=$this->_instanceViewer->getCaption($index); |
@@ -15,22 +15,22 @@ discard block |
||
15 | 15 | * @property object $_modelInstance |
16 | 16 | */ |
17 | 17 | |
18 | -trait FormFieldAsTrait{ |
|
18 | +trait FormFieldAsTrait { |
|
19 | 19 | |
20 | 20 | abstract protected function _getFieldIdentifier($prefix); |
21 | - abstract public function setValueFunction($index,$callback); |
|
22 | - abstract protected function _applyAttributes($element,&$attributes,$index); |
|
21 | + abstract public function setValueFunction($index, $callback); |
|
22 | + abstract protected function _applyAttributes($element, &$attributes, $index); |
|
23 | 23 | abstract public function getIdentifier(); |
24 | 24 | |
25 | - private function _getLabelField($caption,$icon=NULL){ |
|
26 | - $label=new HtmlLabel($this->_getFieldIdentifier("lbl"),$caption,$icon); |
|
25 | + private function _getLabelField($caption, $icon=NULL) { |
|
26 | + $label=new HtmlLabel($this->_getFieldIdentifier("lbl"), $caption, $icon); |
|
27 | 27 | return $label; |
28 | 28 | } |
29 | 29 | |
30 | - protected function _addRules($element,&$attributes){ |
|
31 | - if(isset($attributes["rules"])){ |
|
30 | + protected function _addRules($element, &$attributes) { |
|
31 | + if (isset($attributes["rules"])) { |
|
32 | 32 | $rules=$attributes["rules"]; |
33 | - if(\is_array($rules)){ |
|
33 | + if (\is_array($rules)) { |
|
34 | 34 | $element->addRules($rules); |
35 | 35 | } |
36 | 36 | else |
@@ -39,13 +39,13 @@ discard block |
||
39 | 39 | } |
40 | 40 | } |
41 | 41 | |
42 | - protected function _fieldAs($elementCallback,$index,$attributes=NULL,$identifier=null){ |
|
43 | - $this->setValueFunction($index,function($value) use ($index,&$attributes,$elementCallback){ |
|
42 | + protected function _fieldAs($elementCallback, $index, $attributes=NULL, $identifier=null) { |
|
43 | + $this->setValueFunction($index, function($value) use ($index, &$attributes, $elementCallback){ |
|
44 | 44 | $caption=$this->_instanceViewer->getCaption($index); |
45 | 45 | $name=$this->_instanceViewer->getFieldName($index); |
46 | - $element=$elementCallback($this->getIdentifier()."-".$name,$name,$value,$caption); |
|
47 | - if(\is_array($attributes)){ |
|
48 | - $this->_applyAttributes($element, $attributes,$index); |
|
46 | + $element=$elementCallback($this->getIdentifier()."-".$name, $name, $value, $caption); |
|
47 | + if (\is_array($attributes)) { |
|
48 | + $this->_applyAttributes($element, $attributes, $index); |
|
49 | 49 | } |
50 | 50 | return $element; |
51 | 51 | }); |
@@ -53,53 +53,53 @@ discard block |
||
53 | 53 | } |
54 | 54 | |
55 | 55 | |
56 | - public function fieldAsRadio($index,$attributes=NULL){ |
|
57 | - return $this->_fieldAs(function($id,$name,$value,$caption){ |
|
58 | - return new HtmlFormRadio($id,$name,$caption,$value); |
|
59 | - }, $index,$attributes); |
|
56 | + public function fieldAsRadio($index, $attributes=NULL) { |
|
57 | + return $this->_fieldAs(function($id, $name, $value, $caption) { |
|
58 | + return new HtmlFormRadio($id, $name, $caption, $value); |
|
59 | + }, $index, $attributes); |
|
60 | 60 | } |
61 | 61 | |
62 | - public function fieldAsRadios($index,$elements=[],$attributes=NULL){ |
|
63 | - return $this->_fieldAs(function($id,$name,$value,$caption,$elements){ |
|
64 | - return HtmlFormFields::radios($name,$elements,$caption,$value); |
|
65 | - }, $index,$attributes); |
|
62 | + public function fieldAsRadios($index, $elements=[], $attributes=NULL) { |
|
63 | + return $this->_fieldAs(function($id, $name, $value, $caption, $elements) { |
|
64 | + return HtmlFormFields::radios($name, $elements, $caption, $value); |
|
65 | + }, $index, $attributes); |
|
66 | 66 | } |
67 | 67 | |
68 | - public function fieldAsTextarea($index,$attributes=NULL){ |
|
69 | - return $this->_fieldAs(function($id,$name,$value,$caption){ |
|
70 | - $textarea=new HtmlFormTextarea($id,$caption,$value); |
|
68 | + public function fieldAsTextarea($index, $attributes=NULL) { |
|
69 | + return $this->_fieldAs(function($id, $name, $value, $caption) { |
|
70 | + $textarea=new HtmlFormTextarea($id, $caption, $value); |
|
71 | 71 | $textarea->setName($name); |
72 | 72 | return $textarea; |
73 | - }, $index,$attributes); |
|
73 | + }, $index, $attributes); |
|
74 | 74 | } |
75 | 75 | |
76 | - public function fieldAsInput($index,$attributes=NULL){ |
|
77 | - return $this->_fieldAs(function($id,$name,$value,$caption){ |
|
78 | - $input= new HtmlFormInput($id,$caption,"text",$value); |
|
76 | + public function fieldAsInput($index, $attributes=NULL) { |
|
77 | + return $this->_fieldAs(function($id, $name, $value, $caption) { |
|
78 | + $input=new HtmlFormInput($id, $caption, "text", $value); |
|
79 | 79 | $input->setName($name); |
80 | 80 | return $input; |
81 | - }, $index,$attributes); |
|
81 | + }, $index, $attributes); |
|
82 | 82 | } |
83 | 83 | |
84 | - public function fieldAsCheckbox($index,$attributes=NULL){ |
|
85 | - return $this->_fieldAs(function($id,$name,$value,$caption){ |
|
86 | - return new HtmlFormCheckbox($id,$caption,$value); |
|
87 | - }, $index,$attributes); |
|
84 | + public function fieldAsCheckbox($index, $attributes=NULL) { |
|
85 | + return $this->_fieldAs(function($id, $name, $value, $caption) { |
|
86 | + return new HtmlFormCheckbox($id, $caption, $value); |
|
87 | + }, $index, $attributes); |
|
88 | 88 | } |
89 | 89 | |
90 | - public function fieldAsDropDown($index,$elements=[],$multiple=false,$attributes=NULL){ |
|
91 | - return $this->_fieldAs(function($id,$name,$value,$caption) use ($elements,$multiple){ |
|
92 | - $dd=new HtmlFormDropdown($id,$elements,$caption,$value,$multiple); |
|
90 | + public function fieldAsDropDown($index, $elements=[], $multiple=false, $attributes=NULL) { |
|
91 | + return $this->_fieldAs(function($id, $name, $value, $caption) use ($elements, $multiple){ |
|
92 | + $dd=new HtmlFormDropdown($id, $elements, $caption, $value, $multiple); |
|
93 | 93 | $dd->setName($name); |
94 | 94 | return $dd; |
95 | - }, $index,$attributes); |
|
95 | + }, $index, $attributes); |
|
96 | 96 | } |
97 | 97 | |
98 | - public function fieldAsMessage($index,$attributes=NULL){ |
|
99 | - return $this->_fieldAs(function($id,$name,$value,$caption){ |
|
100 | - $mess= new HtmlMessage("message-".$id,$value); |
|
98 | + public function fieldAsMessage($index, $attributes=NULL) { |
|
99 | + return $this->_fieldAs(function($id, $name, $value, $caption) { |
|
100 | + $mess=new HtmlMessage("message-".$id, $value); |
|
101 | 101 | $mess->addHeader($caption); |
102 | 102 | return $mess; |
103 | - }, $index,$attributes,"message"); |
|
103 | + }, $index, $attributes, "message"); |
|
104 | 104 | } |
105 | 105 | } |
106 | 106 | \ No newline at end of file |
@@ -5,7 +5,7 @@ discard block |
||
5 | 5 | use Ajax\semantic\html\collections\HtmlMessage; |
6 | 6 | use Ajax\service\AjaxCall; |
7 | 7 | |
8 | -trait FormTrait{ |
|
8 | +trait FormTrait { |
|
9 | 9 | /** |
10 | 10 | * @return HtmlForm |
11 | 11 | */ |
@@ -15,7 +15,7 @@ discard block |
||
15 | 15 | return $this->getForm()->addToProperty("class", "loading"); |
16 | 16 | } |
17 | 17 | |
18 | - public function addErrorMessage(){ |
|
18 | + public function addErrorMessage() { |
|
19 | 19 | return $this->getForm()->addContent((new HtmlMessage(""))->setError()); |
20 | 20 | } |
21 | 21 | |
@@ -30,35 +30,35 @@ discard block |
||
30 | 30 | * @param string $responseElement |
31 | 31 | * @return \Ajax\semantic\html\collections\form\HtmlForm |
32 | 32 | */ |
33 | - public function submitOn($event,$identifier,$url,$responseElement){ |
|
33 | + public function submitOn($event, $identifier, $url, $responseElement) { |
|
34 | 34 | $form=$this->getForm(); |
35 | 35 | $elem=$form->getElementById($identifier, $form->getContent()); |
36 | - if(isset($elem)){ |
|
37 | - $this->_buttonAsSubmit($elem, $event,$url,$responseElement); |
|
36 | + if (isset($elem)) { |
|
37 | + $this->_buttonAsSubmit($elem, $event, $url, $responseElement); |
|
38 | 38 | } |
39 | 39 | return $form; |
40 | 40 | } |
41 | 41 | |
42 | - public function submitOnClick($identifier,$url,$responseElement){ |
|
42 | + public function submitOnClick($identifier, $url, $responseElement) { |
|
43 | 43 | return $this->submitOn("click", $identifier, $url, $responseElement); |
44 | 44 | } |
45 | 45 | |
46 | - public function addSubmit($identifier,$value,$cssStyle=NULL,$url=NULL,$responseElement=NULL){ |
|
47 | - $bt=$this->getForm()->addButton($identifier, $value,$cssStyle); |
|
48 | - return $this->_buttonAsSubmit($bt, "click",$url,$responseElement); |
|
46 | + public function addSubmit($identifier, $value, $cssStyle=NULL, $url=NULL, $responseElement=NULL) { |
|
47 | + $bt=$this->getForm()->addButton($identifier, $value, $cssStyle); |
|
48 | + return $this->_buttonAsSubmit($bt, "click", $url, $responseElement); |
|
49 | 49 | } |
50 | 50 | |
51 | - protected function _buttonAsSubmit(&$button,$event,$url,$responseElement=NULL){ |
|
51 | + protected function _buttonAsSubmit(&$button, $event, $url, $responseElement=NULL) { |
|
52 | 52 | $form=$this->getForm(); |
53 | - if(isset($url) && isset($responseElement)){ |
|
53 | + if (isset($url) && isset($responseElement)) { |
|
54 | 54 | $button->addEvent($event, "$('#".$form->getIdentifier()."').form('validate form');"); |
55 | - $form->addValidationParam("_ajaxSubmit", new AjaxCall("postForm", ["form"=>$form->getIdentifier(),"responseElement"=>$responseElement,"url"=>$url])); |
|
55 | + $form->addValidationParam("_ajaxSubmit", new AjaxCall("postForm", ["form"=>$form->getIdentifier(), "responseElement"=>$responseElement, "url"=>$url])); |
|
56 | 56 | } |
57 | 57 | return $button; |
58 | 58 | } |
59 | 59 | |
60 | - public function addReset($identifier,$value,$cssStyle=NULL){ |
|
61 | - $bt=$this->getForm()->addButton($identifier, $value,$cssStyle); |
|
60 | + public function addReset($identifier, $value, $cssStyle=NULL) { |
|
61 | + $bt=$this->getForm()->addButton($identifier, $value, $cssStyle); |
|
62 | 62 | $bt->setProperty("type", "reset"); |
63 | 63 | return $bt; |
64 | 64 | } |
@@ -68,7 +68,7 @@ discard block |
||
68 | 68 | * @param string $jsCode |
69 | 69 | * @return \Ajax\semantic\html\collections\form\HtmlForm |
70 | 70 | */ |
71 | - public function onValid($jsCode){ |
|
71 | + public function onValid($jsCode) { |
|
72 | 72 | $form=$this->getForm(); |
73 | 73 | $form->addValidationParam("onValid", "%function(){".$jsCode."}%"); |
74 | 74 | return $form; |
@@ -79,7 +79,7 @@ discard block |
||
79 | 79 | * @param string $jsCode can use event and fields parameters |
80 | 80 | * @return HtmlForm |
81 | 81 | */ |
82 | - public function onSuccess($jsCode){ |
|
82 | + public function onSuccess($jsCode) { |
|
83 | 83 | $form=$this->getForm(); |
84 | 84 | $form->addValidationParam("onSuccess", "%function(evt,fields){".$jsCode."}%"); |
85 | 85 | return $form; |
@@ -25,10 +25,10 @@ discard block |
||
25 | 25 | |
26 | 26 | public function __construct($identifier, $rowCount, $colCount) { |
27 | 27 | parent::__construct($identifier, "table", "ui table"); |
28 | - $this->content=array (); |
|
28 | + $this->content=array(); |
|
29 | 29 | $this->setRowCount($rowCount, $colCount); |
30 | - $this->_variations=[ Variation::CELLED,Variation::PADDED,Variation::COMPACT ]; |
|
31 | - $this->_compileParts=["thead","tbody","tfoot"]; |
|
30 | + $this->_variations=[Variation::CELLED, Variation::PADDED, Variation::COMPACT]; |
|
31 | + $this->_compileParts=["thead", "tbody", "tfoot"]; |
|
32 | 32 | $this->_afterCompileEvents=[]; |
33 | 33 | } |
34 | 34 | |
@@ -46,9 +46,9 @@ discard block |
||
46 | 46 | * @return HtmlTableContent |
47 | 47 | */ |
48 | 48 | public function getPart($key) { |
49 | - if (\array_key_exists($key, $this->content) === false) { |
|
49 | + if (\array_key_exists($key, $this->content)===false) { |
|
50 | 50 | $this->content[$key]=new HtmlTableContent("", $key); |
51 | - if ($key !== "tbody") { |
|
51 | + if ($key!=="tbody") { |
|
52 | 52 | $this->content[$key]->setRowCount(1, $this->_colCount); |
53 | 53 | } |
54 | 54 | } |
@@ -85,7 +85,7 @@ discard block |
||
85 | 85 | * @return boolean |
86 | 86 | */ |
87 | 87 | public function hasPart($key) { |
88 | - return \array_key_exists($key, $this->content) === true; |
|
88 | + return \array_key_exists($key, $this->content)===true; |
|
89 | 89 | } |
90 | 90 | |
91 | 91 | /** |
@@ -190,7 +190,7 @@ discard block |
||
190 | 190 | |
191 | 191 | private function colAlign($colIndex, $function) { |
192 | 192 | if (\is_array($colIndex)) { |
193 | - foreach ( $colIndex as $cIndex ) { |
|
193 | + foreach ($colIndex as $cIndex) { |
|
194 | 194 | $this->colAlign($cIndex, $function); |
195 | 195 | } |
196 | 196 | } else { |
@@ -229,12 +229,12 @@ discard block |
||
229 | 229 | * @see \Ajax\semantic\html\base\HtmlSemDoubleElement::compile() |
230 | 230 | */ |
231 | 231 | public function compile(JsUtils $js=NULL, &$view=NULL) { |
232 | - if(\sizeof($this->_compileParts)<3){ |
|
232 | + if (\sizeof($this->_compileParts)<3) { |
|
233 | 233 | $this->_template="%content%"; |
234 | 234 | $this->refresh(); |
235 | - }else{ |
|
235 | + } else { |
|
236 | 236 | if ($this->propertyContains("class", "sortable")) { |
237 | - $this->addEvent("execute", "$('#" . $this->identifier . "').tablesort();"); |
|
237 | + $this->addEvent("execute", "$('#".$this->identifier."').tablesort();"); |
|
238 | 238 | } |
239 | 239 | } |
240 | 240 | $this->content=JArray::sortAssociative($this->content, $this->_compileParts); |
@@ -250,13 +250,13 @@ discard block |
||
250 | 250 | public function fromDatabaseObject($object, $function) { |
251 | 251 | $result=$function($object); |
252 | 252 | if (\is_array($result)) { |
253 | - $result= $this->addRow($function($object)); |
|
253 | + $result=$this->addRow($function($object)); |
|
254 | 254 | } else { |
255 | - $result= $this->getBody()->_addRow($result); |
|
255 | + $result=$this->getBody()->_addRow($result); |
|
256 | 256 | } |
257 | - if(isset($this->_afterCompileEvents["onNewRow"])){ |
|
258 | - if(\is_callable($this->_afterCompileEvents["onNewRow"])) |
|
259 | - $this->_afterCompileEvents["onNewRow"]($result,$object); |
|
257 | + if (isset($this->_afterCompileEvents["onNewRow"])) { |
|
258 | + if (\is_callable($this->_afterCompileEvents["onNewRow"])) |
|
259 | + $this->_afterCompileEvents["onNewRow"]($result, $object); |
|
260 | 260 | } |
261 | 261 | return $result; |
262 | 262 | } |
@@ -270,14 +270,14 @@ discard block |
||
270 | 270 | return $this; |
271 | 271 | } |
272 | 272 | |
273 | - public function refresh(){ |
|
273 | + public function refresh() { |
|
274 | 274 | $this->_footer=$this->getFooter(); |
275 | 275 | $this->addEvent("execute", '$("#'.$this->identifier.' tfoot").replaceWith("'.\addslashes($this->_footer).'");'); |
276 | 276 | } |
277 | 277 | |
278 | - public function run(JsUtils $js){ |
|
279 | - $result= parent::run($js); |
|
280 | - if(isset($this->_footer)) |
|
278 | + public function run(JsUtils $js) { |
|
279 | + $result=parent::run($js); |
|
280 | + if (isset($this->_footer)) |
|
281 | 281 | $this->_footer->run($js); |
282 | 282 | return $result; |
283 | 283 | } |
@@ -232,7 +232,7 @@ discard block |
||
232 | 232 | if(\sizeof($this->_compileParts)<3){ |
233 | 233 | $this->_template="%content%"; |
234 | 234 | $this->refresh(); |
235 | - }else{ |
|
235 | + } else{ |
|
236 | 236 | if ($this->propertyContains("class", "sortable")) { |
237 | 237 | $this->addEvent("execute", "$('#" . $this->identifier . "').tablesort();"); |
238 | 238 | } |
@@ -255,8 +255,9 @@ discard block |
||
255 | 255 | $result= $this->getBody()->_addRow($result); |
256 | 256 | } |
257 | 257 | if(isset($this->_afterCompileEvents["onNewRow"])){ |
258 | - if(\is_callable($this->_afterCompileEvents["onNewRow"])) |
|
259 | - $this->_afterCompileEvents["onNewRow"]($result,$object); |
|
258 | + if(\is_callable($this->_afterCompileEvents["onNewRow"])) { |
|
259 | + $this->_afterCompileEvents["onNewRow"]($result,$object); |
|
260 | + } |
|
260 | 261 | } |
261 | 262 | return $result; |
262 | 263 | } |
@@ -277,8 +278,9 @@ discard block |
||
277 | 278 | |
278 | 279 | public function run(JsUtils $js){ |
279 | 280 | $result= parent::run($js); |
280 | - if(isset($this->_footer)) |
|
281 | - $this->_footer->run($js); |
|
281 | + if(isset($this->_footer)) { |
|
282 | + $this->_footer->run($js); |
|
283 | + } |
|
282 | 284 | return $result; |
283 | 285 | } |
284 | 286 |
@@ -1,13 +1,13 @@ discard block |
||
1 | 1 | <?php |
2 | 2 | namespace Ajax\semantic\html\collections\table\traits; |
3 | 3 | |
4 | -trait TableTrait{ |
|
4 | +trait TableTrait { |
|
5 | 5 | /** |
6 | 6 | * @return HtmlTable |
7 | 7 | */ |
8 | 8 | abstract protected function getTable(); |
9 | 9 | |
10 | - protected function addToPropertyTable($property,$value){ |
|
10 | + protected function addToPropertyTable($property, $value) { |
|
11 | 11 | return $this->getTable()->addToProperty($property, $value); |
12 | 12 | } |
13 | 13 | |
@@ -18,8 +18,8 @@ discard block |
||
18 | 18 | public function setBasic($very=false) { |
19 | 19 | $table=$this->getTable(); |
20 | 20 | if ($very) |
21 | - $table->addToPropertyCtrl("class", "very", array ("very" )); |
|
22 | - return $table->addToPropertyCtrl("class", "basic", array ("basic" )); |
|
21 | + $table->addToPropertyCtrl("class", "very", array("very")); |
|
22 | + return $table->addToPropertyCtrl("class", "basic", array("basic")); |
|
23 | 23 | } |
24 | 24 | |
25 | 25 | public function setCollapsing() { |
@@ -17,8 +17,9 @@ |
||
17 | 17 | |
18 | 18 | public function setBasic($very=false) { |
19 | 19 | $table=$this->getTable(); |
20 | - if ($very) |
|
21 | - $table->addToPropertyCtrl("class", "very", array ("very" )); |
|
20 | + if ($very) { |
|
21 | + $table->addToPropertyCtrl("class", "very", array ("very" )); |
|
22 | + } |
|
22 | 23 | return $table->addToPropertyCtrl("class", "basic", array ("basic" )); |
23 | 24 | } |
24 | 25 |
@@ -14,21 +14,24 @@ discard block |
||
14 | 14 | return $array[$key]; |
15 | 15 | } |
16 | 16 | $values=array_values($array); |
17 | - if ($pos < sizeof($values)) |
|
18 | - return $values[$pos]; |
|
17 | + if ($pos < sizeof($values)) { |
|
18 | + return $values[$pos]; |
|
19 | + } |
|
19 | 20 | } |
20 | 21 | |
21 | 22 | public static function getConditionalValue($array, $key, $condition) { |
22 | 23 | $result=NULL; |
23 | 24 | if (array_key_exists($key, $array)) { |
24 | 25 | $result=$array[$key]; |
25 | - if ($condition($result) === true) |
|
26 | - return $result; |
|
26 | + if ($condition($result) === true) { |
|
27 | + return $result; |
|
28 | + } |
|
27 | 29 | } |
28 | 30 | $values=array_values($array); |
29 | 31 | foreach ( $values as $val ) { |
30 | - if ($condition($val) === true) |
|
31 | - return $val; |
|
32 | + if ($condition($val) === true) { |
|
33 | + return $val; |
|
34 | + } |
|
32 | 35 | } |
33 | 36 | return $result; |
34 | 37 | } |
@@ -36,8 +39,9 @@ discard block |
||
36 | 39 | public static function getDefaultValue($array, $key, $default=NULL) { |
37 | 40 | if (array_key_exists($key, $array)) { |
38 | 41 | return $array[$key]; |
39 | - } else |
|
40 | - return $default; |
|
42 | + } else { |
|
43 | + return $default; |
|
44 | + } |
|
41 | 45 | } |
42 | 46 | |
43 | 47 | public static function implode($glue, $pieces) { |
@@ -84,7 +88,7 @@ discard block |
||
84 | 88 | foreach ($objects as $object){ |
85 | 89 | $result[]=self::callFunction($object, $modelFunction); |
86 | 90 | } |
87 | - }else{ |
|
91 | + } else{ |
|
88 | 92 | foreach ($objects as $object){ |
89 | 93 | $result[self::callFunction($object, $identifierFunction)]=self::callFunction($object, $modelFunction); |
90 | 94 | } |
@@ -93,9 +97,9 @@ discard block |
||
93 | 97 | } |
94 | 98 | |
95 | 99 | private static function callFunction($object,$callback){ |
96 | - if(\is_string($callback)) |
|
97 | - return \call_user_func(array($object, $callback),[]); |
|
98 | - else if (\is_callable($callback)){ |
|
100 | + if(\is_string($callback)) { |
|
101 | + return \call_user_func(array($object, $callback),[]); |
|
102 | + } else if (\is_callable($callback)){ |
|
99 | 103 | return $callback($object); |
100 | 104 | } |
101 | 105 | } |
@@ -5,7 +5,7 @@ discard block |
||
5 | 5 | class JArray { |
6 | 6 | |
7 | 7 | public static function isAssociative($array) { |
8 | - return (array_values($array) !== $array); |
|
8 | + return (array_values($array)!==$array); |
|
9 | 9 | // return (array_keys($array)!==range(0, count($array)-1)); |
10 | 10 | } |
11 | 11 | |
@@ -14,7 +14,7 @@ discard block |
||
14 | 14 | return $array[$key]; |
15 | 15 | } |
16 | 16 | $values=array_values($array); |
17 | - if ($pos < sizeof($values)) |
|
17 | + if ($pos<sizeof($values)) |
|
18 | 18 | return $values[$pos]; |
19 | 19 | } |
20 | 20 | |
@@ -22,12 +22,12 @@ discard block |
||
22 | 22 | $result=NULL; |
23 | 23 | if (array_key_exists($key, $array)) { |
24 | 24 | $result=$array[$key]; |
25 | - if ($condition($result) === true) |
|
25 | + if ($condition($result)===true) |
|
26 | 26 | return $result; |
27 | 27 | } |
28 | 28 | $values=array_values($array); |
29 | - foreach ( $values as $val ) { |
|
30 | - if ($condition($val) === true) |
|
29 | + foreach ($values as $val) { |
|
30 | + if ($condition($val)===true) |
|
31 | 31 | return $val; |
32 | 32 | } |
33 | 33 | return $result; |
@@ -44,11 +44,11 @@ discard block |
||
44 | 44 | $result=""; |
45 | 45 | if (\is_array($glue)) { |
46 | 46 | $size=\sizeof($pieces); |
47 | - if ($size > 0) { |
|
48 | - for($i=0; $i < $size - 1; $i++) { |
|
49 | - $result.=$pieces[$i] . @$glue[$i]; |
|
47 | + if ($size>0) { |
|
48 | + for ($i=0; $i<$size-1; $i++) { |
|
49 | + $result.=$pieces[$i].@$glue[$i]; |
|
50 | 50 | } |
51 | - $result.=$pieces[$size - 1]; |
|
51 | + $result.=$pieces[$size-1]; |
|
52 | 52 | } |
53 | 53 | } else { |
54 | 54 | $result=\implode($glue, $pieces); |
@@ -58,7 +58,7 @@ discard block |
||
58 | 58 | |
59 | 59 | public static function dimension($array) { |
60 | 60 | if (\is_array(reset($array))) { |
61 | - $return=self::dimension(reset($array)) + 1; |
|
61 | + $return=self::dimension(reset($array))+1; |
|
62 | 62 | } else { |
63 | 63 | $return=1; |
64 | 64 | } |
@@ -66,8 +66,8 @@ discard block |
||
66 | 66 | } |
67 | 67 | |
68 | 68 | public static function sortAssociative($array, $sortedKeys=array()) { |
69 | - $newArray=array (); |
|
70 | - foreach ( $sortedKeys as $key ) { |
|
69 | + $newArray=array(); |
|
70 | + foreach ($sortedKeys as $key) { |
|
71 | 71 | if (\array_key_exists($key, $array)) { |
72 | 72 | $newArray[$key]=$array[$key]; |
73 | 73 | } |
@@ -75,27 +75,27 @@ discard block |
||
75 | 75 | return $newArray; |
76 | 76 | } |
77 | 77 | |
78 | - public static function modelArray($objects,$identifierFunction=NULL,$modelFunction=NULL){ |
|
78 | + public static function modelArray($objects, $identifierFunction=NULL, $modelFunction=NULL) { |
|
79 | 79 | $result=[]; |
80 | - if(isset($modelFunction)===false){ |
|
80 | + if (isset($modelFunction)===false) { |
|
81 | 81 | $modelFunction="__toString"; |
82 | 82 | } |
83 | - if(isset($identifierFunction)===false){ |
|
84 | - foreach ($objects as $object){ |
|
83 | + if (isset($identifierFunction)===false) { |
|
84 | + foreach ($objects as $object) { |
|
85 | 85 | $result[]=self::callFunction($object, $modelFunction); |
86 | 86 | } |
87 | - }else{ |
|
88 | - foreach ($objects as $object){ |
|
87 | + } else { |
|
88 | + foreach ($objects as $object) { |
|
89 | 89 | $result[self::callFunction($object, $identifierFunction)]=self::callFunction($object, $modelFunction); |
90 | 90 | } |
91 | 91 | } |
92 | 92 | return $result; |
93 | 93 | } |
94 | 94 | |
95 | - private static function callFunction($object,$callback){ |
|
96 | - if(\is_string($callback)) |
|
97 | - return \call_user_func(array($object, $callback),[]); |
|
98 | - else if (\is_callable($callback)){ |
|
95 | + private static function callFunction($object, $callback) { |
|
96 | + if (\is_string($callback)) |
|
97 | + return \call_user_func(array($object, $callback), []); |
|
98 | + else if (\is_callable($callback)) { |
|
99 | 99 | return $callback($object); |
100 | 100 | } |
101 | 101 | } |