Completed
Pull Request — develop (#229)
by ANTHONIUS
08:26
created
module/Applications/src/Applications/Controller/IndexController.php 1 patch
Spacing   +2 added lines, -2 removed lines patch added patch discarded remove patch
@@ -42,10 +42,10 @@
 block discarded – undo
42 42
 
43 43
          //default sorting
44 44
         if (!isset($params['sort'])) {
45
-            $params['sort']="-date";
45
+            $params['sort'] = "-date";
46 46
         }
47 47
         $params->count = 5;
48
-        $params->pageRange=5;
48
+        $params->pageRange = 5;
49 49
 
50 50
         $this->paginationParams()->setParams('Applications\Index', $params);
51 51
 
Please login to merge, or discard this patch.
module/Applications/src/Applications/Controller/ManageController.php 1 patch
Spacing   +8 added lines, -8 removed lines patch added patch discarded remove patch
@@ -85,11 +85,11 @@  discard block
 block discarded – undo
85 85
         }
86 86
         $statusElement->setValueOptions($statesForSelections);
87 87
         
88
-        $job = $params->job ? $jobRepository->find($params->job)  : null;
88
+        $job = $params->job ? $jobRepository->find($params->job) : null;
89 89
         $paginator = $this->paginator('Applications');
90 90
 
91 91
         if ($job) {
92
-            $params['job_title'] = '[' . $job->getApplyId() . '] ' . $job->getTitle();
92
+            $params['job_title'] = '['.$job->getApplyId().'] '.$job->getTitle();
93 93
         }
94 94
 
95 95
         $form->bind($params);
@@ -151,7 +151,7 @@  discard block
 block discarded – undo
151 151
 
152 152
 
153 153
         
154
-        $format=$this->params()->fromQuery('format');
154
+        $format = $this->params()->fromQuery('format');
155 155
 
156 156
         if ($application->isDraft()) {
157 157
             $list = false;
@@ -238,7 +238,7 @@  discard block
 block discarded – undo
238 238
                    && ($network = $this->params()->fromQuery('network'))
239 239
                    && ($data    = $this->params()->fromPost('data'))
240 240
         ) {
241
-            $profileClass = '\\Auth\\Entity\\SocialProfiles\\' . $network;
241
+            $profileClass = '\\Auth\\Entity\\SocialProfiles\\'.$network;
242 242
             $profile      = new $profileClass();
243 243
             $profile->setData(\Zend\Json\Json::decode($data, \Zend\Json\Json::TYPE_ARRAY));
244 244
         } else {
@@ -357,7 +357,7 @@  discard block
 block discarded – undo
357 357
         
358 358
         $this->acl($application, 'forward');
359 359
         
360
-        $translator   = $services->get('translator');
360
+        $translator = $services->get('translator');
361 361
          
362 362
         if (!$emailAddress) {
363 363
             throw new \InvalidArgumentException('An email address must be supplied.');
@@ -398,7 +398,7 @@  discard block
 block discarded – undo
398 398
     {
399 399
         $id          = $this->params('id');
400 400
         $services    = $this->getServiceLocator();
401
-        $repositories= $services->get('repositories');
401
+        $repositories = $services->get('repositories');
402 402
         $repository  = $repositories->get('Applications/Application');
403 403
         $application = $repository->find($id);
404 404
         
@@ -408,8 +408,8 @@  discard block
 block discarded – undo
408 408
 
409 409
         $this->acl($application, 'delete');
410 410
 
411
-        $events   = $services->get('Applications/Events');
412
-        $events->trigger(ApplicationEvent::EVENT_APPLICATION_PRE_DELETE, $this, [ 'application' => $application ]);
411
+        $events = $services->get('Applications/Events');
412
+        $events->trigger(ApplicationEvent::EVENT_APPLICATION_PRE_DELETE, $this, ['application' => $application]);
413 413
         
414 414
         $repositories->remove($application);
415 415
         
Please login to merge, or discard this patch.
module/Core/src/Core/Form/LocalizationSettingsFieldset.php 1 patch
Spacing   +1 added lines, -1 removed lines patch added patch discarded remove patch
@@ -46,7 +46,7 @@
 block discarded – undo
46 46
             )
47 47
         );
48 48
 
49
-        $timezones=array_merge(
49
+        $timezones = array_merge(
50 50
             \DateTimeZone::listIdentifiers(\DateTimeZone::AFRICA),
51 51
             \DateTimeZone::listIdentifiers(\DateTimeZone::AMERICA),
52 52
             \DateTimeZone::listIdentifiers(\DateTimeZone::ASIA),
Please login to merge, or discard this patch.
module/Core/src/Core/Form/View/Helper/ToggleButton.php 1 patch
Spacing   +7 added lines, -7 removed lines patch added patch discarded remove patch
@@ -28,7 +28,7 @@  discard block
 block discarded – undo
28 28
             if (null === $buttonContent) {
29 29
                 throw new Exception\DomainException(
30 30
                     sprintf(
31
-                        '%s expects either button content as the second argument, ' .
31
+                        '%s expects either button content as the second argument, '.
32 32
                         'or that the element provided has a label value; neither found',
33 33
                         __METHOD__
34 34
                     )
@@ -51,7 +51,7 @@  discard block
 block discarded – undo
51 51
         $checkedBoole   = ($value == 1 || $value == 'on');
52 52
         
53 53
         //$checked        = $checkedBoole?'checked="checked"':'';
54
-        $checkedClass   = $checkedBoole?'active"':'';
54
+        $checkedClass   = $checkedBoole ? 'active"' : '';
55 55
 
56 56
         $hiddenElement = '';
57 57
         if ($element->useHiddenElement()) {
@@ -68,11 +68,11 @@  discard block
 block discarded – undo
68 68
             $element->setUseHiddenElement(false);
69 69
         }
70 70
 
71
-        $buttonContent = $hiddenElement . PHP_EOL
72
-                . '<div class="btn-group" data-toggle="buttons">' . PHP_EOL
73
-                . '<label class="btn btn-default ' . $checkedClass . '">' . PHP_EOL
74
-                . parent::render($element) . $buttonContent . PHP_EOL . '</label>' . PHP_EOL
75
-                . '</div>' . PHP_EOL;
71
+        $buttonContent = $hiddenElement.PHP_EOL
72
+                . '<div class="btn-group" data-toggle="buttons">'.PHP_EOL
73
+                . '<label class="btn btn-default '.$checkedClass.'">'.PHP_EOL
74
+                . parent::render($element).$buttonContent.PHP_EOL.'</label>'.PHP_EOL
75
+                . '</div>'.PHP_EOL;
76 76
         
77 77
         //$buttonContent = '<div><div class="processing yk-hidden"><span class="fa-spin yk-icon-spinner yk-icon"></span> ' .
78 78
         //    $translator->translate('processing', $this->getTranslatorTextDomain()) . '</div><div class="default">' . $escape($buttonContent) . '</div></div>';
Please login to merge, or discard this patch.
module/Jobs/src/Jobs/Entity/AtsMode.php 1 patch
Spacing   +1 added lines, -1 removed lines patch added patch discarded remove patch
@@ -182,7 +182,7 @@
 block discarded – undo
182 182
 	 */
183 183
 	public function setOneClickApply($oneClickApply)
184 184
 	{
185
-		$this->oneClickApply = (bool)$oneClickApply;
185
+		$this->oneClickApply = (bool) $oneClickApply;
186 186
 		
187 187
 		return $this;
188 188
 	}
Please login to merge, or discard this patch.
module/Jobs/src/Jobs/View/Helper/ApplyButtons.php 1 patch
Spacing   +1 added lines, -1 removed lines patch added patch discarded remove patch
@@ -74,7 +74,7 @@
 block discarded – undo
74 74
 		$currentTemplate = $view->viewModel()
75 75
             ->getCurrent()
76 76
             ->getTemplate();
77
-        $partial = dirname($currentTemplate) . '/' . $options['partial'];
77
+        $partial = dirname($currentTemplate).'/'.$options['partial'];
78 78
         
79 79
         if (!$options['oneClickOnly'] && $data['uri']) {
80 80
             $variables['default'] = [
Please login to merge, or discard this patch.
module/Auth/src/Auth/Factory/Listener/ExceptionStrategyFactory.php 1 patch
Spacing   +1 added lines, -1 removed lines patch added patch discarded remove patch
@@ -37,7 +37,7 @@
 block discarded – undo
37 37
             break;
38 38
         }
39 39
         
40
-        $config   = $serviceLocator->get('Config');
40
+        $config = $serviceLocator->get('Config');
41 41
          
42 42
         if (isset($config['view_manager'])) {
43 43
             if (isset($config['view_manager']['display_exceptions'])) {
Please login to merge, or discard this patch.
module/Auth/src/Auth/Repository/User.php 1 patch
Spacing   +5 added lines, -5 removed lines patch added patch discarded remove patch
@@ -116,7 +116,7 @@  discard block
 block discarded – undo
116 116
      */
117 117
     public function findByProfileIdentifier($identifier, $provider, array $options = [])
118 118
     {
119
-        return $this->findOneBy(array('profiles.' . $provider . '.auth.identifier' => $identifier), $options) ?: $this->findOneBy(array('profile.identifier' => $identifier), $options);
119
+        return $this->findOneBy(array('profiles.'.$provider.'.auth.identifier' => $identifier), $options) ?: $this->findOneBy(array('profile.identifier' => $identifier), $options);
120 120
     }
121 121
     
122 122
     /**
@@ -133,7 +133,7 @@  discard block
 block discarded – undo
133 133
         $qb->field('_id')->notEqual($curentUserId)
134 134
             ->addAnd(
135 135
                 $qb->expr()
136
-                    ->addOr($qb->expr()->field('profiles.' . $provider . '.auth.identifier' )->equals($identifier))
136
+                    ->addOr($qb->expr()->field('profiles.'.$provider.'.auth.identifier')->equals($identifier))
137 137
                     ->addOr($qb->expr()->field('profile.identifier')->equals($identifier))
138 138
             );
139 139
         
@@ -189,7 +189,7 @@  discard block
 block discarded – undo
189 189
         return $this->findOneBy(
190 190
             array(
191 191
             '$or' => array(
192
-                array('login' => $identity . $suffix),
192
+                array('login' => $identity.$suffix),
193 193
                 array('info.email' => $identity)
194 194
             )
195 195
             )
@@ -238,10 +238,10 @@  discard block
 block discarded – undo
238 238
     public function findByQuery($query)
239 239
     {
240 240
         $qb = $this->createQueryBuilder();
241
-        $parts  = explode(' ', trim($query));
241
+        $parts = explode(' ', trim($query));
242 242
         
243 243
         foreach ($parts as $q) {
244
-            $regex = new \MongoRegex('/^' . $query . '/i');
244
+            $regex = new \MongoRegex('/^'.$query.'/i');
245 245
             $qb->addOr($qb->expr()->field('info.firstName')->equals($regex));
246 246
             $qb->addOr($qb->expr()->field('info.lastName')->equals($regex));
247 247
             $qb->addOr($qb->expr()->field('info.email')->equals($regex));
Please login to merge, or discard this patch.
module/Auth/src/Auth/Controller/IndexController.php 1 patch
Spacing   +35 added lines, -35 removed lines patch added patch discarded remove patch
@@ -31,8 +31,8 @@  discard block
 block discarded – undo
31 31
 class IndexController extends AbstractActionController
32 32
 {
33 33
 
34
-    const LOGIN='login';
35
-    const REGISTER='register';
34
+    const LOGIN = 'login';
35
+    const REGISTER = 'register';
36 36
 
37 37
     /**
38 38
      * @var AuthenticationService
@@ -88,7 +88,7 @@  discard block
 block discarded – undo
88 88
         $registerForm = $this->forms[self::REGISTER];
89 89
 
90 90
         /* @var $request \Zend\Http\Request */
91
-        $request   = $this->getRequest();
91
+        $request = $this->getRequest();
92 92
 
93 93
         if ($request->isPost()) {
94 94
             $data                          = $this->params()->fromPost();
@@ -106,7 +106,7 @@  discard block
 block discarded – undo
106 106
             if (array_key_exists('credentials', $data) &&
107 107
                 array_key_exists('login', $data['credentials']) &&
108 108
                 array_key_exists('credential', $data['credentials'])) {
109
-                $adapter->setIdentity($data['credentials']['login'] . $loginSuffix)
109
+                $adapter->setIdentity($data['credentials']['login'].$loginSuffix)
110 110
                     ->setCredential($data['credentials']['credential']);
111 111
             }
112 112
             
@@ -122,19 +122,19 @@  discard block
 block discarded – undo
122 122
                     $headers = $request->getHeaders();
123 123
                     if ($headers->has('Accept-Language')) {
124 124
                         $locales = $headers->get('Accept-Language')->getPrioritized();
125
-                        $language  = $locales[0]->type;
125
+                        $language = $locales[0]->type;
126 126
                     } else {
127 127
                         $language = 'en';
128 128
                     }
129 129
                 }
130
-                $this->logger->info('User ' . $user->login . ' logged in');
130
+                $this->logger->info('User '.$user->login.' logged in');
131 131
                 
132 132
                 $ref = $this->params()->fromQuery('ref', false);
133 133
 
134 134
                 if ($ref) {
135 135
                     $ref = urldecode($ref);
136
-                    $url = preg_replace('~/[a-z]{2}(/|$)~', '/' . $language . '$1', $ref);
137
-                    $url = $request->getBasePath() . $url;
136
+                    $url = preg_replace('~/[a-z]{2}(/|$)~', '/'.$language.'$1', $ref);
137
+                    $url = $request->getBasePath().$url;
138 138
                 } else {
139 139
                     $urlHelper = $services->get('ViewHelperManager')->get('url');
140 140
                     $url = $urlHelper('lang', array('lang' => $language));
@@ -144,9 +144,9 @@  discard block
 block discarded – undo
144 144
             } else {
145 145
                 $loginName = $data['credentials']['login'];
146 146
                 if (!empty($loginSuffix)) {
147
-                    $loginName = $loginName . ' (' . $loginName . $loginSuffix . ')';
147
+                    $loginName = $loginName.' ('.$loginName.$loginSuffix.')';
148 148
                 }
149
-                $this->logger->info('Failed to authenticate User ' . $loginName);
149
+                $this->logger->info('Failed to authenticate User '.$loginName);
150 150
                 $this->notification()->danger(/*@translate*/ 'Authentication failed.');
151 151
             }
152 152
         }
@@ -205,11 +205,11 @@  discard block
 block discarded – undo
205 205
             try {
206 206
                 $user          = $auth->getUser();
207 207
                 $password      = substr(md5(uniqid()), 0, 6);
208
-                $login         = uniqid() . ($this->options->auth_suffix != "" ? '@' . $this->options->auth_suffix : '');
209
-                $externalLogin = isset($user->login)?$user->login:'-- not communicated --';
210
-                $this->logger->debug('first login via ' . $provider . ' as: ' . $externalLogin);
208
+                $login         = uniqid().($this->options->auth_suffix != "" ? '@'.$this->options->auth_suffix : '');
209
+                $externalLogin = isset($user->login) ? $user->login : '-- not communicated --';
210
+                $this->logger->debug('first login via '.$provider.' as: '.$externalLogin);
211 211
 
212
-                $user->login=$login;
212
+                $user->login = $login;
213 213
                 $user->setPassword($password);
214 214
                 $user->setRole($this->options->getRole());
215 215
 
@@ -226,11 +226,11 @@  discard block
 block discarded – undo
226 226
                 );
227 227
                 $mail->addTo($user->getInfo()->getEmail());
228 228
 
229
-                $loggerId = $login . ' (' . $provider . ': ' . $externalLogin . ')';
229
+                $loggerId = $login.' ('.$provider.': '.$externalLogin.')';
230 230
                 if (isset($mail) && $this->mailer($mail)) {
231
-                    $this->logger->info('Mail first-login for ' . $loggerId . ' sent to ' . $user->getInfo()->getEmail());
231
+                    $this->logger->info('Mail first-login for '.$loggerId.' sent to '.$user->getInfo()->getEmail());
232 232
                 } else {
233
-                    $this->logger->warn('No Mail was sent for ' . $loggerId);
233
+                    $this->logger->warn('No Mail was sent for '.$loggerId);
234 234
                 }
235 235
             } catch (\Exception $e) {
236 236
                 $this->logger->crit($e);
@@ -241,11 +241,11 @@  discard block
 block discarded – undo
241 241
         }
242 242
         
243 243
         $user = $auth->getUser();
244
-        $this->logger->info('User ' . $auth->getUser()->getInfo()->getDisplayName() . ' logged in via ' . $provider);
244
+        $this->logger->info('User '.$auth->getUser()->getInfo()->getDisplayName().' logged in via '.$provider);
245 245
         $settings = $user->getSettings('Core');
246 246
         if (null !== $settings->localization->language) {
247 247
             $basePath = $this->getRequest()->getBasePath();
248
-            $ref = preg_replace('~^'.$basePath . '/[a-z]{2}(/)?~', $basePath . '/' . $settings->localization->language . '$1', $ref);
248
+            $ref = preg_replace('~^'.$basePath.'/[a-z]{2}(/)?~', $basePath.'/'.$settings->localization->language.'$1', $ref);
249 249
         }
250 250
         return $this->redirect()->toUrl($ref);
251 251
     }
@@ -277,8 +277,8 @@  discard block
 block discarded – undo
277 277
         
278 278
         if ($result->isValid()) {
279 279
             $this->logger->info(
280
-                'User ' . $this->params()->fromPost('user') .
281
-                ' logged via ' . $appKey
280
+                'User '.$this->params()->fromPost('user').
281
+                ' logged via '.$appKey
282 282
             );
283 283
             
284 284
             // the external login may include some parameters for an update
@@ -309,7 +309,7 @@  discard block
 block discarded – undo
309 309
             if (array_key_exists('firstLogin', $resultMessage) && $resultMessage['firstLogin'] === true) {
310 310
                 // first external Login
311 311
                 $userName = $this->params()->fromPost('user');
312
-                $this->logger->debug('first login for User: ' .  $userName);
312
+                $this->logger->debug('first login for User: '.$userName);
313 313
                 //
314 314
                 if (preg_match("/^(.*)@\w+$/", $userName, $realUserName)) {
315 315
                     $userName = $realUserName[1];
@@ -333,7 +333,7 @@  discard block
 block discarded – undo
333 333
 
334 334
                 try {
335 335
                     $this->mailer($mail);
336
-                    $this->logger->info('Mail first-login sent to ' . $userName);
336
+                    $this->logger->info('Mail first-login sent to '.$userName);
337 337
                 } catch (\Zend\Mail\Transport\Exception\ExceptionInterface $e) {
338 338
                     $this->logger->warn('No Mail was sent');
339 339
                     $this->logger->debug($e);
@@ -348,8 +348,8 @@  discard block
 block discarded – undo
348 348
             );
349 349
         } else {
350 350
             $this->logger->info(
351
-                'Failed to authenticate User ' . $this->params()->fromPost('user') .
352
-                ' via ' . $this->params()->fromPost('appKey')
351
+                'Failed to authenticate User '.$this->params()->fromPost('user').
352
+                ' via '.$this->params()->fromPost('appKey')
353 353
             );
354 354
             
355 355
             $this->getResponse()->setStatusCode(403);
@@ -374,8 +374,8 @@  discard block
 block discarded – undo
374 374
                 array(
375 375
                 'format' => 'json',
376 376
                     'group' => array(
377
-                        0 => 'testuser4711', 1 => 'flatscreen', 2 => 'flatscreen1', 3 => 'flatscreen2', 4 => 'flatscreen3',  5 => 'flatscreen4',
378
-                        6 => 'flatscreen5', 7 => 'flatscreen6', 8 => 'flatscreen7',  9 => 'flatscreen8', 10 => 'flatscreen9'
377
+                        0 => 'testuser4711', 1 => 'flatscreen', 2 => 'flatscreen1', 3 => 'flatscreen2', 4 => 'flatscreen3', 5 => 'flatscreen4',
378
+                        6 => 'flatscreen5', 7 => 'flatscreen6', 8 => 'flatscreen7', 9 => 'flatscreen8', 10 => 'flatscreen9'
379 379
                     ),
380 380
                     'name' => '(die) Rauscher – Unternehmensberatung & Consulting',
381 381
                 )
@@ -384,7 +384,7 @@  discard block
 block discarded – undo
384 384
         }
385 385
         $auth = $this->auth;
386 386
         $userGrpAdmin = $auth->getUser();
387
-        $this->logger->info('User ' . $auth->getUser()->getInfo()->getDisplayName());
387
+        $this->logger->info('User '.$auth->getUser()->getInfo()->getDisplayName());
388 388
         $grp = $this->params()->fromQuery('group');
389 389
         
390 390
         // if the request is made by an external host, add his identification-key to the name
@@ -405,16 +405,16 @@  discard block
 block discarded – undo
405 405
             foreach ($params->group as $grp_member) {
406 406
                 try
407 407
                 {
408
-                    $user = $users->findByLogin($grp_member . $loginSuffix);
408
+                    $user = $users->findByLogin($grp_member.$loginSuffix);
409 409
                     if (!empty($user)) {
410 410
                         $groupUserId[] = $user->id;
411 411
                     } else {
412
-                        $notFoundUsers[] = $grp_member . $loginSuffix;
412
+                        $notFoundUsers[] = $grp_member.$loginSuffix;
413 413
                     }
414 414
                 }
415 415
                 catch (\Auth\Exception\UserDeactivatedException $e)
416 416
                 {
417
-                    $notFoundUsers[] = $grp_member . $loginSuffix;
417
+                    $notFoundUsers[] = $grp_member.$loginSuffix;
418 418
                 }
419 419
             }
420 420
         }
@@ -424,9 +424,9 @@  discard block
 block discarded – undo
424 424
             $group->setUsers($groupUserId);
425 425
         }
426 426
         $this->logger->info(
427
-            'Update Group Name: ' . $name . PHP_EOL . str_repeat(' ', 36) . 'Group Owner: ' . $userGrpAdmin->getLogin() . PHP_EOL .
428
-            str_repeat(' ', 36) . 'Group Members Param: ' . implode(',', $params->group) . PHP_EOL .
429
-            str_repeat(' ', 36) . 'Group Members: ' . count($groupUserId) . PHP_EOL . str_repeat(' ', 36) . 'Group Members not found: ' . implode(',', $notFoundUsers)
427
+            'Update Group Name: '.$name.PHP_EOL.str_repeat(' ', 36).'Group Owner: '.$userGrpAdmin->getLogin().PHP_EOL.
428
+            str_repeat(' ', 36).'Group Members Param: '.implode(',', $params->group).PHP_EOL.
429
+            str_repeat(' ', 36).'Group Members: '.count($groupUserId).PHP_EOL.str_repeat(' ', 36).'Group Members not found: '.implode(',', $notFoundUsers)
430 430
         );
431 431
         
432 432
         return new JsonModel(
@@ -443,7 +443,7 @@  discard block
 block discarded – undo
443 443
     public function logoutAction()
444 444
     {
445 445
         $auth = $this->auth;
446
-        $this->logger->info('User ' . ($auth->getUser()->login==''?$auth->getUser()->info->displayName:$auth->getUser()->login) . ' logged out');
446
+        $this->logger->info('User '.($auth->getUser()->login == '' ? $auth->getUser()->info->displayName : $auth->getUser()->login).' logged out');
447 447
         $auth->clearIdentity();
448 448
         unset($_SESSION['HA::STORE']);
449 449
 
Please login to merge, or discard this patch.