Completed
Pull Request — develop (#349)
by ANTHONIUS
06:14
created
module/Geo/src/Geo/Service/Photon.php 1 patch
Spacing   +7 added lines, -7 removed lines patch added patch discarded remove patch
@@ -28,11 +28,11 @@  discard block
 block discarded – undo
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
 block discarded – undo
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
 block discarded – undo
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
     }
Please login to merge, or discard this patch.
module/Geo/src/Geo/Form/GeoSelectHydratorStrategy.php 1 patch
Spacing   +2 added lines, -2 removed lines patch added patch discarded remove patch
@@ -72,10 +72,10 @@
 block discarded – undo
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
     }
Please login to merge, or discard this patch.
module/Jobs/src/Jobs/Controller/TemplateController.php 1 patch
Spacing   +5 added lines, -5 removed lines patch added patch discarded remove patch
@@ -58,7 +58,7 @@  discard block
 block discarded – undo
58 58
     public function viewAction()
59 59
     {
60 60
         $id = $this->params()->fromQuery('id');
61
-        $channel = $this->params()->fromRoute('channel','default');
61
+        $channel = $this->params()->fromRoute('channel', 'default');
62 62
         $response = $this->getResponse();
63 63
         /* @var \Jobs\Entity\Job $job */
64 64
         try {
@@ -86,7 +86,7 @@  discard block
 block discarded – undo
86 86
             $this->auth()->isAdmin()
87 87
         ) {
88 88
             $applicationViewModel->setTemplate('iframe/iFrameInjection');
89
-        }elseif(Status::EXPIRED == $job->getStatus() or  Status::INACTIVE == $job->getStatus()) {
89
+        }elseif (Status::EXPIRED == $job->getStatus() or Status::INACTIVE == $job->getStatus()) {
90 90
             $response->setStatusCode(Response::STATUS_CODE_410);
91 91
             $model->setTemplate('jobs/error/expired');
92 92
             $model->setVariables(
@@ -114,7 +114,7 @@  discard block
 block discarded – undo
114 114
     protected function editTemplateAction()
115 115
     {
116 116
         $id = $this->params('id');
117
-        $formIdentifier=$this->params()->fromQuery('form');
117
+        $formIdentifier = $this->params()->fromQuery('form');
118 118
         //$job = $this->jobRepository->find($id);
119 119
         $job = $this->initializeJob()->get($this->params(), true, true);
120 120
         $this->acl($job, 'edit');
@@ -138,7 +138,7 @@  discard block
 block discarded – undo
138 138
 
139 139
         $formTemplate->setParam('id', $job->id);
140 140
         $formTemplate->setParam('applyId', $job->applyId);
141
-        $formTemplate->setParam('snapshot', $job instanceOf JobSnapshot ? $job->getSnapshotId() : '' );
141
+        $formTemplate->setParam('snapshot', $job instanceOf JobSnapshot ? $job->getSnapshotId() : '');
142 142
 
143 143
         $formTemplate->setEntity($job);
144 144
 
@@ -147,7 +147,7 @@  discard block
 block discarded – undo
147 147
 
148 148
             $instanceForm = $formTemplate->get($formIdentifier);
149 149
             if (!isset($instanceForm)) {
150
-                throw new \RuntimeException('No form found for "' . $formIdentifier . '"');
150
+                throw new \RuntimeException('No form found for "'.$formIdentifier.'"');
151 151
             }
152 152
 
153 153
             // the id is part of the postData, but it never should be altered
Please login to merge, or discard this patch.
module/Jobs/src/Jobs/Controller/Plugin/InitializeJob.php 1 patch
Spacing   +5 added lines, -5 removed lines patch added patch discarded remove patch
@@ -43,9 +43,9 @@  discard block
 block discarded – undo
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
 block discarded – undo
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) {
Please login to merge, or discard this patch.
module/Jobs/src/Jobs/Controller/ManageController.php 1 patch
Spacing   +12 added lines, -12 removed lines patch added patch discarded remove patch
@@ -178,7 +178,7 @@  discard block
 block discarded – undo
178 178
         if (empty($user->info->email)) {
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
 block discarded – undo
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
 block discarded – undo
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
 block discarded – undo
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
 block discarded – undo
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
 block discarded – undo
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
 block discarded – undo
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
 block discarded – undo
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
 block discarded – undo
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
 
Please login to merge, or discard this patch.
module/Jobs/src/Jobs/View/Helper/AdminEditLink.php 1 patch
Spacing   +1 added lines, -1 removed lines patch added patch discarded remove patch
@@ -65,6 +65,6 @@
 block discarded – undo
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
Please login to merge, or discard this patch.
module/Geo/src/Geo/Form/GeoSelectSimple.php 1 patch
Spacing   +2 added lines, -2 removed lines patch added patch discarded remove patch
@@ -62,7 +62,7 @@  discard block
 block discarded – undo
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
 block discarded – undo
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
                 }
Please login to merge, or discard this patch.
module/Jobs/config/module.config.php 1 patch
Spacing   +36 added lines, -36 removed lines patch added patch discarded remove patch
@@ -15,7 +15,7 @@  discard block
 block discarded – undo
15 15
                  * for multiple paths.
16 16
                  * example https://github.com/doctrine/DoctrineORMModule
17 17
                  */
18
-                'paths' => array( __DIR__ . '/../src/Jobs/Entity'),
18
+                'paths' => array(__DIR__.'/../src/Jobs/Entity'),
19 19
             ),
20 20
         ),
21 21
         'eventmanager' => array(
@@ -28,8 +28,8 @@  discard block
 block discarded – undo
28 28
     ),
29 29
 
30 30
     'options' => [
31
-        'Jobs/JobboardSearchOptions' => [ 'class' => '\Jobs\Options\JobboardSearchOptions' ],
32
-        'Jobs/BaseFieldsetOptions' => [ 'class' => '\Jobs\Options\BaseFieldsetOptions' ],
31
+        'Jobs/JobboardSearchOptions' => ['class' => '\Jobs\Options\JobboardSearchOptions'],
32
+        'Jobs/BaseFieldsetOptions' => ['class' => '\Jobs\Options\BaseFieldsetOptions'],
33 33
     ],
34 34
 
35 35
     'Jobs' => array(
@@ -51,7 +51,7 @@  discard block
 block discarded – undo
51 51
             'translation_file_patterns' => array(
52 52
                     array(
53 53
                             'type'     => 'gettext',
54
-                            'base_dir' => __DIR__ . '/../language',
54
+                            'base_dir' => __DIR__.'/../language',
55 55
                             'pattern'  => '%s.mo',
56 56
                     ),
57 57
             ),
@@ -91,7 +91,7 @@  discard block
 block discarded – undo
91 91
                     'Jobboard',
92 92
                     'Jobs/Jobboard',
93 93
                     'Jobs/ApiJobListByChannel',
94
-                    'Jobs/Template' => [ 'view', 'edittemplate' ],
94
+                    'Jobs/Template' => ['view', 'edittemplate'],
95 95
                     'Jobs/Manage' => array(
96 96
                         'template',
97 97
                     ),
@@ -228,7 +228,7 @@  discard block
 block discarded – undo
228 228
     ),
229 229
 
230 230
     'event_manager' => [
231
-        'Core/AdminController/Events' => [ 'listeners' => [
231
+        'Core/AdminController/Events' => ['listeners' => [
232 232
             'Jobs/Listener/AdminWidgetProvider' => \Core\Controller\AdminControllerEvent::EVENT_DASHBOARD,
233 233
         ]],
234 234
 
@@ -290,40 +290,40 @@  discard block
 block discarded – undo
290 290
     'view_manager' => array(
291 291
         // Map template to files. Speeds up the lookup through the template stack.
292 292
         'template_map' => array(
293
-            'jobs/form/list-filter' => __DIR__ . '/../view/form/list-filter.phtml',
294
-            'jobs/form/apply-identifier' => __DIR__ . '/../view/form/apply-identifier.phtml',
295
-            'jobs/form/hiring-organization-select' => __DIR__ . '/../view/form/hiring-organization-select.phtml',
296
-            'jobs/form/multiposting-select' => __DIR__ . '/../view/form/multiposting-select.phtml',
297
-            'jobs/form/multiposting-checkboxes' => __DIR__ . '/../view/form/multiposting-checkboxes.phtml',
298
-            'jobs/form/ats-mode.view' => __DIR__ . '/../view/form/ats-mode.view.phtml',
299
-            'jobs/form/ats-mode.form' => __DIR__ . '/../view/form/ats-mode.form.phtml',
300
-            'jobs/form/preview' => __DIR__ . '/../view/form/preview.phtml',
301
-            'jobs/form/customer-note' => __DIR__ . '/../view/form/customer-note.phtml',
302
-            'jobs/partials/channel-list' => __DIR__ . '/../view/partials/channel-list.phtml',
303
-            'jobs/assign-user' => __DIR__ . '/../view/jobs/manage/assign-user.phtml',
304
-            'jobs/snapshot_or_preview' => __DIR__ . '/../view/partials/snapshot_or_preview.phtml',
305
-            'jobs/history' => __DIR__ . '/../view/partials/history.phtml',
306
-            'jobs/portalsummary' => __DIR__ . '/../view/partials/portalsummary.phtml',
307
-            'content/jobs-publish-on-yawik' => __DIR__ . '/../view/modals/yawik.phtml',
308
-            'content/jobs-publish-on-jobsintown' => __DIR__ . '/../view/modals/jobsintown.phtml',
309
-            'content/jobs-publish-on-homepage' => __DIR__ . '/../view/modals/homepage.phtml',
310
-            'content/jobs-publish-on-fazjob' => __DIR__ . '/../view/modals/fazjob.phtml',
311
-            'content/jobs-terms-and-conditions' => __DIR__ . '/../view/jobs/index/terms.phtml',
312
-            'mail/job-created' => __DIR__ . '/../view/mails/job-created.phtml',
313
-            'mail/job-pending' => __DIR__ . '/../view/mails/job-pending.phtml',
314
-            'mail/job-accepted' => __DIR__ . '/../view/mails/job-accepted.phtml',
315
-            'mail/job-rejected' => __DIR__ . '/../view/mails/job-rejected.phtml',
316
-            'mail/job-created.en' => __DIR__ . '/../view/mails/job-created.en.phtml',
317
-            'mail/job-pending.en' => __DIR__ . '/../view/mails/job-pending.en.phtml',
318
-            'mail/job-accepted.en' => __DIR__ . '/../view/mails/job-accepted.en.phtml',
319
-            'mail/job-rejected.en' => __DIR__ . '/../view/mails/job-rejected.en.phtml',
320
-            'jobs/error/no-parent' => __DIR__ . '/../view/error/no-parent.phtml',
321
-            'jobs/error/expired' => __DIR__ . '/../view/error/expired.phtml',
293
+            'jobs/form/list-filter' => __DIR__.'/../view/form/list-filter.phtml',
294
+            'jobs/form/apply-identifier' => __DIR__.'/../view/form/apply-identifier.phtml',
295
+            'jobs/form/hiring-organization-select' => __DIR__.'/../view/form/hiring-organization-select.phtml',
296
+            'jobs/form/multiposting-select' => __DIR__.'/../view/form/multiposting-select.phtml',
297
+            'jobs/form/multiposting-checkboxes' => __DIR__.'/../view/form/multiposting-checkboxes.phtml',
298
+            'jobs/form/ats-mode.view' => __DIR__.'/../view/form/ats-mode.view.phtml',
299
+            'jobs/form/ats-mode.form' => __DIR__.'/../view/form/ats-mode.form.phtml',
300
+            'jobs/form/preview' => __DIR__.'/../view/form/preview.phtml',
301
+            'jobs/form/customer-note' => __DIR__.'/../view/form/customer-note.phtml',
302
+            'jobs/partials/channel-list' => __DIR__.'/../view/partials/channel-list.phtml',
303
+            'jobs/assign-user' => __DIR__.'/../view/jobs/manage/assign-user.phtml',
304
+            'jobs/snapshot_or_preview' => __DIR__.'/../view/partials/snapshot_or_preview.phtml',
305
+            'jobs/history' => __DIR__.'/../view/partials/history.phtml',
306
+            'jobs/portalsummary' => __DIR__.'/../view/partials/portalsummary.phtml',
307
+            'content/jobs-publish-on-yawik' => __DIR__.'/../view/modals/yawik.phtml',
308
+            'content/jobs-publish-on-jobsintown' => __DIR__.'/../view/modals/jobsintown.phtml',
309
+            'content/jobs-publish-on-homepage' => __DIR__.'/../view/modals/homepage.phtml',
310
+            'content/jobs-publish-on-fazjob' => __DIR__.'/../view/modals/fazjob.phtml',
311
+            'content/jobs-terms-and-conditions' => __DIR__.'/../view/jobs/index/terms.phtml',
312
+            'mail/job-created' => __DIR__.'/../view/mails/job-created.phtml',
313
+            'mail/job-pending' => __DIR__.'/../view/mails/job-pending.phtml',
314
+            'mail/job-accepted' => __DIR__.'/../view/mails/job-accepted.phtml',
315
+            'mail/job-rejected' => __DIR__.'/../view/mails/job-rejected.phtml',
316
+            'mail/job-created.en' => __DIR__.'/../view/mails/job-created.en.phtml',
317
+            'mail/job-pending.en' => __DIR__.'/../view/mails/job-pending.en.phtml',
318
+            'mail/job-accepted.en' => __DIR__.'/../view/mails/job-accepted.en.phtml',
319
+            'mail/job-rejected.en' => __DIR__.'/../view/mails/job-rejected.en.phtml',
320
+            'jobs/error/no-parent' => __DIR__.'/../view/error/no-parent.phtml',
321
+            'jobs/error/expired' => __DIR__.'/../view/error/expired.phtml',
322 322
         ),
323 323
 
324 324
         // Where to look for view templates not mapped above
325 325
         'template_path_stack' => array(
326
-            __DIR__ . '/../view',
326
+            __DIR__.'/../view',
327 327
         ),
328 328
     ),
329 329
 
Please login to merge, or discard this patch.
module/Jobs/src/Jobs/Options/BaseFieldsetOptions.php 1 patch
Spacing   +2 added lines, -2 removed lines patch added patch discarded remove patch
@@ -24,7 +24,7 @@  discard block
 block discarded – undo
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
 block discarded – undo
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' => [
Please login to merge, or discard this patch.