@@ -79,13 +79,13 @@ |
||
79 | 79 | 'name' => [ |
80 | 80 | 'required' => true, |
81 | 81 | 'filters' => [ |
82 | - [ 'name' => 'StringTrim' ], |
|
82 | + ['name' => 'StringTrim'], |
|
83 | 83 | ], |
84 | 84 | ], |
85 | 85 | 'value' => [ |
86 | 86 | 'required' => false, |
87 | 87 | 'filters' => [ |
88 | - [ 'name' => 'StringTrim' ], |
|
88 | + ['name' => 'StringTrim'], |
|
89 | 89 | ], |
90 | 90 | ], |
91 | 91 | ]; |
@@ -35,7 +35,7 @@ |
||
35 | 35 | * |
36 | 36 | * @var array |
37 | 37 | */ |
38 | - protected $scripts = [ '/js/html.sortable.min.js', 'Core/js/forms.tree-management.js' ]; |
|
38 | + protected $scripts = ['/js/html.sortable.min.js', 'Core/js/forms.tree-management.js']; |
|
39 | 39 | |
40 | 40 | /** |
41 | 41 | * Attributes. |
@@ -38,14 +38,14 @@ |
||
38 | 38 | |
39 | 39 | $globalConfigPaths = []; |
40 | 40 | foreach ($config['config_glob_paths'] as $path) { |
41 | - $globalConfigPaths[] = substr($path, 0, strrpos($path, DIRECTORY_SEPARATOR)) . DIRECTORY_SEPARATOR; |
|
41 | + $globalConfigPaths[] = substr($path, 0, strrpos($path, DIRECTORY_SEPARATOR)).DIRECTORY_SEPARATOR; |
|
42 | 42 | } |
43 | 43 | |
44 | 44 | $moduleConfigPath = '.'; |
45 | 45 | foreach ($config['module_paths'] as $path) { |
46 | - $path = rtrim($path, DIRECTORY_SEPARATOR) . DIRECTORY_SEPARATOR; |
|
47 | - if (file_exists($path . 'Jobs')) { |
|
48 | - $moduleConfigPath = $path . 'Jobs' . DIRECTORY_SEPARATOR . 'config' . DIRECTORY_SEPARATOR; |
|
46 | + $path = rtrim($path, DIRECTORY_SEPARATOR).DIRECTORY_SEPARATOR; |
|
47 | + if (file_exists($path.'Jobs')) { |
|
48 | + $moduleConfigPath = $path.'Jobs'.DIRECTORY_SEPARATOR.'config'.DIRECTORY_SEPARATOR; |
|
49 | 49 | break; |
50 | 50 | } |
51 | 51 | } |
@@ -67,13 +67,13 @@ |
||
67 | 67 | $file = "jobs.categories.$type.php"; |
68 | 68 | |
69 | 69 | foreach ($this->globalConfigPaths as $path) { |
70 | - if (file_exists($path . $file)) { |
|
71 | - return include $path . $file; |
|
70 | + if (file_exists($path.$file)) { |
|
71 | + return include $path.$file; |
|
72 | 72 | } |
73 | 73 | } |
74 | 74 | |
75 | - if (file_exists($this->moduleConfigPath . $file)) { |
|
76 | - return include $this->moduleConfigPath . $file; |
|
75 | + if (file_exists($this->moduleConfigPath.$file)) { |
|
76 | + return include $this->moduleConfigPath.$file; |
|
77 | 77 | } |
78 | 78 | |
79 | 79 | return false; |
@@ -110,7 +110,6 @@ |
||
110 | 110 | * @see \Core\Controller\Plugin\SearchForm::get() |
111 | 111 | * |
112 | 112 | * @param $elementsFieldset |
113 | - * @param null $buttonsFieldset |
|
114 | 113 | * @param string $as The name of the key in the result array. |
115 | 114 | * |
116 | 115 | * @return self |
@@ -70,7 +70,7 @@ discard block |
||
70 | 70 | } |
71 | 71 | |
72 | 72 | if (!is_array($stack)) { |
73 | - throw new \InvalidArgumentException('Expected argument to be of type array, but received ' . gettype($stack)); |
|
73 | + throw new \InvalidArgumentException('Expected argument to be of type array, but received '.gettype($stack)); |
|
74 | 74 | } |
75 | 75 | |
76 | 76 | $stack = array_intersect_key($stack, ['params' => true, 'form' => true, 'paginator' => true]); |
@@ -143,7 +143,7 @@ discard block |
||
143 | 143 | * |
144 | 144 | * @return self |
145 | 145 | */ |
146 | - public function params($namespace, $defaults = [ 'page' => 1 ]) |
|
146 | + public function params($namespace, $defaults = ['page' => 1]) |
|
147 | 147 | { |
148 | 148 | $this->stack['params'] = [$namespace, $defaults]; |
149 | 149 | return $this; |
@@ -83,6 +83,11 @@ |
||
83 | 83 | return $content; |
84 | 84 | } |
85 | 85 | |
86 | + /** |
|
87 | + * @param FormInterface $form |
|
88 | + * |
|
89 | + * @return null|FormInterface |
|
90 | + */ |
|
86 | 91 | public function renderElements($form, $colMap = null, $buttonsSpan = null) |
87 | 92 | { |
88 | 93 | if ($form instanceOf ViewPartialProviderInterface) { |
@@ -66,8 +66,8 @@ discard block |
||
66 | 66 | $content = $this->renderElements($form, $colMap, $buttonsSpan); |
67 | 67 | |
68 | 68 | return $this->openTag($form) |
69 | - . '<div class="row" style="padding: 0 15px;">' |
|
70 | - . $content . '</div>' . $this->closeTag(); |
|
69 | + . '<div class="row" style="padding: 0 15px;">' |
|
70 | + . $content . '</div>' . $this->closeTag(); |
|
71 | 71 | |
72 | 72 | } |
73 | 73 | |
@@ -109,15 +109,15 @@ discard block |
||
109 | 109 | |
110 | 110 | if ($element->getName() == $form->getButtonElement()) { |
111 | 111 | $content.='<div class="input-group col-md-' . $cols . '">' |
112 | - . $formElement($element) |
|
113 | - . '<div class="input-group-btn search-form-buttons" style="width: 1px;">' |
|
114 | - . $this->renderButtons($form->getButtons()) . '</div>' |
|
115 | - . '</div>'; |
|
112 | + . $formElement($element) |
|
113 | + . '<div class="input-group-btn search-form-buttons" style="width: 1px;">' |
|
114 | + . $this->renderButtons($form->getButtons()) . '</div>' |
|
115 | + . '</div>'; |
|
116 | 116 | $buttonsRendered = true; |
117 | 117 | } else { |
118 | 118 | $content .= '<div class="input-group col-md-' . $cols . '">' |
119 | - . $formElement($element) |
|
120 | - . '</div>'; |
|
119 | + . $formElement($element) |
|
120 | + . '</div>'; |
|
121 | 121 | } |
122 | 122 | |
123 | 123 | $i += 1; |
@@ -128,7 +128,7 @@ discard block |
||
128 | 128 | $buttonsSpan = $form->getOption('buttons_span') ?: 12; |
129 | 129 | } |
130 | 130 | $content .= '<div class="input-group search-form-buttons col-md-' . $buttonsSpan . ' text-right">' |
131 | - . '<div class="btn-group">' . $this->renderButtons($form->getButtons()) .'</div></div>'; |
|
131 | + . '<div class="btn-group">' . $this->renderButtons($form->getButtons()) .'</div></div>'; |
|
132 | 132 | } |
133 | 133 | |
134 | 134 | return $content; |
@@ -34,7 +34,7 @@ discard block |
||
34 | 34 | * @param array $colMap |
35 | 35 | * @return Form|string |
36 | 36 | */ |
37 | - public function __invoke(FormInterface $form = null, $colMap=null) |
|
37 | + public function __invoke(FormInterface $form = null, $colMap = null) |
|
38 | 38 | { |
39 | 39 | if (!$form) { |
40 | 40 | return $this; |
@@ -43,7 +43,7 @@ discard block |
||
43 | 43 | return $this->render($form, $colMap); |
44 | 44 | } |
45 | 45 | |
46 | - public function render(FormInterface $form, $colMap=null, $buttonsSpan = null) |
|
46 | + public function render(FormInterface $form, $colMap = null, $buttonsSpan = null) |
|
47 | 47 | { |
48 | 48 | $headscript = $this->getView()->plugin('headscript'); |
49 | 49 | $basepath = $this->getView()->plugin('basepath'); |
@@ -60,14 +60,14 @@ discard block |
||
60 | 60 | $form->prepare(); |
61 | 61 | |
62 | 62 | if ($form instanceOf ViewPartialProviderInterface) { |
63 | - return $this->getView()->partial($form->getViewPartial(), [ 'element' => $form, 'colMap' => $colMap, 'buttonsSpan' => $buttonsSpan ]); |
|
63 | + return $this->getView()->partial($form->getViewPartial(), ['element' => $form, 'colMap' => $colMap, 'buttonsSpan' => $buttonsSpan]); |
|
64 | 64 | } |
65 | 65 | |
66 | 66 | $content = $this->renderElements($form, $colMap, $buttonsSpan); |
67 | 67 | |
68 | 68 | return $this->openTag($form) |
69 | 69 | . '<div class="row" style="padding: 0 15px;">' |
70 | - . $content . '</div>' . $this->closeTag(); |
|
70 | + . $content.'</div>'.$this->closeTag(); |
|
71 | 71 | |
72 | 72 | } |
73 | 73 | |
@@ -77,7 +77,7 @@ discard block |
||
77 | 77 | |
78 | 78 | $content = ''; |
79 | 79 | foreach ($buttons as $button) { |
80 | - $content.= $helper($button); |
|
80 | + $content .= $helper($button); |
|
81 | 81 | } |
82 | 82 | |
83 | 83 | return $content; |
@@ -86,7 +86,7 @@ discard block |
||
86 | 86 | public function renderElements($form, $colMap = null, $buttonsSpan = null) |
87 | 87 | { |
88 | 88 | if ($form instanceOf ViewPartialProviderInterface) { |
89 | - return $this->getView()->partial($form->getViewPartial(), [ 'element' => $form, 'colMap' => $colMap, 'buttonsSpan' => $buttonsSpan ]); |
|
89 | + return $this->getView()->partial($form->getViewPartial(), ['element' => $form, 'colMap' => $colMap, 'buttonsSpan' => $buttonsSpan]); |
|
90 | 90 | } |
91 | 91 | |
92 | 92 | if (null === $colMap) { |
@@ -94,7 +94,7 @@ discard block |
||
94 | 94 | } |
95 | 95 | |
96 | 96 | $formElement = $this->getView()->plugin('formElement'); |
97 | - $content = ''; $buttonsRendered = false; $i=0; |
|
97 | + $content = ''; $buttonsRendered = false; $i = 0; |
|
98 | 98 | foreach ($form as $element) { |
99 | 99 | |
100 | 100 | if (isset($colMap[$element->getName()])) { |
@@ -108,14 +108,14 @@ discard block |
||
108 | 108 | } |
109 | 109 | |
110 | 110 | if ($element->getName() == $form->getButtonElement()) { |
111 | - $content.='<div class="input-group col-md-' . $cols . '">' |
|
111 | + $content .= '<div class="input-group col-md-'.$cols.'">' |
|
112 | 112 | . $formElement($element) |
113 | 113 | . '<div class="input-group-btn search-form-buttons" style="width: 1px;">' |
114 | - . $this->renderButtons($form->getButtons()) . '</div>' |
|
114 | + . $this->renderButtons($form->getButtons()).'</div>' |
|
115 | 115 | . '</div>'; |
116 | 116 | $buttonsRendered = true; |
117 | 117 | } else { |
118 | - $content .= '<div class="input-group col-md-' . $cols . '">' |
|
118 | + $content .= '<div class="input-group col-md-'.$cols.'">' |
|
119 | 119 | . $formElement($element) |
120 | 120 | . '</div>'; |
121 | 121 | } |
@@ -127,8 +127,8 @@ discard block |
||
127 | 127 | if (null === $buttonsSpan) { |
128 | 128 | $buttonsSpan = $form->getOption('buttons_span') ?: 12; |
129 | 129 | } |
130 | - $content .= '<div class="input-group search-form-buttons col-md-' . $buttonsSpan . ' text-right">' |
|
131 | - . '<div class="btn-group">' . $this->renderButtons($form->getButtons()) .'</div></div>'; |
|
130 | + $content .= '<div class="input-group search-form-buttons col-md-'.$buttonsSpan.' text-right">' |
|
131 | + . '<div class="btn-group">'.$this->renderButtons($form->getButtons()).'</div></div>'; |
|
132 | 132 | } |
133 | 133 | |
134 | 134 | return $content; |
@@ -167,7 +167,7 @@ |
||
167 | 167 | 'label' => $label, |
168 | 168 | ], |
169 | 169 | 'attributes' => [ |
170 | - 'class' => 'btn btn-' . ('submit' == $type ? 'primary' : 'default'), |
|
170 | + 'class' => 'btn btn-'.('submit' == $type ? 'primary' : 'default'), |
|
171 | 171 | 'type' => $type, |
172 | 172 | ], |
173 | 173 | ] |
@@ -47,6 +47,9 @@ discard block |
||
47 | 47 | $this->buttonsIterator->isLIFO(false); |
48 | 48 | } |
49 | 49 | |
50 | + /** |
|
51 | + * @param string $name |
|
52 | + */ |
|
50 | 53 | public function setButtonElement($name) |
51 | 54 | { |
52 | 55 | return $this->setOption('button_element', $name); |
@@ -182,6 +185,9 @@ discard block |
||
182 | 185 | return $this->buttonsIterator; |
183 | 186 | } |
184 | 187 | |
188 | + /** |
|
189 | + * @param string $name |
|
190 | + */ |
|
185 | 191 | public function addButton($name, $priority = 0, $type = 'button') |
186 | 192 | { |
187 | 193 | if (is_array($name)) { |
@@ -23,7 +23,7 @@ |
||
23 | 23 | { |
24 | 24 | /** |
25 | 25 | * @param $data |
26 | - * @return mixed |
|
26 | + * @return Snapshot |
|
27 | 27 | * @ODM\PreUpdate |
28 | 28 | */ |
29 | 29 | public function __invoke($data) |
@@ -124,7 +124,7 @@ discard block |
||
124 | 124 | * |
125 | 125 | * @param string $name |
126 | 126 | * @param mixed $value |
127 | - * @return ViewModel |
|
127 | + * @return HTMLTemplateMessage |
|
128 | 128 | */ |
129 | 129 | public function setVariable($name, $value) |
130 | 130 | { |
@@ -185,7 +185,7 @@ discard block |
||
185 | 185 | * |
186 | 186 | * Resets the internal variable container to an empty container. |
187 | 187 | * |
188 | - * @return ViewModel |
|
188 | + * @return HTMLTemplateMessage |
|
189 | 189 | */ |
190 | 190 | public function clearVariables() |
191 | 191 | { |
@@ -195,7 +195,7 @@ discard block |
||
195 | 195 | |
196 | 196 | /** |
197 | 197 | * |
198 | - * @param $template |
|
198 | + * @param string $template |
|
199 | 199 | * |
200 | 200 | * @return self |
201 | 201 | */ |
@@ -205,6 +205,9 @@ discard block |
||
205 | 205 | return $this; |
206 | 206 | } |
207 | 207 | |
208 | + /** |
|
209 | + * @return string |
|
210 | + */ |
|
208 | 211 | public function getTemplate() |
209 | 212 | { |
210 | 213 | return $this->template; |
@@ -239,7 +239,7 @@ |
||
239 | 239 | |
240 | 240 | if ($resolver->resolve($this->getTemplate() . '.' . $lang)) { |
241 | 241 | $viewModel->setTemplate($this->getTemplate() . '.' . $lang); |
242 | - }else{ |
|
242 | + } else{ |
|
243 | 243 | $viewModel->setTemplate($this->getTemplate()); |
244 | 244 | } |
245 | 245 |
@@ -220,7 +220,7 @@ discard block |
||
220 | 220 | */ |
221 | 221 | public function renderBodyText($force = true, $forceLanguage = null) |
222 | 222 | { |
223 | - if (!$this->renderedBody || $force ) { |
|
223 | + if (!$this->renderedBody || $force) { |
|
224 | 224 | $viewModel = new ViewModel(); |
225 | 225 | $response = new Response(); |
226 | 226 | $body = parent::getBodyText(); |
@@ -229,7 +229,7 @@ discard block |
||
229 | 229 | } |
230 | 230 | |
231 | 231 | /* @var \Zend\Mvc\View\Http\ViewManager $viewManager */ |
232 | - $viewManager = $this->serviceManager->get('viewManager'); |
|
232 | + $viewManager = $this->serviceManager->get('viewManager'); |
|
233 | 233 | $resolver = $this->serviceManager->get('viewResolver'); |
234 | 234 | |
235 | 235 | /* @var \Zend\Mvc\MvcEvent $event */ |
@@ -237,13 +237,13 @@ discard block |
||
237 | 237 | $lang = $forceLanguage ?: $event->getRouteMatch()->getParam('lang'); |
238 | 238 | |
239 | 239 | |
240 | - if ($resolver->resolve($this->getTemplate() . '.' . $lang)) { |
|
241 | - $viewModel->setTemplate($this->getTemplate() . '.' . $lang); |
|
242 | - }else{ |
|
240 | + if ($resolver->resolve($this->getTemplate().'.'.$lang)) { |
|
241 | + $viewModel->setTemplate($this->getTemplate().'.'.$lang); |
|
242 | + } else { |
|
243 | 243 | $viewModel->setTemplate($this->getTemplate()); |
244 | 244 | } |
245 | 245 | |
246 | - $view = $viewManager->getView(); |
|
246 | + $view = $viewManager->getView(); |
|
247 | 247 | |
248 | 248 | $viewModel->setVariables($this->getVariables()); |
249 | 249 | $viewModel->setVariable('mail', $this); |