Completed
Push — develop ( 60c2a6...7c4b2f )
by Carsten
61:42 queued 47:32
created
module/Auth/src/Auth/Controller/IndexController.php 3 patches
Indentation   +1 added lines, -1 removed lines patch added patch discarded remove patch
@@ -352,7 +352,7 @@
 block discarded – undo
352 352
     {
353 353
         //$adapter = $this->getServiceLocator()->get('ExternalApplicationAdapter');
354 354
         if (false) {
355
-             $this->request->setMethod('get');
355
+                $this->request->setMethod('get');
356 356
             $params = new Parameters(
357 357
                 array(
358 358
                 'format' => 'json',
Please login to merge, or discard this patch.
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.
Spacing   +15 added lines, -15 removed lines patch added patch discarded remove patch
@@ -27,8 +27,8 @@  discard block
 block discarded – undo
27 27
 class IndexController extends AbstractActionController
28 28
 {
29 29
 
30
-    const LOGIN='login';
31
-    const REGISTER='register';
30
+    const LOGIN = 'login';
31
+    const REGISTER = 'register';
32 32
 
33 33
     /**
34 34
      * @var AuthenticationService
@@ -56,7 +56,7 @@  discard block
 block discarded – undo
56 56
      * @param $forms
57 57
      * @param $options ModuleOptions
58 58
      */
59
-    public function __construct(AuthenticationService $auth, LoggerInterface $logger,array $forms, $options)
59
+    public function __construct(AuthenticationService $auth, LoggerInterface $logger, array $forms, $options)
60 60
     {
61 61
         $this->auth = $auth;
62 62
         $this->forms = $forms;
@@ -84,7 +84,7 @@  discard block
 block discarded – undo
84 84
         $registerForm = $this->forms[self::REGISTER];
85 85
 
86 86
         /* @var $request \Zend\Http\Request */
87
-        $request   = $this->getRequest();
87
+        $request = $this->getRequest();
88 88
 
89 89
         if ($request->isPost()) {
90 90
             $data                          = $this->params()->fromPost();
@@ -118,7 +118,7 @@  discard block
 block discarded – undo
118 118
                     $headers = $request->getHeaders();
119 119
                     if ($headers->has('Accept-Language')) {
120 120
                         $locales = $headers->get('Accept-Language')->getPrioritized();
121
-                        $language  = $locales[0]->type;
121
+                        $language = $locales[0]->type;
122 122
                     } else {
123 123
                         $language = 'en';
124 124
                     }
@@ -143,7 +143,7 @@  discard block
 block discarded – undo
143 143
                 if (!empty($loginSuffix)) {
144 144
                     $loginName = $loginName . ' (' . $loginName . $loginSuffix . ')';
145 145
                 }
146
-                $this->logger->info('Failed to authenticate User ' . $loginName );
146
+                $this->logger->info('Failed to authenticate User ' . $loginName);
147 147
                 $this->notification()->danger(/*@translate*/ 'Authentication failed.');
148 148
             }
149 149
         }
@@ -190,7 +190,7 @@  discard block
 block discarded – undo
190 190
      */
191 191
     public function loginAction()
192 192
     {
193
-        $ref = urldecode($this->getRequest()->getBasePath().$this->params()->fromQuery('ref'));
193
+        $ref = urldecode($this->getRequest()->getBasePath() . $this->params()->fromQuery('ref'));
194 194
         $provider = $this->params('provider', '--keiner--');
195 195
         $hauth = $this->getServiceLocator()->get('HybridAuthAdapter');
196 196
         $hauth->setProvider($provider);
@@ -203,10 +203,10 @@  discard block
 block discarded – undo
203 203
                 $user          = $auth->getUser();
204 204
                 $password      = substr(md5(uniqid()), 0, 6);
205 205
                 $login         = uniqid() . ($this->options->auth_suffix != "" ? '@' . $this->options->auth_suffix : '');
206
-                $externalLogin = isset($user->login)?$user->login:'-- not communicated --';
206
+                $externalLogin = isset($user->login) ? $user->login : '-- not communicated --';
207 207
                 $this->logger->debug('first login via ' . $provider . ' as: ' . $externalLogin);
208 208
 
209
-                $user->login=$login;
209
+                $user->login = $login;
210 210
                 $user->setPassword($password);
211 211
                 $user->role = $this->options->getRole();
212 212
 
@@ -242,7 +242,7 @@  discard block
 block discarded – undo
242 242
         $settings = $user->getSettings('Core');
243 243
         if (null !== $settings->localization->language) {
244 244
             $basePath = $this->getRequest()->getBasePath();
245
-            $ref = preg_replace('~^'.$basePath . '/[a-z]{2}(/)?~', $basePath . '/' . $settings->localization->language . '$1', $ref);
245
+            $ref = preg_replace('~^' . $basePath . '/[a-z]{2}(/)?~', $basePath . '/' . $settings->localization->language . '$1', $ref);
246 246
         }
247 247
         return $this->redirect()->toUrl($ref);
248 248
     }
@@ -306,7 +306,7 @@  discard block
 block discarded – undo
306 306
             if (array_key_exists('firstLogin', $resultMessage) && $resultMessage['firstLogin'] === true) {
307 307
                 // first external Login
308 308
                 $userName = $this->params()->fromPost('user');
309
-                $this->logger->debug('first login for User: ' .  $userName);
309
+                $this->logger->debug('first login for User: ' . $userName);
310 310
                 //
311 311
                 if (preg_match("/^(.*)@\w+$/", $userName, $realUserName)) {
312 312
                     $userName = $realUserName[1];
@@ -371,9 +371,9 @@  discard block
 block discarded – undo
371 371
             $params = new Parameters(
372 372
                 array(
373 373
                 'format' => 'json',
374
-                    'group' => array (
375
-                        0 => 'testuser4711', 1 => 'flatscreen', 2 => 'flatscreen1', 3 => 'flatscreen2', 4 => 'flatscreen3',  5 => 'flatscreen4',
376
-                        6 => 'flatscreen5', 7 => 'flatscreen6', 8 => 'flatscreen7',  9 => 'flatscreen8', 10 => 'flatscreen9'
374
+                    'group' => array(
375
+                        0 => 'testuser4711', 1 => 'flatscreen', 2 => 'flatscreen1', 3 => 'flatscreen2', 4 => 'flatscreen3', 5 => 'flatscreen4',
376
+                        6 => 'flatscreen5', 7 => 'flatscreen6', 8 => 'flatscreen7', 9 => 'flatscreen8', 10 => 'flatscreen9'
377 377
                     ),
378 378
                     'name' => '(die) Rauscher – Unternehmensberatung & Consulting',
379 379
                 )
@@ -435,7 +435,7 @@  discard block
 block discarded – undo
435 435
     public function logoutAction()
436 436
     {
437 437
         $auth = $this->auth;
438
-        $this->logger->info('User ' . ($auth->getUser()->login==''?$auth->getUser()->info->displayName:$auth->getUser()->login) . ' logged out');
438
+        $this->logger->info('User ' . ($auth->getUser()->login == '' ? $auth->getUser()->info->displayName : $auth->getUser()->login) . ' logged out');
439 439
         $auth->clearIdentity();
440 440
         unset($_SESSION['HA::STORE']);
441 441
 
Please login to merge, or discard this patch.
module/Auth/src/Auth/Controller/ManageController.php 2 patches
Spacing   +1 added lines, -1 removed lines patch added patch discarded remove patch
@@ -40,7 +40,7 @@
 block discarded – undo
40 40
     public function profileAction()
41 41
     {
42 42
         $services = $this->getServiceLocator();
43
-        $container= $services->get('forms')->get('Auth/userprofilecontainer');
43
+        $container = $services->get('forms')->get('Auth/userprofilecontainer');
44 44
         $user     = $services->get('AuthenticationService')->getUser();
45 45
         
46 46
         $container->setEntity($user);
Please login to merge, or discard this patch.
Indentation   +6 added lines, -6 removed lines patch added patch discarded remove patch
@@ -1,11 +1,11 @@
 block discarded – undo
1 1
 <?php
2 2
 /**
3
- * YAWIK
4
- *
5
- * @filesource
6
- * @copyright (c) 2013-2015 Cross Solution (http://cross-solution.de)
7
- * @license   MIT
8
- */
3
+     * YAWIK
4
+     *
5
+     * @filesource
6
+     * @copyright (c) 2013-2015 Cross Solution (http://cross-solution.de)
7
+     * @license   MIT
8
+     */
9 9
 
10 10
 /** SettingsEntityResolverFactory.php */
11 11
 namespace Settings\Repository;
Please login to merge, or discard this patch.
module/Auth/src/Auth/Controller/ManageGroupsController.php 2 patches
Spacing   +3 added lines, -3 removed lines patch added patch discarded remove patch
@@ -48,7 +48,7 @@  discard block
 block discarded – undo
48 48
          */
49 49
         $events->attach(
50 50
             MvcEvent::EVENT_DISPATCH,
51
-            function ($event) {
51
+            function($event) {
52 52
                 $routeMatch = $event->getRouteMatch();
53 53
                 $action     = $routeMatch->getParam('action');
54 54
             
@@ -68,7 +68,7 @@  discard block
 block discarded – undo
68 68
          */
69 69
         $events->attach(
70 70
             MvcEvent::EVENT_DISPATCH,
71
-            function ($event) {
71
+            function($event) {
72 72
                 $model = $event->getResult();
73 73
                 if (!$model instanceof ViewModel || $model->terminate()) {
74 74
                     return;
@@ -198,7 +198,7 @@  discard block
 block discarded – undo
198 198
             $users = $repository->findByQuery($query);
199 199
         
200 200
             $userFilter = $services->get('filtermanager')->get('Auth/Entity/UserToSearchResult');
201
-            $filterFunc = function ($user) use ($userFilter) {
201
+            $filterFunc = function($user) use ($userFilter) {
202 202
                 return $userFilter->filter($user);
203 203
             };
204 204
             $result     = array_values(array_map($filterFunc, $users->toArray()));
Please login to merge, or discard this patch.
Indentation   +6 added lines, -6 removed lines patch added patch discarded remove patch
@@ -1,11 +1,11 @@
 block discarded – undo
1 1
 <?php
2 2
 /**
3
- * YAWIK
4
- *
5
- * @filesource
6
- * @copyright (c) 2013-2015 Cross Solution (http://cross-solution.de)
7
- * @license   MIT
8
- */
3
+     * YAWIK
4
+     *
5
+     * @filesource
6
+     * @copyright (c) 2013-2015 Cross Solution (http://cross-solution.de)
7
+     * @license   MIT
8
+     */
9 9
 
10 10
 /** SettingsEntityResolverFactory.php */
11 11
 namespace Settings\Repository;
Please login to merge, or discard this patch.
module/Auth/src/Auth/Controller/Plugin/OAuth.php 2 patches
Spacing   +1 added lines, -1 removed lines patch added patch discarded remove patch
@@ -135,7 +135,7 @@
 block discarded – undo
135 135
                 $hybridAuth->restoreSessionData($sessionDataStored);
136 136
             }
137 137
             $adapter = $hybridAuth->authenticate($this->providerKey);
138
-            $sessionData    = $hybridAuth->getSessionData();
138
+            $sessionData = $hybridAuth->getSessionData();
139 139
             if ($sessionData != $sessionDataStored) {
140 140
                 $user->updateAuthSession($this->providerKey, $sessionData);
141 141
             }
Please login to merge, or discard this patch.
Indentation   +7 added lines, -7 removed lines patch added patch discarded remove patch
@@ -1,12 +1,12 @@
 block discarded – undo
1 1
 <?php
2 2
 /**
3
- * YAWIK
4
- *
5
- * @filesource
6
- * @copyright (c) 2013-2015 Cross Solution (http://cross-solution.de)
7
- * @license   MIT
8
- * @author    [email protected]
9
- */
3
+     * YAWIK
4
+     *
5
+     * @filesource
6
+     * @copyright (c) 2013-2015 Cross Solution (http://cross-solution.de)
7
+     * @license   MIT
8
+     * @author    [email protected]
9
+     */
10 10
 
11 11
 namespace Organizations\Form;
12 12
 
Please login to merge, or discard this patch.
module/Auth/src/Auth/Controller/Plugin/SocialProfiles/AbstractAdapter.php 2 patches
Spacing   +1 added lines, -1 removed lines patch added patch discarded remove patch
@@ -23,7 +23,7 @@
 block discarded – undo
23 23
     
24 24
     public function fetch($api)
25 25
     {
26
-        $result  = $this->queryApi($api);
26
+        $result = $this->queryApi($api);
27 27
         if (!$result) {
28 28
             return false;
29 29
         }
Please login to merge, or discard this patch.
Indentation   +6 added lines, -6 removed lines patch added patch discarded remove patch
@@ -1,11 +1,11 @@
 block discarded – undo
1 1
 <?php
2 2
 /**
3
- * YAWIK
4
- *
5
- * @filesource
6
- * @copyright (c) 2013-2015 Cross Solution (http://cross-solution.de)
7
- * @license   MIT
8
- */
3
+     * YAWIK
4
+     *
5
+     * @filesource
6
+     * @copyright (c) 2013-2015 Cross Solution (http://cross-solution.de)
7
+     * @license   MIT
8
+     */
9 9
 
10 10
 /** SettingsEntityResolverFactory.php */
11 11
 namespace Settings\Repository;
Please login to merge, or discard this patch.
module/Auth/src/Auth/Controller/Plugin/SocialProfiles/LinkedIn.php 2 patches
Spacing   +1 added lines, -1 removed lines patch added patch discarded remove patch
@@ -135,7 +135,7 @@
 block discarded – undo
135 135
         return array(
136 136
             'year' => strval($xml->year),
137 137
             'month'=> isset($xml->month) ? strval($xml->month) : '01',
138
-            'day'  => isset($xml->day)   ? strval($xml->day)   : '01',
138
+            'day'  => isset($xml->day) ? strval($xml->day) : '01',
139 139
         );
140 140
         
141 141
     }
Please login to merge, or discard this patch.
Indentation   +6 added lines, -6 removed lines patch added patch discarded remove patch
@@ -1,11 +1,11 @@
 block discarded – undo
1 1
 <?php
2 2
 /**
3
- * YAWIK
4
- *
5
- * @filesource
6
- * @copyright (c) 2013-2015 Cross Solution (http://cross-solution.de)
7
- * @license   MIT
8
- */
3
+     * YAWIK
4
+     *
5
+     * @filesource
6
+     * @copyright (c) 2013-2015 Cross Solution (http://cross-solution.de)
7
+     * @license   MIT
8
+     */
9 9
 
10 10
 /** SettingsEntityResolverFactory.php */
11 11
 namespace Settings\Repository;
Please login to merge, or discard this patch.
module/Auth/src/Auth/Entity/SocialProfiles/AbstractProfile.php 2 patches
Spacing   +2 added lines, -2 removed lines patch added patch discarded remove patch
@@ -230,7 +230,7 @@  discard block
 block discarded – undo
230 230
         
231 231
         if ($dataArray) {
232 232
             foreach ($dataArray as $data) {
233
-                $data    = $this->$filter($data);
233
+                $data = $this->$filter($data);
234 234
                 if (!count($data)) {
235 235
                     continue;
236 236
                 }
@@ -286,7 +286,7 @@  discard block
 block discarded – undo
286 286
     {
287 287
         $entity = isset($this->config[$type]['entity'])
288 288
                 ? $this->config[$type]['entity']
289
-                : '\Cv\Entity\\'. ucfirst(rtrim($type, 's'));
289
+                : '\Cv\Entity\\' . ucfirst(rtrim($type, 's'));
290 290
         
291 291
         if (is_string($entity)) {
292 292
             $this->config[$type]['entity'] = $entity = new $entity();
Please login to merge, or discard this patch.
Indentation   +6 added lines, -6 removed lines patch added patch discarded remove patch
@@ -1,11 +1,11 @@
 block discarded – undo
1 1
 <?php
2 2
 /**
3
- * YAWIK
4
- *
5
- * @filesource
6
- * @copyright (c) 2013-2015 Cross Solution (http://cross-solution.de)
7
- * @license   MIT
8
- */
3
+     * YAWIK
4
+     *
5
+     * @filesource
6
+     * @copyright (c) 2013-2015 Cross Solution (http://cross-solution.de)
7
+     * @license   MIT
8
+     */
9 9
 
10 10
 /** SettingsEntityResolverFactory.php */
11 11
 namespace Settings\Repository;
Please login to merge, or discard this patch.
module/Auth/src/Auth/Entity/User.php 2 patches
Indentation   +5 added lines, -5 removed lines patch added patch discarded remove patch
@@ -1,10 +1,10 @@
 block discarded – undo
1 1
 <?php
2 2
 /**
3
- * YAWIK
4
- *
5
- * @copyright (c) 2013-2015 Cross Solution (http://cross-solution.de)
6
- * @license       MIT
7
- */
3
+     * YAWIK
4
+     *
5
+     * @copyright (c) 2013-2015 Cross Solution (http://cross-solution.de)
6
+     * @license       MIT
7
+     */
8 8
 
9 9
 namespace Auth\Entity;
10 10
 
Please login to merge, or discard this patch.
Spacing   +1 added lines, -1 removed lines patch added patch discarded remove patch
@@ -177,7 +177,7 @@
 block discarded – undo
177 177
     /** {@inheritdoc} */
178 178
     public function setLogin($login)
179 179
     {
180
-        $this->login = trim((String)$login);
180
+        $this->login = trim((String) $login);
181 181
         return $this;
182 182
     }
183 183
 
Please login to merge, or discard this patch.
module/Auth/src/Auth/Factory/Form/Element/UserSearchbarFactory.php 2 patches
Spacing   +1 added lines, -1 removed lines patch added patch discarded remove patch
@@ -34,7 +34,7 @@
 block discarded – undo
34 34
         /* @var $serviceLocator \Zend\ServiceManager\AbstractPluginManager
35 35
          * @var $headscript     \Zend\View\Helper\HeadScript */
36 36
         $services   = $serviceLocator->getServiceLocator();
37
-        $viewHelpers= $services->get('ViewHelperManager');
37
+        $viewHelpers = $services->get('ViewHelperManager');
38 38
         $headscript = $viewHelpers->get('headscript');
39 39
         $basepath   = $viewHelpers->get('basepath');
40 40
 
Please login to merge, or discard this patch.
Indentation   +6 added lines, -6 removed lines patch added patch discarded remove patch
@@ -1,11 +1,11 @@
 block discarded – undo
1 1
 <?php
2 2
 /**
3
- * YAWIK
4
- *
5
- * @filesource
6
- * @license MIT
7
- * @copyright  2013 - 2015 Cross Solution <http://cross-solution.de>
8
- */
3
+     * YAWIK
4
+     *
5
+     * @filesource
6
+     * @license MIT
7
+     * @copyright  2013 - 2015 Cross Solution <http://cross-solution.de>
8
+     */
9 9
   
10 10
 /** */
11 11
 namespace Organizations\Repository\Event;
Please login to merge, or discard this patch.