Completed
Pull Request — develop (#329)
by Carsten
09:54
created
module/Organizations/src/Organizations/Entity/TemplateInterface.php 1 patch
Doc Comments   +1 added lines, -1 removed lines patch added patch discarded remove patch
@@ -37,7 +37,7 @@
 block discarded – undo
37 37
     /**
38 38
      * Sets the label of the qualifications form field
39 39
      *
40
-     * @param string $labelQualification
40
+     * @param string $labelQualifications
41 41
      *
42 42
      * @return self
43 43
      */
Please login to merge, or discard this patch.
module/Organizations/src/Organizations/Entity/OrganizationInterface.php 1 patch
Indentation   +13 added lines, -13 removed lines patch added patch discarded remove patch
@@ -92,23 +92,23 @@
 block discarded – undo
92 92
     public function getHiringOrganizations();
93 93
 
94 94
     /**
95
-    * Sets the name of the organization
96
-    *
97
-    * @param OrganizationName organizationName
98
-    * @return OrganizationInterface
99
-    */
95
+     * Sets the name of the organization
96
+     *
97
+     * @param OrganizationName organizationName
98
+     * @return OrganizationInterface
99
+     */
100 100
     public function setOrganizationName(OrganizationName $organizationNames);
101 101
 
102
-   /**
103
-    * Gets the name of the organization
104
-    *
105
-    * @return OrganizationName
106
-    */
102
+    /**
103
+     * Gets the name of the organization
104
+     *
105
+     * @return OrganizationName
106
+     */
107 107
     public function getOrganizationName();
108 108
    
109
-      /**
110
-     * @return string
111
-     */
109
+        /**
110
+         * @return string
111
+         */
112 112
     public function getDescription();
113 113
 
114 114
     /**
Please login to merge, or discard this patch.
module/Core/src/Core/Factory/View/Helper/SocialButtonsFactory.php 1 patch
Spacing   +1 added lines, -1 removed lines patch added patch discarded remove patch
@@ -26,7 +26,7 @@
 block discarded – undo
26 26
         /* @var $serviceLocator \Zend\View\HelperPluginManager */
27 27
         $options = $serviceLocator->getServiceLocator()->get('Auth/Options');
28 28
         $config = $serviceLocator->getServiceLocator()->get('Config');
29
-        $helper = new SocialButtons($options,$config);
29
+        $helper = new SocialButtons($options, $config);
30 30
         return $helper;
31 31
     }
32 32
 }
Please login to merge, or discard this patch.
module/Core/src/Core/View/Helper/SocialButtons.php 1 patch
Spacing   +4 added lines, -4 removed lines patch added patch discarded remove patch
@@ -28,7 +28,7 @@  discard block
 block discarded – undo
28 28
      * @param $options ModuleOptions
29 29
      * @param $config array
30 30
      */
31
-    public function __construct($options,$config)
31
+    public function __construct($options, $config)
32 32
     {
33 33
         $this->options = $options;
34 34
         $this->config = $config;
@@ -42,9 +42,9 @@  discard block
 block discarded – undo
42 42
      */
43 43
     public function __invoke()
44 44
     {
45
-        $SocialNetworksEnabled=[];
46
-        foreach($this->config['hybridauth'] as $key => $val) {
47
-            if ($val['enabled'] and in_array(strtolower($key), $this->options->getEnableLogins())){
45
+        $SocialNetworksEnabled = [];
46
+        foreach ($this->config['hybridauth'] as $key => $val) {
47
+            if ($val['enabled'] and in_array(strtolower($key), $this->options->getEnableLogins())) {
48 48
                 $SocialNetworksEnabled[strtolower($key)] = $key;
49 49
             }
50 50
         }
Please login to merge, or discard this patch.
module/Auth/src/Auth/Repository/User.php 3 patches
Indentation   +1 added lines, -1 removed lines patch added patch discarded remove patch
@@ -194,7 +194,7 @@
 block discarded – undo
194 194
             $qb->addOr($qb->expr()->field('info.email')->equals($regex));
195 195
         }
196 196
         $qb->sort(array('info.lastName' => 1))
197
-           ->sort(array('info.email' => 1));
197
+            ->sort(array('info.email' => 1));
198 198
         
199 199
         return $qb->getQuery()->execute();
200 200
     }
Please login to merge, or discard this patch.
Doc Comments   +5 added lines, -5 removed lines patch added patch discarded remove patch
@@ -52,7 +52,7 @@  discard block
 block discarded – undo
52 52
      * @throws Mapping\MappingException
53 53
      * @throws LockException
54 54
      * @throws UserDeactivatedException
55
-     * @return null | UserInterface
55
+     * @return null|UserInterface | UserInterface
56 56
      */
57 57
     public function find($id, $lockMode = \Doctrine\ODM\MongoDB\LockMode::NONE, $lockVersion = null, array $options = [])
58 58
     {
@@ -63,7 +63,7 @@  discard block
 block discarded – undo
63 63
      * @param array $criteria
64 64
      * @param array $options
65 65
      * @throws UserDeactivatedException
66
-     * @return null | UserInterface
66
+     * @return null|UserInterface | UserInterface
67 67
      */
68 68
     public function findOneBy(array $criteria, array $options = [])
69 69
     {
@@ -92,7 +92,7 @@  discard block
 block discarded – undo
92 92
      * Creates a User
93 93
      *
94 94
      * @see \Core\Repository\AbstractRepository::create()
95
-     * @return UserInterface
95
+     * @return \Core\Entity\EntityInterface
96 96
      */
97 97
     public function create(array $data = null)
98 98
     {
@@ -156,7 +156,7 @@  discard block
 block discarded – undo
156 156
     }
157 157
 
158 158
     /**
159
-     * @param      $email
159
+     * @param      string $email
160 160
      * @param bool $isDraft
161 161
      *
162 162
      * @return UserInterface|null
@@ -267,7 +267,7 @@  discard block
 block discarded – undo
267 267
      * @param UserInterface $user
268 268
      * @param array $options
269 269
      * @throws UserDeactivatedException
270
-     * @return null | UserInterface
270
+     * @return null|UserInterface | UserInterface
271 271
      */
272 272
     protected function assertEntity(UserInterface $user = null, array $options)
273 273
     {
Please login to merge, or discard this 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 3 patches
Doc Comments   +1 added lines, -1 removed lines patch added patch discarded remove patch
@@ -54,7 +54,7 @@
 block discarded – undo
54 54
      * @param $auth  AuthenticationService
55 55
      * @param $logger LoggerInterface
56 56
      * @param $forms
57
-     * @param $options ModuleOptions
57
+     * @param ModuleOptions $options ModuleOptions
58 58
      */
59 59
     public function __construct(AuthenticationService $auth, LoggerInterface $logger,array $forms, $options)
60 60
     {
Please login to merge, or discard this patch.
Braces   +1 added lines, -2 removed lines patch added patch discarded remove patch
@@ -411,8 +411,7 @@
 block discarded – undo
411 411
                     } else {
412 412
                         $notFoundUsers[] = $grp_member . $loginSuffix;
413 413
                     }
414
-                }
415
-                catch (\Auth\Exception\UserDeactivatedException $e)
414
+                } catch (\Auth\Exception\UserDeactivatedException $e)
416 415
                 {
417 416
                     $notFoundUsers[] = $grp_member . $loginSuffix;
418 417
                 }
Please login to merge, or discard this patch.
Spacing   +34 added lines, -34 removed lines patch added patch discarded remove patch
@@ -34,8 +34,8 @@  discard block
 block discarded – undo
34 34
 class IndexController extends AbstractActionController
35 35
 {
36 36
 
37
-    const LOGIN='login';
38
-    const REGISTER='register';
37
+    const LOGIN = 'login';
38
+    const REGISTER = 'register';
39 39
 
40 40
     /**
41 41
      * @var AuthenticationService
@@ -91,7 +91,7 @@  discard block
 block discarded – undo
91 91
         $registerForm = $this->forms[self::REGISTER];
92 92
 
93 93
         /* @var $request \Zend\Http\Request */
94
-        $request   = $this->getRequest();
94
+        $request = $this->getRequest();
95 95
 
96 96
         if ($request->isPost()) {
97 97
             $data                          = $this->params()->fromPost();
@@ -109,7 +109,7 @@  discard block
 block discarded – undo
109 109
             if (array_key_exists('credentials', $data) &&
110 110
                 array_key_exists('login', $data['credentials']) &&
111 111
                 array_key_exists('credential', $data['credentials'])) {
112
-                $adapter->setIdentity($data['credentials']['login'] . $loginSuffix)
112
+                $adapter->setIdentity($data['credentials']['login'].$loginSuffix)
113 113
                     ->setCredential($data['credentials']['credential']);
114 114
             }
115 115
             
@@ -120,14 +120,14 @@  discard block
 block discarded – undo
120 120
             if ($result->isValid()) {
121 121
                 $user = $auth->getUser();
122 122
                 $language = $services->get('Core/Locale')->detectLanguage($request, $user);
123
-                $this->logger->info('User ' . $user->login . ' logged in');
123
+                $this->logger->info('User '.$user->login.' logged in');
124 124
                 
125 125
                 $ref = $this->params()->fromQuery('ref', false);
126 126
 
127 127
                 if ($ref) {
128 128
                     $ref = urldecode($ref);
129
-                    $url = preg_replace('~/[a-z]{2}(/|$)~', '/' . $language . '$1', $ref);
130
-                    $url = $request->getBasePath() . $url;
129
+                    $url = preg_replace('~/[a-z]{2}(/|$)~', '/'.$language.'$1', $ref);
130
+                    $url = $request->getBasePath().$url;
131 131
                 } else {
132 132
                     $urlHelper = $services->get('ViewHelperManager')->get('url');
133 133
                     $url = $urlHelper('lang', array('lang' => $language));
@@ -137,9 +137,9 @@  discard block
 block discarded – undo
137 137
             } else {
138 138
                 $loginName = $data['credentials']['login'];
139 139
                 if (!empty($loginSuffix)) {
140
-                    $loginName = $loginName . ' (' . $loginName . $loginSuffix . ')';
140
+                    $loginName = $loginName.' ('.$loginName.$loginSuffix.')';
141 141
                 }
142
-                $this->logger->info('Failed to authenticate User ' . $loginName);
142
+                $this->logger->info('Failed to authenticate User '.$loginName);
143 143
                 $this->notification()->danger(/*@translate*/ 'Authentication failed.');
144 144
             }
145 145
         }
@@ -198,11 +198,11 @@  discard block
 block discarded – undo
198 198
             try {
199 199
                 $user          = $auth->getUser();
200 200
                 $password      = substr(md5(uniqid()), 0, 6);
201
-                $login         = uniqid() . ($this->options->auth_suffix != "" ? '@' . $this->options->auth_suffix : '');
202
-                $externalLogin = isset($user->login)?$user->login:'-- not communicated --';
203
-                $this->logger->debug('first login via ' . $provider . ' as: ' . $externalLogin);
201
+                $login         = uniqid().($this->options->auth_suffix != "" ? '@'.$this->options->auth_suffix : '');
202
+                $externalLogin = isset($user->login) ? $user->login : '-- not communicated --';
203
+                $this->logger->debug('first login via '.$provider.' as: '.$externalLogin);
204 204
 
205
-                $user->login=$login;
205
+                $user->login = $login;
206 206
                 $user->setPassword($password);
207 207
                 $user->setRole($this->options->getRole());
208 208
 
@@ -219,11 +219,11 @@  discard block
 block discarded – undo
219 219
                 );
220 220
                 $mail->addTo($user->getInfo()->getEmail());
221 221
 
222
-                $loggerId = $login . ' (' . $provider . ': ' . $externalLogin . ')';
222
+                $loggerId = $login.' ('.$provider.': '.$externalLogin.')';
223 223
                 if (isset($mail) && $this->mailer($mail)) {
224
-                    $this->logger->info('Mail first-login for ' . $loggerId . ' sent to ' . $user->getInfo()->getEmail());
224
+                    $this->logger->info('Mail first-login for '.$loggerId.' sent to '.$user->getInfo()->getEmail());
225 225
                 } else {
226
-                    $this->logger->warn('No Mail was sent for ' . $loggerId);
226
+                    $this->logger->warn('No Mail was sent for '.$loggerId);
227 227
                 }
228 228
             } catch (\Exception $e) {
229 229
                 $this->logger->crit($e);
@@ -234,11 +234,11 @@  discard block
 block discarded – undo
234 234
         }
235 235
         
236 236
         $user = $auth->getUser();
237
-        $this->logger->info('User ' . $auth->getUser()->getInfo()->getDisplayName() . ' logged in via ' . $provider);
237
+        $this->logger->info('User '.$auth->getUser()->getInfo()->getDisplayName().' logged in via '.$provider);
238 238
         $settings = $user->getSettings('Core');
239 239
         if (null !== $settings->localization->language) {
240 240
             $basePath = $this->getRequest()->getBasePath();
241
-            $ref = preg_replace('~^'.$basePath . '/[a-z]{2}(?=/|$)~', $basePath . '/' . $settings->localization->language, $ref);
241
+            $ref = preg_replace('~^'.$basePath.'/[a-z]{2}(?=/|$)~', $basePath.'/'.$settings->localization->language, $ref);
242 242
         }
243 243
         return $this->redirect()->toUrl($ref);
244 244
     }
@@ -270,8 +270,8 @@  discard block
 block discarded – undo
270 270
         
271 271
         if ($result->isValid()) {
272 272
             $this->logger->info(
273
-                'User ' . $this->params()->fromPost('user') .
274
-                ' logged via ' . $appKey
273
+                'User '.$this->params()->fromPost('user').
274
+                ' logged via '.$appKey
275 275
             );
276 276
             
277 277
             // the external login may include some parameters for an update
@@ -302,7 +302,7 @@  discard block
 block discarded – undo
302 302
             if (array_key_exists('firstLogin', $resultMessage) && $resultMessage['firstLogin'] === true) {
303 303
                 // first external Login
304 304
                 $userName = $this->params()->fromPost('user');
305
-                $this->logger->debug('first login for User: ' .  $userName);
305
+                $this->logger->debug('first login for User: '.$userName);
306 306
                 //
307 307
                 if (preg_match('/^(.*)@\w+$/', $userName, $realUserName)) {
308 308
                     $userName = $realUserName[1];
@@ -326,7 +326,7 @@  discard block
 block discarded – undo
326 326
 
327 327
                 try {
328 328
                     $this->mailer($mail);
329
-                    $this->logger->info('Mail first-login sent to ' . $userName);
329
+                    $this->logger->info('Mail first-login sent to '.$userName);
330 330
                 } catch (\Zend\Mail\Transport\Exception\ExceptionInterface $e) {
331 331
                     $this->logger->warn('No Mail was sent');
332 332
                     $this->logger->debug($e);
@@ -341,8 +341,8 @@  discard block
 block discarded – undo
341 341
             );
342 342
         } else {
343 343
             $this->logger->info(
344
-                'Failed to authenticate User ' . $this->params()->fromPost('user') .
345
-                ' via ' . $this->params()->fromPost('appKey')
344
+                'Failed to authenticate User '.$this->params()->fromPost('user').
345
+                ' via '.$this->params()->fromPost('appKey')
346 346
             );
347 347
             
348 348
             $this->getResponse()->setStatusCode(Response::STATUS_CODE_401);
@@ -367,8 +367,8 @@  discard block
 block discarded – undo
367 367
                 array(
368 368
                 'format' => 'json',
369 369
                     'group' => array(
370
-                        0 => 'testuser4711', 1 => 'flatscreen', 2 => 'flatscreen1', 3 => 'flatscreen2', 4 => 'flatscreen3',  5 => 'flatscreen4',
371
-                        6 => 'flatscreen5', 7 => 'flatscreen6', 8 => 'flatscreen7',  9 => 'flatscreen8', 10 => 'flatscreen9'
370
+                        0 => 'testuser4711', 1 => 'flatscreen', 2 => 'flatscreen1', 3 => 'flatscreen2', 4 => 'flatscreen3', 5 => 'flatscreen4',
371
+                        6 => 'flatscreen5', 7 => 'flatscreen6', 8 => 'flatscreen7', 9 => 'flatscreen8', 10 => 'flatscreen9'
372 372
                     ),
373 373
                     'name' => '(die) Rauscher – Unternehmensberatung & Consulting',
374 374
                 )
@@ -377,7 +377,7 @@  discard block
 block discarded – undo
377 377
         }
378 378
         $auth = $this->auth;
379 379
         $userGrpAdmin = $auth->getUser();
380
-        $this->logger->info('User ' . $auth->getUser()->getInfo()->getDisplayName());
380
+        $this->logger->info('User '.$auth->getUser()->getInfo()->getDisplayName());
381 381
         $grp = $this->params()->fromQuery('group');
382 382
         
383 383
         // if the request is made by an external host, add his identification-key to the name
@@ -398,16 +398,16 @@  discard block
 block discarded – undo
398 398
             foreach ($params->group as $grp_member) {
399 399
                 try
400 400
                 {
401
-                    $user = $users->findByLogin($grp_member . $loginSuffix);
401
+                    $user = $users->findByLogin($grp_member.$loginSuffix);
402 402
                     if (!empty($user)) {
403 403
                         $groupUserId[] = $user->id;
404 404
                     } else {
405
-                        $notFoundUsers[] = $grp_member . $loginSuffix;
405
+                        $notFoundUsers[] = $grp_member.$loginSuffix;
406 406
                     }
407 407
                 }
408 408
                 catch (\Auth\Exception\UserDeactivatedException $e)
409 409
                 {
410
-                    $notFoundUsers[] = $grp_member . $loginSuffix;
410
+                    $notFoundUsers[] = $grp_member.$loginSuffix;
411 411
                 }
412 412
             }
413 413
         }
@@ -417,9 +417,9 @@  discard block
 block discarded – undo
417 417
             $group->setUsers($groupUserId);
418 418
         }
419 419
         $this->logger->info(
420
-            'Update Group Name: ' . $name . PHP_EOL . str_repeat(' ', 36) . 'Group Owner: ' . $userGrpAdmin->getLogin() . PHP_EOL .
421
-            str_repeat(' ', 36) . 'Group Members Param: ' . implode(',', $params->group) . PHP_EOL .
422
-            str_repeat(' ', 36) . 'Group Members: ' . count($groupUserId) . PHP_EOL . str_repeat(' ', 36) . 'Group Members not found: ' . implode(',', $notFoundUsers)
420
+            'Update Group Name: '.$name.PHP_EOL.str_repeat(' ', 36).'Group Owner: '.$userGrpAdmin->getLogin().PHP_EOL.
421
+            str_repeat(' ', 36).'Group Members Param: '.implode(',', $params->group).PHP_EOL.
422
+            str_repeat(' ', 36).'Group Members: '.count($groupUserId).PHP_EOL.str_repeat(' ', 36).'Group Members not found: '.implode(',', $notFoundUsers)
423 423
         );
424 424
         
425 425
         return new JsonModel(
@@ -436,7 +436,7 @@  discard block
 block discarded – undo
436 436
     public function logoutAction()
437 437
     {
438 438
         $auth = $this->auth;
439
-        $this->logger->info('User ' . ($auth->getUser()->login==''?$auth->getUser()->info->displayName:$auth->getUser()->login) . ' logged out');
439
+        $this->logger->info('User '.($auth->getUser()->login == '' ? $auth->getUser()->info->displayName : $auth->getUser()->login).' logged out');
440 440
         $auth->clearIdentity();
441 441
         unset($_SESSION['HA::STORE']);
442 442
 
Please login to merge, or discard this patch.
module/Auth/src/Auth/Options/CaptchaOptions.php 2 patches
Doc Comments   +1 added lines, -1 removed lines patch added patch discarded remove patch
@@ -70,7 +70,7 @@
 block discarded – undo
70 70
     }
71 71
 
72 72
     /**
73
-     * @return bool
73
+     * @return string
74 74
      */
75 75
     public function getMode()
76 76
     {
Please login to merge, or discard this patch.
Spacing   +3 added lines, -3 removed lines patch added patch discarded remove patch
@@ -40,9 +40,9 @@
 block discarded – undo
40 40
      * @var array
41 41
      */
42 42
     protected $reCaptcha = [
43
-        'public_key' => 'Your Recapture Public Key',      // "site_key"
44
-        'private_key' => 'Your Recapture Private Key',    // "secret_key"
45
-        'ssl' => true,                                    // include google api via http(s)
43
+        'public_key' => 'Your Recapture Public Key', // "site_key"
44
+        'private_key' => 'Your Recapture Private Key', // "secret_key"
45
+        'ssl' => true, // include google api via http(s)
46 46
         ];
47 47
 
48 48
     /**
Please login to merge, or discard this patch.
module/Jobs/src/Jobs/Controller/ApiJobListByOrganizationController.php 1 patch
Spacing   +1 added lines, -1 removed lines patch added patch discarded remove patch
@@ -41,7 +41,7 @@
 block discarded – undo
41 41
             $response->setStatusCode(Response::STATUS_CODE_404);
42 42
             return $response;
43 43
         }
44
-        $jsonModel=new JsonModel();
44
+        $jsonModel = new JsonModel();
45 45
         $jsonModel->setVariables($this->apiJobDehydrator->dehydrateList($jobs));
46 46
         $jsonModel->setJsonpCallback('yawikParseJobs');
47 47
 
Please login to merge, or discard this patch.
module/Jobs/src/Jobs/Form/TemplateLabelBenefits.php 1 patch
Indentation   +1 added lines, -1 removed lines patch added patch discarded remove patch
@@ -62,6 +62,6 @@
 block discarded – undo
62 62
                     )
63 63
                 )
64 64
             )
65
-       );
65
+        );
66 66
     }
67 67
 }
Please login to merge, or discard this patch.