@@ -31,7 +31,7 @@ |
||
31 | 31 | */ |
32 | 32 | public function __construct(LoginFilterService $loginFilter) |
33 | 33 | { |
34 | - $this->loginFilter = $loginFilter;; |
|
34 | + $this->loginFilter = $loginFilter; ; |
|
35 | 35 | } |
36 | 36 | |
37 | 37 | /** |
@@ -56,6 +56,6 @@ |
||
56 | 56 | $form = new static(); |
57 | 57 | $form->forms = $forms; |
58 | 58 | |
59 | - return $form; |
|
59 | + return $form; |
|
60 | 60 | } |
61 | 61 | } |
@@ -57,7 +57,7 @@ |
||
57 | 57 | protected function filterArrayStrings($array, $search, $replace) |
58 | 58 | { |
59 | 59 | $return = array(); |
60 | - foreach ((array)$array as $key => $value) { |
|
60 | + foreach ((array) $array as $key => $value) { |
|
61 | 61 | $key = str_replace($search, $replace, $key); |
62 | 62 | $value = is_array($value) |
63 | 63 | ? $this->filterArrayStrings($value, $search, $replace) |
@@ -128,6 +128,6 @@ |
||
128 | 128 | |
129 | 129 | $pointer = $this->pointer + 1; |
130 | 130 | |
131 | - return isset($this->ids[$pointer]) ? $this->ids[$pointer] : null; |
|
131 | + return isset($this->ids[$pointer]) ? $this->ids[$pointer] : null; |
|
132 | 132 | } |
133 | 133 | } |
@@ -381,7 +381,6 @@ |
||
381 | 381 | } |
382 | 382 | |
383 | 383 | /** |
384 | - * @param mixed $element |
|
385 | 384 | * @return mixed |
386 | 385 | */ |
387 | 386 | protected function getElement($key) |
@@ -25,7 +25,7 @@ discard block |
||
25 | 25 | */ |
26 | 26 | protected $identityExtractor; |
27 | 27 | |
28 | - /** |
|
28 | + /** |
|
29 | 29 | * @param Collection $collection |
30 | 30 | */ |
31 | 31 | public function __construct(Collection $collection) |
@@ -81,7 +81,7 @@ discard block |
||
81 | 81 | $element = $this->getElement($key); |
82 | 82 | |
83 | 83 | if ($element !== false && $this->collection->removeElement($element)) { |
84 | - return $element; |
|
84 | + return $element; |
|
85 | 85 | } |
86 | 86 | } |
87 | 87 | |
@@ -108,7 +108,7 @@ discard block |
||
108 | 108 | { |
109 | 109 | $element = $this->getElement($key); |
110 | 110 | |
111 | - return $element !== false ? $element : null; |
|
111 | + return $element !== false ? $element : null; |
|
112 | 112 | } |
113 | 113 | |
114 | 114 | /** |
@@ -184,7 +184,7 @@ discard block |
||
184 | 184 | |
185 | 185 | if ($element !== false) |
186 | 186 | { |
187 | - return $this->getKey($element); |
|
187 | + return $this->getKey($element); |
|
188 | 188 | } |
189 | 189 | } |
190 | 190 | |
@@ -252,7 +252,7 @@ discard block |
||
252 | 252 | // validate mapped elements |
253 | 253 | array_map($this->getIdentityExtractor(), $mapped->toArray()); |
254 | 254 | |
255 | - return new static($mapped); |
|
255 | + return new static($mapped); |
|
256 | 256 | } |
257 | 257 | |
258 | 258 | /** |
@@ -341,15 +341,15 @@ discard block |
||
341 | 341 | } |
342 | 342 | |
343 | 343 | /** |
344 | - * @param callable $identityExtractor |
|
345 | - * @return IdentityWrapper |
|
346 | - */ |
|
347 | - public function setIdentityExtractor(callable $identityExtractor) |
|
348 | - { |
|
349 | - $this->identityExtractor = $identityExtractor; |
|
344 | + * @param callable $identityExtractor |
|
345 | + * @return IdentityWrapper |
|
346 | + */ |
|
347 | + public function setIdentityExtractor(callable $identityExtractor) |
|
348 | + { |
|
349 | + $this->identityExtractor = $identityExtractor; |
|
350 | 350 | |
351 | - return $this; |
|
352 | - } |
|
351 | + return $this; |
|
352 | + } |
|
353 | 353 | |
354 | 354 | /** |
355 | 355 | * |
@@ -371,23 +371,23 @@ discard block |
||
371 | 371 | return $this->identityExtractor; |
372 | 372 | } |
373 | 373 | |
374 | - /** |
|
375 | - * @param mixed $element |
|
376 | - * @return mixed |
|
377 | - */ |
|
378 | - protected function getKey($element) |
|
379 | - { |
|
380 | - return call_user_func($this->getIdentityExtractor(), $element); |
|
381 | - } |
|
374 | + /** |
|
375 | + * @param mixed $element |
|
376 | + * @return mixed |
|
377 | + */ |
|
378 | + protected function getKey($element) |
|
379 | + { |
|
380 | + return call_user_func($this->getIdentityExtractor(), $element); |
|
381 | + } |
|
382 | 382 | |
383 | - /** |
|
384 | - * @param mixed $element |
|
385 | - * @return mixed |
|
386 | - */ |
|
387 | - protected function getElement($key) |
|
388 | - { |
|
389 | - return $this->collection->filter(function ($element) use ($key) { |
|
390 | - return $this->getKey($element) == $key; |
|
391 | - })->first(); |
|
392 | - } |
|
383 | + /** |
|
384 | + * @param mixed $element |
|
385 | + * @return mixed |
|
386 | + */ |
|
387 | + protected function getElement($key) |
|
388 | + { |
|
389 | + return $this->collection->filter(function ($element) use ($key) { |
|
390 | + return $this->getKey($element) == $key; |
|
391 | + })->first(); |
|
392 | + } |
|
393 | 393 | } |
@@ -116,7 +116,7 @@ discard block |
||
116 | 116 | */ |
117 | 117 | public function getKeys() |
118 | 118 | { |
119 | - return $this->collection->map(function ($element) { |
|
119 | + return $this->collection->map(function($element) { |
|
120 | 120 | return $this->getKey($element); |
121 | 121 | })->toArray(); |
122 | 122 | } |
@@ -309,7 +309,7 @@ discard block |
||
309 | 309 | */ |
310 | 310 | public function offsetExists($offset) |
311 | 311 | { |
312 | - return (bool)$this->getElement($offset); |
|
312 | + return (bool) $this->getElement($offset); |
|
313 | 313 | } |
314 | 314 | |
315 | 315 | /** |
@@ -359,7 +359,7 @@ discard block |
||
359 | 359 | { |
360 | 360 | if (!isset($this->identityExtractor)) { |
361 | 361 | // default identity extractor |
362 | - $this->identityExtractor = function ($element) { |
|
362 | + $this->identityExtractor = function($element) { |
|
363 | 363 | if (!is_callable([$element, 'getId'])) { |
364 | 364 | throw new \LogicException('$element must have getId() method'); |
365 | 365 | } |
@@ -386,7 +386,7 @@ discard block |
||
386 | 386 | */ |
387 | 387 | protected function getElement($key) |
388 | 388 | { |
389 | - return $this->collection->filter(function ($element) use ($key) { |
|
389 | + return $this->collection->filter(function($element) use ($key) { |
|
390 | 390 | return $this->getKey($element) == $key; |
391 | 391 | })->first(); |
392 | 392 | } |
@@ -137,8 +137,7 @@ |
||
137 | 137 | if ($this->getElement($key) !== false) |
138 | 138 | { |
139 | 139 | $this->collection->set($this->collection->indexOf($value), $value); |
140 | - } |
|
141 | - else |
|
140 | + } else |
|
142 | 141 | { |
143 | 142 | $this->collection->add($value); |
144 | 143 | } |
@@ -179,7 +179,7 @@ |
||
179 | 179 | |
180 | 180 | /** |
181 | 181 | * @throws \RuntimeException |
182 | - * @return Collection |
|
182 | + * @return \Core\Entity\EntityInterface |
|
183 | 183 | */ |
184 | 184 | protected function getCollection() |
185 | 185 | { |
@@ -80,12 +80,12 @@ |
||
80 | 80 | $collection[] = $this->newEntry; |
81 | 81 | $form = $this->buildForm($key, $this->newEntry); |
82 | 82 | $eventManager = $form->getEventManager(); |
83 | - $eventManager->attach(CoreForm::EVENT_IS_VALID, function (Event $event) use ($collection) { |
|
83 | + $eventManager->attach(CoreForm::EVENT_IS_VALID, function(Event $event) use ($collection) { |
|
84 | 84 | if (!$event->getParam('isValid')) { |
85 | 85 | $collection->removeElement($this->newEntry); |
86 | 86 | } |
87 | 87 | }); |
88 | - $eventManager->attach(CoreForm::EVENT_PREPARE, function (Event $event) use ($collection) { |
|
88 | + $eventManager->attach(CoreForm::EVENT_PREPARE, function(Event $event) use ($collection) { |
|
89 | 89 | $this->setupForm($event->getTarget(), $collection->indexOf($this->newEntry)); |
90 | 90 | }); |
91 | 91 |
@@ -80,12 +80,12 @@ discard block |
||
80 | 80 | $collection[] = $this->newEntry; |
81 | 81 | $form = $this->buildForm($key, $this->newEntry); |
82 | 82 | $eventManager = $form->getEventManager(); |
83 | - $eventManager->attach(CoreForm::EVENT_IS_VALID, function (Event $event) use ($collection) { |
|
83 | + $eventManager->attach(CoreForm::EVENT_IS_VALID, function (Event $event) use ($collection) { |
|
84 | 84 | if (!$event->getParam('isValid')) { |
85 | 85 | $collection->removeElement($this->newEntry); |
86 | 86 | } |
87 | 87 | }); |
88 | - $eventManager->attach(CoreForm::EVENT_PREPARE, function (Event $event) use ($collection) { |
|
88 | + $eventManager->attach(CoreForm::EVENT_PREPARE, function (Event $event) use ($collection) { |
|
89 | 89 | $this->setupForm($event->getTarget(), $collection->indexOf($this->newEntry)); |
90 | 90 | }); |
91 | 91 | |
@@ -117,7 +117,7 @@ discard block |
||
117 | 117 | } |
118 | 118 | } |
119 | 119 | |
120 | - /** |
|
120 | + /** |
|
121 | 121 | * @see \Core\Form\Element\ViewHelperProviderInterface::getViewHelper() |
122 | 122 | */ |
123 | 123 | public function getViewHelper() |
@@ -221,7 +221,7 @@ discard block |
||
221 | 221 | */ |
222 | 222 | protected function setupForm(CoreForm $form, $key) |
223 | 223 | { |
224 | - $form->setAttribute('action', sprintf('?form=%s', $this->formatAction($key))) |
|
224 | + $form->setAttribute('action', sprintf('?form=%s', $this->formatAction($key))) |
|
225 | 225 | ->setAttribute('data-entry-key', $key) |
226 | 226 | ->setOption('control_buttons', [[ |
227 | 227 | 'class' => 'btn-danger form-collection-container-remove-button', |
@@ -55,8 +55,8 @@ |
||
55 | 55 | { |
56 | 56 | /* @var $options \Applications\Options\ModuleOptions */ |
57 | 57 | $form->get($this->fileName)->setViewHelper('FormImageUpload') |
58 | - ->setMaxSize($options->getContactImageMaxSize()) |
|
59 | - ->setAllowedTypes($options->getContactImageMimeType()) |
|
60 | - ->setForm($form); |
|
58 | + ->setMaxSize($options->getContactImageMaxSize()) |
|
59 | + ->setAllowedTypes($options->getContactImageMimeType()) |
|
60 | + ->setForm($form); |
|
61 | 61 | } |
62 | 62 | } |
@@ -33,7 +33,7 @@ |
||
33 | 33 | */ |
34 | 34 | public function getUri() |
35 | 35 | { |
36 | - return "/file/Cv.ContactImage/" . $this->id . "/" .urlencode($this->name); |
|
36 | + return "/file/Cv.ContactImage/".$this->id."/".urlencode($this->name); |
|
37 | 37 | } |
38 | 38 | |
39 | 39 | /** |
@@ -44,16 +44,16 @@ |
||
44 | 44 | $this->contact->setImage(null); |
45 | 45 | } |
46 | 46 | |
47 | - /** |
|
48 | - * @param Contact $contact |
|
49 | - * @return ContactImage |
|
50 | - */ |
|
51 | - public function setContact(Contact $contact) |
|
52 | - { |
|
53 | - $this->contact = $contact; |
|
47 | + /** |
|
48 | + * @param Contact $contact |
|
49 | + * @return ContactImage |
|
50 | + */ |
|
51 | + public function setContact(Contact $contact) |
|
52 | + { |
|
53 | + $this->contact = $contact; |
|
54 | 54 | |
55 | - return $this; |
|
56 | - } |
|
55 | + return $this; |
|
56 | + } |
|
57 | 57 | |
58 | 58 | /** |
59 | 59 | * @return Contact |
@@ -60,10 +60,12 @@ |
||
60 | 60 | %s |
61 | 61 | </div>'; |
62 | 62 | |
63 | - foreach ($container as $form) /* @var $form \Zend\Form\Form */ |
|
63 | + foreach ($container as $form) { |
|
64 | + /* @var $form \Zend\Form\Form */ |
|
64 | 65 | { |
65 | 66 | $formsMarkup .= sprintf($formTemplateWrapper, $formContainerHelper->renderElement($form, $layout, $parameter)); |
66 | 67 | } |
68 | + } |
|
67 | 69 | |
68 | 70 | $templateForm = $container->getTemplateForm(); |
69 | 71 | $templateMarkup = sprintf( |
@@ -60,7 +60,7 @@ discard block |
||
60 | 60 | $translator = $this->getTranslator(); |
61 | 61 | $formContainerHelper = $view->formContainer(); |
62 | 62 | $formsMarkup = ''; |
63 | - $formTemplateWrapper = '<div class="form-collection-container-form"> |
|
63 | + $formTemplateWrapper = '<div class="form-collection-container-form"> |
|
64 | 64 | '. ($this->displayRemoveButton ? '<button type="button" class="btn btn-sm btn-danger pull-right form-collection-container-remove-button">' . $translator->translate('Remove') . '</button>' : '') . ' |
65 | 65 | %s |
66 | 66 | </div>'; |
@@ -71,16 +71,16 @@ discard block |
||
71 | 71 | } |
72 | 72 | |
73 | 73 | $templateForm = $container->getTemplateForm(); |
74 | - $templateMarkup = sprintf( |
|
74 | + $templateMarkup = sprintf( |
|
75 | 75 | $view->formCollection()->getTemplateWrapper(), |
76 | 76 | $view->escapeHtmlAttr(sprintf($formTemplateWrapper, $formContainerHelper->renderElement($templateForm, $layout, $parameter))) |
77 | 77 | ); |
78 | 78 | |
79 | - return sprintf('<div class="form-collection-container" data-new-entry-key="%s" data-remove-action="%s" data-remove-question="%s"> |
|
79 | + return sprintf('<div class="form-collection-container" data-new-entry-key="%s" data-remove-action="%s" data-remove-question="%s"> |
|
80 | 80 | <h3>%s</h3> |
81 | 81 | %s%s%s |
82 | 82 | </div>', |
83 | - CollectionContainer::NEW_ENTRY, |
|
83 | + CollectionContainer::NEW_ENTRY, |
|
84 | 84 | $container->formatAction('remove'), |
85 | 85 | $translator->translate('Really remove?'), |
86 | 86 | $container->getLabel(), |
@@ -90,14 +90,14 @@ discard block |
||
90 | 90 | ); |
91 | 91 | } |
92 | 92 | /** |
93 | - * @param boolean $displayRemoveButton |
|
94 | - * @return FormCollectionContainer |
|
93 | + * @param boolean $displayRemoveButton |
|
94 | + * @return FormCollectionContainer |
|
95 | 95 | * @since 0.26 |
96 | - */ |
|
97 | - public function setDisplayRemoveButton($displayRemoveButton) |
|
98 | - { |
|
99 | - $this->displayRemoveButton = (bool)$displayRemoveButton; |
|
96 | + */ |
|
97 | + public function setDisplayRemoveButton($displayRemoveButton) |
|
98 | + { |
|
99 | + $this->displayRemoveButton = (bool)$displayRemoveButton; |
|
100 | 100 | |
101 | - return $this; |
|
102 | - } |
|
101 | + return $this; |
|
102 | + } |
|
103 | 103 | } |
@@ -61,7 +61,7 @@ discard block |
||
61 | 61 | $formContainerHelper = $view->formContainer(); |
62 | 62 | $formsMarkup = ''; |
63 | 63 | $formTemplateWrapper = '<div class="form-collection-container-form"> |
64 | - '. ($this->displayRemoveButton ? '<button type="button" class="btn btn-sm btn-danger pull-right form-collection-container-remove-button">' . $translator->translate('Remove') . '</button>' : '') . ' |
|
64 | + '. ($this->displayRemoveButton ? '<button type="button" class="btn btn-sm btn-danger pull-right form-collection-container-remove-button">'.$translator->translate('Remove').'</button>' : '').' |
|
65 | 65 | %s |
66 | 66 | </div>'; |
67 | 67 | |
@@ -86,7 +86,7 @@ discard block |
||
86 | 86 | $container->getLabel(), |
87 | 87 | $formsMarkup, |
88 | 88 | $templateMarkup, |
89 | - '<div class="form-collection-container-add-wrapper"><button type="button" class="btn btn-success form-collection-container-add-button"><span class="yk-icon yk-icon-plus"></span> ' . sprintf($translator->translate('Add %s'), $container->getLabel()) . '</button></div>' |
|
89 | + '<div class="form-collection-container-add-wrapper"><button type="button" class="btn btn-success form-collection-container-add-button"><span class="yk-icon yk-icon-plus"></span> '.sprintf($translator->translate('Add %s'), $container->getLabel()).'</button></div>' |
|
90 | 90 | ); |
91 | 91 | } |
92 | 92 | /** |
@@ -96,7 +96,7 @@ discard block |
||
96 | 96 | */ |
97 | 97 | public function setDisplayRemoveButton($displayRemoveButton) |
98 | 98 | { |
99 | - $this->displayRemoveButton = (bool)$displayRemoveButton; |
|
99 | + $this->displayRemoveButton = (bool) $displayRemoveButton; |
|
100 | 100 | |
101 | 101 | return $this; |
102 | 102 | } |