@@ -125,7 +125,7 @@ |
||
125 | 125 | } |
126 | 126 | |
127 | 127 | /** |
128 | - * @param null|\ValidatorInterface $validator |
|
128 | + * @param ValidatorInterface $validator |
|
129 | 129 | * |
130 | 130 | * @return Form |
131 | 131 | */ |
@@ -78,7 +78,7 @@ discard block |
||
78 | 78 | /** |
79 | 79 | * @inheritDoc |
80 | 80 | */ |
81 | - public function getOptions(){ |
|
81 | + public function getOptions() { |
|
82 | 82 | return $this->options; |
83 | 83 | } |
84 | 84 | |
@@ -98,18 +98,18 @@ discard block |
||
98 | 98 | */ |
99 | 99 | public function validate() |
100 | 100 | { |
101 | - if(!$this->validator){ |
|
101 | + if (!$this->validator) { |
|
102 | 102 | return true; |
103 | 103 | } |
104 | 104 | |
105 | - if(null === $this->object){ |
|
105 | + if (null === $this->object) { |
|
106 | 106 | throw new \InvalidArgumentException('Object not bound'); |
107 | 107 | } |
108 | 108 | |
109 | 109 | $validation = $this->validator->isValid($this->object, $_REQUEST); |
110 | 110 | |
111 | - if(!$validation){ |
|
112 | - foreach($this->elements as $fieldName => $field){ |
|
111 | + if (!$validation) { |
|
112 | + foreach ($this->elements as $fieldName => $field) { |
|
113 | 113 | $field->setErrors($this->validator->getError($fieldName)); |
114 | 114 | } |
115 | 115 | } |
@@ -120,7 +120,7 @@ discard block |
||
120 | 120 | /** |
121 | 121 | * @return array|string[] |
122 | 122 | */ |
123 | - public function getErrorMessages(){ |
|
123 | + public function getErrorMessages() { |
|
124 | 124 | return $this->validator->getErrors(); |
125 | 125 | } |
126 | 126 | |
@@ -141,10 +141,10 @@ discard block |
||
141 | 141 | */ |
142 | 142 | public function bind($object) |
143 | 143 | { |
144 | - foreach($this->elements as $element){ |
|
144 | + foreach ($this->elements as $element) { |
|
145 | 145 | $name = $this->camelCase($element->getName()); |
146 | - $methodName = 'get'.$name; |
|
147 | - if(!method_exists($object, $methodName)){ |
|
146 | + $methodName = 'get' . $name; |
|
147 | + if (!method_exists($object, $methodName)) { |
|
148 | 148 | continue; |
149 | 149 | } |
150 | 150 | |
@@ -161,24 +161,24 @@ discard block |
||
161 | 161 | */ |
162 | 162 | public function setData(array $data) |
163 | 163 | { |
164 | - foreach($data as $fieldName => $currentData){ |
|
165 | - if(!key_exists($fieldName, $this->elements) || $this->elements[$fieldName]->isDisabled()){ |
|
164 | + foreach ($data as $fieldName => $currentData) { |
|
165 | + if (!key_exists($fieldName, $this->elements) || $this->elements[$fieldName]->isDisabled()) { |
|
166 | 166 | continue; |
167 | 167 | } |
168 | 168 | |
169 | 169 | $this->elements[$fieldName]->setValue($currentData); |
170 | 170 | |
171 | - $methodName = 'set'.$this->camelCase($fieldName); |
|
172 | - if(null === $this->object){ |
|
171 | + $methodName = 'set' . $this->camelCase($fieldName); |
|
172 | + if (null === $this->object) { |
|
173 | 173 | continue; |
174 | 174 | } |
175 | 175 | |
176 | - if(method_exists($this->object, $methodName)){ |
|
176 | + if (method_exists($this->object, $methodName)) { |
|
177 | 177 | $this->object->{$methodName}($currentData); |
178 | 178 | continue; |
179 | 179 | } |
180 | 180 | |
181 | - if(property_exists($this->object, $fieldName)){ |
|
181 | + if (property_exists($this->object, $fieldName)) { |
|
182 | 182 | $this->object->{$fieldName} = $currentData; |
183 | 183 | continue; |
184 | 184 | } |
@@ -200,7 +200,7 @@ discard block |
||
200 | 200 | */ |
201 | 201 | public function getElement($elementName) |
202 | 202 | { |
203 | - if(!key_exists($elementName, $this->elements)){ |
|
203 | + if (!key_exists($elementName, $this->elements)) { |
|
204 | 204 | throw new \InvalidArgumentException(sprintf('Element %s not found ', $elementName)); |
205 | 205 | } |
206 | 206 |
@@ -109,8 +109,8 @@ |
||
109 | 109 | * |
110 | 110 | * @return array|string[] |
111 | 111 | */ |
112 | - public function getError($field){ |
|
113 | - if(!$this->hasError($field)){ |
|
112 | + public function getError($field) { |
|
113 | + if (!$this->hasError($field)) { |
|
114 | 114 | return []; |
115 | 115 | } |
116 | 116 |
@@ -116,7 +116,7 @@ discard block |
||
116 | 116 | $extralabels = $extrafields->fetch_name_optionals_label($object->table_element); |
117 | 117 | |
118 | 118 | // Load object |
119 | -include DOL_DOCUMENT_ROOT . '/core/actions_fetchobject.inc.php'; // Must be include, not include_once. Include fetch and fetch_thirdparty but not fetch_optionals |
|
119 | +include DOL_DOCUMENT_ROOT . '/core/actions_fetchobject.inc.php'; // Must be include, not include_once. Include fetch and fetch_thirdparty but not fetch_optionals |
|
120 | 120 | include DOL_DOCUMENT_ROOT . '/core/actions_dellink.inc.php'; |
121 | 121 | |
122 | 122 | // Initialize technical object to manage hooks of modules. Note that conf->hooks_modules contains array array |
@@ -145,7 +145,7 @@ discard block |
||
145 | 145 | |
146 | 146 | $parameters = array(); |
147 | 147 | $reshook = $hookmanager->executeHooks('doActions', $parameters, $object, |
148 | - $action); // Note that $action and $object may have been modified by some hooks |
|
148 | + $action); // Note that $action and $object may have been modified by some hooks |
|
149 | 149 | if ($reshook < 0) { |
150 | 150 | setEventMessages($hookmanager->error, $hookmanager->errors, 'errors'); |
151 | 151 | } |
@@ -286,7 +286,7 @@ discard block |
||
286 | 286 | |
287 | 287 | <tr> |
288 | 288 | <td class="fieldrequired"> Pilote </td> |
289 | - <td><?php echo $renderer->render($formFlight->getElement('fk_pilot'),['ajax' => true]); ?></td> |
|
289 | + <td><?php echo $renderer->render($formFlight->getElement('fk_pilot'), ['ajax' => true]); ?></td> |
|
290 | 290 | </tr> |
291 | 291 | |
292 | 292 | <tr> |
@@ -332,7 +332,7 @@ discard block |
||
332 | 332 | <td> |
333 | 333 | <?php |
334 | 334 | //organisateur |
335 | - print $renderer->render($formFlight->getElement('fk_organisateur'),['ajax' => true]); |
|
335 | + print $renderer->render($formFlight->getElement('fk_organisateur'), ['ajax' => true]); |
|
336 | 336 | ?> |
337 | 337 | </td> |
338 | 338 | </tr> |
@@ -395,7 +395,7 @@ discard block |
||
395 | 395 | <tr class="js-hide-order js-billable-field"> |
396 | 396 | <td class="fieldrequired"><?php echo $langs->trans('Qui a perçu l\'argent') ?></td> |
397 | 397 | <td> |
398 | - <?php print $renderer->render($formFlight->getElement('fk_receiver'),['ajax' => true]); ?> |
|
398 | + <?php print $renderer->render($formFlight->getElement('fk_receiver'), ['ajax' => true]); ?> |
|
399 | 399 | </td> |
400 | 400 | </tr> |
401 | 401 | |
@@ -485,7 +485,7 @@ discard block |
||
485 | 485 | print '<div class="tabsAction">' . "\n"; |
486 | 486 | $parameters = array(); |
487 | 487 | $reshook = $hookmanager->executeHooks('addMoreActionsButtons', $parameters, $object, |
488 | - $action); // Note that $action and $object may have been modified by hook |
|
488 | + $action); // Note that $action and $object may have been modified by hook |
|
489 | 489 | if ($reshook < 0) { |
490 | 490 | setEventMessages($hookmanager->error, $hookmanager->errors, 'errors'); |
491 | 491 | } |
@@ -51,7 +51,7 @@ discard block |
||
51 | 51 | * |
52 | 52 | * @return $this |
53 | 53 | */ |
54 | - public function addValueOption($key, $value){ |
|
54 | + public function addValueOption($key, $value) { |
|
55 | 55 | $this->valueOptions[$key] = $value; |
56 | 56 | return $this; |
57 | 57 | } |
@@ -63,7 +63,7 @@ discard block |
||
63 | 63 | { |
64 | 64 | parent::setValue($value); |
65 | 65 | |
66 | - if(!isset($this->valueOptions[$value])){ |
|
66 | + if (!isset($this->valueOptions[$value])) { |
|
67 | 67 | $this->valueOptions[$value] = empty($value) ? ' ' : $value; |
68 | 68 | } |
69 | 69 | } |
@@ -31,12 +31,12 @@ |
||
31 | 31 | private function buildOptions() |
32 | 32 | { |
33 | 33 | $sql = "SELECT"; |
34 | - $sql.= " t.rowid,"; |
|
35 | - $sql.= " t.immat,"; |
|
36 | - $sql.= " t.is_disable"; |
|
37 | - $sql.= " FROM llx_bbc_ballons as t"; |
|
38 | - $sql.= " WHERE t.is_disable = 0"; |
|
39 | - $sql.= " ORDER BY t.immat"; |
|
34 | + $sql .= " t.rowid,"; |
|
35 | + $sql .= " t.immat,"; |
|
36 | + $sql .= " t.is_disable"; |
|
37 | + $sql .= " FROM llx_bbc_ballons as t"; |
|
38 | + $sql .= " WHERE t.is_disable = 0"; |
|
39 | + $sql .= " ORDER BY t.immat"; |
|
40 | 40 | |
41 | 41 | $resql = $this->db->query($sql); |
42 | 42 | if ($resql) { |
@@ -79,7 +79,7 @@ discard block |
||
79 | 79 | /** |
80 | 80 | * @inheritdoc |
81 | 81 | */ |
82 | - public function getId(){ |
|
82 | + public function getId() { |
|
83 | 83 | return $this->getOption('id') ?: $this->getName(); |
84 | 84 | } |
85 | 85 | |
@@ -115,7 +115,7 @@ discard block |
||
115 | 115 | /** |
116 | 116 | * @return $this |
117 | 117 | */ |
118 | - public function required(){ |
|
118 | + public function required() { |
|
119 | 119 | $this->options['attr']['required'] = 'required'; |
120 | 120 | |
121 | 121 | return $this; |
@@ -124,7 +124,7 @@ discard block |
||
124 | 124 | /** |
125 | 125 | * @return $this |
126 | 126 | */ |
127 | - public function disable(){ |
|
127 | + public function disable() { |
|
128 | 128 | $this->options['attr']['disabled'] = 'disabled'; |
129 | 129 | return $this; |
130 | 130 | } |
@@ -132,7 +132,7 @@ discard block |
||
132 | 132 | /** |
133 | 133 | * @inheritdoc |
134 | 134 | */ |
135 | - public function isDisabled(){ |
|
135 | + public function isDisabled() { |
|
136 | 136 | return isset($this->options['attr']['disabled']); |
137 | 137 | } |
138 | 138 | |
@@ -141,8 +141,8 @@ discard block |
||
141 | 141 | * |
142 | 142 | * @return string|int|boolean|null |
143 | 143 | */ |
144 | - public function getOption($option){ |
|
145 | - if(!isset($this->options[$option])){ |
|
144 | + public function getOption($option) { |
|
145 | + if (!isset($this->options[$option])) { |
|
146 | 146 | return null; |
147 | 147 | } |
148 | 148 |
@@ -70,7 +70,7 @@ discard block |
||
70 | 70 | $select = $element; |
71 | 71 | $html = $this->renderSelectElement($select); |
72 | 72 | |
73 | - if(isset($options['ajax']) && $options['ajax']){ |
|
73 | + if (isset($options['ajax']) && $options['ajax']) { |
|
74 | 74 | $html .= ajax_combobox($element->getName()); |
75 | 75 | } |
76 | 76 | |
@@ -79,7 +79,7 @@ discard block |
||
79 | 79 | default: |
80 | 80 | return sprintf('<input type="%s" class="%s" name="%s" value="%s" %s />', |
81 | 81 | $element->getType(), |
82 | - ' flat '.($element->hasError() ? 'error' : ''), |
|
82 | + ' flat ' . ($element->hasError() ? 'error' : ''), |
|
83 | 83 | $element->getName(), |
84 | 84 | $element->getValue(), |
85 | 85 | $this->formatOptions($element->getOptions()) |
@@ -119,7 +119,7 @@ discard block |
||
119 | 119 | */ |
120 | 120 | private function renderSelectElement(Select $element) |
121 | 121 | { |
122 | - $selectElement = sprintf('<select id="%s" class="%s" name="%s" >', $element->getId(),$element->hasError() ? 'error' : '', $element->getName()); |
|
122 | + $selectElement = sprintf('<select id="%s" class="%s" name="%s" >', $element->getId(), $element->hasError() ? 'error' : '', $element->getName()); |
|
123 | 123 | |
124 | 124 | if ($element->getValueOptions()) { |
125 | 125 | foreach ($element->getValueOptions() as $optionValue => $optionLabel) { |