cross-solution / YAWIK

module/Auth/src/Auth/Controller/IndexController.php

Braces +1 added lines, -2 removed lines

@@ -411,8 +411,7 @@
                     } else {
                         $notFoundUsers[] = $grp_member . $loginSuffix;
                     }
-                }
-                catch (\Auth\Exception\UserDeactivatedException $e)
+                } catch (\Auth\Exception\UserDeactivatedException $e)
                 {
                     $notFoundUsers[] = $grp_member . $loginSuffix;
                 }

Doc Comments +1 added lines, -1 removed lines

@@ -79,7 +79,7 @@
 	 * @param $locale
 	 * @param $urlHelper
 	 * @param array $forms
-	 * @param $options
+	 * @param ModuleOptions $options
 	 */
     public function __construct(
     	AuthenticationService $auth,

Indentation +21 added lines, -21 removed lines

@@ -70,28 +70,28 @@
     
     protected $externalAdapter;
     
-	/**
-	 * IndexController constructor.
-	 *
-	 * @param AuthenticationService $auth
-	 * @param LoggerInterface $logger
-	 * @param $userLoginAdapter
-	 * @param $locale
-	 * @param $urlHelper
-	 * @param array $forms
-	 * @param $options
-	 */
+    /**
+     * IndexController constructor.
+     *
+     * @param AuthenticationService $auth
+     * @param LoggerInterface $logger
+     * @param $userLoginAdapter
+     * @param $locale
+     * @param $urlHelper
+     * @param array $forms
+     * @param $options
+     */
     public function __construct(
-    	AuthenticationService $auth,
-	    LoggerInterface $logger,
-	    $userLoginAdapter,
-	    $locale,
-	    $urlHelper,
-	    array $forms,
-	    $options,
-		$hybridAuthAdapter,
-		$externalAdapter,
-		RepositoryService $repositories
+        AuthenticationService $auth,
+        LoggerInterface $logger,
+        $userLoginAdapter,
+        $locale,
+        $urlHelper,
+        array $forms,
+        $options,
+        $hybridAuthAdapter,
+        $externalAdapter,
+        RepositoryService $repositories
     )
     {
         $this->auth              = $auth;

Spacing +32 added lines, -32 removed lines

@@ -35,8 +35,8 @@ 
 class IndexController extends AbstractActionController
 {
 
-    const LOGIN='login';
-    const REGISTER='register';
+    const LOGIN = 'login';
+    const REGISTER = 'register';
 
     /**
      * @var AuthenticationService
@@ -124,7 +124,7 @@ 
         $registerForm = $this->forms[self::REGISTER];
 
         /* @var $request \Zend\Http\Request */
-        $request   = $this->getRequest();
+        $request = $this->getRequest();
 
         if ($request->isPost()) {
             $data                          = $this->params()->fromPost();
@@ -142,7 +142,7 @@ 
             if (array_key_exists('credentials', $data) &&
                 array_key_exists('login', $data['credentials']) &&
                 array_key_exists('credential', $data['credentials'])) {
-                $adapter->setIdentity($data['credentials']['login'] . $loginSuffix)
+                $adapter->setIdentity($data['credentials']['login'].$loginSuffix)
                     ->setCredential($data['credentials']['credential']);
             }
             
@@ -153,14 +153,14 @@ 
             if ($result->isValid()) {
                 $user = $auth->getUser();
                 $language = $this->locale->detectLanguage($request, $user);
-                $this->logger->info('User ' . $user->getLogin() . ' logged in');
+                $this->logger->info('User '.$user->getLogin().' logged in');
                 
                 $ref = $this->params()->fromQuery('ref', false);
 
                 if ($ref) {
                     $ref = urldecode($ref);
-                    $url = preg_replace('~/[a-z]{2}(/|$)~', '/' . $language . '$1', $ref);
-                    $url = $request->getBasePath() . $url;
+                    $url = preg_replace('~/[a-z]{2}(/|$)~', '/'.$language.'$1', $ref);
+                    $url = $request->getBasePath().$url;
                 } else {
                     $urlHelper = $this->viewHelperManager->get('url');
                     $url = $urlHelper('lang', array('lang' => $language));
@@ -170,9 +170,9 @@ 
             } else {
                 $loginName = $data['credentials']['login'];
                 if (!empty($loginSuffix)) {
-                    $loginName = $loginName . ' (' . $loginName . $loginSuffix . ')';
+                    $loginName = $loginName.' ('.$loginName.$loginSuffix.')';
                 }
-                $this->logger->info('Failed to authenticate User ' . $loginName);
+                $this->logger->info('Failed to authenticate User '.$loginName);
                 $this->notification()->danger(/*@translate*/ 'Authentication failed.');
             }
         }
@@ -232,9 +232,9 @@ 
             try {
                 $user          = $auth->getUser();
                 $password      = substr(md5(uniqid()), 0, 6);
-                $login         = uniqid() . ($this->options->auth_suffix != "" ? '@' . $this->options->auth_suffix : '');
+                $login         = uniqid().($this->options->auth_suffix != "" ? '@'.$this->options->auth_suffix : '');
                 $externalLogin = $user->getLogin() ?: '-- not communicated --';
-                $this->logger->debug('first login via ' . $provider . ' as: ' . $externalLogin);
+                $this->logger->debug('first login via '.$provider.' as: '.$externalLogin);
 
                 $user->setLogin($login);
                 $user->setPassword($password);
@@ -253,11 +253,11 @@ 
                 );
                 $mail->addTo($user->getInfo()->getEmail());
 
-                $loggerId = $login . ' (' . $provider . ': ' . $externalLogin . ')';
+                $loggerId = $login.' ('.$provider.': '.$externalLogin.')';
                 if (isset($mail) && $this->mailer($mail)) {
-                    $this->logger->info('Mail first-login for ' . $loggerId . ' sent to ' . $user->getInfo()->getEmail());
+                    $this->logger->info('Mail first-login for '.$loggerId.' sent to '.$user->getInfo()->getEmail());
                 } else {
-                    $this->logger->warn('No Mail was sent for ' . $loggerId);
+                    $this->logger->warn('No Mail was sent for '.$loggerId);
                 }
             } catch (\Exception $e) {
                 $this->logger->crit($e);
@@ -268,11 +268,11 @@ 
         }
         
         $user = $auth->getUser();
-        $this->logger->info('User ' . $auth->getUser()->getInfo()->getDisplayName() . ' logged in via ' . $provider);
+        $this->logger->info('User '.$auth->getUser()->getInfo()->getDisplayName().' logged in via '.$provider);
         $settings = $user->getSettings('Core');
         if (null !== $settings->localization->language) {
             $basePath = $this->getRequest()->getBasePath();
-            $ref = preg_replace('~^'.$basePath . '/[a-z]{2}(?=/|$)~', $basePath . '/' . $settings->localization->language, $ref);
+            $ref = preg_replace('~^'.$basePath.'/[a-z]{2}(?=/|$)~', $basePath.'/'.$settings->localization->language, $ref);
         }
         return $this->redirect()->toUrl($ref);
     }
@@ -303,8 +303,8 @@ 
         
         if ($result->isValid()) {
             $this->logger->info(
-                'User ' . $this->params()->fromPost('user') .
-                ' logged via ' . $appKey
+                'User '.$this->params()->fromPost('user').
+                ' logged via '.$appKey
             );
             
             // the external login may include some parameters for an update
@@ -335,7 +335,7 @@ 
             if (array_key_exists('firstLogin', $resultMessage) && $resultMessage['firstLogin'] === true) {
                 // first external Login
                 $userName = $this->params()->fromPost('user');
-                $this->logger->debug('first login for User: ' .  $userName);
+                $this->logger->debug('first login for User: '.$userName);
                 //
                 if (preg_match('/^(.*)@\w+$/', $userName, $realUserName)) {
                     $userName = $realUserName[1];
@@ -359,7 +359,7 @@ 
 
                 try {
                     $this->mailer($mail);
-                    $this->logger->info('Mail first-login sent to ' . $userName);
+                    $this->logger->info('Mail first-login sent to '.$userName);
                 } catch (\Zend\Mail\Transport\Exception\ExceptionInterface $e) {
                     $this->logger->warn('No Mail was sent');
                     $this->logger->debug($e);
@@ -374,8 +374,8 @@ 
             );
         } else {
             $this->logger->info(
-                'Failed to authenticate User ' . $this->params()->fromPost('user') .
-                ' via ' . $this->params()->fromPost('appKey')
+                'Failed to authenticate User '.$this->params()->fromPost('user').
+                ' via '.$this->params()->fromPost('appKey')
             );
             
             $this->getResponse()->setStatusCode(Response::STATUS_CODE_401);
@@ -400,8 +400,8 @@ 
                 array(
                 'format' => 'json',
                     'group' => array(
-                        0 => 'testuser4711', 1 => 'flatscreen', 2 => 'flatscreen1', 3 => 'flatscreen2', 4 => 'flatscreen3',  5 => 'flatscreen4',
-                        6 => 'flatscreen5', 7 => 'flatscreen6', 8 => 'flatscreen7',  9 => 'flatscreen8', 10 => 'flatscreen9'
+                        0 => 'testuser4711', 1 => 'flatscreen', 2 => 'flatscreen1', 3 => 'flatscreen2', 4 => 'flatscreen3', 5 => 'flatscreen4',
+                        6 => 'flatscreen5', 7 => 'flatscreen6', 8 => 'flatscreen7', 9 => 'flatscreen8', 10 => 'flatscreen9'
                     ),
                     'name' => '(die) Rauscher – Unternehmensberatung & Consulting',
                 )
@@ -410,7 +410,7 @@ 
         }
         $auth = $this->auth;
         $userGrpAdmin = $auth->getUser();
-        $this->logger->info('User ' . $auth->getUser()->getInfo()->getDisplayName());
+        $this->logger->info('User '.$auth->getUser()->getInfo()->getDisplayName());
         $grp = $this->params()->fromQuery('group');
         
         // if the request is made by an external host, add his identification-key to the name
@@ -431,16 +431,16 @@ 
             foreach ($params->group as $grp_member) {
                 try
                 {
-                    $user = $users->findByLogin($grp_member . $loginSuffix);
+                    $user = $users->findByLogin($grp_member.$loginSuffix);
                     if (!empty($user)) {
                         $groupUserId[] = $user->id;
                     } else {
-                        $notFoundUsers[] = $grp_member . $loginSuffix;
+                        $notFoundUsers[] = $grp_member.$loginSuffix;
                     }
                 }
                 catch (\Auth\Exception\UserDeactivatedException $e)
                 {
-                    $notFoundUsers[] = $grp_member . $loginSuffix;
+                    $notFoundUsers[] = $grp_member.$loginSuffix;
                 }
             }
         }
@@ -450,9 +450,9 @@ 
             $group->setUsers($groupUserId);
         }
         $this->logger->info(
-            'Update Group Name: ' . $name . PHP_EOL . str_repeat(' ', 36) . 'Group Owner: ' . $userGrpAdmin->getLogin() . PHP_EOL .
-            str_repeat(' ', 36) . 'Group Members Param: ' . implode(',', $params->group) . PHP_EOL .
-            str_repeat(' ', 36) . 'Group Members: ' . count($groupUserId) . PHP_EOL . str_repeat(' ', 36) . 'Group Members not found: ' . implode(',', $notFoundUsers)
+            'Update Group Name: '.$name.PHP_EOL.str_repeat(' ', 36).'Group Owner: '.$userGrpAdmin->getLogin().PHP_EOL.
+            str_repeat(' ', 36).'Group Members Param: '.implode(',', $params->group).PHP_EOL.
+            str_repeat(' ', 36).'Group Members: '.count($groupUserId).PHP_EOL.str_repeat(' ', 36).'Group Members not found: '.implode(',', $notFoundUsers)
         );
         
         return new JsonModel(
@@ -469,7 +469,7 @@ 
     public function logoutAction()
     {
         $auth = $this->auth;
-        $this->logger->info('User ' . ($auth->getUser()->getLogin()==''?$auth->getUser()->getInfo()->getDisplayName():$auth->getUser()->getLogin()) . ' logged out');
+        $this->logger->info('User '.($auth->getUser()->getLogin() == '' ? $auth->getUser()->getInfo()->getDisplayName() : $auth->getUser()->getLogin()).' logged out');
         $auth->clearIdentity();
         unset($_SESSION['HA::STORE']);
 

module/Auth/src/Auth/Listener/DeactivatedUserListener.php

Indentation +1 added lines, -1 removed lines

@@ -33,7 +33,7 @@
         ];
         
         // do nothing for allowed routes
-		if (in_array($routeName, $allowedRoutes))
+        if (in_array($routeName, $allowedRoutes))
         {
             return;
         }

module/Auth/src/Auth/Entity/Status.php

Spacing +2 added lines, -2 removed lines

@@ -53,10 +53,10 @@
     public function __construct($status = self::ACTIVE)
     {
         if (!isset(static::$orderMap[$status])) {
-            throw new \DomainException('Unknown status: ' . $status);
+            throw new \DomainException('Unknown status: '.$status);
         }
         
-        $constant = 'self::' . strtoupper($status);
+        $constant = 'self::'.strtoupper($status);
         $this->name = constant($constant);
         $this->order = $this->getOrder();
     }

module/Auth/src/Auth/Controller/UsersController.php

Indentation +3 added lines, -3 removed lines

@@ -84,9 +84,9 @@
         $imageStrategy = $infoContainer->getForm('info.image')
             ->getHydrator()
             ->getStrategy('image');
-		$fileEntity = $imageStrategy->getFileEntity();
-		$fileEntity->setUser($user);
-		$imageStrategy->setFileEntity($fileEntity);
+        $fileEntity = $imageStrategy->getFileEntity();
+        $fileEntity->setUser($user);
+        $imageStrategy->setFileEntity($fileEntity);
         
         if ($this->request->isPost()) {
             $formName = $params->fromQuery('form');

Spacing +2 added lines, -2 removed lines

@@ -40,7 +40,7 @@ 
     /**
      * @param UserRepository $userRepository
      */
-    public function __construct(UserRepository $userRepository,$formManager,$viewHelper)
+    public function __construct(UserRepository $userRepository, $formManager, $viewHelper)
     {
         $this->userRepository = $userRepository;
         $this->formManager = $formManager;
@@ -186,7 +186,7 @@ 
         }
 
         $switcher = $this->plugin('Auth/User/Switcher');
-        $success  = $switcher($this->params()->fromQuery('id'), [ 'ref' => urldecode($this->params()->fromQuery('ref')) ]);
+        $success  = $switcher($this->params()->fromQuery('id'), ['ref' => urldecode($this->params()->fromQuery('ref'))]);
 
         return new JsonModel(['success' => true]);
     }

module/Auth/src/Auth/Controller/Plugin/LoginFilter.php

Spacing +1 added lines, -1 removed lines

@@ -31,7 +31,7 @@
      */
     public function __construct(LoginFilterService $loginFilter)
     {
-        $this->loginFilter = $loginFilter;;
+        $this->loginFilter = $loginFilter; ;
     }
 
     /**

Indentation +5 added lines, -5 removed lines

@@ -44,11 +44,11 @@
     }
 	
 	
-	/**
-	 * @param ContainerInterface $container
-	 *
-	 * @return static
-	 */
+    /**
+     * @param ContainerInterface $container
+     *
+     * @return static
+     */
     public static function factory(ContainerInterface $container)
     {
         return new static($container->get('Auth/LoginFilter'));

module/Auth/src/Acl/Controller/Plugin/Acl.php

Doc Comments +3 added lines, -3 removed lines

@@ -129,7 +129,7 @@ 
 
     /**
      * @param $resource
-     * @param null $privilege
+     * @param null|string $privilege
      * @throws \Auth\Exception\UnauthorizedImageAccessException
      * @throws \Auth\Exception\UnauthorizedAccessException
      */
@@ -155,8 +155,8 @@ 
     }
 
     /**
-     * @param null $resource
-     * @param null $privilege
+     * @param null|string $resource
+     * @param null|string $privilege
      * @param string $mode
      * @return $this|bool
      */

Indentation +7 added lines, -7 removed lines

@@ -138,14 +138,14 @@
         if (!$this->test($resource, $privilege)) {
             $msg = null === $privilege
                  ? sprintf(
-                     'You are not allowed to access resource "%s"',
-                     is_object($resource) ? $resource->getResourceId() : $resource
-                 )
+                        'You are not allowed to access resource "%s"',
+                        is_object($resource) ? $resource->getResourceId() : $resource
+                    )
                  : sprintf(
-                     'You are not allowed to execute operation "%s" on resource "%s"',
-                     $privilege,
-                     is_object($resource) ? $resource->getResourceId() : $resource
-                 );
+                        'You are not allowed to execute operation "%s" on resource "%s"',
+                        $privilege,
+                        is_object($resource) ? $resource->getResourceId() : $resource
+                    );
             
             if ($resource instanceof FileInterface && 0 == strpos($resource->getType(), 'image/')) {
                 throw new UnauthorizedImageAccessException(str_replace('resource', 'image', $msg));

module/Auth/src/Auth/Listener/UnauthorizedAccessListener.php

Indentation +7 added lines, -7 removed lines

@@ -57,9 +57,9 @@ 
         if ($exception instanceof UnauthorizedImageAccessException) {
             $image = __DIR__ . '/../../../../../public/images/unauthorized-access.png';
             $response->setStatusCode(Response::STATUS_CODE_403)
-                     ->setContent(file_get_contents($image))
-                     ->getHeaders()
-                     ->addHeaderLine('Content-Type', 'image/png');
+                        ->setContent(file_get_contents($image))
+                        ->getHeaders()
+                        ->addHeaderLine('Content-Type', 'image/png');
             $e->stopPropagation();
             $response->sendHeaders();
             //echo file_get_contents($image);
@@ -70,7 +70,7 @@ 
         }
         
         $application = $e->getApplication();
-		$auth = $application->getServiceManager()->get('AuthenticationService');
+        $auth = $application->getServiceManager()->get('AuthenticationService');
         
         if (!$auth->hasIdentity()) {
             $routeMatch = $e->getRouteMatch();
@@ -102,9 +102,9 @@ 
         $model->setTemplate($this->getExceptionTemplate());
         $e->setResult($model);
 
-       // $statusCode = $response->getStatusCode();
-       // if ($statusCode === 200) {
+        // $statusCode = $response->getStatusCode();
+        // if ($statusCode === 200) {
             $response->setStatusCode(Response::STATUS_CODE_403);
-       // }
+        // }
     }
 }

Spacing +2 added lines, -2 removed lines

@@ -55,7 +55,7 @@ 
          * Return an image, if an image was requested.
          */
         if ($exception instanceof UnauthorizedImageAccessException) {
-            $image = __DIR__ . '/../../../../../public/images/unauthorized-access.png';
+            $image = __DIR__.'/../../../../../public/images/unauthorized-access.png';
             $response->setStatusCode(Response::STATUS_CODE_403)
                      ->setContent(file_get_contents($image))
                      ->getHeaders()
@@ -78,7 +78,7 @@ 
             $routeMatch->setParam('action', 'index');
             $query = $e->getRequest()->getQuery();
             $ref = $e->getRequest()->getRequestUri();
-            $ref = preg_replace('~^' . preg_quote($e->getRouter()->getBaseUrl()) . '~', '', $ref);
+            $ref = preg_replace('~^'.preg_quote($e->getRouter()->getBaseUrl()).'~', '', $ref);
             $query->set('ref', $ref);
             $query->set('req', 1);
             $response->setStatusCode(Response::STATUS_CODE_401);

module/Auth/src/Auth/Dependency/Manager.php

Spacing +1 added lines, -1 removed lines

@@ -56,7 +56,7 @@
 
     protected function attachDefaultListeners()
     {
-        $this->getEventManager()->attach(static::EVENT_REMOVE_ITEMS, function (EventInterface $event) {
+        $this->getEventManager()->attach(static::EVENT_REMOVE_ITEMS, function(EventInterface $event) {
             $user = $event->getParam('user');
             foreach ($this->getLists() as $list) {
                 foreach ($list->getEntities($user) as $entity) {

Doc Comments +2 added lines, -5 removed lines

@@ -41,9 +41,7 @@ 
     }
     
     /**
-     * @param User $user
-     * @param Router $router
-     * @return ListInterface[]
+     * @return \Zend\EventManager\ResponseCollection
      */
     public function getLists()
     {
@@ -52,8 +50,7 @@ 
  
     /**
      * @param User $user
-     * @param Router $router
-     * @return \Zend\EventManager\ResponseCollection
+     * @return boolean
      */
     public function removeItems(User $user)
     {

module/Auth/src/Auth/Controller/Plugin/SocialProfiles/LinkedIn.php

Spacing +1 added lines, -1 removed lines

@@ -135,7 +135,7 @@
         return array(
             'year' => strval($xml->year),
             'month'=> isset($xml->month) ? strval($xml->month) : '01',
-            'day'  => isset($xml->day)   ? strval($xml->day)   : '01',
+            'day'  => isset($xml->day) ? strval($xml->day) : '01',
         );
     }
 }