@@ -40,7 +40,7 @@ |
||
40 | 40 | { |
41 | 41 | $result = json_decode($result, JSON_OBJECT_AS_ARRAY); |
42 | 42 | |
43 | - $r=[]; |
|
43 | + $r = []; |
|
44 | 44 | foreach ($result["result"] as $val) { |
45 | 45 | $coords = $this->queryCoords($val); |
46 | 46 | if (false !== strpos($val, ',')) { |
@@ -63,16 +63,16 @@ |
||
63 | 63 | |
64 | 64 | foreach ($result as $key => $val) { |
65 | 65 | $row=[ |
66 | - 'postalCode' => (property_exists($val->properties, 'postcode') ? $val->properties->postcode:''), |
|
67 | - 'city' =>(property_exists($val->properties, 'city') ? $val->properties->city:''), |
|
68 | - 'street' => (property_exists($val->properties, 'street') ? $val->properties->street : ''), |
|
69 | - 'region' => (property_exists($val->properties, 'state') ? $val->properties->state : ''), |
|
70 | - 'country' => (property_exists($val->properties, 'country') ? $val->properties->country : ''), |
|
66 | + 'postalCode' => (property_exists($val->properties, 'postcode') ? $val->properties->postcode:''), |
|
67 | + 'city' =>(property_exists($val->properties, 'city') ? $val->properties->city:''), |
|
68 | + 'street' => (property_exists($val->properties, 'street') ? $val->properties->street : ''), |
|
69 | + 'region' => (property_exists($val->properties, 'state') ? $val->properties->state : ''), |
|
70 | + 'country' => (property_exists($val->properties, 'country') ? $val->properties->country : ''), |
|
71 | 71 | |
72 | - 'osm_key' => (property_exists($val->properties, 'osm_key') ? $val->properties->osm_key : ''), |
|
73 | - 'osm_value' => (property_exists($val->properties, 'osm_value') ? $val->properties->osm_value : ''), |
|
74 | - //'id' => (property_exists($val->properties, 'osm_id') ? $val->properties->osm_id : uniqid()), |
|
75 | - //'data' => json_encode($val), |
|
72 | + 'osm_key' => (property_exists($val->properties, 'osm_key') ? $val->properties->osm_key : ''), |
|
73 | + 'osm_value' => (property_exists($val->properties, 'osm_value') ? $val->properties->osm_value : ''), |
|
74 | + //'id' => (property_exists($val->properties, 'osm_id') ? $val->properties->osm_id : uniqid()), |
|
75 | + //'data' => json_encode($val), |
|
76 | 76 | ]; |
77 | 77 | if ($val->geometry) { |
78 | 78 | $row['coordinates'] = [ |
@@ -28,11 +28,11 @@ discard block |
||
28 | 28 | $client->setMethod('GET'); |
29 | 29 | |
30 | 30 | $osmTags = [ |
31 | - 'tourism','aeroway','railway', 'amenity', 'historic', 'tunnel', 'mountain_pass', |
|
31 | + 'tourism', 'aeroway', 'railway', 'amenity', 'historic', 'tunnel', 'mountain_pass', |
|
32 | 32 | 'leisure', 'natural', 'bridge', 'waterway' |
33 | 33 | ]; |
34 | 34 | |
35 | - $osmTags = array_map(function($i) { return urlencode('!' . $i); }, $osmTags); |
|
35 | + $osmTags = array_map(function($i) { return urlencode('!'.$i); }, $osmTags); |
|
36 | 36 | |
37 | 37 | $uri = sprintf( |
38 | 38 | '%s?osm_tag=%s', |
@@ -59,12 +59,12 @@ discard block |
||
59 | 59 | { |
60 | 60 | $result = json_decode($result); |
61 | 61 | $result = $result->features; |
62 | - $r=[]; |
|
62 | + $r = []; |
|
63 | 63 | |
64 | 64 | foreach ($result as $key => $val) { |
65 | - $row=[ |
|
66 | - 'postalCode' => (property_exists($val->properties, 'postcode') ? $val->properties->postcode:''), |
|
67 | - 'city' =>(property_exists($val->properties, 'city') ? $val->properties->city:''), |
|
65 | + $row = [ |
|
66 | + 'postalCode' => (property_exists($val->properties, 'postcode') ? $val->properties->postcode : ''), |
|
67 | + 'city' =>(property_exists($val->properties, 'city') ? $val->properties->city : ''), |
|
68 | 68 | 'street' => (property_exists($val->properties, 'street') ? $val->properties->street : ''), |
69 | 69 | 'region' => (property_exists($val->properties, 'state') ? $val->properties->state : ''), |
70 | 70 | 'country' => (property_exists($val->properties, 'country') ? $val->properties->country : ''), |
@@ -81,7 +81,7 @@ discard block |
||
81 | 81 | ]; |
82 | 82 | } |
83 | 83 | //$row['id'] = json_encode($row); |
84 | - $r[]=$row; |
|
84 | + $r[] = $row; |
|
85 | 85 | } |
86 | 86 | return $r; |
87 | 87 | } |
@@ -72,10 +72,10 @@ |
||
72 | 72 | if (0 === strpos($value, '{')) { |
73 | 73 | return $value; |
74 | 74 | } |
75 | - if ($value){ |
|
75 | + if ($value) { |
|
76 | 76 | $data = $this->geoClient->queryOne($value); |
77 | 77 | return $data['id']; |
78 | - }else{ |
|
78 | + } else { |
|
79 | 79 | return; |
80 | 80 | } |
81 | 81 | } |
@@ -75,7 +75,7 @@ |
||
75 | 75 | if ($value){ |
76 | 76 | $data = $this->geoClient->queryOne($value); |
77 | 77 | return $data['id']; |
78 | - }else{ |
|
78 | + } else{ |
|
79 | 79 | return; |
80 | 80 | } |
81 | 81 | } |
@@ -148,12 +148,12 @@ discard block |
||
148 | 148 | $jobEntity = $this->initializeJob()->get($this->params(), true); |
149 | 149 | |
150 | 150 | $model = new ViewModel([ |
151 | - 'portals' => $jobEntity->getPortals(), |
|
152 | - 'channels' => $channels, |
|
153 | - 'defaultCurrencyCode' => $options->defaultCurrencyCode, |
|
154 | - 'defaultTaxRate' => $options->defaultTaxRate, |
|
155 | - 'jobId' => $jobEntity->getId() |
|
156 | - ]); |
|
151 | + 'portals' => $jobEntity->getPortals(), |
|
152 | + 'channels' => $channels, |
|
153 | + 'defaultCurrencyCode' => $options->defaultCurrencyCode, |
|
154 | + 'defaultTaxRate' => $options->defaultTaxRate, |
|
155 | + 'jobId' => $jobEntity->getId() |
|
156 | + ]); |
|
157 | 157 | $model->setTemplate('jobs/partials/channel-list')->setTerminal(true); |
158 | 158 | return $model; |
159 | 159 | } |
@@ -513,7 +513,7 @@ discard block |
||
513 | 513 | 'lang/jobs/view', |
514 | 514 | array(), |
515 | 515 | array('query' => $query |
516 | - ) |
|
516 | + ) |
|
517 | 517 | ); |
518 | 518 | |
519 | 519 | $approvalLink = $this->url()->fromRoute( |
@@ -529,10 +529,10 @@ discard block |
||
529 | 529 | ); |
530 | 530 | |
531 | 531 | return array('job' => $jobEntity, |
532 | - 'diffSnapshot' => $diff, |
|
533 | - 'viewLink' => $viewLink, |
|
534 | - 'approvalLink' => $approvalLink, |
|
535 | - 'declineLink' => $declineLink); |
|
532 | + 'diffSnapshot' => $diff, |
|
533 | + 'viewLink' => $viewLink, |
|
534 | + 'approvalLink' => $approvalLink, |
|
535 | + 'declineLink' => $declineLink); |
|
536 | 536 | } |
537 | 537 | |
538 | 538 | /** |
@@ -165,7 +165,6 @@ discard block |
||
165 | 165 | * |
166 | 166 | * parameter are arbitrary elements for defaults or programming flow |
167 | 167 | * |
168 | - * @param array $parameter |
|
169 | 168 | * @return null|ViewModel |
170 | 169 | * @throws \RuntimeException |
171 | 170 | */ |
@@ -388,7 +387,7 @@ discard block |
||
388 | 387 | |
389 | 388 | /** |
390 | 389 | * @param $job \Jobs\Entity\Job |
391 | - * @return mixed |
|
390 | + * @return \Jobs\Form\Job |
|
392 | 391 | */ |
393 | 392 | protected function getFormular($job) |
394 | 393 | { |
@@ -411,7 +410,7 @@ discard block |
||
411 | 410 | } |
412 | 411 | |
413 | 412 | /** |
414 | - * @param $form |
|
413 | + * @param \Jobs\Form\Job $form |
|
415 | 414 | * @param array $params |
416 | 415 | * @return ViewModel |
417 | 416 | */ |
@@ -604,7 +603,7 @@ discard block |
||
604 | 603 | } |
605 | 604 | |
606 | 605 | /** |
607 | - * @param $script |
|
606 | + * @param string $script |
|
608 | 607 | * @param array $parameter |
609 | 608 | * @return ViewModel |
610 | 609 | */ |
@@ -178,7 +178,7 @@ discard block |
||
178 | 178 | if (empty($user->getInfo()->getEmail())) { |
179 | 179 | return $this->getErrorViewModel('no-parent', array('cause' => 'noEmail')); |
180 | 180 | } |
181 | - $userOrg = $user->getOrganization(); |
|
181 | + $userOrg = $user->getOrganization(); |
|
182 | 182 | if (!$userOrg->hasAssociation() || $userOrg->getOrganization()->isDraft()) { |
183 | 183 | return $this->getErrorViewModel('no-parent', array('cause' => 'noCompany')); |
184 | 184 | } |
@@ -208,7 +208,7 @@ discard block |
||
208 | 208 | } |
209 | 209 | |
210 | 210 | |
211 | - $viewModel = null; |
|
211 | + $viewModel = null; |
|
212 | 212 | $this->acl($jobEntity, 'edit'); |
213 | 213 | if ($status = $params->fromQuery('status')) { |
214 | 214 | $this->changeStatus($jobEntity, $status); |
@@ -220,11 +220,11 @@ discard block |
||
220 | 220 | $instanceForm = null; |
221 | 221 | $formErrorMessages = array(); |
222 | 222 | |
223 | - if (isset($formIdentifier) && $request->isPost()) { |
|
223 | + if (isset($formIdentifier) && $request->isPost()) { |
|
224 | 224 | // at this point the form get instantiated and immediately accumulated |
225 | 225 | $instanceForm = $form->getForm($formIdentifier); |
226 | 226 | if (!isset($instanceForm)) { |
227 | - throw new \RuntimeException('No form found for "' . $formIdentifier . '"'); |
|
227 | + throw new \RuntimeException('No form found for "'.$formIdentifier.'"'); |
|
228 | 228 | } |
229 | 229 | // the id may be part of the postData, but it never should be altered |
230 | 230 | $postData = $request->getPost(); |
@@ -278,20 +278,20 @@ discard block |
||
278 | 278 | $jobValid = false; |
279 | 279 | $errorMessage[] = $this->translator->translate('Accept the Terms'); |
280 | 280 | } |
281 | - $result = $formEvents->trigger('ValidateJob', $this, [ 'form' => $form ]); |
|
281 | + $result = $formEvents->trigger('ValidateJob', $this, ['form' => $form]); |
|
282 | 282 | foreach ($result as $messages) { |
283 | 283 | if (!$messages) { |
284 | 284 | continue; |
285 | 285 | } |
286 | 286 | if (!is_array($messages)) { |
287 | - $messages = [ $messages ]; |
|
287 | + $messages = [$messages]; |
|
288 | 288 | } |
289 | 289 | |
290 | 290 | $errorMessage = array_merge($errorMessage, $messages); |
291 | 291 | $jobValid = false; |
292 | 292 | } |
293 | 293 | |
294 | - $errorMessage = '<br />' . implode('<br />', $errorMessage); |
|
294 | + $errorMessage = '<br />'.implode('<br />', $errorMessage); |
|
295 | 295 | if ($isAjax) { |
296 | 296 | if ($instanceForm instanceof SummaryForm) { |
297 | 297 | $instanceForm->setRenderMode(SummaryForm::RENDER_SUMMARY); |
@@ -299,7 +299,7 @@ discard block |
||
299 | 299 | } else { |
300 | 300 | $viewHelper = 'form'; |
301 | 301 | } |
302 | - $viewHelperManager = $serviceLocator->get('ViewHelperManager'); |
|
302 | + $viewHelperManager = $serviceLocator->get('ViewHelperManager'); |
|
303 | 303 | $content = $viewHelperManager->get($viewHelper)->__invoke($instanceForm); |
304 | 304 | $viewModel = new JsonModel( |
305 | 305 | array( |
@@ -322,7 +322,7 @@ discard block |
||
322 | 322 | } |
323 | 323 | } |
324 | 324 | } else { |
325 | - $formEvents->trigger('DisableElements', $this, [ 'form' => $form, 'job'=>$jobEntity ]); |
|
325 | + $formEvents->trigger('DisableElements', $this, ['form' => $form, 'job'=>$jobEntity]); |
|
326 | 326 | // Job is deployed, some changes are now disabled |
327 | 327 | $form->enableAll(); |
328 | 328 | } |
@@ -330,7 +330,7 @@ discard block |
||
330 | 330 | |
331 | 331 | $completionLink = $this->url()->fromRoute( |
332 | 332 | 'lang/jobs/completion', |
333 | - [ 'id' => $jobEntity->getId()] |
|
333 | + ['id' => $jobEntity->getId()] |
|
334 | 334 | ); |
335 | 335 | |
336 | 336 | $viewModel = $this->getViewModel($form); |
@@ -501,7 +501,7 @@ discard block |
||
501 | 501 | // array with differences between the last snapshot and the actual entity |
502 | 502 | // is remains Null if there is no snapshot |
503 | 503 | // it will be an empty array if the snapshot and the actual entity do not differ |
504 | - $diff = null; |
|
504 | + $diff = null; |
|
505 | 505 | |
506 | 506 | |
507 | 507 | if ($params == 'declined') { |
@@ -560,7 +560,7 @@ discard block |
||
560 | 560 | */ |
561 | 561 | public function deactivateAction() |
562 | 562 | { |
563 | - $user = $this->auth->getUser(); |
|
563 | + $user = $this->auth->getUser(); |
|
564 | 564 | |
565 | 565 | $jobEntity = $this->initializeJob()->get($this->params()); |
566 | 566 |
@@ -43,9 +43,9 @@ discard block |
||
43 | 43 | |
44 | 44 | public function __construct(RepositoryService $repositoryService, AuthenticationService $auth, Acl $acl) |
45 | 45 | { |
46 | - $this->repositoryService=$repositoryService; |
|
47 | - $this->auth=$auth; |
|
48 | - $this->acl=$acl; |
|
46 | + $this->repositoryService = $repositoryService; |
|
47 | + $this->auth = $auth; |
|
48 | + $this->acl = $acl; |
|
49 | 49 | } |
50 | 50 | |
51 | 51 | public function __invoke() |
@@ -64,12 +64,12 @@ discard block |
||
64 | 64 | public function get(Params $params, $allowDraft = false, $getSnapshot = false) |
65 | 65 | { |
66 | 66 | /* @var \Jobs\Repository\Job $jobRepository */ |
67 | - $jobRepository = $this->repositoryService->get('Jobs/Job'); |
|
67 | + $jobRepository = $this->repositoryService->get('Jobs/Job'); |
|
68 | 68 | $idFromRoute = $params('id', 0); |
69 | 69 | $idFromQuery = $params->fromQuery('id', 0); |
70 | 70 | $idFromSubForm = $params->fromPost('job', 0); |
71 | 71 | |
72 | - $id = empty($idFromRoute)? (empty($idFromQuery)?$idFromSubForm:$idFromQuery) : $idFromRoute; |
|
72 | + $id = empty($idFromRoute) ? (empty($idFromQuery) ? $idFromSubForm : $idFromQuery) : $idFromRoute; |
|
73 | 73 | $snapshotId = $params->fromPost('snapshot') ?: ($params->fromQuery('snapshot') ?: null); |
74 | 74 | |
75 | 75 | if (empty($id) && empty($snapshotId) && $allowDraft) { |
@@ -93,7 +93,7 @@ discard block |
||
93 | 93 | /** |
94 | 94 | * Switch to another user. |
95 | 95 | * |
96 | - * @param string|UserInterface $id user id of the user to switch to. |
|
96 | + * @param string $id user id of the user to switch to. |
|
97 | 97 | * @param array $params Additional parameters to store in the session container. |
98 | 98 | * |
99 | 99 | * @return bool |
@@ -167,7 +167,7 @@ discard block |
||
167 | 167 | * @param string $key |
168 | 168 | * @param mixed $default Value to return if param $key is not set. |
169 | 169 | * |
170 | - * @return null |
|
170 | + * @return string |
|
171 | 171 | */ |
172 | 172 | public function getSessionParam($key, $default = null) |
173 | 173 | { |
@@ -65,6 +65,6 @@ |
||
65 | 65 | 'admin' => 1, |
66 | 66 | ]], |
67 | 67 | true |
68 | - ) . '&return=' . $this->returnUrl; |
|
68 | + ).'&return='.$this->returnUrl; |
|
69 | 69 | } |
70 | 70 | } |
71 | 71 | \ No newline at end of file |
@@ -62,7 +62,7 @@ discard block |
||
62 | 62 | if (0 === strpos($value, '{')) { |
63 | 63 | return $value; |
64 | 64 | } |
65 | - if ($value){ |
|
65 | + if ($value) { |
|
66 | 66 | foreach ($this->getValueOptions() as $optValue => $opt) { |
67 | 67 | if (false !== strpos($value, $opt)) { |
68 | 68 | return $optValue; |
@@ -75,7 +75,7 @@ discard block |
||
75 | 75 | }, |
76 | 76 | |
77 | 77 | /* hydrate */ |
78 | - function ($value) { |
|
78 | + function($value) { |
|
79 | 79 | if (empty($value) || 0 !== strpos($value, '{')) { |
80 | 80 | return null; |
81 | 81 | } |
@@ -32,7 +32,7 @@ |
||
32 | 32 | * |
33 | 33 | * @var array |
34 | 34 | */ |
35 | - protected $fields=[ |
|
35 | + protected $fields=[ |
|
36 | 36 | self::TITLE => [ |
37 | 37 | 'enabled' => true, |
38 | 38 | 'options' => [ |
@@ -24,7 +24,7 @@ discard block |
||
24 | 24 | class BaseFieldsetOptions extends FieldsetCustomizationOptions |
25 | 25 | { |
26 | 26 | |
27 | - const TITLE = 'title'; |
|
27 | + const TITLE = 'title'; |
|
28 | 28 | const LOCATION = 'geoLocation'; |
29 | 29 | |
30 | 30 | /** |
@@ -32,7 +32,7 @@ discard block |
||
32 | 32 | * |
33 | 33 | * @var array |
34 | 34 | */ |
35 | - protected $fields=[ |
|
35 | + protected $fields = [ |
|
36 | 36 | self::TITLE => [ |
37 | 37 | 'enabled' => true, |
38 | 38 | 'options' => [ |